@strayl/agent 0.1.10 → 0.1.12

package/dist/agent.js

@@ -7201,13 +7201,11 @@ var LLMClient = class {
           }
         }
       }
-      if (choice.finish_reason === "tool_calls" || choice.finish_reason === "stop") {
-        if (!emittedToolCalls) {
-          emittedToolCalls = true;
-          for (const [, partial] of partialToolCalls) {
-            if (partial.id && partial.name) {
-              yield { type: "tool_call_complete", id: partial.id, name: partial.name, arguments: partial.arguments };
-            }
+      if (choice.finish_reason && !emittedToolCalls) {
+        emittedToolCalls = true;
+        for (const [, partial] of partialToolCalls) {
+          if (partial.id && partial.name) {
+            yield { type: "tool_call_complete", id: partial.id, name: partial.name, arguments: partial.arguments };
           }
         }
       }
@@ -7222,7 +7220,7 @@ var LLMClient = class {
     }
     if (!emittedToolCalls) {
       for (const [, partial] of partialToolCalls) {
-        if (partial.id && partial.name && partial.arguments) {
+        if (partial.id && partial.name) {
           yield { type: "tool_call_complete", id: partial.id, name: partial.name, arguments: partial.arguments };
         }
       }
@@ -7656,7 +7654,11 @@ var HITLManager = class {
     this.idMap.set(id, safe);
     return safe;
   }
-  async waitForResponse(id) {
+  /**
+   * Wait for HITL response, polling both file system and optional stdin drain callback.
+   * @param onPoll - Called each poll iteration so the caller can drain stdin and write pending responses.
+   */
+  async waitForResponse(id, onPoll) {
     const safe = this.safeId(id);
     const filePath = path2.join(this.dir, `${safe}.json`);
     const maxWait = 30 * 60 * 1e3;
@@ -7665,6 +7667,7 @@ var HITLManager = class {
       if (await this.isCancelled()) {
         return { decision: "reject" };
       }
+      if (onPoll) await onPoll();
       try {
         const content = await fs.readFile(filePath, "utf-8");
         const response = JSON.parse(content);
@@ -13401,15 +13404,16 @@ function createPlanModeMiddleware(getMode) {
     name: "planModeFilter",
     filterTools: (tools) => {
       const mode2 = getMode();
+      const getName2 = (t) => t.type === "function" ? t.function.name : "";
       if (mode2 === "plan") {
-        return tools.filter((t) => !PLAN_MODE_BLOCKED.has(t.function.name));
+        return tools.filter((t) => !PLAN_MODE_BLOCKED.has(getName2(t)));
       }
       if (mode2 === "implement") {
         return tools.filter(
-          (t) => !IMPL_MODE_BLOCKED.has(t.function.name) && t.function.name !== "enterPlanMode"
+          (t) => !IMPL_MODE_BLOCKED.has(getName2(t)) && getName2(t) !== "enterPlanMode"
         );
       }
-      return tools.filter((t) => !IMPL_MODE_BLOCKED.has(t.function.name));
+      return tools.filter((t) => !IMPL_MODE_BLOCKED.has(getName2(t)));
     },
     wrapToolCall: async (call, next) => {
       const mode2 = getMode();
@@ -13545,6 +13549,8 @@ async function runAgent(config) {
   const maxIterations = config.maxIterations ?? 200;
   let consecutiveLLMErrors = 0;
   const MAX_CONSECUTIVE_LLM_ERRORS = 5;
+  let consecutiveNoToolCalls = 0;
+  const MAX_NO_TOOL_RETRIES = 3;
   if (config.restoreCheckpoint) {
     const cp = config.restoreCheckpoint;
     context.restoreMessages(cp.messages);
@@ -13717,7 +13723,15 @@ ${IMPLEMENTATION_MODE_PROMPT2}`);
         context_left_percent: leftPercent
       });
     }
-    if (completedToolCalls.length === 0) break;
+    if (completedToolCalls.length === 0) {
+      consecutiveNoToolCalls++;
+      if (consecutiveNoToolCalls >= MAX_NO_TOOL_RETRIES) break;
+      context.addUser(
+        "[System] You output text without calling any tools. Do not think out loud \u2014 use your tools to take action. If you need to communicate with the user, call the askUser tool. If you need to create a plan, call the writePlan tool. Continue working on the task."
+      );
+      continue;
+    }
+    consecutiveNoToolCalls = 0;
     for (const tc of completedToolCalls) {
       if (stdin.isCancelled()) {
         context.addToolResult(tc.id, tc.function.name, JSON.stringify({ error: "Cancelled by user." }));
@@ -13738,7 +13752,14 @@ ${IMPLEMENTATION_MODE_PROMPT2}`);
       const toolDef = registry.get(tc.function.name);
       if (toolDef?.hitl) {
         emitter.emit({ type: "hitl-request", id: tc.id, safe_id: hitl.safeId(tc.id), tool: tc.function.name, args: parsedArgs });
-        const response = await hitl.waitForResponse(tc.id);
+        const response = await hitl.waitForResponse(tc.id, async () => {
+          for (const cmd of stdin.drain()) {
+            if (cmd.type === "hitl-response") {
+              await hitl.writeResponse(cmd.id, { decision: cmd.decision, data: cmd.data });
+            } else if (cmd.type === "cancel") {
+            }
+          }
+        });
         if (response.decision === "reject") {
           const rejectResult = JSON.stringify({ error: "User rejected this action." });
           emitter.emit({ type: "tool-result", id: tc.id, name: tc.function.name, output: rejectResult });

package/package.json

@@ -1,27 +1,27 @@
-{
-  "name": "@strayl/agent",
-  "version": "0.1.10",
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
-  "main": "dist/index.js",
-  "files": [
-    "dist",
-    "skills"
-  ],
-  "scripts": {
-    "build": "esbuild src/index.ts --bundle --platform=node --target=node20 --format=esm --outfile=dist/agent.js --external:fsevents",
-    "dev": "tsx watch src/index.ts"
-  },
-  "dependencies": {
-    "openai": "^5.8.0",
-    "zod": "^3.25.67"
-  },
-  "devDependencies": {
-    "esbuild": "^0.25.5",
-    "tsx": "^4.19.4",
-    "typescript": "^5.8.3",
-    "@types/node": "^22.15.31"
-  }
-}
+{
+  "name": "@strayl/agent",
+  "version": "0.1.12",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "dist/index.js",
+  "files": [
+    "dist",
+    "skills"
+  ],
+  "scripts": {
+    "build": "esbuild src/index.ts --bundle --platform=node --target=node20 --format=esm --outfile=dist/agent.js --external:fsevents",
+    "dev": "tsx watch src/index.ts"
+  },
+  "dependencies": {
+    "openai": "^5.8.0",
+    "zod": "^3.25.67"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.5",
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3",
+    "@types/node": "^22.15.31"
+  }
+}