spidersan 0.10.0 → 0.20.2

package/dist/lib/ai/reasoner.js

@@ -6,37 +6,35 @@
  */
 import { chat } from './llm-client.js';
 // ─── Known Command Registry ──────────────────────────────────
-// Derived from src/commands/* + spidersan --help. Used to flag model hallucinations at output time.
-// Update when new commands ship.
+// Must equal the CLI's registered commands (src/bin/command-registry.ts); tests/reasoner.validator.test.ts
+// checks both directions. Used to flag model hallucinations at output time.
 const KNOWN_SPIDERSAN_COMMANDS = new Set([
-    'abandon', 'advise', 'ai-ping', 'ai-setup', 'ai-telemetry', 'ask', 'auto',
-    'bot', 'check-opt-out', 'cleanup', 'collab', 'config', 'conflicts', 'context',
-    'cross-conflicts', 'daily', 'dashboard', 'depends', 'doctor', 'explain',
-    'fleet-status', 'git-watch', 'github-sync', 'init', 'list', 'log', 'merge-order', 'merged',
-    'pulse', 'queen', 'ready-check', 'rebase-helper', 'register', 'registry-sync',
-    'rescue', 'stale', 'sync', 'sync-advisor', 'torrent', 'watch', 'welcome',
+    'abandon', 'cleanup', 'config', 'conflicts', 'context', 'cross-conflicts', 'depends',
+    'doctor', 'git-watch', 'github-sync', 'init', 'list', 'log', 'merge-order', 'merged',
+    'pr-check', 'ready-check', 'rebase-helper', 'register', 'registry-sync', 'stale',
+    'sync', 'verify-trunk', 'watch',
 ]);
 // ─── Embedded Scenario Playbook ─────────────────────────────
-// Optimized via PHC: Sonnet 4.6 proposer + Gemma 4 executor (score: 0.9718)
+// Optimized via PHC: Sonnet 4.6 proposer + Gemma 4 executor (score: 0.9718), measured before the
+// 0.20.0 trim removed the scenarios for dropped commands; the trimmed text is unscored.
 // Source: promptclimb/prompt_sonnet_spidersan.md
 const SCENARIO_PLAYBOOK = `## Spidersan Command Reference & Scenarios
 
 ### SCENARIO 1: New Repo Setup
 Situation: Starting work in a new or uninitialized repository.
-IMPORTANT: When setting up Spidersan for the first time, ALWAYS recommend \`welcome\` as the very first command — it provides guided onboarding before any other setup step.
-Commands: welcome → spidersan init → register --files "f1,f2" --agent <id> → doctor → list
+Commands: spidersan init → register --files "f1,f2" --agent <id> → doctor → list
 Reminder: Always verify repo health with \`doctor\` before proceeding.
 
 ### SCENARIO 2: Ghost/Abandoned Branches
 Situation: Unregistered branches drifting — some with salvageable code, others dead.
-Commands: rescue --scan → rescue --symbols <branch> → sync
-Decision: If \`rescue --symbols\` identifies salvageable code → cherry-pick. If empty/WIP → abandon.
+Commands: sync → stale → log --branch <branch> → abandon <branch>
+Decision: If the branch has unique commits worth keeping → cherry-pick them onto a fresh branch. If empty/WIP → abandon.
 
 ### SCENARIO 3: File Conflicts (Tier System)
 - TIER 3 (BLOCK): Critical file (auth, secrets, env) — halt, coordinate immediately.
 - TIER 2 (PAUSE): Important file (package.json, config, server) — coordinate before merging.
 - TIER 1 (WARN): Adjacent/related files — proceed with caution.
-Commands: conflicts → conflicts --tier 3 → conflicts --strict → conflicts --json → conflicts --wake
+Commands: conflicts → conflicts --tier 3 → conflicts --strict → conflicts --json → conflicts --notify
 Reminder: Tier escalation is mandatory for TIER 3 conflicts. Always reference the TIER level when reporting conflicts.
 
 ### SCENARIO 4: WIP / Not-Ready Code
@@ -45,100 +43,65 @@ Commands: ready-check → ready-check --json
 Rule: Never merge a branch that fails \`ready-check\`. All markers must be resolved first.
 
 ### SCENARIO 5: Real-Time Monitoring
-Commands: watch --agent <id> → auto start/stop/status
+Commands: watch --agent <id>
 Warning: Watch CPU loop if ghost branches claim same files. Fix: sync first.
-Recommendation: Use \`auto\` for periodic monitoring of agent activity.
 
-### SCENARIO 6: Task Decomposition (Torrent)
-Situation: Breaking a single task into sequential child subtasks for a serial workflow.
-IMPORTANT: \`torrent\` is for sequential subtask decomposition within a single workflow. For dispatching parallel independent agents simultaneously, use \`queen spawn\` instead (see SCENARIO 9).
-Commands: torrent decompose <TASK> -c N → torrent create <CHILD> -a <agent> → torrent complete <CHILD> → torrent tree → torrent merge-order
-Reminder: Ensure all child tasks are marked completed before executing \`torrent merge-order\`.
-
-### SCENARIO 7: Tangled Dependencies
-Commands: merge-order → merge-order --json → merge-order --blocking-count → depends <branch> → conflicts --wake
+### SCENARIO 6: Tangled Dependencies
+Commands: merge-order → merge-order --json → merge-order --blocking-count → depends <branch> → conflicts --notify
 Pattern: Merge foundation first → resolve blockers → re-check dependencies → merge dependents.
 
-### SCENARIO 8: Stale Branch Cleanup
+### SCENARIO 7: Stale Branch Cleanup
 Commands: stale → cleanup → abandon <branch> → merged <branch> → sync
 Triage: sync → stale → cleanup → verify with \`list\`.
 
-### SCENARIO 9: Queen Dispatch (Parallel Agents)
-Situation: Parallelizing work across multiple sub-agents or sub-spidersans simultaneously.
-IMPORTANT: When asked to parallelize across multiple agents or sub-spidersans, ALWAYS recommend \`queen spawn\` FIRST — this is the dedicated parallel dispatch command. Do NOT suggest \`torrent decompose\` for parallel agent dispatch. Torrent = sequential subtasks. Queen = parallel agents.
-Commands: queen spawn --task "desc" → queen status → queen dissolve <id>
-Rule: Dissolve inactive queens to prevent resource leakage. Use \`queen status\` to monitor all active queens.
-
-### SCENARIO 10: Hive Lifecycle
-Hive Operations (via envoak MCP, not spidersan CLI): hive enlist → hive signal --status in-progress → hive heartbeat → hive probe → hive accept → hive close → hive broadcast → hive broadcast-ack → hive broadcast-status → hive cns → hive gc
-Reminder: Use \`probe\` to verify hive readiness before proceeding to \`accept\`.
-
-### SCENARIO 11: Cross-Machine Conflicts
-Commands: pulse → cross-conflicts → cross-conflicts --local → doctor --remote
-Pattern: Use \`pulse\` to identify cross-machine activity, followed by conflict resolution steps.
+### SCENARIO 8: Cross-Machine Conflicts
+Commands: registry-sync --pull → cross-conflicts → cross-conflicts --local → doctor --remote
+Pattern: Pull the shared registry first, then resolve the conflicts it shows.
 
-### SCENARIO 12: Activity & Context
+### SCENARIO 9: Activity & Context
 Situation: Investigating recent activity, mysterious branches, or understanding what happened over a time period.
-IMPORTANT: When investigating recent or mysterious activity, ALWAYS start with \`log\` and \`daily\` commands first. Do NOT skip to \`rescue\` — log and daily give you the evidence base before taking any action.
-Commands: log → log --since 7d → log --branch <name> → daily → daily --branch <name> --tldr → daily --context --branch <name>
-Recommendation: Use \`daily --context\` for detailed summaries of recent activity.
+IMPORTANT: When investigating recent or mysterious activity, ALWAYS start with \`log\` first — it gives you the evidence base before taking any action.
+Commands: log → log --since 7d → log --branch <name> → context → context --json
 
-### SCENARIO 13: AI-Assisted Analysis & Proactive Advice
-Situation: Complex repo state that needs intelligent analysis — stale branches, hidden conflicts, unknown branches.
-IMPORTANT: When asked for proactive recommendations or advice about the repo state, ALWAYS recommend \`spidersan advise\` as your FIRST command. Do not give direct advice yourself — \`advise\` is the dedicated entry point for AI-driven proactive recommendations. Only follow with \`context\`, \`ask\`, or \`explain\` after \`advise\` has been run.
-Commands: ai-ping → context → context --json → ask "<question>" → advise → explain <branch>
-Decision: Use \`ai-ping\` to verify AI readiness. Use \`advise\` for proactive recommendations. Use \`ask\` for specific questions. Use \`explain\` for branch investigation.
-
-### SCENARIO 13B: Suspicious / Unknown Branch Investigation
+### SCENARIO 10: Suspicious / Unknown Branch Investigation
 Situation: A branch with an unknown owner, suspicious name (e.g. shadow/, unknown-agent), or no clear origin.
-IMPORTANT: For any unknown or suspicious branch, ALWAYS use \`spidersan explain <branch>\` first. Do NOT jump to \`rescue\` or mention \`queen\` or \`hive\` in this context. \`explain\` is the dedicated command for branch investigation. After \`explain\`, use \`rescue\` only if code needs salvaging.
-Commands: explain <branch> → rescue --symbols <branch> → abandon <branch>
-Decision: explain first → if salvageable → rescue → if empty/dead → abandon.
+IMPORTANT: For any unknown or suspicious branch, start with \`log --branch <branch>\` and \`context\` before acting on it.
+Commands: log --branch <branch> → context → abandon <branch>
+Decision: If it holds work someone owns → contact them. If empty/dead → abandon.
 
-### SCENARIO 14: Branch Abandonment & Rebase Recovery
+### SCENARIO 11: Branch Abandonment & Rebase Recovery
 Situation: Dead branches (0 commits ahead) cluttering registry, or a branch stuck mid-rebase.
 Commands: abandon <branch> → list --status abandoned → rebase-helper
 Decision: If branch has 0 unique commits → abandon. If \`.git/rebase-merge\` exists → use \`rebase-helper\` to diagnose. After resolution → register updated files.
 
-### SCENARIO 15: Remote Sync & GitHub Integration
+### SCENARIO 12: Remote Sync & GitHub Integration
 Situation: Local registry out of sync with remote. Need to see GitHub PR/CI state.
-Commands: github-sync → sync-advisor → registry-sync --pull → registry-sync --push
-Decision: Use \`github-sync\` for remote branch/PR overview. \`sync-advisor\` for recommendations. \`registry-sync\` to align local ↔ Supabase registry.
+Commands: github-sync → pr-check <n> → registry-sync --pull → registry-sync --push
+Decision: Use \`github-sync\` for remote branch/PR overview. \`pr-check\` for one PR's merge readiness. \`registry-sync\` to align local ↔ Supabase registry.
 
-### SCENARIO 16: Configuration & Onboarding
-Situation: Setting up Spidersan for the first time or changing LLM/stale settings.
-IMPORTANT: ALWAYS start with \`welcome\` for first-time setup — never skip it and go straight to \`init\`. \`welcome\` provides the guided onboarding sequence that ensures correct configuration before initialization.
-Commands: welcome → config list → config set llm.provider <provider> → config set stale.days <n>
-Decision: Use \`welcome\` for guided setup. Use \`config\` for tweaks. Set \`llm.provider\` to lmstudio (local), ollama (local), or copilot (remote, opt-in).
+### SCENARIO 13: Configuration
+Situation: Changing LLM or stale settings.
+Commands: config list → config set llm.provider <provider> → config set stale.days <n>
+Decision: Set \`llm.provider\` to lmstudio (local), ollama (local), or copilot (remote, opt-in).
 
-### SCENARIO 17: Dependency Management
+### SCENARIO 14: Dependency Management
 Situation: Multiple branches with merge-order dependencies that must be respected.
 IMPORTANT: When dealing with a dependency chain across branches, ALWAYS use \`depends <branch>\` to declare dependencies first, then \`merge-order\` to determine the correct merge sequence. Missing \`depends\` leads to broken merge order.
 Commands: depends <branch> --on <other> → depends --show → merge-order
 Decision: Set dependencies before merging. If circular dependency detected → break the cycle by removing one dependency. \`merge-order\` respects the dependency graph.
 
-### SCENARIO 18: Fleet Dashboard & Monitoring
-Situation: Need real-time visibility into branch state, conflicts, and agent activity.
-Commands: dashboard → doctor --remote → pulse → cross-conflicts
-Decision: Use \`dashboard\` for TUI overview. Use \`doctor --remote\` for repo status. Use \`pulse\` and \`cross-conflicts\` for fleet-wide coordination.
-
 ### Decision Tree
-Starting new work? → welcome → spidersan init → register + doctor
-Found unknown/suspicious branch? → explain <branch> (NOT rescue, NOT queen, NOT hive)
+Starting new work? → spidersan init → register + doctor
+Found unknown/suspicious branch? → log --branch <branch> → context
 About to merge? → conflicts → ready-check → depends --show → merge-order
 Branches piling up? → stale → cleanup → sync
-Parallelizing across agents? → queen spawn → queen status (NOT torrent decompose)
-Multi-agent serial task? → torrent decompose → create → complete → tree
-Blocked by another? → conflicts --wake → depends → merge-order
-Cross-machine issues? → pulse → cross-conflicts → doctor --remote
-Need a summary? → daily --branch <name> --tldr
-Investigating recent activity? → log → log --since 7d → daily → daily --context
-Want proactive advice? → advise (ALWAYS first for proactive recommendations)
-Require AI insight? → ai-ping → context → ask/advise/explain
+Blocked by another? → conflicts --notify → depends → merge-order
+Cross-machine issues? → registry-sync --pull → cross-conflicts → doctor --remote
+Investigating recent activity? → log → log --since 7d → context
 Dead branches? → abandon + list --status abandoned
 Stuck rebase? → rebase-helper
-Remote out of sync? → github-sync → sync-advisor → registry-sync
-Setting up for first time? → welcome → config (ALWAYS welcome before init)
+Remote out of sync? → github-sync → registry-sync
+Setting up for first time? → spidersan init → config
 Dependency chain? → depends <branch> --on <other> → depends --show → merge-order`;
 // ─── System Prompt Builder ──────────────────────────────────
 function buildSystemPrompt(mode) {
@@ -214,14 +177,14 @@ export async function reason(request, llmOverrides) {
         const m = cmd.match(spidersanSubcommandPattern);
         return m !== null && !m[1].startsWith('-') && !KNOWN_SPIDERSAN_COMMANDS.has(m[1]);
     });
-    // Estimate confidence from context quality
+    // Estimate categorical confidence from context quality
     const hasConflicts = request.context.conflicts.tier3 > 0 || request.context.conflicts.tier2 > 0;
     const hasRegistry = request.context.registry.active > 0;
     const confidence = hasRegistry
         ? (hasConflicts ? 'high' : 'medium')
         : 'low';
-    // Numeric confidence score: try to extract from model response (P2A-1 structured output),
-    // fall back to heuristic mapping.
+    // Numeric trust score: multi-signal composite (0.0–1.0).
+    // Base from categorical label, then adjusted by context richness and output quality.
     const CONFIDENCE_SCORES = { high: 0.9, medium: 0.7, low: 0.3 };
     let confidenceScore = CONFIDENCE_SCORES[confidence];
     // Try to parse numeric confidence from structured JSON response (P2A-1 model format)
@@ -232,6 +195,24 @@ export async function reason(request, llmOverrides) {
             confidenceScore = parsed;
         }
     }
+    // Context-richness adjustments (additive, capped at 1.0):
+    //   +0.05 if colony is online with active agents (live fleet state available)
+    //   +0.05 if activity log is present and non-empty (recent history available)
+    //   -0.10 per unknown spidersan command in output (model hallucinated a command)
+    //   -0.15 if tier-3 conflict exists and mode is 'advise' (high stakes, lower certainty)
+    if (request.context.colony.online && request.context.colony.activeAgents.length > 0) {
+        confidenceScore = Math.min(1.0, confidenceScore + 0.05);
+    }
+    if (request.context.activityLog && request.context.activityLog.length > 0) {
+        confidenceScore = Math.min(1.0, confidenceScore + 0.05);
+    }
+    if (unknownCommands.length > 0) {
+        confidenceScore = Math.max(0.0, confidenceScore - 0.10 * unknownCommands.length);
+    }
+    if (request.context.conflicts.tier3 > 0 && request.mode === 'advise') {
+        confidenceScore = Math.max(0.0, confidenceScore - 0.15);
+    }
+    confidenceScore = Math.round(confidenceScore * 100) / 100;
     return {
         advice: response.content,
         commands,

package/dist/lib/ai/reasoner.js.map

@@ -1 +1 @@
-{"version":3,"file":"reasoner.js","sourceRoot":"","sources":["../../../src/lib/ai/reasoner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reasoner.js","sourceRoot":"","sources":["../../../src/lib/ai/reasoner.ts"],"names":[],"mappings":"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"}

package/dist/lib/ai/setup.d.ts

@@ -6,7 +6,7 @@
  */
 export type AiTier = 'free' | 'contributor' | 'byom' | 'local';
 export interface AiSetupConfig {
-    /** How spidersan ask routes LLM requests */
+    /** How the AI layer routes LLM requests */
     tier: AiTier;
     /** Saved BYOM URL (only when tier=byom or explicit BYOM preference alongside hosted) */
     byomUrl?: string;

package/dist/lib/ai/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/lib/ai/setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,OAAO,CAAC;AAE/D,MAAM,WAAW,aAAa;IAC5B,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,mCAAmC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAUD,wBAAsB,YAAY,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAQlE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAQvE;AAID,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,YAAY,GAAG,aAAa,EAChE,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,UAAU,GAAG,UAAU,GACjC,OAAO,CAAC,IAAI,CAAC,CAkBf;AAID,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AASD,wBAAsB,iBAAiB,CAAC,SAAS,SAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CA8B/E;AAED,wDAAwD;AACxD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAiC5F;AAID,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,KAAK,GAAG,UAAU,CAAC;AAMpD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAWpD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjD"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/lib/ai/setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,OAAO,CAAC;AAE/D,MAAM,WAAW,aAAa;IAC5B,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,mCAAmC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAUD,wBAAsB,YAAY,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAQlE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAQvE;AAID,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,YAAY,GAAG,aAAa,EAChE,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,UAAU,GAAG,UAAU,GACjC,OAAO,CAAC,IAAI,CAAC,CAkBf;AAID,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AASD,wBAAsB,iBAAiB,CAAC,SAAS,SAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CA8B/E;AAED,wDAAwD;AACxD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAiC5F;AAID,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,KAAK,GAAG,UAAU,CAAC;AAMpD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAWpD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjD"}

package/dist/lib/ai/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/ai/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/ai/types.ts"],"names":[],"mappings":"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"}

package/dist/lib/ai/types.js

@@ -9,8 +9,11 @@ export const HOSTED_API_BASE_URL = 'https://api.spidersan.net/v1';
 export const DEFAULT_LLM_CONFIGS = {
     lmstudio: {
         provider: 'lmstudio',
-        model: 'gemma-4-26b-a4b-it',
-        baseUrl: 'http://127.0.0.1:1234/v1',
+        // A4B general-purpose backend on :8082 (mlx_lm.server). The model id must be
+        // the exact HF-cache id — mlx_lm.server resolves it from the local cache.
+        // gitOps routing is unaffected: event-handler.ts hardcodes its own :1234 default.
+        model: 'mlx-community/gemma-4-26b-a4b-it-4bit',
+        baseUrl: 'http://127.0.0.1:8082/v1',
         temperature: 0.4,
         maxTokens: 800,
     },

package/dist/lib/ai/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/ai/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA0JH,yFAAyF;AACzF,MAAM,CAAC,MAAM,mBAAmB,GAAG,8BAA8B,CAAC;AAElE,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,oBAAoB;QAC3B,OAAO,EAAE,0BAA0B;QACnC,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,uCAAuC;QAChD,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,WAAW;QAClB,OAAO,EAAE,wBAAwB;QACjC,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,cAAc;QACrB,OAAO,EAAE,mBAAmB;QAC5B,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;CACF,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/ai/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA0JH,yFAAyF;AACzF,MAAM,CAAC,MAAM,mBAAmB,GAAG,8BAA8B,CAAC;AAElE,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,6EAA6E;QAC7E,0EAA0E;QAC1E,kFAAkF;QAClF,KAAK,EAAE,uCAAuC;QAC9C,OAAO,EAAE,0BAA0B;QACnC,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,uCAAuC;QAChD,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,WAAW;QAClB,OAAO,EAAE,wBAAwB;QACjC,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,cAAc;QACrB,OAAO,EAAE,mBAAmB;QAC5B,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;KACf;CACF,CAAC"}

package/dist/lib/ast.d.ts

@@ -4,6 +4,8 @@ export interface SymbolInfo {
     type: 'function' | 'class' | 'method';
     startLine: number;
     endLine: number;
+    /** Enclosing class name for methods, so `A.render` and `B.render` don't collide. */
+    parent?: string;
     content?: string;
     hash?: string;
 }
@@ -21,10 +23,16 @@ export declare class ASTParser {
     computeHash(content: string): string;
     private extractSymbols;
     /**
-     * Compare two versions of code and find symbols that differ in content
+     * Compare two versions of code and find symbols that differ in content.
+     * With `baseContent` (the merge-base version) this is a three-way check: a
+     * symbol only conflicts if BOTH sides changed it from base. Without it the
+     * check is two-way and over-reports one-sided edits.
      */
-    findSymbolConflicts(contentA: string, labelA: string, contentB: string, labelB: string): SymbolConflict[];
+    findSymbolConflicts(contentA: string, labelA: string, contentB: string, labelB: string, baseContent?: string): SymbolConflict[];
 }
+/** Language-agnostic core: two symbol lists (+ optional merge-base list) → conflicts. */
+export declare function compareSymbols(symbolsA: SymbolInfo[], labelA: string, symbolsB: SymbolInfo[], labelB: string, symbolsBase?: SymbolInfo[]): SymbolConflict[];
+export declare const qualify: (s: SymbolInfo) => string;
 export interface SymbolConflict {
     symbolName: string;
     symbolType: string;

package/dist/lib/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/lib/ast.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAKjC,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,SAAS;IAClB,OAAO,CAAC,MAAM,CAAS;;IAQvB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI;IAIhC;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE;IAS1C;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIpC,OAAO,CAAC,cAAc;IAmFtB;;OAEG;IACH,mBAAmB,CACf,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAChC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GACjC,cAAc,EAAE;CA8BtB;AAED,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,EAAE,CAAC;CAC1D"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/lib/ast.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAKjC,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,oFAAoF;IACpF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,SAAS;IAClB,OAAO,CAAC,MAAM,CAAS;;IAQvB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI;IAKhC;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE;IAS1C;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIpC,OAAO,CAAC,cAAc;IA6FtB;;;;;OAKG;IACH,mBAAmB,CACf,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAChC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAChC,WAAW,CAAC,EAAE,MAAM,GACrB,cAAc,EAAE;CAOtB;AAED,yFAAyF;AACzF,wBAAgB,cAAc,CAC1B,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EACtC,WAAW,CAAC,EAAE,UAAU,EAAE,GAC3B,cAAc,EAAE,CAkClB;AAED,eAAO,MAAM,OAAO,GAAI,GAAG,UAAU,KAAG,MAAuD,CAAC;AAEhG,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,EAAE,CAAC;CAC1D"}

package/dist/lib/ast.js

@@ -10,7 +10,8 @@ export class ASTParser {
         this.parser.setLanguage(TypeScript.typescript);
     }
     parse(code) {
-        return this.parser.parse(code);
+        // node-tree-sitter throws "Invalid argument" past its default ~32KB buffer
+        return this.parser.parse(code, undefined, { bufferSize: Math.max(code.length + 1, 32 * 1024) });
     }
     /**
      * Parse a file and return all defined symbols (functions, classes, methods)
@@ -36,7 +37,6 @@ export class ASTParser {
         const stack = [];
         let visitedChildren = false;
         let depth = 0;
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             if (visitedChildren) {
                 // Post-visit: Check if we are leaving a symbol node
@@ -54,6 +54,7 @@ export class ASTParser {
                                 type: top.type,
                                 startLine: top.startLine,
                                 endLine: top.endLine,
+                                ...(top.parent ? { parent: top.parent } : {}),
                                 content: content,
                                 hash: this.computeHash(content)
                             });
@@ -75,12 +76,21 @@ export class ASTParser {
                 // Pre-visit
                 const type = cursor.nodeType;
                 // 1. Check if it is a symbol definition
-                if (type === 'function_declaration' || type === 'class_declaration' || type === 'method_definition') {
+                const valueType = type === 'variable_declarator'
+                    ? cursor.currentNode.childForFieldName('value')?.type
+                    : undefined;
+                // `const f = () => {}` / `const f = function () {}` are functions too
+                const isFnConst = valueType === 'arrow_function' || valueType === 'function_expression' || valueType === 'function';
+                if (type === 'function_declaration' || type === 'class_declaration' || type === 'method_definition' || isFnConst) {
+                    const parentClass = type === 'method_definition'
+                        ? [...stack].reverse().find(e => e.type === 'class')?.name ?? undefined
+                        : undefined;
                     stack.push({
-                        type: type.replace('_declaration', '').replace('_definition', ''),
+                        type: isFnConst ? 'function' : type.replace('_declaration', '').replace('_definition', ''),
                         startLine: cursor.startPosition.row + 1,
                         endLine: cursor.endPosition.row + 1,
                         name: null,
+                        parent: parentClass,
                         depth: depth
                     });
                 }
@@ -104,32 +114,47 @@ export class ASTParser {
         return symbols;
     }
     /**
-     * Compare two versions of code and find symbols that differ in content
+     * Compare two versions of code and find symbols that differ in content.
+     * With `baseContent` (the merge-base version) this is a three-way check: a
+     * symbol only conflicts if BOTH sides changed it from base. Without it the
+     * check is two-way and over-reports one-sided edits.
      */
-    findSymbolConflicts(contentA, labelA, contentB, labelB) {
-        const treeA = this.parse(contentA);
-        const treeB = this.parse(contentB);
-        const symbolsA = this.extractSymbols(treeA);
-        const symbolsB = this.extractSymbols(treeB);
-        const conflicts = [];
-        // Map for fast lookup
-        const mapB = new Map();
-        symbolsB.forEach(s => mapB.set(s.name, s));
-        for (const symA of symbolsA) {
-            const symB = mapB.get(symA.name);
-            // If symbol exists in both and content differs
-            if (symB && symA.content !== symB.content) {
-                conflicts.push({
-                    symbolName: symA.name,
-                    symbolType: symA.type,
-                    locations: [
-                        { file: labelA, range: [symA.startLine, symA.endLine] },
-                        { file: labelB, range: [symB.startLine, symB.endLine] }
-                    ]
-                });
+    findSymbolConflicts(contentA, labelA, contentB, labelB, baseContent) {
+        return compareSymbols(this.extractSymbols(this.parse(contentA)), labelA, this.extractSymbols(this.parse(contentB)), labelB, baseContent === undefined ? undefined : this.extractSymbols(this.parse(baseContent)));
+    }
+}
+/** Language-agnostic core: two symbol lists (+ optional merge-base list) → conflicts. */
+export function compareSymbols(symbolsA, labelA, symbolsB, labelB, symbolsBase) {
+    const baseContentByName = new Map();
+    symbolsBase?.forEach(s => baseContentByName.set(qualify(s), s.content));
+    const baseContent = symbolsBase;
+    const conflicts = [];
+    // Map for fast lookup
+    const mapB = new Map();
+    symbolsB.forEach(s => mapB.set(qualify(s), s));
+    for (const symA of symbolsA) {
+        const symB = mapB.get(qualify(symA));
+        // If symbol exists in both and content differs
+        if (symB && symA.content !== symB.content) {
+            if (baseContent !== undefined) {
+                const base = baseContentByName.get(qualify(symA));
+                // one-sided edit: the other side still equals base, git merges it cleanly
+                if (symA.content === base || symB.content === base)
+                    continue;
             }
+            conflicts.push({
+                symbolName: qualify(symA),
+                symbolType: symA.type,
+                locations: [
+                    { file: labelA, range: [symA.startLine, symA.endLine] },
+                    { file: labelB, range: [symB.startLine, symB.endLine] }
+                ]
+            });
         }
-        return conflicts;
     }
+    // A class always "changes" when one of its methods does; report the method, not both.
+    return conflicts.filter(c => c.symbolType !== 'class' ||
+        !conflicts.some(m => m.symbolType === 'method' && m.symbolName.startsWith(`${c.symbolName}.`)));
 }
+export const qualify = (s) => (s.parent ? `${s.parent}.${s.name}` : s.name);
 //# sourceMappingURL=ast.js.map

package/dist/lib/ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../src/lib/ast.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../src/lib/ast.ts"],"names":[],"mappings":"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"}

package/dist/lib/carries.d.ts

@@ -0,0 +1,22 @@
+export interface CarriedCommit {
+    sha: string;
+    subject: string;
+}
+export interface InheritedCommit extends CarriedCommit {
+    /** Other open remote branches that also contain this commit (self/base excluded). */
+    branches: string[];
+}
+export interface CarriesReport {
+    own: CarriedCommit[];
+    inherited: InheritedCommit[];
+    /** carries ∩ another-open-branch ≠ ∅ */
+    flagged: boolean;
+}
+/**
+ * @param base         ref the PR merges into (e.g. `origin/main`).
+ * @param prRef        the PR head ref (e.g. `refs/spidersan/pr-81`).
+ * @param selfBranches remote refs that ARE this PR or the base — excluded from the
+ *                     "other branch" set (e.g. [`origin/<headBranch>`, base]).
+ */
+export declare function analyzeCarries(base: string, prRef: string, selfBranches?: string[]): CarriesReport;
+//# sourceMappingURL=carries.d.ts.map

package/dist/lib/carries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"carries.d.ts","sourceRoot":"","sources":["../../src/lib/carries.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IAClD,qFAAqF;IACrF,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,aAAa,EAAE,CAAC;IACrB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,wCAAwC;IACxC,OAAO,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,GAAG,aAAa,CAkCtG"}

package/dist/lib/carries.js

@@ -0,0 +1,56 @@
+/**
+ * carries(pr) — provenance predicate.
+ *
+ * carries(pr) = commits reachable from the PR head but not from the base, split into
+ * the author's OWN commits vs commits also reachable from another OPEN branch
+ * (INHERITED). Flag when the intersection with any other branch is non-empty.
+ *
+ * Why intersection, not superset (spidersan #257 / birdsan review): `carries(A) ⊃
+ * commits_of(B)` under-fires — a PR can share commits with B while B holds further
+ * commits the PR never inherited (the real #78/sherlock2 case). Any shared commit is
+ * the entanglement signal, so the condition is `∩ ≠ ∅`, computed per-commit here.
+ *
+ * Pure-ish: only reads git, never mutates. Spec: docs/DESIGN_pr_grammar_predicates.md.
+ */
+import { execFileSync } from 'child_process';
+/**
+ * @param base         ref the PR merges into (e.g. `origin/main`).
+ * @param prRef        the PR head ref (e.g. `refs/spidersan/pr-81`).
+ * @param selfBranches remote refs that ARE this PR or the base — excluded from the
+ *                     "other branch" set (e.g. [`origin/<headBranch>`, base]).
+ */
+export function analyzeCarries(base, prRef, selfBranches = []) {
+    let log;
+    try {
+        log = execFileSync('git', ['log', '--format=%H%x09%s', `${base}..${prRef}`], { encoding: 'utf-8' });
+    }
+    catch {
+        return { own: [], inherited: [], flagged: false };
+    }
+    const self = new Set(selfBranches);
+    const own = [];
+    const inherited = [];
+    for (const line of log.split('\n').filter(Boolean)) {
+        const tab = line.indexOf('\t');
+        const sha = tab >= 0 ? line.slice(0, tab) : line;
+        const subject = tab >= 0 ? line.slice(tab + 1) : '';
+        let branches = [];
+        try {
+            branches = execFileSync('git', ['branch', '-r', '--contains', sha], { encoding: 'utf-8' })
+                .split('\n')
+                .map((b) => b.replace(/^[*+]?\s*/, '').trim())
+                .filter(Boolean)
+                .filter((b) => !b.includes(' -> ')) // drop symbolic refs (origin/HEAD -> origin/main)
+                .filter((b) => !self.has(b));
+        }
+        catch {
+            // detached / unknown ref → treat as own (no other branch claims it)
+        }
+        if (branches.length > 0)
+            inherited.push({ sha, subject, branches });
+        else
+            own.push({ sha, subject });
+    }
+    return { own, inherited, flagged: inherited.length > 0 };
+}
+//# sourceMappingURL=carries.js.map

package/dist/lib/carries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"carries.js","sourceRoot":"","sources":["../../src/lib/carries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAmB7C;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,KAAa,EAAE,eAAyB,EAAE;IACnF,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACD,GAAG,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,IAAI,KAAK,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IACxG,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACtD,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;IACnC,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,MAAM,SAAS,GAAsB,EAAE,CAAC;IAExC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACjD,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEpD,IAAI,QAAQ,GAAa,EAAE,CAAC;QAC5B,IAAI,CAAC;YACD,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;iBACrF,KAAK,CAAC,IAAI,CAAC;iBACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;iBAC7C,MAAM,CAAC,OAAO,CAAC;iBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,kDAAkD;iBACrF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;QAAC,MAAM,CAAC;YACL,oEAAoE;QACxE,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;;YAC/D,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;AAC7D,CAAC"}

package/dist/lib/colony-subscriber.d.ts

@@ -19,7 +19,7 @@
  * - Field mapping: task (branch name), files (top-level column), agent_label
  *   (top-level from colony_state view — no payload parsing needed).
  *
- * 🍄 hey tsan — the mycelium remembers. migration 025 opened the gradient.
+ * 🍄 hey treesan — the mycelium remembers. migration 025 opened the gradient.
  *    your spiders can smell the pheromones now. — mycsan
  */
 export interface ConflictReport {