teamai-cli 0.24.0 → 0.25.0-beta.0

package/dist/index.js

@@ -559,6 +559,7 @@ __export(types_exports, {
   getDataHome: () => getDataHome,
   getEnvBackupPath: () => getEnvBackupPath,
   getHooksSharing: () => getHooksSharing,
+  getInterventionSharing: () => getInterventionSharing,
   getKnowledgeDir: () => getKnowledgeDir,
   getManagedHooksPath: () => getManagedHooksPath,
   getMcpSharing: () => getMcpSharing,
@@ -590,11 +591,15 @@ __export(types_exports, {
   resolveHookScope: () => resolveHookScope,
   resolveLegacyProjectHookScope: () => resolveLegacyProjectHookScope,
   scopedToolPaths: () => scopedToolPaths,
-  totalTokens: () => totalTokens
+  totalTokens: () => totalTokens,
+  usesReportsBranch: () => usesReportsBranch
 });
 import { z } from "zod";
 import path3 from "path";
 import { createHash } from "crypto";
+function getInterventionSharing(config) {
+  return { correctionKeywords: config.sharing?.intervention?.correctionKeywords ?? [] };
+}
 function getHooksSharing(config) {
   const h = config.sharing?.hooks;
   return {
@@ -722,6 +727,9 @@ function scopedToolPaths(teamConfig, localConfig) {
 function isSelfMode(localConfig) {
   return localConfig.repo.kind === "self";
 }
+function usesReportsBranch(localConfig) {
+  return localConfig.repo.kind !== "http";
+}
 function getKnowledgeDir(localConfig) {
   return localConfig.repo.localPath;
 }
@@ -730,10 +738,13 @@ function getDataHome(localConfig) {
   return getTeamaiHome(localConfig.scope, localConfig.projectRoot);
 }
 function getReportsDir(localConfig) {
+  if (!usesReportsBranch(localConfig)) {
+    return localConfig.repo.localPath;
+  }
   if (isSelfMode(localConfig)) {
     return path3.join(localConfig.repo.localPath, REPORTS_WORKTREE_DIRNAME);
   }
-  return localConfig.repo.localPath;
+  return path3.join(path3.dirname(localConfig.repo.localPath), REPORTS_WORKTREE_DIRNAME);
 }
 function getTeamaiHome(scope, projectRoot) {
   if (scope === "project") {
@@ -872,6 +883,15 @@ var init_types = __esm({
         allowedCommands: z.array(z.string()).default([]),
         /** Allowed http/sse hosts (supports a leading `*.` wildcard). Empty = no restriction. */
         allowedHosts: z.array(z.string()).default([])
+      }).optional(),
+      // Optional (not .default) so existing TeamaiConfig literals stay valid; use
+      // getInterventionSharing() for the defaulted view.
+      intervention: z.object({
+        /** Extra course-correction keywords, merged with the built-in list
+         *  (CORRECTION_KEYWORDS). Teams add the words their members actually type,
+         *  e.g. Spanish "rehazlo" or "no era eso". Matched case-insensitively; a
+         *  keyword in a space-separated script must appear as a whole word. */
+        correctionKeywords: z.array(z.string()).default([])
       }).optional()
     });
     SourceConfigSchema = z.object({
@@ -948,6 +968,19 @@ var init_types = __esm({
           mcp: ".qoder/settings.json",
           mcpProject: ".qoder/settings.json"
         },
+        // Kiro: skills, steering (rules), and custom agents sync to .kiro/. Kiro CLI
+        // 2.x stores lifecycle hooks inside each .kiro/agents/*.json config. The
+        // Kiro agent renderer therefore embeds TeamAI's session-start dispatch as
+        // `hooks.agentSpawn`; there is no standalone `settings` hook surface.
+        // MCP uses the dedicated, mcpServers-only .kiro/settings/mcp.json:
+        // https://kiro.dev/docs/mcp/configuration/
+        kiro: {
+          skills: ".kiro/skills",
+          rules: ".kiro/steering",
+          agents: ".kiro/agents",
+          mcp: ".kiro/settings/mcp.json",
+          mcpProject: ".kiro/settings/mcp.json"
+        },
         // ZCode: user-level config lives at ~/.zcode/cli/config.json (a shared file
         // that also carries plugin state — reconcile must merge, never replace).
         // Hooks are Claude-shaped but nested under `hooks.events` and gated by
@@ -1009,6 +1042,8 @@ var init_types = __esm({
          *           Knowledge lives on main under <businessRepoRoot>/.teamai/;
          *           reports (members/sessions/votes/stats) live on the
          *           `teamai-reports` orphan branch. localPath = <businessRepoRoot>/.teamai.
+         * Independent git clones (`kind: 'git'` or omitted) use the same reports
+         * branch; the worktree sits beside the clone, not inside it.
          */
         kind: z.enum(["git", "http", "self"]).optional(),
         /** Base URL of the HTTP team repo (only when kind === 'http'). */
@@ -1212,9 +1247,174 @@ var init_types = __esm({
   }
 });
 
+// src/roles.ts
+var roles_exports = {};
+__export(roles_exports, {
+  activeRoleIds: () => activeRoleIds,
+  describeRoles: () => describeRoles,
+  findRole: () => findRole,
+  listRoleIds: () => listRoleIds,
+  loadRolesManifest: () => loadRolesManifest,
+  matchesRoles: () => matchesRoles,
+  resolveRoleResourceNamespaces: () => resolveRoleResourceNamespaces,
+  saveRolesManifest: () => saveRolesManifest,
+  warnUnknownRoleIds: () => warnUnknownRoleIds
+});
+import path4 from "path";
+import YAML from "yaml";
+import { z as z2 } from "zod";
+function validateManifestShape(raw) {
+  if (!raw || typeof raw !== "object") {
+    throw new Error("Invalid roles manifest: expected an object");
+  }
+  const candidate = raw;
+  const roles = candidate.roles;
+  if (!Array.isArray(roles) || roles.length === 0) {
+    throw new Error("Invalid roles manifest: roles must be a non-empty array");
+  }
+  for (const role of roles) {
+    if (!role || typeof role !== "object") {
+      throw new Error("Invalid roles manifest: every role must be an object");
+    }
+    const resources = role.resources;
+    if (!resources || typeof resources !== "object" || Array.isArray(resources)) {
+      throw new Error(`Invalid roles manifest: role ${role.id ?? "<unknown>"} is missing resources`);
+    }
+    const ALLOWED_RESOURCE_KEYS = /* @__PURE__ */ new Set([...ROLE_RESOURCE_TYPES, "learnings"]);
+    for (const key of Object.keys(resources)) {
+      if (!ALLOWED_RESOURCE_KEYS.has(key)) {
+        throw new Error(`Invalid roles manifest: unknown resource type "${key}"`);
+      }
+    }
+  }
+  const manifest = RolesManifestSchema.parse(raw);
+  const ids = /* @__PURE__ */ new Set();
+  for (const role of manifest.roles) {
+    if (ids.has(role.id)) {
+      throw new Error(`Invalid roles manifest: duplicate role id "${role.id}"`);
+    }
+    ids.add(role.id);
+  }
+  return manifest;
+}
+async function loadRolesManifest(repoPath) {
+  const manifestPath = path4.join(repoPath, "manifest", "roles.yaml");
+  const content = await readFileSafe(manifestPath);
+  if (!content) {
+    throw new Error(`Roles manifest not found: ${manifestPath}`);
+  }
+  let raw;
+  try {
+    raw = YAML.parse(content);
+  } catch (error) {
+    throw new Error(`Invalid roles manifest YAML: ${error.message}`);
+  }
+  return validateManifestShape(raw);
+}
+async function saveRolesManifest(repoPath, manifest) {
+  validateManifestShape(manifest);
+  const manifestDir = path4.join(repoPath, "manifest");
+  const manifestPath = path4.join(manifestDir, "roles.yaml");
+  await ensureDir(manifestDir);
+  await writeFile(manifestPath, YAML.stringify(manifest));
+}
+function findRole(manifest, roleId) {
+  return manifest.roles.find((candidate) => candidate.id === roleId);
+}
+function listRoleIds(manifest) {
+  return manifest.roles.map((role) => role.id);
+}
+function describeRoles(roles) {
+  return roles.map((role) => role.description ? `${role.id}: ${role.description}` : `${role.id}`);
+}
+function getRoleOrThrow(manifest, roleId) {
+  const role = manifest.roles.find((candidate) => candidate.id === roleId);
+  if (!role) {
+    throw new Error(`Unknown role "${roleId}". Valid roles: ${listRoleIds(manifest).join(", ")}`);
+  }
+  return role;
+}
+function resolveRoleResourceNamespaces(input) {
+  const resolvedRoles = [
+    getRoleOrThrow(input.manifest, input.primaryRole),
+    ...input.additionalRoles.map((roleId) => getRoleOrThrow(input.manifest, roleId))
+  ];
+  const namespaces = {
+    knowledge: [],
+    skills: [],
+    // Roles never contribute learnings namespaces; only projects do. Kept empty
+    // so the shape matches project resolution for a clean union at the call site.
+    learnings: []
+  };
+  for (const type of ROLE_RESOURCE_TYPES) {
+    const seen = /* @__PURE__ */ new Set();
+    for (const role of resolvedRoles) {
+      for (const namespace of role.resources[type]) {
+        if (seen.has(namespace)) continue;
+        seen.add(namespace);
+        namespaces[type].push(namespace);
+      }
+    }
+  }
+  return namespaces;
+}
+function activeRoleIds(localConfig) {
+  if (!localConfig.primaryRole) return null;
+  return [.../* @__PURE__ */ new Set([localConfig.primaryRole, ...localConfig.additionalRoles ?? []])];
+}
+function matchesRoles(entryRoles, active) {
+  if (!entryRoles || active == null) return true;
+  return entryRoles.some((role) => active.includes(role));
+}
+async function warnUnknownRoleIds(repoPath, file, entries) {
+  if (!entries.some((entry) => entry.roles && entry.roles.length > 0)) return;
+  let known;
+  try {
+    known = new Set(listRoleIds(await loadRolesManifest(repoPath)));
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    for (const role of entry.roles ?? []) {
+      if (known.has(role) || reportedUnknownRoles.has(`${file}:${role}`)) continue;
+      reportedUnknownRoles.add(`${file}:${role}`);
+      log.warn(`roles: unknown role id "${role}" in ${file} ${entry.kind} "${entry.name}". Valid roles: ${[...known].join(", ")}`);
+    }
+  }
+}
+var ROLE_RESOURCE_TYPES, RoleResourceNamespacesSchema, RoleSchema, RolesManifestSchema, reportedUnknownRoles;
+var init_roles = __esm({
+  "src/roles.ts"() {
+    "use strict";
+    init_fs();
+    init_logger();
+    ROLE_RESOURCE_TYPES = ["knowledge", "skills"];
+    RoleResourceNamespacesSchema = z2.object({
+      knowledge: z2.array(z2.string().min(1)),
+      skills: z2.array(z2.string().min(1)),
+      // learnings is accepted for backward compatibility but ignored at runtime.
+      // All learnings are shared flat across the entire team (no namespace isolation).
+      learnings: z2.array(z2.string()).optional()
+    });
+    RoleSchema = z2.object({
+      id: z2.string().min(1),
+      description: z2.string().default(""),
+      resources: RoleResourceNamespacesSchema
+    });
+    RolesManifestSchema = z2.object({
+      version: z2.number(),
+      roles: z2.array(RoleSchema).min(1),
+      // defaults.shareTarget was removed: learnings are flat, no namespace routing needed.
+      // Old manifests with a defaults block are still parseable (z.passthrough on object level).
+      defaults: z2.object({}).passthrough().optional()
+    });
+    reportedUnknownRoles = /* @__PURE__ */ new Set();
+  }
+});
+
 // src/bundled-runtime.ts
 import fs2 from "fs";
-import path4 from "path";
+import path5 from "path";
 function compareSemver(a, b) {
   const aParts = a.split(".").map((s) => parseInt(s, 10) || 0);
   const bParts = b.split(".").map((s) => parseInt(s, 10) || 0);
@@ -1230,18 +1430,18 @@ function pickLatestVersion(versions) {
   return versions.reduce((best, v) => compareSemver(v, best) > 0 ? v : best, versions[0]);
 }
 function latestVersionDir(relDir) {
-  const versionsDir = path4.join(getUserHome(), relDir);
+  const versionsDir = path5.join(getUserHome(), relDir);
   try {
     const versions = fs2.readdirSync(versionsDir).filter((d) => !d.startsWith("."));
     const latest = pickLatestVersion(versions);
-    return latest ? path4.join(versionsDir, latest) : null;
+    return latest ? path5.join(versionsDir, latest) : null;
   } catch {
     return null;
   }
 }
 function resolveWorkbuddyNode() {
   const dir = latestVersionDir(WORKBUDDY_BUNDLED_NODE_DIR);
-  const nodeBin = dir && path4.join(dir, "bin", "node");
+  const nodeBin = dir && path5.join(dir, "bin", "node");
   return nodeBin && fs2.existsSync(nodeBin) ? nodeBin : null;
 }
 function resolveCodebuddyNode() {
@@ -1251,10 +1451,10 @@ function resolveCodebuddyNode() {
     for (const entry of entries) {
       if (!entry.startsWith(".codebuddy-server")) continue;
       try {
-        const binDir = path4.join(home, entry, "bin");
+        const binDir = path5.join(home, entry, "bin");
         const stableDirs = fs2.readdirSync(binDir).filter((d) => d.startsWith("stable-"));
         for (const stable of stableDirs) {
-          const nodeBin = path4.join(binDir, stable, "node");
+          const nodeBin = path5.join(binDir, stable, "node");
           if (fs2.existsSync(nodeBin)) return nodeBin;
         }
       } catch {
@@ -1270,8 +1470,8 @@ function resolveWorkbuddyShell() {
     if (process.platform === "win32") {
       const dir = latestVersionDir(WORKBUDDY_PORTABLE_GIT_DIR);
       if (dir) {
-        for (const rel of ["bin", path4.join("usr", "bin")]) {
-          const shBin = path4.join(dir, rel, "sh.exe");
+        for (const rel of ["bin", path5.join("usr", "bin")]) {
+          const shBin = path5.join(dir, rel, "sh.exe");
           if (fs2.existsSync(shBin)) {
             _wbShellCache = shBin;
             break;
@@ -1301,7 +1501,7 @@ var init_bundled_runtime = __esm({
 
 // src/builtin-hooks.ts
 import fs3 from "fs";
-import path5 from "path";
+import path6 from "path";
 import { fileURLToPath } from "url";
 function hasShell() {
   if (_hasShellCache === void 0) {
@@ -1316,8 +1516,8 @@ function hasShell() {
 function resolveTeamaiEntryScript() {
   try {
     const thisFile = fileURLToPath(import.meta.url);
-    const distDir = path5.dirname(thisFile);
-    const candidate = path5.join(distDir, "index.js");
+    const distDir = path6.dirname(thisFile);
+    const candidate = path6.join(distDir, "index.js");
     if (fs3.existsSync(candidate)) return candidate;
   } catch {
   }
@@ -1328,8 +1528,8 @@ function ensureTeamaiWrapper() {
   if (!entryScript) return null;
   const nodeBin = resolveWorkbuddyNode() ?? resolveCodebuddyNode() ?? process.argv[0];
   const home = getUserHome();
-  const binDir = path5.join(home, TEAMAI_BIN_DIR);
-  const wrapperPath = path5.join(binDir, WRAPPER_NAME);
+  const binDir = path6.join(home, TEAMAI_BIN_DIR);
+  const wrapperPath = path6.join(binDir, WRAPPER_NAME);
   const script = [
     "#!/bin/sh",
     `# Auto-generated by teamai \u2014 do not edit.`,
@@ -1383,7 +1583,7 @@ function getWrapperDispatchCommand(event, tool, matcher) {
   return `PATH="$HOME/${TEAMAI_BIN_DIR}:$PATH" teamai hook-dispatch ${event} --tool ${tool}${matcherArg} 2>/dev/null || true`;
 }
 function builtinHookDefs(tool) {
-  const withTimeout3 = tool === "cursor" || tool === "workbuddy" || tool === "codebuddy" || tool === "zcode";
+  const withTimeout3 = tool === "cursor" || tool === "workbuddy" || tool === "codebuddy";
   const buildCommand = tool === "zcode" ? getRawDispatchCommand : WRAPPER_TOOLS.has(tool) ? getWrapperDispatchCommand : getDispatchCommand;
   return BUILTIN_HOOK_SPECS.map((spec) => ({
     source: "builtin",
@@ -1427,7 +1627,7 @@ var init_builtin_hooks = __esm({
 });
 
 // src/resources/base.ts
-import path6 from "path";
+import path7 from "path";
 function toolInstallRoot(toolPath) {
   const segments = toolPath.split("/");
   if (segments[0] === ".config" && segments.length > 1) {
@@ -1451,7 +1651,7 @@ var init_base = __esm({
        */
       static async isToolInstalled(toolPath, baseDir) {
         const base = baseDir ?? getUserHome();
-        const toolRoot = path6.join(base, toolInstallRoot(toolPath));
+        const toolRoot = path7.join(base, toolInstallRoot(toolPath));
         return pathExists(toolRoot);
       }
       /**
@@ -1459,7 +1659,7 @@ var init_base = __esm({
        * Returns a Set of resource names that have been explicitly deleted.
        */
       async readTombstones(localConfig) {
-        const tombstonePath = path6.join(localConfig.repo.localPath, this.type, TOMBSTONE_FILE);
+        const tombstonePath = path7.join(localConfig.repo.localPath, this.type, TOMBSTONE_FILE);
         const content = await readFileSafe(tombstonePath);
         if (!content) return /* @__PURE__ */ new Set();
         return new Set(
@@ -1470,9 +1670,9 @@ var init_base = __esm({
        * Append a resource name to the tombstone file, deduplicating and sorting.
        */
       async addTombstone(name, localConfig) {
-        const dir = path6.join(localConfig.repo.localPath, this.type);
+        const dir = path7.join(localConfig.repo.localPath, this.type);
         await ensureDir(dir);
-        const tombstonePath = path6.join(dir, TOMBSTONE_FILE);
+        const tombstonePath = path7.join(dir, TOMBSTONE_FILE);
         const existing = await this.readTombstones(localConfig);
         existing.add(name);
         const sorted = [...existing].sort();
@@ -1495,17 +1695,17 @@ var init_base = __esm({
 });
 
 // src/resources/hooks.ts
-import path7 from "path";
-import { z as z2 } from "zod";
-import YAML from "yaml";
+import path8 from "path";
+import { z as z3 } from "zod";
+import YAML2 from "yaml";
 function teamHooksYamlPath(repoPath) {
-  return path7.join(repoPath, "hooks", "hooks.yaml");
+  return path8.join(repoPath, "hooks", "hooks.yaml");
 }
 async function parseHooksYaml(repoPath) {
   const content = await readFileSafe(teamHooksYamlPath(repoPath));
   if (!content) return null;
   try {
-    return HooksYamlSchema.parse(YAML.parse(content));
+    return HooksYamlSchema.parse(YAML2.parse(content));
   } catch (e) {
     log.warn(`Invalid hooks.yaml format: ${e.message} \u2014 skipping team hooks this run`);
     return null;
@@ -1520,7 +1720,8 @@ function teamHookToDef(h) {
     command: h.command,
     timeout: h.timeout,
     description: `${TEAMAI_CUSTOM_HOOK_PREFIX}${h.id}] ${h.description}`,
-    tools: h.tools
+    tools: h.tools,
+    roles: h.roles
   };
 }
 async function parseTeamHooks(repoPath) {
@@ -1544,6 +1745,8 @@ async function resolveTeamHooks(teamConfig, repoPath, opts = {}) {
     if (defs.length > 0) log.warn(`Team hooks disabled (TEAMAI_HOOKS_DISABLED) \u2014 skipping ${defs.length} team hook(s)`);
     return { defs: [], builtin };
   }
+  await warnUnknownRoleIds(repoPath, "hooks.yaml", defs.map((d) => ({ kind: "hook", name: d.key, roles: d.roles })));
+  defs = defs.filter((d) => matchesRoles(d.roles, opts.activeRoles));
   if (sharing.requireTeamScripts) {
     const before = defs.length;
     defs = defs.filter((d) => isTeamScriptCommand(d.command));
@@ -1570,28 +1773,31 @@ var init_hooks = __esm({
     init_types();
     init_fs();
     init_logger();
-    TeamHookSchema = z2.object({
+    init_roles();
+    TeamHookSchema = z3.object({
       /** Unique id (marker + manifest index). */
-      id: z2.string().regex(/^[a-z0-9-]+$/),
+      id: z3.string().regex(/^[a-z0-9-]+$/),
       /** Written into the hook description. */
-      description: z2.string(),
+      description: z3.string(),
       /** Claude PascalCase event name. */
-      event: z2.string().min(1),
+      event: z3.string().min(1),
       /** Optional tool matcher (e.g. "Bash"). */
-      matcher: z2.string().optional(),
+      matcher: z3.string().optional(),
       /** Shell command to run. */
-      command: z2.string().min(1),
+      command: z3.string().min(1),
       /** Optional per-hook timeout in seconds. */
-      timeout: z2.number().optional(),
+      timeout: z3.number().optional(),
       /** Optional restriction to specific tools (default = all hook-capable tools). */
-      tools: z2.array(z2.string()).optional()
+      tools: z3.array(z3.string()).optional(),
+      /** Optional restriction to members holding one of these role ids (default = every member). */
+      roles: z3.array(z3.string()).optional()
     });
-    BuiltinOverrideSchema = z2.object({
-      disabled: z2.array(z2.string()).default([]),
-      overrides: z2.record(z2.string(), z2.object({ timeout: z2.number().optional() })).default({})
+    BuiltinOverrideSchema = z3.object({
+      disabled: z3.array(z3.string()).default([]),
+      overrides: z3.record(z3.string(), z3.object({ timeout: z3.number().optional() })).default({})
     }).default({ disabled: [], overrides: {} });
-    HooksYamlSchema = z2.object({
-      hooks: z2.array(TeamHookSchema).default([]),
+    HooksYamlSchema = z3.object({
+      hooks: z3.array(TeamHookSchema).default([]),
       builtin: BuiltinOverrideSchema
     });
     HooksHandler = class extends ResourceHandler {
@@ -1635,10 +1841,10 @@ __export(opencode_hooks_exports, {
   removeOpencodeHooks: () => removeOpencodeHooks,
   resolveOpencodePluginDir: () => resolveOpencodePluginDir
 });
-import path8 from "path";
+import path9 from "path";
 function resolveOpencodePluginDir(baseDir, scope) {
-  const configDir = scope === "project" ? ".opencode" : path8.join(".config", "opencode");
-  return path8.join(baseDir, configDir, OPENCODE_PLUGIN_DIR);
+  const configDir = scope === "project" ? ".opencode" : path9.join(".config", "opencode");
+  return path9.join(baseDir, configDir, OPENCODE_PLUGIN_DIR);
 }
 function buildPluginSource() {
   return `// ${TEAMAI_MARKER} hooks plugin \u2014 generated by teamai, do not edit by hand.
@@ -1720,20 +1926,20 @@ export const TeamaiHooks = async ({ $, directory, worktree }) => {
 async function injectOpencodeHooks(baseDir, scope) {
   const dir = resolveOpencodePluginDir(baseDir, scope);
   await ensureDir(dir);
-  const file = path8.join(dir, OPENCODE_HOOK_FILE);
+  const file = path9.join(dir, OPENCODE_HOOK_FILE);
   await writeFile(file, buildPluginSource());
   log.success(`Injected teamai OpenCode hook into ${file}`);
 }
 async function removeOpencodeHooks(baseDir, scope) {
   const dir = resolveOpencodePluginDir(baseDir, scope);
-  const file = path8.join(dir, OPENCODE_HOOK_FILE);
+  const file = path9.join(dir, OPENCODE_HOOK_FILE);
   if (await pathExists(file)) {
     await remove(file);
     log.success(`Removed teamai OpenCode hook from ${file}`);
   }
 }
 function assertSafeSlug(slug) {
-  if (!slug || slug.includes("/") || slug.includes("\\") || slug.includes("..") || path8.isAbsolute(slug)) {
+  if (!slug || slug.includes("/") || slug.includes("\\") || slug.includes("..") || path9.isAbsolute(slug)) {
     throw new Error(`Invalid agent-hook slug: ${slug}`);
   }
 }
@@ -1785,14 +1991,14 @@ async function applyOpencodeAgentHook(def) {
   }
   const dir = resolveOpencodePluginDir(def.baseDir, def.scope);
   await ensureDir(dir);
-  const file = path8.join(dir, `teamai-agent-${def.slug}.ts`);
+  const file = path9.join(dir, `teamai-agent-${def.slug}.ts`);
   await writeFile(file, buildAgentHookPluginSource(def.slug, ocEvent, def.command, def.matcher));
   log.success(`Installed OpenCode agent hook [${def.slug}] in ${file}`);
 }
 async function removeOpencodeAgentHook(opts) {
   assertSafeSlug(opts.slug);
   const dir = resolveOpencodePluginDir(opts.baseDir, opts.scope);
-  const file = path8.join(dir, `teamai-agent-${opts.slug}.ts`);
+  const file = path9.join(dir, `teamai-agent-${opts.slug}.ts`);
   if (await pathExists(file)) {
     await remove(file);
     log.success(`Removed OpenCode agent hook [${opts.slug}] from ${file}`);
@@ -1828,13 +2034,13 @@ __export(openclaw_hooks_exports, {
   resolveOpenClawHooksDir: () => resolveOpenClawHooksDir,
   resolveOpenclawWorkspaceDir: () => resolveOpenclawWorkspaceDir
 });
-import path9 from "path";
+import path10 from "path";
 function resolveOpenClawHooksDir(tool) {
   if (tool === "openclaw" && process.env.OPENCLAW_STATE_DIR) {
-    return path9.join(process.env.OPENCLAW_STATE_DIR, "hooks");
+    return path10.join(process.env.OPENCLAW_STATE_DIR, "hooks");
   }
   const home = getUserHome();
-  return path9.join(home, `.${tool}`, "hooks");
+  return path10.join(home, `.${tool}`, "hooks");
 }
 function buildHookMd(tool) {
   const events = Object.keys(EVENT_MAP);
@@ -1880,21 +2086,21 @@ async function injectOpenClawHooks(workspacePath, tool = "openclaw") {
     log.debug(`openclaw: skip hook injection for ${tool} \u2014 workspace dir not found`);
     return;
   }
-  const dir = path9.join(wsDir, "hooks", OPENCLAW_HOOK_DIR);
+  const dir = path10.join(wsDir, "hooks", OPENCLAW_HOOK_DIR);
   await ensureDir(dir);
-  await writeFile(path9.join(dir, "HOOK.md"), buildHookMd(tool));
-  await writeFile(path9.join(dir, "handler.ts"), buildHandlerTs(tool));
+  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}`);
   await enableOpenClawInternalHooks(tool);
 }
 async function enableOpenClawInternalHooks(tool = "openclaw") {
   if (tool !== "openclaw") return;
   const stateDir = process.env.OPENCLAW_STATE_DIR;
-  if (!stateDir || !path9.isAbsolute(stateDir)) {
+  if (!stateDir || !path10.isAbsolute(stateDir)) {
     log.debug("openclaw: skip enabling internal hooks \u2014 OPENCLAW_STATE_DIR unset or not absolute");
     return;
   }
-  const cfgPath = path9.join(stateDir, "openclaw.json");
+  const cfgPath = path10.join(stateDir, "openclaw.json");
   try {
     const cfg = await readJson(cfgPath) ?? {};
     const hooksVal = cfg.hooks;
@@ -1915,13 +2121,13 @@ async function enableOpenClawInternalHooks(tool = "openclaw") {
   }
 }
 async function removeOpenClawHooks(hooksDir) {
-  const dir = path9.join(hooksDir, OPENCLAW_HOOK_DIR);
+  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 = path9.join(process.env.OPENCLAW_STATE_DIR, "hooks", OPENCLAW_HOOK_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}`);
@@ -1970,16 +2176,16 @@ async function applyOpenClawAgentHook(def) {
   }
   const tool = def.tool ?? "openclaw";
   const hooksDir = resolveOpenClawHooksDir(tool);
-  const dir = path9.join(hooksDir, def.slug);
+  const dir = path10.join(hooksDir, def.slug);
   await ensureDir(dir);
-  await writeFile(path9.join(dir, "HOOK.md"), buildAgentHookMd(def.slug, openclawEvent));
-  await writeFile(path9.join(dir, "handler.ts"), buildAgentHandlerTs(def.command, def.timeout ?? 10));
+  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 = path9.join(hooksDir, opts.slug);
+  const dir = path10.join(hooksDir, opts.slug);
   if (await pathExists(dir)) {
     await remove(dir);
     log.success(`Removed OpenClaw agent hook [${opts.slug}] from ${dir}`);
@@ -1989,8 +2195,8 @@ async function resolveOpenclawWorkspaceDir(workspacePath) {
   const candidates = [];
   if (workspacePath) candidates.push(workspacePath);
   const stateDir = process.env.OPENCLAW_STATE_DIR;
-  if (stateDir && path9.isAbsolute(stateDir)) {
-    const cfgRaw = await readFileSafe(path9.join(stateDir, "openclaw.json"));
+  if (stateDir && path10.isAbsolute(stateDir)) {
+    const cfgRaw = await readFileSafe(path10.join(stateDir, "openclaw.json"));
     if (cfgRaw) {
       try {
         const cfg = JSON.parse(cfgRaw);
@@ -2001,7 +2207,7 @@ async function resolveOpenclawWorkspaceDir(workspacePath) {
       }
     }
   }
-  candidates.push(path9.join(getUserHome(), ".openclaw", "workspace"));
+  candidates.push(path10.join(getUserHome(), ".openclaw", "workspace"));
   for (const candidate of candidates) {
     if (await pathExists(candidate)) {
       log.debug(`openclaw: resolved workspace dir to ${candidate}`);
@@ -2036,14 +2242,14 @@ var hermes_home_exports = {};
 __export(hermes_home_exports, {
   getHermesHome: () => getHermesHome
 });
-import path10 from "path";
+import path11 from "path";
 import { homedir } from "os";
 function getHermesHome() {
   const fromEnv = process.env.HERMES_HOME;
   if (fromEnv && fromEnv.trim() !== "") {
-    return path10.resolve(fromEnv);
+    return path11.resolve(fromEnv);
   }
-  return path10.join(homedir(), ".hermes");
+  return path11.join(homedir(), ".hermes");
 }
 var init_hermes_home = __esm({
   "src/hermes-home.ts"() {
@@ -2064,20 +2270,20 @@ __export(hermes_config_exports, {
   upsertHermesHook: () => upsertHermesHook,
   upsertSoulRules: () => upsertSoulRules
 });
-import YAML2 from "yaml";
-import path11 from "path";
+import YAML3 from "yaml";
+import path12 from "path";
 function getHermesConfigPath() {
-  return path11.join(getHermesHome(), "config.yaml");
+  return path12.join(getHermesHome(), "config.yaml");
 }
 function getHermesSoulPath() {
-  return path11.join(getHermesHome(), "SOUL.md");
+  return path12.join(getHermesHome(), "SOUL.md");
 }
 async function readConfigDoc() {
   const content = await readFileSafe(getHermesConfigPath());
-  if (!content || content.trim() === "") return new YAML2.Document({});
-  const doc = YAML2.parseDocument(content);
-  if (!doc.contents || !YAML2.isMap(doc.contents)) {
-    return new YAML2.Document({});
+  if (!content || content.trim() === "") return new YAML3.Document({});
+  const doc = YAML3.parseDocument(content);
+  if (!doc.contents || !YAML3.isMap(doc.contents)) {
+    return new YAML3.Document({});
   }
   return doc;
 }
@@ -2150,12 +2356,12 @@ async function removeSoulRules() {
   await upsertSoulRules("");
 }
 function getHermesAllowlistPath() {
-  return path11.join(getHermesHome(), "shell-hooks-allowlist.json");
+  return path12.join(getHermesHome(), "shell-hooks-allowlist.json");
 }
 async function upsertHermesHook(event, entry) {
   const doc = await readConfigDoc();
   const rawSeq = doc.getIn(["hooks", event]);
-  const currentJs = YAML2.isSeq(rawSeq) ? rawSeq.toJSON() : rawSeq;
+  const currentJs = YAML3.isSeq(rawSeq) ? rawSeq.toJSON() : rawSeq;
   const arr = Array.isArray(currentJs) ? currentJs : [];
   const untouched = arr.filter((e) => e && typeof e === "object" && e.command !== entry.command);
   const cleanEntry = { command: entry.command };
@@ -2169,7 +2375,7 @@ async function upsertHermesHook(event, entry) {
 async function removeHermesHookByCommand(command) {
   const doc = await readConfigDoc();
   const rawHooks = doc.getIn(["hooks"]);
-  const hooks = YAML2.isMap(rawHooks) ? rawHooks.toJSON() : null;
+  const hooks = YAML3.isMap(rawHooks) ? rawHooks.toJSON() : null;
   if (!hooks || typeof hooks !== "object") return;
   let changed = false;
   for (const event of Object.keys(hooks)) {
@@ -2186,7 +2392,7 @@ async function removeHermesHookByCommand(command) {
   }
   if (!changed) return;
   const remainingRaw = doc.getIn(["hooks"]);
-  const remaining = YAML2.isMap(remainingRaw) ? remainingRaw.toJSON() : null;
+  const remaining = YAML3.isMap(remainingRaw) ? remainingRaw.toJSON() : null;
   if (!remaining || Object.keys(remaining).length === 0) {
     doc.deleteIn(["hooks"]);
   }
@@ -2231,10 +2437,10 @@ __export(hermes_hooks_exports, {
   removeHermesAgentHook: () => removeHermesAgentHook,
   removeHermesHooks: () => removeHermesHooks
 });
-import path12 from "path";
+import path13 from "path";
 import { chmod } from "fs/promises";
 function getReportScriptPath() {
-  return path12.join(getHermesHome(), "hooks", "teamai-status-report.sh");
+  return path13.join(getHermesHome(), "hooks", "teamai-status-report.sh");
 }
 function buildReportScript() {
   return [
@@ -2246,7 +2452,7 @@ function buildReportScript() {
 }
 async function injectHermesHooks() {
   const scriptPath = getReportScriptPath();
-  await ensureDir(path12.dirname(scriptPath));
+  await ensureDir(path13.dirname(scriptPath));
   await writeFile(scriptPath, buildReportScript());
   try {
     await chmod(scriptPath, 493);
@@ -2321,7 +2527,7 @@ __export(hooks_exports, {
   removeHooks: () => removeHooks,
   sweepLegacyProjectHooks: () => sweepLegacyProjectHooks
 });
-import path13 from "path";
+import path14 from "path";
 import { realpathSync } from "fs";
 function detectFormat(tool) {
   if (CODEX_TOOLS.has(tool)) return "codex";
@@ -2354,7 +2560,7 @@ function canonicalProjectRoot(projectRoot) {
   try {
     return realpathSync.native(projectRoot);
   } catch {
-    return path13.resolve(projectRoot);
+    return path14.resolve(projectRoot);
   }
 }
 function gateTeamHookCommand(command, projectRoot) {
@@ -2414,16 +2620,30 @@ function toCodexEntry(def) {
   return entry;
 }
 function toZcodeEntry(def) {
-  const entry = {
+  const ZCODE_TIMEOUT_MS = {
+    SessionStart: 18e4,
+    Stop: 6e4,
+    PostToolUse: 3e4,
+    UserPromptSubmit: 6e4
+  };
+  const entry = process.platform === "win32" ? {
+    // Windows must NOT spawn bare `bash`: CreateProcess resolves it to
+    // System32's WSL launcher before any PATH directory, and the WSL side
+    // has a different $HOME (no ~/.teamai state) and often no Node ≥ 20.
+    // cmd.exe is always present in System32 and resolves teamai from the
+    // Windows PATH (the npm shim is a .cmd, so a shell is required).
+    type: "process",
+    command: "cmd",
+    args: ["/c", def.command],
+    timeoutMs: ZCODE_TIMEOUT_MS[def.event] ?? 6e4
+  } : {
     type: "process",
     command: "bash",
-    // Stored verbatim: the shell payload must equal `def.command` exactly so
-    // managed-entry detection and the managed-hooks manifest share one command
-    // representation (the same invariant the Codex format keeps). teamai
-    // hook-dispatch is silent and failure-tolerant on its success paths, so no
-    // shell redirection is layered on top of the payload.
+    // Stored verbatim: the shell payload must equal `def.command` exactly
+    // so managed-entry detection and the managed-hooks manifest share one
+    // command representation (the same invariant the Codex format keeps).
     args: ["-lc", def.command],
-    ...def.timeout !== void 0 ? { timeoutMs: def.timeout * 1e3 } : {}
+    timeoutMs: ZCODE_TIMEOUT_MS[def.event] ?? 6e4
   };
   const group = { hooks: [entry] };
   if (def.matcher && def.matcher !== "*") group.matcher = def.matcher;
@@ -2431,7 +2651,7 @@ function toZcodeEntry(def) {
 }
 function zcodeEntryCommand(entry) {
   const hook = entry.hooks?.[0];
-  if (hook?.command === "bash" && hook.args?.[0] === "-lc") return hook.args[1] ?? "";
+  if (Array.isArray(hook?.args) && hook.args.length > 1) return hook.args[1] ?? "";
   return hook?.command ?? "";
 }
 function desiredEventOrder(defs, mapEvent) {
@@ -2465,7 +2685,7 @@ async function reconcileClaudeFormat(settingsPath, tool, teamDefs, opts, teamAct
     return true;
   };
   const expanded = expandHome(settingsPath);
-  await ensureDir(path13.dirname(expanded));
+  await ensureDir(path14.dirname(expanded));
   const settings = await readJson(expanded) ?? {};
   if (!settings.hooks) settings.hooks = {};
   let changed = false;
@@ -2497,7 +2717,7 @@ async function reconcileClaudeFormat(settingsPath, tool, teamDefs, opts, teamAct
 }
 async function reconcileCursorFormat(hooksPath, tool, teamDefs, opts, priorTeamCommands) {
   const expanded = expandHome(hooksPath);
-  await ensureDir(path13.dirname(expanded));
+  await ensureDir(path14.dirname(expanded));
   const hooksJson = await readJson(expanded) ?? { version: 1, hooks: {} };
   if (!hooksJson.version) hooksJson.version = 1;
   if (!hooksJson.hooks) hooksJson.hooks = {};
@@ -2545,7 +2765,7 @@ async function reconcileCursorFormat(hooksPath, tool, teamDefs, opts, priorTeamC
 }
 async function reconcileCodexFormat(hooksPath, tool, teamDefs, opts, priorTeamCommands) {
   const expanded = expandHome(hooksPath);
-  await ensureDir(path13.dirname(expanded));
+  await ensureDir(path14.dirname(expanded));
   const hooksJson = await readJson(expanded) ?? {};
   if (!hooksJson.hooks) hooksJson.hooks = {};
   const isManaged = (entry) => {
@@ -2575,10 +2795,15 @@ async function reconcileCodexFormat(hooksPath, tool, teamDefs, opts, priorTeamCo
 }
 async function reconcileZcodeFormat(settingsPath, tool, teamDefs, opts, priorTeamCommands) {
   const expanded = expandHome(settingsPath);
-  await ensureDir(path13.dirname(expanded));
+  await ensureDir(path14.dirname(expanded));
   const cfg = await readJson(expanded) ?? {};
   if (!cfg.hooks) cfg.hooks = {};
   let changed = false;
+  const unknownHookKeys = Object.keys(cfg.hooks).filter((k) => k !== "enabled" && k !== "events");
+  if (unknownHookKeys.length > 0) {
+    for (const k of unknownHookKeys) delete cfg.hooks[k];
+    changed = true;
+  }
   if (!opts.removeAll && cfg.hooks.enabled !== true) {
     cfg.hooks.enabled = true;
     changed = true;
@@ -2628,7 +2853,7 @@ function isAgentClaudeEntry(entry, slug) {
 async function applyAgentHook(settingsPath, tool, def) {
   const format = detectFormat(tool);
   const expanded = expandHome(settingsPath);
-  await ensureDir(path13.dirname(expanded));
+  await ensureDir(path14.dirname(expanded));
   const hookDef = {
     source: "team",
     key: def.slug,
@@ -2854,15 +3079,15 @@ async function hasTeamaiHooks(settingsPath, tool, manifestPath) {
 async function reconcileOpencodePlugin(baseDir, removeAll = false, installedBaseDir) {
   const home = getUserHome();
   const { injectOpencodeHooks: injectOpencodeHooks2, removeOpencodeHooks: removeOpencodeHooks2 } = await Promise.resolve().then(() => (init_opencode_hooks(), opencode_hooks_exports));
-  if (path13.resolve(baseDir) !== path13.resolve(home)) {
+  if (path14.resolve(baseDir) !== path14.resolve(home)) {
     await removeOpencodeHooks2(baseDir, "project");
   }
   if (removeAll) {
     await removeOpencodeHooks2(home, "user");
     return;
   }
-  const homeInstalled = await pathExists(path13.join(home, ".config", "opencode"));
-  const projectInstalled = installedBaseDir ? await pathExists(path13.join(installedBaseDir, ".opencode")) : false;
+  const homeInstalled = await pathExists(path14.join(home, ".config", "opencode"));
+  const projectInstalled = installedBaseDir ? await pathExists(path14.join(installedBaseDir, ".opencode")) : false;
   if (homeInstalled || projectInstalled) {
     await injectOpencodeHooks2(home, "user");
   }
@@ -2876,9 +3101,9 @@ async function injectHooksToAllTools(toolPaths, baseDir, filterAgents2) {
     if (filterAgents2 && !filterAgents2.includes(tool)) continue;
     if (skipped.has(tool)) continue;
     if (paths.settings) {
-      const toolRoot = path13.join(resolvedBaseDir, paths.settings.split("/")[0]);
+      const toolRoot = path14.join(resolvedBaseDir, paths.settings.split("/")[0]);
       if (!await pathExists(toolRoot)) continue;
-      const settingsPath = path13.join(resolvedBaseDir, paths.settings);
+      const settingsPath = path14.join(resolvedBaseDir, paths.settings);
       try {
         await injectHooks(settingsPath, tool);
       } catch (e) {
@@ -2941,10 +3166,10 @@ async function reconcileHooksToAllTools(toolPaths, baseDir, teamDefs, manifestPa
       continue;
     }
     if (!paths.settings) continue;
-    const toolRoot = path13.join(baseDir, paths.settings.split("/")[0]);
-    const installedRoot = opts.installedBaseDir ? path13.join(opts.installedBaseDir, paths.settings.split("/")[0]) : toolRoot;
+    const toolRoot = path14.join(baseDir, paths.settings.split("/")[0]);
+    const installedRoot = opts.installedBaseDir ? path14.join(opts.installedBaseDir, paths.settings.split("/")[0]) : toolRoot;
     if (!await pathExists(toolRoot) && !await pathExists(installedRoot)) continue;
-    const settingsPath = path13.join(baseDir, paths.settings);
+    const settingsPath = path14.join(baseDir, paths.settings);
     try {
       await reconcileHooks(settingsPath, tool, teamDefs, {
         manifestPath,
@@ -2960,7 +3185,7 @@ async function reconcileHooksToAllTools(toolPaths, baseDir, teamDefs, manifestPa
 async function hasInstalledCodexTrustGatedTool(toolPaths, baseDir) {
   for (const [tool, paths] of Object.entries(toolPaths)) {
     if (!isCodexTrustGatedTool(tool) || !paths.settings) continue;
-    const toolRoot = path13.join(baseDir, paths.settings.split("/")[0]);
+    const toolRoot = path14.join(baseDir, paths.settings.split("/")[0]);
     if (await pathExists(toolRoot)) return true;
   }
   return false;
@@ -2982,7 +3207,11 @@ async function sweepLegacyProjectHooks(toolPaths, localConfig) {
   }
 }
 async function reconcileTeamHooksForConfig(teamConfig, localConfig, opts = {}) {
-  const { defs: teamDefs, builtin } = opts.removeAll ? { defs: [], builtin: void 0 } : await resolveTeamHooks(teamConfig, localConfig.repo.localPath, { auto: opts.auto, silent: opts.silent });
+  const { defs: teamDefs, builtin } = opts.removeAll ? { defs: [], builtin: void 0 } : await resolveTeamHooks(teamConfig, localConfig.repo.localPath, {
+    auto: opts.auto,
+    silent: opts.silent,
+    activeRoles: activeRoleIds(localConfig)
+  });
   const { baseDir, manifestPath } = resolveHookScope(localConfig);
   let filterAgents2 = opts.filterAgents ?? localConfig.enabledAgents;
   const disabled = localConfig.disabledAgents;
@@ -3008,6 +3237,7 @@ var init_hooks2 = __esm({
     init_logger();
     init_types();
     init_types();
+    init_roles();
     init_builtin_hooks();
     init_hooks();
     init_home();
@@ -3248,7 +3478,7 @@ __export(builtin_rules_exports, {
   LEGACY_RULE_NAMES: () => LEGACY_RULE_NAMES,
   deployBuiltinRules: () => deployBuiltinRules
 });
-import path14 from "path";
+import path15 from "path";
 import fs4 from "fs/promises";
 async function deployBuiltinRules(teamConfig, localConfig, options) {
   const baseDir = localConfig ? resolveBaseDir(localConfig) : getUserHome();
@@ -3263,19 +3493,19 @@ async function deployBuiltinRules(teamConfig, localConfig, options) {
       continue;
     }
     if (localConfig && isAgentExcluded(localConfig, tool)) continue;
-    const rulesDir = path14.join(baseDir, toolPath.rules);
+    const rulesDir = path15.join(baseDir, toolPath.rules);
     if (!await pathExists(rulesDir)) continue;
     try {
       await ensureDir(rulesDir);
       const ext = ruleFileExtensionForTool(tool);
       for (const rule of builtinRules) {
-        const destFile = path14.join(rulesDir, `${rule.name}${ext}`);
+        const destFile = path15.join(rulesDir, `${rule.name}${ext}`);
         const content = usesCursorMdcRules(tool) ? teamRuleToCursorMdc(rule.content) : rule.content;
         await writeFile(destFile, content);
         log.debug(`Deployed built-in rule ${rule.name} \u2192 ${tool}`);
         if (ext !== ".md") {
           try {
-            await fs4.unlink(path14.join(rulesDir, `${rule.name}.md`));
+            await fs4.unlink(path15.join(rulesDir, `${rule.name}.md`));
             log.debug(`Removed legacy .md built-in rule ${rule.name} from ${tool}`);
           } catch {
           }
@@ -3283,7 +3513,7 @@ async function deployBuiltinRules(teamConfig, localConfig, options) {
       }
       for (const legacyName of LEGACY_RULE_NAMES) {
         for (const legacyExt of /* @__PURE__ */ new Set([ext, ".md"])) {
-          const legacyFile = path14.join(rulesDir, `${legacyName}${legacyExt}`);
+          const legacyFile = path15.join(rulesDir, `${legacyName}${legacyExt}`);
           try {
             await fs4.unlink(legacyFile);
             log.debug(`Removed legacy built-in rule ${legacyName} from ${tool}`);
@@ -3370,7 +3600,7 @@ teamai-recall subagent \u7684\u8FD4\u56DE\u91CC\u5DF2\u5217\u51FA\u672C\u6B21\u6
 });
 
 // src/utils/pre-push-sync.ts
-import path15 from "path";
+import path16 from "path";
 async function syncTeamUpdatesToLocal(teamConfig, localConfig, lastPullRev) {
   if (!lastPullRev) {
     log.debug("No lastPullRev \u2014 skipping pre-push sync");
@@ -3382,12 +3612,12 @@ async function syncTeamUpdatesToLocal(teamConfig, localConfig, lastPullRev) {
   await syncSkillsToLocal(teamConfig, localConfig, repoPath, baseDir, lastPullRev);
 }
 async function syncRulesToLocal(teamConfig, localConfig, repoPath, baseDir, lastPullRev) {
-  const teamRulesDir = path15.join(repoPath, "rules");
+  const teamRulesDir = path16.join(repoPath, "rules");
   if (!await pathExists(teamRulesDir)) return;
   for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
     if (!toolPath.rules) continue;
     if (!await ResourceHandler.isToolInstalled(toolPath.rules, baseDir)) continue;
-    const rulesDir = path15.join(baseDir, toolPath.rules);
+    const rulesDir = path16.join(baseDir, toolPath.rules);
     if (!await pathExists(rulesDir)) continue;
     const ext = ruleFileExtensionForTool(tool);
     const isMdcTool = usesCursorMdcRules(tool);
@@ -3396,9 +3626,9 @@ async function syncRulesToLocal(teamConfig, localConfig, repoPath, baseDir, last
       if (!file.endsWith(ext)) continue;
       const name = file.slice(0, -ext.length);
       if (EXCLUDED_RULE_NAMES.has(name)) continue;
-      const localFilePath = path15.join(rulesDir, file);
+      const localFilePath = path16.join(rulesDir, file);
       const teamRelPath = `rules/${name}.md`;
-      const teamFilePath = path15.join(teamRulesDir, `${name}.md`);
+      const teamFilePath = path16.join(teamRulesDir, `${name}.md`);
       if (!await pathExists(teamFilePath)) continue;
       if (isMdcTool) {
         const localRaw = await readFileSafe(localFilePath);
@@ -3424,19 +3654,19 @@ async function syncRulesToLocal(teamConfig, localConfig, repoPath, baseDir, last
   }
 }
 async function syncSkillsToLocal(teamConfig, localConfig, repoPath, baseDir, lastPullRev) {
-  const teamSkillsDir = path15.join(repoPath, "skills");
+  const teamSkillsDir = path16.join(repoPath, "skills");
   if (!await pathExists(teamSkillsDir)) return;
   const teamSkillPaths = /* @__PURE__ */ new Map();
   const topDirs = await listDirs(teamSkillsDir);
   for (const dir of topDirs) {
-    const dirPath = path15.join(teamSkillsDir, dir);
-    if (await pathExists(path15.join(dirPath, "SKILL.md"))) {
+    const dirPath = path16.join(teamSkillsDir, dir);
+    if (await pathExists(path16.join(dirPath, "SKILL.md"))) {
       teamSkillPaths.set(dir, dirPath);
     } else {
       const subDirs = await listDirs(dirPath);
       for (const subDir of subDirs) {
         if (!teamSkillPaths.has(subDir)) {
-          teamSkillPaths.set(subDir, path15.join(dirPath, subDir));
+          teamSkillPaths.set(subDir, path16.join(dirPath, subDir));
         }
       }
     }
@@ -3445,12 +3675,12 @@ async function syncSkillsToLocal(teamConfig, localConfig, repoPath, baseDir, las
   for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
     if (!toolPath.skills) continue;
     if (!await ResourceHandler.isToolInstalled(toolPath.skills, baseDir)) continue;
-    const skillsDir = path15.join(baseDir, toolPath.skills);
+    const skillsDir = path16.join(baseDir, toolPath.skills);
     if (!await pathExists(skillsDir)) continue;
     const localSkillNames = await listDirs(skillsDir);
     for (const skillName of localSkillNames) {
       if (!teamSkillPaths.has(skillName)) continue;
-      const localSkillDir = path15.join(skillsDir, skillName);
+      const localSkillDir = path16.join(skillsDir, skillName);
       const teamSkillDir = teamSkillPaths.get(skillName);
       if (await dirTeamSubsetEqual(localSkillDir, teamSkillDir, [CONTRIBUTORS_FILE3])) continue;
       const teamFiles = await listFilesRecursive(teamSkillDir);
@@ -3458,10 +3688,10 @@ async function syncSkillsToLocal(teamConfig, localConfig, repoPath, baseDir, las
       let anyDiffers = false;
       for (const file of teamFiles) {
         if (file === CONTRIBUTORS_FILE3) continue;
-        const localFile = path15.join(localSkillDir, file);
-        const teamFile = path15.join(teamSkillDir, file);
+        const localFile = path16.join(localSkillDir, file);
+        const teamFile = path16.join(teamSkillDir, file);
         if (!await pathExists(localFile)) {
-          const relFromRepo2 = path15.relative(repoPath, teamFile);
+          const relFromRepo2 = path16.relative(repoPath, teamFile);
           const oldContent2 = await getFileContentAtRev(repoPath, lastPullRev, relFromRepo2);
           if (oldContent2 === null) {
             anyDiffers = true;
@@ -3472,7 +3702,7 @@ async function syncSkillsToLocal(teamConfig, localConfig, repoPath, baseDir, las
         }
         if (await fileContentEqual(localFile, teamFile)) continue;
         anyDiffers = true;
-        const relFromRepo = path15.relative(repoPath, teamFile);
+        const relFromRepo = path16.relative(repoPath, teamFile);
         const oldContent = await getFileContentAtRev(repoPath, lastPullRev, relFromRepo);
         if (oldContent === null) {
           allMatchOld = false;
@@ -3604,12 +3834,12 @@ var init_rest_auth = __esm({
 import { execSync, spawnSync } from "child_process";
 import fs5 from "fs";
 import os2 from "os";
-import path16 from "path";
+import path17 from "path";
 function gfInstallDir() {
-  return path16.join(getTeamaiHomeDir(), "gf");
+  return path17.join(getTeamaiHomeDir(), "gf");
 }
 function gfBinPath() {
-  return path16.join(gfInstallDir(), "gf", "bin", "gf");
+  return path17.join(gfInstallDir(), "gf", "bin", "gf");
 }
 function shellQuote2(s) {
   return "'" + s.replace(/'/g, "'\\''") + "'";
@@ -3747,7 +3977,7 @@ function ensureAuthenticated() {
 }
 function gfGetOAuthToken() {
   try {
-    const netrcPath2 = path16.join(os2.homedir(), ".netrc");
+    const netrcPath2 = path17.join(os2.homedir(), ".netrc");
     if (!fs5.existsSync(netrcPath2)) return null;
     const content = fs5.readFileSync(netrcPath2, "utf-8");
     const match = content.match(
@@ -5599,7 +5829,7 @@ var init_repo_url4 = __esm({
 import { spawnSync as spawnSync5 } from "child_process";
 import fs6 from "fs";
 import os3 from "os";
-import path17 from "path";
+import path18 from "path";
 function gitcodeApiBase() {
   return GITCODE_API_BASE;
 }
@@ -5627,7 +5857,7 @@ function authHeaders3(token) {
   };
 }
 function netrcPath() {
-  return path17.join(os3.homedir(), ".netrc");
+  return path18.join(os3.homedir(), ".netrc");
 }
 function readNetrcToken() {
   try {
@@ -6113,12 +6343,13 @@ function buildRepoInfo5(owner, repo, remoteUrl) {
     projectId: encodeURIComponent(`${owner}/${repo}`)
   };
 }
-function parseGenericGitRepoInput(input) {
+function parseGenericGitRepoInputWithOptions(input, options = {}) {
   const trimmed = input.trim();
-  if (/^http:\/\//i.test(trimmed)) {
+  const allowExistingInsecureOrigin = options.allowExistingInsecureOrigin === true;
+  if (/^http:\/\//i.test(trimmed) && !allowExistingInsecureOrigin) {
     throw invalidRepoUrl("plain HTTP is not supported; use HTTPS or SSH");
   }
-  if (/^https:\/\//i.test(trimmed) || /^ssh:\/\//i.test(trimmed)) {
+  if (/^https?:\/\//i.test(trimmed) || /^ssh:\/\//i.test(trimmed)) {
     let parsed;
     try {
       parsed = new URL(trimmed);
@@ -6126,7 +6357,7 @@ function parseGenericGitRepoInput(input) {
       throw invalidRepoUrl();
     }
     const httpCredentials = /^https?:$/i.test(parsed.protocol) && (parsed.username || parsed.password);
-    if (!parsed.hostname || parsed.password || httpCredentials) {
+    if (!parsed.hostname || !allowExistingInsecureOrigin && (parsed.password || httpCredentials)) {
       throw new Error(
         "Invalid Git repo URL. Do not embed credentials in the URL; configure a Git credential helper or SSH key instead."
       );
@@ -6135,7 +6366,7 @@ function parseGenericGitRepoInput(input) {
       throw invalidRepoUrl("query strings and fragments are not supported");
     }
     const { owner, repo, fullPath } = parsePath(parsed.pathname);
-    const auth = parsed.username ? `${parsed.username}@` : "";
+    const auth = /^ssh:$/i.test(parsed.protocol) && parsed.username ? `${parsed.username}@` : "";
     const remoteUrl = `${parsed.protocol}//${auth}${parsed.host}/${fullPath}.git`;
     return buildRepoInfo5(owner, repo, remoteUrl);
   }
@@ -6152,6 +6383,12 @@ function parseGenericGitRepoInput(input) {
   }
   throw invalidRepoUrl();
 }
+function parseGenericGitRepoInput(input) {
+  return parseGenericGitRepoInputWithOptions(input);
+}
+function parseGenericGitExistingRemote(input) {
+  return parseGenericGitRepoInputWithOptions(input, { allowExistingInsecureOrigin: true });
+}
 var SUPPORTED_URL_HINT;
 var init_repo_url5 = __esm({
   "src/providers/git/repo-url.ts"() {
@@ -6527,17 +6764,17 @@ __export(builtin_skills_exports, {
   deployBuiltinSkills: () => deployBuiltinSkills
 });
 import fs7 from "fs";
-import path18 from "path";
+import path19 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import fse2 from "fs-extra";
 function getBuiltinSkillsDir() {
-  const distDir = path18.dirname(fileURLToPath2(import.meta.url));
-  return path18.join(distDir, "..", "skills");
+  const distDir = path19.dirname(fileURLToPath2(import.meta.url));
+  return path19.join(distDir, "..", "skills");
 }
 async function copyBuiltinSkillDir(srcDir, destDir) {
   await fse2.copy(srcDir, destDir, {
     overwrite: true,
-    filter: (srcPath) => !path18.basename(srcPath).startsWith(".")
+    filter: (srcPath) => !path19.basename(srcPath).startsWith(".")
   });
 }
 async function deployBuiltinSkills(teamConfig, localConfig, options) {
@@ -6559,7 +6796,7 @@ async function deployBuiltinSkills(teamConfig, localConfig, options) {
   const skillNames = [];
   for (const entry of entries) {
     if (options?.skipRecall && RECALL_DEPENDENT_SKILLS.has(entry)) continue;
-    const skillMd = path18.join(builtinDir, entry, "SKILL.md");
+    const skillMd = path19.join(builtinDir, entry, "SKILL.md");
     if (await pathExists(skillMd)) {
       skillNames.push(entry);
     }
@@ -6575,7 +6812,7 @@ async function deployBuiltinSkills(teamConfig, localConfig, options) {
     }
     if (localConfig && isAgentExcluded(localConfig, tool)) continue;
     for (const skillName of skillNames) {
-      const srcDir = path18.join(builtinDir, skillName);
+      const srcDir = path19.join(builtinDir, skillName);
       const destDir = await resolveSkillDestination(tool, toolPath.skills, baseDir, skillName, srcDir);
       try {
         await copyBuiltinSkillDir(srcDir, destDir);
@@ -6603,142 +6840,6 @@ var init_builtin_skills = __esm({
   }
 });
 
-// src/roles.ts
-var roles_exports = {};
-__export(roles_exports, {
-  describeRoles: () => describeRoles,
-  findRole: () => findRole,
-  listRoleIds: () => listRoleIds,
-  loadRolesManifest: () => loadRolesManifest,
-  resolveRoleResourceNamespaces: () => resolveRoleResourceNamespaces,
-  saveRolesManifest: () => saveRolesManifest
-});
-import path19 from "path";
-import YAML3 from "yaml";
-import { z as z3 } from "zod";
-function validateManifestShape(raw) {
-  if (!raw || typeof raw !== "object") {
-    throw new Error("Invalid roles manifest: expected an object");
-  }
-  const candidate = raw;
-  const roles = candidate.roles;
-  if (!Array.isArray(roles) || roles.length === 0) {
-    throw new Error("Invalid roles manifest: roles must be a non-empty array");
-  }
-  for (const role of roles) {
-    if (!role || typeof role !== "object") {
-      throw new Error("Invalid roles manifest: every role must be an object");
-    }
-    const resources = role.resources;
-    if (!resources || typeof resources !== "object" || Array.isArray(resources)) {
-      throw new Error(`Invalid roles manifest: role ${role.id ?? "<unknown>"} is missing resources`);
-    }
-    const ALLOWED_RESOURCE_KEYS = /* @__PURE__ */ new Set([...ROLE_RESOURCE_TYPES, "learnings"]);
-    for (const key of Object.keys(resources)) {
-      if (!ALLOWED_RESOURCE_KEYS.has(key)) {
-        throw new Error(`Invalid roles manifest: unknown resource type "${key}"`);
-      }
-    }
-  }
-  const manifest = RolesManifestSchema.parse(raw);
-  const ids = /* @__PURE__ */ new Set();
-  for (const role of manifest.roles) {
-    if (ids.has(role.id)) {
-      throw new Error(`Invalid roles manifest: duplicate role id "${role.id}"`);
-    }
-    ids.add(role.id);
-  }
-  return manifest;
-}
-async function loadRolesManifest(repoPath) {
-  const manifestPath = path19.join(repoPath, "manifest", "roles.yaml");
-  const content = await readFileSafe(manifestPath);
-  if (!content) {
-    throw new Error(`Roles manifest not found: ${manifestPath}`);
-  }
-  let raw;
-  try {
-    raw = YAML3.parse(content);
-  } catch (error) {
-    throw new Error(`Invalid roles manifest YAML: ${error.message}`);
-  }
-  return validateManifestShape(raw);
-}
-async function saveRolesManifest(repoPath, manifest) {
-  validateManifestShape(manifest);
-  const manifestDir = path19.join(repoPath, "manifest");
-  const manifestPath = path19.join(manifestDir, "roles.yaml");
-  await ensureDir(manifestDir);
-  await writeFile(manifestPath, YAML3.stringify(manifest));
-}
-function findRole(manifest, roleId) {
-  return manifest.roles.find((candidate) => candidate.id === roleId);
-}
-function listRoleIds(manifest) {
-  return manifest.roles.map((role) => role.id);
-}
-function describeRoles(roles) {
-  return roles.map((role) => role.description ? `${role.id}: ${role.description}` : `${role.id}`);
-}
-function getRoleOrThrow(manifest, roleId) {
-  const role = manifest.roles.find((candidate) => candidate.id === roleId);
-  if (!role) {
-    throw new Error(`Unknown role "${roleId}". Valid roles: ${listRoleIds(manifest).join(", ")}`);
-  }
-  return role;
-}
-function resolveRoleResourceNamespaces(input) {
-  const resolvedRoles = [
-    getRoleOrThrow(input.manifest, input.primaryRole),
-    ...input.additionalRoles.map((roleId) => getRoleOrThrow(input.manifest, roleId))
-  ];
-  const namespaces = {
-    knowledge: [],
-    skills: [],
-    // Roles never contribute learnings namespaces; only projects do. Kept empty
-    // so the shape matches project resolution for a clean union at the call site.
-    learnings: []
-  };
-  for (const type of ROLE_RESOURCE_TYPES) {
-    const seen = /* @__PURE__ */ new Set();
-    for (const role of resolvedRoles) {
-      for (const namespace of role.resources[type]) {
-        if (seen.has(namespace)) continue;
-        seen.add(namespace);
-        namespaces[type].push(namespace);
-      }
-    }
-  }
-  return namespaces;
-}
-var ROLE_RESOURCE_TYPES, RoleResourceNamespacesSchema, RoleSchema, RolesManifestSchema;
-var init_roles = __esm({
-  "src/roles.ts"() {
-    "use strict";
-    init_fs();
-    ROLE_RESOURCE_TYPES = ["knowledge", "skills"];
-    RoleResourceNamespacesSchema = z3.object({
-      knowledge: z3.array(z3.string().min(1)),
-      skills: z3.array(z3.string().min(1)),
-      // learnings is accepted for backward compatibility but ignored at runtime.
-      // All learnings are shared flat across the entire team (no namespace isolation).
-      learnings: z3.array(z3.string()).optional()
-    });
-    RoleSchema = z3.object({
-      id: z3.string().min(1),
-      description: z3.string().default(""),
-      resources: RoleResourceNamespacesSchema
-    });
-    RolesManifestSchema = z3.object({
-      version: z3.number(),
-      roles: z3.array(RoleSchema).min(1),
-      // defaults.shareTarget was removed: learnings are flat, no namespace routing needed.
-      // Old manifests with a defaults block are still parseable (z.passthrough on object level).
-      defaults: z3.object({}).passthrough().optional()
-    });
-  }
-});
-
 // src/utils/path-safety.ts
 var path_safety_exports = {};
 __export(path_safety_exports, {
@@ -7487,10 +7588,20 @@ async function countInterventions(transcriptPath) {
   const { interrupt, toolReject, toolError } = await scanTranscriptStop(transcriptPath);
   return { interrupt, toolReject, toolError };
 }
-function isCorrectionPrompt(text) {
+function wordBoundaryPattern(keyword) {
+  const escaped = keyword.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`(?<![\\p{L}\\p{N}_])${escaped}(?![\\p{L}\\p{N}_])`, "u");
+}
+function containsKeyword(lower, keyword) {
+  const k = keyword.trim().normalize("NFC").toLowerCase();
+  if (!k) return false;
+  if (UNSPACED_SCRIPT_RE.test(k)) return lower.includes(k);
+  return wordBoundaryPattern(k).test(lower);
+}
+function isCorrectionPrompt(text, extraKeywords = []) {
   if (!text) return false;
-  const lower = text.toLowerCase();
-  return CORRECTION_KEYWORDS.some((k) => lower.includes(k));
+  const lower = text.normalize("NFC").toLowerCase();
+  return [...CORRECTION_KEYWORDS, ...extraKeywords].some((k) => containsKeyword(lower, k));
 }
 function mapEventType(hookEventName) {
   switch (hookEventName) {
@@ -7511,7 +7622,7 @@ function mapEventType(hookEventName) {
       return null;
   }
 }
-async function parseHookEvent(raw, tool) {
+async function parseHookEvent(raw, tool, options) {
   if (!raw.trim()) return null;
   let hookData;
   try {
@@ -7550,6 +7661,7 @@ async function parseHookEvent(raw, tool) {
   }
   if (eventType === "prompt_submit" && typeof hookData.prompt === "string") {
     event.promptSummary = hookData.prompt.slice(0, 200);
+    event.correction = isCorrectionPrompt(hookData.prompt, options?.correctionKeywords);
   }
   if (eventType === "stop" && typeof hookData.transcript_path === "string") {
     event.transcriptPath = hookData.transcript_path;
@@ -7856,7 +7968,8 @@ function aggregateSessionMetrics(events) {
       const stopAt = lastStopAt.get(event.sessionId);
       if (stopAt !== void 0) {
         const gap = new Date(event.timestamp).getTime() - stopAt;
-        if (gap >= 0 && gap <= CORRECTION_WINDOW_MS && isCorrectionPrompt(event.promptSummary)) {
+        const isCorrection = event.correction ?? isCorrectionPrompt(event.promptSummary);
+        if (gap >= 0 && gap <= CORRECTION_WINDOW_MS && isCorrection) {
           m.correction++;
         }
         lastStopAt.delete(event.sessionId);
@@ -7918,7 +8031,7 @@ async function dashboardReport(toolArg) {
   compactEvents().catch(() => {
   });
 }
-var TRANSCRIPT_TAIL_BYTES, STOPPED_OUTPUT_MAX_CHARS, CODEX_USAGE_TAIL_BYTES, CODEX_USAGE_MAX_ATTEMPTS, CODEX_USAGE_RETRY_MS, CODEBUDDY_USAGE_MAX_ATTEMPTS, CODEBUDDY_USAGE_RETRY_MS, CODEBUDDY_BLOB_MAX_COUNT, CODEBUDDY_REJECT_MARKER;
+var TRANSCRIPT_TAIL_BYTES, STOPPED_OUTPUT_MAX_CHARS, CODEX_USAGE_TAIL_BYTES, CODEX_USAGE_MAX_ATTEMPTS, CODEX_USAGE_RETRY_MS, CODEBUDDY_USAGE_MAX_ATTEMPTS, CODEBUDDY_USAGE_RETRY_MS, CODEBUDDY_BLOB_MAX_COUNT, CODEBUDDY_REJECT_MARKER, UNSPACED_SCRIPT_RE;
 var init_dashboard_collector = __esm({
   "src/dashboard-collector.ts"() {
     "use strict";
@@ -7941,6 +8054,7 @@ var init_dashboard_collector = __esm({
     CODEBUDDY_USAGE_RETRY_MS = 250;
     CODEBUDDY_BLOB_MAX_COUNT = 2e3;
     CODEBUDDY_REJECT_MARKER = "User rejected this command";
+    UNSPACED_SCRIPT_RE = /[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]/u;
   }
 });
 
@@ -8297,7 +8411,7 @@ var CLAUDE_TOOLS, CURSOR_TOOLS2, CODEX_TOOLS2, BUDDY_TOOLS, OPENCODE_TOOLS, MCP_
 var init_mcp_format = __esm({
   "src/resources/mcp-format.ts"() {
     "use strict";
-    CLAUDE_TOOLS = /* @__PURE__ */ new Set(["claude", "claude-internal", "tclaude", "qoder", "zcode"]);
+    CLAUDE_TOOLS = /* @__PURE__ */ new Set(["claude", "claude-internal", "tclaude", "qoder", "kiro", "zcode"]);
     CURSOR_TOOLS2 = /* @__PURE__ */ new Set(["cursor"]);
     CODEX_TOOLS2 = /* @__PURE__ */ new Set(["codex", "codex-internal", "tcodex"]);
     BUDDY_TOOLS = /* @__PURE__ */ new Set(["codebuddy", "workbuddy"]);
@@ -8354,7 +8468,8 @@ function teamMcpToDef(s) {
     env: s.env,
     timeout: s.timeout,
     requires: s.requires,
-    tools: s.tools
+    tools: s.tools,
+    roles: s.roles
   };
 }
 async function parseTeamMcpServers(repoPath) {
@@ -8380,7 +8495,8 @@ var init_mcp = __esm({
       env: z4.record(z4.string(), z4.string()).optional(),
       timeout: z4.number().int().positive().optional(),
       requires: z4.array(z4.string()).optional(),
-      tools: z4.array(z4.string()).optional()
+      tools: z4.array(z4.string()).optional(),
+      roles: z4.array(z4.string()).optional()
     }).refine((s) => s.transport === "stdio" ? !!s.command : true, {
       message: "stdio transport requires `command`"
     }).refine((s) => s.transport === "stdio" ? true : !!s.url, {
@@ -8703,6 +8819,14 @@ async function reconcileMcpForConfig(teamConfig, localConfig, options = {}) {
     return { changes, wrote };
   }
   const excluded = new Set(localConfig.excludedSkills ?? []);
+  const activeRoles = activeRoleIds(localConfig);
+  if (!removeAll) {
+    await warnUnknownRoleIds(
+      localConfig.repo.localPath,
+      "mcp.yaml",
+      teamDefs.map((def) => ({ kind: "server", name: def.name, roles: def.roles }))
+    );
+  }
   const targets = await resolveMcpTargets(teamConfig, localConfig);
   if (targets.length === 0) return { changes, wrote };
   const dataHome = getDataHome(localConfig);
@@ -8726,6 +8850,7 @@ async function reconcileMcpForConfig(teamConfig, localConfig, options = {}) {
     const desired = /* @__PURE__ */ new Map();
     for (const raw of teamDefs) {
       if (raw.tools && !raw.tools.includes(target.tool)) continue;
+      if (!matchesRoles(raw.roles, activeRoles)) continue;
       if (excluded.has(raw.name)) {
         changes.push({ tool: target.tool, server: raw.name, action: "skipped", reason: "excluded by user" });
         continue;
@@ -8878,6 +9003,7 @@ var init_mcp_reconcile = __esm({
     init_types();
     init_mcp_format();
     init_mcp();
+    init_roles();
     init_fs();
     init_logger();
     init_mcp_manifest();
@@ -12991,6 +13117,8 @@ function agentFileExtensionForTool(tool) {
     case "codex-internal":
     case "tcodex":
       return ".toml";
+    case "kiro":
+      return ".json";
     default:
       return ".md";
   }
@@ -13051,6 +13179,35 @@ function renderForJoycode(spec) {
     content: renderMarkdownAgent(spec, spec.tool_extras?.["joycode"])
   };
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isManagedKiroSessionHook(value) {
+  return isRecord(value) && typeof value["command"] === "string" && value["command"].includes("teamai hook-dispatch session-start --tool kiro");
+}
+function renderForKiro(spec) {
+  const extras = { ...spec.tool_extras?.["kiro"] ?? {} };
+  const existingHooks = isRecord(extras["hooks"]) ? { ...extras["hooks"] } : {};
+  const existingAgentSpawn = Array.isArray(existingHooks["agentSpawn"]) ? existingHooks["agentSpawn"].filter((entry) => !isManagedKiroSessionHook(entry)) : [];
+  existingHooks["agentSpawn"] = [
+    ...existingAgentSpawn,
+    { command: KIRO_SESSION_START_COMMAND }
+  ];
+  extras["hooks"] = existingHooks;
+  const json = {
+    name: spec.name,
+    description: spec.description,
+    prompt: spec.instructions
+  };
+  if (spec.model !== void 0) json["model"] = spec.model;
+  if (spec.tools !== void 0 && spec.tools.length > 0) json["tools"] = spec.tools;
+  Object.assign(json, extras);
+  return {
+    ext: agentFileExtensionForTool("kiro"),
+    content: `${JSON.stringify(json, null, 2)}
+`
+  };
+}
 function renderForCodex(spec) {
   return {
     ext: agentFileExtensionForTool("codex"),
@@ -13178,6 +13335,43 @@ function reverseFromJoycode(filePath, content) {
   }
   return { ok: true, spec };
 }
+function reverseFromKiro(filePath, content) {
+  let parsed;
+  try {
+    const raw = JSON.parse(content);
+    if (!isRecord(raw)) return { ok: false, reason: "agent config must be a JSON object" };
+    parsed = raw;
+  } catch (err) {
+    return { ok: false, reason: `parse error: ${err.message}` };
+  }
+  const name = parsed["name"] ?? path35.basename(filePath, ".json");
+  if (!name) return { ok: false, reason: "missing field name" };
+  if (!parsed["description"]) return { ok: false, reason: "missing field description" };
+  if (!parsed["prompt"]) return { ok: false, reason: "missing field prompt" };
+  const extras = {};
+  for (const [key, value] of Object.entries(parsed)) {
+    if (!COMMON_KIRO_FIELDS.has(key)) extras[key] = value;
+  }
+  if (isRecord(extras["hooks"])) {
+    const hooks = { ...extras["hooks"] };
+    if (Array.isArray(hooks["agentSpawn"])) {
+      const remaining = hooks["agentSpawn"].filter((entry) => !isManagedKiroSessionHook(entry));
+      if (remaining.length > 0) hooks["agentSpawn"] = remaining;
+      else delete hooks["agentSpawn"];
+    }
+    if (Object.keys(hooks).length > 0) extras["hooks"] = hooks;
+    else delete extras["hooks"];
+  }
+  const spec = {
+    name,
+    description: parsed["description"],
+    instructions: parsed["prompt"]
+  };
+  if (parsed["model"] !== void 0) spec.model = parsed["model"];
+  if (parsed["tools"] !== void 0) spec.tools = parsed["tools"];
+  if (Object.keys(extras).length > 0) spec.tool_extras = { kiro: extras };
+  return { ok: true, spec };
+}
 function reverseFromCodex(filePath, content) {
   let parsed;
   try {
@@ -13326,16 +13520,19 @@ function renderForTool(spec, tool) {
       return renderForJoycode(spec);
     case "qoder":
       return renderForClaude(spec);
+    case "kiro":
+      return renderForKiro(spec);
     case "zcode":
       return renderForClaude(spec);
     case "opencode":
       return renderForOpencode(spec);
   }
 }
-var ALL_SUPPORTED_TOOLS, COMMON_CLAUDE_FIELDS, COMMON_CURSOR_FIELDS, COMMON_CODEX_FIELDS, COMMON_OPENCODE_FIELDS, MERGE_COMMON_FIELDS;
+var ALL_SUPPORTED_TOOLS, KIRO_SESSION_START_COMMAND, COMMON_CLAUDE_FIELDS, COMMON_CURSOR_FIELDS, COMMON_CODEX_FIELDS, COMMON_KIRO_FIELDS, COMMON_OPENCODE_FIELDS, MERGE_COMMON_FIELDS;
 var init_agent_format = __esm({
   "src/resources/agent-format.ts"() {
     "use strict";
+    init_builtin_hooks();
     ALL_SUPPORTED_TOOLS = [
       "claude",
       "claude-internal",
@@ -13347,12 +13544,15 @@ var init_agent_format = __esm({
       "cursor",
       "joycode",
       "qoder",
+      "kiro",
       "zcode",
       "opencode"
     ];
+    KIRO_SESSION_START_COMMAND = getDispatchCommand("session-start", "kiro");
     COMMON_CLAUDE_FIELDS = /* @__PURE__ */ new Set(["name", "description", "model", "tools"]);
     COMMON_CURSOR_FIELDS = /* @__PURE__ */ new Set(["agent_id", "description", "model", "tools"]);
     COMMON_CODEX_FIELDS = /* @__PURE__ */ new Set(["name", "description", "developer_instructions", "model"]);
+    COMMON_KIRO_FIELDS = /* @__PURE__ */ new Set(["name", "description", "prompt", "model", "tools"]);
     COMMON_OPENCODE_FIELDS = /* @__PURE__ */ new Set(["description", "model"]);
     MERGE_COMMON_FIELDS = [
       "name",
@@ -13385,7 +13585,7 @@ async function removeStaleAgentSiblings(targetAgentsDir, stem, targetExt) {
     return;
   }
   for (const file of files) {
-    const base = file.replace(/\.(md|toml)$/, "");
+    const base = file.replace(/\.(md|toml|json)$/, "");
     if (base !== stem) continue;
     if (file === `${stem}${targetExt}`) continue;
     try {
@@ -13517,8 +13717,16 @@ function mergeCanonicalEdits(canonical, perTool) {
 function getAgentStem(filename) {
   if (filename.endsWith(".md")) return filename.slice(0, -3);
   if (filename.endsWith(".toml")) return filename.slice(0, -5);
+  if (filename.endsWith(".json")) return filename.slice(0, -5);
   return null;
 }
+async function removeStaleAgentSiblings2(agentsDir, stem, targetExt) {
+  for (const file of await listFiles(agentsDir)) {
+    if (getAgentStem(file) !== stem || file === `${stem}${targetExt}`) continue;
+    await remove(path37.join(agentsDir, file));
+    log.debug(`Removed stale agent sibling ${file} for ${stem}`);
+  }
+}
 function isKnownTool(tool) {
   return ALL_SUPPORTED_TOOLS.includes(tool);
 }
@@ -13551,6 +13759,8 @@ function reverseByTool(tool, filePath, content) {
       return reverseFromJoycode(filePath, content);
     case "qoder":
       return reverseFromClaude(filePath, content);
+    case "kiro":
+      return reverseFromKiro(filePath, content);
     case "zcode":
       return reverseFromClaude(filePath, content);
     case "opencode":
@@ -13847,6 +14057,7 @@ var init_agents = __esm({
           try {
             await ensureDir(destDir);
             const { ext, content: rendered } = renderForTool(spec, tool);
+            await removeStaleAgentSiblings2(destDir, item.name, ext);
             const dest = path37.join(destDir, `${item.name}${ext}`);
             await writeFile(dest, rendered);
             log.debug(`Rendered agent ${item.name} \u2192 ${tool} (${ext})`);
@@ -13874,7 +14085,7 @@ var init_agents = __esm({
         await this.addTombstone(name, localConfig);
         for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (!toolPath.agents) continue;
-          for (const ext of [".md", ".toml"]) {
+          for (const ext of [".md", ".toml", ".json"]) {
             const filePath = path37.join(baseDir, toolPath.agents, `${name}${ext}`);
             if (await pathExists(filePath)) {
               await remove(filePath);
@@ -14032,7 +14243,7 @@ async function fetchLatestVersion(registry, timeout = VERSION_CHECK_TIMEOUT) {
     const { stdout } = await execFileAsync2(
       npm.cmd,
       [...npm.args, "view", pkgName, "version", `--registry=${resolvedRegistry}`],
-      { timeout, encoding: "utf-8" }
+      { timeout, encoding: "utf-8", windowsHide: true }
     );
     const version2 = stdout.trim();
     if (!version2) return null;
@@ -14266,7 +14477,7 @@ async function doUpdate() {
         ...target ? [`--prefix=${target.prefix}`] : [],
         `--registry=${registry}`
       ],
-      { timeout: INSTALL_TIMEOUT }
+      { timeout: INSTALL_TIMEOUT, windowsHide: true }
     );
     log.success(`Updated teamai to v${result.latest}`);
     const entry = resolveTeamaiEntryScript();
@@ -14287,7 +14498,8 @@ async function doUpdate() {
     try {
       const refresh = entry ? { cmd: process.execPath, args: [entry, "hooks", "inject", "--silent"] } : { cmd: "teamai", args: ["hooks", "inject", "--silent"] };
       await execFileAsync2(refresh.cmd, refresh.args, {
-        timeout: 15e3
+        timeout: 15e3,
+        windowsHide: true
       });
       log.success("Refreshed hooks with new version");
     } catch (e) {
@@ -14868,8 +15080,17 @@ import fse8 from "fs-extra";
 function businessRoot(localConfig) {
   return localConfig.repo.businessRepoRoot ?? path42.dirname(localConfig.repo.localPath);
 }
+function reportsGitRoot(localConfig) {
+  if (isSelfMode(localConfig)) {
+    return businessRoot(localConfig);
+  }
+  return localConfig.repo.localPath;
+}
 function reportsWorktreePath(localConfig) {
-  return path42.join(localConfig.repo.localPath, REPORTS_WORKTREE_DIRNAME);
+  return getReportsDir(localConfig);
+}
+function reportsLockPath(localConfig) {
+  return path42.join(path42.dirname(getReportsDir(localConfig)), REPORTS_LOCK_FILENAME);
 }
 async function remoteBranchExists2(repoRoot) {
   const git = createGit2(repoRoot);
@@ -14881,10 +15102,22 @@ async function remoteBranchExists2(repoRoot) {
   }
 }
 async function ensureReportsWorktree(localConfig, options = {}) {
+  if (!usesReportsBranch(localConfig)) {
+    return getReportsDir(localConfig);
+  }
   const wt = reportsWorktreePath(localConfig);
-  const repoRoot = businessRoot(localConfig);
+  const repoRoot = reportsGitRoot(localConfig);
+  if (!isSelfMode(localConfig) && !await isDedicatedRepoRoot(repoRoot)) {
+    throw new Error(
+      `Refusing to create a reports worktree: ${repoRoot} is not a dedicated team-repo clone root`
+    );
+  }
   if (await isGitRepo(wt)) {
-    return wt;
+    try {
+      await createGit2(wt).revparse(["--is-inside-work-tree"]);
+      return wt;
+    } catch {
+    }
   }
   if (await pathExists(wt)) {
     await fse8.remove(wt);
@@ -14907,14 +15140,19 @@ async function ensureReportsWorktree(localConfig, options = {}) {
       await git.raw(["worktree", "add", wt, "--track", "-b", REPORTS_BRANCH, `origin/${REPORTS_BRANCH}`]);
     }
   } else {
-    await createOrphanWorktree(repoRoot, wt);
-    await writeWorktreeGitignore(wt);
-    const wtGit = createGit2(wt);
-    await wtGit.add([".gitignore"]);
-    await commitSkippingHooks(wtGit, "[teamai] Initialize reports branch");
+    const branches = await git.branchLocal();
+    if (branches.all.includes(REPORTS_BRANCH)) {
+      await git.raw(["worktree", "add", wt, REPORTS_BRANCH]);
+    } else {
+      await createOrphanWorktree(repoRoot, wt);
+      await writeWorktreeGitignore(wt);
+      const wtGit = createGit2(wt);
+      await wtGit.add([".gitignore"]);
+      await commitSkippingHooks(wtGit, "[teamai] Initialize reports branch");
+    }
     if (options.pushIfCreated !== false) {
       try {
-        await wtGit.push(["-u", "origin", REPORTS_BRANCH]);
+        await createGit2(wt).push(["-u", "origin", REPORTS_BRANCH]);
       } catch (e) {
         log.debug(`[reports] initial push skipped: ${e.message}`);
       }
@@ -14958,8 +15196,8 @@ async function writeWorktreeGitignore(wt) {
   ].join("\n");
   await writeFile(path42.join(wt, ".gitignore"), content);
 }
-async function commitAndPushReports(localConfig, message, files) {
-  const lockPath = path42.join(localConfig.repo.localPath, REPORTS_LOCK_FILENAME);
+async function commitAndPushReports(localConfig, message, files, options = {}) {
+  const lockPath = reportsLockPath(localConfig);
   const locked = await acquireLock(lockPath);
   if (!locked) {
     log.debug("[reports] another reports write is in progress; skipping");
@@ -14970,11 +15208,11 @@ async function commitAndPushReports(localConfig, message, files) {
     const git = createGit2(wt);
     await git.add(files);
     const status2 = await git.status();
-    if (status2.staged.length === 0) {
+    if (status2.staged.length === 0 && !options.pushIfUnchanged) {
       log.debug("[reports] nothing to commit");
       return false;
     }
-    await commitSkippingHooks(git, message);
+    if (status2.staged.length > 0) await commitSkippingHooks(git, message);
     for (let attempt = 1; attempt <= MAX_PUSH_RETRIES; attempt++) {
       try {
         await git.push(["origin", REPORTS_BRANCH]);
@@ -15004,18 +15242,139 @@ async function commitAndPushReports(localConfig, message, files) {
     await releaseLock(lockPath);
   }
 }
+async function gitPathExists(git, gitPath) {
+  try {
+    const resolved = (await git.raw(["rev-parse", "--git-path", gitPath])).trim();
+    return resolved.length > 0 && await pathExists(resolved);
+  } catch {
+    return false;
+  }
+}
+async function rebaseInProgress(git) {
+  return await gitPathExists(git, "rebase-merge") || await gitPathExists(git, "rebase-apply");
+}
+async function restoreConflictedFiles(git) {
+  let conflicted = [];
+  try {
+    conflicted = (await git.status()).conflicted ?? [];
+  } catch {
+    return;
+  }
+  if (conflicted.length === 0) {
+    return;
+  }
+  if (await rebaseInProgress(git)) {
+    return;
+  }
+  try {
+    await git.raw(["checkout", "--theirs", "--", ...conflicted]);
+    await git.raw(["add", "--", ...conflicted]);
+    await git.raw(["reset", "HEAD", "--", ...conflicted]);
+    log.debug("[reports] restored uncommitted report files after a stash-apply conflict; using the local copy");
+  } catch (e) {
+    log.debug(`[reports] could not restore stash-apply conflicts: ${e.message}`);
+    try {
+      await git.raw(["reset", "--hard", "HEAD"]);
+    } catch {
+    }
+  }
+}
+async function snapshotDirtyTree(git) {
+  try {
+    const sha = (await git.raw(["stash", "create"])).trim();
+    return sha.length > 0 ? sha : null;
+  } catch {
+    return null;
+  }
+}
+async function applyDirtySnapshot(git, sha) {
+  try {
+    await git.raw(["stash", "apply", sha]);
+  } catch {
+  }
+  await restoreConflictedFiles(git);
+}
+async function syncReportsWorktree(wt) {
+  const git = createGit2(wt);
+  const upstream = `origin/${REPORTS_BRANCH}`;
+  try {
+    await git.fetch(["origin", REPORTS_BRANCH]);
+  } catch (e) {
+    log.debug(`[reports] fetch failed, using the local copy: ${e.message}`);
+    return;
+  }
+  await restoreConflictedFiles(git);
+  const dirty = !(await git.status()).isClean();
+  const ahead = Number.parseInt((await git.raw(["rev-list", "--count", `${upstream}..HEAD`])).trim(), 10);
+  let carried = null;
+  if (dirty && ahead > 0) {
+    carried = await snapshotDirtyTree(git);
+    if (!carried) {
+      log.debug("[reports] uncommitted report files block the refresh; using the local copy");
+      return;
+    }
+    try {
+      await git.raw(["reset", "--hard", "HEAD"]);
+    } catch (e) {
+      log.debug(`[reports] could not clear the worktree for rebase; using the local copy: ${e.message}`);
+      await applyDirtySnapshot(git, carried);
+      return;
+    }
+  }
+  try {
+    if (ahead > 0) {
+      await git.rebase([upstream]);
+    } else {
+      await git.raw(["merge", "--ff-only", upstream]);
+    }
+  } catch (e) {
+    if (ahead > 0) {
+      try {
+        await git.rebase(["--abort"]);
+      } catch {
+      }
+    }
+    if (carried) {
+      await applyDirtySnapshot(git, carried);
+      log.debug(`[reports] uncommitted report files block the refresh; using the local copy: ${e.message}`);
+      return;
+    }
+    if (dirty) {
+      log.debug(`[reports] uncommitted report files block the refresh; using the local copy: ${e.message}`);
+      return;
+    }
+    log.debug(`[reports] dropping ${ahead} unpushed report commit(s) that conflict with ${upstream}: ${e.message}`);
+    await git.raw(["reset", "--hard", upstream]);
+    return;
+  }
+  if (carried) {
+    await applyDirtySnapshot(git, carried);
+  }
+}
 async function refreshReportsWorktree(localConfig, options = {}) {
+  if (!usesReportsBranch(localConfig)) {
+    return;
+  }
+  const lockPath = reportsLockPath(localConfig);
+  let locked = false;
   try {
+    locked = await acquireLock(lockPath);
     const wt = await ensureReportsWorktree(localConfig, options);
-    const git = createGit2(wt);
-    await git.fetch(["origin", REPORTS_BRANCH]);
-    await git.raw(["reset", "--hard", `origin/${REPORTS_BRANCH}`]);
+    if (!locked) {
+      log.debug("[reports] a reports write is in progress; reading the local copy");
+      return;
+    }
+    await syncReportsWorktree(wt);
   } catch (e) {
     log.debug(`[reports] refresh skipped: ${e.message}`);
+  } finally {
+    if (locked) {
+      await releaseLock(lockPath);
+    }
   }
 }
 async function ensureReportsDir(localConfig) {
-  if (localConfig.repo.kind === "self") {
+  if (usesReportsBranch(localConfig)) {
     return ensureReportsWorktree(localConfig);
   }
   return getReportsDir(localConfig);
@@ -15139,10 +15498,11 @@ async function listMembers(options) {
   const projectConfig = await detectProjectConfig();
   const localConfig = projectConfig ?? (await requireInit()).localConfig;
   let repoPath;
-  if (localConfig.repo.kind === "self") {
+  const { usesReportsBranch: usesReportsBranch2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+  if (usesReportsBranch2(localConfig)) {
     const { ensureReportsWorktree: ensureReportsWorktree2, refreshReportsWorktree: refreshReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-    await refreshReportsWorktree2(localConfig);
-    repoPath = await ensureReportsWorktree2(localConfig);
+    await refreshReportsWorktree2(localConfig, { pushIfCreated: false });
+    repoPath = await ensureReportsWorktree2(localConfig, { pushIfCreated: false });
   } else {
     repoPath = localConfig.repo.localPath;
     await pullRepo(repoPath);
@@ -15834,12 +16194,12 @@ async function initSelfRepo(options) {
     return;
   }
   const provider = getProvider(providerName);
-  log.debug(`Detected provider: ${providerName} (from ${remoteUrl})`);
+  log.debug(`Detected provider: ${providerName} (from ${redactGitCredentials(remoteUrl)})`);
   let repoInfo;
   try {
-    repoInfo = provider.parseRepoInput(remoteUrl);
+    repoInfo = providerName === "git" ? parseGenericGitExistingRemote(remoteUrl) : provider.parseRepoInput(remoteUrl);
   } catch (e) {
-    log.error(`Could not parse the business repo remote "${remoteUrl}": ${e.message}`);
+    log.error(`Could not parse the business repo remote "${redactGitCredentials(remoteUrl)}": ${e.message}`);
     process.exit(1);
     return;
   }
@@ -16242,6 +16602,7 @@ async function init(options) {
   const emailDomain = provider.getDefaultEmailDomain() ?? void 0;
   await configureGitUser(localPath, username, username, void 0, emailDomain);
   const teamConfig = await loadTeamConfig(localPath);
+  const createdSkeleton = !teamConfig;
   if (!teamConfig) {
     log.warn("teamai.yaml not found in repo. Creating default config...");
     const defaultConfig = YAML11.stringify({
@@ -16271,33 +16632,59 @@ async function init(options) {
     log.error(error.message);
     process.exit(1);
   }
-  const memberPath = path45.join(localPath, "members", `${username}.yaml`);
-  const isNewMember = !await pathExists(memberPath);
-  const existingMember = await getMemberConfig(localPath, username);
-  const { config: memberConfig, changed: memberChanged } = mergeMemberConfig(existingMember, {
+  const reportsConfig = {
+    repo: { localPath, remote: repoInfo.httpsUrl },
     username,
-    projects: resolvedProjects
-  });
-  if (memberChanged) {
-    await writeFile(memberPath, YAML11.stringify(memberConfig));
-    log.success(isNewMember ? `Registered as team member: ${username}` : `Updated member roster: ${username}${memberConfig.projects ? ` (projects: ${memberConfig.projects.join(", ")})` : ""}`);
-    if (!options.dryRun) {
-      try {
-        await pushRepoDirectly(localPath, isNewMember ? `[teamai] Register member: ${username}` : `[teamai] Update member roster: ${username}`, [
-          "members/",
-          "teamai.yaml",
-          "skills/.gitkeep",
-          "rules/.gitkeep",
-          "docs/.gitkeep",
-          "env/.gitkeep"
-        ]);
-        log.success("Member registration pushed to team repo");
-      } catch (e) {
-        log.warn(`Push failed (you can push manually later): ${e.message}`);
+    scope,
+    projectRoot,
+    additionalRoles: []
+  };
+  if (createdSkeleton && !options.dryRun) {
+    try {
+      await pushRepoDirectly(localPath, "[teamai] Initialize team repo skeleton", [
+        "teamai.yaml",
+        "skills/.gitkeep",
+        "rules/.gitkeep",
+        "docs/.gitkeep",
+        "env/.gitkeep",
+        "members/.gitkeep"
+      ]);
+    } catch (e) {
+      log.warn(`Push failed (you can push manually later): ${e.message}`);
+    }
+  }
+  let isNewMember = true;
+  if (!options.dryRun) {
+    try {
+      const { ensureReportsWorktree: ensureReportsWorktree2, commitAndPushReports: commitAndPushReports2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
+      const wt = await ensureReportsWorktree2(reportsConfig);
+      const memberDir = path45.join(wt, "members");
+      await ensureDir(memberDir);
+      const memberPath = path45.join(memberDir, `${username}.yaml`);
+      isNewMember = !await pathExists(memberPath);
+      const existingMember = await getMemberConfig(wt, username);
+      const { config: memberConfig, changed: memberChanged } = mergeMemberConfig(existingMember, {
+        username,
+        projects: resolvedProjects
+      });
+      if (memberChanged) {
+        await writeFile(memberPath, YAML11.stringify(memberConfig));
+        log.success(isNewMember ? `Registered as team member: ${username}` : `Updated member roster: ${username}${memberConfig.projects ? ` (projects: ${memberConfig.projects.join(", ")})` : ""}`);
+        const pushed = await commitAndPushReports2(reportsConfig, isNewMember ? `[teamai] Register member: ${username}` : `[teamai] Update member roster: ${username}`, ["members/"]);
+        if (pushed) {
+          log.success(isNewMember ? "Member registered on the teamai-reports branch" : "Member roster updated on the teamai-reports branch");
+        } else {
+          log.warn("Member registration could not be pushed (no write access?). You are still set up locally.");
+        }
+      } else {
+        log.info(`Member ${username} already registered`);
+        isNewMember = false;
       }
+    } catch (e) {
+      log.warn(`Member registration skipped (non-blocking): ${e.message}`);
     }
   } else {
-    log.info(`Member ${username} already registered`);
+    log.info(`[dry-run] Would register member ${username} on the teamai-reports branch`);
   }
   const currentConfig = await loadTeamConfig(localPath);
   const hasReviewers = currentConfig?.reviewers && currentConfig.reviewers.length > 0;
@@ -16425,6 +16812,7 @@ var init_init = __esm({
     init_git2();
     init_git2();
     init_providers();
+    init_repo_url5();
     init_fs();
     init_logger();
     init_types();
@@ -19700,6 +20088,12 @@ function mergeDeltas(local, remote) {
         votes[docId].last_upvoted_at = localEntry.last_upvoted_at;
       }
     }
+    if (votes[docId].recalled_count === 0) {
+      votes[docId].last_recalled_at = "";
+    }
+    if (votes[docId].upvoted_count === 0) {
+      delete votes[docId].last_upvoted_at;
+    }
   }
   return { version: 2, votes, deltas: {} };
 }
@@ -19739,11 +20133,16 @@ async function recallFeedback(opts) {
       return;
     }
     const existingDelta = data.deltas[opts.negative] ?? { recalled_delta: 0, upvoted_delta: 0 };
+    const decrementedCount = entry.upvoted_count - 1;
+    const updatedEntry = { ...entry, upvoted_count: decrementedCount };
+    if (decrementedCount === 0) {
+      delete updatedEntry.last_upvoted_at;
+    }
     const updated = {
       ...data,
       votes: {
         ...data.votes,
-        [opts.negative]: { ...entry, upvoted_count: entry.upvoted_count - 1 }
+        [opts.negative]: updatedEntry
       },
       deltas: {
         ...data.deltas,
@@ -21473,10 +21872,11 @@ async function generateDigest(options) {
     const localConfig = projectConfig ?? (await requireInit()).localConfig;
     const repoPath = localConfig.repo.localPath;
     let reportsRoot = repoPath;
-    if (localConfig.repo.kind === "self") {
+    const { usesReportsBranch: usesReportsBranch2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+    if (usesReportsBranch2(localConfig)) {
       const { ensureReportsWorktree: ensureReportsWorktree2, refreshReportsWorktree: refreshReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-      await refreshReportsWorktree2(localConfig);
-      reportsRoot = await ensureReportsWorktree2(localConfig);
+      await refreshReportsWorktree2(localConfig, { pushIfCreated: false });
+      reportsRoot = await ensureReportsWorktree2(localConfig, { pushIfCreated: false });
     }
     const teamStats = await loadTeamStats(reportsRoot);
     if (teamStats.length === 0) {
@@ -21629,9 +22029,10 @@ async function loadReportedStats() {
     const config = await detectProjectConfig() ?? await loadLocalConfig();
     if (!config) return null;
     let statsRoot = config.repo.localPath;
-    if (config.repo.kind === "self") {
+    const { usesReportsBranch: usesReportsBranch2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+    if (usesReportsBranch2(config)) {
       const { ensureReportsWorktree: ensureReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-      statsRoot = await ensureReportsWorktree2(config);
+      statsRoot = await ensureReportsWorktree2(config, { pushIfCreated: false });
     }
     const statsPath = path62.join(statsRoot, "stats", `${config.username}.yaml`);
     const content = await readFileSafe(statsPath);
@@ -22105,8 +22506,9 @@ function filterEventsByScope(events, opts) {
   return events;
 }
 async function reportUsageToTeam(repoPath, username, options) {
-  const selfConfig = options?.selfConfig;
-  const selfMode = selfConfig?.repo.kind === "self";
+  const reportsConfig = options?.selfConfig;
+  const useReportsBranch = !!reportsConfig && usesReportsBranch(reportsConfig);
+  let restoreStats;
   try {
     const events = await readUsageEvents();
     const filesToPush = [];
@@ -22136,19 +22538,19 @@ async function reportUsageToTeam(repoPath, username, options) {
     const hasPromptTokens = hasPromptTokenDelta(promptTokenDelta);
     const hasDaily = hasDailyDelta(dailyDelta);
     let writeRoot = repoPath;
-    if (selfMode && selfConfig) {
+    if (useReportsBranch && reportsConfig) {
       const { ensureReportsWorktree: ensureReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-      writeRoot = await ensureReportsWorktree2(selfConfig);
+      writeRoot = await ensureReportsWorktree2(reportsConfig);
     } else {
       const git = createGit2(repoPath);
       if (!await isDedicatedRepoRoot(repoPath)) {
         log.debug(`Skipping report: ${repoPath} is not a dedicated team-repo root (safety guard)`);
-        return;
+        return false;
       }
       const { isImportInProgress: isImportInProgress2 } = await Promise.resolve().then(() => (init_import_lock(), import_lock_exports));
       if (await isImportInProgress2(repoPath)) {
         log.debug(`Skipping report: import in progress for ${repoPath} (would reset uncommitted artifacts)`);
-        return;
+        return false;
       }
       const yamlPath = path64.join(repoPath, "teamai.yaml");
       const workingContent = await readFileSafe(yamlPath);
@@ -22168,6 +22570,10 @@ async function reportUsageToTeam(repoPath, username, options) {
       await ensureDir(statsDir);
       const statsPath = path64.join(statsDir, `${username}.yaml`);
       const existing = await readExistingStats(statsPath);
+      if (useReportsBranch) {
+        const previousContent = await readFileSafe(statsPath);
+        restoreStats = () => writeFile(statsPath, previousContent ?? "");
+      }
       const newStats = hasUsage ? aggregateUsage(events) : [];
       const merged = mergeStats(existing, username, newStats);
       if (hasInterventions) {
@@ -22197,23 +22603,20 @@ async function reportUsageToTeam(repoPath, username, options) {
     }
     if (filesToPush.length === 0) {
       log.debug("No usage events or votes to report");
-      return;
+      return true;
     }
     const commitMsg = hasUsage ? `[teamai] Update usage stats for ${username}` : hasInterventions || hasPromptTokens || hasDaily ? `[teamai] Update session stats for ${username}` : `[teamai] Update votes for ${username}`;
-    if (selfMode && selfConfig) {
+    if (useReportsBranch && reportsConfig) {
       const { commitAndPushReports: commitAndPushReports2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-      await withTimeout(
-        commitAndPushReports2(selfConfig, commitMsg, filesToPush),
-        5e3,
-        "Auto-report timeout (5s)"
-      );
+      if (!await commitAndPushReports2(reportsConfig, commitMsg, filesToPush, { pushIfUnchanged: true })) {
+        log.debug("Auto-report push was not confirmed; keeping local report data");
+        await restoreStats?.();
+        return false;
+      }
     } else {
-      await withTimeout(
-        pushRepoDirectly(repoPath, commitMsg, filesToPush),
-        5e3,
-        "Auto-report timeout (5s)"
-      );
+      await pushRepoDirectly(repoPath, commitMsg, filesToPush);
     }
+    restoreStats = void 0;
     if (hasUsage && !options?.skipTruncate) {
       await truncateUsageAfterReport(events.length);
       log.debug(`Reported ${events.length} usage events to team repo`);
@@ -22238,8 +22641,15 @@ async function reportUsageToTeam(repoPath, username, options) {
     if (!hasUsage && !hasInterventions && !hasPromptTokens && !hasDaily) {
       log.debug("Pushed pending votes to team repo");
     }
+    return true;
   } catch (e) {
+    try {
+      await restoreStats?.();
+    } catch (restoreError) {
+      log.error(`Could not restore report stats after failure: ${restoreError.message}`);
+    }
     log.error(`Auto-report skipped: ${e.message}`);
+    return false;
   }
 }
 var init_team_push = __esm({
@@ -22249,7 +22659,6 @@ var init_team_push = __esm({
     init_stats();
     init_dashboard_collector();
     init_git2();
-    init_async();
     init_fs();
     init_logger();
     init_types();
@@ -22693,11 +23102,6 @@ async function pullForScope(localConfig, options, policy = {}) {
   const scopeLabel = localConfig.scope;
   const revisionField = policy.revisionField ?? "lastPullRev";
   const targetsField = revisionField === "lastPullRev" ? "lastPullTargets" : "lastInheritedPullTargets";
-  const teamConfig = await loadTeamConfig(localConfig.repo.localPath);
-  if (!teamConfig) {
-    log.warn(`[${scopeLabel}] Team config (teamai.yaml) not found. Skipping.`);
-    return;
-  }
   const pullSpin = spinner(`[${scopeLabel}] Pulling team repo...`).start();
   let currentRev = null;
   let reportingOnly = false;
@@ -22714,39 +23118,39 @@ async function pullForScope(localConfig, options, policy = {}) {
     pullSpin.fail(`[${scopeLabel}] Pull failed: ${e.message}`);
     return;
   }
+  const freshConfig = await loadTeamConfig(localConfig.repo.localPath);
+  if (!freshConfig) {
+    log.warn(`[${scopeLabel}] Team config (teamai.yaml) not found. Skipping.`);
+    return;
+  }
   let currentTargets = null;
   if (!options.force && !options.dryRun && !submodulesChanged) {
     try {
       const state = await loadStateForScope(localConfig);
       if (currentRev && state[revisionField] && state[revisionField] === currentRev) {
-        currentTargets = await getInstalledResourceTargets(teamConfig, localConfig);
+        currentTargets = await getInstalledResourceTargets(freshConfig, localConfig);
         const previousTargets = state[targetsField];
         const syncedTargets = new Set(previousTargets ?? []);
         const targetSetMatches = previousTargets !== void 0 && previousTargets.length === currentTargets.length && currentTargets.every((target) => syncedTargets.has(target));
         if (targetSetMatches) {
           log.success(`[${scopeLabel}] Already synced at ${currentRev}, skipping`);
-          if (!options.dryRun) {
-            const cfg = await loadTeamConfig(localConfig.repo.localPath);
-            if (cfg) {
-              const skipRecall = !isRecallEnabled(localConfig, cfg);
-              try {
-                const { deployBuiltinAgents: deployBuiltinAgents2 } = await Promise.resolve().then(() => (init_builtin_agents(), builtin_agents_exports));
-                await deployBuiltinAgents2(cfg, localConfig, { skipRecall });
-              } catch {
-              }
-              try {
-                const { deployBuiltinRules: deployBuiltinRules2 } = await Promise.resolve().then(() => (init_builtin_rules(), builtin_rules_exports));
-                await deployBuiltinRules2(cfg, localConfig, { skipRecall });
-              } catch {
-              }
-              try {
-                const { deployBuiltinSkills: deployBuiltinSkills2 } = await Promise.resolve().then(() => (init_builtin_skills(), builtin_skills_exports));
-                await deployBuiltinSkills2(cfg, localConfig, { reportingOnly, skipRecall });
-              } catch {
-              }
-              await injectRecallBlockIntoTools(cfg, localConfig, scopeLabel);
-            }
+          const skipRecall = !isRecallEnabled(localConfig, freshConfig);
+          try {
+            const { deployBuiltinAgents: deployBuiltinAgents2 } = await Promise.resolve().then(() => (init_builtin_agents(), builtin_agents_exports));
+            await deployBuiltinAgents2(freshConfig, localConfig, { skipRecall });
+          } catch {
+          }
+          try {
+            const { deployBuiltinRules: deployBuiltinRules2 } = await Promise.resolve().then(() => (init_builtin_rules(), builtin_rules_exports));
+            await deployBuiltinRules2(freshConfig, localConfig, { skipRecall });
+          } catch {
+          }
+          try {
+            const { deployBuiltinSkills: deployBuiltinSkills2 } = await Promise.resolve().then(() => (init_builtin_skills(), builtin_skills_exports));
+            await deployBuiltinSkills2(freshConfig, localConfig, { reportingOnly, skipRecall });
+          } catch {
           }
+          await injectRecallBlockIntoTools(freshConfig, localConfig, scopeLabel);
           return;
         }
         log.debug(`[${scopeLabel}] Repo unchanged; resource target set changed, syncing`);
@@ -22755,11 +23159,6 @@ async function pullForScope(localConfig, options, policy = {}) {
       log.debug(`[${scopeLabel}] Rev check failed, proceeding with full sync`);
     }
   }
-  const freshConfig = await loadTeamConfig(localConfig.repo.localPath);
-  if (!freshConfig) {
-    log.warn(`[${scopeLabel}] Team config disappeared after pull. Skipping.`);
-    return;
-  }
   let roleContext = null;
   try {
     roleContext = await buildRolePullContext(localConfig);
@@ -22962,21 +23361,29 @@ async function pullForScope(localConfig, options, policy = {}) {
   if (totalSynced === 0) {
     log.info(`[${scopeLabel}] No resources to sync`);
   }
+  let reportsReadRoot;
+  const resolveReportsReadRoot = () => {
+    reportsReadRoot ??= (async () => {
+      if (!usesReportsBranch(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 {
       const learningsRepoDir = path66.join(localConfig.repo.localPath, "learnings");
       const docsRepoDir = path66.join(localConfig.repo.localPath, "docs");
       const rulesRepoDir = path66.join(localConfig.repo.localPath, "rules");
       const skillsRepoDir = path66.join(localConfig.repo.localPath, "skills");
-      let votesDir = path66.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 = path66.join(await ensureReportsWorktree2(localConfig), "votes");
-        } catch (e) {
-          log.debug(`[self] reports worktree for votes unavailable: ${e.message}`);
-        }
-      }
+      const reportsRoot = await resolveReportsReadRoot();
+      const votesDir = reportsRoot ? path66.join(reportsRoot, "votes") : void 0;
       const activeLearningsNamespaces = roleContext?.activeNamespaces.learnings ?? [];
       const countLearnings = async (baseDir) => {
         let n = (await listFiles(baseDir)).filter((f) => f.endsWith(".md")).length;
@@ -23010,7 +23417,7 @@ async function pullForScope(localConfig, options, policy = {}) {
       const repoCodebaseDir = path66.join(localConfig.repo.localPath, "docs", "team-codebase");
       const effectiveCodebaseDir = await pathExists(repoCodebaseDir) ? repoCodebaseDir : void 0;
       if (hasAnySource || effectiveCodebaseDir) {
-        const votesExist = await pathExists(votesDir);
+        const votesExist = votesDir ? await pathExists(votesDir) : false;
         const teamaiHome = getDataHome(localConfig);
         const indexPath = path66.join(teamaiHome, "search-index.json");
         const { buildIndex: buildIndex2 } = await Promise.resolve().then(() => (init_search_index(), search_index_exports));
@@ -23156,16 +23563,9 @@ async function pullForScope(localConfig, options, policy = {}) {
       const YAML25 = (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));
-      let statsDir = path66.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 = path66.join(await ensureReportsWorktree2(localConfig), "stats");
-        } catch (e) {
-          log.debug(`[self] reports worktree for stats unavailable: ${e.message}`);
-        }
-      }
-      const files = await listFiles2(statsDir);
+      const reportsRoot = await resolveReportsReadRoot();
+      const statsDir = reportsRoot ? path66.join(reportsRoot, "stats") : void 0;
+      const files = statsDir ? await listFiles2(statsDir) : [];
       const teamStats = [];
       for (const file of files) {
         if (!file.endsWith(".yaml")) continue;
@@ -23394,6 +23794,7 @@ async function pull(options) {
   const needsHookMigration = await legacyHooksNeedReinject().catch(() => false);
   const contended = /* @__PURE__ */ new Set();
   const heldLocks = /* @__PURE__ */ new Map();
+  let usageReport;
   const lockScope = async (config) => {
     if (config.repo.kind === "http") return true;
     const lock = path66.join(getDataHome(config), SYNC_LOCK_FILENAME);
@@ -23469,49 +23870,62 @@ async function pull(options) {
     await reconcileHooksAllScopes(reconcileUser, reconcileProject, options);
     await reconcileMcpAllScopes(reconcileUser, reconcileProject, options);
     await reconcileCoAuthorAllScopes(reconcileUser, reconcileProject, options);
-    if (!options.dryRun) {
-      try {
-        const { reportUsageToTeam: reportUsageToTeam2 } = await Promise.resolve().then(() => (init_team_push(), team_push_exports));
-        const { truncateUsageAfterReport: truncateUsageAfterReport2, readUsageEvents: readUsageEvents2 } = await Promise.resolve().then(() => (init_usage_tracker(), usage_tracker_exports));
-        const targets = [];
-        if (reconcileProject && reconcileProject.repo.kind !== "http" && !await usageReportDisabled(reconcileProject.repo.localPath)) {
-          targets.push({
-            repoPath: reconcileProject.repo.localPath,
-            username: reconcileProject.username,
-            opts: {
-              skipTruncate: true,
-              projectRoot: reconcileProject.projectRoot,
-              // Self mode routes stats/votes to the teamai-reports orphan branch.
-              ...reconcileProject.repo.kind === "self" ? { selfConfig: reconcileProject } : {}
-            }
-          });
-        }
-        if (reconcileUser && reconcileUser.repo.kind !== "http" && !await usageReportDisabled(reconcileUser.repo.localPath)) {
-          targets.push({
-            repoPath: reconcileUser.repo.localPath,
-            username: reconcileUser.username,
-            opts: {
-              skipTruncate: true,
-              excludeProjectRoots: projectConfig?.projectRoot ? [projectConfig.projectRoot] : [],
-              // Self mode routes stats/votes to the teamai-reports orphan branch —
-              // never reset/pull the business repo working tree.
-              ...reconcileUser.repo.kind === "self" ? { selfConfig: reconcileUser } : {}
+    if (!options.dryRun && !pendingUsageReport) {
+      pendingUsageReport = (async () => {
+        try {
+          const { reportUsageToTeam: reportUsageToTeam2 } = await Promise.resolve().then(() => (init_team_push(), team_push_exports));
+          const { truncateUsageAfterReport: truncateUsageAfterReport2, readUsageEvents: readUsageEvents2 } = await Promise.resolve().then(() => (init_usage_tracker(), usage_tracker_exports));
+          const targets = [];
+          if (reconcileProject && reconcileProject.repo.kind !== "http" && !await usageReportDisabled(reconcileProject.repo.localPath)) {
+            targets.push({
+              repoPath: reconcileProject.repo.localPath,
+              username: reconcileProject.username,
+              opts: {
+                skipTruncate: true,
+                projectRoot: reconcileProject.projectRoot,
+                // Non-HTTP repos route stats/votes to the teamai-reports orphan branch.
+                selfConfig: reconcileProject
+              }
+            });
+          }
+          if (reconcileUser && reconcileUser.repo.kind !== "http" && !await usageReportDisabled(reconcileUser.repo.localPath)) {
+            targets.push({
+              repoPath: reconcileUser.repo.localPath,
+              username: reconcileUser.username,
+              opts: {
+                skipTruncate: true,
+                excludeProjectRoots: projectConfig?.projectRoot ? [projectConfig.projectRoot] : [],
+                // Non-HTTP repos route stats/votes to the teamai-reports orphan branch —
+                // never reset/pull the default branch (or, in self mode, the business tree).
+                selfConfig: reconcileUser
+              }
+            });
+          }
+          const eventCount = (await readUsageEvents2()).length;
+          let allReported = true;
+          for (const t of targets) {
+            try {
+              const reported = await reportUsageToTeam2(t.repoPath, t.username, t.opts);
+              if (!reported) allReported = false;
+            } catch (e) {
+              allReported = false;
+              log.error(`Auto-report to ${t.repoPath} skipped: ${e.message}`);
             }
-          });
-        }
-        const eventCount = (await readUsageEvents2()).length;
-        for (const t of targets) {
-          try {
-            await reportUsageToTeam2(t.repoPath, t.username, t.opts);
-          } catch (e) {
-            log.error(`Auto-report to ${t.repoPath} skipped: ${e.message}`);
           }
+          if (allReported && eventCount > 0 && targets.length > 0) {
+            await truncateUsageAfterReport2(eventCount);
+          }
+        } catch (e) {
+          log.debug(`Auto-report skipped: ${e.message}`);
         }
-        if (eventCount > 0 && targets.length > 0) {
-          await truncateUsageAfterReport2(eventCount);
-        }
+      })().finally(() => {
+        pendingUsageReport = void 0;
+      });
+      usageReport = pendingUsageReport;
+      try {
+        await withTimeout(pendingUsageReport, 5e3, "Auto-report is still running after 5s");
       } catch (e) {
-        log.debug(`Auto-report skipped: ${e.message}`);
+        log.debug(e.message);
       }
     }
     const sourceConfig = reconcileProject ?? reconcileUser;
@@ -23524,8 +23938,15 @@ async function pull(options) {
       }
     }
   } finally {
-    for (const lock of heldLocks.values()) {
-      await releaseLock(lock);
+    const releaseSyncLocks = async () => {
+      for (const lock of heldLocks.values()) await releaseLock(lock);
+    };
+    if (usageReport && usageReport === pendingUsageReport) {
+      void usageReport.then(releaseSyncLocks, releaseSyncLocks).catch((e) => {
+        log.error(`Could not release report sync locks: ${e.message}`);
+      });
+    } else {
+      await releaseSyncLocks();
     }
   }
 }
@@ -23600,7 +24021,7 @@ async function reconcileCoAuthorAllScopes(userConfig, projectConfig, options) {
     }
   }
 }
-var CONTRIBUTORS_FILE2;
+var pendingUsageReport, CONTRIBUTORS_FILE2;
 var init_pull = __esm({
   "src/pull.ts"() {
     "use strict";
@@ -23621,6 +24042,7 @@ var init_pull = __esm({
     init_home();
     init_update();
     init_learnings_mirror();
+    init_async();
     CONTRIBUTORS_FILE2 = "CONTRIBUTORS";
   }
 });
@@ -25120,21 +25542,22 @@ async function projectsSet(ids, _options) {
 }
 async function projectsMembers(projectId, _options) {
   const { localConfig } = await autoDetectInit();
-  let repoPath;
-  if (localConfig.repo.kind === "self") {
+  const knowledgePath = localConfig.repo.localPath;
+  let membersRoot = knowledgePath;
+  const { usesReportsBranch: usesReportsBranch2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+  if (usesReportsBranch2(localConfig)) {
     const { ensureReportsWorktree: ensureReportsWorktree2, refreshReportsWorktree: refreshReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-    await refreshReportsWorktree2(localConfig);
-    repoPath = await ensureReportsWorktree2(localConfig);
+    await refreshReportsWorktree2(localConfig, { pushIfCreated: false });
+    membersRoot = await ensureReportsWorktree2(localConfig, { pushIfCreated: false });
   } else {
-    repoPath = localConfig.repo.localPath;
-    await pullRepo(repoPath).catch(() => {
+    await pullRepo(knowledgePath).catch(() => {
     });
   }
-  const manifest = await loadProjectsManifest(repoPath);
+  const manifest = await loadProjectsManifest(knowledgePath);
   if (manifest && !listProjectIds(manifest).includes(projectId)) {
     log.warn(`Project "${projectId}" is not defined in manifest/projects.yaml.`);
   }
-  const membersDir = path72.join(repoPath, "members");
+  const membersDir = path72.join(membersRoot, "members");
   const files = (await listFiles(membersDir)).filter((f) => f.endsWith(".yaml") || f.endsWith(".yml"));
   const members = [];
   for (const file of files) {
@@ -25513,8 +25936,8 @@ async function discoverToolResources(tool, toolPath, baseDir, teamSkillNames, te
     const agentsDir = path74.join(baseDir, toolPath.agents);
     if (await pathExists(agentsDir)) {
       for (const file of await listFiles(agentsDir)) {
-        if (!file.endsWith(".md") && !file.endsWith(".toml")) continue;
-        const name = path74.basename(file).replace(/\.(md|toml)$/, "");
+        if (!file.endsWith(".md") && !file.endsWith(".toml") && !file.endsWith(".json")) continue;
+        const name = path74.basename(file).replace(/\.(md|toml|json)$/, "");
         if (!teamAgentNames.has(name) && !BUILTIN_AGENT_NAMES.has(name)) continue;
         res.agentFiles.push(path74.join(agentsDir, file));
       }
@@ -26209,7 +26632,8 @@ async function hooksList(_options) {
     for (const d of teamDefs) {
       const matcher = d.matcher ? ` [${d.matcher}]` : "";
       const tools = d.tools && d.tools.length > 0 ? d.tools.join(",") : "all";
-      console.log(`  [${d.key}] ${d.event}${matcher}  \u2192  ${d.command}  (tools: ${tools})`);
+      const roles = d.roles ? `, roles: ${d.roles.length > 0 ? d.roles.join(",") : "nobody"}` : "";
+      console.log(`  [${d.key}] ${d.event}${matcher}  \u2192  ${d.command}  (tools: ${tools}${roles})`);
     }
   }
   console.log("");
@@ -26269,6 +26693,7 @@ async function mcpList(_options) {
     console.log(`  ${s.name}  [${s.transport}]`);
     if (s.description) console.log(`    ${s.description}`);
     console.log(`    endpoint: ${endpoint}`);
+    if (s.roles) console.log(`    roles:    ${s.roles.length > 0 ? s.roles.join(", ") : "nobody"}`);
     const needed = referencedVars(s);
     if (needed.length > 0) {
       const missing = needed.filter((v) => !vars[v]);
@@ -26539,7 +26964,7 @@ async function saveSession(options) {
     log.info(`[dry-run] Would push session summary to sessions/${username}/${monthKey(summary)}.md`);
     return;
   }
-  if (localConfig.repo.kind === "self") {
+  if (usesReportsBranch(localConfig)) {
     const spin2 = spinner("Pushing session summary to team...").start();
     try {
       const { ensureReportsWorktree: ensureReportsWorktree2, commitAndPushReports: commitAndPushReports2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
@@ -28670,9 +29095,10 @@ async function resolveVizRoot(opts) {
   }
   const config = await detectProjectConfig() ?? await loadLocalConfig();
   if (config?.repo?.localPath) {
-    if (config.repo.kind === "self") {
+    const { usesReportsBranch: usesReportsBranch2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+    if (usesReportsBranch2(config)) {
       const { ensureReportsWorktree: ensureReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-      await ensureReportsWorktree2(config);
+      await ensureReportsWorktree2(config, { pushIfCreated: false });
     }
     const knowledgeRoot = getKnowledgeDir(config);
     const reportsRoot = getReportsDir(config);
@@ -30439,6 +30865,17 @@ var init_mr_hint = __esm({
 
 // src/hook-handlers.ts
 import path92 from "path";
+async function teamCorrectionKeywords(stdin) {
+  if (typeof stdin.prompt !== "string") return [];
+  try {
+    const { autoDetectInit: autoDetectInit2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+    const { getInterventionSharing: getInterventionSharing2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+    const { teamConfig } = await autoDetectInit2();
+    return getInterventionSharing2(teamConfig).correctionKeywords;
+  } catch {
+    return [];
+  }
+}
 async function contributeHintAllowed() {
   const { isContributeHintEnabled: isContributeHintEnabled2 } = await Promise.resolve().then(() => (init_types(), types_exports));
   try {
@@ -30539,7 +30976,7 @@ var init_hook_handlers = __esm({
       async execute(stdin, tool) {
         const { parseHookEvent: parseHookEvent2, appendEvent: appendEvent2, compactEvents: compactEvents2 } = await Promise.resolve().then(() => (init_dashboard_collector(), dashboard_collector_exports));
         const raw = JSON.stringify(stdin);
-        const event = await parseHookEvent2(raw, tool);
+        const event = await parseHookEvent2(raw, tool, { correctionKeywords: await teamCorrectionKeywords(stdin) });
         if (event) {
           await appendEvent2(event);
           compactEvents2().catch(() => {
@@ -30664,7 +31101,8 @@ var init_hook_handlers = __esm({
           if (verifiedDocIds.length > 0) {
             await incrementUpvoted2(votePath, verifiedDocIds);
           }
-          if (localConfig.repo.kind === "self") {
+          const { usesReportsBranch: usesReportsBranch2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+          if (usesReportsBranch2(localConfig)) {
             try {
               const { ensureReportsWorktree: ensureReportsWorktree2, commitAndPushReports: commitAndPushReports2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
               const wt = await ensureReportsWorktree2(localConfig);
@@ -30767,7 +31205,8 @@ var init_hook_handlers = __esm({
 // src/hook-dispatch-cli.ts
 var hook_dispatch_cli_exports = {};
 __export(hook_dispatch_cli_exports, {
-  hookDispatchCli: () => hookDispatchCli
+  hookDispatchCli: () => hookDispatchCli,
+  parseStdin: () => parseStdin
 });
 import { spawn as spawn3 } from "child_process";
 async function readStdin4() {
@@ -30828,10 +31267,15 @@ function parseStdin(raw, event) {
     try {
       stdin = JSON.parse(raw);
     } catch {
-      log.debug(`hook-dispatch: failed to parse STDIN JSON for event=${event}`);
-      return null;
+      const preview = raw.length > 160 ? `${raw.slice(0, 80)}...${raw.slice(-80)}` : raw;
+      log.debug(
+        `hook-dispatch: failed to parse STDIN JSON for event=${event} (len=${raw.length}, body=${JSON.stringify(preview)})`
+      );
     }
   }
+  if (!stdin || typeof stdin !== "object" || Array.isArray(stdin)) {
+    stdin = {};
+  }
   if (!stdin.hook_event_name) {
     const EVENT_MAP2 = {
       "session-start": "SessionStart",
@@ -30857,7 +31301,6 @@ async function hookDispatchCli(event, tool, matcher, bgOnly = false) {
   try {
     const raw = await readStdin4();
     const stdin = parseStdin(raw, event);
-    if (stdin === null) return;
     const { loadLocalConfig: loadLocalConfig4, detectProjectConfig: detectProjectConfig2 } = await Promise.resolve().then(() => (init_config(), config_exports));
     const cwd = resolveHookCwd(stdin);
     if (cwd) {
@@ -30925,7 +31368,8 @@ async function rebuildIndexAfterContribute(localConfig) {
   const docsRepoDir = path93.join(repoPath, "docs");
   const rulesRepoDir = path93.join(repoPath, "rules");
   const skillsRepoDir = path93.join(repoPath, "skills");
-  const votesDir = path93.join(repoPath, "votes");
+  const { getReportsDir: getReportsDir2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+  const votesDir = path93.join(getReportsDir2(localConfig), "votes");
   let effectiveLearningsDir;
   const activeLearningsNamespaces = await resolveActiveLearningsNamespaces(
     repoPath,
@@ -31075,7 +31519,7 @@ async function contributeSelf(localConfig, content, options) {
         let votesDir;
         try {
           const { ensureReportsWorktree: ensureReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
-          const candidate = path93.join(await ensureReportsWorktree2(localConfig), "votes");
+          const candidate = path93.join(await ensureReportsWorktree2(localConfig, { pushIfCreated: false }), "votes");
           if (await pathExists3(candidate)) votesDir = candidate;
         } catch {
         }
@@ -42412,7 +42856,7 @@ var init_extract_mr = __esm({
 // src/maintenance/paths.ts
 import path130 from "path";
 async function resolveMaintenancePaths(localConfig) {
-  if (isSelfMode(localConfig)) {
+  if (usesReportsBranch(localConfig)) {
     const { refreshReportsWorktree: refreshReportsWorktree2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
     await refreshReportsWorktree2(localConfig, { pushIfCreated: false });
   }