teamai-cli 0.25.0-beta.6 → 0.25.0

package/dist/index.js

@@ -838,12 +838,17 @@ function getWebhookSharing(config) {
   const w = config.sharing?.webhooks;
   return {
     enabled: w?.enabled ?? false,
+    // Preserve every schema-accepted field. Previously `secret` was dropped and
+    // `timeout`/`retries` were force-overridden, so a configured signing secret
+    // never reached the request and receivers with signature verification
+    // rejected the (unsigned) webhook (#703).
     endpoints: (w?.endpoints ?? []).map((ep) => ({
       url: ep.url,
       type: ep.type,
+      secret: ep.secret,
       events: ep.events ?? ["push", "pull", "skill-use", "session-start", "session-stop"],
-      timeout: 5e3,
-      retries: 3
+      timeout: ep.timeout ?? 5e3,
+      retries: ep.retries ?? 3
     }))
   };
 }
@@ -11378,16 +11383,19 @@ function selectToolWorkspaces(config, currentPath, currentTool) {
 async function buildReportPayload(config, context) {
   const manifest = await loadManifest();
   const tool = context.tool ?? "workbuddy";
-  const toolPaths = createLocalAgentTeamConfig(config.endpoint).toolPaths;
-  const toolPath = toolPaths[tool];
+  const teamConfig = createLocalAgentTeamConfig(config.endpoint);
   const manifestSlugs = collectManifestSlugs(manifest);
-  const scanScope = async (baseDir) => {
+  const scanScope = async (workspacePath) => {
+    const scope = workspacePath ? "project" : "user";
+    const localConfig = createResourceLocalConfig(config, scope, workspacePath ?? getUserHome(), workspacePath);
+    const toolPath = scopedToolPaths(teamConfig, localConfig)[tool];
     if (!toolPath) return { skills: [], rules: [] };
+    const baseDir = resolveToolBaseDir(tool, localConfig);
     const skills = toolPath.skills ? await scanSkillsFromDisk(path30.join(baseDir, toolPath.skills), manifestSlugs.skills) : [];
     const rules = toolPath.rules ? await scanRulesFromDisk(path30.join(baseDir, toolPath.rules), manifestSlugs.rules) : [];
     return { skills, rules };
   };
-  const userScope = await scanScope(getUserHome());
+  const userScope = await scanScope();
   const userLevel = { group_id: config.userGroupId };
   if (userScope.skills.length > 0) userLevel.skills = userScope.skills;
   if (userScope.rules.length > 0) userLevel.rules = userScope.rules;
@@ -16941,6 +16949,9 @@ async function remoteBranchExists2(spec, repoRoot) {
     return false;
   }
 }
+async function fetchTrackingRef(git, branch) {
+  await git.fetch(["origin", `+refs/heads/${branch}:refs/remotes/origin/${branch}`]);
+}
 async function ensureWorktree(spec, localConfig, options = {}) {
   if (!usesBranchWorktree(localConfig)) {
     return getWorktreeDir(localConfig, spec.worktreeDirname);
@@ -16970,14 +16981,14 @@ async function ensureWorktree(spec, localConfig, options = {}) {
   }
   if (await remoteBranchExists2(spec, repoRoot)) {
     try {
-      await git.fetch(["origin", spec.branch]);
+      await fetchTrackingRef(git, spec.branch);
     } catch {
     }
     const branches = await git.branchLocal();
     if (branches.all.includes(spec.branch)) {
       await git.raw(["worktree", "add", wt, spec.branch]);
     } else {
-      await git.raw(["worktree", "add", wt, "--track", "-b", spec.branch, `origin/${spec.branch}`]);
+      await git.raw(["worktree", "add", wt, "--no-track", "-b", spec.branch, `origin/${spec.branch}`]);
     }
   } else {
     const branches = await git.branchLocal();
@@ -17054,7 +17065,7 @@ async function commitAndPushAt(spec, wt, message, files, options = {}) {
         return { status: "failed", reason: pushErr.message };
       }
       try {
-        await git.fetch(["origin", spec.branch]);
+        await fetchTrackingRef(git, spec.branch);
         await git.rebase([`origin/${spec.branch}`]);
       } catch (rebaseErr) {
         log.debug(`[${spec.logTag}] rebase failed, retrying: ${rebaseErr.message}`);
@@ -17168,7 +17179,7 @@ async function syncWorktree(spec, wt) {
   const git = createGit2(wt);
   const upstream = `origin/${spec.branch}`;
   try {
-    await git.fetch(["origin", spec.branch]);
+    await fetchTrackingRef(git, spec.branch);
   } catch (e) {
     log.debug(`[${spec.logTag}] fetch failed, using the local copy: ${e.message}`);
     return;
@@ -18911,17 +18922,21 @@ async function pushGroup(args) {
       { reuseBranch: Boolean(reuse) }
     );
     workingTreeDirtied = false;
-    if (!hasChanges) {
+    const needsPrRetry = Boolean(reuse) && !reuse?.prUrl;
+    if (!hasChanges && !needsPrRetry) {
       pushSpin.succeed(
         reuse ? `No changes to push (PR already up to date: ${reuse.prUrl ?? branchName})` : "No changes to push (files already up to date)"
       );
-      return true;
+      return "nochange";
     }
-    pushSpin.succeed(`Pushed branch ${branchName}`);
+    pushSpin.succeed(
+      hasChanges ? `Pushed branch ${branchName}` : `No new changes; retrying PR creation for ${branchName}`
+    );
     let prUrl;
-    if (reuse) {
+    let prFailed = false;
+    if (reuse?.prUrl) {
       prUrl = reuse.prUrl;
-      log.success(`Existing PR updated: ${prUrl ?? branchName}`);
+      log.success(`Existing PR updated: ${prUrl}`);
     } else {
       prUrl = await createPrWithFallback(
         teamConfig,
@@ -18933,6 +18948,7 @@ ${items.map((i) => `- [${i.type}] ${i.name}`).join("\n")}`
       );
       if (!prUrl) {
         process.exitCode = 1;
+        prFailed = true;
       }
     }
     recordPendingPush(pushState, {
@@ -18945,7 +18961,7 @@ ${items.map((i) => `- [${i.type}] ${i.name}`).join("\n")}`
     for (const rel of pushedFiles) {
       await pruneEmptyDirs(path50.resolve(localConfig.repo.localPath, rel));
     }
-    return true;
+    return prFailed ? "pr-failed" : "pushed";
   } catch (e) {
     pushSpin.fail(`Push failed: ${e.message}`);
     if (workingTreeDirtied) {
@@ -18960,10 +18976,10 @@ ${items.map((i) => `- [${i.type}] ${i.name}`).join("\n")}`
         );
       }
     }
-    return false;
+    return "failed";
   }
 }
-async function push(options) {
+async function push(options, result) {
   const { localConfig, teamConfig } = await autoDetectInit();
   assertNotReadOnly(localConfig, "teamai push");
   if (options.project) {
@@ -19036,7 +19052,7 @@ async function push(options) {
           if (pendingTeamConfig !== null) {
             await writeFile(path50.join(wtConfig.repo.localPath, "teamai.yaml"), pendingTeamConfig);
           }
-          await pushCore(wtConfig, teamConfig, options, pendingTeamConfig);
+          await pushCore(wtConfig, teamConfig, options, pendingTeamConfig, result);
         });
       } catch (e) {
         if (e instanceof EmptyRepoError2) {
@@ -19059,12 +19075,12 @@ async function push(options) {
     return;
   }
   try {
-    await pushCore(localConfig, teamConfig, options);
+    await pushCore(localConfig, teamConfig, options, null, result);
   } finally {
     await releaseLock(syncLock);
   }
 }
-async function pushCore(localConfig, teamConfig, options, initialPendingTeamConfig = null) {
+async function pushCore(localConfig, teamConfig, options, initialPendingTeamConfig = null, result) {
   const selfMode = localConfig.repo.kind === "self";
   const scopeLabel = localConfig.scope;
   let pendingTeamConfig = initialPendingTeamConfig;
@@ -19238,7 +19254,7 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
   const pendingPushes = pushState.pendingPushes;
   if (allItems.length === 0) {
     if (pendingTeamConfig !== null) {
-      await pushTeamConfigOnly(localConfig, teamConfig, options);
+      await pushTeamConfigOnly(localConfig, teamConfig, options, result);
       return;
     }
     log.info("No new or modified resources to push");
@@ -19386,19 +19402,23 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
     }
   }
   let configRider = pendingTeamConfig !== null;
+  let anyPushed = false;
+  let anyPrFailed = false;
   for (const group of groups) {
-    const ok = await pushGroup({
+    const outcome = await pushGroup({
       group,
       teamConfig,
       localConfig,
       pushState,
       includeTeamConfig: configRider
     });
-    if (!ok) {
+    if (outcome === "failed") {
       await saveStateForScope(pushState, localConfig);
       process.exitCode = 1;
       return;
     }
+    if (outcome === "pushed") anyPushed = true;
+    if (outcome === "pr-failed") anyPrFailed = true;
     configRider = false;
   }
   const state = pushState;
@@ -19415,8 +19435,9 @@ async function pushCore(localConfig, teamConfig, options, initialPendingTeamConf
     }
   }
   await saveStateForScope(state, localConfig);
+  if (result && anyPushed && !anyPrFailed) result.completed = true;
 }
-async function pushTeamConfigOnly(localConfig, teamConfig, options) {
+async function pushTeamConfigOnly(localConfig, teamConfig, options, result) {
   console.log("");
   console.log("Found team config change to push:");
   console.log("  - teamai.yaml");
@@ -19449,6 +19470,8 @@ async function pushTeamConfigOnly(localConfig, teamConfig, options) {
     );
     if (!prUrl) {
       process.exitCode = 1;
+    } else if (result) {
+      result.completed = true;
     }
     await checkoutMaster(localConfig.repo.localPath);
   } catch (e) {
@@ -21263,6 +21286,270 @@ var init_commands = __esm({
   }
 });
 
+// src/webhook-formatters.ts
+function formatFeishuMessage(payload) {
+  const eventLabel = formatEventLabel(payload.event);
+  const time = new Date(payload.timestamp).toLocaleString("zh-CN", {
+    timeZone: "Asia/Shanghai",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  });
+  const lines = [
+    `\u{1F916} TeamAI Notification`,
+    `\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501`,
+    `Event: ${eventLabel}`
+  ];
+  if (payload.username) {
+    lines.push(`User: ${payload.username}`);
+  }
+  lines.push(`Time: ${time}`);
+  if (payload.tool) {
+    lines.push(`Tool: ${payload.tool}`);
+  }
+  if (payload.data) {
+    const dataStr = formatEventData(payload.event, payload.data);
+    if (dataStr) {
+      lines.push(dataStr);
+    }
+  }
+  lines.push(`\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501`);
+  return {
+    msg_type: "text",
+    content: {
+      text: lines.join("\n")
+    }
+  };
+}
+function formatWecomMessage(payload) {
+  const eventLabel = formatEventLabel(payload.event);
+  const time = new Date(payload.timestamp).toLocaleString("zh-CN", {
+    timeZone: "Asia/Shanghai",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  });
+  const lines = [
+    `\u{1F916} TeamAI Notification`,
+    `Event: ${eventLabel}`
+  ];
+  if (payload.username) {
+    lines.push(`User: ${payload.username}`);
+  }
+  lines.push(`Time: ${time}`);
+  if (payload.tool) {
+    lines.push(`Tool: ${payload.tool}`);
+  }
+  if (payload.data) {
+    const dataStr = formatEventData(payload.event, payload.data);
+    if (dataStr) {
+      lines.push(dataStr);
+    }
+  }
+  return {
+    msgtype: "text",
+    text: {
+      content: lines.join("\n")
+    }
+  };
+}
+function formatGenericJson(payload) {
+  return {
+    event: payload.event,
+    timestamp: payload.timestamp,
+    tool: payload.tool,
+    sessionId: payload.sessionId,
+    cwd: payload.cwd,
+    team: payload.team,
+    username: payload.username,
+    data: payload.data
+  };
+}
+function formatEventLabel(event) {
+  const labels = {
+    "push": "Push Complete",
+    "pull": "Pull Complete",
+    "skill-use": "Skill Used",
+    "session-start": "Session Started",
+    "session-stop": "Session Ended",
+    "webhook-test": "Webhook Test"
+  };
+  return labels[event] ?? event;
+}
+function formatEventData(event, data) {
+  switch (event) {
+    case "push":
+    case "pull":
+      if (data.resources && typeof data.resources === "object") {
+        const resources = data.resources;
+        const parts = Object.entries(resources).filter(([, count]) => count > 0).map(([type, count]) => `${type}: ${count}`);
+        return parts.length > 0 ? `Resources: ${parts.join(", ")}` : null;
+      }
+      return null;
+    case "skill-use":
+      if (data.skillName && typeof data.skillName === "string") {
+        return `Skill: ${data.skillName}`;
+      }
+      return null;
+    case "session-start":
+    case "session-stop":
+      if (data.sessionId && typeof data.sessionId === "string") {
+        return `Session: ${data.sessionId.slice(0, 8)}...`;
+      }
+      return null;
+    default:
+      return null;
+  }
+}
+var init_webhook_formatters = __esm({
+  "src/webhook-formatters.ts"() {
+    "use strict";
+  }
+});
+
+// src/webhook.ts
+var webhook_exports = {};
+__export(webhook_exports, {
+  listWebhooks: () => listWebhooks,
+  loadWebhookConfig: () => loadWebhookConfig,
+  sendWebhook: () => sendWebhook,
+  testWebhook: () => testWebhook
+});
+import { createHmac } from "crypto";
+async function sendWebhook(event, payload, config) {
+  if (!config) {
+    const { teamConfig } = await autoDetectInit();
+    config = getWebhookSharing(teamConfig);
+  }
+  if (!config.enabled || config.endpoints.length === 0) return;
+  const fullPayload = {
+    event,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    tool: payload.tool ?? "unknown",
+    sessionId: payload.sessionId,
+    cwd: payload.cwd,
+    team: payload.team,
+    username: payload.username,
+    data: payload.data ?? {}
+  };
+  const matchingEndpoints = config.endpoints.filter(
+    (ep) => ep.events.includes(event) || ep.events.includes("*")
+  );
+  if (matchingEndpoints.length === 0) return;
+  await Promise.allSettled(
+    matchingEndpoints.map((ep) => sendToEndpoint(ep, fullPayload))
+  );
+}
+async function sendToEndpoint(endpoint, payload) {
+  const { url, type, secret, timeout, retries } = endpoint;
+  const body = formatMessage(type, payload);
+  const serialized = typeof body === "string" ? body : JSON.stringify(body);
+  const outbound = redactWithEnv(serialized);
+  const headers = {
+    "Content-Type": type === "json" ? "application/json" : "text/plain; charset=utf-8"
+  };
+  if (secret) {
+    const signature = createHmac("sha256", secret).update(outbound).digest("hex");
+    headers["X-TeamAI-Signature"] = `sha256=${signature}`;
+  }
+  for (let attempt = 0; attempt <= retries; attempt++) {
+    try {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), timeout);
+      const response = await fetch(url, {
+        method: "POST",
+        headers,
+        body: outbound,
+        signal: controller.signal
+      });
+      clearTimeout(timeoutId);
+      if (response.ok) {
+        log.debug(`Webhook sent successfully to ${url}`);
+        return;
+      }
+      if (response.status >= 400 && response.status < 500 && response.status !== 429) {
+        log.warn(`Webhook to ${url} failed with status ${response.status} (not retrying)`);
+        return;
+      }
+      if (attempt < retries) {
+        const delay = Math.pow(2, attempt) * 1e3;
+        log.debug(`Webhook to ${url} failed, retrying in ${delay}ms...`);
+        await new Promise((resolve) => setTimeout(resolve, delay));
+      }
+    } catch (error) {
+      if (error instanceof Error && error.name === "AbortError") {
+        log.warn(`Webhook to ${url} timed out after ${timeout}ms`);
+      } else if (attempt < retries) {
+        const delay = Math.pow(2, attempt) * 1e3;
+        log.debug(`Webhook to ${url} failed, retrying in ${delay}ms...`);
+        await new Promise((resolve) => setTimeout(resolve, delay));
+      } else {
+        log.warn(`Webhook to ${url} failed after ${retries + 1} attempts: ${error.message}`);
+      }
+    }
+  }
+}
+function formatMessage(type, payload) {
+  switch (type) {
+    case "feishu":
+      return formatFeishuMessage(payload);
+    case "wecom":
+      return formatWecomMessage(payload);
+    case "json":
+    default:
+      return formatGenericJson(payload);
+  }
+}
+async function loadWebhookConfig() {
+  const { teamConfig } = await autoDetectInit();
+  return getWebhookSharing(teamConfig);
+}
+async function listWebhooks() {
+  const config = await loadWebhookConfig();
+  return config.endpoints;
+}
+async function testWebhook(url) {
+  const config = await loadWebhookConfig();
+  const endpoints = url ? config.endpoints.filter((ep) => ep.url === url) : config.endpoints;
+  if (endpoints.length === 0) {
+    log.warn("No webhook endpoints configured.");
+    return;
+  }
+  const testPayload = {
+    event: "webhook-test",
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    tool: "teamai-cli",
+    data: {
+      message: "This is a test webhook from TeamAI CLI"
+    }
+  };
+  for (const endpoint of endpoints) {
+    log.info(`Testing webhook to ${endpoint.url}...`);
+    try {
+      await sendToEndpoint(endpoint, testPayload);
+      log.success(`Webhook test successful: ${endpoint.url}`);
+    } catch (error) {
+      log.error(`Webhook test failed: ${endpoint.url} - ${error.message}`);
+    }
+  }
+}
+var init_webhook = __esm({
+  "src/webhook.ts"() {
+    "use strict";
+    init_config();
+    init_logger();
+    init_redact();
+    init_types();
+    init_webhook_formatters();
+  }
+});
+
 // src/migrate.ts
 var migrate_exports = {};
 __export(migrate_exports, {
@@ -23139,6 +23426,7 @@ __export(usage_tracker_exports, {
   isValidSkillName: () => isValidSkillName,
   readKnownSkills: () => readKnownSkills,
   readUsageEvents: () => readUsageEvents,
+  resolveSkillUse: () => resolveSkillUse,
   skillExistsOnDisk: () => skillExistsOnDisk,
   track: () => track,
   trackFromStdin: () => trackFromStdin,
@@ -23175,6 +23463,23 @@ function extractSkillName(toolInput) {
 function isValidSkillName(name) {
   return SKILL_NAME_REGEX.test(name);
 }
+function resolveSkillUse(toolName, toolInput) {
+  let skillName = null;
+  let source = null;
+  if (toolName === "Skill") {
+    skillName = extractSkillName(toolInput);
+  } else if (toolName === "Read") {
+    const filePath = (typeof toolInput.file_path === "string" ? toolInput.file_path : null) ?? (typeof toolInput.filePath === "string" ? toolInput.filePath : null) ?? (typeof toolInput.path === "string" ? toolInput.path : null);
+    if (filePath && /\/SKILL\.md$/i.test(filePath)) {
+      skillName = extractSkillName({ skill: filePath });
+      source = "cursor";
+    }
+  } else {
+    return null;
+  }
+  if (!skillName || !isValidSkillName(skillName)) return null;
+  return { skillName, source };
+}
 async function skillExistsOnDisk(skillName) {
   const home = getUserHome();
   const userSkillDirs = [
@@ -26063,7 +26368,7 @@ async function warnIfEnvYamlShapeIsWrong(freshConfig, localConfig) {
     log.debug(`env.yaml shape check skipped: ${e.message}`);
   }
 }
-async function pullForScope(localConfig, options, reported, policy = {}) {
+async function pullForScope(localConfig, options, reported, policy = {}, result) {
   const scopeLabel = localConfig.scope;
   const revisionField = policy.revisionField ?? "lastPullRev";
   const targetsField = revisionField === "lastPullRev" ? "lastPullTargets" : "lastInheritedPullTargets";
@@ -26110,6 +26415,111 @@ async function pullForScope(localConfig, options, reported, policy = {}) {
     return;
   }
   const resourceTypes = policy.resourceTypes ?? ["skills", "rules", "docs", "env", "agents"];
+  let reportsReadRoot;
+  const resolveReportsReadRoot = () => {
+    reportsReadRoot ??= (async () => {
+      if (!usesBranchWorktree(localConfig)) return localConfig.repo.localPath;
+      try {
+        const { ensureReportsWorktree: ensureReportsWorktree2, refreshReportsWorktree: refreshReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
+        await refreshReportsWorktree2(localConfig, { pushIfCreated: false });
+        return await ensureReportsWorktree2(localConfig, { pushIfCreated: false });
+      } catch (e) {
+        log.debug(`reports worktree unavailable: ${e.message}`);
+        return void 0;
+      }
+    })();
+    return reportsReadRoot;
+  };
+  const syncLearningsAndRebuildIndex = async () => {
+    if (options.dryRun) return;
+    try {
+      try {
+        const { learningsBranch: learningsBranch2 } = await Promise.resolve().then(() => (init_learnings_branch(), learnings_branch_exports));
+        await learningsBranch2.refresh(localConfig, { pushIfCreated: false });
+      } catch (e) {
+        log.debug(`learnings worktree unavailable: ${e.message}`);
+      }
+      const roots = learningsRoots(localConfig);
+      const publishedRoots = roots.read;
+      const docsRepoDir = path75.join(localConfig.repo.localPath, "docs");
+      const rulesRepoDir = path75.join(localConfig.repo.localPath, "rules");
+      const skillsRepoDir = path75.join(localConfig.repo.localPath, "skills");
+      const reportsRoot = await resolveReportsReadRoot();
+      const votesDir = reportsRoot ? path75.join(reportsRoot, "votes") : void 0;
+      const activeLearningsNamespaces = roleContext?.activeNamespaces.learnings ?? [];
+      const countLearnings = async (baseDir) => {
+        if (!await pathExists(baseDir)) return [];
+        const names = (await listFiles(baseDir)).filter((f) => f.endsWith(".md"));
+        for (const ns of activeLearningsNamespaces) {
+          const nsDir = path75.join(baseDir, ns);
+          if (await pathExists(nsDir)) {
+            names.push(
+              ...(await listFilesRecursive(nsDir)).filter((f) => f.endsWith(".md")).map((f) => path75.join(ns, f))
+            );
+          }
+        }
+        return names;
+      };
+      let learningsCount = 0;
+      let effectiveLearningsDir;
+      const mirrorSources = publishedRoots.filter((dir) => dir !== getUserLearningsDir());
+      const counted = /* @__PURE__ */ new Set();
+      for (const dir of publishedRoots) {
+        for (const name of await countLearnings(dir)) counted.add(name);
+      }
+      learningsCount = counted.size;
+      if (localConfig.scope === "user") {
+        await mirrorLearnings(
+          mirrorSources,
+          getUserLearningsDir(),
+          activeLearningsNamespaces
+        );
+        effectiveLearningsDir = await pathExists(getUserLearningsDir()) ? getUserLearningsDir() : void 0;
+      } else {
+        for (const dir of publishedRoots) {
+          if (await pathExists(dir)) {
+            effectiveLearningsDir = dir;
+            break;
+          }
+        }
+      }
+      const hasAnySource = effectiveLearningsDir || await pathExists(docsRepoDir) || await pathExists(rulesRepoDir) || await pathExists(skillsRepoDir);
+      const repoCodebaseDir = path75.join(localConfig.repo.localPath, "docs", "team-codebase");
+      const effectiveCodebaseDir = await pathExists(repoCodebaseDir) ? repoCodebaseDir : void 0;
+      if (hasAnySource || effectiveCodebaseDir) {
+        const votesExist = votesDir ? await pathExists(votesDir) : false;
+        const teamaiHome = getDataHome(localConfig);
+        const indexPath = path75.join(teamaiHome, "search-index.json");
+        const { buildIndex: buildIndex2 } = await Promise.resolve().then(() => (init_search_index(), search_index_exports));
+        const elapsed = await buildIndex2({
+          // The queue comes first: a contribution that could not be published
+          // yet stays recallable, and a queued edit wins over the published copy.
+          // Then every published root, so nothing is indexed from one directory
+          // that happened to be picked.
+          learningsDirs: [
+            pendingLearningsDir(localConfig),
+            ...effectiveLearningsDir ? [effectiveLearningsDir] : [],
+            ...publishedRoots
+          ],
+          learningsNamespaces: activeLearningsNamespaces,
+          docsDir: await pathExists(docsRepoDir) ? docsRepoDir : void 0,
+          rulesDir: await pathExists(rulesRepoDir) ? rulesRepoDir : void 0,
+          skillsDir: await pathExists(skillsRepoDir) ? skillsRepoDir : void 0,
+          codebaseDir: void 0,
+          // codebase now served by teamwiki/ graph engine
+          votesDir: votesExist ? votesDir : void 0,
+          indexPath
+        });
+        if (learningsCount > 0) {
+          log.success(`Synced ${learningsCount} learnings (index: ${elapsed}ms)`);
+        } else {
+          log.debug(`[${scopeLabel}] Built multi-category search index in ${elapsed}ms`);
+        }
+      }
+    } catch (e) {
+      log.debug(`Learnings/index sync skipped: ${e.message}`);
+    }
+  };
   let currentTargets = null;
   if (!options.force && !options.dryRun && !submodulesChanged) {
     try {
@@ -26143,6 +26553,7 @@ async function pullForScope(localConfig, options, reported, policy = {}) {
           if (resourceTypes.includes("env")) {
             await warnIfEnvYamlShapeIsWrong(freshConfig, localConfig);
           }
+          await syncLearningsAndRebuildIndex();
           return;
         }
         log.debug(`[${scopeLabel}] Repo unchanged; resource target set changed, syncing`);
@@ -26302,110 +26713,7 @@ async function pullForScope(localConfig, options, reported, policy = {}) {
   if (totalSynced === 0) {
     log.info(`[${scopeLabel}] No resources to sync`);
   }
-  let reportsReadRoot;
-  const resolveReportsReadRoot = () => {
-    reportsReadRoot ??= (async () => {
-      if (!usesBranchWorktree(localConfig)) return localConfig.repo.localPath;
-      try {
-        const { ensureReportsWorktree: ensureReportsWorktree2, refreshReportsWorktree: refreshReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-        await refreshReportsWorktree2(localConfig, { pushIfCreated: false });
-        return await ensureReportsWorktree2(localConfig, { pushIfCreated: false });
-      } catch (e) {
-        log.debug(`reports worktree unavailable: ${e.message}`);
-        return void 0;
-      }
-    })();
-    return reportsReadRoot;
-  };
-  if (!options.dryRun) {
-    try {
-      try {
-        const { learningsBranch: learningsBranch2 } = await Promise.resolve().then(() => (init_learnings_branch(), learnings_branch_exports));
-        await learningsBranch2.refresh(localConfig, { pushIfCreated: false });
-      } catch (e) {
-        log.debug(`learnings worktree unavailable: ${e.message}`);
-      }
-      const roots = learningsRoots(localConfig);
-      const publishedRoots = roots.read;
-      const docsRepoDir = path75.join(localConfig.repo.localPath, "docs");
-      const rulesRepoDir = path75.join(localConfig.repo.localPath, "rules");
-      const skillsRepoDir = path75.join(localConfig.repo.localPath, "skills");
-      const reportsRoot = await resolveReportsReadRoot();
-      const votesDir = reportsRoot ? path75.join(reportsRoot, "votes") : void 0;
-      const activeLearningsNamespaces = roleContext?.activeNamespaces.learnings ?? [];
-      const countLearnings = async (baseDir) => {
-        if (!await pathExists(baseDir)) return [];
-        const names = (await listFiles(baseDir)).filter((f) => f.endsWith(".md"));
-        for (const ns of activeLearningsNamespaces) {
-          const nsDir = path75.join(baseDir, ns);
-          if (await pathExists(nsDir)) {
-            names.push(
-              ...(await listFilesRecursive(nsDir)).filter((f) => f.endsWith(".md")).map((f) => path75.join(ns, f))
-            );
-          }
-        }
-        return names;
-      };
-      let learningsCount = 0;
-      let effectiveLearningsDir;
-      const mirrorSources = publishedRoots.filter((dir) => dir !== getUserLearningsDir());
-      const counted = /* @__PURE__ */ new Set();
-      for (const dir of publishedRoots) {
-        for (const name of await countLearnings(dir)) counted.add(name);
-      }
-      learningsCount = counted.size;
-      if (localConfig.scope === "user") {
-        await mirrorLearnings(
-          mirrorSources,
-          getUserLearningsDir(),
-          activeLearningsNamespaces
-        );
-        effectiveLearningsDir = await pathExists(getUserLearningsDir()) ? getUserLearningsDir() : void 0;
-      } else {
-        for (const dir of publishedRoots) {
-          if (await pathExists(dir)) {
-            effectiveLearningsDir = dir;
-            break;
-          }
-        }
-      }
-      const hasAnySource = effectiveLearningsDir || await pathExists(docsRepoDir) || await pathExists(rulesRepoDir) || await pathExists(skillsRepoDir);
-      const repoCodebaseDir = path75.join(localConfig.repo.localPath, "docs", "team-codebase");
-      const effectiveCodebaseDir = await pathExists(repoCodebaseDir) ? repoCodebaseDir : void 0;
-      if (hasAnySource || effectiveCodebaseDir) {
-        const votesExist = votesDir ? await pathExists(votesDir) : false;
-        const teamaiHome = getDataHome(localConfig);
-        const indexPath = path75.join(teamaiHome, "search-index.json");
-        const { buildIndex: buildIndex2 } = await Promise.resolve().then(() => (init_search_index(), search_index_exports));
-        const elapsed = await buildIndex2({
-          // The queue comes first: a contribution that could not be published
-          // yet stays recallable, and a queued edit wins over the published copy.
-          // Then every published root, so nothing is indexed from one directory
-          // that happened to be picked.
-          learningsDirs: [
-            pendingLearningsDir(localConfig),
-            ...effectiveLearningsDir ? [effectiveLearningsDir] : [],
-            ...publishedRoots
-          ],
-          learningsNamespaces: activeLearningsNamespaces,
-          docsDir: await pathExists(docsRepoDir) ? docsRepoDir : void 0,
-          rulesDir: await pathExists(rulesRepoDir) ? rulesRepoDir : void 0,
-          skillsDir: await pathExists(skillsRepoDir) ? skillsRepoDir : void 0,
-          codebaseDir: void 0,
-          // codebase now served by teamwiki/ graph engine
-          votesDir: votesExist ? votesDir : void 0,
-          indexPath
-        });
-        if (learningsCount > 0) {
-          log.success(`Synced ${learningsCount} learnings (index: ${elapsed}ms)`);
-        } else {
-          log.debug(`[${scopeLabel}] Built multi-category search index in ${elapsed}ms`);
-        }
-      }
-    } catch (e) {
-      log.debug(`Learnings/index sync skipped: ${e.message}`);
-    }
-  }
+  await syncLearningsAndRebuildIndex();
   if (!options.dryRun) {
     await syncManagedInstructions(freshConfig, localConfig, roleContext, scopeLabel);
   }
@@ -26493,6 +26801,7 @@ async function pullForScope(localConfig, options, reported, policy = {}) {
     } catch {
     }
   }
+  if (result && !options.dryRun) result.completed = true;
 }
 function compileCulture(raw) {
   let parsed;
@@ -26777,7 +27086,7 @@ async function reinjectLegacyHooks(localConfig) {
   await injectHooksToAllTools2(teamConfig.toolPaths, baseDir, hookFilter);
   log.debug("Hooks migrated to dispatch format");
 }
-async function pull(options) {
+async function pull(options, result) {
   const reported = /* @__PURE__ */ new Set();
   const needsHookMigration = await legacyHooksNeedReinject().catch(() => false);
   const contended = /* @__PURE__ */ new Set();
@@ -26819,12 +27128,12 @@ async function pull(options) {
               await pullForScope(inheritedUserConfig, options, reported, {
                 resourceTypes: ["skills", "rules", "docs", "agents"],
                 revisionField: "lastInheritedPullRev"
-              });
+              }, result);
             }
           } else {
             activeUserConfig = loadedUserConfig;
             if (await lockScope(activeUserConfig)) {
-              await pullForScope(activeUserConfig, options, reported);
+              await pullForScope(activeUserConfig, options, reported, {}, result);
             }
           }
         } else if (inheritUserScope) {
@@ -26839,7 +27148,7 @@ async function pull(options) {
     if (projectConfig) {
       try {
         if (await lockScope(projectConfig)) {
-          await pullForScope(projectConfig, options, reported);
+          await pullForScope(projectConfig, options, reported, {}, result);
         }
       } catch (e) {
         log.warn(`Project-scope pull error: ${e.message}`);
@@ -29679,267 +29988,6 @@ var init_mcp_cmd = __esm({
   }
 });
 
-// src/webhook-formatters.ts
-function formatFeishuMessage(payload) {
-  const eventLabel = formatEventLabel(payload.event);
-  const time = new Date(payload.timestamp).toLocaleString("zh-CN", {
-    timeZone: "Asia/Shanghai",
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit"
-  });
-  const lines = [
-    `\u{1F916} TeamAI Notification`,
-    `\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501`,
-    `Event: ${eventLabel}`
-  ];
-  if (payload.username) {
-    lines.push(`User: ${payload.username}`);
-  }
-  lines.push(`Time: ${time}`);
-  if (payload.tool) {
-    lines.push(`Tool: ${payload.tool}`);
-  }
-  if (payload.data) {
-    const dataStr = formatEventData(payload.event, payload.data);
-    if (dataStr) {
-      lines.push(dataStr);
-    }
-  }
-  lines.push(`\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501`);
-  return {
-    msg_type: "text",
-    content: {
-      text: lines.join("\n")
-    }
-  };
-}
-function formatWecomMessage(payload) {
-  const eventLabel = formatEventLabel(payload.event);
-  const time = new Date(payload.timestamp).toLocaleString("zh-CN", {
-    timeZone: "Asia/Shanghai",
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit"
-  });
-  const lines = [
-    `\u{1F916} TeamAI Notification`,
-    `Event: ${eventLabel}`
-  ];
-  if (payload.username) {
-    lines.push(`User: ${payload.username}`);
-  }
-  lines.push(`Time: ${time}`);
-  if (payload.tool) {
-    lines.push(`Tool: ${payload.tool}`);
-  }
-  if (payload.data) {
-    const dataStr = formatEventData(payload.event, payload.data);
-    if (dataStr) {
-      lines.push(dataStr);
-    }
-  }
-  return {
-    msgtype: "text",
-    text: {
-      content: lines.join("\n")
-    }
-  };
-}
-function formatGenericJson(payload) {
-  return {
-    event: payload.event,
-    timestamp: payload.timestamp,
-    tool: payload.tool,
-    sessionId: payload.sessionId,
-    cwd: payload.cwd,
-    team: payload.team,
-    username: payload.username,
-    data: payload.data
-  };
-}
-function formatEventLabel(event) {
-  const labels = {
-    "push": "Push Complete",
-    "pull": "Pull Complete",
-    "skill-use": "Skill Used",
-    "session-start": "Session Started",
-    "session-stop": "Session Ended",
-    "webhook-test": "Webhook Test"
-  };
-  return labels[event] ?? event;
-}
-function formatEventData(event, data) {
-  switch (event) {
-    case "push":
-    case "pull":
-      if (data.resources && typeof data.resources === "object") {
-        const resources = data.resources;
-        const parts = Object.entries(resources).filter(([, count]) => count > 0).map(([type, count]) => `${type}: ${count}`);
-        return parts.length > 0 ? `Resources: ${parts.join(", ")}` : null;
-      }
-      return null;
-    case "skill-use":
-      if (data.skillName && typeof data.skillName === "string") {
-        return `Skill: ${data.skillName}`;
-      }
-      return null;
-    case "session-start":
-    case "session-stop":
-      if (data.sessionId && typeof data.sessionId === "string") {
-        return `Session: ${data.sessionId.slice(0, 8)}...`;
-      }
-      return null;
-    default:
-      return null;
-  }
-}
-var init_webhook_formatters = __esm({
-  "src/webhook-formatters.ts"() {
-    "use strict";
-  }
-});
-
-// src/webhook.ts
-var webhook_exports = {};
-__export(webhook_exports, {
-  listWebhooks: () => listWebhooks,
-  loadWebhookConfig: () => loadWebhookConfig,
-  sendWebhook: () => sendWebhook,
-  testWebhook: () => testWebhook
-});
-import { createHmac } from "crypto";
-async function sendWebhook(event, payload, config) {
-  if (!config) {
-    const { teamConfig } = await autoDetectInit();
-    config = getWebhookSharing(teamConfig);
-  }
-  if (!config.enabled || config.endpoints.length === 0) return;
-  const fullPayload = {
-    event,
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-    tool: payload.tool ?? "unknown",
-    sessionId: payload.sessionId,
-    cwd: payload.cwd,
-    team: payload.team,
-    username: payload.username,
-    data: payload.data ?? {}
-  };
-  const matchingEndpoints = config.endpoints.filter(
-    (ep) => ep.events.includes(event) || ep.events.includes("*")
-  );
-  if (matchingEndpoints.length === 0) return;
-  await Promise.allSettled(
-    matchingEndpoints.map((ep) => sendToEndpoint(ep, fullPayload))
-  );
-}
-async function sendToEndpoint(endpoint, payload) {
-  const { url, type, secret, timeout, retries } = endpoint;
-  const body = formatMessage(type, payload);
-  const headers = {
-    "Content-Type": type === "json" ? "application/json" : "text/plain; charset=utf-8"
-  };
-  if (secret) {
-    const signature = createHmac("sha256", secret).update(JSON.stringify(body)).digest("hex");
-    headers["X-TeamAI-Signature"] = `sha256=${signature}`;
-  }
-  for (let attempt = 0; attempt <= retries; attempt++) {
-    try {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), timeout);
-      const response = await fetch(url, {
-        method: "POST",
-        headers,
-        body: typeof body === "string" ? body : JSON.stringify(body),
-        signal: controller.signal
-      });
-      clearTimeout(timeoutId);
-      if (response.ok) {
-        log.debug(`Webhook sent successfully to ${url}`);
-        return;
-      }
-      if (response.status >= 400 && response.status < 500 && response.status !== 429) {
-        log.warn(`Webhook to ${url} failed with status ${response.status} (not retrying)`);
-        return;
-      }
-      if (attempt < retries) {
-        const delay = Math.pow(2, attempt) * 1e3;
-        log.debug(`Webhook to ${url} failed, retrying in ${delay}ms...`);
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      }
-    } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
-        log.warn(`Webhook to ${url} timed out after ${timeout}ms`);
-      } else if (attempt < retries) {
-        const delay = Math.pow(2, attempt) * 1e3;
-        log.debug(`Webhook to ${url} failed, retrying in ${delay}ms...`);
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      } else {
-        log.warn(`Webhook to ${url} failed after ${retries + 1} attempts: ${error.message}`);
-      }
-    }
-  }
-}
-function formatMessage(type, payload) {
-  switch (type) {
-    case "feishu":
-      return formatFeishuMessage(payload);
-    case "wecom":
-      return formatWecomMessage(payload);
-    case "json":
-    default:
-      return formatGenericJson(payload);
-  }
-}
-async function loadWebhookConfig() {
-  const { teamConfig } = await autoDetectInit();
-  return getWebhookSharing(teamConfig);
-}
-async function listWebhooks() {
-  const config = await loadWebhookConfig();
-  return config.endpoints;
-}
-async function testWebhook(url) {
-  const config = await loadWebhookConfig();
-  const endpoints = url ? config.endpoints.filter((ep) => ep.url === url) : config.endpoints;
-  if (endpoints.length === 0) {
-    log.warn("No webhook endpoints configured.");
-    return;
-  }
-  const testPayload = {
-    event: "webhook-test",
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-    tool: "teamai-cli",
-    data: {
-      message: "This is a test webhook from TeamAI CLI"
-    }
-  };
-  for (const endpoint of endpoints) {
-    log.info(`Testing webhook to ${endpoint.url}...`);
-    try {
-      await sendToEndpoint(endpoint, testPayload);
-      log.success(`Webhook test successful: ${endpoint.url}`);
-    } catch (error) {
-      log.error(`Webhook test failed: ${endpoint.url} - ${error.message}`);
-    }
-  }
-}
-var init_webhook = __esm({
-  "src/webhook.ts"() {
-    "use strict";
-    init_config();
-    init_logger();
-    init_types();
-    init_webhook_formatters();
-  }
-});
-
 // src/session-collector.ts
 import fs28 from "fs";
 import path86 from "path";
@@ -33953,6 +34001,24 @@ async function contributeHintAllowed() {
     return isContributeHintEnabled2({}, {});
   }
 }
+async function buildWebhookData(event, stdin) {
+  if (event === "skill-use") {
+    const rawToolName = stdin.tool_name;
+    const toolInput = stdin.tool_input;
+    if (typeof rawToolName !== "string" || !toolInput || typeof toolInput !== "object") return {};
+    const { resolveSkillUse: resolveSkillUse2 } = await Promise.resolve().then(() => (init_usage_tracker(), usage_tracker_exports));
+    const resolved = resolveSkillUse2(
+      normalizeToolName(rawToolName),
+      toolInput
+    );
+    return resolved ? { skillName: resolved.skillName } : {};
+  }
+  if (event === "session-start" || event === "session-stop") {
+    const sessionId = deriveSessionId(stdin);
+    return sessionId ? { sessionId } : {};
+  }
+  return {};
+}
 function buildHandlerRegistry() {
   return [
     // ─── SessionStart ─────────────────────────────────
@@ -33965,9 +34031,11 @@ function buildHandlerRegistry() {
     { event: "session-start", matcher: "*", handler: packageHintHandler, timeoutMs: FOREGROUND_HOOK_TIMEOUT_MS },
     { event: "session-start", matcher: "*", handler: localAgentHandler, timeoutMs: FOREGROUND_HOOK_TIMEOUT_MS },
     { event: "session-start", matcher: "*", handler: webhookHandler, timeoutMs: FOREGROUND_HOOK_TIMEOUT_MS, background: true },
-    // Copilot emits SessionEnd after its final turn. Only the dashboard needs
-    // this lifecycle event; detaching it avoids delaying CLI shutdown.
+    // Copilot emits SessionEnd after its final turn (not Stop), so the webhook
+    // handler must run here too or those sessions emit no session-stop
+    // notification (#702). Detached, mirroring the stop registration.
     { event: "session-end", matcher: "*", handler: dashboardReportHandler, timeoutMs: FOREGROUND_HOOK_TIMEOUT_MS, background: true },
+    { event: "session-end", matcher: "*", handler: webhookHandler, timeoutMs: FOREGROUND_HOOK_TIMEOUT_MS, background: true },
     // ─── Stop ─────────────────────────────────────────
     // votes-sync and contribute-check may return a hint the host injects back
     // into the session, so they run inline (capped at FOREGROUND_HOOK_TIMEOUT_MS).
@@ -34001,7 +34069,7 @@ function filterHandlersForConfig(registry, localConfig) {
   }
   return registry;
 }
-var FOREGROUND_HOOK_TIMEOUT_MS, TODOWRITE_HINT_TIMEOUT_MS, UPDATE_TIMEOUT_MS2, LOCAL_AGENT_TIMEOUT_MS, PULL_TIMEOUT_MS, pullHandler, updateHandler, dashboardReportHandler, trackHandler, trackSlashHandler, contributeCheckHandler, pendingHintHandler, packagePendingHintHandler, votesSyncHandler, todowriteHintHandler, mrHintHandler, packageHintHandler, localAgentHandler, webhookHandler;
+var FOREGROUND_HOOK_TIMEOUT_MS, TODOWRITE_HINT_TIMEOUT_MS, UPDATE_TIMEOUT_MS2, LOCAL_AGENT_TIMEOUT_MS, PULL_TIMEOUT_MS, pullHandler, updateHandler, dashboardReportHandler, trackHandler, trackSlashHandler, contributeCheckHandler, pendingHintHandler, packagePendingHintHandler, votesSyncHandler, todowriteHintHandler, mrHintHandler, packageHintHandler, localAgentHandler, WEBHOOK_EVENT_BY_HOOK, webhookHandler;
 var init_hook_handlers = __esm({
   "src/hook-handlers.ts"() {
     "use strict";
@@ -34065,29 +34133,20 @@ var init_hook_handlers = __esm({
     trackHandler = {
       name: "track",
       async execute(stdin, tool) {
-        const { extractSkillName: extractSkillName2, isValidSkillName: isValidSkillName2, appendUsageEvent: appendUsageEvent2, updateKnownSkills: updateKnownSkills2 } = await Promise.resolve().then(() => (init_usage_tracker(), usage_tracker_exports));
+        const { resolveSkillUse: resolveSkillUse2, appendUsageEvent: appendUsageEvent2, updateKnownSkills: updateKnownSkills2 } = await Promise.resolve().then(() => (init_usage_tracker(), usage_tracker_exports));
         const rawToolName = stdin.tool_name;
         if (typeof rawToolName !== "string") return null;
         const toolName = normalizeToolName(rawToolName);
         const toolInput = stdin.tool_input;
         if (!toolInput || typeof toolInput !== "object") return null;
-        let skillName = null;
-        let toolSource = tool;
-        if (toolName === "Skill") {
-          skillName = extractSkillName2(toolInput);
-        } else if (toolName === "Read") {
-          const input = toolInput;
-          const filePath = (typeof input.file_path === "string" ? input.file_path : null) ?? (typeof input.filePath === "string" ? input.filePath : null) ?? (typeof input.path === "string" ? input.path : null);
-          if (typeof filePath === "string" && /\/SKILL\.md$/i.test(filePath)) {
-            skillName = extractSkillName2({ skill: filePath });
-            toolSource = "cursor";
-          }
-        } else {
-          return null;
-        }
-        if (!skillName || !isValidSkillName2(skillName)) return null;
-        await appendUsageEvent2({ skill: skillName, timestamp: (/* @__PURE__ */ new Date()).toISOString(), tool: toolSource });
-        await updateKnownSkills2(skillName);
+        const resolved = resolveSkillUse2(toolName, toolInput);
+        if (!resolved) return null;
+        await appendUsageEvent2({
+          skill: resolved.skillName,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          tool: resolved.source ?? tool
+        });
+        await updateKnownSkills2(resolved.skillName);
         return null;
       }
     };
@@ -34278,6 +34337,12 @@ var init_hook_handlers = __esm({
         return reportAndSyncFromHook2(stdin, tool);
       }
     };
+    WEBHOOK_EVENT_BY_HOOK = {
+      sessionstart: "session-start",
+      stop: "session-stop",
+      sessionend: "session-stop",
+      posttooluse: "skill-use"
+    };
     webhookHandler = {
       name: "webhook-dispatch",
       async execute(stdin, tool) {
@@ -34285,13 +34350,15 @@ var init_hook_handlers = __esm({
         try {
           const config = await loadWebhookConfig2();
           if (!config.enabled || config.endpoints.length === 0) return null;
-          const event = typeof stdin.event === "string" ? stdin.event : "unknown";
+          const hookEventName = typeof stdin.hook_event_name === "string" ? stdin.hook_event_name : "";
+          const event = WEBHOOK_EVENT_BY_HOOK[hookEventName.toLowerCase()];
+          if (!event) return null;
           const payload = {
             tool,
             sessionId: deriveSessionId(stdin),
             cwd: resolveHookCwd(stdin),
             username: typeof stdin.username === "string" ? stdin.username : void 0,
-            data: stdin
+            data: await buildWebhookData(event, stdin)
           };
           await sendWebhook2(event, payload, config);
         } catch (error) {
@@ -34671,6 +34738,13 @@ async function contribute(options) {
     log.debug(`contribute: index rebuild skipped: ${e.message}`);
   }
   const report = await publishQueuedLearnings(localConfig, username);
+  if (report.published.length > 0) {
+    try {
+      await rebuildIndexAfterContribute(localConfig);
+    } catch (e) {
+      log.debug(`contribute: post-publish index rebuild skipped: ${e.message}`);
+    }
+  }
   const sessionId = options.sessionId || process.env.CLAUDE_SESSION_ID || "";
   if (sessionId) {
     await markContributed(sessionId);
@@ -43206,6 +43280,7 @@ async function importFromRepo(opts) {
     if (!dryRun) {
       const cacheWiki = path127.join(cacheDir, "teamwiki");
       try {
+        let extractIncremental = incremental;
         if (incremental) {
           const destIndices = path127.join(teamwikiRoot, ".indices");
           const cacheIndices = path127.join(cacheDir, "teamwiki", ".indices");
@@ -43220,13 +43295,18 @@ async function importFromRepo(opts) {
           if (await fs48.pathExists(existingManifest)) {
             await fs48.copy(existingManifest, path127.join(cacheDir, "teamwiki", "source-manifest.json"));
           }
+          const cacheManifest = path127.join(cacheWiki, "source-manifest.json");
+          if (await fs48.pathExists(cacheManifest)) {
+            const manifest = await fs48.readJson(cacheManifest).catch(() => null);
+            if (!lastSync || manifest?.headSha !== lastSync.sha) extractIncremental = false;
+          }
         }
         await extractCodebase({
           path: cacheDir,
           project: slug,
           json: false,
           skipEnrich,
-          incremental,
+          incremental: extractIncremental,
           repoUrl: url,
           branch: cloneBranch === "HEAD" ? void 0 : cloneBranch,
           sourceMrUrl
@@ -43305,7 +43385,7 @@ ${aiNarrative}`;
         }
         log.info(chalk4.green(`\u2713 teamwiki/ knowledge graph updated: ${slug}`));
       } catch (err) {
-        log.debug(`[wiki-engine] Graph generation failed (non-blocking): ${err instanceof Error ? err.message : err}`);
+        throw new Error(`Knowledge extraction failed: ${err instanceof Error ? err.message : String(err)}`);
       } finally {
         await fs48.remove(cacheWiki).catch(() => {
         });
@@ -45285,7 +45365,9 @@ async function findGitHubComment(owner, repo, prNumber, marker) {
     `/repos/${owner}/${repo}/issues/${prNumber}/comments?per_page=100`,
     "GET"
   );
-  if (!resp.ok) return null;
+  if (!resp.ok) {
+    throw new Error(`GitHub comment list request failed (${resp.status})`);
+  }
   const comments = await resp.json();
   return comments.find((c) => c.body.includes(marker)) ?? null;
 }
@@ -45341,7 +45423,9 @@ async function findTGitComment(projectId, mrGlobalId, marker) {
     `/projects/${projectId}/merge_requests/${mrGlobalId}/notes?per_page=100`,
     "GET"
   );
-  if (!resp.ok) return null;
+  if (!resp.ok) {
+    throw new Error(`TGit note list request failed (${resp.status})`);
+  }
   const notes = await resp.json();
   return notes.find((n) => n.body.includes(marker)) ?? null;
 }
@@ -46073,6 +46157,13 @@ function registerPackagesCommand(program2, run = async (target, opts) => {
 var MIGRATION_TRIGGER_COMMANDS = /* @__PURE__ */ new Set(["init", "pull", "push"]);
 var require4 = createRequire4(import.meta.url);
 var { version } = require4("../package.json");
+async function notifyWebhook(event) {
+  try {
+    const { sendWebhook: sendWebhook2 } = await Promise.resolve().then(() => (init_webhook(), webhook_exports));
+    await sendWebhook2(event, { tool: "teamai-cli", data: {} });
+  } catch {
+  }
+}
 var program = new Command();
 program.name("teamai").description("TeamAI \u2014 Make Every Team AI Native").version(version).option("--dry-run", "Preview mode, no changes made").option("-v, --verbose", "Verbose output").hook("preAction", async (thisCommand, actionCommand) => {
   const opts = thisCommand.opts();
@@ -46097,13 +46188,17 @@ program.command("init").description("Initialize teamai (configure Git provider,
 program.command("push").description("Push local resources to team repo").option("--all", "Push all without confirmation").option("--skill <path>", "Push a specific skill by path (e.g., ~/.claude/skills/hai/my-skill or skills/hai_dev/my-skill)").option("--role <id>", "Target role namespace for pushed project skills").option("--project <id>", "Target a project: push skills into the project's skills namespace (from manifest/projects.yaml)").action(async (cmdOpts) => {
   const globalOpts = program.opts();
   const { push: push2 } = await Promise.resolve().then(() => (init_push(), push_exports));
-  await push2({ ...globalOpts, ...cmdOpts });
+  const outcome = { completed: false };
+  await push2({ ...globalOpts, ...cmdOpts }, outcome);
+  if (outcome.completed) await notifyWebhook("push");
 });
 program.command("pull").description("Pull team resources and inject into local AI tools").option("--silent", "Silent mode (for hooks)").option("--force", "Force full sync even if repo is unchanged").action(async (cmdOpts) => {
   const globalOpts = program.opts();
   if (cmdOpts.silent) setSilent(true);
   const { pull: pull2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
-  await pull2({ ...globalOpts, ...cmdOpts, interactive: !cmdOpts.silent });
+  const outcome = { completed: false };
+  await pull2({ ...globalOpts, ...cmdOpts, interactive: !cmdOpts.silent }, outcome);
+  if (!cmdOpts.silent && outcome.completed) await notifyWebhook("pull");
 });
 program.command("status").description("Show local vs team repo diff").option("--all", "List every project data partition under ~/.teamai/projects (flags stale/orphan ones)").action(async (cmdOpts) => {
   const globalOpts = program.opts();