copperhead 0.7.0 → 0.8.0

package/dist/agent/providers/cursor.js

@@ -0,0 +1,317 @@
+import { mkdtemp, rm, utimes } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { execa } from 'execa';
+import { parseToolCalls, renderConversation, renderDelta, renderToolProtocol } from './tool-protocol.js';
+const NATIVE_MUTATION_TYPES = new Set([
+    'tool_call',
+    'tool_use',
+    'tool-call',
+    'shell',
+    'write',
+    'edit',
+    'apply_patch',
+    'file_change',
+    'mcp_tool',
+]);
+/** Subtype tokens that indicate native execution (whole-token match). */
+const NATIVE_SUBTYPE_RE = /(^|_)(tool|shell|write|edit|patch|mutation)(_|$)/;
+export class CursorProvider {
+    model;
+    runFn;
+    sessionResume;
+    name = 'cursor';
+    callSeq = 0;
+    cwdPromise;
+    sessionId;
+    sentCount = 0;
+    inFlight = new Set();
+    constructor(model, runFn = defaultCursorRun, 
+    /**
+     * Opt-in: resume one CLI session across turns and send only new messages.
+     * OFF by default and mutually exclusive with the response cache — mixing
+     * them desyncs the resumed session. `makeProvider` enables it only when
+     * the cache is off.
+     */
+    sessionResume = false) {
+        this.model = model;
+        this.runFn = runFn;
+        this.sessionResume = sessionResume;
+    }
+    async chat(messages, tools, opts = {}) {
+        const system = messages
+            .filter((m) => m.role === 'system')
+            .map((m) => m.content)
+            .join('\n\n');
+        const systemPrompt = [system, renderToolProtocol(tools)].filter(Boolean).join('\n\n');
+        const resume = this.sessionResume ? this.sessionId : undefined;
+        const prompt = resume ? renderDelta(messages, this.sentCount) : renderConversation(messages);
+        const catalog = new Set(tools.map((t) => t.name));
+        const workspace = await this.ensureWorkspace();
+        const aborter = new AbortController();
+        this.inFlight.add(aborter);
+        let inputTokens = 0;
+        let outputTokens = 0;
+        let text = null;
+        try {
+            const result = await this.runFn({
+                prompt,
+                systemPrompt,
+                workspace,
+                ...(this.model ? { model: this.model } : {}),
+                ...(resume ? { resume } : {}),
+                signal: aborter.signal,
+                env: subprocessEnv(),
+            });
+            text = result.text;
+            if (this.sessionResume && result.sessionId)
+                this.sessionId = result.sessionId;
+            inputTokens = result.usage.inputTokens;
+            outputTokens = result.usage.outputTokens;
+            opts.onStream?.(text.length);
+        }
+        catch (err) {
+            if (isAuthError(err))
+                throw new Error(authHint(err.message));
+            throw enhanceCliError(err);
+        }
+        finally {
+            this.inFlight.delete(aborter);
+        }
+        // Only advance the high-water mark when resume is on (same as claude-code).
+        if (this.sessionResume)
+            this.sentCount = messages.length;
+        const parsed = parseToolCalls(text, () => `cur-${++this.callSeq}`, catalog);
+        return {
+            text: parsed.text,
+            toolCalls: parsed.toolCalls,
+            usage: { inputTokens, outputTokens },
+            nudge: parsed.nudge,
+        };
+    }
+    async close() {
+        for (const aborter of this.inFlight) {
+            try {
+                aborter.abort();
+            }
+            catch {
+                // best effort
+            }
+        }
+        this.inFlight.clear();
+        const pending = this.cwdPromise;
+        this.cwdPromise = undefined;
+        if (!pending)
+            return;
+        try {
+            await rm(await pending, { recursive: true, force: true });
+        }
+        catch {
+            // best effort
+        }
+    }
+    async ensureWorkspace() {
+        if (!this.cwdPromise)
+            this.cwdPromise = mkdtemp(path.join(os.tmpdir(), 'copperhead-cursor-'));
+        const cwd = await this.cwdPromise;
+        const now = new Date();
+        await utimes(cwd, now, now).catch(() => { });
+        return cwd;
+    }
+}
+/** Minimal env passed to the Cursor CLI subprocess (saved login via `agent login`). */
+const CURSOR_SUBPROCESS_ENV_KEYS = [
+    'PATH',
+    'HOME',
+    'USER',
+    'LOGNAME',
+    'SHELL',
+    'TMPDIR',
+    'TEMP',
+    'TMP',
+    'LANG',
+    'LC_ALL',
+    'LC_CTYPE',
+    'LC_MESSAGES',
+    'TERM',
+    'XDG_CONFIG_HOME',
+    'XDG_DATA_HOME',
+    'XDG_CACHE_HOME',
+    'XDG_RUNTIME_DIR',
+    // Windows home / login-config location (`USERPROFILE\.cursor\cli-config.json`)
+    'USERPROFILE',
+    'HOMEDRIVE',
+    'HOMEPATH',
+    'SystemRoot',
+    'ComSpec',
+    'APPDATA',
+    'LOCALAPPDATA',
+];
+/** Build an allowlisted env for the Cursor Agent subprocess (no API keys or unrelated secrets). */
+export function subprocessEnv() {
+    const env = {};
+    for (const key of CURSOR_SUBPROCESS_ENV_KEYS) {
+        const value = process.env[key];
+        if (value !== undefined)
+            env[key] = value;
+    }
+    return env;
+}
+/** Parse `--print --output-format json` stdout into assistant text and session id. */
+export function parseCursorStdout(stdout) {
+    const trimmed = stdout.trim();
+    let text = '';
+    let sessionId;
+    let sawResult = false;
+    // Prefer a single pretty-printed JSON object (whole buffer) before NDJSON lines.
+    if (trimmed) {
+        try {
+            const whole = JSON.parse(trimmed);
+            const extracted = extractResultFields(whole);
+            if (extracted) {
+                return {
+                    text: extracted.text,
+                    sessionId: extracted.sessionId,
+                    usage: { inputTokens: 0, outputTokens: 0 },
+                };
+            }
+        }
+        catch (err) {
+            if (isCursorHardFail(err))
+                throw err;
+            // fall through to line-based parse
+        }
+    }
+    const lines = trimmed
+        .split('\n')
+        .map((l) => l.trim())
+        .filter(Boolean);
+    for (const line of lines) {
+        let obj;
+        try {
+            obj = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        const extracted = extractResultFields(obj);
+        if (extracted) {
+            text = extracted.text;
+            sessionId = extracted.sessionId ?? sessionId;
+            sawResult = true;
+        }
+    }
+    if (!sawResult && !text && lines.length) {
+        // Fallback: last parseable JSON line with a string result field
+        for (let i = lines.length - 1; i >= 0; i--) {
+            try {
+                const obj = JSON.parse(lines[i]);
+                if (typeof obj.result === 'string') {
+                    assertNoNativeMutation(obj);
+                    text = obj.result;
+                    if (typeof obj.session_id === 'string')
+                        sessionId = obj.session_id;
+                    sawResult = true;
+                    break;
+                }
+            }
+            catch (err) {
+                if (isCursorHardFail(err))
+                    throw err;
+                continue;
+            }
+        }
+    }
+    if (!sawResult && trimmed) {
+        throw new Error(`cursor: could not parse Cursor Agent output as JSON — raw stdout: ${trimmed.slice(0, 500)}`);
+    }
+    // Official Cursor JSON schema does not expose token usage; callers see zeros.
+    return { text, sessionId, usage: { inputTokens: 0, outputTokens: 0 } };
+}
+function extractResultFields(obj) {
+    assertNoNativeMutation(obj);
+    const type = typeof obj.type === 'string' ? obj.type.toLowerCase() : '';
+    if (type === 'result' || typeof obj.result === 'string') {
+        if (obj.is_error === true) {
+            throw new Error(typeof obj.result === 'string' ? obj.result : 'Cursor Agent returned an error result');
+        }
+        if (typeof obj.result === 'string') {
+            return {
+                text: obj.result,
+                ...(typeof obj.session_id === 'string' ? { sessionId: obj.session_id } : {}),
+            };
+        }
+    }
+    return null;
+}
+function isCursorHardFail(err) {
+    return (err instanceof Error &&
+        (err.message.includes('reasoning-only invariant') ||
+            err.message.includes('Cursor Agent returned an error') ||
+            err.message.startsWith('cursor:')));
+}
+function assertNoNativeMutation(obj) {
+    const type = typeof obj.type === 'string' ? obj.type.toLowerCase() : '';
+    if (NATIVE_MUTATION_TYPES.has(type)) {
+        throw new Error(`cursor: Cursor Agent emitted native tool event "${obj.type}" — reasoning-only invariant violated. Refusing to continue.`);
+    }
+    const subtype = typeof obj.subtype === 'string' ? obj.subtype.toLowerCase() : '';
+    if (subtype && NATIVE_SUBTYPE_RE.test(subtype) && type !== 'result') {
+        throw new Error(`cursor: Cursor Agent output subtype "${obj.subtype}" (line type "${obj.type ?? ''}") suggests native execution — reasoning-only invariant violated.`);
+    }
+}
+/** Default subprocess runner: invokes `agent` (or `COPPERHEAD_CURSOR_PATH`) in plan mode. */
+export async function defaultCursorRun(args) {
+    const bin = process.env.COPPERHEAD_CURSOR_PATH || 'agent';
+    const fullPrompt = [args.systemPrompt, args.prompt].filter(Boolean).join('\n\n---\n\n');
+    // Prompt goes on stdin — a single argv element caps at ~128 KiB on Linux
+    // (MAX_ARG_STRLEN); real .kicad_pcb reads routinely exceed that.
+    const cmdArgs = [
+        '--print',
+        '--output-format',
+        'json',
+        '--mode',
+        'plan',
+        '--trust',
+        '--sandbox',
+        'enabled',
+        '--workspace',
+        args.workspace,
+    ];
+    if (args.model)
+        cmdArgs.push('--model', args.model);
+    if (args.resume)
+        cmdArgs.push('--resume', args.resume);
+    const { stdout } = await execa(bin, cmdArgs, {
+        input: fullPrompt,
+        env: args.env ?? subprocessEnv(),
+        cancelSignal: args.signal,
+        reject: true,
+        maxBuffer: 50 * 1024 * 1024,
+    });
+    return parseCursorStdout(stdout);
+}
+function isAuthError(err) {
+    // Subprocess failures use exitCode, not HTTP status. Only treat real HTTP
+    // status fields as 401/403; otherwise match the CLI's auth message.
+    const status = err?.status ??
+        err?.statusCode;
+    if (status === 401 || status === 403)
+        return true;
+    const m = (err?.message ?? '').toLowerCase();
+    return /unauthenticat|unauthoriz|not logged in|please log in|login required|agent login/.test(m);
+}
+function authHint(detail) {
+    return ('cursor is not authenticated: run `agent login` and verify with `agent status`. ' +
+        `Set COPPERHEAD_CURSOR_PATH if the CLI is not on PATH (original error: ${detail})`);
+}
+function enhanceCliError(err) {
+    const original = err;
+    if (original.code === 'ENOENT') {
+        return new Error('Cursor Agent CLI not found on PATH. Install Cursor Agent or set COPPERHEAD_CURSOR_PATH to the `agent` binary.', { cause: err });
+    }
+    if (original.message?.includes('reasoning-only invariant'))
+        return original;
+    return new Error(`Cursor CLI provider failed: ${original.message}`, { cause: err });
+}
+//# sourceMappingURL=cursor.js.map

package/dist/agent/providers/cursor.js.map

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

package/dist/agent/providers/tool-protocol.js

@@ -0,0 +1,205 @@
+export function renderToolProtocol(tools) {
+    if (!tools.length)
+        return '';
+    const lines = [
+        '# Tool protocol',
+        '',
+        'You are the reasoning half of a tool-driven workflow; you cannot run anything yourself.',
+        'To take an action, reply with EXACTLY ONE JSON object and nothing else, wrapped in a',
+        '```json fenced code block:',
+        '',
+        '```json',
+        '{"tool": "<tool_name>", "args": { ... }}',
+        '```',
+        '',
+        'Use only the tools listed below, with `args` matching the tool\'s JSON Schema. If you have',
+        'no tool to call and only want to say something, reply with plain prose and no JSON block.',
+        '',
+        '## Available tools',
+    ];
+    for (const t of tools) {
+        lines.push('', `### ${t.name}`, t.description, `Parameters (JSON Schema): ${JSON.stringify(t.parameters)}`);
+    }
+    return lines.join('\n');
+}
+/** Delta prompt for a resumed CLI session: new user lines and tool results only. */
+export function renderDelta(messages, from) {
+    const idToName = new Map();
+    for (const m of messages) {
+        if (m.role === 'assistant')
+            for (const call of m.toolCalls ?? [])
+                idToName.set(call.id, call.name);
+    }
+    const parts = [];
+    for (const m of messages.slice(Math.max(0, from))) {
+        if (m.role === 'user') {
+            parts.push(`[user]\n${m.content}`);
+        }
+        else if (m.role === 'tool') {
+            const name = idToName.get(m.toolCallId) ?? m.toolCallId;
+            parts.push(`[result of ${name}]\n${m.content}`);
+        }
+    }
+    return parts.join('\n\n');
+}
+export function renderConversation(messages) {
+    const idToName = new Map();
+    const parts = [];
+    for (const m of messages) {
+        if (m.role === 'system')
+            continue;
+        if (m.role === 'user') {
+            parts.push(`[user]\n${m.content}`);
+        }
+        else if (m.role === 'assistant') {
+            if (m.content)
+                parts.push(`[assistant]\n${m.content}`);
+            for (const call of m.toolCalls ?? []) {
+                idToName.set(call.id, call.name);
+                parts.push(`[assistant tool call]\n\`\`\`json\n${JSON.stringify({ tool: call.name, args: call.args })}\n\`\`\``);
+            }
+        }
+        else {
+            const name = idToName.get(m.toolCallId) ?? m.toolCallId;
+            parts.push(`[result of ${name}]\n${m.content}`);
+        }
+    }
+    return parts.join('\n\n');
+}
+/**
+ * Detect a malformed-but-intended tool call in a turn that dispatched none
+ * (#I10). The signature is machine-recognizable: the text contains
+ * `"tool":"<name>"` naming a tool in the current catalog, yet nothing parsed.
+ * That is the exact case where the tolerant extractor's silence misleads the
+ * model — the JSON was near-miss malformed (a brace short, or the outer object
+ * split so only an inner `{args}` with no `tool` key balanced), not the tool
+ * being broken. Returns a one-line steer to re-emit it, or undefined when the
+ * absence of a call is genuine (plain prose, no tool named).
+ */
+function detectMalformedCall(text, catalog) {
+    const re = /"tool"\s*:\s*"([^"]+)"/g;
+    let m;
+    while ((m = re.exec(text)) !== null) {
+        const name = m[1];
+        if (catalog.has(name)) {
+            return (`A tool call for "${name}" looks malformed — it named the tool but did not parse as ` +
+                'valid JSON (likely unbalanced braces or a missing closing brace), so no call ran. ' +
+                'Re-emit it as exactly one complete JSON object: {"tool": "...", "args": { ... }}.');
+        }
+    }
+    return undefined;
+}
+/**
+ * Extract tool-call JSON from the model's reply. Tolerant by design (D1):
+ * unparseable output is returned as plain text with no tool calls rather than
+ * throwing, so a non-conforming turn degrades to the loop's stall/nudge path.
+ * A parsed block only counts as a tool call when its name is in the current
+ * turn's catalog (`availableTools(ctx)`): a hallucinated or locked tool name is
+ * left as prose so the loop nudges, rather than dispatching a bogus call.
+ */
+export function parseToolCalls(text, nextId, catalog) {
+    if (!text)
+        return { text: null, toolCalls: [] };
+    const toolCalls = [];
+    const matched = [];
+    // Extract tool calls by scanning for complete JSON objects, NOT by matching
+    // ``` fences. A tool call's `content`/`args` can hold a full markdown doc that
+    // itself contains ``` code fences; a fence regex truncates the JSON at the
+    // first inner fence, JSON.parse fails, and the call is silently dropped (the
+    // model then assumes it wrote a file it never did). The brace scan is
+    // string-aware, so braces and backticks inside JSON string values are ignored.
+    let searchFrom = 0;
+    while (searchFrom < text.length) {
+        const braceAt = text.indexOf('{', searchFrom);
+        if (braceAt < 0)
+            break;
+        const span = scanJsonObject(text, braceAt);
+        if (!span) {
+            // Unbalanced '{' (stray brace in prose): retry from the next candidate so
+            // one bad brace can't hide a well-formed call later in the reply.
+            searchFrom = braceAt + 1;
+            continue;
+        }
+        const call = toToolCall(text.slice(span.start, span.end), nextId, catalog);
+        if (call) {
+            toolCalls.push(call);
+            matched.push([span.start, span.end]);
+        }
+        searchFrom = span.end;
+    }
+    if (!toolCalls.length) {
+        // No call dispatched — but did the model clearly *intend* one? A fenced
+        // ```json block that names a catalog tool yet produced zero calls is a
+        // malformed near-miss (unbalanced braces, a missing `}`, or an inner object
+        // with no `tool` key). Silently dropping it gives the model no signal, so it
+        // misreads "no result" as "this tool is broken" and can bake that false
+        // conclusion into a committed summary (#I10). Surface a nudge instead.
+        return { text: text.trim() ? text : null, toolCalls, nudge: detectMalformedCall(text, catalog) };
+    }
+    // Prose is whatever survives once the tool-call objects (and any now-empty
+    // ```json fences around them) are removed.
+    let prose = '';
+    let cursor = 0;
+    for (const [start, end] of matched) {
+        prose += text.slice(cursor, start);
+        cursor = end;
+    }
+    prose += text.slice(cursor);
+    prose = prose.replace(/```(?:json)?\s*```/gi, '').replace(/```(?:json)?\s*$/gi, '').trim();
+    return { text: prose.length ? prose : null, toolCalls };
+}
+/**
+ * Find the first complete, brace-balanced JSON object at or after `from`,
+ * respecting JSON string quoting/escaping so braces or backticks inside string
+ * values do not end the scan. Returns its `[start, end)` bounds or null.
+ */
+function scanJsonObject(text, from) {
+    const start = text.indexOf('{', from);
+    if (start < 0)
+        return null;
+    let depth = 0;
+    let inStr = false;
+    let esc = false;
+    for (let i = start; i < text.length; i++) {
+        const ch = text[i];
+        if (inStr) {
+            if (esc)
+                esc = false;
+            else if (ch === '\\')
+                esc = true;
+            else if (ch === '"')
+                inStr = false;
+            continue;
+        }
+        if (ch === '"')
+            inStr = true;
+        else if (ch === '{')
+            depth++;
+        else if (ch === '}' && --depth === 0)
+            return { start, end: i + 1 };
+    }
+    return null;
+}
+function toToolCall(raw, nextId, catalog) {
+    if (!raw)
+        return null;
+    let obj;
+    try {
+        obj = JSON.parse(raw.trim());
+    }
+    catch {
+        return null;
+    }
+    if (!obj || typeof obj !== 'object')
+        return null;
+    const rec = obj;
+    if (typeof rec.tool !== 'string')
+        return null;
+    // Only accept names the turn actually advertised. An empty catalog means the
+    // turn offered no tools, so nothing parses as a call.
+    if (!catalog.has(rec.tool))
+        return null;
+    const args = rec.args && typeof rec.args === 'object' ? rec.args : {};
+    return { id: nextId(), name: rec.tool, args };
+}
+//# sourceMappingURL=tool-protocol.js.map

package/dist/agent/providers/tool-protocol.js.map

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

package/dist/agent/render.js

@@ -3,7 +3,11 @@
  * once at startup: interactive (TTY, no --json/--plain) pins a status line to
  * the bottom of the terminal and redraws it in place; plain emits line-oriented
  * output with zero ANSI escapes — the mode CI, pipes, and tests see.
+ *
+ * Interactive mode adds subtle SGR chrome (copper accent, dim secondary text).
+ * Plain mode never emits color (AC-8.9).
  */
+import { copper, dim, setColorEnabled, styleOutcome, toolLine, warn } from './theme.js';
 /** Compact token count: 850 -> "850", 12300 -> "12.3k". */
 export function fmtTokens(n) {
     return n < 1000 ? String(n) : `${(n / 1000).toFixed(1)}k`;
@@ -72,20 +76,30 @@ export class InteractiveRenderer {
         process.on('SIGINT', this.onSigint);
     }
     statusText() {
-        const parts = [
-            `turn ${this.turn}/${this.maxTurns}`,
-            `${fmtTokens(this.tokensIn)} in / ${fmtTokens(this.tokensOut)} out`,
-            fmtDuration(Date.now() - this.startMs),
-        ];
-        if (this.busy) {
-            // Fold streamed-output volume into the busy segment so a large turn's
-            // status line visibly grows — a hung one stays frozen (5.1).
-            parts.push(this.streamedChars ? `${this.busy} ~${fmtTokens(this.streamedChars)} ch` : this.busy);
-        }
+        // Raw (uncolored) segments once; both the colored line and the
+        // narrow-terminal fallback are assembled from these.
         const spinner = this.busy ? FRAMES[this.frame % FRAMES.length] : '·';
-        const line = `${spinner} ${parts.join(' · ')}`;
+        const turn = `turn ${this.turn}/${this.maxTurns}`;
+        const tokens = `${fmtTokens(this.tokensIn)} in / ${fmtTokens(this.tokensOut)} out`;
+        const elapsed = fmtDuration(Date.now() - this.startMs);
+        // Fold streamed-output volume into the busy segment so a large turn's
+        // status line visibly grows — a hung one stays frozen (5.1).
+        const busy = this.busy
+            ? this.streamedChars
+                ? `${this.busy} ~${fmtTokens(this.streamedChars)} ch`
+                : this.busy
+            : undefined;
+        const parts = [turn, dim(tokens), dim(elapsed), ...(busy ? [warn(busy)] : [])];
+        const line = `${this.busy ? copper(spinner) : dim(spinner)} ${parts.join(dim(' · '))}`;
+        // Truncate by visible length roughly: strip SGR when measuring so color
+        // codes don't eat the column budget and clip the readable text early.
         const width = this.out.columns ?? 80;
-        return line.length > width ? line.slice(0, width - 1) : line;
+        const visible = line.replace(/\x1b\[[0-9;]*m/g, '');
+        if (visible.length <= width)
+            return line;
+        // Fall back to an uncolored truncated line when the terminal is too narrow.
+        const plain = [spinner, turn, tokens, elapsed, ...(busy ? [busy] : [])].join(' · ');
+        return plain.length > width ? plain.slice(0, width - 1) : plain;
     }
     redraw() {
         if (this.idle)
@@ -126,7 +140,7 @@ export class InteractiveRenderer {
         this.redraw();
     }
     toolResult(name, firstLine) {
-        this.log(`  [${name}] ${firstLine}`);
+        this.log(toolLine(name, firstLine));
     }
     status(text) {
         this.busy = text;
@@ -145,7 +159,7 @@ export class InteractiveRenderer {
     finish(line) {
         if (this.statusShown)
             this.out.write(CLEAR_LINE);
-        this.out.write(line + '\n');
+        this.out.write(styleOutcome(line) + '\n');
         this.suspend();
     }
     /** Release the status line (stop the spinner, restore the cursor) but stay usable. */
@@ -176,9 +190,12 @@ export class InteractiveRenderer {
  * (AC-2.4): the only thing a --json invocation writes to stdout is its JSON.
  */
 export function makeRenderer(opts) {
+    const interactive = !opts.json && !opts.plain && Boolean(process.stdout.isTTY);
+    // Color tracks the interactive path so --plain / pipes stay zero-ANSI (AC-8.9).
+    setColorEnabled(interactive && !process.env.NO_COLOR);
     if (opts.json)
         return plainRenderer((line) => console.error(line));
-    if (!opts.plain && process.stdout.isTTY)
+    if (interactive)
         return new InteractiveRenderer();
     return plainRenderer((line) => console.log(line));
 }