codiedev 0.9.60 → 0.9.61

package/dist/limitEvent.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.classifyLimitKind = classifyLimitKind;
 exports.parseLimitEventFromTranscript = parseLimitEventFromTranscript;
 exports.parseCodexLimitEventFromTranscript = parseCodexLimitEventFromTranscript;
+exports.parseNativeLimitError = parseNativeLimitError;
+exports.parseNativeLimitEventFromTranscript = parseNativeLimitEventFromTranscript;
 exports.tailForLimitEvent = tailForLimitEvent;
 function classifyLimitKind(text) {
     const t = text.toLowerCase();
@@ -129,6 +131,46 @@ function parseCodexLimitEventFromTranscript(transcript) {
     }
     return found;
 }
+/** Only explicit provider errors qualify; never scan user/assistant prose. */
+function parseNativeLimitError(input, now = Date.now()) {
+    const context = input.errorContext ?? input.error_context;
+    if (context !== undefined && context !== "model_call")
+        return null;
+    const error = input.error;
+    const fields = error && typeof error === "object" ? error : {};
+    const code = String(fields.code ?? fields.name ?? input.error_code ?? "");
+    const text = typeof error === "string" ? error
+        : typeof fields.message === "string" ? fields.message
+            : typeof input.error_message === "string" ? input.error_message : "";
+    if (!/^(?:429|rate[_-]?limit(?:ed|_exceeded|_error)?|RateLimitError|quota_exceeded)$/i.test(code)
+        && !/\b(?:rate limit (?:exceeded|reached)|too many requests|usage limit (?:exceeded|reached)|premium requests? (?:exhausted|limit reached))\b/i.test(text))
+        return null;
+    const rawAt = input.timestamp;
+    const parsedAt = typeof rawAt === "number" ? rawAt : typeof rawAt === "string" ? Date.parse(rawAt) : NaN;
+    return { kind: classifyLimitKind(text), at: Number.isFinite(parsedAt) && parsedAt > 0 ? parsedAt : now,
+        resetText: parseResetText(text), reason: code || "rate_limit" };
+}
+function parseNativeLimitEventFromTranscript(transcript) {
+    let found = null;
+    for (const line of transcript.split("\n")) {
+        try {
+            const entry = JSON.parse(line);
+            if (entry.type === "agent.limit" && Number.isFinite(entry.at) && entry.at > 0
+                && ["session", "user_spend", "org_spend", "other"].includes(entry.kind)) {
+                found = { kind: entry.kind, at: entry.at, resetText: typeof entry.resetText === "string" ? entry.resetText : null,
+                    ...(typeof entry.reason === "string" ? { reason: entry.reason } : {}) };
+                continue;
+            }
+            if (!entry.timestamp)
+                continue; // no stable timestamp means snapshots cannot deduplicate
+            if (entry.type === "agent.error" || entry.type === "session.error") {
+                found = parseNativeLimitError({ ...(entry.data ?? entry), timestamp: entry.timestamp }) ?? found;
+            }
+        }
+        catch { /* tolerant of incomplete transcript tails */ }
+    }
+    return found;
+}
 // Tail of the raw transcript to ship with the limit event so the server can
 // summarize "what they were working on" immediately — without waiting for the
 // SessionEnd capture (which can lag hours, or drop entirely on Windows).

package/dist/limitEventReporter.d.ts

@@ -1,5 +1,5 @@
 import { type LimitEvent } from "./limitEvent";
-export type LimitEventSource = "claude-code" | "codex";
+export type LimitEventSource = "claude-code" | "codex" | "cursor" | "copilot";
 export type LimitEventPayload = LimitEvent & {
     source: LimitEventSource;
     sessionId?: string;

package/dist/limitEventReporter.js

@@ -76,7 +76,7 @@ function postLimitEvent(config, payload, timeoutMs = 5_000) {
 async function reportTranscriptLimitEvent(args) {
     const parse = args.source === "codex"
         ? limitEvent_1.parseCodexLimitEventFromTranscript
-        : limitEvent_1.parseLimitEventFromTranscript;
+        : args.source === "cursor" || args.source === "copilot" ? limitEvent_1.parseNativeLimitEventFromTranscript : limitEvent_1.parseLimitEventFromTranscript;
     const parsed = parse(args.transcript);
     if (!parsed && !args.emitMinimalOnMiss)
         return false;

package/dist/nativeSteering.d.ts

@@ -0,0 +1,5 @@
+/** Native records only: quoted denial/interrupt text in conversation is not evidence. */
+export declare function parseNativeSteering(content: string): {
+    interrupts: number;
+    rejections: number;
+};

package/dist/nativeSteering.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseNativeSteering = parseNativeSteering;
+/** Native records only: quoted denial/interrupt text in conversation is not evidence. */
+function parseNativeSteering(content) {
+    const interrupts = new Set();
+    const abortedTurns = new Set();
+    const rejections = new Set();
+    for (const [index, line] of content.split("\n").entries()) {
+        try {
+            const event = JSON.parse(line);
+            const id = String(event.id ?? event.uuid ?? event.toolCallId ?? index);
+            if (event.type === "agent.interruption")
+                interrupts.add(id);
+            if (event.type === "turn_ended" && event.status === "aborted")
+                abortedTurns.add(id);
+            if (event.type === "agent.rejection")
+                rejections.add(id);
+            // Cursor tool failures distinguish a user-denied permission from an
+            // ordinary tool failure. Don't guess from free-form error messages.
+            if (event.type === "tool_result" && event.error?.code === "user_denied")
+                rejections.add(id);
+        }
+        catch { /* incomplete transcript records are ignored */ }
+    }
+    return { interrupts: Math.max(interrupts.size, abortedTurns.size), rejections: rejections.size };
+}

package/dist/teamSkillContext.d.ts

@@ -0,0 +1,9 @@
+/** Session-start context uses each client's supported output contract. */
+export declare const TEAM_SKILL_CONTEXT = "This machine is connected to Codiedev, the team's artifact and skill library.\nBefore a substantial coding task, run codiedev search \"<brief task description>\" and reuse a relevant team skill by running codiedev pull <exact-key> and following its instructions. If no skill fits, continue the task.\nUse codiedev push <file.md> to share an artifact when asked, codiedev ask \"<question>\" for team knowledge, and codiedev inbox to check messages. Use codiedev --help for other commands. If codiedev is unavailable, use npx codiedev@latest.";
+export declare function teamSkillSessionOutput(source: "cursor" | "copilot", context?: string): {
+    additional_context: string;
+    additionalContext?: undefined;
+} | {
+    additionalContext: string;
+    additional_context?: undefined;
+};

package/dist/teamSkillContext.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TEAM_SKILL_CONTEXT = void 0;
+exports.teamSkillSessionOutput = teamSkillSessionOutput;
+/** Session-start context uses each client's supported output contract. */
+exports.TEAM_SKILL_CONTEXT = `This machine is connected to Codiedev, the team's artifact and skill library.
+Before a substantial coding task, run codiedev search "<brief task description>" and reuse a relevant team skill by running codiedev pull <exact-key> and following its instructions. If no skill fits, continue the task.
+Use codiedev push <file.md> to share an artifact when asked, codiedev ask "<question>" for team knowledge, and codiedev inbox to check messages. Use codiedev --help for other commands. If codiedev is unavailable, use npx codiedev@latest.`;
+function teamSkillSessionOutput(source, context = exports.TEAM_SKILL_CONTEXT) {
+    return source === "cursor" ? { additional_context: context } : { additionalContext: context };
+}

package/dist/transcriptModels.d.ts

@@ -1,6 +1,8 @@
 /** Compact per-model usage, derived from captured transcript records. */
 export type TranscriptModelUsage = {
     model: string;
+    /** False for Copilot model/request hints before token totals arrive. */
+    tokensAvailable?: boolean;
     /** Assistant message IDs; nonzero cumulative usage events for Codex. */
     requests: number;
     inputTokens: number;

package/dist/transcriptModels.js

@@ -44,6 +44,7 @@ function* transcriptRecords(content, source) {
 function parseTranscriptModels(content, source) {
     const buckets = new Map();
     const messages = new Map();
+    const tokenEvidence = new Set();
     let model = "Unattributed";
     let previous = {
         inputTokens: 0,
@@ -143,9 +144,12 @@ function parseTranscriptModels(content, source) {
             model =
                 typeof message.model === "string" ? message.model : "Unattributed";
             const raw = message.usage;
+            // Copilot's shutdown token totals carry `requests: 0`: its calls are
+            // already counted from the assistant records.
+            const requests = event.requests;
             usage = {
                 ...empty(model),
-                requests: 1,
+                requests: typeof requests === "number" && Number.isFinite(requests) ? Math.max(0, requests) : 1,
                 inputTokens: positive(raw.input_tokens),
                 outputTokens: positive(raw.output_tokens),
                 cacheReadTokens: positive(raw.cache_read_input_tokens),
@@ -153,6 +157,8 @@ function parseTranscriptModels(content, source) {
             };
             messageId = message.id ?? event.uuid ?? messageId;
         }
+        if (source === "copilot" && event.type === "copilot.usage")
+            tokenEvidence.add(usage.model);
         // Client placeholders are not model executions.
         if (!usage.model.trim() || usage.model.startsWith("<"))
             continue;
@@ -197,7 +203,7 @@ function parseTranscriptModels(content, source) {
         delete buckets.get(key).costUsd;
     for (const key of incompleteReasoning)
         delete buckets.get(key).reasoningTokens;
-    return [...buckets.values()];
+    return [...buckets.values()].map(row => source === "copilot" && !tokenEvidence.has(row.model) ? { ...row, tokensAvailable: false } : row);
 }
 function totalModelTokens(row) {
     return (row.inputTokens +

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import type { CaptureSignals } from "./captureSignals";
-import type { TranscriptModelUsage } from "./transcriptModels";
+import { type TranscriptModelUsage } from "./transcriptModels";
 import { spawn as nodeSpawn } from "child_process";
 import type { CaptureLogEntry } from "./captureLog";
 import { codiedevStateDir } from "./configDir";
@@ -89,6 +89,7 @@ export interface CapturePayloadInput {
     final?: boolean;
     costUsd?: number;
 }
+export declare function stripRepoUrlCredentials(url: string): string;
 export declare function buildCapturePayload(input: CapturePayloadInput): Record<string, unknown>;
 export declare function hashToken(token: string): string;
 export declare function extractHookNodePath(cmd: string | undefined): string | undefined;
@@ -96,6 +97,12 @@ export declare function resetStableNodeCacheForTests(): void;
 export declare function claudeCodeInstalled(): boolean;
 export declare function codexInstalled(): boolean;
 export declare function cursorInstalled(): boolean;
+/**
+ * GitHub Copilot: `$COPILOT_HOME` / ~/.copilot (either surface has run once),
+ * the `copilot` CLI on PATH, or VS Code's Copilot Chat extension. VS Code's
+ * agent and the CLI read the same user hooks, so one install covers both.
+ */
+export declare function copilotInstalled(): boolean;
 export declare function openCodeInstalled(): boolean;
 /** Install a dormant global OpenCode adapter. Installing it unconditionally
  * keeps `codiedev connect` as the only setup step even when Codie/OpenCode is
@@ -116,6 +123,8 @@ export declare function ensureAllCodiedevHooksInstalled(): void;
 export declare function ensureSessionStartHookInstalled(): void;
 export declare function installClaudeCodeInstructions(): void;
 export declare function installCodexInstructions(): void;
+export declare function copilotInstructionsPath(): string;
+export declare function installCopilotInstructions(): void;
 export declare function installCursorInstructions(): void;
 /**
  * Install the Codiedev MCP server into Claude Code's user-scope config.
@@ -173,6 +182,13 @@ export declare function installCodexMcp(): boolean;
 export declare function installCodexHook(): void;
 export declare function ensureCodexLimitHookInstalled(): void;
 export declare function installCursorHook(): void;
+export declare function copilotHooksPath(): string;
+export declare function installCopilotHook(agentSecurityEnabled?: boolean): void;
+/** Self-heal the Copilot hook file after upgrades or drift (like Cursor's). */
+export declare function ensureCopilotCodiedevHooksInstalled(): void;
+/** Repair Cursor's complete flat hook set after upgrades or configuration
+ * drift. This is deliberately separate from Claude Code's nested-hook healer:
+ * the schemas and event names differ, and mixing them risks corrupting both. */
 export declare function ensureCursorCodiedevHooksInstalled(): void;
 export interface ParsedStats {
     messageCount: number;
@@ -184,7 +200,7 @@ export interface SteeringStats {
 }
 export declare function parseClaudeSteering(content: string): SteeringStats;
 export declare function parseCodexSteering(content: string): SteeringStats;
-export declare function parseSteering(content: string, mode: "claude-code" | "codex" | "cursor" | "opencode"): SteeringStats;
+export declare function parseSteering(content: string, mode: "claude-code" | "codex" | "cursor" | "opencode" | "copilot"): SteeringStats;
 export interface UsageStats {
     inputTokens: number;
     outputTokens: number;
@@ -196,7 +212,7 @@ export interface UsageStats {
     /** Engine-reported spend (opencode SDK `info.cost`). Desktop mode only. */
     costUsd?: number;
 }
-export declare function parseUsage(content: string, mode: "claude-code" | "codex" | "cursor" | "opencode" | "desktop"): UsageStats;
+export declare function parseUsage(content: string, mode: "claude-code" | "codex" | "cursor" | "opencode" | "desktop" | "copilot"): UsageStats;
 export declare function parseSessionStart(content: string): number | null;
 export declare function parseClaudeCodeStats(content: string): ParsedStats;
 /** Convert OpenCode's SDK message array (`{info, parts}[]`) into the same

package/dist/utils.js

@@ -53,6 +53,7 @@ exports.parseAuthoredBranches = parseAuthoredBranches;
 exports.parseAuthoredShas = parseAuthoredShas;
 exports.getGitBranch = getGitBranch;
 exports.getGitHeadSha = getGitHeadSha;
+exports.stripRepoUrlCredentials = stripRepoUrlCredentials;
 exports.buildCapturePayload = buildCapturePayload;
 exports.hashToken = hashToken;
 exports.extractHookNodePath = extractHookNodePath;
@@ -60,6 +61,7 @@ exports.resetStableNodeCacheForTests = resetStableNodeCacheForTests;
 exports.claudeCodeInstalled = claudeCodeInstalled;
 exports.codexInstalled = codexInstalled;
 exports.cursorInstalled = cursorInstalled;
+exports.copilotInstalled = copilotInstalled;
 exports.openCodeInstalled = openCodeInstalled;
 exports.installOpenCodeCapturePlugin = installOpenCodeCapturePlugin;
 exports.vscodeCopilotInstalled = vscodeCopilotInstalled;
@@ -72,6 +74,8 @@ exports.ensureAllCodiedevHooksInstalled = ensureAllCodiedevHooksInstalled;
 exports.ensureSessionStartHookInstalled = ensureSessionStartHookInstalled;
 exports.installClaudeCodeInstructions = installClaudeCodeInstructions;
 exports.installCodexInstructions = installCodexInstructions;
+exports.copilotInstructionsPath = copilotInstructionsPath;
+exports.installCopilotInstructions = installCopilotInstructions;
 exports.installCursorInstructions = installCursorInstructions;
 exports.installClaudeCodeMcp = installClaudeCodeMcp;
 exports.installCursorMcp = installCursorMcp;
@@ -84,6 +88,9 @@ exports.installCodexMcp = installCodexMcp;
 exports.installCodexHook = installCodexHook;
 exports.ensureCodexLimitHookInstalled = ensureCodexLimitHookInstalled;
 exports.installCursorHook = installCursorHook;
+exports.copilotHooksPath = copilotHooksPath;
+exports.installCopilotHook = installCopilotHook;
+exports.ensureCopilotCodiedevHooksInstalled = ensureCopilotCodiedevHooksInstalled;
 exports.ensureCursorCodiedevHooksInstalled = ensureCursorCodiedevHooksInstalled;
 exports.parseClaudeSteering = parseClaudeSteering;
 exports.parseCodexSteering = parseCodexSteering;
@@ -114,6 +121,7 @@ exports.runDeferredUpload = runDeferredUpload;
 exports.transcriptReadSkipReason = transcriptReadSkipReason;
 exports.shouldReportCaptureSkip = shouldReportCaptureSkip;
 const fs = __importStar(require("fs"));
+const transcriptModels_1 = require("./transcriptModels");
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const child_process_1 = require("child_process");
@@ -122,6 +130,9 @@ const captureLog_1 = require("./captureLog");
 const configDir_1 = require("./configDir");
 Object.defineProperty(exports, "codiedevStateDir", { enumerable: true, get: function () { return configDir_1.codiedevStateDir; } });
 const codexHookTrust_1 = require("./codexHookTrust");
+const teamSkillContext_1 = require("./teamSkillContext");
+const nativeSteering_1 = require("./nativeSteering");
+const copilotHooks_1 = require("./copilotHooks");
 const CONFIG_DIR = (0, configDir_1.codiedevStateDir)();
 exports.CONFIG_PATH = path.join(CONFIG_DIR, "config.json");
 function readConfig() {
@@ -824,10 +835,13 @@ function getGitHeadSha(cwd) {
         return null;
     }
 }
+function stripRepoUrlCredentials(url) {
+    return url.replace(/^(\s*[a-zA-Z][a-zA-Z0-9+.-]*:\/\/)[^/?#]*@/, "$1");
+}
 function buildCapturePayload(input) {
     return {
         sessionId: input.sessionId,
-        repoUrl: input.remoteUrl ?? "",
+        repoUrl: stripRepoUrlCredentials(input.remoteUrl ?? ""),
         repoId: input.matchedRepoId,
         companyId: input.companyId,
         branch: input.branch ?? "",
@@ -836,7 +850,7 @@ function buildCapturePayload(input) {
         // see no change; newer servers index the session under every key.
         branches: input.branches && input.branches.length ? input.branches : undefined,
         headShas: input.headShas && input.headShas.length ? input.headShas : undefined,
-        gitRefs: input.gitRefs && input.gitRefs.length ? input.gitRefs : undefined,
+        gitRefs: input.gitRefs && input.gitRefs.length ? input.gitRefs.map(ref => ({ ...ref, repoUrl: stripRepoUrlCredentials(ref.repoUrl) })) : undefined,
         pullRequestUrls: input.pullRequestUrls && input.pullRequestUrls.length
             ? input.pullRequestUrls
             : undefined,
@@ -1044,6 +1058,24 @@ function codexInstalled() {
 function cursorInstalled() {
     return fs.existsSync(CURSOR_DIR);
 }
+/**
+ * GitHub Copilot: `$COPILOT_HOME` / ~/.copilot (either surface has run once),
+ * the `copilot` CLI on PATH, or VS Code's Copilot Chat extension. VS Code's
+ * agent and the CLI read the same user hooks, so one install covers both.
+ */
+function copilotInstalled() {
+    if (fs.existsSync((0, copilotHooks_1.copilotHome)()))
+        return true;
+    if (vscodeCopilotInstalled())
+        return true;
+    try {
+        (0, child_process_1.execSync)(process.platform === "win32" ? "where copilot" : "command -v copilot", { stdio: ["pipe", "pipe", "pipe"] });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function openCodeInstalled() {
     if (fs.existsSync(OPENCODE_DIR))
         return true;
@@ -1475,13 +1507,13 @@ Tell the user the portal URL when the submit returns.
  * (no per-repo CLAUDE.md needed). Idempotent — replaces the existing block
  * between its begin/end markers on re-run.
  */
-function writeInstructionsBlock(targetPath) {
+function writeInstructionsBlock(targetPath, body = CODIEDEV_INSTRUCTIONS_BODY) {
     const dir = path.dirname(targetPath);
     if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
     }
     const block = `${CODIEDEV_INSTRUCTIONS_BEGIN}\n` +
-        CODIEDEV_INSTRUCTIONS_BODY +
+        body +
         `\n${CODIEDEV_INSTRUCTIONS_END}\n`;
     let existing = "";
     if (fs.existsSync(targetPath)) {
@@ -1512,6 +1544,12 @@ function installClaudeCodeInstructions() {
 function installCodexInstructions() {
     writeInstructionsBlock(CODEX_USER_INSTRUCTIONS_PATH);
 }
+function copilotInstructionsPath() {
+    return path.join((0, copilotHooks_1.copilotHome)(), "copilot-instructions.md");
+}
+function installCopilotInstructions() {
+    writeInstructionsBlock(copilotInstructionsPath(), `${teamSkillContext_1.TEAM_SKILL_CONTEXT}\n\n${CODIEDEV_INSTRUCTIONS_BODY}`);
+}
 // Cursor uses .mdc rule files with YAML frontmatter (description, alwaysApply,
 // globs). `.cursorrules` is deprecated and ignored by Agent mode as of 2026.
 const CURSOR_INSTRUCTIONS_FRONTMATTER = `---
@@ -1527,7 +1565,7 @@ function installCursorInstructions() {
     const block = CURSOR_INSTRUCTIONS_FRONTMATTER +
         CODIEDEV_INSTRUCTIONS_BEGIN +
         "\n" +
-        CODIEDEV_INSTRUCTIONS_BODY +
+        `${teamSkillContext_1.TEAM_SKILL_CONTEXT}\n\n${CODIEDEV_INSTRUCTIONS_BODY}` +
         "\n" +
         CODIEDEV_INSTRUCTIONS_END +
         "\n";
@@ -1545,7 +1583,7 @@ function installCursorInstructions() {
             existing.slice(0, beginIdx) +
                 CODIEDEV_INSTRUCTIONS_BEGIN +
                 "\n" +
-                CODIEDEV_INSTRUCTIONS_BODY +
+                `${teamSkillContext_1.TEAM_SKILL_CONTEXT}\n\n${CODIEDEV_INSTRUCTIONS_BODY}` +
                 "\n" +
                 CODIEDEV_INSTRUCTIONS_END +
                 existing.slice(endIdx + CODIEDEV_INSTRUCTIONS_END.length);
@@ -1904,12 +1942,93 @@ function installCursorHook() {
     replaceManaged("sessionStart", ["session-start-cursor"]);
     replaceManaged("sessionEnd", ["capture-cursor"]);
     replaceManaged("stop", ["backup-cursor"]);
+    for (const event of ["postToolUse", "postToolUseFailure", "subagentStart", "subagentStop"])
+        replaceManaged(event, ["observe-cursor"]);
     // Cursor cannot inject dynamic context from beforeSubmitPrompt today.
     // Remove older Codiedev discovery entries so prompts are not uploaded for
     // a response the host will discard; preserve any third-party hooks.
     replaceManaged("beforeSubmitPrompt", []);
     fs.writeFileSync(CURSOR_HOOKS_PATH, JSON.stringify(hooksFile, null, 2), "utf8");
 }
+// GitHub Copilot reads every `$COPILOT_HOME/hooks/*.json`, so Codiedev owns
+// one file and never edits anyone else's. camelCase events only: VS Code also
+// accepts Claude-style PascalCase names from the same file, and configuring
+// both would fire every hook twice.
+function copilotHooksPath() {
+    return path.join((0, copilotHooks_1.copilotHome)(), "hooks", "codiedev.json");
+}
+function copilotManagedHooks(agentSecurityEnabled) {
+    return [
+        ["sessionStart", "session-start-copilot", 10],
+        ["userPromptSubmitted", "discover-copilot", 10],
+        // agentStop = end of a turn: a non-final snapshot. VS Code sessions live
+        // until the chat is closed, so this is what keeps them captured.
+        ["agentStop", "backup-copilot", 30],
+        ["sessionEnd", "capture-copilot", 30],
+        ["errorOccurred", "limit-copilot", 10],
+    ];
+}
+const COPILOT_EVENTS = ["sessionStart", "userPromptSubmitted", "agentStop", "sessionEnd", "preToolUse", "postToolUse", "errorOccurred"];
+function installCopilotHook(agentSecurityEnabled = false) {
+    const hooksPath = copilotHooksPath();
+    let hooksFile = {};
+    try {
+        if (fs.existsSync(hooksPath)) {
+            const raw = fs.readFileSync(hooksPath, "utf8");
+            hooksFile = raw.trim() ? JSON.parse(raw) : {};
+        }
+    }
+    catch {
+        hooksFile = {};
+    }
+    hooksFile.version = 1;
+    const hooks = (hooksFile.hooks && typeof hooksFile.hooks === "object" ? hooksFile.hooks : {});
+    const managed = copilotManagedHooks(agentSecurityEnabled);
+    for (const eventName of COPILOT_EVENTS) {
+        const existing = Array.isArray(hooks[eventName]) ? hooks[eventName] : [];
+        // Anything a user added to this file by hand stays.
+        const preserved = existing.filter((hook) => !(0, detection_1.isCodiedevHookCommand)((hook.bash ?? hook.powershell ?? hook.command)));
+        const ours = managed
+            .filter(([event]) => event === eventName)
+            .map(([, subcommand, timeoutSec]) => {
+            const command = resolveHookCommand(subcommand);
+            return { type: "command", bash: command, powershell: command, timeoutSec };
+        });
+        if (preserved.length + ours.length === 0)
+            delete hooks[eventName];
+        else
+            hooks[eventName] = [...preserved, ...ours];
+    }
+    hooksFile.hooks = hooks;
+    fs.mkdirSync(path.dirname(hooksPath), { recursive: true });
+    fs.writeFileSync(hooksPath, JSON.stringify(hooksFile, null, 2), "utf8");
+}
+/** Self-heal the Copilot hook file after upgrades or drift (like Cursor's). */
+function ensureCopilotCodiedevHooksInstalled() {
+    const agentSecurityEnabled = false; // production line: no security hooks
+    try {
+        const hooksPath = copilotHooksPath();
+        if (!fs.existsSync(hooksPath))
+            return;
+        const parsed = JSON.parse(fs.readFileSync(hooksPath, "utf8"));
+        const hooks = parsed.hooks ?? {};
+        const commandsFor = (eventName) => (Array.isArray(hooks[eventName]) ? hooks[eventName] : [])
+            .map((entry) => (entry.bash ?? entry.powershell ?? entry.command))
+            .filter((command) => typeof command === "string" && (0, detection_1.isCodiedevHookCommand)(command));
+        const required = copilotManagedHooks(agentSecurityEnabled);
+        const complete = required.every(([eventName, subcommand]) => commandsFor(eventName).filter((command) => command.trim().endsWith(subcommand)).length === 1);
+        const stale = COPILOT_EVENTS.some((eventName) => commandsFor(eventName).length !== required.filter(([event]) => event === eventName).length);
+        if (complete && !stale)
+            return;
+        installCopilotHook(agentSecurityEnabled);
+    }
+    catch {
+        // Best-effort — a malformed hook file must never block capture.
+    }
+}
+/** Repair Cursor's complete flat hook set after upgrades or configuration
+ * drift. This is deliberately separate from Claude Code's nested-hook healer:
+ * the schemas and event names differ, and mixing them risks corrupting both. */
 function ensureCursorCodiedevHooksInstalled() {
     try {
         if (!fs.existsSync(CURSOR_HOOKS_PATH))
@@ -1920,6 +2039,10 @@ function ensureCursorCodiedevHooksInstalled() {
             ["sessionStart", "session-start-cursor"],
             ["sessionEnd", "capture-cursor"],
             ["stop", "backup-cursor"],
+            ["postToolUse", "observe-cursor"],
+            ["postToolUseFailure", "observe-cursor"],
+            ["subagentStart", "observe-cursor"],
+            ["subagentStop", "observe-cursor"],
         ];
         const has = (eventName, subcommand) => {
             const entries = hooks[eventName];
@@ -1981,46 +2104,27 @@ function parseCodexSteering(content) {
     return { interrupts, rejections };
 }
 function parseSteering(content, mode) {
+    if (mode === "cursor" || mode === "copilot")
+        return (0, nativeSteering_1.parseNativeSteering)(content);
     return mode === "codex"
         ? parseCodexSteering(content)
         : parseClaudeSteering(content);
 }
 function parseClaudeUsage(content) {
-    // Claude Code logs per-turn usage; sum across the session. `input_tokens` is
-    // already fresh (cache read/creation are reported separately).
-    let inputTokens = 0;
-    let outputTokens = 0;
-    let cacheReadTokens = 0;
-    let cacheCreationTokens = 0;
+    const models = (0, transcriptModels_1.parseTranscriptModels)(content, "claude-code");
     let model = null;
     for (const line of content.split("\n")) {
-        if (!line.trim())
-            continue;
         try {
-            const e = JSON.parse(line);
-            const m = e?.message;
-            const u = m?.usage;
-            if (u) {
-                inputTokens += u.input_tokens ?? 0;
-                outputTokens += u.output_tokens ?? 0;
-                cacheReadTokens += u.cache_read_input_tokens ?? 0;
-                cacheCreationTokens += u.cache_creation_input_tokens ?? 0;
-            }
-            if (typeof m?.model === "string" && m.model)
-                model = m.model;
-        }
-        catch {
-            // skip malformed
+            const value = JSON.parse(line)?.message?.model;
+            if (typeof value === "string" && value.trim() && !value.startsWith("<"))
+                model = value;
         }
+        catch { /* partial records */ }
     }
-    return {
-        inputTokens,
-        outputTokens,
-        cacheTokens: cacheReadTokens + cacheCreationTokens,
-        cacheReadTokens,
-        cacheCreationTokens,
-        model,
-    };
+    const sum = (field) => models.reduce((total, usage) => total + usage[field], 0);
+    const cacheReadTokens = sum("cacheReadTokens"), cacheCreationTokens = sum("cacheCreationTokens");
+    return { inputTokens: sum("inputTokens"), outputTokens: sum("outputTokens"),
+        cacheTokens: cacheReadTokens + cacheCreationTokens, cacheReadTokens, cacheCreationTokens, model };
 }
 function parseCodexUsage(content) {
     // Codex reports a CUMULATIVE token_count per turn — the last one is the
@@ -2154,20 +2258,30 @@ function parseSessionStart(content) {
 function parseClaudeCodeStats(content) {
     let messageCount = 0;
     let toolCallCount = 0;
+    const messages = new Set();
+    const tools = new Set();
     const lines = content.split("\n").filter((l) => l.trim());
     for (const line of lines) {
         try {
             const entry = JSON.parse(line);
             if (!entry || typeof entry !== "object")
                 continue;
-            if (entry.type === "user" || entry.type === "assistant") {
+            const id = entry.message?.id ?? entry.uuid;
+            const messageKey = `${entry.type}:${id ?? messages.size}`;
+            if ((entry.type === "user" || entry.type === "assistant") && !messages.has(messageKey)) {
+                messages.add(messageKey);
                 messageCount++;
             }
             const c = entry.message?.content;
             if (Array.isArray(c)) {
-                for (const block of c) {
-                    if (block && block.type === "tool_use")
+                for (const [index, block] of c.entries()) {
+                    if (!block || block.type !== "tool_use")
+                        continue;
+                    const toolKey = block.id ?? `${messageKey}:${index}`;
+                    if (!tools.has(toolKey)) {
+                        tools.add(toolKey);
                         toolCallCount++;
+                    }
                 }
             }
         }
@@ -2215,14 +2329,14 @@ function normalizeOpenCodeTranscript(content) {
             else if (part.type === "tool") {
                 normalizedParts.push({
                     type: "tool_use",
-                    id: part.callID ?? part.id ?? "tool",
+                    id: part.callID ?? part.id,
                     name: part.tool ?? "tool",
                     input: part.state?.input ?? {},
                 });
                 if (part.state?.output != null || part.state?.error != null) {
                     normalizedParts.push({
                         type: "tool_result",
-                        tool_use_id: part.callID ?? part.id ?? "tool",
+                        tool_use_id: part.callID ?? part.id,
                         content: part.state?.output ?? part.state?.error,
                         is_error: part.state?.status === "error" || part.state?.error != null,
                     });
@@ -2238,6 +2352,7 @@ function normalizeOpenCodeTranscript(content) {
             type: role,
             timestamp,
             message: {
+                id: typeof info.id === "string" ? info.id : undefined,
                 role,
                 model: typeof info.modelID === "string" ? info.modelID : undefined,
                 usage: role === "assistant" ? {
@@ -2568,7 +2683,7 @@ function resolveCaptureFinal(argv2) {
         return false;
     if (argv2 === "capture-opencode-final" || argv2 === "capture-desktop-final")
         return true;
-    return argv2 === "capture" || argv2 === "capture-cursor" || argv2 === undefined
+    return argv2 === "capture" || argv2 === "capture-cursor" || argv2 === "capture-copilot" || argv2 === undefined
         ? true
         : undefined;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codiedev",
-  "version": "0.9.60",
-  "description": "Connect Claude Code, Codex, Cursor, OpenCode, or VS Code Copilot to Codiedev for team session capture and artifact collaboration — and run the governed Codie harness",
+  "version": "0.9.61",
+  "description": "Connect Claude Code, Codex, Cursor, OpenCode, or VS Code Copilot to Codiedev for team session capture and artifact collaboration \u2014 and run the governed Codie harness",
   "bin": {
     "codiedev": "dist/cli.js",
     "codiedev-hook": "dist/hook.js",
@@ -12,10 +12,13 @@
     "dev": "tsc --watch",
     "prepublishOnly": "tsc",
     "test": "vitest run",
-    "test:functional": "vitest run src/__tests__/limitEvent.functional.test.ts src/__tests__/harnessParity.functional.test.ts src/__tests__/cursorParity.functional.test.ts",
-    "test:harness-parity": "vitest run src/__tests__/harnessParity.functional.test.ts src/__tests__/cursorParity.functional.test.ts",
+    "test:functional": "vitest run src/__tests__/limitEvent.functional.test.ts src/__tests__/harnessParity.functional.test.ts src/__tests__/cursorParity.functional.test.ts src/__tests__/copilotCapture.functional.test.ts",
+    "test:harness-parity": "vitest run src/__tests__/harnessParity.functional.test.ts src/__tests__/cursorParity.functional.test.ts src/__tests__/copilotCapture.functional.test.ts",
     "test:harness-binaries": "node scripts/checkHarnessBinaries.mjs",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "test:live-sources": "npm run build && node scripts/liveSourceParity.mjs",
+    "test:ide-sources": "npm run build && node scripts/liveSourceParity.mjs --ide",
+    "test:metadata-parity": "vitest run src/__tests__/sourceMetadataMatrix.test.ts src/__tests__/copilotCapture.functional.test.ts src/__tests__/copilotCapture.test.ts src/__tests__/cursorParity.functional.test.ts src/__tests__/nativeSourceParity.test.ts src/__tests__/harnessParity.functional.test.ts src/__tests__/subagents.test.ts src/__tests__/transcriptModels.test.ts src/__tests__/captureRetry.test.ts src/__tests__/limitEvent.functional.test.ts src/__tests__/captureExclusions.test.ts"
   },
   "files": [
     "dist",