@fitlab-ai/agent-infra 0.5.9 → 0.5.10

package/lib/sandbox/tools.js

@@ -1,5 +1,5 @@
-import path from 'node:path';
 import { safeNameCandidates, sanitizeBranchName } from './constants.js';
+import { hostJoin } from './engines/wsl2-paths.js';
 
 /**
  * @typedef {Object} SandboxTool
@@ -18,10 +18,6 @@ import { safeNameCandidates, sanitizeBranchName } from './constants.js';
  * @property {string[]=} postSetupCmds
  */
 
-function hostJoin(basePath, ...segments) {
-  return basePath.startsWith('/') ? path.posix.join(basePath, ...segments) : path.join(basePath, ...segments);
-}
-
 function createBuiltinTools(home, project) {
   /** @type {Record<string, SandboxTool>} */
   return {
@@ -78,6 +74,10 @@ function createBuiltinTools(home, project) {
       containerMount: '/home/devuser/.local/share/opencode',
       versionCmd: 'opencode version',
       setupHint: 'Configure OpenCode credentials inside the container before first use.',
+      // OpenCode reads opencode.json from $XDG_CONFIG_HOME/opencode by default,
+      // outside this tool mount. Pin the config file path so the inherited
+      // sandbox opencode.json is the one the TUI actually reads.
+      envVars: { OPENCODE_CONFIG: '/home/devuser/.local/share/opencode/opencode.json' },
       hostLiveMounts: [
         {
           hostPath: hostJoin(home, '.local', 'share', 'opencode', 'auth.json'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fitlab-ai/agent-infra",
-  "version": "0.5.9",
+  "version": "0.5.10",
   "description": "Bootstrap tool for AI multi-tool collaboration infrastructure — works with Claude Code, Codex, Gemini CLI, and OpenCode",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
     "templates/"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "keywords": [
     "ai",
@@ -41,8 +41,10 @@
     "installer"
   ],
   "dependencies": {
-    "@clack/prompts": "1.2.0",
-    "picocolors": "1.1.1"
+    "@clack/prompts": "1.4.0",
+    "cross-spawn": "^7.0.6",
+    "picocolors": "1.1.1",
+    "smol-toml": "^1.6.1"
   },
   "scripts": {
     "build": "node scripts/build-inline.js",

package/templates/.agents/rules/create-issue.github.en.md

@@ -155,10 +155,8 @@ Update task.md:
 
 - Write `issue_number: {n}` into the frontmatter (replace if it exists; append at the end of the frontmatter otherwise)
 - Update `updated_at` to the current time (command: `date "+%Y-%m-%d %H:%M:%S%:z"`)
-- Append to the `## 活动日志` / `## Activity Log` section:
-  ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Create Issue** by {agent} — Created GitHub Issue #{n}
-  ```
+
+> Do NOT append an Activity Log entry here. The Issue creation event is already captured by the GitHub Issue itself and by the frontmatter `issue_number` field; the Activity Log only records the single `create-task` skill execution anchor (`Task Created`), written by the caller SKILL step 3.
 
 ### 8. Return the Result
 

package/templates/.agents/rules/create-issue.github.zh-CN.md

@@ -155,10 +155,8 @@ gh api "repos/$upstream_repo/issues/{issue-number}" -X PATCH \
 
 - 把 `issue_number: {n}` 写入 frontmatter（已存在则替换；不存在则在 frontmatter 末尾追加）
 - 更新 `updated_at` 为当前时间（命令：`date "+%Y-%m-%d %H:%M:%S%:z"`）
-- 在 `## 活动日志` / `## Activity Log` 段落追加：
-  ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Create Issue** by {agent} — Created GitHub Issue #{n}
-  ```
+
+> 不要在此追加 Activity Log 条目。Issue 创建事件已由 GitHub Issue 自身和 frontmatter `issue_number` 承载；Activity Log 仅记录 `create-task` skill 一次执行的整体锚点（`Task Created`），由调用方 SKILL 步骤 3 写入。
 
 ### 8. 返回结果
 

package/templates/.agents/rules/issue-pr-commands.github.en.md

@@ -120,6 +120,35 @@ Read Issue comments or search for existing hidden markers:
 gh api "repos/$upstream_repo/issues/{issue-number}/comments" --paginate
 ```
 
+## Historical Task Comment Scan
+
+`find-existing-task.js` only consumes stdin and does not call `gh` directly. The AI selects the pipeline command for the host OS.
+
+POSIX (bash / zsh):
+
+```bash
+set -o pipefail
+gh api "repos/$upstream_repo/issues/{issue-number}/comments" \
+  --paginate --jq '.[] | @json' \
+  | node .agents/scripts/find-existing-task.js
+```
+
+Windows (PowerShell 7+ / pwsh):
+
+```powershell
+$ErrorActionPreference = 'Stop'
+gh api "repos/$upstream_repo/issues/{issue-number}/comments" `
+  --paginate --jq '.[] | @json' |
+  node .agents/scripts/find-existing-task.js
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+```
+
+On PowerShell 5.1, explicitly enable UTF-8 stdio first; otherwise the pipe may corrupt multibyte characters:
+
+```powershell
+[Console]::OutputEncoding = $OutputEncoding = [System.Text.UTF8Encoding]::new()
+```
+
 ## PR Template and Metadata Helpers
 
 Read a repository PR template when present:

package/templates/.agents/rules/issue-pr-commands.github.zh-CN.md

@@ -120,6 +120,35 @@ gh issue close {issue-number} -R "$upstream_repo" --reason "{reason}"
 gh api "repos/$upstream_repo/issues/{issue-number}/comments" --paginate
 ```
 
+## 历史任务评论扫描
+
+`find-existing-task.js` 仅消费 stdin，不直接调用 `gh`。由 AI 按宿主 OS 选择下面的 pipeline 命令。
+
+POSIX（bash / zsh）：
+
+```bash
+set -o pipefail
+gh api "repos/$upstream_repo/issues/{issue-number}/comments" \
+  --paginate --jq '.[] | @json' \
+  | node .agents/scripts/find-existing-task.js
+```
+
+Windows（PowerShell 7+ / pwsh）：
+
+```powershell
+$ErrorActionPreference = 'Stop'
+gh api "repos/$upstream_repo/issues/{issue-number}/comments" `
+  --paginate --jq '.[] | @json' |
+  node .agents/scripts/find-existing-task.js
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+```
+
+在 PowerShell 5.1 上需先显式启用 UTF-8 stdio，否则 pipe 可能损坏多字节字符：
+
+```powershell
+[Console]::OutputEncoding = $OutputEncoding = [System.Text.UTF8Encoding]::new()
+```
+
 ## PR 模板与元数据辅助命令
 
 存在仓库 PR 模板时读取：

package/templates/.agents/scripts/{platform-adapters/find-existing-task.github.js → find-existing-task.js}

@@ -1,4 +1,4 @@
-import { spawnSync } from "node:child_process";
+import { text } from "node:stream/consumers";
 import { pathToFileURL } from "node:url";
 
 const markerPattern = /^<!-- sync-issue:(TASK-\d{8}-\d{6}):([a-z][a-z0-9-]*) -->$/;
@@ -10,16 +10,6 @@ function parseArgs(argv) {
 
   for (let index = 0; index < argv.length; index += 1) {
     const arg = argv[index];
-    if (arg === "--issue") {
-      args.issue = argv[index + 1];
-      index += 1;
-      continue;
-    }
-    if (arg === "--repo") {
-      args.repo = argv[index + 1];
-      index += 1;
-      continue;
-    }
     if (arg === "--format") {
       args.format = argv[index + 1];
       index += 1;
@@ -38,53 +28,12 @@ function parseArgs(argv) {
 function usage() {
   return [
     "Usage:",
-    "  node .agents/scripts/platform-adapters/find-existing-task.js --issue <number> [--repo <owner/name>] [--format json]"
+    "  <issue comments JSON via stdin> | node .agents/scripts/find-existing-task.js [--format json]",
+    "",
+    "Reads issue comments JSON (JSON Lines or JSON Array) from stdin and prints {found, task_id, frontmatter?}."
   ].join("\n");
 }
 
-function runGh(args) {
-  const ghBin = process.env.IMPORT_ISSUE_GH_BIN || "gh";
-  const result = spawnSync(ghBin, args, {
-    encoding: "utf8",
-    maxBuffer: 10 * 1024 * 1024
-  });
-
-  if (result.error) {
-    const error = new Error(`gh command failed: ${result.error.message}`);
-    error.stderr = result.error.message;
-    throw error;
-  }
-
-  if (result.status !== 0) {
-    const stderr = result.stderr.trim() || `gh exited with status ${result.status}`;
-    const error = new Error(stderr);
-    error.stderr = stderr;
-    throw error;
-  }
-
-  return result.stdout;
-}
-
-function resolveRepo(explicitRepo) {
-  if (explicitRepo) {
-    return explicitRepo;
-  }
-
-  const currentRepo = runGh(["repo", "view", "--json", "nameWithOwner", "-q", ".nameWithOwner"]).trim();
-  if (!currentRepo) {
-    throw new Error("Cannot detect current GitHub repository");
-  }
-
-  const upstreamRepo = runGh([
-    "api",
-    `repos/${currentRepo}`,
-    "--jq",
-    "if .fork then .parent.full_name else .full_name end"
-  ]).trim();
-
-  return upstreamRepo || currentRepo;
-}
-
 function parseComments(output) {
   const trimmed = output.trim();
   if (!trimmed) {
@@ -102,18 +51,6 @@ function parseComments(output) {
   }
 }
 
-function fetchComments(repo, issueNumber) {
-  const output = runGh([
-    "api",
-    `repos/${repo}/issues/${issueNumber}/comments`,
-    "--paginate",
-    "--jq",
-    ".[] | @json"
-  ]);
-
-  return parseComments(output);
-}
-
 function firstLine(value) {
   return String(value || "").split(/\r?\n/, 1)[0].trim();
 }
@@ -231,7 +168,7 @@ function buildResult(comments) {
   return result;
 }
 
-function main() {
+async function main() {
   let args;
   try {
     args = parseArgs(process.argv.slice(2));
@@ -246,27 +183,33 @@ function main() {
     return;
   }
 
-  if (!args.issue) {
-    console.error("Missing required argument: --issue");
-    console.error(usage());
+  if (args.format !== "json") {
+    console.error(`Unsupported format: ${args.format}`);
     process.exit(1);
   }
 
-  if (args.format !== "json") {
-    console.error(`Unsupported format: ${args.format}`);
+  let raw;
+  try {
+    raw = await text(process.stdin);
+  } catch (error) {
+    console.error(`Cannot read stdin: ${error.message}`);
     process.exit(1);
   }
 
+  let comments;
   try {
-    const repo = resolveRepo(args.repo);
-    const comments = fetchComments(repo, args.issue);
-    console.log(JSON.stringify(buildResult(comments), null, 2));
+    comments = parseComments(raw);
   } catch (error) {
-    console.error(`Cannot scan issue comments: ${error.stderr || error.message}`);
-    process.exit(2);
+    console.error(`Cannot parse stdin as JSON: ${error.message}`);
+    process.exit(1);
   }
+
+  console.log(JSON.stringify(buildResult(comments), null, 2));
 }
 
 if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
-  main();
+  main().catch((error) => {
+    console.error(error.stack || error.message);
+    process.exit(1);
+  });
 }

package/templates/.agents/scripts/platform-adapters/platform-sync.github.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
-import { spawnSync } from "node:child_process";
+import spawn from "cross-spawn";
 
 const CHECK_TYPE = "platform-sync";
 const DEFAULT_RETRY_DELAYS_MS = [3000, 10000];
@@ -1034,7 +1034,7 @@ function resolveUpstreamRepo(taskDir) {
 }
 
 function resolveOwnerRepo(taskDir) {
-  const gitResult = spawnSync("git", ["remote", "get-url", "origin"], {
+  const gitResult = spawn.sync("git", ["remote", "get-url", "origin"], {
     cwd: taskDir,
     encoding: "utf8"
   });
@@ -1097,12 +1097,12 @@ function ghText(args, cwd) {
 }
 
 function ghCommand(args, cwd) {
-  const command = resolveCommand("gh");
-  const result = spawnSync(command, args, commandOptions(command, {
+  const gh = resolveGhCommand();
+  const result = spawn.sync(gh.command, [...gh.preArgs, ...args], {
     cwd,
     encoding: "utf8",
     env: process.env
-  }));
+  });
 
   if (result.status !== 0) {
     const stderr = `${result.stderr || ""}${result.stdout || ""}`.trim();
@@ -1113,17 +1113,35 @@ function ghCommand(args, cwd) {
   return { ok: true, value: result.stdout };
 }
 
+function resolveGhCommand() {
+  const command = process.env.AGENT_INFRA_GH_BIN || "gh";
+  const rawPreArgs = process.env.AGENT_INFRA_GH_ARGS_JSON;
+  if (!rawPreArgs) {
+    return { command, preArgs: [] };
+  }
+
+  try {
+    const preArgs = JSON.parse(rawPreArgs);
+    if (Array.isArray(preArgs) && preArgs.every((arg) => typeof arg === "string")) {
+      return { command, preArgs };
+    }
+  } catch {
+    return { command, preArgs: [] };
+  }
+
+  return { command, preArgs: [] };
+}
+
 function ghPaginatedJson(args, cwd) {
   return ghJson(args, cwd);
 }
 
 function gitText(args, cwd) {
-  const command = resolveCommand("git");
-  const result = spawnSync(command, args, commandOptions(command, {
+  const result = spawn.sync("git", args, {
     cwd,
     encoding: "utf8",
     env: process.env
-  }));
+  });
 
   if (result.status !== 0) {
     const stderr = `${result.stderr || ""}${result.stdout || ""}`.trim();
@@ -1237,39 +1255,6 @@ function sleep(delayMs) {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delayMs);
 }
 
-function resolveCommand(cmd) {
-  if (process.platform !== "win32" || path.extname(cmd)) {
-    return cmd;
-  }
-
-  const pathValue = process.env.Path || process.env.PATH || "";
-  const extensions = (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD")
-    .split(";")
-    .filter(Boolean);
-
-  for (const dir of pathValue.split(path.delimiter).filter(Boolean)) {
-    for (const extension of extensions) {
-      const lowerCandidate = path.join(dir, `${cmd}${extension.toLowerCase()}`);
-      if (fs.existsSync(lowerCandidate)) {
-        return lowerCandidate;
-      }
-      const upperCandidate = path.join(dir, `${cmd}${extension.toUpperCase()}`);
-      if (fs.existsSync(upperCandidate)) {
-        return upperCandidate;
-      }
-    }
-  }
-
-  return cmd;
-}
-
-function commandOptions(cmd, options) {
-  if (process.platform === "win32" && /\.(?:bat|cmd)$/i.test(cmd)) {
-    return { ...options, shell: true };
-  }
-  return options;
-}
-
 function interpolate(template, taskDir, artifactFile) {
   const artifactStem = artifactFile ? path.basename(artifactFile, path.extname(artifactFile)) : "";
   return template

package/templates/.agents/skills/create-task/SKILL.en.md

@@ -109,7 +109,7 @@ The rule's content is determined by the configured code platform:
 
 Handle the result:
 - Rule successfully created the Issue: `issue_number` has been written back to task.md per the rule; continue by reading `.agents/rules/issue-sync.md`, completing upstream repository and permission detection, then sync the task comment and set `status: waiting-for-triage` by rule
-- Rule failed (auth / network / template parse / etc.): do not roll back task.md; get the current time and append an `Issue Creation Skipped` Activity Log entry with the reason
+- Rule failed (auth / network / template parse / etc.): do not roll back task.md; do NOT append an extra Activity Log entry; follow "Scenario C: Issue creation failed" output to surface `error_code` and `error_message` to the user so they can decide whether to retry manually or write `issue_number` later
 - Rule was a no-op (custom or empty platform): do not create comments, do not block the workflow, and do not write an Activity Log entry
 - task.md already has `issue_number`: the rule's prerequisite check skips creation; `create-task` proceeds directly to step 5
 

package/templates/.agents/skills/create-task/SKILL.zh-CN.md

@@ -109,7 +109,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 处理结果：
 - 规则成功创建 Issue：`issue_number` 已按规则回写到 task.md；继续读取 `.agents/rules/issue-sync.md`，完成 upstream 仓库检测和权限检测，然后同步 task 评论并按规则设置 `status: waiting-for-triage`
-- 规则失败（认证 / 网络 / 模板解析等）：不回滚 task.md；获取当前时间，追加 `Issue Creation Skipped` Activity Log，说明错误原因
+- 规则失败（认证 / 网络 / 模板解析等）：不回滚 task.md；不追加额外 Activity Log；按"场景 C：Issue 创建失败"输出向用户透出 `error_code` 与 `error_message`，让用户决定后续是否手动重试或写入 `issue_number`
 - 规则为 no-op（自定义或空平台）：不创建评论，不阻塞后续工作流，不写 Activity Log
 - task.md 已存在 `issue_number`：规则中的前置检查会跳过；`create-task` 直接进入步骤 5
 

package/templates/.agents/skills/import-issue/SKILL.en.md

@@ -28,17 +28,15 @@ Use the Issue title as-is for the task title (preserve the Issue's original lang
 - If found, ask the user whether to re-import or continue with the existing task
 - If not found, continue to 2.2
 
-2.2 Scan Issue comments for sync markers and look for a recoverable historical task ID:
+2.2 Use the "historical task comment scan" command in `.agents/rules/issue-pr-commands.md` to scan Issue comments for sync markers and look for a recoverable historical task ID.
 
-If `$upstream_repo` was not set in step 1, omit `--repo`; the script will infer it using the issue-sync.md detection rule.
+This command depends on `$upstream_repo` being set in step 1.
 
-```bash
-node .agents/scripts/platform-adapters/find-existing-task.js --issue <issue-number> --repo "$upstream_repo" --format json
-```
+Exit code handling for the whole pipeline:
 
-- Script outputs `found=false`: create a new task through the normal import flow
-- Script outputs `found=true`: reuse `task_id`
-- Script exits 2: treat it as network, authentication, or platform API degradation; show the failure reason from script stderr to the user, then continue with the new-task import flow without blocking
+- Exit 0 + output `found=false`: create a new task through the normal import flow
+- Exit 0 + output `found=true`: reuse `task_id`
+- Non-zero exit (platform API, authentication, JSON parsing, or any pipeline segment failure): treat it as platform API degradation; show stderr to the user, then continue with the new-task import flow without blocking
 
 ### 3. Create the Task Directory and File
 

package/templates/.agents/skills/import-issue/SKILL.zh-CN.md

@@ -28,17 +28,15 @@ description: "从 Issue 导入并创建任务"
 - 如果找到，询问用户是重新导入还是继续使用现有任务
 - 如果未找到，继续执行 2.2
 
-2.2 扫描 Issue 评论中的同步标记，查找可恢复的历史任务 ID：
+2.2 按 `.agents/rules/issue-pr-commands.md` 的“历史任务评论扫描”命令扫描 Issue 评论中的同步标记，查找可恢复的历史任务 ID。
 
-如未在步骤 1 中已设置 `$upstream_repo`，可省略 `--repo`，脚本会自动按 issue-sync.md 的检测规则推断。
+该命令依赖步骤 1 已设置的 `$upstream_repo`。
 
-```bash
-node .agents/scripts/platform-adapters/find-existing-task.js --issue <issue-number> --repo "$upstream_repo" --format json
-```
+退出码处理（pipeline 整体）：
 
-- 脚本输出 `found=false`：按新 Issue 导入流程创建新任务
-- 脚本输出 `found=true`：复用 `task_id`
-- 脚本退出码 2：视为网络、认证或 platform API 降级，向用户展示脚本 stderr 中的失败原因后，按新 Issue 导入流程继续，不阻塞导入
+- 退出 0 + 输出 `found=false`：按新 Issue 导入流程创建新任务
+- 退出 0 + 输出 `found=true`：复用 `task_id`
+- 退出非 0（平台 API、认证、JSON 解析或任一段管道异常）：视为 platform API 降级，向用户展示 stderr 后按新 Issue 导入流程继续，不阻塞导入
 
 ### 3. 创建任务目录和文件
 

package/templates/.agents/scripts/platform-adapters/find-existing-task.js

@@ -1,5 +0,0 @@
-import { pathToFileURL } from "node:url";
-
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
-  console.log(JSON.stringify({ found: false }, null, 2));
-}