@alan-ai-hq/agent-manager-linux-arm64 0.1.135 → 0.1.137

package/alan-agent.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()
     });
   }
 });
@@ -20358,6 +20363,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).
     });
@@ -20379,10 +20385,13 @@ var init_desired_state = __esm({
 function runProviderCredentialPath(runId) {
   return `/public/machines/me/runs/${encodeURIComponent(runId)}/provider-credential`;
 }
+function runCodexCredentialRefreshPath(runId) {
+  return `${runProviderCredentialPath(runId)}/refresh`;
+}
 function runAttachmentPath(runId, attachmentId) {
   return `/public/machines/me/runs/${encodeURIComponent(runId)}/attachments/${encodeURIComponent(attachmentId)}`;
 }
-var machineEndpointsSchema, machineCredentialGrantSchema, MACHINE_PATHS, machinePlatformSchema, machineRegisterRequestSchema, machineEnrollRequestSchema, machineRenewRequestSchema, machineRenewReusedSchema, deviceAuthorizationSchema, machineDeviceAuthorizationRequestSchema, machineDeviceTokenRequestSchema, machineDeviceTokenSchema, DEVICE_TOKEN_ERRORS, machineDeviceTokenErrorSchema, DEVICE_SLOW_DOWN_INCREMENT_SECONDS, machineMcpCredentialRequestSchema, machineMcpCredentialSchema, runtimeReleaseSchema, machineSiblingSchema, MACHINE_SIBLINGS_LIMIT, machineSiblingsResponseSchema, runProviderCredentialSchema;
+var machineEndpointsSchema, machineCredentialGrantSchema, MACHINE_PATHS, machinePlatformSchema, machineRegisterRequestSchema, machineEnrollRequestSchema, machineRenewRequestSchema, machineRenewReusedSchema, deviceAuthorizationSchema, machineDeviceAuthorizationRequestSchema, machineDeviceTokenRequestSchema, machineDeviceTokenSchema, DEVICE_TOKEN_ERRORS, machineDeviceTokenErrorSchema, DEVICE_SLOW_DOWN_INCREMENT_SECONDS, machineMcpCredentialRequestSchema, machineMcpCredentialSchema, runtimeReleaseSchema, machineSiblingSchema, MACHINE_SIBLINGS_LIMIT, machineSiblingsResponseSchema, runCodexCredentialSchema, runCodexCredentialRefreshRequestSchema, runProviderCredentialSchema;
 var init_machine_identity = __esm({
   "../shared/dist/runtime-v2/machine-identity.js"() {
     "use strict";
@@ -20498,9 +20507,20 @@ var init_machine_identity = __esm({
     machineSiblingsResponseSchema = external_exports.object({
       machines: external_exports.array(machineSiblingSchema).max(MACHINE_SIBLINGS_LIMIT)
     });
+    runCodexCredentialSchema = external_exports.object({
+      accessToken: external_exports.string().min(1),
+      chatgptAccountId: external_exports.string().min(1),
+      chatgptPlanType: external_exports.string().nullable()
+    });
+    runCodexCredentialRefreshRequestSchema = external_exports.object({
+      /** sha256 hex of the access token Codex was refused with; a newer stored token is returned instead of rotating. */
+      rejectedAccessTokenSha256: external_exports.string().regex(/^[0-9a-f]{64}$/).optional()
+    });
     runProviderCredentialSchema = external_exports.object({
       /** Environment variables for the agent CLI, e.g. ANTHROPIC_API_KEY; empty when the CLI's own login is used. */
-      env: external_exports.record(external_exports.string(), external_exports.string())
+      env: external_exports.record(external_exports.string(), external_exports.string()),
+      /** The team's Codex login for a cloud sandbox; absent where the CLI's own login is used. */
+      codex: runCodexCredentialSchema.optional()
     });
   }
 });
@@ -21358,6 +21378,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",
@@ -21839,12 +21860,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_-]+$/;
   }
 });
@@ -24402,11 +24425,20 @@ var init_chunk_DALFHI4B = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-R6R6ORR2.js
+// ../agent-core/dist/chunk-54ZRJOQP.js
 function specForErrorKind(errorKind) {
   const spec = ERROR_SPECS[errorKind];
   return { message: spec.message, errorKind, recoveryClass: spec.recoveryClass };
 }
+function withAgentSignIn(classified, harness) {
+  const agent = AGENT_SIGN_IN_BY_HARNESS.get(harness);
+  if (!agent || classified.message !== ERROR_SPECS.not_logged_in.message) return classified;
+  const local = agent.localSignIn ?? "sign in to it";
+  return {
+    ...classified,
+    message: `${agent.name} isn't signed in: for cloud runs connect it in Team settings \u2192 Integrations \u2192 Coding agents; on your computer ${local}; then retry.`
+  };
+}
 function embeddedJson(text2) {
   const start = text2.indexOf("{");
   if (start === -1) return void 0;
@@ -24565,7 +24597,8 @@ function retryOwnerFor(classified, harnessOwnsRetry, safe) {
   if (!safe) return "none";
   return classified.errorKind === "resume_failed" || classified.errorKind === "history_rejected" ? "alan_resume" : "user_confirmed_fresh_run";
 }
-function createCliProblem(classified, options) {
+function createCliProblem(observed, options) {
+  const classified = withAgentSignIn(observed, options.harness);
   const automatic = classified.recoveryClass === "auto_recovering";
   const harnessOwnsRetry = options.finality === "observation" && automatic;
   const safe = options.outcomeCertainty === "no_effect" || harnessOwnsRetry;
@@ -24595,9 +24628,9 @@ function createCliProblem(classified, options) {
     ...classified.resetsAt ? { resetsAt: classified.resetsAt } : {}
   });
 }
-var import_crypto2, ERROR_SPECS, AGENT_ERROR_KINDS, STATUS_PREFIX, TEXT_RULES, CODEX_TIMEOUT_MESSAGE, CODEX_EXPIRED_MESSAGE, EPOCH_RESET, WORDED_RESET, COMMAND_NOT_FOUND, CODE_RULES, TEXT_REFINES, STATUS_LEAD, CLI_PROBLEM_CODE_BY_ERROR_KIND, KEY_REJECTION_KINDS;
-var init_chunk_R6R6ORR2 = __esm({
-  "../agent-core/dist/chunk-R6R6ORR2.js"() {
+var import_crypto2, ERROR_SPECS, AGENT_ERROR_KINDS, AGENT_SIGN_IN_BY_HARNESS, STATUS_PREFIX, TEXT_RULES, CODEX_TIMEOUT_MESSAGE, CODEX_EXPIRED_MESSAGE, EPOCH_RESET, WORDED_RESET, COMMAND_NOT_FOUND, CODE_RULES, TEXT_REFINES, STATUS_LEAD, CLI_PROBLEM_CODE_BY_ERROR_KIND, KEY_REJECTION_KINDS;
+var init_chunk_54ZRJOQP = __esm({
+  "../agent-core/dist/chunk-54ZRJOQP.js"() {
     "use strict";
     init_chunk_YXWJW7I5();
     import_crypto2 = require("crypto");
@@ -24616,7 +24649,7 @@ var init_chunk_R6R6ORR2 = __esm({
         recoveryClass: "user_fixable"
       },
       not_logged_in: {
-        message: "Not logged in to the agent CLI on this computer. Sign in to it there (for Claude Code, run `claude` then `/login`), then retry.",
+        message: "The agent CLI isn't signed in: for cloud runs connect it in Team settings \u2192 Integrations \u2192 Coding agents; on your computer sign in to the CLI; then retry.",
         recoveryClass: "user_fixable"
       },
       not_authenticated: {
@@ -24707,6 +24740,19 @@ var init_chunk_R6R6ORR2 = __esm({
     AGENT_ERROR_KINDS = Object.keys(ERROR_SPECS).filter(
       (key) => key in ERROR_SPECS
     );
+    AGENT_SIGN_IN_BY_HARNESS = /* @__PURE__ */ new Map([
+      ["claude_cli", { name: "Claude Code", localSignIn: "run `claude` then `/login`" }],
+      ["codex_app_server", { name: "Codex", localSignIn: "run `codex login`" }],
+      ["codex_exec", { name: "Codex", localSignIn: "run `codex login`" }],
+      ["cursor_agent_cli", { name: "Cursor Agent", localSignIn: "run `cursor-agent login`" }],
+      ["copilot_cli", { name: "GitHub Copilot CLI", localSignIn: "run `copilot` then `/login`" }],
+      ["opencode_serve", { name: "OpenCode", localSignIn: "run `opencode auth login`" }],
+      ["droid_cli", { name: "Droid" }],
+      ["antigravity_cli", { name: "Antigravity" }],
+      ["grok_cli", { name: "Grok CLI" }],
+      ["kimi_cli", { name: "Kimi CLI" }],
+      ["command_code_cli", { name: "Command Code" }]
+    ]);
     STATUS_PREFIX = /\b(?:api error|status|http)[:\s]+(\d{3})\b/i;
     TEXT_RULES = [
       { kind: "auth_expired", pattern: /\bcodex cli connection expired\b|\breconnect openai codex\b/ },
@@ -24847,7 +24893,7 @@ var init_chunk_R6R6ORR2 = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-W3QH4J4A.js
+// ../agent-core/dist/chunk-YPYC4VBL.js
 function collectStrings(value2, out) {
   if (typeof value2 === "string") out.push(value2);
   else if (Array.isArray(value2)) for (const item of value2) collectStrings(item, out);
@@ -25217,11 +25263,11 @@ 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_W3QH4J4A = __esm({
-  "../agent-core/dist/chunk-W3QH4J4A.js"() {
+var init_chunk_YPYC4VBL = __esm({
+  "../agent-core/dist/chunk-YPYC4VBL.js"() {
     "use strict";
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J4T6L5LX();
     init_chunk_YXWJW7I5();
     import_crypto3 = require("crypto");
@@ -25684,7 +25730,7 @@ var init_chunk_J2KTV5FP = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-6WN2R725.js
+// ../agent-core/dist/chunk-ITTV3UIM.js
 function truncate(value2, limit) {
   const normalized2 = Array.from(value2, (character) => {
     const code = character.charCodeAt(0);
@@ -25937,9 +25983,41 @@ function teamOverlay(spec) {
 function present(values) {
   return values.filter((value2) => Boolean(value2?.length));
 }
+function cloudExecutionSection(spec) {
+  if (!spec.sandboxId && !spec.cloudEnvironmentId) return void 0;
+  const lines2 = ["## Cloud execution", "You are executing inside an Alan cloud sandbox."];
+  if (spec.sandboxId) lines2.push(`Sandbox ID: ${spec.sandboxId}.`);
+  if (spec.cloudEnvironmentId) lines2.push(`Cloud environment ID: ${spec.cloudEnvironmentId}.`);
+  lines2.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)) {
+    lines2.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 ?? [];
+  lines2.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) {
+    lines2.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) {
+      lines2.push(
+        `- ${JSON.stringify(skill.name)}: ${JSON.stringify(skill.description)} \u2014 ${JSON.stringify(`${skill.packageDirectory}/SKILL.md`)}`
+      );
+    }
+  }
+  return lines2.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 {
@@ -25948,6 +26026,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),
@@ -25955,6 +26034,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
     ])
@@ -26011,8 +26091,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;
@@ -27279,12 +27359,12 @@ var init_claude = __esm({
   "../agent-core/dist/providers/claude.js"() {
     "use strict";
     init_chunk_DALFHI4B();
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
     init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     init_effort();
     import_crypto6 = require("crypto");
@@ -29070,11 +29150,12 @@ async function withDeadline(work, clock, ms, what) {
     `codex app-server did not answer ${what} within ${ms} ms`
   );
 }
-async function handshake(session, log) {
+async function handshake(session, spec, log) {
+  const experimentalApi = spec.externalAuth !== void 0;
   const init = asRecord(
     await session.rpc.request("initialize", {
       clientInfo: CLIENT_INFO,
-      capabilities: { experimentalApi: false, requestAttestation: false }
+      capabilities: { experimentalApi, requestAttestation: false }
     })
   );
   const userAgent = asString(init?.userAgent);
@@ -29167,7 +29248,7 @@ function createCodexDriver(options = {}) {
       await started;
       try {
         const opening = (async () => {
-          await handshake(session, resolved.log);
+          await handshake(session, spec, resolved.log);
           await preflight(session, spec);
           return openThread(session, spec, resolved.log);
         })();
@@ -30055,12 +30136,12 @@ var init_codex = __esm({
   "../agent-core/dist/providers/codex.js"() {
     "use strict";
     init_chunk_DALFHI4B();
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
     init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_fs6 = require("fs");
     import_path6 = require("path");
@@ -41325,9 +41406,9 @@ var require_tar_stream = __commonJS({
 var init_dist = __esm({
   "../agent-core/dist/index.js"() {
     "use strict";
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J4T6L5LX();
     init_chunk_YXWJW7I5();
   }
@@ -42072,12 +42153,12 @@ var import_promises48, import_path9, import_crypto12, import_promises49, CURSOR_
 var init_acp3 = __esm({
   "../agent-core/dist/providers/acp.js"() {
     "use strict";
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
     init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_promises48 = require("fs/promises");
     import_path9 = require("path");
@@ -42889,7 +42970,7 @@ var init_acp3 = __esm({
 var init_classify = __esm({
   "../agent-core/dist/classify.js"() {
     "use strict";
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_YXWJW7I5();
   }
 });
@@ -42919,38 +43000,31 @@ function toTurnResult(harness, outcome2, spec, providerSessionId, clock, apiKeyS
       return { outcome: "aborted", ...session };
     case "interrupted":
       return { outcome: "interrupted", message: outcome2.reason, ...session };
-    case "failed":
-      return {
-        outcome: "failed",
-        message: outcome2.error.message,
-        problem: createCliProblem(outcome2.error, {
-          harness,
-          phase: "stream",
-          finality: "terminal",
-          outcomeCertainty: "effect_unknown",
-          occurredAt: new Date(clock.now()).toISOString(),
-          scope: { runId: spec.runId, conversationId: spec.conversationId },
-          apiKeySupplied
-        }),
-        ...session
-      };
+    case "failed": {
+      const problem = createCliProblem(outcome2.error, {
+        harness,
+        phase: "stream",
+        finality: "terminal",
+        outcomeCertainty: "effect_unknown",
+        occurredAt: new Date(clock.now()).toISOString(),
+        scope: { runId: spec.runId, conversationId: spec.conversationId },
+        apiKeySupplied
+      });
+      return { outcome: "failed", message: problem.detail, problem, ...session };
+    }
   }
 }
 function refusalResult(harness, refusal2, spec, clock, apiKeySupplied) {
-  const error61 = refusal2.classified ?? specForErrorKind("not_authenticated");
-  return {
-    outcome: "failed",
-    message: error61.message,
-    problem: createCliProblem(error61, {
-      harness,
-      phase: "preflight",
-      finality: "terminal",
-      outcomeCertainty: "no_effect",
-      occurredAt: new Date(clock.now()).toISOString(),
-      scope: { runId: spec.runId, conversationId: spec.conversationId },
-      apiKeySupplied
-    })
-  };
+  const problem = createCliProblem(refusal2.classified ?? specForErrorKind("not_authenticated"), {
+    harness,
+    phase: "preflight",
+    finality: "terminal",
+    outcomeCertainty: "no_effect",
+    occurredAt: new Date(clock.now()).toISOString(),
+    scope: { runId: spec.runId, conversationId: spec.conversationId },
+    apiKeySupplied
+  });
+  return { outcome: "failed", message: problem.detail, problem };
 }
 function createPersistentDriver(provider4, options) {
   const { log, clock } = options;
@@ -43783,12 +43857,12 @@ var import_http10, import_crypto13, import_promises50, import_path10, import_pat
 var init_opencode = __esm({
   "../agent-core/dist/providers/opencode.js"() {
     "use strict";
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
     init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     import_http10 = require("http");
     init_runtime_v2();
@@ -45059,21 +45133,63 @@ var codex_exports = {};
 __export(codex_exports, {
   createCodexHolderDriver: () => createCodexHolderDriver
 });
+function sha2563(value2) {
+  return (0, import_node_crypto25.createHash)("sha256").update(value2).digest("hex");
+}
+function createCodexLogin(broker) {
+  const state = {};
+  return {
+    forTurn: (runId, tokens2) => {
+      state.runId = runId;
+      state.latest = tokens2;
+    },
+    externalAuth: {
+      current: async () => {
+        if (state.latest === void 0) throw new Error("No Codex sign-in for this turn");
+        state.given = state.latest;
+        return state.given;
+      },
+      refresh: async () => {
+        if (broker === void 0 || state.runId === void 0) {
+          throw new Error("Codex sign-in cannot be refreshed on this machine");
+        }
+        const rejected2 = state.given === void 0 ? void 0 : sha2563(state.given.accessToken);
+        const fresh = await broker.refresh(state.runId, rejected2);
+        state.latest = fresh;
+        state.given = fresh;
+        return fresh;
+      }
+    }
+  };
+}
+function withLogin(planned, externalAuth, accountId) {
+  return {
+    ...planned,
+    spec: { ...planned.spec, externalAuth },
+    key: JSON.stringify([planned.key, accountId])
+  };
+}
 function createCodexHolderDriver(options) {
   const clock = options.clock ?? systemClock2;
   const sessions = options.sessions ?? createCodexDriver({ ...options.timings, clock, log: options.log });
+  const login = createCodexLogin(options.codexCredentials);
   return createPersistentDriver(
     {
       harness: "codex_app_server",
       displayName: "Codex app-server",
-      plan: (spec, inputs, resumeId, managedMcp) => planCodexSession(spec, {
-        command: options.command ?? "codex",
-        cwd: spec.projectPath ?? options.defaultCwd,
-        cliEnv: options.cliEnvironment,
-        providerEnv: inputs.providerEnv,
-        ...managedMcp === void 0 ? {} : { managedMcp },
-        ...resumeId === void 0 ? {} : { resumeThreadId: resumeId }
-      }),
+      plan: (spec, inputs, resumeId, managedMcp) => {
+        const planned = planCodexSession(spec, {
+          command: options.command ?? "codex",
+          cwd: spec.projectPath ?? options.defaultCwd,
+          cliEnv: options.cliEnvironment,
+          providerEnv: inputs.providerEnv,
+          ...managedMcp === void 0 ? {} : { managedMcp },
+          ...resumeId === void 0 ? {} : { resumeThreadId: resumeId }
+        });
+        if (inputs.codex === void 0) return planned;
+        login.forTurn(spec.runId, inputs.codex);
+        return withLogin(planned, login.externalAuth, inputs.codex.chatgptAccountId);
+      },
       canResume: () => true,
       open: async (spec) => {
         const session = await sessions.open(spec);
@@ -45093,9 +45209,11 @@ function createCodexHolderDriver(options) {
     }
   );
 }
+var import_node_crypto25;
 var init_codex2 = __esm({
   "src/holder/drivers/codex.ts"() {
     "use strict";
+    import_node_crypto25 = require("crypto");
     init_dist();
     init_codex();
     init_persistent();
@@ -45547,12 +45665,12 @@ var import_crypto15, import_promises51, FACTORY_API_VERSION, FACTORY_PROTOCOL_VE
 var init_droid = __esm({
   "../agent-core/dist/providers/droid.js"() {
     "use strict";
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
     init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
     init_runtime_v2();
     import_crypto15 = require("crypto");
@@ -46020,6 +46138,35 @@ var init_opencode2 = __esm({
 });
 
 // ../agent-core/dist/providers/antigravity.js
+function settingsPath(env) {
+  const home = env.HOME?.trim() || env.USERPROFILE?.trim();
+  return home ? (0, import_path12.resolve)(home, ".gemini", "antigravity-cli", "settings.json") : void 0;
+}
+async function readSettings2(path4) {
+  let raw;
+  try {
+    raw = (await (0, import_promises52.readFile)(path4, "utf8")).trim();
+  } catch {
+    return {};
+  }
+  if (!raw) return {};
+  try {
+    const parsed = JSON.parse(raw);
+    return isRecord(parsed) ? parsed : "malformed";
+  } catch {
+    return "malformed";
+  }
+}
+async function selectAntigravityApiKeyMode(env) {
+  const path4 = settingsPath(env);
+  if (!env.GEMINI_API_KEY?.trim() || path4 === void 0) return "no_key";
+  const settings2 = await readSettings2(path4);
+  if (settings2 === "malformed") return "malformed";
+  if (settings2.modelProvider === "gemini") return "already_selected";
+  await (0, import_promises52.mkdir)((0, import_path12.dirname)(path4), { recursive: true });
+  await (0, import_promises52.writeFile)(path4, JSON.stringify({ ...settings2, modelProvider: "gemini" }), { mode: 384 });
+  return "selected";
+}
 function readAntigravityCapabilities(version2, help) {
   const text2 = help.toLowerCase().replace(/\s+/g, " ");
   const structured = /\bstream-json\b/.test(text2) || /\bjsonl\b/.test(text2) || /\bjson\b/.test(text2);
@@ -46060,21 +46207,21 @@ function antigravityArgs(input2, capabilities, prompt) {
   ];
 }
 function workspaceRoot(cwd) {
-  for (let current = (0, import_path12.resolve)(cwd); ; current = (0, import_path12.dirname)(current)) {
-    if ((0, import_fs8.existsSync)((0, import_path12.join)(current, ".git"))) return current;
-    if ((0, import_path12.dirname)(current) === current) return (0, import_path12.resolve)(cwd);
+  for (let current = (0, import_path13.resolve)(cwd); ; current = (0, import_path13.dirname)(current)) {
+    if ((0, import_fs8.existsSync)((0, import_path13.join)(current, ".git"))) return current;
+    if ((0, import_path13.dirname)(current) === current) return (0, import_path13.resolve)(cwd);
   }
 }
 function instructionPaths(cwd) {
   const root = workspaceRoot(cwd);
   const paths = [];
-  for (let current = (0, import_path12.resolve)(cwd); ; current = (0, import_path12.dirname)(current)) {
-    const path4 = (0, import_path12.join)(current, INSTRUCTIONS_FILE);
+  for (let current = (0, import_path13.resolve)(cwd); ; current = (0, import_path13.dirname)(current)) {
+    const path4 = (0, import_path13.join)(current, INSTRUCTIONS_FILE);
     try {
       if ((0, import_fs8.existsSync)(path4) && (0, import_fs8.statSync)(path4).isFile()) paths.unshift(path4);
     } catch {
     }
-    if (current === root || (0, import_path12.dirname)(current) === current) return paths;
+    if (current === root || (0, import_path13.dirname)(current) === current) return paths;
   }
 }
 function antigravityWorkspaceInstructions(cwd, maxChars = MAX_INSTRUCTION_CHARS) {
@@ -46328,7 +46475,7 @@ function normalizeAntigravityFrame(event) {
 }
 function antigravityBrainRoot(env) {
   const home = env.HOME?.trim() || env.USERPROFILE?.trim();
-  return home ? (0, import_path13.resolve)(home, ".gemini", "antigravity-cli", "brain") : void 0;
+  return home ? (0, import_path14.resolve)(home, ".gemini", "antigravity-cli", "brain") : void 0;
 }
 function parseEntry(text2) {
   try {
@@ -46366,14 +46513,14 @@ function childTranscriptPath(root, frame) {
   try {
     const url3 = new URL(logUri);
     if (url3.protocol !== "file:") return void 0;
-    path4 = (0, import_path13.resolve)((0, import_url3.fileURLToPath)(url3));
+    path4 = (0, import_path14.resolve)((0, import_url3.fileURLToPath)(url3));
   } catch {
     return void 0;
   }
-  const fromRoot = (0, import_path13.relative)(root, path4);
-  if (!fromRoot || (0, import_path13.isAbsolute)(fromRoot) || fromRoot.split(import_path13.sep).includes("..")) return void 0;
+  const fromRoot = (0, import_path14.relative)(root, path4);
+  if (!fromRoot || (0, import_path14.isAbsolute)(fromRoot) || fromRoot.split(import_path14.sep).includes("..")) return void 0;
   const expected = [conversationId, ...LOG_DIRS, TRANSCRIPT_FILE];
-  const segments = fromRoot.split(import_path13.sep);
+  const segments = fromRoot.split(import_path14.sep);
   const matches = segments.length === expected.length && segments.every((segment, index) => segment === expected[index]);
   return matches ? path4 : void 0;
 }
@@ -46551,11 +46698,15 @@ ${output2.stderr}`).join("\n")
     name: "antigravity_cli",
     capabilities,
     open: async (spec) => {
-      const found = await capabilities(spec.command, spec.env);
+      const [found, apiKeyMode] = await Promise.all([
+        capabilities(spec.command, spec.env),
+        selectAntigravityApiKeyMode(spec.env).catch(() => "unwritable")
+      ]);
       session.log.info("antigravity.opened", {
         version: found.version,
         structured: found.structuredPrint,
-        resumeId: spec.resumeSessionId
+        resumeId: spec.resumeSessionId,
+        apiKeyMode
       });
       return new AntigravitySession(
         provider2(spec, found, options.platform ?? process.platform),
@@ -46612,21 +46763,24 @@ function antigravityTurnInput(run2, context) {
   });
   return { turnId: run2.runId, text: appendImagePathReferences(text2, images) };
 }
-var import_fs8, import_path12, import_path13, import_url3, import_crypto16, NO_ANTIGRAVITY_CAPABILITIES, INSTRUCTIONS_FILE, MAX_INSTRUCTION_CHARS, SHORTENED_NOTE, DIFF_BLOCK_START, DIFF_BLOCK_END, HUNK_HEADER, TRANSCRIPT_FILE, FULL_TRANSCRIPT_FILE, LOG_DIRS, TOOL_RESULT_TYPES, BrainTranscript, AntigravityTranscripts, ANTIGRAVITY_GRAMMAR_NAME, AntigravityGrammar, ignored, HANDLERS, SUCCESSFUL_STATUSES, SESSION_START_TYPES, RESULT_TYPES, SUBAGENT_START_TYPES, RESUME_FORKED, EXITED_WITHOUT_RESULT, AntigravityTurn, DEFAULTS6, AntigravitySession, WINDOWS_LINE_MARGIN;
+var import_promises52, import_path12, import_fs8, import_path13, import_path14, import_url3, import_crypto16, NO_ANTIGRAVITY_CAPABILITIES, INSTRUCTIONS_FILE, MAX_INSTRUCTION_CHARS, SHORTENED_NOTE, DIFF_BLOCK_START, DIFF_BLOCK_END, HUNK_HEADER, TRANSCRIPT_FILE, FULL_TRANSCRIPT_FILE, LOG_DIRS, TOOL_RESULT_TYPES, BrainTranscript, AntigravityTranscripts, ANTIGRAVITY_GRAMMAR_NAME, AntigravityGrammar, ignored, HANDLERS, SUCCESSFUL_STATUSES, SESSION_START_TYPES, RESULT_TYPES, SUBAGENT_START_TYPES, RESUME_FORKED, EXITED_WITHOUT_RESULT, AntigravityTurn, DEFAULTS6, AntigravitySession, WINDOWS_LINE_MARGIN;
 var init_antigravity = __esm({
   "../agent-core/dist/providers/antigravity.js"() {
     "use strict";
     init_chunk_DALFHI4B();
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
-    import_fs8 = require("fs");
+    import_promises52 = require("fs/promises");
     import_path12 = require("path");
-    init_effort();
+    init_type_guards();
+    import_fs8 = require("fs");
     import_path13 = require("path");
+    init_effort();
+    import_path14 = require("path");
     import_url3 = require("url");
     import_crypto16 = require("crypto");
     init_agent2();
@@ -46666,7 +46820,7 @@ var init_antigravity = __esm({
       #full;
       constructor(path4) {
         this.#cursor = new TranscriptCursor(path4);
-        this.#fullPath = (0, import_path13.resolve)((0, import_path13.dirname)(path4), FULL_TRANSCRIPT_FILE);
+        this.#fullPath = (0, import_path14.resolve)((0, import_path14.dirname)(path4), FULL_TRANSCRIPT_FILE);
       }
       skipExisting() {
         this.#cursor.read();
@@ -46714,7 +46868,7 @@ var init_antigravity = __esm({
       /** A conversation this turn did not resume was created by it, so it is read whole. */
       trackParent(conversationId) {
         if (this.#parent?.conversationId === conversationId) return;
-        const path4 = (0, import_path13.resolve)(this.#root, conversationId, ...LOG_DIRS, TRANSCRIPT_FILE);
+        const path4 = (0, import_path14.resolve)(this.#root, conversationId, ...LOG_DIRS, TRANSCRIPT_FILE);
         this.#parent = { conversationId, transcript: new BrainTranscript(path4) };
       }
       /** A launcher keeps the first valid transcript it names; later frames change nothing. */
@@ -47119,8 +47273,8 @@ function parseConfig(raw) {
   }
 }
 async function writeCommandCodeProjectMcp(cwd, mcp) {
-  const path4 = (0, import_path14.join)(cwd, ".mcp.json");
-  const original = await (0, import_promises52.readFile)(path4, "utf8").catch(() => null);
+  const path4 = (0, import_path15.join)(cwd, ".mcp.json");
+  const original = await (0, import_promises53.readFile)(path4, "utf8").catch(() => null);
   const config2 = parseConfig(original);
   const next = {
     ...config2,
@@ -47137,12 +47291,12 @@ async function writeCommandCodeProjectMcp(cwd, mcp) {
       }
     }
   };
-  await (0, import_promises52.mkdir)(cwd, { recursive: true });
-  await (0, import_promises52.writeFile)(path4, `${JSON.stringify(next, null, 2)}
+  await (0, import_promises53.mkdir)(cwd, { recursive: true });
+  await (0, import_promises53.writeFile)(path4, `${JSON.stringify(next, null, 2)}
 `);
   return async () => {
-    if (original === null) await (0, import_promises52.rm)(path4, { force: true });
-    else await (0, import_promises52.writeFile)(path4, original);
+    if (original === null) await (0, import_promises53.rm)(path4, { force: true });
+    else await (0, import_promises53.writeFile)(path4, original);
   };
 }
 function commandCodeString(value2) {
@@ -47314,19 +47468,19 @@ function commandCodeTurnInput(run2, context) {
   });
   return { turnId: run2.runId, text: appendImagePathReferences(text2, images) };
 }
-var import_promises52, import_path14, import_crypto17, COMMAND_CODE_GRAMMAR_NAME, SILENT3, CommandCodeGrammar, SHELL_TOOL, STOP_TOOLS, REPORTED_STATUS, SHELL_STATUS, SWEEP_INTERVAL_MS, CommandCodeBackgroundTasks, EXITED_WITHOUT_RESULT2, CommandCodeTurn, COMMAND_CODE_MAX_TURNS, DEFAULTS7, CommandCodeSession;
+var import_promises53, import_path15, import_crypto17, COMMAND_CODE_GRAMMAR_NAME, SILENT3, CommandCodeGrammar, SHELL_TOOL, STOP_TOOLS, REPORTED_STATUS, SHELL_STATUS, SWEEP_INTERVAL_MS, CommandCodeBackgroundTasks, EXITED_WITHOUT_RESULT2, CommandCodeTurn, COMMAND_CODE_MAX_TURNS, DEFAULTS7, CommandCodeSession;
 var init_command_code = __esm({
   "../agent-core/dist/providers/command-code.js"() {
     "use strict";
-    init_chunk_W3QH4J4A();
+    init_chunk_YPYC4VBL();
     init_chunk_UGRKZTAD();
-    init_chunk_R6R6ORR2();
+    init_chunk_54ZRJOQP();
     init_chunk_J2KTV5FP();
     init_chunk_J4T6L5LX();
-    init_chunk_6WN2R725();
+    init_chunk_ITTV3UIM();
     init_chunk_YXWJW7I5();
-    import_promises52 = require("fs/promises");
-    import_path14 = require("path");
+    import_promises53 = require("fs/promises");
+    import_path15 = require("path");
     init_agent2();
     init_runtime_v2();
     init_acp();
@@ -51312,7 +51466,7 @@ var require_websocket = __commonJS({
     var http = require("http");
     var net = require("net");
     var tls = require("tls");
-    var { randomBytes: randomBytes6, createHash: createHash29 } = require("crypto");
+    var { randomBytes: randomBytes6, createHash: createHash31 } = require("crypto");
     var { Duplex, Readable: Readable2 } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -51969,7 +52123,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash29("sha1").update(key + GUID).digest("base64");
+        const digest = createHash31("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -52336,7 +52490,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = require("events");
     var http = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash29 } = require("crypto");
+    var { createHash: createHash31 } = require("crypto");
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate();
     var subprotocol = require_subprotocol();
@@ -52633,7 +52787,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash29("sha1").update(key + GUID).digest("base64");
+        const digest = createHash31("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -52721,7 +52875,7 @@ var require_websocket_server = __commonJS({
 // package.json
 var package_default = {
   name: "@alan-ai-hq/agent-manager",
-  version: "0.1.135",
+  version: "0.1.137",
   private: true,
   type: "module",
   description: "Alan machine runtime (alan-agent): identity, link, reconciler, session holders, run log, uploader, local API",
@@ -52770,8 +52924,8 @@ var package_default = {
 };
 
 // src/cli/commands/compat.ts
-var import_node_crypto28 = require("crypto");
-var import_promises63 = require("fs/promises");
+var import_node_crypto30 = require("crypto");
+var import_promises65 = require("fs/promises");
 init_runtime_v2();
 init_zod();
 
@@ -53577,6 +53731,13 @@ function createHolderApiClient({
       }
       return runProviderCredentialSchema.parse(jsonBody(response));
     },
+    refreshCodexCredential: async (runId, body, signal) => {
+      const response = await request2("POST", runCodexCredentialRefreshPath(runId), signal, body);
+      if (!isOk(response)) {
+        throw new RuntimeFault("io_failed", `Codex sign-in refresh failed: ${response.status}`);
+      }
+      return runCodexCredentialSchema.parse(jsonBody(response));
+    },
     mintMcpCredential: async (conversationId, signal) => {
       const response = await request2("POST", MACHINE_PATHS.mcpCredential, signal, {
         conversationId
@@ -63093,16 +63254,33 @@ async function scanLocalSkills(home, context, cache2, mode = "incremental") {
 // src/capabilities/skills/store.ts
 var import_promises40 = require("fs/promises");
 var import_node_path42 = require("path");
+
+// ../shared/dist/node/alan-skill-identity.js
+var import_node_crypto20 = require("crypto");
+var ALAN_SKILL_NAMESPACE = "ec71d99b-d207-4ca2-a9eb-3a7bed4a73fd";
+function uuidV5(name, namespace) {
+  const bytes = (0, import_node_crypto20.createHash)("sha1").update(Buffer.from(namespace.replaceAll("-", ""), "hex")).update(name, "utf8").digest().subarray(0, 16);
+  bytes[6] = bytes[6] & 15 | 80;
+  bytes[8] = bytes[8] & 63 | 128;
+  const hex3 = bytes.toString("hex");
+  return `${hex3.slice(0, 8)}-${hex3.slice(8, 12)}-${hex3.slice(12, 16)}-${hex3.slice(16, 20)}-${hex3.slice(20)}`;
+}
+function alanSkillId(slug) {
+  return uuidV5(`alan:${slug}`, ALAN_SKILL_NAMESPACE);
+}
+
+// src/capabilities/skills/store.ts
 init_runtime_v2();
 init_zod();
-function skillsLayout(stateDir) {
+function skillsLayout(stateDir, home) {
   const root = (0, import_node_path42.join)(stateDir, "skills");
   return {
     root,
     installedFile: (0, import_node_path42.join)(root, "installed.json"),
     localFile: (0, import_node_path42.join)(root, "local.json"),
     versionsDir: (0, import_node_path42.join)(root, "versions"),
-    tmpDir: (0, import_node_path42.join)(root, "tmp")
+    tmpDir: (0, import_node_path42.join)(root, "tmp"),
+    nativeDir: home === void 0 || home === "" ? null : (0, import_node_path42.join)(home, ".agents", "skills")
   };
 }
 function packageDirectory(layout, versionId) {
@@ -63169,6 +63347,17 @@ async function isIntact(layout, skill) {
     return false;
   }
 }
+async function resolveNativeBuiltIn(layout, invocation) {
+  const slug = invocation.displayName;
+  if (layout.nativeDir === null || invocation.skillId !== alanSkillId(slug)) return null;
+  const directory = (0, import_node_path42.join)(layout.nativeDir, slug);
+  try {
+    await inspectSkillPackage(directory, { expectedName: slug });
+    return { packageDirectory: directory };
+  } catch {
+    return null;
+  }
+}
 async function resolveSkillInvocations(layout, invocations) {
   if (invocations.length === 0) return { kind: "resolved", skills: [] };
   const installed = await readInstalledSkills(layout);
@@ -63187,12 +63376,46 @@ async function resolveSkillInvocations(layout, invocations) {
     );
     if (skill !== void 0 && await isIntact(layout, skill)) {
       resolved.push({ packageDirectory: packageDirectory(layout, skill.versionId) });
-    } else {
-      missing.push(invocation.displayName);
+      continue;
     }
+    const native = await resolveNativeBuiltIn(layout, invocation);
+    if (native === null) missing.push(invocation.displayName);
+    else resolved.push(native);
   }
   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_promises40.readdir)(layout.nativeDir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (entry.isDirectory() || entry.isSymbolicLink())
+        candidates2.push({ directory: (0, import_node_path42.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/skills/local-preview.ts
 var MAX_INLINE_IMAGE_BYTES = 2 * 1024 * 1024;
@@ -63303,7 +63526,7 @@ var import_promises43 = require("fs/promises");
 
 // ../shared/dist/node/skill-bundle.js
 var import_node_buffer2 = require("buffer");
-var import_node_crypto20 = require("crypto");
+var import_node_crypto21 = require("crypto");
 var import_promises42 = require("fs/promises");
 var import_node_path44 = require("path");
 var import_node_stream = require("stream");
@@ -63442,7 +63665,7 @@ function requireSafeArchivePath(value2) {
   return normalized2;
 }
 function sha2562(bytes) {
-  return `sha256:${(0, import_node_crypto20.createHash)("sha256").update(bytes).digest("hex")}`;
+  return `sha256:${(0, import_node_crypto21.createHash)("sha256").update(bytes).digest("hex")}`;
 }
 
 // src/capabilities/skills/local-upload.ts
@@ -63486,14 +63709,14 @@ async function publishLocalSkill(options) {
 }
 
 // src/capabilities/skills/sync.ts
-var import_node_crypto21 = require("crypto");
+var import_node_crypto22 = require("crypto");
 var import_promises44 = require("fs/promises");
 var import_node_path45 = require("path");
 var SKILL_PREPARE_WAIT_MS = 15e3;
 async function install(layout, source, skill, download, signal) {
   const bytes = await source.download(download.url, signal);
   await (0, import_promises44.mkdir)(layout.tmpDir, { recursive: true, mode: 448 });
-  const staging = (0, import_node_path45.join)(layout.tmpDir, (0, import_node_crypto21.randomUUID)());
+  const staging = (0, import_node_path45.join)(layout.tmpDir, (0, import_node_crypto22.randomUUID)());
   await extractSkillBundle(Buffer.from(bytes), staging, {
     expectedArchiveHash: download.archiveHash,
     expectedContentHash: skill.contentHash
@@ -63533,11 +63756,28 @@ async function mapBounded(items, limit, work) {
   await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker));
   return results;
 }
-async function applyDesired(layout, source, log, present2, response, signal) {
+function installedRecorder(layout, present2, onRecorded) {
+  const ready = new Map(
+    present2.map((skill) => [skill.skillId, skill])
+  );
+  let chain = Promise.resolve();
+  return {
+    record: (skill) => {
+      ready.set(skill.skillId, skill);
+      const snapshot2 = [...ready.values()];
+      const write = chain.then(() => writeInstalledSkills(layout, snapshot2)).then(onRecorded);
+      chain = write.catch(() => void 0);
+      return write;
+    },
+    settled: () => chain
+  };
+}
+async function applyDesired(layout, source, log, present2, response, onRecorded, signal) {
   const held = new Map(present2.map((skill) => [skill.skillId, skill]));
   const downloads = new Map(
     response.downloads.map((download) => [download.skillId, download])
   );
+  const recorder = installedRecorder(layout, present2, onRecorded);
   const installOne = async (skill) => {
     const download = downloads.get(skill.skillId);
     if (download === void 0) {
@@ -63547,6 +63787,7 @@ async function applyDesired(layout, source, log, present2, response, signal) {
     }
     try {
       await install(layout, source, skill, download, signal);
+      await recorder.record(skill);
       return "downloaded";
     } catch (error61) {
       log.warn("skills.install_failed", { skillId: skill.skillId, slug: skill.slug, error: error61 });
@@ -63557,6 +63798,7 @@ async function applyDesired(layout, source, log, present2, response, signal) {
   const installed = response.skills.filter((_, index) => outcomes[index] !== "failed");
   const failed = response.skills.filter((_, index) => outcomes[index] === "failed").map((skill) => skill.slug);
   const downloaded = outcomes.filter((outcome2) => outcome2 === "downloaded").length;
+  await recorder.settled();
   await writeInstalledSkills(layout, installed);
   const removed = await sweep(layout, installed);
   return { installed: installed.length, downloaded, removed, failed };
@@ -63647,14 +63889,14 @@ async function settleLocal(layout, source, log, local, exchange3, response, sign
   const uploads = await uploadRequested(layout, source, log, local, response.uploads ?? [], signal);
   return serverLost || uploads > 0;
 }
-async function syncOnce(layout, source, log, local, signal) {
+async function syncOnce(layout, source, log, local, onRecorded, signal) {
   let report2 = { installed: 0, downloaded: 0, removed: 0, failed: [] };
   if (local !== null) await loadContext(layout, local);
   for (let exchange3 = 0; exchange3 < MAX_EXCHANGES; exchange3 += 1) {
     const present2 = await intactSkills(layout);
     const pending = local === null ? null : localExchange(local);
     const response = await source.sync(syncRequest(present2, pending), signal);
-    report2 = await applyDesired(layout, source, log, present2, response, signal);
+    report2 = await applyDesired(layout, source, log, present2, response, onRecorded, signal);
     if (local === null || pending === null) return report2;
     const again = await settleLocal(layout, source, log, local, pending, response, signal);
     if (!again) return report2;
@@ -63668,7 +63910,7 @@ function aborted2(signal) {
   });
 }
 function openMachineSkills(options) {
-  const layout = skillsLayout(options.stateDir);
+  const layout = skillsLayout(options.stateDir, options.local?.home);
   const { source, log } = options;
   const local = options.local === void 0 ? null : {
     options: options.local,
@@ -63684,6 +63926,10 @@ function openMachineSkills(options) {
   const waitMs = options.waitMs ?? SKILL_PREPARE_WAIT_MS;
   const lifetime = new AbortController();
   const flight = {};
+  const recordWatchers = /* @__PURE__ */ new Set();
+  const recorded = () => {
+    for (const watcher of recordWatchers) watcher();
+  };
   const rescans = /* @__PURE__ */ new Set();
   const rescanOnce = async (state) => {
     try {
@@ -63700,7 +63946,7 @@ function openMachineSkills(options) {
     return task;
   };
   const run2 = () => {
-    const running = syncOnce(layout, source, log, local, lifetime.signal).then((report2) => {
+    const running = syncOnce(layout, source, log, local, recorded, lifetime.signal).then((report2) => {
       log.info("skills.synced", { ...report2 });
       return report2;
     }).catch((error61) => {
@@ -63741,6 +63987,25 @@ function openMachineSkills(options) {
       if ((await resolveSkillInvocations(layout, named)).kind === "resolved") return;
     }
   };
+  const recordedUntilResolved = (named, until) => new Promise((resolve12) => {
+    const done = () => {
+      recordWatchers.delete(check3);
+      until.removeEventListener("abort", done);
+      resolve12();
+    };
+    const check3 = () => {
+      void resolveSkillInvocations(layout, named).then((resolution) => {
+        if (resolution.kind === "resolved") done();
+      });
+    };
+    if (until.aborted) {
+      resolve12();
+      return;
+    }
+    recordWatchers.add(check3);
+    until.addEventListener("abort", done, { once: true });
+    check3();
+  });
   return {
     sync,
     rescan,
@@ -63748,8 +64013,11 @@ function openMachineSkills(options) {
       const named = invocations ?? [];
       if ((await resolveSkillInvocations(layout, named)).kind === "resolved") return;
       const picksLocal = named.some((invocation) => invocation.kind === "local_skill");
+      const settled2 = new AbortController();
+      const until = AbortSignal.any([signal, AbortSignal.timeout(waitMs), settled2.signal]);
       const settle = picksLocal ? rescanUntilResolved(named) : exchangeUntilResolved(named);
-      await Promise.race([settle, aborted2(AbortSignal.any([signal, AbortSignal.timeout(waitMs)]))]);
+      await Promise.race([settle, recordedUntilResolved(named, until), aborted2(until)]);
+      settled2.abort();
     },
     [Symbol.asyncDispose]: async () => {
       lifetime.abort();
@@ -63861,7 +64129,7 @@ async function openApprovedPaths(options) {
 }
 
 // src/capabilities/workspace/locks.ts
-var import_node_crypto22 = require("crypto");
+var import_node_crypto23 = require("crypto");
 var import_promises46 = require("fs/promises");
 var import_node_path47 = require("path");
 init_zod();
@@ -63878,7 +64146,7 @@ var ownerSchema = external_exports.object({
   since: external_exports.number().int().nonnegative()
 });
 function repositoryLockKey(commonDir, platform3) {
-  return (0, import_node_crypto22.createHash)("sha256").update(comparablePath(commonDir, platform3)).digest("hex").slice(0, 32);
+  return (0, import_node_crypto23.createHash)("sha256").update(comparablePath(commonDir, platform3)).digest("hex").slice(0, 32);
 }
 async function readOwner2(path4) {
   let text2;
@@ -63991,7 +64259,7 @@ function openRepositoryLocks(options) {
     },
     tryShared: async (commonDir, runId) => {
       const { key, dir } = await folder(commonDir);
-      const file2 = `${RUN_FILE_PREFIX}${(0, import_node_crypto22.createHash)("sha256").update(runId).digest("hex").slice(0, 32)}.json`;
+      const file2 = `${RUN_FILE_PREFIX}${(0, import_node_crypto23.createHash)("sha256").update(runId).digest("hex").slice(0, 32)}.json`;
       const path4 = (0, import_node_path47.join)(dir, file2);
       const owner = await self(runId);
       await writeJsonFileAtomic(path4, owner);
@@ -64898,14 +65166,14 @@ async function sendNativeHookSignal(discoveryPath, hookSignal, signal) {
 }
 
 // src/sessions/index.ts
-var import_node_crypto27 = require("crypto");
-var import_promises61 = require("fs/promises");
+var import_node_crypto29 = require("crypto");
+var import_promises63 = require("fs/promises");
 var import_node_os10 = require("os");
 var import_node_path63 = require("path");
 init_runtime_v2();
 
 // src/holder/control-client.ts
-var import_node_crypto23 = require("crypto");
+var import_node_crypto24 = require("crypto");
 var import_node_net2 = require("net");
 init_runtime_v2();
 
@@ -64975,7 +65243,7 @@ async function connectHolder(endpoint, token, onEvent) {
   });
   const pid = await ready;
   const request2 = (body) => {
-    const id = (0, import_node_crypto23.randomUUID)();
+    const id = (0, import_node_crypto24.randomUUID)();
     return new Promise((resolve12, reject) => {
       const timer = AbortSignal.timeout(REQUEST_TIMEOUT_MS7);
       timer.addEventListener("abort", () => {
@@ -65236,8 +65504,33 @@ function createConversationMcpAuthorization(options) {
   };
 }
 
+// src/holder/mcp-helper-access.ts
+var import_promises54 = require("fs/promises");
+function createHelperMcpAccess(options) {
+  return {
+    [Symbol.asyncDispose]: async () => {
+      await (0, import_promises54.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_promises54.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_promises53 = require("fs/promises");
+var import_promises55 = require("fs/promises");
 var import_node_path53 = require("path");
 var NO_RUN_INPUTS = {
   attachments: [],
@@ -65253,16 +65546,16 @@ function safeFilename(filename) {
 async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
   const dir = (0, import_node_path53.join)(tmpDir, "runs", spec.runId);
   const cleanup = async () => {
-    await (0, import_promises53.rm)(dir, { recursive: true, force: true });
+    await (0, import_promises55.rm)(dir, { recursive: true, force: true });
   };
   try {
     const credential = await source.fetchProviderCredential(spec.runId, signal);
     const attachments = [];
-    if (spec.attachments?.length) await (0, import_promises53.mkdir)(dir, { recursive: true, mode: 448 });
+    if (spec.attachments?.length) await (0, import_promises55.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 path4 = (0, import_node_path53.join)(dir, `${index}-${safeFilename(attachment.filename)}`);
-      await (0, import_promises53.writeFile)(path4, bytes, { mode: 384 });
+      await (0, import_promises55.writeFile)(path4, bytes, { mode: 384 });
       attachments.push({
         id: attachment.id,
         kind: attachment.kind,
@@ -65275,7 +65568,13 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
         ...attachment.height === void 0 ? {} : { height: attachment.height }
       });
     }
-    return { attachments, providerEnv: credential.env, skills, [Symbol.asyncDispose]: cleanup };
+    return {
+      attachments,
+      providerEnv: credential.env,
+      ...credential.codex === void 0 ? {} : { codex: credential.codex },
+      skills,
+      [Symbol.asyncDispose]: cleanup
+    };
   } catch (error61) {
     await cleanup();
     throw error61;
@@ -65283,7 +65582,7 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
 }
 
 // src/holder/serve.ts
-var import_node_crypto26 = require("crypto");
+var import_node_crypto28 = require("crypto");
 var import_node_fs21 = require("fs");
 var import_node_net3 = require("net");
 var import_node_path62 = require("path");
@@ -65291,7 +65590,7 @@ init_runtime_v2();
 
 // src/holder/admission.ts
 var import_node_fs18 = require("fs");
-var import_promises57 = require("fs/promises");
+var import_promises59 = require("fs/promises");
 var import_node_os9 = require("os");
 var import_node_path58 = require("path");
 init_constants();
@@ -65305,7 +65604,7 @@ function resolveAlanDefaultWorkspacePath(homeDirectory = (0, import_node_os8.hom
 }
 
 // src/holder/admission-relocation.ts
-var import_promises54 = require("fs/promises");
+var import_promises56 = require("fs/promises");
 var import_node_path55 = require("path");
 var MAX_RELOCATION_CANDIDATES = 200;
 var RELOCATION_BUDGET_MS = 2e4;
@@ -65341,7 +65640,7 @@ async function originIdentity(git, path4, signal) {
 }
 async function childDirectories(parent, limit) {
   try {
-    const entries = await (0, import_promises54.readdir)(parent, { withFileTypes: true });
+    const entries = await (0, import_promises56.readdir)(parent, { withFileTypes: true });
     return entries.filter((entry) => entry.isDirectory()).slice(0, limit).map((entry) => (0, import_node_path55.join)(parent, entry.name));
   } catch {
     return [];
@@ -65377,8 +65676,8 @@ async function discoverRelocatedWorkspace(search) {
 }
 
 // src/holder/checkout-refresh.ts
-var import_node_crypto24 = require("crypto");
-var import_promises55 = require("fs/promises");
+var import_node_crypto26 = require("crypto");
+var import_promises57 = require("fs/promises");
 var import_node_path56 = require("path");
 function short(sha) {
   return sha.slice(0, 12);
@@ -65391,8 +65690,8 @@ function staleLine(path4, snapshot2, tip) {
 }
 async function claimOnce(dir, name) {
   try {
-    await (0, import_promises55.mkdir)(dir, { recursive: true, mode: 448 });
-    await (await (0, import_promises55.open)((0, import_node_path56.join)(dir, name), "wx")).close();
+    await (0, import_promises57.mkdir)(dir, { recursive: true, mode: 448 });
+    await (await (0, import_promises57.open)((0, import_node_path56.join)(dir, name), "wx")).close();
     return true;
   } catch {
     return false;
@@ -65424,7 +65723,7 @@ async function fastForward(freshness, operationId, deps, signal) {
 async function atFirstLease(freshness, spec, deps, signal) {
   const first = await claimOnce(
     (0, import_node_path56.join)(deps.dir, "leased"),
-    (0, import_node_crypto24.createHash)("sha256").update(freshness.path).digest("hex")
+    (0, import_node_crypto26.createHash)("sha256").update(freshness.path).digest("hex")
   );
   switch (freshness.state) {
     case "current":
@@ -65475,7 +65774,7 @@ function createCheckoutRefresh(deps) {
 }
 
 // src/holder/lease.ts
-var import_promises56 = require("fs/promises");
+var import_promises58 = require("fs/promises");
 var import_node_path57 = require("path");
 var LEASE_CHECK_EVERY_MS = 5e3;
 var MAX_TRANSIENT_FAILURES = 3;
@@ -65490,8 +65789,8 @@ function identityFailure(code, workspacePath) {
   return { code, problemCode: "app.workspace.missing", message: MESSAGES[code], workspacePath };
 }
 async function fileIdentity(path4) {
-  const canonical = await (0, import_promises56.realpath)(path4);
-  const info = await (0, import_promises56.stat)(canonical, { bigint: true });
+  const canonical = await (0, import_promises58.realpath)(path4);
+  const info = await (0, import_promises58.stat)(canonical, { bigint: true });
   return `${canonical}:${info.dev}:${info.ino}`;
 }
 async function snapshot(git, path4, signal) {
@@ -65510,7 +65809,7 @@ async function snapshot(git, path4, signal) {
       workspace: await fileIdentity(path4),
       repository: await fileIdentity(commonDir),
       worktree: await fileIdentity(gitDir),
-      commonDir: await (0, import_promises56.realpath)(commonDir)
+      commonDir: await (0, import_promises58.realpath)(commonDir)
     };
   } catch {
     return null;
@@ -65523,7 +65822,7 @@ async function gitValue(git, path4, args, signal) {
 }
 async function pathExists(path4) {
   try {
-    await (0, import_promises56.stat)(path4);
+    await (0, import_promises58.stat)(path4);
     return true;
   } catch (error61) {
     return errnoCode(error61) !== "ENOENT" && errnoCode(error61) !== "ENOTDIR";
@@ -65532,13 +65831,13 @@ async function pathExists(path4) {
 async function hasGitMarker(path4) {
   let directory;
   try {
-    directory = await (0, import_promises56.realpath)(path4);
+    directory = await (0, import_promises58.realpath)(path4);
   } catch {
     return true;
   }
   for (; ; ) {
     try {
-      await (0, import_promises56.stat)((0, import_node_path57.join)(directory, ".git"));
+      await (0, import_promises58.stat)((0, import_node_path57.join)(directory, ".git"));
       return true;
     } catch (error61) {
       const code = errnoCode(error61);
@@ -65708,7 +66007,7 @@ function volumeRoot(path4) {
 }
 async function exists4(path4) {
   try {
-    await (0, import_promises57.stat)(path4);
+    await (0, import_promises59.stat)(path4);
     return true;
   } catch {
     return false;
@@ -65716,10 +66015,10 @@ async function exists4(path4) {
 }
 async function inspectReadiness(path4) {
   try {
-    if (!(await (0, import_promises57.stat)(path4)).isDirectory()) {
+    if (!(await (0, import_promises59.stat)(path4)).isDirectory()) {
       return { ready: false, missing: true, message: MESSAGES2.missing };
     }
-    await (0, import_promises57.access)(path4, import_node_fs18.constants.R_OK | import_node_fs18.constants.W_OK | import_node_fs18.constants.X_OK);
+    await (0, import_promises59.access)(path4, import_node_fs18.constants.R_OK | import_node_fs18.constants.W_OK | import_node_fs18.constants.X_OK);
     return { ready: true };
   } catch (error61) {
     const code = errnoCode(error61) ?? "";
@@ -65797,8 +66096,8 @@ async function admitDefaultWorkspace(spec, context, skills) {
   const { env } = context;
   const path4 = resolveAlanDefaultWorkspacePath(env.HOME || env.USERPROFILE || (0, import_node_os9.homedir)());
   try {
-    await (0, import_promises57.mkdir)(path4, { recursive: true, mode: 448 });
-    await (0, import_promises57.access)(path4, import_node_fs18.constants.R_OK | import_node_fs18.constants.W_OK | import_node_fs18.constants.X_OK);
+    await (0, import_promises59.mkdir)(path4, { recursive: true, mode: 448 });
+    await (0, import_promises59.access)(path4, import_node_fs18.constants.R_OK | import_node_fs18.constants.W_OK | import_node_fs18.constants.X_OK);
     return {
       kind: "admitted",
       spec: { ...spec, projectPath: path4 },
@@ -65814,6 +66113,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;
@@ -65825,6 +66134,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 };
@@ -65869,7 +66179,10 @@ function createHolderWorkspace(machine, clock, log) {
       env: machine.env,
       git,
       platform: platform3,
-      skills: skillsLayout(machine.stateDir),
+      skills: skillsLayout(
+        machine.stateDir,
+        machine.env.HOME || machine.env.USERPROFILE || (0, import_node_os9.homedir)()
+      ),
       approvedRoots: async () => {
         const approved = await openApprovedPaths({
           file: (0, import_node_path58.join)(machine.stateDir, "workspaces.json"),
@@ -65913,7 +66226,7 @@ async function respondToTurn(runningRunId, gate, driver, request2) {
 }
 
 // src/holder/session-facts.ts
-var import_promises58 = require("fs/promises");
+var import_promises60 = require("fs/promises");
 var CLI_RSS_CACHE_MS = 1e4;
 var LOGIN_PROBLEM_PREFIX = "cli.auth.";
 function isLoginFailure(result) {
@@ -65939,8 +66252,8 @@ function createSessionFacts(options) {
     const path4 = await resolveCommandOnPath(command, env, platform3);
     if (path4 === null) return null;
     try {
-      const real = await (0, import_promises58.realpath)(path4);
-      const info = await (0, import_promises58.stat)(real);
+      const real = await (0, import_promises60.realpath)(path4);
+      const info = await (0, import_promises60.stat)(real);
       return { command, key: `${real}:${info.ino}:${info.size}:${info.mtimeMs}` };
     } catch {
       return null;
@@ -66027,12 +66340,12 @@ function createSessionFacts(options) {
 init_acp2();
 
 // src/run-log/complete.ts
-var import_node_crypto25 = require("crypto");
+var import_node_crypto27 = require("crypto");
 var import_node_fs19 = require("fs");
 var import_node_path60 = require("path");
 
 // src/run-log/directory.ts
-var import_promises59 = require("fs/promises");
+var import_promises61 = require("fs/promises");
 var import_node_path59 = require("path");
 init_runtime_v2();
 init_zod();
@@ -66052,7 +66365,7 @@ function runDirectory(runsDir, runId) {
 }
 async function isRunClaimed(runsDir, runId) {
   try {
-    return (await (0, import_promises59.stat)(runDirectory(runsDir, runId).log)).size > 0;
+    return (await (0, import_promises61.stat)(runDirectory(runsDir, runId).log)).size > 0;
   } catch (error61) {
     if (errnoCode(error61) === "ENOENT") return false;
     throw error61;
@@ -66061,7 +66374,7 @@ async function isRunClaimed(runsDir, runId) {
 
 // src/run-log/complete.ts
 function writeLogFile(path4, dir, text2) {
-  const temp = (0, import_node_path60.join)(dir, `.log.${(0, import_node_crypto25.randomUUID)()}.tmp`);
+  const temp = (0, import_node_path60.join)(dir, `.log.${(0, import_node_crypto27.randomUUID)()}.tmp`);
   const fd = (0, import_node_fs19.openSync)(temp, "wx", 384);
   try {
     (0, import_node_fs19.writeSync)(fd, text2);
@@ -66090,7 +66403,7 @@ async function writeCompleteRunLog(runsDir, meta3, records) {
 }
 
 // src/run-log/reader.ts
-var import_promises60 = require("fs/promises");
+var import_promises62 = require("fs/promises");
 init_runtime_v2();
 
 // src/run-log/tail.ts
@@ -66113,7 +66426,7 @@ function firstRecordLength(bytes) {
   return bytes.indexOf(RUN_LOG_RECORD_SEPARATOR) + 1;
 }
 async function openRunLogReader(path4) {
-  const handle = await (0, import_promises60.open)(path4, "r");
+  const handle = await (0, import_promises62.open)(path4, "r");
   const readAt = async (position, length) => {
     const buffer = Buffer.alloc(length);
     const { bytesRead } = await handle.read(buffer, 0, length, position);
@@ -66147,7 +66460,7 @@ async function openRunLogReader(path4) {
   };
 }
 async function readLastRecord(path4) {
-  const handle = await (0, import_promises60.open)(path4, "r").catch(() => null);
+  const handle = await (0, import_promises62.open)(path4, "r").catch(() => null);
   if (handle === null) return null;
   try {
     const { size } = await handle.stat();
@@ -66493,13 +66806,13 @@ var TASK_UNSUPPORTED = {
   reason: "unsupported",
   message: "This agent cannot stop one background task."
 };
-function sha2563(value2) {
-  return (0, import_node_crypto26.createHash)("sha256").update(value2).digest("hex");
+function sha2564(value2) {
+  return (0, import_node_crypto28.createHash)("sha256").update(value2).digest("hex");
 }
 function tokenMatches(expected, presented) {
-  const a = Buffer.from(sha2563(expected), "hex");
-  const b = Buffer.from(sha2563(presented), "hex");
-  return (0, import_node_crypto26.timingSafeEqual)(a, b);
+  const a = Buffer.from(sha2564(expected), "hex");
+  const b = Buffer.from(sha2564(presented), "hex");
+  return (0, import_node_crypto28.timingSafeEqual)(a, b);
 }
 async function runHolder({
   launch,
@@ -66536,7 +66849,7 @@ async function runHolder({
       startedAt: identity.startedAt,
       ...identity.command === void 0 ? {} : { command: identity.command },
       endpoint: launch.endpoint,
-      tokenSha256: sha2563(launch.token),
+      tokenSha256: sha2564(launch.token),
       state: holder.state,
       runId: holder.runId,
       updatedAt: clock.now()
@@ -66807,7 +67120,7 @@ var DEFAULT_MAX_ACTIVE_RUNS = 32;
 var HOLDER_BUSY = "busy";
 async function listIds(dir, schema) {
   const ids = [];
-  for (const name of await (0, import_promises61.readdir)(dir).catch(() => [])) {
+  for (const name of await (0, import_promises63.readdir)(dir).catch(() => [])) {
     const parsed = schema.safeParse(name);
     if (parsed.success) ids.push(parsed.data);
   }
@@ -66863,7 +67176,7 @@ async function openSessions(deps) {
     await reapLeftoverEngines(engineRecordsPath(dir), { clock, log, conversationId }).catch(
       (error61) => log.warn("sessions.engine_reap_failed", { conversationId, error: error61 })
     );
-    await (0, import_promises61.rm)(dir, { recursive: true, force: true });
+    await (0, import_promises63.rm)(dir, { recursive: true, force: true });
   };
   const retireIfGone = async (conversationId) => {
     const files = sessionFiles(paths, conversationId);
@@ -66951,7 +67264,7 @@ async function openSessions(deps) {
       log.info("sessions.reattached", { conversationId });
       return;
     }
-    if (alive) await (0, import_promises61.rm)(files.dir, { recursive: true, force: true });
+    if (alive) await (0, import_promises63.rm)(files.dir, { recursive: true, force: true });
     else await discardSession(conversationId);
   };
   const busyRunIds = async () => {
@@ -66982,8 +67295,8 @@ async function openSessions(deps) {
       protocol: HOLDER_PROTOCOL,
       conversationId,
       machineId: deps.machineId,
-      endpoint: ipcEndpoint(paths.sockets, (0, import_node_crypto27.randomUUID)().slice(0, 8)),
-      token: (0, import_node_crypto27.randomBytes)(32).toString("hex"),
+      endpoint: ipcEndpoint(paths.sockets, (0, import_node_crypto29.randomUUID)().slice(0, 8)),
+      token: (0, import_node_crypto29.randomBytes)(32).toString("hex"),
       runsDir: paths.runs,
       statusPath: files.status
     };
@@ -67009,7 +67322,7 @@ async function openSessions(deps) {
     const meta3 = await readRunMeta(dir.meta);
     const last = await readLastRecord(dir.log);
     if (meta3 === null || last === null) return null;
-    const logged = await (0, import_promises61.stat)(dir.log).catch((error61) => {
+    const logged = await (0, import_promises63.stat)(dir.log).catch((error61) => {
       if (errnoCode(error61) === "ENOENT") return null;
       throw error61;
     });
@@ -67389,7 +67702,7 @@ function takeEnrollmentCodeFromEnv(env = process.env) {
 }
 
 // src/cli/context.ts
-var import_promises62 = require("fs/promises");
+var import_promises64 = require("fs/promises");
 var import_node_os12 = require("os");
 var import_node_path65 = require("path");
 var DESKTOP_BUNDLE_IDS = {
@@ -67439,7 +67752,7 @@ async function installedServiceSpec(ctx) {
   const spec = serviceSpec(ctx);
   if (ctx.config.host === "app") return spec;
   const layout = installLayout(ctx.config.installDir, ctx.config.profile);
-  const installed = await (0, import_promises62.access)(layout.launcher).then(
+  const installed = await (0, import_promises64.access)(layout.launcher).then(
     () => true,
     () => false
   );
@@ -67567,7 +67880,7 @@ var manifestRevisionSchema = external_exports.object({ revision: external_export
 async function manifestRevision(path4) {
   let raw;
   try {
-    raw = JSON.parse(await (0, import_promises63.readFile)(path4, "utf8"));
+    raw = JSON.parse(await (0, import_promises65.readFile)(path4, "utf8"));
   } catch (error61) {
     throw new RuntimeFault("invalid_file", `Cannot read the skill manifest at ${path4}`, {
       cause: error61
@@ -67585,7 +67898,7 @@ async function runSkills(argv) {
     case "scan":
       writeJson({
         status: "failed",
-        attemptId: (0, import_node_crypto28.randomUUID)(),
+        attemptId: (0, import_node_crypto30.randomUUID)(),
         retainedInventoryRevision: null,
         diagnostics: [
           { code: "RUNTIME_SKILL_SCAN_UNSUPPORTED", message: SKILLS_SYNCED_BY_RUNTIME }
@@ -67601,7 +67914,7 @@ async function runSkills(argv) {
         );
       }
       writeJson({
-        attemptId: (0, import_node_crypto28.randomUUID)(),
+        attemptId: (0, import_node_crypto30.randomUUID)(),
         desiredRevision: await manifestRevision(manifest),
         skills: []
       });
@@ -67621,7 +67934,7 @@ async function runSkills(argv) {
 }
 
 // src/cli/commands/doctor.ts
-var import_promises66 = require("fs/promises");
+var import_promises68 = require("fs/promises");
 var import_node_path69 = require("path");
 init_runtime_v2();
 
@@ -67799,11 +68112,11 @@ async function authorizeDevice(input2) {
 }
 
 // src/identity/enroll.ts
-var import_promises64 = require("fs/promises");
+var import_promises66 = require("fs/promises");
 init_runtime_v2();
 
 // src/identity/installation.ts
-var import_node_crypto29 = require("crypto");
+var import_node_crypto31 = require("crypto");
 var import_node_path66 = require("path");
 init_zod();
 var installationFileSchema = external_exports.object({
@@ -67816,7 +68129,7 @@ async function ensureInstallationId(paths) {
   const path4 = installationPath(paths);
   const existing = await readJsonFile(path4, installationFileSchema);
   if (existing.kind === "ok") return existing.value.installationId;
-  const created = { installationId: (0, import_node_crypto29.randomUUID)() };
+  const created = { installationId: (0, import_node_crypto31.randomUUID)() };
   await writeJsonFileAtomic(path4, created);
   return created.installationId;
 }
@@ -67903,12 +68216,12 @@ async function enrollFromGrantFile(input2) {
     clock: input2.clock,
     access: input2.access
   });
-  await (0, import_promises64.rm)(input2.grantPath, { force: true });
+  await (0, import_promises66.rm)(input2.grantPath, { force: true });
   return machine;
 }
 
 // src/identity/migrate-v1.ts
-var import_promises65 = require("fs/promises");
+var import_promises67 = require("fs/promises");
 var import_node_path67 = require("path");
 init_runtime_v2();
 init_zod();
@@ -67959,8 +68272,8 @@ async function scrubLegacyInstall(install2) {
   const scrubbed = { ...install2.config, migratedToRuntimeV2: true };
   for (const key of SCRUBBED_KEYS) delete scrubbed[key];
   await writeJsonFileAtomic(`${install2.configPath}.migrated-v1`, scrubbed);
-  await (0, import_promises65.rm)(install2.configPath, { force: true });
-  await (0, import_promises65.rm)(install2.ownerLeasePath, { force: true });
+  await (0, import_promises67.rm)(install2.configPath, { force: true });
+  await (0, import_promises67.rm)(install2.ownerLeasePath, { force: true });
 }
 async function exchangeCredential(deps) {
   const { config: config2 } = deps.install;
@@ -68369,7 +68682,7 @@ async function probeHolder(dir, conversationId) {
   }
 }
 async function holdersCheck(ctx) {
-  const names = await (0, import_promises66.readdir)(ctx.paths.sessions).catch(() => []);
+  const names = await (0, import_promises68.readdir)(ctx.paths.sessions).catch(() => []);
   const holders = (await Promise.all(names.map((name) => probeHolder((0, import_node_path69.join)(ctx.paths.sessions, name), name)))).filter((facts) => facts !== null);
   const dead = holders.filter((holder) => !holder.alive).length;
   return check2(
@@ -68381,7 +68694,7 @@ async function holdersCheck(ctx) {
 }
 async function freeBytesAt(path4) {
   try {
-    const stats = await (0, import_promises66.statfs)(path4);
+    const stats = await (0, import_promises68.statfs)(path4);
     return { path: path4, freeBytes: stats.bavail * stats.bsize };
   } catch (error61) {
     const parent = (0, import_node_path69.dirname)(path4);
@@ -68520,7 +68833,7 @@ async function runDoctor(argv, context = cliContext) {
 }
 
 // src/cli/commands/git-credential.ts
-var import_promises67 = require("fs/promises");
+var import_promises69 = require("fs/promises");
 var import_node_net4 = require("net");
 var MAX_RESPONSE_BYTES = 64 * 1024;
 async function readAll(stream) {
@@ -68630,7 +68943,7 @@ async function configure(argv) {
 }
 async function configureGitGateway(config2, gatewayUrl, signal) {
   const { launcher } = installLayout(config2.installDir, config2.profile);
-  const installed = await (0, import_promises67.access)(launcher).then(
+  const installed = await (0, import_promises69.access)(launcher).then(
     () => true,
     () => false
   );
@@ -68658,6 +68971,7 @@ async function runGitCredential(argv) {
 
 // src/cli/commands/hold.ts
 var import_node_path70 = require("path");
+init_agent2();
 init_runtime_v2();
 async function machineAccess(paths, log, conversationId, transport) {
   const initial = await loadStoredAccess(paths).catch(
@@ -68690,7 +69004,14 @@ async function machineAccess(paths, log, conversationId, transport) {
       return (await api()).fetchProviderCredential(runId, signal);
     }
   };
-  return { source, managedMcp };
+  const codexCredentials = {
+    refresh: async (runId, rejectedAccessTokenSha256) => (await api()).refreshCodexCredential(
+      runId,
+      rejectedAccessTokenSha256 === void 0 ? {} : { rejectedAccessTokenSha256 },
+      new AbortController().signal
+    )
+  };
+  return { source, managedMcp, codexCredentials };
 }
 async function runHold(argv) {
   var _stack = [];
@@ -68718,14 +69039,26 @@ async function runHold(argv) {
     );
     const transport = __using(_stack, createHttpTransport());
     const access7 = await machineAccess(paths, log, launch.value.conversationId, transport);
+    const credentialPath = (0, import_node_path70.join)(paths.tmp, "mcp", `${launch.value.conversationId}.json`);
+    const managedMcp = __using(_stack, access7.managedMcp === void 0 ? void 0 : createHelperMcpAccess({
+      managedMcp: access7.managedMcp,
+      conversationId: launch.value.conversationId,
+      credentialPath
+    }), true);
+    const providerEnvironment2 = access7.managedMcp === void 0 ? cliEnvironment : {
+      ...cliEnvironment,
+      [ALAN_MCP_URL_ENV]: access7.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,
-        ...access7.managedMcp === void 0 ? {} : { managedMcp: access7.managedMcp }
+        ...managedMcp === void 0 ? {} : { managedMcp },
+        codexCredentials: access7.codexCredentials
       }),
       clock: systemClock,
       log,
@@ -68740,7 +69073,8 @@ async function runHold(argv) {
   } catch (_) {
     var _error = _, _hasError = true;
   } finally {
-    __callDispose(_stack, _error, _hasError);
+    var _promise2 = __callDispose(_stack, _error, _hasError);
+    _promise2 && await _promise2;
   }
 }
 
@@ -68813,7 +69147,7 @@ async function runHook(argv, overrides = {}) {
 }
 
 // src/cli/commands/ingestion-hooks.ts
-var import_promises68 = require("fs/promises");
+var import_promises70 = require("fs/promises");
 var CODEX_TRUST_NOTE = "Codex runs new hooks only after you review them: open /hooks in Codex.";
 function isAction(value2) {
   return value2 === "enable" || value2 === "disable" || value2 === "status";
@@ -68836,7 +69170,7 @@ function errorMessage2(error61) {
   return error61 instanceof Error ? error61.message : String(error61);
 }
 async function exists5(path4) {
-  return (0, import_promises68.access)(path4).then(
+  return (0, import_promises70.access)(path4).then(
     () => true,
     () => false
   );
@@ -69195,7 +69529,7 @@ async function runToken(argv, signal) {
 }
 
 // src/cli/commands/logout.ts
-var import_promises69 = require("fs/promises");
+var import_promises71 = require("fs/promises");
 var import_node_path74 = require("path");
 init_runtime_v2();
 var RUNTIME_EXIT_WAIT_MS = 35e3;
@@ -69255,7 +69589,7 @@ async function stopHolder(launch, deps, outcome2) {
 }
 async function stopHeldRuns(ctx, deps, outcome2 = "aborted") {
   const stopped = [];
-  for (const name of await (0, import_promises69.readdir)(ctx.paths.sessions).catch(() => [])) {
+  for (const name of await (0, import_promises71.readdir)(ctx.paths.sessions).catch(() => [])) {
     const launch = await readJsonFile(
       (0, import_node_path74.join)(ctx.paths.sessions, name, "launch.json"),
       holderLaunchSchema
@@ -69294,7 +69628,7 @@ async function forgetMachineLocally(ctx) {
   const machine = await readMachineFile(ctx.paths);
   if (machine === null) return;
   await credentialStoreFor(ctx.paths, machine.credentialStore, ctx.access).clear();
-  await (0, import_promises69.rm)(ctx.paths.machine, { force: true });
+  await (0, import_promises71.rm)(ctx.paths.machine, { force: true });
 }
 async function runLogout(argv, signal) {
   var _stack = [];
@@ -69382,18 +69716,18 @@ function createRunAppends() {
 }
 
 // src/local-api/server.ts
-var import_node_crypto31 = require("crypto");
-var import_promises70 = require("fs/promises");
+var import_node_crypto33 = require("crypto");
+var import_promises72 = require("fs/promises");
 var import_node_http4 = require("http");
 var import_node_path75 = require("path");
 
 // src/local-api/guard.ts
-var import_node_crypto30 = require("crypto");
+var import_node_crypto32 = require("crypto");
 var ALLOWED = { kind: "allowed" };
 function tokenMatches2(expected, header) {
   if (header === void 0 || !header.startsWith("Bearer ")) return false;
   const presented = Buffer.from(header.slice("Bearer ".length));
-  return presented.length === expected.length && (0, import_node_crypto30.timingSafeEqual)(presented, expected);
+  return presented.length === expected.length && (0, import_node_crypto32.timingSafeEqual)(presented, expected);
 }
 function isBrowserReachable(req, allowedHosts) {
   if (req.headers.origin !== void 0 || req.headers.referer !== void 0) return true;
@@ -70038,7 +70372,7 @@ async function serveLocalApi(deps) {
   server.keepAliveTimeout = KEEP_ALIVE_TIMEOUT_MS;
   server.maxConnections = HARD_MAX_CONNECTIONS;
   const port = await listenOnLoopback(server);
-  const token = (0, import_node_crypto31.randomBytes)(32).toString("base64url");
+  const token = (0, import_node_crypto33.randomBytes)(32).toString("base64url");
   const guard = createRequestGuard({ token, port, rateLimit: limits.rateLimit, clock });
   const appAttachments = createAppAttachments(clock);
   const routeDeps = {
@@ -70122,7 +70456,7 @@ async function serveLocalApi(deps) {
       await watchedStatus[Symbol.asyncDispose]();
       const current = await readJsonFile(discoveryPath, localApiDiscoverySchema);
       if (current.kind === "ok" && current.value.token === token) {
-        await (0, import_promises70.rm)(discoveryPath, { force: true });
+        await (0, import_promises72.rm)(discoveryPath, { force: true });
       }
       await closeServer(server);
       log.info("local_api.closed", {});
@@ -73875,7 +74209,7 @@ function refusalFailure(refusal2) {
 }
 
 // src/link/probe.ts
-var import_promises71 = require("dns/promises");
+var import_promises73 = require("dns/promises");
 var import_node_net5 = require("net");
 var import_node_tls2 = require("tls");
 var PROBE_TIMEOUT_MS4 = 5e3;
@@ -73911,7 +74245,7 @@ async function connectOnce(url3, clock) {
 }
 async function probeEndpoint(url3, clock) {
   try {
-    await (0, import_promises71.lookup)(url3.hostname);
+    await (0, import_promises73.lookup)(url3.hostname);
   } catch (error61) {
     const reason = classifyTransportFailure(error61);
     return reason === "other" ? "dns" : reason;
@@ -74213,9 +74547,9 @@ function planReconcile(desired, held) {
 }
 
 // src/reconciler/desired-sync.ts
-var import_node_crypto32 = require("crypto");
+var import_node_crypto34 = require("crypto");
 function fingerprintOf(desired) {
-  return (0, import_node_crypto32.createHash)("sha256").update(JSON.stringify(desired)).digest("hex");
+  return (0, import_node_crypto34.createHash)("sha256").update(JSON.stringify(desired)).digest("hex");
 }
 var FAILED_READ_RETRY_MS = 3e4;
 function createDesiredSync(deps) {
@@ -74352,7 +74686,7 @@ function createReconciler(host, lifecycle, log, signal) {
 }
 
 // src/uploader/index.ts
-var import_promises72 = require("fs/promises");
+var import_promises74 = require("fs/promises");
 init_runtime_v2();
 init_zod();
 var RETRY_DELAYS_MS = [250, 500, 1e3, 2e3, 5e3, 1e4, 3e4];
@@ -74493,7 +74827,7 @@ function startUploader({ api, runsDir, clock, log }) {
     active.set(runId, task);
   };
   const sweep2 = async () => {
-    for (const name of await (0, import_promises72.readdir)(runsDir).catch(() => [])) {
+    for (const name of await (0, import_promises74.readdir)(runsDir).catch(() => [])) {
       const runId = runIdSchema.safeParse(name);
       if (runId.success) run2(runId.data);
     }
@@ -74503,18 +74837,18 @@ function startUploader({ api, runsDir, clock, log }) {
     const dir = runDirectory(runsDir, runId);
     const progress = await readJsonFile(dir.upload, uploadProgressSchema);
     if (progress.kind !== "ok" || !progress.value.sealed) return false;
-    const sealedAt = (await (0, import_promises72.stat)(dir.upload)).mtimeMs;
+    const sealedAt = (await (0, import_promises74.stat)(dir.upload)).mtimeMs;
     if (clock.now() - sealedAt < options.sealedForMs) return false;
     return (await readLastRecord(dir.log))?.update.sessionUpdate === "_alan/run.ended";
   };
   const prune = async (options) => {
     let removed = 0;
-    for (const name of await (0, import_promises72.readdir)(runsDir).catch(() => [])) {
+    for (const name of await (0, import_promises74.readdir)(runsDir).catch(() => [])) {
       const runId = runIdSchema.safeParse(name);
       if (!runId.success) continue;
       try {
         if (!await isPrunable(runId.data, options)) continue;
-        await (0, import_promises72.rm)(runDirectory(runsDir, runId.data).dir, { recursive: true, force: true });
+        await (0, import_promises74.rm)(runDirectory(runsDir, runId.data).dir, { recursive: true, force: true });
         removed += 1;
       } catch (error61) {
         log.warn("upload.prune_failed", { runId: runId.data, error: error61 });
@@ -75814,17 +76148,17 @@ async function runServiceCommand(argv, ctx = cliContext()) {
 }
 
 // src/cli/commands/upgrade.ts
-var import_promises73 = require("fs/promises");
+var import_promises75 = require("fs/promises");
 var import_node_path79 = require("path");
 function isNotNewer(version2, installed) {
   return installed !== null && isReleaseVersion(version2) && isReleaseVersion(installed) && compareVersions(version2, installed) <= 0;
 }
 async function installFromSource(source) {
   const { layout, from, ifNewer } = source;
-  const isTarball = (await (0, import_promises73.stat)(from)).isFile();
+  const isTarball = (await (0, import_promises75.stat)(from)).isFile();
   const downloads = (0, import_node_path79.join)(layout.root, ".downloads");
-  if (isTarball) await (0, import_promises73.mkdir)(downloads, { recursive: true, mode: 448 });
-  const scratch = isTarball ? await (0, import_promises73.mkdtemp)((0, import_node_path79.join)(downloads, "upgrade-")) : null;
+  if (isTarball) await (0, import_promises75.mkdir)(downloads, { recursive: true, mode: 448 });
+  const scratch = isTarball ? await (0, import_promises75.mkdtemp)((0, import_node_path79.join)(downloads, "upgrade-")) : null;
   try {
     const sourceDir = scratch === null ? from : await extractPackageTarball(from, scratch);
     const version2 = await readPackageVersion(sourceDir);
@@ -75832,7 +76166,7 @@ async function installFromSource(source) {
     if (ifNewer && isNotNewer(version2, installed)) return { kind: "skipped", version: version2, installed };
     return { kind: "installed", ...await installVersion(layout, sourceDir) };
   } finally {
-    if (scratch !== null) await (0, import_promises73.rm)(scratch, { recursive: true, force: true });
+    if (scratch !== null) await (0, import_promises75.rm)(scratch, { recursive: true, force: true });
   }
 }
 async function runUpgrade(argv) {