@co0ontty/wand 4.27.1 → 4.28.0

package/dist/storage.js

@@ -180,7 +180,7 @@ function parseQueuedMessageSkills(raw, queueLength) {
     });
 }
 function inferSessionProvider(row) {
-    if (row.provider === "claude" || row.provider === "codex" || row.provider === "opencode" || row.provider === "grok" || row.provider === "qoder") {
+    if (row.provider === "claude" || row.provider === "codex" || row.provider === "opencode" || row.provider === "grok" || row.provider === "qoder" || row.provider === "pi") {
         return row.provider;
     }
     if (row.runner === "claude-cli" || row.runner === "claude-cli-print") {
@@ -196,6 +196,8 @@ function inferSessionProvider(row) {
         return "grok";
     if (row.runner === "qoder-cli-print")
         return "qoder";
+    if (row.runner === "pi-cli-json")
+        return "pi";
     if (/^codex\b/i.test(row.command.trim()))
         return "codex";
     if (/^opencode\b/i.test(row.command.trim()))
@@ -204,6 +206,8 @@ function inferSessionProvider(row) {
         return "grok";
     if (/^qodercli\b/i.test(row.command.trim()))
         return "qoder";
+    if (/^pi\b/i.test(row.command.trim()))
+        return "pi";
     return /^claude\b/i.test(row.command.trim()) ? "claude" : undefined;
 }
 function parseWorktreeInfo(raw) {
@@ -476,6 +480,70 @@ const INIT_SQL = `
   CREATE INDEX IF NOT EXISTS idx_password_items_vault ON password_items(vault_id);
   CREATE INDEX IF NOT EXISTS idx_password_items_type ON password_items(type);
   CREATE INDEX IF NOT EXISTS idx_password_items_updated ON password_items(updated_at);
+
+  CREATE TABLE IF NOT EXISTS missions (
+    id TEXT PRIMARY KEY,
+    title TEXT NOT NULL,
+    prompt TEXT NOT NULL,
+    cwd TEXT NOT NULL,
+    status TEXT NOT NULL,
+    base_ref TEXT,
+    shared_directories TEXT NOT NULL DEFAULT '[]',
+    copy_paths TEXT NOT NULL DEFAULT '[]',
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  );
+
+  CREATE TABLE IF NOT EXISTS mission_attempts (
+    id TEXT PRIMARY KEY,
+    mission_id TEXT NOT NULL,
+    session_id TEXT,
+    provider TEXT NOT NULL,
+    state TEXT NOT NULL,
+    branch TEXT,
+    worktree_path TEXT,
+    base_ref TEXT,
+    summary TEXT,
+    error TEXT,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL,
+    FOREIGN KEY(mission_id) REFERENCES missions(id)
+  );
+
+  CREATE TABLE IF NOT EXISTS mission_review_comments (
+    id TEXT PRIMARY KEY,
+    mission_id TEXT NOT NULL,
+    attempt_id TEXT NOT NULL,
+    file_path TEXT NOT NULL,
+    line INTEGER,
+    side TEXT NOT NULL DEFAULT 'new',
+    body TEXT NOT NULL,
+    status TEXT NOT NULL DEFAULT 'pending',
+    created_at TEXT NOT NULL,
+    sent_at TEXT,
+    resolved_at TEXT,
+    FOREIGN KEY(mission_id) REFERENCES missions(id),
+    FOREIGN KEY(attempt_id) REFERENCES mission_attempts(id)
+  );
+
+  CREATE TABLE IF NOT EXISTS agent_activity (
+    session_id TEXT PRIMARY KEY,
+    mission_id TEXT,
+    attempt_id TEXT,
+    state TEXT NOT NULL,
+    title TEXT NOT NULL,
+    summary TEXT,
+    provider TEXT,
+    cwd TEXT,
+    updated_at TEXT NOT NULL,
+    read_at TEXT
+  );
+
+  CREATE INDEX IF NOT EXISTS idx_missions_updated ON missions(updated_at);
+  CREATE INDEX IF NOT EXISTS idx_mission_attempts_mission ON mission_attempts(mission_id);
+  CREATE UNIQUE INDEX IF NOT EXISTS idx_mission_attempts_session ON mission_attempts(session_id) WHERE session_id IS NOT NULL;
+  CREATE INDEX IF NOT EXISTS idx_mission_comments_attempt ON mission_review_comments(attempt_id, status);
+  CREATE INDEX IF NOT EXISTS idx_agent_activity_state ON agent_activity(state, updated_at);
 `;
 export function ensureDatabaseFile(dbPath) {
     const dir = path.dirname(dbPath);
@@ -740,6 +808,97 @@ export class WandStorage {
     deleteExpiredAuthSessions(now) {
         this.db.prepare("DELETE FROM auth_sessions WHERE expires_at < ?").run(now);
     }
+    // ============ Missions / Agent Inbox ============
+    saveMission(mission) {
+        this.db.prepare(`INSERT INTO missions (
+         id, title, prompt, cwd, status, base_ref, shared_directories, copy_paths, created_at, updated_at
+       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(id) DO UPDATE SET
+         title = excluded.title, prompt = excluded.prompt, cwd = excluded.cwd,
+         status = excluded.status, base_ref = excluded.base_ref,
+         shared_directories = excluded.shared_directories, copy_paths = excluded.copy_paths,
+         updated_at = excluded.updated_at`).run(mission.id, mission.title, mission.prompt, mission.cwd, mission.status, mission.worktree.baseRef ?? null, JSON.stringify(mission.worktree.sharedDirectories ?? []), JSON.stringify(mission.worktree.copyPaths ?? []), mission.createdAt, mission.updatedAt);
+    }
+    getMission(id) {
+        const row = this.db.prepare("SELECT * FROM missions WHERE id = ?").get(id);
+        return row ? mapMissionRow(row) : null;
+    }
+    listMissions(includeArchived = false) {
+        const rows = this.db.prepare(`SELECT * FROM missions ${includeArchived ? "" : "WHERE status <> 'archived'"} ORDER BY updated_at DESC`).all();
+        return rows.map(mapMissionRow);
+    }
+    updateMissionStatus(id, status, updatedAt = nowIso()) {
+        this.db.prepare("UPDATE missions SET status = ?, updated_at = ? WHERE id = ?").run(status, updatedAt, id);
+    }
+    saveMissionAttempt(attempt) {
+        this.db.prepare(`INSERT INTO mission_attempts (
+         id, mission_id, session_id, provider, state, branch, worktree_path, base_ref,
+         summary, error, created_at, updated_at
+       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(id) DO UPDATE SET
+         session_id = excluded.session_id, state = excluded.state, branch = excluded.branch,
+         worktree_path = excluded.worktree_path, base_ref = excluded.base_ref,
+         summary = excluded.summary, error = excluded.error, updated_at = excluded.updated_at`).run(attempt.id, attempt.missionId, attempt.sessionId, attempt.provider, attempt.state, attempt.branch, attempt.worktreePath, attempt.baseRef, attempt.summary, attempt.error, attempt.createdAt, attempt.updatedAt);
+    }
+    getMissionAttempt(id) {
+        const row = this.db.prepare("SELECT * FROM mission_attempts WHERE id = ?").get(id);
+        return row ? mapMissionAttemptRow(row) : null;
+    }
+    getMissionAttemptBySession(sessionId) {
+        const row = this.db.prepare("SELECT * FROM mission_attempts WHERE session_id = ?").get(sessionId);
+        return row ? mapMissionAttemptRow(row) : null;
+    }
+    listMissionAttempts(missionId) {
+        const rows = this.db.prepare("SELECT * FROM mission_attempts WHERE mission_id = ? ORDER BY created_at ASC").all(missionId);
+        return rows.map(mapMissionAttemptRow);
+    }
+    saveMissionReviewComment(comment) {
+        this.db.prepare(`INSERT INTO mission_review_comments (
+         id, mission_id, attempt_id, file_path, line, side, body, status, created_at, sent_at, resolved_at
+       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(id) DO UPDATE SET
+         file_path = excluded.file_path, line = excluded.line, side = excluded.side,
+         body = excluded.body, status = excluded.status, sent_at = excluded.sent_at,
+         resolved_at = excluded.resolved_at`).run(comment.id, comment.missionId, comment.attemptId, comment.filePath, comment.line, comment.side, comment.body, comment.status, comment.createdAt, comment.sentAt, comment.resolvedAt);
+    }
+    listMissionReviewComments(missionId, attemptId) {
+        const rows = attemptId
+            ? this.db.prepare("SELECT * FROM mission_review_comments WHERE mission_id = ? AND attempt_id = ? ORDER BY created_at ASC").all(missionId, attemptId)
+            : this.db.prepare("SELECT * FROM mission_review_comments WHERE mission_id = ? ORDER BY created_at ASC").all(missionId);
+        return rows.map(mapMissionReviewCommentRow);
+    }
+    updateMissionReviewStatus(ids, status, at = nowIso()) {
+        if (ids.length === 0)
+            return;
+        const placeholders = ids.map(() => "?").join(", ");
+        const timestampColumn = status === "sent" ? "sent_at" : status === "resolved" ? "resolved_at" : null;
+        const timestampSql = timestampColumn ? `, ${timestampColumn} = ?` : "";
+        this.db.prepare(`UPDATE mission_review_comments SET status = ?${timestampSql} WHERE id IN (${placeholders})`)
+            .run(status, ...(timestampColumn ? [at] : []), ...ids);
+    }
+    upsertAgentActivity(item) {
+        this.db.prepare(`INSERT INTO agent_activity (
+         session_id, mission_id, attempt_id, state, title, summary, provider, cwd, updated_at, read_at
+       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(session_id) DO UPDATE SET
+         mission_id = excluded.mission_id, attempt_id = excluded.attempt_id,
+         state = excluded.state, title = excluded.title, summary = excluded.summary,
+         provider = excluded.provider, cwd = excluded.cwd, updated_at = excluded.updated_at,
+         read_at = CASE WHEN agent_activity.state = excluded.state THEN agent_activity.read_at ELSE excluded.read_at END`).run(item.sessionId, item.missionId, item.attemptId, item.state, item.title, item.summary, item.provider, item.cwd, item.updatedAt, item.readAt);
+    }
+    listAgentActivity() {
+        const rows = this.db.prepare(`SELECT * FROM agent_activity
+       ORDER BY CASE state WHEN 'needs_permission' THEN 0 WHEN 'needs_input' THEN 1 WHEN 'working' THEN 2 WHEN 'failed' THEN 3 ELSE 4 END,
+                updated_at DESC`).all();
+        return rows.map(mapAgentActivityRow);
+    }
+    markAgentActivityRead(sessionId) {
+        const at = nowIso();
+        if (sessionId)
+            this.db.prepare("UPDATE agent_activity SET read_at = ? WHERE session_id = ?").run(at, sessionId);
+        else
+            this.db.prepare("UPDATE agent_activity SET read_at = ? WHERE read_at IS NULL").run(at);
+    }
     saveSession(snapshot) {
         // A single SQLite statement is already atomic. Avoid BEGIN IMMEDIATE in
         // this hot path so streaming checkpoints do not take an unnecessary write
@@ -820,6 +979,67 @@ export class WandStorage {
         this.db.prepare("DELETE FROM command_sessions WHERE id = ?").run(id);
     }
 }
+function mapMissionRow(row) {
+    return {
+        id: String(row.id),
+        title: String(row.title),
+        prompt: String(row.prompt),
+        cwd: String(row.cwd),
+        status: String(row.status),
+        worktree: {
+            baseRef: typeof row.base_ref === "string" ? row.base_ref : undefined,
+            sharedDirectories: safeJsonParse(typeof row.shared_directories === "string" ? row.shared_directories : null) ?? [],
+            copyPaths: safeJsonParse(typeof row.copy_paths === "string" ? row.copy_paths : null) ?? [],
+        },
+        createdAt: String(row.created_at),
+        updatedAt: String(row.updated_at),
+    };
+}
+function mapMissionAttemptRow(row) {
+    return {
+        id: String(row.id),
+        missionId: String(row.mission_id),
+        sessionId: typeof row.session_id === "string" ? row.session_id : null,
+        provider: String(row.provider),
+        state: String(row.state),
+        branch: typeof row.branch === "string" ? row.branch : null,
+        worktreePath: typeof row.worktree_path === "string" ? row.worktree_path : null,
+        baseRef: typeof row.base_ref === "string" ? row.base_ref : null,
+        summary: typeof row.summary === "string" ? row.summary : null,
+        error: typeof row.error === "string" ? row.error : null,
+        createdAt: String(row.created_at),
+        updatedAt: String(row.updated_at),
+    };
+}
+function mapMissionReviewCommentRow(row) {
+    return {
+        id: String(row.id),
+        missionId: String(row.mission_id),
+        attemptId: String(row.attempt_id),
+        filePath: String(row.file_path),
+        line: typeof row.line === "number" ? row.line : null,
+        side: row.side === "old" ? "old" : "new",
+        body: String(row.body),
+        status: String(row.status),
+        createdAt: String(row.created_at),
+        sentAt: typeof row.sent_at === "string" ? row.sent_at : null,
+        resolvedAt: typeof row.resolved_at === "string" ? row.resolved_at : null,
+    };
+}
+function mapAgentActivityRow(row) {
+    return {
+        sessionId: String(row.session_id),
+        missionId: typeof row.mission_id === "string" ? row.mission_id : null,
+        attemptId: typeof row.attempt_id === "string" ? row.attempt_id : null,
+        state: String(row.state),
+        title: String(row.title),
+        summary: typeof row.summary === "string" ? row.summary : null,
+        provider: typeof row.provider === "string" ? row.provider : null,
+        cwd: typeof row.cwd === "string" ? row.cwd : null,
+        updatedAt: String(row.updated_at),
+        readAt: typeof row.read_at === "string" ? row.read_at : null,
+    };
+}
 function mapPasswordVaultRow(row) {
     return {
         id: row.id,

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

@@ -0,0 +1,11 @@
+import { spawn } from "node:child_process";
+import type { StructuredRunnerAdapter, StructuredRunnerContext, StructuredRunnerExecution, StructuredRunnerObserver, StructuredRunnerTurnState } from "./structured-runner.js";
+import type { SessionSnapshot } from "./types.js";
+export declare function buildPiArgs(session: SessionSnapshot, prompt: string): string[];
+export declare function piToolName(name: string): string;
+export declare function applyPiEvent(state: StructuredRunnerTurnState, event: Record<string, unknown>): string | null;
+export declare class PiRunner implements StructuredRunnerAdapter {
+    private readonly spawnProcess;
+    constructor(spawnProcess?: typeof spawn);
+    start(context: StructuredRunnerContext, observer: StructuredRunnerObserver): StructuredRunnerExecution;
+}

package/dist/structured-pi-adapter.js

@@ -0,0 +1,135 @@
+import { spawn } from "node:child_process";
+import { thinkingEffortToPiLevel } from "./structured-provider-common.js";
+function record(value) {
+    return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function textContent(value) {
+    if (typeof value === "string")
+        return value;
+    if (Array.isArray(value))
+        return value.map((item) => textContent(item)).filter(Boolean).join("\n");
+    const item = record(value);
+    if (!item)
+        return "";
+    if (item.type === "text" && typeof item.text === "string")
+        return item.text;
+    return textContent(item.content);
+}
+export function buildPiArgs(session, prompt) {
+    const args = ["--mode", "json", "--print"];
+    const model = session.selectedModel?.trim();
+    if (model && model !== "default")
+        args.push("--model", model);
+    const thinking = thinkingEffortToPiLevel(session.thinkingEffort);
+    if (thinking)
+        args.push("--thinking", thinking);
+    if (session.claudeSessionId)
+        args.push("--session", session.claudeSessionId);
+    args.push(prompt);
+    return args;
+}
+export function piToolName(name) {
+    const mapped = { bash: "Bash", read: "Read", edit: "Edit", write: "Write", grep: "Grep", find: "Glob", ls: "Glob" };
+    return mapped[name.toLowerCase()] ?? `Pi/${name}`;
+}
+export function applyPiEvent(state, event) {
+    if (event.type === "session" && typeof event.id === "string")
+        state.sessionId = event.id;
+    if (event.type === "message_update") {
+        const update = record(event.assistantMessageEvent);
+        const delta = typeof update?.delta === "string" ? update.delta : "";
+        if (update?.type === "text_delta" && delta) {
+            const last = state.blocks.at(-1);
+            if (last?.type === "text")
+                last.text += delta;
+            else
+                state.blocks.push({ type: "text", text: delta });
+            state.result += delta;
+        }
+        else if (update?.type === "thinking_delta" && delta) {
+            const last = state.blocks.at(-1);
+            if (last?.type === "thinking")
+                last.thinking += delta;
+            else
+                state.blocks.push({ type: "thinking", thinking: delta });
+        }
+    }
+    if (event.type === "tool_execution_start") {
+        const id = typeof event.toolCallId === "string" ? event.toolCallId : crypto.randomUUID();
+        const name = typeof event.toolName === "string" ? event.toolName : "tool";
+        state.blocks.push({ type: "tool_use", id, name: piToolName(name), input: record(event.args) ?? {} });
+    }
+    if (event.type === "tool_execution_end") {
+        const id = typeof event.toolCallId === "string" ? event.toolCallId : "unknown";
+        state.blocks.push({ type: "tool_result", tool_use_id: id, content: textContent(event.result), is_error: event.isError === true });
+    }
+    if (event.type === "message_end") {
+        const message = record(event.message);
+        if (message?.role === "assistant") {
+            if (typeof message.model === "string")
+                state.model = message.model;
+            const usage = record(message.usage);
+            const cost = record(usage?.cost);
+            if (usage)
+                state.usage = {
+                    inputTokens: typeof usage.input === "number" ? usage.input : 0,
+                    outputTokens: typeof usage.output === "number" ? usage.output : 0,
+                    cacheReadInputTokens: typeof usage.cacheRead === "number" ? usage.cacheRead : 0,
+                    cacheCreationInputTokens: typeof usage.cacheWrite === "number" ? usage.cacheWrite : 0,
+                    totalCostUsd: typeof cost?.total === "number" ? cost.total : 0,
+                };
+            if (message.stopReason === "error")
+                return typeof message.errorMessage === "string" ? message.errorMessage : "Pi CLI execution failed";
+        }
+    }
+    return null;
+}
+export class PiRunner {
+    spawnProcess;
+    constructor(spawnProcess = spawn) {
+        this.spawnProcess = spawnProcess;
+    }
+    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));
+            } });
+        });
+        return { args, spawnedAt, pid: child.pid ?? null, completion, interrupt: () => { try {
+                child.kill("SIGTERM");
+            }
+            catch { /* best effort */ } } };
+    }
+}

package/dist/structured-provider-common.d.ts

@@ -11,3 +11,4 @@ export declare function thinkingEffortToCodexReasoningEffort(effort: SessionSnap
 export declare function thinkingEffortToOpenCodeVariant(effort: SessionSnapshot["thinkingEffort"]): string | null;
 export declare function thinkingEffortToGrokEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;
 export declare function thinkingEffortToQoderEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;
+export declare function thinkingEffortToPiLevel(effort: SessionSnapshot["thinkingEffort"]): string | null;

package/dist/structured-provider-common.js

@@ -7,7 +7,9 @@ export function isStructuredRunnerForProvider(provider, runner) {
         return runner === "opencode-cli-run";
     if (provider === "grok")
         return runner === "grok-cli-headless";
-    return runner === "qoder-cli-print";
+    if (provider === "qoder")
+        return runner === "qoder-cli-print";
+    return runner === "pi-cli-json";
 }
 export function defaultStructuredRunner(provider, configuredClaudeRunner = "cli") {
     if (provider === "codex")
@@ -18,6 +20,8 @@ export function defaultStructuredRunner(provider, configuredClaudeRunner = "cli"
         return "grok-cli-headless";
     if (provider === "qoder")
         return "qoder-cli-print";
+    if (provider === "pi")
+        return "pi-cli-json";
     return configuredClaudeRunner === "sdk" ? "claude-sdk" : "claude-cli-print";
 }
 export function resolveStructuredRunner(provider, requestedRunner, configuredClaudeRunner = "cli") {
@@ -105,3 +109,14 @@ export function thinkingEffortToQoderEffort(effort) {
         return "max";
     return effort.startsWith("codex:") ? effort.slice("codex:".length) || null : null;
 }
+export function thinkingEffortToPiLevel(effort) {
+    if (!effort || effort === "off")
+        return "off";
+    if (effort === "standard")
+        return "low";
+    if (effort === "deep")
+        return "high";
+    if (effort === "max")
+        return "xhigh";
+    return effort.startsWith("codex:") ? effort.slice("codex:".length) || null : null;
+}

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

@@ -1,4 +1,5 @@
 import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
+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";
@@ -10,6 +11,7 @@ export interface StructuredSessionManagerRunners {
     opencode?: StructuredRunnerAdapter;
     grok?: StructuredRunnerAdapter;
     qoder?: StructuredRunnerAdapter;
+    pi?: StructuredRunnerAdapter;
 }
 interface CreateStructuredSessionOptions {
     cwd: string;
@@ -17,6 +19,7 @@ interface CreateStructuredSessionOptions {
     provider?: SessionProvider;
     runner?: SessionRunner;
     worktreeEnabled?: boolean;
+    worktreeSpec?: WorktreeSetupSpec;
     /** 用户指定的模型（别名或完整 ID）。留空则 spawn 时不加 --model。 */
     model?: string;
     /** 用户预设的思考深度。留空 / null 视为 off。 */
@@ -86,6 +89,7 @@ export declare class StructuredSessionManager {
     private readonly openCodeRunner;
     private readonly grokRunner;
     private readonly qoderRunner;
+    private readonly piRunner;
     private disposed;
     constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null, sdkQueryFactory?: typeof sdkQuery, runners?: StructuredSessionManagerRunners);
     private archiveExpiredSessions;

package/dist/structured-session-manager.js

@@ -15,6 +15,7 @@ import { captureTaskMeta, extractClaudeAssistantMessage, extractClaudeModelName,
 import { OpenCodeRunner } from "./structured-opencode-adapter.js";
 import { GrokRunner } from "./structured-grok-adapter.js";
 import { QoderRunner } from "./structured-qoder-adapter.js";
+import { PiRunner } from "./structured-pi-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";
@@ -209,6 +210,7 @@ export class StructuredSessionManager {
     openCodeRunner;
     grokRunner;
     qoderRunner;
+    piRunner;
     disposed = false;
     constructor(storage, config, logger = null, sdkQueryFactory = sdkQuery, runners = {}) {
         this.storage = storage;
@@ -220,12 +222,13 @@ export class StructuredSessionManager {
         this.openCodeRunner = runners.opencode ?? new OpenCodeRunner();
         this.grokRunner = runners.grok ?? new GrokRunner();
         this.qoderRunner = runners.qoder ?? new QoderRunner();
+        this.piRunner = runners.pi ?? new PiRunner();
         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" || storedProvider === "qoder"
+            const provider = storedProvider === "codex" || storedProvider === "opencode" || storedProvider === "grok" || storedProvider === "qoder" || storedProvider === "pi"
                 ? storedProvider
                 : "claude";
             const storedRunner = snapshot.runner ?? snapshot.structuredState?.runner;
@@ -526,14 +529,14 @@ 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" && requestedProvider !== "qoder") {
+        if (requestedProvider !== "claude" && requestedProvider !== "codex" && requestedProvider !== "opencode" && requestedProvider !== "grok" && requestedProvider !== "qoder" && requestedProvider !== "pi") {
             throw new Error(`不支持的结构化 provider: ${String(requestedProvider)}`);
         }
         const provider = requestedProvider;
         const runner = resolveStructuredRunner(provider, options.runner, this.config.structuredRunner);
         const baseCwd = resolveSessionCwd(options.cwd, this.config.defaultCwd);
         const worktreeSetup = options.worktreeEnabled
-            ? prepareSessionWorktree({ cwd: baseCwd, sessionId: id })
+            ? prepareSessionWorktree({ cwd: baseCwd, sessionId: id, spec: options.worktreeSpec })
             : null;
         const selectedModel = options.model?.trim() || null;
         const initialThinkingEffort = normalizeThinkingEffort(options.thinkingEffort);
@@ -552,9 +555,11 @@ export class StructuredSessionManager {
                         ? "grok -p --output-format streaming-json"
                         : provider === "qoder"
                             ? "qodercli -p --output-format stream-json"
-                            : runner === "claude-sdk"
-                                ? "claude-agent-sdk (stream-json)"
-                                : "claude -p --output-format stream-json",
+                            : provider === "pi"
+                                ? "pi --mode json --print"
+                                : runner === "claude-sdk"
+                                    ? "claude-agent-sdk (stream-json)"
+                                    : "claude -p --output-format stream-json",
             cwd: worktreeSetup?.cwd ?? baseCwd,
             mode: options.mode,
             worktreeEnabled: Boolean(worktreeSetup),
@@ -775,6 +780,15 @@ export class StructuredSessionManager {
                     installHint: "请安装 @qoder-ai/qodercli，或重跑 `wand service:install` 刷新服务的 PATH",
                 });
             }
+            else if (provider === "pi") {
+                await this.runClaudeStreaming(id, updated, prompt, requestId, {
+                    runner: this.piRunner,
+                    provider: "pi",
+                    commandLabel: "pi --mode json --print",
+                    logKind: "pi-json",
+                    installHint: "请安装 @mariozechner/pi-coding-agent（或兼容的 Pi CLI），或重跑 `wand service:install` 刷新服务的 PATH",
+                });
+            }
             else if (runner === "claude-sdk") {
                 await this.runClaudeSdkStreaming(id, updated, prompt, requestId, skills);
             }
@@ -1806,7 +1820,7 @@ export class StructuredSessionManager {
         flushEmit();
         if (result.spawnError) {
             const hint = result.spawnError.code === "ENOENT"
-                ? `（PATH 中找不到 ${provider === "qoder" ? "qodercli" : "claude"} 可执行文件；${options.installHint ?? "请确认 claude 已安装，或重跑 `wand service:install` 刷新服务的 PATH"}）`
+                ? `（PATH 中找不到 ${provider === "qoder" ? "qodercli" : provider === "pi" ? "pi" : "claude"} 可执行文件；${options.installHint ?? "请确认 claude 已安装，或重跑 `wand service:install` 刷新服务的 PATH"}）`
                 : "";
             throw new Error(`${commandLabel} 启动失败：${result.spawnError.message}${hint}`);
         }

package/dist/system-ai.js

@@ -260,7 +260,7 @@ export function discoverCliSystemAiConfigs(preferred, home = os.homedir()) {
     const found = [];
     const seen = new Set();
     for (const provider of [...new Set(order)]) {
-        if (provider === "qoder")
+        if (provider === "qoder" || provider === "pi")
             continue;
         let discovered;
         try {

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 export type SessionKind = "pty" | "structured";
-export type SessionProvider = "claude" | "codex" | "opencode" | "grok" | "qoder";
+export type SessionProvider = "claude" | "codex" | "opencode" | "grok" | "qoder" | "pi";
 export type CommitAiSource = "cli" | "api";
-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 SessionRunner = "claude-cli" | "claude-cli-print" | "claude-sdk" | "codex-cli-exec" | "opencode-cli-run" | "grok-cli-headless" | "qoder-cli-print" | "pi-cli-json" | "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";
@@ -116,6 +116,8 @@ export interface WandConfig {
     defaultGrokModel?: string;
     /** 新建 Qoder 会话时默认使用的模型层级。留空则由 qodercli 自行决定。 */
     defaultQoderModel?: string;
+    /** 新建 Pi 会话时默认使用的 provider/model pattern。 */
+    defaultPiModel?: string;
     /** 快捷提交生成 commit message / tag 时使用的 CLI。 */
     commitCli?: SessionProvider;
     /** 快捷提交专用模型。留空则跟随所选 CLI 的默认模型。 */
@@ -187,9 +189,13 @@ export interface ReasoningEffortInfo {
  * 避免 `max`（旧值代表 xhigh）与 Codex 新增的原生 max 档位冲突。
  */
 export type ThinkingEffort = "off" | "standard" | "deep" | "max" | `codex:${string}`;
-interface WorktreeInfo {
+export interface WorktreeInfo {
     branch: string;
     path: string;
+    /** Git ref each task worktree was created from. */
+    baseRef?: string;
+    /** Main checkout root, used by task review without rediscovering it. */
+    repoRoot?: string;
 }
 export interface WorktreeMergeInfo {
     targetBranch?: string;
@@ -604,4 +610,3 @@ export interface TaskData {
 export interface SessionEndData {
     exitCode: number | null;
 }
-export {};