@chipschat/opencode 1.0.14 → 1.0.16

package/README.md

@@ -92,7 +92,7 @@ each model call and tells the agent what changed, so an edit applies from its ne
 
 - The agent's own, which a person may change from its page: its folder's `AGENTS.md`, shown empty
   until there is one, and any file `instructions` finds in its folder.
-- The harness's own set, on its page: `~/chips-opencode/agents/AGENTS.md`, which every agent
+- The harness's own set, on its page: `~/Chips/Agents/opencode/AGENTS.md`, which every agent
   reads and a person may change; any `AGENTS.md` above it; and your own, with the files
   `instructions` names elsewhere, which your own OpenCode reads too, so they are shown and not
   changed.
@@ -163,7 +163,7 @@ first. The steps below run the bridge from this checkout instead, to work on it.
    ```
 
    The bridge runs OpenCode's server itself (`opencode serve` on `127.0.0.1`, 4096 when it is
-   free), with a password it makes and keeps in `~/.chips-opencode/server.json`, readable by you
+   free), with a password it makes and keeps in `~/Chips/.bridges/opencode/server.json`, readable by you
    only: nobody starts a server or makes up a password. While the bridge runs, a server that stops
    is started again; when the bridge stops, so does its server.
 
@@ -177,13 +177,22 @@ first. The steps below run the bridge from this checkout instead, to work on it.
    two answer twice. The key Chips gives it is kept; a new link from Chips replaces it. Or join with
    `CHIPS_URL` and a code a person allows.
 
-3. Optionally, name the agents in `~/.chips-opencode/config.json` (see `config.example.json`).
+3. Optionally, name the agents in `~/Chips/.bridges/opencode/config.json` (see `config.example.json`).
    Without a config it is OpenCode's `build` agent, named OpenCode.
 
-   Each agent's sessions work in a folder of its own, `~/chips-opencode/agents/<its name>`, made
+   Each agent's sessions work in a folder of its own, `~/Chips/Agents/opencode/<its name>`, made
    the first time it is spoken to and kept after a rename; `folders` moves them. A `directory`
    puts every session in that one project instead, a repository the agents share.
 
+   Everything the bridge keeps is under `~/Chips` (Chips ADR 0283): its config, sessions, server
+   password and state in `~/Chips/.bridges/opencode`, the agents' folders in
+   `~/Chips/Agents/opencode`, where its own server runs from. Until 1.0.15 they were
+   `~/.chips-opencode` and `~/chips-opencode/agents`. The first start of 1.0.15 moves them and the
+   folder paths it saved, and once OpenCode answers, asks it to move each session of a folder that
+   moved (`POST /api/session/:id/move`), with everything said in it: OpenCode won't use a session
+   whose folder is gone. It renames and never copies; where something is at the new place already it
+   moves in what isn't there yet and says in its log what it left.
+
    **A server of your own.** To use an `opencode serve` you run yourself, give its password in the
    environment variable `passwordEnv` names (`OPENCODE_PASSWORD` by default, never in the file),
    and its `url` in the config when it isn't `127.0.0.1:4096`. `npm run keep` takes the password

package/dist/THIRD-PARTY-NOTICES.md

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

package/dist/main.js

@@ -8,9 +8,8 @@ var __export = (target, all) => {
 };
 
 // src/main.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "node:fs";
-import { homedir as homedir7 } from "node:os";
-import { dirname as dirname5, join as join10, resolve as resolve4 } from "node:path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "node:fs";
+import { dirname as dirname6, join as join10 } from "node:path";
 
 // node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -5106,7 +5105,7 @@ function isRecursive(inst, stack, resolve5) {
     }
     return answer;
   };
-  const merge2 = (answer) => {
+  const merge3 = (answer) => {
     if (answer > result)
       result = answer;
   };
@@ -5115,7 +5114,7 @@ function isRecursive(inst, stack, resolve5) {
   switch (kind) {
     case "object": {
       const raw = rawShape(def);
-      merge2(raw ? shape(raw, true) : ASSUMED);
+      merge3(raw ? shape(raw, true) : ASSUMED);
       check2(def.catchall);
       break;
     }
@@ -5165,7 +5164,7 @@ function isRecursive(inst, stack, resolve5) {
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
       const inner = def._cachedInner ?? (resolve5 ? inst._zod.innerType : void 0);
-      merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
+      merge3(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
     // a leaf by choice: `parts` are regex fragments, not data positions
@@ -23398,8 +23397,8 @@ var Project = class {
       const end2 = all.findIndex((line, at) => at > start && line.startsWith(">>>>>>> "));
       if (start < 0 || end2 < 0)
         return void 0;
-      const shown = all.slice(Math.max(0, start - 1), end2 + 2);
-      return shown.length <= MARKED_LINES ? shown.join("\n") : [...shown.slice(0, MARKED_LINES - 1), "\u2026"].join("\n");
+      const shown2 = all.slice(Math.max(0, start - 1), end2 + 2);
+      return shown2.length <= MARKED_LINES ? shown2.join("\n") : [...shown2.slice(0, MARKED_LINES - 1), "\u2026"].join("\n");
     } catch {
       return void 0;
     }
@@ -25304,7 +25303,7 @@ async function ask(url2, options, send, machine) {
   if (asked.status !== 201)
     throw await refused(asked);
   const { request_id, secret, code, interval } = await asked.json();
-  const show = options.onCode ?? ((shown, where) => process.stderr.write(`Allow ${options.name} in Chips at ${where}. Its code is ${shown}.
+  const show = options.onCode ?? ((shown2, where) => process.stderr.write(`Allow ${options.name} in Chips at ${where}. Its code is ${shown2}.
 `));
   show(code, url2);
   for (; ; ) {
@@ -25871,9 +25870,9 @@ import { globSync, readFileSync as readFileSync5, statSync } from "node:fs";
 import { mkdir as mkdir2, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname4, isAbsolute as isAbsolute2, join as join5, relative, sep as sep2 } from "node:path";
 var AGENTS_MD = "AGENTS.md";
-function placesOf(env, home3) {
-  const config3 = env["OPENCODE_CONFIG_DIR"] || join5(env["XDG_CONFIG_HOME"] || join5(home3, ".config"), "opencode");
-  return { home: home3, config: config3 };
+function placesOf(env, home) {
+  const config3 = env["OPENCODE_CONFIG_DIR"] || join5(env["XDG_CONFIG_HOME"] || join5(home, ".config"), "opencode");
+  return { home, config: config3 };
 }
 function hashOf(text2) {
   return createHash2("sha256").update(text2, "utf8").digest("hex");
@@ -25901,7 +25900,7 @@ function upTo(dir, stop2) {
   }
   return dirs;
 }
-function namedFiles(sources, folder2, root, home3) {
+function namedFiles(sources, folder2, root, home) {
   const found = [];
   const glob = (pattern, cwd) => {
     try {
@@ -25912,7 +25911,7 @@ function namedFiles(sources, folder2, root, home3) {
   };
   for (const source2 of sources) {
     if (/^https?:\/\//i.test(source2)) continue;
-    const expanded = source2.startsWith("~/") ? join5(home3, source2.slice(2)) : source2;
+    const expanded = source2.startsWith("~/") ? join5(home, source2.slice(2)) : source2;
     const matches = isAbsolute2(expanded) ? glob(expanded.slice(dirname4(expanded).length + 1), dirname4(expanded)) : upTo(folder2, within(folder2, root) ? root : folder2).flatMap((dir) => glob(expanded, dir));
     for (const path of matches.sort()) if (isFile(path) && !found.includes(path)) found.push(path);
   }
@@ -25932,15 +25931,15 @@ var ContextFiles = class {
   }
   places;
   folders;
-  /** `~/chips-opencode/agents/AGENTS.md`, or the whole path where it isn't in the home. */
+  /** `~/Chips/Agents/opencode/AGENTS.md`, or the whole path where it isn't in the home. */
   tilde(path) {
-    const { home: home3 } = this.places;
-    return within(path, home3) ? `~${path.slice(home3.length)}` : path;
+    const { home } = this.places;
+    return within(path, home) ? `~${path.slice(home.length)}` : path;
   }
   /** A shared file's name: where it is, a step at a time (`~ › .config › opencode › AGENTS.md`), with no slash. */
   crumbs(path) {
-    const { home: home3 } = this.places;
-    const steps = within(path, home3) ? ["~", ...relative(home3, path).split(sep2)] : ["/", ...path.split(sep2)];
+    const { home } = this.places;
+    const steps = within(path, home) ? ["~", ...relative(home, path).split(sep2)] : ["/", ...path.split(sep2)];
     return steps.filter((step) => step !== "").join(" \u203A ").slice(0, 255);
   }
   /**
@@ -26249,6 +26248,13 @@ var OpenCodeClient = class {
     const metadata = data["metadata"];
     return { id: id2, metadata: typeof metadata === "object" && metadata !== null ? metadata : {} };
   }
+  /**
+   * A session moved to another folder (2.0.25), with everything said in it; the session's context
+   * says it moved. It works where the old folder is gone, as after Chips ADR 0283's move.
+   */
+  async moveSession(sessionId, directory) {
+    await this.call("POST", `/api/session/${encodeURIComponent(sessionId)}/move`, { directory });
+  }
   /** A session's title, or its metadata, which this replaces whole. */
   async update(sessionId, changes) {
     await this.call("PATCH", `/api/session/${encodeURIComponent(sessionId)}`, {
@@ -26720,10 +26726,10 @@ var Bridge = class {
   }
   /** The Main agent into the harness's own room, in the place of whichever of ours is there. */
   async goHome(main2, known) {
-    const { chips: chips2, home: home3 } = this.options;
-    if (home3 === void 0 || main2.spaces.includes(home3)) return;
-    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)}`));
+    const { chips: chips2, home } = this.options;
+    if (home === void 0 || main2.spaces.includes(home)) return;
+    const there2 = known.find((agent) => agent.agentId !== main2.agentId && agent.spaces.includes(home));
+    await chips2.agents.attach(main2.agentId, { spaceId: home, replacing: there2?.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). Nothing while a
@@ -26838,7 +26844,7 @@ var Bridge = class {
    * that isn't one of the harness's has no copy, nor has an ask the room stopped waiting for.
    */
   async makeCopy(fork) {
-    const { chips: chips2, opencode: opencode2, state: state2, saveState } = this.options;
+    const { chips: chips2, opencode: opencode2, state: state2, saveState: saveState2 } = this.options;
     const spaceId = fork.space_id;
     if (spaceId === void 0) return;
     const late = Date.now() - Date.parse(fork.ts);
@@ -26869,7 +26875,7 @@ var Bridge = class {
       const folder2 = await this.folderFor({ who, agent });
       kept = { ...copied === void 0 ? {} : { session: copied.id }, ...folder2 === void 0 ? {} : { folder: folder2 } };
       state2.forks = { ...state2.forks, [fork.id]: kept };
-      saveState(state2);
+      saveState2(state2);
     }
     const copy = await chips2.agents.register({
       key: `opencode:fork:${fork.id}`,
@@ -26882,7 +26888,7 @@ var Bridge = class {
     if (kept.folder !== void 0) state2.folders = { ...state2.folders, [copy.agentId]: kept.folder };
     const pick2 = state2.models?.[who];
     if (pick2 !== void 0) state2.models = { ...state2.models, [copy.agentId]: pick2 };
-    saveState(state2);
+    saveState2(state2);
     if (copied !== void 0) {
       await opencode2.update(copied.id, {
         title: `Chips space ${spaceId}`,
@@ -26947,7 +26953,7 @@ var Bridge = class {
   async modelChanged(change) {
     const whose = await this.whoseIs(change.agent_id);
     if (whose === void 0) throw new Refuse("This harness has no such agent.");
-    const { opencode: opencode2, state: state2, saveState } = this.options;
+    const { opencode: opencode2, state: state2, saveState: saveState2 } = this.options;
     let pick2;
     try {
       pick2 = pickOf(change, await opencode2.models());
@@ -26958,7 +26964,7 @@ var Bridge = class {
     if (pick2 === null) delete models[whose.who];
     else models[whose.who] = pick2;
     state2.models = models;
-    saveState(state2);
+    saveState2(state2);
     const name = await this.nameOf(whose);
     this.log(`${name} runs on ${pick2 === null ? "its default" : `${pick2.model}${pick2.effort === void 0 ? "" : ` at ${pick2.effort}`}`}, from Chips`);
     const copy = await this.modelCopyOf(change.agent_id);
@@ -26996,7 +27002,7 @@ var Bridge = class {
    */
   async readingOf(folder2) {
     const { opencode: opencode2 } = this.options;
-    const { home: home3 } = this.places;
+    const { home } = this.places;
     let root = this.roots.get(folder2);
     if (root === void 0) {
       root = await opencode2.projectRoot(folder2).catch(() => folder2);
@@ -27007,7 +27013,7 @@ var Bridge = class {
       () => false
     );
     const sources = await this.readsNamed ? await opencode2.instructions(folder2).catch(() => []) : [];
-    return { stop: within(folder2, home3) ? home3 : root, named: namedFiles(sources, folder2, root, home3) };
+    return { stop: within(folder2, home) ? home : root, named: namedFiles(sources, folder2, root, home) };
   }
   /** Each agent of the harness's, with the folder its sessions work in and what OpenCode reads there. */
   async agentReadings() {
@@ -27353,7 +27359,7 @@ var Bridge = class {
   }
   /** The words into the room's session: the one it had, or a new one when OpenCode no longer has it. */
   async give({ id: id2, who, agent, spaceId }, said, rules) {
-    const { opencode: opencode2, state: state2, saveState } = this.options;
+    const { opencode: opencode2, state: state2, saveState: saveState2 } = this.options;
     let kept = state2.sessions[id2];
     if (kept === void 0 && this.copying.size > 0) {
       await Promise.allSettled(this.copying.values());
@@ -27377,7 +27383,7 @@ var Bridge = class {
       metadata: { chips_space: spaceId, chips_agent: who }
     });
     state2.sessions[id2] = made;
-    saveState(state2);
+    saveState2(state2);
     return { sessionId: made, given: await this.prompted(made, said(made), rules) };
   }
   /**
@@ -27385,14 +27391,14 @@ var Bridge = class {
    * kept by whose it is, so a rename doesn't move it. None without `folders`: the project's.
    */
   async folderFor({ who, agent }) {
-    const { folders: root, state: state2, saveState } = this.options;
+    const { folders: root, state: state2, saveState: saveState2 } = this.options;
     if (root === void 0) return void 0;
     let folder2 = state2.folders?.[who];
     if (folder2 === void 0) {
       const name = await this.nameOf({ who, agent });
       folder2 = freeFolder(root, name, Object.values(state2.folders ?? {}));
       state2.folders = { ...state2.folders, [who]: folder2 };
-      saveState(state2);
+      saveState2(state2);
     }
     mkdirSync4(folder2, { recursive: true });
     return folder2;
@@ -28044,12 +28050,60 @@ function lastLine(said) {
 }
 
 // src/keep.ts
-import { homedir as homedir5 } from "node:os";
-import { basename as basename3, join as join7, resolve as resolve2 } from "node:path";
+import { basename as basename3 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
+
+// src/places.ts
+import { existsSync as existsSync5 } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { isAbsolute as isAbsolute3, join as join7, relative as relative2, resolve as resolve2, sep as sep3 } from "node:path";
+function placesOf2(home = homedir5()) {
+  return {
+    settings: join7(home, "Chips", ".bridges", "opencode"),
+    agents: join7(home, "Chips", "Agents", "opencode"),
+    oldSettings: join7(home, ".chips-opencode"),
+    oldAgents: join7(home, "chips-opencode", "agents")
+  };
+}
+var fromHome = (path, home = homedir5()) => path === "~" ? home : path.startsWith("~/") ? join7(home, path.slice(2)) : path;
+function inside2(root, path) {
+  const under = relative2(root, path);
+  return under === ".." || under.startsWith(`..${sep3}`) || isAbsolute3(under) ? void 0 : under;
+}
+function nowAt(path, before2, after) {
+  const under = inside2(before2, path);
+  if (under === void 0) return path;
+  const moved = join7(after, under);
+  return existsSync5(path) && !existsSync5(moved) ? path : moved;
+}
+var configOf = (word, places, home) => resolve2(fromHome(word ?? join7(places.settings, "config.json"), home));
+function configTargetOf(word, home = homedir5()) {
+  const places = placesOf2(home);
+  const path = configOf(word, places, home);
+  const under = inside2(places.oldSettings, path);
+  return under === void 0 ? path : join7(places.settings, under);
+}
+function configPathOf(word, home = homedir5()) {
+  const places = placesOf2(home);
+  const target = configTargetOf(word, home);
+  const under = inside2(places.settings, target);
+  const old = under === void 0 ? void 0 : join7(places.oldSettings, under);
+  return old !== void 0 && existsSync5(old) && !existsSync5(target) ? old : target;
+}
+function foldersPathOf(path, home = homedir5()) {
+  const places = placesOf2(home);
+  const whole2 = resolve2(fromHome(path, home));
+  const under = inside2(places.agents, whole2);
+  const old = under === void 0 ? void 0 : join7(places.oldAgents, under);
+  if (old !== void 0 && existsSync5(old) && !existsSync5(whole2)) return old;
+  return nowAt(whole2, places.oldAgents, places.agents);
+}
+
+// src/keep.ts
 var flags = process.argv.slice(2);
 var words3 = flags.filter((word) => !word.startsWith("--"));
-var whole = (word) => resolve2(word.startsWith("~/") ? join7(homedir5(), word.slice(2)) : word);
+var handsOver = flags.includes("--keep");
+var whole = (word) => configTargetOf(word);
 var here = fileURLToPath2(new URL("..", import.meta.url)).replace(/\/$/, "");
 var self = fileURLToPath2(import.meta.url);
 var run = self.endsWith(".js") ? [self] : ["--import", "tsx", "src/main.ts"];
@@ -28094,12 +28148,147 @@ function keepIfAsked(label2, url2, names, log2, before2 = () => void 0) {
   );
 }
 
+// src/move.ts
+import { lstatSync, mkdirSync as mkdirSync5, readdirSync, readFileSync as readFileSync6, renameSync as renameSync2, rmdirSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { homedir as homedir6 } from "node:os";
+import { dirname as dirname5, join as join8, resolve as resolve3 } from "node:path";
+var there = (path) => {
+  try {
+    lstatSync(path);
+    return true;
+  } catch {
+    return false;
+  }
+};
+var isFolder = (path) => lstatSync(path).isDirectory();
+var shown = (path, home) => path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;
+function merge2(from, to, log2, home = homedir6(), quiet = false) {
+  if (!there(from)) return;
+  try {
+    if (!there(to)) {
+      mkdirSync5(dirname5(to), { recursive: true });
+      renameSync2(from, to);
+      if (!quiet) log2(`moved ${shown(from, home)} to ${shown(to, home)}`);
+      return;
+    }
+    if (!isFolder(from) || !isFolder(to)) {
+      log2(`${shown(from, home)} was left where it is: ${shown(to, home)} is there already`);
+      return;
+    }
+    for (const entry of readdirSync(from)) merge2(join8(from, entry), join8(to, entry), log2, home, true);
+    if (readdirSync(from).length === 0) rmdirSync(from);
+    if (!quiet) log2(`moved what was in ${shown(from, home)} into ${shown(to, home)}`);
+  } catch (error62) {
+    log2(`${shown(from, home)} couldn't be moved to ${shown(to, home)}, so it is used where it is: ${error62.message}`);
+  }
+}
+function removeIfEmpty(path) {
+  try {
+    if (readdirSync(path).length === 0) rmdirSync(path);
+  } catch {
+  }
+}
+function pairOf(path, places) {
+  const old = inside2(places.oldAgents, path);
+  if (old !== void 0) return { old: path, now: join8(places.agents, old) };
+  const now = inside2(places.agents, path);
+  return now === void 0 ? void 0 : { old: join8(places.oldAgents, now), now: path };
+}
+function writeJson(path, value) {
+  const next = `${path}.next`;
+  writeFileSync4(next, `${JSON.stringify(value, null, 2)}
+`, { mode: 384 });
+  renameSync2(next, path);
+}
+var readJson = (path) => {
+  try {
+    const read = JSON.parse(readFileSync6(path, "utf8"));
+    return typeof read === "object" && read !== null ? read : void 0;
+  } catch {
+    return void 0;
+  }
+};
+function moveOld(configPath2, log2, home = homedir6()) {
+  const places = placesOf2(home);
+  const settings = dirname5(configPath2);
+  const under = inside2(places.settings, settings);
+  if (under !== void 0) {
+    mkdirSync5(dirname5(dirname5(places.settings)), { recursive: true });
+    mkdirSync5(dirname5(places.settings), { recursive: true, mode: 448 });
+    merge2(join8(places.oldSettings, under), settings, log2, home);
+  }
+  const config3 = readJson(configPath2);
+  const said = config3?.["folders"];
+  const root = typeof said === "string" && said !== "" ? resolve3(fromHome(said, home)) : places.agents;
+  const pair = pairOf(root, places);
+  if (pair !== void 0) merge2(pair.old, pair.now, log2, home);
+  if (config3 !== void 0 && typeof said === "string") {
+    const moved = nowAt(root, places.oldAgents, places.agents);
+    if (moved !== root) writeJson(configPath2, { ...config3, folders: `~/${moved.slice(home.length + 1)}` });
+  }
+  const statePath2 = join8(settings, "sessions.json");
+  const state2 = readJson(statePath2);
+  if (state2 === void 0) return;
+  const moving = { ...state2.moving };
+  let changed = false;
+  const folders = { ...state2.folders };
+  for (const [who, folder2] of Object.entries(folders)) {
+    const moved = nowAt(folder2, places.oldAgents, places.agents);
+    if (moved === folder2) continue;
+    folders[who] = moved;
+    for (const [room, session] of Object.entries(state2.sessions ?? {})) {
+      if (room.slice(0, room.lastIndexOf("|")) === who) moving[session] = moved;
+    }
+    changed = true;
+  }
+  const forks = { ...state2.forks };
+  for (const [ask2, fork] of Object.entries(forks)) {
+    if (fork.folder === void 0) continue;
+    const moved = nowAt(fork.folder, places.oldAgents, places.agents);
+    if (moved === fork.folder) continue;
+    forks[ask2] = { ...fork, folder: moved };
+    if (fork.session !== void 0) moving[fork.session] = moved;
+    changed = true;
+  }
+  if (changed) {
+    writeJson(statePath2, {
+      ...state2,
+      folders,
+      ...state2.forks === void 0 ? {} : { forks },
+      ...Object.keys(moving).length === 0 ? {} : { moving }
+    });
+  }
+  removeIfEmpty(places.oldSettings);
+  removeIfEmpty(places.oldAgents);
+  removeIfEmpty(dirname5(places.oldAgents));
+}
+async function moveSessions(state2, opencode2, save, log2, home = homedir6()) {
+  const moving = state2.moving;
+  if (moving === void 0) return;
+  for (const [session, folder2] of Object.entries(moving)) {
+    try {
+      await opencode2.moveSession(session, folder2);
+      log2(`moved OpenCode's session ${session} to ${shown(folder2, home)}`);
+      delete moving[session];
+    } catch (error62) {
+      if (!(error62 instanceof OpenCodeError)) {
+        log2(`OpenCode's session ${session} wasn't moved to ${shown(folder2, home)}, for now: ${String(error62)}`);
+        continue;
+      }
+      log2(`OpenCode wouldn't move its session ${session} to ${shown(folder2, home)}: ${error62.message}`);
+      delete moving[session];
+    }
+  }
+  if (Object.keys(moving).length === 0) delete state2.moving;
+  save(state2);
+}
+
 // src/server.ts
 import { spawn } from "node:child_process";
 import { randomBytes } from "node:crypto";
-import { accessSync as accessSync2, constants as constants2, existsSync as existsSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "node:fs";
+import { accessSync as accessSync2, constants as constants2, existsSync as existsSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "node:fs";
 import { createServer } from "node:net";
-import { delimiter as delimiter2, join as join8 } from "node:path";
+import { delimiter as delimiter2, join as join9 } from "node:path";
 import { createInterface } from "node:readline";
 var ServerError = class extends Error {
   constructor(message, missing = false) {
@@ -28110,10 +28299,10 @@ var ServerError = class extends Error {
   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) => {
+var onPath = (command, env) => command.includes("/") ? existsSync6(command) : (env["PATH"] ?? "").split(delimiter2).some((folder2) => {
   if (folder2 === "") return false;
   try {
-    accessSync2(join8(folder2, command), constants2.X_OK);
+    accessSync2(join9(folder2, command), constants2.X_OK);
     return true;
   } catch {
     return false;
@@ -28147,9 +28336,9 @@ async function answers2(url2, password) {
   return typeof info === "string" ? info : "ok";
 }
 function keptIn(path) {
-  if (!existsSync5(path)) return void 0;
+  if (!existsSync6(path)) return void 0;
   try {
-    const kept = JSON.parse(readFileSync6(path, "utf8"));
+    const kept = JSON.parse(readFileSync7(path, "utf8"));
     return typeof kept.port === "number" && typeof kept.password === "string" ? kept : void 0;
   } catch {
     return void 0;
@@ -28178,7 +28367,7 @@ async function ownServer(options) {
   const env = options.env ?? process.env;
   const command = options.command ?? "opencode";
   const log2 = options.log ?? (() => void 0);
-  const path = join8(options.folder, "server.json");
+  const path = join9(options.folder, "server.json");
   let kept = keptIn(path);
   let before2 = false;
   if (kept !== void 0) {
@@ -28200,7 +28389,7 @@ async function ownServer(options) {
   let again2;
   const said = [];
   const start = () => {
-    writeFileSync4(path, `${JSON.stringify({ port, password }, null, 2)}
+    writeFileSync5(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,
@@ -28302,9 +28491,8 @@ async function ownServer(options) {
 }
 
 // src/setup.ts
-import { existsSync as existsSync6, readFileSync as readFileSync7 } from "node:fs";
-import { homedir as homedir6 } from "node:os";
-import { join as join9, resolve as resolve3 } from "node:path";
+import { existsSync as existsSync7, readFileSync as readFileSync8 } from "node:fs";
+import { resolve as resolve4 } from "node:path";
 var SetupError = class extends Error {
   constructor(message, words4 = {}) {
     super(message);
@@ -28321,9 +28509,8 @@ var hostOf = (url2) => {
   }
 };
 var STILL_GOOD = "The link is still good: run the same command again once that's done.";
-var home = (path) => path.startsWith("~/") ? join9(homedir6(), path.slice(2)) : path;
 function readConfig(path, env = process.env) {
-  const raw = existsSync6(path) ? JSON.parse(readFileSync7(path, "utf8")) : {};
+  const raw = existsSync7(path) ? JSON.parse(readFileSync8(path, "utf8")) : {};
   const passwordEnv = typeof raw["passwordEnv"] === "string" ? raw["passwordEnv"] : "OPENCODE_PASSWORD";
   const password = filledIn(env[passwordEnv]) ? env[passwordEnv] : void 0;
   const ownServer2 = password === void 0 && typeof raw["url"] !== "string";
@@ -28350,8 +28537,8 @@ function readConfig(path, env = process.env) {
     password,
     passwordEnv,
     ownServer: ownServer2,
-    directory: typeof raw["directory"] === "string" ? resolve3(home(raw["directory"])) : void 0,
-    folders: resolve3(home(typeof raw["folders"] === "string" ? raw["folders"] : "~/chips-opencode/agents")),
+    directory: typeof raw["directory"] === "string" ? resolve4(fromHome(raw["directory"])) : void 0,
+    folders: foldersPathOf(typeof raw["folders"] === "string" ? raw["folders"] : placesOf2().agents),
     agents
   };
 }
@@ -28379,17 +28566,17 @@ async function checkOpenCode(config3, client) {
 }
 
 // src/version.ts
-import { readFileSync as readFileSync8 } from "node:fs";
-var VERSION = JSON.parse(readFileSync8(new URL("../package.json", import.meta.url), "utf8")).version;
+import { readFileSync as readFileSync9 } from "node:fs";
+var VERSION = JSON.parse(readFileSync9(new URL("../package.json", import.meta.url), "utf8")).version;
 
 // src/main.ts
-var home2 = (path) => path.startsWith("~/") ? join10(homedir7(), path.slice(2)) : path;
 var link = process.env["CHIPS_JOIN_LINK"] || void 0;
 var LABEL = "chat.chips.opencode";
 stopIfAsked(LABEL);
-var configPath = resolve4(home2(words3[0] ?? "~/.chips-opencode/config.json"));
 var log = (line) => process.stdout.write(`${(/* @__PURE__ */ new Date()).toISOString()} ${line}
 `);
+if (!handsOver) moveOld(configTargetOf(words3[0]), log);
+var configPath = configPathOf(words3[0]);
 var stop = (error62) => {
   if (!(error62 instanceof SetupError)) throw error62;
   reportStep("failed", error62.words);
@@ -28403,14 +28590,14 @@ try {
 } catch (error62) {
   config2 = stop(error62);
 }
-var folder = dirname5(configPath);
-mkdirSync5(folder, { recursive: true, mode: 448 });
+var folder = dirname6(configPath);
+mkdirSync6(folder, { recursive: true, mode: 448 });
 var statePath = join10(folder, "sessions.json");
 var server;
 if (link !== void 0) reportStep("checking", { detail: "Looking for OpenCode" });
 if (config2.ownServer) {
-  const cwd = config2.directory ?? dirname5(config2.folders);
-  mkdirSync5(cwd, { recursive: true });
+  const cwd = config2.directory ?? config2.folders;
+  mkdirSync6(cwd, { recursive: true });
   try {
     server = await ownServer({ folder, cwd, log });
   } catch (error62) {
@@ -28454,7 +28641,10 @@ var joined = await join3({
   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(readFileSync9(statePath, "utf8")) : { sessions: {} };
+var state = existsSync8(statePath) ? JSON.parse(readFileSync10(statePath, "utf8")) : { sessions: {} };
+var saveState = (next) => writeFileSync6(statePath, `${JSON.stringify(next, null, 2)}
+`, { mode: 384 });
+if (offered !== void 0) await moveSessions(state, opencode, saveState, log);
 var bridge;
 var chips = await connect({
   url: joined.url,
@@ -28476,8 +28666,7 @@ bridge = new Bridge({
   agents: config2.agents,
   home: joined.spaceId,
   state,
-  saveState: (next) => writeFileSync5(statePath, `${JSON.stringify(next, null, 2)}
-`, { mode: 384 }),
+  saveState,
   log,
   restartServer: server?.restart,
   ...config2.directory === void 0 ? { folders: config2.folders } : { directory: config2.directory }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chipschat/opencode",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "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",
   "repository": {