perchai-cli 2.4.15 → 2.4.17

package/dist/perch.mjs

@@ -75566,6 +75566,7 @@ var init_payroll = __esm({
 // lib/perchBusinessTools/index.ts
 var init_perchBusinessTools = __esm({
   "lib/perchBusinessTools/index.ts"() {
+    "use strict";
     init_generateAPAuditPacket();
     init_inventoryFolder();
     init_loadBusinessTables();
@@ -76004,7 +76005,188 @@ var init_userFacingErrors = __esm({
   }
 });
 
-// lib/perchTerminal/toolDisplayNames.ts
+// features/perchTerminal/runtime/toolNames.ts
+var TOOL_NAMES, BROWSER_OPERATOR_TOOL_NAMES, BROWSER_RESEARCH_TOOL_NAMES, VERIFIED_SURFACE_SKILL_NAMES, DELIVERY_OPERATOR_TOOL_NAMES;
+var init_toolNames = __esm({
+  "features/perchTerminal/runtime/toolNames.ts"() {
+    "use strict";
+    TOOL_NAMES = {
+      // Desktop tools (require Perch AI Desktop; filesystem policy validates paths per call)
+      validateWorkspaceRoot: "validateWorkspaceRoot",
+      bash: "bash",
+      runBashTerminalCommand: "runBashTerminalCommand",
+      glob: "glob",
+      grep: "grep",
+      readLocalFile: "readLocalFile",
+      writeLocalFile: "writeLocalFile",
+      moveLocalFile: "moveLocalFile",
+      copyLocalFile: "copyLocalFile",
+      createDirectory: "createDirectory",
+      deleteLocalFile: "deleteLocalFile",
+      printFile: "printFile",
+      editLocalFile: "editLocalFile",
+      statPath: "statPath",
+      prepareSandboxInputs: "prepareSandboxInputs",
+      readProjectMemory: "readProjectMemory",
+      saveToMemory: "saveToMemory",
+      addProjectRule: "addProjectRule",
+      writePerchManual: "writePerchManual",
+      getProjectRules: "getProjectRules",
+      listLocalSources: "listLocalSources",
+      readLocalSourceFile: "readLocalSourceFile",
+      generateAPAuditPacket: "generateAPAuditPacket",
+      prepareAPEvidence: "prepare_ap_evidence",
+      queryAPCases: "query_ap_cases",
+      renderAPControlGraph: "render_ap_control_graph",
+      runManagedPlaybook: "runManagedPlaybook",
+      runSuite: "run_suite",
+      listSuiteCatalog: "list_suite_catalog",
+      proposeSuitePlan: "propose_suite_plan",
+      executeSuitePlan: "execute_suite_plan",
+      proposeWork: "propose_work",
+      executeWork: "execute_work",
+      sendWorkerMessage: "send_worker_message",
+      taskStop: "task_stop",
+      spawnWorker: "spawn_worker",
+      dispatchAgent: "dispatch_agent",
+      runSandboxAnalysis: "runSandboxAnalysis",
+      runSandboxCode: "run_sandbox_code",
+      safeBrowserAction: "safeBrowserAction",
+      // Operator primitives — drive the browser turn-by-turn (observe→act). Each
+      // result embeds a fresh accessibility snapshot + URL so the model re-observes
+      // after every action. Clipboard-free: typing uses direct key events.
+      browserNavigate: "browser_navigate",
+      browserExecuteTask: "browser_execute_task",
+      browserObserve: "browser_observe",
+      browserClick: "browser_click",
+      browserType: "browser_type",
+      browserVisualClick: "browser_visual_click",
+      browserFocusType: "browser_focus_type",
+      browserPressKey: "browser_press_key",
+      browserRead: "browser_read",
+      browserWait: "browser_wait",
+      browserHandleDialog: "browser_handle_dialog",
+      // Browser research tools — higher-level web research through the browser operator
+      browserSearchWeb: "browser_search_web",
+      browserReadPage: "browser_read_page",
+      browserCollectSources: "browser_collect_sources",
+      gmailSendEmail: "gmail_send_email",
+      gmailSaveDraft: "gmail_save_draft",
+      googleDocsCreate: "google_docs_create",
+      googleDocsAppend: "google_docs_append",
+      googleCalendarCreateEvent: "google_calendar_create_event",
+      googleSheetsCreate: "google_sheets_create",
+      googleSheetsAppendRows: "google_sheets_append_rows",
+      // Verified surface skills — optional shortcuts for Google Workspace delivery.
+      // Operator-first workers default to browser primitives and may use these
+      // adapter wrappers once when they can return proof-based receipt verification.
+      gmailSendEmailVerified: "gmail_send_email_verified",
+      gmailSaveDraftVerified: "gmail_save_draft_verified",
+      googleDocsCreateVerified: "google_docs_create_verified",
+      googleCalendarCreateEventVerified: "google_calendar_create_event_verified",
+      // Market desk tools (flag-gated: PERCH_MARKET_DESK=1)
+      getMarketSignal: "get_market_signal",
+      queryMarketSignalLog: "query_market_signal_log",
+      explainMarketSignal: "explain_market_signal",
+      listMarketStrategies: "list_market_strategies",
+      runMarketBacktest: "run_market_backtest",
+      getMarketTrackRecord: "get_market_track_record",
+      // Native tools (always available; executed locally without Desktop bridge)
+      ctxInspect: "ctxInspect",
+      toolSearch: "toolSearch",
+      configInspect: "configInspect",
+      syntheticOutput: "syntheticOutput",
+      todoWrite: "todoWrite",
+      askUserQuestion: "askUserQuestion",
+      proposePlan: "propose_plan",
+      enterPlanMode: "enterPlanMode",
+      exitPlanMode: "exitPlanMode",
+      brief: "brief",
+      listMcpServers: "listMcpServers",
+      searchKnowledge: "searchKnowledge",
+      // Unavailable tools (not executable in Perch Terminal Desktop; Supabase/web/sandbox)
+      listSources: "listSources",
+      readSource: "readSource",
+      analyzeWorkbook: "analyzeWorkbook",
+      extractDocument: "extractDocument",
+      searchSources: "searchSources",
+      semanticSearch: "semanticSearch",
+      retrieveContext: "retrieveContext",
+      diagnoseWorkspaceAccess: "diagnoseWorkspaceAccess",
+      listIndexedSources: "listIndexedSources",
+      searchWorkspaceSources: "searchWorkspaceSources",
+      resolveSourceCandidates: "resolveSourceCandidates",
+      inspectDocument: "inspectDocument",
+      visionInspect: "visionInspect",
+      extractDocumentSection: "extractDocumentSection",
+      inspectWorkbookSheets: "inspectWorkbookSheets",
+      compareEvidenceAcrossSources: "compareEvidenceAcrossSources",
+      listArtifacts: "listArtifacts",
+      webSearch: "webSearch",
+      webFetch: "webFetch",
+      scholarSearch: "scholarSearch",
+      runLocalCommand: "runLocalCommand",
+      createTextArtifact: "createTextArtifact",
+      createDocumentArtifact: "createDocumentArtifact",
+      artifactCapabilityReport: "artifactCapabilityReport",
+      writingEnvironmentCheck: "writingEnvironmentCheck"
+    };
+    BROWSER_OPERATOR_TOOL_NAMES = [
+      TOOL_NAMES.browserNavigate,
+      TOOL_NAMES.browserExecuteTask,
+      TOOL_NAMES.browserObserve,
+      TOOL_NAMES.browserClick,
+      TOOL_NAMES.browserType,
+      TOOL_NAMES.browserVisualClick,
+      TOOL_NAMES.browserFocusType,
+      TOOL_NAMES.browserPressKey,
+      TOOL_NAMES.browserRead,
+      TOOL_NAMES.browserWait,
+      TOOL_NAMES.browserHandleDialog
+    ];
+    BROWSER_RESEARCH_TOOL_NAMES = [
+      TOOL_NAMES.browserSearchWeb,
+      TOOL_NAMES.browserReadPage,
+      TOOL_NAMES.browserCollectSources
+    ];
+    VERIFIED_SURFACE_SKILL_NAMES = [
+      TOOL_NAMES.gmailSendEmailVerified,
+      TOOL_NAMES.gmailSaveDraftVerified,
+      TOOL_NAMES.googleDocsCreateVerified,
+      TOOL_NAMES.googleCalendarCreateEventVerified
+    ];
+    DELIVERY_OPERATOR_TOOL_NAMES = [
+      ...BROWSER_OPERATOR_TOOL_NAMES,
+      ...VERIFIED_SURFACE_SKILL_NAMES
+    ];
+  }
+});
+
+// features/perchTerminal/runtime/toolSystem/catalog.ts
+function isEnabledToolName(name) {
+  return Object.values(TOOL_NAMES).includes(name);
+}
+function getToolRiskLevel(name) {
+  if (!isEnabledToolName(name)) return null;
+  return TOOL_RISK[name];
+}
+function getCatalogToolOwner(name) {
+  if (!isEnabledToolName(name)) return null;
+  return NON_MODULE_TOOL_OWNERS[name] ?? "module";
+}
+function getToolCatalogEntry(name) {
+  if (!isEnabledToolName(name)) return null;
+  const owner = getCatalogToolOwner(name);
+  if (!owner) return null;
+  const riskLevel = getToolRiskLevel(name);
+  if (!riskLevel) return null;
+  return {
+    name,
+    owner,
+    riskLevel,
+    displayName: getToolDisplayName(name)
+  };
+}
 function humanizeToolSlug(toolName) {
   const stripped = toolName.replace(/^mcp__[^_]+__/, "");
   if (stripped !== toolName) {
@@ -76012,14 +76194,150 @@ function humanizeToolSlug(toolName) {
   }
   return toolName.replace(/_/g, " ").replace(/\b\w/g, (char) => char.toUpperCase());
 }
-function displayToolName(toolName) {
+function getToolDisplayName(toolName) {
   return TOOL_DISPLAY_NAMES[toolName] ?? humanizeToolSlug(toolName);
 }
-var TOOL_DISPLAY_NAMES;
-var init_toolDisplayNames = __esm({
-  "lib/perchTerminal/toolDisplayNames.ts"() {
+var NON_MODULE_TOOL_OWNERS, TOOL_RISK, TOOL_DISPLAY_NAMES;
+var init_catalog = __esm({
+  "features/perchTerminal/runtime/toolSystem/catalog.ts"() {
+    init_toolNames();
+    NON_MODULE_TOOL_OWNERS = {
+      [TOOL_NAMES.listSources]: "lane",
+      [TOOL_NAMES.readSource]: "lane",
+      [TOOL_NAMES.searchSources]: "lane",
+      [TOOL_NAMES.semanticSearch]: "lane",
+      [TOOL_NAMES.retrieveContext]: "lane",
+      [TOOL_NAMES.diagnoseWorkspaceAccess]: "lane",
+      [TOOL_NAMES.listIndexedSources]: "lane",
+      [TOOL_NAMES.searchWorkspaceSources]: "lane",
+      [TOOL_NAMES.resolveSourceCandidates]: "lane",
+      [TOOL_NAMES.webSearch]: "lane",
+      [TOOL_NAMES.webFetch]: "lane",
+      [TOOL_NAMES.scholarSearch]: "lane",
+      [TOOL_NAMES.analyzeWorkbook]: "external",
+      [TOOL_NAMES.extractDocument]: "external",
+      [TOOL_NAMES.inspectDocument]: "external",
+      [TOOL_NAMES.extractDocumentSection]: "external",
+      [TOOL_NAMES.inspectWorkbookSheets]: "external",
+      [TOOL_NAMES.compareEvidenceAcrossSources]: "external",
+      [TOOL_NAMES.listArtifacts]: "external",
+      [TOOL_NAMES.runLocalCommand]: "external",
+      [TOOL_NAMES.createTextArtifact]: "external",
+      [TOOL_NAMES.createDocumentArtifact]: "external",
+      [TOOL_NAMES.artifactCapabilityReport]: "external",
+      [TOOL_NAMES.writingEnvironmentCheck]: "external"
+    };
+    TOOL_RISK = {
+      [TOOL_NAMES.validateWorkspaceRoot]: "read",
+      [TOOL_NAMES.bash]: "command",
+      [TOOL_NAMES.runBashTerminalCommand]: "command",
+      [TOOL_NAMES.glob]: "read",
+      [TOOL_NAMES.grep]: "read",
+      [TOOL_NAMES.readLocalFile]: "read",
+      [TOOL_NAMES.writeLocalFile]: "write",
+      [TOOL_NAMES.moveLocalFile]: "write",
+      [TOOL_NAMES.copyLocalFile]: "write",
+      [TOOL_NAMES.createDirectory]: "write",
+      [TOOL_NAMES.deleteLocalFile]: "write",
+      [TOOL_NAMES.printFile]: "write",
+      [TOOL_NAMES.editLocalFile]: "write",
+      [TOOL_NAMES.statPath]: "read",
+      [TOOL_NAMES.prepareSandboxInputs]: "read",
+      [TOOL_NAMES.readProjectMemory]: "read",
+      [TOOL_NAMES.saveToMemory]: "write",
+      [TOOL_NAMES.addProjectRule]: "write",
+      [TOOL_NAMES.writePerchManual]: "write",
+      [TOOL_NAMES.getProjectRules]: "read",
+      [TOOL_NAMES.listLocalSources]: "read",
+      [TOOL_NAMES.readLocalSourceFile]: "read",
+      [TOOL_NAMES.generateAPAuditPacket]: "command",
+      [TOOL_NAMES.prepareAPEvidence]: "command",
+      [TOOL_NAMES.queryAPCases]: "read",
+      [TOOL_NAMES.renderAPControlGraph]: "read",
+      [TOOL_NAMES.runManagedPlaybook]: "command",
+      [TOOL_NAMES.runSuite]: "command",
+      [TOOL_NAMES.listSuiteCatalog]: "read",
+      [TOOL_NAMES.proposeSuitePlan]: "command",
+      [TOOL_NAMES.executeSuitePlan]: "command",
+      [TOOL_NAMES.proposeWork]: "command",
+      [TOOL_NAMES.executeWork]: "command",
+      [TOOL_NAMES.sendWorkerMessage]: "command",
+      [TOOL_NAMES.taskStop]: "command",
+      [TOOL_NAMES.spawnWorker]: "command",
+      [TOOL_NAMES.dispatchAgent]: "command",
+      [TOOL_NAMES.runSandboxAnalysis]: "command",
+      [TOOL_NAMES.runSandboxCode]: "command",
+      [TOOL_NAMES.safeBrowserAction]: "write",
+      [TOOL_NAMES.browserNavigate]: "write",
+      [TOOL_NAMES.browserExecuteTask]: "write",
+      [TOOL_NAMES.browserObserve]: "read",
+      [TOOL_NAMES.browserClick]: "write",
+      [TOOL_NAMES.browserType]: "write",
+      [TOOL_NAMES.browserVisualClick]: "write",
+      [TOOL_NAMES.browserFocusType]: "write",
+      [TOOL_NAMES.browserPressKey]: "write",
+      [TOOL_NAMES.browserRead]: "read",
+      [TOOL_NAMES.browserWait]: "read",
+      [TOOL_NAMES.browserHandleDialog]: "write",
+      [TOOL_NAMES.browserSearchWeb]: "read",
+      [TOOL_NAMES.browserReadPage]: "read",
+      [TOOL_NAMES.browserCollectSources]: "read",
+      [TOOL_NAMES.gmailSendEmail]: "write",
+      [TOOL_NAMES.gmailSaveDraft]: "write",
+      [TOOL_NAMES.googleDocsCreate]: "write",
+      [TOOL_NAMES.googleDocsAppend]: "write",
+      [TOOL_NAMES.googleCalendarCreateEvent]: "write",
+      [TOOL_NAMES.googleSheetsCreate]: "write",
+      [TOOL_NAMES.googleSheetsAppendRows]: "write",
+      [TOOL_NAMES.gmailSendEmailVerified]: "write",
+      [TOOL_NAMES.gmailSaveDraftVerified]: "write",
+      [TOOL_NAMES.googleDocsCreateVerified]: "write",
+      [TOOL_NAMES.googleCalendarCreateEventVerified]: "write",
+      [TOOL_NAMES.getMarketSignal]: "read",
+      [TOOL_NAMES.queryMarketSignalLog]: "read",
+      [TOOL_NAMES.explainMarketSignal]: "read",
+      [TOOL_NAMES.listMarketStrategies]: "read",
+      [TOOL_NAMES.runMarketBacktest]: "command",
+      [TOOL_NAMES.getMarketTrackRecord]: "read",
+      [TOOL_NAMES.ctxInspect]: "read",
+      [TOOL_NAMES.toolSearch]: "read",
+      [TOOL_NAMES.configInspect]: "read",
+      [TOOL_NAMES.syntheticOutput]: "read",
+      [TOOL_NAMES.todoWrite]: "read",
+      [TOOL_NAMES.askUserQuestion]: "read",
+      [TOOL_NAMES.proposePlan]: "read",
+      [TOOL_NAMES.enterPlanMode]: "read",
+      [TOOL_NAMES.exitPlanMode]: "read",
+      [TOOL_NAMES.brief]: "read",
+      [TOOL_NAMES.listMcpServers]: "read",
+      [TOOL_NAMES.searchKnowledge]: "read",
+      [TOOL_NAMES.listSources]: "read",
+      [TOOL_NAMES.readSource]: "read",
+      [TOOL_NAMES.analyzeWorkbook]: "read",
+      [TOOL_NAMES.extractDocument]: "read",
+      [TOOL_NAMES.searchSources]: "read",
+      [TOOL_NAMES.semanticSearch]: "read",
+      [TOOL_NAMES.retrieveContext]: "read",
+      [TOOL_NAMES.diagnoseWorkspaceAccess]: "read",
+      [TOOL_NAMES.listIndexedSources]: "read",
+      [TOOL_NAMES.searchWorkspaceSources]: "read",
+      [TOOL_NAMES.resolveSourceCandidates]: "read",
+      [TOOL_NAMES.inspectDocument]: "read",
+      [TOOL_NAMES.visionInspect]: "read",
+      [TOOL_NAMES.extractDocumentSection]: "read",
+      [TOOL_NAMES.inspectWorkbookSheets]: "read",
+      [TOOL_NAMES.compareEvidenceAcrossSources]: "read",
+      [TOOL_NAMES.listArtifacts]: "read",
+      [TOOL_NAMES.webSearch]: "read",
+      [TOOL_NAMES.webFetch]: "read",
+      [TOOL_NAMES.scholarSearch]: "read",
+      [TOOL_NAMES.runLocalCommand]: "command",
+      [TOOL_NAMES.createTextArtifact]: "write",
+      [TOOL_NAMES.createDocumentArtifact]: "write",
+      [TOOL_NAMES.artifactCapabilityReport]: "read",
+      [TOOL_NAMES.writingEnvironmentCheck]: "read"
+    };
     TOOL_DISPLAY_NAMES = {
-      // ── Desktop / workspace ─────────────────────────────────────────────────────
       validateWorkspaceRoot: "Local folder access",
       bash: "Shell command",
       runBashTerminalCommand: "Terminal command",
@@ -76049,7 +76367,6 @@ var init_toolDisplayNames = __esm({
       query_ap_cases: "Query AP cases",
       render_ap_control_graph: "Render AP graph",
       runSandboxAnalysis: "Sandbox analysis",
-      // ── Workflows & specialists ───────────────────────────────────────────────
       run_suite: "Run workflow suite",
       list_suite_catalog: "Browse workflows",
       propose_suite_plan: "Propose workflow plan",
@@ -76061,7 +76378,6 @@ var init_toolDisplayNames = __esm({
       spawn_worker: "Run specialist",
       send_worker_message: "Message specialist",
       task_stop: "Stop specialist",
-      // ── Native / meta ─────────────────────────────────────────────────────────
       ctxInspect: "Inspect context",
       toolSearch: "Search tools",
       configInspect: "Inspect config",
@@ -76073,7 +76389,6 @@ var init_toolDisplayNames = __esm({
       exitPlanMode: "Exit plan mode",
       brief: "Brief",
       listMcpServers: "List integrations",
-      // ── Sources & retrieval (web / indexed) ───────────────────────────────────
       listSources: "List sources",
       readSource: "Read source",
       analyzeWorkbook: "Analyze workbook",
@@ -76099,7 +76414,6 @@ var init_toolDisplayNames = __esm({
       createDocumentArtifact: "Create document",
       artifactCapabilityReport: "Artifact capabilities",
       writingEnvironmentCheck: "Writing environment",
-      // ── Playwright Google Workspace adapters ─────────────────────────────────
       safeBrowserAction: "Browser action",
       browser_navigate: "Open page",
       browser_execute_task: "Browser task",
@@ -76126,7 +76440,12 @@ var init_toolDisplayNames = __esm({
       google_calendar_create_event: "Create calendar event",
       google_sheets_create: "Create Google Sheet",
       google_sheets_append_rows: "Append to Google Sheet",
-      // ── Playwright MCP ────────────────────────────────────────────────────────
+      get_market_signal: "Reading market signal",
+      query_market_signal_log: "Querying signal log",
+      explain_market_signal: "Explaining signal",
+      list_market_strategies: "Listing strategies",
+      run_market_backtest: "Running backtest",
+      get_market_track_record: "Computing track record",
       "mcp__playwright__browser_navigate": "Open page",
       "mcp__playwright__browser_snapshot": "Read page",
       "mcp__playwright__browser_click": "Click",
@@ -76145,7 +76464,6 @@ var init_toolDisplayNames = __esm({
       "mcp__playwright__browser_fill_form": "Fill form",
       "mcp__playwright__browser_press_key": "Keyboard",
       "mcp__playwright__browser_resize": "Resize window",
-      // ── CourtListener MCP ─────────────────────────────────────────────────────
       "mcp__courtlistener__search_cases_by_problem": "Searching case law",
       "mcp__courtlistener__search_cases": "Searching case law",
       "mcp__courtlistener__search_opinions": "Searching case law",
@@ -76160,19 +76478,18 @@ var init_toolDisplayNames = __esm({
       "mcp__courtlistener__lookup_citation": "Looking up citation",
       "mcp__courtlistener__validate_citations": "Verifying legal citations",
       "mcp__courtlistener__courtlistener_verify_citation": "Verifying legal citations",
-      // ── Market desk ──────────────────────────────────────────────────────────
-      get_market_signal: "Reading market signal",
-      query_market_signal_log: "Querying signal log",
-      explain_market_signal: "Explaining signal",
-      list_market_strategies: "Listing strategies",
-      run_market_backtest: "Running backtest",
-      get_market_track_record: "Computing track record",
-      // ── Future MCP slots (route to GenericCard until dedicated cards ship) ───
       "mcp__slack__post_message": "Post Slack message"
     };
   }
 });
 
+// lib/perchTerminal/toolDisplayNames.ts
+var init_toolDisplayNames = __esm({
+  "lib/perchTerminal/toolDisplayNames.ts"() {
+    init_catalog();
+  }
+});
+
 // features/perchTerminal/runtime/toolCallNormalizer.ts
 function normalizeToolCalls(modelResponse) {
   const calls = [];
@@ -77231,7 +77548,7 @@ function buildTranscriptSegments(state) {
         segments.push({
           kind: "executor_event",
           label: ev.title,
-          detail: ev.toolName ? `Started ${displayToolName(ev.toolName)}` : "Started",
+          detail: ev.toolName ? `Started ${getToolDisplayName(ev.toolName)}` : "Started",
           status: "running",
           seq: seq++,
           timestamp: ev.ts
@@ -77243,7 +77560,7 @@ function buildTranscriptSegments(state) {
         segments.push({
           kind: "executor_event",
           label: ev.title,
-          detail: ev.resultSummary ?? (ev.toolName ? `Completed ${displayToolName(ev.toolName)}` : "Completed"),
+          detail: ev.resultSummary ?? (ev.toolName ? `Completed ${getToolDisplayName(ev.toolName)}` : "Completed"),
           status: "completed",
           seq: seq++,
           timestamp: ev.ts
@@ -81350,163 +81667,6 @@ Tool strengths:
   }
 });
 
-// features/perchTerminal/runtime/toolNames.ts
-var TOOL_NAMES, BROWSER_OPERATOR_TOOL_NAMES, BROWSER_RESEARCH_TOOL_NAMES, VERIFIED_SURFACE_SKILL_NAMES, DELIVERY_OPERATOR_TOOL_NAMES;
-var init_toolNames = __esm({
-  "features/perchTerminal/runtime/toolNames.ts"() {
-    "use strict";
-    TOOL_NAMES = {
-      // Desktop tools (require Perch AI Desktop; filesystem policy validates paths per call)
-      validateWorkspaceRoot: "validateWorkspaceRoot",
-      bash: "bash",
-      runBashTerminalCommand: "runBashTerminalCommand",
-      glob: "glob",
-      grep: "grep",
-      readLocalFile: "readLocalFile",
-      writeLocalFile: "writeLocalFile",
-      moveLocalFile: "moveLocalFile",
-      copyLocalFile: "copyLocalFile",
-      createDirectory: "createDirectory",
-      deleteLocalFile: "deleteLocalFile",
-      printFile: "printFile",
-      editLocalFile: "editLocalFile",
-      statPath: "statPath",
-      prepareSandboxInputs: "prepareSandboxInputs",
-      readProjectMemory: "readProjectMemory",
-      saveToMemory: "saveToMemory",
-      addProjectRule: "addProjectRule",
-      writePerchManual: "writePerchManual",
-      getProjectRules: "getProjectRules",
-      listLocalSources: "listLocalSources",
-      readLocalSourceFile: "readLocalSourceFile",
-      generateAPAuditPacket: "generateAPAuditPacket",
-      prepareAPEvidence: "prepare_ap_evidence",
-      queryAPCases: "query_ap_cases",
-      renderAPControlGraph: "render_ap_control_graph",
-      runManagedPlaybook: "runManagedPlaybook",
-      runSuite: "run_suite",
-      listSuiteCatalog: "list_suite_catalog",
-      proposeSuitePlan: "propose_suite_plan",
-      executeSuitePlan: "execute_suite_plan",
-      proposeWork: "propose_work",
-      executeWork: "execute_work",
-      sendWorkerMessage: "send_worker_message",
-      taskStop: "task_stop",
-      spawnWorker: "spawn_worker",
-      dispatchAgent: "dispatch_agent",
-      runSandboxAnalysis: "runSandboxAnalysis",
-      runSandboxCode: "run_sandbox_code",
-      safeBrowserAction: "safeBrowserAction",
-      // Operator primitives — drive the browser turn-by-turn (observe→act). Each
-      // result embeds a fresh accessibility snapshot + URL so the model re-observes
-      // after every action. Clipboard-free: typing uses direct key events.
-      browserNavigate: "browser_navigate",
-      browserExecuteTask: "browser_execute_task",
-      browserObserve: "browser_observe",
-      browserClick: "browser_click",
-      browserType: "browser_type",
-      browserVisualClick: "browser_visual_click",
-      browserFocusType: "browser_focus_type",
-      browserPressKey: "browser_press_key",
-      browserRead: "browser_read",
-      browserWait: "browser_wait",
-      browserHandleDialog: "browser_handle_dialog",
-      // Browser research tools — higher-level web research through the browser operator
-      browserSearchWeb: "browser_search_web",
-      browserReadPage: "browser_read_page",
-      browserCollectSources: "browser_collect_sources",
-      gmailSendEmail: "gmail_send_email",
-      gmailSaveDraft: "gmail_save_draft",
-      googleDocsCreate: "google_docs_create",
-      googleDocsAppend: "google_docs_append",
-      googleCalendarCreateEvent: "google_calendar_create_event",
-      googleSheetsCreate: "google_sheets_create",
-      googleSheetsAppendRows: "google_sheets_append_rows",
-      // Verified surface skills — optional shortcuts for Google Workspace delivery.
-      // Operator-first workers default to browser primitives and may use these
-      // adapter wrappers once when they can return proof-based receipt verification.
-      gmailSendEmailVerified: "gmail_send_email_verified",
-      gmailSaveDraftVerified: "gmail_save_draft_verified",
-      googleDocsCreateVerified: "google_docs_create_verified",
-      googleCalendarCreateEventVerified: "google_calendar_create_event_verified",
-      // Market desk tools (flag-gated: PERCH_MARKET_DESK=1)
-      getMarketSignal: "get_market_signal",
-      queryMarketSignalLog: "query_market_signal_log",
-      explainMarketSignal: "explain_market_signal",
-      listMarketStrategies: "list_market_strategies",
-      runMarketBacktest: "run_market_backtest",
-      getMarketTrackRecord: "get_market_track_record",
-      // Native tools (always available; executed locally without Desktop bridge)
-      ctxInspect: "ctxInspect",
-      toolSearch: "toolSearch",
-      configInspect: "configInspect",
-      syntheticOutput: "syntheticOutput",
-      todoWrite: "todoWrite",
-      askUserQuestion: "askUserQuestion",
-      proposePlan: "propose_plan",
-      enterPlanMode: "enterPlanMode",
-      exitPlanMode: "exitPlanMode",
-      brief: "brief",
-      listMcpServers: "listMcpServers",
-      searchKnowledge: "searchKnowledge",
-      // Unavailable tools (not executable in Perch Terminal Desktop; Supabase/web/sandbox)
-      listSources: "listSources",
-      readSource: "readSource",
-      analyzeWorkbook: "analyzeWorkbook",
-      extractDocument: "extractDocument",
-      searchSources: "searchSources",
-      semanticSearch: "semanticSearch",
-      retrieveContext: "retrieveContext",
-      diagnoseWorkspaceAccess: "diagnoseWorkspaceAccess",
-      listIndexedSources: "listIndexedSources",
-      searchWorkspaceSources: "searchWorkspaceSources",
-      resolveSourceCandidates: "resolveSourceCandidates",
-      inspectDocument: "inspectDocument",
-      visionInspect: "visionInspect",
-      extractDocumentSection: "extractDocumentSection",
-      inspectWorkbookSheets: "inspectWorkbookSheets",
-      compareEvidenceAcrossSources: "compareEvidenceAcrossSources",
-      listArtifacts: "listArtifacts",
-      webSearch: "webSearch",
-      webFetch: "webFetch",
-      scholarSearch: "scholarSearch",
-      runLocalCommand: "runLocalCommand",
-      createTextArtifact: "createTextArtifact",
-      createDocumentArtifact: "createDocumentArtifact",
-      artifactCapabilityReport: "artifactCapabilityReport",
-      writingEnvironmentCheck: "writingEnvironmentCheck"
-    };
-    BROWSER_OPERATOR_TOOL_NAMES = [
-      TOOL_NAMES.browserNavigate,
-      TOOL_NAMES.browserExecuteTask,
-      TOOL_NAMES.browserObserve,
-      TOOL_NAMES.browserClick,
-      TOOL_NAMES.browserType,
-      TOOL_NAMES.browserVisualClick,
-      TOOL_NAMES.browserFocusType,
-      TOOL_NAMES.browserPressKey,
-      TOOL_NAMES.browserRead,
-      TOOL_NAMES.browserWait,
-      TOOL_NAMES.browserHandleDialog
-    ];
-    BROWSER_RESEARCH_TOOL_NAMES = [
-      TOOL_NAMES.browserSearchWeb,
-      TOOL_NAMES.browserReadPage,
-      TOOL_NAMES.browserCollectSources
-    ];
-    VERIFIED_SURFACE_SKILL_NAMES = [
-      TOOL_NAMES.gmailSendEmailVerified,
-      TOOL_NAMES.gmailSaveDraftVerified,
-      TOOL_NAMES.googleDocsCreateVerified,
-      TOOL_NAMES.googleCalendarCreateEventVerified
-    ];
-    DELIVERY_OPERATOR_TOOL_NAMES = [
-      ...BROWSER_OPERATOR_TOOL_NAMES,
-      ...VERIFIED_SURFACE_SKILL_NAMES
-    ];
-  }
-});
-
 // features/perchTerminal/runtime/marketDesk/marketDeskAccess.ts
 function isMarketDeskEnabled() {
   return process.env.PERCH_MARKET_DESK === "1";
@@ -130788,24 +130948,36 @@ async function callModelRouterViaServer(request, opts, endpoint = "/api/perch-te
     signal: _signal,
     ...serializableRequest
   } = request;
-  const response = await fetch(endpoint, {
+  const body = JSON.stringify({
+    request: serializableRequest,
+    runId: opts?.runId,
+    lane: opts?.lane ?? "chat",
+    strictManual: opts?.strictManual ?? false,
+    raceMode: opts?.raceMode,
+    preferredModelId: opts?.preferredModelId ?? null,
+    avoidModelIds: opts?.avoidModelIds ?? [],
+    attribution: opts?.attribution ?? null
+  });
+  const response = await fetchModelProxyWithRetry(endpoint, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
       ...hasStreamingHandler ? { Accept: "text/event-stream" } : {},
       ...nodeModelProxyAuthHeader()
     },
-    body: JSON.stringify({
-      request: serializableRequest,
-      runId: opts?.runId,
-      lane: opts?.lane ?? "chat",
-      strictManual: opts?.strictManual ?? false,
-      raceMode: opts?.raceMode,
-      preferredModelId: opts?.preferredModelId ?? null,
-      avoidModelIds: opts?.avoidModelIds ?? [],
-      attribution: opts?.attribution ?? null
-    }),
+    body,
     signal: _signal
+  }, {
+    onRetry: (attempt, statusOrError) => {
+      onStreamEvent?.({
+        type: "model_call_failed",
+        provider: "model_proxy",
+        modelId: "app-proxy",
+        lane: opts?.lane ?? "chat",
+        error: `Model proxy retry ${attempt + 1}/${MODEL_PROXY_MAX_ATTEMPTS}: ${statusOrError}`,
+        errorCategory: "proxy_transient"
+      });
+    }
   });
   if (!hasStreamingHandler) {
     return await response.json();
@@ -130913,6 +131085,46 @@ async function callModelRouterViaServer(request, opts, endpoint = "/api/perch-te
     durationMs: 0
   };
 }
+async function fetchModelProxyWithRetry(endpoint, init, options) {
+  const maxAttempts = Math.max(1, options?.maxAttempts ?? MODEL_PROXY_MAX_ATTEMPTS);
+  let lastError = null;
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    try {
+      const response = await fetch(endpoint, init);
+      if (!isRetriableModelProxyStatus(response.status) || attempt === maxAttempts - 1) {
+        return response;
+      }
+      options?.onRetry?.(attempt, `HTTP ${response.status}`);
+      await response.body?.cancel().catch(() => void 0);
+      await waitForModelProxyRetry(attempt, init.signal);
+    } catch (error) {
+      if (isAbortLikeError(error) || attempt === maxAttempts - 1) throw error;
+      lastError = error;
+      options?.onRetry?.(attempt, error instanceof Error ? error.message : String(error));
+      await waitForModelProxyRetry(attempt, init.signal);
+    }
+  }
+  throw lastError instanceof Error ? lastError : new Error(String(lastError ?? "Model proxy request failed"));
+}
+function isRetriableModelProxyStatus(status) {
+  return status === 408 || status === 425 || status >= 500 && status <= 599;
+}
+function isAbortLikeError(error) {
+  if (!(error instanceof Error)) return false;
+  return error.name === "AbortError" || error.message.toLowerCase().includes("abort");
+}
+function waitForModelProxyRetry(attempt, signal) {
+  const delayMs = MODEL_PROXY_RETRY_BASE_MS * 2 ** attempt;
+  if (signal?.aborted) return Promise.reject(new DOMException("Aborted", "AbortError"));
+  return new Promise((resolve5, reject2) => {
+    const timer = setTimeout(resolve5, delayMs);
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject2(new DOMException("Aborted", "AbortError"));
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
 function resolveNodeModelCallProxyUrl() {
   if (typeof process === "undefined") return null;
   const raw = process.env[MODEL_CALL_PROXY_ENV]?.trim();
@@ -131002,7 +131214,7 @@ function safeParseObject2(text) {
 function objectRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
-var MODEL_CALL_PROXY_ENV, MODEL_CALL_PROXY_TOKEN_ENV;
+var MODEL_CALL_PROXY_ENV, MODEL_CALL_PROXY_TOKEN_ENV, MODEL_PROXY_MAX_ATTEMPTS, MODEL_PROXY_RETRY_BASE_MS;
 var init_modelRouter = __esm({
   "features/perchTerminal/runtime/modelRouter.ts"() {
     "use strict";
@@ -131014,6 +131226,8 @@ var init_modelRouter = __esm({
     init_toolCallNormalizer();
     MODEL_CALL_PROXY_ENV = "PERCH_MODEL_CALL_PROXY_URL";
     MODEL_CALL_PROXY_TOKEN_ENV = "PERCH_MODEL_CALL_PROXY_TOKEN";
+    MODEL_PROXY_MAX_ATTEMPTS = 3;
+    MODEL_PROXY_RETRY_BASE_MS = 350;
   }
 });
 
@@ -133606,10 +133820,18 @@ function classifyTool(name) {
       message: `Unknown tool: ${name}`
     };
   }
+  const riskLevel = getToolRiskLevel(name);
+  if (!riskLevel) {
+    return {
+      ok: false,
+      code: "tool_unknown",
+      message: `Tool is not cataloged: ${name}`
+    };
+  }
   return {
     ok: true,
     toolName: name,
-    riskLevel: TOOL_RISK[name]
+    riskLevel
   };
 }
 function validateToolCallPolicy(input) {
@@ -133860,9 +134082,6 @@ function classifyIrreversibleOrOutboundAction(toolName, args) {
       return null;
   }
 }
-function isEnabledToolName(name) {
-  return Object.values(TOOL_NAMES).includes(name);
-}
 function countEmailRecipients(args) {
   const countValue = (value) => {
     if (Array.isArray(value)) return value.filter((item) => String(item).trim()).length;
@@ -134242,7 +134461,7 @@ function validateArgs(name, args) {
           return "run_sandbox_code.command must be a non-empty string when provided.";
         if (args.language !== void 0 && args.language !== "python" && args.language !== "node")
           return 'run_sandbox_code.language must be either "python" or "node" when provided.';
-        if (args.code !== void 0 && !hasCode)
+        if (args.code !== void 0 && !hasCode && !hasCommand)
           return "run_sandbox_code.code must be a non-empty string when provided.";
       }
       if (args.label !== void 0 && typeof args.label !== "string")
@@ -134303,128 +134522,77 @@ function isSafeSandboxInputRef(value) {
   if (typeof value !== "string") return false;
   return isSafeLocalSourceId(value) || isSafeFilePath(value);
 }
-var TOOL_RISK;
 var init_toolPolicy = __esm({
   "features/perchTerminal/runtime/toolPolicy.ts"() {
     "use strict";
     init_toolNames();
+    init_catalog();
     init_toolPermissionPolicy();
     init_permissionModes();
     init_localCommandPolicy();
-    TOOL_RISK = {
-      // Desktop tools
-      [TOOL_NAMES.validateWorkspaceRoot]: "read",
-      [TOOL_NAMES.bash]: "command",
-      [TOOL_NAMES.runBashTerminalCommand]: "command",
-      [TOOL_NAMES.glob]: "read",
-      [TOOL_NAMES.grep]: "read",
-      [TOOL_NAMES.readLocalFile]: "read",
-      [TOOL_NAMES.writeLocalFile]: "write",
-      [TOOL_NAMES.moveLocalFile]: "write",
-      [TOOL_NAMES.copyLocalFile]: "write",
-      [TOOL_NAMES.createDirectory]: "write",
-      [TOOL_NAMES.deleteLocalFile]: "write",
-      [TOOL_NAMES.printFile]: "write",
-      [TOOL_NAMES.editLocalFile]: "write",
-      [TOOL_NAMES.statPath]: "read",
-      [TOOL_NAMES.prepareSandboxInputs]: "read",
-      [TOOL_NAMES.readProjectMemory]: "read",
-      [TOOL_NAMES.saveToMemory]: "write",
-      [TOOL_NAMES.addProjectRule]: "write",
-      [TOOL_NAMES.writePerchManual]: "write",
-      [TOOL_NAMES.getProjectRules]: "read",
-      [TOOL_NAMES.listLocalSources]: "read",
-      [TOOL_NAMES.readLocalSourceFile]: "read",
-      [TOOL_NAMES.generateAPAuditPacket]: "command",
-      [TOOL_NAMES.prepareAPEvidence]: "command",
-      [TOOL_NAMES.queryAPCases]: "read",
-      [TOOL_NAMES.renderAPControlGraph]: "read",
-      [TOOL_NAMES.runManagedPlaybook]: "command",
-      [TOOL_NAMES.runSuite]: "command",
-      [TOOL_NAMES.listSuiteCatalog]: "read",
-      [TOOL_NAMES.proposeSuitePlan]: "command",
-      [TOOL_NAMES.executeSuitePlan]: "command",
-      [TOOL_NAMES.proposeWork]: "command",
-      [TOOL_NAMES.executeWork]: "command",
-      [TOOL_NAMES.sendWorkerMessage]: "command",
-      [TOOL_NAMES.taskStop]: "command",
-      [TOOL_NAMES.spawnWorker]: "command",
-      [TOOL_NAMES.dispatchAgent]: "command",
-      [TOOL_NAMES.runSandboxAnalysis]: "command",
-      [TOOL_NAMES.runSandboxCode]: "command",
-      [TOOL_NAMES.safeBrowserAction]: "write",
-      [TOOL_NAMES.browserNavigate]: "write",
-      [TOOL_NAMES.browserExecuteTask]: "write",
-      [TOOL_NAMES.browserObserve]: "read",
-      [TOOL_NAMES.browserClick]: "write",
-      [TOOL_NAMES.browserType]: "write",
-      [TOOL_NAMES.browserVisualClick]: "write",
-      [TOOL_NAMES.browserFocusType]: "write",
-      [TOOL_NAMES.browserPressKey]: "write",
-      [TOOL_NAMES.browserRead]: "read",
-      [TOOL_NAMES.browserWait]: "read",
-      [TOOL_NAMES.browserHandleDialog]: "write",
-      [TOOL_NAMES.browserSearchWeb]: "read",
-      [TOOL_NAMES.browserReadPage]: "read",
-      [TOOL_NAMES.browserCollectSources]: "read",
-      [TOOL_NAMES.gmailSendEmail]: "write",
-      [TOOL_NAMES.gmailSaveDraft]: "write",
-      [TOOL_NAMES.googleDocsCreate]: "write",
-      [TOOL_NAMES.googleDocsAppend]: "write",
-      [TOOL_NAMES.googleCalendarCreateEvent]: "write",
-      [TOOL_NAMES.googleSheetsCreate]: "write",
-      [TOOL_NAMES.googleSheetsAppendRows]: "write",
-      [TOOL_NAMES.gmailSendEmailVerified]: "write",
-      [TOOL_NAMES.gmailSaveDraftVerified]: "write",
-      [TOOL_NAMES.googleDocsCreateVerified]: "write",
-      [TOOL_NAMES.googleCalendarCreateEventVerified]: "write",
-      // Market desk tools
-      [TOOL_NAMES.getMarketSignal]: "read",
-      [TOOL_NAMES.queryMarketSignalLog]: "read",
-      [TOOL_NAMES.explainMarketSignal]: "read",
-      [TOOL_NAMES.listMarketStrategies]: "read",
-      [TOOL_NAMES.runMarketBacktest]: "command",
-      [TOOL_NAMES.getMarketTrackRecord]: "read",
-      // Native tools
-      [TOOL_NAMES.ctxInspect]: "read",
-      [TOOL_NAMES.toolSearch]: "read",
-      [TOOL_NAMES.configInspect]: "read",
-      [TOOL_NAMES.syntheticOutput]: "read",
-      [TOOL_NAMES.todoWrite]: "read",
-      [TOOL_NAMES.askUserQuestion]: "read",
-      [TOOL_NAMES.proposePlan]: "read",
-      [TOOL_NAMES.enterPlanMode]: "read",
-      [TOOL_NAMES.exitPlanMode]: "read",
-      [TOOL_NAMES.brief]: "read",
-      [TOOL_NAMES.listMcpServers]: "read",
-      [TOOL_NAMES.searchKnowledge]: "read",
-      // Unavailable tools (handled in executor, mapped to read for policy purposes)
-      [TOOL_NAMES.listSources]: "read",
-      [TOOL_NAMES.readSource]: "read",
-      [TOOL_NAMES.analyzeWorkbook]: "read",
-      [TOOL_NAMES.extractDocument]: "read",
-      [TOOL_NAMES.searchSources]: "read",
-      [TOOL_NAMES.semanticSearch]: "read",
-      [TOOL_NAMES.retrieveContext]: "read",
-      [TOOL_NAMES.diagnoseWorkspaceAccess]: "read",
-      [TOOL_NAMES.listIndexedSources]: "read",
-      [TOOL_NAMES.searchWorkspaceSources]: "read",
-      [TOOL_NAMES.resolveSourceCandidates]: "read",
-      [TOOL_NAMES.inspectDocument]: "read",
-      [TOOL_NAMES.visionInspect]: "read",
-      [TOOL_NAMES.extractDocumentSection]: "read",
-      [TOOL_NAMES.inspectWorkbookSheets]: "read",
-      [TOOL_NAMES.compareEvidenceAcrossSources]: "read",
-      [TOOL_NAMES.listArtifacts]: "read",
-      [TOOL_NAMES.webSearch]: "read",
-      [TOOL_NAMES.webFetch]: "read",
-      [TOOL_NAMES.scholarSearch]: "read",
-      [TOOL_NAMES.runLocalCommand]: "command",
-      [TOOL_NAMES.createTextArtifact]: "write",
-      [TOOL_NAMES.createDocumentArtifact]: "write",
-      [TOOL_NAMES.artifactCapabilityReport]: "read",
-      [TOOL_NAMES.writingEnvironmentCheck]: "read"
-    };
+  }
+});
+
+// features/perchTerminal/runtime/toolSystem/schemaCatalog.ts
+function buildToolSchemaCatalog(sections) {
+  const byName = /* @__PURE__ */ new Map();
+  const definitions = [];
+  for (const section of sections) {
+    for (const definition of section.definitions) {
+      const name = definition.function.name;
+      const existing = byName.get(name);
+      if (existing) {
+        throw new Error(
+          `Duplicate model tool schema "${name}" in schema section "${section.id}".`
+        );
+      }
+      if (section.owner !== "mcp") {
+        const entry = getToolCatalogEntry(name);
+        if (!entry) {
+          throw new Error(
+            `Model tool schema "${name}" in schema section "${section.id}" is missing from the tool catalog.`
+          );
+        }
+        if (entry.owner !== section.owner) {
+          throw new Error(
+            `Model tool schema "${name}" declares owner "${section.owner}" but catalog owner is "${entry.owner}".`
+          );
+        }
+      }
+      byName.set(name, definition);
+      definitions.push(definition);
+    }
+  }
+  return {
+    definitions,
+    byName,
+    sections
+  };
+}
+function groupSchemaDefinitionsByCatalogOwner(idPrefix, definitions) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const definition of definitions) {
+    const name = definition.function.name;
+    const entry = getToolCatalogEntry(name);
+    if (!entry) {
+      throw new Error(
+        `Model tool schema "${name}" in schema group "${idPrefix}" is missing from the tool catalog.`
+      );
+    }
+    const defs = groups.get(entry.owner) ?? [];
+    defs.push(definition);
+    groups.set(entry.owner, defs);
+  }
+  return [...groups.entries()].map(([owner, groupedDefinitions]) => ({
+    id: `${idPrefix}:${owner}`,
+    owner,
+    definitions: groupedDefinitions
+  }));
+}
+var init_schemaCatalog = __esm({
+  "features/perchTerminal/runtime/toolSystem/schemaCatalog.ts"() {
+    "use strict";
+    init_catalog();
   }
 });
 
@@ -136543,7 +136711,7 @@ function buildFullRegistry(desktopConnected, cliLocalTools, activeRootPath, supa
   const baseUnavailable = UNAVAILABLE_TOOLS.filter(
     (t) => !dynamicSupabaseNames.has(t.name)
   );
-  return [
+  return dedupeFullRegistryEntries([
     ...desktopEntries,
     ...nativeEntries,
     ...knowledgeEntries,
@@ -136552,7 +136720,17 @@ function buildFullRegistry(desktopConnected, cliLocalTools, activeRootPath, supa
     ...docWorkbookEntries,
     ...artifactEntries,
     ...baseUnavailable
-  ];
+  ]);
+}
+function dedupeFullRegistryEntries(entries) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const existing = byName.get(entry.name);
+    if (!existing || entry.available && !existing.available) {
+      byName.set(entry.name, entry);
+    }
+  }
+  return [...byName.values()];
 }
 function getFullToolRegistry(opts) {
   return buildFullRegistry(
@@ -136588,46 +136766,53 @@ function filterToolDefinitionsForNames(definitions, allowedToolNames) {
     (definition) => allowed.has(definition.function.name)
   );
 }
-function getEnabledToolDefinitions(opts) {
+function getEnabledToolSchemaSections(opts) {
   const native = getNativeToolDefinitions();
   const knowledgeTools = getKnowledgeToolDefinitions();
   const webTools = getWebToolDefinitions();
   const marketDeskDefs = isMarketDeskEnabled() ? getMarketDeskToolDefinitions() : [];
-  const supabaseDefs = getSupabaseToolDefinitions(
-    opts.supabaseConfigured,
-    opts.workspaceId
-  );
   const mcpDefs = filterModelFacingMcpTools(opts.mcpTools ?? []);
+  const supabaseSections = groupSchemaDefinitionsByCatalogOwner(
+    "supabase",
+    getSupabaseToolDefinitions(opts.supabaseConfigured, opts.workspaceId)
+  );
   if (!opts.desktopConnected) {
     const cliLocalDesktop = opts.cliLocalTools === true ? getDesktopToolDefinitions().filter(
       (definition) => isCliLocalToolName(definition.function.name)
     ) : [];
     return [
-      ...cliLocalDesktop,
-      ...native,
-      ...knowledgeTools,
-      ...webTools,
-      ...marketDeskDefs,
-      ...supabaseDefs,
-      ...mcpDefs
+      { id: "desktop:cli-local", owner: "module", definitions: cliLocalDesktop },
+      { id: "native", owner: "module", definitions: native },
+      { id: "knowledge", owner: "module", definitions: knowledgeTools },
+      { id: "web", owner: "lane", definitions: webTools },
+      { id: "market-desk", owner: "module", definitions: marketDeskDefs },
+      ...supabaseSections,
+      { id: "mcp", owner: "mcp", definitions: mcpDefs }
     ];
   }
   const desktop = getDesktopToolDefinitions();
   const desktopNames = new Set(desktop.map((d) => d.function.name));
+  const supabaseDefs = getSupabaseToolDefinitions(
+    opts.supabaseConfigured,
+    opts.workspaceId
+  );
   const supabaseFiltered = supabaseDefs.filter((d) => !desktopNames.has(d.function.name));
   const hasVisionInspect = desktopNames.has(TOOL_NAMES.visionInspect) || supabaseFiltered.some((d) => d.function.name === TOOL_NAMES.visionInspect);
   const desktopVisionInspect = hasVisionInspect ? [] : [getVisionInspectToolDefinition()];
   return [
-    ...desktop,
-    ...native,
-    ...knowledgeTools,
-    ...webTools,
-    ...marketDeskDefs,
-    ...desktopVisionInspect,
-    ...supabaseFiltered,
-    ...mcpDefs
+    { id: "desktop", owner: "module", definitions: desktop },
+    { id: "native", owner: "module", definitions: native },
+    { id: "knowledge", owner: "module", definitions: knowledgeTools },
+    { id: "web", owner: "lane", definitions: webTools },
+    { id: "market-desk", owner: "module", definitions: marketDeskDefs },
+    { id: "desktop:vision-fallback", owner: "module", definitions: desktopVisionInspect },
+    ...groupSchemaDefinitionsByCatalogOwner("supabase", supabaseFiltered),
+    { id: "mcp", owner: "mcp", definitions: mcpDefs }
   ];
 }
+function getEnabledToolDefinitions(opts) {
+  return buildToolSchemaCatalog(getEnabledToolSchemaSections(opts)).definitions;
+}
 function filterModelFacingMcpTools(mcpTools) {
   return mcpTools.filter((tool) => !tool.function.name.startsWith("mcp__playwright__"));
 }
@@ -136779,6 +136964,7 @@ var init_toolDefinitions = __esm({
     init_toolAvailability();
     init_toolPolicy();
     init_marketDeskAccess();
+    init_schemaCatalog();
     init_toolNames();
     init_toolPermissionPolicy();
     init_toolPermissionPolicy();
@@ -206575,6 +206761,8 @@ var init_operatorPrimitives = __esm({
       operatorPrimitive(TOOL_NAMES.browserObserve),
       operatorPrimitive(TOOL_NAMES.browserClick),
       operatorPrimitive(TOOL_NAMES.browserType),
+      operatorPrimitive(TOOL_NAMES.browserVisualClick),
+      operatorPrimitive(TOOL_NAMES.browserFocusType),
       operatorPrimitive(TOOL_NAMES.browserPressKey),
       operatorPrimitive(TOOL_NAMES.browserRead),
       operatorPrimitive(TOOL_NAMES.browserWait),
@@ -215147,9 +215335,21 @@ var init_marketDesk = __esm({
 });
 
 // features/perchTerminal/runtime/toolSystem/registry.ts
+var registry_exports = {};
+__export(registry_exports, {
+  getRegisteredTool: () => getRegisteredTool,
+  getRegisteredToolNames: () => getRegisteredToolNames,
+  isRegisteredTool: () => isRegisteredTool
+});
 function getRegisteredTool(name) {
   return REGISTRY.get(name) ?? null;
 }
+function isRegisteredTool(name) {
+  return REGISTRY.has(name);
+}
+function getRegisteredToolNames() {
+  return [...REGISTRY.keys()];
+}
 var TOOL_MODULES, REGISTRY;
 var init_registry5 = __esm({
   "features/perchTerminal/runtime/toolSystem/registry.ts"() {
@@ -215207,8 +215407,16 @@ var init_registry5 = __esm({
 });
 
 // features/perchTerminal/runtime/toolSystem/executeTool.ts
+async function loadToolRegistry() {
+  if (typeof window !== "undefined") return null;
+  registryPromise ??= Promise.resolve().then(() => (init_registry5(), registry_exports));
+  return registryPromise;
+}
 async function executeRegisteredTool(name, args, ctx) {
-  const mod = getRegisteredTool(name);
+  const registry2 = await loadToolRegistry();
+  if (!registry2) return { handled: false };
+  const { getRegisteredTool: getRegisteredTool2 } = registry2;
+  const mod = getRegisteredTool2(name);
   if (!mod) return { handled: false };
   if (MARKET_DESK_TOOL_NAMES.has(name) && !isMarketDeskEnabled()) {
     return {
@@ -215222,11 +215430,12 @@ async function executeRegisteredTool(name, args, ctx) {
   }
   return { handled: true, result: await mod.handler(args, ctx) };
 }
+var registryPromise;
 var init_executeTool = __esm({
   "features/perchTerminal/runtime/toolSystem/executeTool.ts"() {
     "use strict";
     init_marketDeskAccess();
-    init_registry5();
+    registryPromise = null;
   }
 });
 
@@ -219705,17 +219914,18 @@ async function runLiveAgentsLoop(input) {
     }
     const mode = effectiveChatMode;
     const loopTools = tools;
-    const loopSystemPrompt = appendLiveTurnContract(context.systemPrompt, {
+    const sandboxExecutionRequired = sandboxExecutionRequiredByUserText(turn.trimmedInput, loopTools);
+    const loopSystemPromptBase = appendLiveTurnContract(context.systemPrompt, {
       chatMode: mode,
       toolsAvailable: loopTools.length > 0,
       userObjective: turn.trimmedInput,
       planGateRejected
     });
+    const loopSystemPrompt = sandboxExecutionRequired ? appendSandboxExecutionRequiredContract(loopSystemPromptBase) : loopSystemPromptBase;
     const threadSession = turn.threadId ? getThreadSessionFromMemory(turn.threadId) : null;
     const contextCompaction = threadSession?.contextCompaction ?? null;
     const approvedToolCall = approvedToolCallFromState(workflowState);
     const runLoop = input.loopRunner ?? runModelToolLoop;
-    const sandboxExecutionRequired = sandboxExecutionRequiredByUserText(turn.trimmedInput, loopTools);
     const loopInput = {
       signal: deps.signal ?? void 0,
       lane: loopLane,
@@ -219746,7 +219956,7 @@ async function runLiveAgentsLoop(input) {
       forcedInitialToolCall: approvedToolCall ?? turn.forcedInitialToolCall ?? null,
       forcedInitialToolCallApproved: Boolean(approvedToolCall),
       stopAfterForcedInitialToolCall: Boolean(approvedToolCall),
-      forceToolUse: turn.forceToolUse === true || sandboxExecutionRequired,
+      forceToolUse: turn.forceToolUse === true,
       mcpTools: turn.mcpTools ?? [],
       maxIterations: turnHasBrowserOperatorTools(loopTools) ? 24 : turn.coordinatorSessionActive ? 20 : void 0,
       attachOperatorScreenshots: turnHasBrowserOperatorTools(loopTools),
@@ -219843,10 +220053,11 @@ async function runLiveAgentsLoop(input) {
     if (sandboxExecutionRequired && loopResult.ok && !hasRunSandboxCodeToolCall(loopResult)) {
       loopResult = await runLoop({
         ...loopInput,
-        forceToolUse: true,
-        systemPrompt: `${loopInput.systemPrompt.trim()}
-
-Sandbox execution is explicitly required by the user. This turn is incomplete until you call run_sandbox_code. Use the command field when possible; pass source file paths in sources and read copied files from input/. The sandbox tool result already captures stdout/stderr and produced files; do not try to read output/report.json from the host filesystem after the run. Do not mention internal model, provider, or lane details in the user-facing answer. Do not finish with prose before a sandbox run.`
+        forceToolUse: false,
+        systemPrompt: appendSandboxExecutionRequiredContract(
+          loopInput.systemPrompt,
+          true
+        )
       });
     }
     if (sandboxExecutionRequired && loopResult.ok && !hasRunSandboxCodeToolCall(loopResult)) {
@@ -219977,6 +220188,12 @@ function sandboxExecutionRequiredByUserText(userText, tools) {
   if (!mentionsSandbox) return false;
   return /\b(use|run|execute|call|primary|required|mandatory|must|final numbers|must come from|do not stop)\b/.test(normalized) || /sandbox.{0,80}(primary|required|mandatory|must|execute|run|numbers|code)/.test(normalized) || /(primary|required|mandatory|must|execute|run|numbers|code).{0,80}sandbox/.test(normalized);
 }
+function appendSandboxExecutionRequiredContract(systemPrompt, retry = false) {
+  const prefix = retry ? "The previous attempt did not call run_sandbox_code." : "Sandbox execution is explicitly required by the user.";
+  return `${systemPrompt.trim()}
+
+${prefix} This turn is incomplete until you call run_sandbox_code. Use the command field when possible; pass source file paths in sources and read copied files from input/. The sandbox tool result already captures stdout/stderr and produced files; do not try to read output/report.json from the host filesystem after the run. Do not mention internal model, provider, or lane details in the user-facing answer. Do not finish with prose before a sandbox run.`;
+}
 function hasRunSandboxCodeToolCall(loopResult) {
   return loopResult.toolCalls.some((call) => call.toolName === TOOL_NAMES.runSandboxCode);
 }
@@ -222813,7 +223030,9 @@ function maybeWarnCategoryDrift(input) {
   const drift = sum - input.headlineTokens;
   const allowed = Math.max(256, Math.ceil(input.wireOverheadTokens ?? 0) + 64);
   if (Math.abs(drift) <= allowed) return;
-  if (typeof process !== "undefined" && process.env.NODE_ENV === "production") return;
+  if (typeof process === "undefined" || process.env.PERCH_CONTEXT_METER_DEBUG !== "1") {
+    return;
+  }
   console.warn(
     `[context-meter] Category total drift in ${input.source}: categories=${sum}, headline=${input.headlineTokens}, drift=${drift}`
   );
@@ -282005,12 +282224,27 @@ async function runInkInteractivePerchCli(writer, deps, options) {
         const [pulse, setPulse] = React11.useState(0);
         const [, refresh] = React11.useState(0);
         const liveTextRef = React11.useRef("");
+        const liveTextFlushTimerRef = React11.useRef(null);
         const activeRunRef = React11.useRef(null);
         const toolInputsById = React11.useRef(/* @__PURE__ */ new Map());
         const richToolIds = React11.useRef(/* @__PURE__ */ new Set());
         const terminalCommandItems = React11.useRef(/* @__PURE__ */ new Map());
         const sandboxRunItems = React11.useRef(/* @__PURE__ */ new Map());
         const sandboxRunMeta = React11.useRef(/* @__PURE__ */ new Map());
+        const clearLiveTextFlushTimer = React11.useCallback(() => {
+          if (liveTextFlushTimerRef.current) {
+            clearTimeout(liveTextFlushTimerRef.current);
+            liveTextFlushTimerRef.current = null;
+          }
+        }, []);
+        const scheduleLiveTextPaint = React11.useCallback(() => {
+          if (liveTextFlushTimerRef.current) return;
+          liveTextFlushTimerRef.current = setTimeout(() => {
+            liveTextFlushTimerRef.current = null;
+            setLiveText(liveTextRef.current);
+          }, 33);
+        }, []);
+        React11.useEffect(() => clearLiveTextFlushTimer, [clearLiveTextFlushTimer]);
         React11.useEffect(() => {
           if (!working) return void 0;
           const timer = setInterval(() => setPulse((value) => value + 1), 120);
@@ -282109,6 +282343,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           }
           setWorking(true);
           setWorkingText("thinking");
+          clearLiveTextFlushTimer();
           setLiveText("");
           liveTextRef.current = "";
           const toolNamesById = /* @__PURE__ */ new Map();
@@ -282155,7 +282390,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                   case "content_delta":
                   case "streaming_text":
                     liveTextRef.current += event.text;
-                    setLiveText(liveTextRef.current);
+                    scheduleLiveTextPaint();
                     break;
                   case "assistant_preamble":
                   case "activity_delta":
@@ -282403,6 +282638,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                 }
               }
             });
+            clearLiveTextFlushTimer();
             setLiveText("");
             const assistantText = result2.assistantText.trim() || liveTextRef.current.trim();
             if (assistantText) {
@@ -282439,12 +282675,13 @@ async function runInkInteractivePerchCli(writer, deps, options) {
             if (activeRunRef.current?.runId === clientRunId) {
               activeRunRef.current = null;
             }
+            clearLiveTextFlushTimer();
             setWorking(false);
             setWorkingText("ready");
             setLiveText("");
             liveTextRef.current = "";
           }
-        }, [addItem, app, appendItemDetails, patchItem, reconnect, runTurn, updateToolItem, working]);
+        }, [addItem, app, appendItemDetails, clearLiveTextFlushTimer, patchItem, reconnect, runTurn, scheduleLiveTextPaint, updateToolItem, working]);
         Ink2.useInput((input, key) => {
           if (working) {
             if (key.ctrl && input === "e") {

package/package.json

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