@zat-design/sisyphus-scene 4.6.4 → 4.6.5-beta.2

package/README.md

@@ -13,7 +13,11 @@ npx -y @zat-design/sisyphus-scene install --check
 npx -y @zat-design/sisyphus-scene install
 ```
 
-常用参数：`--global`、`--platform claude,cursor,codex`、`--skip-mcp`、`--skill sisyphus-scene-legacy`。`--skip-mcp` 只安装 Skill，不提供组件 API/demo 查询能力；不需要 Codex 时可显式使用 `--platform claude,cursor`。
+常用参数：`--global`、`--platform claude,cursor,codex`、`--project <项目根>`、`--mcp-cwd <前端目录>`、`--skip-mcp`、`--skill sisyphus-scene-legacy`。`--skip-mcp` 只安装 Skill，不提供组件 API/demo 查询能力；不需要 Codex 时可显式使用 `--platform claude,cursor`。
+
+Codex 项目配置写入 `<项目根>/.codex/config.toml`。当 Codex 保存项目根是 monorepo 或工作区父目录，而 Sisyphus 前端位于子目录时，使用 `--mcp-cwd` 单独指定组件解析目录；相对路径以 `--project` 为基准。该参数不能与 `--skip-mcp`、legacy 技能或不含 Codex 的平台组合。用户级安装默认不会绑定业务项目；对尚不加载项目级 MCP 的旧版 Codex Desktop，可显式组合 `--global --mcp-cwd <前端目录>` 创建兼容入口。
+
+安装器修正已有 Codex `cwd` 前会创建带时间戳的配置备份，通过同目录临时文件原子替换，并在 Codex CLI 读回校验失败时恢复原文件。更新仅定位有效的 `[mcp_servers.sisyphus-react]` 表，不匹配注释中的示例，也不改动后续 MCP 表。
 
 Codex MCP 安装失败时，先在同一终端运行 `codex --version` 和 `codex mcp list --json`。若 Codex 命令非零退出且 stdout/stderr 为空，请检查当前终端实际命中的 Codex CLI 来源和兼容性；可临时使用 `--skip-mcp` 绕过 MCP，但这不代表 MCP 已安装。
 

package/bin/sisyphus-scene.mjs

@@ -17,6 +17,7 @@ const options = {
   skill: 'sisyphus-scene',
   platform: 'all',
   project: process.cwd(),
+  mcpCwd: undefined,
   check: false,
   skipMcp: false,
 };
@@ -26,10 +27,11 @@ for (let index = 0; index < argv.length; index += 1) {
   if (token === '--global') options.scope = 'user';
   else if (token === '--check') options.check = true;
   else if (token === '--skip-mcp') options.skipMcp = true;
-  else if (['--skill', '--platform', '--project'].includes(token)) {
+  else if (['--skill', '--platform', '--project', '--mcp-cwd'].includes(token)) {
     const value = argv[index + 1];
     if (!value || value.startsWith('--')) throw new Error(`${token} 缺少参数。`);
-    options[token.slice(2)] = value;
+    if (token === '--mcp-cwd') options.mcpCwd = value;
+    else options[token.slice(2)] = value;
     index += 1;
   } else throw new Error(`不支持的参数：${token}`);
 }
@@ -43,6 +45,13 @@ const selectedPlatforms = platform.split(',');
 for (const item of selectedPlatforms) {
   if (!['claude', 'cursor', 'codex'].includes(item)) throw new Error(`不支持的平台：${item}`);
 }
+const configureMcp = options.skill === 'sisyphus-scene' && !options.skipMcp;
+if (options.mcpCwd) {
+  if (!configureMcp) throw new Error('--mcp-cwd 仅在安装 sisyphus-scene MCP 时可用。');
+  if (!selectedPlatforms.includes('codex')) {
+    throw new Error('--mcp-cwd 仅适用于包含 codex 的平台安装。');
+  }
+}
 
 const run = (script, args) =>
   execFileSync(process.execPath, [path.join(scripts, script), ...args], {
@@ -50,6 +59,7 @@ const run = (script, args) =>
     stdio: ['ignore', 'pipe', 'pipe'],
   });
 
+const projectRoot = path.resolve(options.project);
 const skillArgs = [
   '--platform',
   platform,
@@ -58,17 +68,17 @@ const skillArgs = [
   '--skill',
   options.skill,
   '--project',
-  path.resolve(options.project),
+  projectRoot,
 ];
-const configureMcp = options.skill === 'sisyphus-scene' && !options.skipMcp;
 const mcpArgs = [
   '--platform',
   platform,
   '--scope',
   options.scope,
   '--project',
-  path.resolve(options.project),
+  projectRoot,
 ];
+if (options.mcpCwd) mcpArgs.push('--mcp-cwd', path.resolve(projectRoot, options.mcpCwd));
 
 const preview = {
   skill: JSON.parse(run('sync-platforms.mjs', [...skillArgs, '--check'])),

package/mcp/sisyphus-react.json

@@ -4,7 +4,7 @@
       "command": "npx",
       "args": [
         "-y",
-        "@zat-design/sisyphus-react-mcp@4.6.4"
+        "@zat-design/sisyphus-react-mcp@4.6.5-beta.2"
       ]
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-scene",
-  "version": "4.6.4",
+  "version": "4.6.5-beta.2",
   "description": "Sisyphus 业务场景 Agent 技能，跨 Claude Code、Codex、Cursor 分发 Sisyphus 4 + Ant Design 6 场景与 MCP 配置",
   "type": "module",
   "license": "MIT",

package/scripts/install-mcp.mjs

@@ -32,6 +32,10 @@ const platformInput = String(args.platform || 'all');
 const platforms =
   platformInput === 'all' ? ['claude', 'cursor', 'codex'] : platformInput.split(',');
 const projectRoot = path.resolve(String(args.project || process.cwd()));
+const mcpCwdInput = String(args['mcp-cwd'] || projectRoot);
+const requestedMcpCwd = path.isAbsolute(mcpCwdInput)
+  ? path.normalize(mcpCwdInput)
+  : path.resolve(projectRoot, mcpCwdInput);
 const scope = String(args.scope || 'project');
 const write = Boolean(args.write);
 const check = Boolean(args.check);
@@ -42,6 +46,12 @@ if (write === check || (!write && !check)) {
 
 const allowedPlatforms = new Set(['claude', 'cursor', 'codex']);
 if (!['user', 'project'].includes(scope)) throw new Error(`不支持的 scope：${scope}`);
+if (
+  (scope === 'project' || args['mcp-cwd']) &&
+  !fs.statSync(requestedMcpCwd, { throwIfNoEntry: false })?.isDirectory()
+) {
+  throw new Error(`MCP 工作目录不存在或不是目录：${requestedMcpCwd}`);
+}
 for (const platform of platforms) {
   if (!allowedPlatforms.has(platform)) throw new Error(`不支持的平台：${platform}`);
 }
@@ -65,6 +75,19 @@ const codexHome =
   scope === 'user'
     ? path.resolve(process.env.CODEX_HOME || path.join(os.homedir(), '.codex'))
     : path.join(projectRoot, '.codex');
+const codexTarget = path.join(codexHome, 'config.toml');
+
+const normalizePath = (value) => {
+  if (!value) return null;
+  try {
+    return fs.realpathSync(value);
+  } catch {
+    return path.resolve(value);
+  }
+};
+
+const expectedCodexCwd =
+  scope === 'project' || args['mcp-cwd'] ? normalizePath(requestedMcpCwd) : null;
 
 const codexEnv = { ...process.env, CODEX_HOME: codexHome };
 
@@ -126,7 +149,7 @@ const inspectCodex = () => {
   if (!value) return { status: 'missing' };
   if (value.enabled === false) {
     throw new Error(
-      `${path.join(codexHome, 'config.toml')} 中的 sisyphus-react MCP 已禁用；请人工启用后重试。`,
+      `${codexTarget} 中的 sisyphus-react MCP 已禁用；请人工启用后重试。`,
     );
   }
 
@@ -134,12 +157,100 @@ const inspectCodex = () => {
   const expectedArgs = server.args || [];
   if (transport.command !== server.command || !sameJson(transport.args || [], expectedArgs)) {
     throw new Error(
-      `${path.join(codexHome, 'config.toml')} 已存在不同的 sisyphus-react 配置；请人工确认。`,
+      `${codexTarget} 已存在不同的 sisyphus-react 配置；请人工确认。`,
     );
   }
+  const actualCwd = normalizePath(transport.cwd);
+  if (actualCwd !== expectedCodexCwd) {
+    return {
+      status: 'needs-update',
+      reason: 'cwd',
+      expectedCwd: expectedCodexCwd,
+      actualCwd,
+    };
+  }
   return { status: 'unchanged' };
 };
 
+const findTomlTableRange = (content, tableName) => {
+  const escapedName = tableName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const targetPattern = new RegExp(
+    `^\\s*\\[${escapedName}\\]\\s*(?:#.*)?(?:\\r?\\n)?$`,
+  );
+  const tablePattern = /^\s*\[\[?[^\]\r\n]+\]\]?\s*(?:#.*)?(?:\r?\n)?$/;
+  const lines = content.match(/[^\n]*(?:\n|$)/g)?.filter(Boolean) || [];
+  let offset = 0;
+  let start = -1;
+  let end = content.length;
+
+  for (const line of lines) {
+    if (start < 0 && targetPattern.test(line)) start = offset;
+    else if (start >= 0 && tablePattern.test(line)) {
+      end = offset;
+      break;
+    }
+    offset += line.length;
+  }
+
+  if (start < 0) throw new Error(`${codexTarget} 缺少 [${tableName}]，无法校准 cwd。`);
+  return { start, end };
+};
+
+const createCodexBackup = () => {
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  let candidate = `${codexTarget}.backup-${timestamp}`;
+  let suffix = 0;
+  while (fs.existsSync(candidate)) {
+    suffix += 1;
+    candidate = `${codexTarget}.backup-${timestamp}-${suffix}`;
+  }
+  fs.copyFileSync(codexTarget, candidate, fs.constants.COPYFILE_EXCL);
+  return candidate;
+};
+
+const writeCodexConfigAtomically = (content) => {
+  const temporary = path.join(
+    path.dirname(codexTarget),
+    `.${path.basename(codexTarget)}.${process.pid}.${Date.now()}.tmp`,
+  );
+  const mode = fs.statSync(codexTarget).mode;
+  try {
+    fs.writeFileSync(temporary, content, { mode });
+    fs.renameSync(temporary, codexTarget);
+  } catch (error) {
+    if (fs.existsSync(temporary)) fs.unlinkSync(temporary);
+    throw error;
+  }
+};
+
+const updateCodexCwd = () => {
+  const content = fs.readFileSync(codexTarget, 'utf8');
+  const { start, end } = findTomlTableRange(content, 'mcp_servers.sisyphus-react');
+  const eol = content.includes('\r\n') ? '\r\n' : '\n';
+  const lines = content
+    .slice(start, end)
+    .split(/\r?\n/)
+    .filter((line) => !/^\s*cwd\s*=/.test(line));
+  while (lines.at(-1) === '') lines.pop();
+  if (expectedCodexCwd) lines.push(`cwd = ${JSON.stringify(expectedCodexCwd)}`);
+  const updatedBlock = `${lines.join(eol)}${eol}`;
+  const updatedContent = `${content.slice(0, start)}${updatedBlock}${content.slice(end)}`;
+  findTomlTableRange(updatedContent, 'mcp_servers.sisyphus-react');
+
+  const backup = createCodexBackup();
+  try {
+    writeCodexConfigAtomically(updatedContent);
+    const verified = inspectCodex();
+    if (verified.status !== 'unchanged') {
+      throw new Error(`Codex MCP 配置校验未通过：${JSON.stringify(verified)}`);
+    }
+  } catch (error) {
+    fs.copyFileSync(backup, codexTarget);
+    throw new Error(`更新 Codex MCP 配置失败，已恢复原文件；备份：${backup}；${error.message}`);
+  }
+  return backup;
+};
+
 const readConfig = (target) => {
   if (!fs.existsSync(target)) return { mcpServers: {} };
   const value = JSON.parse(fs.readFileSync(target, 'utf8'));
@@ -193,11 +304,24 @@ for (const platform of platforms) {
         throw new Error(`写入 Codex MCP 配置失败：\n${formatCodexFailure(commandArgs, result)}`);
       }
     }
-    results.push({
+    const backup = write && inspected.status !== 'unchanged' ? updateCodexCwd() : null;
+    const result = {
       platform,
-      target: path.join(codexHome, 'config.toml'),
-      status: inspected.status === 'unchanged' ? 'unchanged' : write ? 'added' : 'would-add',
-    });
+      target: codexTarget,
+      status:
+        inspected.status === 'unchanged'
+          ? 'unchanged'
+          : inspected.status === 'missing'
+            ? write
+              ? 'added'
+              : 'would-add'
+            : write
+              ? 'updated'
+              : 'would-update',
+    };
+    if (inspected.reason) result.reason = inspected.reason;
+    if (backup) result.backup = backup;
+    results.push(result);
     continue;
   }
 
@@ -222,5 +346,9 @@ for (const platform of platforms) {
 }
 
 process.stdout.write(
-  `${JSON.stringify({ projectRoot, scope, mode: write ? 'write' : 'check', results }, null, 2)}\n`,
+  `${JSON.stringify(
+    { projectRoot, mcpCwd: expectedCodexCwd, scope, mode: write ? 'write' : 'check', results },
+    null,
+    2,
+  )}\n`,
 );

package/skills/sisyphus-scene/assets/ai-contract.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.6.4",
+  "version": "4.6.5-beta.2",
   "schemaVersion": 2,
   "tools": [
     "sisyphus-get-meta-status",

package/skills/sisyphus-scene/evals/fixtures/valid-decisions.json

@@ -8,13 +8,13 @@
     "apiEvidence": {
       "tool": "sisyphus-get-component-api",
       "target": "ProForm",
-      "libraryVersion": "4.6.4",
+      "libraryVersion": "4.6.5-beta.2",
       "schemaVersion": 2
     },
     "demoEvidence": {
       "tool": "sisyphus-get-example",
       "target": "ProForm/demos/base.tsx",
-      "libraryVersion": "4.6.4",
+      "libraryVersion": "4.6.5-beta.2",
       "schemaVersion": 2,
       "exampleId": "ProForm/demos/base.tsx"
     }
@@ -28,13 +28,13 @@
     "apiEvidence": {
       "tool": "sisyphus-get-component-api",
       "target": "ProTable",
-      "libraryVersion": "4.6.4",
+      "libraryVersion": "4.6.5-beta.2",
       "schemaVersion": 2
     },
     "demoEvidence": {
       "tool": "sisyphus-get-example",
       "target": "ProTable/demos/base.tsx",
-      "libraryVersion": "4.6.4",
+      "libraryVersion": "4.6.5-beta.2",
       "schemaVersion": 2,
       "exampleId": "ProTable/demos/base.tsx"
     }

package/skills/sisyphus-scene/references/approved-examples.yaml

@@ -7,7 +7,7 @@ examples: []
 #   status: approved
 #   application: xk-wjs-claim-web
 #   capabilities: [search-form, data-table, table-tabs, drawer-form]
-#   sisyphus_version: "4.6.4"
+#   sisyphus_version: "4.6.5-beta.2"
 #   antd_range: ">=6 <7"
 #   paths:
 #     - src/pages/litigationManagement/index.tsx