specrails-desktop 2.59.2 → 2.60.0

package/server/dist/jira/jira-status-resolver.js

@@ -9,8 +9,8 @@
 //   2. Category fallback anchored on `statusCategory.key` (never the localizable
 //      status NAME), with a cancel/ship lexicon to disambiguate the `done`
 //      category (e.g. `Won't Do` vs `Released`).
-//   3. BFS transition walk for forward-only workflows where there is no direct
-//      edge to the target category.
+//   3. Bounded category-monotonic transition walk where there is no direct edge
+//      to the target category. Unknown lateral paths are never explored by writes.
 //
 // This module is PURE: the walker takes async callbacks (getTransitions /
 // applyTransition) so it is fully testable without HTTP.
@@ -60,12 +60,14 @@ function nameMatches(name, lexicon) {
 function isCancelName(name) {
     return nameMatches(name, CANCEL_LEXICON);
 }
+function matchesStatusTarget(id, name, target) {
+    return id === target || (name !== undefined && name.toLowerCase() === target.toLowerCase());
+}
 /** Does this transition's destination match the user's explicitly configured
- *  target (by status id, status name, or transition id)? Case-insensitive on name.
+ *  target (by status id or status name)? Case-insensitive on name.
  *  The explicit config ALWAYS wins over the cancel/ship lexicon heuristics. */
 function matchesExplicit(t, explicitTarget) {
-    const e = explicitTarget.toLowerCase();
-    return t.to.id === explicitTarget || t.to.name.toLowerCase() === e || t.id === explicitTarget;
+    return matchesStatusTarget(t.to.id, t.to.name, explicitTarget);
 }
 function transitionCategory(t) {
     const k = t.to.statusCategory?.key;
@@ -81,6 +83,8 @@ function transitionCategory(t) {
  */
 function pickDirectTransition(transitions, state, explicitTarget) {
     if (explicitTarget) {
+        // Values identify destination statuses, never transition IDs: the two ID
+        // namespaces can collide, including with an unrelated terminal transition.
         const t = transitions.find((tr) => matchesExplicit(tr, explicitTarget));
         if (t)
             return t;
@@ -117,9 +121,9 @@ function pickDirectTransition(transitions, state, explicitTarget) {
 }
 /**
  * Pick a transition that moves the issue closer to the target category (used by
- * the BFS walk when no direct transition exists). Returns the edge whose target
+ * the bounded walk when no direct transition exists). Returns the edge whose target
  * category is strictly closer (in rank distance) to the goal, never overshooting
- * past it, preferring the smallest forward step.
+ * past it, preferring the furthest progress in either direction.
  */
 function pickProgressTransition(transitions, currentCategory, targetCategory, visitedStatusIds, opts) {
     const goal = categoryRank(targetCategory);
@@ -189,26 +193,57 @@ function buildTransitionFields(transition, state) {
     }
     return Object.keys(out).length > 0 ? { fields: out } : {};
 }
+function diagnosticValue(value, limit = 64) {
+    const compact = value.replace(/[\u0000-\u001f\u007f]/g, ' ').trim();
+    if (compact.length <= limit && JSON.stringify(compact).length <= limit)
+        return JSON.stringify(compact);
+    let preview = compact.slice(0, limit);
+    while (JSON.stringify(`${preview}…`).length > limit)
+        preview = preview.slice(0, -1);
+    return JSON.stringify(`${preview}…`);
+}
+function statusDiagnostic(name, id) {
+    return `${name ? diagnosticValue(name, 48) : '(unknown)'}${id ? ` (id ${diagnosticValue(id, 24)})` : ''}`;
+}
+function noPathReason(summary, currentName, currentId, explicitTarget, transitions) {
+    // Dead-letter storage retains at most 500 characters. Budget the entire
+    // message here so available destinations are never silently cut off there.
+    const prefix = `${summary.slice(0, 160)}; current status ${statusDiagnostic(currentName, currentId)}`
+        + (explicitTarget ? `; configured target ${diagnosticValue(explicitTarget)}` : '')
+        + '; available destinations: ';
+    if (transitions === undefined)
+        return `${prefix}not fetched for current status`;
+    const available = [];
+    for (const transition of transitions.slice(0, 8)) {
+        const candidate = [...available, statusDiagnostic(transition.to.name, transition.to.id)];
+        const omitted = transitions.length - candidate.length;
+        const suffix = omitted > 0 ? `; +${omitted} more` : '';
+        if (`${prefix}${candidate.join(', ')}${suffix}`.length > 500)
+            break;
+        available.push(candidate[candidate.length - 1]);
+    }
+    const omitted = transitions.length - available.length;
+    return `${prefix}${available.join(', ') || (omitted ? '(omitted)' : 'none')}${omitted > 0 ? `; +${omitted} more` : ''}`;
+}
 /**
  * Walk the transition graph from the current category to the target category for
  * `state`, applying edges per hop (you can only see the current status's
- * outgoing edges). Idempotency-first: if already in the target category, no-op —
- * UNLESS an explicit target status is configured and the issue is not already
- * sitting on it (see `currentStatusName`).
+ * outgoing edges). An explicit destination's identity wins over the default
+ * category, including idempotency. Without a destination, the category suffices.
  */
 async function walkToCategory(args) {
     const target = targetCategoryFor(args.state);
-    if (args.currentCategory === target) {
-        const alreadyAtExplicit = !args.explicitTarget ||
-            (args.currentStatusName !== undefined &&
-                args.currentStatusName.toLowerCase() === args.explicitTarget.toLowerCase());
-        if (alreadyAtExplicit)
-            return { status: 'noop' };
-    }
+    const alreadyAtTarget = args.explicitTarget
+        ? matchesStatusTarget(args.currentStatusId, args.currentStatusName, args.explicitTarget)
+        : args.currentCategory === target;
+    if (alreadyAtTarget)
+        return { status: 'noop' };
     const maxHops = args.maxHops ?? 5;
-    const visited = new Set();
+    const visited = new Set(args.currentStatusId ? [args.currentStatusId] : []);
     const applied = [];
     let currentCategory = args.currentCategory;
+    let currentStatusName = args.currentStatusName;
+    let currentStatusId = args.currentStatusId;
     for (let hop = 0; hop < maxHops; hop++) {
         let transitions;
         try {
@@ -230,7 +265,7 @@ async function walkToCategory(args) {
                 return { status: 'error', reason: err instanceof Error ? err.message : String(err) };
             }
             applied.push(direct.id);
-            return { status: 'applied', finalCategory: target, transitions: applied };
+            return { status: 'applied', finalCategory: transitionCategory(direct), transitions: applied };
         }
         // No direct edge → step toward the target category. For any non-cancel walk
         // the step must avoid reject statuses so the issue never overshoots onto a
@@ -242,7 +277,7 @@ async function walkToCategory(args) {
         if (!step) {
             return {
                 status: 'no_path',
-                reason: `no workflow transition from category "${currentCategory}" toward "${target}"`,
+                reason: noPathReason(`no workflow transition from category "${currentCategory}" toward "${target}"`, currentStatusName, currentStatusId, args.explicitTarget, transitions),
             };
         }
         const plan = buildTransitionFields(step, args.state);
@@ -256,12 +291,19 @@ async function walkToCategory(args) {
         }
         applied.push(step.id);
         visited.add(step.to.id);
+        currentStatusName = step.to.name;
+        currentStatusId = step.to.id;
         const stepCat = transitionCategory(step);
         if (stepCat)
             currentCategory = stepCat;
-        if (currentCategory === target) {
+        if (!args.explicitTarget && currentCategory === target) {
             return { status: 'applied', finalCategory: target, transitions: applied };
         }
     }
-    return { status: 'no_path', reason: `target category "${target}" not reached within ${maxHops} hops` };
+    return {
+        status: 'no_path',
+        reason: noPathReason(args.explicitTarget
+            ? `configured status not reached within ${maxHops} hops`
+            : `target category "${target}" not reached within ${maxHops} hops`, currentStatusName, currentStatusId, args.explicitTarget, undefined),
+    };
 }

package/server/dist/jira/jira-sync-manager.js

@@ -999,6 +999,11 @@ class JiraSyncManager {
             return;
         let changed = false;
         while (!this.authPaused) {
+            // A failed transition may have acquired a newer intention while its HTTP
+            // request was in flight. Reconcile before each claim, including legacy
+            // manual retries whose newer transition has already completed.
+            if ((0, jira_db_1.reconcileSupersededTransitions)(this.db) > 0)
+                changed = true;
             const batch = (0, jira_db_1.claimDrainable)(this.db, MAX_DRAIN_BATCH);
             if (batch.length === 0)
                 break;
@@ -1099,6 +1104,7 @@ class JiraSyncManager {
             // the SAME category (e.g. In Progress → In Review, both indeterminate)
             // while still noop-ing when the issue already sits on the target.
             currentStatusName: issue.data.fields.status?.name,
+            currentStatusId: issue.data.fields.status?.id,
             explicitTarget,
             getTransitions: async () => {
                 const res = await client.getTransitions(payload.jiraIssueId);
@@ -1231,6 +1237,7 @@ class JiraSyncManager {
         }
     }
     broadcastOutboxState() {
+        (0, jira_db_1.reconcileSupersededTransitions)(this.db);
         const counts = (0, jira_db_1.countOutboxByState)(this.db);
         this.broadcast({ type: 'jira.outbox_changed', projectId: this.projectId, pending: counts.pending + counts.inflight, dead: counts.dead });
     }
@@ -1309,11 +1316,43 @@ class JiraSyncManager {
         return (0, jira_db_1.listLinks)(this.db);
     }
     listOutbox(state) {
-        return (0, jira_db_1.listOutbox)(this.db, state ? { state } : {});
+        if ((0, jira_db_1.reconcileSupersededTransitions)(this.db) > 0)
+            this.broadcastOutboxState();
+        const links = new Map((0, jira_db_1.listLinks)(this.db).map((link) => [link.jiraIssueId, link.jiraKey]));
+        const statusMap = (0, jira_db_1.getConnection)(this.db, this.projectId)?.statusMap;
+        const logicalStates = ['todo', 'in_progress', 'on_review', 'done', 'cancelled'];
+        return (0, jira_db_1.listOutbox)(this.db, state ? { state } : {}).map((row) => {
+            let logicalState = null;
+            let targetStatus = null;
+            if (row.opType === 'transition') {
+                try {
+                    const payload = JSON.parse(row.payload);
+                    if (payload && typeof payload === 'object') {
+                        if (logicalStates.includes(payload.logicalState))
+                            logicalState = payload.logicalState;
+                        if (typeof payload.targetStatus === 'string' && payload.targetStatus.trim())
+                            targetStatus = payload.targetStatus;
+                    }
+                }
+                catch {
+                    // Historical/corrupt payloads remain visible for diagnosis.
+                }
+                targetStatus ??= logicalState ? statusMap?.[logicalState] ?? null : null;
+            }
+            return { ...row, jiraKey: links.get(row.jiraIssueId) ?? null, logicalState, targetStatus };
+        });
     }
     outboxCounts() {
+        if ((0, jira_db_1.reconcileSupersededTransitions)(this.db) > 0)
+            this.broadcastOutboxState();
         return (0, jira_db_1.countOutboxByState)(this.db);
     }
+    retryOutbox(id) {
+        const disposition = (0, jira_db_1.retryDeadOutbox)(this.db, id);
+        if (disposition)
+            this.broadcastOutboxState();
+        return disposition;
+    }
 }
 exports.JiraSyncManager = JiraSyncManager;
 // ─── Error envelope for thrown client failures inside the walk ─────────────────

package/server/dist/jira-router.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJiraRouter = createJiraRouter;
 const express_1 = require("express");
@@ -201,26 +168,26 @@ function createJiraRouter() {
     router.get('/outbox', (req, res) => {
         const c = ctx(req);
         const state = req.query.state;
-        const valid = ['pending', 'inflight', 'done', 'dead'];
+        const valid = ['pending', 'inflight', 'done', 'dead', 'superseded'];
         const filter = valid.includes(state) ? state : undefined;
         res.json({ ops: c.jiraSyncManager.listOutbox(filter), counts: c.jiraSyncManager.outboxCounts() });
     });
     // POST /outbox/:id/retry — re-queue a dead-lettered op for a manual retry.
     router.post('/outbox/:id/retry', async (req, res) => {
         const c = ctx(req);
-        const id = parseInt(req.params.id, 10);
-        if (Number.isNaN(id)) {
+        const id = Number(req.params.id);
+        if (!Number.isSafeInteger(id) || id <= 0) {
             res.status(400).json({ error: 'Invalid op id' });
             return;
         }
-        const { retryDeadOutbox } = await Promise.resolve().then(() => __importStar(require('./jira/jira-db')));
-        const ok = retryDeadOutbox(c.db, id);
-        if (!ok) {
+        const disposition = c.jiraSyncManager.retryOutbox(id);
+        if (!disposition) {
             res.status(404).json({ error: 'Op not found or not in dead state' });
             return;
         }
-        void c.jiraSyncManager.drainOnce().catch(() => undefined);
-        res.json({ ok: true });
+        if (disposition === 'pending')
+            void c.jiraSyncManager.drainOnce().catch(() => undefined);
+        res.json({ ok: true, disposition });
     });
     // POST /specs — Add Spec when the project source is Jira: create the issue in
     // Jira and materialize it locally. Keeps the generic local ticket-create path

package/server/dist/mcp/guide.js

@@ -385,9 +385,10 @@ can run Contract Refine require AI-spawn, including Explore conversions.
 - **Plugins** (\`specrails_plugins\`): per-project MCP integrations; \`preview\`
   the diff before \`install\`; a degraded plugin never blocks rail launches.
 - **Profiles** (\`specrails_agents\`): per-project agent chains; the baseline
-  trio \`sr-architect\`/\`sr-developer\`/\`sr-reviewer\` is required; routing rules
-  end in a single terminal \`default: true\` rule; requires specrails-core
-  4.1.0 or newer.
+  trio \`sr-architect\`/\`sr-developer\`/\`sr-reviewer\` are role identifiers
+  defined by the specrails-core runtime (no installed files) and are required
+  in every chain; routing rules end in a single terminal \`default: true\` rule;
+  requires specrails-core 4.1.0 or newer.
 - **Setup** (\`specrails_setup\`): \`prerequisites\` → \`add_project\` →
   \`install_config\` per provider → ONE \`install\` (provisions all chosen
   providers; quick-only, offline) → poll \`checkpoints\` until

package/server/dist/modules/agent-runtime/runtime/agent-runtime-bridge.js

@@ -10,7 +10,7 @@ exports.runAgentRuntimeControl = runAgentRuntimeControl;
 const agent_runtime_verification_suggestions_1 = require("./agent-runtime-verification-suggestions");
 const agent_runtime_history_1 = require("./agent-runtime-history");
 const agent_runtime_repositories_1 = require("./agent-runtime-repositories");
-const node_util_1 = require("node:util");
+const agent_runtime_verification_log_1 = require("./agent-runtime-verification-log");
 const agent_runtime_effective_config_1 = require("./agent-runtime-effective-config");
 const node_child_process_1 = require("node:child_process");
 const node_crypto_1 = require("node:crypto");
@@ -93,66 +93,6 @@ function requiresConfiguredChecks(value) {
     return Object.values(body.nodes ?? {}).some(node => node.kind === 'verify' && node.params?.commands === 'configured' && !node.params.additionalCommandsFrom && node.params.unverified !== true)
         || Object.values(body.components ?? {}).some(requiresConfiguredChecks);
 }
-/** Keep TAP failure diagnostics and totals in the readable log. The unfiltered
- * event stream remains available as runtime evidence. State is invocation-local. */
-function verificationLogFilter() {
-    const streams = new Map();
-    return text => (0, node_util_1.stripVTControlCharacters)(text).split(/(?<=\n)/).flatMap(line => {
-        const match = line.match(/^(\[verification [^\]]+\] )?(.*?)(?:\n)?$/);
-        if (!match)
-            return [line];
-        const key = match[1] ?? '', body = match[2].trim();
-        const state = streams.get(key) ?? { tap: false, failed: false, yaml: false, inputLines: null };
-        streams.set(key, state);
-        if (/AssertionError\b.*\bInput:\s*$/.test(body))
-            state.inputLines = 0;
-        else if (state.inputLines !== null) {
-            // Node prints assert.match's entire source input as quoted concatenation
-            // lines. Bound only that block; stacks, expected values and other streams
-            // remain visible and original events remain intact.
-            if (/^["'`]/.test(body)) {
-                state.inputLines++;
-                if (state.inputLines > 2)
-                    return state.inputLines === 3 ? [key + '[Assertion input shortened; inspect raw evidence]\n'] : [];
-            }
-            else if (!body)
-                return [];
-            else
-                state.inputLines = null;
-        }
-        if (/^[✔✓]\s/.test(body))
-            return [];
-        if (/^[✖✗]\s/.test(body)) {
-            state.failed = true;
-            return [line];
-        }
-        if (/^TAP version |^# Subtest:/.test(body)) {
-            state.tap = true;
-            return [];
-        }
-        if (/^(?:not )?ok \d+\b/.test(body)) {
-            state.tap = true;
-            state.failed = body.startsWith('not ok');
-            state.yaml = false;
-            return state.failed ? [line] : [];
-        }
-        if (!state.tap)
-            return [line];
-        if (body === '---') {
-            state.yaml = true;
-            return state.failed ? [line] : [];
-        }
-        if (body === '...') {
-            state.yaml = false;
-            return state.failed ? [line] : [];
-        }
-        if (state.yaml)
-            return state.failed ? [line] : [];
-        if (/^1\.\.\d+$/.test(body) || !body)
-            return [];
-        return [line];
-    }).map(line => line.length > 2_000 ? line.slice(0, 1_900) + '\n[Long diagnostic line shortened; inspect raw evidence]\n' : line).join('');
-}
 exports.RUNTIME_HOST_ENV_KEYS = [
     'SPECRAILS_REPO_DIR', 'SPECRAILS_GIT_AUTO', 'SPECRAILS_REPO_MAP_PATH',
     'SPECRAILS_EXECUTION_CONTEXT', 'SPECRAILS_EXECUTION_MANIFEST', 'SPECRAILS_REPOSITORIES',
@@ -208,14 +148,18 @@ async function runAgentRuntimeInvocation(options) {
         if (!Array.isArray(admittedContext.repositories) || !admittedContext.repositories.length || admittedContext.repositories.some(repo => !repo || typeof repo.id !== 'string' || !repo.id))
             throw new Error('Core context is missing its repository scope');
         const source = (0, node_fs_1.existsSync)(options.configPath) ? 'project-role' : 'default';
-        const { config, origins } = (0, agent_runtime_effective_config_1.resolveEffectiveRuntimeConfig)(options.loopConfig ? (0, agent_runtime_settings_1.loadLoopRuntimeConfig)(options.configPath, options.loopConfig, options.providerOverride ?? { provider: options.defaultProvider ?? 'claude' }) : (0, agent_runtime_settings_1.loadRuntimeConfigFile)(options.configPath, options.defaultProvider), {
+        // The engine owns the factory role definitions; the user's global overrides sit on top. The Implement
+        // rail merges them under any project text, and loop recipes resolve their `inherit` definitions here.
+        const effectiveRolePrompts = { ...(await (0, agent_runtime_loader_1.loadCoreAgentRuntime)()).rolePromptDefaults(), ...(0, agent_runtime_settings_1.loadRuntimeRolePrompts)() };
+        const loopConfig = options.loopConfig && (0, agent_runtime_settings_1.resolveInheritedRolePrompts)(options.loopConfig, effectiveRolePrompts);
+        const { config, origins } = (0, agent_runtime_effective_config_1.resolveEffectiveRuntimeConfig)(loopConfig ? (0, agent_runtime_settings_1.loadLoopRuntimeConfig)(options.configPath, loopConfig, options.providerOverride ?? { provider: options.defaultProvider ?? 'claude' }) : (0, agent_runtime_settings_1.loadRuntimeConfigFile)(options.configPath, options.defaultProvider), {
             repositoryIds: admittedContext.repositories.map(repo => repo.id), source: options.loopConfig ? 'loop-role' : source, providerOverride: options.loopConfig ? undefined : options.providerOverride,
         });
         config.verification = scopedHostChecks(config.verification, admittedContext.repositories);
         if (definitionEngine)
             completeHostChecks(config, admittedContext.repositories);
-        if (!options.loopConfig)
-            config.rolePrompts = { ...(await (0, agent_runtime_loader_1.loadCoreAgentRuntime)()).rolePromptDefaults(), ...(0, agent_runtime_settings_1.loadRuntimeRolePrompts)(), ...config.rolePrompts };
+        if (!loopConfig)
+            config.rolePrompts = { ...effectiveRolePrompts, ...config.rolePrompts };
         // Core rejects unknown connection keys: drop the desktop-only local-engine
         // fields (label/defaultModel/rates/supportsReasoningEffort) before Core sees it.
         const runtime = await (0, agent_runtime_loader_1.loadCoreAgentRuntime)();
@@ -356,7 +300,13 @@ async function runAgentRuntimeInvocation(options) {
             callback?.();
         }
         catch { /* Logging cannot replay a workflow. */ } };
-        const readableVerification = verificationLogFilter();
+        const readableVerification = (0, agent_runtime_verification_log_1.createVerificationLogProjection)();
+        const readableLines = (lines) => {
+            for (const line of lines)
+                observe(() => line.attemptId
+                    ? options.onLine?.(line.text, 'stdout', { attemptId: line.attemptId })
+                    : options.onLine?.(line.text));
+        };
         const lines = (0, node_readline_1.createInterface)({ input: child.stdout });
         lines.on('line', line => {
             if (line.length > 2_000_000) {
@@ -388,6 +338,10 @@ async function runAgentRuntimeInvocation(options) {
                     (0, win_spawn_1.treeKillSafe)(child.pid, 'SIGKILL');
                 return;
             }
+            const boundary = event.type === 'workflow-event' || event.type === 'runtime-result';
+            // Flush buffered output before the projection advances the current step.
+            if (boundary)
+                readableLines(readableVerification.project(event));
             try {
                 options.onRuntimeEvent?.(event);
             }
@@ -400,6 +354,8 @@ async function runAgentRuntimeInvocation(options) {
             if (event.type === 'runtime-graph')
                 graph = event;
             observe(() => options.onRawLine?.(event.repositories ? JSON.stringify(event) : line));
+            if (!boundary)
+                readableLines(readableVerification.project(event));
             if (event.type === 'runtime-result') {
                 if (result)
                     invalidProtocol = true;
@@ -435,11 +391,6 @@ async function runAgentRuntimeInvocation(options) {
                     observe(() => options.onLine?.(`[${role}]${scope} ${payload.tool}${payload.detail ? ' ' + payload.detail : ''}\n`));
                 }
             }
-            else if (event.type === 'verification-output' && typeof event.text === 'string') {
-                const readable = readableVerification(String(event.text));
-                if (readable)
-                    observe(() => options.onLine?.(readable));
-            }
             else if (event.type === 'span') {
                 // Trace spans are telemetry; the raw line is already recorded for diagnostics.
             }
@@ -461,6 +412,7 @@ async function runAgentRuntimeInvocation(options) {
             if (timer)
                 clearTimeout(timer);
             lines.close();
+            readableLines(readableVerification.flush());
             const usage = result?.invocationUsage;
             const known = (value) => typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : undefined;
             const cost = known(usage?.costUsd), tokensIn = known(usage?.inputTokens), tokensOut = known(usage?.outputTokens);

package/server/dist/modules/agent-runtime/runtime/agent-runtime-controls.js

@@ -26,6 +26,7 @@ const agent_runtime_bridge_1 = require("./agent-runtime-bridge");
 const core_node_runtime_1 = require("../../../core-node-runtime");
 const win_spawn_1 = require("../../../util/win-spawn");
 const workspace_resolution_1 = require("../../../workspace-resolution");
+const project_env_1 = require("../../../project-env");
 const loop_runs_store_1 = require("../../loops/runtime/loop-runs-store");
 const multi_repo_execution_store_1 = require("../../delivery/runtime/multi-repo-execution-store");
 const db_1 = require("../../../db");
@@ -309,7 +310,7 @@ class AgentRuntimeControls {
         const host = JSON.parse(node_fs_1.default.readFileSync(hostFile, 'utf8'));
         if (host.schemaVersion !== 1 || typeof host.cwd !== 'string' || ![frozen.backlogRoot, ...frozen.repositories.map((repository) => repository.path)].includes(host.cwd) || !host.env || typeof host.env !== 'object' || Array.isArray(host.env) || Object.entries(host.env).some(([key, value]) => !agent_runtime_bridge_1.RUNTIME_HOST_ENV_KEYS.includes(key) || typeof value !== 'string'))
             throw new RuntimeControlError(409, 'runtime_host_invalid', 'The saved runtime host settings are invalid');
-        const env = { ...(0, workspace_resolution_1.resolveLoopBaseEnv)(this.ctx.project) };
+        const env = { ...(0, workspace_resolution_1.resolveLoopBaseEnv)(this.ctx.project, undefined, (0, project_env_1.applyWorktreeEnvPassthrough)(this.ctx.db, process.env)) };
         for (const key of agent_runtime_bridge_1.RUNTIME_HOST_ENV_KEYS)
             delete env[key];
         Object.assign(env, host.env, { SPECRAILS_EXECUTION_CONTEXT: file });
@@ -541,15 +542,17 @@ class AgentRuntimeControls {
                 loopDurationBaseline: previous.total_duration_ms, completedDurationMs: 0,
                 iterationCount: previous.iteration_count, activeTurnStartedAtMs: startedAtMs, lastActivityAtMs: startedAtMs,
             });
-            const logLine = (line, source = 'stdout') => {
+            const logLine = (line, source = 'stdout', metadata) => {
                 if (this.disposed)
                     return;
+                const attemptId = metadata?.attemptId;
+                const attribution = typeof attemptId === 'string' && attemptId.trim() && attemptId.length <= 256 ? { attemptId } : {};
                 try {
-                    (0, db_1.appendEvent)(this.ctx.db, runId, ++sequence, { event_type: 'log', source, payload: JSON.stringify({ line: line.replace(/\n$/, '') }) });
+                    (0, db_1.appendEvent)(this.ctx.db, runId, ++sequence, { event_type: 'log', source, payload: JSON.stringify({ line: line.replace(/\n$/, ''), ...attribution }) });
                 }
                 catch { /* events table best-effort */ }
                 try {
-                    this.ctx.broadcast?.({ type: 'log', source, line, timestamp: new Date().toISOString(), processId: runId });
+                    this.ctx.broadcast?.({ type: 'log', source, line, timestamp: new Date().toISOString(), processId: runId, ...attribution });
                 }
                 catch { /* persisted log remains authoritative */ }
             };

package/server/dist/modules/agent-runtime/runtime/agent-runtime-settings.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentRuntimeConfigError = exports.REVIEW_THRESHOLD_FLOORS = exports.MAX_OUTPUT_TOKENS_MAX = exports.MAX_OUTPUT_TOKENS_MIN = exports.CONTEXT_WINDOW_TOKENS_MAX = exports.CONTEXT_WINDOW_TOKENS_MIN = exports.RUNTIME_ROLE_ID = void 0;
+exports.INHERIT_ROLE_PROMPT = exports.AgentRuntimeConfigError = exports.REVIEW_THRESHOLD_FLOORS = exports.MAX_OUTPUT_TOKENS_MAX = exports.MAX_OUTPUT_TOKENS_MIN = exports.CONTEXT_WINDOW_TOKENS_MAX = exports.CONTEXT_WINDOW_TOKENS_MIN = exports.RUNTIME_ROLE_ID = void 0;
 exports.stripDesktopConnectionFields = stripDesktopConnectionFields;
 exports.coreConnectionFieldGates = coreConnectionFieldGates;
 exports.validateLoopRuntimeSettings = validateLoopRuntimeSettings;
@@ -18,6 +18,8 @@ exports.saveRuntimeProviders = saveRuntimeProviders;
 exports.loadRuntimeConfigFile = loadRuntimeConfigFile;
 exports.loadAgentRuntimeConfig = loadAgentRuntimeConfig;
 exports.saveAgentRuntimeConfig = saveAgentRuntimeConfig;
+exports.inheritedRolePrompt = inheritedRolePrompt;
+exports.resolveInheritedRolePrompts = resolveInheritedRolePrompts;
 exports.validateRuntimeRolePrompts = validateRuntimeRolePrompts;
 exports.loadRuntimeRolePrompts = loadRuntimeRolePrompts;
 exports.saveRuntimeRolePrompts = saveRuntimeRolePrompts;
@@ -419,6 +421,27 @@ function saveAgentRuntimeConfig(project, input) {
     return config;
 }
 const PROMPT_ROLES = [...ROLES, 'fixer'];
+/** A loop recipe definition that follows the engine: resolved at launch to the selected Core's factory definition plus the user's global override. */
+exports.INHERIT_ROLE_PROMPT = 'inherit';
+const INHERITED_ROLE_PROMPT = /^inherit:(architect|developer|reviewer|fixer)$/;
+/** The prompt a declared recipe role carries when it follows a built-in definition (`inherit:<role>`), or the recipe's own text. */
+function inheritedRolePrompt(prompts, role) {
+    const value = prompts?.[role];
+    return value === undefined || value === exports.INHERIT_ROLE_PROMPT ? `${exports.INHERIT_ROLE_PROMPT}:${role}` : value;
+}
+/** Replace `inherit` definitions (built-in roles) and `inherit:<role>` prompts (declared roles) with the effective engine definitions. Explicit recipe text is kept verbatim. */
+function resolveInheritedRolePrompts(settings, effective) {
+    // A Core predating the fixer stance has no fixer default: the fixer then follows the developer definition.
+    const resolved = { ...effective, fixer: effective.fixer ?? effective.developer };
+    const lookup = (role) => resolved[role];
+    const rolePrompts = settings.rolePrompts && Object.fromEntries(Object.entries(settings.rolePrompts).map(([role, text]) => [role, text === exports.INHERIT_ROLE_PROMPT ? lookup(role) ?? text : text]));
+    const roles = settings.roles && Object.fromEntries(Object.entries(settings.roles).map(([id, role]) => {
+        const inherited = role.prompt?.match(INHERITED_ROLE_PROMPT);
+        const text = inherited ? lookup(inherited[1]) : undefined;
+        return [id, text ? { ...role, prompt: text } : role];
+    }));
+    return { ...settings, ...(rolePrompts ? { rolePrompts } : {}), ...(roles ? { roles } : {}) };
+}
 function validateRuntimeRolePrompts(input, extraRoles = []) {
     if (!input || typeof input !== 'object' || Array.isArray(input))
         throw new AgentRuntimeConfigError('Role prompts must be an object');