teamai-cli 0.20.0-beta.5 → 0.20.0-beta.7

package/dist/index.js

@@ -444,8 +444,8 @@ var init_types = __esm({
         tcodex: { skills: ".tcodex/skills", rules: ".tcodex/rules", settings: ".tcodex/hooks.json", agents: ".tcodex/agents" },
         cursor: { skills: ".cursor/skills", rules: ".cursor/rules", settings: ".cursor/hooks.json", agents: ".cursor/agents", mcp: ".cursor/mcp.json", mcpProject: ".cursor/mcp.json" },
         codebuddy: { skills: ".codebuddy/skills", rules: ".codebuddy/rules", settings: ".codebuddy/settings.json", claudemd: ".codebuddy/CODEBUDDY.md", agents: ".codebuddy/agents", mcp: ".codebuddy/mcp.json", mcpProject: ".codebuddy/mcp.json" },
-        openclaw: { skills: ".openclaw/skills", rules: ".openclaw/rules" },
-        hermes: { skills: ".hermes/skills" },
+        openclaw: { skills: ".openclaw/skills", rules: ".openclaw/rules", claudemd: ".openclaw/workspace/AGENTS.md" },
+        hermes: { skills: ".hermes/skills", claudemd: "AGENTS.md" },
         workbuddy: { skills: ".workbuddy/skills", rules: ".workbuddy/rules", settings: ".workbuddy/settings.json", claudemd: "AGENTS.md", mcp: ".workbuddy/mcp.json", mcpProject: ".workbuddy/mcp.json" }
       })
     });
@@ -1349,15 +1349,12 @@ function getTGitToken() {
     "No TGit credentials found. Set the TGIT_TOKEN environment variable (a git.woa.com Personal Access Token) or run `gf auth login`."
   );
 }
-function tgitGitUser(scheme) {
-  return scheme === "private-token" ? "private" : "oauth2";
-}
-function tryGetTGitToken() {
-  try {
-    return getTGitToken();
-  } catch {
+function tgitGitCloneUrl(httpsUrl) {
+  const oauthToken = gfGetOAuthToken();
+  if (!oauthToken) {
     return null;
   }
+  return httpsUrl.replace(/^https:\/\//, `https://oauth2:${oauthToken}@`);
 }
 function tgitAuthHeaders(token, scheme) {
   if (scheme === "bearer") {
@@ -1579,10 +1576,8 @@ function gitOutputSaysRepoMissing(output) {
   return output.includes("not found") || output.includes("does not exist") || output.includes("Repository not found");
 }
 function gfRepoClone(repo, localPath) {
-  const creds = tryGetTGitToken();
-  if (creds) {
-    const user = tgitGitUser(creds.scheme);
-    const cloneUrl = `https://${user}:${creds.token}@git.woa.com/${repo}.git`;
+  const cloneUrl = tgitGitCloneUrl(`https://git.woa.com/${repo}.git`);
+  if (cloneUrl) {
     const result2 = spawnSync("git", ["clone", cloneUrl, localPath], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
@@ -1593,7 +1588,7 @@ function gfRepoClone(repo, localPath) {
       throw new RepoNotFoundError2(repo);
     }
     if (result2.status !== 0) {
-      const sanitized = allOutput2.replace(/(oauth2|private):[^@]+@/g, "$1:***@");
+      const sanitized = allOutput2.replace(/oauth2:[^@]+@/g, "oauth2:***@");
       throw new Error(`git clone failed: ${sanitized.trim()}`);
     }
     return;
@@ -2856,9 +2851,191 @@ var init_builtin_skills = __esm({
   }
 });
 
+// src/openclaw-hooks.ts
+var openclaw_hooks_exports = {};
+__export(openclaw_hooks_exports, {
+  OPENCLAW_HOOK_DIR: () => OPENCLAW_HOOK_DIR,
+  applyOpenClawAgentHook: () => applyOpenClawAgentHook,
+  injectOpenClawHooks: () => injectOpenClawHooks,
+  removeOpenClawAgentHook: () => removeOpenClawAgentHook,
+  removeOpenClawHooks: () => removeOpenClawHooks,
+  resolveOpenClawHooksDir: () => resolveOpenClawHooksDir,
+  resolveOpenclawWorkspaceDir: () => resolveOpenclawWorkspaceDir
+});
+import path10 from "path";
+function resolveOpenClawHooksDir(tool) {
+  if (tool === "openclaw" && process.env.OPENCLAW_STATE_DIR) {
+    return path10.join(process.env.OPENCLAW_STATE_DIR, "hooks");
+  }
+  const home = process.env.HOME ?? "";
+  return path10.join(home, `.${tool}`, "hooks");
+}
+function buildHookMd(tool) {
+  const events = Object.keys(EVENT_MAP);
+  const metadata = JSON.stringify({ openclaw: { events } });
+  return [
+    "---",
+    `name: ${TEAMAI_MARKER} status-report`,
+    `metadata:`,
+    `  ${metadata}`,
+    `handler: ./handler.ts`,
+    "---",
+    "",
+    `${TEAMAI_MARKER} Reports agent status to the team backend (report/sync/ack) for tool \`${tool}\`.`,
+    "Managed by teamai \u2014 do not edit by hand.",
+    ""
+  ].join("\n");
+}
+function buildHandlerTs(tool) {
+  const mapLiteral = JSON.stringify(EVENT_MAP);
+  return `// ${TEAMAI_MARKER} status-report handler \u2014 generated by teamai, do not edit.
+import { spawn } from 'node:child_process';
+
+const EVENT_MAP: Record<string, string> = ${mapLiteral};
+const TOOL = ${JSON.stringify(tool)};
+
+export default async function handler(ctx: { event?: string } = {}): Promise<void> {
+  const dispatchEvent = ctx.event ? EVENT_MAP[ctx.event] : undefined;
+  if (!dispatchEvent) return;
+  try {
+    const child = spawn('teamai', ['hook-dispatch', dispatchEvent, '--tool', TOOL], {
+      stdio: ['inherit', 'ignore', 'ignore'],
+    });
+    child.on('error', () => {});
+  } catch {
+    // never block the agent
+  }
+}
+`;
+}
+async function injectOpenClawHooks(hooksDir, tool = "openclaw") {
+  const effectiveHooksDir = resolveOpenClawHooksDir(tool);
+  const dir = path10.join(effectiveHooksDir, OPENCLAW_HOOK_DIR);
+  await ensureDir(dir);
+  await writeFile(path10.join(dir, "HOOK.md"), buildHookMd(tool));
+  await writeFile(path10.join(dir, "handler.ts"), buildHandlerTs(tool));
+  log.success(`Injected teamai OpenClaw hook into ${dir}`);
+}
+async function removeOpenClawHooks(hooksDir) {
+  const dir = path10.join(hooksDir, OPENCLAW_HOOK_DIR);
+  if (await pathExists(dir)) {
+    await remove(dir);
+    log.success(`Removed teamai OpenClaw hook from ${dir}`);
+  }
+  if (process.env.OPENCLAW_STATE_DIR) {
+    const altDir = path10.join(process.env.OPENCLAW_STATE_DIR, "hooks", OPENCLAW_HOOK_DIR);
+    if (altDir !== dir && await pathExists(altDir)) {
+      await remove(altDir);
+      log.success(`Removed teamai OpenClaw hook from ${altDir}`);
+    }
+  }
+}
+function buildAgentHookMd(slug, openclawEvent) {
+  const metadata = JSON.stringify({ openclaw: { events: [openclawEvent] } });
+  return [
+    "---",
+    `name: ${TEAMAI_MARKER} ${slug}`,
+    `metadata:`,
+    `  ${metadata}`,
+    `handler: ./handler.ts`,
+    "---",
+    "",
+    `${TEAMAI_MARKER} Agent hook [${slug}] \u2014 managed by teamai, do not edit by hand.`,
+    ""
+  ].join("\n");
+}
+function buildAgentHandlerTs(command, timeout) {
+  const timeoutMs = timeout * 1e3;
+  return [
+    `// ${TEAMAI_MARKER} agent hook handler \u2014 generated by teamai, do not edit.`,
+    `import { spawn } from 'node:child_process';`,
+    "",
+    `export default async function handler(): Promise<void> {`,
+    "  try {",
+    `    const child = spawn('sh', ['-c', ${JSON.stringify(command)}], {`,
+    `      stdio: ['inherit', 'ignore', 'ignore'],`,
+    `      timeout: ${timeoutMs},`,
+    "    });",
+    "    child.on('error', () => {});",
+    "  } catch {",
+    "    // never block the agent",
+    "  }",
+    "}",
+    ""
+  ].join("\n");
+}
+async function applyOpenClawAgentHook(def) {
+  const openclawEvent = CLAUDE_TO_OPENCLAW_EVENTS[def.event];
+  if (!openclawEvent) {
+    log.warn(`OpenClaw does not support event "${def.event}" \u2014 skipping hook [${def.slug}]`);
+    return;
+  }
+  const tool = def.tool ?? "openclaw";
+  const hooksDir = resolveOpenClawHooksDir(tool);
+  const dir = path10.join(hooksDir, def.slug);
+  await ensureDir(dir);
+  await writeFile(path10.join(dir, "HOOK.md"), buildAgentHookMd(def.slug, openclawEvent));
+  await writeFile(path10.join(dir, "handler.ts"), buildAgentHandlerTs(def.command, def.timeout ?? 10));
+  log.success(`Installed OpenClaw agent hook [${def.slug}] in ${dir}`);
+}
+async function removeOpenClawAgentHook(opts) {
+  const tool = opts.tool ?? "openclaw";
+  const hooksDir = resolveOpenClawHooksDir(tool);
+  const dir = path10.join(hooksDir, opts.slug);
+  if (await pathExists(dir)) {
+    await remove(dir);
+    log.success(`Removed OpenClaw agent hook [${opts.slug}] from ${dir}`);
+  }
+}
+async function resolveOpenclawWorkspaceDir(workspacePath) {
+  const candidates = [];
+  if (workspacePath) candidates.push(workspacePath);
+  const stateDir = process.env.OPENCLAW_STATE_DIR;
+  if (stateDir && path10.isAbsolute(stateDir)) {
+    const cfgRaw = await readFileSafe(path10.join(stateDir, "openclaw.json"));
+    if (cfgRaw) {
+      try {
+        const cfg = JSON.parse(cfgRaw);
+        const ws = cfg?.agents?.defaults?.workspace;
+        if (typeof ws === "string" && ws) candidates.push(ws);
+      } catch (e) {
+        log.debug(`openclaw: failed to parse openclaw.json: ${e.message}`);
+      }
+    }
+  }
+  const home = process.env.HOME;
+  if (home) candidates.push(path10.join(home, ".openclaw", "workspace"));
+  for (const candidate of candidates) {
+    if (await pathExists(candidate)) {
+      log.debug(`openclaw: resolved workspace dir to ${candidate}`);
+      return candidate;
+    }
+  }
+  log.warn(`openclaw: no workspace dir found (tried: ${candidates.join(", ") || "none"})`);
+  return null;
+}
+var OPENCLAW_HOOK_DIR, TEAMAI_MARKER, EVENT_MAP, CLAUDE_TO_OPENCLAW_EVENTS;
+var init_openclaw_hooks = __esm({
+  "src/openclaw-hooks.ts"() {
+    "use strict";
+    init_fs();
+    init_logger();
+    OPENCLAW_HOOK_DIR = "teamai-status-report";
+    TEAMAI_MARKER = "[teamai]";
+    EVENT_MAP = {
+      "session:start": "session-start",
+      "command:new": "prompt-submit"
+    };
+    CLAUDE_TO_OPENCLAW_EVENTS = {
+      SessionStart: "session:start",
+      UserPromptSubmit: "command:new"
+    };
+  }
+});
+
 // src/builtin-hooks.ts
 import fs5 from "fs";
-import path10 from "path";
+import path11 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function hasShell() {
   if (_hasShellCache === void 0) {
@@ -2886,12 +3063,12 @@ function pickLatestVersion(versions) {
 }
 function resolveWorkbuddyNode() {
   const home = process.env.HOME ?? "";
-  const versionsDir = path10.join(home, WORKBUDDY_BUNDLED_NODE_DIR);
+  const versionsDir = path11.join(home, WORKBUDDY_BUNDLED_NODE_DIR);
   try {
     const versions = fs5.readdirSync(versionsDir).filter((d) => !d.startsWith("."));
     const latest = pickLatestVersion(versions);
     if (!latest) return null;
-    const nodeBin = path10.join(versionsDir, latest, "bin", "node");
+    const nodeBin = path11.join(versionsDir, latest, "bin", "node");
     if (fs5.existsSync(nodeBin)) return nodeBin;
   } catch {
   }
@@ -2904,10 +3081,10 @@ function resolveCodebuddyNode() {
     for (const entry of entries) {
       if (!entry.startsWith(".codebuddy-server")) continue;
       try {
-        const binDir = path10.join(home, entry, "bin");
+        const binDir = path11.join(home, entry, "bin");
         const stableDirs = fs5.readdirSync(binDir).filter((d) => d.startsWith("stable-"));
         for (const stable of stableDirs) {
-          const nodeBin = path10.join(binDir, stable, "node");
+          const nodeBin = path11.join(binDir, stable, "node");
           if (fs5.existsSync(nodeBin)) return nodeBin;
         }
       } catch {
@@ -2920,8 +3097,8 @@ function resolveCodebuddyNode() {
 function resolveTeamaiEntryScript() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
-    const distDir = path10.dirname(thisFile);
-    const candidate = path10.join(distDir, "index.js");
+    const distDir = path11.dirname(thisFile);
+    const candidate = path11.join(distDir, "index.js");
     if (fs5.existsSync(candidate)) return candidate;
   } catch {
   }
@@ -2932,8 +3109,8 @@ function ensureTeamaiWrapper() {
   if (!entryScript) return null;
   const nodeBin = resolveWorkbuddyNode() ?? resolveCodebuddyNode() ?? process.argv[0];
   const home = process.env.HOME ?? "";
-  const binDir = path10.join(home, TEAMAI_BIN_DIR);
-  const wrapperPath = path10.join(binDir, WRAPPER_NAME);
+  const binDir = path11.join(home, TEAMAI_BIN_DIR);
+  const wrapperPath = path11.join(binDir, WRAPPER_NAME);
   const script = [
     "#!/bin/sh",
     `# Auto-generated by teamai \u2014 do not edit.`,
@@ -3007,11 +3184,11 @@ var init_builtin_hooks = __esm({
 });
 
 // src/resources/hooks.ts
-import path11 from "path";
+import path12 from "path";
 import { z as z3 } from "zod";
 import YAML2 from "yaml";
 function teamHooksYamlPath(repoPath) {
-  return path11.join(repoPath, "hooks", "hooks.yaml");
+  return path12.join(repoPath, "hooks", "hooks.yaml");
 }
 async function parseHooksYaml(repoPath) {
   const content = await readFileSafe(teamHooksYamlPath(repoPath));
@@ -3134,80 +3311,6 @@ var init_hooks = __esm({
   }
 });
 
-// src/openclaw-hooks.ts
-var openclaw_hooks_exports = {};
-__export(openclaw_hooks_exports, {
-  OPENCLAW_HOOK_DIR: () => OPENCLAW_HOOK_DIR,
-  injectOpenClawHooks: () => injectOpenClawHooks,
-  removeOpenClawHooks: () => removeOpenClawHooks
-});
-import path12 from "path";
-function buildHookMd(tool) {
-  const events = Object.keys(EVENT_MAP);
-  return [
-    "---",
-    `name: ${TEAMAI_MARKER} status-report`,
-    "events:",
-    ...events.map((e) => `  - ${e}`),
-    `handler: ./handler.ts`,
-    "---",
-    "",
-    `${TEAMAI_MARKER} Reports agent status to the team backend (report/sync/ack) for tool \`${tool}\`.`,
-    "Managed by teamai \u2014 do not edit by hand.",
-    ""
-  ].join("\n");
-}
-function buildHandlerTs(tool) {
-  const mapLiteral = JSON.stringify(EVENT_MAP);
-  return `// ${TEAMAI_MARKER} status-report handler \u2014 generated by teamai, do not edit.
-import { spawn } from 'node:child_process';
-
-const EVENT_MAP: Record<string, string> = ${mapLiteral};
-const TOOL = ${JSON.stringify(tool)};
-
-export default async function handler(ctx: { event?: string } = {}): Promise<void> {
-  const dispatchEvent = ctx.event ? EVENT_MAP[ctx.event] : undefined;
-  if (!dispatchEvent) return;
-  try {
-    const child = spawn('teamai', ['hook-dispatch', dispatchEvent, '--tool', TOOL], {
-      stdio: ['inherit', 'ignore', 'ignore'],
-    });
-    child.on('error', () => {});
-  } catch {
-    // never block the agent
-  }
-}
-`;
-}
-async function injectOpenClawHooks(hooksDir, tool = "openclaw") {
-  const dir = path12.join(hooksDir, OPENCLAW_HOOK_DIR);
-  await ensureDir(dir);
-  await writeFile(path12.join(dir, "HOOK.md"), buildHookMd(tool));
-  await writeFile(path12.join(dir, "handler.ts"), buildHandlerTs(tool));
-  log.success(`Injected teamai OpenClaw hook into ${dir}`);
-}
-async function removeOpenClawHooks(hooksDir) {
-  const dir = path12.join(hooksDir, OPENCLAW_HOOK_DIR);
-  if (await pathExists(dir)) {
-    await remove(dir);
-    log.success(`Removed teamai OpenClaw hook from ${dir}`);
-  }
-}
-var OPENCLAW_HOOK_DIR, TEAMAI_MARKER, EVENT_MAP;
-var init_openclaw_hooks = __esm({
-  "src/openclaw-hooks.ts"() {
-    "use strict";
-    init_fs();
-    init_logger();
-    OPENCLAW_HOOK_DIR = "teamai-status-report";
-    TEAMAI_MARKER = "[teamai]";
-    EVENT_MAP = {
-      "session:start": "session-start",
-      "command:new": "prompt-submit"
-    };
-  }
-});
-
 // src/hermes-home.ts
 var hermes_home_exports = {};
 __export(hermes_home_exports, {
@@ -3477,6 +3580,7 @@ var hooks_exports = {};
 __export(hooks_exports, {
   AGENT_HOOK_EVENTS: () => AGENT_HOOK_EVENTS,
   CLAUDE_TO_CURSOR_EVENTS: () => CLAUDE_TO_CURSOR_EVENTS,
+  OPENCLAW_TOOLS: () => OPENCLAW_TOOLS,
   TEAMAI_HOOK_SUBCOMMANDS: () => TEAMAI_HOOK_SUBCOMMANDS,
   TEAMAI_LEGACY_HOOK_SUBCOMMANDS: () => TEAMAI_LEGACY_HOOK_SUBCOMMANDS,
   agentHookDescription: () => agentHookDescription,
@@ -3684,7 +3788,7 @@ async function reconcileCodexFormat(hooksPath, tool, teamDefs, opts, priorTeamCo
   }
 }
 function isAgentHookSupportedTool(tool) {
-  return !CURSOR_TOOLS.has(tool) && !OPENCLAW_TOOLS.has(tool);
+  return !CURSOR_TOOLS.has(tool);
 }
 function isAgentHookEvent(event) {
   return AGENT_HOOK_EVENTS.has(event);
@@ -4793,6 +4897,16 @@ async function detectWorkbuddyVersion() {
   }
   return "";
 }
+async function detectHermesVersion() {
+  const raw = await execVersion("hermes");
+  const match = raw.match(/^\(?(\d+(?:\.\d+)*)\)?/);
+  return match?.[1] ?? "";
+}
+async function detectOpenclawVersion() {
+  const raw = await execVersion("openclaw");
+  const match = raw.match(/^([\d.]+)/);
+  return match?.[1] ?? "";
+}
 async function getAgentVersion(agentType) {
   if (VERSION_CACHE.has(agentType)) return VERSION_CACHE.get(agentType);
   const detector = DETECTORS[agentType];
@@ -4825,7 +4939,9 @@ var init_agent_version = __esm({
       cursor: detectCursorVersion,
       codebuddy: detectCodebuddyCliVersion,
       "codebuddy-ide": detectCodebuddyIdeVersion,
-      workbuddy: detectWorkbuddyVersion
+      workbuddy: detectWorkbuddyVersion,
+      hermes: detectHermesVersion,
+      openclaw: detectOpenclawVersion
     };
   }
 });
@@ -4834,24 +4950,29 @@ var init_agent_version = __esm({
 import crypto2 from "crypto";
 import fs8 from "fs";
 import { execFileSync } from "child_process";
+import os2 from "os";
 function getMachineId() {
   if (cachedMachineId !== null) return cachedMachineId;
   cachedMachineId = detectMachineId();
   return cachedMachineId;
 }
 function detectMachineId(platform = process.platform) {
+  let id = "";
   try {
     switch (platform) {
       case "darwin":
-        return readDarwinMachineId();
+        id = readDarwinMachineId();
+        break;
       case "win32":
-        return readWindowsMachineId();
+        id = readWindowsMachineId();
+        break;
       default:
-        return readLinuxMachineId();
+        id = readLinuxMachineId();
+        break;
     }
   } catch {
-    return "";
   }
+  return id || os2.hostname() || "";
 }
 function readDarwinMachineId() {
   const out = execFileSync("ioreg", ["-rd1", "-c", "IOPlatformExpertDevice"], {
@@ -4896,7 +5017,7 @@ var init_machine_id = __esm({
 });
 
 // src/utils/path-safety.ts
-import os2 from "os";
+import os3 from "os";
 import path19 from "path";
 import fs9 from "fs";
 function assertSafePath(target, allowedRoots) {
@@ -4912,7 +5033,7 @@ function assertSafePath(target, allowedRoots) {
   );
 }
 function resolveReal(p) {
-  const expanded = p.startsWith("~") ? path19.join(os2.homedir(), p.slice(1)) : p;
+  const expanded = p.startsWith("~") ? path19.join(os3.homedir(), p.slice(1)) : p;
   const abs = path19.resolve(expanded);
   try {
     return fs9.realpathSync(abs);
@@ -4921,7 +5042,7 @@ function resolveReal(p) {
   }
 }
 function defaultAllowedRoots() {
-  return [process.cwd(), os2.homedir()];
+  return [process.cwd(), os3.homedir()];
 }
 function assertSafeResourceName(name) {
   if (name.includes("\0")) {
@@ -5300,7 +5421,7 @@ __export(local_agent_exports, {
   writeTokenFile: () => writeTokenFile
 });
 import fs10 from "fs";
-import os3 from "os";
+import os4 from "os";
 import path20 from "path";
 import readline3 from "readline";
 import { execFile as execFile2 } from "child_process";
@@ -5525,7 +5646,7 @@ function createResourceLocalConfig(config, scope, repoPath, workspacePath) {
   const projectScope = scope === "project";
   return {
     repo: { localPath: repoPath, remote: config.endpoint },
-    username: os3.userInfo().username,
+    username: os4.userInfo().username,
     scope: projectScope ? "project" : "user",
     projectRoot: projectScope ? workspacePath : void 0,
     additionalRoles: []
@@ -5835,7 +5956,7 @@ async function bindWorkspaceToProject(workspacePath, projectId) {
 async function ensureWorkspaceBinding(config, workspacePath, sessionId) {
   if (config.workspaceBindings[workspacePath]) return;
   const markerKey = sessionId || `ppid-${process.ppid}`;
-  const hintMarker = path20.join(os3.tmpdir(), `teamai-bind-session-${markerKey}`);
+  const hintMarker = path20.join(os4.tmpdir(), `teamai-bind-session-${markerKey}`);
   if (fs10.existsSync(hintMarker)) return;
   try {
     fs10.writeFileSync(hintMarker, "");
@@ -5883,7 +6004,7 @@ function isBindPromptEnabled() {
 async function emitBindingHint(config, workspacePath, sessionId) {
   if (config.workspaceBindings[workspacePath]) return;
   const markerKey = sessionId || `ppid-${process.ppid}`;
-  const hintMarker = path20.join(os3.tmpdir(), `teamai-bind-hint-${markerKey}`);
+  const hintMarker = path20.join(os4.tmpdir(), `teamai-bind-hint-${markerKey}`);
   if (fs10.existsSync(hintMarker)) return;
   try {
     fs10.writeFileSync(hintMarker, "");
@@ -6044,8 +6165,8 @@ async function buildReportPayload(config, context) {
     agent_type: normalizeAgentType(tool),
     agent_version: await getAgentVersion(tool),
     local_agent_id: resolveLocalAgentId(context),
-    host_name: os3.hostname(),
-    os: os3.platform(),
+    host_name: os4.hostname(),
+    os: os4.platform(),
     started_at: config.createdAt,
     last_status: context.status ?? "running",
     // Instance-level skills/rules are a phase-1 legacy concept. They are
@@ -6156,7 +6277,7 @@ function assertHttpUrl(rawUrl) {
   return parsed;
 }
 async function downloadResource(downloadUrl) {
-  const tmpDir = await fs10.promises.mkdtemp(path20.join(os3.tmpdir(), "teamai-local-agent-"));
+  const tmpDir = await fs10.promises.mkdtemp(path20.join(os4.tmpdir(), "teamai-local-agent-"));
   const filePath = path20.join(tmpDir, "resource");
   let current = assertHttpUrl(downloadUrl);
   let response;
@@ -6326,7 +6447,7 @@ async function installDownloadedResource(input) {
       const dest = path20.join(repoPath, "claudemd", `${input.slug}.md`);
       await fse3.ensureDir(path20.dirname(dest));
       await fse3.copyFile(mdFile, dest);
-      await syncClaudemd(teamConfig, localConfig, repoPath);
+      await syncClaudemd(teamConfig, localConfig, repoPath, input.workspacePath);
     }
     const version2 = commandVersion(input.command, input.kind);
     const manifest = await loadManifest();
@@ -6364,12 +6485,28 @@ async function uninstallResource(input) {
     await new RulesHandler().removeItem(input.slug, teamConfig, localConfig);
   } else {
     await remove(path20.join(repoPath, "claudemd", `${input.slug}.md`));
-    await syncClaudemd(teamConfig, localConfig, repoPath);
+    await syncClaudemd(teamConfig, localConfig, repoPath, input.workspacePath);
   }
   delete scopeManifest[manifestKind(input.kind)][input.slug];
   await saveManifest(manifest);
 }
-async function syncClaudemd(teamConfig, localConfig, repoPath) {
+async function resolveHermesUserBaseDir() {
+  try {
+    const envWs = process.env.TEAMAI_HERMES_WORKSPACE;
+    if (envWs && path20.isAbsolute(envWs)) return envWs;
+    const cfg = await readJson(getConfigPath2());
+    const bindings = cfg?.workspaceBindings;
+    if (bindings && typeof bindings === "object") {
+      const entries = Object.entries(bindings).filter(([p, v]) => path20.isAbsolute(p) && v?.ideType === "hermes").sort((a, b) => (b[1].boundAt ?? "").localeCompare(a[1].boundAt ?? ""));
+      for (const [p] of entries) {
+        if (await pathExists(path20.join(p, ".hermes"))) return p;
+      }
+    }
+  } catch {
+  }
+  return void 0;
+}
+async function syncClaudemd(teamConfig, localConfig, repoPath, workspacePath) {
   const claudemdDir = path20.join(repoPath, "claudemd");
   const files = await pathExists(claudemdDir) ? (await fse3.readdir(claudemdDir)).filter((file) => file.endsWith(".md")).sort() : [];
   const contents = [];
@@ -6378,24 +6515,48 @@ async function syncClaudemd(teamConfig, localConfig, repoPath) {
     if (content) contents.push(content);
   }
   const block = compileClaudemdBlock(contents);
-  const baseDir = localConfig.scope === "project" && localConfig.projectRoot ? localConfig.projectRoot : process.env.HOME ?? "";
+  let syncedAny = false;
+  const defaultBaseDir = localConfig.scope === "project" && localConfig.projectRoot ? localConfig.projectRoot : process.env.HOME ?? "";
   for (const [tool, toolPath] of Object.entries(teamConfig.toolPaths)) {
     if (!toolPath.claudemd) continue;
-    if (!await ResourceHandler.isToolInstalled(toolPath.claudemd, baseDir)) continue;
-    const claudeMdPath = path20.join(baseDir, toolPath.claudemd);
+    let baseDir = defaultBaseDir;
+    let resolvedAbsPath = null;
+    if (tool === "openclaw" && localConfig.scope !== "project") {
+      const openclawWs = await resolveOpenclawWorkspaceDir(workspacePath);
+      if (openclawWs) {
+        resolvedAbsPath = path20.join(openclawWs, path20.basename(toolPath.claudemd));
+      }
+    } else if (tool === "hermes" && localConfig.scope !== "project") {
+      const hermesBase = workspacePath ?? await resolveHermesUserBaseDir();
+      if (hermesBase) {
+        baseDir = hermesBase;
+        log.debug(`local-agent: hermes user-scope baseDir resolved to ${baseDir}`);
+      }
+    }
+    const toolInstalled = resolvedAbsPath ? await pathExists(resolvedAbsPath) : toolPath.claudemd.includes("/") ? await ResourceHandler.isToolInstalled(toolPath.claudemd, baseDir) : await pathExists(path20.join(baseDir, `.${tool}`));
+    if (!toolInstalled) {
+      log.debug(`Skipped CLAUDE.md sync for ${tool}: target not found`);
+      continue;
+    }
+    const claudeMdPath = resolvedAbsPath ?? path20.join(baseDir, toolPath.claudemd);
     try {
       const { injectClaudeMdSection: injectClaudeMdSection2 } = await Promise.resolve().then(() => (init_claudemd(), claudemd_exports));
       if (block) {
         await injectClaudeMdSection2(claudeMdPath, TEAMAI_CLAUDEMD_START, TEAMAI_CLAUDEMD_END, block);
         log.debug(`local-agent: synced CLAUDE.md instructions to ${tool}`);
+        syncedAny = true;
       } else {
         await removeClaudeMdSection(claudeMdPath, TEAMAI_CLAUDEMD_START, TEAMAI_CLAUDEMD_END);
         log.debug(`local-agent: removed CLAUDE.md instructions from ${tool}`);
+        syncedAny = true;
       }
     } catch (e) {
       log.warn(`Failed to sync CLAUDE.md instructions to ${tool}: ${e.message}`);
     }
   }
+  if (files.length > 0 && !syncedAny) {
+    throw new Error("CLAUDE.md sync landed on no tool: every configured target was skipped");
+  }
 }
 async function removeClaudeMdSection(filePath, startMarker, endMarker) {
   const existing = await readFileSafe(filePath);
@@ -6521,6 +6682,9 @@ async function runHookRuleCommand(config, command, context) {
       if (rec.tool === "hermes") {
         const { removeHermesAgentHook: removeHermesAgentHook2 } = await Promise.resolve().then(() => (init_hermes_hooks(), hermes_hooks_exports));
         await removeHermesAgentHook2({ slug, event: rec.event, command: rec.command });
+      } else if (OPENCLAW_TOOLS.has(rec.tool)) {
+        const { removeOpenClawAgentHook: removeOpenClawAgentHook2 } = await Promise.resolve().then(() => (init_openclaw_hooks(), openclaw_hooks_exports));
+        await removeOpenClawAgentHook2({ slug, tool: rec.tool });
       } else {
         const settingsPath = resolveToolSettingsPath(config, rec.tool);
         await removeAgentHook(settingsPath, rec.tool, { slug, command: rec.command });
@@ -6546,6 +6710,9 @@ async function runHookRuleCommand(config, command, context) {
       if (prior.tool === "hermes") {
         const { removeHermesAgentHook: removeHermesAgentHook2 } = await Promise.resolve().then(() => (init_hermes_hooks(), hermes_hooks_exports));
         await removeHermesAgentHook2({ slug, event: prior.event, command: prior.command });
+      } else if (OPENCLAW_TOOLS.has(prior.tool)) {
+        const { removeOpenClawAgentHook: removeOpenClawAgentHook2 } = await Promise.resolve().then(() => (init_openclaw_hooks(), openclaw_hooks_exports));
+        await removeOpenClawAgentHook2({ slug, tool: prior.tool });
       } else {
         const priorPath = resolveToolSettingsPath(config, prior.tool);
         await removeAgentHook(priorPath, prior.tool, { slug, command: prior.command });
@@ -6557,6 +6724,9 @@ async function runHookRuleCommand(config, command, context) {
   if (tool === "hermes") {
     const { applyHermesAgentHook: applyHermesAgentHook2 } = await Promise.resolve().then(() => (init_hermes_hooks(), hermes_hooks_exports));
     await applyHermesAgentHook2({ slug, event, command: cmd, matcher, timeout });
+  } else if (OPENCLAW_TOOLS.has(tool)) {
+    const { applyOpenClawAgentHook: applyOpenClawAgentHook2 } = await Promise.resolve().then(() => (init_openclaw_hooks(), openclaw_hooks_exports));
+    await applyOpenClawAgentHook2({ slug, event, command: cmd, tool, matcher, timeout });
   } else {
     const settingsPath = resolveToolSettingsPath(config, tool);
     await applyAgentHook(settingsPath, tool, { slug, event, command: cmd, matcher, timeout });
@@ -6781,6 +6951,9 @@ async function removeAllAgentHooks() {
       if (rec.tool === "hermes") {
         const { removeHermesAgentHook: removeHermesAgentHook2 } = await Promise.resolve().then(() => (init_hermes_hooks(), hermes_hooks_exports));
         await removeHermesAgentHook2({ slug, event: rec.event, command: rec.command });
+      } else if (OPENCLAW_TOOLS.has(rec.tool)) {
+        const { removeOpenClawAgentHook: removeOpenClawAgentHook2 } = await Promise.resolve().then(() => (init_openclaw_hooks(), openclaw_hooks_exports));
+        await removeOpenClawAgentHook2({ slug, tool: rec.tool });
       } else {
         const settingsPath = resolveToolSettingsPath(config, rec.tool);
         await removeAgentHook(settingsPath, rec.tool, { slug, command: rec.command });
@@ -6854,6 +7027,7 @@ var init_local_agent = __esm({
     init_machine_id();
     init_builtin_rules();
     init_builtin_hooks();
+    init_openclaw_hooks();
     init_path_safety();
     init_tool_names();
     init_http_log();
@@ -7442,6 +7616,7 @@ var init_skills = __esm({
     init_fs();
     init_logger();
     init_builtin_skills();
+    init_openclaw_hooks();
     init_roles();
     CONTRIBUTORS_FILE = "CONTRIBUTORS";
     SKILL_MD = "SKILL.md";
@@ -7627,11 +7802,21 @@ var init_skills = __esm({
         for (const [tool, toolPath] of Object.entries(teamConfig.toolPaths)) {
           if (isAgentDisabled(localConfig, tool)) continue;
           if (!toolPath.skills) continue;
-          if (!await ResourceHandler.isToolInstalled(toolPath.skills, baseDir)) {
-            log.debug(`Skipping skill sync for ${tool}: tool not installed`);
-            continue;
+          let dest;
+          if (tool === "openclaw" && localConfig.scope !== "project") {
+            const wsDir = await resolveOpenclawWorkspaceDir();
+            if (!wsDir) {
+              log.debug(`Skipping skill sync for openclaw: workspace dir not found`);
+              continue;
+            }
+            dest = path22.join(wsDir, "skills", item.name);
+          } else {
+            if (!await ResourceHandler.isToolInstalled(toolPath.skills, baseDir)) {
+              log.debug(`Skipping skill sync for ${tool}: tool not installed`);
+              continue;
+            }
+            dest = path22.join(baseDir, toolPath.skills, item.name);
           }
-          const dest = path22.join(baseDir, toolPath.skills, item.name);
           try {
             await copyDir(item.sourcePath, dest);
             await ensureSkillFrontmatter(dest, item.name);
@@ -7666,7 +7851,14 @@ var init_skills = __esm({
         await this.addTombstone(name, localConfig);
         for (const [tool, toolPath] of Object.entries(teamConfig.toolPaths)) {
           if (!toolPath.skills) continue;
-          const skillDir = path22.join(baseDir, toolPath.skills, name);
+          let skillDir;
+          if (tool === "openclaw" && localConfig.scope !== "project") {
+            const wsDir = await resolveOpenclawWorkspaceDir();
+            if (!wsDir) continue;
+            skillDir = path22.join(wsDir, "skills", name);
+          } else {
+            skillDir = path22.join(baseDir, toolPath.skills, name);
+          }
           if (await pathExists(skillDir)) {
             await remove(skillDir);
             removed.push(skillDir);
@@ -9676,6 +9868,11 @@ async function push(options) {
   const { localConfig, teamConfig } = await autoDetectInit();
   assertNotReadOnly(localConfig, "teamai push");
   if (localConfig.repo.kind === "self") {
+    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 {
       await withKnowledgeWorktree2(localConfig, (wtConfig) => pushCore(wtConfig, teamConfig, options));
@@ -9738,8 +9935,8 @@ async function pushCore(localConfig, teamConfig, options) {
       process.exitCode = 2;
       return;
     }
-    const os7 = await import("os");
-    const skillPath = options.skill.startsWith("~") ? path32.join(os7.homedir(), options.skill.slice(1)) : path32.resolve(options.skill);
+    const os8 = await import("os");
+    const skillPath = options.skill.startsWith("~") ? path32.join(os8.homedir(), options.skill.slice(1)) : path32.resolve(options.skill);
     let matchedItem;
     for (const item of allItems) {
       if (item.type !== "skills") continue;
@@ -9751,7 +9948,7 @@ async function pushCore(localConfig, teamConfig, options) {
         matchedItem = item;
         break;
       }
-      const skillInput = options.skill.replace(/^~/, os7.homedir());
+      const skillInput = options.skill.replace(/^~/, os8.homedir());
       if (item.sourcePath.endsWith(skillInput) || item.sourcePath.includes(path32.sep + skillInput)) {
         matchedItem = item;
         break;
@@ -10845,6 +11042,8 @@ __export(init_exports, {
   init: () => init,
   initHttp: () => initHttp,
   initSelfRepo: () => initSelfRepo,
+  migrateSelfModeGitignore: () => migrateSelfModeGitignore,
+  migrateSelfModeGitignoreContent: () => migrateSelfModeGitignoreContent,
   promptForSelfModeAgents: () => promptForSelfModeAgents,
   resolveInheritUserScope: () => resolveInheritUserScope,
   resolveInitRepo: () => resolveInitRepo,
@@ -11136,6 +11335,45 @@ function buildSelfModeGitignore() {
     ""
   ].join("\n");
 }
+function migrateSelfModeGitignoreContent(content) {
+  const lines = content.split("\n");
+  let changed = false;
+  const filtered = lines.filter((line) => {
+    if (line.trim() === "env") {
+      changed = true;
+      return false;
+    }
+    return true;
+  });
+  const hasEnvLocal = filtered.some((l) => l.trim() === "env.local");
+  if (!hasEnvLocal) {
+    const envShIdx = filtered.findIndex((l) => l.trim() === "env.sh");
+    if (envShIdx >= 0) {
+      filtered.splice(envShIdx + 1, 0, "env.local");
+    } else {
+      const lastNonEmpty = filtered.reduce((acc, l, i) => l.trim() ? i : acc, -1);
+      filtered.splice(lastNonEmpty + 1, 0, "env.local");
+    }
+    changed = true;
+  }
+  return { changed, content: filtered.join("\n") };
+}
+async function migrateSelfModeGitignore(localConfig) {
+  if (localConfig.repo.kind !== "self" || !localConfig.projectRoot) return;
+  const gitignorePath = path38.join(localConfig.projectRoot, ".teamai", ".gitignore");
+  try {
+    const current = await readFileSafe(gitignorePath);
+    if (current === null) return;
+    const { changed, content } = migrateSelfModeGitignoreContent(current);
+    if (!changed) return;
+    await writeFile(gitignorePath, content);
+    log.info(
+      "Updated .teamai/.gitignore so team env vars (.teamai/env/env.yaml) can be shared \u2014 please `git add .teamai/.gitignore` and commit it."
+    );
+  } catch (e) {
+    log.debug(`[self-mode] gitignore migration skipped: ${e.message}`);
+  }
+}
 function resolveSelfModeSelection(indices, detected) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -11863,13 +12101,10 @@ function tokenize(text) {
         if (t !== word) tokens.push(t);
       }
     }
-    const chars = [...word];
-    for (const ch of chars) {
-      if (/[一-鿿]/.test(ch)) {
-        cjkRun.push(ch);
-      } else {
-        flushCjkRun();
-      }
+    if (word.length === 1 && /[一-鿿]/.test(word)) {
+      cjkRun.push(word);
+    } else {
+      flushCjkRun();
     }
   }
   flushCjkRun();
@@ -11884,6 +12119,40 @@ function tokenCount(text) {
   }
   return count;
 }
+function wordSegments(text) {
+  if (!text) return [];
+  const input = text.length > MAX_TOKENIZE_CHARS ? text.slice(0, MAX_TOKENIZE_CHARS) : text;
+  const words = [];
+  let run = [];
+  let lastWasCjkWord = false;
+  const flushRun = () => {
+    if (run.length > 0 && lastWasCjkWord) {
+      words[words.length - 1] += run.shift();
+      lastWasCjkWord = false;
+    }
+    if (run.length > 0) {
+      words.push(run.join(""));
+      lastWasCjkWord = false;
+    }
+    run = [];
+  };
+  for (const seg of sharedSegmenter.segment(input)) {
+    if (!seg.isWordLike) {
+      flushRun();
+      lastWasCjkWord = false;
+      continue;
+    }
+    if (seg.segment.length === 1 && /[一-鿿]/.test(seg.segment)) {
+      run.push(seg.segment);
+      continue;
+    }
+    flushRun();
+    words.push(seg.segment);
+    lastWasCjkWord = /^[一-鿿]+$/.test(seg.segment);
+  }
+  flushRun();
+  return words;
+}
 var MAX_TOKENIZE_CHARS, sharedSegmenter;
 var init_tokenizer = __esm({
   "src/utils/tokenizer.ts"() {
@@ -12198,7 +12467,8 @@ __export(search_index_exports, {
   parseLearningDoc: () => parseLearningDoc,
   search: () => search,
   titleFromFilename: () => titleFromFilename,
-  tokenize: () => tokenize
+  tokenize: () => tokenize,
+  wordSegments: () => wordSegments
 });
 import path42 from "path";
 import matter3 from "gray-matter";
@@ -12502,6 +12772,8 @@ function search(query, index, limit = 5) {
     const docFreq = df[token] ?? 0;
     return Math.log((N + 1) / (docFreq + 1)) + 1;
   };
+  const lengthNorm = Math.sqrt(queryTokens.length);
+  const wordTokens = wordSegments(query).map((w) => ({ word: w, tokens: tokenize(w) }));
   const results = [];
   for (const entry of index.entries) {
     let score = 0;
@@ -12524,6 +12796,7 @@ function search(query, index, limit = 5) {
     }
     const isCodebaseDoc = entry.type === "docs" && (entry.path ?? entry.filename ?? "").includes("team-codebase");
     if (score > 0 && (hasTitleOrTagMatch || isCodebaseDoc)) {
+      score /= lengthNorm;
       score += Math.min(entry.votes * 0.5, 5);
       const domainMultiplier = domainWeightRow[entry.domain ?? "neutral"];
       const typeMultiplier = TYPE_BONUS[entry.type];
@@ -12534,14 +12807,40 @@ function search(query, index, limit = 5) {
       if (entry.hotness !== void 0 && entry.hotness < 1) {
         score *= entry.hotness;
       }
-      results.push({ entry, score });
+      if (!hasTitleOrTagMatch) {
+        results.push({ entry, score });
+        continue;
+      }
+      const matchedTerms = [];
+      const missingTerms = [];
+      for (const { word, tokens: wt } of wordTokens) {
+        const hit = wt.some((t) => entryTokens.has(`title:${t}`) || entryTokens.has(`tag:${t}`));
+        (hit ? matchedTerms : missingTerms).push(word);
+      }
+      results.push({ entry, score, matchedTerms, missingTerms });
     }
   }
   results.sort((a, b) => {
     if (b.score !== a.score) return b.score - a.score;
     return (b.entry.date || "").localeCompare(a.entry.date || "");
   });
-  return results.slice(0, limit);
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = [];
+  for (const r of results) {
+    const key = [
+      r.entry.type,
+      r.entry.title,
+      r.entry.date,
+      r.entry.author,
+      r.entry.tokens.length,
+      r.score
+    ].join(" ");
+    if (seen.has(key)) continue;
+    seen.add(key);
+    deduped.push(r);
+    if (deduped.length === limit) break;
+  }
+  return deduped;
 }
 var MAX_BODY_CHARS, MAX_DOC_BYTES, TECHNICAL_TAGS, OPS_TAGS, SUPPORT_TAGS, TECHNICAL_PATH_PATTERNS, OPS_PATH_PATTERNS, SUPPORT_PATH_PATTERNS, DOMAIN_WEIGHT, TYPE_BONUS, CODEBASE_INDEX_FILENAME, CODEBASE_FULL_FILENAME, CODEBASE_INDEX_WEIGHT_BOOST;
 var init_search_index = __esm({
@@ -13303,6 +13602,7 @@ var init_skill_health = __esm({
 // src/digest.ts
 var digest_exports = {};
 __export(digest_exports, {
+  buildSkillChangePathspec: () => buildSkillChangePathspec,
   formatTokenCount: () => formatTokenCount,
   generateDigest: () => generateDigest,
   summarizeConversation: () => summarizeConversation,
@@ -13353,9 +13653,17 @@ function parseGitLogOutput(output) {
   if (current) commits.push(current);
   return commits;
 }
-async function getRecentSkillChanges(repoPath) {
+function buildSkillChangePathspec(subdir = "") {
+  const prefix = subdir ? `${subdir.replace(/\/+$/, "")}/` : "";
+  const pathspec = `${prefix}skills/*/SKILL.md`;
+  const escaped = prefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const skillRe = new RegExp(`^${escaped}skills/([^/]+)/SKILL\\.md$`);
+  return { pathspec, skillRe };
+}
+async function getRecentSkillChanges(repoPath, subdir = "") {
   const seen = /* @__PURE__ */ new Set();
   const changes = [];
+  const { pathspec, skillRe } = buildSkillChangePathspec(subdir);
   try {
     const git = createGit2(repoPath);
     const rawOutput = await git.raw([
@@ -13365,13 +13673,13 @@ async function getRecentSkillChanges(repoPath) {
       "--name-only",
       "--pretty=format:%H|%an|%s",
       "--",
-      "skills/*/SKILL.md"
+      pathspec
     ]);
     if (!rawOutput.trim()) return changes;
     const commits = parseGitLogOutput(rawOutput);
     for (const commit of commits) {
       for (const file of commit.files) {
-        const match = file.match(/^skills\/([^/]+)\/SKILL\.md$/);
+        const match = file.match(skillRe);
         if (!match) continue;
         const skillName = match[1];
         if (seen.has(skillName)) continue;
@@ -13389,14 +13697,14 @@ async function getRecentSkillChanges(repoPath) {
         "--name-only",
         "--pretty=format:%H|%an|%s",
         "--",
-        "skills/*/SKILL.md"
+        pathspec
       ]);
       const newSkills = /* @__PURE__ */ new Set();
       if (addedOutput.trim()) {
         const addedCommits = parseGitLogOutput(addedOutput);
         for (const commit of addedCommits) {
           for (const file of commit.files) {
-            const match = file.match(/^skills\/([^/]+)\/SKILL\.md$/);
+            const match = file.match(skillRe);
             if (match) {
               newSkills.add(match[1]);
             }
@@ -13577,7 +13885,10 @@ async function generateDigest(options) {
       console.log(`\u{1F4CA} Knowledge base total: ${totalLearnings} learnings`);
       console.log("");
     }
-    const skillChanges = await getRecentSkillChanges(repoPath);
+    const skillChanges = localConfig.repo.kind === "self" ? await getRecentSkillChanges(
+      localConfig.repo.businessRepoRoot ?? path44.dirname(repoPath),
+      ".teamai"
+    ) : await getRecentSkillChanges(repoPath);
     const newSkills = skillChanges.filter((c) => c.type === "new");
     const updatedSkills = skillChanges.filter((c) => c.type === "updated");
     if (newSkills.length > 0) {
@@ -14648,6 +14959,11 @@ async function refreshTeamRepo(localConfig) {
     return { label: "HTTP (report/sync delivery)", version: null, reportingOnly: true };
   }
   if (localConfig.repo.kind === "self") {
+    try {
+      const { migrateSelfModeGitignore: migrateSelfModeGitignore2 } = await Promise.resolve().then(() => (init_init(), init_exports));
+      await migrateSelfModeGitignore2(localConfig);
+    } catch {
+    }
     let version3 = null;
     try {
       version3 = await getHeadRev(localConfig.repo.localPath);
@@ -15041,7 +15357,15 @@ async function pullForScope(localConfig, options, policy = {}) {
       const docsRepoDir = path48.join(localConfig.repo.localPath, "docs");
       const rulesRepoDir = path48.join(localConfig.repo.localPath, "rules");
       const skillsRepoDir = path48.join(localConfig.repo.localPath, "skills");
-      const votesDir = path48.join(localConfig.repo.localPath, "votes");
+      let votesDir = path48.join(localConfig.repo.localPath, "votes");
+      if (localConfig.repo.kind === "self") {
+        try {
+          const { ensureReportsWorktree: ensureReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
+          votesDir = path48.join(await ensureReportsWorktree2(localConfig), "votes");
+        } catch (e) {
+          log.debug(`[self] reports worktree for votes unavailable: ${e.message}`);
+        }
+      }
       let learningsCount = 0;
       let effectiveLearningsDir;
       if (localConfig.scope === "user") {
@@ -15207,7 +15531,15 @@ async function pullForScope(localConfig, options, policy = {}) {
       const YAML20 = (await import("yaml")).default;
       const { listFiles: listFiles2, readFileSafe: readFileSafe5 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
       const { getRecommendations: getRecommendations2, displayRecommendations: displayRecommendations2 } = await Promise.resolve().then(() => (init_skill_recommend(), skill_recommend_exports));
-      const statsDir = path48.join(localConfig.repo.localPath, "stats");
+      let statsDir = path48.join(localConfig.repo.localPath, "stats");
+      if (localConfig.repo.kind === "self") {
+        try {
+          const { ensureReportsWorktree: ensureReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
+          statsDir = path48.join(await ensureReportsWorktree2(localConfig), "stats");
+        } catch (e) {
+          log.debug(`[self] reports worktree for stats unavailable: ${e.message}`);
+        }
+      }
       const files = await listFiles2(statsDir);
       const teamStats = [];
       for (const file of files) {
@@ -17229,9 +17561,13 @@ async function discoverToolResources(tool, toolPath, baseDir, teamSkillNames, te
       res.hookFiles.push({ path: settingsPath, tool });
     }
   } else {
-    const hooksDir = path56.join(baseDir, `.${tool}`, "hooks");
-    if (await pathExists(path56.join(hooksDir, OPENCLAW_HOOK_DIR))) {
-      res.openclawHookDirs.push({ hooksDir, tool });
+    const defaultHooksDir = path56.join(baseDir, `.${tool}`, "hooks");
+    const resolvedHooksDir = resolveOpenClawHooksDir(tool);
+    const dirsToCheck = /* @__PURE__ */ new Set([defaultHooksDir, resolvedHooksDir]);
+    for (const hooksDir of dirsToCheck) {
+      if (await pathExists(path56.join(hooksDir, OPENCLAW_HOOK_DIR))) {
+        res.openclawHookDirs.push({ hooksDir, tool });
+      }
     }
   }
   if (toolPath.claudemd) {
@@ -20733,15 +21069,31 @@ async function contributeSelf(localConfig, content, options) {
       await ensureDir(path69.join(wtRepo, "learnings"));
       await fs24.promises.writeFile(path69.join(wtRepo, relPath), content, "utf-8");
       try {
+        const { pathExists: pathExists3 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
         const wtLearnings = path69.join(wtRepo, "learnings");
         await fse11.copy(wtLearnings, LEARNINGS_LOCAL_DIR, {
           overwrite: true,
           filter: (src) => !path69.basename(src).startsWith(".")
         });
+        const repoPath = localConfig.repo.localPath;
+        const docsDir = path69.join(repoPath, "docs");
+        const rulesDir = path69.join(repoPath, "rules");
+        const skillsDir = path69.join(repoPath, "skills");
+        let votesDir;
+        try {
+          const { ensureReportsWorktree: ensureReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
+          const candidate = path69.join(await ensureReportsWorktree2(localConfig), "votes");
+          if (await pathExists3(candidate)) votesDir = candidate;
+        } catch {
+        }
         const teamaiHome = getTeamaiHome(localConfig.scope, localConfig.projectRoot);
         const { buildIndex: buildIndex2 } = await Promise.resolve().then(() => (init_search_index(), search_index_exports));
         await buildIndex2({
-          learningsDir: LEARNINGS_LOCAL_DIR,
+          learningsDir: await pathExists3(LEARNINGS_LOCAL_DIR) ? LEARNINGS_LOCAL_DIR : void 0,
+          docsDir: await pathExists3(docsDir) ? docsDir : void 0,
+          rulesDir: await pathExists3(rulesDir) ? rulesDir : void 0,
+          skillsDir: await pathExists3(skillsDir) ? skillsDir : void 0,
+          votesDir,
           indexPath: path69.join(teamaiHome, "search-index.json")
         });
       } catch (e) {
@@ -21517,7 +21869,7 @@ function formatResults(results) {
   lines.push(`--- [teamai:recall:start] --- (${results.length} result${results.length !== 1 ? "s" : ""})`);
   lines.push("");
   for (let i = 0; i < results.length; i++) {
-    const { entry, score, scope, learningsBase, sources } = results[i];
+    const { entry, score, scope, learningsBase, sources, matchedTerms, missingTerms } = results[i];
     const voteStr = entry.votes > 0 ? ` \u2605${entry.votes}` : "";
     const scopeStr = scope ? ` [${scope}]` : "";
     const typeTag = entry.type ? `[${entry.type}] ` : "";
@@ -21526,6 +21878,10 @@ function formatResults(results) {
     if (entry.tags.length > 0) {
       lines.push(`Tags: ${entry.tags.join(", ")}`);
     }
+    if (missingTerms && missingTerms.length > 0) {
+      const matchedStr = matchedTerms && matchedTerms.length > 0 ? matchedTerms.join(", ") : "none";
+      lines.push(`Matched: ${matchedStr} | Missing: ${missingTerms.join(", ")}`);
+    }
     const filePath = entry.path ? entry.path : learningsBase ? `${learningsBase}/${entry.filename}` : `~/.teamai/learnings/${entry.filename}`;
     lines.push(`File: ${filePath}`);
     if (sources && sources.length > 0) {
@@ -21620,8 +21976,16 @@ async function recall(query, options) {
     const rounded = Math.round(score * 10) / 10;
     const verdict = isRelevantScore(score, isCodebaseHit, baseline) ? "RELEVANT" : "NOT_RELEVANT";
     let line = `${verdict} score=${rounded.toFixed(1)}`;
+    const cutoff = isCodebaseHit ? CODEBASE_RELEVANCE_THRESHOLD : Math.max((baseline > 0 ? baseline : 1) * LEARNINGS_RELEVANCE_RATIO, LEARNINGS_ABSOLUTE_FLOOR);
+    line += ` threshold=${(Math.round(cutoff * 10) / 10).toFixed(1)}`;
     if (verdict === "RELEVANT" && topResult) {
       line += ` title="${topResult.entry.title}"`;
+      if (topResult.matchedTerms && topResult.matchedTerms.length > 0) {
+        line += ` matched=${topResult.matchedTerms.join(",")}`;
+      }
+      if (topResult.missingTerms && topResult.missingTerms.length > 0) {
+        line += ` missing=${topResult.missingTerms.join(",")}`;
+      }
       if (topResult.sources && topResult.sources.length > 0) {
         const srcStr = topResult.sources.map((s) => s.desc ? `${s.path}(${s.desc})` : s.path).join(",");
         line += ` sources=${srcStr}`;
@@ -21913,10 +22277,10 @@ var init_recall_toggle = __esm({
 
 // src/utils/cache-index.ts
 import path75 from "path";
-import os4 from "os";
+import os5 from "os";
 import fs25 from "fs-extra";
 function getCacheRoot() {
-  return process.env.TEAMAI_CACHE_DIR ?? path75.join(os4.homedir(), ".teamai", "cache", "repos");
+  return process.env.TEAMAI_CACHE_DIR ?? path75.join(os5.homedir(), ".teamai", "cache", "repos");
 }
 function buildKey(provider, owner, repo) {
   return `${provider}/${owner}/${repo}`;
@@ -25862,6 +26226,23 @@ function parseJSON(raw) {
     return null;
   }
 }
+function resolveImportToModule(importerFile, importPath) {
+  if (importPath.startsWith(".")) {
+    const importerDir = path86.dirname(importerFile);
+    const resolved = path86.normalize(path86.join(importerDir, importPath));
+    const topLevel = resolved.split("/")[0];
+    if (!topLevel || topLevel === ".." || topLevel === ".") return void 0;
+    return topLevel;
+  }
+  if (importPath.includes(".") && !importPath.includes("/")) {
+    return importPath.split(".")[0];
+  }
+  const parts = importPath.split("/");
+  const first = parts[0];
+  if (!first) return void 0;
+  if (first.startsWith("@")) return void 0;
+  return first;
+}
 async function enrichWithAI(ctx) {
   const moduleEntries = [...ctx.modules.entries()].filter(([, facts]) => facts.length >= 5);
   if (moduleEntries.length === 0) {
@@ -25925,9 +26306,9 @@ async function enrichWithAI(ctx) {
     const moduleImports = ctx.facts.filter((f) => f.kind === "relation" && f.file.startsWith(name + "/"));
     const targetModules = /* @__PURE__ */ new Set();
     for (const imp of moduleImports) {
-      const targetParts = imp.name.split("/");
-      if (targetParts[0] && targetParts[0] !== name) {
-        targetModules.add(targetParts[0]);
+      const resolved = resolveImportToModule(imp.file, imp.name);
+      if (resolved && resolved !== name) {
+        targetModules.add(resolved);
       }
     }
     for (const target of targetModules) {
@@ -26414,7 +26795,19 @@ async function extractCodebase(opts) {
   let callChains;
   const depPathsFile = path87.join(evidenceDir, "dependency-paths.md");
   if (changedFiles) {
-    callChains = [];
+    let reused = false;
+    try {
+      const existing = await readFile8(depPathsFile, "utf-8");
+      if (existing.trim()) {
+        reused = true;
+      }
+    } catch {
+    }
+    if (reused) {
+      callChains = [];
+    } else {
+      callChains = traceCallChains(facts, files);
+    }
   } else {
     callChains = traceCallChains(facts, files);
   }
@@ -26699,15 +27092,16 @@ async function shallowClone(url, localPath, provider, opts) {
       log.debug(`shallowClone: \u4F7F\u7528\u533F\u540D HTTPS \u514B\u9686 github \u4ED3\u5E93`);
     }
   } else if (provider === "tgit") {
-    const creds = tryGetTGitToken();
-    cloneUrl = url.replace(/^http:\/\//, "https://");
-    if (creds) {
-      cloneUrl = cloneUrl.replace("https://", `https://${tgitGitUser(creds.scheme)}:${creds.token}@`);
+    const httpsUrl = url.replace(/^http:\/\//, "https://");
+    const authed = tgitGitCloneUrl(httpsUrl);
+    if (authed) {
+      cloneUrl = authed;
       cloneMethod = "https-token";
-      log.debug(`shallowClone: \u4F7F\u7528 HTTPS+token \u514B\u9686 tgit \u4ED3\u5E93`);
+      log.debug(`shallowClone: \u4F7F\u7528 HTTPS+OAuth token \u514B\u9686 tgit \u4ED3\u5E93`);
     } else {
+      cloneUrl = httpsUrl;
       cloneMethod = "https-anonymous";
-      log.debug(`shallowClone: \u65E0 TGit token\uFF0C\u5C1D\u8BD5\u533F\u540D HTTPS \u514B\u9686`);
+      log.debug(`shallowClone: \u65E0 TGit OAuth token\uFF0C\u5C1D\u8BD5\u533F\u540D HTTPS \u514B\u9686`);
     }
   } else {
     cloneUrl = url.replace(/^http:\/\//, "https://");
@@ -26775,10 +27169,10 @@ __export(repo_cache_exports, {
   writeLastSync: () => writeLastSync
 });
 import path88 from "path";
-import os5 from "os";
+import os6 from "os";
 import fs31 from "fs-extra";
 function getCacheRoot2() {
-  return process.env.TEAMAI_CACHE_DIR ?? path88.join(os5.homedir(), ".teamai", "cache", "repos");
+  return process.env.TEAMAI_CACHE_DIR ?? path88.join(os6.homedir(), ".teamai", "cache", "repos");
 }
 function getRepoCacheDir(provider, owner, repo) {
   return path88.join(getCacheRoot2(), provider, owner, repo);
@@ -28833,7 +29227,7 @@ __export(import_exports, {
   importCmd: () => importCmd
 });
 import path98 from "path";
-import os6 from "os";
+import os7 from "os";
 import fs38 from "fs-extra";
 import { Listr, PRESET_TIMER } from "listr2";
 async function importCmd(opts) {
@@ -29027,7 +29421,7 @@ async function importCmd(opts) {
         log.success(`Local directory ${slug} import complete (dry-run)`);
         return;
       }
-      const tmpExtractDir = await fs38.mkdtemp(path98.join(os6.tmpdir(), "teamai-extract-"));
+      const tmpExtractDir = await fs38.mkdtemp(path98.join(os7.tmpdir(), "teamai-extract-"));
       try {
         const { extractCodebase: extractCodebase2 } = await Promise.resolve().then(() => (init_codebase_extract(), codebase_extract_exports));
         await extractCodebase2({