perchai-cli 2.4.21 → 2.4.22

package/dist/perch.mjs

@@ -75566,7 +75566,6 @@ var init_payroll = __esm({
 // lib/perchBusinessTools/index.ts
 var init_perchBusinessTools = __esm({
   "lib/perchBusinessTools/index.ts"() {
-    "use strict";
     init_generateAPAuditPacket();
     init_inventoryFolder();
     init_loadBusinessTables();
@@ -75900,6 +75899,7 @@ function isTurnAbortedError(error) {
 var TURN_STOPPED_BY_USER_MESSAGE;
 var init_turnAbort = __esm({
   "features/perchTerminal/runtime/turnAbort.ts"() {
+    "use strict";
     TURN_STOPPED_BY_USER_MESSAGE = "Turn stopped by user.";
   }
 });
@@ -259813,7 +259813,7 @@ var require_websocket = __commonJS({
     var http2 = __require("http");
     var net = __require("net");
     var tls = __require("tls");
-    var { randomBytes, createHash: createHash4 } = __require("crypto");
+    var { randomBytes, createHash: createHash5 } = __require("crypto");
     var { Duplex, Readable } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -260481,7 +260481,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash4("sha1").update(key + GUID).digest("base64");
+        const digest = createHash5("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -260850,7 +260850,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter3 = __require("events");
     var http2 = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash: createHash4 } = __require("crypto");
+    var { createHash: createHash5 } = __require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -261157,7 +261157,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash4("sha1").update(key + GUID).digest("base64");
+        const digest = createHash5("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -283093,6 +283093,7 @@ __export(perch_cli_exports, {
   runPerchCli: () => runPerchCli
 });
 import fs14 from "node:fs";
+import { createHash as createHash4 } from "node:crypto";
 import os5 from "node:os";
 import path14 from "node:path";
 import readline from "node:readline/promises";
@@ -283123,7 +283124,8 @@ ${HELP_TEXT}`);
       const connection = await connectModelProxy({ appUrl: parsed.appUrl });
       try {
         const threadId = parsed.threadId?.trim() || "cli-default";
-        const persisted = await hydrateCliThreadState(threadId);
+        const threadScopeKey = await resolveCliThreadScopeKey(connection);
+        const persisted = await hydrateCliThreadState(threadId, threadScopeKey);
         const hostedContext = await fetchCliHostedContext(connection, {
           query: parsed.prompt,
           threadId
@@ -283165,6 +283167,7 @@ ${HELP_TEXT}`);
         });
         await persistCliThreadState({
           threadId: result3.threadId,
+          threadScopeKey,
           recentMessages: nextRecentMessages,
           contextSnapshot: result3.contextSnapshot ?? persisted?.contextSnapshot ?? null
         });
@@ -283439,14 +283442,15 @@ async function runReadlineInteractivePerchCli(writer, deps, options) {
     terminal: true
   });
   const state = createInteractiveCliState(options);
-  await hydrateInteractiveCliState(state);
   const connectModelProxy = deps.connectModelProxy ?? connectCliModelProxy;
   let connection = await connectModelProxy({ appUrl: state.appUrl });
   if (!state.appUrl && connection.appUrl) state.appUrl = connection.appUrl;
+  await syncInteractiveCliThreadScope(state, connection, { force: true });
   const reconnect = async () => {
     connection.restore();
     connection = await connectModelProxy({ appUrl: state.appUrl });
     if (!state.appUrl && connection.appUrl) state.appUrl = connection.appUrl;
+    await syncInteractiveCliThreadScope(state, connection);
   };
   writer.stdout(renderInteractiveStartup(state, connection));
   try {
@@ -283532,14 +283536,15 @@ async function runInkInteractivePerchCli(writer, deps, options) {
       init_build2().then(() => build_exports)
     ]);
     const state = createInteractiveCliState(options);
-    await hydrateInteractiveCliState(state);
     const connectModelProxy = deps.connectModelProxy ?? connectCliModelProxy;
     let connection = await connectModelProxy({ appUrl: state.appUrl });
     if (!state.appUrl && connection.appUrl) state.appUrl = connection.appUrl;
+    await syncInteractiveCliThreadScope(state, connection, { force: true });
     const reconnect = async () => {
       connection.restore();
       connection = await connectModelProxy({ appUrl: state.appUrl });
       if (!state.appUrl && connection.appUrl) state.appUrl = connection.appUrl;
+      await syncInteractiveCliThreadScope(state, connection);
     };
     const runTurn = deps.runCliTurn ?? runPerchCliTurn;
     const instance = Ink2.render(
@@ -284340,7 +284345,7 @@ async function runInteractiveSlashCommand(input) {
       input.state.contextSnapshot = null;
       input.state.persistedThreadUpdatedAt = null;
       clearThreadSession(input.state.threadId);
-      await deleteCliThreadState(input.state.threadId);
+      await deleteCliThreadState(input.state.threadId, input.state.threadScopeKey);
       writeModeLine(input.writer, "memory", "cleared");
       return "continue";
     case "login":
@@ -284539,6 +284544,7 @@ function createInteractiveCliState(options) {
     personaId: options.personaId ?? "saffron",
     permissionMode: options.permissionMode ?? "default",
     threadId: options.threadId?.trim() || "cli-default",
+    threadScopeKey: null,
     desktopConnected: options.desktopConnected ?? false,
     cliLocalTools: options.cliLocalTools ?? true,
     appUrl: resolveCliAppUrl(options.appUrl ?? null, null),
@@ -284548,14 +284554,25 @@ function createInteractiveCliState(options) {
   };
 }
 async function hydrateInteractiveCliState(state) {
-  const persisted = await hydrateCliThreadState(state.threadId);
+  const persisted = await hydrateCliThreadState(state.threadId, state.threadScopeKey);
   if (!persisted) return;
   state.recentMessages = persisted.recentMessages;
   state.contextSnapshot = persisted.contextSnapshot;
   state.persistedThreadUpdatedAt = persisted.updatedAt;
 }
-async function hydrateCliThreadState(threadId) {
-  const persisted = await readCliThreadState(threadId);
+async function syncInteractiveCliThreadScope(state, connection, options = {}) {
+  const nextScopeKey = await resolveCliThreadScopeKey(connection);
+  if (!options.force && state.threadScopeKey === nextScopeKey) return;
+  state.threadScopeKey = nextScopeKey;
+  state.recentMessages = [];
+  state.contextSnapshot = null;
+  state.persistedThreadUpdatedAt = null;
+  clearThreadSession(state.threadId);
+  await hydrateInteractiveCliState(state);
+}
+async function hydrateCliThreadState(threadId, threadScopeKey) {
+  const persisted = await readCliThreadState(threadId, threadScopeKey);
+  clearThreadSession(threadId);
   if (!persisted) return null;
   if (persisted.threadSession) {
     await saveThreadSession(persisted.threadSession);
@@ -284565,6 +284582,7 @@ async function hydrateCliThreadState(threadId) {
 async function persistInteractiveCliState(state) {
   await persistCliThreadState({
     threadId: state.threadId,
+    threadScopeKey: state.threadScopeKey,
     recentMessages: state.recentMessages,
     contextSnapshot: state.contextSnapshot
   });
@@ -284580,13 +284598,13 @@ async function persistCliThreadState(input) {
     threadSession,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  const filePath = cliThreadStatePath(input.threadId);
+  const filePath = cliThreadStatePath(input.threadId, input.threadScopeKey);
   await fs14.promises.mkdir(path14.dirname(filePath), { recursive: true, mode: 448 });
   await fs14.promises.writeFile(filePath, JSON.stringify(payload, null, 2), { mode: 384 });
 }
-async function readCliThreadState(threadId) {
+async function readCliThreadState(threadId, threadScopeKey) {
   try {
-    const raw = await fs14.promises.readFile(cliThreadStatePath(threadId), "utf8");
+    const raw = await fs14.promises.readFile(cliThreadStatePath(threadId, threadScopeKey), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed.version !== 1 || parsed.threadId !== threadId) return null;
     return {
@@ -284601,12 +284619,28 @@ async function readCliThreadState(threadId) {
     return null;
   }
 }
-async function deleteCliThreadState(threadId) {
-  await fs14.promises.rm(cliThreadStatePath(threadId), { force: true }).catch(() => void 0);
+async function deleteCliThreadState(threadId, threadScopeKey) {
+  await fs14.promises.rm(cliThreadStatePath(threadId, threadScopeKey), { force: true }).catch(() => void 0);
 }
-function cliThreadStatePath(threadId) {
+function cliThreadStatePath(threadId, threadScopeKey) {
   const base = process.env.PERCH_CLI_STATE_DIR?.trim() || path14.join(os5.homedir(), ".perch", "threads");
-  return path14.join(base, `${safeCliThreadId(threadId)}.json`);
+  return path14.join(base, safeCliThreadScopeKey(threadScopeKey), `${safeCliThreadId(threadId)}.json`);
+}
+async function resolveCliThreadScopeKey(connection) {
+  const session = await readStoredCliAuthSession().catch(() => null);
+  const sessionUsable = isStoredCliAuthSessionUsable(session);
+  const authenticated = Boolean(connection?.authenticated || sessionUsable);
+  const appUrl = connection?.appUrl ?? session?.appUrl ?? "local";
+  const userId = connection?.userId ?? session?.userId ?? null;
+  const email = connection?.email ?? session?.email ?? null;
+  const fallbackToken = authenticated && !userId && !email ? session?.accessToken ?? null : null;
+  const authKey = authenticated ? `user:${userId ?? ""}|email:${email ?? ""}|token:${fallbackToken ? createHash4("sha256").update(fallbackToken).digest("hex").slice(0, 20) : ""}` : "anonymous";
+  const raw = `app:${appUrl}|${authKey}`;
+  const prefix = authenticated ? "user" : "anon";
+  return `${prefix}-${createHash4("sha256").update(raw).digest("hex").slice(0, 20)}`;
+}
+function safeCliThreadScopeKey(threadScopeKey) {
+  return (threadScopeKey?.trim() || "anon-local").replace(/[^a-zA-Z0-9_.-]+/g, "_").slice(0, 96);
 }
 function safeCliThreadId(threadId) {
   return threadId.trim().replace(/[^a-zA-Z0-9_.-]+/g, "_").slice(0, 96) || "cli-default";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perchai-cli",
-  "version": "2.4.21",
+  "version": "2.4.22",
   "description": "Perch AI command-line interface",
   "bin": {
     "perch": "bin/perch"