@chipschat/opencode 1.0.15 → 1.0.17

package/dist/THIRD-PARTY-NOTICES.md

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

package/dist/main.js

@@ -9,7 +9,7 @@ var __export = (target, all) => {
 
 // src/main.ts
 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";
+import { dirname as dirname7, join as join10 } from "node:path";
 
 // node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -28056,7 +28056,7 @@ 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";
+import { dirname as dirname5, 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"),
@@ -28088,17 +28088,22 @@ function configPathOf(word, home = homedir5()) {
   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;
+  return old !== void 0 && existsSync5(dirname5(old)) && !existsSync5(dirname5(target)) ? old : target;
 }
 function foldersPathOf(path, home = homedir5()) {
   const places = placesOf2(home);
-  return nowAt(resolve2(fromHome(path, home)), places.oldAgents, places.agents);
+  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) => configPathOf(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"];
@@ -28146,7 +28151,7 @@ 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";
+import { dirname as dirname6, join as join8, resolve as resolve3 } from "node:path";
 var there = (path) => {
   try {
     lstatSync(path);
@@ -28161,7 +28166,7 @@ function merge2(from, to, log2, home = homedir6(), quiet = false) {
   if (!there(from)) return;
   try {
     if (!there(to)) {
-      mkdirSync5(dirname5(to), { recursive: true });
+      mkdirSync5(dirname6(to), { recursive: true });
       renameSync2(from, to);
       if (!quiet) log2(`moved ${shown(from, home)} to ${shown(to, home)}`);
       return;
@@ -28205,11 +28210,11 @@ var readJson = (path) => {
 };
 function moveOld(configPath2, log2, home = homedir6()) {
   const places = placesOf2(home);
-  const settings = dirname5(configPath2);
+  const settings = dirname6(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 });
+    mkdirSync5(dirname6(dirname6(places.settings)), { recursive: true });
+    mkdirSync5(dirname6(places.settings), { recursive: true, mode: 448 });
     merge2(join8(places.oldSettings, under), settings, log2, home);
   }
   const config3 = readJson(configPath2);
@@ -28255,7 +28260,7 @@ function moveOld(configPath2, log2, home = homedir6()) {
   }
   removeIfEmpty(places.oldSettings);
   removeIfEmpty(places.oldAgents);
-  removeIfEmpty(dirname5(places.oldAgents));
+  removeIfEmpty(dirname6(places.oldAgents));
 }
 async function moveSessions(state2, opencode2, save, log2, home = homedir6()) {
   const moving = state2.moving;
@@ -28570,7 +28575,7 @@ var LABEL = "chat.chips.opencode";
 stopIfAsked(LABEL);
 var log = (line) => process.stdout.write(`${(/* @__PURE__ */ new Date()).toISOString()} ${line}
 `);
-moveOld(configTargetOf(words3[0]), log);
+if (!handsOver) moveOld(configTargetOf(words3[0]), log);
 var configPath = configPathOf(words3[0]);
 var stop = (error62) => {
   if (!(error62 instanceof SetupError)) throw error62;
@@ -28585,7 +28590,7 @@ try {
 } catch (error62) {
   config2 = stop(error62);
 }
-var folder = dirname6(configPath);
+var folder = dirname7(configPath);
 mkdirSync6(folder, { recursive: true, mode: 448 });
 var statePath = join10(folder, "sessions.json");
 var server;

package/package.json

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