perchai-cli 2.4.20 → 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.";
   }
 });
@@ -78260,7 +78260,7 @@ var init_permissionModes = __esm({
 });
 
 // features/perchTerminal/runtime/perchMemoryGuidance.ts
-var VISIBLE_OUTPUT_STYLE_GUIDANCE, SAFFRON_CORE_IDENTITY, QUILL_CORE_IDENTITY, PERCH_MEMORY_GUIDANCE;
+var VISIBLE_OUTPUT_STYLE_GUIDANCE, SAFFRON_STYLE_CONTRACT, QUILL_STYLE_CONTRACT, SAFFRON_CORE_IDENTITY, QUILL_CORE_IDENTITY, PERCH_MEMORY_GUIDANCE;
 var init_perchMemoryGuidance = __esm({
   "features/perchTerminal/runtime/perchMemoryGuidance.ts"() {
     "use strict";
@@ -78275,6 +78275,31 @@ Avoid stock AI phrases: "delve," "nuanced," "robust," "seamless,"
 Be concise when the user is moving fast.
 Preserve the persona: Quill is warm, literate, and direct; Saffron is sharp,
 practical, and confident.
+`.trim();
+    SAFFRON_STYLE_CONTRACT = `
+## Voice contract \u2014 Saffron (visible output only)
+
+This contract shapes how your replies read. It never changes which tools you
+use, which tasks you take on, or how the work itself is done.
+
+- Direct, sharp, practical, operator-like, confident.
+- Lead with the finding or the action. Decoration is at most a dry aside.
+- Memory texture: use remembered facts operationally ("your close lands on the
+  5th, so this ships before it") \u2014 state the fact, use it, move on.
+- Concise. Confidence reads as economy, not volume.
+`.trim();
+    QUILL_STYLE_CONTRACT = `
+## Voice contract \u2014 Quill (visible output only)
+
+This contract shapes how your replies read. It never changes which tools you
+use, which tasks you take on, or how the work itself is done.
+
+- Warm, personable, literate, more emotionally present than a status report.
+- Lightly humorous when it arises naturally; never forced, never a bit.
+- Memory texture: when relevant personal memories are in context, weave them in
+  naturally ("you mentioned the board reads these, so I kept it tight").
+- Still concise and useful. Warmth lives in the engagement, not the word count.
+- Hard limits: not verbose, not therapeutic, not flirty, not over-familiar.
 `.trim();
     SAFFRON_CORE_IDENTITY = `
 You are Saffron \u2014 Perch's workspace operator.
@@ -78411,6 +78436,11 @@ working through a paper. Founders tightening a pitch. Anyone who wants their
 words to land. You don't try to write *for* people; you help them write
 *better*. You know the difference, and you respect the difference.
 
+Writing is your craft home, not your fence. You're a full Perch operator: when
+the user needs analysis, files, data, an audit, or delivery, you do that work
+yourself with the same tools \u2014 in your own voice. You never punt real work to
+another persona.
+
 ## How you work
 
 Read first. Before you draft a single sentence, you know what the piece is for,
@@ -80878,6 +80908,7 @@ var init_personaRegistry = __esm({
         label: "Saffron",
         shortDescription: "Operator. Direct, sharp, finds the thing.",
         identityPrompt: SAFFRON_CORE_IDENTITY,
+        styleContract: SAFFRON_STYLE_CONTRACT,
         suggestedPrompts: [
           "Audit the AP folder for duplicates and anomalies",
           "Reconcile the GL against last month's subledger",
@@ -80901,6 +80932,7 @@ var init_personaRegistry = __esm({
         label: "Quill",
         shortDescription: "Writing companion. Warm, craft-aware, reads first.",
         identityPrompt: QUILL_CORE_IDENTITY,
+        styleContract: QUILL_STYLE_CONTRACT,
         suggestedPrompts: [
           "Draft a memo on personal jurisdiction",
           "Brief Pennoyer v. Neff",
@@ -85443,9 +85475,9 @@ var QUILL_SPECIALIST_AGENTS_PROMPT;
 var init_quillSpecialistPrompt = __esm({
   "features/perchTerminal/agentPlatform/quillSpecialistPrompt.ts"() {
     QUILL_SPECIALIST_AGENTS_PROMPT = `
-## Quill \u2014 Specialist Delegation
+## Writing & Research \u2014 Specialist Delegation
 
-You are Quill, the writing persona. You do not run playbooks or suites. You write and deliver in your own loop, dispatching specialists ONLY for research/verification fan-out \u2014 never for delivery.
+This task is writing/research/legal shaped. You write and deliver in your own loop, dispatching specialists ONLY for research/verification fan-out \u2014 never for delivery.
 
 Use specialists (dispatch_agent) when independent research or verification benefits from separation:
 - general_writer: drafts polished letters, memos, essays, emails, and revisions from the user's request plus provided context. It does NOT research \u2014 only give it general_writer work once you already have the sources/facts it needs.
@@ -85483,7 +85515,6 @@ Success rules:
 - Do not say a Google Doc was created or an email was sent unless you have a verified receipt (URL / sent confirmation) or a screenshot showing the result.
 - Safety: never click anything that grants access or changes sharing/permissions, such as "Share & send", "Share", or "Grant access". If a share/permission dialog appears, choose the option that sends without changing permissions, such as "Send without sharing" or "Send anyway".
 - If delivery hits a problem, recover in the same loop. Try the next reasonable path, or ask the user for permission/choice; do not silently stop or skip the requested delivery. Never claim success without proof.
-- If the user asks for finance, AP, payroll, KYC, market, meeting, or close work, suggest Saffron unless the task is purely writing the prose.
 `.trim();
   }
 });
@@ -91884,6 +91915,7 @@ function buildCoreSystemSection(input) {
       ].join("\n")
     );
   }
+  lines.push("", persona.styleContract);
   return lines.join("\n");
 }
 function appendAgentsModeGuidance(input) {
@@ -91916,9 +91948,8 @@ function appendAgentsModeGuidance(input) {
     });
     return;
   }
-  const isQuill = personaId === "quill";
   lines.push(
-    isQuill ? "You're in Quill mode. Get writing, research, legal, and delivery work done by orchestrating specialist sub-agents, not by running suites or playbooks." : "You're in Agents mode. Get the work done.",
+    "You're in Agents mode. Get the work done.",
     "Execute directly when the task is clear and bounded.",
     "For greetings, thanks, quick check-ins, or explanation-only questions, answer directly without tools unless the user asks you to inspect, search, run, create, send, or change something.",
     "For delivery, write/send/change, filesystem, browser, or other external action turns, call the appropriate tool in the same turn and never end with only a promise, preamble, apology, or status line. For chat-only drafts, summaries, opinions, or answers, once evidence is available, synthesize directly in chat and stop.",
@@ -91938,9 +91969,10 @@ function appendAgentsModeGuidance(input) {
   if (approvedPlanBlock) {
     lines.push("", approvedPlanBlock);
   }
-  if (isQuill) {
+  if (personaId === "quill" && isWritingResearchIntent(assemblyInput.trimmedInput)) {
     lines.push("", QUILL_SPECIALIST_AGENTS_PROMPT);
-  } else if (assemblyInput.coordinatorMode || isFinancialOperatorIntent(assemblyInput.trimmedInput)) {
+  }
+  if (assemblyInput.coordinatorMode || isFinancialOperatorIntent(assemblyInput.trimmedInput)) {
     lines.push("", FINANCIAL_OPERATOR_AGENTS_PROMPT);
   }
   lines.push("", PLATFORM_DELIVERY_GUIDANCE);
@@ -92053,6 +92085,11 @@ function isFinancialOperatorIntent(input) {
     input
   );
 }
+function isWritingResearchIntent(input) {
+  return /\b(writ(?:e|ing|ten)|draft|redraft|rewrite|revise|edit|proofread|polish|memo(?:randum)?|essay|letter|brief|motion|paper|article|blog|post|thesis|abstract|summar(?:y|ize|ise)|cit(?:e|ation|ations)|research|sources?|irac|case[-\s]?law|statute|regulation|legal|law\s+review)\b/i.test(
+    input
+  );
+}
 function buildApprovedGeneralPlanBlock(session) {
   const approvedPlan = session?.approvedGeneralPlan;
   if (!approvedPlan) return null;
@@ -199912,6 +199949,7 @@ function containsBrowserDeliveryTask(tasks) {
 var BROWSER_DELIVERY_ROLE_IDS;
 var init_browserDeliveryLock = __esm({
   "features/perchTerminal/agentPlatform/browserDeliveryLock.ts"() {
+    "use strict";
     BROWSER_DELIVERY_ROLE_IDS = /* @__PURE__ */ new Set([
       "doc_writer",
       "email_sender",
@@ -202537,8 +202575,6 @@ async function dispatchAgentHandler(args, ctx) {
     parentToolCallId: ctx.parentToolCallId,
     mcpTools: ctx.mcpTools ?? []
   };
-  const isQuillNormalTurn = ctx.personaId === "quill" && ctx.chatMode !== "coordinator" && !ctx.allowedCallableAgents?.length;
-  void isQuillNormalTurn;
   if (Array.isArray(args.tasks) && args.tasks.length > 0) {
     const tasks = args.tasks.map(
       (t) => ({
@@ -207292,7 +207328,7 @@ var init_sendWorkerMessage2 = __esm({
 });
 
 // features/perchTerminal/runtime/toolSystem/tools/workers/spawnWorker.ts
-var QUILL_BLOCKED_DELIVERY_WORKER_IDS, spawnWorkerTool;
+var spawnWorkerTool;
 var init_spawnWorker2 = __esm({
   "features/perchTerminal/runtime/toolSystem/tools/workers/spawnWorker.ts"() {
     "use strict";
@@ -207301,11 +207337,6 @@ var init_spawnWorker2 = __esm({
     init_agentDispatch();
     init_localScope();
     init_toolNames();
-    QUILL_BLOCKED_DELIVERY_WORKER_IDS = /* @__PURE__ */ new Set([
-      "doc_writer",
-      "email_sender",
-      "calendar_scheduler"
-    ]);
     spawnWorkerTool = {
       name: TOOL_NAMES.spawnWorker,
       classification: { native: false },
@@ -207323,8 +207354,6 @@ var init_spawnWorker2 = __esm({
             errorCode: "worker_event_sink_missing"
           };
         }
-        if (ctx.personaId === "quill" && ctx.chatMode !== "coordinator" && !ctx.allowedCallableAgents?.length && QUILL_BLOCKED_DELIVERY_WORKER_IDS.has(workerId)) {
-        }
         const enrichedContext = await threadPriorSpecialistContext({
           threadId: ctx.threadId,
           roleId: workerId,
@@ -220487,52 +220516,15 @@ var init_toolLoop = __esm({
   }
 });
 
-// features/perchTerminal/runtime/personas/quillToolPolicy.ts
-function isQuillBlockedToolName(toolName) {
-  return QUILL_BLOCKED_TOOL_NAMES.has(toolName);
-}
-function filterToolsForQuill(toolDefinitions) {
-  return toolDefinitions.filter((tool) => !isQuillBlockedToolName(tool.function.name));
-}
-var QUILL_BLOCKED_TOOL_NAMES;
-var init_quillToolPolicy = __esm({
-  "features/perchTerminal/runtime/personas/quillToolPolicy.ts"() {
-    "use strict";
-    init_toolNames();
-    QUILL_BLOCKED_TOOL_NAMES = /* @__PURE__ */ new Set([
-      TOOL_NAMES.runSuite,
-      TOOL_NAMES.runManagedPlaybook,
-      TOOL_NAMES.listSuiteCatalog,
-      TOOL_NAMES.proposeSuitePlan,
-      TOOL_NAMES.executeSuitePlan,
-      TOOL_NAMES.proposeWork,
-      TOOL_NAMES.executeWork,
-      TOOL_NAMES.generateAPAuditPacket,
-      TOOL_NAMES.safeBrowserAction,
-      // Deprecated non-verified shortcuts — superseded by the verified surface tools.
-      TOOL_NAMES.gmailSendEmail,
-      TOOL_NAMES.gmailSaveDraft,
-      TOOL_NAMES.googleDocsCreate,
-      TOOL_NAMES.googleDocsAppend,
-      TOOL_NAMES.googleCalendarCreateEvent,
-      TOOL_NAMES.googleSheetsCreate,
-      TOOL_NAMES.googleSheetsAppendRows
-    ]);
-  }
-});
-
-// features/perchTerminal/runtime/personas/saffronToolPolicy.ts
+// features/perchTerminal/runtime/personas/sharedToolPolicy.ts
 function filterSuiteRelayTools(toolDefinitions, opts = {}) {
   if (opts.allowSuiteRelay) return toolDefinitions;
   return toolDefinitions.filter(
     (tool) => !SUITE_RELAY_TOOL_NAMES.has(tool.function.name)
   );
 }
-function filterToolsForSaffron(toolDefinitions, opts = {}) {
-  return filterSuiteRelayTools(toolDefinitions, opts);
-}
-var init_saffronToolPolicy = __esm({
-  "features/perchTerminal/runtime/personas/saffronToolPolicy.ts"() {
+var init_sharedToolPolicy = __esm({
+  "features/perchTerminal/runtime/personas/sharedToolPolicy.ts"() {
     "use strict";
     init_suiteRelayKillSwitch();
   }
@@ -220650,10 +220642,7 @@ async function runLiveAgentsLoop(input) {
       PLAN_MODE_ALLOWED_TOOL_NAMES
     ) : effectiveChatMode === "ask" ? [] : getReadOnlyToolDefinitions(toolOpts);
     const suiteRelayEnabled = isSuiteRelayEnabled();
-    const personaFilteredTools = turn.personaId === "quill" ? filterToolsForQuill(baseAgentsTools) : turn.personaId === "saffron" ? filterToolsForSaffron(baseAgentsTools, {
-      allowSuiteRelay: suiteRelayEnabled
-    }) : baseAgentsTools;
-    const suiteRelayFilteredTools = filterSuiteRelayTools(personaFilteredTools, {
+    const suiteRelayFilteredTools = filterSuiteRelayTools(baseAgentsTools, {
       allowSuiteRelay: suiteRelayEnabled
     });
     const deliveryPolicyDeliveryOperatorOnly = turn.deliveryOperatorOnly === true;
@@ -221106,8 +221095,7 @@ var init_liveAgentsLoop = __esm({
     init_toolNames();
     init_planModeStateMachine();
     init_toolPermissionPolicy();
-    init_quillToolPolicy();
-    init_saffronToolPolicy();
+    init_sharedToolPolicy();
     init_deliveryToolPolicy();
     init_threadSession();
     init_sandboxProvenance();
@@ -225245,10 +225233,7 @@ async function runOperatorTurn(input, deps) {
       getEnabledToolDefinitions(toolOpts),
       PLAN_MODE_ALLOWED_TOOL_NAMES
     ) : effectiveChatMode === "agents" ? getExecutableToolDefinitions(toolOpts) : effectiveChatMode === "ask" ? [] : getReadOnlyToolDefinitions(toolOpts);
-    const personaFilteredTools = enrichedInput.personaId === "quill" ? filterToolsForQuill(baseTurnToolDefinitions) : enrichedInput.personaId === "saffron" ? filterToolsForSaffron(baseTurnToolDefinitions, {
-      allowSuiteRelay: suiteRelayEnabled
-    }) : baseTurnToolDefinitions;
-    const suiteRelayFilteredTools = filterSuiteRelayTools(personaFilteredTools, {
+    const suiteRelayFilteredTools = filterSuiteRelayTools(baseTurnToolDefinitions, {
       allowSuiteRelay: suiteRelayEnabled
     });
     const turnToolDefinitions = filterMainPersonaDeliveryTools(suiteRelayFilteredTools, {
@@ -225936,8 +225921,7 @@ var init_runOperatorTurn = __esm({
     init_folderIndexing();
     init_approvalResume();
     init_personaRegistry();
-    init_quillToolPolicy();
-    init_saffronToolPolicy();
+    init_sharedToolPolicy();
     init_deliveryToolPolicy();
     init_voiceFilters();
     init_progressEventBridge();
@@ -259829,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();
@@ -260497,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;
@@ -260866,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();
@@ -261173,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",
@@ -283109,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";
@@ -283139,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
@@ -283181,6 +283167,7 @@ ${HELP_TEXT}`);
         });
         await persistCliThreadState({
           threadId: result3.threadId,
+          threadScopeKey,
           recentMessages: nextRecentMessages,
           contextSnapshot: result3.contextSnapshot ?? persisted?.contextSnapshot ?? null
         });
@@ -283455,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 {
@@ -283548,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(
@@ -283848,7 +283837,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                       text: `bash \xB7 ${truncateMiddle(commandText, 54)} \xB7 running`,
                       tone: "muted",
                       detailLines: [
-                        { tone: "command", text: `$ ${commandText}` },
+                        { tone: "command", text: `$ ${commandText}`, language: "bash" },
                         { tone: "meta", text: `cwd ${event.cwd || "."}` }
                       ],
                       expanded: false
@@ -283896,7 +283885,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     richToolIds.current.add(itemId2);
                     const commandText = renderCommandLine(event.command, event.args);
                     const details = [
-                      { tone: "command", text: `$ ${commandText}` },
+                      { tone: "command", text: `$ ${commandText}`, language: "bash" },
                       { tone: "meta", text: `cwd ${event.cwd || "."}` },
                       ...outputChunkToDetailLines(event.stdout, "stdout"),
                       ...outputChunkToDetailLines(event.stderr, "stderr")
@@ -283929,9 +283918,10 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                       detailLines: [
                         {
                           tone: "command",
-                          text: event.language === "shell" ? `$ ${event.command}` : `${event.language} cell`
+                          text: event.language === "shell" ? `$ ${event.command}` : `${event.language} cell`,
+                          language: event.language === "shell" ? "bash" : void 0
                         },
-                        ...event.language === "shell" ? [] : codePreviewDetailLines(event.command)
+                        ...event.language === "shell" ? [] : codePreviewDetailLines(event.command, cliLanguageForSandbox(event.language))
                       ],
                       expanded: false
                     });
@@ -284124,14 +284114,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           React11.createElement(
             Ink2.Box,
             { flexGrow: 1 },
-            React11.createElement(
-              Ink2.Text,
-              {
-                color: colorForInkDetailTone(line.tone),
-                dimColor: line.tone === "meta"
-              },
-              formatInkDetailLine(line)
-            )
+            renderInkDetailContent(React11, Ink2, line)
           )
         );
         const renderTranscriptItem = (item, index) => {
@@ -284362,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":
@@ -284561,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),
@@ -284570,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);
@@ -284587,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
   });
@@ -284602,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 {
@@ -284623,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";
@@ -284818,6 +284830,53 @@ function bodyColorForInkTone(tone) {
       return "#fff8f0";
   }
 }
+function renderInkDetailContent(React11, Ink2, line) {
+  const prefix = inkDetailPrefix(line.tone);
+  const baseColor = colorForInkDetailTone(line.tone);
+  const language = normalizeCliDetailLanguage(line.language);
+  const tokens = shouldSyntaxHighlightDetail(line) ? tokenizeCliDetailSyntax(language, line.text) : [{ text: line.text, tone: "plain" }];
+  return React11.createElement(
+    Ink2.Text,
+    null,
+    prefix ? React11.createElement(
+      Ink2.Text,
+      { color: baseColor, bold: line.tone === "add" || line.tone === "remove" },
+      prefix
+    ) : null,
+    ...tokens.map(
+      (token, index) => React11.createElement(
+        Ink2.Text,
+        {
+          key: `${line.tone}-${index}-${token.tone}`,
+          color: colorForCliSyntaxTone(token.tone, line.tone),
+          dimColor: line.tone === "meta" || token.tone === "comment"
+        },
+        token.text
+      )
+    )
+  );
+}
+function shouldSyntaxHighlightDetail(line) {
+  if (line.tone === "meta" || line.tone === "hunk") return false;
+  if (line.tone === "stdout" || line.tone === "stderr") return false;
+  return Boolean(normalizeCliDetailLanguage(line.language)) || line.tone === "command";
+}
+function inkDetailPrefix(tone) {
+  switch (tone) {
+    case "add":
+      return "+ ";
+    case "remove":
+      return "- ";
+    case "stderr":
+      return "! ";
+    case "meta":
+      return "# ";
+    case "stdout":
+      return "  ";
+    default:
+      return "";
+  }
+}
 function colorForInkDetailTone(tone) {
   switch (tone) {
     case "add":
@@ -284836,21 +284895,168 @@ function colorForInkDetailTone(tone) {
       return CLI_BRAND.cream;
   }
 }
-function formatInkDetailLine(line) {
-  switch (line.tone) {
-    case "add":
-      return `+ ${line.text}`;
-    case "remove":
-      return `- ${line.text}`;
-    case "stderr":
-      return `! ${line.text}`;
-    case "meta":
-      return `# ${line.text}`;
-    case "stdout":
-      return `  ${line.text}`;
-    default:
-      return line.text;
+function colorForCliSyntaxTone(tone, lineTone) {
+  if (lineTone === "remove") {
+    switch (tone) {
+      case "comment":
+        return "#8e6a55";
+      case "string":
+        return "#c48656";
+      case "keyword":
+      case "flag":
+        return CLI_BRAND.bronzeGlint;
+      case "number":
+        return "#c77952";
+      case "operator":
+        return CLI_BRAND.bronzeDeep;
+      default:
+        return CLI_BRAND.bronzeGlint;
+    }
+  }
+  if (lineTone === "add") {
+    switch (tone) {
+      case "comment":
+        return "#7f9586";
+      case "string":
+        return "#b7c989";
+      case "keyword":
+      case "flag":
+        return CLI_BRAND.patinaActive;
+      case "number":
+        return "#8fd19c";
+      case "operator":
+        return "#7e9f87";
+      default:
+        return CLI_BRAND.cream;
+    }
+  }
+  if (lineTone === "command") {
+    switch (tone) {
+      case "comment":
+        return "#7a6f66";
+      case "string":
+      case "path":
+        return "#e5bc75";
+      case "keyword":
+        return CLI_BRAND.bronzeGlint;
+      case "flag":
+        return CLI_BRAND.patinaActive;
+      case "number":
+        return "#8fd19c";
+      case "operator":
+        return CLI_BRAND.muted;
+      default:
+        return CLI_BRAND.cream;
+    }
   }
+  return colorForInkDetailTone(lineTone);
+}
+function tokenizeCliDetailSyntax(language, text) {
+  const normalized = language ?? "text";
+  const pattern = cliSyntaxPatternForLanguage(normalized);
+  if (!pattern) return [{ text, tone: "plain" }];
+  const tokens = [];
+  let lastIndex = 0;
+  pattern.lastIndex = 0;
+  for (let match = pattern.exec(text); match; match = pattern.exec(text)) {
+    if (match.index > lastIndex) {
+      tokens.push({ text: text.slice(lastIndex, match.index), tone: "plain" });
+    }
+    tokens.push({ text: match[0], tone: cliToneForSyntaxToken(normalized, match[0]) });
+    lastIndex = match.index + match[0].length;
+  }
+  if (lastIndex < text.length) {
+    tokens.push({ text: text.slice(lastIndex), tone: "plain" });
+  }
+  return tokens.length ? tokens : [{ text, tone: "plain" }];
+}
+function cliSyntaxPatternForLanguage(language) {
+  if (["javascript", "typescript", "jsx", "tsx"].includes(language)) {
+    return /(\/\/.*$|\/\*.*?\*\/|`(?:\\.|[^`])*`|'(?:\\.|[^'])*'|"(?:\\.|[^"])*"|\b(?:const|let|var|function|return|if|else|for|while|import|export|from|class|extends|new|await|async|try|catch|throw|type|interface|implements|switch|case|break|continue|null|undefined|true|false)\b|\b\d+(?:\.\d+)?\b|=>|===|!==|==|!=|\|\||&&|[{}()[\].,:;<>/+*=-])/g;
+  }
+  if (language === "python") {
+    return /(#.*$|'''[\s\S]*?'''|"""[\s\S]*?"""|'(?:\\.|[^'])*'|"(?:\\.|[^"])*"|\b(?:def|class|return|if|elif|else|for|while|import|from|as|try|except|raise|with|yield|lambda|None|True|False|async|await|pass|break|continue|and|or|not)\b|\b\d+(?:\.\d+)?\b|[{}()[\].,:;<>/+*=-])/g;
+  }
+  if (language === "bash" || language === "shell") {
+    return /(#.*$|'[^']*'|"(?:\\.|[^"])*"|\$(?:\w+|\{[^}]+\})|(?:^|\s)-{1,2}[A-Za-z0-9][\w-]*|\b(?:if|then|fi|for|do|done|case|esac|function|export|local|sudo|cd|echo|grep|sed|awk|find|cat|ls|mkdir|rm|mv|cp|npm|node|tsx|python|git|rg)\b|\b\d+\b|[|&;()<>])/g;
+  }
+  if (language === "json" || language === "yaml") {
+    return /("(?:\\.|[^"\\])*"(?=\s*:)|"(?:\\.|[^"\\])*"|\b(?:true|false|null)\b|\b\d+(?:\.\d+)?\b|[:{}\[\],-])/g;
+  }
+  if (language === "css") {
+    return /(\/\*.*?\*\/|"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|#[0-9a-fA-F]{3,8}\b|\b\d+(?:\.\d+)?(?:px|rem|em|%)?\b|[{}:;(),])/g;
+  }
+  if (language === "html" || language === "xml") {
+    return /(<!--.*?-->|<\/?[A-Za-z0-9:-]+|"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|\/?>)/g;
+  }
+  return null;
+}
+function cliToneForSyntaxToken(language, text) {
+  if (text.startsWith("//") || text.startsWith("/*") || text.startsWith("#") || text.startsWith("<!--")) {
+    return "comment";
+  }
+  if (text.startsWith("'") || text.startsWith('"') || text.startsWith("`")) {
+    return language === "json" && text.endsWith(":") ? "keyword" : "string";
+  }
+  if (/^\s*-{1,2}[A-Za-z0-9]/.test(text)) return "flag";
+  if (/^\$/.test(text)) return "keyword";
+  if (/^\d/.test(text)) return "number";
+  if (/^[{}()[\].,:;<>/+*=\-|&]+$/.test(text)) return "operator";
+  if (/[\\/]/.test(text) && !/\s/.test(text)) return "path";
+  return "keyword";
+}
+function normalizeCliDetailLanguage(language) {
+  const value = language?.trim().toLowerCase();
+  if (!value) return null;
+  const map2 = {
+    js: "javascript",
+    mjs: "javascript",
+    cjs: "javascript",
+    jsx: "jsx",
+    ts: "typescript",
+    mts: "typescript",
+    cts: "typescript",
+    tsx: "tsx",
+    py: "python",
+    python3: "python",
+    sh: "bash",
+    shell: "bash",
+    zsh: "bash",
+    yml: "yaml",
+    htm: "html"
+  };
+  return map2[value] ?? value;
+}
+function cliLanguageForSandbox(language) {
+  if (language === "node") return "javascript";
+  if (language === "shell") return "bash";
+  return normalizeCliDetailLanguage(language) ?? "text";
+}
+function inferCliLanguageFromPath(filePath) {
+  const extension2 = filePath.split(/[./\\]/).pop()?.toLowerCase();
+  if (!extension2 || extension2 === filePath.toLowerCase()) return null;
+  const map2 = {
+    js: "javascript",
+    mjs: "javascript",
+    cjs: "javascript",
+    jsx: "jsx",
+    ts: "typescript",
+    mts: "typescript",
+    cts: "typescript",
+    tsx: "tsx",
+    py: "python",
+    sh: "bash",
+    zsh: "bash",
+    json: "json",
+    jsonc: "json",
+    yml: "yaml",
+    yaml: "yaml",
+    css: "css",
+    html: "html",
+    htm: "html",
+    xml: "xml"
+  };
+  return map2[extension2] ?? null;
 }
 function buildFileToolDisplay(toolName, input, phase, summary) {
   const normalizedName = toolName.toLowerCase();
@@ -284861,12 +285067,13 @@ function buildFileToolDisplay(toolName, input, phase, summary) {
   const filePath = stringValue8(input.path) ?? stringValue8(input.filePath) ?? summary?.filePath ?? "file";
   const short = shortFilePath(filePath);
   const status = phase === "running" ? "running" : summary?.changeKind ?? "done";
+  const language = inferCliLanguageFromPath(filePath);
   if (isWrite) {
     const content = stringValue8(input.content) ?? "";
     const added = summary?.linesAdded ?? countTextLines(content);
     const detailLines = [
       { tone: "hunk", text: `@@ ${short}` },
-      ...textToDetailLines(content, "add")
+      ...textToDetailLines(content, "add", language)
     ];
     if (detailLines.length === 1 && summary) {
       detailLines.push({ tone: "meta", text: describeChangeSummary(summary) });
@@ -284883,8 +285090,8 @@ function buildFileToolDisplay(toolName, input, phase, summary) {
     const added = summary?.linesAdded ?? countTextLines(newText);
     const detailLines = [
       { tone: "hunk", text: `@@ ${short}` },
-      ...textToDetailLines(oldText, "remove"),
-      ...textToDetailLines(newText, "add")
+      ...textToDetailLines(oldText, "remove", language),
+      ...textToDetailLines(newText, "add", language)
     ];
     if (detailLines.length === 1 && summary) {
       detailLines.push({ tone: "meta", text: describeChangeSummary(summary) });
@@ -284910,18 +285117,23 @@ function describeChangeSummary(summary) {
   const removed = summary.linesRemoved ?? 0;
   return `${kind} \xB7 +${added} -${removed}`;
 }
-function textToDetailLines(text, tone) {
+function textToDetailLines(text, tone, language) {
   if (!text) return [];
   const lines = text.split(/\r?\n/);
-  const preview = lines.slice(0, 38).map((line) => ({ tone, text: line }));
+  const normalizedLanguage = normalizeCliDetailLanguage(language);
+  const preview = lines.slice(0, 38).map((line) => ({
+    tone,
+    text: line,
+    ...normalizedLanguage ? { language: normalizedLanguage } : {}
+  }));
   if (lines.length > preview.length) {
     preview.push({ tone: "meta", text: `${lines.length - preview.length} more line(s)` });
   }
   return preview;
 }
-function codePreviewDetailLines(code) {
+function codePreviewDetailLines(code, language) {
   if (!code.trim()) return [];
-  return textToDetailLines(code, "command").slice(0, 18);
+  return textToDetailLines(code, "command", language).slice(0, 18);
 }
 function outputChunkToDetailLines(text, tone) {
   if (!text) return [];

package/package.json

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