@co0ontty/wand 4.10.3 → 4.11.0

package/dist/structured-qoder-adapter.js

@@ -0,0 +1,124 @@
+import { spawn } from "node:child_process";
+import { ClaudeCliProtocolReducer } from "./structured-claude-protocol.js";
+export function buildQoderArgs(session, prompt) {
+    const args = ["-p", prompt, "--output-format", "stream-json"];
+    const model = session.selectedModel?.trim();
+    if (model && model !== "default")
+        args.push("--model", model);
+    if (session.autoApprovePermissions === true
+        || session.mode === "full-access"
+        || session.mode === "managed") {
+        args.push("--permission-mode", "bypass_permissions");
+    }
+    else if (session.mode === "auto-edit") {
+        args.push("--permission-mode", "accept_edits");
+    }
+    if (session.claudeSessionId)
+        args.push("-r", session.claudeSessionId);
+    return args;
+}
+/** Owns the official Qoder CLI print process and its stream-json protocol. */
+export class QoderRunner {
+    spawnProcess;
+    constructor(spawnProcess = spawn) {
+        this.spawnProcess = spawnProcess;
+    }
+    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) => {
+                if (!observer.isActive())
+                    return;
+                const text = chunk.toString();
+                observer.onStdout?.(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));
+            });
+        });
+        return {
+            args,
+            spawnedAt,
+            pid: child.pid ?? null,
+            completion,
+            interrupt: () => { try {
+                child.kill("SIGTERM");
+            }
+            catch { /* best effort */ } },
+        };
+    }
+}

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

@@ -9,6 +9,7 @@ export interface StructuredSessionManagerRunners {
     codex?: StructuredRunnerAdapter;
     opencode?: StructuredRunnerAdapter;
     grok?: StructuredRunnerAdapter;
+    qoder?: StructuredRunnerAdapter;
 }
 interface CreateStructuredSessionOptions {
     cwd: string;
@@ -83,6 +84,7 @@ export declare class StructuredSessionManager {
     private readonly codexRunner;
     private readonly openCodeRunner;
     private readonly grokRunner;
+    private readonly qoderRunner;
     private disposed;
     constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null, sdkQueryFactory?: typeof sdkQuery, runners?: StructuredSessionManagerRunners);
     private archiveExpiredSessions;

package/dist/structured-session-manager.js

@@ -13,6 +13,7 @@ import { buildAppendSystemPromptParts, buildClaudeSdkThinking, ClaudeCliRunner,
 import { captureTaskMeta, extractClaudeAssistantMessage, extractClaudeModelName, normalizeClaudeToolInput, stampParentTaskResults, stampSelfTask, tagSubagentBlocks, } from "./structured-claude-protocol.js";
 import { OpenCodeRunner } from "./structured-opencode-adapter.js";
 import { GrokRunner } from "./structured-grok-adapter.js";
+import { QoderRunner } from "./structured-qoder-adapter.js";
 import { defaultStructuredRunner, defaultStructuredState, isStructuredRunnerForProvider, normalizeThinkingEffort, resolveStructuredRunner, } from "./structured-provider-common.js";
 import { enrichStructuredMessages, WAND_PROTOCOL_VERSION } from "./structured-client-protocol.js";
 export { isStructuredRunnerForProvider, normalizeThinkingEffort, resolveStructuredRunner, thinkingEffortToClaudeCliEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToOpenCodeVariant, thinkingEffortToSdkBudget, } from "./structured-provider-common.js";
@@ -203,6 +204,7 @@ export class StructuredSessionManager {
     codexRunner;
     openCodeRunner;
     grokRunner;
+    qoderRunner;
     disposed = false;
     constructor(storage, config, logger = null, sdkQueryFactory = sdkQuery, runners = {}) {
         this.storage = storage;
@@ -213,12 +215,13 @@ export class StructuredSessionManager {
         this.codexRunner = runners.codex ?? new CodexRunner();
         this.openCodeRunner = runners.opencode ?? new OpenCodeRunner();
         this.grokRunner = runners.grok ?? new GrokRunner();
+        this.qoderRunner = runners.qoder ?? new QoderRunner();
         for (const snapshot of this.storage.loadSessions()) {
             if ((snapshot.sessionKind ?? "pty") !== "structured")
                 continue;
             const restoredStatus = snapshot.status === "running" ? "idle" : snapshot.status;
             const storedProvider = snapshot.provider ?? snapshot.structuredState?.provider;
-            const provider = storedProvider === "codex" || storedProvider === "opencode" || storedProvider === "grok"
+            const provider = storedProvider === "codex" || storedProvider === "opencode" || storedProvider === "grok" || storedProvider === "qoder"
                 ? storedProvider
                 : "claude";
             const storedRunner = snapshot.runner ?? snapshot.structuredState?.runner;
@@ -498,7 +501,7 @@ export class StructuredSessionManager {
         const id = randomUUID();
         const startedAt = new Date().toISOString();
         const requestedProvider = options.provider ?? "claude";
-        if (requestedProvider !== "claude" && requestedProvider !== "codex" && requestedProvider !== "opencode" && requestedProvider !== "grok") {
+        if (requestedProvider !== "claude" && requestedProvider !== "codex" && requestedProvider !== "opencode" && requestedProvider !== "grok" && requestedProvider !== "qoder") {
             throw new Error(`不支持的结构化 provider: ${String(requestedProvider)}`);
         }
         const provider = requestedProvider;
@@ -522,9 +525,11 @@ export class StructuredSessionManager {
                     ? "opencode run --format json"
                     : provider === "grok"
                         ? "grok -p --output-format streaming-json"
-                        : runner === "claude-sdk"
-                            ? "claude-agent-sdk (stream-json)"
-                            : "claude -p --output-format stream-json",
+                        : provider === "qoder"
+                            ? "qodercli -p --output-format stream-json"
+                            : runner === "claude-sdk"
+                                ? "claude-agent-sdk (stream-json)"
+                                : "claude -p --output-format stream-json",
             cwd: worktreeSetup?.cwd ?? baseCwd,
             mode: options.mode,
             worktreeEnabled: Boolean(worktreeSetup),
@@ -728,6 +733,15 @@ export class StructuredSessionManager {
             else if (provider === "grok") {
                 await this.runGrokStreaming(id, updated, prompt, requestId);
             }
+            else if (provider === "qoder") {
+                await this.runClaudeStreaming(id, updated, prompt, requestId, {
+                    runner: this.qoderRunner,
+                    provider: "qoder",
+                    commandLabel: "qodercli -p",
+                    logKind: "qoder-print",
+                    installHint: "请安装 @qoder-ai/qodercli，或重跑 `wand service:install` 刷新服务的 PATH",
+                });
+            }
             else if (runner === "claude-sdk") {
                 await this.runClaudeSdkStreaming(id, updated, prompt, requestId);
             }
@@ -1632,7 +1646,7 @@ export class StructuredSessionManager {
      * - Root: --permission-mode acceptEdits + --allowedTools (extends approval
      *   outside CWD). stdin is always "ignore" — no ACP bidirectional control.
      */
-    async runClaudeStreaming(sessionId, session, prompt, requestId) {
+    async runClaudeStreaming(sessionId, session, prompt, requestId, options = {}) {
         let emitTimer = null;
         const syncSnapshot = (turnState) => {
             const current = this.currentSessionForRequest(sessionId, requestId);
@@ -1681,7 +1695,11 @@ export class StructuredSessionManager {
             if (!emitTimer)
                 emitTimer = this.trackStreamEmitTimer(setTimeout(flushEmit, STREAM_EMIT_DEBOUNCE_MS));
         };
-        const execution = this.claudeCliRunner.start({
+        const runner = options.runner ?? this.claudeCliRunner;
+        const provider = options.provider ?? "claude";
+        const commandLabel = options.commandLabel ?? "claude -p";
+        const logKind = options.logKind ?? "claude-print";
+        const execution = runner.start({
             session,
             prompt,
             env: buildChildEnv(this.config.inheritEnv !== false),
@@ -1697,8 +1715,8 @@ export class StructuredSessionManager {
         });
         this.pendingRunnerExecutions.set(sessionId, execution);
         this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "claude-print",
-            provider: "claude",
+            kind: logKind,
+            provider,
             pid: execution.pid,
             cwd: session.cwd,
             args: execution.args,
@@ -1724,12 +1742,12 @@ export class StructuredSessionManager {
         flushEmit();
         if (result.spawnError) {
             const hint = result.spawnError.code === "ENOENT"
-                ? "（PATH 中找不到 claude 可执行文件；请确认 claude 已安装，或重跑 `wand service:install` 刷新服务的 PATH）"
+                ? `（PATH 中找不到 ${provider === "qoder" ? "qodercli" : "claude"} 可执行文件；${options.installHint ?? "请确认 claude 已安装，或重跑 `wand service:install` 刷新服务的 PATH"}）`
                 : "";
-            throw new Error(`claude -p 启动失败：${result.spawnError.message}${hint}`);
+            throw new Error(`${commandLabel} 启动失败：${result.spawnError.message}${hint}`);
         }
         this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "claude-print-close",
+            kind: `${logKind}-close`,
             pid: execution.pid,
             spawnedAt: execution.spawnedAt,
             closedAt: new Date().toISOString(),
@@ -1743,9 +1761,10 @@ export class StructuredSessionManager {
         const interruptedForQuestion = result.stopReason === "ask-user-question";
         const failedExit = (result.exitCode !== null && result.exitCode !== 0) || result.signal !== null;
         if (failedExit && !interruptedByUser && !interruptedForQuestion) {
-            const errorText = this.formatStructuredExitError("claude -p", result.exitCode, result.signal, {
+            const errorText = this.formatStructuredExitError(commandLabel, result.exitCode, result.signal, {
                 stderr: result.stderr,
                 stdoutTail: result.stdoutTail,
+                primary: result.primaryError,
             });
             const failed = this.finishStructuredFailure(current, typeof result.exitCode === "number" ? result.exitCode : 1, errorText, result.state);
             this.sessions.set(sessionId, failed);

package/dist/system-ai.js

@@ -99,7 +99,7 @@ export function discoverCliSystemAiConfig(preferred, home = os.homedir()) {
     const discoverers = { claude: discoverClaude, codex: discoverCodex, opencode: discoverOpenCode };
     const order = [preferred ?? "claude", "claude", "opencode", "codex"];
     for (const provider of [...new Set(order)]) {
-        if (provider === "grok")
+        if (provider === "grok" || provider === "qoder")
             continue;
         const found = discoverers[provider](home);
         if (found)

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 export type SessionKind = "pty" | "structured";
-export type SessionProvider = "claude" | "codex" | "opencode" | "grok";
+export type SessionProvider = "claude" | "codex" | "opencode" | "grok" | "qoder";
 export type CommitAiSource = "cli" | "api";
-export type SessionRunner = "claude-cli" | "claude-cli-print" | "claude-sdk" | "codex-cli-exec" | "opencode-cli-run" | "grok-cli-headless" | "pty";
+export type SessionRunner = "claude-cli" | "claude-cli-print" | "claude-sdk" | "codex-cli-exec" | "opencode-cli-run" | "grok-cli-headless" | "qoder-cli-print" | "pty";
 export type SessionSource = "interactive" | "automation" | "startup";
 export type ExecutionMode = "assist" | "agent" | "agent-max" | "default" | "auto-edit" | "full-access" | "native" | "managed";
 export type AutonomyPolicy = "assist" | "agent" | "agent-max";
@@ -114,6 +114,8 @@ export interface WandConfig {
     defaultOpenCodeModel?: string;
     /** 新建 Grok 会话时默认使用的模型。留空则不传 --model，由 grok 自行决定。 */
     defaultGrokModel?: string;
+    /** 新建 Qoder 会话时默认使用的模型层级。留空则由 qodercli 自行决定。 */
+    defaultQoderModel?: string;
     /** 快捷提交生成 commit message / tag 时使用的 CLI。 */
     commitCli?: SessionProvider;
     /** 快捷提交专用模型。留空则跟随所选 CLI 的默认模型。 */