@ycodium-ai/agent-fake 0.2.3130 → 0.2.3168

package/dist/index.js

@@ -89,6 +89,86 @@ var FAKE_CARD = {
 // src/fakeInstance.ts
 import * as NodeCrypto from "node:crypto";
 
+// src/fakeEventBus.ts
+var EventBus = class {
+  #queued = [];
+  #waiters = [];
+  #closed = false;
+  push(event) {
+    const waiter = this.#waiters.shift();
+    if (waiter) {
+      waiter({ done: false, value: event });
+      return;
+    }
+    this.#queued.push(event);
+  }
+  close() {
+    if (this.#closed) return;
+    this.#closed = true;
+    while (this.#waiters.length > 0) {
+      this.#waiters.shift()?.({ done: true, value: void 0 });
+    }
+  }
+  [Symbol.asyncIterator]() {
+    return {
+      next: () => {
+        const queued = this.#queued.shift();
+        if (queued !== void 0) return Promise.resolve({ done: false, value: queued });
+        if (this.#closed) return Promise.resolve({ done: true, value: void 0 });
+        return new Promise((resolve) => {
+          this.#waiters.push(resolve);
+        });
+      }
+    };
+  }
+};
+
+// src/fakeSessionLifecycle.ts
+function runFakeTurn(run, settle, fail) {
+  const work = run();
+  return (fail === void 0 ? work : work.catch(fail)).finally(settle);
+}
+function createFakeSessionLifecycle(input) {
+  let disposal;
+  const closeBooked = (threadId, booked) => {
+    if (booked.closing !== void 0) return booked.closing;
+    const closing = Promise.withResolvers();
+    booked.closing = closing.promise;
+    void (async () => {
+      input.abort(threadId);
+      const [cleanup] = await Promise.allSettled([
+        (async () => input.stopPlaybook(threadId))(),
+        booked.turnWork?.catch(() => void 0)
+      ]);
+      if (cleanup.status === "rejected") throw cleanup.reason;
+      if (input.threads.get(threadId) !== booked) return;
+      input.exited(booked.session);
+      input.threads.delete(threadId);
+      input.forget(threadId);
+    })().then(closing.resolve, closing.reject);
+    return closing.promise;
+  };
+  return {
+    closeBooked,
+    dispose: () => {
+      if (disposal !== void 0) return disposal;
+      const disposing = Promise.withResolvers();
+      disposal = disposing.promise;
+      void (async () => {
+        const results = await Promise.allSettled(
+          [...input.threads].map(([threadId, booked]) => closeBooked(threadId, booked))
+        );
+        for (const result of results) {
+          if (result.status === "rejected") throw result.reason;
+        }
+        await input.disposePlaybook();
+        input.closeEvents();
+      })().then(disposing.resolve, disposing.reject);
+      return disposal;
+    }
+  };
+}
+
 // src/laneScript.ts
 import * as NodeFS from "node:fs";
 import * as NodePath from "node:path";
@@ -563,12 +643,14 @@ function parseMcpSendInput(input) {
 async function runMcpCalls(input) {
   const lines = [];
   for (const call of input.calls) {
+    if (input.signal?.aborted === true) break;
     try {
       const result = await callMcpTool({
         fetch: input.fetch,
         server: input.server,
         name: call.tool,
-        arguments: call.arguments
+        arguments: call.arguments,
+        ...input.signal === void 0 ? {} : { signal: input.signal }
       });
       lines.push(`mcp-send ${call.tool}: ${JSON.stringify(result)}`);
     } catch (error) {
@@ -1153,38 +1235,6 @@ async function runVisualizeTurn(input) {
 
 // src/fakeInstance.ts
 var yieldTick = () => Promise.resolve();
-var EventBus = class {
-  #queued = [];
-  #waiters = [];
-  #closed = false;
-  push(event) {
-    const waiter = this.#waiters.shift();
-    if (waiter) {
-      waiter({ done: false, value: event });
-      return;
-    }
-    this.#queued.push(event);
-  }
-  close() {
-    if (this.#closed) return;
-    this.#closed = true;
-    while (this.#waiters.length > 0) {
-      this.#waiters.shift()?.({ done: true, value: void 0 });
-    }
-  }
-  [Symbol.asyncIterator]() {
-    return {
-      next: () => {
-        const queued = this.#queued.shift();
-        if (queued !== void 0) return Promise.resolve({ done: false, value: queued });
-        if (this.#closed) return Promise.resolve({ done: true, value: void 0 });
-        return new Promise((resolve) => {
-          this.#waiters.push(resolve);
-        });
-      }
-    };
-  }
-};
 var FAKE_ASYNC_QUESTIONS = [
   {
     id: "q0",
@@ -1253,9 +1303,29 @@ var createFakeInstance = (config, host) => {
       payload,
       ...extra?.turnId === void 0 ? {} : { turnId: extra.turnId },
       ...extra?.itemId === void 0 ? {} : { itemId: extra.itemId },
-      ...extra?.requestId === void 0 ? {} : { requestId: extra.requestId }
+      ...extra?.requestId === void 0 ? {} : { requestId: extra.requestId },
+      ...extra?.originBindingGeneration === void 0 ? {} : { originBindingGeneration: extra.originBindingGeneration },
+      ...extra?.originResumeCursor === void 0 ? {} : { originResumeCursor: extra.originResumeCursor }
     });
   };
+  const lifecycle = createFakeSessionLifecycle({
+    threads,
+    abort: (threadId) => inflight.get(threadId)?.abort(),
+    stopPlaybook: (threadId) => playbook?.stopSession(threadId),
+    // 代次与续接游标取被关闭的那份 session，不在发送时重查当前会话。
+    exited: (session) => emit(
+      "session.exited",
+      session.threadId,
+      { reason: "stopped" },
+      {
+        ...session.bindingGeneration === void 0 ? {} : { originBindingGeneration: session.bindingGeneration },
+        ...session.resumeCursor === void 0 ? {} : { originResumeCursor: session.resumeCursor }
+      }
+    ),
+    forget: (threadId) => steeredInputs.delete(threadId),
+    disposePlaybook: () => playbook?.dispose(),
+    closeEvents: () => events.close()
+  });
   const requireThread = (threadId) => {
     const booked = threads.get(threadId);
     if (!booked) throw new Error(`unknown thread ${threadId}`);
@@ -1283,12 +1353,12 @@ var createFakeInstance = (config, host) => {
       inflight.delete(booked.session.threadId);
     }
   };
-  const runMcpSendScript = async (booked, input) => {
+  const runMcpSendScript = async (booked, input, signal) => {
     const calls = parseMcpSendInput(input);
     if (calls === null) return replyText;
     const server = builtinMcpServer(booked.mcpServers);
     if (server === null) return "mcp-send: no MCP server was handed to this session";
-    return runMcpCalls({ fetch: host.fetch, server, calls });
+    return runMcpCalls({ fetch: host.fetch, server, calls, signal });
   };
   const runApprovalToolScript = async (threadId, turnId, signal) => {
     const isAborted = () => signal?.aborted === true;
@@ -1470,7 +1540,7 @@ var createFakeInstance = (config, host) => {
       return;
     }
     if (script === "mcp-send") {
-      const text = playbookText ?? await runMcpSendScript(booked, input);
+      const text = playbookText ?? await runMcpSendScript(booked, input, signal);
       emit("content.delta", threadId, { streamKind: "assistant_text", delta: text }, { turnId });
       await yieldTick();
       finishTurn(booked, turnId, aborted() ? "interrupted" : "completed", [
@@ -1552,6 +1622,7 @@ var createFakeInstance = (config, host) => {
     startSession: async (input, signal) => {
       if (disposed) throw new Error("instance disposed");
       if (signal?.aborted) throw new Error("aborted");
+      if (threads.get(input.threadId)?.closing !== void 0) throw new Error("session closing");
       if (failStartSession !== void 0) throw new Error(failStartSession);
       const cwd = input.cwd ?? host.workspacePath(input.threadId);
       if (cwd.trim() === "") throw new Error("workspace path missing");
@@ -1581,6 +1652,7 @@ var createFakeInstance = (config, host) => {
     sendTurn: async (input, signal) => {
       if (disposed) throw new Error("instance disposed");
       const booked = requireThread(input.threadId);
+      if (booked.closing !== void 0) throw new Error("session closing");
       const running = inflight.get(input.threadId);
       const steered = acceptLaneSteer({
         running,
@@ -1611,17 +1683,15 @@ var createFakeInstance = (config, host) => {
         signal?.removeEventListener("abort", abortTurn);
         if (inflight.get(input.threadId)?.turnId === turnId) inflight.delete(input.threadId);
       };
-      if (script === "approval-tool" || script === "stream" || script === "mcp-send" || script === "visualize" || script === "lane") {
-        signal?.removeEventListener("abort", abortTurn);
-        void run().catch((error) => failTurn(booked, turnId, error)).finally(settle);
-        return result;
-      }
-      try {
-        await run();
-        return result;
-      } finally {
-        settle();
-      }
+      const background = script === "approval-tool" || script === "stream" || script === "mcp-send" || script === "visualize" || script === "lane";
+      if (background) signal?.removeEventListener("abort", abortTurn);
+      booked.turnWork = runFakeTurn(
+        run,
+        settle,
+        background ? (error) => failTurn(booked, turnId, error) : void 0
+      );
+      if (!background) await booked.turnWork;
+      return result;
     },
     interruptTurn: async (threadId, turnId) => {
       const running = inflight.get(threadId);
@@ -1642,9 +1712,8 @@ var createFakeInstance = (config, host) => {
       host.log.info("respondToUserInput ignored");
     },
     stopSession: async (threadId) => {
-      inflight.get(threadId)?.abort();
-      threads.delete(threadId);
-      await playbook?.stopSession(threadId);
+      const booked = threads.get(threadId);
+      if (booked !== void 0) await lifecycle.closeBooked(threadId, booked);
     },
     readThread: async (threadId) => {
       const booked = requireThread(threadId);
@@ -1654,13 +1723,7 @@ var createFakeInstance = (config, host) => {
     usage: createFakeUsage({ instanceId: host.instanceId, script: parseUsageScript(config) }),
     dispose: async () => {
       disposed = true;
-      for (const running of inflight.values()) running.abort();
-      inflight.clear();
-      for (const settle of pendingDecisions.values()) settle("cancel");
-      pendingDecisions.clear();
-      threads.clear();
-      await playbook?.dispose();
-      events.close();
+      await lifecycle.dispose();
     }
   };
   return instance;
@@ -1678,7 +1741,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-fake",
-  apiVersion: 14,
+  apiVersion: 16,
   executors,
   activate(ctx) {
     ctx.log.info("fake executor ready");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-fake",
-  "version": "0.2.3130",
+  "version": "0.2.3168",
   "description": "Minimal fake executor for plugin authors and host orchestration tests.",
   "keywords": [
     "ycodium",
@@ -21,7 +21,7 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3130",
+    "@ycodium-ai/plugin-api": "0.2.3168",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {