合并 origin/master(58 个提交):生产 Nginx 模板收敛与记录同步
Project CI / AI game creator shell Rust lane 1/2 (push) Failing after 2m23s
Project CI / AI game creator shell Rust lane 2/2 (push) Failing after 1m15s
Project CI / AI game creator shell Rust crates (push) Successful in 1m14s
Project CI / AI game creator shell Rust smoke (push) Successful in 1m35s
Project CI / Frontend tests (push) Successful in 2m53s
Project CI / Repository checks (push) Successful in 3m36s
Project CI / Backend tests (push) Successful in 4m26s
Project CI / AI game creator shell web tests (push) Successful in 2m23s
Project CI / Native shell tests (push) Successful in 7m27s
Project CI / AI game creator shell Rust lane 1/2 (push) Failing after 2m23s
Project CI / AI game creator shell Rust lane 2/2 (push) Failing after 1m15s
Project CI / AI game creator shell Rust crates (push) Successful in 1m14s
Project CI / AI game creator shell Rust smoke (push) Successful in 1m35s
Project CI / Frontend tests (push) Successful in 2m53s
Project CI / Repository checks (push) Successful in 3m36s
Project CI / Backend tests (push) Successful in 4m26s
Project CI / AI game creator shell web tests (push) Successful in 2m23s
Project CI / Native shell tests (push) Successful in 7m27s
- 合并 origin/master 58 个提交,解决 2 处文件冲突:决策记录与踩坑记录均按两侧新增条目并存处理 - claude_code_cli.rs 自动合并通过:本机 Claude sidecar 诊断改动与上游 sidecar 归位并存,无重复函数定义、无冲突残留 - 保留本地未推送提交:AGC Claude 执行认证与错误诊断、Claude sidecar 超时诊断 - 本次推送主体内容不变:生产 Nginx 模板收敛、host-only snippet 与运维/踩坑/决策文档同步
This commit is contained in:
@@ -31,10 +31,13 @@ const aiGameCreatorProjectDevelopmentSource = fs.readFileSync(
|
||||
'apps/ai-game-creator-shell/src/view/project-development/index.tsx',
|
||||
'utf8',
|
||||
);
|
||||
const aiGameCreatorPreviewRustSource = fs.readFileSync(
|
||||
// 同时检查共享预览实现和桌面命令接入,避免拆分后漏掉激活或外部浏览器边界。
|
||||
const aiGameCreatorPreviewRustSource = [
|
||||
'apps/ai-game-creator-shell/src-tauri/src/preview.rs',
|
||||
'utf8',
|
||||
);
|
||||
'apps/ai-game-creator-shell/src-tauri/src/preview/desktop.rs',
|
||||
]
|
||||
.map((sourcePath) => fs.readFileSync(sourcePath, 'utf8'))
|
||||
.join('\n');
|
||||
const aiGameCreatorShellTauriConfig = JSON.parse(
|
||||
fs.readFileSync(
|
||||
'apps/ai-game-creator-shell/src-tauri/tauri.conf.json',
|
||||
|
||||
@@ -707,7 +707,7 @@ describe('project CI workflow', () => {
|
||||
'npm run ai-game-creator-shell:check:web && npm run ai-game-creator-shell:check:rust && npm run ai-game-creator-shell:agent-run:smoke',
|
||||
);
|
||||
expect(rootPackageJson.scripts?.['ai-game-creator-shell:check:web']).toBe(
|
||||
'npm run ai-game-creator-shell:typecheck && npm run test -- apps/ai-game-creator-shell/tests',
|
||||
'npm run ai-game-creator-shell:typecheck && npm --prefix apps/ai-game-creator-shell run bundled-resources:test && npm run test -- apps/ai-game-creator-shell/tests',
|
||||
);
|
||||
expect(rootPackageJson.scripts?.['ai-game-creator-shell:check:rust']).toBe(
|
||||
'npm run ai-game-creator-shell:check:rust:crates && npm run ai-game-creator-shell:check:rust:shell',
|
||||
|
||||
Reference in New Issue
Block a user