@tiens.nguyen/gu-cli 1.0.840 → 1.0.841

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.840",
+  "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",