teamai-cli 0.23.0-beta.1 → 0.23.0-beta.3

package/README.md

@@ -11,7 +11,7 @@
 [![npm downloads](https://img.shields.io/npm/dm/teamai-cli.svg)](https://www.npmjs.com/package/teamai-cli)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-TeamAI manages your team's skills, rules, MCP, and knowledge across Claude Code, Codex, CodeBuddy, WorkBuddy, OpenCode, Cursor, and other AI agents.
+TeamAI manages your team's skills, rules, MCP, and knowledge across Claude Code, Codex, CodeBuddy, WorkBuddy, OpenCode, Cursor, Qoder, and other AI agents.
 
 ## Quick Start
 
@@ -74,6 +74,7 @@ Once initialized, every AI session automatically pulls the latest skills / rules
     <tr><td>Claude Code</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>Codex</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>Cursor</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
+    <tr><td>Qoder</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>CodeBuddy</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>OpenCode</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">—</td><td align="center">—</td><td align="center">—</td></tr>
     <tr><td>WorkBuddy</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">—</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>

package/README.zh-CN.md

@@ -11,7 +11,7 @@
 [![npm downloads](https://img.shields.io/npm/dm/teamai-cli.svg)](https://www.npmjs.com/package/teamai-cli)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-TeamAI 统一管理团队的 Skills、Rules、MCP 和知识，驾驭 Claude Code、Codex、CodeBuddy、WorkBuddy、OpenCode、Cursor 等 AI Agents。
+TeamAI 统一管理团队的 Skills、Rules、MCP 和知识，驾驭 Claude Code、Codex、CodeBuddy、WorkBuddy、OpenCode、Cursor、Qoder 等 AI Agents。
 
 ## 快速开始
 
@@ -74,6 +74,7 @@ teamai init https://github.com/yourorg/yourrepo --scope user
     <tr><td>Claude Code</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>Codex</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>Cursor</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
+    <tr><td>Qoder</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>CodeBuddy</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>
     <tr><td>OpenCode</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">—</td><td align="center">—</td><td align="center">—</td></tr>
     <tr><td>WorkBuddy</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">—</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td><td align="center">✓</td></tr>

package/dist/index.js

@@ -536,6 +536,20 @@ var init_types = __esm({
         tclaude: { skills: ".tclaude/skills", rules: ".tclaude/rules", settings: ".tclaude/settings.json", claudemd: ".tclaude/CLAUDE.md", agents: ".tclaude/agents", mcp: ".tclaude/.claude.json" },
         tcodex: { skills: ".tcodex/skills", rules: ".tcodex/rules", settings: ".tcodex/hooks.json", agents: ".tcodex/agents" },
         cursor: { skills: ".cursor/skills", rules: ".cursor/rules", settings: ".cursor/hooks.json", agents: ".cursor/agents", mcp: ".cursor/mcp.json", mcpProject: ".cursor/mcp.json" },
+        // JoyCode: skills, rules (.mdc), and subagents are synced to .joycode/.
+        // JoyCode currently does not provide a lifecycle hooks system or startup
+        // adapter, so it intentionally has no `settings` path. Hook reconciliation
+        // skips JoyCode cleanly without generating ghost files; users must sync
+        // manually via `teamai pull`.
+        joycode: { skills: ".joycode/skills", rules: ".joycode/rules", agents: ".joycode/agents" },
+        qoder: {
+          skills: ".qoder/skills",
+          rules: ".qoder/rules",
+          settings: ".qoder/settings.json",
+          agents: ".qoder/agents",
+          mcp: ".qoder/settings.json",
+          mcpProject: ".qoder/settings.json"
+        },
         codebuddy: { skills: ".codebuddy/skills", rules: ".codebuddy/rules", settings: ".codebuddy/settings.json", claudemd: ".codebuddy/CODEBUDDY.md", agents: ".codebuddy/agents", mcp: ".codebuddy/mcp.json", mcpProject: ".codebuddy/mcp.json" },
         openclaw: { skills: ".openclaw/skills", rules: ".openclaw/rules", claudemd: ".openclaw/workspace/AGENTS.md" },
         hermes: { skills: ".hermes/skills", claudemd: "AGENTS.md" },
@@ -1202,10 +1216,10 @@ var init_base = __esm({
 
 // src/resources/rule-format.ts
 function ruleFileExtensionForTool(tool) {
-  return tool === "cursor" ? ".mdc" : ".md";
+  return usesCursorMdcRules(tool) ? ".mdc" : ".md";
 }
 function usesCursorMdcRules(tool) {
-  return tool === "cursor";
+  return CURSOR_MDC_RULE_TOOLS.has(tool);
 }
 function ruleStemFromFilename(filename) {
   if (filename.endsWith(".mdc")) return filename.slice(0, -".mdc".length);
@@ -1215,9 +1229,11 @@ function ruleStemFromFilename(filename) {
 function isLegacyCursorRuleFile(tool, filename) {
   return usesCursorMdcRules(tool) && filename.endsWith(".md");
 }
+var CURSOR_MDC_RULE_TOOLS;
 var init_rule_format = __esm({
   "src/resources/rule-format.ts"() {
     "use strict";
+    CURSOR_MDC_RULE_TOOLS = /* @__PURE__ */ new Set(["cursor", "joycode"]);
   }
 });
 
@@ -1446,7 +1462,7 @@ async function syncRulesToLocal(teamConfig, localConfig, repoPath, baseDir, last
     const rulesDir = path6.join(baseDir, toolPath.rules);
     if (!await pathExists(rulesDir)) continue;
     const ext = ruleFileExtensionForTool(tool);
-    const isCursor = usesCursorMdcRules(tool);
+    const isMdcTool = usesCursorMdcRules(tool);
     const files = await listFilesRecursive(rulesDir);
     for (const file of files) {
       if (!file.endsWith(ext)) continue;
@@ -1456,7 +1472,7 @@ async function syncRulesToLocal(teamConfig, localConfig, repoPath, baseDir, last
       const teamRelPath = `rules/${name}.md`;
       const teamFilePath = path6.join(teamRulesDir, `${name}.md`);
       if (!await pathExists(teamFilePath)) continue;
-      if (isCursor) {
+      if (isMdcTool) {
         const localRaw = await readFileSafe(localFilePath);
         const teamRaw = await readFileSafe(teamFilePath);
         if (localRaw === null || teamRaw === null) continue;
@@ -7405,7 +7421,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"]);
+    CLAUDE_TOOLS = /* @__PURE__ */ new Set(["claude", "claude-internal", "tclaude", "qoder"]);
     CURSOR_TOOLS2 = /* @__PURE__ */ new Set(["cursor"]);
     CODEX_TOOLS2 = /* @__PURE__ */ new Set(["codex", "codex-internal", "tcodex"]);
     BUDDY_TOOLS = /* @__PURE__ */ new Set(["codebuddy", "workbuddy"]);
@@ -10956,7 +10972,7 @@ var init_rules = __esm({
           const rulesDir = path29.join(resolveBaseDir(localConfig), rulesPath);
           if (!await pathExists(rulesDir)) continue;
           const ext = ruleFileExtensionForTool(tool);
-          const isCursor = usesCursorMdcRules(tool);
+          const isMdcTool = usesCursorMdcRules(tool);
           const files = await listFilesRecursive(rulesDir);
           for (const file of files) {
             if (!file.endsWith(ext)) continue;
@@ -10967,7 +10983,7 @@ var init_rules = __esm({
             const teamFileName = `${name}.md`;
             if (teamRules.has(teamFileName)) {
               const teamFilePath = path29.join(teamRulesDir, teamFileName);
-              const equal = isCursor ? cursorMdcBodyEqualsTeamMd(
+              const equal = isMdcTool ? cursorMdcBodyEqualsTeamMd(
                 await readFileSafe(localFilePath) ?? "",
                 await readTeamRule(teamFilePath)
               ) : await fileContentEqual(localFilePath, teamFilePath);
@@ -10978,7 +10994,7 @@ var init_rules = __esm({
                 candidates.set(name, { sourcePath: localFilePath, mtime, status: "modified" });
               }
             } else {
-              if (isCursor) continue;
+              if (isMdcTool) continue;
               const existing = candidates.get(name);
               if (!existing) {
                 const mtime = await getFileMtime(localFilePath);
@@ -11113,6 +11129,7 @@ var init_rules = __esm({
           await this.pullItem(rule, teamConfig, localConfig);
         }
         const teamRuleNames = new Set(rules.map((r) => r.name));
+        const tombstones = await this.readTombstones(localConfig);
         const baseDir = resolveBaseDir(localConfig);
         for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (!toolPath.rules) continue;
@@ -11124,6 +11141,7 @@ var init_rules = __esm({
           for (const localFile of localFiles) {
             const ruleName = ruleStemFromFilename(localFile);
             if (ruleName === null) continue;
+            if (tool === "joycode" && !tombstones.has(ruleName)) continue;
             if (isLegacyCursorRuleFile(tool, localFile)) {
               await remove(path29.join(destDir, localFile));
               log.debug(`Removed legacy .md rule ${localFile} from ${tool}`);
@@ -11551,6 +11569,12 @@ function renderForCodebuddy(spec) {
     content: renderMarkdownAgent(spec, spec.tool_extras?.["codebuddy"])
   };
 }
+function renderForJoycode(spec) {
+  return {
+    ext: agentFileExtensionForTool("joycode"),
+    content: renderMarkdownAgent(spec, spec.tool_extras?.["joycode"])
+  };
+}
 function renderForCodex(spec) {
   return {
     ext: agentFileExtensionForTool("codex"),
@@ -11669,6 +11693,15 @@ function reverseFromCodebuddy(filePath, content) {
   }
   return { ok: true, spec };
 }
+function reverseFromJoycode(filePath, content) {
+  const result = reverseFromClaude(filePath, content);
+  if (!result.ok) return result;
+  const spec = result.spec;
+  if (spec.tool_extras?.["claude"]) {
+    spec.tool_extras = { joycode: spec.tool_extras["claude"] };
+  }
+  return { ok: true, spec };
+}
 function reverseFromCodex(filePath, content) {
   let parsed;
   try {
@@ -11813,6 +11846,10 @@ function renderForTool(spec, tool) {
       return renderForCodex(spec);
     case "cursor":
       return renderForCursor(spec);
+    case "joycode":
+      return renderForJoycode(spec);
+    case "qoder":
+      return renderForClaude(spec);
     case "opencode":
       return renderForOpencode(spec);
   }
@@ -11830,6 +11867,8 @@ var init_agent_format = __esm({
       "codex-internal",
       "tcodex",
       "cursor",
+      "joycode",
+      "qoder",
       "opencode"
     ];
     COMMON_CLAUDE_FIELDS = /* @__PURE__ */ new Set(["name", "description", "model", "tools"]);
@@ -11953,6 +11992,49 @@ var init_builtin_agents = __esm({
 
 // src/resources/agents.ts
 import path34 from "path";
+import { isDeepStrictEqual } from "util";
+import { parse as parseYaml2 } from "yaml";
+function mergeCanonicalEdits(canonical, perTool) {
+  const merged = { ...canonical };
+  const extras = { ...canonical.tool_extras };
+  const changes = /* @__PURE__ */ new Map();
+  const conflicts = [];
+  const propose = (key, value, apply) => {
+    const previous = changes.get(key);
+    if (previous && !isDeepStrictEqual(previous.value, value)) {
+      conflicts.push({ field: key, values: { previous: previous.value, next: value } });
+    } else {
+      changes.set(key, { value, apply });
+    }
+  };
+  for (const [tool, edited] of Object.entries(perTool)) {
+    const rendered = renderForTool(canonical, tool);
+    const baseline = reverseByTool(tool, `${canonical.name}${rendered.ext}`, rendered.content);
+    if (!baseline.ok) return { ok: false, conflicts: [{ field: tool, values: { error: baseline.reason } }] };
+    for (const field of ["name", "description", "instructions", "model", "tools"]) {
+      if (isDeepStrictEqual(baseline.spec[field], edited[field])) continue;
+      propose(field, edited[field], () => {
+        const output = merged;
+        if (edited[field] === void 0) delete output[field];
+        else output[field] = edited[field];
+      });
+    }
+    const extrasKey = tool === "tclaude" ? "claude" : tool === "tcodex" ? "codex" : tool;
+    const before = Object.values(baseline.spec.tool_extras ?? {})[0] ?? {};
+    const after = Object.values(edited.tool_extras ?? {})[0] ?? {};
+    if (!isDeepStrictEqual(before, after)) {
+      propose(`tool_extras.${extrasKey}`, after, () => {
+        if (Object.keys(after).length) extras[extrasKey] = after;
+        else delete extras[extrasKey];
+      });
+    }
+  }
+  if (conflicts.length) return { ok: false, conflicts };
+  for (const change of changes.values()) change.apply();
+  if (Object.keys(extras).length) merged.tool_extras = extras;
+  else delete merged.tool_extras;
+  return { ok: true, spec: merged };
+}
 function getAgentStem(filename) {
   if (filename.endsWith(".md")) return filename.slice(0, -3);
   if (filename.endsWith(".toml")) return filename.slice(0, -5);
@@ -11986,6 +12068,10 @@ function reverseByTool(tool, filePath, content) {
       return reverseFromCodex(filePath, content);
     case "cursor":
       return reverseFromCursor(filePath, content);
+    case "joycode":
+      return reverseFromJoycode(filePath, content);
+    case "qoder":
+      return reverseFromClaude(filePath, content);
     case "opencode":
       return reverseFromOpencode(filePath, content);
   }
@@ -12070,8 +12156,36 @@ var init_agents = __esm({
           const teamMdPath = path34.join(teamAgentsDir, `${stem}.md`);
           const hasTeamYaml = await pathExists(teamYamlPath);
           const hasTeamMd = await pathExists(teamMdPath);
+          let canonicalSpec;
+          if (hasTeamYaml) {
+            const raw = await readFileSafe(teamYamlPath);
+            const parsed = raw === null ? null : parseAgentYaml(raw, `${stem}.yaml`);
+            if (!parsed?.ok) {
+              items.push({
+                name: stem,
+                type: "agents",
+                sourcePath: teamYamlPath,
+                relativePath: `agents/${stem}.yaml`,
+                status: "modified",
+                skipReason: "cannot read or parse canonical agent YAML"
+              });
+              continue;
+            }
+            canonicalSpec = { ...parseYaml2(raw), ...parsed.spec };
+            for (const [tool, filePath] of toolFiles) {
+              if (!isKnownTool(tool) || isAgentDisabled(localConfig, tool) || canonicalSpec.targets && !canonicalSpec.targets.includes(tool)) {
+                toolFiles.delete(tool);
+                continue;
+              }
+              if (await readFileSafe(filePath) === renderForTool(canonicalSpec, tool).content) {
+                toolFiles.delete(tool);
+              }
+            }
+          }
           let hasChange = false;
-          if (!hasTeamYaml && !hasTeamMd) {
+          if (hasTeamYaml) {
+            hasChange = toolFiles.size > 0;
+          } else if (!hasTeamMd) {
             hasChange = true;
           } else {
             for (const [tool, filePath] of toolFiles) {
@@ -12104,22 +12218,27 @@ var init_agents = __esm({
           for (const [tool, filePath] of toolFiles) {
             if (!isKnownTool(tool)) continue;
             const content = await readFileSafe(filePath);
-            if (!content) continue;
+            if (!content) {
+              if (canonicalSpec) skipReason = `cannot read edited agent file for ${tool}`;
+              continue;
+            }
             const result = reverseByTool(tool, filePath, content);
             if (result.ok) {
               perToolSpecs[tool] = result.spec;
             } else {
+              if (canonicalSpec) skipReason = `cannot parse edited agent file for ${tool}: ${result.reason}`;
               log.debug(`Reverse failed for ${stem} from ${tool}: ${result.reason}`);
             }
           }
-          if (Object.keys(perToolSpecs).length === 0) {
+          if (!skipReason && Object.keys(perToolSpecs).length === 0) {
             skipReason = `could not reverse-parse any tool's agent file for ${stem}`;
-          } else {
-            const mergeResult = mergeReverseResults(perToolSpecs);
+          } else if (!skipReason) {
+            const mergeResult = canonicalSpec ? mergeCanonicalEdits(canonicalSpec, perToolSpecs) : mergeReverseResults(perToolSpecs);
             if (!mergeResult.ok) {
               const conflictSummary = mergeResult.conflicts.map((c) => `${c.field}: ${JSON.stringify(c.values)}`).join("; ");
               skipReason = `conflicting values across tools \u2014 ${conflictSummary}`;
             } else {
+              if (canonicalSpec && isDeepStrictEqual(canonicalSpec, mergeResult.spec)) continue;
               items.push({
                 name: stem,
                 type: "agents",
@@ -12208,7 +12327,7 @@ var init_agents = __esm({
        * Pull an agent to every installed tool's agents/ directory.
        *
        * New format (.yaml): parses spec, respects spec.targets, renders per-tool native format.
-       * Legacy format (.md): copies .md as-is to claude/claude-internal/codebuddy only.
+       * Legacy format (.md): copies .md as-is to Claude-compatible tools.
        */
       async pullItem(item, teamConfig, localConfig) {
         const agentItem = item;
@@ -12287,10 +12406,10 @@ var init_agents = __esm({
       }
       // ─── Private helpers ──────────────────────────────────────────────────────
       /**
-       * Legacy pull: copies .md as-is to claude/claude-internal/codebuddy.
+       * Legacy pull: copies .md as-is to Claude-compatible tools, including JoyCode.
        */
       async pullLegacyMd(item, teamConfig, baseDir, localConfig) {
-        const legacyTools = /* @__PURE__ */ new Set(["claude", "claude-internal", "tclaude", "codebuddy"]);
+        const legacyTools = /* @__PURE__ */ new Set(["claude", "claude-internal", "tclaude", "codebuddy", "joycode"]);
         for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (!legacyTools.has(tool)) continue;
           if (!toolPath.agents) {
@@ -13071,7 +13190,7 @@ async function ensureReportsWorktree(localConfig, options = {}) {
     await writeWorktreeGitignore(wt);
     const wtGit = createGit2(wt);
     await wtGit.add([".gitignore"]);
-    await wtGit.commit("[teamai] Initialize reports branch");
+    await commitSkippingHooks(wtGit, "[teamai] Initialize reports branch");
     if (options.pushIfCreated !== false) {
       try {
         await wtGit.push(["-u", "origin", REPORTS_BRANCH]);
@@ -13134,7 +13253,7 @@ async function commitAndPushReports(localConfig, message, files) {
       log.debug("[reports] nothing to commit");
       return false;
     }
-    await git.commit(message);
+    await commitSkippingHooks(git, message);
     for (let attempt = 1; attempt <= MAX_PUSH_RETRIES; attempt++) {
       try {
         await git.push(["origin", REPORTS_BRANCH]);
@@ -13894,6 +14013,7 @@ __export(git_exports, {
   autoPushViaMR: () => autoPushViaMR,
   checkoutMaster: () => checkoutMaster,
   commitPaths: () => commitPaths,
+  commitSkippingHooks: () => commitSkippingHooks,
   configureGitUser: () => configureGitUser,
   createGit: () => createGit2,
   generateBranchName: () => generateBranchName,
@@ -13929,6 +14049,9 @@ function createGit2(basePath) {
   }
   return simpleGit();
 }
+function commitSkippingHooks(git, message) {
+  return git.commit(message, { "--no-verify": null });
+}
 async function isGitRepo(localPath) {
   if (!await fse9.pathExists(localPath)) {
     return false;
@@ -14198,7 +14321,7 @@ async function pushRepoBranch(localPath, message, files, branchName, opts = {})
     await leaveAndDeletePushBranch(git, defaultBranch, branchName);
     return false;
   }
-  await git.commit(message);
+  await commitSkippingHooks(git, message);
   if (opts.reuseBranch) {
     if (await treeMatchesRemoteBranch(git, branchName)) {
       log.debug(`Remote branch ${branchName} already holds this tree, skipping force-push`);
@@ -14503,7 +14626,7 @@ var init_known_agents = __esm({
     init_types();
     init_base();
     init_home();
-    SELF_MODE_AGENT_CHOICES = ["claude", "codex", "cursor", "codebuddy", "workbuddy"];
+    SELF_MODE_AGENT_CHOICES = ["claude", "codex", "cursor", "joycode", "codebuddy", "workbuddy"];
     KNOWN_AGENTS = [
       // Coding agents already wired through teamConfig.toolPaths defaults
       { id: "claude", displayName: "Claude Code", category: "coding", skillsPath: ".claude/skills" },
@@ -14513,6 +14636,7 @@ var init_known_agents = __esm({
       { id: "codex-internal", displayName: "Codex CLI Internal", category: "coding", skillsPath: ".codex-internal/skills" },
       { id: "tcodex", displayName: "TCodex", category: "coding", skillsPath: ".tcodex/skills" },
       { id: "cursor", displayName: "Cursor", category: "coding", skillsPath: ".cursor/skills" },
+      { id: "joycode", displayName: "JoyCode", category: "coding", skillsPath: ".joycode/skills" },
       { id: "codebuddy", displayName: "CodeBuddy", category: "coding", skillsPath: ".codebuddy/skills" },
       // Additional coding agents from skills-manage
       { id: "gemini", displayName: "Gemini CLI", category: "coding", skillsPath: ".gemini/skills" },
@@ -18456,14 +18580,6 @@ function filterEventsByScope(events, opts) {
 async function reportUsageToTeam(repoPath, username, options) {
   const selfConfig = options?.selfConfig;
   const selfMode = selfConfig?.repo.kind === "self";
-  const syncLock = selfMode ? null : path55.join(path55.dirname(repoPath), SYNC_LOCK_FILENAME);
-  if (syncLock) {
-    const locked = await acquireLock(syncLock);
-    if (!locked) {
-      log.debug("Skipping report: another pull/push holds the sync lock");
-      return;
-    }
-  }
   try {
     const events = await readUsageEvents();
     const filesToPush = [];
@@ -18583,8 +18699,6 @@ async function reportUsageToTeam(repoPath, username, options) {
     }
   } catch (e) {
     log.error(`Auto-report skipped: ${e.message}`);
-  } finally {
-    if (syncLock) await releaseLock(syncLock);
   }
 }
 var init_team_push = __esm({
@@ -18599,7 +18713,6 @@ var init_team_push = __esm({
     init_logger();
     init_types();
     init_home();
-    init_update();
   }
 });
 
@@ -18793,38 +18906,28 @@ async function refreshTeamRepo(localConfig) {
       await migrateSelfModeGitignore2(localConfig);
     } catch {
     }
-    let version2 = null;
+    let version3 = null;
     try {
-      version2 = await getHeadRev(localConfig.repo.localPath);
+      version3 = await getHeadRev(localConfig.repo.localPath);
     } catch {
-      version2 = null;
+      version3 = null;
     }
-    return { label: "single-repo (knowledge on main)", version: version2, reportingOnly: false };
+    return { label: "single-repo (knowledge on main)", version: version3, reportingOnly: false };
   }
-  const syncLock = path57.join(getDataHome(localConfig), SYNC_LOCK_FILENAME);
-  const locked = await acquireLock(syncLock);
-  if (!locked) {
-    log.debug("[pull] another pull/push holds the sync lock; skipping this scope");
-    return { label: "sync in progress elsewhere \u2014 skipped", version: null, reportingOnly: false, skipped: true };
+  const result = await pullRepo(localConfig.repo.localPath);
+  try {
+    await flushPendingLearnings(localConfig.repo.localPath, localConfig.username);
+  } catch (e) {
+    log.debug(`pending-learnings flush skipped: ${e.message}`);
   }
+  let version2 = null;
   try {
-    const result = await pullRepo(localConfig.repo.localPath);
-    try {
-      await flushPendingLearnings(localConfig.repo.localPath, localConfig.username);
-    } catch (e) {
-      log.debug(`pending-learnings flush skipped: ${e.message}`);
-    }
-    let version2 = null;
-    try {
-      version2 = await getHeadRev(localConfig.repo.localPath);
-    } catch {
-      log.debug("Rev check failed, proceeding with full sync");
-      version2 = null;
-    }
-    return { label: result, version: version2, reportingOnly: false };
-  } finally {
-    await releaseLock(syncLock);
+    version2 = await getHeadRev(localConfig.repo.localPath);
+  } catch {
+    log.debug("Rev check failed, proceeding with full sync");
+    version2 = null;
   }
+  return { label: result, version: version2, reportingOnly: false };
 }
 async function buildRolePullContext(localConfig) {
   if (!localConfig.primaryRole) return null;
@@ -18983,11 +19086,7 @@ async function pullForScope(localConfig, options, policy = {}) {
   let currentRev = null;
   let reportingOnly = false;
   try {
-    const { label, version: version2, reportingOnly: ro, skipped } = await refreshTeamRepo(localConfig);
-    if (skipped) {
-      pullSpin.succeed(`[${scopeLabel}] Team repo: ${label}`);
-      return;
-    }
+    const { label, version: version2, reportingOnly: ro } = await refreshTeamRepo(localConfig);
     currentRev = version2;
     reportingOnly = ro;
     pullSpin.succeed(`[${scopeLabel}] Team repo: ${label}`);
@@ -19618,18 +19717,21 @@ async function collectClaudemdFiles(repoPath, roleContext) {
   }
   return contents;
 }
-async function autoMigrateHooksIfNeeded() {
+async function legacyHooksNeedReinject() {
   const home = getUserHome();
   const primarySettings = path57.join(home, ".claude", "settings.json");
-  if (!await pathExists(primarySettings)) return;
+  if (!await pathExists(primarySettings)) return false;
   const content = await readFileSafe(primarySettings);
-  if (!content) return;
-  if (content.includes("hook-dispatch")) return;
-  if (!content.includes("teamai")) return;
+  if (!content) return false;
+  if (content.includes("hook-dispatch")) return false;
+  if (!content.includes("teamai")) return false;
+  return true;
+}
+async function reinjectLegacyHooks(localConfig) {
   log.debug("Auto-migrating hooks to dispatch format...");
-  const { autoDetectInit: autoDetectInit2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+  const teamConfig = await loadTeamConfig(localConfig.repo.localPath);
+  if (!teamConfig) return;
   const { injectHooksToAllTools: injectHooksToAllTools2 } = await Promise.resolve().then(() => (init_hooks2(), hooks_exports));
-  const { localConfig, teamConfig } = await autoDetectInit2();
   const { baseDir } = resolveHookScope(localConfig);
   const disabled = localConfig.disabledAgents;
   let hookFilter = localConfig.enabledAgents;
@@ -19641,108 +19743,141 @@ async function autoMigrateHooksIfNeeded() {
   log.debug("Hooks migrated to dispatch format");
 }
 async function pull(options) {
+  const needsHookMigration = await legacyHooksNeedReinject().catch(() => false);
+  const contended = /* @__PURE__ */ new Set();
+  const heldLocks = /* @__PURE__ */ new Map();
+  const lockScope = async (config) => {
+    if (config.repo.kind && config.repo.kind !== "git") return true;
+    const lock = path57.join(getDataHome(config), SYNC_LOCK_FILENAME);
+    if (await acquireLock(lock)) {
+      heldLocks.set(config, lock);
+      return true;
+    }
+    log.info(`[${config.scope}] sync in progress elsewhere \u2014 skipped (another pull/push holds the lock)`);
+    contended.add(config);
+    return false;
+  };
   try {
-    await autoMigrateHooksIfNeeded();
-  } catch {
-  }
-  let projectConfig = null;
-  try {
-    projectConfig = await detectProjectConfig();
-  } catch (e) {
-    log.warn(`Project-scope detection error: ${e.message}`);
-  }
-  const projectMode = projectConfig !== null;
-  const inheritUserScope = projectConfig?.inheritUserScope === true;
-  let activeUserConfig = null;
-  let inheritedUserConfig = null;
-  if (projectMode && !inheritUserScope) {
-    log.info("project scope detected, skipped user scope");
-  } else {
+    let projectConfig = null;
     try {
-      const loadedUserConfig = await loadLocalConfigForScope("user");
-      if (loadedUserConfig) {
-        if (inheritUserScope) {
-          inheritedUserConfig = loadedUserConfig;
-          log.info("project scope detected, inheriting user-scope resources and knowledge");
-          await pullForScope(inheritedUserConfig, options, {
-            resourceTypes: ["skills", "rules", "docs", "agents"],
-            revisionField: "lastInheritedPullRev"
-          });
+      projectConfig = await detectProjectConfig();
+    } catch (e) {
+      log.warn(`Project-scope detection error: ${e.message}`);
+    }
+    const projectMode = projectConfig !== null;
+    const inheritUserScope = projectConfig?.inheritUserScope === true;
+    let activeUserConfig = null;
+    let inheritedUserConfig = null;
+    if (projectMode && !inheritUserScope) {
+      log.info("project scope detected, skipped user scope");
+    } else {
+      try {
+        const loadedUserConfig = await loadLocalConfigForScope("user");
+        if (loadedUserConfig) {
+          if (inheritUserScope) {
+            inheritedUserConfig = loadedUserConfig;
+            log.info("project scope detected, inheriting user-scope resources and knowledge");
+            if (await lockScope(inheritedUserConfig)) {
+              await pullForScope(inheritedUserConfig, options, {
+                resourceTypes: ["skills", "rules", "docs", "agents"],
+                revisionField: "lastInheritedPullRev"
+              });
+            }
+          } else {
+            activeUserConfig = loadedUserConfig;
+            if (await lockScope(activeUserConfig)) {
+              await pullForScope(activeUserConfig, options);
+            }
+          }
+        } else if (inheritUserScope) {
+          log.warn("user-scope inheritance is enabled, but user scope is not initialized");
         } else {
-          activeUserConfig = loadedUserConfig;
-          await pullForScope(activeUserConfig, options);
+          log.debug("No user-scope config found, skipping user pull");
         }
-      } else if (inheritUserScope) {
-        log.warn("user-scope inheritance is enabled, but user scope is not initialized");
-      } else {
-        log.debug("No user-scope config found, skipping user pull");
+      } catch (e) {
+        log.warn(`User-scope pull error: ${e.message}`);
       }
-    } catch (e) {
-      log.warn(`User-scope pull error: ${e.message}`);
     }
-  }
-  if (projectConfig) {
-    try {
-      await pullForScope(projectConfig, options);
-    } catch (e) {
-      log.warn(`Project-scope pull error: ${e.message}`);
+    if (projectConfig) {
+      try {
+        if (await lockScope(projectConfig)) {
+          await pullForScope(projectConfig, options);
+        }
+      } catch (e) {
+        log.warn(`Project-scope pull error: ${e.message}`);
+      }
     }
-  }
-  await reconcileHooksAllScopes(activeUserConfig, projectConfig, options);
-  await reconcileMcpAllScopes(activeUserConfig, projectConfig, options);
-  await reconcileCoAuthorAllScopes(activeUserConfig, projectConfig, 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 (projectConfig && projectConfig.repo.kind !== "http") {
-        targets.push({
-          repoPath: projectConfig.repo.localPath,
-          username: projectConfig.username,
-          opts: {
-            skipTruncate: true,
-            projectRoot: projectConfig.projectRoot,
-            // Self mode routes stats/votes to the teamai-reports orphan branch.
-            ...projectConfig.repo.kind === "self" ? { selfConfig: projectConfig } : {}
-          }
-        });
+    const reconcileUser = activeUserConfig && !contended.has(activeUserConfig) ? activeUserConfig : null;
+    const reconcileProject = projectConfig && !contended.has(projectConfig) ? projectConfig : null;
+    if (needsHookMigration) {
+      const migrateScope = reconcileProject ?? reconcileUser;
+      if (migrateScope) {
+        try {
+          await reinjectLegacyHooks(migrateScope);
+        } catch {
+        }
       }
-      if (activeUserConfig && activeUserConfig.repo.kind !== "http") {
-        targets.push({
-          repoPath: activeUserConfig.repo.localPath,
-          username: activeUserConfig.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.
-            ...activeUserConfig.repo.kind === "self" ? { selfConfig: activeUserConfig } : {}
+    }
+    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") {
+          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") {
+          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 } : {}
+            }
+          });
+        }
+        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}`);
           }
-        });
-      }
-      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 (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);
+    }
+    const sourceConfig = reconcileProject ?? reconcileUser;
+    if (sourceConfig) {
+      try {
+        const { pullSources: pullSources2 } = await Promise.resolve().then(() => (init_source(), source_exports));
+        await pullSources2(sourceConfig, options);
+      } catch (e) {
+        log.debug(`Source pull skipped: ${e.message}`);
       }
-    } catch (e) {
-      log.debug(`Auto-report skipped: ${e.message}`);
     }
-  }
-  const sourceConfig = projectConfig ?? activeUserConfig;
-  if (sourceConfig) {
-    try {
-      const { pullSources: pullSources2 } = await Promise.resolve().then(() => (init_source(), source_exports));
-      await pullSources2(sourceConfig, options);
-    } catch (e) {
-      log.debug(`Source pull skipped: ${e.message}`);
+  } finally {
+    for (const lock of heldLocks.values()) {
+      await releaseLock(lock);
     }
   }
 }
@@ -36315,7 +36450,7 @@ var init_schema = __esm({
 
 // src/repo-list/store.ts
 import fs40 from "fs-extra";
-import { parse as parseYaml2 } from "yaml";
+import { parse as parseYaml3 } from "yaml";
 async function loadRepoList(filePath) {
   const exists3 = await fs40.pathExists(filePath);
   if (!exists3) {
@@ -36326,7 +36461,7 @@ async function loadRepoList(filePath) {
     throw new Error(`${filePath} exceeds max allowed size 10MB`);
   }
   const raw = await fs40.readFile(filePath, "utf8");
-  const parsed = parseYaml2(raw);
+  const parsed = parseYaml3(raw);
   const result = RepoListFileSchema.parse(parsed);
   return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamai-cli",
-  "version": "0.23.0-beta.1",
+  "version": "0.23.0-beta.3",
   "description": "TeamAI — Make Every Team AI Native (skill sync + shared knowledge base, powered by Git)",
   "type": "module",
   "bin": {