@rachel_rotenberg/ai-contribution-tracker 1.0.16 → 1.0.18

package/index.ts

@@ -60,7 +60,14 @@ function loadState(g: string): TrackerState {
 }
 function saveState(g: string, s: TrackerState) { s.lastUpdated = new Date().toISOString(); fs.writeFileSync(getStatePath(g), JSON.stringify(s, null, 2)); }
 function formatK(n: number) { return n >= 1000 ? `${Math.round(n / 1000)}k` : String(n); }
-function buildMarkerParts(s: TrackerState): string[] {
+function buildCoAuthoredBy(s: TrackerState): string {
+    const models = s.models.join(", ");
+    const coAuthorName = models || s.promptCount > 0
+        ? `OpenCode (${[models, s.promptCount > 0 ? `${s.promptCount}p` : ""].filter(Boolean).join(", ")})`
+        : "OpenCode";
+    return `Co-authored-by: ${coAuthorName} <noreply@opencode.dev>`;
+}
+function formatMarker(s: TrackerState): string {
     const p: string[] = [];
     const ma = [...new Set(s.mainAgentTypes)]; if (ma.length) p.push(`Agent mode: ${ma.join(", ")}`);
     if (s.models.length) p.push(`Model: ${s.models.join(", ")}`);
@@ -74,26 +81,25 @@ function buildMarkerParts(s: TrackerState): string[] {
         if (t.reasoningTokens > 0) r += ` +${formatK(t.reasoningTokens)} reasoning`;
         return r;
     }).join(" | ")}`); }
-    return p;
-}
-function buildCoAuthoredBy(s: TrackerState): string {
-    const models = s.models.join(", ");
-    const coAuthorName = models || s.promptCount > 0
-        ? `OpenCode (${[models, s.promptCount > 0 ? `${s.promptCount}p` : ""].filter(Boolean).join(", ")})`
-        : "OpenCode";
-    return `Co-authored-by: ${coAuthorName} <noreply@opencode.dev>`;
-}
-function formatMarker(s: TrackerState, prefix?: string): string {
-    const parts = buildMarkerParts(s);
-    if (prefix) parts.unshift(prefix);
-    const marker = parts.length ? `Impacted by AI (${parts.join(" | ")})` : "Impacted by AI";
+    const marker = p.length ? `Impacted by AI (${p.join(" | ")})` : "Impacted by AI";
     return `${marker}\n${buildCoAuthoredBy(s)}`;
 }
 function writeFlag(g: string, s: TrackerState) {
     if (s.promptCount === 0 && s.mainAgentTypes.length === 0 && s.subagentTypes.length === 0 && s.subagentCount === 0 && Object.keys(s.tokensByModel).length === 0) return;
-    const fp = getFlagPath(g);
-    const isInline = fs.existsSync(fp) && fs.readFileSync(fp, "utf8").includes("Inline");
-    fs.writeFileSync(fp, formatMarker(s, isInline ? "Inline" : undefined));
+    const fp = getFlagPath(g), marker = formatMarker(s);
+    if (fs.existsSync(fp)) {
+        const ex = fs.readFileSync(fp, "utf8").trim();
+        if (ex.includes("Inline")) {
+            // Merge: preserve Inline marker, add agent data
+            const inner = marker.split('\n')[0].match(/\((.+)\)$/)?.[1];
+            const coAuthorLine = marker.split('\n').slice(1).join('\n');
+            const merged = inner ? `Impacted by AI (Inline + ${inner})` : "Impacted by AI (Inline)";
+            fs.writeFileSync(fp, coAuthorLine ? `${merged}\n${coAuthorLine}` : merged);
+            return;
+        }
+        // Always overwrite with latest state — state only grows, never shrinks
+    }
+    fs.writeFileSync(fp, marker);
 }
 
 // ─── Plugin ─────────────────────────────────────────────────
@@ -109,7 +115,7 @@ function appendOrCreateHook(hooksDir: string) {
         'if [ -f "$IMPACT_FLAG" ]; then',
         '    MARKER=$(cat "$IMPACT_FLAG")',
         '    if [ -z "$MARKER" ]; then MARKER="Impacted by AI"; fi',
-        '    if ! grep -qF "Impacted by AI" "$1"; then',
+        '    if ! grep -qF "$MARKER" "$1"; then',
         '        echo "" >> "$1"',
         '        echo "$MARKER" >> "$1"',
         '    fi',
@@ -155,15 +161,11 @@ function extractSessionId(event: any): string | null {
     return i.sessionID || i.session_id || i.id || null;
 }
 
-function sanitizeAgentName(name: string): string {
-    return name.trim();
-}
-
 function getOrCreateSession(sid: string, agent?: string): SessionState {
     let sess = sessions.get(sid);
     if (sess) return sess;
     // gitDir starts null — resolved ONLY from file paths in tool.execute.after
-    sess = { gitDir: null, isSubagent: false, agentName: sanitizeAgentName(agent ?? "session"), pendingPrompts: 0, pendingModels: [], lastTokens: new Map() };
+    sess = { gitDir: null, isSubagent: false, agentName: agent ?? "session", pendingPrompts: 0, pendingModels: [], lastTokens: new Map() };
     sessions.set(sid, sess);
     return sess;
 }
@@ -199,7 +201,7 @@ const AIContributionTracker: Plugin = async ({ directory, worktree }) => {
                     sessions.set(sid, {
                         gitDir: null, // NEVER resolve from cwd — wait for file paths
                         isSubagent: Boolean(info?.parentID),
-                        agentName: sanitizeAgentName(info?.agent ?? "session"),
+                        agentName: info?.agent ?? "session",
                         pendingPrompts: 0, pendingModels: [],
                         lastTokens: new Map(),
                     });
@@ -224,8 +226,11 @@ const AIContributionTracker: Plugin = async ({ directory, worktree }) => {
                     if (info.role !== "assistant" || !info.finish || !info.tokens) return;
                     const modelId = info.modelID ?? "unknown";
                     const msgId = info.id || info.messageID;
-                    const cur: TokenTotals = { inputTokens: Number(info.tokens.input ?? 0), outputTokens: Number(info.tokens.output ?? 0),
-                        cachedTokens: Number(info.tokens.cache?.read ?? 0), reasoningTokens: Number(info.tokens.reasoning ?? 0) };
+                    const rawInput = Number(info.tokens.input ?? 0);
+                    const cacheRead = Number(info.tokens.cache?.read ?? 0);
+                    const totalInput = Number(info.tokens.total ?? 0) || (rawInput + cacheRead);
+                    const cur: TokenTotals = { inputTokens: totalInput, outputTokens: Number(info.tokens.output ?? 0),
+                        cachedTokens: cacheRead, reasoningTokens: Number(info.tokens.reasoning ?? 0) };
                     const prev = msgId ? sess.lastTokens.get(msgId) : undefined;
                     // Clamp deltas to >= 0 (snapshots can decrease; we never subtract)
                     const delta: TokenTotals = {
@@ -253,7 +258,7 @@ const AIContributionTracker: Plugin = async ({ directory, worktree }) => {
                 if (sess.gitDir) {
                     // gitDir known — write directly
                     const state = loadState(sess.gitDir);
-                    const src = `opencode/${sanitizeAgentName(input.agent ?? "session")}`;
+                    const src = `opencode/${input.agent ?? "session"}`;
                     if (!state.mainAgentTypes.includes(src)) state.mainAgentTypes.push(src);
                     state.promptCount += 1;
                     if (input.model?.modelID && !state.models.includes(input.model.modelID)) state.models.push(input.model.modelID);
@@ -262,7 +267,7 @@ const AIContributionTracker: Plugin = async ({ directory, worktree }) => {
                 } else {
                     // gitDir NOT known yet — buffer in memory
                     sess.pendingPrompts += 1;
-                    if (input.agent) sess.agentName = sanitizeAgentName(input.agent);
+                    if (input.agent) sess.agentName = input.agent;
                     if (input.model?.modelID && !sess.pendingModels.includes(input.model.modelID)) sess.pendingModels.push(input.model.modelID);
                 }
             } catch { /* never crash OpenCode */ }
@@ -293,7 +298,6 @@ const AIContributionTracker: Plugin = async ({ directory, worktree }) => {
                     state.subagentCount += 1;
                     if (!state.subagentTypes.includes(agentType)) state.subagentTypes.push(agentType);
                     saveState(sess.gitDir, state);
-                    writeFlag(sess.gitDir, state);
                     writeFlag(sess.gitDir, state); // keep flag current for commit-before-idle
                 }
             } catch { /* never crash OpenCode */ }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rachel_rotenberg/ai-contribution-tracker",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "OpenCode plugin \u2014 tracks AI coding sessions and tags git commits with Impacted by AI markers",
   "main": "index.ts",
   "types": "index.ts",