perchai-cli 2.4.18 → 2.4.20

package/dist/perch.mjs

@@ -75900,7 +75900,6 @@ 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.";
   }
 });
@@ -80933,12 +80932,14 @@ function buildDesktopContextSection(input) {
       "grep",
       "statPath",
       "readLocalFile",
+      "readProjectMemory",
       "listLocalSources",
       "readLocalSourceFile"
     ].filter((name) => enabledToolSet2.has(name));
     const localWriteTools = [
       "writeLocalFile",
       "editLocalFile",
+      "saveToMemory",
       "bash",
       "runBashTerminalCommand",
       "generateAPAuditPacket",
@@ -80950,16 +80951,16 @@ function buildDesktopContextSection(input) {
     return {
       id: "desktop-context",
       lane: "desktop",
-      label: "CLI workspace",
+      label: "Terminal workspace",
       content: [
-        "## CLI local workspace",
-        "Perch is running from a terminal. Local filesystem, shell, sandbox-code, and AP evidence tools are available through CLI local workspace access.",
+        "## Terminal workspace",
+        "Perch is running from a terminal. Files, shell, sandbox-code, and AP evidence tools are available for the current workspace.",
         input.activeRootPath?.trim() ? `Workspace root: ${input.activeRootPath}. Treat relative paths as relative to this root.` : "Workspace root: current terminal directory.",
-        "GUI-only services are not connected here: embedded browser, Google/Gmail/Calendar delivery, Desktop RAG indexing, MCP Desktop servers, and project memory writes are unavailable unless the desktop app is running.",
+        "App-only services are not connected here: embedded browser, Google/Gmail/Calendar delivery, attached-folder semantic source indexing, and connected desktop integrations. CLI memory can still use signed-in durable memory or local .perch project memory when available.",
         localReadTools.length > 0 ? `Read tools: ${localReadTools.join(", ")}.` : "Read tools: none exposed for this turn.",
         localWriteTools.length > 0 ? `Write/command tools: ${localWriteTools.join(", ")}. These are governed by the selected permission mode and command policy.` : "Write/command tools: none exposed for this turn."
       ].join("\n"),
-      reason: "Terminal local workspace access and CLI tool availability for this turn.",
+      reason: "Terminal workspace and tool availability for this turn.",
       sourcePath: input.activeRootPath,
       metadata: {
         desktopConnected: false,
@@ -81018,8 +81019,14 @@ function buildDesktopContextSection(input) {
     (file) => `- ${file.relativePath} (${file.matchReason})`
   ) : [];
   const hasVisionSupport = input.selectedModelVisionSupport === true;
-  const searchHints = input.folderIndexSummary && input.folderIndexSummary.retrievalReadyFiles > 0 ? [
-    "Prefer retrieveContext for questions that span multiple files (cross-file evidence, duplicates, totals).",
+  const hasIndexedSourceSearch = Boolean(
+    input.folderIndexSummary && (input.folderIndexSummary.sourceChunkCount > 0 || input.folderIndexSummary.retrievalChunkCount > 0)
+  );
+  const hasVectorSearch = Boolean(
+    input.folderIndexSummary && (input.folderIndexSummary.embeddedChunkCount > 0 || input.folderIndexSummary.vectorReadyFiles > 0)
+  );
+  const searchHints = hasIndexedSourceSearch ? [
+    hasVectorSearch ? "Prefer retrieveContext for questions that span multiple files (cross-file evidence, duplicates, totals)." : "Keyword/source search is available through retrieveContext; semantic/vector retrieval is pending until embedded chunks are created.",
     "Use glob for named files like *Screenshot* or exact extensions like *.png.",
     "Use statPath or glob before claiming a file does not exist.",
     hasVisionSupport ? "For screenshots/images/PDF pages, open the file with readLocalSourceFile/readLocalFile and read the attached visual preview directly." : "For screenshots/images/PDF pages, open the file with readLocalSourceFile/readLocalFile; if visual details matter and no usable text was extracted, call visionInspect."
@@ -81028,8 +81035,16 @@ function buildDesktopContextSection(input) {
     "Use statPath or glob before claiming a file does not exist.",
     hasVisionSupport ? "For screenshots/images/PDF pages, open the file with readLocalSourceFile/readLocalFile and read the attached visual preview directly." : "For screenshots/images/PDF pages, open the file with readLocalSourceFile/readLocalFile; if visual details matter and no usable text was extracted, call visionInspect."
   ];
-  const folderIndexLine = input.folderIndexSummary ? `Folder index: ${input.folderIndexSummary.indexedFiles}/${input.folderIndexSummary.totalFiles} indexed \xB7 ${input.folderIndexSummary.retrievalReadyFiles} retrieval-ready \xB7 ${input.folderIndexSummary.filesNeedingOcr} need OCR.` : "Folder index: not loaded for this turn.";
-  const retrievalGuidance = input.folderIndexSummary && input.folderIndexSummary.retrievalReadyFiles > 20 ? `This folder has ${input.folderIndexSummary.retrievalReadyFiles} files with semantic embeddings. Use retrieveContext for cross-file queries instead of serial readLocalSourceFile calls. The recent-files list below is a sample \u2014 not the full corpus.` : null;
+  const folderIndexLine = input.folderIndexSummary ? [
+    `Folder index: ${input.folderIndexSummary.indexedFiles}/${input.folderIndexSummary.totalFiles} indexed`,
+    `${input.folderIndexSummary.registeredSources} registered source(s)`,
+    `${input.folderIndexSummary.sourceChunkCount} text/source chunk(s)`,
+    `${input.folderIndexSummary.retrievalChunkCount} retrieval chunk(s)`,
+    `${input.folderIndexSummary.embeddedChunkCount} embedded retrieval chunk(s)`,
+    `${input.folderIndexSummary.vectorReadyFiles} vector-ready file(s)`,
+    `${input.folderIndexSummary.filesNeedingOcr} need OCR`
+  ].join(" \xB7 ") + "." : "Folder index: not loaded for this turn.";
+  const retrievalGuidance = input.folderIndexSummary && input.folderIndexSummary.vectorReadyFiles > 20 ? `This folder has ${input.folderIndexSummary.vectorReadyFiles} files with embedded retrieval chunks for semantic/vector search. Use retrieveContext for cross-file queries instead of serial readLocalSourceFile calls. The recent-files list below is a sample \u2014 not the full corpus.` : input.folderIndexSummary && input.folderIndexSummary.sourceChunkCount > 0 && input.folderIndexSummary.embeddedChunkCount === 0 ? "This folder has keyword/source chunks, but no embedded retrieval chunks yet. Use retrieveContext for keyword-backed source search; semantic/vector retrieval is pending." : null;
   const mcpToolNames = enabledToolSet.has("mcp__") ? [] : Array.from(enabledToolSet).filter((tool) => tool.startsWith("mcp__"));
   const mcpServerNames = Array.from(
     new Set(mcpToolNames.map((tool) => tool.split("__")[1]).filter(Boolean))
@@ -81062,7 +81077,7 @@ function buildDesktopContextSection(input) {
     content: [
       "## Desktop environment",
       "Local workspace access is connected. Local filesystem tools are available.",
-      input.activeRootPath?.trim() ? `Optional folder scope: ${input.activeRootPath} (you are NOT limited to it \u2014 absolute paths anywhere in the user's home work directly).` : "No folder scope is selected, and none is needed. When the user gives a file path, USE IT DIRECTLY \u2014 call readLocalFile / glob / grep / visionInspect with the absolute path (e.g. /Users/you/Desktop/shot.png). Full-access policy already allows any path in the user's home. NEVER tell the user to select or approve a folder, and NEVER refuse a file because no folder is selected.",
+      input.activeRootPath?.trim() ? `Workspace folder: ${input.activeRootPath} (optional; absolute paths anywhere in the user's home work directly).` : "No workspace folder is selected, and none is needed. When the user gives a file path, use it directly with readLocalFile / glob / grep / visionInspect and the absolute path (for example /Users/you/Desktop/shot.png).",
       `Visible local sources: ${totalVisibleFiles}`,
       input.localSourcesMeta?.refreshedAt ? `Local source snapshot refreshed: ${input.localSourcesMeta.refreshedAt}` : null,
       input.localSourcesMeta?.truncated ? `Local source snapshot is truncated at ${input.localSourcesMeta.maxSources} files. ${input.localSourcesMeta.warning ?? "Use glob with a pattern for exact discovery."}` : null,
@@ -81079,7 +81094,7 @@ function buildDesktopContextSection(input) {
       availableReadTools.length > 0 ? `Read tools: ${availableReadTools.join(", ")}.` : "Read tools: none exposed for this turn.",
       availableWriteTools.length > 0 ? `Write/command tools: ${availableWriteTools.join(", ")}. These are governed by the selected permission mode and command policy.` : "Write/command tools: none exposed for this turn."
     ].filter(Boolean).join("\n"),
-    reason: "Local workspace access, optional folder scope, and tool availability for this turn.",
+    reason: "Local workspace access, optional workspace folder, and tool availability for this turn.",
     sourcePath: input.activeRootPath,
     metadata: {
       desktopConnected: true,
@@ -85236,7 +85251,7 @@ function buildProjectMemorySections(meta) {
       lane: "project_memory",
       label: "PERCH.md",
       content: ["## PERCH.md", meta.perchMd.content].join("\n"),
-      reason: "Project operator memory loaded from the selected local folder scope.",
+      reason: "Project operator memory loaded from the selected workspace folder.",
       sourcePath: meta.perchMd.relativePath,
       metadata: {
         relativePath: meta.perchMd.relativePath,
@@ -85273,7 +85288,7 @@ function buildProjectMemorySections(meta) {
       lane: "project_memory",
       label: `Rule: ${rule.fileName}`,
       content: [`## Project rule: ${rule.fileName}`, rule.content].join("\n"),
-      reason: "Rules-style project instruction loaded from the selected local folder scope.",
+      reason: "Rules-style project instruction loaded from the selected workspace folder.",
       sourcePath: rule.relativePath,
       metadata: {
         relativePath: rule.relativePath,
@@ -85303,7 +85318,7 @@ function buildProjectMemorySections(meta) {
       content: [`## Project memory: ${memory.fileName}`, memory.content].join(
         "\n"
       ),
-      reason: "Typed project memory loaded from the selected local folder scope.",
+      reason: "Typed project memory loaded from the selected workspace folder.",
       sourcePath: memory.relativePath,
       metadata: {
         relativePath: memory.relativePath,
@@ -85414,7 +85429,7 @@ Tool strengths:
 - For PO overages, compare each invoice/payment against the specific PO number referenced by that invoice, not only vendor-level PO coverage. If duplicate PO rows share a PO number, compare against each candidate approved amount and flag any row-level overage or ambiguous approval.
 - Model-written code should emit useful output first. The sandbox workspace has stdlib Python, input_manifest.json, sandbox_runtime.json, and perch_helpers. pandas/pdfplumber may not be installed, so use stdlib CSV parsing and perch_helpers.extract_invoice_fields() for invoice PDFs unless sandbox_runtime.json says package installs are enabled and an install is truly needed. Host paths like /Users/... are not readable inside the sandbox unless passed as sources and copied under input/. If output/report.json is present, it can be used as structured evidence; if not, use stdout/stderr and produced files honestly. If the sandbox run errors, say that plainly and iterate.
 - Cite sources for every reported figure. If a figure can't be traced to a document, mark it [UNSOURCED] rather than omitting it
-- For a Mac folder: use glob and grep with the path; use listLocalSources/readLocalSourceFile only when a folder scope is already selected
+- For a Mac folder: use glob and grep with the path; use listLocalSources/readLocalSourceFile only when a workspace folder is already selected
 - Do not run a tool just because a keyword matches; reason from the user's current request and the existing thread state
 - Do not redo an audit, document, or email draft that is already done unless the user asks for a revision
 - Summarize tool outputs; don't stream raw JSON to the user
@@ -92429,7 +92444,7 @@ function buildContextSummary(input, rows) {
     `mode=${input.chatMode}`,
     `messages=${input.recentMessages.length}`,
     `source=${input.selectedSourceId ?? "none"}`,
-    `desktop=${input.desktopConnected ? "connected" : input.cliLocalTools === true ? "cli-local" : "browser"}`,
+    `desktop=${input.desktopConnected ? "connected" : input.cliLocalTools === true ? "terminal" : "browser"}`,
     `sent=${sentCount}`,
     `compacted=${compactedCount}`,
     `not_found=${notFoundCount}`,
@@ -92788,9 +92803,15 @@ function createEmbeddingProviderFromEnv(env4 = readEnv()) {
   };
 }
 function createBrowserEmbeddingProvider(route = "/api/perch-terminal/embeddings") {
+  let resolvedModel = "server-configured";
+  let resolvedDimensions = DEFAULT_RETRIEVAL_EMBEDDING_DIMENSIONS;
   return {
-    model: "server-configured",
-    dimensions: DEFAULT_RETRIEVAL_EMBEDDING_DIMENSIONS,
+    get model() {
+      return resolvedModel;
+    },
+    get dimensions() {
+      return resolvedDimensions;
+    },
     async embed(text) {
       return (await this.embedBatch([text]))[0];
     },
@@ -92813,6 +92834,12 @@ function createBrowserEmbeddingProvider(route = "/api/perch-terminal/embeddings"
       if (!Array.isArray(payload.embeddings)) {
         throw new EmbeddingProviderError("Embedding route returned no embeddings.");
       }
+      if (typeof payload.model === "string" && payload.model.trim()) {
+        resolvedModel = payload.model;
+      }
+      if (typeof payload.dimensions === "number" && Number.isFinite(payload.dimensions)) {
+        resolvedDimensions = payload.dimensions;
+      }
       return payload.embeddings;
     }
   };
@@ -92887,7 +92914,7 @@ var init_embeddingProvider = __esm({
 
 // features/perchTerminal/persistence/permanentMemoryPersistence.ts
 function createPermanentMemoryPersistence(supabase, options = {}) {
-  const embeddingProvider = options.embeddingProvider ?? createBrowserEmbeddingProvider();
+  const embeddingProvider = options.embeddingProvider ?? createDefaultPermanentMemoryEmbeddingProvider();
   const selectColumns = "id, user_id, workspace_id, project_id, scope, type, title, description, body, why, how_to_apply, source_kind, source_thread_id, source_message_id, source_run_id, confidence, created_at, updated_at, last_confirmed_at, stale_after_days, archived_at, tags, metadata";
   const api2 = {
     async listPermanentMemories({
@@ -93147,6 +93174,21 @@ function createPermanentMemoryPersistence(supabase, options = {}) {
   };
   return api2;
 }
+function createDefaultPermanentMemoryEmbeddingProvider() {
+  if (typeof window !== "undefined") return createBrowserEmbeddingProvider();
+  const status = getEmbeddingProviderStatus();
+  let provider = null;
+  const load = () => {
+    provider ??= createEmbeddingProviderFromEnv();
+    return provider;
+  };
+  return {
+    model: status.configured ? status.model : DEFAULT_RETRIEVAL_EMBEDDING_MODEL,
+    dimensions: status.configured ? status.dimensions : DEFAULT_RETRIEVAL_EMBEDDING_DIMENSIONS,
+    embed: async (text) => load().embed(text),
+    embedBatch: async (texts) => load().embedBatch(texts)
+  };
+}
 async function findSimilarPermanentMemoryForInput(input) {
   const queryEmbedding = await input.embeddingProvider.embed(canonicalMemoryEmbeddingText(input.input));
   const { data, error } = await input.supabase.rpc("perch_ai_match_permanent_memories", {
@@ -117027,7 +117069,7 @@ function createSourcePersistence(supabase) {
       return count ?? 0;
     },
     async countEmbeddedRetrievalChunks(workspaceId) {
-      const { count, error } = await supabase.from("perch_ai_retrieval_chunks").select("*", { count: "exact", head: true }).eq("workspace_id", workspaceId).eq("is_stale", false).not("embedding", "is", null);
+      const { count, error } = await supabase.from("perch_ai_retrieval_chunks").select("*", { count: "exact", head: true }).eq("workspace_id", workspaceId).eq("is_stale", false).not("embedding", "is", null).not("embedding_model", "is", null).not("embedded_at", "is", null);
       if (error) throw error;
       return count ?? 0;
     },
@@ -117133,18 +117175,30 @@ function createSourcePersistence(supabase) {
       return data ?? [];
     },
     async listIndexedSourceIds(workspaceId) {
-      const [chunks, retrieval, memory] = await Promise.all([
+      const [chunks, retrieval, embeddedRetrieval, memory] = await Promise.all([
         supabase.from("perch_ai_source_chunks").select("source_id").eq("workspace_id", workspaceId),
         supabase.from("perch_ai_retrieval_chunks").select("source_id").eq("workspace_id", workspaceId).eq("is_stale", false),
+        supabase.from("perch_ai_retrieval_chunks").select("source_id").eq("workspace_id", workspaceId).eq("is_stale", false).not("embedding", "is", null).not("embedding_model", "is", null).not("embedded_at", "is", null),
         supabase.from("perch_ai_source_memory").select("source_id").eq("workspace_id", workspaceId)
       ]);
       if (chunks.error) throw chunks.error;
       if (retrieval.error) throw retrieval.error;
+      if (embeddedRetrieval.error) throw embeddedRetrieval.error;
       if (memory.error) throw memory.error;
+      const sourceChunkSourceIds = sourceIdsFromRows(chunks.data);
+      const retrievalChunkSourceIds = sourceIdsFromRows(retrieval.data);
+      const embeddedRetrievalSourceIds = sourceIdsFromRows(embeddedRetrieval.data);
       return {
-        sourceChunkIds: new Set((chunks.data ?? []).map((r) => r.source_id)),
-        retrievalChunkIds: new Set((retrieval.data ?? []).map((r) => r.source_id)),
-        memorySourceIds: new Set((memory.data ?? []).map((r) => r.source_id))
+        sourceChunkIds: new Set(sourceChunkSourceIds),
+        retrievalChunkIds: new Set(retrievalChunkSourceIds),
+        embeddedRetrievalChunkIds: new Set(embeddedRetrievalSourceIds),
+        memorySourceIds: new Set((memory.data ?? []).map((r) => r.source_id)),
+        sourceChunkCountsBySourceId: countBySourceId(sourceChunkSourceIds),
+        retrievalChunkCountsBySourceId: countBySourceId(retrievalChunkSourceIds),
+        embeddedRetrievalChunkCountsBySourceId: countBySourceId(embeddedRetrievalSourceIds),
+        totalSourceChunks: sourceChunkSourceIds.length,
+        totalRetrievalChunks: retrievalChunkSourceIds.length,
+        totalEmbeddedRetrievalChunks: embeddedRetrievalSourceIds.length
       };
     },
     async keywordSearchSourcesMetadata(workspaceId, query, limit) {
@@ -117200,6 +117254,16 @@ function createSourcePersistence(supabase) {
 function escapeIlike2(value) {
   return value.replace(/[%_\\]/g, (ch) => `\\${ch}`);
 }
+function sourceIdsFromRows(rows) {
+  return (rows ?? []).map((row) => row.source_id).filter((sourceId) => typeof sourceId === "string" && sourceId.trim().length > 0);
+}
+function countBySourceId(sourceIds) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const sourceId of sourceIds) {
+    counts.set(sourceId, (counts.get(sourceId) ?? 0) + 1);
+  }
+  return counts;
+}
 var SOURCE_LIST_COLUMNS;
 var init_sourcePersistence = __esm({
   "features/perchTerminal/persistence/sourcePersistence.ts"() {
@@ -117877,21 +117941,22 @@ function getSourceRetrievalToolDefinitions() {
     }
   ];
 }
-async function dispatchSourceRetrievalTool(toolName, args, session) {
-  if (!isSupabaseConfigured()) {
-    return sessionError("Supabase is not configured for this environment.");
+async function dispatchSourceRetrievalTool(toolName, args, session, options = {}) {
+  if (!options.supabase && !isSupabaseConfigured()) {
+    return sessionError("Workspace source search is unavailable in this session.");
   }
   if (!session.workspaceId) {
-    return sessionError("workspace_id is required from the authenticated session.");
+    return sessionError("Sign in to a workspace before using workspace source search.");
   }
   let supabase;
   try {
-    supabase = createClient();
+    supabase = options.supabase ?? createClient();
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     return sessionError(message);
   }
   const store = createSourcePersistence(supabase);
+  const retrievalStore = createRetrievalPersistence(supabase);
   const workspaceId = session.workspaceId;
   switch (toolName) {
     case TOOL_NAMES.listSources:
@@ -117907,9 +117972,9 @@ async function dispatchSourceRetrievalTool(toolName, args, session) {
     case TOOL_NAMES.resolveSourceCandidates:
       return resolveSourceCandidatesHandler(store, workspaceId, session, args);
     case TOOL_NAMES.retrieveContext:
-      return retrieveContextHandler(store, workspaceId, session, args);
+      return retrieveContextHandler(store, retrievalStore, workspaceId, session, args);
     case TOOL_NAMES.semanticSearch:
-      return semanticSearchHandler(store, workspaceId, args);
+      return semanticSearchHandler(store, retrievalStore, workspaceId, args);
     case TOOL_NAMES.diagnoseWorkspaceAccess:
       return diagnoseWorkspaceAccessHandler(store, workspaceId, session);
     default:
@@ -118172,7 +118237,7 @@ async function resolveSourceCandidatesHandler(store, workspaceId, session, args)
     schemaVersion: "perch-tool-result-v1"
   };
 }
-async function retrieveContextHandler(store, workspaceId, session, args) {
+async function retrieveContextHandler(store, retrievalStore, workspaceId, session, args) {
   const query = stringArg(args.query)?.trim();
   if (!query) {
     return { ok: false, error: "query is required", toolName: TOOL_NAMES.retrieveContext };
@@ -118198,7 +118263,6 @@ async function retrieveContextHandler(store, workspaceId, session, args) {
   let searchMode = "keyword_only";
   let fallbackUsed = false;
   let semanticError = null;
-  const retrievalStore = createRetrievalPersistence(createClient());
   const embeddedCount = await store.countEmbeddedRetrievalChunks(workspaceId).catch(() => 0);
   retrievalAttempts.push("semantic_first");
   try {
@@ -118396,7 +118460,7 @@ async function retrieveContextHandler(store, workspaceId, session, args) {
     schemaVersion: "perch-tool-result-v1"
   };
 }
-async function semanticSearchHandler(store, workspaceId, args) {
+async function semanticSearchHandler(store, retrievalStore, workspaceId, args) {
   const query = stringArg(args.query)?.trim();
   if (!query) {
     return { ok: false, error: "query is required", toolName: TOOL_NAMES.semanticSearch };
@@ -118405,7 +118469,7 @@ async function semanticSearchHandler(store, workspaceId, args) {
   const sourceIds = Array.isArray(args.sourceIds) ? args.sourceIds.map(String) : void 0;
   const includeStale = args.includeStale === true;
   const embeddedCount = await store.countEmbeddedRetrievalChunks(workspaceId);
-  const result2 = await createRetrievalPersistence(createClient()).matchRetrievalChunks({
+  const result2 = await retrievalStore.matchRetrievalChunks({
     workspaceId,
     query,
     limit,
@@ -118450,7 +118514,7 @@ async function semanticSearchHandler(store, workspaceId, args) {
       return {
         rankSignals: signals,
         reason: result2.searchMode === "hybrid" ? "hybrid_sparse_vector_rrf" : result2.searchMode === "sparse" ? "postgres_full_text_rank" : "semantic_similarity",
-        scoreExplanation: result2.searchMode === "hybrid" ? `hybrid RRF rank${typeof signals.semanticRank === "number" ? `; semantic rank ${signals.semanticRank}` : ""}${typeof signals.sparseRank === "number" ? `; sparse rank ${signals.sparseRank}` : ""}` : result2.searchMode === "sparse" ? "Postgres full-text rank; semantic embeddings unavailable or not needed" : `cosine similarity ${hit.similarity.toFixed(3)} from ${hit.embedding_model ?? "indexed embedding"}`
+        scoreExplanation: result2.searchMode === "hybrid" ? `hybrid rank${typeof signals.semanticRank === "number" ? `; vector rank ${signals.semanticRank}` : ""}${typeof signals.sparseRank === "number" ? `; text rank ${signals.sparseRank}` : ""}` : result2.searchMode === "sparse" ? "Workspace text-search rank; vector retrieval unavailable for this result" : `cosine similarity ${hit.similarity.toFixed(3)} from ${hit.embedding_model ?? "indexed embedding"}`
       };
     })(),
     rank: index + 1,
@@ -118490,7 +118554,7 @@ async function semanticSearchHandler(store, workspaceId, args) {
       semanticAvailable: result2.embeddingProviderConfigured,
       sparseAvailable: result2.sparseProviderConfigured,
       fallbackUsed: result2.fallbackUsed,
-      ranking: result2.searchMode === "hybrid" ? "reciprocal rank fusion over semantic vector and Postgres full-text ranks" : result2.searchMode === "sparse" ? "Postgres full-text rank; vector embeddings not required" : "semantic cosine similarity from perch_ai_match_retrieval_chunks"
+      ranking: result2.searchMode === "hybrid" ? "combined vector and text-search ranks" : result2.searchMode === "sparse" ? "workspace text-search rank; vector retrieval not required" : "vector similarity over indexed source chunks"
     },
     schemaVersion: "perch-tool-result-v1"
   };
@@ -118499,7 +118563,7 @@ async function diagnoseWorkspaceAccessHandler(store, workspaceId, session) {
   const workspace = await store.getWorkspaceRow(workspaceId);
   const blockers = [];
   if (!workspace) {
-    blockers.push("Workspace row not found or not accessible under RLS.");
+    blockers.push("Workspace is not available to this signed-in session.");
   }
   let sourcesCount = 0;
   let sourceChunksCount = 0;
@@ -133502,6 +133566,8 @@ var init_toolPermissionPolicy = __esm({
       TOOL_NAMES.deleteLocalFile,
       TOOL_NAMES.editLocalFile,
       TOOL_NAMES.statPath,
+      TOOL_NAMES.readProjectMemory,
+      TOOL_NAMES.saveToMemory,
       TOOL_NAMES.listLocalSources,
       TOOL_NAMES.readLocalSourceFile,
       TOOL_NAMES.generateAPAuditPacket,
@@ -135199,7 +135265,7 @@ function getDesktopToolDefinitions() {
       type: "function",
       function: {
         name: TOOL_NAMES.readProjectMemory,
-        description: "Read project memory metadata for the active folder scope.",
+        description: "Read local project memory for the active workspace folder when .perch memory is present. Signed-in durable memory is admitted automatically at turn start.",
         parameters: {
           type: "object",
           properties: {},
@@ -135211,7 +135277,7 @@ function getDesktopToolDefinitions() {
       type: "function",
       function: {
         name: TOOL_NAMES.saveToMemory,
-        description: "Save something to a memory file in this project (.perch/memory/). Use when the user asks you to remember something or when you learn a durable fact about the project worth keeping across sessions. Prefer mode='merge' with a sectionHeading so existing memory isn't overwritten.",
+        description: "Save durable memory when the user asks you to remember something or when you learn a stable user/project preference. In signed-in CLI sessions this writes server memory; in a .perch project folder it can also write local project memory. Prefer mode='merge' with a sectionHeading for local project memory.",
         parameters: {
           type: "object",
           properties: {
@@ -135227,6 +135293,15 @@ function getDesktopToolDefinitions() {
             sectionHeading: {
               type: "string",
               description: "Required for merge mode \u2014 markdown heading to upsert under."
+            },
+            scope: {
+              type: "string",
+              enum: ["private_user", "workspace", "project"],
+              description: "Optional durable-memory scope for signed-in server memory. Defaults from fileName."
+            },
+            title: {
+              type: "string",
+              description: "Optional short title for signed-in durable memory."
             }
           },
           required: ["fileName", "mode", "content"],
@@ -135282,7 +135357,7 @@ function getDesktopToolDefinitions() {
       type: "function",
       function: {
         name: TOOL_NAMES.getProjectRules,
-        description: "Read PERCH.md and small .perch/rules/*.md or *.txt project rule files for the active folder scope.",
+        description: "Read PERCH.md and small .perch/rules/*.md or *.txt project rule files for the active workspace folder.",
         parameters: {
           type: "object",
           properties: {},
@@ -135300,7 +135375,7 @@ function getDesktopToolDefinitions() {
           properties: {
             path: {
               type: "string",
-              description: "Absolute directory path to list (e.g. /Users/you/Desktop). Works with no folder scope selected."
+              description: "Absolute directory path to list (e.g. /Users/you/Desktop). Works with no workspace folder selected."
             },
             query: {
               type: "string",
@@ -136488,7 +136563,7 @@ function getNativeToolDefinitions() {
       type: "function",
       function: {
         name: TOOL_NAMES.ctxInspect,
-        description: "Inspect current execution context: desktop connection status, selected folder scope, permission mode, tool counts, and available tools.",
+        description: "Inspect current execution context: desktop connection status, selected workspace folder, permission mode, tool counts, and available tools.",
         parameters: {
           type: "object",
           properties: {},
@@ -136522,7 +136597,7 @@ function getNativeToolDefinitions() {
       type: "function",
       function: {
         name: TOOL_NAMES.configInspect,
-        description: "Inspect the Perch Terminal configuration: local workspace access, optional folder scope, permission mode, and capabilities.",
+        description: "Inspect the Perch Terminal configuration: local workspace access, optional workspace folder, permission mode, and capabilities.",
         parameters: {
           type: "object",
           properties: {},
@@ -137811,12 +137886,17 @@ async function restartBashTerminal(request) {
 async function runBashTerminalCommand(request) {
   const bridge = getDesktopBridge();
   if (!bridge) return null;
-  return bridge.runBashTerminalCommand(request);
+  return bridge.runBashTerminalCommand(stripBrowserOnlyAbortSignal(request));
 }
 async function runLocalBash(request) {
   const bridge = getDesktopBridge();
   if (!bridge) return null;
-  return bridge.runLocalBash(withPermissionMode(request, request));
+  return bridge.runLocalBash(withPermissionMode(stripBrowserOnlyAbortSignal(request), request));
+}
+function stripBrowserOnlyAbortSignal(request) {
+  if (typeof window === "undefined" || !("signal" in request)) return request;
+  const { signal: _signal, ...rest2 } = request;
+  return rest2;
 }
 async function readWorkspaceFile(request) {
   const bridge = getDesktopBridge();
@@ -206110,7 +206190,7 @@ async function requireMemoryRootId(ctx, surface) {
   if (!rootId) {
     return {
       ok: false,
-      error: `No selected folder scope is available for ${surface}.`
+      error: `No selected workspace folder is available for ${surface}.`
     };
   }
   return { ok: true, rootId };
@@ -206135,14 +206215,86 @@ var init_readProjectMemory = __esm({
       classification: { native: false },
       handler: async (_args, ctx) => {
         const root2 = await requireMemoryRootId(ctx, "project memory");
-        if (!root2.ok) return root2;
-        return readProjectMemory(root2.rootId);
+        if (!root2.ok) {
+          return ctx.cliServerAppUrl?.trim() && ctx.cliServerAccessToken?.trim() ? {
+            ok: true,
+            backend: "server_memory",
+            message: "Signed-in durable memory is available. Relevant memories are added automatically at the start of each CLI turn."
+          } : {
+            ok: false,
+            errorCode: "memory_unavailable",
+            error: "Project memory is unavailable in this CLI session. Run from a project folder with .perch memory or sign in for durable memory."
+          };
+        }
+        const result2 = await readProjectMemory(root2.rootId);
+        if (!result2.ok && ctx.cliServerAppUrl?.trim() && ctx.cliServerAccessToken?.trim()) {
+          return {
+            ok: true,
+            backend: "server_memory",
+            localProjectMemory: result2,
+            message: "Signed-in durable memory is available. Relevant memories are added automatically at the start of each CLI turn."
+          };
+        }
+        return result2;
       }
     };
   }
 });
 
 // features/perchTerminal/runtime/toolSystem/tools/projectMemory/saveToMemory.ts
+function hasCliServerMemory(ctx) {
+  return Boolean(
+    ctx.cliServerAppUrl?.trim() && ctx.cliServerAccessToken?.trim()
+  );
+}
+async function saveMemoryThroughCliServer(args, ctx) {
+  const appUrl = ctx.cliServerAppUrl?.trim();
+  const accessToken = ctx.cliServerAccessToken?.trim();
+  if (!appUrl || !accessToken) return memoryUnavailable();
+  try {
+    const response = await fetch(`${appUrl.replace(/\/+$/, "")}/api/perch-terminal/cli-memory`, {
+      method: "POST",
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      },
+      body: JSON.stringify({
+        action: "save",
+        args,
+        threadId: ctx.threadId ?? null,
+        runId: ctx.runId ?? null,
+        workspaceRoot: ctx.activeRootPath ?? ctx.workspaceRoot ?? null
+      }),
+      signal: ctx.signal
+    });
+    const payload = await response.json().catch(() => ({}));
+    if (!response.ok) {
+      return {
+        ok: false,
+        backend: "server_memory",
+        errorCode: typeof payload.errorCode === "string" ? payload.errorCode : "memory_save_unavailable",
+        error: typeof payload.message === "string" ? payload.message : "Durable memory is unavailable right now. Try again shortly or update Perch."
+      };
+    }
+    return payload;
+  } catch (error) {
+    const aborted = error instanceof DOMException && error.name === "AbortError";
+    return {
+      ok: false,
+      backend: "server_memory",
+      errorCode: aborted ? "memory_save_cancelled" : "memory_save_unavailable",
+      error: aborted ? "Memory save was stopped." : "Durable memory is unavailable right now. Try again shortly or update Perch."
+    };
+  }
+}
+function memoryUnavailable() {
+  return {
+    ok: false,
+    errorCode: "memory_unavailable",
+    error: "Memory is unavailable in this CLI session. Sign in with `perch login` or run from a project folder with .perch memory."
+  };
+}
 var saveToMemoryTool;
 var init_saveToMemory = __esm({
   "features/perchTerminal/runtime/toolSystem/tools/projectMemory/saveToMemory.ts"() {
@@ -206154,14 +206306,24 @@ var init_saveToMemory = __esm({
       name: TOOL_NAMES.saveToMemory,
       classification: { native: false },
       handler: async (args, ctx) => {
+        const serverResult = hasCliServerMemory(ctx) ? await saveMemoryThroughCliServer(args, ctx) : null;
+        if (serverResult?.ok) return serverResult;
         const root2 = await requireMemoryRootId(ctx, "project memory");
-        if (!root2.ok) return root2;
-        return writeMemoryFile(root2.rootId, {
+        if (!root2.ok) return serverResult ?? memoryUnavailable();
+        const localResult = await writeMemoryFile(root2.rootId, {
           fileName: String(args.fileName),
           mode: String(args.mode),
           content: String(args.content ?? ""),
           sectionHeading: typeof args.sectionHeading === "string" ? args.sectionHeading : void 0
         });
+        if (localResult.ok === true) {
+          return {
+            ...localResult,
+            backend: "local_project_memory",
+            message: serverResult ? "Saved to local project memory. Signed-in durable memory was unavailable, so this save is scoped to the current project folder." : "Saved to local project memory."
+          };
+        }
+        return serverResult ?? localResult ?? memoryUnavailable();
       }
     };
   }
@@ -213107,18 +213269,24 @@ var init_terminal = __esm({
           command,
           cwd: cwd2,
           timeoutMs,
-          fsAccessOverride: ctx.fsAccessOverride
+          fsAccessOverride: ctx.fsAccessOverride,
+          signal: ctx.cliLocalTools ? ctx.signal : void 0
         });
       }
     };
     runBashTerminalCommandTool = {
       name: TOOL_NAMES.runBashTerminalCommand,
       classification: { native: false },
-      handler: async (args) => {
+      handler: async (args, ctx) => {
         const command = String(args.command ?? "");
         const cwd2 = args.cwd ? String(args.cwd) : void 0;
         const commandArgs = Array.isArray(args.args) ? args.args.map(String) : void 0;
-        return runBashTerminalCommand({ command, cwd: cwd2, args: commandArgs });
+        return runBashTerminalCommand({
+          command,
+          cwd: cwd2,
+          args: commandArgs,
+          signal: ctx.cliLocalTools ? ctx.signal : void 0
+        });
       }
     };
     terminalTools = [bashTool, runBashTerminalCommandTool];
@@ -213210,7 +213378,7 @@ var init_localSources = __esm({
           return {
             ok: true,
             sources: [],
-            warning: "No folder scope and no path given. To read or search a file, call readLocalFile / glob / grep / visionInspect with its absolute path (e.g. /Users/you/Desktop/file.png) \u2014 no folder selection is needed."
+            warning: "Local workspace access is unavailable in this chat. Open Perch Desktop or attach a workspace folder, then try again."
           };
         }
         const maxResults = sanitizeListLocalSourcesMaxResults(args.maxResults);
@@ -213769,6 +213937,11 @@ var init_fixtureStore = __esm({
 function calendarTicker() {
   return process.env.PERCH_MARKET_CALENDAR_TICKER || "SPY";
 }
+function sourceRank(source) {
+  if (source === "yahoo") return 3;
+  if (source === "stooq") return 2;
+  return 1;
+}
 function createSupabaseMarketStore(supabase) {
   return {
     async listInstruments() {
@@ -213786,13 +213959,13 @@ function createSupabaseMarketStore(supabase) {
     async getBars(ticker, opts) {
       const cutoff = endOfDayUtc(opts.upTo);
       const wanted = opts.lookbackBars ?? Number.MAX_SAFE_INTEGER;
-      const rows = [];
-      for (let page2 = 0; rows.length < wanted; page2++) {
-        const { data, error } = await supabase.from("perch_ai_market_bars").select("bar_date, open, high, low, close, adj_close, volume, known_at").eq("ticker", ticker).lte("bar_date", opts.upTo).lte("known_at", cutoff).order("bar_date", { ascending: false }).range(page2 * PAGE_SIZE, page2 * PAGE_SIZE + PAGE_SIZE - 1);
+      const byDate = /* @__PURE__ */ new Map();
+      for (let page2 = 0; byDate.size < wanted; page2++) {
+        const { data, error } = await supabase.from("perch_ai_market_bars").select("bar_date, open, high, low, close, adj_close, volume, known_at, source").eq("ticker", ticker).lte("bar_date", opts.upTo).lte("known_at", cutoff).order("bar_date", { ascending: false }).order("known_at", { ascending: false }).range(page2 * PAGE_SIZE, page2 * PAGE_SIZE + PAGE_SIZE - 1);
         if (error) throw new Error(`market bars read failed: ${error.message}`);
         const batch = data ?? [];
         for (const row of batch) {
-          rows.push({
+          const bar = {
             ticker,
             date: row.bar_date,
             open: row.open === null ? void 0 : Number(row.open),
@@ -213801,13 +213974,17 @@ function createSupabaseMarketStore(supabase) {
             close: Number(row.close),
             adjClose: row.adj_close === null ? Number(row.close) : Number(row.adj_close),
             volume: row.volume === null ? void 0 : Number(row.volume),
-            knownAt: row.known_at
-          });
-          if (rows.length >= wanted) break;
+            knownAt: row.known_at,
+            source: row.source ?? void 0
+          };
+          const existing = byDate.get(bar.date);
+          if (!existing || sourceRank(bar.source) > sourceRank(existing.source)) {
+            byDate.set(bar.date, bar);
+          }
         }
         if (batch.length < PAGE_SIZE) break;
       }
-      return rows.reverse();
+      return [...byDate.values()].sort((a, b2) => a.date > b2.date ? -1 : a.date < b2.date ? 1 : 0).slice(0, wanted).reverse().map(({ source: _source, ...bar }) => bar);
     },
     async getTradingDates(opts) {
       const dates = [];
@@ -216685,6 +216862,8 @@ async function executeToolCall(call, opts) {
         workspaceId: opts.workspaceId,
         threadId: opts.threadId,
         supabase: opts.supabase,
+        cliServerAppUrl: opts.cliServerAppUrl,
+        cliServerAccessToken: opts.cliServerAccessToken,
         marketDeskProxyAppUrl: opts.marketDeskProxyAppUrl,
         marketDeskProxyAccessToken: opts.marketDeskProxyAccessToken,
         chatMode: opts.chatMode ?? null,
@@ -216744,7 +216923,7 @@ async function executeToolCall(call, opts) {
       const result2 = {
         ok: false,
         errorCode: "supabase_session_required",
-        error: isSupabaseConfigured() ? "Source retrieval tools require an authenticated workspace session." : "Supabase is not configured for source retrieval tools.",
+        error: isSupabaseConfigured() ? "Source retrieval tools require an authenticated workspace session." : "Workspace source search is unavailable in this session.",
         schemaVersion: "perch-tool-result-v1",
         toolName: call.name
       };
@@ -216825,6 +217004,8 @@ async function executeToolCall(call, opts) {
         workspaceRoot: opts.workspaceRoot,
         threadId: opts.threadId,
         runId: opts.runId,
+        cliServerAppUrl: opts.cliServerAppUrl,
+        cliServerAccessToken: opts.cliServerAccessToken,
         marketDeskProxyAppUrl: opts.marketDeskProxyAppUrl,
         marketDeskProxyAccessToken: opts.marketDeskProxyAccessToken,
         onEvent: runtime.onEvent,
@@ -219025,6 +219206,8 @@ async function runModelToolLoop(input) {
           selectedSourceId: input.selectedSourceId,
           supabaseConfigured: input.supabaseConfigured,
           supabase: input.supabase,
+          cliServerAppUrl: input.cliServerAppUrl,
+          cliServerAccessToken: input.cliServerAccessToken,
           marketDeskProxyAppUrl: input.marketDeskProxyAppUrl,
           marketDeskProxyAccessToken: input.marketDeskProxyAccessToken,
           runId: input.runId,
@@ -219441,6 +219624,8 @@ async function executeInitialToolCall(input) {
     selectedSourceId: input.input.selectedSourceId,
     supabaseConfigured: input.input.supabaseConfigured,
     supabase: input.input.supabase,
+    cliServerAppUrl: input.input.cliServerAppUrl,
+    cliServerAccessToken: input.input.cliServerAccessToken,
     marketDeskProxyAppUrl: input.input.marketDeskProxyAppUrl,
     marketDeskProxyAccessToken: input.input.marketDeskProxyAccessToken,
     runId: input.input.runId,
@@ -220502,7 +220687,7 @@ async function runLiveAgentsLoop(input) {
       const onEv = onEvent ?? deps.onEvent;
       onEv({
         type: "activity_delta",
-        text: "Workspace preflight: no folder scope selected \u2014 continuing with Desktop tools.",
+        text: "Workspace preflight: no workspace folder selected; continuing with Desktop tools.",
         ts: (/* @__PURE__ */ new Date()).toISOString()
       });
     }
@@ -220541,6 +220726,8 @@ async function runLiveAgentsLoop(input) {
       untrustedContextPresent: context.untrustedContextPresent,
       supabaseConfigured: turn.supabaseConfigured,
       supabase: turn.supabase,
+      cliServerAppUrl: turn.cliServerAppUrl ?? null,
+      cliServerAccessToken: turn.cliServerAccessToken ?? null,
       marketDeskProxyAppUrl: turn.marketDeskProxyAppUrl ?? null,
       marketDeskProxyAccessToken: turn.marketDeskProxyAccessToken ?? null,
       onEvent: onEvent ?? deps.onEvent,
@@ -221907,7 +222094,12 @@ async function ensureLocalSourceIndexed(input) {
     contentHash: null,
     chunksBuilt: 0,
     chunksUpserted: 0,
-    embeddingConfigured: getEmbeddingProviderStatus().configured,
+    sourceChunksUpserted: 0,
+    retrievalChunksBuilt: 0,
+    retrievalChunksUpserted: 0,
+    embeddedChunksUpserted: 0,
+    vectorReady: false,
+    embeddingConfigured: isBrowserRuntime() ? true : getEmbeddingProviderStatus().configured,
     errors: [],
     warnings: []
   };
@@ -221940,7 +222132,12 @@ async function ensureLocalSourceIndexed(input) {
         contentHash,
         chunksBuilt: 0,
         chunksUpserted: 0,
-        embeddingConfigured: getEmbeddingProviderStatus().configured,
+        sourceChunksUpserted: 0,
+        retrievalChunksBuilt: 0,
+        retrievalChunksUpserted: 0,
+        embeddedChunksUpserted: 0,
+        vectorReady: true,
+        embeddingConfigured: isBrowserRuntime() ? true : getEmbeddingProviderStatus().configured,
         errors: [],
         warnings: []
       };
@@ -222038,12 +222235,15 @@ async function ensureLocalSourceIndexed(input) {
       threadId: input.threadId ?? null,
       chunks: sourceTextChunks
     });
-    const embeddingStatus = getEmbeddingProviderStatus();
     let chunksBuilt = textChunks.length;
     let chunksUpserted = 0;
     const warnings = [...extracted.truncated ? ["Source text was truncated before indexing."] : []];
-    if (!embeddingStatus.configured) {
-      warnings.push(embeddingStatus.message);
+    let embeddingProvider;
+    try {
+      embeddingProvider = input.embeddingProvider ?? createDefaultLocalSourceEmbeddingProvider();
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      warnings.push(message);
       return {
         ok: true,
         status: "indexed",
@@ -222053,38 +222253,69 @@ async function ensureLocalSourceIndexed(input) {
         contentHash: indexedContentHash,
         chunksBuilt,
         chunksUpserted: 0,
+        sourceChunksUpserted: sourceTextChunks.length,
+        retrievalChunksBuilt: chunksBuilt,
+        retrievalChunksUpserted: 0,
+        embeddedChunksUpserted: 0,
+        vectorReady: false,
+        embeddingConfigured: false,
+        errors: [],
+        warnings
+      };
+    }
+    let indexResult;
+    try {
+      const indexer = createRetrievalIndexer(input.supabase, { embeddingProvider });
+      indexResult = pdfPages ? await indexer.indexLocalFilePages({
+        workspaceId: input.workspaceId,
+        sourceId: source.id,
+        fileName: source.file_name,
+        fileType: extracted.fileType,
+        mimeType: source.mime_type,
+        provenanceType: "desktop_local",
+        contentHash: indexedContentHash,
+        threadId: input.threadId ?? null,
+        pages: pdfPages,
+        blocks: pdfBlocks,
+        tables: pdfTables,
+        facts: factPageEntries.length ? factPageEntries : void 0
+      }) : await indexer.indexLocalFileText({
+        workspaceId: input.workspaceId,
+        sourceId: source.id,
+        fileName: source.file_name,
+        fileType: extracted.fileType,
+        mimeType: source.mime_type,
+        provenanceType: "desktop_local",
+        contentHash: indexedContentHash,
+        threadId: input.threadId ?? null,
+        text: extracted.text
+      });
+    } catch (error) {
+      if (!isEmbeddingProviderNotConfigured(error)) throw error;
+      warnings.push(error.message);
+      return {
+        ok: true,
+        status: "indexed",
+        localSourceId: input.localSourceId,
+        supabaseSourceId: source.id,
+        retrievalSourceId: null,
+        contentHash: indexedContentHash,
+        chunksBuilt,
+        chunksUpserted: 0,
+        sourceChunksUpserted: sourceTextChunks.length,
+        retrievalChunksBuilt: chunksBuilt,
+        retrievalChunksUpserted: 0,
+        embeddedChunksUpserted: 0,
+        vectorReady: false,
         embeddingConfigured: false,
         errors: [],
         warnings
       };
     }
-    const indexer = createRetrievalIndexer(input.supabase);
-    const indexResult = pdfPages ? await indexer.indexLocalFilePages({
-      workspaceId: input.workspaceId,
-      sourceId: source.id,
-      fileName: source.file_name,
-      fileType: extracted.fileType,
-      mimeType: source.mime_type,
-      provenanceType: "desktop_local",
-      contentHash: indexedContentHash,
-      threadId: input.threadId ?? null,
-      pages: pdfPages,
-      blocks: pdfBlocks,
-      tables: pdfTables,
-      facts: factPageEntries.length ? factPageEntries : void 0
-    }) : await indexer.indexLocalFileText({
-      workspaceId: input.workspaceId,
-      sourceId: source.id,
-      fileName: source.file_name,
-      fileType: extracted.fileType,
-      mimeType: source.mime_type,
-      provenanceType: "desktop_local",
-      contentHash: indexedContentHash,
-      threadId: input.threadId ?? null,
-      text: extracted.text
-    });
     chunksBuilt = indexResult.chunksBuilt;
     chunksUpserted = indexResult.chunksUpserted;
+    const embeddedChunksUpserted = indexResult.chunksEmbedded;
+    const vectorReady = embeddedChunksUpserted > 0;
     if (!indexResult.ok) {
       return {
         ok: false,
@@ -222095,6 +222326,11 @@ async function ensureLocalSourceIndexed(input) {
         contentHash: indexedContentHash,
         chunksBuilt,
         chunksUpserted,
+        sourceChunksUpserted: sourceTextChunks.length,
+        retrievalChunksBuilt: indexResult.chunksBuilt,
+        retrievalChunksUpserted: indexResult.chunksUpserted,
+        embeddedChunksUpserted,
+        vectorReady,
         embeddingConfigured: true,
         errors: indexResult.errors,
         warnings: [...warnings, ...indexResult.warnings]
@@ -222105,10 +222341,15 @@ async function ensureLocalSourceIndexed(input) {
       status: "indexed",
       localSourceId: input.localSourceId,
       supabaseSourceId: source.id,
-      retrievalSourceId: source.id,
+      retrievalSourceId: vectorReady ? source.id : null,
       contentHash: indexedContentHash,
       chunksBuilt,
       chunksUpserted,
+      sourceChunksUpserted: sourceTextChunks.length,
+      retrievalChunksBuilt: indexResult.chunksBuilt,
+      retrievalChunksUpserted: indexResult.chunksUpserted,
+      embeddedChunksUpserted,
+      vectorReady,
       embeddingConfigured: true,
       errors: [],
       warnings
@@ -222124,6 +222365,12 @@ async function ensureLocalSourceIndexed(input) {
     };
   }
 }
+function createDefaultLocalSourceEmbeddingProvider() {
+  return isBrowserRuntime() ? createBrowserEmbeddingProvider() : createEmbeddingProviderFromEnv();
+}
+function isBrowserRuntime() {
+  return typeof window !== "undefined";
+}
 async function resolveRetrievalSourceIdForTurn(input) {
   const selected = input.selectedSourceId?.trim() ?? null;
   if (!selected) return { retrievalSourceId: null, indexOutcome: null };
@@ -222399,7 +222646,11 @@ async function loadFolderIndexSummary(input) {
   }
   const files = input.localSources.filter((entry) => entry.rootId === input.rootId && isAutoIndexableLocalSource(entry)).map((entry) => {
     const row = rowByLocalId.get(entry.localSourceId) ?? null;
-    const retrievalReady = row ? indexSets.retrievalChunkIds.has(row.id) : false;
+    const sourceChunkCount2 = row ? indexSets.sourceChunkCountsBySourceId.get(row.id) ?? 0 : 0;
+    const retrievalChunkCount2 = row ? indexSets.retrievalChunkCountsBySourceId.get(row.id) ?? 0 : 0;
+    const embeddedChunkCount2 = row ? indexSets.embeddedRetrievalChunkCountsBySourceId.get(row.id) ?? 0 : 0;
+    const retrievalReady = retrievalChunkCount2 > 0;
+    const vectorReady = embeddedChunkCount2 > 0;
     const stale = row ? Date.parse(entry.modifiedAt) > Date.parse(row.updated_at) : true;
     return {
       localSourceId: entry.localSourceId,
@@ -222408,19 +222659,30 @@ async function loadFolderIndexSummary(input) {
       mimeType: entry.mimeType,
       modifiedAt: entry.modifiedAt,
       sizeBytes: entry.sizeBytes,
-      status: row ? retrievalReady ? "indexed" : "pending" : "pending",
+      status: row ? sourceChunkCount2 > 0 || retrievalReady ? "indexed" : "pending" : "pending",
       supabaseSourceId: row?.id ?? null,
       retrievalReady,
+      vectorReady,
+      sourceChunkCount: sourceChunkCount2,
+      retrievalChunkCount: retrievalChunkCount2,
+      embeddedChunkCount: embeddedChunkCount2,
       contentHash: row?.content_hash ?? null,
       message: stale && row ? "Changed since last indexing pass." : void 0
     };
   });
   const staleFiles = files.filter((file) => file.message?.includes("Changed since last indexing pass")).length;
   const retrievalReadySourceIds = files.filter((file) => file.retrievalReady && file.supabaseSourceId).map((file) => file.supabaseSourceId);
+  const vectorReadySourceIds = files.filter((file) => file.vectorReady && file.supabaseSourceId).map((file) => file.supabaseSourceId);
   const indexedFiles = files.filter((file) => file.status === "indexed").length;
+  const sourceChunkCount = sumFiles(files, "sourceChunkCount");
+  const retrievalChunkCount = sumFiles(files, "retrievalChunkCount");
+  const embeddedChunkCount = sumFiles(files, "embeddedChunkCount");
   const lastIndexedAt = rows[0]?.updated_at ?? null;
   const diagnostics = [
+    rows.length > 0 ? `${rows.length} registered source(s).` : null,
+    sourceChunkCount > 0 ? `${sourceChunkCount} text/source chunk(s) available for keyword search.` : null,
     retrievalReadySourceIds.length > 0 ? `${retrievalReadySourceIds.length} file(s) have fresh retrieval chunks.` : "No retrieval-ready files yet for this folder.",
+    vectorReadySourceIds.length > 0 ? `${vectorReadySourceIds.length} file(s) have embedded retrieval chunks for vector search.` : sourceChunkCount > 0 ? "Keyword/source search is available; semantic/vector retrieval is pending." : null,
     staleFiles > 0 ? `${staleFiles} file(s) changed since the last index update.` : null
   ].filter(Boolean);
   return {
@@ -222430,8 +222692,14 @@ async function loadFolderIndexSummary(input) {
     indexedFiles,
     skippedFiles: 0,
     failedFiles: 0,
+    registeredSources: rows.length,
+    sourceChunkCount,
+    sourceChunkFiles: files.filter((file) => file.sourceChunkCount > 0).length,
+    retrievalChunkCount,
     staleFiles,
     retrievalReadyFiles: retrievalReadySourceIds.length,
+    embeddedChunkCount,
+    vectorReadyFiles: vectorReadySourceIds.length,
     filesNeedingOcr: files.filter((file) => needsOcrHint(file)).length,
     lastIndexedAt,
     status: files.length === 0 ? "idle" : staleFiles > 0 || indexedFiles < files.length ? "partial" : "ready",
@@ -222439,6 +222707,7 @@ async function loadFolderIndexSummary(input) {
     localOnlyEmbeddingsEnabled: false,
     remoteIndexArtifacts: [...DEFAULT_REMOTE_INDEX_ARTIFACTS],
     retrievalReadySourceIds,
+    vectorReadySourceIds,
     diagnostics,
     manifestPath: DEFAULT_MANIFEST_PATH,
     files
@@ -222458,6 +222727,9 @@ function needsOcrHint(file) {
   const message = file.message?.toLowerCase() ?? "";
   return message.includes("ocr") || message.includes("scanned") || message.includes("no readable text");
 }
+function sumFiles(files, field) {
+  return files.reduce((total, file) => total + file[field], 0);
+}
 var DEFAULT_MANIFEST_PATH, AUTO_INDEX_EXCLUDED_PATH_PREFIXES, AUTO_INDEX_EXCLUDED_EXACT_PATHS, DEFAULT_STORAGE_MODE, DEFAULT_REMOTE_INDEX_ARTIFACTS;
 var init_folderIndexing = __esm({
   "features/perchTerminal/runtime/folderIndexing.ts"() {
@@ -224713,6 +224985,54 @@ var init_objectiveClassifier = __esm({
 });
 
 // features/perchTerminal/runtime/turn/runOperatorTurn.ts
+function buildTurnMemoryRetriever(input) {
+  if (input.supabase) {
+    return async ({ userId, workspaceId, limitPerScope, query }) => createPermanentMemoryPersistence(
+      input.supabase
+    ).retrievePermanentMemoriesForTurn({
+      userId,
+      workspaceId,
+      limitPerScope,
+      query
+    });
+  }
+  const appUrl = input.cliServerAppUrl?.trim();
+  const accessToken = input.cliServerAccessToken?.trim();
+  if (!appUrl || !accessToken) return null;
+  return createCliServerMemoryRetriever({
+    appUrl,
+    accessToken,
+    threadId: input.threadId
+  });
+}
+function createCliServerMemoryRetriever(input) {
+  return async ({ limitPerScope, query }) => {
+    const response = await fetch(`${input.appUrl.replace(/\/+$/, "")}/api/perch-terminal/cli-context`, {
+      method: "POST",
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${input.accessToken}`
+      },
+      body: JSON.stringify({
+        query,
+        threadId: input.threadId,
+        limitPerScope
+      })
+    });
+    const payload = await response.json().catch(() => ({}));
+    if (!response.ok || payload.ok !== true) {
+      throw new Error("Durable memory is unavailable right now.");
+    }
+    const memories = Array.isArray(payload.permanentMemories) ? payload.permanentMemories.filter(isPermanentMemoryLike) : [];
+    return memories;
+  };
+}
+function isPermanentMemoryLike(value) {
+  if (!value || typeof value !== "object") return false;
+  const memory = value;
+  return typeof memory.id === "string" && typeof memory.user_id === "string" && (memory.workspace_id === null || typeof memory.workspace_id === "string") && typeof memory.scope === "string" && typeof memory.type === "string" && typeof memory.title === "string" && typeof memory.body === "string" && typeof memory.source_kind === "string" && typeof memory.confidence === "number" && typeof memory.created_at === "string" && typeof memory.updated_at === "string" && Array.isArray(memory.tags) && Boolean(memory.metadata && typeof memory.metadata === "object");
+}
 async function runOperatorTurn(input, deps) {
   const runId = input.clientRunId?.trim() || makeRunId();
   const startMs = Date.now();
@@ -224778,21 +225098,15 @@ async function runOperatorTurn(input, deps) {
     });
   }
   try {
+    const memoryRetriever = buildTurnMemoryRetriever(input);
     const memoryContext = await buildMemoryContext({
       query: input.trimmedInput,
-      userId: input.userId,
+      userId: input.userId ?? (memoryRetriever && input.cliServerAccessToken?.trim() ? "cli_authenticated_user" : null),
       workspaceId: input.workspaceId,
       threadId: input.threadId,
       permanentMemories: input.permanentMemories,
       userMemories: input.userMemories,
-      retriever: input.supabase ? async ({ userId, workspaceId, limitPerScope, query }) => createPermanentMemoryPersistence(
-        input.supabase
-      ).retrievePermanentMemoriesForTurn({
-        userId,
-        workspaceId,
-        limitPerScope,
-        query
-      }) : null
+      retriever: memoryRetriever
     });
     const earlySession = input.threadId ? await loadThreadSession(input.threadId, { supabase: input.supabase ?? null }) : null;
     const persona = getPersona(input.personaId ?? earlySession?.personaId);
@@ -225080,8 +225394,15 @@ ${planStateLines}`
       if (perchMdRow?.status === "not_found") {
         extendedWarnings.push("No PERCH.md \u2014 add an operator playbook to .perch/PERCH.md to customise behaviour.");
       }
-      if (!enrichedInput.supabase) {
-        extendedWarnings.push("Memory retrieval skipped \u2014 no Supabase session available.");
+      const hostedMemoryAvailable = Boolean(
+        enrichedInput.cliServerAppUrl?.trim() && enrichedInput.cliServerAccessToken?.trim()
+      );
+      const memoryDiagnostics = enrichedInput.memoryContext?.diagnostics ?? null;
+      if (memoryDiagnostics?.warnings.length) {
+        extendedWarnings.push(...memoryDiagnostics.warnings);
+      }
+      if (!enrichedInput.supabase && !hostedMemoryAvailable && memoryDiagnostics?.retrieval.attempted !== true) {
+        extendedWarnings.push("Memory retrieval skipped \u2014 sign in to use durable memory.");
       }
       const contextJob = resolveJobContextTokens({
         threadContextTokens: threadContextAccounting.threadContextTokens,
@@ -226493,6 +226814,21 @@ function installCliNodeLocalBridge(input) {
     }
   };
 }
+function readCliProjectMemoryState(workspaceRoot) {
+  const root2 = path11.resolve(expandHome4(workspaceRoot));
+  if (!isCliProjectMemoryAvailable(root2)) {
+    return {
+      available: false,
+      meta: null,
+      reason: "Local project memory is unavailable in this folder."
+    };
+  }
+  return {
+    available: true,
+    meta: enrichCliProjectMeta(root2, loadCliStoredMeta(root2)),
+    reason: "Local project memory is available."
+  };
+}
 function createCliNodeLocalBridge(input) {
   const workspaceRoot = path11.resolve(input.workspaceRoot);
   const now13 = () => (/* @__PURE__ */ new Date()).toISOString();
@@ -226567,7 +226903,8 @@ function createCliNodeLocalBridge(input) {
       workspaceRoot: resolveRequestRoot(workspaceRoot, request.workspaceRoot),
       command: request.command,
       cwd: request.cwd,
-      timeoutMs: request.timeoutMs
+      timeoutMs: request.timeoutMs,
+      signal: request.signal
     }),
     runBashTerminalCommand: async (request) => {
       const startedAt = Date.now();
@@ -226575,7 +226912,8 @@ function createCliNodeLocalBridge(input) {
       const result2 = await runShellCommand({
         workspaceRoot,
         command: request.args?.length ? shellQuote([request.command, ...request.args]) : request.command,
-        cwd: request.cwd
+        cwd: request.cwd,
+        signal: request.signal
       });
       return {
         ok: result2.ok,
@@ -226773,10 +227111,20 @@ function createCliNodeLocalBridge(input) {
         encoding: "base64"
       };
     },
-    getProjectRules: async () => [],
-    readProjectMemory: async () => ({ ok: false, error: "Project memory is not available in this CLI package yet." }),
-    writeProjectMemory: async () => ({ ok: false, error: "Project memory writes are not available in this CLI package yet." }),
-    writeMemoryFile: async () => ({ ok: false, error: "Project memory files are not available in this CLI package yet." }),
+    getProjectRules: async () => {
+      const state = readCliProjectMemoryState(workspaceRoot);
+      return state.meta ? [{
+        rootId: CLI_ROOT_ID,
+        perchMd: state.meta.perchMd?.content ?? null,
+        rules: state.meta.rules.map((rule) => ({
+          fileName: rule.fileName,
+          content: rule.content
+        }))
+      }] : [];
+    },
+    readProjectMemory: async () => readCliProjectMemoryBridge(workspaceRoot),
+    writeProjectMemory: async (request) => writeCliProjectMemory(workspaceRoot, request.meta),
+    writeMemoryFile: async (request) => writeCliMemoryFile(workspaceRoot, request),
     writeRule: async () => ({ ok: false, error: "Project rule writes are not available in this CLI package yet." }),
     writePerchMd: async () => ({ ok: false, error: "PERCH.md writes are not available in this CLI package yet." }),
     readGlobalPerchMd: async () => ({ ok: false, error: "Global PERCH.md is not available in this CLI package yet." }),
@@ -227055,6 +227403,292 @@ function guessCliFileType(filePath) {
   if ([".doc", ".docx", ".txt", ".md", ".rtf"].includes(ext)) return "document";
   return "unknown";
 }
+async function readCliProjectMemoryBridge(workspaceRoot) {
+  const state = readCliProjectMemoryState(workspaceRoot);
+  if (!state.available || !state.meta) {
+    return {
+      ok: false,
+      error: "Local project memory is unavailable in this folder. Run from a project folder with .perch memory or sign in for durable memory."
+    };
+  }
+  return { ok: true, meta: state.meta };
+}
+async function writeCliProjectMemory(workspaceRoot, patch) {
+  const root2 = path11.resolve(expandHome4(workspaceRoot));
+  if (!isCliProjectMemoryAvailable(root2)) {
+    return {
+      ok: false,
+      error: "Local project memory is unavailable in this folder. Run from a project folder with .perch memory or sign in for durable memory."
+    };
+  }
+  const current = loadCliStoredMeta(root2);
+  const next = {
+    ...current,
+    projectName: patch.projectName !== void 0 ? patch.projectName : current.projectName,
+    notes: patch.notes !== void 0 ? patch.notes : current.notes,
+    preferredRoot: patch.preferredRoot !== void 0 ? patch.preferredRoot : current.preferredRoot,
+    lastOpenedThreadId: patch.lastOpenedThreadId !== void 0 ? patch.lastOpenedThreadId : current.lastOpenedThreadId,
+    memorySummary: patch.memorySummary !== void 0 ? patch.memorySummary : current.memorySummary
+  };
+  await fsp.mkdir(path11.join(root2, PERCH_DIR), { recursive: true });
+  await atomicWriteCliUtf8(getCliProjectFilePath(root2), JSON.stringify(next, null, 2));
+  return { ok: true, meta: enrichCliProjectMeta(root2, next) };
+}
+async function writeCliMemoryFile(workspaceRoot, request) {
+  const root2 = path11.resolve(expandHome4(workspaceRoot));
+  if (!isCliProjectMemoryAvailable(root2)) {
+    return {
+      ok: false,
+      error: "Local project memory is unavailable in this folder. Run from a project folder with .perch memory or sign in for durable memory."
+    };
+  }
+  if (request.rootId && request.rootId !== CLI_ROOT_ID) {
+    return { ok: false, error: "Local project memory is unavailable for that workspace root." };
+  }
+  const fileName = normalizeCliMemoryFileName(request.fileName);
+  if (!fileName) return { ok: false, error: "Invalid memory file name." };
+  const relativePath = path11.join(PERCH_DIR, MEMORY_DIR, fileName);
+  const fullPath = path11.join(root2, relativePath);
+  const existing = await fsp.readFile(fullPath, "utf8").catch(() => "");
+  let nextContent;
+  try {
+    nextContent = applyCliMemoryWrite(existing, request);
+  } catch (error) {
+    return {
+      ok: false,
+      error: error instanceof Error ? error.message : "Failed to merge memory content."
+    };
+  }
+  const capError = assertCliMemoryWithinCap(nextContent);
+  if (capError) return { ok: false, error: capError };
+  await fsp.mkdir(path11.dirname(fullPath), { recursive: true });
+  await atomicWriteCliUtf8(fullPath, nextContent);
+  const updatedFile = readCliTextMemoryFile(root2, relativePath, MAX_MEMORY_BYTES);
+  return {
+    ok: true,
+    meta: enrichCliProjectMeta(root2, loadCliStoredMeta(root2)),
+    updatedFile
+  };
+}
+function defaultCliProjectMeta() {
+  return {
+    projectName: null,
+    notes: null,
+    preferredRoot: null,
+    lastOpenedThreadId: null,
+    memorySummary: null,
+    perchMd: null,
+    rules: [],
+    memoryFiles: [],
+    missingMemoryFiles: [],
+    projectMemoryEmpty: true,
+    evidenceOnly: true
+  };
+}
+function isCliProjectMemoryAvailable(root2) {
+  try {
+    return fs10.statSync(path11.join(root2, PERCH_DIR)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function getCliProjectFilePath(root2) {
+  return path11.join(root2, PERCH_DIR, PROJECT_FILE);
+}
+function loadCliStoredMeta(root2) {
+  try {
+    const raw = fs10.readFileSync(getCliProjectFilePath(root2), "utf8");
+    return { ...defaultCliProjectMeta(), ...JSON.parse(raw) };
+  } catch {
+    return defaultCliProjectMeta();
+  }
+}
+function enrichCliProjectMeta(root2, base) {
+  const perchMd = readCliFirstExisting(root2, [
+    path11.join(PERCH_DIR, PERCH_INDEX_FILE),
+    PERCH_INDEX_FILE
+  ], MAX_TEXT_BYTES);
+  const rules = readCliRules(root2);
+  const { memoryFiles, missingMemoryFiles } = readCliMemoryFiles(root2);
+  const projectMemoryEmpty = !perchMd?.found && rules.length === 0 && memoryFiles.filter((file) => file.found).length === 0;
+  return {
+    ...base,
+    perchMd,
+    rules,
+    memoryFiles,
+    missingMemoryFiles,
+    projectMemoryEmpty,
+    evidenceOnly: projectMemoryEmpty
+  };
+}
+function normalizeCliMemoryFileName(fileName) {
+  if (typeof fileName !== "string") return null;
+  const trimmed = fileName.trim();
+  if (trimmed.includes("..") || trimmed.includes("/") || trimmed.includes("\\")) return null;
+  return EXPECTED_MEMORY_FILES.includes(trimmed) ? trimmed : null;
+}
+function applyCliMemoryWrite(existing, request) {
+  const incoming = request.content ?? "";
+  if (request.mode === "replace") return incoming;
+  if (request.mode === "append") {
+    if (request.sectionHeading?.trim()) {
+      return upsertCliMarkdownSection(existing, request.sectionHeading, incoming, "append");
+    }
+    if (!existing.trim()) return incoming;
+    return `${existing}${existing.endsWith("\n") ? "" : "\n"}${incoming}`;
+  }
+  if (!request.sectionHeading?.trim()) {
+    throw new Error('mode "merge" requires sectionHeading.');
+  }
+  return upsertCliMarkdownSection(existing, request.sectionHeading, incoming, "replace");
+}
+function upsertCliMarkdownSection(existing, sectionHeading, body, mode) {
+  const heading = sectionHeading.trim().startsWith("#") ? sectionHeading.trim() : `## ${sectionHeading.trim()}`;
+  const targetKey = normalizeCliHeadingKey(heading);
+  const sections = parseCliMarkdownSections(existing);
+  const index = sections.findIndex((section) => normalizeCliHeadingKey(section.heading) === targetKey);
+  if (index >= 0) {
+    const prior = sections[index];
+    sections[index] = {
+      heading: prior.heading || heading,
+      body: mode === "append" && prior.body.trim() ? `${prior.body.trim()}
+${body.trim()}` : body.trim()
+    };
+  } else {
+    sections.push({ heading, body: body.trim() });
+  }
+  return sections.map((section) => {
+    if (!section.heading) return section.body.trim();
+    return `${section.heading}
+
+${section.body.trim()}`.trim();
+  }).filter(Boolean).join("\n\n").concat("\n");
+}
+function parseCliMarkdownSections(content) {
+  const sections = [];
+  let current = null;
+  for (const line of content.split(/\r?\n/)) {
+    if (/^#{1,6}\s+/.test(line)) {
+      if (current) sections.push(current);
+      current = { heading: line.trimEnd(), body: "" };
+      continue;
+    }
+    if (!current) {
+      if (!line.trim()) continue;
+      current = { heading: "", body: line };
+      continue;
+    }
+    current.body = current.body ? `${current.body}
+${line}` : line;
+  }
+  if (current) sections.push(current);
+  return sections;
+}
+function normalizeCliHeadingKey(heading) {
+  return heading.replace(/^#+\s*/, "").trim().toLowerCase();
+}
+function assertCliMemoryWithinCap(content) {
+  return Buffer.byteLength(content, "utf8") > MAX_MEMORY_BYTES ? "Memory file exceeds 128KB cap." : null;
+}
+async function atomicWriteCliUtf8(filePath, content) {
+  const tmpPath = `${filePath}.tmp`;
+  await fsp.writeFile(tmpPath, content, "utf8");
+  try {
+    await fsp.rename(tmpPath, filePath);
+  } catch (error) {
+    await fsp.rm(tmpPath, { force: true }).catch(() => void 0);
+    throw error;
+  }
+}
+function readCliFirstExisting(root2, relativePaths, maxBytes) {
+  for (const relativePath of relativePaths) {
+    const file = readCliTextMemoryFile(root2, relativePath, maxBytes);
+    if (file.found) {
+      return {
+        relativePath: file.relativePath,
+        content: file.content,
+        found: true,
+        sizeBytes: file.sizeBytes,
+        modifiedAt: file.modifiedAt
+      };
+    }
+  }
+  return null;
+}
+function readCliRules(root2) {
+  const dirPath = path11.join(root2, PERCH_DIR, RULES_DIR);
+  try {
+    return fs10.readdirSync(dirPath).filter((name) => [".md", ".txt"].includes(path11.extname(name).toLowerCase())).slice(0, 40).map((name) => readCliTextMemoryFile(root2, path11.join(PERCH_DIR, RULES_DIR, name), MAX_TEXT_BYTES)).filter((file) => file.found).map((file) => ({
+      fileName: path11.basename(file.relativePath),
+      relativePath: file.relativePath,
+      content: file.content,
+      sizeBytes: file.sizeBytes,
+      modifiedAt: file.modifiedAt
+    }));
+  } catch {
+    return [];
+  }
+}
+function readCliMemoryFiles(root2) {
+  const memoryDir = path11.join(root2, PERCH_DIR, MEMORY_DIR);
+  const discovered = /* @__PURE__ */ new Set();
+  const memoryFiles = [];
+  try {
+    for (const name of fs10.readdirSync(memoryDir).slice(0, MAX_MEMORY_FILES)) {
+      const ext = path11.extname(name).toLowerCase();
+      if (ext !== ".md" && ext !== ".txt") continue;
+      discovered.add(name);
+      memoryFiles.push(readCliTextMemoryFile(root2, path11.join(PERCH_DIR, MEMORY_DIR, name), MAX_MEMORY_BYTES));
+    }
+  } catch {
+  }
+  return {
+    memoryFiles,
+    missingMemoryFiles: EXPECTED_MEMORY_FILES.filter((name) => !discovered.has(name)).map((name) => ({
+      fileName: name,
+      relativePath: path11.join(PERCH_DIR, MEMORY_DIR, name),
+      reason: "expected project memory file was not found"
+    }))
+  };
+}
+function readCliTextMemoryFile(root2, relativePath, maxBytes) {
+  const fullPath = path11.join(root2, relativePath);
+  const fileName = path11.basename(relativePath);
+  try {
+    const stat2 = fs10.statSync(fullPath);
+    if (!stat2.isFile()) {
+      return { fileName, relativePath, content: "", found: false, error: "not a regular file" };
+    }
+    const content = fs10.readFileSync(fullPath, "utf8");
+    if (stat2.size > maxBytes) {
+      return {
+        fileName,
+        relativePath,
+        content: `${content.slice(0, maxBytes)}
+[truncated: file exceeds ${maxBytes} bytes]`,
+        found: true,
+        sizeBytes: stat2.size,
+        modifiedAt: stat2.mtime.toISOString()
+      };
+    }
+    return {
+      fileName,
+      relativePath,
+      content,
+      found: true,
+      sizeBytes: stat2.size,
+      modifiedAt: stat2.mtime.toISOString()
+    };
+  } catch (error) {
+    return {
+      fileName,
+      relativePath,
+      content: "",
+      found: false,
+      error: error instanceof Error ? error.message : "read failed"
+    };
+  }
+}
 async function runShellCommand(input) {
   const startedAt = Date.now();
   const cwd2 = input.cwd ? resolveReadPath(input.workspaceRoot, input.cwd) : input.workspaceRoot;
@@ -227063,15 +227697,28 @@ async function runShellCommand(input) {
     const child = spawn2(process.env.SHELL || "/bin/zsh", ["-lc", input.command], {
       cwd: cwd2,
       env: process.env,
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      detached: true
     });
     let stdout = "";
     let stderr = "";
     let timedOut = false;
+    let aborted = false;
+    let settled = false;
+    const stopChild = (reason) => {
+      if (reason === "abort") aborted = true;
+      if (reason === "timeout") timedOut = true;
+      terminateProcessGroup(child, "SIGTERM");
+      setTimeout(() => {
+        if (!settled) terminateProcessGroup(child, "SIGKILL");
+      }, 1e3).unref?.();
+    };
     const timer = setTimeout(() => {
-      timedOut = true;
-      child.kill("SIGTERM");
+      stopChild("timeout");
     }, timeoutMs);
+    const onAbort = () => stopChild("abort");
+    if (input.signal?.aborted) onAbort();
+    input.signal?.addEventListener("abort", onAbort, { once: true });
     child.stdout.on("data", (chunk2) => {
       stdout += String(chunk2);
     });
@@ -227079,7 +227726,9 @@ async function runShellCommand(input) {
       stderr += String(chunk2);
     });
     child.on("error", (error) => {
+      settled = true;
       clearTimeout(timer);
+      input.signal?.removeEventListener("abort", onAbort);
       resolve5({
         ok: false,
         stdout,
@@ -227095,10 +227744,12 @@ async function runShellCommand(input) {
       });
     });
     child.on("close", (code, signal) => {
+      settled = true;
       clearTimeout(timer);
+      input.signal?.removeEventListener("abort", onAbort);
       const capped = capOutput(stdout, stderr);
       resolve5({
-        ok: code === 0 && !timedOut,
+        ok: code === 0 && !timedOut && !aborted,
         stdout: capped.stdout,
         stderr: capped.stderr,
         exitCode: code,
@@ -227109,11 +227760,25 @@ async function runShellCommand(input) {
         command: input.command,
         cwd: cwd2,
         executionHost: "electron_desktop",
-        ...timedOut ? { errorCode: "timed_out", errorMessage: `Command timed out after ${timeoutMs}ms.` } : {}
+        ...timedOut ? { errorCode: "timed_out", errorMessage: `Command timed out after ${timeoutMs}ms.` } : {},
+        ...aborted ? { errorCode: "aborted", errorMessage: "Command stopped by user." } : {}
       });
     });
   });
 }
+function terminateProcessGroup(child, signal) {
+  if (child.pid) {
+    try {
+      process.kill(-child.pid, signal);
+      return;
+    } catch {
+    }
+  }
+  try {
+    child.kill(signal);
+  } catch {
+  }
+}
 function resolveReadPath(root2, inputPath) {
   const expanded = expandHome4(inputPath || ".");
   return path11.resolve(path11.isAbsolute(expanded) ? expanded : path11.join(root2, expanded));
@@ -227261,7 +227926,7 @@ function capOutput(stdout, stderr) {
 function shellQuote(parts) {
   return parts.map((part) => `'${part.replace(/'/g, "'\\''")}'`).join(" ");
 }
-var CLI_ROOT_ID, DEFAULT_MAX_RESULTS, MAX_READ_BYTES, IGNORED_DIRS;
+var CLI_ROOT_ID, DEFAULT_MAX_RESULTS, MAX_READ_BYTES, IGNORED_DIRS, PERCH_DIR, PROJECT_FILE, PERCH_INDEX_FILE, MEMORY_DIR, RULES_DIR, MAX_TEXT_BYTES, MAX_MEMORY_BYTES, MAX_MEMORY_FILES, EXPECTED_MEMORY_FILES;
 var init_nodeLocalBridge = __esm({
   "features/perchTerminal/runtime/cliHost/nodeLocalBridge.ts"() {
     "use strict";
@@ -227272,6 +227937,20 @@ var init_nodeLocalBridge = __esm({
     DEFAULT_MAX_RESULTS = 200;
     MAX_READ_BYTES = 2e6;
     IGNORED_DIRS = /* @__PURE__ */ new Set([".git", "node_modules", "dist", "build", ".next", "release"]);
+    PERCH_DIR = ".perch";
+    PROJECT_FILE = "project.json";
+    PERCH_INDEX_FILE = "PERCH.md";
+    MEMORY_DIR = "memory";
+    RULES_DIR = "rules";
+    MAX_TEXT_BYTES = 64e3;
+    MAX_MEMORY_BYTES = 128e3;
+    MAX_MEMORY_FILES = 80;
+    EXPECTED_MEMORY_FILES = [
+      "project.md",
+      "preferences.md",
+      "decisions.md",
+      "permanent.md"
+    ];
   }
 });
 
@@ -227353,10 +228032,13 @@ function buildCliTurnInput(input, resolved) {
     activeRootPath: input.activeRootPath ?? resolved.cwd,
     localSources: [],
     localSourcesMeta: null,
+    projectMeta: readCliProjectMemoryState(resolved.cwd).meta,
     permanentMemories: input.permanentMemories ?? [],
     userMemories: input.userMemories ?? [],
     supabase: null,
     supabaseConfigured: false,
+    cliServerAppUrl: input.cliServerAppUrl ?? input.marketDeskProxyAppUrl ?? input.appUrl ?? null,
+    cliServerAccessToken: input.cliServerAccessToken ?? input.marketDeskProxyAccessToken ?? null,
     marketDeskProxyAppUrl: input.marketDeskProxyAppUrl ?? input.appUrl ?? null,
     marketDeskProxyAccessToken: input.marketDeskProxyAccessToken ?? null,
     permissionMode: normalizePermissionMode(input.permissionMode ?? "default"),
@@ -227432,6 +228114,7 @@ var init_runCliTurn = __esm({
     init_personaRegistry();
     init_runOperatorTurn();
     init_nodeLocalBridge();
+    init_nodeLocalBridge();
   }
 });
 
@@ -227601,12 +228284,12 @@ import os2 from "node:os";
 import path13 from "node:path";
 import { promisify } from "node:util";
 async function readStoredCliAuthSession() {
-  const raw = process.platform === "darwin" ? await readKeychainSecret().catch(() => null) : await readFallbackSecret().catch(() => null);
+  const raw = shouldUseFallbackAuthFile() ? await readFallbackSecret().catch(() => null) : process.platform === "darwin" ? await readKeychainSecret().catch(() => null) : await readFallbackSecret().catch(() => null);
   return parseStoredCliAuthSession(raw);
 }
 async function writeStoredCliAuthSession(session) {
   const raw = JSON.stringify(session);
-  if (process.platform === "darwin") {
+  if (process.platform === "darwin" && !shouldUseFallbackAuthFile()) {
     await execFileAsync("security", [
       "add-generic-password",
       "-U",
@@ -227622,7 +228305,7 @@ async function writeStoredCliAuthSession(session) {
   await writeFallbackSecret(raw);
 }
 async function clearStoredCliAuthSession() {
-  if (process.platform === "darwin") {
+  if (process.platform === "darwin" && !shouldUseFallbackAuthFile()) {
     await execFileAsync("security", [
       "delete-generic-password",
       "-s",
@@ -227634,6 +228317,9 @@ async function clearStoredCliAuthSession() {
   }
   await fs11.rm(fallbackSessionPath(), { force: true }).catch(() => void 0);
 }
+function shouldUseFallbackAuthFile() {
+  return Boolean(process.env.PERCH_CLI_AUTH_DIR?.trim());
+}
 function isStoredCliAuthSessionUsable(session, nowSeconds = Math.floor(Date.now() / 1e3)) {
   if (!session?.accessToken?.trim()) return false;
   if (!session.appUrl?.trim()) return false;
@@ -283754,6 +284440,7 @@ function parseInteractiveSlashCommand(input) {
 }
 function renderInteractiveStatus(state, connection, session, workspaceId) {
   const storedAuth = session === void 0 ? renderCliAuthSummary(connection) : isStoredCliAuthSessionUsable(session) ? `signed in${session.email ? ` as ${session.email}` : ""}` : "not signed in";
+  const signedIn = session === void 0 ? isCliModelConnectionReady(connection) : isStoredCliAuthSessionUsable(session);
   const connectionStatus = isCliModelConnectionReady(connection) ? "connected" : "locked \xB7 run /login";
   const color = shouldUseCliColor();
   const lines = [
@@ -283761,6 +284448,7 @@ function renderInteractiveStatus(state, connection, session, workspaceId) {
     ["cwd", state.cwd],
     ["auth", storedAuth],
     ["connection", connectionStatus],
+    ["memory", renderCliMemoryAvailability(state.cwd, workspaceId ?? null, signedIn)],
     ["tools", renderCliCapabilityCount(state, workspaceId ?? null)],
     ["permission", state.permissionMode],
     ["mode", state.chatMode],
@@ -283772,6 +284460,15 @@ function renderInteractiveStatus(state, connection, session, workspaceId) {
   ];
   return lines.map(([key, value]) => `${paint(key.padEnd(11), "muted", color)} ${value}`).join("\n") + "\n";
 }
+function renderCliMemoryAvailability(cwd2, workspaceId, signedIn) {
+  const local = readCliProjectMemoryState(cwd2).available;
+  const parts = [];
+  if (signedIn && workspaceId) parts.push("server memory");
+  if (local) parts.push("local project memory");
+  if (parts.length) return parts.join(" + ");
+  if (signedIn) return "unavailable until a workspace is available";
+  return "unavailable; sign in or run from a .perch project";
+}
 function renderCliCapabilityCount(state, workspaceId) {
   const count = getExecutableToolDefinitions({
     surface: "cli",
@@ -283966,7 +284663,21 @@ async function fetchCliHostedContext(connection, input) {
   return {
     userId: typeof context.session?.userId === "string" ? context.session.userId : session.userId ?? null,
     workspaceId: typeof context.session?.workspaceId === "string" ? context.session.workspaceId : null,
-    permanentMemories: Array.isArray(context.permanentMemories) ? context.permanentMemories.filter(isPermanentMemoryLike) : []
+    permanentMemories: Array.isArray(context.permanentMemories) ? context.permanentMemories.filter(isPermanentMemoryLike2) : []
+  };
+}
+async function fetchCliHostedContextForSession(session) {
+  if (!isStoredCliAuthSessionUsable(session)) return null;
+  const body = await postCliJson(session.appUrl, session, "/api/perch-terminal/cli-context", {
+    query: "/status",
+    threadId: "cli-status",
+    limitPerScope: 1
+  });
+  if (!body || body.ok !== true) return null;
+  const context = body;
+  return {
+    userId: typeof context.session?.userId === "string" ? context.session.userId : session.userId ?? null,
+    workspaceId: typeof context.session?.workspaceId === "string" ? context.session.workspaceId : null
   };
 }
 async function resolveCliMarketDeskProxy(connection) {
@@ -283974,6 +284685,8 @@ async function resolveCliMarketDeskProxy(connection) {
   const session = await readStoredCliAuthSession();
   if (!isStoredCliAuthSessionUsable(session)) return {};
   return {
+    cliServerAppUrl: session.appUrl || connection.appUrl,
+    cliServerAccessToken: session.accessToken,
     marketDeskProxyAppUrl: session.appUrl || connection.appUrl,
     marketDeskProxyAccessToken: session.accessToken
   };
@@ -284018,7 +284731,7 @@ async function postCliJson(appUrl, session, pathname, payload) {
     clearTimeout(timeout);
   }
 }
-function isPermanentMemoryLike(value) {
+function isPermanentMemoryLike2(value) {
   if (!value || typeof value !== "object") return false;
   const memory = value;
   return typeof memory.id === "string" && typeof memory.title === "string" && typeof memory.body === "string";
@@ -284318,12 +285031,17 @@ async function runAuthCommand(parsed, writer) {
   if (parsed.action === "status") {
     const session = await readStoredCliAuthSession();
     if (isStoredCliAuthSessionUsable(session)) {
-      writer.stdout(`Perch CLI ${CLI_PACKAGE_VERSION} \xB7 Signed in${session.email ? ` as ${session.email}` : ""} \xB7 ${session.appUrl}
-`);
+      const hostedContext = await fetchCliHostedContextForSession(session).catch(() => null);
+      writer.stdout([
+        `Perch CLI ${CLI_PACKAGE_VERSION} \xB7 Signed in${session.email ? ` as ${session.email}` : ""} \xB7 ${session.appUrl}`,
+        `Memory: ${renderCliMemoryAvailability(process.cwd(), hostedContext?.workspaceId ?? null, true)}`
+      ].join("\n") + "\n");
       return 0;
     }
-    writer.stdout(`Perch CLI ${CLI_PACKAGE_VERSION} \xB7 Not signed in. Run \`perch login\`.
-`);
+    writer.stdout([
+      `Perch CLI ${CLI_PACKAGE_VERSION} \xB7 Not signed in. Run \`perch login\`.`,
+      `Memory: ${renderCliMemoryAvailability(process.cwd(), null, false)}`
+    ].join("\n") + "\n");
     return 2;
   }
   const appUrl = resolveCliAppUrl(parsed.appUrl, DEFAULT_CLI_LOGIN_APP_URL) ?? DEFAULT_CLI_LOGIN_APP_URL;
@@ -284583,6 +285301,7 @@ var init_perch_cli = __esm({
     init_runRegistry();
     init_learningMemory();
     init_toolDefinitions();
+    init_nodeLocalBridge();
     execFileAsync3 = promisify3(execFile3);
     DEFAULT_CLI_LOGIN_APP_URL = "https://app.perchai.app";
     CLI_PACKAGE_VERSION = readCliPackageVersion();
@@ -284616,7 +285335,7 @@ Usage:
   perch login
   perch status
   perch logout
-  perch run "<task>" [--json] [--cwd <dir>] [--mode ask|agents|plan] [--persona saffron|quill]
+  perch run "<task>" [--json] [--thread <id>] [--cwd <dir>] [--mode ask|agents|plan] [--persona saffron|quill]
   perch ap evidence <folder> [--json] [--out <dir>] [--timestamp <id>]
   perch ap packet   <folder> [--json] [--out <dir>] [--timestamp <id>]
   perch test ap      <folder> [--json] [--out <dir>] [--timestamp <id>] [--profile financial-lab-v2] [--expect key=value]