portal-agent-cli 3.0.3 → 3.0.5

package/lib/repl.mjs

@@ -1,237 +1,2 @@
 import { createInterface } from "node:readline";
-import { existsSync } from "node:fs";
-import { resolve } from "node:path";
-import { launch } from "./browser.mjs";
-import { getProvider, listProviders } from "./providers.mjs";
-import { waitForComposer } from "./wait.mjs";
-import { enableDeepThink } from "./deepthink.mjs";
-import { runTurn } from "./turn.mjs";
-import { setWorkspace, getWorkspace } from "./tools/path.mjs";
-import { setIgnore } from "./tools/walk.mjs";
-import { loadInstructions, activeInstructionFile } from "./instructions.mjs";
-import { newSessionId, saveSession, loadSession, listSessions } from "./sessions.mjs";
-import { theme } from "./theme.mjs";
-import { info, warn, error, ok } from "./log.mjs";
-
-export async function runRepl(config) {
-  const provider = getProvider(config.provider);
-  setWorkspace(config.ws);
-  setIgnore(config.ignored);
-
-  config.instructionsText = await loadInstructions(config.ws);
-
-  let session;
-  if (config.resume) {
-    session = await loadSession(config.resume);
-    if (!session) {
-      warn("session not found. starting fresh.");
-      session = newSession(config);
-    }
-  } else {
-    session = newSession(config);
-  }
-
-  process.stdout.write("\n");
-  process.stdout.write(theme.bold(theme.cyan("Portal")) + theme.dim(" v3.0.2") + "\n");
-  process.stdout.write(theme.dim("workspace: ") + theme.accent(getWorkspace()) + "\n");
-  process.stdout.write(theme.dim("provider:  ") + theme.accent(provider.label) + "\n");
-  process.stdout.write(theme.dim("session:   ") + theme.accent(session.id) + "\n");
-  if (config.instructionsText) {
-    process.stdout.write(theme.dim("instructions: ") +
-      theme.accent(activeInstructionFile() || "?") + "\n");
-  }
-  process.stdout.write("\n");
-
-  const ctx = await launch();
-  const page = await ctx.newPage();
-  page.setDefaultTimeout(30000);
-
-  info("opening " + provider.label + "...");
-  await page.goto(provider.url);
-
-  process.stdout.write("\n");
-  process.stdout.write(theme.yellow("Log in to " + provider.label +
-    " in the Chrome window.") + "\n");
-  process.stdout.write(theme.dim("Waiting up to " +
-    Math.round(config.loginTimeout / 1000) + "s.") + "\n");
-  process.stdout.write("\n");
-
-  await waitForComposer(page, provider, config.loginTimeout);
-
-  if (provider.deepthink) {
-    const on = await enableDeepThink(page);
-    if (on) process.stdout.write(theme.green("+ DeepThink enabled") + "\n");
-  }
-
-  ok(provider.label + " ready");
-  process.stdout.write(theme.dim("type /help for commands") + "\n");
-  process.stdout.write("\n");
-
-  const rl = createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    prompt: theme.user("> ")
-  });
-  rl.prompt();
-
-  let busy = false;
-  const queue = [];
-
-  async function drain() {
-    if (busy) return;
-    const next = queue.shift();
-    if (!next) return;
-    busy = true;
-    try {
-      await runTurn(page, provider, next, config, session);
-      await saveSession(session.id, session);
-    } catch (e) {
-      error(e.message || String(e));
-    }
-    busy = false;
-    process.stdout.write("\n");
-    rl.prompt();
-    if (queue.length > 0) drain();
-  }
-
-  rl.on("line", async function (line) {
-    const t = line.trim();
-    if (!t) { rl.prompt(); return; }
-
-    if (t === "/quit" || t === "/exit") { rl.close(); return; }
-    if (t === "/help") { help(); rl.prompt(); return; }
-    if (t === "/pwd") { process.stdout.write(getWorkspace() + "\n"); rl.prompt(); return; }
-    if (t === "/queue") { showQueue(queue); rl.prompt(); return; }
-    if (t === "/status") { showStatus(config, session, queue, busy); rl.prompt(); return; }
-    if (t === "/clear") { clearScreen(); rl.prompt(); return; }
-    if (t === "/deepthink") {
-      const on = await enableDeepThink(page);
-      process.stdout.write((on ? theme.ok("+") : theme.warn("!")) +
-        " DeepThink " + (on ? "on" : "not found") + "\n");
-      rl.prompt();
-      return;
-    }
-    if (t === "/providers") { showProviders(); rl.prompt(); return; }
-    if (t === "/sessions") { await showSessions(); rl.prompt(); return; }
-    if (t.slice(0, 4) === "/cd ") { changeDir(t.slice(4).trim()); rl.prompt(); return; }
-    if (t.slice(0, 10) === "/provider ") {
-      await changeProvider(t.slice(10).trim(), page, config, provider);
-      rl.prompt();
-      return;
-    }
-
-    if (busy) {
-      queue.push(t);
-      process.stdout.write(theme.dim("queued (" + queue.length + ")") + "\n");
-      rl.prompt();
-      return;
-    }
-    queue.push(t);
-    drain();
-  });
-
-  rl.on("close", async function () {
-    process.stdout.write("\n");
-    await saveSession(session.id, session).catch(function () {});
-    await ctx.close().catch(function () {});
-    process.stdout.write(theme.ok("+ done") + "\n");
-    process.exit(0);
-  });
-}
-
-function newSession(config) {
-  return {
-    id: newSessionId(),
-    ws: config.ws,
-    provider: config.provider,
-    turns: [],
-    approvedAlways: [],
-    startedAt: Date.now(),
-    updatedAt: Date.now()
-  };
-}
-
-function help() {
-  const lines = [
-    "COMMANDS",
-    "  /help              show this",
-    "  /cd <folder>       change workspace",
-    "  /pwd               show current workspace",
-    "  /provider <name>   switch provider",
-    "  /providers         list providers",
-    "  /deepthink         force DeepThink on",
-    "  /sessions          list saved sessions",
-    "  /queue             list pending tasks",
-    "  /status            session status",
-    "  /clear             clear screen",
-    "  /quit              exit"
-  ];
-  for (const l of lines) {
-    process.stdout.write((l.startsWith("  ") ? theme.dim(l) : theme.bold(l)) + "\n");
-  }
-}
-
-function showQueue(queue) {
-  if (!queue.length) { process.stdout.write(theme.dim("(empty)") + "\n"); return; }
-  process.stdout.write(theme.bold(queue.length + " waiting:") + "\n");
-  queue.forEach(function (x, i) {
-    process.stdout.write(theme.dim("  " + (i + 1) + ". ") + x + "\n");
-  });
-}
-
-function showStatus(config, session, queue, busy) {
-  process.stdout.write(theme.bold("session status") + "\n");
-  process.stdout.write(theme.dim("  id:        ") + session.id + "\n");
-  process.stdout.write(theme.dim("  workspace: ") + getWorkspace() + "\n");
-  process.stdout.write(theme.dim("  provider:  ") + session.provider + "\n");
-  process.stdout.write(theme.dim("  turns:     ") + session.turns.length + "\n");
-  process.stdout.write(theme.dim("  busy:      ") + (busy ? "yes" : "no") + "\n");
-  process.stdout.write(theme.dim("  queued:    ") + queue.length + "\n");
-}
-
-function showProviders() {
-  process.stdout.write(theme.bold("providers:") + "\n");
-  const list = listProviders();
-  for (const p of list) {
-    process.stdout.write(theme.dim("  " + p.id.padEnd(10)) + " " + p.label + "\n");
-  }
-}
-
-async function showSessions() {
-  const list = await listSessions();
-  if (!list.length) { process.stdout.write(theme.dim("(none)") + "\n"); return; }
-  process.stdout.write(theme.bold("sessions:") + "\n");
-  for (const s of list.slice(0, 15)) {
-    process.stdout.write(theme.dim("  " + s.id + "  " + s.provider +
-      "  " + s.turns + " turns") + "\n");
-  }
-}
-
-function changeDir(target) {
-  if (!target) {
-    process.stdout.write(theme.dim("usage: /cd <folder>") + "\n");
-    return;
-  }
-  const clean = target.replace(/^"|"$/g, "");
-  const abs = resolve(clean);
-  if (!existsSync(abs)) { warn("not found: " + abs); return; }
-  setWorkspace(abs);
-  ok("workspace: " + getWorkspace());
-}
-
-async function changeProvider(name, page, config, current) {
-  if (name === current.id) return;
-  let next;
-  try { next = getProvider(name); } catch (e) { error(e.message); return; }
-  info("switching to " + next.label + "...");
-  await page.goto(next.url);
-  await waitForComposer(page, next, 60000);
-  if (next.deepthink) await enableDeepThink(page);
-  config.provider = name;
-  ok("switched to " + next.label);
-}
-
-function clearScreen() {
-  process.stdout.write(String.fromCharCode(27) + "[2J");
-  process.stdout.write(String.fromCharCode(27) + "[H");
-}
+import { exists

package/lib/safety.mjs

@@ -1,32 +1,16 @@
-import { createInterface } from "node:readline";
 import { theme } from "./theme.mjs";
 
-export const SENSITIVE = new Set([
-  "shell",
-  "delete_file",
-  "move_file",
-  "write_file",
-  "edit_file"
-]);
-
+export const SENSITIVE = new Set(["shell", "delete_file", "move_file", "write_file", "edit_file"]);
 export const SAFE = new Set([
-  "read_file",
-  "list_files",
-  "find_files",
-  "grep_search",
-  "git_status",
-  "git_diff",
-  "git_log"
+  "read_file", "list_files", "find_files", "grep_search",
+  "git_status", "git_diff", "git_log"
 ]);
 
-export function isSensitive(name) {
-  return SENSITIVE.has(name);
-}
-
-export function isSafe(name) {
-  return SAFE.has(name);
-}
+export function isSensitive(name) { return SENSITIVE.has(name); }
+export function isSafe(name) { return SAFE.has(name); }
 
+// Read a single keypress from stdin. Does NOT open a second readline —
+// the main REPL owns stdin, so a new readline would eat the keystroke.
 export async function askApproval(toolName, args) {
   const preview = JSON.stringify(args || {}, null, 2).slice(0, 500);
   process.stdout.write("\n");
@@ -39,22 +23,37 @@ export async function askApproval(toolName, args) {
   if (preview.split("\n").length > 12) {
     process.stdout.write(theme.dim("  ...") + "\n");
   }
+  process.stdout.write(
+    theme.bold("  [y]") + "es  " +
+    theme.bold("[a]") + "lways  " +
+    theme.bold("[n]") + "o  > "
+  );
 
   return new Promise(function (resolve) {
-    const rl = createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-    rl.question(
-      theme.bold("  allow? ") + theme.ok("y") + "es / " +
-      theme.warn("a") + "lways / " + theme.error("n") + "o: ",
-      function (answer) {
-        rl.close();
-        const a = answer.trim().toLowerCase();
-        if (a === "y" || a === "yes") resolve("yes");
-        else if (a === "a" || a === "always") resolve("always");
-        else resolve("no");
+    let answered = false;
+
+    function onData(buf) {
+      if (answered) return;
+      const s = buf.toString("utf8").toLowerCase();
+      if (s.indexOf("y") >= 0) { answered = true; finish("yes"); }
+      else if (s.indexOf("a") >= 0) { answered = true; finish("always"); }
+      else if (s.indexOf("n") >= 0) { answered = true; finish("no"); }
+      else if (s.indexOf("\r") >= 0 || s.indexOf("\n") >= 0) {
+        answered = true; finish("no");
       }
-    );
+    }
+
+    function finish(answer) {
+      process.stdin.removeListener("data", onData);
+      try { process.stdin.setRawMode(false); } catch (e) {}
+      process.stdin.pause();
+      process.stdout.write(answer + "\n");
+      resolve(answer);
+    }
+
+    try { process.stdin.setRawMode(true); }
+    catch (e) { return resolve("no"); }
+    process.stdin.resume();
+    process.stdin.on("data", onData);
   });
 }

package/lib/send.mjs

@@ -5,17 +5,16 @@ import { theme } from "./theme.mjs";
 const SETTLE_MS = 1500;
 const POLL_MS = 150;
 
+// Stream the reply as it grows. Only prints the delta so the terminal does
+// not redraw the same text.
 function makeStreamer() {
   let printed = 0;
-  let lastLength = 0;
   return function (text) {
     if (!text) return;
     const t = String(text);
-    if (t.length > lastLength) {
-      const delta = t.slice(printed);
-      process.stdout.write(delta);
+    if (t.length > printed) {
+      process.stdout.write(t.slice(printed));
       printed = t.length;
-      lastLength = t.length;
     }
   };
 }
@@ -36,34 +35,28 @@ export async function send(page, provider, prompt, timeoutMs) {
   await sleep(300);
   if (provider.paste) await dismissPaste(page);
 
-  try {
-    await input.press("Enter");
-  } catch (e) {}
+  try { await input.press("Enter"); } catch (e) {}
 
   let ok = await composerEmpty(input, 5000);
   if (!ok) {
     const btn = await findFirstVisible(page, provider.submit, 1500);
-    if (btn) {
-      try { await btn.click({ timeout: 1500 }); } catch (e) {}
-    }
+    if (btn) { try { await btn.click({ timeout: 1500 }); } catch (e) {} }
     ok = await composerEmpty(input, 3000);
   }
 
-  if (!ok) {
-    throw new Error(
-      "Message stayed in composer. Check Chrome: if a Cancel/Send bar " +
-      "is showing, click Send once manually, then resend."
-    );
-  }
+  if (!ok) throw new Error("Message stayed in composer. Check Chrome.");
 
   return waitForReply(page, provider, want, timeoutMs);
 }
 
+// Returns { text, streamed }. If streamed is true, the caller should NOT
+// print the text again.
 async function waitForReply(page, provider, want, timeoutMs) {
   const end = Date.now() + timeoutMs;
   let last = "";
   let stab = Date.now();
   let sawAnything = false;
+  let streamedAny = false;
   const stream = makeStreamer();
 
   process.stdout.write("\n" + theme.cyan("* ") + " ");
@@ -75,25 +68,23 @@ async function waitForReply(page, provider, want, timeoutMs) {
       try { tx = (await node.textContent()) || ""; } catch (e) { tx = ""; }
       const n = norm(tx);
 
-      if (!n || n === want) {
-        await sleep(POLL_MS);
-        continue;
-      }
+      if (!n || n === want) { await sleep(POLL_MS); continue; }
 
       if (tx !== last) {
         stream(tx);
+        streamedAny = true;
         last = tx;
         stab = Date.now();
         sawAnything = true;
       } else if (sawAnything && Date.now() - stab > SETTLE_MS) {
         process.stdout.write("\n\n");
-        return tx;
+        return { text: tx, streamed: streamedAny };
       }
     }
     await sleep(POLL_MS);
   }
 
   process.stdout.write("\n\n");
-  if (last) return last;
-  throw new Error("Timed out waiting for a reply. Check the Chrome window.");
+  if (last) return { text: last, streamed: streamedAny };
+  throw new Error("Timed out waiting for a reply.");
 }

package/lib/sessions.mjs

@@ -1,64 +1 @@
-import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { homedir } from "node:os";
-
-function dir() {
-  return join(homedir(), ".portal-agent", "sessions");
-}
-
-export function newSessionId() {
-  const d = new Date();
-  const p = function (n, w) { return String(n).padStart(w || 2, "0"); };
-  return [
-    d.getFullYear(),
-    p(d.getMonth() + 1),
-    p(d.getDate()),
-    "-",
-    p(d.getHours()),
-    p(d.getMinutes()),
-    p(d.getSeconds())
-  ].join("");
-}
-
-export async function saveSession(id, data) {
-  const d = dir();
-  await mkdir(d, { recursive: true });
-  const path = join(d, id + ".json");
-  await writeFile(path, JSON.stringify(data, null, 2), "utf8");
-}
-
-export async function loadSession(id) {
-  const path = join(dir(), id + ".json");
-  try {
-    const raw = await readFile(path, "utf8");
-    return JSON.parse(raw);
-  } catch (e) {
-    return null;
-  }
-}
-
-export async function listSessions() {
-  const d = dir();
-  let names;
-  try {
-    names = await readdir(d);
-  } catch (e) {
-    return [];
-  }
-
-  const metas = [];
-  for (const n of names) {
-    if (!n.endsWith(".json")) continue;
-    const id = n.slice(0, -5);
-    const s = await loadSession(id);
-    if (!s) continue;
-    metas.push({
-      id: id,
-      provider: s.provider || "",
-      turns: (s.turns || []).length,
-      updatedAt: s.updatedAt || 0
-    });
-  }
-  metas.sort(function (a, b) { return b.updatedAt - a.updatedAt; });
-  return metas;
-}
+import

package/lib/system.mjs

@@ -2,43 +2,4 @@ import { CATALOG } from "./tools/index.mjs";
 
 export function buildSystem(ws, instructions) {
   const shown = ws.split("\\").join("/");
-  const isWin = process.platform === "win32";
-  const parts = [];
-
-  parts.push([
-    "You are a coding agent working in a terminal.",
-    "Workspace: " + shown,
-    "Platform: " + (isWin ? "Windows" : process.platform),
-    "",
-    "Think carefully about each step before acting. Explain your reasoning",
-    "when it helps the user follow along. Take as much space as the task",
-    "requires.",
-    "",
-    "In file paths inside tool arguments, use forward slashes (L:/this/file.txt).",
-    isWin
-      ? "In shell commands on Windows, use backslashes (del L:\\this\\file.txt)."
-      : "In shell commands, forward slashes are fine.",
-    "",
-    "Prefer purpose-built tools over shell. Use delete_file, not rm or del.",
-    "Do not call the same tool with the same arguments twice.",
-    "Read a file before editing it.",
-    "If a request is ambiguous, ask the user a real question.",
-    "When the task is complete, say so plainly and stop calling tools."
-  ].join("\n"));
-
-  if (instructions) parts.push(instructions);
-
-  parts.push([
-    "Tool call format:",
-    "",
-    "To call a tool, write on its own line:",
-    "portal-tool: {\"tool\":\"name\",\"args\":{\"key\":\"value\"}}",
-    "",
-    "The JSON must use double quotes. Plain text only, no backticks.",
-    "You may write narrative text around the tool calls."
-  ].join("\n"));
-
-  parts.push("Available tools:\n" + CATALOG);
-
-  return parts.join("\n\n");
-}
+  const isWin = process.pl

package/lib/theme.mjs

@@ -33,14 +33,10 @@ export const theme = {
   ok: function (s) { return wrap(BGRN, s); },
   yellow: function (s) { return wrap(YEL, s); },
   warn: function (s) { return wrap(YEL, s); },
-  blue: function (s) { return wrap(BLU, s); },
-  magenta: function (s) { return wrap(MAG, s); },
   cyan: function (s) { return wrap(BCYN, s); },
   accent: function (s) { return wrap(CYN, s); },
   user: function (s) { return wrap(BLU, s); },
   tool: function (s) { return wrap(MAG, s); }
 };
 
-export function colorEnabled() {
-  return MODE === "color";
-}
+export function colorEnabled() { return MODE === "color"; }

package/lib/tools/delete.mjs

@@ -1,25 +1,2 @@
 import { stat, rename } from "node:fs/promises";
-import { safePath } from "./path.mjs";
-
-export async function delete_file(args) {
-  const abs = safePath(args.path);
-  try {
-    const st = await stat(abs);
-    if (st.isDirectory()) return "delete_file cannot remove directories";
-    await rename(abs, abs + ".portal-trash");
-    return "moved " + args.path + " to trash";
-  } catch (e) {
-    return "delete_file failed: " + (e.message || e);
-  }
-}
-
-export async function move_file(args) {
-  const from = safePath(args.from);
-  const to = safePath(args.to);
-  try {
-    await rename(from, to);
-    return "moved " + args.from + " to " + args.to;
-  } catch (e) {
-    return "move_file failed: " + (e.message || e);
-  }
-}
+import { safePath } from "./

package/lib/tools/edit.mjs

@@ -1,46 +1 @@
-import { readFile, writeFile } from "node:fs/promises";
-import { safePath } from "./path.mjs";
-
-export async function edit_file(args) {
-  const abs = safePath(args.path);
-  const oldStr = String(args.old_string || "");
-  const newStr = String(args.new_string || "");
-
-  if (!oldStr) return "edit_file requires old_string";
-  if (oldStr === newStr) return "old_string and new_string are identical";
-
-  const orig = await readFile(abs, "utf8");
-  const count = orig.split(oldStr).length - 1;
-
-  if (count === 0) {
-    return "old_string not found in " + args.path +
-      ". Read the file first to see exact contents.";
-  }
-
-  if (count > 1 && !args.replace_all) {
-    return "old_string appears " + count + " times. Add context or set replace_all:true.";
-  }
-
-  const next = args.replace_all
-    ? orig.split(oldStr).join(newStr)
-    : orig.replace(oldStr, newStr);
-
-  await writeFile(abs + ".portal-bak", orig, "utf8");
-  await writeFile(abs, next, "utf8");
-
-  const delta = next.length - orig.length;
-  const noun = args.replace_all ? count + " occurrences" : "1 occurrence";
-  return "edited " + args.path + ": " + noun + " (" +
-    (delta >= 0 ? "+" : "") + delta + " bytes)";
-}
-
-export async function undo_file(args) {
-  const abs = safePath(args.path);
-  try {
-    const content = await readFile(abs + ".portal-bak", "utf8");
-    await writeFile(abs, content, "utf8");
-    return "restored " + args.path;
-  } catch (e) {
-    return "no backup for " + args.path;
-  }
-}
+import

package/lib/tools/find.mjs

@@ -1,39 +1,2 @@
 import { relative, sep } from "node:path";
-import { walk } from "./walk.mjs";
-import { toPosix, getWorkspace } from "./path.mjs";
-
-function globToRegex(glob) {
-  let re = "";
-  for (let i = 0; i < glob.length; i++) {
-    const c = glob[i];
-    if (c === "*") {
-      if (glob[i + 1] === "*") { re += ".*"; i++; }
-      else re += "[^/\\\\]*";
-    } else if (c === "?") {
-      re += ".";
-    } else if (".+^$(){}[]|\\".indexOf(c) >= 0) {
-      re += "\\" + c;
-    } else {
-      re += c;
-    }
-  }
-  return new RegExp("^" + re + "$", "i");
-}
-
-export async function find_files(args) {
-  const pattern = args.pattern || "*";
-  const re = globToRegex(pattern);
-  const ws = getWorkspace();
-  const hits = [];
-
-  for await (const f of walk(ws)) {
-    if (hits.length >= 200) break;
-    const rel = toPosix(relative(ws, f));
-    const base = f.split(sep).pop();
-    if (re.test(rel) || re.test(base)) hits.push(rel);
-  }
-
-  if (!hits.length) return "no files matched: " + pattern;
-  hits.sort();
-  return hits.length + " file(s):\n" + hits.join("\n");
-}
+import { walk } from "./walk.m