补充Mac Jenkins节点工具链路径

为LaunchAgent构建环境注入Node、npm、Cargo和Homebrew路径

.gitattributes

@@ -23,6 +23,3 @@
 *.meta text
 *.anim text
 *.controller text
-
-# Rust ts-rs 生成的共享契约：保留在仓库中供 TS 消费，但不作为手写源文件统计。
-packages/shared/src/contracts/generated/** linguist-generated=true

.gitea/workflows/project-ci.yml

@@ -221,7 +221,8 @@ jobs:
       - name: Run AI game creator shell agent-run smoke
         run: npm run check:native-shells:agc-rust-smoke
 
-  # AGC 壳依赖的共享 / 平台和编辑器插件 crate 各自预热独立 manifest，再运行对应测试。
+  # AGC 壳依赖的共享 / 平台 crate 测试用的是 server-rs workspace 与两个无锁独立 crate
+  # 的 manifest，属另一套依赖图，因此单独一个 job 预热、单独跑。
   ai-game-creator-shell-rust-crates:
     name: AI game creator shell Rust crates
     runs-on: genarrative-ci
@@ -262,15 +263,13 @@ jobs:
           # `cargo test --manifest-path` 单独跑这两个 crate。不在这里预热的话，这两条测试
           # 会在测试阶段自己 `Updating crates.io index`，crates.io 一抖动整条 job 就红
           # （见 #327 / PR #316 run 1950）。
-          # Cocos 插件也使用独立且未提交的锁文件，一并预热。
+          # 两个 crate 都没有提交 Cargo.lock，所以这里只能做不带锁标志的 fetch：
-          # 这些 crate 都没有提交 Cargo.lock，所以这里只能做不带锁标志的 fetch：
           # 加锁标志会因为缺少锁文件直接失败。生成的 Cargo.lock 落在两个 crate 目录内，
           # 已被各自的 .gitignore 忽略，只留在容器里；随后的测试阶段因此能用锁定版本
           # 解析，不再触碰 registry index。
           for manifest_path in \
             server-rs/crates/agent-runtime-core/Cargo.toml \
-            server-rs/crates/agent-runtime-orchestration/Cargo.toml \
+            server-rs/crates/agent-runtime-orchestration/Cargo.toml; do
-            plugins/agc-cocos-editor/native/cocos-editor-bridge/Cargo.toml; do
             for attempt in $(seq 1 5); do
               if cargo fetch \
                 --target x86_64-unknown-linux-gnu \
@@ -285,23 +284,6 @@ jobs:
             done
           done
 
-      - name: Prepare Unity plugin Rust dependencies
-        shell: bash
-        run: |
-          set -euo pipefail
-          for attempt in $(seq 1 5); do
-            if cargo fetch --locked \
-              --target x86_64-unknown-linux-gnu \
-              --manifest-path plugins/agc-unity-editor/native/unity-editor-bridge/Cargo.toml; then
-              break
-            fi
-            if [[ "${attempt}" -eq 5 ]]; then
-              echo 'Unity plugin Cargo dependency fetch failed after 5 attempts.' >&2
-              exit 1
-            fi
-            sleep $((attempt * 2))
-          done
-
       - name: Run AI game creator shell shared crate gates
         run: npm run check:native-shells:agc-rust-crates
 

.gitignore

@@ -47,11 +47,9 @@ temp*build*/
 /apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/codex-package.json
 /apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/manifest.json
 /apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/NOTICE.md
+/apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/darwin-arm64/
+/apps/ai-game-creator-shell/src-tauri/resources/codex/mac-native/darwin-x64/
 /plugins/agc-cocos-editor/native/payload/
-/plugins/agc-unity-editor/dotnet/**/bin/
-/plugins/agc-unity-editor/dotnet/**/obj/
-/plugins/agc-unity-editor/dotnet/publish/
-/plugins/agc-unity-editor/dotnet/native-build/
 /apps/ai-game-creator-shell/logs/
 /apps/ai-game-creator-shell/.llm-drafts/
 /apps/ai-game-creator-shell/game-creator.config.local.json

.prettierrc.json

@@ -1,14 +1,5 @@
 {
   "singleQuote": true,
   "semi": true,
-  "trailingComma": "all",
+  "trailingComma": "all"
-  "overrides": [
-    {
-      "files": "packages/shared/src/contracts/generated/**/*.ts",
-      "options": {
-        "printWidth": 1000,
-        "singleQuote": false
-      }
-    }
-  ]
 }

apps/ai-game-creator-shell/scripts/agent-runtime-deterministic-playable-e2e.mjs

@@ -676,11 +676,11 @@ async function runSelfTest() {
       designFoundationAssetCall?.arguments?.input?.outputPath ===
         'assets/ui-prototype.png' &&
       designFoundationAssetCall.arguments.input.aspectRatio === '16:9' &&
-      designFoundationAssetCall.arguments.input.assetKind === 'ui-design' &&
+      designFoundationAssetCall.arguments.input.assetKind === 'ui-prototype' &&
       artAssetPlanAssetCall?.arguments?.input?.outputPath ===
         'assets/art-spritesheet.png' &&
       artAssetPlanAssetCall.arguments.input.aspectRatio === '1:1' &&
-      artAssetPlanAssetCall.arguments.input.assetKind === 'icon-spritesheet',
+      artAssetPlanAssetCall.arguments.input.assetKind === 'art-spritesheet',
     'self-test-visual-assets-invalid',
   );
 

apps/ai-game-creator-shell/scripts/agent-swarm-test-chat.mjs

@@ -70,7 +70,7 @@ const requiredFormalArtifactSpecs = [
   { path: 'game/balance.json', kind: 'json' },
   { path: 'assets/manifest.art.json', kind: 'json' },
   { path: 'assets/manifest.audio.json', kind: 'json' },
-  { path: 'game/index.html', kind: 'file' },
+  { path: 'game/index.html', kind: 'game-entry' },
   { path: 'exports/README.md', kind: 'file' },
 ];
 const editorImageArtifactSpecs = [

apps/ai-game-creator-shell/scripts/build-macos-ci.mjs

@@ -0,0 +1,113 @@
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { resolveReleaseContext, runTauriBuild } from './build-release.mjs';
+
+const appRoot = fileURLToPath(new URL('..', import.meta.url));
+const repoRoot = path.resolve(appRoot, '../..');
+assert.equal(process.platform, 'darwin', '只能在 macOS Agent 执行');
+assert.equal(
+  process.env.JENKINS_URL?.length > 0,
+  true,
+  '此入口仅用于 Jenkins 独立工作区',
+);
+assert.equal(
+  fs.realpathSync(process.env.WORKSPACE || '.'),
+  fs.realpathSync(repoRoot),
+  '必须在 Jenkins workspace 根目录执行',
+);
+const space = fs.statfsSync(repoRoot);
+assert.ok(
+  space.bavail * space.bsize >= 8 * 1024 ** 3,
+  '构建前至少需要 8 GiB 可用空间；禁止自动清理开发缓存',
+);
+
+// 本入口永不发布，不使用 Agent 用户可能持有的发布或 Apple 认证环境。
+for (const key of Object.keys(process.env)) {
+  if (/^(TAURI_SIGNING_|APPLE_|AGC_OSS_)/u.test(key)) delete process.env[key];
+}
+process.env.RUSTC_WRAPPER = '';
+process.env.CARGO_TARGET_DIR = path.join(appRoot, 'src-tauri/target');
+const context = resolveReleaseContext(['--target=universal-apple-darwin']);
+const args = [
+  '--target=universal-apple-darwin',
+  '--bundles',
+  'app',
+  '--ci',
+  '--no-sign',
+  '--config',
+  '{"bundle":{"createUpdaterArtifacts":false}}',
+];
+const command = (binary, argv, options = {}) =>
+  execFileSync(binary, argv, { cwd: repoRoot, stdio: 'inherit', ...options });
+runTauriBuild(args, context);
+const app = path.join(context.bundleRoot, 'macos/陶泥儿.app');
+for (const architecture of ['arm64', 'x86_64']) {
+  command(process.execPath, [
+    path.join(appRoot, 'scripts/check-macos-bundle.mjs'),
+    app,
+    architecture,
+    '--universal',
+  ]);
+}
+const version = JSON.parse(
+  fs.readFileSync(path.join(appRoot, 'package.json'), 'utf8'),
+).version;
+assert.match(version, /^\d+\.\d+\.\d+$/u);
+const artifacts = path.join(repoRoot, 'artifacts');
+// 只清理本 Job 的归档输出，不能把上次 DMG 当成本次成功产物。
+fs.rmSync(artifacts, { recursive: true, force: true });
+fs.mkdirSync(artifacts, { recursive: true });
+const dmg = path.join(artifacts, `陶泥儿_${version}_universal.dmg`);
+const stage = fs.mkdtempSync(path.join(os.tmpdir(), 'agc-ci-dmg-'));
+try {
+  command('ditto', [app, path.join(stage, '陶泥儿.app')]);
+  fs.symlinkSync('/Applications', path.join(stage, 'Applications'));
+  command('hdiutil', [
+    'create',
+    '-volname',
+    '陶泥儿',
+    '-srcfolder',
+    stage,
+    '-format',
+    'UDZO',
+    dmg,
+  ]);
+  command('hdiutil', ['verify', dmg]);
+} finally {
+  fs.rmSync(stage, { recursive: true, force: true });
+}
+const hash = createHash('sha256');
+for await (const chunk of fs.createReadStream(dmg)) hash.update(chunk);
+fs.writeFileSync(
+  `${dmg}.sha256`,
+  `${hash.digest('hex')}  ${path.basename(dmg)}\n`,
+);
+const commit = execFileSync('git', ['rev-parse', 'HEAD'], {
+  cwd: repoRoot,
+  encoding: 'utf8',
+}).trim();
+fs.writeFileSync(
+  path.join(artifacts, 'build-manifest.json'),
+  `${JSON.stringify(
+    {
+      version,
+      commit,
+      target: context.target,
+      channel: context.channel,
+      signed: false,
+      notarized: false,
+      uploaded: false,
+      smoke: ['arm64', 'x86_64'],
+      intelSmoke: process.arch === 'arm64' ? 'Rosetta' : 'native',
+    },
+    null,
+    2,
+  )}\n`,
+);
+console.log('[macOS CI] universal 包与校验文件已生成；未发布、未签名或公证');

apps/ai-game-creator-shell/scripts/build-release.mjs

@@ -42,16 +42,12 @@ function explicitBuildTarget(args) {
 }
 
 function validateReleaseTarget(target) {
-  if (target === 'universal-apple-darwin') {
-    throw new Error(
-      '内置 Codex 资源仅支持 macOS 单架构构建，请使用 aarch64-apple-darwin 或 x86_64-apple-darwin',
-    );
-  }
   if (
     ![
       'x86_64-pc-windows-msvc',
       'aarch64-apple-darwin',
       'x86_64-apple-darwin',
+      'universal-apple-darwin',
     ].includes(target)
   ) {
     throw new Error(`不支持的发布目标：${target}`);
@@ -105,7 +101,6 @@ export const agcReleasePathPatterns = [
   'packages/',
   'server-rs/crates/',
   'plugins/agc-cocos-editor/',
-  'plugins/agc-unity-editor/',
   'apps/desktop-shell/src-tauri/icons/',
   'package.json',
   'package-lock.json',
@@ -198,10 +193,12 @@ export function updateManifestUrl(channel = resolveReleaseChannel()) {
 }
 
 /**
- * 单架构产物只登记实际目标，不能把同一原生资源映射为另一架构。
+ * universal 主程序与双目录原生资源共用一个更新包；单架构只登记实际目标。
  */
 export function resolveManifestPlatformKeys(target = defaultTarget()) {
   validateReleaseTarget(target);
+  if (target === 'universal-apple-darwin')
+    return ['darwin-aarch64', 'darwin-x86_64'];
   if (target === 'aarch64-apple-darwin') return ['darwin-aarch64'];
   if (target === 'x86_64-apple-darwin') return ['darwin-x86_64'];
   if (target.includes('windows')) {
@@ -501,41 +498,6 @@ export function selectReleaseArtifact(files, target = defaultTarget()) {
   );
 }
 
-export function selectFirstInstallArtifact(
-  files,
-  { target, version, artifact },
-) {
-  validateReleaseTarget(target);
-  let selected;
-  if (target.includes('windows')) {
-    selected = artifact;
-    if (!selected?.endsWith('.exe')) {
-      throw new Error('Windows 首装包必须复用本次 NSIS .exe 更新包');
-    }
-  } else {
-    // Tauri DMG 文件名使用 aarch64 / x64，而 updater 的 Intel 平台键是 x86_64。
-    const architecture = target.startsWith('aarch64') ? 'aarch64' : 'x64';
-    const suffix = `_${version}_${architecture}.dmg`;
-    const candidates = files.filter((file) =>
-      path.basename(file).endsWith(suffix),
-    );
-    if (candidates.length !== 1) {
-      throw new Error(
-        `首装 DMG 必须唯一匹配本次版本 ${version} 和架构 ${architecture}，找到 ${candidates.length} 个`,
-      );
-    }
-    selected = candidates[0];
-  }
-  if (
-    !fs.existsSync(selected) ||
-    !fs.statSync(selected).isFile() ||
-    fs.statSync(selected).size === 0
-  ) {
-    throw new Error(`首装包不存在或为空：${selected}`);
-  }
-  return selected;
-}
-
 function readUpdaterSignature(artifactPath) {
   const signaturePath = `${artifactPath}.sig`;
   if (!fs.existsSync(signaturePath)) {
@@ -556,32 +518,23 @@ export function createUpdateManifest(
     publishedAt = new Date().toISOString(),
     notes = readReleaseNotes(),
     commit = readHeadCommit(),
-    downloadArtifact,
   } = {},
 ) {
   validateReleaseTarget(target);
   resolveReleaseChannel({ AGC_UPDATE_CHANNEL: channel }, target);
   const signature = readUpdaterSignature(artifactPath);
   const version = readPackageJson().version;
-  const firstInstallArtifact = selectFirstInstallArtifact(
-    downloadArtifact ? [downloadArtifact] : [],
-    { target, version, artifact: artifactPath },
-  );
   const fileName = path.basename(artifactPath);
   const url = `${ossBaseUrl()}/${channel}/${encodeURIComponent(version)}/${encodeURIComponent(fileName)}`;
-  const downloadUrl = `${ossBaseUrl()}/${channel}/${encodeURIComponent(version)}/${encodeURIComponent(path.basename(firstInstallArtifact))}`;
   const platforms = {};
-  const downloads = {};
   for (const key of resolveManifestPlatformKeys(target)) {
     platforms[key] = { signature, url };
-    downloads[key] = { url: downloadUrl };
   }
   return {
     version,
     ...(notes ? { notes } : {}),
     pub_date: publishedAt,
     platforms,
-    downloads,
     // 非标准字段：更新插件会忽略，发布脚本用它定位下一次自动更新摘要的起点。
     ...(commit ? { commit } : {}),
   };
@@ -720,16 +673,10 @@ export async function generateUpdateManifest(
   context = resolveReleaseContext(),
 ) {
   const { channel, target, bundleRoot } = context;
-  const files = listFiles(bundleRoot);
+  const artifact = selectReleaseArtifact(listFiles(bundleRoot), target);
-  const artifact = selectReleaseArtifact(files, target);
   if (!artifact) {
     throw new Error(`未找到可发布的 AGC 安装包：${bundleRoot}`);
   }
-  const downloadArtifact = selectFirstInstallArtifact(files, {
-    target,
-    version: readPackageJson().version,
-    artifact,
-  });
   const manualNotes = readReleaseNotes();
   const previousCommit = await resolvePreviousReleaseCommit(channel);
   const commits = collectReleaseCommits(previousCommit);
@@ -743,12 +690,7 @@ export async function generateUpdateManifest(
       `[ai-game-creator-shell] 未生成自动更新摘要（上一发布 commit=${previousCommit ?? '未知'}，客户端相关提交=${commits ? commits.length : '不可判定'}，最近提交=${recentCommits ? recentCommits.length : '不可判定'}）`,
     );
   }
-  const manifest = createUpdateManifest(artifact, {
+  const manifest = createUpdateManifest(artifact, { channel, target, notes });
-    channel,
-    target,
-    notes,
-    downloadArtifact,
-  });
   const manifestPath = path.join(bundleRoot, 'latest.json');
   fs.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
   const notesPath = path.join(bundleRoot, 'release-notes.txt');
@@ -773,7 +715,6 @@ export async function generateUpdateManifest(
     `[ai-game-creator-shell] 渠道 ${channel}：已生成 ${manifestPath}`,
   );
   console.log(`[ai-game-creator-shell] 安装包：${artifact}`);
-  console.log(`[ai-game-creator-shell] 首装包：${downloadArtifact}`);
   console.log(
     manualNotes
       ? '[ai-game-creator-shell] 更新摘要：使用 AGC_UPDATE_RELEASE_NOTES 手动文案'
@@ -790,7 +731,6 @@ export async function generateUpdateManifest(
   return {
     channel,
     artifact,
-    downloadArtifact,
     manifest,
     manifestPath,
     notes,

apps/ai-game-creator-shell/scripts/build-release.test.mjs

@@ -32,31 +32,19 @@ import {
   resolveReleaseContext,
   resolveRemoteHighWaterVersion,
   runTauriBuild,
-  selectFirstInstallArtifact,
   selectReleaseArtifact,
   updateManifestUrl,
 } from './build-release.mjs';
 
 const windowsTarget = 'x86_64-pc-windows-msvc';
 const universalTarget = 'universal-apple-darwin';
-const packageVersion = JSON.parse(
-  readFileSync(new URL('../package.json', import.meta.url), 'utf8'),
-).version;
 
-function createDmgFixture(root, target, version = packageVersion) {
+test('native sidecar builds accept universal and each macOS architecture', () => {
-  const architecture = target.startsWith('aarch64') ? 'aarch64' : 'x64';
+  for (const target of [
-  const dmg = path.join(root, `陶泥儿_${version}_${architecture}.dmg`);
+    universalTarget,
-  writeFileSync(dmg, 'first installation disk image');
+    'aarch64-apple-darwin',
-  return dmg;
+    'x86_64-apple-darwin',
-}
+  ]) {
-
-test('native sidecar builds reject universal targets and accept each macOS architecture', () => {
-  assert.throws(() => buildTauriBuildArguments([], universalTarget), /单架构/);
-  assert.throws(
-    () => buildTauriBuildArguments(['--target=universal-apple-darwin']),
-    /单架构/,
-  );
-  for (const target of ['aarch64-apple-darwin', 'x86_64-apple-darwin']) {
     assert.deepEqual(buildTauriBuildArguments([], target), [
       'build',
       '--target',
@@ -163,8 +151,11 @@ test('channel manifest URL and build-time endpoint follow the channel', () => {
   });
 });
 
-test('macOS manifests only advertise the architecture actually built', () => {
+test('macOS manifests advertise exactly the architectures actually built', () => {
-  assert.throws(() => resolveManifestPlatformKeys(universalTarget), /单架构/);
+  assert.deepEqual(resolveManifestPlatformKeys(universalTarget), [
+    'darwin-aarch64',
+    'darwin-x86_64',
+  ]);
   assert.deepEqual(resolveManifestPlatformKeys('aarch64-apple-darwin'), [
     'darwin-aarch64',
   ]);
@@ -208,7 +199,6 @@ test('release context resolves explicit targets before environment/default and f
     ['--target='],
     ['--target', '--no-bundle'],
     ['--target', windowsTarget, '--target=aarch64-apple-darwin'],
-    ['--target', universalTarget],
     ['--target', 'unknown'],
   ])
     assert.throws(() => resolveReleaseContext(args, {}));
@@ -265,13 +255,7 @@ test('explicit macOS target drives version lookup, Tauri endpoint, artifact and
                   ),
                   artifact,
                 );
-                const manifest = createUpdateManifest(artifact, {
+                const manifest = createUpdateManifest(artifact, context);
-                  ...context,
-                  downloadArtifact: createDmgFixture(
-                    path.dirname(artifact),
-                    context.target,
-                  ),
-                });
                 assert.deepEqual(Object.keys(manifest.platforms), [
                   'darwin-aarch64',
                 ]);
@@ -289,17 +273,15 @@ test('explicit macOS target drives version lookup, Tauri endpoint, artifact and
   assert.ok(seenContexts.every((context) => context === seenContexts[0]));
 });
 
-for (const target of ['aarch64-apple-darwin', 'x86_64-apple-darwin']) {
+test('real manifest writer uses the resolved bundle root and does not emit Windows artifacts', async () => {
-  test(`real manifest writer publishes the ${target} updater and first installer separately`, async () => {
   const root = mkdtempSync(path.join(os.tmpdir(), 'agc-mac-manifest-'));
   try {
     const artifact = path.join(root, '陶泥儿.app.tar.gz');
     writeFileSync(artifact, 'mac package');
     writeFileSync(`${artifact}.sig`, 'mac signature');
     writeFileSync(path.join(root, 'windows.exe'), 'wrong platform');
-      const downloadArtifact = createDmgFixture(root, target);
     const context = {
-        ...resolveReleaseContext([`--target=${target}`], {}),
+      ...resolveReleaseContext(['--target=x86_64-apple-darwin'], {}),
       bundleRoot: root,
     };
     const result = await withStubbedFetch(
@@ -310,97 +292,10 @@ for (const target of ['aarch64-apple-darwin', 'x86_64-apple-darwin']) {
       () => generateUpdateManifest(context),
     );
     assert.equal(result.artifact, artifact);
-      assert.equal(result.downloadArtifact, downloadArtifact);
     assert.equal(result.manifestPath, path.join(root, 'latest.json'));
     assert.equal(result.legacyManifestPath, null);
-      const key = target.startsWith('aarch64')
+    assert.deepEqual(Object.keys(result.manifest.platforms), ['darwin-x86_64']);
-        ? 'darwin-aarch64'
+    assert.match(result.manifest.platforms['darwin-x86_64'].url, /\/dev-mac\//);
-        : 'darwin-x86_64';
-      assert.deepEqual(Object.keys(result.manifest.platforms), [key]);
-      assert.deepEqual(Object.keys(result.manifest.downloads), [key]);
-      assert.match(
-        result.manifest.platforms[key].url,
-        /\/dev-mac\/.*\.app\.tar\.gz$/,
-      );
-      assert.equal(
-        decodeURIComponent(
-          new URL(result.manifest.downloads[key].url).pathname,
-        ),
-        `/agc/dev-mac/${packageVersion}/${path.basename(downloadArtifact)}`,
-      );
-      assert.deepEqual(
-        JSON.parse(readFileSync(result.manifestPath, 'utf8')),
-        result.manifest,
-      );
-    } finally {
-      rmSync(root, { recursive: true, force: true });
-    }
-  });
-}
-
-test('DMG selection ignores other versions and architectures but rejects missing, empty and ambiguous current packages', () => {
-  const root = mkdtempSync(path.join(os.tmpdir(), 'agc-dmg-selection-'));
-  try {
-    const target = 'aarch64-apple-darwin';
-    const options = {
-      target,
-      version: '2.3.4',
-      artifact: path.join(root, '陶泥儿.app.tar.gz'),
-    };
-    const oldVersion = createDmgFixture(root, target, '2.3.3');
-    const wrongArchitecture = createDmgFixture(
-      root,
-      'x86_64-apple-darwin',
-      '2.3.4',
-    );
-    assert.throws(() => selectFirstInstallArtifact([], options), /找到 0 个/u);
-    assert.throws(
-      () =>
-        selectFirstInstallArtifact([oldVersion, wrongArchitecture], options),
-      /找到 0 个/u,
-    );
-    const current = createDmgFixture(root, target, '2.3.4');
-    assert.equal(
-      selectFirstInstallArtifact(
-        [oldVersion, wrongArchitecture, current],
-        options,
-      ),
-      current,
-    );
-    writeFileSync(current, '');
-    assert.throws(
-      () => selectFirstInstallArtifact([current], options),
-      /不存在或为空/u,
-    );
-    writeFileSync(current, 'valid dmg');
-    const second = path.join(root, '另一包_2.3.4_aarch64.dmg');
-    writeFileSync(second, 'ambiguous dmg');
-    assert.throws(
-      () => selectFirstInstallArtifact([current, second], options),
-      /找到 2 个/u,
-    );
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test('manifest writer refuses to create latest when the current Mac DMG is missing', async () => {
-  const root = mkdtempSync(path.join(os.tmpdir(), 'agc-missing-dmg-'));
-  try {
-    const artifact = path.join(root, '陶泥儿.app.tar.gz');
-    writeFileSync(artifact, 'updater archive');
-    writeFileSync(`${artifact}.sig`, 'signature');
-    const context = {
-      ...resolveReleaseContext(['--target=aarch64-apple-darwin'], {}),
-      bundleRoot: root,
-    };
-    await assert.rejects(
-      () => generateUpdateManifest(context),
-      /首装 DMG 必须唯一匹配/u,
-    );
-    assert.throws(() => readFileSync(path.join(root, 'latest.json')), {
-      code: 'ENOENT',
-    });
   } finally {
     rmSync(root, { recursive: true, force: true });
   }
@@ -420,8 +315,8 @@ test('invalid target or mismatched channel fails before any release side effect'
     },
   };
   await assert.rejects(
-    () => buildRelease(['--target', universalTarget], sideEffects),
+    () => buildRelease(['--target', 'unknown'], sideEffects),
-    /单架构/,
+    /不支持的发布目标/,
   );
   await withEnv({ AGC_UPDATE_CHANNEL: 'dev-win' }, () =>
     assert.rejects(
@@ -432,6 +327,26 @@ test('invalid target or mismatched channel fails before any release side effect'
   assert.equal(touched, false);
 });
 
+test('universal uses the Mac channel and the same signed artifact for both architectures', () => {
+  const context = resolveReleaseContext(['--target', universalTarget], {
+    AGC_BUILD_TARGET: windowsTarget,
+  });
+  assert.equal(context.channel, 'dev-mac');
+  assert.ok(context.bundleRoot.includes(universalTarget));
+  withSignedArtifact('陶泥儿.app.tar.gz', (artifact) => {
+    const manifest = createUpdateManifest(artifact, context);
+    assert.deepEqual(Object.keys(manifest.platforms), [
+      'darwin-aarch64',
+      'darwin-x86_64',
+    ]);
+    assert.deepEqual(
+      manifest.platforms['darwin-aarch64'],
+      manifest.platforms['darwin-x86_64'],
+    );
+    assert.match(manifest.platforms['darwin-aarch64'].url, /\/dev-mac\//);
+  });
+});
+
 test('Windows remains the default and explicit Windows overrides macOS environment', () => {
   const files = ['/tmp/mac.app.tar.gz', '/tmp/windows.exe', '/tmp/mac.dmg'];
   for (const context of [
@@ -450,11 +365,7 @@ test('Windows remains the default and explicit Windows overrides macOS environme
       context,
       {
         spawn: (_binary, command) => {
-          assert.ok(
+          assert.ok(command.includes('--features=cocos-editor-execute'));
-            command.includes(
-              '--features=cocos-editor-execute,unity-editor-execute',
-            ),
-          );
           assert.ok(command.includes('user-config.json'));
           const configIndex = command.lastIndexOf('--config');
           const config = JSON.parse(
@@ -499,9 +410,6 @@ test('channel manifest carries version, platform keys and signature', () => {
       assert.equal(manifest.notes, '修复与改进');
       assert.equal(manifest.pub_date, '2026-09-17T00:00:00.000Z');
       assert.deepEqual(Object.keys(manifest.platforms), ['windows-x86_64']);
-      assert.deepEqual(manifest.downloads, {
-        'windows-x86_64': { url: manifest.platforms['windows-x86_64'].url },
-      });
       assert.equal(
         manifest.platforms['windows-x86_64'].signature,
         'signature-content',
@@ -682,18 +590,18 @@ test('recent commit fallback marks that entries may repeat the previous release'
   }
 });
 
-test('release entry forwards the built artifacts and dry-run mode to the uploader', () => {
+test('release upload forces overwrite for artifact, signature and channel pointers', () => {
   const source = readFileSync(
     new URL('./release-upload.mjs', import.meta.url),
     'utf8',
   );
-  assert.match(
+  assert.equal(
-    source,
+    (source.match(/runOssutil\(\[\s*'cp',\s*'--force'/gu) ?? []).length,
-    /const release = await buildRelease\(process\.argv\.slice\(2\)\)/u,
+    4,
   );
-  assert.match(source, /uploadReleaseArtifacts\(release, \{/u);
+  assert.match(source, /agc\/\$\{channel\}\/latest\.json/u);
-  assert.match(source, /const dryRun = readReleaseDryRun\(\);/u);
+  assert.match(source, /agc\/latest\.json/u);
-  assert.ok(source.includes('\n  dryRun,\n'));
+  assert.match(source, /await buildRelease\(process\.argv\.slice\(2\)\)/u);
 });
 
 test('release notes list client commits with short sha and bound their size', () => {

apps/ai-game-creator-shell/scripts/cargo-features.mjs

@@ -19,6 +19,6 @@ export function withDefaultCargoFeatures(argv, features) {
 
 export function defaultEditorFeatures(target) {
   return target === 'win32' || target.includes('windows')
-    ? ['cocos-editor-execute', 'unity-editor-execute']
+    ? ['cocos-editor-execute']
     : [];
 }

apps/ai-game-creator-shell/scripts/cargo-features.test.mjs

@@ -9,7 +9,7 @@ test('Windows release includes the same editor feature as development', () => {
     buildTauriBuildArguments([], 'x86_64-pc-windows-msvc', 'win32'),
     [
       'build',
-      '--features=cocos-editor-execute,unity-editor-execute',
+      '--features=cocos-editor-execute',
       '--target',
       'x86_64-pc-windows-msvc',
     ],

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

@@ -143,6 +143,7 @@ const allowedUncalledTauriCommands = [
   'reload_agc_plugin',
   'call_agc_plugin',
   'read_agc_plugin_panel',
+  'set_agc_plugin_project_path',
   'set_agc_plugin_enabled',
 ];
 const sourceExtensions = new Set([
@@ -1366,7 +1367,8 @@ if (windowsTauriConfig.bundle?.useLocalToolsDir !== true) {
 assert.deepEqual(
   macosTauriConfig.bundle?.resources,
   Object.fromEntries([
-    ...[
+    ...['darwin-arm64', 'darwin-x64'].flatMap((arch) =>
+      [
         'bin/codex',
         'bin/codex-code-mode-host',
         'codex-path/rg',
@@ -1375,9 +1377,10 @@ assert.deepEqual(
         'NOTICE.md',
         'manifest.json',
       ].map((file) => [
-      `resources/codex/mac-native/${file}`,
+        `resources/codex/mac-native/${arch}/${file}`,
-      `coding-agent/mac-native/${file}`,
+        `coding-agent/mac-native/${arch}/${file}`,
       ]),
+    ),
     ['resources/plugins', 'plugins'],
   ]),
   'macOS must bundle the complete native Codex layout and plugin workspace',

apps/ai-game-creator-shell/scripts/check-macos-bundle.mjs

@@ -8,6 +8,13 @@ import path from 'node:path';
 // 只操作临时复制品；不启动 GUI、不读取开发机凭据、不访问 Provider。
 assert.equal(process.platform, 'darwin', '此验证必须在 macOS 执行');
 const source = path.resolve(process.argv[2] || '');
+const architecture =
+  process.argv[3] || (process.arch === 'arm64' ? 'arm64' : 'x86_64');
+assert.ok(
+  ['arm64', 'x86_64'].includes(architecture),
+  '架构只接受 arm64 / x86_64',
+);
+const requireUniversal = process.argv.includes('--universal');
 assert.ok(
   source.endsWith('.app') && fs.statSync(source).isDirectory(),
   '请传入 .app 绝对路径',
@@ -31,13 +38,19 @@ const env = {
 };
 
 function run(command, args) {
-  const result = spawnSync(command, args, {
+  // 只强制被测应用切片；本机 Xcode 检查工具可能仅提供宿主架构。
+  const useSlice = command.startsWith(`${app}${path.sep}`);
+  const result = spawnSync(
+    useSlice ? '/usr/bin/arch' : command,
+    useSlice ? [`-${architecture}`, command, ...args] : args,
+    {
       cwd: root,
       env,
       encoding: 'utf8',
-    timeout: 30_000,
+      timeout: 120_000,
       maxBuffer: 1024 * 1024,
-  });
+    },
+  );
   assert.ifError(result.error);
   return result;
 }
@@ -60,7 +73,7 @@ async function handshake(executable) {
     await new Promise((resolve, reject) => {
       const timer = setTimeout(
         () => reject(new Error('app-server 初始化超时')),
-        15_000,
+        120_000,
       );
       const finish = (error) => {
         clearTimeout(timer);
@@ -129,20 +142,39 @@ async function handshake(executable) {
 try {
   fs.cpSync(source, app, { recursive: true });
   const resources = path.join(app, 'Contents/Resources');
-  const bundle = path.join(resources, 'coding-agent/mac-native');
+  const platform = architecture === 'arm64' ? 'darwin-arm64' : 'darwin-x64';
+  const bundle = path.join(resources, 'coding-agent/mac-native', platform);
   const executable = path.join(bundle, 'bin/codex');
   const main = path.join(
     app,
     'Contents/MacOS/genarrative-ai-game-creator-shell',
   );
+  const mainArchitectures = run('/usr/bin/lipo', ['-archs', main]);
+  assert.equal(mainArchitectures.status, 0);
+  assert.ok(mainArchitectures.stdout.split(/\s+/).includes(architecture));
+  if (requireUniversal) {
+    assert.deepEqual(mainArchitectures.stdout.trim().split(/\s+/).sort(), [
+      'arm64',
+      'x86_64',
+    ]);
+    for (const platform of ['darwin-arm64', 'darwin-x64']) {
+      assert.ok(
+        fs.existsSync(
+          path.join(
+            resources,
+            'coding-agent/mac-native',
+            platform,
+            'manifest.json',
+          ),
+        ),
+      );
+    }
+  }
   const manifest = JSON.parse(
     fs.readFileSync(path.join(bundle, 'manifest.json'), 'utf8'),
   );
   assert.equal(manifest.schemaVersion, 'genarrative-codex-sidecar.v2');
-  assert.equal(
+  assert.equal(manifest.platform, platform);
-    manifest.platform,
-    process.arch === 'arm64' ? 'darwin-arm64' : 'darwin-x64',
-  );
   assert.equal(manifest.version, 'codex-cli 0.147.0');
   const components = [
     'bin/codex',
@@ -159,11 +191,7 @@ try {
       fs.accessSync(file, fs.constants.X_OK);
       const arch = run('/usr/bin/lipo', ['-archs', file]);
       assert.equal(arch.status, 0, component);
-      assert.equal(
+      assert.equal(arch.stdout.trim(), architecture, component);
-        arch.stdout.trim(),
-        process.arch === 'arm64' ? 'arm64' : 'x86_64',
-        component,
-      );
     }
   }
   assert.ok(fs.existsSync(path.join(bundle, 'NOTICE.md')));
@@ -212,7 +240,7 @@ try {
   assert.notEqual(broken.status, 0);
   assert.match(`${broken.stdout}\n${broken.stderr}`, /Codex CLI 未安装/);
   console.log(
-    'PASS: 隔离安装包资源、架构、摘要、权限、正式 Codex 查找、app-server 握手及缺组件拒绝',
+    `PASS (${architecture}): 隔离安装包资源、架构、摘要、权限、正式 Codex 查找、app-server 握手及缺组件拒绝`,
   );
   console.log(
     '未验证：GUI、真实登录/Provider 对话、Cocos macOS 原生桥接；插件 Node 仍为外部前提',

apps/ai-game-creator-shell/scripts/deterministic-lane-defense-provider.mjs

@@ -290,7 +290,7 @@ function deterministicArtManifest(
           {
             id: 'garden-guardians-spritesheet',
             path: 'assets/art-spritesheet.png',
-            kind: 'icon-spritesheet',
+            kind: 'art-spritesheet',
             usage: ['defenders', 'enemies', 'battlefield-ui'],
             source: 'canvas',
             status: 'ready',
@@ -710,7 +710,7 @@ function canvasAssetCall(agentId) {
       outputPath: 'assets/ui-prototype.png',
       aspectRatio: '16:9',
       imageSize: '2K',
-      assetKind: 'ui-design',
+      assetKind: 'ui-prototype',
       assetLabel: '游戏横屏界面原型图',
       replaceExisting: false,
     });
@@ -721,7 +721,7 @@ function canvasAssetCall(agentId) {
     outputPath: 'assets/art-spritesheet.png',
     aspectRatio: '1:1',
     imageSize: '1K',
-    assetKind: 'icon-spritesheet',
+    assetKind: 'art-spritesheet',
     assetLabel: '游戏首版核心美术素材',
     replaceExisting: false,
     sliceMode: 'connected-components',
@@ -830,12 +830,12 @@ function missingGeneratedVisualAssetObservation(context, agentId) {
     },
     'design-foundation': {
       path: 'assets/ui-prototype.png',
-      kind: 'ui-design',
+      kind: 'ui-prototype',
       summary: '策划界面原型图尚未按正式视觉流程生成并登记，不能完成任务',
     },
     'art-asset-plan': {
       path: 'assets/art-spritesheet.png',
-      kind: 'icon-spritesheet',
+      kind: 'art-spritesheet',
       summary: '首版美术素材图尚未按正式视觉流程生成并登记，不能完成任务',
     },
   }[agentId];
@@ -2667,7 +2667,7 @@ function createDeterministicCanvasFixture(apiKey) {
           asset: {
             assetId: `asset-${sliceImageId}`,
             assetObjectId: sliceAssetObjectId,
-            assetKind: 'icon',
+            assetKind: 'art-spritesheet-slice',
             projectId,
             taskId,
           },
@@ -2707,7 +2707,7 @@ function createDeterministicCanvasFixture(apiKey) {
         spritesheetAsset: {
           assetId: `asset-${imageId}`,
           assetObjectId,
-          assetKind: 'icon-spritesheet',
+          assetKind: 'art-spritesheet',
           projectId,
           taskId,
         },
@@ -2749,7 +2749,7 @@ function createDeterministicCanvasFixture(apiKey) {
       const assetObjectId = `asset-object-${imageId}`;
       const resourceId = `resource-${imageId}`;
       const assetKind =
-        typeof body?.assetKind === 'string' ? body.assetKind : 'image';
+        typeof body?.assetKind === 'string' ? body.assetKind : 'game-art';
       images.set(imageId, {
         ...image,
         objectKey,

apps/ai-game-creator-shell/scripts/prepare-macos-codex.mjs

@@ -0,0 +1,134 @@
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const appRoot = fileURLToPath(new URL('..', import.meta.url));
+const repoRoot = path.resolve(appRoot, '../..');
+const platforms = {
+  arm64: 'aarch64-apple-darwin',
+  x64: 'x86_64-apple-darwin',
+};
+
+export function lockedMacPackage(lock, arch, version) {
+  assert.ok(Object.hasOwn(platforms, arch), '未知 macOS 架构');
+  const alias = `@openai/codex-darwin-${arch}`;
+  const entry = lock.packages?.[`node_modules/${alias}`];
+  assert.equal(
+    entry?.version,
+    `${version}-darwin-${arch}`,
+    '原生依赖必须与应用锁定版本一致',
+  );
+  assert.deepEqual(entry.os, ['darwin']);
+  assert.deepEqual(entry.cpu, [arch]);
+  const url = new URL(entry.resolved);
+  assert.equal(url.protocol, 'https:');
+  assert.equal(
+    url.hostname,
+    'registry.npmjs.org',
+    '只下载锁定的官方 npm 原生包',
+  );
+  assert.equal(url.username + url.password + url.search + url.hash, '');
+  assert.match(entry.integrity, /^sha512-[A-Za-z0-9+/]+={0,2}$/);
+  return { alias, target: platforms[arch], ...entry };
+}
+
+export function verifyPackageIntegrity(bytes, expected) {
+  const actual = `sha512-${createHash('sha512').update(bytes).digest('base64')}`;
+  assert.equal(actual, expected, 'Codex 下载包 lockfile integrity 不匹配');
+}
+
+export function validateArchiveListing(listing) {
+  const files = listing.trim().split(/\r?\n/u);
+  assert.ok(files.length > 0);
+  for (const file of files) {
+    assert.ok(file.startsWith('package/'), '原生包必须只有 package 根目录');
+    assert.ok(
+      !file.split('/').includes('..') && !file.includes('\\'),
+      '压缩包路径不安全',
+    );
+  }
+}
+
+export async function prepareMacosCodex() {
+  assert.equal(process.platform, 'darwin', '该入口仅用于 macOS 构建机');
+  const lock = JSON.parse(
+    fs.readFileSync(path.join(repoRoot, 'package-lock.json'), 'utf8'),
+  );
+  const app = JSON.parse(
+    fs.readFileSync(path.join(appRoot, 'package.json'), 'utf8'),
+  );
+  const version = app.devDependencies['@openai/codex'];
+  assert.match(version, /^\d+\.\d+\.\d+$/u, 'Codex 必须锁定精确版本');
+  const cache = path.join(appRoot, 'src-tauri/target/.macos-native-cache');
+  fs.mkdirSync(cache, { recursive: true });
+  for (const arch of Object.keys(platforms)) {
+    const entry = lockedMacPackage(lock, arch, version);
+    const archive = path.join(cache, `codex-${entry.version}.tgz`);
+    if (!fs.existsSync(archive)) {
+      const response = await fetch(entry.resolved, {
+        signal: AbortSignal.timeout(300_000),
+      });
+      assert.ok(response.ok, `原生包下载失败 HTTP ${response.status}`);
+      const bytes = Buffer.from(await response.arrayBuffer());
+      verifyPackageIntegrity(bytes, entry.integrity);
+      const partial = `${archive}.${process.pid}.tmp`;
+      fs.writeFileSync(partial, bytes);
+      fs.renameSync(partial, archive);
+    }
+    verifyPackageIntegrity(fs.readFileSync(archive), entry.integrity);
+    validateArchiveListing(
+      execFileSync('tar', ['-tzf', archive], { encoding: 'utf8' }),
+    );
+    // 拒绝链接、设备及其它特殊条目，不能让 tar 在包目录之外写入。
+    const entries = execFileSync('tar', ['-tvzf', archive], {
+      encoding: 'utf8',
+    });
+    assert.ok(
+      entries
+        .trim()
+        .split(/\r?\n/u)
+        .every((line) => /^[-d]/u.test(line)),
+      '原生包禁止链接或特殊文件',
+    );
+    const parent = path.join(repoRoot, 'node_modules/@openai');
+    fs.mkdirSync(parent, { recursive: true });
+    const stage = fs.mkdtempSync(path.join(parent, '.mac-native-'));
+    try {
+      execFileSync(
+        'tar',
+        ['-xzf', archive, '-C', stage, '--strip-components=1'],
+        { stdio: 'pipe' },
+      );
+      const metadata = JSON.parse(
+        fs.readFileSync(
+          path.join(stage, 'vendor', entry.target, 'codex-package.json'),
+          'utf8',
+        ),
+      );
+      assert.equal(metadata.version, version);
+      assert.equal(metadata.target, entry.target);
+      assert.equal(metadata.entrypoint, 'bin/codex');
+      const destination = path.join(repoRoot, 'node_modules', entry.alias);
+      assert.ok(
+        !fs.existsSync(destination) ||
+          !fs.lstatSync(destination).isSymbolicLink(),
+        '拒绝覆盖链接依赖',
+      );
+      fs.rmSync(destination, { recursive: true, force: true });
+      fs.renameSync(stage, destination);
+    } finally {
+      fs.rmSync(stage, { recursive: true, force: true });
+    }
+    console.log(`[macOS Codex] ${entry.version}: lockfile integrity 已验证`);
+  }
+}
+
+if (
+  process.argv[1] &&
+  path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)
+) {
+  await prepareMacosCodex();
+}

apps/ai-game-creator-shell/scripts/prepare-macos-codex.test.mjs

@@ -0,0 +1,85 @@
+import assert from 'node:assert/strict';
+import { createHash } from 'node:crypto';
+import fs from 'node:fs';
+import { test } from 'node:test';
+
+import {
+  lockedMacPackage,
+  validateArchiveListing,
+  verifyPackageIntegrity,
+} from './prepare-macos-codex.mjs';
+
+const lock = JSON.parse(
+  fs.readFileSync(new URL('../../../package-lock.json', import.meta.url)),
+);
+const version = JSON.parse(
+  fs.readFileSync(new URL('../package.json', import.meta.url)),
+).devDependencies['@openai/codex'];
+
+test('both macOS dependencies resolve from the lockfile without floating versions', () => {
+  assert.equal(
+    lockedMacPackage(lock, 'arm64', version).target,
+    'aarch64-apple-darwin',
+  );
+  assert.equal(
+    lockedMacPackage(lock, 'x64', version).target,
+    'x86_64-apple-darwin',
+  );
+  assert.throws(() => lockedMacPackage(lock, 'other', version));
+  assert.throws(() => lockedMacPackage(lock, 'x64', '0.0.0'));
+});
+
+test('native package integrity rejects tampering', () => {
+  const bytes = Buffer.from('pinned package');
+  const integrity = `sha512-${createHash('sha512').update(bytes).digest('base64')}`;
+  verifyPackageIntegrity(bytes, integrity);
+  assert.throws(() =>
+    verifyPackageIntegrity(Buffer.from('modified'), integrity),
+  );
+});
+
+test('archive traversal and non-package entries fail closed', () => {
+  validateArchiveListing(
+    'package/package.json\npackage/vendor/target/bin/codex\n',
+  );
+  for (const listing of [
+    '',
+    '/tmp/payload',
+    'package/../private',
+    'other/file',
+    'package/..\\file',
+  ]) {
+    assert.throws(() => validateArchiveListing(listing));
+  }
+});
+
+test('CI pipeline is manual archive-only and does not reuse a developer workspace', () => {
+  const pipeline = fs.readFileSync(
+    new URL(
+      '../../../jenkins/Jenkinsfile.ai-game-creator-shell-macos-build',
+      import.meta.url,
+    ),
+    'utf8',
+  );
+  for (const required of [
+    'genarrative-agc-macos',
+    'disableConcurrentBuilds()',
+    '$AGC_AGENT_ROOT',
+    'StrictHostKeyChecking=yes',
+    'git merge-base --is-ancestor',
+    'allowEmptyArchive: false',
+  ]) {
+    assert.ok(pipeline.includes(required), required);
+  }
+  for (const forbidden of [
+    'triggers {',
+    'cron(',
+    'pollSCM(',
+    'release:upload',
+    'AgcUpdaterSigningKey',
+    'AliyunAccessKeyId',
+    'git clean -fdx',
+  ]) {
+    assert.ok(!pipeline.includes(forbidden), forbidden);
+  }
+});

apps/ai-game-creator-shell/scripts/release-oss.mjs

@@ -1,6 +1,3 @@
-import { spawnSync } from 'node:child_process';
-import path from 'node:path';
-
 /**
  * 发布上传的 OSS 命令行整理：把 ossutil 参数与凭据整理成可执行或可打印的形式，
  * 便于在 dry-run 下核对将要执行的上传，同时保证任何输出都不回显凭据明文。
@@ -28,89 +25,3 @@ export function formatOssutilCommand({ binary, args, endpoint, credentials }) {
   }
   return parts.map(quoteArgument).join(' ');
 }
-
-export function createReleaseUploadPlan(
-  {
-    artifact,
-    downloadArtifact,
-    channel,
-    manifest,
-    manifestPath,
-    legacyManifestPath,
-  },
-  bucket,
-) {
-  if (!artifact || !downloadArtifact || !manifestPath || !manifest?.version) {
-    throw new Error('发布结果缺少更新包、首装包或清单');
-  }
-  const prefix = `oss://${bucket}/agc/${channel}`;
-  const artifacts = [
-    ...new Set(
-      [artifact, `${artifact}.sig`, downloadArtifact].map((file) =>
-        path.resolve(file),
-      ),
-    ),
-  ];
-  const plan = artifacts.map((source) => ({
-    source,
-    destination: `${prefix}/${manifest.version}/${path.basename(source)}`,
-  }));
-  plan.push({ source: manifestPath, destination: `${prefix}/latest.json` });
-  if (legacyManifestPath) {
-    plan.push({
-      source: legacyManifestPath,
-      destination: `oss://${bucket}/agc/latest.json`,
-    });
-  }
-  return plan;
-}
-
-export function uploadReleaseArtifacts(
-  release,
-  {
-    bucket,
-    endpoint,
-    binary = 'ossutil',
-    accessKeyId,
-    accessKeySecret,
-    dryRun = false,
-    spawn = spawnSync,
-    log = console.log,
-  },
-) {
-  if (Boolean(accessKeyId) !== Boolean(accessKeySecret)) {
-    throw new Error('OSS AccessKey ID 和 Secret 必须同时提供');
-  }
-  const plan = createReleaseUploadPlan(release, bucket);
-  for (const { source, destination } of plan) {
-    // 全部安装对象成功后才执行 latest 指针；失败立即终止，不发布悬空链接。
-    const args = ['cp', '--force', source, destination];
-    if (dryRun) {
-      log(
-        `[dry-run] ${formatOssutilCommand({ binary, args, endpoint, credentials: Boolean(accessKeyId) })}`,
-      );
-      continue;
-    }
-    const credentials = accessKeyId
-      ? ['--access-key-id', accessKeyId, '--access-key-secret', accessKeySecret]
-      : [];
-    const result = spawn(
-      binary,
-      [...args, '--endpoint', endpoint, ...credentials],
-      {
-        stdio: 'inherit',
-        shell: false,
-      },
-    );
-    if (result.error)
-      throw new Error(`无法执行 ${binary}，请先安装并配置 ossutil`);
-    if (result.status !== 0) {
-      throw new Error(
-        `OSS 上传失败（退出码 ${result.status ?? 1}）：${destination}`,
-      );
-    }
-    log(`[ai-game-creator-shell] 已上传 ${destination}`);
-  }
-  if (dryRun) log('[ai-game-creator-shell] dry-run：未写入任何 OSS 对象');
-  return plan;
-}

apps/ai-game-creator-shell/scripts/release-oss.test.mjs

@@ -1,15 +1,8 @@
 import assert from 'node:assert/strict';
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { test } from 'node:test';
 
-import {
+import { formatOssutilCommand, readReleaseDryRun } from './release-oss.mjs';
-  createReleaseUploadPlan,
-  formatOssutilCommand,
-  readReleaseDryRun,
-  uploadReleaseArtifacts,
-} from './release-oss.mjs';
 
 test('dry run only accepts explicit truthy values', () => {
   assert.equal(readReleaseDryRun({}), false);
@@ -40,158 +33,12 @@ test('printed upload command keeps arguments and hides credentials', () => {
   );
 });
 
-function withReleaseFixture(channel, architecture, run) {
+test('uploader gates every ossutil call behind the dry run switch', () => {
-  const root = mkdtempSync(path.join(os.tmpdir(), 'agc-upload-plan-'));
+  const source = readFileSync(
-  try {
+    new URL('./release-upload.mjs', import.meta.url),
-    const artifact = path.join(
+    'utf8',
-      root,
-      channel === 'dev-win'
-        ? '陶泥儿_1.2.3_x64-setup.exe'
-        : '陶泥儿.app.tar.gz',
   );
-    const downloadArtifact =
+  assert.match(source, /const dryRun = readReleaseDryRun\(\);/u);
-      channel === 'dev-win'
+  assert.match(source, /if \(dryRun\) \{/u);
-        ? artifact
+  assert.match(source, /dry-run：未写入任何 OSS 对象/u);
-        : path.join(root, `陶泥儿_1.2.3_${architecture}.dmg`);
-    const manifestPath = path.join(root, 'latest.json');
-    const legacyManifestPath =
-      channel === 'dev-win' ? path.join(root, 'legacy-latest.json') : null;
-    for (const file of [
-      artifact,
-      `${artifact}.sig`,
-      downloadArtifact,
-      manifestPath,
-      legacyManifestPath,
-    ].filter(Boolean)) {
-      writeFileSync(file, 'fixture');
-    }
-    return run({
-      artifact,
-      downloadArtifact,
-      channel,
-      manifest: { version: '1.2.3' },
-      manifestPath,
-      legacyManifestPath,
-    });
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-}
-
-const uploadOptions = {
-  bucket: 'agc-dev',
-  endpoint: 'oss-rg-china-mainland.aliyuncs.com',
-  log: () => {},
-};
-
-for (const architecture of ['aarch64', 'x64']) {
-  test(`uploads every ${architecture} Mac object before the channel pointer`, () => {
-    withReleaseFixture('dev-mac', architecture, (release) => {
-      const calls = [];
-      uploadReleaseArtifacts(release, {
-        ...uploadOptions,
-        spawn: (binary, args, options) => {
-          assert.equal(binary, 'ossutil');
-          assert.equal(options.shell, false);
-          assert.deepEqual(args.slice(0, 2), ['cp', '--force']);
-          calls.push({ source: args[2], destination: args[3] });
-          return { status: 0 };
-        },
-      });
-      assert.deepEqual(
-        calls.map(({ source }) => source),
-        [
-          release.artifact,
-          `${release.artifact}.sig`,
-          release.downloadArtifact,
-          release.manifestPath,
-        ],
-      );
-      assert.equal(
-        calls[2].destination,
-        `oss://agc-dev/agc/dev-mac/1.2.3/陶泥儿_1.2.3_${architecture}.dmg`,
-      );
-      assert.equal(
-        calls[3].destination,
-        'oss://agc-dev/agc/dev-mac/latest.json',
-      );
-    });
-  });
-}
-
-test('Windows uploads the shared installer once and publishes migration metadata last', () => {
-  withReleaseFixture('dev-win', 'x64', (release) => {
-    const plan = createReleaseUploadPlan(release, 'agc-dev');
-    assert.deepEqual(
-      plan.map(({ source }) => source),
-      [
-        release.artifact,
-        `${release.artifact}.sig`,
-        release.manifestPath,
-        release.legacyManifestPath,
-      ],
-    );
-    assert.equal(plan.at(-1).destination, 'oss://agc-dev/agc/latest.json');
-    const calls = [];
-    uploadReleaseArtifacts(release, {
-      ...uploadOptions,
-      spawn: (_binary, args) => {
-        assert.deepEqual(args.slice(0, 2), ['cp', '--force']);
-        calls.push(args[3]);
-        return { status: 0 };
-      },
-    });
-    assert.deepEqual(
-      calls,
-      plan.map(({ destination }) => destination),
-    );
-  });
-});
-
-for (const failedArtifactIndex of [0, 1, 2]) {
-  test(`failed Mac object ${failedArtifactIndex} prevents both later objects and latest publication`, () => {
-    withReleaseFixture('dev-mac', 'aarch64', (release) => {
-      const destinations = [];
-      assert.throws(
-        () =>
-          uploadReleaseArtifacts(release, {
-            ...uploadOptions,
-            spawn: (_binary, args) => {
-              destinations.push(args[3]);
-              return {
-                status: destinations.length - 1 === failedArtifactIndex ? 1 : 0,
-              };
-            },
-          }),
-        /OSS 上传失败/u,
-      );
-      assert.equal(destinations.length, failedArtifactIndex + 1);
-      assert.ok(
-        destinations.every(
-          (destination) => !destination.endsWith('/latest.json'),
-        ),
-      );
-    });
-  });
-}
-
-test('dry run prints the complete plan without spawning uploads or exposing credentials', () => {
-  withReleaseFixture('dev-mac', 'aarch64', (release) => {
-    const output = [];
-    uploadReleaseArtifacts(release, {
-      ...uploadOptions,
-      dryRun: true,
-      accessKeyId: 'fixture-id',
-      accessKeySecret: 'fixture-secret',
-      spawn: () => assert.fail('dry run must never execute ossutil'),
-      log: (line) => output.push(line),
-    });
-    assert.equal(
-      output.filter((line) => line.startsWith('[dry-run]')).length,
-      4,
-    );
-    assert.match(output.join('\n'), /\.dmg/u);
-    assert.match(output.at(-1), /未写入任何 OSS 对象/u);
-    assert.doesNotMatch(output.join('\n'), /fixture-id|fixture-secret|已上传/u);
-  });
 });

apps/ai-game-creator-shell/scripts/release-upload.mjs

@@ -1,4 +1,7 @@
-import { readReleaseDryRun, uploadReleaseArtifacts } from './release-oss.mjs';
+import { spawnSync } from 'node:child_process';
+import path from 'node:path';
+
+import { formatOssutilCommand, readReleaseDryRun } from './release-oss.mjs';
 
 const bucket = process.env.AGC_OSS_BUCKET?.trim() || 'agc-dev';
 const endpoint =
@@ -11,12 +14,76 @@ const dryRun = readReleaseDryRun();
 
 const { buildRelease } = await import('./build-release.mjs');
 
-const release = await buildRelease(process.argv.slice(2));
+function runOssutil(args) {
-uploadReleaseArtifacts(release, {
+  const binary = process.env.OSSUTIL_BIN?.trim() || 'ossutil';
-  bucket,
+  const accessKeyId = process.env.AGC_OSS_ACCESS_KEY_ID?.trim();
+  const accessKeySecret = process.env.AGC_OSS_ACCESS_KEY_SECRET;
+  if (Boolean(accessKeyId) !== Boolean(accessKeySecret)) {
+    throw new Error('OSS AccessKey ID 和 Secret 必须同时提供');
+  }
+  if (dryRun) {
+    // 演练：只打印将要执行的上传，凭据以占位符呈现，不写入 OSS。
+    console.log(
+      `[dry-run] ${formatOssutilCommand({
+        binary,
+        args,
         endpoint,
-  binary: process.env.OSSUTIL_BIN?.trim() || 'ossutil',
+        credentials: Boolean(accessKeyId),
-  accessKeyId: process.env.AGC_OSS_ACCESS_KEY_ID?.trim(),
+      })}`,
-  accessKeySecret: process.env.AGC_OSS_ACCESS_KEY_SECRET,
+    );
-  dryRun,
+    return;
-});
+  }
+  const credentialArgs = accessKeyId
+    ? ['--access-key-id', accessKeyId, '--access-key-secret', accessKeySecret]
+    : [];
+  const result = spawnSync(
+    binary,
+    [...args, '--endpoint', endpoint, ...credentialArgs],
+    {
+      stdio: 'inherit',
+      shell: false,
+    },
+  );
+  if (result.error) {
+    throw new Error(`无法执行 ${binary}，请先安装并配置 ossutil`);
+  }
+  if (result.status !== 0) process.exit(result.status ?? 1);
+}
+
+const { artifact, channel, legacyManifestPath, manifest, manifestPath } =
+  await buildRelease(process.argv.slice(2));
+const artifactKey = `agc/${channel}/${manifest.version}/${path.basename(artifact)}`;
+// Jenkins/ossutil 默认会在目标对象已存在时交互询问并按默认值跳过；
+// 发布清单是固定的 latest 指针，必须显式覆盖，否则流水线会误报成功但远端仍保留旧版本。
+runOssutil(['cp', '--force', artifact, `oss://${bucket}/${artifactKey}`]);
+runOssutil([
+  'cp',
+  '--force',
+  `${artifact}.sig`,
+  `oss://${bucket}/${artifactKey}.sig`,
+]);
+runOssutil([
+  'cp',
+  '--force',
+  manifestPath,
+  `oss://${bucket}/agc/${channel}/latest.json`,
+]);
+console.log(`[ai-game-creator-shell] 已上传 oss://${bucket}/${artifactKey}`);
+console.log(
+  `[ai-game-creator-shell] 已上传 oss://${bucket}/agc/${channel}/latest.json`,
+);
+if (legacyManifestPath) {
+  // 迁移桥：让仍走旧 sha256 清单的已发布客户端升级到新协议，一个版本周期后删除。
+  runOssutil([
+    'cp',
+    '--force',
+    legacyManifestPath,
+    `oss://${bucket}/agc/latest.json`,
+  ]);
+  console.log(
+    `[ai-game-creator-shell] 已上传迁移指针 oss://${bucket}/agc/latest.json`,
+  );
+}
+if (dryRun) {
+  console.log('[ai-game-creator-shell] dry-run：未写入任何 OSS 对象');
+}

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

@@ -1,10 +1,7 @@
 import { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import {
+import { withDefaultCargoFeatures } from './cargo-features.mjs';
-  defaultEditorFeatures,
-  withDefaultCargoFeatures,
-} from './cargo-features.mjs';
 import {
   readAgcDevEndpoint,
   resolveAgcDevEndpoint,
@@ -50,8 +47,9 @@ function buildTauriArguments(argv, devUrl = readAgcDevEndpoint().url) {
   ];
 }
 
-// 开发和发行构建使用同一平台编辑器 feature 集合。
+// `agc_cocos_execute` 与 Cocos 编辑器适配器只在 `cocos-editor-execute` feature 下
-// 可用 AGC_DEV_CARGO_FEATURES（逗号分隔）覆盖，传空串即关闭。
+// 注册。开发构建默认在 Windows 打开它，否则 Agent 的工具清单里根本没有该工具，
+// 只能退化成改写脚本。可用 AGC_DEV_CARGO_FEATURES（逗号分隔）覆盖，传空串即关闭。
 function readDevCargoFeatures(env = process.env) {
   const override = env.AGC_DEV_CARGO_FEATURES;
   if (override !== undefined) {
@@ -60,7 +58,7 @@ function readDevCargoFeatures(env = process.env) {
       .map((value) => value.trim())
       .filter(Boolean);
   }
-  return defaultEditorFeatures(process.platform);
+  return process.platform === 'win32' ? ['cocos-editor-execute'] : [];
 }
 
 function withDevCargoFeatures(argv, features = readDevCargoFeatures()) {

apps/ai-game-creator-shell/src-tauri/Cargo.lock

@@ -1793,7 +1793,6 @@ dependencies = [
  "ttf-parser",
  "typed_floats",
  "unicode-normalization",
- "unity-editor-bridge",
  "url",
  "uuid",
  "windows-sys 0.61.2",
@@ -3932,7 +3931,6 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -5018,7 +5016,6 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "ts-rs",
 ]
 
 [[package]]
@@ -6410,16 +6407,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
-[[package]]
-name = "unity-editor-bridge"
-version = "0.1.0"
-dependencies = [
- "editor-adapter-api",
- "serde",
- "serde_json",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"

apps/ai-game-creator-shell/src-tauri/Cargo.toml

@@ -12,7 +12,6 @@ template-library-fixtures = []
 cocos-editor = ["cocos-editor-bridge/process-discovery"]
 cocos-editor-execute = ["cocos-editor", "cocos-editor-bridge/windows-bootstrap"]
 cocos-editor-injection = ["cocos-editor-execute", "cocos-editor-bridge/windows-injection"]
-unity-editor-execute = []
 
 [build-dependencies]
 serde = { version = "1", features = ["derive"] }
@@ -28,7 +27,6 @@ nalgebra = { version = "0.35.0", features = ["serde-serialize"] }
 agent-runtime-core = { path = "../../../server-rs/crates/agent-runtime-core" }
 cocos-editor-bridge = { path = "../../../plugins/agc-cocos-editor/native/cocos-editor-bridge", default-features = false }
 editor-adapter-api = { path = "../../../server-rs/crates/editor-adapter-api" }
-unity-editor-bridge = { path = "../../../plugins/agc-unity-editor/native/unity-editor-bridge" }
 base64 = "0.22"
 axum = "0.8"
 chromiumoxide = "0.9.1"
@@ -58,7 +56,7 @@ platform-agent = { path = "../../../server-rs/crates/platform-agent" }
 portable-pty = "0.9"
 reqwest = { version = "0.12", default-features = false, features = ["json", "multipart", "native-tls", "stream"] }
 regex = "1"
-shared-contracts = { path = "../../../server-rs/crates/shared-contracts", default-features = false, features = ["ts-bindings"] }
+shared-contracts = { path = "../../../server-rs/crates/shared-contracts", default-features = false }
 tauri = { version = "2.11.2", features = [] }
 tauri-plugin-dialog = "2.7.1"
 tauri-plugin-http = { version = "2.5.9", default-features = false, features = ["charset", "cookies", "http2", "rustls-tls"] }

apps/ai-game-creator-shell/src-tauri/build.rs

@@ -31,7 +31,23 @@ fn sha256_file(path: &std::path::Path) -> Result<String, std::io::Error> {
 fn stage_bundled_codex_cli(manifest_dir: &std::path::Path) {
     let target = env::var("TARGET").expect("Cargo TARGET");
     println!("cargo:rustc-env=AGC_BUILD_TARGET={target}");
-    let Some(layout) = codex_bundle::for_target(&target) else {
+    if target.contains("apple-darwin") {
+        // Tauri 的 universal 两次 Cargo 编译共用 resource staging，
+        // 每次都生成完整双架构目录，最终 bundle 不取决于最后编译的切片。
+        let staging = manifest_dir.join("resources/codex/mac-native");
+        if staging.exists() {
+            fs::remove_dir_all(&staging).expect("清理 macOS Codex staging 失败");
+        }
+        for target in ["aarch64-apple-darwin", "x86_64-apple-darwin"] {
+            stage_codex_target(manifest_dir, target);
+        }
+    } else {
+        stage_codex_target(manifest_dir, &target);
+    }
+}
+
+fn stage_codex_target(manifest_dir: &std::path::Path, target: &str) {
+    let Some(layout) = codex_bundle::for_target(target) else {
         assert!(
             !target.contains("windows") && !target.contains("apple-darwin"),
             "不支持的 Codex 随包目标：{target}"
@@ -81,7 +97,7 @@ fn stage_bundled_codex_cli(manifest_dir: &std::path::Path) {
             &fs::read(source.join("codex-package.json")).expect("读取 Codex 原生包元数据失败"),
         )
         .expect("Codex 原生包元数据无效");
-        codex_bundle::validate_package_metadata(&metadata, &target, layout)
+        codex_bundle::validate_package_metadata(&metadata, target, layout)
             .unwrap_or_else(|error| panic!("{error}"));
         let target_dir = manifest_dir.join("resources/codex").join(layout.directory);
         let notice = target_dir.join("NOTICE.md");
@@ -196,7 +212,6 @@ fn main() {
     );
     let manifest_path = manifest_dir.join("prompts/runtime/manifest.json");
     stage_bundled_codex_cli(&manifest_dir);
-    prepare_unity_editor_helper(&manifest_dir);
     stage_plugin_workspace(&manifest_dir);
     stage_cocos_editor_payload(&manifest_dir);
     let compiled = runtime_prompt_bundle::compile_manifest(&manifest_path)
@@ -267,107 +282,6 @@ fn stage_cocos_editor_payload(manifest_dir: &std::path::Path) {
 #[cfg(not(windows))]
 fn stage_cocos_editor_payload(_manifest_dir: &std::path::Path) {}
 
-/// Unity helper 是插件的随包运行文件。内容指纹避免每次 Cargo 检查都重新发布 .NET。
-fn prepare_unity_editor_helper(manifest_dir: &std::path::Path) {
-    println!("cargo:rerun-if-env-changed=CARGO_FEATURE_UNITY_EDITOR_EXECUTE");
-    let target = env::var("TARGET").expect("Cargo TARGET");
-    if env::var_os("CARGO_FEATURE_UNITY_EDITOR_EXECUTE").is_none()
-        || target != "x86_64-pc-windows-msvc"
-    {
-        return;
-    }
-    let root = manifest_dir.join("../../../plugins/agc-unity-editor/dotnet");
-    let mut sources = Vec::new();
-    collect_unity_helper_sources(&root, &mut sources);
-    sources.sort();
-    let mut fingerprint = Sha256::new();
-    for source in &sources {
-        println!("cargo:rerun-if-changed={}", source.display());
-        fingerprint.update(
-            source
-                .strip_prefix(&root)
-                .expect("helper source")
-                .to_string_lossy()
-                .as_bytes(),
-        );
-        fingerprint.update([0]);
-        fingerprint.update(fs::read(source).expect("读取 Unity helper 源文件失败"));
-    }
-    let fingerprint = format!("{:x}", fingerprint.finalize());
-    let publish = root.join("publish/win-x64");
-    let executable = publish.join("Agc.Unity.Attach.exe");
-    let stamp = publish.join(".agc-source.sha256");
-    println!("cargo:rerun-if-changed={}", executable.display());
-    if unity_helper_publish_complete(&publish)
-        && fs::read_to_string(&stamp).ok().as_deref() == Some(&fingerprint)
-    {
-        return;
-    }
-    assert!(
-        cfg!(windows),
-        "构建 Unity 插件 helper 需要 Windows .NET 10 与 x64 C++ 工具链"
-    );
-    let status = std::process::Command::new("powershell.exe")
-        .args([
-            "-NoProfile",
-            "-NonInteractive",
-            "-ExecutionPolicy",
-            "Bypass",
-            "-File",
-        ])
-        .arg(root.join("build.ps1"))
-        .current_dir(&root)
-        .status()
-        .expect("无法启动 Unity helper 构建脚本");
-    assert!(
-        status.success() && unity_helper_publish_complete(&publish),
-        "Unity helper 构建失败或缺少运行文件/许可"
-    );
-    fs::write(stamp, fingerprint).expect("写入 Unity helper 构建指纹失败");
-}
-
-fn unity_helper_publish_complete(publish: &std::path::Path) -> bool {
-    [
-        "Agc.Unity.Attach.exe",
-        "NOTICE",
-        "THIRD-PARTY-NOTICES.txt",
-        "licenses/DotCraft-Apache-2.0.txt",
-        "licenses/Roslyn-MIT.txt",
-        "licenses/upstream.json",
-        "licenses/dotnet-LICENSE.TXT",
-        "licenses/dotnet-THIRD-PARTY-NOTICES.TXT",
-        "licenses/microsoft.codeanalysis.common-ThirdPartyNotices.rtf",
-        "licenses/microsoft.codeanalysis.csharp-ThirdPartyNotices.rtf",
-    ]
-    .iter()
-    .all(|name| {
-        fs::symlink_metadata(publish.join(name)).is_ok_and(|metadata| {
-            metadata.is_file() && !metadata.file_type().is_symlink() && metadata.len() > 0
-        })
-    })
-}
-
-fn collect_unity_helper_sources(root: &std::path::Path, sources: &mut Vec<PathBuf>) {
-    for entry in fs::read_dir(root)
-        .expect("Unity helper 源码目录缺失")
-        .flatten()
-    {
-        let kind = entry.file_type().expect("读取 Unity helper 源文件类型失败");
-        assert!(!kind.is_symlink(), "Unity helper 源码不允许符号链接");
-        let name = entry.file_name();
-        if kind.is_dir() {
-            if !matches!(
-                name.to_str(),
-                Some("bin" | "obj" | "publish" | "native-build")
-            ) {
-                collect_unity_helper_sources(&entry.path(), sources);
-            }
-        } else if kind.is_file() {
-            sources.push(entry.path());
-        }
-    }
-}
-
 /// 把 `plugins/` 工作区里的插件包随包映射到应用资源目录。
 ///
 /// 只复制插件运行需要的清单、入口、面板和 native payload，不复制 native 源码、
@@ -415,15 +329,9 @@ fn stage_plugin_workspace(manifest_dir: &std::path::Path) {
         for relative in [
             std::path::PathBuf::from("src"),
             std::path::PathBuf::from("panels"),
-            std::path::PathBuf::from("skills"),
             std::path::PathBuf::from("native/payload"),
-            std::path::PathBuf::from("dotnet/publish/win-x64"),
         ] {
-            if (relative == std::path::Path::new("native/payload") && !target.contains("windows"))
+            if relative == std::path::Path::new("native/payload") && !target.contains("windows") {
-                || (relative == std::path::Path::new("dotnet/publish/win-x64")
-                    && (target != "x86_64-pc-windows-msvc"
-                        || env::var_os("CARGO_FEATURE_UNITY_EDITOR_EXECUTE").is_none()))
-            {
                 continue;
             }
             copy_plugin_tree(&plugin_root.join(&relative), &destination.join(&relative));

apps/ai-game-creator-shell/src-tauri/build_support/codex_bundle.rs

@@ -49,7 +49,11 @@ pub fn for_target(target: &str) -> Option<Layout> {
             } else {
                 "codex-darwin-x64"
             },
-            directory: "mac-native",
+            directory: if target.starts_with("aarch64") {
+                "mac-native/darwin-arm64"
+            } else {
+                "mac-native/darwin-x64"
+            },
             executable: "bin/codex",
             files: MAC_FILES,
         }),
@@ -90,6 +94,9 @@ mod tests {
         let intel = for_target("x86_64-apple-darwin").unwrap();
         assert_eq!(intel.platform, "darwin-x64");
         assert_eq!(intel.npm_package, "codex-darwin-x64");
+        assert_eq!(mac.directory, "mac-native/darwin-arm64");
+        assert_eq!(intel.directory, "mac-native/darwin-x64");
+        assert_ne!(mac.directory, intel.directory);
         let windows = for_target("x86_64-pc-windows-msvc").unwrap();
         assert_eq!(windows.directory, "win-x64");
         assert_eq!(windows.files.len(), 6);

apps/ai-game-creator-shell/src-tauri/resources/agc-skills/manifest.json

@@ -63,7 +63,7 @@
         "agents/openai.yaml",
         "references/platform-art-contract.md"
       ],
-      "sha256": "6668bf1aa69601bcc65c97fdcd879c699c3139befcd70805d95614997f6e44e9"
+      "sha256": "47ac742d9b88e5d6cd9833484ab212152578e58ae27f7add312fd1d78183385c"
     },
     {
       "name": "agc-web-game-development",