@witqq/agent-sdk 0.3.1 → 0.5.0

package/dist/backends/claude.cjs

@@ -43,6 +43,10 @@ var BaseAgent = class {
   state = "idle";
   abortController = null;
   config;
+  /** CLI session ID for persistent mode. Override in backends that support it. */
+  get sessionId() {
+    return void 0;
+  }
   constructor(config) {
     this.config = Object.freeze({ ...config });
   }
@@ -128,6 +132,10 @@ var BaseAgent = class {
       this.abortController.abort();
     }
   }
+  /** Default interrupt — falls back to abort(). Backends may override with graceful shutdown. */
+  async interrupt() {
+    this.abort();
+  }
   getState() {
     return this.state;
   }
@@ -337,12 +345,9 @@ function _injectSDK(mock) {
 function _resetSDK() {
   sdkModule = null;
 }
-var CLAUDE_KNOWN_MODELS = [
-  { id: "claude-sonnet-4-5-20250514", name: "Claude Sonnet 4.5" },
-  { id: "claude-haiku-3-5-20241022", name: "Claude 3.5 Haiku" },
-  { id: "claude-opus-4-20250514", name: "Claude Opus 4" },
-  { id: "claude-sonnet-4-20250514", name: "Claude Sonnet 4" }
-];
+var ANTHROPIC_MODELS_URL = "https://api.anthropic.com/v1/models";
+var ANTHROPIC_API_VERSION = "2023-06-01";
+var ANTHROPIC_OAUTH_BETA = "oauth-2025-04-20";
 function buildMcpServer(sdk, tools, toolResultCapture) {
   if (tools.length === 0) return void 0;
   const mcpTools = tools.map(
@@ -586,17 +591,43 @@ var ClaudeAgent = class extends BaseAgent {
   options;
   tools;
   canUseTool;
+  isPersistent;
+  _sessionId;
+  activeQuery = null;
   constructor(config, options) {
     super(config);
     this.options = options;
     this.tools = config.tools;
     this.canUseTool = buildCanUseTool(config);
+    this.isPersistent = config.sessionMode === "persistent";
     if (config.supervisor?.onAskUser) {
       console.warn(
         "[agent-sdk/claude] supervisor.onAskUser is not supported by the Claude CLI backend. User interaction requests from the model will not be forwarded."
       );
     }
   }
+  get sessionId() {
+    return this._sessionId;
+  }
+  async interrupt() {
+    try {
+      if (this.activeQuery) {
+        await this.activeQuery.interrupt();
+      }
+    } catch {
+    } finally {
+      this.abort();
+    }
+  }
+  /** Clear persistent session state after an error so next call starts fresh */
+  clearPersistentSession() {
+    this._sessionId = void 0;
+  }
+  emitSessionInfo(sessionId) {
+    const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
+    const transcriptPath = home ? `${home}/.claude/projects/.session/sessions/${sessionId}/conversation.jsonl` : void 0;
+    return { type: "session_info", sessionId, transcriptPath, backend: "claude" };
+  }
   buildQueryOptions(signal) {
     const ac = new AbortController();
     signal.addEventListener("abort", () => ac.abort(), { once: true });
@@ -606,13 +637,26 @@ var ClaudeAgent = class extends BaseAgent {
       maxTurns: this.options.maxTurns,
       cwd: this.options.workingDirectory,
       pathToClaudeCodeExecutable: this.options.cliPath,
-      persistSession: false,
+      persistSession: this.isPersistent,
       includePartialMessages: true,
       canUseTool: this.canUseTool
     };
+    if (this.isPersistent && this._sessionId) {
+      opts.resume = this._sessionId;
+    }
     if (this.config.systemPrompt) {
       opts.systemPrompt = this.config.systemPrompt;
     }
+    if (this.options.oauthToken || this.options.env) {
+      opts.env = {
+        ...process.env,
+        ...this.options.env ?? {},
+        ...this.options.oauthToken ? { CLAUDE_CODE_OAUTH_TOKEN: this.options.oauthToken } : {}
+      };
+    }
+    if (opts.canUseTool && !opts.permissionMode) {
+      opts.permissionMode = "default";
+    }
     return opts;
   }
   async buildMcpConfig(opts, toolResultCapture) {
@@ -630,11 +674,13 @@ var ClaudeAgent = class extends BaseAgent {
   async executeRun(messages, _options, signal) {
     this.checkAbort(signal);
     const sdk = await loadSDK();
-    const prompt = extractLastUserPrompt(messages);
+    const isResuming = this.isPersistent && this._sessionId !== void 0;
+    const prompt = isResuming ? extractLastUserPrompt(messages) : buildContextualPrompt(messages);
     let opts = this.buildQueryOptions(signal);
     const toolResultCapture = /* @__PURE__ */ new Map();
     opts = await this.buildMcpConfig(opts, toolResultCapture);
     const q = sdk.query({ prompt, options: opts });
+    this.activeQuery = q;
     const toolCalls = [];
     let output = null;
     let usage;
@@ -669,6 +715,9 @@ var ClaudeAgent = class extends BaseAgent {
             const r = msg;
             output = r.result;
             usage = aggregateUsage(r.modelUsage);
+            if (this.isPersistent && r.session_id) {
+              this._sessionId = r.session_id;
+            }
           } else if (msg.is_error) {
             const r = msg;
             throw new Error(
@@ -678,8 +727,11 @@ var ClaudeAgent = class extends BaseAgent {
         }
       }
     } catch (e) {
+      if (this.isPersistent) this.clearPersistentSession();
       if (signal.aborted) throw new AbortError();
       throw e;
+    } finally {
+      this.activeQuery = null;
     }
     return {
       output,
@@ -696,7 +748,8 @@ var ClaudeAgent = class extends BaseAgent {
   async executeRunStructured(messages, schema, _options, signal) {
     this.checkAbort(signal);
     const sdk = await loadSDK();
-    const prompt = extractLastUserPrompt(messages);
+    const isResuming = this.isPersistent && this._sessionId !== void 0;
+    const prompt = isResuming ? extractLastUserPrompt(messages) : buildContextualPrompt(messages);
     let opts = this.buildQueryOptions(signal);
     opts = await this.buildMcpConfig(opts);
     const jsonSchema = zodToJsonSchema(schema.schema);
@@ -705,6 +758,7 @@ var ClaudeAgent = class extends BaseAgent {
       schema: jsonSchema
     };
     const q = sdk.query({ prompt, options: opts });
+    this.activeQuery = q;
     const toolCalls = [];
     let output = null;
     let structuredOutput;
@@ -732,6 +786,9 @@ var ClaudeAgent = class extends BaseAgent {
             }
           }
           usage = aggregateUsage(r.modelUsage);
+          if (this.isPersistent && r.session_id) {
+            this._sessionId = r.session_id;
+          }
         } else if (msg.type === "result" && msg.is_error) {
           const r = msg;
           throw new Error(
@@ -740,8 +797,11 @@ var ClaudeAgent = class extends BaseAgent {
         }
       }
     } catch (e) {
+      if (this.isPersistent) this.clearPersistentSession();
       if (signal.aborted) throw new AbortError();
       throw e;
+    } finally {
+      this.activeQuery = null;
     }
     return {
       output,
@@ -758,10 +818,12 @@ var ClaudeAgent = class extends BaseAgent {
   async *executeStream(messages, _options, signal) {
     this.checkAbort(signal);
     const sdk = await loadSDK();
-    const prompt = extractLastUserPrompt(messages);
+    const isResuming = this.isPersistent && this._sessionId !== void 0;
+    const prompt = isResuming ? extractLastUserPrompt(messages) : buildContextualPrompt(messages);
     let opts = this.buildQueryOptions(signal);
     opts = await this.buildMcpConfig(opts);
     const q = sdk.query({ prompt, options: opts });
+    this.activeQuery = q;
     const thinkingBlockIndices = /* @__PURE__ */ new Set();
     const toolCallTracker = new ClaudeToolCallTracker();
     try {
@@ -777,15 +839,25 @@ var ClaudeAgent = class extends BaseAgent {
         }
         if (msg.type === "result" && msg.subtype === "success") {
           const r = msg;
+          if (r.session_id) {
+            if (this.isPersistent) {
+              this._sessionId = r.session_id;
+            }
+            yield this.emitSessionInfo(r.session_id);
+          }
           yield { type: "done", finalOutput: r.result };
         }
       }
     } catch (e) {
+      if (this.isPersistent) this.clearPersistentSession();
       if (signal.aborted) throw new AbortError();
       throw e;
+    } finally {
+      this.activeQuery = null;
     }
   }
   dispose() {
+    this._sessionId = void 0;
     super.dispose();
   }
 };
@@ -798,6 +870,20 @@ function extractLastUserPrompt(messages) {
   }
   return "";
 }
+function buildContextualPrompt(messages) {
+  if (messages.length <= 1) {
+    return extractLastUserPrompt(messages);
+  }
+  const history = messages.slice(0, -1).map((msg) => {
+    const text = msg.content ? getTextContent(msg.content) : "";
+    return msg.role === "user" ? `User: ${text}` : `Assistant: ${text}`;
+  }).join("\n");
+  const lastPrompt = extractLastUserPrompt(messages);
+  return `Conversation history:
+${history}
+
+User: ${lastPrompt}`;
+}
 var ClaudeAgentService = class {
   name = "claude";
   disposed = false;
@@ -813,9 +899,30 @@ var ClaudeAgentService = class {
   async listModels() {
     if (this.disposed) throw new DisposedError("ClaudeAgentService");
     if (this.cachedModels) return this.cachedModels;
-    this.cachedModels = CLAUDE_KNOWN_MODELS.map((m) => ({
+    const token = this.options.oauthToken;
+    if (!token) {
+      return [];
+    }
+    const res = await globalThis.fetch(
+      `${ANTHROPIC_MODELS_URL}?limit=100`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "anthropic-version": ANTHROPIC_API_VERSION,
+          "anthropic-beta": ANTHROPIC_OAUTH_BETA
+        }
+      }
+    );
+    if (!res.ok) {
+      return [];
+    }
+    const body = await res.json();
+    if (!body.data || body.data.length === 0) {
+      return [];
+    }
+    this.cachedModels = body.data.map((m) => ({
       id: m.id,
-      name: m.name,
+      name: m.display_name,
       provider: "claude"
     }));
     return this.cachedModels;
@@ -836,7 +943,7 @@ var ClaudeAgentService = class {
       const q = sdk.query({
         prompt: "echo test",
         options: {
-          model: CLAUDE_KNOWN_MODELS[0].id,
+          model: "claude-sonnet-4-20250514",
           pathToClaudeCodeExecutable: this.options.cliPath,
           cwd: this.options.workingDirectory,
           persistSession: false,