@witqq/agent-sdk 0.6.0 → 0.7.0

package/dist/backends/copilot.cjs

@@ -8,10 +8,16 @@ function getTextContent(content) {
 
 // src/errors.ts
 var AgentSDKError = class extends Error {
+  /** @internal Marker for cross-bundle identity checks */
+  _agentSDKError = true;
   constructor(message, options) {
     super(message, options);
     this.name = "AgentSDKError";
   }
+  /** Check if an error is an AgentSDKError (works across bundled copies) */
+  static is(error) {
+    return error instanceof Error && "_agentSDKError" in error && error._agentSDKError === true;
+  }
 };
 var ReentrancyError = class extends AgentSDKError {
   constructor() {
@@ -43,6 +49,7 @@ var BaseAgent = class {
   state = "idle";
   abortController = null;
   config;
+  _cleanupExternalSignal = null;
   /** CLI session ID for persistent mode. Override in backends that support it. */
   get sessionId() {
     return void 0;
@@ -62,8 +69,7 @@ var BaseAgent = class {
       this.enrichAndNotifyUsage(result);
       return result;
     } finally {
-      this.state = "idle";
-      this.abortController = null;
+      this.cleanupRun();
     }
   }
   async runWithContext(messages, options) {
@@ -76,8 +82,7 @@ var BaseAgent = class {
       this.enrichAndNotifyUsage(result);
       return result;
     } finally {
-      this.state = "idle";
-      this.abortController = null;
+      this.cleanupRun();
     }
   }
   async runStructured(prompt, schema, options) {
@@ -96,8 +101,7 @@ var BaseAgent = class {
       this.enrichAndNotifyUsage(result);
       return result;
     } finally {
-      this.state = "idle";
-      this.abortController = null;
+      this.cleanupRun();
     }
   }
   async *stream(prompt, options) {
@@ -110,8 +114,7 @@ var BaseAgent = class {
       const enriched = this.enrichStream(this.executeStream(messages, options, ac.signal));
       yield* this.heartbeatStream(enriched);
     } finally {
-      this.state = "idle";
-      this.abortController = null;
+      this.cleanupRun();
     }
   }
   async *streamWithContext(messages, options) {
@@ -123,8 +126,7 @@ var BaseAgent = class {
       const enriched = this.enrichStream(this.executeStream(messages, options, ac.signal));
       yield* this.heartbeatStream(enriched);
     } finally {
-      this.state = "idle";
-      this.abortController = null;
+      this.cleanupRun();
     }
   }
   abort() {
@@ -144,6 +146,8 @@ var BaseAgent = class {
   }
   /** Mark agent as disposed. Override to add cleanup. */
   dispose() {
+    this._cleanupExternalSignal?.();
+    this._cleanupExternalSignal = null;
     this.abort();
     this.state = "disposed";
   }
@@ -254,16 +258,24 @@ var BaseAgent = class {
     }
   }
   // ─── Internal Helpers ─────────────────────────────────────────
+  /** Clean up after a run completes (success, error, or abort). */
+  cleanupRun() {
+    this._cleanupExternalSignal?.();
+    this._cleanupExternalSignal = null;
+    this.state = "idle";
+    this.abortController = null;
+  }
   createAbortController(externalSignal) {
     const ac = new AbortController();
     this.abortController = ac;
+    this._cleanupExternalSignal = null;
     if (externalSignal) {
       if (externalSignal.aborted) {
         ac.abort();
       } else {
-        externalSignal.addEventListener("abort", () => ac.abort(), {
-          once: true
-        });
+        const listener = () => ac.abort();
+        externalSignal.addEventListener("abort", listener, { once: true });
+        this._cleanupExternalSignal = () => externalSignal.removeEventListener("abort", listener);
       }
     }
     return ac;
@@ -349,9 +361,25 @@ function mapToolsToSDK(tools) {
   return tools.map((tool) => ({
     name: tool.name,
     description: tool.description,
-    // Pass Zod schema directly — Copilot SDK accepts ZodSchema natively
-    // and handles conversion internally, avoiding potential schema format issues.
-    parameters: tool.parameters,
+    parameters: convertParameters(tool.parameters),
+    handler: async (args) => {
+      const result = await tool.execute(args);
+      return typeof result === "string" ? result : JSON.stringify(result);
+    }
+  }));
+}
+function convertParameters(params) {
+  if (!params) return void 0;
+  if (params && typeof params === "object" && "_def" in params) {
+    return zodToJsonSchema(params);
+  }
+  return params;
+}
+async function mapToolsToSDKAsync(tools) {
+  return tools.map((tool) => ({
+    name: tool.name,
+    description: tool.description,
+    parameters: convertParameters(tool.parameters),
     handler: async (args) => {
       const result = await tool.execute(args);
       return typeof result === "string" ? result : JSON.stringify(result);
@@ -522,7 +550,7 @@ function mapSessionEvent(event, tracker, thinkingTracker) {
     case "assistant.message": {
       const doneEvent = {
         type: "done",
-        finalOutput: String(data.content ?? "")
+        finalOutput: data.content ? String(data.content) : null
       };
       if (thinkingTracker.endThinking()) {
         return [{ type: "thinking_end" }, doneEvent];
@@ -543,12 +571,14 @@ var CopilotAgent = class extends BaseAgent {
   persistentSession = null;
   _sessionId;
   activeSession = null;
-  constructor(config, getClient, sendAndWaitTimeout) {
+  _resumeSessionId;
+  _toolsReady = null;
+  constructor(config, getClient, sendAndWaitTimeout, resumeSessionId) {
     super(config);
     this.getClient = getClient;
     this.sendAndWaitTimeout = sendAndWaitTimeout;
     this.isPersistent = config.sessionMode === "persistent";
-    this.sdkTools = mapToolsToSDK(config.tools);
+    this.sdkTools = mapToolsToSDK(config.tools ?? []);
     this.sessionConfig = {
       model: config.model,
       tools: this.sdkTools,
@@ -558,8 +588,16 @@ var CopilotAgent = class extends BaseAgent {
       },
       onPermissionRequest: buildPermissionHandler(config),
       onUserInputRequest: buildUserInputHandler(config),
-      ...config.availableTools ? { availableTools: config.availableTools } : {}
+      ...config.availableTools?.length ? { availableTools: config.availableTools } : {}
     };
+    this._toolsReady = this._initToolsAsync(config);
+    this._resumeSessionId = resumeSessionId;
+  }
+  /** Pre-convert Zod schemas to JSON Schema asynchronously.
+   *  Updates sdkTools and sessionConfig.tools before first session creation. */
+  async _initToolsAsync(config) {
+    this.sdkTools = await mapToolsToSDKAsync(config.tools ?? []);
+    this.sessionConfig.tools = this.sdkTools;
   }
   get sessionId() {
     return this._sessionId;
@@ -588,7 +626,27 @@ var CopilotAgent = class extends BaseAgent {
     if (this.isPersistent && this.persistentSession) {
       return { session: this.persistentSession, isNew: false };
     }
+    if (this._toolsReady) {
+      await this._toolsReady;
+      this._toolsReady = null;
+    }
     const client = await this.getClient();
+    if (this._resumeSessionId) {
+      const storedId = this._resumeSessionId;
+      this._resumeSessionId = void 0;
+      try {
+        const session2 = await client.resumeSession(storedId, {
+          ...this.sessionConfig,
+          streaming: this.isPersistent ? true : streaming
+        });
+        if (this.isPersistent) {
+          this.persistentSession = session2;
+          this._sessionId = session2.sessionId;
+        }
+        return { session: session2, isNew: false };
+      } catch {
+      }
+    }
     const session = await client.createSession({
       ...this.sessionConfig,
       streaming: this.isPersistent ? true : streaming
@@ -796,13 +854,43 @@ function extractLastUserPrompt(messages) {
   }
   return "";
 }
+function serializeToolCall(tc) {
+  const args = typeof tc.args === "string" ? tc.args : JSON.stringify(tc.args);
+  return `  Tool call: ${tc.name}(${args})`;
+}
+function serializeToolResult(tr) {
+  const result = typeof tr.result === "string" ? tr.result : JSON.stringify(tr.result);
+  const prefix = tr.isError ? "[ERROR] " : "";
+  return `  ${tr.name} \u2192 ${prefix}${result}`;
+}
 function buildContextualPrompt(messages) {
   if (messages.length <= 1) {
     return extractLastUserPrompt(messages);
   }
   const history = messages.slice(0, -1).map((msg) => {
+    if (msg.role === "user") {
+      return `User: ${msg.content ? getTextContent(msg.content) : ""}`;
+    }
+    if (msg.role === "tool" && msg.toolResults) {
+      const results = msg.toolResults.map(serializeToolResult).join("\n");
+      return `Tool results:
+${results}`;
+    }
+    if (msg.role === "assistant") {
+      const parts = [];
+      const thinking = msg.thinking;
+      if (thinking) {
+        parts.push(`[reasoning: ${thinking}]`);
+      }
+      const text2 = msg.content ? getTextContent(msg.content) : "";
+      if (text2) parts.push(text2);
+      if (msg.toolCalls && msg.toolCalls.length > 0) {
+        parts.push(msg.toolCalls.map(serializeToolCall).join("\n"));
+      }
+      return `Assistant: ${parts.join("\n")}`;
+    }
     const text = msg.content ? getTextContent(msg.content) : "";
-    return msg.role === "user" ? `User: ${text}` : `Assistant: ${text}`;
+    return `${msg.role}: ${text}`;
   }).join("\n");
   const lastPrompt = extractLastUserPrompt(messages);
   return `Conversation history:
@@ -810,6 +898,21 @@ ${history}
 
 User: ${lastPrompt}`;
 }
+function withTimeout(promise, ms, message) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new SubprocessError(message)), ms);
+    promise.then(
+      (val) => {
+        clearTimeout(timer);
+        resolve(val);
+      },
+      (err) => {
+        clearTimeout(timer);
+        reject(err);
+      }
+    );
+  });
+}
 var CopilotAgentService = class {
   name = "copilot";
   client = null;
@@ -834,12 +937,17 @@ var CopilotAgentService = class {
           autoRestart: true,
           logLevel: "error",
           githubToken: this.options.githubToken,
-          useLoggedInUser: this.options.useLoggedInUser ?? true,
+          useLoggedInUser: this.options.useLoggedInUser ?? !this.options.githubToken,
           ...this.options.cliArgs ? { cliArgs: this.options.cliArgs } : {},
           ...this.options.env ? { env: { ...process.env, ...this.options.env } } : {}
         });
-        await client.start();
-        const auth = await client.getAuthStatus();
+        const startupTimeout = this.options.startupTimeoutMs ?? 3e4;
+        await withTimeout(client.start(), startupTimeout, "CLI startup timed out");
+        const auth = await withTimeout(
+          client.getAuthStatus(),
+          startupTimeout,
+          "Auth status check timed out \u2014 token may be expired"
+        );
         if (!auth.isAuthenticated) {
           await client.stop();
           throw new SubprocessError(
@@ -857,7 +965,7 @@ var CopilotAgentService = class {
   }
   createAgent(config) {
     if (this.disposed) throw new DisposedError("CopilotAgentService");
-    return new CopilotAgent(config, () => this.ensureClient(), this.options.timeout);
+    return new CopilotAgent(config, () => this.ensureClient(), this.options.timeout, this.options.resumeSessionId);
   }
   async listModels() {
     const client = await this.ensureClient();