suzmii
7ae71441ba
合并 origin/master 4a46f89c9 到 chore/agc-acceptance-build（HEAD 55fab1776），本次合并共涉及 117 个文件（113 个自动合并 + 4 个冲突）。
- 自动合并 113 个文件：插件宿主与插件工作区（plugin_host.rs / builtin_plugins.rs / editor_adapter(_s).rs / plugins/agc-cocos-editor / cocos-editor-bridge crate / editor-adapter-api）、构建与打包脚本、locked Cargo.lock 及 master 侧锁与资源链路改动；不逐条列出。
- 冲突 1 apps/ai-game-creator-shell/src/App.tsx:271-278：两侧各自新增一个 import（本分支 ./services/tauriEventSubscription、master ./services/pluginHost），两个 import 都保留，并按 simple-import-sort 口径排在 ./services/platformSession 之后、tauriEventSubscription 之前；四个符号都仍被使用。
- 冲突 2 docs/project-memory/shared-memory/decision-log.md:8338-8469：两侧在同一位置追加记录，逐字保留两侧记录且各自原有顺序不变（先本分支的 2026-09-11 资源卡预览 data URL / loopback HTTP 两条，后 master 的 2026-09-09～2026-09-12 通用插件宿主、Cocos 桥接与内置插件开关条目），不改写、不合并措辞。
- 冲突 3 docs/project-memory/shared-memory/pitfalls.md:79-112：同上，保留本分支的「2026-09-05 资源画本转场与视口分离」与 master 的「2026-09-11 首页自动工作区必须使用 AGC 管理目录」「2026-09-12 Cocos 项目识别不等于编辑器桥就绪」「2026-09-11 Cocos 项目必须走独立导入分支」，内容逐字保留、两侧原顺序不变。
- 冲突 4 apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_history.rs:400-435：判据是「两侧不互斥」，解法为 both（语义超集）。
- 冲突 4 保留本分支的有界退避重试循环（DIRECT_PROJECT_HISTORY_CONTENTION_RETRY_BACKOFF_MS + is_direct_project_history_contention_failure + 测试注入点）与单次尝试函数 append_direct_project_history_item_once（含锁外幂等回扫与锁内状态复核）。
- 冲突 4 保留 master 的有界等待取项目写锁：把该函数内原来的零等待 crate::project::acquire_project_write_lock(root, "conversation.write") 换成 acquire_game_creator_agent_runtime_project_write_lock_with_wait(root, "conversation.write")，并原样保留 master 的注释（agc_write_file 占锁 5.5 秒期间，零等待取锁会让流式历史落盘直接失败）。
- 冲突 4 判断依据：master 只替换了同一处的取锁语义（零等待 → 约 10 秒有界等待，并有 append_waits_for_a_same_process_project_writer 用例锁定），不改变函数签名、调用方与错误类型；HEAD 的重试循环因此仍然可达，与有界等待叠加后语义更强——写文件占锁由有界等待吃掉，等待窗口耗尽后的残余争用再由一次 250ms 短退避重试兜底。未删除任何一侧行为，也未放弃任何一侧语义。
- 冲突 4 位置取舍：有界等待取锁仍放在锁外回扫与序列化之后（本分支结构），保住「幂等回扫与序列化留在锁外、不让他人等整份历史读完」的性能语义；master 的注释与调用参数逐字保留。
- 验证：npm run typecheck、npm --prefix apps/ai-game-creator-shell run typecheck、cargo check --locked --all-targets（exit 0，0 error）、npm run check:rustfmt、npm run check:encoding、git diff --check 全部通过；冲突标记扫描为空。
- 定向 Rust 测试（--test-threads=1）：direct_project_history 19 passed / 0 failed（含本分支 contention_failure_is_retried_with_bounded_backoff、contention_failure_beyond_the_backoff_budget_fails_closed、shape_failure_is_not_retried 与 master 的 append_waits_for_a_same_process_project_writer）；conversation 36 passed / 0 failed；write_lock 21 passed / 0 failed。两侧用例同时绿，证明有界等待取锁与有界退避重试叠加后语义自洽。
- 未跑全量测试（按仓库约定本地只跑定向，全量交给 CI）；本次不 push。
141 lines
5.3 KiB
TypeScript
141 lines
5.3 KiB
TypeScript
import { createRequire } from 'node:module';
|
|
import path from 'node:path';
|
|
|
|
import { defineConfig } from 'vitest/config';
|
|
|
|
const aiGameCreatorRequire = createRequire(
|
|
path.resolve(__dirname, 'apps/ai-game-creator-shell/package.json'),
|
|
);
|
|
const reactFileManagerPackageRoot = path.dirname(
|
|
aiGameCreatorRequire.resolve('@cubone/react-file-manager/package.json'),
|
|
);
|
|
|
|
export default defineConfig({
|
|
resolve: {
|
|
alias: [
|
|
{
|
|
find: /^@cubone\/react-file-manager$/,
|
|
replacement: path.resolve(
|
|
reactFileManagerPackageRoot,
|
|
'dist/react-file-manager.es.js',
|
|
),
|
|
},
|
|
// Keep shared components' application-root imports resolvable in tests.
|
|
{ find: '@', replacement: path.resolve(__dirname, '.') },
|
|
{
|
|
find: '@genarrative/image-canvas-core',
|
|
replacement: path.resolve(
|
|
__dirname,
|
|
'packages/image-canvas-core/src/index.ts',
|
|
),
|
|
},
|
|
{
|
|
find: '@genarrative/image-canvas-react',
|
|
replacement: path.resolve(
|
|
__dirname,
|
|
'packages/image-canvas-react/src/index.ts',
|
|
),
|
|
},
|
|
// The standalone AI shell owns its Tauri guest dependencies. Root tests
|
|
// use inert aliases so the root H5 package keeps the HostBridge boundary.
|
|
{
|
|
find: '@tauri-apps/plugin-clipboard-manager',
|
|
replacement: path.resolve(
|
|
__dirname,
|
|
'apps/ai-game-creator-shell/tests/tauri-plugin-clipboard-manager.mock.ts',
|
|
),
|
|
},
|
|
{
|
|
find: '@tauri-apps/plugin-opener',
|
|
replacement: path.resolve(
|
|
__dirname,
|
|
'apps/ai-game-creator-shell/tests/tauri-plugin-opener.mock.ts',
|
|
),
|
|
},
|
|
// Keep every workspace test on the root install's single React renderer.
|
|
{
|
|
find: 'react',
|
|
replacement: path.resolve(__dirname, 'node_modules/react'),
|
|
},
|
|
{
|
|
find: 'react-dom',
|
|
replacement: path.resolve(__dirname, 'node_modules/react-dom'),
|
|
},
|
|
],
|
|
dedupe: ['react', 'react-dom', 'zustand'],
|
|
},
|
|
test: {
|
|
environment: 'node',
|
|
globals: true,
|
|
minThreads: 1,
|
|
maxThreads: 8,
|
|
server: {
|
|
deps: {
|
|
inline: [
|
|
/apps\/ai-game-creator-shell\/node_modules\//,
|
|
/node_modules\/@cubone\/react-file-manager/,
|
|
],
|
|
},
|
|
},
|
|
include: [
|
|
'src/index.test.ts',
|
|
'src/routing/activeAppPageRoutes.test.ts',
|
|
'src/routing/activeAppRoutes.test.ts',
|
|
'src/services/activeAppTitle.test.ts',
|
|
'src/services/assetReadUrlService.test.ts',
|
|
'src/services/authService.test.ts',
|
|
'src/services/apiClient.test.ts',
|
|
'src/services/clipboard.test.ts',
|
|
'src/services/host-bridge/**/*.test.ts',
|
|
'src/services/image-editor/**/*.test.ts',
|
|
'src/services/external-generation/**/*.test.ts',
|
|
'src/services/payment/**/*.test.ts',
|
|
'src/services/platform-entry/platformProfileClient.test.ts',
|
|
'src/stores/**/*.test.ts',
|
|
'src/stores/**/*.test.tsx',
|
|
'src/components/auth/**/*.test.ts',
|
|
'src/components/auth/**/*.test.tsx',
|
|
'src/components/creation-home/**/*.test.ts',
|
|
'src/components/creation-home/**/*.test.tsx',
|
|
'src/components/shared-components/**/*.test.tsx',
|
|
'src/components/common/AutoGrowTextArea.test.tsx',
|
|
'src/components/common/CreativeImageInputPanel.test.tsx',
|
|
'src/components/common/PlatformDangerConfirmDialog.test.tsx',
|
|
'src/components/common/PlatformFloatingMenu.test.tsx',
|
|
'src/components/common/PlatformImagePreviewModal.test.tsx',
|
|
'src/components/common/PlatformReportDialog.test.tsx',
|
|
'src/components/common/PlatformUtilityInfoModal.test.tsx',
|
|
'src/components/common/PublishShareModal.test.tsx',
|
|
'src/components/image-editor/**/*.test.ts',
|
|
'src/components/image-editor/**/*.test.tsx',
|
|
'src/components/project/**/*.test.ts',
|
|
'src/components/project/**/*.test.tsx',
|
|
'src/components/platform-entry/PlatformActiveMobileWelcomeDialog.test.tsx',
|
|
'src/components/platform-entry/PlatformActiveProfileView.test.tsx',
|
|
'src/components/platform-entry/PlatformEntryActiveFlowShell.test.tsx',
|
|
'src/components/platform-entry/PlatformProfileModalShell.test.tsx',
|
|
'src/components/platform-entry/PlatformProfileReferralModal.test.tsx',
|
|
'src/components/platform-entry/PlatformProfileRewardCodeRedeemModal.test.tsx',
|
|
'src/components/platform-entry/platformProfile*.test.ts',
|
|
'src/components/platform-entry/usePlatformProfileCenterController*.test.tsx',
|
|
'src/hooks/useHostNavigationCanGoBack.test.tsx',
|
|
'apps/admin-web/src/**/*.test.ts',
|
|
'apps/admin-web/src/**/*.test.tsx',
|
|
'apps/ai-game-creator-shell/tests/**/*.test.ts',
|
|
'apps/ai-game-creator-shell/tests/**/*.test.tsx',
|
|
'miniprogram/**/*.test.js',
|
|
'scripts/**/*.test.ts',
|
|
'packages/shared/src/contracts/*.test.ts',
|
|
'packages/shared/src/components/**/*.test.ts',
|
|
'packages/shared/src/components/**/*.test.tsx',
|
|
'packages/shared/src/stores/**/*.test.ts',
|
|
'packages/shared/src/utils/**/*.test.ts',
|
|
'packages/image-canvas-core/src/**/*.test.ts',
|
|
'packages/image-canvas-react/src/**/*.test.ts',
|
|
'packages/image-canvas-react/src/**/*.test.tsx',
|
|
'packages/agc-plugin-sdk/src/**/*.test.ts',
|
|
],
|
|
exclude: ['scripts/loadtest/**'],
|
|
},
|
|
});
|