@alan-ai-hq/agent-manager-linux-arm64 0.1.146 → 0.1.148

package/alan-holder.cjs

@@ -12529,7 +12529,7 @@ function compileValidator(schema, parser) {
 function compile(schema, options) {
   try {
     const parser = compileFn(schema);
-    const clone2 = clone(schema);
+    const clone3 = clone(schema);
     const liveRun = schema._zod.run;
     const originalRun = liveRun.__originalRun ?? liveRun;
     const wrapped = (payload, ctx) => {
@@ -12549,12 +12549,12 @@ function compile(schema, options) {
       return originalRun(payload, ctx);
     };
     wrapped.__originalRun = originalRun;
-    clone2._zod.bag.fallbackRun = originalRun;
-    clone2._zod.bag.validator = compileValidator(schema, parser);
-    clone2._zod.run = wrapped;
+    clone3._zod.bag.fallbackRun = originalRun;
+    clone3._zod.bag.validator = compileValidator(schema, parser);
+    clone3._zod.run = wrapped;
     if (!liveRun.__originalRun)
-      installCompiledUserMethods(clone2, schema, parser);
-    return clone2;
+      installCompiledUserMethods(clone3, schema, parser);
+    return clone3;
   } catch (err) {
     if (options?.strict)
       throw err;
@@ -19060,21 +19060,21 @@ function visit(schema, fnOrHandlers) {
       case "object": {
         const oldShape = def.shape;
         const keys = Object.keys(oldShape);
-        let changed = false;
+        let changed2 = false;
         const newShape = {};
         for (const k of keys) {
           const mapped = run(oldShape[k]);
           if (mapped !== oldShape[k])
-            changed = true;
+            changed2 = true;
           newShape[k] = mapped;
         }
         let newCatchall = def.catchall;
         if (def.catchall) {
           newCatchall = run(def.catchall);
           if (newCatchall !== def.catchall)
-            changed = true;
+            changed2 = true;
         }
-        return changed ? clone(s, { ...def, shape: newShape, catchall: newCatchall }) : s;
+        return changed2 ? clone(s, { ...def, shape: newShape, catchall: newCatchall }) : s;
       }
       case "array": {
         const mapped = run(def.element);
@@ -19082,21 +19082,21 @@ function visit(schema, fnOrHandlers) {
       }
       case "tuple": {
         const oldItems = def.items;
-        let changed = false;
+        let changed2 = false;
         const newItems = [];
         for (const item of oldItems) {
           const mapped = run(item);
           if (mapped !== item)
-            changed = true;
+            changed2 = true;
           newItems.push(mapped);
         }
         let newRest = def.rest;
         if (def.rest) {
           newRest = run(def.rest);
           if (newRest !== def.rest)
-            changed = true;
+            changed2 = true;
         }
-        return changed ? clone(s, { ...def, items: newItems, rest: newRest }) : s;
+        return changed2 ? clone(s, { ...def, items: newItems, rest: newRest }) : s;
       }
       case "record":
       case "map": {
@@ -19110,15 +19110,15 @@ function visit(schema, fnOrHandlers) {
       }
       case "union": {
         const oldOptions = def.options;
-        let changed = false;
+        let changed2 = false;
         const newOptions = [];
         for (const opt of oldOptions) {
           const mapped = run(opt);
           if (mapped !== opt)
-            changed = true;
+            changed2 = true;
           newOptions.push(mapped);
         }
-        return changed ? clone(s, { ...def, options: newOptions }) : s;
+        return changed2 ? clone(s, { ...def, options: newOptions }) : s;
       }
       case "intersection": {
         const newLeft = run(def.left);
@@ -19568,6 +19568,259 @@ var init_zod = __esm({
   }
 });
 
+// ../shared/dist/runtime-v2/workspace.js
+var UNSAFE_LINE, CONTROL_CHARACTERS, machinePathSchema, gitShaSchema, gitBranchSchema, gitRemoteNameSchema, gitRemoteUrlSchema, statusFingerprintSchema, singleLineSchema, operationIdSchema, repoTargetShape, trustedRepoTargetShape, workspaceStatusRequestSchema, gitStatusRequestSchema, gitCheckpointRequestSchema, gitPushRequestSchema, gitPrepareCheckoutRequestSchema, gitVerifyHeadRequestSchema, workspaceQueryRequestSchema, WORKSPACE_QUERY_METHODS, workspaceQueryMethodSchema, workspaceStatusValueSchema, gitStatusValueSchema, gitCheckpointValueSchema, gitPushValueSchema, gitPrepareCheckoutValueSchema, gitVerifyHeadValueSchema, WORKSPACE_QUERY_ERROR_CODES, workspaceQueryErrorCodeSchema, publishedGitReceiptSchema, workspaceQueryErrorSchema, resultEnvelopeSchema;
+var init_workspace = __esm({
+  "../shared/dist/runtime-v2/workspace.js"() {
+    "use strict";
+    init_zod();
+    UNSAFE_LINE = /[\0\r\n]/;
+    CONTROL_CHARACTERS = /[\x00-\x1f\x7f]/;
+    machinePathSchema = external_exports.string().min(1).max(4096).refine((value) => !UNSAFE_LINE.test(value), "path contains unsafe characters");
+    gitShaSchema = external_exports.string().regex(/^[0-9a-f]{40}(?:[0-9a-f]{24})?$/, "not a Git SHA");
+    gitBranchSchema = external_exports.string().min(1).max(255).refine((value) => !value.startsWith("-") && !value.startsWith("+") && !value.includes("..") && !value.includes("@{") && !value.endsWith(".lock") && !/[\s~^:?*[\\]/.test(value) && !CONTROL_CHARACTERS.test(value), "not a safe Git branch name");
+    gitRemoteNameSchema = external_exports.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/, "not a safe Git remote name");
+    gitRemoteUrlSchema = external_exports.string().min(1).max(2048).refine((value) => !UNSAFE_LINE.test(value), "remote URL contains unsafe characters");
+    statusFingerprintSchema = external_exports.string().regex(/^[0-9a-f]{64}$/, "not a status fingerprint");
+    singleLineSchema = (max) => external_exports.string().min(1).max(max).refine((value) => !CONTROL_CHARACTERS.test(value), "contains control characters");
+    operationIdSchema = external_exports.guid();
+    repoTargetShape = {
+      path: machinePathSchema,
+      expectedRepoRoot: machinePathSchema.optional(),
+      projectPath: machinePathSchema.optional()
+    };
+    trustedRepoTargetShape = {
+      path: machinePathSchema,
+      expectedRepoRoot: machinePathSchema,
+      projectPath: machinePathSchema
+    };
+    workspaceStatusRequestSchema = external_exports.object({
+      method: external_exports.literal("workspace.status"),
+      path: machinePathSchema
+    });
+    gitStatusRequestSchema = external_exports.object({
+      method: external_exports.literal("git.status"),
+      ...repoTargetShape,
+      remote: gitRemoteNameSchema.default("origin"),
+      expectedRemoteUrl: gitRemoteUrlSchema.optional()
+    });
+    gitCheckpointRequestSchema = external_exports.object({
+      method: external_exports.literal("git.checkpoint"),
+      operationId: operationIdSchema,
+      ...trustedRepoTargetShape,
+      switchId: singleLineSchema(200),
+      repoKey: singleLineSchema(256),
+      expectedHeadSha: gitShaSchema,
+      expectedBranch: gitBranchSchema,
+      expectedStatusFingerprint: statusFingerprintSchema,
+      expectedProposedTreeSha: gitShaSchema,
+      /** Goes to `git commit-tree` over stdin; newlines carry trailers, NUL is unrepresentable. */
+      commitMessage: external_exports.string().min(1).max(64 * 1024).refine((value) => !value.includes("\0") && value.trim().length > 0, "invalid commit message"),
+      authorName: singleLineSchema(256),
+      authorEmail: singleLineSchema(320).refine((value) => !/[<>]/.test(value), "invalid email")
+    });
+    gitPushRequestSchema = external_exports.object({
+      method: external_exports.literal("git.push"),
+      operationId: operationIdSchema,
+      ...trustedRepoTargetShape,
+      remote: gitRemoteNameSchema.default("origin"),
+      expectedRemoteUrl: gitRemoteUrlSchema,
+      expectedHeadSha: gitShaSchema,
+      expectedBranch: gitBranchSchema
+    });
+    gitPrepareCheckoutRequestSchema = external_exports.object({
+      method: external_exports.literal("git.prepare_checkout"),
+      operationId: operationIdSchema,
+      ...trustedRepoTargetShape,
+      remote: gitRemoteNameSchema.default("origin"),
+      expectedRemoteUrl: gitRemoteUrlSchema,
+      branch: gitBranchSchema,
+      targetSha: gitShaSchema
+    });
+    gitVerifyHeadRequestSchema = external_exports.object({
+      method: external_exports.literal("git.verify_head"),
+      ...trustedRepoTargetShape,
+      expectedSha: gitShaSchema
+    });
+    workspaceQueryRequestSchema = external_exports.discriminatedUnion("method", [
+      workspaceStatusRequestSchema,
+      gitStatusRequestSchema,
+      gitCheckpointRequestSchema,
+      gitPushRequestSchema,
+      gitPrepareCheckoutRequestSchema,
+      gitVerifyHeadRequestSchema
+    ]);
+    WORKSPACE_QUERY_METHODS = [
+      "workspace.status",
+      "git.status",
+      "git.checkpoint",
+      "git.push",
+      "git.prepare_checkout",
+      "git.verify_head"
+    ];
+    workspaceQueryMethodSchema = external_exports.enum(WORKSPACE_QUERY_METHODS);
+    workspaceStatusValueSchema = external_exports.object({
+      repoRoot: machinePathSchema,
+      /** null: detached HEAD. */
+      branch: external_exports.string().nullable(),
+      /** null: unborn branch. */
+      headSha: gitShaSchema.nullable(),
+      dirty: external_exports.boolean(),
+      filesChanged: external_exports.number().int().nonnegative(),
+      ahead: external_exports.number().int().nonnegative().nullable(),
+      behind: external_exports.number().int().nonnegative().nullable(),
+      hasUpstream: external_exports.boolean()
+    });
+    gitStatusValueSchema = workspaceStatusValueSchema.extend({
+      remoteUrl: gitRemoteUrlSchema.nullable(),
+      upstream: external_exports.string().nullable(),
+      statusFingerprint: statusFingerprintSchema,
+      proposedTreeSha: gitShaSchema
+    });
+    gitCheckpointValueSchema = external_exports.object({
+      repoRoot: machinePathSchema,
+      sha: gitShaSchema,
+      replayed: external_exports.boolean()
+    });
+    gitPushValueSchema = external_exports.object({
+      repoRoot: machinePathSchema,
+      pushedSha: gitShaSchema,
+      branch: gitBranchSchema,
+      remote: gitRemoteNameSchema,
+      /** The remote already had the SHA before this push. */
+      replayed: external_exports.boolean()
+    });
+    gitPrepareCheckoutValueSchema = external_exports.object({
+      repoRoot: machinePathSchema,
+      branch: gitBranchSchema,
+      headSha: gitShaSchema,
+      replayed: external_exports.boolean()
+    });
+    gitVerifyHeadValueSchema = external_exports.object({
+      repoRoot: machinePathSchema,
+      headSha: gitShaSchema,
+      verified: external_exports.literal(true)
+    });
+    WORKSPACE_QUERY_ERROR_CODES = [
+      "path_not_approved",
+      "workspace_busy",
+      "workspace_repository_mismatch",
+      "operation_in_progress",
+      "git_not_installed",
+      "runtime_operation_failed",
+      "invalid_git_request",
+      "repository_not_found",
+      "repository_path_changed",
+      "repository_path_not_authorized",
+      "path_canonicalization_failed",
+      "git_status_unreadable",
+      "git_operation_failed",
+      "git_network_timeout",
+      "git_output_limit_exceeded",
+      "git_remote_unavailable",
+      "git_fetch_failed",
+      "git_push_failed",
+      "remote_url_credentials_rejected",
+      "remote_url_mismatch",
+      "source_changed_since_approval",
+      "source_dirty_after_checkpoint",
+      "source_head_unreadable",
+      "checkpoint_empty",
+      "checkpoint_tree_unavailable",
+      "checkpoint_commit_failed",
+      "checkpoint_lock_unavailable",
+      "checkpoint_index_sync_failed",
+      "push_verification_failed",
+      "target_checkout_dirty",
+      "target_checkout_failed",
+      "target_branch_in_use",
+      "target_branch_diverged",
+      "target_fast_forward_failed",
+      "target_verification_failed",
+      "target_sha_mismatch",
+      "target_sha_unavailable",
+      "target_head_unreadable",
+      "verify_head_mismatch"
+    ];
+    workspaceQueryErrorCodeSchema = external_exports.enum(WORKSPACE_QUERY_ERROR_CODES);
+    publishedGitReceiptSchema = external_exports.object({
+      pushedSha: gitShaSchema,
+      branch: gitBranchSchema,
+      remote: gitRemoteNameSchema,
+      replayed: external_exports.boolean()
+    });
+    workspaceQueryErrorSchema = external_exports.object({
+      code: workspaceQueryErrorCodeSchema,
+      message: external_exports.string().max(4096),
+      /** Only with source_changed_since_approval after a push: what already reached the remote. */
+      published: publishedGitReceiptSchema.optional()
+    });
+    resultEnvelopeSchema = external_exports.discriminatedUnion("ok", [
+      external_exports.object({ ok: external_exports.literal(true), value: external_exports.unknown() }),
+      external_exports.object({ ok: external_exports.literal(false), error: workspaceQueryErrorSchema })
+    ]);
+  }
+});
+
+// ../shared/dist/runtime-v2/agent-context.js
+var AGENT_CONTEXT_VERSION, agentSessionKindSchema, agentTurnTriggerSchema, agentBranchSourceSchema, agentContextRepositorySchema, agentContextBuildSchema, agentContextEnvironmentSchema, agentContextPullRequestSchema, agentContextSchema;
+var init_agent_context = __esm({
+  "../shared/dist/runtime-v2/agent-context.js"() {
+    "use strict";
+    init_zod();
+    init_workspace();
+    AGENT_CONTEXT_VERSION = 1;
+    agentSessionKindSchema = external_exports.enum(["chat", "task", "workflow", "pr_review"]);
+    agentTurnTriggerSchema = external_exports.enum(["user", "image_build"]);
+    agentBranchSourceSchema = external_exports.enum([
+      "handoff",
+      "pull_request",
+      "task",
+      "chat_selection",
+      "environment_default"
+    ]);
+    agentContextRepositorySchema = external_exports.object({
+      name: external_exports.string().min(1).max(200),
+      url: gitRemoteUrlSchema,
+      path: machinePathSchema,
+      branch: gitBranchSchema,
+      branchSource: agentBranchSourceSchema,
+      base: gitBranchSchema
+    });
+    agentContextBuildSchema = external_exports.object({
+      id: external_exports.guid(),
+      status: external_exports.enum(["queued", "running", "succeeded", "failed", "cancelled", "superseded"]),
+      trigger: external_exports.enum(["agent", "base_bumped", "preview", "manual", "push"])
+    });
+    agentContextEnvironmentSchema = external_exports.object({
+      id: external_exports.guid(),
+      name: external_exports.string().min(1).max(200),
+      installCommand: external_exports.string().max(8192).nullable(),
+      startCommand: external_exports.string().max(8192).nullable(),
+      imageBuildId: external_exports.guid().nullable(),
+      /** The newest build when it is not the one sessions boot from. */
+      pendingBuild: agentContextBuildSchema.optional(),
+      /** Saved variable names; values never leave the API. */
+      variables: external_exports.array(external_exports.string().min(1).max(200)).max(200)
+    });
+    agentContextPullRequestSchema = external_exports.object({
+      number: external_exports.number().int().positive(),
+      url: external_exports.string().url().max(2048),
+      head: gitBranchSchema,
+      base: gitBranchSchema
+    });
+    agentContextSchema = external_exports.object({
+      kind: agentSessionKindSchema,
+      trigger: agentTurnTriggerSchema,
+      organizationId: external_exports.guid(),
+      taskWorkingBranch: gitBranchSchema.optional(),
+      pullRequest: agentContextPullRequestSchema.optional(),
+      repositories: external_exports.array(agentContextRepositorySchema).max(64),
+      environment: agentContextEnvironmentSchema.optional()
+    });
+  }
+});
+
 // ../shared/dist/skills/domain.js
 var SKILLS_PROTOCOL_VERSION, SKILL_PACKAGE_LIMITS;
 var init_domain = __esm({
@@ -20114,207 +20367,14 @@ var init_run_context = __esm({
   }
 });
 
-// ../shared/dist/runtime-v2/workspace.js
-var UNSAFE_LINE, CONTROL_CHARACTERS, machinePathSchema, gitShaSchema, gitBranchSchema, gitRemoteNameSchema, gitRemoteUrlSchema, statusFingerprintSchema, singleLineSchema, operationIdSchema, repoTargetShape, trustedRepoTargetShape, workspaceStatusRequestSchema, gitStatusRequestSchema, gitCheckpointRequestSchema, gitPushRequestSchema, gitPrepareCheckoutRequestSchema, gitVerifyHeadRequestSchema, workspaceQueryRequestSchema, WORKSPACE_QUERY_METHODS, workspaceQueryMethodSchema, workspaceStatusValueSchema, gitStatusValueSchema, gitCheckpointValueSchema, gitPushValueSchema, gitPrepareCheckoutValueSchema, gitVerifyHeadValueSchema, WORKSPACE_QUERY_ERROR_CODES, workspaceQueryErrorCodeSchema, publishedGitReceiptSchema, workspaceQueryErrorSchema, resultEnvelopeSchema;
-var init_workspace = __esm({
-  "../shared/dist/runtime-v2/workspace.js"() {
-    "use strict";
-    init_zod();
-    UNSAFE_LINE = /[\0\r\n]/;
-    CONTROL_CHARACTERS = /[\x00-\x1f\x7f]/;
-    machinePathSchema = external_exports.string().min(1).max(4096).refine((value) => !UNSAFE_LINE.test(value), "path contains unsafe characters");
-    gitShaSchema = external_exports.string().regex(/^[0-9a-f]{40}(?:[0-9a-f]{24})?$/, "not a Git SHA");
-    gitBranchSchema = external_exports.string().min(1).max(255).refine((value) => !value.startsWith("-") && !value.startsWith("+") && !value.includes("..") && !value.includes("@{") && !value.endsWith(".lock") && !/[\s~^:?*[\\]/.test(value) && !CONTROL_CHARACTERS.test(value), "not a safe Git branch name");
-    gitRemoteNameSchema = external_exports.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/, "not a safe Git remote name");
-    gitRemoteUrlSchema = external_exports.string().min(1).max(2048).refine((value) => !UNSAFE_LINE.test(value), "remote URL contains unsafe characters");
-    statusFingerprintSchema = external_exports.string().regex(/^[0-9a-f]{64}$/, "not a status fingerprint");
-    singleLineSchema = (max) => external_exports.string().min(1).max(max).refine((value) => !CONTROL_CHARACTERS.test(value), "contains control characters");
-    operationIdSchema = external_exports.guid();
-    repoTargetShape = {
-      path: machinePathSchema,
-      expectedRepoRoot: machinePathSchema.optional(),
-      projectPath: machinePathSchema.optional()
-    };
-    trustedRepoTargetShape = {
-      path: machinePathSchema,
-      expectedRepoRoot: machinePathSchema,
-      projectPath: machinePathSchema
-    };
-    workspaceStatusRequestSchema = external_exports.object({
-      method: external_exports.literal("workspace.status"),
-      path: machinePathSchema
-    });
-    gitStatusRequestSchema = external_exports.object({
-      method: external_exports.literal("git.status"),
-      ...repoTargetShape,
-      remote: gitRemoteNameSchema.default("origin"),
-      expectedRemoteUrl: gitRemoteUrlSchema.optional()
-    });
-    gitCheckpointRequestSchema = external_exports.object({
-      method: external_exports.literal("git.checkpoint"),
-      operationId: operationIdSchema,
-      ...trustedRepoTargetShape,
-      switchId: singleLineSchema(200),
-      repoKey: singleLineSchema(256),
-      expectedHeadSha: gitShaSchema,
-      expectedBranch: gitBranchSchema,
-      expectedStatusFingerprint: statusFingerprintSchema,
-      expectedProposedTreeSha: gitShaSchema,
-      /** Goes to `git commit-tree` over stdin; newlines carry trailers, NUL is unrepresentable. */
-      commitMessage: external_exports.string().min(1).max(64 * 1024).refine((value) => !value.includes("\0") && value.trim().length > 0, "invalid commit message"),
-      authorName: singleLineSchema(256),
-      authorEmail: singleLineSchema(320).refine((value) => !/[<>]/.test(value), "invalid email")
-    });
-    gitPushRequestSchema = external_exports.object({
-      method: external_exports.literal("git.push"),
-      operationId: operationIdSchema,
-      ...trustedRepoTargetShape,
-      remote: gitRemoteNameSchema.default("origin"),
-      expectedRemoteUrl: gitRemoteUrlSchema,
-      expectedHeadSha: gitShaSchema,
-      expectedBranch: gitBranchSchema
-    });
-    gitPrepareCheckoutRequestSchema = external_exports.object({
-      method: external_exports.literal("git.prepare_checkout"),
-      operationId: operationIdSchema,
-      ...trustedRepoTargetShape,
-      remote: gitRemoteNameSchema.default("origin"),
-      expectedRemoteUrl: gitRemoteUrlSchema,
-      branch: gitBranchSchema,
-      targetSha: gitShaSchema
-    });
-    gitVerifyHeadRequestSchema = external_exports.object({
-      method: external_exports.literal("git.verify_head"),
-      ...trustedRepoTargetShape,
-      expectedSha: gitShaSchema
-    });
-    workspaceQueryRequestSchema = external_exports.discriminatedUnion("method", [
-      workspaceStatusRequestSchema,
-      gitStatusRequestSchema,
-      gitCheckpointRequestSchema,
-      gitPushRequestSchema,
-      gitPrepareCheckoutRequestSchema,
-      gitVerifyHeadRequestSchema
-    ]);
-    WORKSPACE_QUERY_METHODS = [
-      "workspace.status",
-      "git.status",
-      "git.checkpoint",
-      "git.push",
-      "git.prepare_checkout",
-      "git.verify_head"
-    ];
-    workspaceQueryMethodSchema = external_exports.enum(WORKSPACE_QUERY_METHODS);
-    workspaceStatusValueSchema = external_exports.object({
-      repoRoot: machinePathSchema,
-      /** null: detached HEAD. */
-      branch: external_exports.string().nullable(),
-      /** null: unborn branch. */
-      headSha: gitShaSchema.nullable(),
-      dirty: external_exports.boolean(),
-      filesChanged: external_exports.number().int().nonnegative(),
-      ahead: external_exports.number().int().nonnegative().nullable(),
-      behind: external_exports.number().int().nonnegative().nullable(),
-      hasUpstream: external_exports.boolean()
-    });
-    gitStatusValueSchema = workspaceStatusValueSchema.extend({
-      remoteUrl: gitRemoteUrlSchema.nullable(),
-      upstream: external_exports.string().nullable(),
-      statusFingerprint: statusFingerprintSchema,
-      proposedTreeSha: gitShaSchema
-    });
-    gitCheckpointValueSchema = external_exports.object({
-      repoRoot: machinePathSchema,
-      sha: gitShaSchema,
-      replayed: external_exports.boolean()
-    });
-    gitPushValueSchema = external_exports.object({
-      repoRoot: machinePathSchema,
-      pushedSha: gitShaSchema,
-      branch: gitBranchSchema,
-      remote: gitRemoteNameSchema,
-      /** The remote already had the SHA before this push. */
-      replayed: external_exports.boolean()
-    });
-    gitPrepareCheckoutValueSchema = external_exports.object({
-      repoRoot: machinePathSchema,
-      branch: gitBranchSchema,
-      headSha: gitShaSchema,
-      replayed: external_exports.boolean()
-    });
-    gitVerifyHeadValueSchema = external_exports.object({
-      repoRoot: machinePathSchema,
-      headSha: gitShaSchema,
-      verified: external_exports.literal(true)
-    });
-    WORKSPACE_QUERY_ERROR_CODES = [
-      "path_not_approved",
-      "workspace_busy",
-      "workspace_repository_mismatch",
-      "operation_in_progress",
-      "git_not_installed",
-      "runtime_operation_failed",
-      "invalid_git_request",
-      "repository_not_found",
-      "repository_path_changed",
-      "repository_path_not_authorized",
-      "path_canonicalization_failed",
-      "git_status_unreadable",
-      "git_operation_failed",
-      "git_network_timeout",
-      "git_output_limit_exceeded",
-      "git_remote_unavailable",
-      "git_fetch_failed",
-      "git_push_failed",
-      "remote_url_credentials_rejected",
-      "remote_url_mismatch",
-      "source_changed_since_approval",
-      "source_dirty_after_checkpoint",
-      "source_head_unreadable",
-      "checkpoint_empty",
-      "checkpoint_tree_unavailable",
-      "checkpoint_commit_failed",
-      "checkpoint_lock_unavailable",
-      "checkpoint_index_sync_failed",
-      "push_verification_failed",
-      "target_checkout_dirty",
-      "target_checkout_failed",
-      "target_branch_in_use",
-      "target_branch_diverged",
-      "target_fast_forward_failed",
-      "target_verification_failed",
-      "target_sha_mismatch",
-      "target_sha_unavailable",
-      "target_head_unreadable",
-      "verify_head_mismatch"
-    ];
-    workspaceQueryErrorCodeSchema = external_exports.enum(WORKSPACE_QUERY_ERROR_CODES);
-    publishedGitReceiptSchema = external_exports.object({
-      pushedSha: gitShaSchema,
-      branch: gitBranchSchema,
-      remote: gitRemoteNameSchema,
-      replayed: external_exports.boolean()
-    });
-    workspaceQueryErrorSchema = external_exports.object({
-      code: workspaceQueryErrorCodeSchema,
-      message: external_exports.string().max(4096),
-      /** Only with source_changed_since_approval after a push: what already reached the remote. */
-      published: publishedGitReceiptSchema.optional()
-    });
-    resultEnvelopeSchema = external_exports.discriminatedUnion("ok", [
-      external_exports.object({ ok: external_exports.literal(true), value: external_exports.unknown() }),
-      external_exports.object({ ok: external_exports.literal(false), error: workspaceQueryErrorSchema })
-    ]);
-  }
-});
-
 // ../shared/dist/runtime-v2/desired-state.js
-var repoLocalPathSchema, runSpecSchema, desiredRunSchema, desiredStateSchema;
+var repoLocalPathSchema, requestedCheckoutSchema, runSpecSchema, desiredRunSchema, desiredStateSchema;
 var init_desired_state = __esm({
   "../shared/dist/runtime-v2/desired-state.js"() {
     "use strict";
     init_zod();
     init_contracts();
+    init_agent_context();
     init_ids();
     init_run_context();
     init_workspace();
@@ -20324,6 +20384,11 @@ var init_desired_state = __esm({
       localPath: external_exports.string().min(1),
       branch: external_exports.string().min(1).optional()
     });
+    requestedCheckoutSchema = external_exports.object({
+      path: machinePathSchema,
+      repoUrl: gitRemoteUrlSchema,
+      branch: gitBranchSchema
+    });
     runSpecSchema = external_exports.object({
       runId: runIdSchema,
       conversationId: conversationIdSchema,
@@ -20342,6 +20407,9 @@ var init_desired_state = __esm({
       workspacePathPinned: external_exports.boolean().optional(),
       approvedWorkspacePaths: external_exports.array(external_exports.string().min(1)).optional(),
       repoLocalPaths: external_exports.array(repoLocalPathSchema).optional(),
+      /** Applied once, at the conversation's first turn on a cloud sandbox; never moves local work. */
+      requestedCheckouts: external_exports.array(requestedCheckoutSchema).max(64).optional(),
+      agentContext: agentContextSchema.optional(),
       workflowId: external_exports.guid().optional(),
       workflowExecutionId: external_exports.guid().optional(),
       agentId: external_exports.string().min(1).optional(),
@@ -20933,13 +21001,20 @@ var init_problem = __esm({
 });
 
 // ../shared/dist/cli-usage.js
-var usagePercentSchema, usageTimestampSchema, cliUsageWindowPatchSchema, cliUsageWindowSchema, cliUsageBucketSchema, cliUsageSnapshotSchema;
+var usagePercentSchema, usageTimestampSchema, usageAmountSchema, usageObservationShape, cliUsageWindowPatchSchema, cliUsageWindowSchema, cliUsageSpendPatchSchema, cliUsageSpendSchema, cliUsageCreditsPatchSchema, cliUsageCreditsSchema, cliUsageBucketSchema, cliUsageSnapshotSchema;
 var init_cli_usage = __esm({
   "../shared/dist/cli-usage.js"() {
     "use strict";
     init_zod();
     usagePercentSchema = external_exports.number().min(0).max(100);
     usageTimestampSchema = external_exports.iso.datetime();
+    usageAmountSchema = external_exports.string().min(1);
+    usageObservationShape = {
+      observedAt: usageTimestampSchema,
+      receivedAt: usageTimestampSchema,
+      sourceId: external_exports.string().min(1),
+      sequence: external_exports.number().int().nonnegative()
+    };
     cliUsageWindowPatchSchema = external_exports.object({
       usedPercent: usagePercentSchema.nullable().optional(),
       windowMinutes: external_exports.number().positive().nullable().optional(),
@@ -20949,14 +21024,41 @@ var init_cli_usage = __esm({
       usedPercent: usagePercentSchema.optional(),
       windowMinutes: external_exports.number().positive().optional(),
       resetsAt: usageTimestampSchema.optional(),
-      observedAt: usageTimestampSchema,
-      receivedAt: usageTimestampSchema,
-      sourceId: external_exports.string().min(1),
-      sequence: external_exports.number().int().nonnegative()
+      ...usageObservationShape
+    });
+    cliUsageSpendPatchSchema = external_exports.object({
+      reached: external_exports.boolean(),
+      limit: usageAmountSchema.nullable().optional(),
+      used: usageAmountSchema.nullable().optional(),
+      remaining: usageAmountSchema.nullable().optional(),
+      usedPercent: usagePercentSchema.nullable().optional(),
+      resetsAt: usageTimestampSchema.nullable().optional()
+    });
+    cliUsageSpendSchema = external_exports.object({
+      reached: external_exports.boolean(),
+      limit: usageAmountSchema.optional(),
+      used: usageAmountSchema.optional(),
+      remaining: usageAmountSchema.optional(),
+      usedPercent: usagePercentSchema.optional(),
+      resetsAt: usageTimestampSchema.optional(),
+      ...usageObservationShape
+    });
+    cliUsageCreditsPatchSchema = external_exports.object({
+      hasCredits: external_exports.boolean(),
+      unlimited: external_exports.boolean(),
+      balance: usageAmountSchema.nullable().optional()
+    });
+    cliUsageCreditsSchema = external_exports.object({
+      hasCredits: external_exports.boolean(),
+      unlimited: external_exports.boolean(),
+      balance: usageAmountSchema.optional(),
+      ...usageObservationShape
     });
     cliUsageBucketSchema = external_exports.object({
       primary: cliUsageWindowSchema.optional(),
       secondary: cliUsageWindowSchema.optional(),
+      spend: cliUsageSpendSchema.optional(),
+      credits: cliUsageCreditsSchema.optional(),
       planType: external_exports.string().min(1).nullable().optional()
     });
     cliUsageSnapshotSchema = external_exports.object({
@@ -20992,6 +21094,8 @@ var init_run_log = __esm({
       limitId: external_exports.string().min(1),
       primary: cliUsageWindowPatchSchema.nullable().optional(),
       secondary: cliUsageWindowPatchSchema.nullable().optional(),
+      spend: cliUsageSpendPatchSchema.nullable().optional(),
+      credits: cliUsageCreditsPatchSchema.nullable().optional(),
       planType: external_exports.string().min(1).nullable().optional(),
       observedAt: external_exports.iso.datetime(),
       sourceId: external_exports.string().min(1),
@@ -21319,6 +21423,7 @@ var init_skills = __esm({
 var init_runtime_v2 = __esm({
   "../shared/dist/runtime-v2/index.js"() {
     "use strict";
+    init_agent_context();
     init_capabilities();
     init_desired_state();
     init_git_capability();
@@ -22225,11 +22330,11 @@ function createListeners() {
     }
   };
 }
-var import_promises4, CoreFault, NANOS_PER_MILLI, systemClock2, silentLog;
+var import_promises5, CoreFault, NANOS_PER_MILLI, systemClock2, silentLog;
 var init_chunk_YXWJW7I5 = __esm({
   "../agent-core/dist/chunk-YXWJW7I5.js"() {
     "use strict";
-    import_promises4 = require("timers/promises");
+    import_promises5 = require("timers/promises");
     CoreFault = class extends Error {
       code;
       constructor(code, message, options) {
@@ -22243,7 +22348,7 @@ var init_chunk_YXWJW7I5 = __esm({
       now: () => Date.now(),
       monotonic: () => Number(process.hrtime.bigint() / NANOS_PER_MILLI),
       sleep: async (ms, signal) => {
-        await (0, import_promises4.setTimeout)(ms, void 0, signal ? { signal } : void 0);
+        await (0, import_promises5.setTimeout)(ms, void 0, signal ? { signal } : void 0);
       }
     };
     silentLog = {
@@ -22450,7 +22555,7 @@ function plan(command, args, options) {
 function captureOutput(command, args, options) {
   const launch = plan(command, args, options);
   if (launch === void 0) return Promise.resolve(NEVER_STARTED);
-  return new Promise((resolve7) => {
+  return new Promise((resolve9) => {
     (0, import_child_process.execFile)(
       launch.file,
       [...launch.args],
@@ -22464,7 +22569,7 @@ function captureOutput(command, args, options) {
       },
       (error61, stdout, stderr) => {
         const code = error61 && typeof error61.code === "number" ? error61.code : error61 ? void 0 : 0;
-        resolve7({ stdout, stderr, exitCode: code });
+        resolve9({ stdout, stderr, exitCode: code });
       }
     );
   });
@@ -22506,18 +22611,18 @@ function decode3(bytes, start, end) {
 }
 async function linuxStartTicks(pid) {
   try {
-    const stat15 = await (0, import_promises5.readFile)(`/proc/${pid}/stat`, "utf8");
-    const fields = stat15.slice(stat15.lastIndexOf(")") + 2).split(" ");
+    const stat16 = await (0, import_promises6.readFile)(`/proc/${pid}/stat`, "utf8");
+    const fields = stat16.slice(stat16.lastIndexOf(")") + 2).split(" ");
     return fields[19];
   } catch {
     return void 0;
   }
 }
 function psStartTime(pid) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve9) => {
     (0, import_child_process2.execFile)("ps", ["-o", "lstart=", "-p", String(pid)], { timeout: 2e3 }, (error61, stdout) => {
       const text2 = stdout.trim();
-      resolve7(error61 || !text2 ? void 0 : text2);
+      resolve9(error61 || !text2 ? void 0 : text2);
     });
   });
 }
@@ -22546,12 +22651,12 @@ function parseProcessList(text2) {
 }
 function listProcesses(platform = process.platform) {
   if (platform === "win32") return Promise.resolve([]);
-  return new Promise((resolve7) => {
+  return new Promise((resolve9) => {
     (0, import_child_process3.execFile)(
       "ps",
       ["-A", "-o", "pid=,ppid=,pgid=,lstart="],
       { timeout: 5e3, maxBuffer: 8 * 1024 * 1024 },
-      (error61, stdout) => resolve7(error61 ? [] : parseProcessList(stdout))
+      (error61, stdout) => resolve9(error61 ? [] : parseProcessList(stdout))
     );
   });
 }
@@ -22591,11 +22696,11 @@ async function taskkill(pid, options) {
     stdio: "ignore",
     windowsHide: true
   });
-  const exited = new Promise((resolve7) => {
-    killer.once("error", (error210) => resolve7(error210));
+  const exited = new Promise((resolve9) => {
+    killer.once("error", (error210) => resolve9(error210));
     killer.once(
       "exit",
-      (code, signal) => resolve7(code === 0 ? void 0 : new Error(`taskkill failed: exit ${code}, signal ${signal}`))
+      (code, signal) => resolve9(code === 0 ? void 0 : new Error(`taskkill failed: exit ${code}, signal ${signal}`))
     );
   });
   const timedOut = clock.sleep(options.timeoutMs ?? DEFAULT_TASKKILL_TIMEOUT_MS, timeout.signal).then(() => new Error("taskkill timed out")).catch(() => void 0);
@@ -22799,7 +22904,7 @@ async function waitForWindowsJob(child, command) {
   const deadline = systemClock2.monotonic() + START_TIMEOUT_MS;
   try {
     while (systemClock2.monotonic() < deadline) {
-      const providerPid = await (0, import_promises6.readFile)(status.path, "utf8").catch(() => void 0);
+      const providerPid = await (0, import_promises7.readFile)(status.path, "utf8").catch(() => void 0);
       if (providerPid !== void 0) {
         requireStartedProvider(providerPid, command);
         return;
@@ -22822,7 +22927,7 @@ async function waitForWindowsJob(child, command) {
     throw new CoreFault("spawn_failed", `Could not start ${command} (Windows helper timed out)`);
   } finally {
     statuses.delete(child);
-    await (0, import_promises6.rm)(status.directory, { recursive: true, force: true });
+    await (0, import_promises7.rm)(status.directory, { recursive: true, force: true });
   }
 }
 function onCliSpawned(listener) {
@@ -22851,10 +22956,10 @@ function spawnCli(options) {
 function waitForSpawn(child, command) {
   if (isWindowsJob(child)) return waitForWindowsJob(child, command);
   if (child.pid !== void 0) return Promise.resolve();
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve9, reject) => {
     const onSpawn = () => {
       child.off("error", onError);
-      resolve7();
+      resolve9();
     };
     const onError = (error61) => {
       child.off("spawn", onSpawn);
@@ -22867,7 +22972,7 @@ 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, 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 import_child_process, import_fs, import_path, import_child_process2, import_promises6, import_child_process3, import_child_process4, import_child_process5, import_child_process6, import_crypto, import_fs2, import_promises7, 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";
@@ -22876,14 +22981,14 @@ var init_chunk_M6YHY2EZ = __esm({
     import_fs = require("fs");
     import_path = require("path");
     import_child_process2 = require("child_process");
-    import_promises5 = require("fs/promises");
+    import_promises6 = require("fs/promises");
     import_child_process3 = require("child_process");
     import_child_process4 = require("child_process");
     import_child_process5 = require("child_process");
     import_child_process6 = require("child_process");
     import_crypto = require("crypto");
     import_fs2 = require("fs");
-    import_promises6 = require("fs/promises");
+    import_promises7 = require("fs/promises");
     import_os = require("os");
     import_path2 = require("path");
     SHIM_MAX_BYTES = 64 * 1024;
@@ -24765,8 +24870,8 @@ function readMediaFiles(candidates2, cwd, mimeByExt, maxBytes) {
     seen.add(path);
     const mimeType = mimeByExt[(0, import_path3.extname)(path).toLowerCase()];
     if (!mimeType) continue;
-    const stat15 = (0, import_fs4.statSync)(path);
-    if (!stat15.isFile() || stat15.size <= 0 || stat15.size > maxBytes) continue;
+    const stat16 = (0, import_fs4.statSync)(path);
+    if (!stat16.isFile() || stat16.size <= 0 || stat16.size > maxBytes) continue;
     files.push({ path, mimeType, buffer: (0, import_fs4.readFileSync)(path) });
   }
   return files;
@@ -24841,8 +24946,8 @@ function createJsonRpcPeer(writer, handlers) {
     },
     request: (method, params = {}) => {
       const id = counter.next++;
-      return new Promise((resolve7, reject) => {
-        pending.set(id, { method, resolve: resolve7, reject });
+      return new Promise((resolve9, reject) => {
+        pending.set(id, { method, resolve: resolve9, reject });
         writer.write({ id, method, params }).catch((error61) => {
           pending.delete(id);
           reject(error61 instanceof Error ? error61 : new Error(String(error61)));
@@ -24955,7 +25060,7 @@ function createNdjsonWriter(stream) {
     get writable() {
       return stream.writable && !stream.destroyed && failure5.error === void 0;
     },
-    write: (value) => new Promise((resolve7, reject) => {
+    write: (value) => new Promise((resolve9, reject) => {
       if (failure5.error) {
         reject(failure5.error);
         return;
@@ -24967,7 +25072,7 @@ function createNdjsonWriter(stream) {
       stream.write(`${JSON.stringify(value)}
 `, (error61) => {
         if (error61) reject(error61);
-        else resolve7();
+        else resolve9();
       });
     }),
     end: () => {
@@ -24983,11 +25088,11 @@ function hostProcess(child, tree, options, handlers) {
   const stderr = new LineSplitter((line) => handlers.onStderrLine(line));
   child.stderr.on("data", (chunk) => stderr.push(chunk));
   child.stderr.once("end", () => stderr.flush());
-  const processExit = new Promise((resolve7) => {
-    child.once("exit", (code, signal) => resolve7({ code, signal }));
+  const processExit = new Promise((resolve9) => {
+    child.once("exit", (code, signal) => resolve9({ code, signal }));
   });
-  const outputEnded = new Promise((resolve7) => {
-    child.stdout.once("close", () => resolve7());
+  const outputEnded = new Promise((resolve9) => {
+    child.stdout.once("close", () => resolve9());
   });
   const watch = async () => {
     const { clock, stdoutDrainMs, log, name } = options;
@@ -25277,13 +25382,13 @@ var init_chunk_4G77APXN = __esm({
         const turnId = input2.turnId;
         let finish = () => {
         };
-        const done = new Promise((resolve7) => {
+        const done = new Promise((resolve9) => {
           finish = (outcome2) => {
             if (this.#current?.id !== turnId) return;
             this.#current = void 0;
             if (this.#state === "busy") this.#state = "idle";
             this.#emit({ type: "turn_ended", turnId, outcome: outcome2 });
-            resolve7({ turnId, outcome: outcome2, providerSessionId: this.#sessionId });
+            resolve9({ turnId, outcome: outcome2, providerSessionId: this.#sessionId });
           };
         });
         const pending = {
@@ -25479,20 +25584,20 @@ function canonicalizeManagedMcpToolName(toolName) {
   return flattened ? `mcp__${MANAGED_MCP_SERVER_NAME}__${flattened[1]}` : toolName;
 }
 async function writeSecretFile(name, contents) {
-  const dir = await (0, import_promises13.mkdtemp)((0, import_path4.join)((0, import_os2.tmpdir)(), "alan-mcp-"));
+  const dir = await (0, import_promises14.mkdtemp)((0, import_path4.join)((0, import_os2.tmpdir)(), "alan-mcp-"));
   const path = (0, import_path4.join)(dir, name);
   const remove = async () => {
-    await (0, import_promises13.rm)(dir, { recursive: true, force: true });
+    await (0, import_promises14.rm)(dir, { recursive: true, force: true });
   };
   try {
-    await (0, import_promises13.writeFile)(path, contents, { mode: 384, flag: "wx" });
+    await (0, import_promises14.writeFile)(path, contents, { mode: 384, flag: "wx" });
   } catch (error61) {
     await remove();
     throw error61;
   }
   return { path, remove, [Symbol.asyncDispose]: remove };
 }
-var import_crypto4, import_crypto5, import_promises13, import_os2, import_path4, MANAGED_MCP_SERVER_NAME, RUN_SCOPED_SERVER, NAMESPACED_RUN_TOOL, FLATTENED_RUN_TOOL;
+var import_crypto4, import_crypto5, import_promises14, import_os2, import_path4, MANAGED_MCP_SERVER_NAME, RUN_SCOPED_SERVER, NAMESPACED_RUN_TOOL, FLATTENED_RUN_TOOL;
 var init_chunk_J2KTV5FP = __esm({
   "../agent-core/dist/chunk-J2KTV5FP.js"() {
     "use strict";
@@ -25501,7 +25606,7 @@ var init_chunk_J2KTV5FP = __esm({
     import_crypto5 = require("crypto");
     init_agent2();
     init_runtime_v2();
-    import_promises13 = require("fs/promises");
+    import_promises14 = require("fs/promises");
     import_os2 = require("os");
     import_path4 = require("path");
     MANAGED_MCP_SERVER_NAME = "alan";
@@ -25511,7 +25616,259 @@ var init_chunk_J2KTV5FP = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-FPGAN4XO.js
+// ../agent-core/dist/chunk-GI3ZGXTY.js
+function repositories(input2, context) {
+  const problems = new Map(input2.problems.map((problem) => [problem.path, problem]));
+  const listed = context?.repositories ?? [];
+  const known = new Set(listed.map((repository) => repository.path));
+  const unlisted = input2.problems.filter((problem) => !known.has(problem.path));
+  return [
+    ...listed.map((repository) => {
+      const problem = problems.get(repository.path);
+      return {
+        path: repository.path,
+        name: repository.name,
+        url: repository.url,
+        branch: repository.branch,
+        branchSource: repository.branchSource,
+        base: repository.base,
+        checkout: problem ? "needs_attention" : "ok",
+        ...problem ? { problem: problem.problem, action: problem.action } : {}
+      };
+    }),
+    ...unlisted.map(
+      (problem) => ({
+        path: problem.path,
+        checkout: "needs_attention",
+        problem: problem.problem,
+        action: problem.action
+      })
+    )
+  ];
+}
+function branchInstruction(repository) {
+  const { path, branch, branchSource } = repository;
+  if (!branch || !branchSource) return void 0;
+  const reason = BRANCH_REASONS[branchSource];
+  if (branchSource === "task") {
+    return `Commit work in ${path} on ${branch}, ${reason}; create it from ${repository.base ?? "the default branch"} if it does not exist.`;
+  }
+  return `Work in ${path} on ${branch}, ${reason}.`;
+}
+function repositoryInstructions(repository) {
+  const problem = repository.problem && repository.action ? `${repository.path} ${repository.problem}. ${repository.action} before relying on its files.` : void 0;
+  const branch = problem && repository.branchSource !== "environment_default" ? void 0 : branchInstruction(repository);
+  return [branch, problem].filter((line) => line !== void 0);
+}
+function environmentInstructions(environment, cwd) {
+  const lines = [];
+  const start = environment.start;
+  if (start?.state === "failed") {
+    lines.push(
+      `The start command exited with code ${start.exitCode}. Read ${start.log}, fix the cause, then run the start command from ${cwd} before testing the app.`
+    );
+  } else if (start?.state === "pending") {
+    lines.push(`The start command is still starting; check ${start.log} before testing the app.`);
+  }
+  const build = environment.pendingBuild;
+  if (build?.status === "queued" || build?.status === "running") {
+    lines.push(
+      `Image build ${build.id} is ${build.status}; its result arrives as a message, so do not poll for it.`
+    );
+  } else if (build?.status === "failed") {
+    lines.push(
+      `The latest image build (${build.id}) failed; sessions still boot from the previous image.`
+    );
+  }
+  if (environment.variables.length > 0) {
+    lines.push("Saved variables are set in this sandbox; never print or commit their values.");
+  }
+  return lines;
+}
+function instructionsFor(snapshot2) {
+  const cwd = snapshot2.workspace.cwd ?? snapshot2.workspace.root ?? "the workspace";
+  return [
+    ...snapshot2.session.trigger === "image_build" ? ["Alan sent this turn, not the user: it reports an image build result."] : [],
+    ...snapshot2.environment ? environmentInstructions(snapshot2.environment, cwd) : []
+  ];
+}
+function startingInstructions(snapshot2) {
+  const cwd = snapshot2.workspace.cwd ?? snapshot2.workspace.root;
+  return [
+    ...cwd ? [`Work from ${cwd}.`] : [],
+    ...snapshot2.workspace.repositories.flatMap(repositoryInstructions)
+  ];
+}
+function sessionKind(input2, context) {
+  if (context) return context.kind;
+  if (input2.spec.workflowExecutionId) return "workflow";
+  return input2.spec.taskId ? "task" : "chat";
+}
+function environmentOf(input2, context) {
+  const environment = context?.environment;
+  if (!environment) return void 0;
+  const start = environment.startCommand === null ? { state: "not_configured" } : input2.start;
+  return {
+    id: environment.id,
+    name: environment.name,
+    installCommand: environment.installCommand,
+    startCommand: environment.startCommand,
+    imageBuildId: environment.imageBuildId,
+    ...environment.pendingBuild ? { pendingBuild: environment.pendingBuild } : {},
+    variables: environment.variables,
+    ...start ? { start: start.state === "not_configured" ? start : { ...start, log: input2.startLogPath } } : {}
+  };
+}
+function knownContext(snapshot2) {
+  const organizationId = snapshot2?.session.organizationId;
+  if (!snapshot2 || !organizationId) return void 0;
+  const environment = snapshot2.environment;
+  return {
+    kind: snapshot2.session.kind,
+    trigger: "user",
+    organizationId,
+    ...snapshot2.task ? { taskWorkingBranch: snapshot2.task.workingBranch } : {},
+    ...snapshot2.pullRequest ? { pullRequest: snapshot2.pullRequest } : {},
+    repositories: snapshot2.workspace.repositories.flatMap(
+      ({ path, name, url: url2, branch, branchSource, base }) => name && url2 && branch && branchSource && base ? [{ path, name, url: url2, branch, branchSource, base }] : []
+    ),
+    ...environment ? {
+      environment: {
+        id: environment.id,
+        name: environment.name,
+        installCommand: environment.installCommand,
+        startCommand: environment.startCommand,
+        imageBuildId: environment.imageBuildId,
+        ...environment.pendingBuild ? { pendingBuild: environment.pendingBuild } : {},
+        variables: environment.variables
+      }
+    } : {}
+  };
+}
+function agentContextSnapshot(input2) {
+  const context = input2.spec.agentContext ?? knownContext(input2.known);
+  if (!context && input2.problems.length === 0) return null;
+  const environment = environmentOf(input2, context);
+  const base = {
+    session: {
+      kind: sessionKind(input2, context),
+      trigger: context?.trigger ?? "user",
+      conversationId: input2.spec.conversationId,
+      runId: input2.spec.runId,
+      ...input2.spec.teamId ? { teamId: input2.spec.teamId } : {},
+      ...input2.spec.taskId ? { taskId: input2.spec.taskId } : {},
+      ...input2.spec.workflowExecutionId ? { workflowExecutionId: input2.spec.workflowExecutionId } : {},
+      ...context ? { organizationId: context.organizationId } : {}
+    },
+    ...context?.taskWorkingBranch ? { task: { workingBranch: context.taskWorkingBranch } } : {},
+    ...context?.pullRequest ? { pullRequest: context.pullRequest } : {},
+    workspace: {
+      ...input2.workspaceRoot ? { root: input2.workspaceRoot } : {},
+      ...input2.spec.projectPath ? { cwd: input2.spec.projectPath } : {},
+      repositories: repositories(input2, context)
+    },
+    ...environment ? { environment } : {}
+  };
+  return { ...base, instructions: instructionsFor(base) };
+}
+function isScalar(value) {
+  return value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+}
+function scalar(value) {
+  if (typeof value !== "string") return String(value);
+  return PLAIN_SCALAR.test(value) ? value : JSON.stringify(value);
+}
+function snakeCase(key) {
+  return key.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
+}
+function yamlLines(record2, indent) {
+  return Object.entries(record2).flatMap(([key, value]) => {
+    const name = `${indent}${snakeCase(key)}:`;
+    if (isScalar(value)) return [`${name} ${scalar(value)}`];
+    if (Array.isArray(value)) {
+      if (value.length === 0) return [];
+      return [
+        name,
+        ...value.flatMap((item) => {
+          if (isScalar(item)) return [`${indent}  - ${scalar(item)}`];
+          if (typeof item !== "object" || item === null) return [];
+          const [first = "", ...rest] = yamlLines(item, `${indent}    `);
+          return [`${indent}  - ${first.trimStart()}`, ...rest];
+        })
+      ];
+    }
+    if (typeof value === "object" && value !== null)
+      return [name, ...yamlLines(value, `${indent}  `)];
+    return [];
+  });
+}
+function block(tag, body) {
+  return [`<${tag} version="${AGENT_CONTEXT_VERSION}">`, ...yamlLines(body, ""), `</${tag}>`].join(
+    "\n"
+  );
+}
+function stableRepository(repository) {
+  const { checkout: _checkout, problem: _problem, action: _action, ...rest } = repository;
+  return rest;
+}
+function commandPreview(command) {
+  if (command === null || command.length <= COMMAND_PREVIEW_CHARS) return command;
+  const lines = command.split("\n").length;
+  return `${command.slice(0, COMMAND_PREVIEW_CHARS)}\u2026 (${lines} lines; get_cloud_machine has the full command)`;
+}
+function withCommandPreviews(environment) {
+  return {
+    ...environment,
+    ...environment.installCommand !== void 0 ? { installCommand: commandPreview(environment.installCommand) } : {},
+    ...environment.startCommand !== void 0 ? { startCommand: commandPreview(environment.startCommand) } : {}
+  };
+}
+function changed(a, b) {
+  return JSON.stringify(a) !== JSON.stringify(b);
+}
+function environmentUpdate(previous, next) {
+  if (!next) return void 0;
+  const { start: previousStart, ...previousFacts } = previous ?? {};
+  const { start, ...facts } = next;
+  if (changed(previousFacts, facts)) return next;
+  return start?.state === "failed" && changed(previousStart, start) ? { start } : void 0;
+}
+function updateBody(previous, next) {
+  const known = new Set(previous.instructions);
+  const instructions = next.instructions.filter((line) => !known.has(line));
+  const before = new Map(
+    previous.workspace.repositories.map((repository) => [
+      repository.path,
+      stableRepository(repository)
+    ])
+  );
+  const repositories2 = next.workspace.repositories.map(stableRepository).filter(
+    (repository) => repository.path !== void 0 && changed(before.get(repository.path), repository)
+  );
+  const environment = environmentUpdate(previous.environment, next.environment);
+  const facts = {
+    ...changed(previous.task, next.task) && next.task ? { task: next.task } : {},
+    ...changed(previous.pullRequest, next.pullRequest) && next.pullRequest ? { pullRequest: next.pullRequest } : {},
+    ...repositories2.length > 0 ? { workspace: { repositories: repositories2 } } : {},
+    ...environment ? { environment: withCommandPreviews(environment) } : {},
+    ...instructions.length > 0 ? { instructions } : {}
+  };
+  if (Object.keys(facts).length === 0) return void 0;
+  return next.session.trigger === "user" ? facts : { session: { trigger: next.session.trigger }, ...facts };
+}
+function renderAgentContext(snapshot2, previous) {
+  const full = block("alan_agent_context", {
+    ...snapshot2,
+    ...snapshot2.environment ? { environment: withCommandPreviews(snapshot2.environment) } : {},
+    instructions: [...startingInstructions(snapshot2), ...snapshot2.instructions]
+  });
+  const update = previous ? updateBody(previous, snapshot2) : void 0;
+  return {
+    snapshot: snapshot2,
+    full,
+    ...update ? { update: block("alan_agent_context_update", update) } : {}
+  };
+}
 function truncate(value, limit) {
   const normalized2 = Array.from(value, (character) => {
     const code = character.charCodeAt(0);
@@ -25770,11 +26127,12 @@ function cloudExecutionSection(spec) {
   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."
+    "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.",
+    "A turn can begin with an <alan_agent_context> block, or an <alan_agent_context_update> with only what changed since. Alan writes these, not the user: they state this session's repositories, branches, environment and start command state, and their instructions apply."
   );
   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. For application changes, check the repository's setup instructions and configured start commands, start the app if needed, and verify it is reachable before testing. For user-facing flows, use alan-test-feature when installed to test the running app, capture a video, and create a test report. 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 blocked capabilities and validation gaps while continuing independent work."
+      "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. For application changes, follow the session context for where to work and whether the start command is running, start the app if needed, and verify it is reachable before testing. For user-facing flows, use alan-test-feature when installed to test the running app, capture a video, and create a test report. 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 blocked capabilities and validation gaps while continuing independent work."
     );
   }
   const skills = spec.promptContext?.availableSkills ?? [];
@@ -25871,11 +26229,71 @@ function buildTurnText(input2) {
 ${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_FPGAN4XO = __esm({
-  "../agent-core/dist/chunk-FPGAN4XO.js"() {
+var startCommandStateSchema, repositorySnapshotSchema, environmentSnapshotSchema, agentContextSnapshotSchema, BRANCH_REASONS, PLAIN_SCALAR, COMMAND_PREVIEW_CHARS, MAX_PARSED_ATTACHMENTS, MAX_PARSED_ATTACHMENT_CHARS, MAX_METADATA_CHARS, UNAVAILABLE, READ_ONLY_MODES, AGENT_MODES;
+var init_chunk_GI3ZGXTY = __esm({
+  "../agent-core/dist/chunk-GI3ZGXTY.js"() {
     "use strict";
+    init_runtime_v2();
+    init_zod();
     init_agent2();
+    startCommandStateSchema = external_exports.discriminatedUnion("state", [
+      external_exports.object({ state: external_exports.literal("not_configured") }),
+      external_exports.object({ state: external_exports.literal("pending") }),
+      external_exports.object({ state: external_exports.literal("running") }),
+      external_exports.object({ state: external_exports.literal("exited_ok") }),
+      external_exports.object({ state: external_exports.literal("failed"), exitCode: external_exports.number().int() })
+    ]);
+    repositorySnapshotSchema = external_exports.object({
+      path: external_exports.string(),
+      name: external_exports.string().optional(),
+      url: external_exports.string().optional(),
+      branch: external_exports.string().optional(),
+      branchSource: agentBranchSourceSchema.optional(),
+      base: external_exports.string().optional(),
+      checkout: external_exports.enum(["ok", "needs_attention"]),
+      problem: external_exports.string().optional(),
+      action: external_exports.string().optional()
+    });
+    environmentSnapshotSchema = external_exports.object({
+      id: external_exports.string(),
+      name: external_exports.string(),
+      installCommand: external_exports.string().nullable(),
+      startCommand: external_exports.string().nullable(),
+      imageBuildId: external_exports.string().nullable(),
+      pendingBuild: agentContextBuildSchema.optional(),
+      variables: external_exports.array(external_exports.string()),
+      start: external_exports.intersection(startCommandStateSchema, external_exports.object({ log: external_exports.string().optional() })).optional()
+    });
+    agentContextSnapshotSchema = external_exports.object({
+      session: external_exports.object({
+        kind: agentSessionKindSchema,
+        trigger: agentTurnTriggerSchema,
+        conversationId: external_exports.string(),
+        runId: external_exports.string(),
+        teamId: external_exports.string().optional(),
+        taskId: external_exports.string().optional(),
+        workflowExecutionId: external_exports.string().optional(),
+        organizationId: external_exports.string().optional()
+      }),
+      task: external_exports.object({ workingBranch: external_exports.string() }).optional(),
+      pullRequest: agentContextPullRequestSchema.optional(),
+      workspace: external_exports.object({
+        root: external_exports.string().optional(),
+        cwd: external_exports.string().optional(),
+        repositories: external_exports.array(repositorySnapshotSchema)
+      }),
+      environment: environmentSnapshotSchema.optional(),
+      instructions: external_exports.array(external_exports.string())
+    });
+    BRANCH_REASONS = {
+      handoff: "the branch handed off from the user's computer",
+      pull_request: "this pull request's branch",
+      task: "this task's branch",
+      chat_selection: "the branch the user selected for this chat",
+      environment_default: "the environment's default branch"
+    };
+    PLAIN_SCALAR = /^[A-Za-z0-9_./@~+-][A-Za-z0-9_./@~+:-]*$/;
+    COMMAND_PREVIEW_CHARS = 200;
     MAX_PARSED_ATTACHMENTS = 3;
     MAX_PARSED_ATTACHMENT_CHARS = 12e3;
     MAX_METADATA_CHARS = 240;
@@ -26313,16 +26731,16 @@ function parseClaudeEvent(event, state) {
 }
 function thoughtsOf(event, content, messageId, state) {
   const texts = content.flatMap((raw) => {
-    const block = asRecord(raw);
-    if (!block || asString(block.type) !== "thinking") return [];
-    return [asString(block.thinking) || asString(block.text)];
+    const block2 = asRecord(raw);
+    if (!block2 || asString(block2.type) !== "thinking") return [];
+    return [asString(block2.thinking) || asString(block2.text)];
   });
   if (texts.length === 0) return [];
   const frameId = asString(event.uuid) || synthId(state, "claude-thought-frame");
   return thoughtBlocksFor(state, messageId).complete(frameId, texts);
 }
-function textUpdates(frame, block) {
-  const text2 = asString(block.text);
+function textUpdates(frame, block2) {
+  const text2 = asString(block2.text);
   if (!text2 || frame.alreadyStreamed) return [];
   const content = textBlock(frame.previousBlockWasText ? `
 ${text2}` : text2);
@@ -26343,12 +26761,12 @@ function thoughtUpdates(frame) {
     }
   ];
 }
-function blockUpdates(frame, block) {
-  const blockType = asString(block.type);
-  if (blockType === "text") return textUpdates(frame, block);
+function blockUpdates(frame, block2) {
+  const blockType = asString(block2.type);
+  if (blockType === "text") return textUpdates(frame, block2);
   frame.previousBlockWasText = false;
   if (blockType === "thinking") return thoughtUpdates(frame);
-  if (blockType === "tool_use") return parseToolUse(block, frame.meta);
+  if (blockType === "tool_use") return parseToolUse(block2, frame.meta);
   return [];
 }
 function parseAssistant(event, state) {
@@ -26366,8 +26784,8 @@ function parseAssistant(event, state) {
     previousBlockWasText: false
   };
   return content.flatMap((raw) => {
-    const block = asRecord(raw);
-    return block ? blockUpdates(frame, block) : [];
+    const block2 = asRecord(raw);
+    return block2 ? blockUpdates(frame, block2) : [];
   });
 }
 function toolUseMeta(name, input2, meta3) {
@@ -26380,11 +26798,11 @@ function toolUseMeta(name, input2, meta3) {
     ...!isAsk && normalizeToolName2(name) === "exitplanmode" ? { [EXIT_PLAN_MODE_INPUT_META]: input2 } : {}
   };
 }
-function parseToolUse(block, meta3) {
-  const toolCallId = asString(block.id);
+function parseToolUse(block2, meta3) {
+  const toolCallId = asString(block2.id);
   if (!toolCallId) return [];
-  const name = canonicalizeManagedMcpToolName(asString(block.name));
-  const input2 = block.input;
+  const name = canonicalizeManagedMcpToolName(asString(block2.name));
+  const input2 = block2.input;
   const inputRecord = asRecord(input2) ?? {};
   const pendingFileChange = claudeToolInputDiffContent(name, input2);
   const updates = [
@@ -26426,21 +26844,21 @@ function parseUser(event) {
   if (!message) return [];
   const meta3 = nesting(event);
   return asArray(message.content).flatMap((raw) => {
-    const block = asRecord(raw);
-    if (!block || asString(block.type) !== "tool_result") return [];
-    const toolCallId = asString(block.tool_use_id);
+    const block2 = asRecord(raw);
+    if (!block2 || asString(block2.type) !== "tool_result") return [];
+    const toolCallId = asString(block2.tool_use_id);
     if (!toolCallId) return [];
-    const text2 = flattenToolResult(block.content);
+    const text2 = flattenToolResult(block2.content);
     const content = outputContent(text2);
     const diffs = claudeFileChangeContents(event.tool_use_result);
     return [
       {
         sessionUpdate: "tool_call_update",
         toolCallId,
-        status: block.is_error === true ? "failed" : "completed",
+        status: block2.is_error === true ? "failed" : "completed",
         ...content || diffs.length ? { content: [...diffs, ...content ?? []] } : {},
         rawOutput: text2,
-        _meta: { ...meta3._meta, [PROVIDER_PAYLOAD_META]: event.tool_use_result ?? block }
+        _meta: { ...meta3._meta, [PROVIDER_PAYLOAD_META]: event.tool_use_result ?? block2 }
       }
     ];
   });
@@ -26944,12 +27362,12 @@ async function claudeTurnInput(run, context) {
   const encoded = await Promise.all(
     images.map(async (image) => ({
       mimeType: image.mimeType,
-      data: (await (0, import_promises14.readFile)(image.path)).toString("base64")
+      data: (await (0, import_promises15.readFile)(image.path)).toString("base64")
     }))
   );
   return { turnId: run.runId, text: text2, ...encoded.length ? { images: encoded } : {} };
 }
-var import_crypto6, import_fs5, import_path5, import_crypto7, import_promises14, EDIT_TOOLS, ThoughtBlocks, UNDERSTOOD_SYSTEM_SUBTYPES, RATE_LIMIT_WARN_AT, CLAUDE_GRAMMAR_NAME, SUBAGENT_TOOL_NAMES, PLAN_ENTRY_STATUSES, controlResponseSchema, STOPPED_STATUSES, TaskRecords, TERMINAL_BACKGROUND_STATUSES, NON_TERMINAL_BACKGROUND_STATUSES, ASYNC_LAUNCH_ACK, BackgroundTasks, FAILED_STATUSES, STOPPED_BY_USER_TEXT, ClaudeTurn, STDERR_TAIL_LINES2, MAX_EARLY_LINES, UNSUPPORTED_STOP, OUTPUT_CLOSED_REASON, ClaudeSession, DEFAULTS, READ_ONLY_DISALLOWED_TOOLS, DEFAULT_MCP_TIMEOUT_MS;
+var import_crypto6, import_fs5, import_path5, import_crypto7, import_promises15, EDIT_TOOLS, ThoughtBlocks, UNDERSTOOD_SYSTEM_SUBTYPES, RATE_LIMIT_WARN_AT, CLAUDE_GRAMMAR_NAME, SUBAGENT_TOOL_NAMES, PLAN_ENTRY_STATUSES, controlResponseSchema, STOPPED_STATUSES, TaskRecords, TERMINAL_BACKGROUND_STATUSES, NON_TERMINAL_BACKGROUND_STATUSES, ASYNC_LAUNCH_ACK, BackgroundTasks, FAILED_STATUSES, STOPPED_BY_USER_TEXT, ClaudeTurn, STDERR_TAIL_LINES2, MAX_EARLY_LINES, UNSUPPORTED_STOP, OUTPUT_CLOSED_REASON, ClaudeSession, DEFAULTS, READ_ONLY_DISALLOWED_TOOLS, DEFAULT_MCP_TIMEOUT_MS;
 var init_claude = __esm({
   "../agent-core/dist/providers/claude.js"() {
     "use strict";
@@ -26959,7 +27377,7 @@ var init_claude = __esm({
     init_chunk_HBIPWAUI();
     init_chunk_J2KTV5FP();
     init_chunk_M6YHY2EZ();
-    init_chunk_FPGAN4XO();
+    init_chunk_GI3ZGXTY();
     init_chunk_YXWJW7I5();
     init_effort();
     import_crypto6 = require("crypto");
@@ -26972,7 +27390,7 @@ var init_claude = __esm({
     import_fs5 = require("fs");
     import_path5 = require("path");
     import_crypto7 = require("crypto");
-    import_promises14 = require("fs/promises");
+    import_promises15 = require("fs/promises");
     init_agent2();
     EDIT_TOOLS = /* @__PURE__ */ new Set([
       "Edit",
@@ -27482,11 +27900,11 @@ var init_claude = __esm({
         }
         this.#iterations += 1;
         for (const raw of asArray(asRecord(event.message)?.content)) {
-          const block = asRecord(raw);
-          if (!block || asString(block.type) !== "tool_use") continue;
-          const id = asString(block.id);
+          const block2 = asRecord(raw);
+          if (!block2 || asString(block2.type) !== "tool_use") continue;
+          const id = asString(block2.id);
           if (!id) continue;
-          const name = canonicalizeManagedMcpToolName(asString(block.name));
+          const name = canonicalizeManagedMcpToolName(asString(block2.name));
           if (isInteractiveToolName(name) || INTERACTIVE_TOOL_NAMES.has(normalizeToolName2(name))) {
             this.#suppressedResults.add(id);
           }
@@ -27682,8 +28100,8 @@ var init_claude = __esm({
       }
       async #awaitTaskStop(requestId, taskId) {
         const timer = new AbortController();
-        const answered = new Promise((resolve7) => {
-          this.#taskStops.set(requestId, resolve7);
+        const answered = new Promise((resolve9) => {
+          this.#taskStops.set(requestId, resolve9);
         });
         const timeoutMs = this.#options.stopTaskTimeoutMs;
         const timedOut = this.#options.clock.sleep(timeoutMs, timer.signal).then(
@@ -27756,17 +28174,17 @@ var init_claude = __esm({
         };
         let markStarted = () => {
         };
-        const whenStarted = new Promise((resolve7) => {
-          markStarted = resolve7;
+        const whenStarted = new Promise((resolve9) => {
+          markStarted = resolve9;
         });
-        const done = new Promise((resolve7) => {
+        const done = new Promise((resolve9) => {
           finish = (outcome2) => {
             if (this.#current?.id !== id) return;
             this.#current = void 0;
             this.#lastTurn = turn;
             if (this.#state === "busy") this.#state = "idle";
             this.#emit({ type: "turn_ended", turnId: id, outcome: outcome2 });
-            resolve7({ turnId: id, outcome: outcome2, providerSessionId: this.#providerSessionId });
+            resolve9({ turnId: id, outcome: outcome2, providerSessionId: this.#providerSessionId });
           };
         });
         const active = {
@@ -27884,8 +28302,8 @@ var init_claude = __esm({
         void removeLaunchFiles(this.#launchFiles).catch((error61) => {
           this.#options.log.warn("claude.launch_files_cleanup_failed", { error: error61 });
         });
-        for (const resolve7 of this.#taskStops.values()) {
-          resolve7({ ok: false, reason: "runtime_unavailable", message: "Claude Code exited." });
+        for (const resolve9 of this.#taskStops.values()) {
+          resolve9({ ok: false, reason: "runtime_unavailable", message: "Claude Code exited." });
         }
         const active = this.#current;
         if (active) {
@@ -28281,6 +28699,44 @@ function windowPatch(value) {
   }
   return patch;
 }
+function amount(value) {
+  const text2 = asString(value).trim();
+  return text2.length > 0 ? text2 : void 0;
+}
+function spendPatch(limit, reached) {
+  const record2 = asRecord(limit);
+  const reachedFlag = reached === true;
+  if (!record2)
+    return limit === null && !reachedFlag ? null : reachedFlag ? { reached: true } : void 0;
+  const patch = { reached: reachedFlag };
+  const limitAmount = amount(record2.limit);
+  const usedAmount = amount(record2.used);
+  if (limitAmount) patch.limit = limitAmount;
+  if (usedAmount) patch.used = usedAmount;
+  const remainingPercent = asFiniteNumber(record2.remainingPercent);
+  if (remainingPercent !== void 0) {
+    patch.usedPercent = Math.min(100, Math.max(0, 100 - remainingPercent));
+  }
+  const seconds = asFiniteNumber(record2.resetsAt);
+  if (seconds !== void 0 && seconds >= 0) {
+    const reset = new Date(seconds * 1e3);
+    if (Number.isFinite(reset.getTime())) patch.resetsAt = reset.toISOString();
+  }
+  return patch;
+}
+function creditsPatch(value) {
+  if (value === null) return null;
+  const record2 = asRecord(value);
+  if (!record2 || typeof record2.hasCredits !== "boolean" || typeof record2.unlimited !== "boolean") {
+    return void 0;
+  }
+  const balance = amount(record2.balance);
+  return {
+    hasCredits: record2.hasCredits,
+    unlimited: record2.unlimited,
+    ...balance ? { balance } : {}
+  };
+}
 function isApprovalRequest(method) {
   return COMMAND_OR_FILE.has(method) || LEGACY.has(method);
 }
@@ -29136,7 +29592,7 @@ var init_codex = __esm({
     init_chunk_HBIPWAUI();
     init_chunk_J2KTV5FP();
     init_chunk_M6YHY2EZ();
-    init_chunk_FPGAN4XO();
+    init_chunk_GI3ZGXTY();
     init_chunk_YXWJW7I5();
     import_fs6 = require("fs");
     import_path6 = require("path");
@@ -29357,12 +29813,16 @@ var init_codex = __esm({
         if (!snapshot2) return [];
         const primary = windowPatch(snapshot2.primary);
         const secondary = windowPatch(snapshot2.secondary);
+        const spend = spendPatch(snapshot2.individualLimit, snapshot2.spendControlReached);
+        const credits = creditsPatch(snapshot2.credits);
         const planType = snapshot2.planType === null ? null : asString(snapshot2.planType) || void 0;
         const parsed = runCodexRateLimitsUpdateSchema.safeParse({
           sessionUpdate: "_alan/codex.rate_limits",
           limitId: bucketId ?? (asString(snapshot2.limitId) || "codex"),
           ...primary === void 0 ? {} : { primary },
           ...secondary === void 0 ? {} : { secondary },
+          ...spend === void 0 ? {} : { spend },
+          ...credits === void 0 ? {} : { credits },
           ...planType === void 0 ? {} : { planType },
           observedAt: new Date(this.#clock.now()).toISOString(),
           sourceId: this.#sourceId,
@@ -29801,10 +30261,10 @@ var init_codex = __esm({
         };
         let identify = () => {
         };
-        const identified = new Promise((resolve7) => {
-          identify = resolve7;
+        const identified = new Promise((resolve9) => {
+          identify = resolve9;
         });
-        const done = new Promise((resolve7) => {
+        const done = new Promise((resolve9) => {
           finish = (outcome2) => {
             if (this.#current?.id !== id) return;
             this.#current = void 0;
@@ -29812,7 +30272,7 @@ var init_codex = __esm({
             if (this.#state === "busy") this.#state = "idle";
             this.#host.scanDescendants(true);
             this.#emit({ type: "turn_ended", turnId: id, outcome: outcome2 });
-            resolve7({ turnId: id, outcome: outcome2, providerSessionId: this.#threadId });
+            resolve9({ turnId: id, outcome: outcome2, providerSessionId: this.#threadId });
           };
         });
         const active = {
@@ -30302,7 +30762,7 @@ function alanCodeConfigContent(existing, input2) {
   });
 }
 function readBody2(response) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve9, reject) => {
     const chunks = [];
     let size = 0;
     response.on("data", (chunk) => {
@@ -30310,7 +30770,7 @@ function readBody2(response) {
       if (size > MAX_CATALOG_BYTES) response.destroy(new Error("catalog too large"));
       else chunks.push(chunk);
     });
-    response.on("end", () => resolve7(Buffer.concat(chunks).toString("utf8")));
+    response.on("end", () => resolve9(Buffer.concat(chunks).toString("utf8")));
     response.on("error", reject);
   });
 }
@@ -30326,13 +30786,13 @@ function parseResponseBody(text2, status) {
 }
 function getJson(url2, headers, timeout, signal) {
   const request2 = url2.protocol === "https:" ? import_https.request : import_http3.request;
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve9, reject) => {
     const outgoing = request2(url2, { method: "GET", headers, timeout, signal }, (response) => {
       const status = response.statusCode ?? 0;
       readBody2(response).then((text2) => {
         const body = parseResponseBody(text2, status);
         if (status < 200 || status >= 300) reject(new CatalogResponseError(status, body));
-        else resolve7(body);
+        else resolve9(body);
       }).catch(reject);
     });
     outgoing.on("timeout", () => outgoing.destroy(new Error("catalog timed out")));
@@ -30549,15 +31009,15 @@ async function writePlugin(directory, apiOrigin) {
   const origin = (0, import_crypto12.createHash)("sha256").update(apiOrigin).digest("hex").slice(0, 12);
   const target = (0, import_path8.join)(directory, `engine-plugin-v${ALAN_CODE_ENGINE_PLUGIN_VERSION}-${origin}.mjs`);
   const temporary = `${target}.${(0, import_crypto12.randomUUID)()}.tmp`;
-  await (0, import_promises15.mkdir)(directory, { recursive: true, mode: 448 });
-  await (0, import_promises15.writeFile)(temporary, alanCodeEnginePluginSource(apiOrigin), { mode: 384 });
-  await (0, import_promises15.rename)(temporary, target);
+  await (0, import_promises16.mkdir)(directory, { recursive: true, mode: 448 });
+  await (0, import_promises16.writeFile)(temporary, alanCodeEnginePluginSource(apiOrigin), { mode: 384 });
+  await (0, import_promises16.rename)(temporary, target);
   return (0, import_url.pathToFileURL)(target).href;
 }
 async function prepareAlanCodeProfile(input2) {
   const directories = Object.values(alanCodeEngineDirectories(input2.engineRoot));
   await Promise.all(
-    directories.map((directory) => (0, import_promises15.mkdir)(directory, { recursive: true, mode: 448 }))
+    directories.map((directory) => (0, import_promises16.mkdir)(directory, { recursive: true, mode: 448 }))
   );
   const [pluginUrl, models] = await Promise.all([
     writePlugin((0, import_path8.join)(input2.engineRoot, "plugin"), input2.access.apiOrigin),
@@ -30580,7 +31040,7 @@ function alanCodeSystemPrompt(alanSystemPrompt) {
 
 ${instructions}` : ALAN_CODE_TOOL_NAMING_PROMPT;
 }
-var import_http3, import_https, import_fs7, import_path7, import_crypto12, import_promises15, import_path8, import_url, ALAN_CODE_BASELINE_PROMPT, ALAN_CODE_ENGINE_PROVIDER_ID, DEFAULT_CONTEXT_WINDOW, DEFAULT_MAX_OUTPUT_TOKENS, ALAN_CODE_API_KEY_ENV, ALAN_CODE_CONVERSATION_ID_ENV, ALAN_CODE_PROXY_PATH, ALAN_CODE_WEBSEARCH_PATH, ALAN_CODE_CATALOG_PATH, CATALOG_TIMEOUT_MS, MAX_CATALOG_BYTES, ACTIVATION_WAIT_MS, ACTIVATION_POLL_MS, CatalogResponseError, ALAN_CODE_ENGINE_PATH_ENV, ALAN_CODE_ENGINE_COMMAND, ALAN_CODE_ENGINE_NAME, WINDOWS_RUNNABLE_EXTENSION, ALAN_CODE_ENGINE_PLUGIN_VERSION, ALAN_CODE_TOOL_NAMING_PROMPT;
+var import_http3, import_https, import_fs7, import_path7, import_crypto12, import_promises16, import_path8, import_url, ALAN_CODE_BASELINE_PROMPT, ALAN_CODE_ENGINE_PROVIDER_ID, DEFAULT_CONTEXT_WINDOW, DEFAULT_MAX_OUTPUT_TOKENS, ALAN_CODE_API_KEY_ENV, ALAN_CODE_CONVERSATION_ID_ENV, ALAN_CODE_PROXY_PATH, ALAN_CODE_WEBSEARCH_PATH, ALAN_CODE_CATALOG_PATH, CATALOG_TIMEOUT_MS, MAX_CATALOG_BYTES, ACTIVATION_WAIT_MS, ACTIVATION_POLL_MS, CatalogResponseError, ALAN_CODE_ENGINE_PATH_ENV, ALAN_CODE_ENGINE_COMMAND, ALAN_CODE_ENGINE_NAME, WINDOWS_RUNNABLE_EXTENSION, ALAN_CODE_ENGINE_PLUGIN_VERSION, ALAN_CODE_TOOL_NAMING_PROMPT;
 var init_alan_code = __esm({
   "../agent-core/dist/providers/alan-code.js"() {
     "use strict";
@@ -30594,7 +31054,7 @@ var init_alan_code = __esm({
     import_path7 = require("path");
     init_runtime_v2();
     import_crypto12 = require("crypto");
-    import_promises15 = require("fs/promises");
+    import_promises16 = require("fs/promises");
     import_path8 = require("path");
     import_url = require("url");
     ALAN_CODE_BASELINE_PROMPT = "You are alan-code, an interactive CLI coding agent that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.\n\nDo not invent URLs. Use verified URLs or ones supplied by the user or project.\n\nIf the user asks for help or wants to give feedback, inform them of the following:\n- `--harness-help` / harness help: learn how to run alan-code\n- For product feedback or bugs, report through the Alan / Supatest issue channels used by this repository\n\nWhen the user directly asks about alan-code capabilities (for example \"can alan-code\u2026\", \"does the harness have\u2026\") or asks in second person about your abilities, answer from the tools and instructions available in this session. If a docs/fetch tool is available and project docs URLs are known, use them; otherwise inspect local README / AGENTS.md rather than inventing product claims.\n\n# Personality\n\nYour default personality and tone is concise, direct, and friendly. You communicate efficiently, always keeping the user clearly informed about ongoing actions without unnecessary detail. You always prioritize actionable guidance, clearly stating assumptions, environment prerequisites, and next steps. Unless explicitly asked, you avoid excessively verbose explanations about your work.\n\n# Tone and style\n\nYou should be concise, direct, and to the point. When you run a non-trivial bash command, you should explain what the command does and why you are running it, so the user understands what you are doing (especially important for commands that change their system).\nRemember that your output will be displayed on a command line interface. Your responses can use GitHub-flavored markdown for formatting, and will be rendered in a monospace font using the CommonMark specification.\nOutput text to communicate with the user; all text you output outside of tool use is displayed to the user. Only use tools to complete tasks. Never use tools like Bash or code comments as means to communicate with the user during the session.\nIf you cannot or will not help the user with something, do not lecture about why. Offer helpful alternatives if possible; otherwise keep the response to 1-2 sentences.\nOnly use emojis if the user explicitly requests it. Avoid emojis in all communication unless asked.\nIMPORTANT: Minimize output tokens while staying helpful, correct, and accurate. Only address the specific query or task. Avoid tangential information unless it is critical to completing the request. If you can answer in 1-3 sentences or a short paragraph, do that.\nAnswer the user's question directly. One-word answers are best when they suffice. Avoid text before/after your response such as \"The answer is <answer>.\", \"Here is the content of the file\u2026\", \"Based on the information provided\u2026\", or \"Here is what I will do next\u2026\". Examples of appropriate verbosity:\n<example>\nuser: what is 2+2?\nassistant: 4\n</example>\n\n<example>\nuser: is 11 a prime number?\nassistant: Yes\n</example>\n\n<example>\nuser: what command should I run to list files in the current directory?\nassistant: ls\n</example>\n\n<example>\nuser: what command should I run to watch files in the current directory?\nassistant: [use tools to inspect the project, then answer]\nnpm run dev\n</example>\n\n<example>\nuser: what files are in the directory src/?\nassistant: [lists files and sees foo.c, bar.c, baz.c]\nuser: which file contains the implementation of foo?\nassistant: src/foo.c\n</example>\n\n<example>\nuser: write tests for new feature\nassistant: [searches for similar tests, reads relevant files concurrently, edits/writes tests]\n</example>\n\n# Responsiveness\n\n## Preamble messages\n\nBefore making tool calls, send a brief preamble to the user explaining what you're about to do. When sending preamble messages, follow these principles and examples:\n\n- **Logically group related actions**: if you're about to run several related commands, describe them together in one preamble rather than sending a separate note for each.\n- **Keep it concise**: be no more than 1-2 sentences, focused on immediate, tangible next steps. (8\u201312 words for quick updates).\n- **Build on prior context**: if this is not your first tool call, use the preamble message to connect the dots with what's been done so far and create a sense of momentum and clarity for the user to understand your next actions.\n- **Keep your tone light, friendly and curious**: add small touches of personality in preambles feel collaborative and engaging.\n- **Exception**: Avoid adding a preamble for every trivial read (e.g., `cat` a single file) unless it's part of a larger grouped action.\n\nExamples:\n\n- \"I've explored the repo; now checking the API route definitions.\"\n- \"Next, I'll patch the config and update the related tests.\"\n- \"I'm about to scaffold the CLI commands and helper functions.\"\n- \"Ok cool, so I've wrapped my head around the repo. Now digging into the API routes.\"\n- \"Config's looking tidy. Next up is patching helpers to keep things in sync.\"\n- \"Finished poking at the DB gateway. I will now chase down error handling.\"\n- \"Alright, build pipeline order is interesting. Checking how it reports failures.\"\n- \"Spotted a clever caching util; now hunting where it gets used.\"\n\n# Planning\n\nIf a planning tool is available, use it when it helps track complex work. Keep the plan brief and update it as work progresses.\n\nNote that plans are not for padding out simple work with filler steps or stating the obvious. The content of your plan should not involve doing anything that you aren't capable of doing (i.e. don't try to test things that you can't test). Do not use plans for simple or single-step queries that you can just do or answer immediately.\n\nWhen a planning tool displays the plan, summarize only what changed or what comes next.\n\nKeep any active plan aligned with the work completed and remaining.\n\nUse a plan when:\n\n- The task is non-trivial and will require multiple actions over a long time horizon.\n- There are logical phases or dependencies where sequencing matters.\n- The work has ambiguity that benefits from outlining high-level goals.\n- You want intermediate checkpoints for feedback and validation.\n- When the user asked you to do more than one thing in a single prompt\n- The user has asked you to use the plan tool (aka \"TODOs\")\n- You generate additional steps while working, and plan to do them before yielding to the user\n\n## Examples\n\n**High-quality plans**\n\nExample 1:\n\n1. Add CLI entry with file args\n2. Parse Markdown via CommonMark library\n3. Apply semantic HTML template\n4. Handle code blocks, images, links\n5. Add error handling for invalid files\n\nExample 2:\n\n1. Define CSS variables for colors\n2. Add toggle with localStorage state\n3. Refactor components to use variables\n4. Verify all views for readability\n5. Add smooth theme-change transition\n\nExample 3:\n\n1. Set up Node.js + WebSocket server\n2. Add join/leave broadcast events\n3. Implement messaging with timestamps\n4. Add usernames + mention highlighting\n5. Persist messages in lightweight DB\n6. Add typing indicators + unread count\n\n**Low-quality plans**\n\nExample 1:\n\n1. Create CLI tool\n2. Add Markdown parser\n3. Convert to HTML\n\nExample 2:\n\n1. Add dark mode toggle\n2. Save preference\n3. Make styles look good\n\nExample 3:\n\n1. Create single-file HTML game\n2. Run quick sanity check\n3. Summarize usage instructions\n\nIf you need to write a plan, only write high quality plans, not low quality ones.\n\n## Plan mode and clarification (harness specifics)\n\n- When the session is in plan mode, inspect without making changes and produce a concrete plan. Outside plan mode, proceed with authorized work and ask for approval only when the action requires it.\n- Prefer the durable plan file path over relying on chat memory after compaction.\n- When requirements are ambiguous, ask a targeted question using an available user-input tool instead of guessing.\n- An execution checklist is not a substitute for a durable plan when the task requires one.\n\n# Task execution\n\nYou are a coding agent. Please keep going until the query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved. Autonomously resolve the query to the best of your ability, using the tools available to you, before coming back to the user. Do NOT guess or make up an answer.\n\nYou MUST adhere to the following criteria when solving queries:\n\n- Working on the repo(s) in the current environment is allowed, even if they are proprietary.\n- Analyzing code for vulnerabilities is allowed.\n- Showing user code and tool call details is allowed.\n- Use the editing tools available in the current host to modify files. Do not assume a particular tool name.\n\nIf completing the user's task requires writing or modifying files, your code and final answer should follow these coding guidelines, though user instructions (i.e. AGENTS.md) may override these guidelines:\n\n- Fix the problem at the root cause rather than applying surface-level patches, when possible.\n- Avoid unneeded complexity in your solution.\n- Do not attempt to fix unrelated bugs or broken tests. It is not your responsibility to fix them. (You may mention them to the user in your final message though.)\n- Update documentation as necessary.\n- Keep changes consistent with the style of the existing codebase. Changes should be minimal and focused on the task.\n- Use `git log` and `git blame` to search the history of the codebase if additional context is required.\n- NEVER add copyright or license headers unless specifically requested.\n- Do not waste tokens by re-reading files after editing them. The tool call will fail if it didn't work. The same goes for making folders, deleting folders, etc.\n- Do not `git commit` your changes or create new git branches unless explicitly requested.\n- Add comments when they explain a non-obvious invariant or reason for a decision.\n- Do not use one-letter variable names unless explicitly requested.\n- NEVER output inline citations like \"\u3010F:README.md\u2020L5-L14\u3011\" in your outputs. The CLI is not able to render these so they will just be broken in the UI. Instead, if you output valid filepaths, users will be able to click on them to open the files in their editor.\n\n# Validating your work\n\nIf the codebase has tests or the ability to build or run, consider using them to verify that your work is complete.\n\nWhen testing, your philosophy should be to start as specific as possible to the code you changed so that you can catch issues efficiently, then make your way to broader tests as you build confidence. If there's no test for the code you changed, and if the adjacent patterns in the codebases show that there's a logical place for you to add a test, you may do so. However, do not add tests to codebases with no tests.\n\nSimilarly, once you're confident in correctness, you can suggest or use formatting commands to ensure that your code is well formatted. If there are issues you can iterate up to 3 times to get formatting right, but if you still can't manage it's better to save the user time and present them a correct solution where you call out the formatting in your final message. If the codebase does not have a formatter configured, do not add one.\n\nFor all of testing, running, building, and formatting, do not attempt to fix unrelated bugs. It is not your responsibility to fix them. (You may mention them to the user in your final message though.)\n\nBe mindful of whether to run validation commands proactively. In the absence of behavioral guidance:\n\n- When running in a non-interactive mode where edits are auto-approved (print/headless, or the `allow edits` permission mode), proactively run tests, lint and do whatever you need to ensure you've completed the task.\n- In plan mode, stay read-only. Otherwise, run focused checks after changes when the host permits them.\n- When working on test-related tasks, such as adding tests, fixing tests, or reproducing a bug to verify behavior, you may proactively run tests regardless of permission mode. Use your judgement to decide whether this is a test-related task.\n\n# Ambition vs. precision\n\nFor tasks that have no prior context (i.e. the user is starting something brand new), you should feel free to be ambitious and demonstrate creativity with your implementation.\n\nIf you're operating in an existing codebase, you should make sure you do exactly what the user asks with surgical precision. Treat the surrounding codebase with respect, and don't overstep (i.e. changing filenames or variables unnecessarily). You should balance being sufficiently ambitious and proactive when completing tasks of this nature.\n\nYou should use judicious initiative to decide on the right level of detail and complexity to deliver based on the user's needs. This means showing good judgment that you're capable of doing the right extras without gold-plating. This might be demonstrated by high-value, creative touches when scope of the task is vague; while being surgical and targeted when scope is tightly specified.\n\n# Sharing progress updates\n\nFor especially longer tasks that you work on (i.e. requiring many tool calls, or a plan with multiple steps), you should provide progress updates back to the user at reasonable intervals. These updates should be structured as a concise sentence or two (no more than 8-10 words long) recapping progress so far in plain language: this update demonstrates your understanding of what needs to be done, progress so far (i.e. files explores, subtasks complete), and where you're going next.\n\nBefore doing large chunks of work that may incur latency as experienced by the user (i.e. writing a new file), you should send a concise message to the user with an update indicating what you're about to do to ensure they know what you're spending time on. Don't start editing or writing large files before informing the user what you are doing and why.\n\nThe messages you send before tool calls should describe what is immediately about to be done next in very concise language. If there was previous work done, this preamble message should also include a note about the work done so far to bring the user along.\n\n# Presenting your work and final message\n\nYour final message should read naturally, like an update from a concise teammate. For casual conversation, brainstorming tasks, or quick questions from the user, respond in a friendly, conversational tone. You should ask questions, suggest ideas, and adapt to the user's style. If you've finished a large amount of work, when describing what you've done to the user, you should follow the final answer formatting guidelines to communicate substantive changes. You don't need to add structured formatting for one-word answers, greetings, or purely conversational exchanges.\n\nYou can skip heavy formatting for single, simple actions or confirmations. In these cases, respond in plain sentences with any relevant next step or quick option. Reserve multi-section structured responses for results that need grouping or explanation.\n\nThe user is working on the same computer as you, and has access to your work. As such there's no need to show the full contents of large files you have already written unless the user explicitly asks for them. Similarly, if you've created or modified files, there's no need to tell users to \"save the file\" or \"copy the code into a file\"\u2014just reference the file path.\n\nComplete authorized next steps, including relevant tests. Ask before a consequential action that needs approval, and briefly report anything you could not verify.\n\nBrevity is very important as a default. You should be very concise (i.e. no more than 10 lines), but can relax this requirement for tasks where additional detail and comprehensiveness is important for the user's understanding.\n\n## Final answer structure and style guidelines\n\nYou are producing plain text that will later be styled by the CLI. Follow these rules exactly. Formatting should make results easy to scan, but not feel mechanical. Use judgment to decide how much structure adds value.\n\n**Section Headers**\n\n- Use only when they improve clarity \u2014 they are not mandatory for every answer.\n- Choose descriptive names that fit the content\n- Keep headers short (1\u20133 words) and in `**Title Case**`. Always start headers with `**` and end with `**`\n- Use the blank lines required by the renderer for headings and lists.\n- Section headers should only be used where they genuinely improve scanability; avoid fragmenting the answer.\n\n**Bullets**\n\n- Use `-` followed by a space for every bullet.\n- Merge related points when possible; avoid a bullet for every trivial detail.\n- Keep bullets to one line unless breaking for clarity is unavoidable.\n- Group into short lists (4\u20136 bullets) ordered by importance.\n- Use consistent keyword phrasing and formatting across sections.\n\n**Monospace**\n\n- Wrap all commands, file paths, env vars, and code identifiers in backticks (`` `...` ``).\n- Apply to inline examples and to bullet keywords if the keyword itself is a literal file/command.\n- Never mix monospace and bold markers; choose one based on whether it's a keyword (`**`) or inline code/path (`` ` ``).\n\n**File References**\n\nWhen referencing files in your response, make sure to include the relevant start line and always follow the below rules:\n\n- Use inline code to make file paths clickable.\n- Each reference should have a stand alone path. Even if it's the same file.\n- Accepted: absolute, workspace\u2011relative, a/ or b/ diff prefixes, or bare filename/suffix.\n- Line/column (1\u2011based, optional): :line[:column] or #Lline[Ccolumn] (column defaults to 1).\n- Do not use URIs like file://, vscode://, or https://.\n- Do not provide range of lines\n- Examples: src/app.ts, src/app.ts:42, b/server/index.js#L10, C:\\repo\\project\\main.rs:12:5\n\n**Structure**\n\n- Place related bullets together; don't mix unrelated concepts in the same section.\n- Order sections from general \u2192 specific \u2192 supporting info.\n- For subsections (e.g., \"Binaries\" under \"Rust Workspace\"), introduce with a bolded keyword bullet, then list items under it.\n- Match structure to complexity:\n  - Multi-part or detailed results \u2192 use clear headers and grouped bullets.\n  - Simple results \u2192 minimal headers, possibly just a short list or paragraph.\n\n**Tone**\n\n- Keep the voice collaborative and natural, like a coding partner handing off work.\n- Be concise and factual \u2014 no filler or conversational commentary and avoid unnecessary repetition\n- Use present tense and active voice (e.g., \"Runs tests\" not \"This will run tests\").\n- Keep descriptions self-contained; don't refer to \"above\" or \"below\".\n- Use parallel structure in lists for consistency.\n\n**Don't**\n\n- Don't use literal words \"bold\" or \"monospace\" in the content.\n- Don't nest bullets or create deep hierarchies.\n- Don't output ANSI escape codes directly \u2014 the CLI renderer applies them.\n- Don't cram unrelated keywords into a single bullet; split for clarity.\n- Don't let keyword lists run long \u2014 wrap or reformat for scanability.\n\nGenerally, ensure your final answers adapt their shape and depth to the request. For example, answers to code explanations should have a precise, structured explanation with code references that answer the question directly. For tasks with a simple implementation, lead with the outcome and supplement only with what's needed for clarity. Larger changes can be presented as a logical walkthrough of your approach, grouping related steps, explaining rationale where it adds value, and highlighting next actions to accelerate the user. Your answers should provide the right level of detail while being easily scannable.\n\nFor casual greetings, acknowledgements, or other one-off conversational messages that are not delivering substantive information or structured results, respond naturally without section headers or bullet formatting.\n\n# Professional objectivity\n\nPrioritize technical accuracy and truthfulness over validating the user's beliefs. Focus on facts and problem-solving. Be direct and objective without unnecessary praise or emotional validation. Disagree when needed. When uncertain, investigate before confirming the user's assumptions.\n\n# Proactiveness\n\nProactively complete work that follows from the user's request. Avoid unrelated actions that would surprise the user. Strike a balance between:\n\n1. Doing the right thing when asked, including follow-up actions\n2. Not surprising the user with unrequested actions\n   For example, if the user asks how to approach something, answer first; do not immediately jump into edits.\n\n# Following conventions\n\nWhen changing files, first understand the file's conventions. Mimic code style, use existing libraries and utilities, and follow existing patterns.\n\n- NEVER assume a library is available, even if it is well known. Whenever you write code that uses a library or framework, first check that this codebase already uses it (neighboring files, package.json, cargo.toml, go.mod, etc.).\n- When creating a new component, first look at existing components for framework choice, naming, typing, and other conventions.\n- When editing code, first look at surrounding context (especially imports) to understand chosen frameworks/libraries, then make the change idiomatically.\n- Always follow security best practices. Never introduce code that exposes or logs secrets and keys. Never commit secrets or keys to the repository.\n\n# Doing tasks\n\nThe user will primarily request software engineering tasks: bugs, features, refactors, explanations, and more. Recommended steps:\n\n- Use available search/read tools extensively to understand the codebase and the query (in parallel when independent).\n- Implement the solution with the tools available to you.\n- Prefer editing existing files. Create documentation when the task or project instructions require it.\n- Verify when possible with tests. NEVER assume a specific test framework or script \u2014 check README / AGENTS.md or search the repo.\n- Run lint and typecheck commands (for example npm run lint, npm run typecheck, ruff, pnpm lint) if they were provided to you \u2014 see Validating your work for when to run them proactively vs. when to hold off. If you cannot find the correct command, ask the user, and if they supply it, proactively suggest writing it to AGENTS.md so you know next time.\n\n- Tool results and user messages may include <system-reminder> tags. Those tags contain useful reminders. They are NOT part of the user's provided input or the tool result.\n\n# Tool usage policy\n\n- Prefer specialized file tools over shell for reading, editing, writing, listing, and searching when those tools are available. Use the `grep`, `glob`, and `list` tools instead of bash for search and listing \u2014 they are ripgrep-backed and return structured, length-capped results. Use shell for real system commands (git, package managers, builds, tests, process control).\n- When doing broad codebase exploration, use the available search tools and delegate only when the task benefits from independent work.\n- You can call multiple tools in one response. When multiple independent pieces of information are needed, batch tool calls for performance. When making multiple bash tool calls, send a single message with multiple tool calls so they can run in parallel (for example git status and git diff together).\n- Match edit old-text exactly, including whitespace.\n- If a tool call is denied by policy, adapt: use an allowed approach or ask the user. Do not retry the same blocked call in a loop.\n\n## Shell commands\n\nWhen using the shell, you must adhere to the following guidelines:\n\n- When searching for text or files, prefer using `rg` or `rg --files` respectively because `rg` is much faster than alternatives like `grep` and `find`. (If the `rg` command is not found, then use alternatives.) Reach for the shell only when the `grep`/`glob` tools cannot express the query \u2014 for example counting matches, or piping results into another command.\n- Search narrow first: use `rg -l` or `rg -c` to find which files match, then read only those files. Do not dump full match bodies across a repo into context.\n- Never pipe a large file into your context. Do not `cat` a big file; use the `read` tool with an offset/limit, or `sed -n 'START,ENDp'` for a specific range.\n- Do not use python scripts to attempt to output larger chunks of a file.\n\nIMPORTANT: Before you begin work, think about what the code you're editing is supposed to do based on the filenames and directory structure.\n\n# AGENTS.md spec\n\n- Repos often contain AGENTS.md files. These files can appear anywhere within the repository.\n- These files are a way for humans to give you (the agent) instructions or tips for working within the container.\n- Some examples might be: coding conventions, info about how code is organized, or instructions for how to run or test code.\n- Instructions in AGENTS.md files:\n  - The scope of an AGENTS.md file is the entire directory tree rooted at the folder that contains it.\n  - For every file you touch in the final change, you must obey instructions in any AGENTS.md file whose scope includes that file.\n  - Instructions about code style, structure, naming, etc. apply only to code within the AGENTS.md file's scope, unless the file states otherwise.\n  - More-deeply-nested AGENTS.md files take precedence in the case of conflicting instructions.\n  - Direct system/developer/user instructions (as part of a prompt) take precedence over AGENTS.md instructions.\n- The contents of the AGENTS.md file at the root of the repo and the project directory are loaded into your context automatically and don't need to be re-read. AGENTS.md files in subdirectories are NOT loaded automatically: when working in a subdirectory, or a directory outside the CWD, check for any AGENTS.md files that may be applicable.\n\n# Permissions and safety\n\n- Never commit secrets or keys.\n- Never create a git commit unless the user explicitly asks.\n- Do not run destructive commands (mass delete, force-push, hard reset) unless the user clearly requested them.\n";
@@ -30647,7 +31107,7 @@ var require_identity = __commonJS({
     var isDocument = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === DOC;
     var isMap = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === MAP;
     var isPair = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === PAIR;
-    var isScalar = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === SCALAR;
+    var isScalar2 = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === SCALAR;
     var isSeq = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === SEQ;
     function isCollection(node2) {
       if (node2 && typeof node2 === "object")
@@ -30669,7 +31129,7 @@ var require_identity = __commonJS({
         }
       return false;
     }
-    var hasAnchor = (node2) => (isScalar(node2) || isCollection(node2)) && !!node2.anchor;
+    var hasAnchor = (node2) => (isScalar2(node2) || isCollection(node2)) && !!node2.anchor;
     exports2.ALIAS = ALIAS;
     exports2.DOC = DOC;
     exports2.MAP = MAP;
@@ -30684,7 +31144,7 @@ var require_identity = __commonJS({
     exports2.isMap = isMap;
     exports2.isNode = isNode;
     exports2.isPair = isPair;
-    exports2.isScalar = isScalar;
+    exports2.isScalar = isScalar2;
     exports2.isSeq = isSeq;
   }
 });
@@ -35040,13 +35500,13 @@ var require_resolve_block_scalar = __commonJS({
   "../../node_modules/yaml/dist/compose/resolve-block-scalar.js"(exports2) {
     "use strict";
     var Scalar = require_Scalar();
-    function resolveBlockScalar(ctx, scalar, onError) {
-      const start = scalar.offset;
-      const header = parseBlockScalarHeader(scalar, ctx.options.strict, onError);
+    function resolveBlockScalar(ctx, scalar2, onError) {
+      const start = scalar2.offset;
+      const header = parseBlockScalarHeader(scalar2, ctx.options.strict, onError);
       if (!header)
         return { value: "", type: null, comment: "", range: [start, start, start] };
       const type = header.mode === ">" ? Scalar.Scalar.BLOCK_FOLDED : Scalar.Scalar.BLOCK_LITERAL;
-      const lines = scalar.source ? splitLines(scalar.source) : [];
+      const lines = scalar2.source ? splitLines(scalar2.source) : [];
       let chompStart = lines.length;
       for (let i = lines.length - 1; i >= 0; --i) {
         const content = lines[i][1];
@@ -35058,12 +35518,12 @@ var require_resolve_block_scalar = __commonJS({
       if (chompStart === 0) {
         const value2 = header.chomp === "+" && lines.length > 0 ? "\n".repeat(Math.max(1, lines.length - 1)) : "";
         let end2 = start + header.length;
-        if (scalar.source)
-          end2 += scalar.source.length;
+        if (scalar2.source)
+          end2 += scalar2.source.length;
         return { value: value2, type, comment: header.comment, range: [start, end2, end2] };
       }
-      let trimIndent = scalar.indent + header.indent;
-      let offset = scalar.offset + header.length;
+      let trimIndent = scalar2.indent + header.indent;
+      let offset = scalar2.offset + header.length;
       let contentStart = 0;
       for (let i = 0; i < chompStart; ++i) {
         const [indent, content] = lines[i];
@@ -35141,7 +35601,7 @@ var require_resolve_block_scalar = __commonJS({
         default:
           value += "\n";
       }
-      const end = start + header.length + scalar.source.length;
+      const end = start + header.length + scalar2.source.length;
       return { value, type, comment: header.comment, range: [start, end, end] };
     }
     function parseBlockScalarHeader({ offset, props }, strict, onError) {
@@ -35224,8 +35684,8 @@ var require_resolve_flow_scalar = __commonJS({
     "use strict";
     var Scalar = require_Scalar();
     var resolveEnd = require_resolve_end();
-    function resolveFlowScalar(scalar, strict, onError) {
-      const { offset, type, source, end } = scalar;
+    function resolveFlowScalar(scalar2, strict, onError) {
+      const { offset, type, source, end } = scalar2;
       let _type;
       let value;
       const _onError = (rel, code, msg) => onError(offset + rel, code, msg);
@@ -35244,7 +35704,7 @@ var require_resolve_flow_scalar = __commonJS({
           break;
         /* istanbul ignore next should not happen */
         default:
-          onError(scalar, "UNEXPECTED_TOKEN", `Expected a flow scalar value, but found: ${type}`);
+          onError(scalar2, "UNEXPECTED_TOKEN", `Expected a flow scalar value, but found: ${type}`);
           return {
             value: "",
             type: null,
@@ -35458,26 +35918,26 @@ var require_compose_scalar = __commonJS({
         tag = findScalarTagByTest(ctx, value, token, onError);
       else
         tag = ctx.schema[identity.SCALAR];
-      let scalar;
+      let scalar2;
       try {
         const res = tag.resolve(value, (msg) => onError(tagToken ?? token, "TAG_RESOLVE_FAILED", msg), ctx.options);
-        scalar = identity.isScalar(res) ? res : new Scalar.Scalar(res);
+        scalar2 = identity.isScalar(res) ? res : new Scalar.Scalar(res);
       } catch (error61) {
         const msg = error61 instanceof Error ? error61.message : String(error61);
         onError(tagToken ?? token, "TAG_RESOLVE_FAILED", msg);
-        scalar = new Scalar.Scalar(value);
+        scalar2 = new Scalar.Scalar(value);
       }
-      scalar.range = range;
-      scalar.source = value;
+      scalar2.range = range;
+      scalar2.source = value;
       if (type)
-        scalar.type = type;
+        scalar2.type = type;
       if (tagName)
-        scalar.tag = tagName;
+        scalar2.tag = tagName;
       if (tag.format)
-        scalar.format = tag.format;
+        scalar2.format = tag.format;
       if (comment)
-        scalar.comment = comment;
-      return scalar;
+        scalar2.comment = comment;
+      return scalar2;
     }
     function findScalarTagByName(schema, value, tagName, tagToken, onError) {
       if (tagName === "!")
@@ -36226,7 +36686,7 @@ var require_cst = __commonJS({
     var FLOW_END = "";
     var SCALAR = "";
     var isCollection = (token) => !!token && "items" in token;
-    var isScalar = (token) => !!token && (token.type === "scalar" || token.type === "single-quoted-scalar" || token.type === "double-quoted-scalar" || token.type === "block-scalar");
+    var isScalar2 = (token) => !!token && (token.type === "scalar" || token.type === "single-quoted-scalar" || token.type === "double-quoted-scalar" || token.type === "block-scalar");
     function prettyToken(token) {
       switch (token) {
         case BOM:
@@ -36310,7 +36770,7 @@ var require_cst = __commonJS({
     exports2.FLOW_END = FLOW_END;
     exports2.SCALAR = SCALAR;
     exports2.isCollection = isCollection;
-    exports2.isScalar = isScalar;
+    exports2.isScalar = isScalar2;
     exports2.prettyToken = prettyToken;
     exports2.tokenType = tokenType;
   }
@@ -37305,37 +37765,37 @@ var require_parser = __commonJS({
           };
         }
       }
-      *scalar(scalar) {
+      *scalar(scalar2) {
         if (this.type === "map-value-ind") {
           const prev = getPrevProps(this.peek(2));
           const start = getFirstKeyStartProps(prev);
           let sep4;
-          if (scalar.end) {
-            sep4 = scalar.end;
+          if (scalar2.end) {
+            sep4 = scalar2.end;
             sep4.push(this.sourceToken);
-            delete scalar.end;
+            delete scalar2.end;
           } else
             sep4 = [this.sourceToken];
           const map2 = {
             type: "block-map",
-            offset: scalar.offset,
-            indent: scalar.indent,
-            items: [{ start, key: scalar, sep: sep4 }]
+            offset: scalar2.offset,
+            indent: scalar2.indent,
+            items: [{ start, key: scalar2, sep: sep4 }]
           };
           this.onKeyLine = true;
           this.stack[this.stack.length - 1] = map2;
         } else
-          yield* this.lineEnd(scalar);
+          yield* this.lineEnd(scalar2);
       }
-      *blockScalar(scalar) {
+      *blockScalar(scalar2) {
         switch (this.type) {
           case "space":
           case "comment":
           case "newline":
-            scalar.props.push(this.sourceToken);
+            scalar2.props.push(this.sourceToken);
             return;
           case "scalar":
-            scalar.source = this.source;
+            scalar2.source = this.source;
             this.atNewLine = true;
             this.indent = 0;
             if (this.onNewLine) {
@@ -38058,7 +38518,7 @@ function within(root, path) {
 }
 async function resolveReal(path) {
   try {
-    return await (0, import_promises23.realpath)(path);
+    return await (0, import_promises24.realpath)(path);
   } catch {
     const parent = (0, import_path9.dirname)(path);
     if (parent === path) return path;
@@ -38087,14 +38547,14 @@ function createWorkspaceFs(roots, writable) {
   return {
     read: async (params) => {
       const path = await confined(params);
-      const bytes = await (0, import_promises23.readFile)(path);
+      const bytes = await (0, import_promises24.readFile)(path);
       if (bytes.byteLength > MAX_READ_BYTES) throw new FsDenied(`${path} is too large to read`);
       return { content: sliceLines(bytes.toString("utf8"), params) };
     },
     write: async (params) => {
       if (!writable) throw new FsDenied("This session is read-only");
       const path = await confined(params);
-      await (0, import_promises23.writeFile)(path, asString(params.content));
+      await (0, import_promises24.writeFile)(path, asString(params.content));
       return {};
     }
   };
@@ -38191,8 +38651,8 @@ function refusal(error61, displayName) {
   return failure2("failed", String(error61));
 }
 function toolResultText(update) {
-  const texts = (update.content ?? []).flatMap((block) => {
-    const text2 = asString(asRecord(asRecord(block)?.content)?.text);
+  const texts = (update.content ?? []).flatMap((block2) => {
+    const text2 = asString(asRecord(asRecord(block2)?.content)?.text);
     return text2 ? [text2] : [];
   });
   if (typeof update.rawOutput === "string" && update.rawOutput) texts.push(update.rawOutput);
@@ -38288,11 +38748,11 @@ function isStopReason(value) {
 function v2ToolContent(content) {
   if (!Array.isArray(content)) return void 0;
   return content.map((item) => {
-    const block = asRecord(item);
-    if (!block || asString(block.type) !== "diff" || asRecord(block.diff)) return item;
-    const path = asString(block.path);
-    const oldText = typeof block.oldText === "string" ? block.oldText : null;
-    const newText = typeof block.newText === "string" ? block.newText : null;
+    const block2 = asRecord(item);
+    if (!block2 || asString(block2.type) !== "diff" || asRecord(block2.diff)) return item;
+    const path = asString(block2.path);
+    const oldText = typeof block2.oldText === "string" ? block2.oldText : null;
+    const newText = typeof block2.newText === "string" ? block2.newText : null;
     const operation = oldText === null ? "add" : newText === null ? "delete" : "modify";
     return {
       type: "diff",
@@ -38697,7 +39157,7 @@ async function acpTurnInput(run, context) {
   const encoded = await Promise.all(
     images.map(async (image) => ({
       mimeType: image.mimeType,
-      data: (await (0, import_promises24.readFile)(image.path)).toString("base64")
+      data: (await (0, import_promises25.readFile)(image.path)).toString("base64")
     }))
   );
   return {
@@ -38706,7 +39166,7 @@ async function acpTurnInput(run, context) {
     ...encoded.length ? { images: encoded, imagePaths: images.map((image) => image.path) } : {}
   };
 }
-var import_promises23, import_path9, import_crypto13, import_promises24, CURSOR_ASK_QUESTION, copilotAcpProfile, cursorAcpProfile, MODEL_REJECTED, MAX_READ_BYTES, FsDenied, ENV_REFERENCE, AcpBackgroundTasks, CURSOR_CREATE_PLAN, STATUSES, READ_KINDS, ALLOW_KINDS, REJECT_KINDS, CANCELLED_PERMISSION, STOP_REASONS, CHUNKS, ECHOES, AcpTurn, STDERR_TAIL_LINES4, MAX_BETWEEN_UPDATES2, AcpSession, DEFAULTS3, CLIENT_INFO2, TASK_BACKGROUNDED, TASK_COMPLETED, SESSION_NOTIFICATION, KILLED_STATUSES, SUCCESS_STATUSES, SUBAGENT_ID, grokTaskDialect, grokAcpProfile, kimiAcpProfile, ACP_PROFILES, ACP_MODES;
+var import_promises24, import_path9, import_crypto13, import_promises25, CURSOR_ASK_QUESTION, copilotAcpProfile, cursorAcpProfile, MODEL_REJECTED, MAX_READ_BYTES, FsDenied, ENV_REFERENCE, AcpBackgroundTasks, CURSOR_CREATE_PLAN, STATUSES, READ_KINDS, ALLOW_KINDS, REJECT_KINDS, CANCELLED_PERMISSION, STOP_REASONS, CHUNKS, ECHOES, AcpTurn, STDERR_TAIL_LINES4, MAX_BETWEEN_UPDATES2, AcpSession, DEFAULTS3, CLIENT_INFO2, TASK_BACKGROUNDED, TASK_COMPLETED, SESSION_NOTIFICATION, KILLED_STATUSES, SUCCESS_STATUSES, SUBAGENT_ID, grokTaskDialect, grokAcpProfile, kimiAcpProfile, ACP_PROFILES, ACP_MODES;
 var init_acp3 = __esm({
   "../agent-core/dist/providers/acp.js"() {
     "use strict";
@@ -38715,14 +39175,14 @@ var init_acp3 = __esm({
     init_chunk_HBIPWAUI();
     init_chunk_J2KTV5FP();
     init_chunk_M6YHY2EZ();
-    init_chunk_FPGAN4XO();
+    init_chunk_GI3ZGXTY();
     init_chunk_YXWJW7I5();
-    import_promises23 = require("fs/promises");
+    import_promises24 = require("fs/promises");
     import_path9 = require("path");
     init_effort();
     init_acp();
     import_crypto13 = require("crypto");
-    import_promises24 = require("fs/promises");
+    import_promises25 = require("fs/promises");
     init_agent2();
     CURSOR_ASK_QUESTION = "cursor/ask_question";
     copilotAcpProfile = {
@@ -39238,7 +39698,7 @@ var init_acp3 = __esm({
         const turn = new AcpTurn(`acp-${this.#turns}-${id}`, this.#profile);
         let finish = () => {
         };
-        const done = new Promise((resolve7) => {
+        const done = new Promise((resolve9) => {
           finish = (outcome2) => {
             if (this.#current?.id !== id) return;
             this.#current = void 0;
@@ -39246,7 +39706,7 @@ var init_acp3 = __esm({
             if (this.#state === "busy") this.#state = "idle";
             this.#host.scanDescendants(true);
             this.#emit({ type: "turn_ended", turnId: id, outcome: outcome2 });
-            resolve7({ turnId: id, outcome: outcome2, providerSessionId: this.#sessionId });
+            resolve9({ turnId: id, outcome: outcome2, providerSessionId: this.#sessionId });
           };
         });
         const active = { id, turn, done, finish, cancelRequested: false };
@@ -39542,6 +40002,9 @@ var init_driver = __esm({
 });
 
 // src/holder/drivers/persistent.ts
+function sessionContextFor(opened, inputs) {
+  return opened.fresh ? inputs.agentContext?.full : inputs.agentContext?.update;
+}
 function errorMessage(error61) {
   return error61 instanceof Error ? error61.message : String(error61);
 }
@@ -39597,14 +40060,14 @@ function createPersistentDriver(provider4, options) {
   const resumeNotice = (spec, session, sink) => {
     if (spec.resumeFallbackContext) {
       log.info("holder.session_resume_fallback", { harness: provider4.harness, runId: spec.runId });
-      return { session, contextPrefix: spec.resumeFallbackContext };
+      return { session, fresh: true, contextPrefix: spec.resumeFallbackContext };
     }
     sink.onEvent({
       seq: 0,
       at: clock.now(),
       update: noticeUpdate("warning", "session_resume_failed", RESUME_UNAVAILABLE)
     });
-    return { session };
+    return { session, fresh: true };
   };
   const managedMcpAccess = async (signal) => {
     const managed = options.managedMcp;
@@ -39615,7 +40078,7 @@ function createPersistentDriver(provider4, options) {
   const ensureSession = async (spec, inputs, sink, managedMcp) => {
     const wanted = provider4.plan(spec, inputs, void 0, managedMcp);
     const reused = await reuseLive(spec, wanted.key);
-    if (reused) return { session: reused };
+    if (reused) return { session: reused, fresh: false };
     const requested = live.providerSessionId ?? spec.providerSessionId;
     const resumeId = requested !== void 0 && requested !== live.rejectedSessionId && provider4.canResume(wanted, requested) ? requested : void 0;
     const planned = provider4.plan(spec, inputs, resumeId, managedMcp);
@@ -39634,7 +40097,7 @@ function createPersistentDriver(provider4, options) {
       requested
     });
     const resumed = resumeId !== void 0 && !opened.resumeFailed;
-    if (requested === void 0 || resumed) return { session: opened.session };
+    if (requested === void 0 || resumed) return { session: opened.session, fresh: !resumed };
     return resumeNotice(spec, opened.session, sink);
   };
   const runOnSession = async (opened, spec, sink, signal, inputs) => {
@@ -39686,7 +40149,7 @@ function createPersistentDriver(provider4, options) {
       };
       signal.addEventListener("abort", onAbort, { once: true });
       try {
-        const contextPrefix = [inputs.turnContext, opened.contextPrefix].filter((part) => part !== void 0).join("\n\n");
+        const contextPrefix = [sessionContextFor(opened, inputs), opened.contextPrefix].filter((part) => part !== void 0).join("\n\n");
         const input2 = await provider4.turnInput(spec, inputs, contextPrefix || void 0);
         if (signal.aborted) return { outcome: "aborted" };
         const result = await session.sendTurn(input2);
@@ -39867,8 +40330,8 @@ var init_acp4 = __esm({
 });
 
 // ../agent-core/dist/providers/opencode.js
-function parseSseBlock(block) {
-  const data = block.split("\n").map((line) => line.endsWith("\r") ? line.slice(0, -1) : line).filter((line) => line.startsWith("data:")).map((line) => line.slice(5).replace(/^ /, "")).join("\n");
+function parseSseBlock(block2) {
+  const data = block2.split("\n").map((line) => line.endsWith("\r") ? line.slice(0, -1) : line).filter((line) => line.startsWith("data:")).map((line) => line.slice(5).replace(/^ /, "")).join("\n");
   if (!data) return void 0;
   let parsed;
   try {
@@ -40247,7 +40710,7 @@ async function sameDirectory(left, right) {
 }
 async function canonicalDirectory(directory) {
   try {
-    return await (0, import_promises25.realpath)(directory);
+    return await (0, import_promises26.realpath)(directory);
   } catch {
     return (0, import_path10.resolve)(directory);
   }
@@ -40443,7 +40906,7 @@ function openCodeTurnInput(run, context) {
     ...images.length ? { imagePaths: images.map((image) => image.path) } : {}
   };
 }
-var import_http4, import_crypto14, import_promises25, import_path10, import_path11, import_url2, import_crypto15, IDLE_SOCKET_MS2, OpenCodeHttpError, OpenCodeClient, OPENCODE_CONFIG_ENV, OPENCODE_ENGINE, TEXT_PARTS, STEP_PARTS, STOPPED_BY_USER, OpenCodeSubagents, NAMED_KINDS, OPENCODE_ABORTED_ERROR, PROVIDER_EVENT_META, TASK_TOOL_NAME, TASK_RESULT_TAG, TASK_ERROR_TAG, PERMISSION_DENIED, FILE_OPERATIONS, PartReader, NOTHING, NON_INTERACTIVE_PERMISSIONS, CONTENT_FILTER_FINISHES, OUTPUT_PARTS, OpenCodeTurn, LISTENING, OUTPUT_TAIL_LINES, IMAGE_TYPES, OpenCodeSession, OPENCODE_MIN_VERSION, OPENCODE_REQUIREMENT, OPENCODE_TESTED_LINE, OPENCODE_SUPPORTED_MAJOR, DEFAULTS4, STORE_LOCKED, NON_INTERACTIVE_RULES, TITLE_LENGTH, MAX_VARIANT_LENGTH;
+var import_http4, import_crypto14, import_promises26, import_path10, import_path11, import_url2, import_crypto15, IDLE_SOCKET_MS2, OpenCodeHttpError, OpenCodeClient, OPENCODE_CONFIG_ENV, OPENCODE_ENGINE, TEXT_PARTS, STEP_PARTS, STOPPED_BY_USER, OpenCodeSubagents, NAMED_KINDS, OPENCODE_ABORTED_ERROR, PROVIDER_EVENT_META, TASK_TOOL_NAME, TASK_RESULT_TAG, TASK_ERROR_TAG, PERMISSION_DENIED, FILE_OPERATIONS, PartReader, NOTHING, NON_INTERACTIVE_PERMISSIONS, CONTENT_FILTER_FINISHES, OUTPUT_PARTS, OpenCodeTurn, LISTENING, OUTPUT_TAIL_LINES, IMAGE_TYPES, OpenCodeSession, OPENCODE_MIN_VERSION, OPENCODE_REQUIREMENT, OPENCODE_TESTED_LINE, OPENCODE_SUPPORTED_MAJOR, DEFAULTS4, STORE_LOCKED, NON_INTERACTIVE_RULES, TITLE_LENGTH, MAX_VARIANT_LENGTH;
 var init_opencode = __esm({
   "../agent-core/dist/providers/opencode.js"() {
     "use strict";
@@ -40452,12 +40915,12 @@ var init_opencode = __esm({
     init_chunk_HBIPWAUI();
     init_chunk_J2KTV5FP();
     init_chunk_M6YHY2EZ();
-    init_chunk_FPGAN4XO();
+    init_chunk_GI3ZGXTY();
     init_chunk_YXWJW7I5();
     import_http4 = require("http");
     init_runtime_v2();
     import_crypto14 = require("crypto");
-    import_promises25 = require("fs/promises");
+    import_promises26 = require("fs/promises");
     import_path10 = require("path");
     init_agent2();
     import_path11 = require("path");
@@ -41922,8 +42385,8 @@ function createDroidPeer(writer, handlers) {
     },
     request: (method, params = {}) => {
       const id = `alan-${counter.next++}`;
-      return new Promise((resolve7, reject) => {
-        pending.set(id, { method, resolve: resolve7, reject });
+      return new Promise((resolve9, reject) => {
+        pending.set(id, { method, resolve: resolve9, reject });
         writer.write(envelope("request", { id, method, params })).catch((error61) => {
           pending.delete(id);
           reject(error61 instanceof Error ? error61 : new Error(String(error61)));
@@ -42008,7 +42471,7 @@ function droidToolCall(toolUse) {
 function droidResultText(result) {
   const blocks = asArray(result.content);
   if (blocks.length) {
-    return blocks.map((block) => asString(asRecord(block)?.text)).filter(Boolean).join("\n");
+    return blocks.map((block2) => asString(asRecord(block2)?.text)).filter(Boolean).join("\n");
   }
   const value = result.value;
   if (typeof value === "string") return value;
@@ -42258,12 +42721,12 @@ async function droidTurnInput(run, context) {
   const encoded = await Promise.all(
     images.map(async (image) => ({
       mimeType: image.mimeType,
-      data: (await (0, import_promises26.readFile)(image.path)).toString("base64")
+      data: (await (0, import_promises27.readFile)(image.path)).toString("base64")
     }))
   );
   return { turnId: run.runId, text: text2, ...encoded.length ? { images: encoded } : {} };
 }
-var import_crypto16, import_promises26, FACTORY_API_VERSION, FACTORY_PROTOCOL_VERSION, SUBAGENT_TOOLS, TASK_OUTPUT_TOOLS, TASK_STOP_TOOLS, SILENT2, DroidTurn, STDERR_TAIL_LINES5, UNSUPPORTED_REQUEST2, DroidSession, DEFAULTS5, DROID_REQUIREMENT, DROID_JSONRPC_ARGS;
+var import_crypto16, import_promises27, FACTORY_API_VERSION, FACTORY_PROTOCOL_VERSION, SUBAGENT_TOOLS, TASK_OUTPUT_TOOLS, TASK_STOP_TOOLS, SILENT2, DroidTurn, STDERR_TAIL_LINES5, UNSUPPORTED_REQUEST2, DroidSession, DEFAULTS5, DROID_REQUIREMENT, DROID_JSONRPC_ARGS;
 var init_droid = __esm({
   "../agent-core/dist/providers/droid.js"() {
     "use strict";
@@ -42272,11 +42735,11 @@ var init_droid = __esm({
     init_chunk_HBIPWAUI();
     init_chunk_J2KTV5FP();
     init_chunk_M6YHY2EZ();
-    init_chunk_FPGAN4XO();
+    init_chunk_GI3ZGXTY();
     init_chunk_YXWJW7I5();
     init_runtime_v2();
     import_crypto16 = require("crypto");
-    import_promises26 = require("fs/promises");
+    import_promises27 = require("fs/promises");
     init_agent2();
     FACTORY_API_VERSION = "1.0.0";
     FACTORY_PROTOCOL_VERSION = "1.187.0";
@@ -42548,14 +43011,14 @@ var init_droid = __esm({
         const turn = new DroidTurn(sessionId, this.#memory);
         let finish = () => {
         };
-        const done = new Promise((resolve7) => {
+        const done = new Promise((resolve9) => {
           finish = (outcome2) => {
             if (this.#current?.id !== id) return;
             this.#current = void 0;
             if (this.#state === "busy") this.#state = "idle";
             this.#host.scanDescendants(true);
             this.#emit({ type: "turn_ended", turnId: id, outcome: outcome2 });
-            resolve7({ turnId: id, outcome: outcome2, providerSessionId: this.#sessionId });
+            resolve9({ turnId: id, outcome: outcome2, providerSessionId: this.#sessionId });
           };
         });
         const active = { id, turn, done, finish, cancelRequested: false };
@@ -42751,7 +43214,7 @@ function settingsPath(env) {
 async function readSettings(path) {
   let raw;
   try {
-    raw = (await (0, import_promises27.readFile)(path, "utf8")).trim();
+    raw = (await (0, import_promises28.readFile)(path, "utf8")).trim();
   } catch {
     return {};
   }
@@ -42769,8 +43232,8 @@ async function selectAntigravityApiKeyMode(env) {
   const settings2 = await readSettings(path);
   if (settings2 === "malformed") return "malformed";
   if (settings2.modelProvider === "gemini") return "already_selected";
-  await (0, import_promises27.mkdir)((0, import_path12.dirname)(path), { recursive: true });
-  await (0, import_promises27.writeFile)(path, JSON.stringify({ ...settings2, modelProvider: "gemini" }), { mode: 384 });
+  await (0, import_promises28.mkdir)((0, import_path12.dirname)(path), { recursive: true });
+  await (0, import_promises28.writeFile)(path, JSON.stringify({ ...settings2, modelProvider: "gemini" }), { mode: 384 });
   return "selected";
 }
 function readAntigravityCapabilities(version2, help) {
@@ -43369,7 +43832,7 @@ function antigravityTurnInput(run, context) {
   });
   return { turnId: run.runId, text: appendImagePathReferences(text2, images) };
 }
-var import_promises27, import_path12, import_fs8, import_path13, import_path14, import_url3, import_crypto17, 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_promises28, import_path12, import_fs8, import_path13, import_path14, import_url3, import_crypto17, 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";
@@ -43378,9 +43841,9 @@ var init_antigravity = __esm({
     init_chunk_XC5676SG();
     init_chunk_HBIPWAUI();
     init_chunk_M6YHY2EZ();
-    init_chunk_FPGAN4XO();
+    init_chunk_GI3ZGXTY();
     init_chunk_YXWJW7I5();
-    import_promises27 = require("fs/promises");
+    import_promises28 = require("fs/promises");
     import_path12 = require("path");
     init_type_guards();
     import_fs8 = require("fs");
@@ -43880,7 +44343,7 @@ function parseConfig(raw) {
 }
 async function writeCommandCodeProjectMcp(cwd, mcp) {
   const path = (0, import_path15.join)(cwd, ".mcp.json");
-  const original = await (0, import_promises28.readFile)(path, "utf8").catch(() => null);
+  const original = await (0, import_promises29.readFile)(path, "utf8").catch(() => null);
   const config2 = parseConfig(original);
   const next = {
     ...config2,
@@ -43897,12 +44360,12 @@ async function writeCommandCodeProjectMcp(cwd, mcp) {
       }
     }
   };
-  await (0, import_promises28.mkdir)(cwd, { recursive: true });
-  await (0, import_promises28.writeFile)(path, `${JSON.stringify(next, null, 2)}
+  await (0, import_promises29.mkdir)(cwd, { recursive: true });
+  await (0, import_promises29.writeFile)(path, `${JSON.stringify(next, null, 2)}
 `);
   return async () => {
-    if (original === null) await (0, import_promises28.rm)(path, { force: true });
-    else await (0, import_promises28.writeFile)(path, original);
+    if (original === null) await (0, import_promises29.rm)(path, { force: true });
+    else await (0, import_promises29.writeFile)(path, original);
   };
 }
 function commandCodeString(value) {
@@ -44074,7 +44537,7 @@ function commandCodeTurnInput(run, context) {
   });
   return { turnId: run.runId, text: appendImagePathReferences(text2, images) };
 }
-var import_promises28, import_path15, import_crypto18, 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_promises29, import_path15, import_crypto18, 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";
@@ -44083,9 +44546,9 @@ var init_command_code = __esm({
     init_chunk_HBIPWAUI();
     init_chunk_J2KTV5FP();
     init_chunk_M6YHY2EZ();
-    init_chunk_FPGAN4XO();
+    init_chunk_GI3ZGXTY();
     init_chunk_YXWJW7I5();
-    import_promises28 = require("fs/promises");
+    import_promises29 = require("fs/promises");
     import_path15 = require("path");
     init_agent2();
     init_runtime_v2();
@@ -44947,7 +45410,7 @@ function transportFailure(request2, error61) {
   });
 }
 function readBody(incoming, url2, maxBytes) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve9, reject) => {
     const declared = Number(incoming.headers["content-length"] ?? "0");
     if (maxBytes !== void 0 && declared > maxBytes) {
       incoming.destroy();
@@ -44966,7 +45429,7 @@ function readBody(incoming, url2, maxBytes) {
       chunks.push(chunk);
     });
     incoming.on("error", reject);
-    incoming.on("end", () => resolve7(Buffer.concat(chunks)));
+    incoming.on("end", () => resolve9(Buffer.concat(chunks)));
   });
 }
 function isConnectionReset(error61) {
@@ -44974,7 +45437,7 @@ function isConnectionReset(error61) {
 }
 function exchange(request2, agents, attempt = 0) {
   const { signal, url: url2 } = request2;
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve9, reject) => {
     if (signal.aborted) {
       reject(signal.reason);
       return;
@@ -45001,7 +45464,7 @@ function exchange(request2, agents, attempt = 0) {
       const stale = outgoing.reusedSocket && !responded && isConnectionReset(error61);
       if (stale && attempt < STALE_SOCKET_RETRIES && !signal.aborted) {
         settle();
-        resolve7(exchange(request2, agents, attempt + 1));
+        resolve9(exchange(request2, agents, attempt + 1));
         return;
       }
       fail(error61);
@@ -45014,7 +45477,7 @@ function exchange(request2, agents, attempt = 0) {
       readBody(incoming, url2, isRedirect(status) ? void 0 : request2.maxBodyBytes).then(
         (body) => {
           settle();
-          resolve7({ status, headers: incoming.headers, body });
+          resolve9({ status, headers: incoming.headers, body });
         },
         fail
       );
@@ -45184,6 +45647,19 @@ var GitFault = class extends Error {
   }
 };
 
+// src/capabilities/git/repository.ts
+var import_promises4 = require("fs/promises");
+var import_node_path3 = require("path");
+async function assertValidBranch(git, repoRoot, branch, signal) {
+  const output2 = await git.run(
+    { cwd: repoRoot, args: ["check-ref-format", "--branch", branch], readOnly: true },
+    signal
+  );
+  if (branch.startsWith("-") || output2.exitCode !== 0) {
+    throw new GitFault("invalid_git_request", "branch is not a valid Git ref");
+  }
+}
+
 // src/capabilities/git/run-git.ts
 var import_node_child_process = require("child_process");
 
@@ -45320,7 +45796,7 @@ function createGitRunner(options) {
       }
       await killProcessTree(child.pid, { signal: "SIGKILL", child, platform });
     };
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve9, reject) => {
       let ending = null;
       const stop = (next) => {
         if (ending !== null) return;
@@ -45345,7 +45821,7 @@ function createGitRunner(options) {
         signal.removeEventListener("abort", onAbort);
         const final = ending ?? last;
         if (final.kind === "exited") {
-          resolve7({ exitCode: final.exitCode, stdout: stdout.text(), stderr: stderr.text() });
+          resolve9({ exitCode: final.exitCode, stdout: stdout.text(), stderr: stderr.text() });
         } else {
           reject(faultFor(final, command));
         }
@@ -45369,8 +45845,8 @@ function createGitRunner(options) {
 
 // src/capabilities/git/checkout-freshness.ts
 var import_node_crypto3 = require("crypto");
-var import_promises7 = require("fs/promises");
-var import_node_path3 = require("path");
+var import_promises8 = require("fs/promises");
+var import_node_path4 = require("path");
 init_zod();
 var REMOTE = "origin";
 var snapshotSchema = external_exports.object({
@@ -45400,7 +45876,7 @@ var freshnessSchema = external_exports.discriminatedUnion("state", [
   })
 ]);
 function freshnessFile(dir, path) {
-  return (0, import_node_path3.join)(dir, `${(0, import_node_crypto3.createHash)("sha256").update(path).digest("hex").slice(0, 32)}.json`);
+  return (0, import_node_path4.join)(dir, `${(0, import_node_crypto3.createHash)("sha256").update(path).digest("hex").slice(0, 32)}.json`);
 }
 function parseStatus(stdout) {
   const lines = stdout.split("\n").filter((line) => line.length > 0);
@@ -45432,32 +45908,35 @@ async function readCheckoutStatus(git, cwd, signal) {
   return output2.exitCode === 0 ? parseStatus(output2.stdout) : null;
 }
 async function isCheckout(path) {
-  return (0, import_promises7.stat)((0, import_node_path3.join)(path, ".git")).then(
+  return (0, import_promises8.stat)((0, import_node_path4.join)(path, ".git")).then(
     () => true,
     () => false
   );
 }
 async function checkoutsUnder(root) {
   if (await isCheckout(root)) return [root];
-  const entries = await (0, import_promises7.readdir)(root, { withFileTypes: true }).catch(() => []);
+  const entries = await (0, import_promises8.readdir)(root, { withFileTypes: true }).catch(() => []);
   const found = await Promise.all(
     entries.filter((entry) => entry.isDirectory()).map(
-      async (entry) => await isCheckout((0, import_node_path3.join)(root, entry.name)) ? (0, import_node_path3.join)(root, entry.name) : null
+      async (entry) => await isCheckout((0, import_node_path4.join)(root, entry.name)) ? (0, import_node_path4.join)(root, entry.name) : null
     )
   );
   return found.filter((path) => path !== null);
 }
+async function recordCheckoutKept(dir, path, reason) {
+  await writeJsonFileAtomic(freshnessFile(dir, path), { state: "kept", path, reason });
+}
 async function readCheckoutFreshness(dir, path) {
-  for (let current = path; ; current = (0, import_node_path3.dirname)(current)) {
+  for (let current = path; ; current = (0, import_node_path4.dirname)(current)) {
     const read = await readJsonFile(freshnessFile(dir, current), freshnessSchema);
     if (read.kind === "ok") return read.value;
-    if ((0, import_node_path3.dirname)(current) === current) return null;
+    if ((0, import_node_path4.dirname)(current) === current) return null;
   }
 }
 
 // src/platform/credential-store/credential-store.ts
 var import_node_crypto4 = require("crypto");
-var import_promises8 = require("fs/promises");
+var import_promises9 = require("fs/promises");
 
 // src/platform/credential-store/parse.ts
 function parseStoredJson(text2, schema) {
@@ -45473,16 +45952,16 @@ function parseStoredJson(text2, schema) {
 
 // src/platform/windows-helper.ts
 var import_node_fs3 = require("fs");
-var import_node_path4 = require("path");
+var import_node_path5 = require("path");
 var import_node_url = require("url");
 var import_meta = {};
 function windowsHelperPath(entry = process.argv[1]) {
-  const packaged = entry === void 0 ? null : (0, import_node_path4.join)((0, import_node_path4.dirname)((0, import_node_path4.resolve)(entry)), "alan-winhelper.exe");
+  const packaged = entry === void 0 ? null : (0, import_node_path5.join)((0, import_node_path5.dirname)((0, import_node_path5.resolve)(entry)), "alan-winhelper.exe");
   if (entry !== void 0) {
     if (packaged !== null && (0, import_node_fs3.existsSync)(packaged)) return packaged;
   }
   try {
-    const local = (0, import_node_path4.resolve)((0, import_node_path4.dirname)((0, import_node_url.fileURLToPath)(import_meta.url)), "../../dist/alan-winhelper.exe");
+    const local = (0, import_node_path5.resolve)((0, import_node_path5.dirname)((0, import_node_url.fileURLToPath)(import_meta.url)), "../../dist/alan-winhelper.exe");
     return (0, import_node_fs3.existsSync)(local) ? local : packaged;
   } catch {
     return packaged;
@@ -45550,7 +46029,7 @@ function createFileCredentialStore(path) {
     kind: "file",
     read: (schema) => readJsonFile(path, schema),
     write: (value) => writeJsonFileAtomic(path, value),
-    clear: () => (0, import_promises8.rm)(path, { force: true })
+    clear: () => (0, import_promises9.rm)(path, { force: true })
   };
 }
 var KEYCHAIN_SERVICE = "ai.tryalan.runtime";
@@ -45645,14 +46124,14 @@ function defaultCredentialStoreKind(platform) {
 var import_node_child_process3 = require("child_process");
 var import_node_crypto5 = require("crypto");
 var import_node_fs4 = require("fs");
-var import_promises10 = require("fs/promises");
-var import_node_path5 = require("path");
+var import_promises11 = require("fs/promises");
+var import_node_path6 = require("path");
 var import_node_util2 = require("util");
 init_zod();
 
 // src/platform/process-identity.ts
 var import_node_child_process2 = require("child_process");
-var import_promises9 = require("fs/promises");
+var import_promises10 = require("fs/promises");
 var import_node_util = require("util");
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process2.execFile);
 function isProcessAlive(pid) {
@@ -45664,13 +46143,13 @@ function isProcessAlive(pid) {
   }
 }
 async function linuxStartTime(pid) {
-  const stat15 = await (0, import_promises9.readFile)(`/proc/${pid}/stat`, "utf8").catch(() => null);
-  if (stat15 === null) return null;
-  const fields = stat15.slice(stat15.lastIndexOf(")") + 2).split(" ");
+  const stat16 = await (0, import_promises10.readFile)(`/proc/${pid}/stat`, "utf8").catch(() => null);
+  if (stat16 === null) return null;
+  const fields = stat16.slice(stat16.lastIndexOf(")") + 2).split(" ");
   return fields[19] ?? null;
 }
 async function linuxCommand(pid) {
-  const raw = await (0, import_promises9.readFile)(`/proc/${pid}/cmdline`, "utf8").catch(() => null);
+  const raw = await (0, import_promises10.readFile)(`/proc/${pid}/cmdline`, "utf8").catch(() => null);
   return raw === null ? null : normalizeCommand(raw.replaceAll("\0", " "));
 }
 async function darwinCommand(pid) {
@@ -45764,11 +46243,11 @@ async function mayBeSameProcess(expected, probe = systemProcessProbe) {
 var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process3.execFile);
 var packageJsonSchema = external_exports.object({ version: external_exports.string().min(1) });
 function markVersionInUse(bundlePath) {
-  const versionDir = (0, import_node_path5.dirname)(bundlePath);
-  if ((0, import_node_path5.basename)((0, import_node_path5.dirname)(versionDir)) !== "versions") return { [Symbol.dispose]: () => {
+  const versionDir = (0, import_node_path6.dirname)(bundlePath);
+  if ((0, import_node_path6.basename)((0, import_node_path6.dirname)(versionDir)) !== "versions") return { [Symbol.dispose]: () => {
   } };
-  const marker = (0, import_node_path5.join)(versionDir, ".running", String(process.pid));
-  (0, import_node_fs4.mkdirSync)((0, import_node_path5.dirname)(marker), { recursive: true, mode: 448 });
+  const marker = (0, import_node_path6.join)(versionDir, ".running", String(process.pid));
+  (0, import_node_fs4.mkdirSync)((0, import_node_path6.dirname)(marker), { recursive: true, mode: 448 });
   (0, import_node_fs4.writeFileSync)(marker, "");
   const remove = () => (0, import_node_fs4.rmSync)(marker, { force: true });
   process.once("exit", remove);
@@ -45784,36 +46263,36 @@ function markVersionInUse(bundlePath) {
 var import_node_crypto6 = require("crypto");
 var import_node_fs5 = require("fs");
 var import_node_os = require("os");
-var import_node_path6 = require("path");
+var import_node_path7 = require("path");
 function removeStaleEndpoint(endpoint) {
   if (!endpoint.startsWith("\\\\.\\pipe\\")) (0, import_node_fs5.rmSync)(endpoint, { force: true });
 }
 
 // src/platform/paths.ts
-var import_node_path7 = require("path");
+var import_node_path8 = require("path");
 function runtimePaths(stateDir) {
   return {
     stateDir,
-    lock: (0, import_node_path7.join)(stateDir, "runtime.lock"),
-    machine: (0, import_node_path7.join)(stateDir, "machine.json"),
-    credential: (0, import_node_path7.join)(stateDir, "credential.json"),
-    runs: (0, import_node_path7.join)(stateDir, "runs"),
-    sessions: (0, import_node_path7.join)(stateDir, "sessions"),
-    sockets: (0, import_node_path7.join)(stateDir, "s"),
-    logs: (0, import_node_path7.join)(stateDir, "logs"),
-    tmp: (0, import_node_path7.join)(stateDir, "tmp")
+    lock: (0, import_node_path8.join)(stateDir, "runtime.lock"),
+    machine: (0, import_node_path8.join)(stateDir, "machine.json"),
+    credential: (0, import_node_path8.join)(stateDir, "credential.json"),
+    runs: (0, import_node_path8.join)(stateDir, "runs"),
+    sessions: (0, import_node_path8.join)(stateDir, "sessions"),
+    sockets: (0, import_node_path8.join)(stateDir, "s"),
+    logs: (0, import_node_path8.join)(stateDir, "logs"),
+    tmp: (0, import_node_path8.join)(stateDir, "tmp")
   };
 }
 
 // src/platform/process-memory.ts
 var import_node_child_process4 = require("child_process");
-var import_promises11 = require("fs/promises");
+var import_promises12 = require("fs/promises");
 var import_node_util3 = require("util");
 var execFileAsync3 = (0, import_node_util3.promisify)(import_node_child_process4.execFile);
 var PROBE_TIMEOUT_MS = 2e3;
 async function readProcessRss(pid) {
   if (process.platform === "linux") {
-    const status = await (0, import_promises11.readFile)(`/proc/${pid}/status`, "utf8").catch(() => null);
+    const status = await (0, import_promises12.readFile)(`/proc/${pid}/status`, "utf8").catch(() => null);
     const kilobytes = status === null ? void 0 : /^VmRSS:\s+(\d+)\s+kB$/m.exec(status)?.[1];
     return kilobytes === void 0 ? null : Number(kilobytes) * 1024;
   }
@@ -45830,7 +46309,7 @@ async function readProcessRss(pid) {
 }
 
 // src/platform/runtime-host.ts
-var import_promises12 = require("fs/promises");
+var import_promises13 = require("fs/promises");
 var RUNTIME_HOST_KINDS = ["app", "standalone"];
 
 // src/platform/service/exec.ts
@@ -45845,7 +46324,7 @@ function statusOf(error61) {
   }
   return 1;
 }
-var systemExec = (request2) => new Promise((resolve7) => {
+var systemExec = (request2) => new Promise((resolve9) => {
   const child = (0, import_node_child_process5.execFile)(
     request2.command,
     [...request2.args],
@@ -45856,7 +46335,7 @@ var systemExec = (request2) => new Promise((resolve7) => {
       windowsHide: true
     },
     (error61, stdout, stderr) => {
-      resolve7({ status: statusOf(error61), stdout, stderr });
+      resolve9({ status: statusOf(error61), stdout, stderr });
     }
   );
   child.stdin?.on("error", () => {
@@ -45869,8 +46348,8 @@ init_alan_code();
 
 // src/capabilities/providers/commands.ts
 var import_node_fs6 = require("fs");
-var import_promises16 = require("fs/promises");
-var import_node_path8 = require("path");
+var import_promises17 = require("fs/promises");
+var import_node_path9 = require("path");
 var PROVIDER_COMMANDS = [
   // The engine, not a CLI of its own: `resolveProviderExecutable` finds the bundled one first.
   { backendKind: "alan_code", command: "opencode", name: "Alan Code" },
@@ -45905,8 +46384,8 @@ function pathDelimiter(platform) {
 }
 async function isRunnable(path, platform) {
   try {
-    if (!(await (0, import_promises16.stat)(path)).isFile()) return false;
-    if (platform !== "win32") await (0, import_promises16.access)(path, import_node_fs6.constants.X_OK);
+    if (!(await (0, import_promises17.stat)(path)).isFile()) return false;
+    if (platform !== "win32") await (0, import_promises17.access)(path, import_node_fs6.constants.X_OK);
     return true;
   } catch {
     return false;
@@ -45923,12 +46402,12 @@ async function resolveCommandOnPath(command, env, platform) {
   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
+    (directory) => platform === "win32" ? import_node_path9.win32.isAbsolute(directory) : directory.length > 0
   );
   const extensions = platform === "win32" ? windowsExtensions(command, env) : [""];
   for (const directory of directories) {
     for (const extension of extensions) {
-      const candidate = (0, import_node_path8.join)(directory, `${command}${extension}`);
+      const candidate = (0, import_node_path9.join)(directory, `${command}${extension}`);
       if (await isRunnable(candidate, platform)) return candidate;
     }
   }
@@ -45963,14 +46442,14 @@ function resolveProviderExecutable(provider4, env, platform) {
 
 // src/capabilities/providers/managed.ts
 var import_node_crypto7 = require("crypto");
-var import_promises17 = require("fs/promises");
-var import_node_path9 = require("path");
+var import_promises18 = require("fs/promises");
+var import_node_path10 = require("path");
 init_zod();
 var VERSION = /^[0-9]+\.[0-9]+\.[0-9]+(?:[-+][0-9A-Za-z.-]+)?$/;
 var selectedSchema = external_exports.record(external_exports.string(), external_exports.string());
 async function readManagedProviderVersion(file2, backendKind) {
   try {
-    const selected = selectedSchema.parse(JSON.parse(await (0, import_promises17.readFile)(file2, "utf8")));
+    const selected = selectedSchema.parse(JSON.parse(await (0, import_promises18.readFile)(file2, "utf8")));
     const version2 = selected[backendKind];
     return version2 !== void 0 && VERSION.test(version2) ? version2 : null;
   } catch {
@@ -45981,8 +46460,8 @@ async function readManagedProviderVersion(file2, backendKind) {
 // ../shared/dist/node/skill-package.js
 var import_node_buffer = require("buffer");
 var import_node_crypto8 = require("crypto");
-var import_promises18 = require("fs/promises");
-var import_node_path10 = require("path");
+var import_promises19 = require("fs/promises");
+var import_node_path11 = require("path");
 var import_yaml = __toESM(require_dist(), 1);
 init_contracts();
 init_domain();
@@ -46053,7 +46532,7 @@ async function inspectSkillPackage(packageRoot, options = {}) {
   }
   const inspectedFiles = await Promise.all(files.map(readPackageFile));
   inspectedFiles.sort(comparePackageFiles);
-  const parsedMetadata = parseSkillMetadata(inspectedFiles.find((file2) => file2.manifest.path === "SKILL.md")?.bytes, options.expectedName === void 0 ? (0, import_node_path10.basename)(root) : options.expectedName);
+  const parsedMetadata = parseSkillMetadata(inspectedFiles.find((file2) => file2.manifest.path === "SKILL.md")?.bytes, options.expectedName === void 0 ? (0, import_node_path11.basename)(root) : options.expectedName);
   const manifestFiles = inspectedFiles.map((file2) => file2.manifest);
   const diagnostics = [
     ...parsedMetadata.conformance,
@@ -46071,11 +46550,11 @@ async function inspectSkillPackage(packageRoot, options = {}) {
   };
 }
 async function requirePackageRoot(packageRoot) {
-  const root = await (0, import_promises18.realpath)((0, import_node_path10.resolve)(packageRoot)).catch(() => null);
+  const root = await (0, import_promises19.realpath)((0, import_node_path11.resolve)(packageRoot)).catch(() => null);
   if (!root) {
     throw new SkillPackageError("INVALID_PACKAGE_ROOT", "Skill package directory does not exist");
   }
-  const rootStat = await (0, import_promises18.lstat)(root);
+  const rootStat = await (0, import_promises19.lstat)(root);
   if (!rootStat.isDirectory()) {
     throw new SkillPackageError("INVALID_PACKAGE_ROOT", "Skill package root must be a directory");
   }
@@ -46095,13 +46574,13 @@ async function walkPackage(root, ignoredPaths) {
   }
   return files;
   async function walkDirectory(directory) {
-    const entries = await (0, import_promises18.readdir)(directory, { withFileTypes: true });
+    const entries = await (0, import_promises19.readdir)(directory, { withFileTypes: true });
     for (const entry of entries) {
-      const absolutePath = (0, import_node_path10.resolve)(directory, entry.name);
+      const absolutePath = (0, import_node_path11.resolve)(directory, entry.name);
       const normalizedPath = normalizeRelativePath(root, absolutePath);
       if (isIgnored(normalizedPath, entry.name, entry.isDirectory(), ignored2))
         continue;
-      const entryStat = await (0, import_promises18.lstat)(absolutePath);
+      const entryStat = await (0, import_promises19.lstat)(absolutePath);
       if (entryStat.isSymbolicLink()) {
         throw new SkillPackageError("SYMLINK_BLOCKED", `Nested symbolic links are not allowed in Skill packages: ${normalizedPath}`, normalizedPath);
       }
@@ -46164,12 +46643,12 @@ function globToRegExp(pattern) {
   return new RegExp(`${source}(?:/.*)?$`);
 }
 function normalizeRelativePath(root, absolutePath) {
-  const nativeRelativePath = (0, import_node_path10.relative)(root, absolutePath);
-  if (!nativeRelativePath || nativeRelativePath.startsWith(`..${import_node_path10.sep}`) || nativeRelativePath === "..") {
+  const nativeRelativePath = (0, import_node_path11.relative)(root, absolutePath);
+  if (!nativeRelativePath || nativeRelativePath.startsWith(`..${import_node_path11.sep}`) || nativeRelativePath === "..") {
     throw new SkillPackageError("INVALID_PATH", "Skill package path escapes its root");
   }
-  const normalized2 = nativeRelativePath.split(import_node_path10.sep).join("/").normalize("NFC");
-  if (normalized2.includes("\0") || normalized2.includes("\uFFFD") || import_node_path10.posix.isAbsolute(normalized2)) {
+  const normalized2 = nativeRelativePath.split(import_node_path11.sep).join("/").normalize("NFC");
+  if (normalized2.includes("\0") || normalized2.includes("\uFFFD") || import_node_path11.posix.isAbsolute(normalized2)) {
     throw new SkillPackageError("INVALID_PATH", `Invalid Skill package path: ${normalized2}`);
   }
   return normalized2;
@@ -46204,13 +46683,13 @@ function requireSafeFile(path, size, normalizedPaths) {
   }
 }
 function isSecretPath(path) {
-  const name = import_node_path10.posix.basename(path).toLowerCase();
+  const name = import_node_path11.posix.basename(path).toLowerCase();
   if (SECRET_BASENAMES.has(name) || name.startsWith(".env."))
     return true;
   return name.endsWith(".private-key.pem") || name.endsWith(".private-key.key");
 }
 async function readPackageFile(file2) {
-  const bytes = await (0, import_promises18.readFile)(file2.absolutePath);
+  const bytes = await (0, import_promises19.readFile)(file2.absolutePath);
   return {
     bytes,
     manifest: {
@@ -46232,12 +46711,12 @@ function classifyFileKind(path) {
     return "reference";
   if (path.startsWith("assets/"))
     return "asset";
-  if (/^(?:licen[cs]e|copying|notice)(?:\.|$)/i.test(import_node_path10.posix.basename(path)))
+  if (/^(?:licen[cs]e|copying|notice)(?:\.|$)/i.test(import_node_path11.posix.basename(path)))
     return "license";
   return "other";
 }
 function classifyPreview(path, bytes) {
-  const extension = import_node_path10.posix.extname(path).toLowerCase();
+  const extension = import_node_path11.posix.extname(path).toLowerCase();
   if (IMAGE_EXTENSIONS2.has(extension))
     return "image";
   if (bytes.includes(0))
@@ -46341,7 +46820,7 @@ function normalizePackageReference(value) {
   const withoutSuffix = trimmed4.split(/[?#]/, 1)[0];
   if (!withoutSuffix)
     return null;
-  const normalized2 = import_node_path10.posix.normalize(withoutSuffix).replace(/^\.\//, "").normalize("NFC");
+  const normalized2 = import_node_path11.posix.normalize(withoutSuffix).replace(/^\.\//, "").normalize("NFC");
   if (normalized2 === ".." || normalized2.startsWith("../"))
     return null;
   return normalized2;
@@ -46380,8 +46859,8 @@ function uint642(value) {
 }
 
 // src/capabilities/skills/store.ts
-var import_promises19 = require("fs/promises");
-var import_node_path11 = require("path");
+var import_promises20 = require("fs/promises");
+var import_node_path12 = require("path");
 
 // ../shared/dist/node/alan-skill-identity.js
 var import_node_crypto9 = require("crypto");
@@ -46404,21 +46883,21 @@ function alanSkillVersionId(slug, contentHash) {
 init_runtime_v2();
 init_zod();
 function skillsLayout(stateDir, home) {
-  const root = (0, import_node_path11.join)(stateDir, "skills");
+  const root = (0, import_node_path12.join)(stateDir, "skills");
   return {
     root,
-    installedFile: (0, import_node_path11.join)(root, "installed.json"),
-    retiredFile: (0, import_node_path11.join)(root, "retired.json"),
-    localFile: (0, import_node_path11.join)(root, "local.json"),
-    versionsDir: (0, import_node_path11.join)(root, "versions"),
-    tmpDir: (0, import_node_path11.join)(root, "tmp"),
-    pluginDir: (0, import_node_path11.join)(root, "alan-plugin"),
-    pluginSkillsDir: (0, import_node_path11.join)(root, "alan-plugin", "skills"),
-    nativeDir: home === void 0 || home === "" ? null : (0, import_node_path11.join)(home, ".agents", "skills")
+    installedFile: (0, import_node_path12.join)(root, "installed.json"),
+    retiredFile: (0, import_node_path12.join)(root, "retired.json"),
+    localFile: (0, import_node_path12.join)(root, "local.json"),
+    versionsDir: (0, import_node_path12.join)(root, "versions"),
+    tmpDir: (0, import_node_path12.join)(root, "tmp"),
+    pluginDir: (0, import_node_path12.join)(root, "alan-plugin"),
+    pluginSkillsDir: (0, import_node_path12.join)(root, "alan-plugin", "skills"),
+    nativeDir: home === void 0 || home === "" ? null : (0, import_node_path12.join)(home, ".agents", "skills")
   };
 }
 function packageDirectory(layout, versionId) {
-  return (0, import_node_path11.join)(layout.versionsDir, versionId);
+  return (0, import_node_path12.join)(layout.versionsDir, versionId);
 }
 var installedFileSchema = external_exports.object({ skills: external_exports.array(desiredMachineSkillSchema) });
 async function readInstalledSkills(layout) {
@@ -46445,7 +46924,7 @@ async function readLocalSkills(layout) {
 async function isLocalSkillCurrent(entry, contentHash, ignoredPaths) {
   if (entry.contentHash !== contentHash) return false;
   try {
-    if (await (0, import_promises19.realpath)(entry.path) !== entry.path) return false;
+    if (await (0, import_promises20.realpath)(entry.path) !== entry.path) return false;
     const inspected = await inspectSkillPackage(entry.path, { expectedName: null, ignoredPaths });
     return inspected.contentHash === contentHash;
   } catch {
@@ -46460,7 +46939,7 @@ async function resolveLocalSkill(local, invocation) {
 }
 async function hasSkillFile(directory) {
   try {
-    return (await (0, import_promises19.stat)((0, import_node_path11.join)(directory, "SKILL.md"))).isFile();
+    return (await (0, import_promises20.stat)((0, import_node_path12.join)(directory, "SKILL.md"))).isFile();
   } catch {
     return false;
   }
@@ -46478,7 +46957,7 @@ async function isIntact(layout, skill) {
 async function resolveNativeBuiltIn(layout, invocation, baked) {
   const slug = invocation.displayName;
   if (layout.nativeDir === null || invocation.skillId !== alanSkillId(slug)) return null;
-  const directory = (0, import_node_path11.join)(layout.nativeDir, slug);
+  const directory = (0, import_node_path12.join)(layout.nativeDir, slug);
   try {
     const inspected = await inspectSkillPackage(directory, { expectedName: slug });
     if (baked === "exact" && alanSkillVersionId(slug, inspected.contentHash) !== invocation.versionId)
@@ -46524,10 +47003,10 @@ async function availableSkillIndex(layout) {
     });
   }
   if (layout.nativeDir !== null) {
-    const entries = await (0, import_promises19.readdir)(layout.nativeDir, { withFileTypes: true }).catch(() => []);
+    const entries = await (0, import_promises20.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) });
+        candidates2.push({ directory: (0, import_node_path12.join)(layout.nativeDir, entry.name) });
     }
   }
   const bounded = candidates2.slice(0, 2e3);
@@ -46557,8 +47036,8 @@ async function inspectIndexedSkill(directory, contentHash) {
 // src/capabilities/skills/native-index.ts
 var import_node_crypto10 = require("crypto");
 var import_node_fs7 = require("fs");
-var import_promises20 = require("fs/promises");
-var import_node_path12 = require("path");
+var import_promises21 = require("fs/promises");
+var import_node_path13 = require("path");
 var ALAN_SKILLS_PLUGIN_NAME = "alan";
 var PLUGIN_MANIFEST = `${JSON.stringify(
   {
@@ -46570,18 +47049,18 @@ var PLUGIN_MANIFEST = `${JSON.stringify(
 )}
 `;
 function installedSkillFolders(layout) {
-  return (0, import_node_fs7.existsSync)((0, import_node_path12.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
+  return (0, import_node_fs7.existsSync)((0, import_node_path13.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
 }
 
 // src/capabilities/workspace/index.ts
-var import_node_path15 = require("path");
+var import_node_path16 = require("path");
 
 // src/capabilities/workspace/approved-paths.ts
-var import_promises21 = require("fs/promises");
+var import_promises22 = require("fs/promises");
 init_zod();
 
 // src/capabilities/workspace/paths.ts
-var import_node_path13 = require("path");
+var import_node_path14 = require("path");
 function stripWin32Namespace(path) {
   if (/^\\\\\?\\UNC\\/i.test(path)) return `\\\\${path.slice(8)}`;
   if (path.startsWith("\\\\?\\")) return path.slice(4);
@@ -46589,15 +47068,15 @@ function stripWin32Namespace(path) {
 }
 function comparablePath(path, platform) {
   if (platform === "win32") {
-    const normalized3 = import_node_path13.win32.normalize(stripWin32Namespace(path).replaceAll("/", "\\"));
+    const normalized3 = import_node_path14.win32.normalize(stripWin32Namespace(path).replaceAll("/", "\\"));
     const trimmed4 = normalized3.length > 3 || !/^[a-z]:\\$/i.test(normalized3) ? normalized3.replace(/\\+$/, "") : normalized3;
     return trimmed4.toLowerCase();
   }
-  const normalized2 = import_node_path13.posix.normalize(path);
+  const normalized2 = import_node_path14.posix.normalize(path);
   return normalized2.length > 1 ? normalized2.replace(/\/+$/, "") : normalized2;
 }
 function isAbsoluteFor(path, platform) {
-  return platform === "win32" ? import_node_path13.win32.isAbsolute(path) : import_node_path13.posix.isAbsolute(path);
+  return platform === "win32" ? import_node_path14.win32.isAbsolute(path) : import_node_path14.posix.isAbsolute(path);
 }
 function isWithin(root, candidate, platform) {
   const separator = platform === "win32" ? "\\" : "/";
@@ -46615,7 +47094,7 @@ var storeSchema = external_exports.object({
 });
 async function realpathOrNull(path) {
   try {
-    return await (0, import_promises21.realpath)(path);
+    return await (0, import_promises22.realpath)(path);
   } catch (error61) {
     const code = errnoCode(error61);
     if (code === "ENOENT" || code === "ENOTDIR" || code === "EACCES" || code === "EPERM") {
@@ -46675,8 +47154,8 @@ async function openApprovedPaths(options) {
 
 // src/capabilities/workspace/locks.ts
 var import_node_crypto11 = require("crypto");
-var import_promises22 = require("fs/promises");
-var import_node_path14 = require("path");
+var import_promises23 = require("fs/promises");
+var import_node_path15 = require("path");
 init_zod();
 var LOCK_FORMAT = 1;
 var EXCLUSIVE_FILE = "exclusive.json";
@@ -46696,7 +47175,7 @@ function repositoryLockKey(commonDir, platform) {
 async function readOwner(path) {
   let text2;
   try {
-    text2 = await (0, import_promises22.readFile)(path, "utf8");
+    text2 = await (0, import_promises23.readFile)(path, "utf8");
   } catch (error61) {
     if (errnoCode(error61) === "ENOENT") return { kind: "missing" };
     return { kind: "unreadable" };
@@ -46717,7 +47196,7 @@ async function removeIfSame(path, expected) {
     if (current.kind !== "owner" || current.owner.since !== expected.since) return;
     if (current.owner.pid !== expected.pid || current.owner.holder !== expected.holder) return;
   }
-  await (0, import_promises22.unlink)(path).catch((error61) => {
+  await (0, import_promises23.unlink)(path).catch((error61) => {
     if (errnoCode(error61) !== "ENOENT") throw error61;
   });
 }
@@ -46742,7 +47221,7 @@ function openRepositoryLocks(options) {
       await removeIfSame(path, read.owner);
       return null;
     }
-    const age = await (0, import_promises22.stat)(path).then(
+    const age = await (0, import_promises23.stat)(path).then(
       (info) => clock.now() - info.mtimeMs,
       () => 0
     );
@@ -46756,13 +47235,13 @@ function openRepositoryLocks(options) {
   });
   const folder = async (commonDir) => {
     const key = repositoryLockKey(commonDir, platform);
-    const dir = (0, import_node_path14.join)(options.dir, key);
-    await (0, import_promises22.mkdir)(dir, { recursive: true, mode: 448 });
+    const dir = (0, import_node_path15.join)(options.dir, key);
+    await (0, import_promises23.mkdir)(dir, { recursive: true, mode: 448 });
     return { key, dir };
   };
   const createExclusive = async (path, owner) => {
     try {
-      const handle = await (0, import_promises22.open)(path, "wx", 384);
+      const handle = await (0, import_promises23.open)(path, "wx", 384);
       try {
         await handle.writeFile(JSON.stringify(owner));
       } finally {
@@ -46775,10 +47254,10 @@ function openRepositoryLocks(options) {
     }
   };
   const liveRun = async (dir) => {
-    const entries = await (0, import_promises22.readdir)(dir);
+    const entries = await (0, import_promises23.readdir)(dir);
     for (const entry of entries) {
       if (!entry.startsWith(RUN_FILE_PREFIX)) continue;
-      const holder = await heldBy((0, import_node_path14.join)(dir, entry));
+      const holder = await heldBy((0, import_node_path15.join)(dir, entry));
       if (holder !== null) return holder;
     }
     return null;
@@ -46786,7 +47265,7 @@ function openRepositoryLocks(options) {
   return {
     tryExclusive: async (commonDir, operationId) => {
       const { key, dir } = await folder(commonDir);
-      const path = (0, import_node_path14.join)(dir, EXCLUSIVE_FILE);
+      const path = (0, import_node_path15.join)(dir, EXCLUSIVE_FILE);
       const owner = await self(operationId);
       if (!await createExclusive(path, owner)) {
         const holder = await heldBy(path);
@@ -46805,10 +47284,10 @@ function openRepositoryLocks(options) {
     tryShared: async (commonDir, runId) => {
       const { key, dir } = await folder(commonDir);
       const file2 = `${RUN_FILE_PREFIX}${(0, import_node_crypto11.createHash)("sha256").update(runId).digest("hex").slice(0, 32)}.json`;
-      const path = (0, import_node_path14.join)(dir, file2);
+      const path = (0, import_node_path15.join)(dir, file2);
       const owner = await self(runId);
       await writeJsonFileAtomic(path, owner);
-      const operation = await heldBy((0, import_node_path14.join)(dir, EXCLUSIVE_FILE));
+      const operation = await heldBy((0, import_node_path15.join)(dir, EXCLUSIVE_FILE));
       if (operation !== null) {
         await removeIfSame(path, owner);
         return { kind: "busy", holder: operation };
@@ -46820,30 +47299,30 @@ function openRepositoryLocks(options) {
 
 // src/cli/config.ts
 var import_node_os7 = require("os");
-var import_node_path29 = require("path");
+var import_node_path33 = require("path");
 init_zod();
 
 // src/client/locate.ts
-var import_node_path16 = require("path");
+var import_node_path17 = require("path");
 var RUNTIME_PROFILES = ["production", "staging", "development", "local"];
 function defaultStateDir({ profile, platform, home, env }) {
   if (platform === "win32") {
-    return (0, import_node_path16.join)(env.LOCALAPPDATA ?? (0, import_node_path16.join)(home, "AppData", "Local"), "Alan", profile);
+    return (0, import_node_path17.join)(env.LOCALAPPDATA ?? (0, import_node_path17.join)(home, "AppData", "Local"), "Alan", profile);
   }
-  return (0, import_node_path16.join)(env.XDG_STATE_HOME ?? (0, import_node_path16.join)(home, ".local", "state"), "alan", profile);
+  return (0, import_node_path17.join)(env.XDG_STATE_HOME ?? (0, import_node_path17.join)(home, ".local", "state"), "alan", profile);
 }
 function defaultInstallDir({ platform, home, env }) {
   if (platform === "win32") {
-    return (0, import_node_path16.join)(env.LOCALAPPDATA ?? (0, import_node_path16.join)(home, "AppData", "Local"), "Alan", "runtime");
+    return (0, import_node_path17.join)(env.LOCALAPPDATA ?? (0, import_node_path17.join)(home, "AppData", "Local"), "Alan", "runtime");
   }
-  return (0, import_node_path16.join)(env.XDG_DATA_HOME ?? (0, import_node_path16.join)(home, ".local", "share"), "alan", "runtime");
+  return (0, import_node_path17.join)(env.XDG_DATA_HOME ?? (0, import_node_path17.join)(home, ".local", "share"), "alan", "runtime");
 }
 
 // src/sessions/index.ts
 var import_node_crypto16 = require("crypto");
-var import_promises38 = require("fs/promises");
+var import_promises41 = require("fs/promises");
 var import_node_os6 = require("os");
-var import_node_path28 = require("path");
+var import_node_path32 = require("path");
 
 // src/holder/control-client.ts
 var import_node_crypto12 = require("crypto");
@@ -47010,7 +47489,7 @@ function createProviderDrivers(options) {
 }
 
 // src/holder/engine-records.ts
-var import_node_path17 = require("path");
+var import_node_path18 = require("path");
 init_zod();
 var ENGINES_FILE = "engines.json";
 var engineRecordSchema = external_exports.object({
@@ -47020,7 +47499,7 @@ var engineRecordSchema = external_exports.object({
 });
 var engineRecordsSchema = external_exports.object({ engines: external_exports.array(engineRecordSchema) });
 function engineRecordsPath(sessionDir) {
-  return (0, import_node_path17.join)(sessionDir, ENGINES_FILE);
+  return (0, import_node_path18.join)(sessionDir, ENGINES_FILE);
 }
 function recordSpawnedEngines(path, clock, log) {
   const live = /* @__PURE__ */ new Map();
@@ -47075,17 +47554,17 @@ function createConversationMcpAuthorization(options) {
 }
 
 // src/holder/mcp-helper-access.ts
-var import_promises29 = require("fs/promises");
+var import_promises30 = require("fs/promises");
 function createHelperMcpAccess(options) {
   return {
     [Symbol.asyncDispose]: async () => {
-      await (0, import_promises29.rm)(options.credentialPath, { force: true });
+      await (0, import_promises30.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_promises29.rm)(options.credentialPath, { force: true });
+        await (0, import_promises30.rm)(options.credentialPath, { force: true });
         return void 0;
       }
       const credential = {
@@ -47100,8 +47579,8 @@ function createHelperMcpAccess(options) {
 }
 
 // src/holder/run-inputs.ts
-var import_promises30 = require("fs/promises");
-var import_node_path18 = require("path");
+var import_promises31 = require("fs/promises");
+var import_node_path19 = require("path");
 init_dist();
 var NO_RUN_INPUTS = {
   attachments: [],
@@ -47115,18 +47594,18 @@ function safeFilename(filename) {
   return safe || "attachment";
 }
 async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
-  const dir = (0, import_node_path18.join)(tmpDir, "runs", spec.runId);
+  const dir = (0, import_node_path19.join)(tmpDir, "runs", spec.runId);
   const cleanup = async () => {
-    await (0, import_promises30.rm)(dir, { recursive: true, force: true });
+    await (0, import_promises31.rm)(dir, { recursive: true, force: true });
   };
   try {
     const credential = await source.fetchProviderCredential(spec.runId, signal);
     const attachments = [];
-    if (spec.attachments?.length) await (0, import_promises30.mkdir)(dir, { recursive: true, mode: 448 });
+    if (spec.attachments?.length) await (0, import_promises31.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_path18.join)(dir, `${index}-${safeFilename(attachment.filename)}`);
-      await (0, import_promises30.writeFile)(path, bytes, { mode: 384 });
+      const path = (0, import_node_path19.join)(dir, `${index}-${safeFilename(attachment.filename)}`);
+      await (0, import_promises31.writeFile)(path, bytes, { mode: 384 });
       const imageMimeType = attachment.kind === "image" ? detectImageMimeType(Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength)) : null;
       attachments.push({
         id: attachment.id,
@@ -47157,27 +47636,27 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
 var import_node_crypto15 = require("crypto");
 var import_node_fs11 = require("fs");
 var import_node_net2 = require("net");
-var import_node_path27 = require("path");
+var import_node_path31 = require("path");
 init_runtime_v2();
 
 // src/holder/admission.ts
 var import_node_fs9 = require("fs");
-var import_promises34 = require("fs/promises");
+var import_promises37 = require("fs/promises");
 var import_node_os5 = require("os");
-var import_node_path23 = require("path");
+var import_node_path27 = require("path");
 init_constants();
 
 // ../shared/dist/node/local-workspace.js
 var import_node_fs8 = require("fs");
 var import_node_os4 = require("os");
-var import_node_path19 = require("path");
+var import_node_path20 = require("path");
 function resolveAlanDefaultWorkspacePath(homeDirectory = (0, import_node_os4.homedir)()) {
-  return (0, import_node_path19.join)(homeDirectory, ".alan", "workspace");
+  return (0, import_node_path20.join)(homeDirectory, ".alan", "workspace");
 }
 
 // src/holder/admission-relocation.ts
-var import_promises31 = require("fs/promises");
-var import_node_path20 = require("path");
+var import_promises32 = require("fs/promises");
+var import_node_path21 = require("path");
 var MAX_RELOCATION_CANDIDATES = 200;
 var RELOCATION_BUDGET_MS = 2e4;
 function repositoryIdentity(url2) {
@@ -47212,8 +47691,8 @@ async function originIdentity(git, path, signal) {
 }
 async function childDirectories(parent, limit) {
   try {
-    const entries = await (0, import_promises31.readdir)(parent, { withFileTypes: true });
-    return entries.filter((entry) => entry.isDirectory()).slice(0, limit).map((entry) => (0, import_node_path20.join)(parent, entry.name));
+    const entries = await (0, import_promises32.readdir)(parent, { withFileTypes: true });
+    return entries.filter((entry) => entry.isDirectory()).slice(0, limit).map((entry) => (0, import_node_path21.join)(parent, entry.name));
   } catch {
     return [];
   }
@@ -47221,7 +47700,7 @@ async function childDirectories(parent, limit) {
 async function candidateFolders(search) {
   const roots = /* @__PURE__ */ new Map();
   for (const path of [search.missingPath, ...search.approvedWorkspacePaths]) {
-    const parent = (0, import_node_path20.dirname)((0, import_node_path20.resolve)(path));
+    const parent = (0, import_node_path21.dirname)((0, import_node_path21.resolve)(path));
     roots.set(comparablePath(parent, search.platform), parent);
   }
   const candidates2 = /* @__PURE__ */ new Map();
@@ -47247,28 +47726,262 @@ async function discoverRelocatedWorkspace(search) {
   return matches[0] ?? null;
 }
 
-// src/holder/checkout-refresh.ts
-var import_node_crypto14 = require("crypto");
-var import_promises32 = require("fs/promises");
-var import_node_path21 = require("path");
-function short(sha) {
-  return sha.slice(0, 12);
+// src/holder/agent-context.ts
+var import_promises33 = require("fs/promises");
+var import_node_path22 = require("path");
+
+// ../agent-core/dist/prompt.js
+init_chunk_GI3ZGXTY();
+
+// src/holder/agent-context.ts
+async function readText2(path) {
+  return (0, import_promises33.readFile)(path, "utf8").then(
+    (text2) => text2.trim(),
+    () => null
+  );
 }
-function staleLine(path, snapshot2, tip) {
-  const checkout = snapshot2 === void 0 ? "is the environment snapshot's checkout" : `is the environment snapshot's checkout of ${snapshot2.branch} (commit ${short(snapshot2.head)})`;
-  const base = snapshot2 === void 0 ? "its upstream" : `origin/${snapshot2.base}`;
-  const remote = tip === void 0 ? "may be ahead" : `is ahead at ${short(tip)}`;
-  return `Note: ${path} ${checkout}; ${base} ${remote}. Run \`git pull --ff-only\` there before relying on its files.`;
+async function startCommandState(statusPath) {
+  const [status, exit] = await Promise.all([readText2(statusPath), readText2(`${statusPath}.exit`)]);
+  if (status === null || status === "started") return { state: "pending" };
+  const failed = /^failed (\d+)$/.exec(status);
+  if (failed) return { state: "failed", exitCode: Number(failed[1]) };
+  if (exit === null) return { state: "running" };
+  const code = Number(exit);
+  return code === 0 ? { state: "exited_ok" } : { state: "failed", exitCode: code };
+}
+function createAgentContext(deps) {
+  const statusPath = (0, import_node_path22.join)(deps.homeDir, ".alan", "start-commands.status");
+  const logPath = (0, import_node_path22.join)(deps.homeDir, ".alan", "start-commands.log");
+  return async (spec, problems) => {
+    const file2 = (0, import_node_path22.join)(deps.dir, `${spec.conversationId}.json`);
+    const saved = await readJsonFile(file2, agentContextSnapshotSchema);
+    const known = saved.kind === "ok" ? saved.value : void 0;
+    const hasEnvironment = (spec.agentContext ?? known)?.environment !== void 0;
+    const start = hasEnvironment ? await startCommandState(statusPath) : void 0;
+    const snapshot2 = agentContextSnapshot({
+      spec,
+      ...spec.approvedWorkspacePaths?.[0] ? { workspaceRoot: spec.approvedWorkspacePaths[0] } : {},
+      problems,
+      ...start ? { start } : {},
+      startLogPath: logPath,
+      ...known ? { known } : {}
+    });
+    if (snapshot2 === null) return void 0;
+    const rendered = renderAgentContext(snapshot2, known);
+    return {
+      full: rendered.full,
+      ...rendered.update ? { update: rendered.update } : {},
+      save: () => writeJsonFileAtomic(file2, snapshot2)
+    };
+  };
 }
+
+// src/holder/checkout-refresh.ts
+var import_node_path25 = require("path");
+
+// src/holder/claim-once.ts
+var import_node_crypto14 = require("crypto");
+var import_promises34 = require("fs/promises");
+var import_node_path23 = require("path");
 async function claimOnce(dir, name) {
   try {
-    await (0, import_promises32.mkdir)(dir, { recursive: true, mode: 448 });
-    await (await (0, import_promises32.open)((0, import_node_path21.join)(dir, name), "wx")).close();
+    await (0, import_promises34.mkdir)(dir, { recursive: true, mode: 448 });
+    await (await (0, import_promises34.open)((0, import_node_path23.join)(dir, name), "wx")).close();
     return true;
   } catch {
     return false;
   }
 }
+function claimFirstLease(freshnessDir, path) {
+  return claimOnce((0, import_node_path23.join)(freshnessDir, "leased"), (0, import_node_crypto14.createHash)("sha256").update(path).digest("hex"));
+}
+
+// src/holder/requested-checkout.ts
+var import_promises35 = require("fs/promises");
+var import_node_path24 = require("path");
+var REMOTE2 = "origin";
+var REASON_MAX_CHARS = 200;
+function firstLine2(text2) {
+  return (text2.trim().split("\n")[0] ?? "").slice(0, REASON_MAX_CHARS);
+}
+function reasonOf(output2, command) {
+  return firstLine2(output2.stderr) || `git ${command} exited ${output2.exitCode}`;
+}
+function noted(situation, reason, action) {
+  return { kind: "noted", problem: `${situation}: ${reason}`, action };
+}
+function notSwitched(checkout, current, reason) {
+  const on = current ?? "a detached HEAD";
+  return noted(
+    `is on ${on}, not ${checkout.branch}, the branch picked for this chat`,
+    reason,
+    `Switch it to ${checkout.branch}`
+  );
+}
+async function clone2(checkout, deps, signal) {
+  const parent = (0, import_node_path24.dirname)(checkout.path);
+  await (0, import_promises35.mkdir)(parent, { recursive: true });
+  await assertValidBranch(deps.git, parent, checkout.branch, signal);
+  const output2 = await deps.git.run(
+    {
+      cwd: parent,
+      args: [
+        "clone",
+        "--quiet",
+        "--no-tags",
+        "--depth=1",
+        "--branch",
+        checkout.branch,
+        "--",
+        checkout.repoUrl,
+        checkout.path
+      ],
+      network: true
+    },
+    signal
+  );
+  if (output2.exitCode === 0) return { kind: "moved", how: "cloned" };
+  return noted(
+    `is missing, and cloning it on ${checkout.branch}, the branch picked for this chat, failed`,
+    reasonOf(output2, "clone"),
+    `Clone ${checkout.repoUrl} there`
+  );
+}
+var SWITCHED = { kind: "moved", how: "switched" };
+function coversBranch(fetchConfig, branch) {
+  return fetchConfig.split("\n").some(
+    (refspec) => refspec === `+refs/heads/*:refs/remotes/${REMOTE2}/*` || refspec === `+refs/heads/${branch}:refs/remotes/${REMOTE2}/${branch}`
+  );
+}
+async function fetchBranch(checkout, git, shallow, current) {
+  const { branch } = checkout;
+  const tracking = `refs/remotes/${REMOTE2}/${branch}`;
+  const fetchConfig = await git(["config", "--get-all", `remote.${REMOTE2}.fetch`], {
+    readOnly: true
+  });
+  if (!coversBranch(fetchConfig.stdout, branch)) {
+    const added = await git(["remote", "set-branches", "--add", REMOTE2, branch]);
+    if (added.exitCode !== 0) return notSwitched(checkout, current, reasonOf(added, "remote"));
+  }
+  const depth = shallow ? ["--depth=1"] : [];
+  const fetched = await git(
+    ["fetch", "--no-tags", "--quiet", ...depth, REMOTE2, `refs/heads/${branch}:${tracking}`],
+    { network: true }
+  );
+  if (fetched.exitCode !== 0) return notSwitched(checkout, current, reasonOf(fetched, "fetch"));
+  const tip = await git(["rev-parse", "--verify", tracking], { readOnly: true });
+  if (tip.exitCode !== 0) return notSwitched(checkout, current, reasonOf(tip, "rev-parse"));
+  return { kind: "fetched", tip: tip.stdout.trim() };
+}
+async function moveOnto(checkout, git, tip, current) {
+  const { branch } = checkout;
+  const local = await git(["rev-parse", "--verify", "-q", `refs/heads/${branch}`], {
+    readOnly: true
+  });
+  if (local.exitCode !== 0) {
+    const created = await git([
+      "switch",
+      "--quiet",
+      "-c",
+      branch,
+      "--track",
+      `${REMOTE2}/${branch}`
+    ]);
+    return created.exitCode === 0 ? SWITCHED : notSwitched(checkout, current, reasonOf(created, "switch"));
+  }
+  const localHead = local.stdout.trim();
+  const ancestor = localHead === tip || (await git(["merge-base", "--is-ancestor", localHead, tip], { readOnly: true })).exitCode === 0;
+  if (!ancestor) {
+    return notSwitched(
+      checkout,
+      current,
+      `its local ${branch} has diverged from ${REMOTE2}/${branch}`
+    );
+  }
+  const switched = await git(["switch", "--quiet", branch]);
+  if (switched.exitCode !== 0) return notSwitched(checkout, current, reasonOf(switched, "switch"));
+  if (localHead === tip) return SWITCHED;
+  const merged = await git(["merge", "--quiet", "--ff-only", tip]);
+  return merged.exitCode === 0 ? SWITCHED : noted(
+    `is on ${branch} but behind ${REMOTE2}/${branch}`,
+    reasonOf(merged, "merge"),
+    "Run `git pull --ff-only` there"
+  );
+}
+async function switchTo(checkout, current, operationId, deps, signal) {
+  var _stack = [];
+  try {
+    const cwd = checkout.path;
+    const git = (args, invocation = {}) => deps.git.run({ cwd, args, ...invocation }, signal);
+    await assertValidBranch(deps.git, cwd, checkout.branch, signal);
+    const refs = await git(
+      ["rev-parse", "--path-format=absolute", "--git-common-dir", "--is-shallow-repository"],
+      { readOnly: true }
+    );
+    if (refs.exitCode !== 0) return notSwitched(checkout, current, reasonOf(refs, "rev-parse"));
+    const [commonDir = "", shallow] = refs.stdout.trim().split("\n");
+    const attempt = await deps.locks.tryExclusive(commonDir, operationId);
+    if (attempt.kind === "busy") {
+      return notSwitched(checkout, current, "another git operation holds the checkout");
+    }
+    const _lock = __using(_stack, attempt.lock, true);
+    const now = await readCheckoutStatus(deps.git, cwd, signal);
+    if (now === null || now.dirty) {
+      return notSwitched(checkout, now?.branch ?? current, "it has uncommitted changes");
+    }
+    const fetched = await fetchBranch(checkout, git, shallow === "true", now.branch);
+    if (fetched.kind !== "fetched") return fetched;
+    const outcome2 = await moveOnto(checkout, git, fetched.tip, now.branch);
+    const after = await readCheckoutStatus(deps.git, cwd, signal);
+    if (after?.branch === checkout.branch) {
+      await recordCheckoutKept(deps.dir, cwd, "requested_branch");
+    }
+    return outcome2;
+  } catch (_) {
+    var _error = _, _hasError = true;
+  } finally {
+    var _promise2 = __callDispose(_stack, _error, _hasError);
+    _promise2 && await _promise2;
+  }
+}
+async function applyRequestedCheckout(checkout, spec, deps, signal) {
+  try {
+    if (!await isCheckout(checkout.path)) return await clone2(checkout, deps, signal);
+    const status = await readCheckoutStatus(deps.git, checkout.path, signal);
+    if (status === null) return notSwitched(checkout, null, "git status failed");
+    if (status.branch === checkout.branch) return { kind: "on_branch" };
+    if (status.dirty) return notSwitched(checkout, status.branch, "it has uncommitted changes");
+    if (!await claimFirstLease(deps.dir, checkout.path)) {
+      return notSwitched(
+        checkout,
+        status.branch,
+        "an earlier conversation on this machine already uses it"
+      );
+    }
+    return await switchTo(checkout, status.branch, `checkout-${spec.runId}`, deps, signal);
+  } catch (error61) {
+    return noted(
+      `could not be put on ${checkout.branch}, the branch picked for this chat`,
+      firstLine2(error61 instanceof Error ? error61.message : String(error61)) || "unknown error",
+      "Check it"
+    );
+  }
+}
+
+// src/holder/checkout-refresh.ts
+function short(sha) {
+  return sha.slice(0, 12);
+}
+function staleCheckout(path, snapshot2, tip) {
+  const checkout = snapshot2 === void 0 ? "is the environment snapshot's checkout" : `is the environment snapshot's checkout of ${snapshot2.branch} (commit ${short(snapshot2.head)})`;
+  const base = snapshot2 === void 0 ? "its upstream" : `origin/${snapshot2.base}`;
+  const remote = tip === void 0 ? "may be ahead" : `is ahead at ${short(tip)}`;
+  return {
+    path,
+    problem: `${checkout}; ${base} ${remote}`,
+    action: "Run `git pull --ff-only` there"
+  };
+}
 async function fastForward(freshness, operationId, deps, signal) {
   var _stack = [];
   try {
@@ -47293,10 +48006,7 @@ async function fastForward(freshness, operationId, deps, signal) {
   }
 }
 async function atFirstLease(freshness, spec, deps, signal) {
-  const first = await claimOnce(
-    (0, import_node_path21.join)(deps.dir, "leased"),
-    (0, import_node_crypto14.createHash)("sha256").update(freshness.path).digest("hex")
-  );
+  const first = await claimFirstLease(deps.dir, freshness.path);
   switch (freshness.state) {
     case "current":
     case "kept":
@@ -47308,46 +48018,88 @@ async function atFirstLease(freshness, spec, deps, signal) {
       return first && freshness.fetched && await fastForward(freshness, `refresh-${spec.runId}`, deps, signal) ? "moved" : "noted";
   }
 }
-function lineFor(freshness) {
+function problemFor(freshness) {
   switch (freshness.state) {
     case "behind":
-      return staleLine(freshness.path, freshness.snapshot, freshness.tip);
+      return staleCheckout(freshness.path, freshness.snapshot, freshness.tip);
     case "failed":
-      return staleLine(freshness.path, freshness.snapshot);
+      return staleCheckout(freshness.path, freshness.snapshot);
     default:
-      return staleLine(freshness.path, void 0);
+      return staleCheckout(freshness.path, void 0);
   }
 }
 async function checkoutsOf(spec, leaseTargets) {
   if (leaseTargets.length > 0 || spec.projectPath === void 0) return [...leaseTargets];
   return checkoutsUnder(spec.projectPath);
 }
-function createCheckoutRefresh(deps) {
-  return async (spec, leaseTargets, signal) => {
-    if (spec.providerSessionId !== void 0) return void 0;
-    if (!await claimOnce((0, import_node_path21.join)(deps.dir, "conversations"), spec.conversationId)) return void 0;
-    const lines = [];
-    for (const target of await checkoutsOf(spec, leaseTargets)) {
-      const freshness = await readCheckoutFreshness(deps.dir, target);
-      if (freshness === null) continue;
-      const outcome2 = await atFirstLease(freshness, spec, deps, signal).catch(
-        () => "noted"
-      );
-      if (outcome2 === "noted") lines.push(lineFor(freshness));
-      deps.log.info("workspace.refresh", {
+function requestedCheckoutsOf(spec, log) {
+  const roots = spec.approvedWorkspacePaths ?? [];
+  return (spec.requestedCheckouts ?? []).filter((checkout) => {
+    const approved = roots.some((root) => isWithin(root, checkout.path, process.platform));
+    if (!approved) {
+      log.warn("workspace.requested_checkout_outside_workspace", {
         runId: spec.runId,
-        path: freshness.path,
-        state: freshness.state,
-        outcome: outcome2
+        path: checkout.path
       });
     }
-    return lines.length === 0 ? void 0 : lines.join("\n");
+    return approved;
+  });
+}
+async function applyRequestedCheckouts(spec, deps, signal) {
+  const settled2 = /* @__PURE__ */ new Set();
+  const problems = [];
+  for (const checkout of requestedCheckoutsOf(spec, deps.log)) {
+    const outcome2 = await applyRequestedCheckout(checkout, spec, deps, signal);
+    deps.log.info("workspace.requested_checkout", {
+      runId: spec.runId,
+      path: checkout.path,
+      branch: checkout.branch,
+      outcome: outcome2.kind,
+      ...outcome2.kind === "moved" ? { how: outcome2.how } : {}
+    });
+    if (outcome2.kind === "on_branch") continue;
+    settled2.add((0, import_node_path25.resolve)(checkout.path));
+    if (outcome2.kind === "noted") {
+      problems.push({ path: checkout.path, problem: outcome2.problem, action: outcome2.action });
+    }
+  }
+  return { settled: settled2, problems };
+}
+async function refreshSnapshotCheckouts(spec, targets, settled2, deps, signal) {
+  const problems = [];
+  for (const target of targets) {
+    if (settled2.has((0, import_node_path25.resolve)(target))) continue;
+    const freshness = await readCheckoutFreshness(deps.dir, target);
+    if (freshness === null) continue;
+    const outcome2 = await atFirstLease(freshness, spec, deps, signal).catch(
+      () => "noted"
+    );
+    if (outcome2 === "noted") problems.push(problemFor(freshness));
+    deps.log.info("workspace.refresh", {
+      runId: spec.runId,
+      path: freshness.path,
+      state: freshness.state,
+      outcome: outcome2
+    });
+  }
+  return problems;
+}
+function createCheckoutRefresh(deps) {
+  return async (spec, leaseTargets, signal) => {
+    if (spec.providerSessionId !== void 0) return [];
+    if (!await claimOnce((0, import_node_path25.join)(deps.dir, "conversations"), spec.conversationId)) return [];
+    const requested = await applyRequestedCheckouts(spec, deps, signal);
+    const targets = await checkoutsOf(spec, leaseTargets);
+    return [
+      ...requested.problems,
+      ...await refreshSnapshotCheckouts(spec, targets, requested.settled, deps, signal)
+    ];
   };
 }
 
 // src/holder/lease.ts
-var import_promises33 = require("fs/promises");
-var import_node_path22 = require("path");
+var import_promises36 = require("fs/promises");
+var import_node_path26 = require("path");
 var LEASE_CHECK_EVERY_MS = 5e3;
 var MAX_TRANSIENT_FAILURES = 3;
 var BACKOFF_BASE_MS = 1e3;
@@ -47361,8 +48113,8 @@ function identityFailure(code, workspacePath) {
   return { code, problemCode: "app.workspace.missing", message: MESSAGES[code], workspacePath };
 }
 async function fileIdentity(path) {
-  const canonical = await (0, import_promises33.realpath)(path);
-  const info = await (0, import_promises33.stat)(canonical, { bigint: true });
+  const canonical = await (0, import_promises36.realpath)(path);
+  const info = await (0, import_promises36.stat)(canonical, { bigint: true });
   return `${canonical}:${info.dev}:${info.ino}`;
 }
 async function snapshot(git, path, signal) {
@@ -47381,7 +48133,7 @@ async function snapshot(git, path, signal) {
       workspace: await fileIdentity(path),
       repository: await fileIdentity(commonDir),
       worktree: await fileIdentity(gitDir),
-      commonDir: await (0, import_promises33.realpath)(commonDir)
+      commonDir: await (0, import_promises36.realpath)(commonDir)
     };
   } catch {
     return null;
@@ -47394,7 +48146,7 @@ async function gitValue(git, path, args, signal) {
 }
 async function pathExists(path) {
   try {
-    await (0, import_promises33.stat)(path);
+    await (0, import_promises36.stat)(path);
     return true;
   } catch (error61) {
     return errnoCode(error61) !== "ENOENT" && errnoCode(error61) !== "ENOTDIR";
@@ -47403,19 +48155,19 @@ async function pathExists(path) {
 async function hasGitMarker(path) {
   let directory;
   try {
-    directory = await (0, import_promises33.realpath)(path);
+    directory = await (0, import_promises36.realpath)(path);
   } catch {
     return true;
   }
   for (; ; ) {
     try {
-      await (0, import_promises33.stat)((0, import_node_path22.join)(directory, ".git"));
+      await (0, import_promises36.stat)((0, import_node_path26.join)(directory, ".git"));
       return true;
     } catch (error61) {
       const code = errnoCode(error61);
       if (code !== "ENOENT" && code !== "ENOTDIR") return true;
     }
-    const parent = (0, import_node_path22.dirname)(directory);
+    const parent = (0, import_node_path26.dirname)(directory);
     if (parent === directory) return false;
     directory = parent;
   }
@@ -47579,7 +48331,7 @@ function volumeRoot(path) {
 }
 async function exists(path) {
   try {
-    await (0, import_promises34.stat)(path);
+    await (0, import_promises37.stat)(path);
     return true;
   } catch {
     return false;
@@ -47587,10 +48339,10 @@ async function exists(path) {
 }
 async function inspectReadiness(path) {
   try {
-    if (!(await (0, import_promises34.stat)(path)).isDirectory()) {
+    if (!(await (0, import_promises37.stat)(path)).isDirectory()) {
       return { ready: false, missing: true, message: MESSAGES2.missing };
     }
-    await (0, import_promises34.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
+    await (0, import_promises37.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
     return { ready: true };
   } catch (error61) {
     const code = errnoCode(error61) ?? "";
@@ -47668,8 +48420,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_promises34.mkdir)(path, { recursive: true, mode: 448 });
-    await (0, import_promises34.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
+    await (0, import_promises37.mkdir)(path, { recursive: true, mode: 448 });
+    await (0, import_promises37.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
     return {
       kind: "admitted",
       spec: { ...spec, projectPath: path },
@@ -47742,10 +48494,12 @@ async function admitRun(spec, context, signal) {
   };
 }
 var PROBE_TIMEOUT_MS2 = 5e3;
+var CHECKOUT_LOCAL_TIMEOUT_MS = 6e4;
+var CHECKOUT_NETWORK_TIMEOUT_MS = 12e4;
 function createHolderWorkspace(machine, clock, log) {
   const platform = machine.platform ?? process.platform;
   const git = createGitRunner({ env: machine.env, platform, localTimeoutMs: PROBE_TIMEOUT_MS2 });
-  const locks = openRepositoryLocks({ dir: (0, import_node_path23.join)(machine.stateDir, "locks"), clock, platform });
+  const locks = openRepositoryLocks({ dir: (0, import_node_path27.join)(machine.stateDir, "locks"), clock, platform });
   return {
     admission: {
       env: machine.env,
@@ -47757,7 +48511,7 @@ function createHolderWorkspace(machine, clock, log) {
       ),
       approvedRoots: async () => {
         const approved = await openApprovedPaths({
-          file: (0, import_node_path23.join)(machine.stateDir, "workspaces.json"),
+          file: (0, import_node_path27.join)(machine.stateDir, "workspaces.json"),
           log,
           platform
         });
@@ -47767,10 +48521,19 @@ function createHolderWorkspace(machine, clock, log) {
     lease: { git, locks, clock, log, platform },
     ...machine.refreshesFirstCheckout === true ? {
       refreshFirstCheckout: createCheckoutRefresh({
-        git,
+        git: createGitRunner({
+          env: machine.env,
+          platform,
+          localTimeoutMs: CHECKOUT_LOCAL_TIMEOUT_MS,
+          networkTimeoutMs: CHECKOUT_NETWORK_TIMEOUT_MS
+        }),
         locks,
         log,
-        dir: (0, import_node_path23.join)(machine.stateDir, "checkout-freshness")
+        dir: (0, import_node_path27.join)(machine.stateDir, "checkout-freshness")
+      }),
+      prepareAgentContext: createAgentContext({
+        dir: (0, import_node_path27.join)(machine.stateDir, "agent-context"),
+        homeDir: machine.env.HOME || (0, import_node_os5.homedir)()
       })
     } : {}
   };
@@ -47798,7 +48561,7 @@ async function respondToTurn(runningRunId, gate, driver, request2) {
 }
 
 // src/holder/session-facts.ts
-var import_promises35 = require("fs/promises");
+var import_promises38 = require("fs/promises");
 var CLI_RSS_CACHE_MS = 1e4;
 var LOGIN_PROBLEM_PREFIX = "cli.auth.";
 function isLoginFailure(result) {
@@ -47824,8 +48587,8 @@ function createSessionFacts(options) {
     const path = await resolveCommandOnPath(command, env, platform);
     if (path === null) return null;
     try {
-      const real = await (0, import_promises35.realpath)(path);
-      const info = await (0, import_promises35.stat)(real);
+      const real = await (0, import_promises38.realpath)(path);
+      const info = await (0, import_promises38.stat)(real);
       return { command, key: `${real}:${info.ino}:${info.size}:${info.mtimeMs}` };
     } catch {
       return null;
@@ -47912,8 +48675,8 @@ function createSessionFacts(options) {
 init_acp2();
 
 // src/run-log/directory.ts
-var import_promises36 = require("fs/promises");
-var import_node_path24 = require("path");
+var import_promises39 = require("fs/promises");
+var import_node_path28 = require("path");
 init_runtime_v2();
 init_zod();
 var runMetaSchema = external_exports.object({
@@ -47935,17 +48698,17 @@ var runMetaSchema = external_exports.object({
   }).optional()
 });
 function runDirectory(runsDir, runId) {
-  const dir = (0, import_node_path24.join)(runsDir, runId);
+  const dir = (0, import_node_path28.join)(runsDir, runId);
   return {
     dir,
-    log: (0, import_node_path24.join)(dir, "log.jsonl"),
-    upload: (0, import_node_path24.join)(dir, "upload.json"),
-    meta: (0, import_node_path24.join)(dir, "run.json")
+    log: (0, import_node_path28.join)(dir, "log.jsonl"),
+    upload: (0, import_node_path28.join)(dir, "upload.json"),
+    meta: (0, import_node_path28.join)(dir, "run.json")
   };
 }
 async function isRunClaimed(runsDir, runId) {
   try {
-    return (await (0, import_promises36.stat)(runDirectory(runsDir, runId).log)).size > 0;
+    return (await (0, import_promises39.stat)(runDirectory(runsDir, runId).log)).size > 0;
   } catch (error61) {
     if (errnoCode(error61) === "ENOENT") return false;
     throw error61;
@@ -47953,8 +48716,8 @@ async function isRunClaimed(runsDir, runId) {
 }
 
 // src/run-log/conversation-index.ts
-var import_promises37 = require("fs/promises");
-var import_node_path25 = require("path");
+var import_promises40 = require("fs/promises");
+var import_node_path29 = require("path");
 init_runtime_v2();
 init_zod();
 var ORDINALS_PER_SHARD = 1e3;
@@ -47970,13 +48733,13 @@ var coverageSchema = external_exports.object({
   nextExpectedOrdinal: external_exports.number().int().positive()
 });
 function conversationsDirectory(runsDir) {
-  return (0, import_node_path25.join)((0, import_node_path25.dirname)(runsDir), "conversations");
+  return (0, import_node_path29.join)((0, import_node_path29.dirname)(runsDir), "conversations");
 }
 function indexDirectory(runsDir, conversationId) {
-  return (0, import_node_path25.join)(conversationsDirectory(runsDir), conversationId, "turn-index");
+  return (0, import_node_path29.join)(conversationsDirectory(runsDir), conversationId, "turn-index");
 }
 function shardPath(runsDir, conversationId, ordinal) {
-  return (0, import_node_path25.join)(
+  return (0, import_node_path29.join)(
     indexDirectory(runsDir, conversationId),
     `${Math.floor(ordinal / ORDINALS_PER_SHARD)}.jsonl`
   );
@@ -47985,10 +48748,10 @@ async function indexConversationRun(runsDir, conversationId, ordinal, assistantO
   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_promises37.mkdir)((0, import_node_path25.dirname)(path), { recursive: true, mode: 448 });
-  await (0, import_promises37.appendFile)(path, `${JSON.stringify({ ordinal, nextOrdinal, runId })}
+  await (0, import_promises40.mkdir)((0, import_node_path29.dirname)(path), { recursive: true, mode: 448 });
+  await (0, import_promises40.appendFile)(path, `${JSON.stringify({ ordinal, nextOrdinal, runId })}
 `, { mode: 384 });
-  const coveragePath = (0, import_node_path25.join)((0, import_node_path25.dirname)((0, import_node_path25.dirname)(path)), "coverage.json");
+  const coveragePath = (0, import_node_path29.join)((0, import_node_path29.dirname)((0, import_node_path29.dirname)(path)), "coverage.json");
   const coverage = await readJsonFile(coveragePath, coverageSchema);
   const current = coverage.kind === "ok" ? coverage.value : null;
   const next = nextCoverage(current, ordinal, nextOrdinal);
@@ -48032,7 +48795,7 @@ var decoder = new TextDecoder();
 
 // src/run-log/writer.ts
 var import_node_fs10 = require("fs");
-var import_node_path26 = require("path");
+var import_node_path30 = require("path");
 init_runtime_v2();
 function lastSeq(fd, size) {
   for (const length of tailWindows(size)) {
@@ -48048,7 +48811,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_fs10.mkdirSync)((0, import_node_path26.dirname)(path), { recursive: true, mode: 448 });
+  (0, import_node_fs10.mkdirSync)((0, import_node_path30.dirname)(path), { recursive: true, mode: 448 });
   const fd = (0, import_node_fs10.openSync)(path, "a+", 384);
   let size = (0, import_node_fs10.fstatSync)(fd).size;
   let seq = lastSeq(fd, size);
@@ -48226,8 +48989,12 @@ function fitForRunLog(update) {
 async function runWithInputs({ spec, leaseTargets, skills }, context, sink, signal) {
   var _stack = [];
   try {
-    const refreshed = context.workspace?.refreshFirstCheckout?.(spec, leaseTargets, signal).catch((error61) => {
+    const workspace = context.workspace;
+    const sessionContext = (workspace?.refreshFirstCheckout?.(spec, leaseTargets, signal) ?? Promise.resolve([])).catch((error61) => {
       context.log.warn("workspace.refresh_failed", { runId: spec.runId, error: error61 });
+      return [];
+    }).then((problems) => workspace?.prepareAgentContext?.(spec, problems)).catch((error61) => {
+      context.log.warn("holder.agent_context_failed", { runId: spec.runId, error: error61 });
       return void 0;
     });
     let inputs;
@@ -48240,17 +49007,37 @@ async function runWithInputs({ spec, leaseTargets, skills }, context, sink, sign
         message: `Could not fetch this run's attachments or provider credential: ${error61 instanceof Error ? error61.message : String(error61)}`
       };
     }
-    const turnContext = await refreshed;
+    const agentContext = await sessionContext;
     const prepared = __using(_stack, inputs, true);
-    const run = (turnSink, turnSignal) => context.driver.runTurn(
+    const run = async (turnSink, turnSignal) => {
+      const result = await context.driver.runTurn(
+        spec,
+        turnSink,
+        turnSignal,
+        agentContext === void 0 ? prepared : {
+          ...prepared,
+          agentContext: {
+            full: agentContext.full,
+            ...agentContext.update ? { update: agentContext.update } : {}
+          }
+        }
+      );
+      if (agentContext !== void 0 && result.outcome !== "rejected") {
+        await agentContext.save().catch((error61) => {
+          context.log.warn("holder.agent_context_save_failed", { runId: spec.runId, error: error61 });
+        });
+      }
+      return result;
+    };
+    if (workspace === void 0) return await run(sink, signal);
+    return await runLeased(
       spec,
-      turnSink,
-      turnSignal,
-      turnContext === void 0 ? prepared : { ...prepared, turnContext }
+      leaseTargets,
+      { ...context, lease: workspace.lease },
+      sink,
+      signal,
+      run
     );
-    if (context.workspace === void 0) return await run(sink, signal);
-    const leased = { ...context, lease: context.workspace.lease };
-    return await runLeased(spec, leaseTargets, leased, sink, signal, run);
   } catch (_) {
     var _error = _, _hasError = true;
   } finally {
@@ -48384,7 +49171,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_path27.dirname)(launch.statusPath)), clock, log));
+    const _engines = __using(_stack, recordSpawnedEngines(engineRecordsPath((0, import_node_path31.dirname)(launch.statusPath)), clock, log));
     const holder = {
       state: "idle",
       runId: null,
@@ -48580,16 +49367,16 @@ async function runHolder({
       client.on("error", () => holder.clients.delete(client));
     });
     removeStaleEndpoint(launch.endpoint);
-    await new Promise((resolve7, reject) => {
+    await new Promise((resolve9, reject) => {
       server.once("error", reject);
-      server.listen(launch.endpoint, () => resolve7());
+      server.listen(launch.endpoint, () => resolve9());
     });
     await writeStatus();
     log.info("holder.ready", { conversationId: launch.conversationId, pid: identity.pid });
-    await new Promise((resolve7) => exit.signal.addEventListener("abort", () => resolve7()));
+    await new Promise((resolve9) => exit.signal.addEventListener("abort", () => resolve9()));
     await driver.suspend?.().catch((error61) => log.warn("holder.driver_suspend_failed", { error: error61 }));
     for (const client of holder.clients) client.end();
-    await new Promise((resolve7) => server.close(() => resolve7()));
+    await new Promise((resolve9) => server.close(() => resolve9()));
     (0, import_node_fs11.rmSync)(launch.statusPath, { force: true });
     log.info("holder.suspended", { conversationId: launch.conversationId });
   } catch (_) {
@@ -48729,7 +49516,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_path29.join)(home, ".config"),
+    configHome: XDG_CONFIG_HOME ?? (0, import_node_path33.join)(home, ".config"),
     codexHome: resolveCodexHome(CODEX_HOME, home),
     ...githubProxyConfig({ ALAN_RUNTIME_GITHUB_PROXY, XDG_CONFIG_HOME, GH_CONFIG_DIR }, home),
     gitGatewayUrl: ALAN_RUNTIME_GIT_GATEWAY_URL ?? null,
@@ -48739,13 +49526,13 @@ function loadRuntimeConfig(env = process.env, totalMemoryBytes = (0, import_node
   };
 }
 function resolveCodexHome(configuredHome, home) {
-  return configuredHome ?? (0, import_node_path29.join)(home, ".codex");
+  return configuredHome ?? (0, import_node_path33.join)(home, ".codex");
 }
 function githubProxyConfig(env, home) {
-  const configHome = env.XDG_CONFIG_HOME ?? (0, import_node_path29.join)(home, ".config");
+  const configHome = env.XDG_CONFIG_HOME ?? (0, import_node_path33.join)(home, ".config");
   return {
     githubProxy: env.ALAN_RUNTIME_GITHUB_PROXY === "on",
-    ghConfigDir: env.GH_CONFIG_DIR ?? (0, import_node_path29.join)(configHome, "gh")
+    ghConfigDir: env.GH_CONFIG_DIR ?? (0, import_node_path33.join)(configHome, "gh")
   };
 }
 function serviceEnvironment(env, profile) {
@@ -48844,7 +49631,7 @@ async function loadStoredAccess(paths, access3 = { exec: systemExec }) {
 }
 
 // src/cli/commands/hold.ts
-var import_node_path30 = require("path");
+var import_node_path34 = require("path");
 init_agent2();
 init_runtime_v2();
 async function machineAccess(paths, log, conversationId, transport) {
@@ -48902,7 +49689,7 @@ async function runHold(argv) {
     const config2 = loadRuntimeConfig();
     const paths = runtimePaths(config2.stateDir);
     const log = __using(_stack, openFileLog(
-      (0, import_node_path30.join)(paths.logs, `holder-${launch.value.conversationId}.jsonl`),
+      (0, import_node_path34.join)(paths.logs, `holder-${launch.value.conversationId}.jsonl`),
       config2.logLevel,
       systemClock
     ));
@@ -48913,7 +49700,7 @@ async function runHold(argv) {
     );
     const transport = __using(_stack, createHttpTransport());
     const access3 = await machineAccess(paths, log, launch.value.conversationId, transport);
-    const credentialPath = (0, import_node_path30.join)(paths.tmp, "mcp", `${launch.value.conversationId}.json`);
+    const credentialPath = (0, import_node_path34.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,