portal-agent-cli 1.0.1 → 3.0.0

package/lib/turn.mjs

@@ -1,57 +1,118 @@
 import { send } from "./send.mjs";
 import { parseCalls, stripCalls } from "./parse.mjs";
-import { tools, getWs } from "./tools.mjs";
+import { TOOLS, SAFE_TOOLS } from "./tools/index.mjs";
+import { getWorkspace } from "./tools/path.mjs";
 import { buildSystem } from "./system.mjs";
+import { askApproval } from "./safety.mjs";
+import { reply, tool as logTool, toolResult, status } from "./log.mjs";
+import { theme } from "./theme.mjs";
+
+const REPEAT_WARN = 2;
+const REPEAT_STOP = 3;
+
+export async function runTurn(page, provider, prompt, config, session) {
+  const instructions = config.instructionsText || null;
+  const sys = buildSystem(getWorkspace(), instructions);
 
-export async function runTurn(page, provider, prompt, opts) {
-  const sys = buildSystem(getWs());
   const seen = new Map();
   let next = sys + "\n\nTask: " + prompt;
+  let approvedAlways = new Set(session.approvedAlways || []);
+  const newTools = [];
 
-  for (let i = 0; i < opts.maxSteps; i++) {
-    console.log("  waiting for " + provider.label + "...");
-    const r = await send(page, provider, next, opts.timeout);
+  for (let step = 0; step < config.maxSteps; step++) {
+    status("waiting for " + provider.label + "...");
+    const r = await send(page, provider, next, config.timeout);
     const calls = parseCalls(r);
 
     if (!calls.length) {
       const prose = stripCalls(r);
-      if (prose) console.log("\n" + prose + "\n");
+      reply(prose);
+      session.turns.push({ role: "user", text: prompt });
+      session.turns.push({ role: "assistant", text: prose });
+      session.approvedAlways = Array.from(approvedAlways);
+      session.updatedAt = Date.now();
       return;
     }
 
     const results = [];
-    let stop = false;
+    let stopped = false;
 
     for (const c of calls) {
       const sig = c.tool + ":" + JSON.stringify(c.args || {});
       const n = (seen.get(sig) || 0) + 1;
       seen.set(sig, n);
 
-      if (n >= 3) {
-        console.log("loop detected: " + c.tool + " repeated. stopping.");
-        stop = true;
+      if (n >= REPEAT_STOP) {
+        process.stdout.write(theme.error("x loop detected: " + c.tool +
+          " called " + n + " times with same args. stopping.") + "\n");
+        stopped = true;
         break;
       }
 
-      console.log("> " + c.tool + " " + JSON.stringify(c.args || {}).slice(0, 120));
+      if (n === REPEAT_WARN) {
+        process.stdout.write(theme.warn("! " + c.tool + " repeated " + n +
+          " times. warning the model.") + "\n");
+      }
+
+      logTool(c.tool, c.args);
+
+      // Approval gate for sensitive tools
+      const needsApproval = !config.yolo &&
+        !SAFE_TOOLS.has(c.tool) &&
+        !approvedAlways.has(c.tool);
+
+      if (needsApproval) {
+        const decision = await askApproval(c.tool, c.args);
+        if (decision === "no") {
+          const msg = "user denied " + c.tool;
+          toolResult(msg, true);
+          results.push("Tool: " + c.tool + "\nStatus: denied\n" + msg);
+          continue;
+        }
+        if (decision === "always") {
+          approvedAlways.add(c.tool);
+          newTools.push(c.tool);
+        }
+      }
 
       let out;
+      let isError = false;
       try {
-        const fn = tools[c.tool];
-        out = fn ? await fn(c.args || {}) : "unknown tool: " + c.tool;
+        const fn = TOOLS[c.tool];
+        if (!fn) {
+          out = "unknown tool: " + c.tool;
+          isError = true;
+        } else {
+          out = await fn(c.args || {});
+          if (typeof out === "string" && out.indexOf("failed") === 0) isError = true;
+        }
       } catch (e) {
         out = "error: " + (e.message || e);
+        isError = true;
       }
 
-      console.log("  " + String(out).slice(0, 240).split("\n").join("\n  "));
-      results.push(c.tool + ":\n" + out);
+      toolResult(out, isError);
+      results.push("Tool: " + c.tool + "\nResult:\n" + out);
+    }
+
+    if (stopped) {
+      session.turns.push({ role: "user", text: prompt });
+      session.turns.push({ role: "assistant", text: "(stopped: loop detected)" });
+      session.updatedAt = Date.now();
+      return;
     }
 
-    if (stop) return;
+    const footer = [
+      "Results above.",
+      "Do not repeat any call with the same arguments.",
+      "If the task is complete, reply with plain prose and no tool calls."
+    ].join("\n");
 
-    next = "Results:\n\n" + results.join("\n\n") +
-      "\n\nContinue. Do not repeat any call with the same arguments.";
+    next = "Tool results:\n\n" + results.join("\n\n") + "\n\n" + footer;
   }
 
-  console.log("max steps reached for this turn.");
+  process.stdout.write(theme.warn("max steps reached for this turn.") + "\n");
+  session.turns.push({ role: "user", text: prompt });
+  session.turns.push({ role: "assistant", text: "(max steps reached)" });
+  session.updatedAt = Date.now();
 }

package/lib/wait.mjs

@@ -6,27 +6,58 @@ export function norm(s) {
   return String(s || "").replace(/\s+/g, " ").trim();
 }
 
-export async function waitForComposer(page, p, ms) {
+export async function findFirstVisible(page, selectors, ms) {
   const end = Date.now() + ms;
-  let hint = Date.now();
   while (Date.now() < end) {
-    const loc = page.locator(p.input).last();
-    let ok = false;
-    try {
-      ok = await loc.isVisible({ timeout: 250 });
-    } catch (e) {
-      ok = false;
+    for (const sel of selectors) {
+      const loc = page.locator(sel).last();
+      try {
+        if (await loc.isVisible({ timeout: 200 })) return loc;
+      } catch (e) {
+        // try next selector
+      }
+    }
+    await sleep(200);
+  }
+  return null;
+}
+
+export async function waitForComposer(page, provider, ms) {
+  const end = Date.now() + ms;
+  let lastHint = Date.now();
+  while (Date.now() < end) {
+    for (const sel of provider.input) {
+      const loc = page.locator(sel).last();
+      let ok = false;
+      try {
+        ok = await loc.isVisible({ timeout: 200 });
+      } catch (e) {
+        ok = false;
+      }
+      if (ok) return loc;
     }
-    if (ok) return loc;
-    if (Date.now() - hint > 15000) {
+    if (Date.now() - lastHint > 15000) {
       const left = Math.round((end - Date.now()) / 1000);
       process.stdout.write("  waiting for login (" + left + "s left)\n");
-      hint = Date.now();
+      lastHint = Date.now();
     }
     await sleep(1000);
   }
   throw new Error(
-    "Timed out waiting for the composer. Log in to the provider " +
-    "and try again, or raise --login-timeout."
+    "Timed out waiting for the composer.\n" +
+    "Log in to the provider in the Chrome window and try again, " +
+    "or raise --login-timeout."
   );
 }
+
+export async function countMatching(page, selectors) {
+  for (const sel of selectors) {
+    try {
+      const n = await page.locator(sel).count();
+      if (n > 0) return n;
+    } catch (e) {
+      // try next
+    }
+  }
+  return 0;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "portal-agent-cli",
-  "version": "1.0.1",
-  "description": "Drive web AI products from the terminal with local tools. Enter-first submit, paste-safe insertion, prompt-echo skip, loop breaker.",
+  "version": "3.0.0",
+  "description": "Drive web AI products from the terminal with local tools. Multi-provider, session persistence, approval gate, undo.",
   "type": "module",
   "bin": {
     "portal-agent": "portal.mjs"
@@ -17,15 +17,11 @@
     "node": ">=20"
   },
   "scripts": {
-    "start": "node portal.mjs",
-    "build": "pkg portal.mjs --targets node18-win-x64 --output portal.exe"
+    "start": "node portal.mjs"
   },
   "dependencies": {
     "playwright": "^1.48.0"
   },
-  "devDependencies": {
-    "pkg": "^5.8.1"
-  },
   "keywords": [
     "browser",
     "automation",
@@ -34,8 +30,8 @@
     "agent",
     "deepseek",
     "chatgpt",
+    "gemini",
     "playwright"
   ],
-  "author": "kitadestin",
   "license": "MIT"
-}
+}

package/portal.mjs

@@ -1,13 +1,36 @@
 #!/usr/bin/env node
+//
+// portal-agent -- drive web AI products from the terminal with local tools.
+//
+// Entry point. Loads config, parses arguments, and dispatches to either the
+// interactive REPL or the one-shot exec mode.
+//
 import { parseArgs } from "./lib/args.mjs";
+import { loadConfig } from "./lib/config.mjs";
 import { runRepl } from "./lib/repl.mjs";
 import { runExec } from "./lib/exec.mjs";
+import { theme } from "./lib/theme.mjs";
 
-const opts = parseArgs();
+async function main() {
+  const opts = parseArgs();
+  const config = await loadConfig(opts);
 
-const task = opts.exec ? runExec(opts) : runRepl(opts);
+  if (config.verbose) {
+    process.stdout.write(theme.dim("config: " + JSON.stringify(config, null, 2)) + "\n");
+  }
 
-task.catch(function (e) {
-  console.error(e.message || e);
+  if (opts.exec) {
+    await runExec(config);
+  } else {
+    await runRepl(config);
+  }
+}
+
+main().catch(function (e) {
+  const msg = e && e.message ? e.message : String(e);
+  process.stderr.write(theme.error("fatal: " + msg) + "\n");
+  if (process.env.PORTAL_DEBUG) {
+    process.stderr.write(e.stack + "\n");
+  }
   process.exit(1);
 });

package/lib/tools.mjs

@@ -1,151 +0,0 @@
-import { readFile, writeFile, mkdir, readdir, stat } from "node:fs/promises";
-import { dirname, resolve, relative, sep, join } from "node:path";
-import { spawn } from "node:child_process";
-
-let ws = process.cwd();
-
-export function setWs(p) {
-  ws = resolve(p);
-}
-
-export function getWs() {
-  return ws;
-}
-
-const IGNORE = new Set([
-  "node_modules", ".git", ".hg", ".svn", "dist", "build", "out",
-  ".next", ".nuxt", ".turbo", ".cache", "target", "__pycache__",
-  ".venv", "venv", "env", "coverage", ".idea", ".vscode"
-]);
-
-function safe(p) {
-  const a = resolve(ws, p);
-  const r = relative(ws, a);
-  if (r === ".." || r.slice(0, 3) === "..\\" || r.slice(0, 3) === "../") {
-    throw new Error("path escapes workspace: " + p);
-  }
-  return a;
-}
-
-async function* walk(dir) {
-  let items;
-  try {
-    items = await readdir(dir, { withFileTypes: true });
-  } catch (e) {
-    return;
-  }
-  for (const it of items) {
-    if (IGNORE.has(it.name)) continue;
-    if (it.name.startsWith(".") && it.name !== ".env.example") continue;
-    const full = join(dir, it.name);
-    if (it.isDirectory()) yield* walk(full);
-    else if (it.isFile()) yield full;
-  }
-}
-
-export const tools = {
-  read_file: async function (a) {
-    const t = await readFile(safe(a.path), "utf8");
-    return t.length > 200000 ? t.slice(0, 200000) + "\n[truncated]" : t;
-  },
-
-  write_file: async function (a) {
-    const x = safe(a.path);
-    await mkdir(dirname(x), { recursive: true });
-    await writeFile(x, a.content || "", "utf8");
-    return "wrote " + (a.content || "").length + " bytes to " + a.path;
-  },
-
-  edit_file: async function (a) {
-    const x = safe(a.path);
-    const orig = await readFile(x, "utf8");
-    const n = orig.split(a.old_string).length - 1;
-    if (n === 0) return "old_string not found in " + a.path;
-    if (n > 1 && !a.replace_all) return "old_string appears " + n + " times";
-    const next = a.replace_all
-      ? orig.split(a.old_string).join(a.new_string)
-      : orig.replace(a.old_string, a.new_string);
-    await writeFile(x, next, "utf8");
-    return "edited " + a.path;
-  },
-
-  list_files: async function (a) {
-    const e = await readdir(safe(a.path || "."), { withFileTypes: true });
-    if (!e.length) return "EMPTY. Do not call list_files again.";
-    const names = e.map(function (x) {
-      return (x.isDirectory() ? "[dir] " : "      ") + x.name;
-    });
-    names.sort();
-    return names.join("\n");
-  },
-
-  grep_search: async function (a) {
-    let re;
-    try {
-      re = new RegExp(a.pattern, a.case_sensitive ? "" : "i");
-    } catch (e) {
-      return "bad regex: " + e.message;
-    }
-    const hits = [];
-    for await (const f of walk(ws)) {
-      if (hits.length >= 80) break;
-      let info;
-      try {
-        info = await stat(f);
-      } catch (e) {
-        continue;
-      }
-      if (info.size > 512000) continue;
-      let t;
-      try {
-        t = await readFile(f, "utf8");
-      } catch (e) {
-        continue;
-      }
-      const lines = t.split("\n");
-      for (let i = 0; i < lines.length && hits.length < 80; i++) {
-        if (re.test(lines[i])) {
-          const rel = relative(ws, f).split(sep).join("/");
-          hits.push(rel + ":" + (i + 1) + ":" + lines[i].trim().slice(0, 200));
-        }
-      }
-    }
-    return hits.length ? hits.join("\n") : "no matches";
-  },
-
-  shell: function (a) {
-    const cmd = String(a.command || "");
-    if (!cmd) return Promise.resolve("shell requires command");
-    return new Promise(function (done) {
-      const c = spawn(cmd, { cwd: ws, shell: true, windowsHide: true });
-      let o = "";
-      let e = "";
-      if (c.stdout) c.stdout.on("data", function (d) { o += String(d); });
-      if (c.stderr) c.stderr.on("data", function (d) { e += String(d); });
-      const to = setTimeout(function () {
-        c.kill();
-        done("timed out after 60s");
-      }, 60000);
-      c.on("error", function (err) {
-        clearTimeout(to);
-        done("error: " + err.message);
-      });
-      c.on("close", function (code) {
-        clearTimeout(to);
-        const both = [o.trim(), e.trim()].filter(Boolean).join("\n");
-        let s = "exit " + code + "\n" + (both || "(no output)");
-        if (s.length > 65000) s = s.slice(0, 65000) + "\n[truncated]";
-        done(s);
-      });
-    });
-  }
-};
-
-export const CATALOG = [
-  "- read_file(path, start_line?, end_line?)",
-  "- write_file(path, content)",
-  "- edit_file(path, old_string, new_string, replace_all?)",
-  "- list_files(path?)",
-  "- grep_search(pattern, case_sensitive?)",
-  "- shell(command)"
-].join("\n");