合并 origin/master 到资源工作台 V3 分支：解 4 处冲突并保留两侧行为

- WorkspaceLauncher.tsx：保留本分支清单快照 CAS 拒收提示（manifestMergeNotice 提示条、data-manifest-merge-* 观察点、recoverRejectedManifestSnapshot「重新读取清单」）与 activeVersionId/onActiveVersionChange 版本口径，并入 master 的策划/游戏运行态切换（onMakeGame + switchToGameRuntime、suppressInitialGameTurn 抑制首轮、supervisor key 带 agentRuntimeMode、onSwitchToGameRuntime），planningStartMode 统一取 master 的派生值（上下文 startMode 为 planning 且未切到 game 运行时）
- ProjectSupervisorView.tsx：props 同时保留本分支 versions/activeVersionId 与 master 的 designView/onDesignApprove/onDesignClarify/onDesignRetry，DesignAgentSurface 审批链路与本分支资源引用输入区并存；directCodex 输入区保留本分支 @ 引用按钮 + 模型选择 + 发送按钮控制条，发送按钮禁用条件并入 master 的 designView 审批待定口径，模型选择沿用 master 的「对话中可切换」口径
- styles.css：本分支追加的资源画布/输入区样式块与 master 追加的 .design-agent-reasoning 样式块都保留，并补上本分支最后一条规则的收尾大括号
- view/project-development/index.tsx：保留本分支的 image-editor 引用（ImageCanvasProjectAssetPickerDialog、ImageCanvasQuickEditPanelView、ImageCanvasSelectedLayerToolbarView、useImageCanvasFloatingOptionDismiss），去掉 master 对已退役 features/asset-canvas 的 import（本分支已由 resource-canvas 取代），保留 master 的 DesignWorkspacePanel 与 planningStartMode 策划工作台分支
- tests/workspaceLauncherManifestMerge.test.tsx：补 master 新引入的 get_design_agent_runtime_mode mock（返回 null，与 master 各套件同口径），拒收提示断言不变
- tests/appSurface/design-agent.suite.ts：审批待定禁用输入的断言改用本分支 Lexical 输入区的禁用口径（容器 data-disabled + editor.setEditable(false)），断言意图不变
- 验证：npm run typecheck 通过；apps/ai-game-creator-shell typecheck 通过；apps/ai-game-creator-shell/tests 96 个测试文件 1380 通过 4 跳过 0 失败；全仓 vitest 297 通过 2 失败（scripts 下两例为 Windows 权限语义导致的既有失败，相关文件与实现均未参与本次合并）；npm run check:encoding 与 git diff --check 通过

apps/ai-game-creator-shell/scripts/check-config.mjs

@@ -114,6 +114,7 @@ const allowedUncalledTauriCommands = [
   'open_game_creator_launcher_window',
   'open_game_creator_workspace_window',
   'read_direct_project_conversation',
+  'reset_design_agent_session',
   'stop_local_game_preview_if_matches',
   'start_game_creator_external_mcp',
   'stop_game_creator_external_mcp',
@@ -1285,6 +1286,9 @@ if (tauriConfig.identifier !== 'world.genarrative.ai-game-creator') {
   throw new Error('AI game creator shell identifier drifted');
 }
 
+const expectedBundledDesignAgentResources = {
+  'design-agent': 'design-agent',
+};
 const expectedBundledCodexResources = {
   'resources/codex/win-x64/bin/codex.exe': 'codex/win-x64/bin/codex.exe',
   'resources/codex/win-x64/bin/codex-code-mode-host.exe':
@@ -1300,16 +1304,33 @@ const expectedBundledCodexResources = {
   'resources/codex/win-x64/NOTICE.md': 'codex/win-x64/NOTICE.md',
   'resources/codex/win-x64/manifest.json': 'codex/win-x64/manifest.json',
 };
-if (tauriConfig.bundle?.resources !== undefined) {
-  throw new Error(
-    'AI game creator shell base Tauri config must not require Windows-only Codex resources',
-  );
+assert.deepEqual(
+  tauriConfig.bundle?.resources,
+  expectedBundledDesignAgentResources,
+  'AI game creator shell base Tauri config must bundle the design-agent resource pack',
+);
+for (const key of Object.keys(tauriConfig.bundle?.resources ?? {})) {
+  if (String(key).includes('codex')) {
+    throw new Error(
+      'AI game creator shell base Tauri config must not require Windows-only Codex resources',
+    );
+  }
 }
 assert.deepEqual(
   windowsTauriConfig.bundle?.resources,
   expectedBundledCodexResources,
   'AI game creator shell Windows Tauri config must bundle the complete pinned Codex resource set',
 );
+if (
+  Object.prototype.hasOwnProperty.call(
+    windowsTauriConfig.bundle?.resources ?? {},
+    'design-agent',
+  )
+) {
+  throw new Error(
+    'design-agent resource pack must not be mixed into the Windows Codex sidecar bundle',
+  );
+}
 if (windowsTauriConfig.bundle?.useLocalToolsDir !== true) {
   throw new Error(
     'AI game creator shell Windows Tauri config must cache bundling tools in the project target directory',

apps/ai-game-creator-shell/scripts/start-tauri-dev.mjs

@@ -20,6 +20,10 @@ import {
 const appRoot = fileURLToPath(new URL('..', import.meta.url));
 const repoRoot = resolve(appRoot, '../..');
 const tauriCliPath = resolve(repoRoot, 'node_modules/@tauri-apps/cli/tauri.js');
+const AGC_DESIGN_DEBUG_ENV = 'GENARRATIVE_AGC_DESIGN_DEBUG';
+const AGC_DESIGN_DEBUG_VITE_ENV = 'VITE_GENARRATIVE_AGC_DESIGN_DEBUG';
+const designDebugEnabled =
+  process.env[AGC_DESIGN_DEBUG_ENV]?.trim() === '0' ? '0' : '1';
 
 function buildTauriArguments(argv, devUrl = readAgcDevEndpoint().url) {
   const args = [...argv];
@@ -108,7 +112,11 @@ async function runTauriDev(
     if (!prepared || shutdownSignal) return 1;
     const tauriArguments = buildTauriArguments(argv, endpoint.url);
     child = spawnCli(tauriArguments, {
-      env: withAgcDevEndpointEnv(endpoint),
+      env: {
+        ...withAgcDevEndpointEnv(endpoint),
+        [AGC_DESIGN_DEBUG_ENV]: designDebugEnabled,
+        [AGC_DESIGN_DEBUG_VITE_ENV]: designDebugEnabled,
+      },
     });
     const childResult = waitForCli(child);
     const outcome = await Promise.race([
@@ -157,7 +165,13 @@ async function prepareFrontendDev(endpoint, { onChild, signal }) {
   const frontend = spawnChild(
     process.platform === 'win32' ? 'npm.cmd' : 'npm',
     ['run', 'agc:serve'],
-    { cwd: repoRoot, env: withAgcDevEndpointEnv(endpoint) },
+    {
+      cwd: repoRoot,
+      env: {
+        ...withAgcDevEndpointEnv(endpoint),
+        [AGC_DESIGN_DEBUG_VITE_ENV]: designDebugEnabled,
+      },
+    },
   );
   onChild(frontend);
   console.log(