specrails-desktop 2.30.2 → 2.31.0

package/server/dist/smash-runner.js

@@ -59,6 +59,8 @@ const node_crypto_1 = require("node:crypto");
 const node_readline_1 = require("node:readline");
 const tree_kill_1 = __importDefault(require("tree-kill"));
 const cli_prompt_1 = require("./util/cli-prompt");
+const spawn_lifecycle_1 = require("./spawn-lifecycle");
+const providers_1 = require("./providers");
 const explore_smash_1 = require("./explore-smash");
 const explore_cwd_manager_1 = require("./explore-cwd-manager");
 const workspace_resolution_1 = require("./workspace-resolution");
@@ -66,6 +68,8 @@ const ai_invocations_1 = require("./ai-invocations");
 const result_event_1 = require("./result-event");
 const ticket_store_1 = require("./ticket-store");
 const ticket_store_2 = require("./ticket-store");
+const runtime_1 = require("./providers/runtime");
+const transient_children_1 = require("./transient-children");
 /** Resolve the tickets-store path for a SMASH run: the gated `ticketsPath` when
  *  the caller threaded it (relocation-aware), else the legacy repo-relative
  *  derivation. */
@@ -104,21 +108,18 @@ function checkSmashEligibility(store, ticketId) {
     return { ok: true, context: { ticket, childCount } };
 }
 // ─── Spawn helpers ───────────────────────────────────────────────────────────
-function buildSmashArgs(model, systemPrompt, userPrompt, mode) {
-    // Simple: deny all tools, single turn — fast, no codebase access.
-    // Full: allow Read/Grep/Glob (read-only), multi-turn — slower, grounded.
-    const disallowed = mode === 'full' ? 'Bash,Edit,Write,NotebookEdit' : 'Read,Grep,Glob,Bash';
+function buildSmashArgs(adapter, model, systemPrompt, userPrompt, mode) {
+    // Simple: deny all tools, single turn — fast, no codebase access. Full:
+    // request the adapter's verified read-only boundary.
     const maxTurns = mode === 'full' ? SMASH_MAX_TURNS_FULL : SMASH_MAX_TURNS_SIMPLE;
-    return [
-        '--model', model,
-        '--dangerously-skip-permissions',
-        '--output-format', 'stream-json',
-        '--verbose',
-        '--system-prompt', systemPrompt,
-        '--disallowedTools', disallowed,
-        '--max-turns', String(maxTurns),
-        '-p', userPrompt,
-    ];
+    const options = {
+        prompt: userPrompt,
+        model,
+        systemPrompt,
+        toolPolicy: mode === 'full' ? 'read-only' : 'none',
+        maxTurns,
+    };
+    return { args: adapter.buildArgs('spec-gen', options), options };
 }
 /**
  * Build the spawn argv + cwd. Exported for tests.
@@ -152,8 +153,10 @@ function prepareSmashSpawn(deps, ticket) {
             cwd = deps.projectPath;
         }
     }
-    const model = deps.model ?? 'sonnet';
-    return { args: buildSmashArgs(model, systemPrompt, userPrompt, mode), cwd, env, systemPrompt, userPrompt, mode };
+    const adapter = (0, providers_1.getAdapter)(deps.providerId ?? 'claude');
+    const model = deps.model ?? adapter.defaultModel();
+    const built = buildSmashArgs(adapter, model, systemPrompt, userPrompt, mode);
+    return { args: built.args, cwd, env, systemPrompt, userPrompt, mode, options: built.options, adapter };
 }
 /** Grace before SIGKILL-escalating a child that swallowed SIGTERM. */
 const SMASH_SIGKILL_GRACE_MS = 2_000;
@@ -389,13 +392,16 @@ function applyDeleteEpicChildren(filePath, epicId) {
     return { deletedChildren, revision: store.revision };
 }
 // ─── recordInvocation wrapper ────────────────────────────────────────────────
-function recordSafely(deps, ticketId, runId, startedAt, finishedAt, status, resultEvent, model) {
+function recordSafely(deps, adapter, ticketId, runId, startedAt, finishedAt, status, events, model) {
     try {
-        const normalised = resultEvent ? (0, result_event_1.normaliseResultEvent)(resultEvent, 'claude') : {};
+        const { result: normalised, estimated } = (0, result_event_1.finaliseInvocationResult)(adapter, events, {
+            fallbackModel: model ?? adapter.defaultModel(),
+            durationMs: Math.max(0, Date.parse(finishedAt) - Date.parse(startedAt)),
+        });
         (0, ai_invocations_1.recordInvocation)(deps.db, {
             id: (0, node_crypto_1.randomUUID)(),
             project_id: deps.projectId,
-            provider: 'claude',
+            provider: adapter.id,
             surface: 'smash',
             surface_ref_id: `smash:${runId}`,
             conversation_id: null,
@@ -403,8 +409,9 @@ function recordSafely(deps, ticketId, runId, startedAt, finishedAt, status, resu
             status,
             started_at: startedAt,
             finished_at: finishedAt,
+            total_cost_usd_estimated: estimated,
             ...normalised,
-            model: resultEvent?.model ?? model ?? undefined,
+            model: normalised.model ?? model ?? undefined,
         });
     }
     catch (err) {
@@ -451,10 +458,13 @@ function distributeInt(total, n) {
  * are split via largest-remainder so the per-child rows sum EXACTLY back to the
  * spawn total (LOW-9).
  */
-function recordChildrenInvocations(deps, childrenIds, runId, startedAt, finishedAt, resultEvent, model) {
-    if (childrenIds.length === 0 || !resultEvent)
+function recordChildrenInvocations(deps, adapter, childrenIds, runId, startedAt, finishedAt, events, model) {
+    if (childrenIds.length === 0)
         return;
-    const normalised = (0, result_event_1.normaliseResultEvent)(resultEvent, 'claude');
+    const { result: normalised, estimated } = (0, result_event_1.finaliseInvocationResult)(adapter, events, {
+        fallbackModel: model ?? adapter.defaultModel(),
+        durationMs: Math.max(0, Date.parse(finishedAt) - Date.parse(startedAt)),
+    });
     const n = childrenIds.length;
     const split = (v) => {
         if (v === null || v === undefined)
@@ -474,7 +484,7 @@ function recordChildrenInvocations(deps, childrenIds, runId, startedAt, finished
             (0, ai_invocations_1.recordInvocation)(deps.db, {
                 id: (0, node_crypto_1.randomUUID)(),
                 project_id: deps.projectId,
-                provider: 'claude',
+                provider: adapter.id,
                 surface: 'smash',
                 surface_ref_id: `smash:${runId}:child:${childId}`,
                 conversation_id: null,
@@ -482,6 +492,7 @@ function recordChildrenInvocations(deps, childrenIds, runId, startedAt, finished
                 status: 'success',
                 started_at: startedAt,
                 finished_at: finishedAt,
+                total_cost_usd_estimated: estimated,
                 duration_ms: split(normalised.duration_ms),
                 duration_api_ms: split(normalised.duration_api_ms),
                 tokens_in: tokensIn[i],
@@ -491,7 +502,7 @@ function recordChildrenInvocations(deps, childrenIds, runId, startedAt, finished
                 total_cost_usd: split(normalised.total_cost_usd),
                 num_turns: numTurns[i],
                 session_id: normalised.session_id,
-                model: resultEvent.model ?? model ?? undefined,
+                model: normalised.model ?? model ?? undefined,
             });
         }
         catch (err) {
@@ -519,6 +530,10 @@ async function runSmash(deps, ticketId) {
     if ((0, explore_smash_1.isSpecsSmashKillSwitchActive)()) {
         return { ok: false, reason: 'disabled', ticketId, runId };
     }
+    const adapter = (0, providers_1.getAdapter)(deps.providerId ?? 'claude');
+    if (adapter.capabilities.structuredActions !== true) {
+        return { ok: false, reason: 'provider-unsupported', ticketId, runId };
+    }
     // B60: reject a concurrent SMASH of the same ticket. The has-check + add are
     // synchronous (no await between them), so they close the TOCTOU window the
     // pre-flight eligibility check leaves open. Released in the finally below.
@@ -566,36 +581,14 @@ async function runSmash(deps, ticketId) {
             ticketTitle: ticket.title,
             timestamp: startedAt,
         });
-        const { args, cwd, env: spawnEnv } = prepareSmashSpawn({
+        const { args, cwd, env: spawnEnv, options: spawnOptions } = prepareSmashSpawn({
             projectSlug: deps.projectSlug,
             projectPath: deps.projectPath,
             projectName: deps.projectName,
             model: deps.model,
             mode,
+            providerId: adapter.id,
         }, ticket);
-        let child;
-        try {
-            child = spawn('claude', args, {
-                env: spawnEnv ? { ...process.env, ...spawnEnv } : process.env,
-                stdio: ['ignore', 'pipe', 'pipe'],
-                cwd,
-            });
-        }
-        catch (err) {
-            const finishedAt = now().toISOString();
-            recordSafely(deps, ticketId, runId, startedAt, finishedAt, 'failed', null, deps.model);
-            deps.broadcast({
-                type: 'smash.failed',
-                projectId: deps.projectId,
-                ticketId,
-                runId,
-                reason: 'crashed',
-                timestamp: finishedAt,
-            });
-            // LOW-10: a row was recorded — invalidate open dashboards.
-            deps.broadcast({ type: 'spending.invalidated', projectId: deps.projectId });
-            return { ok: false, reason: 'crashed', ticketId, runId };
-        }
         // Synthesize progress pills as the spawn proceeds. The runner uses fixed
         // offsets — cheap and deterministic vs trying to read tool-use events.
         const progressTimers = [];
@@ -612,12 +605,50 @@ async function runSmash(deps, ticketId) {
                 });
             }, 200 + i * 1500));
         });
-        const result = await readSmashChildOutput(child, timeoutMs);
+        let fullText = '';
+        let resultEvent = null;
+        const run = await (0, spawn_lifecycle_1.runAiCliInvocation)({
+            adapter,
+            binary: adapter.binary,
+            argv: args,
+            cwd,
+            env: (0, runtime_1.buildProviderEnv)(adapter, spawnOptions, spawnEnv ? { ...process.env, ...spawnEnv } : process.env),
+            spawn,
+            timeoutMs,
+            onSpawn: (child) => (0, transient_children_1.trackTransientChild)(deps.projectId, child),
+            onEvent: (event) => {
+                if (event.kind === 'text-delta')
+                    fullText += event.text;
+                else if (event.kind === 'result')
+                    resultEvent = event.payload;
+            },
+        });
+        const result = {
+            fullText,
+            resultEvent,
+            code: run.code,
+            timedOut: run.timedOut,
+            spawnFailed: run.spawnFailed,
+            events: run.events,
+        };
         progressTimers.forEach((t) => clearTimeout(t));
         const finishedAt = now().toISOString();
         console.log(`[smash-runner] spawn done code=${result.code} timedOut=${result.timedOut} hasResult=${!!result.resultEvent} textBytes=${result.fullText.length}`);
+        if (result.spawnFailed) {
+            recordSafely(deps, adapter, ticketId, runId, startedAt, finishedAt, 'failed', result.events, deps.model);
+            deps.broadcast({
+                type: 'smash.failed',
+                projectId: deps.projectId,
+                ticketId,
+                runId,
+                reason: 'crashed',
+                timestamp: finishedAt,
+            });
+            deps.broadcast({ type: 'spending.invalidated', projectId: deps.projectId });
+            return { ok: false, reason: 'crashed', ticketId, runId };
+        }
         if (result.timedOut) {
-            recordSafely(deps, ticketId, runId, startedAt, finishedAt, 'aborted', result.resultEvent, deps.model);
+            recordSafely(deps, adapter, ticketId, runId, startedAt, finishedAt, 'aborted', result.events, deps.model);
             deps.broadcast({
                 type: 'smash.failed',
                 projectId: deps.projectId,
@@ -630,9 +661,10 @@ async function runSmash(deps, ticketId) {
             deps.broadcast({ type: 'spending.invalidated', projectId: deps.projectId });
             return { ok: false, reason: 'timeout', ticketId, runId };
         }
-        if (result.code !== 0 || !result.resultEvent) {
-            recordSafely(deps, ticketId, runId, startedAt, finishedAt, 'failed', result.resultEvent, deps.model);
-            const reason = result.resultEvent ? 'model_error' : 'crashed';
+        const providerError = result.events.some((event) => event.kind === 'error');
+        if (result.code !== 0 || providerError || !result.fullText.trim()) {
+            recordSafely(deps, adapter, ticketId, runId, startedAt, finishedAt, 'failed', result.events, deps.model);
+            const reason = providerError || result.resultEvent ? 'model_error' : 'crashed';
             deps.broadcast({
                 type: 'smash.failed',
                 projectId: deps.projectId,
@@ -648,7 +680,7 @@ async function runSmash(deps, ticketId) {
         const parse = (0, explore_smash_1.parseSmashOutput)(result.fullText);
         if (!parse.ok) {
             console.log(`[smash-runner] parse failed reason=${parse.reason} detail=${parse.detail ?? '-'}`);
-            recordSafely(deps, ticketId, runId, startedAt, finishedAt, 'failed', result.resultEvent, deps.model);
+            recordSafely(deps, adapter, ticketId, runId, startedAt, finishedAt, 'failed', result.events, deps.model);
             deps.broadcast({
                 type: 'smash.failed',
                 projectId: deps.projectId,
@@ -670,7 +702,7 @@ async function runSmash(deps, ticketId) {
         }
         catch (err) {
             console.error('[smash-runner] mutation failed:', err);
-            recordSafely(deps, ticketId, runId, startedAt, finishedAt, 'failed', result.resultEvent, deps.model);
+            recordSafely(deps, adapter, ticketId, runId, startedAt, finishedAt, 'failed', result.events, deps.model);
             deps.broadcast({
                 type: 'smash.failed',
                 projectId: deps.projectId,
@@ -687,7 +719,22 @@ async function runSmash(deps, ticketId) {
         // (cost split evenly). The Epic itself does not accrue cost here — the
         // operation logically birthed the Sub-Specs and the cost belongs to them.
         // Total project cost remains the original spawn cost (sum of N × X/N = X).
-        recordChildrenInvocations(deps, applied.children.map((c) => c.id), runId, startedAt, finishedAt, result.resultEvent, deps.model);
+        const reported = (0, result_event_1.finaliseInvocationResult)(adapter, result.events, {
+            fallbackModel: deps.model ?? adapter.defaultModel(),
+        }).result;
+        const hasAttributableUsage = reported.total_cost_usd !== undefined ||
+            reported.tokens_in !== undefined ||
+            reported.tokens_out !== undefined ||
+            reported.tokens_cache_read !== undefined ||
+            reported.tokens_cache_create !== undefined;
+        if (hasAttributableUsage) {
+            recordChildrenInvocations(deps, adapter, applied.children.map((c) => c.id), runId, startedAt, finishedAt, result.events, deps.model);
+        }
+        else {
+            // Kimi's stream has no usage/cost envelope. Record the actual process once
+            // with null cost instead of fabricating N zero-cost child invocations.
+            recordSafely(deps, adapter, ticketId, runId, startedAt, finishedAt, 'success', result.events, deps.model);
+        }
         // Broadcast underlying state changes first, then the SMASH-specific event.
         deps.broadcast({
             type: 'ticket_updated',

package/server/dist/spawn-lifecycle.js

@@ -19,6 +19,7 @@ exports.runAiCliInvocation = runAiCliInvocation;
 const node_readline_1 = require("node:readline");
 const tree_kill_1 = __importDefault(require("tree-kill"));
 const cli_prompt_1 = require("./util/cli-prompt");
+const runtime_1 = require("./providers/runtime");
 const STDERR_TAIL_CAP = 64 * 1024;
 /**
  * Run one AI-CLI invocation: spawn → stream → settle. Resolves exactly once on
@@ -31,6 +32,9 @@ function runAiCliInvocation(hooks) {
     const binary = hooks.binary ?? hooks.adapter.binary;
     const args = hooks.argv ?? hooks.adapter.buildArgs(hooks.action, hooks.buildOpts);
     const spawn = hooks.spawn ?? cli_prompt_1.spawnAiCli;
+    const env = hooks.buildOpts
+        ? (0, runtime_1.buildProviderEnv)(hooks.adapter, hooks.buildOpts, hooks.env ?? process.env)
+        : hooks.env ?? process.env;
     const events = [];
     let lastResultEvent = null;
     let sessionId = null;
@@ -51,7 +55,7 @@ function runAiCliInvocation(hooks) {
         let child;
         try {
             child = spawn(binary, args, {
-                env: hooks.env ?? process.env,
+                env,
                 stdio: hooks.stdio ?? ['ignore', 'pipe', 'pipe'],
                 cwd: hooks.cwd,
             });
@@ -100,20 +104,20 @@ function runAiCliInvocation(hooks) {
                 // uncaught exception that takes the sidecar down.
                 try {
                     hooks.onStdoutLine?.(line);
-                    const ev = hooks.adapter.parseStreamLine(line);
-                    if (!ev)
-                        return;
-                    events.push(ev);
-                    if (ev.kind === 'session-started') {
-                        sessionId = ev.sessionId;
-                    }
-                    else if (ev.kind === 'result') {
-                        lastResultEvent = ev;
-                        const sid = ev.payload.session_id;
-                        if (sid)
-                            sessionId = sid;
+                    const parsedEvents = (0, runtime_1.parseStreamEvents)(hooks.adapter, line);
+                    for (const ev of parsedEvents) {
+                        events.push(ev);
+                        if (ev.kind === 'session-started') {
+                            sessionId = ev.sessionId;
+                        }
+                        else if (ev.kind === 'result') {
+                            lastResultEvent = ev;
+                            const sid = ev.payload.session_id;
+                            if (sid)
+                                sessionId = sid;
+                        }
+                        hooks.onEvent?.(ev);
                     }
-                    hooks.onEvent?.(ev);
                 }
                 catch (err) {
                     console.error('[spawn-lifecycle] stdout line handler error (ignored):', err);

package/server/dist/spec-launcher-manager.js

@@ -12,6 +12,9 @@ const cli_prompt_1 = require("./util/cli-prompt");
 const providers_1 = require("./providers");
 const result_event_1 = require("./result-event");
 const ai_invocations_1 = require("./ai-invocations");
+const runtime_1 = require("./providers/runtime");
+const loop_command_catalog_1 = require("./loop-command-catalog");
+const workspace_resolution_1 = require("./workspace-resolution");
 // ─── SpecLauncherManager ──────────────────────────────────────────────────────
 class SpecLauncherManager {
     _broadcast;
@@ -36,21 +39,27 @@ class SpecLauncherManager {
      *  fires when BOTH are present. */
     _db;
     _projectId;
-    /** claude adapter — the launcher only ever spawns claude. Used to parse the
-     *  stream into AdapterEvents for cost finalisation. */
-    _adapter = (0, providers_1.getAdapter)('claude');
+    _projectSlug;
+    _adapter;
     /** Accumulated adapter events per active launch, drained at close. */
     _events = new Map();
     /** Spawn timestamp per active launch (ISO), for the invocation row. */
     _startedAt = new Map();
-    constructor(broadcast, cwd, db, projectId) {
+    constructor(broadcast, cwd, db, projectId, providerId = 'claude', projectSlug) {
         this._broadcast = broadcast;
         this._cwd = cwd;
         this._db = db;
         this._projectId = projectId;
+        this._projectSlug = projectSlug;
+        this._adapter = (0, providers_1.getAdapter)(providerId);
         this._activeProcesses = new Map();
         this._buffers = new Map();
     }
+    /** Resolve lazily because Core may populate the relocated workspace after
+     * this project-scoped manager was constructed. */
+    _execution() {
+        return (0, workspace_resolution_1.resolveProjectExecution)({ slug: this._projectSlug, path: this._cwd });
+    }
     /**
      * Persist one surface='spec-launcher' ai_invocations row. Cost is the native
      * `total_cost_usd` when the run produced a terminal `result` event, else the
@@ -66,8 +75,10 @@ class SpecLauncherManager {
         if (!db || !projectId)
             return;
         try {
+            const finishedAt = new Date().toISOString();
             const { result, estimated } = (0, result_event_1.finaliseInvocationResult)(this._adapter, events, {
                 fallbackModel: this._adapter.defaultModel(),
+                durationMs: Math.max(0, Date.parse(finishedAt) - Date.parse(startedAt)),
             });
             (0, ai_invocations_1.recordInvocation)(db, {
                 id: (0, crypto_1.randomUUID)(),
@@ -77,7 +88,7 @@ class SpecLauncherManager {
                 surface_ref_id: launchId,
                 status,
                 started_at: startedAt,
-                finished_at: new Date().toISOString(),
+                finished_at: finishedAt,
                 total_cost_usd_estimated: estimated,
                 ...result,
             });
@@ -139,24 +150,42 @@ class SpecLauncherManager {
         this._startedAt.clear();
     }
     async launch(launchId, description) {
+        const execution = this._execution();
         const rawCommand = `/opsx:ff ${description}`;
-        const prompt = (0, command_resolver_1.resolveCommand)(rawCommand, this._cwd);
-        if (prompt === rawCommand) {
+        const resolvedPrompt = this._adapter.capabilities.materializeHeadlessSkills
+            ? rawCommand
+            : (0, command_resolver_1.resolveCommand)(rawCommand, execution.cwd);
+        const providerCommand = resolvedPrompt === rawCommand
+            ? `${(0, loop_command_catalog_1.expandCommands)('{{cmd:opsx:ff}}', { provider: this._adapter.id })} ${description}`
+            : resolvedPrompt;
+        if (providerCommand === rawCommand) {
             this._broadcastError(launchId, 'This project does not have the /opsx:ff command installed. Run "npx specrails-core@latest" to install it.');
             return;
         }
-        const args = [
-            '--dangerously-skip-permissions',
-            '--tools', 'default',
-            '--output-format', 'stream-json',
-            '--verbose',
-            '-p', prompt,
-        ];
-        // spawnClaude reroutes multi-line argv values through stdin on Windows.
-        const child = (0, cli_prompt_1.spawnClaude)(args, {
-            env: process.env,
+        let prompt;
+        try {
+            prompt = (0, runtime_1.formatProviderCommand)(this._adapter, providerCommand, execution.cwd);
+        }
+        catch (error) {
+            this._broadcastError(launchId, error instanceof Error ? error.message : String(error));
+            return;
+        }
+        const spawnOptions = {
+            prompt,
+            model: this._adapter.defaultModel(),
+            toolPolicy: 'default',
+            extraArgs: execution.relocated
+                ? (0, runtime_1.buildProviderRepoAccessArgs)(this._adapter, [execution.repoDir])
+                : [],
+        };
+        const args = this._adapter.buildArgs('spec-gen', spawnOptions);
+        const child = (0, cli_prompt_1.spawnAiCli)(this._adapter.binary, args, {
+            env: (0, runtime_1.buildProviderEnv)(this._adapter, spawnOptions, {
+                ...process.env,
+                ...execution.env,
+            }),
             stdio: ['ignore', 'pipe', 'pipe'],
-            cwd: this._cwd,
+            cwd: execution.cwd,
         });
         this._activeProcesses.set(launchId, child);
         this._buffers.set(launchId, '');
@@ -178,7 +207,7 @@ class SpecLauncherManager {
                 type: 'spec_launcher_error',
                 projectId: '',
                 launchId,
-                error: `Failed to launch claude: ${err.message}`,
+                error: `Failed to launch ${this._adapter.binary}: ${err.message}`,
                 timestamp: new Date().toISOString(),
             });
         });
@@ -188,28 +217,12 @@ class SpecLauncherManager {
         const stdoutReader = (0, readline_1.createInterface)({ input: child.stdout, crlfDelay: Infinity });
         stdoutReader.on('line', (line) => {
             // Accumulate adapter events so a killed/failed launch is still costed from
-            // the per-assistant-event usage snapshots (HIGH-5). Only when DB-wired.
-            if (this._db && this._projectId) {
-                const ev = this._adapter.parseStreamLine(line);
-                if (ev)
-                    this._events.get(launchId)?.push(ev);
-            }
-            let parsed = null;
-            try {
-                parsed = JSON.parse(line);
-            }
-            catch { /* skip non-JSON */ }
-            if (!parsed)
-                return;
-            const eventType = parsed.type;
-            if (eventType === 'assistant') {
-                const msg = parsed.message;
-                const blocks = msg?.content ?? [];
-                const texts = blocks
-                    .filter((c) => c.type === 'text')
-                    .map((c) => c.text ?? '');
-                const newText = texts.join('');
-                if (newText) {
+            // the per-assistant-event usage snapshots (HIGH-5), and so explicit
+            // provider failures remain terminal even when a CLI anomalously exits 0.
+            for (const event of (0, runtime_1.parseStreamEvents)(this._adapter, line)) {
+                this._events.get(launchId)?.push(event);
+                if (event.kind === 'text-delta') {
+                    const newText = event.text;
                     // Try to detect change ID from output (look for "openspec/changes/<id>" pattern)
                     const changeMatch = newText.match(/openspec\/changes\/([^\s/]+)/);
                     if (changeMatch)
@@ -224,16 +237,14 @@ class SpecLauncherManager {
                         timestamp: new Date().toISOString(),
                     });
                 }
-                for (const block of blocks) {
-                    if (block.type === 'tool_use' && block.name) {
-                        this._broadcast({
-                            type: 'spec_launcher_stream',
-                            projectId: '',
-                            launchId,
-                            delta: `<!--tool:${block.name}-->`,
-                            timestamp: new Date().toISOString(),
-                        });
-                    }
+                else if (event.kind === 'tool-use') {
+                    this._broadcast({
+                        type: 'spec_launcher_stream',
+                        projectId: '',
+                        launchId,
+                        delta: `<!--tool:${event.name}-->`,
+                        timestamp: new Date().toISOString(),
+                    });
                 }
             }
         });
@@ -244,13 +255,14 @@ class SpecLauncherManager {
                 this._activeProcesses.delete(launchId);
                 this._buffers.delete(launchId);
                 const wasCancelled = this._cancelledIds.delete(launchId);
+                const providerError = this._events.get(launchId)?.find((event) => event.kind === 'error')?.message;
                 // Record the invocation regardless of cancel/done outcome (the spend is
                 // real either way) — but NOT when the project is being torn down, since
                 // its DB is closing (recordInvocation would throw). A cancelled/killed
                 // launch is 'aborted'; a non-zero exit is 'failed'; a clean exit is
                 // 'success' (HIGH-5).
                 if (!this._disposed) {
-                    const status = wasCancelled ? 'aborted' : code === 0 ? 'success' : 'failed';
+                    const status = wasCancelled ? 'aborted' : code === 0 && !providerError ? 'success' : 'failed';
                     this._recordInvocation(launchId, status);
                 }
                 this._events.delete(launchId);
@@ -262,7 +274,7 @@ class SpecLauncherManager {
                     resolve();
                     return;
                 }
-                if (code === 0) {
+                if (code === 0 && !providerError) {
                     // Also try to extract change ID from full text
                     if (!detectedChangeId) {
                         const match = fullText.match(/openspec\/changes\/([^\s/]+)/);
@@ -278,7 +290,7 @@ class SpecLauncherManager {
                     });
                 }
                 else {
-                    this._broadcastError(launchId, 'Spec generation failed');
+                    this._broadcastError(launchId, providerError ?? 'Spec generation failed');
                 }
                 resolve();
             });

package/server/dist/spec-models.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROVIDER_DEFAULT_MODEL = exports.GEMINI_MODELS = exports.CODEX_MODELS = exports.CLAUDE_MODELS = void 0;
+exports.PROVIDER_DEFAULT_MODEL = exports.KIMI_MODELS = exports.GEMINI_MODELS = exports.CODEX_MODELS = exports.CLAUDE_MODELS = void 0;
 exports.getModelsForProvider = getModelsForProvider;
 exports.isValidModelForProvider = isValidModelForProvider;
 exports.getProviderDefault = getProviderDefault;
+const providers_1 = require("./providers");
 exports.CLAUDE_MODELS = [
     { value: 'sonnet', label: 'Claude Sonnet' },
     { value: 'fable', label: 'Claude Fable' },
@@ -26,25 +27,33 @@ exports.GEMINI_MODELS = [
     { value: 'gemini-3.1-flash-lite', label: 'Gemini 3.1 Flash Lite' },
     { value: 'gemini-2.5-flash-lite', label: 'Gemini 2.5 Flash Lite' },
 ];
-/** Per-provider model catalog. Lookup, not a branch — fallback is Claude's. */
+// Mirrors KIMI_MODELS in server/providers/kimi-adapter.ts.
+exports.KIMI_MODELS = [
+    { value: 'k3', label: 'Kimi K3' },
+    { value: 'kimi-for-coding', label: 'Kimi for Coding' },
+    { value: 'kimi-for-coding-highspeed', label: 'Kimi for Coding Highspeed' },
+];
+/** Per-provider model catalog. Unknown providers intentionally return none. */
 const PROVIDER_MODELS = {
     claude: exports.CLAUDE_MODELS,
     codex: exports.CODEX_MODELS,
     gemini: exports.GEMINI_MODELS,
+    kimi: exports.KIMI_MODELS,
 };
 exports.PROVIDER_DEFAULT_MODEL = {
     claude: 'sonnet',
     codex: 'gpt-5.5',
     gemini: 'gemini-3.5-flash',
+    kimi: 'k3',
 };
 function getModelsForProvider(provider) {
-    return PROVIDER_MODELS[provider] ?? exports.CLAUDE_MODELS;
+    return PROVIDER_MODELS[provider] ?? [];
 }
 function isValidModelForProvider(model, provider) {
-    if (typeof model !== 'string' || model.length === 0)
+    if (!(0, providers_1.hasAdapter)(provider))
         return false;
-    return getModelsForProvider(provider).some((m) => m.value === model);
+    return (0, providers_1.isModelAvailableForAdapter)((0, providers_1.getAdapter)(provider), model);
 }
 function getProviderDefault(provider) {
-    return exports.PROVIDER_DEFAULT_MODEL[provider] ?? exports.PROVIDER_DEFAULT_MODEL.claude;
+    return exports.PROVIDER_DEFAULT_MODEL[provider] ?? '';
 }