@co0ontty/wand 4.80.0 → 4.80.1

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

@@ -1,4 +1,4 @@
-import type { SessionProvider, SessionRunner, SessionSnapshot, StructuredSessionState, WandConfig } from "./types.js";
+import type { SessionProvider, SessionRunner, SessionSnapshot, StructuredSessionState } from "./types.js";
 /**
  * 把会话级系统提示交给 CLI 的开关。Claude / Qoder / Pi 用 `--append-system-prompt`，
  * Grok 用 `--rules`；Codex / OpenCode / Gemini 没有这个入口，只能退回并入本轮消息
@@ -22,11 +22,15 @@ export declare function isThinkingEffort(value: unknown): value is NonNullable<S
 /** 只取本 provider 的原生档位。别的 CLI 的前缀不能串过去。 */
 export declare function prefixedThinkingEffort(provider: SessionProvider, effort: SessionSnapshot["thinkingEffort"]): string | null;
 export declare function isStructuredRunnerForProvider(provider: SessionProvider, runner: unknown): runner is SessionRunner;
-export declare function defaultStructuredRunner(provider: SessionProvider, configuredClaudeRunner?: WandConfig["structuredRunner"]): SessionRunner;
-export declare function resolveStructuredRunner(provider: SessionProvider, requestedRunner: unknown, configuredClaudeRunner?: WandConfig["structuredRunner"]): SessionRunner;
+export declare function defaultStructuredRunner(provider: SessionProvider): SessionRunner;
+/**
+ * 历史值归一：`claude-sdk` 是 SDK 执行路径的遗留会话值（含旧客户端仍会提交的值）。
+ * SDK 已移除，读路径把它映射成同一套 `claude -p` 执行，不报错、不丢会话。
+ */
+export declare function normalizeStructuredRunner(runner: unknown): unknown;
+export declare function resolveStructuredRunner(provider: SessionProvider, requestedRunner: unknown): SessionRunner;
 export declare function defaultStructuredState(provider: SessionProvider, runner?: SessionRunner): StructuredSessionState;
 export declare function normalizeThinkingEffort(value: unknown): SessionSnapshot["thinkingEffort"];
-export declare function thinkingEffortToSdkBudget(effort: SessionSnapshot["thinkingEffort"]): number;
 export declare function thinkingEffortToClaudeCliEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;
 export declare function thinkingEffortToClaudeSlashEffort(effort: SessionSnapshot["thinkingEffort"]): string;
 export declare function thinkingEffortToCodexReasoningEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;

package/dist/structured-provider-common.js

@@ -73,6 +73,7 @@ export function prefixedThinkingEffort(provider, effort) {
     return /^[a-z0-9][a-z0-9_-]{0,31}$/.test(level) ? level : null;
 }
 export function isStructuredRunnerForProvider(provider, runner) {
+    // "claude-sdk" 是历史值：SDK 执行路径已移除，只在读旧会话时用来识别（见 normalizeStructuredRunner）。
     if (provider === "claude")
         return runner === "claude-sdk" || runner === "claude-cli-print";
     if (provider === "codex")
@@ -87,7 +88,7 @@ export function isStructuredRunnerForProvider(provider, runner) {
         return runner === "pi-cli-json";
     return runner === "gemini-cli-json";
 }
-export function defaultStructuredRunner(provider, configuredClaudeRunner = "cli") {
+export function defaultStructuredRunner(provider) {
     if (provider === "codex")
         return "codex-cli-exec";
     if (provider === "opencode")
@@ -100,14 +101,22 @@ export function defaultStructuredRunner(provider, configuredClaudeRunner = "cli"
         return "pi-cli-json";
     if (provider === "gemini")
         return "gemini-cli-json";
-    return configuredClaudeRunner === "sdk" ? "claude-sdk" : "claude-cli-print";
+    return "claude-cli-print";
 }
-export function resolveStructuredRunner(provider, requestedRunner, configuredClaudeRunner = "cli") {
-    const runner = requestedRunner ?? defaultStructuredRunner(provider, configuredClaudeRunner);
+/**
+ * 历史值归一：`claude-sdk` 是 SDK 执行路径的遗留会话值（含旧客户端仍会提交的值）。
+ * SDK 已移除，读路径把它映射成同一套 `claude -p` 执行，不报错、不丢会话。
+ */
+export function normalizeStructuredRunner(runner) {
+    return runner === "claude-sdk" ? "claude-cli-print" : runner;
+}
+export function resolveStructuredRunner(provider, requestedRunner) {
+    const normalized = normalizeStructuredRunner(requestedRunner);
+    const runner = normalized ?? defaultStructuredRunner(provider);
     if (!isStructuredRunnerForProvider(provider, runner)) {
         throw new Error(`runner ${String(runner)} 不支持 provider ${provider}。`);
     }
-    return runner;
+    return runner === "claude-sdk" ? "claude-cli-print" : runner;
 }
 export function defaultStructuredState(provider, runner = defaultStructuredRunner(provider)) {
     return { provider, runner, lastError: null, inFlight: false, activeRequestId: null };
@@ -122,16 +131,6 @@ export function normalizeThinkingEffort(value) {
         return normalized;
     return null;
 }
-export function thinkingEffortToSdkBudget(effort) {
-    const native = prefixedThinkingEffort("claude", effort) ?? effort;
-    if (native === "standard" || native === "low")
-        return 4096;
-    if (native === "deep" || native === "medium" || native === "high")
-        return 16000;
-    if (native === "max" || native === "xhigh" || native === "ultra")
-        return 31999;
-    return 0;
-}
 export function thinkingEffortToClaudeCliEffort(effort) {
     const native = prefixedThinkingEffort("claude", effort);
     if (native)

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

@@ -1,4 +1,3 @@
-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";
@@ -67,30 +66,10 @@ export declare class StructuredSessionManager {
     private readonly storage;
     private readonly config;
     private readonly logger;
-    private readonly sdkQueryFactory;
     private readonly execHost?;
     private readonly sessions;
     private readonly pendingRunnerExecutions;
-    private readonly pendingSdkAbort;
-    /**
-     * Active SDK Query handle per session, kept around so we can call
-     * `query.interrupt()` for a graceful stop instead of aborting via signal.
-     * Only populated while an SDK call is in flight.
-     */
-    private readonly pendingSdkQueries;
-    /** In-flight canUseTool waiters. One pending prompt per session. */
-    private readonly pendingPermissions;
-    /** approve_turn memory, scoped to the current SDK query. */
-    private readonly turnApprovalMemory;
     private readonly interruptedWith;
-    private readonly interruptedSkills;
-    /**
-     * Sessions where the current interrupt is a "queue promote" (用户从排队条点了「立即」
-     * 把队首插队到 now)。退出处理三个分支默认会把 queuedMessages 清空——因为常规的
-     * interrupt 语义是"算了，做这个"，把队列也作废。但 queue-promote 的语义是
-     * "先做这条，剩下的队列还要继续"，所以这里打个标记，让退出 handler 保留 queue。
-     * 收到后必须 delete 掉，避免下一次普通 interrupt 误带 flag。
-     */
     private readonly preserveQueueOnInterrupt;
     /** Last wall-clock time (ms) a streaming checkpoint reached SQLite. */
     private readonly lastStreamSaveAt;
@@ -108,6 +87,7 @@ export declare class StructuredSessionManager {
     private emitEvent;
     private archiveTimer;
     private readonly topicCoordinator;
+    private readonly nativeTitles;
     private readonly streamEmitTimers;
     private readonly claudeCliRunner;
     private readonly codexRunner;
@@ -122,7 +102,7 @@ export declare class StructuredSessionManager {
     private detachedRecoveryRetryTimer;
     private detachedRecoveryFailureLogged;
     private disposed;
-    constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null, sdkQueryFactory?: typeof sdkQuery, runners?: StructuredSessionManagerRunners, execHost?: StructuredExecHost | undefined);
+    constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null, runners?: StructuredSessionManagerRunners, execHost?: StructuredExecHost | undefined);
     private archiveExpiredSessions;
     setEventEmitter(emitEvent: (event: ProcessEvent) => void): void;
     /** Stop every runner and flush terminal state before storage is closed. */
@@ -155,6 +135,8 @@ export declare class StructuredSessionManager {
      */
     setWorktreeMergeState(id: string, status: SessionSnapshot["worktreeMergeStatus"], info: SessionSnapshot["worktreeMergeInfo"]): SessionSnapshot | null;
     private maybeGenerateSessionTopic;
+    /** 原生标题优先于模型标题：只受「不能是任务名/目录名」约束，命中且变化时才落库。 */
+    private applyNativeSessionTitle;
     createSession(options: CreateStructuredSessionOptions): SessionSnapshot;
     registerRelay(automationIdPrefix: string, handler: StructuredRelayHandler): void;
     private relayHandlerFor;
@@ -171,7 +153,6 @@ export declare class StructuredSessionManager {
         idempotencyKey?: string;
         preserveQueue?: boolean;
         queueAlreadyRemoved?: boolean;
-        skills?: string[];
     }): Promise<SessionSnapshot>;
     /**
      * Reorder the pending queued messages. `order` is a permutation of the current
@@ -223,15 +204,10 @@ export declare class StructuredSessionManager {
     private currentSessionForRequest;
     /** Delete a handle only if it still belongs to the execution doing cleanup. */
     private releasePendingRunnerExecution;
-    private releasePendingSdkAbort;
-    private releasePendingSdkQuery;
     private emitStructuredSnapshot;
     private flushNextQueuedMessage;
     private emit;
     private incrementApprovalStats;
-    private rememberTurnApproval;
-    private settlePendingPermission;
-    private handleCanUseTool;
     private runCodexStreaming;
     private runGrokStreaming;
     private runOpenCodeStreaming;
@@ -247,17 +223,6 @@ export declare class StructuredSessionManager {
      *   outside CWD). stdin is always "ignore" — no ACP bidirectional control.
      */
     private runClaudeStreaming;
-    /**
-     * Use @anthropic-ai/claude-agent-sdk instead of spawning claude -p directly.
-     * The SDK still spawns the claude binary but provides typed AsyncGenerator<SDKMessage>
-     * messages, so we skip NDJSON parsing. Options are 1:1 with the CLI flags.
-     *
-     * Streaming is enabled via includePartialMessages: true — the SDK emits
-     * SDKPartialAssistantMessage (type: "stream_event") with BetaRawMessageStreamEvent
-     * payloads for incremental text/thinking/tool_use updates, followed by a final
-     * SDKAssistantMessage with the authoritative complete content.
-     */
-    private runClaudeSdkStreaming;
     private compactContentBlocks;
     private buildCompletedAssistantMessages;
     /**
@@ -271,7 +236,6 @@ export declare class StructuredSessionManager {
      */
     private mergeTruncatedReplayTurn;
     private resolveQueuedMessagesAfterInterrupt;
-    private resolveQueuedMessageSkillsAfterInterrupt;
     private normalizeToolResultContent;
     /**
      * 组装结构化 runner 退出失败时的可读错误字符串。