@buildautomaton/cli 0.1.98 → 0.1.99

package/dist/index.js

@@ -3805,6 +3805,7 @@ function isCliSqliteLockError(e) {
 var CliSqliteInterrupted;
 var init_sqlite_errors = __esm({
   "../bridge/src/sqlite/sqlite-errors.ts"() {
+    "use strict";
     CliSqliteInterrupted = class extends Error {
       name = "CliSqliteInterrupted";
       constructor() {
@@ -3959,6 +3960,7 @@ function maybeLogCodeNavCacheWorkerError(message) {
 var diagnosticSink, lastDiagnosticKey;
 var init_code_nav_cache_log = __esm({
   "../bridge/src/sqlite/code-nav-cache/code-nav-cache-log.ts"() {
+    "use strict";
     init_log();
     init_sqlite_errors();
     init_sqlite_lock_path();
@@ -5122,6 +5124,7 @@ async function ensureCodeNavCacheSqliteInitialized() {
 var safeCloseCodeNavCacheSqliteDatabase, openCodeNavCacheSqliteConnection;
 var init_database = __esm({
   "../bridge/src/sqlite/code-nav-cache/database.ts"() {
+    "use strict";
     init_code_nav_cache_availability();
     init_instance();
     init_sqlite_errors();
@@ -5366,7 +5369,7 @@ function migrateCliSqlite(db) {
     "cli-sqlite"
   );
 }
-var CHECKPOINT_V12, CHECKPOINT_V1_SQL2, AGENT_CAPABILITIES_SQL, DROP_CACHE_TABLES_SQL, CLI_SQLITE_MIGRATIONS;
+var CHECKPOINT_V12, CHECKPOINT_V1_SQL2, AGENT_CAPABILITIES_SQL, AGENT_SESSION_AVAILABLE_COMMANDS_SQL, AGENT_CAPABILITIES_AVAILABLE_COMMANDS_SQL, DROP_CACHE_TABLES_SQL, CLI_SQLITE_MIGRATIONS;
 var init_migrate_cli_sqlite = __esm({
   "../bridge/src/sqlite/migrate-cli-sqlite.ts"() {
     "use strict";
@@ -5375,6 +5378,12 @@ var init_migrate_cli_sqlite = __esm({
     CHECKPOINT_V12 = "001_cli_sqlite_checkpoint_v1";
     CHECKPOINT_V1_SQL2 = readCliSqliteMigrationSql("001_cli_sqlite_checkpoint_v1.sql");
     AGENT_CAPABILITIES_SQL = readCliSqliteMigrationSql("002_agent_capabilities.sql");
+    AGENT_SESSION_AVAILABLE_COMMANDS_SQL = readCliSqliteMigrationSql(
+      "003_agent_session_available_commands.sql"
+    );
+    AGENT_CAPABILITIES_AVAILABLE_COMMANDS_SQL = readCliSqliteMigrationSql(
+      "004_agent_capabilities_available_commands.sql"
+    );
     DROP_CACHE_TABLES_SQL = readCliSqliteMigrationSql("006_drop_cache_tables.sql");
     CLI_SQLITE_MIGRATIONS = [
       {
@@ -5401,6 +5410,26 @@ var init_migrate_cli_sqlite = __esm({
         },
         alreadyApplied: (db) => agentCapabilitiesTableState(db) === "current"
       },
+      {
+        name: "003_agent_session_available_commands",
+        migrate: (db) => {
+          db.exec(AGENT_SESSION_AVAILABLE_COMMANDS_SQL);
+        },
+        alreadyApplied: (db) => {
+          const rows = db.all(`PRAGMA table_info(agent_session)`);
+          return rows.some((r) => r.name === "available_commands_json");
+        }
+      },
+      {
+        name: "004_agent_capabilities_available_commands",
+        migrate: (db) => {
+          db.exec(AGENT_CAPABILITIES_AVAILABLE_COMMANDS_SQL);
+        },
+        alreadyApplied: (db) => {
+          const rows = db.all(`PRAGMA table_info(agent_capabilities)`);
+          return rows.some((r) => r.name === "available_commands_json");
+        }
+      },
       {
         name: "006_drop_cache_tables",
         migrate: (db) => {
@@ -32824,6 +32853,12 @@ function liveEditSnippetToUnifiedDiff(filePath, oldText, newText) {
 // ../bridge/src/files/workspace/limits.ts
 var MAX_SYNC_WORKSPACE_FILE_BYTES = 512 * 1024;
 
+// ../bridge/src/files/workspace/path-has-dot-dot-segment.ts
+function pathHasDotDotSegment(path84) {
+  if (!path84) return false;
+  return path84.split(/[/\\]/).includes("..");
+}
+
 // ../bridge/src/files/workspace/safe-path.ts
 import * as path2 from "node:path";
 function resolveSafePathUnderCwd(cwd, filePath) {
@@ -32832,7 +32867,7 @@ function resolveSafePathUnderCwd(cwd, filePath) {
   const normalizedCwd = path2.resolve(cwd);
   const resolved = path2.isAbsolute(trimmed2) ? path2.normalize(trimmed2) : path2.resolve(normalizedCwd, trimmed2);
   const rel = path2.relative(normalizedCwd, resolved);
-  if (rel.startsWith("..") || path2.isAbsolute(rel)) return null;
+  if (rel === ".." || rel.startsWith(`..${path2.sep}`) || path2.isAbsolute(rel)) return null;
   return resolved;
 }
 function toDisplayPathRelativeToCwd(cwd, absolutePath) {
@@ -32994,6 +33029,9 @@ function resolveWorkspaceFilePath(sessionParentPath, rawPath) {
 import { readFileSync as readFileSync3, statSync } from "node:fs";
 import * as path19 from "node:path";
 var GIT_FILE_READ_TIMEOUT_MS = 2e3;
+function isRelUnderRoot(rel) {
+  return rel !== ".." && !rel.startsWith(`..${path19.sep}`) && !path19.isAbsolute(rel);
+}
 function readUtf8FileCapped(resolvedPath) {
   try {
     const st = statSync(resolvedPath);
@@ -33004,12 +33042,12 @@ function readUtf8FileCapped(resolvedPath) {
   }
 }
 function readUtf8WorkspaceFile(sessionParentPath, displayPath) {
-  if (!displayPath || displayPath.includes("..")) return "";
+  if (!displayPath || pathHasDotDotSegment(displayPath)) return "";
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
     const resolvedPath2 = path19.resolve(gitRoot, displayPath);
     const rel = path19.relative(gitRoot, resolvedPath2);
-    if (!rel.startsWith("..") && !path19.isAbsolute(rel)) {
+    if (isRelUnderRoot(rel)) {
       return readUtf8FileCapped(resolvedPath2);
     }
   }
@@ -33018,17 +33056,17 @@ function readUtf8WorkspaceFile(sessionParentPath, displayPath) {
   return readUtf8FileCapped(resolvedPath);
 }
 function tryWorkspaceDisplayToPath(sessionParentPath, displayPath) {
-  if (!displayPath || displayPath.includes("..")) return null;
+  if (!displayPath || pathHasDotDotSegment(displayPath)) return null;
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
     const resolvedPath = path19.resolve(gitRoot, displayPath);
     const rel = path19.relative(gitRoot, resolvedPath);
-    if (!rel.startsWith("..") && !path19.isAbsolute(rel)) return resolvedPath;
+    if (isRelUnderRoot(rel)) return resolvedPath;
   }
   return resolveSafePathUnderCwd(sessionParentPath, displayPath);
 }
 function readGitHeadBlob(sessionParentPath, displayPath) {
-  if (!displayPath || displayPath.includes("..")) return "";
+  if (!displayPath || pathHasDotDotSegment(displayPath)) return "";
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (!gitRoot) return "";
   try {
@@ -33080,15 +33118,35 @@ function acpWriteTextFileInProcess(ctx, filePath, newText) {
   return {};
 }
 
+// ../bridge/src/agents/acp/clients/shared/parse-available-commands.ts
+function parseAvailableCommandsList(raw) {
+  if (!Array.isArray(raw)) return null;
+  return raw;
+}
+function availableCommandsFromSessionUpdatePayload(flatPayload) {
+  return parseAvailableCommandsList(flatPayload.availableCommands ?? flatPayload.available_commands);
+}
+
 // ../bridge/src/agents/acp/clients/shared/dispatch-session-update.ts
 function dispatchAcpSessionUpdate(opts) {
-  const { flatPayload, onAcpConfigOptionsUpdated, onSessionUpdate, suppressLoadReplay } = opts;
+  const {
+    flatPayload,
+    onAcpConfigOptionsUpdated,
+    onAcpAvailableCommandsUpdated,
+    onSessionUpdate,
+    suppressLoadReplay
+  } = opts;
   const su = flatPayload.sessionUpdate ?? flatPayload.session_update;
   if (su === "config_option_update") {
     const co = flatPayload.configOptions;
     if (Array.isArray(co)) onAcpConfigOptionsUpdated?.(co);
     return;
   }
+  if (su === "available_commands_update") {
+    const cmds = availableCommandsFromSessionUpdatePayload(flatPayload);
+    if (cmds) onAcpAvailableCommandsUpdated?.(cmds);
+    return;
+  }
   if (suppressLoadReplay()) return;
   onSessionUpdate?.(flatPayload);
 }
@@ -33161,6 +33219,7 @@ function createSdkStdioConnectionClient(deps) {
       dispatchAcpSessionUpdate({
         flatPayload: bridged,
         onAcpConfigOptionsUpdated: sessionCtx.onAcpConfigOptionsUpdated,
+        onAcpAvailableCommandsUpdated: sessionCtx.onAcpAvailableCommandsUpdated,
         onSessionUpdate,
         suppressLoadReplay: () => sessionCtx.suppressLoadReplay.value
       });
@@ -33248,6 +33307,7 @@ function createSdkStdioSessionContext(options) {
     getActiveConfigOptions: options.getActiveConfigOptions,
     onAcpSessionEstablished: options.onAcpSessionEstablished,
     onAcpConfigOptionsUpdated: options.onAcpConfigOptionsUpdated,
+    onAcpAvailableCommandsUpdated: options.onAcpAvailableCommandsUpdated,
     logDebug,
     getStderrText: () => options.stderrCapture.getText(),
     afterSessionEstablished: options.afterSessionEstablished
@@ -33606,6 +33666,7 @@ async function createSdkStdioAcpClient(options) {
     getActiveConfigOptions,
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
+    onAcpAvailableCommandsUpdated: options.onAcpAvailableCommandsUpdated,
     onFileChange,
     afterSessionEstablished,
     stderrCapture
@@ -35742,6 +35803,7 @@ function createCursorAcpSessionContext(options) {
     getActiveConfigOptions: options.getActiveConfigOptions,
     onAcpSessionEstablished: options.onAcpSessionEstablished,
     onAcpConfigOptionsUpdated: options.onAcpConfigOptionsUpdated,
+    onAcpAvailableCommandsUpdated: options.onAcpAvailableCommandsUpdated,
     logDebug,
     getStderrText: () => options.stderrCapture.getText(),
     pendingPlanExecute: { value: false },
@@ -36166,6 +36228,7 @@ function handleCursorIncomingSessionUpdate(msg, deps) {
   dispatchAcpSessionUpdate({
     flatPayload: update,
     onAcpConfigOptionsUpdated: deps.sessionCtx.onAcpConfigOptionsUpdated,
+    onAcpAvailableCommandsUpdated: deps.sessionCtx.onAcpAvailableCommandsUpdated,
     onSessionUpdate: deps.onSessionUpdate,
     suppressLoadReplay: () => deps.sessionCtx.suppressLoadReplay.value
   });
@@ -36418,6 +36481,7 @@ async function createCursorAcpClient(options) {
     getActiveConfigOptions: options.getActiveConfigOptions,
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
+    onAcpAvailableCommandsUpdated: options.onAcpAvailableCommandsUpdated,
     onFileChange,
     afterSessionEstablished,
     stderrCapture
@@ -36619,7 +36683,7 @@ function getAgentTypeDisplayName(agentType) {
 import { existsSync as existsSync4, statSync as statSync2 } from "node:fs";
 var GIT_PATH_KIND_TIMEOUT_MS = 2e3;
 function gitHeadPathObjectType(sessionParentPath, displayPath) {
-  if (!displayPath || displayPath.includes("..")) return null;
+  if (!displayPath || pathHasDotDotSegment(displayPath)) return null;
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (!gitRoot) return null;
   try {
@@ -37395,36 +37459,74 @@ function buildAcpSessionBridgeHooks(opts) {
 
 // ../bridge/src/agents/acp/local-agent-session-file.ts
 init_cli_database();
+
+// ../bridge/src/agents/acp/local-agent-session-row.ts
+function parseJsonArray(raw) {
+  if (raw == null || raw === "") return null;
+  try {
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function rowToFile(row) {
+  return {
+    v: 1,
+    acpSessionId: row.acp_session_id,
+    backendAgentType: row.backend_agent_type,
+    configOptions: parseJsonArray(row.config_options_json),
+    availableCommands: parseJsonArray(row.available_commands_json),
+    updatedAt: row.updated_at
+  };
+}
+function readLocalAgentSessionRow(db, key) {
+  const row = db.get(
+    `SELECT acp_session_id, backend_agent_type, config_options_json, available_commands_json, updated_at
+     FROM agent_session WHERE session_key = ?`,
+    [key]
+  );
+  return row ? rowToFile(row) : null;
+}
+function writeLocalAgentSessionRow(db, key, patch) {
+  const prev = readLocalAgentSessionRow(db, key);
+  const next = {
+    v: 1,
+    acpSessionId: patch.acpSessionId !== void 0 ? patch.acpSessionId : prev?.acpSessionId ?? null,
+    backendAgentType: patch.backendAgentType !== void 0 ? patch.backendAgentType : prev?.backendAgentType ?? null,
+    configOptions: patch.configOptions !== void 0 ? patch.configOptions : prev?.configOptions ?? null,
+    availableCommands: patch.availableCommands !== void 0 ? patch.availableCommands : prev?.availableCommands ?? null,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  db.run(
+    `INSERT INTO agent_session (
+       session_key, acp_session_id, backend_agent_type, config_options_json, available_commands_json, updated_at
+     ) VALUES (?, ?, ?, ?, ?, ?)
+     ON CONFLICT(session_key) DO UPDATE SET
+       acp_session_id = excluded.acp_session_id,
+       backend_agent_type = excluded.backend_agent_type,
+       config_options_json = excluded.config_options_json,
+       available_commands_json = excluded.available_commands_json,
+       updated_at = excluded.updated_at`,
+    [
+      key,
+      next.acpSessionId,
+      next.backendAgentType,
+      next.configOptions != null ? JSON.stringify(next.configOptions) : null,
+      next.availableCommands != null ? JSON.stringify(next.availableCommands) : null,
+      next.updatedAt
+    ]
+  );
+}
+
+// ../bridge/src/agents/acp/local-agent-session-file.ts
 function sessionKeyForCloudSessionId(cloudSessionId) {
   const t = cloudSessionId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 220);
   return t.length > 0 ? t : "session";
 }
 function readLocalAgentSessionFile(cloudSessionId) {
   try {
-    return withCliSqliteSync((db) => {
-      const key = sessionKeyForCloudSessionId(cloudSessionId);
-      const row = db.get(
-        "SELECT acp_session_id, backend_agent_type, config_options_json, updated_at FROM agent_session WHERE session_key = ?",
-        [key]
-      );
-      if (!row) return null;
-      let configOptions = null;
-      if (row.config_options_json != null && row.config_options_json !== "") {
-        try {
-          const parsed = JSON.parse(row.config_options_json);
-          configOptions = Array.isArray(parsed) ? parsed : null;
-        } catch {
-          configOptions = null;
-        }
-      }
-      return {
-        v: 1,
-        acpSessionId: row.acp_session_id,
-        backendAgentType: row.backend_agent_type,
-        configOptions,
-        updatedAt: row.updated_at
-      };
-    });
+    return withCliSqliteSync((db) => readLocalAgentSessionRow(db, sessionKeyForCloudSessionId(cloudSessionId)));
   } catch {
     return null;
   }
@@ -37432,53 +37534,28 @@ function readLocalAgentSessionFile(cloudSessionId) {
 function writeLocalAgentSessionFile(cloudSessionId, patch) {
   try {
     withCliSqliteSync((db) => {
-      const key = sessionKeyForCloudSessionId(cloudSessionId);
-      const prevRow = db.get(
-        "SELECT acp_session_id, backend_agent_type, config_options_json, updated_at FROM agent_session WHERE session_key = ?",
-        [key]
-      );
-      let prev = null;
-      if (prevRow) {
-        let configOptions = null;
-        if (prevRow.config_options_json != null && prevRow.config_options_json !== "") {
-          try {
-            const parsed = JSON.parse(prevRow.config_options_json);
-            configOptions = Array.isArray(parsed) ? parsed : null;
-          } catch {
-            configOptions = null;
-          }
-        }
-        prev = {
-          v: 1,
-          acpSessionId: prevRow.acp_session_id,
-          backendAgentType: prevRow.backend_agent_type,
-          configOptions,
-          updatedAt: prevRow.updated_at
-        };
-      }
-      const next = {
-        v: 1,
-        acpSessionId: patch.acpSessionId !== void 0 ? patch.acpSessionId : prev?.acpSessionId ?? null,
-        backendAgentType: patch.backendAgentType !== void 0 ? patch.backendAgentType : prev?.backendAgentType ?? null,
-        configOptions: patch.configOptions !== void 0 ? patch.configOptions : prev?.configOptions ?? null,
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-      };
-      const configJson = next.configOptions != null ? JSON.stringify(next.configOptions) : null;
-      db.run(
-        `INSERT INTO agent_session (session_key, acp_session_id, backend_agent_type, config_options_json, updated_at)
-         VALUES (?, ?, ?, ?, ?)
-         ON CONFLICT(session_key) DO UPDATE SET
-           acp_session_id = excluded.acp_session_id,
-           backend_agent_type = excluded.backend_agent_type,
-           config_options_json = excluded.config_options_json,
-           updated_at = excluded.updated_at`,
-        [key, next.acpSessionId, next.backendAgentType, configJson, next.updatedAt]
-      );
+      writeLocalAgentSessionRow(db, sessionKeyForCloudSessionId(cloudSessionId), patch);
     });
   } catch {
   }
 }
 
+// ../bridge/src/agents/acp/persist-acp-available-commands.ts
+function persistAcpAvailableCommands(params) {
+  const { availableCommands, setActive, cloudSessionId, preferredAgentType, reportAgentCapabilities } = params;
+  if (!Array.isArray(availableCommands)) return;
+  setActive(availableCommands);
+  if (cloudSessionId != null && cloudSessionId !== "") {
+    writeLocalAgentSessionFile(cloudSessionId, {
+      availableCommands,
+      ...preferredAgentType != null && preferredAgentType !== "" ? { backendAgentType: preferredAgentType } : {}
+    });
+  }
+  if (reportAgentCapabilities && preferredAgentType != null && preferredAgentType !== "" && availableCommands.length > 0) {
+    reportAgentCapabilities({ agentType: preferredAgentType, availableCommands });
+  }
+}
+
 // ../bridge/src/agents/acp/acp-agent.ts
 function computeAcpSessionAgentKey(cloudSessionId, acpAgentKey) {
   const sid = cloudSessionId?.trim();
@@ -37527,6 +37604,7 @@ function invalidateAcpClientState(state) {
   state.acpStartPromise = null;
   state.acpAgentKey = null;
   state.activeSessionConfigOptions = null;
+  state.activeAvailableCommands = null;
   state.latestAgentConfigForBridgeHooks = null;
 }
 function createEmptyAcpClientState() {
@@ -37537,6 +37615,7 @@ function createEmptyAcpClientState() {
     lastAcpCwd: null,
     acpAgentKey: null,
     activeSessionConfigOptions: null,
+    activeAvailableCommands: null,
     latestAgentConfigForBridgeHooks: null,
     clientEpoch: 0
   };
@@ -37622,6 +37701,7 @@ async function ensureAcpClient(options) {
     const persisted = cloudSessionId != null && cloudSessionId !== "" && preferredAgentType != null && preferredAgentType !== "" ? readLocalAgentSessionFile(cloudSessionId) : null;
     const persistedAcpSessionId = persisted && persisted.backendAgentType === preferredAgentType && typeof persisted.acpSessionId === "string" && persisted.acpSessionId.trim() !== "" ? persisted.acpSessionId.trim() : null;
     state.activeSessionConfigOptions = Array.isArray(persisted?.configOptions) ? persisted.configOptions : null;
+    state.activeAvailableCommands = Array.isArray(persisted?.availableCommands) ? persisted.availableCommands : null;
     const spawnEpoch = state.clientEpoch;
     state.acpStartPromise = resolved.createClient({
       command: resolved.command,
@@ -37661,6 +37741,17 @@ async function ensureAcpClient(options) {
           });
         }
       },
+      onAcpAvailableCommandsUpdated: (availableCommands) => {
+        persistAcpAvailableCommands({
+          availableCommands,
+          setActive: (cmds) => {
+            state.activeAvailableCommands = cmds;
+          },
+          cloudSessionId,
+          preferredAgentType,
+          reportAgentCapabilities
+        });
+      },
       onAgentSubprocessExit: () => {
         if (state.acpHandle != null) {
           state.clientEpoch += 1;
@@ -37669,6 +37760,7 @@ async function ensureAcpClient(options) {
         state.acpStartPromise = null;
         state.acpAgentKey = null;
         state.activeSessionConfigOptions = null;
+        state.activeAvailableCommands = null;
         state.latestAgentConfigForBridgeHooks = null;
         state.lastAcpStartError = "Agent subprocess exited";
       },
@@ -37878,7 +37970,7 @@ function repoDisplayPath(repoPath, multiRepo) {
   return (rel) => multiRepo ? `${slug}/${rel}` : rel;
 }
 function safeRelPath(rel) {
-  return typeof rel === "string" && rel.length > 0 && !rel.includes("..");
+  return typeof rel === "string" && rel.length > 0 && !pathHasDotDotSegment(rel);
 }
 function newUntrackedPaths(raw, baselineUntracked, seen) {
   const baseline = new Set(baselineUntracked);
@@ -38208,6 +38300,19 @@ async function sendPromptToAgent(options) {
     attachments,
     isNewSession = false
   } = options;
+  const finalize2 = (result) => finalizeAndSendPromptResult({
+    result,
+    sessionId,
+    runId,
+    promptId,
+    agentType,
+    agentCwd,
+    followUpCatalogPromptId,
+    plugin,
+    sendResult,
+    sendSessionUpdate,
+    log: log2
+  });
   try {
     const prepared = await prepareAgentPromptText({
       promptText,
@@ -38228,7 +38333,10 @@ async function sendPromptToAgent(options) {
       log: log2
     });
     if (!imagesResolved.ok) {
-      sendResult(imagesResolved.errorResult);
+      await finalize2({
+        success: false,
+        error: imagesResolved.errorResult.error
+      });
       return;
     }
     const promptStartedAt = Date.now();
@@ -38237,32 +38345,11 @@ async function sendPromptToAgent(options) {
     if (promptDurationMs >= SLOW_ACP_PROMPT_MS) {
       log2(`[Agent] ACP session/prompt completed after ${promptDurationMs}ms.`);
     }
-    await finalizeAndSendPromptResult({
-      result,
-      sessionId,
-      runId,
-      promptId,
-      agentType,
-      agentCwd,
-      followUpCatalogPromptId,
-      plugin,
-      sendResult,
-      sendSessionUpdate,
-      log: log2
-    });
+    await finalize2(result);
   } catch (err) {
     const errMsg = err instanceof Error ? err.message : String(err);
     log2(`[Agent] Send failed: ${errMsg}`);
-    sendResult({
-      type: "prompt_result",
-      id: promptId,
-      ...sessionId ? { sessionId } : {},
-      ...runId ? { runId } : {},
-      success: false,
-      error: errMsg,
-      ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-      ...augmentPromptResultAuthFields(agentType, errMsg)
-    });
+    await finalize2({ success: false, error: errMsg });
   }
 }
 
@@ -38382,8 +38469,13 @@ async function ensureAcpPromptClient(ctx, runCtx, opts) {
 
 // ../bridge/src/agents/acp/manager/run-acp-prompt.ts
 async function runAcpPrompt(ctx, runCtx, opts) {
-  const handle = await ensureAcpPromptClient(ctx, runCtx, opts);
-  if (handle) await dispatchAcpPrompt(ctx, runCtx, opts, handle);
+  ctx.promptRouting.setStreamingRunId(runCtx.activeAcpSessionAgentKey, runCtx.activeRunId);
+  try {
+    const handle = await ensureAcpPromptClient(ctx, runCtx, opts);
+    if (handle) await dispatchAcpPrompt(ctx, runCtx, opts, handle);
+  } finally {
+    ctx.promptRouting.clearStreamingRunId(runCtx.activeAcpSessionAgentKey, runCtx.activeRunId);
+  }
 }
 
 // ../bridge/src/agents/acp/manager/handle-prompt.ts
@@ -38838,63 +38930,95 @@ function hashJsonUtf8Sha256(value) {
   return createHash("sha256").update(JSON.stringify(value), "utf8").digest("hex");
 }
 
+// ../bridge/src/sqlite/agent-capability-fields.ts
+function parseJsonArrayColumn(raw) {
+  if (raw == null || raw === "") return null;
+  try {
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function mergeAgentCapabilityFields(existing, patch) {
+  return {
+    configOptions: patch.configOptions !== void 0 ? patch.configOptions : existing.configOptions,
+    availableCommands: patch.availableCommands !== void 0 ? patch.availableCommands : existing.availableCommands
+  };
+}
+
+// ../bridge/src/sqlite/list-cli-agent-capability-cache.ts
+function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
+  const rows = db.all(
+    `SELECT agent_type, config_options_json, available_commands_json FROM agent_capabilities WHERE workspace_id = ?`,
+    [workspaceId]
+  );
+  const out = [];
+  for (const r of rows) {
+    const configOptions = parseJsonArrayColumn(r.config_options_json) ?? [];
+    const availableCommands = parseJsonArrayColumn(r.available_commands_json);
+    if (configOptions.length === 0 && !(availableCommands && availableCommands.length > 0)) continue;
+    out.push({ agentType: r.agent_type, configOptions, availableCommands });
+  }
+  return out;
+}
+
 // ../bridge/src/sqlite/agent-capability-cache.ts
-function hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType) {
-  const t = agentType.trim();
-  if (!t) return false;
+function readExistingFields(db, workspaceId, agentType) {
   try {
     const row = db.get(
-      `SELECT config_options_json FROM agent_capabilities WHERE workspace_id = ? AND agent_type = ?`,
-      [workspaceId, t]
+      `SELECT config_options_json, available_commands_json, content_hash
+       FROM agent_capabilities WHERE workspace_id = ? AND agent_type = ?`,
+      [workspaceId, agentType]
     );
-    if (row?.config_options_json == null || row.config_options_json === "") return false;
-    const parsed = JSON.parse(row.config_options_json);
-    return Array.isArray(parsed) && parsed.length > 0;
+    if (!row) return { configOptions: null, availableCommands: null };
+    return {
+      configOptions: parseJsonArrayColumn(row.config_options_json),
+      availableCommands: parseJsonArrayColumn(row.available_commands_json),
+      contentHash: row.content_hash
+    };
   } catch {
-    return false;
+    return { configOptions: null, availableCommands: null };
   }
 }
+function hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType) {
+  const t = agentType.trim();
+  if (!t) return false;
+  const existing = readExistingFields(db, workspaceId, t);
+  return Array.isArray(existing.configOptions) && existing.configOptions.length > 0;
+}
 function upsertCliAgentCapabilityCache(db, row) {
   const t = row.agentType.trim();
   if (!t) return false;
-  const hash2 = hashJsonUtf8Sha256(row.configOptions);
-  try {
-    const prev = db.get(
-      `SELECT content_hash FROM agent_capabilities WHERE workspace_id = ? AND agent_type = ?`,
-      [row.workspaceId, t]
-    );
-    if (prev?.content_hash === hash2) return false;
-  } catch {
-  }
-  const json2 = JSON.stringify(row.configOptions);
+  const existing = readExistingFields(db, row.workspaceId, t);
+  const next = mergeAgentCapabilityFields(existing, row);
+  if (!next.configOptions?.length && !next.availableCommands?.length) return false;
+  const hash2 = hashJsonUtf8Sha256({
+    configOptions: next.configOptions,
+    availableCommands: next.availableCommands
+  });
+  if (existing.contentHash === hash2) return false;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   db.run(
-    `INSERT INTO agent_capabilities (workspace_id, agent_type, config_options_json, content_hash, updated_at)
-     VALUES (?, ?, ?, ?, ?)
+    `INSERT INTO agent_capabilities (
+       workspace_id, agent_type, config_options_json, available_commands_json, content_hash, updated_at
+     ) VALUES (?, ?, ?, ?, ?, ?)
      ON CONFLICT(workspace_id, agent_type) DO UPDATE SET
        config_options_json = excluded.config_options_json,
+       available_commands_json = excluded.available_commands_json,
        content_hash = excluded.content_hash,
        updated_at = excluded.updated_at`,
-    [row.workspaceId, t, json2, hash2, now]
+    [
+      row.workspaceId,
+      t,
+      next.configOptions != null ? JSON.stringify(next.configOptions) : null,
+      next.availableCommands != null ? JSON.stringify(next.availableCommands) : null,
+      hash2,
+      now
+    ]
   );
   return true;
 }
-function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
-  const rows = db.all(
-    `SELECT agent_type, config_options_json FROM agent_capabilities WHERE workspace_id = ?`,
-    [workspaceId]
-  );
-  const out = [];
-  for (const r of rows) {
-    try {
-      const parsed = JSON.parse(r.config_options_json);
-      if (!Array.isArray(parsed) || parsed.length === 0) continue;
-      out.push({ agentType: r.agent_type, configOptions: parsed });
-    } catch {
-    }
-  }
-  return out;
-}
 
 // ../bridge/src/agents/capabilities/probe-agent-capabilities-for-types.ts
 init_cli_database();
@@ -39048,7 +39172,11 @@ async function warmupAgentCapabilitiesOnConnect(params) {
       if (!isCurrent() || rows.length === 0) return;
       sendWsMessage(socket, {
         type: "agent_capabilities_batch",
-        items: rows.map((r) => ({ agentType: r.agentType, configOptions: r.configOptions }))
+        items: rows.map((r) => ({
+          agentType: r.agentType,
+          configOptions: r.configOptions,
+          ...r.availableCommands != null ? { availableCommands: r.availableCommands } : {}
+        }))
       });
     } catch (e) {
       if (e instanceof CliSqliteInterrupted) return;
@@ -39092,7 +39220,9 @@ init_cli_database();
 function createAgentCapabilitiesReporter(params) {
   const { workspaceId, getWs } = params;
   return (info) => {
-    if (!Array.isArray(info.configOptions) || info.configOptions.length === 0) return;
+    const hasConfig = Array.isArray(info.configOptions) && info.configOptions.length > 0;
+    const hasCommands = Array.isArray(info.availableCommands) && info.availableCommands.length > 0;
+    if (!hasConfig && !hasCommands) return;
     setImmediate(() => {
       let changed = false;
       try {
@@ -39100,7 +39230,8 @@ function createAgentCapabilitiesReporter(params) {
           (db) => upsertCliAgentCapabilityCache(db, {
             workspaceId,
             agentType: info.agentType,
-            configOptions: info.configOptions
+            ...hasConfig ? { configOptions: info.configOptions } : {},
+            ...hasCommands ? { availableCommands: info.availableCommands } : {}
           })
         );
       } catch (e) {
@@ -39112,7 +39243,8 @@ function createAgentCapabilitiesReporter(params) {
       sendWsMessage(socket, {
         type: "agent_capabilities",
         agentType: info.agentType,
-        configOptions: info.configOptions
+        ...hasConfig ? { configOptions: info.configOptions } : {},
+        ...hasCommands ? { availableCommands: info.availableCommands } : {}
       });
     });
   };
@@ -40494,7 +40626,7 @@ function createBridgeHeartbeatController(params) {
 }
 
 // ../bridge/src/cli/cli-version.ts
-var CLI_VERSION = "0.1.98".length > 0 ? "0.1.98" : "0.0.0-dev";
+var CLI_VERSION = "0.1.99".length > 0 ? "0.1.99" : "0.0.0-dev";
 
 // ../bridge/src/connection/identify/send-bridge-identify.ts
 function sendBridgeIdentify(ws, params) {
@@ -53572,7 +53704,7 @@ function createPendingAuthOnMessage(params) {
 }
 
 // src/cli-version.ts
-var CLI_VERSION2 = "0.1.98".length > 0 ? "0.1.98" : "0.0.0-dev";
+var CLI_VERSION2 = "0.1.99".length > 0 ? "0.1.99" : "0.0.0-dev";
 
 // src/auth/pending/pending-auth-on-open.ts
 function createPendingAuthOnOpen(params) {