Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(dev): Terminal 启动命令按转发清单清除所有未设值变量
Dash1069cb9832d6
diff --git a/scripts/__tests__/restart-desktop-remote.test.mjs b/scripts/__tests__/restart-desktop-remote.test.mjsindex ea48c8c71b..a39a5e7a3e 100644--- a/scripts/__tests__/restart-desktop-remote.test.mjs+++ b/scripts/__tests__/restart-desktop-remote.test.mjs@@ -15,7 +15,7 @@ import {defaultIsolatedUserDataDir,desktopDevCacheDirs,devEnvPrefix,- darwinStaleIsolationUnset,+ darwinStaleDevEnvUnset,hasIsolationIntent,isTrustedIsolatedAuthUserDataDir,ISOLATED_AUTH_LAUNCH_PROOF_FILE,@@ -1386,21 +1386,42 @@ test('Linux readiness binds the reported renderer to a live descendant in the saassert.equal(applyLinuxRendererEvidence(scanned, records, processes, 'win32')[0].ready, false);});-test("darwinStaleIsolationUnset clears isolation vars a long-lived Terminal may still carry", () => {- assert.equal(- darwinStaleIsolationUnset({}),- "unset XDT_ISOLATED XDT_ISOLATED_NAME XDT_USER_DATA_DIR XDT_DEVICE_ID_OVERRIDE XDT_ISOLATED_AUTH XDT_ISOLATED_AUTH_PROOF; ",- );- // 本次显式设了的隔离变量由 devEnvPrefix 转发,不能被清掉。- assert.equal(- darwinStaleIsolationUnset({- XDT_ISOLATED: "1",- XDT_ISOLATED_NAME: "dev",- XDT_USER_DATA_DIR: "/tmp/x",- XDT_DEVICE_ID_OVERRIDE: "d",- XDT_ISOLATED_AUTH: "1",- XDT_ISOLATED_AUTH_PROOF: "p",- }),- "",- );+function unsetKeys(prefix) {+ const match = /^unset ([^;]+); $/.exec(prefix);+ return match ? match[1].split(" ") : [];+}++test("darwinStaleDevEnvUnset clears every forwarded variable this launch did not set", () => {+ const keys = unsetKeys(darwinStaleDevEnvUnset({}));+ // 身份与数据目录类:Terminal 残留会让预览落进别的沙箱或认领错误钥匙串身份。+ for (const key of [+ "XDT_ISOLATED",+ "XDT_ISOLATED_NAME",+ "XDT_USER_DATA_DIR",+ "XDT_USER_DATA_DIR_EPOCH",+ "XDT_DEVICE_ID_OVERRIDE",+ "XDT_SCHEDULER_PASSIVE",+ "XDT_ISOLATED_AUTH",+ "XDT_ISOLATED_AUTH_PROOF",+ ]) {+ assert.ok(keys.includes(key), `${key} should be unset`);+ }+ // CINDY_CUA_SMOKE 总由 devEnvPrefix 显式赋值,不需要也不应被清。+ assert.ok(!keys.includes("CINDY_CUA_SMOKE"));+});++test("darwinStaleDevEnvUnset keeps variables this launch forwards (isolated without isolated-auth)", () => {+ const env = {+ XDT_ISOLATED: "1",+ XDT_ISOLATED_NAME: "src-feature-1a2b3c",+ XDT_USER_DATA_DIR: "/tmp/CindyGlobal-dev2-src-feature-1a2b3c",+ };+ const keys = unsetKeys(darwinStaleDevEnvUnset(env));+ for (const key of Object.keys(env)) assert.ok(!keys.includes(key), `${key} must not be unset`);+ for (const key of ["XDT_USER_DATA_DIR_EPOCH", "XDT_ISOLATED_AUTH", "XDT_ISOLATED_AUTH_PROOF"]) {+ assert.ok(keys.includes(key), `${key} should be unset`);+ }+ // 被转发的值与被清除的键互不重叠:同一次命令里不会先赋值再 unset。+ const forwarded = devEnvPrefix(env, "darwin");+ for (const key of keys) assert.ok(!forwarded.includes(`${key}=`), `${key} both forwarded and unset`);});diff --git a/scripts/restart-desktop-remote.mjs b/scripts/restart-desktop-remote.mjsindex 6a863a17e5..e8794e3789 100644--- a/scripts/restart-desktop-remote.mjs+++ b/scripts/restart-desktop-remote.mjs@@ -854,27 +854,15 @@ function darwinEnvPrefix() {}/**- * 数据目录 / 隔离身份类变量:本次调用没设值时必须在 Terminal 命令里显式清掉。- * 长驻的 Terminal.app 会保留更早一次 isolated 启动留下的这些变量,而 devEnvPrefix 只- * 转发有值的项 —— 于是 `--shared` / `--preserve-running` 预览会悄悄落进别的 worktree- * 的沙箱(新 deviceId、别人的库),而不是共享正式 profile。+ * 启动器转发给 dev 进程的全部环境变量(含未设值项)。devEnvPrefix 只转发有值的项;+ * macOS 走长驻的 Terminal.app 时,未设值项还必须由 darwinStaleDevEnvUnset 显式清掉 ——+ * 否则 Terminal 进程里残留的更早一次启动的值(XDT_ISOLATED / XDT_USER_DATA_DIR /+ * XDT_USER_DATA_DIR_EPOCH 等)会被 dev 进程继承,`--shared` / `--preserve-running`+ * 预览悄悄落进别的 worktree 的沙箱,甚至用错钥匙串身份打开 profile。+ * 不变量:Terminal 命令里这些变量的取值 == 本次启动器的取值。*/-const STALE_TERMINAL_ISOLATION_ENV_KEYS = Object.freeze([- 'XDT_ISOLATED',- 'XDT_ISOLATED_NAME',- 'XDT_USER_DATA_DIR',- 'XDT_DEVICE_ID_OVERRIDE',- 'XDT_ISOLATED_AUTH',- 'XDT_ISOLATED_AUTH_PROOF',-]);--export function darwinStaleIsolationUnset(env = process.env) {- const keys = STALE_TERMINAL_ISOLATION_ENV_KEYS.filter((key) => !env[key]);- return keys.length > 0 ? `unset ${keys.join(' ')}; ` : '';-}--export function devEnvPrefix(env = process.env, platform = process.platform) {- const envEntries = [+function devEnvEntries(env) {+ return [// --region 经 CINDY_AUTH_REGION 注入 dev-remote-env / Forge / Vite,同一个值// 同时决定区域身份与 --endpoints-cdn 的自举 CDN 基址。['CINDY_AUTH_REGION', env.CINDY_AUTH_REGION],@@ -927,7 +915,19 @@ export function devEnvPrefix(env = process.env, platform = process.platform) {['XDT_DESKTOP_DEV_STARTUP_STATUS_FILE', env.XDT_DESKTOP_DEV_STARTUP_STATUS_FILE],// 插件存储启动边界的 dev 黑盒验收:仅显式临时结果路径时启用。['XDT_PLUGIN_STORAGE_SMOKE_RESULT_FILE', env.XDT_PLUGIN_STORAGE_SMOKE_RESULT_FILE],- ].filter(([, value]) => value);+ ];+}++/** macOS Terminal 命令前缀:清掉本次未设值、但可能残留在 Terminal 进程里的转发变量。 */+export function darwinStaleDevEnvUnset(env = process.env) {+ const keys = devEnvEntries(env)+ .filter(([, value]) => !value)+ .map(([key]) => key);+ return keys.length > 0 ? `unset ${[...new Set(keys)].join(' ')}; ` : '';+}++export function devEnvPrefix(env = process.env, platform = process.platform) {+ const envEntries = devEnvEntries(env).filter(([, value]) => value);if (platform === 'win32') {return envEntries@@ -960,7 +960,7 @@ function launchInSystemTerminal(mode) {}if (process.platform === 'darwin') {- const command = `${darwinEnvPrefix()}${darwinStaleIsolationUnset()}cd ${shellSingleQuote(rootDir)} && ${devEnvPrefix()}${packageManagerCommand(mode)}; exitCode=$?; exit $exitCode`;+ const command = `${darwinEnvPrefix()}${darwinStaleDevEnvUnset()}cd ${shellSingleQuote(rootDir)} && ${devEnvPrefix()}${packageManagerCommand(mode)}; exitCode=$?; exit $exitCode`;const child = spawn('osascript', osascriptLaunchDarwinTerminalArgs(command), {detached: true,stdio: 'ignore',