specrails-desktop 2.30.2 → 2.31.0

package/server/dist/contract-refine-runner.js

@@ -25,7 +25,8 @@ 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 registry_1 = require("./providers/registry");
+const providers_1 = require("./providers");
+const runtime_1 = require("./providers/runtime");
 const explore_contract_refine_1 = require("./explore-contract-refine");
 const db_1 = require("./db");
 const explore_cwd_manager_1 = require("./explore-cwd-manager");
@@ -65,29 +66,30 @@ function isResultErrorEvent(resultEvent) {
     // `error_*` subtype as a model-side error rather than malformed output.
     return subtype === 'error_max_turns' || subtype.startsWith('error_');
 }
-function normalizeClaudeCodeModel(model) {
-    if (!model || typeof model !== 'string')
-        return 'sonnet';
-    return model;
-}
-function buildRefineArgs(model, systemPrompt, sessionId) {
-    return [
-        '--model', normalizeClaudeCodeModel(model),
-        // Contract Refine receives all required spec context in the prompt. An
-        // explicit no-tool allowlist is stronger than trying to enumerate every
-        // present and future tool in --disallowedTools.
-        '--tools', '__none__',
-        '--output-format', 'stream-json',
-        '--verbose',
-        '--system-prompt', systemPrompt,
-        '--resume', sessionId,
-        '--max-turns', '1',
-        '-p', explore_contract_refine_1.CONTRACT_MARKER_USER_MESSAGE,
-    ];
+function buildRefineArgs(adapter, model, systemPrompt, sessionId) {
+    const action = sessionId && adapter.capabilities.nativeResume ? 'chat-resume' : 'spec-gen';
+    // Chat adapters intentionally keep resumed Explore prompts short because the
+    // app-managed cwd already carries the normal Explore stance. Contract Refine
+    // is different: its schema is invocation-specific and must be present on the
+    // resumed turn. Providers without a native system-prompt flag therefore need
+    // the schema folded here, exactly once, before their chat-resume builder
+    // deliberately ignores `systemPrompt`.
+    const foldForResume = action === 'chat-resume' && !adapter.capabilities.systemPromptArg;
+    const options = {
+        prompt: foldForResume
+            ? `${systemPrompt}\n\n---\n\n${explore_contract_refine_1.CONTRACT_MARKER_USER_MESSAGE}`
+            : explore_contract_refine_1.CONTRACT_MARKER_USER_MESSAGE,
+        model,
+        systemPrompt: foldForResume ? undefined : systemPrompt,
+        sessionId,
+        toolPolicy: 'none',
+        maxTurns: 1,
+    };
+    return { args: adapter.buildArgs(action, options), options };
 }
 /** Build the pure-output, no-resume invocation used by Quick Refine and by the
  * one-time compatibility recovery for cwd-scoped Explore sessions. */
-function buildFreshRefineArgs(model, title, description) {
+function buildFreshRefineArgs(adapter, model, title, description) {
     const systemPrompt = [
         (0, explore_contract_refine_1.buildContractRefineSystemPrompt)(),
         '',
@@ -99,15 +101,14 @@ function buildFreshRefineArgs(model, title, description) {
         '### Description',
         description,
     ].join('\n');
-    return [
-        '--model', model,
-        '--tools', '__none__',
-        '--output-format', 'stream-json',
-        '--verbose',
-        '--system-prompt', systemPrompt,
-        '--max-turns', '1',
-        '-p', explore_contract_refine_1.CONTRACT_MARKER_USER_MESSAGE,
-    ];
+    const options = {
+        prompt: explore_contract_refine_1.CONTRACT_MARKER_USER_MESSAGE,
+        model,
+        systemPrompt,
+        toolPolicy: 'none',
+        maxTurns: 1,
+    };
+    return { args: adapter.buildArgs('spec-gen', options), options };
 }
 /** Match only Claude's missing cwd-scoped session diagnostic. The CLI has
  * emitted it both as stderr and inside structured result payloads, so inspect
@@ -180,8 +181,10 @@ function prepareContractRefineSpawn(deps, conversation) {
             cwd = deps.projectPath;
         }
     }
-    const args = buildRefineArgs(conversation.model ?? 'sonnet', systemPrompt, conversation.session_id ?? '');
-    return { args, cwd, systemPrompt, env };
+    const adapter = (0, providers_1.getAdapter)(conversation.provider ?? deps.providerId ?? 'claude');
+    const model = conversation.model ?? adapter.defaultModel();
+    const built = buildRefineArgs(adapter, model, systemPrompt, conversation.session_id ?? '');
+    return { args: built.args, cwd, systemPrompt, env, options: built.options, adapter };
 }
 /** Grace before SIGKILL-escalating a child that swallowed SIGTERM. */
 const REFINE_SIGKILL_GRACE_MS = 2_000;
@@ -358,13 +361,9 @@ async function runContractRefine(deps, conversationId, ticketId) {
         console.log(`[contract-refine-runner] skip: conversation missing or not explore (kind=${conversation?.kind})`);
         return { ok: false, reason: 'not-explore', ticketId, conversationId };
     }
-    // Contract Layer refinement is a Claude-only capability (it `--resume`s the
-    // Explore session and invokes the `/specrails:contract-refine` slash command,
-    // neither of which Codex supports). Skip defensively when the conversation
-    // ran on a non-claude engine; the Add Spec UI already hides the toggle for
-    // those, but a manually-crafted scope must never spawn the wrong CLI.
-    if (conversation.provider && conversation.provider !== 'claude') {
-        console.log(`[contract-refine-runner] skip: provider '${conversation.provider}' does not support contract refine`);
+    const adapter = (0, providers_1.getAdapter)(conversation.provider ?? deps.providerId ?? 'claude');
+    if (adapter.capabilities.structuredActions !== true) {
+        console.log(`[contract-refine-runner] skip: provider '${adapter.id}' does not support structured actions`);
         return { ok: false, reason: 'provider-unsupported', ticketId, conversationId };
     }
     // Per-conversation gating: contractRefine on the conversation's stored
@@ -394,13 +393,15 @@ async function runContractRefine(deps, conversationId, ticketId) {
     deps.broadcast({
         type: 'explore.contract_refine_started',
         projectId: deps.projectId,
+        provider: adapter.id,
         ticketId,
         timestamp: now().toISOString(),
     });
-    const { args, cwd, env: refineEnv } = prepareContractRefineSpawn({
+    const { args, cwd, env: refineEnv, options: refineOptions } = prepareContractRefineSpawn({
         projectSlug: deps.projectSlug,
         projectPath: deps.projectPath,
         projectName: deps.projectName,
+        providerId: adapter.id,
     }, conversation);
     const startedAt = now().toISOString();
     // Spawn/stream/timeout/settlement is owned by the shared spawn-lifecycle; the
@@ -408,38 +409,24 @@ async function runContractRefine(deps, conversationId, ticketId) {
     // the raw result event) and all finalize/record/broadcast logic stay here.
     // Keeping the invocation result in one shape also lets the narrowly-gated
     // missing-session recovery re-enter the exact same finalization path.
-    const invoke = async (invocationArgs) => {
+    const invoke = async (invocationArgs, invocationOptions) => {
         let fullText = '';
         let resultEvent = null;
         const run = await (0, spawn_lifecycle_1.runAiCliInvocation)({
-            adapter: (0, registry_1.getAdapter)('claude'),
-            binary: 'claude',
+            adapter,
+            binary: adapter.binary,
             argv: invocationArgs,
             cwd,
-            env: refineEnv ?? process.env,
+            env: (0, runtime_1.buildProviderEnv)(adapter, invocationOptions, refineEnv ?? process.env),
             spawn,
             timeoutMs,
             onSpawn: (child) => (0, transient_children_1.trackTransientChild)(deps.projectId, child),
-            onStdoutLine: (line) => {
-                let parsed = null;
-                try {
-                    parsed = JSON.parse(line);
+            onEvent: (event) => {
+                if (event.kind === 'text-delta') {
+                    fullText += event.text;
                 }
-                catch {
-                    return;
-                }
-                if (!parsed)
-                    return;
-                const type = parsed.type;
-                if (type === 'result') {
-                    resultEvent = parsed;
-                }
-                else if (type === 'assistant') {
-                    const message = parsed.message;
-                    for (const b of (message?.content ?? [])) {
-                        if (b.type === 'text' && typeof b.text === 'string')
-                            fullText += b.text;
-                    }
+                else if (event.kind === 'result') {
+                    resultEvent = event.payload;
                 }
             },
         });
@@ -450,9 +437,10 @@ async function runContractRefine(deps, conversationId, ticketId) {
             timedOut: run.timedOut,
             spawnFailed: run.spawnFailed,
             stderrTail: run.stderrTail,
+            events: run.events,
         };
     };
-    let result = await invoke(args);
+    let result = await invoke(args, refineOptions);
     if (!admission.isCurrent()) {
         return { ok: false, reason: 'aborted', ticketId, conversationId };
     }
@@ -468,7 +456,7 @@ async function runContractRefine(deps, conversationId, ticketId) {
     const missingSessionDiagnostic = containsMissingClaudeSessionDiagnostic(result.fullText) ||
         containsMissingClaudeSessionDiagnostic(result.resultEvent) ||
         containsMissingClaudeSessionDiagnostic(result.stderrTail);
-    if (resumedFromRelocatedWorkspace && resumeFailed && missingSessionDiagnostic) {
+    if (adapter.id === 'claude' && resumedFromRelocatedWorkspace && resumeFailed && missingSessionDiagnostic) {
         let ticket = null;
         try {
             ticket = (0, ticket_store_1.readStore)(resolveContractTicketsPath(deps.projectPath)).tickets[String(ticketId)] ?? null;
@@ -478,7 +466,8 @@ async function runContractRefine(deps, conversationId, ticketId) {
         }
         if (ticket) {
             console.warn(`[contract-refine-runner] resume session unavailable; retrying once fresh from workspace ticket=${ticketId}`);
-            result = await invoke(buildFreshRefineArgs(conversation.model ?? 'sonnet', ticket.title, ticket.description));
+            const fresh = buildFreshRefineArgs(adapter, conversation.model ?? adapter.defaultModel(), ticket.title, ticket.description);
+            result = await invoke(fresh.args, fresh.options);
             if (!admission.isCurrent()) {
                 return { ok: false, reason: 'aborted', ticketId, conversationId };
             }
@@ -486,10 +475,11 @@ async function runContractRefine(deps, conversationId, ticketId) {
     }
     const finishedAt = now().toISOString();
     if (result.spawnFailed) {
-        recordSafely(deps, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', null);
+        recordSafely(deps, adapter, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'crashed',
             timestamp: finishedAt,
@@ -498,17 +488,19 @@ async function runContractRefine(deps, conversationId, ticketId) {
     }
     console.log(`[contract-refine-runner] spawn done code=${result.code} timedOut=${result.timedOut} hasResult=${!!result.resultEvent} textBytes=${result.fullText.length}`);
     if (result.timedOut) {
-        recordSafely(deps, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'aborted', result.resultEvent);
+        recordSafely(deps, adapter, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'aborted', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'timeout',
             timestamp: finishedAt,
         });
         return { ok: false, reason: 'timeout', ticketId, conversationId };
     }
-    if (result.code !== 0 || !result.resultEvent) {
+    const providerError = result.events.some((event) => event.kind === 'error');
+    if (result.code !== 0 || providerError || !result.fullText.trim()) {
         const r = result.resultEvent;
         console.log(`[contract-refine-runner] non-zero exit code=${result.code} ` +
             `subtype=${r?.subtype ?? '-'} is_error=${r?.is_error ?? '-'} ` +
@@ -516,25 +508,27 @@ async function runContractRefine(deps, conversationId, ticketId) {
             `textTail=${JSON.stringify(result.fullText.slice(-400))}`);
         if (r)
             console.log(`[contract-refine-runner] result event: ${JSON.stringify(r).slice(0, 2000)}`);
-        recordSafely(deps, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafely(deps, adapter, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
-            reason: result.resultEvent ? 'model_error' : 'crashed',
+            reason: providerError || result.resultEvent ? 'model_error' : 'crashed',
             timestamp: finishedAt,
         });
-        return { ok: false, reason: result.resultEvent ? 'model_error' : 'crashed', ticketId, conversationId };
+        return { ok: false, reason: providerError || result.resultEvent ? 'model_error' : 'crashed', ticketId, conversationId };
     }
     // BUG-PARSER-04: exit-0 but the result event flags an error / max-turns
     // truncation — classify as model_error, not malformed.
-    if (isResultErrorEvent(result.resultEvent)) {
+    if (result.resultEvent && isResultErrorEvent(result.resultEvent)) {
         const r = result.resultEvent;
         console.log(`[contract-refine-runner] result error event subtype=${r.subtype ?? '-'} is_error=${r.is_error ?? '-'}`);
-        recordSafely(deps, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafely(deps, adapter, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'model_error',
             timestamp: finishedAt,
@@ -547,10 +541,11 @@ async function runContractRefine(deps, conversationId, ticketId) {
         const reason = parse.reason === 'parser-error'
             ? 'parser_error'
             : 'malformed';
-        recordSafely(deps, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafely(deps, adapter, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason,
             timestamp: finishedAt,
@@ -565,17 +560,18 @@ async function runContractRefine(deps, conversationId, ticketId) {
     }
     catch (err) {
         console.error('[contract-refine-runner] PATCH failed:', err);
-        recordSafely(deps, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafely(deps, adapter, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'parser_error',
             timestamp: finishedAt,
         });
         return { ok: false, reason: 'parser_error', ticketId, conversationId };
     }
-    recordSafely(deps, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'success', result.resultEvent);
+    recordSafely(deps, adapter, conversationId, ticketId, conversation.model, startedAt, finishedAt, 'success', result.events);
     if (updated) {
         deps.broadcast({
             type: 'ticket_updated',
@@ -605,79 +601,106 @@ async function runContractRefineForQuick(deps, ticketId, generatedTitle, generat
         return { ok: false, reason: 'disabled', ticketId, conversationId: '' };
     }
     const admission = (0, process_admission_1.captureProcessAdmission)(deps.projectId);
-    const args = buildFreshRefineArgs(model ?? 'sonnet', generatedTitle, generatedDescription);
+    const adapter = (0, providers_1.getAdapter)(deps.providerId ?? 'claude');
+    if (adapter.capabilities.structuredActions !== true) {
+        return { ok: false, reason: 'provider-unsupported', ticketId, conversationId: '' };
+    }
+    const resolvedModel = model ?? adapter.defaultModel();
+    const built = buildFreshRefineArgs(adapter, resolvedModel, generatedTitle, generatedDescription);
     const startedAt = now().toISOString();
     deps.broadcast({
         type: 'explore.contract_refine_started',
         projectId: deps.projectId,
+        provider: adapter.id,
         ticketId,
         timestamp: startedAt,
     });
     // Relocate-artifacts gate: spawn from the workspace + SPECRAILS_REPO_DIR when
     // relocated, else cwd = project.path + process.env (byte-identical legacy).
     const quickExec = (0, workspace_resolution_1.resolveProjectExecution)({ slug: deps.projectSlug, path: deps.projectPath });
-    let child;
-    try {
-        child = spawn('claude', args, {
-            env: quickExec.relocated ? { ...process.env, ...quickExec.env } : process.env,
-            stdio: ['ignore', 'pipe', 'pipe'],
-            cwd: quickExec.cwd,
-        });
-        (0, transient_children_1.trackTransientChild)(deps.projectId, child);
+    let fullText = '';
+    let resultEvent = null;
+    const run = await (0, spawn_lifecycle_1.runAiCliInvocation)({
+        adapter,
+        binary: adapter.binary,
+        argv: built.args,
+        cwd: quickExec.cwd,
+        env: (0, runtime_1.buildProviderEnv)(adapter, built.options, quickExec.relocated ? { ...process.env, ...quickExec.env } : 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,
+    };
+    if (!admission.isCurrent()) {
+        return { ok: false, reason: 'aborted', ticketId, conversationId: '' };
     }
-    catch (err) {
-        recordSafelyQuick(deps, ticketId, model, startedAt, now().toISOString(), 'failed', null);
+    const finishedAt = now().toISOString();
+    console.log(`[contract-refine-runner] quick spawn done code=${result.code} timedOut=${result.timedOut} textBytes=${result.fullText.length}`);
+    if (result.spawnFailed) {
+        recordSafelyQuick(deps, adapter, ticketId, resolvedModel, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'crashed',
-            timestamp: now().toISOString(),
+            timestamp: finishedAt,
         });
         return { ok: false, reason: 'crashed', ticketId, conversationId: '' };
     }
-    const result = await readRefineChildOutput(child, timeoutMs);
-    if (!admission.isCurrent()) {
-        return { ok: false, reason: 'aborted', ticketId, conversationId: '' };
-    }
-    const finishedAt = now().toISOString();
-    console.log(`[contract-refine-runner] quick spawn done code=${result.code} timedOut=${result.timedOut} textBytes=${result.fullText.length}`);
     if (result.timedOut) {
-        recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, 'aborted', result.resultEvent);
+        recordSafelyQuick(deps, adapter, ticketId, resolvedModel, startedAt, finishedAt, 'aborted', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'timeout',
             timestamp: finishedAt,
         });
         return { ok: false, reason: 'timeout', ticketId, conversationId: '' };
     }
-    if (result.code !== 0 || !result.resultEvent) {
+    const providerError = result.events.some((event) => event.kind === 'error');
+    if (result.code !== 0 || providerError || !result.fullText.trim()) {
         const r = result.resultEvent;
         console.log(`[contract-refine-runner] quick non-zero exit code=${result.code} ` +
             `subtype=${r?.subtype ?? '-'} is_error=${r?.is_error ?? '-'} ` +
             `num_turns=${r?.num_turns ?? '-'} ` +
             `textTail=${JSON.stringify(result.fullText.slice(-400))}`);
-        recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafelyQuick(deps, adapter, ticketId, resolvedModel, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
-            reason: result.resultEvent ? 'model_error' : 'crashed',
+            reason: providerError || result.resultEvent ? 'model_error' : 'crashed',
             timestamp: finishedAt,
         });
-        return { ok: false, reason: result.resultEvent ? 'model_error' : 'crashed', ticketId, conversationId: '' };
+        return { ok: false, reason: providerError || result.resultEvent ? 'model_error' : 'crashed', ticketId, conversationId: '' };
     }
     // BUG-PARSER-04: exit-0 but the result event flags an error / max-turns
     // truncation — classify as model_error, not malformed.
-    if (isResultErrorEvent(result.resultEvent)) {
+    if (result.resultEvent && isResultErrorEvent(result.resultEvent)) {
         const r = result.resultEvent;
         console.log(`[contract-refine-runner] quick result error event subtype=${r.subtype ?? '-'} is_error=${r.is_error ?? '-'}`);
-        recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafelyQuick(deps, adapter, ticketId, resolvedModel, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'model_error',
             timestamp: finishedAt,
@@ -687,10 +710,11 @@ async function runContractRefineForQuick(deps, ticketId, generatedTitle, generat
     const parse = (0, explore_contract_refine_1.parseContractLayerBlock)(result.fullText);
     if (!parse.ok) {
         const reason = parse.reason === 'parser-error' ? 'parser_error' : 'malformed';
-        recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafelyQuick(deps, adapter, ticketId, resolvedModel, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason,
             timestamp: finishedAt,
@@ -704,17 +728,18 @@ async function runContractRefineForQuick(deps, ticketId, generatedTitle, generat
     }
     catch (err) {
         console.error('[contract-refine-runner] quick PATCH failed:', err);
-        recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, 'failed', result.resultEvent);
+        recordSafelyQuick(deps, adapter, ticketId, resolvedModel, startedAt, finishedAt, 'failed', result.events);
         deps.broadcast({
             type: 'explore.contract_refine_failed',
             projectId: deps.projectId,
+            provider: adapter.id,
             ticketId,
             reason: 'parser_error',
             timestamp: finishedAt,
         });
         return { ok: false, reason: 'parser_error', ticketId, conversationId: '' };
     }
-    recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, 'success', result.resultEvent);
+    recordSafelyQuick(deps, adapter, ticketId, resolvedModel, startedAt, finishedAt, 'success', result.events);
     if (updated) {
         deps.broadcast({
             type: 'ticket_updated',
@@ -726,13 +751,16 @@ async function runContractRefineForQuick(deps, ticketId, generatedTitle, generat
     deps.broadcast({ type: 'spending.invalidated', projectId: deps.projectId });
     return { ok: true, ticketId, conversationId: '' };
 }
-function recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, status, resultEvent) {
+function recordSafelyQuick(deps, adapter, ticketId, model, startedAt, finishedAt, status, events) {
     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: 'quick-spec',
             surface_ref_id: `contract-refine:${ticketId}`,
             conversation_id: null,
@@ -740,21 +768,25 @@ function recordSafelyQuick(deps, ticketId, model, startedAt, finishedAt, status,
             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) {
         console.error('[contract-refine-runner] quick recordInvocation failed:', err);
     }
 }
-function recordSafely(deps, conversationId, ticketId, model, startedAt, finishedAt, status, resultEvent) {
+function recordSafely(deps, adapter, conversationId, ticketId, model, startedAt, finishedAt, status, events) {
     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: 'explore-spec',
             surface_ref_id: `contract-refine:${conversationId}`,
             conversation_id: conversationId,
@@ -762,8 +794,9 @@ function recordSafely(deps, conversationId, ticketId, model, startedAt, finished
             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) {

package/server/dist/core-compat.js

@@ -9,10 +9,12 @@ exports.detectAvailableCLIs = detectAvailableCLIs;
 exports.detectCLI = detectCLI;
 exports.getCLIStatus = getCLIStatus;
 exports.checkCoreCompat = checkCoreCompat;
+exports.coreCompatSupportsProvider = coreCompatSupportsProvider;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const setup_manager_1 = require("./setup-manager");
+const bundled_core_1 = require("./bundled-core");
 // Windows has no `which`; probe PATH via `where` instead.
 const WHICH_CMD = process.platform === 'win32' ? 'where' : 'which';
 // These must mirror KNOWN_VERBS in cli/specrails-desktop.ts
@@ -27,15 +29,55 @@ const DESKTOP_KNOWN_COMMANDS = new Set([
     'compat-check',
     'enrich',
 ]);
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function isStringArray(value) {
+    return Array.isArray(value) && value.every((item) => typeof item === 'string');
+}
+/**
+ * A provider key alone is not proof that Core can render or launch it. Require
+ * the common workflow surface and, for Kimi, the managed materialization runner
+ * that Desktop depends on for every headless Core command.
+ */
+function isRenderedProviderContract(provider, value) {
+    if (!isRecord(value))
+        return false;
+    if (typeof value.enrichCommand !== 'string' ||
+        value.enrichCommand.length === 0 ||
+        !isStringArray(value.enrichArgs) ||
+        typeof value.updateCommand !== 'string' ||
+        value.updateCommand.length === 0 ||
+        !isStringArray(value.updateArgs) ||
+        !isRecord(value.cli)) {
+        return false;
+    }
+    if (provider !== 'kimi')
+        return true;
+    const cli = value.cli;
+    const skillRunner = cli.skillRunner;
+    return cli.providerBinary === 'kimi' &&
+        typeof skillRunner === 'string' &&
+        skillRunner === '.kimi-code/specrails/run-skill.mjs' &&
+        isStringArray(cli.enrichArgs) &&
+        cli.enrichArgs.includes(skillRunner);
+}
 async function findCoreContract() {
-    // Strategy 1: Try require.resolve (works for local installs)
+    // Strategy 1: the packaged Desktop's bundled Core is authoritative.
+    const bundledRoot = (0, bundled_core_1.getBundledCoreRoot)();
+    if (bundledRoot) {
+        const contractPath = path_1.default.join(bundledRoot, 'integration-contract.json');
+        if (fs_1.default.existsSync(contractPath))
+            return contractPath;
+    }
+    // Strategy 2: Try require.resolve (works for local installs)
     try {
         const contractPath = require.resolve('specrails-core/integration-contract.json');
         if (fs_1.default.existsSync(contractPath))
             return contractPath;
     }
     catch { /* not locally installed */ }
-    // Strategy 2: npm root -g
+    // Strategy 3: npm root -g
     try {
         const globalRoot = (0, child_process_1.execSync)('npm root -g', {
             encoding: 'utf-8',
@@ -149,9 +191,15 @@ async function checkCoreCompat() {
             missingCommands: [],
             extraCommands: [],
             contractFound: false,
+            supportedProviders: [],
         };
     }
     const contract = JSON.parse(fs_1.default.readFileSync(contractPath, 'utf-8'));
+    const supportedProviders = contract.providers && typeof contract.providers === 'object'
+        ? Object.entries(contract.providers)
+            .filter(([provider, providerContract]) => isRenderedProviderContract(provider, providerContract))
+            .map(([provider]) => provider)
+        : [];
     const desktopCheckpointKeys = setup_manager_1.CHECKPOINTS.map((cp) => cp.key);
     // v1/v2 store checkpoints as a string[]; v3+ stores them as a description map.
     const contractCheckpoints = Array.isArray(contract.checkpoints)
@@ -182,8 +230,15 @@ async function checkCoreCompat() {
         extraCommands,
         contractFound: true,
         contractSchemaVersion: contract.schemaVersion,
+        supportedProviders,
     };
 }
+/** True only when the located Core contract explicitly renders this provider. */
+function coreCompatSupportsProvider(result, provider) {
+    return result.contractFound &&
+        Array.isArray(result.supportedProviders) &&
+        result.supportedProviders.includes(provider);
+}
 // v3 contracts no longer include `coreVersion` at the top level — fall back
 // to reading it from the package.json next to the contract file.
 function readCoreVersionNear(contractPath) {