@aiden-ade/sandbox-agent 0.1.32 → 0.1.35

package/dist/index.cjs

@@ -4810,14 +4810,23 @@ var require_websocket_server = __commonJS({
   }
 });
 
+// src/legacy-env.ts
+for (const [key, value2] of Object.entries(process.env)) {
+  if (!key.startsWith("ALAN_") || value2 === void 0) continue;
+  const alanKey = `ALAN_${key.slice("ALAN_".length)}`;
+  if (process.env[alanKey] === void 0 || process.env[alanKey] === "") {
+    process.env[alanKey] = value2;
+  }
+}
+
 // src/cli-help.ts
-var HELP_TEXT = `Aiden agent CLI
+var HELP_TEXT = `Alan agent CLI
 
 Usage:
-  aiden-agent <command> [options]
+  alan-agent <command> [options]
 
 Commands:
-  setup       Register this computer with a setup token from Aiden
+  setup       Register this computer with a setup token from Alan
   login       Register this computer through browser authorization
   daemon      Start the durable runtime daemon
   stop        Stop the local daemon (or active runs only via the local API /stop)
@@ -4826,22 +4835,22 @@ Commands:
   scan-models Probe installed agent CLIs and print discovered models
   logout      Remove local runtime configuration
   token       Rotate or revoke the configured runtime token
-  run-session Internal: run one ephemeral sandbox/session from AIDEN_* env vars
+  run-session Internal: run one ephemeral sandbox/session from ALAN_* env vars
 
 Common flows:
-  aiden-agent login
-  aiden-agent setup --setup-token <token>
-  aiden-agent setup --setup-token <token> --scope user
-  aiden-agent daemon
-  aiden-agent stop
+  alan-agent login
+  alan-agent setup --setup-token <token>
+  alan-agent setup --setup-token <token> --scope user
+  alan-agent daemon
+  alan-agent stop
 
 Local development:
-  aiden-agent login --profile local
-  aiden-agent setup --profile local --setup-token <token>
+  alan-agent login --profile local
+  alan-agent setup --profile local --setup-token <token>
 `;
 function hasRunSessionEnv(env) {
   return Boolean(
-    env.AIDEN_WS_URL && env.AIDEN_SESSION_ID && env.AIDEN_TASK_ID && env.AIDEN_SESSION_TOKEN && env.AIDEN_TASK !== void 0
+    env.ALAN_WS_URL && env.ALAN_SESSION_ID && env.ALAN_TASK_ID && env.ALAN_SESSION_TOKEN && env.ALAN_TASK !== void 0
   );
 }
 function resolveCommand(args, env) {
@@ -4986,7 +4995,7 @@ async function withTimeout(promise, timeoutMs, fallback) {
 }
 async function collectCodexLimits(env) {
   const runtimeEnv = augmentCliPath(env);
-  const codexCommand = resolveExecutable("codex", runtimeEnv, "AIDEN_CODEX_PATH");
+  const codexCommand = resolveExecutable("codex", runtimeEnv, "ALAN_CODEX_PATH");
   if (!codexCommand)
     return [];
   return withTimeout(new Promise((resolve3) => {
@@ -5040,7 +5049,7 @@ async function collectCodexLimits(env) {
     void (async () => {
       try {
         await request("initialize", {
-          clientInfo: { name: "aiden", version: "runtime" }
+          clientInfo: { name: "alan", version: "runtime" }
         });
         child.stdin.write(`${JSON.stringify({ method: "initialized", params: {} })}
 `);
@@ -9255,7 +9264,7 @@ function resolveAgentConfigFileName(profile) {
     case "production":
       return "config.json";
     case "local":
-      return "config-dev.json";
+      return "config-local.json";
     case "staging":
       return "config-staging.json";
     case "custom":
@@ -12870,28 +12879,28 @@ var import_node_fs2 = require("fs");
 var import_node_os2 = require("os");
 var import_node_path2 = require("path");
 var PROVIDER_CLI_COMMANDS = {
-  claude_cli: { provider: "claude_cli", command: "claude", envVars: ["AIDEN_CLAUDE_PATH"] },
+  claude_cli: { provider: "claude_cli", command: "claude", envVars: ["ALAN_CLAUDE_PATH"] },
   codex_app_server: {
     provider: "codex_app_server",
     command: "codex",
-    envVars: ["AIDEN_CODEX_PATH"]
+    envVars: ["ALAN_CODEX_PATH"]
   },
-  copilot_cli: { provider: "copilot_cli", command: "copilot", envVars: ["AIDEN_COPILOT_PATH"] },
+  copilot_cli: { provider: "copilot_cli", command: "copilot", envVars: ["ALAN_COPILOT_PATH"] },
   cursor_agent_cli: {
     provider: "cursor_agent_cli",
     command: "cursor-agent",
-    envVars: ["AIDEN_CURSOR_AGENT_PATH"]
+    envVars: ["ALAN_CURSOR_AGENT_PATH"]
   },
   antigravity_cli: {
     provider: "antigravity_cli",
     command: "agy",
-    envVars: ["AIDEN_ANTIGRAVITY_PATH"]
+    envVars: ["ALAN_ANTIGRAVITY_PATH"]
   },
-  kimi_cli: { provider: "kimi_cli", command: "kimi-cli", envVars: ["AIDEN_KIMI_PATH"] },
-  grok_cli: { provider: "grok_cli", command: "grok", envVars: ["AIDEN_GROK_PATH"] },
-  opencode_cli: { provider: "opencode_cli", command: "opencode", envVars: ["AIDEN_OPENCODE_PATH"] },
-  droid_cli: { provider: "droid_cli", command: "droid", envVars: ["AIDEN_DROID_PATH"] },
-  supatest_cli: { provider: "supatest_cli", command: "supatest", envVars: ["AIDEN_SUPATEST_PATH"] }
+  kimi_cli: { provider: "kimi_cli", command: "kimi-cli", envVars: ["ALAN_KIMI_PATH"] },
+  grok_cli: { provider: "grok_cli", command: "grok", envVars: ["ALAN_GROK_PATH"] },
+  opencode_cli: { provider: "opencode_cli", command: "opencode", envVars: ["ALAN_OPENCODE_PATH"] },
+  droid_cli: { provider: "droid_cli", command: "droid", envVars: ["ALAN_DROID_PATH"] },
+  supatest_cli: { provider: "supatest_cli", command: "supatest", envVars: ["ALAN_SUPATEST_PATH"] }
 };
 var DISCOVERABLE_PROVIDER_KINDS = Object.keys(PROVIDER_CLI_COMMANDS);
 var PROVIDER_ALIASES = {
@@ -13177,7 +13186,7 @@ var import_node_fs4 = require("fs");
 var import_node_fs3 = require("fs");
 var import_node_os3 = require("os");
 var import_node_path3 = require("path");
-var DEFAULT_AGENT_DIR = (0, import_node_path3.join)((0, import_node_os3.homedir)(), ".aiden", "agent");
+var DEFAULT_AGENT_DIR = (0, import_node_path3.join)((0, import_node_os3.homedir)(), ".alan", "agent");
 function resolveAgentConfigPath(input) {
   if (input?.explicitPath?.trim()) return input.explicitPath.trim();
   const profile = normalizeAgentEndpointProfile(
@@ -13191,15 +13200,15 @@ function configExistsAtPath(configPath) {
 }
 function resolveEndpointProfileFromArgs(args) {
   const index = args.indexOf("--profile");
-  const raw = index === -1 ? process.env.AIDEN_AGENT_PROFILE : args[index + 1];
+  const raw = index === -1 ? process.env.ALAN_AGENT_PROFILE : args[index + 1];
   return normalizeAgentEndpointProfile(raw) ?? "production";
 }
 function bindAgentConfigPathFromArgs(args) {
-  const explicit = process.env.AIDEN_AGENT_CONFIG_PATH?.trim();
+  const explicit = process.env.ALAN_AGENT_CONFIG_PATH?.trim();
   if (explicit) return explicit;
   const profile = resolveEndpointProfileFromArgs(args);
   const configPath = resolveAgentConfigPath({ profile });
-  process.env.AIDEN_AGENT_CONFIG_PATH = configPath;
+  process.env.ALAN_AGENT_CONFIG_PATH = configPath;
   return configPath;
 }
 
@@ -13270,7 +13279,7 @@ function buildComputerReadiness(input) {
     check(
       "ws_connected",
       input.connected ? "pass" : "fail",
-      input.connected ? "Daemon is connected to Aiden backend." : "Daemon is disconnected from Aiden backend.",
+      input.connected ? "Daemon is connected to Alan backend." : "Daemon is disconnected from Alan backend.",
       {
         nowMs,
         code: input.connected ? void 0 : "ws_disconnected",
@@ -13329,7 +13338,7 @@ Before create_task:
 // ../shared/dist/agent/agent-definitions.js
 var COORDINATOR_PROMPT = `## You are the Orchestrator
 
-You are the **Orchestrator** for this task. When asked "who are you?", "what agent are you?", "are you the coordinator?", "are you the orchestrator?", or anything similar \u2014 identify yourself plainly as the Orchestrator for this task. Do not say "I'm Aiden" alone; say "I'm the Orchestrator (an Aiden agent profile) for this task."
+You are the **Orchestrator** for this task. When asked "who are you?", "what agent are you?", "are you the coordinator?", "are you the orchestrator?", or anything similar \u2014 identify yourself plainly as the Orchestrator for this task. Do not say "I'm Alan" alone; say "I'm the Orchestrator (an Alan agent profile) for this task."
 
 Your primary job is orchestration: understand the task, choose the next unit of work, keep context current, and decide whether to act directly or delegate to a specialist.
 
@@ -13345,7 +13354,7 @@ Use these tools, in roughly this order of frequency:
 5. \`get_session_context\` \u2014 check what a worker accomplished
 6. \`update_task\` \u2014 keep status, priority, labels current
 7. \`send_session_message\` / \`start_task_session\` \u2014 continue a specific session or force a new session only when needed
-8. \`list_sessions\` / \`search\` / \`Read\` / \`Glob\` / \`Grep\` \u2014 situational awareness
+8. \`list_sessions\` / \`search\` / \`search_code_context\` / \`Read\` / \`Glob\` / \`Grep\` \u2014 situational awareness (\`search_code_context\` before grep for codebase discovery or implementation-answer questions; read exact cited files before claiming behavior)
 9. \`get_task_memory\` / \`update_task_memory\` \u2014 compatibility memory tools for older task summaries and session outcomes
 10. \`create_plan\` \u2014 document implementation plans and durable specs as artifacts
 11. \`add_task_comment\` \u2014 human-facing collaboration: answer questions, post explicit status updates, escalate blockers, or leave comments the user asked you to post. Do not use comments as running notes or memory.
@@ -13390,7 +13399,7 @@ You are coordination-first, not read-only. Use judgment: act directly for focuse
 ${TASK_CREATE_FIND_BEFORE_CREATE_INSTRUCTIONS}`;
 var PM_PROMPT = `## You are the PM Agent
 
-You are the **PM Agent** (Product Manager) for this task. When identifying yourself, say "I'm the PM Agent (an Aiden agent profile)."
+You are the **PM Agent** (Product Manager) for this task. When identifying yourself, say "I'm the PM Agent (an Alan agent profile)."
 
 Your job is product thinking, not implementation. You own requirements, scope, and prioritization. You do not write code or edit files.
 
@@ -13448,11 +13457,11 @@ Every \`start_task_session\` message must include all four of these:
 5. Track results and update task status as work completes.`;
 var GENERAL_PROMPT = `## You are the General Agent
 
-You are a flexible general-purpose agent (an Aiden agent profile) for work that does not need a specialist profile. Wear whatever hat the moment demands \u2014 product thinker, planner, programmer, debugger, tester. Read the room and pick the hat.
+You are a flexible general-purpose agent (an Alan agent profile) for work that does not need a specialist profile. Wear whatever hat the moment demands \u2014 product thinker, planner, programmer, debugger, tester. Read the room and pick the hat.
 
-Your name is Aiden, General Agent.
+Your name is Alan, General Agent.
 
-Clarify the goal only when required, inspect the relevant context first, then complete the requested work directly. Keep changes focused, avoid unrelated refactors, and validate the result before reporting back.
+Clarify the goal only when required, inspect the relevant context first, then complete the requested work directly. For codebase discovery or implementation-answer questions, use \`search_code_context\` before grep and read exact cited files before claiming behavior. Keep changes focused, avoid unrelated refactors, and validate the result before reporting back.
 
 Non-trivial implementations include tests. Break and plan before building when scope is wide.
 
@@ -13468,17 +13477,25 @@ ${TASK_CREATE_FIND_BEFORE_CREATE_INSTRUCTIONS}
 - Any residual risk or open question`;
 var BUDDY_PROMPT = `## You are Buddy
 
-You are **Buddy** (an Aiden agent profile) for direct team chat. When identifying yourself, say "I'm Buddy, the direct chat agent in Aiden."
+You are **Buddy** (an Alan agent profile) for direct team chat. When identifying yourself, say "I'm Buddy, the direct chat agent in Alan."
 
 Your job is to be the user's always-available teammate: answer questions, inspect context, help shape ambiguous ideas, and take focused implementation or coordination action when the user asks.
 
 ## How to work
 
 1. Start from the current team/chat context before asking for details.
-2. Clarify only when the request has multiple plausible meanings.
-3. Keep responses concise, concrete, and tied to the user's next step.
-4. For implementation work, make the smallest coherent change and validate it.
-5. For plans, PRDs, reviews, and test reports, use structured Aiden artifacts when task context exists.
+2. For codebase location, behavior, or implementation-answer questions, call \`search_code_context\` via Alan MCP before grep or filesystem search, then read the exact cited files before claiming behavior.
+3. Clarify only when the request has multiple plausible meanings.
+4. Keep responses concise, concrete, and tied to the user's next step.
+5. For implementation work, make the smallest coherent change and validate it.
+6. For plans, PRDs, reviews, and test reports, use structured Alan artifacts when task context exists.
+
+## Primary tools (code discovery)
+
+- \`mcp__alan__search_code_context\` / \`search_code_context\` \u2014 find where code lives or how behavior is implemented (**use this first**)
+- \`mcp__alan__code_context_status\` \u2014 confirm the team index is ready
+- \`Read\`, \`Grep\` \u2014 only after you have paths from the index, or for line-level edits in known files; read exact cited files before answering exact questions
+- Do **not** run repo-wide \`grep\` / \`rg\` / Bash find for "where is X" or "how does this work" questions when MCP code-context tools are available
 
 ## Rules
 
@@ -13490,7 +13507,7 @@ Your job is to be the user's always-available teammate: answer questions, inspec
 ${TASK_CREATE_FIND_BEFORE_CREATE_INSTRUCTIONS}`;
 var REVIEW_PROMPT = `## You are the Review Agent
 
-You are the **Review Agent** (an Aiden agent profile) for pull request review sessions. When identifying yourself, say "I'm the Review Agent."
+You are the **Review Agent** (an Alan agent profile) for pull request review sessions. When identifying yourself, say "I'm the Review Agent."
 
 Your job is to inspect the pull request context, reason about correctness and risk, and help the user review the change. Prefer concrete findings tied to files, lines, tests, and behavior. Do not send a review verdict until you have enough evidence.
 
@@ -13511,7 +13528,7 @@ Your job is to inspect the pull request context, reason about correctness and ri
 - Ask one targeted question only when evidence is missing and blocks a useful review.`;
 var IMPLEMENTOR_PROMPT = `## You are the Implementor Agent
 
-You are a senior implementation agent responsible for end-to-end code delivery. When identifying yourself, say "I'm the Implementor Agent (an Aiden agent profile)."
+You are a senior implementation agent responsible for end-to-end code delivery. When identifying yourself, say "I'm the Implementor Agent (an Alan agent profile)."
 
 Workflow: Listen \u2192 Understand \u2192 Break down \u2192 Plan \u2192 Build \u2192 Test \u2192 Ship.
 
@@ -13524,7 +13541,8 @@ Workflow: Listen \u2192 Understand \u2192 Break down \u2192 Plan \u2192 Build \u
 
 ## Primary tools
 
-- \`Read\`, \`Glob\`, \`Grep\` \u2014 understand the codebase before touching it
+- \`mcp__alan__search_code_context\` / \`search_code_context\` \u2014 find where code lives or how behavior is implemented (use BEFORE grep for discovery and implementation-answer questions)
+- \`Read\`, \`Glob\`, \`Grep\` \u2014 read exact cited files or narrow search after you have paths from the index
 - \`Edit\`, \`Write\` \u2014 make changes; prefer \`Edit\` over \`Write\` for existing files
 - \`Bash\` \u2014 run type-checks, tests, and read-only commands; never skip validation
 - \`get_session_context\` \u2014 check what prior sessions already did before redoing work
@@ -13544,7 +13562,7 @@ Workflow: Listen \u2192 Understand \u2192 Break down \u2192 Plan \u2192 Build \u
 - **Residual risk**: anything that could break or needs follow-up`;
 var DESIGNER_PROMPT = `## You are the Designer Agent
 
-You are a product UI designer and frontend interaction specialist. When identifying yourself, say "I'm the Designer Agent (an Aiden agent profile)."
+You are a product UI designer and frontend interaction specialist. When identifying yourself, say "I'm the Designer Agent (an Alan agent profile)."
 
 ## Taste Skill (premium frontends)
 
@@ -13778,9 +13796,9 @@ function isBrowserRecordingToolName(toolName) {
 }
 
 // ../shared/dist/agent/mcp-config.js
-function buildAidenMcpServers(registration) {
+function buildAlanMcpServers(registration) {
   return {
-    aiden: {
+    alan: {
       type: "http",
       url: registration.url,
       ...Object.keys(registration.headers).length > 0 ? { headers: registration.headers } : {}
@@ -13895,7 +13913,7 @@ function toCodexMcpToml(src) {
   return `${lines.join("\n").trim()}
 `;
 }
-function renderAidenMcpConfigFiles(mcpServers, home) {
+function renderAlanMcpConfigFiles(mcpServers, home) {
   return [
     {
       path: `${home}/.claude.json`,
@@ -13922,8 +13940,8 @@ function renderAidenMcpConfigFiles(mcpServers, home) {
     }
   ];
 }
-function aidenMcpConfigFilesForBackend(backendKind, mcpServers, home) {
-  const all = renderAidenMcpConfigFiles(mcpServers, home);
+function alanMcpConfigFilesForBackend(backendKind, mcpServers, home) {
+  const all = renderAlanMcpConfigFiles(mcpServers, home);
   const byPathSuffix = (...suffixes) => all.filter((f) => suffixes.some((s) => f.path.endsWith(s)));
   switch (backendKind) {
     case "claude_cli":
@@ -13948,15 +13966,15 @@ function aidenMcpConfigFilesForBackend(backendKind, mcpServers, home) {
 var SESSION_RESUME_FAILED_MESSAGE = "Session resume failed. The previous session may have expired or is no longer available. Please start a new session.";
 
 // ../shared/dist/agent/system-prompt.js
-var AIDEN_IDENTITY_PROMPT = `You are Aiden, the software factory agent built by Supatest in Bangalore. Aiden ships software end to end \u2014 plan, write, review, test, deploy.
+var ALAN_IDENTITY_PROMPT = `You are Alan, the software factory agent built by Supatest in Bangalore. Alan ships software end to end \u2014 plan, write, review, test, deploy.
 
-Do not present yourself as a runtime model, CLI, or backend vendor as your primary identity \u2014 those are runtime details. Mention them only if the user explicitly asks about the underlying model or backend. If the user asks who you are, answer in Aiden terms first, and identify by your current agent role (described after this block).
+Do not present yourself as a runtime model, CLI, or backend vendor as your primary identity \u2014 those are runtime details. Mention them only if the user explicitly asks about the underlying model or backend. If the user asks who you are, answer in Alan terms first, and identify by your current agent role (described after this block).
 
 ## Voice
 
 Direct. Structured. Concise. No hype, no "Great question!", no tool-brand roleplay. Speak like a teammate, not a data dump. Precise and decisive when working a task; listen, think, then act.
 
-## How Aiden is structured
+## How Alan is structured
 
 \`\`\`
 Team
@@ -13974,7 +13992,7 @@ Team
 
 ## Structure over chat
 
-Deliverables persist as Aiden artifacts and documents \u2014 not as chat. Plans, PRDs, specs, test reports, and reviews live as structured outputs tied to team, task, and conversation. If a skill exists for the workflow you're in, use it instead of improvising in chat.
+Deliverables persist as Alan artifacts and documents \u2014 not as chat. Plans, PRDs, specs, test reports, and reviews live as structured outputs tied to team, task, and conversation. If a skill exists for the workflow you're in, use it instead of improvising in chat.
 
 ## Universal teammate principles
 
@@ -13990,13 +14008,13 @@ Deliverables persist as Aiden artifacts and documents \u2014 not as chat. Plans,
 For non-trivial tasks, log high-signal events as they happen: decisions, changed assumptions, validation results, known-good IDs, blockers, risks, and direction changes. Keep one current task-state summary updated with current state, known-good IDs, open risks, and next action. Do not log routine commands or file reads. Before stopping, ensure the timeline and current state are enough for a human to understand progress and for another agent to resume. If a prior decision is stale, write a newer event that supersedes it.
 
 The specific work you do \u2014 implementation, planning, review, coordination, verification \u2014 is determined by your agent role, described next.`;
-var AIDEN_ASK_USER_PROMPT = `## Asking the user
+var ALAN_ASK_USER_PROMPT = `## Asking the user
 
-When you need a decision or information only the user can provide, do not guess \u2014 ask with an interactive ask tool so Aiden can render clickable question cards.
+When you need a decision or information only the user can provide, do not guess \u2014 ask with an interactive ask tool so Alan can render clickable question cards.
 
 ### Tool preference (required)
 1. Prefer the **native** ask tool when it appears in your tool list (\`AskUserQuestion\`, or the backend's equivalent built-in ask tool).
-2. Only if native ask is missing, call \`mcp__aiden__ask_user_question\` (server tool name: \`ask_user_question\`).
+2. Only if native ask is missing, call \`mcp__alan__ask_user_question\` (server tool name: \`ask_user_question\`).
 
 Required arguments (both native and MCP forms):
 - \`questions\`: non-empty array. Each item needs a clear \`question\` string.
@@ -14015,8 +14033,49 @@ If neither native ask nor the MCP ask tool is available, ask ONE short plain-tex
 
 ### After the tool call
 The ask tool returns an empty/ack result and does NOT wait. Immediately end your turn. At most one short line like "Please pick an option above." \u2014 no restating the full questions in markdown. The user's answer (or skip) arrives as the next user message; continue from there.`;
+function buildAlanTeamScopePrompt(teamId) {
+  return [
+    `You are operating within team \`${teamId}\`.`,
+    "Use this teamId for MCP tools that accept it (search, list_tasks, search_code_context, etc.).",
+    "On code-context tools, teamId auto-resolves from the Alan session when omitted \u2014 never invent or guess a teamId.",
+    "Do not call list_teams."
+  ].join(" ");
+}
+var ALAN_CODE_CONTEXT_PROMPT = `## Codebase index (required for code discovery)
+
+This team has an indexed codebase. For questions about where code lives, how something works, how to answer from the codebase, or which files to read, use Alan MCP code-context tools BEFORE local grep/find/bash search.
+
+### Required path for codebase questions
+Examples: "where is X configured", "which file handles Y", "how does Z work", "find code that \u2026", "why does this behavior happen?"
+1. Call \`mcp__alan__search_code_context\` (MCP tool: \`search_code_context\`) with hybrid mode and topK 5.
+2. Optionally call \`mcp__alan__code_context_status\` first when unsure indexing is ready.
+3. Use the result citations to choose exact paths, then \`Read\` those files before making claims, proposing edits, or changing code.
+4. For exact symbols, constants, routes, schema fields, or line-level behavior, verify in the cited file with \`Read\` or narrow \`Grep\` before answering.
+
+### Do NOT do this first
+- Do NOT start with \`grep\`, \`rg\`, \`find\`, or broad Bash filesystem search for codebase discovery or implementation-answer questions when \`search_code_context\` is available.
+- Do NOT use graphify or local graph tools for semantic "where is this implemented" questions \u2014 use \`search_code_context\`.
+- \`Read\` / \`Grep\` / \`Glob\` are for after you have specific paths from the index, or for line-level work in files already identified.
+
+### Follow-ups
+- Import/caller structure: \`code_graph_query\` after search when available.
+- Current breakage: \`code_lsp_diagnostics\` when available.
+
+If search returns no strong matches, say so and try one targeted local search in the most likely package \u2014 not repo-wide grep.`;
+function buildAlanTeamCodeContextOverlay(teamId) {
+  return [buildAlanTeamScopePrompt(teamId), ALAN_CODE_CONTEXT_PROMPT].join("\n\n");
+}
+function buildCodeDiscoveryEnforcementTail() {
+  return [
+    "## MANDATORY \u2014 team code index (do this before Grep/graphify)",
+    "1. For codebase discovery or implementation-answer questions, call `mcp__alan__search_code_context` (hybrid, topK 5). Omit teamId \u2014 Alan session headers resolve it.",
+    "2. Optionally `mcp__alan__code_context_status` if indexing readiness is unclear.",
+    "3. Read the exact cited files before answering, claiming behavior, or editing code; use narrow `Grep` only inside known paths.",
+    "Repo-wide grep, graphify, or Bash find **before** MCP on discovery/implementation-answer questions fails the task."
+  ].join("\n");
+}
 var PLAN_MODE_PROMPT = [
-  "You are in Aiden plan mode.",
+  "You are in Alan plan mode.",
   "Analyze the task, inspect the relevant code and context, and produce a concrete implementation plan.",
   "Do not make code changes or execute write operations in plan mode.",
   "Write the plan in natural markdown. Use whatever structure best communicates the work clearly.",
@@ -14033,7 +14092,7 @@ var TEST_MODE_PROMPT = [
 ].join("\n");
 var ASK_MODE_PROMPT = "You are in ask mode. Stay read-only and explain the code, architecture, or behavior clearly without changing files.";
 var REVIEW_MODE_PROMPT = "You are in review mode. Inspect the relevant changes, find real issues, and summarize risks and regressions precisely.";
-function getAidenModePrompt(mode) {
+function getAlanModePrompt(mode) {
   switch (mode) {
     case "plan":
       return PLAN_MODE_PROMPT;
@@ -14047,11 +14106,12 @@ function getAidenModePrompt(mode) {
       return void 0;
   }
 }
-function getAidenAgentPrompt(agentId) {
+function getAlanAgentPrompt(agentId) {
   return getAgentSystemPrompt(agentId);
 }
 
 // ../shared/dist/types/frontend.js
+var EFFORT_LEVELS = ["minimal", "low", "medium", "high", "xhigh", "max", "ultra"];
 var CLAUDE_48_EFFORT_LEVELS = [
   "minimal",
   "low",
@@ -14338,9 +14398,18 @@ var CLAUDE_5_EFFORT_LEVELS2 = [
 var CODEX_5X_EFFORT_LEVELS2 = ["low", "medium", "high", "xhigh"];
 var GPT_5_5_EFFORT_LEVELS = ["minimal", "low", "medium", "high", "xhigh"];
 var GPT_5_4_EFFORT_LEVELS = ["low", "medium", "high"];
+var GPT_5_6_EFFORT_LEVELS = [
+  "low",
+  "medium",
+  "high",
+  "xhigh",
+  "max",
+  "ultra"
+];
 var CURSOR_EFFORT_SUFFIXES = [
   { suffix: "-extra-high", level: "xhigh" },
   { suffix: "-xhigh", level: "xhigh" },
+  { suffix: "-ultra", level: "ultra" },
   { suffix: "-max", level: "max" },
   { suffix: "-high", level: "high" },
   { suffix: "-medium", level: "medium" },
@@ -14436,7 +14505,11 @@ function mergeEffortLevels(existing, discovered) {
   const merged = new Set(existing ?? []);
   for (const level of discovered)
     merged.add(level);
-  return Array.from(merged);
+  return orderEffortLevels(merged);
+}
+function orderEffortLevels(levels) {
+  const set = levels instanceof Set ? levels : new Set(levels);
+  return EFFORT_LEVELS.filter((level) => set.has(level));
 }
 function lookupKnownModelCapabilities(modelId) {
   for (const catalog of [AVAILABLE_MODELS, CURSOR_AGENT_MODELS]) {
@@ -14460,6 +14533,13 @@ function inferSlugModelCapabilities(providerKind, modelId) {
     if (id === "gpt-5.4" || id === "gpt-5.4-mini") {
       return { contextWindows: [], effortLevels: GPT_5_4_EFFORT_LEVELS };
     }
+    if (/^gpt-5\.6-/.test(id)) {
+      const hasUltra = id.includes("-sol") || id.includes("-terra");
+      return {
+        contextWindows: [],
+        effortLevels: hasUltra ? GPT_5_6_EFFORT_LEVELS : GPT_5_6_EFFORT_LEVELS.filter((level) => level !== "ultra")
+      };
+    }
     if (id.includes("codex") || /^gpt-5\.[0-3]/.test(id)) {
       return { contextWindows: [], effortLevels: CODEX_5X_EFFORT_LEVELS2 };
     }
@@ -14618,6 +14698,7 @@ function baseCatalogForProvider(providerKind) {
   }
   return staticCatalog;
 }
+var PROVIDER_MODEL_INFERENCE_IDS = Object.keys(PROVIDER_MODELS).filter((providerId) => providerId !== "antigravity_cli");
 function catalogModelsForProvider(providerKind, modelsFromConfig) {
   const catalog = baseCatalogForProvider(providerKind);
   if (!modelsFromConfig)
@@ -14630,13 +14711,18 @@ function catalogModelsForProvider(providerKind, modelsFromConfig) {
 }
 
 // ../agent-core/dist/index.js
-var import_child_process = require("child_process");
 var import_fs2 = require("fs");
 var import_os2 = require("os");
 var import_path2 = require("path");
+var import_child_process = require("child_process");
+var import_fs3 = require("fs");
+var import_os3 = require("os");
+var import_path3 = require("path");
 var import_readline = require("readline");
 var import_child_process2 = require("child_process");
 var import_crypto = require("crypto");
+var import_child_process3 = require("child_process");
+var import_util10 = require("util");
 
 // ../shared/dist/constants/agent.js
 var INTERACTIVE_TOOL_NAMES = /* @__PURE__ */ new Set(["askuserquestion", "exitplanmode", "enterplanmode"]);
@@ -14645,8 +14731,11 @@ function normalizeToolName2(name) {
   const mcp = lower.match(/^mcp__[a-z0-9-]+__(.+)$/);
   let bare = mcp ? mcp[1] : lower;
   bare = bare.replace(/[_\s-]/g, "");
-  if (bare.startsWith("aiden") && bare.length > "aiden".length) {
-    bare = bare.slice("aiden".length);
+  for (const vendor of ["alan", "alan"]) {
+    if (bare.startsWith(vendor) && bare.length > vendor.length) {
+      bare = bare.slice(vendor.length);
+      break;
+    }
   }
   return bare;
 }
@@ -14685,8 +14774,8 @@ function isInteractiveToolName(name, input) {
     return true;
   return isAskUserQuestionTool(name, input);
 }
-var AIDEN_AGENT_WORKOS_USER_ID_PREFIX = "aiden-agent:";
-var AIDEN_AGENT_WORKOS_USER_ID_LIKE_PATTERN = `${AIDEN_AGENT_WORKOS_USER_ID_PREFIX}%`;
+var ALAN_AGENT_WORKOS_USER_ID_PREFIX = "alan-agent:";
+var ALAN_AGENT_WORKOS_USER_ID_LIKE_PATTERN = `${ALAN_AGENT_WORKOS_USER_ID_PREFIX}%`;
 
 // ../shared/dist/constants/colors.js
 var CATEGORICAL_COLORS = {
@@ -14925,18 +15014,289 @@ var PRIORITY_OPTIONS = [
 ];
 
 // ../agent-core/dist/index.js
-var import_fs3 = require("fs");
-var import_os3 = require("os");
-var import_path3 = require("path");
 var import_fs4 = require("fs");
 var import_os4 = require("os");
 var import_path4 = require("path");
 var import_fs5 = require("fs");
 var import_os5 = require("os");
 var import_path5 = require("path");
-var import_crypto2 = require("crypto");
 var import_fs6 = require("fs");
+var import_os6 = require("os");
 var import_path6 = require("path");
+var import_crypto2 = require("crypto");
+var import_fs7 = require("fs");
+var import_path7 = require("path");
+var MANAGED_ALAN_MCP_SERVER_NAMES = [
+  "alan",
+  "alan-prod",
+  "alan-staging",
+  "alan-local"
+];
+function parseJsonSafe(content) {
+  if (!content) return {};
+  try {
+    return JSON.parse(content);
+  } catch {
+    return {};
+  }
+}
+function readFileOrNull(path) {
+  try {
+    if ((0, import_fs2.existsSync)(path)) return (0, import_fs2.readFileSync)(path, "utf-8");
+  } catch {
+  }
+  return null;
+}
+function writeFileSafe(path, content) {
+  (0, import_fs2.mkdirSync)((0, import_path2.dirname)(path), { recursive: true });
+  (0, import_fs2.writeFileSync)(path, content, "utf-8");
+}
+function formatTomlKey2(key) {
+  return /^[A-Za-z0-9_-]+$/.test(key) ? key : JSON.stringify(key);
+}
+function parseJsonStringOrNull(raw) {
+  try {
+    const value2 = JSON.parse(raw);
+    return typeof value2 === "string" ? value2 : null;
+  } catch {
+    return null;
+  }
+}
+function splitTomlInlineEntries(body) {
+  const entries = [];
+  let current = "";
+  let inString = false;
+  let escaping = false;
+  for (const char of body) {
+    if (escaping) {
+      current += char;
+      escaping = false;
+      continue;
+    }
+    if (char === "\\") {
+      current += char;
+      escaping = inString;
+      continue;
+    }
+    if (char === '"') inString = !inString;
+    if (char === "," && !inString) {
+      if (current.trim()) entries.push(current.trim());
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+  if (current.trim()) entries.push(current.trim());
+  return entries;
+}
+function parseTomlInlineStringTable(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed.startsWith("{") || !trimmed.endsWith("}")) return {};
+  const body = trimmed.slice(1, -1).trim();
+  if (!body) return {};
+  const headers = {};
+  for (const entry of splitTomlInlineEntries(body)) {
+    const equalsIndex = entry.indexOf("=");
+    if (equalsIndex < 0) continue;
+    const rawKey = entry.slice(0, equalsIndex).trim();
+    const rawValue = entry.slice(equalsIndex + 1).trim();
+    const key = rawKey.startsWith('"') ? parseJsonStringOrNull(rawKey) : rawKey;
+    const value2 = rawValue.startsWith('"') ? parseJsonStringOrNull(rawValue) : rawValue;
+    if (key && value2 !== null) headers[key] = value2;
+  }
+  return headers;
+}
+function buildTomlInlineStringTable(record) {
+  return `{ ${Object.entries(record).map(([key, value2]) => `${formatTomlKey2(key)} = ${JSON.stringify(value2)}`).join(", ")} }`;
+}
+function findManagedAlanServer(servers) {
+  for (const name of MANAGED_ALAN_MCP_SERVER_NAMES) {
+    const server = servers[name];
+    if (server && typeof server === "object") {
+      return { name, server };
+    }
+  }
+  return null;
+}
+function buildSessionHeaders(input) {
+  const headers = {
+    "x-conversation-id": input.conversationId
+  };
+  if (input.teamId) headers["x-team-id"] = input.teamId;
+  if (input.allowedTools?.length) {
+    headers["x-allowed-tools"] = input.allowedTools.join(",");
+  }
+  return headers;
+}
+function getTomlSectionName(line) {
+  const match = line.match(/^\s*\[mcp_servers\.(?:"([^"]+)"|([A-Za-z0-9_-]+))\]\s*$/);
+  return match?.[1] ?? match?.[2] ?? null;
+}
+function patchCodexTomlMcpConfig(content, sessionHeaders) {
+  const newline = content.includes("\r\n") ? "\r\n" : "\n";
+  const lines = content.split(/\r?\n/);
+  const sectionStart = lines.findIndex((line) => {
+    const name = getTomlSectionName(line);
+    return Boolean(name && MANAGED_ALAN_MCP_SERVER_NAMES.includes(name));
+  });
+  if (sectionStart < 0) return null;
+  let sectionEnd = lines.findIndex((line, index) => index > sectionStart && /^\s*\[/.test(line));
+  if (sectionEnd < 0) sectionEnd = lines.length;
+  const headerLineIndex = lines.findIndex(
+    (line, index) => index > sectionStart && index < sectionEnd && /^\s*http_headers\s*=/.test(line)
+  );
+  if (headerLineIndex >= 0) {
+    const rawInlineTable = lines[headerLineIndex]?.replace(/^\s*http_headers\s*=\s*/, "") ?? "";
+    const currentHeaders = parseTomlInlineStringTable(rawInlineTable);
+    lines[headerLineIndex] = `http_headers = ${buildTomlInlineStringTable({
+      ...currentHeaders,
+      ...sessionHeaders
+    })}`;
+  } else {
+    const insertAfterUrl = lines.findIndex(
+      (line, index) => index > sectionStart && index < sectionEnd && /^\s*url\s*=/.test(line)
+    );
+    lines.splice(
+      insertAfterUrl >= 0 ? insertAfterUrl + 1 : sectionStart + 1,
+      0,
+      `http_headers = ${buildTomlInlineStringTable(sessionHeaders)}`
+    );
+  }
+  const updated = lines.join(newline);
+  return updated.endsWith(newline) ? updated : `${updated}${newline}`;
+}
+function patchCodexTomlMcpTarget(target, sessionHeaders) {
+  if (!(0, import_fs2.existsSync)(target.guardDir)) return false;
+  const existing = readFileOrNull(target.configPath);
+  if (existing === null) return false;
+  const updated = patchCodexTomlMcpConfig(existing, sessionHeaders);
+  if (updated === null || updated === existing) return false;
+  writeFileSafe(target.configPath, updated);
+  return true;
+}
+function patchJsonMcpTarget(target, sessionHeaders) {
+  if (!(0, import_fs2.existsSync)(target.guardDir)) return false;
+  const existing = readFileOrNull(target.configPath);
+  const config = parseJsonSafe(existing);
+  const servers = target.readServers(config);
+  const match = findManagedAlanServer(servers);
+  if (!match) return false;
+  const currentHeaders = target.readHeaders(match.server) ?? {};
+  target.writeHeaders(match.server, { ...currentHeaders, ...sessionHeaders });
+  servers[match.name] = match.server;
+  target.writeServers(config, servers);
+  writeFileSafe(target.configPath, `${JSON.stringify(config, null, 2)}
+`);
+  return true;
+}
+function jsonMcpServersTarget(cli, home, configRelativePath, guardRelativePath) {
+  const configPath = (0, import_path2.join)(home, ...configRelativePath);
+  const guardDir = guardRelativePath.length > 0 ? (0, import_path2.join)(home, ...guardRelativePath) : home;
+  return {
+    cli,
+    configPath,
+    guardDir,
+    readServers: (config) => config.mcpServers ?? {},
+    writeServers: (config, servers) => {
+      config.mcpServers = servers;
+    },
+    readHeaders: (server) => server.headers,
+    writeHeaders: (server, headers) => {
+      server.headers = headers;
+    }
+  };
+}
+function buildCodexTomlTargets(home) {
+  return [
+    {
+      cli: "Codex",
+      configPath: (0, import_path2.join)(home, ".codex", "config.toml"),
+      guardDir: (0, import_path2.join)(home, ".codex")
+    }
+  ];
+}
+function buildJsonTargets(home) {
+  return [
+    jsonMcpServersTarget("Cursor", home, [".cursor", "mcp.json"], [".cursor"]),
+    jsonMcpServersTarget("Claude Code", home, [".claude.json"], []),
+    jsonMcpServersTarget("Kimi CLI", home, [".kimi", "mcp.json"], [".kimi"]),
+    jsonMcpServersTarget("Factory Droid", home, [".factory", "mcp.json"], [".factory"]),
+    {
+      cli: "OpenCode",
+      configPath: (0, import_path2.join)(home, ".config", "opencode", "opencode.json"),
+      guardDir: (0, import_path2.join)(home, ".config", "opencode"),
+      readServers: (config) => config.mcp ?? {},
+      writeServers: (config, servers) => {
+        config.mcp = servers;
+      },
+      readHeaders: (server) => server.headers,
+      writeHeaders: (server, headers) => {
+        server.headers = headers;
+      }
+    },
+    {
+      cli: "Amp",
+      configPath: (0, import_path2.join)(home, ".config", "amp", "settings.json"),
+      guardDir: (0, import_path2.join)(home, ".config", "amp"),
+      readServers: (config) => config["amp.mcpServers"] ?? {},
+      writeServers: (config, servers) => {
+        config["amp.mcpServers"] = servers;
+      },
+      readHeaders: (server) => server.headers,
+      writeHeaders: (server, headers) => {
+        server.headers = headers;
+      }
+    },
+    {
+      cli: "Antigravity",
+      configPath: (0, import_path2.join)(home, ".gemini", "settings.json"),
+      guardDir: (0, import_path2.join)(home, ".gemini"),
+      readServers: (config) => config.mcpServers ?? {},
+      writeServers: (config, servers) => {
+        config.mcpServers = servers;
+      },
+      readHeaders: (server) => server.headers,
+      writeHeaders: (server, headers) => {
+        server.headers = headers;
+      }
+    },
+    {
+      cli: "Antigravity CLI",
+      configPath: (0, import_path2.join)(home, ".gemini", "antigravity-cli", "settings.json"),
+      guardDir: (0, import_path2.join)(home, ".gemini"),
+      readServers: (config) => config.mcpServers ?? {},
+      writeServers: (config, servers) => {
+        config.mcpServers = servers;
+      },
+      readHeaders: (server) => server.headers,
+      writeHeaders: (server, headers) => {
+        server.headers = headers;
+      }
+    }
+  ];
+}
+function syncAlanMcpSessionHeaders(input) {
+  const home = input.homeDir ?? (0, import_os2.homedir)();
+  const sessionHeaders = buildSessionHeaders(input);
+  const written = [];
+  for (const target of buildCodexTomlTargets(home)) {
+    try {
+      if (patchCodexTomlMcpTarget(target, sessionHeaders)) {
+        written.push(target.cli);
+      }
+    } catch {
+    }
+  }
+  for (const target of buildJsonTargets(home)) {
+    try {
+      if (patchJsonMcpTarget(target, sessionHeaders)) {
+        written.push(target.cli);
+      }
+    } catch {
+    }
+  }
+  return written;
+}
 function buildPromptWithSystem(config, promptText) {
   const parts2 = [
     config.systemPrompt?.trim(),
@@ -14961,16 +15321,16 @@ function imageFileExtension(mimeType) {
 }
 function createImageTempDirectory(cwd) {
   const candidates = [
-    cwd ? (0, import_path2.join)(cwd, ".aiden-images-") : null,
-    (0, import_path2.join)((0, import_os2.tmpdir)(), "aiden-images-")
+    cwd ? (0, import_path3.join)(cwd, ".alan-images-") : null,
+    (0, import_path3.join)((0, import_os3.tmpdir)(), "alan-images-")
   ].filter((value2) => Boolean(value2));
   for (const candidate of candidates) {
     try {
-      return (0, import_fs2.mkdtempSync)(candidate);
+      return (0, import_fs3.mkdtempSync)(candidate);
     } catch {
     }
   }
-  return (0, import_fs2.mkdtempSync)((0, import_path2.join)((0, import_os2.tmpdir)(), "aiden-images-"));
+  return (0, import_fs3.mkdtempSync)((0, import_path3.join)((0, import_os3.tmpdir)(), "alan-images-"));
 }
 function safeFilename(filename) {
   const safe = filename.replace(/[^a-zA-Z0-9._-]/g, "_").replace(/^_+/, "");
@@ -14984,8 +15344,8 @@ function writeImagesToTempFiles(images, cwd) {
   const files = [];
   for (const img of images) {
     const ext = imageFileExtension(img.mimeType);
-    const filePath = (0, import_path2.join)(directory, `aiden-img-${img.id}.${ext}`);
-    (0, import_fs2.writeFileSync)(filePath, Buffer.from(img.data, "base64"));
+    const filePath = (0, import_path3.join)(directory, `alan-img-${img.id}.${ext}`);
+    (0, import_fs3.writeFileSync)(filePath, Buffer.from(img.data, "base64"));
     paths.push(filePath);
     files.push({
       filename: img.filename,
@@ -15000,7 +15360,7 @@ function writeImagesToTempFiles(images, cwd) {
     files,
     cleanup: () => {
       try {
-        (0, import_fs2.rmSync)(directory, { recursive: true, force: true });
+        (0, import_fs3.rmSync)(directory, { recursive: true, force: true });
       } catch {
       }
     }
@@ -15026,8 +15386,8 @@ function writeFilesToTempFiles(files, cwd) {
   }
   for (const file of dataFiles) {
     if (!directory || file.data === void 0) continue;
-    const filePath = (0, import_path2.join)(directory, `${file.id}-${safeFilename(file.filename)}`);
-    (0, import_fs2.writeFileSync)(filePath, Buffer.from(file.data, "base64"));
+    const filePath = (0, import_path3.join)(directory, `${file.id}-${safeFilename(file.filename)}`);
+    (0, import_fs3.writeFileSync)(filePath, Buffer.from(file.data, "base64"));
     paths.push(filePath);
     tempFiles.push({
       filename: file.filename,
@@ -15042,7 +15402,7 @@ function writeFilesToTempFiles(files, cwd) {
     cleanup: () => {
       if (!directory) return;
       try {
-        (0, import_fs2.rmSync)(directory, { recursive: true, force: true });
+        (0, import_fs3.rmSync)(directory, { recursive: true, force: true });
       } catch {
       }
     }
@@ -15964,6 +16324,30 @@ function createAntigravityCliBackend(command = "agy", defaultArgs = []) {
     }
   };
 }
+var execFileAsync = (0, import_util10.promisify)(import_child_process3.execFile);
+var flagSupportCache = /* @__PURE__ */ new Map();
+function helpAdvertisesFlag(helpText, flag) {
+  return helpText.includes(flag);
+}
+async function cliSupportsFlag(command, flag, env = {}) {
+  const key = `${command}::${flag}`;
+  const cached = flagSupportCache.get(key);
+  if (cached !== void 0) return cached;
+  let supported = false;
+  try {
+    const { stdout, stderr } = await execFileAsync(command, ["--help"], {
+      env: { ...process.env, ...env },
+      timeout: 5e3,
+      maxBuffer: 4 * 1024 * 1024
+    });
+    supported = helpAdvertisesFlag(`${stdout ?? ""}${stderr ?? ""}`, flag);
+  } catch (error) {
+    const withOutput = error;
+    supported = helpAdvertisesFlag(`${withOutput.stdout ?? ""}${withOutput.stderr ?? ""}`, flag);
+  }
+  flagSupportCache.set(key, supported);
+  return supported;
+}
 function stringField(record, key) {
   const value2 = record[key];
   return typeof value2 === "string" && value2.trim().length > 0 ? value2 : void 0;
@@ -16070,7 +16454,7 @@ function maybeFinalizeDeferredResult(kind, context, state) {
   state.resultDeferredOnBackgroundWork = false;
   finalizeStructuredResult(kind, state);
 }
-var DEBUG_ASK = process.env.AIDEN_DEBUG_ASK === "1" || process.env.AIDEN_DEBUG === "1";
+var DEBUG_ASK = process.env.ALAN_DEBUG_ASK === "1" || process.env.ALAN_DEBUG === "1";
 function debugAskLog(message) {
   if (DEBUG_ASK) console.info(message);
 }
@@ -16333,13 +16717,13 @@ function createClaudeCliBackend(command = "claude", defaultArgs = []) {
         args.push("--disallowedTools", disallowedTools.join(","));
       }
       const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
-      if (!resumeId) {
-        if (context.config.systemPrompt?.trim()) {
-          args.push("--system-prompt", context.config.systemPrompt.trim());
-        }
-        if (context.config.systemPromptAppend?.trim()) {
-          args.push("--append-system-prompt", context.config.systemPromptAppend.trim());
-        }
+      if (!resumeId && context.config.systemPrompt?.trim()) {
+        args.push("--system-prompt", context.config.systemPrompt.trim());
+      } else if (resumeId && context.config.systemPromptAppend?.trim()) {
+        args.push("--append-system-prompt", context.config.systemPromptAppend.trim());
+      }
+      if (context.config.teamId?.trim() && await cliSupportsFlag(command, "--approve-mcps", context.env)) {
+        args.push("--approve-mcps");
       }
       const baseModel = context.config.selectedModel?.trim();
       if (baseModel) {
@@ -16424,26 +16808,26 @@ function normalizeCodexMcpToolResult(output) {
   return raw;
 }
 function findCodexSessionLog(runtimeSessionId, codexHome) {
-  if (!runtimeSessionId || !(0, import_fs3.existsSync)(codexHome)) return null;
-  const root = (0, import_path3.join)(codexHome, "sessions");
-  if (!(0, import_fs3.existsSync)(root)) return null;
+  if (!runtimeSessionId || !(0, import_fs4.existsSync)(codexHome)) return null;
+  const root = (0, import_path4.join)(codexHome, "sessions");
+  if (!(0, import_fs4.existsSync)(root)) return null;
   const matches = [];
   const stack = [root];
   while (stack.length > 0) {
     const dir = stack.pop();
     let entries;
     try {
-      entries = (0, import_fs3.readdirSync)(dir, { withFileTypes: true });
+      entries = (0, import_fs4.readdirSync)(dir, { withFileTypes: true });
     } catch {
       continue;
     }
     for (const entry of entries) {
-      const path = (0, import_path3.join)(dir, entry.name);
+      const path = (0, import_path4.join)(dir, entry.name);
       if (entry.isDirectory()) {
         stack.push(path);
       } else if (entry.isFile() && entry.name.includes(runtimeSessionId) && entry.name.endsWith(".jsonl")) {
         try {
-          matches.push({ path, mtimeMs: (0, import_fs3.statSync)(path).mtimeMs });
+          matches.push({ path, mtimeMs: (0, import_fs4.statSync)(path).mtimeMs });
         } catch {
           matches.push({ path, mtimeMs: 0 });
         }
@@ -16476,10 +16860,10 @@ function latestUserMessageLineIndex(lines) {
 async function replayCodexMcpToolEventsFromSessionLog(context, state) {
   const runtimeSessionId = state.runtimeSessionId;
   if (!runtimeSessionId) return;
-  const codexHome = context.env.CODEX_HOME || process.env.CODEX_HOME || (0, import_path3.join)((0, import_os3.homedir)(), ".codex");
+  const codexHome = context.env.CODEX_HOME || process.env.CODEX_HOME || (0, import_path4.join)((0, import_os4.homedir)(), ".codex");
   const logPath = findCodexSessionLog(runtimeSessionId, codexHome);
   if (!logPath) return;
-  const allLines = (0, import_fs3.readFileSync)(logPath, "utf8").split(/\r?\n/).filter(Boolean);
+  const allLines = (0, import_fs4.readFileSync)(logPath, "utf8").split(/\r?\n/).filter(Boolean);
   const latestUserLineIndex = latestUserMessageLineIndex(allLines);
   const lines = latestUserLineIndex >= 0 ? allLines.slice(latestUserLineIndex + 1) : allLines;
   const emittedToolIds = /* @__PURE__ */ new Set();
@@ -17117,6 +17501,7 @@ function createCursorAgentCliBackend(command = "cursor-agent", defaultArgs = [])
         context.config.images,
         context.cwd
       );
+      const approveMcps = context.config.teamId?.trim() ? await cliSupportsFlag(command, "--approve-mcps", context.env) : false;
       try {
         return await createGenericCliBackend({
           kind: "cursor_agent_cli",
@@ -17129,10 +17514,12 @@ function createCursorAgentCliBackend(command = "cursor-agent", defaultArgs = [])
               "--output-format",
               "stream-json",
               "--trust",
-              "--approve-mcps",
               "--workspace",
               ctx.cwd
             ];
+            if (approveMcps) {
+              args.push("--approve-mcps");
+            }
             const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
             if (shouldForceCursorAgent(ctx.config)) args.push("--force");
             if (ctx.config.mode === "plan" || ctx.config.mode === "review") {
@@ -17167,7 +17554,12 @@ function createCursorAgentCliBackend(command = "cursor-agent", defaultArgs = [])
           // with zero output; without this watchdog only the 30-min server reaper
           // would end the run.
           startupTimeoutMs: 18e4,
-          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles),
+          augmentPrompt: (ctx) => {
+            const prompt = buildPromptWithImagePathReferences(ctx, imageFiles);
+            return ctx.config.teamId?.trim() ? `${prompt}
+
+${buildCodeDiscoveryEnforcementTail()}` : prompt;
+          },
           parseStructuredLine: parseCursorStructuredLine
         }).run(context);
       } finally {
@@ -17305,174 +17697,259 @@ function createDroidCliBackend(command = "droid", defaultArgs = []) {
     }
   };
 }
+var ACP_PROTOCOL_VERSION = 1;
 function asRecord(value2) {
-  return value2 && typeof value2 === "object" ? value2 : null;
+  return value2 && typeof value2 === "object" && !Array.isArray(value2) ? value2 : null;
 }
-function extractToolName2(parsed) {
-  for (const key of ["toolName", "name", "tool", "tool_name"]) {
-    const value2 = parsed[key];
-    if (typeof value2 === "string" && value2.trim()) return value2.trim();
+function asString(value2) {
+  return typeof value2 === "string" ? value2 : "";
+}
+function resumeSessionId(context) {
+  return context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim() || "";
+}
+function chunkText(content) {
+  const record = asRecord(content);
+  if (!record) return "";
+  if (typeof record.text === "string") return record.text;
+  return chunkText(record.content);
+}
+function toolResultText(update) {
+  const content = update.content;
+  if (Array.isArray(content)) {
+    const parts2 = content.map((item) => chunkText(item)).filter((text) => text.length > 0);
+    if (parts2.length) return parts2.join("\n");
   }
-  const toolCall = asRecord(parsed.toolCall) ?? asRecord(parsed.tool_call);
-  if (toolCall) {
-    for (const key of ["name", "toolName", "tool"]) {
-      const value2 = toolCall[key];
-      if (typeof value2 === "string" && value2.trim()) return value2.trim();
+  const rawOutput = update.rawOutput;
+  if (rawOutput !== void 0) return JSON.stringify(rawOutput, null, 2);
+  return "";
+}
+function toolMetaName(update) {
+  const meta = asRecord(update._meta);
+  const tool = asRecord(meta?.["x.ai/tool"]);
+  return asString(tool?.name);
+}
+function resolvePermission(params, context) {
+  const record = asRecord(params);
+  const options = Array.isArray(record?.options) ? record?.options : [];
+  const toolCall = asRecord(record?.toolCall);
+  const meta = asRecord(toolCall?._meta);
+  const tool = asRecord(meta?.["x.ai/tool"]);
+  const isReadOnlyTool = tool?.read_only === true || asString(tool?.kind) === "read";
+  const allow = !shouldUseReadOnlyRuntimePermissions(context.config) || isReadOnlyTool;
+  const allowKinds = ["allow_always", "allow_once", "allow"];
+  const rejectKinds = ["reject_always", "reject_once", "reject", "deny"];
+  const wanted = allow ? allowKinds : rejectKinds;
+  const chosen = options.find((option) => wanted.includes(asString(asRecord(option)?.kind))) ?? (allow ? options[0] : options[options.length - 1]);
+  const optionId = asString(asRecord(chosen)?.optionId);
+  if (!optionId) return { outcome: { outcome: "cancelled" } };
+  return { outcome: { outcome: "selected", optionId } };
+}
+function createGrokAcpDriver(imageFiles) {
+  let stdin = null;
+  let nextId = 0;
+  let initId = -1;
+  let sessionOpId = -1;
+  let promptId = -1;
+  let attemptedNewSession = false;
+  let finalized = false;
+  function write(message) {
+    try {
+      stdin?.write(`${JSON.stringify(message)}
+`);
+    } catch {
     }
   }
-  return "Grok Tool";
-}
-function extractToolId2(parsed, fallback) {
-  for (const key of ["toolCallId", "callId", "call_id", "id"]) {
-    const value2 = parsed[key];
-    if (typeof value2 === "string" && value2.trim()) return value2.trim();
+  function request(method, params) {
+    const id = ++nextId;
+    write({ jsonrpc: "2.0", id, method, params });
+    return id;
   }
-  const toolCall = asRecord(parsed.toolCall) ?? asRecord(parsed.tool_call);
-  if (toolCall) {
-    for (const key of ["id", "toolCallId", "callId"]) {
-      const value2 = toolCall[key];
-      if (typeof value2 === "string" && value2.trim()) return value2.trim();
-    }
+  function respond(id, result) {
+    write({ jsonrpc: "2.0", id, result });
   }
-  return fallback;
-}
-function extractToolArgs(parsed) {
-  for (const key of ["args", "arguments", "input", "params"]) {
-    if (parsed[key] !== void 0) return parsed[key];
+  function newSession(context) {
+    attemptedNewSession = true;
+    sessionOpId = request("session/new", { cwd: context.cwd, mcpServers: [] });
   }
-  const toolCall = asRecord(parsed.toolCall) ?? asRecord(parsed.tool_call);
-  if (toolCall) {
-    for (const key of ["args", "arguments", "input", "params"]) {
-      if (toolCall[key] !== void 0) return toolCall[key];
+  function beginSession(context, state) {
+    const resume = resumeSessionId(context);
+    if (resume) {
+      state.runtimeSessionId = resume;
+      sessionOpId = request("session/load", {
+        sessionId: resume,
+        cwd: context.cwd,
+        mcpServers: []
+      });
+      return;
     }
+    newSession(context);
   }
-  return parsed;
-}
-function extractToolResultText(parsed) {
-  for (const key of ["result", "output", "content", "data", "message"]) {
-    const value2 = parsed[key];
-    if (typeof value2 === "string" && value2.trim()) return value2;
+  function sendPrompt(context, state) {
+    const text = buildPromptWithImagePathReferences(context, imageFiles);
+    promptId = request("session/prompt", {
+      sessionId: state.runtimeSessionId,
+      prompt: [{ type: "text", text }]
+    });
   }
-  return JSON.stringify(parsed, null, 2);
-}
-function handleGrokStructuredEvent(parsed, context, state) {
-  const presenter = context.presenter;
-  const type = typeof parsed.type === "string" ? parsed.type : "";
-  if (!type) return false;
-  for (const key of ["sessionId", "session_id"]) {
-    const value2 = parsed[key];
-    if (typeof value2 === "string" && value2.trim()) {
-      state.runtimeSessionId = value2.trim();
-      break;
+  function finalize(state) {
+    if (finalized) return;
+    finalized = true;
+    state.resultReceived = true;
+    state.onResultReceived?.();
+    try {
+      stdin?.end();
+    } catch {
     }
   }
-  if (typeof parsed.model === "string" && parsed.model.trim()) {
-    state.activeModel = parsed.model.trim();
-  }
-  switch (type) {
-    case "thought":
-    case "thinking":
-    case "reasoning": {
-      const text = typeof parsed.data === "string" ? parsed.data : "";
-      if (!text) return true;
-      state.iterations = Math.max(state.iterations, 1);
-      void presenter.onThinking(text);
-      return true;
+  function handleResponse(message, context, state) {
+    if (message.error && message.id === sessionOpId && !attemptedNewSession) {
+      newSession(context);
+      return;
     }
-    case "text":
-    case "assistant":
-    case "message": {
-      const text = typeof parsed.data === "string" ? parsed.data : typeof parsed.text === "string" ? parsed.text : typeof parsed.content === "string" ? parsed.content : "";
-      if (!text) return true;
-      state.iterations = Math.max(state.iterations, 1);
-      state.summary += text;
-      void presenter.onAssistantText(text);
-      return true;
+    if (message.error) {
+      state.error = message.error.message?.trim() || "Grok agent error";
+      void context.presenter.onError(state.error);
+      finalize(state);
+      return;
     }
-    case "tool":
-    case "tool_call":
-    case "tool_use":
-    case "toolCall": {
-      const toolId = extractToolId2(parsed, `grok-tool-${Date.now()}`);
-      const toolName = extractToolName2(parsed);
-      const toolArgs = extractToolArgs(parsed);
-      const subtype = typeof parsed.subtype === "string" ? parsed.subtype : "";
-      const status = typeof parsed.status === "string" ? parsed.status : "";
-      state.iterations = Math.max(state.iterations, 1);
-      if (subtype === "completed" || subtype === "result" || status === "completed" || status === "done" || parsed.result !== void 0 || parsed.output !== void 0) {
-        void presenter.onToolResult?.(toolId, extractToolResultText(parsed));
-        return true;
-      }
-      void presenter.onToolUse(toolName, toolArgs, toolId);
-      return true;
+    const result = asRecord(message.result);
+    if (message.id === initId) {
+      const modelState = asRecord(asRecord(result?._meta)?.modelState);
+      const model = asString(modelState?.currentModelId);
+      if (model) state.activeModel = model;
+      beginSession(context, state);
+      return;
     }
-    case "tool_result":
-    case "toolResult": {
-      const toolId = extractToolId2(parsed, `grok-tool-${Date.now()}`);
+    if (message.id === sessionOpId) {
+      const sessionId = asString(result?.sessionId);
+      if (sessionId) state.runtimeSessionId = sessionId;
       state.iterations = Math.max(state.iterations, 1);
-      void presenter.onToolResult?.(toolId, extractToolResultText(parsed));
-      return true;
-    }
-    case "error": {
-      const message = typeof parsed.message === "string" && parsed.message.trim() ? parsed.message.trim() : typeof parsed.data === "string" && parsed.data.trim() ? parsed.data.trim() : "Grok Build run failed";
-      state.error = message;
-      void presenter.onError(message);
-      state.resultReceived = true;
-      state.onResultReceived?.();
-      return true;
+      sendPrompt(context, state);
+      return;
     }
-    case "end":
-    case "result": {
-      const stopReason = typeof parsed.stopReason === "string" ? parsed.stopReason : "";
+    if (message.id === promptId) {
+      const meta = asRecord(result?._meta);
+      const model = asString(meta?.modelId) || state.activeModel || (typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel.trim() : "grok");
+      const inputTokens = typeof meta?.inputTokens === "number" ? meta.inputTokens : 0;
+      const outputTokens = typeof meta?.outputTokens === "number" ? meta.outputTokens : 0;
+      const cacheReadTokens = typeof meta?.cachedReadTokens === "number" ? meta.cachedReadTokens : 0;
       state.iterations = Math.max(state.iterations, 1);
       state.usage = {
-        model: state.activeModel || (typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel : "grok"),
+        model,
         numTurns: Math.max(state.iterations, 1),
-        durationMs: typeof parsed.duration_ms === "number" ? parsed.duration_ms : 0,
-        inputTokens: 0,
-        outputTokens: 0,
-        cacheReadTokens: 0,
+        durationMs: 0,
+        inputTokens,
+        outputTokens,
+        cacheReadTokens,
         cacheCreationTokens: 0,
         costUsd: 0
       };
-      void presenter.onUsageUpdate?.({
-        model: state.usage.model,
-        inputTokens: 0,
-        outputTokens: 0,
-        cacheReadTokens: 0,
+      void context.presenter.onUsageUpdate?.({
+        model,
+        inputTokens,
+        outputTokens,
+        cacheReadTokens,
         cacheCreationTokens: 0
       });
-      if ((stopReason.toLowerCase().includes("error") || parsed.is_error === true) && !state.error) {
+      const stopReason = asString(result?.stopReason).toLowerCase();
+      if (stopReason.includes("error") && !state.error) {
         state.error = "Grok Build run failed";
-        void presenter.onError(state.error);
+        void context.presenter.onError(state.error);
       }
-      state.resultReceived = true;
-      state.onResultReceived?.();
-      return true;
+      finalize(state);
     }
-    default:
-      return false;
   }
+  function handleServerRequest(message, context, _state) {
+    const id = message.id;
+    switch (message.method) {
+      case "session/request_permission":
+        respond(id, resolvePermission(message.params, context));
+        return;
+      case "fs/read_text_file":
+        respond(id, { content: "" });
+        return;
+      default:
+        respond(id, null);
+    }
+  }
+  function handleNotification(message, context, state) {
+    const params = asRecord(message.params);
+    const update = asRecord(params?.update);
+    if (!update) return;
+    const presenter = context.presenter;
+    switch (asString(update.sessionUpdate)) {
+      case "agent_thought_chunk": {
+        const text = chunkText(update.content);
+        if (!text) return;
+        state.iterations = Math.max(state.iterations, 1);
+        void presenter.onThinking(text);
+        return;
+      }
+      case "agent_message_chunk": {
+        const text = chunkText(update.content);
+        if (!text) return;
+        state.iterations = Math.max(state.iterations, 1);
+        state.summary += text;
+        void presenter.onAssistantText(text);
+        return;
+      }
+      case "tool_call": {
+        const toolId = asString(update.toolCallId);
+        const toolName = asString(update.title) || toolMetaName(update) || "Grok Tool";
+        const input = update.rawInput ?? {};
+        state.iterations = Math.max(state.iterations, 1);
+        void presenter.onToolUse(toolName, input, toolId);
+        return;
+      }
+      case "tool_call_update": {
+        const status = asString(update.status).toLowerCase();
+        if (status !== "completed" && status !== "failed" && status !== "error") return;
+        const toolId = asString(update.toolCallId);
+        void presenter.onToolResult?.(toolId, toolResultText(update));
+        return;
+      }
+      default:
+        return;
+    }
+  }
+  function handleLine(line, context, state) {
+    if (!stdin && state.stdin) stdin = state.stdin;
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      if (line.trim().length > 0) void context.presenter.onLog(`[grok_cli] ${line}`);
+      return;
+    }
+    const message = asRecord(parsed);
+    if (!message) return;
+    if (message.id !== void 0 && message.method === void 0) {
+      handleResponse(message, context, state);
+      return;
+    }
+    if (message.method && message.id !== void 0) {
+      handleServerRequest(message, context, state);
+      return;
+    }
+    if (message.method) {
+      handleNotification(message, context, state);
+    }
+  }
+  function start(stdinStream, _context) {
+    stdin = stdinStream;
+    initId = request("initialize", {
+      protocolVersion: ACP_PROTOCOL_VERSION,
+      clientCapabilities: {
+        fs: { readTextFile: false, writeTextFile: false },
+        terminal: false
+      }
+    });
+  }
+  return { start, handleLine };
 }
-var parseGrokStructuredLine = createStructuredLineParser(
-  "grok_cli",
-  handleGrokStructuredEvent
-);
 function isGrokCliModelId(model) {
   return model === "auto" || /^grok-/.test(model) || /^grok_/.test(model) || model.startsWith("grok-composer-");
 }
-function resolveGrokPermissionMode(config) {
-  if (shouldUseReadOnlyRuntimePermissions(config)) return "plan";
-  switch (config.mode) {
-    case "plan":
-    case "review":
-      return "plan";
-    case "ask":
-      return "dontAsk";
-    default:
-      return "bypassPermissions";
-  }
-}
 function createGrokCliBackend(command = "grok", defaultArgs = []) {
   return {
     kind: "grok_cli",
@@ -17482,34 +17959,17 @@ function createGrokCliBackend(command = "grok", defaultArgs = []) {
         context.config.images,
         context.cwd
       );
+      const driver = createGrokAcpDriver(imageFiles);
       try {
         return await createGenericCliBackend({
           kind: "grok_cli",
           supportTier: "structured",
           command,
           args: [],
-          buildArgs: (ctx, prompt) => {
-            const args = [
-              "-p",
-              prompt,
-              "--output-format",
-              "streaming-json",
-              "--cwd",
-              ctx.cwd,
-              "--permission-mode",
-              resolveGrokPermissionMode(ctx.config)
-            ];
-            if (!shouldUseReadOnlyRuntimePermissions(ctx.config)) {
-              args.push("--always-approve");
-            }
-            const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
-            if (resumeId) args.push("--resume", resumeId);
-            const model = ctx.config.selectedModel?.trim();
-            if (model && isGrokCliModelId(model)) args.push("--model", model);
-            return [...args, ...defaultArgs];
-          },
-          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles),
-          parseStructuredLine: parseGrokStructuredLine
+          buildArgs: (ctx) => buildGrokAgentArgs(ctx.config, defaultArgs),
+          keepStdinOpen: true,
+          stdinWriter: (stdin, ctx) => driver.start(stdin, ctx),
+          parseStructuredLine: driver.handleLine
         }).run(context);
       } finally {
         cleanup();
@@ -17517,10 +17977,20 @@ function createGrokCliBackend(command = "grok", defaultArgs = []) {
     }
   };
 }
+function buildGrokAgentArgs(config, defaultArgs = []) {
+  const args = ["agent"];
+  if (!shouldUseReadOnlyRuntimePermissions(config)) {
+    args.push("--always-approve");
+  }
+  const model = config.selectedModel?.trim();
+  if (model && isGrokCliModelId(model)) args.push("--model", model);
+  args.push(...defaultArgs, "stdio");
+  return args;
+}
 var DEFAULT_SKILL_ROOTS = [
-  (0, import_path4.join)((0, import_os4.homedir)(), ".agents", "skills"),
-  (0, import_path4.join)((0, import_os4.homedir)(), ".claude", "skills"),
-  (0, import_path4.join)((0, import_os4.homedir)(), ".config", "opencode", "skills")
+  (0, import_path5.join)((0, import_os5.homedir)(), ".agents", "skills"),
+  (0, import_path5.join)((0, import_os5.homedir)(), ".claude", "skills"),
+  (0, import_path5.join)((0, import_os5.homedir)(), ".config", "opencode", "skills")
 ];
 function parseFrontmatter(content) {
   if (!content.startsWith("---\n")) return {};
@@ -17536,12 +18006,12 @@ function parseFrontmatter(content) {
   return result;
 }
 function listSkillFiles(root) {
-  if (!(0, import_fs4.existsSync)(root)) return [];
+  if (!(0, import_fs5.existsSync)(root)) return [];
   const files = [];
-  for (const entry of (0, import_fs4.readdirSync)(root, { withFileTypes: true })) {
+  for (const entry of (0, import_fs5.readdirSync)(root, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const skillPath = (0, import_path4.join)(root, entry.name, "SKILL.md");
-    if ((0, import_fs4.existsSync)(skillPath)) files.push(skillPath);
+    const skillPath = (0, import_path5.join)(root, entry.name, "SKILL.md");
+    if ((0, import_fs5.existsSync)(skillPath)) files.push(skillPath);
   }
   return files;
 }
@@ -17550,7 +18020,7 @@ function loadInstalledSkills(roots = DEFAULT_SKILL_ROOTS) {
   for (const root of roots) {
     for (const skillPath of listSkillFiles(root)) {
       try {
-        const frontmatter = parseFrontmatter((0, import_fs4.readFileSync)(skillPath, "utf8"));
+        const frontmatter = parseFrontmatter((0, import_fs5.readFileSync)(skillPath, "utf8"));
         const name = frontmatter.name;
         const description = frontmatter.description;
         if (!name || !description || skills.has(name)) continue;
@@ -18047,40 +18517,40 @@ function parseSkillInvocation(text) {
 function candidateRoots(cwd) {
   const roots = [];
   if (cwd) {
-    roots.push((0, import_path5.join)(cwd, ".agents", "skills"));
-    roots.push((0, import_path5.join)(cwd, ".claude", "skills"));
-    roots.push((0, import_path5.join)(cwd, ".codex", "skills"));
-    if ((0, import_fs5.existsSync)(cwd)) {
+    roots.push((0, import_path6.join)(cwd, ".agents", "skills"));
+    roots.push((0, import_path6.join)(cwd, ".claude", "skills"));
+    roots.push((0, import_path6.join)(cwd, ".codex", "skills"));
+    if ((0, import_fs6.existsSync)(cwd)) {
       let entries = [];
       try {
-        entries = (0, import_fs5.readdirSync)(cwd, { withFileTypes: true });
+        entries = (0, import_fs6.readdirSync)(cwd, { withFileTypes: true });
       } catch {
       }
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
         if (entry.name.startsWith(".")) continue;
-        const child = (0, import_path5.join)(cwd, entry.name);
-        roots.push((0, import_path5.join)(child, ".agents", "skills"));
-        roots.push((0, import_path5.join)(child, ".claude", "skills"));
-        roots.push((0, import_path5.join)(child, ".codex", "skills"));
+        const child = (0, import_path6.join)(cwd, entry.name);
+        roots.push((0, import_path6.join)(child, ".agents", "skills"));
+        roots.push((0, import_path6.join)(child, ".claude", "skills"));
+        roots.push((0, import_path6.join)(child, ".codex", "skills"));
       }
     }
   }
-  const home = (0, import_os5.homedir)();
-  roots.push((0, import_path5.join)(home, ".agents", "skills"));
-  roots.push((0, import_path5.join)(home, ".claude", "skills"));
-  roots.push((0, import_path5.join)(home, ".codex", "skills"));
+  const home = (0, import_os6.homedir)();
+  roots.push((0, import_path6.join)(home, ".agents", "skills"));
+  roots.push((0, import_path6.join)(home, ".claude", "skills"));
+  roots.push((0, import_path6.join)(home, ".codex", "skills"));
   return Array.from(new Set(roots));
 }
 function resolveSkillInvocation(text, cwd) {
   const parsed = parseSkillInvocation(text);
   if (!parsed) return null;
   for (const root of candidateRoots(cwd)) {
-    const skillPath = (0, import_path5.join)(root, parsed.command, "SKILL.md");
-    if (!(0, import_fs5.existsSync)(skillPath)) continue;
+    const skillPath = (0, import_path6.join)(root, parsed.command, "SKILL.md");
+    if (!(0, import_fs6.existsSync)(skillPath)) continue;
     let content;
     try {
-      content = (0, import_fs5.readFileSync)(skillPath, "utf-8");
+      content = (0, import_fs6.readFileSync)(skillPath, "utf-8");
     } catch {
       continue;
     }
@@ -18190,7 +18660,7 @@ function buildTaskLifecyclePrompt(config) {
   return [
     "## Task Lifecycle",
     `This session is attached to taskId "${taskId}".`,
-    `Do not change the task status on your own. The user manages this task's status. Only change it by calling the Aiden MCP update_task tool when the user explicitly asks you to (for example: "move this to review" or "mark it done"). Do not update the status proactively as you move through research, implementation, testing, or review phases.`,
+    `Do not change the task status on your own. The user manages this task's status. Only change it by calling the Alan MCP update_task tool when the user explicitly asks you to (for example: "move this to review" or "mark it done"). Do not update the status proactively as you move through research, implementation, testing, or review phases.`,
     ...statusLines,
     "",
     "When the user asks you to change the status, use exact status IDs from the available statuses. Do not invent status IDs. If none of the available statuses clearly matches the request, ask which one they mean instead of guessing."
@@ -18309,12 +18779,12 @@ var BaseMachineAgent = class _BaseMachineAgent {
   buildRuntimeConfig(config, safeProjectPath) {
     const backendKind = this.resolveBackendKind(config);
     const supportTier = config.supportTier || this.getDefaultSupportTier(backendKind);
-    const systemPromptParts = [AIDEN_IDENTITY_PROMPT];
-    const agentPrompt = config.agentPrompt?.trim() || getAidenAgentPrompt(config.agentId);
+    const systemPromptParts = [ALAN_IDENTITY_PROMPT];
+    const agentPrompt = config.agentPrompt?.trim() || getAlanAgentPrompt(config.agentId);
     if (agentPrompt) systemPromptParts.push(agentPrompt);
-    const modeHint = getAidenModePrompt(config.mode);
+    const modeHint = getAlanModePrompt(config.mode);
     if (modeHint) systemPromptParts.push(modeHint);
-    systemPromptParts.push(AIDEN_ASK_USER_PROMPT);
+    systemPromptParts.push(ALAN_ASK_USER_PROMPT);
     const operatorSystemPrompt = config.systemPrompt?.trim();
     if (operatorSystemPrompt) systemPromptParts.push(operatorSystemPrompt);
     const workingDir = config.worktreePath || safeProjectPath;
@@ -18326,8 +18796,14 @@ Prefer relative paths and keep your work scoped to this project.`
     }
     const lifecyclePrompt = buildTaskLifecyclePrompt(config);
     if (lifecyclePrompt) systemPromptParts.push(lifecyclePrompt);
+    const teamId = config.teamId;
+    const teamCodeOverlay = teamId ? buildAlanTeamCodeContextOverlay(teamId) : void 0;
+    if (teamCodeOverlay) {
+      systemPromptParts.push(teamCodeOverlay);
+    }
     const extra = this.buildExtraSystemPromptParts(config);
     systemPromptParts.push(...extra);
+    const mergedAppend = [config.systemPromptAppend?.trim(), teamCodeOverlay].filter((value2) => Boolean(value2 && value2.length > 0)).join("\n\n");
     return {
       ...config,
       backendKind,
@@ -18335,12 +18811,13 @@ Prefer relative paths and keep your work scoped to this project.`
       runtimeCommand: config.runtimeCommand || this.runtime.runtimeCommand,
       runtimeArgs: config.runtimeArgs || this.runtime.runtimeArgs,
       selectedModel: config.selectedModel || defaultSelectedModelForBackend(backendKind),
-      systemPrompt: systemPromptParts.join("\n\n") || void 0
+      systemPrompt: systemPromptParts.join("\n\n") || void 0,
+      systemPromptAppend: mergedAppend || void 0
     };
   }
   async runCliBackend(config, safeProjectPath) {
     const backendKind = this.resolveBackendKind(config);
-    const defaultCwd = (0, import_path.join)((0, import_os.homedir)(), "Documents", "aiden");
+    const defaultCwd = (0, import_path.join)((0, import_os.homedir)(), "Documents", "alan");
     if (!(0, import_fs.existsSync)(defaultCwd)) {
       (0, import_fs.mkdirSync)(defaultCwd, { recursive: true });
     }
@@ -18479,6 +18956,19 @@ Prefer relative paths and keep your work scoped to this project.`
       this.presenter.onComplete(result);
       return result;
     }
+    if (initialConfig.conversationId) {
+      try {
+        const writtenClis = syncAlanMcpSessionHeaders({
+          conversationId: initialConfig.conversationId,
+          teamId: initialConfig.teamId
+        });
+        if (writtenClis.length > 0) {
+          void this.presenter.onLog(`Synced Alan MCP session headers to ${writtenClis.join(", ")}`);
+        }
+      } catch (error) {
+        console.warn("[base-machine-agent] Failed to sync MCP session headers", error);
+      }
+    }
     try {
       return await this.runCliBackend(initialConfig, safeProjectPath);
     } catch (error) {
@@ -18520,8 +19010,8 @@ var MAX_SESSION_VIDEO_BYTES = 100 * 1024 * 1024;
 function isRecord(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
-function shouldExtractGeneratedImagesFromToolResult(toolName, content, options = {}) {
-  return isGeneratedImageToolName(toolName) || isBrowserScreenshotToolName(toolName) || isAgentBrowserMediaInvocation(toolName, content, options.toolInput, "image");
+function shouldExtractGeneratedImagesFromToolResult(toolName, _content, _options = {}) {
+  return isGeneratedImageToolName(toolName);
 }
 function collectStringValues(value2, out) {
   if (typeof value2 === "string") {
@@ -18585,14 +19075,14 @@ function normalizePath(candidate, cwd) {
   } catch {
   }
   if (path.startsWith("~/")) return null;
-  if ((0, import_path6.isAbsolute)(path)) return path;
-  return cwd ? (0, import_path6.join)(cwd, path) : null;
+  if ((0, import_path7.isAbsolute)(path)) return path;
+  return cwd ? (0, import_path7.join)(cwd, path) : null;
 }
 function resolveToolCwd(cwd, toolInput) {
   if (!isRecord(toolInput)) return cwd;
   const raw = typeof toolInput.cwd === "string" ? toolInput.cwd : typeof toolInput.workdir === "string" ? toolInput.workdir : typeof toolInput.workingDirectory === "string" ? toolInput.workingDirectory : null;
   if (!raw) return cwd;
-  return (0, import_path6.isAbsolute)(raw) || !cwd ? raw : (0, import_path6.join)(cwd, raw);
+  return (0, import_path7.isAbsolute)(raw) || !cwd ? raw : (0, import_path7.join)(cwd, raw);
 }
 function extractBrowserMediaPathHints(content, cwd, toolName, options = {}, kind = "video") {
   if (!isAgentBrowserMediaInvocation(toolName, content, options.toolInput, kind)) return [];
@@ -18635,19 +19125,19 @@ function extractGeneratedImagesFromToolResult(toolId, content, cwd, toolName, op
   const effectiveCwd = resolveToolCwd(cwd, options.toolInput);
   for (const candidate of extractPathCandidates(content, options)) {
     const path = normalizePath(candidate, effectiveCwd);
-    if (!path || seen.has(path) || !(0, import_fs6.existsSync)(path)) continue;
+    if (!path || seen.has(path) || !(0, import_fs7.existsSync)(path)) continue;
     seen.add(path);
-    const ext = (0, import_path6.extname)(path).toLowerCase();
+    const ext = (0, import_path7.extname)(path).toLowerCase();
     const mimeType = IMAGE_MIME_BY_EXT[ext];
     if (!mimeType) continue;
-    const stat = (0, import_fs6.statSync)(path);
+    const stat = (0, import_fs7.statSync)(path);
     if (!stat.isFile() || stat.size <= 0 || stat.size > MAX_GENERATED_IMAGE_BYTES) continue;
-    const buffer = (0, import_fs6.readFileSync)(path);
+    const buffer = (0, import_fs7.readFileSync)(path);
     const { width, height } = readImageDimensions2(buffer, mimeType);
     images.push({
       type: "generated_image",
       id: (0, import_crypto2.randomUUID)(),
-      filename: (0, import_path6.basename)(path),
+      filename: (0, import_path7.basename)(path),
       mimeType,
       size: buffer.length,
       width,
@@ -18662,27 +19152,36 @@ function extractGeneratedImagesFromToolResult(toolId, content, cwd, toolName, op
   return images;
 }
 function extractSessionMediaFromToolResult(toolId, content, cwd, toolName, options = {}) {
-  if (!isAgentBrowserMediaInvocation(toolName, content, options.toolInput, "video")) return [];
+  const isImage = isAgentBrowserMediaInvocation(toolName, content, options.toolInput, "image");
+  const isVideo = isAgentBrowserMediaInvocation(toolName, content, options.toolInput, "video");
+  if (!isImage && !isVideo) return [];
   const media = [];
   const seen = /* @__PURE__ */ new Set();
   const effectiveCwd = resolveToolCwd(cwd, options.toolInput);
-  for (const candidate of extractPathCandidates(content, options, "mp4|webm|mov")) {
+  const kind = isVideo ? "video" : "image";
+  const extensionsPattern = kind === "video" ? "mp4|webm|mov" : "png|jpe?g|gif|webp";
+  const maxBytes = kind === "video" ? MAX_SESSION_VIDEO_BYTES : MAX_GENERATED_IMAGE_BYTES;
+  const mimeByExt = kind === "video" ? VIDEO_MIME_BY_EXT : IMAGE_MIME_BY_EXT;
+  for (const candidate of extractPathCandidates(content, options, extensionsPattern)) {
     const path = normalizePath(candidate, effectiveCwd);
-    if (!path || seen.has(path) || !(0, import_fs6.existsSync)(path)) continue;
+    if (!path || seen.has(path) || !(0, import_fs7.existsSync)(path)) continue;
     seen.add(path);
-    const ext = (0, import_path6.extname)(path).toLowerCase();
-    const mimeType = VIDEO_MIME_BY_EXT[ext];
+    const ext = (0, import_path7.extname)(path).toLowerCase();
+    const mimeType = mimeByExt[ext];
     if (!mimeType) continue;
-    const stat = (0, import_fs6.statSync)(path);
-    if (!stat.isFile() || stat.size <= 0 || stat.size > MAX_SESSION_VIDEO_BYTES) continue;
-    const buffer = (0, import_fs6.readFileSync)(path);
+    const stat = (0, import_fs7.statSync)(path);
+    if (!stat.isFile() || stat.size <= 0 || stat.size > maxBytes) continue;
+    const buffer = (0, import_fs7.readFileSync)(path);
+    const dimensions = kind === "image" ? readImageDimensions2(buffer, mimeType) : null;
     media.push({
       type: "session_media",
-      kind: "video",
+      kind,
       id: (0, import_crypto2.randomUUID)(),
-      filename: (0, import_path6.basename)(path),
+      filename: (0, import_path7.basename)(path),
       mimeType,
       size: buffer.length,
+      width: dimensions?.width,
+      height: dimensions?.height,
       data: buffer.toString("base64"),
       sourcePath: path,
       sourceHash: (0, import_crypto2.createHash)("sha256").update(buffer).digest("hex"),
@@ -18928,11 +19427,11 @@ ${meta.description}`);
       }
       parts2.push(lines.join("\n"));
     }
-    const taskId = config.taskId ?? process.env.AIDEN_TASK_ID;
-    const workflowId = config.workflowId ?? process.env.AIDEN_WORKFLOW_ID;
-    const workflowExecutionId = config.workflowExecutionId ?? process.env.AIDEN_WORKFLOW_EXECUTION_ID;
-    const conversationId = config.conversationId ?? process.env.AIDEN_SESSION_ID;
-    const teamId = config.teamId;
+    const taskId = config.taskId ?? process.env.ALAN_TASK_ID;
+    const workflowId = config.workflowId ?? process.env.ALAN_WORKFLOW_ID;
+    const workflowExecutionId = config.workflowExecutionId ?? process.env.ALAN_WORKFLOW_EXECUTION_ID;
+    const conversationId = config.conversationId ?? process.env.ALAN_SESSION_ID;
+    const teamId = config.teamId ?? process.env.ALAN_TEAM_ID;
     const artifactIds = [];
     if (teamId) artifactIds.push(`- teamId: "${teamId}"`);
     const isWorkflowSession = !!(workflowId || workflowExecutionId);
@@ -18956,7 +19455,7 @@ ${meta.description}`);
         [
           "## Prototype Artifacts",
           "When the user asks to create, build, modify, or iterate on a prototype, do not create local prototype files such as prototype/index.html.",
-          "Instead, generate a Vite React TypeScript source snapshot and call the Aiden MCP tool upsert_prototype_version with teamId, workflowId, workflowExecutionId, conversationId, title, sourceSnapshot, and packageJson.",
+          "Instead, generate a Vite React TypeScript source snapshot and call the Alan MCP tool upsert_prototype_version with teamId, workflowId, workflowExecutionId, conversationId, title, sourceSnapshot, and packageJson.",
           "For follow-up changes to the same prototype, call list_prototypes (with workflowId) or get_prototype if needed, then call upsert_prototype_version again with the existing prototypeId and parentVersionId."
         ].join("\n")
       );
@@ -18965,16 +19464,11 @@ ${meta.description}`);
         [
           "## Prototype Artifacts",
           "When the user asks to create, build, modify, or iterate on a prototype, do not create local prototype files such as prototype/index.html.",
-          "Instead, generate a Vite React TypeScript source snapshot and call the Aiden MCP tool upsert_prototype_version with teamId, taskId, conversationId, title, sourceSnapshot, and packageJson.",
+          "Instead, generate a Vite React TypeScript source snapshot and call the Alan MCP tool upsert_prototype_version with teamId, taskId, conversationId, title, sourceSnapshot, and packageJson.",
           "For follow-up changes to the same prototype, call list_prototypes or get_prototype if needed, then call upsert_prototype_version again with the existing prototypeId and parentVersionId so the task Prototypes panel renders the new version."
         ].join("\n")
       );
     }
-    if (teamId) {
-      parts2.push(
-        `You are operating within team \`${teamId}\`. Always use this as the \`teamId\` for all MCP tool calls that accept it (list_tasks, search, start_task_session, etc.). Do not call list_teams.`
-      );
-    }
     return parts2;
   }
 };
@@ -18983,10 +19477,10 @@ ${meta.description}`);
 var import_node_fs5 = require("fs");
 var import_node_os5 = require("os");
 var import_node_path4 = require("path");
-function ensureAidenMcpRegistered(backendKind, registration, home = (0, import_node_os5.homedir)()) {
+function ensureAlanMcpRegistered(backendKind, registration, home = (0, import_node_os5.homedir)()) {
   try {
-    const mcpServers = buildAidenMcpServers(registration);
-    const files = aidenMcpConfigFilesForBackend(backendKind, mcpServers, home);
+    const mcpServers = buildAlanMcpServers(registration);
+    const files = alanMcpConfigFilesForBackend(backendKind, mcpServers, home);
     const paths = [];
     for (const file of files) {
       (0, import_node_fs5.mkdirSync)((0, import_node_path4.dirname)(file.path), { recursive: true });
@@ -19010,8 +19504,8 @@ function ensureAidenMcpRegistered(backendKind, registration, home = (0, import_n
     return { ok: false, paths: [], error: err instanceof Error ? err.message : String(err) };
   }
 }
-function verifyAidenMcpRegistered(backendKind, home = (0, import_node_os5.homedir)()) {
-  const files = aidenMcpConfigFilesForBackend(backendKind, {}, home);
+function verifyAlanMcpRegistered(backendKind, home = (0, import_node_os5.homedir)()) {
+  const files = alanMcpConfigFilesForBackend(backendKind, {}, home);
   const missing = files.map((f) => f.path).filter((p) => !(0, import_node_fs5.existsSync)(p));
   return { ok: missing.length === 0, missing };
 }
@@ -19163,20 +19657,40 @@ function extractModelIdsFromJson(value2) {
   }
   return [];
 }
-function extractCodexModelSlugsFromDebugJson(value2) {
+function normalizeCodexReasoningEffort(effort) {
+  const normalized = effort.trim().toLowerCase();
+  if (!normalized) return null;
+  if (normalized === "none") return "minimal";
+  if (normalized === "minimal" || normalized === "low" || normalized === "medium" || normalized === "high" || normalized === "xhigh" || normalized === "max" || normalized === "ultra") {
+    return normalized;
+  }
+  return null;
+}
+function extractCodexDiscoveredModelIdsFromDebugJson(value2) {
   if (!value2 || typeof value2 !== "object") return [];
   const models = value2.models;
   if (!Array.isArray(models)) return [];
-  const slugs = [];
+  const ids = [];
   for (const entry of models) {
     if (!entry || typeof entry !== "object") continue;
     const record = entry;
     const visibility = typeof record.visibility === "string" ? record.visibility.toLowerCase() : "list";
     if (visibility === "hidden" || visibility === "hide") continue;
     const slug = readModelId(record.slug);
-    if (slug) slugs.push(slug);
+    if (!slug) continue;
+    const reasoningLevels = record.supported_reasoning_levels;
+    if (Array.isArray(reasoningLevels) && reasoningLevels.length > 0) {
+      for (const levelEntry of reasoningLevels) {
+        if (!levelEntry || typeof levelEntry !== "object") continue;
+        const effort = typeof levelEntry.effort === "string" ? levelEntry.effort : null;
+        const normalized = effort ? normalizeCodexReasoningEffort(effort) : null;
+        if (normalized) ids.push(`${slug}-${normalized}`);
+      }
+      continue;
+    }
+    ids.push(slug);
   }
-  return [...new Set(slugs)];
+  return [...new Set(ids)];
 }
 function extractModelIdsFromText(value2) {
   const ansiPattern = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
@@ -19267,8 +19781,8 @@ async function probeJsonOrTextModels(executable, env, argSets, options) {
     if (!result || result.error || result.status !== 0 || !result.stdout.trim()) continue;
     try {
       const parsed = JSON.parse(result.stdout);
-      const codexSlugs = extractCodexModelSlugsFromDebugJson(parsed);
-      if (codexSlugs.length > 0) return codexSlugs;
+      const codexModels = extractCodexDiscoveredModelIdsFromDebugJson(parsed);
+      if (codexModels.length > 0) return codexModels;
       const models = extractModelIdsFromJson(parsed);
       if (models.length > 0) return models;
     } catch {
@@ -19349,13 +19863,13 @@ async function discoverProviderModels(provider, executable, env) {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.1.32";
+var AGENT_VERSION = "0.1.35";
 
 // src/daemon.ts
-var STAGING_API_URL = process.env.AIDEN_STAGING_API_URL ?? "https://api.staging.aiden-platform.com";
-var STAGING_WS_URL = process.env.AIDEN_STAGING_WS_URL ?? "wss://ws.staging.aiden-platform.com";
-var PRODUCTION_API_URL = "https://api.aiden-platform.com";
-var PRODUCTION_WS_URL = "wss://ws.aiden-platform.com";
+var STAGING_API_URL = process.env.ALAN_STAGING_API_URL ?? "https://staging-api.tryalan.ai";
+var STAGING_WS_URL = process.env.ALAN_STAGING_WS_URL ?? "wss://alan-staging-ws.tryalan.ai";
+var PRODUCTION_API_URL = "https://api.tryalan.ai";
+var PRODUCTION_WS_URL = "wss://ws.tryalan.ai";
 var LOCAL_API_URL = "http://localhost:8400";
 var LOCAL_WS_URL = "ws://localhost:8401";
 function requiredString(params, key) {
@@ -19405,10 +19919,10 @@ function gitSafe(cwd, args) {
 }
 function worktreeDir(projectPath) {
   const resolved = (0, import_node_path5.resolve)(projectPath);
-  return (0, import_node_path5.join)((0, import_node_path5.dirname)(resolved), `${(0, import_node_path5.basename)(resolved)}-aiden-worktrees`);
+  return (0, import_node_path5.join)((0, import_node_path5.dirname)(resolved), `${(0, import_node_path5.basename)(resolved)}-alan-worktrees`);
 }
 function pathSegment(value2) {
-  return value2.toLowerCase().replace(/^aiden\//, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || "task";
+  return value2.toLowerCase().replace(/^alan\//, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || "task";
 }
 function repoName(repoUrl, localPath) {
   return repoUrl.replace(/\.git$/, "").split("/").pop() || (0, import_node_path5.basename)(localPath) || "repo";
@@ -19579,7 +20093,7 @@ async function probeLocalDaemonEndpoint(port, token, timeoutMs = 750) {
   }
 }
 function describeOccupiedLocalDaemon(port) {
-  return `local daemon API port ${port} is already in use. If Aiden desktop is open, it manages the daemon automatically. Quit Aiden desktop or stop the existing daemon before starting another.`;
+  return `local daemon API port ${port} is already in use. If Alan desktop is open, it manages the daemon automatically. Quit Alan desktop or stop the existing daemon before starting another.`;
 }
 var boundAgentConfigPath = null;
 function bindConfigPath(args) {
@@ -19587,10 +20101,10 @@ function bindConfigPath(args) {
   return boundAgentConfigPath;
 }
 function getConfigPath() {
-  return process.env.AIDEN_AGENT_CONFIG_PATH ?? boundAgentConfigPath ?? resolveAgentConfigPath({ profile: "production" });
+  return process.env.ALAN_AGENT_CONFIG_PATH ?? boundAgentConfigPath ?? resolveAgentConfigPath({ profile: "production" });
 }
 function getEndpointDefaultsPath() {
-  return process.env.AIDEN_AGENT_ENDPOINTS_PATH ?? (0, import_node_path5.join)((0, import_node_path5.dirname)(getConfigPath()), "endpoints.json");
+  return process.env.ALAN_AGENT_ENDPOINTS_PATH ?? (0, import_node_path5.join)((0, import_node_path5.dirname)(getConfigPath()), "endpoints.json");
 }
 function readConfig() {
   const configPath = getConfigPath();
@@ -19609,7 +20123,14 @@ function readEndpointDefaults() {
 function writeConfig(config) {
   const configPath = getConfigPath();
   (0, import_node_fs7.mkdirSync)((0, import_node_path5.dirname)(configPath), { recursive: true, mode: 448 });
-  (0, import_node_fs7.writeFileSync)(configPath, JSON.stringify(config, null, 2), { mode: 384 });
+  const pendingPath = `${configPath}.pending-${process.pid}-${(0, import_node_crypto.randomBytes)(6).toString("hex")}`;
+  try {
+    (0, import_node_fs7.writeFileSync)(pendingPath, JSON.stringify(config, null, 2), { mode: 384 });
+    (0, import_node_fs7.chmodSync)(pendingPath, 384);
+    (0, import_node_fs7.renameSync)(pendingPath, configPath);
+  } finally {
+    (0, import_node_fs7.rmSync)(pendingPath, { force: true });
+  }
 }
 function removeConfig() {
   const configPath = getConfigPath();
@@ -19629,8 +20150,8 @@ function resolveEndpoints(args, stored = {}) {
   const profileApiUrl = requestedProfile === "local" ? LOCAL_API_URL : requestedProfile === "staging" ? STAGING_API_URL : PRODUCTION_API_URL;
   const profileWsUrl = requestedProfile === "local" ? LOCAL_WS_URL : requestedProfile === "staging" ? STAGING_WS_URL : PRODUCTION_WS_URL;
   const endpointDefaults = readEndpointDefaults();
-  const apiUrl = argValue(args, "--api-url") ?? process.env.AIDEN_API_URL ?? stored.apiUrl ?? endpointDefaults.apiUrl ?? profileApiUrl;
-  const wsUrl = argValue(args, "--ws-url") ?? process.env.AIDEN_WS_URL ?? stored.wsUrl ?? endpointDefaults.wsUrl ?? profileWsUrl;
+  const apiUrl = argValue(args, "--api-url") ?? process.env.ALAN_API_URL ?? stored.apiUrl ?? endpointDefaults.apiUrl ?? profileApiUrl;
+  const wsUrl = argValue(args, "--ws-url") ?? process.env.ALAN_WS_URL ?? stored.wsUrl ?? endpointDefaults.wsUrl ?? profileWsUrl;
   const endpointProfile = apiUrl === profileApiUrl && wsUrl === profileWsUrl ? requestedProfile : apiUrl === endpointDefaults.apiUrl && wsUrl === endpointDefaults.wsUrl && endpointDefaults.endpointProfile ? endpointDefaults.endpointProfile : "custom";
   return { apiUrl, wsUrl, endpointProfile };
 }
@@ -19640,9 +20161,12 @@ function isLocalEndpoint(url2) {
 function checkStoredEndpointConsistency(stored, endpointDefaults) {
   const profile = stored.endpointProfile;
   if (profile !== "production" && profile !== "staging") return null;
+  const builtInApiUrl = profile === "production" ? PRODUCTION_API_URL : STAGING_API_URL;
+  const builtInWsUrl = profile === "production" ? PRODUCTION_WS_URL : STAGING_WS_URL;
+  if (stored.apiUrl === builtInApiUrl && stored.wsUrl === builtInWsUrl) return null;
   const defaultsMatchProfile = endpointDefaults.endpointProfile === profile;
-  const expectedApiUrl = (defaultsMatchProfile ? endpointDefaults.apiUrl : void 0) ?? (profile === "production" ? PRODUCTION_API_URL : STAGING_API_URL);
-  const expectedWsUrl = (defaultsMatchProfile ? endpointDefaults.wsUrl : void 0) ?? (profile === "production" ? PRODUCTION_WS_URL : STAGING_WS_URL);
+  const expectedApiUrl = (defaultsMatchProfile ? endpointDefaults.apiUrl : void 0) ?? builtInApiUrl;
+  const expectedWsUrl = (defaultsMatchProfile ? endpointDefaults.wsUrl : void 0) ?? builtInWsUrl;
   const issues = [];
   if (stored.wsUrl && stored.wsUrl !== expectedWsUrl) {
     issues.push(`wsUrl ${stored.wsUrl} (expected ${expectedWsUrl})`);
@@ -19658,7 +20182,7 @@ function checkStoredEndpointConsistency(stored, endpointDefaults) {
   };
 }
 function getLocalApiPort(args, stored) {
-  const raw = argValue(args, "--local-api-port") ?? process.env.AIDEN_AGENT_LOCAL_API_PORT;
+  const raw = argValue(args, "--local-api-port") ?? process.env.ALAN_AGENT_LOCAL_API_PORT;
   if (raw) return Number.parseInt(raw, 10);
   const storedPort = stored.localApiPort;
   if (storedPort && storedPort > 0) return storedPort;
@@ -20189,17 +20713,17 @@ var RuntimePresenter = class {
 async function setupDaemon(args) {
   bindConfigPath(args);
   const { apiUrl, wsUrl, endpointProfile } = resolveEndpoints(args);
-  const teamId = argValue(args, "--team") ?? process.env.AIDEN_TEAM_ID;
-  const setupToken = argValue(args, "--setup-token") ?? process.env.AIDEN_RUNTIME_SETUP_TOKEN;
-  const token = argValue(args, "--token") ?? process.env.AIDEN_SETUP_TOKEN;
+  const teamId = argValue(args, "--team") ?? process.env.ALAN_TEAM_ID;
+  const setupToken = argValue(args, "--setup-token") ?? process.env.ALAN_RUNTIME_SETUP_TOKEN;
+  const token = argValue(args, "--token") ?? process.env.ALAN_SETUP_TOKEN;
   const displayName = argValue(args, "--name") ?? (0, import_node_os6.hostname)();
-  const scope = argValue(args, "--scope") ?? process.env.AIDEN_RUNTIME_SCOPE ?? "team";
+  const scope = argValue(args, "--scope") ?? process.env.ALAN_RUNTIME_SCOPE ?? "team";
   if (scope !== "team" && scope !== "user") {
     throw new Error("setup --scope must be either 'team' or 'user'");
   }
   if (!setupToken && (!teamId || !token)) {
     throw new Error(
-      "setup requires --setup-token <token> or --team <team-id> and --token <aiden PAT>.\nFor normal setup, copy the setup token from Aiden and run: aiden-agent setup --setup-token <token>\nFor browser authorization, run: aiden-agent login"
+      "setup requires --setup-token <token> or --team <team-id> and --token <alan PAT>.\nFor normal setup, copy the setup token from Alan and run: alan-agent setup --setup-token <token>\nFor browser authorization, run: alan-agent login"
     );
   }
   const response = await fetch(
@@ -20241,7 +20765,7 @@ async function setupDaemon(args) {
     localApiToken: (0, import_node_crypto.randomBytes)(24).toString("hex"),
     displayName: body.runtime.displayName ?? displayName
   });
-  console.info("[aiden-agent] Runtime registered", {
+  console.info("[alan-agent] Runtime registered", {
     runtimeId: body.runtime.id,
     configPath: getConfigPath()
   });
@@ -20266,8 +20790,8 @@ async function loginWithDeviceCode(args) {
   }
   const authorization = await start.json();
   const intervalMs = Math.max(0, (authorization.intervalSeconds ?? 2) * 1e3);
-  console.info(`[aiden-agent] Open ${authorization.verificationUri}`);
-  console.info(`[aiden-agent] Enter code ${authorization.userCode}`);
+  console.info(`[alan-agent] Open ${authorization.verificationUri}`);
+  console.info(`[alan-agent] Enter code ${authorization.userCode}`);
   for (let attempt = 0; attempt < maxPolls; attempt += 1) {
     if (attempt > 0) await sleep(intervalMs);
     const token = await fetch(`${apiUrl}/public/runtimes/device-authorizations/token`, {
@@ -20293,7 +20817,7 @@ async function loginWithDeviceCode(args) {
       localApiToken: (0, import_node_crypto.randomBytes)(24).toString("hex"),
       displayName: body.runtime.displayName ?? displayName
     });
-    console.info("[aiden-agent] Runtime registered", {
+    console.info("[alan-agent] Runtime registered", {
       runtimeId: body.runtime.id,
       configPath: getConfigPath()
     });
@@ -20308,14 +20832,14 @@ async function startDaemon(args) {
   const endpointProfile = stored.endpointProfile ?? resolveEndpointProfile(args);
   const daemonSessionId = (0, import_node_crypto.randomUUID)();
   let heartbeatSeq = 0;
-  const runtimeId = argValue(args, "--runtime-id") ?? process.env.AIDEN_RUNTIME_ID ?? stored.runtimeId;
-  const runtimeToken = argValue(args, "--token") ?? process.env.AIDEN_RUNTIME_TOKEN ?? stored.runtimeToken;
-  const wsUrlOverride = argValue(args, "--ws-url") ?? process.env.AIDEN_WS_URL;
+  const runtimeId = argValue(args, "--runtime-id") ?? process.env.ALAN_RUNTIME_ID ?? stored.runtimeId;
+  const runtimeToken = argValue(args, "--token") ?? process.env.ALAN_RUNTIME_TOKEN ?? stored.runtimeToken;
+  const wsUrlOverride = argValue(args, "--ws-url") ?? process.env.ALAN_WS_URL;
   const endpointMismatch = wsUrlOverride ? null : checkStoredEndpointConsistency(stored, readEndpointDefaults());
   let wsUrl = wsUrlOverride ?? stored.wsUrl;
   if (endpointMismatch && stored.wsUrl && stored.wsUrl !== endpointMismatch.expectedWsUrl) {
     console.warn(
-      "[aiden-agent] Stored config does not match its endpoint profile \u2014 connecting with the profile endpoints instead. Re-run setup to repair the stored config.",
+      "[alan-agent] Stored config does not match its endpoint profile \u2014 connecting with the profile endpoints instead. Re-run setup to repair the stored config.",
       { configPath: getConfigPath(), detail: endpointMismatch.detail }
     );
     wsUrl = endpointMismatch.expectedWsUrl;
@@ -20329,6 +20853,8 @@ async function startDaemon(args) {
   }
   const activeAgents = /* @__PURE__ */ new Map();
   let disconnectedSinceMs = null;
+  let lastConnectError = null;
+  let lastConnectErrorCode = null;
   const pendingDeliveryLost = [];
   const currentCapabilities = () => discoverCapabilities();
   const currentMetadata = () => collectRuntimeMetadataWithProviderLimits();
@@ -20397,9 +20923,11 @@ async function startDaemon(args) {
   }, VERSION_REFRESH_INTERVAL_MS);
   socket.on("connect", () => {
     disconnectedSinceMs = null;
+    lastConnectError = null;
+    lastConnectErrorCode = null;
     setConnectedRuntimeSocket(socket);
     pushLog(`connected runtime=${runtimeId}`);
-    console.info("[aiden-agent] Daemon connected", { runtimeId, wsUrl, version: AGENT_VERSION });
+    console.info("[alan-agent] Daemon connected", { runtimeId, wsUrl, version: AGENT_VERSION });
     flushPendingDeliveryLostEvents({
       socket,
       activeAgents,
@@ -20434,18 +20962,23 @@ async function startDaemon(args) {
   let lastConnectErrorLogAt = 0;
   socket.on("connect_error", (error) => {
     if (!socket.connected && disconnectedSinceMs === null) disconnectedSinceMs = Date.now();
-    pushLog(`connect_error ${error.message}`);
+    lastConnectError = error.message;
+    const errorCode = error?.data?.code;
+    lastConnectErrorCode = typeof errorCode === "string" ? errorCode : null;
+    pushLog(
+      `connect_error ${error.message}${lastConnectErrorCode ? ` code=${lastConnectErrorCode}` : ""}`
+    );
     const now = Date.now();
     if (now - lastConnectErrorLogAt < 5e3) return;
     lastConnectErrorLogAt = now;
     const wsHint = isLocalEndpoint(wsUrl) ? ` Nothing is listening at ${wsUrl}. For local dev run setup with --profile local and start the stack (WS on ws://localhost:8401).` : ` Verify wsUrl in ${getConfigPath()} and that you can reach ${wsUrl}.`;
-    console.warn("[aiden-agent] Daemon connection error:", `${error.message}.${wsHint}`);
+    console.warn("[alan-agent] Daemon connection error:", `${error.message}.${wsHint}`);
   });
   socket.on("disconnect", (reason) => {
     setConnectedRuntimeSocket(null);
     if (disconnectedSinceMs === null) disconnectedSinceMs = Date.now();
     pushLog(`disconnected ${reason}`);
-    console.info("[aiden-agent] Daemon disconnected:", reason);
+    console.info("[alan-agent] Daemon disconnected:", reason);
     for (const [runId, entry] of activeAgents.entries()) {
       if (entry.stage === "completed" || entry.stage === "failed" || entry.stage === "aborted" || entry.stage === "delivery_lost") {
         continue;
@@ -20548,7 +21081,7 @@ async function startDaemon(args) {
       agentVersion: AGENT_VERSION
     });
     pushLog(`accepted run=${payload.runId}`);
-    console.info("[aiden-agent] Agent run accepted", correlation);
+    console.info("[alan-agent] Agent run accepted", correlation);
     if (!payload.worktreeInfo?.worktreePath && payload.sharedCheckout?.branchName) {
       const repoTargets = resolveSharedCheckoutTargets({
         cwd,
@@ -20578,14 +21111,14 @@ async function startDaemon(args) {
     };
     const releaseActiveRun = () => {
       if (!activeAgents.delete(payload.runId)) return;
-      console.info("[aiden-agent] Agent run finished", correlation);
+      console.info("[alan-agent] Agent run finished", correlation);
     };
     if (backendKind) {
       if (payload.aidenMcp) {
-        const registration = ensureAidenMcpRegistered(backendKind, payload.aidenMcp);
+        const registration = ensureAlanMcpRegistered(backendKind, payload.aidenMcp);
         if (registration.ok) {
           pushLog(`mcp-registered run=${payload.runId} url=${payload.aidenMcp.url}`);
-          console.info("[aiden-agent] Aiden MCP registered for run", {
+          console.info("[alan-agent] Alan MCP registered for run", {
             ...correlation,
             mcpUrl: payload.aidenMcp.url,
             paths: registration.paths
@@ -20593,16 +21126,16 @@ async function startDaemon(args) {
         } else {
           pushLog(`mcp-registration-failed run=${payload.runId} ${registration.error}`);
           console.warn(
-            "[aiden-agent] Aiden MCP registration failed \u2014 Aiden tools may be unavailable this run",
+            "[alan-agent] Alan MCP registration failed \u2014 Alan tools may be unavailable this run",
             { ...correlation, error: registration.error }
           );
         }
       } else {
-        const check2 = verifyAidenMcpRegistered(backendKind);
+        const check2 = verifyAlanMcpRegistered(backendKind);
         if (!check2.ok) {
           pushLog(`mcp-config-missing run=${payload.runId}`);
           console.warn(
-            "[aiden-agent] Aiden MCP config missing \u2014 Aiden tools may be unavailable this run",
+            "[alan-agent] Alan MCP config missing \u2014 Alan tools may be unavailable this run",
             { ...correlation, missing: check2.missing }
           );
         }
@@ -20668,7 +21201,7 @@ async function startDaemon(args) {
     }).catch((error) => {
       const message = error instanceof Error ? error.message : String(error);
       pushLog(`failed run=${payload.runId} ${message}`);
-      console.error("[aiden-agent] Agent run failed", {
+      console.error("[alan-agent] Agent run failed", {
         ...correlation,
         error: message
       });
@@ -20695,7 +21228,7 @@ async function startDaemon(args) {
     abortActiveAgent(entry);
     activeAgents.delete(payload.runId);
     pushLog(`aborted run=${payload.runId}`);
-    console.info("[aiden-agent] Agent run aborted", {
+    console.info("[alan-agent] Agent run aborted", {
       runId: payload.runId,
       agentVersion: AGENT_VERSION
     });
@@ -20801,6 +21334,8 @@ async function startDaemon(args) {
           staleRunCount: runnerSummary.staleRunCount,
           lastRunActivityAtMs: runnerSummary.lastRunActivityAtMs,
           disconnectedSinceMs: runnerSummary.disconnectedSinceMs,
+          lastConnectError,
+          lastConnectErrorCode,
           daemonSessionId,
           heartbeatSeq,
           endpointProfile,
@@ -20827,6 +21362,15 @@ async function startDaemon(args) {
       res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ ok: true }));
       return;
     }
+    if (req.method === "POST" && req.url === "/reconnect") {
+      pushLog("reconnect requested via local API");
+      lastConnectError = null;
+      lastConnectErrorCode = null;
+      socket.disconnect();
+      socket.connect();
+      res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ ok: true }));
+      return;
+    }
     if (req.method === "POST" && req.url?.startsWith("/stop_run")) {
       const runId = new URL(req.url, "http://127.0.0.1").searchParams.get("runId");
       if (!runId) {
@@ -20881,7 +21425,7 @@ async function startDaemon(args) {
     clearInterval(versionRefresh);
     socket.disconnect();
     throw new Error(
-      `${describeOccupiedLocalDaemon(localApiPort)} The token in ${getConfigPath()} no longer matches the running daemon; quit Aiden desktop or run setup again.`
+      `${describeOccupiedLocalDaemon(localApiPort)} The token in ${getConfigPath()} no longer matches the running daemon; quit Alan desktop or run setup again.`
     );
   }
   await new Promise((resolve3, reject) => {
@@ -20911,7 +21455,7 @@ async function startDaemon(args) {
       const address = localServer.address();
       if (address && typeof address === "object") localApiPort = address.port;
       pushLog(`local_api listening port=${localApiPort}`);
-      console.info("[aiden-agent] Local daemon API listening", { port: localApiPort });
+      console.info("[alan-agent] Local daemon API listening", { port: localApiPort });
       resolve3();
     });
   });
@@ -20953,11 +21497,11 @@ async function stopDaemon(args) {
   const probe = await probeLocalDaemonEndpoint(localApiPort, localApiToken);
   if (probe.state === "listening_unauthorized") {
     throw new Error(
-      `Daemon is listening on port ${localApiPort} but rejected this config token. Quit Aiden desktop or rerun setup/login to refresh config.`
+      `Daemon is listening on port ${localApiPort} but rejected this config token. Quit Alan desktop or rerun setup/login to refresh config.`
     );
   }
   if (probe.state === "absent") {
-    console.info("[aiden-agent] No daemon listening", { port: localApiPort });
+    console.info("[alan-agent] No daemon listening", { port: localApiPort });
     return;
   }
   const response = await fetch(`http://127.0.0.1:${localApiPort}/shutdown`, {
@@ -20968,7 +21512,7 @@ async function stopDaemon(args) {
   if (!response.ok) {
     throw new Error(`Failed to stop daemon: HTTP ${response.status}`);
   }
-  console.info("[aiden-agent] Daemon stopped", {
+  console.info("[alan-agent] Daemon stopped", {
     port: localApiPort,
     runtimeId: probe.status.runtimeId
   });
@@ -20980,18 +21524,18 @@ async function runDaemon(args) {
   const localApiToken = stored.localApiToken;
   const existingProbe = await probeLocalDaemonEndpoint(localApiPort, localApiToken);
   if (existingProbe.state === "running") {
-    console.info("[aiden-agent] Daemon already running", {
+    console.info("[alan-agent] Daemon already running", {
       port: localApiPort,
       runtimeId: existingProbe.status.runtimeId,
       connected: existingProbe.status.connected,
-      hint: "If Aiden desktop is open, it manages the daemon automatically."
+      hint: "If Alan desktop is open, it manages the daemon automatically."
     });
     return;
   }
   if (existingProbe.state === "listening_unauthorized") {
-    console.info("[aiden-agent] Daemon already running", {
+    console.info("[alan-agent] Daemon already running", {
       port: localApiPort,
-      hint: `Aiden desktop is using a different local API token than ${getConfigPath()}. Quit the desktop app or rerun setup if you need a fresh daemon.`
+      hint: `Alan desktop is using a different local API token than ${getConfigPath()}. Quit the desktop app or rerun setup if you need a fresh daemon.`
     });
     return;
   }
@@ -21008,11 +21552,11 @@ async function runDaemon(args) {
 async function rotateRuntimeToken(args) {
   bindConfigPath(args);
   const stored = readConfig();
-  const apiUrl = argValue(args, "--api-url") ?? process.env.AIDEN_API_URL ?? stored.apiUrl;
-  const runtimeId = argValue(args, "--runtime-id") ?? process.env.AIDEN_RUNTIME_ID ?? stored.runtimeId;
-  const token = argValue(args, "--token") ?? process.env.AIDEN_SETUP_TOKEN;
+  const apiUrl = argValue(args, "--api-url") ?? process.env.ALAN_API_URL ?? stored.apiUrl;
+  const runtimeId = argValue(args, "--runtime-id") ?? process.env.ALAN_RUNTIME_ID ?? stored.runtimeId;
+  const token = argValue(args, "--token") ?? process.env.ALAN_SETUP_TOKEN;
   if (!apiUrl || !runtimeId || !token) {
-    throw new Error("token rotate requires configured api/runtime plus --token <aiden PAT>");
+    throw new Error("token rotate requires configured api/runtime plus --token <alan PAT>");
   }
   const response = await fetch(`${apiUrl}/public/runtimes/${runtimeId}/tokens/rotate`, {
     method: "POST",
@@ -21023,16 +21567,16 @@ async function rotateRuntimeToken(args) {
   }
   const body = await response.json();
   writeConfig({ ...stored, apiUrl, runtimeId, runtimeToken: body.runtimeToken });
-  console.info("[aiden-agent] Runtime token rotated", { runtimeId });
+  console.info("[alan-agent] Runtime token rotated", { runtimeId });
 }
 async function revokeRuntimeToken(args) {
   bindConfigPath(args);
   const stored = readConfig();
-  const apiUrl = argValue(args, "--api-url") ?? process.env.AIDEN_API_URL ?? stored.apiUrl;
-  const runtimeId = argValue(args, "--runtime-id") ?? process.env.AIDEN_RUNTIME_ID ?? stored.runtimeId;
-  const token = argValue(args, "--token") ?? process.env.AIDEN_SETUP_TOKEN;
+  const apiUrl = argValue(args, "--api-url") ?? process.env.ALAN_API_URL ?? stored.apiUrl;
+  const runtimeId = argValue(args, "--runtime-id") ?? process.env.ALAN_RUNTIME_ID ?? stored.runtimeId;
+  const token = argValue(args, "--token") ?? process.env.ALAN_SETUP_TOKEN;
   if (!apiUrl || !runtimeId || !token) {
-    throw new Error("token revoke requires configured api/runtime plus --token <aiden PAT>");
+    throw new Error("token revoke requires configured api/runtime plus --token <alan PAT>");
   }
   const response = await fetch(`${apiUrl}/public/runtimes/${runtimeId}/tokens/revoke`, {
     method: "POST",
@@ -21042,12 +21586,12 @@ async function revokeRuntimeToken(args) {
     throw new Error(`runtime token revoke failed: ${response.status} ${await response.text()}`);
   }
   removeConfig();
-  console.info("[aiden-agent] Runtime token revoked", { runtimeId });
+  console.info("[alan-agent] Runtime token revoked", { runtimeId });
 }
 function logoutDaemon(args = []) {
   bindConfigPath(args);
   removeConfig();
-  console.info("[aiden-agent] Runtime config removed", { configPath: getConfigPath() });
+  console.info("[alan-agent] Runtime config removed", { configPath: getConfigPath() });
 }
 async function printStatus(args = []) {
   bindConfigPath(args);
@@ -21075,7 +21619,7 @@ async function printStatus(args = []) {
         localDaemonRunning,
         hasLocalApiToken: Boolean(config.localApiToken),
         configPath: getConfigPath(),
-        note: configured ? localDaemonRunning ? "Local daemon is running. Stop it with: aiden-agent stop" : "Durable runtime config is present. Start it with: aiden-agent daemon" : "No durable runtime configured. Cloud sandbox sessions are launched by Aiden with session env vars and do not appear in this local config.",
+        note: configured ? localDaemonRunning ? "Local daemon is running. Stop it with: alan-agent stop" : "Durable runtime config is present. Start it with: alan-agent daemon" : "No durable runtime configured. Cloud sandbox sessions are launched by Alan with session env vars and do not appear in this local config.",
         warnings
       },
       null,
@@ -21166,7 +21710,7 @@ var AgentLifecycleLogger = class _AgentLifecycleLogger {
     const record = omitUndefined({
       ts: (/* @__PURE__ */ new Date()).toISOString(),
       level,
-      component: "sandbox-agent",
+      component: "agent-manager",
       event,
       ...this.context,
       ...normalizeFields(fields)
@@ -21176,12 +21720,12 @@ var AgentLifecycleLogger = class _AgentLifecycleLogger {
 };
 function lifecycleContextFromEnv(env) {
   return normalizeContext({
-    taskId: env.AIDEN_TASK_ID,
-    conversationId: env.AIDEN_SESSION_ID,
-    runId: env.AIDEN_RUN_ID,
-    sandboxId: env.AIDEN_SANDBOX_ID,
-    provider: env.AIDEN_SANDBOX_PROVIDER,
-    backendKind: env.AIDEN_BACKEND_KIND,
+    taskId: env.ALAN_TASK_ID,
+    conversationId: env.ALAN_SESSION_ID,
+    runId: env.ALAN_RUN_ID,
+    sandboxId: env.ALAN_SANDBOX_ID,
+    provider: env.ALAN_SANDBOX_PROVIDER,
+    backendKind: env.ALAN_BACKEND_KIND,
     agentVersion: AGENT_VERSION
   });
 }
@@ -21370,11 +21914,41 @@ var WebPresenter = class {
   }
 };
 
+// src/ws-client.ts
+var import_node_crypto2 = require("crypto");
+
+// ../shared/dist/agent-liveness.js
+var AGENT_LIVENESS_PROTOCOL_VERSION = 1;
+var AGENT_HEARTBEAT_INTERVAL_MS = 15e3;
+var agentRunStateSchema = external_exports.object({
+  /** True when no run is currently executing in this agent process. */
+  idle: external_exports.boolean(),
+  /** Run ids currently executing (cloud sandbox agent runs one at a time, but keep it a list). */
+  activeRunIds: external_exports.array(external_exports.string()).default([])
+});
+var agentHeartbeatSchema = external_exports.object({
+  /** Stable id for this agent OS process; changes only on a fresh agent start. */
+  agentSessionId: external_exports.string().min(1),
+  /** Monotonic per-process sequence number; advances on every heartbeat. */
+  seq: external_exports.number().int().nonnegative(),
+  /** Capability marker — presence is what distinguishes a new agent from a legacy one. */
+  protocolVersion: external_exports.number().int().positive(),
+  runState: agentRunStateSchema,
+  agentVersion: external_exports.string().optional()
+});
+var agentProbeAckSchema = external_exports.object({
+  agentSessionId: external_exports.string().min(1),
+  seq: external_exports.number().int().nonnegative().optional(),
+  protocolVersion: external_exports.number().int().positive().optional()
+});
+
 // src/ws-client.ts
 var WSClient = class {
   constructor(wsUrl, sessionId, taskId, token, callbacks, agentVersion, lifecycle) {
     this.lifecycle = lifecycle;
     this.lifecycle?.info("sandbox_agent_ws_socket_create", { wsUrl });
+    this.agentVersion = agentVersion ?? "";
+    this.getRunState = callbacks.getRunState;
     this.socket = lookup(wsUrl, {
       query: { type: "agent", sessionId, taskId, agentVersion: agentVersion ?? "" },
       auth: { token },
@@ -21390,6 +21964,48 @@ var WSClient = class {
     this.setupListeners(callbacks);
   }
   socket;
+  /** Stable id for this agent process; fences stale heartbeats server-side. */
+  agentSessionId = (0, import_node_crypto2.randomUUID)();
+  /** Monotonic heartbeat sequence — advances on every hello + heartbeat. */
+  heartbeatSeq = 0;
+  heartbeatTimer = null;
+  agentVersion;
+  getRunState;
+  currentRunState() {
+    try {
+      return this.getRunState?.() ?? { idle: true, activeRunIds: [] };
+    } catch {
+      return { idle: true, activeRunIds: [] };
+    }
+  }
+  buildHeartbeat() {
+    this.heartbeatSeq += 1;
+    return {
+      agentSessionId: this.agentSessionId,
+      seq: this.heartbeatSeq,
+      protocolVersion: AGENT_LIVENESS_PROTOCOL_VERSION,
+      runState: this.currentRunState(),
+      agentVersion: this.agentVersion || void 0
+    };
+  }
+  /** Emit `agent.hello` on (re)connect and (re)start the heartbeat interval. */
+  startHeartbeat() {
+    if (this.socket.connected) {
+      this.socket.emit("agent.hello", this.buildHeartbeat());
+    }
+    if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
+    this.heartbeatTimer = setInterval(() => {
+      if (!this.socket.connected) return;
+      this.socket.emit("agent.heartbeat", this.buildHeartbeat());
+    }, AGENT_HEARTBEAT_INTERVAL_MS);
+    this.heartbeatTimer.unref?.();
+  }
+  stopHeartbeat() {
+    if (this.heartbeatTimer) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
+  }
   emitEvent(event) {
     this.socket.emit("agent_event", event);
   }
@@ -21421,17 +22037,27 @@ var WSClient = class {
   }
   close() {
     this.lifecycle?.info("sandbox_agent_ws_close_requested");
+    this.stopHeartbeat();
     this.socket.disconnect();
   }
   setupListeners(callbacks) {
     this.socket.on("connect", () => {
       this.lifecycle?.info("sandbox_agent_ws_socket_connected", { socketId: this.socket.id });
+      this.startHeartbeat();
       callbacks.onConnect?.();
     });
     this.socket.on("disconnect", (reason) => {
       this.lifecycle?.info("sandbox_agent_ws_socket_disconnected", { reason });
+      this.stopHeartbeat();
       callbacks.onDisconnect?.(reason);
     });
+    this.socket.on("agent.probe", (_data, ack) => {
+      ack?.({
+        agentSessionId: this.agentSessionId,
+        seq: this.heartbeatSeq,
+        protocolVersion: AGENT_LIVENESS_PROTOCOL_VERSION
+      });
+    });
     this.socket.on("connect_error", (error) => {
       this.lifecycle?.warn("sandbox_agent_ws_socket_connect_error", {
         error: error instanceof Error ? error : new Error(String(error))
@@ -21596,7 +22222,9 @@ async function runSandbox(config) {
         }
       },
       onConnect: () => lifecycle.info("sandbox_agent_ws_connected"),
-      onDisconnect: (reason) => lifecycle.info("sandbox_agent_ws_disconnected", { reason })
+      onDisconnect: (reason) => lifecycle.info("sandbox_agent_ws_disconnected", { reason }),
+      // Liveness heartbeat run state: a run is active while CoreAgent is executing.
+      getRunState: () => currentAgent ? { idle: false, activeRunIds: currentRunId ? [currentRunId] : [] } : { idle: true, activeRunIds: [] }
     },
     AGENT_VERSION,
     lifecycle
@@ -21619,7 +22247,7 @@ async function runSandbox(config) {
   let activeContextWindow = config.contextWindow;
   let activeEffortLevel = config.effortLevel;
   let activeMode = config.mode || "agent";
-  let currentAidenMcp;
+  let currentAlanMcp;
   while (!stopped) {
     if (currentTask?.trim()) {
       const agent = new CoreAgent(presenter, {
@@ -21653,8 +22281,8 @@ async function runSandbox(config) {
           model: activeModel,
           maxIterations: currentMaxIterations
         });
-        if (currentAidenMcp) {
-          const registration = ensureAidenMcpRegistered(activeBackendKind, currentAidenMcp);
+        if (currentAlanMcp) {
+          const registration = ensureAlanMcpRegistered(activeBackendKind, currentAlanMcp);
           if (registration.ok) {
             lifecycle.info("sandbox_agent_mcp_registered", {
               backendKind: activeBackendKind,
@@ -21666,18 +22294,18 @@ async function runSandbox(config) {
               error: registration.error
             });
             presenter.onLog(
-              `[sandbox] Aiden MCP registration failed \u2014 Aiden tools may be unavailable this run: ${registration.error}`
+              `[sandbox] Alan MCP registration failed \u2014 Alan tools may be unavailable this run: ${registration.error}`
             );
           }
         } else {
-          const check2 = verifyAidenMcpRegistered(activeBackendKind);
+          const check2 = verifyAlanMcpRegistered(activeBackendKind);
           if (!check2.ok) {
             lifecycle.warn("sandbox_agent_mcp_config_missing", {
               backendKind: activeBackendKind,
               missing: check2.missing
             });
             presenter.onLog(
-              `[sandbox] Aiden MCP config missing for ${activeBackendKind} \u2014 Aiden tools may be unavailable this run`
+              `[sandbox] Alan MCP config missing for ${activeBackendKind} \u2014 Alan tools may be unavailable this run`
             );
           }
         }
@@ -21789,8 +22417,8 @@ async function runSandbox(config) {
     if (nextPayload.mode) {
       activeMode = nextPayload.mode;
     }
-    if (nextPayload.aidenMcp !== void 0) {
-      currentAidenMcp = nextPayload.aidenMcp;
+    if (nextPayload.alanMcp !== void 0) {
+      currentAlanMcp = nextPayload.alanMcp;
     }
     if (nextPayload.taskMeta !== void 0) {
       currentTaskMeta = nextPayload.taskMeta;
@@ -21839,26 +22467,26 @@ async function runSandbox(config) {
 
 // src/index.ts
 async function runSessionFromEnv() {
-  const wsUrl = process.env.AIDEN_WS_URL;
-  const sessionId = process.env.AIDEN_SESSION_ID;
-  const taskId = process.env.AIDEN_TASK_ID;
-  const sessionToken = process.env.AIDEN_SESSION_TOKEN;
-  const task = process.env.AIDEN_TASK;
-  const teamId = process.env.AIDEN_TEAM_ID || void 0;
-  const projectPath = process.env.AIDEN_PROJECT_PATH || "/home/user/workspace";
-  const backendKind = process.env.AIDEN_BACKEND_KIND || "claude_cli";
-  const agentId = process.env.AIDEN_AGENT_ID || void 0;
-  const agentPrompt = process.env.AIDEN_AGENT_PROMPT || void 0;
-  const mode = process.env.AIDEN_MODE || "agent";
-  const model = process.env.AIDEN_MODEL;
-  const contextWindow = process.env.AIDEN_CONTEXT_WINDOW || void 0;
-  const effortLevel = process.env.AIDEN_EFFORT_LEVEL || void 0;
-  const providerSessionId = process.env.AIDEN_PROVIDER_SESSION_ID || void 0;
-  const workflowId = process.env.AIDEN_WORKFLOW_ID || void 0;
-  const workflowExecutionId = process.env.AIDEN_WORKFLOW_EXECUTION_ID || void 0;
-  const sandboxId = process.env.AIDEN_SANDBOX_ID || void 0;
-  const provider = process.env.AIDEN_SANDBOX_PROVIDER || void 0;
-  const runId = process.env.AIDEN_RUN_ID || void 0;
+  const wsUrl = process.env.ALAN_WS_URL;
+  const sessionId = process.env.ALAN_SESSION_ID;
+  const taskId = process.env.ALAN_TASK_ID;
+  const sessionToken = process.env.ALAN_SESSION_TOKEN;
+  const task = process.env.ALAN_TASK;
+  const teamId = process.env.ALAN_TEAM_ID || void 0;
+  const projectPath = process.env.ALAN_PROJECT_PATH || "/home/user/workspace";
+  const backendKind = process.env.ALAN_BACKEND_KIND || "claude_cli";
+  const agentId = process.env.ALAN_AGENT_ID || void 0;
+  const agentPrompt = process.env.ALAN_AGENT_PROMPT || void 0;
+  const mode = process.env.ALAN_MODE || "agent";
+  const model = process.env.ALAN_MODEL;
+  const contextWindow = process.env.ALAN_CONTEXT_WINDOW || void 0;
+  const effortLevel = process.env.ALAN_EFFORT_LEVEL || void 0;
+  const providerSessionId = process.env.ALAN_PROVIDER_SESSION_ID || void 0;
+  const workflowId = process.env.ALAN_WORKFLOW_ID || void 0;
+  const workflowExecutionId = process.env.ALAN_WORKFLOW_EXECUTION_ID || void 0;
+  const sandboxId = process.env.ALAN_SANDBOX_ID || void 0;
+  const provider = process.env.ALAN_SANDBOX_PROVIDER || void 0;
+  const runId = process.env.ALAN_RUN_ID || void 0;
   const lifecycle = new AgentLifecycleLogger(lifecycleContextFromEnv(process.env));
   if (!wsUrl || !sessionId || !taskId || !sessionToken || task == null) {
     lifecycle.error("sandbox_agent_bootstrap_missing_env", {
@@ -21869,7 +22497,7 @@ async function runSessionFromEnv() {
       hasTask: task != null
     });
     throw new Error(
-      "run-session is an internal Aiden sandbox/session command and must be launched by Aiden with session env vars. Missing required env vars: AIDEN_WS_URL, AIDEN_SESSION_ID, AIDEN_TASK_ID, AIDEN_SESSION_TOKEN, AIDEN_TASK"
+      "run-session is an internal Alan sandbox/session command and must be launched by Alan with session env vars. Missing required env vars: ALAN_WS_URL, ALAN_SESSION_ID, ALAN_TASK_ID, ALAN_SESSION_TOKEN, ALAN_TASK"
     );
   }
   lifecycle.info("sandbox_agent_process_start", {