@alan-ai-hq/agent-manager-linux-x64 0.1.136 → 0.1.138

package/alan-holder.cjs

@@ -20104,7 +20104,12 @@ var init_run_context = __esm({
       prMeta: pullRequestMetaSchema.optional(),
       currentUser: agentUserIdentitySchema.optional(),
       sessionVisibility: external_exports.enum(["private", "team"]).nullable().optional(),
-      workflowTools: external_exports.array(workflowToolRefSchema).optional()
+      workflowTools: external_exports.array(workflowToolRefSchema).optional(),
+      availableSkills: external_exports.array(external_exports.object({
+        name: external_exports.string().min(1),
+        description: external_exports.string(),
+        packageDirectory: external_exports.string().min(1)
+      })).max(2e3).optional()
     });
   }
 });
@@ -20355,6 +20360,7 @@ var init_desired_state = __esm({
       /** Omitted by older servers; only an explicit entitlement enables context-search guidance. */
       contextGraphEnabled: external_exports.boolean().optional(),
       cloudEnvironmentId: external_exports.guid().optional(),
+      sandboxId: external_exports.string().min(1).optional(),
       localRepoUrls: external_exports.array(external_exports.string().min(1)).optional()
       // Never here: the provider API key. The holder fetches it per run (RUN_PROVIDER_CREDENTIAL_PATH).
     });
@@ -21313,6 +21319,7 @@ var init_workflow_tools_filter = __esm({
     WORKFLOW_ALWAYS_ALLOWED_BUILTIN_TOOLS = [
       "search_context",
       "create_test_report",
+      "publish_capture",
       "create_plan",
       "create_document_artifact",
       "list_artifacts",
@@ -21794,12 +21801,14 @@ function isExternalMcpServerName(name) {
 function isMcpConfigKey(name) {
   return MCP_CONFIG_KEY.test(name);
 }
-var ALAN_MCP_AUTHORIZATION_ENV, ALAN_RUN_ID_ENV, MCP_CONFIG_KEY;
+var ALAN_MCP_AUTHORIZATION_ENV, ALAN_RUN_ID_ENV, ALAN_MCP_URL_ENV, ALAN_MCP_CREDENTIAL_FILE_ENV, MCP_CONFIG_KEY;
 var init_mcp_config = __esm({
   "../shared/dist/agent/mcp-config.js"() {
     "use strict";
     ALAN_MCP_AUTHORIZATION_ENV = "ALAN_MCP_AUTHORIZATION";
     ALAN_RUN_ID_ENV = "ALAN_RUN_ID";
+    ALAN_MCP_URL_ENV = "ALAN_MCP_URL";
+    ALAN_MCP_CREDENTIAL_FILE_ENV = "ALAN_MCP_CREDENTIAL_FILE";
     MCP_CONFIG_KEY = /^[A-Za-z0-9_-]+$/;
   }
 });
@@ -22221,23 +22230,31 @@ var init_chunk_YXWJW7I5 = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-J4T6L5LX.js
+// ../agent-core/dist/chunk-M6YHY2EZ.js
 function windowsEnvValue(env, name) {
   const wanted = name.toLowerCase();
-  for (const [key, value] of Object.entries(env)) {
+  for (const [key, value] of Object.entries(env).reverse()) {
     if (key.toLowerCase() === wanted) return value;
   }
   return void 0;
 }
+function canonicalWindowsEnvironment(env) {
+  const unique = /* @__PURE__ */ new Map();
+  for (const [name, value] of Object.entries(env)) {
+    unique.set(name.toLowerCase(), [name.toLowerCase() === "path" ? "PATH" : name, value]);
+  }
+  return Object.fromEntries(unique.values());
+}
 function hasExtension(name, extensions) {
   const ext = import_path.win32.extname(name).toLowerCase();
   return ext.length > 0 && extensions.includes(ext);
 }
 function candidates(base, extensions) {
-  return hasExtension(base, extensions) ? [base] : extensions.map((ext) => `${base}${ext}`);
+  const extension = import_path.win32.extname(base).toLowerCase();
+  return extension === ".exe" || extension === ".com" || hasExtension(base, extensions) ? [base] : extensions.map((ext) => `${base}${ext}`);
 }
 function resolveWindowsCommand(command, env, files) {
-  const extensions = (windowsEnvValue(env, "PATHEXT") ?? DEFAULT_PATHEXT).split(";").map((ext) => ext.trim().toLowerCase()).filter((ext) => ext.startsWith("."));
+  const extensions = (windowsEnvValue(env, "PATHEXT") ?? DEFAULT_PATHEXT).split(";").map((ext) => ext.trim().toLowerCase()).filter((ext) => LAUNCHABLE_EXTENSIONS.has(ext));
   if (/[\\/]/.test(command)) {
     return candidates(command, extensions).find((path) => files.isFile(path));
   }
@@ -22250,6 +22267,18 @@ function resolveWindowsCommand(command, env, files) {
   }
   return void 0;
 }
+function unwrapNativeShim(shim, args, files) {
+  const lines = files.readShim(shim)?.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  if (lines?.length !== NATIVE_SHIM_LINES.length + 1) return void 0;
+  if (!NATIVE_SHIM_LINES.every((pattern, index) => pattern.test(lines[index] ?? ""))) {
+    return void 0;
+  }
+  const target = NATIVE_SHIM_ENTRY.exec(lines.at(-1) ?? "")?.[1];
+  if (target === void 0) return void 0;
+  const directory = import_path.win32.dirname(shim);
+  const file2 = import_path.win32.resolve(directory, target.replace(/^%dp0%\\/i, ""));
+  return files.isFile(file2) ? { kind: "native", file: file2, args } : void 0;
+}
 function isSimpleNodeShim(text2) {
   return text2.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0).every((line) => /^@?echo off$/i.test(line) || NODE_SHIM_ENTRY.test(line));
 }
@@ -22275,7 +22304,7 @@ function planWindowsLaunch(command, args, env, files) {
   const file2 = resolveWindowsCommand(command, env, files);
   if (file2 === void 0) return void 0;
   if (!/\.(cmd|bat)$/i.test(file2)) return { kind: "native", file: file2, args };
-  return unwrapNodeShim(file2, args, env, files) ?? { kind: "batch", file: file2, args };
+  return unwrapNativeShim(file2, args, files) ?? unwrapNodeShim(file2, args, env, files) ?? { kind: "batch", file: file2, args };
 }
 function quoteWindowsArgument(value) {
   if (value.length === 0) return '""';
@@ -22777,11 +22806,12 @@ function onCliSpawned(listener) {
 }
 function spawnCli(options) {
   const platform = options.platform ?? process.platform;
-  const plan2 = planSpawn({ ...options, platform });
-  if (plan2.commandLine !== null) return spawnInWindowsJob(plan2, options);
+  const env = platform === "win32" ? canonicalWindowsEnvironment(options.env) : options.env;
+  const plan2 = planSpawn({ ...options, env, platform });
+  if (plan2.commandLine !== null) return spawnInWindowsJob(plan2, { ...options, env });
   const child = (0, import_child_process5.spawn)(plan2.file, [...plan2.args], {
     cwd: options.cwd,
-    env: { ...options.env },
+    env: { ...env },
     stdio: ["pipe", "pipe", "pipe"],
     shell: false,
     detached: true
@@ -22808,9 +22838,9 @@ function waitForSpawn(child, command) {
     child.once("error", onError);
   });
 }
-var import_child_process, import_fs, import_path, import_child_process2, import_promises5, import_child_process3, import_child_process4, import_child_process5, import_child_process6, import_crypto, import_fs2, import_promises6, import_os, import_path2, SHIM_MAX_BYTES, CMD_MAX_COMMAND_LINE, MAX_COMMAND_LINE, DEFAULT_PATHEXT, nodeWindowsFiles, NODE_SHIM_ENTRY, CMD_META, NEVER_STARTED, HIDDEN_FLAG_PROBE_VALUE, NEWLINE, CARRIAGE_RETURN, EMPTY, MAX_LINE_BYTES, LineSplitter, PS_LINE, POLL_MS, DEFAULT_GRACE_MS, DEFAULT_KILL_WAIT_MS, DEFAULT_TASKKILL_TIMEOUT_MS, statuses, START_TIMEOUT_MS, spawnListeners;
-var init_chunk_J4T6L5LX = __esm({
-  "../agent-core/dist/chunk-J4T6L5LX.js"() {
+var import_child_process, import_fs, import_path, import_child_process2, import_promises5, import_child_process3, import_child_process4, import_child_process5, import_child_process6, import_crypto, import_fs2, import_promises6, import_os, import_path2, SHIM_MAX_BYTES, CMD_MAX_COMMAND_LINE, MAX_COMMAND_LINE, DEFAULT_PATHEXT, LAUNCHABLE_EXTENSIONS, nodeWindowsFiles, NODE_SHIM_ENTRY, NATIVE_SHIM_LINES, NATIVE_SHIM_ENTRY, CMD_META, NEVER_STARTED, HIDDEN_FLAG_PROBE_VALUE, NEWLINE, CARRIAGE_RETURN, EMPTY, MAX_LINE_BYTES, LineSplitter, PS_LINE, POLL_MS, DEFAULT_GRACE_MS, DEFAULT_KILL_WAIT_MS, DEFAULT_TASKKILL_TIMEOUT_MS, statuses, START_TIMEOUT_MS, spawnListeners;
+var init_chunk_M6YHY2EZ = __esm({
+  "../agent-core/dist/chunk-M6YHY2EZ.js"() {
     "use strict";
     init_chunk_YXWJW7I5();
     import_child_process = require("child_process");
@@ -22831,6 +22861,7 @@ var init_chunk_J4T6L5LX = __esm({
     CMD_MAX_COMMAND_LINE = 8191;
     MAX_COMMAND_LINE = 32766;
     DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD";
+    LAUNCHABLE_EXTENSIONS = /* @__PURE__ */ new Set([".com", ".exe", ".bat", ".cmd"]);
     nodeWindowsFiles = {
       isFile: (path) => {
         try {
@@ -22849,6 +22880,17 @@ var init_chunk_J4T6L5LX = __esm({
       }
     };
     NODE_SHIM_ENTRY = /"(%_prog%|[^"\r\n]*node(?:\.exe)?)"\s+"([^"\r\n]+\.(?:c?js|mjs))"\s+%\*/i;
+    NATIVE_SHIM_LINES = [
+      /^@echo off$/i,
+      /^goto start$/i,
+      /^:find_dp0$/i,
+      /^set dp0=%~dp0$/i,
+      /^exit \/b$/i,
+      /^:start$/i,
+      /^setlocal$/i,
+      /^call :find_dp0$/i
+    ];
+    NATIVE_SHIM_ENTRY = /^"(%dp0%\\(?:\.\.\\)?(?:node_modules\\)?[\w@.-]+(?:\\[\w@.-]+)*\.exe)"\s+%\*$/i;
     CMD_META = /([()\][%!^"`<>&|;, *?])/g;
     NEVER_STARTED = { stdout: "", stderr: "", exitCode: void 0 };
     HIDDEN_FLAG_PROBE_VALUE = "__alan_probe__";
@@ -24584,7 +24626,7 @@ var init_chunk_54ZRJOQP = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-YPYC4VBL.js
+// ../agent-core/dist/chunk-KHYYC5IN.js
 function collectStrings(value, out) {
   if (typeof value === "string") out.push(value);
   else if (Array.isArray(value)) for (const item of value) collectStrings(item, out);
@@ -24954,12 +24996,12 @@ function silentStartError(name, timeoutMs) {
   };
 }
 var import_crypto3, import_fs4, import_path3, IMAGE_MIME_BY_EXT, VIDEO_MIME_BY_EXT, IMAGE_EXTENSIONS, VIDEO_EXTENSIONS, MAX_IMAGE_BYTES, MAX_VIDEO_BYTES, AGENT_BROWSER_MENTION, LocalMediaReader, SessionOpenRefusal, JsonRpcError, ACP_PROTOCOL_VERSION, ACP_ERROR, STDERR_TAIL_LINES, RESULT_EXIT_GRACE_MS, PerTurnSession;
-var init_chunk_YPYC4VBL = __esm({
-  "../agent-core/dist/chunk-YPYC4VBL.js"() {
+var init_chunk_KHYYC5IN = __esm({
+  "../agent-core/dist/chunk-KHYYC5IN.js"() {
     "use strict";
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
-    init_chunk_J4T6L5LX();
+    init_chunk_M6YHY2EZ();
     init_chunk_YXWJW7I5();
     import_crypto3 = require("crypto");
     import_fs4 = require("fs");
@@ -25421,7 +25463,7 @@ var init_chunk_J2KTV5FP = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-6WN2R725.js
+// ../agent-core/dist/chunk-ITTV3UIM.js
 function truncate(value, limit) {
   const normalized2 = Array.from(value, (character) => {
     const code = character.charCodeAt(0);
@@ -25674,9 +25716,41 @@ function teamOverlay(spec) {
 function present(values) {
   return values.filter((value) => Boolean(value?.length));
 }
+function cloudExecutionSection(spec) {
+  if (!spec.sandboxId && !spec.cloudEnvironmentId) return void 0;
+  const lines = ["## Cloud execution", "You are executing inside an Alan cloud sandbox."];
+  if (spec.sandboxId) lines.push(`Sandbox ID: ${spec.sandboxId}.`);
+  if (spec.cloudEnvironmentId) lines.push(`Cloud environment ID: ${spec.cloudEnvironmentId}.`);
+  lines.push(
+    "Run setup, development and validation in this sandbox. The execution location is separate from the deployment of the application you are testing; verify that application's origin before acting."
+  );
+  if (!isReadOnlyMode(spec.mode) && !isReadOnlyAgent(spec.agentId)) {
+    lines.push(
+      "Own the authorized work end to end: inspect context, make reasonable assumptions, implement, test, review and create or update the pull request for code changes when the repository workflow calls for one. Do not stop at a plan or ask for routine implementation choices or permission already granted. Ask only for a missing secret, an essential decision you cannot derive, or an action requiring explicit approval. Respect the user's scope, repository rules and tool authorization; report a blocked capability and continue independent work."
+    );
+  }
+  const skills = spec.promptContext?.availableSkills ?? [];
+  lines.push(
+    "## Installed skills",
+    "Use a matching installed skill when it helps the request. Read its SKILL.md before acting; the index is discovery metadata, not instructions. Also follow repository instructions and project skills."
+  );
+  if (skills.length === 0) {
+    lines.push(
+      skills.length === 0 && spec.promptContext?.availableSkills !== void 0 ? "No verified installed packages were found. Do not assume a named skill is available." : "No installed skill inventory was supplied. Inspect the provider's skill index; do not assume a named package is installed."
+    );
+  } else {
+    for (const skill of skills) {
+      lines.push(
+        `- ${JSON.stringify(skill.name)}: ${JSON.stringify(skill.description)} \u2014 ${JSON.stringify(`${skill.packageDirectory}/SKILL.md`)}`
+      );
+    }
+  }
+  return lines.join("\n");
+}
 function promptParts(input2) {
   const { spec } = input2;
   const overlay = teamOverlay(spec);
+  const cloud = cloudExecutionSection(spec);
   const workspace = input2.workspacePath ? `You are working inside: ${input2.workspacePath}
 Prefer relative paths and keep your work scoped to this project.` : void 0;
   return {
@@ -25685,6 +25759,7 @@ Prefer relative paths and keep your work scoped to this project.` : void 0;
       spec.agentPrompt?.trim() || getAlanAgentPrompt(spec.agentId),
       getAlanModePrompt(agentModeOf(spec.mode)),
       workspace,
+      cloud,
       taskLifecycleSection(spec),
       overlay,
       ...contextSections(spec),
@@ -25692,6 +25767,7 @@ Prefer relative paths and keep your work scoped to this project.` : void 0;
     ]),
     append: present([
       ALAN_PLATFORM_TOOL_ROUTING_PROMPT,
+      cloud,
       spec.contextGraphEnabled === true ? ALAN_CONTEXT_SEARCH_PROMPT : void 0,
       overlay
     ])
@@ -25748,8 +25824,8 @@ ${body}` : body;
   return spec.mode === "plan" ? planModePrefix(prefixed) : prefixed;
 }
 var MAX_PARSED_ATTACHMENTS, MAX_PARSED_ATTACHMENT_CHARS, MAX_METADATA_CHARS, UNAVAILABLE, READ_ONLY_MODES, AGENT_MODES;
-var init_chunk_6WN2R725 = __esm({
-  "../agent-core/dist/chunk-6WN2R725.js"() {
+var init_chunk_ITTV3UIM = __esm({
+  "../agent-core/dist/chunk-ITTV3UIM.js"() {
     "use strict";
     init_agent2();
     MAX_PARSED_ATTACHMENTS = 3;
@@ -26822,12 +26898,12 @@ var init_claude = __esm({
   "../agent-core/dist/providers/claude.js"() {
     "use strict";
     init_chunk_DALFHI4B();
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
-    init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_M6YHY2EZ();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     init_effort();
     import_crypto6 = require("crypto");
@@ -28955,12 +29031,12 @@ var init_codex = __esm({
   "../agent-core/dist/providers/codex.js"() {
     "use strict";
     init_chunk_DALFHI4B();
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
-    init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_M6YHY2EZ();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_fs6 = require("fs");
     import_path6 = require("path");
@@ -37724,10 +37800,10 @@ var require_dist = __commonJS({
 var init_dist = __esm({
   "../agent-core/dist/index.js"() {
     "use strict";
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
-    init_chunk_J4T6L5LX();
+    init_chunk_M6YHY2EZ();
     init_chunk_YXWJW7I5();
   }
 });
@@ -38471,12 +38547,12 @@ var import_promises22, import_path9, import_crypto12, import_promises23, CURSOR_
 var init_acp3 = __esm({
   "../agent-core/dist/providers/acp.js"() {
     "use strict";
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
-    init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_M6YHY2EZ();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_promises22 = require("fs/promises");
     import_path9 = require("path");
@@ -40175,12 +40251,12 @@ var import_http4, import_crypto13, import_promises24, import_path10, import_path
 var init_opencode = __esm({
   "../agent-core/dist/providers/opencode.js"() {
     "use strict";
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
-    init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_M6YHY2EZ();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_http4 = require("http");
     init_runtime_v2();
@@ -41983,12 +42059,12 @@ var import_crypto15, import_promises25, FACTORY_API_VERSION, FACTORY_PROTOCOL_VE
 var init_droid = __esm({
   "../agent-core/dist/providers/droid.js"() {
     "use strict";
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
-    init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_M6YHY2EZ();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     init_runtime_v2();
     import_crypto15 = require("crypto");
@@ -43086,11 +43162,11 @@ var init_antigravity = __esm({
   "../agent-core/dist/providers/antigravity.js"() {
     "use strict";
     init_chunk_DALFHI4B();
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
-    init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_M6YHY2EZ();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_promises26 = require("fs/promises");
     import_path12 = require("path");
@@ -43790,12 +43866,12 @@ var import_promises27, import_path15, import_crypto17, COMMAND_CODE_GRAMMAR_NAME
 var init_command_code = __esm({
   "../agent-core/dist/providers/command-code.js"() {
     "use strict";
-    init_chunk_YPYC4VBL();
+    init_chunk_KHYYC5IN();
     init_chunk_UGRKZTAD();
     init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
-    init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_M6YHY2EZ();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_promises27 = require("fs/promises");
     import_path15 = require("path");
@@ -44883,7 +44959,7 @@ var GitFault = class extends Error {
 var import_node_child_process = require("child_process");
 
 // ../agent-core/dist/process.js
-init_chunk_J4T6L5LX();
+init_chunk_M6YHY2EZ();
 init_chunk_YXWJW7I5();
 
 // src/capabilities/git/run-git.ts
@@ -45590,7 +45666,9 @@ function providerCommandFor(backendKind) {
   return BY_BACKEND.get(backendKind)?.command;
 }
 function envValue(env, name) {
-  const key = Object.keys(env).find((candidate) => candidate.toUpperCase() === name);
+  const key = Object.keys(env).findLast(
+    (candidate) => candidate.toUpperCase() === name.toUpperCase()
+  );
   return key === void 0 ? "" : env[key] ?? "";
 }
 function pathDelimiter(platform) {
@@ -45606,12 +45684,18 @@ async function isRunnable(path, platform) {
   }
 }
 function windowsExtensions(command, env) {
-  const extensions = (envValue(env, "PATHEXT") || ".COM;.EXE;.BAT;.CMD").split(";").filter((extension) => extension.startsWith("."));
+  const extensions = (envValue(env, "PATHEXT") || ".COM;.EXE;.BAT;.CMD").split(";").map((extension) => extension.trim()).filter((extension) => [".COM", ".EXE", ".BAT", ".CMD"].includes(extension.toUpperCase()));
   const named = command.toLowerCase();
-  return extensions.some((extension) => named.endsWith(extension.toLowerCase())) ? [""] : extensions;
+  return [".com", ".exe", ...extensions.map((extension) => extension.toLowerCase())].some(
+    (extension) => named.endsWith(extension)
+  ) ? [""] : extensions;
 }
 async function resolveCommandOnPath(command, env, platform) {
-  const directories = envValue(env, "PATH").split(pathDelimiter(platform)).filter((directory) => directory.length > 0);
+  const directories = envValue(env, "PATH").split(pathDelimiter(platform)).map(
+    (directory) => platform === "win32" ? directory.trim().replace(/^"(.*)"$/, "$1") : directory
+  ).filter(
+    (directory) => platform === "win32" ? import_node_path8.win32.isAbsolute(directory) : directory.length > 0
+  );
   const extensions = platform === "win32" ? windowsExtensions(command, env) : [""];
   for (const directory of directories) {
     for (const extension of extensions) {
@@ -45649,7 +45733,6 @@ function resolveProviderExecutable(provider4, env, platform) {
 }
 
 // src/capabilities/providers/managed.ts
-var import_node_child_process6 = require("child_process");
 var import_node_crypto7 = require("crypto");
 var import_promises17 = require("fs/promises");
 var import_node_path9 = require("path");
@@ -46194,6 +46277,38 @@ async function resolveSkillInvocations(layout, invocations) {
   }
   return missing.length === 0 ? { kind: "resolved", skills: resolved } : { kind: "missing", names: missing };
 }
+async function availableSkillIndex(layout) {
+  const found = /* @__PURE__ */ new Map();
+  const candidates2 = [];
+  for (const skill of await readInstalledSkills(layout)) {
+    candidates2.push({
+      directory: packageDirectory(layout, skill.versionId),
+      contentHash: skill.contentHash
+    });
+  }
+  if (layout.nativeDir !== null) {
+    const entries = await (0, import_promises19.readdir)(layout.nativeDir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (entry.isDirectory() || entry.isSymbolicLink())
+        candidates2.push({ directory: (0, import_node_path11.join)(layout.nativeDir, entry.name) });
+    }
+  }
+  for (const candidate of candidates2.slice(0, 2e3)) {
+    const skill = await inspectIndexedSkill(candidate.directory, candidate.contentHash);
+    if (skill !== null && !found.has(skill.name)) found.set(skill.name, skill);
+  }
+  return [...found.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+async function inspectIndexedSkill(directory, contentHash) {
+  try {
+    const inspected = await inspectSkillPackage(directory, { expectedName: null });
+    if (contentHash && inspected.contentHash !== contentHash) return null;
+    const { name, description } = inspected.metadata;
+    return { name, description, packageDirectory: directory };
+  } catch {
+    return null;
+  }
+}
 
 // src/capabilities/workspace/index.ts
 var import_node_path14 = require("path");
@@ -46442,7 +46557,7 @@ function openRepositoryLocks(options) {
 
 // src/cli/config.ts
 var import_node_os7 = require("os");
-var import_node_path27 = require("path");
+var import_node_path28 = require("path");
 init_zod();
 
 // src/client/locate.ts
@@ -46463,9 +46578,9 @@ function defaultInstallDir({ platform, home, env }) {
 
 // src/sessions/index.ts
 var import_node_crypto15 = require("crypto");
-var import_promises35 = require("fs/promises");
+var import_promises37 = require("fs/promises");
 var import_node_os6 = require("os");
-var import_node_path26 = require("path");
+var import_node_path27 = require("path");
 
 // src/holder/control-client.ts
 var import_node_crypto11 = require("crypto");
@@ -46696,8 +46811,33 @@ function createConversationMcpAuthorization(options) {
   };
 }
 
-// src/holder/run-inputs.ts
+// src/holder/mcp-helper-access.ts
 var import_promises28 = require("fs/promises");
+function createHelperMcpAccess(options) {
+  return {
+    [Symbol.asyncDispose]: async () => {
+      await (0, import_promises28.rm)(options.credentialPath, { force: true });
+    },
+    url: options.managedMcp.url,
+    authorization: async (signal) => {
+      const authorization = await options.managedMcp.authorization(signal);
+      if (authorization === void 0 || signal.aborted) {
+        await (0, import_promises28.rm)(options.credentialPath, { force: true });
+        return void 0;
+      }
+      const credential = {
+        url: options.managedMcp.url,
+        authorization,
+        conversationId: options.conversationId
+      };
+      await writeJsonFileAtomic(options.credentialPath, credential);
+      return authorization;
+    }
+  };
+}
+
+// src/holder/run-inputs.ts
+var import_promises29 = require("fs/promises");
 var import_node_path17 = require("path");
 var NO_RUN_INPUTS = {
   attachments: [],
@@ -46713,16 +46853,16 @@ function safeFilename(filename) {
 async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
   const dir = (0, import_node_path17.join)(tmpDir, "runs", spec.runId);
   const cleanup = async () => {
-    await (0, import_promises28.rm)(dir, { recursive: true, force: true });
+    await (0, import_promises29.rm)(dir, { recursive: true, force: true });
   };
   try {
     const credential = await source.fetchProviderCredential(spec.runId, signal);
     const attachments = [];
-    if (spec.attachments?.length) await (0, import_promises28.mkdir)(dir, { recursive: true, mode: 448 });
+    if (spec.attachments?.length) await (0, import_promises29.mkdir)(dir, { recursive: true, mode: 448 });
     for (const [index, attachment] of (spec.attachments ?? []).entries()) {
       const bytes = await source.downloadAttachment(spec.runId, attachment.id, signal);
       const path = (0, import_node_path17.join)(dir, `${index}-${safeFilename(attachment.filename)}`);
-      await (0, import_promises28.writeFile)(path, bytes, { mode: 384 });
+      await (0, import_promises29.writeFile)(path, bytes, { mode: 384 });
       attachments.push({
         id: attachment.id,
         kind: attachment.kind,
@@ -46752,12 +46892,12 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
 var import_node_crypto14 = require("crypto");
 var import_node_fs10 = require("fs");
 var import_node_net2 = require("net");
-var import_node_path25 = require("path");
+var import_node_path26 = require("path");
 init_runtime_v2();
 
 // src/holder/admission.ts
 var import_node_fs8 = require("fs");
-var import_promises32 = require("fs/promises");
+var import_promises33 = require("fs/promises");
 var import_node_os5 = require("os");
 var import_node_path22 = require("path");
 init_constants();
@@ -46771,7 +46911,7 @@ function resolveAlanDefaultWorkspacePath(homeDirectory = (0, import_node_os4.hom
 }
 
 // src/holder/admission-relocation.ts
-var import_promises29 = require("fs/promises");
+var import_promises30 = require("fs/promises");
 var import_node_path19 = require("path");
 var MAX_RELOCATION_CANDIDATES = 200;
 var RELOCATION_BUDGET_MS = 2e4;
@@ -46807,7 +46947,7 @@ async function originIdentity(git, path, signal) {
 }
 async function childDirectories(parent, limit) {
   try {
-    const entries = await (0, import_promises29.readdir)(parent, { withFileTypes: true });
+    const entries = await (0, import_promises30.readdir)(parent, { withFileTypes: true });
     return entries.filter((entry) => entry.isDirectory()).slice(0, limit).map((entry) => (0, import_node_path19.join)(parent, entry.name));
   } catch {
     return [];
@@ -46844,7 +46984,7 @@ async function discoverRelocatedWorkspace(search) {
 
 // src/holder/checkout-refresh.ts
 var import_node_crypto13 = require("crypto");
-var import_promises30 = require("fs/promises");
+var import_promises31 = require("fs/promises");
 var import_node_path20 = require("path");
 function short(sha) {
   return sha.slice(0, 12);
@@ -46857,8 +46997,8 @@ function staleLine(path, snapshot2, tip) {
 }
 async function claimOnce(dir, name) {
   try {
-    await (0, import_promises30.mkdir)(dir, { recursive: true, mode: 448 });
-    await (await (0, import_promises30.open)((0, import_node_path20.join)(dir, name), "wx")).close();
+    await (0, import_promises31.mkdir)(dir, { recursive: true, mode: 448 });
+    await (await (0, import_promises31.open)((0, import_node_path20.join)(dir, name), "wx")).close();
     return true;
   } catch {
     return false;
@@ -46941,7 +47081,7 @@ function createCheckoutRefresh(deps) {
 }
 
 // src/holder/lease.ts
-var import_promises31 = require("fs/promises");
+var import_promises32 = require("fs/promises");
 var import_node_path21 = require("path");
 var LEASE_CHECK_EVERY_MS = 5e3;
 var MAX_TRANSIENT_FAILURES = 3;
@@ -46956,8 +47096,8 @@ function identityFailure(code, workspacePath) {
   return { code, problemCode: "app.workspace.missing", message: MESSAGES[code], workspacePath };
 }
 async function fileIdentity(path) {
-  const canonical = await (0, import_promises31.realpath)(path);
-  const info = await (0, import_promises31.stat)(canonical, { bigint: true });
+  const canonical = await (0, import_promises32.realpath)(path);
+  const info = await (0, import_promises32.stat)(canonical, { bigint: true });
   return `${canonical}:${info.dev}:${info.ino}`;
 }
 async function snapshot(git, path, signal) {
@@ -46976,7 +47116,7 @@ async function snapshot(git, path, signal) {
       workspace: await fileIdentity(path),
       repository: await fileIdentity(commonDir),
       worktree: await fileIdentity(gitDir),
-      commonDir: await (0, import_promises31.realpath)(commonDir)
+      commonDir: await (0, import_promises32.realpath)(commonDir)
     };
   } catch {
     return null;
@@ -46989,7 +47129,7 @@ async function gitValue(git, path, args, signal) {
 }
 async function pathExists(path) {
   try {
-    await (0, import_promises31.stat)(path);
+    await (0, import_promises32.stat)(path);
     return true;
   } catch (error61) {
     return errnoCode(error61) !== "ENOENT" && errnoCode(error61) !== "ENOTDIR";
@@ -46998,13 +47138,13 @@ async function pathExists(path) {
 async function hasGitMarker(path) {
   let directory;
   try {
-    directory = await (0, import_promises31.realpath)(path);
+    directory = await (0, import_promises32.realpath)(path);
   } catch {
     return true;
   }
   for (; ; ) {
     try {
-      await (0, import_promises31.stat)((0, import_node_path21.join)(directory, ".git"));
+      await (0, import_promises32.stat)((0, import_node_path21.join)(directory, ".git"));
       return true;
     } catch (error61) {
       const code = errnoCode(error61);
@@ -47174,7 +47314,7 @@ function volumeRoot(path) {
 }
 async function exists(path) {
   try {
-    await (0, import_promises32.stat)(path);
+    await (0, import_promises33.stat)(path);
     return true;
   } catch {
     return false;
@@ -47182,10 +47322,10 @@ async function exists(path) {
 }
 async function inspectReadiness(path) {
   try {
-    if (!(await (0, import_promises32.stat)(path)).isDirectory()) {
+    if (!(await (0, import_promises33.stat)(path)).isDirectory()) {
       return { ready: false, missing: true, message: MESSAGES2.missing };
     }
-    await (0, import_promises32.access)(path, import_node_fs8.constants.R_OK | import_node_fs8.constants.W_OK | import_node_fs8.constants.X_OK);
+    await (0, import_promises33.access)(path, import_node_fs8.constants.R_OK | import_node_fs8.constants.W_OK | import_node_fs8.constants.X_OK);
     return { ready: true };
   } catch (error61) {
     const code = errnoCode(error61) ?? "";
@@ -47263,8 +47403,8 @@ async function admitDefaultWorkspace(spec, context, skills) {
   const { env } = context;
   const path = resolveAlanDefaultWorkspacePath(env.HOME || env.USERPROFILE || (0, import_node_os5.homedir)());
   try {
-    await (0, import_promises32.mkdir)(path, { recursive: true, mode: 448 });
-    await (0, import_promises32.access)(path, import_node_fs8.constants.R_OK | import_node_fs8.constants.W_OK | import_node_fs8.constants.X_OK);
+    await (0, import_promises33.mkdir)(path, { recursive: true, mode: 448 });
+    await (0, import_promises33.access)(path, import_node_fs8.constants.R_OK | import_node_fs8.constants.W_OK | import_node_fs8.constants.X_OK);
     return {
       kind: "admitted",
       spec: { ...spec, projectPath: path },
@@ -47280,6 +47420,16 @@ async function admitDefaultWorkspace(spec, context, skills) {
     );
   }
 }
+async function withInstalledCloudSkills(spec, context) {
+  if (!spec.sandboxId && !spec.cloudEnvironmentId || context.skills === void 0) return spec;
+  return {
+    ...spec,
+    promptContext: {
+      ...spec.promptContext,
+      availableSkills: await availableSkillIndex(context.skills)
+    }
+  };
+}
 async function admitRun(spec, context, signal) {
   const provider4 = await checkProvider(spec, context);
   if (provider4 !== null) return provider4;
@@ -47291,6 +47441,7 @@ async function admitRun(spec, context, signal) {
     );
   }
   const skills = selected.skills;
+  spec = await withInstalledCloudSkills(spec, context);
   const projectPath = spec.projectPath;
   if (projectPath === void 0) {
     return { kind: "admitted", spec, relocated: null, leaseTargets: [], skills };
@@ -47382,7 +47533,7 @@ async function respondToTurn(runningRunId, gate, driver, request2) {
 }
 
 // src/holder/session-facts.ts
-var import_promises33 = require("fs/promises");
+var import_promises34 = require("fs/promises");
 var CLI_RSS_CACHE_MS = 1e4;
 var LOGIN_PROBLEM_PREFIX = "cli.auth.";
 function isLoginFailure(result) {
@@ -47408,8 +47559,8 @@ function createSessionFacts(options) {
     const path = await resolveCommandOnPath(command, env, platform);
     if (path === null) return null;
     try {
-      const real = await (0, import_promises33.realpath)(path);
-      const info = await (0, import_promises33.stat)(real);
+      const real = await (0, import_promises34.realpath)(path);
+      const info = await (0, import_promises34.stat)(real);
       return { command, key: `${real}:${info.ino}:${info.size}:${info.mtimeMs}` };
     } catch {
       return null;
@@ -47496,11 +47647,28 @@ function createSessionFacts(options) {
 init_acp2();
 
 // src/run-log/directory.ts
-var import_promises34 = require("fs/promises");
+var import_promises35 = require("fs/promises");
 var import_node_path23 = require("path");
 init_runtime_v2();
 init_zod();
-var runMetaSchema = external_exports.object({ runId: runIdSchema, conversationId: conversationIdSchema });
+var runMetaSchema = external_exports.object({
+  runId: runIdSchema,
+  conversationId: conversationIdSchema,
+  agentMode: external_exports.string().optional(),
+  userMessage: external_exports.object({
+    id: external_exports.string(),
+    content: external_exports.string(),
+    turnOrdinal: external_exports.number().int().nullable(),
+    createdAt: external_exports.string(),
+    clientMessageId: external_exports.string().optional(),
+    attachmentIds: external_exports.array(external_exports.string()).optional()
+  }).optional(),
+  assistantMessage: external_exports.object({
+    id: external_exports.string(),
+    turnOrdinal: external_exports.number().int().nullable(),
+    createdAt: external_exports.string()
+  }).optional()
+});
 function runDirectory(runsDir, runId) {
   const dir = (0, import_node_path23.join)(runsDir, runId);
   return {
@@ -47512,13 +47680,54 @@ function runDirectory(runsDir, runId) {
 }
 async function isRunClaimed(runsDir, runId) {
   try {
-    return (await (0, import_promises34.stat)(runDirectory(runsDir, runId).log)).size > 0;
+    return (await (0, import_promises35.stat)(runDirectory(runsDir, runId).log)).size > 0;
   } catch (error61) {
     if (errnoCode(error61) === "ENOENT") return false;
     throw error61;
   }
 }
 
+// src/run-log/conversation-index.ts
+var import_promises36 = require("fs/promises");
+var import_node_path24 = require("path");
+init_runtime_v2();
+init_zod();
+var ORDINALS_PER_SHARD = 1e3;
+var indexRecordSchema = external_exports.object({
+  ordinal: external_exports.number().int().nonnegative(),
+  nextOrdinal: external_exports.number().int().positive(),
+  runId: runIdSchema
+});
+var coverageSchema = external_exports.object({
+  highestOrdinal: external_exports.number().int().nonnegative(),
+  nextExpectedOrdinal: external_exports.number().int().positive()
+});
+function indexDirectory(runsDir, conversationId) {
+  return (0, import_node_path24.join)((0, import_node_path24.dirname)(runsDir), "sessions", conversationId, "turn-index");
+}
+function shardPath(runsDir, conversationId, ordinal) {
+  return (0, import_node_path24.join)(
+    indexDirectory(runsDir, conversationId),
+    `${Math.floor(ordinal / ORDINALS_PER_SHARD)}.jsonl`
+  );
+}
+async function indexConversationRun(runsDir, conversationId, ordinal, assistantOrdinal, runId) {
+  const nextOrdinal = assistantOrdinal + 1;
+  if (nextOrdinal <= ordinal) throw new Error("Assistant order must follow the prompt");
+  const path = shardPath(runsDir, conversationId, ordinal);
+  await (0, import_promises36.mkdir)((0, import_node_path24.dirname)(path), { recursive: true, mode: 448 });
+  await (0, import_promises36.appendFile)(path, `${JSON.stringify({ ordinal, nextOrdinal, runId })}
+`, { mode: 384 });
+  const coveragePath = (0, import_node_path24.join)((0, import_node_path24.dirname)((0, import_node_path24.dirname)(path)), "coverage.json");
+  const coverage = await readJsonFile(coveragePath, coverageSchema);
+  const current = coverage.kind === "ok" ? coverage.value : null;
+  if (ordinal === 0 && current === null || current?.nextExpectedOrdinal === ordinal)
+    await writeJsonFileAtomic(coveragePath, {
+      highestOrdinal: ordinal,
+      nextExpectedOrdinal: nextOrdinal
+    });
+}
+
 // src/run-log/tail.ts
 init_runtime_v2();
 var TAIL_BYTES = 64 * 1024;
@@ -47548,7 +47757,7 @@ var decoder = new TextDecoder();
 
 // src/run-log/writer.ts
 var import_node_fs9 = require("fs");
-var import_node_path24 = require("path");
+var import_node_path25 = require("path");
 init_runtime_v2();
 function lastSeq(fd, size) {
   for (const length of tailWindows(size)) {
@@ -47564,7 +47773,7 @@ function lastSeq(fd, size) {
   throw new RuntimeFault("record_too_large", "Run log tail record is larger than any record");
 }
 function openRunLog(path, clock) {
-  (0, import_node_fs9.mkdirSync)((0, import_node_path24.dirname)(path), { recursive: true, mode: 448 });
+  (0, import_node_fs9.mkdirSync)((0, import_node_path25.dirname)(path), { recursive: true, mode: 448 });
   const fd = (0, import_node_fs9.openSync)(path, "a+", 384);
   let size = (0, import_node_fs9.fstatSync)(fd).size;
   let seq = lastSeq(fd, size);
@@ -47796,10 +48005,30 @@ async function admitAndRun(spec, context, append, sink, signal) {
 async function claimRun(spec, context) {
   if (await isRunClaimed(context.runsDir, spec.runId)) return null;
   const paths = runDirectory(context.runsDir, spec.runId);
-  await writeJsonFileAtomic(paths.meta, { runId: spec.runId, conversationId: spec.conversationId });
+  await writeJsonFileAtomic(paths.meta, {
+    runId: spec.runId,
+    conversationId: spec.conversationId,
+    ...spec.mode ? { agentMode: spec.mode } : {},
+    ...spec.userMessage ? { userMessage: spec.userMessage } : {},
+    ...spec.assistantMessage ? { assistantMessage: spec.assistantMessage } : {}
+  });
   const log = openRunLog(paths.log, context.clock);
   const offset = log.append(runAccepted(context.machineId, context.clock.now()));
   context.onAppended(spec.runId, offset);
+  if (spec.userMessage?.turnOrdinal !== null && spec.userMessage?.turnOrdinal !== void 0 && spec.assistantMessage?.turnOrdinal !== null && spec.assistantMessage?.turnOrdinal !== void 0) {
+    try {
+      await indexConversationRun(
+        context.runsDir,
+        spec.conversationId,
+        spec.userMessage.turnOrdinal,
+        spec.assistantMessage.turnOrdinal,
+        spec.runId
+      );
+      context.onAppended(spec.runId, offset);
+    } catch (error61) {
+      context.log.warn("holder.conversation_index_failed", { runId: spec.runId, error: error61 });
+    }
+  }
   return log;
 }
 async function runClaimedTurn(spec, claimed, context, signal) {
@@ -47880,7 +48109,7 @@ async function runHolder({
   try {
     const identity = await readProcessIdentity(process.pid);
     if (identity === null) throw new RuntimeFault("internal", "Cannot read own process identity");
-    const _engines = __using(_stack, recordSpawnedEngines(engineRecordsPath((0, import_node_path25.dirname)(launch.statusPath)), clock, log));
+    const _engines = __using(_stack, recordSpawnedEngines(engineRecordsPath((0, import_node_path26.dirname)(launch.statusPath)), clock, log));
     const holder = {
       state: "idle",
       runId: null,
@@ -48223,7 +48452,7 @@ function loadRuntimeConfig(env = process.env, totalMemoryBytes = (0, import_node
     providerProbes: ALAN_RUNTIME_PROVIDER_PROBES === "on",
     providerToolchain: ALAN_RUNTIME_PROVIDER_NODE !== void 0 && ALAN_RUNTIME_PROVIDER_NPM_CLI !== void 0 ? { node: ALAN_RUNTIME_PROVIDER_NODE, npmCli: ALAN_RUNTIME_PROVIDER_NPM_CLI } : null,
     home,
-    configHome: XDG_CONFIG_HOME ?? (0, import_node_path27.join)(home, ".config"),
+    configHome: XDG_CONFIG_HOME ?? (0, import_node_path28.join)(home, ".config"),
     ...githubProxyConfig({ ALAN_RUNTIME_GITHUB_PROXY, XDG_CONFIG_HOME, GH_CONFIG_DIR }, home),
     gitGatewayUrl: ALAN_RUNTIME_GIT_GATEWAY_URL ?? null,
     workspaceRoot: ALAN_RUNTIME_WORKSPACE_ROOT ?? null,
@@ -48232,10 +48461,10 @@ function loadRuntimeConfig(env = process.env, totalMemoryBytes = (0, import_node
   };
 }
 function githubProxyConfig(env, home) {
-  const configHome = env.XDG_CONFIG_HOME ?? (0, import_node_path27.join)(home, ".config");
+  const configHome = env.XDG_CONFIG_HOME ?? (0, import_node_path28.join)(home, ".config");
   return {
     githubProxy: env.ALAN_RUNTIME_GITHUB_PROXY === "on",
-    ghConfigDir: env.GH_CONFIG_DIR ?? (0, import_node_path27.join)(configHome, "gh")
+    ghConfigDir: env.GH_CONFIG_DIR ?? (0, import_node_path28.join)(configHome, "gh")
   };
 }
 function serviceEnvironment(env, profile) {
@@ -48334,7 +48563,8 @@ async function loadStoredAccess(paths, access3 = { exec: systemExec }) {
 }
 
 // src/cli/commands/hold.ts
-var import_node_path28 = require("path");
+var import_node_path29 = require("path");
+init_agent2();
 init_runtime_v2();
 async function machineAccess(paths, log, conversationId, transport) {
   const initial = await loadStoredAccess(paths).catch(
@@ -48391,7 +48621,7 @@ async function runHold(argv) {
     const config2 = loadRuntimeConfig();
     const paths = runtimePaths(config2.stateDir);
     const log = __using(_stack, openFileLog(
-      (0, import_node_path28.join)(paths.logs, `holder-${launch.value.conversationId}.jsonl`),
+      (0, import_node_path29.join)(paths.logs, `holder-${launch.value.conversationId}.jsonl`),
       config2.logLevel,
       systemClock
     ));
@@ -48402,15 +48632,26 @@ async function runHold(argv) {
     );
     const transport = __using(_stack, createHttpTransport());
     const access3 = await machineAccess(paths, log, launch.value.conversationId, transport);
+    const credentialPath = (0, import_node_path29.join)(paths.tmp, "mcp", `${launch.value.conversationId}.json`);
+    const managedMcp = __using(_stack, access3.managedMcp === void 0 ? void 0 : createHelperMcpAccess({
+      managedMcp: access3.managedMcp,
+      conversationId: launch.value.conversationId,
+      credentialPath
+    }), true);
+    const providerEnvironment2 = access3.managedMcp === void 0 ? cliEnvironment : {
+      ...cliEnvironment,
+      [ALAN_MCP_URL_ENV]: access3.managedMcp.url,
+      [ALAN_MCP_CREDENTIAL_FILE_ENV]: credentialPath
+    };
     await runHolder({
       launch: launch.value,
       driver: createProviderDrivers({
-        cliEnvironment,
+        cliEnvironment: providerEnvironment2,
         defaultCwd: process.cwd(),
         timings: config2.sessionTimings,
         log,
-        codexCredentials: access3.codexCredentials,
-        ...access3.managedMcp === void 0 ? {} : { managedMcp: access3.managedMcp }
+        ...managedMcp === void 0 ? {} : { managedMcp },
+        codexCredentials: access3.codexCredentials
       }),
       clock: systemClock,
       log,
@@ -48425,7 +48666,8 @@ async function runHold(argv) {
   } catch (_) {
     var _error = _, _hasError = true;
   } finally {
-    __callDispose(_stack, _error, _hasError);
+    var _promise2 = __callDispose(_stack, _error, _hasError);
+    _promise2 && await _promise2;
   }
 }