teamai-cli 0.26.0-beta.5 → 0.26.0

package/dist/index.js

@@ -66,8 +66,8 @@ function ensureLogDir() {
 }
 function maybeRotate() {
   try {
-    const stat9 = fs.statSync(getLogFilePath());
-    if (stat9.size >= MAX_LOG_BYTES) {
+    const stat10 = fs.statSync(getLogFilePath());
+    if (stat10.size >= MAX_LOG_BYTES) {
       fs.renameSync(getLogFilePath(), getLogFilePath() + ".1");
     }
   } catch {
@@ -683,8 +683,8 @@ async function writeJsonAtomic(filePath, data, options) {
 async function copyDir(src, dest) {
   const destExpanded = expandHome(dest);
   try {
-    const stat9 = await fse.lstat(destExpanded);
-    if (stat9.isSymbolicLink()) {
+    const stat10 = await fse.lstat(destExpanded);
+    if (stat10.isSymbolicLink()) {
       await fse.remove(destExpanded);
     }
   } catch {
@@ -698,8 +698,8 @@ async function pruneEmptyDirs(target) {
   const expanded = expandHome(target);
   let entries;
   try {
-    const stat9 = await fse.lstat(expanded);
-    if (!stat9.isDirectory() || stat9.isSymbolicLink()) return false;
+    const stat10 = await fse.lstat(expanded);
+    if (!stat10.isDirectory() || stat10.isSymbolicLink()) return false;
     entries = await fse.readdir(expanded, { withFileTypes: true });
   } catch {
     return false;
@@ -781,8 +781,8 @@ async function remove(p) {
 }
 async function getFileMtime(filePath) {
   try {
-    const stat9 = await fse.stat(expandHome(filePath));
-    return stat9.mtimeMs;
+    const stat10 = await fse.stat(expandHome(filePath));
+    return stat10.mtimeMs;
   } catch {
     return 0;
   }
@@ -796,8 +796,8 @@ async function getDirLatestMtime(dirPath) {
     if (isIgnored(entry.name)) continue;
     const fullPath = path5.join(expanded, entry.name);
     if (entry.isFile()) {
-      const stat9 = await fse.stat(fullPath);
-      if (stat9.mtimeMs > latest) latest = stat9.mtimeMs;
+      const stat10 = await fse.stat(fullPath);
+      if (stat10.mtimeMs > latest) latest = stat10.mtimeMs;
     } else if (entry.isDirectory()) {
       const sub = await getDirLatestMtime(fullPath);
       if (sub > latest) latest = sub;
@@ -3765,11 +3765,12 @@ export const TeamaiHooks = async ({ directory, worktree }) => {
 `;
 }
 async function injectOpencodeHooks(baseDir, scope) {
-  const dir = resolveOpencodePluginDir(baseDir, scope);
-  await ensureDir(dir);
-  const file = path14.join(dir, OPENCODE_HOOK_FILE);
-  await writeFile(file, buildPluginSource());
-  log.success(`Injected teamai OpenCode hook into ${file}`);
+  const file = path14.join(resolveOpencodePluginDir(baseDir, scope), OPENCODE_HOOK_FILE);
+  if (await writeIfChanged(file, buildPluginSource())) {
+    log.success(`Injected teamai OpenCode hook into ${file}`);
+  } else {
+    log.debug(`teamai OpenCode hook already up-to-date in ${file}`);
+  }
 }
 async function removeOpencodeHooks(baseDir, scope) {
   const dir = resolveOpencodePluginDir(baseDir, scope);
@@ -3935,11 +3936,12 @@ export default function teamaiHooks(pi) {
 `;
 }
 async function injectOmpHooks() {
-  const dir = resolveOmpExtensionsDir();
-  await ensureDir(dir);
-  const file = path15.join(dir, OMP_HOOK_FILE);
-  await writeFile(file, buildOmpExtensionSource());
-  log.success(`Injected teamai OMP hook into ${file}`);
+  const file = path15.join(resolveOmpExtensionsDir(), OMP_HOOK_FILE);
+  if (await writeIfChanged(file, buildOmpExtensionSource())) {
+    log.success(`Injected teamai OMP hook into ${file}`);
+  } else {
+    log.debug(`teamai OMP hook already up-to-date in ${file}`);
+  }
 }
 async function removeOmpHooks() {
   const file = path15.join(resolveOmpExtensionsDir(), OMP_HOOK_FILE);
@@ -4062,9 +4064,11 @@ async function injectPiHooks() {
     log.warn(`Skipping Pi hook injection: ${file} exists without the TeamAI marker`);
     return;
   }
-  await ensureDir(dir);
-  await writeFile(file, buildPiExtensionSource());
-  log.success(`Injected teamai Pi hook into ${file}`);
+  if (await writeIfChanged(file, buildPiExtensionSource())) {
+    log.success(`Injected teamai Pi hook into ${file}`);
+  } else {
+    log.debug(`teamai Pi hook already up-to-date in ${file}`);
+  }
 }
 async function removePiHooks() {
   const file = path16.join(resolvePiExtensionsDir(), PI_HOOK_FILE);
@@ -4236,10 +4240,13 @@ async function injectOpenClawHooks(workspacePath, tool = "openclaw") {
     return;
   }
   const dir = path17.join(wsDir, "hooks", OPENCLAW_HOOK_DIR);
-  await ensureDir(dir);
-  await writeFile(path17.join(dir, "HOOK.md"), buildHookMd(tool));
-  await writeFile(path17.join(dir, "handler.ts"), buildHandlerTs(tool));
-  log.success(`Injected teamai OpenClaw hook into ${dir}`);
+  const hookMdChanged = await writeIfChanged(path17.join(dir, "HOOK.md"), buildHookMd(tool));
+  const handlerChanged = await writeIfChanged(path17.join(dir, "handler.ts"), buildHandlerTs(tool));
+  if (hookMdChanged || handlerChanged) {
+    log.success(`Injected teamai OpenClaw hook into ${dir}`);
+  } else {
+    log.debug(`teamai OpenClaw hook already up-to-date in ${dir}`);
+  }
   await enableOpenClawInternalHooks(tool);
 }
 async function enableOpenClawInternalHooks(tool = "openclaw") {
@@ -4526,9 +4533,10 @@ async function upsertHermesHook(event, entry) {
   if (entry.matcher !== void 0) cleanEntry.matcher = entry.matcher;
   if (entry.timeout !== void 0) cleanEntry.timeout = entry.timeout;
   const newArr = [...untouched, cleanEntry];
-  if (JSON.stringify(arr) === JSON.stringify(newArr)) return;
+  if (JSON.stringify(arr) === JSON.stringify(newArr)) return false;
   doc.setIn(["hooks", event], newArr);
   await writeConfigDoc(doc);
+  return true;
 }
 async function removeHermesHookByCommand(command) {
   const doc = await readConfigDoc();
@@ -4561,9 +4569,10 @@ async function addHermesAllowlist(event, command) {
   const raw = await readJson(filePath);
   const data = raw && Array.isArray(raw.approvals) ? raw : { approvals: [] };
   const exists3 = data.approvals.some((a) => a.event === event && a.command === command);
-  if (exists3) return;
+  if (exists3) return false;
   data.approvals.push({ event, command });
   await writeJson(filePath, data);
+  return true;
 }
 async function removeHermesAllowlist(event, command) {
   const filePath = getHermesAllowlistPath();
@@ -4611,16 +4620,19 @@ function buildReportScript() {
 }
 async function injectHermesHooks() {
   const scriptPath = getReportScriptPath();
-  await ensureDir(path20.dirname(scriptPath));
-  await writeFile(scriptPath, buildReportScript());
+  const scriptChanged = await writeIfChanged(scriptPath, buildReportScript());
   try {
     await chmod(scriptPath, 493);
   } catch (e) {
     log.warn(`Failed to chmod Hermes hook script: ${e.message}`);
   }
-  await upsertHermesHook(REPORT_EVENT, { command: scriptPath, timeout: 60 });
-  await addHermesAllowlist(REPORT_EVENT, scriptPath);
-  log.success("Injected teamai Hermes hook into " + scriptPath);
+  const hookChanged = await upsertHermesHook(REPORT_EVENT, { command: scriptPath, timeout: 60 });
+  const allowlistChanged = await addHermesAllowlist(REPORT_EVENT, scriptPath);
+  if (scriptChanged || hookChanged || allowlistChanged) {
+    log.success("Injected teamai Hermes hook into " + scriptPath);
+  } else {
+    log.debug(`teamai Hermes hook already up-to-date in ${scriptPath}`);
+  }
 }
 async function removeHermesHooks() {
   const scriptPath = getReportScriptPath();
@@ -6491,7 +6503,7 @@ searched: relay that warning rather than conclude the team has no knowledge ther
 import crypto2 from "crypto";
 import path25 from "path";
 import fse2 from "fs-extra";
-async function syncTeamUpdatesToLocal(teamConfig, localConfig, baseRevs, placedRules = void 0) {
+async function syncTeamUpdatesToLocal(teamConfig, localConfig, baseRevs, placedRules) {
   const bases = (typeof baseRevs === "string" ? [baseRevs] : baseRevs ?? []).filter((rev) => rev !== "");
   if (bases.length === 0) {
     log.debug("No base revision \u2014 skipping pre-push sync");
@@ -6640,12 +6652,12 @@ async function replaceSkillDir(teamSkillDir, localSkillDir) {
 }
 async function removeLeftover(dir) {
   try {
-    const stat9 = await fse2.lstat(dir).catch((error) => {
+    const stat10 = await fse2.lstat(dir).catch((error) => {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
       throw error;
     });
-    if (stat9 === null) return;
-    if (stat9.isDirectory()) await fse2.chmod(dir, 448);
+    if (stat10 === null) return;
+    if (stat10.isDirectory()) await fse2.chmod(dir, 448);
     await fse2.remove(dir);
   } catch (error) {
     log.warn(`Could not remove ${dir} (${error instanceof Error ? error.message : String(error)}). Delete it by hand.`);
@@ -6827,11 +6839,11 @@ function gfExec(args, options) {
 }
 function getGfPath() {
   try {
-    const stat9 = execSync(`test -x "${gfBinPath()}" && echo ok`, {
+    const stat10 = execSync(`test -x "${gfBinPath()}" && echo ok`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
-    if (stat9.trim() === "ok") return gfBinPath();
+    if (stat10.trim() === "ok") return gfBinPath();
   } catch {
   }
   try {
@@ -10827,6 +10839,27 @@ var init_hook_cwd = __esm({
 });
 
 // src/utils/session-id.ts
+async function agentSessionIdFromEnv() {
+  if (BRIDGE_AGENT_ENV.some((name) => process.env[name])) return void 0;
+  const ids = [...new Set(AGENT_SESSION_ENV.map((name) => process.env[name]).filter((v) => !!v))];
+  if (ids.length <= 1) return ids[0];
+  const { readEvents: readEvents2 } = await Promise.resolve().then(() => (init_dashboard_collector(), dashboard_collector_exports));
+  const firstEvent = /* @__PURE__ */ new Map();
+  const lastStart = /* @__PURE__ */ new Map();
+  for (const { sessionId, timestamp, type } of await readEvents2()) {
+    if (!ids.includes(sessionId)) continue;
+    const first = firstEvent.get(sessionId);
+    if (!first || timestamp < first) firstEvent.set(sessionId, timestamp);
+    const start = lastStart.get(sessionId);
+    if (type === "session_start" && (!start || timestamp > start)) lastStart.set(sessionId, timestamp);
+  }
+  let latest;
+  for (const [id, first] of firstEvent) {
+    const runStart = lastStart.get(id) ?? first;
+    if (!latest || runStart > latest.runStart) latest = { id, runStart };
+  }
+  return latest?.id ?? ids[0];
+}
 function deriveSessionId(data, options = {}) {
   if (typeof data.session_id === "string" && data.session_id) {
     return data.session_id;
@@ -10847,11 +10880,27 @@ function deriveSessionId(data, options = {}) {
 function deriveDispatchSessionId(data, tool) {
   return deriveSessionId(data, { includeCwd: tool.toLowerCase() !== COPILOT_TOOL_ID });
 }
+var AGENT_SESSION_ENV, BRIDGE_AGENT_ENV;
 var init_session_id = __esm({
   "src/utils/session-id.ts"() {
     "use strict";
     init_hook_cwd();
     init_types();
+    AGENT_SESSION_ENV = [
+      "CLAUDE_CODE_SESSION_ID",
+      // Claude Code
+      "CODEX_SESSION_ID",
+      // Codex >= 0.148
+      "CODEBUDDY_SESSION_ID",
+      // CodeBuddy
+      "COPILOT_AGENT_SESSION_ID",
+      // Copilot CLI >= 1.0.29
+      "CURSOR_CONVERSATION_ID",
+      // Cursor
+      "CLAUDE_SESSION_ID"
+      // CodeBuddy's alias and older setups
+    ];
+    BRIDGE_AGENT_ENV = ["PI_SESSION_ID", "OPENCODE"];
   }
 });
 
@@ -11011,10 +11060,10 @@ function getParentPid(pid) {
     return ppid !== void 0 && ppid > 0 ? ppid : void 0;
   }
   try {
-    const stat9 = fs13.readFileSync(`/proc/${pid}/stat`, "utf-8");
-    const closeParen = stat9.lastIndexOf(") ");
+    const stat10 = fs13.readFileSync(`/proc/${pid}/stat`, "utf-8");
+    const closeParen = stat10.lastIndexOf(") ");
     if (closeParen === -1) return void 0;
-    const fields = stat9.slice(closeParen + 2).split(" ");
+    const fields = stat10.slice(closeParen + 2).split(" ");
     const ppid = parseInt(fields[1], 10);
     return ppid > 0 ? ppid : void 0;
   } catch {
@@ -11323,8 +11372,9 @@ async function acquireReclaimSentinel(sentinel, owner) {
   });
   return exclusiveCreate(sentinel, payload);
 }
-async function acquireLock(lockPath) {
+async function acquireLock(lockPath, options = {}) {
   const resolved = lockPath ?? expandHome(getUpdateLockPath());
+  if (options.dryRun) return await lockState(resolved) !== "live";
   const owner = randomUUID();
   const payload = JSON.stringify({
     pid: process.pid,
@@ -11416,6 +11466,22 @@ async function doUpdate() {
     log.debug(`Auto-update skipped: ${reason}`);
     return;
   }
+  const pkgName = getCurrentPackageName();
+  const registry = resolveRegistryForPackage(pkgName);
+  const target = resolveInstallPrefix();
+  if (!target) {
+    const root = path35.dirname(path35.dirname(fileURLToPath3(import.meta.url)));
+    const message = `Self-update skipped: teamai is running from ${root}, which is not an npm install it can update in place (for example an \`npm link\` checkout). For a checkout, pull and rebuild it; to switch to the published package, run "npm install -g ${pkgName} --registry=${registry}".`;
+    log.warn(message);
+    log.persist(message);
+    return;
+  }
+  if (!target.global) {
+    const message = `Self-update is not supported for the vendored install at ${target.prefix} (npm would relocate or prune the runtime tree) \u2014 update manually.`;
+    log.warn(message);
+    log.persist(message);
+    return;
+  }
   if (policy === "prompt") {
     if (!isInteractive()) {
       log.info(`Update available: v${result.current} \u2192 v${result.latest}. Run "teamai update" to upgrade.`);
@@ -11435,16 +11501,7 @@ async function doUpdate() {
     return;
   }
   try {
-    const pkgName = getCurrentPackageName();
-    const registry = resolveRegistryForPackage(pkgName);
     const npm = resolveNpmCommand();
-    const target = resolveInstallPrefix();
-    if (target && !target.global) {
-      log.warn(
-        `Self-update is not supported for the vendored install at ${target.prefix} (npm would relocate or prune the runtime tree) \u2014 update manually.`
-      );
-      return;
-    }
     await execFileAsync(
       npm.cmd,
       [
@@ -11452,7 +11509,7 @@ async function doUpdate() {
         "install",
         "-g",
         pkgName,
-        ...target ? [`--prefix=${target.prefix}`] : [],
+        `--prefix=${target.prefix}`,
         `--registry=${registry}`
       ],
       { timeout: INSTALL_TIMEOUT, windowsHide: true }
@@ -11603,8 +11660,8 @@ async function readStdin() {
 }
 async function readLastAssistantOutput(transcriptPath) {
   try {
-    const stat9 = await fs15.promises.stat(transcriptPath);
-    const fileSize = stat9.size;
+    const stat10 = await fs15.promises.stat(transcriptPath);
+    const fileSize = stat10.size;
     if (fileSize === 0) return "";
     const readSize = Math.min(fileSize, TRANSCRIPT_TAIL_BYTES);
     const offset = Math.max(0, fileSize - readSize);
@@ -11676,12 +11733,12 @@ async function scanJsonlTranscriptOnce(transcriptPath, modelAliases) {
   const countedUsageKeys = /* @__PURE__ */ new Set();
   const historicalRequests = await readLocalRequestRecords();
   try {
-    const stat9 = await fs15.promises.stat(transcriptPath);
-    if (stat9.size === 0) {
+    const stat10 = await fs15.promises.stat(transcriptPath);
+    if (stat10.size === 0) {
       return { result: { interrupt, toolReject, toolError, tokens, prompts }, codexSnapshot: null };
     }
-    if (stat9.size > INTERVENTION_SCAN_MAX_BYTES) {
-      log.warn(`dashboard: transcript too large to scan (${stat9.size} bytes)`);
+    if (stat10.size > INTERVENTION_SCAN_MAX_BYTES) {
+      log.warn(`dashboard: transcript too large to scan (${stat10.size} bytes)`);
       return { result: { interrupt, toolReject, toolError, tokens, prompts }, codexSnapshot: null };
     }
     const rl = readline2.createInterface({
@@ -11823,10 +11880,10 @@ function preferCodexSnapshot(current, observed) {
 }
 async function readLatestCodexUsageFromTail(transcriptPath) {
   try {
-    const stat9 = await fs15.promises.stat(transcriptPath);
-    if (stat9.size === 0) return null;
-    const readSize = Math.min(stat9.size, CODEX_USAGE_TAIL_BYTES);
-    const offset = stat9.size - readSize;
+    const stat10 = await fs15.promises.stat(transcriptPath);
+    if (stat10.size === 0) return null;
+    const readSize = Math.min(stat10.size, CODEX_USAGE_TAIL_BYTES);
+    const offset = stat10.size - readSize;
     const fh = await fs15.promises.open(transcriptPath, "r");
     try {
       const buffer = Buffer.alloc(readSize);
@@ -11899,10 +11956,10 @@ function parseCopilotShutdown(entry) {
 }
 async function readLatestCopilotUsageFromTail(transcriptPath) {
   try {
-    const stat9 = await fs15.promises.stat(transcriptPath);
-    if (stat9.size === 0) return { shutdownObserved: false };
-    const readSize = Math.min(stat9.size, COPILOT_USAGE_TAIL_BYTES);
-    const offset = stat9.size - readSize;
+    const stat10 = await fs15.promises.stat(transcriptPath);
+    if (stat10.size === 0) return { shutdownObserved: false };
+    const readSize = Math.min(stat10.size, COPILOT_USAGE_TAIL_BYTES);
+    const offset = stat10.size - readSize;
     const fh = await fs15.promises.open(transcriptPath, "r");
     try {
       const buffer = Buffer.alloc(readSize);
@@ -11954,11 +12011,11 @@ async function waitForCopilotShutdownUsage(transcriptPath, initial) {
 }
 async function findCopilotRunMarkerAfter(transcriptPath, startOffset, startedAt, endedAt, useProviderTime) {
   try {
-    const stat9 = await fs15.promises.stat(transcriptPath);
-    if (startOffset > stat9.size || stat9.size - startOffset > COPILOT_RUN_SCAN_BYTES) {
+    const stat10 = await fs15.promises.stat(transcriptPath);
+    if (startOffset > stat10.size || stat10.size - startOffset > COPILOT_RUN_SCAN_BYTES) {
       return void 0;
     }
-    const readSize = stat9.size - startOffset;
+    const readSize = stat10.size - startOffset;
     const offset = startOffset;
     const fh = await fs15.promises.open(transcriptPath, "r");
     try {
@@ -11997,8 +12054,8 @@ async function readCopilotUsageForRun(transcriptPath, marker) {
   const descendants = /* @__PURE__ */ new Set([marker.id]);
   let latest = { shutdownObserved: false };
   try {
-    const stat9 = await fs15.promises.stat(transcriptPath);
-    if (stat9.size - marker.offset > COPILOT_RUN_SCAN_BYTES) return latest;
+    const stat10 = await fs15.promises.stat(transcriptPath);
+    if (stat10.size - marker.offset > COPILOT_RUN_SCAN_BYTES) return latest;
     const stream = fs15.createReadStream(transcriptPath, {
       start: marker.offset,
       encoding: "utf-8"
@@ -12051,8 +12108,8 @@ function resolveCopilotUsageTranscript(sessionId) {
 }
 async function readCodebuddyIndexOnce(transcriptPath) {
   try {
-    const stat9 = await fs15.promises.stat(transcriptPath);
-    if (stat9.size === 0 || stat9.size > INTERVENTION_SCAN_MAX_BYTES) return null;
+    const stat10 = await fs15.promises.stat(transcriptPath);
+    if (stat10.size === 0 || stat10.size > INTERVENTION_SCAN_MAX_BYTES) return null;
     const content = await fs15.promises.readFile(transcriptPath, "utf-8");
     const data = JSON.parse(content);
     if (!data || !Array.isArray(data.requests)) return null;
@@ -12085,8 +12142,8 @@ async function scanCodebuddyBlobs(messagesDir) {
   const erroredCallIds = /* @__PURE__ */ new Set();
   for (const blobPath of blobPaths) {
     try {
-      const stat9 = await fs15.promises.stat(blobPath);
-      if (stat9.size === 0 || stat9.size > INTERVENTION_SCAN_MAX_BYTES) continue;
+      const stat10 = await fs15.promises.stat(blobPath);
+      if (stat10.size === 0 || stat10.size > INTERVENTION_SCAN_MAX_BYTES) continue;
       const raw = await fs15.promises.readFile(blobPath, "utf-8");
       const blob = JSON.parse(raw);
       if (blob.role === "assistant") {
@@ -13660,11 +13717,24 @@ function sameFile(a, b, platform = process.platform) {
 function shellQuoteValue(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
-function extractEnvBlock(profileContent) {
-  const start = profileContent.indexOf(TEAMAI_ENV_START);
-  if (start === -1) return null;
-  const end = profileContent.indexOf(TEAMAI_ENV_END, start);
-  return end === -1 ? profileContent.slice(start) : profileContent.slice(start, end);
+function findEnvBlocks(profileContent) {
+  const blocks = [];
+  let from = 0;
+  for (; ; ) {
+    const start = profileContent.indexOf(TEAMAI_ENV_START, from);
+    if (start === -1) return blocks;
+    const endMarker = profileContent.indexOf(TEAMAI_ENV_END, start);
+    if (endMarker === -1) {
+      blocks.push({ text: profileContent.slice(start), start, end: null });
+      return blocks;
+    }
+    const end = endMarker + TEAMAI_ENV_END.length;
+    blocks.push({ text: profileContent.slice(start, endMarker), start, end });
+    from = end;
+  }
+}
+function findEnvBlockFor(profileContent, envShPath) {
+  return findEnvBlocks(profileContent).find((block) => envBlockReferencesDataHome(block.text, envShPath)) ?? null;
 }
 function envBlockSourcesPath(block, envShPath) {
   const posixPath = toGeneratedForm(envShPath);
@@ -13681,9 +13751,16 @@ function candidateSpellings(envShPath) {
   }
   return [...spellings];
 }
+function includesAsPath(text, spelling) {
+  for (let at = text.indexOf(spelling); at !== -1; at = text.indexOf(spelling, at + 1)) {
+    const after = at + spelling.length;
+    if ((at === 0 || /[\s'"]/.test(text[at - 1])) && (after === text.length || /[\s'";]/.test(text[after]))) return true;
+  }
+  return false;
+}
 function envBlockReferencesDataHome(block, envShPath) {
   for (const spelling of candidateSpellings(envShPath)) {
-    if (block.includes(spelling) || block.includes(shellQuoteValue(spelling)) || block.includes(`"${spelling}"`)) {
+    if (includesAsPath(block, spelling) || block.includes(shellQuoteValue(spelling)) || block.includes(`"${spelling}"`)) {
       return true;
     }
   }
@@ -13763,14 +13840,15 @@ async function resolveActiveShellProfile(envShPath, platform = process.platform)
   const activePick = await detectShellProfile(platform);
   const visited = /* @__PURE__ */ new Set();
   const queue = [activePick];
+  let firstWithBlock = null;
   while (queue.length > 0) {
     const current = queue.shift();
     if (visited.has(current)) continue;
     visited.add(current);
     const content = await readFileSafe(current);
-    const block = content ? extractEnvBlock(content) : null;
-    if (block && envBlockReferencesDataHome(block, envShPath)) return current;
     if (!content) continue;
+    if (findEnvBlockFor(content, envShPath)) return current;
+    if (firstWithBlock === null && findEnvBlocks(content).length > 0) firstWithBlock = current;
     for (const name of SHELL_PROFILE_CANDIDATE_NAMES) {
       const candidate = path38.join(home, name);
       if (candidate !== current && !visited.has(candidate) && await referencesCandidate(content, name)) {
@@ -13778,7 +13856,7 @@ async function resolveActiveShellProfile(envShPath, platform = process.platform)
       }
     }
   }
-  return activePick;
+  return firstWithBlock ?? activePick;
 }
 var SHELL_PROFILE_CANDIDATE_NAMES;
 var init_shell_profile = __esm({
@@ -13878,12 +13956,18 @@ function parseEnvYamlDocument(raw, label) {
 function envPushItem(relativePath, sourcePath) {
   return { name: relativePath.slice("env/".length), type: "env", sourcePath, relativePath };
 }
-var EnvVariableSchema, EnvYamlSchema, envEntryReader, ENV_KEY_RE, EnvHandler;
+async function userScopeEnvShPath() {
+  const userConfig = await loadLocalConfigForScope("user");
+  if (userConfig) return path39.join(getDataHome(userConfig), "env.sh");
+  return await pathExists(getUserConfigPath()) ? path39.join(getTeamaiHome("user"), "env.sh") : null;
+}
+var EnvVariableSchema, EnvYamlSchema, envEntryReader, ENV_KEY_RE, SOURCES_ENV_SH, EnvHandler;
 var init_env = __esm({
   "src/resources/env.ts"() {
     "use strict";
     init_base();
     init_types();
+    init_config();
     init_fs();
     init_logger();
     init_namespaced_entries();
@@ -13925,6 +14009,7 @@ var init_env = __esm({
       scopeOf: (variable) => variable
     };
     ENV_KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
+    SOURCES_ENV_SH = /(?:^|[\s;&|])(?:source|\.)\s[^\n;&|]*env\.sh/m;
     EnvHandler = class extends ResourceHandler {
       type = "env";
       /**
@@ -14014,7 +14099,7 @@ var init_env = __esm({
         if (inject) {
           const profilePath = teamConfig.sharing.env.shellProfilePath ? teamConfig.sharing.env.shellProfilePath : await this.detectShellProfile(envShPath);
           const shellBlock = this.generateShellBlock(teamaiHome);
-          await this.injectShellProfile(profilePath, shellBlock);
+          await this.injectShellProfile(profilePath, shellBlock, envShPath, localConfig.scope);
         }
         return true;
       }
@@ -14130,17 +14215,29 @@ var init_env = __esm({
         return resolveActiveShellProfile(envShPath, platform);
       }
       /**
-       * Inject the shell block into the profile file (idempotent).
+       * Inject this scope's shell block into the profile file (idempotent).
+       *
+       * The profile keeps the user scope's block plus at most one project block,
+       * the user's first so a project value wins on a key both define (#876). A
+       * scope replaces its own block. Otherwise a project takes over another
+       * project's block, never the user scope's, which keeps the project block
+       * last-wins; a user scope goes in right before the project block. Any other
+       * blocks (a hand-edited profile) are left alone.
        */
-      async injectShellProfile(profilePath, block) {
+      async injectShellProfile(profilePath, block, envShPath, scope) {
         const original = await readFileSafe(profilePath) ?? "";
         let content = original;
-        const startIdx = content.indexOf(TEAMAI_ENV_START);
-        const endIdx = content.indexOf(TEAMAI_ENV_END);
-        if (startIdx !== -1 && endIdx !== -1) {
-          const before = content.substring(0, startIdx);
-          const after = content.substring(endIdx + TEAMAI_ENV_END.length);
-          content = before + block + after;
+        const blocks = findEnvBlocks(content).filter((b) => b.end !== null);
+        let target = blocks.find((b) => envBlockReferencesDataHome(b.text, envShPath));
+        if (!target) {
+          const userEnvShPath = scope === "user" ? envShPath : await userScopeEnvShPath();
+          const isUserBlock = (b) => !SOURCES_ENV_SH.test(b.text) || userEnvShPath !== null && envBlockReferencesDataHome(b.text, userEnvShPath);
+          target = blocks.find((b) => scope === "user" ? isUserBlock(b) : !isUserBlock(b));
+        }
+        if (target) {
+          content = content.substring(0, target.start) + block + content.substring(target.end);
+        } else if (scope === "user" && blocks.length > 0) {
+          content = content.substring(0, blocks[0].start) + block + "\n\n" + content.substring(blocks[0].start);
         } else {
           if (content.length > 0 && !content.endsWith("\n")) {
             content += "\n";
@@ -22572,8 +22669,8 @@ async function cleanupStaleSessions(dir, currentSessionId) {
     if (name === currentBasename) continue;
     const filePath = path57.join(dir, entry);
     try {
-      const stat9 = await fs25.promises.stat(filePath);
-      if (now - stat9.mtimeMs > STALE_SESSION_MS) {
+      const stat10 = await fs25.promises.stat(filePath);
+      if (now - stat10.mtimeMs > STALE_SESSION_MS) {
         await fs25.promises.unlink(filePath);
       }
     } catch {
@@ -25974,7 +26071,7 @@ async function contribute(options) {
       log.debug(`contribute: post-publish index rebuild skipped: ${e.message}`);
     }
   }
-  const sessionId = options.sessionId || process.env.CLAUDE_SESSION_ID || "";
+  const sessionId = options.sessionId || await agentSessionIdFromEnv() || "";
   if (sessionId) {
     await markContributed(sessionId);
   }
@@ -26000,6 +26097,7 @@ var init_contribute = __esm({
     init_fs();
     init_logger();
     init_contribute_check();
+    init_session_id();
     init_pending_learnings();
     init_learnings_publish();
     init_learnings_roots();
@@ -27047,7 +27145,8 @@ async function capUsageEvents(config) {
 }
 async function withUsageLock(usagePath, wait, fn) {
   const lockPath = `${usagePath}.lock`;
-  for (let i = 0; i < wait.attempts; i++) {
+  const deadline = Date.now() + wait.budgetMs;
+  for (; ; ) {
     if (await acquireLock(lockPath)) {
       try {
         await foldPendingEvents2(usagePath);
@@ -27057,9 +27156,10 @@ async function withUsageLock(usagePath, wait, fn) {
       }
       return true;
     }
-    await new Promise((r) => setTimeout(r, wait.delayMs));
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) return false;
+    await new Promise((r) => setTimeout(r, Math.min(wait.delayMs, remaining)));
   }
-  return false;
 }
 function pendingPrefix(usagePath) {
   return `${path70.basename(usagePath, ".jsonl")}.pending-`;
@@ -27337,8 +27437,8 @@ var init_usage_tracker = __esm({
     ];
     PROJECT_SKILL_DIRS = [...SKILL_DIRS, ".github/skills"];
     USAGE_EVENT_CAP = 5e3;
-    APPEND_LOCK_WAIT = { attempts: 10, delayMs: 25 };
-    REWRITE_LOCK_WAIT = { attempts: 100, delayMs: 50 };
+    APPEND_LOCK_WAIT = { budgetMs: 250, delayMs: 25 };
+    REWRITE_LOCK_WAIT = { budgetMs: 5e3, delayMs: 50 };
     USAGE_SIDE_FILE_PATTERNS = ["usage.jsonl.*", "usage.pending-*.jsonl"];
   }
 });
@@ -28916,15 +29016,15 @@ function mergeLocalAndReported(localStats, reported) {
       });
     }
   }
-  for (const stat9 of localStats) {
-    const existing = map.get(stat9.name);
+  for (const stat10 of localStats) {
+    const existing = map.get(stat10.name);
     if (existing) {
-      existing.count += stat9.count;
-      if (stat9.lastUsed > existing.lastUsed) {
-        existing.lastUsed = stat9.lastUsed;
+      existing.count += stat10.count;
+      if (stat10.lastUsed > existing.lastUsed) {
+        existing.lastUsed = stat10.lastUsed;
       }
     } else {
-      map.set(stat9.name, { ...stat9 });
+      map.set(stat10.name, { ...stat10 });
     }
   }
   return Array.from(map.values()).sort((a, b) => b.count - a.count);
@@ -29019,10 +29119,10 @@ async function showStats(options = {}) {
     console.log("");
     const maxNameLen = Math.max(...stats.map((s) => s.name.length), 4);
     const maxCountLen = Math.max(...stats.map((s) => String(s.count).length), 4);
-    for (const stat9 of stats) {
-      const name = stat9.name.padEnd(maxNameLen);
-      const count = String(stat9.count).padStart(maxCountLen);
-      const recency = formatRelativeTime(stat9.lastUsed);
+    for (const stat10 of stats) {
+      const name = stat10.name.padEnd(maxNameLen);
+      const count = String(stat10.count).padStart(maxCountLen);
+      const recency = formatRelativeTime(stat10.lastUsed);
       console.log(`  ${name}  ${count} uses   last: ${recency}`);
     }
     const totalEvents = stats.reduce((sum, s) => sum + s.count, 0);
@@ -29259,16 +29359,16 @@ function mergeStats(existing, username, newEvents) {
       skills[name] = { count: data.count, lastUsed: data.lastUsed };
     }
   }
-  for (const stat9 of newEvents) {
-    const prev = skills[stat9.name];
-    const newLastUsed = stat9.lastUsed.toISOString();
+  for (const stat10 of newEvents) {
+    const prev = skills[stat10.name];
+    const newLastUsed = stat10.lastUsed.toISOString();
     if (prev) {
-      prev.count += stat9.count;
+      prev.count += stat10.count;
       if (newLastUsed > prev.lastUsed) {
         prev.lastUsed = newLastUsed;
       }
     } else {
-      skills[stat9.name] = { count: stat9.count, lastUsed: newLastUsed };
+      skills[stat10.name] = { count: stat10.count, lastUsed: newLastUsed };
     }
   }
   return {
@@ -29304,7 +29404,7 @@ async function readSnapshot(name, config, split, persist = true) {
   if (!persist) return seed;
   try {
     await writeJson(own, seed);
-    const sharedTime = await fs35.promises.stat(sharedSnapshotPath(name)).then((stat9) => stat9.mtime, () => void 0);
+    const sharedTime = await fs35.promises.stat(sharedSnapshotPath(name)).then((stat10) => stat10.mtime, () => void 0);
     if (sharedTime) await fs35.promises.utimes(own, sharedTime, sharedTime);
   } catch (e) {
     log.debug(`Could not seed ${own}: ${e.message}`);
@@ -29696,7 +29796,7 @@ function metricsAsOf(events, at) {
   return at === void 0 ? void 0 : aggregateSessionMetrics(events.filter((e) => Date.parse(e.timestamp) <= at));
 }
 async function snapshotWrittenAt(config) {
-  const mtime = (file) => fs35.promises.stat(file).then((stat9) => stat9.mtimeMs, () => void 0);
+  const mtime = (file) => fs35.promises.stat(file).then((stat10) => stat10.mtimeMs, () => void 0);
   const own = await mtime(scopeSnapshotPath("prompt-tokens", config));
   if (own === void 0) return mtime(sharedSnapshotPath("prompt-tokens"));
   const stats = config ? await mtime(path77.join(getReportsDir(config), "stats", `${config.username}.yaml`)) : void 0;
@@ -30357,10 +30457,10 @@ async function envDeliveryProblems(ctx) {
     teamConfig?.sharing?.env?.shellProfilePath ?? await envHandler2.detectShellProfile(envShPath)
   );
   const profile = await readFileSafe(profilePath);
-  const block = profile === null ? null : extractEnvBlock(profile);
+  const block = profile === null ? null : findEnvBlockFor(profile, envShPath);
   if (block === null) {
-    problems.push(`${profilePath} carries no TeamAI env block`);
-  } else if (envSh !== null && !envBlockSourcesPath(block, envShPath)) {
+    problems.push(`${profilePath} carries no TeamAI env block for ${envShPath}`);
+  } else if (envSh !== null && !envBlockSourcesPath(block.text, envShPath)) {
     problems.push(
       `the block in ${profilePath} does not load ${envShPath}: a POSIX shell reads an unquoted backslash as an escape, so the \`[ -f ... ]\` test fails and \`source\` never runs`
     );
@@ -30371,10 +30471,7 @@ async function envDeliveryProblems(ctx) {
     const candidate = path78.join(home, name);
     if (sameFile(candidate, profilePath)) continue;
     const content = await readFileSafe(candidate);
-    const strayBlock = content ? extractEnvBlock(content) : null;
-    if (strayBlock && envBlockReferencesDataHome(strayBlock, envShPath)) {
-      staleProfiles.push(candidate);
-    }
+    if (content && findEnvBlockFor(content, envShPath)) staleProfiles.push(candidate);
   }
   return { problems, staleProfiles };
 }
@@ -32025,8 +32122,8 @@ async function pull(options, result) {
   const lockScope = async (config) => {
     if (config.repo.kind === "http") return true;
     const lock = path81.join(getDataHome(config), SYNC_LOCK_FILENAME);
-    if (await acquireLock(lock)) {
-      heldLocks.set(config, lock);
+    if (await acquireLock(lock, { dryRun: options.dryRun })) {
+      if (!options.dryRun) heldLocks.set(config, lock);
       return true;
     }
     log.info(`[${config.scope}] sync in progress elsewhere \u2014 skipped (another pull/push holds the lock)`);
@@ -32037,9 +32134,13 @@ async function pull(options, result) {
     let projectConfig = null;
     const unreadable = [];
     try {
-      projectConfig = await detectProjectConfig(void 0, (configPath, error) => {
-        unreadable.push(`${configPath}: ${error}`);
-      });
+      projectConfig = await detectProjectConfig(
+        void 0,
+        (configPath, error) => {
+          unreadable.push(`${configPath}: ${error}`);
+        },
+        { dryRun: options.dryRun }
+      );
     } catch (e) {
       log.warn(`Project-scope detection error: ${e.message}`);
     }
@@ -32059,7 +32160,7 @@ async function pull(options, result) {
       log.info("project scope detected, skipped user scope");
     } else {
       try {
-        const loadedUserConfig = await loadLocalConfigForScope("user");
+        const loadedUserConfig = await loadLocalConfigForScope("user", void 0, { dryRun: options.dryRun });
         if (loadedUserConfig) {
           if (inheritUserScope) {
             inheritedUserConfig = loadedUserConfig;
@@ -32737,7 +32838,10 @@ var init_rules = __esm({
           }
         }
         await this.activateOpencodeInstructions(teamConfig, localConfig, rules.length > 0);
-        if (rules.length === 0) return;
+        if (rules.length === 0) {
+          await this.reclaimUnselectedTeamRules(teamConfig, localConfig);
+          return;
+        }
         for (const rule of rules) {
           await this.pullItem(rule, teamConfig, localConfig);
         }
@@ -32865,6 +32969,33 @@ var init_rules = __esm({
       /**
        * Recursively remove empty subdirectories under a given directory.
        */
+      /**
+       * Remove the copies of team rules that no longer reach this directory when none
+       * does — e.g. the last rule of a project the directory dropped, or of one an
+       * admin removed. Only a file TeamAI provably wrote goes: it sits at a team rule's
+       * delivery path and holds exactly what pull rendered for that tool, from the
+       * rule as it is now or as it was at a revision this checkout last pulled (the
+       * admin may have edited the rule before removing its project). That proof holds
+       * in rule directories shared with user-authored rules too, so JoyCode, OMP, Pi
+       * and Copilot are reclaimed like the rest. A personal rule, a locally edited
+       * copy and the author's own copy of a rule they published stay.
+       */
+      async reclaimUnselectedTeamRules(teamConfig, localConfig) {
+        const teamRules = await this.scanTeamForPull(teamConfig, localConfig);
+        if (teamRules.length === 0) return;
+        const deliveredRevs = (await (await Promise.resolve().then(() => (init_pull(), pull_exports))).resolveCheckoutBases(localConfig, await loadStateForScope(localConfig))).revs;
+        const touchedDirs = /* @__PURE__ */ new Set();
+        for (const item of teamRules) {
+          for (const { tool, dest, supersedes } of await this.deliveryTargets(teamConfig, localConfig, item)) {
+            if (supersedes) continue;
+            if (!await isDeliveredRender(tool, dest, item, localConfig.repo.localPath, deliveredRevs)) continue;
+            await remove(dest);
+            touchedDirs.add(path83.join(resolveToolBaseDir(tool, localConfig), scopedToolPaths(teamConfig, localConfig)[tool].rules));
+            log.debug(`Removed unselected team rule ${item.name} from ${tool}`);
+          }
+        }
+        for (const dir of touchedDirs) await this.removeEmptyDirs(dir);
+      }
       async removeEmptyDirs(dir) {
         if (!await pathExists(dir)) return;
         const subdirs = await listDirs(dir);
@@ -33273,6 +33404,7 @@ __export(push_exports, {
   filterExistingTopLevelPaths: () => filterExistingTopLevelPaths,
   push: () => push
 });
+import { chmod as chmod2, readFile as readFile4, stat as stat3 } from "fs/promises";
 import path86 from "path";
 import YAML20 from "yaml";
 async function filterExistingTopLevelPaths(repoPath, candidates) {
@@ -33453,13 +33585,22 @@ async function hasGitModeChange(git, filePath) {
     return true;
   }
 }
-function isTeamaiOwnedDirtyPath(filePath, pendingTeamConfig, modeChangedPaths) {
+async function readFileSnapshot(filePath) {
+  try {
+    const [content, stats] = await Promise.all([readFile4(filePath), stat3(filePath)]);
+    return { content, mode: stats.mode & 511 };
+  } catch {
+    return null;
+  }
+}
+function isTeamaiOwnedDirtyPath(filePath, pendingTeamConfig, modeChangedPaths, pendingEnvPaths) {
   const normalized = filePath.replaceAll("\\", "/");
   if (normalized === ".teamai/.sync-lock") return true;
+  if (pendingEnvPaths.has(normalized)) return true;
   return normalized === "teamai.yaml" && pendingTeamConfig !== null && !modeChangedPaths.has(normalized);
 }
-function collectUnsafeDirtyPaths(status2, pendingTeamConfig, modeChangedPaths = /* @__PURE__ */ new Set()) {
-  return collectDirtyPaths(status2).filter((filePath) => !isTeamaiOwnedDirtyPath(filePath, pendingTeamConfig, modeChangedPaths));
+function collectUnsafeDirtyPaths(status2, pendingTeamConfig, modeChangedPaths = /* @__PURE__ */ new Set(), pendingEnvPaths = /* @__PURE__ */ new Set()) {
+  return collectDirtyPaths(status2).filter((filePath) => !isTeamaiOwnedDirtyPath(filePath, pendingTeamConfig, modeChangedPaths, pendingEnvPaths));
 }
 function collisionPaths(type, placedAt) {
   if (type !== "agents") return [placedAt];
@@ -33579,7 +33720,7 @@ async function pushGroup(args) {
         log.debug(`Marketplace refresh skipped: ${e.message}`);
       }
     }
-    const sweeperCandidates = ["rules/", "env/", ".codebuddy-plugin/"];
+    const sweeperCandidates = ["rules/", ".codebuddy-plugin/"];
     const existingSweepers = await filterExistingTopLevelPaths(
       localConfig.repo.localPath,
       sweeperCandidates
@@ -33655,7 +33796,7 @@ ${items.map((i) => `- [${i.type}] ${i.name}`).join("\n")}`
   }
 }
 async function push(options, result) {
-  const { localConfig, teamConfig } = await autoDetectInit();
+  const { localConfig, teamConfig } = await autoDetectInit(void 0, { dryRun: options.dryRun });
   assertNotReadOnly(localConfig, "teamai push");
   if (options.project && options.role) {
     log.error("Use either --role or --project, not both.");
@@ -33676,30 +33817,22 @@ async function push(options, result) {
   }
   if (localConfig.repo.kind === "self") {
     const selfSyncLock = path86.join(getDataHome(localConfig), SYNC_LOCK_FILENAME);
-    if (!await acquireLock(selfSyncLock)) {
+    if (!await acquireLock(selfSyncLock, { dryRun: options.dryRun })) {
       log.error("Another teamai pull/push/migration is in progress for this project. Re-run once it finishes.");
       process.exitCode = 1;
       return;
     }
     try {
-      try {
-        const { migrateSelfModeGitignore: migrateSelfModeGitignore2 } = await Promise.resolve().then(() => (init_init(), init_exports));
-        await migrateSelfModeGitignore2(localConfig);
-      } catch {
+      if (!options.dryRun) {
+        try {
+          const { migrateSelfModeGitignore: migrateSelfModeGitignore2 } = await Promise.resolve().then(() => (init_init(), init_exports));
+          await migrateSelfModeGitignore2(localConfig);
+        } catch {
+        }
       }
       const { withKnowledgeWorktree: withKnowledgeWorktree2, EmptyRepoError: EmptyRepoError2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
       try {
-        const activeConfigPath = path86.join(localConfig.repo.localPath, "teamai.yaml");
-        const activeConfig = await readFileSafe(activeConfigPath);
-        const businessRoot = localConfig.repo.businessRepoRoot ?? localConfig.projectRoot;
-        let pendingTeamConfig = null;
-        if (activeConfig !== null && businessRoot) {
-          const relativeConfigPath = path86.relative(businessRoot, activeConfigPath).split(path86.sep).join("/");
-          const committed = await getFileContentAtRev(businessRoot, "HEAD", relativeConfigPath);
-          if (committed === null || committed.toString() !== activeConfig) {
-            pendingTeamConfig = activeConfig;
-          }
-        }
+        const pendingTeamConfig = await pendingSelfTeamConfig(localConfig);
         await withKnowledgeWorktree2(localConfig, async (wtConfig) => {
           if (pendingTeamConfig !== null) {
             await writeFile(path86.join(wtConfig.repo.localPath, "teamai.yaml"), pendingTeamConfig);
@@ -33720,7 +33853,7 @@ async function push(options, result) {
     return;
   }
   const syncLock = path86.join(getDataHome(localConfig), SYNC_LOCK_FILENAME);
-  const locked = await acquireLock(syncLock);
+  const locked = await acquireLock(syncLock, { dryRun: options.dryRun });
   if (!locked) {
     log.error("Another teamai pull/push is in progress for this project. Re-run once it finishes.");
     process.exitCode = 1;
@@ -33732,9 +33865,39 @@ async function push(options, result) {
     await releaseLock(syncLock);
   }
 }
+async function pendingSelfTeamConfig(localConfig) {
+  const activeConfigPath = path86.join(localConfig.repo.localPath, "teamai.yaml");
+  const activeConfig = await readFileSafe(activeConfigPath);
+  const businessRoot = localConfig.repo.businessRepoRoot ?? localConfig.projectRoot;
+  if (activeConfig === null || !businessRoot) return null;
+  const relativeConfigPath = path86.relative(businessRoot, activeConfigPath).split(path86.sep).join("/");
+  const committed = await getFileContentAtRev(businessRoot, "HEAD", relativeConfigPath);
+  return committed === null || committed.toString() !== activeConfig ? activeConfig : null;
+}
 async function pushCore(localConfig, teamConfig, options, initialPendingTeamConfig = null, result) {
   const selfMode = localConfig.repo.kind === "self";
   let pendingTeamConfig = initialPendingTeamConfig;
+  const pendingEnvFiles = /* @__PURE__ */ new Map();
+  const restorePendingEnvFiles = async () => {
+    const lost = [];
+    for (const [relativePath, { content, mode }] of pendingEnvFiles) {
+      const target = path86.join(localConfig.repo.localPath, ...relativePath.split("/"));
+      try {
+        await writeFile(target, content);
+        await chmod2(target, mode);
+      } catch (e) {
+        lost.push(`${relativePath} (${e.message})`);
+      }
+    }
+    return lost;
+  };
+  const reportLostEnvFiles = (lost) => {
+    log.error(
+      `Could not put back ${lost.join(", ")} after resetting the team repo, so that env edit is no longer in the clone. Nothing more was pushed. Run \`teamai env add\` again for the variables it held, then push.`
+    );
+    process.exitCode = 1;
+  };
+  let lostEnvFiles = [];
   let teamRepoStale = false;
   if (!selfMode) {
     const pullSpin = spinner("Pulling latest changes...").start();
@@ -33758,10 +33921,26 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
       if (pendingTeamConfig !== null && await hasGitModeChange(git, "teamai.yaml")) {
         modeChangedPaths.add("teamai.yaml");
       }
+      const status2 = await git.status();
+      const indexedPaths = new Set(collectDirtyPaths({
+        staged: status2.staged,
+        created: status2.created,
+        conflicted: status2.conflicted,
+        deleted: status2.deleted,
+        renamed: status2.renamed
+      }));
+      for (const item of await getHandler("env").scanLocalForPush(teamConfig, localConfig)) {
+        if (indexedPaths.has(item.relativePath)) continue;
+        const snapshot = await readFileSnapshot(item.sourcePath);
+        if (snapshot !== null && !await hasGitModeChange(git, item.relativePath)) {
+          pendingEnvFiles.set(item.relativePath, snapshot);
+        }
+      }
       const unsafeDirtyPaths = collectUnsafeDirtyPaths(
-        await git.status(),
+        status2,
         pendingTeamConfig,
-        modeChangedPaths
+        modeChangedPaths,
+        new Set(pendingEnvFiles.keys())
       );
       if (unsafeDirtyPaths.length > 0) {
         pullSpin.fail(
@@ -33770,8 +33949,12 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
         process.exitCode = 1;
         return;
       }
-      await resetToCleanMaster(git, repoPath);
-      await pullRepo(repoPath);
+      try {
+        await resetToCleanMaster(git, repoPath);
+        await pullRepo(repoPath);
+      } finally {
+        lostEnvFiles = await restorePendingEnvFiles();
+      }
       if (pendingTeamConfig !== null) {
         await writeFile(yamlPath, pendingTeamConfig);
       }
@@ -33780,6 +33963,10 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
       teamRepoStale = true;
       pullSpin.warn(`Pull failed: ${e.message}`);
     }
+    if (lostEnvFiles.length > 0) {
+      reportLostEnvFiles(lostEnvFiles);
+      return;
+    }
   }
   const brokenCatalogs = await brokenTeamProfileFiles(localConfig.repo.localPath);
   if (brokenCatalogs.length > 0) {
@@ -34206,11 +34393,20 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
       includeTeamConfig: groupIndex === configGroupIndex,
       branch: options.branch
     });
-    if (pendingTeamConfig !== null && groupIndex < configGroupIndex) {
+    const configPending = pendingTeamConfig !== null && groupIndex <= configGroupIndex;
+    if (outcome === "failed" && (configPending || pendingEnvFiles.size > 0)) {
+      await checkoutMaster(localConfig.repo.localPath);
+    }
+    if (pendingTeamConfig !== null && configPending && (groupIndex < configGroupIndex || outcome === "failed")) {
       await writeFile(path86.join(localConfig.repo.localPath, "teamai.yaml"), pendingTeamConfig);
     }
-    if (outcome === "failed") {
+    if (outcome === "pushed" || outcome === "pr-failed") {
+      for (const item of group.items) pendingEnvFiles.delete(item.relativePath);
+    }
+    const lost = await restorePendingEnvFiles();
+    if (outcome === "failed" || lost.length > 0) {
       await saveStateForScope(pushState, localConfig);
+      if (lost.length > 0) reportLostEnvFiles(lost);
       process.exitCode = 1;
       return;
     }
@@ -34238,6 +34434,8 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
       options,
       anyPrFailed ? void 0 : result
     );
+    const lost = await restorePendingEnvFiles();
+    if (lost.length > 0) reportLostEnvFiles(lost);
     return;
   }
   if (result && anyPushed && !anyPrFailed) result.completed = true;
@@ -34334,6 +34532,7 @@ __export(git_exports, {
   getHeadRev: () => getHeadRev,
   getRemoteUrl: () => getRemoteUrl,
   getRepoStatus: () => getRepoStatus,
+  gitBinary: () => gitBinary,
   hasCommits: () => hasCommits,
   hashObject: () => hashObject,
   initRepo: () => initRepo,
@@ -34356,16 +34555,53 @@ __export(git_exports, {
   resetToCleanMaster: () => resetToCleanMaster,
   resolveAnchors: () => resolveAnchors
 });
+import { spawnSync as spawnSync7 } from "child_process";
 import fs38 from "fs";
 import { realpath } from "fs/promises";
 import path87 from "path";
 import fse13 from "fs-extra";
 import simpleGit from "simple-git";
+function gitBinary(options = {}) {
+  if ((options.platform ?? process.platform) === "win32") return "git";
+  const pathEnv = options.pathEnv ?? process.env.PATH ?? "";
+  if (resolvedGit?.pathEnv !== pathEnv || !stillExecutable(resolvedGit.binary)) {
+    resolvedGit = { pathEnv, binary: lookUpGit(pathEnv) };
+  }
+  return resolvedGit.binary;
+}
+function stillExecutable(binary) {
+  if (binary === "git") return true;
+  try {
+    fs38.accessSync(binary, fs38.constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function lookUpGit(pathEnv) {
+  for (const dir of pathEnv.split(path87.delimiter)) {
+    if (!path87.isAbsolute(dir)) return "git";
+    const candidate = path87.join(dir, "git");
+    let stat10;
+    try {
+      stat10 = fs38.statSync(candidate);
+    } catch (e) {
+      if (typeof e === "object" && e !== null && "code" in e && (e.code === "ENOENT" || e.code === "ENOTDIR")) continue;
+      return "git";
+    }
+    if (!stat10.isFile() || !SIMPLE_GIT_SAFE_BINARY.test(candidate)) return "git";
+    return spawnsByPath(candidate) ? candidate : "git";
+  }
+  return "git";
+}
+function spawnsByPath(candidate) {
+  return spawnSync7(candidate, ["--version"], { stdio: "ignore", timeout: 1e4 }).error === void 0;
+}
 function createGit(basePath) {
   if (basePath) {
-    return simpleGit({ baseDir: basePath });
+    return simpleGit({ baseDir: basePath, binary: gitBinary() });
   }
-  return simpleGit();
+  return simpleGit({ binary: gitBinary() });
 }
 function commitSkippingHooks(git, message, paths) {
   if (paths === void 0) return git.commit(message, { "--no-verify": null });
@@ -34379,7 +34615,7 @@ async function isGitRepo(localPath) {
 }
 async function initRepo(remote, localPath) {
   await fse13.ensureDir(localPath);
-  const git = simpleGit({ baseDir: localPath });
+  const git = createGit(localPath);
   await git.init();
   await git.addRemote("origin", remote);
 }
@@ -34861,11 +35097,12 @@ async function getRepoStatus(localPath) {
     modified: [...status2.modified, ...status2.not_added, ...status2.created]
   };
 }
-var defaultBranchCache, anchorsByDir;
+var SIMPLE_GIT_SAFE_BINARY, resolvedGit, defaultBranchCache, anchorsByDir;
 var init_git2 = __esm({
   "src/utils/git.ts"() {
     "use strict";
     init_logger();
+    SIMPLE_GIT_SAFE_BINARY = /^([a-z]:)?([a-z0-9/.\\_~-]+)$/i;
     defaultBranchCache = /* @__PURE__ */ new Map();
     anchorsByDir = /* @__PURE__ */ new Map();
   }
@@ -37027,7 +37264,7 @@ async function status(options) {
     await statusAll();
     return;
   }
-  const { localConfig, teamConfig } = await autoDetectInit();
+  const { localConfig, teamConfig } = await autoDetectInit(void 0, { dryRun: true });
   const scopeLabel = localConfig.scope;
   console.log("");
   log.info(`Scope: ${scopeLabel}${scopeLabel === "project" && localConfig.projectRoot ? ` (${localConfig.projectRoot})` : ""}`);
@@ -37157,7 +37394,7 @@ async function statusAll() {
   }
 }
 async function list(type, options) {
-  const { localConfig, teamConfig } = await autoDetectInit();
+  const { localConfig, teamConfig } = await autoDetectInit(void 0, { dryRun: true });
   const repoPath = localConfig.repo.localPath;
   const source = options.source ?? "all";
   if (!["repo", "local", "all"].includes(source)) {
@@ -37707,13 +37944,21 @@ async function removeCore(type, names, options, localConfig, teamConfig) {
     }
     if (type === "mcp" && !name.includes("/")) {
       const target = await mcpRemovalTarget(name, teamItems.filter((item) => item.name === name).map(qualified), localConfig, options);
-      if (target === "ambiguous") {
-        ambiguous = true;
-      } else if (target === null) {
-        notFound2.push(name);
-      } else {
-        if (target !== name) log.info(`${name} is ${target}`);
-        found.push(target);
+      switch (target.kind) {
+        case "ambiguous":
+          ambiguous = true;
+          break;
+        case "not-found":
+          notFound2.push(name);
+          break;
+        case "target":
+          if (target.name !== name) log.info(`${name} is ${target.name}`);
+          found.push(target.name);
+          break;
+        default: {
+          const unhandled = target;
+          throw new Error(`Unhandled MCP removal target: ${JSON.stringify(unhandled)}`);
+        }
       }
       continue;
     }
@@ -37842,33 +38087,34 @@ async function mcpRemovalTarget(name, candidates, localConfig, options) {
     const target = await entryNamespaceFromFlags2(localConfig.repo.localPath, "mcp", options);
     if (!target.ok) {
       log.error(target.message);
-      return "ambiguous";
+      return { kind: "ambiguous" };
     }
     const wanted = target.namespace === null ? name : `${target.namespace}/${name}`;
-    if (candidates.includes(wanted)) return wanted;
+    if (candidates.includes(wanted)) return { kind: "target", name: wanted };
     const file = entryFilePath2("mcp", target.namespace);
     if ((await unreadableMcpFiles(localConfig.repo.localPath)).includes(file)) {
       log.error(`${file} does not parse, so "${name}" cannot be found in it. Fix it in the team repo, then retry.`);
-      return "ambiguous";
+      return { kind: "ambiguous" };
     }
-    return null;
+    return { kind: "not-found" };
   }
-  if (candidates.includes(name)) return name;
+  if (candidates.includes(name)) return { kind: "target", name };
   const unreadable = await unreadableMcpFiles(localConfig.repo.localPath);
   if (unreadable.length > 0) {
     log.error(
       `Cannot tell which MCP file defines "${name}": ${unreadable.join(", ")} does not parse. Fix it in the team repo, or pass --role <ns> or --project <id> to name the file.`
     );
-    return "ambiguous";
+    return { kind: "ambiguous" };
   }
   if (candidates.length > 1) {
     const files = candidates.map((candidate) => `mcp/${candidate.slice(0, candidate.lastIndexOf("/"))}/mcp.yaml`);
     log.error(
       `MCP server "${name}" is not in mcp/mcp.yaml but is defined in several namespace files (${files.join(", ")}), and each reaches different members. Pass --role <ns> or --project <id> to remove it from one of them.`
     );
-    return "ambiguous";
+    return { kind: "ambiguous" };
   }
-  return candidates[0] ?? null;
+  const only = candidates[0];
+  return only === void 0 ? { kind: "not-found" } : { kind: "target", name: only };
 }
 async function unreadableMcpFiles(repoPath) {
   const { listEntryFiles: listEntryFiles2 } = await Promise.resolve().then(() => (init_namespaced_entries(), namespaced_entries_exports));
@@ -39174,8 +39420,7 @@ async function buildRemovalPlan(localConfig, teamConfig, agentFilter) {
     ]));
     for (const candidate of candidateProfilePaths) {
       const profileContent = await readFileSafe(candidate);
-      const block = profileContent ? extractEnvBlock(profileContent) : null;
-      if (block && envBlockReferencesDataHome(block, envShPath)) {
+      if (profileContent && findEnvBlockFor(profileContent, envShPath)) {
         plan.shellProfiles.push(candidate);
       }
     }
@@ -39437,15 +39682,15 @@ async function executeRemoval(plan) {
   if (plan.agentFiles.length > 0) {
     log.success(`Removed ${plan.agentFiles.length} agent files`);
   }
+  const envShPath = path97.join(plan.teamaiHome, "env.sh");
   for (const profilePath of plan.shellProfiles) {
     try {
       const content = await readFileSafe(profilePath);
       if (content) {
-        const startIdx = content.indexOf(TEAMAI_ENV_START);
-        const endIdx = content.indexOf(TEAMAI_ENV_END);
-        if (startIdx !== -1 && endIdx !== -1) {
-          const before = content.substring(0, startIdx).replace(/\n+$/, "\n");
-          const after = content.substring(endIdx + TEAMAI_ENV_END.length).replace(/^\n+/, "\n");
+        const block = findEnvBlockFor(content, envShPath);
+        if (block && block.end !== null) {
+          const before = content.substring(0, block.start).replace(/\n+$/, "\n");
+          const after = content.substring(block.end).replace(/^\n+/, "\n");
           await writeFile(profilePath, before + after);
           log.success(`Cleaned shell profile: ${profilePath}`);
         }
@@ -40307,7 +40552,7 @@ async function saveSession(options) {
     log.info("No local session data yet \u2014 nothing to save.");
     return;
   }
-  const sessionId = options.sessionId || process.env.CLAUDE_SESSION_ID || mostRecentSessionId(events);
+  const sessionId = options.sessionId || await agentSessionIdFromEnv() || mostRecentSessionId(events);
   if (!sessionId) {
     log.error("Could not determine a session id. Pass --session-id <id>.");
     return;
@@ -40431,6 +40676,7 @@ var init_save_session = __esm({
     init_session_collector();
     init_logger();
     init_async();
+    init_session_id();
     init_types();
   }
 });
@@ -40463,7 +40709,7 @@ async function dashboardWorkspaces(events) {
   const seen = /* @__PURE__ */ new Set();
   async function add(root, dataHome) {
     if (seen.has(root)) return;
-    if (!await fs41.stat(root).then((stat9) => stat9.isDirectory()).catch(() => false)) return;
+    if (!await fs41.stat(root).then((stat10) => stat10.isDirectory()).catch(() => false)) return;
     const config = await readConfigFrom(dataHome, root);
     if (!config) return;
     seen.add(root);
@@ -41748,16 +41994,16 @@ function renderOverviewCards(data) {
   return `<section id="overview"><h2 data-i18n>Overview</h2><div class="cards">${cardHtml}</div></section>`;
 }
 function renderCoverageSection(coverage) {
-  const rows = coverage.map((stat9) => {
-    const label = escapeHtml(stat9.type);
-    const pct = stat9.coveragePct;
+  const rows = coverage.map((stat10) => {
+    const label = escapeHtml(stat10.type);
+    const pct = stat10.coveragePct;
     return [
       `<div class="cov-row">`,
       `  <div class="cov-label">${label}</div>`,
       `  <div class="cov-bar-wrap">`,
       `    <div class="cov-bar" style="width:${pct}%"></div>`,
       `  </div>`,
-      `  <div class="cov-stat">${stat9.covered}/${stat9.total} (${pct}%)</div>`,
+      `  <div class="cov-stat">${stat10.covered}/${stat10.total} (${pct}%)</div>`,
       `</div>`
     ].join("");
   }).join("");
@@ -42513,7 +42759,7 @@ async function getVizSummary(opts = {}) {
   return {
     totalEntries: data.totalEntries,
     overallCoveragePct: data.overallCoveragePct,
-    coverage: (data.coverage ?? []).map((stat9) => ({ type: stat9.type, coveragePct: stat9.coveragePct })),
+    coverage: (data.coverage ?? []).map((stat10) => ({ type: stat10.type, coveragePct: stat10.coveragePct })),
     source: data.source
   };
 }
@@ -42582,27 +42828,30 @@ async function startDashboard(port) {
   const contextRequests = /* @__PURE__ */ new Map();
   const contextCaches = /* @__PURE__ */ new Map();
   const clients = /* @__PURE__ */ new Set();
-  let watchDebounce = null;
-  const watcher = fs43.watch(eventsPath, () => {
-    if (watchDebounce) clearTimeout(watchDebounce);
-    watchDebounce = setTimeout(async () => {
-      try {
-        const events = await readEvents(eventsPath);
-        const workspaces = await getWorkspaces(events);
-        const sessions = rebuildSessions(events);
-        const data = JSON.stringify(sessions);
-        for (const client of clients) {
-          const workspace = workspaces.find((w) => w.id === clientScopes.get(client));
-          client.write(`data: ${workspace ? JSON.stringify(rebuildSessions(workspaceEvents(events, workspace, workspaces))) : data}
+  const pushSessions = async () => {
+    try {
+      const events = await readEvents(eventsPath);
+      const workspaces = await getWorkspaces(events);
+      const sessions = rebuildSessions(events);
+      const data = JSON.stringify(sessions);
+      for (const client of clients) {
+        const workspace = workspaces.find((w) => w.id === clientScopes.get(client));
+        client.write(`data: ${workspace ? JSON.stringify(rebuildSessions(workspaceEvents(events, workspace, workspaces))) : data}
 
 `);
-        }
-      } catch (e) {
-        log.debug(`dashboard: SSE push error: ${e.message}`);
       }
-    }, 200);
+    } catch (e) {
+      log.debug(`dashboard: SSE push error: ${e.message}`);
+    }
+  };
+  let watchDebounce = null;
+  const eventsFileName = path107.basename(eventsPath);
+  const watcher = fs43.watch(path107.dirname(eventsPath), (_eventType, filename) => {
+    if (filename && filename.toString() !== eventsFileName) return;
+    if (watchDebounce) clearTimeout(watchDebounce);
+    watchDebounce = setTimeout(() => void pushSessions(), 200);
   });
-  const pidCheckInterval = setInterval(async () => {
+  const checkPids = async () => {
     try {
       const events = await readEvents(eventsPath);
       const sessions = rebuildSessions(events);
@@ -42631,8 +42880,9 @@ async function startDashboard(port) {
     } catch (e) {
       log.debug(`dashboard: PID check error: ${e.message}`);
     }
-  }, DASHBOARD_PID_CHECK_INTERVAL_MS);
-  const server = http.createServer(async (req, res) => {
+  };
+  const pidCheckInterval = setInterval(() => void checkPids(), DASHBOARD_PID_CHECK_INTERVAL_MS);
+  const handleRequest = async (req, res) => {
     const url = new URL(req.url ?? "/", `http://localhost:${serverPort}`);
     res.setHeader("Access-Control-Allow-Origin", "*");
     if (url.pathname === "/" || url.pathname === "/index.html") {
@@ -42761,6 +43011,15 @@ async function startDashboard(port) {
     }
     res.writeHead(404, { "Content-Type": "text/plain" });
     res.end("Not Found");
+  };
+  const server = http.createServer((req, res) => {
+    handleRequest(req, res).catch((e) => {
+      log.debug(`dashboard: request error: ${e instanceof Error ? e.message : String(e)}`);
+      if (!res.headersSent) {
+        res.writeHead(500, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Internal error" }));
+      }
+    });
   });
   server.on("error", (err) => {
     if (err.code === "EADDRINUSE") {
@@ -43144,8 +43403,8 @@ async function parseTranscriptForVotes(transcriptPath) {
   let finalAssistantText = "";
   let finalAssistantId;
   try {
-    const stat9 = await fs45.promises.stat(transcriptPath);
-    if (stat9.size === 0) return emptyResult();
+    const stat10 = await fs45.promises.stat(transcriptPath);
+    if (stat10.size === 0) return emptyResult();
   } catch {
     return emptyResult();
   }
@@ -43837,7 +44096,7 @@ __export(mr_hint_exports, {
   mrHint: () => mrHint,
   parseRemoteToRepo: () => parseRemoteToRepo
 });
-import { spawnSync as spawnSync7 } from "child_process";
+import { spawnSync as spawnSync8 } from "child_process";
 import fs48 from "fs";
 import path113 from "path";
 function repoSlug(owner, repo) {
@@ -43875,7 +44134,7 @@ function saveCache(owner, repo, cache) {
 }
 function getGitRemote(cwd) {
   try {
-    const result = spawnSync7("git", ["remote", "get-url", "origin"], {
+    const result = spawnSync8("git", ["remote", "get-url", "origin"], {
       cwd,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -43962,7 +44221,7 @@ async function listGitHubMergedMRsViaREST(owner, repo, since) {
 }
 async function listGitHubMergedMRs(owner, repo, since) {
   try {
-    const result = spawnSync7(
+    const result = spawnSync8(
       "gh",
       [
         "pr",
@@ -44558,6 +44817,7 @@ __export(hook_dispatch_cli_exports, {
   deriveDispatchSessionId: () => deriveDispatchSessionId,
   hookDispatchCli: () => hookDispatchCli,
   parseStdin: () => parseStdin,
+  readStdin: () => readStdin4,
   salvageStdinFields: () => salvageStdinFields,
   trySpawnDetachedViaWmi: () => trySpawnDetachedViaWmi
 });
@@ -44565,17 +44825,23 @@ import { spawn as spawn4 } from "child_process";
 import fs49 from "fs";
 import os10 from "os";
 import path115 from "path";
-async function readStdin4() {
-  if (process.stdin.isTTY) return "";
+async function readStdin4(stream = process.stdin, timeoutMs = STDIN_READ_TIMEOUT_MS) {
+  if (stream.isTTY) return "";
   const chunks = [];
   const readAll = (async () => {
-    for await (const chunk of process.stdin) {
+    for await (const chunk of stream) {
       chunks.push(chunk);
     }
   })();
+  void readAll.catch(() => {
+  });
   let timer;
+  let timedOut = false;
   const deadline = new Promise((resolve) => {
-    timer = setTimeout(resolve, STDIN_READ_TIMEOUT_MS);
+    timer = setTimeout(() => {
+      timedOut = true;
+      resolve();
+    }, timeoutMs);
     timer.unref();
   });
   try {
@@ -44583,8 +44849,7 @@ async function readStdin4() {
   } finally {
     if (timer) clearTimeout(timer);
   }
-  readAll.catch(() => {
-  });
+  if (timedOut && !stream.destroyed) stream.destroy();
   return Buffer.concat(chunks).toString("utf-8");
 }
 async function spawnBackground(event, tool, matcher, raw, cwd) {
@@ -44888,7 +45153,7 @@ __export(graph_index_schema_exports, {
   toPageSlug: () => toPageSlug,
   validateGraph: () => validateGraph
 });
-import { readFile as readFile4, writeFile as writeFile3, mkdir as mkdir2 } from "fs/promises";
+import { readFile as readFile5, writeFile as writeFile3, mkdir as mkdir2 } from "fs/promises";
 import path117 from "path";
 import { z as z11 } from "zod";
 function toPageSlug(relativePath) {
@@ -45076,7 +45341,7 @@ function computeGraphHealth(graph) {
 async function loadGraphIndex(wikiRoot) {
   const graphPath = path117.join(wikiRoot, ".indices", "graph-index.json");
   try {
-    const raw = await readFile4(graphPath, "utf8");
+    const raw = await readFile5(graphPath, "utf8");
     const parsed = JSON.parse(raw);
     return parseGraphIndex(parsed);
   } catch {
@@ -45227,7 +45492,7 @@ var init_graph_index_schema = __esm({
 });
 
 // src/code-knowledge-recall.ts
-import { readFile as readFile5, readdir as readdir2 } from "fs/promises";
+import { readFile as readFile6, readdir as readdir2 } from "fs/promises";
 import path118 from "path";
 import matter9 from "gray-matter";
 function countOccurrences(text, token) {
@@ -45365,7 +45630,7 @@ async function loadWikiPages(wikiRoot, depth) {
   if (depth === "route") {
     const routerPath = path118.join(wikiRoot, "router.md");
     try {
-      const content = await readFile5(routerPath, "utf-8");
+      const content = await readFile6(routerPath, "utf-8");
       const titleMatch = content.match(/^title:\s*(.+)$/m);
       const title = titleMatch ? titleMatch[1].trim() : "Team Wiki Router";
       pages.push({
@@ -45477,7 +45742,7 @@ async function loadPagesRecursive(dir, relativePath, pages, depth, currentDepth
         if (depthFromProject <= 1 && NAVIGATION_FILES.has(entry.name)) continue;
       }
       try {
-        const content = await readFile5(fullPath, "utf-8");
+        const content = await readFile6(fullPath, "utf-8");
         let title;
         let sources;
         try {
@@ -45632,6 +45897,7 @@ __export(recall_exports, {
   computeIdfBaseline: () => computeIdfBaseline,
   formatResults: () => formatResults,
   isRelevantScore: () => isRelevantScore,
+  normalizeLearningsScoreForRanking: () => normalizeLearningsScoreForRanking,
   recall: () => recall
 });
 import path119 from "path";
@@ -45650,6 +45916,12 @@ function computeIdfBaseline(indexes) {
   if (maxEntries === 0) return 1;
   return Math.log((maxEntries + 1) / 2) + 1;
 }
+function normalizeLearningsScoreForRanking(score, idfBaseline) {
+  if (score <= 0) return 0;
+  const baseline = idfBaseline > 0 ? idfBaseline : 1;
+  const threshold = Math.max(baseline * LEARNINGS_RELEVANCE_RATIO, LEARNINGS_ABSOLUTE_FLOOR);
+  return Math.min(10, Math.max(0, 4 + 2 * Math.log2(score / threshold)));
+}
 function resolveReadablePath(indexedPath, filename, learningsBase) {
   if (indexedPath && existsSync3(indexedPath)) return indexedPath;
   const underBase = learningsBase ? path119.join(learningsBase, filename) : null;
@@ -45919,13 +46191,14 @@ async function recall(query, options) {
   );
   const idfBaseline = computeIdfBaseline(scopeIndexes.map((s) => s.index));
   for (const { index, scope, learningsBase } of scopeIndexes) {
+    const scopeIdfBaseline = computeIdfBaseline([index]);
     const results = search(query, index);
     for (const r of results) {
       const entryKey = `${r.entry.type}:${r.entry.filename}`;
       if (scope === "user" && projectEntryKeys.has(entryKey)) continue;
       if (!seenEntries.has(entryKey)) {
         seenEntries.add(entryKey);
-        allResults.push({ ...r, scope, learningsBase });
+        allResults.push({ ...r, scope, learningsBase, idfBaseline: scopeIdfBaseline });
       }
     }
   }
@@ -45957,18 +46230,20 @@ async function recall(query, options) {
   } catch {
     log.warn("recall: code graph retrieval unavailable, run teamai codebase --lint to diagnose");
   }
+  const rankingScore = (result) => result.fromCodebase ? result.score : normalizeLearningsScoreForRanking(result.score, result.idfBaseline ?? idfBaseline);
   allResults.sort((a, b) => {
-    if (b.score !== a.score) return b.score - a.score;
+    const scoreDelta = rankingScore(b) - rankingScore(a);
+    if (scoreDelta !== 0) return scoreDelta;
     return (b.entry.date || "").localeCompare(a.entry.date || "");
   });
   if (options.check) {
     const top = allResults.length > 0 ? allResults[0] : void 0;
-    emitCheckVerdict(top?.score ?? 0, top?.fromCodebase ?? false, idfBaseline, top);
+    emitCheckVerdict(top?.score ?? 0, top?.fromCodebase ?? false, top?.idfBaseline ?? idfBaseline, top);
     return;
   }
   const topResults = allResults.slice(0, 5);
   if (process.env.TEAMAI_RECALL_DISABLED !== "1") {
-    recordRecallQuality(deriveSessionId({}), topResults);
+    recordRecallQuality(await agentSessionIdFromEnv() ?? deriveSessionId({}), topResults);
   }
   if (topResults.length === 0) {
     log.info(`No matching learnings found for "${query}".`);
@@ -46158,8 +46433,8 @@ function keyToAbsPath(key) {
 async function loadCacheIndex() {
   const indexPath = path121.join(getCacheRoot(), INDEX_FILENAME);
   try {
-    const stat9 = await fs50.stat(indexPath);
-    if (stat9.size > MAX_CONFIG_FILE_BYTES) {
+    const stat10 = await fs50.stat(indexPath);
+    if (stat10.size > MAX_CONFIG_FILE_BYTES) {
       throw new Error(`${indexPath} exceeds max allowed size 10MB`);
     }
     const raw = await fs50.readFile(indexPath, "utf8");
@@ -46188,20 +46463,20 @@ function emptyIndex() {
 }
 async function statDirSize(absPath) {
   let total = 0;
-  let stat9;
+  let stat10;
   try {
-    stat9 = await fs50.lstat(absPath);
+    stat10 = await fs50.lstat(absPath);
   } catch (err) {
     log.debug(`[cache-index] statDirSize: lstat failed, skipping ${absPath}: ${String(err)}`);
     return 0;
   }
-  if (stat9.isSymbolicLink()) {
+  if (stat10.isSymbolicLink()) {
     return 0;
   }
-  if (stat9.isFile()) {
-    return stat9.size;
+  if (stat10.isFile()) {
+    return stat10.size;
   }
-  if (!stat9.isDirectory()) {
+  if (!stat10.isDirectory()) {
     return 0;
   }
   let entries;
@@ -46623,8 +46898,8 @@ async function scanCandidates(opts) {
       if (ext !== ".md" && ext !== ".txt") continue;
       const absPath = path122.join(expandedDir, relPath);
       try {
-        const stat9 = fs51.statSync(absPath);
-        if (stat9.size > MAX_FILE_SIZE_BYTES) continue;
+        const stat10 = fs51.statSync(absPath);
+        if (stat10.size > MAX_FILE_SIZE_BYTES) continue;
       } catch (statErr) {
         log.warn(`cannot stat file, skipped: ${absPath} (${String(statErr)})`);
         continue;
@@ -46649,8 +46924,8 @@ async function scanCandidates(opts) {
         if (path122.extname(relPath).toLowerCase() !== ".md") continue;
         const absPath = path122.join(baseDir, relPath);
         try {
-          const stat9 = fs51.statSync(absPath);
-          if (stat9.size > MAX_FILE_SIZE_BYTES) continue;
+          const stat10 = fs51.statSync(absPath);
+          if (stat10.size > MAX_FILE_SIZE_BYTES) continue;
         } catch (statErr) {
           log.warn(`cannot stat file, skipped: ${absPath} (${String(statErr)})`);
           continue;
@@ -47095,7 +47370,7 @@ var init_iwiki_client = __esm({
 
 // src/import-iwiki.ts
 import path123 from "path";
-import { readFile as readFile6, writeFile as writeFile4 } from "fs/promises";
+import { readFile as readFile7, writeFile as writeFile4 } from "fs/promises";
 function parseIWikiInput(input) {
   const trimmed = input.trim();
   if (/^\d+$/.test(trimmed)) {
@@ -47204,7 +47479,7 @@ async function importFromIWiki(opts) {
 }
 async function reconcileIwikiWithCodebase(documents, teamwikiRoot) {
   const graphPath = path123.join(teamwikiRoot, ".indices", "graph-index.json");
-  const graphRaw = await readFile6(graphPath, "utf-8");
+  const graphRaw = await readFile7(graphPath, "utf-8");
   const graph = JSON.parse(graphRaw);
   const codeLabels = /* @__PURE__ */ new Map();
   for (const node of graph.nodes) {
@@ -47222,7 +47497,7 @@ async function reconcileIwikiWithCodebase(documents, teamwikiRoot) {
       const files = await readdir10(projectDir).catch(() => []);
       for (const file of files) {
         if (!file.endsWith(".md")) continue;
-        const content = await readFile6(path123.join(projectDir, file), "utf-8").catch(() => "");
+        const content = await readFile7(path123.join(projectDir, file), "utf-8").catch(() => "");
         codePageContents.set(`evidence/code/${project}/${file}`, content);
       }
     }
@@ -47519,8 +47794,8 @@ async function resolveDocDate(filePath, filename) {
       return parsed;
     }
   }
-  const stat9 = await fs52.stat(filePath);
-  return stat9.mtime;
+  const stat10 = await fs52.stat(filePath);
+  return stat10.mtime;
 }
 async function listComparableLearnings(learningsDirs, namespaces) {
   const out = await listLearningFiles(learningsDirs);
@@ -48127,7 +48402,7 @@ var init_codebase = __esm({
 // src/wiki-engine/code-knowledge/code-collector.ts
 import { createHash as createHash11 } from "crypto";
 import { execFile as execFile3 } from "child_process";
-import { readFile as readFile7, readdir as readdir3, stat as stat3 } from "fs/promises";
+import { readFile as readFile8, readdir as readdir3, stat as stat4 } from "fs/promises";
 import path127 from "path";
 import { promisify as promisify3 } from "util";
 function isKeyFile(relativePath, language) {
@@ -48162,7 +48437,7 @@ async function collectCode(options) {
   const limited = filtered.slice(0, options.maxFiles ?? 200);
   const files = [];
   for (const filePath of limited) {
-    const content = await readFile7(filePath, "utf8");
+    const content = await readFile8(filePath, "utf8");
     const relativePath = toPosix(path127.relative(root, filePath));
     const language = languageFor(filePath);
     files.push({
@@ -48196,7 +48471,7 @@ async function walk(directory, results, includeTests) {
     }
     if (entry.isDirectory()) {
       await walk(fullPath, results, includeTests);
-    } else if (entry.isFile() && isCodeFile(fullPath) && (await stat3(fullPath)).size < 256e3) {
+    } else if (entry.isFile() && isCodeFile(fullPath) && (await stat4(fullPath)).size < 256e3) {
       results.push(fullPath);
     }
   }
@@ -49182,7 +49457,7 @@ var init_call_resolver = __esm({
 });
 
 // src/wiki-engine/code-knowledge/ast/import-resolver.ts
-import { readFile as readFile8, stat as stat4 } from "fs/promises";
+import { readFile as readFile9, stat as stat5 } from "fs/promises";
 import path129 from "path";
 async function loadTsconfigPaths(repoRoot, fromRelativeFile) {
   const absDir = path129.dirname(path129.resolve(repoRoot, fromRelativeFile));
@@ -49194,7 +49469,7 @@ async function loadTsconfigPaths(repoRoot, fromRelativeFile) {
     }
     const configPath = path129.join(dir, "tsconfig.json");
     try {
-      const raw = JSON.parse(await readFile8(configPath, "utf8"));
+      const raw = JSON.parse(await readFile9(configPath, "utf8"));
       const configDir = path129.dirname(configPath);
       const baseUrl = raw.compilerOptions?.baseUrl ?? ".";
       const pathsMap = raw.compilerOptions?.paths ?? {};
@@ -49345,7 +49620,7 @@ async function buildFileExistenceChecker(repoRoot, knownFiles) {
     if (knownFiles.has(relativePath)) return true;
     try {
       const abs = path129.resolve(repoRoot, relativePath);
-      const s = await stat4(abs);
+      const s = await stat5(abs);
       return s.isFile();
     } catch {
       return false;
@@ -50107,10 +50382,10 @@ var init_ast = __esm({
 });
 
 // src/wiki-engine/code-knowledge/code-incremental.ts
-import { readFile as readFile9, writeFile as writeFile5, stat as stat5, mkdir as mkdir3 } from "fs/promises";
+import { readFile as readFile10, writeFile as writeFile5, stat as stat6, mkdir as mkdir3 } from "fs/promises";
 import path131 from "path";
 async function detectCodeIncrementalChanges(root, manifestPath2, project) {
-  const previous = await exists(manifestPath2) ? JSON.parse(await readFile9(manifestPath2, "utf8")) : { files: [] };
+  const previous = await exists(manifestPath2) ? JSON.parse(await readFile10(manifestPath2, "utf8")) : { files: [] };
   const oldSha = previous.headSha;
   const newSha = await gitCommit(root);
   if (oldSha && newSha && await isWorkingTreeClean(root)) {
@@ -50148,7 +50423,7 @@ function affectedPages(project, files) {
 }
 async function exists(filePath) {
   try {
-    await stat5(path131.resolve(filePath));
+    await stat6(path131.resolve(filePath));
     return true;
   } catch {
     return false;
@@ -50157,7 +50432,7 @@ async function exists(filePath) {
 async function loadFactsCache(indicesDir) {
   const cachePath = path131.join(indicesDir, FACTS_CACHE_FILENAME);
   try {
-    const raw = await readFile9(cachePath, "utf-8");
+    const raw = await readFile10(cachePath, "utf-8");
     const parsed = JSON.parse(raw);
     return Array.isArray(parsed) ? parsed : [];
   } catch {
@@ -50171,7 +50446,7 @@ async function saveFactsCache(indicesDir, facts) {
 async function loadInterfacesCache(indicesDir) {
   const cachePath = path131.join(indicesDir, INTERFACES_CACHE_FILENAME);
   try {
-    const raw = await readFile9(cachePath, "utf-8");
+    const raw = await readFile10(cachePath, "utf-8");
     const parsed = JSON.parse(raw);
     return parsed?.entries ? parsed : { entries: [], scannedAt: "" };
   } catch {
@@ -50560,7 +50835,7 @@ var init_reconciler_v2_types = __esm({
 });
 
 // src/wiki-engine/knowledge-reconciler.ts
-import { readFile as readFile10, readdir as readdir4, stat as stat6 } from "fs/promises";
+import { readFile as readFile11, readdir as readdir4, stat as stat7 } from "fs/promises";
 import path133 from "path";
 function isExpectedSelfLoop(edge) {
   return edge.from === edge.to && edge.relation === "IMPLEMENTS" && !!edge.source && REPAIRABLE_CODE_EDGE_SOURCES.has(edge.source);
@@ -50607,7 +50882,7 @@ async function loadReconciliationBase(wikiRoot) {
 }
 async function exists2(p) {
   try {
-    await stat6(p);
+    await stat7(p);
     return true;
   } catch (error) {
     if (error.code === MISSING_PATH_ERROR_CODE) return false;
@@ -50623,7 +50898,7 @@ async function readPages(dirPath) {
     if (entry.isDirectory()) {
       pages.push(...await readPages(full));
     } else if (entry.isFile() && entry.name.endsWith(".md")) {
-      const text = await readFile10(full, "utf8");
+      const text = await readFile11(full, "utf8");
       const headingMatch = text.match(/^#\s+(.+)/m);
       const title = headingMatch ? headingMatch[1].trim() : entry.name.replace(/\.md$/, "");
       const updatedMatch = text.match(/updated[:\s]+(\d{4}-\d{2}-\d{2})/i);
@@ -51418,7 +51693,7 @@ __export(codebase_extract_exports, {
   extractCodebase: () => extractCodebase
 });
 import { statSync } from "fs";
-import { mkdir as mkdir5, writeFile as writeFile7, readFile as readFile11, realpath as realpath3 } from "fs/promises";
+import { mkdir as mkdir5, writeFile as writeFile7, readFile as readFile12, realpath as realpath3 } from "fs/promises";
 import path135 from "path";
 import chalk4 from "chalk";
 function detectKnowledgeGaps(facts, graph, files) {
@@ -51907,7 +52182,7 @@ async function extractCodebase(opts) {
   if (changedFiles) {
     let reused = false;
     try {
-      const existing = await readFile11(depPathsFile, "utf-8");
+      const existing = await readFile12(depPathsFile, "utf-8");
       if (existing.trim()) {
         reused = true;
       }
@@ -51925,7 +52200,7 @@ async function extractCodebase(opts) {
   await mkdir5(evidenceDir, { recursive: true });
   if (changedFiles && !pages.has("dependency-paths.md")) {
     try {
-      const existing = await readFile11(depPathsFile, "utf-8");
+      const existing = await readFile12(depPathsFile, "utf-8");
       pages.set("dependency-paths.md", existing);
     } catch {
     }
@@ -52044,7 +52319,7 @@ async function extractCodebase(opts) {
   }));
   if (changedFiles !== void 0 && changedFiles.length > 0) {
     try {
-      const oldManifestRaw = await readFile11(manifestPath2, "utf-8");
+      const oldManifestRaw = await readFile12(manifestPath2, "utf-8");
       const oldManifest = JSON.parse(oldManifestRaw);
       const changedSet = /* @__PURE__ */ new Set([...changedFiles, ...deletedFiles]);
       const unchanged = (oldManifest.files ?? []).filter((f) => !changedSet.has(f.relativePath)).map((f) => ({ relativePath: f.relativePath, sha256: f.sha256, language: f.language ?? "" }));
@@ -52059,7 +52334,7 @@ async function extractCodebase(opts) {
   let prevBranch;
   let prevIngestedMrs = [];
   try {
-    const prev = JSON.parse(await readFile11(manifestPath2, "utf-8"));
+    const prev = JSON.parse(await readFile12(manifestPath2, "utf-8"));
     prevRepoUrl = prev.repoUrl;
     prevBranch = prev.branch;
     prevIngestedMrs = prev.ingestedMrs ?? [];
@@ -52396,11 +52671,11 @@ __export(deep_enrich_exports, {
   deepEnrich: () => deepEnrich,
   runHiddenDeepEnrich: () => runHiddenDeepEnrich
 });
-import { readFile as readFile12, writeFile as writeFile8, readdir as readdir5, mkdir as mkdir6, unlink as unlink2 } from "fs/promises";
+import { readFile as readFile13, writeFile as writeFile8, readdir as readdir5, mkdir as mkdir6, unlink as unlink2 } from "fs/promises";
 import path137 from "path";
 async function readFileSafe2(filePath) {
   try {
-    return await readFile12(filePath, "utf-8");
+    return await readFile13(filePath, "utf-8");
   } catch {
     return "";
   }
@@ -52446,7 +52721,7 @@ function isValidProgressState(v, project) {
 async function loadProgress(evidenceDir, project, allComponents) {
   const p = progressPath(evidenceDir);
   try {
-    const raw = await readFile12(p, "utf-8");
+    const raw = await readFile13(p, "utf-8");
     const parsed = JSON.parse(raw);
     if (isValidProgressState(parsed, project)) return parsed;
   } catch {
@@ -53132,7 +53407,7 @@ var rebuild_wiki_index_exports = {};
 __export(rebuild_wiki_index_exports, {
   rebuildWikiIndex: () => rebuildWikiIndex
 });
-import { readFile as readFile13, readdir as readdir7, stat as stat7, writeFile as writeFile9 } from "fs/promises";
+import { readFile as readFile14, readdir as readdir7, stat as stat8, writeFile as writeFile9 } from "fs/promises";
 import path139 from "path";
 async function rebuildWikiIndex(teamwikiRoot) {
   const evidenceCodeDir = path139.join(teamwikiRoot, "evidence", "code");
@@ -53144,7 +53419,7 @@ async function rebuildWikiIndex(teamwikiRoot) {
   const dirs = await readdir7(evidenceCodeDir);
   for (const dir of dirs) {
     const dirPath = path139.join(evidenceCodeDir, dir);
-    const dirStat = await stat7(dirPath).catch(() => null);
+    const dirStat = await stat8(dirPath).catch(() => null);
     if (!dirStat?.isDirectory()) continue;
     const info = {
       slug: dir,
@@ -53158,7 +53433,7 @@ async function rebuildWikiIndex(teamwikiRoot) {
     };
     const overviewPath = path139.join(dirPath, "overview.md");
     if (await pathExists(overviewPath)) {
-      const content = await readFile13(overviewPath, "utf-8");
+      const content = await readFile14(overviewPath, "utf-8");
       const bodyStart = content.indexOf("\n\n", content.indexOf("---", 3));
       if (bodyStart > 0) {
         const body = content.slice(bodyStart).trim();
@@ -53171,7 +53446,7 @@ async function rebuildWikiIndex(teamwikiRoot) {
     }
     const projectIndex = path139.join(dirPath, "index.md");
     if (await pathExists(projectIndex)) {
-      const content = await readFile13(projectIndex, "utf-8");
+      const content = await readFile14(projectIndex, "utf-8");
       const factsMatch = content.match(/Facts:\s*(\d+)/);
       if (factsMatch) info.facts = parseInt(factsMatch[1], 10);
       const ifMatches = content.matchAll(/\|\s*(HTTP|MQ|RPC)\s*\|\s*(\d+)\s*\|/g);
@@ -53182,7 +53457,7 @@ async function rebuildWikiIndex(teamwikiRoot) {
     const manifestPath2 = path139.join(dirPath, "_manifest.json");
     if (await pathExists(manifestPath2)) {
       try {
-        const raw = await readFile13(manifestPath2, "utf-8");
+        const raw = await readFile14(manifestPath2, "utf-8");
         const manifest = JSON.parse(raw);
         for (const comp of manifest.components) {
           if (comp.responsibilities) info.responsibilities.push(...comp.responsibilities);
@@ -53194,7 +53469,7 @@ async function rebuildWikiIndex(teamwikiRoot) {
     const domainsPath = path139.join(dirPath, "_domains.json");
     if (await pathExists(domainsPath)) {
       try {
-        const raw = await readFile13(domainsPath, "utf-8");
+        const raw = await readFile14(domainsPath, "utf-8");
         const domainMeta = JSON.parse(raw);
         if (domainMeta.domain) {
           info.domain = domainMeta.domain;
@@ -53210,7 +53485,7 @@ async function rebuildWikiIndex(teamwikiRoot) {
     }
     const chainsPath = path139.join(dirPath, "dependency-paths.md");
     if (await pathExists(chainsPath)) {
-      const content = await readFile13(chainsPath, "utf-8");
+      const content = await readFile14(chainsPath, "utf-8");
       const chainMatch = content.match(/(\d+)\s*call chain/);
       if (chainMatch) info.callChains = parseInt(chainMatch[1], 10);
     }
@@ -53227,7 +53502,7 @@ async function rebuildWikiIndex(teamwikiRoot) {
   const graphPath = path139.join(teamwikiRoot, ".indices", "graph-index.json");
   if (await pathExists(graphPath)) {
     try {
-      const raw = await readFile13(graphPath, "utf-8");
+      const raw = await readFile14(graphPath, "utf-8");
       const graph = JSON.parse(raw);
       totalNodes = Array.isArray(graph.nodes) ? graph.nodes.length : 0;
       totalEdges = Array.isArray(graph.edges) ? graph.edges.length : 0;
@@ -53777,8 +54052,8 @@ async function loadRepoList(filePath) {
   if (!exists3) {
     throw new Error(`Repo list not found: ${filePath}`);
   }
-  const stat9 = await fs59.stat(filePath);
-  if (stat9.size > MAX_CONFIG_FILE_BYTES2) {
+  const stat10 = await fs59.stat(filePath);
+  if (stat10.size > MAX_CONFIG_FILE_BYTES2) {
     throw new Error(`${filePath} exceeds max allowed size 10MB`);
   }
   const raw = await fs59.readFile(filePath, "utf8");
@@ -53866,7 +54141,7 @@ async function importFromRepoList(opts) {
         failed.push({ url: entry.url, error: message });
       }
     }
-    const inFlight = [];
+    const inFlight = /* @__PURE__ */ new Set();
     for (const entry of queue) {
       while (semaphore.running >= concurrency) {
         await Promise.race(inFlight);
@@ -53874,10 +54149,9 @@ async function importFromRepoList(opts) {
       semaphore.running++;
       const task = processEntry(entry).finally(() => {
         semaphore.running--;
-        const idx = inFlight.indexOf(task);
-        if (idx !== -1) inFlight.splice(idx, 1);
+        inFlight.delete(task);
       });
-      inFlight.push(task);
+      inFlight.add(task);
     }
     await Promise.all(inFlight);
     if (!dryRun && succeeded.length > 0) {
@@ -54141,8 +54415,8 @@ async function loadPendingReview(cwd) {
   if (!await fs62.pathExists(filePath)) {
     return [];
   }
-  const stat9 = await fs62.stat(filePath);
-  if (stat9.size > MAX_CONFIG_FILE_BYTES3) {
+  const stat10 = await fs62.stat(filePath);
+  if (stat10.size > MAX_CONFIG_FILE_BYTES3) {
     throw new Error(`${filePath} exceeds max allowed size 10MB`);
   }
   const text = await fs62.readFile(filePath, "utf8");
@@ -54853,7 +55127,7 @@ var codebase_upgrade_wiki_exports = {};
 __export(codebase_upgrade_wiki_exports, {
   upgradeCodebaseWiki: () => upgradeCodebaseWiki
 });
-import { readdir as readdir8, readFile as readFile14 } from "fs/promises";
+import { readdir as readdir8, readFile as readFile15 } from "fs/promises";
 import path147 from "path";
 import chalk6 from "chalk";
 import matter13 from "gray-matter";
@@ -54885,7 +55159,7 @@ async function upgradeCodebaseWiki(opts) {
     const slug = file.replace(".md", "");
     const filePath = path147.join(teamCodebaseDir, file);
     try {
-      const content = await readFile14(filePath, "utf-8");
+      const content = await readFile15(filePath, "utf-8");
       const parsed = matter13(content);
       const source = parsed.data["source"] ?? parsed.data["repo_url"];
       if (!source) {
@@ -54952,7 +55226,7 @@ __export(codebase_wiki_lint_exports, {
   formatWikiLintReport: () => formatWikiLintReport,
   lintTeamwiki: () => lintTeamwiki
 });
-import { readFile as readFile15, readdir as readdir9, stat as stat8 } from "fs/promises";
+import { readFile as readFile16, readdir as readdir9, stat as stat9 } from "fs/promises";
 import path148 from "path";
 import chalk7 from "chalk";
 async function lintTeamwiki(opts) {
@@ -54977,7 +55251,7 @@ async function lintTeamwiki(opts) {
     });
   } else {
     try {
-      const raw = await readFile15(graphPath, "utf-8");
+      const raw = await readFile16(graphPath, "utf-8");
       graph = JSON.parse(raw);
     } catch {
       addIssue({
@@ -55008,7 +55282,7 @@ async function lintTeamwiki(opts) {
     }
     for (const project of projects) {
       const projectDir = path148.join(evidenceDir, project);
-      const pStat = await stat8(projectDir).catch(() => null);
+      const pStat = await stat9(projectDir).catch(() => null);
       if (!pStat?.isDirectory()) {
         if (!pStat) {
           addIssue({ severity: "low", category: "stat-failed", location: `evidence/code/${project}`, message: "\u65E0\u6CD5\u8BFB\u53D6\u76EE\u5F55\u72B6\u6001" });
@@ -55046,7 +55320,7 @@ async function lintTeamwiki(opts) {
     });
   } else {
     try {
-      const raw = await readFile15(manifestPath2, "utf-8");
+      const raw = await readFile16(manifestPath2, "utf-8");
       const manifest = JSON.parse(raw);
       if (manifest.lastScan) {
         const daysSince = (Date.now() - new Date(manifest.lastScan).getTime()) / (1e3 * 60 * 60 * 24);
@@ -55152,7 +55426,7 @@ __export(codebase_cmd_exports, {
   codebaseCmd: () => codebaseCmd
 });
 import path149 from "path";
-import { readFile as readFile16 } from "fs/promises";
+import { readFile as readFile17 } from "fs/promises";
 import chalk8 from "chalk";
 async function codebaseCmd(opts) {
   const cwd = process.cwd();
@@ -55233,7 +55507,7 @@ async function codebaseCmd(opts) {
     }
     let componentCount = 0;
     try {
-      const manifest = JSON.parse(await readFile16(path149.join(evidenceDir, "_manifest.json"), "utf-8"));
+      const manifest = JSON.parse(await readFile17(path149.join(evidenceDir, "_manifest.json"), "utf-8"));
       componentCount = Array.isArray(manifest.components) ? manifest.components.length : 0;
     } catch {
       componentCount = 0;
@@ -55313,7 +55587,7 @@ async function printCodebaseStatus(opts) {
   const manifestPath2 = path149.join(teamwikiDir, "source-manifest.json");
   let manifest;
   try {
-    manifest = JSON.parse(await readFile16(manifestPath2, "utf-8"));
+    manifest = JSON.parse(await readFile17(manifestPath2, "utf-8"));
   } catch {
     if (opts.json) {
       console.log(JSON.stringify({ error: "no-manifest", manifestPath: manifestPath2 }));
@@ -56914,7 +57188,7 @@ program.command("stats").description("Show local skill usage statistics").option
   await showStats2({ byRepo: cmdOpts.byRepo, byTime: cmdOpts.byTime });
 });
 var sessionCmd = program.command("session").description("Record and inspect coding-session summaries");
-sessionCmd.command("save").description("Record a privacy-scrubbed summary of a coding session to a local monthly log").option("--session-id <id>", "Session to record (default: most recent, or $CLAUDE_SESSION_ID)").option("--push", "Also push the summary to the team repo (feeds `teamai digest`)").option("--force", "Push even if the session is not flagged as valuable").option("--include-prompt", "Include the redacted first-prompt line in the pushed summary (default: off)").option("--scope <scope>", "Config scope for --push: user | project (default: auto-detect)").action(async (cmdOpts) => {
+sessionCmd.command("save").description("Record a privacy-scrubbed summary of a coding session to a local monthly log").option("--session-id <id>", "Session to record (default: the agent's session, e.g. $CLAUDE_CODE_SESSION_ID, or the most recent)").option("--push", "Also push the summary to the team repo (feeds `teamai digest`)").option("--force", "Push even if the session is not flagged as valuable").option("--include-prompt", "Include the redacted first-prompt line in the pushed summary (default: off)").option("--scope <scope>", "Config scope for --push: user | project (default: auto-detect)").action(async (cmdOpts) => {
   const globalOpts = program.opts();
   const { saveSession: saveSession2 } = await Promise.resolve().then(() => (init_save_session(), save_session_exports));
   await saveSession2({ ...globalOpts, ...cmdOpts });