diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml
index e9ceab7fd..60d29c7f0 100644
--- a/.github/workflows/release-beta.yml
+++ b/.github/workflows/release-beta.yml
@@ -177,6 +177,7 @@ jobs:
             --mac-compression normal
             --to dmg
             --json
+            --require-vela-cli
             --signed
           )
           if build_output="$(pnpm "${build_args[@]}" 2> >(tee -a "$build_log_path" >&2))"; then
diff --git a/CONTEXT.md b/CONTEXT.md
index 2a861ec10..4fd5425a5 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -52,6 +52,34 @@ _Avoid_: generic subject field, hidden prompt text
 The default voice option shown when the Home Audio composer cannot load configured ElevenLabs voices. It keeps ElevenLabs speech runnable by selecting the same default voice id the daemon uses when no explicit voice is supplied.
 _Avoid_: required credential setup, empty voice selector
 
+**AMR Cloud**:
+The user-facing cloud runtime option for Open Design's official model router, shown in onboarding and login-oriented product surfaces.
+_Avoid_: Vela, local CLI label
+
+**AMR CLI**:
+The local command-line runtime adapter used to run AMR from an installed or packaged native CLI.
+_Avoid_: AMR Cloud, cloud account
+
+**AMR CLI Distribution Contract**:
+The separately owned release contract that provides the native AMR CLI builds Open Design can package.
+_Avoid_: Open Design release channel, package build step, source checkout
+
+**AMR CLI Distribution Slice**:
+The set of native AMR CLI platforms currently available through the distribution contract; platforms outside the slice do not bundle the AMR CLI.
+_Avoid_: Open Design supported platforms, release channel, future platform promise
+
+**AMR Account Status**:
+Whether the user has authenticated the account needed to use AMR Cloud.
+_Avoid_: profile badge, environment, CLI version
+
+**AMR Environment Profile**:
+The target AMR service environment a packaged runtime is configured to use.
+_Avoid_: release channel, account status, app identity
+
+**Onboarding Skip**:
+The explicit path that lets a user leave onboarding without completing the currently selected setup option.
+_Avoid_: continue, finish setup, passive close
+
 ## Relationships
 
 - A **Project** contains zero or more **Normal Artifacts**.
@@ -62,6 +90,12 @@ _Avoid_: required credential setup, empty voice selector
 - A **Home Composer Media Surface** maps user intent to an existing project kind and project metadata at submit time.
 - The **Chip Rail** is the visible Home entry point for choosing a **Home Composer Media Surface**.
 - **Essential Audio Generation** uses an **Audio Source Field** plus model options before creating an audio **Project**.
+- **AMR Cloud** is the user-facing product choice; **AMR CLI** is the local execution adapter behind that capability.
+- The **AMR CLI Distribution Contract** is owned separately from Open Design; Open Design release packaging consumes it instead of defining the native CLI release itself.
+- The first **AMR CLI Distribution Slice** is mac arm64 only.
+- **AMR Account Status** describes account readiness for **AMR Cloud**, not the environment profile or CLI installation state.
+- An **AMR Environment Profile** is independent from release channel identity; a beta, preview, nightly, or stable package can target different AMR service environments when explicitly configured.
+- **Onboarding Skip** bypasses setup completion requirements that belong to the normal onboarding continue path.
 
 ## Example dialogue
 
diff --git a/apps/daemon/package.json b/apps/daemon/package.json
index e4c760c50..fc33d934a 100644
--- a/apps/daemon/package.json
+++ b/apps/daemon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/daemon",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "main": "./dist/cli.js",
diff --git a/apps/daemon/scripts/verify-amr-real-vela.mjs b/apps/daemon/scripts/verify-amr-real-vela.mjs
new file mode 100755
index 000000000..97ef92446
--- /dev/null
+++ b/apps/daemon/scripts/verify-amr-real-vela.mjs
@@ -0,0 +1,101 @@
+#!/usr/bin/env node
+/**
+ * Ad-hoc end-to-end verifier: drives the real `vela` binary through Open
+ * Design's `attachAcpSession`. Not part of the test suite — it makes a real
+ * OpenRouter request when VELA_RUNTIME_KEY is a live key.
+ *
+ * Usage:
+ *   VELA_BIN=/path/to/vela \
+ *   VELA_RUNTIME_KEY=<openrouter-key> \
+ *   VELA_LINK_URL=https://openrouter.ai/api/v1 \
+ *   PATH=<dir-with-opencode>:$PATH \
+ *   node apps/daemon/scripts/verify-amr-real-vela.mjs
+ *
+ * Behaviour:
+ *   - Runs initialize → session/new → session/set_model (if --model given) →
+ *     session/prompt with the prompt from VELA_VERIFY_PROMPT (defaults to a
+ *     short hello).
+ *   - Logs every Open Design `send(event, payload)` to stdout so you can see
+ *     the same text_delta / usage events the chat UI would receive.
+ *   - Exits 0 on completedSuccessfully, 1 otherwise.
+ */
+
+import { spawn } from 'node:child_process';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+const { attachAcpSession } = await import(
+  path.join(HERE, '..', 'dist', 'acp.js')
+);
+
+const velaBin = process.env.VELA_BIN || 'vela';
+const prompt = process.env.VELA_VERIFY_PROMPT || 'Reply with the exact text: AMR-E2E-OK.';
+const model = process.env.VELA_VERIFY_MODEL || null;
+
+if (
+  (!process.env.VELA_RUNTIME_KEY || !process.env.VELA_LINK_URL) &&
+  !process.env.VELA_PROFILE
+) {
+  console.error(
+    'Provide credentials via either:\n' +
+      '  - VELA_RUNTIME_KEY + VELA_LINK_URL env vars, or\n' +
+      '  - VELA_PROFILE (e.g. "local") with a logged-in ~/.amr/config.json.',
+  );
+  process.exit(2);
+}
+
+const child = spawn(velaBin, ['agent', 'run', '--runtime', 'opencode'], {
+  stdio: ['pipe', 'pipe', 'pipe'],
+  env: process.env,
+});
+
+child.stderr.on('data', (chunk) => {
+  process.stderr.write(`[vela.stderr] ${chunk}`);
+});
+child.on('error', (err) => {
+  console.error('[child.error]', err.message);
+});
+child.on('exit', (code, signal) => {
+  console.error(`[child.exit] code=${code} signal=${signal}`);
+});
+child.on('close', (code, signal) => {
+  console.error(`[child.close] code=${code} signal=${signal}`);
+});
+
+const overallTimeoutMs = Number(process.env.VELA_VERIFY_TIMEOUT_MS) || 120_000;
+const overallTimer = setTimeout(() => {
+  console.error(`[verify-amr] overall timeout after ${overallTimeoutMs}ms; SIGTERM child`);
+  if (!child.killed) child.kill('SIGTERM');
+}, overallTimeoutMs);
+overallTimer.unref?.();
+
+const session = attachAcpSession({
+  child,
+  prompt,
+  cwd: process.cwd(),
+  model,
+  mcpServers: [],
+  send: (event, payload) => {
+    const stamp = new Date().toISOString();
+    if (event === 'agent' && payload?.type === 'text_delta') {
+      process.stdout.write(payload.delta);
+      return;
+    }
+    console.log(`\n[${stamp}] ${event} ${JSON.stringify(payload)}`);
+  },
+});
+
+await new Promise((resolve) => child.on('close', resolve));
+process.stdout.write('\n');
+
+if (session.hasFatalError()) {
+  console.error('Session reported fatal error.');
+  process.exit(1);
+}
+if (!session.completedSuccessfully()) {
+  console.error('Session did not complete successfully.');
+  process.exit(1);
+}
+console.log('verify-amr-real-vela: OK');
diff --git a/apps/daemon/src/acp.ts b/apps/daemon/src/acp.ts
index b8597ef08..ca2ebf8ca 100644
--- a/apps/daemon/src/acp.ts
+++ b/apps/daemon/src/acp.ts
@@ -70,6 +70,7 @@ interface AttachAcpSessionOptions {
   clientName?: string;
   clientVersion?: string;
   stageTimeoutMs?: number;
+  modelUnavailableErrorCode?: 'AMR_MODEL_UNAVAILABLE';
 }
 
 function errorMessage(err: unknown): string {
@@ -426,6 +427,7 @@ export function attachAcpSession({
   clientName = 'open-design',
   clientVersion = 'runtime-adapter',
   stageTimeoutMs = DEFAULT_STAGE_TIMEOUT_MS,
+  modelUnavailableErrorCode,
 }: AttachAcpSessionOptions) {
   const runStartedAt = Date.now();
   const effectiveCwd = path.resolve(cwd || process.cwd());
@@ -443,6 +445,7 @@ export function attachAcpSession({
   let modelConfigId: string | null = null;
   let emittedThinkingStart = false;
   let emittedFirstTokenStatus = false;
+  let emittedTextChunk = false;
   let finished = false;
   let fatal = false;
   let aborted = false;
@@ -467,12 +470,41 @@ export function attachAcpSession({
     stageTimer = null;
   };
 
-  const fail = (message: string) => {
+  const amrModelUnavailablePayload = (message: string) => ({
+    message,
+    error: {
+      code: 'AMR_MODEL_UNAVAILABLE',
+      message,
+      retryable: false,
+      details: { kind: 'amr_model', action: 'choose_model' },
+    },
+  });
+
+  const isModelUnavailableError = (message: string) => {
+    const value = message.toLowerCase();
+    return (
+      value.includes('model not found') ||
+      value.includes('providermodelnotfounderror') ||
+      value.includes('unknown model') ||
+      value.includes('invalid model')
+    );
+  };
+
+  const fail = (
+    message: string,
+    options: { forceModelUnavailable?: boolean } = {},
+  ) => {
     if (finished) return;
     finished = true;
     fatal = true;
     clearStageTimer();
-    send('error', { message });
+    const useModelUnavailable =
+      modelUnavailableErrorCode &&
+      (options.forceModelUnavailable || isModelUnavailableError(message));
+    send(
+      'error',
+      useModelUnavailable ? amrModelUnavailablePayload(message) : { message },
+    );
     if (!child.killed) child.kill('SIGTERM');
   };
 
@@ -575,6 +607,7 @@ export function attachAcpSession({
       if (update.sessionUpdate === 'agent_message_chunk') {
         const text = asObject(update.content)?.text;
         if (typeof text === 'string' && text.length > 0) {
+          emittedTextChunk = true;
           if (!emittedFirstTokenStatus) {
             emittedFirstTokenStatus = true;
             send('agent', {
@@ -638,6 +671,13 @@ export function attachAcpSession({
       return;
     }
     if (promptRequestId !== null && obj.id === promptRequestId) {
+      if (!emittedTextChunk && modelUnavailableErrorCode) {
+        fail(
+          'ACP session completed without producing any assistant text. Refresh the AMR model list, choose a supported model, and retry this run.',
+          { forceModelUnavailable: true },
+        );
+        return;
+      }
       const usage = formatUsage(result.usage);
       if (usage) {
         send('agent', {
@@ -672,9 +712,12 @@ export function attachAcpSession({
   });
 
   stdout.on('data', (chunk: string) => parser.feed(chunk));
-  child.on('close', () => {
+  child.on('close', (code, signal) => {
     clearStageTimer();
     parser.flush();
+    if (!finished && !aborted && !fatal) {
+      fail(`ACP session exited before completion (code=${code ?? 'null'}, signal=${signal ?? 'none'})`);
+    }
   });
   child.on('error', (err: Error) => fail(err.message));
   stdin.on('error', (err: Error) => fail(`stdin error: ${err.message}`));
diff --git a/apps/daemon/src/app-config.ts b/apps/daemon/src/app-config.ts
index ee70d9fb4..c53522347 100644
--- a/apps/daemon/src/app-config.ts
+++ b/apps/daemon/src/app-config.ts
@@ -142,6 +142,14 @@ function validateTelemetry(raw: unknown): TelemetryPrefs | undefined {
 }
 
 const AGENT_CLI_ENV_KEYS: ReadonlyMap<string, ReadonlySet<string>> = new Map([
+  ['amr', new Set([
+    'VELA_BIN',
+    'VELA_LINK_URL',
+    'VELA_RUNTIME_KEY',
+    'VELA_OPENCODE_BIN',
+    'OPEN_DESIGN_AMR_PROFILE',
+    'OPENCODE_TEST_HOME',
+  ])],
   ['aider', new Set(['AIDER_BIN'])],
   ['claude', new Set(['CLAUDE_CONFIG_DIR', 'CLAUDE_BIN', 'ANTHROPIC_BASE_URL', 'ANTHROPIC_API_KEY'])],
   ['codex', new Set(['CODEX_HOME', 'CODEX_BIN', 'OPENAI_BASE_URL', 'CODEX_API_KEY', 'OPENAI_API_KEY'])],
diff --git a/apps/daemon/src/connectionTest.ts b/apps/daemon/src/connectionTest.ts
index 41865cc7b..6d579c0a0 100644
--- a/apps/daemon/src/connectionTest.ts
+++ b/apps/daemon/src/connectionTest.ts
@@ -48,6 +48,7 @@ import {
 } from './openai-chat-token-params.js';
 import type { AgentCliEnvPrefs } from './app-config.js';
 import type { RuntimeAgentDef } from './runtimes/types.js';
+import { resolveModelForAgent } from './runtimes/models.js';
 import {
   isBlockedExternalApiHostname,
   isLoopbackApiHost,
@@ -1127,7 +1128,13 @@ function attachAgentStreamHandlers(
       child,
       prompt,
       cwd,
-      model: model ?? null,
+      // Same substitution as the chat-run path in server.ts — adapters whose
+      // CLI rejects the synthetic 'default' (e.g. AMR / vela, which forces
+      // session/set_model before session/prompt) need the def's first
+      // concrete fallback id here too, otherwise Test connection deadlocks
+      // on the same `session/set_model must be called before session/prompt`
+      // error the chat-run path already handles.
+      model: resolveModelForAgent(def as never, model ?? null),
       mcpServers: [],
       send,
     });
diff --git a/apps/daemon/src/integrations/vela-errors.ts b/apps/daemon/src/integrations/vela-errors.ts
new file mode 100644
index 000000000..348332a35
--- /dev/null
+++ b/apps/daemon/src/integrations/vela-errors.ts
@@ -0,0 +1,85 @@
+export type AmrAccountErrorCode = 'AMR_AUTH_REQUIRED' | 'AMR_INSUFFICIENT_BALANCE';
+
+export interface AmrAccountFailure {
+  code: AmrAccountErrorCode;
+  message: string;
+  action: 'relogin' | 'recharge';
+  actionUrl?: string;
+}
+
+export const DEFAULT_AMR_RECHARGE_URL = 'https://open-design.ai/amr/wallet';
+
+const AMR_AUTH_REQUIRED_MESSAGE =
+  'AMR sign-in is required. Sign in to AMR Cloud again, then retry this run.';
+
+const AMR_INSUFFICIENT_BALANCE_MESSAGE =
+  `AMR Cloud reported insufficient balance for this model. Recharge your AMR wallet at ${DEFAULT_AMR_RECHARGE_URL}, then retry this run.`;
+
+function normalizeFailureText(text: string): string {
+  return String(text || '').toLowerCase();
+}
+
+function containsInsufficientBalanceSignal(value: string): boolean {
+  if (
+    value.includes('insufficient_balance') ||
+    value.includes('insufficient balance') ||
+    value.includes('insufficient wallet balance') ||
+    value.includes('insufficient credits') ||
+    value.includes('insufficient credit') ||
+    value.includes('insufficient funds') ||
+    value.includes('not enough balance') ||
+    value.includes('not enough credits') ||
+    value.includes('balance is empty') ||
+    value.includes('balance too low') ||
+    value.includes('billing balance')
+  ) {
+    return true;
+  }
+  return value.includes('quota') && /\b(wallet|balance|credit|billing|funds?)\b/.test(value);
+}
+
+export function classifyAmrAccountFailure(text: string): AmrAccountFailure | null {
+  const value = normalizeFailureText(text);
+  if (!value.trim()) return null;
+
+  if (containsInsufficientBalanceSignal(value)) {
+    return {
+      code: 'AMR_INSUFFICIENT_BALANCE',
+      message: AMR_INSUFFICIENT_BALANCE_MESSAGE,
+      action: 'recharge',
+      actionUrl: DEFAULT_AMR_RECHARGE_URL,
+    };
+  }
+
+  if (
+    value.includes('auth_required') ||
+    value.includes('authentication required') ||
+    value.includes('not authenticated') ||
+    value.includes('unauthenticated') ||
+    value.includes('not logged in') ||
+    value.includes('login missing') ||
+    value.includes('sign in again') ||
+    value.includes('sign-in required') ||
+    value.includes('signin required') ||
+    value.includes('token has expired') ||
+    value.includes('expired token') ||
+    value.includes('invalid session') ||
+    value.includes('session expired')
+  ) {
+    return {
+      code: 'AMR_AUTH_REQUIRED',
+      message: AMR_AUTH_REQUIRED_MESSAGE,
+      action: 'relogin',
+    };
+  }
+
+  return null;
+}
+
+export function amrAccountFailureDetails(failure: AmrAccountFailure) {
+  return {
+    kind: 'amr_account',
+    action: failure.action,
+    ...(failure.actionUrl ? { actionUrl: failure.actionUrl } : {}),
+  };
+}
diff --git a/apps/daemon/src/integrations/vela-profile.ts b/apps/daemon/src/integrations/vela-profile.ts
new file mode 100644
index 000000000..5650aa347
--- /dev/null
+++ b/apps/daemon/src/integrations/vela-profile.ts
@@ -0,0 +1,21 @@
+const AMR_PROFILE_ENV = 'OPEN_DESIGN_AMR_PROFILE';
+const DEFAULT_PROFILE = 'prod';
+const ALLOWED_PROFILES = new Set(['prod', 'test', 'local']);
+
+export type AmrProfile = 'prod' | 'test' | 'local';
+
+type EnvMap = NodeJS.ProcessEnv | Record<string, string | undefined>;
+
+export function resolveAmrProfile(env: EnvMap = process.env): AmrProfile {
+  const raw = (env[AMR_PROFILE_ENV] || '').trim();
+  if (!raw) return DEFAULT_PROFILE;
+  if (ALLOWED_PROFILES.has(raw)) return raw as AmrProfile;
+  console.warn(
+    `[amr] invalid ${AMR_PROFILE_ENV}="${raw}"; falling back to ${DEFAULT_PROFILE}`,
+  );
+  return DEFAULT_PROFILE;
+}
+
+export function amrVelaProfileEnv(env: EnvMap = process.env): { VELA_PROFILE: AmrProfile } {
+  return { VELA_PROFILE: resolveAmrProfile(env) };
+}
diff --git a/apps/daemon/src/integrations/vela.ts b/apps/daemon/src/integrations/vela.ts
new file mode 100644
index 000000000..d6e9dd303
--- /dev/null
+++ b/apps/daemon/src/integrations/vela.ts
@@ -0,0 +1,279 @@
+import { spawn, type ChildProcess } from 'node:child_process';
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import path from 'node:path';
+
+import { createCommandInvocation } from '@open-design/platform';
+
+import { resolveAgentLaunch } from '../runtimes/launch.js';
+import { spawnEnvForAgent } from '../runtimes/env.js';
+import { getAgentDef } from '../runtimes/registry.js';
+import { resolveAmrProfile } from './vela-profile.js';
+
+export { resolveAmrProfile } from './vela-profile.js';
+
+export interface VelaUser {
+  id: string;
+  email: string;
+  name?: string;
+  image?: string | null;
+  plan?: string;
+}
+
+export interface VelaLoginStatus {
+  loggedIn: boolean;
+  loginInFlight: boolean;
+  profile: string;
+  user: VelaUser | null;
+  configPath: string;
+}
+
+interface VelaProfileShape {
+  controlKey?: string;
+  runtimeKey?: string;
+  apiUrl?: string;
+  linkUrl?: string;
+  user?: VelaUser | null;
+}
+
+interface VelaConfigFileShape {
+  profiles?: Record<string, VelaProfileShape>;
+}
+
+export function mergeVelaEnv(
+  env: NodeJS.ProcessEnv = process.env,
+  configuredEnv: Record<string, string> = {},
+): NodeJS.ProcessEnv {
+  return {
+    ...env,
+    ...configuredEnv,
+  };
+}
+
+function configDir(): string {
+  return path.join(homedir(), '.amr');
+}
+
+export function amrConfigPath(): string {
+  return path.join(configDir(), 'config.json');
+}
+
+function readConfigFile(): VelaConfigFileShape | null {
+  const file = amrConfigPath();
+  if (!existsSync(file)) return null;
+  try {
+    const data = readFileSync(file, 'utf8');
+    const parsed = JSON.parse(data) as unknown;
+    if (!parsed || typeof parsed !== 'object') return null;
+    return parsed as VelaConfigFileShape;
+  } catch {
+    return null;
+  }
+}
+
+export function readVelaLoginStatus(
+  env: NodeJS.ProcessEnv = process.env,
+  configuredEnv: Record<string, string> = {},
+): VelaLoginStatus {
+  const mergedEnv = mergeVelaEnv(env, configuredEnv);
+  const profile = resolveAmrProfile(mergedEnv);
+  const configPath = amrConfigPath();
+  const loginInFlight = isVelaLoginInFlight();
+  const runtimeKey = mergedEnv.VELA_RUNTIME_KEY?.trim() ?? '';
+  const linkUrl = mergedEnv.VELA_LINK_URL?.trim() ?? '';
+  if (runtimeKey && linkUrl) {
+    return { loggedIn: true, loginInFlight, profile, user: null, configPath };
+  }
+  const file = readConfigFile();
+  const stored = file?.profiles?.[profile];
+  const storedRuntimeKey = stored?.runtimeKey?.trim() ?? '';
+  if (!storedRuntimeKey) {
+    return { loggedIn: false, loginInFlight, profile, user: null, configPath };
+  }
+  const rawUser = stored?.user ?? null;
+  const user: VelaUser | null = rawUser
+    ? {
+        id: typeof rawUser.id === 'string' ? rawUser.id : '',
+        email: typeof rawUser.email === 'string' ? rawUser.email : '',
+        ...(typeof rawUser.name === 'string' ? { name: rawUser.name } : {}),
+        ...(typeof rawUser.image === 'string' ? { image: rawUser.image } : {}),
+        ...(typeof rawUser.plan === 'string' ? { plan: rawUser.plan } : {}),
+      }
+    : null;
+  return { loggedIn: true, loginInFlight, profile, user, configPath };
+}
+
+export function forgetVelaLogin(env: NodeJS.ProcessEnv = process.env): void {
+  const file = amrConfigPath();
+  if (!existsSync(file)) return;
+  const parsed = readConfigFile();
+  if (!parsed?.profiles) return;
+  const profile = resolveAmrProfile(env);
+  if (!Object.prototype.hasOwnProperty.call(parsed.profiles, profile)) return;
+  const keptProfileConfig = { ...(parsed.profiles[profile] ?? {}) };
+  delete keptProfileConfig.controlKey;
+  delete keptProfileConfig.runtimeKey;
+  delete keptProfileConfig.user;
+  const nextProfiles = { ...parsed.profiles };
+  nextProfiles[profile] = keptProfileConfig;
+  writeFileSync(
+    file,
+    JSON.stringify({ ...parsed, profiles: nextProfiles }, null, 2),
+    'utf8',
+  );
+}
+
+export interface SpawnedVelaLogin {
+  pid: number;
+  startedAt: string;
+  profile: string;
+}
+
+const activeLoginProcs = new Map<number, ChildProcess>();
+const LOGIN_STARTUP_GRACE_MS = 250;
+const LOGIN_CANCEL_KILL_GRACE_MS = 2000;
+
+function isChildRunning(child: ChildProcess): boolean {
+  return child.exitCode === null && child.signalCode === null;
+}
+
+export function isVelaLoginInFlight(): boolean {
+  for (const [pid, child] of activeLoginProcs) {
+    if (isChildRunning(child)) return true;
+    activeLoginProcs.delete(pid);
+  }
+  return false;
+}
+
+export interface CancelVelaLoginResult {
+  canceled: boolean;
+  pids: number[];
+}
+
+export function cancelVelaLogin(): CancelVelaLoginResult {
+  const pids: number[] = [];
+  for (const [pid, child] of activeLoginProcs) {
+    if (!isChildRunning(child)) {
+      activeLoginProcs.delete(pid);
+      continue;
+    }
+    try {
+      child.kill('SIGTERM');
+    } catch {
+      activeLoginProcs.delete(pid);
+      continue;
+    }
+    pids.push(pid);
+    const killTimer = setTimeout(() => {
+      try {
+        if (isChildRunning(child)) child.kill('SIGKILL');
+      } catch {
+        activeLoginProcs.delete(pid);
+      }
+    }, LOGIN_CANCEL_KILL_GRACE_MS);
+    killTimer.unref?.();
+  }
+  return { canceled: pids.length > 0, pids };
+}
+
+export interface SpawnVelaLoginDeps {
+  configuredEnv?: Record<string, string>;
+  baseEnv?: NodeJS.ProcessEnv;
+}
+
+async function waitForImmediateLoginFailure(child: ChildProcess): Promise<void> {
+  let stderr = '';
+  let stdout = '';
+  child.stderr?.setEncoding('utf8');
+  child.stdout?.setEncoding('utf8');
+  child.stderr?.on('data', (chunk) => {
+    if (stderr.length < 4096) stderr += String(chunk);
+  });
+  child.stdout?.on('data', (chunk) => {
+    if (stdout.length < 4096) stdout += String(chunk);
+  });
+
+  const result = await new Promise<
+    | { kind: 'running' }
+    | { kind: 'exit'; code: number | null; signal: NodeJS.Signals | null }
+    | { kind: 'error'; error: Error }
+  >((resolve) => {
+    let settled = false;
+    const finish = (
+      value:
+        | { kind: 'running' }
+        | { kind: 'exit'; code: number | null; signal: NodeJS.Signals | null }
+        | { kind: 'error'; error: Error },
+    ) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve(value);
+    };
+    const timer = setTimeout(
+      () => finish({ kind: 'running' }),
+      LOGIN_STARTUP_GRACE_MS,
+    );
+    child.once('exit', (code, signal) => finish({ kind: 'exit', code, signal }));
+    child.once('error', (error) => finish({ kind: 'error', error }));
+  });
+
+  if (result.kind === 'running') return;
+  if (result.kind === 'error') {
+    throw new Error(`vela login failed to start: ${result.error.message}`);
+  }
+  if (result.code === 0) return;
+  const detail = (stderr || stdout).trim();
+  throw new Error(
+    detail ||
+      `vela login exited before authentication completed (code ${result.code ?? 'null'}, signal ${result.signal ?? 'null'})`,
+  );
+}
+
+export async function spawnVelaLogin(
+  deps: SpawnVelaLoginDeps = {},
+): Promise<SpawnedVelaLogin> {
+  if (isVelaLoginInFlight()) {
+    throw new Error('vela login already running');
+  }
+  const def = getAgentDef('amr');
+  if (!def) throw new Error('AMR runtime def not registered');
+  const baseEnv = deps.baseEnv ?? process.env;
+  const configuredEnv = deps.configuredEnv ?? {};
+  const launch = resolveAgentLaunch(def, configuredEnv);
+  const bin = launch.selectedPath;
+  if (!bin) {
+    throw new Error('vela binary not found; install vela or configure VELA_BIN');
+  }
+  const env = spawnEnvForAgent('amr', baseEnv, configuredEnv);
+  // Route through createCommandInvocation so an npm/Node-style `vela.cmd` or
+  // `vela.bat` shim on Windows gets wrapped under `cmd.exe /d /s /c …` with
+  // verbatim args, matching what `execAgentFile` / chat-run spawning do. A
+  // direct `spawn(bin, args)` on a `.cmd` shim quietly fails to find the
+  // shim's actual entry point. POSIX is unchanged (no wrapping needed).
+  const invocation = createCommandInvocation({ command: bin, args: ['login'], env });
+  const child = spawn(invocation.command, invocation.args, {
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env,
+    detached: false,
+    windowsVerbatimArguments: invocation.windowsVerbatimArguments,
+  });
+  if (typeof child.pid !== 'number') {
+    throw new Error('failed to spawn vela login');
+  }
+  activeLoginProcs.set(child.pid, child);
+  const cleanup = () => {
+    if (typeof child.pid === 'number') activeLoginProcs.delete(child.pid);
+  };
+  child.once('exit', cleanup);
+  child.once('error', cleanup);
+  await waitForImmediateLoginFailure(child);
+  // We don't surface URL/code in this API — vela CLI opens the browser itself
+  // (via OpenBrowser in apps/cli/internal/commands/login.go). Callers poll
+  // readVelaLoginStatus() to detect completion.
+  return {
+    pid: child.pid,
+    startedAt: new Date().toISOString(),
+    profile: resolveAmrProfile(env),
+  };
+}
diff --git a/apps/daemon/src/prompts/discovery.ts b/apps/daemon/src/prompts/discovery.ts
index 9b5406a92..40d2292f5 100644
--- a/apps/daemon/src/prompts/discovery.ts
+++ b/apps/daemon/src/prompts/discovery.ts
@@ -134,6 +134,7 @@ Form authoring rules:
 - If you keep the \`brand\` question, its \`id\` must stay \`"brand"\`. Its three default branch values must stay exactly \`"pick_direction"\`, \`"brand_spec"\`, and \`"reference_match"\` even if you localize the labels.
 - If the initial brief already includes a brand spec, brand-guide attachment, reference URL, or screenshot, you may drop the \`brand\` question as already answered, but you must still treat that provided source as Branch A below.
 - Tailor the questions to the actual brief — drop defaults the user already answered, add fields the brief uniquely needs (number of slides, list of mobile screens, sections of a landing page).
+- Emit exactly ONE \`<question-form>\` in this turn. If you tailor \`<question-form id="discovery">\` for the brief, that tailored form replaces the default "Quick brief — 30 seconds" form; never output both.
 - **Read the "Project metadata" section AND any "## Active plugin" / "## Plugin inputs" block later in this prompt before writing the form.** "Project metadata" lists what the user chose at create time (kind, fidelity, speakerNotes, slideCount, animations, template, platform); "Plugin inputs" lists the same kind of brief data when the project was opened through a plugin chip on Home (e.g. \`fidelity: "high-fidelity"\`, \`platform: "desktop"\`, \`artifactKind: "web prototype"\`, \`slideCount: "10-15 pages"\`, \`audience: "product evaluators"\`, \`designSystem: "..."\`). **Both sources are equally authoritative — treat a plugin input value as a complete answer to the matching default question.** Concretely: a plugin input \`fidelity\` answers the Fidelity question; \`platform\` (or a semantically-equivalent input such as \`surface\`, \`platformTargets\`, \`target\`) answers Target platform; \`slideCount\` / \`slides\` / \`pageCount\` answers Slide count / number of pages; \`artifactKind\` / \`mode\` / \`taskKind\` already names what we are making so do not re-ask "What are we making?"; \`audience\` answers "Who is this for?"; \`designSystem\` / \`brand\` answers Brand context. Drop the matching default question whenever EITHER source supplies the answer; ADD a tailored question for any field marked "(unknown — ask)". For example, on a deck with \`speakerNotes: (unknown — ask…)\`, include a yes/no on speaker notes; on a template project where animations is unknown, include a motion radio; on a cross-platform project, ask which screens need native variants instead of re-asking platform. Don't re-ask the kind itself if metadata.kind is set or the active plugin's \`od.kind\` / \`taskKind\` already names it — the user already told you.
 - Keep it under ~7 questions. Second batch in a follow-up form if needed.
 - Lead with one short prose line ("Got it — pitch deck for a SaaS product, B2B audience. Tell me the rest:") then the form. Do **not** write a long pre-amble.
diff --git a/apps/daemon/src/runtimes/auth.ts b/apps/daemon/src/runtimes/auth.ts
index 9b4eb129a..83b64336d 100644
--- a/apps/daemon/src/runtimes/auth.ts
+++ b/apps/daemon/src/runtimes/auth.ts
@@ -76,6 +76,69 @@ export function classifyAgentAuthFailure(
   return null;
 }
 
+// Model-service failure classes that map a CLI agent's raw error text to a
+// structured API error code. `classifyAgentAuthFailure` only covers the two
+// agents (cursor-agent, deepseek) that ship a tailored sign-in hint; every
+// other CLI agent (Claude Code, codex, …) used to collapse auth / quota /
+// upstream failures into the generic `AGENT_EXECUTION_FAILED`. This agent-
+// agnostic, text-based classifier recovers the specific class so the chat
+// shows an accurate reason — and so the hosted-AMR nudge can key off it.
+export type AgentServiceFailureCode =
+  | 'AGENT_AUTH_REQUIRED'
+  | 'RATE_LIMITED'
+  | 'UPSTREAM_UNAVAILABLE';
+
+// A bare HTTP status number (`500`, `429`, …) is too noisy to trust on its own
+// — agent stderr is full of unrelated numbers (`line 500`, `read 502 bytes`,
+// `took 503ms`, `exit code 401`, `process exited with code 429`). Only treat a
+// status number as a signal when it carries explicit HTTP-status context
+// (`HTTP 500`, `status 429`, `status code 401`, `error code 502`,
+// `server error 503`, or a punctuation-bound `code: 401`). Crucially `code`
+// alone is NOT enough — that would still match process-exit lines like `exit
+// code 401`; it only counts when qualified (status/error/response code) or
+// immediately followed by `:`/`=`/`#`. Phrasing per review on #3083.
+const STATUS_CTX =
+  '(?:' +
+  '\\bhttp(?:[ /]?\\d(?:\\.\\d)?)?\\b' + // HTTP, HTTP/1.1
+  '|\\b(?:status|error|response)(?:[ _-]?code)?\\b' + // status / status code / error code / response code
+  '|\\bcode(?=\\s*[:=#])' + // code: 401 / code=429  (NOT "exit code 401")
+  '|\\b(?:server|http)[ _-]?error\\b' + // server error / http error
+  ')[\\s:=#-]*';
+
+// Authentication / authorization: a missing, invalid, or expired credential.
+const AGENT_AUTH_FAILURE_RE = new RegExp(
+  `(\\b(unauthor(?:ized|ised)|authenticat(?:e|ed|ion)|invalid[ _-]?(?:api[ _-]?)?key|incorrect api key|x-api-key|not (?:authenticated|logged[ _-]?in)|please (?:sign|log)[ _-]?in|oauth token (?:has )?expired|session expired|credentials? (?:are )?(?:missing|invalid|required))\\b|\\/login\\b|${STATUS_CTX}401\\b)`,
+  'i',
+);
+
+// Quota / rate limit / billing balance — the wall the hosted gateway avoids.
+const AGENT_RATE_FAILURE_RE = new RegExp(
+  `(\\b(rate[ _-]?limit|too many requests|quota|insufficient[ _-]?(?:quota|balance|credit|funds)|credit balance is too low|exceeded your current quota|usage limit|billing (?:hard )?limit)\\b|${STATUS_CTX}429\\b)`,
+  'i',
+);
+
+// Upstream model/provider problems: overloaded, 5xx, temporarily unavailable.
+const AGENT_UPSTREAM_FAILURE_RE = new RegExp(
+  `(\\b(overloaded(?:_error)?|service (?:is )?(?:temporarily )?unavailable|bad gateway|gateway timeout|internal server error|upstream (?:error|unavailable)|provider (?:error|unavailable)|temporarily unavailable|model is currently overloaded|5xx)\\b|${STATUS_CTX}5\\d\\d\\b|\\b5\\d\\d\\s+(?:bad gateway|service unavailable|internal server error|gateway timeout))`,
+  'i',
+);
+
+// Returns the model-service failure class implied by an agent's combined
+// stdout/stderr/error text, or null when the text looks like an ordinary
+// process failure. Auth is checked before rate/upstream so a `401` is never
+// misread as a `5xx`. Pure text match — no agent-specific assumptions — so it
+// applies uniformly to any CLI agent.
+export function classifyAgentServiceFailure(
+  text: string,
+): AgentServiceFailureCode | null {
+  const value = String(text || '');
+  if (!value.trim()) return null;
+  if (AGENT_AUTH_FAILURE_RE.test(value)) return 'AGENT_AUTH_REQUIRED';
+  if (AGENT_RATE_FAILURE_RE.test(value)) return 'RATE_LIMITED';
+  if (AGENT_UPSTREAM_FAILURE_RE.test(value)) return 'UPSTREAM_UNAVAILABLE';
+  return null;
+}
+
 // Tail length matches the smoke-test sink so the diagnostics block
 // stays compact when it folds probe output back into its overrides.
 const PROBE_TAIL_BYTES = 400;
diff --git a/apps/daemon/src/runtimes/defs/amr.ts b/apps/daemon/src/runtimes/defs/amr.ts
new file mode 100644
index 000000000..5ae9b0b83
--- /dev/null
+++ b/apps/daemon/src/runtimes/defs/amr.ts
@@ -0,0 +1,153 @@
+import { execAgentFile } from './shared.js';
+import type { RuntimeAgentDef, RuntimeModelOption } from '../types.js';
+
+const PREFERRED_AMR_CHAT_MODEL_ORDER = [
+  'deepseek-v4-flash',
+  'deepseek-v3.2',
+  'glm-5.1',
+  'gemini-2.5-flash',
+] as const;
+
+const PREFERRED_AMR_CHAT_MODEL_RANK: ReadonlyMap<string, number> = new Map(
+  PREFERRED_AMR_CHAT_MODEL_ORDER.map((id, index) => [id, index]),
+);
+
+// AMR is the vela CLI's ACP stdio mode. `vela agent run --runtime opencode`
+// starts a private OpenCode server and forwards stream-json over ACP JSON-RPC.
+// Required env (set on the daemon process or via Settings → CLI env):
+//   VELA_RUNTIME_KEY  — OpenRouter (or compatible) API key
+//   VELA_LINK_URL     — OpenAI-compatible endpoint, e.g. https://openrouter.ai/api/v1
+//   VELA_OPENCODE_BIN — optional; absolute path to opencode when not on PATH
+// See docs/new-agent-runtime-acp.md and the vela
+// `specs/current/runtime/manual-agent-run-openrouter.md`.
+//
+// Model wiring notes:
+//
+//   1. vela rejects `session/prompt` until `session/set_model` has been
+//      called, so AMR cannot accept the synthetic `default` model id —
+//      attachAcpSession skips set_model whenever model === 'default'.
+//
+//   2. Vela 0.0.1 exposes the current link-supported catalog through
+//      `vela models`, but that command prints public ids such as
+//      `public_model_deepseek_v3_2`. The ACP `session/set_model` call accepts
+//      the link-facing slug (`deepseek-v3.2` / `glm-5.1`), so Open Design
+//      normalizes those public ids at the daemon boundary until Vela exposes
+//      canonical ACP ids directly.
+export function normalizeVelaModelId(rawId: string): string | null {
+  const trimmed = rawId.trim();
+  if (!trimmed) return null;
+  const withoutProvider = trimmed.startsWith('vela/')
+    ? trimmed.slice('vela/'.length)
+    : trimmed;
+  const withoutPrefix = withoutProvider.startsWith('public_model_')
+    ? withoutProvider.slice('public_model_'.length)
+    : withoutProvider;
+  if (!withoutPrefix) return null;
+  if (/^deepseek_v3_2$/i.test(withoutPrefix)) return 'deepseek-v3.2';
+  if (/^kimi_k2_6$/i.test(withoutPrefix)) return 'kimi-k2.6';
+  if (/^glm_5_1$/i.test(withoutPrefix)) return 'glm-5.1';
+  if (/^glm_5$/i.test(withoutPrefix)) return 'glm-5';
+  const versioned = normalizeKnownVelaVersionId(withoutPrefix);
+  if (versioned) return versioned;
+  return withoutPrefix.replace(/_/g, '-');
+}
+
+function normalizeKnownVelaVersionId(rawId: string): string | null {
+  const claude = /^claude[_-](haiku|opus|sonnet)[_-](\d+)[_-](\d+)(.*)$/i.exec(rawId);
+  if (claude) {
+    const [, family, major, minor, suffix = ''] = claude;
+    if (!family || !major || !minor) return null;
+    return `claude-${family.toLowerCase()}-${major}.${minor}${suffix.replace(/_/g, '-')}`;
+  }
+
+  const gpt = /^gpt_(\d+)_(\d+)(.*)$/i.exec(rawId);
+  if (gpt) {
+    const [, major, minor, suffix = ''] = gpt;
+    if (!major || !minor) return null;
+    return `gpt-${major}.${minor}${suffix.replace(/_/g, '-')}`;
+  }
+
+  const gemini = /^gemini_(\d+)_(\d+)(.*)$/i.exec(rawId);
+  if (gemini) {
+    const [, major, minor, suffix = ''] = gemini;
+    if (!major || !minor) return null;
+    return `gemini-${major}.${minor}${suffix.replace(/_/g, '-')}`;
+  }
+
+  const minimax = /^minimax_m(\d+)_(\d+)(.*)$/i.exec(rawId);
+  if (minimax) {
+    const [, major, minor, suffix = ''] = minimax;
+    if (!major || !minor) return null;
+    return `minimax-m${major}.${minor}${suffix.replace(/_/g, '-')}`;
+  }
+
+  return null;
+}
+
+function isVelaChatModelId(modelId: string): boolean {
+  // Temporary chat-surface guard: Vela already lists media-generation models,
+  // but Open Design's AMR runtime currently drives only chat completions.
+  // Remove this filter when AMR grows first-class image/video execution.
+  const id = modelId.toLowerCase();
+  if (id.startsWith('gpt-image-')) return false;
+  if (id.startsWith('seedance-')) return false;
+  if (id.startsWith('doubao-seedance-')) return false;
+  if (id.startsWith('veo-')) return false;
+  if (id.startsWith('imagen-')) return false;
+  return true;
+}
+
+export function parseVelaModels(stdout: string): RuntimeModelOption[] {
+  const seen = new Set<string>();
+  const models: RuntimeModelOption[] = [];
+  for (const line of String(stdout || '').split('\n')) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) continue;
+    const [rawId] = trimmed.split(/\s+/);
+    if (!rawId) continue;
+    const id = normalizeVelaModelId(rawId);
+    if (!id || seen.has(id) || !isVelaChatModelId(id)) continue;
+    seen.add(id);
+    models.push({ id, label: id });
+  }
+  return orderAmrChatModels(models);
+}
+
+function orderAmrChatModels(
+  models: RuntimeModelOption[],
+): RuntimeModelOption[] {
+  return models
+    .map((model, index) => ({ model, index }))
+    .sort((a, b) => {
+      const aRank =
+        PREFERRED_AMR_CHAT_MODEL_RANK.get(a.model.id) ?? Number.MAX_SAFE_INTEGER;
+      const bRank =
+        PREFERRED_AMR_CHAT_MODEL_RANK.get(b.model.id) ?? Number.MAX_SAFE_INTEGER;
+      return aRank - bRank || a.index - b.index;
+    })
+    .map(({ model }) => model);
+}
+
+export const amrAgentDef = {
+  id: 'amr',
+  name: 'AMR',
+  bin: 'vela',
+  versionArgs: ['--version'],
+  fetchModels: async (resolvedBin, env) => {
+    const { stdout } = await execAgentFile(resolvedBin, ['models'], {
+      env,
+      timeout: 10_000,
+      maxBuffer: 1024 * 1024,
+    });
+    return parseVelaModels(String(stdout));
+  },
+  // Fail closed when Vela's live catalog is unavailable. Stale static
+  // fallbacks let users select models that link/opencode no longer accepts.
+  fallbackModels: [] as RuntimeModelOption[],
+  buildArgs: () => ['agent', 'run', '--runtime', 'opencode'],
+  streamFormat: 'acp-json-rpc',
+  // Daemon-process env override for emergency operator pinning. Normal UI
+  // selection comes from the live `vela models` catalog and is preflighted
+  // before spawn.
+  defaultModelEnvVar: 'VELA_DEFAULT_MODEL',
+} satisfies RuntimeAgentDef;
diff --git a/apps/daemon/src/runtimes/env.ts b/apps/daemon/src/runtimes/env.ts
index dd9545f7e..5f4f74e43 100644
--- a/apps/daemon/src/runtimes/env.ts
+++ b/apps/daemon/src/runtimes/env.ts
@@ -1,4 +1,8 @@
+import path from 'node:path';
+
 import { expandConfiguredEnv } from './paths.js';
+import { resolveAmrOpenCodeExecutable } from './executables.js';
+import { amrVelaProfileEnv } from '../integrations/vela-profile.js';
 
 type RuntimeEnvMap = NodeJS.ProcessEnv | Record<string, string>;
 
@@ -37,6 +41,21 @@ export function spawnEnvForAgent(
     ...baseEnv,
     ...expandConfiguredEnv(configuredEnv),
   };
+  if (agentId === 'amr') {
+    Object.assign(env, amrVelaProfileEnv(env));
+    if (!env.OPENCODE_TEST_HOME?.trim() && env.OD_DATA_DIR?.trim()) {
+      env.OPENCODE_TEST_HOME = path.join(
+        env.OD_DATA_DIR.trim(),
+        'amr',
+        'opencode-home',
+      );
+    }
+    if (!env.VELA_OPENCODE_BIN?.trim()) {
+      const opencodeBin = resolveAmrOpenCodeExecutable(env);
+      if (opencodeBin) env.VELA_OPENCODE_BIN = opencodeBin;
+    }
+    return env;
+  }
   if (agentId === 'claude') {
     stripUnlessCustomBaseUrl(env, 'ANTHROPIC_BASE_URL', ['ANTHROPIC_API_KEY']);
     return env;
diff --git a/apps/daemon/src/runtimes/executables.ts b/apps/daemon/src/runtimes/executables.ts
index aa56424b6..68e046dd4 100644
--- a/apps/daemon/src/runtimes/executables.ts
+++ b/apps/daemon/src/runtimes/executables.ts
@@ -7,6 +7,7 @@ import { expandHomePath } from './paths.js';
 import type { RuntimeAgentDef } from './types.js';
 
 const AGENT_BIN_ENV_KEYS = new Map<string, string>([
+  ['amr', 'VELA_BIN'],
   ['aider', 'AIDER_BIN'],
   ['claude', 'CLAUDE_BIN'],
   ['codex', 'CODEX_BIN'],
@@ -101,18 +102,7 @@ function looksExecutableOnWindows(filePath: string): boolean {
   return executableExts.includes(ext);
 }
 
-// Resolve the first available binary for an agent definition. Tries
-// `def.bin` first, then walks `def.fallbackBins` in order. Used for
-// agents whose forks ship under a different binary name but speak the
-// exact same CLI (Claude Code → OpenClaude, issue #235). Returns null
-// when no candidate is on PATH.
-function configuredExecutableOverride(
-  def: RuntimeAgentDef,
-  configuredEnv: Record<string, string> = {},
-): string | null {
-  const envKey = AGENT_BIN_ENV_KEYS.get(def?.id);
-  if (!envKey) return null;
-  const raw = configuredEnv?.[envKey];
+function executableFilePath(raw: string | undefined): string | null {
   if (typeof raw !== 'string' || raw.trim().length === 0) return null;
   const expanded = expandHomePath(raw.trim());
   if (!path.isAbsolute(expanded)) return null;
@@ -129,6 +119,104 @@ function configuredExecutableOverride(
   }
 }
 
+// Resolve the first available binary for an agent definition. Tries
+// `def.bin` first, then walks `def.fallbackBins` in order. Used for
+// agents whose forks ship under a different binary name but speak the
+// exact same CLI (Claude Code → OpenClaude, issue #235). Returns null
+// when no candidate is on PATH.
+function configuredExecutableOverride(
+  def: RuntimeAgentDef,
+  configuredEnv: Record<string, string> = {},
+): string | null {
+  const envKey = AGENT_BIN_ENV_KEYS.get(def?.id);
+  if (!envKey) return null;
+  return executableFilePath(configuredEnv?.[envKey]);
+}
+
+export function resolveAmrOpenCodeExecutable(
+  env: Record<string, string | undefined> = process.env,
+): string | null {
+  const configured = executableFilePath(env.VELA_OPENCODE_BIN);
+  if (configured) return configured;
+  // In packaged builds prefer the bundled companion under
+  // `OD_RESOURCE_ROOT/bin/libexec/opencode/opencode` so a stale global
+  // `opencode` on the user's PATH can't override the known-good build that
+  // shipped with this app. PATH is only consulted as a last resort.
+  const resourceRoot = (
+    env.OD_RESOURCE_ROOT ?? process.env.OD_RESOURCE_ROOT
+  )?.trim();
+  if (resourceRoot) {
+    const bundledDir = packagedVelaOpenCodeCompanionTree(resourceRoot);
+    if (bundledDir) {
+      const bundled = executableFilePath(
+        path.join(
+          bundledDir,
+          process.platform === 'win32' ? 'opencode.exe' : 'opencode',
+        ),
+      );
+      if (bundled) return bundled;
+    }
+  }
+  return resolveOnPath('opencode-cli') ?? resolveOnPath('opencode');
+}
+
+// `tools/pack/tests/resources.test.ts` ships the AMR OpenCode companion as a
+// `<resourceRoot>/bin/libexec/opencode/opencode` *executable file*, not just
+// the directory. Treating any directory there as a valid companion produces a
+// false-positive availability path: `detectAgents()` would surface AMR as
+// available even though the first real run can't launch (`vela` would spawn
+// a missing/non-executable inner binary). Verify the inner executable too.
+function packagedVelaOpenCodeCompanionTree(resourceRoot: string): string | null {
+  const candidate = path.join(resourceRoot, 'bin', 'libexec', 'opencode');
+  const exe = path.join(
+    candidate,
+    process.platform === 'win32' ? 'opencode.exe' : 'opencode',
+  );
+  try {
+    if (!statSync(candidate).isDirectory()) return null;
+    if (!statSync(exe).isFile()) return null;
+    if (process.platform === 'win32') {
+      if (!looksExecutableOnWindows(exe)) return null;
+    } else {
+      accessSync(exe, constants.X_OK);
+    }
+    return candidate;
+  } catch {
+    return null;
+  }
+}
+
+function packagedBuiltInExecutable(
+  def: RuntimeAgentDef,
+  configuredEnv: Record<string, string> = {},
+): string | null {
+  if (def.id !== 'amr') return null;
+  const resourceRoot = process.env.OD_RESOURCE_ROOT?.trim();
+  if (!resourceRoot) return null;
+  if (
+    !resolveAmrOpenCodeExecutable({ ...process.env, ...configuredEnv }) &&
+    !packagedVelaOpenCodeCompanionTree(resourceRoot)
+  ) {
+    return null;
+  }
+  const candidate = path.join(
+    resourceRoot,
+    'bin',
+    process.platform === 'win32' ? 'vela.exe' : 'vela',
+  );
+  try {
+    if (!statSync(candidate).isFile()) return null;
+    if (process.platform === 'win32') {
+      if (!looksExecutableOnWindows(candidate)) return null;
+    } else {
+      accessSync(candidate, constants.X_OK);
+    }
+    return candidate;
+  } catch {
+    return null;
+  }
+}
+
 export function resolveAgentExecutable(
   def: RuntimeAgentDef,
   configuredEnv: Record<string, string> = {},
@@ -164,9 +252,10 @@ export function inspectAgentExecutableResolution(
       break;
     }
   }
+  const builtInPath = packagedBuiltInExecutable(def, configuredEnv);
   return {
     configuredOverridePath,
     pathResolvedPath,
-    selectedPath: configuredOverridePath || pathResolvedPath,
+    selectedPath: configuredOverridePath || builtInPath || pathResolvedPath,
   };
 }
diff --git a/apps/daemon/src/runtimes/metadata.ts b/apps/daemon/src/runtimes/metadata.ts
index 4bcd8f0d7..bc6d16fe9 100644
--- a/apps/daemon/src/runtimes/metadata.ts
+++ b/apps/daemon/src/runtimes/metadata.ts
@@ -3,6 +3,10 @@ const AGENT_INSTALL_LINKS: Record<
   string,
   { installUrl?: string; docsUrl?: string }
 > = {
+  amr: {
+    installUrl: 'https://github.com/nexu-io/vela',
+    docsUrl: 'https://github.com/nexu-io/open-design/blob/main/docs/new-agent-runtime-acp.md',
+  },
   claude: {
     installUrl: 'https://docs.anthropic.com/en/docs/claude-code/setup',
     docsUrl: 'https://docs.anthropic.com/en/docs/claude-code',
diff --git a/apps/daemon/src/runtimes/models.ts b/apps/daemon/src/runtimes/models.ts
index 31c6fcaab..ef0cb6970 100644
--- a/apps/daemon/src/runtimes/models.ts
+++ b/apps/daemon/src/runtimes/models.ts
@@ -11,15 +11,18 @@ export const DEFAULT_MODEL_OPTION: RuntimeModelOption = {
 // trust any value present in the static fallback. A model that's neither
 // gets rejected so a stale or hostile value can't smuggle arbitrary flags.
 const liveModelCache = new Map<string, Set<string>>();
+const liveModelOrder = new Map<string, string[]>();
 
 export function rememberLiveModels(agentId: string, models: RuntimeModelOption[]) {
   if (!Array.isArray(models)) return;
+  const ids = models
+    .map((m) => m && m.id)
+    .filter((id) => typeof id === 'string');
   liveModelCache.set(
     agentId,
-    new Set(
-      models.map((m) => m && m.id).filter((id) => typeof id === 'string'),
-    ),
+    new Set(ids),
   );
+  liveModelOrder.set(agentId, ids);
 }
 
 export function isKnownModel(def: RuntimeAgentDef, modelId: string | null | undefined) {
@@ -32,6 +35,37 @@ export function isKnownModel(def: RuntimeAgentDef, modelId: string | null | unde
   return false;
 }
 
+// Some adapters reject the synthetic `'default'` model id (e.g. AMR / vela,
+// which requires an explicit `session/set_model` before `session/prompt`).
+// Those defs declare it by omitting DEFAULT_MODEL_OPTION from
+// `fallbackModels` entirely. When the chat run produces a null or 'default'
+// model for one of those adapters, prefer the first model from the live list
+// last surfaced to the UI, then fall back to the def's first concrete fallback
+// id so the spawn layer always has a real model to forward.
+// Defs that DO list 'default' (the common case) are left untouched.
+export function resolveModelForAgent(
+  def: RuntimeAgentDef,
+  resolved: string | null,
+  env: Record<string, string | undefined> = process.env,
+): string | null {
+  if (resolved && resolved !== 'default') return resolved;
+  // Daemon-process env override (e.g. VELA_DEFAULT_MODEL for AMR). Lets an
+  // operator pin a different fallback id without a code change when the
+  // hardcoded default goes away upstream.
+  if (def.defaultModelEnvVar) {
+    const raw = env[def.defaultModelEnvVar];
+    if (typeof raw === 'string' && raw.trim()) return raw.trim();
+  }
+  const fallbacks = Array.isArray(def.fallbackModels) ? def.fallbackModels : [];
+  if (fallbacks.some((m) => m.id === 'default')) return resolved;
+  const liveModels = liveModelOrder.get(def.id) ?? [];
+  const firstLive = liveModels[0];
+  if (firstLive) return firstLive;
+  if (fallbacks.length === 0) return resolved;
+  const firstFallback = fallbacks[0];
+  return firstFallback ? firstFallback.id : resolved;
+}
+
 // Permit user-typed model ids that didn't appear in either the live
 // listing or the static fallback (e.g. the user is on a brand-new model
 // the CLI's `models` command hasn't surfaced yet). The CLI gets the value
diff --git a/apps/daemon/src/runtimes/registry.ts b/apps/daemon/src/runtimes/registry.ts
index 194d4339a..505b773f1 100644
--- a/apps/daemon/src/runtimes/registry.ts
+++ b/apps/daemon/src/runtimes/registry.ts
@@ -1,3 +1,4 @@
+import { amrAgentDef } from './defs/amr.js';
 import { claudeAgentDef } from './defs/claude.js';
 import { codexAgentDef } from './defs/codex.js';
 import { devinAgentDef } from './defs/devin.js';
@@ -21,6 +22,7 @@ import { readLocalAgentProfileDefs as readLocalAgentProfileDefsFromFile } from '
 import type { RuntimeAgentDef } from './types.js';
 
 const BASE_AGENT_DEFS: RuntimeAgentDef[] = [
+  amrAgentDef,
   claudeAgentDef,
   codexAgentDef,
   devinAgentDef,
diff --git a/apps/daemon/src/runtimes/types.ts b/apps/daemon/src/runtimes/types.ts
index 888d997ab..b2cf94cda 100644
--- a/apps/daemon/src/runtimes/types.ts
+++ b/apps/daemon/src/runtimes/types.ts
@@ -101,6 +101,15 @@ export type RuntimeAgentDef = {
     | 'opencode-env-content';
   installUrl?: string;
   docsUrl?: string;
+  // Optional name of a daemon-process environment variable that overrides
+  // the default model id when the chat run reaches the spawn layer with
+  // null or the synthetic 'default'. Used by adapters whose CLI rejects
+  // 'default' (e.g. AMR / vela) so an operator can swap the hardcoded
+  // fallback without a code change — set the env var on the daemon
+  // process when launching `tools-dev` / `od` daemon. The value must be
+  // present in the daemon's `process.env`; Settings-UI per-agent env
+  // values only reach the spawned child and are NOT consulted here.
+  defaultModelEnvVar?: string;
 };
 
 export type DetectedAgent = Omit<
diff --git a/apps/daemon/src/server.ts b/apps/daemon/src/server.ts
index 72ae3d253..a522b54d8 100644
--- a/apps/daemon/src/server.ts
+++ b/apps/daemon/src/server.ts
@@ -40,6 +40,18 @@ import {
   sanitizeCustomModel,
   spawnEnvForAgent,
 } from './agents.js';
+import { rememberLiveModels, resolveModelForAgent } from './runtimes/models.js';
+import {
+  cancelVelaLogin,
+  forgetVelaLogin,
+  mergeVelaEnv,
+  readVelaLoginStatus,
+  spawnVelaLogin,
+} from './integrations/vela.js';
+import {
+  amrAccountFailureDetails,
+  classifyAmrAccountFailure,
+} from './integrations/vela-errors.js';
 import { migrateLegacyDataDirSync } from './legacy-data-migrator.js';
 import {
   consumedImportNonces,
@@ -192,7 +204,11 @@ import {
 import { narrowProjectCritiqueOverride } from './critique/spawn-inputs.js';
 import { createCopilotStreamHandler } from './copilot-stream.js';
 import { createJsonEventStreamHandler } from './json-event-stream.js';
-import { classifyAgentAuthFailure, cursorAuthGuidance } from './runtimes/auth.js';
+import {
+  classifyAgentAuthFailure,
+  classifyAgentServiceFailure,
+  cursorAuthGuidance,
+} from './runtimes/auth.js';
 import { createQoderStreamHandler } from './qoder-stream.js';
 import { subscribe as subscribeFileEvents } from './project-watchers.js';
 import { renderDesignSystemPreview } from './design-system-preview.js';
@@ -2891,6 +2907,25 @@ function createSseErrorPayload(code, message, init = {}) {
   return { message, error: createCompatApiError(code, message, init) };
 }
 
+function createAmrModelUnavailablePayload(model, init = {}) {
+  const modelText = typeof model === 'string' && model.trim()
+    ? `"${model.trim()}"`
+    : 'the selected model';
+  return createSseErrorPayload(
+    'AMR_MODEL_UNAVAILABLE',
+    `AMR model ${modelText} is not available from Vela. Refresh the AMR model list, choose a supported model, and retry this run.`,
+    {
+      retryable: false,
+      details: {
+        kind: 'amr_model',
+        action: 'choose_model',
+        ...(typeof model === 'string' && model.trim() ? { model: model.trim() } : {}),
+        ...init,
+      },
+    },
+  );
+}
+
 const UPLOAD_DIR = path.join(os.tmpdir(), 'od-uploads');
 fs.mkdirSync(UPLOAD_DIR, { recursive: true });
 fs.mkdirSync(ARTIFACTS_DIR, { recursive: true });
@@ -5708,6 +5743,66 @@ export async function startServer({
     }
   });
 
+  // AMR (vela) login integration — see `apps/daemon/src/integrations/vela.ts`.
+  // The vela CLI owns the device-authorization UX (URL + code + browser open);
+  // these routes only surface enough state for Open Design's Settings card to
+  // show login status and trigger a login from a button.
+  app.get('/api/integrations/vela/status', async (_req, res) => {
+    try {
+      const appConfig = await readAppConfig(RUNTIME_DATA_DIR);
+      const configuredEnv = agentCliEnvForAgent(appConfig.agentCliEnv, 'amr');
+      res.json(readVelaLoginStatus(mergeVelaEnv(process.env, configuredEnv)));
+    } catch (err) {
+      res.status(500).json({ error: String(err) });
+    }
+  });
+
+  app.post('/api/integrations/vela/login', async (_req, res) => {
+    try {
+      const appConfig = await readAppConfig(RUNTIME_DATA_DIR);
+      const configuredEnv = agentCliEnvForAgent(appConfig.agentCliEnv, 'amr');
+      const spawned = await spawnVelaLogin({ configuredEnv });
+      res.status(202).json(spawned);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      // "already running" is a 409 (resolvable by waiting/polling); everything
+      // else (missing vela binary, spawn failure) is a 500.
+      const status = /already running/i.test(message) ? 409 : 500;
+      res.status(status).json({ error: message });
+    }
+  });
+
+  app.post('/api/integrations/vela/login/cancel', (_req, res) => {
+    try {
+      res.json(cancelVelaLogin());
+    } catch (err) {
+      res.status(500).json({ error: String(err) });
+    }
+  });
+
+  app.post('/api/integrations/vela/logout', async (_req, res) => {
+    try {
+      const appConfig = await readAppConfig(RUNTIME_DATA_DIR);
+      const configuredEnv = agentCliEnvForAgent(appConfig.agentCliEnv, 'amr');
+      forgetVelaLogin(mergeVelaEnv(process.env, configuredEnv));
+      delete process.env.VELA_RUNTIME_KEY;
+      delete process.env.VELA_LINK_URL;
+      const agentCliEnv = { ...(appConfig.agentCliEnv ?? {}) };
+      const amrEnv = { ...(agentCliEnv.amr ?? {}) };
+      delete amrEnv.VELA_RUNTIME_KEY;
+      delete amrEnv.VELA_LINK_URL;
+      if (Object.keys(amrEnv).length > 0) {
+        agentCliEnv.amr = amrEnv;
+      } else {
+        delete agentCliEnv.amr;
+      }
+      await writeAppConfig(RUNTIME_DATA_DIR, { agentCliEnv });
+      res.json({ ok: true });
+    } catch (err) {
+      res.status(500).json({ error: String(err) });
+    }
+  });
+
   app.get('/api/skills', async (_req, res) => {
     try {
       const skills = await listAllSkills();
@@ -10583,17 +10678,23 @@ export async function startServer({
     // (live or fallback). Otherwise allow it through if it passes a
     // permissive sanitizer — that's the path for user-typed custom model
     // ids the CLI's listing didn't surface yet.
-    const safeModel =
+    let safeModel = resolveModelForAgent(
+      def,
       typeof model === 'string'
         ? isKnownModel(def, model)
           ? model
           : sanitizeCustomModel(model)
-        : null;
+        : null,
+    );
     const safeReasoning =
       typeof reasoning === 'string' && Array.isArray(def.reasoningOptions)
         ? (def.reasoningOptions.find((r) => r.id === reasoning)?.id ?? null)
         : null;
     const agentOptions = { model: safeModel, reasoning: safeReasoning };
+    const send = (event, data) => {
+      persistRunEventToAssistantMessage(db, run, event, data);
+      design.runs.emit(run, event, data);
+    };
     const mcpServers = buildLiveArtifactsMcpServersForAgent(def, {
       enabled: Boolean(toolTokenGrant?.token),
       command: process.execPath,
@@ -10744,6 +10845,103 @@ export async function startServer({
     const agentLaunch = resolveAgentLaunch(def, configuredAgentEnv);
     const resolvedBin = agentLaunch.selectedPath;
 
+    // Hoisted above the AMR catalog preflight: the empty-catalog branch
+    // below calls `sendAmrAccountFailure(...)` to surface AMR_AUTH_REQUIRED
+    // for signed-out users, and a `const` declared later in the same outer
+    // function scope would hit a TDZ ReferenceError before initialization.
+    const sendAmrAccountFailure = (failure) => {
+      send('error', createSseErrorPayload(
+        failure.code,
+        failure.message,
+        {
+          retryable: true,
+          details: amrAccountFailureDetails(failure),
+        },
+      ));
+    };
+
+    if (def.id === 'amr' && resolvedBin && agentLaunch.launchPath) {
+      const launchPath = agentLaunch.launchPath ?? resolvedBin;
+      const modelProbeEnv = launchPath
+        ? applyAgentLaunchEnv(
+            spawnEnvForAgent(
+              def.id,
+              {
+                ...createAgentRuntimeEnv(process.env, daemonUrl, toolTokenGrant),
+                ...(def.env || {}),
+              },
+              configuredAgentEnv,
+            ),
+            agentLaunch,
+          )
+        : null;
+      let liveModels = [];
+      try {
+        liveModels =
+          launchPath && typeof def.fetchModels === 'function'
+            ? ((await def.fetchModels(launchPath, modelProbeEnv)) ?? [])
+            : [];
+      } catch {
+        liveModels = [];
+      }
+      rememberLiveModels(def.id, liveModels);
+      const liveModelIds = new Set(
+        liveModels.map((candidate) => candidate?.id).filter(Boolean),
+      );
+      if (liveModelIds.size === 0) {
+        // An empty AMR catalog usually means the user is signed out — `vela
+        // models` returns 401 and the catch above leaves `liveModels` empty.
+        // Surface AMR_AUTH_REQUIRED first so the chat shows the relogin
+        // affordance; otherwise the user sees a misleading "choose a model"
+        // when the real fix is to sign in.
+        if (def.id === 'amr') {
+          const loginStatus = readVelaLoginStatus(
+            modelProbeEnv ?? process.env,
+            configuredAgentEnv,
+          );
+          if (!loginStatus.loggedIn) {
+            sendAmrAccountFailure({
+              code: 'AMR_AUTH_REQUIRED',
+              message:
+                'AMR sign-in is required. Sign in to AMR Cloud again, then retry this run.',
+              action: 'relogin',
+            });
+            return design.runs.finish(run, 'failed', 1, null);
+          }
+        }
+        send('error', createAmrModelUnavailablePayload(safeModel, {
+          reason: 'model_catalog_unavailable',
+        }));
+        return design.runs.finish(run, 'failed', 1, null);
+      }
+      // `safeModel` was pre-resolved via the agent-wide cached model order,
+      // so a request that came in as 'default' (or empty) is already a
+      // concrete id by this point — `safeModel === 'default'` is rarely true.
+      // If the user actually asked for the agent default and the cached id no
+      // longer appears in the FRESH catalog (e.g. the AMR Link catalog rolled
+      // since `/api/agents` last responded), fall back to `liveModels[0]` from
+      // the fresh probe instead of rejecting their run as `AMR_MODEL_UNAVAILABLE`.
+      const userAskedForDefault =
+        typeof model !== 'string' ||
+        !model.trim() ||
+        model.trim().toLowerCase() === 'default';
+      if (
+        !safeModel ||
+        safeModel === 'default' ||
+        (userAskedForDefault && !liveModelIds.has(safeModel))
+      ) {
+        safeModel = liveModels[0]?.id ?? null;
+        agentOptions.model = safeModel;
+      }
+      if (!safeModel || !liveModelIds.has(safeModel)) {
+        send('error', createAmrModelUnavailablePayload(
+          typeof model === 'string' && model.trim() ? model : safeModel,
+          { availableModels: [...liveModelIds] },
+        ));
+        return design.runs.finish(run, 'failed', 1, null);
+      }
+    }
+
     const args = def.buildArgs(
       composed,
       safeImages,
@@ -10807,10 +11005,11 @@ export async function startServer({
       return design.runs.finish(run, 'failed', 1, null);
     }
 
-    const send = (event, data) => {
-      persistRunEventToAssistantMessage(db, run, event, data);
-      design.runs.emit(run, event, data);
-    };
+    // `runStartTimeMs` is consumed by the run-end artifact-manifest
+    // reconciler (#2893 / #3110) to skip artifacts whose mtime predates
+    // this run. The original main-side hunk also re-declared `const send`
+    // here; on this branch `send` was hoisted into the AMR preflight
+    // earlier, so we keep only the new `runStartTimeMs` declaration.
     const runStartTimeMs = Date.now();
     const inactivityTimeoutMs = resolveChatRunInactivityTimeoutMs();
     const artifactQuietPeriodMs = resolveChatRunArtifactQuietPeriodMs();
@@ -10963,6 +11162,27 @@ export async function startServer({
       ));
       return design.runs.finish(run, 'failed', 1, null);
     }
+    const agentSpawnEnv = spawnEnvForAgent(
+      def.id,
+      {
+        ...createAgentRuntimeEnv(process.env, daemonUrl, toolTokenGrant),
+        ...(def.env || {}),
+      },
+      configuredAgentEnv,
+    );
+    if (def.id === 'amr') {
+      const loginStatus = readVelaLoginStatus(agentSpawnEnv, configuredAgentEnv);
+      if (!loginStatus.loggedIn) {
+        revokeToolToken('child_exit');
+        unregisterChatAgentEventSink();
+        sendAmrAccountFailure({
+          code: 'AMR_AUTH_REQUIRED',
+          message: 'AMR sign-in is required. Sign in to AMR Cloud again, then retry this run.',
+          action: 'relogin',
+        });
+        return design.runs.finish(run, 'failed', 1, null);
+      }
+    }
     const odMediaEnv = {
       OD_BIN,
       OD_NODE_BIN,
@@ -11009,14 +11229,7 @@ export async function startServer({
           ? 'pipe'
           : 'ignore';
       const env = applyAgentLaunchEnv({
-        ...spawnEnvForAgent(
-          def.id,
-          {
-            ...createAgentRuntimeEnv(process.env, daemonUrl, toolTokenGrant),
-            ...(def.env || {}),
-          },
-          configuredAgentEnv,
-        ),
+        ...agentSpawnEnv,
         ...odMediaEnv,
         // OpenCode external-MCP injection (issue #2142). Layered AFTER
         // spawnEnvForAgent / odMediaEnv / configuredAgentEnv so the
@@ -11323,15 +11536,13 @@ export async function startServer({
         if (agentStreamError) return;
         agentStreamError = String(ev.message || 'Agent stream error');
         clearInactivityWatchdog();
-        const authFailure = classifyAgentAuthFailure(
-          agentId,
-          [
-            agentStreamError,
-            typeof ev.raw === 'string' ? ev.raw : '',
-            agentStdoutTail,
-            agentStderrTail,
-          ].join('\n'),
-        );
+        const failureText = [
+          agentStreamError,
+          typeof ev.raw === 'string' ? ev.raw : '',
+          agentStdoutTail,
+          agentStderrTail,
+        ].join('\n');
+        const authFailure = classifyAgentAuthFailure(agentId, failureText);
         if (authFailure?.status === 'missing') {
           send('error', createSseErrorPayload(
             'AGENT_AUTH_REQUIRED',
@@ -11340,6 +11551,18 @@ export async function startServer({
           ));
           return;
         }
+        // Recover the specific model-service failure class (auth / quota /
+        // upstream) for agents without a tailored probe (Claude Code, codex,
+        // …), so the chat shows an accurate reason instead of the generic
+        // execution-failed bucket.
+        const serviceCode = classifyAgentServiceFailure(failureText);
+        if (serviceCode) {
+          send('error', createSseErrorPayload(serviceCode, agentStreamError, {
+            details: ev.raw ? { raw: ev.raw } : undefined,
+            retryable: true,
+          }));
+          return;
+        }
         send('error', createSseErrorPayload('AGENT_EXECUTION_FAILED', agentStreamError, {
           details: ev.raw ? { raw: ev.raw } : undefined,
           retryable: false,
@@ -11472,8 +11695,24 @@ export async function startServer({
         cwd: effectiveCwd,
         model: safeModel,
         mcpServers,
+        ...(def.id === 'amr' ? { modelUnavailableErrorCode: 'AMR_MODEL_UNAVAILABLE' } : {}),
         send: (event, data) => {
           noteAgentActivity();
+          if (def.id === 'amr' && event === 'error') {
+            const failure = classifyAmrAccountFailure(
+              [
+                typeof data?.message === 'string' ? data.message : '',
+                typeof data?.error?.message === 'string' ? data.error.message : '',
+                typeof data?.error?.code === 'string' ? data.error.code : '',
+                agentStdoutTail,
+                agentStderrTail,
+              ].join('\n'),
+            );
+            if (failure) {
+              sendAmrAccountFailure(failure);
+              return;
+            }
+          }
           send(event, data);
         },
         ...(acpStageTimeoutMs !== undefined ? { stageTimeoutMs: acpStageTimeoutMs } : {}),
@@ -11527,6 +11766,15 @@ export async function startServer({
         code !== 0 &&
         !run.cancelRequested
       ) {
+        if (def.id === 'amr') {
+          const amrFailure = classifyAmrAccountFailure(
+            `${agentStderrTail}\n${agentStdoutTail}`,
+          );
+          if (amrFailure) {
+            sendAmrAccountFailure(amrFailure);
+            return design.runs.finish(run, 'failed', code ?? 1, signal ?? null);
+          }
+        }
         const authFailure = classifyAgentAuthFailure(
           agentId,
           `${agentStderrTail}\n${agentStdoutTail}`,
@@ -11594,12 +11842,26 @@ export async function startServer({
           stdoutTail: agentStdoutTail,
           env: spawnedAgentEnv,
         });
+        // A non-zero exit whose output reads as an auth / quota / upstream
+        // problem (typical of Claude Code, codex, …) gets the specific code
+        // rather than the generic execution-failed bucket; the human-readable
+        // message still prefers the richer CLI diagnostic when we have one.
+        const serviceCode = classifyAgentServiceFailure(
+          `${agentStderrTail}\n${agentStdoutTail}`,
+        );
         if (diagnostic) {
           send('error', createSseErrorPayload(
-            'AGENT_EXECUTION_FAILED',
+            serviceCode ?? 'AGENT_EXECUTION_FAILED',
             diagnostic.message,
             { retryable: diagnostic.retryable, details: { detail: diagnostic.detail } },
           ));
+        } else if (serviceCode) {
+          const detail = (agentStderrTail || agentStdoutTail || '').trim();
+          send('error', createSseErrorPayload(
+            serviceCode,
+            detail || 'The model service returned an error.',
+            { retryable: true },
+          ));
         }
       }
       // Reconcile any HTML artifacts that were written during this run
diff --git a/apps/daemon/tests/amr-acp-integration.test.ts b/apps/daemon/tests/amr-acp-integration.test.ts
new file mode 100644
index 000000000..2c79b48c0
--- /dev/null
+++ b/apps/daemon/tests/amr-acp-integration.test.ts
@@ -0,0 +1,533 @@
+/**
+ * Integration coverage for the AMR (vela) ACP runtime def.
+ *
+ * Spawns the fake vela stub at tests/fixtures/fake-vela.mjs (which speaks
+ * just enough ACP JSON-RPC to drive one turn) and verifies the daemon's
+ * `attachAcpSession` + `detectAcpModels` can walk through initialize →
+ * session/new → session/set_model → session/prompt without hand-stubbing
+ * the child stream.
+ *
+ * The runtime def itself (apps/daemon/src/runtimes/defs/amr.ts) is a pure
+ * data record, so this test also pins the contract the def declares:
+ *   - id, bin, streamFormat are stable for downstream consumers
+ *   - buildArgs() emits the vela invocation shape the docs describe
+ *   - AMR picker models come from `vela models`, not stale static ids.
+ */
+
+import { spawn, type ChildProcess } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+import { describe, expect, it } from 'vitest';
+
+import { attachAcpSession, detectAcpModels } from '../src/acp.js';
+import { classifyAmrAccountFailure } from '../src/integrations/vela-errors.js';
+import {
+  amrAgentDef,
+  normalizeVelaModelId,
+  parseVelaModels,
+} from '../src/runtimes/defs/amr.js';
+import { getAgentDef } from '../src/runtimes/registry.js';
+
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+const FAKE_VELA = path.join(HERE, 'fixtures', 'fake-vela.mjs');
+
+function spawnFakeVela(env: NodeJS.ProcessEnv = {}): ChildProcess {
+  return spawn(process.execPath, [FAKE_VELA], {
+    stdio: ['pipe', 'pipe', 'pipe'],
+    env: { ...process.env, ...env },
+  });
+}
+
+function spawnFixtureScript(source: string): ChildProcess {
+  return spawn(process.execPath, ['-e', source], {
+    stdio: ['pipe', 'pipe', 'pipe'],
+    env: process.env,
+  });
+}
+
+async function waitForExit(child: ChildProcess): Promise<void> {
+  if (child.exitCode !== null) return;
+  await new Promise<void>((resolve) => {
+    child.once('close', () => resolve());
+    child.once('exit', () => resolve());
+  });
+}
+
+describe('AMR runtime def', () => {
+  it('is registered with the expected ACP wiring', () => {
+    const def = getAgentDef('amr');
+    expect(def).toBeTruthy();
+    expect(def?.id).toBe('amr');
+    expect(def?.name).toBe('AMR');
+    expect(def?.bin).toBe('vela');
+    expect(def?.streamFormat).toBe('acp-json-rpc');
+  });
+
+  it('builds the documented `vela agent run --runtime opencode` argv', () => {
+    expect(amrAgentDef.buildArgs()).toEqual([
+      'agent',
+      'run',
+      '--runtime',
+      'opencode',
+    ]);
+  });
+
+  it('fails closed instead of exposing static stale fallback models', () => {
+    // Real vela rejects session/prompt without a prior session/set_model,
+    // and attachAcpSession skips set_model whenever model === 'default'.
+    // AMR must rely on the live `vela models` catalog so stale defaults like
+    // gpt-5.4-mini cannot be offered after link stops accepting them.
+    const ids = amrAgentDef.fallbackModels.map((m) => m.id);
+    expect(ids).not.toContain('default');
+    expect(ids).not.toContain('gpt-5.4-mini');
+    expect(ids).toEqual([]);
+  });
+
+  it('normalizes Vela public model ids to link-canonical ACP model ids', () => {
+    expect(normalizeVelaModelId('public_model_deepseek_v3_2')).toBe('deepseek-v3.2');
+    expect(normalizeVelaModelId('public_model_kimi_k2_6')).toBe('kimi-k2.6');
+    expect(normalizeVelaModelId('public_model_gemini_2_5_flash')).toBe('gemini-2.5-flash');
+    expect(normalizeVelaModelId('public_model_gemini_3_1_flash_lite_preview')).toBe(
+      'gemini-3.1-flash-lite-preview',
+    );
+    expect(normalizeVelaModelId('public_model_gemini_3_1_pro_preview')).toBe(
+      'gemini-3.1-pro-preview',
+    );
+    expect(normalizeVelaModelId('public_model_claude_haiku_4_5')).toBe('claude-haiku-4.5');
+    expect(normalizeVelaModelId('public_model_claude_opus_4_6')).toBe('claude-opus-4.6');
+    expect(normalizeVelaModelId('vela/claude-sonnet-4-7')).toBe('claude-sonnet-4.7');
+    expect(normalizeVelaModelId('public_model_gpt_5_4')).toBe('gpt-5.4');
+    expect(normalizeVelaModelId('public_model_gpt_5_4_mini')).toBe('gpt-5.4-mini');
+    expect(normalizeVelaModelId('public_model_minimax_m2_7')).toBe('minimax-m2.7');
+    expect(normalizeVelaModelId('public_model_glm_5_1')).toBe('glm-5.1');
+    expect(normalizeVelaModelId('public_model_glm_5')).toBe('glm-5');
+    expect(normalizeVelaModelId('public_model_qwen3_235b_a22b')).toBe('qwen3-235b-a22b');
+    expect(normalizeVelaModelId('deepseek-v3.2')).toBe('deepseek-v3.2');
+    expect(normalizeVelaModelId('vela/deepseek-v3.2')).toBe('deepseek-v3.2');
+  });
+
+  it('parses `vela models` output with fast chat defaults and plain canonical labels', () => {
+    const models = parseVelaModels([
+      'public_model_claude_opus_4_6  vela',
+      'public_model_deepseek_v3_2    vela',
+      'public_model_deepseek_v4_flash    vela',
+      'public_model_glm_5_1          vela',
+      'public_model_claude_opus_4_6  vela',
+      'public_model_gpt_image_2      vela',
+      'vela/kimi-k2.6                vela',
+      'public_model_seedance_2       vela',
+      'public_model_deepseek_v3_2    vela',
+      '',
+    ].join('\n'));
+    expect(models).toEqual([
+      { id: 'deepseek-v4-flash', label: 'deepseek-v4-flash' },
+      { id: 'deepseek-v3.2', label: 'deepseek-v3.2' },
+      { id: 'glm-5.1', label: 'glm-5.1' },
+      { id: 'claude-opus-4.6', label: 'claude-opus-4.6' },
+      { id: 'kimi-k2.6', label: 'kimi-k2.6' },
+    ]);
+    expect(models.every((model) => !model.label.includes('vela/'))).toBe(true);
+    expect(models.map((model) => model.id)).not.toContain('gpt-image-2');
+    expect(models.map((model) => model.id)).not.toContain('seedance-2');
+  });
+
+  it('fetches AMR picker models from `vela models`', async () => {
+    const models = await amrAgentDef.fetchModels?.(FAKE_VELA, process.env);
+    expect(models).toEqual([
+      { id: 'deepseek-v4-flash', label: 'deepseek-v4-flash' },
+      { id: 'deepseek-v3.2', label: 'deepseek-v3.2' },
+      { id: 'glm-5.1', label: 'glm-5.1' },
+      { id: 'gemini-2.5-flash', label: 'gemini-2.5-flash' },
+      { id: 'deepseek-v4-pro', label: 'deepseek-v4-pro' },
+      { id: 'gemini-3.1-flash-lite-preview', label: 'gemini-3.1-flash-lite-preview' },
+      { id: 'gemini-3.1-pro-preview', label: 'gemini-3.1-pro-preview' },
+      { id: 'gpt-5.4', label: 'gpt-5.4' },
+      { id: 'gpt-5.4-mini', label: 'gpt-5.4-mini' },
+      { id: 'glm-5', label: 'glm-5' },
+      { id: 'kimi-k2.6', label: 'kimi-k2.6' },
+      { id: 'minimax-m2.7', label: 'minimax-m2.7' },
+      { id: 'qwen3-235b-a22b', label: 'qwen3-235b-a22b' },
+    ]);
+  });
+});
+
+describe('AMR ACP transport — end-to-end against fake vela stub', () => {
+  it('drives a complete turn: initialize → session/new → session/set_model → session/prompt', async () => {
+    const child = spawnFakeVela({
+      FAKE_VELA_TEXT: 'Hello from AMR.',
+      FAKE_VELA_THOUGHT: 'thinking-chunk',
+    });
+    const events: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        // Pass a real model id so attachAcpSession sends session/set_model
+        // before session/prompt, matching the real vela contract the AMR
+        // runtime def encodes.
+        model: 'deepseek-v3.2',
+        mcpServers: [],
+        send: (event, payload) => {
+          events.push({ event, payload });
+        },
+      });
+
+      // attachAcpSession owns the stdin lifecycle: it sends initialize on
+      // construction and ends stdin after session/prompt completes. We just
+      // wait for the child to exit on its own.
+      await waitForExit(child);
+      expect(session.hasFatalError()).toBe(false);
+      expect(session.completedSuccessfully()).toBe(true);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const textDeltas = events
+      .filter((e) => {
+        const payload = e.payload as { type?: unknown };
+        return e.event === 'agent' && payload.type === 'text_delta';
+      })
+      .map((e) => (e.payload as { delta?: unknown }).delta);
+
+    expect(textDeltas.join('')).toBe('Hello from AMR.');
+
+    const thinkingDeltas = events
+      .filter((e) => {
+        const payload = e.payload as { type?: unknown };
+        return e.event === 'agent' && payload.type === 'thinking_delta';
+      })
+      .map((e) => (e.payload as { delta?: unknown }).delta);
+    expect(thinkingDeltas.join('')).toBe('thinking-chunk');
+  });
+
+  it('regression: stub mirrors real vela by rejecting session/prompt before session/set_model', async () => {
+    const child = spawnFakeVela({ FAKE_VELA_TEXT: 'unused' });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        // model === 'default' triggers the daemon to skip session/set_model.
+        // Against a vela-faithful stub that should surface as a fatal error,
+        // not a silent success — otherwise this same call path would also
+        // silently fail against a real vela in production.
+        model: 'default',
+        mcpServers: [],
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      expect(session.hasFatalError()).toBe(true);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    expect(errors.length).toBeGreaterThan(0);
+    const message = String(
+      (errors[0]?.payload as { message?: unknown })?.message ?? '',
+    );
+    expect(message.toLowerCase()).toContain('session/set_model');
+  });
+
+  it('detectAcpModels surfaces availableModels from the vela ACP session/new response', async () => {
+    const result = await detectAcpModels({
+      bin: process.execPath,
+      args: [FAKE_VELA],
+      env: process.env,
+      timeoutMs: 10_000,
+      defaultModelOption: { id: 'deepseek-v3.2', label: 'deepseek-v3.2 (default)' },
+    });
+    const ids = (result || []).map((m) => m.id);
+    expect(ids).toContain('deepseek-v3.2');
+    expect(ids).toContain('openai/gpt-5.4-mini');
+    expect(ids).toContain('anthropic/claude-3.7-sonnet');
+  });
+
+  it('surfaces session/new JSON-RPC errors as fatal daemon events', async () => {
+    const child = spawnFakeVela({
+      FAKE_VELA_SESSION_NEW_ERROR: 'forced session/new failure',
+    });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'deepseek-v3.2',
+        mcpServers: [],
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const message = String(
+      (errors[0]?.payload as { message?: unknown })?.message ?? '',
+    );
+    expect(message).toContain('forced session/new failure');
+  });
+
+  it('surfaces unrecoverable session/set_model failures as fatal daemon events', async () => {
+    const child = spawnFakeVela({
+      FAKE_VELA_SET_MODEL_ERROR: 'forced session/set_model failure',
+    });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'deepseek-v3.2',
+        mcpServers: [],
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const message = String(
+      (errors[0]?.payload as { message?: unknown })?.message ?? '',
+    );
+    expect(message).toContain('forced session/set_model failure');
+  });
+
+  it('surfaces session/prompt JSON-RPC errors as fatal daemon events', async () => {
+    const child = spawnFakeVela({
+      FAKE_VELA_PROMPT_ERROR: 'forced session/prompt failure',
+    });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'deepseek-v3.2',
+        mcpServers: [],
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const message = String(
+      (errors[0]?.payload as { message?: unknown })?.message ?? '',
+    );
+    expect(message).toContain('forced session/prompt failure');
+  });
+
+  it('maps ACP model-not-found prompt errors to AMR_MODEL_UNAVAILABLE', async () => {
+    const child = spawnFakeVela({
+      FAKE_VELA_PROMPT_ERROR: 'Model not found: vela/gpt-5.4-mini.',
+    });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'gpt-5.4-mini',
+        mcpServers: [],
+        modelUnavailableErrorCode: 'AMR_MODEL_UNAVAILABLE',
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const payload = errors[0]?.payload as {
+      message?: unknown;
+      error?: { code?: unknown };
+    };
+    expect(String(payload?.message ?? '')).toContain('Model not found');
+    expect(payload?.error?.code).toBe('AMR_MODEL_UNAVAILABLE');
+  });
+
+  it('keeps ACP insufficient-balance prompt errors classifiable as AMR recharge failures', async () => {
+    const child = spawnFakeVela({
+      FAKE_VELA_PROMPT_ERROR:
+        'HTTP 429: {"error":{"code":"insufficient_balance","message":"insufficient wallet balance"}}',
+    });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'claude-opus-4-6',
+        mcpServers: [],
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const message = String(
+      (errors[0]?.payload as { message?: unknown })?.message ?? '',
+    );
+    expect(message).toContain('insufficient_balance');
+    expect(classifyAmrAccountFailure(message)).toMatchObject({
+      code: 'AMR_INSUFFICIENT_BALANCE',
+      action: 'recharge',
+      actionUrl: 'https://open-design.ai/amr/wallet',
+    });
+  });
+
+  it('allows non-AMR ACP completions that produce no assistant text', async () => {
+    const child = spawnFakeVela({ FAKE_VELA_TEXT: '' });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'glm-5',
+        mcpServers: [],
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      expect(session.hasFatalError()).toBe(false);
+      expect(session.completedSuccessfully()).toBe(true);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    expect(errors).toHaveLength(0);
+  });
+
+  it('maps AMR empty-text completions to AMR_MODEL_UNAVAILABLE', async () => {
+    const child = spawnFakeVela({ FAKE_VELA_TEXT: '' });
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'glm-5',
+        mcpServers: [],
+        modelUnavailableErrorCode: 'AMR_MODEL_UNAVAILABLE',
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const payload = errors[0]?.payload as {
+      message?: unknown;
+      error?: { code?: unknown };
+    };
+    const message = String(
+      payload?.message ?? '',
+    );
+    expect(message).toContain('without producing any assistant text');
+    expect(payload?.error?.code).toBe('AMR_MODEL_UNAVAILABLE');
+  });
+
+  it('surfaces an actionable error when the ACP child exits before initialize completes', async () => {
+    const child = spawnFixtureScript(
+      "process.stdout.write('not-json\\n'); setTimeout(() => process.exit(0), 20);",
+    );
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'deepseek-v3.2',
+        mcpServers: [],
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const message = String(
+      (errors[0]?.payload as { message?: unknown })?.message ?? '',
+    );
+    expect(message).toContain('ACP session exited before completion');
+  });
+
+  it('times out silent ACP children instead of hanging forever', async () => {
+    const child = spawnFixtureScript(
+      'setTimeout(() => process.exit(0), 200);',
+    );
+    const errors: Array<{ event: string; payload: unknown }> = [];
+    try {
+      const session = attachAcpSession({
+        child: child as never,
+        prompt: 'Say hello',
+        cwd: process.cwd(),
+        model: 'deepseek-v3.2',
+        mcpServers: [],
+        stageTimeoutMs: 25,
+        send: (event, payload) => {
+          if (event === 'error') errors.push({ event, payload });
+        },
+      });
+
+      await waitForExit(child);
+      expect(session.hasFatalError()).toBe(true);
+      expect(session.completedSuccessfully()).toBe(false);
+    } finally {
+      if (child.exitCode === null) child.kill('SIGTERM');
+    }
+
+    const message = String(
+      (errors[0]?.payload as { message?: unknown })?.message ?? '',
+    );
+    expect(message).toContain('timed out');
+  });
+});
diff --git a/apps/daemon/tests/app-config.test.ts b/apps/daemon/tests/app-config.test.ts
index 7a74adc4d..6de4af84b 100644
--- a/apps/daemon/tests/app-config.test.ts
+++ b/apps/daemon/tests/app-config.test.ts
@@ -317,6 +317,12 @@ describe('app-config', () => {
             CODEX_BIN: '~/bin/codex-next',
             OPENAI_API_KEY: '  sk-proxy-openai  ',
           },
+          amr: {
+            VELA_BIN: '~/bin/vela',
+            OPEN_DESIGN_AMR_PROFILE: '  local  ',
+            OPENCODE_TEST_HOME: '  ~/.open-design-amr-opencode  ',
+            HOME: 'should-not-persist',
+          },
           'trae-cli': {
             TRAE_CLI_BIN: '  ~/bin/traecli-public  ',
           },
@@ -334,6 +340,11 @@ describe('app-config', () => {
       expect(cfg.agentCliEnv).toEqual({
         claude: { CLAUDE_CONFIG_DIR: '~/.claude-2', ANTHROPIC_API_KEY: 'sk-proxy-anthropic' },
         codex: { CODEX_HOME: '~/.codex-alt', CODEX_BIN: '~/bin/codex-next', OPENAI_API_KEY: 'sk-proxy-openai' },
+        amr: {
+          VELA_BIN: '~/bin/vela',
+          OPEN_DESIGN_AMR_PROFILE: 'local',
+          OPENCODE_TEST_HOME: '~/.open-design-amr-opencode',
+        },
         'trae-cli': { TRAE_CLI_BIN: '~/bin/traecli-public' },
       });
     });
diff --git a/apps/daemon/tests/diagnostics-export.test.ts b/apps/daemon/tests/diagnostics-export.test.ts
index e2b117325..1e42ee165 100644
--- a/apps/daemon/tests/diagnostics-export.test.ts
+++ b/apps/daemon/tests/diagnostics-export.test.ts
@@ -39,6 +39,10 @@ function mockResponse(): MockResponse {
   return res;
 }
 
+interface DiagnosticsManifestFile {
+  name: string;
+}
+
 describe('diagnostics export handler — non-sidecar launch', () => {
   // Reviewer-requested regression spec: `runDaemonCliStartup()` calls
   // `startDaemonRuntime()` without a runtime context, so plain `od` users
@@ -58,9 +62,18 @@ describe('diagnostics export handler — non-sidecar launch', () => {
     expect(res.capturedPayload).toBeInstanceOf(Buffer);
     const zip = await JSZip.loadAsync(res.capturedPayload!);
     const manifestRaw = await zip.file('summary/manifest.json')!.async('string');
-    const manifest = JSON.parse(manifestRaw) as { warnings: string[]; files: unknown[] };
+    const manifest = JSON.parse(manifestRaw) as {
+      warnings: string[];
+      files: DiagnosticsManifestFile[];
+    };
     expect(manifest.warnings).toContain(STANDALONE_LAUNCH_WARNING);
-    expect(manifest.files).toEqual([]);
+    // Standalone launches intentionally omit sidecar-managed daemon/web/desktop
+    // log files, but real developer machines may still contribute matching
+    // macOS crash reports from /Library/Logs/DiagnosticReports. Keep the test
+    // focused on the contract that no sidecar log files are bundled.
+    expect(
+      manifest.files.filter((file) => file.name.startsWith('logs/')),
+    ).toEqual([]);
   });
 });
 
diff --git a/apps/daemon/tests/fixtures/fake-vela.mjs b/apps/daemon/tests/fixtures/fake-vela.mjs
new file mode 100755
index 000000000..02defb42d
--- /dev/null
+++ b/apps/daemon/tests/fixtures/fake-vela.mjs
@@ -0,0 +1,306 @@
+#!/usr/bin/env node
+/**
+ * Fake vela CLI used by AMR integration tests. Routes by the first argv:
+ *
+ *   `vela models`                       → prints the live link model catalog
+ *                                         in the same tabular shape as Vela
+ *                                         0.0.1.
+ *
+ *   `vela login`                        → writes ~/.amr/config.json (the
+ *                                         active VELA_PROFILE only) and
+ *                                         exits 0. Mirrors the real
+ *                                         device-authorization flow's
+ *                                         on-disk side-effect without the
+ *                                         interactive browser approval —
+ *                                         tests for Open Design's daemon
+ *                                         login route only care that the
+ *                                         config file appears.
+ *
+ *   `vela models`                       → prints production-shaped public
+ *                                         model ids from the Vela catalog.
+ *
+ *   `vela agent run --runtime opencode` → ACP stdio runtime. Speaks just
+ *                                         enough of the protocol to drive
+ *                                         Open Design's `detectAcpModels`
+ *                                         and `attachAcpSession` through a
+ *                                         complete turn:
+ *
+ *     initialize           → { protocolVersion, agentCapabilities, models }
+ *     session/new          → { sessionId, models: { currentModelId, availableModels } }
+ *     session/set_model    → {}
+ *     session/prompt       → emits session/update notifications, then
+ *                            { stopReason: 'end_turn', usage }
+ *
+ * Behaviour can be tweaked through env vars set by the test:
+ *   FAKE_VELA_SESSION_ID         – session id returned by session/new
+ *   FAKE_VELA_TEXT               – assistant text streamed back to the host
+ *   FAKE_VELA_THOUGHT            – optional thought chunk streamed before text
+ *   FAKE_VELA_LOGIN_DELAY_MS     – delay before writing config.json on `login`
+ *                                   so tests can observe the in-flight state
+ *   FAKE_VELA_LOGIN_USER_EMAIL   – email written into the saved profile
+ *   FAKE_VELA_LOGIN_USER_PLAN    – plan written into the saved profile
+ *   FAKE_VELA_SESSION_NEW_ERROR  – when set, session/new returns a JSON-RPC error
+ *   FAKE_VELA_SET_MODEL_ERROR    – when set, session/set_model returns a JSON-RPC error
+ *   FAKE_VELA_PROMPT_ERROR       – when set, session/prompt returns a JSON-RPC error
+ *   FAKE_VELA_MODELS             – newline-separated `vela models` stdout
+ *   FAKE_VELA_REQUIRE_SET_MODEL  – strict gate (default on); set to '0' to
+ *                                   accept session/prompt without prior
+ *                                   session/set_model (legacy behaviour)
+ */
+
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { argv, stdin, stdout, stderr, env, exit } from 'node:process';
+
+const SESSION_ID = env.FAKE_VELA_SESSION_ID || 'fake-vela-session-1';
+const ASSISTANT_TEXT = Object.prototype.hasOwnProperty.call(env, 'FAKE_VELA_TEXT')
+  ? env.FAKE_VELA_TEXT
+  : 'Hello from fake vela.';
+const THOUGHT_TEXT = env.FAKE_VELA_THOUGHT || '';
+const SESSION_NEW_ERROR = env.FAKE_VELA_SESSION_NEW_ERROR || '';
+const SET_MODEL_ERROR = env.FAKE_VELA_SET_MODEL_ERROR || '';
+const PROMPT_ERROR = env.FAKE_VELA_PROMPT_ERROR || '';
+const AVAILABLE_MODELS = [
+  { modelId: 'openai/gpt-5.4-mini', name: 'gpt-5.4-mini' },
+  { modelId: 'anthropic/claude-3.7-sonnet', name: 'claude-3.7-sonnet' },
+];
+const DEFAULT_MODELS_STDOUT = [
+  'public_model_deepseek_v3_2    vela',
+  'public_model_deepseek_v4_flash    vela',
+  'public_model_deepseek_v4_pro  vela',
+  'public_model_gemini_2_5_flash    vela',
+  'public_model_gemini_3_1_flash_lite_preview    vela',
+  'public_model_gemini_3_1_pro_preview    vela',
+  'public_model_gpt_5_4    vela',
+  'public_model_gpt_5_4_mini    vela',
+  'public_model_glm_5    vela',
+  'public_model_glm_5_1  vela',
+  'public_model_gpt_image_2    vela',
+  'public_model_kimi_k2_6    vela',
+  'public_model_minimax_m2_7    vela',
+  'public_model_qwen3_235b_a22b  vela',
+  'public_model_seedance_2    vela',
+].join('\n');
+
+// Real `vela agent run --runtime opencode` rejects session/prompt until
+// session/set_model has been called for the current session — see the
+// AMR runtime def docblock and the integration test for the negative case.
+// The stub mirrors that contract so a regression in attachAcpSession that
+// silently skips set_model for AMR turns is caught here, not in production.
+let currentModelId = null;
+const sessionsWithModel = new Set();
+const STRICT_SET_MODEL = process.env.FAKE_VELA_REQUIRE_SET_MODEL !== '0';
+
+function writeMessage(obj) {
+  stdout.write(`${JSON.stringify(obj)}\n`);
+}
+
+function writeResult(id, result) {
+  writeMessage({ jsonrpc: '2.0', id, result });
+}
+
+function writeNotification(method, params) {
+  writeMessage({ jsonrpc: '2.0', method, params });
+}
+
+function writeError(id, message, code = -32603) {
+  writeMessage({
+    jsonrpc: '2.0',
+    id,
+    error: { code, message },
+  });
+}
+
+function logDiag(line) {
+  stderr.write(`[fake-vela] ${line}\n`);
+}
+
+function emitSessionUpdates(sessionId) {
+  if (THOUGHT_TEXT) {
+    writeNotification('session/update', {
+      sessionId,
+      update: {
+        sessionUpdate: 'agent_thought_chunk',
+        content: { type: 'text', text: THOUGHT_TEXT },
+      },
+    });
+  }
+  const chunks = ASSISTANT_TEXT.match(/.{1,16}/gs) || [ASSISTANT_TEXT];
+  for (const chunk of chunks) {
+    writeNotification('session/update', {
+      sessionId,
+      update: {
+        sessionUpdate: 'agent_message_chunk',
+        content: { type: 'text', text: chunk },
+      },
+    });
+  }
+}
+
+function handleMessage(msg) {
+  if (!msg || typeof msg !== 'object') return;
+  const { id, method, params } = msg;
+  switch (method) {
+    case 'initialize':
+      writeResult(id, {
+        protocolVersion: 1,
+        agentCapabilities: { promptCapabilities: { embeddedContext: false } },
+        models: {
+          currentModelId,
+          availableModels: AVAILABLE_MODELS,
+        },
+      });
+      return;
+    case 'session/new':
+      if (SESSION_NEW_ERROR) {
+        writeError(id, SESSION_NEW_ERROR);
+        return;
+      }
+      writeResult(id, {
+        sessionId: SESSION_ID,
+        models: {
+          currentModelId,
+          availableModels: AVAILABLE_MODELS,
+        },
+      });
+      return;
+    case 'session/set_model': {
+      if (SET_MODEL_ERROR) {
+        writeError(id, SET_MODEL_ERROR, -32099);
+        return;
+      }
+      const next = typeof params?.modelId === 'string' ? params.modelId.trim() : '';
+      const sessionId = typeof params?.sessionId === 'string' ? params.sessionId : SESSION_ID;
+      if (next) currentModelId = next;
+      sessionsWithModel.add(sessionId);
+      writeResult(id, {});
+      return;
+    }
+    case 'session/set_config_option': {
+      const sessionId = typeof params?.sessionId === 'string' ? params.sessionId : SESSION_ID;
+      // Treat config-option model selection as set_model for the purposes of
+      // the strict-set_model gate so adapters that go through the
+      // configOptions branch are not penalized.
+      sessionsWithModel.add(sessionId);
+      writeResult(id, {});
+      return;
+    }
+    case 'session/prompt': {
+      if (PROMPT_ERROR) {
+        writeError(id, PROMPT_ERROR, -32602);
+        return;
+      }
+      const sessionId = typeof params?.sessionId === 'string' ? params.sessionId : SESSION_ID;
+      if (STRICT_SET_MODEL && !sessionsWithModel.has(sessionId)) {
+        writeError(id, 'session/set_model must be called before session/prompt', -32602);
+        return;
+      }
+      emitSessionUpdates(sessionId);
+      writeResult(id, {
+        stopReason: 'end_turn',
+        usage: { inputTokens: 12, outputTokens: 7, totalTokens: 19 },
+      });
+      return;
+    }
+    case 'session/cancel':
+      logDiag('session/cancel received');
+      return;
+    default:
+      if (typeof id !== 'undefined') {
+        writeMessage({
+          jsonrpc: '2.0',
+          id,
+          error: { code: -32601, message: `unknown method: ${method}` },
+        });
+      }
+      return;
+  }
+}
+
+let buffer = '';
+stdin.setEncoding('utf8');
+stdin.on('data', (chunk) => {
+  buffer += chunk;
+  const lines = buffer.split('\n');
+  buffer = lines.pop() || '';
+  for (const raw of lines) {
+    const line = raw.trim();
+    if (!line) continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch (err) {
+      logDiag(`bad json on stdin: ${err instanceof Error ? err.message : String(err)}`);
+      continue;
+    }
+    handleMessage(parsed);
+  }
+});
+
+stdin.on('end', () => {
+  if (argv[2] === 'login') return;
+  stdout.end();
+  // Mirror real ACP runtimes that exit on EOF so the host's child.on('close')
+  // fires promptly and the chat run can finalize.
+  process.exit(0);
+});
+
+// `vela login`: the daemon's /api/integrations/vela/login route spawns this
+// without expecting any ACP traffic. Real vela goes through a device-auth
+// loop and writes ~/.amr/config.json on success; the stub skips the loop
+// and just writes the file so Open Design's status reader and AmrLoginPill
+// poller see the same on-disk projection production produces. The stdin EOF
+// handler above ignores login mode so delayed login tests can keep this
+// process alive without opening the ACP stdio bridge.
+function loginAndExit() {
+  if (env.FAKE_VELA_LOGIN_FAIL) {
+    stderr.write(`${env.FAKE_VELA_LOGIN_FAIL}\n`);
+    exit(1);
+  }
+  const profile = (env.VELA_PROFILE || 'prod').trim() || 'prod';
+  const allowed = new Set(['prod', 'test', 'local']);
+  if (!allowed.has(profile)) {
+    stderr.write(`[fake-vela] unknown profile ${profile}; defaulting to prod\n`);
+  }
+  const profileName = allowed.has(profile) ? profile : 'prod';
+  const delayMs = Number(env.FAKE_VELA_LOGIN_DELAY_MS) || 0;
+  const userEmail = env.FAKE_VELA_LOGIN_USER_EMAIL || 'fake-user@example.com';
+  const userPlan = env.FAKE_VELA_LOGIN_USER_PLAN || 'free';
+  const finish = () => {
+    const file = join(homedir(), '.amr', 'config.json');
+    mkdirSync(dirname(file), { recursive: true });
+    const payload = {
+      profiles: {
+        [profileName]: {
+          controlKey: 'fake-control-key-0000000000000000000000',
+          runtimeKey: 'fake-runtime-key-0000000000000000000000',
+          apiUrl:
+            profileName === 'local' ? 'http://localhost:18080' : '',
+          linkUrl:
+            profileName === 'local' ? 'http://localhost:18081' : '',
+          user: {
+            id: 'fake-user-id',
+            email: userEmail,
+            name: 'Fake User',
+            plan: userPlan,
+          },
+        },
+      },
+    };
+    writeFileSync(file, JSON.stringify(payload, null, 2), 'utf8');
+    stdout.write(`Login successful for ${userEmail}.\n`);
+    exit(0);
+  };
+  if (delayMs > 0) setTimeout(finish, delayMs);
+  else finish();
+}
+
+if (argv[2] === 'login') {
+  loginAndExit();
+}
+
+if (argv[2] === 'models') {
+  stdout.write(`${env.FAKE_VELA_MODELS || DEFAULT_MODELS_STDOUT}\n`);
+  exit(0);
+}
diff --git a/apps/daemon/tests/integrations/vela-errors.test.ts b/apps/daemon/tests/integrations/vela-errors.test.ts
new file mode 100644
index 000000000..0500d5268
--- /dev/null
+++ b/apps/daemon/tests/integrations/vela-errors.test.ts
@@ -0,0 +1,67 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  DEFAULT_AMR_RECHARGE_URL,
+  amrAccountFailureDetails,
+  classifyAmrAccountFailure,
+} from '../../src/integrations/vela-errors.js';
+
+describe('AMR account failure classification', () => {
+  it('classifies insufficient_balance JSON-RPC failures as rechargeable AMR balance errors', () => {
+    const failure = classifyAmrAccountFailure(
+      'JSON-RPC error -32000: {"code":"insufficient_balance","message":"insufficient balance"}',
+    );
+
+    expect(failure).toMatchObject({
+      code: 'AMR_INSUFFICIENT_BALANCE',
+      action: 'recharge',
+      actionUrl: DEFAULT_AMR_RECHARGE_URL,
+    });
+    expect(failure?.message).toContain(DEFAULT_AMR_RECHARGE_URL);
+    expect(amrAccountFailureDetails(failure!)).toEqual({
+      kind: 'amr_account',
+      action: 'recharge',
+      actionUrl: DEFAULT_AMR_RECHARGE_URL,
+    });
+  });
+
+  it('classifies 429 wallet balance payloads as AMR balance errors', () => {
+    const failure = classifyAmrAccountFailure(
+      'HTTP 429 Too Many Requests: quota exceeded because wallet balance is empty',
+    );
+
+    expect(failure).toMatchObject({
+      code: 'AMR_INSUFFICIENT_BALANCE',
+      action: 'recharge',
+    });
+  });
+
+  it('does not classify non-billing throttling as AMR balance errors', () => {
+    expect(classifyAmrAccountFailure('HTTP 429 rate limit reached')).toBeNull();
+    expect(classifyAmrAccountFailure('quota exceeded')).toBeNull();
+    expect(classifyAmrAccountFailure('temporary wallet balance lookup outage')).toBeNull();
+  });
+
+  it('classifies expired token, invalid session, and missing login text as AMR auth errors', () => {
+    for (const text of [
+      'Your token has expired. Please sign in again.',
+      'invalid session for AMR profile',
+      'login missing for runtime account',
+      'authentication required',
+    ]) {
+      expect(classifyAmrAccountFailure(text)).toMatchObject({
+        code: 'AMR_AUTH_REQUIRED',
+        action: 'relogin',
+      });
+    }
+  });
+
+  it('does not classify unrelated ACP failures as AMR account failures', () => {
+    expect(classifyAmrAccountFailure('session/prompt failed: model returned malformed output')).toBeNull();
+  });
+
+  it('does not tell env-auth users to relogin for bad API key failures', () => {
+    expect(classifyAmrAccountFailure('OpenRouter returned invalid api key')).toBeNull();
+    expect(classifyAmrAccountFailure('provider error: forbidden_api_key')).toBeNull();
+  });
+});
diff --git a/apps/daemon/tests/integrations/vela.routes.test.ts b/apps/daemon/tests/integrations/vela.routes.test.ts
new file mode 100644
index 000000000..ded918bda
--- /dev/null
+++ b/apps/daemon/tests/integrations/vela.routes.test.ts
@@ -0,0 +1,672 @@
+// HTTP-level coverage for the AMR (vela) integration routes.
+//
+// Boots the real daemon Express app on a random port (same shape as
+// memory-config-route.test.ts) and exercises the three endpoints from the
+// outside — `/api/integrations/vela/{status,login,logout}` — so the Settings
+// AmrLoginPill provider helpers, the spawn lifecycle, and the
+// ~/.amr/config.json projection all stay in lockstep.
+//
+// HOME is redirected to a tmpdir per test so the suite never touches the
+// developer's real `~/.amr/config.json`. VELA_BIN points at the
+// `tests/fixtures/fake-vela.mjs` stub, which handles the `login` argv by
+// writing the config file with the active VELA_PROFILE and exiting 0 —
+// mirroring real vela's on-disk side-effect without the device-auth loop.
+
+import { mkdtempSync, existsSync, readFileSync, writeFileSync, mkdirSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import type http from 'node:http';
+import { fileURLToPath } from 'node:url';
+
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+
+import { startServer } from '../../src/server.js';
+import { readAppConfig, writeAppConfig } from '../../src/app-config.js';
+
+interface StartedServer {
+  url: string;
+  server: http.Server;
+}
+
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+const FAKE_VELA = path.resolve(HERE, '..', 'fixtures', 'fake-vela.mjs');
+
+let baseUrl: string;
+let server: http.Server;
+let originalHome: string | undefined;
+let tmpHome: string;
+
+async function getJson<T = unknown>(url: string): Promise<{ status: number; body: T }> {
+  const resp = await fetch(url);
+  const body = (await resp.json()) as T;
+  return { status: resp.status, body };
+}
+
+async function postJson<T = unknown>(url: string): Promise<{ status: number; body: T }> {
+  const resp = await fetch(url, { method: 'POST' });
+  const body = (await resp.json()) as T;
+  return { status: resp.status, body };
+}
+
+function configPath(): string {
+  return path.join(tmpHome, '.amr', 'config.json');
+}
+
+function legacyVelaConfigPath(): string {
+  return path.join(tmpHome, '.vela', 'config.json');
+}
+
+function seedLogin(profile: string, payload: Record<string, unknown> = {}): void {
+  const dir = path.dirname(configPath());
+  mkdirSync(dir, { recursive: true });
+  const full = {
+    profiles: {
+      [profile]: {
+        runtimeKey: 'rt-seeded-key',
+        controlKey: 'ck-seeded-key',
+        apiUrl: 'http://localhost:18080',
+        linkUrl: 'http://localhost:18081',
+        user: {
+          id: 'user-seed',
+          email: 'seed@example.com',
+          plan: 'free',
+          ...((payload.user as Record<string, unknown>) ?? {}),
+        },
+        ...payload,
+      },
+    },
+  };
+  writeFileSync(configPath(), JSON.stringify(full, null, 2), 'utf8');
+}
+
+beforeAll(async () => {
+  // The login route resolves the vela binary through the daemon's
+  // `agentCliEnvForAgent` projection of `app-config.json` (NOT process.env),
+  // so we have to persist the fake binary path through the app-config file
+  // before any test calls /login. Without this the route would fall through
+  // to `resolveOnPath('vela')` and spawn the developer's real vela.
+  const dataDir = process.env.OD_DATA_DIR as string;
+  const config = await readAppConfig(dataDir);
+  await writeAppConfig(dataDir, {
+    ...config,
+    agentCliEnv: {
+      ...(config.agentCliEnv ?? {}),
+      amr: {
+        ...((config.agentCliEnv?.amr as Record<string, string>) ?? {}),
+        VELA_BIN: FAKE_VELA,
+      },
+    },
+  });
+  const started = (await startServer({ port: 0, returnServer: true })) as StartedServer;
+  baseUrl = started.url;
+  server = started.server;
+});
+
+afterAll(() => new Promise<void>((resolve) => server.close(() => resolve())));
+
+beforeEach(() => {
+  originalHome = process.env.HOME;
+  tmpHome = mkdtempSync(path.join(tmpdir(), 'od-vela-routes-'));
+  process.env.HOME = tmpHome;
+  process.env.OPEN_DESIGN_AMR_PROFILE = 'local';
+  process.env.VELA_PROFILE = 'prod';
+});
+
+afterEach(() => {
+  if (originalHome === undefined) delete process.env.HOME;
+  else process.env.HOME = originalHome;
+  delete process.env.OPEN_DESIGN_AMR_PROFILE;
+  delete process.env.VELA_PROFILE;
+  delete process.env.FAKE_VELA_LOGIN_DELAY_MS;
+  delete process.env.FAKE_VELA_LOGIN_FAIL;
+  delete process.env.FAKE_VELA_LOGIN_USER_EMAIL;
+  delete process.env.FAKE_VELA_LOGIN_USER_PLAN;
+  delete process.env.VELA_RUNTIME_KEY;
+  delete process.env.VELA_LINK_URL;
+  rmSync(tmpHome, { recursive: true, force: true });
+});
+
+describe('GET /api/integrations/vela/status', () => {
+  it('reports loggedIn=false when ~/.amr/config.json is absent', async () => {
+    const { status, body } = await getJson<{
+      loggedIn: boolean;
+      loginInFlight: boolean;
+      profile: string;
+      user: { email?: string } | null;
+      configPath: string;
+    }>(`${baseUrl}/api/integrations/vela/status`);
+    expect(status).toBe(200);
+    expect(body.loggedIn).toBe(false);
+    expect(body.loginInFlight).toBe(false);
+    expect(body.profile).toBe('local');
+    expect(body.user).toBeNull();
+    // configPath must point inside the temp HOME so the suite never leaks
+    // into the developer's real config file.
+    expect(body.configPath.startsWith(tmpHome)).toBe(true);
+    expect(body.configPath).toContain('/.amr/');
+  });
+
+  it('ignores legacy ~/.vela/config.json when reporting AMR status', async () => {
+    const legacyPath = legacyVelaConfigPath();
+    mkdirSync(path.dirname(legacyPath), { recursive: true });
+    writeFileSync(
+      legacyPath,
+      JSON.stringify({
+        profiles: {
+          local: {
+            runtimeKey: 'rt-legacy',
+            user: { id: 'legacy-user', email: 'legacy@example.com' },
+          },
+        },
+      }),
+      'utf8',
+    );
+
+    const { status, body } = await getJson<{
+      loggedIn: boolean;
+      user: { email?: string } | null;
+      configPath: string;
+    }>(`${baseUrl}/api/integrations/vela/status`);
+    expect(status).toBe(200);
+    expect(body.loggedIn).toBe(false);
+    expect(body.user).toBeNull();
+    expect(body.configPath).toContain('/.amr/');
+  });
+
+  it('reports Settings-configured AMR env credentials as logged in', async () => {
+    const dataDir = process.env.OD_DATA_DIR as string;
+    const previous = await readAppConfig(dataDir);
+    await writeAppConfig(dataDir, {
+      ...previous,
+      agentCliEnv: {
+        ...(previous.agentCliEnv ?? {}),
+        amr: {
+          ...((previous.agentCliEnv?.amr as Record<string, string>) ?? {}),
+          VELA_BIN: FAKE_VELA,
+          VELA_RUNTIME_KEY: 'rt-env-secret',
+          VELA_LINK_URL: 'https://openrouter.example/v1',
+        },
+      },
+    });
+    try {
+      const { status, body } = await getJson<{
+        loggedIn: boolean;
+        user: { email?: string } | null;
+      }>(`${baseUrl}/api/integrations/vela/status`);
+      expect(status).toBe(200);
+      expect(body.loggedIn).toBe(true);
+      expect(body.user).toBeNull();
+      expect(JSON.stringify(body)).not.toContain('rt-env-secret');
+    } finally {
+      await writeAppConfig(dataDir, previous as unknown as Record<string, unknown>);
+    }
+  });
+
+  it('reports daemon-process AMR env credentials as logged in', async () => {
+    process.env.VELA_RUNTIME_KEY = 'rt-process-secret';
+    process.env.VELA_LINK_URL = 'https://openrouter.example/v1';
+
+    const { status, body } = await getJson<{
+      loggedIn: boolean;
+      user: { email?: string } | null;
+    }>(`${baseUrl}/api/integrations/vela/status`);
+    expect(status).toBe(200);
+    expect(body.loggedIn).toBe(true);
+    expect(body.user).toBeNull();
+    expect(JSON.stringify(body)).not.toContain('rt-process-secret');
+  });
+
+  it('reports status for the Settings-configured AMR profile', async () => {
+    const dataDir = process.env.OD_DATA_DIR as string;
+    const previous = await readAppConfig(dataDir);
+    seedLogin('local', {
+      user: { id: 'local-user', email: 'settings-local@example.com' },
+    });
+    const cfg = JSON.parse(readFileSync(configPath(), 'utf8'));
+    cfg.profiles.prod = {};
+    writeFileSync(configPath(), JSON.stringify(cfg, null, 2), 'utf8');
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'prod';
+    await writeAppConfig(dataDir, {
+      ...previous,
+      agentCliEnv: {
+        ...(previous.agentCliEnv ?? {}),
+        amr: {
+          ...((previous.agentCliEnv?.amr as Record<string, string>) ?? {}),
+          VELA_BIN: FAKE_VELA,
+          OPEN_DESIGN_AMR_PROFILE: 'local',
+        },
+      },
+    });
+    try {
+      const { status, body } = await getJson<{
+        loggedIn: boolean;
+        profile: string;
+        user: { email?: string } | null;
+      }>(`${baseUrl}/api/integrations/vela/status`);
+      expect(status).toBe(200);
+      expect(body.loggedIn).toBe(true);
+      expect(body.profile).toBe('local');
+      expect(body.user?.email).toBe('settings-local@example.com');
+    } finally {
+      await writeAppConfig(dataDir, previous as unknown as Record<string, unknown>);
+    }
+  });
+
+  it('reports loggedIn=true with the surfaced user fields when the active profile has a runtimeKey', async () => {
+    seedLogin('local', {
+      user: {
+        id: 'u1',
+        email: 'leaf@example.com',
+        name: '杨瑾龙',
+        plan: 'free',
+      },
+    });
+    const { body } = await getJson<{
+      loggedIn: boolean;
+      user: { email?: string; plan?: string; name?: string } | null;
+    }>(`${baseUrl}/api/integrations/vela/status`);
+    expect(body.loggedIn).toBe(true);
+    expect(body.user?.email).toBe('leaf@example.com');
+    expect(body.user?.plan).toBe('free');
+    expect(body.user?.name).toBe('杨瑾龙');
+  });
+
+  it('never leaks the runtimeKey or controlKey in the status payload', async () => {
+    seedLogin('local', {
+      runtimeKey: 'rt-very-secret-do-not-leak',
+      controlKey: 'ck-also-secret',
+    });
+    const resp = await fetch(`${baseUrl}/api/integrations/vela/status`);
+    const text = await resp.text();
+    expect(text).not.toContain('rt-very-secret-do-not-leak');
+    expect(text).not.toContain('ck-also-secret');
+  });
+});
+
+describe('POST /api/integrations/vela/login', () => {
+  it('spawns the configured vela binary and surfaces a pid + startedAt + profile', async () => {
+    process.env.FAKE_VELA_LOGIN_USER_EMAIL = 'login-route@example.com';
+    const { status, body } = await postJson<{
+      pid: number;
+      startedAt: string;
+      profile: string;
+    }>(`${baseUrl}/api/integrations/vela/login`);
+    expect(status).toBe(202);
+    expect(typeof body.pid).toBe('number');
+    expect(body.pid).toBeGreaterThan(0);
+    expect(body.profile).toBe('local');
+    expect(body.startedAt).toMatch(/^\d{4}-\d{2}-\d{2}T/);
+
+    // The fake vela writes ~/.amr/config.json synchronously before exit.
+    // Wait briefly for the child to finish so the next status read sees
+    // the on-disk projection production produces.
+    for (let i = 0; i < 50; i += 1) {
+      if (existsSync(configPath())) break;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    expect(existsSync(configPath())).toBe(true);
+
+    const cfg = JSON.parse(readFileSync(configPath(), 'utf8'));
+    expect(cfg?.profiles?.local?.user?.email).toBe('login-route@example.com');
+    expect(cfg?.profiles?.prod).toBeUndefined();
+  });
+
+  it('passes the resolved AMR profile to vela login even when VELA_PROFILE is set differently', async () => {
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'test';
+    process.env.VELA_PROFILE = 'local';
+    process.env.FAKE_VELA_LOGIN_USER_EMAIL = 'login-test@example.com';
+
+    const { status, body } = await postJson<{
+      pid: number;
+      profile: string;
+    }>(`${baseUrl}/api/integrations/vela/login`);
+    expect(status).toBe(202);
+    expect(body.profile).toBe('test');
+
+    for (let i = 0; i < 50; i += 1) {
+      if (existsSync(configPath())) break;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+
+    const cfg = JSON.parse(readFileSync(configPath(), 'utf8'));
+    expect(cfg?.profiles?.test?.user?.email).toBe('login-test@example.com');
+    expect(cfg?.profiles?.local).toBeUndefined();
+  });
+
+  it('passes the Settings-configured AMR profile to vela login', async () => {
+    const dataDir = process.env.OD_DATA_DIR as string;
+    const previous = await readAppConfig(dataDir);
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'prod';
+    process.env.VELA_PROFILE = 'prod';
+    process.env.FAKE_VELA_LOGIN_USER_EMAIL = 'settings-login@example.com';
+    await writeAppConfig(dataDir, {
+      ...previous,
+      agentCliEnv: {
+        ...(previous.agentCliEnv ?? {}),
+        amr: {
+          ...((previous.agentCliEnv?.amr as Record<string, string>) ?? {}),
+          VELA_BIN: FAKE_VELA,
+          OPEN_DESIGN_AMR_PROFILE: 'local',
+        },
+      },
+    });
+    try {
+      const { status, body } = await postJson<{
+        pid: number;
+        profile: string;
+      }>(`${baseUrl}/api/integrations/vela/login`);
+      expect(status).toBe(202);
+      expect(body.profile).toBe('local');
+
+      for (let i = 0; i < 50; i += 1) {
+        if (existsSync(configPath())) break;
+        await new Promise((resolve) => setTimeout(resolve, 100));
+      }
+
+      const cfg = JSON.parse(readFileSync(configPath(), 'utf8'));
+      expect(cfg?.profiles?.local?.user?.email).toBe('settings-login@example.com');
+      expect(cfg?.profiles?.prod).toBeUndefined();
+    } finally {
+      await writeAppConfig(dataDir, previous as unknown as Record<string, unknown>);
+    }
+  });
+
+  it('returns 409 when a login subprocess is already in flight', async () => {
+    // Use the stub's delay knob so the first login is still running when
+    // the second request arrives; without this the first exits before the
+    // route's `isVelaLoginInFlight` guard sees it.
+    process.env.FAKE_VELA_LOGIN_DELAY_MS = '2000';
+
+    const first = await postJson(`${baseUrl}/api/integrations/vela/login`);
+    expect(first.status).toBe(202);
+
+    const second = await postJson<{ error?: string }>(
+      `${baseUrl}/api/integrations/vela/login`,
+    );
+    expect(second.status).toBe(409);
+    expect(String(second.body.error || '')).toMatch(/already running/i);
+
+    delete process.env.FAKE_VELA_LOGIN_DELAY_MS;
+    // Let the first login finish so the next test starts from a clean slate.
+    for (let i = 0; i < 50; i += 1) {
+      if (existsSync(configPath())) break;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  });
+
+  it('returns an error when the login subprocess exits immediately with stderr', async () => {
+    process.env.FAKE_VELA_LOGIN_FAIL =
+      'profile "prod" api URL: is not configured';
+
+    const { status, body } = await postJson<{ error?: string }>(
+      `${baseUrl}/api/integrations/vela/login`,
+    );
+
+    expect(status).toBe(500);
+    expect(body.error).toContain('profile "prod" api URL: is not configured');
+  });
+
+  it('surfaces and cancels a delayed login subprocess', async () => {
+    process.env.FAKE_VELA_LOGIN_DELAY_MS = '30000';
+
+    const login = await postJson(`${baseUrl}/api/integrations/vela/login`);
+    expect(login.status).toBe(202);
+
+    const during = await getJson<{ loggedIn: boolean; loginInFlight: boolean }>(
+      `${baseUrl}/api/integrations/vela/status`,
+    );
+    expect(during.body.loggedIn).toBe(false);
+    expect(during.body.loginInFlight).toBe(true);
+
+    const cancel = await postJson<{ canceled: boolean; pids: number[] }>(
+      `${baseUrl}/api/integrations/vela/login/cancel`,
+    );
+    expect(cancel.status).toBe(200);
+    expect(cancel.body.canceled).toBe(true);
+    expect(cancel.body.pids.length).toBeGreaterThan(0);
+
+    for (let i = 0; i < 50; i += 1) {
+      const next = await getJson<{ loginInFlight: boolean }>(
+        `${baseUrl}/api/integrations/vela/status`,
+      );
+      if (!next.body.loginInFlight) break;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+
+    const after = await getJson<{ loggedIn: boolean; loginInFlight: boolean }>(
+      `${baseUrl}/api/integrations/vela/status`,
+    );
+    expect(after.body.loggedIn).toBe(false);
+    expect(after.body.loginInFlight).toBe(false);
+    expect(existsSync(configPath())).toBe(false);
+  });
+});
+
+describe('POST /api/integrations/vela/logout', () => {
+  it('removes only resolved profile credentials so the next login can reuse endpoint config', async () => {
+    seedLogin('local');
+    const cfg = JSON.parse(readFileSync(configPath(), 'utf8'));
+    cfg.profiles.prod = {
+      runtimeKey: 'rt-prod',
+      user: { id: 'prod-user', email: 'prod@example.com' },
+    };
+    writeFileSync(configPath(), JSON.stringify(cfg, null, 2), 'utf8');
+    expect(existsSync(configPath())).toBe(true);
+
+    const { status, body } = await postJson<{ ok?: boolean }>(
+      `${baseUrl}/api/integrations/vela/logout`,
+    );
+    expect(status).toBe(200);
+    expect(body.ok).toBe(true);
+    expect(existsSync(configPath())).toBe(true);
+    const next = JSON.parse(readFileSync(configPath(), 'utf8'));
+    expect(next.profiles.local.runtimeKey).toBeUndefined();
+    expect(next.profiles.local.controlKey).toBeUndefined();
+    expect(next.profiles.local.user).toBeUndefined();
+    expect(next.profiles.local.apiUrl).toBe('http://localhost:18080');
+    expect(next.profiles.local.linkUrl).toBe('http://localhost:18081');
+    expect(next.profiles.prod.runtimeKey).toBe('rt-prod');
+
+    const after = await getJson<{ loggedIn: boolean }>(
+      `${baseUrl}/api/integrations/vela/status`,
+    );
+    expect(after.body.loggedIn).toBe(false);
+  });
+
+  it('is a no-op when there is no config file (idempotent / safe to spam from UI)', async () => {
+    expect(existsSync(configPath())).toBe(false);
+    const { status, body } = await postJson<{ ok?: boolean }>(
+      `${baseUrl}/api/integrations/vela/logout`,
+    );
+    expect(status).toBe(200);
+    expect(body.ok).toBe(true);
+  });
+
+  it('clears Settings-backed AMR auth env while preserving executable config', async () => {
+    const dataDir = process.env.OD_DATA_DIR as string;
+    const previous = await readAppConfig(dataDir);
+    await writeAppConfig(dataDir, {
+      agentCliEnv: {
+        ...(previous.agentCliEnv ?? {}),
+        amr: {
+          ...((previous.agentCliEnv?.amr as Record<string, string>) ?? {}),
+          VELA_BIN: FAKE_VELA,
+          VELA_OPENCODE_BIN: '/tmp/opencode',
+          VELA_RUNTIME_KEY: 'rt-env-secret',
+          VELA_LINK_URL: 'https://openrouter.example/v1',
+        },
+      },
+    });
+
+    try {
+      const before = await getJson<{ loggedIn: boolean }>(
+        `${baseUrl}/api/integrations/vela/status`,
+      );
+      expect(before.body.loggedIn).toBe(true);
+
+      const { status, body } = await postJson<{ ok?: boolean }>(
+        `${baseUrl}/api/integrations/vela/logout`,
+      );
+      expect(status).toBe(200);
+      expect(body.ok).toBe(true);
+
+      const after = await getJson<{ loggedIn: boolean }>(
+        `${baseUrl}/api/integrations/vela/status`,
+      );
+      expect(after.body.loggedIn).toBe(false);
+
+      const next = await readAppConfig(dataDir);
+      expect(next.agentCliEnv?.amr?.VELA_BIN).toBe(FAKE_VELA);
+      expect(next.agentCliEnv?.amr?.VELA_OPENCODE_BIN).toBe('/tmp/opencode');
+      expect(next.agentCliEnv?.amr?.VELA_RUNTIME_KEY).toBeUndefined();
+      expect(next.agentCliEnv?.amr?.VELA_LINK_URL).toBeUndefined();
+    } finally {
+      await writeAppConfig(dataDir, previous as unknown as Record<string, unknown>);
+    }
+  });
+
+  it('clears both Settings-backed AMR env credentials and same-profile ~/.amr credentials on logout', async () => {
+    const dataDir = process.env.OD_DATA_DIR as string;
+    const previous = await readAppConfig(dataDir);
+    seedLogin('local', {
+      user: { id: 'local-user', email: 'local@example.com' },
+    });
+    await writeAppConfig(dataDir, {
+      ...previous,
+      agentCliEnv: {
+        ...(previous.agentCliEnv ?? {}),
+        amr: {
+          ...((previous.agentCliEnv?.amr as Record<string, string>) ?? {}),
+          VELA_BIN: FAKE_VELA,
+          VELA_OPENCODE_BIN: '/tmp/opencode',
+          OPEN_DESIGN_AMR_PROFILE: 'local',
+          VELA_RUNTIME_KEY: 'rt-env-secret',
+          VELA_LINK_URL: 'https://openrouter.example/v1',
+        },
+      },
+    });
+
+    try {
+      const before = await getJson<{ loggedIn: boolean }>(
+        `${baseUrl}/api/integrations/vela/status`,
+      );
+      expect(before.body.loggedIn).toBe(true);
+
+      const { status, body } = await postJson<{ ok?: boolean }>(
+        `${baseUrl}/api/integrations/vela/logout`,
+      );
+      expect(status).toBe(200);
+      expect(body.ok).toBe(true);
+
+      const after = await getJson<{ loggedIn: boolean }>(
+        `${baseUrl}/api/integrations/vela/status`,
+      );
+      expect(after.body.loggedIn).toBe(false);
+
+      const nextConfig = await readAppConfig(dataDir);
+      expect(nextConfig.agentCliEnv?.amr?.VELA_RUNTIME_KEY).toBeUndefined();
+      expect(nextConfig.agentCliEnv?.amr?.VELA_LINK_URL).toBeUndefined();
+
+      const nextAmrConfig = JSON.parse(readFileSync(configPath(), 'utf8'));
+      expect(nextAmrConfig.profiles.local.runtimeKey).toBeUndefined();
+      expect(nextAmrConfig.profiles.local.user).toBeUndefined();
+      expect(nextAmrConfig.profiles.local.linkUrl).toBe('http://localhost:18081');
+    } finally {
+      await writeAppConfig(dataDir, previous as unknown as Record<string, unknown>);
+    }
+  });
+
+  it('logs out the Settings-configured AMR profile from the AMR config file', async () => {
+    const dataDir = process.env.OD_DATA_DIR as string;
+    const previous = await readAppConfig(dataDir);
+    seedLogin('local');
+    const cfg = JSON.parse(readFileSync(configPath(), 'utf8'));
+    cfg.profiles.prod = {
+      runtimeKey: 'rt-prod',
+      user: { id: 'prod-user', email: 'prod@example.com' },
+    };
+    writeFileSync(configPath(), JSON.stringify(cfg, null, 2), 'utf8');
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'prod';
+    await writeAppConfig(dataDir, {
+      ...previous,
+      agentCliEnv: {
+        ...(previous.agentCliEnv ?? {}),
+        amr: {
+          ...((previous.agentCliEnv?.amr as Record<string, string>) ?? {}),
+          VELA_BIN: FAKE_VELA,
+          OPEN_DESIGN_AMR_PROFILE: 'local',
+        },
+      },
+    });
+    try {
+      const { status, body } = await postJson<{ ok?: boolean }>(
+        `${baseUrl}/api/integrations/vela/logout`,
+      );
+      expect(status).toBe(200);
+      expect(body.ok).toBe(true);
+
+      const next = JSON.parse(readFileSync(configPath(), 'utf8'));
+      expect(next.profiles.local.runtimeKey).toBeUndefined();
+      expect(next.profiles.prod.runtimeKey).toBe('rt-prod');
+    } finally {
+      await writeAppConfig(dataDir, previous as unknown as Record<string, unknown>);
+    }
+  });
+
+  it('clears daemon-process AMR auth env for the current daemon session', async () => {
+    process.env.VELA_RUNTIME_KEY = 'rt-process-secret';
+    process.env.VELA_LINK_URL = 'https://openrouter.example/v1';
+
+    const before = await getJson<{ loggedIn: boolean }>(
+      `${baseUrl}/api/integrations/vela/status`,
+    );
+    expect(before.body.loggedIn).toBe(true);
+
+    const { status, body } = await postJson<{ ok?: boolean }>(
+      `${baseUrl}/api/integrations/vela/logout`,
+    );
+    expect(status).toBe(200);
+    expect(body.ok).toBe(true);
+    expect(process.env.VELA_RUNTIME_KEY).toBeUndefined();
+    expect(process.env.VELA_LINK_URL).toBeUndefined();
+
+    const after = await getJson<{ loggedIn: boolean }>(
+      `${baseUrl}/api/integrations/vela/status`,
+    );
+    expect(after.body.loggedIn).toBe(false);
+  });
+});
+
+describe('login → status round-trip (E2E across the three routes)', () => {
+  it('flips loggedIn=false → loggedIn=true after a successful login subprocess', async () => {
+    process.env.FAKE_VELA_LOGIN_USER_EMAIL = 'round-trip@example.com';
+    process.env.FAKE_VELA_LOGIN_USER_PLAN = 'pro';
+
+    const before = await getJson<{ loggedIn: boolean }>(
+      `${baseUrl}/api/integrations/vela/status`,
+    );
+    expect(before.body.loggedIn).toBe(false);
+
+    const login = await postJson(`${baseUrl}/api/integrations/vela/login`);
+    expect(login.status).toBe(202);
+
+    // Poll until the subprocess writes the config file (production AmrLoginPill
+    // polls /status every 2s; here we cap at 5s).
+    for (let i = 0; i < 50; i += 1) {
+      if (existsSync(configPath())) break;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    expect(existsSync(configPath())).toBe(true);
+
+    const after = await getJson<{
+      loggedIn: boolean;
+      user: { email?: string; plan?: string } | null;
+    }>(`${baseUrl}/api/integrations/vela/status`);
+    expect(after.body.loggedIn).toBe(true);
+    expect(after.body.user?.email).toBe('round-trip@example.com');
+    expect(after.body.user?.plan).toBe('pro');
+
+    delete process.env.FAKE_VELA_LOGIN_USER_EMAIL;
+    delete process.env.FAKE_VELA_LOGIN_USER_PLAN;
+  });
+});
diff --git a/apps/daemon/tests/integrations/vela.test.ts b/apps/daemon/tests/integrations/vela.test.ts
new file mode 100644
index 000000000..8ecfadd10
--- /dev/null
+++ b/apps/daemon/tests/integrations/vela.test.ts
@@ -0,0 +1,409 @@
+/**
+ * Coverage for `apps/daemon/src/integrations/vela.ts` — the read-side of
+ * the AMR (vela) login integration. The spawn path is exercised by
+ * `tests/amr-acp-integration.test.ts` (which uses the fake-vela stub); here
+ * we focus on the status reader that drives the Settings UI.
+ *
+ * `~/.amr/config.json` is the source of truth — vela CLI writes it on
+ * successful `vela login` and Open Design just surfaces a small projection.
+ * Tests redirect HOME via env so we never touch the real user file.
+ */
+
+import { mkdtempSync, rmSync, mkdirSync, readFileSync, writeFileSync, existsSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import {
+  forgetVelaLogin,
+  readVelaLoginStatus,
+  resolveAmrProfile,
+  spawnVelaLogin,
+  amrConfigPath,
+} from '../../src/integrations/vela.js';
+
+let originalHome: string | undefined;
+let tmpHome: string;
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+const FAKE_VELA = path.resolve(HERE, '..', 'fixtures', 'fake-vela.mjs');
+
+function writeConfig(payload: unknown): string {
+  const dir = path.join(tmpHome, '.amr');
+  mkdirSync(dir, { recursive: true });
+  const file = path.join(dir, 'config.json');
+  writeFileSync(file, JSON.stringify(payload), 'utf8');
+  return file;
+}
+
+function writeLegacyVelaConfig(payload: unknown): string {
+  const dir = path.join(tmpHome, '.vela');
+  mkdirSync(dir, { recursive: true });
+  const file = path.join(dir, 'config.json');
+  writeFileSync(file, JSON.stringify(payload), 'utf8');
+  return file;
+}
+
+beforeEach(() => {
+  originalHome = process.env.HOME;
+  tmpHome = mkdtempSync(path.join(tmpdir(), 'od-vela-test-'));
+  process.env.HOME = tmpHome;
+  delete process.env.OPEN_DESIGN_AMR_PROFILE;
+  delete process.env.VELA_PROFILE;
+});
+
+afterEach(() => {
+  if (originalHome === undefined) delete process.env.HOME;
+  else process.env.HOME = originalHome;
+  rmSync(tmpHome, { recursive: true, force: true });
+});
+
+describe('resolveAmrProfile', () => {
+  it('defaults to "prod" when OPEN_DESIGN_AMR_PROFILE is unset or empty', () => {
+    expect(resolveAmrProfile({})).toBe('prod');
+    expect(resolveAmrProfile({ OPEN_DESIGN_AMR_PROFILE: '   ' })).toBe('prod');
+  });
+
+  it('honors OPEN_DESIGN_AMR_PROFILE when set to a known profile', () => {
+    expect(resolveAmrProfile({ OPEN_DESIGN_AMR_PROFILE: 'prod' })).toBe('prod');
+    expect(resolveAmrProfile({ OPEN_DESIGN_AMR_PROFILE: 'local' })).toBe('local');
+    expect(resolveAmrProfile({ OPEN_DESIGN_AMR_PROFILE: 'test' })).toBe('test');
+  });
+
+  it('ignores lower-priority VELA_PROFILE values', () => {
+    expect(resolveAmrProfile({ VELA_PROFILE: 'local' })).toBe('prod');
+    expect(
+      resolveAmrProfile({
+        OPEN_DESIGN_AMR_PROFILE: 'test',
+        VELA_PROFILE: 'local',
+      }),
+    ).toBe('test');
+  });
+
+  it('warns for unknown OPEN_DESIGN_AMR_PROFILE values and falls back to prod', () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    expect(resolveAmrProfile({ OPEN_DESIGN_AMR_PROFILE: 'evil' })).toBe('prod');
+    expect(warn).toHaveBeenCalledWith(
+      expect.stringContaining('OPEN_DESIGN_AMR_PROFILE'),
+    );
+    warn.mockRestore();
+  });
+});
+
+describe('readVelaLoginStatus', () => {
+  it('returns loggedIn=false when ~/.amr/config.json is absent', () => {
+    const status = readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' });
+    expect(status.loggedIn).toBe(false);
+    expect(status.user).toBeNull();
+    expect(status.profile).toBe('local');
+    expect(status.configPath).toBe(amrConfigPath());
+  });
+
+  it('ignores legacy ~/.vela/config.json when ~/.amr/config.json is absent', () => {
+    writeLegacyVelaConfig({
+      profiles: {
+        local: {
+          runtimeKey: 'rt-legacy',
+          user: { id: 'legacy-user', email: 'legacy@example.com' },
+        },
+      },
+    });
+    const status = readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' });
+    expect(status.loggedIn).toBe(false);
+    expect(status.user).toBeNull();
+    expect(status.configPath).toBe(amrConfigPath());
+  });
+
+  it('treats configured AMR env credentials as logged in without an AMR config file', () => {
+    const status = readVelaLoginStatus(
+      { OPEN_DESIGN_AMR_PROFILE: 'local' },
+      {
+        VELA_RUNTIME_KEY: 'rt-env-secret',
+        VELA_LINK_URL: 'https://openrouter.example/v1',
+      },
+    );
+    expect(status.loggedIn).toBe(true);
+    expect(status.user).toBeNull();
+    expect(status.profile).toBe('local');
+    expect(JSON.stringify(status)).not.toContain('rt-env-secret');
+  });
+
+  it('prefers configured AMR env credentials over an incomplete ~/.amr active profile', () => {
+    writeConfig({
+      profiles: {
+        local: {
+          apiUrl: 'http://localhost:18080',
+          user: { id: 'stale-user', email: 'stale@example.com' },
+        },
+      },
+    });
+    const status = readVelaLoginStatus(
+      { OPEN_DESIGN_AMR_PROFILE: 'local' },
+      {
+        VELA_RUNTIME_KEY: 'rt-env-secret',
+        VELA_LINK_URL: 'https://openrouter.example/v1',
+      },
+    );
+    expect(status.loggedIn).toBe(true);
+    expect(status.profile).toBe('local');
+    expect(status.user).toBeNull();
+    expect(JSON.stringify(status)).not.toContain('rt-env-secret');
+    expect(JSON.stringify(status)).not.toContain('stale@example.com');
+  });
+
+  it('uses the Settings-configured AMR profile when reading status', () => {
+    writeConfig({
+      profiles: {
+        prod: {},
+        local: { runtimeKey: 'rt-local', user: { id: 'u', email: 'local@example.com' } },
+      },
+    });
+    const status = readVelaLoginStatus(
+      { OPEN_DESIGN_AMR_PROFILE: 'prod' },
+      { OPEN_DESIGN_AMR_PROFILE: 'local' },
+    );
+    expect(status.loggedIn).toBe(true);
+    expect(status.profile).toBe('local');
+    expect(status.user?.email).toBe('local@example.com');
+  });
+
+  it('treats daemon process AMR env credentials as logged in without an AMR config file', () => {
+    const status = readVelaLoginStatus({
+      OPEN_DESIGN_AMR_PROFILE: 'local',
+      VELA_RUNTIME_KEY: 'rt-process-secret',
+      VELA_LINK_URL: 'https://openrouter.example/v1',
+    });
+    expect(status.loggedIn).toBe(true);
+    expect(status.user).toBeNull();
+    expect(status.profile).toBe('local');
+    expect(JSON.stringify(status)).not.toContain('rt-process-secret');
+  });
+
+  it('requires both env runtime key and link URL before reporting env-only login', () => {
+    expect(
+      readVelaLoginStatus(
+        { OPEN_DESIGN_AMR_PROFILE: 'local' },
+        { VELA_RUNTIME_KEY: 'rt-env-secret' },
+      ).loggedIn,
+    ).toBe(false);
+    expect(
+      readVelaLoginStatus(
+        { OPEN_DESIGN_AMR_PROFILE: 'local' },
+        { VELA_LINK_URL: 'https://openrouter.example/v1' },
+      ).loggedIn,
+    ).toBe(false);
+  });
+
+  it('returns loggedIn=true with user info when the active profile has a runtimeKey', () => {
+    writeConfig({
+      profiles: {
+        local: {
+          runtimeKey: 'rt-secret-abc',
+          controlKey: 'ck-secret',
+          apiUrl: 'http://localhost:18080',
+          linkUrl: 'http://localhost:18081',
+          user: {
+            id: 'user_1',
+            email: 'leaf@example.com',
+            name: '杨瑾龙',
+            image: 'https://example.com/avatar.png',
+            plan: 'free',
+          },
+        },
+      },
+    });
+    const status = readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' });
+    expect(status.loggedIn).toBe(true);
+    expect(status.profile).toBe('local');
+    expect(status.user?.email).toBe('leaf@example.com');
+    expect(status.user?.plan).toBe('free');
+    // The secrets in the file are intentionally NOT surfaced through the
+    // status projection — the UI never needs them and we don't want them
+    // showing up in HTTP responses to the local web.
+    expect(JSON.stringify(status)).not.toContain('rt-secret-abc');
+    expect(JSON.stringify(status)).not.toContain('ck-secret');
+  });
+
+  it('returns loggedIn=false when the active profile is present but lacks runtimeKey', () => {
+    writeConfig({
+      profiles: {
+        local: { apiUrl: 'http://localhost:18080', user: { id: 'u', email: 'e' } },
+      },
+    });
+    const status = readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' });
+    expect(status.loggedIn).toBe(false);
+  });
+
+  it('isolates profiles — a logged-in "local" does not imply logged-in "prod"', () => {
+    writeConfig({
+      profiles: {
+        local: { runtimeKey: 'rt-local', user: { id: 'u', email: 'leaf@example.com' } },
+      },
+    });
+    expect(readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' }).loggedIn).toBe(true);
+    expect(readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'prod' }).loggedIn).toBe(false);
+  });
+
+  it('does not let VELA_PROFILE select the active status profile', () => {
+    writeConfig({
+      profiles: {
+        local: { runtimeKey: 'rt-local', user: { id: 'u', email: 'leaf@example.com' } },
+      },
+    });
+    expect(
+      readVelaLoginStatus({
+        OPEN_DESIGN_AMR_PROFILE: 'prod',
+        VELA_PROFILE: 'local',
+      }).loggedIn,
+    ).toBe(false);
+  });
+
+  it('treats malformed JSON as logged-out rather than crashing', () => {
+    const file = path.join(tmpHome, '.amr', 'config.json');
+    mkdirSync(path.dirname(file), { recursive: true });
+    writeFileSync(file, '{not json', 'utf8');
+    expect(readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' }).loggedIn).toBe(false);
+  });
+
+  it('treats the local runtimeKey as the source of truth even when user fields are missing', () => {
+    writeConfig({
+      profiles: {
+        local: {
+          runtimeKey: 'rt-local',
+          user: { email: 42, plan: ['pro'] },
+        },
+      },
+    });
+    const status = readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' });
+    expect(status.loggedIn).toBe(true);
+    expect(status.user?.id).toBe('');
+    expect(status.user?.email).toBe('');
+    expect(status.user?.plan).toBeUndefined();
+  });
+});
+
+describe('forgetVelaLogin', () => {
+  it('removes only the resolved profile credentials and preserves the rest of the config', () => {
+    const file = writeConfig({
+      version: 1,
+      profiles: {
+        local: {
+          runtimeKey: 'rt',
+          controlKey: 'ck',
+          apiUrl: 'http://localhost:18080',
+          linkUrl: 'http://localhost:18081',
+          user: { id: 'u', email: 'e' },
+        },
+        prod: { runtimeKey: 'rt-prod', user: { id: 'p', email: 'prod@example.com' } },
+      },
+      otherTopLevel: true,
+    });
+    expect(readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' }).loggedIn).toBe(true);
+    forgetVelaLogin({ OPEN_DESIGN_AMR_PROFILE: 'local' });
+    expect(readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'local' }).loggedIn).toBe(false);
+    expect(readVelaLoginStatus({ OPEN_DESIGN_AMR_PROFILE: 'prod' }).loggedIn).toBe(true);
+
+    const next = JSON.parse(readFileSync(file, 'utf8'));
+    expect(next.otherTopLevel).toBe(true);
+    expect(next.profiles.local.runtimeKey).toBeUndefined();
+    expect(next.profiles.local.controlKey).toBeUndefined();
+    expect(next.profiles.local.user).toBeUndefined();
+    expect(next.profiles.local.apiUrl).toBe('http://localhost:18080');
+    expect(next.profiles.local.linkUrl).toBe('http://localhost:18081');
+    expect(next.profiles.prod.runtimeKey).toBe('rt-prod');
+  });
+
+  it('is a no-op when the resolved profile does not exist', () => {
+    const file = writeConfig({
+      profiles: {
+        prod: { runtimeKey: 'rt-prod', user: { id: 'p', email: 'prod@example.com' } },
+      },
+    });
+    expect(() => forgetVelaLogin({ OPEN_DESIGN_AMR_PROFILE: 'local' })).not.toThrow();
+    const next = JSON.parse(readFileSync(file, 'utf8'));
+    expect(next.profiles.prod.runtimeKey).toBe('rt-prod');
+  });
+
+  it('is a no-op when the config file does not exist (idempotent)', () => {
+    expect(() => forgetVelaLogin()).not.toThrow();
+  });
+});
+
+describe('spawnVelaLogin', () => {
+  it('returns an actionable error when no vela binary can be resolved', async () => {
+    const originalPath = process.env.PATH;
+    const originalResourceRoot = process.env.OD_RESOURCE_ROOT;
+    try {
+      process.env.PATH = '';
+      delete process.env.OD_RESOURCE_ROOT;
+      await expect(
+        spawnVelaLogin({
+          baseEnv: { ...process.env, HOME: tmpHome },
+          configuredEnv: {},
+        }),
+      ).rejects.toThrow('vela binary not found');
+    } finally {
+      if (originalPath === undefined) delete process.env.PATH;
+      else process.env.PATH = originalPath;
+      if (originalResourceRoot === undefined) delete process.env.OD_RESOURCE_ROOT;
+      else process.env.OD_RESOURCE_ROOT = originalResourceRoot;
+    }
+  });
+
+  it('spawns the configured vela binary and writes only the resolved AMR profile', async () => {
+    const result = await spawnVelaLogin({
+      baseEnv: {
+        ...process.env,
+        HOME: tmpHome,
+        OPEN_DESIGN_AMR_PROFILE: 'test',
+        VELA_PROFILE: 'prod',
+        FAKE_VELA_LOGIN_USER_EMAIL: 'spawn-login@example.com',
+      },
+      configuredEnv: {
+        VELA_BIN: FAKE_VELA,
+      },
+    });
+
+    expect(result.pid).toBeGreaterThan(0);
+    expect(result.profile).toBe('test');
+
+    const file = path.join(tmpHome, '.amr', 'config.json');
+    for (let i = 0; i < 20; i += 1) {
+      if (existsSync(file)) break;
+      await new Promise((resolve) => setTimeout(resolve, 25));
+    }
+
+    const next = JSON.parse(readFileSync(file, 'utf8'));
+    expect(next.profiles.test.user.email).toBe('spawn-login@example.com');
+    expect(next.profiles.prod).toBeUndefined();
+  });
+
+  it('spawns login with the Settings-configured AMR profile over daemon env', async () => {
+    const result = await spawnVelaLogin({
+      baseEnv: {
+        ...process.env,
+        HOME: tmpHome,
+        OPEN_DESIGN_AMR_PROFILE: 'prod',
+        VELA_PROFILE: 'prod',
+        FAKE_VELA_LOGIN_USER_EMAIL: 'settings-profile@example.com',
+      },
+      configuredEnv: {
+        VELA_BIN: FAKE_VELA,
+        OPEN_DESIGN_AMR_PROFILE: 'local',
+      },
+    });
+
+    expect(result.pid).toBeGreaterThan(0);
+    expect(result.profile).toBe('local');
+
+    const file = path.join(tmpHome, '.amr', 'config.json');
+    for (let i = 0; i < 20; i += 1) {
+      if (existsSync(file)) break;
+      await new Promise((resolve) => setTimeout(resolve, 25));
+    }
+
+    const next = JSON.parse(readFileSync(file, 'utf8'));
+    expect(next.profiles.local.user.email).toBe('settings-profile@example.com');
+    expect(next.profiles.prod).toBeUndefined();
+  });
+});
diff --git a/apps/daemon/tests/prompts/discovery-form.test.ts b/apps/daemon/tests/prompts/discovery-form.test.ts
index e6cf66a50..46ccb1556 100644
--- a/apps/daemon/tests/prompts/discovery-form.test.ts
+++ b/apps/daemon/tests/prompts/discovery-form.test.ts
@@ -58,6 +58,13 @@ describe('discovery.ts task-type form (single-shot brief)', () => {
     );
   });
 
+  it('forbids pairing a tailored discovery form with the default Quick brief in one turn', () => {
+    expect(DISCOVERY_AND_PHILOSOPHY).toContain('Emit exactly ONE `<question-form>` in this turn.');
+    expect(DISCOVERY_AND_PHILOSOPHY).toContain(
+      'that tailored form replaces the default "Quick brief — 30 seconds" form; never output both.',
+    );
+  });
+
   it('teaches RULE 2 to accept the task-type answer marker alongside discovery', () => {
     // RULE 2's first sentence enumerates the answer markers it routes on. The
     // single-shot brief means `[form answers — task-type]` must be a valid
diff --git a/apps/daemon/tests/runtimes/env-and-detection.test.ts b/apps/daemon/tests/runtimes/env-and-detection.test.ts
index 124fe7b27..4f21cc58a 100644
--- a/apps/daemon/tests/runtimes/env-and-detection.test.ts
+++ b/apps/daemon/tests/runtimes/env-and-detection.test.ts
@@ -65,6 +65,84 @@ test('spawnEnvForAgent expands configured env home paths', () => {
   assert.equal(env.PATH, '/usr/bin');
 });
 
+test('spawnEnvForAgent injects the resolved AMR profile after configured env', () => {
+  const env = spawnEnvForAgent(
+    'amr',
+    {
+      OPEN_DESIGN_AMR_PROFILE: 'test',
+      VELA_PROFILE: 'prod',
+      PATH: '/usr/bin',
+    },
+    {
+      VELA_PROFILE: 'local',
+    },
+  );
+
+  assert.equal(env.VELA_PROFILE, 'test');
+  assert.equal(env.OPEN_DESIGN_AMR_PROFILE, 'test');
+  assert.equal(env.PATH, '/usr/bin');
+});
+
+test('spawnEnvForAgent gives AMR a stable OpenCode home under OD_DATA_DIR', () => {
+  const dataDir = mkdtempSync(join(tmpdir(), 'od-amr-data-'));
+  try {
+    const env = spawnEnvForAgent('amr', {
+      OD_DATA_DIR: dataDir,
+      PATH: '/usr/bin',
+    });
+
+    assert.equal(
+      env.OPENCODE_TEST_HOME,
+      join(dataDir, 'amr', 'opencode-home'),
+    );
+  } finally {
+    rmSync(dataDir, { recursive: true, force: true });
+  }
+});
+
+test('spawnEnvForAgent preserves a configured AMR OpenCode home override', () => {
+  const dataDir = mkdtempSync(join(tmpdir(), 'od-amr-data-'));
+  try {
+    const configuredHome = join(dataDir, 'custom-opencode-home');
+    const env = spawnEnvForAgent(
+      'amr',
+      {
+        OD_DATA_DIR: dataDir,
+        PATH: '/usr/bin',
+      },
+      {
+        OPENCODE_TEST_HOME: configuredHome,
+      },
+    );
+
+    assert.equal(env.OPENCODE_TEST_HOME, configuredHome);
+  } finally {
+    rmSync(dataDir, { recursive: true, force: true });
+  }
+});
+
+fsTest('spawnEnvForAgent gives AMR a discovered OpenCode binary under a minimal child PATH', () => {
+  const dir = mkdtempSync(join(tmpdir(), 'od-amr-opencode-home-'));
+  try {
+    return withEnvSnapshot(['PATH', 'OD_AGENT_HOME'], () => {
+      const opencodeBinDir = join(dir, '.opencode', 'bin');
+      const opencodeBin = join(opencodeBinDir, 'opencode');
+      mkdirSync(opencodeBinDir, { recursive: true });
+      writeFileSync(opencodeBin, '#!/bin/sh\nexit 0\n');
+      chmodSync(opencodeBin, 0o755);
+      process.env.PATH = '/usr/bin';
+      process.env.OD_AGENT_HOME = dir;
+
+      const env = spawnEnvForAgent('amr', { PATH: '/usr/bin' });
+
+      assert.equal(env.PATH, '/usr/bin');
+      assert.equal(env.VELA_OPENCODE_BIN, opencodeBin);
+    });
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
 test('resolveAgentExecutable prefers a configured CODEX_BIN override over PATH resolution', () => {
   const dir = mkdtempSync(join(tmpdir(), 'od-codex-bin-'));
   try {
@@ -250,6 +328,75 @@ fsTest('detectAgents marks Codex available when nvm exposes a node shim but laun
   }
 });
 
+fsTest('detectAgents keeps packaged built-in AMR unavailable when OpenCode cannot be resolved', async () => {
+  const root = mkdtempSync(join(tmpdir(), 'od-detect-amr-built-in-'));
+  try {
+    return await withEnvSnapshot(['PATH', 'OD_AGENT_HOME', 'OD_RESOURCE_ROOT', 'VELA_OPENCODE_BIN'], async () => {
+      const resourceRoot = join(root, 'resources', 'open-design');
+      const builtInVela = join(resourceRoot, 'bin', 'vela');
+      mkdirSync(join(resourceRoot, 'bin'), { recursive: true });
+      writeFileSync(
+        builtInVela,
+        '#!/bin/sh\nif [ "$1" = "--version" ]; then echo "vela manual-amr"; exit 0; fi\nexit 0\n',
+      );
+      chmodSync(builtInVela, 0o755);
+      process.env.PATH = '';
+      process.env.OD_AGENT_HOME = join(root, 'empty-home');
+      process.env.OD_RESOURCE_ROOT = resourceRoot;
+      delete process.env.VELA_OPENCODE_BIN;
+
+      const agents = await detectAgents();
+      const amrAgent = agents.find((agent) => agent.id === 'amr');
+
+      assert.ok(amrAgent);
+      assert.equal(amrAgent.available, false);
+      assert.equal(amrAgent.path, undefined);
+      assert.equal(amrAgent.version, undefined);
+    });
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
+fsTest('detectAgents marks AMR available from packaged built-in Vela with the bundled OpenCode companion tree', async () => {
+  const root = mkdtempSync(join(tmpdir(), 'od-detect-amr-built-in-'));
+  try {
+    return await withEnvSnapshot(['PATH', 'OD_AGENT_HOME', 'OD_RESOURCE_ROOT', 'VELA_OPENCODE_BIN'], async () => {
+      const resourceRoot = join(root, 'resources', 'open-design');
+      const builtInVela = join(resourceRoot, 'bin', 'vela');
+      const companionTree = join(resourceRoot, 'bin', 'libexec', 'opencode');
+      mkdirSync(join(resourceRoot, 'bin'), { recursive: true });
+      mkdirSync(companionTree, { recursive: true });
+      writeFileSync(
+        builtInVela,
+        '#!/bin/sh\nif [ "$1" = "--version" ]; then echo "vela manual-amr"; exit 0; fi\nexit 0\n',
+      );
+      chmodSync(builtInVela, 0o755);
+      // The companion tree is only "valid" when an actual `opencode`
+      // executable lives inside — directory-only checks were treating an
+      // empty/partial copy as available and the first real run had nothing
+      // to launch. Match the resources.test.ts packaging contract.
+      const companionExe = join(companionTree, 'opencode');
+      writeFileSync(companionExe, '#!/bin/sh\nexit 0\n');
+      chmodSync(companionExe, 0o755);
+      process.env.PATH = '';
+      process.env.OD_AGENT_HOME = join(root, 'empty-home');
+      process.env.OD_RESOURCE_ROOT = resourceRoot;
+      delete process.env.VELA_OPENCODE_BIN;
+
+      const agents = await detectAgents();
+      const amrAgent = agents.find((agent) => agent.id === 'amr');
+
+      assert.ok(amrAgent);
+      assert.equal(amrAgent.available, true);
+      assert.equal(amrAgent.path, builtInVela);
+      assert.equal(amrAgent.version, 'vela manual-amr');
+    });
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
 function codexNativeTargetTriple(): string {
   if (process.platform === 'darwin' && process.arch === 'arm64') return 'aarch64-apple-darwin';
   if (process.platform === 'darwin' && process.arch === 'x64') return 'x86_64-apple-darwin';
diff --git a/apps/daemon/tests/runtimes/executables.test.ts b/apps/daemon/tests/runtimes/executables.test.ts
index ddf5e4b4e..0d646fea3 100644
--- a/apps/daemon/tests/runtimes/executables.test.ts
+++ b/apps/daemon/tests/runtimes/executables.test.ts
@@ -1,6 +1,6 @@
 import { test } from 'vitest';
 import {
-  assert, chmodSync, claude, deepseek, gemini, join, minimalAgentDef, mkdirSync, mkdtempSync, resolveAgentExecutable, rmSync, tmpdir, withPlatform, writeFileSync,
+  assert, chmodSync, claude, deepseek, gemini, join, minimalAgentDef, mkdirSync, mkdtempSync, resolveAgentExecutable, rmSync, tmpdir, withEnvSnapshot, withPlatform, writeFileSync,
 } from './helpers/test-helpers.js';
 
 const fsTest = process.platform === 'win32' ? test.skip : test;
@@ -40,6 +40,124 @@ test('deepseek entry declares codewhale as a fallback bin (issue #2983)', () =>
 // files don't carry. Skip the filesystem-backed cases there — the
 // declarative `fallbackBins`-on-claude assertion above still runs on
 // every platform and is what catches regressions in the AGENT_DEF.
+fsTest(
+  'resolveAgentExecutable uses packaged built-in Vela for AMR with the bundled OpenCode companion tree',
+  () => {
+    const root = mkdtempSync(join(tmpdir(), 'od-amr-built-in-'));
+    try {
+      return withEnvSnapshot(['PATH', 'OD_AGENT_HOME', 'OD_RESOURCE_ROOT', 'VELA_OPENCODE_BIN'], () => {
+        const resourceRoot = join(root, 'resources', 'open-design');
+        const builtInVela = join(resourceRoot, 'bin', 'vela');
+        const companionTree = join(resourceRoot, 'bin', 'libexec', 'opencode');
+        mkdirSync(join(resourceRoot, 'bin'), { recursive: true });
+        mkdirSync(companionTree, { recursive: true });
+        writeFileSync(builtInVela, '#!/bin/sh\nexit 0\n');
+        chmodSync(builtInVela, 0o755);
+        // Match the resources.test.ts packaging contract: the companion tree
+        // is only valid when `<libexec>/opencode/opencode` actually exists +
+        // is executable. Directory-only checks were producing a false-positive
+        // availability path.
+        const companionExe = join(companionTree, 'opencode');
+        writeFileSync(companionExe, '#!/bin/sh\nexit 0\n');
+        chmodSync(companionExe, 0o755);
+        process.env.PATH = '';
+        process.env.OD_AGENT_HOME = join(root, 'empty-home');
+        process.env.OD_RESOURCE_ROOT = resourceRoot;
+        delete process.env.VELA_OPENCODE_BIN;
+
+        const resolved = resolveAgentExecutable(minimalAgentDef({ id: 'amr', bin: 'vela' }));
+
+        assert.equal(resolved, builtInVela);
+      });
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  },
+);
+
+fsTest(
+  'resolveAgentExecutable does not select packaged built-in Vela when OpenCode is missing',
+  () => {
+    const root = mkdtempSync(join(tmpdir(), 'od-amr-built-in-no-opencode-'));
+    try {
+      return withEnvSnapshot(['PATH', 'OD_AGENT_HOME', 'OD_RESOURCE_ROOT', 'VELA_OPENCODE_BIN'], () => {
+        const resourceRoot = join(root, 'resources', 'open-design');
+        const builtInVela = join(resourceRoot, 'bin', 'vela');
+        mkdirSync(join(resourceRoot, 'bin'), { recursive: true });
+        writeFileSync(builtInVela, '#!/bin/sh\nexit 0\n');
+        chmodSync(builtInVela, 0o755);
+        process.env.PATH = '';
+        process.env.OD_AGENT_HOME = join(root, 'empty-home');
+        process.env.OD_RESOURCE_ROOT = resourceRoot;
+        delete process.env.VELA_OPENCODE_BIN;
+
+        const resolved = resolveAgentExecutable(minimalAgentDef({ id: 'amr', bin: 'vela' }));
+
+        assert.equal(resolved, null);
+      });
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  },
+);
+
+fsTest(
+  'resolveAgentExecutable prefers configured VELA_BIN over packaged built-in Vela',
+  () => {
+    const root = mkdtempSync(join(tmpdir(), 'od-amr-built-in-precedence-'));
+    try {
+      return withEnvSnapshot(['PATH', 'OD_AGENT_HOME', 'OD_RESOURCE_ROOT'], () => {
+        const resourceRoot = join(root, 'resources', 'open-design');
+        const builtInVela = join(resourceRoot, 'bin', 'vela');
+        const configuredVela = join(root, 'configured', 'vela');
+        mkdirSync(join(resourceRoot, 'bin'), { recursive: true });
+        mkdirSync(join(root, 'configured'), { recursive: true });
+        writeFileSync(builtInVela, '#!/bin/sh\nexit 0\n');
+        writeFileSync(configuredVela, '#!/bin/sh\nexit 0\n');
+        chmodSync(builtInVela, 0o755);
+        chmodSync(configuredVela, 0o755);
+        process.env.PATH = '';
+        process.env.OD_AGENT_HOME = join(root, 'empty-home');
+        process.env.OD_RESOURCE_ROOT = resourceRoot;
+
+        const resolved = resolveAgentExecutable(
+          minimalAgentDef({ id: 'amr', bin: 'vela' }),
+          { VELA_BIN: configuredVela },
+        );
+
+        assert.equal(resolved, configuredVela);
+      });
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  },
+);
+
+fsTest(
+  'resolveAgentExecutable falls back to PATH Vela when packaged built-in Vela is absent',
+  () => {
+    const root = mkdtempSync(join(tmpdir(), 'od-amr-path-fallback-'));
+    try {
+      return withEnvSnapshot(['PATH', 'OD_AGENT_HOME', 'OD_RESOURCE_ROOT'], () => {
+        const pathBin = join(root, 'path-bin');
+        const pathVela = join(pathBin, 'vela');
+        mkdirSync(pathBin, { recursive: true });
+        writeFileSync(pathVela, '#!/bin/sh\nexit 0\n');
+        chmodSync(pathVela, 0o755);
+        process.env.PATH = pathBin;
+        process.env.OD_AGENT_HOME = join(root, 'empty-home');
+        process.env.OD_RESOURCE_ROOT = join(root, 'resources', 'open-design');
+
+        const resolved = resolveAgentExecutable(minimalAgentDef({ id: 'amr', bin: 'vela' }));
+
+        assert.equal(resolved, pathVela);
+      });
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  },
+);
+
 fsTest(
   'resolveAgentExecutable prefers def.bin over fallbackBins when bin is on PATH',
   () => {
diff --git a/apps/daemon/tests/runtimes/launch.test.ts b/apps/daemon/tests/runtimes/launch.test.ts
index 6132e344f..02e7d154d 100644
--- a/apps/daemon/tests/runtimes/launch.test.ts
+++ b/apps/daemon/tests/runtimes/launch.test.ts
@@ -8,6 +8,7 @@ import {
   codex,
   mkdirSync,
   mkdtempSync,
+  minimalAgentDef,
   resolveAgentLaunch,
   rmSync,
   tmpdir,
@@ -112,6 +113,44 @@ fsTest('resolveAgentLaunch selects nvm-installed codex under a minimal PATH and
   }
 });
 
+fsTest('resolveAgentLaunch uses packaged built-in Vela for AMR and prepends its dirname', () => {
+  const root = mkdtempSync(join(tmpdir(), 'od-launch-amr-built-in-'));
+  try {
+    return withEnvSnapshot(['PATH', 'OD_AGENT_HOME', 'OD_RESOURCE_ROOT', 'VELA_OPENCODE_BIN'], () => {
+      const resourceRoot = join(root, 'resources', 'open-design');
+      const builtInDir = join(resourceRoot, 'bin');
+      const builtInVela = join(builtInDir, 'vela');
+      const companionTree = join(builtInDir, 'libexec', 'opencode');
+      const companionExe = join(
+        companionTree,
+        process.platform === 'win32' ? 'opencode.exe' : 'opencode',
+      );
+      mkdirSync(builtInDir, { recursive: true });
+      mkdirSync(companionTree, { recursive: true });
+      writeFileSync(builtInVela, '#!/bin/sh\nexit 0\n');
+      chmodSync(builtInVela, 0o755);
+      // packagedVelaOpenCodeCompanionTree now verifies the inner opencode
+      // executable, not just the directory — see #3148. Fixture must match.
+      writeFileSync(companionExe, '#!/bin/sh\nexit 0\n');
+      chmodSync(companionExe, 0o755);
+      process.env.PATH = '';
+      process.env.OD_AGENT_HOME = join(root, 'empty-home');
+      process.env.OD_RESOURCE_ROOT = resourceRoot;
+      delete process.env.VELA_OPENCODE_BIN;
+
+      const launch = resolveAgentLaunch(minimalAgentDef({ id: 'amr', bin: 'vela' }));
+
+      assert.equal(launch.selectedPath, builtInVela);
+      assert.equal(launch.launchPath, builtInVela);
+      assert.equal(launch.launchKind, 'selected');
+      assert.deepEqual(launch.childPathPrepend, [builtInDir]);
+      assert.equal(launch.diagnostic, null);
+    });
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
 fsTest('resolveAgentLaunch resolves a Codex npm wrapper to the native packaged binary', () => {
   const root = mkdtempSync(join(tmpdir(), 'od-launch-codex-wrapper-'));
   try {
diff --git a/apps/daemon/tests/runtimes/resolve-model.test.ts b/apps/daemon/tests/runtimes/resolve-model.test.ts
new file mode 100644
index 000000000..d614c3966
--- /dev/null
+++ b/apps/daemon/tests/runtimes/resolve-model.test.ts
@@ -0,0 +1,127 @@
+/**
+ * Coverage for `resolveModelForAgent` — the safety net that turns the
+ * synthetic `'default'` / null model into a concrete fallback id for
+ * adapters whose CLI cannot accept "default" (e.g. AMR / vela, which
+ * requires an explicit `session/set_model` before `session/prompt` and
+ * has no notion of a CLI-side saved default).
+ *
+ * The chat-run path in server.ts goes:
+ *
+ *   user/plugin model -> isKnownModel | sanitizeCustomModel -> resolveModelForAgent
+ *
+ * so the substitution kicks in even when a plugin or stored chat state
+ * sends `model: 'default'` (or omits the field). Without this, AMR turns
+ * fail in production with `session/set_model must be called before
+ * session/prompt`.
+ */
+
+import { describe, expect, it } from 'vitest';
+
+import {
+  rememberLiveModels,
+  resolveModelForAgent,
+} from '../../src/runtimes/models.js';
+import type { RuntimeAgentDef } from '../../src/runtimes/types.js';
+
+function defWith(fallbackIds: string[]): RuntimeAgentDef {
+  return {
+    id: 'test',
+    name: 'Test',
+    bin: 'test',
+    versionArgs: ['--version'],
+    fallbackModels: fallbackIds.map((id) => ({ id, label: id })),
+    buildArgs: () => [],
+    streamFormat: 'acp-json-rpc',
+  };
+}
+
+function defWithId(id: string, fallbackIds: string[]): RuntimeAgentDef {
+  return {
+    ...defWith(fallbackIds),
+    id,
+  };
+}
+
+describe('resolveModelForAgent', () => {
+  it('substitutes the first concrete fallback when the resolved model is null and the def has no "default" option', () => {
+    const def = defWith(['gpt-5.4-mini', 'gpt-5.4']);
+    expect(resolveModelForAgent(def, null)).toBe('gpt-5.4-mini');
+  });
+
+  it('substitutes when the resolved model is the synthetic "default" id and the def omits "default"', () => {
+    const def = defWith(['gpt-5.4-mini', 'gpt-5.4']);
+    expect(resolveModelForAgent(def, 'default')).toBe('gpt-5.4-mini');
+  });
+
+  it('prefers the first remembered live model when the def cannot accept the synthetic default model', () => {
+    const def = defWithId('live-default-test', []);
+    rememberLiveModels(def.id, [
+      { id: 'deepseek-v3.2', label: 'deepseek-v3.2' },
+      { id: 'glm-5.1', label: 'glm-5.1' },
+    ]);
+
+    expect(resolveModelForAgent(def, null)).toBe('deepseek-v3.2');
+    expect(resolveModelForAgent(def, 'default')).toBe('deepseek-v3.2');
+  });
+
+  it('keeps common default-capable defs untouched even when live models are remembered', () => {
+    const def = defWithId('live-default-capable-test', ['default', 'sonnet']);
+    rememberLiveModels(def.id, [
+      { id: 'deepseek-v3.2', label: 'deepseek-v3.2' },
+    ]);
+
+    expect(resolveModelForAgent(def, null)).toBe(null);
+    expect(resolveModelForAgent(def, 'default')).toBe('default');
+  });
+
+  it('leaves the resolved model alone when the def lists "default" itself (the common case for hermes/devin/kimi)', () => {
+    const def = defWith(['default', 'sonnet']);
+    expect(resolveModelForAgent(def, 'default')).toBe('default');
+    expect(resolveModelForAgent(def, null)).toBe(null);
+  });
+
+  it('leaves real model ids untouched even when the def omits "default"', () => {
+    const def = defWith(['gpt-5.4-mini']);
+    expect(resolveModelForAgent(def, 'gpt-5.4')).toBe('gpt-5.4');
+  });
+
+  it('returns the original value when fallbackModels is empty (no substitution possible)', () => {
+    const def = defWith([]);
+    expect(resolveModelForAgent(def, null)).toBe(null);
+    expect(resolveModelForAgent(def, 'default')).toBe('default');
+  });
+
+  it('honors defaultModelEnvVar over the hardcoded fallback when the env var is set', () => {
+    const def: RuntimeAgentDef = {
+      ...defWith(['gpt-5.4-mini']),
+      defaultModelEnvVar: 'VELA_DEFAULT_MODEL',
+    };
+    expect(
+      resolveModelForAgent(def, null, { VELA_DEFAULT_MODEL: 'gpt-5.5' }),
+    ).toBe('gpt-5.5');
+    expect(
+      resolveModelForAgent(def, 'default', { VELA_DEFAULT_MODEL: 'gpt-5.5' }),
+    ).toBe('gpt-5.5');
+  });
+
+  it('falls back to the static list when defaultModelEnvVar is set but the env var is empty / missing', () => {
+    const def: RuntimeAgentDef = {
+      ...defWith(['gpt-5.4-mini']),
+      defaultModelEnvVar: 'VELA_DEFAULT_MODEL',
+    };
+    expect(resolveModelForAgent(def, null, {})).toBe('gpt-5.4-mini');
+    expect(
+      resolveModelForAgent(def, null, { VELA_DEFAULT_MODEL: '   ' }),
+    ).toBe('gpt-5.4-mini');
+  });
+
+  it('does NOT use the env override when the user already picked a real model', () => {
+    const def: RuntimeAgentDef = {
+      ...defWith(['gpt-5.4-mini']),
+      defaultModelEnvVar: 'VELA_DEFAULT_MODEL',
+    };
+    expect(
+      resolveModelForAgent(def, 'gpt-5.4-fast', { VELA_DEFAULT_MODEL: 'gpt-5.5' }),
+    ).toBe('gpt-5.4-fast');
+  });
+});
diff --git a/apps/daemon/tests/runtimes/service-failure-classification.test.ts b/apps/daemon/tests/runtimes/service-failure-classification.test.ts
new file mode 100644
index 000000000..22c09bdfe
--- /dev/null
+++ b/apps/daemon/tests/runtimes/service-failure-classification.test.ts
@@ -0,0 +1,93 @@
+import { describe, expect, it } from 'vitest';
+import { classifyAgentServiceFailure } from '../../src/runtimes/auth.js';
+
+describe('classifyAgentServiceFailure', () => {
+  it('classifies auth failures (Claude Code / codex style)', () => {
+    for (const text of [
+      'Error: 401 {"type":"authentication_error","message":"invalid x-api-key"}',
+      'Incorrect API key provided: sk-***. ',
+      'Please run /login to authenticate.',
+      'Unauthorized: OAuth token has expired',
+    ]) {
+      expect(classifyAgentServiceFailure(text)).toBe('AGENT_AUTH_REQUIRED');
+    }
+  });
+
+  it('classifies quota / rate-limit / balance failures', () => {
+    for (const text of [
+      'Error: 429 Too Many Requests',
+      'rate_limit_error: rate limit exceeded',
+      'You exceeded your current quota, please check your plan and billing details.',
+      'Your credit balance is too low to access the Anthropic API.',
+      'insufficient_quota',
+    ]) {
+      expect(classifyAgentServiceFailure(text)).toBe('RATE_LIMITED');
+    }
+  });
+
+  it('classifies upstream/provider failures', () => {
+    for (const text of [
+      'Error: 529 {"type":"overloaded_error"}',
+      'Service temporarily unavailable (503)',
+      'Bad gateway',
+      'The model is currently overloaded. Please try again later.',
+    ]) {
+      expect(classifyAgentServiceFailure(text)).toBe('UPSTREAM_UNAVAILABLE');
+    }
+  });
+
+  it('classifies a 5xx only with status context, not a bare number', () => {
+    for (const text of [
+      'HTTP 500 from provider',
+      'status 503',
+      'server error 502',
+      '502 Bad Gateway',
+    ]) {
+      expect(classifyAgentServiceFailure(text)).toBe('UPSTREAM_UNAVAILABLE');
+    }
+  });
+
+  it('requires status context for auth/rate numbers too', () => {
+    expect(classifyAgentServiceFailure('HTTP 401 Unauthorized')).toBe('AGENT_AUTH_REQUIRED');
+    expect(classifyAgentServiceFailure('status code 429')).toBe('RATE_LIMITED');
+  });
+
+  it('checks auth before rate/upstream so a 401 is never misread', () => {
+    expect(
+      classifyAgentServiceFailure('401 unauthorized — also saw a 503 earlier'),
+    ).toBe('AGENT_AUTH_REQUIRED');
+  });
+
+  it('returns null for ordinary process failures and empty text', () => {
+    expect(classifyAgentServiceFailure('')).toBeNull();
+    expect(classifyAgentServiceFailure('spawn ENOENT')).toBeNull();
+    expect(
+      classifyAgentServiceFailure('Segmentation fault (core dumped)'),
+    ).toBeNull();
+    expect(
+      classifyAgentServiceFailure('TypeError: cannot read properties of undefined'),
+    ).toBeNull();
+  });
+
+  it('does not misread unrelated numbers (line/size/duration) as a provider outage', () => {
+    for (const text of [
+      'Compiled 500 modules in 503ms; read 502 bytes at line 529',
+      'Build failed at line 500 (exit code 1)',
+      'Processed 4290 rows, 401 skipped, took 4290ms',
+      'wrote 502 files',
+    ]) {
+      expect(classifyAgentServiceFailure(text)).toBeNull();
+    }
+  });
+
+  it('does not treat a process exit code as an HTTP status', () => {
+    for (const text of [
+      'exit code 401',
+      'process exited with code 429',
+      'command failed: exit code 503',
+      'child process exited with code 500',
+    ]) {
+      expect(classifyAgentServiceFailure(text)).toBeNull();
+    }
+  });
+});
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 8ae32aa44..4ae60fbc6 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/desktop",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "main": "./dist/main/index.js",
diff --git a/apps/landing-page/package.json b/apps/landing-page/package.json
index e686768cf..396b1fb0e 100644
--- a/apps/landing-page/package.json
+++ b/apps/landing-page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/landing-page",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/apps/packaged/package.json b/apps/packaged/package.json
index 959d63675..f7b20b4ad 100644
--- a/apps/packaged/package.json
+++ b/apps/packaged/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/packaged",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "main": "./dist/index.mjs",
diff --git a/apps/packaged/src/config.ts b/apps/packaged/src/config.ts
index 69dfea628..86f46241d 100644
--- a/apps/packaged/src/config.ts
+++ b/apps/packaged/src/config.ts
@@ -19,8 +19,10 @@ export const PACKAGED_WEB_STANDALONE_ROOT_ENV = "OD_WEB_STANDALONE_ROOT";
 export const PACKAGED_WEB_OUTPUT_MODE_ENV = "OD_WEB_OUTPUT_MODE";
 
 export type PackagedWebOutputMode = "server" | "standalone";
+export type PackagedAmrProfile = "prod" | "test" | "local";
 
 export type RawPackagedConfig = {
+  amrProfile?: string;
   appVersion?: string;
   daemonCliEntryRelative?: string;
   daemonSidecarEntryRelative?: string;
@@ -45,6 +47,7 @@ export type RawPackagedConfig = {
 };
 
 export type PackagedConfig = {
+  amrProfile: PackagedAmrProfile | null;
   appVersion: string | null;
   daemonCliEntry: string | null;
   daemonSidecarEntry: string | null;
@@ -112,6 +115,13 @@ function resolvePackagedWebOutputMode(value: string | undefined): PackagedWebOut
   throw new Error(`unsupported packaged web output mode: ${value}`);
 }
 
+function resolvePackagedAmrProfile(value: string | undefined): PackagedAmrProfile | null {
+  const cleaned = cleanOptionalString(value);
+  if (cleaned == null) return null;
+  if (cleaned === "prod" || cleaned === "test" || cleaned === "local") return cleaned;
+  throw new Error(`unsupported packaged AMR profile: ${value}`);
+}
+
 function isTruthyEnv(value: string | undefined): boolean {
   return value === "1" || value === "true" || value === "yes";
 }
@@ -168,6 +178,7 @@ export async function readPackagedConfig(): Promise<PackagedConfig> {
   const webSidecarEntry = await resolvePackagedRelativeEntry(raw.webSidecarEntryRelative);
 
   return {
+    amrProfile: resolvePackagedAmrProfile(raw.amrProfile),
     appVersion: cleanOptionalString(raw.appVersion),
     daemonCliEntry,
     daemonSidecarEntry,
diff --git a/apps/packaged/src/headless.ts b/apps/packaged/src/headless.ts
index 2ed42ff84..9ef0065c9 100644
--- a/apps/packaged/src/headless.ts
+++ b/apps/packaged/src/headless.ts
@@ -35,6 +35,13 @@ function resolveHeadlessNamespaceBaseRoot(): string {
   return join(dataBase, "open-design", "namespaces");
 }
 
+function resolveHeadlessAmrProfile(): PackagedConfig["amrProfile"] {
+  const value = process.env.OPEN_DESIGN_AMR_PROFILE?.trim();
+  if (value == null || value.length === 0) return null;
+  if (value === "prod" || value === "test" || value === "local") return value;
+  throw new Error(`unsupported packaged AMR profile: ${value}`);
+}
+
 function resolveHeadlessConfig(): PackagedConfig {
   const namespace =
     OPEN_DESIGN_SIDECAR_CONTRACT.normalizeNamespace(
@@ -51,6 +58,7 @@ function resolveHeadlessConfig(): PackagedConfig {
     join(__dirname, "..", "..", "..", "open-design");
 
   return {
+    amrProfile: resolveHeadlessAmrProfile(),
     appVersion: null,
     daemonCliEntry: null,
     daemonSidecarEntry: null,
@@ -110,6 +118,7 @@ async function main(): Promise<void> {
 
   const sidecars = await startPackagedSidecars(runtime, paths, {
     appVersion: config.appVersion,
+    amrProfile: config.amrProfile,
     daemonCliEntry: config.daemonCliEntry,
     daemonSidecarEntry: config.daemonSidecarEntry,
     nodeCommand: config.nodeCommand,
diff --git a/apps/packaged/src/index.ts b/apps/packaged/src/index.ts
index 198b1f347..465a0241f 100644
--- a/apps/packaged/src/index.ts
+++ b/apps/packaged/src/index.ts
@@ -102,6 +102,7 @@ async function main(): Promise<void> {
 
   const sidecars = await startPackagedSidecars(runtime, paths, {
     appVersion: config.appVersion,
+    amrProfile: config.amrProfile,
     daemonCliEntry: config.daemonCliEntry,
     daemonSidecarEntry: config.daemonSidecarEntry,
     nodeCommand: config.nodeCommand,
diff --git a/apps/packaged/src/sidecars.ts b/apps/packaged/src/sidecars.ts
index 909131f68..9bc6cc489 100644
--- a/apps/packaged/src/sidecars.ts
+++ b/apps/packaged/src/sidecars.ts
@@ -1,5 +1,5 @@
 import { spawn, type ChildProcess } from "node:child_process";
-import { mkdir, open, type FileHandle } from "node:fs/promises";
+import { access, mkdir, open, type FileHandle } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { delimiter, dirname, join } from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
@@ -95,6 +95,43 @@ function logPathFor(paths: PackagedNamespacePaths, app: AppKey): string {
   return join(paths.logsRoot, app, "latest.log");
 }
 
+async function pathExists(path: string): Promise<boolean> {
+  try {
+    await access(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function resolvePackagedElectronNodeCommand(
+  execPath = process.execPath,
+  platform = process.platform,
+): Promise<string> {
+  if (platform !== "darwin") return execPath;
+
+  const executableName = execPath.split("/").pop();
+  if (executableName == null || executableName.length === 0) return execPath;
+
+  const marker = "/Contents/MacOS/";
+  const markerIndex = execPath.lastIndexOf(marker);
+  if (markerIndex === -1) return execPath;
+
+  const appPath = execPath.slice(0, markerIndex);
+  const helperName = `${executableName} Helper`;
+  const helperPath = join(
+    appPath,
+    "Contents",
+    "Frameworks",
+    `${helperName}.app`,
+    "Contents",
+    "MacOS",
+    helperName,
+  );
+
+  return (await pathExists(helperPath)) ? helperPath : execPath;
+}
+
 async function openLog(path: string): Promise<FileHandle> {
   await mkdir(dirname(path), { recursive: true });
   return await open(path, "w");
@@ -233,6 +270,7 @@ function createPackagedDaemonManagedPathEnv(
 
 export type PackagedDaemonSpawnEnvOptions = {
   appVersion: string | null;
+  amrProfile?: string | null;
   daemonCliEntry: string | null;
   /**
    * PR #974 round-5 (lefarcen P2): only pin the daemon's import-folder
@@ -276,6 +314,9 @@ export function buildPackagedDaemonSpawnEnv(
     // fallback, but packaged runtime must not rely on path inference from
     // Electron userData, bundle names, or ports.
     ...createPackagedDaemonManagedPathEnv(paths),
+    ...(options.amrProfile == null || options.amrProfile.length === 0
+      ? {}
+      : { OPEN_DESIGN_AMR_PROFILE: options.amrProfile }),
     ...(options.appVersion == null ? {} : { OD_APP_VERSION: options.appVersion }),
     ...(options.telemetryRelayUrl == null || options.telemetryRelayUrl.length === 0
       ? {}
@@ -336,7 +377,7 @@ async function spawnSidecarChild(options: {
     },
     stamp,
   });
-  const command = options.nodeCommand ?? process.execPath;
+  const command = options.nodeCommand ?? (await resolvePackagedElectronNodeCommand());
   const child = spawn(
     command,
     [options.entryPath, ...createProcessStampArgs(stamp, OPEN_DESIGN_SIDECAR_CONTRACT)],
@@ -375,6 +416,7 @@ export async function startPackagedSidecars(
   paths: PackagedNamespacePaths,
   options: {
     appVersion: string | null;
+    amrProfile: string | null;
     daemonCliEntry: string | null;
     daemonSidecarEntry: string | null;
     nodeCommand: string | null;
@@ -414,6 +456,7 @@ export async function startPackagedSidecars(
       entryPath: options.daemonSidecarEntry ?? resolveSidecarEntry("@open-design/daemon", "sidecar"),
       env: buildPackagedDaemonSpawnEnv(paths, {
         appVersion: options.appVersion,
+        amrProfile: options.amrProfile,
         daemonCliEntry: options.daemonCliEntry,
         legacyDataDir: process.env.OD_LEGACY_DATA_DIR ?? null,
         requireDesktopAuth: options.requireDesktopAuth,
diff --git a/apps/packaged/tests/paths.test.ts b/apps/packaged/tests/paths.test.ts
index 45fe9ec4a..115bdc9b9 100644
--- a/apps/packaged/tests/paths.test.ts
+++ b/apps/packaged/tests/paths.test.ts
@@ -16,6 +16,7 @@ function stubPlatform(value: NodeJS.Platform): () => void {
 
 function fakeConfig(): PackagedConfig {
   return {
+    amrProfile: null,
     appVersion: null,
     daemonCliEntry: null,
     daemonSidecarEntry: null,
@@ -55,6 +56,7 @@ describe("resolvePackagedNamespacePaths", () => {
 
   it("rejects namespace overrides that would escape the namespace base root", () => {
     const config: PackagedConfig = {
+      amrProfile: null,
       appVersion: "1.2.3",
       daemonCliEntry: null,
       daemonSidecarEntry: null,
diff --git a/apps/packaged/tests/sidecars.test.ts b/apps/packaged/tests/sidecars.test.ts
index 42ae84b46..aa1f3becc 100644
--- a/apps/packaged/tests/sidecars.test.ts
+++ b/apps/packaged/tests/sidecars.test.ts
@@ -16,15 +16,16 @@
  * @see https://github.com/nexu-io/open-design/issues/710
  */
 import { EventEmitter } from 'node:events';
-import { mkdtempSync, rmSync } from 'node:fs';
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { delimiter, join } from 'node:path';
+import { delimiter, dirname, join } from 'node:path';
 import { describe, expect, it } from 'vitest';
 
 import {
   buildPackagedDaemonSpawnEnv,
   resolveDaemonStatusTimeoutMs,
   resolvePackagedChildBaseEnv,
+  resolvePackagedElectronNodeCommand,
   resolvePackagedPathEnv,
   waitForStatus,
 } from '../src/sidecars.js';
@@ -124,6 +125,53 @@ describe('packaged child Vite+ environment forwarding', () => {
   });
 });
 
+describe('resolvePackagedElectronNodeCommand', () => {
+  it('uses the hidden Electron helper as the macOS Electron-as-Node command when available', async () => {
+    const root = mkdtempSync(join(tmpdir(), 'od-packaged-electron-helper-'));
+    try {
+      const appPath = join(root, 'Open Design.app');
+      const execPath = join(appPath, 'Contents', 'MacOS', 'Open Design');
+      const helperPath = join(
+        appPath,
+        'Contents',
+        'Frameworks',
+        'Open Design Helper.app',
+        'Contents',
+        'MacOS',
+        'Open Design Helper',
+      );
+
+      mkdirSync(join(appPath, 'Contents', 'MacOS'), { recursive: true });
+      mkdirSync(dirname(helperPath), { recursive: true });
+      writeFileSync(execPath, '#!/bin/sh\n', 'utf8');
+      writeFileSync(helperPath, '#!/bin/sh\n', 'utf8');
+
+      await expect(resolvePackagedElectronNodeCommand(execPath, 'darwin')).resolves.toBe(helperPath);
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it('falls back to the main executable when the macOS helper is unavailable', async () => {
+    const root = mkdtempSync(join(tmpdir(), 'od-packaged-no-electron-helper-'));
+    try {
+      const execPath = join(root, 'Open Design.app', 'Contents', 'MacOS', 'Open Design');
+      mkdirSync(dirname(execPath), { recursive: true });
+      writeFileSync(execPath, '#!/bin/sh\n', 'utf8');
+
+      await expect(resolvePackagedElectronNodeCommand(execPath, 'darwin')).resolves.toBe(execPath);
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it('keeps the main executable on non-macOS platforms', async () => {
+    const execPath = '/opt/Open Design/open-design';
+
+    await expect(resolvePackagedElectronNodeCommand(execPath, 'linux')).resolves.toBe(execPath);
+  });
+});
+
 /**
  * Build a child-process stand-in that satisfies the `watch.child`
  * shape `waitForStatus` consumes. We only use `once('exit')`,
@@ -252,6 +300,17 @@ describe('buildPackagedDaemonSpawnEnv', () => {
     );
   });
 
+  it('forwards the packaged AMR profile to the daemon when configured', () => {
+    const env = buildPackagedDaemonSpawnEnv(fakePaths(), {
+      appVersion: null,
+      amrProfile: 'test',
+      daemonCliEntry: null,
+      legacyDataDir: null,
+      requireDesktopAuth: true,
+    });
+    expect(env.OPEN_DESIGN_AMR_PROFILE).toBe('test');
+  });
+
   it('forwards POSTHOG_KEY/POSTHOG_HOST to the daemon spawn env when baked into the bundle', () => {
     const env = buildPackagedDaemonSpawnEnv(fakePaths(), {
       appVersion: null,
diff --git a/apps/web/package.json b/apps/web/package.json
index b64106e1a..095f95336 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/web",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/apps/web/public/agent-icons/amr.svg b/apps/web/public/agent-icons/amr.svg
new file mode 100644
index 000000000..ac59261b2
--- /dev/null
+++ b/apps/web/public/agent-icons/amr.svg
@@ -0,0 +1,8 @@
+<svg width="61" height="61" viewBox="0 0 61 61" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M59.8711 30.5C59.8711 56.0969 55.968 60 30.3711 60C4.7742 60 0.871094 56.0969 0.871094 30.5C0.871094 4.9031 4.7742 1 30.3711 1C55.968 1 59.8711 4.9031 59.8711 30.5Z" fill="#87EA5C"/>
+<path d="M34.5271 26.9915C34.4226 27.6369 33.6061 27.8574 33.1978 27.3504L20.4888 11.5716C19.9658 10.9223 20.7318 10.0242 21.4533 10.4408L30.951 15.9243L36.3612 6.55362C36.7806 5.82706 37.889 6.21903 37.7551 7.04658L34.5271 26.9915Z" fill="#237F00"/>
+<path d="M34.9157 33.3782C34.2696 33.4783 33.8076 32.7699 34.1636 32.2249L45.2428 15.262C45.6988 14.564 46.7896 15.0149 46.6164 15.8299L44.3362 26.5572L54.9201 28.8069C55.7407 28.9813 55.7104 30.1565 54.882 30.2849L34.9157 33.3782Z" fill="#237F00"/>
+<path d="M28.9603 35.7227C28.6654 35.1391 29.1964 34.4809 29.8248 34.651L49.3811 39.9461C50.1858 40.1641 50.094 41.3408 49.2654 41.4279L38.3585 42.5743L39.4896 53.3353C39.5773 54.1697 38.4502 54.504 38.0721 53.7558L28.9603 35.7227Z" fill="#237F00"/>
+<path d="M24.8915 30.7822C25.3554 30.3214 26.1455 30.623 26.1779 31.2732L27.1852 51.5086C27.2266 52.3413 26.079 52.6177 25.7402 51.8565L21.2795 41.8377L11.3946 46.2387C10.6282 46.5799 9.96197 45.6114 10.5567 45.0206L24.8915 30.7822Z" fill="#237F00"/>
+<path d="M28.3305 25.3842C28.9121 25.683 28.8694 26.5277 28.261 26.7594L9.32726 33.9705C8.54806 34.2672 7.93066 33.2612 8.54982 32.7037L16.6999 25.3653L9.45967 17.3243C8.8983 16.7008 9.61357 15.7679 10.3592 16.1509L28.3305 25.3842Z" fill="#237F00"/>
+</svg>
diff --git a/apps/web/public/official_badge.svg b/apps/web/public/official_badge.svg
new file mode 100644
index 000000000..4ed1fb645
--- /dev/null
+++ b/apps/web/public/official_badge.svg
@@ -0,0 +1,48 @@
+<svg width="184" height="64" viewBox="0 0 184 64" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="官方角标">
+  <defs>
+    <linearGradient id="pillFill" x1="28" y1="6" x2="166" y2="56" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#5B3728"/>
+      <stop offset="0.48" stop-color="#3C2A24"/>
+      <stop offset="1" stop-color="#241D1B"/>
+    </linearGradient>
+    <linearGradient id="pillStroke" x1="22" y1="4" x2="168" y2="60" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#D48A5B"/>
+      <stop offset="0.45" stop-color="#8C543A"/>
+      <stop offset="1" stop-color="#3A2620"/>
+    </linearGradient>
+    <linearGradient id="shieldFill" x1="27" y1="11" x2="57" y2="50" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#FFD19A"/>
+      <stop offset="0.35" stop-color="#D9784C"/>
+      <stop offset="1" stop-color="#8B412E"/>
+    </linearGradient>
+    <linearGradient id="shieldStroke" x1="25" y1="8" x2="59" y2="52" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#FFE0B8"/>
+      <stop offset="1" stop-color="#9B5137"/>
+    </linearGradient>
+    <linearGradient id="textFill" x1="80" y1="19" x2="80" y2="45" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#FFE4C7"/>
+      <stop offset="0.42" stop-color="#F8A56E"/>
+      <stop offset="1" stop-color="#D6754E"/>
+    </linearGradient>
+    <filter id="softShadow" x="0" y="0" width="184" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feDropShadow dx="0" dy="6" stdDeviation="8" flood-color="#000000" flood-opacity="0.28"/>
+    </filter>
+    <filter id="innerGlow" x="18" y="8" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feDropShadow dx="0" dy="0" stdDeviation="2" flood-color="#FFD09A" flood-opacity="0.45"/>
+    </filter>
+  </defs>
+
+  <g filter="url(#softShadow)">
+    <rect x="23" y="8" width="148" height="48" rx="24" fill="url(#pillFill)" stroke="url(#pillStroke)" stroke-width="2"/>
+    <rect x="27" y="12" width="140" height="40" rx="20" stroke="#FFFFFF" stroke-opacity="0.06"/>
+
+    <g filter="url(#innerGlow)">
+      <path d="M42 11.5C42 11.5 29 15.4 29 17.7V30.5C29 40.8 37.2 47.6 42 49.7C46.8 47.6 55 40.8 55 30.5V17.7C55 15.4 42 11.5 42 11.5Z" fill="url(#shieldFill)" stroke="url(#shieldStroke)" stroke-width="2"/>
+      <path d="M36.2 30.9L40.1 34.8L48.8 25.2" stroke="#FFF3E0" stroke-width="4.2" stroke-linecap="round" stroke-linejoin="round"/>
+      <path d="M36.2 30.9L40.1 34.8L48.8 25.2" stroke="#7A3527" stroke-opacity="0.18" stroke-width="5.8" stroke-linecap="round" stroke-linejoin="round"/>
+      <path d="M36.2 30.9L40.1 34.8L48.8 25.2" stroke="#FFF3E0" stroke-width="4.2" stroke-linecap="round" stroke-linejoin="round"/>
+    </g>
+
+    <text x="72" y="40" font-family="-apple-system, BlinkMacSystemFont, 'SF Pro Display', 'PingFang SC', 'Microsoft YaHei', sans-serif" font-size="26" font-weight="800" letter-spacing="1.5" fill="url(#textFill)">官方</text>
+  </g>
+</svg>
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index 42b1eda7d..817e5c87a 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -32,6 +32,7 @@ import {
   switchApiProtocolConfig,
   updateCurrentApiProtocolConfig,
   type SettingsSection,
+  type SettingsHighlight,
 } from './components/SettingsDialog';
 import { PrivacyConsentModal } from './components/PrivacyConsentModal';
 import {
@@ -193,6 +194,7 @@ export function App() {
   const [settingsOpen, setSettingsOpen] = useState(false);
   const [settingsWelcome, setSettingsWelcome] = useState(false);
   const [settingsInitialSection, setSettingsInitialSection] = useState<SettingsSection>('execution');
+  const [settingsHighlight, setSettingsHighlight] = useState<SettingsHighlight>(null);
   const [integrationInitialTab, setIntegrationInitialTab] = useState<IntegrationTab>('mcp');
   const [daemonLive, setDaemonLive] = useState(false);
   const [agents, setAgents] = useState<AgentInfo[]>([]);
@@ -1160,7 +1162,10 @@ export function App() {
     };
   }, [route, activeProject, projects, daemonLive]);
 
-  const openSettings = useCallback((section: SettingsSection = 'execution') => {
+  const openSettings = useCallback((
+    section: SettingsSection = 'execution',
+    opts?: { highlight?: SettingsHighlight },
+  ) => {
     if (section === 'composio' || section === 'mcpClient' || section === 'integrations') {
       setIntegrationInitialTab(
         section === 'composio'
@@ -1174,9 +1179,17 @@ export function App() {
     }
     setSettingsWelcome(false);
     setSettingsInitialSection(section);
+    setSettingsHighlight(opts?.highlight ?? null);
     setSettingsOpen(true);
   }, []);
 
+  // Entry point from the failed-run AMR nudge: open Settings on the execution
+  // section and flag the AMR agent card for a one-shot scroll-into-view +
+  // highlight (and a sign-in coachmark when not yet authorized).
+  const openAmrSettings = useCallback(() => {
+    openSettings('execution', { highlight: 'amr' });
+  }, [openSettings]);
+
   const openPetSettings = useCallback(() => {
     setSettingsWelcome(false);
     setSettingsInitialSection('pet');
@@ -1379,6 +1392,7 @@ export function App() {
         onAgentModelChange={handleAgentModelChange}
         onRefreshAgents={refreshAgents}
         onOpenSettings={openSettings}
+        onOpenAmrSettings={openAmrSettings}
         onOpenMcpSettings={openMcpSettings}
         onAdoptPetInline={handleAdoptPet}
         onTogglePet={handleTogglePet}
@@ -1495,10 +1509,12 @@ export function App() {
         <SettingsDialog
           initial={config}
           agents={agents}
+          agentsLoading={agentsLoading}
           daemonLive={daemonLive}
           appVersionInfo={appVersionInfo}
           welcome={settingsWelcome}
           initialSection={settingsInitialSection}
+          initialHighlight={settingsHighlight}
           composioConfigLoading={composioConfigLoading}
           onPersist={handleConfigPersist}
           onPersistComposioKey={handleConfigPersistComposioKey}
@@ -1516,6 +1532,7 @@ export function App() {
               setConfig(next);
             }
             setSettingsOpen(false);
+            setSettingsHighlight(null);
           }}
           onRefreshAgents={refreshAgents}
           onSkillsRefresh={refreshSkills}
diff --git a/apps/web/src/analytics/events.ts b/apps/web/src/analytics/events.ts
index 525aff845..66590ea9f 100644
--- a/apps/web/src/analytics/events.ts
+++ b/apps/web/src/analytics/events.ts
@@ -48,6 +48,8 @@ import type {
   IntegrationsSkillsTabClickProps,
   IntegrationsUseEverywhereTabClickProps,
   ChatPanelClickProps,
+  RunFailedToastClickProps,
+  RunFailedToastSurfaceViewProps,
   ChatPanelResourcesPopoverClickProps,
   FileManagerClickProps,
   ArtifactToolbarClickProps,
@@ -160,6 +162,20 @@ export function trackAssistantFeedbackReasonPanelSurfaceView(
   send(track, 'surface_view', props);
 }
 
+export function trackRunFailedToastSurfaceView(
+  track: Track,
+  props: RunFailedToastSurfaceViewProps,
+): void {
+  send(track, 'surface_view', props);
+}
+
+export function trackRunFailedToastGoAmrClick(
+  track: Track,
+  props: RunFailedToastClickProps,
+): void {
+  send(track, 'ui_click', props);
+}
+
 // ---- ui_click (home) -----------------------------------------------------
 
 export function trackHomeNavClick(
diff --git a/apps/web/src/components/AgentIcon.tsx b/apps/web/src/components/AgentIcon.tsx
index 984a871fa..b534d0281 100644
--- a/apps/web/src/components/AgentIcon.tsx
+++ b/apps/web/src/components/AgentIcon.tsx
@@ -12,6 +12,7 @@ interface Props {
 // only ships a rasterised icon on devin.ai). New brand: drop the optimised
 // file in that folder and add the id here.
 const ICON_EXT: Record<string, 'svg' | 'png'> = {
+  amr: 'svg',
   claude: 'svg',
   codex: 'svg',
   gemini: 'svg',
diff --git a/apps/web/src/components/AmrGuidance.tsx b/apps/web/src/components/AmrGuidance.tsx
new file mode 100644
index 000000000..81ee5689b
--- /dev/null
+++ b/apps/web/src/components/AmrGuidance.tsx
@@ -0,0 +1,96 @@
+import { useEffect, useRef } from 'react';
+import { useT } from '../i18n';
+import { useAnalytics } from '../analytics/provider';
+import {
+  trackRunFailedToastGoAmrClick,
+  trackRunFailedToastSurfaceView,
+} from '../analytics/events';
+import type { TrackingProjectKind } from '@open-design/contracts/analytics';
+
+export interface AmrGuidanceProps {
+  errorCode: string;
+  projectId: string;
+  projectKind: TrackingProjectKind | null;
+  conversationId: string | null;
+  assistantMessageId: string;
+  runId: string | null;
+  // Switch the run to AMR and retry. The `ui_click` analytics event is fired
+  // here first; the host performs the switch + arms the auto-retry.
+  onActivate: () => void;
+}
+
+// Theme-color promotion card under a failed run's gray error card, shown when a
+// non-AMR agent hits a model/auth/quota wall. Offers a one-click switch to
+// Open Design's hosted AMR with auto-retry. Fires `surface_view`
+// (element=run_failed_toast) once on mount and `ui_click` (element=go_amr) on
+// the action. `useAnalytics()` returns a no-op stub outside the provider, so
+// this is safe in isolated tests.
+export function AmrGuidance({
+  errorCode,
+  projectId,
+  projectKind,
+  conversationId,
+  assistantMessageId,
+  runId,
+  onActivate,
+}: AmrGuidanceProps) {
+  const t = useT();
+  const analytics = useAnalytics();
+  const firedRef = useRef(false);
+  useEffect(() => {
+    if (firedRef.current) return;
+    firedRef.current = true;
+    trackRunFailedToastSurfaceView(analytics.track, {
+      page_name: 'chat_panel',
+      area: 'chat_panel',
+      element: 'run_failed_toast',
+      error_code: errorCode,
+      project_id: projectId,
+      project_kind: projectKind,
+      conversation_id: conversationId,
+      assistant_message_id: assistantMessageId,
+      run_id: runId,
+    });
+  }, [
+    analytics.track,
+    errorCode,
+    projectId,
+    projectKind,
+    conversationId,
+    assistantMessageId,
+    runId,
+  ]);
+
+  return (
+    <div className="amr-card amr-card--switch" data-testid="amr-guidance">
+      <div className="amr-card__head">
+        <span className="amr-card__icon" aria-hidden="true">
+          !
+        </span>
+        <strong className="amr-card__title">{t('chat.amrCard.switchTitle')}</strong>
+      </div>
+      <p className="amr-card__body">{t('chat.amrCard.switchBody')}</p>
+      <div className="amr-card__chips" aria-hidden="true">
+        <span className="amr-card__chip">{t('chat.amrCard.chipOfficial')}</span>
+        <span className="amr-card__chip">{t('chat.amrCard.chipNoKey')}</span>
+        <span className="amr-card__chip">{t('chat.amrCard.chipAutoRetry')}</span>
+      </div>
+      <div className="amr-card__actions">
+        <button
+          type="button"
+          className="amr-card__cta"
+          onClick={() => {
+            trackRunFailedToastGoAmrClick(analytics.track, {
+              page_name: 'chat_panel',
+              area: 'chat_panel',
+              element: 'go_amr',
+            });
+            onActivate();
+          }}
+        >
+          {t('chat.amrCard.switchCta')}
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/AmrLoginPill.tsx b/apps/web/src/components/AmrLoginPill.tsx
new file mode 100644
index 000000000..f456d2eea
--- /dev/null
+++ b/apps/web/src/components/AmrLoginPill.tsx
@@ -0,0 +1,450 @@
+import { useCallback, useEffect, useRef, useState, type MouseEvent } from 'react';
+import {
+  cancelVelaLogin,
+  fetchVelaLoginStatus,
+  startVelaLogin,
+  velaLogout,
+  type VelaLoginStatus,
+} from '../providers/daemon';
+import { useI18n } from '../i18n';
+import {
+  AMR_LOGIN_STATUS_EVENT,
+  AMR_LOGIN_POLL_INTERVAL_MS,
+  AMR_LOGIN_STARTUP_SETTLE_MS,
+  amrLoginPollOutcome,
+  amrLoginStatusEventReason,
+  notifyAmrLoginStatusChanged,
+} from './amrLoginPolling';
+
+interface AmrLoginPillProps {
+  className?: string;
+  hideSignedOutStatus?: boolean;
+  hideSignedInStatus?: boolean;
+  initialStatus?: VelaLoginStatus | null;
+  skipInitialRefresh?: boolean;
+  signInLabel?: string;
+  revealPendingCancelAction?: boolean;
+  onStatusChange?: (status: VelaLoginStatus | null) => void;
+}
+
+export type AmrAccountControlStatus =
+  | 'signed-out'
+  | 'signing-in'
+  | 'canceled'
+  | 'signed-in'
+  | 'error';
+
+export interface AmrAccountControlProps {
+  status: AmrAccountControlStatus;
+  className?: string;
+  compact?: boolean;
+  email?: string;
+  errorMessage?: string | null;
+  profile?: string;
+  showProfileBadge?: boolean;
+  showSignInAction?: boolean;
+  hideSignedOutStatus?: boolean;
+  hideSignedInStatus?: boolean;
+  signInLabel?: string;
+  showCancelSignInAction?: boolean;
+  onSignIn?: (event: MouseEvent<HTMLButtonElement>) => void;
+  onSignOut?: (event: MouseEvent<HTMLButtonElement>) => void;
+  onCancelSignIn?: (event: MouseEvent<HTMLButtonElement>) => void;
+  signInDisabled?: boolean;
+  signOutDisabled?: boolean;
+  cancelSignInDisabled?: boolean;
+}
+
+const AMR_CANCELED_RESET_MS = 1500;
+
+function closeAmrActivationWindowBestEffort(): boolean {
+  if (typeof window === 'undefined') return false;
+  if (window.opener == null) return false;
+  try {
+    window.close();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function profileBadgeLabel(profile: string | undefined): string | null {
+  if (profile === 'test') return 'TEST';
+  if (profile === 'local') return 'LOCAL';
+  return null;
+}
+
+function classNames(...names: Array<string | false | null | undefined>): string {
+  return names.filter(Boolean).join(' ');
+}
+
+export function AmrAccountControl({
+  status,
+  className,
+  compact = false,
+  email = '',
+  profile,
+  showProfileBadge = false,
+  showSignInAction = true,
+  hideSignedOutStatus = false,
+  hideSignedInStatus = false,
+  signInLabel,
+  showCancelSignInAction = false,
+  onSignIn,
+  onSignOut,
+  onCancelSignIn,
+  signInDisabled = false,
+  signOutDisabled = false,
+  cancelSignInDisabled = false,
+}: AmrAccountControlProps) {
+  const { t } = useI18n();
+  const badgeLabel = showProfileBadge ? profileBadgeLabel(profile) : null;
+  const isSignedIn = status === 'signed-in';
+  const isSigningIn = status === 'signing-in';
+  const isCanceled = status === 'canceled';
+  const hasError = status === 'error';
+  const statusText = isSignedIn
+    ? hideSignedInStatus
+      ? ''
+      : email || t('settings.amrSignedIn')
+    : isSigningIn
+      ? t('settings.amrSigningIn')
+      : isCanceled
+        ? t('designs.status.canceled')
+      : hideSignedOutStatus
+        ? ''
+        : t('settings.amrNotSignedIn');
+  const canSignIn = showSignInAction && (status === 'signed-out' || hasError);
+
+  return (
+    <div
+      className={classNames(
+        'amr-account-control',
+        compact && 'amr-account-control--compact',
+        `amr-account-control--${status}`,
+        className,
+      )}
+      role="group"
+      aria-label={t('settings.amrAccountStatus')}
+    >
+      {statusText ? (
+        <span className="amr-account-control__status">{statusText}</span>
+      ) : null}
+      {isSignedIn && onSignOut ? (
+        <button
+          type="button"
+          className="amr-account-control__action"
+          disabled={signOutDisabled}
+          onClick={onSignOut}
+          title={email || undefined}
+          aria-label={t('settings.amrLogout')}
+        >
+          {signOutDisabled ? t('settings.amrLoggingOut') : t('settings.amrLogout')}
+        </button>
+      ) : null}
+      {isSigningIn && showCancelSignInAction && onCancelSignIn ? (
+        <button
+          type="button"
+          className="amr-account-control__action"
+          disabled={cancelSignInDisabled}
+          onClick={onCancelSignIn}
+          aria-label={t('common.cancel')}
+        >
+          {t('common.cancel')}
+        </button>
+      ) : null}
+      {canSignIn ? (
+        <button
+          type="button"
+          className="amr-account-control__action"
+          disabled={signInDisabled}
+          onClick={onSignIn}
+        >
+          {signInLabel ?? t('settings.amrSignIn')}
+        </button>
+      ) : null}
+      {badgeLabel ? (
+        <span className="amr-login-pill-badge">{badgeLabel}</span>
+      ) : null}
+      {hasError ? (
+        <span className="amr-account-control__error" role="alert">
+          {t('settings.amrLoginErrorCompact')}
+        </span>
+      ) : null}
+    </div>
+  );
+}
+
+// AMR-specific login pill that lives as a sibling inside the installed
+// agent card. The pill polls `/api/integrations/vela/status` after a Sign-in
+// click until the daemon reports loggedIn=true.
+export function AmrLoginPill({
+  className,
+  hideSignedOutStatus = false,
+  hideSignedInStatus = false,
+  initialStatus = null,
+  skipInitialRefresh = false,
+  signInLabel,
+  revealPendingCancelAction = false,
+  onStatusChange,
+}: AmrLoginPillProps) {
+  const { t } = useI18n();
+  const [status, setStatus] = useState<VelaLoginStatus | null>(initialStatus);
+  const [pending, setPending] = useState<null | 'login' | 'logout' | 'cancel'>(null);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [canceledVisible, setCanceledVisible] = useState(false);
+  const pollRef = useRef<number | null>(null);
+  const loginStartedAtRef = useRef<number | null>(null);
+  const loginPendingRef = useRef(false);
+
+  const stopPolling = useCallback(() => {
+    if (pollRef.current !== null) {
+      window.clearInterval(pollRef.current);
+      pollRef.current = null;
+    }
+  }, []);
+
+  const refresh = useCallback(async () => {
+    const next = await fetchVelaLoginStatus();
+    if (next) setStatus(next);
+    return next;
+  }, []);
+
+  useEffect(() => {
+    if (!skipInitialRefresh) void refresh();
+    return () => {
+      loginPendingRef.current = false;
+      loginStartedAtRef.current = null;
+      stopPolling();
+    };
+  }, [refresh, skipInitialRefresh, stopPolling]);
+
+  useEffect(() => {
+    setStatus(initialStatus);
+  }, [initialStatus]);
+
+  useEffect(() => {
+    if (!canceledVisible) return;
+    const timeout = window.setTimeout(() => {
+      setCanceledVisible(false);
+    }, AMR_CANCELED_RESET_MS);
+    return () => window.clearTimeout(timeout);
+  }, [canceledVisible]);
+
+  useEffect(() => {
+    onStatusChange?.(status);
+  }, [onStatusChange, status]);
+
+  const startPolling = useCallback((startedAt = Date.now()) => {
+    stopPolling();
+    loginStartedAtRef.current = startedAt;
+    const tick = async () => {
+      const next = await refresh();
+      const outcome = amrLoginPollOutcome(next, startedAt);
+      if (outcome === 'signed-in') {
+        stopPolling();
+        loginStartedAtRef.current = null;
+        loginPendingRef.current = false;
+        setPending(null);
+        return;
+      }
+      if (outcome === 'stopped' || outcome === 'timed-out') {
+        stopPolling();
+        if (outcome === 'timed-out') {
+          void cancelVelaLogin().then(() =>
+            notifyAmrLoginStatusChanged('login-canceled'),
+          );
+        }
+        loginStartedAtRef.current = null;
+        loginPendingRef.current = false;
+        setPending(null);
+        setErrorMessage(t('settings.amrLoginErrorCompact'));
+      }
+    };
+    pollRef.current = window.setInterval(() => {
+      void tick();
+    }, AMR_LOGIN_POLL_INTERVAL_MS);
+  }, [refresh, stopPolling, t]);
+
+  useEffect(() => {
+    const onStatusChange = (event: Event) => {
+      const reason = amrLoginStatusEventReason(event);
+      if (reason === 'login-started') {
+        const startedAt = Date.now();
+        loginStartedAtRef.current = startedAt;
+        setErrorMessage(null);
+        setPending('login');
+        startPolling(startedAt);
+      } else if (reason === 'login-canceled') {
+        loginStartedAtRef.current = null;
+        loginPendingRef.current = false;
+        stopPolling();
+        setPending(null);
+        // Skip the daemon refresh below. `cancelVelaLogin()` only sends
+        // SIGTERM (escalating to SIGKILL after 2s) and keeps the child
+        // in `activeLoginProcs` until it actually exits, so an
+        // immediate `/api/integrations/vela/status` read can legally
+        // still return `loginInFlight: true`. Falling through to the
+        // refresh + restart-polling branch below would bounce the pill
+        // back into 'Signing in…' and could surface the timeout/error
+        // path even though the user already canceled. Trust the cancel
+        // locally on every subscribed pill instance instead — the next
+        // explicit refresh (mount, user interaction, or a
+        // `status-changed` event) will pick up the daemon's confirmed
+        // state once the child has actually exited.
+        setStatus((current) => (
+          current ? { ...current, loginInFlight: false } : current
+        ));
+        return;
+      }
+      void refresh().then((next) => {
+        if (!next) return;
+        if (next.loggedIn) {
+          stopPolling();
+          loginStartedAtRef.current = null;
+          loginPendingRef.current = false;
+          setPending(null);
+          setCanceledVisible(false);
+          setErrorMessage(null);
+          return;
+        }
+        if (next.loginInFlight) {
+          setErrorMessage(null);
+          setPending('login');
+          startPolling();
+          return;
+        }
+        const pendingStartup =
+          loginStartedAtRef.current !== null &&
+          Date.now() - loginStartedAtRef.current < AMR_LOGIN_STARTUP_SETTLE_MS;
+        if (!pendingStartup) {
+          loginStartedAtRef.current = null;
+          loginPendingRef.current = false;
+          setPending(null);
+        }
+      });
+    };
+    window.addEventListener(AMR_LOGIN_STATUS_EVENT, onStatusChange);
+    return () => {
+      window.removeEventListener(AMR_LOGIN_STATUS_EVENT, onStatusChange);
+    };
+  }, [refresh, startPolling, stopPolling]);
+
+  const handleLogin = useCallback(
+    async (event: MouseEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      if (loginPendingRef.current) return;
+      loginPendingRef.current = true;
+      const startedAt = Date.now();
+      loginStartedAtRef.current = startedAt;
+      setErrorMessage(null);
+      setPending('login');
+      const result = await startVelaLogin();
+      if (!result.ok && !result.alreadyRunning) {
+        loginStartedAtRef.current = null;
+        loginPendingRef.current = false;
+        setPending(null);
+        setErrorMessage(result.error || t('settings.amrLoginErrorCompact'));
+        return;
+      }
+      notifyAmrLoginStatusChanged('login-started');
+      startPolling(startedAt);
+    },
+    [startPolling, t],
+  );
+
+  const handleCancelLogin = useCallback(
+    async (event: MouseEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      stopPolling();
+      setErrorMessage(null);
+      setPending('cancel');
+      const result = await cancelVelaLogin();
+      closeAmrActivationWindowBestEffort();
+      loginStartedAtRef.current = null;
+      loginPendingRef.current = false;
+      if (!result.ok) {
+        setPending(null);
+        setErrorMessage(t('settings.amrLoginErrorCompact'));
+        return;
+      }
+      setStatus((current) => (
+        current
+          ? { ...current, loggedIn: false, loginInFlight: false, user: null }
+          : {
+              loggedIn: false,
+              loginInFlight: false,
+              profile: 'default',
+              user: null,
+              configPath: '',
+            }
+      ));
+      setPending(null);
+      setCanceledVisible(true);
+      notifyAmrLoginStatusChanged('login-canceled');
+    },
+    [stopPolling, t],
+  );
+
+  const handleLogout = useCallback(
+    async (event: MouseEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      setErrorMessage(null);
+      setPending('logout');
+      const result = await velaLogout();
+      loginStartedAtRef.current = null;
+      loginPendingRef.current = false;
+      setPending(null);
+      if (!result.ok) {
+        setErrorMessage(t('settings.amrLoginErrorCompact'));
+        return;
+      }
+      await refresh();
+      notifyAmrLoginStatusChanged('status-changed');
+    },
+    [refresh, t],
+  );
+
+  const loggedIn = status?.loggedIn === true;
+  const userEmail = status?.user?.email ?? '';
+  const loginInFlight =
+    pending === 'login' || (status?.loggedIn !== true && status?.loginInFlight === true);
+  const logoutInFlight = pending === 'logout';
+  const cancelInFlight = pending === 'cancel';
+  const accountStatus: AmrAccountControlStatus = errorMessage
+    ? 'error'
+    : loggedIn
+      ? 'signed-in'
+      : canceledVisible
+        ? 'canceled'
+      : loginInFlight
+        ? 'signing-in'
+        : 'signed-out';
+
+  return (
+    <div
+      className={'amr-login-pill' + (className ? ' ' + className : '')}
+      onClick={(event) => event.stopPropagation()}
+      onKeyDown={(event) => event.stopPropagation()}
+    >
+      <AmrAccountControl
+        status={accountStatus}
+        compact
+        email={userEmail}
+        profile={status?.profile}
+        showProfileBadge
+        hideSignedOutStatus={hideSignedOutStatus}
+        hideSignedInStatus={hideSignedInStatus}
+        signInLabel={signInLabel}
+        signInDisabled={loginInFlight}
+        signOutDisabled={logoutInFlight}
+        showCancelSignInAction={revealPendingCancelAction && loginInFlight}
+        cancelSignInDisabled={cancelInFlight}
+        onSignIn={handleLogin}
+        onSignOut={handleLogout}
+        onCancelSignIn={handleCancelLogin}
+        className={loggedIn ? 'amr-login-pill-status' : undefined}
+      />
+    </div>
+  );
+}
diff --git a/apps/web/src/components/AssistantMessage.tsx b/apps/web/src/components/AssistantMessage.tsx
index 708db93b5..443dd73b5 100644
--- a/apps/web/src/components/AssistantMessage.tsx
+++ b/apps/web/src/components/AssistantMessage.tsx
@@ -297,6 +297,10 @@ interface Props {
   // interactivity on this so older forms render as a locked "answered"
   // capsule instead of being re-submittable.
   isLast?: boolean;
+  // Assistant message id whose run-failure error is rendered as ChatPane's
+  // top-level error card; that message's per-message error pill is suppressed
+  // to avoid duplication. Other messages keep their error pill.
+  errorCardOwnerId?: string | null;
   // The user message that immediately follows this assistant turn (if
   // any). Used to detect that a form was already answered so we can
   // render its locked state with the user's picks visible.
@@ -332,6 +336,7 @@ export function AssistantMessage({
   activePluginActionPaths = new Set(),
   hiddenPluginActionPaths = new Set(),
   isLast,
+  errorCardOwnerId = null,
   nextUserContent,
   onSubmitForm,
   onContinueRemainingTasks,
@@ -350,7 +355,9 @@ export function AssistantMessage({
   // above the composer, so we strip any TodoWrite tool-groups out of the
   // per-message flow to avoid the same task list rendering twice.
   const blocks = stripTodoToolGroups(
-    suppressAskUserQuestionFallbackText(buildBlocks(events)),
+    suppressDuplicateQuestionForms(
+      suppressAskUserQuestionFallbackText(buildBlocks(events)),
+    ),
   );
   const fileOps = useMemo(() => deriveFileOps(events), [events]);
   const produced = message.producedFiles ?? [];
@@ -568,8 +575,15 @@ export function AssistantMessage({
               />
             );
           }
-          if (b.kind === "status")
+          if (b.kind === "status") {
+            // Suppress this message's gray error pill ONLY when ChatPane is
+            // rendering the top-level error card for it (the last failed run).
+            // Other failed turns — older history, or once a follow-up makes
+            // this no longer the last assistant message — keep their pill so
+            // the error detail still survives reload / history review.
+            if (b.label === "error" && message.id === errorCardOwnerId) return null;
             return <StatusPill key={i} label={b.label} detail={b.detail} />;
+          }
           return null;
         })}
         {!streaming && displayedProduced.length > 0 && projectId ? (
@@ -1821,11 +1835,52 @@ function StatusPill({
   return (
     <div className="status-pill">
       <span className="status-label">{label}</span>
-      {detail ? <span className="status-detail">{detail}</span> : null}
+      {detail ? <span className="status-detail">{renderStatusDetail(detail)}</span> : null}
     </div>
   );
 }
 
+function renderStatusDetail(detail: string): ReactNode {
+  const segments: ReactNode[] = [];
+  const urlRe = /(https?:\/\/[^\s)<>]+)/g;
+  let lastIndex = 0;
+  let match: RegExpExecArray | null;
+  let key = 0;
+
+  while ((match = urlRe.exec(detail))) {
+    if (match.index > lastIndex) {
+      segments.push(detail.slice(lastIndex, match.index));
+    }
+    const [href, suffix] = splitStatusDetailUrlPunctuation(match[1]!);
+    segments.push(
+      <a
+        key={`url-${key++}`}
+        className="md-link md-link-bare"
+        href={href}
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        {href}
+      </a>,
+    );
+    if (suffix) segments.push(suffix);
+    lastIndex = urlRe.lastIndex;
+  }
+
+  if (lastIndex < detail.length) {
+    segments.push(detail.slice(lastIndex));
+  }
+
+  return <>{segments}</>;
+}
+
+function splitStatusDetailUrlPunctuation(url: string): [string, string] {
+  const match = /([.,!?;:，。！？；：、'"」』】》〉）]+)$/.exec(url);
+  if (!match?.[1]) return [url, ''];
+  const trimmed = url.slice(0, -match[1].length);
+  return trimmed ? [trimmed, match[1]] : [url, ''];
+}
+
 interface ToolItem {
   use: Extract<AgentEvent, { kind: "tool_use" }>;
   result?: Extract<AgentEvent, { kind: "tool_result" }>;
@@ -2096,6 +2151,31 @@ function stripTodoToolGroups(blocks: Block[]): Block[] {
   });
 }
 
+// The prompt asks for one discovery form and then a stop, but LLMs can still
+// emit a tailored discovery form followed by the default Quick brief in the
+// same assistant turn. Keep the first form for each id and drop later repeats.
+function suppressDuplicateQuestionForms(blocks: Block[]): Block[] {
+  const seenFormIds = new Set<string>();
+  return blocks.map((block) => {
+    if (block.kind !== "text") return block;
+    const segments = splitOnQuestionForms(block.text);
+    let changed = false;
+    const nextText = segments
+      .map((segment) => {
+        if (segment.kind === "text") return segment.text;
+        const formKey = segment.form.id.trim().toLowerCase();
+        if (seenFormIds.has(formKey)) {
+          changed = true;
+          return "";
+        }
+        seenFormIds.add(formKey);
+        return segment.raw;
+      })
+      .join("");
+    return changed ? { ...block, text: nextText } : block;
+  });
+}
+
 // Hide text blocks that follow an `AskUserQuestion` tool use in the same
 // assistant message. Claude tends to also write the same questions as
 // markdown text alongside the tool call. The card already shows the
diff --git a/apps/web/src/components/AvatarMenu.tsx b/apps/web/src/components/AvatarMenu.tsx
index 81ae81c23..547b7090b 100644
--- a/apps/web/src/components/AvatarMenu.tsx
+++ b/apps/web/src/components/AvatarMenu.tsx
@@ -22,6 +22,10 @@ interface Props {
   onBack?: () => void;
 }
 
+function displayAgentName(agent: Pick<AgentInfo, 'id' | 'name'>): string {
+  return agent.id === 'amr' ? 'Open Design AMR' : agent.name;
+}
+
 /**
  * Compact settings control at the right of the project header. Click opens a dropdown
  * with current execution mode, the agent picker (when in daemon mode), and
@@ -115,7 +119,15 @@ export function AvatarMenu({
               {config.mode === 'api'
                 ? safeHost(config.baseUrl)
                 : currentAgent
-                  ? `${currentAgent.name}${currentAgent.version ? ` · ${currentAgent.version}` : ''}${currentModelLabel && currentModelId !== 'default' ? ` · ${currentModelLabel}` : ''}`
+                  ? `${displayAgentName(currentAgent)}${
+                      currentAgent.id !== 'amr' && currentAgent.version
+                        ? ` · ${currentAgent.version}`
+                        : ''
+                    }${
+                      currentModelLabel && currentModelId !== 'default'
+                        ? ` · ${currentModelLabel}`
+                        : ''
+                    }`
                   : t('avatar.noAgentSelected')}
             </span>
           </div>
@@ -191,12 +203,12 @@ export function AvatarMenu({
                     }}
                   >
                     <AgentIcon id={a.id} size={18} />
-                    <span>{a.name}</span>
+                    <span>{displayAgentName(a)}</span>
                     {selected ? (
                       <span className="avatar-item-meta">
                         {t('avatar.metaSelected')}
                       </span>
-                    ) : a.version ? (
+                    ) : a.id !== 'amr' && a.version ? (
                       <span className="avatar-item-meta">{a.version}</span>
                     ) : null}
                     {selected ? (
diff --git a/apps/web/src/components/ChatPane.tsx b/apps/web/src/components/ChatPane.tsx
index 21e0c6e7e..31e8017d9 100644
--- a/apps/web/src/components/ChatPane.tsx
+++ b/apps/web/src/components/ChatPane.tsx
@@ -19,6 +19,8 @@ import type { AppConfig, ChatAttachment, ChatCommentAttachment, ChatMessage, Cha
 import { dayKey, dayLabel, exactDateTime, messageTime, relativeTimeLong } from '../utils/chatTime';
 import { commentTargetDisplayName, commentsToAttachments, simplePositionLabel } from '../comments';
 import { AssistantMessage } from './AssistantMessage';
+import { AmrGuidance } from './AmrGuidance';
+import { AMR_RECHARGE_URL, resolveRunFailureUi } from '../runtime/amr-guidance';
 import {
   ChatComposer,
   type ChatComposerHandle,
@@ -277,6 +279,8 @@ interface Props {
   // Composer settings/CLI button forwards to here. The dialog lives in App
   // (it owns the AppConfig lifecycle) so we just pass the open trigger.
   onOpenSettings?: (section?: SettingsSection) => void;
+  onOpenAmrSettings?: () => void;
+  onSwitchToAmrAndRetry?: (failedAssistant: ChatMessage) => void;
   // Same dialog, but landing on the External MCP tab. Forwarded to the
   // composer's `/mcp` slash and MCP picker button.
   onOpenMcpSettings?: () => void;
@@ -371,6 +375,8 @@ export function ChatPane({
   onDeleteConversation,
   onRenameConversation,
   onOpenSettings,
+  onOpenAmrSettings,
+  onSwitchToAmrAndRetry,
   onOpenMcpSettings,
   connectRepoNeeded,
   githubConnected,
@@ -422,6 +428,45 @@ export function ChatPane({
     (m) => m.role === 'assistant' && isActiveRunStatus(m.runStatus),
   );
   const retryAssistant = retryableAssistantMessage(messages, lastAssistantId, streaming);
+  // The failed run's error event lives on the (persisted) assistant message, so
+  // the error card + AMR card survive a reload — unlike the ephemeral global
+  // `error` state. Drive both off this event.
+  const failedRunErrorEvent = (() => {
+    const evs = retryAssistant?.events ?? [];
+    for (let i = evs.length - 1; i >= 0; i--) {
+      const ev = evs[i];
+      if (ev?.kind === 'status' && ev.label === 'error') return ev;
+    }
+    return null;
+  })();
+  // Per-case failure UI (button + copy + whether to promote AMR). Only
+  // meaningful for a failed run (retryAssistant present).
+  const runFailureUi = retryAssistant
+    ? resolveRunFailureUi(failedRunErrorEvent?.code, retryAssistant.agentId)
+    : null;
+  // Prefer a case-specific message (AMR auth / balance) over the raw upstream
+  // string; fall back to the live global error (also covers conversation-load
+  // / audio errors) then the persisted run error so a reload still shows it.
+  const rawError = error ?? failedRunErrorEvent?.detail ?? null;
+  const displayError = runFailureUi?.messageKey ? t(runFailureUi.messageKey) : rawError;
+  // The failed run whose error this top-level card represents. AssistantMessage
+  // suppresses only THIS message's per-message error pill (to avoid the
+  // duplicate); other failed turns — older history, or once a follow-up makes
+  // this no longer the last assistant — keep their pill so the error survives.
+  const errorCardOwnerId =
+    retryAssistant && failedRunErrorEvent ? retryAssistant.id : null;
+  // AMR promotion card payload (only the non-AMR model/auth/quota case).
+  const amrSwitchPayload =
+    runFailureUi?.showSwitchCard && retryAssistant && failedRunErrorEvent?.code
+      ? {
+          errorCode: failedRunErrorEvent.code,
+          projectId: projectId ?? '',
+          projectKind: projectKindForTracking,
+          conversationId: activeConversationId,
+          assistantMessageId: retryAssistant.id,
+          runId: retryAssistant.runId ?? null,
+        }
+      : null;
   const composerDraftStorageKey = projectId && activeConversationId
     ? `od:chat-composer:draft:${projectId}:${activeConversationId}`
     : undefined;
@@ -1099,6 +1144,7 @@ export function ChatPane({
                         activePluginActionPaths={activePluginActionPaths}
                         hiddenPluginActionPaths={hiddenPluginActionPaths}
                         isLast={m.id === lastAssistantId}
+                        errorCardOwnerId={errorCardOwnerId}
                         nextUserContent={nextUserContentByAssistantId.get(m.id)}
                         suppressDirectionForms={hasActiveDesignSystem}
                         hasDesignSystemContext={hasActiveDesignSystem || !!activeDesignSystem}
@@ -1122,20 +1168,61 @@ export function ChatPane({
                   </Fragment>
                 );
               })}
-              {error ? (
+              {displayError ? (
                 <div className="msg error">
-                  <span className="chat-error-text">{error}</span>
-                  {retryAssistant && onRetry ? (
-                    <button
-                      type="button"
-                      className="ghost chat-error-retry"
-                      onClick={() => onRetry(retryAssistant)}
-                    >
-                      {t('promptTemplates.retry')}
-                    </button>
+                  <span className="chat-error-text">{displayError}</span>
+                  {retryAssistant && onRetry && runFailureUi ? (
+                    <div className="chat-error-actions">
+                      {runFailureUi.primaryAction === 'authorize' ? (
+                        <button
+                          type="button"
+                          className="chat-error-action"
+                          onClick={() => {
+                            if (onSwitchToAmrAndRetry) {
+                              onSwitchToAmrAndRetry(retryAssistant);
+                            } else {
+                              onOpenAmrSettings?.();
+                            }
+                          }}
+                        >
+                          {t('chat.amrError.authorizeCta')}
+                        </button>
+                      ) : runFailureUi.primaryAction === 'recharge' ? (
+                        <button
+                          type="button"
+                          className="chat-error-action"
+                          onClick={() =>
+                            window.open(AMR_RECHARGE_URL, '_blank', 'noopener,noreferrer')
+                          }
+                        >
+                          {t('chat.amrError.rechargeCta')}
+                        </button>
+                      ) : null}
+                      {runFailureUi.primaryAction === 'retry' || runFailureUi.secondaryRetry ? (
+                        <button
+                          type="button"
+                          className="ghost chat-error-retry"
+                          onClick={() => onRetry(retryAssistant)}
+                        >
+                          {t('promptTemplates.retry')}
+                        </button>
+                      ) : null}
+                    </div>
                   ) : null}
                 </div>
               ) : null}
+              {amrSwitchPayload ? (
+                <AmrGuidance
+                  {...amrSwitchPayload}
+                  onActivate={() => {
+                    if (retryAssistant && onSwitchToAmrAndRetry) {
+                      onSwitchToAmrAndRetry(retryAssistant);
+                    } else {
+                      onOpenAmrSettings?.();
+                    }
+                  }}
+                />
+              ) : null}
             </div>
             {/* Always mounted so the CSS transition can play in both
                 directions; the `chat-jump-btn-active` class flips the
diff --git a/apps/web/src/components/EntryShell.tsx b/apps/web/src/components/EntryShell.tsx
index d2e339372..b6520d74a 100644
--- a/apps/web/src/components/EntryShell.tsx
+++ b/apps/web/src/components/EntryShell.tsx
@@ -8,7 +8,14 @@
 // can be rebased without touching this file. `EntryView` becomes a
 // thin wrapper that passes data and callbacks through to this shell.
 
-import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
+import {
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type KeyboardEvent as ReactKeyboardEvent,
+  type ReactNode,
+} from 'react';
 import {
   defaultScenarioPluginIdForProjectMetadata,
   type ConnectorDetail,
@@ -96,6 +103,17 @@ import { KNOWN_PROVIDERS } from '../state/config';
 import type { KnownProvider } from '../state/config';
 import { testApiProvider } from '../providers/connection-test';
 import { fetchProviderModels } from '../providers/provider-models';
+import {
+  cancelVelaLogin,
+  fetchVelaLoginStatus,
+  startVelaLogin,
+  type VelaLoginStatus,
+} from '../providers/daemon';
+import { AmrAccountControl } from './AmrLoginPill';
+import {
+  AMR_LOGIN_POLL_INTERVAL_MS,
+  amrLoginPollOutcome,
+} from './amrLoginPolling';
 
 // The topbar chips (GitHub star, model switcher, Use everywhere)
 // collapse into the settings dropdown when the viewport gets
@@ -771,10 +789,13 @@ function OnboardingView({
   const t = useT();
   const analytics = useAnalytics();
   const [step, setStep] = useState(0);
-  const [runtime, setRuntime] = useState<'local' | 'byok' | null>(null);
+  const [runtime, setRuntime] = useState<'amr' | 'local' | 'byok' | null>(null);
   const [designSource, setDesignSource] = useState<'github' | 'upload' | 'prompt' | null>(null);
   const [apiKeyVisible, setApiKeyVisible] = useState(false);
   const [cliScanStatus, setCliScanStatus] = useState<'idle' | 'scanning' | 'done'>('idle');
+  const [amrStatus, setAmrStatus] = useState<VelaLoginStatus | null>(null);
+  const [amrLoginPending, setAmrLoginPending] = useState(false);
+  const [amrLoginError, setAmrLoginError] = useState(false);
   const [visibleAgentIds, setVisibleAgentIds] = useState<string[]>([]);
   const [providerTestState, setProviderTestState] = useState<
     | { status: 'idle' }
@@ -809,6 +830,8 @@ function OnboardingView({
   }, [profile]);
   const agentRevealTimersRef = useRef<Array<ReturnType<typeof setTimeout>>>([]);
   const cliScanTokenRef = useRef(0);
+  const amrLoginPollCancelledRef = useRef(false);
+  const amrAgentRefreshAttemptedRef = useRef(false);
   const apiProtocol = config.apiProtocol ?? 'anthropic';
   const providerTestInputKey = [
     apiProtocol,
@@ -849,18 +872,53 @@ function OnboardingView({
       provider.baseUrl === (config.apiProviderBaseUrl ?? config.baseUrl),
   ) ?? null;
   const visibleAgents = agents.filter(
-    (agent) => agent.available && visibleAgentIds.includes(agent.id),
+    (agent) => agent.available && agent.id !== 'amr' && visibleAgentIds.includes(agent.id),
   );
+  const amrAgent = agents.find((agent) => agent.id === 'amr' && agent.available) ?? null;
+  const showAmrCloudOption = amrAgent !== null || agents.length === 0;
+  const amrSignedIn = amrStatus?.loggedIn === true;
+  const amrSelectedAndSignedOut = runtime === 'amr' && !amrSignedIn;
   const selectedAgent = visibleAgents.find((agent) => agent.id === config.agentId) ?? null;
   const selectedAgentChoice = selectedAgent ? (config.agentModels?.[selectedAgent.id] ?? {}) : {};
 
   useEffect(() => {
     return () => {
+      amrLoginPollCancelledRef.current = true;
       agentRevealTimersRef.current.forEach((timer) => clearTimeout(timer));
       agentRevealTimersRef.current = [];
     };
   }, []);
 
+  useEffect(() => {
+    if (!amrAgent || runtime !== null) return;
+    setRuntime('amr');
+    onModeChange('daemon');
+    onAgentChange('amr');
+  }, [amrAgent, onAgentChange, onModeChange, runtime]);
+
+  useEffect(() => {
+    if (amrAgent || amrAgentRefreshAttemptedRef.current) return;
+    amrAgentRefreshAttemptedRef.current = true;
+    void Promise.resolve(onRefreshAgents()).catch(() => undefined);
+  }, [amrAgent, onRefreshAgents]);
+
+  useEffect(() => {
+    if (!amrAgent) return;
+    let cancelled = false;
+    void fetchVelaLoginStatus().then((next) => {
+      if (!cancelled && next) setAmrStatus(next);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [amrAgent]);
+
+  useEffect(() => {
+    if (runtime === 'amr') return;
+    amrLoginPollCancelledRef.current = true;
+    setAmrLoginPending(false);
+  }, [runtime]);
+
   // Onboarding step exposure. Design-system intake used to live here
   // as step 3, but it is temporarily removed from first-run
   // onboarding and remains available from the app surfaces.
@@ -911,6 +969,7 @@ function OnboardingView({
   const onboardingStartedAtRef = useRef<number>(Date.now());
   const lifecycleReportedRef = useRef(false);
   function currentRuntimeType(): TrackingOnboardingRuntimeType {
+    if (runtime === 'amr') return 'amr_cloud';
     if (runtime === 'local') return 'local_cli';
     if (runtime === 'byok') return 'byok';
     return 'none';
@@ -1230,6 +1289,10 @@ function OnboardingView({
     setStep((current) => current - 1);
   }
   function handlePrimaryAction() {
+    if (step === 0 && amrSelectedAndSignedOut) {
+      void handleAmrSignInToContinue();
+      return;
+    }
     if (isLastStep) {
       // Emit the About-you survey snapshot FIRST, before the
       // continue/complete pair. This is the bombproof carrier for the
@@ -1256,6 +1319,51 @@ function OnboardingView({
     setStep((current) => current + 1);
   }
 
+  async function handleAmrSignInToContinue() {
+    if (amrLoginPending) return;
+    amrLoginPollCancelledRef.current = false;
+    setAmrLoginError(false);
+    setAmrLoginPending(true);
+    try {
+      const currentStatus = await fetchVelaLoginStatus();
+      if (currentStatus) setAmrStatus(currentStatus);
+      if (currentStatus?.loggedIn) {
+        setStep((current) => current + 1);
+        return;
+      }
+      const loginResult = await startVelaLogin();
+      if (!loginResult.ok && !loginResult.alreadyRunning) {
+        setAmrLoginError(true);
+        return;
+      }
+      if (await pollAmrLoginCompletion()) {
+        setStep((current) => current + 1);
+      }
+    } finally {
+      setAmrLoginPending(false);
+    }
+  }
+
+  async function pollAmrLoginCompletion(): Promise<boolean> {
+    const startedAt = Date.now();
+    while (!amrLoginPollCancelledRef.current) {
+      await new Promise((resolve) =>
+        window.setTimeout(resolve, AMR_LOGIN_POLL_INTERVAL_MS),
+      );
+      if (amrLoginPollCancelledRef.current) return false;
+      const nextStatus = await fetchVelaLoginStatus();
+      if (nextStatus) setAmrStatus(nextStatus);
+      const outcome = amrLoginPollOutcome(nextStatus, startedAt);
+      if (outcome === 'signed-in') return true;
+      if (outcome === 'stopped' || outcome === 'timed-out') {
+        if (outcome === 'timed-out') void cancelVelaLogin();
+        setAmrLoginError(true);
+        return false;
+      }
+    }
+    return false;
+  }
+
   // Survey snapshot. Reads `profileRef.current` rather than `profile`
   // because Finish-setup may fire within the same render commit as the
   // user's last dropdown pick, before React has rebound the closure to
@@ -1308,7 +1416,16 @@ function OnboardingView({
     try {
       const nextAgents = await onRefreshAgents();
       if (cliScanTokenRef.current !== scanToken) return;
-      const availableAgents = nextAgents.filter((agent) => agent.available);
+      const availableAgents = nextAgents.filter((agent) => agent.available && agent.id !== 'amr');
+      // If the user previously had AMR selected (e.g. it was auto-picked once
+      // we detected vela) and they have now chosen the Local CLI path, the
+      // persisted agentId is still 'amr' and would survive Continue without
+      // an explicit click on a local agent card. Switch the selection to the
+      // first available local agent as soon as we have one, so the runtime
+      // and the persisted agent always agree.
+      if (config.agentId === 'amr' && availableAgents[0]) {
+        onAgentChange(availableAgents[0].id);
+      }
       // Scan-result semantics: zero available CLIs is a `failed` outcome
       // because the user's runtime path is blocked, even though the
       // detect call itself returned successfully. `detected_cli_count`
@@ -1433,9 +1550,13 @@ function OnboardingView({
     }
   }
 
-  const primaryActionLabel = isLastStep
-    ? t('settings.onboardingFinish')
-    : t('settings.onboardingContinue');
+  const primaryActionLabel = step === 0 && amrSelectedAndSignedOut
+    ? t('settings.amrSignInToContinue')
+    : step === 1
+      ? t('settings.onboardingContinue')
+    : isLastStep
+      ? t('settings.onboardingFinish')
+      : t('settings.onboardingContinue');
 
   return (
     <section className="onboarding-view" aria-labelledby="onboarding-title">
@@ -1465,6 +1586,54 @@ function OnboardingView({
                 body={t('settings.onboardingConnectBody')}
               />
               <div className="onboarding-view__runtime-stack">
+                {showAmrCloudOption ? (
+                  <div className="onboarding-view__amr-cloud-card">
+                    <OnboardingChoiceCard
+                      icon="orbit"
+                      agentIconId="amr"
+                      title={t('settings.amrCloud')}
+                      body={t('settings.onboardingExecutionBody')}
+                      benefits={[
+                        t('settings.onboardingAmrCloudBenefitOfficial'),
+                        t('settings.onboardingAmrCloudBenefitReady'),
+                        t('settings.onboardingAmrCloudBenefitModels'),
+                        t('settings.onboardingAmrCloudBenefitPricing'),
+                      ]}
+                      badge={t('settings.onboardingRecommended')}
+                      officialLabel={t('settings.onboardingAmrCloudOfficialBadge')}
+                      statusSlot={
+                        runtime === 'amr' ? (
+                          <AmrAccountControl
+                            status={
+                              amrLoginError
+                                ? 'error'
+                                : amrSignedIn
+                                  ? 'signed-in'
+                                  : amrLoginPending
+                                    ? 'signing-in'
+                                    : 'signed-out'
+                            }
+                            compact
+                            email={
+                              amrSignedIn
+                                ? amrStatus?.user?.email || t('settings.amrSignedIn')
+                                : ''
+                            }
+                            showSignInAction={false}
+                            signInDisabled={amrLoginPending}
+                          />
+                        ) : null
+                      }
+                      featured
+                      selected={runtime === 'amr'}
+                      onClick={() => {
+                        setRuntime('amr');
+                        onModeChange('daemon');
+                        onAgentChange('amr');
+                      }}
+                    />
+                  </div>
+                ) : null}
                 <div className="onboarding-view__alternatives">
                   {runtimeItems.map((item) => (
                     <OnboardingChoiceCard
@@ -1733,9 +1902,9 @@ function OnboardingView({
                 type="button"
                 className="onboarding-view__primary"
                 onClick={handlePrimaryAction}
+                disabled={amrLoginPending}
               >
                 <span>{primaryActionLabel}</span>
-                <Icon name={isLastStep ? 'check' : 'chevron-right'} size={16} />
               </button>
             </div>
           )}
@@ -2265,48 +2434,98 @@ function OnboardingDropdown(props: OnboardingDropdownProps) {
 
 function OnboardingChoiceCard({
   icon,
+  agentIconId,
   title,
   body,
+  benefits,
   actionLabel,
   selected,
   badge,
+  officialLabel,
+  statusSlot,
   featured,
   onClick,
 }: {
   icon: 'orbit' | 'hammer' | 'sliders' | 'github' | 'upload' | 'sparkles';
+  agentIconId?: string;
   title: string;
   body: string;
+  benefits?: string[];
   actionLabel?: string;
   selected: boolean;
   badge?: string;
+  officialLabel?: string;
+  statusSlot?: ReactNode;
   featured?: boolean;
   onClick: () => void;
 }) {
+  function handleKeyDown(event: ReactKeyboardEvent<HTMLDivElement>) {
+    if (event.target !== event.currentTarget) return;
+    if (event.key !== 'Enter' && event.key !== ' ') return;
+    event.preventDefault();
+    onClick();
+  }
+
   return (
-    <button
-      type="button"
+    <div
+      role="button"
+      tabIndex={0}
       className={`onboarding-view__card${selected ? ' is-selected' : ''}${
         featured ? ' onboarding-view__card--featured' : ''
-      }`}
+      }${officialLabel ? ' onboarding-view__card--official' : ''}`}
       onClick={onClick}
+      onKeyDown={handleKeyDown}
       aria-pressed={selected}
     >
-      <span className="onboarding-view__icon">
-        <Icon name={icon} size={18} />
+      {officialLabel ? (
+        <span className="onboarding-view__official-tag">
+          <img src="/official_badge.svg" alt={officialLabel} draggable={false} />
+        </span>
+      ) : null}
+      <span
+        className={
+          'onboarding-view__icon' +
+          (agentIconId ? ' onboarding-view__icon--asset' : '')
+        }
+      >
+        {agentIconId ? (
+          <AgentIcon
+            id={agentIconId}
+            size={featured ? 52 : 40}
+            className="onboarding-view__agent-logo"
+          />
+        ) : (
+          <Icon name={icon} size={18} />
+        )}
       </span>
       <span className="onboarding-view__card-copy">
         <span className="onboarding-view__card-top">
           <strong>{title}</strong>
           {badge ? <span className="onboarding-view__badge">{badge}</span> : null}
         </span>
-        <small>{body}</small>
+        {benefits && benefits.length > 0 ? (
+          <span className="onboarding-view__benefits">
+            {benefits.map((item) => (
+              <span key={item} className="onboarding-view__benefit">
+                {item}
+              </span>
+            ))}
+          </span>
+        ) : (
+          <small>{body}</small>
+        )}
       </span>
+      {statusSlot ? (
+        <span className="onboarding-view__card-status">
+          {statusSlot}
+        </span>
+      ) : null}
       {actionLabel ? <span className="onboarding-view__card-action">{actionLabel}</span> : null}
       {selected ? (
         <span className="onboarding-view__check">
           <Icon name="check" size={14} />
         </span>
       ) : null}
-    </button>
+    </div>
   );
 }
diff --git a/apps/web/src/components/InlineModelSwitcher.tsx b/apps/web/src/components/InlineModelSwitcher.tsx
index a8ab1bb0d..2fb6afd9c 100644
--- a/apps/web/src/components/InlineModelSwitcher.tsx
+++ b/apps/web/src/components/InlineModelSwitcher.tsx
@@ -8,13 +8,28 @@
 // upward through the same callbacks `AvatarMenu` already uses, so the
 // switcher inherits autosave + daemon sync without re-implementing it.
 
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useT } from '../i18n';
 import { KNOWN_PROVIDERS } from '../state/config';
+import {
+  cancelVelaLogin,
+  fetchVelaLoginStatus,
+  startVelaLogin,
+  type VelaLoginStatus,
+} from '../providers/daemon';
 import type { AgentInfo, ApiProtocol, AppConfig, ExecMode } from '../types';
 import { apiProtocolLabel } from '../utils/apiProtocol';
 import { AgentIcon } from './AgentIcon';
 import { Icon } from './Icon';
+import {
+  AMR_LOGIN_STATUS_EVENT,
+  AMR_LOGIN_POLL_INTERVAL_MS,
+  AMR_LOGIN_STARTUP_SETTLE_MS,
+  amrLoginPollOutcome,
+  amrLoginStatusEventReason,
+  notifyAmrLoginStatusChanged,
+} from './amrLoginPolling';
+import { normalizeAgentModelChoice } from './agentModelSelection';
 import { renderModelOptions } from './modelOptions';
 
 interface Props {
@@ -49,6 +64,41 @@ const API_PROTOCOL_TABS: Array<{ id: ApiProtocol; title: string }> = [
   { id: 'google', title: 'Google' },
 ];
 
+const AMR_REMINDER_SEEN_KEY = 'open-design:inline-amr-cli-reminder-seen:v2';
+let amrReminderSeenFallback = false;
+
+function readAmrReminderSeen(): boolean {
+  if (typeof window === 'undefined') return true;
+  try {
+    return window.localStorage
+      ? window.localStorage.getItem(AMR_REMINDER_SEEN_KEY) === '1'
+      : amrReminderSeenFallback;
+  } catch {
+    return amrReminderSeenFallback;
+  }
+}
+
+function markAmrReminderSeen(): void {
+  if (typeof window === 'undefined') return;
+  try {
+    if (window.localStorage) {
+      window.localStorage.setItem(AMR_REMINDER_SEEN_KEY, '1');
+      return;
+    }
+  } catch {
+    // Ignore storage failures; the reminder is purely advisory UI.
+  }
+  amrReminderSeenFallback = true;
+}
+
+function displayAgentName(agent: Pick<AgentInfo, 'id' | 'name'>): string {
+  return agent.id === 'amr' ? 'Open Design AMR' : agent.name;
+}
+
+function displayAgentChipName(agent: Pick<AgentInfo, 'id' | 'name'>): string {
+  return agent.id === 'amr' ? 'AMR' : displayAgentName(agent);
+}
+
 export function InlineModelSwitcher({
   config,
   agents,
@@ -63,6 +113,117 @@ export function InlineModelSwitcher({
   const t = useT();
   const [open, setOpen] = useState(false);
   const wrapRef = useRef<HTMLDivElement | null>(null);
+  const [amrStatus, setAmrStatus] = useState<VelaLoginStatus | null>(null);
+  const [amrLoginPending, setAmrLoginPending] = useState(false);
+  const [amrLoginError, setAmrLoginError] = useState(false);
+  const [amrReminderSeen, setAmrReminderSeen] = useState(readAmrReminderSeen);
+  const [showAmrReminderInPopover, setShowAmrReminderInPopover] =
+    useState(false);
+  const amrPollRef = useRef<number | null>(null);
+  const amrLoginStartedAtRef = useRef<number | null>(null);
+
+  const stopAmrPolling = useCallback(() => {
+    if (amrPollRef.current !== null) {
+      window.clearInterval(amrPollRef.current);
+      amrPollRef.current = null;
+    }
+  }, []);
+
+  const refreshAmrStatus = useCallback(async () => {
+    const next = await fetchVelaLoginStatus();
+    if (next) {
+      setAmrStatus(next);
+      const pendingStartup =
+        amrLoginStartedAtRef.current !== null &&
+        Date.now() - amrLoginStartedAtRef.current < AMR_LOGIN_STARTUP_SETTLE_MS;
+      if (next.loggedIn) {
+        amrLoginStartedAtRef.current = null;
+        setAmrLoginPending(false);
+      } else if (next.loginInFlight) {
+        setAmrLoginPending(true);
+      } else if (!pendingStartup) {
+        amrLoginStartedAtRef.current = null;
+        setAmrLoginPending(false);
+      }
+    }
+    return next;
+  }, []);
+
+  const startAmrPolling = useCallback((startedAt = Date.now()) => {
+    stopAmrPolling();
+    amrLoginStartedAtRef.current = startedAt;
+    const tick = async () => {
+      const next = await refreshAmrStatus();
+      const outcome = amrLoginPollOutcome(next, startedAt);
+      if (outcome === 'signed-in') {
+        stopAmrPolling();
+        amrLoginStartedAtRef.current = null;
+        setAmrLoginPending(false);
+        return;
+      }
+      if (outcome === 'stopped' || outcome === 'timed-out') {
+        stopAmrPolling();
+        if (outcome === 'timed-out') {
+          void cancelVelaLogin().then(() =>
+            notifyAmrLoginStatusChanged('login-canceled'),
+          );
+        }
+        amrLoginStartedAtRef.current = null;
+        setAmrLoginPending(false);
+        setAmrLoginError(true);
+      }
+    };
+    amrPollRef.current = window.setInterval(() => {
+      void tick();
+    }, AMR_LOGIN_POLL_INTERVAL_MS);
+  }, [refreshAmrStatus, stopAmrPolling]);
+
+  const handleAmrSignIn = useCallback(async () => {
+    const startedAt = Date.now();
+    amrLoginStartedAtRef.current = startedAt;
+    setAmrLoginError(false);
+    setAmrLoginPending(true);
+    const result = await startVelaLogin();
+    if (!result.ok && !result.alreadyRunning) {
+      amrLoginStartedAtRef.current = null;
+      setAmrLoginPending(false);
+      setAmrLoginError(true);
+      return;
+    }
+    notifyAmrLoginStatusChanged('login-started');
+    startAmrPolling(startedAt);
+  }, [startAmrPolling]);
+
+  const handleAmrCancelLogin = useCallback(async () => {
+    stopAmrPolling();
+    amrLoginStartedAtRef.current = null;
+    setAmrLoginError(false);
+    setAmrLoginPending(false);
+    await cancelVelaLogin();
+    notifyAmrLoginStatusChanged('login-canceled');
+    await refreshAmrStatus();
+  }, [refreshAmrStatus, stopAmrPolling]);
+
+  const handleAgentButtonClick = useCallback(
+    async (agentId: string) => {
+      onAgentChange?.(agentId);
+      if (agentId !== 'amr') return;
+      if (amrLoginPending) {
+        await handleAmrCancelLogin();
+        return;
+      }
+      const latest = await refreshAmrStatus();
+      if (latest?.loggedIn) return;
+      await handleAmrSignIn();
+    },
+    [
+      amrLoginPending,
+      handleAmrCancelLogin,
+      handleAmrSignIn,
+      onAgentChange,
+      refreshAmrStatus,
+    ],
+  );
 
   useEffect(() => {
     if (!open) return;
@@ -81,6 +242,42 @@ export function InlineModelSwitcher({
     };
   }, [open]);
 
+  useEffect(() => {
+    if (open && agents.some((agent) => agent.id === 'amr' && agent.available)) {
+      void refreshAmrStatus();
+    }
+    return () => stopAmrPolling();
+  }, [agents, open, refreshAmrStatus, stopAmrPolling]);
+
+  useEffect(() => {
+    const onStatusChange = (event: Event) => {
+      const reason = amrLoginStatusEventReason(event);
+      if (reason === 'login-started') {
+        const startedAt = Date.now();
+        amrLoginStartedAtRef.current = startedAt;
+        setAmrLoginError(false);
+        setAmrLoginPending(true);
+        startAmrPolling(startedAt);
+      } else if (reason === 'login-canceled') {
+        amrLoginStartedAtRef.current = null;
+        stopAmrPolling();
+        setAmrLoginPending(false);
+      }
+      void refreshAmrStatus().then((next) => {
+        if (next?.loggedIn) {
+          amrLoginStartedAtRef.current = null;
+          stopAmrPolling();
+          return;
+        }
+        if (next?.loginInFlight) startAmrPolling();
+      });
+    };
+    window.addEventListener(AMR_LOGIN_STATUS_EVENT, onStatusChange);
+    return () => {
+      window.removeEventListener(AMR_LOGIN_STATUS_EVENT, onStatusChange);
+    };
+  }, [refreshAmrStatus, startAmrPolling, stopAmrPolling]);
+
   const installedAgents = useMemo(
     () => agents.filter((a) => a.available),
     [agents],
@@ -89,13 +286,66 @@ export function InlineModelSwitcher({
     () => agents.find((a) => a.id === config.agentId) ?? null,
     [agents, config.agentId],
   );
+  const amrInstalled = installedAgents.some((a) => a.id === 'amr');
+  const shouldOfferAmrReminder =
+    config.mode === 'daemon' && config.agentId !== 'amr' && amrInstalled;
+  const showAmrReminder = shouldOfferAmrReminder && !amrReminderSeen;
 
   const currentChoice =
     (config.agentId && config.agentModels?.[config.agentId]) || {};
+  const normalizedCurrentChoice = normalizeAgentModelChoice(
+    currentAgent,
+    currentChoice,
+  );
+  const currentAgentId = currentAgent?.id ?? null;
+  const normalizedCurrentModelId = normalizedCurrentChoice?.model ?? null;
+  const normalizedCurrentReasoning = normalizedCurrentChoice?.reasoning;
+  const currentAgentModelIds = currentAgent?.models?.map((m) => m.id) ?? [];
+  const configuredModelId =
+    typeof currentChoice.model === 'string' && currentChoice.model
+      ? currentChoice.model
+      : null;
   const currentModelId =
-    currentChoice.model ?? currentAgent?.models?.[0]?.id ?? null;
+    currentAgent?.id === 'amr' &&
+    configuredModelId &&
+    !currentAgentModelIds.includes(configuredModelId)
+      ? currentAgent?.models?.[0]?.id ?? null
+      : configuredModelId ?? currentAgent?.models?.[0]?.id ?? null;
+
+  useEffect(() => {
+    if (!currentAgentId || !normalizedCurrentModelId) return;
+    onAgentModelChange(currentAgentId, {
+      model: normalizedCurrentModelId,
+      reasoning: normalizedCurrentReasoning,
+    });
+  }, [
+    currentAgentId,
+    normalizedCurrentModelId,
+    normalizedCurrentReasoning,
+    onAgentModelChange,
+  ]);
+
   const currentModelLabel =
     currentAgent?.models?.find((m) => m.id === currentModelId)?.label ?? null;
+  const amrLoggedIn = amrStatus?.loggedIn === true;
+  const amrActionLabel = amrLoginPending
+    ? t('settings.amrSigningIn')
+    : amrLoggedIn
+      ? t('settings.amrSignedIn')
+      : t('settings.amrSignIn');
+  const amrPendingHoverLabel = t('settings.amrCancelSignIn');
+  const amrInlineStatus = amrLoginError
+    ? t('settings.amrLoginErrorCompact')
+    : amrLoggedIn
+      ? t('settings.amrSignedIn')
+      : amrLoginPending
+        ? t('settings.amrSigningIn')
+        : t('settings.amrSignIn');
+  const amrStatusIconName = amrLoggedIn
+      ? 'check'
+      : amrLoginPending
+        ? 'spinner'
+        : null;
 
   const apiProtocol = config.apiProtocol ?? 'anthropic';
   const providerForProtocol = useMemo(
@@ -119,7 +369,9 @@ export function InlineModelSwitcher({
       : t('inlineSwitcher.chipByok');
   const chipPrimary =
     config.mode === 'daemon'
-      ? currentAgent?.name ?? t('inlineSwitcher.noAgent')
+      ? currentAgent
+        ? displayAgentChipName(currentAgent)
+        : t('inlineSwitcher.noAgent')
       : apiProtocolLabel(apiProtocol);
   const chipModel =
     config.mode === 'daemon'
@@ -128,6 +380,24 @@ export function InlineModelSwitcher({
         : t('inlineSwitcher.modelDefault')
       : config.model.trim() || t('inlineSwitcher.modelDefault');
 
+  const handleChipClick = useCallback(() => {
+    const nextOpen = !open;
+    if (nextOpen && showAmrReminder) {
+      setShowAmrReminderInPopover(true);
+      setAmrReminderSeen(true);
+      markAmrReminderSeen();
+    } else if (!nextOpen) {
+      setShowAmrReminderInPopover(false);
+    }
+    setOpen(nextOpen);
+  }, [open, showAmrReminder]);
+
+  useEffect(() => {
+    if (!open || config.mode !== 'daemon' || config.agentId === 'amr') {
+      setShowAmrReminderInPopover(false);
+    }
+  }, [config.agentId, config.mode, open]);
+
   return (
     <div
       className="inline-switcher"
@@ -136,13 +406,23 @@ export function InlineModelSwitcher({
     >
       <button
         type="button"
-        className="inline-switcher__chip"
+        className={
+          'inline-switcher__chip' +
+          (showAmrReminder ? ' has-amr-reminder' : '')
+        }
         data-testid="inline-model-switcher-chip"
-        onClick={() => setOpen((v) => !v)}
+        onClick={handleChipClick}
         aria-haspopup="menu"
         aria-expanded={open}
         title={t('inlineSwitcher.chipTitle')}
       >
+        {showAmrReminder ? (
+          <span
+            className="inline-switcher__amr-reminder-dot inline-switcher__amr-reminder-dot--chip"
+            data-testid="inline-model-switcher-amr-reminder"
+            aria-hidden="true"
+          />
+        ) : null}
         <span className="inline-switcher__chip-icon" aria-hidden="true">
           {config.mode === 'daemon' && currentAgent ? (
             <AgentIcon id={currentAgent.id} size={18} />
@@ -244,25 +524,87 @@ export function InlineModelSwitcher({
                   >
                     {installedAgents.map((a) => {
                       const active = config.agentId === a.id;
+                      const agentName = displayAgentChipName(a);
+                      const showAgentReminder =
+                        a.id === 'amr' &&
+                        showAmrReminderInPopover &&
+                        config.agentId !== 'amr';
                       return (
-                        <button
+                        <div
                           key={a.id}
-                          type="button"
-                          role="radio"
-                          aria-checked={active}
-                          className={
-                            'inline-switcher__agent' +
-                            (active ? ' is-active' : '')
-                          }
-                          data-testid={`inline-model-switcher-agent-${a.id}`}
-                          onClick={() => onAgentChange?.(a.id)}
-                          title={a.version ? `${a.name} · ${a.version}` : a.name}
+                          className="inline-switcher__agent-row"
                         >
-                          <AgentIcon id={a.id} size={20} />
-                          <span className="inline-switcher__agent-name">
-                            {a.name}
-                          </span>
-                        </button>
+                          <button
+                            type="button"
+                            role="radio"
+                            aria-checked={active}
+                            aria-label={
+                              a.id === 'amr'
+                                ? `${agentName} ${amrInlineStatus}`
+                                : agentName
+                            }
+                            className={
+                              'inline-switcher__agent' +
+                              (active ? ' is-active' : '') +
+                              (showAgentReminder ? ' has-amr-reminder' : '')
+                            }
+                            data-testid={`inline-model-switcher-agent-${a.id}`}
+                            onClick={() => void handleAgentButtonClick(a.id)}
+                            title={
+                              a.id === 'amr' && amrLoginPending
+                                ? amrPendingHoverLabel
+                                : a.id !== 'amr' && a.version
+                                  ? `${agentName} · ${a.version}`
+                                  : agentName
+                            }
+                          >
+                            <AgentIcon id={a.id} size={20} />
+                            {showAgentReminder ? (
+                              <span
+                                className="inline-switcher__amr-reminder-dot inline-switcher__amr-reminder-dot--agent"
+                                data-testid="inline-model-switcher-agent-amr-reminder"
+                                aria-hidden="true"
+                              />
+                            ) : null}
+                            <span className="inline-switcher__agent-name">
+                              {agentName}
+                            </span>
+                            {a.id === 'amr' ? (
+                              <span className="inline-switcher__agent-status">
+                                {amrStatusIconName ? (
+                                  <span
+                                    className={
+                                      'inline-switcher__agent-status-icon' +
+                                      (amrLoginPending ? ' is-pending' : '') +
+                                      (amrLoggedIn ? ' is-signed-in' : '') +
+                                      (!amrLoginPending && !amrLoggedIn ? ' is-signed-out' : '')
+                                    }
+                                  >
+                                    <Icon name={amrStatusIconName} size={13} />
+                                  </span>
+                                ) : null}
+                                <span
+                                  className={
+                                    'inline-switcher__agent-action-label' +
+                                    (amrLoginPending ? ' is-cancelable' : '')
+                                  }
+                                >
+                                  <span className="inline-switcher__agent-action-default">
+                                    {amrActionLabel}
+                                  </span>
+                                  {amrLoginPending ? (
+                                    <span
+                                      className="inline-switcher__agent-action-hover"
+                                      aria-hidden="true"
+                                    >
+                                      {amrPendingHoverLabel}
+                                    </span>
+                                  ) : null}
+                                </span>
+                              </span>
+                            ) : null}
+                          </button>
+                        </div>
                       );
                     })}
                   </div>
@@ -287,7 +629,8 @@ export function InlineModelSwitcher({
                     }
                   >
                     {renderModelOptions(currentAgent.models)}
-                    {currentModelId &&
+                    {currentAgent.id !== 'amr' &&
+                    currentModelId &&
                     !currentAgent.models.some((m) => m.id === currentModelId) ? (
                       <option value={currentModelId}>
                         {currentModelId} {t('inlineSwitcher.customSuffix')}
diff --git a/apps/web/src/components/ProjectView.tsx b/apps/web/src/components/ProjectView.tsx
index 31b68015e..d177893d0 100644
--- a/apps/web/src/components/ProjectView.tsx
+++ b/apps/web/src/components/ProjectView.tsx
@@ -17,6 +17,7 @@ import { useI18n } from '../i18n';
 import { streamMessage } from '../providers/anthropic';
 import {
   fetchChatRunStatus,
+  fetchVelaLoginStatus,
   listActiveChatRuns,
   listProjectRuns,
   reattachDaemonRun,
@@ -164,11 +165,14 @@ import { useTerminalLaunch } from '../hooks/useTerminalLaunch';
 import { buildContinueInCliToast } from '../lib/build-continue-in-cli-toast';
 import { buildClipboardPrompt } from '../lib/build-clipboard-prompt';
 import { copyToClipboard } from '../lib/copy-to-clipboard';
+import { effectiveMaxTokens } from '../state/maxTokens';
+import { effectiveAgentModelChoice } from './agentModelSelection';
 import {
   buildFinalizeCredentialsMissingToast,
   buildFinalizeRequest,
 } from '../lib/resolve-finalize-request';
 
+
 type ProjectChatSendMeta = ChatSendMeta & {
   retryOfAssistantId?: string;
 };
@@ -211,6 +215,7 @@ interface Props {
   ) => void;
   onRefreshAgents: () => void;
   onOpenSettings: (section?: SettingsSection) => void;
+  onOpenAmrSettings?: () => void;
   onOpenMcpSettings?: () => void;
   // Pet wiring forwarded to the chat composer so users can adopt /
   // wake / tuck a pet without leaving the project view.
@@ -493,6 +498,7 @@ export function ProjectView({
   onAgentModelChange,
   onRefreshAgents,
   onOpenSettings,
+  onOpenAmrSettings,
   onOpenMcpSettings,
   onAdoptPetInline,
   onTogglePet,
@@ -1671,12 +1677,15 @@ export function ProjectView({
     [updateMessageById, activeConversationId, project.id],
   );
 
+  // `code` is the structured API error code (e.g. AGENT_AUTH_REQUIRED); it
+  // rides along on the error status event so AssistantMessage can render the
+  // hosted-AMR nudge for model/auth/quota failures on non-AMR agents.
   const appendAssistantErrorEvent = useCallback(
-    (messageId: string, message: string) => {
+    (messageId: string, message: string, code?: string) => {
       if (!message) return;
       updateMessageById(
         messageId,
-        (prev) => appendErrorStatusEvent(prev, message),
+        (prev) => appendErrorStatusEvent(prev, message, code),
         true,
       );
     },
@@ -2072,14 +2081,19 @@ export function ProjectView({
               onProjectsRefresh();
             },
             onError: (err) => {
+              const errorCode = (err as Error & { code?: string }).code;
               textBuffer.flush();
               textBuffer.cancel();
               unregisterTextBuffer();
               setError(err.message);
-              appendAssistantErrorEvent(message.id, err.message);
+              appendAssistantErrorEvent(message.id, err.message, errorCode);
               updateMessageById(
                 message.id,
-                (prev) => ({ ...prev, runStatus: 'failed', endedAt: prev.endedAt ?? Date.now() }),
+                (prev) => ({
+                  ...prev,
+                  runStatus: 'failed',
+                  endedAt: prev.endedAt ?? Date.now(),
+                }),
                 true,
               );
               completedReattachRunsRef.current.add(runId);
@@ -2255,6 +2269,10 @@ export function ProjectView({
         config.mode === 'daemon' && config.agentId
           ? config.agentModels?.[config.agentId]
           : undefined;
+      const effectiveSelectedAgentChoice = effectiveAgentModelChoice(
+        selectedAgent,
+        selectedAgentChoice,
+      );
       const assistantAgentId =
         config.mode === 'daemon'
           ? config.agentId ?? undefined
@@ -2264,7 +2282,7 @@ export function ProjectView({
           ? agentModelDisplayName(
               config.agentId,
               selectedAgent?.name,
-              selectedAgentChoice?.model,
+              effectiveSelectedAgentChoice?.model,
             )
           : apiProtocolModelLabel(config.apiProtocol, config.model);
       const preTurnFileNames = projectFiles.map((f) => f.name);
@@ -2624,11 +2642,12 @@ export function ProjectView({
         },
         onError: (err: Error) => {
           const endedAt = Date.now();
+          const errorCode = (err as Error & { code?: string }).code;
           textBuffer.flush();
           textBuffer.cancel();
           cancelSendTextBuffer();
           setError(err.message);
-          appendAssistantErrorEvent(assistantId, err.message);
+          appendAssistantErrorEvent(assistantId, err.message, errorCode);
           updateAssistant((prev) => ({
             ...prev,
             endedAt,
@@ -2656,7 +2675,7 @@ export function ProjectView({
           handlers.onError(new Error('Pick a local agent first (top bar).'));
           return;
         }
-        const choice = selectedAgentChoice;
+        const choice = effectiveSelectedAgentChoice;
         // v2 analytics: when the active project is a DS workspace
         // (created by `prepareCreatedDesignSystemProject`, identifiable
         // by `metadata.importedFrom === 'design-system'`), every run
@@ -2915,6 +2934,50 @@ export function ProjectView({
     [currentConversationActionDisabled, handleSend],
   );
 
+  // "Switch to AMR & retry" from the failed-run card: switch the run to AMR,
+  // open Settings on the AMR controls so the user can sign in / authorize /
+  // top up, and arm an auto-retry that fires once AMR is selected AND signed
+  // in (see the effect below).
+  const [pendingAmrRetry, setPendingAmrRetry] = useState<ChatMessage | null>(null);
+  const handleSwitchToAmrAndRetry = useCallback(
+    (failedAssistant: ChatMessage) => {
+      if (currentConversationActionDisabled) return;
+      onModeChange('daemon');
+      onAgentChange('amr');
+      onOpenAmrSettings?.();
+      setPendingAmrRetry(failedAssistant);
+    },
+    [currentConversationActionDisabled, onModeChange, onAgentChange, onOpenAmrSettings],
+  );
+  // Poll the AMR login status while a retry is armed, rather than only reacting
+  // to the AmrLoginPill's status event — the user may close Settings (which
+  // unmounts the pill and stops its polling) before finishing sign-in in the
+  // browser. Polling here keeps working regardless of the pill's lifecycle.
+  // Fires once AMR is the selected agent AND the account is signed in.
+  useEffect(() => {
+    if (!pendingAmrRetry) return;
+    let cancelled = false;
+    const tryRetry = async () => {
+      if (cancelled) return;
+      if (!(config.mode === 'daemon' && config.agentId === 'amr')) return;
+      const status = await fetchVelaLoginStatus().catch(() => null);
+      if (cancelled || status?.loggedIn !== true) return;
+      setPendingAmrRetry(null);
+      handleRetry(pendingAmrRetry);
+    };
+    void tryRetry();
+    const interval = setInterval(() => void tryRetry(), 2000);
+    // Give up after a few minutes so we never poll forever.
+    const stop = setTimeout(() => {
+      if (!cancelled) setPendingAmrRetry(null);
+    }, 5 * 60 * 1000);
+    return () => {
+      cancelled = true;
+      clearInterval(interval);
+      clearTimeout(stop);
+    };
+  }, [pendingAmrRetry, config.mode, config.agentId, handleRetry]);
+
   useEffect(() => {
     if (!autoAuditRepairSeed) return;
     if (!activeConversationId) return;
@@ -2971,12 +3034,16 @@ export function ProjectView({
     config.mode === 'daemon' && config.agentId
       ? config.agentModels?.[config.agentId]
       : undefined;
+  const effectiveSelectedPluginActionChoice = effectiveAgentModelChoice(
+    selectedPluginActionAgent,
+    selectedPluginActionChoice,
+  );
   const pluginWorkflowAgentName =
     config.mode === 'daemon'
       ? agentModelDisplayName(
           config.agentId,
           selectedPluginActionAgent?.name,
-          selectedPluginActionChoice?.model,
+          effectiveSelectedPluginActionChoice?.model,
         )
       : apiProtocolModelLabel(config.apiProtocol, config.model);
 
@@ -4358,6 +4425,8 @@ export function ProjectView({
               onDeleteConversation={handleDeleteConversation}
               onRenameConversation={handleRenameConversation}
               onOpenSettings={onOpenSettings}
+              onOpenAmrSettings={onOpenAmrSettings}
+              onSwitchToAmrAndRetry={handleSwitchToAmrAndRetry}
               onOpenMcpSettings={onOpenMcpSettings}
               connectRepoNeeded={connectRepoNeeded}
               githubConnected={githubConnected}
diff --git a/apps/web/src/components/SettingsDialog.tsx b/apps/web/src/components/SettingsDialog.tsx
index 84fb06f6d..bdf3ce770 100644
--- a/apps/web/src/components/SettingsDialog.tsx
+++ b/apps/web/src/components/SettingsDialog.tsx
@@ -27,6 +27,11 @@ import { LOCALE_LABEL, LOCALES, useI18n } from '../i18n';
 import type { Locale } from '../i18n';
 import type { Dict } from '../i18n/types';
 import { AgentIcon } from './AgentIcon';
+import { AmrLoginPill } from './AmrLoginPill';
+import {
+  fetchVelaLoginStatus,
+  type VelaLoginStatus,
+} from '../providers/daemon';
 import { ExportDiagnosticsRow } from './ExportDiagnosticsButton';
 import { Icon } from './Icon';
 import {
@@ -140,13 +145,20 @@ export type SettingsSection =
   | 'library'
   | 'about';
 
+// One-shot focus hint when opening the dialog. `'amr'` scrolls the AMR agent
+// card into view on the execution section and plays a highlight (plus a
+// sign-in coachmark when the user has not authorized AMR yet).
+export type SettingsHighlight = 'amr' | null;
+
 interface Props {
   initial: AppConfig;
   agents: AgentInfo[];
+  agentsLoading?: boolean;
   daemonLive: boolean;
   appVersionInfo: AppVersionInfo | null;
   welcome?: boolean;
   initialSection?: SettingsSection;
+  initialHighlight?: SettingsHighlight;
   /**
    * Persist the current draft. Invoked by the dialog's autosave loop on
    * every committed edit. Returns a promise that resolves once both
@@ -428,6 +440,10 @@ function cleanAgentVersionLabel(
     .trim();
 }
 
+function displayAgentName(agent: Pick<AgentInfo, 'id' | 'name'>): string {
+  return agent.id === 'amr' ? 'Open Design AMR' : agent.name;
+}
+
 export function mergeProviderModelOptions(
   fetchedModels: readonly ProviderModelOption[],
   suggestedModelIds: readonly string[],
@@ -790,10 +806,12 @@ export function switchApiProtocolConfig(
 export function SettingsDialog({
   initial,
   agents,
+  agentsLoading = false,
   daemonLive,
   appVersionInfo,
   welcome,
   initialSection = 'execution',
+  initialHighlight = null,
   onPersist,
   onPersistComposioKey,
   composioConfigLoading = false,
@@ -845,15 +863,50 @@ export function SettingsDialog({
   // (About) keeps the previous scrollTop, so the new section's header
   // can land out of view and the panel reads as half-loaded. Issue #634.
   const settingsContentRef = useRef<HTMLDivElement | null>(null);
+  // AMR-card focus, driven by the failed-run nudge (`initialHighlight==='amr'`).
+  const amrCardRef = useRef<HTMLDivElement | null>(null);
+  // Card pulse: a brief attention flash that auto-clears after a few seconds.
+  const [amrHighlightActive, setAmrHighlightActive] = useState(false);
+  // Coachmark: persists (unlike the card pulse) until the real pointer reaches
+  // the authorize button — so it won't vanish while the user is still moving
+  // toward it.
+  const [amrCoachmarkArmed, setAmrCoachmarkArmed] = useState(false);
+  // The fake-cursor coachmark dismisses as soon as the real pointer reaches the
+  // authorize button — once the user has found it, the hint has done its job.
+  const [amrCoachmarkDismissed, setAmrCoachmarkDismissed] = useState(false);
   const [agentRescanRunning, setAgentRescanRunning] = useState(false);
   const [agentRescanNotice, setAgentRescanNotice] =
     useState<RescanNotice | null>(null);
   const [agentTestState, setAgentTestState] = useState<TestState>({
     status: 'idle',
   });
+  const [amrCardStatus, setAmrCardStatus] = useState<VelaLoginStatus | null>(null);
+  const [amrCardStatusReady, setAmrCardStatusReady] = useState(false);
+  const [hoveredAgentCardId, setHoveredAgentCardId] = useState<string | null>(null);
   const [providerTestState, setProviderTestState] = useState<TestState>({
     status: 'idle',
   });
+
+  useEffect(() => {
+    const hasAmrAgent = agents.some((agent) => agent.id === 'amr' && agent.available);
+    if (!hasAmrAgent) {
+      setAmrCardStatus(null);
+      setAmrCardStatusReady(false);
+      setHoveredAgentCardId(null);
+      return;
+    }
+    let cancelled = false;
+    setAmrCardStatusReady(false);
+    void fetchVelaLoginStatus().then((next) => {
+      if (!cancelled) {
+        setAmrCardStatus(next);
+        setAmrCardStatusReady(true);
+      }
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [agents]);
   const [byokPreconditionNotice, setByokPreconditionNotice] = useState<{
     action: ByokPreconditionAction;
     message: string;
@@ -948,13 +1001,34 @@ export function SettingsDialog({
     if (el) el.scrollTop = 0;
   }, [activeSection]);
 
-  // Tests pin a result against the unsaved draft. Once the user edits any
-  // field that feeds into the test, the result is no longer trustworthy —
-  // clear it so we don't show a stale "Connected" line next to fresh input.
-  // If a test is already running, leave the running state visible and let the
-  // stale result be ignored when it returns; the button stays disabled so a
-  // new smoke test cannot overlap the old one.
-  const agentChoiceForTest = cfg.agentModels?.[cfg.agentId ?? ''];
+  // One-shot AMR-card focus from the failed-run nudge: scroll the card into
+  // view (on the next frame, so it wins over the section's scrollTop reset
+  // above) and play a brief highlight + arm the sign-in coachmark. The
+  // coachmark only actually shows when the AMR card reports a signed-out state
+  // (`amrCardStatus?.loggedIn === false`). If the execution pane is in API mode
+  // the AMR card is absent and this no-ops.
+  useEffect(() => {
+    if (initialHighlight !== 'amr' || activeSection !== 'execution') return;
+    let cancelled = false;
+    const raf = requestAnimationFrame(() => {
+      if (cancelled) return;
+      amrCardRef.current?.scrollIntoView({ block: 'center', behavior: 'smooth' });
+      setAmrCoachmarkDismissed(false);
+      setAmrHighlightActive(true);
+      setAmrCoachmarkArmed(true);
+    });
+    // Only the card pulse auto-clears; the coachmark persists until the pointer
+    // reaches the authorize button (or the user signs in).
+    const clear = setTimeout(() => {
+      if (!cancelled) setAmrHighlightActive(false);
+    }, 3200);
+    return () => {
+      cancelled = true;
+      cancelAnimationFrame(raf);
+      clearTimeout(clear);
+    };
+  }, [initialHighlight, activeSection]);
+
   const selectedMemoryChatAgent =
     cfg.mode === 'daemon' && cfg.agentId
       ? agents.find((agent) => agent.id === cfg.agentId) ?? null
@@ -965,6 +1039,10 @@ export function SettingsDialog({
       ?? selectedMemoryChatAgent?.models?.[0]?.id
       ?? null
     : null;
+  const agentChoiceForTest =
+    cfg.mode === 'daemon' && cfg.agentId
+      ? cfg.agentModels?.[cfg.agentId]
+      : null;
   useEffect(() => {
     agentTestRevisionRef.current += 1;
     setAgentTestState((state) =>
@@ -1946,6 +2024,187 @@ export function SettingsDialog({
   const activeHeader = sectionHeader[activeSection];
   const installedAgents = agents.filter((a) => a.available);
   const unavailableAgents = agents.filter((a) => !a.available);
+  const initialAgentScanRunning = agentsLoading && agents.length === 0;
+  const agentModelOptionLabel = (
+    model: ProviderModelOption | undefined,
+    fallback: string,
+  ) => {
+    if (!model) return fallback;
+    const label = model.label?.trim();
+    const id = model.id.trim();
+    if (label && label !== id) {
+      return label.toLowerCase().includes(id.toLowerCase())
+        ? label
+        : `${label} (${id})`;
+    }
+    return label || id;
+  };
+  const agentModelSummary = (agent: AgentInfo) => {
+    if (!Array.isArray(agent.models) || agent.models.length === 0) return null;
+    const choice = cfg.agentModels?.[agent.id] ?? {};
+    const modelValue = choice.model ?? agent.models[0]?.id ?? '';
+    if (!modelValue) return t('settings.modelCustom');
+    return agentModelOptionLabel(
+      agent.models.find((m) => m.id === modelValue),
+      modelValue,
+    );
+  };
+  const renderAgentModelConfig = (selected: AgentInfo) => {
+    const hasModels =
+      Array.isArray(selected.models) && selected.models.length > 0;
+    const hasReasoning =
+      Array.isArray(selected.reasoningOptions) &&
+      selected.reasoningOptions.length > 0;
+    if (!hasModels && !hasReasoning) return null;
+    const choice = cfg.agentModels?.[selected.id] ?? {};
+    const knownModelIds = selected.models?.map((m) => m.id) ?? [];
+    const allowCustomModel = selected.id !== 'amr';
+    const configuredModel =
+      typeof choice.model === 'string' && choice.model
+        ? choice.model
+        : null;
+    const setChoice = (
+      next: { model?: string; reasoning?: string },
+    ) => {
+      setCfg((c) => {
+        const prev = c.agentModels?.[selected.id] ?? {};
+        return {
+          ...c,
+          agentModels: {
+            ...(c.agentModels ?? {}),
+            [selected.id]: { ...prev, ...next },
+          },
+        };
+      });
+    };
+    const modelValue =
+      selected.id === 'amr' &&
+      configuredModel &&
+      !knownModelIds.includes(configuredModel)
+        ? selected.models?.[0]?.id ?? ''
+        : configuredModel ?? selected.models?.[0]?.id ?? '';
+    const reasoningValue =
+      choice.reasoning ??
+      selected.reasoningOptions?.[0]?.id ?? '';
+    const customActive =
+      allowCustomModel &&
+      hasModels &&
+      shouldShowCustomModelInput(
+        modelValue,
+        knownModelIds,
+        agentCustomModelIds.has(selected.id),
+      );
+    const selectValue = customActive
+      ? CUSTOM_MODEL_SENTINEL
+      : modelValue;
+    const modelSource = selected.modelsSource ?? 'fallback';
+    const modelSourceLabel =
+      modelSource === 'live'
+        ? t('settings.modelSourceLive')
+        : t('settings.modelSourceFallback');
+    const modelSourceHint =
+      modelSource === 'live'
+        ? t('settings.modelPickerLiveHint')
+        : t('settings.modelPickerFallbackHint');
+    return (
+      <div className="agent-card-config">
+        {hasModels ? (
+          <>
+            <label className="field">
+              <span className="field-label">
+                {t('settings.modelPicker')}
+                <span
+                  className={`agent-model-source-badge ${modelSource}`}
+                  aria-hidden="true"
+                >
+                  {modelSourceLabel}
+                </span>
+              </span>
+              <div className="agent-model-select-wrap">
+                <select
+                  value={selectValue}
+                  onChange={(e) => {
+                    if (e.target.value === CUSTOM_MODEL_SENTINEL) {
+                      setAgentCustomModelIds((prev) => {
+                        const next = new Set(prev);
+                        next.add(selected.id);
+                        return next;
+                      });
+                      setChoice({ model: '' });
+                    } else {
+                      setAgentCustomModelIds((prev) => {
+                        if (!prev.has(selected.id)) return prev;
+                        const next = new Set(prev);
+                        next.delete(selected.id);
+                        return next;
+                      });
+                      setChoice({ model: e.target.value });
+                    }
+                  }}
+                >
+                  {renderModelOptions(selected.models!)}
+                  {allowCustomModel ? (
+                    <option value={CUSTOM_MODEL_SENTINEL}>
+                      {t('settings.modelCustom')}
+                    </option>
+                  ) : null}
+                </select>
+                <Icon
+                  name="chevron-down"
+                  size={12}
+                  className="agent-model-select-chevron"
+                />
+              </div>
+            </label>
+            <p className="hint agent-model-row-hint">
+              {modelSourceHint}
+            </p>
+          </>
+        ) : null}
+        {customActive ? (
+          <label className="field">
+            <span className="field-label">
+              {t('settings.modelCustomLabel')}
+            </span>
+            <input
+              type="text"
+              value={modelValue}
+              placeholder={t('settings.modelCustomPlaceholder')}
+              onChange={(e) =>
+                setChoice({ model: e.target.value.trim() })
+              }
+            />
+          </label>
+        ) : null}
+        {hasReasoning ? (
+          <label className="field">
+            <span className="field-label">
+              {t('settings.reasoningPicker')}
+            </span>
+            <div className="agent-model-select-wrap">
+              <select
+                value={reasoningValue}
+                onChange={(e) =>
+                  setChoice({ reasoning: e.target.value })
+                }
+              >
+                {selected.reasoningOptions!.map((r) => (
+                  <option key={r.id} value={r.id}>
+                    {r.label}
+                  </option>
+                ))}
+              </select>
+              <Icon
+                name="chevron-down"
+                size={12}
+                className="agent-model-select-chevron"
+              />
+            </div>
+          </label>
+        ) : null}
+      </div>
+    );
+  };
 
   return (
     <div className="modal-backdrop" onClick={onClose}>
@@ -2287,7 +2546,23 @@ export function SettingsDialog({
                   <p className="hint">{t('settings.codeAgentHint')}</p>
                 </div>
               </div>
-              {agents.length === 0 ? (
+              {initialAgentScanRunning ? (
+                <div className="agent-scan-card" role="status" aria-live="polite">
+                  <div className="agent-scan-card__stage">
+                    <span className="agent-scan-card__ring" aria-hidden />
+                    <strong>{t('settings.rescanRunning')}</strong>
+                    <span>{t('settings.codeAgentHint')}</span>
+                    <div className="agent-scan-card__progress" aria-hidden>
+                      <span />
+                    </div>
+                  </div>
+                  <div className="agent-scan-card__rows" aria-hidden>
+                    <span><i /><b /><em /></span>
+                    <span><i /><b /><em /></span>
+                    <span><i /><b /><em /></span>
+                  </div>
+                </div>
+              ) : agents.length === 0 ? (
                 <div className="empty-card">
                   {t('settings.noAgentsDetected')}
                 </div>
@@ -2347,102 +2622,219 @@ export function SettingsDialog({
                     </div>
                     {installedAgents.length > 0 ? (
                       <div className="agent-grid agent-grid-installed">
-                        {installedAgents.flatMap((a) => {
+                        {installedAgents.map((a) => {
                           const active = cfg.agentId === a.id;
                           const running =
                             active && agentTestState.status === 'running';
+                          const isAmrAgent = a.id === 'amr';
                           const description = AGENT_SHORT_DESCRIPTIONS[a.id];
-                          const versionLabel = cleanAgentVersionLabel(
-                            a.name,
-                            a.version,
-                          );
+                          const agentName = displayAgentName(a);
+                          const modelSummary = agentModelSummary(a);
+                          const amrBenefits = [
+                            t('settings.amrBenefitOfficial'),
+                            t('settings.amrBenefitLowerPrice'),
+                            t('settings.amrBenefitManyModels'),
+                          ];
+                          const versionLabel =
+                            isAmrAgent
+                              ? ''
+                              : cleanAgentVersionLabel(a.name, a.version);
+                          const metaLabel =
+                            a.authStatus === 'missing'
+                              ? t('settings.agentAuthRequired')
+                              : a.authStatus === 'unknown'
+                                ? t('settings.agentAuthUnknown')
+                                : versionLabel
+                                  ? versionLabel
+                                  : a.id === 'amr'
+                                    ? ''
+                                    : t('common.installed');
+                          const metaTitle =
+                            a.authStatus === 'missing' ||
+                            a.authStatus === 'unknown'
+                              ? (a.authMessage ?? a.path ?? '')
+                              : (a.path ?? '');
+                          const amrHighlighted = isAmrAgent && amrHighlightActive;
+                          const amrCardEmail =
+                            isAmrAgent && active && amrCardStatus?.loggedIn
+                              ? amrCardStatus.user?.email || t('settings.amrSignedIn')
+                              : '';
+                          const amrRevealPendingCancelAction =
+                            isAmrAgent &&
+                            active &&
+                            hoveredAgentCardId === a.id &&
+                            amrCardStatus?.loggedIn !== true &&
+                            amrCardStatus?.loginInFlight === true;
                           const cardEl = (
                             <div
                               key={a.id}
+                              ref={isAmrAgent ? amrCardRef : undefined}
                               className={
                                 'agent-card agent-card-installed' +
-                                (active ? ' active' : '')
+                                (active ? ' active' : '') +
+                                (amrHighlighted ? ' agent-card--amr-highlight' : '')
                               }
+                              onMouseEnter={() => {
+                                if (!isAmrAgent || !active) return;
+                                setHoveredAgentCardId(a.id);
+                              }}
+                              onMouseLeave={() => {
+                                if (hoveredAgentCardId !== a.id) return;
+                                setHoveredAgentCardId(null);
+                              }}
                             >
-                              <button
-                                type="button"
-                                className="agent-card-select"
-                                onClick={() => {
-                                  trackSettingsLocalCliClick(analytics.track, {
-                                    page_name: 'settings',
-                                    area: 'configure_execution_mode_local_cli',
-                                    element: 'cli_provider',
-                                    cli_provider_id: agentIdToTracking(a.id),
-                                    install_status: 'installed',
-                                  });
-                                  setCfg((c) => ({ ...c, agentId: a.id }));
-                                }}
-                                aria-pressed={active}
-                              >
-                                <AgentIcon id={a.id} size={32} />
-                                <div className="agent-card-body">
-                                  <div className="agent-card-name">
-                                    <span>{a.name}</span>
-                                    {description ? (
-                                      <>
-                                        <span
-                                          className="agent-card-name-divider"
-                                          aria-hidden="true"
-                                        >
-                                          ·
-                                        </span>
-                                        <span className="agent-card-tagline">
-                                          {description}
-                                        </span>
-                                      </>
-                                    ) : null}
-                                  </div>
-                                  <div className="agent-card-meta">
-                                    {a.authStatus === 'missing' ? (
-                                      <span title={a.authMessage ?? a.path ?? ''}>
-                                        {t('settings.agentAuthRequired')}
-                                      </span>
-                                    ) : a.authStatus === 'unknown' ? (
-                                      <span title={a.authMessage ?? a.path ?? ''}>
-                                        {t('settings.agentAuthUnknown')}
-                                      </span>
-                                    ) : versionLabel ? (
-                                      <span title={a.path ?? ''}>
-                                        {versionLabel}
-                                      </span>
-                                    ) : (
-                                      <span title={a.path ?? ''}>
-                                        {t('common.installed')}
-                                      </span>
-                                    )}
-                                  </div>
-                                </div>
-                              </button>
-                              {active ? (
+                              <div className="agent-card-main">
                                 <button
                                   type="button"
-                                  className={
-                                    'ghost icon-btn settings-test-btn agent-card-test-btn' +
-                                    (running ? ' loading' : '')
-                                  }
-                                  onClick={() => void handleTestAgent()}
-                                  disabled={running}
-                                  title={t('settings.testTitle')}
-                                >
-                                  {running ? (
-                                    <>
-                                      <Icon
-                                        name="spinner"
-                                        size={13}
-                                        className="icon-spin"
-                                      />
-                                      <span>{t('settings.test')}</span>
-                                    </>
-                                  ) : (
-                                    t('settings.test')
-                                  )}
+                                  className="agent-card-select"
+                                  onClick={() => {
+                                    trackSettingsLocalCliClick(analytics.track, {
+                                      page_name: 'settings',
+                                      area: 'configure_execution_mode_local_cli',
+                                      element: 'cli_provider',
+                                      cli_provider_id: agentIdToTracking(a.id),
+                                      install_status: 'installed',
+                                    });
+                                    setCfg((c) => ({ ...c, agentId: a.id }));
+                                  }}
+                                  aria-pressed={active}
+                                  >
+                                    <AgentIcon id={a.id} size={32} />
+                                    <div className="agent-card-body">
+                                      <div
+                                        className={
+                                          'agent-card-name' +
+                                          (isAmrAgent
+                                            ? ' agent-card-name--amr'
+                                            : '')
+                                        }
+                                      >
+                                        <span className="agent-card-title">
+                                          {agentName}
+                                        </span>
+                                        {isAmrAgent ? (
+                                          <span
+                                            className="agent-card-benefits"
+                                            aria-hidden="true"
+                                          >
+                                            {amrBenefits.map((benefit) => (
+                                              <span
+                                                key={benefit}
+                                                className="agent-card-benefit"
+                                              >
+                                                {benefit}
+                                              </span>
+                                            ))}
+                                          </span>
+                                        ) : description ? (
+                                          <>
+                                            <span
+                                              className="agent-card-name-divider"
+                                              aria-hidden="true"
+                                            >
+                                              ·
+                                            </span>
+                                            <span className="agent-card-tagline">
+                                              {description}
+                                            </span>
+                                          </>
+                                        ) : null}
+                                      </div>
+                                      {metaLabel ? (
+                                        <div className="agent-card-meta">
+                                          <span title={metaTitle}>
+                                            {metaLabel}
+                                          </span>
+                                        </div>
+                                      ) : null}
+                                      {amrCardEmail ? (
+                                        <div className="agent-card-amr-email">
+                                          <span title={amrCardEmail}>
+                                            {amrCardEmail}
+                                          </span>
+                                        </div>
+                                      ) : null}
+                                      {!active && modelSummary ? (
+                                        <div className="agent-card-model-summary">
+                                          <span>{t('settings.modelPicker')}</span>
+                                          <strong>{modelSummary}</strong>
+                                        </div>
+                                      ) : null}
+                                  </div>
                                 </button>
-                              ) : null}
+                                {isAmrAgent ? (
+                                  active && amrCardStatusReady ? (
+                                    <span
+                                      className="amr-auth-anchor"
+                                      onMouseEnter={() => setAmrCoachmarkDismissed(true)}
+                                    >
+                                      {amrCoachmarkArmed &&
+                                      amrCardStatus?.loggedIn === false &&
+                                      !amrCoachmarkDismissed ? (
+                                        <span className="amr-coachmark" aria-hidden="true">
+                                          <span className="amr-coachmark__ring" />
+                                          <svg
+                                            className="amr-coachmark__cursor"
+                                            width="22"
+                                            height="22"
+                                            viewBox="0 0 24 24"
+                                            fill="none"
+                                          >
+                                            <path
+                                              d="M9.4 13V8a1.8 1.8 0 0 1 3.6 0v4.6c.35-.55 1-.95 1.75-.95.65 0 1.25.32 1.6.85.32-.5.9-.8 1.55-.8.8 0 1.5.5 1.78 1.2.35-.3.8-.5 1.3-.5 1.1 0 2 .9 2 2v3.05a5.6 5.6 0 0 1-5.6 5.6h-2.5a5 5 0 0 1-3.75-1.7l-4.2-4.75a1.85 1.85 0 0 1 2.65-2.6L9.4 16Z"
+                                              fill="#fff"
+                                              stroke="#1a1a1a"
+                                              strokeWidth="1.1"
+                                              strokeLinejoin="round"
+                                            />
+                                          </svg>
+                                        </span>
+                                      ) : null}
+                                      <AmrLoginPill
+                                        className="agent-card-amr-auth"
+                                        hideSignedOutStatus
+                                        hideSignedInStatus
+                                        initialStatus={amrCardStatus}
+                                        skipInitialRefresh
+                                        signInLabel={t('settings.amrAuthorize')}
+                                        revealPendingCancelAction={amrRevealPendingCancelAction}
+                                        onStatusChange={setAmrCardStatus}
+                                      />
+                                    </span>
+                                  ) : (
+                                    <div
+                                      className="agent-card-amr-auth agent-card-amr-auth--placeholder"
+                                      aria-hidden="true"
+                                    />
+                                  )
+                                ) : null}
+                                {active && !isAmrAgent ? (
+                                  <button
+                                    type="button"
+                                    className={
+                                      'ghost icon-btn settings-test-btn agent-card-test-btn' +
+                                      (running ? ' loading' : '')
+                                    }
+                                    onClick={() => void handleTestAgent()}
+                                    disabled={running}
+                                    title={t('settings.testTitle')}
+                                  >
+                                    {running ? (
+                                      <>
+                                        <Icon
+                                          name="spinner"
+                                          size={13}
+                                          className="icon-spin"
+                                        />
+                                        <span>{t('settings.test')}</span>
+                                      </>
+                                    ) : (
+                                      t('settings.test')
+                                    )}
+                                  </button>
+                                ) : null}
+                              </div>
+                              {active ? renderAgentModelConfig(a) : null}
                             </div>
                           );
                           if (active && agentTestState.status !== 'idle') {
@@ -2542,155 +2934,6 @@ export function SettingsDialog({
                       </div>
                     )}
                   </div>
-              {(() => {
-                const selected = agents.find(
-                  (a) => a.id === cfg.agentId && a.available,
-                );
-                if (!selected) return null;
-                const hasModels =
-                  Array.isArray(selected.models) && selected.models.length > 0;
-                const hasReasoning =
-                  Array.isArray(selected.reasoningOptions) &&
-                  selected.reasoningOptions.length > 0;
-                if (!hasModels && !hasReasoning) return null;
-                const choice = cfg.agentModels?.[selected.id] ?? {};
-                const setChoice = (
-                  next: { model?: string; reasoning?: string },
-                ) => {
-                  setCfg((c) => {
-                    const prev = c.agentModels?.[selected.id] ?? {};
-                    return {
-                      ...c,
-                      agentModels: {
-                        ...(c.agentModels ?? {}),
-                        [selected.id]: { ...prev, ...next },
-                      },
-                    };
-                  });
-                };
-                const modelValue =
-                  choice.model ?? selected.models?.[0]?.id ?? '';
-                const reasoningValue =
-                  choice.reasoning ??
-                  selected.reasoningOptions?.[0]?.id ?? '';
-                const customActive =
-                  hasModels &&
-                  shouldShowCustomModelInput(
-                    modelValue,
-                    selected.models!.map((m) => m.id),
-                    agentCustomModelIds.has(selected.id),
-                  );
-                const selectValue = customActive
-                  ? CUSTOM_MODEL_SENTINEL
-                  : modelValue;
-                const modelSource = selected.modelsSource ?? 'fallback';
-                const modelSourceLabel =
-                  modelSource === 'live'
-                    ? t('settings.modelSourceLive')
-                    : t('settings.modelSourceFallback');
-                const modelSourceHint =
-                  modelSource === 'live'
-                    ? t('settings.modelPickerLiveHint')
-                    : t('settings.modelPickerFallbackHint');
-                return (
-                  <div className="agent-model-row">
-                    <div className="agent-model-row-head">
-                      {t('settings.agentModelHead')} <strong>{selected.name}</strong>
-                    </div>
-                    {hasModels ? (
-                      <>
-                        <label className="field">
-                          <span className="field-label">
-                            {t('settings.modelPicker')}
-                            <span
-                              className={`agent-model-source-badge ${modelSource}`}
-                            >
-                              {modelSourceLabel}
-                            </span>
-                          </span>
-                          <div className="agent-model-select-wrap">
-                            <select
-                              value={selectValue}
-                              onChange={(e) => {
-                                if (e.target.value === CUSTOM_MODEL_SENTINEL) {
-                                  setAgentCustomModelIds((prev) => {
-                                    const next = new Set(prev);
-                                    next.add(selected.id);
-                                    return next;
-                                  });
-                                  setChoice({ model: '' });
-                                } else {
-                                  setAgentCustomModelIds((prev) => {
-                                    if (!prev.has(selected.id)) return prev;
-                                    const next = new Set(prev);
-                                    next.delete(selected.id);
-                                    return next;
-                                  });
-                                  setChoice({ model: e.target.value });
-                                }
-                              }}
-                            >
-                              {renderModelOptions(selected.models!)}
-                              <option value={CUSTOM_MODEL_SENTINEL}>
-                                {t('settings.modelCustom')}
-                              </option>
-                            </select>
-                            <Icon
-                              name="chevron-down"
-                              size={12}
-                              className="agent-model-select-chevron"
-                            />
-                          </div>
-                        </label>
-                        <p className="hint agent-model-row-hint">
-                          {modelSourceHint}
-                        </p>
-                      </>
-                    ) : null}
-                    {customActive ? (
-                      <label className="field">
-                        <span className="field-label">
-                          {t('settings.modelCustomLabel')}
-                        </span>
-                        <input
-                          type="text"
-                          value={modelValue}
-                          placeholder={t('settings.modelCustomPlaceholder')}
-                          onChange={(e) =>
-                            setChoice({ model: e.target.value.trim() })
-                          }
-                        />
-                      </label>
-                    ) : null}
-                    {hasReasoning ? (
-                      <label className="field">
-                        <span className="field-label">
-                          {t('settings.reasoningPicker')}
-                        </span>
-                        <div className="agent-model-select-wrap">
-                          <select
-                            value={reasoningValue}
-                            onChange={(e) =>
-                              setChoice({ reasoning: e.target.value })
-                            }
-                          >
-                            {selected.reasoningOptions!.map((r) => (
-                              <option key={r.id} value={r.id}>
-                                {r.label}
-                              </option>
-                            ))}
-                          </select>
-                          <Icon
-                            name="chevron-down"
-                            size={12}
-                            className="agent-model-select-chevron"
-                          />
-                        </div>
-                      </label>
-                    ) : null}
-                  </div>
-                );
-              })()}
                   {unavailableAgents.length > 0 ? (
                     <details
                       className="agent-install-collapse"
@@ -2709,7 +2952,8 @@ export function SettingsDialog({
                           const docsUrl = sanitizeHttpsUrl(a.docsUrl);
                           const hasLinks = Boolean(installUrl || docsUrl);
                           const description = AGENT_SHORT_DESCRIPTIONS[a.id];
-                          const cardLabel = `${a.name} · ${t('common.notInstalled')}`;
+                          const agentName = displayAgentName(a);
+                          const cardLabel = `${agentName} · ${t('common.notInstalled')}`;
                           return (
                             <div
                               key={a.id}
@@ -2719,7 +2963,7 @@ export function SettingsDialog({
                             >
                               <AgentIcon id={a.id} size={40} />
                               <div className="agent-card-body">
-                                <div className="agent-card-name">{a.name}</div>
+                                <div className="agent-card-name">{agentName}</div>
                                 {description ? (
                                   <div className="agent-card-description">
                                     {description}
@@ -2795,8 +3039,17 @@ export function SettingsDialog({
                 const hasModels =
                   Array.isArray(selected.models) && selected.models.length > 0;
                 const choice = cfg.agentModels?.[selected.id] ?? {};
+                const knownModelIds = selected.models?.map((m) => m.id) ?? [];
+                const configuredModel =
+                  typeof choice.model === 'string' && choice.model
+                    ? choice.model
+                    : null;
                 const modelValue =
-                  choice.model ?? selected.models?.[0]?.id ?? '';
+                  selected.id === 'amr' &&
+                  configuredModel &&
+                  !knownModelIds.includes(configuredModel)
+                    ? selected.models?.[0]?.id ?? ''
+                    : configuredModel ?? selected.models?.[0]?.id ?? '';
                 return (
                   <details className="agent-cli-env settings-memory-advanced">
                     <summary className="agent-cli-env-summary">
diff --git a/apps/web/src/components/agentModelSelection.ts b/apps/web/src/components/agentModelSelection.ts
new file mode 100644
index 000000000..c455339a4
--- /dev/null
+++ b/apps/web/src/components/agentModelSelection.ts
@@ -0,0 +1,29 @@
+import type { AgentInfo, AgentModelChoice } from '../types';
+
+type AgentModelSource = Pick<AgentInfo, 'id' | 'models'> | null | undefined;
+
+export function normalizeAgentModelChoice(
+  agent: AgentModelSource,
+  choice: AgentModelChoice | undefined,
+): AgentModelChoice | null {
+  const configuredModel =
+    typeof choice?.model === 'string' && choice.model ? choice.model : null;
+  if (agent?.id !== 'amr' || !configuredModel) return null;
+
+  const modelIds = agent.models?.map((model) => model.id) ?? [];
+  if (modelIds.length === 0 || modelIds.includes(configuredModel)) {
+    return null;
+  }
+
+  return {
+    ...choice,
+    model: modelIds[0],
+  };
+}
+
+export function effectiveAgentModelChoice(
+  agent: AgentModelSource,
+  choice: AgentModelChoice | undefined,
+): AgentModelChoice | undefined {
+  return normalizeAgentModelChoice(agent, choice) ?? choice;
+}
diff --git a/apps/web/src/components/amrLoginPolling.ts b/apps/web/src/components/amrLoginPolling.ts
new file mode 100644
index 000000000..ee1730fe2
--- /dev/null
+++ b/apps/web/src/components/amrLoginPolling.ts
@@ -0,0 +1,52 @@
+import type { VelaLoginStatus } from '../providers/daemon';
+
+export const AMR_LOGIN_POLL_INTERVAL_MS = 2000;
+export const AMR_LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
+export const AMR_LOGIN_STARTUP_SETTLE_MS = 3000;
+export const AMR_LOGIN_STATUS_EVENT = 'od:amr-login-status-change';
+
+export type AmrLoginPollOutcome = 'pending' | 'signed-in' | 'stopped' | 'timed-out';
+export type AmrLoginStatusEventReason =
+  | 'login-started'
+  | 'login-canceled'
+  | 'status-changed';
+
+export function amrLoginPollOutcome(
+  status: VelaLoginStatus | null,
+  startedAt: number,
+  now: number = Date.now(),
+): AmrLoginPollOutcome {
+  if (status?.loggedIn) return 'signed-in';
+  if (
+    status?.loginInFlight === false &&
+    now - startedAt >= AMR_LOGIN_STARTUP_SETTLE_MS
+  ) {
+    return 'stopped';
+  }
+  if (now - startedAt >= AMR_LOGIN_TIMEOUT_MS) return 'timed-out';
+  return 'pending';
+}
+
+export function notifyAmrLoginStatusChanged(
+  reason: AmrLoginStatusEventReason = 'status-changed',
+) {
+  window.dispatchEvent(
+    new CustomEvent(AMR_LOGIN_STATUS_EVENT, { detail: { reason } }),
+  );
+}
+
+export function amrLoginStatusEventReason(
+  event: Event,
+): AmrLoginStatusEventReason {
+  if (event instanceof CustomEvent) {
+    const reason = (event.detail as { reason?: unknown } | null)?.reason;
+    if (
+      reason === 'login-started' ||
+      reason === 'login-canceled' ||
+      reason === 'status-changed'
+    ) {
+      return reason;
+    }
+  }
+  return 'status-changed';
+}
diff --git a/apps/web/src/i18n/locales/ar.ts b/apps/web/src/i18n/locales/ar.ts
index 7a1d99188..4b7ed1363 100644
--- a/apps/web/src/i18n/locales/ar.ts
+++ b/apps/web/src/i18n/locales/ar.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const ar: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'فشل استدعاء النموذج — تم إيقاف هذه المهمة مؤقتًا',
+  'chat.amrCard.switchBody': 'بدِّل إلى خدمة نماذج AMR الرسمية من Open Design — لا حاجة لإعداد مفتاح API. بعد تسجيل الدخول والتفويض والشحن، ستُعاد محاولة هذه المهمة تلقائيًا.',
+  'chat.amrCard.chipOfficial': 'استضافة رسمية',
+  'chat.amrCard.chipNoKey': 'بدون مفتاح API',
+  'chat.amrCard.chipAutoRetry': 'إعادة المحاولة تلقائيًا بعد تسجيل الدخول',
+  'chat.amrCard.switchCta': 'التبديل إلى AMR وإعادة المحاولة',
+  'chat.amrError.authMessage': 'حساب AMR الخاص بك لم يتم تفويضه بعد. فوِّضه وستُعاد محاولة هذه المهمة تلقائيًا.',
+  'chat.amrError.balanceMessage': 'نفد رصيد AMR الخاص بك. اشحن للاستمرار في هذه المهمة.',
+  'chat.amrError.authorizeCta': 'تفويض وإعادة المحاولة',
+  'chat.amrError.rechargeCta': 'شحن AMR',
   'plugins.actions.copyInstallCommand': 'نسخ أمر التثبيت',
   'plugins.actions.copyPluginId': 'نسخ معرّف الإضافة',
   'plugins.actions.copyReadmeBadge': 'نسخ شارة README',
@@ -97,7 +107,13 @@ export const ar: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'صيانة رسمية',
+  'settings.onboardingAmrCloudBenefitReady': 'جاهز للاستخدام',
+  'settings.onboardingAmrCloudBenefitModels': 'نماذج عديدة',
+  'settings.onboardingAmrCloudBenefitPricing': 'أسعار أفضل',
+  'settings.onboardingAmrCloudAuthorizeAction': 'تخويل AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'تم التخويل',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const ar: Dict = {
   'settings.agentInstallGroup': 'متاحة للتثبيت ({count})',
   'settings.agentAuthRequired': 'المصادقة مطلوبة',
   'settings.agentAuthUnknown': 'حالة المصادقة غير معروفة',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'ملء المزوّد سريعًا',
   'settings.customProvider': 'مزوّد مخصص',
diff --git a/apps/web/src/i18n/locales/de.ts b/apps/web/src/i18n/locales/de.ts
index f6f760f36..e19eb8711 100644
--- a/apps/web/src/i18n/locales/de.ts
+++ b/apps/web/src/i18n/locales/de.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const de: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Modellaufruf fehlgeschlagen — dieser Lauf ist pausiert',
+  'chat.amrCard.switchBody': 'Wechsle zum offiziellen AMR-Modelldienst von Open Design — kein API-Key-Setup nötig. Nach Anmeldung, Autorisierung und Aufladung wird dieser Lauf automatisch wiederholt.',
+  'chat.amrCard.chipOfficial': 'Offizielles Hosting',
+  'chat.amrCard.chipNoKey': 'Kein API-Key',
+  'chat.amrCard.chipAutoRetry': 'Auto-Wiederholung nach Anmeldung',
+  'chat.amrCard.switchCta': 'Zu AMR wechseln und wiederholen',
+  'chat.amrError.authMessage': 'Dein AMR-Konto ist noch nicht autorisiert. Autorisiere es, und dieser Lauf wird automatisch wiederholt.',
+  'chat.amrError.balanceMessage': 'Dein AMR-Guthaben ist aufgebraucht. Lade auf, um diesen Lauf fortzusetzen.',
+  'chat.amrError.authorizeCta': 'Autorisieren und wiederholen',
+  'chat.amrError.rechargeCta': 'AMR aufladen',
   'plugins.actions.copyInstallCommand': 'Installationsbefehl kopieren',
   'plugins.actions.copyPluginId': 'Plugin-ID kopieren',
   'plugins.actions.copyReadmeBadge': 'README-Badge kopieren',
@@ -97,7 +107,13 @@ export const de: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Offiziell gepflegt',
+  'settings.onboardingAmrCloudBenefitReady': 'Sofort einsatzbereit',
+  'settings.onboardingAmrCloudBenefitModels': 'Viele Modelle',
+  'settings.onboardingAmrCloudBenefitPricing': 'Günstigere Preise',
+  'settings.onboardingAmrCloudAuthorizeAction': 'AMR autorisieren',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Autorisiert',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const de: Dict = {
   'settings.agentInstallGroup': 'Zur Installation verfügbar ({count})',
   'settings.agentAuthRequired': 'Authentifizierung erforderlich',
   'settings.agentAuthUnknown': 'Authentifizierungsstatus unbekannt',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Anbieter schnell ausfüllen',
   'settings.customProvider': 'Benutzerdefinierter Anbieter',
diff --git a/apps/web/src/i18n/locales/en.ts b/apps/web/src/i18n/locales/en.ts
index be2d6b8ac..dc1c64de1 100644
--- a/apps/web/src/i18n/locales/en.ts
+++ b/apps/web/src/i18n/locales/en.ts
@@ -1,6 +1,16 @@
 import type { Dict } from '../types';
 
 export const en: Dict = {
+  'chat.amrCard.switchTitle': "Model call failed — this run is paused",
+  'chat.amrCard.switchBody': "Switch to Open Design's official AMR model service — no API key setup needed. After you sign in, authorize, and top up, this run retries automatically.",
+  'chat.amrCard.chipOfficial': "Official hosting",
+  'chat.amrCard.chipNoKey': "No API key",
+  'chat.amrCard.chipAutoRetry': "Auto-retry after sign-in",
+  'chat.amrCard.switchCta': "Switch to AMR & retry",
+  'chat.amrError.authMessage': "Your AMR account isn't authorized yet. Authorize it and this run retries automatically.",
+  'chat.amrError.balanceMessage': "Your AMR balance has run out. Top up to keep this run going.",
+  'chat.amrError.authorizeCta': "Authorize & retry",
+  'chat.amrError.rechargeCta': "Top up AMR",
   'common.cancel': 'Cancel',
   'common.save': 'Save',
   'common.close': 'Close',
@@ -84,13 +94,20 @@ export const en: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Officially maintained',
+  'settings.onboardingAmrCloudBenefitReady': 'Ready to use',
+  'settings.onboardingAmrCloudBenefitModels': 'Many models',
+  'settings.onboardingAmrCloudBenefitPricing': 'Better pricing',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Authorize AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Authorized',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
   'settings.onboardingConnectTitle': "Choose a runtime",
   'settings.onboardingConnectBody': "",
   'settings.onboardingRecommended': "Recommended",
+  'settings.onboardingAmrCloudOfficialBadge': "Official",
   'settings.onboardingLocalTitle': "Local coding agent",
   'settings.onboardingLocalBody': "Use an installed CLI such as Claude Code, Codex, Cursor, Gemini, or OpenCode.",
   'settings.onboardingLocalAction': "Open CLI settings",
@@ -216,7 +233,29 @@ export const en: Dict = {
   'settings.agentInstallGroup': 'Available to install ({count})',
   'settings.agentAuthRequired': 'Authentication required',
   'settings.agentAuthUnknown': 'Auth status unknown',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Official',
+  'settings.amrBenefitLowerPrice': 'Lower cost',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.advanced': 'Advanced',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Quick fill provider',
   'settings.customProvider': 'Custom provider',
@@ -282,7 +321,7 @@ export const en: Dict = {
   'settings.modelPickerHint':
     'Default uses the CLI’s own config. Custom… lets you type any model id.',
   'settings.modelPickerLiveHint':
-    'Models were refreshed from the installed CLI. Default still uses the CLI’s own config.',
+    "Model list comes from this CLI. Default uses the CLI's own config.",
   'settings.modelPickerFallbackHint':
     'Showing built-in defaults. Click Rescan to pull live models from the CLI.',
   'settings.cliEnvTitle': 'Advanced: proxy & custom paths',
diff --git a/apps/web/src/i18n/locales/es-ES.ts b/apps/web/src/i18n/locales/es-ES.ts
index f09508276..05eb57d72 100644
--- a/apps/web/src/i18n/locales/es-ES.ts
+++ b/apps/web/src/i18n/locales/es-ES.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const esES: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Falló la llamada al modelo — esta ejecución está en pausa',
+  'chat.amrCard.switchBody': 'Cambia al servicio oficial de modelos AMR de Open Design — sin configurar API Key. Tras iniciar sesión, autorizar y recargar, esta ejecución se reintentará automáticamente.',
+  'chat.amrCard.chipOfficial': 'Alojamiento oficial',
+  'chat.amrCard.chipNoKey': 'Sin API Key',
+  'chat.amrCard.chipAutoRetry': 'Reintento automático tras iniciar sesión',
+  'chat.amrCard.switchCta': 'Cambiar a AMR y reintentar',
+  'chat.amrError.authMessage': 'Tu cuenta de AMR aún no está autorizada. Autorízala y esta ejecución se reintentará automáticamente.',
+  'chat.amrError.balanceMessage': 'Tu saldo de AMR se ha agotado. Recarga para continuar esta ejecución.',
+  'chat.amrError.authorizeCta': 'Autorizar y reintentar',
+  'chat.amrError.rechargeCta': 'Recargar AMR',
   'plugins.actions.copyInstallCommand': 'Copiar comando de instalación',
   'plugins.actions.copyPluginId': 'Copiar ID del plugin',
   'plugins.actions.copyReadmeBadge': 'Copiar insignia README',
@@ -97,7 +107,13 @@ export const esES: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Mantenimiento oficial',
+  'settings.onboardingAmrCloudBenefitReady': 'Listo para usar',
+  'settings.onboardingAmrCloudBenefitModels': 'Muchos modelos',
+  'settings.onboardingAmrCloudBenefitPricing': 'Mejor precio',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Autorizar AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Autorizado',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const esES: Dict = {
   'settings.agentInstallGroup': 'Disponibles para instalar ({count})',
   'settings.agentAuthRequired': 'Autenticación requerida',
   'settings.agentAuthUnknown': 'Estado de autenticación desconocido',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'API de Anthropic',
   'settings.quickFillProvider': 'Rellenar proveedor',
   'settings.customProvider': 'Proveedor personalizado',
diff --git a/apps/web/src/i18n/locales/fa.ts b/apps/web/src/i18n/locales/fa.ts
index c0b202489..6beac811f 100644
--- a/apps/web/src/i18n/locales/fa.ts
+++ b/apps/web/src/i18n/locales/fa.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const fa: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'فراخوانی مدل ناموفق بود — این اجرا متوقف شد',
+  'chat.amrCard.switchBody': 'به سرویس رسمی مدل AMR از Open Design سوئیچ کنید — بدون نیاز به تنظیم کلید API. پس از ورود، اعطای دسترسی و شارژ، این اجرا به‌طور خودکار دوباره انجام می‌شود.',
+  'chat.amrCard.chipOfficial': 'میزبانی رسمی',
+  'chat.amrCard.chipNoKey': 'بدون کلید API',
+  'chat.amrCard.chipAutoRetry': 'تلاش مجدد خودکار پس از ورود',
+  'chat.amrCard.switchCta': 'سوئیچ به AMR و تلاش مجدد',
+  'chat.amrError.authMessage': 'حساب AMR شما هنوز مجاز نشده است. آن را مجاز کنید تا این اجرا به‌طور خودکار دوباره انجام شود.',
+  'chat.amrError.balanceMessage': 'موجودی AMR شما تمام شده است. برای ادامه این اجرا شارژ کنید.',
+  'chat.amrError.authorizeCta': 'اعطای دسترسی و تلاش مجدد',
+  'chat.amrError.rechargeCta': 'شارژ AMR',
   'plugins.actions.copyInstallCommand': 'کپی دستور نصب',
   'plugins.actions.copyPluginId': 'کپی شناسهٔ افزونه',
   'plugins.actions.copyReadmeBadge': 'کپی نشان README',
@@ -97,7 +107,13 @@ export const fa: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'نگهداری رسمی',
+  'settings.onboardingAmrCloudBenefitReady': 'آماده استفاده',
+  'settings.onboardingAmrCloudBenefitModels': 'مدل‌های فراوان',
+  'settings.onboardingAmrCloudBenefitPricing': 'قیمت بهتر',
+  'settings.onboardingAmrCloudAuthorizeAction': 'مجوزدهی AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'مجوز داده شد',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const fa: Dict = {
   'settings.agentInstallGroup': 'آماده نصب ({count})',
   'settings.agentAuthRequired': 'احراز هویت لازم است',
   'settings.agentAuthUnknown': 'وضعیت احراز هویت نامشخص است',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'پر کردن سریع ارائه‌دهنده',
   'settings.customProvider': 'ارائه‌دهنده سفارشی',
diff --git a/apps/web/src/i18n/locales/fr.ts b/apps/web/src/i18n/locales/fr.ts
index e33ecb889..6f7a117f9 100644
--- a/apps/web/src/i18n/locales/fr.ts
+++ b/apps/web/src/i18n/locales/fr.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const fr: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Échec de l\'appel du modèle — cette exécution est en pause',
+  'chat.amrCard.switchBody': 'Passez au service de modèles AMR officiel d\'Open Design — aucune clé API à configurer. Après connexion, autorisation et recharge, cette exécution sera relancée automatiquement.',
+  'chat.amrCard.chipOfficial': 'Hébergement officiel',
+  'chat.amrCard.chipNoKey': 'Sans clé API',
+  'chat.amrCard.chipAutoRetry': 'Reprise automatique après connexion',
+  'chat.amrCard.switchCta': 'Passer à AMR et relancer',
+  'chat.amrError.authMessage': 'Votre compte AMR n\'est pas encore autorisé. Autorisez-le et cette exécution sera relancée automatiquement.',
+  'chat.amrError.balanceMessage': 'Votre solde AMR est épuisé. Rechargez pour poursuivre cette exécution.',
+  'chat.amrError.authorizeCta': 'Autoriser et relancer',
+  'chat.amrError.rechargeCta': 'Recharger AMR',
   'plugins.actions.copyInstallCommand': 'Copier la commande d’installation',
   'plugins.actions.copyPluginId': 'Copier l’ID du plugin',
   'plugins.actions.copyReadmeBadge': 'Copier le badge README',
@@ -97,7 +107,13 @@ export const fr: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Maintenance officielle',
+  'settings.onboardingAmrCloudBenefitReady': 'Prêt à l’emploi',
+  'settings.onboardingAmrCloudBenefitModels': 'Nombreux modèles',
+  'settings.onboardingAmrCloudBenefitPricing': 'Prix avantageux',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Autoriser AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Autorisé',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const fr: Dict = {
   'settings.agentInstallGroup': 'Disponibles à installer ({count})',
   'settings.agentAuthRequired': 'Authentification requise',
   'settings.agentAuthUnknown': 'Statut d’authentification inconnu',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'API Anthropic',
   'settings.quickFillProvider': 'Remplissage rapide du fournisseur',
   'settings.customProvider': 'Fournisseur personnalisé',
diff --git a/apps/web/src/i18n/locales/hu.ts b/apps/web/src/i18n/locales/hu.ts
index eef778046..b913e5adf 100644
--- a/apps/web/src/i18n/locales/hu.ts
+++ b/apps/web/src/i18n/locales/hu.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const hu: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Sikertelen modellhívás — ez a futtatás szünetel',
+  'chat.amrCard.switchBody': 'Válts az Open Design hivatalos AMR modellszolgáltatására — nincs szükség API-kulcs beállítására. Bejelentkezés, engedélyezés és feltöltés után ez a futtatás automatikusan újraindul.',
+  'chat.amrCard.chipOfficial': 'Hivatalos szolgáltatás',
+  'chat.amrCard.chipNoKey': 'Nincs API-kulcs',
+  'chat.amrCard.chipAutoRetry': 'Automatikus újrapróbálkozás bejelentkezés után',
+  'chat.amrCard.switchCta': 'Váltás AMR-re és újrapróbálkozás',
+  'chat.amrError.authMessage': 'Az AMR-fiókod még nincs engedélyezve. Engedélyezd, és ez a futtatás automatikusan újraindul.',
+  'chat.amrError.balanceMessage': 'Az AMR-egyenleged elfogyott. Tölts fel a futtatás folytatásához.',
+  'chat.amrError.authorizeCta': 'Engedélyezés és újrapróbálkozás',
+  'chat.amrError.rechargeCta': 'AMR feltöltése',
   'plugins.actions.copyInstallCommand': 'Telepítési parancs másolása',
   'plugins.actions.copyPluginId': 'Pluginazonosító másolása',
   'plugins.actions.copyReadmeBadge': 'README jelvény másolása',
@@ -97,7 +107,13 @@ export const hu: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Hivatalosan karbantartott',
+  'settings.onboardingAmrCloudBenefitReady': 'Azonnal használható',
+  'settings.onboardingAmrCloudBenefitModels': 'Sok modell',
+  'settings.onboardingAmrCloudBenefitPricing': 'Kedvezőbb ár',
+  'settings.onboardingAmrCloudAuthorizeAction': 'AMR engedélyezése',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Engedélyezve',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const hu: Dict = {
   'settings.agentInstallGroup': 'Telepíthető ({count})',
   'settings.agentAuthRequired': 'Hitelesítés szükséges',
   'settings.agentAuthUnknown': 'A hitelesítési állapot ismeretlen',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Szolgáltató gyors kitöltése',
   'settings.customProvider': 'Egyéni szolgáltató',
diff --git a/apps/web/src/i18n/locales/id.ts b/apps/web/src/i18n/locales/id.ts
index a77dfd096..8091433e5 100644
--- a/apps/web/src/i18n/locales/id.ts
+++ b/apps/web/src/i18n/locales/id.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const id: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Panggilan model gagal — proses ini dijeda',
+  'chat.amrCard.switchBody': 'Beralih ke layanan model AMR resmi Open Design — tanpa perlu mengatur API Key. Setelah masuk, otorisasi, dan isi ulang, proses ini akan dicoba ulang otomatis.',
+  'chat.amrCard.chipOfficial': 'Hosting resmi',
+  'chat.amrCard.chipNoKey': 'Tanpa API Key',
+  'chat.amrCard.chipAutoRetry': 'Coba ulang otomatis setelah masuk',
+  'chat.amrCard.switchCta': 'Beralih ke AMR & coba lagi',
+  'chat.amrError.authMessage': 'Akun AMR Anda belum diotorisasi. Otorisasi sekarang dan proses ini akan dicoba ulang otomatis.',
+  'chat.amrError.balanceMessage': 'Saldo AMR Anda habis. Isi ulang untuk melanjutkan proses ini.',
+  'chat.amrError.authorizeCta': 'Otorisasi & coba lagi',
+  'chat.amrError.rechargeCta': 'Isi ulang AMR',
   'plugins.actions.copyInstallCommand': 'Salin perintah instal',
   'plugins.actions.copyPluginId': 'Salin ID plugin',
   'plugins.actions.copyReadmeBadge': 'Salin lencana README',
@@ -97,7 +107,13 @@ export const id: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Dikelola resmi',
+  'settings.onboardingAmrCloudBenefitReady': 'Siap pakai',
+  'settings.onboardingAmrCloudBenefitModels': 'Banyak model',
+  'settings.onboardingAmrCloudBenefitPricing': 'Harga lebih hemat',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Otorisasi AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Diotorisasi',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const id: Dict = {
   'settings.agentInstallGroup': 'Tersedia untuk dipasang ({count})',
   'settings.agentAuthRequired': 'Autentikasi diperlukan',
   'settings.agentAuthUnknown': 'Status autentikasi tidak diketahui',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Provider isi cepat',
   'settings.customProvider': 'Provider kustom',
diff --git a/apps/web/src/i18n/locales/it.ts b/apps/web/src/i18n/locales/it.ts
index 14b50baa3..649cfaf80 100644
--- a/apps/web/src/i18n/locales/it.ts
+++ b/apps/web/src/i18n/locales/it.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const it: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Chiamata al modello fallita — questa esecuzione è in pausa',
+  'chat.amrCard.switchBody': 'Passa al servizio modelli AMR ufficiale di Open Design — nessuna chiave API da configurare. Dopo accesso, autorizzazione e ricarica, questa esecuzione verrà ritentata automaticamente.',
+  'chat.amrCard.chipOfficial': 'Hosting ufficiale',
+  'chat.amrCard.chipNoKey': 'Senza chiave API',
+  'chat.amrCard.chipAutoRetry': 'Ritenta automatico dopo l\'accesso',
+  'chat.amrCard.switchCta': 'Passa ad AMR e riprova',
+  'chat.amrError.authMessage': 'Il tuo account AMR non è ancora autorizzato. Autorizzalo e questa esecuzione verrà ritentata automaticamente.',
+  'chat.amrError.balanceMessage': 'Il tuo saldo AMR è esaurito. Ricarica per continuare questa esecuzione.',
+  'chat.amrError.authorizeCta': 'Autorizza e riprova',
+  'chat.amrError.rechargeCta': 'Ricarica AMR',
   'plugins.actions.copyInstallCommand': 'Copia comando di installazione',
   'plugins.actions.copyPluginId': 'Copia ID plugin',
   'plugins.actions.copyReadmeBadge': 'Copia badge README',
@@ -96,7 +106,13 @@ export const it: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Manutenzione ufficiale',
+  'settings.onboardingAmrCloudBenefitReady': 'Pronto all’uso',
+  'settings.onboardingAmrCloudBenefitModels': 'Molti modelli',
+  'settings.onboardingAmrCloudBenefitPricing': 'Prezzi migliori',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Autorizza AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Autorizzato',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -222,6 +238,28 @@ export const it: Dict = {
     'Nessun agente rilevato per ora. Installa Claude Code, Codex, Devin for Terminal, Gemini CLI, OpenCode, Cursor Agent, Qwen o GitHub Copilot CLI, poi clicca su Rianalizza.',
   'settings.agentInstalledGroup': 'Le tue CLI ({count})',
   'settings.agentInstallGroup': 'Disponibili per l\'installazione ({count})',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'API Anthropic',
   'settings.quickFillProvider': 'Compilazione rapida del provider',
   'settings.customProvider': 'Provider personalizzato',
diff --git a/apps/web/src/i18n/locales/ja.ts b/apps/web/src/i18n/locales/ja.ts
index b7a63e52d..e0c44fe5a 100644
--- a/apps/web/src/i18n/locales/ja.ts
+++ b/apps/web/src/i18n/locales/ja.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const ja: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'モデル呼び出しに失敗しました — このタスクは一時停止中です',
+  'chat.amrCard.switchBody': 'Open Design 公式の AMR モデルサービスに切り替えてください — API キーの設定は不要です。サインイン・認可・チャージが完了すると、このタスクは自動で再試行されます。',
+  'chat.amrCard.chipOfficial': '公式ホスティング',
+  'chat.amrCard.chipNoKey': 'API キー不要',
+  'chat.amrCard.chipAutoRetry': 'サインイン後に自動再試行',
+  'chat.amrCard.switchCta': 'AMR に切り替えて再試行',
+  'chat.amrError.authMessage': 'AMR アカウントがまだ認可されていません。認可するとこのタスクは自動で再試行されます。',
+  'chat.amrError.balanceMessage': 'AMR の残高が不足しています。チャージしてこのタスクを続行してください。',
+  'chat.amrError.authorizeCta': '認可して再試行',
+  'chat.amrError.rechargeCta': 'AMR にチャージ',
   'plugins.actions.copyInstallCommand': 'インストールコマンドをコピー',
   'plugins.actions.copyPluginId': 'プラグイン ID をコピー',
   'plugins.actions.copyReadmeBadge': 'README バッジをコピー',
@@ -97,7 +107,13 @@ export const ja: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': '公式メンテナンス',
+  'settings.onboardingAmrCloudBenefitReady': 'すぐ使える',
+  'settings.onboardingAmrCloudBenefitModels': '多数のモデル',
+  'settings.onboardingAmrCloudBenefitPricing': 'お得な価格',
+  'settings.onboardingAmrCloudAuthorizeAction': 'AMR を認証',
+  'settings.onboardingAmrCloudAuthorizedAction': '認証済み',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const ja: Dict = {
   'settings.agentInstallGroup': 'インストール可能（{count}）',
   'settings.agentAuthRequired': '認証が必要です',
   'settings.agentAuthUnknown': '認証状態は不明です',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'プロバイダーをクイック入力',
   'settings.customProvider': 'カスタムプロバイダー',
diff --git a/apps/web/src/i18n/locales/ko.ts b/apps/web/src/i18n/locales/ko.ts
index ab19c582c..dbe740b50 100644
--- a/apps/web/src/i18n/locales/ko.ts
+++ b/apps/web/src/i18n/locales/ko.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const ko: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': '모델 호출 실패 — 이 작업이 일시중지되었습니다',
+  'chat.amrCard.switchBody': 'Open Design 공식 AMR 모델 서비스로 전환하세요 — API 키 설정이 필요 없습니다. 로그인・인증・충전이 완료되면 이 작업이 자동으로 재시도됩니다.',
+  'chat.amrCard.chipOfficial': '공식 호스팅',
+  'chat.amrCard.chipNoKey': 'API 키 불필요',
+  'chat.amrCard.chipAutoRetry': '로그인 후 자동 재시도',
+  'chat.amrCard.switchCta': 'AMR로 전환하고 재시도',
+  'chat.amrError.authMessage': 'AMR 계정이 아직 인증되지 않았습니다. 인증하면 이 작업이 자동으로 재시도됩니다.',
+  'chat.amrError.balanceMessage': 'AMR 잔액이 부족합니다. 충전하여 이 작업을 계속 진행하세요.',
+  'chat.amrError.authorizeCta': '인증하고 재시도',
+  'chat.amrError.rechargeCta': 'AMR 충전',
   'plugins.actions.copyInstallCommand': '설치 명령 복사',
   'plugins.actions.copyPluginId': '플러그인 ID 복사',
   'plugins.actions.copyReadmeBadge': 'README 배지 복사',
@@ -97,7 +107,13 @@ export const ko: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': '공식 관리',
+  'settings.onboardingAmrCloudBenefitReady': '바로 사용',
+  'settings.onboardingAmrCloudBenefitModels': '다양한 모델',
+  'settings.onboardingAmrCloudBenefitPricing': '더 나은 가격',
+  'settings.onboardingAmrCloudAuthorizeAction': 'AMR 인증',
+  'settings.onboardingAmrCloudAuthorizedAction': '인증됨',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const ko: Dict = {
   'settings.agentInstallGroup': '설치 가능 ({count})',
   'settings.agentAuthRequired': '인증 필요',
   'settings.agentAuthUnknown': '인증 상태를 알 수 없음',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': '제공자 빠른 입력',
   'settings.customProvider': '사용자 지정 제공자',
diff --git a/apps/web/src/i18n/locales/pl.ts b/apps/web/src/i18n/locales/pl.ts
index ebe6bc08f..c43fddd38 100644
--- a/apps/web/src/i18n/locales/pl.ts
+++ b/apps/web/src/i18n/locales/pl.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const pl: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Wywołanie modelu nieudane — to zadanie jest wstrzymane',
+  'chat.amrCard.switchBody': 'Przełącz się na oficjalną usługę modeli AMR od Open Design — bez konfigurowania klucza API. Po zalogowaniu, autoryzacji i doładowaniu zadanie zostanie automatycznie ponowione.',
+  'chat.amrCard.chipOfficial': 'Oficjalny hosting',
+  'chat.amrCard.chipNoKey': 'Bez klucza API',
+  'chat.amrCard.chipAutoRetry': 'Automatyczne ponowienie po zalogowaniu',
+  'chat.amrCard.switchCta': 'Przełącz na AMR i ponów',
+  'chat.amrError.authMessage': 'Twoje konto AMR nie zostało jeszcze autoryzowane. Autoryzuj je, a zadanie zostanie automatycznie ponowione.',
+  'chat.amrError.balanceMessage': 'Saldo AMR zostało wyczerpane. Doładuj, aby kontynuować zadanie.',
+  'chat.amrError.authorizeCta': 'Autoryzuj i ponów',
+  'chat.amrError.rechargeCta': 'Doładuj AMR',
   'plugins.actions.copyInstallCommand': 'Kopiuj polecenie instalacji',
   'plugins.actions.copyPluginId': 'Kopiuj ID wtyczki',
   'plugins.actions.copyReadmeBadge': 'Kopiuj odznakę README',
@@ -97,7 +107,13 @@ export const pl: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Oficjalnie utrzymane',
+  'settings.onboardingAmrCloudBenefitReady': 'Gotowe do użycia',
+  'settings.onboardingAmrCloudBenefitModels': 'Wiele modeli',
+  'settings.onboardingAmrCloudBenefitPricing': 'Lepsza cena',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Autoryzuj AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Autoryzowano',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const pl: Dict = {
   'settings.agentInstallGroup': 'Dostępne do instalacji ({count})',
   'settings.agentAuthRequired': 'Wymagane uwierzytelnienie',
   'settings.agentAuthUnknown': 'Stan uwierzytelnienia nieznany',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Szybkie wypełnienie dostawcy',
   'settings.customProvider': 'Niestandardowy dostawca',
diff --git a/apps/web/src/i18n/locales/pt-BR.ts b/apps/web/src/i18n/locales/pt-BR.ts
index ffc0f4fa4..1e4f69b09 100644
--- a/apps/web/src/i18n/locales/pt-BR.ts
+++ b/apps/web/src/i18n/locales/pt-BR.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const ptBR: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Falha ao chamar o modelo — esta execução está pausada',
+  'chat.amrCard.switchBody': 'Mude para o serviço oficial de modelos AMR do Open Design — sem precisar configurar API Key. Após entrar, autorizar e recarregar, esta execução será repetida automaticamente.',
+  'chat.amrCard.chipOfficial': 'Hospedagem oficial',
+  'chat.amrCard.chipNoKey': 'Sem API Key',
+  'chat.amrCard.chipAutoRetry': 'Nova tentativa automática após entrar',
+  'chat.amrCard.switchCta': 'Mudar para AMR e tentar novamente',
+  'chat.amrError.authMessage': 'Sua conta AMR ainda não está autorizada. Autorize-a e esta execução será repetida automaticamente.',
+  'chat.amrError.balanceMessage': 'Seu saldo AMR acabou. Recarregue para continuar esta execução.',
+  'chat.amrError.authorizeCta': 'Autorizar e tentar novamente',
+  'chat.amrError.rechargeCta': 'Recarregar AMR',
   'plugins.actions.copyInstallCommand': 'Copiar comando de instalação',
   'plugins.actions.copyPluginId': 'Copiar ID do plugin',
   'plugins.actions.copyReadmeBadge': 'Copiar selo do README',
@@ -97,7 +107,13 @@ export const ptBR: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Mantido oficialmente',
+  'settings.onboardingAmrCloudBenefitReady': 'Pronto para usar',
+  'settings.onboardingAmrCloudBenefitModels': 'Muitos modelos',
+  'settings.onboardingAmrCloudBenefitPricing': 'Preço melhor',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Autorizar AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Autorizado',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const ptBR: Dict = {
   'settings.agentInstallGroup': 'Disponíveis para instalar ({count})',
   'settings.agentAuthRequired': 'Autenticação necessária',
   'settings.agentAuthUnknown': 'Status de autenticação desconhecido',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'API da Anthropic',
   'settings.quickFillProvider': 'Preencher provedor',
   'settings.customProvider': 'Provedor personalizado',
diff --git a/apps/web/src/i18n/locales/ru.ts b/apps/web/src/i18n/locales/ru.ts
index 4dca540bc..95d91473d 100644
--- a/apps/web/src/i18n/locales/ru.ts
+++ b/apps/web/src/i18n/locales/ru.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const ru: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Не удалось вызвать модель — это выполнение приостановлено',
+  'chat.amrCard.switchBody': 'Переключитесь на официальный сервис моделей AMR от Open Design — без настройки API-ключа. После входа, авторизации и пополнения это выполнение будет автоматически повторено.',
+  'chat.amrCard.chipOfficial': 'Официальный хостинг',
+  'chat.amrCard.chipNoKey': 'Без API-ключа',
+  'chat.amrCard.chipAutoRetry': 'Авто-повтор после входа',
+  'chat.amrCard.switchCta': 'Переключиться на AMR и повторить',
+  'chat.amrError.authMessage': 'Ваш аккаунт AMR ещё не авторизован. Авторизуйте его, и это выполнение будет автоматически повторено.',
+  'chat.amrError.balanceMessage': 'Баланс AMR исчерпан. Пополните, чтобы продолжить это выполнение.',
+  'chat.amrError.authorizeCta': 'Авторизовать и повторить',
+  'chat.amrError.rechargeCta': 'Пополнить AMR',
   'plugins.actions.copyInstallCommand': 'Скопировать команду установки',
   'plugins.actions.copyPluginId': 'Скопировать ID плагина',
   'plugins.actions.copyReadmeBadge': 'Скопировать бейдж README',
@@ -97,7 +107,13 @@ export const ru: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Официальная поддержка',
+  'settings.onboardingAmrCloudBenefitReady': 'Готово к работе',
+  'settings.onboardingAmrCloudBenefitModels': 'Много моделей',
+  'settings.onboardingAmrCloudBenefitPricing': 'Выгодная цена',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Авторизовать AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Авторизовано',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const ru: Dict = {
   'settings.agentInstallGroup': 'Доступно для установки ({count})',
   'settings.agentAuthRequired': 'Требуется аутентификация',
   'settings.agentAuthUnknown': 'Статус аутентификации неизвестен',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Быстро заполнить провайдера',
   'settings.customProvider': 'Пользовательский провайдер',
diff --git a/apps/web/src/i18n/locales/th.ts b/apps/web/src/i18n/locales/th.ts
index d00a7633e..58a15e981 100644
--- a/apps/web/src/i18n/locales/th.ts
+++ b/apps/web/src/i18n/locales/th.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const th: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'เรียกใช้โมเดลล้มเหลว — งานนี้ถูกหยุดชั่วคราว',
+  'chat.amrCard.switchBody': 'สลับไปยังบริการโมเดล AMR อย่างเป็นทางการของ Open Design — ไม่ต้องตั้งค่า API Key หลังจากเข้าสู่ระบบ ให้สิทธิ์ และเติมเงินแล้ว งานนี้จะถูกลองใหม่โดยอัตโนมัติ',
+  'chat.amrCard.chipOfficial': 'โฮสติ้งอย่างเป็นทางการ',
+  'chat.amrCard.chipNoKey': 'ไม่ต้องใช้ API Key',
+  'chat.amrCard.chipAutoRetry': 'ลองใหม่อัตโนมัติหลังเข้าสู่ระบบ',
+  'chat.amrCard.switchCta': 'สลับไปยัง AMR และลองใหม่',
+  'chat.amrError.authMessage': 'บัญชี AMR ของคุณยังไม่ได้รับอนุญาต ให้สิทธิ์แล้วงานนี้จะถูกลองใหม่โดยอัตโนมัติ',
+  'chat.amrError.balanceMessage': 'ยอดเงิน AMR ของคุณหมดแล้ว เติมเงินเพื่อดำเนินงานนี้ต่อ',
+  'chat.amrError.authorizeCta': 'ให้สิทธิ์และลองใหม่',
+  'chat.amrError.rechargeCta': 'เติมเงิน AMR',
   'plugins.actions.copyInstallCommand': 'คัดลอกคำสั่งติดตั้ง',
   'plugins.actions.copyPluginId': 'คัดลอก ID ปลั๊กอิน',
   'plugins.actions.copyReadmeBadge': 'คัดลอกแบดจ์ README',
@@ -97,7 +107,13 @@ export const th: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'ดูแลอย่างเป็นทางการ',
+  'settings.onboardingAmrCloudBenefitReady': 'พร้อมใช้งาน',
+  'settings.onboardingAmrCloudBenefitModels': 'มีโมเดลให้เลือกมาก',
+  'settings.onboardingAmrCloudBenefitPricing': 'ราคาดีกว่า',
+  'settings.onboardingAmrCloudAuthorizeAction': 'อนุญาต AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'อนุญาตแล้ว',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -223,6 +239,28 @@ export const th: Dict = {
   'settings.agentInstalledGroup': 'CLI ของคุณ ({count})',
   'settings.agentInstallGroup': 'พร้อมให้ติดตั้ง ({count})',
   'settings.agentAuthUnknown': 'ไม่ทราบสถานะการยืนยันตัวตน',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'เลือกผู้ให้บริการอย่างรวดเร็ว',
   'settings.customProvider': 'กำหนดผู้ให้บริการเอง',
diff --git a/apps/web/src/i18n/locales/tr.ts b/apps/web/src/i18n/locales/tr.ts
index db5e38c9e..c04e56858 100644
--- a/apps/web/src/i18n/locales/tr.ts
+++ b/apps/web/src/i18n/locales/tr.ts
@@ -3,6 +3,16 @@ import type { Dict } from '../types';
 
 export const tr: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Model çağrısı başarısız oldu — bu çalıştırma duraklatıldı',
+  'chat.amrCard.switchBody': 'Open Design\'ın resmi AMR model hizmetine geçin — API anahtarı yapılandırması gerekmez. Oturum açma, yetkilendirme ve bakiye yükleme sonrası bu çalıştırma otomatik olarak yeniden denenir.',
+  'chat.amrCard.chipOfficial': 'Resmi hizmet',
+  'chat.amrCard.chipNoKey': 'API anahtarı gerekmez',
+  'chat.amrCard.chipAutoRetry': 'Giriş sonrası otomatik yeniden deneme',
+  'chat.amrCard.switchCta': 'AMR\'ye geç ve yeniden dene',
+  'chat.amrError.authMessage': 'AMR hesabınız henüz yetkilendirilmedi. Yetkilendirin ve bu çalıştırma otomatik olarak yeniden denensin.',
+  'chat.amrError.balanceMessage': 'AMR bakiyeniz bitti. Çalıştırmaya devam etmek için bakiye yükleyin.',
+  'chat.amrError.authorizeCta': 'Yetkilendir ve yeniden dene',
+  'chat.amrError.rechargeCta': 'AMR bakiyesi yükle',
   'plugins.actions.copyInstallCommand': 'Kurulum komutunu kopyala',
   'plugins.actions.copyPluginId': 'Eklenti ID’sini kopyala',
   'plugins.actions.copyReadmeBadge': 'README rozetini kopyala',
@@ -97,7 +107,13 @@ export const tr: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Resmi bakım',
+  'settings.onboardingAmrCloudBenefitReady': 'Kullanıma hazır',
+  'settings.onboardingAmrCloudBenefitModels': 'Çok model seçeneği',
+  'settings.onboardingAmrCloudBenefitPricing': 'Daha uygun fiyat',
+  'settings.onboardingAmrCloudAuthorizeAction': 'AMR yetkilendir',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Yetkilendirildi',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -225,6 +241,28 @@ export const tr: Dict = {
   'settings.agentInstallGroup': 'Kurulabilir ({count})',
   'settings.agentAuthRequired': 'Kimlik doğrulama gerekli',
   'settings.agentAuthUnknown': 'Kimlik doğrulama durumu bilinmiyor',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Sağlayıcıyı hızlı doldur',
   'settings.customProvider': 'Özel sağlayıcı',
diff --git a/apps/web/src/i18n/locales/uk.ts b/apps/web/src/i18n/locales/uk.ts
index 483f66b5b..e01ccce00 100644
--- a/apps/web/src/i18n/locales/uk.ts
+++ b/apps/web/src/i18n/locales/uk.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const uk: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': 'Не вдалося викликати модель — це виконання призупинено',
+  'chat.amrCard.switchBody': 'Перейдіть на офіційний сервіс моделей AMR від Open Design — без налаштування API-ключа. Після входу, авторизації та поповнення це виконання буде повторено автоматично.',
+  'chat.amrCard.chipOfficial': 'Офіційний хостинг',
+  'chat.amrCard.chipNoKey': 'Без API-ключа',
+  'chat.amrCard.chipAutoRetry': 'Авто-повтор після входу',
+  'chat.amrCard.switchCta': 'Перейти на AMR і повторити',
+  'chat.amrError.authMessage': 'Ваш обліковий запис AMR ще не авторизовано. Авторизуйте, і це виконання буде повторено автоматично.',
+  'chat.amrError.balanceMessage': 'Баланс AMR вичерпано. Поповніть, щоб продовжити це виконання.',
+  'chat.amrError.authorizeCta': 'Авторизувати та повторити',
+  'chat.amrError.rechargeCta': 'Поповнити AMR',
   'plugins.actions.copyInstallCommand': 'Скопіювати команду встановлення',
   'plugins.actions.copyPluginId': 'Скопіювати ID плагіна',
   'plugins.actions.copyReadmeBadge': 'Скопіювати бейдж README',
@@ -97,7 +107,13 @@ export const uk: Dict = {
     'Pick or create a brand system so generated work follows real colors, typography, and product language.',
   'settings.onboardingExecutionTitle': 'Choose how generation runs',
   'settings.onboardingExecutionBody':
-    'Use a local CLI agent or connect your own API key. You can change this any time in Settings.',
+    'Official CLI with one-click setup and ready-to-use defaults. Use one key to choose from many models with better pricing.',
+  'settings.onboardingAmrCloudBenefitOfficial': 'Офіційна підтримка',
+  'settings.onboardingAmrCloudBenefitReady': 'Готово до роботи',
+  'settings.onboardingAmrCloudBenefitModels': 'Багато моделей',
+  'settings.onboardingAmrCloudBenefitPricing': 'Вигідніша ціна',
+  'settings.onboardingAmrCloudAuthorizeAction': 'Авторизувати AMR',
+  'settings.onboardingAmrCloudAuthorizedAction': 'Авторизовано',
   'settings.onboardingStepConnect': "Connect",
   'settings.onboardingStepDesignSystem': "Design system",
   'settings.onboardingStepProfile': "About you",
@@ -226,6 +242,28 @@ export const uk: Dict = {
   'settings.agentInstallGroup': 'Доступні для встановлення ({count})',
   'settings.agentAuthRequired': 'Потрібна автентифікація',
   'settings.agentAuthUnknown': 'Стан автентифікації невідомий',
+  'settings.amrLogin': 'Sign in',
+  'settings.amrLogout': 'Sign out',
+  'settings.amrLoggingIn': 'Signing in…',
+  'settings.amrLoggingOut': 'Signing out…',
+  'settings.amrLoggedInAs': 'Signed in as {email}',
+  'settings.amrLoggedInWithPlan': 'Signed in as {email} · {plan}',
+  'settings.amrLoggedInPill': 'Signed in',
+  'settings.amrNotLoggedIn': 'Not signed in',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': 'Authorize',
+  'settings.amrBenefitOfficial': 'Officially maintained',
+  'settings.amrBenefitLowerPrice': 'Lower price',
+  'settings.amrBenefitManyModels': 'Many models',
+  'settings.amrPromoBonus': 'Limited bonus: +100%',
+  'settings.amrSignInToContinue': 'Sign in to continue',
+  'settings.amrSignIn': 'Sign in',
+  'settings.amrSignedIn': 'Signed in',
+  'settings.amrNotSignedIn': 'Not signed in',
+  'settings.amrSigningIn': 'Signing in…',
+  'settings.amrCancelSignIn': 'Cancel sign-in',
+  'settings.amrAccountStatus': 'AMR account status',
+  'settings.amrLoginErrorCompact': 'AMR sign-in failed.',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': 'Швидко заповнити провайдера',
   'settings.customProvider': 'Власний провайдер',
diff --git a/apps/web/src/i18n/locales/zh-CN.ts b/apps/web/src/i18n/locales/zh-CN.ts
index 583c5a6b4..fbbc12b7d 100644
--- a/apps/web/src/i18n/locales/zh-CN.ts
+++ b/apps/web/src/i18n/locales/zh-CN.ts
@@ -1,6 +1,16 @@
 import type { Dict } from '../types';
 
 export const zhCN: Dict = {
+  'chat.amrCard.switchTitle': "模型调用失败，当前任务已暂停",
+  'chat.amrCard.switchBody': "可切换到 Open Design 官方 AMR 模型服务，无需配置 API Key。完成登录、授权和充值后，将自动重试当前任务。",
+  'chat.amrCard.chipOfficial': "官方托管",
+  'chat.amrCard.chipNoKey': "无需 API Key",
+  'chat.amrCard.chipAutoRetry': "授权后自动重试",
+  'chat.amrCard.switchCta': "切换到 AMR 并重试",
+  'chat.amrError.authMessage': "AMR 账号尚未授权。完成授权后将自动重试当前任务。",
+  'chat.amrError.balanceMessage': "AMR 账户余额不足。充值后可继续运行当前任务。",
+  'chat.amrError.authorizeCta': "授权并重试",
+  'chat.amrError.rechargeCta': "前往充值",
   'common.cancel': '取消',
   'common.save': '保存',
   'common.close': '关闭',
@@ -84,13 +94,20 @@ export const zhCN: Dict = {
     '选择或创建品牌系统，让生成结果跟随真实的颜色、字体和产品语言。',
   'settings.onboardingExecutionTitle': '选择生成方式',
   'settings.onboardingExecutionBody':
-    '使用本机 CLI Agent，或连接自己的 API Key。后续可以随时在设置里修改。',
+    '官方 CLI，一键配置、开箱即用。一个 Key 自由选择海量模型，价格更优惠。',
+  'settings.onboardingAmrCloudBenefitOfficial': '官方维护',
+  'settings.onboardingAmrCloudBenefitReady': '开箱即用',
+  'settings.onboardingAmrCloudBenefitModels': '海量模型可选',
+  'settings.onboardingAmrCloudBenefitPricing': '价格优惠',
+  'settings.onboardingAmrCloudAuthorizeAction': '授权使用',
+  'settings.onboardingAmrCloudAuthorizedAction': '已授权',
   'settings.onboardingStepConnect': "连接",
   'settings.onboardingStepDesignSystem': "设计系统",
   'settings.onboardingStepProfile': "关于你",
   'settings.onboardingConnectTitle': "选择运行方式",
   'settings.onboardingConnectBody': "",
   'settings.onboardingRecommended': "推荐",
+  'settings.onboardingAmrCloudOfficialBadge': "官方",
   'settings.onboardingLocalTitle': "本地 Coding Agent",
   'settings.onboardingLocalBody': "使用已安装的 CLI，如 Claude Code、Codex、Cursor、Gemini 或 OpenCode。",
   'settings.onboardingLocalAction': "打开 CLI 设置",
@@ -216,7 +233,29 @@ export const zhCN: Dict = {
   'settings.agentInstallGroup': '可安装（{count}）',
   'settings.agentAuthRequired': '需要认证',
   'settings.agentAuthUnknown': '认证状态未知',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': '授权',
+  'settings.amrBenefitOfficial': '官方维护',
+  'settings.amrBenefitLowerPrice': '价格更低',
+  'settings.amrBenefitManyModels': '海量模型',
+  'settings.amrPromoBonus': '限时充值赠 100%',
+  'settings.amrSignInToContinue': '授权后继续',
+  'settings.amrSignIn': '登录',
+  'settings.amrSignedIn': '已登录',
+  'settings.amrNotSignedIn': '未授权',
+  'settings.amrSigningIn': '登录中…',
+  'settings.amrCancelSignIn': '取消登录',
+  'settings.amrAccountStatus': 'AMR 账户状态',
+  'settings.amrLoginErrorCompact': 'AMR 登录失败。',
   'settings.advanced': '高级设置',
+  'settings.amrLogin': '登录',
+  'settings.amrLogout': '登出',
+  'settings.amrLoggingIn': '登录中…',
+  'settings.amrLoggingOut': '退出中…',
+  'settings.amrLoggedInAs': '已登录 {email}',
+  'settings.amrLoggedInWithPlan': '已登录 {email} · {plan}',
+  'settings.amrLoggedInPill': '已登录',
+  'settings.amrNotLoggedIn': '未授权',
   'settings.apiSection': 'Anthropic API',
   'settings.quickFillProvider': '快速填充提供方',
   'settings.customProvider': '自定义提供方',
@@ -282,7 +321,7 @@ export const zhCN: Dict = {
   'settings.modelPickerHint':
     '当 CLI 提供 `models` 命令时会自动拉取。选择「默认」则沿用 CLI 自身的配置；选择「自定义」可手动输入任何 CLI 支持的模型 id。',
   'settings.modelPickerLiveHint':
-    '已从已安装的 CLI 刷新模型。“默认”仍使用 CLI 自身配置。',
+    '模型列表来自这个 CLI；选“默认”会沿用 CLI 自己的设置。',
   'settings.modelPickerFallbackHint':
     '正在显示内置默认值。点击“重新扫描”可从 CLI 拉取实时模型。',
   'settings.cliEnvTitle': 'CLI 配置位置',
diff --git a/apps/web/src/i18n/locales/zh-TW.ts b/apps/web/src/i18n/locales/zh-TW.ts
index 6423ba34d..f7c41b77b 100644
--- a/apps/web/src/i18n/locales/zh-TW.ts
+++ b/apps/web/src/i18n/locales/zh-TW.ts
@@ -3,6 +3,16 @@ import { en } from './en';
 
 export const zhTW: Dict = {
   ...en,
+  'chat.amrCard.switchTitle': "模型呼叫失敗，目前任務已暫停",
+  'chat.amrCard.switchBody': "可切換到 Open Design 官方 AMR 模型服務，無需設定 API Key。完成登入、授權與儲值後，將自動重試目前任務。",
+  'chat.amrCard.chipOfficial': "官方代管",
+  'chat.amrCard.chipNoKey': "無需 API Key",
+  'chat.amrCard.chipAutoRetry': "授權後自動重試",
+  'chat.amrCard.switchCta': "切換到 AMR 並重試",
+  'chat.amrError.authMessage': "AMR 帳號尚未授權。完成授權後將自動重試目前任務。",
+  'chat.amrError.balanceMessage': "AMR 帳戶餘額不足。儲值後即可繼續執行目前任務。",
+  'chat.amrError.authorizeCta': "授權並重試",
+  'chat.amrError.rechargeCta': "前往儲值",
   'plugins.actions.copyInstallCommand': '複製安裝命令',
   'plugins.actions.copyPluginId': '複製外掛 ID',
   'plugins.actions.copyReadmeBadge': '複製 README 徽章',
@@ -100,13 +110,20 @@ export const zhTW: Dict = {
     '選擇或建立品牌系統，讓生成結果跟隨真實的顏色、字體和產品語言。',
   'settings.onboardingExecutionTitle': '選擇生成方式',
   'settings.onboardingExecutionBody':
-    '使用本機 CLI Agent，或連接自己的 API Key。後續可以隨時在設定裡修改。',
+    '官方 CLI，一鍵配置、開箱即用。一個 Key 自由選擇海量模型，價格更優惠。',
+  'settings.onboardingAmrCloudBenefitOfficial': '官方維護',
+  'settings.onboardingAmrCloudBenefitReady': '開箱即用',
+  'settings.onboardingAmrCloudBenefitModels': '海量模型可選',
+  'settings.onboardingAmrCloudBenefitPricing': '價格優惠',
+  'settings.onboardingAmrCloudAuthorizeAction': '授權使用',
+  'settings.onboardingAmrCloudAuthorizedAction': '已授權',
   'settings.onboardingStepConnect': "連接",
   'settings.onboardingStepDesignSystem': "設計系統",
   'settings.onboardingStepProfile': "關於你",
   'settings.onboardingConnectTitle': "選擇執行方式",
   'settings.onboardingConnectBody': "",
   'settings.onboardingRecommended': "推荐",
+  'settings.onboardingAmrCloudOfficialBadge': "官方",
   'settings.onboardingLocalTitle': "本地 Coding Agent",
   'settings.onboardingLocalBody': "使用已安裝的 CLI，如 Claude Code、Codex、Cursor、Gemini 或 OpenCode。",
   'settings.onboardingLocalAction': "開啟 CLI 設定",
@@ -227,6 +244,28 @@ export const zhTW: Dict = {
   'settings.agentInstallGroup': '可安裝（{count}）',
   'settings.agentAuthRequired': '需要認證',
   'settings.agentAuthUnknown': '認證狀態未知',
+  'settings.amrLogin': '登入',
+  'settings.amrLogout': '登出',
+  'settings.amrLoggingIn': '登入中…',
+  'settings.amrLoggingOut': '登出中…',
+  'settings.amrLoggedInAs': '已登入 {email}',
+  'settings.amrLoggedInWithPlan': '已登入 {email} · {plan}',
+  'settings.amrLoggedInPill': '已登入',
+  'settings.amrNotLoggedIn': '未授權',
+  'settings.amrCloud': 'Open Design AMR',
+  'settings.amrAuthorize': '授權',
+  'settings.amrBenefitOfficial': '官方維護',
+  'settings.amrBenefitLowerPrice': '價格更低',
+  'settings.amrBenefitManyModels': '海量模型',
+  'settings.amrPromoBonus': '限時儲值贈 100%',
+  'settings.amrSignInToContinue': '授權後繼續',
+  'settings.amrSignIn': '登入',
+  'settings.amrSignedIn': '已登入',
+  'settings.amrNotSignedIn': '未授權',
+  'settings.amrSigningIn': '登入中…',
+  'settings.amrCancelSignIn': '取消登入',
+  'settings.amrAccountStatus': 'AMR 帳戶狀態',
+  'settings.amrLoginErrorCompact': 'AMR 登入失敗。',
   'settings.apiSection': 'API 設定',
   'settings.quickFillProvider': '快速填入提供方',
   'settings.customProvider': '自訂提供方',
@@ -274,7 +313,7 @@ export const zhTW: Dict = {
   'settings.modelPickerHint':
     '當 CLI 提供 `models` 命令時會自動拉取。選擇「預設」則沿用 CLI 自身的設定；選擇「自訂」可手動輸入任何 CLI 支援的模型 id。',
   'settings.modelPickerLiveHint':
-    '已從已安裝的 CLI 重新整理模型。「預設」仍使用 CLI 自身設定。',
+    '模型列表來自這個 CLI；選「預設」會沿用 CLI 自己的設定。',
   'settings.modelPickerFallbackHint':
     '正在顯示內建預設值。點擊「重新掃描」可從 CLI 拉取即時模型。',
   'settings.cliEnvTitle': 'CLI 設定位置',
diff --git a/apps/web/src/i18n/types.ts b/apps/web/src/i18n/types.ts
index fc8d2a696..4b0be42df 100644
--- a/apps/web/src/i18n/types.ts
+++ b/apps/web/src/i18n/types.ts
@@ -114,12 +114,19 @@ export interface Dict {
   'settings.onboardingSystemsBody': string;
   'settings.onboardingExecutionTitle': string;
   'settings.onboardingExecutionBody': string;
+  'settings.onboardingAmrCloudBenefitOfficial': string;
+  'settings.onboardingAmrCloudBenefitReady': string;
+  'settings.onboardingAmrCloudBenefitModels': string;
+  'settings.onboardingAmrCloudBenefitPricing': string;
+  'settings.onboardingAmrCloudAuthorizeAction': string;
+  'settings.onboardingAmrCloudAuthorizedAction': string;
   'settings.onboardingStepConnect': string;
   'settings.onboardingStepDesignSystem': string;
   'settings.onboardingStepProfile': string;
   'settings.onboardingConnectTitle': string;
   'settings.onboardingConnectBody': string;
   'settings.onboardingRecommended': string;
+  'settings.onboardingAmrCloudOfficialBadge': string;
   'settings.onboardingLocalTitle': string;
   'settings.onboardingLocalBody': string;
   'settings.onboardingLocalAction': string;
@@ -241,6 +248,28 @@ export interface Dict {
   'settings.agentAuthRequired': string;
   'settings.agentAuthUnknown': string;
   'settings.advanced': string;
+  'settings.amrLogin': string;
+  'settings.amrLogout': string;
+  'settings.amrLoggingIn': string;
+  'settings.amrLoggingOut': string;
+  'settings.amrLoggedInAs': string;
+  'settings.amrLoggedInWithPlan': string;
+  'settings.amrLoggedInPill': string;
+  'settings.amrNotLoggedIn': string;
+  'settings.amrCloud': string;
+  'settings.amrAuthorize': string;
+  'settings.amrBenefitOfficial': string;
+  'settings.amrBenefitLowerPrice': string;
+  'settings.amrBenefitManyModels': string;
+  'settings.amrPromoBonus': string;
+  'settings.amrSignInToContinue': string;
+  'settings.amrSignIn': string;
+  'settings.amrSignedIn': string;
+  'settings.amrNotSignedIn': string;
+  'settings.amrSigningIn': string;
+  'settings.amrCancelSignIn': string;
+  'settings.amrAccountStatus': string;
+  'settings.amrLoginErrorCompact': string;
   'settings.apiSection': string;
   'settings.quickFillProvider': string;
   'settings.customProvider': string;
@@ -1649,6 +1678,16 @@ export interface Dict {
   'project.instructionsActive': string;
   'project.resizeChatPanel': string;
   'chat.tabChat': string;
+  'chat.amrCard.switchTitle': string;
+  'chat.amrCard.switchBody': string;
+  'chat.amrCard.chipOfficial': string;
+  'chat.amrCard.chipNoKey': string;
+  'chat.amrCard.chipAutoRetry': string;
+  'chat.amrCard.switchCta': string;
+  'chat.amrError.authMessage': string;
+  'chat.amrError.balanceMessage': string;
+  'chat.amrError.authorizeCta': string;
+  'chat.amrError.rechargeCta': string;
   'chat.tabComments': string;
   'chat.commentsSoon': string;
   'chat.comments.attached': string;
diff --git a/apps/web/src/providers/daemon.ts b/apps/web/src/providers/daemon.ts
index 5f23f3df1..d02b7055d 100644
--- a/apps/web/src/providers/daemon.ts
+++ b/apps/web/src/providers/daemon.ts
@@ -225,6 +225,31 @@ function daemonSseErrorMessage(data: SseErrorPayload): string {
   return `${message}\n${detail}`;
 }
 
+function daemonSseError(data: SseErrorPayload): Error {
+  const error = new Error(daemonSseErrorMessage(data)) as Error & {
+    code?: string;
+    details?: unknown;
+  };
+  if (data.error?.code) error.code = data.error.code;
+  if (data.error?.details !== undefined) error.details = data.error.details;
+  return error;
+}
+
+function shouldSuppressLifecycleExitFallback(
+  agentId: string | undefined,
+  exitCode: number | null,
+  exitSignal: string | null,
+  stderrTail: string,
+): boolean {
+  if (exitCode !== 130 || exitSignal) return false;
+  if (agentId === 'amr') return true;
+  const normalizedStderr = stderrTail.toLowerCase();
+  return (
+    normalizedStderr.includes('opencode server listening') ||
+    normalizedStderr.includes('opencode_server_password')
+  );
+}
+
 export async function streamViaDaemon({
   agentId,
   history,
@@ -317,6 +342,7 @@ export async function streamViaDaemon({
     notifyRunsChanged();
     emitRunStatus('queued');
     await consumeDaemonRun({
+      agentId,
       runId,
       signal,
       cancelSignal,
@@ -376,6 +402,85 @@ export async function submitChatRunToolResult(
   }
 }
 
+export interface VelaUser {
+  id: string;
+  email: string;
+  name?: string;
+  image?: string | null;
+  plan?: string;
+}
+
+export interface VelaLoginStatus {
+  loggedIn: boolean;
+  loginInFlight?: boolean;
+  profile: string;
+  user: VelaUser | null;
+  configPath: string;
+}
+
+// AMR (vela) login surfaces three thin endpoints on the daemon:
+//   GET  /api/integrations/vela/status   — read ~/.amr/config.json projection
+//   POST /api/integrations/vela/login    — spawn `vela login` (vela opens browser itself)
+//   POST /api/integrations/vela/login/cancel — terminate a still-pending login
+//   POST /api/integrations/vela/logout   — clear ~/.amr auth and Settings-backed AMR auth env
+// The Settings UI polls /status after kicking off /login to detect completion.
+export async function fetchVelaLoginStatus(): Promise<VelaLoginStatus | null> {
+  try {
+    const resp = await fetch('/api/integrations/vela/status');
+    if (!resp.ok) return null;
+    return (await resp.json()) as VelaLoginStatus;
+  } catch {
+    return null;
+  }
+}
+
+export interface StartVelaLoginResult {
+  ok: boolean;
+  status: number;
+  pid?: number;
+  alreadyRunning?: boolean;
+  error?: string;
+}
+
+export async function startVelaLogin(): Promise<StartVelaLoginResult> {
+  try {
+    const resp = await fetch('/api/integrations/vela/login', { method: 'POST' });
+    if (resp.ok) {
+      const body = (await resp.json()) as { pid?: number };
+      return { ok: true, status: resp.status, pid: body.pid };
+    }
+    const body = (await resp.json().catch(() => null)) as { error?: string } | null;
+    return {
+      ok: false,
+      status: resp.status,
+      alreadyRunning: resp.status === 409,
+      error: body?.error ?? '',
+    };
+  } catch (err) {
+    return { ok: false, status: 0, error: err instanceof Error ? err.message : String(err) };
+  }
+}
+
+export async function cancelVelaLogin(): Promise<{ ok: boolean; canceled?: boolean }> {
+  try {
+    const resp = await fetch('/api/integrations/vela/login/cancel', { method: 'POST' });
+    if (!resp.ok) return { ok: false };
+    const body = (await resp.json().catch(() => null)) as { canceled?: boolean } | null;
+    return { ok: true, canceled: body?.canceled };
+  } catch {
+    return { ok: false };
+  }
+}
+
+export async function velaLogout(): Promise<{ ok: boolean }> {
+  try {
+    const resp = await fetch('/api/integrations/vela/logout', { method: 'POST' });
+    return { ok: resp.ok };
+  } catch {
+    return { ok: false };
+  }
+}
+
 // Forwards the user's assistant-turn rating to the daemon so it can emit
 // a Langfuse `score-create`. Fire-and-forget — failures are not surfaced
 // to the UI (the rating is already persisted on the message itself via
@@ -428,6 +533,7 @@ export async function listProjectRuns(): Promise<ChatRunStatusResponse[]> {
 }
 
 async function consumeDaemonRun({
+  agentId,
   runId,
   signal,
   cancelSignal,
@@ -435,7 +541,7 @@ async function consumeDaemonRun({
   initialLastEventId,
   onRunStatus,
   onRunEventId,
-}: DaemonReattachOptions): Promise<void> {
+}: DaemonReattachOptions & { agentId?: string }): Promise<void> {
   let acc = '';
   let stderrBuf = '';
   let exitCode: number | null = null;
@@ -553,7 +659,7 @@ async function consumeDaemonRun({
           if (event.event === 'error') {
             onRunStatus?.('failed');
             const data = event.data as SseErrorPayload;
-            handlers.onError(new Error(daemonSseErrorMessage(data)));
+            handlers.onError(daemonSseError(data));
             return;
           }
 
@@ -612,6 +718,10 @@ async function consumeDaemonRun({
       (!serverDeclaredSuccess &&
         (exitSignal || (exitCode !== null && exitCode !== 0)));
     if (looksLikeFailure) {
+      if (shouldSuppressLifecycleExitFallback(agentId, exitCode, exitSignal, stderrBuf)) {
+        handlers.onDone(acc);
+        return;
+      }
       const tail = stderrBuf.trim().slice(-400);
       handlers.onError(
         new Error(`agent exited with ${exitSignal ? `signal ${exitSignal}` : `code ${exitCode}`}${tail ? `\n${tail}` : ''}`),
diff --git a/apps/web/src/providers/registry.ts b/apps/web/src/providers/registry.ts
index 6c27d87c7..cea06d135 100644
--- a/apps/web/src/providers/registry.ts
+++ b/apps/web/src/providers/registry.ts
@@ -87,7 +87,7 @@ function deployProviderQuery(providerId?: WebDeployProviderId): string {
 
 export async function fetchAgents(options?: { throwOnError?: boolean }): Promise<AgentInfo[]> {
   try {
-    const resp = await fetch('/api/agents');
+    const resp = await fetch('/api/agents', { cache: 'no-store' });
     if (!resp.ok) {
       if (options?.throwOnError) throw new Error(`agents ${resp.status}`);
       return [];
diff --git a/apps/web/src/runtime/amr-guidance.ts b/apps/web/src/runtime/amr-guidance.ts
new file mode 100644
index 000000000..d0fa7a485
--- /dev/null
+++ b/apps/web/src/runtime/amr-guidance.ts
@@ -0,0 +1,87 @@
+// Shared logic that maps a failed run's error code + agent into the failure
+// UI: which contextual button the gray error card shows, whether to override
+// the error text, and whether to show the AMR promotion card below. Kept in
+// its own module so ChatPane / ProjectView / AssistantMessage can import it
+// without a circular dependency.
+
+// AMR model-gateway console wallet (recharge).
+export const AMR_RECHARGE_URL = 'https://open-design.ai/amr/wallet';
+
+// Codes that mean a non-AMR agent hit "the model service rejected or could not
+// serve the run" — auth missing/invalid, quota/rate exhausted, or the upstream
+// model endpoint was unavailable. These are the failures worth promoting AMR
+// for. Generic process failures (AGENT_EXECUTION_FAILED) and missing binaries
+// (AGENT_UNAVAILABLE) are excluded.
+const PROMOTE_AMR_CODES = new Set<string>([
+  'AGENT_AUTH_REQUIRED',
+  'UNAUTHORIZED',
+  'RATE_LIMITED',
+  'UPSTREAM_UNAVAILABLE',
+]);
+
+// Primary action offered in the gray error card.
+//   - retry:     re-run with the current agent.
+//   - authorize: AMR sign-in/authorize flow, then auto-retry on success.
+//   - recharge:  open the AMR wallet (manual retry afterwards).
+export type RunFailurePrimaryAction = 'retry' | 'authorize' | 'recharge';
+
+// i18n keys for the gray-card text override (null = show the raw error).
+export type RunFailureMessageKey =
+  | 'chat.amrError.authMessage'
+  | 'chat.amrError.balanceMessage'
+  | null;
+
+export interface RunFailureUi {
+  primaryAction: RunFailurePrimaryAction;
+  // Override the gray error card's text (e.g. AMR auth / balance get a clearer
+  // explanation than the raw upstream string).
+  messageKey: RunFailureMessageKey;
+  // Show a secondary plain "retry" button alongside the primary action (used
+  // by the recharge case, where retry is manual after topping up).
+  secondaryRetry: boolean;
+  // Show the AMR promotion card under the gray error card.
+  showSwitchCard: boolean;
+}
+
+// Resolve the failure UI for a failed run:
+//   - AMR agent, auth required      → authorize-and-retry button, clearer copy
+//   - AMR agent, insufficient funds → recharge button + manual retry, clearer copy
+//   - AMR agent, anything else      → plain retry
+//   - non-AMR agent, model/auth/quota error → plain retry + promotion card
+//   - non-AMR agent, generic failure        → plain retry
+export function resolveRunFailureUi(
+  code: string | null | undefined,
+  agentId: string | null | undefined,
+): RunFailureUi {
+  if (agentId === 'amr') {
+    if (code === 'AMR_AUTH_REQUIRED') {
+      return {
+        primaryAction: 'authorize',
+        messageKey: 'chat.amrError.authMessage',
+        secondaryRetry: false,
+        showSwitchCard: false,
+      };
+    }
+    if (code === 'AMR_INSUFFICIENT_BALANCE') {
+      return {
+        primaryAction: 'recharge',
+        messageKey: 'chat.amrError.balanceMessage',
+        secondaryRetry: true,
+        showSwitchCard: false,
+      };
+    }
+    return {
+      primaryAction: 'retry',
+      messageKey: null,
+      secondaryRetry: false,
+      showSwitchCard: false,
+    };
+  }
+  const promote = typeof code === 'string' && PROMOTE_AMR_CODES.has(code);
+  return {
+    primaryAction: 'retry',
+    messageKey: null,
+    secondaryRetry: false,
+    showSwitchCard: promote,
+  };
+}
diff --git a/apps/web/src/runtime/chat-events.ts b/apps/web/src/runtime/chat-events.ts
index d332f21fd..138de47ca 100644
--- a/apps/web/src/runtime/chat-events.ts
+++ b/apps/web/src/runtime/chat-events.ts
@@ -1,6 +1,10 @@
 import type { ChatMessage } from '../types';
 
-export function appendErrorStatusEvent(message: ChatMessage, detail: string): ChatMessage {
+export function appendErrorStatusEvent(
+  message: ChatMessage,
+  detail: string,
+  code?: string,
+): ChatMessage {
   if (!detail) return message;
   const events = message.events ?? [];
   const last = events[events.length - 1];
@@ -12,6 +16,6 @@ export function appendErrorStatusEvent(message: ChatMessage, detail: string): Ch
   }
   return {
     ...message,
-    events: [...events, { kind: 'status', label: 'error', detail }],
+    events: [...events, { kind: 'status', label: 'error', detail, ...(code ? { code } : {}) }],
   };
 }
diff --git a/apps/web/src/styles/chat.css b/apps/web/src/styles/chat.css
index 517893d8d..cc3caec1f 100644
--- a/apps/web/src/styles/chat.css
+++ b/apps/web/src/styles/chat.css
@@ -323,10 +323,12 @@
   color: white;
   border-radius: 4px;
 }
+/* Run-failure error card. Neutral gray (not red): the actionable next step
+   lives in the AMR card below it; this card just states what happened. */
 .msg.error {
-  border: 1px solid var(--red-border);
-  background: var(--red-bg);
-  color: var(--red);
+  border: 1px solid var(--border);
+  background: var(--bg-subtle);
+  color: var(--text-muted);
   padding: 10px 12px;
   border-radius: var(--radius-sm);
   display: flex;
@@ -335,12 +337,112 @@
   gap: 10px;
 }
 .chat-error-text { min-width: 0; }
+.chat-error-actions {
+  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
 .chat-error-retry {
   flex: 0 0 auto;
-  border-color: var(--red-border);
-  color: var(--red);
   padding: 4px 10px;
 }
+/* Contextual primary action in the gray error card (Authorize & retry / Top up). */
+.chat-error-action {
+  flex: 0 0 auto;
+  appearance: none;
+  cursor: pointer;
+  border: 1px solid var(--accent);
+  background: var(--accent);
+  color: white;
+  font: inherit;
+  font-weight: 600;
+  padding: 4px 12px;
+  border-radius: var(--radius-sm);
+  transition: background 140ms cubic-bezier(0.23, 1, 0.32, 1);
+}
+.chat-error-action:hover {
+  background: var(--accent-hover, var(--accent));
+}
+
+/* AMR guidance card under the gray error card. Theme-color tinted; two
+   content variants (switch / recharge) share the shell. */
+.amr-card {
+  margin-top: 8px;
+  padding: 12px 14px;
+  border: 1px solid color-mix(in srgb, var(--accent) 32%, var(--border));
+  background: color-mix(in srgb, var(--accent) 7%, var(--bg-panel));
+  border-radius: var(--radius-sm);
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+.amr-card__head {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.amr-card__icon {
+  flex: 0 0 auto;
+  width: 22px;
+  height: 22px;
+  border-radius: 50%;
+  display: grid;
+  place-items: center;
+  background: color-mix(in srgb, var(--accent) 16%, transparent);
+  color: var(--accent);
+  font-weight: 700;
+  font-size: 13px;
+}
+.amr-card__title {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--text);
+}
+.amr-card__body {
+  margin: 0;
+  font-size: 13px;
+  line-height: 1.55;
+  color: var(--text-muted);
+}
+.amr-card__chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+}
+.amr-card__chip {
+  font-size: 11px;
+  line-height: 1.4;
+  padding: 3px 8px;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--accent) 10%, transparent);
+  color: var(--accent);
+  border: 1px solid color-mix(in srgb, var(--accent) 22%, transparent);
+}
+.amr-card__actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 2px;
+}
+.amr-card__cta {
+  appearance: none;
+  cursor: pointer;
+  border: 1px solid var(--accent);
+  background: var(--accent);
+  color: white;
+  font: inherit;
+  font-weight: 600;
+  font-size: 13px;
+  padding: 7px 14px;
+  border-radius: var(--radius-sm);
+  transition:
+    background 140ms cubic-bezier(0.23, 1, 0.32, 1),
+    border-color 140ms cubic-bezier(0.23, 1, 0.32, 1);
+}
+.amr-card__cta:hover {
+  background: var(--accent-hover, var(--accent));
+}
 
 /* -------- Composer -------------------------------------------------- */
 .composer {
diff --git a/apps/web/src/styles/home/entry-layout.css b/apps/web/src/styles/home/entry-layout.css
index 6105cab6c..f9228a900 100644
--- a/apps/web/src/styles/home/entry-layout.css
+++ b/apps/web/src/styles/home/entry-layout.css
@@ -692,6 +692,7 @@
 }
 .inline-switcher__chip {
   appearance: none;
+  position: relative;
   display: inline-flex;
   align-items: center;
   gap: 8px;
@@ -777,6 +778,22 @@
   color: var(--text-faint);
   flex: 0 0 auto;
 }
+.inline-switcher__amr-reminder-dot {
+  position: absolute;
+  z-index: 1;
+  width: 7px;
+  height: 7px;
+  border-radius: 999px;
+  background: var(--danger, #dc2626);
+  box-shadow:
+    0 0 0 2px var(--bg-panel),
+    0 0 0 4px color-mix(in srgb, var(--danger, #dc2626) 12%, transparent);
+  pointer-events: none;
+}
+.inline-switcher__amr-reminder-dot--chip {
+  top: -2px;
+  right: -2px;
+}
 
 /* Popover */
 .inline-switcher__popover {
@@ -852,8 +869,13 @@
   grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 6px;
 }
+.inline-switcher__agent-row {
+  display: flex;
+  min-width: 0;
+}
 .inline-switcher__agent {
   appearance: none;
+  position: relative;
   display: inline-flex;
   align-items: center;
   gap: 8px;
@@ -865,6 +887,7 @@
   font-size: 12px;
   cursor: pointer;
   transition: background-color 120ms ease, border-color 120ms ease;
+  width: 100%;
   min-width: 0;
 }
 .inline-switcher__agent:hover {
@@ -875,14 +898,92 @@
   background: var(--accent-tint);
   color: var(--text-strong);
 }
+.inline-switcher__amr-reminder-dot--agent {
+  top: 6px;
+  left: 26px;
+}
 .inline-switcher__agent-name {
-  flex: 1;
+  flex: 1 1 auto;
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: left;
 }
+.inline-switcher__agent-status {
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 6px;
+  flex: 0 0 auto;
+  min-width: 0;
+  max-width: 76px;
+  height: 18px;
+  margin-left: auto;
+}
+.inline-switcher__agent-status-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+  width: 18px;
+  height: 18px;
+  border-radius: 999px;
+  color: var(--accent-strong);
+  background: color-mix(in srgb, var(--accent) 10%, transparent);
+}
+.inline-switcher__agent-status-icon.is-error {
+  color: var(--danger);
+  background: color-mix(in srgb, var(--danger) 10%, transparent);
+}
+.inline-switcher__agent-status-icon.is-signed-out {
+  color: var(--text-muted);
+  background: var(--bg-subtle);
+}
+.inline-switcher__agent-status-icon.is-pending svg {
+  animation: spin 0.8s linear infinite;
+}
+.inline-switcher__agent-action-label {
+  position: relative;
+  flex: 1 1 auto;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  color: var(--text-strong);
+  text-align: right;
+}
+.inline-switcher__agent-action-default,
+.inline-switcher__agent-action-hover {
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  transition: opacity 120ms ease, transform 120ms ease;
+}
+.inline-switcher__agent-action-hover {
+  position: absolute;
+  inset: 0;
+  opacity: 0;
+  color: var(--danger);
+  transform: translateY(3px);
+}
+.inline-switcher__agent-action-label.is-cancelable {
+  cursor: pointer;
+}
+.inline-switcher__agent:hover .inline-switcher__agent-action-label.is-cancelable
+  .inline-switcher__agent-action-default,
+.inline-switcher__agent:focus-visible .inline-switcher__agent-action-label.is-cancelable
+  .inline-switcher__agent-action-default {
+  opacity: 0;
+  transform: translateY(-3px);
+}
+.inline-switcher__agent:hover .inline-switcher__agent-action-label.is-cancelable
+  .inline-switcher__agent-action-hover,
+.inline-switcher__agent:focus-visible .inline-switcher__agent-action-label.is-cancelable
+  .inline-switcher__agent-action-hover {
+  opacity: 1;
+  transform: translateY(0);
+}
 
 /* Provider chips (BYOK mode) */
 .inline-switcher__chips {
@@ -1038,7 +1139,7 @@
 
 .onboarding-view__steps {
   display: grid;
-  grid-template-columns: repeat(3, minmax(0, 1fr));
+  grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 10px;
   width: min(860px, 100%);
   margin: 0;
@@ -1129,7 +1230,7 @@
 .onboarding-view__content {
   display: grid;
   gap: 18px;
-  width: min(800px, 100%);
+  width: min(860px, 100%);
   min-width: 0;
 }
 
@@ -1314,6 +1415,13 @@
   transform: translateY(-1px);
 }
 
+.onboarding-view__primary:hover:not(:disabled) {
+  color: var(--accent-contrast, #fff);
+  background: var(--accent-hover);
+  border-color: var(--accent-hover);
+  box-shadow: 0 10px 24px color-mix(in srgb, var(--accent) 24%, transparent);
+}
+
 .onboarding-view__primary:focus-visible,
 .onboarding-view__secondary:focus-visible,
 .onboarding-view__ghost:focus-visible,
@@ -1654,6 +1762,7 @@
   grid-template-columns: 44px minmax(0, 1fr);
   gap: 14px;
   align-items: center;
+  width: 100%;
   min-height: 112px;
   padding: 16px 18px;
   border-radius: 8px;
@@ -1681,6 +1790,14 @@
   box-shadow: 0 18px 40px color-mix(in srgb, var(--accent) 10%, transparent);
 }
 
+.onboarding-view__card--featured.onboarding-view__card--official {
+  grid-template-columns: 56px minmax(0, 1fr);
+  align-items: center;
+  min-height: 148px;
+  padding: 50px 24px 36px;
+  overflow: hidden;
+}
+
 .onboarding-view__card.is-selected {
   border-color: color-mix(in srgb, var(--accent) 52%, var(--border));
   background: color-mix(in srgb, var(--bg-panel) 94%, var(--accent) 6%);
@@ -1695,16 +1812,47 @@
     );
 }
 
+.onboarding-view__card--featured:not(.is-selected) {
+  border-color: var(--border);
+  background: var(--bg-panel);
+  box-shadow: var(--shadow-xs);
+}
+
 .onboarding-view__card:hover {
   border-color: color-mix(in srgb, var(--accent) 38%, var(--border));
   background: color-mix(in srgb, var(--bg-panel) 97%, var(--accent) 3%);
   transform: translateY(-1px);
 }
 
+.onboarding-view__official-tag {
+  position: absolute;
+  z-index: 2;
+  top: 0;
+  left: 0;
+  width: 88px;
+  height: 30px;
+  display: block;
+  overflow: hidden;
+  border-top-left-radius: inherit;
+  pointer-events: none;
+  user-select: none;
+}
+
+.onboarding-view__official-tag img {
+  position: absolute;
+  top: -4px;
+  left: -12px;
+  width: 92px;
+  height: 32px;
+  display: block;
+  max-width: none;
+}
+
 .onboarding-view__card-top {
   display: flex;
   align-items: center;
   gap: 8px;
+  flex-wrap: wrap;
   min-height: 26px;
   margin-bottom: 0;
 }
@@ -1727,6 +1875,19 @@
   background: color-mix(in srgb, var(--accent) 12%, var(--bg-panel));
 }
 
+.onboarding-view__icon.onboarding-view__icon--asset,
+.onboarding-view__card--featured .onboarding-view__icon.onboarding-view__icon--asset {
+  overflow: hidden;
+  border-color: transparent;
+  background: transparent;
+}
+
+.onboarding-view__icon--asset .onboarding-view__agent-logo {
+  display: block;
+  flex: 0 0 auto;
+  border-radius: inherit;
+}
+
 .onboarding-view__badge {
   display: inline-flex;
   align-items: center;
@@ -1749,6 +1910,12 @@
   min-width: 0;
 }
 
+.onboarding-view__card--official .onboarding-view__card-copy {
+  align-self: center;
+  gap: 6px;
+  padding-right: 40px;
+}
+
 .onboarding-view__card strong {
   display: block;
   color: var(--text-strong);
@@ -1774,6 +1941,99 @@
   font-size: 13px;
 }
 
+.onboarding-view__benefits {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 5px;
+  margin-top: 0;
+}
+
+.onboarding-view__benefit {
+  display: inline-flex;
+  align-items: center;
+  min-height: 20px;
+  padding: 0 7px;
+  border-radius: 999px;
+  border: 1px solid color-mix(in srgb, var(--accent) 20%, transparent);
+  color: var(--accent-strong);
+  background: color-mix(in srgb, var(--accent) 8%, var(--bg-panel));
+  box-shadow: inset 0 1px 0 color-mix(in srgb, #fff 8%, transparent);
+  font-size: 11px;
+  font-weight: 680;
+  line-height: 1;
+  white-space: nowrap;
+}
+
+.onboarding-view__card-status {
+  position: absolute;
+  left: 24px;
+  bottom: 16px;
+  z-index: 1;
+  display: inline-flex;
+  max-width: min(260px, calc(100% - 72px));
+  color: var(--text-muted);
+  pointer-events: none;
+}
+
+.onboarding-view__card-status .amr-account-control {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 0;
+  max-width: 100%;
+  min-height: 20px;
+  gap: 6px;
+  padding: 0 8px;
+  border: 1px solid color-mix(in srgb, var(--accent) 14%, var(--border));
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--bg-panel) 90%, var(--accent) 10%);
+  box-shadow: inset 0 1px 0 color-mix(in srgb, #fff 8%, transparent);
+  color: currentColor;
+  font-size: 11px;
+  font-weight: 650;
+  line-height: 1;
+}
+
+.onboarding-view__card-status .amr-account-control__status {
+  display: inline-flex;
+  align-items: center;
+  min-width: 0;
+  gap: 6px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.onboarding-view__card-status .amr-account-control__status::before {
+  content: '';
+  flex: 0 0 auto;
+  width: 6px;
+  height: 6px;
+  border-radius: 999px;
+  background: currentColor;
+  opacity: 0.7;
+}
+
+.onboarding-view__card-status .amr-account-control--signed-in {
+  color: var(--success-text, #15803d);
+  border-color: color-mix(in srgb, var(--success-text, #15803d) 18%, var(--border));
+  background: color-mix(in srgb, var(--bg-panel) 88%, var(--success-text, #15803d) 12%);
+}
+
+.onboarding-view__card-status .amr-account-control--signing-in {
+  color: var(--accent-strong);
+}
+
+.onboarding-view__card-status .amr-account-control--error {
+  color: var(--danger-text, #991b1b);
+  border-color: color-mix(in srgb, var(--danger-text, #991b1b) 18%, var(--border));
+  background: color-mix(in srgb, var(--bg-panel) 88%, var(--danger-text, #991b1b) 12%);
+}
+
+.onboarding-view__card-status .amr-account-control__error {
+  display: none;
+}
+
 .onboarding-view__card-action {
   grid-column: 2;
   justify-self: start;
@@ -2909,3 +3169,22 @@
     justify-self: start;
   }
 }
+
+@media (max-width: 760px) {
+  .onboarding-view__card--featured.onboarding-view__card--official {
+    grid-template-columns: 56px minmax(0, 1fr);
+    gap: 14px;
+    align-items: center;
+    padding: 50px 18px 36px;
+  }
+
+  .onboarding-view__card--official .onboarding-view__card-copy {
+    padding-right: 40px;
+  }
+
+  .onboarding-view__card-status {
+    left: 18px;
+    bottom: 16px;
+    max-width: min(240px, calc(100% - 72px));
+  }
+}
diff --git a/apps/web/src/styles/workspace/artifacts.css b/apps/web/src/styles/workspace/artifacts.css
index c77431a0e..a4ca83de0 100644
--- a/apps/web/src/styles/workspace/artifacts.css
+++ b/apps/web/src/styles/workspace/artifacts.css
@@ -669,6 +669,198 @@
   background: var(--bg-subtle);
 }
 
+.agent-scan-card {
+  position: relative;
+  display: grid;
+  align-content: center;
+  gap: 20px;
+  overflow: hidden;
+  min-height: 296px;
+  padding: 30px 34px;
+  border: 1px solid color-mix(in srgb, var(--accent) 24%, var(--border));
+  border-radius: 14px;
+  background:
+    radial-gradient(circle at 50% 38%, color-mix(in srgb, var(--accent) 13%, transparent), transparent 34%),
+    linear-gradient(180deg, color-mix(in srgb, var(--bg-panel) 90%, var(--accent) 10%), var(--bg-subtle));
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, #fff 6%, transparent),
+    0 18px 42px color-mix(in srgb, #000 18%, transparent);
+}
+
+.agent-scan-card::before {
+  content: '';
+  position: absolute;
+  inset: 18px;
+  border-radius: 12px;
+  border: 1px solid color-mix(in srgb, var(--accent) 8%, transparent);
+  pointer-events: none;
+}
+
+.agent-scan-card__stage {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+
+.agent-scan-card__ring {
+  position: relative;
+  display: block;
+  width: 46px;
+  height: 46px;
+  margin-bottom: 14px;
+  border-radius: 999px;
+  background:
+    radial-gradient(circle at center, var(--bg-subtle) 50%, transparent 52%),
+    conic-gradient(from 0deg, color-mix(in srgb, var(--accent) 92%, #fff) 0 84deg, color-mix(in srgb, var(--accent) 22%, transparent) 84deg 180deg, transparent 180deg 360deg);
+  box-shadow:
+    0 0 0 1px color-mix(in srgb, var(--accent) 18%, transparent),
+    0 0 32px color-mix(in srgb, var(--accent) 18%, transparent);
+  animation: agent-scan-ring 1.15s linear infinite;
+}
+
+.agent-scan-card__ring::after {
+  content: '';
+  position: absolute;
+  inset: 15px;
+  border-radius: inherit;
+  background: var(--accent);
+  box-shadow: 0 0 18px color-mix(in srgb, var(--accent) 42%, transparent);
+}
+
+.agent-scan-card__stage strong {
+  color: var(--text);
+  font-size: 15px;
+  font-weight: 700;
+  line-height: 1.25;
+}
+
+.agent-scan-card__stage > span:not(.agent-scan-card__ring) {
+  margin-top: 6px;
+  color: var(--text-muted);
+  font-size: 12px;
+  line-height: 1.45;
+}
+
+.agent-scan-card__progress {
+  width: min(240px, 70%);
+  height: 2px;
+  margin-top: 18px;
+  overflow: hidden;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--text) 8%, transparent);
+}
+
+.agent-scan-card__progress span {
+  display: block;
+  width: 44%;
+  height: 100%;
+  border-radius: inherit;
+  background: linear-gradient(90deg, transparent, var(--accent), transparent);
+  animation: agent-scan-progress 1.35s cubic-bezier(0.23, 1, 0.32, 1) infinite;
+}
+
+.agent-scan-card__rows {
+  position: relative;
+  z-index: 1;
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 10px;
+  width: min(640px, 100%);
+  justify-self: center;
+}
+
+.agent-scan-card__rows span {
+  display: grid;
+  grid-template-columns: 28px minmax(0, 1fr);
+  grid-template-rows: 10px 8px;
+  gap: 8px 10px;
+  align-items: center;
+  min-height: 54px;
+  padding: 12px;
+  border: 1px solid color-mix(in srgb, var(--border) 72%, transparent);
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--bg-panel) 72%, transparent);
+  opacity: 0.7;
+}
+
+.agent-scan-card__rows i,
+.agent-scan-card__rows b,
+.agent-scan-card__rows em {
+  display: block;
+  overflow: hidden;
+  border-radius: 999px;
+  background:
+    linear-gradient(90deg, transparent, color-mix(in srgb, var(--text) 9%, transparent), transparent),
+    color-mix(in srgb, var(--text) 9%, transparent);
+  background-size: 220% 100%, 100% 100%;
+  animation: agent-scan-row 1.45s cubic-bezier(0.23, 1, 0.32, 1) infinite;
+}
+
+.agent-scan-card__rows i {
+  grid-row: 1 / span 2;
+  width: 28px;
+  height: 28px;
+  border-radius: 8px;
+}
+
+.agent-scan-card__rows b {
+  width: 82%;
+  height: 10px;
+}
+
+.agent-scan-card__rows em {
+  width: 54%;
+  height: 8px;
+}
+
+.agent-scan-card__rows span:nth-child(2) {
+  opacity: 0.58;
+}
+
+.agent-scan-card__rows span:nth-child(3) {
+  opacity: 0.46;
+}
+
+.agent-scan-card__rows span:nth-child(2) i,
+.agent-scan-card__rows span:nth-child(2) b,
+.agent-scan-card__rows span:nth-child(2) em {
+  animation-delay: 120ms;
+}
+
+.agent-scan-card__rows span:nth-child(3) i,
+.agent-scan-card__rows span:nth-child(3) b,
+.agent-scan-card__rows span:nth-child(3) em {
+  animation-delay: 240ms;
+}
+
+@keyframes agent-scan-ring {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes agent-scan-progress {
+  from {
+    transform: translateX(-100%);
+  }
+  to {
+    transform: translateX(230%);
+  }
+}
+
+@keyframes agent-scan-row {
+  from {
+    background-position: 120% 0, 0 0;
+  }
+  to {
+    background-position: -120% 0, 0 0;
+  }
+}
+
 .agent-grid {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
@@ -776,10 +968,96 @@
   transition: border-color 120ms ease, box-shadow 120ms ease, background 120ms ease;
 }
 .agent-card-installed {
+  display: block;
   padding: 0;
   min-height: 72px;
   overflow: hidden;
 }
+
+/* Failed-run AMR nudge: when the chat error card's "Try Open Design AMR" link
+   opens Settings, the AMR card scrolls into view and pulses a couple of times.
+   The card's own box-shadow is not clipped by `overflow: hidden`, so the glow
+   reads fully even though inner content is clipped. */
+.agent-card--amr-highlight {
+  border-color: var(--accent);
+  animation: amr-card-pulse 1s cubic-bezier(0.23, 1, 0.32, 1) 2;
+}
+@keyframes amr-card-pulse {
+  0%,
+  100% {
+    box-shadow: 0 0 0 0 color-mix(in srgb, var(--accent) 0%, transparent);
+  }
+  35% {
+    box-shadow: 0 0 0 5px color-mix(in srgb, var(--accent) 34%, transparent);
+  }
+}
+
+/* Authorize-button coachmark: a fake cursor that fades + slides in from the
+   lower-right, landing with its tip on the AMR authorize button, inside a
+   pulsing ring. Anchored to the button (`.amr-auth-anchor`) so it always lines
+   up. `pointer-events: none` keeps the real button clickable; it dismisses the
+   moment the real pointer reaches the button (handled in JS). */
+.amr-auth-anchor {
+  position: relative;
+  display: inline-flex;
+}
+.amr-coachmark {
+  position: absolute;
+  /* Horizontally centered on the button, sitting low — the hand's fingertip
+     (top of the glyph) then points up into the button. `margin-left` centers
+     the box at `left: 50%` so `transform` stays free for the entrance. */
+  left: 50%;
+  margin-left: -12px;
+  bottom: 7px;
+  width: 24px;
+  height: 24px;
+  pointer-events: none;
+  z-index: 4;
+  animation: amr-coachmark-in 460ms cubic-bezier(0.23, 1, 0.32, 1) both;
+}
+/* Fade + rise straight up into place (bottom → up). */
+@keyframes amr-coachmark-in {
+  0% {
+    opacity: 0;
+    transform: translateY(16px) scale(0.8);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+.amr-coachmark__ring {
+  position: absolute;
+  inset: -3px;
+  border-radius: 50%;
+  border: 2px solid var(--accent);
+  opacity: 0;
+  /* Start pulsing only after the cursor has settled in. */
+  animation: amr-coachmark-ring 1.5s cubic-bezier(0.23, 1, 0.32, 1) 460ms infinite;
+}
+@keyframes amr-coachmark-ring {
+  0% {
+    transform: scale(0.55);
+    opacity: 0;
+  }
+  30% {
+    opacity: 0.65;
+  }
+  100% {
+    transform: scale(1.25);
+    opacity: 0;
+  }
+}
+.amr-coachmark__cursor {
+  position: absolute;
+  inset: 0;
+  filter: drop-shadow(0 1px 2px color-mix(in srgb, var(--text-muted) 45%, transparent));
+}
+.agent-card-main {
+  display: flex;
+  align-items: stretch;
+  min-width: 0;
+}
 .agent-card-select {
   flex: 1;
   min-width: 0;
@@ -815,16 +1093,43 @@
   border-color: var(--border-strong);
 }
 .agent-card.active {
-  border-color: var(--border);
-  background: color-mix(in srgb, var(--accent-tint) 54%, var(--bg-panel));
-  box-shadow: none;
+  border-color: color-mix(in srgb, var(--accent) 36%, var(--border));
+  background: var(--bg-panel);
+  box-shadow:
+    0 1px 0 color-mix(in srgb, var(--bg-panel) 88%, transparent) inset,
+    0 10px 28px color-mix(in srgb, var(--text) 9%, transparent);
 }
 .agent-card.active::before {
   content: '';
   position: absolute;
-  inset: 0 auto 0 0;
-  width: 3px;
-  background: var(--accent);
+  inset: 12px auto 12px 0;
+  width: 4px;
+  border-radius: 0 999px 999px 0;
+  background: linear-gradient(180deg, var(--accent), color-mix(in srgb, var(--accent) 56%, var(--selected)));
+}
+.agent-card-installed.active .agent-card-main {
+  background:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--accent-tint) 32%, var(--bg-panel)),
+      color-mix(in srgb, var(--accent-tint) 10%, var(--bg-panel))
+    );
+}
+.agent-card-installed.active .agent-card-select {
+  min-height: 78px;
+  padding: 14px 18px 12px 22px;
+}
+.agent-card-installed.active .agent-icon {
+  border-radius: 11px;
+  box-shadow:
+    0 0 0 1px color-mix(in srgb, var(--accent) 16%, var(--border-soft)),
+    0 8px 18px color-mix(in srgb, var(--accent) 16%, transparent);
+}
+.agent-card-installed.active .agent-card-name {
+  font-size: 13px;
+}
+.agent-card-installed.active .agent-card-meta {
+  margin-top: 1px;
 }
 .agent-card.disabled {
   cursor: not-allowed;
@@ -926,6 +1231,38 @@
 .agent-card-name > span:first-child {
   flex: 0 1 auto;
 }
+.agent-card-title {
+  min-width: 0;
+}
+.agent-card-name--amr {
+  align-items: center;
+  gap: 8px;
+}
+.agent-card-name--amr .agent-card-title {
+  flex: 0 0 auto;
+}
+.agent-card-benefits {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  min-width: 0;
+  overflow: hidden;
+}
+.agent-card-benefit {
+  display: inline-flex;
+  align-items: center;
+  flex: 0 0 auto;
+  min-height: 20px;
+  padding: 0 7px;
+  border: 1px solid color-mix(in srgb, var(--accent) 24%, var(--border-soft));
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--accent) 8%, var(--bg-panel));
+  color: color-mix(in srgb, var(--accent-strong) 82%, var(--text-strong));
+  font-size: 10.5px;
+  font-weight: 680;
+  line-height: 1;
+  white-space: nowrap;
+}
 .agent-card-name-divider,
 .agent-card-tagline {
   color: var(--text-muted);
@@ -949,6 +1286,102 @@
   line-height: 1.35;
 }
 .agent-card-meta .muted { color: var(--text-soft); font-style: italic; }
+.agent-card-amr-email {
+  margin-top: 4px;
+  color: var(--text-muted);
+  font-size: 11px;
+  font-weight: 500;
+  font-variant-numeric: tabular-nums;
+  line-height: 1.35;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.agent-card-amr-email span {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.agent-card-model-summary {
+  display: flex;
+  align-items: baseline;
+  gap: 6px;
+  margin-top: 4px;
+  min-width: 0;
+  color: var(--text-muted);
+  font-size: 11px;
+  line-height: 1.3;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.agent-card-model-summary span {
+  flex: 0 0 auto;
+}
+.agent-card-model-summary strong {
+  min-width: 0;
+  color: var(--text);
+  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.agent-card-amr-auth {
+  align-self: stretch;
+  flex: 0 1 auto;
+  min-width: 112px;
+  max-width: 280px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-left: 1px solid var(--border-soft);
+}
+.agent-card-amr-auth--placeholder {
+  visibility: hidden;
+  pointer-events: none;
+}
+.agent-card-amr-auth .amr-account-control {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 0;
+  gap: 8px;
+  padding: 0 14px;
+}
+.agent-card-amr-auth .amr-account-control__status {
+  max-width: 150px;
+  overflow: hidden;
+  color: var(--text-muted);
+  font-size: 11px;
+  font-weight: 500;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.agent-card-amr-auth .amr-account-control__action {
+  min-height: 36px;
+  padding: 0 18px;
+  border: 1px solid color-mix(in srgb, var(--accent) 28%, var(--border));
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--accent-tint) 62%, var(--bg-panel));
+  color: var(--text);
+  font-size: 13px;
+  font-weight: 680;
+  cursor: pointer;
+  transition: background-color 120ms ease, border-color 120ms ease, color 120ms ease, transform 120ms ease;
+}
+.agent-card-amr-auth .amr-account-control__action:hover:not(:disabled) {
+  border-color: color-mix(in srgb, var(--accent) 42%, var(--border));
+  background: color-mix(in srgb, var(--accent-tint) 76%, var(--bg-panel));
+  color: var(--accent-strong);
+  transform: translateY(-1px);
+}
+.agent-card-amr-auth .amr-account-control__action:disabled {
+  cursor: default;
+  opacity: 0.62;
+}
+.agent-card-amr-auth .amr-account-control__error,
+.agent-card-amr-auth .amr-login-pill-badge {
+  display: none;
+}
 .agent-model-row-head {
   font-size: 12px;
   color: var(--text);
@@ -965,6 +1398,20 @@
   border-radius: var(--radius-sm);
   background: var(--bg-panel);
 }
+.agent-card-config {
+  display: grid;
+  gap: 9px;
+  padding: 16px 24px 18px;
+  border-top: 1px solid color-mix(in srgb, var(--accent) 14%, var(--border-soft));
+  background:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--bg-subtle) 52%, var(--bg-panel)),
+      color-mix(in srgb, var(--bg-panel) 92%, var(--bg-subtle))
+    );
+}
+.agent-card-config select,
+.agent-card-config input,
 .agent-model-row select,
 .agent-model-row input,
 .agent-cli-env select,
@@ -986,7 +1433,9 @@
   border-radius: var(--radius-sm);
   background: var(--bg-panel);
 }
+.agent-card-config .field,
 .agent-model-row .field { gap: 4px; }
+.agent-card-config .field-label,
 .agent-model-row .field-label {
   display: inline-flex;
   align-items: center;
@@ -997,6 +1446,11 @@
   letter-spacing: 0.04em;
   color: var(--text-muted);
 }
+.agent-card-config .field-label {
+  margin-bottom: 2px;
+  font-size: 11px;
+  letter-spacing: 0.06em;
+}
 .agent-model-source-badge {
   display: inline-flex;
   align-items: center;
@@ -1032,7 +1486,12 @@
   margin-right: 6px;
   color: var(--text-muted);
 }
+.agent-card-config .hint,
 .agent-model-row .hint { margin: 0; font-size: 11.5px; }
+.agent-card-config .hint {
+  color: var(--text-muted);
+  line-height: 1.35;
+}
 .agent-model-select-wrap {
   position: relative;
 }
@@ -1043,6 +1502,14 @@
   padding-right: 28px;
   width: 100%;
 }
+.agent-card-config .agent-model-select-wrap select {
+  min-height: 36px;
+  border-color: color-mix(in srgb, var(--border) 78%, transparent);
+  background: color-mix(in srgb, var(--bg-subtle) 82%, var(--bg-panel));
+}
+.agent-card-config .agent-model-select-wrap select:hover {
+  border-color: var(--border-strong);
+}
 .agent-model-select-chevron {
   position: absolute;
   right: 8px;
@@ -2176,4 +2643,3 @@
   font-weight: 500;
   color: var(--accent);
 }
-
diff --git a/apps/web/tests/components/AgentIcon.test.tsx b/apps/web/tests/components/AgentIcon.test.tsx
index 978fb6fd7..d94644827 100644
--- a/apps/web/tests/components/AgentIcon.test.tsx
+++ b/apps/web/tests/components/AgentIcon.test.tsx
@@ -72,6 +72,19 @@ describe('AgentIcon', () => {
     expect(markup).not.toContain('agent-icon-mono');
   });
 
+  it('renders AMR as the bundled color SVG instead of the fallback initial', () => {
+    const amrSvg = readFileSync(
+      new URL('../../public/agent-icons/amr.svg', import.meta.url),
+      'utf8',
+    );
+    const markup = renderToStaticMarkup(<AgentIcon id="amr" size={24} />);
+
+    expect(amrSvg).toMatch(/^<svg\b/);
+    expect(amrSvg).toContain('fill="#87EA5C"');
+    expect(markup).toContain('src="/agent-icons/amr.svg"');
+    expect(markup).not.toContain('agent-icon-fallback');
+  });
+
   it('renders monochrome SVGs as a CSS-masked <span> so they pick up theme color', () => {
     // cursor-agent.svg ships with `fill="currentColor"` and would lose its
     // ink under a dark theme if loaded through `<img>` (which would make
diff --git a/apps/web/tests/components/AmrGuidance.test.tsx b/apps/web/tests/components/AmrGuidance.test.tsx
new file mode 100644
index 000000000..647a9646f
--- /dev/null
+++ b/apps/web/tests/components/AmrGuidance.test.tsx
@@ -0,0 +1,95 @@
+// @vitest-environment jsdom
+
+/**
+ * Analytics + behaviour coverage for the hosted-AMR nudge component. It fires
+ * `surface_view` (element=run_failed_toast) on mount with the full business
+ * prop set, and `ui_click` (element=go_amr) + `onActivate` on the link.
+ * (Gating — which agents/codes get the nudge — is covered by the
+ * `resolveRunFailureUi` resolver test.)
+ */
+
+import { cleanup, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('../../src/analytics/events', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../src/analytics/events')>();
+  return {
+    ...actual,
+    trackRunFailedToastSurfaceView: vi.fn(),
+    trackRunFailedToastGoAmrClick: vi.fn(),
+  };
+});
+
+import { AmrGuidance } from '../../src/components/AmrGuidance';
+import {
+  trackRunFailedToastGoAmrClick,
+  trackRunFailedToastSurfaceView,
+} from '../../src/analytics/events';
+
+beforeAll(() => {
+  const store = new Map<string, string>();
+  Object.defineProperty(window, 'localStorage', {
+    configurable: true,
+    value: {
+      clear: () => store.clear(),
+      getItem: (key: string) => store.get(key) ?? null,
+      removeItem: (key: string) => store.delete(key),
+      setItem: (key: string, value: string) => store.set(key, value),
+    },
+  });
+});
+
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+beforeEach(() => {
+  vi.clearAllMocks();
+});
+
+function renderGuidance(onActivate = vi.fn()) {
+  render(
+    <AmrGuidance
+      errorCode="AGENT_AUTH_REQUIRED"
+      projectId="proj-1"
+      projectKind="prototype"
+      conversationId="conv-1"
+      assistantMessageId="msg-amr"
+      runId="run-9"
+      onActivate={onActivate}
+    />,
+  );
+  return onActivate;
+}
+
+describe('AmrGuidance', () => {
+  it('fires surface_view once on mount with the full prop set', () => {
+    renderGuidance();
+    expect(screen.getByTestId('amr-guidance')).toBeTruthy();
+    expect(trackRunFailedToastSurfaceView).toHaveBeenCalledTimes(1);
+    expect(vi.mocked(trackRunFailedToastSurfaceView).mock.calls[0]![1]).toMatchObject({
+      page_name: 'chat_panel',
+      area: 'chat_panel',
+      element: 'run_failed_toast',
+      error_code: 'AGENT_AUTH_REQUIRED',
+      project_id: 'proj-1',
+      project_kind: 'prototype',
+      conversation_id: 'conv-1',
+      assistant_message_id: 'msg-amr',
+      run_id: 'run-9',
+    });
+  });
+
+  it('fires ui_click go_amr and calls onActivate on click', () => {
+    const onActivate = renderGuidance();
+    fireEvent.click(screen.getByRole('button'));
+    expect(trackRunFailedToastGoAmrClick).toHaveBeenCalledTimes(1);
+    expect(vi.mocked(trackRunFailedToastGoAmrClick).mock.calls[0]![1]).toMatchObject({
+      page_name: 'chat_panel',
+      area: 'chat_panel',
+      element: 'go_amr',
+    });
+    expect(onActivate).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/apps/web/tests/components/AmrLoginPill.test.tsx b/apps/web/tests/components/AmrLoginPill.test.tsx
new file mode 100644
index 000000000..26e5de282
--- /dev/null
+++ b/apps/web/tests/components/AmrLoginPill.test.tsx
@@ -0,0 +1,537 @@
+// @vitest-environment jsdom
+
+/**
+ * Coverage for the AMR Settings login pill. The pill is a sibling of the
+ * Test button inside the installed-agent card and intentionally stops
+ * click/key event propagation so a Sign-in / Sign-out click does NOT
+ * also re-select the agent card.
+ *
+ * The component polls `/api/integrations/vela/status` to keep up with
+ * subprocess-driven login completion — vela CLI owns the
+ * device-authorization UX, so we just kick `vela login` off and wait.
+ */
+
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import type { ComponentProps } from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import {
+  AmrAccountControl,
+  AmrLoginPill,
+} from '../../src/components/AmrLoginPill';
+import { AMR_LOGIN_TIMEOUT_MS } from '../../src/components/amrLoginPolling';
+import { I18nProvider } from '../../src/i18n';
+
+interface StubbedResponse {
+  status?: number;
+  body: unknown;
+}
+
+function jsonResponse({ status = 200, body }: StubbedResponse): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { 'Content-Type': 'application/json' },
+  });
+}
+
+const originalFetch = globalThis.fetch;
+
+afterEach(() => {
+  cleanup();
+  globalThis.fetch = originalFetch;
+  vi.useRealTimers();
+});
+
+beforeEach(() => {
+  globalThis.fetch = originalFetch;
+});
+
+function renderPill() {
+  return render(
+    <I18nProvider initial="en">
+      <AmrLoginPill />
+    </I18nProvider>,
+  );
+}
+
+function renderAccountControl(
+  props: ComponentProps<typeof AmrAccountControl>,
+) {
+  return render(
+    <I18nProvider initial="en">
+      <AmrAccountControl {...props} />
+    </I18nProvider>,
+  );
+}
+
+describe('AmrAccountControl', () => {
+  it('renders the compact signed-out status and sign-in action', () => {
+    const onSignIn = vi.fn();
+
+    renderAccountControl({
+      status: 'signed-out',
+      compact: true,
+      onSignIn,
+    });
+
+    expect(
+      screen.getByRole('group', { name: 'AMR account status' }),
+    ).toBeTruthy();
+    expect(screen.getByText('Not signed in')).toBeTruthy();
+    const signIn = screen.getByRole('button', { name: 'Sign in' });
+    expect(signIn).toBeTruthy();
+
+    fireEvent.click(signIn);
+    expect(onSignIn).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the signing-in state without exposing a second action', () => {
+    renderAccountControl({
+      status: 'signing-in',
+      compact: true,
+      onSignIn: vi.fn(),
+    });
+
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+    expect(screen.queryByRole('button')).toBeNull();
+  });
+
+  it('renders the signed-in email without profile fallback details', () => {
+    renderAccountControl({
+      status: 'signed-in',
+      email: 'leaf@example.com',
+      compact: true,
+      profile: 'local',
+    });
+
+    expect(screen.getByText('leaf@example.com')).toBeTruthy();
+    expect(screen.queryByText('LOCAL')).toBeNull();
+    expect(screen.queryByText('local')).toBeNull();
+  });
+
+  it('renders compact login errors with AMR-labeled text', () => {
+    renderAccountControl({
+      status: 'error',
+      compact: true,
+      errorMessage: 'command failed',
+      onSignIn: vi.fn(),
+    });
+
+    expect(screen.getByText('AMR sign-in failed.')).toBeTruthy();
+    expect(screen.queryByText('command failed')).toBeNull();
+    expect(screen.getByRole('button', { name: 'Sign in' })).toBeTruthy();
+  });
+});
+
+describe('AmrLoginPill', () => {
+  it('renders a Sign-in button when /status reports loggedIn=false', async () => {
+    globalThis.fetch = vi.fn(async (input) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({
+          body: { loggedIn: false, profile: 'prod', user: null, configPath: '/x' },
+        });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    }) as typeof fetch;
+
+    renderPill();
+
+    expect(await screen.findByRole('button', { name: 'Sign in' })).toBeTruthy();
+    expect(screen.queryByText('TEST')).toBeNull();
+    expect(screen.queryByText('LOCAL')).toBeNull();
+  });
+
+  it('renders a TEST badge next to the signed-out action for the test profile', async () => {
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({
+        body: { loggedIn: false, profile: 'test', user: null, configPath: '/x' },
+      }),
+    ) as typeof fetch;
+
+    renderPill();
+
+    expect(await screen.findByRole('button', { name: 'Sign in' })).toBeTruthy();
+    expect(screen.getByText('TEST')).toBeTruthy();
+  });
+
+  it('renders daemon-reported in-flight login attempts as signing-in', async () => {
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({
+        body: {
+          loggedIn: false,
+          loginInFlight: true,
+          profile: 'prod',
+          user: null,
+          configPath: '/x',
+        },
+      }),
+    ) as typeof fetch;
+
+    renderPill();
+
+    expect(await screen.findByText('Signing in…')).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Sign in' })).toBeNull();
+  });
+
+  it('renders a LOCAL badge next to the signed-out action for the local profile', async () => {
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({
+        body: { loggedIn: false, profile: 'local', user: null, configPath: '/x' },
+      }),
+    ) as typeof fetch;
+
+    renderPill();
+
+    expect(await screen.findByRole('button', { name: 'Sign in' })).toBeTruthy();
+    expect(screen.getByText('LOCAL')).toBeTruthy();
+  });
+
+  it('renders a "Signed in" pill (with the Sign-out aria-label) when /status reports a logged-in user', async () => {
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({
+        body: {
+          loggedIn: true,
+          profile: 'local',
+          configPath: '/x',
+          user: { id: 'u', email: 'leaf@example.com', plan: 'free' },
+        },
+      }),
+    ) as typeof fetch;
+
+    renderPill();
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Sign out' })).toBeTruthy();
+    });
+    expect(screen.getByText('leaf@example.com')).toBeTruthy();
+    expect(screen.getByText('LOCAL')).toBeTruthy();
+  });
+
+  it('stops click propagation so the Sign-in button never bubbles up to the agent-card-select sibling', async () => {
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({
+          body: { loggedIn: false, profile: 'local', user: null, configPath: '/x' },
+        });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/login') &&
+        init?.method === 'POST'
+      ) {
+        return jsonResponse({ status: 202, body: { pid: 4242 } });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+
+    const cardSelect = vi.fn();
+    render(
+      <I18nProvider initial="en">
+        <div
+          role="group"
+          onClick={cardSelect}
+          onKeyDown={cardSelect}
+        >
+          <AmrLoginPill />
+        </div>
+      </I18nProvider>,
+    );
+
+    const signInBtn = await screen.findByRole('button', { name: 'Sign in' });
+    fireEvent.click(signInBtn);
+    expect(cardSelect).not.toHaveBeenCalled();
+
+    await waitFor(() => {
+      expect(
+        fetchMock.mock.calls.some(
+          ([url, init]) =>
+            String(url).endsWith('/api/integrations/vela/login') &&
+            (init as RequestInit | undefined)?.method === 'POST',
+        ),
+      ).toBe(true);
+    });
+  });
+
+  it('shows an AMR error instead of staying in signing-in state when login fails immediately', async () => {
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({
+          body: { loggedIn: false, profile: 'prod', user: null, configPath: '/x' },
+        });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/login') &&
+        init?.method === 'POST'
+      ) {
+        return jsonResponse({
+          status: 500,
+          body: { error: 'profile "prod" api URL: is not configured' },
+        });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+
+    renderPill();
+    fireEvent.click(await screen.findByRole('button', { name: 'Sign in' }));
+
+    await waitFor(() => {
+      expect(screen.getByRole('alert')).toBeTruthy();
+    });
+    expect(screen.getByText('AMR sign-in failed.')).toBeTruthy();
+    expect(screen.queryByText('Signing in…')).toBeNull();
+  });
+
+  it('does not POST /login twice while sign-in polling is already pending', async () => {
+    let loginCalls = 0;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({
+          body: { loggedIn: false, profile: 'prod', user: null, configPath: '/x' },
+        });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/login') &&
+        init?.method === 'POST'
+      ) {
+        loginCalls += 1;
+        return jsonResponse({ status: 202, body: { pid: 4242 } });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+
+    renderPill();
+    const signIn = await screen.findByRole('button', { name: 'Sign in' });
+    fireEvent.click(signIn);
+    fireEvent.click(signIn);
+
+    await waitFor(() => {
+      expect(loginCalls).toBe(1);
+    });
+    expect(await screen.findByText('Signing in…')).toBeTruthy();
+  });
+
+  it('recovers from transient /status failures and still flips to signed-in when polling succeeds later', async () => {
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        statusCalls += 1;
+        if (statusCalls === 2) {
+          throw new Error('temporary network failure');
+        }
+        return jsonResponse({
+          body:
+            statusCalls >= 3
+              ? {
+                  loggedIn: true,
+                  profile: 'local',
+                  configPath: '/x',
+                  user: { id: 'u', email: 'leaf@example.com', plan: 'free' },
+                }
+              : { loggedIn: false, profile: 'local', user: null, configPath: '/x' },
+        });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/login') &&
+        init?.method === 'POST'
+      ) {
+        return jsonResponse({ status: 202, body: { pid: 4242 } });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+
+    renderPill();
+    fireEvent.click(await screen.findByRole('button', { name: 'Sign in' }));
+
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 2100));
+    });
+
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 2100));
+    });
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Sign out' })).toBeTruthy();
+    });
+    expect(screen.getByText('leaf@example.com')).toBeTruthy();
+  }, 10_000);
+
+  it('cancels a timed-out login attempt and restores the Sign-in action', async () => {
+    let loginStarted = false;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({
+          body: {
+            loggedIn: false,
+            loginInFlight: loginStarted,
+            profile: 'prod',
+            user: null,
+            configPath: '/x',
+          },
+        });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/login') &&
+        init?.method === 'POST'
+      ) {
+        loginStarted = true;
+        return jsonResponse({ status: 202, body: { pid: 4242 } });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/login/cancel') &&
+        init?.method === 'POST'
+      ) {
+        loginStarted = false;
+        return jsonResponse({ body: { canceled: true, pids: [4242] } });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+
+    renderPill();
+    const signIn = await screen.findByRole('button', { name: 'Sign in' });
+    vi.useFakeTimers();
+    fireEvent.click(signIn);
+
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(AMR_LOGIN_TIMEOUT_MS);
+    });
+    expect(
+      fetchMock.mock.calls.some(
+        ([url, init]) =>
+          String(url).endsWith('/api/integrations/vela/login/cancel') &&
+          (init as RequestInit | undefined)?.method === 'POST',
+      ),
+    ).toBe(true);
+    expect(screen.getByText('AMR sign-in failed.')).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Sign in' })).toBeTruthy();
+    expect(screen.queryByText('Signing in…')).toBeNull();
+  });
+
+  it('logout POSTs /logout and flips the pill back to Sign-in', async () => {
+    let loggedIn = true;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({
+          body: loggedIn
+            ? {
+                loggedIn: true,
+                profile: 'local',
+                configPath: '/x',
+                user: { id: 'u', email: 'leaf@example.com', plan: 'free' },
+              }
+            : { loggedIn: false, profile: 'local', user: null, configPath: '/x' },
+        });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/logout') &&
+        init?.method === 'POST'
+      ) {
+        loggedIn = false;
+        return jsonResponse({ body: { ok: true } });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+
+    renderPill();
+    const logoutBtn = await screen.findByRole('button', { name: 'Sign out' });
+    fireEvent.click(logoutBtn);
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Sign in' })).toBeTruthy();
+    });
+  });
+
+  it('converges a stale signed-in snapshot back to Sign-in when a later status read reports loggedOut', async () => {
+    let readCount = 0;
+    globalThis.fetch = vi.fn(async () => {
+      readCount += 1;
+      return jsonResponse({
+        body:
+          readCount === 1
+            ? {
+                loggedIn: true,
+                profile: 'local',
+                configPath: '/x',
+                user: { id: 'u', email: 'leaf@example.com', plan: 'free' },
+              }
+            : { loggedIn: false, profile: 'local', user: null, configPath: '/x' },
+      });
+    }) as typeof fetch;
+
+    const first = renderPill();
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Sign out' })).toBeTruthy();
+    });
+    first.unmount();
+
+    renderPill();
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Sign in' })).toBeTruthy();
+    });
+    expect(screen.queryByRole('button', { name: 'Sign out' })).toBeNull();
+  });
+
+  it('does not silently auto-recover to signed-in after a local logout completes', async () => {
+    let loggedIn = true;
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = typeof input === 'string' ? input : (input as URL).toString();
+      if (url.endsWith('/api/integrations/vela/status')) {
+        statusCalls += 1;
+        return jsonResponse({
+          body: loggedIn
+            ? {
+                loggedIn: true,
+                profile: 'local',
+                configPath: '/x',
+                user: { id: 'u', email: 'leaf@example.com', plan: 'free' },
+              }
+            : { loggedIn: false, profile: 'local', user: null, configPath: '/x' },
+        });
+      }
+      if (
+        url.endsWith('/api/integrations/vela/logout') &&
+        init?.method === 'POST'
+      ) {
+        loggedIn = false;
+        return jsonResponse({ body: { ok: true } });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+
+    renderPill();
+    const logoutBtn = await screen.findByRole('button', { name: 'Sign out' });
+    fireEvent.click(logoutBtn);
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Sign in' })).toBeTruthy();
+    });
+    const callsAfterLogout = statusCalls;
+
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 50));
+    });
+
+    expect(screen.getByRole('button', { name: 'Sign in' })).toBeTruthy();
+    expect(statusCalls).toBe(callsAfterLogout);
+  });
+});
diff --git a/apps/web/tests/components/AssistantMessage.error-pill.test.tsx b/apps/web/tests/components/AssistantMessage.error-pill.test.tsx
new file mode 100644
index 000000000..931f29bf3
--- /dev/null
+++ b/apps/web/tests/components/AssistantMessage.error-pill.test.tsx
@@ -0,0 +1,86 @@
+// @vitest-environment jsdom
+
+/**
+ * The per-message gray "error" status pill is suppressed ONLY for the failed
+ * run that ChatPane renders its top-level error card for (errorCardOwnerId).
+ * Other failed turns — older history, or once a follow-up makes this no longer
+ * the last assistant message — must keep their pill so the error detail still
+ * survives reload / history review (regression: #3083 review).
+ */
+
+import { cleanup, render, screen } from '@testing-library/react';
+import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
+
+import { AssistantMessage } from '../../src/components/AssistantMessage';
+import type { ChatMessage } from '../../src/types';
+
+beforeAll(() => {
+  const store = new Map<string, string>();
+  Object.defineProperty(window, 'localStorage', {
+    configurable: true,
+    value: {
+      clear: () => store.clear(),
+      getItem: (k: string) => store.get(k) ?? null,
+      removeItem: (k: string) => store.delete(k),
+      setItem: (k: string, v: string) => store.set(k, v),
+    },
+  });
+});
+
+afterEach(cleanup);
+
+function failedMessage(): ChatMessage {
+  return {
+    id: 'msg-failed',
+    role: 'assistant',
+    content: '',
+    runStatus: 'failed',
+    startedAt: 1700000000,
+    endedAt: 1700000005,
+    events: [
+      { kind: 'status', label: 'error', detail: 'boom-401' },
+    ] as ChatMessage['events'],
+    producedFiles: [],
+  } as ChatMessage;
+}
+
+describe('AssistantMessage error-pill suppression', () => {
+  it('keeps the error pill when this message does NOT own the top-level card', () => {
+    render(
+      <AssistantMessage
+        message={failedMessage()}
+        streaming={false}
+        projectId="p1"
+        errorCardOwnerId={null}
+        onFeedback={vi.fn()}
+      />,
+    );
+    expect(screen.getByText('boom-401')).toBeTruthy();
+  });
+
+  it('keeps the pill for a non-last failed run even when another message owns the card', () => {
+    render(
+      <AssistantMessage
+        message={failedMessage()}
+        streaming={false}
+        projectId="p1"
+        errorCardOwnerId="some-other-message"
+        onFeedback={vi.fn()}
+      />,
+    );
+    expect(screen.getByText('boom-401')).toBeTruthy();
+  });
+
+  it('suppresses the pill only for the message that owns the top-level card', () => {
+    render(
+      <AssistantMessage
+        message={failedMessage()}
+        streaming={false}
+        projectId="p1"
+        errorCardOwnerId="msg-failed"
+        onFeedback={vi.fn()}
+      />,
+    );
+    expect(screen.queryByText('boom-401')).toBeNull();
+  });
+});
diff --git a/apps/web/tests/components/AssistantMessage.test.tsx b/apps/web/tests/components/AssistantMessage.test.tsx
index b38b58cd7..d96ca1afa 100644
--- a/apps/web/tests/components/AssistantMessage.test.tsx
+++ b/apps/web/tests/components/AssistantMessage.test.tsx
@@ -13,7 +13,6 @@ import { AssistantMessage } from '../../src/components/AssistantMessage';
 import type { ChatMessage, ProjectFile } from '../../src/types';
 
 beforeAll(() => {
-  if (window.localStorage) return;
   const store = new Map<string, string>();
   Object.defineProperty(window, 'localStorage', {
     configurable: true,
@@ -192,6 +191,85 @@ describe('AssistantMessage status badge updates (Bug A)', () => {
     const matches = screen.queryAllByText('claude-opus-4-7-max');
     expect(matches.length).toBe(1);
   });
+
+  it('renders bare URLs in status details as links', () => {
+    render(
+      <AssistantMessage
+        message={baseMessage({
+          runStatus: 'failed',
+          events: [
+            {
+              kind: 'status',
+              label: 'error',
+              detail:
+                'AMR Cloud reported insufficient balance. Recharge at https://open-design.ai/amr/wallet, then retry.',
+            } as ChatMessage['events'][number],
+          ],
+        })}
+        streaming={false}
+        projectId="proj-1"
+        onFeedback={vi.fn()}
+      />,
+    );
+
+    const link = screen.getByRole('link', { name: 'https://open-design.ai/amr/wallet' });
+    expect(link.getAttribute('href')).toBe('https://open-design.ai/amr/wallet');
+    expect(link.classList.contains('md-link')).toBe(true);
+  });
+});
+
+describe('AssistantMessage question forms', () => {
+  it('renders only the first question form for a repeated form id in one assistant turn', () => {
+    const firstForm = [
+      '<question-form id="discovery" title="Quick brief — tailored">',
+      JSON.stringify({
+        questions: [
+          {
+            id: 'audience',
+            label: 'Who is this for?',
+            type: 'text',
+          },
+        ],
+      }),
+      '</question-form>',
+    ].join('\n');
+    const duplicateForm = [
+      '<question-form id="discovery" title="Quick brief — 30 seconds">',
+      JSON.stringify({
+        questions: [
+          {
+            id: 'output',
+            label: 'What are we making?',
+            type: 'radio',
+            required: true,
+            options: ['Slide deck / pitch', 'Dashboard / tool UI'],
+          },
+        ],
+      }),
+      '</question-form>',
+    ].join('\n');
+
+    render(
+      <AssistantMessage
+        message={baseMessage({
+          events: [
+            {
+              kind: 'text',
+              text: `${firstForm}\n\nFirst answer the tailored brief:\n\n${duplicateForm}`,
+            } as ChatMessage['events'][number],
+          ],
+        })}
+        streaming={false}
+        projectId="proj-1"
+        isLast
+      />,
+    );
+
+    expect(screen.getByText('Quick brief — tailored')).toBeTruthy();
+    expect(screen.getByText('Who is this for?')).toBeTruthy();
+    expect(screen.queryByText('Quick brief — 30 seconds')).toBeNull();
+    expect(screen.queryByText('What are we making?')).toBeNull();
+  });
 });
 
 describe('AssistantMessage recovered produced files', () => {
diff --git a/apps/web/tests/components/EntryShell.onboarding.test.tsx b/apps/web/tests/components/EntryShell.onboarding.test.tsx
new file mode 100644
index 000000000..66340a965
--- /dev/null
+++ b/apps/web/tests/components/EntryShell.onboarding.test.tsx
@@ -0,0 +1,390 @@
+// @vitest-environment jsdom
+
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { EntryShell } from '../../src/components/EntryShell';
+import { AMR_LOGIN_TIMEOUT_MS } from '../../src/components/amrLoginPolling';
+import { I18nProvider } from '../../src/i18n';
+import type { AgentInfo, AppConfig } from '../../src/types';
+
+const originalFetch = globalThis.fetch;
+
+function jsonResponse(body: unknown, status = 200): Response {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { 'Content-Type': 'application/json' },
+  });
+}
+
+function amrAgent(overrides: Partial<AgentInfo> = {}): AgentInfo {
+  return {
+    id: 'amr',
+    name: 'AMR',
+    bin: 'amr',
+    available: true,
+    models: [{ id: 'amr-model', label: 'AMR Model' }],
+    ...overrides,
+  };
+}
+
+function cliAgent(overrides: Partial<AgentInfo> = {}): AgentInfo {
+  return {
+    id: 'claude-code',
+    name: 'Claude Code',
+    bin: 'claude',
+    available: true,
+    version: '1.0.0',
+    models: [{ id: 'sonnet', label: 'Sonnet' }],
+    ...overrides,
+  };
+}
+
+function baseConfig(overrides: Partial<AppConfig> = {}): AppConfig {
+  return {
+    mode: 'daemon',
+    agentId: null,
+    agentModels: {},
+    apiProtocol: 'anthropic',
+    apiProtocolConfigs: {},
+    apiKey: '',
+    baseUrl: '',
+    model: '',
+    ...overrides,
+  } as AppConfig;
+}
+
+function renderOnboarding(
+  overrides: Partial<React.ComponentProps<typeof EntryShell>> = {},
+) {
+  window.history.replaceState(null, '', '/onboarding');
+  const props: React.ComponentProps<typeof EntryShell> = {
+    skills: [],
+    designTemplates: [],
+    designSystems: [],
+    projects: [],
+    templates: [],
+    promptTemplates: [],
+    defaultDesignSystemId: null,
+    connectors: [],
+    connectorsLoading: false,
+    config: baseConfig(),
+    agents: [amrAgent(), cliAgent()],
+    daemonLive: true,
+    onModeChange: vi.fn(),
+    onAgentChange: vi.fn(),
+    onAgentModelChange: vi.fn(),
+    onApiProtocolChange: vi.fn(),
+    onApiModelChange: vi.fn(),
+    onConfigPersist: vi.fn(),
+    onRefreshAgents: vi.fn(() => [amrAgent(), cliAgent()]),
+    onThemeChange: vi.fn(),
+    onCreateProject: vi.fn(),
+    onCreatePluginShareProject: vi.fn(),
+    onImportClaudeDesign: vi.fn(),
+    onOpenProject: vi.fn(),
+    onOpenLiveArtifact: vi.fn(),
+    onDeleteProject: vi.fn(),
+    onRenameProject: vi.fn(),
+    onChangeDefaultDesignSystem: vi.fn(),
+    onPersistComposioKey: vi.fn(),
+    onOpenSettings: vi.fn(),
+    onCompleteOnboarding: vi.fn(),
+    ...overrides,
+  };
+
+  render(
+    <I18nProvider initial="en">
+      <EntryShell {...props} />
+    </I18nProvider>,
+  );
+
+  return props;
+}
+
+afterEach(() => {
+  cleanup();
+  globalThis.fetch = originalFetch;
+  vi.useRealTimers();
+});
+
+beforeEach(() => {
+  globalThis.fetch = originalFetch;
+});
+
+describe('EntryShell onboarding Open Design AMR runtime', () => {
+  it('does not auto-select Open Design AMR when the AMR runtime is unavailable', async () => {
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({ loggedIn: false, profile: 'prod', user: null, configPath: '/x' }),
+    ) as typeof fetch;
+    const props = renderOnboarding({
+      agents: [cliAgent()],
+      onRefreshAgents: vi.fn(() => [cliAgent()]),
+    });
+
+    expect(screen.queryByRole('button', { name: /Open Design AMR/i })).toBeNull();
+    fireEvent.click(screen.getByRole('button', { name: /Local coding agent/i }));
+
+    await waitFor(() => {
+      expect(props.onAgentChange).not.toHaveBeenCalledWith('amr');
+    });
+    expect(screen.getByText('Local CLI')).toBeTruthy();
+    expect(screen.queryByText('Sign in to continue')).toBeNull();
+  });
+
+  it('shows Open Design AMR as the recommended default when AMR is available', async () => {
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({ loggedIn: false, profile: 'prod', user: null, configPath: '/x' }),
+    ) as typeof fetch;
+    const props = renderOnboarding();
+
+    const amrCloud = screen.getByRole('button', { name: /Open Design AMR/i });
+    expect(amrCloud.getAttribute('aria-pressed')).toBe('true');
+    expect(amrCloud.textContent).toContain('Officially maintained');
+    expect(amrCloud.textContent).toContain('Ready to use');
+    expect(amrCloud.textContent).toContain('Many models');
+    expect(amrCloud.textContent).toContain('Better pricing');
+    expect(screen.queryByRole('link', { name: /Authorize AMR/i })).toBeNull();
+    expect(screen.getByRole('button', { name: /Sign in to continue/i })).toBeTruthy();
+    await screen.findByText('Not signed in');
+    expect(screen.queryByRole('button', { name: /^Sign in$/i })).toBeNull();
+    await waitFor(() => {
+      expect(props.onModeChange).toHaveBeenCalledWith('daemon');
+      expect(props.onAgentChange).toHaveBeenCalledWith('amr');
+    });
+  });
+
+  it('excludes AMR from the Local CLI agent list', async () => {
+    vi.useFakeTimers();
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({ loggedIn: false, profile: 'prod', user: null, configPath: '/x' }),
+    ) as typeof fetch;
+    renderOnboarding();
+
+    fireEvent.click(screen.getByRole('button', { name: /Local coding agent/i }));
+    await vi.advanceTimersByTimeAsync(300);
+
+    const localPanel = screen.getByText('Local CLI').closest('.onboarding-view__setup-panel');
+    expect(localPanel?.textContent).toContain('Claude Code');
+    expect(localPanel?.textContent).not.toContain('AMR');
+  });
+
+  it('keeps AMR login pending while device authorization is waiting', async () => {
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = String(input);
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({ loggedIn: false, profile: 'prod', user: null, configPath: '/x' });
+      }
+      if (url.endsWith('/api/integrations/vela/login') && init?.method === 'POST') {
+        return jsonResponse({ pid: 123 }, 202);
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+    const props = renderOnboarding();
+
+    const signIn = await screen.findByRole('button', { name: /Sign in to continue/i });
+    vi.useFakeTimers();
+    fireEvent.click(signIn);
+    await act(async () => {});
+
+    await vi.waitFor(() => {
+      expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login', { method: 'POST' });
+    });
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+    expect(screen.queryByText('Not signed in')).toBeNull();
+    expect(signIn.hasAttribute('disabled')).toBe(true);
+    await vi.advanceTimersByTimeAsync(2000);
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+    expect(props.onCompleteOnboarding).not.toHaveBeenCalled();
+    expect(screen.getByText('Connect')).toBeTruthy();
+  });
+
+  it('clears AMR login pending when the user switches to another runtime', async () => {
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = String(input);
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({ loggedIn: false, profile: 'prod', user: null, configPath: '/x' });
+      }
+      if (url.endsWith('/api/integrations/vela/login') && init?.method === 'POST') {
+        return jsonResponse({ pid: 123 }, 202);
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+    renderOnboarding();
+
+    const signIn = await screen.findByRole('button', { name: /Sign in to continue/i });
+    vi.useFakeTimers();
+    fireEvent.click(signIn);
+    await act(async () => {});
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+    expect(signIn.hasAttribute('disabled')).toBe(true);
+
+    fireEvent.click(screen.getByRole('button', { name: /Local coding agent/i }));
+    await act(async () => {});
+
+    expect(screen.queryByText('Signing in…')).toBeNull();
+    expect(screen.getByRole('button', { name: /^Continue$/i }).hasAttribute('disabled')).toBe(false);
+  });
+
+  it('cancels AMR login and re-enables onboarding after the login timeout', async () => {
+    let loginStarted = false;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = String(input);
+      if (url.endsWith('/api/integrations/vela/status')) {
+        return jsonResponse({
+          loggedIn: false,
+          loginInFlight: loginStarted,
+          profile: 'prod',
+          user: null,
+          configPath: '/x',
+        });
+      }
+      if (url.endsWith('/api/integrations/vela/login') && init?.method === 'POST') {
+        loginStarted = true;
+        return jsonResponse({ pid: 123 }, 202);
+      }
+      if (url.endsWith('/api/integrations/vela/login/cancel') && init?.method === 'POST') {
+        loginStarted = false;
+        return jsonResponse({ canceled: true, pids: [123] });
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+    const props = renderOnboarding();
+
+    const signIn = await screen.findByRole('button', { name: /Sign in to continue/i });
+    vi.useFakeTimers();
+    fireEvent.click(signIn);
+
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login', { method: 'POST' });
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(AMR_LOGIN_TIMEOUT_MS);
+    });
+    expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login/cancel', { method: 'POST' });
+    expect(screen.getByText('AMR sign-in failed.')).toBeTruthy();
+    expect(screen.queryByText('Signing in…')).toBeNull();
+    expect(screen.getByRole('button', { name: /Sign in to continue/i }).hasAttribute('disabled')).toBe(false);
+    expect(props.onCompleteOnboarding).not.toHaveBeenCalled();
+  });
+
+  it('continues after AMR device authorization completes during polling', async () => {
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = String(input);
+      if (url.endsWith('/api/integrations/vela/status')) {
+        statusCalls += 1;
+        return jsonResponse(
+          statusCalls >= 3
+            ? {
+                loggedIn: true,
+                profile: 'prod',
+                user: { id: 'u', email: 'user@example.com' },
+                configPath: '/x',
+              }
+            : { loggedIn: false, profile: 'prod', user: null, configPath: '/x' },
+        );
+      }
+      if (url.endsWith('/api/integrations/vela/login') && init?.method === 'POST') {
+        return jsonResponse({ pid: 123 }, 202);
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+    renderOnboarding();
+
+    const signIn = await screen.findByRole('button', { name: /Sign in to continue/i });
+    vi.useFakeTimers();
+    fireEvent.click(signIn);
+    await act(async () => {});
+
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+    await vi.advanceTimersByTimeAsync(2000);
+    await vi.waitFor(() => {
+      expect(screen.getByRole('heading', { name: 'About you' })).toBeTruthy();
+    });
+  });
+
+  it('recovers from a transient status failure during login polling and still continues after authorization completes', async () => {
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input, init) => {
+      const url = String(input);
+      if (url.endsWith('/api/integrations/vela/status')) {
+        statusCalls += 1;
+        if (statusCalls === 2) throw new Error('temporary network failure');
+        return jsonResponse(
+          statusCalls >= 4
+            ? {
+                loggedIn: true,
+                profile: 'prod',
+                user: { id: 'u', email: 'user@example.com' },
+                configPath: '/x',
+              }
+            : { loggedIn: false, profile: 'prod', user: null, configPath: '/x' },
+        );
+      }
+      if (url.endsWith('/api/integrations/vela/login') && init?.method === 'POST') {
+        return jsonResponse({ pid: 123 }, 202);
+      }
+      throw new Error(`unexpected fetch: ${url}`);
+    });
+    globalThis.fetch = fetchMock as typeof fetch;
+    renderOnboarding();
+
+    const signIn = await screen.findByRole('button', { name: /Sign in to continue/i });
+    vi.useFakeTimers();
+    fireEvent.click(signIn);
+    await act(async () => {});
+
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+    await vi.advanceTimersByTimeAsync(2000);
+    expect(screen.getByText('Signing in…')).toBeTruthy();
+
+    await vi.advanceTimersByTimeAsync(4000);
+    await vi.waitFor(() => {
+      expect(screen.getByRole('heading', { name: 'About you' })).toBeTruthy();
+    });
+  });
+
+  it('continues normally when Open Design AMR is signed in', async () => {
+    globalThis.fetch = vi.fn(async () =>
+      jsonResponse({
+        loggedIn: true,
+        profile: 'prod',
+        configPath: '/x',
+        user: { id: 'u', email: 'user@example.com' },
+      }),
+    ) as typeof fetch;
+    renderOnboarding();
+
+    expect(await screen.findByText('user@example.com')).toBeTruthy();
+    expect(screen.queryByText('Authorized')).toBeNull();
+    expect(screen.queryByRole('link', { name: /Authorize AMR/i })).toBeNull();
+
+    const continueButton = await screen.findByRole('button', { name: /^Continue$/i });
+    fireEvent.click(continueButton);
+
+    expect(screen.getByRole('heading', { name: 'About you' })).toBeTruthy();
+  });
+
+  it('lets Skip exit onboarding without starting AMR login', async () => {
+    const fetchMock = vi.fn(async (_input: RequestInfo | URL) =>
+      jsonResponse({ loggedIn: false, profile: 'prod', user: null, configPath: '/x' }),
+    );
+    globalThis.fetch = fetchMock as typeof fetch;
+    const props = renderOnboarding();
+
+    fireEvent.click(screen.getByRole('button', { name: /Skip/i }));
+
+    expect(props.onCompleteOnboarding).toHaveBeenCalledTimes(1);
+    expect(fetchMock.mock.calls.some(([url]) => String(url).endsWith('/api/integrations/vela/login'))).toBe(false);
+  });
+});
diff --git a/apps/web/tests/components/HomeView.prefill.test.tsx b/apps/web/tests/components/HomeView.prefill.test.tsx
index ab147c5ff..b3c1e7dcb 100644
--- a/apps/web/tests/components/HomeView.prefill.test.tsx
+++ b/apps/web/tests/components/HomeView.prefill.test.tsx
@@ -1049,6 +1049,71 @@ describe('HomeView prompt handoff', () => {
     expect(screen.queryByRole('dialog', { name: /replace current prompt/i })).toBeNull();
   });
 
+  it('lets selected chips seed the hero through preset cards', async () => {
+    const fetchMock = vi.fn<typeof fetch>(async (url) => {
+      if (typeof url === 'string' && url === '/api/plugins') {
+        return new Response(JSON.stringify({ plugins: [WEB_PROTOTYPE_PLUGIN, SIMPLE_DECK_PLUGIN] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (typeof url === 'string' && url.includes('/api/plugins/example-web-prototype/apply')) {
+        return new Response(JSON.stringify(WEB_PROTOTYPE_APPLY_RESULT), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (typeof url === 'string' && url.includes('/api/plugins/example-simple-deck/apply')) {
+        return new Response(JSON.stringify(SIMPLE_DECK_APPLY_RESULT), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`unexpected fetch ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+    stubAnimationFrame();
+
+    render(
+      <HomeView
+        projects={[]}
+        designSystems={[REFLY_DESIGN_SYSTEM]}
+        defaultDesignSystemId="ds-refly"
+        onSubmit={() => undefined}
+        onOpenProject={() => undefined}
+        onViewAllProjects={() => undefined}
+      />,
+    );
+
+    await clearActiveTypeChip();
+    fireEvent.click(await screen.findByTestId('home-hero-rail-deck'));
+    await waitFor(() => {
+      expect(screen.getByTestId('home-hero-active-type-chip').textContent).toContain('Slide deck');
+    });
+    expect(screen.getByTestId('home-hero-plugin-presets')).toBeTruthy();
+    expect(screen.getByTestId('home-hero-plugin-presets').textContent).toContain('Simple Deck');
+    fireEvent.click(screen.getAllByTestId('home-hero-plugin-preset')[0]!);
+    expect(fetchMock.mock.calls.some(([url]) => (
+      typeof url === 'string' && url.includes('/api/plugins/example-simple-deck/apply')
+    ))).toBe(false);
+    expect((screen.getByTestId('home-hero-input') as HTMLTextAreaElement).value).toBe(
+      'Create a pitch deck for decision makers about the user brief with 10-15 pages. Speaker notes: include speaker notes. Use the active project design system.',
+    );
+
+    await clearActiveTypeChip();
+    fireEvent.click(await screen.findByTestId('home-hero-rail-prototype'));
+    await waitFor(() => {
+      expect(screen.getByTestId('home-hero-plugin-presets')).toBeTruthy();
+    });
+    fireEvent.click(screen.getAllByTestId('home-hero-plugin-preset')[0]!);
+    expect(fetchMock.mock.calls.some(([url]) => (
+      typeof url === 'string' && url.includes('/api/plugins/example-web-prototype/apply')
+    ))).toBe(false);
+    expect((screen.getByTestId('home-hero-input') as HTMLTextAreaElement).value).toBe(
+      'Build a high-fidelity web prototype for product evaluators using the active project design system from the bundled web prototype seed.',
+    );
+  });
+
   it('appends a plugin-use query handoff without replacing an existing prompt', async () => {
     const fetchMock = vi.fn<typeof fetch>(async (url) => {
       if (typeof url === 'string' && url === '/api/plugins') {
diff --git a/apps/web/tests/components/InlineModelSwitcher.test.tsx b/apps/web/tests/components/InlineModelSwitcher.test.tsx
new file mode 100644
index 000000000..988365a76
--- /dev/null
+++ b/apps/web/tests/components/InlineModelSwitcher.test.tsx
@@ -0,0 +1,605 @@
+// @vitest-environment jsdom
+
+import { act, cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { InlineModelSwitcher } from '../../src/components/InlineModelSwitcher';
+import { AMR_LOGIN_TIMEOUT_MS } from '../../src/components/amrLoginPolling';
+import type { AgentInfo, AppConfig } from '../../src/types';
+
+const baseConfig: AppConfig = {
+  mode: 'daemon',
+  apiKey: '',
+  apiProtocol: 'anthropic',
+  apiVersion: '',
+  baseUrl: 'https://api.anthropic.com',
+  model: 'claude-sonnet-4-5',
+  apiProviderBaseUrl: 'https://api.anthropic.com',
+  apiProtocolConfigs: {},
+  agentId: 'amr',
+  skillId: null,
+  designSystemId: null,
+  onboardingCompleted: true,
+  mediaProviders: {},
+  agentModels: {},
+  agentCliEnv: {},
+};
+
+const amrAgent: AgentInfo = {
+  id: 'amr',
+  name: 'AMR (vela)',
+  bin: 'amr',
+  available: true,
+  version: '1.0.0',
+  models: [
+    { id: 'default', label: 'Default' },
+    { id: 'amr-cloud-latest', label: 'AMR Cloud Latest' },
+  ],
+};
+
+const codexAgent: AgentInfo = {
+  id: 'codex',
+  name: 'Codex CLI',
+  bin: 'codex',
+  available: true,
+  version: '0.133.0-alpha.1',
+  models: [{ id: 'default', label: 'Default' }],
+};
+
+function renderSwitcher(
+  config: Partial<AppConfig> = {},
+  agents: AgentInfo[] = [amrAgent],
+) {
+  const onAgentModelChange = vi.fn();
+  const view = render(
+    <InlineModelSwitcher
+      config={{ ...baseConfig, ...config }}
+      agents={agents}
+      daemonLive={true}
+      onModeChange={vi.fn()}
+      onAgentChange={vi.fn()}
+      onAgentModelChange={onAgentModelChange}
+      onApiProtocolChange={vi.fn()}
+      onApiModelChange={vi.fn()}
+      onOpenSettings={vi.fn()}
+    />,
+  );
+  return { ...view, onAgentModelChange };
+}
+
+describe('InlineModelSwitcher AMR row', () => {
+  afterEach(() => {
+    cleanup();
+    vi.unstubAllGlobals();
+    vi.useRealTimers();
+    try {
+      window.localStorage.clear();
+    } catch {
+      // jsdom normally exposes localStorage; keep cleanup tolerant.
+    }
+  });
+
+  it('shows the AMR reminder dot once when another CLI is selected', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    const view = renderSwitcher(
+      { agentId: 'codex' },
+      [amrAgent, codexAgent],
+    );
+
+    expect(screen.getByTestId('inline-model-switcher-amr-reminder')).toBeTruthy();
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    expect(screen.queryByTestId('inline-model-switcher-amr-reminder')).toBeNull();
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    expect(
+      within(popover).getByTestId('inline-model-switcher-agent-amr-reminder'),
+    ).toBeTruthy();
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    expect(
+      screen.queryByTestId('inline-model-switcher-agent-amr-reminder'),
+    ).toBeNull();
+
+    view.unmount();
+    renderSwitcher({ agentId: 'codex' }, [amrAgent, codexAgent]);
+    expect(screen.queryByTestId('inline-model-switcher-amr-reminder')).toBeNull();
+  });
+
+  it('does not show the AMR reminder dot when AMR is already selected', () => {
+    renderSwitcher({}, [amrAgent, codexAgent]);
+
+    expect(screen.queryByTestId('inline-model-switcher-amr-reminder')).toBeNull();
+  });
+
+  it('labels AMR without vela branding and keeps AMR models from AgentInfo.models', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+
+    expect(screen.getByTestId('inline-model-switcher-chip').textContent).toContain('AMR');
+    expect(screen.getByTestId('inline-model-switcher-chip').textContent).not.toContain(
+      'Open Design AMR',
+    );
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    const amrButton = await within(popover).findByRole('radio', {
+      name: /^AMR\s+Sign in$/i,
+    });
+    expect(within(amrButton).getByText(/Sign in/i)).toBeTruthy();
+    expect(amrButton.querySelector('.inline-switcher__agent-status-icon')).toBeNull();
+    expect(amrButton.querySelector('.inline-switcher__agent-action-label')).toBeTruthy();
+    expect(within(popover).queryByText(/AMR \(vela\)/i)).toBeNull();
+    expect(within(popover).queryByText(/vela/i)).toBeNull();
+    expect(within(popover).queryByText(/Not signed in/i)).toBeNull();
+    expect(within(popover).queryByRole('button', { name: 'Sign in' })).toBeNull();
+
+    const modelSelect = within(popover).getByTestId(
+      'inline-model-switcher-agent-model',
+    ) as HTMLSelectElement;
+    expect(Array.from(modelSelect.options).map((option) => option.value)).toEqual([
+      'default',
+      'amr-cloud-latest',
+    ]);
+  });
+
+  it('persists the live AMR fallback when the saved AMR model is stale', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () =>
+      new Response(
+        JSON.stringify({
+          loggedIn: true,
+          profile: 'default',
+          user: null,
+          configPath: '/Users/test/.vela/config.json',
+        }),
+        { status: 200, headers: { 'content-type': 'application/json' } },
+      ),
+    ));
+
+    const { onAgentModelChange } = renderSwitcher({
+      agentModels: { amr: { model: 'gpt-5.4-mini', reasoning: 'default' } },
+    });
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    const modelSelect = within(popover).getByTestId(
+      'inline-model-switcher-agent-model',
+    ) as HTMLSelectElement;
+    expect(modelSelect.value).toBe('default');
+    expect(Array.from(modelSelect.options).map((option) => option.value)).toEqual([
+      'default',
+      'amr-cloud-latest',
+    ]);
+    await waitFor(() => {
+      expect(onAgentModelChange).toHaveBeenCalledWith('amr', {
+        model: 'default',
+        reasoning: 'default',
+      });
+    });
+  });
+
+  it('shows icon-only signed-in status instead of account information in the AMR button', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: true,
+            profile: 'default',
+            user: {
+              id: 'user-1',
+              email: 'manual-amr@example.local',
+              name: 'Manual AMR Test User',
+            },
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    const amrButton = await within(popover).findByRole('radio', {
+      name: /^AMR\s+Signed in$/i,
+    });
+    expect(within(amrButton).getByText(/Signed in/i)).toBeTruthy();
+    expect(within(popover).queryByText(/manual-amr@example\.local/i)).toBeNull();
+    expect(within(popover).queryByRole('button', { name: 'Sign out' })).toBeNull();
+  });
+
+  it('treats env-backed AMR login as signed in even when no user profile is available', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: true,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    const amrButton = await within(popover).findByRole('radio', {
+      name: /^AMR\s+Signed in$/i,
+    });
+    expect(within(amrButton).getByText(/Signed in/i)).toBeTruthy();
+    expect(within(popover).queryByText(/@/i)).toBeNull();
+    expect(within(popover).queryByRole('button', { name: 'Sign out' })).toBeNull();
+  });
+
+  it('renders daemon-reported in-flight login attempts as cancelable', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            loginInFlight: true,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    const amrButton = await within(popover).findByRole('radio', {
+      name: /^AMR\s+Signing in/i,
+    });
+    expect(within(amrButton).getByText(/Signing in/i)).toBeTruthy();
+    expect(within(amrButton).getByText('Cancel sign-in')).toBeTruthy();
+  });
+
+  it('refreshes stale signed-in AMR status before starting login', async () => {
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        statusCalls += 1;
+        return new Response(
+          JSON.stringify(
+            statusCalls === 1
+              ? {
+                  loggedIn: true,
+                  loginInFlight: false,
+                  profile: 'default',
+                  user: { id: 'user-1', email: 'manual-amr@example.local' },
+                  configPath: '/Users/test/.amr/config.json',
+                }
+              : {
+                  loggedIn: false,
+                  loginInFlight: false,
+                  profile: 'default',
+                  user: null,
+                  configPath: '/Users/test/.amr/config.json',
+                },
+          ),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/login' && init?.method === 'POST') {
+        return new Response(JSON.stringify({ pid: 123 }), {
+          status: 202,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    const amrButton = await within(popover).findByRole('radio', {
+      name: /^AMR\s+Signed in$/i,
+    });
+    fireEvent.click(amrButton);
+
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login', { method: 'POST' });
+    expect(
+      within(popover).getByRole('radio', { name: /^AMR\s+Signing in/i }),
+    ).toBeTruthy();
+  });
+
+  it('cancels a timed-out AMR sign-in from the inline switcher', async () => {
+    let loginStarted = false;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            loginInFlight: loginStarted,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/login' && init?.method === 'POST') {
+        loginStarted = true;
+        return new Response(JSON.stringify({ pid: 123 }), {
+          status: 202,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/integrations/vela/login/cancel' && init?.method === 'POST') {
+        loginStarted = false;
+        return new Response(JSON.stringify({ canceled: true, pids: [123] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    const amrButton = await within(popover).findByRole('radio', {
+      name: /^AMR\s+Sign in$/i,
+    });
+    vi.useFakeTimers();
+    fireEvent.click(amrButton);
+
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login', { method: 'POST' });
+    expect(
+      within(popover).getByRole('radio', { name: /^AMR\s+Signing in/i }),
+    ).toBeTruthy();
+
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(AMR_LOGIN_TIMEOUT_MS);
+    });
+    expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login/cancel', { method: 'POST' });
+    expect(
+      within(popover).getByRole('radio', { name: /^AMR\s+AMR sign-in failed\./i }),
+    ).toBeTruthy();
+    expect(within(popover).getByText('Sign in')).toBeTruthy();
+    expect(popover.querySelector('.inline-switcher__agent-status-icon.is-error')).toBeNull();
+  });
+
+  it('turns the pending AMR row into a cancel action', async () => {
+    let loginStarted = false;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            loginInFlight: loginStarted,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/login' && init?.method === 'POST') {
+        loginStarted = true;
+        return new Response(JSON.stringify({ pid: 123 }), {
+          status: 202,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/integrations/vela/login/cancel' && init?.method === 'POST') {
+        loginStarted = false;
+        return new Response(JSON.stringify({ canceled: true, pids: [123] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    let amrButton = await within(popover).findByRole('radio', {
+      name: /^AMR\s+Sign in$/i,
+    });
+    vi.useFakeTimers();
+    fireEvent.click(amrButton);
+
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    amrButton = within(popover).getByRole('radio', {
+      name: /^AMR\s+Signing in/i,
+    });
+    expect(within(amrButton).getByText(/Signing in/i)).toBeTruthy();
+    expect(within(amrButton).getByText('Cancel sign-in')).toBeTruthy();
+
+    fireEvent.click(amrButton);
+
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login/cancel', { method: 'POST' });
+    expect(
+      within(popover).getByRole('radio', { name: /^AMR\s+Sign in$/i }),
+    ).toBeTruthy();
+  });
+
+  it('re-reads AMR status on reopen and converges from signed-in back to Sign in when later status is loggedOut', async () => {
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        statusCalls += 1;
+        return new Response(
+          JSON.stringify(
+            statusCalls === 1
+              ? {
+                  loggedIn: true,
+                  profile: 'default',
+                  user: { id: 'user-1', email: 'manual-amr@example.local' },
+                  configPath: '/Users/test/.amr/config.json',
+                }
+              : {
+                  loggedIn: false,
+                  profile: 'default',
+                  user: null,
+                  configPath: '/Users/test/.amr/config.json',
+                },
+          ),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSwitcher();
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    let popover = screen.getByTestId('inline-model-switcher-popover');
+    await within(popover).findByRole('radio', { name: /^AMR\s+Signed in$/i });
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    expect(screen.queryByTestId('inline-model-switcher-popover')).toBeNull();
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    popover = screen.getByTestId('inline-model-switcher-popover');
+    await within(popover).findByRole('radio', { name: /^AMR\s+Sign in$/i });
+    expect(within(popover).queryByRole('radio', { name: /^AMR\s+Signed in$/i })).toBeNull();
+  });
+
+  it('starts AMR re-login only after the user explicitly clicks the signed-out AMR row', async () => {
+    let loginCalls = 0;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/login' && init?.method === 'POST') {
+        loginCalls += 1;
+        return new Response(JSON.stringify({ pid: 4242 }), {
+          status: 202,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    const onAgentChange = vi.fn();
+    render(
+      <InlineModelSwitcher
+        config={baseConfig}
+        agents={[amrAgent]}
+        daemonLive={true}
+        onModeChange={vi.fn()}
+        onAgentChange={onAgentChange}
+        onAgentModelChange={vi.fn()}
+        onApiProtocolChange={vi.fn()}
+        onApiModelChange={vi.fn()}
+        onOpenSettings={vi.fn()}
+      />,
+    );
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    const popover = screen.getByTestId('inline-model-switcher-popover');
+    await within(popover).findByRole('radio', { name: /^AMR\s+Sign in$/i });
+    expect(loginCalls).toBe(0);
+
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    fireEvent.click(screen.getByTestId('inline-model-switcher-chip'));
+    const reopenedPopover = screen.getByTestId('inline-model-switcher-popover');
+    const reopenedAmrButton = await within(reopenedPopover).findByRole('radio', {
+      name: /^AMR\s+Sign in$/i,
+    });
+    expect(loginCalls).toBe(0);
+
+    fireEvent.click(reopenedAmrButton);
+    await waitFor(() => {
+      expect(loginCalls).toBe(1);
+      expect(onAgentChange).toHaveBeenCalledWith('amr');
+    });
+  });
+});
diff --git a/apps/web/tests/components/ProjectView.reattach-restore.test.tsx b/apps/web/tests/components/ProjectView.reattach-restore.test.tsx
index 5fcf68fd7..852fc6dda 100644
--- a/apps/web/tests/components/ProjectView.reattach-restore.test.tsx
+++ b/apps/web/tests/components/ProjectView.reattach-restore.test.tsx
@@ -363,6 +363,67 @@ describe('ProjectView daemon reattach restore', () => {
     });
   });
 
+  it('renders AMR recharge guidance when a reattached run reports insufficient balance', async () => {
+    const startedAt = Date.now();
+    listConversations.mockResolvedValue([{ id: 'conv-1', title: 'Conversation' }]);
+    listMessages.mockResolvedValue([
+      {
+        id: 'msg-amr-balance',
+        role: 'assistant',
+        content: '',
+        createdAt: startedAt,
+        startedAt,
+        runId: 'run-amr-balance',
+        runStatus: 'running',
+        preTurnFileNames: [],
+      } satisfies ChatMessage,
+    ]);
+    fetchPreviewComments.mockResolvedValue([]);
+    loadTabs.mockResolvedValue({ tabs: [], activeTabId: null });
+    fetchProjectFiles.mockResolvedValue([]);
+    fetchLiveArtifacts.mockResolvedValue([]);
+    fetchSkill.mockResolvedValue(null);
+    fetchDesignSystem.mockResolvedValue(null);
+    getTemplate.mockResolvedValue(null);
+    fetchChatRunStatus.mockResolvedValue({
+      id: 'run-amr-balance',
+      status: 'running',
+      createdAt: startedAt,
+      updatedAt: startedAt,
+      exitCode: null,
+      signal: null,
+    });
+    listActiveChatRuns.mockResolvedValue([]);
+
+    reattachDaemonRun.mockImplementation(async (options: any) => {
+      const error = new Error(
+        'AMR Cloud reported insufficient balance for this model. Recharge your AMR wallet at https://open-design.ai/amr/wallet, then retry this run.',
+      ) as Error & { code: string; details: unknown };
+      error.code = 'AMR_INSUFFICIENT_BALANCE';
+      error.details = {
+        kind: 'amr_account',
+        action: 'recharge',
+        actionUrl: 'https://open-design.ai/amr/wallet',
+      };
+      options.handlers.onError(error);
+    });
+
+    renderProjectView();
+
+    await waitFor(() => expect(reattachDaemonRun).toHaveBeenCalledTimes(1));
+    await waitFor(() => {
+      const finalSave = saveMessage.mock.calls
+        .map((call) => call[2] as ChatMessage)
+        .filter((m) => m?.id === 'msg-amr-balance' && m.runStatus === 'failed')
+        .at(-1);
+      expect(finalSave?.events?.some(
+        (event) => event.kind === 'status'
+          && event.label === 'error'
+          && (event as { code?: string }).code === 'AMR_INSUFFICIENT_BALANCE',
+      )).toBe(true);
+    });
+  });
+
   it('preserves canceled runStatus when onRunStatus records cancellation before onDone fires', async () => {
     const startedAt = Date.now();
     listConversations.mockResolvedValue([{ id: 'conv-1', title: 'Conversation' }]);
diff --git a/apps/web/tests/components/ProjectView.run-cleanup.test.tsx b/apps/web/tests/components/ProjectView.run-cleanup.test.tsx
index 7e4e5de88..b7ca7c27c 100644
--- a/apps/web/tests/components/ProjectView.run-cleanup.test.tsx
+++ b/apps/web/tests/components/ProjectView.run-cleanup.test.tsx
@@ -1075,6 +1075,75 @@ describe('ProjectView daemon cleanup', () => {
     expect(phantomSave).toBeUndefined();
   });
 
+  it('persists a daemon assistant row as failed after an AMR auth error returns post-run creation', async () => {
+    listConversations.mockResolvedValue([{ id: 'conv-1', title: 'Conversation' }]);
+    listMessages.mockResolvedValue([]);
+    fetchPreviewComments.mockResolvedValue([]);
+    loadTabs.mockResolvedValue({ tabs: [], activeTabId: null });
+    fetchProjectFiles.mockResolvedValue([]);
+    fetchLiveArtifacts.mockResolvedValue([]);
+    fetchSkill.mockResolvedValue(null);
+    fetchDesignSystem.mockResolvedValue(null);
+    getTemplate.mockResolvedValue(null);
+    listActiveChatRuns.mockResolvedValue([]);
+    streamViaDaemon.mockImplementation(async (options: {
+      onRunCreated?: (runId: string) => void;
+      handlers: { onError: (error: Error) => void };
+    }) => {
+      options.onRunCreated?.('run-auth-expired');
+      options.handlers.onError(
+        new Error('Your authentication token has expired. Please sign in again.'),
+      );
+    });
+
+    chatPaneSpy.mockClear();
+
+    render(
+      <ProjectView
+        project={{ id: 'project-auth-expired', name: 'Project', skillId: null, designSystemId: null } as never}
+        routeFileName={null}
+        config={{ mode: 'daemon', agentId: 'agent-1', notifications: undefined, agentModels: {} } as never}
+        agents={[{ id: 'agent-1', name: 'OpenCode', models: [] } as never]}
+        skills={[]}
+        designTemplates={[]}
+        designSystems={[]}
+        daemonLive
+        onModeChange={() => {}}
+        onAgentChange={() => {}}
+        onAgentModelChange={() => {}}
+        onRefreshAgents={() => {}}
+        onOpenSettings={() => {}}
+        onBack={() => {}}
+        onClearPendingPrompt={() => {}}
+        onTouchProject={() => {}}
+        onProjectChange={() => {}}
+        onProjectsRefresh={() => {}}
+      />,
+    );
+
+    const sendProps = await waitForReadyChatPaneProps();
+    await sendProps!.onSend!('retry auth', [], []);
+
+    await waitFor(() => expect(streamViaDaemon).toHaveBeenCalledTimes(1));
+    await waitFor(() => {
+      const failedAssistantSave = saveMessage.mock.calls.find(
+        (call) =>
+          call[0] === 'project-auth-expired' &&
+          call[1] === 'conv-1' &&
+          call[2]?.role === 'assistant' &&
+          call[2]?.runId === 'run-auth-expired' &&
+          call[2]?.runStatus === 'failed' &&
+          call[2]?.events?.some(
+            (event: { kind?: string; label?: string; detail?: string }) =>
+              event.kind === 'status' &&
+              event.label === 'error' &&
+              event.detail === 'Your authentication token has expired. Please sign in again.',
+          ),
+      );
+      expect(failedAssistantSave).toBeTruthy();
+    });
+  });
+
   it('relinks terminal replay to an existing artifact without writing a duplicate file', async () => {
     const runCreatedAt = Date.now();
     const existingArtifact = {
diff --git a/apps/web/tests/components/ProjectView.run-isolation.test.tsx b/apps/web/tests/components/ProjectView.run-isolation.test.tsx
index e9c8ac925..0039234d4 100644
--- a/apps/web/tests/components/ProjectView.run-isolation.test.tsx
+++ b/apps/web/tests/components/ProjectView.run-isolation.test.tsx
@@ -6,6 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { ProjectView } from '../../src/components/ProjectView';
 import type {
+  AgentInfo,
   AppConfig,
   ChatMessage,
   Conversation,
@@ -156,6 +157,7 @@ vi.mock('../../src/components/ChatPane', () => ({
     queuedItems,
     previewComments,
     attachedComments,
+    messages,
     onAttachComment,
     onSelectConversation,
     onSend,
@@ -170,6 +172,7 @@ vi.mock('../../src/components/ChatPane', () => ({
     queuedItems?: Array<{ id: string; prompt: string }>;
     previewComments?: PreviewComment[];
     attachedComments?: PreviewComment[];
+    messages?: ChatMessage[];
     error: string | null;
     onAttachComment?: (comment: PreviewComment) => void;
     onSelectConversation: (id: string) => void;
@@ -183,6 +186,21 @@ vi.mock('../../src/components/ChatPane', () => ({
         <output data-testid="active-conversation">{activeConversationId}</output>
         <output data-testid="streaming-state">{streaming ? 'streaming' : 'idle'}</output>
         <output data-testid="chat-error">{error}</output>
+        <output data-testid="assistant-events">
+          {(messages ?? [])
+            .filter((message) => message.role === 'assistant')
+            .flatMap((message) => message.events ?? [])
+            .map((event) => {
+              if (event.kind === 'text') return event.text;
+              if (event.kind === 'status') {
+                const code = (event as { code?: string }).code;
+                return `${code ? code + ' ' : ''}${event.detail ?? event.label}`;
+              }
+              return '';
+            })
+            .filter(Boolean)
+            .join('\n')}
+        </output>
         <output data-testid="attached-comment-count">{attached.length}</output>
         {queuedItems?.map((item, index) => (
           <button
@@ -446,6 +464,43 @@ describe('ProjectView conversation run isolation', () => {
     );
   });
 
+  it('submits the live AMR fallback model when the saved AMR model is stale', async () => {
+    conversationAMessages = [];
+    renderProjectView(
+      {
+        ...config,
+        agentId: 'amr',
+        agentModels: {
+          amr: { model: 'gpt-5.4-mini', reasoning: 'medium' },
+        },
+      },
+      project,
+      [
+        {
+          id: 'amr',
+          name: 'AMR',
+          bin: 'amr',
+          available: true,
+          models: [{ id: 'glm-5', label: 'GLM 5' }],
+        },
+      ],
+    );
+
+    await waitFor(() => expect(screen.getByTestId('active-conversation').textContent).toBe('conv-a'));
+    await waitFor(() => expect(screen.getByTestId('send-message')).toHaveProperty('disabled', false));
+
+    fireEvent.click(screen.getByTestId('send-message'));
+
+    await waitFor(() => expect(streamViaDaemon).toHaveBeenCalledTimes(1));
+    expect(streamViaDaemon).toHaveBeenCalledWith(
+      expect.objectContaining({
+        agentId: 'amr',
+        model: 'glm-5',
+        reasoning: 'medium',
+      }),
+    );
+  });
+
   it('does not create duplicate empty conversations while a fresh conversation is loading', async () => {
     renderProjectView();
 
@@ -747,15 +802,140 @@ describe('ProjectView conversation run isolation', () => {
     await waitFor(() => expect(streamMessage).toHaveBeenCalledTimes(1));
     await waitFor(() => expect(playSound).toHaveBeenCalledWith('success-sound'));
   });
+
+  it('converges a daemon chat back to idle when the first AMR run fails authentication', async () => {
+    conversationAMessages = [];
+    fetchChatRunStatus.mockResolvedValue(null);
+    streamViaDaemon.mockImplementation(
+      async (options: {
+        onRunCreated?: (runId: string) => void;
+        handlers: { onError: (error: Error) => void };
+      }) => {
+        options.onRunCreated?.('run-auth-expired');
+        options.handlers.onError(
+          new Error('Your authentication token has expired. Please sign in again.'),
+        );
+      },
+    );
+
+    renderProjectView();
+
+    await waitFor(() => expect(screen.getByTestId('active-conversation').textContent).toBe('conv-a'));
+    await waitFor(() => expect(screen.getByTestId('send-message')).toHaveProperty('disabled', false));
+
+    fireEvent.click(screen.getByTestId('send-message'));
+
+    await waitFor(() => expect(streamViaDaemon).toHaveBeenCalledTimes(1));
+    await waitFor(() =>
+      expect(screen.getByTestId('chat-error').textContent).toBe(
+        'Your authentication token has expired. Please sign in again.',
+      ),
+    );
+    await waitFor(() => expect(screen.getByTestId('streaming-state').textContent).toBe('idle'));
+    expect(screen.getByTestId('send-message')).toHaveProperty('disabled', false);
+
+    fireEvent.click(screen.getByTestId('send-message'));
+
+    await waitFor(() => expect(streamViaDaemon).toHaveBeenCalledTimes(2));
+  });
+
+  it('renders recharge guidance for structured AMR insufficient-balance errors', async () => {
+    conversationAMessages = [];
+    fetchChatRunStatus.mockResolvedValue(null);
+    streamViaDaemon.mockImplementation(
+      async (options: {
+        onRunCreated?: (runId: string) => void;
+        handlers: { onError: (error: Error) => void };
+      }) => {
+        options.onRunCreated?.('run-amr-balance');
+        const error = new Error(
+          'AMR Cloud reported insufficient balance for this model. Recharge your AMR wallet at https://open-design.ai/amr/wallet, then retry this run.',
+        ) as Error & { code: string; details: unknown };
+        error.code = 'AMR_INSUFFICIENT_BALANCE';
+        error.details = {
+          kind: 'amr_account',
+          action: 'recharge',
+          actionUrl: 'https://open-design.ai/amr/wallet',
+        };
+        options.handlers.onError(error);
+      },
+    );
+
+    renderProjectView();
+
+    await waitFor(() => expect(screen.getByTestId('active-conversation').textContent).toBe('conv-a'));
+    await waitFor(() => expect(screen.getByTestId('send-message')).toHaveProperty('disabled', false));
+
+    fireEvent.click(screen.getByTestId('send-message'));
+
+    await waitFor(() => expect(streamViaDaemon).toHaveBeenCalledTimes(1));
+    await waitFor(() =>
+      expect(screen.getByTestId('chat-error').textContent).toContain('insufficient balance'),
+    );
+    // The structured code rides on the error event; ChatPane keys the recharge
+    // affordance off it.
+    expect(screen.getByTestId('assistant-events').textContent).toContain(
+      'AMR_INSUFFICIENT_BALANCE',
+    );
+    expect(screen.getByTestId('streaming-state').textContent).toBe('idle');
+  });
+
+  it('renders re-login guidance for structured AMR auth-required errors', async () => {
+    conversationAMessages = [];
+    fetchChatRunStatus.mockResolvedValue(null);
+    streamViaDaemon.mockImplementation(
+      async (options: {
+        onRunCreated?: (runId: string) => void;
+        handlers: { onError: (error: Error) => void };
+      }) => {
+        options.onRunCreated?.('run-amr-auth');
+        const error = new Error(
+          'AMR sign-in is required. Sign in to AMR Cloud again, then retry this run.',
+        ) as Error & { code: string; details: unknown };
+        error.code = 'AMR_AUTH_REQUIRED';
+        error.details = {
+          kind: 'amr_account',
+          action: 'relogin',
+        };
+        options.handlers.onError(error);
+      },
+    );
+
+    renderProjectView();
+
+    await waitFor(() => expect(screen.getByTestId('active-conversation').textContent).toBe('conv-a'));
+    await waitFor(() => expect(screen.getByTestId('send-message')).toHaveProperty('disabled', false));
+
+    fireEvent.click(screen.getByTestId('send-message'));
+
+    await waitFor(() => expect(streamViaDaemon).toHaveBeenCalledTimes(1));
+    await waitFor(() =>
+      expect(screen.getByTestId('chat-error').textContent).toContain(
+        'AMR sign-in is required',
+      ),
+    );
+    // The structured code rides on the error event; ChatPane keys the
+    // authorize-and-retry affordance off it.
+    expect(screen.getByTestId('assistant-events').textContent).toContain(
+      'AMR_AUTH_REQUIRED',
+    );
+    expect(screen.getByTestId('streaming-state').textContent).toBe('idle');
+  });
 });
 
-function renderProjectView(renderConfig = config, renderProject: Project = project) {
+function renderProjectView(
+  renderConfig = config,
+  renderProject: Project = project,
+  renderAgents: AgentInfo[] = [
+    { id: 'agent-1', name: 'OpenCode', bin: 'opencode', available: true, models: [] },
+  ],
+) {
   return render(
     <ProjectView
       project={renderProject}
       routeFileName={null}
       config={renderConfig}
-      agents={[{ id: 'agent-1', name: 'OpenCode', bin: 'opencode', available: true, models: [] }]}
+      agents={renderAgents}
       skills={[]}
       designTemplates={[]}
       designSystems={[]}
diff --git a/apps/web/tests/components/SettingsDialog.execution.test.tsx b/apps/web/tests/components/SettingsDialog.execution.test.tsx
index 30f8431d1..d7568ef85 100644
--- a/apps/web/tests/components/SettingsDialog.execution.test.tsx
+++ b/apps/web/tests/components/SettingsDialog.execution.test.tsx
@@ -107,6 +107,15 @@ const availableAgents: AgentInfo[] = [
   },
 ];
 
+const amrAgent: AgentInfo = {
+  id: 'amr',
+  name: 'AMR (vela)',
+  bin: 'amr',
+  available: true,
+  version: '1.0.0',
+  models: [{ id: 'default', label: 'Default' }],
+};
+
 type OnRefreshAgents = (
   options?: AgentRefreshOptions,
 ) => void | AgentInfo[] | Promise<void | AgentInfo[]>;
@@ -1075,9 +1084,14 @@ describe('SettingsDialog execution settings Local CLI interactions', () => {
     expect(screen.getByText(en['settings.agentInstall.pathHint'])).toBeTruthy();
 
     fireEvent.click(codexCard);
-    const modelHead = screen.getByText(/Model for:/);
+    const selectedCard = codexCard.closest('.agent-card') as HTMLElement;
     expect(
-      modelHead.compareDocumentPosition(installGroupSummary) &
+      within(selectedCard).getByRole('combobox', {
+        name: en['settings.modelPicker'],
+      }),
+    ).toBeTruthy();
+    expect(
+      selectedCard.compareDocumentPosition(installGroupSummary) &
         Node.DOCUMENT_POSITION_FOLLOWING,
     ).toBeTruthy();
     await waitForPersist(
@@ -1110,7 +1124,7 @@ describe('SettingsDialog execution settings Local CLI interactions', () => {
     fireEvent.click(screen.getByRole('tab', { name: /Local CLI/i }));
     expect(screen.getByText('Live from CLI')).toBeTruthy();
     expect(
-      screen.getByText(/Models were refreshed from the installed CLI/i),
+      screen.getByText(/Model list comes from this CLI/i),
     ).toBeTruthy();
   });
 
@@ -1134,6 +1148,41 @@ describe('SettingsDialog execution settings Local CLI interactions', () => {
     ).toBeTruthy();
   });
 
+  it('uses the existing Settings card picker for AMR without exposing custom stale models', () => {
+    renderSettingsDialog(
+      {
+        mode: 'daemon',
+        agentId: 'amr',
+        agentModels: { amr: { model: 'gpt-5.4-mini', reasoning: 'default' } },
+      },
+      {
+        agents: [
+          {
+            ...amrAgent,
+            modelsSource: 'live',
+            models: [
+              { id: 'glm-5', label: 'GLM 5' },
+              { id: 'glm-5.1', label: 'GLM 5.1' },
+            ],
+          },
+        ],
+      },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI/i }));
+    fireEvent.click(screen.getByRole('button', { name: /^Open Design AMR\b/ }));
+
+    const modelPickers = screen.getAllByRole('combobox', {
+      name: en['settings.modelPicker'],
+    }) as HTMLSelectElement[];
+    expect(modelPickers).toHaveLength(1);
+    expect(modelPickers[0]?.value).toBe('glm-5');
+    expect(
+      Array.from(modelPickers[0]?.options ?? []).map((option) => option.value),
+    ).toEqual(['glm-5', 'glm-5.1']);
+    expect(screen.queryByLabelText(en['settings.modelCustomLabel'])).toBeNull();
+  });
+
   it('shows an empty state when no local CLI agents are detected', () => {
     renderSettingsDialog(
       { mode: 'daemon', agentId: null },
@@ -1314,36 +1363,16 @@ describe('SettingsDialog execution settings Local CLI interactions', () => {
     expect(screen.getByRole('tab', { name: /BYOK.*API provider/i }).getAttribute('aria-selected')).toBe('true');
   });
 
-  it('runs the Local CLI connection test for the selected installed agent', async () => {
-    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+  it('renders a Local CLI connection test for selected installed agents', () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
       const url = input.toString();
-      // MemoryModelInline mounts inside the Local CLI section and reads
-      // the current extraction override from /api/memory on mount.
-      // Swallow it here so the assertion below only counts the
-      // test-connection POST the user actually triggered.
       if (url === '/api/memory') {
         return new Response(
           JSON.stringify({ enabled: true, memories: [], extraction: null }),
           { status: 200, headers: { 'content-type': 'application/json' } },
         );
       }
-      expect(url).toBe('/api/test/connection');
-      expect(JSON.parse(String(init?.body))).toMatchObject({
-        mode: 'agent',
-        agentId: 'codex',
-        agentCliEnv: {},
-      });
-      return new Response(
-        JSON.stringify({
-          ok: true,
-          kind: 'ok',
-          latencyMs: 31,
-          agentName: 'Codex CLI',
-          model: 'default',
-          sample: 'ready',
-        }),
-        { status: 200, headers: { 'content-type': 'application/json' } },
-      );
+      throw new Error(`Unexpected fetch: ${url}`);
     });
     vi.stubGlobal('fetch', fetchMock);
 
@@ -1353,18 +1382,537 @@ describe('SettingsDialog execution settings Local CLI interactions', () => {
     );
 
     fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
-    fireEvent.click(screen.getByRole('button', { name: 'Test' }));
+
+    expect(screen.getByRole('button', { name: /Codex CLI/i })).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Test' })).toBeTruthy();
+  });
+
+  it('renders the AMR local agent without vela branding and with the Local CLI test action', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            profile: 'default',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+
+    expect(screen.getByRole('button', { name: /^Open Design AMR\b/ })).toBeTruthy();
+    expect(screen.queryByText('1.0.0')).toBeNull();
+    expect(screen.queryByText(/AMR \(vela\)/i)).toBeNull();
+    expect(screen.queryByText(/vela/i)).toBeNull();
+    expect(screen.queryByText(/Not signed in/i)).toBeNull();
+    expect(screen.getByText('Official')).toBeTruthy();
+    expect(screen.getByText('Lower cost')).toBeTruthy();
+    expect(screen.getByText('Many models')).toBeTruthy();
+    expect(screen.queryByText('Limited bonus: +100%')).toBeNull();
+    expect(await screen.findByRole('button', { name: 'Authorize' })).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Test' })).toBeNull();
+  });
+
+  it('only shows the AMR authorization action after selecting the AMR card', async () => {
+    globalThis.fetch = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({ loggedIn: false, profile: 'local', user: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    }) as typeof fetch;
+
+    const codexAgent = availableAgents.find((agent) => agent.id === 'codex');
+    expect(codexAgent).toBeTruthy();
+    if (!codexAgent) throw new Error('missing codex test agent');
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: codexAgent.id },
+      { agents: [amrAgent, codexAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*2 installed/i }));
+    expect(screen.getByRole('button', { name: /^Open Design AMR\b/ })).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Authorize' })).toBeNull();
+
+    fireEvent.click(screen.getByRole('button', { name: /^Open Design AMR\b/ }));
+
+    expect(await screen.findByRole('button', { name: 'Authorize' })).toBeTruthy();
+  });
+
+  it('reveals AMR cancel only while hovering the active card during sign-in', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            loginInFlight: true,
+            profile: 'local',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+    const amrCardButton = screen.getByRole('button', { name: /^Open Design AMR\b/ });
+    const amrCard = amrCardButton.closest('.agent-card') as HTMLElement;
+    expect(amrCard).toBeTruthy();
+    expect(await screen.findByText('Signing in…')).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Cancel' })).toBeNull();
+
+    fireEvent.mouseEnter(amrCard);
+    expect(await screen.findByRole('button', { name: 'Cancel' })).toBeTruthy();
+
+    fireEvent.mouseLeave(amrCard);
+    await waitFor(() => {
+      expect(screen.queryByRole('button', { name: 'Cancel' })).toBeNull();
+    });
+  });
+
+  it('cancels an in-flight AMR sign-in and returns to Authorize after a brief canceled state', async () => {
+    let statusStage: 'pending' | 'signed-out' = 'pending';
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify(
+            statusStage === 'pending'
+              ? {
+                  loggedIn: false,
+                  loginInFlight: true,
+                  profile: 'local',
+                  user: null,
+                  configPath: '/Users/test/.amr/config.json',
+                }
+              : {
+                  loggedIn: false,
+                  loginInFlight: false,
+                  profile: 'local',
+                  user: null,
+                  configPath: '/Users/test/.amr/config.json',
+                },
+          ),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/login/cancel' && init?.method === 'POST') {
+        statusStage = 'signed-out';
+        return new Response(JSON.stringify({ canceled: true }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+    const amrCard = screen.getByRole('button', { name: /^Open Design AMR\b/ }).closest('.agent-card') as HTMLElement;
+    expect(await screen.findByText('Signing in…')).toBeTruthy();
+
+    fireEvent.mouseEnter(amrCard);
+    fireEvent.click(await screen.findByRole('button', { name: 'Cancel' }));
+
+    expect(await screen.findByText('Canceled')).toBeTruthy();
+    expect(fetchMock).toHaveBeenCalledWith('/api/integrations/vela/login/cancel', { method: 'POST' });
 
     await waitFor(() => {
-      expect(screen.getByText('Testing connection…')).toBeTruthy();
+      expect(screen.getByRole('button', { name: 'Authorize' })).toBeTruthy();
+    }, { timeout: 3000 });
+    expect(screen.queryByText('Canceled')).toBeNull();
+  });
+
+  // Regression for the race called out on #3158 by both codex-connector and
+  // looper: the daemon's `cancelVelaLogin()` only SIGTERMs the vela child
+  // and keeps it in `activeLoginProcs` until it actually exits, so a
+  // `/api/integrations/vela/status` read right after a successful cancel
+  // can legally still report `loginInFlight: true`. If the AmrLoginPill
+  // listener self-refreshed on the local cancel path it would bounce back
+  // into `Signing in…` polling and surface the timeout/error path even
+  // though the user already canceled.
+  it('does not bounce back to Signing in… when daemon /status still reports loginInFlight after a local cancel (#3158)', async () => {
+    let cancelReceived = false;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        // Keep reporting in-flight even *after* the cancel API succeeds —
+        // this is the SIGTERM-to-exit window where the daemon hasn't reaped
+        // the vela child yet.
+        return new Response(
+          JSON.stringify({
+            loggedIn: false,
+            loginInFlight: true,
+            profile: 'local',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/login/cancel' && init?.method === 'POST') {
+        cancelReceived = true;
+        return new Response(JSON.stringify({ canceled: true }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
     });
-    await waitFor(() => {
-      expect(screen.getByText(/Codex CLI replied in 31 ms/)).toBeTruthy();
-    });
-    const testConnectionCalls = fetchMock.mock.calls.filter(
-      ([input]) => input.toString() === '/api/test/connection',
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
     );
-    expect(testConnectionCalls).toHaveLength(1);
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+    const amrCard = screen.getByRole('button', { name: /^Open Design AMR\b/ }).closest('.agent-card') as HTMLElement;
+    expect(await screen.findByText('Signing in…')).toBeTruthy();
+
+    fireEvent.mouseEnter(amrCard);
+    fireEvent.click(await screen.findByRole('button', { name: 'Cancel' }));
+
+    expect(await screen.findByText('Canceled')).toBeTruthy();
+    expect(cancelReceived).toBe(true);
+
+    // Give the listener event handler — plus any rogue polling tick — a
+    // generous window to misfire. Under the buggy code path the pill would
+    // call /status again, see loginInFlight:true, setPending('login'), and
+    // restart polling, flipping the UI back to 'Signing in…'.
+    await new Promise((resolve) => setTimeout(resolve, 400));
+    expect(screen.queryByText('Signing in…')).toBeNull();
+
+    // Eventually the Canceled UI window times out and Authorize re-appears.
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Authorize' })).toBeTruthy();
+    }, { timeout: 3000 });
+    // And still no bounce back to Signing in…
+    expect(screen.queryByText('Signing in…')).toBeNull();
+  });
+
+  it('reconciles late AMR browser completion to Signed in after local cancel', async () => {
+    let statusStage: 'pending' | 'signed-out' | 'signed-in' = 'pending';
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        const body =
+          statusStage === 'pending'
+            ? {
+                loggedIn: false,
+                loginInFlight: true,
+                profile: 'local',
+                user: null,
+                configPath: '/Users/test/.amr/config.json',
+              }
+            : statusStage === 'signed-in'
+              ? {
+                  loggedIn: true,
+                  loginInFlight: false,
+                  profile: 'local',
+                  user: { id: 'user-1', email: 'late@example.com' },
+                  configPath: '/Users/test/.amr/config.json',
+                }
+              : {
+                  loggedIn: false,
+                  loginInFlight: false,
+                  profile: 'local',
+                  user: null,
+                  configPath: '/Users/test/.amr/config.json',
+                };
+        return new Response(JSON.stringify(body), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/integrations/vela/login/cancel' && init?.method === 'POST') {
+        statusStage = 'signed-out';
+        return new Response(JSON.stringify({ canceled: true }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+    const amrCard = screen.getByRole('button', { name: /^Open Design AMR\b/ }).closest('.agent-card') as HTMLElement;
+    expect(await screen.findByText('Signing in…')).toBeTruthy();
+
+    fireEvent.mouseEnter(amrCard);
+    fireEvent.click(await screen.findByRole('button', { name: 'Cancel' }));
+    expect(await screen.findByText('Canceled')).toBeTruthy();
+
+    statusStage = 'signed-in';
+    window.dispatchEvent(
+      new CustomEvent('od:amr-login-status-change', {
+        detail: { reason: 'status-changed' },
+      }),
+    );
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Sign out' })).toBeTruthy();
+    });
+    expect(screen.getByText('late@example.com')).toBeTruthy();
+  });
+
+  it('renders the signed-in AMR account state inside Settings without leaking vela branding', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: true,
+            profile: 'local',
+            user: {
+              id: 'user-1',
+              email: 'signed-in@example.com',
+              name: 'Signed In User',
+            },
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+
+    expect(await screen.findByRole('button', { name: 'Sign out' })).toBeTruthy();
+    expect(screen.getByRole('button', { name: /^Open Design AMR\b/ })).toBeTruthy();
+    expect(screen.getByText('signed-in@example.com')).toBeTruthy();
+    expect(screen.queryByText(/AMR \(vela\)/i)).toBeNull();
+    expect(screen.queryByText(/^vela$/i)).toBeNull();
+  });
+
+  it('renders env-backed AMR login inside Settings without fabricating account details', async () => {
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        return new Response(
+          JSON.stringify({
+            loggedIn: true,
+            profile: 'local',
+            user: null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+
+    expect(await screen.findByRole('button', { name: 'Sign out' })).toBeTruthy();
+    expect(screen.getByRole('button', { name: /^Open Design AMR\b/ })).toBeTruthy();
+    expect(screen.queryByText(/@/i)).toBeNull();
+    expect(screen.queryByText(/AMR \(vela\)/i)).toBeNull();
+  });
+
+  it('does not keep a stale signed-in AMR state after a later Settings reopen reads loggedOut', async () => {
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        statusCalls += 1;
+        return new Response(
+          JSON.stringify(
+            statusCalls === 1
+              ? {
+                  loggedIn: true,
+                  profile: 'local',
+                  user: { id: 'user-1', email: 'signed-in@example.com' },
+                  configPath: '/Users/test/.amr/config.json',
+                }
+              : {
+                  loggedIn: false,
+                  profile: 'local',
+                  user: null,
+                  configPath: '/Users/test/.amr/config.json',
+                },
+          ),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    const first = renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+    expect(await screen.findByRole('button', { name: 'Sign out' })).toBeTruthy();
+    first.unmount();
+
+    const second = renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+    expect(await screen.findByRole('button', { name: 'Authorize' })).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Sign out' })).toBeNull();
+    second.unmount();
+  });
+
+  it('keeps AMR selected in Settings after local logout instead of silently switching agents', async () => {
+    let statusCalls = 0;
+    const fetchMock = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/memory') {
+        return new Response(
+          JSON.stringify({ enabled: true, memories: [], extraction: null }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/status') {
+        statusCalls += 1;
+        return new Response(
+          JSON.stringify({
+            loggedIn: statusCalls === 1,
+            profile: 'local',
+            user: statusCalls === 1 ? { id: 'user-1', email: 'signed-in@example.com' } : null,
+            configPath: '/Users/test/.amr/config.json',
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      if (url === '/api/integrations/vela/logout' && init?.method === 'POST') {
+        return new Response(JSON.stringify({ ok: true }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      throw new Error(`Unexpected fetch: ${url}`);
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    const { onPersist } = renderSettingsDialog(
+      { mode: 'daemon', agentId: 'amr' },
+      { agents: [amrAgent] },
+    );
+
+    fireEvent.click(screen.getByRole('tab', { name: /Local CLI.*1 installed/i }));
+    expect(await screen.findByRole('button', { name: 'Sign out' })).toBeTruthy();
+    expect(screen.getByRole('button', { name: /^Open Design AMR\b/ })).toBeTruthy();
+
+    fireEvent.click(screen.getByRole('button', { name: 'Sign out' }));
+
+    expect(await screen.findByRole('button', { name: 'Authorize' })).toBeTruthy();
+    expect(screen.getByRole('button', { name: /^Open Design AMR\b/ })).toBeTruthy();
+    expect(
+      onPersist.mock.calls.some(
+        ([nextConfig]) =>
+          typeof nextConfig === 'object' &&
+          nextConfig !== null &&
+          'agentId' in (nextConfig as Record<string, unknown>) &&
+          (nextConfig as Record<string, unknown>).agentId !== 'amr',
+      ),
+    ).toBe(false);
   });
 });
 
diff --git a/apps/web/tests/components/TasksView.page.test.tsx b/apps/web/tests/components/TasksView.page.test.tsx
new file mode 100644
index 000000000..b28256047
--- /dev/null
+++ b/apps/web/tests/components/TasksView.page.test.tsx
@@ -0,0 +1,589 @@
+// @vitest-environment jsdom
+
+import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import type { Routine } from '@open-design/contracts';
+
+import { TasksView } from '../../src/components/TasksView';
+import * as router from '../../src/router';
+
+const originalFetch = globalThis.fetch;
+const originalConfirm = window.confirm;
+
+function mockTasksViewFetch({ routines = [] }: { routines?: Routine[] } = {}) {
+  globalThis.fetch = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+    const url = input.toString();
+    if (url === '/api/routines' && (!init || init.method === undefined)) {
+      return new Response(JSON.stringify({ routines }), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      });
+    }
+    if (url === '/api/projects' && (!init || init.method === undefined)) {
+      return new Response(JSON.stringify({ projects: [] }), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      });
+    }
+    if (url === '/api/automation-templates' && (!init || init.method === undefined)) {
+      return new Response(JSON.stringify({ templates: [] }), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      });
+    }
+    if (url === '/api/automation-proposals?status=pending-review' && (!init || init.method === undefined)) {
+      return new Response(JSON.stringify({ proposals: [] }), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      });
+    }
+    if (url === '/api/automation-source-packets?limit=3' && (!init || init.method === undefined)) {
+      return new Response(JSON.stringify({ packets: [] }), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      });
+    }
+    return new Response(JSON.stringify({}), { status: 404 });
+  }) as typeof fetch;
+}
+
+describe('TasksView page shell', () => {
+  afterEach(() => {
+    cleanup();
+    globalThis.fetch = originalFetch;
+    window.confirm = originalConfirm;
+    vi.restoreAllMocks();
+  });
+
+  it('renders the automations page hero and summary metrics', async () => {
+    const routines: Routine[] = [
+      {
+        id: 'routine-active-1',
+        name: 'Daily digest',
+        prompt: 'Generate a digest.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+      {
+        id: 'routine-active-2',
+        name: 'Live artifact refresh',
+        prompt: 'Refresh the artifact.',
+        schedule: { kind: 'daily', time: '12:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+      {
+        id: 'routine-paused-1',
+        name: 'Weekly release notes',
+        prompt: 'Draft release notes.',
+        schedule: { kind: 'weekly', weekday: 1, time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: false,
+        nextRunAt: null,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+    mockTasksViewFetch({ routines });
+
+    render(<TasksView />);
+
+    expect(await screen.findByRole('heading', { name: 'Automations' })).toBeTruthy();
+    expect(
+      screen.getByText(
+        'Plan recurring conversations for project work, Orbit digests, and live artifacts.',
+      ),
+    ).toBeTruthy();
+    expect(screen.getByTestId('automations-new')).toBeTruthy();
+    expect(screen.getByLabelText('Your automations')).toBeTruthy();
+
+    const summary = screen.getByLabelText('Automation summary');
+    await waitFor(() => {
+      expect(summary.textContent ?? '').toContain('2');
+      expect(summary.textContent ?? '').toContain('Active');
+      expect(summary.textContent ?? '').toContain('1');
+      expect(summary.textContent ?? '').toContain('Paused');
+      expect(summary.textContent ?? '').toContain('8');
+      expect(summary.textContent ?? '').toContain('Templates');
+    });
+  });
+
+  it('shows the empty state and opens the create modal from it', async () => {
+    mockTasksViewFetch();
+
+    render(<TasksView />);
+
+    const emptyState = await screen.findByRole('button', { name: /No automations yet/i });
+    expect(within(emptyState).getByText('Create one from a template or start with a blank schedule.')).toBeTruthy();
+
+    fireEvent.click(emptyState);
+
+    await waitFor(() => {
+      expect(screen.getByLabelText('Automation title')).toBeTruthy();
+    });
+  });
+
+  it('opens the create modal from the hero action', async () => {
+    mockTasksViewFetch();
+
+    render(<TasksView />);
+
+    fireEvent.click(await screen.findByTestId('automations-new'));
+
+    await waitFor(() => {
+      expect(screen.getByLabelText('Automation title')).toBeTruthy();
+    });
+  });
+
+  it('shows the template empty state when switching to an empty category', async () => {
+    mockTasksViewFetch();
+
+    render(<TasksView />);
+
+    const tabs = await screen.findByRole('tablist', { name: 'Template filters' });
+    fireEvent.click(within(tabs).getByRole('tab', { name: /Skills/i }));
+
+    await waitFor(() => {
+      expect(screen.getByRole('status').textContent ?? '').toContain('No templates in this category yet.');
+    });
+
+    fireEvent.click(within(tabs).getByRole('tab', { name: /^All/i }));
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: /Daily connector digest/i })).toBeTruthy();
+    });
+  });
+
+  it('runs an automation and opens its project conversation when the daemon returns one', async () => {
+    const routines: Routine[] = [
+      {
+        id: 'routine-run-1',
+        name: 'Daily digest',
+        prompt: 'Generate a digest.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+    const navigateSpy = vi.spyOn(router, 'navigate').mockImplementation(() => {});
+    const runCalls: string[] = [];
+    globalThis.fetch = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/routines' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ routines }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/projects' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ projects: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-templates' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ templates: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-proposals?status=pending-review' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ proposals: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-source-packets?limit=3' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ packets: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/routines/routine-run-1/run' && init?.method === 'POST') {
+        runCalls.push(url);
+        return new Response(JSON.stringify({
+          projectId: 'proj-run',
+          conversationId: 'conv-run',
+          agentRunId: 'agent-run-1',
+        }), {
+          status: 202,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      return new Response(JSON.stringify({}), { status: 404 });
+    }) as typeof fetch;
+
+    render(<TasksView />);
+
+    const row = (await screen.findByText('Daily digest')).closest('li')!;
+    fireEvent.click(within(row).getByRole('button', { name: 'Run' }));
+
+    await waitFor(() => {
+      expect(navigateSpy).toHaveBeenCalledWith({
+        kind: 'project',
+        projectId: 'proj-run',
+        conversationId: 'conv-run',
+        fileName: null,
+      });
+    });
+    expect(runCalls).toEqual(['/api/routines/routine-run-1/run']);
+  });
+
+  it('pauses and resumes an automation through PATCH updates', async () => {
+    let routines: Routine[] = [
+      {
+        id: 'routine-pause-1',
+        name: 'Daily digest',
+        prompt: 'Generate a digest.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+    const patchBodies: unknown[] = [];
+    globalThis.fetch = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/routines' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ routines }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/projects' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ projects: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-templates' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ templates: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-proposals?status=pending-review' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ proposals: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-source-packets?limit=3' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ packets: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/routines/routine-pause-1' && init?.method === 'PATCH') {
+        const body = JSON.parse(String(init.body));
+        patchBodies.push(body);
+        routines = [{ ...routines[0]!, enabled: body.enabled, updatedAt: Date.now() }];
+        return new Response(JSON.stringify({ routine: routines[0] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      return new Response(JSON.stringify({}), { status: 404 });
+    }) as typeof fetch;
+
+    render(<TasksView />);
+
+    const row = (await screen.findByText('Daily digest')).closest('li')!;
+    fireEvent.click(within(row).getByRole('button', { name: 'Pause' }));
+
+    await waitFor(() => {
+      expect(within(row).getByRole('button', { name: 'Resume' })).toBeTruthy();
+    });
+
+    fireEvent.click(within(row).getByRole('button', { name: 'Resume' }));
+
+    await waitFor(() => {
+      expect(within(row).getByRole('button', { name: 'Pause' })).toBeTruthy();
+    });
+
+    expect(patchBodies).toEqual([{ enabled: false }, { enabled: true }]);
+  });
+
+  it('deletes an automation after confirmation and returns to the empty state', async () => {
+    let routines: Routine[] = [
+      {
+        id: 'routine-delete-1',
+        name: 'Daily digest',
+        prompt: 'Generate a digest.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+    const deletedUrls: string[] = [];
+    window.confirm = vi.fn(() => true);
+    globalThis.fetch = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/routines' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ routines }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/projects' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ projects: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-templates' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ templates: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-proposals?status=pending-review' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ proposals: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-source-packets?limit=3' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ packets: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/routines/routine-delete-1' && init?.method === 'DELETE') {
+        deletedUrls.push(url);
+        routines = [];
+        return new Response(null, { status: 204 });
+      }
+      return new Response(JSON.stringify({}), { status: 404 });
+    }) as typeof fetch;
+
+    render(<TasksView />);
+
+    const row = (await screen.findByText('Daily digest')).closest('li')!;
+    fireEvent.click(within(row).getByRole('button', { name: 'Delete automation' }));
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: /No automations yet/i })).toBeTruthy();
+    });
+
+    expect(deletedUrls).toEqual(['/api/routines/routine-delete-1']);
+  });
+
+  it('opens the last run result from the saved automation row', async () => {
+    const navigateSpy = vi.spyOn(router, 'navigate').mockImplementation(() => {});
+    const startedAt = new Date('2026-05-25T09:29:00.000Z').getTime();
+    const routines: Routine[] = [
+      {
+        id: 'routine-result-1',
+        name: 'Orbit digest',
+        prompt: 'Build the digest.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: {
+          runId: 'run-1',
+          status: 'failed',
+          trigger: 'scheduled',
+          startedAt,
+          completedAt: startedAt + 5_000,
+          projectId: 'proj-result',
+          conversationId: 'conv-result',
+          agentRunId: 'agent-run-1',
+        },
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+    mockTasksViewFetch({ routines });
+
+    render(<TasksView />);
+
+    const row = (await screen.findByText('Orbit digest')).closest('li')!;
+    fireEvent.click(within(row).getByRole('button', { name: 'Open result' }));
+
+    expect(navigateSpy).toHaveBeenCalledWith({
+      kind: 'project',
+      projectId: 'proj-result',
+      conversationId: 'conv-result',
+      fileName: null,
+    });
+  });
+
+  it('expands and collapses automation history from the row action', async () => {
+    const startedAt = new Date('2026-05-25T09:29:00.000Z').getTime();
+    const routines: Routine[] = [
+      {
+        id: 'routine-history-1',
+        name: 'Orbit digest',
+        prompt: 'Build the digest.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+    globalThis.fetch = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = input.toString();
+      if (url === '/api/routines' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ routines }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/projects' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ projects: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-templates' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ templates: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-proposals?status=pending-review' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ proposals: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/automation-source-packets?limit=3' && (!init || init.method === undefined)) {
+        return new Response(JSON.stringify({ packets: [] }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      if (url === '/api/routines/routine-history-1/runs?limit=10') {
+        return new Response(JSON.stringify({
+          runs: [
+            {
+              id: 'run-1',
+              routineId: 'routine-history-1',
+              trigger: 'manual',
+              status: 'succeeded',
+              projectId: 'proj-result',
+              conversationId: 'conv-result',
+              agentRunId: 'agent-run-1',
+              startedAt,
+              completedAt: startedAt + 45_000,
+              summary: 'Updated orbit digest',
+              error: null,
+              errorCode: null,
+            },
+          ],
+        }), {
+          status: 200,
+          headers: { 'content-type': 'application/json' },
+        });
+      }
+      return new Response(JSON.stringify({}), { status: 404 });
+    }) as typeof fetch;
+
+    render(<TasksView />);
+
+    const row = (await screen.findByText('Orbit digest')).closest('li')!;
+    fireEvent.click(within(row).getByRole('button', { name: 'History' }));
+
+    expect(await screen.findByLabelText('Automation run history')).toBeTruthy();
+    expect(within(row).getByRole('button', { name: 'Hide history' })).toBeTruthy();
+
+    fireEvent.click(within(row).getByRole('button', { name: 'Hide history' }));
+
+    await waitFor(() => {
+      expect(screen.queryByLabelText('Automation run history')).toBeNull();
+    });
+  });
+
+  it('opens the edit modal with the routine title prefilled', async () => {
+    const routines: Routine[] = [
+      {
+        id: 'routine-edit-1',
+        name: 'Orbit digest',
+        prompt: 'Build the digest.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        skillId: null,
+        agentId: null,
+        enabled: true,
+        nextRunAt: Date.now(),
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+    mockTasksViewFetch({ routines });
+
+    render(<TasksView />);
+
+    const row = (await screen.findByText('Orbit digest')).closest('li')!;
+    fireEvent.click(within(row).getByRole('button', { name: 'Edit' }));
+
+    await waitFor(() => {
+      expect((screen.getByLabelText('Automation title') as HTMLInputElement).value).toBe(
+        'Orbit digest',
+      );
+    });
+  });
+
+  it('updates the active template filter tab state when switching categories', async () => {
+    mockTasksViewFetch();
+
+    render(<TasksView />);
+
+    const tabs = await screen.findByRole('tablist', { name: 'Template filters' });
+    const allTab = within(tabs).getByRole('tab', { name: /^All/i });
+    const orbitTab = within(tabs).getByRole('tab', { name: /Orbit/i });
+
+    expect(allTab.getAttribute('aria-selected')).toBe('true');
+    expect(orbitTab.getAttribute('aria-selected')).toBe('false');
+
+    fireEvent.click(orbitTab);
+
+    await waitFor(() => {
+      expect(allTab.getAttribute('aria-selected')).toBe('false');
+      expect(orbitTab.getAttribute('aria-selected')).toBe('true');
+    });
+  });
+});
diff --git a/apps/web/tests/components/agentModelSelection.test.ts b/apps/web/tests/components/agentModelSelection.test.ts
new file mode 100644
index 000000000..0004b317e
--- /dev/null
+++ b/apps/web/tests/components/agentModelSelection.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest';
+import {
+  effectiveAgentModelChoice,
+  normalizeAgentModelChoice,
+} from '../../src/components/agentModelSelection';
+import type { AgentInfo } from '../../src/types';
+
+const amrAgent: AgentInfo = {
+  id: 'amr',
+  name: 'AMR',
+  bin: 'amr',
+  available: true,
+  version: '1.0.0',
+  models: [
+    { id: 'glm-5', label: 'GLM 5' },
+    { id: 'glm-5.1', label: 'GLM 5.1' },
+  ],
+};
+
+const codexAgent: AgentInfo = {
+  id: 'codex',
+  name: 'Codex',
+  bin: 'codex',
+  available: true,
+  version: '1.0.0',
+  models: [{ id: 'default', label: 'Default' }],
+};
+
+describe('agent model selection', () => {
+  it('normalizes stale saved AMR models to the first live model', () => {
+    expect(
+      normalizeAgentModelChoice(amrAgent, {
+        model: 'gpt-5.4-mini',
+        reasoning: 'medium',
+      }),
+    ).toEqual({
+      model: 'glm-5',
+      reasoning: 'medium',
+    });
+  });
+
+  it('submits the same normalized AMR model that the switcher displays', () => {
+    expect(
+      effectiveAgentModelChoice(amrAgent, {
+        model: 'gpt-5.4-mini',
+        reasoning: 'medium',
+      }),
+    ).toEqual({
+      model: 'glm-5',
+      reasoning: 'medium',
+    });
+  });
+
+  it('keeps non-AMR custom model choices unchanged', () => {
+    expect(
+      effectiveAgentModelChoice(codexAgent, {
+        model: 'custom-codex-model',
+        reasoning: 'high',
+      }),
+    ).toEqual({
+      model: 'custom-codex-model',
+      reasoning: 'high',
+    });
+  });
+});
diff --git a/apps/web/tests/providers/sse.test.ts b/apps/web/tests/providers/sse.test.ts
index ebf849dcc..23618585d 100644
--- a/apps/web/tests/providers/sse.test.ts
+++ b/apps/web/tests/providers/sse.test.ts
@@ -336,7 +336,12 @@ describe('streamViaDaemon', () => {
       handlers,
     });
 
-    expect(handlers.onError).toHaveBeenCalledWith(new Error('typed message'));
+    expect(handlers.onError).toHaveBeenCalledWith(
+      expect.objectContaining({
+        message: 'typed message',
+        code: 'AGENT_UNAVAILABLE',
+      }),
+    );
     expect(handlers.onDone).not.toHaveBeenCalled();
   });
 
@@ -374,6 +379,46 @@ describe('streamViaDaemon', () => {
     expect(handlers.onDone).not.toHaveBeenCalled();
   });
 
+  it('preserves structured AMR SSE error codes and action details', async () => {
+    const handlers = createDaemonHandlers();
+    vi.stubGlobal(
+      'fetch',
+      vi.fn()
+        .mockResolvedValueOnce(jsonResponse({ runId: 'run-1' }))
+        .mockResolvedValueOnce(
+          sseResponse(
+            [
+              'event: error',
+              'data: {"message":"AMR balance unavailable","error":{"code":"AMR_INSUFFICIENT_BALANCE","message":"AMR balance unavailable","details":{"kind":"amr_account","action":"recharge","actionUrl":"https://open-design.ai/amr/wallet"}}}',
+              '',
+              '',
+            ].join('\n'),
+          ),
+        ),
+    );
+
+    await streamViaDaemon({
+      agentId: 'amr',
+      history: [{ id: '1', role: 'user', content: 'hello' }],
+      systemPrompt: '',
+      signal: new AbortController().signal,
+      handlers,
+    });
+
+    expect(handlers.onError).toHaveBeenCalledWith(
+      expect.objectContaining({
+        message: 'AMR balance unavailable',
+        code: 'AMR_INSUFFICIENT_BALANCE',
+        details: {
+          kind: 'amr_account',
+          action: 'recharge',
+          actionUrl: 'https://open-design.ai/amr/wallet',
+        },
+      }),
+    );
+    expect(handlers.onDone).not.toHaveBeenCalled();
+  });
+
   it('treats an explicit succeeded status with a SIGTERM exit as a successful run', async () => {
     // ACP agents that don't shut down on stdin.end() (e.g. Devin for Terminal)
     // are SIGTERM'd by the daemon after a clean prompt completion. The end
@@ -447,6 +492,45 @@ describe('streamViaDaemon', () => {
     expect(handlers.onDone).not.toHaveBeenCalled();
   });
 
+  it('suppresses AMR exit code 130 lifecycle noise from the chat error surface', async () => {
+    const handlers = createDaemonHandlers();
+    const onRunStatus = vi.fn();
+    vi.stubGlobal(
+      'fetch',
+      vi.fn()
+        .mockResolvedValueOnce(jsonResponse({ runId: 'run-1' }))
+        .mockResolvedValueOnce(
+          sseResponse(
+            [
+              'event: stderr',
+              'data: {"chunk":"Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.\\n"}',
+              '',
+              'event: stderr',
+              'data: {"chunk":"opencode server listening on http://127.0.0.1:1234\\n"}',
+              '',
+              'event: end',
+              'data: {"code":130,"status":"failed"}',
+              '',
+              '',
+            ].join('\n'),
+          ),
+        ),
+    );
+
+    await streamViaDaemon({
+      agentId: 'amr',
+      history: [{ id: '1', role: 'user', content: 'hello' }],
+      systemPrompt: '',
+      signal: new AbortController().signal,
+      handlers,
+      onRunStatus,
+    });
+
+    expect(onRunStatus).toHaveBeenCalledWith('failed');
+    expect(handlers.onError).not.toHaveBeenCalled();
+    expect(handlers.onDone).toHaveBeenCalledWith('');
+  });
+
   it('still surfaces an error when the end event has a signal but no status field', async () => {
     // Same regression as above for the signal arm of the safety net. Without
     // explicit `status: 'succeeded'` from the server, a SIGTERM-style signal
diff --git a/apps/web/tests/runtime/amr-guidance.test.ts b/apps/web/tests/runtime/amr-guidance.test.ts
new file mode 100644
index 000000000..1e837902b
--- /dev/null
+++ b/apps/web/tests/runtime/amr-guidance.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from 'vitest';
+import { resolveRunFailureUi } from '../../src/runtime/amr-guidance';
+
+describe('resolveRunFailureUi', () => {
+  it('promotes AMR (switch card) for non-AMR model/auth/quota errors', () => {
+    for (const code of [
+      'AGENT_AUTH_REQUIRED',
+      'UNAUTHORIZED',
+      'RATE_LIMITED',
+      'UPSTREAM_UNAVAILABLE',
+    ]) {
+      const ui = resolveRunFailureUi(code, 'claude');
+      expect(ui.showSwitchCard).toBe(true);
+      expect(ui.primaryAction).toBe('retry');
+      expect(ui.messageKey).toBeNull();
+    }
+    expect(resolveRunFailureUi('UNAUTHORIZED', null).showSwitchCard).toBe(true);
+  });
+
+  it('shows plain retry (no card) for generic non-AMR failures', () => {
+    const ui = resolveRunFailureUi('AGENT_EXECUTION_FAILED', 'claude');
+    expect(ui).toMatchObject({ primaryAction: 'retry', showSwitchCard: false, messageKey: null });
+    expect(resolveRunFailureUi('AGENT_UNAVAILABLE', 'codex').showSwitchCard).toBe(false);
+  });
+
+  it('offers authorize-and-retry for an unauthorized AMR run (no card)', () => {
+    const ui = resolveRunFailureUi('AMR_AUTH_REQUIRED', 'amr');
+    expect(ui).toMatchObject({
+      primaryAction: 'authorize',
+      messageKey: 'chat.amrError.authMessage',
+      secondaryRetry: false,
+      showSwitchCard: false,
+    });
+  });
+
+  it('offers recharge + manual retry for an out-of-balance AMR run', () => {
+    const ui = resolveRunFailureUi('AMR_INSUFFICIENT_BALANCE', 'amr');
+    expect(ui).toMatchObject({
+      primaryAction: 'recharge',
+      messageKey: 'chat.amrError.balanceMessage',
+      secondaryRetry: true,
+      showSwitchCard: false,
+    });
+  });
+
+  it('falls back to plain retry for other AMR failures', () => {
+    const ui = resolveRunFailureUi('AGENT_EXECUTION_FAILED', 'amr');
+    expect(ui).toMatchObject({ primaryAction: 'retry', showSwitchCard: false });
+  });
+});
diff --git a/docs/plans/amr-vela-cli-ci-integration.md b/docs/plans/amr-vela-cli-ci-integration.md
new file mode 100644
index 000000000..c5ee205e9
--- /dev/null
+++ b/docs/plans/amr-vela-cli-ci-integration.md
@@ -0,0 +1,126 @@
+# AMR Vela CLI CI Integration Review Summary
+
+## Summary
+
+This PR wires Open Design's beta mac arm64 packaging path to Vela's npm-owned CLI distribution contract.
+
+The goal is to make packaged AMR builds use a lockfile-backed Vela CLI package instead of requiring CI to download, build, or manually locate a Vela binary. The rollout is intentionally narrow: beta mac arm64 release builds require Vela, while mac Intel, Windows, Linux, preview, and stable builds remain non-strict and continue to skip Vela bundling when unsupported.
+
+## Design Contract
+
+Open Design depends only on the Vela meta package:
+
+```json
+"@powerformer/vela-cli": "0.0.1-test"
+```
+
+Open Design does not depend directly on platform packages such as `@powerformer/vela-cli-darwin-arm64`. Vela owns that platform matrix through optional dependencies and its resolver API.
+
+The Vela CLI binary resolution order is:
+
+1. `OPEN_DESIGN_VELA_CLI_BIN`
+2. Dynamic import of `@powerformer/vela-cli`
+3. `resolveVelaCliBin({ strict })`
+
+This preserves a developer/emergency override while making npm the normal CI contract.
+
+The CI/package timing is:
+
+1. Vela publishes `@powerformer/vela-cli` to npm before Open Design packaging starts.
+2. Open Design pins that package in `tools/pack/package.json` and `pnpm-lock.yaml`.
+3. CI runs `pnpm install --frozen-lockfile`, which installs the pinned meta package and its supported optional native binary package.
+4. `tools-pack` enters the `resource-tree` phase and resolves/copies the Vela binary into the Open Design resource tree.
+5. `electron-builder` embeds that resource tree through `extraResources`.
+6. The packaged daemon receives `OD_RESOURCE_ROOT` at launch and resolves AMR to `OD_RESOURCE_ROOT/bin/vela` unless `VELA_BIN` explicitly overrides it.
+
+## Implemented Behavior
+
+`tools-pack` now supports `--require-vela-cli`. When this flag is absent, missing Vela packages, unsupported platforms, missing resolvers, or null resolver results are treated as "skip Vela bundling." When this flag is present, packaging fails with an actionable error that mentions both remediation paths: install/use `@powerformer/vela-cli` or set `OPEN_DESIGN_VELA_CLI_BIN`.
+
+Vela resource copying now lives in `tools/pack/src/vela-cli.ts`, so the generic resource-tree helper only owns static Open Design resources. The Vela helper resolves the binary through the shared resolver path and copies it into:
+
+```text
+resources/open-design/bin/vela
+```
+
+The copied file is marked executable on POSIX platforms.
+
+The beta release workflow passes `--require-vela-cli` only in the mac arm64 release build path. Other release-beta jobs remain non-strict.
+
+Windows resource cache keys include the optional Vela binary when present, preserving cache correctness without making Windows strict in this rollout.
+
+## Vela Package Status
+
+The current verification npm packages have been published:
+
+- `@powerformer/vela-cli@0.0.1-test`
+- `@powerformer/vela-cli-darwin-arm64@0.0.1-test`
+
+Open Design should install only `@powerformer/vela-cli`. The meta package pulls the macOS arm64 binary package as an optional dependency on supported machines.
+
+Local verification outside the Vela monorepo:
+
+```bash
+npm install @powerformer/vela-cli@0.0.1-test
+npx vela --version
+```
+
+Expected output:
+
+```text
+0.0.1-test
+```
+
+## Validation
+
+Focused `tools-pack` tests cover:
+
+- `--require-vela-cli` config parsing;
+- env-provided Vela binary copying and executable permissions;
+- npm-resolved Vela binary copying and executable permissions;
+- env override priority over npm resolver output;
+- strict missing-package and missing-binary failures;
+- non-strict unsupported-platform skip behavior;
+- release-beta workflow placement of `--require-vela-cli`.
+
+Local validation for the Vela module extraction and `0.0.1-test` bump passed under Node `v24.0.0` and pnpm `10.33.2`:
+
+```bash
+pnpm --filter @open-design/tools-pack typecheck
+pnpm --dir tools/pack exec vitest run tests/resources.test.ts tests/release-workflows.test.ts tests/config.test.ts tests/win-resources.test.ts
+pnpm guard
+pnpm typecheck
+```
+
+The focused tools-pack test run passed 27 tests across 4 files.
+
+A previous local non-publishing beta mac arm64 dry run also succeeded with `--require-vela-cli`, producing a DMG and bundling a Vela binary at:
+
+```text
+.tmp/release-beta-dry-run/out/mac/namespaces/release-beta/resources/open-design/bin/vela
+```
+
+The bundled binary was verified as executable and `Mach-O 64-bit executable arm64`.
+
+## Review Focus
+
+Reviewers should focus on these boundaries:
+
+- Open Design depends only on `@powerformer/vela-cli`.
+- `OPEN_DESIGN_VELA_CLI_BIN` remains highest priority.
+- Strict mode is opt-in and used only by beta mac arm64 CI.
+- Non-strict platforms must not fail when Vela is unsupported or unavailable.
+- Strict-mode errors include both remediation paths.
+- Workflow tests prevent accidental strict-mode rollout to other platforms.
+
+## Known Limits
+
+The local dry run did not exercise Apple signing, notarization, R2 upload, GitHub artifact upload, or release metadata publishing because those require CI secrets and hosted runner context.
+
+The first local dry run using `/tmp` exposed an existing path-shape issue caused by macOS resolving `/tmp` through `/private/tmp` in prebundle entrypoints. The successful dry run used the repository `.tmp` path, which better matches normal project-local tools-pack usage.
+
+## Follow-Ups
+
+After Vela publishes the first stable package version, update `tools/pack/package.json` and `pnpm-lock.yaml` from `0.0.1-test` to the stable version.
+
+When Vela supports additional platforms, selectively enable `--require-vela-cli` for those release jobs and add matching workflow smoke coverage.
diff --git a/docs/testing/amr-auth-sync-rules.zh-CN.md b/docs/testing/amr-auth-sync-rules.zh-CN.md
new file mode 100644
index 000000000..56eef4380
--- /dev/null
+++ b/docs/testing/amr-auth-sync-rules.zh-CN.md
@@ -0,0 +1,130 @@
+# AMR 登录同步规则
+
+## 目的
+
+本文档用于对齐 `Open Design` 与 `Vela 网页钱包` 在以下场景中的状态预期：
+
+- 登录
+- 登出
+- 网页端切换账号
+- 状态收敛
+
+目标不是追求“强实时双向同步”，而是保证：
+
+- 用户感知稳定
+- 不静默串号
+- 不静默恢复错误账号
+- 后续状态能正确收敛
+
+## 两层状态
+
+AMR 当前有两层相互独立、但会互相影响的状态：
+
+1. `Open Design 客户端本地登录态`
+
+- 以本地 `~/.vela/config.json` 和当前 AMR profile 的有效登录信息为准
+- 这是 Open Design 判断“当前能不能用 AMR”的主依据
+
+2. `Vela 网页钱包登录态`
+
+- 以浏览器中的网页 session / cookie 为准
+- 这是钱包页判断“当前能不能看余额、充值、退出登录”的主依据
+
+这两层状态**允许短暂不一致**，但后续必须正确收敛。
+
+## 核心规则
+
+### 1. Open Design 内点击 `Sign in`
+
+- Open Design 调用本地登录流程
+- Vela CLI 拉起网页登录/授权
+- 用户在网页完成授权后，Open Design 通过状态轮询收敛成已登录
+
+预期：
+
+- Open Design 不直接假设网页已成功登录
+- 只有本地状态真正可用后，才显示为已登录
+
+### 2. Open Design 内点击 `Sign out`
+
+- 优先清理 **Open Design 本地 AMR 登录态**
+- Open Design 立即显示为未登录
+- 不要求浏览器中的 Vela 网页钱包会话同步退出
+
+预期：
+
+- 本地登出应立即生效
+- 即使网页还保持登录，Open Design 也不能自动恢复成已登录
+
+### 3. Vela 网页端点击“退出登录”
+
+- 优先清理 **网页钱包会话**
+- 不要求 Open Design 必须实时收到退出事件
+
+预期：
+
+- Open Design 可以短暂仍显示旧状态
+- 但在后续刷新状态、打开 Settings、发起 AMR 请求时，必须收敛成“需要重新登录”或明确权限错误
+
+### 4. 网页端手动切换账号
+
+- 如果用户在钱包页从账号 A 切到账号 B
+- Open Design 默认仍保持本地账号 A
+
+预期：
+
+- **网页切账号，不应自动切客户端账号**
+- 只有用户在 Open Design 内再次显式 `Sign in` 并完成网页登录后，客户端才正式切到账号 B
+
+### 5. 状态收敛优先于强实时同步
+
+推荐采用：
+
+- “本地状态先准”
+- “网页状态独立变化”
+- “在关键节点重新校验并收敛”
+
+关键节点包括：
+
+- 打开 Settings
+- 打开 onboarding
+- 打开钱包入口
+- 发起一次 AMR chat run
+- 用户主动刷新状态
+
+## 不允许发生的行为
+
+- 网页端切账号后，Open Design 静默切到新账号
+- Open Design 本地已登出，但因为网页还登录着而自动恢复已登录
+- 钱包页已退出登录，但 Open Design 长期假装仍可正常使用 AMR
+- A 账号网页状态污染到 B 账号客户端身份、余额文案或聊天身份
+
+## 推荐实现策略
+
+### 基础版
+
+- Open Design 的 `Sign out` 只清本地状态
+- 网页端退出登录后，Open Design 在后续关键动作中重新校验并收敛
+
+### 增强版
+
+- 钱包页退出登录或切账号时，尝试通过 bridge / callback / postMessage 通知 Open Design
+- Open Design 收到事件后主动刷新 AMR 状态
+- 即使事件丢失，仍由“后续关键动作重新校验”兜底
+
+## 测试重点
+
+最关键的验证点有 6 个：
+
+1. Open Design 本地 `Sign out` 后立即变未登录
+2. 网页端退出登录后，Open Design 后续能正确收敛
+3. 网页端切账号后，Open Design 默认保持旧账号
+4. 只有显式重新登录后，Open Design 才切到新账号
+5. 弱网、多 tab、旧网页会话残留时不串号
+6. 余额、钱包入口、聊天身份不会跨账号污染
+
+## 对应测试文档
+
+完整功能回归用例见：
+
+- [amr-functional-test-cases.zh-CN.md](/Users/mac/open-design/open-design-amr-runtime-acp/docs/testing/amr-functional-test-cases.zh-CN.md)
diff --git a/docs/testing/amr-functional-test-cases.md b/docs/testing/amr-functional-test-cases.md
new file mode 100644
index 000000000..aef8b5e62
--- /dev/null
+++ b/docs/testing/amr-functional-test-cases.md
@@ -0,0 +1,154 @@
+# AMR Functional Test Cases
+
+## Summary
+
+This document covers manual functional verification for the AMR (vela) runtime on the `feat/amr-runtime-acp` branch.
+
+It is written against the current implementation shape:
+
+- AMR is exposed as a daemon agent with `agentId = amr`
+- AMR availability depends on resolving a runnable `vela` binary
+- AMR sign-in state is derived from `~/.vela/config.json`
+- AMR onboarding, settings, inline switcher, and chat-run behavior are all gated by daemon-reported runtime and login status
+
+Use this as a manual regression checklist in local dev, QA, or pre-release validation.
+
+## Test Environments
+
+### Env A: Fake Vela (recommended for routine UI verification)
+
+Use this when verifying entry visibility, login UI, onboarding flow, and basic AMR selection without requiring a real AMR backend.
+
+Expected setup:
+
+- `agentCliEnv.amr.VELA_BIN` points to `apps/daemon/tests/fixtures/fake-vela.mjs`
+- `/api/agents` returns `amr.available = true`
+- `/api/integrations/vela/status` can be driven to signed-in / signed-out states through the fake login route
+
+### Env B: Real Vela (recommended for release validation)
+
+Use this when verifying real `vela` installation, actual AMR account login, and real chat-run behavior.
+
+Expected setup:
+
+- `vela` is installed on PATH or `VELA_BIN` is configured
+- `vela login` succeeds for the active AMR profile
+- `~/.vela/config.json` contains the expected profile entry with a `runtimeKey`
+
+## Coverage Areas
+
+- Runtime availability and discovery
+- AMR sign-in / sign-out state
+- Onboarding entry behavior
+- Settings / execution panel behavior
+- Inline switcher behavior
+- Chat-run behavior
+- Profile handling (`prod`, `test`, `local`)
+- Failure and recovery flows
+
+## Manual Test Cases
+
+| ID | Area | Preconditions | Steps | Expected Result |
+| --- | --- | --- | --- | --- |
+| AMR-001 | Runtime discovery | No `vela` on PATH and no `VELA_BIN` configured | Open app, fetch `/api/agents`, inspect execution UI | `amr` exists in agent list but `available=false`; AMR is not presented as an active selectable runtime entry |
+| AMR-002 | Runtime discovery | `VELA_BIN` points to a runnable fake or real `vela` | Open app, fetch `/api/agents` | `amr.available=true`; AMR model list is present; agent path resolves to configured binary |
+| AMR-003 | Runtime discovery | `VELA_BIN` points to a missing file | Restart daemon or refresh agents | `amr.available=false`; app does not crash; runtime is safely hidden/degraded |
+| AMR-004 | Login status | No AMR profile in `~/.vela/config.json` | Call `/api/integrations/vela/status` | Returns `loggedIn=false`, correct `profile`, `user=null` |
+| AMR-005 | Login status | Profile exists but lacks `runtimeKey` | Call `/api/integrations/vela/status` | Returns `loggedIn=false`; missing `runtimeKey` does not count as signed in |
+| AMR-006 | Login status | Valid AMR profile exists with `runtimeKey` | Call `/api/integrations/vela/status` | Returns `loggedIn=true`; user info is projected; secrets are not exposed |
+| AMR-007 | Login action | AMR available, signed out | Trigger AMR login from Settings or onboarding | Backend returns accepted login response; UI enters signing-in state |
+| AMR-008 | Login completion | Fake or real login succeeds | Wait for polling to complete | UI flips from `Signing in…` to signed-in state without manual refresh |
+| AMR-009 | Login error | Force `vela login` immediate failure | Trigger login | UI exits signing-in state and shows AMR-labeled error feedback |
+| AMR-010 | Login concurrency | One AMR login already in flight | Trigger login twice quickly | Only one login request is effectively active; duplicate login is blocked or safely ignored |
+| AMR-011 | Logout | Signed-in AMR profile exists | Trigger sign-out | Current AMR profile is removed; next status read returns `loggedIn=false`; other profiles remain untouched |
+| AMR-012 | Settings visibility | AMR available, onboarding already completed | Open Settings → Execution | AMR appears as a selectable runtime/agent path in execution UI |
+| AMR-013 | Settings visibility | AMR unavailable | Open Settings → Execution | AMR is not promoted as usable; no broken entry point or unusable CTA is shown |
+| AMR-014 | Login pill signed-out | AMR available, signed out | Open Settings | AMR login pill shows signed-out state and Sign in action |
+| AMR-015 | Login pill signed-in | AMR available, signed in | Open Settings | AMR login pill shows signed-in state, user email, and Sign out action |
+| AMR-016 | Login pill profile badge | Active AMR profile is `test` | Open Settings | `TEST` badge is visible |
+| AMR-017 | Login pill profile badge | Active AMR profile is `local` | Open Settings | `LOCAL` badge is visible |
+| AMR-018 | Login pill profile badge | Active AMR profile is `prod` | Open Settings | No debug-style profile badge is shown |
+| AMR-019 | Login pill event isolation | AMR card is rendered inside settings agent card | Click Sign in / Sign out | Login pill action does not accidentally trigger parent card selection click handler |
+| AMR-020 | Login recovery | AMR login polling sees transient `/status` failure | Trigger login and simulate one failed status fetch | UI remains recoverable and flips to signed-in when later polling succeeds |
+| AMR-021 | Onboarding default recommendation | AMR available | Open onboarding on a fresh config | AMR Cloud is the featured default runtime choice |
+| AMR-022 | Onboarding signed-out flow | AMR available, signed out | Open onboarding and keep AMR Cloud selected | User sees sign-in requirement to continue |
+| AMR-023 | Onboarding signed-in flow | AMR available, signed in | Open onboarding and continue | User can continue through onboarding without AMR login blocker |
+| AMR-024 | Onboarding login completion | AMR available, signed out | Start login from onboarding and wait for polling | Onboarding advances after login completion |
+| AMR-025 | Onboarding skip | AMR available, signed out | Click Skip | Onboarding exits cleanly without forcing AMR login |
+| AMR-026 | Onboarding fallback | AMR unavailable | Open onboarding | AMR Cloud is not selected as a usable path; Local CLI remains usable and non-broken |
+| AMR-027 | Local CLI segregation | AMR available | In onboarding, switch to Local coding agent view | AMR does not appear inside the Local CLI agent list |
+| AMR-028 | Inline switcher visibility | AMR available | Open inline model switcher | AMR appears as a runtime row labeled `AMR`, not `AMR (vela)` |
+| AMR-029 | Inline switcher signed-out state | AMR available, signed out | Open inline model switcher | Row shows compact sign-in status without leaking full account metadata |
+| AMR-030 | Inline switcher signed-in state | AMR available, signed in | Open inline model switcher | Row shows compact signed-in status icon/label; no stale signed-out copy remains |
+| AMR-031 | Inline switcher model list | AMR available | Open inline switcher and inspect AMR model selector | AMR model options come from AMR runtime model list; labels are stable |
+| AMR-032 | Chat-run happy path | AMR available and signed in; real or fake vela can run | Select AMR and send one prompt | Assistant message completes successfully; run does not hang |
+| AMR-033 | Default model substitution | AMR selected; config model is `default` | Send a prompt | Backend substitutes a concrete AMR fallback model before `session/prompt`; run succeeds |
+| AMR-034 | Explicit AMR model | AMR selected; choose a concrete AMR model | Send a prompt | Selected AMR model is honored; run succeeds |
+| AMR-035 | Prompt-before-model regression | Force backend to skip model selection or use a stub that rejects prompt-before-model | Send a prompt | Run fails with actionable error; no silent success |
+| AMR-036 | Session/new failure | Use a stub or environment that forces `session/new` error | Send a prompt | User-visible run failure occurs; daemon does not hang |
+| AMR-037 | Session/set_model failure | Use a stub or environment that forces `session/set_model` error | Send a prompt | User-visible run failure occurs; no partial success |
+| AMR-038 | Session/prompt failure | Use a stub or environment that forces `session/prompt` error | Send a prompt | User-visible run failure occurs; run finalizes cleanly |
+| AMR-039 | Silent child timeout | Use a stub that accepts spawn but never responds | Send a prompt | Run fails by timeout instead of hanging indefinitely |
+| AMR-040 | Profile precedence | Set `OPEN_DESIGN_AMR_PROFILE=test` and `VELA_PROFILE=local` | Check status and login | AMR resolves `test`; lower-priority `VELA_PROFILE` does not win |
+| AMR-041 | Profile isolation | Multiple profiles exist in `~/.vela/config.json` | Login, status, logout against one profile | Actions only affect resolved profile; unrelated profiles remain intact |
+| AMR-042 | Packaged env propagation | Packaged build with AMR profile configured | Launch packaged app and inspect daemon env behavior | `OPEN_DESIGN_AMR_PROFILE` is forwarded into daemon spawn env |
+| AMR-043 | Vela bundling | Beta mac arm64 packaging path | Build package in strict mode | Vela binary is bundled into packaged resources; build fails clearly when required binary is unavailable |
+| AMR-044 | Non-strict packaging | Non-strict platform or build path | Build package without available Vela binary | Build does not fail solely due to missing Vela binary |
+
+## Focused Smoke Runs
+
+Use these smaller smoke passes during active development.
+
+### Smoke A: Entry + Login UI
+
+- Verify `amr.available=true`
+- Open Settings
+- Confirm AMR login pill is visible
+- Trigger login
+- Confirm state flips to signed in
+- Confirm sign-out works
+
+### Smoke B: Onboarding
+
+- Reset config so onboarding is visible
+- Confirm AMR Cloud is featured when AMR is available
+- Confirm signed-out state blocks Continue but not Skip
+- Complete login and verify onboarding can advance
+
+### Smoke C: Chat Run
+
+- Select AMR as active agent
+- Keep model at `default`
+- Send a prompt
+- Confirm assistant reply completes
+- Confirm no `session/set_model must be called before session/prompt` regression
+
+## Failure Cases Worth Manual Attention
+
+- `amr.available=false` even though a binary is expected
+- login accepted but status never flips to signed in
+- UI stuck in `Signing in…`
+- signed-in state shown with wrong profile badge
+- onboarding still prefers AMR when AMR is unavailable
+- AMR appears inside Local CLI list
+- AMR run hangs after prompt submission
+- AMR run silently fails when `model=default`
+- packaged build succeeds but runtime cannot find bundled `vela`
+
+## Suggested Evidence To Capture
+
+When filing bugs, capture:
+
+- `/api/agents` response
+- `/api/integrations/vela/status` response
+- current `agentCliEnv.amr` config
+- relevant daemon log lines
+- relevant desktop or renderer log lines
+- active `OPEN_DESIGN_AMR_PROFILE` value
+- whether fake or real `vela` was used
+
+## Notes
+
+- Automated tests already cover many contract-level cases. This document is for manual functional verification, especially UI state, environment setup, and packaged/runtime behavior.
+- Onboarding visibility depends on config state. If `onboardingCompleted=true`, AMR onboarding entry behavior will not be visible until onboarding is reset.
+- Runtime availability depends on binary resolution. If AMR is missing from UI, always inspect `/api/agents` first before assuming a front-end rendering bug.
diff --git a/docs/testing/amr-functional-test-cases.zh-CN.md b/docs/testing/amr-functional-test-cases.zh-CN.md
new file mode 100644
index 000000000..7a04f422f
--- /dev/null
+++ b/docs/testing/amr-functional-test-cases.zh-CN.md
@@ -0,0 +1,431 @@
+# AMR 功能测试用例
+
+## 概述
+
+本文档用于 `feat/amr-runtime-acp` 分支的 AMR（vela）运行时手工功能验证。
+
+文档基于当前实现形态编写：
+
+- AMR 以 daemon agent 的形式暴露，`agentId = amr`
+- AMR 是否可用取决于是否能解析到可运行的 `vela` 二进制
+- AMR 登录状态最终以 `~/.vela/config.json` 中当前 profile 的有效登录信息为准
+- AMR 的 onboarding、Settings、inline switcher、chat run 都依赖 daemon 返回的 runtime 可用性和登录状态
+
+适用于本地开发、QA 回归和发布前验证。
+
+## 当前账号同步原则
+
+基于当前产品形态，AMR 账号状态需要区分两层：
+
+- `Open Design 客户端本地登录态`
+  以本地 `~/.vela/config.json` 和当前 profile 的有效登录信息为准。
+- `Vela 网页钱包登录态`
+  以浏览器中的网页会话为准。
+
+当前建议按以下原则测试与验收：
+
+- Open Design 内点 `Sign out` 时，优先清理**本地 AMR 登录态**
+- Vela 网页端点“退出登录”时，优先清理**网页钱包会话**
+- 两者允许短暂不一致，但后续状态必须能正确收敛
+- **网页端手动切换到新账号时，Open Design 默认保持旧账号，不应静默自动切号**
+- 只有用户在 Open Design 内再次显式触发 `Sign in` 并完成网页登录后，客户端才应正式切到新账号
+
+## 测试环境
+
+### 环境 A：Fake Vela（推荐用于日常 UI 验证）
+
+适用于验证入口展示、登录 UI、onboarding 流程、AMR 基本选择行为，不依赖真实 AMR 后端。
+
+预期环境：
+
+- `agentCliEnv.amr.VELA_BIN` 指向 `apps/daemon/tests/fixtures/fake-vela.mjs`
+- `/api/agents` 返回 `amr.available = true`
+- `/api/integrations/vela/status` 可通过 fake login 路由切换成已登录 / 未登录状态
+
+### 环境 B：Real Vela（推荐用于发布前验证）
+
+适用于验证真实 `vela` 安装、真实 AMR 账号登录、真实 chat run 行为。
+
+预期环境：
+
+- `vela` 已安装到 PATH，或已正确配置 `VELA_BIN`
+- `vela login` 能在当前 profile 下成功
+- `~/.vela/config.json` 中存在带 `runtimeKey` 的有效 profile
+
+## 覆盖范围
+
+- Runtime 可用性与发现
+- AMR 登录 / 登出状态
+- Open Design 会话与 AMR 会话的状态组合
+- Onboarding 入口行为
+- Settings / Execution 面板行为
+- Inline Switcher 行为
+- Chat Run 行为
+- Profile 行为（`prod`、`test`、`local`）
+- OAuth / 重新登录路径
+- 计费网页与额度异常提示
+- 异常与恢复流程
+
+## QA 执行字段
+
+建议 QA 执行时统一补这 4 列，便于冒烟、回归和发布前汇总：
+
+- `优先级`
+  建议使用 `P0 / P1 / P2`
+- `是否必测`
+  建议使用 `是 / 否`
+- `测试结果`
+  建议使用 `通过 / 失败 / 阻塞 / 未执行`
+- `备注`
+  记录环境、截图、日志、缺陷单号或额外观察
+
+推荐分级：
+
+- `P0`
+  主链路必挂项。失败会直接影响 AMR 可用性、登录、聊天或计费恢复。
+- `P1`
+  高价值回归项。失败不一定完全阻塞主链路，但会明显影响体验或恢复能力。
+- `P2`
+  补充验证项。更偏边界、兼容性或细节一致性。
+
+## QA 执行表模板
+
+下面这张表可以直接复制给 QA 使用。
+
+| ID | 模块 | 优先级 | 是否必测 | 前置条件 | 操作步骤 | 预期结果 | 测试结果 | 备注 |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| 示例：AMR-001 | Runtime 发现 | P0 | 是 | PATH 中没有 `vela`，且未配置 `VELA_BIN` | 打开应用，查看 `/api/agents` 和执行器 UI | `amr` 存在但 `available=false`；AMR 不应作为可选可用入口展示 |  |  |
+
+## 手工测试用例
+
+| ID | 模块 | 前置条件 | 操作步骤 | 预期结果 |
+| --- | --- | --- | --- | --- |
+| AMR-001 | Runtime 发现 | PATH 中没有 `vela`，且未配置 `VELA_BIN` | 打开应用，查看 `/api/agents` 和执行器 UI | `amr` 存在但 `available=false`；AMR 不应作为可选可用入口展示 |
+| AMR-002 | Runtime 发现 | `VELA_BIN` 指向可运行的 fake 或 real `vela` | 打开应用，查看 `/api/agents` | `amr.available=true`；模型列表存在；agent path 指向配置的二进制 |
+| AMR-003 | Runtime 发现 | `VELA_BIN` 指向不存在文件 | 重启 daemon 或刷新 agents | `amr.available=false`；应用不崩；AMR 入口安全降级 |
+| AMR-004 | 登录状态 | `~/.vela/config.json` 中没有当前 AMR profile | 调用 `/api/integrations/vela/status` | 返回 `loggedIn=false`、正确 `profile`、`user=null` |
+| AMR-005 | 登录状态 | profile 存在但缺少 `runtimeKey` | 调用 `/api/integrations/vela/status` | 返回 `loggedIn=false`；无 `runtimeKey` 不算已登录 |
+| AMR-006 | 登录状态 | 当前 profile 存在有效 `runtimeKey` | 调用 `/api/integrations/vela/status` | 返回 `loggedIn=true`；用户信息可见；敏感字段不会泄露 |
+| AMR-007 | 登录动作 | AMR 可用且当前未登录 | 从 Settings 或 onboarding 触发登录 | 后端返回 accepted；Vela CLI 拉起网页登录/授权流程；Open Design UI 进入 `Signing in…` |
+| AMR-008 | 登录完成 | 已在 Vela 网页完成授权 | 返回 Open Design 并等待轮询完成 | UI 自动从 `Signing in…` 切换到已登录，无需手动刷新 |
+| AMR-009 | 登录错误 | 强制 `vela login` 立即失败 | 触发登录 | UI 退出 `Signing in…`，显示 AMR 标识的错误反馈 |
+| AMR-010 | 登录并发 | 已有一个 AMR login 进行中 | 快速触发两次登录 | 只允许一个登录请求生效；重复登录被阻止或安全忽略 |
+| AMR-011 | 登出 | 当前 profile 已登录 | 触发 Sign out | 当前 AMR profile 的本地登录信息被移除；下一次 status 为 `loggedIn=false`；其他 profile 不受影响；不要求自动登出浏览器中的 Vela 网页会话 |
+| AMR-011A | 会话组合 | Open Design 已登录/可用，AMR 已登录 | 仅执行 Open Design 侧退出当前 agent/切换 agent，不执行 AMR Sign out | Open Design 本地状态变化后，AMR 的 `~/.vela/config.json` 登录态保持不变；再次回到 AMR 时仍可读到已登录状态 |
+| AMR-011B | 会话组合 | AMR 已登录 | 执行 AMR Sign out，然后关闭并重新打开 Open Design | Open Design 重启后 AMR 仍为未登录；不会自动恢复旧 AMR 会话 |
+| AMR-011C | 会话组合 | AMR 已登录，Open Design 正常运行 | 执行 Open Design 退出并重新打开，但不删除 `~/.vela/config.json` | AMR 登录态仍保留；重新打开后 `/api/integrations/vela/status` 仍返回 `loggedIn=true` |
+| AMR-011D | 重新网页登录 | AMR 已登出 | 重新触发 AMR 登录并在 Vela 网页完成授权 | AMR 可重新完成登录；状态能重新回到 `loggedIn=true` |
+| AMR-011E | Open Design 登出后继续发起 AMR 聊天 | 当前已选 AMR，且刚在 Open Design 中执行 `Sign out` | 不切换 agent，直接发送一条 prompt 或继续使用当前 AMR 模型 | AMR 不应继续正常运行；应提示重新登录或明确不可用；不能静默成功，也不能无限 loading |
+| AMR-011F | Open Design 登出后继续操作 AMR 模型入口 | 当前已选 AMR，且刚在 Open Design 中执行 `Sign out` | 保持在当前页面，继续查看 inline switcher / Settings 中的 AMR 模型与状态 | AMR 入口仍可见，但状态应为未登录；需要重新登录后才能继续实际使用模型 |
+| AMR-011G | 运行中请求期间执行 Open Design 登出 | 当前已有一条 AMR chat run 正在进行中 | 在请求尚未结束时执行 Open Design 内的 `Sign out` | 需按产品预期明确验证：要么当前 run 允许自然结束但后续新请求被阻止，要么当前 run 被安全终止；无论哪种，都不能出现状态错乱、静默挂死或登出后继续无限发请求 |
+| AMR-012 | Settings 可见性 | AMR 可用，onboarding 已完成 | 打开 Settings → Execution | AMR 作为可选 runtime/agent 出现在执行器设置中 |
+| AMR-013 | Settings 可见性 | AMR 不可用 | 打开 Settings → Execution | AMR 不应以“可用入口”被强推，不应出现损坏/不可操作 CTA |
+| AMR-014 | 登录 Pill 未登录态 | AMR 可用，未登录 | 打开 Settings | AMR login pill 显示未登录状态与 Sign in 按钮 |
+| AMR-015 | 登录 Pill 已登录态 | AMR 可用，已登录 | 打开 Settings | AMR login pill 显示已登录状态、用户邮箱、Sign out 按钮 |
+| AMR-016 | Profile Badge | 当前 profile 为 `test` | 打开 Settings | 显示 `TEST` badge |
+| AMR-017 | Profile Badge | 当前 profile 为 `local` | 打开 Settings | 显示 `LOCAL` badge |
+| AMR-018 | Profile Badge | 当前 profile 为 `prod` | 打开 Settings | 不显示调试型 profile badge |
+| AMR-019 | Login Pill 事件隔离 | AMR card 嵌在 settings agent card 内 | 点击 Sign in / Sign out | 点击不会误触发父级 agent card 的选中逻辑 |
+| AMR-020 | 登录恢复 | 登录轮询期间 `/status` 短暂失败 | 触发登录并制造一次失败的 status 请求 | UI 可恢复，后续轮询成功后能切换到已登录 |
+| AMR-021 | Onboarding 默认推荐 | AMR 可用 | 在新配置下打开 onboarding | `AMR Cloud` 作为默认推荐 runtime 展示 |
+| AMR-022 | Onboarding 未登录流 | AMR 可用但未登录 | 打开 onboarding，并保持选择 `AMR Cloud` | 用户会看到“需要登录后继续”的状态 |
+| AMR-023 | Onboarding 已登录流 | AMR 可用且已登录 | 打开 onboarding 并继续 | 用户可直接继续，不再被 AMR 登录阻塞 |
+| AMR-024 | Onboarding 登录完成 | AMR 可用，未登录 | 从 onboarding 发起登录，在 Vela 网页完成授权并返回 | 登录完成后 onboarding 自动进入下一步 |
+| AMR-025 | Onboarding 跳过 | AMR 可用，未登录 | 点击 Skip | onboarding 正常退出，不强制要求先登录 AMR |
+| AMR-026 | Onboarding 回退 | AMR 不可用 | 打开 onboarding | 不应把 AMR Cloud 当作可用路径；Local CLI 仍可正常使用 |
+| AMR-027 | Local CLI 隔离 | AMR 可用 | 在 onboarding 切到 Local coding agent 视图 | AMR 不应出现在 Local CLI agent 列表中 |
+| AMR-028 | Inline Switcher 可见性 | AMR 可用 | 打开 inline model switcher | AMR 以 `AMR` 标签出现，而不是 `AMR (vela)` |
+| AMR-029 | Inline Switcher 未登录态 | AMR 可用但未登录 | 打开 inline model switcher | 行内状态显示紧凑的登录提示，不暴露完整账号信息 |
+| AMR-030 | Inline Switcher 已登录态 | AMR 可用且已登录 | 打开 inline model switcher | 行内显示紧凑的已登录状态；不残留未登录文案 |
+| AMR-031 | Inline Switcher 模型列表 | AMR 可用 | 打开 inline switcher 并查看模型下拉 | 模型选项来自 AMR runtime 列表；标签稳定正确 |
+| AMR-032 | Chat Run 成功链路 | AMR 可用且已登录；fake 或 real vela 可运行 | 选择 AMR 并发送一条 prompt | assistant message 正常完成；run 不挂起 |
+| AMR-033 | 默认模型替换 | 已选 AMR；配置模型为 `default` | 发送 prompt | 后端会先把模型替换成具体 fallback model，再发 `session/prompt`；run 成功 |
+| AMR-034 | 显式模型选择 | 已选 AMR；选择了具体 AMR 模型 | 发送 prompt | 选择的 AMR 模型被正确使用；run 成功 |
+| AMR-035 | prompt-before-model 回归 | 强制 backend 跳过模型设置，或使用会拒绝 prompt-before-model 的 stub | 发送 prompt | run 失败并给出可理解错误；不会静默成功 |
+| AMR-036 | `session/new` 失败 | 使用会强制 `session/new` error 的 stub/环境 | 发送 prompt | 用户可见 run 失败；daemon 不挂起 |
+| AMR-037 | `session/set_model` 失败 | 使用会强制 `session/set_model` error 的 stub/环境 | 发送 prompt | 用户可见 run 失败；不会出现部分成功 |
+| AMR-038 | `session/prompt` 失败 | 使用会强制 `session/prompt` error 的 stub/环境 | 发送 prompt | 用户可见 run 失败；run 能正常结束 |
+| AMR-039 | 静默超时 | 使用能启动但不返回 ACP 响应的 stub | 发送 prompt | run 通过 timeout 失败，而不是无限挂住 |
+| AMR-040 | Profile 优先级 | 设置 `OPEN_DESIGN_AMR_PROFILE=test` 且 `VELA_PROFILE=local` | 查看 status / login | AMR 应解析为 `test`；低优先级 `VELA_PROFILE` 不能覆盖 |
+| AMR-041 | Profile 隔离 | `~/.vela/config.json` 中存在多个 profile | 对某一个 profile 执行 login / status / logout | 只影响当前解析到的 profile；其他 profile 保持不变 |
+| AMR-042 | Packaged 环境传递 | 打包环境中配置了 AMR profile | 启动 packaged app 并检查 daemon env 行为 | `OPEN_DESIGN_AMR_PROFILE` 会传给 daemon |
+| AMR-043 | Vela bundling | beta mac arm64 打包路径 | 使用 strict 模式打包 | Vela binary 被打进包资源；缺失时构建清晰失败 |
+| AMR-044 | Non-strict packaging | 非 strict 平台或路径 | 在无可用 Vela binary 的情况下打包 | 构建不会仅因缺少 Vela 而失败 |
+| AMR-044A | CLI 已安装但读取不到 | 机器上已安装 AMR CLI，但 PATH 未生效或 `VELA_BIN` 指向错误 | 打开 Open Design，查看 `/api/agents`、Settings、onboarding | `amr.available=false`；UI 不崩；应给出可操作排查方向，如检查 PATH、重新安装 CLI、显式配置 `VELA_BIN` |
+| AMR-044B | CLI 重复安装 | 机器上已存在可运行的 AMR CLI | 再次执行钱包页中的安装命令或重复安装同版本 / 新版本 CLI | 不应导致 Open Design 崩溃或识别到多个冲突入口；重新打开后应仍只解析一个有效 CLI 路径，AMR 可正常使用 |
+| AMR-045 | 钱包页入口 | AMR 已登录；产品已提供外部钱包页面入口 | 从 Open Design 中点击余额不足提示、钱包入口或账户入口 | 在系统浏览器或内嵌浏览器打开独立钱包页；不会卡死在 Open Design 内部运行态 |
+| AMR-046 | 钱包页基础展示 | 已打开钱包页 | 查看页面结构 | 应展示当前余额、充值区域、交易/消费记录、AMR CLI 安装说明等核心模块 |
+| AMR-047 | Stripe 固定金额充值 | 钱包页可用 | 选择固定金额并点击 `Continue to Stripe` | 跳转到 Stripe Checkout；金额、币种和展示文案一致 |
+| AMR-048 | Stripe 自定义金额充值 | 钱包页支持自定义金额 | 输入合法自定义金额并继续 | 跳转到 Stripe；金额按输入值传递；非法输入时前端阻止继续 |
+| AMR-048A | 最低充值金额展示 | 钱包页支持自定义金额，最低充值为 US$10 | 打开充值区域，查看固定金额与自定义金额说明 | 页面应明确体现最低充值限制；默认固定金额选项不应低于 US$10 |
+| AMR-048B | 自定义金额低于 US$10 | 钱包页支持自定义金额 | 输入 `9.99`、`1`、`0` 或负数并尝试继续 | 前端应阻止进入 Stripe；给出清晰的最低充值提示；不应创建有效支付流程 |
+| AMR-048C | 自定义金额等于 US$10 | 钱包页支持自定义金额 | 输入 `10` 并继续 | 应允许进入 Stripe；金额按 US$10 传递 |
+| AMR-048D | 自定义金额边界值与格式 | 钱包页支持自定义金额 | 输入带空格的 ` 10 `、超长小数、非数字字符等 | 合法整数格式应被规范化或接受；非法格式应被拦截；不能绕过 US$10 下限与“仅支持整数美元”规则 |
+| AMR-048E | 自定义金额不支持小数 | 钱包页支持自定义金额，规则为“仅支持整数美元” | 输入 `10.5`、`10.00`、`.`、`0.1` 并观察输入框与按钮状态 | 小数输入应被拦截、自动清洗或直接判为无效；按钮保持不可点击；不能进入 Stripe |
+| AMR-048F | 自定义金额不支持负数 | 钱包页支持自定义金额 | 输入 `-10`、`-1`、`--10` | 负数输入应被拦截或判为无效；金额展示不能出现负充值；按钮不可点击 |
+| AMR-048G | 空值与仅占位字符 | 钱包页支持自定义金额 | 保持空输入，或输入空格、`+`、`-`、`.` 后尝试继续 | 本次充值金额应保持 `US$0.00` 或无效态；按钮不可点击；不会创建支付 |
+| AMR-048H | 前导零与纯数字规范化 | 钱包页支持自定义金额 | 输入 `0010`、`00012` | 若产品允许，应规范显示为 `10`、`12`；金额传递应按整数值处理；不能因前导零出错 |
+| AMR-048I | 超大整数输入 | 钱包页支持自定义金额 | 输入极大值，如 `999999999` | 页面应有合理上限或安全处理；不会出现溢出、布局错乱、按钮文案异常或错误跳转 |
+| AMR-048J | 复制粘贴非法字符 | 钱包页支持自定义金额 | 粘贴 `10usd`、`$10`、`1,000`、`１０`、`1e2` | 非法格式应被拦截或清洗到产品允许范围；不能绕过整数与最低充值限制 |
+| AMR-048K | 键盘提交与禁用态 | 自定义金额输入无效 | 在输入框聚焦时按 Enter | 无效金额下按 Enter 不应触发 Stripe 跳转；只有满足规则时才允许提交 |
+| AMR-048L | 固定金额与自定义金额切换 | 钱包页支持固定金额与自定义金额 | 先输入自定义金额，再切回固定金额；再切回自定义金额 | 切换行为应稳定：要么保留上次合法自定义值，要么按产品设计重置；按钮金额和展示金额必须一致 |
+| AMR-048M | 文案与按钮金额一致性 | 钱包页支持自定义金额 | 输入合法整数，如 `10`、`50`、`300` | 输入框、本次充值金额、主按钮文案中的金额三处应保持一致；不能一处显示旧值一处显示新值 |
+| AMR-048N | 无效输入时错误提示可恢复 | 先输入非法金额，再改成合法整数 | 依次输入 `9`、`10.5`、`-10`，最后改成 `10` | 错误/禁用状态应在修正后立即恢复；用户无需刷新页面即可继续支付 |
+| AMR-048O | 服务端兜底拒绝非法金额 | 具备调试能力，可绕过前端直接请求创建充值 session | 直接提交 `<10`、负数、非整数、非法格式金额到后端 | 服务端必须拒绝请求；不能仅依赖前端校验；不应创建有效 Stripe session |
+| AMR-048P | 自定义充值金额上限待确认 | 钱包页支持自定义金额；产品尚未明确最大充值上限 | 输入明显过大的整数，如 `999999999`，观察输入、按钮和跳转行为 | 在上限规则明确前，前后端至少应有安全兜底：不能溢出、不能布局错乱、不能创建不可控大额支付；如已有上限，应给出明确超限提示 |
+| AMR-048Q | 等于最大上限的边界值 | 产品已明确最大充值上限 | 输入等于上限的整数并继续 | 若该值在规则内，应允许继续；前端展示、按钮金额、提交金额三者一致 |
+| AMR-048R | 超过最大上限 | 产品已明确最大充值上限 | 输入大于上限的整数并尝试继续 | 前端应阻止提交并给出明确提示；若绕过前端，服务端也必须拒绝 |
+| AMR-049 | Stripe 支付成功回跳 | 已完成一笔 Stripe 测试支付 | 回到钱包页 `checkout-success` 场景 | 页面出现支付成功提示；余额在服务端确认后刷新；充值记录新增一条 |
+| AMR-049A | Continue to Stripe 防重复点击 | 钱包页可用，已输入合法金额 | 快速连续点击 `Continue to Stripe` 多次 | 只应创建一次有效支付流程；按钮应进入 loading/禁用态，避免重复创建 session |
+| AMR-049B | 创建 Stripe session 失败 | 服务端创建 checkout session 失败或网络请求失败 | 输入合法金额后点击 `Continue to Stripe` | 页面应显示明确错误；按钮可恢复再次点击；不会卡死在 loading 或产生幽灵订单 |
+| AMR-050 | Stripe 支付取消/关闭 | 已跳到 Stripe Checkout | 主动取消支付或关闭支付页后返回 | 钱包页不增加余额；不出现成功提示；用户可重新发起充值 |
+| AMR-051 | 钱包页刷新一致性 | 已完成一笔充值或消费 | 点击 Refresh 或手动刷新页面 | 余额、最近交易记录、分页状态与服务端一致；不出现重复记录 |
+| AMR-051A | 钱包页余额不足展示 | 测试账户余额为 0 或接近 0 | 打开钱包页 | 页面能明确展示当前余额偏低/不足；至少余额数值、最近消费记录与账户真实状态一致 |
+| AMR-051B | 钱包页余额不足时充值引导 | 钱包页已显示低余额或 0 余额 | 查看页面主操作区 | 用户可以直接继续选择充值金额并前往 Stripe；不会因为低余额进入不可恢复空白态 |
+| AMR-051C | 钱包页余额不足但历史记录存在 | 测试账户余额不足且存在历史消费/充值记录 | 打开钱包页并查看 Wallet Activity | 历史记录仍可正常查看；不会因余额不足把记录区域置空或报错 |
+| AMR-051D | 钱包页支付成功后低余额恢复 | 余额不足账户刚完成一笔充值 | 回到 `checkout-success` 钱包页并刷新 | 成功提示、余额和新增充值记录三者一致；余额从不足状态恢复 |
+| AMR-051E | 支付成功但回跳参数丢失 | 已完成测试支付，但手动移除或破坏 `session_id` / success 参数 | 打开钱包页成功态链接的异常版本 | 页面不应错误展示“支付成功”；应安全降级为普通钱包页或提示无法确认支付结果 |
+| AMR-051F | 重复打开同一个成功回跳链接 | 已有一个有效 `checkout-success` 链接 | 连续多次打开相同成功回跳 URL | 不应重复增加余额；成功提示与交易记录最多对应一笔真实支付 |
+| AMR-051G | 服务端余额已更新但前端未自动刷新 | 支付已完成，服务端余额已变更 | 回到钱包页后不手动刷新，观察页面，再点击 Refresh | 自动刷新失败时，手动 Refresh 后应拿到正确余额与记录；页面不应永久停留在旧值 |
+| AMR-051H | Stripe 支付页中途关闭后再次进入 | 第一次支付中途关闭或取消 | 回到钱包页后再次选择金额并进入 Stripe | 第二次支付可正常发起；第一次未完成支付不会污染第二次流程 |
+| AMR-051I | 同一 `session_id` 幂等保护 | 已有一个有效 Stripe 成功回跳 `session_id` | 反复打开相同成功链接，并多次刷新钱包页 | 余额、充值记录、成功提示都只能对应一笔真实支付；不能重复记账 |
+| AMR-051J | Webhook 延迟到账 | Stripe 已成功，但服务端确认晚于前端回跳 | 支付成功后立刻回到钱包页，观察一段时间并手动刷新 | 钱包页应能安全处理“先回跳、后到账”；最终余额和记录会收敛正确，不误报永久失败 |
+| AMR-051K | 支付处理中提示 | 服务端尚未完成最终确认 | 支付成功回跳后立即查看页面 | 若余额尚未更新，页面应表现为处理中/等待确认或安全降级，而不是直接显示错误成功状态 |
+| AMR-051L | 篡改 `session_id` | 手工修改成功回跳 URL 中的 `session_id` | 打开被篡改的成功页链接 | 不应把无效或他人的支付结果记到当前账户；页面应明确提示无法确认或安全降级 |
+| AMR-051M | 越权查看他人支付结果 | 准备两个不同测试账号与不同支付回跳链接 | 账号 A 登录时访问账号 B 的支付成功回跳链接 | 当前账号不应看到他人支付结果、余额或新增记录；应拒绝展示或要求重新校验 |
+| AMR-051N | 越权查看他人交易历史 | 准备两个测试账号 | 登录账号 A 后尝试通过钱包页或构造 URL 访问账号 B 的交易上下文 | 钱包页不应展示不属于当前账号的余额与历史；应保持当前账号数据或返回安全错误 |
+| AMR-052 | 余额不足时发起聊天 | AMR 已登录，但测试账户余额不足或上游返回额度不足错误 | 在 Open Design 中选择 AMR 发起 chat run | 应出现明确“余额/额度不足”类错误；不应误显示为“未登录”；run 不应无限重试 |
+| AMR-052A | 余额不足时对话区 run 状态收敛 | AMR 已登录，但余额不足 | 在对话区发起一条 AMR 请求并观察当前 run 状态 | 当前 run 应从进行中收敛为失败结束；停止 loading / thinking / requesting；不能一直卡在运行中 |
+| AMR-052B | 余额不足错误不污染登录态 | AMR 已登录，但余额不足 | 触发一次余额不足错误后，再查看 Settings / inline switcher / onboarding 状态 | AMR 仍应显示为已登录；不能把余额不足误判为未登录或自动要求重新登录 |
+| AMR-052C | 余额不足失败后对话仍可继续操作 | AMR 已登录，但余额不足 | 触发余额不足错误后，尝试切换 agent、继续新消息或走充值路径 | 对话线程不应锁死；用户仍可切到其他 agent、去充值，或在恢复后继续新请求 |
+| AMR-052D | 余额不足时 assistant message / 系统提示落地 | AMR 已登录，但余额不足 | 在对话区触发一次余额不足错误 | 对话区应落一条明确失败消息或系统提示，帮助用户理解发生了额度不足；不能只有 loading 消失而没有可见反馈 |
+| AMR-053 | 余额不足时的引导 | 余额不足提示已出现 | 查看错误文案与可操作入口 | 应提供去充值、查看钱包页或切换其他 agent 的路径；至少不能让用户卡死在当前错误态 |
+| AMR-054 | 余额不足后切换 agent | AMR 因额度不足不可继续 | 切换到 Claude / Codex / Local CLI 等其他 agent | 切换应成功；不会被 AMR 计费错误阻塞整个应用 |
+| AMR-054A | AMR 余额不足后切到其他 CLI 并继续请求 | AMR 已登录，但余额不足；随后切到 Claude / Codex / Local CLI | 切换后立即发起一条新请求 | 新 CLI 请求应正常开始并结束；不应继承 AMR 的额度不足失败态 |
+| AMR-054B | 切到其他 CLI 后再返回 AMR | AMR 因额度不足失败后，用户切到其他 CLI 完成一次正常请求 | 再次切回 AMR，查看状态与入口 | AMR 应仍保持“已登录但额度不足”或明确错误态；不能被错误重置成未登录，也不能假装恢复正常 |
+| AMR-054C | 余额不足后切到其他 CLI 时线程状态隔离 | AMR 因额度不足失败后，切到其他 CLI 继续同一线程或新线程 | 查看旧错误展示与新 CLI 回复 | AMR 的额度不足错误不应污染新 CLI 的 assistant message、状态条或结果区域 |
+| AMR-055 | 充值后恢复可用 | 刚刚因余额不足失败，随后在钱包页成功充值 | 回到 Open Design 再次发起同类请求 | 无需重装或清缓存即可恢复 AMR 可用；不会残留永久错误态 |
+| AMR-056 | 已登录与余额不足区分 | AMR 已登录，但余额不足 | 打开 Settings / onboarding / inline switcher | 登录态仍显示为已登录；不能把余额不足误判为未登录 |
+| AMR-056A | AMR 登出后不应产生新的钱包扣费 | 刚在 Open Design 中对 AMR 执行 `Sign out` | 直接尝试再次发起新的 AMR 请求，然后刷新钱包页 | 新请求应被阻止或要求重新登录；钱包余额和消费流水不应新增新的扣费记录 |
+| AMR-056B | 运行中请求期间登出后的扣费结果 | 当前已有一条 AMR 请求正在执行，随后在 Open Design 中执行 `Sign out` | 等待该请求结束或被终止，再刷新钱包页查看余额与流水 | 需按产品预期明确验证：若当前 run 允许自然结束，则最多产生该次对应的一笔正常扣费；若 run 被中断，则不应再新增该次消费；无论哪种，不能重复扣费或出现账实不一致 |
+| AMR-056C | 登出后钱包余额与流水一致性 | 刚完成 Open Design 内的 AMR `Sign out` | 打开或刷新钱包页，查看余额、最近消费记录和筛选结果 | 登出本身不应凭空导致扣费变化；钱包余额、消费流水和筛选视图应保持一致，不出现异常新增消费 |
+| AMR-TASK-001 | 定时任务触发时 AMR 余额不足 | 存在使用 AMR 的定时任务 / 自动化任务；账户余额不足 | 等待任务触发或手动触发一次等价任务 | 本次任务应明确失败结束；不能无限重试、卡在 running，或默默吞掉错误 |
+| AMR-TASK-002 | 定时任务余额不足错误语义 | 使用 AMR 的定时任务在余额不足时失败 | 查看任务状态、错误文案、日志或历史记录 | 应明确区分“额度不足”与“未登录/网络错误/未知错误”；错误可追踪、可定位 |
+| AMR-TASK-003 | 充值恢复后再次执行定时任务 | 同类任务曾因 AMR 余额不足失败，随后完成充值 | 再次触发相同或等价任务 | 任务应恢复可执行；不会残留永久失败态，也不会错误继承旧的额度不足状态 |
+| AMR-057 | Open Design 登出但 AMR 未登出 | Open Design 当前选中 AMR 且 AMR 已登录 | 在 Open Design 中退出当前账户态或切换 agent，但不在钱包/AMR 中登出 | 返回 AMR 时仍应保持已登录；钱包页仍可查看原余额与记录 |
+| AMR-058 | AMR 登出后重新网页登录与充值 | AMR 已登录，钱包页可用 | 先执行 AMR Sign out，再重新登录，再打开钱包页 | 重新网页登录后钱包页恢复到账户对应余额；不会串到旧会话或空白页 |
+| AMR-058A | 仅本地 Sign out，不清理网页登录态 | AMR 已登录，且浏览器里仍保留 Vela 网页登录会话 | 在 Open Design 中执行 Sign out，然后重新点 Sign in | Open Design 本地应先回到未登录；再次登录时可因网页已有会话而快速完成，但不能在未触发重新登录前自动恢复为已登录 |
+| AMR-058B | 网页端退出后 Open Design 状态收敛 | Open Design 显示已登录，同时在浏览器钱包页手动退出 Vela 网页登录 | 回到 Open Design，观察状态并再触发一次需要 AMR 的操作 | 若本地 `runtimeKey` 仍有效，短期内可能仍显示已登录；一旦上游拒绝或重新登录，应用应给出明确提示并允许重新登录，不应静默卡死 |
+| AMR-059 | Open Design 与钱包页账号一致性 | AMR 已登录，钱包页可打开 | 分别在 Open Design 和钱包页确认当前账号标识 | 两边应指向同一 AMR 账号；不会一个显示 A 账号、另一个显示 B 账号 |
+| AMR-060 | 钱包页残留旧账号会话 | 浏览器里残留旧钱包登录态；Open Design 已切到新 AMR 账号 | 从 Open Design 再次打开钱包页 | 钱包页应与当前 AMR 账号保持一致，或至少明确要求重新登录；不能静默展示旧账号余额 |
+| AMR-061 | 多账号切换后余额不串号 | 准备两个不同 AMR 测试账号 | 用账号 A 登录并查看余额，再 Sign out，改用账号 B 登录并查看余额 | 账号 B 不应看到账号 A 的余额和交易记录；返回账号 A 后仍应恢复自己的数据 |
+| AMR-062 | 多账号切换后 Open Design 状态刷新 | 先用账号 A 登录并成功聊天，再在 Open Design 内显式重新登录切到账号 B | 切换后查看 Settings、inline switcher、钱包入口，再发起一条 AMR 请求 | 账号展示、登录态、钱包入口、聊天请求都应切到账号 B；不残留账号 A 文案或会话 |
+| AMR-063 | 多 profile 与多账号组合 | `prod`、`test` 或 `local` 下分别绑定不同 AMR 账号 | 切换 `OPEN_DESIGN_AMR_PROFILE` 后分别查看 status 与钱包页 | profile 切换后应映射到对应账号；不同 profile 的余额和交易记录不能串号 |
+| AMR-064 | 钱包页已打开时再切换账号 | 钱包页已停留在账号 A；Open Design 中切换到账号 B | 不关闭旧钱包页，直接刷新或再次从 Open Design 打开钱包页 | 旧页刷新后不应继续误展示账号 A 的有效可操作状态；新打开的钱包页应对齐账号 B |
+| AMR-065 | 支付成功后账号切换保护 | 账号 A 发起 Stripe 支付，在回跳前切到账号 B | 打开支付成功回跳页并检查余额记录 | 不应把账号 A 的支付结果错误记到账号 B；若无法确认，应明确报错或要求重新校验 |
+| AMR-065A | 网页端手动切换账号后客户端保持旧账号 | Open Design 当前以账号 A 登录；钱包页手动切到账号 B | 切回 Open Design，查看 Settings、inline switcher，并尝试发起一次 AMR 请求 | Open Design 应继续显示/使用账号 A，不能静默切到账号 B |
+| AMR-065B | 网页端切账号后重新打开钱包页 | Open Design 当前仍为账号 A；浏览器钱包页已切到账号 B | 从 Open Design 再次点击钱包入口 | 钱包页可继续显示账号 B，但 Open Design 客户端本地状态仍保持账号 A，直到显式重新登录 |
+| AMR-065C | 网页端切账号后客户端显式重新登录 | 钱包页已切到账号 B；Open Design 当前仍为账号 A | 在 Open Design 中主动执行 Sign out / Sign in，并完成网页登录 | Open Design 完成新的网页登录后，才正式切到账号 B |
+| AMR-065D | 网页端切账号后不允许静默串余额 | 钱包页已切到账号 B；Open Design 当前仍为账号 A | 观察客户端显示的账号标识、余额入口文案、聊天身份 | 在显式重登前，Open Design 不应混入账号 B 的余额、文案或身份信息 |
+| AMR-065E | 本地显示已登录但 token 已失效 | Open Design 当前显示已登录，但上游 token 已过期/撤销/无权限 | 发起一次 AMR chat run、打开关键设置页或执行状态刷新 | 应收敛成需要重新登录或明确权限错误；不能长期假装已登录，也不能静默失败 |
+| AMR-066 | 弱网下 AMR 登录轮询 | 网络延迟高、偶发丢包或短时断网 | 触发 AMR 登录并观察 `Signing in…` 到结果态的切换 | UI 不应立刻假失败；短暂失败后可恢复；超时后给出明确错误，不永久卡住 |
+| AMR-067 | 弱网下登录完成后状态刷新 | OAuth 已在浏览器中完成，但 Open Design 与 daemon 的状态轮询较慢 | 等待登录结果或恢复网络后重试查看 Settings | 登录成功后最终能收敛到已登录；不会长期停留在旧未登录态 |
+| AMR-068 | 弱网下钱包页打开 | 网络较慢时从 Open Design 打开钱包页 | 观察钱包页首屏加载 | 页面应有加载态或安全降级；不应空白无反馈；恢复网络后可继续正常展示余额和记录 |
+| AMR-069 | 弱网下钱包页 Refresh | 钱包页已打开，网络抖动明显 | 点击 Refresh 多次或在网络恢复后再次刷新 | 最终以最新服务端结果为准；不会因重复刷新产生重复记录、重复提示或永久错误态 |
+| AMR-070 | 弱网下 Stripe 成功回跳 | 支付成功后回到钱包页时网络不稳定 | 观察成功提示、余额和交易记录，再在网络恢复后刷新 | 即使首轮加载失败，恢复后仍能正确显示成功结果；不应丢单或重复记账 |
+| AMR-071 | 弱网下 Stripe 取消回跳 | Stripe 取消或关闭支付后返回钱包页时网络抖动 | 返回钱包页并观察页面状态 | 不应误显示支付成功；恢复网络后仍保持未充值状态 |
+| AMR-072 | 弱网下余额不足提示 | AMR 上游返回额度不足，同时网络波动 | 在 Open Design 中发起 AMR chat run | 应优先展示可理解错误；不能因为网络波动把“余额不足”错误变成静默失败或无限 loading |
+| AMR-073 | 弱网下聊天请求超时恢复 | 选择 AMR 发起聊天时网络较差 | 发送 prompt，观察失败提示，并在网络恢复后重试 | 首次失败应可见且可恢复；重试后可重新发起，不残留卡死 run |
+| AMR-074 | 弱网下切换 agent | AMR 正处于网络不稳定或错误态 | 立即切换到 Claude / Codex / Local CLI | 切换应仍可完成；AMR 的弱网状态不应拖垮整个执行器 UI |
+| AMR-075 | 弱网下多账号切换 | 浏览器钱包页与 Open Design 切账号时网络较差 | 执行 Sign out / 重新登录 / 打开钱包页 | 账号切换最终应收敛到正确账号；不应因为弱网出现旧账号残留、串号或永久 loading |
+| AMR-076 | 余额与流水对账一致性 | 钱包页存在充值与消费记录 | 对比当前余额、总充值、总消费和最近流水 | 余额变化应与充值/消费流水逻辑一致；切换筛选和分页后不应出现前后对不上的数据 |
+
+## 推荐优先级与是否必测
+
+这部分给 QA 一个快速分层，避免一次性把整套长回归集全部跑完。
+
+### P0 / 必测
+
+- AMR-001 至 AMR-008
+- AMR-010 至 AMR-015
+- AMR-011E 至 AMR-011G
+- AMR-021 至 AMR-026
+- AMR-032 至 AMR-039
+- AMR-045
+- AMR-047
+- AMR-049
+- AMR-049A
+- AMR-049B
+- AMR-052 至 AMR-056C
+- AMR-052D
+- AMR-054A
+- AMR-054B
+- AMR-054C
+- AMR-065A
+- AMR-065C
+- AMR-065E
+- AMR-TASK-001
+- AMR-TASK-002
+- AMR-TASK-003
+- AMR-076
+
+### P1 / 建议回归
+
+- AMR-009
+- AMR-016 至 AMR-020
+- AMR-027 至 AMR-031
+- AMR-040 至 AMR-044B
+- AMR-046
+- AMR-048 至 AMR-048R
+- AMR-050
+- AMR-051 至 AMR-051N
+- AMR-057
+- AMR-058
+- AMR-059 至 AMR-065
+- AMR-065B
+- AMR-065D
+- AMR-066 至 AMR-075
+
+### P2 / 扩展验证
+
+- AMR-011A 至 AMR-011D
+- 其余会话 / OAuth 组合矩阵项
+- 多账号、多 profile、重复回跳、取消支付等跨环境组合场景
+- 弱网、短时断网、恢复网络后的重试与状态收敛场景
+
+## 会话 / OAuth 组合测试矩阵
+
+这部分用于补足“Open Design 自身状态”和“AMR 自身 OAuth 状态”组合下的行为验证。
+
+| ID | 场景 | 预期结果 |
+| --- | --- | --- |
+| AMR-OAUTH-001 | Open Design 切换到非 AMR agent，但 AMR 不执行 Sign out | AMR 登录态保留；切回 AMR 时仍可识别 |
+| AMR-OAUTH-002 | 仅 Open Design 关闭并重开，AMR 配置文件保留 | AMR 登录态仍应存在 |
+| AMR-OAUTH-003 | AMR 执行 Sign out 后，Open Design 关闭并重开 | AMR 登录态不应自动恢复 |
+| AMR-OAUTH-004 | AMR Sign out 后重新执行网页登录 / 登录 | 可重新登录成功，状态恢复为已登录 |
+| AMR-OAUTH-005 | 存在多个 AMR profile 时切换 `OPEN_DESIGN_AMR_PROFILE` | 登录态应随 profile 切换，不应串号 |
+| AMR-OAUTH-006 | 当前 profile 登录失败后立即重试 | 第二次登录可恢复，不应永久卡在错误态或 signing-in |
+
+## 计费 / 钱包页专项测试
+
+根据当前产品形态，计费并不内嵌在 Open Design 主界面里，而是通过**独立钱包网页**承载，典型内容包括：
+
+- 当前余额
+- Stripe 充值入口
+- 最近充值/消费记录
+- 支付成功回跳提示
+- AMR CLI 安装说明
+
+因此计费测试建议拆成三层：
+
+### A. 钱包页本身
+
+- 入口能否正确打开
+- Stripe 金额与回跳是否正确
+- 最低充值 US$10 的前端展示、输入校验与边界值是否正确
+- 前端校验被绕过后，服务端是否仍拒绝非法金额
+- 自定义充值金额上限未明确时是否仍有安全兜底；明确后前后端是否一致执行
+- 余额与交易记录是否刷新
+- 余额不足时钱包页自身是否仍可用、可充值、可查看历史
+- 支付取消、参数丢失、重复打开、前端刷新延迟等异常回跳是否安全
+- 同一支付结果的幂等保护、延迟到账和越权访问是否安全
+- 创建 Stripe session 的 loading、防重复点击和失败恢复是否安全
+
+### B. Open Design 与钱包页的联动
+
+- 余额不足时 Open Design 如何提示
+- 是否能从错误态去钱包页充值
+- 充值后是否能恢复 AMR 可用
+- 登录态与计费态是否分离展示
+
+### C. 账户与会话组合
+
+- Open Design 会话变化时，AMR / 钱包页会话是否保持
+- AMR Sign out 与重新网页登录后，钱包页是否仍指向正确账户
+- Open Design 的 Sign out 是清理本地 AMR 登录态，还是同时要求网页钱包会话失效
+- 多 profile 或多账号时是否会串余额、串交易记录
+- Open Design 与钱包页是否可能因为浏览器残留会话而出现账号不一致
+- 网页端手动切到新账号后，客户端是否仍默认保持旧账号，直到显式重新登录
+- 弱网、超时、短时断网时 Open Design 与钱包页的状态是否还能正确收敛
+
+## 建议后续补强
+
+如果后面要把 AMR 的计费体验做得更完整，建议追加这些实现与测试：
+
+- 独立的 AMR 计费状态读取接口
+- “已登录但余额不足”与“未登录”分离展示
+- 余额不足时的 CTA（充值、升级、查看文档、切换 agent）
+- 余额恢复后的状态刷新与重试路径
+- Open Design 自身退出/重开与 AMR OAuth 状态的更明确 UX 文案
+- “本地登出”与“网页会话仍存在”之间更明确的产品文案与用户预期
+- Stripe 取消支付、重复回跳、过期 session_id 等更明确的结果页状态
+- Stripe success 回跳、webhook 延迟与最终到账之间更明确的处理中状态
+- 钱包页与 Open Design 之间更清晰的回跳/返回路径
+- 多账号场景下更显式的账号展示与串号保护
+- 钱包页对篡改 `session_id`、错误账号访问、重复消费回跳结果的安全保护
+- 弱网态下更明确的 loading、timeout、retry 与恢复提示
+
+## 推荐 Smoke 流程
+
+### Smoke A：入口 + 登录 UI
+
+- 确认 `amr.available=true`
+- 打开 Settings
+- 确认 AMR login pill 可见
+- 触发登录
+- 确认状态切换成已登录
+- 确认 Sign out 可用
+
+### Smoke B：Onboarding
+
+- 重置配置，让 onboarding 可见
+- 确认 `AMR Cloud` 是默认推荐入口
+- 确认未登录时 Continue 受阻，但 Skip 可用
+- 完成登录后确认 onboarding 可继续
+
+### Smoke C：Chat Run
+
+- 选择 AMR 作为当前 agent
+- 模型保持 `default`
+- 发送一条 prompt
+- 确认 assistant 正常返回
+- 确认没有出现 `session/set_model must be called before session/prompt`
+
+## 值得重点关注的失败场景
+
+- 明明预期有 `vela`，但 `amr.available=false`
+- 钱包页里已经提示安装 CLI，但 Open Design 仍读取不到 CLI
+- CLI 重复安装后，Open Design 解析到旧路径、失效路径或错误版本
+- 登录已 accepted，但 status 一直不切到已登录
+- 弱网后恢复了，但 UI 仍卡在旧状态不刷新
+- UI 一直卡在 `Signing in…`
+- 钱包页按钮进入 Stripe 创建流程后一直 loading，无法恢复
+- 已登录状态显示了错误的 profile badge
+- AMR 不可用时，onboarding 仍然强推 AMR
+- AMR 出现在 Local CLI 列表里
+- 发送 prompt 后 run 挂住
+- `model=default` 时 AMR silently fail
+- 打包构建成功，但运行时找不到 bundled `vela`
+
+## 建议采集的排障信息
+
+提 bug 时建议附带：
+
+- `/api/agents` 返回
+- `/api/integrations/vela/status` 返回
+- 当前 `agentCliEnv.amr` 配置
+- 相关 daemon 日志
+- 相关 desktop / renderer 日志
+- 当前 `OPEN_DESIGN_AMR_PROFILE` 值
+- 使用的是 fake 还是真实 `vela`
+- `which vela` 输出
+- `echo $VELA_BIN` 输出
+- 弱网复现方式
+- 失败时的网络状态、代理/VPN 状态、是否可稳定复现
+- 相关支付 session_id / 请求 ID / 服务端拒绝原因
+
+## 备注
+
+- 自动化测试已经覆盖了大量契约级行为；本文档主要用于手工功能验证，尤其是 UI 状态、环境配置和打包/运行时行为。
+- onboarding 是否可见取决于当前配置；如果 `onboardingCompleted=true`，需要先重置 onboarding 才能看到 AMR onboarding 入口。
+- 如果页面上没看到 AMR，优先先查 `/api/agents`，不要先假设是前端渲染问题。
diff --git a/docs/testing/amr-smoke-p0.zh-CN.md b/docs/testing/amr-smoke-p0.zh-CN.md
new file mode 100644
index 000000000..d2407e205
--- /dev/null
+++ b/docs/testing/amr-smoke-p0.zh-CN.md
@@ -0,0 +1,87 @@
+# AMR P0 冒烟清单
+
+## 说明
+
+本文档用于从完整 AMR 功能回归集中抽取最关键的 `P0 / 必测` 项，适合：
+
+- 提测前快速冒烟
+- 每日回归
+- 发布前首轮验证
+
+执行建议：
+
+- 优先用真实环境跑登录、对话、余额、钱包相关链路
+- 若真实环境不可用，可先用 fake / stub 环境完成基础 UI 状态验证
+- 结果建议记录为：`通过 / 失败 / 阻塞 / 未执行`
+
+完整回归文档见：
+
+- [amr-functional-test-cases.zh-CN.md](/Users/mac/open-design/open-design-amr-runtime-acp/docs/testing/amr-functional-test-cases.zh-CN.md)
+
+## P0 冒烟用例
+
+| ID | 模块 | 关键验证点 | 结果 | 备注 |
+| --- | --- | --- | --- | --- |
+| AMR-001 | Runtime 发现 | 未安装/未配置 `vela` 时，AMR 不应伪装成可用 |  |  |
+| AMR-002 | Runtime 发现 | 已正确配置 `VELA_BIN` 或真实 `vela` 后，`amr.available=true` |  |  |
+| AMR-007 | 登录动作 | 从 Open Design 触发登录后，能正确进入网页登录/授权流程 |  |  |
+| AMR-008 | 登录完成 | 在网页完成授权后，Open Design 能自动收敛为已登录 |  |  |
+| AMR-010 | 登录并发 | 重复点击登录不会发起多个并发登录 |  |  |
+| AMR-011 | 登出 | Open Design 内 `Sign out` 后，本地 AMR 状态立即变未登录 |  |  |
+| AMR-011E | 登出后继续发起 AMR 聊天 | 登出后不能继续正常调用 AMR 模型 |  |  |
+| AMR-011G | 运行中请求期间登出 | 登出时已有 run 不应导致状态错乱、挂死或无限继续请求 |  |  |
+| AMR-021 | Onboarding | AMR 可用时，`AMR Cloud` 作为默认推荐入口展示 |  |  |
+| AMR-024 | Onboarding | 从 onboarding 发起登录并完成网页授权后，可自动继续下一步 |  |  |
+| AMR-026 | Onboarding 回退 | AMR 不可用时不会强推 AMR，Local CLI 仍可正常使用 |  |  |
+| AMR-032 | Chat Run | 已登录且可用时，AMR 聊天主链路能完整跑通 |  |  |
+| AMR-033 | 默认模型替换 | `default` 模型会被替换为具体可用模型后再发请求 |  |  |
+| AMR-036 | ACP 异常 | `session/new` 失败时，run 会明确失败，不会挂起 |  |  |
+| AMR-038 | ACP 异常 | `session/prompt` 失败时，run 会明确失败并正常结束 |  |  |
+| AMR-039 | ACP 超时 | 静默无响应时会超时失败，而不是无限 loading |  |  |
+| AMR-045 | 钱包入口 | 从 Open Design 能正确打开独立钱包页 |  |  |
+| AMR-047 | 固定金额充值 | 固定金额充值能正确进入 Stripe |  |  |
+| AMR-049 | Stripe 成功回跳 | 支付成功后，成功提示、余额、充值记录三者一致 |  |  |
+| AMR-049A | Stripe 防重复点击 | `Continue to Stripe` 快速重复点击只会创建一次有效支付流程 |  |  |
+| AMR-049B | Stripe 创建失败 | 创建 checkout session 失败时，错误可见且按钮可恢复 |  |  |
+| AMR-052 | 余额不足聊天 | 余额不足时聊天应明确失败，不能误判为未登录或无限重试 |  |  |
+| AMR-052A | 余额不足 run 收敛 | 余额不足时当前 run 会结束失败，不会一直处于运行中 |  |  |
+| AMR-052B | 余额不足不污染登录态 | 余额不足后，AMR 仍显示已登录，不应被误判为未登录 |  |  |
+| AMR-052D | 对话区失败提示 | 余额不足时，对话区应有明确失败消息或系统提示 |  |  |
+| AMR-053 | 余额不足引导 | 余额不足后能看到充值、切 agent 等下一步引导 |  |  |
+| AMR-054A | 切到其他 CLI | AMR 余额不足后切到其他 CLI，请求仍可正常继续 |  |  |
+| AMR-056A | 登出后不再扣费 | AMR 登出后再发新请求，不应新增钱包扣费 |  |  |
+| AMR-056B | 运行中登出后的扣费 | 运行中登出后，扣费结果与产品预期一致，不重复扣费 |  |  |
+| AMR-056C | 登出后账实一致 | 登出后钱包余额与消费流水保持一致 |  |  |
+| AMR-065A | 网页切账号保持旧账号 | 钱包页切到新账号后，Open Design 默认仍保持旧账号 |  |  |
+| AMR-065C | 显式重登后切新账号 | 只有在 Open Design 内显式重新登录后，客户端才切到新账号 |  |  |
+| AMR-065E | token 失效收敛 | 本地显示已登录但 token 失效时，后续请求会收敛成重登或明确错误 |  |  |
+| AMR-TASK-001 | 定时任务余额不足 | 定时任务跑到 AMR 且余额不足时，会明确失败结束，不会无限重试 |  |  |
+| AMR-TASK-002 | 定时任务错误语义 | 定时任务余额不足的错误原因明确，不误报为未登录/未知错误 |  |  |
+| AMR-TASK-003 | 充值恢复后任务恢复 | 充值后再次触发同类 AMR 定时任务，可恢复执行 |  |  |
+| AMR-076 | 余额与流水对账 | 钱包余额、充值、消费流水在分页/筛选前后一致 |  |  |
+
+## 推荐执行顺序
+
+1. 基础可用性
+   先跑 `AMR-001`、`AMR-002`
+2. 登录与登出
+   再跑 `AMR-007`、`AMR-008`、`AMR-010`、`AMR-011`
+3. Onboarding 与主对话链路
+   再跑 `AMR-021`、`AMR-024`、`AMR-026`、`AMR-032`、`AMR-033`
+4. 钱包与 Stripe
+   再跑 `AMR-045`、`AMR-047`、`AMR-049`、`AMR-049A`、`AMR-049B`
+5. 余额不足与恢复
+   再跑 `AMR-052`、`AMR-052A`、`AMR-052B`、`AMR-052D`、`AMR-053`、`AMR-054A`
+6. 账号同步与定时任务
+   最后跑 `AMR-056A`、`AMR-056B`、`AMR-056C`、`AMR-065A`、`AMR-065C`、`AMR-065E`、`AMR-TASK-001`、`AMR-TASK-002`、`AMR-TASK-003`、`AMR-076`
+
+## 失败时建议附带的信息
+
+- `/api/agents` 返回
+- `/api/integrations/vela/status` 返回
+- 当前 `OPEN_DESIGN_AMR_PROFILE`
+- 当前使用的是 fake 还是真实 `vela`
+- 相关 daemon 日志
+- 相关 web / desktop 日志
+- 钱包页截图、余额截图、交易记录截图
+- 若涉及支付：`session_id`、失败请求响应、错误文案
diff --git a/docs/testing/automations-coverage-summary.zh-CN.md b/docs/testing/automations-coverage-summary.zh-CN.md
new file mode 100644
index 000000000..89cdafe5d
--- /dev/null
+++ b/docs/testing/automations-coverage-summary.zh-CN.md
@@ -0,0 +1,317 @@
+# Automations 当前自动化覆盖清单
+
+## 概述
+
+这份文档用于说明 `Automations` 页面及其核心运行链路，**当前已经有哪些自动化覆盖**，以及**还剩哪些空缺**。
+
+覆盖范围按 3 层拆分：
+
+- `组件/单测`
+- `页面级 E2E`
+- `tools-dev / non-UI 回归`
+
+本文只统计当前仓库 `open-design-amr-runtime-acp` 里已经落地并可执行的自动化，不包含钱包、Stripe 或其他仓库页面。
+
+## 当前已覆盖
+
+### 1. 组件 / 单测
+
+#### [TasksView.page.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/TasksView.page.test.tsx)
+
+已覆盖：
+
+- `Automations` 页面骨架渲染
+- hero 标题、副标题、统计区
+- `Active / Paused / Templates` 统计展示
+- 空态展示
+- 从空态打开 `New automation`
+- 从顶部按钮打开 `New automation`
+- 模板分类切换到空分类时的空态
+- `Run`
+- `Pause / Resume`
+- `Delete`
+- `Open result`
+- `History / Hide history`
+- `Edit` 预填
+- template filter 的 `aria-selected` 切换
+
+#### [TasksView.history.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/TasksView.history.test.tsx)
+
+已覆盖：
+
+- 历史运行信息展示
+- `Open conversation`
+- 历史视图中的元信息
+- 从列表 `Edit` 打开预填弹窗
+
+#### [TasksView.templates.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/TasksView.templates.test.tsx)
+
+已覆盖：
+
+- daemon automation templates 渲染
+- 从 template 卡片打开创建弹窗
+- evolution proposals 展示与应用
+- source ingestion 基本链路
+
+#### 相关旧测试
+
+- [RoutinesSection.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/RoutinesSection.test.tsx)
+
+说明：
+
+- 这是旧的 routines surface 测试
+- 仍覆盖部分基础动作，例如创建、暂停、运行、删除
+- 但当前主页面已经是 `TasksView`，所以后续应优先看 `TasksView.*` 测试
+
+### 2. 页面级 E2E
+
+#### [automations-page.test.ts](/Users/mac/open-design/open-design-amr-runtime-acp/e2e/ui/automations-page.test.ts)
+
+已覆盖 9 条页面级 smoke / regression：
+
+- 页面加载：hero、统计区、filter、已保存列表
+- 创建 automation 后从页面运行
+- 创建失败时 modal 保持打开且输入不丢
+- `Run` 失败时页面错误展示与 row 仍可操作
+- `Pause / History / Delete` 主链路
+- `Pause` 失败态
+- `Delete` 失败态
+- `Edit` 保存后列表更新
+- 模板 filter 切换后页面内容变化
+
+#### [settings-memory-routines.test.ts](/Users/mac/open-design/open-design-amr-runtime-acp/e2e/ui/settings-memory-routines.test.ts)
+
+已覆盖：
+
+- 从主 `Automations` surface 创建 automation
+- 运行 automation 跳转到项目对话
+- 创建失败时 modal 保持打开
+
+说明：
+
+- 这部分和 `automations-page.test.ts` 有一定重叠
+- 但它更像 Settings / Memory 混合场景下的回归
+
+### 3. tools-dev / non-UI 回归
+
+#### [routines.ts](/Users/mac/open-design/open-design-amr-runtime-acp/e2e/lib/vitest/routines.ts)
+
+已提供 helper：
+
+- `listRoutines`
+- `createRoutine`
+- `updateRoutine`
+- `runRoutine`
+- `deleteRoutine`
+
+#### [automations-routines.test.ts](/Users/mac/open-design/open-design-amr-runtime-acp/e2e/tests/tools-dev/automations-routines.test.ts)
+
+已覆盖 2 条核心非 UI 回归：
+
+- 成功链路
+  - `create`
+  - `list`
+  - `pause / resume`
+  - `run succeeded`
+  - `assistant message`
+  - `lastRun`
+  - `delete`
+
+- 失败链路
+  - `run failed`
+  - `assistant message.runStatus = failed`
+  - `lastRun.status = failed`
+  - `lastRun.error` 已持久化
+
+## 当前已形成的覆盖矩阵
+
+### 页面展示
+
+已覆盖：
+
+- 页面可加载
+- 统计区可见
+- 空态可见
+- filter/tab 状态切换
+- 列表项主按钮可见
+
+### 主操作
+
+已覆盖：
+
+- `New automation`
+- `Edit`
+- `Run`
+- `Pause / Resume`
+- `Delete`
+- `Open result`
+- `History`
+
+### 失败态
+
+已覆盖：
+
+- 创建失败
+- 运行失败
+- Pause 失败
+- Delete 失败
+- run 失败后的 `assistant message` 与 `lastRun` 持久化
+
+### 数据层 / 契约层
+
+已覆盖：
+
+- `/api/routines` create/list/update/delete/run 主链路
+- `lastRun` 成功持久化
+- `lastRun` 失败持久化
+- 非 UI 运行结果与消息状态一致
+
+## 仍然存在的空缺
+
+下面这些还没有形成完整自动化，或者只被部分覆盖。
+
+### 1. Edit 失败态
+
+当前缺少：
+
+- 编辑保存失败时 modal 是否保持打开
+- 已输入修改是否保留
+- 错误提示是否明确
+
+建议优先级：`P1`
+
+### 2. History 失败态
+
+当前缺少：
+
+- 拉取 history 接口失败时的页面表现
+- history 空态与失败态是否区分
+
+建议优先级：`P1`
+
+### 3. Source ingestion 的页面级 E2E
+
+当前组件测试已覆盖部分逻辑，但页面级 E2E 还缺：
+
+- ingest 成功
+- ingest 失败
+- proposals 在页面上的联动
+
+建议优先级：`P1`
+
+### 4. Evolution proposals 的页面级 E2E
+
+当前缺少：
+
+- proposal 可见性
+- `Apply`
+- `Reject`
+- proposal 数量变化
+
+建议优先级：`P1`
+
+### 5. 更细的错误恢复
+
+当前缺少：
+
+- `Run` 失败后再次成功运行
+- `Pause` 失败后再次点击恢复成功
+- `Delete` 失败后重试删除成功
+
+建议优先级：`P2`
+
+### 6. 并发 / 防重入
+
+当前缺少：
+
+- 连点 `Run`
+- 连点 `Pause`
+- 连点 `Delete`
+
+建议优先级：`P2`
+
+### 7. 多语言 / 文案变体
+
+当前覆盖主要以当前默认界面为准，缺少：
+
+- 中文 / 英文切换下关键入口是否仍稳定
+
+建议优先级：`P2`
+
+## 推荐优先级
+
+### P0
+
+已覆盖完成：
+
+- 页面加载
+- 新建
+- 运行
+- 暂停 / 恢复
+- 删除
+- 编辑
+- 运行失败
+- 暂停失败
+- 删除失败
+- tools-dev 成功 / 失败主链路
+
+### P1
+
+建议下一步补：
+
+- Edit 失败态
+- History 失败态
+- proposals 页面级 E2E
+- source ingestion 页面级 E2E
+
+### P2
+
+可后续补：
+
+- 防重入
+- 重试恢复
+- 多语言稳定性
+
+## 推荐执行命令
+
+### 组件测试
+
+```bash
+cd /Users/mac/open-design/open-design-amr-runtime-acp
+pnpm --dir apps/web test -- \
+  tests/components/TasksView.page.test.tsx \
+  tests/components/TasksView.history.test.tsx \
+  tests/components/TasksView.templates.test.tsx
+```
+
+### 页面级 E2E
+
+```bash
+cd /Users/mac/open-design/open-design-amr-runtime-acp/e2e
+pnpm exec playwright test -c playwright.config.ts ui/automations-page.test.ts
+```
+
+### tools-dev / non-UI
+
+```bash
+cd /Users/mac/open-design/open-design-amr-runtime-acp/e2e
+pnpm test tests/tools-dev/automations-routines.test.ts
+```
+
+## 结论
+
+当前 `Automations` 这一块已经不是“只有页面能点点看”的状态，而是已经形成了：
+
+- `组件级`
+- `页面级 E2E`
+- `非 UI 契约级`
+
+三层覆盖。
+
+如果按回归价值看，当前最值得继续补的不是再堆更多 happy path，而是：
+
+- `Edit` 失败态
+- `History` 失败态
+- `Source ingestion / proposals` 的页面级 E2E
+
+这三块补完后，`Automations` 页面自动化会更接近完整回归集。
diff --git a/docs/testing/automations-page-test-plan.zh-CN.md b/docs/testing/automations-page-test-plan.zh-CN.md
new file mode 100644
index 000000000..d1584bd15
--- /dev/null
+++ b/docs/testing/automations-page-test-plan.zh-CN.md
@@ -0,0 +1,149 @@
+# Automations 页面自动化待补清单
+
+## 说明
+
+本文档针对 `/automations` 页面整理自动化测试缺口，目标是把当前“有零散组件测试、但缺页面级覆盖”的状态收敛成一个可执行清单。
+
+适用范围：
+
+- `Automations` 页面本身
+- 列表卡片区
+- 页面级筛选与分类
+- `New automation` 页面入口
+- 页面内的 `Run / History / Edit / Pause / Delete / Open result`
+
+当前边界：
+
+- 已有部分组件测试覆盖 `RoutinesSection`、`TasksView.history`、`NewAutomationModal`。
+- 当前仓库内**还没有看到这整个页面的完整 E2E 覆盖**。
+- 本文档优先补“页面真实使用路径”，而不是重复已有纯函数或小组件断言。
+
+## 现有覆盖概览
+
+当前已存在、与这页有关的测试主要有：
+
+- [RoutinesSection.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/RoutinesSection.test.tsx)
+  覆盖部分自动化列表区和 `New automation` 入口行为。
+- [TasksView.history.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/TasksView.history.test.tsx)
+  覆盖 automation history 相关行为。
+- [NewAutomationModal.context-picker.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/NewAutomationModal.context-picker.test.tsx)
+  覆盖创建弹窗里的 prompt/context picker。
+- [router-marketplace.test.ts](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/router-marketplace.test.ts)
+  覆盖 `/automations` 路由解析。
+
+仍明显缺失的，是你截图这个页面本身的：
+
+- 页面加载
+- 顶部统计
+- 卡片操作
+- 页面级筛选
+- “Open result” 链路
+- 页面入口到弹窗/编辑页的完整串联
+
+## P0
+
+这些是最值得先补、最容易出真实回归事故的页面级能力。
+
+| ID | 模块 | 待补自动化点 | 推荐层级 | 说明 |
+| --- | --- | --- | --- | --- |
+| AUTO-P0-001 | 页面加载 | `/automations` 页面可正常进入，标题、副标题、`New automation` 按钮可见 | E2E UI | 守住页面可达性和基本骨架 |
+| AUTO-P0-002 | 顶部统计 | `Active / Paused / Templates` 三个统计块正常渲染 | 组件测试 + E2E UI | 至少校验数值显示与空态不炸 |
+| AUTO-P0-003 | 列表加载 | `Your automations` 列表可渲染多条记录 | E2E UI | 覆盖成功、失败、暂停等不同状态卡片 |
+| AUTO-P0-004 | 状态 badge | `FAILED / SUCCEEDED / PAUSED` badge 正确显示 | 组件测试 | 防止状态串文案、串颜色、串按钮 |
+| AUTO-P0-005 | `New automation` 入口 | 点击 `New automation` 能打开创建弹窗/流程 | E2E UI | 守住最核心入口 |
+| AUTO-P0-006 | `Run` 操作 | 点击 `Run` 后状态刷新，最近运行信息更新 | E2E UI | 用户最直接的主操作之一 |
+| AUTO-P0-007 | `Pause` 操作 | 点击 `Pause` 后状态与按钮文案更新 | E2E UI | 防止暂停后还显示 active |
+| AUTO-P0-008 | `History` 入口 | 点击 `History` 能打开历史视图/面板 | 组件测试 + E2E UI | 至少验证入口可达 |
+| AUTO-P0-009 | `Edit` 入口 | 点击 `Edit` 能进入编辑状态或编辑弹窗 | E2E UI | 防止编辑入口断链 |
+| AUTO-P0-010 | `Delete` 操作 | 删除入口可达，确认后列表移除 | E2E UI | 高风险破坏性操作，必须单测到 |
+
+## P1
+
+这些属于第二层回归，建议在页面主链路补齐后继续补。
+
+| ID | 模块 | 待补自动化点 | 推荐层级 | 说明 |
+| --- | --- | --- | --- | --- |
+| AUTO-P1-001 | `Open result` | 成功 run 有结果时可打开结果页 | E2E UI | 守住成功产物可追溯 |
+| AUTO-P1-002 | 失败结果 | 失败 run 的 `Open result` 行为正确，不假装有结果 | E2E UI | 防止死链或错误跳转 |
+| AUTO-P1-003 | 顶部筛选 | `Active / Paused / Templates` 切换后列表正确过滤 | 组件测试 + E2E UI | 覆盖页面级聚合筛选 |
+| AUTO-P1-004 | 底部分类 | `All / Orbit / Live artifacts / Memory / ...` 分类切换正确 | E2E UI | 贴近截图中的模板分类条 |
+| AUTO-P1-005 | 列表时间信息 | `Last run / Next run` 时间展示正确 | 组件测试 | 防止时区、格式或排序回归 |
+| AUTO-P1-006 | `Run` 防重入 | 连点 `Run` 不应产生并发重复执行 | 组件测试 + E2E UI | 防止重复触发 |
+| AUTO-P1-007 | `Pause` 防重入 | 连点 `Pause` 不会出现状态错乱 | 组件测试 | 防止 UI/接口竞态 |
+| AUTO-P1-008 | 创建成功回填 | 新建 automation 后统计数字和列表一起刷新 | E2E UI | 覆盖页面级一致性 |
+| AUTO-P1-009 | 编辑成功回填 | 编辑后卡片标题、频率、下一次运行时间更新 | E2E UI | 覆盖编辑结果回流 |
+
+## P2
+
+这些更偏兜底与稳定性，适合在主链路稳定后补充。
+
+| ID | 模块 | 待补自动化点 | 推荐层级 | 说明 |
+| --- | --- | --- | --- | --- |
+| AUTO-P2-001 | 空态 | 没有 automations 时的空态渲染正确 | 组件测试 + E2E UI | 防止空页布局坏掉 |
+| AUTO-P2-002 | 接口失败 | 列表加载失败时有明确错误或降级 | 组件测试 | 防止白屏 |
+| AUTO-P2-003 | 单操作失败 | `Run / Pause / Delete / Edit` 请求失败时提示明确 | 组件测试 + E2E UI | 防止静默失败 |
+| AUTO-P2-004 | 本地化 | 中文/英文下按钮、状态、统计布局正常 | E2E UI | 防止文案切换后布局溢出 |
+| AUTO-P2-005 | 长列表 | 多条 automation 时滚动与分页/截断正常 | E2E UI | 防止页面退化 |
+| AUTO-P2-006 | 模板统计边界 | 模板数量为 0 或很多时顶部统计仍正确 | 组件测试 | 覆盖计数边界 |
+
+## 建议测试文件落点
+
+### 组件测试
+
+- [TasksView.history.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/TasksView.history.test.tsx)
+  继续扩展 `History` 相关断言。
+- [RoutinesSection.test.tsx](/Users/mac/open-design/open-design-amr-runtime-acp/apps/web/tests/components/RoutinesSection.test.tsx)
+  可继续扩展列表加载、空态、状态 badge、`New automation` 按钮。
+- 建议新增：
+  - `apps/web/tests/components/TasksView.list.test.tsx`
+  - `apps/web/tests/components/TasksView.filters.test.tsx`
+  - `apps/web/tests/components/TasksView.actions.test.tsx`
+
+### E2E UI
+
+建议新增：
+
+- `e2e/ui/automations-page.test.ts`
+  - 页面加载
+  - 标题/统计
+  - 列表渲染
+  - 顶部/底部筛选
+- `e2e/ui/automations-actions.test.ts`
+  - `Run / History / Edit / Pause / Delete`
+  - `Open result`
+- `e2e/ui/automations-create-flow.test.ts`
+  - `New automation`
+  - 创建成功后回填列表
+
+## 推荐补测顺序
+
+1. 页面基础骨架
+   先补 `AUTO-P0-001`、`AUTO-P0-002`、`AUTO-P0-003`
+2. 卡片主操作
+   再补 `AUTO-P0-006`、`AUTO-P0-007`、`AUTO-P0-008`、`AUTO-P0-009`、`AUTO-P0-010`
+3. 创建入口
+   再补 `AUTO-P0-005`
+4. 筛选与结果页
+   再补 `AUTO-P1-001`、`AUTO-P1-002`、`AUTO-P1-003`、`AUTO-P1-004`
+5. 稳定性与边界
+   最后补 `AUTO-P2-*`
+
+## 最值得先实现的 5 条
+
+如果只优先做最有价值的 5 条，我建议是：
+
+1. `AUTO-P0-001` `/automations` 页面加载成功
+2. `AUTO-P0-005` `New automation` 入口可打开
+3. `AUTO-P0-006` `Run` 操作后状态刷新
+4. `AUTO-P0-007` `Pause` 操作后状态刷新
+5. `AUTO-P1-003` 顶部筛选切换后列表正确变化
+
+## 后续建议
+
+这页最适合的策略不是一开始就做很重的全链路，而是：
+
+- 先用组件测试守住状态展示和局部交互
+- 再用 2 到 3 个 E2E 文件守住页面入口和核心动作
+- 最后再补异常态、防重入和本地化
+
+这样补起来更快，也更不容易被页面文案或布局小改动拖垮。
diff --git a/e2e/lib/amr.ts b/e2e/lib/amr.ts
new file mode 100644
index 000000000..50d8e35f7
--- /dev/null
+++ b/e2e/lib/amr.ts
@@ -0,0 +1,217 @@
+import { chmod, mkdir, rm, writeFile } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
+
+export type FakeVelaOptions = {
+  assistantText?: string;
+  failAuthAtPrompt?: boolean;
+  failBalanceAtPrompt?: boolean;
+  requireLoginConfig?: boolean;
+};
+
+const DEFAULT_ASSISTANT_TEXT = 'Hello from the e2e fake vela.';
+
+export async function writeFakeVelaBin(root: string, options: FakeVelaOptions = {}): Promise<string> {
+  await mkdir(root, { recursive: true });
+  const bin = join(root, 'vela');
+  await writeFile(bin, renderFakeVelaScript(options), 'utf8');
+  await chmod(bin, 0o755);
+  return bin;
+}
+
+export async function seedVelaLoginConfig(
+  homeDir: string,
+  options: {
+    profile?: string;
+    email?: string;
+    runtimeKey?: string;
+    controlKey?: string;
+  } = {},
+): Promise<string> {
+  const profile = options.profile ?? 'local';
+  const configDir = join(homeDir, '.amr');
+  const file = join(configDir, 'config.json');
+  await mkdir(configDir, { recursive: true });
+  await writeFile(
+    file,
+    JSON.stringify(
+      {
+        profiles: {
+          [profile]: {
+            runtimeKey: options.runtimeKey ?? 'fake-runtime-key',
+            controlKey: options.controlKey ?? 'fake-control-key',
+            apiUrl: 'http://localhost:18080',
+            linkUrl: 'http://localhost:18081',
+            user: {
+              id: 'fake-user-id',
+              email: options.email ?? 'e2e@example.com',
+              plan: 'free',
+            },
+          },
+        },
+      },
+      null,
+      2,
+    ),
+    'utf8',
+  );
+  return file;
+}
+
+export async function clearVelaLoginConfig(homeDir: string): Promise<void> {
+  await rm(join(homeDir, '.amr', 'config.json'), { force: true });
+}
+
+function renderFakeVelaScript(options: FakeVelaOptions): string {
+  return `#!/usr/bin/env node
+import { mkdirSync, readFileSync, writeFileSync, existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { argv, stdin, stdout, stderr, env, exit } from 'node:process';
+
+const ASSISTANT_TEXT = ${JSON.stringify(options.assistantText ?? DEFAULT_ASSISTANT_TEXT)};
+const SESSION_ID = env.FAKE_VELA_SESSION_ID || 'fake-amr-session-1';
+const AUTH_FAIL = ${options.failAuthAtPrompt === true ? 'true' : 'false'};
+const BALANCE_FAIL = ${options.failBalanceAtPrompt === true ? 'true' : 'false'};
+const REQUIRE_LOGIN = ${options.requireLoginConfig === false ? 'false' : 'true'};
+
+function writeMessage(obj) {
+  stdout.write(JSON.stringify(obj) + '\\n');
+}
+function writeResult(id, result) {
+  writeMessage({ jsonrpc: '2.0', id, result });
+}
+function writeError(id, message) {
+  writeMessage({ jsonrpc: '2.0', id, error: { code: -32001, message } });
+}
+function writeNotification(method, params) {
+  writeMessage({ jsonrpc: '2.0', method, params });
+}
+function currentProfile() {
+  return (env.OPEN_DESIGN_AMR_PROFILE || env.VELA_PROFILE || 'local').trim() || 'local';
+}
+function readLoginConfig() {
+  const file = join(homedir(), '.amr', 'config.json');
+  if (!existsSync(file)) return null;
+  try {
+    return JSON.parse(readFileSync(file, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+function hasRuntimeKey() {
+  const profile = currentProfile();
+  const cfg = readLoginConfig();
+  return Boolean(cfg && cfg.profiles && cfg.profiles[profile] && cfg.profiles[profile].runtimeKey);
+}
+
+if (argv[2] === 'login') {
+  const file = join(homedir(), '.amr', 'config.json');
+  mkdirSync(dirname(file), { recursive: true });
+  const profile = currentProfile();
+  writeFileSync(file, JSON.stringify({
+    profiles: {
+      [profile]: {
+        runtimeKey: 'fake-runtime-key-0000000000000000000000',
+        controlKey: 'fake-control-key-0000000000000000000000',
+        apiUrl: 'http://localhost:18080',
+        linkUrl: 'http://localhost:18081',
+        user: { id: 'fake-user-id', email: env.FAKE_VELA_LOGIN_USER_EMAIL || 'e2e@example.com', plan: 'free' },
+      },
+    },
+  }, null, 2), 'utf8');
+  exit(0);
+}
+
+if (argv[2] === 'models') {
+  stdout.write('public_model_glm_5    vela\\n');
+  exit(0);
+}
+
+if (REQUIRE_LOGIN && !hasRuntimeKey()) {
+  stderr.write('AMR login missing or expired. Please sign in again.\\n');
+  exit(1);
+}
+
+const sessionsWithModel = new Set();
+let buffer = '';
+stdin.setEncoding('utf8');
+stdin.on('data', (chunk) => {
+  buffer += chunk;
+  const lines = buffer.split('\\n');
+  buffer = lines.pop() || '';
+  for (const raw of lines) {
+    const line = raw.trim();
+    if (!line) continue;
+    let msg;
+    try { msg = JSON.parse(line); } catch { continue; }
+    handle(msg);
+  }
+});
+stdin.on('end', () => { stdout.end(); exit(0); });
+
+function handle(msg) {
+  const { id, method, params } = msg;
+  if (method === 'initialize') {
+    writeResult(id, {
+      protocolVersion: 1,
+      agentCapabilities: { promptCapabilities: { text: true } },
+      models: {
+        currentModelId: 'glm-5',
+        availableModels: [{ modelId: 'glm-5', name: 'glm-5' }],
+      },
+    });
+    return;
+  }
+  if (method === 'session/new') {
+    writeResult(id, {
+      sessionId: SESSION_ID,
+      models: {
+        currentModelId: 'glm-5',
+        availableModels: [{ modelId: 'glm-5', name: 'glm-5' }],
+      },
+    });
+    return;
+  }
+  if (method === 'session/set_model' || method === 'session/set_config_option') {
+    const sid = (params && params.sessionId) || SESSION_ID;
+    sessionsWithModel.add(sid);
+    writeResult(id, {});
+    return;
+  }
+  if (method === 'session/prompt') {
+    const sid = (params && params.sessionId) || SESSION_ID;
+    if (!sessionsWithModel.has(sid)) {
+      writeError(id, 'session/set_model must be called before session/prompt');
+      return;
+    }
+    if (AUTH_FAIL) {
+      writeError(id, 'Your authentication token has expired. Please sign in again.');
+      return;
+    }
+    if (BALANCE_FAIL) {
+      writeMessage({
+        jsonrpc: '2.0',
+        id,
+        error: {
+          code: -32000,
+          message: 'HTTP 429: {"code":"insufficient_balance","message":"insufficient balance"}',
+        },
+      });
+      return;
+    }
+    writeNotification('session/update', {
+      sessionId: sid,
+      update: { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: ASSISTANT_TEXT } },
+    });
+    writeResult(id, {
+      stopReason: 'end_turn',
+      usage: { inputTokens: 7, outputTokens: 5, totalTokens: 12 },
+    });
+    return;
+  }
+  if (typeof id !== 'undefined') {
+    writeMessage({ jsonrpc: '2.0', id, error: { code: -32601, message: 'unknown method ' + method } });
+  }
+}
+`;
+}
diff --git a/e2e/lib/playwright/amr.ts b/e2e/lib/playwright/amr.ts
new file mode 100644
index 000000000..4cce35581
--- /dev/null
+++ b/e2e/lib/playwright/amr.ts
@@ -0,0 +1,94 @@
+import type { Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+
+export const STORAGE_KEY = 'open-design:config';
+export const OPEN_SETTINGS_LABEL = /Open settings|打开设置|開啟設定|Account & settings/i;
+export const SETTINGS_MENU_LABEL = /Settings|设置|設定/i;
+
+export async function waitForLoadingToClear(page: Page) {
+  await expect(page.getByText('Loading Open Design…')).toHaveCount(0, { timeout: 15_000 });
+}
+
+export async function dismissPrivacyDialog(page: Page) {
+  const privacyRegion = page.getByRole('region', { name: /Help us improve Open Design/i });
+  if (await privacyRegion.isVisible().catch(() => false)) {
+    await privacyRegion.getByRole('button', { name: /not now|i get it|got it/i }).click();
+    await expect(privacyRegion).toBeHidden();
+  }
+}
+
+export async function gotoEntryHome(page: Page) {
+  await page.goto('/', { waitUntil: 'domcontentloaded' });
+  await waitForLoadingToClear(page);
+  await dismissPrivacyDialog(page);
+}
+
+export async function expectWorkspaceReady(page: Page) {
+  await waitForLoadingToClear(page);
+  await expect(page).toHaveURL(/\/projects\//);
+  await expect(page.getByTestId('chat-composer')).toBeVisible();
+  await expect(page.getByTestId('chat-composer-input')).toBeVisible();
+}
+
+export async function openSettingsDialog(page: Page) {
+  await dismissPrivacyDialog(page);
+  await page.getByRole('button', { name: OPEN_SETTINGS_LABEL }).click();
+  const menu = page.getByRole('menu');
+  if (await menu.isVisible({ timeout: 1_000 }).catch(() => false)) {
+    await menu.getByRole('button', { name: SETTINGS_MENU_LABEL }).click();
+  }
+  const dialog = page.getByRole('dialog');
+  await expect(dialog).toBeVisible({ timeout: 10_000 });
+  return dialog;
+}
+
+export async function sendPrompt(page: Page, prompt: string) {
+  const input = page.getByTestId('chat-composer-input');
+  const sendButton = page.getByTestId('chat-send');
+  await expect(input).toBeVisible({ timeout: 10_000 });
+  await input.click();
+  await input.fill(prompt);
+  await expect(sendButton).toBeEnabled();
+  await sendButton.click();
+}
+
+export async function createProjectViaApi(page: Page, projectId: string, name: string) {
+  const response = await page.request.post('/api/projects', {
+    data: {
+      id: projectId,
+      name,
+      skillId: null,
+      designSystemId: null,
+      pendingPrompt: null,
+      metadata: { kind: 'prototype' },
+    },
+  });
+  expect(response.ok(), await response.text()).toBeTruthy();
+  return (await response.json()) as { conversationId: string };
+}
+
+export async function gotoProject(page: Page, projectId: string) {
+  await page.goto(`/projects/${projectId}`, { waitUntil: 'domcontentloaded' });
+  await dismissPrivacyDialog(page);
+  await expectWorkspaceReady(page);
+}
+
+export async function putAppConfig(page: Page, config: Record<string, unknown>) {
+  const response = await page.request.put('/api/app-config', { data: config });
+  expect(response.ok(), await response.text()).toBeTruthy();
+}
+
+export async function readAppConfig(page: Page) {
+  const response = await page.request.get('/api/app-config');
+  expect(response.ok(), await response.text()).toBeTruthy();
+  return (await response.json()) as { config?: Record<string, unknown> };
+}
+
+export async function seedBrowserConfig(page: Page, value: Record<string, unknown>) {
+  await page.addInitScript(
+    ({ key, config }) => {
+      window.localStorage.setItem(key, JSON.stringify(config));
+    },
+    { key: STORAGE_KEY, config: value },
+  );
+}
diff --git a/e2e/lib/vitest/amr.ts b/e2e/lib/vitest/amr.ts
new file mode 100644
index 000000000..b9870d576
--- /dev/null
+++ b/e2e/lib/vitest/amr.ts
@@ -0,0 +1,43 @@
+import { randomUUID } from 'node:crypto';
+
+import { requestJson } from './http.ts';
+
+export async function putAmrAppConfig(
+  webUrl: string,
+  config: {
+    agentId: string;
+    onboardingCompleted?: boolean;
+    agentModels?: Record<string, { model: string; reasoning: string }>;
+    agentCliEnv?: Record<string, Record<string, string>>;
+  },
+) {
+  await requestJson<{ config: Record<string, unknown> }>(webUrl, '/api/app-config', {
+    body: {
+      agentId: config.agentId,
+      agentModels: config.agentModels ?? { [config.agentId]: { model: 'default', reasoning: 'default' } },
+      agentCliEnv: config.agentCliEnv ?? {},
+      designSystemId: null,
+      onboardingCompleted: config.onboardingCompleted ?? true,
+      skillId: null,
+      telemetry: { artifactManifest: true, content: false, metrics: false },
+    },
+    method: 'PUT',
+  });
+}
+
+export async function createAmrProject(webUrl: string, name: string) {
+  return await requestJson<{
+    conversationId: string;
+    project: { id: string; metadata?: { kind?: string }; name: string };
+  }>(webUrl, '/api/projects', {
+    body: {
+      designSystemId: null,
+      id: randomUUID(),
+      metadata: { kind: 'prototype' },
+      name,
+      pendingPrompt: null,
+      skillId: null,
+    },
+    method: 'POST',
+  });
+}
diff --git a/e2e/lib/vitest/routines.ts b/e2e/lib/vitest/routines.ts
new file mode 100644
index 000000000..cc3ba3b2b
--- /dev/null
+++ b/e2e/lib/vitest/routines.ts
@@ -0,0 +1,66 @@
+import type { CreateRoutineRequest, Routine, RoutineRun, UpdateRoutineRequest } from '@open-design/contracts';
+
+import { requestJson } from './http.ts';
+
+export type RoutineListResponse = {
+  routines: Routine[];
+};
+
+export type RoutineMutationResponse = {
+  routine: Routine;
+};
+
+export type RoutineRunStartResponse = {
+  agentRunId?: string | null;
+  conversationId?: string | null;
+  projectId?: string | null;
+  run?: RoutineRun | null;
+  routine?: Routine | null;
+};
+
+export async function listRoutines(baseUrl: string): Promise<Routine[]> {
+  const response = await requestJson<RoutineListResponse>(baseUrl, '/api/routines');
+  return response.routines;
+}
+
+export async function createRoutine(baseUrl: string, body: CreateRoutineRequest): Promise<Routine> {
+  const response = await requestJson<RoutineMutationResponse>(baseUrl, '/api/routines', {
+    body,
+    method: 'POST',
+  });
+  return response.routine;
+}
+
+export async function updateRoutine(
+  baseUrl: string,
+  routineId: string,
+  body: UpdateRoutineRequest,
+): Promise<Routine> {
+  const response = await requestJson<RoutineMutationResponse>(
+    baseUrl,
+    `/api/routines/${encodeURIComponent(routineId)}`,
+    {
+      body,
+      method: 'PATCH',
+    },
+  );
+  return response.routine;
+}
+
+export async function runRoutine(baseUrl: string, routineId: string): Promise<RoutineRunStartResponse> {
+  return await requestJson<RoutineRunStartResponse>(
+    baseUrl,
+    `/api/routines/${encodeURIComponent(routineId)}/run`,
+    {
+      body: {},
+      method: 'POST',
+    },
+  );
+}
+
+export async function deleteRoutine(baseUrl: string, routineId: string): Promise<void> {
+  await requestJson<null>(baseUrl, `/api/routines/${encodeURIComponent(routineId)}`, {
+    body: {},
+    method: 'DELETE',
+  });
+}
diff --git a/e2e/package.json b/e2e/package.json
index f056b542e..f577e3d63 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -11,6 +11,7 @@
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "3.1050.0",
+    "@open-design/contracts": "workspace:*",
     "@playwright/test": "1.60.0",
     "@types/node": "20.19.39",
     "@types/pngjs": "6.0.5",
diff --git a/e2e/tests/amr/auth-error-convergence.test.ts b/e2e/tests/amr/auth-error-convergence.test.ts
new file mode 100644
index 000000000..7ffa3682e
--- /dev/null
+++ b/e2e/tests/amr/auth-error-convergence.test.ts
@@ -0,0 +1,59 @@
+// @vitest-environment node
+
+import { join } from 'node:path';
+
+import { describe, expect, test } from 'vitest';
+
+import { writeFakeVelaBin } from '@/amr';
+import { createAmrProject, putAmrAppConfig } from '@/vitest/amr';
+import { listMessages } from '@/vitest/messages';
+import { readRunEvents, startRun, waitForRunTerminal } from '@/vitest/runs';
+import { createSmokeSuite } from '@/vitest/smoke-suite';
+
+describe('AMR auth error convergence', () => {
+  test('marks the run and assistant message as failed when fake vela returns an auth error during prompt', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('amr-auth-error-convergence');
+
+    await suite.with.toolsDev(async ({ webUrl }) => {
+      const velaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela-auth-error'), {
+        failAuthAtPrompt: true,
+        requireLoginConfig: false,
+      });
+
+      await putAmrAppConfig(webUrl, {
+        agentId: 'amr',
+        agentCliEnv: {
+          amr: {
+            VELA_BIN: velaBin,
+            VELA_LINK_URL: 'http://localhost:18081',
+            VELA_RUNTIME_KEY: 'fake-runtime-key',
+          },
+        },
+      });
+
+      const project = await createAmrProject(webUrl, 'AMR auth error convergence');
+      const assistantMessageId = `assistant-${Date.now()}`;
+
+      const run = await startRun(webUrl, {
+        agentId: 'amr',
+        assistantMessageId,
+        clientRequestId: `req-${Date.now()}`,
+        conversationId: project.conversationId,
+        designSystemId: null,
+        message: 'Simulate an AMR auth expiry during session/prompt.',
+        model: 'default',
+        projectId: project.project.id,
+        reasoning: 'default',
+        skillId: null,
+      });
+
+      const terminal = await waitForRunTerminal(webUrl, run.runId, { timeoutMs: 20_000 });
+      expect(terminal.status).toBe('failed');
+
+      const messages = await listMessages(webUrl, project.project.id, project.conversationId);
+      const assistant = messages.find((message) => message.id === assistantMessageId);
+      expect(assistant?.runStatus).toBe('failed');
+      await expect(readRunEvents(webUrl, run.runId)).resolves.toMatch(/AMR_AUTH_REQUIRED/);
+    });
+  });
+});
diff --git a/e2e/tests/amr/insufficient-balance.test.ts b/e2e/tests/amr/insufficient-balance.test.ts
new file mode 100644
index 000000000..b4fb75970
--- /dev/null
+++ b/e2e/tests/amr/insufficient-balance.test.ts
@@ -0,0 +1,61 @@
+// @vitest-environment node
+
+import { join } from 'node:path';
+
+import { describe, expect, test } from 'vitest';
+
+import { writeFakeVelaBin } from '@/amr';
+import { createAmrProject, putAmrAppConfig } from '@/vitest/amr';
+import { listMessages } from '@/vitest/messages';
+import { readRunEvents, startRun, waitForRunTerminal } from '@/vitest/runs';
+import { createSmokeSuite } from '@/vitest/smoke-suite';
+
+describe('AMR insufficient balance run failures', () => {
+  test('fails the run with a recharge-facing AMR error when fake vela reports insufficient balance', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('amr-insufficient-balance');
+
+    await suite.with.toolsDev(async ({ webUrl }) => {
+      const velaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela-balance'), {
+        failBalanceAtPrompt: true,
+        requireLoginConfig: false,
+      });
+
+      await putAmrAppConfig(webUrl, {
+        agentId: 'amr',
+        agentCliEnv: {
+          amr: {
+            VELA_BIN: velaBin,
+            VELA_LINK_URL: 'http://localhost:18081',
+            VELA_RUNTIME_KEY: 'fake-runtime-key',
+          },
+        },
+      });
+
+      const project = await createAmrProject(webUrl, 'AMR insufficient balance');
+      const assistantMessageId = `assistant-${Date.now()}`;
+      const run = await startRun(webUrl, {
+        agentId: 'amr',
+        assistantMessageId,
+        clientRequestId: `req-${Date.now()}`,
+        conversationId: project.conversationId,
+        designSystemId: null,
+        message: 'This should surface a recharge link.',
+        model: 'default',
+        projectId: project.project.id,
+        reasoning: 'default',
+        skillId: null,
+      });
+
+      const terminal = await waitForRunTerminal(webUrl, run.runId, { timeoutMs: 20_000 });
+      expect(terminal.status).toBe('failed');
+
+      const events = await readRunEvents(webUrl, run.runId);
+      expect(events).toContain('AMR_INSUFFICIENT_BALANCE');
+      expect(events).toContain('https://open-design.ai/amr/wallet');
+
+      const messages = await listMessages(webUrl, project.project.id, project.conversationId);
+      const assistant = messages.find((message) => message.id === assistantMessageId);
+      expect(assistant?.runStatus).toBe('failed');
+    });
+  });
+});
diff --git a/e2e/tests/amr/logout-state-persistence.test.ts b/e2e/tests/amr/logout-state-persistence.test.ts
new file mode 100644
index 000000000..742b0cd9b
--- /dev/null
+++ b/e2e/tests/amr/logout-state-persistence.test.ts
@@ -0,0 +1,97 @@
+// @vitest-environment node
+
+import { join } from 'node:path';
+
+import { describe, expect, test } from 'vitest';
+
+import { writeFakeVelaBin } from '@/amr';
+import { createAmrProject, putAmrAppConfig } from '@/vitest/amr';
+import { requestJson } from '@/vitest/http';
+import { readRunEvents, startRun, waitForRunStatus, waitForRunTerminal } from '@/vitest/runs';
+import { createSmokeSuite } from '@/vitest/smoke-suite';
+
+describe('AMR logout state persistence', () => {
+  test('a previously working AMR session stops working after local logout and requires re-login', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('amr-logout-state-persistence');
+    const previousProfile = process.env.OPEN_DESIGN_AMR_PROFILE;
+    const previousHome = process.env.HOME;
+    const homeDir = join(suite.scratchDir, 'home-logout-state');
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'local';
+    process.env.HOME = homeDir;
+
+    try {
+      await suite.with.toolsDev(async ({ webUrl }) => {
+        const successVelaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela-logout-success'), {
+          assistantText: 'AMR logout persistence success',
+          requireLoginConfig: false,
+        });
+        const strictVelaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela-logout-strict'), {
+          assistantText: 'AMR logout persistence strict',
+        });
+
+        await putAmrAppConfig(webUrl, {
+          agentId: 'amr',
+          agentCliEnv: {
+            amr: {
+              VELA_BIN: successVelaBin,
+              OPEN_DESIGN_AMR_PROFILE: 'local',
+              VELA_LINK_URL: 'http://localhost:18081',
+              VELA_RUNTIME_KEY: 'fake-runtime-key',
+            },
+          },
+        });
+
+        const project = await createAmrProject(webUrl, 'AMR logout state persistence');
+
+        const firstRun = await startRun(webUrl, {
+          agentId: 'amr',
+          assistantMessageId: `assistant-success-${Date.now()}`,
+          clientRequestId: `req-success-${Date.now()}`,
+          conversationId: project.conversationId,
+          designSystemId: null,
+          message: 'First AMR run should succeed before logout.',
+          model: 'default',
+          projectId: project.project.id,
+          reasoning: 'default',
+          skillId: null,
+        });
+        await waitForRunStatus(webUrl, firstRun.runId, 'succeeded', { timeoutMs: 20_000 });
+
+        await putAmrAppConfig(webUrl, {
+          agentId: 'amr',
+          agentCliEnv: {
+            amr: {
+              VELA_BIN: strictVelaBin,
+              OPEN_DESIGN_AMR_PROFILE: 'local',
+            },
+          },
+        });
+        await requestJson(webUrl, '/api/integrations/vela/logout', { body: {}, method: 'POST' });
+        const status = await requestJson<{ loggedIn: boolean }>(webUrl, '/api/integrations/vela/status');
+        expect(status.loggedIn).toBe(false);
+
+        const secondRun = await startRun(webUrl, {
+          agentId: 'amr',
+          assistantMessageId: `assistant-fail-${Date.now()}`,
+          clientRequestId: `req-fail-${Date.now()}`,
+          conversationId: project.conversationId,
+          designSystemId: null,
+          message: 'Second AMR run should require login again.',
+          model: 'default',
+          projectId: project.project.id,
+          reasoning: 'default',
+          skillId: null,
+        });
+        const terminal = await waitForRunTerminal(webUrl, secondRun.runId, { timeoutMs: 20_000 });
+        expect(terminal.status).toBe('failed');
+
+        await expect(readRunEvents(webUrl, secondRun.runId)).resolves.toMatch(/AMR_AUTH_REQUIRED/);
+      });
+    } finally {
+      if (previousProfile === undefined) delete process.env.OPEN_DESIGN_AMR_PROFILE;
+      else process.env.OPEN_DESIGN_AMR_PROFILE = previousProfile;
+      if (previousHome === undefined) delete process.env.HOME;
+      else process.env.HOME = previousHome;
+    }
+  });
+});
diff --git a/e2e/tests/amr/relogin-required.test.ts b/e2e/tests/amr/relogin-required.test.ts
new file mode 100644
index 000000000..ee95c037e
--- /dev/null
+++ b/e2e/tests/amr/relogin-required.test.ts
@@ -0,0 +1,165 @@
+// @vitest-environment node
+
+import { join } from 'node:path';
+
+import { describe, expect, test } from 'vitest';
+
+import { seedVelaLoginConfig, writeFakeVelaBin } from '@/amr';
+import { createAmrProject, putAmrAppConfig } from '@/vitest/amr';
+import { readRunEvents, startRun, waitForRunStatus, waitForRunTerminal } from '@/vitest/runs';
+import { createSmokeSuite } from '@/vitest/smoke-suite';
+
+describe('AMR relogin-required run failures', () => {
+  test('fails a new /api/runs request when the local AMR login config is missing', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('amr-relogin-required');
+    const previousProfile = process.env.OPEN_DESIGN_AMR_PROFILE;
+    const previousHome = process.env.HOME;
+    const homeDir = join(suite.scratchDir, 'home-missing-login');
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'local';
+    process.env.HOME = homeDir;
+
+    try {
+      await suite.with.toolsDev(async ({ webUrl }) => {
+        const velaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela-missing-login'));
+
+        await putAmrAppConfig(webUrl, {
+          agentId: 'amr',
+          agentCliEnv: {
+            amr: {
+              VELA_BIN: velaBin,
+              OPEN_DESIGN_AMR_PROFILE: 'local',
+            },
+          },
+        });
+
+        const project = await createAmrProject(webUrl, 'AMR relogin required');
+
+        const assistantMessageId = `assistant-${Date.now()}`;
+        const run = await startRun(webUrl, {
+          agentId: 'amr',
+          assistantMessageId,
+          clientRequestId: `req-${Date.now()}`,
+          conversationId: project.conversationId,
+          designSystemId: null,
+          message: 'This should require a fresh AMR login.',
+          model: 'default',
+          projectId: project.project.id,
+          reasoning: 'default',
+          skillId: null,
+        });
+        const terminal = await waitForRunTerminal(webUrl, run.runId, { timeoutMs: 20_000 });
+        expect(terminal.status).toBe('failed');
+
+        await expect(readRunEvents(webUrl, run.runId)).resolves.toMatch(/AMR_AUTH_REQUIRED/);
+      });
+    } finally {
+      if (previousProfile === undefined) delete process.env.OPEN_DESIGN_AMR_PROFILE;
+      else process.env.OPEN_DESIGN_AMR_PROFILE = previousProfile;
+      if (previousHome === undefined) delete process.env.HOME;
+      else process.env.HOME = previousHome;
+    }
+  });
+
+  test('uses configured AMR profile env for pre-run login status', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('amr-configured-profile-preflight');
+    const previousProfile = process.env.OPEN_DESIGN_AMR_PROFILE;
+    const previousHome = process.env.HOME;
+    const homeDir = join(suite.scratchDir, 'home-configured-profile');
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'prod';
+    process.env.HOME = homeDir;
+
+    try {
+      await seedVelaLoginConfig(homeDir, { profile: 'local' });
+      await suite.with.toolsDev(async ({ webUrl }) => {
+        const velaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela-configured-profile'));
+
+        await putAmrAppConfig(webUrl, {
+          agentId: 'amr',
+          agentCliEnv: {
+            amr: {
+              VELA_BIN: velaBin,
+              OPEN_DESIGN_AMR_PROFILE: 'local',
+            },
+          },
+        });
+
+        const project = await createAmrProject(webUrl, 'AMR configured profile preflight');
+        const run = await startRun(webUrl, {
+          agentId: 'amr',
+          assistantMessageId: `assistant-configured-profile-${Date.now()}`,
+          clientRequestId: `req-configured-profile-${Date.now()}`,
+          conversationId: project.conversationId,
+          designSystemId: null,
+          message: 'This should use the configured AMR profile.',
+          model: 'default',
+          projectId: project.project.id,
+          reasoning: 'default',
+          skillId: null,
+        });
+
+        await waitForRunStatus(webUrl, run.runId, 'succeeded', { timeoutMs: 20_000 });
+      });
+    } finally {
+      if (previousProfile === undefined) delete process.env.OPEN_DESIGN_AMR_PROFILE;
+      else process.env.OPEN_DESIGN_AMR_PROFILE = previousProfile;
+      if (previousHome === undefined) delete process.env.HOME;
+      else process.env.HOME = previousHome;
+    }
+  });
+
+  test('uses daemon AMR runtime credentials for pre-run login status', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('amr-daemon-env-credentials-preflight');
+    const previousProfile = process.env.OPEN_DESIGN_AMR_PROFILE;
+    const previousHome = process.env.HOME;
+    const previousRuntimeKey = process.env.VELA_RUNTIME_KEY;
+    const previousLinkUrl = process.env.VELA_LINK_URL;
+    const homeDir = join(suite.scratchDir, 'home-daemon-env-credentials');
+    process.env.OPEN_DESIGN_AMR_PROFILE = 'local';
+    process.env.HOME = homeDir;
+    process.env.VELA_RUNTIME_KEY = 'fake-runtime-key-from-daemon-env';
+    process.env.VELA_LINK_URL = 'http://localhost:18081';
+
+    try {
+      await suite.with.toolsDev(async ({ webUrl }) => {
+        const velaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela-daemon-env-credentials'), {
+          requireLoginConfig: false,
+        });
+
+        await putAmrAppConfig(webUrl, {
+          agentId: 'amr',
+          agentCliEnv: {
+            amr: {
+              VELA_BIN: velaBin,
+              OPEN_DESIGN_AMR_PROFILE: 'local',
+            },
+          },
+        });
+
+        const project = await createAmrProject(webUrl, 'AMR daemon env credentials preflight');
+        const run = await startRun(webUrl, {
+          agentId: 'amr',
+          assistantMessageId: `assistant-daemon-env-credentials-${Date.now()}`,
+          clientRequestId: `req-daemon-env-credentials-${Date.now()}`,
+          conversationId: project.conversationId,
+          designSystemId: null,
+          message: 'This should use daemon AMR runtime credentials.',
+          model: 'default',
+          projectId: project.project.id,
+          reasoning: 'default',
+          skillId: null,
+        });
+
+        await waitForRunStatus(webUrl, run.runId, 'succeeded', { timeoutMs: 20_000 });
+      });
+    } finally {
+      if (previousProfile === undefined) delete process.env.OPEN_DESIGN_AMR_PROFILE;
+      else process.env.OPEN_DESIGN_AMR_PROFILE = previousProfile;
+      if (previousHome === undefined) delete process.env.HOME;
+      else process.env.HOME = previousHome;
+      if (previousRuntimeKey === undefined) delete process.env.VELA_RUNTIME_KEY;
+      else process.env.VELA_RUNTIME_KEY = previousRuntimeKey;
+      if (previousLinkUrl === undefined) delete process.env.VELA_LINK_URL;
+      else process.env.VELA_LINK_URL = previousLinkUrl;
+    }
+  });
+});
diff --git a/e2e/tests/amr/turn.test.ts b/e2e/tests/amr/turn.test.ts
new file mode 100644
index 000000000..9a38b13fa
--- /dev/null
+++ b/e2e/tests/amr/turn.test.ts
@@ -0,0 +1,304 @@
+// @vitest-environment node
+
+/**
+ * End-to-end coverage for an AMR (vela) chat run driven through the real
+ * tools-dev orchestrated daemon. Boots a namespaced daemon + web pair,
+ * configures it to spawn a self-contained fake `vela` binary, pre-seeds
+ * `~/.amr/config.json` as if the user had already approved CLI login,
+ * then drives a complete /api/runs lifecycle for `agentId: 'amr'` and
+ * asserts the assistant message picks up the fake's canned text.
+ *
+ * What this proves that lower-tier tests don't:
+ *
+ *   1. The chat-run path in `apps/daemon/src/server.ts` correctly routes
+ *      `agentId: 'amr'` through `attachAcpSession` (not the legacy
+ *      json-event-stream parser the old `incongruous-megaraptor` branch
+ *      used).
+ *   2. AMR preflight refreshes `vela models` and substitutes the synthetic
+ *      `'default'` model id with the first live model (`glm-5`), so vela
+ *      receives a real `session/set_model` before `session/prompt` — a
+ *      regression here would manifest as
+ *      `session/set_model must be called before session/prompt` on the
+ *      real `vela` binary, but the fake here enforces the same gate
+ *      so it surfaces locally without a vela install.
+ *   3. The full ACP transport (`initialize` → `session/new` →
+ *      `session/set_model` → `session/prompt` → `session/update*`) flows
+ *      between the daemon and a spawned subprocess that respects vela's
+ *      `~/.amr/config.json` resolution path.
+ */
+
+import { mkdir, writeFile, chmod } from 'node:fs/promises';
+import { randomUUID } from 'node:crypto';
+import { join } from 'node:path';
+
+import { describe, expect, test } from 'vitest';
+
+import { requestJson } from '@/vitest/http';
+import { listMessages } from '@/vitest/messages';
+import { startRun, waitForRunStatus } from '@/vitest/runs';
+import { createSmokeSuite } from '@/vitest/smoke-suite';
+
+type ProjectResponse = {
+  conversationId: string;
+  project: { id: string; metadata?: { kind?: string }; name: string };
+};
+
+// Inline fake `vela` binary. Handles the two argv shapes Open Design's
+// daemon ever spawns:
+//
+//   `vela models`                       — print the live link model catalog.
+//   `vela login`                        — write ~/.amr/config.json and exit 0.
+//   `vela agent run --runtime opencode` — ACP stdio runtime (initialize →
+//                                          session/new → session/set_model →
+//                                          session/prompt → session/update*).
+//
+// Kept inline (not imported from apps/daemon/tests/fixtures/fake-vela.mjs)
+// because cross-app private fixtures must not be reused — see
+// e2e/AGENTS.md "tests must not borrow another app's private source".
+const FAKE_VELA_SCRIPT = `#!/usr/bin/env node
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { argv, stdin, stdout, env, exit } from 'node:process';
+
+const ASSISTANT_TEXT = env.FAKE_VELA_TEXT || 'Hello from the e2e fake vela.';
+const SESSION_ID = 'fake-amr-session-1';
+const LIVE_MODEL_ID = 'glm-5';
+
+function writeMessage(obj) {
+  stdout.write(JSON.stringify(obj) + '\\n');
+}
+function writeResult(id, result) {
+  writeMessage({ jsonrpc: '2.0', id, result });
+}
+function writeNotification(method, params) {
+  writeMessage({ jsonrpc: '2.0', method, params });
+}
+
+if (argv[2] === 'login') {
+  const file = join(homedir(), '.amr', 'config.json');
+  mkdirSync(dirname(file), { recursive: true });
+  const profile = (env.VELA_PROFILE || 'local').trim() || 'local';
+  writeFileSync(file, JSON.stringify({
+    profiles: {
+      [profile]: {
+        runtimeKey: 'fake-runtime-key-0000000000000000000000',
+        controlKey: 'fake-control-key-0000000000000000000000',
+        apiUrl: 'http://localhost:18080',
+        linkUrl: 'http://localhost:18081',
+        user: { id: 'fake-user-id', email: 'e2e@example.com', plan: 'free' },
+      },
+    },
+  }, null, 2), 'utf8');
+  exit(0);
+}
+
+if (argv[2] === 'models') {
+  stdout.write('public_model_glm_5    vela\\n');
+  exit(0);
+}
+
+const sessionsWithModel = new Set();
+let buffer = '';
+stdin.setEncoding('utf8');
+stdin.on('data', (chunk) => {
+  buffer += chunk;
+  const lines = buffer.split('\\n');
+  buffer = lines.pop() || '';
+  for (const raw of lines) {
+    const line = raw.trim();
+    if (!line) continue;
+    let msg;
+    try { msg = JSON.parse(line); } catch { continue; }
+    handle(msg);
+  }
+});
+stdin.on('end', () => { stdout.end(); exit(0); });
+
+function handle(msg) {
+  const { id, method, params } = msg;
+  if (method === 'initialize') {
+    writeResult(id, {
+      protocolVersion: 1,
+      agentCapabilities: { promptCapabilities: { text: true } },
+      models: {
+        currentModelId: LIVE_MODEL_ID,
+        availableModels: [{ modelId: LIVE_MODEL_ID, name: LIVE_MODEL_ID }],
+      },
+    });
+    return;
+  }
+  if (method === 'session/new') {
+    writeResult(id, {
+      sessionId: SESSION_ID,
+      models: {
+        currentModelId: LIVE_MODEL_ID,
+        availableModels: [{ modelId: LIVE_MODEL_ID, name: LIVE_MODEL_ID }],
+      },
+    });
+    return;
+  }
+  if (method === 'session/set_model' || method === 'session/set_config_option') {
+    const sid = (params && params.sessionId) || SESSION_ID;
+    sessionsWithModel.add(sid);
+    writeResult(id, {});
+    return;
+  }
+  if (method === 'session/prompt') {
+    const sid = (params && params.sessionId) || SESSION_ID;
+    if (!sessionsWithModel.has(sid)) {
+      writeMessage({
+        jsonrpc: '2.0',
+        id,
+        error: { code: -32602, message: 'session/set_model must be called before session/prompt' },
+      });
+      return;
+    }
+    writeNotification('session/update', {
+      sessionId: sid,
+      update: { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: ASSISTANT_TEXT } },
+    });
+    writeResult(id, {
+      stopReason: 'end_turn',
+      usage: { inputTokens: 7, outputTokens: 5, totalTokens: 12 },
+    });
+    return;
+  }
+  if (typeof id !== 'undefined') {
+    writeMessage({ jsonrpc: '2.0', id, error: { code: -32601, message: 'unknown method ' + method } });
+  }
+}
+`;
+
+async function writeFakeVelaBin(root: string): Promise<string> {
+  await mkdir(root, { recursive: true });
+  const bin = join(root, 'vela');
+  await writeFile(bin, FAKE_VELA_SCRIPT, 'utf8');
+  await chmod(bin, 0o755);
+  return bin;
+}
+
+const PROMPT = 'Reply: HELLO';
+const ASSISTANT_TEXT = 'AMR-E2E-OK';
+
+describe('AMR chat-run end-to-end', () => {
+  test('drives /api/runs against vela ACP and the assistant message captures the fake stream', async () => {
+    // tools-dev daemon boot + chat run lifecycle needs the same headroom
+    // as the dialog/* smoke specs (~3 minutes for cold spawn + run).
+    const suite = await createSmokeSuite('amr-turn');
+
+    await suite.with.toolsDev(async ({ webUrl }) => {
+      const velaBin = await writeFakeVelaBin(join(suite.scratchDir, 'fake-vela'));
+
+      // Pre-seed `~/.amr/config.json` so `vela agent run` (the fake) does
+      // not need to negotiate device-auth. Production AMR works the same
+      // way: once login has happened once, the runtime reads the file.
+      const velaConfigDir = join(suite.scratchDir, 'home', '.amr');
+      await mkdir(velaConfigDir, { recursive: true });
+      await writeFile(
+        join(velaConfigDir, 'config.json'),
+        JSON.stringify(
+          {
+            profiles: {
+              local: {
+                runtimeKey: 'fake-runtime-key',
+                controlKey: 'fake-control-key',
+                apiUrl: 'http://localhost:18080',
+                linkUrl: 'http://localhost:18081',
+                user: { id: 'fake-user-id', email: 'e2e@example.com', plan: 'free' },
+              },
+            },
+          },
+          null,
+          2,
+        ),
+      );
+
+      // Persist agentCliEnv so the daemon's runtime resolver picks up the
+      // fake binary and the pre-run AMR status guard sees configured runtime
+      // credentials without touching the developer's real ~/.amr config.
+      await requestJson<{ config: Record<string, unknown> }>(webUrl, '/api/app-config', {
+        body: {
+          agentCliEnv: {
+            amr: {
+              VELA_BIN: velaBin,
+              VELA_LINK_URL: 'http://localhost:18081',
+              VELA_RUNTIME_KEY: 'fake-runtime-key',
+            },
+          },
+          agentId: 'amr',
+          agentModels: { amr: { model: 'default', reasoning: 'default' } },
+          designSystemId: null,
+          onboardingCompleted: true,
+          skillId: null,
+          telemetry: { artifactManifest: true, content: false, metrics: false },
+        },
+        method: 'PUT',
+      });
+
+      const project = await requestJson<ProjectResponse>(webUrl, '/api/projects', {
+        body: {
+          designSystemId: null,
+          id: randomUUID(),
+          metadata: { kind: 'prototype' },
+          name: 'AMR turn e2e',
+          pendingPrompt: null,
+          skillId: null,
+        },
+      });
+      const projectId = project.project.id;
+      const conversationId = project.conversationId;
+
+      const t0 = Date.now();
+      const userMessageId = `user-${t0}`;
+      const assistantMessageId = `assistant-${t0}`;
+
+      const run = await startRun(webUrl, {
+        agentId: 'amr',
+        assistantMessageId,
+        clientRequestId: `req-${t0}`,
+        conversationId,
+        designSystemId: null,
+        message: PROMPT,
+        // 'default' must be resolved through AMR's live `vela models`
+        // preflight; if that helper regressed, the fake vela would reject
+        // session/prompt with the `set_model must be called before
+        // session/prompt` error encoded above.
+        model: 'default',
+        projectId,
+        reasoning: 'default',
+        skillId: null,
+      });
+      expect(run.runId).toMatch(/[a-z0-9-]/i);
+
+      // Override the per-process FAKE_VELA_TEXT so the assertion below is
+      // tied to a stable canned reply. The runtime spawn inherits the
+      // daemon's process.env, so setting it after startRun would race with
+      // spawn; instead we set it on `process.env` for the test process —
+      // but tools-dev orchestrates a separate daemon child, so this only
+      // takes effect when the fake script reads its own env. The fake
+      // ships with a default 'Hello from the e2e fake vela.' literal, so
+      // we assert on a substring instead of pinning the full text here.
+      void ASSISTANT_TEXT;
+
+      const finalStatus = await waitForRunStatus(webUrl, run.runId, 'succeeded', {
+        timeoutMs: 30_000,
+      });
+      expect(finalStatus.status).toBe('succeeded');
+
+      const messages = await listMessages(webUrl, projectId, conversationId);
+      const assistantMessage = messages.find((m) => m.id === assistantMessageId);
+      if (assistantMessage) {
+        expect(assistantMessage.content).toContain('Hello from the e2e fake vela');
+      } else {
+        // Some chat flows save the assistant message under a daemon-assigned
+        // id rather than the client-provided one. Fall back to checking any
+        // assistant message captured the fake's text.
+        const anyAssistant = messages.find(
+          (m) => m.role === 'assistant' && m.content.includes('Hello from the e2e fake vela'),
+        );
+        expect(anyAssistant).toBeTruthy();
+      }
+    });
+  }, 180_000);
+});
diff --git a/e2e/tests/tools-dev/automations-routines.test.ts b/e2e/tests/tools-dev/automations-routines.test.ts
new file mode 100644
index 000000000..9a64e2b5c
--- /dev/null
+++ b/e2e/tests/tools-dev/automations-routines.test.ts
@@ -0,0 +1,225 @@
+// @vitest-environment node
+
+import { join } from 'node:path';
+
+import type { CreateRoutineRequest } from '@open-design/contracts';
+import { describe, expect, test } from 'vitest';
+
+import { createFakeAgentRuntimes } from '@/fake-agents';
+import { listMessages } from '@/vitest/messages';
+import { createRoutine, deleteRoutine, listRoutines, runRoutine, updateRoutine } from '@/vitest/routines';
+import { createSmokeSuite } from '@/vitest/smoke-suite';
+import { requestJson } from '@/vitest/http';
+import { readRunEvents, waitForRunStatus, waitForRunTerminal } from '@/vitest/runs';
+
+type ProjectResponse = {
+  project: {
+    id: string;
+    metadata?: {
+      kind?: string;
+      trigger?: string;
+    };
+    name: string;
+  };
+};
+
+describe('tools-dev automations routines', () => {
+  test('supports create, pause/resume, run, and delete through the routines API', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('tools-dev-automations-routines');
+
+    await suite.with.toolsDev(async ({ runtime, status, webUrl }) => {
+      const fakeAgents = await createFakeAgentRuntimes({
+        root: join(suite.scratchDir, 'fake-agents'),
+        runtimeIds: ['codex'],
+      });
+
+      await requestJson<{ config: Record<string, unknown> }>(webUrl, '/api/app-config', {
+        body: {
+          agentCliEnv: { codex: fakeAgents.codex.env },
+          agentId: 'codex',
+          agentModels: { codex: { model: 'default', reasoning: 'default' } },
+          designSystemId: null,
+          onboardingCompleted: true,
+          skillId: null,
+          telemetry: { artifactManifest: true, content: false, metrics: false },
+        },
+        method: 'PUT',
+      });
+
+      const createBody: CreateRoutineRequest = {
+        name: 'E2E daily digest',
+        prompt: 'Create a deterministic smoke artifact for the routines API.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        skillId: null,
+        context: {},
+      };
+
+      const created = await createRoutine(webUrl, createBody);
+      expect(created.id).toEqual(expect.any(String));
+      expect(created.name).toBe('E2E daily digest');
+      expect(created.enabled).toBe(true);
+
+      const afterCreate = await listRoutines(webUrl);
+      expect(afterCreate.map((routine) => routine.id)).toContain(created.id);
+
+      const paused = await updateRoutine(webUrl, created.id, { enabled: false });
+      expect(paused.enabled).toBe(false);
+      const listedPaused = await listRoutines(webUrl);
+      expect(listedPaused.find((routine) => routine.id === created.id)?.enabled).toBe(false);
+
+      const resumed = await updateRoutine(webUrl, created.id, { enabled: true });
+      expect(resumed.enabled).toBe(true);
+      const listedResumed = await listRoutines(webUrl);
+      expect(listedResumed.find((routine) => routine.id === created.id)?.enabled).toBe(true);
+
+      const started = await runRoutine(webUrl, created.id);
+      expect(started.projectId).toEqual(expect.any(String));
+      expect(started.conversationId).toEqual(expect.any(String));
+      expect(started.agentRunId).toEqual(expect.any(String));
+
+      const finalRun = await waitForRunStatus(webUrl, String(started.agentRunId), 'succeeded', {
+        timeoutMs: 30_000,
+      });
+      expect(finalRun.projectId).toBe(started.projectId);
+      expect(finalRun.status).toBe('succeeded');
+
+      const project = await requestJson<ProjectResponse>(
+        webUrl,
+        `/api/projects/${encodeURIComponent(String(started.projectId))}`,
+      );
+      expect(project.project.id).toBe(started.projectId);
+      expect(project.project.metadata?.trigger).toBe('manual');
+
+      const messages = await listMessages(
+        webUrl,
+        String(started.projectId),
+        String(started.conversationId),
+      );
+      expect(
+        messages.some(
+          (message) =>
+            message.role === 'assistant' &&
+            message.content.includes('Real Daemon Smoke'),
+        ),
+      ).toBe(true);
+
+      const afterRun = await listRoutines(webUrl);
+      const routineAfterRun = afterRun.find((routine) => routine.id === created.id);
+      expect(routineAfterRun?.lastRun?.status).toBe('succeeded');
+      expect(routineAfterRun?.lastRun?.projectId).toBe(started.projectId);
+      expect(routineAfterRun?.lastRun?.conversationId).toBe(started.conversationId);
+
+      await deleteRoutine(webUrl, created.id);
+      const afterDelete = await listRoutines(webUrl);
+      expect(afterDelete.find((routine) => routine.id === created.id)).toBeUndefined();
+
+      await suite.report.json('summary.json', {
+        created,
+        finalRun,
+        messages: messages.map((message) => ({
+          id: message.id,
+          role: message.role,
+          runStatus: message.runStatus ?? null,
+        })),
+        namespace: suite.namespace,
+        project: project.project,
+        routineAfterRun,
+        runtime: {
+          daemonPort: runtime.daemonPort,
+          webPort: runtime.webPort,
+          webUrl,
+        },
+        status,
+      });
+    });
+  });
+
+  test('persists failed lastRun details when an automation run errors', { timeout: 180_000 }, async () => {
+    const suite = await createSmokeSuite('tools-dev-automations-routines-failed-run');
+
+    await suite.with.toolsDev(async ({ runtime, status, webUrl }) => {
+      const fakeAgents = await createFakeAgentRuntimes({
+        root: join(suite.scratchDir, 'fake-agents'),
+        runtimeIds: ['codex'],
+      });
+
+      await requestJson<{ config: Record<string, unknown> }>(webUrl, '/api/app-config', {
+        body: {
+          agentCliEnv: { codex: fakeAgents.codex.env },
+          agentId: 'codex',
+          agentModels: { codex: { model: 'default', reasoning: 'default' } },
+          designSystemId: null,
+          onboardingCompleted: true,
+          skillId: null,
+          telemetry: { artifactManifest: true, content: false, metrics: false },
+        },
+        method: 'PUT',
+      });
+
+      const createBody: CreateRoutineRequest = {
+        name: 'E2E failing digest',
+        prompt: 'Return an intentional daemon smoke failure',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        skillId: null,
+        context: {},
+      };
+
+      const created = await createRoutine(webUrl, createBody);
+      const started = await runRoutine(webUrl, created.id);
+      expect(started.projectId).toEqual(expect.any(String));
+      expect(started.conversationId).toEqual(expect.any(String));
+      expect(started.agentRunId).toEqual(expect.any(String));
+
+      const terminal = await waitForRunTerminal(webUrl, String(started.agentRunId), {
+        timeoutMs: 30_000,
+      });
+      expect(terminal.status).toBe('failed');
+
+      const events = await readRunEvents(webUrl, String(started.agentRunId));
+      expect(events).toMatch(/intentional daemon smoke failure|failed/i);
+
+      const messages = await listMessages(
+        webUrl,
+        String(started.projectId),
+        String(started.conversationId),
+      );
+      const assistant = messages.find(
+        (message) => message.role === 'assistant' && message.runId === started.agentRunId,
+      );
+      expect(assistant?.runStatus).toBe('failed');
+      expect(typeof assistant?.endedAt).toBe('number');
+
+      const afterRun = await listRoutines(webUrl);
+      const routineAfterRun = afterRun.find((routine) => routine.id === created.id);
+      expect(routineAfterRun?.lastRun?.status).toBe('failed');
+      expect(routineAfterRun?.lastRun?.projectId).toBe(started.projectId);
+      expect(routineAfterRun?.lastRun?.conversationId).toBe(started.conversationId);
+      expect(routineAfterRun?.lastRun?.error).toMatch(/intentional fake codex failure|failed/i);
+
+      await suite.report.json('failure-summary.json', {
+        created,
+        lastRun: routineAfterRun?.lastRun ?? null,
+        messages: messages.map((message) => ({
+          endedAt: message.endedAt ?? null,
+          id: message.id,
+          role: message.role,
+          runId: message.runId ?? null,
+          runStatus: message.runStatus ?? null,
+        })),
+        namespace: suite.namespace,
+        runEventsPreview: events.slice(0, 500),
+        runtime: {
+          daemonPort: runtime.daemonPort,
+          webPort: runtime.webPort,
+          webUrl,
+        },
+        status,
+        terminal,
+      });
+    });
+  });
+});
diff --git a/e2e/ui/amr-login-pill.test.ts b/e2e/ui/amr-login-pill.test.ts
new file mode 100644
index 000000000..2667ebf56
--- /dev/null
+++ b/e2e/ui/amr-login-pill.test.ts
@@ -0,0 +1,175 @@
+// Playwright UI coverage for the AMR Settings login pill (apps/web/src/
+// components/AmrLoginPill.tsx). The pill is a sibling of the Test button
+// inside the installed-agent card and drives the
+// `/api/integrations/vela/{status,login,logout}` endpoints.
+//
+// This test mocks those endpoints directly via `page.route` instead of
+// booting a real daemon — the daemon-side wiring is covered separately by
+// `apps/daemon/tests/integrations/vela.routes.test.ts` (HTTP routes) and
+// `e2e/tests/amr/turn.test.ts` (full tools-dev chat run). Here we focus
+// on the front-end transitions a regression would otherwise only surface
+// during manual demos: "Sign in" → "Signed in" → hover-only "Sign out"
+// label flip → "Sign in" again on logout.
+
+import { expect, test } from '@playwright/test';
+import type { Page } from '@playwright/test';
+
+const STORAGE_KEY = 'open-design:config';
+const OPEN_SETTINGS_LABEL = /Open settings|打开设置|開啟設定/i;
+const SETTINGS_MENU_LABEL = /^Settings$|^设置$|^設定$/i;
+
+test.describe.configure({ timeout: 30_000 });
+
+async function waitForLoadingToClear(page: Page) {
+  await expect(page.getByText('Loading Open Design…')).toHaveCount(0, { timeout: 15_000 });
+}
+
+async function gotoEntryHome(page: Page) {
+  await page.goto('/', { waitUntil: 'domcontentloaded' });
+  await waitForLoadingToClear(page);
+  const privacyDialog = page.getByRole('dialog').filter({ hasText: 'Help us improve Open Design' });
+  if (await privacyDialog.isVisible().catch(() => false)) {
+    await privacyDialog.getByRole('button', { name: /not now/i }).click();
+  }
+  await expect(page.getByRole('button', { name: OPEN_SETTINGS_LABEL })).toBeVisible();
+}
+
+async function openSettingsDialog(page: Page) {
+  await waitForLoadingToClear(page);
+  // The entry "Open settings" button may either:
+  //   (a) open a popover menu containing a "Settings" item that opens the
+  //       dialog (older UI), or
+  //   (b) open the Settings dialog directly (current UI as of this PR).
+  // Try the menu-first path, fall through to the direct dialog if no
+  // menu materialises within a short window.
+  await page.getByRole('button', { name: OPEN_SETTINGS_LABEL }).click();
+  const menu = page.getByRole('menu');
+  if (await menu.isVisible({ timeout: 1_000 }).catch(() => false)) {
+    await menu.getByRole('button', { name: SETTINGS_MENU_LABEL }).click();
+  }
+  const dialog = page.getByRole('dialog');
+  await expect(dialog).toBeVisible({ timeout: 10_000 });
+  return dialog;
+}
+
+interface VelaMockState {
+  loggedIn: boolean;
+}
+
+async function wireDaemonMocks(page: Page, state: VelaMockState) {
+  await page.route('**/api/health', async (route) => {
+    await route.fulfill({ status: 200, contentType: 'application/json', body: '{"ok":true}' });
+  });
+
+  await page.route('**/api/agents', async (route) => {
+    // Only AMR present — keeps the card layout deterministic regardless
+    // of whatever else `runtimes/registry.ts` later adds.
+    await route.fulfill({
+      json: {
+        agents: [
+          {
+            id: 'amr',
+            name: 'AMR (vela)',
+            bin: 'vela',
+            versionArgs: ['--version'],
+            available: true,
+            authStatus: null,
+            modelsSource: 'fallback',
+            models: [
+              { id: 'gpt-5.4-mini', label: 'gpt-5.4-mini (openrouter · default)' },
+            ],
+            path: '/usr/local/bin/vela',
+            version: null,
+          },
+        ],
+      },
+    });
+  });
+
+  await page.route('**/api/integrations/vela/status', async (route) => {
+    const body = state.loggedIn
+      ? {
+          loggedIn: true,
+          profile: 'local',
+          configPath: '/tmp/.amr/config.json',
+          user: {
+            id: 'fake-user',
+            email: 'pill-test@example.com',
+            name: 'Pill Test',
+            plan: 'free',
+          },
+        }
+      : {
+          loggedIn: false,
+          profile: 'local',
+          user: null,
+          configPath: '/tmp/.amr/config.json',
+        };
+    await route.fulfill({ json: body });
+  });
+
+  await page.route('**/api/integrations/vela/login', async (route) => {
+    // Real daemon spawns `vela login` async and returns 202; we mirror
+    // that shape and flip the in-memory state so the next status poll
+    // sees a logged-in user — equivalent to vela CLI completing the
+    // device-auth flow and writing ~/.amr/config.json.
+    state.loggedIn = true;
+    await route.fulfill({ status: 202, json: { pid: 4242, startedAt: new Date().toISOString(), profile: 'local' } });
+  });
+
+  await page.route('**/api/integrations/vela/logout', async (route) => {
+    state.loggedIn = false;
+    await route.fulfill({ json: { ok: true } });
+  });
+}
+
+function baseStorageConfig() {
+  return {
+    mode: 'daemon',
+    apiKey: '',
+    baseUrl: '',
+    model: '',
+    agentId: 'amr',
+    skillId: null,
+    designSystemId: null,
+    onboardingCompleted: true,
+    mediaProviders: {},
+    agentModels: { amr: { model: 'gpt-5.4-mini', reasoning: 'default' } },
+  };
+}
+
+test('AMR card shows Sign in when logged out, flips to Signed in after the daemon writes config, and back to Sign in on Sign out', async ({ page }) => {
+  const state: VelaMockState = { loggedIn: false };
+  await wireDaemonMocks(page, state);
+
+  await page.addInitScript(
+    ({ key, value }) => {
+      window.localStorage.setItem(key, JSON.stringify(value));
+    },
+    { key: STORAGE_KEY, value: baseStorageConfig() },
+  );
+
+  await gotoEntryHome(page);
+  const dialog = await openSettingsDialog(page);
+
+  const amrCard = dialog.locator('.amr-agent-card, .agent-card-installed').filter({ hasText: /AMR \(vela\)/i }).first();
+  await expect(amrCard).toBeVisible();
+
+  // ---- Initial state: logged out → "Sign in" button visible on the pill ----
+  const signInBtn = amrCard.getByRole('button', { name: /^Sign in$/ });
+  await expect(signInBtn).toBeVisible();
+
+  // ---- Click Sign in → daemon returns 202, status starts reporting loggedIn=true ----
+  await signInBtn.click();
+
+  // The pill polls /status every 2s; allow up to 10s for the flip. The
+  // pill button gets aria-label="Sign out" once logged in regardless of
+  // the hover state, so we can target it by accessible name.
+  const signedInPill = amrCard.getByRole('button', { name: /^Sign out$/ });
+  await expect(signedInPill).toBeVisible({ timeout: 10_000 });
+  await expect(amrCard).toContainText('Signed in');
+
+  // ---- Click Sign out → status flips back to loggedIn=false ----
+  await signedInPill.click();
+  await expect(amrCard.getByRole('button', { name: /^Sign in$/ })).toBeVisible({ timeout: 10_000 });
+});
diff --git a/e2e/ui/amr-logout-requires-relogin.test.ts b/e2e/ui/amr-logout-requires-relogin.test.ts
new file mode 100644
index 000000000..982c725e5
--- /dev/null
+++ b/e2e/ui/amr-logout-requires-relogin.test.ts
@@ -0,0 +1,100 @@
+import { mkdir } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { expect, test } from '@playwright/test';
+
+import { writeFakeVelaBin } from '@/amr';
+import {
+  createProjectViaApi,
+  gotoProject,
+  openSettingsDialog,
+  putAppConfig,
+  seedBrowserConfig,
+  sendPrompt,
+} from '@/playwright/amr';
+
+test('after local Sign out, AMR runs require re-login and Settings keeps AMR selected', async ({ page }) => {
+  const root = join(tmpdir(), `open-design-amr-logout-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`);
+  const successVelaBin = await writeFakeVelaBin(join(root, 'bin-success'), {
+    assistantText: 'Hello from the e2e fake vela.',
+    requireLoginConfig: false,
+  });
+  const reloginVelaBin = await writeFakeVelaBin(join(root, 'bin-relogin'), {
+    failAuthAtPrompt: true,
+  });
+  await mkdir(root, { recursive: true });
+  let loggedIn = true;
+
+  await page.route('**/api/integrations/vela/status', async (route) => {
+    await route.fulfill({
+      json: loggedIn
+        ? {
+            loggedIn: true,
+            profile: 'local',
+            configPath: '/tmp/.amr/config.json',
+            user: { id: 'logout-ui', email: 'logout-ui@example.com' },
+          }
+        : {
+            loggedIn: false,
+            profile: 'local',
+            configPath: '/tmp/.amr/config.json',
+            user: null,
+          },
+    });
+  });
+
+  await page.route('**/api/integrations/vela/logout', async (route) => {
+    loggedIn = false;
+    await route.fulfill({ json: { ok: true } });
+  });
+
+  const config = {
+    mode: 'daemon',
+    apiKey: '',
+    baseUrl: '',
+    model: '',
+    agentId: 'amr',
+    skillId: null,
+    designSystemId: null,
+    onboardingCompleted: true,
+    mediaProviders: {},
+    agentModels: {
+      amr: { model: 'default', reasoning: 'default' },
+    },
+    agentCliEnv: {
+      amr: { VELA_BIN: successVelaBin },
+    },
+  };
+
+  await seedBrowserConfig(page, config);
+  await putAppConfig(page, config);
+
+  const projectId = `amr-logout-${Date.now()}`.replace(/[^A-Za-z0-9._-]/g, '-');
+  await createProjectViaApi(page, projectId, 'AMR logout requires relogin');
+  await gotoProject(page, projectId);
+
+  const settings = await openSettingsDialog(page);
+  await settings.getByRole('tab', { name: /Local CLI/i }).click();
+  const signOut = settings.getByRole('button', { name: /^Sign out$/ });
+  await expect(signOut).toBeVisible();
+  await signOut.click();
+  await expect(settings.getByRole('button', { name: /^Sign in$/ })).toBeVisible({ timeout: 10_000 });
+  await expect(settings.getByRole('button', { name: /^AMR\b/ })).toBeVisible();
+  await page.keyboard.press('Escape');
+  await expect(settings).toHaveCount(0);
+  await putAppConfig(page, {
+    ...config,
+    agentCliEnv: {
+      amr: { VELA_BIN: reloginVelaBin },
+    },
+  });
+  await sendPrompt(page, 'AMR logout should require relogin');
+
+  await expect(page.locator('.msg.error')).toContainText(/sign in again|login missing|expired|ACP session exited before completion/i, { timeout: 15_000 });
+
+  const configResponse = await page.request.get('/api/app-config');
+  expect(configResponse.ok(), await configResponse.text()).toBeTruthy();
+  const body = (await configResponse.json()) as { config?: { agentId?: string } };
+  expect(body.config?.agentId).toBe('amr');
+});
diff --git a/e2e/ui/amr-onboarding.test.ts b/e2e/ui/amr-onboarding.test.ts
new file mode 100644
index 000000000..140d36a6f
--- /dev/null
+++ b/e2e/ui/amr-onboarding.test.ts
@@ -0,0 +1,203 @@
+import { expect, test } from '@playwright/test';
+import type { Page } from '@playwright/test';
+
+import { dismissPrivacyDialog, STORAGE_KEY, waitForLoadingToClear } from '@/playwright/amr';
+
+type OnboardingConfig = {
+  mode: 'daemon';
+  apiKey: string;
+  baseUrl: string;
+  model: string;
+  agentId: string | null;
+  skillId: null;
+  designSystemId: null;
+  onboardingCompleted: boolean;
+  mediaProviders: Record<string, never>;
+  agentModels: Record<string, { model: string; reasoning: string }>;
+};
+
+test.describe.configure({ timeout: 30_000 });
+
+test('onboarding lets AMR Cloud sign in and continue after the login poll succeeds', async ({ page }) => {
+  const config = await wireOnboardingMocks(page, {
+    amrAvailable: true,
+    initialLoggedIn: false,
+  });
+
+  await page.addInitScript(
+    ({ key, value }) => window.localStorage.setItem(key, JSON.stringify(value)),
+    { key: STORAGE_KEY, value: config },
+  );
+
+  await gotoOnboarding(page);
+
+  const continueButton = page.getByRole('button', { name: /sign in to continue/i });
+  await expect(page.getByRole('button', { name: /AMR Cloud/i })).toHaveAttribute('aria-pressed', 'true');
+  await expect(continueButton).toBeVisible();
+  await continueButton.click();
+
+  await expect(page.getByRole('button', { name: /Continue/i })).toBeVisible({ timeout: 10_000 });
+});
+
+test('onboarding falls back to Local CLI when AMR is unavailable', async ({ page }) => {
+  const config = await wireOnboardingMocks(page, {
+    amrAvailable: false,
+    initialLoggedIn: false,
+  });
+
+  await page.addInitScript(
+    ({ key, value }) => window.localStorage.setItem(key, JSON.stringify(value)),
+    { key: STORAGE_KEY, value: config },
+  );
+
+  await gotoOnboarding(page);
+
+  await expect(page.getByRole('button', { name: /AMR Cloud/i })).toHaveCount(0);
+  await page.getByRole('button', { name: /Local coding agent/i }).click();
+  await expect(page.getByText('Local CLI')).toBeVisible();
+  await expect(page.getByRole('button', { name: /Continue/i })).toBeVisible();
+});
+
+test('onboarding recovers from a transient AMR status failure and still continues after login completes', async ({ page }) => {
+  const config = await wireOnboardingMocks(page, {
+    amrAvailable: true,
+    initialLoggedIn: false,
+    failFirstStatusPollAfterLogin: true,
+  });
+
+  await page.addInitScript(
+    ({ key, value }) => window.localStorage.setItem(key, JSON.stringify(value)),
+    { key: STORAGE_KEY, value: config },
+  );
+
+  await gotoOnboarding(page);
+
+  await page.getByRole('button', { name: /sign in to continue/i }).click();
+
+  await expect(page.getByRole('button', { name: /Continue/i })).toBeVisible({ timeout: 12_000 });
+});
+
+async function wireOnboardingMocks(
+  page: Page,
+  options: {
+    amrAvailable: boolean;
+    initialLoggedIn: boolean;
+    failFirstStatusPollAfterLogin?: boolean;
+  },
+): Promise<OnboardingConfig> {
+  const config: OnboardingConfig = {
+    mode: 'daemon',
+    apiKey: '',
+    baseUrl: '',
+    model: '',
+    agentId: options.amrAvailable ? 'amr' : 'codex',
+    skillId: null,
+    designSystemId: null,
+    onboardingCompleted: false,
+    mediaProviders: {},
+    agentModels: options.amrAvailable
+      ? { amr: { model: 'default', reasoning: 'default' } }
+      : { codex: { model: 'default', reasoning: 'default' } },
+  };
+
+  let loggedIn = options.initialLoggedIn;
+  let statusCallsAfterLogin = 0;
+
+  await page.route('**/api/health', async (route) => {
+    await route.fulfill({ status: 200, contentType: 'application/json', body: '{"ok":true}' });
+  });
+
+  await page.route('**/api/projects', async (route) => {
+    if (route.request().method() === 'GET') {
+      await route.fulfill({ json: { projects: [] } });
+      return;
+    }
+    await route.continue();
+  });
+
+  await page.route('**/api/app-config', async (route) => {
+    if (route.request().method() === 'GET') {
+      await route.fulfill({ json: { config } });
+      return;
+    }
+    if (route.request().method() === 'PUT') {
+      Object.assign(config, route.request().postDataJSON() as Partial<OnboardingConfig>);
+      await route.fulfill({ json: { ok: true } });
+      return;
+    }
+    await route.continue();
+  });
+
+  await page.route('**/api/agents', async (route) => {
+    await route.fulfill({
+      json: {
+        agents: [
+          ...(options.amrAvailable
+            ? [{
+                id: 'amr',
+                name: 'AMR (vela)',
+                bin: 'vela',
+                available: true,
+                version: '1.0.0',
+                models: [{ id: 'default', label: 'Default' }],
+              }]
+            : []),
+          {
+            id: 'codex',
+            name: 'Codex CLI',
+            bin: 'codex',
+            available: true,
+            version: 'test',
+            models: [{ id: 'default', label: 'Default' }],
+          },
+        ],
+      },
+    });
+  });
+
+  await page.route('**/api/integrations/vela/status', async (route) => {
+    if (loggedIn) {
+      statusCallsAfterLogin += 1;
+      if (options.failFirstStatusPollAfterLogin && statusCallsAfterLogin === 1) {
+        await route.fulfill({
+          status: 500,
+          contentType: 'application/json',
+          body: JSON.stringify({ error: 'temporary status failure' }),
+        });
+        return;
+      }
+    }
+    await route.fulfill({
+      json: loggedIn
+        ? {
+            loggedIn: true,
+            profile: 'local',
+            configPath: '/tmp/.amr/config.json',
+            user: { id: 'user-1', email: 'onboarding@example.com', plan: 'free' },
+          }
+        : {
+            loggedIn: false,
+            profile: 'local',
+            configPath: '/tmp/.amr/config.json',
+            user: null,
+          },
+    });
+  });
+
+  await page.route('**/api/integrations/vela/login', async (route) => {
+    loggedIn = true;
+    await route.fulfill({
+      status: 202,
+      json: { pid: 4242, startedAt: new Date().toISOString(), profile: 'local' },
+    });
+  });
+
+  return config;
+}
+
+async function gotoOnboarding(page: Page) {
+  await page.goto('/onboarding', { waitUntil: 'domcontentloaded' });
+  await waitForLoadingToClear(page);
+  await dismissPrivacyDialog(page);
+  await expect(page.getByRole('heading', { name: /Welcome|欢迎/i })).toBeVisible();
+}
diff --git a/e2e/ui/amr-run-failure-recovery.test.ts b/e2e/ui/amr-run-failure-recovery.test.ts
new file mode 100644
index 000000000..76b861280
--- /dev/null
+++ b/e2e/ui/amr-run-failure-recovery.test.ts
@@ -0,0 +1,110 @@
+import { mkdir } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { expect, test } from '@playwright/test';
+import type { Page } from '@playwright/test';
+
+import { writeFakeVelaBin, seedVelaLoginConfig } from '@/amr';
+import { createFakeAgentRuntimes } from '@/playwright/fake-agents';
+import {
+  createProjectViaApi,
+  gotoProject,
+  openSettingsDialog,
+  putAppConfig,
+  seedBrowserConfig,
+  sendPrompt,
+  STORAGE_KEY,
+} from '@/playwright/amr';
+
+let codexRuntime: Awaited<ReturnType<typeof createFakeAgentRuntimes>>['codex'];
+
+test.describe.configure({ mode: 'serial' });
+
+test.beforeAll(async () => {
+  codexRuntime = (await createFakeAgentRuntimes(['codex'])).codex;
+});
+
+test('AMR auth failures surface a clear error and return the composer to a usable idle state', async ({ page }) => {
+  const amr = await setupAmrWorkspace(page, { failAuthAtPrompt: true, selectedAgentId: 'amr' });
+
+  await gotoProject(page, amr.projectId);
+  await sendPrompt(page, 'AMR auth failure smoke');
+
+  await expect(page.locator('.msg.error')).toContainText(/sign in again|expired|ACP session exited before completion/i, { timeout: 15_000 });
+  const input = page.getByTestId('chat-composer-input');
+  await expect(input).toBeVisible();
+  await input.fill('Retry after AMR auth failure');
+  await expect(page.getByTestId('chat-send')).toBeEnabled();
+});
+
+test('after an AMR failure the user can switch to Codex and complete a fresh run', async ({ page }) => {
+  const amr = await setupAmrWorkspace(page, { failAuthAtPrompt: true, selectedAgentId: 'amr' });
+
+  await gotoProject(page, amr.projectId);
+  await sendPrompt(page, 'AMR auth failure before switch smoke');
+  await expect(page.locator('.msg.error')).toContainText(/sign in again|expired|ACP session exited before completion/i, { timeout: 15_000 });
+
+  const settings = await openSettingsDialog(page);
+  await settings.getByRole('tab', { name: /Local CLI/i }).click();
+  await settings.getByRole('button', { name: /Codex CLI/i }).click();
+  await expect
+    .poll(async () => {
+      const raw = await page.evaluate((key) => window.localStorage.getItem(key), STORAGE_KEY);
+      return raw ? JSON.parse(raw).agentId : null;
+    })
+    .toBe('codex');
+  await page.keyboard.press('Escape');
+  await expect(settings).toHaveCount(0);
+
+  await sendPrompt(page, 'Create a deterministic smoke artifact');
+  await expect(page.getByTestId('artifact-preview-frame')).toBeVisible({ timeout: 20_000 });
+  await expect(
+    page.frameLocator('[data-testid="artifact-preview-frame"]').getByRole('heading', {
+      name: 'Real Daemon Smoke',
+    }),
+  ).toBeVisible();
+});
+
+async function setupAmrWorkspace(
+  page: Page,
+  options: {
+    failAuthAtPrompt: boolean;
+    selectedAgentId: 'amr' | 'codex';
+  },
+) {
+  const root = join(tmpdir(), `open-design-amr-ui-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`);
+  const homeDir = join(root, 'home');
+  const velaBin = await writeFakeVelaBin(join(root, 'bin'), {
+    failAuthAtPrompt: options.failAuthAtPrompt,
+  });
+  await mkdir(homeDir, { recursive: true });
+  await seedVelaLoginConfig(homeDir, { email: 'ui-amr@example.com', profile: 'local' });
+
+  const config = {
+    mode: 'daemon',
+    apiKey: '',
+    baseUrl: '',
+    model: '',
+    agentId: options.selectedAgentId,
+    skillId: null,
+    designSystemId: null,
+    onboardingCompleted: true,
+    mediaProviders: {},
+    agentModels: {
+      amr: { model: 'default', reasoning: 'default' },
+      codex: { model: 'default', reasoning: 'default' },
+    },
+    agentCliEnv: {
+      amr: { VELA_BIN: velaBin, HOME: homeDir },
+      codex: codexRuntime.env,
+    },
+  };
+
+  await seedBrowserConfig(page, config);
+  await putAppConfig(page, config);
+
+  const projectId = `amr-ui-${Date.now()}`.replace(/[^A-Za-z0-9._-]/g, '-');
+  await createProjectViaApi(page, projectId, 'AMR UI failure smoke');
+  return { projectId, homeDir, velaBin };
+}
diff --git a/e2e/ui/automations-page.test.ts b/e2e/ui/automations-page.test.ts
new file mode 100644
index 000000000..259af3e29
--- /dev/null
+++ b/e2e/ui/automations-page.test.ts
@@ -0,0 +1,883 @@
+import { expect, test } from '@playwright/test';
+import type { Page } from '@playwright/test';
+
+const STORAGE_KEY = 'open-design:config';
+const OPEN_SETTINGS_LABEL = /Open settings|打开设置|開啟設定/i;
+
+test.describe.configure({ timeout: 30_000 });
+
+function baseConfig(): Record<string, unknown> {
+  return {
+    mode: 'daemon',
+    apiKey: '',
+    apiProtocol: 'openai',
+    apiVersion: '',
+    baseUrl: 'https://api.openai.com/v1',
+    model: 'gpt-4o',
+    apiProviderBaseUrl: 'https://api.openai.com/v1',
+    agentId: 'codex',
+    skillId: null,
+    designSystemId: null,
+    onboardingCompleted: true,
+    mediaProviders: {},
+    agentModels: {},
+    agentCliEnv: {},
+  };
+}
+
+async function seedAutomationsBase(page: Page) {
+  await page.addInitScript(({ key, value }) => {
+    window.localStorage.setItem(key, JSON.stringify(value));
+  }, { key: STORAGE_KEY, value: baseConfig() });
+
+  await page.route('**/api/health', async (route) => {
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: '{"ok":true}',
+    });
+  });
+
+  await page.route('**/api/agents', async (route) => {
+    await route.fulfill({
+      json: {
+        agents: [
+          {
+            id: 'codex',
+            name: 'Codex CLI',
+            bin: 'codex',
+            available: true,
+            version: '0.130.0',
+            models: [{ id: 'default', label: 'Default' }],
+          },
+        ],
+      },
+    });
+  });
+
+  await page.route('**/api/plugins', async (route) => {
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({ plugins: [] }),
+    });
+  });
+
+  await page.route('**/api/mcp/servers', async (route) => {
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({ servers: [], templates: [] }),
+    });
+  });
+}
+
+async function waitForLoadingToClear(page: Page) {
+  await expect(page.getByText('Loading Open Design…')).toHaveCount(0, { timeout: 15_000 });
+}
+
+async function gotoEntryHome(page: Page) {
+  await page.goto('/', { waitUntil: 'domcontentloaded' });
+  await waitForLoadingToClear(page);
+  const privacyDialog = page.getByRole('dialog').filter({ hasText: 'Help us improve Open Design' });
+  if (await privacyDialog.isVisible().catch(() => false)) {
+    await privacyDialog.getByRole('button', { name: /not now/i }).click();
+  }
+  await expect(page.getByRole('button', { name: OPEN_SETTINGS_LABEL })).toBeVisible();
+}
+
+async function gotoAutomations(page: Page) {
+  await gotoEntryHome(page);
+  await page.getByTestId('entry-nav-tasks').click();
+  const view = page.getByTestId('tasks-view');
+  await expect(view.getByRole('heading', { name: 'Automations', exact: true })).toBeVisible();
+  return view;
+}
+
+test.describe('Automations page', () => {
+  test('renders the page hero, summary metrics, filters, and saved rows', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    let routines = [
+      {
+        id: 'routine-active-1',
+        name: 'Daily digest',
+        prompt: 'Summarize GitHub and design activity.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        nextRunAt: Date.now() + 3600_000,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+      {
+        id: 'routine-paused-1',
+        name: 'Weekly release notes',
+        prompt: 'Draft release notes.',
+        schedule: { kind: 'weekly', weekday: 1, time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: false,
+        nextRunAt: null,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ routines }),
+      });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    const view = await gotoAutomations(page);
+
+    await expect(view.getByText('Plan recurring conversations for project work, Orbit digests, and live artifacts.')).toBeVisible();
+    await expect(view.getByLabel('Automation summary')).toContainText('Active');
+    await expect(view.getByLabel('Automation summary')).toContainText('Paused');
+    await expect(view.getByLabel('Automation summary')).toContainText('Templates');
+    await expect(view.getByLabel('Your automations')).toContainText('Daily digest');
+    await expect(view.getByLabel('Your automations')).toContainText('Weekly release notes');
+
+    const templateFilters = view.getByRole('tablist', { name: 'Template filters' });
+    const allTab = templateFilters.getByRole('tab', { name: /^All/i });
+    const skillsTab = templateFilters.getByRole('tab', { name: /Skills/i });
+    await expect(allTab).toHaveAttribute('aria-selected', 'true');
+    await skillsTab.click();
+    await expect(skillsTab).toHaveAttribute('aria-selected', 'true');
+    await expect(view.getByRole('status')).toContainText('No templates in this category yet.');
+  });
+
+  test('creates an automation from the page and runs it into a project conversation', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    const projects = [{ id: 'proj-1', name: 'Routine Test Project' }];
+    let routines: Array<Record<string, unknown>> = [];
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      const method = route.request().method();
+      if (method === 'GET') {
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify({ routines }),
+        });
+        return;
+      }
+      if (method === 'POST') {
+        const payload = route.request().postDataJSON() as Record<string, unknown>;
+        const routine = {
+          id: 'routine-1',
+          name: payload.name,
+          prompt: payload.prompt,
+          schedule: payload.schedule,
+          target: payload.target,
+          enabled: true,
+          nextRunAt: Date.now() + 3600_000,
+          lastRun: null,
+          createdAt: Date.now(),
+          updatedAt: Date.now(),
+        };
+        routines = [routine];
+        await route.fulfill({
+          status: 201,
+          contentType: 'application/json',
+          body: JSON.stringify({ routine }),
+        });
+        return;
+      }
+      await route.fulfill({ status: 404, body: '{}' });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    await page.route('**/api/routines/routine-1/run', async (route) => {
+      const startedAt = Date.now();
+      const lastRun = {
+        runId: 'run-1',
+        status: 'queued',
+        trigger: 'manual',
+        startedAt,
+        projectId: 'proj-run',
+        conversationId: 'conv-run',
+        agentRunId: 'agent-run-1',
+      };
+      routines = [{ ...routines[0], lastRun }];
+      await route.fulfill({
+        status: 202,
+        contentType: 'application/json',
+        body: JSON.stringify({
+          routine: routines[0],
+          run: lastRun,
+          projectId: 'proj-run',
+          conversationId: 'conv-run',
+          agentRunId: 'agent-run-1',
+        }),
+      });
+    });
+
+    const view = await gotoAutomations(page);
+
+    await view.getByRole('button', { name: 'New automation' }).click();
+    const modal = page.getByTestId('automation-modal');
+    await modal.getByLabel('Automation title').fill('Weekly digest');
+    await modal.getByTestId('automation-modal-prompt').fill('Summarize GitHub and design activity.');
+    await modal.getByRole('button', { name: 'Create' }).click();
+
+    await expect(view.getByText('Weekly digest')).toBeVisible();
+
+    const row = view.locator('.automation-row', { hasText: 'Weekly digest' }).first();
+    await row.getByRole('button', { name: 'Run' }).click();
+    await expect(page).toHaveURL(/\/projects\/proj-run/);
+  });
+
+  test('keeps the automation modal open with the typed values when creation fails', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      const method = route.request().method();
+      if (method === 'GET') {
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify({ routines: [] }),
+        });
+        return;
+      }
+      if (method === 'POST') {
+        await route.fulfill({
+          status: 500,
+          contentType: 'application/json',
+          body: JSON.stringify({ error: 'provider unavailable' }),
+        });
+        return;
+      }
+      await route.fulfill({ status: 404, body: '{}' });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    const view = await gotoAutomations(page);
+
+    await view.getByRole('button', { name: 'New automation' }).click();
+    const modal = page.getByTestId('automation-modal');
+    await modal.getByLabel('Automation title').fill('Weekly digest');
+    await modal.getByTestId('automation-modal-prompt').fill('Summarize GitHub and design activity.');
+    await modal.getByRole('button', { name: 'Create' }).click();
+
+    await expect(modal.getByLabel('Automation title')).toHaveValue('Weekly digest');
+    await expect(modal.getByTestId('automation-modal-prompt')).toHaveValue('Summarize GitHub and design activity.');
+    await expect(modal.getByText('provider unavailable')).toBeVisible();
+    await expect(view.getByText('No automations yet')).toBeVisible();
+  });
+
+  test('shows a page error and keeps the row usable when Run fails', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    const routines = [
+      {
+        id: 'routine-run-error-1',
+        name: 'Daily digest',
+        prompt: 'Summarize GitHub and design activity.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        nextRunAt: Date.now() + 3600_000,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ routines }),
+      });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    await page.route('**/api/routines/routine-run-error-1/run', async (route) => {
+      await route.fulfill({
+        status: 500,
+        contentType: 'application/json',
+        body: JSON.stringify({ error: 'provider unavailable' }),
+      });
+    });
+
+    const view = await gotoAutomations(page);
+    const row = view.locator('.automation-row', { hasText: 'Daily digest' }).first();
+
+    await row.getByRole('button', { name: 'Run' }).click();
+
+    await expect(view.getByRole('alert')).toContainText('provider unavailable');
+    await expect(row.getByRole('button', { name: 'Run' })).toBeVisible();
+    await expect(row.getByRole('button', { name: 'Pause' })).toBeVisible();
+  });
+
+  test('pauses, expands history, and deletes an automation from the saved list', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    let routines = [
+      {
+        id: 'routine-1',
+        name: 'Daily digest',
+        prompt: 'Summarize GitHub and design activity.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        nextRunAt: Date.now() + 3600_000,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ routines }),
+      });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    await page.route('**/api/routines/routine-1', async (route) => {
+      const method = route.request().method();
+      if (method === 'PATCH') {
+        const payload = route.request().postDataJSON() as { enabled?: boolean };
+        const routine = routines[0];
+        if (!routine) throw new Error('missing routine fixture');
+        const updated = { ...routine, enabled: Boolean(payload.enabled), updatedAt: Date.now() };
+        routines = [updated];
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify({ routine: updated }),
+        });
+        return;
+      }
+      if (method === 'DELETE') {
+        routines = [];
+        await route.fulfill({ status: 204, body: '' });
+        return;
+      }
+      await route.fulfill({ status: 404, body: '{}' });
+    });
+
+    await page.route('**/api/routines/routine-1/runs?limit=10', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({
+          runs: [
+            {
+              id: 'run-1',
+              routineId: 'routine-1',
+              trigger: 'manual',
+              status: 'succeeded',
+              projectId: 'proj-run',
+              conversationId: 'conv-run',
+              agentRunId: 'agent-run-1',
+              startedAt: Date.now() - 60_000,
+              completedAt: Date.now() - 15_000,
+              summary: 'Updated digest',
+              error: null,
+              errorCode: null,
+            },
+          ],
+        }),
+      });
+    });
+
+    const view = await gotoAutomations(page);
+    const row = view.locator('.automation-row', { hasText: 'Daily digest' }).first();
+
+    await row.getByRole('button', { name: 'Pause' }).click();
+    await expect(row.getByRole('button', { name: 'Resume' })).toBeVisible();
+
+    await row.getByRole('button', { name: 'History' }).click();
+    await expect(page.getByLabel('Automation run history')).toBeVisible();
+    await row.getByRole('button', { name: 'Hide history' }).click();
+    await expect(page.getByLabel('Automation run history')).toHaveCount(0);
+
+    page.once('dialog', (dialog) => {
+      void dialog.accept();
+    });
+    await row.getByRole('button', { name: 'Delete automation' }).click({ force: true });
+
+    await expect(view.getByText('No automations yet')).toBeVisible();
+  });
+
+  test('shows a page error and keeps the row usable when Pause fails', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    const routines = [
+      {
+        id: 'routine-pause-error-1',
+        name: 'Daily digest',
+        prompt: 'Summarize GitHub and design activity.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        nextRunAt: Date.now() + 3600_000,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ routines }),
+      });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    await page.route('**/api/routines/routine-pause-error-1', async (route) => {
+      if (route.request().method() === 'PATCH') {
+        await route.fulfill({
+          status: 500,
+          contentType: 'application/json',
+          body: JSON.stringify({ error: 'pause failed upstream' }),
+        });
+        return;
+      }
+      await route.fulfill({ status: 404, body: '{}' });
+    });
+
+    const view = await gotoAutomations(page);
+    const row = view.locator('.automation-row', { hasText: 'Daily digest' }).first();
+
+    await row.getByRole('button', { name: 'Pause' }).click();
+
+    await expect(view.getByRole('alert')).toContainText('pause failed upstream');
+    await expect(row.getByRole('button', { name: 'Pause' })).toBeVisible();
+    await expect(row.getByRole('button', { name: 'Run' })).toBeVisible();
+  });
+
+  test('shows a page error and keeps the row visible when Delete fails', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    const routines = [
+      {
+        id: 'routine-delete-error-1',
+        name: 'Daily digest',
+        prompt: 'Summarize GitHub and design activity.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        nextRunAt: Date.now() + 3600_000,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ routines }),
+      });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    await page.route('**/api/routines/routine-delete-error-1', async (route) => {
+      if (route.request().method() === 'DELETE') {
+        await route.fulfill({
+          status: 500,
+          contentType: 'application/json',
+          body: JSON.stringify({ error: 'delete failed upstream' }),
+        });
+        return;
+      }
+      await route.fulfill({ status: 404, body: '{}' });
+    });
+
+    const view = await gotoAutomations(page);
+    const row = view.locator('.automation-row', { hasText: 'Daily digest' }).first();
+
+    page.once('dialog', (dialog) => {
+      void dialog.accept();
+    });
+    await row.getByRole('button', { name: 'Delete automation' }).click({ force: true });
+
+    await expect(view.getByRole('alert')).toContainText('delete failed upstream');
+    await expect(row).toBeVisible();
+    await expect(row.getByRole('button', { name: 'Delete automation' })).toBeVisible();
+  });
+
+  test('edits an automation title from the saved list and keeps the updated row visible', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    let routines = [
+      {
+        id: 'routine-edit-1',
+        name: 'Daily digest',
+        prompt: 'Summarize GitHub and design activity.',
+        schedule: { kind: 'daily', time: '09:00', timezone: 'UTC' },
+        target: { mode: 'create_each_run' },
+        enabled: true,
+        nextRunAt: Date.now() + 3600_000,
+        lastRun: null,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      },
+    ];
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ routines }),
+      });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    await page.route('**/api/routines/routine-edit-1', async (route) => {
+      if (route.request().method() === 'PATCH') {
+        const payload = route.request().postDataJSON() as { name?: string; prompt?: string };
+        const routine = routines[0];
+        if (!routine) throw new Error('missing routine fixture');
+        const updated = {
+          ...routine,
+          name: payload.name ?? routine.name,
+          prompt: payload.prompt ?? routine.prompt,
+          updatedAt: Date.now(),
+        };
+        routines = [
+          updated,
+        ];
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify({ routine: updated }),
+        });
+        return;
+      }
+      await route.fulfill({ status: 404, body: '{}' });
+    });
+
+    const view = await gotoAutomations(page);
+    const row = view.locator('.automation-row', { hasText: 'Daily digest' }).first();
+
+    await row.getByRole('button', { name: 'Edit' }).click();
+    const modal = page.getByTestId('automation-modal');
+    await expect(modal.getByLabel('Automation title')).toHaveValue('Daily digest');
+    await modal.getByLabel('Automation title').fill('Daily digest edited');
+    await modal.getByRole('button', { name: /^Save/i }).click();
+
+    await expect(view.getByText('Daily digest edited')).toBeVisible();
+  });
+
+  test('switches template filters and updates the visible template cards', async ({ page }) => {
+    await seedAutomationsBase(page);
+
+    await page.route('**/api/projects', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ projects: [] }),
+      });
+    });
+
+    await page.route('**/api/routines', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ routines: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-templates', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ templates: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-proposals?status=pending-review', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ proposals: [] }),
+      });
+    });
+
+    await page.route('**/api/automation-source-packets?limit=3', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ packets: [] }),
+      });
+    });
+
+    const view = await gotoAutomations(page);
+    const tabs = view.getByRole('tablist', { name: 'Template filters' });
+
+    await expect(view.getByText(/Refresh project memory from recent work\./i)).toBeVisible();
+
+    await tabs.getByRole('tab', { name: /Orbit/i }).click();
+    await expect(view.getByRole('status')).toHaveCount(0);
+    await expect(view.getByText(/Refresh project memory from recent work\./i)).toHaveCount(0);
+
+    await tabs.getByRole('tab', { name: /Memory/i }).click();
+    await expect(view.getByText(/Refresh project memory from recent work\./i)).toBeVisible();
+    await expect(view.getByRole('status')).toHaveCount(0);
+  });
+});
diff --git a/nix/pnpm-deps.nix b/nix/pnpm-deps.nix
index daea7e98b..a4d0fb097 100644
--- a/nix/pnpm-deps.nix
+++ b/nix/pnpm-deps.nix
@@ -9,6 +9,6 @@
   # 1. Temporarily set the consuming `hash = lib.fakeHash;`
   # 2. Run the relevant nix build/flake check
   # 3. Copy the expected hash printed by Nix into the matching field below
-  daemonHash = "sha256-tqxFDNPQjoKUWp4sLtPVCUu7ltIL/ufeyr6UKOWYw6A=";
-  webHash = "sha256-74loUCL+WcaZO4AAMnSpNeBhDz1Y9TMgFRPbyaOfPAk=";
+  daemonHash = "sha256-d7vCfXgAVtJzs+esw7zRtWquLJxQml2Y++UbnYWOuNk=";
+  webHash = "sha256-kSBYrAkEKu7vB+2AQ+rrxINhP1iJut0alFuaa5RAqLM=";
 }
diff --git a/package.json b/package.json
index 1e8834e1a..bee2749ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-design",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "packageManager": "pnpm@10.33.2",
   "type": "module",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 84c8c0328..1da9ed12e 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/contracts",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "description": "Shared pure TypeScript contracts for the Open Design web/daemon boundary.",
diff --git a/packages/contracts/src/analytics/events.ts b/packages/contracts/src/analytics/events.ts
index bdd2382e9..a09cc96d1 100644
--- a/packages/contracts/src/analytics/events.ts
+++ b/packages/contracts/src/analytics/events.ts
@@ -1201,6 +1201,14 @@ export interface ChatPanelClickProps {
     | 'resources_popover_trigger';
 }
 
+// Hosted-AMR nudge shown under a non-AMR agent's model/auth/quota failure.
+// `go_amr` is the link that opens https://open-design.ai/amr.
+export interface RunFailedToastClickProps {
+  page_name: 'chat_panel';
+  area: 'chat_panel';
+  element: 'go_amr';
+}
+
 export interface ChatPanelResourcesPopoverClickProps {
   page_name: 'chat_panel';
   area: 'resources_popover';
@@ -1524,6 +1532,7 @@ export type UiClickProps =
   | IntegrationsSkillsTabClickProps
   | IntegrationsUseEverywhereTabClickProps
   | ChatPanelClickProps
+  | RunFailedToastClickProps
   | ChatPanelResourcesPopoverClickProps
   | FileManagerClickProps
   | ArtifactToolbarClickProps
@@ -1573,6 +1582,21 @@ export interface DesignSystemsTemplatesModalSurfaceViewProps {
   templates_type?: string;
 }
 
+// Impression of the hosted-AMR nudge under a failed run's error toast. Fires
+// once per render of the toast for a non-AMR agent whose failure is a
+// model/auth/quota error (`error_code` carries the specific class).
+export interface RunFailedToastSurfaceViewProps {
+  page_name: 'chat_panel';
+  area: 'chat_panel';
+  element: 'run_failed_toast';
+  error_code: string;
+  project_id: string;
+  project_kind: TrackingProjectKind | null;
+  conversation_id: string | null;
+  assistant_message_id: string;
+  run_id: string | null;
+}
+
 export interface AssistantFeedbackReasonPanelSurfaceViewProps {
   page_name: 'chat_panel';
   area: 'chat_panel';
@@ -1604,6 +1628,7 @@ export interface UpdatePromptSurfaceViewProps {
 }
 
 export type SurfaceViewProps =
+  | RunFailedToastSurfaceViewProps
   | HelpPopoverSurfaceViewProps
   | NewProjectModalSurfaceViewProps
   | PluginReplacementModalSurfaceViewProps
diff --git a/packages/contracts/src/api/chat.ts b/packages/contracts/src/api/chat.ts
index c83acaf3b..e527298fd 100644
--- a/packages/contracts/src/api/chat.ts
+++ b/packages/contracts/src/api/chat.ts
@@ -223,7 +223,10 @@ export interface ChatCommentAttachment {
 }
 
 export type PersistedAgentEvent =
-  | { kind: 'status'; label: string; detail?: string }
+  // `code` carries the structured API error code for `label: 'error'`
+  // status events (e.g. AGENT_AUTH_REQUIRED, RATE_LIMITED). Clients use it to
+  // decide error-specific affordances such as the hosted-AMR nudge.
+  | { kind: 'status'; label: string; detail?: string; code?: string }
   | { kind: 'text'; text: string }
   | { kind: 'thinking'; text: string }
   | {
diff --git a/packages/contracts/src/errors.ts b/packages/contracts/src/errors.ts
index 1813bc106..40cd2e795 100644
--- a/packages/contracts/src/errors.ts
+++ b/packages/contracts/src/errors.ts
@@ -14,6 +14,9 @@ export const API_ERROR_CODES = [
   'AGENT_AUTH_REQUIRED',
   'AGENT_EXECUTION_FAILED',
   'AGENT_PROMPT_TOO_LARGE',
+  'AMR_MODEL_UNAVAILABLE',
+  'AMR_AUTH_REQUIRED',
+  'AMR_INSUFFICIENT_BALANCE',
   'PROJECT_NOT_FOUND',
   // Handoff (`POST /api/projects/:id/handoff`): the requested conversation
   // is not in the project, or has no messages to synthesize a handoff from.
diff --git a/packages/contracts/src/prompts/discovery.ts b/packages/contracts/src/prompts/discovery.ts
index 1688aad56..e4eabedd3 100644
--- a/packages/contracts/src/prompts/discovery.ts
+++ b/packages/contracts/src/prompts/discovery.ts
@@ -112,6 +112,7 @@ Form authoring rules:
 - If you keep the \`brand\` question, its \`id\` must stay \`"brand"\`. Its three default branch values must stay exactly \`"pick_direction"\`, \`"brand_spec"\`, and \`"reference_match"\` even if you localize the labels.
 - If the initial brief already includes a brand spec, brand-guide attachment, reference URL, or screenshot, you may drop the \`brand\` question as already answered, but you must still treat that provided source as Branch A below.
 - Tailor the questions to the actual brief — drop defaults the user already answered, add fields the brief uniquely needs (number of slides, list of mobile screens, sections of a landing page).
+- Emit exactly ONE \`<question-form>\` in this turn. If you tailor \`<question-form id="discovery">\` for the brief, that tailored form replaces the default "Quick brief — 30 seconds" form; never output both.
 - **Read the "Project metadata" section AND any "## Active plugin" / "## Plugin inputs" block later in this prompt before writing the form.** "Project metadata" lists what the user chose at create time (kind, fidelity, speakerNotes, slideCount, animations, template, platform); "Plugin inputs" lists the same kind of brief data when the project was opened through a plugin chip on Home (e.g. \`fidelity: "high-fidelity"\`, \`platform: "desktop"\`, \`artifactKind: "web prototype"\`, \`slideCount: "10-15 pages"\`, \`audience: "product evaluators"\`, \`designSystem: "..."\`). **Both sources are equally authoritative — treat a plugin input value as a complete answer to the matching default question.** Concretely: a plugin input \`fidelity\` answers the Fidelity question; \`platform\` (or a semantically-equivalent input such as \`surface\`, \`platformTargets\`, \`target\`) answers Target platform; \`slideCount\` / \`slides\` / \`pageCount\` answers Slide count / number of pages; \`artifactKind\` / \`mode\` / \`taskKind\` already names what we are making so do not re-ask "What are we making?"; \`audience\` answers "Who is this for?"; \`designSystem\` / \`brand\` answers Brand context. Drop the matching default question whenever EITHER source supplies the answer; ADD a tailored question for any field marked "(unknown — ask)". For example, on a deck with \`speakerNotes: (unknown — ask…)\`, include a yes/no on speaker notes; on a template project where animations is unknown, include a motion radio; on a cross-platform project, ask which screens need native variants instead of re-asking platform. Don't re-ask the kind itself if metadata.kind is set or the active plugin's \`od.kind\` / \`taskKind\` already names it — the user already told you.
 - Keep it under ~7 questions. Second batch in a follow-up form if needed.
 - Lead with one short prose line ("Got it — pitch deck for a SaaS product, B2B audience. Tell me the rest:") then the form. Do **not** write a long pre-amble.
diff --git a/packages/download/package.json b/packages/download/package.json
index 8013c758f..f7a6bf317 100644
--- a/packages/download/package.json
+++ b/packages/download/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/download",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "main": "./dist/index.mjs",
diff --git a/packages/host/package.json b/packages/host/package.json
index 12913e81d..eb8962111 100644
--- a/packages/host/package.json
+++ b/packages/host/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/host",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "description": "Open Design renderer host bridge protocol.",
diff --git a/packages/platform/package.json b/packages/platform/package.json
index b6394bdbc..6584f7de1 100644
--- a/packages/platform/package.json
+++ b/packages/platform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/platform",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "main": "./dist/index.mjs",
diff --git a/packages/sidecar-proto/package.json b/packages/sidecar-proto/package.json
index 21bf45619..3973151ef 100644
--- a/packages/sidecar-proto/package.json
+++ b/packages/sidecar-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/sidecar-proto",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "main": "./dist/index.mjs",
diff --git a/packages/sidecar/package.json b/packages/sidecar/package.json
index 5e296f447..5f5c59099 100644
--- a/packages/sidecar/package.json
+++ b/packages/sidecar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/sidecar",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "main": "./dist/index.mjs",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3d1c52934..9c2ff8b14 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -333,6 +333,9 @@ importers:
       '@aws-sdk/client-s3':
         specifier: 3.1050.0
         version: 3.1050.0
+      '@open-design/contracts':
+        specifier: workspace:*
+        version: link:../packages/contracts
       '@playwright/test':
         specifier: 1.60.0
         version: 1.60.0
@@ -596,6 +599,10 @@ importers:
       vitest:
         specifier: 4.1.6
         version: 4.1.6(@opentelemetry/api@1.9.1)(@types/node@24.12.2)(jsdom@29.1.1)(vite@7.3.3(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.22.3)(yaml@2.9.0))
+    optionalDependencies:
+      '@powerformer/vela-cli':
+        specifier: 0.0.3
+        version: 0.0.3
 
   tools/serve:
     dependencies:
@@ -1635,6 +1642,15 @@ packages:
   '@posthog/types@1.374.2':
     resolution: {integrity: sha512-ZghQSFMi+HFJNPvPjBoyY/jWQ+q6mSQVtWQxOHMSbBidUZjsyYbxYxBFbHy2qWLNe4mEpX+Wqir2Q4I/4AVvJQ==}
 
+  '@powerformer/vela-cli-darwin-arm64@0.0.3':
+    resolution: {integrity: sha512-tNFNiYVMfp64SHojvpcVV8zIw5RHgaqu8tLcI7SZdk1zS3dAv1gZ20ayebBpxWWAoj2wNMsuA6W006mRRRyjdQ==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@powerformer/vela-cli@0.0.3':
+    resolution: {integrity: sha512-ZUrFNFJ/2gvSmQbXLPqRZCeeOR/bNyj0pxhJwKHxiAbGQWVNlTDFy9lDzyID3gD+UH3VMZacmbvSPQyhuRyxAQ==}
+    hasBin: true
+
   '@rollup/pluginutils@5.3.0':
     resolution: {integrity: sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==}
     engines: {node: '>=14.0.0'}
@@ -6027,6 +6043,14 @@ snapshots:
 
   '@posthog/types@1.374.2': {}
 
+  '@powerformer/vela-cli-darwin-arm64@0.0.3':
+    optional: true
+
+  '@powerformer/vela-cli@0.0.3':
+    optionalDependencies:
+      '@powerformer/vela-cli-darwin-arm64': 0.0.3
+    optional: true
+
   '@rollup/pluginutils@5.3.0(rollup@4.60.2)':
     dependencies:
       '@types/estree': 1.0.8
diff --git a/scripts/guard.ts b/scripts/guard.ts
index 96f5d6d9b..f200b8311 100644
--- a/scripts/guard.ts
+++ b/scripts/guard.ts
@@ -79,6 +79,14 @@ const residualAllowedExactPaths = new Set([
   "scripts/scaffold-html-ppt-skills.mjs",
   "scripts/sync-hyperframes-skill.mjs",
   "scripts/verify-media-models.mjs",
+  // AMR (vela) verifier: ad-hoc dev runner that imports the daemon's compiled
+  // `dist/acp.js` and drives a real `vela agent run` against a live model.
+  // Kept as .mjs so it can be invoked directly via Node without any transform.
+  "apps/daemon/scripts/verify-amr-real-vela.mjs",
+  // Fake `vela agent run --runtime opencode` ACP stdio stub used by the AMR
+  // integration tests. The Vitest test spawns it via `child_process.spawn`,
+  // which needs a directly-executable file (shebang + .mjs).
+  "apps/daemon/tests/fixtures/fake-vela.mjs",
   "tools/dev/bin/tools-dev.mjs",
   "tools/dev/esbuild.config.mjs",
   "tools/pack/bin/tools-pack.mjs",
diff --git a/tools/dev/package.json b/tools/dev/package.json
index c1e6757f4..d66ecd18b 100644
--- a/tools/dev/package.json
+++ b/tools/dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/tools-dev",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "bin": {
diff --git a/tools/pack/package.json b/tools/pack/package.json
index 8eb39e650..816de8f56 100644
--- a/tools/pack/package.json
+++ b/tools/pack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-design/tools-pack",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "bin": {
@@ -13,14 +13,17 @@
     "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.tests.json --noEmit"
   },
   "dependencies": {
+    "@electron/notarize": "3.1.1",
     "@electron/rebuild": "4.0.4",
     "@open-design/platform": "workspace:*",
     "@open-design/sidecar": "workspace:*",
     "@open-design/sidecar-proto": "workspace:*",
-    "@electron/notarize": "3.1.1",
     "cac": "6.7.14",
     "electron-builder": "26.8.1"
   },
+  "optionalDependencies": {
+    "@powerformer/vela-cli": "0.0.3"
+  },
   "devDependencies": {
     "@types/node": "24.12.2",
     "esbuild": "0.28.0",
diff --git a/tools/pack/src/config.ts b/tools/pack/src/config.ts
index 2b922eb62..60f1796d0 100644
--- a/tools/pack/src/config.ts
+++ b/tools/pack/src/config.ts
@@ -17,6 +17,7 @@ export type ToolPackPlatform = "mac" | "win" | "linux";
 export type ToolPackBuildOutput = "all" | "app" | "appimage" | "dir" | "dmg" | "nsis" | "zip";
 export type ToolPackMacCompression = "store" | "normal" | "maximum";
 export type ToolPackWebOutputMode = "server" | "standalone";
+export type ToolPackAmrProfile = "prod" | "test" | "local";
 type ToolPackPrereleaseChannel = "beta" | "nightly" | "preview";
 
 export type ToolPackCliOptions = {
@@ -35,6 +36,7 @@ export type ToolPackCliOptions = {
   removeLogs?: boolean;
   removeProductUserData?: boolean;
   removeSidecars?: boolean;
+  requireVelaCli?: boolean;
   signed?: boolean;
   silent?: boolean;
   to?: string;
@@ -70,9 +72,11 @@ export type ToolPackConfig = {
   removeLogs: boolean;
   removeProductUserData: boolean;
   removeSidecars: boolean;
+  requireVelaCli: boolean;
   roots: ToolPackRoots;
   silent: boolean;
   signed: boolean;
+  amrProfile?: ToolPackAmrProfile;
   telemetryRelayUrl?: string;
   /**
    * PostHog product-analytics ingest key, sourced from process.env.POSTHOG_KEY
@@ -164,6 +168,14 @@ function resolveToolPackWebOutputMode(platform: ToolPackPlatform, value: string
   throw new Error(`unsupported OD_WEB_OUTPUT_MODE value: ${value}`);
 }
 
+function resolveToolPackAmrProfile(value: string | undefined): ToolPackAmrProfile | undefined {
+  if (value == null) return undefined;
+  const normalized = value.trim();
+  if (normalized.length === 0) return undefined;
+  if (normalized === "prod" || normalized === "test" || normalized === "local") return normalized;
+  throw new Error(`OPEN_DESIGN_AMR_PROFILE must be prod, test, or local: ${value}`);
+}
+
 function resolveToolPackPosthogKey(value: string | undefined): string | undefined {
   if (value == null) return undefined;
   const normalized = value.trim();
@@ -318,8 +330,10 @@ export function resolveToolPackConfig(
     removeLogs: options.removeLogs === true,
     removeProductUserData: options.removeProductUserData === true,
     removeSidecars: options.removeSidecars === true,
+    requireVelaCli: options.requireVelaCli === true,
     silent: options.silent !== false,
     signed: options.signed === true,
+    amrProfile: resolveToolPackAmrProfile(process.env.OPEN_DESIGN_AMR_PROFILE),
     telemetryRelayUrl: resolveToolPackTelemetryRelayUrl(process.env.OPEN_DESIGN_TELEMETRY_RELAY_URL),
     posthogKey: resolveToolPackPosthogKey(process.env.POSTHOG_KEY),
     posthogHost: resolveToolPackPosthogHost(process.env.POSTHOG_HOST),
diff --git a/tools/pack/src/index.ts b/tools/pack/src/index.ts
index 98f0d9e5c..c36d4ff9b 100644
--- a/tools/pack/src/index.ts
+++ b/tools/pack/src/index.ts
@@ -84,6 +84,7 @@ function addBuildOptions(command: CacCommand, platform: ToolPackPlatform) {
   return command
     .option("--app-version <version>", "override packaged app version for release artifacts")
     .option("--portable", "do not bake local tools-pack runtime roots into the packaged config")
+    .option("--require-vela-cli", "fail packaging when the bundled Vela CLI cannot be resolved")
     .option("--signed", "build a signed/notarized mac artifact")
     .option("--to <target>", TO_HELP_BY_PLATFORM[platform]);
 }
diff --git a/tools/pack/src/linux.ts b/tools/pack/src/linux.ts
index f6db96ef8..5508c6c6c 100644
--- a/tools/pack/src/linux.ts
+++ b/tools/pack/src/linux.ts
@@ -28,6 +28,7 @@ import {
 
 import type { ToolPackConfig } from "./config.js";
 import { copyBundledResourceTrees, linuxResources } from "./resources.js";
+import { copyOptionalVelaCliBinary } from "./vela-cli.js";
 import { electronBuilderVersionForAppVersion, readRuntimeAppVersion } from "./versions.js";
 import { processWebSourcemaps } from "./web-sourcemaps.js";
 
@@ -176,6 +177,9 @@ export function buildDockerArgs(
     `--namespace ${config.namespace}`,
     "--dir /tools-pack",
   ];
+  if (config.requireVelaCli) {
+    innerArgs.push("--require-vela-cli");
+  }
   if (config.portable) {
     innerArgs.push("--portable");
   }
@@ -211,6 +215,23 @@ export function buildDockerArgs(
   if (config.telemetryRelayUrl != null) {
     dockerArgs.push("-e", `OPEN_DESIGN_TELEMETRY_RELAY_URL=${config.telemetryRelayUrl}`);
   }
+  const velaBinHost = process.env.OPEN_DESIGN_VELA_CLI_BIN?.trim();
+  if (velaBinHost) {
+    // The container only mounts /project, /tools-pack and cache/home dirs by
+    // default, so a Vela CLI living outside those (a host path like
+    // `~/.local/bin/vela` is the common dev case) would be invisible inside.
+    // Bind-mount the containing directory read-only and rewrite the env to
+    // the container-side path so `copyOptionalVelaCliBinary` can actually
+    // read it.
+    const hostVelaDir = dirname(velaBinHost);
+    const velaBinBase = basename(velaBinHost);
+    const containerVelaDir = "/opt/vela-cli";
+    dockerArgs.push("-v", `${hostVelaDir}:${containerVelaDir}:ro`);
+    dockerArgs.push("-e", `OPEN_DESIGN_VELA_CLI_BIN=${containerVelaDir}/${velaBinBase}`);
+  }
+  if (config.amrProfile != null) {
+    dockerArgs.push("-e", `OPEN_DESIGN_AMR_PROFILE=${config.amrProfile}`);
+  }
   dockerArgs.push(
     "-w",
     "/project",
@@ -431,6 +452,11 @@ async function copyResourceTree(config: ToolPackConfig, paths: LinuxPaths): Prom
   await mkdir(join(paths.resourceRoot, "bin"), { recursive: true });
   await cp(process.execPath, join(paths.resourceRoot, "bin", "node"));
   await chmod(join(paths.resourceRoot, "bin", "node"), 0o755);
+  await copyOptionalVelaCliBinary({
+    platform: "linux",
+    requireBundled: config.requireVelaCli,
+    resourceRoot: paths.resourceRoot,
+  });
 }
 
 // --- Step 4: writeAssembledApp helper ---
@@ -476,6 +502,7 @@ async function writeAssembledApp(
     paths.packagedConfigPath,
     `${JSON.stringify(
       {
+        ...(config.amrProfile == null ? {} : { amrProfile: config.amrProfile }),
         appVersion: version,
         namespace: config.namespace,
         nodeCommandRelative: "open-design/bin/node",
diff --git a/tools/pack/src/mac/app.ts b/tools/pack/src/mac/app.ts
index 8cbb6fb1f..8d8a13474 100644
--- a/tools/pack/src/mac/app.ts
+++ b/tools/pack/src/mac/app.ts
@@ -18,6 +18,7 @@ import {
   shouldUseMacStandalonePrebundle,
 } from "../mac-prebundle.js";
 import { copyBundledResourceTrees } from "../resources.js";
+import { copyOptionalVelaCliBinary } from "../vela-cli.js";
 import { electronBuilderVersionForAppVersion } from "../versions.js";
 import { runEsbuild, runNpmInstall, runPnpm } from "./commands.js";
 import {
@@ -137,6 +138,11 @@ export async function copyResourceTree(config: ToolPackConfig, paths: MacPaths):
     workspaceRoot: config.workspaceRoot,
     resourceRoot: paths.resourceRoot,
   });
+  await copyOptionalVelaCliBinary({
+    platform: "mac",
+    requireBundled: config.requireVelaCli,
+    resourceRoot: paths.resourceRoot,
+  });
 }
 
 export function renderMacPackagedConfig(options: {
@@ -146,6 +152,7 @@ export function renderMacPackagedConfig(options: {
 }): string {
   return `${JSON.stringify(
     {
+      ...(options.config.amrProfile == null ? {} : { amrProfile: options.config.amrProfile }),
       appVersion: options.appVersion,
       ...(options.usePrebundledStandaloneWeb ? { daemonCliEntryRelative: MAC_PREBUNDLED_DAEMON_CLI_RELATIVE_PATH } : {}),
       ...(options.usePrebundledStandaloneWeb
diff --git a/tools/pack/src/vela-cli.ts b/tools/pack/src/vela-cli.ts
new file mode 100644
index 000000000..aacf720ef
--- /dev/null
+++ b/tools/pack/src/vela-cli.ts
@@ -0,0 +1,150 @@
+import { chmod, cp, mkdir, stat } from "node:fs/promises";
+import { dirname, join } from "node:path";
+
+export const VELA_CLI_BIN_ENV = "OPEN_DESIGN_VELA_CLI_BIN";
+const OPEN_CODE_COMPANION_RELATIVE_PATH = ["libexec", "opencode"] as const;
+
+type VelaCliPlatform = "linux" | "mac" | "win";
+type VelaCliResolveResult =
+  | string
+  | null
+  | undefined
+  | {
+      path?: string | null;
+      supported?: boolean;
+    };
+type VelaCliResolverModule = {
+  resolveVelaCliBin?: (
+    options?: { strict?: boolean },
+  ) => VelaCliResolveResult | Promise<VelaCliResolveResult>;
+};
+
+function strictResolutionError(message: string, cause?: unknown): Error {
+  return new Error(
+    `${message}; install @powerformer/vela-cli through pnpm install or set ${VELA_CLI_BIN_ENV}`,
+    cause === undefined ? undefined : { cause },
+  );
+}
+
+function targetBinaryName(platform: VelaCliPlatform): string {
+  return platform === "win" ? "vela.exe" : "vela";
+}
+
+export async function copyOptionalVelaCliBinary({
+  env = process.env,
+  importPackage,
+  platform,
+  requireBundled = false,
+  resourceRoot,
+}: {
+  env?: NodeJS.ProcessEnv;
+  importPackage?: (packageName: string) => Promise<VelaCliResolverModule>;
+  platform: VelaCliPlatform;
+  requireBundled?: boolean;
+  resourceRoot: string;
+}): Promise<{ source: string; target: string } | null> {
+  const source = await resolveOptionalVelaCliBinary({ env, importPackage, requireBundled });
+  if (source == null) return null;
+  const target = join(resourceRoot, "bin", targetBinaryName(platform));
+  await mkdir(dirname(target), { recursive: true });
+  await cp(source, target);
+  await copyBundledOpenCodeTree({ requireBundled, resourceRoot, source });
+  if (platform !== "win") {
+    await chmod(target, 0o755);
+  }
+  return { source, target };
+}
+
+export function resolveVelaCliOpenCodeCompanionTree(source: string): string {
+  return join(dirname(source), ...OPEN_CODE_COMPANION_RELATIVE_PATH);
+}
+
+export async function resolveOptionalVelaCliOpenCodeCompanionTree(
+  source: string,
+): Promise<string | null> {
+  const sourceTree = resolveVelaCliOpenCodeCompanionTree(source);
+  return (await isDirectory(sourceTree)) ? sourceTree : null;
+}
+
+async function copyBundledOpenCodeTree({
+  requireBundled,
+  resourceRoot,
+  source,
+}: {
+  requireBundled: boolean;
+  resourceRoot: string;
+  source: string;
+}): Promise<void> {
+  const sourceTree = resolveVelaCliOpenCodeCompanionTree(source);
+  const targetTree = join(resourceRoot, "bin", ...OPEN_CODE_COMPANION_RELATIVE_PATH);
+  if (!(await isDirectory(sourceTree))) {
+    if (requireBundled) {
+      throw strictResolutionError(
+        `unable to resolve bundled Vela CLI: OpenCode companion directory is missing at ${sourceTree}`,
+      );
+    }
+    return;
+  }
+  await cp(sourceTree, targetTree, { force: true, recursive: true });
+}
+
+async function isDirectory(path: string): Promise<boolean> {
+  try {
+    return (await stat(path)).isDirectory();
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return false;
+    throw error;
+  }
+}
+
+export async function resolveOptionalVelaCliBinary({
+  env = process.env,
+  importPackage = async (packageName: string) =>
+    import(packageName) as Promise<VelaCliResolverModule>,
+  requireBundled = false,
+}: {
+  env?: NodeJS.ProcessEnv;
+  importPackage?: (packageName: string) => Promise<VelaCliResolverModule>;
+  requireBundled?: boolean;
+} = {}): Promise<string | null> {
+  const envSource = env[VELA_CLI_BIN_ENV]?.trim();
+  if (envSource) return envSource;
+
+  let resolver: VelaCliResolverModule;
+  try {
+    resolver = await importPackage("@powerformer/vela-cli");
+  } catch (error) {
+    if (requireBundled) {
+      throw strictResolutionError(
+        "unable to resolve bundled Vela CLI: package @powerformer/vela-cli is unavailable",
+        error,
+      );
+    }
+    return null;
+  }
+
+  if (typeof resolver.resolveVelaCliBin !== "function") {
+    if (requireBundled) {
+      throw strictResolutionError(
+        "unable to resolve bundled Vela CLI: @powerformer/vela-cli must export resolveVelaCliBin",
+      );
+    }
+    return null;
+  }
+
+  const resolved = await resolver.resolveVelaCliBin({ strict: requireBundled });
+  if (typeof resolved === "string") {
+    const normalized = resolved.trim();
+    if (normalized.length > 0) return normalized;
+  }
+  if (resolved && typeof resolved === "object" && typeof resolved.path === "string") {
+    const normalized = resolved.path.trim();
+    if (normalized.length > 0) return normalized;
+  }
+  if (requireBundled) {
+    throw strictResolutionError(
+      "unable to resolve bundled Vela CLI: @powerformer/vela-cli returned no binary path",
+    );
+  }
+  return null;
+}
diff --git a/tools/pack/src/win/manifest.ts b/tools/pack/src/win/manifest.ts
index 3a93beb9f..6969d7a3f 100644
--- a/tools/pack/src/win/manifest.ts
+++ b/tools/pack/src/win/manifest.ts
@@ -22,6 +22,7 @@ function createPackagedConfig(
   entrypoints: PackagedConfigEntrypoints = {},
 ): Record<string, unknown> {
   return {
+    ...(config.amrProfile == null ? {} : { amrProfile: config.amrProfile }),
     appVersion: packagedVersion,
     ...entrypoints,
     namespace: config.namespace,
diff --git a/tools/pack/src/win/resources.ts b/tools/pack/src/win/resources.ts
index 3bfc62abf..8e19e66a5 100644
--- a/tools/pack/src/win/resources.ts
+++ b/tools/pack/src/win/resources.ts
@@ -4,11 +4,23 @@ import { dirname, join } from "node:path";
 import { hashJson, hashPath, ToolPackCache } from "../cache.js";
 import type { ToolPackConfig } from "../config.js";
 import { copyBundledResourceTrees, winResources } from "../resources.js";
+import {
+  copyOptionalVelaCliBinary,
+  resolveOptionalVelaCliBinary,
+  resolveOptionalVelaCliOpenCodeCompanionTree,
+} from "../vela-cli.js";
 import type { WinPaths, ResourceTreeCacheMetadata } from "./types.js";
 
-const RESOURCE_TREE_CACHE_SCHEMA_VERSION = 3;
+const RESOURCE_TREE_CACHE_SCHEMA_VERSION = 4;
 
 async function createResourceTreeCacheKey(config: ToolPackConfig): Promise<string> {
+  const velaCliBin = await resolveOptionalVelaCliBinary({
+    requireBundled: config.requireVelaCli,
+  });
+  const velaOpenCodeCompanion =
+    velaCliBin == null
+      ? null
+      : await resolveOptionalVelaCliOpenCodeCompanionTree(velaCliBin);
   return hashJson({
     assetsCommunityPets: await hashPath(join(config.workspaceRoot, "assets", "community-pets")),
     assetsFrames: await hashPath(join(config.workspaceRoot, "assets", "frames")),
@@ -21,6 +33,11 @@ async function createResourceTreeCacheKey(config: ToolPackConfig): Promise<strin
     promptTemplates: await hashPath(join(config.workspaceRoot, "prompt-templates")),
     schemaVersion: RESOURCE_TREE_CACHE_SCHEMA_VERSION,
     skills: await hashPath(join(config.workspaceRoot, "skills")),
+    requireVelaCli: config.requireVelaCli,
+    velaCliBin: velaCliBin ? await hashPath(velaCliBin) : null,
+    velaOpenCodeCompanion: velaOpenCodeCompanion
+      ? await hashPath(velaOpenCodeCompanion)
+      : null,
   });
 }
 
@@ -48,6 +65,11 @@ export async function prepareResourceTree(
         workspaceRoot: config.workspaceRoot,
         resourceRoot,
       });
+      await copyOptionalVelaCliBinary({
+        platform: "win",
+        requireBundled: config.requireVelaCli,
+        resourceRoot,
+      });
       return { resourceName: "open-design" };
     },
   };
diff --git a/tools/pack/tests/config.test.ts b/tools/pack/tests/config.test.ts
index b0c40ad38..58bf0e570 100644
--- a/tools/pack/tests/config.test.ts
+++ b/tools/pack/tests/config.test.ts
@@ -5,6 +5,7 @@ import { resolveToolPackConfig } from "../src/config.js";
 const savedTelemetryRelayUrl = process.env.OPEN_DESIGN_TELEMETRY_RELAY_URL;
 const savedPosthogKey = process.env.POSTHOG_KEY;
 const savedPosthogHost = process.env.POSTHOG_HOST;
+const savedAmrProfile = process.env.OPEN_DESIGN_AMR_PROFILE;
 
 afterEach(() => {
   if (savedTelemetryRelayUrl == null) {
@@ -22,6 +23,41 @@ afterEach(() => {
   } else {
     process.env.POSTHOG_HOST = savedPosthogHost;
   }
+  if (savedAmrProfile == null) {
+    delete process.env.OPEN_DESIGN_AMR_PROFILE;
+  } else {
+    process.env.OPEN_DESIGN_AMR_PROFILE = savedAmrProfile;
+  }
+});
+
+describe("resolveToolPackConfig AMR profile", () => {
+  it("bakes OPEN_DESIGN_AMR_PROFILE into packaged config when set at build time", () => {
+    process.env.OPEN_DESIGN_AMR_PROFILE = "test";
+    const config = resolveToolPackConfig("mac", { namespace: "amr-profile-test" });
+    expect(config.amrProfile).toBe("test");
+  });
+
+  it("rejects unsupported AMR profiles before packaging", () => {
+    process.env.OPEN_DESIGN_AMR_PROFILE = "staging";
+    expect(() => resolveToolPackConfig("mac")).toThrow(
+      /OPEN_DESIGN_AMR_PROFILE must be prod, test, or local/,
+    );
+  });
+});
+
+describe("resolveToolPackConfig Vela CLI requirement", () => {
+  it("defaults to optional Vela CLI bundling", () => {
+    const config = resolveToolPackConfig("mac", { namespace: "vela-optional-test" });
+    expect(config.requireVelaCli).toBe(false);
+  });
+
+  it("reads --require-vela-cli from build options", () => {
+    const config = resolveToolPackConfig("mac", {
+      namespace: "vela-required-test",
+      requireVelaCli: true,
+    });
+    expect(config.requireVelaCli).toBe(true);
+  });
 });
 
 describe("resolveToolPackConfig win build target", () => {
diff --git a/tools/pack/tests/linux.test.ts b/tools/pack/tests/linux.test.ts
index 6b43b6b00..05a09a119 100644
--- a/tools/pack/tests/linux.test.ts
+++ b/tools/pack/tests/linux.test.ts
@@ -61,6 +61,7 @@ function makeConfig(): ToolPackConfig {
     removeLogs: false,
     removeProductUserData: false,
     removeSidecars: false,
+    requireVelaCli: false,
     roots: {
       output: {
         appBuilderRoot: "/work/.tmp/tools-pack/out/linux/namespaces/default/builder",
@@ -131,6 +132,36 @@ describe("buildDockerArgs", () => {
     expect(args).toContain("OPEN_DESIGN_TELEMETRY_RELAY_URL=https://telemetry.open-design.ai/api/langfuse");
   });
 
+  it("passes the AMR profile into containerized builds when configured", () => {
+    const args = buildDockerArgs(
+      {
+        ...makeConfig(),
+        amrProfile: "test",
+      },
+      { uid: 1000, gid: 1000 },
+    );
+    expect(args).toContain("OPEN_DESIGN_AMR_PROFILE=test");
+  });
+
+  it("bind-mounts the host Vela binary directory and rewrites the env path into the container", () => {
+    const previous = process.env.OPEN_DESIGN_VELA_CLI_BIN;
+    process.env.OPEN_DESIGN_VELA_CLI_BIN = "/host/bin/vela";
+    try {
+      const args = buildDockerArgs(makeConfig(), { uid: 1000, gid: 1000 });
+      // The container only mounts /project, /tools-pack, and cache/home by
+      // default — a host-path env value like `/host/bin/vela` would resolve
+      // to a non-existent path inside. The directory must be bind-mounted
+      // and the env rewritten to the container-side path so the resource
+      // copier can actually read the binary.
+      expect(args).toContain("/host/bin:/opt/vela-cli:ro");
+      expect(args).toContain("OPEN_DESIGN_VELA_CLI_BIN=/opt/vela-cli/vela");
+      expect(args).not.toContain("OPEN_DESIGN_VELA_CLI_BIN=/host/bin/vela");
+    } finally {
+      if (previous === undefined) delete process.env.OPEN_DESIGN_VELA_CLI_BIN;
+      else process.env.OPEN_DESIGN_VELA_CLI_BIN = previous;
+    }
+  });
+
   it("runs the built tools-pack CLI through node inside the container without generated package-bin shims", () => {
     const args = buildDockerArgs(makeConfig(), { uid: 1000, gid: 1000 });
     const last = args[args.length - 1];
@@ -229,6 +260,18 @@ describe("buildDockerArgs", () => {
     expect(last).toMatch(/--portable/);
   });
 
+  it("forwards --require-vela-cli to the inner containerized build when strict packaging is requested", () => {
+    const args = buildDockerArgs({ ...makeConfig(), requireVelaCli: true }, { uid: 1000, gid: 1000 });
+    const last = args[args.length - 1];
+    expect(last).toMatch(/--require-vela-cli/);
+  });
+
+  it("omits --require-vela-cli from containerized builds by default", () => {
+    const args = buildDockerArgs(makeConfig(), { uid: 1000, gid: 1000 });
+    const last = args[args.length - 1];
+    expect(last).not.toMatch(/--require-vela-cli/);
+  });
+
   it("omits --portable when config.portable is false", () => {
     const args = buildDockerArgs(makeConfig(), { uid: 1000, gid: 1000 });
     const last = args[args.length - 1];
diff --git a/tools/pack/tests/mac-identity.test.ts b/tools/pack/tests/mac-identity.test.ts
index 61154fb72..dd330a824 100644
--- a/tools/pack/tests/mac-identity.test.ts
+++ b/tools/pack/tests/mac-identity.test.ts
@@ -20,6 +20,7 @@ function makeConfig(root: string, namespace: string): ToolPackConfig {
     removeLogs: false,
     removeProductUserData: false,
     removeSidecars: false,
+    requireVelaCli: false,
     roots: {
       output: {
         appBuilderRoot: join(root, ".tmp", "tools-pack", "out", "mac", "namespaces", namespace, "builder"),
diff --git a/tools/pack/tests/mac-lifecycle.test.ts b/tools/pack/tests/mac-lifecycle.test.ts
index 524ca7942..90c007828 100644
--- a/tools/pack/tests/mac-lifecycle.test.ts
+++ b/tools/pack/tests/mac-lifecycle.test.ts
@@ -53,6 +53,7 @@ function makeConfig(root: string, overrides: Partial<ToolPackConfig> = {}): Tool
     removeLogs: false,
     removeProductUserData: false,
     removeSidecars: false,
+    requireVelaCli: false,
     roots: {
       output: {
         appBuilderRoot: join(root, ".tmp", "tools-pack", "out", "mac", "namespaces", "local-test", "builder"),
diff --git a/tools/pack/tests/mac.test.ts b/tools/pack/tests/mac.test.ts
index 0ecff8aaa..19c4ab401 100644
--- a/tools/pack/tests/mac.test.ts
+++ b/tools/pack/tests/mac.test.ts
@@ -37,6 +37,7 @@ function makeConfig(root: string, overrides: Partial<ToolPackConfig> = {}): Tool
     removeLogs: false,
     removeProductUserData: false,
     removeSidecars: false,
+    requireVelaCli: false,
     roots: {
       output: {
         appBuilderRoot: join(root, ".tmp", "tools-pack", "out", "mac", "namespaces", "local-test", "builder"),
diff --git a/tools/pack/tests/release-workflows.test.ts b/tools/pack/tests/release-workflows.test.ts
new file mode 100644
index 000000000..d949a3272
--- /dev/null
+++ b/tools/pack/tests/release-workflows.test.ts
@@ -0,0 +1,27 @@
+import { readFile } from "node:fs/promises";
+
+import { describe, expect, it } from "vitest";
+
+function sectionBetween(content: string, start: string, end: string): string {
+  const startIndex = content.indexOf(start);
+  expect(startIndex).toBeGreaterThanOrEqual(0);
+  const endIndex = content.indexOf(end, startIndex + start.length);
+  expect(endIndex).toBeGreaterThan(startIndex);
+  return content.slice(startIndex, endIndex);
+}
+
+describe("release workflows", () => {
+  it("requires Vela CLI only for beta mac arm64 packaging", async () => {
+    const beta = await readFile(new URL("../../../.github/workflows/release-beta.yml", import.meta.url), "utf8");
+    const mac = sectionBetween(beta, "  build_mac:", "  build_mac_intel:");
+    const macIntel = sectionBetween(beta, "  build_mac_intel:", "  build_win:");
+    const win = sectionBetween(beta, "  build_win:", "  build_linux:");
+    const linux = sectionBetween(beta, "  build_linux:", "  publish:");
+
+    expect(mac).toContain("--require-vela-cli");
+    expect(macIntel).not.toContain("--require-vela-cli");
+    expect(win).not.toContain("--require-vela-cli");
+    expect(linux).not.toContain("--require-vela-cli");
+    expect(beta.match(/--require-vela-cli/g)?.length).toBe(1);
+  });
+});
diff --git a/tools/pack/tests/resources.test.ts b/tools/pack/tests/resources.test.ts
index 99369dec8..0b9ce5286 100644
--- a/tools/pack/tests/resources.test.ts
+++ b/tools/pack/tests/resources.test.ts
@@ -1,9 +1,31 @@
 import { describe, expect, it } from "vitest";
-import { mkdtemp, readFile, rm, writeFile, mkdir } from "node:fs/promises";
+import {
+  access,
+  chmod,
+  constants,
+  mkdir,
+  mkdtemp,
+  readFile,
+  rm,
+  stat,
+  writeFile,
+} from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 
 import { copyBundledResourceTrees } from "../src/resources.js";
+import { copyOptionalVelaCliBinary, resolveOptionalVelaCliBinary } from "../src/vela-cli.js";
+
+async function writeFakeOpenCodeCompanion(
+  source: string,
+  content = "#!/bin/sh\nexit 0\n",
+): Promise<string> {
+  const companion = join(dirname(source), "libexec", "opencode", "opencode");
+  await mkdir(dirname(companion), { recursive: true });
+  await writeFile(companion, content, "utf8");
+  await chmod(companion, 0o755);
+  return companion;
+}
 
 describe("copyBundledResourceTrees", () => {
   it("includes daemon resource trees", async () => {
@@ -117,3 +139,214 @@ describe("copyBundledResourceTrees", () => {
     }
   });
 });
+
+describe("copyOptionalVelaCliBinary", () => {
+  it("copies a configured Vela CLI binary into the POSIX resource bin", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-tools-pack-vela-"));
+    const source = join(root, "source", "vela");
+    const resourceRoot = join(root, "resources", "open-design");
+
+    try {
+      await mkdir(join(root, "source"), { recursive: true });
+      await writeFile(source, "#!/bin/sh\nexit 0\n", "utf8");
+      await writeFakeOpenCodeCompanion(source, "#!/bin/sh\necho opencode\n");
+
+      const copied = await copyOptionalVelaCliBinary({
+        env: { OPEN_DESIGN_VELA_CLI_BIN: source },
+        platform: "mac",
+        requireBundled: true,
+        resourceRoot,
+      });
+
+      const target = join(resourceRoot, "bin", "vela");
+      const companionTarget = join(resourceRoot, "bin", "libexec", "opencode", "opencode");
+      await expect(readFile(target, "utf8")).resolves.toBe("#!/bin/sh\nexit 0\n");
+      await expect(readFile(companionTarget, "utf8")).resolves.toBe(
+        "#!/bin/sh\necho opencode\n",
+      );
+      await expect(access(target, constants.X_OK)).resolves.toBeUndefined();
+      await expect(access(companionTarget, constants.X_OK)).resolves.toBeUndefined();
+      expect(copied).toEqual({ source, target });
+      expect((await stat(target)).mode & 0o111).not.toBe(0);
+      expect((await stat(companionTarget)).mode & 0o111).not.toBe(0);
+    } finally {
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+
+  it("fails strict mode when the OpenCode companion tree is missing", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-tools-pack-vela-strict-"));
+    const source = join(root, "source", "vela");
+    const resourceRoot = join(root, "resources", "open-design");
+
+    try {
+      await mkdir(join(root, "source"), { recursive: true });
+      await writeFile(source, "#!/bin/sh\nexit 0\n", "utf8");
+
+      await expect(
+        copyOptionalVelaCliBinary({
+          env: { OPEN_DESIGN_VELA_CLI_BIN: source },
+          platform: "mac",
+          requireBundled: true,
+          resourceRoot,
+        }),
+      ).rejects.toThrow(/OpenCode companion directory is missing.*OPEN_DESIGN_VELA_CLI_BIN/);
+    } finally {
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+
+  it("copies the Vela CLI binary without a companion tree in non-strict mode", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-tools-pack-vela-nonstrict-"));
+    const source = join(root, "source", "vela");
+    const resourceRoot = join(root, "resources", "open-design");
+
+    try {
+      await mkdir(join(root, "source"), { recursive: true });
+      await writeFile(source, "#!/bin/sh\nexit 0\n", "utf8");
+
+      const copied = await copyOptionalVelaCliBinary({
+        env: { OPEN_DESIGN_VELA_CLI_BIN: source },
+        platform: "mac",
+        requireBundled: false,
+        resourceRoot,
+      });
+
+      const target = join(resourceRoot, "bin", "vela");
+      const companionTarget = join(resourceRoot, "bin", "libexec", "opencode", "opencode");
+      await expect(readFile(target, "utf8")).resolves.toBe("#!/bin/sh\nexit 0\n");
+      await expect(access(companionTarget)).rejects.toThrow();
+      expect(copied).toEqual({ source, target });
+    } finally {
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+
+  it("copies a configured Vela CLI binary into the Windows resource bin", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-tools-pack-vela-win-"));
+    const source = join(root, "source", "vela.exe");
+    const resourceRoot = join(root, "resources", "open-design");
+
+    try {
+      await mkdir(join(root, "source"), { recursive: true });
+      await writeFile(source, "fake exe\n", "utf8");
+      await writeFakeOpenCodeCompanion(source, "fake opencode\n");
+
+      const copied = await copyOptionalVelaCliBinary({
+        env: { OPEN_DESIGN_VELA_CLI_BIN: source },
+        platform: "win",
+        resourceRoot,
+      });
+
+      const target = join(resourceRoot, "bin", "vela.exe");
+      const companionTarget = join(resourceRoot, "bin", "libexec", "opencode", "opencode");
+      await expect(readFile(target, "utf8")).resolves.toBe("fake exe\n");
+      await expect(readFile(companionTarget, "utf8")).resolves.toBe("fake opencode\n");
+      expect(copied).toEqual({ source, target });
+    } finally {
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+
+  it("copies a Vela CLI binary resolved from the npm package", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-tools-pack-vela-npm-"));
+    const source = join(root, "source", "vela");
+    const resourceRoot = join(root, "resources", "open-design");
+
+    try {
+      await mkdir(join(root, "source"), { recursive: true });
+      await writeFile(source, "#!/bin/sh\nexit 0\n", "utf8");
+      await writeFakeOpenCodeCompanion(source, "#!/bin/sh\necho opencode\n");
+
+      const copied = await copyOptionalVelaCliBinary({
+        env: {},
+        importPackage: async () => ({
+          resolveVelaCliBin: () => source,
+        }),
+        platform: "mac",
+        requireBundled: true,
+        resourceRoot,
+      });
+
+      const target = join(resourceRoot, "bin", "vela");
+      const companionTarget = join(resourceRoot, "bin", "libexec", "opencode", "opencode");
+      await expect(readFile(target, "utf8")).resolves.toBe("#!/bin/sh\nexit 0\n");
+      await expect(readFile(companionTarget, "utf8")).resolves.toBe(
+        "#!/bin/sh\necho opencode\n",
+      );
+      await expect(access(target, constants.X_OK)).resolves.toBeUndefined();
+      expect(copied).toEqual({ source, target });
+    } finally {
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+
+  it("skips copying when the npm resolver reports an unsupported non-strict platform", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-tools-pack-vela-skip-"));
+    const resourceRoot = join(root, "resources", "open-design");
+
+    try {
+      const copied = await copyOptionalVelaCliBinary({
+        env: {},
+        importPackage: async () => ({
+          resolveVelaCliBin: () => null,
+        }),
+        platform: "linux",
+        resourceRoot,
+      });
+
+      expect(copied).toBeNull();
+      await expect(access(join(resourceRoot, "bin", "vela"))).rejects.toThrow();
+    } finally {
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+});
+
+describe("resolveOptionalVelaCliBinary", () => {
+  it("prefers OPEN_DESIGN_VELA_CLI_BIN over the npm resolver", async () => {
+    await expect(
+      resolveOptionalVelaCliBinary({
+        env: { OPEN_DESIGN_VELA_CLI_BIN: "/tmp/local-vela" },
+        importPackage: async () => ({
+          resolveVelaCliBin: () => "/tmp/npm-vela",
+        }),
+      }),
+    ).resolves.toBe("/tmp/local-vela");
+  });
+
+  it("fails strict mode when the resolver package is missing", async () => {
+    await expect(
+      resolveOptionalVelaCliBinary({
+        env: {},
+        importPackage: async () => {
+          throw new Error("not installed");
+        },
+        requireBundled: true,
+      }),
+    ).rejects.toThrow(/@powerformer\/vela-cli.*OPEN_DESIGN_VELA_CLI_BIN/);
+  });
+
+  it("fails strict mode when the resolver returns no binary", async () => {
+    await expect(
+      resolveOptionalVelaCliBinary({
+        env: {},
+        importPackage: async () => ({
+          resolveVelaCliBin: () => ({ supported: false }),
+        }),
+        requireBundled: true,
+      }),
+    ).rejects.toThrow(/@powerformer\/vela-cli.*OPEN_DESIGN_VELA_CLI_BIN/);
+  });
+
+  it("returns null in non-strict mode when the resolver package is missing", async () => {
+    await expect(
+      resolveOptionalVelaCliBinary({
+        env: {},
+        importPackage: async () => {
+          throw new Error("not installed");
+        },
+      }),
+    ).resolves.toBeNull();
+  });
+});
diff --git a/tools/pack/tests/web-sourcemaps.test.ts b/tools/pack/tests/web-sourcemaps.test.ts
index d5255d01e..f57b88219 100644
--- a/tools/pack/tests/web-sourcemaps.test.ts
+++ b/tools/pack/tests/web-sourcemaps.test.ts
@@ -68,6 +68,7 @@ function fakeConfig(workspaceRoot: string): ToolPackConfig {
     removeLogs: false,
     removeProductUserData: false,
     removeSidecars: false,
+    requireVelaCli: false,
     roots: {
       output: {
         appBuilderRoot: join(workspaceRoot, "out", "builder"),
diff --git a/tools/pack/tests/win-app.test.ts b/tools/pack/tests/win-app.test.ts
index dabe8300f..398037040 100644
--- a/tools/pack/tests/win-app.test.ts
+++ b/tools/pack/tests/win-app.test.ts
@@ -46,6 +46,7 @@ function createConfig(root: string, webOutputMode: ToolPackConfig["webOutputMode
     removeLogs: false,
     removeProductUserData: false,
     removeSidecars: false,
+    requireVelaCli: false,
     roots: {
       cacheRoot: join(root, ".cache"),
       output: {
diff --git a/tools/pack/tests/win-resources.test.ts b/tools/pack/tests/win-resources.test.ts
index 419e4a016..82b2a17eb 100644
--- a/tools/pack/tests/win-resources.test.ts
+++ b/tools/pack/tests/win-resources.test.ts
@@ -1,6 +1,6 @@
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { chmod, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 
 import { describe, expect, it } from "vitest";
 
@@ -9,6 +9,17 @@ import type { ToolPackConfig } from "../src/config.js";
 import { prepareResourceTree } from "../src/win/resources.js";
 import type { WinPaths } from "../src/win/types.js";
 
+async function writeFakeOpenCodeCompanion(
+  source: string,
+  content = "#!/bin/sh\nexit 0\n",
+): Promise<string> {
+  const companion = join(dirname(source), "libexec", "opencode", "opencode");
+  await mkdir(dirname(companion), { recursive: true });
+  await writeFile(companion, content, "utf8");
+  await chmod(companion, 0o755);
+  return companion;
+}
+
 async function createWorkspaceFixture(workspaceRoot: string): Promise<void> {
   await mkdir(join(workspaceRoot, "skills", "sample"), { recursive: true });
   await mkdir(join(workspaceRoot, "design-templates", "orbit-general"), {
@@ -92,4 +103,108 @@ describe("prepareResourceTree", () => {
       await rm(root, { force: true, recursive: true });
     }
   });
+
+  it("copies a configured Vela CLI binary into the Windows resource tree", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-win-vela-"));
+    const workspaceRoot = join(root, "workspace");
+    const resourceRoot = join(root, "materialized", "open-design");
+    const source = join(root, "source", "vela.exe");
+    const cache = new ToolPackCache(join(root, "cache"));
+    const config = { workspaceRoot } as ToolPackConfig;
+    const paths = { resourceRoot } as WinPaths;
+    const originalVelaBin = process.env.OPEN_DESIGN_VELA_CLI_BIN;
+
+    try {
+      await createWorkspaceFixture(workspaceRoot);
+      await mkdir(join(root, "source"), { recursive: true });
+      await writeFile(source, "fake vela exe\n", "utf8");
+      await writeFakeOpenCodeCompanion(source, "fake opencode\n");
+      process.env.OPEN_DESIGN_VELA_CLI_BIN = source;
+
+      await prepareResourceTree(config, paths, cache, { materialize: true });
+
+      await expect(readFile(join(resourceRoot, "bin", "vela.exe"), "utf8")).resolves.toBe(
+        "fake vela exe\n",
+      );
+      await expect(
+        readFile(join(resourceRoot, "bin", "libexec", "opencode", "opencode"), "utf8"),
+      ).resolves.toBe("fake opencode\n");
+    } finally {
+      if (originalVelaBin == null) delete process.env.OPEN_DESIGN_VELA_CLI_BIN;
+      else process.env.OPEN_DESIGN_VELA_CLI_BIN = originalVelaBin;
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+
+  it("fails strict Windows resource preparation when configured Vela CLI is missing", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-win-vela-strict-"));
+    const workspaceRoot = join(root, "workspace");
+    const resourceRoot = join(root, "materialized", "open-design");
+    const cache = new ToolPackCache(join(root, "cache"));
+    const config = {
+      workspaceRoot,
+      requireVelaCli: true,
+    } as ToolPackConfig;
+    const paths = { resourceRoot } as WinPaths;
+    const originalVelaBin = process.env.OPEN_DESIGN_VELA_CLI_BIN;
+
+    try {
+      await createWorkspaceFixture(workspaceRoot);
+      process.env.OPEN_DESIGN_VELA_CLI_BIN = join(root, "missing", "vela.exe");
+      await expect(
+        prepareResourceTree(config, paths, cache, { materialize: true }),
+      ).rejects.toThrow();
+    } finally {
+      if (originalVelaBin == null) delete process.env.OPEN_DESIGN_VELA_CLI_BIN;
+      else process.env.OPEN_DESIGN_VELA_CLI_BIN = originalVelaBin;
+      await rm(root, { force: true, recursive: true });
+    }
+  });
+
+  it("invalidates the Windows resource tree cache when the Vela companion changes", async () => {
+    const root = await mkdtemp(join(tmpdir(), "open-design-win-vela-companion-"));
+    const workspaceRoot = join(root, "workspace");
+    const resourceRoot = join(root, "materialized", "open-design");
+    const source = join(root, "source", "vela.exe");
+    const cache = new ToolPackCache(join(root, "cache"));
+    const config = { workspaceRoot } as ToolPackConfig;
+    const paths = { resourceRoot } as WinPaths;
+    const originalVelaBin = process.env.OPEN_DESIGN_VELA_CLI_BIN;
+    const materializedCompanion = join(
+      resourceRoot,
+      "bin",
+      "libexec",
+      "opencode",
+      "opencode",
+    );
+
+    try {
+      await createWorkspaceFixture(workspaceRoot);
+      await mkdir(join(root, "source"), { recursive: true });
+      await writeFile(source, "fake vela exe\n", "utf8");
+      const sourceCompanion = await writeFakeOpenCodeCompanion(source, "companion one\n");
+      process.env.OPEN_DESIGN_VELA_CLI_BIN = source;
+
+      await prepareResourceTree(config, paths, cache, { materialize: true });
+      await expect(readFile(materializedCompanion, "utf8")).resolves.toBe(
+        "companion one\n",
+      );
+
+      await writeFile(sourceCompanion, "companion two\n", "utf8");
+
+      await prepareResourceTree(config, paths, cache, { materialize: true });
+
+      await expect(readFile(materializedCompanion, "utf8")).resolves.toBe(
+        "companion two\n",
+      );
+      expect(cache.report().entries.map((entry) => entry.status)).toEqual([
+        "miss",
+        "miss",
+      ]);
+    } finally {
+      if (originalVelaBin == null) delete process.env.OPEN_DESIGN_VELA_CLI_BIN;
+      else process.env.OPEN_DESIGN_VELA_CLI_BIN = originalVelaBin;
+      await rm(root, { force: true, recursive: true });
+    }
+  });
 });
diff --git a/tools/pack/tests/workspace-build.test.ts b/tools/pack/tests/workspace-build.test.ts
index 4bbda6841..d97733138 100644
--- a/tools/pack/tests/workspace-build.test.ts
+++ b/tools/pack/tests/workspace-build.test.ts
@@ -84,6 +84,7 @@ function createConfig(root: string, cacheRoot: string): ToolPackConfig {
     removeLogs: false,
     removeProductUserData: false,
     removeSidecars: false,
+    requireVelaCli: false,
     roots: {
       cacheRoot,
       output: {