specrails-desktop 2.30.3 → 2.31.0

package/server/dist/agent-refine-manager.js

@@ -201,10 +201,12 @@ class AgentRefineManager {
         }
         fs_1.default.writeFileSync(file, session.draft_body, 'utf8');
         const maxVersion = this._db
-            .prepare(`SELECT COALESCE(MAX(version), 0) AS v FROM agent_versions WHERE agent_name = ?`)
-            .get(session.agent_id).v;
+            .prepare(`SELECT COALESCE(MAX(version), 0) AS v FROM agent_versions
+         WHERE provider = ? AND agent_name = ?`)
+            .get(this._adapter.id, session.agent_id).v;
         const nextVersion = maxVersion + 1;
-        this._db.prepare(`INSERT INTO agent_versions (agent_name, version, body, created_at) VALUES (?, ?, ?, ?)`).run(session.agent_id, nextVersion, session.draft_body, Date.now());
+        this._db.prepare(`INSERT INTO agent_versions (provider, agent_name, version, body, created_at)
+       VALUES (?, ?, ?, ?, ?)`).run(this._adapter.id, session.agent_id, nextVersion, session.draft_body, Date.now());
         (0, agent_refine_db_1.updateRefineSession)(this._db, opts.refineId, { status: 'applied', phase: 'done' });
         this._broadcast({
             type: 'agent_refine_applied',
@@ -230,12 +232,6 @@ class AgentRefineManager {
             throw new Error('manager_disposed');
     }
     _agentFile(agentId) {
-        // Per-provider on-disk layout:
-        //   claude → <root>/.claude/agents/<agentId>.md
-        //   codex  → <root>/.codex/skills/<agentId>/SKILL.md
-        // Future providers add their own branch via the adapter; the projectDir
-        // is already provider-aware.
-        //
         // Relocate-artifacts: custom-* agents are materialized by core into the
         // WORKSPACE when the project is relocated (same place the rails load them
         // from). Reading/writing `<project.path>/<providerDir>/agents` would touch a
@@ -244,15 +240,14 @@ class AgentRefineManager {
         // rails consume. Legacy projects are byte-identical (root === project.path).
         const exec = (0, workspace_resolution_1.resolveProjectExecution)({ path: this._projectPath });
         const root = exec.relocated && exec.workspaceDir ? exec.workspaceDir : this._projectPath;
-        if (this._adapter.id === 'codex') {
-            return path_1.default.join(root, this._adapter.projectDirName, 'skills', agentId, 'SKILL.md');
-        }
-        return path_1.default.join(root, this._adapter.projectDirName, 'agents', `${agentId}.md`);
+        return this._adapter.customRolePath?.(root, agentId)
+            ?? path_1.default.join(root, this._adapter.projectDirName, 'agents', `${agentId}.md`);
     }
     _currentVersion(agentId) {
         const row = this._db
-            .prepare(`SELECT COALESCE(MAX(version), 0) AS v FROM agent_versions WHERE agent_name = ?`)
-            .get(agentId);
+            .prepare(`SELECT COALESCE(MAX(version), 0) AS v FROM agent_versions
+         WHERE provider = ? AND agent_name = ?`)
+            .get(this._adapter.id, agentId);
         return row.v;
     }
     _appendHistory(refineId, turn) {
@@ -272,12 +267,22 @@ class AgentRefineManager {
                 agentId: session.agent_id,
                 currentBody: bodyForFirstTurn ?? '',
                 userInstruction: instruction,
+                providerId: this._adapter.id,
             })
             : instruction;
         const action = !isFirst && session.session_id && this._adapter.capabilities.nativeResume
             ? 'chat-resume'
             : 'agent-refine';
         const refineModel = this._adapter.defaultModel();
+        const supportedToolPolicies = this._adapter.capabilities.toolPolicies ?? [];
+        const toolPolicy = supportedToolPolicies.includes('none')
+            ? 'none'
+            : supportedToolPolicies.includes('read-only')
+                ? 'read-only'
+                : null;
+        if (!toolPolicy) {
+            throw new Error(`provider_tool_policy_unsupported:${this._adapter.id}`);
+        }
         const buildOpts = {
             prompt,
             model: refineModel,
@@ -285,9 +290,8 @@ class AgentRefineManager {
             // The model receives the complete current agent body in its prompt and
             // must only return a replacement body. Repo tools cannot improve this
             // contract and would turn prompt text into filesystem authority.
-            toolPolicy: 'none',
+            toolPolicy,
         };
-        const args = this._adapter.buildArgs(action, buildOpts);
         let drafted = false;
         this._bodyBuffers.set(refineId, '');
         const turnStartedAt = new Date().toISOString();
@@ -300,14 +304,13 @@ class AgentRefineManager {
         // Relocate-artifacts gate: spawn from the workspace (with SPECRAILS_REPO_DIR)
         // when relocated, else cwd = project.path + empty env (byte-identical legacy).
         const refineExec = (0, workspace_resolution_1.resolveProjectExecution)({ path: this._projectPath });
-        const refineEnv = refineExec.relocated ? { ...process.env, ...refineExec.env } : undefined;
+        const refineEnv = refineExec.relocated ? { ...process.env, ...refineExec.env } : process.env;
         const run = await (0, spawn_lifecycle_1.runAiCliInvocation)({
             adapter: this._adapter,
-            // Pass the already-policy-bound argv so first turns and native resumes
-            // cannot diverge if the lifecycle rebuilds options later.
-            argv: args,
+            action,
+            buildOpts,
             cwd: refineExec.cwd,
-            env: refineEnv,
+            env: (0, providers_1.buildProviderEnv)(this._adapter, buildOpts, refineEnv),
             onSpawn: (child) => this._activeProcesses.set(refineId, child),
             onSpawnError: (err) => { spawnState.err = err; },
             onEvent: (ev) => {
@@ -369,7 +372,7 @@ class AgentRefineManager {
             return; // cancel (BUG-LONGTAIL-01)
         }
         if (run.spawnFailed) {
-            this._emitError(refineId, `Failed to launch claude: ${spawnState.err?.message ?? 'spawn error'}`);
+            this._emitError(refineId, `Failed to launch ${this._adapter.binary}: ${spawnState.err?.message ?? 'spawn error'}`);
             (0, agent_refine_db_1.updateRefineSession)(this._db, refineId, { status: 'error', phase: 'idle' });
             return;
         }
@@ -377,13 +380,16 @@ class AgentRefineManager {
         const adapterEvents = run.events;
         const code = run.code;
         const stderr = run.stderrTail;
+        const providerError = adapterEvents.find((event) => event.kind === 'error')?.message;
         // ai_invocations capture (surface='ai-edit'). One row per refine turn.
-        const invStatus = code === 0 && fullDraft.trim() ? 'success' : 'failed';
+        const invStatus = code === 0 && !providerError && fullDraft.trim() ? 'success' : 'failed';
         this._recordRefineInvocation(refineId, adapterEvents, refineModel, invStatus, turnStartedAt);
-        if (code !== 0 || !fullDraft.trim()) {
-            this._emitError(refineId, code !== 0
-                ? `claude exited with code ${code}${stderr ? `: ${stderr.slice(-300)}` : ''}`
-                : 'claude returned empty output');
+        if (code !== 0 || providerError || !fullDraft.trim()) {
+            this._emitError(refineId, providerError
+                ? providerError
+                : code !== 0
+                    ? `${this._adapter.binary} exited with code ${code}${stderr ? `: ${stderr.slice(-300)}` : ''}`
+                    : `${this._adapter.binary} returned empty output`);
             (0, agent_refine_db_1.updateRefineSession)(this._db, refineId, { status: 'error', phase: 'idle' });
             return;
         }
@@ -442,7 +448,11 @@ class AgentRefineManager {
         if (!this._projectId)
             return;
         try {
-            const { result: normalised, estimated } = (0, result_event_1.finaliseInvocationResult)(this._adapter, adapterEvents, { fallbackModel: model });
+            const finishedAt = new Date().toISOString();
+            const { result: normalised, estimated } = (0, result_event_1.finaliseInvocationResult)(this._adapter, adapterEvents, {
+                fallbackModel: model,
+                durationMs: Math.max(0, Date.parse(finishedAt) - Date.parse(startedAt)),
+            });
             (0, ai_invocations_1.recordInvocation)(this._db, {
                 id: (0, crypto_1.randomUUID)(),
                 project_id: this._projectId,
@@ -451,7 +461,7 @@ class AgentRefineManager {
                 surface_ref_id: refineId,
                 status,
                 started_at: startedAt,
-                finished_at: new Date().toISOString(),
+                finished_at: finishedAt,
                 total_cost_usd_estimated: estimated,
                 ...normalised,
             });
@@ -466,11 +476,12 @@ class AgentRefineManager {
             return;
         (0, agent_refine_db_1.updateRefineSession)(this._db, refineId, { phase: 'testing' });
         this._emitPhase(refineId, 'testing');
-        const sampleTask = pickSampleTask(this._db, agentId);
+        const sampleTask = pickSampleTask(this._db, this._adapter.id, agentId);
         try {
             const result = await (0, agent_generator_1.testCustomAgent)(this._projectPath, {
                 draftBody,
                 sampleTask,
+                providerId: this._adapter.id,
                 // MED-3: the default-on per-refine-turn auto-test is a billable claude
                 // spawn — record it (surface='agent-studio') when we have a project DB.
                 record: this._projectId
@@ -479,8 +490,9 @@ class AgentRefineManager {
             });
             if (this._disposed)
                 return;
-            this._db.prepare(`INSERT INTO agent_tests (agent_name, draft_hash, sample_task_id, tokens, duration_ms, output, created_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?)`).run(agentId, result.draftHash, null, result.tokens, result.durationMs, result.output, Date.now());
+            this._db.prepare(`INSERT INTO agent_tests
+           (provider, agent_name, draft_hash, sample_task_id, tokens, duration_ms, output, created_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(this._adapter.id, agentId, result.draftHash, null, result.tokens, result.durationMs, result.output, Date.now());
             (0, agent_refine_db_1.updateRefineSession)(this._db, refineId, {
                 last_test_at: Date.now(),
                 last_test_hash: draftHash,
@@ -564,6 +576,15 @@ function validateAgentBody(body, providerId = 'claude') {
     return { ok: true };
 }
 function buildFirstTurnPrompt(opts) {
+    const modelRule = (opts.providerId ?? 'claude') === 'claude'
+        ? [
+            '  1. Frontmatter MUST include `name`, `description`, and `model` (one of',
+            '     `sonnet`, `opus`, `haiku`).',
+        ]
+        : [
+            '  1. Frontmatter MUST include `name` and `description`.',
+            '     Do not add provider-specific model metadata.',
+        ];
     return [
         'You are refining an existing custom agent. The user wants to iterate on its',
         'definition. Output the COMPLETE refined `.md` file — full YAML frontmatter',
@@ -571,8 +592,7 @@ function buildFirstTurnPrompt(opts) {
         'commentary, or explanations. Start at `---`.',
         '',
         'Hard rules:',
-        '  1. Frontmatter MUST include `name`, `description`, and `model` (one of',
-        '     `sonnet`, `opus`, `haiku`).',
+        ...modelRule,
         `  2. The frontmatter \`name\` MUST remain exactly: ${opts.agentId}`,
         '  3. The id `name` is locked; renaming is a separate explicit action.',
         '',
@@ -589,13 +609,13 @@ function buildFirstTurnPrompt(opts) {
         'Output only the new file content, starting with `---`.',
     ].join('\n');
 }
-function pickSampleTask(db, agentId) {
+function pickSampleTask(db, provider, agentId) {
     try {
         const row = db
             .prepare(`SELECT output FROM agent_tests
-         WHERE agent_name = ? AND sample_task_id IS NOT NULL
+         WHERE provider = ? AND agent_name = ? AND sample_task_id IS NOT NULL
          ORDER BY created_at DESC LIMIT 1`)
-            .get(agentId);
+            .get(provider, agentId);
         if (row?.output)
             return row.output;
     }

package/server/dist/ai-invocations.js

@@ -57,44 +57,89 @@ function getTicketSpendingSummary(db, ticketId) {
             tokens_in, tokens_out, tokens_cache_read, tokens_cache_create
      FROM ai_invocations WHERE ticket_id = ?`).all(ticketId);
     const bySurface = {
-        job: { count: 0, costUsd: 0 },
-        'quick-spec': { count: 0, costUsd: 0 },
-        'explore-spec': { count: 0, costUsd: 0 },
-        'ai-edit': { count: 0, costUsd: 0 },
-        smash: { count: 0, costUsd: 0 },
-        'file-summary': { count: 0, costUsd: 0 },
-        loop: { count: 0, costUsd: 0 },
-        'chat-sidebar': { count: 0, costUsd: 0 },
-        'spec-launcher': { count: 0, costUsd: 0 },
-        proposal: { count: 0, costUsd: 0 },
-        'agent-studio': { count: 0, costUsd: 0 },
-        setup: { count: 0, costUsd: 0 },
+        job: { count: 0, costUsd: 0, unpricedCount: 0 },
+        'quick-spec': { count: 0, costUsd: 0, unpricedCount: 0 },
+        'explore-spec': { count: 0, costUsd: 0, unpricedCount: 0 },
+        'ai-edit': { count: 0, costUsd: 0, unpricedCount: 0 },
+        smash: { count: 0, costUsd: 0, unpricedCount: 0 },
+        'file-summary': { count: 0, costUsd: 0, unpricedCount: 0 },
+        loop: { count: 0, costUsd: 0, unpricedCount: 0 },
+        'chat-sidebar': { count: 0, costUsd: 0, unpricedCount: 0 },
+        'spec-launcher': { count: 0, costUsd: 0, unpricedCount: 0 },
+        proposal: { count: 0, costUsd: 0, unpricedCount: 0 },
+        'agent-studio': { count: 0, costUsd: 0, unpricedCount: 0 },
+        setup: { count: 0, costUsd: 0, unpricedCount: 0 },
     };
     let totalCostUsd = 0;
     let estimatedCostUsd = 0;
     let totalTokens = 0;
     let totalTurns = 0;
+    let pricedRuns = 0;
+    let unpricedRuns = 0;
+    let usageReportedRuns = 0;
+    let usageUnavailableRuns = 0;
+    let turnsReportedRuns = 0;
+    let turnsUnavailableRuns = 0;
     let activeDurationMs = 0;
     for (const r of rows) {
         // Defensive: a row written by a newer schema with a surface this build
         // doesn't know must not crash the summary.
         if (!bySurface[r.surface])
-            bySurface[r.surface] = { count: 0, costUsd: 0 };
+            bySurface[r.surface] = { count: 0, costUsd: 0, unpricedCount: 0 };
         bySurface[r.surface].count += 1;
         bySurface[r.surface].costUsd += r.total_cost_usd ?? 0;
+        if (r.total_cost_usd == null) {
+            unpricedRuns += 1;
+            bySurface[r.surface].unpricedCount = (bySurface[r.surface].unpricedCount ?? 0) + 1;
+        }
+        else {
+            pricedRuns += 1;
+        }
         totalCostUsd += r.total_cost_usd ?? 0;
         if (r.total_cost_usd_estimated === 1)
             estimatedCostUsd += r.total_cost_usd ?? 0;
         // Real total tokens = fresh input + output + cache-read + cache-create.
-        totalTokens +=
-            (r.tokens_in ?? 0) +
-                (r.tokens_out ?? 0) +
-                (r.tokens_cache_read ?? 0) +
-                (r.tokens_cache_create ?? 0);
-        totalTurns += r.num_turns ?? 0;
+        const hasUsage = r.tokens_in != null || r.tokens_out != null
+            || r.tokens_cache_read != null || r.tokens_cache_create != null;
+        if (hasUsage) {
+            usageReportedRuns += 1;
+            totalTokens +=
+                (r.tokens_in ?? 0) +
+                    (r.tokens_out ?? 0) +
+                    (r.tokens_cache_read ?? 0) +
+                    (r.tokens_cache_create ?? 0);
+        }
+        else {
+            usageUnavailableRuns += 1;
+        }
+        if (r.num_turns != null) {
+            turnsReportedRuns += 1;
+            totalTurns += r.num_turns;
+        }
+        else {
+            turnsUnavailableRuns += 1;
+        }
         activeDurationMs += r.duration_ms ?? 0;
     }
-    return { totalCostUsd, estimatedCostUsd, totalTokens, totalTurns, activeDurationMs, bySurface, totalRuns: rows.length };
+    for (const bucket of Object.values(bySurface)) {
+        if ((bucket.unpricedCount ?? 0) === 0)
+            delete bucket.unpricedCount;
+    }
+    return {
+        totalCostUsd,
+        estimatedCostUsd,
+        totalTokens: usageReportedRuns > 0 ? totalTokens : rows.length > 0 ? null : 0,
+        totalTurns: turnsReportedRuns > 0 ? totalTurns : rows.length > 0 ? null : 0,
+        pricedRuns,
+        unpricedRuns,
+        usageReportedRuns,
+        usageUnavailableRuns,
+        turnsReportedRuns,
+        turnsUnavailableRuns,
+        activeDurationMs,
+        bySurface,
+        totalRuns: rows.length,
+    };
 }
 /**
  * Per-provider aggregation for the Analytics dashboard. Returns counts +

package/server/dist/attachment-manager.js

@@ -78,6 +78,37 @@ function sanitizeFilename(name) {
 function escapeUserAttachmentTag(s) {
     return s.replace(/<\/user-attachment>/gi, '<\\/user-attachment>');
 }
+/**
+ * Resolve a sidecar-controlled stored filename without ever allowing it to
+ * escape the app-managed attachment directory. Sidecars live on disk and can
+ * be edited by the local user (or left behind by an older version), so treating
+ * `storedName` as trusted would let an attachment prompt expose an arbitrary
+ * absolute path to the provider. The realpath check also rejects symlink
+ * escapes, which a lexical `path.resolve` containment check alone misses.
+ */
+function resolveManagedAttachmentPath(dir, storedName) {
+    if (typeof storedName !== 'string' ||
+        storedName.length === 0 ||
+        storedName !== path_1.default.basename(storedName) ||
+        storedName.includes('/') ||
+        storedName.includes('\\')) {
+        throw new Error(`Unsafe attachment stored name: ${JSON.stringify(storedName)}`);
+    }
+    const candidate = path_1.default.resolve(dir, storedName);
+    const lexicalRelative = path_1.default.relative(path_1.default.resolve(dir), candidate);
+    if (lexicalRelative === '..' || lexicalRelative.startsWith(`..${path_1.default.sep}`) || path_1.default.isAbsolute(lexicalRelative)) {
+        throw new Error(`Unsafe attachment path: ${JSON.stringify(storedName)}`);
+    }
+    if (!fs_1.default.existsSync(candidate))
+        return null;
+    const realDir = fs_1.default.realpathSync(dir);
+    const realCandidate = fs_1.default.realpathSync(candidate);
+    const realRelative = path_1.default.relative(realDir, realCandidate);
+    if (realRelative === '..' || realRelative.startsWith(`..${path_1.default.sep}`) || path_1.default.isAbsolute(realRelative)) {
+        throw new Error(`Unsafe attachment symlink: ${JSON.stringify(storedName)}`);
+    }
+    return realCandidate;
+}
 class AttachmentManager {
     homeDir;
     constructor(homeDir = os_1.default.homedir()) {
@@ -180,8 +211,7 @@ class AttachmentManager {
         const meta = this.readMeta(slug, ticketKey, attachmentId);
         if (!meta)
             return null;
-        const abs = path_1.default.join(this.ticketDir(slug, ticketKey), meta.storedName);
-        return fs_1.default.existsSync(abs) ? abs : null;
+        return resolveManagedAttachmentPath(this.ticketDir(slug, ticketKey), meta.storedName);
     }
     getMeta(slug, ticketKey, attachmentId) {
         return this.readMeta(slug, ticketKey, attachmentId);
@@ -191,8 +221,11 @@ class AttachmentManager {
         if (!meta)
             return false;
         const dir = this.ticketDir(opts.slug, opts.ticketKey);
-        const bin = path_1.default.join(dir, meta.storedName);
-        if (fs_1.default.existsSync(bin))
+        // Validate the sidecar-controlled path before deleting either the sidecar
+        // or ticket-store reference. On rejection the operation is atomic from the
+        // caller's perspective and an out-of-root target is never touched.
+        const bin = resolveManagedAttachmentPath(dir, meta.storedName);
+        if (bin)
             fs_1.default.unlinkSync(bin);
         const side = this.sidecarPath(opts.slug, opts.ticketKey, opts.attachmentId);
         if (fs_1.default.existsSync(side))
@@ -246,14 +279,16 @@ class AttachmentManager {
      */
     async getClaudeArgs(slug, ticketKey, attachmentIds) {
         const textBlocks = [];
+        const imagePaths = [];
         for (const id of attachmentIds) {
             const meta = this.readMeta(slug, ticketKey, id);
             if (!meta)
                 continue;
-            const abs = path_1.default.join(this.ticketDir(slug, ticketKey), meta.storedName);
-            if (!fs_1.default.existsSync(abs))
+            const abs = resolveManagedAttachmentPath(this.ticketDir(slug, ticketKey), meta.storedName);
+            if (!abs)
                 continue;
             if (meta.mimeType.startsWith(IMAGE_MIME_PREFIX)) {
+                imagePaths.push(abs);
                 textBlocks.push(wrapUserAttachment(meta, `@${abs}`));
                 continue;
             }
@@ -265,7 +300,7 @@ class AttachmentManager {
                 textBlocks.push(wrapUserAttachment(meta, '[extraction failed]'));
             }
         }
-        return { imageFlags: [], textBlocks };
+        return { imageFlags: [], textBlocks, imagePaths };
     }
     /**
      * Synchronous prompt blocks for long-running implement flows where we need to
@@ -282,8 +317,8 @@ class AttachmentManager {
             const meta = this.readMeta(slug, ticketKey, id);
             if (!meta)
                 continue;
-            const abs = path_1.default.join(this.ticketDir(slug, ticketKey), meta.storedName);
-            if (!fs_1.default.existsSync(abs))
+            const abs = resolveManagedAttachmentPath(this.ticketDir(slug, ticketKey), meta.storedName);
+            if (!abs)
                 continue;
             if (meta.mimeType.startsWith(IMAGE_MIME_PREFIX)) {
                 textBlocks.push(wrapUserAttachment(meta, `@${abs}`));
@@ -385,16 +420,15 @@ class AttachmentManager {
         const meta = this.readAgentMeta(conversationId, attachmentId);
         if (!meta)
             return null;
-        const abs = path_1.default.join(this.agentDir(conversationId), meta.storedName);
-        return fs_1.default.existsSync(abs) ? abs : null;
+        return resolveManagedAttachmentPath(this.agentDir(conversationId), meta.storedName);
     }
     async deleteAgent(conversationId, attachmentId) {
         const meta = this.readAgentMeta(conversationId, attachmentId);
         if (!meta)
             return false;
         const dir = this.agentDir(conversationId);
-        const bin = path_1.default.join(dir, meta.storedName);
-        if (fs_1.default.existsSync(bin))
+        const bin = resolveManagedAttachmentPath(dir, meta.storedName);
+        if (bin)
             fs_1.default.unlinkSync(bin);
         const side = this.agentSidecarPath(conversationId, attachmentId);
         if (fs_1.default.existsSync(side))
@@ -422,8 +456,8 @@ class AttachmentManager {
             const meta = this.readAgentMeta(conversationId, id);
             if (!meta)
                 continue;
-            const abs = path_1.default.join(this.agentDir(conversationId), meta.storedName);
-            if (!fs_1.default.existsSync(abs))
+            const abs = resolveManagedAttachmentPath(this.agentDir(conversationId), meta.storedName);
+            if (!abs)
                 continue;
             if (meta.mimeType.startsWith(IMAGE_MIME_PREFIX)) {
                 imagePaths.push(abs);

package/server/dist/blueprint-chat-manager.js

@@ -7,6 +7,7 @@ exports.BlueprintChatManager = void 0;
 const crypto_1 = require("crypto");
 const tree_kill_1 = __importDefault(require("tree-kill"));
 const providers_1 = require("./providers");
+const runtime_1 = require("./providers/runtime");
 const spawn_lifecycle_1 = require("./spawn-lifecycle");
 const cli_prompt_1 = require("./util/cli-prompt");
 const result_event_1 = require("./result-event");
@@ -129,12 +130,17 @@ class BlueprintChatManager {
     async _runTurn(conversation, userText, options) {
         const conversationId = conversation.id;
         const adapter = (0, providers_1.getAdapter)(conversation.provider);
-        const catalog = new Set(adapter.modelCatalog().map((m) => m.value));
+        const toolPolicy = (0, runtime_1.pureOutputToolPolicy)(adapter);
+        if (!toolPolicy) {
+            throw new Error(`provider_tool_policy_unsupported:${adapter.id}:pure-output`);
+        }
         const requested = options.model || conversation.model;
-        const model = requested && catalog.has(requested) ? requested : adapter.defaultModel();
+        const model = requested && (0, providers_1.isModelAvailableForAdapter)(adapter, requested)
+            ? requested
+            : adapter.defaultModel();
         // Reasoning effort: only for providers with the knob, only when the value
         // is in their catalog (else undefined = provider default).
-        const efforts = adapter.capabilities.reasoningEfforts ?? [];
+        const efforts = (0, providers_1.reasoningEffortsForModel)(adapter, model);
         const requestedEffort = options.reasoningEffort;
         const reasoningEffort = requestedEffort
             && efforts.includes(requestedEffort)
@@ -156,20 +162,29 @@ class BlueprintChatManager {
             let streamed = '';
             let capturedSessionId = useResume ? conversation.session_id ?? null : null;
             let capturedError = null;
+            // `chat-turn` / `chat-resume` intentionally ignore `systemPrompt` for
+            // providers whose normal project-chat stance lives in their cwd
+            // instructions file. The day-0 Builder has no project instructions, so
+            // its schema/operator prompt must ride in the user prompt instead.
+            const prompt = adapter.capabilities.systemPromptArg
+                ? userText
+                : `${blueprint_operator_prompt_1.BUILDER_SYSTEM_PROMPT}\n\n---\n\n${userText}`;
             console.log(`[blueprint-chat] turn start conv=${conversationId} provider=${adapter.id} action=${action} model=${model}`);
+            const buildOpts = {
+                prompt,
+                systemPrompt: adapter.capabilities.systemPromptArg ? blueprint_operator_prompt_1.BUILDER_SYSTEM_PROMPT : undefined,
+                model,
+                sessionId: useResume ? conversation.session_id ?? undefined : undefined,
+                reasoning_effort: reasoningEffort,
+                toolPolicy,
+            };
             const invocation = this._awaitWhileLive((0, spawn_lifecycle_1.runAiCliInvocation)({
                 adapter,
                 action,
                 cwd,
-                env: { ...process.env },
+                env: (0, runtime_1.buildProviderEnv)(adapter, buildOpts),
                 spawn: this._spawnOwned.bind(this),
-                buildOpts: {
-                    prompt: userText,
-                    systemPrompt: adapter.capabilities.systemPromptArg ? blueprint_operator_prompt_1.BUILDER_SYSTEM_PROMPT : undefined,
-                    model,
-                    sessionId: useResume ? conversation.session_id ?? undefined : undefined,
-                    reasoning_effort: reasoningEffort,
-                },
+                buildOpts,
                 onSpawn: (child) => {
                     if (this._disposed) {
                         this._terminate(child);
@@ -265,7 +280,7 @@ class BlueprintChatManager {
             return;
         }
         // Auto-heal a stale session: a resume with no text retries once fresh.
-        if (canResume && !r.spawnFailed && !r.text) {
+        if (canResume && !r.spawnFailed && !r.error && !r.text) {
             (0, blueprint_store_1.updateBlueprintConversation)(this._db, conversationId, { session_id: null });
             r = await invoke(false);
             if (this._disposed || r.disposed)
@@ -286,15 +301,23 @@ class BlueprintChatManager {
             record(r, 'failed');
             return;
         }
+        if (r.error || r.code !== 0) {
+            persistSession(null);
+            const reason = r.error ||
+                (r.stderrTail ? r.stderrTail.split('\n').filter(Boolean).slice(-3).join(' ').slice(0, 300) : '') ||
+                `${adapter.binary} exited with code ${r.code ?? 'unknown'}`;
+            this._emitError(conversationId, reason);
+            record(r, 'failed');
+            return;
+        }
         if (r.text) {
             settleText(r);
             record(r, 'success');
             return;
         }
         persistSession(null);
-        const reason = r.error ||
-            (r.stderrTail ? r.stderrTail.split('\n').filter(Boolean).slice(-3).join(' ').slice(0, 300) : '') ||
-            (r.code !== 0 ? `${adapter.binary} exited with code ${r.code}` : 'The Builder returned no output.');
+        const reason = (r.stderrTail ? r.stderrTail.split('\n').filter(Boolean).slice(-3).join(' ').slice(0, 300) : '') ||
+            'The Builder returned no output.';
         this._emitError(conversationId, reason);
         record(r, 'failed');
     }
@@ -302,8 +325,10 @@ class BlueprintChatManager {
         if (this._disposed)
             return;
         try {
+            const finishedAt = new Date().toISOString();
             const { result, estimated } = (0, result_event_1.finaliseInvocationResult)(adapter, outcome.events, {
                 fallbackModel: model,
+                durationMs: Math.max(0, Date.parse(finishedAt) - Date.parse(outcome.startedAt)),
             });
             (0, desktop_db_1.recordAgentInvocation)(this._db, {
                 id: (0, crypto_1.randomUUID)(),
@@ -312,7 +337,7 @@ class BlueprintChatManager {
                 provider: adapter.id,
                 status,
                 started_at: outcome.startedAt,
-                finished_at: new Date().toISOString(),
+                finished_at: finishedAt,
                 total_cost_usd_estimated: estimated,
                 ...result,
             });