@awak-app/simy-cli 0.2.3 → 0.3.3

package/src/cli-contract.js

@@ -1,11 +1,50 @@
-export const CLI_VERSION = "0.2.3";
-export const CLI_API_CONTRACT_VERSION = 3;
+import { localTaskFileCapabilityMetadata } from "./local-task-file-capabilities.js";
+import { localTaskScenarioPackMetadata } from "./local-task-scenario-packs.js";
+import {
+  boundedLocalTaskSubtasksCapabilityMetadata,
+} from "./bounded-local-task-subtasks-contract.js";
+import {
+  DURABLE_LOCAL_TASK_STEP_CLAIM_SCHEMA,
+  LOCAL_TASK_PLAN_ORCHESTRATION_SCHEMA,
+  LOCAL_TASK_PLAN_SCHEMA,
+  LOCAL_TASK_STEP_CONTEXT_SCHEMA,
+  LOCAL_TASK_STEP_SCHEMA,
+  MAX_LOCAL_TASK_PLAN_STEPS,
+} from "./durable-local-task-steps-contract.js";
+import { buildExecutionCapabilityContract } from "./execution-capability-contract.js";
 
-export function withCliContract(capabilities = {}, installMode = null) {
+export const CLI_VERSION = "0.3.3";
+export const CLI_API_CONTRACT_VERSION = 10;
+
+export function withCliContract(
+  capabilities = {},
+  installMode = null,
+  { authenticated = false } = {},
+) {
   return {
     ...capabilities,
     cli_version: CLI_VERSION,
     api_contract_version: CLI_API_CONTRACT_VERSION,
+    local_task_file_capabilities: localTaskFileCapabilityMetadata(),
+    local_task_scenario_packs: localTaskScenarioPackMetadata(),
+    bounded_local_task_subtasks:
+      boundedLocalTaskSubtasksCapabilityMetadata(),
+    durable_local_task_steps: {
+      orchestration_schema_version: LOCAL_TASK_PLAN_ORCHESTRATION_SCHEMA,
+      claim_schema_version: DURABLE_LOCAL_TASK_STEP_CLAIM_SCHEMA,
+      plan_schema_version: LOCAL_TASK_PLAN_SCHEMA,
+      step_schema_version: LOCAL_TASK_STEP_SCHEMA,
+      context_schema_version: LOCAL_TASK_STEP_CONTEXT_SCHEMA,
+      max_steps: MAX_LOCAL_TASK_PLAN_STEPS,
+    },
+    execution_capabilities: buildExecutionCapabilityContract({
+      cliVersion: CLI_VERSION,
+      apiContractVersion: CLI_API_CONTRACT_VERSION,
+      installMode,
+      backends: capabilities.backends,
+      backendVersions: capabilities.backend_versions,
+      authenticated,
+    }),
     ...(installMode ? { install_mode: installMode } : {}),
   };
 }

package/src/console/app.js

@@ -68,14 +68,12 @@ export function AgenticLoopConsole({ agent, onQuit = () => {} }) {
   const selectedRun = runs.find((run) => run.id === selectedId) ?? null;
   const selectableIds = [NEW_TASK, ...runs.map((run) => run.id)];
   const selectedIndex = Math.max(0, selectableIds.indexOf(selectedId));
-  const waitingForHuman = Boolean(
-    selectedRun &&
-      (selectedRun.status === "waiting_human" || selectedRun.controlState === "waiting_human"),
+  const hasNextAction = Boolean(
+    selectedRun && nextActionForRun(selectedRun, isRepositoryMissing(selectedRun)),
   );
   const actionRows =
     1 +
-    (waitingForHuman ? 1 : 0) +
-    (!selectedRun ? 1 : 0) +
+    (hasNextAction ? 1 : 0) +
     (notice || busy ? 1 : 0) +
     (visibleUpdateNotice(cliUpdate) ? 1 : 0);
   const mainHeight = Math.max(8, terminal.rows - 5 - actionRows);
@@ -486,7 +484,7 @@ export function AgenticLoopConsole({ agent, onQuit = () => {} }) {
     flexDirection: "column",
     width: terminal.columns,
     children: [
-      jsx(Header, { agent, runCount: runs.length }),
+      jsx(Header, { agent, runCount: runs.length, width: terminal.columns }),
       jsx(Box, {
         marginTop: 1,
         height: mainHeight,
@@ -535,10 +533,10 @@ export function AgenticLoopConsole({ agent, onQuit = () => {} }) {
         busy,
         notice,
         confirmStop,
-        draft,
         repositoryMissing: isRepositoryMissing(selectedRun),
         modalOpen: Boolean(scanPrompt || repositoryPicker),
         cliUpdate,
+        width: terminal.columns,
       }),
     ],
   });
@@ -546,48 +544,77 @@ export function AgenticLoopConsole({ agent, onQuit = () => {} }) {
 
 export const CodingLoopConsole = AgenticLoopConsole;
 
-function Header({ agent, runCount }) {
+function Header({ agent, runCount, width }) {
+  const compact = width < 84;
+  const version = agent.updates?.snapshot?.().current_version;
   return jsxs(Box, {
     borderStyle: "single",
     borderColor: "cyan",
     paddingX: 1,
+    flexDirection: compact ? "column" : "row",
     children: [
-      jsx(Text, { bold: true, color: "cyan", children: "SIMY" }),
-      jsx(Text, { bold: true, children: " Coding Chat" }),
-      agent.updates?.snapshot?.().current_version
-        ? jsx(Text, {
+      jsxs(Box, {
+        children: [
+          jsx(Text, { bold: true, color: "cyan", children: "SIMY" }),
+          jsx(Text, { bold: true, children: " Local Agent" }),
+          version ? jsx(Text, { dimColor: true, children: `  v${version}` }) : null,
+        ],
+      }),
+      compact
+        ? jsxs(Text, {
             dimColor: true,
-            children: `  v${agent.updates.snapshot().current_version}`,
+            children: [
+              `Connected · localhost:${agent.port}`,
+              jsx(Text, { children: ` · ${runCount} ${runCount === 1 ? "run" : "runs"}` }),
+            ],
           })
-        : null,
-      jsx(Text, { dimColor: true, children: `  localhost:${agent.port}` }),
-      jsx(Spacer, {}),
-      jsx(Text, { color: runCount > 0 ? "green" : "yellow", children: `${runCount} runs` }),
-      jsx(Text, { dimColor: true, children: `  ${agent.webOrigin}` }),
+        : jsx(Text, { dimColor: true, children: `  Connected · localhost:${agent.port}` }),
+      compact ? null : jsx(Spacer, {}),
+      compact
+        ? null
+        : jsx(Text, {
+            color: runCount > 0 ? "green" : undefined,
+            children: `${runCount} ${runCount === 1 ? "run" : "runs"}`,
+          }),
+      compact ? null : jsx(Text, { dimColor: true, children: `  ·  ${agent.webOrigin}` }),
     ],
   });
 }
 
 function NewTask({ draft, loginUrl, width }) {
+  const compact = width < 72;
   return jsxs(Box, {
     width,
+    alignSelf: "flex-start",
     flexDirection: "column",
     borderStyle: "single",
     borderColor: "cyan",
     paddingX: 1,
     children: [
-      jsx(Text, { bold: true, color: "cyan", children: "What do you want to build?" }),
+      jsx(Text, { bold: true, color: "cyan", children: "NEW TASK" }),
+      jsx(Text, { bold: true, children: "What should SIMY do?" }),
       jsx(Text, {
         dimColor: true,
-        children: "Describe the change in the composer. SIMY will create the ledger and run it here.",
+        wrap: "wrap",
+        children:
+          "Describe the outcome. SIMY will choose a one-time Local Task or an Agentic Loop.",
+      }),
+      jsx(Text, { children: " " }),
+      jsx(Text, {
+        children: `${compact ? "Repo" : "Repository"}  ${draft.repository || "Not selected"}`,
       }),
-      jsx(Text, { children: `Repository  ${draft.repository || "not set"}` }),
       jsx(Text, { children: `Branch      ${draft.branch}` }),
-      jsx(Text, { children: `Executor    ${executorLabel(draft.backend)}` }),
+      jsx(Text, { children: `Agent       ${executorLabel(draft.backend)}` }),
       jsx(Text, {
-        children: `Attachments ${draft.attachmentPaths.length === 0 ? "none" : draft.attachmentPaths.join(", ")}`,
+        wrap: "wrap",
+        children: `Files       ${draft.attachmentPaths.length === 0 ? "None" : draft.attachmentPaths.join(", ")}`,
+      }),
+      jsx(Text, { children: " " }),
+      jsx(Text, {
+        bold: true,
+        children: "Next  Type your request below, then press Enter.",
       }),
-      loginUrl ? jsx(Text, { color: "cyan", children: `Sign in: ${loginUrl}` }) : null,
+      loginUrl ? jsx(Text, { color: "cyan", wrap: "wrap", children: `Sign in  ${loginUrl}` }) : null,
     ],
   });
 }
@@ -601,9 +628,10 @@ function RepositoryScanConsent({ root, width, height }) {
     borderColor: "yellow",
     paddingX: 1,
     children: [
-      jsx(Text, { bold: true, color: "yellow", children: "Allow local repository scan?" }),
+      jsx(Text, { bold: true, color: "yellow", children: "REPOSITORY ACCESS" }),
+      jsx(Text, { bold: true, children: "Allow SIMY to find local Git repositories?" }),
       jsx(Text, { children: " " }),
-      jsx(Text, { bold: true, children: "Authorized root" }),
+      jsx(Text, { dimColor: true, children: "Folder to scan" }),
       jsx(Text, { color: "cyan", wrap: "wrap", children: root }),
       jsx(Text, { children: " " }),
       jsx(Text, {
@@ -617,8 +645,12 @@ function RepositoryScanConsent({ root, width, height }) {
           "Source files and file contents are not indexed or uploaded. Hidden, dependency, cache, and symlink directories are skipped.",
       }),
       jsx(Text, { children: " " }),
-      jsx(Text, { bold: true, color: "green", children: "Press y to allow this scan" }),
-      jsx(Text, { dimColor: true, children: "Press n or Esc to cancel. Use /scan <path> to choose a narrower root." }),
+      jsx(Text, { bold: true, children: "Next  Press y to allow this scan." }),
+      jsx(Text, {
+        dimColor: true,
+        wrap: "wrap",
+        children: "Press n or Esc to cancel. Use /scan <path> to choose a narrower folder.",
+      }),
     ],
   });
 }
@@ -640,7 +672,7 @@ function RepositoryPicker({ repositories, selected, requiredRepository, width, h
     children: [
       jsxs(Box, {
         children: [
-          jsx(Text, { bold: true, color: "cyan", children: "LOCAL GIT REPOSITORIES" }),
+          jsx(Text, { bold: true, color: "cyan", children: "CHOOSE A REPOSITORY" }),
           jsx(Spacer, {}),
           jsx(Text, { dimColor: true, children: `${repositories.length} indexed` }),
         ],
@@ -650,7 +682,7 @@ function RepositoryPicker({ repositories, selected, requiredRepository, width, h
             color: "yellow",
             children: `This run requires ${requiredRepository}`,
           })
-        : jsx(Text, { dimColor: true, children: "Choose the repository for the next coding task." }),
+        : jsx(Text, { dimColor: true, children: "Choose the workspace for the next task." }),
       ...visible.map((repository, offset) => {
         const index = start + offset;
         const active = index === selected;
@@ -672,12 +704,13 @@ function RepositoryPicker({ repositories, selected, requiredRepository, width, h
           ],
         }, repository.local_path);
       }),
-      jsx(Text, { dimColor: true, children: "Up/Down select  Enter use repository  Esc cancel" }),
+      jsx(Text, { dimColor: true, children: "↑/↓ select  Enter choose  Esc cancel" }),
     ],
   });
 }
 
 function RunList({ runs, selectedId, width, height }) {
+  const compact = width < 84;
   return jsxs(Box, {
     width,
     height,
@@ -690,33 +723,37 @@ function RunList({ runs, selectedId, width, height }) {
         children: [
           jsx(Text, { bold: true, children: "RUNS" }),
           jsx(Spacer, {}),
-          jsx(Text, { dimColor: true, children: "Enter opens the selected run full screen" }),
+          jsx(Text, { dimColor: true, children: compact ? "Enter open" : "Enter opens details" }),
         ],
       }),
-      jsxs(Box, {
-        borderStyle: selectedId === NEW_TASK ? "round" : undefined,
-        borderColor: selectedId === NEW_TASK ? "cyan" : undefined,
-        paddingX: selectedId === NEW_TASK ? 1 : 2,
-        children: [
-          jsx(Text, { color: "cyan", bold: selectedId === NEW_TASK, children: "+ New task" }),
-        ],
+      jsx(Text, {
+        color: "cyan",
+        bold: selectedId === NEW_TASK,
+        children: `${selectedId === NEW_TASK ? "> " : "  "}+ New task`,
       }),
       ...runs.slice(0, 10).map((run) => {
         const selected = run.id === selectedId;
         return jsxs(Box, {
           flexDirection: "column",
-          borderStyle: selected ? "round" : undefined,
-          borderColor: selected ? "cyan" : undefined,
-          paddingX: selected ? 1 : 2,
+          paddingLeft: 0,
           children: [
             jsxs(Text, {
               children: [
+                jsx(Text, { color: selected ? "cyan" : undefined, children: selected ? "> " : "  " }),
                 jsx(Text, { color: statusColor(run), children: `${statusGlyph(run)} ` }),
                 jsx(Text, { bold: selected, children: shortId(run.id) }),
-                jsx(Text, { dimColor: true, children: `  ${run.request.backend}` }),
+                jsx(Text, {
+                  dimColor: true,
+                  children: compact
+                    ? `  ${statusLabel(run)}`
+                    : `  ${statusLabel(run)} · ${executorLabel(run.request.backend)}`,
+                }),
               ],
             }),
-            jsx(Text, { dimColor: true, children: truncate(run.request.requirement, width - 6) }),
+            jsx(Text, {
+              dimColor: true,
+              children: `    ${truncate(run.request.requirement, Math.max(12, width - 8))}`,
+            }),
           ],
         }, run.id);
       }),
@@ -744,8 +781,9 @@ function RunDetail({ run, rows, scrollFromEnd, width, height }) {
         children: [
           jsxs(Text, {
             children: [
-              jsx(Text, { bold: true, children: run.id }),
-              jsx(Text, { color: statusColor(run), children: `  ${statusLabel(run)}` }),
+              jsx(Text, { color: statusColor(run), children: `${statusGlyph(run)} ` }),
+              jsx(Text, { bold: true, children: statusLabel(run) }),
+              jsx(Text, { dimColor: true, children: `  ${shortId(run.id)}` }),
             ],
           }),
           jsx(Spacer, {}),
@@ -755,7 +793,7 @@ function RunDetail({ run, rows, scrollFromEnd, width, height }) {
           }),
           jsx(Text, {
             color: scroll > 0 ? "yellow" : run.child ? "green" : "gray",
-            children: scroll > 0 ? "  ● scroll paused" : run.child ? "  ● live" : "  ○ idle",
+            children: scroll > 0 ? "  ‖ history" : run.child ? "  ● live" : "  ○ idle",
           }),
         ],
       }),
@@ -772,6 +810,10 @@ function RunDetail({ run, rows, scrollFromEnd, width, height }) {
 }
 
 function Help({ width }) {
+  const groups = [
+    ["TASK", consoleHelpLines().slice(0, 8)],
+    ["RUN", consoleHelpLines().slice(8, 15)],
+  ];
   return jsxs(Box, {
     width,
     borderStyle: "single",
@@ -779,8 +821,12 @@ function Help({ width }) {
     paddingX: 1,
     flexDirection: "column",
     children: [
-      jsx(Text, { bold: true, color: "blue", children: "COMMANDS" }),
-      ...consoleHelpLines().map((line) => jsx(Text, { children: line }, line)),
+      jsx(Text, { bold: true, color: "blue", children: "HELP" }),
+      ...groups.flatMap(([label, lines]) => [
+        jsx(Text, { bold: true, children: label }, `${label}-heading`),
+        ...lines.map((line) => jsx(Text, { children: line }, line)),
+      ]),
+      jsx(Text, { dimColor: true, children: "Esc closes help" }),
     ],
   });
 }
@@ -793,23 +839,23 @@ function ActionBar({
   busy,
   notice,
   confirmStop,
-  draft,
   repositoryMissing,
   modalOpen,
   cliUpdate,
+  width,
 }) {
-  const waiting = run && (run.controlState === "waiting_human" || run.status === "waiting_human");
+  const compact = width < 84;
+  const nextAction = run ? nextActionForRun(run, repositoryMissing) : null;
   return jsxs(Box, {
     flexDirection: "column",
     marginTop: 1,
     children: [
-      waiting
+      nextAction && !modalOpen && !inputMode
         ? jsx(Text, {
             bold: true,
-            color: "yellow",
-            children: repositoryMissing
-              ? "LOCAL REPOSITORY REQUIRED  Press s to review and authorize a local Git repository scan."
-              : "HUMAN INPUT REQUIRED  Press i, type guidance, then Enter.",
+            color: nextAction.tone,
+            wrap: "wrap",
+            children: `NEXT ACTION  ${nextAction.text}`,
           })
         : null,
       modalOpen
@@ -825,27 +871,39 @@ function ActionBar({
         : jsx(Text, {
             dimColor: true,
             children: detailOpen
-              ? "↑/↓ scroll  PgUp/PgDn page  Home/End  Esc runs  i guidance  / command  s scan repos  p pause/resume  r recheck  x stop  ? help  q quit"
-              : "↑/↓ select  Enter open  i guidance  / command  s scan repos  ? help  q quit",
+              ? compact
+                ? "↑/↓ scroll  Esc runs  i act  ? help  q quit"
+                : "↑/↓ scroll  PgUp/PgDn page  Home/End  Esc runs  i act  / command  ? help  q quit"
+              : compact
+                ? "↑/↓ select  Enter open  i act  ? help  q quit"
+                : "↑/↓ select  Enter open  i act  / command  s repositories  ? help  q quit",
           }),
-      !run
-        ? jsx(Text, {
-            dimColor: true,
-            children: `${draft.repository || "repo not set"}  ${draft.branch}  ${executorLabel(draft.backend)}`,
-          })
-        : null,
       notice
         ? jsx(Text, {
             color: confirmStop ? "yellow" : notice.includes("could not") || notice.includes("requires") ? "red" : "cyan",
-            children: `${busy ? "Working... " : ""}${notice}`,
+            wrap: "wrap",
+            children: `${busy ? "WORKING  " : "STATUS  "}${notice}`,
           })
         : busy
-          ? jsx(Text, { color: "cyan", children: "Working..." })
+          ? jsx(Text, { color: "cyan", children: "WORKING  Please wait…" })
           : null,
       visibleUpdateNotice(cliUpdate)
-        ? jsx(Text, {
-            color: cliUpdate.state === "failed" ? "red" : "yellow",
-            children: visibleUpdateNotice(cliUpdate),
+        ? jsxs(Box, {
+            flexDirection: "column",
+            children: [
+              jsx(Text, {
+                bold: true,
+                color: cliUpdate.state === "failed" ? "red" : "yellow",
+                wrap: "wrap",
+                children: `UPDATE  ${cliUpdate.message || "SIMY CLI update status changed."}`,
+              }),
+              cliUpdate.action?.command
+                ? jsx(Text, {
+                    wrap: "wrap",
+                    children: `Next  ${cliUpdate.action.command}`,
+                  })
+                : null,
+            ],
           })
         : null,
     ],
@@ -861,8 +919,7 @@ function visibleUpdateNotice(update) {
   ) {
     return "";
   }
-  const command = update.action?.command ? ` Run: ${update.action.command}` : "";
-  return `${update.message || "SIMY CLI update status changed."}${command}`;
+  return update.message || "SIMY CLI update status changed.";
 }
 
 function initialDraft(agent) {
@@ -914,33 +971,40 @@ function buildRunDetailRows(run, width) {
     for (const text of wrapTerminalText(value, width)) rows.push({ text, ...style });
   };
 
+  const attemptNumber = run.snapshot.attempts.length + (run.child ? 1 : 0);
+  const maxAttempts = run.snapshot.charter?.max_attempts;
   add(
-    `PID ${run.child?.pid ?? "-"}  attempt ${run.snapshot.attempts.length + (run.child ? 1 : 0)}`,
+    `${executorLabel(run.request.backend)} · Attempt ${attemptNumber}${maxAttempts ? `/${maxAttempts}` : ""} · PID ${run.child?.pid ?? "—"}`,
     { dimColor: true },
   );
-  add(`Repository: ${run.request.repository}`, { dimColor: true });
+  add(`${run.request.repository} · ${run.request.base_branch || run.snapshot.charter?.base_branch || "dev"}`, {
+    dimColor: true,
+  });
   if (run.request.attachments?.length) {
-    add(`Attachments: ${run.request.attachments.map((item) => item.name).join(", ")}`, {
+    add(`Files · ${run.request.attachments.map((item) => item.name).join(", ")}`, {
       dimColor: true,
     });
   }
   add();
-  add("YOU", { bold: true, color: "cyan" });
+  add("GOAL", { bold: true, color: "cyan" });
   add(run.request.requirement);
-  add();
-  add("SIMY", { bold: true, color: "green" });
-  add(statusLabel(run), { color: statusColor(run) });
 
   if (presentation) {
     add();
-    add("STEP SUMMARY", { bold: true, color: "cyan" });
+    add("CURRENT STEP", { bold: true, color: "cyan" });
     add(presentation.summary);
-    if (presentation.result) add(`Result: ${presentation.result}`);
-    if (presentation.next) add(`Next: ${presentation.next}`);
+    if (presentation.result) add(`Result · ${presentation.result}`, { dimColor: true });
+  }
+
+  const nextAction = nextActionForRun(run, isRepositoryMissing(run));
+  if (!nextAction && presentation?.next) {
+    add();
+    add("NEXT ACTION", { bold: true });
+    add(presentation.next);
   }
 
   add();
-  add(`LIVE TRANSCRIPT  ${run.child ? "● streaming" : "○ idle"}`, {
+  add(`OUTPUT  ${run.child ? "● live" : "○ idle"}`, {
     bold: true,
     color: run.child ? "green" : undefined,
   });
@@ -1036,7 +1100,7 @@ function isFullWidthCodePoint(codePoint) {
 
 function terminalSize(stdout) {
   return {
-    columns: Math.max(72, stdout.columns || 120),
+    columns: Math.max(52, stdout.columns || 120),
     rows: Math.max(24, stdout.rows || 32),
   };
 }
@@ -1061,15 +1125,15 @@ function statusGlyph(run) {
 }
 
 function statusLabel(run) {
-  if (run.controlState === "paused") return "PAUSED";
-  if (run.controlState === "stopping") return "STOPPING";
-  if (run.controlState === "stopped" || run.status === "stopped") return "STOPPED";
-  if (run.status === "pr_ready_for_review") return "PR READY - HUMAN REVIEW";
+  if (run.controlState === "paused") return "Paused";
+  if (run.controlState === "stopping") return "Stopping";
+  if (run.controlState === "stopped" || run.status === "stopped") return "Stopped";
+  if (run.status === "pr_ready_for_review") return "PR ready · Review needed";
   if (run.controlState === "waiting_human" || run.status === "waiting_human") {
-    return "WAITING FOR HUMAN";
+    return "Waiting for you";
   }
-  if (run.status === "merge_ready") return "READY TO MERGE";
-  return String(run.status || "queued").replaceAll("_", " ").toUpperCase();
+  if (run.status === "merge_ready") return "Ready to merge";
+  return titleCase(String(run.status || "queued").replaceAll("_", " "));
 }
 
 function statusColor(run) {
@@ -1078,3 +1142,61 @@ function statusColor(run) {
   if (run.controlState === "complete") return "green";
   return "cyan";
 }
+
+function nextActionForRun(run, repositoryMissing = false) {
+  if (!run) return null;
+  if (repositoryMissing) {
+    return {
+      tone: "yellow",
+      text: "Press s to choose and authorize the local repository.",
+    };
+  }
+  if (run.controlState === "paused") {
+    return { tone: "yellow", text: "Press p to resume the local agent." };
+  }
+  if (run.status === "pr_ready_for_review") {
+    return { tone: "yellow", text: "Review the pull request, then press r to refresh its evidence." };
+  }
+  if (run.status === "merge_ready") {
+    return {
+      tone: "green",
+      text: "Review the final evidence and merge the pull request when ready.",
+    };
+  }
+  if (run.controlState === "waiting_human" || run.status === "waiting_human") {
+    return { tone: "yellow", text: "Press i, type your guidance or approval, then press Enter." };
+  }
+  const recoveryAction = primaryRecoveryAction(run);
+  if (recoveryAction) {
+    const command = recoveryAction.command ? ` Run: ${recoveryAction.command}` : "";
+    return {
+      tone: ["blocked", "failed"].includes(run.status) ? "red" : "yellow",
+      text: `${recoveryAction.label || "Resolve the reported issue."}${command}`,
+    };
+  }
+  if (["blocked", "failed"].includes(run.status)) {
+    return { tone: "red", text: "Press i to revise the request or provide recovery guidance." };
+  }
+  if (run.controlState === "stopped" || run.status === "stopped") {
+    return { tone: undefined, text: "Press / and enter /new to start another task." };
+  }
+  return null;
+}
+
+function primaryRecoveryAction(run) {
+  const events = Array.isArray(run.snapshot?.events) ? [...run.snapshot.events].reverse() : [];
+  for (const event of events) {
+    const recovery = event?.detail?.recovery;
+    if (!recovery || !Array.isArray(recovery.actions)) continue;
+    return (
+      recovery.actions.find((action) => action.id === recovery.primary_action_id) ??
+      recovery.actions[0] ??
+      null
+    );
+  }
+  return null;
+}
+
+function titleCase(value) {
+  return value.replace(/\b\p{L}/gu, (character) => character.toUpperCase());
+}

package/src/desktop-executor.js

@@ -47,6 +47,7 @@ export function desktopExecutorCapability(inspection) {
 
 export async function resolveDesktopExecutorCommand({
   backend,
+  model = null,
   instruction,
   repositoryPath,
   executionKind = "agentic_loop",
@@ -61,6 +62,13 @@ export async function resolveDesktopExecutorCommand({
     throw new Error("Desktop execution kind must be agentic_loop or direct.");
   }
   const normalizedPermissionMode = normalizePermissionMode(permissionMode);
+  const normalizedModel =
+    model === null || model === undefined
+      ? null
+      : String(model).trim();
+  if (normalizedModel !== null && !/^[A-Za-z0-9][A-Za-z0-9._:/-]{0,159}$/.test(normalizedModel)) {
+    throw new Error("Desktop executor model is invalid.");
+  }
   const target = normalizeDesktopExecutionTarget(DESKTOP_EXECUTION_TARGET);
   const override =
     provider === "claude" ? environment.SIMY_CLAUDE_COMMAND : environment.SIMY_CODEX_COMMAND;
@@ -87,14 +95,20 @@ export async function resolveDesktopExecutorCommand({
     args:
       provider === "claude"
         ? directExecution
-          ? claudeDirectBackendArgs(instruction, normalizedPermissionMode)
+          ? claudeDirectBackendArgs(
+              instruction,
+              normalizedPermissionMode,
+              normalizedModel,
+            )
           : claudeBackendArgs(instruction)
         : directExecution
           ? [
               "exec",
               "--json",
+              "--skip-git-repo-check",
               "--sandbox",
               normalizedPermissionMode === "read_only" ? "read-only" : "workspace-write",
+              ...(normalizedModel ? ["--model", normalizedModel] : []),
               instruction,
             ]
           : ["exec", "--json", instruction],
@@ -123,7 +137,11 @@ export function claudeBackendArgs(instruction) {
   ];
 }
 
-export function claudeDirectBackendArgs(instruction, permissionMode = "read_only") {
+export function claudeDirectBackendArgs(
+  instruction,
+  permissionMode = "read_only",
+  model = null,
+) {
   const normalized = normalizePermissionMode(permissionMode);
   return [
     "-p",
@@ -131,6 +149,7 @@ export function claudeDirectBackendArgs(instruction, permissionMode = "read_only
     "--output-format",
     "stream-json",
     "--verbose",
+    ...(model ? ["--model", model] : []),
     ...(normalized === "read_only"
       ? ["--permission-mode", "plan"]
       : ["--dangerously-skip-permissions"]),