@fitlab-ai/agent-infra 0.4.5 → 0.5.1

package/README.md

@@ -133,10 +133,18 @@ npm install -g @fitlab-ai/agent-infra
 curl -fsSL https://raw.githubusercontent.com/fitlab-ai/agent-infra/main/install.sh | sh
 ```
 
+**Option C - Homebrew (macOS)**
+
+```bash
+brew install fitlab-ai/tap/agent-infra
+```
+
 ### Updating agent-infra
 
 ```bash
 npm update -g @fitlab-ai/agent-infra
+# or, if installed via Homebrew:
+brew upgrade agent-infra
 ```
 
 Check your current version:
@@ -171,6 +179,14 @@ Open the project in any AI TUI and run `update-agent-infra`:
 
 This detects the packaged template version and renders all managed files. The same command is used both for first-time setup and for future template upgrades.
 
+### Sandbox aliases and GitHub CLI
+
+`ai sandbox create` now bootstraps the host-side aliases file at `~/.agent-infra/aliases/sandbox.sh` on first run. The generated file includes ready-to-edit yolo shortcuts for Claude, Codex, Gemini CLI, and OpenCode, and every sandbox syncs that file into `/home/devuser/.bash_aliases`.
+
+The sandbox image also preinstalls `gh`. When `gh auth token` succeeds on the host, `ai sandbox create` injects the token into the container as `GH_TOKEN`, so `gh` commands work inside the sandbox without extra setup.
+
+`ai sandbox exec` also forwards a small terminal-detection whitelist (`TERM_PROGRAM`, `TERM_PROGRAM_VERSION`, `LC_TERMINAL`, `LC_TERMINAL_VERSION`) into the container. This keeps interactive TUIs aligned with the host terminal for behaviors such as Claude Code's Shift+Enter newline support, without passing through the full host environment.
+
 <a id="architecture-overview"></a>
 
 ## Architecture Overview
@@ -179,7 +195,7 @@ agent-infra is intentionally simple: a bootstrap CLI creates the seed configurat
 
 ### End-to-End Flow
 
-1. **Install** — `npm install -g @fitlab-ai/agent-infra` (or use the shell script wrapper)
+1. **Install** — `npm install -g @fitlab-ai/agent-infra` (or `brew install fitlab-ai/tap/agent-infra` on macOS, or use the shell script wrapper)
 2. **Initialize** — `ai init` in the project root to generate `.agents/.airc.json` and install the seed command
 3. **Render** — run `update-agent-infra` in any AI TUI to detect the bundled template version and generate all managed files
 4. **Develop** — use built-in skills to drive the full lifecycle: `analysis → design → implementation → review → fix → commit`
@@ -380,7 +396,7 @@ The generated `.agents/.airc.json` file is the central contract between the boot
   "project": "my-project",
   "org": "my-org",
   "language": "en",
-  "templateVersion": "v0.4.5",
+  "templateVersion": "v0.5.1",
   "files": {
     "managed": [
       ".agents/workspace/README.md",

package/README.zh-CN.md

@@ -133,10 +133,18 @@ npm install -g @fitlab-ai/agent-infra
 curl -fsSL https://raw.githubusercontent.com/fitlab-ai/agent-infra/main/install.sh | sh
 ```
 
+**方式 C - Homebrew (macOS)**
+
+```bash
+brew install fitlab-ai/tap/agent-infra
+```
+
 ### 更新 agent-infra
 
 ```bash
 npm update -g @fitlab-ai/agent-infra
+# 或者通过 Homebrew 安装时：
+brew upgrade agent-infra
 ```
 
 查看当前版本：
@@ -171,6 +179,14 @@ CLI 会收集项目元数据，向所有支持的 AI TUI 安装 `update-agent-in
 
 该命令会检测当前打包模板版本并渲染所有受管理文件。首次安装和后续升级都使用同一条命令。
 
+### 沙箱 aliases 与 GitHub CLI
+
+`ai sandbox create` 在首次运行时会自动生成宿主机侧的 `~/.agent-infra/aliases/sandbox.sh`。该文件内置了 Claude、Codex、Gemini CLI 和 OpenCode 的 yolo 快捷命令模板，你可以直接修改；每次创建沙箱时，这个文件都会同步到容器内的 `/home/devuser/.bash_aliases`。
+
+沙箱镜像也会预装 `gh`。如果宿主机上的 `gh auth token` 能成功返回 token，`ai sandbox create` 会把它以 `GH_TOKEN` 环境变量注入容器，让你在沙箱里直接使用 `gh`，无需额外登录配置。
+
+`ai sandbox exec` 也会向容器透传一小组终端检测白名单变量（`TERM_PROGRAM`、`TERM_PROGRAM_VERSION`、`LC_TERMINAL`、`LC_TERMINAL_VERSION`）。这样可以让交互式 TUI 保持与宿主终端一致的行为，例如 Claude Code 的 `Shift+Enter` 换行支持，同时避免把整个宿主环境灌入容器。
+
 <a id="architecture-overview"></a>
 
 ## 架构概览
@@ -179,7 +195,7 @@ agent-infra 的结构刻意保持简单：引导 CLI 负责生成种子配置，
 
 ### 端到端流程
 
-1. **安装** — `npm install -g @fitlab-ai/agent-infra`（或使用 shell 脚本便捷封装）
+1. **安装** — `npm install -g @fitlab-ai/agent-infra`（或在 macOS 上使用 `brew install fitlab-ai/tap/agent-infra`，或使用 shell 脚本便捷封装）
 2. **初始化** — 在项目根目录运行 `ai init`，生成 `.agents/.airc.json` 并安装种子命令
 3. **渲染** — 在任意 AI TUI 中执行 `update-agent-infra`，检测当前打包模板版本并生成所有受管理文件
 4. **开发** — 使用内置 skill 驱动完整生命周期：`analysis → design → implementation → review → fix → commit`
@@ -380,7 +396,7 @@ import-issue #42                    从 GitHub Issue 导入任务
   "project": "my-project",
   "org": "my-org",
   "language": "en",
-  "templateVersion": "v0.4.5",
+  "templateVersion": "v0.5.1",
   "files": {
     "managed": [
       ".agents/workspace/README.md",

package/bin/cli.js

@@ -14,7 +14,9 @@ const USAGE = `agent-infra - bootstrap AI collaboration infrastructure
 
 Usage:
   agent-infra init        Initialize a new project with update-agent-infra seed command
+  agent-infra merge       Merge tasks from another workspace directory (active/blocked/completed/archive)
   agent-infra update      Update seed files and sync file registry for an existing project
+  agent-infra sandbox     Manage Docker-based AI sandboxes
   agent-infra version     Show version
   agent-infra help        Show this help message
 
@@ -23,6 +25,7 @@ Shorthand: ai (e.g. ai init)
 Install methods:
   npm:   npm install -g @fitlab-ai/agent-infra
   npx:   npx @fitlab-ai/agent-infra init
+  brew:  brew install fitlab-ai/tap/agent-infra  (macOS)
   curl:  curl -fsSL https://raw.githubusercontent.com/fitlab-ai/agent-infra/main/install.sh | sh  (runs npm install -g internally)
 
 Examples:
@@ -49,6 +52,22 @@ switch (command) {
     });
     break;
   }
+  case 'merge': {
+    const { cmdMerge } = await import('../lib/merge.js');
+    await cmdMerge(process.argv.slice(3)).catch((e) => {
+      process.stderr.write(`Error: ${e.message}\n`);
+      process.exitCode = 1;
+    });
+    break;
+  }
+  case 'sandbox': {
+    const { runSandbox } = await import('../lib/sandbox/index.js');
+    await runSandbox(process.argv.slice(3)).catch((e) => {
+      process.stderr.write(`Error: ${e.message}\n`);
+      process.exitCode = 1;
+    });
+    break;
+  }
   case 'version': {
     console.log(`agent-infra ${VERSION}`);
     break;

package/lib/defaults.json

@@ -1,4 +1,21 @@
 {
+  "sandbox": {
+    "runtimes": [
+      "node20"
+    ],
+    "tools": [
+      "claude-code",
+      "codex",
+      "opencode",
+      "gemini-cli"
+    ],
+    "dockerfile": null,
+    "vm": {
+      "cpu": null,
+      "memory": null,
+      "disk": null
+    }
+  },
   "labels": {
     "in": {}
   },

package/lib/init.js

@@ -162,6 +162,7 @@ async function cmdInit() {
     org: orgName,
     language,
     templateVersion: VERSION,
+    sandbox: structuredClone(defaults.sandbox),
     labels: structuredClone(defaults.labels),
     files: structuredClone(defaults.files)
   };

package/lib/log.js

@@ -1,27 +1,22 @@
-const isTTY = process.stdout.isTTY;
-const isTTYErr = process.stderr.isTTY;
-
-function color(code, text, tty) {
-  return tty ? `\x1b[${code}m${text}\x1b[0m` : text;
-}
+import pc from 'picocolors';
 
 function info(...args) {
   const msg = args.join(' ');
-  process.stdout.write(`  ${color('1;34', '>', isTTY)} ${msg}\n`);
+  process.stdout.write(`  ${pc.bold(pc.blue('>'))} ${msg}\n`);
 }
 
 function ok(...args) {
   const msg = args.join(' ');
-  process.stdout.write(`  ${color('1;32', '\u2713', isTTY)} ${msg}\n`);
+  process.stdout.write(`  ${pc.bold(pc.green('\u2713'))} ${msg}\n`);
 }
 
 function err(...args) {
   const msg = args.join(' ');
-  process.stderr.write(`  ${color('1;31', '\u2717', isTTYErr)} ${msg}\n`);
+  process.stderr.write(`  ${pc.bold(pc.red('\u2717'))} ${msg}\n`);
 }
 
 function ask(text) {
-  process.stdout.write(`  ${color('1;33', '?', isTTY)} ${text}`);
+  process.stdout.write(`  ${pc.bold(pc.yellow('?'))} ${text}`);
 }
 
 export { info, ok, err, ask };