specrails-desktop 2.2.0 → 2.3.0

package/server/dist/providers/claude-adapter.js

@@ -38,28 +38,46 @@ function normaliseModel(model) {
             return model || 'sonnet';
     }
 }
-/** Default arg block every claude spawn shares. */
+/** Default arg block every claude spawn shares. `--setting-sources` is appended
+ *  separately per-spawn (see `commonFlagsFor`) because its value depends on
+ *  whether the caller opted into loading the user's full Claude environment. */
 const COMMON_FLAGS = [
     '--dangerously-skip-permissions',
     '--tools', 'default',
     '--output-format', 'stream-json',
     '--verbose',
-    // Isolate app-spawned claude from the *user's* global Claude config. Without
-    // this, the child loads ~/.claude (user CLAUDE.md memory, plugins like
-    // claude-mem, SessionStart hooks). That bled cross-project memory into
-    // Explore turns (e.g. an unrelated "fighting game" surfaced for a fresh
-    // project) and inflated spec-gen tool usage past --max-turns. `project,local`
-    // still loads the target repo's own .claude settings + CLAUDE.md, which is
-    // exactly the context an app run should see.
-    '--setting-sources', 'project,local',
 ];
+/**
+ * COMMON_FLAGS + the `--setting-sources` value for this spawn.
+ *
+ * Default (`project,local`) isolates app-spawned claude from the *user's*
+ * global Claude config. Without this, the child loads ~/.claude (user CLAUDE.md
+ * memory, plugins like claude-mem, SessionStart hooks). That bled cross-project
+ * memory into Explore turns (e.g. an unrelated "fighting game" surfaced for a
+ * fresh project) and inflated spec-gen tool usage past --max-turns.
+ *
+ * When `opts.loadUserEnv` is set (the Add Spec "My approved MCPs" toggle), we
+ * switch to `user,project,local` so the developer's user-scope, plugin-bundled,
+ * and connector MCP servers are discovered. This is the ONLY way those MCP
+ * servers load (verified empirically against claude 2.1.177 — plugin MCP
+ * servers are gated by the `user` setting source); it also re-loads user
+ * CLAUDE.md + hooks, which is the user's explicit opt-in via the toggle.
+ */
+function commonFlagsFor(opts) {
+    return [
+        ...COMMON_FLAGS,
+        '--setting-sources',
+        opts.loadUserEnv ? 'user,project,local' : 'project,local',
+    ];
+}
 function buildClaudeArgs(action, opts) {
     const args = [];
     const model = normaliseModel(opts.model);
+    const commonFlags = commonFlagsFor(opts);
     switch (action) {
         case 'chat-turn': {
             args.push('--model', model);
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             if (opts.systemPrompt)
                 args.push('--system-prompt', opts.systemPrompt);
             args.push('-p', opts.prompt);
@@ -74,7 +92,7 @@ function buildClaudeArgs(action, opts) {
                 throw new Error('chat-resume requires sessionId');
             }
             args.push('--model', model);
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             if (opts.systemPrompt)
                 args.push('--system-prompt', opts.systemPrompt);
             args.push('--resume', opts.sessionId);
@@ -85,11 +103,33 @@ function buildClaudeArgs(action, opts) {
                 args.push(...opts.extraArgs);
             return args;
         }
+        case 'chat-stream': {
+            // Persistent multi-turn transport: one child stays alive and reads
+            // newline-delimited stream-json user messages from stdin (no `-p
+            // <prompt>` argument — the prompt arrives over stdin). The system prompt
+            // is fixed once at spawn (the Explore lightweight prompt is byte-stable,
+            // so this is sound). `--max-turns` is intentionally omitted: it would
+            // terminate the whole process after N agentic turns and end the session.
+            args.push('--model', model);
+            args.push(...commonFlags);
+            if (opts.systemPrompt)
+                args.push('--system-prompt', opts.systemPrompt);
+            // When the conversation already has a session (a re-spawn after idle-kill
+            // or crash), resume it so the persistent child restores prior context
+            // instead of starting a fresh thread. Absent on the very first turn.
+            if (opts.sessionId)
+                args.push('--resume', opts.sessionId);
+            args.push('-p');
+            args.push('--input-format', 'stream-json');
+            if (opts.extraArgs)
+                args.push(...opts.extraArgs);
+            return args;
+        }
         case 'rail-job': {
             // QueueManager spawns with `--append-system-prompt` (not `--system-prompt`)
             // because the slash command in the prompt brings its own system prompt;
             // we ADD to it rather than overwrite.
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             args.push('--model', model);
             if (opts.systemPrompt)
                 args.push('--append-system-prompt', opts.systemPrompt);
@@ -99,7 +139,7 @@ function buildClaudeArgs(action, opts) {
             return args;
         }
         case 'spec-gen': {
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             args.push('--model', model);
             if (opts.maxTurns != null)
                 args.push('--max-turns', String(opts.maxTurns));
@@ -113,7 +153,7 @@ function buildClaudeArgs(action, opts) {
             return args;
         }
         case 'agent-refine': {
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             if (opts.sessionId)
                 args.push('--resume', opts.sessionId);
             args.push('-p', opts.prompt);
@@ -123,7 +163,7 @@ function buildClaudeArgs(action, opts) {
         }
         case 'setup-enrich': {
             args.push('-p', opts.prompt);
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             if (opts.extraArgs)
                 args.push(...opts.extraArgs);
             return args;
@@ -133,14 +173,14 @@ function buildClaudeArgs(action, opts) {
                 throw new Error('setup-enrich-resume requires sessionId');
             }
             args.push('--resume', opts.sessionId);
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             args.push('-p', opts.prompt);
             if (opts.extraArgs)
                 args.push(...opts.extraArgs);
             return args;
         }
         case 'auto-title': {
-            args.push(...COMMON_FLAGS);
+            args.push(...commonFlags);
             args.push('-p', opts.prompt);
             return args;
         }
@@ -270,6 +310,7 @@ exports.claudeAdapter = {
         nativeOtelEnv: true,
         profileEnvSupport: true,
         systemPromptArg: true,
+        persistentStdin: true,
     },
     modelCatalog: () => CLAUDE_MODELS,
     defaultModel: () => 'sonnet',

package/server/dist/providers/codex-adapter.js

@@ -98,6 +98,12 @@ function buildCodexArgs(action, opts) {
                 args.push(...opts.extraArgs);
             return args;
         }
+        case 'chat-stream': {
+            // Codex has no persistent stdin multi-turn transport; the Explore
+            // fast-path gates on capabilities.persistentStdin, so this is never
+            // reached. Throw defensively rather than emit a broken argv.
+            throw new Error('codex does not support persistent stdin streaming (chat-stream)');
+        }
         case 'rail-job': {
             // Rail jobs are headless implementation pipelines. They must run repo
             // inspection, edits, tests, and git probes without interactive approval.

package/server/dist/spawn-lifecycle.js

@@ -0,0 +1,117 @@
+"use strict";
+// Shared AI-CLI spawn lifecycle.
+//
+// Every AI-CLI invocation in the app (agent-refine, contract-refine, quick-spec,
+// setup-enrich, explore chat, rail jobs) shares the same boilerplate: spawn the
+// provider binary, read stdout line-by-line through `adapter.parseStreamLine`
+// into an AdapterEvent[] accumulator, capture the session id, drain stderr, and
+// settle once on `close` (or a wall-clock timeout / spawn error). This module
+// owns exactly that core and nothing more — the genuinely-unique bits (how a
+// callsite renders deltas, finalizes invocation accounting, validates output,
+// manages crash-respawn / idle-kill) stay with the caller via hooks + the
+// returned result. Adopting it is behaviour-preserving: the caller keeps every
+// post-close decision it had, just without re-implementing the plumbing.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAiCliInvocation = runAiCliInvocation;
+const node_readline_1 = require("node:readline");
+const cli_prompt_1 = require("./util/cli-prompt");
+const STDERR_TAIL_CAP = 64 * 1024;
+/**
+ * Run one AI-CLI invocation: spawn → stream → settle. Resolves exactly once on
+ * child 'close', a spawn 'error', or the optional timeout. Never rejects — a
+ * failure is reported via the result (`spawnFailed`/`timedOut`/`code`). The
+ * caller does all post-close work (finalise/record/validate) from the returned
+ * events.
+ */
+function runAiCliInvocation(hooks) {
+    const binary = hooks.binary ?? hooks.adapter.binary;
+    const args = hooks.argv ?? hooks.adapter.buildArgs(hooks.action, hooks.buildOpts);
+    const spawn = hooks.spawn ?? cli_prompt_1.spawnAiCli;
+    const events = [];
+    let lastResultEvent = null;
+    let sessionId = null;
+    let stderrTail = '';
+    return new Promise((resolve) => {
+        let settled = false;
+        let timer = null;
+        const settle = (partial) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timer) {
+                clearTimeout(timer);
+                timer = null;
+            }
+            resolve({ ...partial, events, lastResultEvent, sessionId, stderrTail });
+        };
+        let child;
+        try {
+            child = spawn(binary, args, {
+                env: hooks.env ?? process.env,
+                stdio: hooks.stdio ?? ['ignore', 'pipe', 'pipe'],
+                cwd: hooks.cwd,
+            });
+        }
+        catch (err) {
+            hooks.onSpawnError?.(err);
+            settle({ code: null, timedOut: false, spawnFailed: true, child: null });
+            return;
+        }
+        hooks.onSpawn?.(child);
+        if (hooks.timeoutMs != null) {
+            timer = setTimeout(() => {
+                hooks.onTimeout?.();
+                try {
+                    child.kill('SIGTERM');
+                }
+                catch { /* already gone */ }
+                settle({ code: null, timedOut: true, spawnFailed: false, child });
+            }, hooks.timeoutMs);
+        }
+        if (child.stdout) {
+            const reader = (0, node_readline_1.createInterface)({ input: child.stdout, crlfDelay: Infinity });
+            if (hooks.onData)
+                child.stdout.on('data', () => hooks.onData('stdout'));
+            reader.on('line', (line) => {
+                hooks.onStdoutLine?.(line);
+                const ev = hooks.adapter.parseStreamLine(line);
+                if (!ev)
+                    return;
+                events.push(ev);
+                if (ev.kind === 'session-started') {
+                    sessionId = ev.sessionId;
+                }
+                else if (ev.kind === 'result') {
+                    lastResultEvent = ev;
+                    const sid = ev.payload.session_id;
+                    if (sid)
+                        sessionId = sid;
+                }
+                hooks.onEvent?.(ev);
+            });
+        }
+        if (child.stderr) {
+            if (hooks.onStderrLine) {
+                const errReader = (0, node_readline_1.createInterface)({ input: child.stderr, crlfDelay: Infinity });
+                if (hooks.onData)
+                    child.stderr.on('data', () => hooks.onData('stderr'));
+                errReader.on('line', (line) => hooks.onStderrLine(line));
+            }
+            else {
+                child.stderr.on('data', (chunk) => {
+                    if (hooks.onData)
+                        hooks.onData('stderr');
+                    if (stderrTail.length < STDERR_TAIL_CAP)
+                        stderrTail += chunk.toString();
+                });
+            }
+        }
+        child.on('error', (err) => {
+            hooks.onSpawnError?.(err);
+            settle({ code: null, timedOut: false, spawnFailed: true, child });
+        });
+        child.on('close', (code) => {
+            settle({ code, timedOut: false, spawnFailed: false, child });
+        });
+    });
+}

package/client/dist/assets/ActivityFeedPage-BupGdGjj.js

@@ -1 +0,0 @@
-import{r as e}from"./chunk-CilyBKbf.js";import{K as t,Mt as n,Nt as r,St as i,_t as a,at as o,bt as s,j as c,jt as l,ot as u,qt as d,tn as f,vt as p}from"./index-CNiaj7Sj.js";var m=p(`ban`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`M4.929 4.929 19.07 19.071`,key:`196cmz`}]]),h=e(f(),1);function g(e){let t=new Set;return e.filter(e=>{let n=`${e.type}:${e.jobId}`;return t.has(n)?!1:(t.add(n),!0)})}function _({activeProjectId:e,limit:t=50}){let[n,a]=(0,h.useState)([]),[o,s]=(0,h.useState)(!1),[c,u]=(0,h.useState)(!0),d=(0,h.useRef)(e);(0,h.useEffect)(()=>{d.current=e},[e]);let{registerHandler:f,unregisterHandler:p}=l();(0,h.useEffect)(()=>{if(!e){a([]),u(!0);return}let n=!1;s(!0),a([]),u(!0);async function i(){let e=r();try{let r=await fetch(`${e}/activity?limit=${t}`);if(!r.ok||n)return;let i=await r.json();if(n)return;a(i),u(i.length===t)}catch{}finally{n||s(!1)}}return i(),()=>{n=!0}},[e,t]);let m=(0,h.useCallback)(async()=>{if(o||!c)return;s(!0);let e=r();try{a(n=>{let r=n[n.length-1];if(!r)return n;let i=encodeURIComponent(r.timestamp);return fetch(`${e}/activity?limit=${t}&before=${i}`).then(e=>e.json()).then(e=>{a(t=>g([...t,...e])),u(e.length===t),s(!1)}).catch(()=>s(!1)),n})}catch{s(!1)}},[o,c,t]),_=(0,h.useCallback)(e=>{let t=e,n=d.current;if(!(!t||typeof t.type!=`string`)&&!(t.projectId&&t.projectId!==n)){if(t.type===`queue`&&Array.isArray(t.jobs)){let e=[];for(let n of t.jobs){let t=n.status===`completed`?`job_completed`:n.status===`failed`?`job_failed`:n.status===`canceled`?`job_canceled`:`job_started`;e.push({id:`${t}:${n.id}`,type:t,jobId:n.id,jobCommand:n.command??``,timestamp:n.startedAt??new Date().toISOString(),summary:`${t.replace(`_`,` `)}: ${n.command??``}`,costUsd:null})}e.length>0&&a(t=>g([...e,...t]))}if(t.type===`phase`&&t.phase&&t.state&&t.timestamp){let e={id:`phase:${t.phase}:${t.state}:${t.timestamp}`,type:`job_started`,jobId:`phase-${t.phase}`,jobCommand:i.t(`activity:feed.phaseCommand`,{phase:t.phase,state:t.state}),timestamp:t.timestamp,summary:`Phase ${t.phase} is ${t.state}`,costUsd:null};a(t=>g([e,...t]))}}},[]);return(0,h.useLayoutEffect)(()=>(f(`activity`,_),()=>p(`activity`)),[_,f,p]),{items:n,loading:o,hasMore:c,loadMore:m}}var v=n();function y(e,t){let n=Date.now()-new Date(e).getTime(),r=Math.floor(n/1e3);if(r<60)return t(`feed.relativeTime.seconds`,{value:r});let i=Math.floor(r/60);if(i<60)return t(`feed.relativeTime.minutes`,{value:i});let a=Math.floor(i/60);return a<24?t(`feed.relativeTime.hours`,{value:a}):t(`feed.relativeTime.days`,{value:Math.floor(a/24)})}function b({type:e}){switch(e){case`job_completed`:return(0,v.jsx)(u,{className:`w-4 h-4 text-green-500 flex-shrink-0`});case`job_failed`:return(0,v.jsx)(o,{className:`w-4 h-4 text-red-500 flex-shrink-0`});case`job_canceled`:return(0,v.jsx)(m,{className:`w-4 h-4 text-muted-foreground flex-shrink-0`});default:return(0,v.jsx)(c,{className:`w-4 h-4 text-blue-500 flex-shrink-0`})}}function x(e,t){switch(e){case`job_completed`:return t(`common:status.completed`);case`job_failed`:return t(`common:status.failed`);case`job_canceled`:return t(`common:status.canceled`);default:return t(`feed.typeStarted`)}}function S(e){switch(e){case`job_completed`:return`text-green-500`;case`job_failed`:return`text-red-500`;case`job_canceled`:return`text-muted-foreground`;default:return`text-blue-500`}}function C(){let{t:e}=d(`activity`),{activeProjectId:n}=s(),{items:r,loading:i,hasMore:o,loadMore:c}=_({activeProjectId:n}),l=(0,h.useRef)(null);return(0,h.useEffect)(()=>{let e=l.current;if(!e)return;let t=new IntersectionObserver(e=>{e[0].isIntersecting&&o&&!i&&c()},{threshold:.1});return t.observe(e),()=>t.disconnect()},[o,i,c]),(0,v.jsxs)(`div`,{className:`flex flex-col h-full overflow-hidden`,children:[(0,v.jsxs)(`div`,{className:`flex items-center gap-2 px-4 py-3 border-b border-border bg-background/50`,children:[(0,v.jsx)(a,{className:`w-4 h-4 text-muted-foreground`}),(0,v.jsx)(`h1`,{className:`text-sm font-medium`,children:e(`feed.title`)})]}),(0,v.jsxs)(`div`,{className:`flex-1 overflow-y-auto`,children:[i&&r.length===0?(0,v.jsx)(`div`,{className:`flex items-center justify-center h-32`,children:(0,v.jsx)(t,{className:`w-4 h-4 animate-spin text-muted-foreground`})}):r.length===0?(0,v.jsxs)(`div`,{className:`flex flex-col items-center justify-center h-48 gap-2 text-muted-foreground`,children:[(0,v.jsx)(a,{className:`w-8 h-8 opacity-40`}),(0,v.jsx)(`p`,{className:`text-sm`,children:e(`feed.emptyTitle`)}),(0,v.jsx)(`p`,{className:`text-xs opacity-70`,children:e(`feed.emptyHint`)})]}):(0,v.jsx)(`ul`,{className:`divide-y divide-border/50`,children:r.map(t=>(0,v.jsxs)(`li`,{className:`flex items-center gap-3 px-4 py-2.5 hover:bg-accent/30 transition-colors`,children:[(0,v.jsx)(b,{type:t.type}),(0,v.jsxs)(`div`,{className:`flex-1 min-w-0`,children:[(0,v.jsx)(`p`,{className:`text-xs text-foreground truncate`,title:t.jobCommand,children:t.jobCommand}),(0,v.jsxs)(`div`,{className:`flex items-center gap-2 mt-0.5`,children:[(0,v.jsx)(`span`,{className:`text-xs font-medium ${S(t.type)}`,children:x(t.type,e)}),t.costUsd!=null&&(0,v.jsxs)(`span`,{className:`text-xs text-muted-foreground`,children:[`$`,t.costUsd.toFixed(4)]})]})]}),(0,v.jsx)(`span`,{className:`text-xs text-muted-foreground flex-shrink-0 tabular-nums`,children:y(t.timestamp,e)})]},`${t.type}:${t.jobId}`))}),(0,v.jsx)(`div`,{ref:l,className:`h-1`}),i&&r.length>0&&(0,v.jsx)(`div`,{className:`flex justify-center py-3`,children:(0,v.jsx)(t,{className:`w-4 h-4 animate-spin text-muted-foreground`})}),!o&&r.length>0&&(0,v.jsx)(`p`,{className:`text-center text-xs text-muted-foreground py-3`,children:e(`feed.allLoaded`)})]})]})}export{C as default};