teamai-cli 0.25.0-beta.1 → 0.25.0-beta.2

package/CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### ✨ Features
 
+- `teamai remove` accepts `--force` to skip its confirmation prompt, spelled the same way as `teamai uninstall --force`. Without a TTY the prompt answers itself with no, so this is the only way to remove a resource from a script or a test (for [#591](https://github.com/Tencent/teamai-cli/issues/591)).
 - MCP servers in `mcp/mcp.yaml` and hooks in `hooks/hooks.yaml` accept an optional `roles:` list and ship only to members holding one of those roles; a role change removes the previous role's entries on the next pull, and `teamai mcp list` / `teamai hooks list` show the restriction (for [#563](https://github.com/Tencent/teamai-cli/issues/563)).
 - Agents can be scoped by role or project: `agents/<namespace>/` ships only to members whose `roles.yaml` / `projects.yaml` entry lists that namespace under a new optional `agents:` key, and a role change removes the previous namespaces' agents on the next pull (for [#563](https://github.com/Tencent/teamai-cli/issues/563)).
 - First-class Kiro support: skills, steering rules, JSON subagents with CLI `agentSpawn` session-start hooks, and MCP sync to `.kiro/` (for [#500](https://github.com/Tencent/teamai-cli/issues/500)).
@@ -15,8 +16,10 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### 🐛 Bug Fixes
 
+- `teamai tags subscribe` and `teamai tags unsubscribe` now invalidate the pull revision cache, as `teamai skill exclude` already does, so the next `teamai pull` applies the new subscriptions instead of reporting "Already synced" when the team repo has not changed.
 - `teamai pull` now deletes a tombstoned agent under all three render extensions, so the Codex `.toml` and Kiro `.json` copies of a removed agent no longer survive on other machines. The cleanup also runs when the team repo rev is unchanged, so an upgrade reaches machines that already pulled the tombstone with an older CLI. `teamai remove agents <name>` also honours `enabledAgents` and no longer deletes from excluded tools. Fixes [#576](https://github.com/Tencent/teamai-cli/issues/576).
 - `teamai remove rules <name>` and `teamai remove skills <name>` now honour `enabledAgents` and leave excluded tools untouched, matching the whitelist `teamai pull` already applies when it cleans up a tombstoned resource. Fixes [#590](https://github.com/Tencent/teamai-cli/issues/590).
+- `teamai pull` and `teamai mcp inject` no longer write team MCP servers into installed tools outside `enabledAgents` or listed in `disabledAgents`, the same gate skills, rules, agents and hooks already use. Servers injected before the upgrade are left in place, and `teamai uninstall` still removes them.
 - `teamai import --cache-status` and `--cache-gc` now expose their existing JSON output through the CLI `--json` option.
 - Course-correction matching normalizes prompts and keywords to Unicode NFC, so composed and decomposed accents match. Stored prompt summaries and the 60-second correction window are unchanged. Fixes [#573](https://github.com/Tencent/teamai-cli/issues/573).
 - Course-correction detection matches keywords in space-separated scripts as whole words, so Spanish "segundo" no longer counts as `undo` (for [#564](https://github.com/Tencent/teamai-cli/issues/564)).

package/README.ja.md

@@ -266,7 +266,7 @@ teamai recall maintenance --update-quality       # draft updates for stale skill
 | `teamai remove <type> <name>` | リソースを削除し、MR を開く |
 | `teamai session save` | プライバシー除去済みのセッション要約を月次ログへ記録（`--push` は `digest` へ供給） |
 | `teamai digest` | チーム利用の週次 digest を生成 |
-| `teamai doctor` | 設定の問題を診断 |
+| `teamai doctor` | 設定の問題を診断（`--json` で JSON 出力、CI・hook・agent 向け）|
 | `teamai uninstall` | すべての teamai リソースと hooks を削除 |
 
 ## ライセンス

package/README.ko.md

@@ -266,7 +266,7 @@ teamai recall maintenance --update-quality       # draft updates for stale skill
 | `teamai remove <type> <name>` | 리소스를 제거하고 MR을 엽니다 |
 | `teamai session save` | 개인정보를 제거한 세션 요약을 월별 로그에 기록 (`--push`는 `digest`에 공급) |
 | `teamai digest` | 주간 팀 사용 digest 생성 |
-| `teamai doctor` | 구성 문제 진단 |
+| `teamai doctor` | 구성 문제 진단 (`--json`으로 JSON 출력, CI·hook·agent용) |
 | `teamai uninstall` | 모든 teamai 리소스와 hooks 제거 |
 
 ## 라이선스

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, GitHub Copilot CLI, CodeBuddy, WorkBuddy, OpenCode, Cursor, and other AI agents.
 
 ## Contributors
 
@@ -86,6 +86,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>GitHub Copilot CLI</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>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>
     <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>
@@ -266,7 +267,7 @@ Insight into how the team actually uses its AI tools, and a starting point for t
 | `teamai remove <type> <name>` | Remove a resource and open MR |
 | `teamai session save` | Record a privacy-scrubbed session summary to a monthly log (`--push` feeds `digest`) |
 | `teamai digest` | Generate weekly team usage digest |
-| `teamai doctor` | Diagnose configuration issues |
+| `teamai doctor` | Diagnose configuration issues (`--json` for CI, hooks and agents) |
 | `teamai uninstall` | Remove all teamai resources and hooks |
 
 ## License

package/README.th.md

@@ -266,7 +266,7 @@ teamai recall maintenance --update-quality       # draft updates for stale skill
 | `teamai remove <type> <name>` | ลบทรัพยากรแล้วเปิด MR |
 | `teamai session save` | บันทึกสรุปเซสชันที่ล้างข้อมูลส่วนตัวแล้วลงล็อกรายเดือน (`--push` จะป้อน `digest`) |
 | `teamai digest` | สร้างสรุปการใช้งานทีมรายสัปดาห์ |
-| `teamai doctor` | วินิจฉัยปัญหาคอนฟิก |
+| `teamai doctor` | วินิจฉัยปัญหาคอนฟิก (`--json` แสดงผลเป็น JSON สำหรับ CI, hook และ agent) |
 | `teamai uninstall` | ลบทรัพยากรและ hooks ของ teamai ทั้งหมด |
 
 ## ใบอนุญาต

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、GitHub Copilot CLI、CodeBuddy、WorkBuddy、OpenCode、Cursor 等 AI Agents。
 
 ## 贡献者
 
@@ -86,6 +86,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>GitHub Copilot CLI</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>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>
     <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>
@@ -266,7 +267,7 @@ teamai recall maintenance --update-quality       # 为过时 skills / docs 生
 | `teamai remove <type> <name>` | 删除资源并创建 MR |
 | `teamai session save` | 将脱敏后的 session 摘要记录到月度日志（`--push` 可喂给 `digest`） |
 | `teamai digest` | 生成团队周报 |
-| `teamai doctor` | 诊断配置问题 |
+| `teamai doctor` | 诊断配置问题（`--json` 输出 JSON，供 CI、hook 与 agent 消费）|
 | `teamai uninstall` | 移除所有 teamai 资源和 hooks |
 
 ## 许可证

package/dist/index.js

@@ -503,6 +503,7 @@ __export(types_exports, {
   CONTRIBUTE_SKILL_BONUS: () => CONTRIBUTE_SKILL_BONUS,
   CONTRIBUTE_SMART_THRESHOLD: () => CONTRIBUTE_SMART_THRESHOLD,
   CONTRIBUTE_TOOLERROR_TIERS: () => CONTRIBUTE_TOOLERROR_TIERS,
+  COPILOT_TOOL_ID: () => COPILOT_TOOL_ID,
   CORRECTION_KEYWORDS: () => CORRECTION_KEYWORDS,
   CORRECTION_WINDOW_MS: () => CORRECTION_WINDOW_MS,
   CultureCompanySchema: () => CultureCompanySchema,
@@ -556,6 +557,7 @@ __export(types_exports, {
   areTeamHooksDisabled: () => areTeamHooksDisabled,
   emptyTokenUsage: () => emptyTokenUsage,
   getConfigPath: () => getConfigPath,
+  getCopilotHome: () => getCopilotHome,
   getDataHome: () => getDataHome,
   getEnvBackupPath: () => getEnvBackupPath,
   getHooksSharing: () => getHooksSharing,
@@ -590,6 +592,7 @@ __export(types_exports, {
   resolveCoAuthor: () => resolveCoAuthor,
   resolveHookScope: () => resolveHookScope,
   resolveLegacyProjectHookScope: () => resolveLegacyProjectHookScope,
+  resolveToolBaseDir: () => resolveToolBaseDir,
   scopedToolPaths: () => scopedToolPaths,
   totalTokens: () => totalTokens,
   usesReportsBranch: () => usesReportsBranch
@@ -699,6 +702,14 @@ function resolveBaseDir(localConfig) {
   }
   return getUserHome();
 }
+function getCopilotHome(env = process.env) {
+  const configured = env.COPILOT_HOME?.trim();
+  return configured ? path3.resolve(configured) : path3.join(getUserHome(), DEFAULT_COPILOT_HOME);
+}
+function resolveToolBaseDir(tool, localConfig) {
+  if (tool === COPILOT_TOOL_ID && localConfig.scope === "user") return getCopilotHome();
+  return resolveBaseDir(localConfig);
+}
 function isAgentDisabled(localConfig, tool) {
   return localConfig.disabledAgents?.includes(tool) ?? false;
 }
@@ -719,7 +730,8 @@ function scopedToolPaths(teamConfig, localConfig) {
       ...paths,
       ...us.skills !== void 0 ? { skills: us.skills } : {},
       ...us.rules !== void 0 ? { rules: us.rules } : {},
-      ...us.agents !== void 0 ? { agents: us.agents } : {}
+      ...us.agents !== void 0 ? { agents: us.agents } : {},
+      ...us.hooks !== void 0 ? { hooks: us.hooks } : {}
     };
   }
   return out;
@@ -795,7 +807,7 @@ function getPushignorePath() {
 function areTeamHooksDisabled() {
   return process.env.TEAMAI_HOOKS_DISABLED === "1" || process.env.TEAMAI_HOOKS_DISABLED === "true";
 }
-var ToolPathsSchema, ScopeEnum, SharingConfigSchema, SourceConfigSchema, SOURCE_PULL_TTL_MS, TEAMAI_SOURCES_DIR, TeamaiConfigSchema, MemberConfigSchema, LocalConfigSchema, PendingPushItemSchema, PendingPushSchema, StateSchema, RESOURCE_TYPES, TEAMAI_RULES_START, TEAMAI_RULES_END, TEAMAI_HOOK_DESCRIPTION_PREFIX, TEAMAI_CUSTOM_HOOK_PREFIX, TEAMAI_AGENT_HOOK_PREFIX, TEAMAI_ENV_START, TEAMAI_ENV_END, TEAMAI_CULTURE_START, TEAMAI_CULTURE_END, TEAMAI_CLAUDEMD_START, TEAMAI_CLAUDEMD_END, TEAMAI_RECALL_RULES_START, TEAMAI_RECALL_RULES_END, SKILL_NAME_REGEX, UsageEventSchema, DASHBOARD_DEFAULT_PORT, DASHBOARD_IDLE_TIMEOUT_MS, DASHBOARD_STALE_TIMEOUT_MS, DASHBOARD_COMPACTION_THRESHOLD, DASHBOARD_STOPPED_DISPLAY_MS, DASHBOARD_PID_CHECK_INTERVAL_MS, CORRECTION_WINDOW_MS, CORRECTION_KEYWORDS, INTERVENTION_SCAN_MAX_BYTES, TRANSCRIPT_INTERRUPT_PREFIX, TRANSCRIPT_SYSTEM_PREFIXES, TRANSCRIPT_REJECT_MARKERS, CONTRIBUTE_BASE_THRESHOLD, CONTRIBUTE_SMART_THRESHOLD, CONTRIBUTE_INTERRUPT_WEIGHT, CONTRIBUTE_REJECT_WEIGHT, CONTRIBUTE_CORRECTION_WEIGHT, CONTRIBUTE_TOOLERROR_TIERS, CONTRIBUTE_SKILL_BONUS, CONTRIBUTE_DIVERSITY_BONUS_MAX, CONTRIBUTE_FASTPATH_TTL_MS, CONTRIBUTE_KNOWLEDGE_GAP_BONUS, CONTRIBUTE_LOW_QUALITY_BONUS, CONTRIBUTE_LOW_QUALITY_THRESHOLD, CONTRIBUTE_GIT_COMMIT_DOWNWEIGHT, SEARCH_INDEX_VERSION, CultureCompanySchema, CultureTeamSchema, CultureFrontmatterSchema, REPORTS_BRANCH, REPORTS_WORKTREE_DIRNAME, KNOWLEDGE_WORKTREE_DIRNAME, REPORTS_LOCK_FILENAME, BOOTSTRAP_LOCK_FILENAME, SYNC_LOCK_FILENAME;
+var ToolPathsSchema, ScopeEnum, SharingConfigSchema, SourceConfigSchema, SOURCE_PULL_TTL_MS, TEAMAI_SOURCES_DIR, TeamaiConfigSchema, MemberConfigSchema, LocalConfigSchema, PendingPushItemSchema, PendingPushSchema, StateSchema, RESOURCE_TYPES, TEAMAI_RULES_START, TEAMAI_RULES_END, TEAMAI_HOOK_DESCRIPTION_PREFIX, TEAMAI_CUSTOM_HOOK_PREFIX, TEAMAI_AGENT_HOOK_PREFIX, TEAMAI_ENV_START, TEAMAI_ENV_END, TEAMAI_CULTURE_START, TEAMAI_CULTURE_END, TEAMAI_CLAUDEMD_START, TEAMAI_CLAUDEMD_END, TEAMAI_RECALL_RULES_START, TEAMAI_RECALL_RULES_END, SKILL_NAME_REGEX, UsageEventSchema, DASHBOARD_DEFAULT_PORT, DASHBOARD_IDLE_TIMEOUT_MS, DASHBOARD_STALE_TIMEOUT_MS, DASHBOARD_COMPACTION_THRESHOLD, DASHBOARD_STOPPED_DISPLAY_MS, DASHBOARD_PID_CHECK_INTERVAL_MS, CORRECTION_WINDOW_MS, CORRECTION_KEYWORDS, INTERVENTION_SCAN_MAX_BYTES, TRANSCRIPT_INTERRUPT_PREFIX, TRANSCRIPT_SYSTEM_PREFIXES, TRANSCRIPT_REJECT_MARKERS, CONTRIBUTE_BASE_THRESHOLD, CONTRIBUTE_SMART_THRESHOLD, CONTRIBUTE_INTERRUPT_WEIGHT, CONTRIBUTE_REJECT_WEIGHT, CONTRIBUTE_CORRECTION_WEIGHT, CONTRIBUTE_TOOLERROR_TIERS, CONTRIBUTE_SKILL_BONUS, CONTRIBUTE_DIVERSITY_BONUS_MAX, CONTRIBUTE_FASTPATH_TTL_MS, CONTRIBUTE_KNOWLEDGE_GAP_BONUS, CONTRIBUTE_LOW_QUALITY_BONUS, CONTRIBUTE_LOW_QUALITY_THRESHOLD, CONTRIBUTE_GIT_COMMIT_DOWNWEIGHT, SEARCH_INDEX_VERSION, CultureCompanySchema, CultureTeamSchema, CultureFrontmatterSchema, COPILOT_TOOL_ID, DEFAULT_COPILOT_HOME, REPORTS_BRANCH, REPORTS_WORKTREE_DIRNAME, KNOWLEDGE_WORKTREE_DIRNAME, REPORTS_LOCK_FILENAME, BOOTSTRAP_LOCK_FILENAME, SYNC_LOCK_FILENAME;
 var init_types = __esm({
   "src/types.ts"() {
     "use strict";
@@ -804,6 +816,8 @@ var init_types = __esm({
       skills: z.string().optional(),
       rules: z.string().optional(),
       settings: z.string().optional(),
+      /** Standalone hooks file for tools that do not store hooks in settings. */
+      hooks: z.string().optional(),
       claudemd: z.string().optional(),
       /** Per-tool agents directory (Phase 1: teamai-recall subagent target).
        * Optional — tools without subagent support omit this and agents sync skips them. */
@@ -826,7 +840,8 @@ var init_types = __esm({
       userScope: z.object({
         skills: z.string().optional(),
         rules: z.string().optional(),
-        agents: z.string().optional()
+        agents: z.string().optional(),
+        hooks: z.string().optional()
       }).optional()
     });
     ScopeEnum = z.enum(["user", "project"]);
@@ -954,6 +969,15 @@ 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" },
+        // GitHub Copilot CLI keeps project customizations under .github and moves
+        // the complete user customization root when COPILOT_HOME is set. Hooks are
+        // a standalone file; settings.json is deliberately never managed.
+        copilot: {
+          skills: ".github/skills",
+          rules: ".github/instructions",
+          hooks: ".github/hooks/teamai.json",
+          userScope: { skills: "skills", rules: "instructions", hooks: "hooks/teamai.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
@@ -1238,6 +1262,8 @@ var init_types = __esm({
       company: CultureCompanySchema.optional(),
       team: CultureTeamSchema.optional()
     });
+    COPILOT_TOOL_ID = "copilot";
+    DEFAULT_COPILOT_HOME = ".copilot";
     REPORTS_BRANCH = "teamai-reports";
     REPORTS_WORKTREE_DIRNAME = "reports-wt";
     KNOWLEDGE_WORKTREE_DIRNAME = "knowledge-wt";
@@ -1587,7 +1613,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";
+  const withTimeout3 = tool === "cursor" || tool === "copilot" || tool === "workbuddy" || tool === "codebuddy";
   const buildCommand = tool === "zcode" ? getRawDispatchCommand : WRAPPER_TOOLS.has(tool) ? getWrapperDispatchCommand : getDispatchCommand;
   return BUILTIN_HOOK_SPECS.map((spec) => ({
     source: "builtin",
@@ -1639,10 +1665,18 @@ function toolInstallRoot(toolPath) {
   }
   return segments[0] ?? toolPath;
 }
+async function isToolInstalledForConfig(tool, toolPath, localConfig) {
+  const baseDir = resolveToolBaseDir(tool, localConfig);
+  if (tool === COPILOT_TOOL_ID) {
+    return localConfig.enabledAgents?.includes(COPILOT_TOOL_ID) === true || pathExists(getCopilotHome());
+  }
+  return ResourceHandler.isToolInstalled(toolPath, baseDir);
+}
 var TOMBSTONE_FILE, ResourceHandler;
 var init_base = __esm({
   "src/resources/base.ts"() {
     "use strict";
+    init_types();
     init_fs();
     init_home();
     TOMBSTONE_FILE = ".removed";
@@ -2509,6 +2543,7 @@ var init_hermes_hooks = __esm({
 var hooks_exports = {};
 __export(hooks_exports, {
   AGENT_HOOK_EVENTS: () => AGENT_HOOK_EVENTS,
+  CLAUDE_TO_COPILOT_EVENTS: () => CLAUDE_TO_COPILOT_EVENTS,
   CLAUDE_TO_CURSOR_EVENTS: () => CLAUDE_TO_CURSOR_EVENTS,
   OPENCLAW_TOOLS: () => OPENCLAW_TOOLS,
   TEAMAI_HOOK_SUBCOMMANDS: () => TEAMAI_HOOK_SUBCOMMANDS,
@@ -2534,6 +2569,7 @@ __export(hooks_exports, {
 import path14 from "path";
 import { realpathSync } from "fs";
 function detectFormat(tool) {
+  if (tool === COPILOT_TOOL_ID) return "copilot";
   if (CODEX_TOOLS.has(tool)) return "codex";
   if (ZCODE_TOOLS.has(tool)) return "zcode";
   return CURSOR_TOOLS.has(tool) ? "cursor" : "claude";
@@ -2623,6 +2659,20 @@ function toCodexEntry(def) {
   if (def.matcher && def.matcher !== "*") entry.matcher = def.matcher;
   return entry;
 }
+function copilotPowershellCommand(command) {
+  const match = command.match(COPILOT_BUILTIN_COMMAND_RE);
+  return match ? `${match[1]} 2>$null; exit 0` : command;
+}
+function toCopilotEntry(def) {
+  return {
+    type: "command",
+    bash: def.command,
+    powershell: copilotPowershellCommand(def.command),
+    command: def.command,
+    ...def.matcher && def.matcher !== "*" ? { matcher: def.matcher } : {},
+    ...def.timeout !== void 0 ? { timeoutSec: def.timeout } : {}
+  };
+}
 function toZcodeEntry(def) {
   const ZCODE_TIMEOUT_MS = {
     SessionStart: 18e4,
@@ -2768,6 +2818,61 @@ async function reconcileCursorFormat(hooksPath, tool, teamDefs, opts, priorTeamC
     log.debug(`teamai hooks already up-to-date in ${hooksPath}`);
   }
 }
+function copilotEntryCommands(entry) {
+  return [entry.bash, entry.powershell, entry.command].filter(Boolean);
+}
+async function reconcileCopilotFormat(hooksPath, tool, teamDefs, opts, priorTeamCommands) {
+  const expanded = expandHome(hooksPath);
+  const existed = await pathExists(expanded);
+  if (opts.removeAll && !existed) {
+    log.debug(`No teamai hooks to remove from ${hooksPath}`);
+    return;
+  }
+  await ensureDir(path14.dirname(expanded));
+  const hooksJson = await readJson(expanded) ?? {
+    version: COPILOT_HOOK_SCHEMA_VERSION,
+    hooks: {}
+  };
+  let changed = hooksJson.version !== COPILOT_HOOK_SCHEMA_VERSION;
+  hooksJson.version = COPILOT_HOOK_SCHEMA_VERSION;
+  if (!hooksJson.hooks) hooksJson.hooks = {};
+  const isManaged = (entry) => copilotEntryCommands(entry).some(
+    (command) => TEAMAI_COMMAND_MARKERS.some((marker) => command.includes(marker)) || priorTeamCommands.has(command)
+  );
+  const defs = opts.removeAll ? [] : desiredDefs(tool, teamDefs, opts.builtinOverride);
+  const desiredByEvent = {};
+  for (const def of defs) {
+    const event = CLAUDE_TO_COPILOT_EVENTS[def.event];
+    if (!event) continue;
+    (desiredByEvent[event] ??= []).push(toCopilotEntry(def));
+  }
+  for (const event of Object.keys(hooksJson.hooks)) {
+    const existing = hooksJson.hooks[event] ?? [];
+    const untouched = existing.filter((entry) => !isManaged(entry));
+    const desired = desiredByEvent[event] ?? [];
+    const next = [...untouched, ...desired];
+    if (next.length === 0 && !opts.removeAll) {
+      if (existing.length > 0) changed = true;
+      delete hooksJson.hooks[event];
+      continue;
+    }
+    if (JSON.stringify(existing) !== JSON.stringify(next)) {
+      hooksJson.hooks[event] = next;
+      changed = true;
+    }
+  }
+  for (const event of desiredEventOrder(defs, (value) => CLAUDE_TO_COPILOT_EVENTS[value])) {
+    if (hooksJson.hooks[event]) continue;
+    hooksJson.hooks[event] = desiredByEvent[event];
+    changed = true;
+  }
+  if (changed || !existed) {
+    await writeJson(expanded, hooksJson);
+    log.success(`${opts.removeAll ? "Removed" : "Updated"} teamai hooks in ${hooksPath}`);
+  } else {
+    log.debug(`teamai hooks already up-to-date in ${hooksPath}`);
+  }
+}
 async function reconcileCodexFormat(hooksPath, tool, teamDefs, opts, priorTeamCommands) {
   const expanded = expandHome(hooksPath);
   await ensureDir(path14.dirname(expanded));
@@ -2954,6 +3059,8 @@ async function reconcileHooks(settingsPath, tool, teamDefs = [], opts = {}) {
   const format = detectFormat(tool);
   if (format === "cursor") {
     await reconcileCursorFormat(settingsPath, tool, scopedDefs, opts, priorTeamCommands);
+  } else if (format === "copilot") {
+    await reconcileCopilotFormat(settingsPath, tool, scopedDefs, opts, priorTeamCommands);
   } else if (format === "codex") {
     await reconcileCodexFormat(settingsPath, tool, scopedDefs, opts, priorTeamCommands);
   } else if (format === "zcode") {
@@ -3007,6 +3114,19 @@ async function getHookStatus(settingsPath, tool) {
     });
     return present2 ? "installed" : "missing";
   }
+  if (format === "copilot") {
+    const hooksJson = await readJson(expanded);
+    if (hooksJson?.version !== COPILOT_HOOK_SCHEMA_VERSION || !hooksJson.hooks) return "missing";
+    const present2 = defs.every((def) => {
+      const event = CLAUDE_TO_COPILOT_EVENTS[def.event];
+      if (!event) return true;
+      const want = toCopilotEntry(def);
+      return (hooksJson.hooks[event] ?? []).some(
+        (entry) => entry.type === want.type && entry.bash === want.bash && entry.powershell === want.powershell && entry.command === want.command && entry.matcher === want.matcher
+      );
+    });
+    return present2 ? "installed" : "missing";
+  }
   if (format === "codex") {
     const hooksJson = await readJson(expanded);
     if (!hooksJson?.hooks) return "missing";
@@ -3050,6 +3170,15 @@ async function hasTeamaiHooks(settingsPath, tool, manifestPath) {
       (entries) => (entries ?? []).some((e) => isTeamaiHookCommand(e.command) || priorTeamCommands.has(e.command))
     );
   }
+  if (format === "copilot") {
+    const j = await readJson(expanded);
+    if (!j?.hooks) return false;
+    return Object.values(j.hooks).some(
+      (entries) => (entries ?? []).some((entry) => copilotEntryCommands(entry).some(
+        (command) => TEAMAI_COMMAND_MARKERS.some((marker) => command.includes(marker)) || priorTeamCommands.has(command)
+      ))
+    );
+  }
   if (format === "codex") {
     const j = await readJson(expanded);
     if (!j?.hooks) return false;
@@ -3218,7 +3347,8 @@ async function reconcileTeamHooksForConfig(teamConfig, localConfig, opts = {}) {
     activeRoles: activeRoleIds(localConfig)
   });
   const { baseDir, manifestPath } = resolveHookScope(localConfig);
-  let filterAgents2 = opts.filterAgents ?? localConfig.enabledAgents;
+  const explicitlySelectedAgents = opts.filterAgents ?? localConfig.enabledAgents;
+  let filterAgents2 = explicitlySelectedAgents;
   const disabled = localConfig.disabledAgents;
   if (disabled && disabled.length > 0) {
     const universe = filterAgents2 ?? Object.keys(teamConfig.toolPaths);
@@ -3231,10 +3361,29 @@ async function reconcileTeamHooksForConfig(teamConfig, localConfig, opts = {}) {
     teamHookProjectRoot: localConfig.scope === "project" && !isSelfMode(localConfig) ? localConfig.projectRoot : void 0,
     installedBaseDir: localConfig.scope === "project" ? localConfig.projectRoot ?? baseDir : void 0
   });
+  const copilotExcluded = disabled?.includes(COPILOT_TOOL_ID) ?? false;
+  const copilotSelected = !copilotExcluded && (explicitlySelectedAgents?.includes(COPILOT_TOOL_ID) ?? false);
+  const copilotEnabled = !copilotExcluded && (copilotSelected || explicitlySelectedAgents === void 0 && await pathExists(getCopilotHome()));
+  const copilotPaths = scopedToolPaths(teamConfig, localConfig)[COPILOT_TOOL_ID];
+  if (copilotEnabled && copilotPaths?.hooks) {
+    const copilotBase = resolveToolBaseDir(COPILOT_TOOL_ID, localConfig);
+    if (copilotSelected || await pathExists(getCopilotHome())) {
+      await reconcileHooks(
+        path14.join(copilotBase, copilotPaths.hooks),
+        COPILOT_TOOL_ID,
+        teamDefs,
+        {
+          manifestPath: getManagedHooksPath(localConfig.scope, localConfig.projectRoot),
+          removeAll: opts.removeAll,
+          builtinOverride: builtin
+        }
+      );
+    }
+  }
   await sweepLegacyProjectHooks(teamConfig.toolPaths, localConfig);
   return teamDefs;
 }
-var OPENCLAW_TOOLS, TEAMAI_HOOK_SUBCOMMANDS, TEAMAI_LEGACY_HOOK_SUBCOMMANDS, CLAUDE_TO_CURSOR_EVENTS, CURSOR_TOOLS, CODEX_TOOLS, ZCODE_TOOLS, CODEX_TRUST_GATE_TOOLS, TEAMAI_COMMAND_MARKERS, AGENT_HOOK_EVENTS;
+var OPENCLAW_TOOLS, TEAMAI_HOOK_SUBCOMMANDS, TEAMAI_LEGACY_HOOK_SUBCOMMANDS, CLAUDE_TO_CURSOR_EVENTS, CLAUDE_TO_COPILOT_EVENTS, COPILOT_HOOK_SCHEMA_VERSION, CURSOR_TOOLS, CODEX_TOOLS, ZCODE_TOOLS, CODEX_TRUST_GATE_TOOLS, TEAMAI_COMMAND_MARKERS, COPILOT_BUILTIN_COMMAND_RE, AGENT_HOOK_EVENTS;
 var init_hooks2 = __esm({
   "src/hooks.ts"() {
     "use strict";
@@ -3255,6 +3404,14 @@ var init_hooks2 = __esm({
       PostToolUse: "postToolUse",
       UserPromptSubmit: "beforeSubmitPrompt"
     };
+    CLAUDE_TO_COPILOT_EVENTS = {
+      SessionStart: "SessionStart",
+      Stop: "Stop",
+      UserPromptSubmit: "UserPromptSubmit",
+      PreToolUse: "PreToolUse",
+      PostToolUse: "PostToolUse"
+    };
+    COPILOT_HOOK_SCHEMA_VERSION = 1;
     CURSOR_TOOLS = /* @__PURE__ */ new Set(["cursor"]);
     CODEX_TOOLS = /* @__PURE__ */ new Set(["codex", "codex-internal", "tcodex"]);
     ZCODE_TOOLS = /* @__PURE__ */ new Set(["zcode"]);
@@ -3270,6 +3427,7 @@ var init_hooks2 = __esm({
       "teamai mr-hint",
       "teamai hook-dispatch"
     ];
+    COPILOT_BUILTIN_COMMAND_RE = /^bash -lc "(teamai hook-dispatch [^"]+) 2>\/dev\/null" \|\| true$/;
     AGENT_HOOK_EVENTS = /* @__PURE__ */ new Set([
       "SessionStart",
       "UserPromptSubmit",
@@ -3375,12 +3533,17 @@ var init_pending_push = __esm({
 
 // src/resources/rule-format.ts
 function ruleFileExtensionForTool(tool) {
-  return usesCursorMdcRules(tool) ? ".mdc" : ".md";
+  if (usesCursorMdcRules(tool)) return ".mdc";
+  return usesCopilotInstructions(tool) ? ".instructions.md" : ".md";
 }
 function usesCursorMdcRules(tool) {
   return CURSOR_MDC_RULE_TOOLS.has(tool);
 }
+function usesCopilotInstructions(tool) {
+  return COPILOT_INSTRUCTIONS_RULE_TOOLS.has(tool);
+}
 function ruleStemFromFilename(filename) {
+  if (filename.endsWith(".instructions.md")) return filename.slice(0, -".instructions.md".length);
   if (filename.endsWith(".mdc")) return filename.slice(0, -".mdc".length);
   if (filename.endsWith(".md")) return filename.slice(0, -".md".length);
   return null;
@@ -3388,11 +3551,12 @@ function ruleStemFromFilename(filename) {
 function isLegacyCursorRuleFile(tool, filename) {
   return usesCursorMdcRules(tool) && filename.endsWith(".md");
 }
-var CURSOR_MDC_RULE_TOOLS;
+var CURSOR_MDC_RULE_TOOLS, COPILOT_INSTRUCTIONS_RULE_TOOLS;
 var init_rule_format = __esm({
   "src/resources/rule-format.ts"() {
     "use strict";
     CURSOR_MDC_RULE_TOOLS = /* @__PURE__ */ new Set(["cursor", "joycode"]);
+    COPILOT_INSTRUCTIONS_RULE_TOOLS = /* @__PURE__ */ new Set(["copilot"]);
   }
 });
 
@@ -8864,6 +9028,10 @@ function codexServerNames(source) {
   for (const m of source.matchAll(/^\[mcp_servers\.([A-Za-z0-9_-]+)\]\s*$/gm)) names.add(m[1]);
   return [...names];
 }
+function mcpTargetExcluded(localConfig, target) {
+  if (!isAgentExcluded(localConfig, target.tool)) return false;
+  return !(target.projectScope && target.tool === "claude" && !isAgentExcluded(localConfig, "tclaude"));
+}
 async function reconcileMcpForConfig(teamConfig, localConfig, options = {}) {
   const changes = [];
   let wrote = false;
@@ -8902,6 +9070,7 @@ async function reconcileMcpForConfig(teamConfig, localConfig, options = {}) {
   if (teamDefs.length === 0 && nothingOwned) return { changes, wrote };
   const vars = await buildVarTable(localConfig);
   for (const target of targets) {
+    if (!removeAll && mcpTargetExcluded(localConfig, target)) continue;
     const manifestKey = managedMcpManifestKey(target.tool, target.projectScope);
     const owned = manifest[manifestKey] ?? [];
     const ownedNames = new Set(owned.map((r) => r.name));
@@ -12331,9 +12500,9 @@ var init_skills = __esm({
           sourceSkillNames = /* @__PURE__ */ new Set();
         }
         const candidates = /* @__PURE__ */ new Map();
-        for (const [_tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
+        for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (!toolPath.skills) continue;
-          const skillsDir = path30.join(resolveBaseDir(localConfig), toolPath.skills);
+          const skillsDir = path30.join(resolveToolBaseDir(tool, localConfig), toolPath.skills);
           if (!await pathExists(skillsDir)) continue;
           const localSkills = await scanSkillsRecursively(skillsDir);
           for (const [dir, localDirPath] of localSkills) {
@@ -12441,7 +12610,6 @@ var init_skills = __esm({
        * Pull a skill from team repo to all configured AI tool directories.
        */
       async pullItem(item, teamConfig, localConfig) {
-        const baseDir = resolveBaseDir(localConfig);
         for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (isAgentExcluded(localConfig, tool)) continue;
           if (!toolPath.skills) continue;
@@ -12460,10 +12628,11 @@ var init_skills = __esm({
             }
             dest = path30.join(getHermesHome(), "skills", item.name);
           } else {
-            if (!await ResourceHandler.isToolInstalled(toolPath.skills, baseDir)) {
+            if (!await isToolInstalledForConfig(tool, toolPath.skills, localConfig)) {
               log.debug(`Skipping skill sync for ${tool}: tool not installed`);
               continue;
             }
+            const baseDir = resolveToolBaseDir(tool, localConfig);
             dest = await resolveSkillDestination(tool, toolPath.skills, baseDir, item.name, item.sourcePath);
           }
           try {
@@ -12480,7 +12649,6 @@ var init_skills = __esm({
        */
       async removeItem(name, teamConfig, localConfig) {
         const removed = [];
-        const baseDir = resolveBaseDir(localConfig);
         const scopedNamespaces = await resolveSkillNamespaces(localConfig);
         if (scopedNamespaces.length > 0) {
           for (const namespace of scopedNamespaces) {
@@ -12507,6 +12675,7 @@ var init_skills = __esm({
             if (!wsDir) continue;
             skillDir = path30.join(wsDir, "skills", name);
           } else {
+            const baseDir = resolveToolBaseDir(tool, localConfig);
             const configuredDir = path30.join(baseDir, toolPath.skills, name);
             skillDir = await resolveSkillDestination(tool, toolPath.skills, baseDir, name);
             if (skillDir !== configuredDir && await pathExists(configuredDir) && await dirContentEqual(skillDir, configuredDir)) {
@@ -12535,6 +12704,55 @@ var init_skills = __esm({
   }
 });
 
+// src/resources/copilot-instructions.ts
+function normalizeBody2(body) {
+  return body.replace(/^\s+/, "").replace(/\s+$/, "");
+}
+function rulePaths(data) {
+  const value = data.paths;
+  if (Array.isArray(value)) {
+    return value.map((entry) => String(entry).trim()).filter(Boolean);
+  }
+  if (typeof value === "string") {
+    return value.split(",").map((entry) => entry.trim()).filter(Boolean);
+  }
+  return [];
+}
+function teamRuleToCopilotInstructions(rawTeamRule) {
+  const { data, body } = splitFrontmatter2(rawTeamRule);
+  const paths = rulePaths(data);
+  return stringifyFrontmatter(
+    { applyTo: paths.length > 0 ? paths.join(", ") : ALL_FILES_GLOB },
+    `
+${normalizeBody2(body)}
+`
+  );
+}
+function mergeCopilotBodyIntoTeamMd(rawCopilotInstructions, existingTeamMd) {
+  const body = normalizeBody2(splitFrontmatter2(rawCopilotInstructions).body);
+  if (existingTeamMd === null) return `${body}
+`;
+  const existing = splitFrontmatter2(existingTeamMd);
+  if (normalizeBody2(existing.body) === body) return existingTeamMd;
+  if (!existing.raw) return `${body}
+`;
+  return `${existing.raw.endsWith("\n") ? existing.raw : `${existing.raw}
+`}
+${body}
+`;
+}
+function copilotInstructionsBodyEqualsTeamMd(rawCopilotInstructions, rawTeamRule) {
+  return normalizeBody2(splitFrontmatter2(rawCopilotInstructions).body) === normalizeBody2(splitFrontmatter2(rawTeamRule).body);
+}
+var ALL_FILES_GLOB;
+var init_copilot_instructions = __esm({
+  "src/resources/copilot-instructions.ts"() {
+    "use strict";
+    init_frontmatter();
+    ALL_FILES_GLOB = "**";
+  }
+});
+
 // src/resources/opencode-config.ts
 var opencode_config_exports = {};
 __export(opencode_config_exports, {
@@ -12607,6 +12825,7 @@ var init_rules = __esm({
     init_types();
     init_builtin_rules();
     init_cursor_mdc();
+    init_copilot_instructions();
     init_rule_format();
     RulesHandler = class extends ResourceHandler {
       type = "rules";
@@ -12634,10 +12853,11 @@ var init_rules = __esm({
         for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           const rulesPath = toolPath.rules;
           if (!rulesPath) continue;
-          const rulesDir = path32.join(resolveBaseDir(localConfig), rulesPath);
+          const rulesDir = path32.join(resolveToolBaseDir(tool, localConfig), rulesPath);
           if (!await pathExists(rulesDir)) continue;
           const ext = ruleFileExtensionForTool(tool);
           const isMdcTool = usesCursorMdcRules(tool);
+          const isCopilotTool = usesCopilotInstructions(tool);
           const files = await listFilesRecursive(rulesDir);
           for (const file of files) {
             if (!file.endsWith(ext)) continue;
@@ -12648,10 +12868,12 @@ var init_rules = __esm({
             const teamFileName = `${name}.md`;
             if (teamRules.has(teamFileName)) {
               const teamFilePath = path32.join(teamRulesDir, teamFileName);
+              const localRule = await readFileSafe(localFilePath) ?? "";
+              const teamRule = await readTeamRule(teamFilePath);
               const equal = isMdcTool ? cursorMdcBodyEqualsTeamMd(
-                await readFileSafe(localFilePath) ?? "",
-                await readTeamRule(teamFilePath)
-              ) : await fileContentEqual(localFilePath, teamFilePath);
+                localRule,
+                teamRule
+              ) : isCopilotTool ? copilotInstructionsBodyEqualsTeamMd(localRule, teamRule) : await fileContentEqual(localFilePath, teamFilePath);
               if (equal) continue;
               const mtime = await getFileMtime(localFilePath);
               const existing = candidates.get(name);
@@ -12659,7 +12881,7 @@ var init_rules = __esm({
                 candidates.set(name, { sourcePath: localFilePath, mtime, status: "modified" });
               }
             } else {
-              if (isMdcTool) continue;
+              if (isMdcTool || isCopilotTool) continue;
               const existing = candidates.get(name);
               if (!existing) {
                 const mtime = await getFileMtime(localFilePath);
@@ -12705,6 +12927,12 @@ var init_rules = __esm({
               throw new Error(`Cannot read rule source ${item.sourcePath}`);
             }
             await writeFile(dest, mergeCursorBodyIntoTeamMd(raw, await readFileSafe(dest)));
+          } else if (item.sourcePath.endsWith(".instructions.md")) {
+            const raw = await readFileSafe(item.sourcePath);
+            if (raw === null) {
+              throw new Error(`Cannot read rule source ${item.sourcePath}`);
+            }
+            await writeFile(dest, mergeCopilotBodyIntoTeamMd(raw, await readFileSafe(dest)));
           } else {
             await copyFile(item.sourcePath, dest);
           }
@@ -12715,15 +12943,14 @@ var init_rules = __esm({
        * Pull a single rule file to all configured AI tool rules/ directories.
        */
       async pullItem(item, teamConfig, localConfig) {
-        const baseDir = resolveBaseDir(localConfig);
         for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (isAgentExcluded(localConfig, tool)) continue;
           if (!toolPath.rules) continue;
-          if (!await ResourceHandler.isToolInstalled(toolPath.rules, baseDir)) {
+          if (!await isToolInstalledForConfig(tool, toolPath.rules, localConfig)) {
             log.debug(`Skipping rule sync for ${tool}: tool not installed`);
             continue;
           }
-          const destDir = path32.join(baseDir, toolPath.rules);
+          const destDir = path32.join(resolveToolBaseDir(tool, localConfig), toolPath.rules);
           await ensureDir(destDir);
           const dest = path32.join(destDir, `${item.name}${ruleFileExtensionForTool(tool)}`);
           try {
@@ -12734,6 +12961,13 @@ var init_rules = __esm({
               }
               await writeFile(dest, teamRuleToCursorMdc(raw));
               await remove(path32.join(destDir, `${item.name}.md`));
+            } else if (usesCopilotInstructions(tool)) {
+              const raw = await readFileSafe(item.sourcePath);
+              if (raw === null) {
+                throw new Error(`Cannot read rule source ${item.sourcePath}`);
+              }
+              await writeFile(dest, teamRuleToCopilotInstructions(raw));
+              await remove(path32.join(destDir, `${item.name}.md`));
             } else {
               await copyFile(item.sourcePath, dest);
             }
@@ -12748,7 +12982,6 @@ var init_rules = __esm({
        */
       async removeItem(name, teamConfig, localConfig) {
         const removed = [];
-        const baseDir = resolveBaseDir(localConfig);
         const teamFile = path32.join(localConfig.repo.localPath, "rules", `${name}.md`);
         if (await pathExists(teamFile)) {
           await remove(teamFile);
@@ -12758,6 +12991,7 @@ var init_rules = __esm({
         for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (!toolPath.rules) continue;
           if (isAgentExcluded(localConfig, tool)) continue;
+          const baseDir = resolveToolBaseDir(tool, localConfig);
           const extensions = /* @__PURE__ */ new Set([ruleFileExtensionForTool(tool), ".md"]);
           for (const extension of extensions) {
             const filePath = path32.join(baseDir, toolPath.rules, `${name}${extension}`);
@@ -12796,11 +13030,11 @@ var init_rules = __esm({
         }
         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;
           if (isAgentExcluded(localConfig, tool)) continue;
-          if (!await ResourceHandler.isToolInstalled(toolPath.rules, baseDir)) continue;
+          if (!await isToolInstalledForConfig(tool, toolPath.rules, localConfig)) continue;
+          const baseDir = resolveToolBaseDir(tool, localConfig);
           const destDir = path32.join(baseDir, toolPath.rules);
           if (!await pathExists(destDir)) continue;
           const ext = ruleFileExtensionForTool(tool);
@@ -12808,7 +13042,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 ((tool === "joycode" || usesCopilotInstructions(tool)) && !tombstones.has(ruleName)) continue;
             if (isLegacyCursorRuleFile(tool, localFile)) {
               await remove(path32.join(destDir, localFile));
               log.debug(`Removed legacy .md rule ${localFile} from ${tool}`);
@@ -12824,8 +13058,9 @@ var init_rules = __esm({
           }
           await this.removeEmptyDirs(destDir);
         }
-        for (const [, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
+        for (const [tool, toolPath] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
           if (!toolPath.claudemd) continue;
+          const baseDir = resolveToolBaseDir(tool, localConfig);
           const claudeMdPath = path32.join(baseDir, toolPath.claudemd);
           try {
             const content = await readFileSafe(claudeMdPath);
@@ -15869,6 +16104,10 @@ async function detectHomeInstalledAgents(candidateIds = SELF_MODE_AGENT_CHOICES)
   const home = getUserHome();
   const found = [];
   for (const id of candidateIds) {
+    if (id === COPILOT_TOOL_ID) {
+      if (await pathExists(getCopilotHome())) found.push(id);
+      continue;
+    }
     const skillsPath = KNOWN_AGENTS.find((a) => a.id === id)?.skillsPath;
     if (!skillsPath) continue;
     const rootSegment = skillsPath.split("/")[0];
@@ -15903,7 +16142,6 @@ function getEffectiveAgents(teamConfig, localConfig) {
   return [...byId.values()];
 }
 async function detectInstalledAgents(localConfig, teamConfig) {
-  const baseDir = resolveBaseDir(localConfig);
   const agents = getEffectiveAgents(teamConfig, localConfig);
   const scoped = scopedToolPaths(teamConfig, localConfig);
   const fromTeamConfig = new Set(
@@ -15911,12 +16149,11 @@ async function detectInstalledAgents(localConfig, teamConfig) {
   );
   const results = [];
   for (const agent of agents) {
-    const rootSegment = toolInstallRoot(agent.skillsPath);
-    const rootPath = path44.join(baseDir, rootSegment);
-    const installed = rootSegment ? await pathExists(rootPath) : false;
+    const baseDir = resolveToolBaseDir(agent.id, localConfig);
+    const installed = await isToolInstalledForConfig(agent.id, agent.skillsPath, localConfig);
     results.push({
       ...agent,
-      absoluteSkillsPath: `${baseDir}/${agent.skillsPath}`,
+      absoluteSkillsPath: path44.join(baseDir, agent.skillsPath),
       installed,
       fromTeamConfig: fromTeamConfig.has(agent.id)
     });
@@ -15931,7 +16168,7 @@ var init_known_agents = __esm({
     init_types();
     init_base();
     init_home();
-    SELF_MODE_AGENT_CHOICES = ["claude", "codex", "cursor", "joycode", "codebuddy", "workbuddy"];
+    SELF_MODE_AGENT_CHOICES = ["claude", "codex", "cursor", "copilot", "joycode", "codebuddy", "workbuddy"];
     KNOWN_AGENTS = [
       // Coding agents already wired through teamConfig.toolPaths defaults
       { id: "claude", displayName: "Claude Code", category: "coding", skillsPath: ".claude/skills" },
@@ -25055,10 +25292,12 @@ async function removeCore(type, names, options, localConfig, teamConfig) {
     log.info("Dry run \u2014 no changes made");
     return;
   }
-  const confirmed = await askConfirmation("Are you sure? [y/N] ");
-  if (!confirmed) {
-    log.info("Cancelled");
-    return;
+  if (!options.force) {
+    const confirmed = await askConfirmation("Are you sure? [y/N] ");
+    if (!confirmed) {
+      log.info("Cancelled");
+      return;
+    }
   }
   const spin = spinner(`Removing ${found.length} ${type}...`).start();
   let totalRemoved = 0;
@@ -25140,16 +25379,20 @@ var init_remove = __esm({
 // src/doctor.ts
 var doctor_exports = {};
 __export(doctor_exports, {
-  doctor: () => doctor
+  buildChecks: () => buildChecks,
+  doctor: () => doctor,
+  resolveDoctorContext: () => resolveDoctorContext
 });
 import path70 from "path";
-async function buildHookChecks(toolPaths, baseDir) {
+async function buildHookChecks(toolPaths, baseDir, localConfig) {
   const checks = [];
   for (const [tool, paths] of Object.entries(toolPaths)) {
-    if (!paths.settings) continue;
-    const settingsPath = path70.join(baseDir, paths.settings);
+    const hookPath = paths.hooks ? path70.join(resolveToolBaseDir(tool, localConfig), paths.hooks) : paths.settings ? path70.join(baseDir, paths.settings) : void 0;
+    if (!hookPath) continue;
+    const settingsPath = hookPath;
     const parentDir = path70.dirname(settingsPath);
-    if (!await pathExists(parentDir)) continue;
+    const installed = tool === COPILOT_TOOL_ID ? await isToolInstalledForConfig(tool, paths.hooks ?? paths.settings ?? "", localConfig) : await pathExists(parentDir);
+    if (!installed) continue;
     checks.push({
       name: `teamai hooks in ${tool} settings`,
       check: async () => {
@@ -25176,28 +25419,20 @@ async function hasInstalledCodexHooks(toolPaths, baseDir) {
   }
   return false;
 }
-async function doctor(options) {
-  log.info("Running diagnostics...\n");
+async function resolveDoctorContext() {
   const projectConfig = await detectProjectConfig();
   const localConfig = projectConfig ?? await loadLocalConfig();
-  if (!localConfig) {
-    console.log("  Scope: not initialized\n");
-    console.log("  \u2716 TeamAI is not initialized");
-    console.log("    \u2192 Run `teamai init <repo-url>` in a project, or add `--scope user` for all projects");
-    console.log("");
-    log.warn("Initialization is required before diagnostics can run.");
-    return false;
-  }
-  const scope = localConfig.scope ?? "user";
-  const scopeLabel = `${scope}${scope === "project" && localConfig.projectRoot ? ` (${localConfig.projectRoot})` : ""}`;
-  console.log(`  Scope: ${scopeLabel}
-`);
+  if (!localConfig) return null;
   const teamConfig = await loadTeamConfig(localConfig.repo.localPath);
   const toolPaths = teamConfig ? Object.fromEntries(
     Object.entries(scopedToolPaths(teamConfig, localConfig)).filter(([tool]) => !isAgentExcluded(localConfig, tool))
   ) : {};
-  const providerName = teamConfig?.provider;
   const baseDir = resolveHookScope(localConfig).baseDir;
+  return { localConfig, teamConfig, toolPaths, baseDir };
+}
+async function buildChecks(ctx) {
+  const { localConfig, teamConfig, toolPaths, baseDir } = ctx;
+  const providerName = teamConfig?.provider;
   const checks = [];
   if (providerName === "tgit") {
     const { isGfInstalled: isGfInstalled2, gfIsAuthenticated: gfIsAuthenticated2 } = await Promise.resolve().then(() => (init_tgit(), tgit_exports));
@@ -25256,7 +25491,7 @@ async function doctor(options) {
       },
       fix: "Check teamai.yaml in team repo for syntax errors"
     },
-    ...await buildHookChecks(toolPaths, baseDir),
+    ...await buildHookChecks(toolPaths, baseDir, localConfig),
     {
       name: "Env variables injected in shell profile",
       check: async () => {
@@ -25278,26 +25513,80 @@ async function doctor(options) {
       fix: "Run `teamai pull` to inject env variables into shell profile"
     }
   );
-  let allPassed = true;
+  return checks;
+}
+async function runChecks(checks, onResult) {
+  const results = [];
   for (const { name, check, fix } of checks) {
     const ok = await check();
-    if (ok) {
-      console.log(`  \u2714 ${name}`);
+    const result = ok ? { name, ok } : { name, ok, fix };
+    results.push(result);
+    onResult?.(result);
+  }
+  return results;
+}
+function emitReport(report) {
+  console.log(JSON.stringify(report, null, 2));
+}
+function renderResult({ name, ok, fix }) {
+  if (ok) {
+    console.log(`  \u2714 ${name}`);
+    return;
+  }
+  console.log(`  \u2716 ${name}`);
+  if (fix) console.log(`    \u2192 ${fix}`);
+}
+async function doctor(options) {
+  const jsonMode = options.json === true;
+  if (jsonMode) setStderrOnly(true);
+  log.info("Running diagnostics...\n");
+  const ctx = await resolveDoctorContext();
+  if (!ctx) {
+    const notInitialized = {
+      name: "TeamAI is not initialized",
+      ok: false,
+      fix: "Run `teamai init <repo-url>` in a project, or add `--scope user` for all projects"
+    };
+    if (jsonMode) {
+      emitReport({ ok: false, scope: null, checks: [notInitialized] });
     } else {
-      console.log(`  \u2716 ${name}`);
-      if (fix) console.log(`    \u2192 ${fix}`);
-      allPassed = false;
+      console.log("  Scope: not initialized\n");
+      renderResult(notInitialized);
+      console.log("");
     }
+    log.warn("Initialization is required before diagnostics can run.");
+    return false;
   }
+  const { localConfig, toolPaths, baseDir } = ctx;
+  const scope = localConfig.scope ?? "user";
+  if (!jsonMode) {
+    const scopeLabel = `${scope}${scope === "project" && localConfig.projectRoot ? ` (${localConfig.projectRoot})` : ""}`;
+    console.log(`  Scope: ${scopeLabel}
+`);
+  }
+  const results = await runChecks(await buildChecks(ctx), jsonMode ? void 0 : renderResult);
+  let allPassed = results.every((r) => r.ok);
   const { pkgDoctorReport: pkgDoctorReport2 } = await Promise.resolve().then(() => (init_commands(), commands_exports));
   const packageReport = await pkgDoctorReport2(localConfig, process.cwd());
+  if (packageReport && !packageReport.allPassed) allPassed = false;
+  const codexNote = await hasInstalledCodexHooks(toolPaths, baseDir) ? codexTrustReminder() : null;
+  if (jsonMode) {
+    emitReport({
+      ok: allPassed,
+      scope,
+      checks: results,
+      // pkgDoctorReport renders its own lines; they are human text, not checks.
+      ...packageReport ? { packages: { ok: packageReport.allPassed, lines: packageReport.lines } } : {},
+      ...codexNote ? { notes: [codexNote] } : {}
+    });
+    return allPassed;
+  }
   if (packageReport) {
     for (const line of packageReport.lines) console.log(line);
-    if (!packageReport.allPassed) allPassed = false;
   }
-  if (await hasInstalledCodexHooks(toolPaths, baseDir)) {
+  if (codexNote) {
     console.log("");
-    log.info(codexTrustReminder());
+    log.info(codexNote);
   }
   console.log("");
   if (allPassed) {
@@ -25314,6 +25603,7 @@ var init_doctor = __esm({
     init_fs();
     init_logger();
     init_types();
+    init_base();
     init_hooks2();
     init_home();
   }
@@ -25897,6 +26187,12 @@ async function saveTagsScopeConfig(localConfig) {
   } else {
     await saveLocalConfig(localConfig);
   }
+  try {
+    const state = await loadStateForScope(localConfig);
+    state.lastPullRev = null;
+    await saveStateForScope(state, localConfig);
+  } catch {
+  }
 }
 async function tagsList(options) {
   const localConfig = await resolveTagsScope();
@@ -26135,7 +26431,7 @@ function opencodePluginTargets(baseDir, scope) {
   }
   return targets;
 }
-async function discoverToolResources(tool, toolPath, baseDir, teamSkillNames, teamRuleNames, teamAgentNames, hookTargets, scope) {
+async function discoverToolResources(tool, toolPath, baseDir, teamSkillNames, teamRuleNames, teamAgentNames, hookTargets, standaloneHookManifestPath, scope) {
   const res = {
     hookFiles: [],
     openclawHookDirs: [],
@@ -26145,7 +26441,16 @@ async function discoverToolResources(tool, toolPath, baseDir, teamSkillNames, te
     ruleFiles: [],
     agentFiles: []
   };
-  if (tool === "opencode") {
+  if (toolPath.hooks) {
+    const hooksPath = path74.join(baseDir, toolPath.hooks);
+    if (await pathExists(hooksPath) && (await hasTeamaiHooks(hooksPath, tool, standaloneHookManifestPath) || isEmptyHooksResidue(await readJson(hooksPath)))) {
+      res.hookFiles.push({
+        path: hooksPath,
+        tool,
+        manifestPath: standaloneHookManifestPath
+      });
+    }
+  } else if (tool === "opencode") {
     const { resolveOpencodePluginDir: resolveOpencodePluginDir2, OPENCODE_HOOK_FILE: OPENCODE_HOOK_FILE2 } = await Promise.resolve().then(() => (init_opencode_hooks(), opencode_hooks_exports));
     for (const target of opencodePluginTargets(baseDir, scope)) {
       const pluginDir = resolveOpencodePluginDir2(target.baseDir, target.scope);
@@ -26232,6 +26537,10 @@ async function discoverToolResources(tool, toolPath, baseDir, teamSkillNames, te
 async function buildRemovalPlan(localConfig, teamConfig, agentFilter) {
   const baseDir = resolveBaseDir(localConfig);
   const teamaiHome = getDataHome(localConfig);
+  const standaloneHookManifestPath = getManagedHooksPath(
+    localConfig.scope,
+    localConfig.projectRoot
+  );
   const repoPath = localConfig.repo.localPath;
   const teamSkillNames = await collectTeamSkillNames(repoPath);
   for (const name of BUILTIN_SKILL_NAMES) teamSkillNames.add(name);
@@ -26268,11 +26577,12 @@ async function buildRemovalPlan(localConfig, teamConfig, agentFilter) {
       await discoverToolResources(
         tool,
         toolPath,
-        baseDir,
+        resolveToolBaseDir(tool, localConfig),
         teamSkillNames,
         teamRuleNames,
         teamAgentNames,
         hookTargets,
+        standaloneHookManifestPath,
         localConfig.scope
       )
     );
@@ -26890,16 +27200,16 @@ async function hooksList(_options) {
   const { localConfig, teamConfig } = await autoDetectInit();
   const { baseDir } = resolveHookScope(localConfig);
   const rows = [];
-  for (const [tool, paths] of Object.entries(teamConfig.toolPaths)) {
-    if (!paths.settings) {
+  for (const [tool, paths] of Object.entries(scopedToolPaths(teamConfig, localConfig))) {
+    const hookPath = paths.hooks ? path76.join(resolveToolBaseDir(tool, localConfig), paths.hooks) : paths.settings ? path76.join(baseDir, paths.settings) : void 0;
+    if (!hookPath) {
       rows.push({ tool, status: "not configured", settingsPath: "no settings configured" });
       continue;
     }
-    const settingsPath = path76.join(baseDir, paths.settings);
     rows.push({
       tool,
-      status: await getHookStatus(settingsPath, tool),
-      settingsPath: formatDisplayPath(settingsPath)
+      status: await getHookStatus(hookPath, tool),
+      settingsPath: formatDisplayPath(hookPath)
     });
   }
   console.log(formatHooksList(rows));
@@ -26928,6 +27238,18 @@ async function hooksRemove(_options) {
   const { localConfig, teamConfig } = await autoDetectInit();
   const { baseDir, manifestPath } = resolveHookScope(localConfig);
   await reconcileHooksToAllTools(teamConfig.toolPaths, baseDir, [], manifestPath, { removeAll: true });
+  const copilotPaths = scopedToolPaths(teamConfig, localConfig)[COPILOT_TOOL_ID];
+  if (copilotPaths?.hooks) {
+    await reconcileHooks(
+      path76.join(resolveToolBaseDir(COPILOT_TOOL_ID, localConfig), copilotPaths.hooks),
+      COPILOT_TOOL_ID,
+      [],
+      {
+        manifestPath: getManagedHooksPath(localConfig.scope, localConfig.projectRoot),
+        removeAll: true
+      }
+    );
+  }
   await sweepLegacyProjectHooks(teamConfig.toolPaths, localConfig);
   log.success("Hooks removed from all AI tool settings");
 }
@@ -43317,16 +43639,16 @@ membersCmd.command("list").description("List team members").action(async () => {
   const { listMembers: listMembers2 } = await Promise.resolve().then(() => (init_members(), members_exports));
   await listMembers2(globalOpts);
 });
-program.command("remove <type> <names...>").description("Remove resource(s) from team repo and all local AI tools (type: skills|rules|agents|mcp)").action(async (type, names) => {
+program.command("remove <type> <names...>").description("Remove resource(s) from team repo and all local AI tools (type: skills|rules|agents|mcp)").option("--force", "Skip confirmation prompt").action(async (type, names, cmdOpts) => {
   const globalOpts = program.opts();
   const { remove: remove3 } = await Promise.resolve().then(() => (init_remove(), remove_exports));
-  await remove3(type, names, globalOpts);
+  await remove3(type, names, { ...globalOpts, ...cmdOpts });
 });
 registerPackagesCommand(program);
-program.command("doctor").description("Diagnose configuration issues").action(async () => {
+program.command("doctor").description("Diagnose configuration issues").option("--json", "Output the report as JSON (suitable for CI)").action(async (cmdOpts) => {
   const globalOpts = program.opts();
   const { doctor: doctor2 } = await Promise.resolve().then(() => (init_doctor(), doctor_exports));
-  const allPassed = await doctor2(globalOpts);
+  const allPassed = await doctor2({ ...globalOpts, ...cmdOpts });
   if (!allPassed) process.exitCode = 1;
 });
 var rolesCmd = program.command("roles").description("Manage team roles and resource namespaces").action(async () => {

package/package.json

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