tesseract-agent 0.9.28 → 0.9.29

package/dist-bundle/cli.js

@@ -70555,15 +70555,24 @@ async function restore(dir2, tree) {
   try {
     if (await git(dir2, ["read-tree", tree], { GIT_INDEX_FILE: indexFile }) === null)
       return null;
-    const diff = await git(dir2, ["diff-index", "--name-status", tree], { GIT_INDEX_FILE: indexFile });
+    await git(dir2, ["update-index", "--refresh", "-q"], { GIT_INDEX_FILE: indexFile });
+    const diff = await git(dir2, ["diff-index", "-z", "--name-status", tree], { GIT_INDEX_FILE: indexFile });
     const restored = [];
     const recreated = [];
-    for (const line of (diff ?? "").split("\n").filter(Boolean)) {
-      const [status2, ...rest] = line.split(/\s+/);
-      const path6 = rest.join(" ");
-      if (!path6)
+    const fields = (diff ?? "").split("\0").filter((f) => f !== "");
+    for (let i = 0; i < fields.length; ) {
+      const code = fields[i++];
+      if (code.startsWith("R") || code.startsWith("C")) {
+        i++;
+        const to = fields[i++];
+        if (to !== void 0)
+          restored.push(to);
         continue;
-      (status2.startsWith("D") ? recreated : restored).push(path6);
+      }
+      const path6 = fields[i++];
+      if (path6 === void 0)
+        break;
+      (code.startsWith("D") ? recreated : restored).push(path6);
     }
     if (await git(dir2, ["checkout-index", "-a", "-f"], { GIT_INDEX_FILE: indexFile }) === null)
       return null;
@@ -70581,8 +70590,9 @@ async function preview(dir2, tree) {
   try {
     if (await git(dir2, ["read-tree", tree], { GIT_INDEX_FILE: indexFile }) === null)
       return null;
-    const diff = await git(dir2, ["diff-index", "--name-only", tree], { GIT_INDEX_FILE: indexFile });
-    return { changed: (diff ?? "").split("\n").filter(Boolean) };
+    await git(dir2, ["update-index", "--refresh", "-q"], { GIT_INDEX_FILE: indexFile });
+    const diff = await git(dir2, ["diff-index", "-z", "--name-only", tree], { GIT_INDEX_FILE: indexFile });
+    return { changed: (diff ?? "").split("\0").filter((f) => f !== "") };
   } finally {
     await rm(tmp, { recursive: true, force: true }).catch(() => {
     });
@@ -71226,26 +71236,42 @@ async function createClaudeCodeBackend(send4, onBrowserRequest, loadPluginRuntim
   const sendWatchingSessions = (msg, origin) => {
     if (msg.type === "chat:complete" && msg.sessionId) {
       const sid = msg.sessionId;
-      const seq3 = (claudeTurnSeq.get(sid) ?? 1) - 1;
-      if (seq3 >= 0 && claudeSnapshots.treeFor(sid, `claude-user-${seq3}`)) {
-        void (async () => {
+      const queue3 = pendingAlias.get(sid);
+      if (queue3?.length) {
+        aliasChain.set(sid, (aliasChain.get(sid) ?? Promise.resolve()).then(async () => {
+          const job = queue3.shift();
+          if (!job)
+            return;
           for (let attempt = 0; attempt < 12; attempt++) {
             const rows = await store.getSessionMessages(sid).catch(() => []);
-            const lastUser = [...rows].reverse().find((m) => m.role === "user" && m.uuid)?.uuid;
-            if (lastUser) {
-              claudeSnapshots.alias(sid, `claude-user-${seq3}`, lastUser);
+            const fresh = rows.find((m) => m.role === "user" && m.uuid && !job.knownUuids.has(m.uuid))?.uuid;
+            if (fresh) {
+              claudeSnapshots.alias(sid, job.key, fresh);
               return;
             }
             await new Promise((r) => setTimeout(r, 200));
           }
-        })();
+        }).catch(() => {
+        }).finally(() => {
+          if (!pendingAlias.get(sid)?.length) {
+            pendingAlias.delete(sid);
+            aliasChain.delete(sid);
+          }
+        }));
       }
     }
     if (msg.type === "session:created" && msg.sessionId) {
-      claudeSnapshots.transfer(PENDING_SESSION, msg.sessionId);
-      claudeSnapshots.forget(PENDING_SESSION);
-      claudeTurnSeq.set(msg.sessionId, claudeTurnSeq.get(PENDING_SESSION) ?? 0);
-      claudeTurnSeq.delete(PENDING_SESSION);
+      const from = pendingKey(msg.clientRequestId);
+      claudeSnapshots.transfer(from, msg.sessionId);
+      claudeSnapshots.forget(from);
+      claudeTurnSeq.set(msg.sessionId, claudeTurnSeq.get(from) ?? 0);
+      claudeTurnSeq.delete(from);
+      const carried = pendingAlias.get(from);
+      if (carried?.length)
+        pendingAlias.set(msg.sessionId, [...pendingAlias.get(msg.sessionId) ?? [], ...carried]);
+      pendingAlias.delete(from);
+      pendingOpened.delete(from);
+      sweepPending();
       pendingSessionId = msg.sessionId;
     }
     send4(msg, origin);
@@ -71253,7 +71279,24 @@ async function createClaudeCodeBackend(send4, onBrowserRequest, loadPluginRuntim
   const manager2 = new AgentManager2(sendWatchingSessions, onBrowserRequest);
   const claudeSnapshots = createSnapshotStore(join19(daemonDir(), "engine-snapshots", "claude-code.json"));
   const claudeTurnSeq = /* @__PURE__ */ new Map();
+  const pendingAlias = /* @__PURE__ */ new Map();
+  const aliasChain = /* @__PURE__ */ new Map();
+  const ALIAS_QUEUE_CAP = 16;
   const PENDING_SESSION = "\0pending";
+  const pendingKey = (clientRequestId) => clientRequestId ? `${PENDING_SESSION}:${clientRequestId}` : PENDING_SESSION;
+  const pendingOpened = /* @__PURE__ */ new Map();
+  const PENDING_TTL_MS = 5 * 6e4;
+  const sweepPending = () => {
+    const cutoff = Date.now() - PENDING_TTL_MS;
+    for (const [key2, at] of [...pendingOpened]) {
+      if (at > cutoff)
+        continue;
+      pendingOpened.delete(key2);
+      claudeSnapshots.forget(key2);
+      claudeTurnSeq.delete(key2);
+      pendingAlias.delete(key2);
+    }
+  };
   let pendingSessionId;
   const hookBus = new HookBus2();
   manager2.setHookBus(hookBus);
@@ -71324,11 +71367,29 @@ async function createClaudeCodeBackend(send4, onBrowserRequest, loadPluginRuntim
      */
     sendMessage: async (params) => {
       if (params.projectDir && !params.autoContinuation) {
-        const key2 = params.sessionId ?? PENDING_SESSION;
+        const key2 = params.sessionId ?? pendingKey(params.clientRequestId);
+        if (!params.sessionId) {
+          pendingOpened.set(key2, Date.now());
+          sweepPending();
+        }
         const seq3 = claudeTurnSeq.get(key2) ?? 0;
         claudeTurnSeq.set(key2, seq3 + 1);
-        await claudeSnapshots.take(key2, `claude-user-${seq3}`, params.projectDir).catch(() => {
+        const snapKey = `claude-user-${seq3}`;
+        await claudeSnapshots.take(key2, snapKey, params.projectDir).catch(() => {
         });
+        if (params.sessionId) {
+          const rows = await store.getSessionMessages(params.sessionId).catch(() => []);
+          const known = new Set(rows.filter((m) => m.role === "user" && m.uuid).map((m) => m.uuid));
+          const q = pendingAlias.get(params.sessionId) ?? [];
+          q.push({ key: snapKey, knownUuids: known });
+          while (q.length > ALIAS_QUEUE_CAP)
+            q.shift();
+          pendingAlias.set(params.sessionId, q);
+        } else {
+          const q = pendingAlias.get(key2) ?? [];
+          q.push({ key: snapKey, knownUuids: /* @__PURE__ */ new Set() });
+          pendingAlias.set(key2, q);
+        }
       }
       const result = await manager2.sendMessage(params);
       return result;
@@ -72835,7 +72896,7 @@ function writeManagedMcpHome(engineId, layout, servers, projectDir, baseDir, use
       if (modern || !t.legacyBudget)
         node[t.levelKey] = level;
       else
-        node[t.legacyBudget.key] = thinkingBudget === "off" ? 0 : thinkingBudget;
+        node[t.legacyBudget.key] = t.legacyBudget.clamp(model, thinkingBudget === "off" ? 0 : thinkingBudget);
       let parent = settings;
       for (const k of t.overridesPath.slice(0, -1)) {
         const next = parent[k];
@@ -73738,6 +73799,16 @@ var GEMINI_ACP = {
           if (!model.startsWith("gemini-"))
             return true;
           return /^gemini-(?:[3-9]|\d{2,})/.test(model);
+        },
+        clamp: (model, budget) => {
+          const lite = /flash-lite/.test(model ?? "");
+          const pro = /-pro\b/.test(model ?? "");
+          const zeroOk = !pro;
+          const min = pro ? 128 : lite ? 512 : /flash/.test(model ?? "") ? 0 : 512;
+          const max = pro ? 32768 : 24576;
+          if (budget <= 0)
+            return zeroOk ? 0 : min;
+          return Math.min(max, Math.max(min, Math.round(budget)));
         }
       },
       // Non-empty, because an empty match is DISCARDED. `overrideScope: 'core'` matches when
@@ -75727,15 +75798,15 @@ function compactionVerdict(method, p, state3) {
   if (method === "turn/started" && state3.turnId === void 0 && !state3.userTurnOnThread) {
     return tn.id ? { verdict: "claim", turnId: tn.id } : { verdict: "ignore" };
   }
-  const id = method === "error" ? String(p.turnId ?? "") : tn.id ?? "";
-  if (state3.turnId === void 0 || id !== state3.turnId)
+  const id = String(tn.id ?? p.turnId ?? "");
+  if (state3.turnId === void 0 || !id || id !== state3.turnId)
     return { verdict: "ignore" };
   if (method === "turn/completed")
     return { verdict: tn.status === "completed" ? "ok" : "failed" };
   if (method === "error") {
-    return p.willRetry === true ? { verdict: "ignore" } : { verdict: "failed" };
+    return p.willRetry === true ? { verdict: "alive" } : { verdict: "failed" };
   }
-  return { verdict: "ignore" };
+  return { verdict: "alive" };
 }
 function approvalPolicyFor(mode) {
   switch (mode) {
@@ -75951,7 +76022,8 @@ function createCodexAppServerBackend(send4, resolve16, onBrowserRequest, loadPlu
   const verifyOff = /* @__PURE__ */ new Set();
   const lastTurnDiff = /* @__PURE__ */ new Map();
   const compactWaiters = /* @__PURE__ */ new Map();
-  const COMPACT_TIMEOUT_MS = 18e4;
+  const COMPACT_IDLE_MS = 18e4;
+  const COMPACT_CEILING_MS = 9e5;
   const tokenUsage = /* @__PURE__ */ new Map();
   let lastWindow;
   const snapshots = createSnapshotStore(join26(daemonDir2(), "engine-snapshots", "openai-codex.json"));
@@ -76121,6 +76193,7 @@ function createCodexAppServerBackend(send4, resolve16, onBrowserRequest, loadPlu
       });
       if (verdict === "claim") {
         pendingCompact.turnId = turnId;
+        pendingCompact.keepAlive();
         return;
       }
       if (verdict === "ok") {
@@ -76131,6 +76204,10 @@ function createCodexAppServerBackend(send4, resolve16, onBrowserRequest, loadPlu
         pendingCompact.settle(false);
         return;
       }
+      if (verdict === "alive") {
+        pendingCompact.keepAlive();
+        return;
+      }
     }
     const turn = threadId ? turns.get(threadId) : void 0;
     if (!turn)
@@ -76485,13 +76562,20 @@ function createCodexAppServerBackend(send4, resolve16, onBrowserRequest, loadPlu
         return;
       }
       const compacted = await new Promise((resolve17) => {
+        let idle;
         const finish = (ok2) => {
           compactWaiters.delete(threadId);
-          clearTimeout(timer2);
+          clearTimeout(idle);
+          clearTimeout(ceiling);
           resolve17(ok2);
         };
-        const timer2 = setTimeout(() => finish(false), COMPACT_TIMEOUT_MS);
-        compactWaiters.set(threadId, { settle: finish });
+        const arm = () => {
+          clearTimeout(idle);
+          idle = setTimeout(() => finish(false), COMPACT_IDLE_MS);
+        };
+        const ceiling = setTimeout(() => finish(false), COMPACT_CEILING_MS);
+        arm();
+        compactWaiters.set(threadId, { settle: finish, keepAlive: arm });
       });
       if (!compacted) {
         fail3(threadId, params.clientRequestId, `${label} did not finish compacting this conversation in time.`, origin);
@@ -100757,8 +100841,21 @@ async function runDaemon(opts = {}) {
     process.exit(code);
   }
   startSystemEvents({ version: VERSION2, log: (m) => log9(m) });
-  process.on("SIGTERM", () => shutdown(0, "signal:SIGTERM"));
-  process.on("SIGINT", () => shutdown(0, "signal:SIGINT"));
+  const mergedProcess = opts.merged ?? (process.env.CCB_MERGED_PROCESS === "1" || process.argv.includes("--merged"));
+  const deliberateMergedQuit = () => !!globalThis.__ccbDeliberateQuit;
+  const onTermSignal = (sig) => {
+    if (mergedProcess && !deliberateMergedQuit()) {
+      try {
+        log9(`${sig} received \u2014 IGNORED (merged: always-on app; a rival daemon's takeover must never kill the window)`);
+        snapshotProcs(`${sig}-ignored`);
+      } catch {
+      }
+      return;
+    }
+    shutdown(0, `signal:${sig}`);
+  };
+  process.on("SIGTERM", () => onTermSignal("SIGTERM"));
+  process.on("SIGINT", () => onTermSignal("SIGINT"));
   try {
     process.on("SIGHUP", () => {
       try {
@@ -100795,8 +100892,6 @@ async function runDaemon(opts = {}) {
   try {
     const eapp = electronModule()?.app;
     if (eapp) {
-      const mergedProcess = opts.merged ?? (process.env.CCB_MERGED_PROCESS === "1" || process.argv.includes("--merged"));
-      const deliberateMergedQuit = () => !!globalThis.__ccbDeliberateQuit;
       eapp.on("before-quit", (e) => {
         if (mergedProcess) {
           if (deliberateMergedQuit()) {
@@ -101696,6 +101791,10 @@ async function listMeshes() {
   const r = await call("/meshes", { method: "GET" });
   return r.ok ? { ok: true, meshes: r.data } : r;
 }
+async function deleteMesh(args) {
+  const r = await call(`/meshes/${encodeURIComponent(args.meshId)}?confirm=${encodeURIComponent(args.confirm)}`, { method: "DELETE" });
+  return r.ok ? { ok: true, deleted: r.data.deleted } : r;
+}
 async function createMesh(args = {}) {
   const r = await call("/meshes", {
     method: "POST",
@@ -101739,7 +101838,7 @@ async function enrolWith(requested, post) {
   const sig = await generateSigningKey();
   const staticPrivate = await rawPrivate(stat9.privateKey);
   const sigPrivate = await rawPrivate(sig.privateKey);
-  const r = await post(hex4(stat9.publicRaw), hex4(sig.publicRaw));
+  const r = await post(hex4(stat9.publicRaw), hex4(sig.publicRaw), name);
   if (!r.ok)
     return r;
   const cert = fromHexOrB64(r.data.cert);
@@ -101770,13 +101869,13 @@ async function enrolWith(requested, post) {
   };
 }
 async function enrol(args) {
-  return enrolWith(args.name, (staticPub, sigPub) => call(`/meshes/${encodeURIComponent(args.meshId)}/nodes`, {
+  return enrolWith(args.name, (staticPub, sigPub, name) => call(`/meshes/${encodeURIComponent(args.meshId)}/nodes`, {
     method: "POST",
-    body: { name: args.name, staticPub, sigPub }
+    body: { name, staticPub, sigPub }
   }));
 }
 async function joinWithToken(args) {
-  return enrolWith(args.name, async (staticPub, sigPub) => postJoin(args.origin, { token: args.token, name: args.name, staticPub, sigPub }));
+  return enrolWith(args.name, async (staticPub, sigPub, name) => postJoin(args.origin, { token: args.token, name, staticPub, sigPub }));
 }
 async function postJoin(origin, body) {
   const base = origin ?? readCredentials()?.apiOrigin;
@@ -101807,7 +101906,7 @@ async function postJoin(origin, body) {
   return { ok: true, data: JSON.parse(text9) };
 }
 async function enrolWithCode(args) {
-  return enrolWith(args.name, async (staticPub, sigPub) => postJoin(args.origin, { code: args.code, name: args.name, staticPub, sigPub }));
+  return enrolWith(args.name, async (staticPub, sigPub, name) => postJoin(args.origin, { code: args.code, name, staticPub, sigPub }));
 }
 async function rawPrivate(key2) {
   const pkcs8 = new Uint8Array(await crypto.subtle.exportKey("pkcs8", key2));
@@ -102611,6 +102710,8 @@ Running a network (needs a signed-in account):
   tesseract-agent net token MESH [--rotate]  Show the join token again, or replace it
   tesseract-agent net approve MESH NODE      Let a waiting machine on
   tesseract-agent net remove MESH NODE       Cut a machine off for good
+  tesseract-agent net destroy MESH --confirm NAME
+                                             Delete a network for good. Irreversible.
   tesseract-agent net code new MESH [--uses N] [--ttl MIN] [--json]
                                              A ONE-SHOT code, for anyone who wants one
   tesseract-agent net join-me MESH [--name N]
@@ -102805,10 +102906,6 @@ async function netCommand(rest, flags) {
     if (r.name !== name) {
       console.log(`(another machine on this network is already called "${name}")`);
     }
-    console.log(`
-Six-word check \u2014 these must match on your admin's screen:`);
-    console.log(`  ${r.sas.join(" ")}
-`);
     if (!r.approved) {
       console.log("This network requires an admin to approve new machines.");
       console.log("You are enrolled and waiting \u2014 nothing else to do on this machine.");
@@ -102858,6 +102955,25 @@ Six-word check \u2014 these must match on your admin's screen:`);
     }
     return;
   }
+  if (sub === "destroy" || sub === "mesh" && rest[1] === "delete") {
+    const meshId = sub === "destroy" ? rest[1] : rest[2];
+    const confirm2 = str2(flags.confirm);
+    if (!meshId) {
+      console.error("net destroy: name the network \u2014 tesseract-agent net destroy <ID> --confirm <NAME>");
+      process.exit(1);
+    }
+    if (!confirm2) {
+      console.error("net destroy: pass --confirm with the network's exact name. This cannot be undone.");
+      process.exit(1);
+    }
+    const r = await deleteMesh({ meshId, confirm: confirm2 });
+    if (!r.ok) {
+      console.error(`net destroy: ${r.detail}`);
+      process.exit(1);
+    }
+    console.log(`Deleted "${r.deleted}". Every machine that was on it now holds a certificate for a network that no longer exists.`);
+    return;
+  }
   if (sub === "new" || sub === "mesh" && rest[1] === "create") {
     const name = sub === "new" ? rest[1] : str2(flags.name);
     const approve = str2(flags.approve);
@@ -102993,10 +103109,6 @@ Six-word check \u2014 these must match on your admin's screen:`);
     }
     console.log(`Joined ${r.meshId} as "${r.name}" \u2014 this machine is ${r.overlayIp4}.`);
     if (r.name !== nm) console.log(`(another machine here is already called "${nm}")`);
-    console.log(`
-Six-word check:
-  ${r.sas.join(" ")}
-`);
     return;
   }
   if (sub === "peers") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tesseract-agent",
-  "version": "0.9.28",
+  "version": "0.9.29",
   "license": "UNLICENSED",
   "publishConfig": {
     "access": "public",