@ycodium-ai/agent-fake 0.2.3122 → 0.2.3130

package/README.md

@@ -94,13 +94,25 @@ A `wait` polls `tools/list` on that MCP server every 250 ms for the tool name or
 tool items. A `waitFor`, such as
 `{ "waitFor": { "tool": "message_inbox_peek", "path": "items", "atLeast": 2 } }`, calls that tool
 with its optional `arguments` (none by default; placeholders are not resolved there) every 250 ms on one session until the value at the dot `path` of its result is
-an array at least `atLeast` long, or a number at least `atLeast`; a tool error counts as not yet.
+an array at least `atLeast` long, or a number at least `atLeast`; any other value found there (for
+example one entry picked by a selector such as `items[title=<encodeURIComponent value>]`) counts
+as 1, and a tool error counts as not yet. Dots inside a selector's brackets do not split the path.
+An optional `id` keeps the result of the ready poll so later calls can reference it with
+`{{step:<id>.<path>}}`; it is not added to the history that `{{step:*…}}` searches.
 Point it only at read-only tools, since every poll is a real call. It also defaults to 30000 ms,
 replies `mcp-send waitFor <tool> <path> >= <atLeast>: ready` or `… failed: timeout`, emits no tool
 items and continues. Calls reply `mcp-send <tool>: <JSON result>` or `mcp-send <tool> failed: <error>` and
 emit paired `item.started` / `item.completed` events carrying the prefixed tool name, resolved
 input, raw result and status. Abort stops before the next step and ends the turn as `interrupted`.
 
+A batch may start with `{ "expectInput": "<text>" }`: it runs only on a turn whose input contains
+that text. Each turn runs the earliest batch that has not run yet and either matches the turn's
+input or, without `expectInput`, is the earliest batch left; so batches keyed by their wake-up text
+can run out of order, and a playbook without `expectInput` still runs batch by batch. A turn that
+matches nothing falls back to the plain `mcp-send` handling below. Recorded replays key each batch
+by the message that started that turn, so wake-ups arriving in a different order still reach the
+right batch. `expectInput` is valid only as a batch's first step.
+
 Threads with no matching line, or with all batches consumed, use the original `mcp-send`
 input handling: JSON requests call tools and ordinary text gets `replyText`. Omitting
 `playbookPath` keeps the existing scripts and output unchanged.

package/dist/index.js

@@ -666,6 +666,8 @@ var parseTimeout = (value) => {
 };
 function parseStep(value) {
   if (!isRecord2(value)) return null;
+  if (Object.hasOwn(value, "expectInput"))
+    return onlyKeys(value, ["expectInput"]) && isName(value.expectInput) ? { expectInput: value.expectInput } : null;
   if (Object.hasOwn(value, "wait")) {
     const wait = value.wait;
     if (!onlyKeys(value, ["wait"]) || !isRecord2(wait) || !isName(wait.tool)) return null;
@@ -683,7 +685,7 @@ function parseStep(value) {
   if (Object.hasOwn(value, "waitFor")) {
     const wait = value.waitFor;
     if (!onlyKeys(value, ["waitFor"]) || !isRecord2(wait) || !isName(wait.tool)) return null;
-    if (!onlyKeys(wait, ["server", "tool", "arguments", "path", "atLeast", "timeoutMs"]) || !isName(wait.path) || wait.arguments !== void 0 && !isRecord2(wait.arguments) || wait.server !== void 0 && !isName(wait.server))
+    if (!onlyKeys(wait, ["id", "server", "tool", "arguments", "path", "atLeast", "timeoutMs"]) || !isName(wait.path) || wait.id !== void 0 && !isName(wait.id) || wait.arguments !== void 0 && !isRecord2(wait.arguments) || wait.server !== void 0 && !isName(wait.server))
       return null;
     if (typeof wait.atLeast !== "number" || !Number.isInteger(wait.atLeast) || wait.atLeast < 0)
       return null;
@@ -694,6 +696,7 @@ function parseStep(value) {
         path: wait.path,
         atLeast: wait.atLeast,
         timeoutMs,
+        ...wait.id === void 0 ? {} : { id: wait.id },
         ...wait.server === void 0 ? {} : { server: wait.server },
         ...wait.arguments === void 0 ? {} : { arguments: wait.arguments }
       }
@@ -732,7 +735,7 @@ function parsePlaybook(text) {
         const steps = [];
         for (const entry of batch) {
           const step = parseStep(entry);
-          if (step === null)
+          if (step === null || "expectInput" in step && steps.length > 0)
             return { ok: false, reason: `threads[${index}].turns[${turn}] has an invalid step` };
           steps.push(step);
         }
@@ -753,9 +756,10 @@ function parsePlaybook(text) {
 }
 var UnresolvedPlaceholder = class extends Error {
 };
+var splitPath = (path) => path.split(/\.(?![^\[]*\])/u);
 function placeholderValue(raw, threadId, results, history) {
   if (raw === "{{thread}}") return threadId;
-  const [id, ...path] = raw.slice(7, -2).split(/\.(?![^\[]*\])/u);
+  const [id, ...path] = splitPath(raw.slice(7, -2));
   const unresolved = () => new UnresolvedPlaceholder(`unresolved placeholder ${raw}`);
   const nthAt = path.findIndex((part) => {
     const selector = parseSelector(part);
@@ -855,6 +859,17 @@ function stepResult(result) {
     return first.text;
   }
 }
+function pickBatch(line, consumed, input) {
+  let earliest = true;
+  for (const [index, batch] of line.turns.entries()) {
+    if (consumed.has(index)) continue;
+    const first = batch[0];
+    const expected = first !== void 0 && "expectInput" in first ? first.expectInput : void 0;
+    if (expected === void 0 ? earliest : input.includes(expected)) return index;
+    earliest = false;
+  }
+  return void 0;
+}
 async function poll(timeoutMs, input, ready) {
   const deadline = Date.now() + timeoutMs;
   const controller = new AbortController();
@@ -885,18 +900,25 @@ var waitForTool = (step, input, clients) => poll(step.wait.timeoutMs, input, asy
     (tool) => isRecord2(tool) && (tool.name === step.wait.tool || tool.name === `mcp__${step.wait.server ?? "ycodium"}__${step.wait.tool}`)
   );
 });
-var waitForCount = (step, input, clients) => poll(step.waitFor.timeoutMs, input, async (signal) => {
-  const called = await clients.request(
-    step.waitFor.server,
-    "tools/call",
-    { name: step.waitFor.tool, arguments: step.waitFor.arguments ?? {} },
-    signal
-  );
-  if (isRecord2(called) && called.isError === true) return false;
-  const value = valueAt(stepResult(called), step.waitFor.path.split("."));
-  const count = Array.isArray(value) ? value.length : value;
-  return typeof count === "number" && count >= step.waitFor.atLeast;
-});
+async function waitForCount(step, input, clients) {
+  let ready;
+  const ok = await poll(step.waitFor.timeoutMs, input, async (signal) => {
+    const called = await clients.request(
+      step.waitFor.server,
+      "tools/call",
+      { name: step.waitFor.tool, arguments: step.waitFor.arguments ?? {} },
+      signal
+    );
+    if (isRecord2(called) && called.isError === true) return false;
+    const result = stepResult(called);
+    const value = valueAt(result, splitPath(step.waitFor.path));
+    const count = Array.isArray(value) ? value.length : typeof value === "number" ? value : value === void 0 || value === null ? 0 : 1;
+    if (count < step.waitFor.atLeast) return false;
+    ready = { result };
+    return true;
+  });
+  return ok ? ready : void 0;
+}
 async function runCall(step, playback, input, clients) {
   let args = step.arguments ?? {};
   let failure;
@@ -981,15 +1003,16 @@ function createPlaybookRunner(input) {
         if (index >= 0) claimed.add(index);
         playback = {
           line: parsed.threads[index] ?? null,
-          cursor: 0,
+          consumed: /* @__PURE__ */ new Set(),
           results: /* @__PURE__ */ new Map(),
           history: []
         };
         sessions.set(turn.threadId, playback);
       }
-      const batch = playback.line?.turns[playback.cursor];
-      if (batch === void 0) return null;
-      playback.cursor += 1;
+      const picked = playback.line === null ? void 0 : pickBatch(playback.line, playback.consumed, turn.input ?? "");
+      const batch = picked === void 0 ? void 0 : playback.line?.turns[picked];
+      if (picked === void 0 || batch === void 0) return null;
+      playback.consumed.add(picked);
       let opened = clients.get(turn.threadId);
       if (opened === void 0) {
         opened = createPlaybookMcp({ fetch: turn.fetch, servers: turn.mcpServers });
@@ -1004,6 +1027,7 @@ function createPlaybookRunner(input) {
       const lines = [];
       for (const step of batch) {
         if (turn.signal.aborted) break;
+        if ("expectInput" in step) continue;
         if ("wait" in step) {
           const missing = opened.missing(step.wait.server);
           if (step.wait.server !== void 0 && missing !== void 0) {
@@ -1021,7 +1045,8 @@ function createPlaybookRunner(input) {
           }
           const ready = await waitForCount(step, safeTurn, opened);
           if (turn.signal.aborted) break;
-          const { tool, path: path2, atLeast } = step.waitFor;
+          const { id, tool, path: path2, atLeast } = step.waitFor;
+          if (ready !== void 0 && id !== void 0) playback.results.set(id, ready.result);
           lines.push(
             `mcp-send waitFor ${tool} ${path2} >= ${String(atLeast)}${ready ? ": ready" : " failed: timeout"}`
           );
@@ -1391,6 +1416,7 @@ var createFakeInstance = (config, host) => {
       threadId,
       turnId,
       signal,
+      ...input === void 0 ? {} : { input },
       fetch: host.fetch,
       mcpServers: booked.mcpServers,
       emit,
@@ -1652,7 +1678,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-fake",
-  apiVersion: 13,
+  apiVersion: 14,
   executors,
   activate(ctx) {
     ctx.log.info("fake executor ready");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-fake",
-  "version": "0.2.3122",
+  "version": "0.2.3130",
   "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.3122",
+    "@ycodium-ai/plugin-api": "0.2.3130",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {