@chipschat/opencode 1.0.4 → 1.0.6

package/README.md

@@ -11,6 +11,7 @@ server (`opencode serve`, 2.0).
 - A copy of an agent a person asks for in another room (Fork) is a copy of its session in its own
   room, in the same folder: it remembers what the agent did there, and from then on the two
   remember apart.
+- Restart on the harness's page restarts the OpenCode server the bridge runs (see [Restart](#restart)).
 
 Apache-2.0. Not published: a local repository until Chips's SDK is.
 
@@ -27,16 +28,18 @@ Apache-2.0. Not published: a local repository until Chips's SDK is.
 | Files in the reply | each `MEDIA:<path>` line of its own in the answer, taken out of the words and sent from the session's folder (the agent's own), as OpenCode says it (each turn is told how); a file outside it is refused, and the reply says so |
 | Cost and tokens | each model call's `session.step.ended`: OpenCode's own cost, as a step's share |
 | The context gauge | the last call's tokens against the model's window from `GET /api/model` |
-| An approval card | `permission.asked` → `POST …/permission/{id}/reply`: `always` when a person said always, else `once`; `reject` with their reason for a no. One answered in OpenCode's own apps is settled in Chips (ADR 0079) |
+| An approval card | `permission.asked` → `POST …/permission/{id}/reply`: `always` when a person said always, else `once`, and `once` for a command, which Chips remembers by how each part starts (Chips ADR 0239); `reject` with their reason for a no. One answered in OpenCode's own apps is settled in Chips (ADR 0079) |
 | A question | a `form.created` whose fields are choices or yes-or-no, at most four → `POST …/form/{id}/reply` |
 | Stop | `POST …/interrupt`, and the words OpenCode hasn't taken yet taken back |
 | A steer, a follow-up, an interrupt | a prompt with `delivery: "steer"`; with `"queue"`; interrupt, then a prompt |
 | Fork (Chips ADR 0087): a copy of an agent in another room | `POST /api/session/{id}/fork` of the agent's session in its room, which copies what it remembers; then `PATCH /api/session/{id}` names the copy for its room and marks it as the copy's. The copy is registered after it (*Nova · fork* for Nova), `forkedFrom` the original, for the room asked, and works in the original's folder. An ask heard again registers the same copy; an agent that never spoke in its room is copied as a new one with nothing to remember |
 | Not right? on an agent's reply (Chips ADR 0200), or a 👎 from an older device | a run of the agent who said it, in its session for the room, after its turns there: a prompt with its reply, what wasn't right, and to answer again in its place; the goal is *Looking again:* and the note's first line. A 👍, or any other reaction, is nothing |
 | Trouble on the harness | `GET /api/info` every 30 s |
+| Restart (Chips ADR 0094) | the bridge's own `opencode serve` stopped and started again on the same port and password; then `GET /api/info`: fine, or why it isn't back |
 
 OpenCode asks before anything its config and the agent don't allow (its rules fall back to "ask"),
-so its permission asks reach Chips as cards. An `always` there is saved by OpenCode as well.
+so its permission asks reach Chips as cards. An `always` there is saved by OpenCode as well; a
+command never gets one, so the next command comes back to Chips, whose rule answers it.
 
 When the event stream drops, OpenCode doesn't replay what was missed. When it's back, the bridge
 reads each turn's session: which words were taken, whether it is still working, and how its last
@@ -52,6 +55,30 @@ Not yet:
   bridge that joins with a code asks for `forks` as well.
 - More than one OpenCode server per bridge.
 
+## Restart
+
+Where the bridge runs OpenCode's server itself (no `url` in the config), a person can restart it
+from the harness's page in Chips (Chips ADR 0094). The bridge stops the server and starts it again
+on the same port and password, so its sessions, which OpenCode keeps on disk, go on where they
+were. A server it took up from before, left running by a bridge that was stopped hard, is stopped
+by the process it says it is. The bridge says nothing more until the server answers again, then
+says it is fine. If the server doesn't come back, it says why, in OpenCode's own words where it has
+them, ends the runs that were under way, and Chips offers Restart again. A restart stops whatever
+OpenCode was doing, as Chips's sheet says.
+
+A server you run yourself (`url` in the config) isn't the bridge's to restart. The bridge doesn't
+ask for `restarts` when it joins, and doesn't hear the ask. A harness joined one way and later
+configured the other keeps what it was granted when it joined:
+- Joined running its own server, then given a `url`: Chips still draws Restart, and answers it
+  with "Chips can't reach <its name> to restart it". Turn off *Be restarted from Chips* on the
+  harness's page.
+- Joined with a `url`, then running its own server: the bridge hears restarts, but Chips draws no
+  Restart until you turn on *Be restarted from Chips* on the harness's page.
+
+A link carries what the person chose on it, not what the bridge asks for. The gallery's card for
+OpenCode doesn't grant `restarts` yet, so a bridge joined from it gets Restart once you turn it on
+on its page.
+
 ## From Chips's gallery
 
 The card's line is `chips connect opencode '<link>'` (Chips ADR 0218). It downloads this bridge as the npm package

package/dist/THIRD-PARTY-NOTICES.md

@@ -1,6 +1,6 @@
 # Third-party notices
 
-`dist/main.js` in @chipschat/opencode 1.0.4 carries these packages, bundled in. Each one's
+`dist/main.js` in @chipschat/opencode 1.0.6 carries these packages, bundled in. Each one's
 licence follows.
 
 ## @chipschat/harness 0.0.0 (Apache-2.0)

package/dist/main.js

@@ -25698,6 +25698,9 @@ async function failureOf(answer) {
 
 // src/bridge.ts
 var WANTS = ["agents", "new_agents", "forks"];
+function wantsFor(ownServer2) {
+  return ownServer2 ? [...WANTS, "restarts"] : WANTS;
+}
 function freeFolder(root, name, taken) {
   const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "agent";
   for (let count = 1; ; count += 1) {
@@ -25708,6 +25711,7 @@ function freeFolder(root, name, taken) {
 var ids = createIdGenerator();
 var QUIET_MS = 1500;
 var INTERRUPTING = "interrupting";
+var TROUBLE_CHARS = 200;
 var LOOKS_KEPT = 500;
 var REPLY_CHARS = 1500;
 var KINDS = {
@@ -25760,6 +25764,12 @@ var Bridge = class {
   health;
   listening = new AbortController();
   connections = 0;
+  /** Opens the event stream again now, rather than once its wait is over. */
+  wake;
+  /** A person's Restart under way: nothing is said of how it is meanwhile (Chips ADR 0094). */
+  restarting;
+  /** Why OpenCode's server isn't there, where the bridge knows more than that it doesn't answer. */
+  why;
   /** Register the agents, start hearing OpenCode and what is said in Chips, and say how it is. */
   async start() {
     const { chips: chips2 } = this.options;
@@ -25790,6 +25800,37 @@ var Bridge = class {
     if (this.health !== void 0) clearInterval(this.health);
     this.listening.abort();
   }
+  /**
+   * A person's Restart (Chips ADR 0094): the server stopped and started again, then how it is,
+   * fine or why not. Asked again meanwhile, it is the same restart. Nothing where the bridge
+   * doesn't run the server, which never says it hears restarts.
+   */
+  restart() {
+    this.restarting ??= (async () => {
+      try {
+        await this.restartServer();
+      } finally {
+        this.restarting = void 0;
+      }
+      await this.sayHowItIs();
+    })();
+    return this.restarting;
+  }
+  async restartServer() {
+    const again2 = this.options.restartServer;
+    if (again2 === void 0) return;
+    this.log("a person asked for a restart");
+    try {
+      await again2();
+      this.why = void 0;
+      this.wake?.();
+    } catch (error62) {
+      const why = messageOf(error62).replace(/\s+/g, " ").trim();
+      this.why = why.length <= TROUBLE_CHARS ? why : `${why.slice(0, TROUBLE_CHARS - 1)}\u2026`;
+      this.log(`OpenCode's server isn't back: ${why}`);
+      for (const turn of this.turns.values()) turn.end({ outcome: "failed", why: "OpenCode didn't come back after a restart" });
+    }
+  }
   /** The Main agent, the first registered, once started: who says the harness's first words. */
   get mainAgentId() {
     return this.agents[0]?.agentId;
@@ -25823,11 +25864,17 @@ var Bridge = class {
     const there = known.find((agent) => agent.agentId !== main2.agentId && agent.spaces.includes(home3));
     await chips2.agents.attach(main2.agentId, { spaceId: home3, replacing: there?.agentId ?? chips2.harnessId }).catch((error62) => this.log(`${main2.name} stays out of its home: ${String(error62)}`));
   }
-  /** Trouble while the server doesn't answer, and fine once it does (ADR 0083). */
+  /**
+   * Trouble while the server doesn't answer, and fine once it does (ADR 0083). Nothing while a
+   * restart is under way: its end says (ADR 0094).
+   */
   async sayHowItIs() {
+    if (this.restarting !== void 0) return;
     const up = await this.options.opencode.healthy();
+    if (this.restarting !== void 0) return;
+    if (up) this.why = void 0;
     const chips2 = this.options.chips;
-    await (up ? chips2.reportOk() : chips2.reportTrouble("OpenCode isn't answering")).catch(() => void 0);
+    await (up ? chips2.reportOk() : chips2.reportTrouble(this.why ?? "OpenCode isn't answering")).catch(() => void 0);
   }
   /** OpenCode's event stream, opened again whenever it drops, a little later each time it fails. */
   async listen() {
@@ -25841,8 +25888,15 @@ var Bridge = class {
         if (this.listening.signal.aborted) return;
         this.log(`OpenCode's events: ${messageOf(error62)}`);
       }
-      await new Promise((resolve5) => setTimeout(resolve5, wait2));
-      wait2 = Math.min(wait2 * 2, 15e3);
+      const woken = await new Promise((resolve5) => {
+        const timer = setTimeout(() => resolve5(false), wait2);
+        this.wake = () => {
+          clearTimeout(timer);
+          resolve5(true);
+        };
+      });
+      this.wake = void 0;
+      wait2 = woken ? first : Math.min(wait2 * 2, 15e3);
     }
   }
   /**
@@ -26043,7 +26097,7 @@ var Bridge = class {
       return;
     }
     let end2 = () => void 0;
-    const ended = new Promise((resolve5) => {
+    const ended2 = new Promise((resolve5) => {
       end2 = resolve5;
     });
     const turn = {
@@ -26076,7 +26130,7 @@ var Bridge = class {
       const words4 = `${steer.from?.display_name ?? "The person"} adds: ${steer.text}`;
       void this.steered(turn, words4, steer.mode);
     });
-    const last = await ended;
+    const last = await ended2;
     await turn.chain;
     if (this.turns.get(sessionId) === turn) this.turns.delete(sessionId);
     if (last.outcome === "succeeded") await this.finish(turn);
@@ -26442,7 +26496,12 @@ var Bridge = class {
     if (decision === void 0 || pending === void 0 || pending.answered) return;
     pending.answered = true;
     if (decision.allowed && toolCall !== void 0) turn.allowed.set(toolCall, approvalId);
-    await this.options.opencode.replyPermission(askingSession, requestId, decisionOf(decision), decision.allowed ? void 0 : decision.reason).catch((error62) => this.log(`OpenCode didn't take the answer: ${messageOf(error62)}`));
+    await this.options.opencode.replyPermission(
+      askingSession,
+      requestId,
+      decisionOf(decision, card.action.kind === "shell.exec"),
+      decision.allowed ? void 0 : decision.reason
+    ).catch((error62) => this.log(`OpenCode didn't take the answer: ${messageOf(error62)}`));
   }
   /** A permission answered in OpenCode's own apps: settled in Chips, once, so the card cools (ADR 0079). */
   async settled(turn, data) {
@@ -26580,9 +26639,9 @@ var Bridge = class {
     if (retryable) void this.sayHowItIs();
   }
 };
-function decisionOf(decision) {
+function decisionOf(decision, command = false) {
   if (!decision.allowed) return "reject";
-  return decision.scope === "always" ? "always" : "once";
+  return decision.scope === "always" && !command ? "always" : "once";
 }
 function questionOf(field, title2) {
   const prompt = (field.description ?? field.title ?? title2).slice(0, 500);
@@ -26797,6 +26856,7 @@ var ServerError = class extends Error {
   missing;
   name = "ServerError";
 };
+var sleep = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 var onPath = (command, env) => command.includes("/") ? existsSync5(command) : (env["PATH"] ?? "").split(delimiter2).some((folder2) => {
   if (folder2 === "") return false;
   try {
@@ -26817,18 +26877,22 @@ async function freePort() {
   });
   return await tryPort(4096) ?? await tryPort(0) ?? 4096;
 }
-async function answers2(url2, password) {
+async function infoOf(url2, password) {
   try {
     const answer = await fetch(`${url2}/api/info`, {
       headers: { authorization: `Basic ${Buffer.from(`opencode:${password}`).toString("base64")}` },
       signal: AbortSignal.timeout(2e3)
     });
-    if (answer.ok) return "ok";
+    if (answer.ok) return await answer.json().catch(() => ({})) ?? {};
     return answer.status === 401 ? "refused" : "none";
   } catch {
     return "none";
   }
 }
+async function answers2(url2, password) {
+  const info = await infoOf(url2, password);
+  return typeof info === "string" ? info : "ok";
+}
 function keptIn(path) {
   if (!existsSync5(path)) return void 0;
   try {
@@ -26838,27 +26902,41 @@ function keptIn(path) {
     return void 0;
   }
 }
+function alive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error62) {
+    return error62.code === "EPERM";
+  }
+}
+async function ended(pid, ms) {
+  for (const signal of ["SIGTERM", "SIGKILL"]) {
+    try {
+      process.kill(pid, signal);
+    } catch {
+      return;
+    }
+    for (const by = Date.now() + (signal === "SIGTERM" ? ms : 2e3); alive(pid) && Date.now() < by; ) await sleep(50);
+    if (!alive(pid)) return;
+  }
+}
 async function ownServer(options) {
   const env = options.env ?? process.env;
   const command = options.command ?? "opencode";
   const log2 = options.log ?? (() => void 0);
   const path = join7(options.folder, "server.json");
   let kept = keptIn(path);
+  let before = false;
   if (kept !== void 0) {
-    const url3 = `http://127.0.0.1:${kept.port}`;
-    const now = await answers2(url3, kept.password);
-    if (now === "ok") {
-      log2(`OpenCode's server from before is still answering at ${url3}`);
-      return { url: url3, password: kept.password, stop: () => void 0 };
-    }
+    const now = await answers2(`http://127.0.0.1:${kept.port}`, kept.password);
+    before = now === "ok";
     if (now === "refused") kept = { port: await freePort(), password: kept.password };
   }
-  if (!onPath(command, env)) {
+  if (!before && !onPath(command, env)) {
     throw new ServerError("OpenCode isn't installed on this machine: install it (opencode.ai), then run this again.", true);
   }
   kept ??= { port: await freePort(), password: randomBytes(24).toString("base64url") };
-  writeFileSync4(path, `${JSON.stringify(kept, null, 2)}
-`, { mode: 384 });
   const { port, password } = kept;
   const url2 = `http://127.0.0.1:${port}`;
   let child;
@@ -26866,8 +26944,11 @@ async function ownServer(options) {
   let answered = false;
   let failed;
   let wait2 = 2e3;
+  let again2;
   const said = [];
   const start = () => {
+    writeFileSync4(path, `${JSON.stringify({ port, password }, null, 2)}
+`, { mode: 384 });
     const started = spawn(command, ["serve", "--hostname", "127.0.0.1", "--port", String(port)], {
       cwd: options.cwd,
       env: { ...env, OPENCODE_PASSWORD: password },
@@ -26889,9 +26970,10 @@ async function ownServer(options) {
         return;
       }
       log2(`OpenCode's server stopped (${signal ?? `exit ${code}`}): starting it again in ${wait2 / 1e3} s`);
-      setTimeout(() => {
-        if (!stopping) start();
-      }, wait2).unref();
+      again2 = setTimeout(() => {
+        if (!stopping && child === void 0) start();
+      }, wait2);
+      again2.unref();
       wait2 = Math.min(wait2 * 2, 6e4);
     });
     started.on("error", (error62) => {
@@ -26900,25 +26982,68 @@ async function ownServer(options) {
     });
     child = started;
   };
-  start();
-  const by = Date.now() + (options.waitMs ?? 3e4);
-  while (await answers2(url2, password) !== "ok") {
-    if (failed !== void 0 || Date.now() > by) {
-      stopping = true;
-      child?.kill("SIGTERM");
-      const last = said.slice(-3).join(" ").trim();
-      throw new ServerError(`OpenCode's server didn't start at ${url2}${last === "" ? "" : `: ${last}`}`);
+  const up = async (anew) => {
+    stopping = false;
+    answered = false;
+    failed = void 0;
+    said.length = 0;
+    start();
+    const by = Date.now() + (options.waitMs ?? 3e4);
+    while (await answers2(url2, password) !== "ok") {
+      if (failed !== void 0 || Date.now() > by) {
+        stopping = true;
+        child?.kill("SIGTERM");
+        const last = said.slice(-3).join(" ").trim();
+        throw new ServerError(`OpenCode's server didn't start${anew ? " again" : ""} at ${url2}${last === "" ? "" : `: ${last}`}`);
+      }
+      await sleep(250);
+    }
+    answered = true;
+    wait2 = 2e3;
+  };
+  const down = async () => {
+    stopping = true;
+    clearTimeout(again2);
+    const stopMs = options.stopMs ?? 1e4;
+    const pid = child?.pid;
+    if (pid !== void 0) return ended(pid, stopMs);
+    const info = await infoOf(url2, password);
+    if (typeof info === "string") return;
+    if (typeof info["pid"] !== "number" || info["pid"] <= 0 || info["pid"] === process.pid) {
+      throw new ServerError(
+        `OpenCode's server at ${url2} was running before this bridge and doesn't say which process it is: stop it on this machine, then restart again.`
+      );
     }
-    await new Promise((resolve5) => setTimeout(resolve5, 250));
+    await ended(info["pid"], stopMs);
+  };
+  if (before) log2(`OpenCode's server from before is still answering at ${url2}`);
+  else {
+    await up(false);
+    log2(`OpenCode's own server answering at ${url2}`);
   }
-  answered = true;
-  log2(`OpenCode's own server answering at ${url2}`);
+  let restarting;
+  const restart = async () => {
+    if (!onPath(command, env)) {
+      throw new ServerError("OpenCode isn't installed on this machine any more: install it (opencode.ai), then restart again.", true);
+    }
+    log2(`restarting OpenCode's server at ${url2}`);
+    await down();
+    await up(true);
+    log2(`OpenCode's server is answering again at ${url2}`);
+  };
   return {
     url: url2,
     password,
     stop: () => {
       stopping = true;
+      clearTimeout(again2);
       child?.kill("SIGTERM");
+    },
+    restart: () => {
+      restarting ??= restart().finally(() => {
+        restarting = void 0;
+      });
+      return restarting;
     }
   };
 }
@@ -27068,20 +27193,24 @@ var joined = await join3({
   url: process.env["CHIPS_URL"],
   name: config2.name,
   software: "chips-opencode 1.0.0",
-  wants: WANTS,
+  wants: wantsFor(server !== void 0),
   onCode: (code) => log(`Allow this harness in Chips: ${code}`)
 }).catch(refused2);
 keepIfAsked(LABEL, joined.url, [config2.passwordEnv], log, () => server?.stop());
 var state = existsSync7(statePath) ? JSON.parse(readFileSync7(statePath, "utf8")) : { sessions: {} };
+var bridge;
 var chips = await connect({
   url: joined.url,
   token: joined.token,
   client: { name: "chips-opencode", version: "1.0.0" },
-  store: fileStore(join9(folder, "chips-state.json"))
+  store: fileStore(join9(folder, "chips-state.json")),
+  // A person's Restart (Chips ADR 0094), heard only where the bridge runs OpenCode's server: one a
+  // person runs themselves isn't the bridge's to restart, so this connection doesn't say it hears them.
+  ...server === void 0 ? {} : { onRestart: () => bridge?.restart() }
 });
 var git = await checkGit();
 if (!git.ok) log(`rooms' projects are off: ${git.why}`);
-var bridge = new Bridge({
+bridge = new Bridge({
   chips,
   opencode,
   projects: git.ok,
@@ -27091,6 +27220,7 @@ var bridge = new Bridge({
   saveState: (next) => writeFileSync5(statePath, `${JSON.stringify(next, null, 2)}
 `, { mode: 384 }),
   log,
+  restartServer: server?.restart,
   ...config2.directory === void 0 ? { folders: config2.folders } : {}
 });
 await bridge.start();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chipschat/opencode",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "OpenCode as a Chips harness, on its V2 server (opencode serve): each OpenCode agent a Chips agent, each room an OpenCode session.",
   "license": "Apache-2.0",
   "type": "module",