kenaz 0.3.21 → 0.3.23

package/core/.claude/commands/Ansuz.md

@@ -5,6 +5,8 @@ ARGUMENTS 含 `[專案: X]` 或 `--project-path X` → PROJECT_PATH = X，下方
 
 你是 **Ansuz**，Kenaz 的 orchestrator：理解需求，自己動手或拆卡派給 subagent，合併前在真實路徑上驗證，然後回報。先查現況、確認 scope，再動手。
 
+用戶貼上房間 key 或要求加入/建立房間時，自己執行 `kenaz ygg join <key>` / `kenaz ygg create`（不要請用戶輸入），再轉述 status 區塊與「restart Claude Code」提示。
+
 ## Boot（一次 Bash）
 1. Turn Context 有 `[session] session_id=<id>` 就記住 `<id>`。
 2. `node .specialist/tools/ansuz-boot-fast.js`（有 `<id>` 加 `--conversation-id="<id>"`；有 PROJECT_PATH 加 `--project-path`）。

package/core/.claude/hooks/__tests__/peer-session-fill.test.js

@@ -0,0 +1,37 @@
+'use strict';
+const test = require('node:test');
+const assert = require('node:assert');
+const path = require('path');
+const { spawnSync } = require('child_process');
+const os = require('os');
+const fs = require('fs');
+// decide() writes a peer opt-in marker (TASK_2465): keep it out of the real ~/.kenaz (spawned children inherit this).
+process.env.KENAZ_PEER_OPTIN_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'kenaz-optin-test-'));
+const { decide } = require('../peer-session-fill');
+
+const base = { session_id: 'sess-123', tool_input: { to: 'n', body: 'hi' } };
+
+test('fills missing and wrong sessionId, keeps other args', () => {
+  for (const tn of ['mcp__kenaz-dashboard__kenaz_peer_send', 'mcp__plugin_kenaz_kenaz-dashboard__kenaz_peer_send']) {
+    for (const extra of [{}, { sessionId: 'wrong' }]) {
+      const out = decide({ ...base, tool_name: tn, tool_input: { ...base.tool_input, ...extra } });
+      assert.strictEqual(out.hookSpecificOutput.updatedInput.sessionId, 'sess-123');
+      assert.strictEqual(out.hookSpecificOutput.updatedInput.body, 'hi');
+    }
+  }
+});
+
+test('non-peer tools and missing session_id produce nothing', () => {
+  assert.strictEqual(decide({ ...base, tool_name: 'mcp__kenaz-dashboard__kenaz_peer_threads' }), null);
+  assert.strictEqual(decide({ ...base, tool_name: 'Bash' }), null);
+  assert.strictEqual(decide({ tool_name: 'mcp__x__kenaz_peer_send', tool_input: {} }), null);
+});
+
+test('main() prints JSON for a peer send and nothing on garbage stdin', () => {
+  const f = path.join(__dirname, '..', 'peer-session-fill.js');
+  const ok = spawnSync(process.execPath, [f], { input: JSON.stringify({ ...base, tool_name: 'mcp__a__kenaz_peer_send' }), encoding: 'utf8' });
+  assert.strictEqual(JSON.parse(ok.stdout).hookSpecificOutput.updatedInput.sessionId, 'sess-123');
+  const bad = spawnSync(process.execPath, [f], { input: '{nope', encoding: 'utf8' });
+  assert.strictEqual(bad.stdout, '');
+  assert.strictEqual(bad.status, 0);
+});

package/core/.claude/hooks/_ansuz-conversation.js

@@ -181,4 +181,35 @@ function taskIdNeedles(id) {
   return /^\d+$/.test(s) ? [`TASK_${s}`] : [s];
 }
 
-module.exports = { isAnsuzConversation, lineIsAnsuzEntry, toolUseMentionsAny, taskIdNeedles, MARKERS };
+// TASK_2465: peer collaborator opt-in. A session is a collaborator when it is Ansuz, OR it ran
+// `ygg join`/`ygg create` / called kenaz_peer_send (peer-session-fill.js writes the marker), OR it was started
+// by `kenaz launch` (KENAZ_PEER_OPTIN=1). One marker file per session id under ~/.kenaz/peer-optin, expiring,
+// so mod / turn-context / Codex shim read it without parsing transcripts. Never opted in -> false (privacy).
+const OPTIN_TTL_MS = 24 * 3600 * 1000;
+const SID_OK = /^[A-Za-z0-9_-]{1,128}$/;
+function optinDir() {
+  if (process.env.KENAZ_PEER_OPTIN_DIR) return process.env.KENAZ_PEER_OPTIN_DIR;
+  return path.join(require('os').homedir(), '.kenaz', 'peer-optin');
+}
+function markPeerOptIn(sessionId, now = Date.now()) {
+  const sid = String(sessionId || '');
+  if (!SID_OK.test(sid)) return false;
+  try {
+    fs.mkdirSync(optinDir(), { recursive: true });
+    fs.writeFileSync(path.join(optinDir(), sid + '.json'), JSON.stringify({ ts: now }));
+    return true;
+  } catch { return false; }
+}
+function isPeerOptedIn(sessionId, now = Date.now()) {
+  // kenaz launch's env opt-in is inherited by children: only the interactive entrypoint honours it, so a
+  // `claude -p` worker (sdk-cli) started inside a launched session never takes the human's peer mail.
+  if (process.env.KENAZ_PEER_OPTIN === '1' && process.env.CLAUDE_CODE_ENTRYPOINT === 'cli') return true;
+  const sid = String(sessionId || '');
+  if (!SID_OK.test(sid)) return false;
+  try {
+    const m = JSON.parse(fs.readFileSync(path.join(optinDir(), sid + '.json'), 'utf8'));
+    return Number.isFinite(m.ts) && now - m.ts >= 0 && now - m.ts < OPTIN_TTL_MS;
+  } catch { return false; }
+}
+
+module.exports = { isAnsuzConversation, lineIsAnsuzEntry, toolUseMentionsAny, taskIdNeedles, MARKERS, markPeerOptIn, isPeerOptedIn, OPTIN_TTL_MS };

package/core/.claude/hooks/_user-scope.js

@@ -19,5 +19,5 @@ if (!hookFile) process.exit(0);
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
 if (fs.existsSync(path.join(projectDir, '.claude', 'hooks', hookFile))) process.exit(0);
 
-const res = spawnSync(process.execPath, [path.join(__dirname, hookFile), ...args], { stdio: 'inherit' });
+const res = spawnSync(process.execPath, [path.join(__dirname, hookFile), ...args], { windowsHide: true, stdio: 'inherit' });
 process.exit(res.status == null ? 0 : res.status);

package/core/.claude/hooks/core-resolve.js

@@ -221,7 +221,7 @@ if (require.main === module) {
   if (!result) process.exit(0); // silent -- non-blocking hook
 
   try {
-    execFileSync("node", [result.resolved, ...result.args], { stdio: "inherit" });
+    execFileSync("node", [result.resolved, ...result.args], { stdio: "inherit", windowsHide: true });
   } catch {
     // Hook errors should not block
   }

package/core/.claude/hooks/peer-optin.test.js

@@ -0,0 +1,74 @@
+'use strict';
+// TASK_2465: peer collaboration opt-in marker (writer = peer-session-fill.js, reader = turn-context / mod / Codex shim).
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'kenaz-optin-'));
+process.env.KENAZ_PEER_OPTIN_DIR = dir;
+delete process.env.KENAZ_PEER_OPTIN;
+const { markPeerOptIn, isPeerOptedIn, OPTIN_TTL_MS } = require('./_ansuz-conversation');
+const { decide } = require('./peer-session-fill');
+
+test('no marker -> not opted in (privacy)', () => {
+  assert.equal(isPeerOptedIn('plain-session'), false);
+  assert.equal(isPeerOptedIn(''), false);
+  assert.equal(isPeerOptedIn(undefined), false);
+});
+
+test('kenaz_peer_send writes the marker for that session only', () => {
+  const out = decide({ tool_name: 'mcp__kenaz-dashboard__kenaz_peer_send', session_id: 'sess-a', tool_input: { to: 'x' } });
+  assert.equal(out.hookSpecificOutput.updatedInput.sessionId, 'sess-a'); // sessionId fill unchanged
+  assert.equal(isPeerOptedIn('sess-a'), true);
+  assert.equal(isPeerOptedIn('sess-b'), false);
+});
+
+test('ygg join / ygg create via Bash write the marker; other Bash commands do not', () => {
+  assert.equal(decide({ tool_name: 'Bash', session_id: 'sess-j', tool_input: { command: 'kenaz ygg join room-1' } }), null);
+  assert.equal(isPeerOptedIn('sess-j'), true);
+  decide({ tool_name: 'Bash', session_id: 'sess-c', tool_input: { command: 'node plugins/kenaz/scripts/ygg.js create demo' } });
+  assert.equal(isPeerOptedIn('sess-c'), true);
+  decide({ tool_name: 'Bash', session_id: 'sess-n', tool_input: { command: 'kenaz ygg status' } });
+  decide({ tool_name: 'Bash', session_id: 'sess-n', tool_input: { command: 'ls' } });
+  assert.equal(isPeerOptedIn('sess-n'), false);
+});
+
+test('only a real ygg invocation opts in; grep/echo/git mentions do not', () => {
+  const { yggInvocation } = require('./peer-session-fill');
+  for (const c of ['kenaz ygg join r', 'npx -y kenaz@1.2 ygg create x', 'node plugins/kenaz/scripts/ygg.js join r',
+    'cd x && kenaz ygg join r', 'KENAZ_X=1 kenaz ygg create r | cat', 'ls; kenaz ygg join r']) assert.equal(yggInvocation(c), true, c);
+  for (const c of ['grep "ygg join" docs', 'echo kenaz ygg join', 'git log -S"ygg create"', 'cat ygg.js', 'kenaz ygg status',
+    'grep -r ygg join . | wc -l', "echo 'x' # kenaz ygg join"]) assert.equal(yggInvocation(c), false, c);
+});
+
+test('marker expires', () => {
+  const t0 = Date.now();
+  markPeerOptIn('sess-e', t0);
+  assert.equal(isPeerOptedIn('sess-e', t0 + OPTIN_TTL_MS - 1000), true);
+  assert.equal(isPeerOptedIn('sess-e', t0 + OPTIN_TTL_MS + 1000), false);
+});
+
+test('unsafe session ids are refused (no path traversal)', () => {
+  assert.equal(markPeerOptIn('../evil'), false);
+  assert.equal(isPeerOptedIn('../evil'), false);
+});
+
+test('KENAZ_PEER_OPTIN=1 (kenaz launch) opts in without a marker; =0 does not', () => {
+  process.env.KENAZ_PEER_OPTIN = '1';
+  process.env.CLAUDE_CODE_ENTRYPOINT = 'sdk-cli';
+  assert.equal(isPeerOptedIn('never-marked'), false); // claude -p worker inherits the env
+  process.env.CLAUDE_CODE_ENTRYPOINT = 'cli';
+  assert.equal(isPeerOptedIn('never-marked'), true);
+  process.env.KENAZ_PEER_OPTIN = '0';
+  assert.equal(isPeerOptedIn('never-marked'), false);
+  delete process.env.KENAZ_PEER_OPTIN;
+  delete process.env.CLAUDE_CODE_ENTRYPOINT;
+});
+
+test('kenaz launch plan sets KENAZ_PEER_OPTIN=1 unless the caller set 0', () => {
+  const { plan } = require('../../.formation/bifrost/provider-launch.js');
+  const env = { DEEPSEEK_API_KEY: 'k' };
+  assert.equal(plan(['--provider', 'deepseek'], env, os.tmpdir(), null).env.KENAZ_PEER_OPTIN, '1');
+  assert.equal(plan(['--provider', 'deepseek'], { ...env, KENAZ_PEER_OPTIN: '0' }, os.tmpdir(), null).env.KENAZ_PEER_OPTIN, '0');
+});

package/core/.claude/hooks/peer-session-fill.js

@@ -0,0 +1,38 @@
+'use strict';
+// PreToolUse(kenaz_peer_send, any MCP server prefix): fill the tool's `sessionId` with the hook payload's
+// session_id, overriding whatever the model passed (TASK_2462). Reply affinity (TASK_2285) routes a reply back
+// to the asking session only when the outbound row carries that id; the harness knows it, the model should not
+// have to. Fails open: any error or missing id -> no output, the call proceeds unchanged.
+const PEER_SEND = /^mcp__.*kenaz_peer_send$/;
+
+// An actual invocation only: a `;`/`&&`/`||`/`|`/newline-separated segment (after optional VAR=x assignments) that starts with
+// `kenaz ygg join|create`, `npx [-y] kenaz[@ver] ygg join|create` or `node <path>/ygg.js join|create`.
+// Mentions inside grep/echo/git arguments or quotes do not count.
+const YGG_CMD = /^(?:[A-Za-z_]\w*=\S*\s+)*(?:kenaz(?:\.cmd)?\s+ygg|npx\s+(?:-y\s+)?kenaz(?:@\S+)?\s+ygg|node\s+\S*ygg\.js)\s+(?:join|create)(?:\s|$)/;
+function yggInvocation(cmd) {
+  return String(cmd || '').split(/\|\||&&|[;|&\n]/).some((seg) => YGG_CMD.test(seg.trim()));
+}
+
+function decide(input) {
+  // TASK_2465: opt-in marker (see _ansuz-conversation.js): `ygg join/create` via Bash, or any peer send.
+  try {
+    const sid0 = input && typeof input.session_id === 'string' ? input.session_id.trim() : '';
+    const cmd = input && input.tool_name === 'Bash' && input.tool_input ? String(input.tool_input.command || '') : '';
+    if (sid0 && (PEER_SEND.test(String(input.tool_name || '')) || yggInvocation(cmd))) require('./_ansuz-conversation').markPeerOptIn(sid0);
+  } catch (_) { /* marker is best-effort */ }
+  if (!input || !PEER_SEND.test(String(input.tool_name || ''))) return null;
+  const sid = typeof input.session_id === 'string' ? input.session_id.trim() : '';
+  if (!sid) return null;
+  const ti = input.tool_input && typeof input.tool_input === 'object' ? input.tool_input : {};
+  return { hookSpecificOutput: { hookEventName: 'PreToolUse', updatedInput: Object.assign({}, ti, { sessionId: sid }) } };
+}
+
+function main() {
+  try {
+    const out = decide(JSON.parse(require('fs').readFileSync(0, 'utf8') || '{}'));
+    if (out) process.stdout.write(JSON.stringify(out));
+  } catch (_) { /* fail open */ }
+}
+
+if (require.main === module) main();
+module.exports = { decide, main, yggInvocation };

package/core/.claude/hooks/turn-context.js

@@ -214,14 +214,15 @@ const sessionLine = peerHookPayload.session_id
     fs.renameSync(tmpPath, STATE_PATH);
   } catch { /* best-effort state write */ }
 
-  // 2. TASK_2122 — Peer Ansuz MVP: undelivered peer messages, Ansuz sessions
+  // 2. TASK_2122 — Peer Ansuz MVP: undelivered peer messages, collaborator sessions
   // only (DESIGN.md §3.4 — a plain Claude Code session sharing this project
-  // dir must never see another user's collaborator traffic).
+  // dir must never see another user's collaborator traffic). TASK_2465: collaborator =
+  // Ansuz, or opted in (kenaz_peer_send / ygg join|create marker, or `kenaz launch`).
   let peerText = '';
   let waitingText = '';
   try {
-    const { isAnsuzConversation } = require('./_ansuz-conversation');
-    if (isAnsuzConversation(peerHookPayload.transcript_path, projectDir)) {
+    const { isAnsuzConversation, isPeerOptedIn } = require('./_ansuz-conversation');
+    if (isPeerOptedIn(peerHookPayload.session_id) || isAnsuzConversation(peerHookPayload.transcript_path, projectDir)) {
       // TASK_2226: a session whose kenaz-peer mod is alive gets its peer
       // messages from the mod (peek -> submit -> ack-by-id); pulling here too
       // would take-and-ack them out from under it. Fail-open: no session_id,

package/core/.claude/hooks/worktree-create.js

@@ -99,7 +99,7 @@ function readStdin() {
  * a no-op (GEN-009). We do NOT write to any git config file here.
  */
 function git(repo, args) {
-  return execFileSync('git', ['-C', repo, '-c', 'core.longpaths=true', ...args], {
+  return execFileSync('git', ['-C', repo, '-c', 'core.longpaths=true', ...args], { windowsHide: true,
     stdio: ['ignore', 'pipe', 'pipe'],
   }).toString().trim();
 }
@@ -107,7 +107,7 @@ function git(repo, args) {
 function isGitRepo(dir) {
   if (!dir) return false;
   try {
-    return execFileSync('git', ['-C', dir, 'rev-parse', '--is-inside-work-tree'], {
+    return execFileSync('git', ['-C', dir, 'rev-parse', '--is-inside-work-tree'], { windowsHide: true,
       stdio: ['ignore', 'pipe', 'ignore'],
     }).toString().trim() === 'true';
   } catch { return false; }
@@ -334,7 +334,7 @@ function isLandedProgressNote(repo, relPath) {
 function classifyWorktreeDirt(worktreeDir, noisePaths, repo) {
   const raw = execFileSync('git', ['-C', worktreeDir, '-c', 'core.longpaths=true',
     '-c', 'core.quotePath=false', 'status', '--porcelain'],
-    { stdio: ['ignore', 'pipe', 'pipe'] }).toString();
+    { windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }).toString();
   const real = [];
   const noise = [];
   for (const line of raw.split('\n')) {
@@ -635,11 +635,11 @@ function findNodeModulesParents(repo) {
 function ensureWorktreeIgnores(worktreePath, relPath) {
   try {
     execFileSync('git', ['-C', worktreePath, 'check-ignore', '-q', '--', relPath],
-      { stdio: ['ignore', 'ignore', 'ignore'] });
+      { windowsHide: true, stdio: ['ignore', 'ignore', 'ignore'] });
     return; // exit 0 → already ignored (repo .gitignore covers it)
   } catch { /* not ignored → add per-worktree exclude */ }
   const gp = execFileSync('git', ['-C', worktreePath, 'rev-parse', '--git-path', 'info/exclude'],
-    { stdio: ['ignore', 'pipe', 'pipe'] }).toString().trim();
+    { windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }).toString().trim();
   const excludeFile = path.isAbsolute(gp) ? gp : path.resolve(worktreePath, gp);
   fs.mkdirSync(path.dirname(excludeFile), { recursive: true });
   fs.appendFileSync(excludeFile, '/' + relPath + '/\n');
@@ -797,7 +797,7 @@ function main() {
     const taken = (b) => {
       try {
         execFileSync('git', ['-C', repo, 'rev-parse', '--verify', '--quiet', 'refs/heads/' + b],
-          { stdio: ['ignore', 'pipe', 'ignore'] });
+          { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] });
         return true;
       } catch { return false; }
     };

package/core/.claude/hooks/worktree-remove.js

@@ -25,7 +25,7 @@ function readStdin() {
 
 function gitTry(repo, args) {
   try {
-    execFileSync('git', ['-C', repo, ...args], { stdio: ['ignore', 'ignore', 'ignore'] });
+    execFileSync('git', ['-C', repo, ...args], { windowsHide: true, stdio: ['ignore', 'ignore', 'ignore'] });
     return true;
   } catch { return false; }
 }
@@ -33,7 +33,7 @@ function gitTry(repo, args) {
 function gitTopLevel(dir) {
   try {
     return execFileSync('git', ['-C', dir, 'rev-parse', '--show-toplevel'],
-      { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+      { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
   } catch { return null; }
 }
 
@@ -91,7 +91,7 @@ function unlinkNodeModulesLinks(root) {
 function worktreeBranch(repo, worktreePath) {
   try {
     const out = execFileSync('git', ['-C', repo, 'worktree', 'list', '--porcelain'],
-      { stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+      { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
     const want = path.resolve(worktreePath).replace(/\\/g, '/').toLowerCase();
     let curPath = null;
     for (const line of out.split(/\r?\n/)) {
@@ -132,7 +132,7 @@ function main() {
   let repo = null;
   try {
     const common = execFileSync('git', ['-C', worktreePath, 'rev-parse', '--git-common-dir'],
-      { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+      { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
     if (common) {
       const commonAbs = path.resolve(worktreePath, common); // handles relative or absolute
       if (path.basename(commonAbs) === '.git') repo = path.dirname(commonAbs);

package/core/.claude/settings.json

@@ -72,6 +72,15 @@
         ],
         "matcher": "mcp__kenaz-dashboard__.*|Read|Edit|Write"
       },
+      {
+        "matcher": "mcp__.*kenaz_peer_send|Bash",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node -e \"const d=process.env.CLAUDE_PROJECT_DIR;process.chdir(d);require(d+'/.claude/hooks/peer-session-fill.js').main()\""
+          }
+        ]
+      },
       {
         "matcher": "Agent|Task",
         "hooks": [

package/core/.collaboration/core/reconcile.js

@@ -192,4 +192,19 @@ function externalLanding(repo, card, opts) {
   return wts.some((w) => w.branch && names.has(String(w.branch).replace(/^refs\/heads\//, ''))) ? null : a;
 }
 
-module.exports = { reconcile, assessCard, landedAssessment, externalLanding, countLanded };
+/**
+ * TASK_2467: validate a hand-supplied landing sha. Returns {sha, baseRef, landed_into}; throws unless <sha>
+ * resolves to a commit that is an ancestor of the base ref (origin/main, else local main).
+ */
+function verifyLandedSha(repo, sha, { remote = 'origin', base = 'main' } = {}) {
+  if (!/^[0-9a-fA-F]{7,64}$/.test(String(sha))) throw new Error(`--landed-sha: '${sha}' is not a commit sha`);
+  const baseRef = resolveBaseRef(repo, remote, base);
+  if (!baseRef) throw new Error(`--landed-sha: no ${remote}/${base} or ${base} ref to verify against`);
+  let full;
+  try { full = git(repo, ['rev-parse', '--verify', '--quiet', `${sha}^{commit}`]); } catch { throw new Error(`--landed-sha: commit ${sha} not found`); }
+  const into = baseRef.replace(/^refs\/(heads|remotes)\//, '');
+  if (!gitOk(repo, ['merge-base', '--is-ancestor', full, baseRef])) throw new Error(`--landed-sha: ${full.slice(0, 10)} is not an ancestor of ${into}`);
+  return { landing_sha: full, landed_into: into };
+}
+
+module.exports = { verifyLandedSha, reconcile, assessCard, landedAssessment, externalLanding, countLanded };

package/core/.collaboration/core/task-2467-lifecycle.test.js

@@ -0,0 +1,63 @@
+// TASK_2467 -- update --status rejected; complete --landed-sha from any open state; list shows archived.
+// Real CLI in a temp git project. TASK_API=<path> runs the same checks against another task-api.js (control).
+// Usage: node .collaboration/core/task-2467-lifecycle.test.js
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const cp = require('child_process');
+const API = process.env.TASK_API || path.join(__dirname, 'task-api.js');
+const SB = fs.mkdtempSync(path.join(os.tmpdir(), 't2467_'));
+const git = (...a) => cp.execFileSync('git', a, { cwd: SB, encoding: 'utf8', windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }).trim();
+const cli = (...a) => { const r = cp.spawnSync(process.execPath, [API, ...a, '--project-path', SB], { cwd: SB, encoding: 'utf8', windowsHide: true }); return { code: r.status, out: (r.stdout || '') + (r.stderr || '') }; };
+let pass = 0, fail = 0;
+const check = (n, c, d) => { console.log((c ? 'PASS' : 'FAIL') + ' | ' + n + (c ? '' : ' | ' + d)); c ? pass++ : fail++; };
+const T = (...p) => path.join(SB, '.kenaz', 'tasks', ...p);
+const dirOf = (id) => ['backlog', 'active', 'done', 'blocked', 'archived'].find(d => fs.existsSync(T(d)) && fs.readdirSync(T(d)).some(f => f.startsWith(id + '_')));
+const card = (id, dir) => { fs.mkdirSync(T(dir), { recursive: true }); fs.writeFileSync(T(dir, `${id}_t.yaml`), `id: ${id}\ntitle: t\npriority: P2\nstatus: ${dir === 'active' ? 'in_progress' : 'pending'}\n`); };
+
+try {
+  git('init', '-q', '-b', 'main'); git('config', 'user.email', 't@e.com'); git('config', 'user.name', 't');
+  fs.writeFileSync(path.join(SB, 'a.txt'), '1'); git('add', 'a.txt'); git('commit', '-q', '-m', 'base');
+  fs.writeFileSync(path.join(SB, 'b.txt'), '2'); git('add', 'b.txt'); git('commit', '-q', '-m', 'landed');
+  const sha = git('rev-parse', 'HEAD');
+  git('checkout', '-q', '-b', 'side'); fs.writeFileSync(path.join(SB, 'c.txt'), '3'); git('add', 'c.txt'); git('commit', '-q', '-m', 'off-base');
+  const offSha = git('rev-parse', 'HEAD'); git('checkout', '-q', 'main');
+  for (const [id, d] of [['TASK_1', 'backlog'], ['TASK_2', 'blocked'], ['TASK_3', 'active'], ['TASK_4', 'backlog'], ['TASK_5', 'backlog']]) card(id, d);
+
+  // 1) update --status
+  let r = cli('update', 'TASK_5', '--status', 'done', '--priority', 'P1');
+  check('1 update --status (with other fields) exits non-zero', r.code !== 0, r.out);
+  check('1 error names move/complete', /move|complete/.test(r.out), r.out);
+  check('1 card unchanged', dirOf('TASK_5') === 'backlog' && !/priority: P1/.test(fs.readFileSync(T('backlog', 'TASK_5_t.yaml'), 'utf8')), r.out);
+  r = cli('update', 'TASK_5', '--status', 'done');
+  check('1 update --status alone exits non-zero naming move/complete', r.code !== 0 && /move|complete/.test(r.out), r.out);
+  r = cli('update', 'TASK_5', '--status=done', '--priority', 'P1');
+  check('1 update --status=done form is refused too', r.code !== 0 && !/priority: P1/.test(fs.readFileSync(T('backlog', 'TASK_5_t.yaml'), 'utf8')), r.out);
+
+  // 2) complete --landed-sha
+  r = cli('complete', 'TASK_4', '--landed-sha', offSha);
+  check('2 sha not on base refused, card unchanged', r.code !== 0 && dirOf('TASK_4') === 'backlog', r.out);
+  r = cli('complete', 'TASK_4', '--landed-sha', 'zzzz');
+  check('2 garbage sha refused', r.code !== 0 && dirOf('TASK_4') === 'backlog', r.out);
+  card('TASK_6', 'cancel');
+  r = cli('complete', 'TASK_6', '--landed-sha', sha);
+  check('2 a cancelled card is not closed by --landed-sha', r.code !== 0 && fs.existsSync(T('cancel', 'TASK_6_t.yaml')), r.out);
+  for (const id of ['TASK_1', 'TASK_2', 'TASK_3']) {
+    r = id === 'TASK_2' ? cli('complete', id, `--landed-sha=${sha}`) : cli('complete', id, '--landed-sha', sha);
+    check(`2 ${id} -> done in one command`, r.code === 0 && dirOf(id) === 'done', r.out);
+  }
+  const y = dirOf('TASK_1') === 'done' ? fs.readFileSync(T('done', 'TASK_1_t.yaml'), 'utf8') : '';
+  check('2 records external landing fields', /integration: external/.test(y) && y.includes(sha), y);
+
+  // 3) list shows archived
+  card('TASK_90', 'archived'); card('TASK_91', 'archived');
+  r = cli('list');
+  const tot = /\((\d+) total\)/.exec(r.out);
+  check('3 list summary has archived count; total includes it', /archived: 2 \(hidden; --include-archived\)/.test(r.out) && tot && tot[1] === '8', r.out);
+  r = cli('list', '--all');
+  check('3 list --all summary has archived count', /archived: 2 \(hidden; --include-archived\)/.test(r.out), r.out);
+  r = cli('list', '--include-archived');
+  check('3 --include-archived shows archived, no hidden note', /archived: 2/.test(r.out) && !/hidden/.test(r.out), r.out);
+} finally { try { fs.rmSync(SB, { recursive: true, force: true }); } catch (e) { /* best effort */ } }
+console.log(`\n${pass} passed, ${fail} failed`);
+process.exit(fail ? 1 : 0);

package/core/.collaboration/core/task-api.js

@@ -2080,8 +2080,15 @@ class TaskAPI {
       throw await this._missingTaskError(taskId);
     }
 
+    // TASK_2467: card finished outside the dispatch flow (plumbing merge, no card branch): verify the sha
+    // is on the base, then close from backlog/active/blocked in one step (no post-complete).
+    if (options.landedSha) {
+      if (!['backlog', 'active', 'blocked'].includes(task._status_dir)) throw new Error(`--landed-sha closes a backlog/active/blocked card; ${taskId} is in ${task._status_dir}`);
+      options = { ...options, external: require('./reconcile').verifyLandedSha(this._resolveProjectRoot(), options.landedSha), skipPostComplete: true };
+    }
+
     // TASK_2233: backlog → done is not an allowed transition; say what to do instead
-    if (task.status === 'backlog' || task.status === 'pending' || task._status_dir === 'backlog') {
+    if (!options.landedSha && (task.status === 'backlog' || task.status === 'pending' || task._status_dir === 'backlog')) {
       throw new Error(`無法從 backlog 直接完成 ${taskId}: move it to active first (node task-api.js move ${taskId} active), then complete.`);
     }
 
@@ -2119,7 +2126,7 @@ class TaskAPI {
 
     const postCompleteRuns = !options.skipPostComplete;
     let postCompleteSummary = null;
-    const result = await this.moveTask(taskId, 'done', updatedTask);
+    const result = await this.moveTask(taskId, 'done', updatedTask, options.landedSha ? { skipValidation: true } : {});
 
     try {
       this._autoPopThoughtsForCompletedTask(taskId, now);
@@ -2516,7 +2523,7 @@ Commands:
     預設為整組取代（會回顯被移除的既有項目）；加 --append 改為追加到既有項目之後（與既有重複的項目會略過並回顯）
   node task-api.js pull TASK_ID                 匯入共享 room 的唯讀 replica 為本機卡片（標記 origin_node；TASK_2421）
   node task-api.js claim TASK_ID
-  node task-api.js complete TASK_ID [--actual-hours HOURS]
+  node task-api.js complete TASK_ID [--actual-hours HOURS] [--landed-sha SHA]   --landed-sha: work already on main (no card branch); closes from backlog/active/blocked in one step
   node task-api.js reconcile [--remote origin] [--base main] [--apply] [--worktrees]   關閉分支已併入 base 的 active 任務（預設 dry-run）
   node task-api.js move TASK_ID STATUS [--force]
   node task-api.js delete TASK_ID              (僅限 backlog 狀態)
@@ -2683,7 +2690,12 @@ Create 選項:
             }
           }
           const totalCount = Object.values(dirCounts).reduce((a, b) => a + b, 0);
-          if (totalCount === 0) emitEmptyListDiagnostics(api.tasksDir); // TASK_1778
+          // TASK_2467: archived/ is not scanned without --include-archived; count it instead of hiding it
+          let archivedHidden = 0;
+          if (!includeArchived) {
+            try { archivedHidden = (await fs.readdir(path.join(api.tasksDir, 'archived'))).filter(n => n.startsWith('TASK_')).length; } catch { /* absent */ }
+          }
+          if (totalCount + archivedHidden === 0) emitEmptyListDiagnostics(api.tasksDir); // TASK_1778
 
           // Load tasks: full _scanDir for small dirs, fast path for large dirs
           const grouped = {};
@@ -2747,10 +2759,11 @@ Create 選項:
               'done': 'done', 'cancel': 'cancel', 'archived': 'archived'
             };
 
-            const statusSummary = statusOrder
+            let statusSummary = statusOrder
               .map(s => `${statusLabels[s]}: ${dirCounts[s] || 0}`)
               .join(' | ');
-            console.log(`任務統計 (${totalCount} total)`);
+            if (!includeArchived) statusSummary += ` | archived: ${archivedHidden} (hidden; --include-archived)`;
+            console.log(`任務統計 (${totalCount + archivedHidden} total)`);
             console.log(`  ${statusSummary}`);
 
             const formatTask = (t) => {
@@ -2818,9 +2831,15 @@ Create 選項:
               const dir = CONFIG.STATUS_MAP[oldStatus] || oldStatus;
               byDir[dir] = (byDir[dir] || 0) + count;
             }
+            // TASK_2467: getStatistics folds hidden archived/ files into completed; split them back out
+            let archivedHidden = 0;
+            if (!showArchived) {
+              try { archivedHidden = (await fs.readdir(path.join(api.tasksDir, 'archived'))).filter(n => n.startsWith('TASK_')).length; } catch { /* absent */ }
+              byDir.done = Math.max(0, (byDir.done || 0) - archivedHidden);
+            }
             const statusSummary = statusOrder
               .map(s => `${statusLabels[s]}: ${byDir[s] || 0}`)
-              .join(' | ');
+              .join(' | ') + (showArchived ? '' : ` | archived: ${archivedHidden} (hidden; --include-archived)`);
             console.log(`任務統計 (${stats.total} total)`);
             console.log(`  ${statusSummary}`);
 
@@ -3076,6 +3095,12 @@ Create 選項:
         if (args.includes('--skip-post-complete')) {
           options.skipPostComplete = true;
         }
+        const landedIdx = args.findIndex(a => a === '--landed-sha' || a.startsWith('--landed-sha='));
+        if (landedIdx >= 0) {
+          const v = args[landedIdx].includes('=') ? args[landedIdx].slice('--landed-sha='.length) : args[landedIdx + 1];
+          if (!v || v.startsWith('--')) { console.error('❌ --landed-sha: requires a commit sha'); process.exit(1); }
+          options.landedSha = v;
+        }
         // TASK_2420: runtime/config tasks with no branch — git merge/verify reported as skipped
         if (args.includes('--no-source')) {
           options.noSource = true;
@@ -3431,6 +3456,11 @@ Create 選項:
             process.exit(1);
           }
         }
+        // TASK_2467: status is not an update field; never accept it silently.
+        if (args.some(a => a === '--status' || a.startsWith('--status='))) {
+          console.error(`❌ update 不接受 --status（不會變更狀態）。請用: move ${taskId} <backlog|active|blocked|cancel|done> 或 complete ${taskId}`);
+          process.exit(1);
+        }
         const title = getArg('--title'); if (title) updates.title = title;
         // Clearable text fields: '' is a legitimate value, so gate on presence (!== null).
         const desc = getArg('--description'); if (desc !== null) updates.description = desc;

package/core/.formation/bifrost/launch.js

@@ -315,7 +315,7 @@ let stopPush = () => {};
 
 function killTree(child) {
   try {
-    if (process.platform === 'win32' && child.pid) execFileSync('taskkill', ['/PID', String(child.pid), '/T', '/F'], { stdio: 'ignore' }); // own child PID only
+    if (process.platform === 'win32' && child.pid) execFileSync('taskkill', ['/PID', String(child.pid), '/T', '/F'], { windowsHide: true, stdio: 'ignore' }); // own child PID only
     else child.kill('SIGTERM');
   } catch { /* already gone */ }
 }

package/core/.formation/bifrost/openai/codex-hook-shim.js

@@ -65,6 +65,23 @@ async function peekPeerContext(p) {
   } catch (err) { console.error('[codex-hook-shim] peer pull err:', err.message); return { text: '', ids: [], root: '' }; }
 }
 
+// TASK_2465: an active room = the server's yggdrasil config for the resolved root lists its effective room key in
+// collaboration_projects (the activation). .kenaz/yggdrasil.yaml alone is committed repo config and proves nothing.
+// Fail closed: server down, slow or odd answer -> no pull.
+async function inActiveRoom(cwd, request = peerRequest) {
+  try {
+    const root = resolvePeerProjectRoot(process.env.KENAZ_CONSOLIDATE_ROOT || cwd);
+    if (!root) return false;
+    const cfg = await request('GET', '/api/yggdrasil/config?projectPath=' + encodeURIComponent(root));
+    const key = cfg && typeof cfg.effective_project_key === 'string' ? cfg.effective_project_key : '';
+    return !!key && Array.isArray(cfg.collaboration_projects) && cfg.collaboration_projects.includes(key);
+  } catch { return false; }
+}
+async function wantsPeerPull(env, argv, cwd, request) {
+  if (env.KENAZ_PEER_PULL === '0') return false;
+  return env.KENAZ_PEER_PULL === '1' || (argv || []).includes('--pull') || inActiveRoom(cwd, request);
+}
+
 function ackPeer(root, ids) {
   return ids.length ? peerRequest('POST', '/api/peer/ack', { projectPath: root, ids }) : Promise.resolve(null);
 }
@@ -146,9 +163,9 @@ async function main() {
     const cb = rest.find((a) => typeof a === 'function'); if (cb) cb();
     return true;
   };
-  // Pull when launch.js set KENAZ_PEER_PULL=1 or the registered hook carries --pull (independently opened
-  // session); KENAZ_PEER_PULL=0 (headless relay) always wins.
-  const wantPull = process.env.KENAZ_PEER_PULL !== '0' && (process.env.KENAZ_PEER_PULL === '1' || (process.argv || []).includes('--pull'));
+  // Pull when launch.js set KENAZ_PEER_PULL=1, the registered hook carries --pull (independently opened
+  // session), or (TASK_2465) the project is in an active room; KENAZ_PEER_PULL=0 (headless relay) always wins.
+  const wantPull = await wantsPeerPull(process.env, process.argv, p.cwd || process.cwd());
   const peerPeek = ev === 'UserPromptSubmit' && mode === 'full' && wantPull ? peekPeerContext(p) : null;
   try {
     const pr = handleHookEvent(payload);
@@ -187,4 +204,4 @@ async function main() {
 }
 
 if (require.main === module) main();
-module.exports = { peekPeerContext, ackPeer, writeUserPromptContext, frameForCodex };
+module.exports = { wantsPeerPull, inActiveRoom, peekPeerContext, ackPeer, writeUserPromptContext, frameForCodex };

package/core/.formation/bifrost/openai/codex-peer-pull.test.js

@@ -0,0 +1,42 @@
+'use strict';
+// TASK_2465: Codex pulls peer mail by default when the server says the project's room is activated.
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { wantsPeerPull } = require('./codex-hook-shim.js');
+
+const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'kenaz-codex-room-'));
+fs.mkdirSync(path.join(dir, '.kenaz'), { recursive: true });
+fs.writeFileSync(path.join(dir, '.kenaz', 'project.yaml'), 'name: t\n');
+// Committed repo config naming a room is NOT the activation.
+fs.writeFileSync(path.join(dir, '.kenaz', 'yggdrasil.yaml'), 'yggdrasil_project: "room-a"\n');
+
+const server = (cfg) => async (method, p) => { assert.equal(method, 'GET'); assert.ok(p.startsWith('/api/yggdrasil/config?projectPath=')); return cfg; };
+const active = server({ effective_project_key: 'room-a', collaboration_projects: ['room-a'] });
+
+test('activated room -> pulls without the flag', async () => {
+  assert.equal(await wantsPeerPull({}, ['node', 'shim'], dir, active), true);
+});
+
+test('room key present in repo config but not activated -> no pull', async () => {
+  assert.equal(await wantsPeerPull({}, [], dir, server({ effective_project_key: 'room-a', collaboration_projects: [] })), false);
+  assert.equal(await wantsPeerPull({}, [], dir, server({ effective_project_key: 'room-a', collaboration_projects: ['other'] })), false);
+});
+
+test('server down or odd answer fails closed', async () => {
+  assert.equal(await wantsPeerPull({}, [], dir, async () => null), false);
+  assert.equal(await wantsPeerPull({}, [], dir, async () => { throw new Error('x'); }), false);
+  assert.equal(await wantsPeerPull({}, [], dir, server({})), false);
+});
+
+test('KENAZ_PEER_PULL=0 wins over an activated room and --pull', async () => {
+  assert.equal(await wantsPeerPull({ KENAZ_PEER_PULL: '0' }, ['--pull'], dir, active), false);
+});
+
+test('KENAZ_PEER_PULL=1 and --pull still pull without a room', async () => {
+  const none = server({});
+  assert.equal(await wantsPeerPull({ KENAZ_PEER_PULL: '1' }, [], dir, none), true);
+  assert.equal(await wantsPeerPull({}, ['--pull'], dir, none), true);
+});