hostwares-cli 2.4.2 → 2.4.4

package/dist/index.js

@@ -1877,12 +1877,6 @@ async function runTurn(opts) {
   let assistantContent = null;
   let toolResults = [];
   let firstHop = true;
-  const callCounts = /* @__PURE__ */ new Map();
-  const writeCounts = /* @__PURE__ */ new Map();
-  let stalledHops = 0;
-  let totalGuardHits = 0;
-  let emptyHops = 0;
-  const MAX_EMPTY_RETRIES = 1;
   const steering = buildSteeringContext(host.cwd ?? process.cwd(), opts.message);
   const firstMessage = steering ? `${steering}
 
@@ -1897,7 +1891,6 @@ ${opts.message}` : opts.message;
         throw new AbortedError();
       emit({ type: "thinking" });
       const pending = [];
-      const textBefore = text.length;
       const done = await streamChat(credentials, {
         ...firstHop ? { message: firstMessage, images: opts.images } : { toolResults, assistantContent },
         conversationId,
@@ -1952,106 +1945,15 @@ ${opts.message}` : opts.message;
         }
       }
       firstHop = false;
-      if (!pending.length) {
-        const producedText = text.length > textBefore;
-        if (!producedText && hop > 0 && emptyHops < MAX_EMPTY_RETRIES) {
-          emptyHops++;
-          toolResults = [{
-            id: `empty-${hop}`,
-            result: `[continue] Your last turn was empty \u2014 no message and no tool call. Do NOT stop here. Look at what has been done so far in this conversation and take the NEXT concrete step toward the goal: create the next file, run the next command, or if the task is genuinely complete, give a short final answer stating what you built and how to run it. Act now.`
-          }];
-          assistantContent = assistantContent ?? "";
-          continue;
-        }
-        if (!producedText && emptyHops >= MAX_EMPTY_RETRIES) {
-          const wroteSomething = writeCounts.size > 0;
-          emit({ type: "error", message: wroteSomething ? `Stopping: the last steps returned nothing new. What I changed is saved \u2014 tell me the specific next change and I'll make it directly.` : `Stopping: I couldn't make progress on that. Tell me the specific step you want (e.g. "create the server file") and I'll do it directly.` });
-        }
+      if (!pending.length)
         break;
+      const ran = await executePending(pending, opts, emit, checkpoint);
+      if (ran === null) {
+        return finish({ conversationId, turnCredits, balance, text, aborted: true });
       }
-      emptyHops = 0;
-      const toRun = [];
-      const shortCircuited = [];
-      for (const call of pending) {
-        const fp = `${call.name}:${stableStringify(call.input)}`;
-        const seen = (callCounts.get(fp) ?? 0) + 1;
-        callCounts.set(fp, seen);
-        const path = typeof call.input?.path === "string" ? call.input.path : void 0;
-        if (seen > MAX_IDENTICAL_CALLS && isReadOnlyTool(call.name)) {
-          shortCircuited.push({
-            id: call.id,
-            result: `[loop guard] You already ran ${call.name}(${compactArgs(call.input)}) and nothing has changed since. This call was NOT executed. You are looping. If you have already written and verified the work this turn, STOP NOW and give your final answer \u2014 say what you changed, quote the check that passed, and end. Only continue calling tools if there is a concrete NEW change left to make; if so, make it directly instead of reading again.`
-          });
-          emit({ type: "tool:end", id: call.id, tool: call.name, ok: false, durationMs: 0, summary: "loop guard: repeated read skipped" });
-        } else if (WRITE_TOOLS.has(call.name) && path && (writeCounts.get(path) ?? 0) >= MAX_WRITES_PER_FILE) {
-          shortCircuited.push({
-            id: call.id,
-            result: `[loop guard] You have already written ${path} ${writeCounts.get(path)} times this turn \u2014 its content is on disk. This write was NOT executed. Stop rewriting it: verify it (run it / typecheck it) or give your final answer. Do not write this file again unless you are making a specific, different change.`
-          });
-          emit({ type: "tool:end", id: call.id, tool: call.name, ok: false, durationMs: 0, summary: "loop guard: write thrash skipped" });
-        } else {
-          toRun.push(call);
-        }
-      }
-      totalGuardHits += shortCircuited.length;
-      if (toRun.length === 0 && shortCircuited.length > 0)
-        stalledHops++;
-      else
-        stalledHops = 0;
-      if (stalledHops >= 2 || totalGuardHits >= 6) {
-        const wroteSomething = writeCounts.size > 0;
-        emit({ type: "error", message: wroteSomething ? `Stopping: I kept re-reading or rewriting the same files without making new progress. What I changed is saved; tell me specifically what to adjust next.` : `Stopping: I kept re-reading the same files without writing anything. I have enough context now \u2014 tell me the specific change you want and I'll make it directly.` });
-        return finish({ conversationId, turnCredits, balance, text, aborted: false });
-      }
-      for (const c2 of toRun) {
-        if (!MUTATION_TOOLS.has(c2.name))
-          continue;
-        const p = typeof c2.input?.path === "string" ? c2.input.path : void 0;
-        if (!p)
-          continue;
-        if (WRITE_TOOLS.has(c2.name))
-          writeCounts.set(p, (writeCounts.get(p) ?? 0) + 1);
-        for (const key of [...callCounts.keys()]) {
-          if (key.includes(JSON.stringify(p)))
-            callCounts.delete(key);
-        }
-      }
-      let results = shortCircuited;
-      if (toRun.length) {
-        const ran = await executePending(toRun, opts, emit, checkpoint);
-        if (ran === null) {
-          return finish({ conversationId, turnCredits, balance, text, aborted: true });
-        }
-        for (const call of toRun) {
-          if (!WRITE_TOOLS.has(call.name))
-            continue;
-          const res = ran.find((r) => r.id === call.id);
-          if (!res || /^Error:/i.test(res.result))
-            continue;
-          const path = String(call.input?.path ?? "");
-          if (!path)
-            continue;
-          let hookResults;
-          try {
-            hookResults = await runPostWriteHooks(host.cwd ?? process.cwd(), path);
-          } catch {
-            hookResults = [];
-          }
-          for (const h of hookResults) {
-            emit({ type: "tool:end", id: `${call.id}:${h.name}`, tool: h.name, ok: h.ok, durationMs: 0, summary: h.ok ? `${h.name} passed` : `${h.name} failed` });
-            res.result += h.ok ? `
-
-[${h.name}] passed on ${path}.` : `
-
-[${h.name}] FAILED after this write \u2014 fix before continuing:
-${h.output}`;
-          }
-        }
-        results = [...shortCircuited, ...ran];
-      }
-      toolResults = results;
+      toolResults = ran;
       if (hop === MAX_HOPS - 1) {
-        emit({ type: "error", message: `Paused after ${MAX_HOPS} steps to check in - this is a long task, not necessarily a finished one. Say "continue" and I'll pick up exactly where I left off.` });
+        emit({ type: "error", message: `Paused after ${MAX_HOPS} steps to check in \u2014 this is a long task, not necessarily a finished one. Say "continue" and I'll pick up exactly where I left off.` });
       }
     }
     emit({
@@ -2090,21 +1992,6 @@ function finish(r) {
     error: r.error
   };
 }
-function isReadOnlyTool(name) {
-  return READ_ONLY_TOOLS.has(name);
-}
-function stableStringify(v) {
-  if (v === null || typeof v !== "object")
-    return JSON.stringify(v);
-  if (Array.isArray(v))
-    return `[${v.map(stableStringify).join(",")}]`;
-  const o = v;
-  return `{${Object.keys(o).sort().map((k) => `${JSON.stringify(k)}:${stableStringify(o[k])}`).join(",")}}`;
-}
-function compactArgs(input) {
-  const s = Object.entries(input).map(([k, val]) => `${k}: ${JSON.stringify(val)}`).join(", ");
-  return s.length > 120 ? `${s.slice(0, 117)}...` : s;
-}
 async function executePending(calls, opts, emit, checkpoint) {
   const results = [];
   for (const call of calls) {
@@ -2192,7 +2079,25 @@ async function executePending(calls, opts, emit, checkpoint) {
     }
     const bytes = effect.kind === "wrote" || effect.kind === "modified" ? byteLength(call.input?.content) : void 0;
     emit({ type: "tool:end", id: call.id, tool: call.name, ok: !failed2, durationMs: Date.now() - started, effect, bytes });
-    results.push({ id: call.id, result: truncate(output) });
+    let resultText = output;
+    if (!failed2 && WRITE_TOOLS.has(call.name) && typeof call.input?.path === "string" && call.input.path) {
+      let hookResults;
+      try {
+        hookResults = await runPostWriteHooks(opts.host.cwd ?? process.cwd(), String(call.input.path));
+      } catch {
+        hookResults = [];
+      }
+      for (const h of hookResults) {
+        emit({ type: "tool:end", id: `${call.id}:${h.name}`, tool: h.name, ok: h.ok, durationMs: 0, summary: h.ok ? `${h.name} passed` : `${h.name} failed` });
+        resultText += h.ok ? `
+
+[${h.name}] passed on ${call.input.path}.` : `
+
+[${h.name}] FAILED after this write \u2014 fix before continuing:
+${h.output}`;
+      }
+    }
+    results.push({ id: call.id, result: truncate(resultText) });
   }
   return results;
 }
@@ -2240,7 +2145,7 @@ function targetOf(call) {
     return void 0;
   return s.length > 60 ? `${s.slice(0, 57)}\u2026` : s;
 }
-var MAX_HOPS, MAX_IDENTICAL_CALLS, MAX_WRITES_PER_FILE, MAX_RESULT_CHARS, READ_ONLY_TOOLS, MUTATION_TOOLS, WRITE_TOOLS;
+var MAX_HOPS, MAX_RESULT_CHARS, MUTATION_TOOLS, WRITE_TOOLS;
 var init_loop = __esm({
   "node_modules/@hostwares/agent-client/dist/esm/agent/loop.js"() {
     init_client();
@@ -2252,28 +2157,13 @@ var init_loop = __esm({
     init_subagents();
     init_safety();
     init_events();
-    MAX_HOPS = 50;
-    MAX_IDENTICAL_CALLS = 2;
-    MAX_WRITES_PER_FILE = 2;
+    MAX_HOPS = 80;
     MAX_RESULT_CHARS = 3e4;
-    READ_ONLY_TOOLS = /* @__PURE__ */ new Set([
-      "read_file",
-      "list_directory",
-      "search_files",
-      "file_search",
-      "get_system_info",
-      "list_processes",
-      "get_process_output",
-      "check_port",
-      "git_status",
-      "git_log",
-      "git_diff",
-      "docker_ps"
-    ]);
     MUTATION_TOOLS = /* @__PURE__ */ new Set([
       "write_file",
       "str_replace_file",
       "append_file",
+      "edit_file",
       "delete_path",
       "git_commit",
       "git_add",
@@ -2283,7 +2173,7 @@ var init_loop = __esm({
       "stop_process",
       "kill_process"
     ]);
-    WRITE_TOOLS = /* @__PURE__ */ new Set(["write_file", "str_replace_file", "append_file"]);
+    WRITE_TOOLS = /* @__PURE__ */ new Set(["write_file", "str_replace_file", "append_file", "edit_file"]);
   }
 });
 
@@ -3321,6 +3211,9 @@ async function runCliTurn(opts) {
           spinner.stop();
           error(e.message);
           break;
+        case "tool:pending":
+          spinner.stop();
+          break;
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hostwares-cli",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "Hostwares CLI - AI DevOps in your terminal",
   "type": "module",
   "main": "dist/index.js",
@@ -41,9 +41,9 @@
     "url": "https://github.com/Hostwares/hostwares-cli/issues"
   },
   "devDependencies": {
+    "@hostwares/agent-client": "github:Hostwares/hostwares-agent-client#v1",
     "@types/node": "^20.0.0",
-    "typescript": "^5.5.0",
     "esbuild": "^0.28.2",
-    "@hostwares/agent-client": "github:Hostwares/hostwares-agent-client#v1"
+    "typescript": "^5.5.0"
   }
 }