@co0ontty/wand 4.46.0 → 4.47.0

package/dist/structured-pi-adapter.js

@@ -1,4 +1,5 @@
 import { spawn } from "node:child_process";
+import { startStructuredCli } from "./structured-exec-pump.js";
 import { thinkingEffortToPiLevel } from "./structured-provider-common.js";
 function record(value) {
     return value && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -86,50 +87,37 @@ export function applyPiEvent(state, event) {
 }
 export class PiRunner {
     spawnProcess;
-    constructor(spawnProcess = spawn) {
+    execHost;
+    constructor(spawnProcess = spawn, execHost) {
         this.spawnProcess = spawnProcess;
+        this.execHost = execHost;
     }
     start(context, observer) {
         const args = buildPiArgs(context.session, context.prompt);
-        const spawnedAt = new Date().toISOString();
-        const child = this.spawnProcess("pi", args, { cwd: context.session.cwd, env: context.env, stdio: ["ignore", "pipe", "pipe"] });
         const state = { blocks: [], result: "", sessionId: context.session.claudeSessionId, model: context.session.selectedModel ?? undefined };
-        let lineBuffer = "", stderr = "", primaryError = null, settled = false;
-        const result = (exitCode, signal, spawnError) => ({ state, exitCode, signal, stderr, primaryError, ...(spawnError ? { spawnError } : {}) });
-        const processLine = (line) => {
-            if (!observer.isActive() || !line.trim())
-                return;
-            try {
-                const event = JSON.parse(line);
-                observer.onEvent?.(event);
-                primaryError = applyPiEvent(state, event) ?? primaryError;
-                observer.onUpdate(state);
-            }
-            catch { /* Pi stdout is NDJSON; ignore non-protocol noise. */ }
-        };
-        const completion = new Promise((resolve) => {
-            child.stdout?.on("data", (chunk) => {
-                const text = chunk.toString();
-                observer.onStdout?.(text);
-                lineBuffer += text;
-                const lines = lineBuffer.split("\n");
-                lineBuffer = lines.pop() ?? "";
-                lines.forEach(processLine);
-            });
-            child.stderr?.on("data", (chunk) => { const text = chunk.toString(); observer.onStderr?.(text); stderr += text; });
-            child.on("error", (error) => { if (!settled) {
-                settled = true;
-                resolve(result(null, null, error));
-            } });
-            child.on("close", (code, signal) => { if (!settled) {
-                settled = true;
-                processLine(lineBuffer);
-                resolve(result(code, signal));
-            } });
+        let primaryError = null;
+        return startStructuredCli({
+            sessionId: context.session.id,
+            file: "pi",
+            args,
+            cwd: context.session.cwd,
+            env: context.env,
+            observer,
+            execHost: this.execHost,
+            spawnProcess: this.spawnProcess,
+            createState: () => state,
+            processLine: (line) => {
+                if (!observer.isActive() || !line.trim())
+                    return;
+                try {
+                    const event = JSON.parse(line);
+                    observer.onEvent?.(event);
+                    primaryError = applyPiEvent(state, event) ?? primaryError;
+                    observer.onUpdate(state);
+                }
+                catch { /* Pi stdout is NDJSON; ignore non-protocol noise. */ }
+            },
+            finalize: (ctx, exitCode, signal, spawnError) => ({ state, exitCode, signal, stderr: ctx.stderr, primaryError, ...(spawnError ? { spawnError } : {}) }),
         });
-        return { args, spawnedAt, pid: child.pid ?? null, completion, interrupt: () => { try {
-                child.kill("SIGTERM");
-            }
-            catch { /* best effort */ } } };
     }
 }

package/dist/structured-qoder-adapter.d.ts

@@ -1,10 +1,12 @@
 import { spawn } from "node:child_process";
+import type { StructuredExecHost } from "./structured-exec-host.js";
 import type { StructuredRunnerAdapter, StructuredRunnerContext, StructuredRunnerExecution, StructuredRunnerObserver } from "./structured-runner.js";
 import type { SessionSnapshot } from "./types.js";
 export declare function buildQoderArgs(session: SessionSnapshot, prompt: string): string[];
 /** Owns the official Qoder CLI print process and its stream-json protocol. */
 export declare class QoderRunner implements StructuredRunnerAdapter {
     private readonly spawnProcess;
-    constructor(spawnProcess?: typeof spawn);
+    private readonly execHost?;
+    constructor(spawnProcess?: typeof spawn, execHost?: StructuredExecHost | undefined);
     start(context: StructuredRunnerContext, observer: StructuredRunnerObserver): StructuredRunnerExecution;
 }

package/dist/structured-qoder-adapter.js

@@ -1,5 +1,6 @@
 import { spawn } from "node:child_process";
 import { ClaudeCliProtocolReducer } from "./structured-claude-protocol.js";
+import { startStructuredCli } from "./structured-exec-pump.js";
 export function buildQoderArgs(session, prompt) {
     const args = ["-p", prompt, "--output-format", "stream-json"];
     const model = session.selectedModel?.trim();
@@ -20,105 +21,66 @@ export function buildQoderArgs(session, prompt) {
 /** Owns the official Qoder CLI print process and its stream-json protocol. */
 export class QoderRunner {
     spawnProcess;
-    constructor(spawnProcess = spawn) {
+    execHost;
+    constructor(spawnProcess = spawn, execHost) {
         this.spawnProcess = spawnProcess;
+        this.execHost = execHost;
     }
     start(context, observer) {
         const args = buildQoderArgs(context.session, context.prompt);
-        const spawnedAt = new Date().toISOString();
-        const child = this.spawnProcess("qodercli", args, {
-            cwd: context.session.cwd,
-            env: context.env,
-            stdio: ["ignore", "pipe", "pipe"],
-        });
         const reducer = new ClaudeCliProtocolReducer(context.session);
-        let lineBuffer = "";
-        let stderr = "";
         let stdoutTail = "";
         let primaryError = null;
-        let settled = false;
-        const result = (exitCode, signal, spawnError) => ({
-            state: reducer.state,
-            exitCode,
-            signal,
-            stderr,
-            stdoutTail,
-            primaryError,
-            ...(spawnError ? { spawnError } : {}),
-        });
-        const processLine = (line) => {
-            if (!observer.isActive())
-                return;
-            const trimmed = line.trim();
-            if (!trimmed)
-                return;
-            let event;
-            try {
-                event = JSON.parse(trimmed);
-            }
-            catch {
-                return;
-            }
-            if (event && typeof event === "object" && !Array.isArray(event)) {
-                const record = event;
-                observer.onEvent?.(record);
-                if (record.type === "result" && record.subtype !== "success") {
-                    const errors = Array.isArray(record.errors)
-                        ? record.errors.filter((item) => typeof item === "string")
-                        : [];
-                    primaryError = errors.join("\n") || "Qoder CLI execution failed";
-                }
-            }
-            if (reducer.apply(event, context.session.mode === "managed"))
-                observer.onUpdate(reducer.state);
-        };
-        const completion = new Promise((resolve) => {
-            child.stdout?.on("data", (chunk) => {
+        return startStructuredCli({
+            sessionId: context.session.id,
+            file: "qodercli",
+            args,
+            cwd: context.session.cwd,
+            env: context.env,
+            observer,
+            execHost: this.execHost,
+            spawnProcess: this.spawnProcess,
+            createState: () => reducer.state,
+            processLine: (line) => {
                 if (!observer.isActive())
                     return;
-                const text = chunk.toString();
-                observer.onStdout?.(text);
+                const trimmed = line.trim();
+                if (!trimmed)
+                    return;
+                let event;
+                try {
+                    event = JSON.parse(trimmed);
+                }
+                catch {
+                    return;
+                }
+                if (event && typeof event === "object" && !Array.isArray(event)) {
+                    const record = event;
+                    observer.onEvent?.(record);
+                    if (record.type === "result" && record.subtype !== "success") {
+                        const errors = Array.isArray(record.errors)
+                            ? record.errors.filter((item) => typeof item === "string")
+                            : [];
+                        primaryError = errors.join("\n") || "Qoder CLI execution failed";
+                    }
+                }
+                if (reducer.apply(event, context.session.mode === "managed"))
+                    observer.onUpdate(reducer.state);
+            },
+            onStdoutText: (text) => {
                 const trimmed = text.trim();
                 if (trimmed)
                     stdoutTail = trimmed.slice(-1024);
-                lineBuffer += text;
-                const lines = lineBuffer.split("\n");
-                lineBuffer = lines.pop() ?? "";
-                for (const line of lines)
-                    processLine(line);
-            });
-            child.stderr?.on("data", (chunk) => {
-                if (!observer.isActive())
-                    return;
-                const text = chunk.toString();
-                observer.onStderr?.(text);
-                stderr += text;
-            });
-            child.on("error", (error) => {
-                if (settled)
-                    return;
-                settled = true;
-                resolve(result(null, null, error));
-            });
-            child.on("close", (exitCode, signal) => {
-                if (settled)
-                    return;
-                settled = true;
-                if (lineBuffer.trim())
-                    processLine(lineBuffer);
-                lineBuffer = "";
-                resolve(result(exitCode, signal));
-            });
+            },
+            finalize: (ctx, exitCode, signal, spawnError) => ({
+                state: reducer.state,
+                exitCode,
+                signal,
+                stderr: ctx.stderr,
+                stdoutTail,
+                primaryError,
+                ...(spawnError ? { spawnError } : {}),
+            }),
         });
-        return {
-            args,
-            spawnedAt,
-            pid: child.pid ?? null,
-            completion,
-            interrupt: () => { try {
-                child.kill("SIGTERM");
-            }
-            catch { /* best effort */ } },
-        };
     }
 }

package/dist/structured-session-manager.d.ts

@@ -3,6 +3,7 @@ import { type WorktreeSetupSpec } from "./git-worktree.js";
 import { SessionLogger } from "./session-logger.js";
 import { WandStorage } from "./storage.js";
 import { ExecutionMode, ProcessEvent, SessionProvider, SessionRunner, SessionSnapshot, SessionSource, WandConfig } from "./types.js";
+import { type StructuredExecHost } from "./structured-exec-host.js";
 import type { StructuredRunnerAdapter } from "./structured-runner.js";
 export interface StructuredSessionManagerRunners {
     claudeCli?: StructuredRunnerAdapter;
@@ -52,6 +53,7 @@ export declare class StructuredSessionManager {
     private readonly config;
     private readonly logger;
     private readonly sdkQueryFactory;
+    private readonly execHost?;
     private readonly sessions;
     private readonly pendingRunnerExecutions;
     private readonly pendingSdkAbort;
@@ -93,12 +95,18 @@ export declare class StructuredSessionManager {
     private readonly grokRunner;
     private readonly qoderRunner;
     private readonly piRunner;
+    /** Structured CLI runs that were mid-flight when the previous web process died. */
+    private pendingRecoveryIds;
     private disposed;
-    constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null, sdkQueryFactory?: typeof sdkQuery, runners?: StructuredSessionManagerRunners);
+    constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null, sdkQueryFactory?: typeof sdkQuery, runners?: StructuredSessionManagerRunners, execHost?: StructuredExecHost | undefined);
     private archiveExpiredSessions;
     setEventEmitter(emitEvent: (event: ProcessEvent) => void): void;
     /** Stop every runner and flush terminal state before storage is closed. */
     dispose(): void;
+    /** Called once after startup wiring; safe to skip when no host or candidates. */
+    recoverDetachedRuns(): Promise<void>;
+    private resumeDetachedRun;
+    private finalizeRecoveredRun;
     private trackStreamEmitTimer;
     private clearStreamEmitTimer;
     /** Mark streaming payload dirty and enforce both leading and trailing checkpoints. */