@chipschat/hermes 1.0.16 → 1.0.18

package/README.md

@@ -152,11 +152,18 @@ point (the one the `hermes` wrapper runs) directly, with the wrapper's variables
 `DYLD_LIBRARY_PATH=/opt/homebrew/opt/expat/lib`, which macOS would drop at the wrapper, and its log
 says so.
 
-**Folders.** Each agent gets a folder of its own, `~/chips-hermes/agents/<its name>`, made the
+**Folders.** Each agent gets a folder of its own, `~/Chips/Agents/hermes/<its name>`, made the
 first time it is spoken to and kept by its Chips agent after a rename. Each run tells the agent it
 is its folder, in the run's `instructions`. The files an answer sends go to the room from there and
 from nowhere else.
 
+Everything the bridge keeps is under `~/Chips` (Chips ADR 0283): its config, sessions and state in
+`~/Chips/.bridges/hermes`, the agents' folders in `~/Chips/Agents/hermes`. Until 1.0.17 they were
+`~/.chips-hermes` and `~/chips-hermes/agents`. The first start of 1.0.17 moves them, and the folder
+paths its sessions saved. 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 file in `~/chips-hermes` it
+didn't make stays there.
+
 **Each new agent, a profile of its own.** An agent made in Chips (Add, then a new one, or a
 space from the +) gets a Hermes profile, made by Hermes with
 `hermes profile create <name> --clone-from <the Main agent's> --no-alias`:
@@ -172,7 +179,7 @@ space from the +) gets a Hermes profile, made by Hermes with
 The profile is named after the agent when it is made, in lowercase letters, digits and `-`
 (`nova`, `nova-2` when Hermes has a `nova` already), and keeps that name after a rename, as the
 agent's folder does. Deleting the agent in Chips leaves its profile in Hermes: what it learned is
-yours to delete, with `hermes profile delete <name>`. `~/.chips-hermes/sessions.json` remembers
+yours to delete, with `hermes profile delete <name>`. `~/Chips/.bridges/hermes/sessions.json` remembers
 which profile is whose.
 
 The one gateway serves every profile under `/p/<name>`, and takes a new one at once when the bridge
@@ -183,7 +190,7 @@ on it serves every profile. Hermes's gateway also keeps sending a new profile's
 Main agent's address until it starts again, which the bridge drops. Where Hermes doesn't make a
 profile, the agent runs on the first profile, in a session of its own, and the log says why.
 
-**More than one agent.** Name them in `~/.chips-hermes/config.json` (see `config.example.json`).
+**More than one agent.** Name them in `~/Chips/.bridges/hermes/config.json` (see `config.example.json`).
 Each agent is one of three:
 - the default profile;
 - a profile under `/p/<profile>`, with `gateway.multiplex_profiles` on and that profile's own key;

package/dist/THIRD-PARTY-NOTICES.md

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

package/dist/main.js

@@ -9,10 +9,9 @@ var __export = (target, all) => {
 
 // src/main.ts
 import { randomBytes as randomBytes3 } from "node:crypto";
-import { existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync12, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync13, writeFileSync as writeFileSync6 } from "node:fs";
 import { createServer as createServer2 } from "node:net";
-import { homedir as homedir8 } from "node:os";
-import { dirname as dirname6, join as join13, resolve as resolve6 } from "node:path";
+import { dirname as dirname7, join as join14 } from "node:path";
 
 // node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -5108,7 +5107,7 @@ function isRecursive(inst, stack, resolve7) {
     }
     return answer;
   };
-  const merge2 = (answer) => {
+  const merge3 = (answer) => {
     if (answer > result)
       result = answer;
   };
@@ -5117,7 +5116,7 @@ function isRecursive(inst, stack, resolve7) {
   switch (kind) {
     case "object": {
       const raw = rawShape(def);
-      merge2(raw ? shape(raw, true) : ASSUMED);
+      merge3(raw ? shape(raw, true) : ASSUMED);
       check2(def.catchall);
       break;
     }
@@ -5167,7 +5166,7 @@ function isRecursive(inst, stack, resolve7) {
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
       const inner = def._cachedInner ?? (resolve7 ? 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
@@ -23400,8 +23399,8 @@ var Project = class {
       const end2 = all.findIndex((line2, at) => at > start && line2.startsWith(">>>>>>> "));
       if (start < 0 || end2 < 0)
         return void 0;
-      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");
+      const shown3 = all.slice(Math.max(0, start - 1), end2 + 2);
+      return shown3.length <= MARKED_LINES ? shown3.join("\n") : [...shown3.slice(0, MARKED_LINES - 1), "\u2026"].join("\n");
     } catch {
       return void 0;
     }
@@ -25325,7 +25324,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 ?? ((shown2, where) => process.stderr.write(`Allow ${options.name} in Chips at ${where}. Its code is ${shown2}.
+  const show = options.onCode ?? ((shown3, where) => process.stderr.write(`Allow ${options.name} in Chips at ${where}. Its code is ${shown3}.
 `));
   show(code, url2);
   for (; ; ) {
@@ -25902,8 +25901,8 @@ function profileName(profile) {
   const name2 = (profile ?? "default").trim().toLowerCase();
   return name2 === "" ? "default" : name2;
 }
-function envValue(home2, name2) {
-  const path = join5(home2, ".env");
+function envValue(home, name2) {
+  const path = join5(home, ".env");
   if (!existsSync5(path)) return void 0;
   let found;
   for (const line2 of readFileSync5(path, "utf8").split("\n")) {
@@ -25915,16 +25914,16 @@ function envValue(home2, name2) {
   }
   return found;
 }
-function appendEnv(home2, name2, value) {
-  const path = join5(home2, ".env");
+function appendEnv(home, name2, value) {
+  const path = join5(home, ".env");
   const text = readFileSync5(path, "utf8");
   const mode = statSync(path).mode & 511;
   appendFileSync(path, `${text === "" || text.endsWith("\n") ? "" : "\n"}${name2}=${value}
 `);
   chmodSync3(path, mode);
 }
-function configText(home2) {
-  const path = join5(home2, "config.yaml");
+function configText(home) {
+  const path = join5(home, "config.yaml");
   try {
     return existsSync5(path) ? readFileSync5(path, "utf8") : "";
   } catch {
@@ -26006,30 +26005,30 @@ function isFolder(path) {
     return false;
   }
 }
-function workFolder(home2, env = process.env) {
-  const configured = yamlValue(configText(home2), "terminal", "cwd");
+function workFolder(home, env = process.env) {
+  const configured = yamlValue(configText(home), "terminal", "cwd");
   if (configured !== void 0 && configured !== "" && configured !== ".") {
     const folder2 = expanded(configured);
     if (isFolder(folder2)) return folder2;
   }
   for (const name2 of ["TERMINAL_CWD", "MESSAGING_CWD"]) {
-    const said2 = envValue(home2, name2) ?? env[name2];
+    const said2 = envValue(home, name2) ?? env[name2];
     if (said2 !== void 0 && said2 !== "" && isFolder(expanded(said2))) return expanded(said2);
   }
-  return gatewayFolder(home2);
+  return gatewayFolder(home);
 }
 var gateways = /* @__PURE__ */ new Map();
-function gatewayFolder(home2) {
+function gatewayFolder(home) {
   let raw;
   try {
-    raw = readFileSync5(join5(home2, "gateway.pid"), "utf8").trim();
+    raw = readFileSync5(join5(home, "gateway.pid"), "utf8").trim();
   } catch {
     return void 0;
   }
-  const known = gateways.get(home2);
+  const known = gateways.get(home);
   if (known?.pidFile === raw) return known.folder;
   const folder2 = folderOfPid(raw);
-  gateways.set(home2, { pidFile: raw, folder: folder2 });
+  gateways.set(home, { pidFile: raw, folder: folder2 });
   return folder2;
 }
 function folderOfPid(raw) {
@@ -26107,8 +26106,8 @@ function memoryProblem(text, limit, what) {
   }
   return void 0;
 }
-function memorySettings(home2) {
-  const text = configText(home2);
+function memorySettings(home) {
+  const text = configText(home);
   const value = (key) => yamlValue(text, "memory", key);
   return {
     ...yamlBool(value("memory_enabled")) === false ? {} : { memory: yamlNumber(value("memory_char_limit")) ?? MEMORY_LIMIT },
@@ -26116,21 +26115,21 @@ function memorySettings(home2) {
   };
 }
 function sourcesOf(profile, env = process.env) {
-  const { name: name2, home: home2 } = profile;
+  const { name: name2, home } = profile;
   const found = [];
-  const soul = join6(home2, "SOUL.md");
+  const soul = join6(home, "SOUL.md");
   if (existsSync6(soul)) found.push({ path: soul, kind: "soul", file: "SOUL.md", profile: name2 });
-  const folder2 = workFolder(home2, env);
+  const folder2 = workFolder(home, env);
   const project = folder2 === void 0 ? void 0 : PROJECT_FILES.find((file3) => readText(join6(folder2, file3)).trim() !== "");
   if (folder2 !== void 0 && project !== void 0) {
     found.push({ path: join6(folder2, project), kind: "project", file: project, profile: name2 });
   }
-  const memory = memorySettings(home2);
+  const memory = memorySettings(home);
   if (memory.user !== void 0) {
-    found.push({ path: join6(home2, "memories", "USER.md"), kind: "user", file: "USER.md", profile: name2, limit: memory.user });
+    found.push({ path: join6(home, "memories", "USER.md"), kind: "user", file: "USER.md", profile: name2, limit: memory.user });
   }
   if (memory.memory !== void 0) {
-    found.push({ path: join6(home2, "memories", "MEMORY.md"), kind: "memory", file: "MEMORY.md", profile: name2, limit: memory.memory });
+    found.push({ path: join6(home, "memories", "MEMORY.md"), kind: "memory", file: "MEMORY.md", profile: name2, limit: memory.memory });
   }
   return found;
 }
@@ -26209,18 +26208,18 @@ var Picture = class {
   }
   /** The harness's own set, as `PUT /v1/harnesses/:id/context` takes it. */
   harnessCopy() {
-    const shown2 = [];
+    const shown3 = [];
     const notShown = [];
     for (const [path, { id: id2, name: name2 }] of this.shared) {
       const entry = this.readers.get(path);
       if (entry === void 0) continue;
       const { source: source2, agents } = entry;
       const { file: file3, tooLarge } = fileOf(source2, name2);
-      if (tooLarge || shown2.length >= FILES_SHOWN) {
+      if (tooLarge || shown3.length >= FILES_SHOWN) {
         notShown.push({ name: name2, title: ROWS[source2.kind].title, reason: tooLarge ? "too_large" : "count" });
         continue;
       }
-      shown2.push({
+      shown3.push({
         ...file3,
         id: id2,
         used_by: agents.length,
@@ -26228,7 +26227,7 @@ var Picture = class {
       });
     }
     return {
-      shared: shown2,
+      shared: shown3,
       ...notShown.length === 0 ? {} : { not_shown: notShown }
     };
   }
@@ -26268,9 +26267,9 @@ var Picture = class {
   /** The file an edit names: an agent's own, or one of the harness's set; with whether it is shared. */
   find(agentId2, name2) {
     if (agentId2 === void 0) {
-      for (const [path, { name: shown2 }] of this.shared) {
+      for (const [path, { name: shown3 }] of this.shared) {
         const source2 = this.readers.get(path)?.source;
-        if (shown2 === name2 && source2 !== void 0) return { source: source2, shared: true };
+        if (shown3 === name2 && source2 !== void 0) return { source: source2, shared: true };
       }
       return void 0;
     }
@@ -26457,8 +26456,8 @@ var SMALL_THRESHOLD = 0.75;
 var WHY_NOT = "Hermes can't be asked to compact from Chips.";
 var whyReadOnly = (profile) => `Hermes sets this for every agent on its ${profile} profile.`;
 var num = (value) => typeof value === "number" && Number.isFinite(value) ? value : void 0;
-function limitOf(home2, window) {
-  const text = configText(home2);
+function limitOf(home, window) {
+  const text = configText(home);
   const enabled = yamlBool(yamlValue(text, "compression", "enabled")) ?? true;
   const threshold = yamlNumber(yamlValue(text, "compression", "threshold")) ?? THRESHOLD;
   let ratio = window < SMALL_WINDOW ? Math.max(threshold, SMALL_THRESHOLD) : threshold;
@@ -26911,8 +26910,8 @@ function linesOf2(text) {
     return { indent, words: words4 };
   });
 }
-function hookPortIn(home2) {
-  const path = join7(home2, "config.yaml");
+function hookPortIn(home) {
+  const path = join7(home, "config.yaml");
   if (!existsSync7(path)) return void 0;
   const escaped = HOOK_PATH.replace(/[/]/g, "\\/");
   const match = new RegExp(`^\\s*(?:-\\s*)?url:\\s*["']?http:\\/\\/127\\.0\\.0\\.1:(\\d+)${escaped}`, "m").exec(
@@ -26931,15 +26930,15 @@ function entryLines(indent, url2, secret) {
     `${indent}    timeout: 5`
   ];
 }
-function secretInEnv(home2, secret) {
-  const path = join7(home2, ".env");
+function secretInEnv(home, secret) {
+  const path = join7(home, ".env");
   if (!existsSync7(path)) return false;
-  if (envValue(home2, SECRET_ENV) === void 0) appendEnv(home2, SECRET_ENV, secret);
+  if (envValue(home, SECRET_ENV) === void 0) appendEnv(home, SECRET_ENV, secret);
   return true;
 }
-function addHook(home2, port, profile, secret) {
-  const path = join7(home2, "config.yaml");
-  if (!existsSync7(home2)) return { state: "no_home", path };
+function addHook(home, port, profile, secret) {
+  const path = join7(home, "config.yaml");
+  if (!existsSync7(home)) return { state: "no_home", path };
   const url2 = hookUrl(port, profile);
   const text = existsSync7(path) ? readFileSync7(path, "utf8") : "";
   const lines2 = linesOf2(text);
@@ -26947,16 +26946,16 @@ function addHook(home2, port, profile, secret) {
   if (lines2.some((line2) => ours2.test(line2.words))) return { state: "there", path };
   const where = lines2.findIndex((line2) => line2.indent === 0 && /^["']?hooks["']?\s*:/.test(line2.words));
   const byHand = (why) => {
-    const inEnv2 = secretInEnv(home2, secret);
-    const shown2 = entryLines("  ", url2, inEnv2 ? { env: SECRET_ENV } : { inline: secret });
-    return { state: "by_hand", path, why, lines: ["hooks:", ...shown2].join("\n") };
+    const inEnv2 = secretInEnv(home, secret);
+    const shown3 = entryLines("  ", url2, inEnv2 ? { env: SECRET_ENV } : { inline: secret });
+    return { state: "by_hand", path, why, lines: ["hooks:", ...shown3].join("\n") };
   };
   const plain = /^(?:"[^"]+"|'[^']+'|[A-Za-z_][\w.-]*)\s*:(?:\s|$)/;
   if (lines2.some((line2) => line2.indent === 0 && line2.words !== "" && !plain.test(line2.words))) {
     return byHand("its top level isn't laid out as this bridge expects");
   }
   if (where === -1) {
-    const inEnv2 = secretInEnv(home2, secret);
+    const inEnv2 = secretInEnv(home, secret);
     const block = [
       "# Chips: how full each agent's context is, sent to the chips-hermes bridge after each model call.",
       "hooks:",
@@ -26988,7 +26987,7 @@ function addHook(home2, port, profile, secret) {
   if (children.some((line2) => line2.indent !== indent && line2.indent < indent) || children[0]?.words.startsWith("-")) {
     return byHand("its hooks: isn't laid out as this bridge expects");
   }
-  const inEnv = secretInEnv(home2, secret);
+  const inEnv = secretInEnv(home, secret);
   const raw = text.split("\n");
   raw.splice(where + 1, 0, ...entryLines(" ".repeat(indent), url2, inEnv ? { env: SECRET_ENV } : { inline: secret }));
   writeWhole(path, raw.join("\n"));
@@ -27115,9 +27114,9 @@ function gatewayRunArgs(command) {
   return plain[0] === "gateway" && plain[1] === "run" ? args : void 0;
 }
 function serviceOf(system, root2, env = {}) {
-  const home2 = resolve3(root2);
+  const home = resolve3(root2);
   const native = resolve3(system.home, ".hermes");
-  const suffix = home2 === native ? "" : dirname5(home2) === join8(native, "profiles") ? basename4(home2) : createHash3("sha256").update(home2).digest("hex").slice(0, 8);
+  const suffix = home === native ? "" : dirname5(home) === join8(native, "profiles") ? basename4(home) : createHash3("sha256").update(home).digest("hex").slice(0, 8);
   if (system.platform === "darwin") {
     const path = join8(system.home, "Library", "LaunchAgents", `ai.hermes.gateway${suffix ? `-${suffix}` : ""}.plist`);
     return system.exists(path) ? { kind: "launchd", path } : void 0;
@@ -27549,18 +27548,18 @@ function freeProfile(root2, name2, taken) {
     if (!taken.includes(profile) && !existsSync9(join9(root2, "profiles", profile))) return profile;
   }
 }
-function readyProfile(home2, names, hook) {
-  for (const file3 of ["MEMORY.md", "USER.md"]) rmSync4(join9(home2, "memories", file3), { force: true });
-  if (envValue(home2, KEY_ENV) === void 0) appendEnv(home2, KEY_ENV, randomBytes2(32).toString("hex"));
+function readyProfile(home, names, hook) {
+  for (const file3 of ["MEMORY.md", "USER.md"]) rmSync4(join9(home, "memories", file3), { force: true });
+  if (envValue(home, KEY_ENV) === void 0) appendEnv(home, KEY_ENV, randomBytes2(32).toString("hex"));
   if (hook === void 0) return void 0;
-  const path = join9(home2, "config.yaml");
+  const path = join9(home, "config.yaml");
   if (existsSync9(path)) {
     const theirs = hookUrl(hook.port, names.from).replace(/[.*+?^${}()|[\]\\/]/g, "\\$&");
     const entry = new RegExp(`^(\\s*(?:-\\s*)?url:\\s*["']?)${theirs}(["']?\\s*(?:#.*)?)$`, "m");
     const text = readFileSync9(path, "utf8");
     if (entry.test(text)) writeWhole(path, text.replace(entry, `$1${hookUrl(hook.port, names.profile)}$2`));
   }
-  return addHook(home2, hook.port, names.profile, hook.secret);
+  return addHook(home, hook.port, names.profile, hook.secret);
 }
 function hermesProfiles(options) {
   return {
@@ -27633,9 +27632,9 @@ var WANTS = [
 ];
 function settingsFor(active) {
   const bridge2 = () => {
-    const there = active();
-    if (there === void 0) throw new Refuse("The bridge is starting. Try again in a moment.");
-    return there;
+    const there2 = active();
+    if (there2 === void 0) throw new Refuse("The bridge is starting. Try again in a moment.");
+    return there2;
   };
   return {
     context: (edit) => bridge2().onContextEdit(edit),
@@ -28026,10 +28025,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: home2 } = this.options;
-    if (home2 === void 0 || main2.spaces.includes(home2)) return;
-    const there = known.find((agent) => agent.agentId !== main2.agentId && agent.spaces.includes(home2));
-    await chips2.agents.attach(main2.agentId, { spaceId: home2, 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)}`));
   }
   /**
    * A person asked for a new agent in a room (Chips ADR 0108): one of the harness's, keyed by the
@@ -28065,12 +28064,12 @@ var Bridge = class {
     if (profiles === void 0 || root2 === void 0 || main2 === void 0 || this.own.has(agentId2)) return;
     const from = profileName(main2.config.address.profile);
     const profile = freeProfile(root2, name2, Object.values(state2.made ?? {}));
-    const home2 = profileHome(root2, profile);
+    const home = profileHome(root2, profile);
     const secret = state2.fills?.secret ?? this.options.fills?.secret;
     try {
       await profiles.create(profile, from);
       const port = this.fillsPort;
-      const hook = readyProfile(home2, { from, profile }, port === void 0 || secret === void 0 ? void 0 : { port, secret });
+      const hook = readyProfile(home, { from, profile }, port === void 0 || secret === void 0 ? void 0 : { port, secret });
       if (hook?.state === "by_hand") this.log(`context window: ${hook.path} was left as it is: ${hook.why}. Add these lines to it:
 ${hook.lines}`);
     } catch (error62) {
@@ -28098,12 +28097,12 @@ ${hook.lines}`);
     const main2 = this.agents[0];
     const root2 = this.options.hermesRoot;
     if (main2 === void 0 || root2 === void 0) return void 0;
-    const home2 = profileHome(root2, profile);
+    const home = profileHome(root2, profile);
     const config3 = {
       name: name2,
-      address: { url: main2.config.address.url, profile, key: envValue(home2, KEY_ENV) ?? "" },
+      address: { url: main2.config.address.url, profile, key: envValue(home, KEY_ENV) ?? "" },
       keyEnv: KEY_ENV,
-      keyFrom: join10(home2, ".env")
+      keyFrom: join10(home, ".env")
     };
     const client = this.options.clientFor?.(config3) ?? new HermesClient(config3.address);
     return { config: config3, key: agentId2, client, agentId: agentId2, up: true };
@@ -28850,12 +28849,60 @@ function lowerFirst(text) {
 }
 
 // src/keep.ts
-import { homedir as homedir6 } from "node:os";
-import { basename as basename5, join as join11, resolve as resolve4 } from "node:path";
+import { basename as basename5 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
+
+// src/places.ts
+import { existsSync as existsSync10 } from "node:fs";
+import { homedir as homedir6 } from "node:os";
+import { isAbsolute as isAbsolute2, join as join11, relative, resolve as resolve4, sep as sep2 } from "node:path";
+function placesOf(home = homedir6()) {
+  return {
+    settings: join11(home, "Chips", ".bridges", "hermes"),
+    agents: join11(home, "Chips", "Agents", "hermes"),
+    oldSettings: join11(home, ".chips-hermes"),
+    oldAgents: join11(home, "chips-hermes", "agents")
+  };
+}
+var fromHome = (path, home = homedir6()) => path === "~" ? home : path.startsWith("~/") ? join11(home, path.slice(2)) : path;
+function inside2(root2, path) {
+  const under = relative(root2, path);
+  return under === ".." || under.startsWith(`..${sep2}`) || isAbsolute2(under) ? void 0 : under;
+}
+function nowAt(path, before, after) {
+  const under = inside2(before, path);
+  if (under === void 0) return path;
+  const moved = join11(after, under);
+  return existsSync10(path) && !existsSync10(moved) ? path : moved;
+}
+var configOf = (word, places, home) => resolve4(fromHome(word ?? join11(places.settings, "config.json"), home));
+function configTargetOf(word, home = homedir6()) {
+  const places = placesOf(home);
+  const path = configOf(word, places, home);
+  const under = inside2(places.oldSettings, path);
+  return under === void 0 ? path : join11(places.settings, under);
+}
+function configPathOf(word, home = homedir6()) {
+  const places = placesOf(home);
+  const target = configTargetOf(word, home);
+  const under = inside2(places.settings, target);
+  const old = under === void 0 ? void 0 : join11(places.oldSettings, under);
+  return old !== void 0 && existsSync10(old) && !existsSync10(target) ? old : target;
+}
+function folderPathOf(path, home = homedir6()) {
+  const places = placesOf(home);
+  const whole2 = resolve4(fromHome(path, home));
+  const under = inside2(places.agents, whole2);
+  const old = under === void 0 ? void 0 : join11(places.oldAgents, under);
+  if (old !== void 0 && existsSync10(old) && !existsSync10(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) => resolve4(word.startsWith("~/") ? join11(homedir6(), 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"];
@@ -28900,10 +28947,130 @@ function keepIfAsked(label2, url2, names, log2, before = () => void 0) {
   );
 }
 
-// src/setup.ts
-import { existsSync as existsSync10, readFileSync as readFileSync10 } from "node:fs";
+// src/move.ts
+import { lstatSync as lstatSync2, mkdirSync as mkdirSync6, readdirSync, readFileSync as readFileSync10, renameSync as renameSync3, rmdirSync, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
-import { join as join12, resolve as resolve5 } from "node:path";
+import { dirname as dirname6, join as join12, resolve as resolve5 } from "node:path";
+var there = (path) => {
+  try {
+    lstatSync2(path);
+    return true;
+  } catch {
+    return false;
+  }
+};
+var isFolder2 = (path) => lstatSync2(path).isDirectory();
+var shown = (path, home) => path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;
+function merge2(from, to, log2, home = homedir7(), quiet = false) {
+  if (!there(from)) return;
+  try {
+    if (!there(to)) {
+      mkdirSync6(dirname6(to), { recursive: true });
+      renameSync3(from, to);
+      if (!quiet) log2(`moved ${shown(from, home)} to ${shown(to, home)}`);
+      return;
+    }
+    if (!isFolder2(from) || !isFolder2(to)) {
+      log2(`${shown(from, home)} was left where it is: ${shown(to, home)} is there already`);
+      return;
+    }
+    for (const entry of readdirSync(from)) merge2(join12(from, entry), join12(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: join12(places.agents, old) };
+  const now = inside2(places.agents, path);
+  return now === void 0 ? void 0 : { old: join12(places.oldAgents, now), now: path };
+}
+function writeJson(path, value) {
+  const next = `${path}.next`;
+  writeFileSync5(next, `${JSON.stringify(value, null, 2)}
+`, { mode: 384 });
+  renameSync3(next, path);
+}
+var readJson = (path) => {
+  try {
+    const read = JSON.parse(readFileSync10(path, "utf8"));
+    return typeof read === "object" && read !== null ? read : void 0;
+  } catch {
+    return void 0;
+  }
+};
+function movedWords(said2, places, home) {
+  if (typeof said2 !== "string" || said2 === "") return void 0;
+  const path = resolve5(fromHome(said2, home));
+  const moved = nowAt(path, places.oldAgents, places.agents);
+  return moved === path ? void 0 : `~/${moved.slice(home.length + 1)}`;
+}
+function moveOld(configPath2, log2, home = homedir7()) {
+  const places = placesOf(home);
+  const settings = dirname6(configPath2);
+  const under = inside2(places.settings, settings);
+  if (under !== void 0) {
+    mkdirSync6(dirname6(dirname6(places.settings)), { recursive: true });
+    mkdirSync6(dirname6(places.settings), { recursive: true, mode: 448 });
+    merge2(join12(places.oldSettings, under), settings, log2, home);
+  }
+  const config3 = readJson(configPath2);
+  const agents = Array.isArray(config3?.["agents"]) ? config3["agents"] : [];
+  const roots = [config3?.["folders"] ?? places.agents, config3?.["folder"], ...agents.map((agent) => agent["folder"])].filter((root2) => typeof root2 === "string" && root2 !== "").map((root2) => resolve5(fromHome(root2, home)));
+  const pairs = roots.map((root2) => pairOf(root2, places)).filter((pair) => pair !== void 0);
+  for (const { old, now } of pairs) merge2(old, now, log2, home);
+  if (config3 !== void 0) {
+    let changed = false;
+    const folders = movedWords(config3["folders"], places, home);
+    if (folders !== void 0) {
+      config3["folders"] = folders;
+      changed = true;
+    }
+    const folder2 = movedWords(config3["folder"], places, home);
+    if (folder2 !== void 0) {
+      config3["folder"] = folder2;
+      changed = true;
+    }
+    for (const agent of agents) {
+      const folder3 = movedWords(agent["folder"], places, home);
+      if (folder3 === void 0) continue;
+      agent["folder"] = folder3;
+      changed = true;
+    }
+    if (changed) writeJson(configPath2, config3);
+  }
+  const statePath2 = join12(settings, "sessions.json");
+  const state2 = readJson(statePath2);
+  const saved = state2?.["folders"];
+  if (state2 !== void 0 && typeof saved === "object" && saved !== null) {
+    const folders = saved;
+    let changed = false;
+    for (const [agentId2, folder2] of Object.entries(folders)) {
+      if (typeof folder2 !== "string") continue;
+      const moved = nowAt(folder2, places.oldAgents, places.agents);
+      if (moved === folder2) continue;
+      folders[agentId2] = moved;
+      changed = true;
+    }
+    if (changed) writeJson(statePath2, state2);
+  }
+  removeIfEmpty(places.oldSettings);
+  removeIfEmpty(places.oldAgents);
+  removeIfEmpty(dirname6(places.oldAgents));
+}
+
+// src/setup.ts
+import { existsSync as existsSync11, readFileSync as readFileSync11 } from "node:fs";
+import { homedir as homedir8 } from "node:os";
+import { join as join13, resolve as resolve6 } from "node:path";
 var SetupError = class extends Error {
   constructor(message, words4 = {}) {
     super(message);
@@ -28912,7 +29079,7 @@ var SetupError = class extends Error {
   words;
   name = "SetupError";
 };
-var shown = (path) => path.startsWith(`${homedir7()}/`) ? `~${path.slice(homedir7().length)}` : path;
+var shown2 = (path) => path.startsWith(`${homedir8()}/`) ? `~${path.slice(homedir8().length)}` : path;
 var portOf2 = (url2) => {
   const parsed = new URL(url2);
   return parsed.port || (parsed.protocol === "https:" ? "443" : "80");
@@ -28932,24 +29099,24 @@ function readyHooks(config3, options) {
     const profile = profileName(named);
     if (done.has(profile)) continue;
     done.add(profile);
-    const home2 = profileHome(options.root, named);
+    const home = profileHome(options.root, named);
     let outcome;
     try {
-      outcome = addHook(home2, options.port, profile, options.secret);
+      outcome = addHook(home, options.port, profile, options.secret);
     } catch (error62) {
-      lines2.push(`Chips's webhook wasn't added to ${shown(join12(home2, "config.yaml"))}: ${error62 instanceof Error ? error62.message : String(error62)}`);
+      lines2.push(`Chips's webhook wasn't added to ${shown2(join13(home, "config.yaml"))}: ${error62 instanceof Error ? error62.message : String(error62)}`);
       continue;
     }
     if (outcome.state === "added") {
-      lines2.push(`Added Chips's webhook to ${shown(outcome.path)}, so Hermes tells Chips how full each agent's context is.`);
+      lines2.push(`Added Chips's webhook to ${shown2(outcome.path)}, so Hermes tells Chips how full each agent's context is.`);
       restart2 ||= options.gatewayUp;
     } else if (outcome.state === "by_hand") {
       lines2.push(
-        `${shown(outcome.path)} was left as it is: ${outcome.why}. For Chips to show how full each agent's context is, add these lines to it, then start hermes gateway again:
+        `${shown2(outcome.path)} was left as it is: ${outcome.why}. For Chips to show how full each agent's context is, add these lines to it, then start hermes gateway again:
 ${outcome.lines}`
       );
     } else if (outcome.state === "no_home") {
-      lines2.push(`Hermes has no ${profile} profile at ${shown(home2)}, so no webhook was added for it.`);
+      lines2.push(`Hermes has no ${profile} profile at ${shown2(home)}, so no webhook was added for it.`);
     }
   }
   if (restart2) lines2.push(RESTART);
@@ -28959,12 +29126,12 @@ var STILL_GOOD = "The link is still good: run the same command again once that's
 var EXAMPLE = '{ "agents": [{ "name": "Hermes", "profile": "default", "keyEnv": "API_SERVER_KEY" }] }';
 var PLAIN = { agents: [{ name: "Hermes", profile: "default", keyEnv: "API_SERVER_KEY" }] };
 function hermesEnvPath(env = process.env) {
-  return resolve5(env["HERMES_HOME"] ?? resolve5(homedir7(), ".hermes"), ".env");
+  return resolve6(env["HERMES_HOME"] ?? resolve6(homedir8(), ".hermes"), ".env");
 }
 function fromHermes(name2, env) {
   const path = hermesEnvPath(env);
-  if (!existsSync10(path)) return void 0;
-  for (const line2 of readFileSync10(path, "utf8").split("\n")) {
+  if (!existsSync11(path)) return void 0;
+  for (const line2 of readFileSync11(path, "utf8").split("\n")) {
     const match = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*?)\s*$/.exec(line2);
     if (match?.[1] === name2) return match[2]?.replace(/^(["'])(.*)\1$/, "$2");
   }
@@ -28972,10 +29139,10 @@ function fromHermes(name2, env) {
 }
 function folderOf(said2) {
   if (typeof said2 !== "string" || said2 === "") return void 0;
-  return resolve5(said2 === "~" || said2.startsWith("~/") ? homedir7() + said2.slice(1) : said2);
+  return folderPathOf(said2);
 }
 function readConfig(path, env = process.env) {
-  const raw = existsSync10(path) ? JSON.parse(readFileSync10(path, "utf8")) : PLAIN;
+  const raw = existsSync11(path) ? JSON.parse(readFileSync11(path, "utf8")) : PLAIN;
   const url2 = typeof raw.url === "string" ? raw.url : "http://127.0.0.1:8642";
   const folder2 = folderOf(raw.folder);
   if (!Array.isArray(raw.agents) || raw.agents.length === 0) {
@@ -28993,7 +29160,7 @@ function readConfig(path, env = process.env) {
         {
           detail: "No key for its API server",
           says: "Hermes's API server isn't set up.",
-          doing: `Add API_SERVER_ENABLED=true and an API_SERVER_KEY, a long random key, to ${shown(hermesEnvPath(env))}. Then start Hermes with hermes gateway.`
+          doing: `Add API_SERVER_ENABLED=true and an API_SERVER_KEY, a long random key, to ${shown2(hermesEnvPath(env))}. Then start Hermes with hermes gateway.`
         }
       );
     }
@@ -29014,7 +29181,7 @@ function readConfig(path, env = process.env) {
   return {
     ...typeof raw.name === "string" ? { name: raw.name } : {},
     agents,
-    folders: folderOf(raw.folders) ?? resolve5(homedir7(), "chips-hermes", "agents"),
+    folders: folderOf(raw.folders) ?? folderPathOf(placesOf().agents),
     ...typeof hookPort === "number" && Number.isInteger(hookPort) && hookPort > 0 && hookPort < 65536 ? { hookPort } : {}
   };
 }
@@ -29027,7 +29194,7 @@ async function checkHermes(config3, clientFor = (agent) => new HermesClient(agen
         {
           detail: `Nothing answers on port ${portOf2(agent.address.url)}`,
           says: "Hermes's API server is off.",
-          doing: `Add this line to ${shown(hermesEnvPath())}, then start Hermes with hermes gateway.`,
+          doing: `Add this line to ${shown2(hermesEnvPath())}, then start Hermes with hermes gateway.`,
           copy: "API_SERVER_ENABLED=true"
         }
       );
@@ -29046,25 +29213,25 @@ async function checkHermes(config3, clientFor = (agent) => new HermesClient(agen
 }
 
 // src/version.ts
-import { readFileSync as readFileSync11 } from "node:fs";
-var VERSION = JSON.parse(readFileSync11(new URL("../package.json", import.meta.url), "utf8")).version;
+import { readFileSync as readFileSync12 } from "node:fs";
+var VERSION = JSON.parse(readFileSync12(new URL("../package.json", import.meta.url), "utf8")).version;
 
 // src/main.ts
-var home = (path) => path.startsWith("~/") ? join13(homedir8(), path.slice(2)) : path;
 var link = process.env["CHIPS_JOIN_LINK"] || void 0;
 var LABEL = "chat.chips.hermes";
 stopIfAsked(LABEL);
-var configPath = resolve6(home(words3[0] ?? "~/.chips-hermes/config.json"));
-var folder = dirname6(configPath);
-var statePath = join13(folder, "sessions.json");
-var state = existsSync11(statePath) ? JSON.parse(readFileSync12(statePath, "utf8")) : { sessions: {} };
+var log = (line2) => process.stdout.write(`${(/* @__PURE__ */ new Date()).toISOString()} ${line2}
+`);
+if (!handsOver) moveOld(configTargetOf(words3[0]), log);
+var configPath = configPathOf(words3[0]);
+var folder = dirname7(configPath);
+var statePath = join14(folder, "sessions.json");
+var state = existsSync12(statePath) ? JSON.parse(readFileSync13(statePath, "utf8")) : { sessions: {} };
 var saveState = (next) => {
-  mkdirSync6(folder, { recursive: true, mode: 448 });
-  writeFileSync5(statePath, `${JSON.stringify(next, null, 2)}
+  mkdirSync7(folder, { recursive: true, mode: 448 });
+  writeFileSync6(statePath, `${JSON.stringify(next, null, 2)}
 `, { mode: 384 });
 };
-var log = (line2) => process.stdout.write(`${(/* @__PURE__ */ new Date()).toISOString()} ${line2}
-`);
 var freePort = () => new Promise((done, failed) => {
   const server = createServer2();
   server.once("error", failed);
@@ -29137,7 +29304,7 @@ var chips = await connect({
   url: joined.url,
   token: joined.token,
   client: { name: "chips-hermes", version: VERSION },
-  store: fileStore(join13(folder, "chips-state.json")),
+  store: fileStore(join14(folder, "chips-state.json")),
   onRestart: restart,
   settings: settingsFor(() => bridge)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chipschat/hermes",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Hermes Agent as a Chips harness, on its Runs API: each profile a Chips agent, each room a Hermes session.",
   "license": "Apache-2.0",
   "repository": {