hostwares-cli 2.4.3 → 2.4.5

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,113 +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 \u2014 re-reading it will keep returning the same thing. This call was NOT executed. STOP re-inspecting and DECIDE from what you already know: if a file the task needs does not exist yet, WRITE it now (write_file) \u2014 an empty or missing directory means the file has not been created, not that you should look again. If every file the task needs already exists and has been run/verified, give your final answer now (what you built + how to run it) and end. Do NOT read or list 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;
-      const wroteThisHop = toRun.some((c2) => WRITE_TOOLS.has(c2.name));
-      if (wroteThisHop) {
-        stalledHops = 0;
-      }
-      const filesWritten = writeCounts.size;
-      const guardHitCeiling = 6 + filesWritten * 3;
-      const stallCeiling = filesWritten > 0 ? 4 : 2;
-      if (stalledHops >= stallCeiling || totalGuardHits >= guardHitCeiling) {
-        const wroteSomething = filesWritten > 0;
-        emit({ type: "error", message: wroteSomething ? `Stopping: I kept re-reading the same files without making new progress. What I built so far is saved. Tell me the specific next change (e.g. "write the UI file" / "start it") and I'll do it directly.` : `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({
@@ -2097,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) {
@@ -2151,14 +2031,14 @@ async function executePending(calls, opts, emit, checkpoint) {
     let oldContent = null;
     if (WRITE_TOOLS.has(call.name) && typeof call.input?.path === "string" && call.input.path) {
       try {
-        const { readFileSync: readFileSync9, existsSync: existsSync8 } = await import("fs");
-        const { resolve: pathResolve2, join: join9 } = await import("path");
-        const { homedir: homedir5 } = await import("os");
+        const { readFileSync: readFileSync10, existsSync: existsSync9 } = await import("fs");
+        const { resolve: pathResolve2, join: join10 } = await import("path");
+        const { homedir: homedir6 } = await import("os");
         const raw = String(call.input.path);
-        const expanded = raw === "~" ? homedir5() : raw.startsWith("~/") ? join9(homedir5(), raw.slice(2)) : raw;
+        const expanded = raw === "~" ? homedir6() : raw.startsWith("~/") ? join10(homedir6(), raw.slice(2)) : raw;
         const abs = pathResolve2(expanded);
-        if (existsSync8(abs))
-          oldContent = readFileSync9(abs, "utf8");
+        if (existsSync9(abs))
+          oldContent = readFileSync10(abs, "utf8");
         else
           oldContent = "";
       } catch {
@@ -2199,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;
 }
@@ -2247,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();
@@ -2259,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",
@@ -2290,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"]);
   }
 });
 
@@ -2838,9 +2721,9 @@ var init_device = __esm({
 });
 
 // src/index.ts
-import { readFileSync as readFileSync8 } from "fs";
+import { readFileSync as readFileSync9 } from "fs";
 import { fileURLToPath } from "url";
-import { dirname as dirname4, join as join8 } from "path";
+import { dirname as dirname4, join as join9 } from "path";
 
 // src/agent/run.ts
 init_esm();
@@ -3000,6 +2883,9 @@ async function pickScope(options) {
 init_theme();
 init_render();
 init_esm();
+import { existsSync as existsSync7, readFileSync as readFileSync7, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, renameSync as renameSync2, chmodSync as chmodSync2 } from "fs";
+import { join as join7 } from "path";
+import { homedir as homedir5 } from "os";
 var READ_ONLY = /* @__PURE__ */ new Set([
   "read_file",
   "list_directory",
@@ -3040,6 +2926,40 @@ function permissionRules() {
   }
   return cachedRules;
 }
+function reloadPermissionRules() {
+  cachedRules = null;
+}
+function saveGlobalPermissionRule(rule) {
+  const { HW_DIR: HW_DIR2 } = getHwDir();
+  const file = join7(HW_DIR2, "permissions.json");
+  let rules = [];
+  try {
+    if (existsSync7(file)) {
+      const parsed = JSON.parse(readFileSync7(file, "utf8"));
+      const arr = Array.isArray(parsed) ? parsed : Array.isArray(parsed?.rules) ? parsed.rules : [];
+      rules = arr.filter((r) => !!r && typeof r.tool === "string" && ["allow", "ask", "deny"].includes(r.effect));
+    }
+  } catch {
+    rules = [];
+  }
+  const exists = rules.some((r) => r.tool === rule.tool && (r.match ?? "") === (rule.match ?? "") && r.effect === rule.effect);
+  if (!exists) rules.push(rule);
+  try {
+    if (!existsSync7(HW_DIR2)) mkdirSync5(HW_DIR2, { recursive: true, mode: 448 });
+    const tmp = join7(HW_DIR2, `permissions.json.tmp-${process.pid}`);
+    writeFileSync5(tmp, JSON.stringify(rules, null, 2) + "\n", { mode: 384 });
+    renameSync2(tmp, file);
+    try {
+      chmodSync2(file, 384);
+    } catch {
+    }
+  } catch {
+  }
+  reloadPermissionRules();
+}
+function getHwDir() {
+  return { HW_DIR: join7(homedir5(), ".hostwares") };
+}
 function isProjectTrusted(cwd = process.cwd()) {
   return (getConfig().trustedProjects ?? []).includes(cwd);
 }
@@ -3084,15 +3004,11 @@ ${c.yellow(glyph.caret)} ${describe(tool)}
       const toolPath = String(tool.input.path ?? tool.input.localPath ?? "");
       const rel = toolPath ? shortRel(toolPath) : "";
       const dir = rel ? rel.split("/").slice(0, -1).join("/") || "." : "";
-      const scopeOpts = [
-        `Specific paths      \u2192 ${rel || tool.name}  ${c.dim("(this file only)")}`,
-        `Complete directory  \u2192 ${dir || "."}  ${c.dim("(all files here)")}`,
-        `Entire Tool         \u2192 *  ${c.dim(`(always allow '${tool.name}')`)}`
-      ];
       const displayOpts = [
         `Specific paths      \u2192 ${rel || tool.name}`,
         `Complete directory  \u2192 ${dir || "."}`,
-        `Entire Tool         \u2192 *`
+        `Entire Tool         \u2192 *  (this session)`,
+        `Always, everywhere  \u2192 ${tool.name} (never ask again \u2014 saved)`
       ];
       const choice = await pickScope(displayOpts);
       if (choice === -1) return "abort";
@@ -3106,9 +3022,14 @@ ${c.yellow(glyph.caret)} ${describe(tool)}
         addSessionRule({ tool: tool.name, match, effect: "allow" });
         process.stdout.write(`  ${c.dim(`Trusted '${tool.name}' for ${match} this session.`)}
 `);
-      } else {
+      } else if (choice === 2) {
         addSessionRule({ tool: tool.name, match: "*", effect: "allow" });
         process.stdout.write(`  ${c.dim(`Trusted '${tool.name}' (*) this session.`)}
+`);
+      } else {
+        addSessionRule({ tool: tool.name, match: "*", effect: "allow" });
+        saveGlobalPermissionRule({ tool: tool.name, match: "*", effect: "allow" });
+        process.stdout.write(`  ${c.green(glyph.tick)} ${c.dim(`Always allowing '${tool.name}' everywhere \u2014 saved to ~/.hostwares/permissions.json. You won't be asked again.`)}
 `);
       }
       return "allow";
@@ -3406,13 +3327,13 @@ init_config();
 // src/session/store.ts
 init_config();
 import { createHash } from "crypto";
-import { join as join7 } from "path";
-import { existsSync as existsSync7, readFileSync as readFileSync7, readdirSync as readdirSync5, unlinkSync as unlinkSync2, mkdirSync as mkdirSync5 } from "fs";
-var SESSION_DIR = join7(HW_DIR, "sessions");
+import { join as join8 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync8, readdirSync as readdirSync5, unlinkSync as unlinkSync2, mkdirSync as mkdirSync6 } from "fs";
+var SESSION_DIR = join8(HW_DIR, "sessions");
 var SCHEMA_VERSION = 2;
 function sessionPath(cwd) {
   const hash = createHash("sha256").update(cwd).digest("hex").slice(0, 24);
-  return join7(SESSION_DIR, `${hash}.json`);
+  return join8(SESSION_DIR, `${hash}.json`);
 }
 function newSession(cwd = process.cwd()) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -3428,9 +3349,9 @@ function newSession(cwd = process.cwd()) {
 }
 function loadSession(cwd = process.cwd()) {
   const file = sessionPath(cwd);
-  if (!existsSync7(file)) return null;
+  if (!existsSync8(file)) return null;
   try {
-    const data = JSON.parse(readFileSync7(file, "utf8"));
+    const data = JSON.parse(readFileSync8(file, "utf8"));
     if (data.version !== SCHEMA_VERSION) return null;
     if (data.cwd !== cwd) return null;
     if (!Array.isArray(data.turns)) return null;
@@ -3452,7 +3373,7 @@ function isTurn(t) {
 }
 var MAX_LOCAL_TURNS = 200;
 function saveSession(session) {
-  mkdirSync5(SESSION_DIR, { recursive: true, mode: 448 });
+  mkdirSync6(SESSION_DIR, { recursive: true, mode: 448 });
   session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
   if (session.turns.length > MAX_LOCAL_TURNS) {
     session.turns = session.turns.slice(-MAX_LOCAL_TURNS);
@@ -3463,12 +3384,12 @@ function appendTurn(session, role, content) {
   session.turns.push({ role, content, at: (/* @__PURE__ */ new Date()).toISOString() });
 }
 function listSessions() {
-  if (!existsSync7(SESSION_DIR)) return [];
+  if (!existsSync8(SESSION_DIR)) return [];
   const out = [];
   for (const name of readdirSync5(SESSION_DIR)) {
     if (!name.endsWith(".json")) continue;
     try {
-      const data = JSON.parse(readFileSync7(join7(SESSION_DIR, name), "utf8"));
+      const data = JSON.parse(readFileSync8(join8(SESSION_DIR, name), "utf8"));
       if (data.version !== SCHEMA_VERSION || !data.cwd) continue;
       out.push({
         cwd: data.cwd,
@@ -4011,7 +3932,7 @@ async function listSites() {
 function readVersion() {
   try {
     const here = dirname4(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(readFileSync8(join8(here, "..", "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync9(join9(here, "..", "package.json"), "utf8"));
     return pkg.version ?? "0.0.0";
   } catch {
     return "0.0.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hostwares-cli",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "Hostwares CLI - AI DevOps in your terminal",
   "type": "module",
   "main": "dist/index.js",