tryharness 0.7.16 → 0.7.22

package/lib/worktrees.mjs

@@ -24,6 +24,21 @@ export function repositoryOf(folder) {
   return { root: fs.realpathSync(top.out), inside: path.relative(fs.realpathSync(top.out), fs.realpathSync(folder)) };
 }
 
+/**
+ * The folder a linked git worktree stands for: the same place in its repository's main checkout. A thread's copy here,
+ * T3 Code's and the person's own are all worktrees of the checkout the person works in (T3 counts their history as
+ * that checkout's too). Any other folder is itself.
+ */
+export function mainCheckout(folder) {
+  if (!folder || !fs.existsSync(folder)) return folder;
+  const found = git(folder, ["rev-parse", "--path-format=absolute", "--show-toplevel", "--git-common-dir"]);
+  const [top, common] = found.ok ? found.out.split("\n") : [];
+  if (!top || !common || path.basename(common) !== ".git") return folder;
+  const main = path.dirname(common);
+  if (!fs.existsSync(main) || fs.realpathSync(main) === fs.realpathSync(top)) return folder;
+  return path.join(main, path.relative(fs.realpathSync(top), fs.realpathSync(folder)));
+}
+
 const slug = (text) => String(text).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 32) || "thread";
 
 export function createWorktrees({ store, root }) {
@@ -127,17 +142,34 @@ export function createWorktrees({ store, root }) {
     return { ok: true };
   };
 
+  /**
+   * The thread's folder changed: its copy of the old repository goes when nothing in it is the person's yet, and the
+   * next turn makes whatever the new folder needs. Changes not yet merged or discarded keep it where it is.
+   */
+  const moved = (threadId) => {
+    const tree = get(threadId);
+    if (tree?.state === "open" && fs.existsSync(tree.path)) {
+      if (stat(tree.path, `${tree.base}..HEAD`).length) return { ok: false, error: `this thread changed files on ${tree.branch}; merge or discard them first` };
+      retire(tree);
+      git(tree.repo, ["branch", "-D", tree.branch]);
+    }
+    if (tree) save(threadId, null);
+    return { ok: true };
+  };
+
   /** A thread that carries on a session from a terminal works where that session did: agents find sessions by folder. */
   const inPlace = (threadId) => save(threadId, { state: "in_place" });
 
   /**
    * Where T3 Code runs a thread's agents (t3.mjs runInT3): the checkout T3 made for the thread's first agent, shared by
-   * the rest as its own worktree is; before that, a new one on its own branch from what the person has checked out (as
+   * the rest as its own worktree is, or the thread's own copy when it worked here before; a task's room that works in
+   * place, T3's project checkout itself; else a new one on its own branch from what the person has checked out (as
    * folderFor's), or T3's project folder when the thread's folder is in no repository.
    */
   const t3Workspace = (thread) => {
     const current = get(thread.id);
-    if (current?.state === "t3" && current.path) return { type: "existing_worktree", worktreePath: current.path, ...(current.branch ? { branch: current.branch } : {}) };
+    if (current?.state === "in_place" || current?.inPlace) return { type: "root" };
+    if ((current?.state === "t3" || current?.state === "open") && current.path) return { type: "existing_worktree", worktreePath: current.path, ...(current.branch ? { branch: current.branch } : {}) };
     const repo = repositoryOf(thread.goal.workspace);
     if (!repo) return { type: "root" };
     const branch = git(repo.root, ["rev-parse", "--abbrev-ref", "HEAD"]).out;
@@ -147,8 +179,8 @@ export function createWorktrees({ store, root }) {
   /** The thread works in T3 Code from now on; `where` and `branch` once T3 has made its checkout. */
   const inT3 = (threadId, where = null, branch = null) => {
     const current = get(threadId);
-    if (current?.state !== "t3" || (where && where !== current.path)) save(threadId, { state: "t3", path: where ?? current?.path ?? null, branch: branch ?? current?.branch ?? null });
+    if (current?.state !== "t3" || (where && where !== current.path)) save(threadId, { ...current, ...(current?.state === "in_place" ? { inPlace: true } : {}), state: "t3", path: where ?? current?.path ?? null, branch: branch ?? current?.branch ?? null });
   };
 
-  return { folderFor, commitTurn, diff, summary, merge, discard, inPlace, t3Workspace, inT3, get };
+  return { folderFor, commitTurn, diff, summary, merge, discard, moved, inPlace, t3Workspace, inT3, get };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tryharness",
-  "version": "0.7.16",
+  "version": "0.7.22",
   "description": "Harness Relay: the daemon that turns the agents on this machine into your personal swarm. Memory, history, and work handed between any of them.",
   "bin": {
     "tryharness": "cli.mjs"
@@ -39,8 +39,8 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "tryharness-desktop-darwin-arm64": "0.7.16",
-    "tryharness-desktop-darwin-x64": "0.7.16",
+    "tryharness-desktop-darwin-arm64": "0.7.22",
+    "tryharness-desktop-darwin-x64": "0.7.22",
     "tryharness-desktop-linux-x64": "0.7.4",
     "tryharness-desktop-win32-x64": "0.7.4"
   }