@tiens.nguyen/gu-cli 1.0.839 → 1.0.841

package/browser-command.mjs

@@ -140,7 +140,7 @@ export function allowIn(folder, allow = true) {
   writeFileSync(allowPath(), JSON.stringify({ folders }, null, 2));
 }
 
-export function browserReport({ connected, version, installType, refused = [], running = true, error = "" }, { allowed = false, storeUrl = STORE_URL } = {}) {
+export function browserReport({ connected, version, installType, refused = [], running = true, error = "" }, { allowed = false, storeUrl = STORE_URL, storeInstalled = false } = {}) {
   // The bridge itself would not start (#170): that is gu's fault, and says so — not "nothing to install".
   if (!running && error) {
     return [
@@ -174,9 +174,14 @@ export function browserReport({ connected, version, installType, refused = [], r
     "opens gu's own Chrome window (a separate profile — not signed in to your",
     "accounts) and works in it with a real mouse and keyboard.",
     // The link on a row of its own (#385): the published one is longer than a row beside the text.
-    ...(storeUrl
-      ? ["To let it use YOUR Chrome (your logins, a tab you share), add the gu", `extension: ${storeUrl}`]
-      : ["To let it use YOUR Chrome (your logins, a tab you share): /browser install"]),
+    // #386: which step is missing — added but not connected, or not added at all.
+    ...(storeUrl && storeInstalled
+      ? ["The gu extension is added to Chrome but not connected: keep Chrome open (it",
+        "connects within 30 s) — /browser install waits for it."]
+      : storeUrl
+        ? ["To let it use YOUR Chrome (your logins, a tab you share), add the gu",
+          "extension — /browser install guides you through it:", `  ${storeUrl}`]
+        : ["To let it use YOUR Chrome (your logins, a tab you share): /browser install"]),
     here,
     ...twoCopies,
   ];
@@ -319,6 +324,86 @@ export function findDevInstalls({ roots = browserRoots(), extDir = extensionDir(
   return found;
 }
 
+// THE PUBLISHED EXTENSION, FOUND IN CHROME'S OWN RECORDS (#386, GitHub #176). Its ID is fixed by the
+// store (the last part of the store URL), so a profile has it when its preferences list that ID
+// from anywhere but an unpacked folder. Disabled is told apart: it is installed but cannot connect.
+export const STORE_EXTENSION_ID = "ldfcjapmdbgdkdhlbdkbkiankneabagj";
+
+export function findStoreInstalls({ roots = browserRoots(), id = STORE_EXTENSION_ID } = {}) {
+  const found = [];
+  for (const { browser, dir } of roots) {
+    let profiles = [];
+    try {
+      profiles = readdirSync(dir).filter((p) => p === "Default" || /^Profile \d+$/.test(p));
+    } catch {
+      continue;
+    }
+    for (const profile of profiles) {
+      for (const file of ["Secure Preferences", "Preferences"]) {
+        let e;
+        try {
+          e = JSON.parse(readFileSync(join(dir, profile, file), "utf8"))?.extensions?.settings?.[id];
+        } catch {
+          continue;
+        }
+        if (!e || UNPACKED.has(e.location)) continue;
+        const reasons = Array.isArray(e.disable_reasons) ? e.disable_reasons.length : Number(e.disable_reasons) || 0;
+        found.push({ browser, profile, id, disabled: e.state === 0 || reasons > 0 });
+        break;
+      }
+    }
+  }
+  return found;
+}
+
+/**
+ * Where the install stands, and what to tell the user — PURE, so every stage can be tested.
+ * → { stage, lines }: "remove-dev" (a developer copy would block the store one, #148), "add" (not
+ * in Chrome yet), "enable" (added but switched off), "connect" (added, not connected yet), "done".
+ */
+export function installStage({ dev = [], store = [], status = {}, storeUrl = STORE_URL } = {}) {
+  if (status.connected && status.installType === "normal") {
+    return { stage: "done", lines: [`✓ gu browser is connected (Chrome Web Store, v${status.version ?? "?"}).`] };
+  }
+  if (dev.length) {
+    return {
+      stage: "remove-dev",
+      lines: [
+        "1. First remove the developer copy of gu browser — only one can connect.",
+        "   In chrome://extensions (gu opened it), click Remove on this one:",
+        ...dev.map((d) => `     ${d.browser} · ${d.profile} · ID ${d.id}`),
+        "   Waiting for it to be removed…",
+      ],
+    };
+  }
+  if (!store.length) {
+    return {
+      stage: "add",
+      lines: [
+        "1. Add gu browser to Chrome: on its store page, click \"Add to Chrome\".",
+        `   ${storeUrl}`,
+        "   (gu opened the page for you.) Waiting for it to be added…",
+      ],
+    };
+  }
+  if (store.every((s) => s.disabled)) {
+    return {
+      stage: "enable",
+      lines: [
+        "2. gu browser is added but switched off. In chrome://extensions, turn it on.",
+        "   Waiting for it to be turned on…",
+      ],
+    };
+  }
+  return {
+    stage: "connect",
+    lines: [
+      "2. gu browser is added. Waiting for it to connect to gu…",
+      "   Keep Chrome open — it connects within 30 s, or click its icon → Connect now.",
+    ],
+  };
+}
+
 // gu's own leftovers of the developer install, in ~/.gonext.
 export function localLeftovers() {
   return [extensionDir(), statePath(), seenPath(), logPath()].filter((p) => existsSync(p));

package/gonext_agent_chat.py

@@ -9511,6 +9511,52 @@ def _shell_exit_code(s: dict):
         return (None, None)
 
 
+def _shells_add_new(rec: dict) -> None:
+    """Append one record to shells.json under an exclusive lock, RE-READING the file inside the
+    lock so two overlapping turns do not overwrite each other's record (#387). _to_background used
+    to _shells_load() OUTSIDE any lock then _shells_save() the grown list — a concurrent reader's
+    own save in between silently dropped this record, and the repl's "N shells running (click)"
+    link disappeared for a live background task."""
+    import fcntl  # macOS/Linux posix lock; the workspace here is the user's Mac
+    import json as _json
+    import os
+    import time as _t
+    path = _shells_path()
+    lock_fd = os.open(path + ".lock", os.O_RDWR | os.O_CREAT, 0o644)
+    try:
+        fcntl.flock(lock_fd, fcntl.LOCK_EX)
+        # Re-read INSIDE the lock (the dict envelope {"shells": [...]} matches _shells_save).
+        try:
+            with open(path, encoding="utf-8") as fh:
+                shells = _json.load(fh).get("shells", [])
+        except Exception:  # noqa: BLE001
+            shells = []
+        shells = [s for s in shells if isinstance(s, dict) and s.get("pid")]
+        shells.append(rec)
+        # Same prune policy as _shells_save so the file stays bounded.
+        now = _t.time()
+        kept = []
+        for s in shells:
+            st = _shell_state(s, now=now)
+            if st["state"] != "running" and now - st["ended"] > _SHELLS_KEEP_DONE_S:
+                continue
+            kept.append(s)
+        kept = kept[-_SHELLS_KEEP:]
+        tmp = f"{path}.{os.getpid()}.tmp"
+        with open(tmp, "w", encoding="utf-8") as fh:
+            _json.dump({"shells": kept}, fh, indent=2)
+            fh.flush()
+            os.fsync(fh.fileno())
+        os.replace(tmp, path)  # the terminal polls this file — never let it read half of it
+        fcntl.flock(lock_fd, fcntl.LOCK_UN)
+    finally:
+        try:
+            os.close(lock_fd)
+        except OSError:
+            pass
+    _log(f"shells.json +1 → pid {rec.get('pid')} registered (#387)")
+
+
 def _shell_state(s: dict, alive=None, now=None) -> dict:
     """{state, code, runtime, ended} for a shell record. state: running | exited (0) | failed |
     killed | ended (gone, exit code unknown). `alive` is injectable so tests need no process."""
@@ -15575,14 +15621,12 @@ def run_agent_chat(cfg):
 
                 def _to_background(why: str) -> str:
                     """Leave the command running as a background shell; say so to the model."""
-                    shells = _shells_load()
-                    shells.append({
+                    _shells_add_new({
                         "id": str(proc.pid), "pid": proc.pid, "pgid": proc.pid,
                         "command": command, "workdir": wd, "log": log_path,
                         "exit_file": exit_path if _use_shell else "",
                         "started": start, "started_at": _t.strftime("%Y-%m-%d %H:%M:%S"),
                     })
-                    _shells_save(shells)
                     _emit({"type": "step", "text":
                            f"Running in background → {_trim_words(command)} (shell {proc.pid})"})
                     tail = _ws_distill_output(_read_log())
@@ -15673,6 +15717,15 @@ def run_agent_chat(cfg):
                         # waiting for it like any command; it hands off at the deadline if needed.
                         if ports and all(_ws_is_ephemeral_port(p_) for p_ in ports):
                             ports = []
+                        if ports and background:
+                            # AN EXPLICIT background=True STILL LANDS IN shells.json (#387, GitHub
+                            # #177). A shell that opens a port in its first 3s used to be filed ONLY
+                            # as a server here — so the repl bar read shells.json, found nothing
+                            # running, and showed no "N shells running (click)" link for a build the
+                            # model had just told the user was in the background.
+                            msg = _to_background("started (also listening)")
+                            _last_obs["text"] = msg
+                            return msg
                         if ports:
                             servers = _ws_load_servers()
                             servers.append({
@@ -15697,6 +15750,14 @@ def run_agent_chat(cfg):
                         # no port, so it would otherwise hit the timeout kill below and its
                         # window would be destroyed). Returning fast here also dodges the
                         # smolagents 60s executor cap that was killing the tool call.
+                        if background:
+                            # The window check above would classify it as an app and skip
+                            # shells.json entirely — the same missing-link bug as the port
+                            # branch (#387, GitHub #177). background=True asked for a shell,
+                            # so a shell it is.
+                            msg = _to_background("started (window open)")
+                            _last_obs["text"] = msg
+                            return msg
                         if _ws_gui_pids(proc.pid):
                             servers = _ws_load_servers()
                             servers.append({

package/gu-repl.mjs

@@ -139,7 +139,7 @@ import {
 import { completedFlush, splitLiveStream } from "./completed-flush.mjs";
 import { isScaffoldStep, isGroupableStep, stepGroupMark, stepGroupRows, relativizePaths } from "./step-group.mjs";
 import { clearLogsNoticeText } from "./clear-logs.mjs";
-import { allowIn, allowedIn, bridgeCommand, browserReport, bridgeStatus, extensionDir, findDevInstalls, helpInstall, installExtensionFiles, installSteps, localLeftovers, openExtensionsPage, openStorePage, removeLocalFiles, STORE_URL, stopBridge } from "./browser-command.mjs";
+import { allowIn, allowedIn, bridgeCommand, browserReport, bridgeStatus, extensionDir, findDevInstalls, helpInstall, installExtensionFiles, installSteps, localLeftovers, findStoreInstalls, installStage, openExtensionsPage, openStorePage, removeLocalFiles, STORE_URL, stopBridge } from "./browser-command.mjs";
 import { commandLogFile, killShell, logTail, markAnnounced, readShells, recapQuestion, shellsToRecap, statusText as shellStatusText, renderShellDetails, shellPanelRows, shellPickerLabel, shellState, shellsNotice } from "./shell-details.mjs";
 import { discoverSkills, matchSkillCommand } from "./skills.mjs";
 import { appendNew, archivePathFor, archivedWorkspaceKey, markReset, seedArchive } from "./conversation-archive.mjs";
@@ -9620,31 +9620,100 @@ function printShellDetails(rec) {
 // /browser (#363): the extension's connection, else how to install it.
 async function showBrowser() {
   const st = await bridgeStatus().catch(() => ({ running: false, connected: false }));
-  const lines = browserReport(st, { allowed: allowedIn(resolve(process.cwd())) });
+  const lines = browserReport(st, { allowed: allowedIn(resolve(process.cwd())), storeInstalled: findStoreInstalls().length > 0 });
   console.log("");
   for (const [i, l] of lines.entries()) console.log(GUTTER + (i === 0 && st.connected ? accent(l) : l.startsWith("⚠") ? yellow(l) : dim(l)));
   console.log("");
   paintBar();
 }
 
-// /browser install (#150): the extension, for the agent to use YOUR Chrome. Optional — gu's own
-// window needs nothing. The store page once published; until then the developer way.
+// /browser install (#150; guided since #386, GitHub #176): the published extension, for the agent to
+// use YOUR Chrome — the way Claude Code sets up its Chrome extension. gu walks it through to the end:
+// a developer copy is removed first (it would block the store one, #148), then the store page is
+// opened, and the panel in place of the input box (#384) shows each stage live until the store copy
+// is CONNECTED — or Esc stops waiting. gu's own window still needs none of this.
 async function browserInstall() {
-  let folder = extensionDir();
+  if (listPickerActive || approvalActive) return;
+  const done = (line) => {
+    console.log("\n" + GUTTER + line + "\n");
+    paintBar();
+  };
   if (!STORE_URL) {
+    // No published listing configured (GU_BROWSER_STORE_URL=""): the developer way, as before.
+    let folder = extensionDir();
     try {
       folder = installExtensionFiles();
     } catch (e) {
       console.log(GUTTER + yellow(`could not copy the extension to ${folder}: ${e.message}`));
     }
+    await bridgeStatus().catch(() => null);
+    console.log("");
+    for (const l of installSteps(folder, process.platform, "")) console.log(GUTTER + dim(l));
+    if (helpInstall(folder)) console.log(GUTTER + dim("(Opened chrome://extensions and copied the folder to your clipboard.)"));
+    console.log("");
+    paintBar();
+    return;
   }
-  await bridgeStatus().catch(() => null); // running, so a fresh install has something to connect to
-  console.log("");
-  for (const l of installSteps(folder)) console.log(GUTTER + dim(l));
-  // #385: the store link opens the STORE PAGE (it used to open chrome://extensions and say "Opened Chrome").
-  if (STORE_URL ? openStorePage() : helpInstall(folder)) console.log(GUTTER + dim(STORE_URL ? "(Opened the Chrome Web Store page.)" : "(Opened chrome://extensions and copied the folder to your clipboard.)"));
-  console.log("");
-  paintBar();
+  let status = await bridgeStatus().catch(() => ({ running: false, connected: false }));
+  const opened = new Set();
+  const state = () => {
+    const st = installStage({ dev: findDevInstalls(), store: findStoreInstalls(), status });
+    // Open the page each stage needs, once.
+    if (st.stage === "remove-dev" && !opened.has("ext")) { opened.add("ext"); openExtensionsPage(); }
+    if (st.stage === "add" && !opened.has("store")) { opened.add("store"); openStorePage(); }
+    if (st.stage === "enable" && !opened.has("ext2")) { opened.add("ext2"); openExtensionsPage(); }
+    return st;
+  };
+  let st = state();
+  if (st.stage === "done") return done(accent(st.lines[0]));
+  if (!barPinned()) {
+    // No zone to wait in: say what to do once.
+    console.log("");
+    for (const l of st.lines) console.log(GUTTER + dim(l));
+    console.log(GUTTER + dim("Then type /browser — it should say connected.") + "\n");
+    paintBar();
+    return;
+  }
+  let polling = false;
+  const poll = setInterval(async () => {
+    if (polling) return;
+    polling = true;
+    try {
+      status = await bridgeStatus({ waitMs: 0 }).catch(() => status);
+      st = state();
+      if (st.stage === "done") {
+        clearInterval(poll);
+        closeZonePanel();
+        done(accent(st.lines[0]) + dim("  The agent can use your Chrome now."));
+      }
+    } finally {
+      polling = false;
+    }
+  }, 2000);
+  openZonePanel({
+    refreshMs: 1000,
+    rows: (width) => {
+      // A row the panel would clip is WRAPPED instead: the store link is 84 characters, and a link
+      // cut short at 80 columns cannot be copied.
+      const room = Math.max(20, width - 1 - GUTTER.length);
+      const wrap = (l) => {
+        const out = [];
+        for (let rest = l; rest.length; rest = rest.slice(room)) out.push(rest.slice(0, room));
+        return out.length ? out : [""];
+      };
+      return [
+        GUTTER + bold(accent("Install gu browser")) + dim("  — so the agent can use your own Chrome"),
+        "",
+        ...st.lines.flatMap((l) => wrap(/https?:\/\//.test(l) ? l.trim() : l).map((r) => GUTTER + (/^\d\./.test(l) ? r : dim(r)))),
+        "",
+        GUTTER + dim("Esc to stop waiting · /browser install picks up where you left off"),
+      ];
+    },
+    onClose: () => {
+      clearInterval(poll);
+      if (st.stage !== "done") done(dim("(stopped waiting — /browser install picks up where you left off)"));
+    },
+  });
 }
 
 // /browser cleanup (#145, #147): remove the developer (unpacked) install so the Chrome Web Store
@@ -10761,7 +10830,11 @@ async function approvalPrompt(command) {
     process.stdout.write(
       "\n" + yellow("🌐 Allow gu to use a web browser?") + dim("  (no answer in ~3 min = Yes, this time)") + "\n" +
         dim(`  It wants to: ${what || "open a page"}`) + "\n" +
-        dim("  In your Chrome if the gu extension is there, else in gu's own Chrome window.") + "\n"
+        dim("  In your Chrome if the gu extension is there, else in gu's own Chrome window.") + "\n" +
+        // #386: the way to "your Chrome", said where the question is asked.
+        (STORE_URL && !findStoreInstalls().length
+          ? dim("  To use your own Chrome (your logins): /browser install adds the gu extension.") + "\n"
+          : "")
     );
     // "Yes, this time" is THE default (#380, GitHub #167): highlighted, so Enter allows it once, and
     // also what an unanswered question becomes — the countdown used to sit on "No", which read as

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.839",
+  "version": "1.0.841",
   "description": "Gu CLI — the gu terminal plus the local worker that runs agent / OCR / PDF / embedding jobs on your Mac (Ollama / MLX / OpenAI-compatible).",
   "type": "module",
   "license": "MIT",