thoth-agents 0.2.7 → 0.2.8

package/dist/cli/tui/index.js

@@ -1,44 +1,16 @@
 import {
-  CLAUDE_CODE_ROLE_NAMES,
-  CODEX_ROLE_NAMES,
-  applyClaudeCodePlan,
-  applyCodexPlan,
-  applyOpenCodePlan,
-  buildClaudeCodeInstallPlan,
-  buildClaudeCodeModelPlan,
-  buildClaudeCodeSetupPlan,
-  buildClaudeCodeSyncPlan,
-  buildClaudeCodeUpdatePlan,
-  buildCodexInstallPlan,
-  buildCodexModelPlan,
-  buildCodexSetupPlan,
-  buildCodexSyncPlan,
-  buildCodexUpdatePlan,
-  buildOpenCodeInstallPlan,
-  buildOpenCodeModelPlan,
-  buildOpenCodeSyncPlan,
-  buildOpenCodeUpdatePlan,
-  defaultClaudeCodeModelRoles,
-  getClaudeCodeStatus,
-  getCodexStatus,
-  getOpenCodeStatus,
-  listOperationHarnesses,
-  parseRoleTomlModel,
-  parseSubagentModel
-} from "../../chunk-32672NLJ.js";
-import {
-  ALL_AGENT_NAMES,
-  DEFAULT_MODELS,
-  getExistingLiteConfigPath,
-  parseConfig
-} from "../../chunk-N7GFXGFJ.js";
+  defaultTuiOperations,
+  effortChoicesForModel,
+  listOperationHarnesses
+} from "../../chunk-FM7HCZSW.js";
+import "../../chunk-YLRPDTU7.js";
 
 // src/cli/tui/index.tsx
 import { render } from "ink";
 
 // src/cli/tui/App.tsx
 import { Box as Box8, Text as Text8, useApp, useInput } from "ink";
-import { useMemo, useState } from "react";
+import { useMemo, useRef, useState } from "react";
 
 // src/cli/tui/components/Header.tsx
 import { Box, Text } from "ink";
@@ -168,6 +140,41 @@ function ModelChoiceScreen({
     ] }) : null
   ] });
 }
+function EffortChoiceScreen({
+  model,
+  currentEffort,
+  draftEffort,
+  choices,
+  selected
+}) {
+  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs3(Text3, { children: [
+      "Model: ",
+      /* @__PURE__ */ jsx3(Text3, { color: theme.accent, children: model })
+    ] }),
+    /* @__PURE__ */ jsxs3(Text3, { children: [
+      "Current effort: ",
+      /* @__PURE__ */ jsx3(Text3, { color: theme.accent, children: currentEffort })
+    ] }),
+    /* @__PURE__ */ jsxs3(Text3, { children: [
+      "New effort: ",
+      /* @__PURE__ */ jsx3(Text3, { color: theme.warning, children: draftEffort })
+    ] }),
+    choices.length === 1 ? /* @__PURE__ */ jsx3(Text3, { color: theme.dim, children: "No explicit effort options are available for this model." }) : null,
+    choices.map((effort, index) => /* @__PURE__ */ jsxs3(
+      Text3,
+      {
+        color: index === selected ? theme.accent : void 0,
+        children: [
+          index === selected ? ">" : " ",
+          " ",
+          effort
+        ]
+      },
+      effort
+    ))
+  ] });
+}
 
 // src/cli/tui/components/ModelScreen.tsx
 import { Box as Box4, Text as Text4 } from "ink";
@@ -196,7 +203,13 @@ function ModelScreen({
           role.role,
           ": ",
           role.model,
-          /* @__PURE__ */ jsx4(Text4, { color: theme.dim, children: role.dirty ? ` (was ${role.currentModel})` : "" })
+          /* @__PURE__ */ jsxs4(Text4, { color: theme.dim, children: [
+            " ",
+            "\xB7 effort",
+            " ",
+            role.effort?.kind === "effort" ? role.effort.value : "inherit"
+          ] }),
+          /* @__PURE__ */ jsx4(Text4, { color: theme.dim, children: role.dirty ? ` (was ${role.currentModel} \xB7 effort ${role.currentEffort.kind === "effort" ? role.currentEffort.value : "inherit"})` : "" })
         ]
       },
       role.role
@@ -498,277 +511,6 @@ function StatusView({ report }) {
   ] });
 }
 
-// src/cli/tui/model-catalog.ts
-import { execFileSync } from "child_process";
-var MODEL_CATALOG_TIMEOUT_MS = 5e3;
-var MODELS_DEV_MAX_BUFFER = 8 * 1024 * 1024;
-function parseOpenCodeModels(output) {
-  const seen = /* @__PURE__ */ new Set();
-  const options = [];
-  for (const line of output.split(/\r?\n/)) {
-    const match = line.trim().match(/^([a-z0-9_-]+)\/([^\s{]+)/i);
-    if (!match) continue;
-    const id = `${match[1]}/${match[2]}`;
-    if (seen.has(id)) continue;
-    seen.add(id);
-    options.push({ id, label: id, provider: match[1] ?? "unknown" });
-  }
-  return options;
-}
-function parseModelsDevOpenAi(output) {
-  const catalog = JSON.parse(output);
-  return Object.entries(catalog.openai?.models ?? {}).filter(([id]) => isCodexOpenAiModelId(id)).map(([id, model]) => ({
-    id,
-    label: model.name ?? id,
-    provider: "openai"
-  }));
-}
-function isCodexOpenAiModelId(id) {
-  const match = id.match(/^gpt-(\d+)(?:[.-]|$)/);
-  return match?.[1] !== void 0 && Number(match[1]) >= 5;
-}
-function getOpenCodeModelsInvocation(platform = process.platform) {
-  const options = {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "ignore"],
-    timeout: MODEL_CATALOG_TIMEOUT_MS
-  };
-  if (platform === "win32") {
-    return {
-      command: "opencode models",
-      args: [],
-      options: { ...options, shell: true }
-    };
-  }
-  return {
-    command: "opencode",
-    args: ["models"],
-    options
-  };
-}
-function getModelsDevCatalog() {
-  try {
-    const output = execFileSync(
-      process.execPath,
-      [
-        "-e",
-        [
-          "const controller = new AbortController();",
-          `const timeout = setTimeout(() => controller.abort(), ${MODEL_CATALOG_TIMEOUT_MS});`,
-          "if (typeof fetch !== 'function') {",
-          "  console.error('fetch unavailable');",
-          "  process.exit(1);",
-          "}",
-          "fetch('https://models.dev/api.json', { signal: controller.signal })",
-          "  .then(async (response) => {",
-          "    if (!response.ok) throw new Error(String(response.status));",
-          "    const catalog = await response.json();",
-          "    const models = catalog?.openai?.models ?? {};",
-          "    return JSON.stringify({ openai: { models } });",
-          "  })",
-          "  .then((body) => {",
-          "    clearTimeout(timeout);",
-          "    process.stdout.write(body);",
-          "  })",
-          "  .catch((error) => { clearTimeout(timeout); console.error(error.message); process.exit(1); });"
-        ].join("\n")
-      ],
-      {
-        encoding: "utf8",
-        maxBuffer: MODELS_DEV_MAX_BUFFER,
-        stdio: ["ignore", "pipe", "ignore"],
-        timeout: MODEL_CATALOG_TIMEOUT_MS
-      }
-    );
-    return parseModelsDevOpenAi(output);
-  } catch {
-    return [];
-  }
-}
-var CLAUDE_CODE_MODEL_OPTIONS = [
-  { id: "sonnet", label: "sonnet", provider: "anthropic" },
-  { id: "opus", label: "opus", provider: "anthropic" },
-  { id: "haiku", label: "haiku", provider: "anthropic" },
-  {
-    id: "inherit",
-    label: "inherit (main session model)",
-    provider: "anthropic"
-  }
-];
-function getModelOptions(harness) {
-  if (harness === "codex") return getModelsDevCatalog();
-  if (harness === "claude") return CLAUDE_CODE_MODEL_OPTIONS;
-  try {
-    const invocation = getOpenCodeModelsInvocation();
-    const output = execFileSync(
-      invocation.command,
-      invocation.args,
-      invocation.options
-    );
-    return parseOpenCodeModels(output);
-  } catch {
-    return [];
-  }
-}
-
-// src/cli/tui/operations.ts
-var context = { cwd: process.cwd() };
-var codexContext = { cwd: process.cwd() };
-var claudeCodeContext = {
-  cwd: process.cwd(),
-  scope: "user"
-};
-var opencodeModelRoles = ALL_AGENT_NAMES.map(
-  (role) => ({
-    role,
-    model: DEFAULT_MODELS[role] ?? "openai/gpt-5.4"
-  })
-);
-var codexModelRoles = CODEX_ROLE_NAMES.map(
-  (role) => ({
-    role,
-    model: "gpt-5.4-mini"
-  })
-);
-var codexDefaultModels = new Map(
-  codexModelRoles.map((role) => [role.role, role.model])
-);
-function codexInstallConfig(source, dryRun) {
-  return {
-    dryRun,
-    reset: false,
-    scope: source.scope ?? "user",
-    projectRoot: source.cwd,
-    homeDir: source.homeDir,
-    codexHome: source.codexHome,
-    packageRoot: source.packageRoot,
-    pluginId: source.pluginId
-  };
-}
-function getCodexModelRoles(source = codexContext) {
-  try {
-    const plan = buildCodexSetupPlan(codexInstallConfig(source, true));
-    return CODEX_ROLE_NAMES.map((role) => {
-      const item = plan.items.find(
-        (candidate) => candidate.action === "write-role-toml" && candidate.role === role
-      );
-      return {
-        role,
-        model: (item?.content ? parseRoleTomlModel(item.content) : void 0) ?? codexDefaultModels.get(role) ?? "gpt-5.4-mini"
-      };
-    });
-  } catch {
-    return codexModelRoles.map((role) => ({ ...role }));
-  }
-}
-function getClaudeCodeModelRoles(source = claudeCodeContext) {
-  try {
-    const plan = buildClaudeCodeSetupPlan({
-      dryRun: true,
-      reset: false,
-      scope: source.scope ?? "user",
-      projectRoot: source.cwd,
-      homeDir: source.homeDir,
-      packageRoot: source.packageRoot
-    });
-    return CLAUDE_CODE_ROLE_NAMES.map((role) => {
-      const item = plan.items.find(
-        (candidate) => candidate.kind === "subagent" && candidate.role === role
-      );
-      const model = item?.content ? parseSubagentModel(item.content) : void 0;
-      return { role, model: model ?? "inherit" };
-    });
-  } catch {
-    return defaultClaudeCodeModelRoles();
-  }
-}
-function readRoleModel(config, role) {
-  if (!config || typeof config !== "object" || Array.isArray(config)) {
-    return void 0;
-  }
-  const record = config;
-  const value = record[role];
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return void 0;
-  }
-  const model = value.model;
-  return typeof model === "string" && model.length > 0 ? model : void 0;
-}
-function getOpenCodeModelRoles() {
-  const parsed = parseConfig(getExistingLiteConfigPath());
-  const agents = parsed.config?.agents && typeof parsed.config.agents === "object" ? parsed.config.agents : void 0;
-  const presets = parsed.config?.presets && typeof parsed.config.presets === "object" ? parsed.config.presets : {};
-  const openaiPreset = presets.openai && typeof presets.openai === "object" ? presets.openai : void 0;
-  return ALL_AGENT_NAMES.map((role) => ({
-    role,
-    model: readRoleModel(agents, role) ?? readRoleModel(openaiPreset, role) ?? DEFAULT_MODELS[role] ?? "openai/gpt-5.4"
-  }));
-}
-function buildTuiModelPlan(harness, roles) {
-  if (harness === "opencode") {
-    return buildOpenCodeModelPlan({ harness, dryRun: true, roles }, context);
-  }
-  if (harness === "claude") {
-    return buildClaudeCodeModelPlan(
-      { harness, dryRun: true, roles },
-      claudeCodeContext
-    );
-  }
-  return buildCodexModelPlan({ harness, dryRun: true, roles }, codexContext);
-}
-var defaultTuiOperations = {
-  status(harness) {
-    if (harness === "opencode") return getOpenCodeStatus(context);
-    if (harness === "claude") {
-      return getClaudeCodeStatus(claudeCodeContext);
-    }
-    return getCodexStatus(codexContext);
-  },
-  modelRoles(harness) {
-    if (harness === "opencode") return getOpenCodeModelRoles();
-    if (harness === "claude") {
-      return getClaudeCodeModelRoles(claudeCodeContext);
-    }
-    return getCodexModelRoles(codexContext);
-  },
-  modelOptions(harness) {
-    return getModelOptions(harness);
-  },
-  plan(harness, action) {
-    if (harness === "opencode") {
-      if (action === "install") return buildOpenCodeInstallPlan(context);
-      if (action === "update") return buildOpenCodeUpdatePlan(context);
-      if (action === "sync") return buildOpenCodeSyncPlan(context);
-      return buildTuiModelPlan(harness, getOpenCodeModelRoles());
-    }
-    if (harness === "claude") {
-      if (action === "install") {
-        return buildClaudeCodeInstallPlan(claudeCodeContext);
-      }
-      if (action === "update") {
-        return buildClaudeCodeUpdatePlan(claudeCodeContext);
-      }
-      if (action === "sync") return buildClaudeCodeSyncPlan(claudeCodeContext);
-      return buildTuiModelPlan(
-        harness,
-        getClaudeCodeModelRoles(claudeCodeContext)
-      );
-    }
-    if (action === "install") return buildCodexInstallPlan(codexContext);
-    if (action === "update") return buildCodexUpdatePlan(codexContext);
-    if (action === "sync") return buildCodexSyncPlan(codexContext);
-    return buildTuiModelPlan(harness, getCodexModelRoles(codexContext));
-  },
-  modelPlan(harness, roles) {
-    return buildTuiModelPlan(harness, roles);
-  },
-  apply(plan) {
-    if (plan.harness === "opencode") return applyOpenCodePlan(plan);
-    if (plan.harness === "claude") return applyClaudeCodePlan(plan);
-    return applyCodexPlan(plan);
-  }
-};
-
 // src/cli/tui/App.tsx
 import { jsx as jsx8, jsxs as jsxs7 } from "react/jsx-runtime";
 var rootItems = [
@@ -873,7 +615,46 @@ function normalizeSelection(current, items) {
   return Math.min(current, items.length - 1);
 }
 function changedRoles(rows) {
-  return rows.filter((role) => role.dirty).map((role) => ({ role: role.role, model: role.model }));
+  return rows.filter((role) => role.dirty).map((role) => {
+    const effortChanged = role.effort?.kind !== role.currentEffort.kind || role.effort?.kind === "effort" && role.currentEffort.kind === "effort" && role.effort.value !== role.currentEffort.value;
+    const includeEffort = effortChanged || role.effort?.kind === "effort";
+    return {
+      role: role.role,
+      model: role.model,
+      ...includeEffort ? { effort: role.effort } : {},
+      ...includeEffort && role.provider ? { provider: role.provider } : {},
+      ...includeEffort && role.catalogId ? { catalogId: role.catalogId } : {},
+      ...includeEffort && role.availableEfforts ? { availableEfforts: role.availableEfforts } : {}
+    };
+  });
+}
+function metadataForModel(role, model, option) {
+  if (option) {
+    return {
+      provider: option.provider,
+      ...option.catalogId ? { catalogId: option.catalogId } : {},
+      availableEfforts: option.efforts
+    };
+  }
+  if (model !== role.model) return {};
+  return {
+    ...role.provider ? { provider: role.provider } : {},
+    ...role.catalogId ? { catalogId: role.catalogId } : {},
+    ...role.availableEfforts ? { availableEfforts: role.availableEfforts } : {}
+  };
+}
+function choicesForRole(role, options, draftModel) {
+  const exact = options.find((option) => option.id === draftModel);
+  const sameModel = draftModel === role.model;
+  const current = exact ?? {
+    id: draftModel,
+    ...sameModel && role.catalogId ? { catalogId: role.catalogId } : {},
+    label: draftModel,
+    provider: sameModel ? role.provider ?? "current" : "manual",
+    efforts: sameModel ? role.availableEfforts ?? [] : [],
+    source: "manual"
+  };
+  return [current, ...options.filter((option) => option.id !== draftModel)];
 }
 function App({
   operations = defaultTuiOperations,
@@ -899,8 +680,14 @@ function App({
   const [modelHarness, setModelHarness] = useState("codex");
   const [modelRoles, setModelRoles] = useState([]);
   const [modelOptions, setModelOptions] = useState([]);
-  const [choiceSelected, setChoiceSelected] = useState(0);
+  const [modelCatalogLoading, setModelCatalogLoading] = useState(false);
+  const [modelCatalogError, setModelCatalogError] = useState();
+  const modelCatalogRequest = useRef(0);
+  const [modelChoiceSelection, setModelChoiceSelection] = useState({ kind: "manual" });
   const [editedModels, setEditedModels] = useState({});
+  const [editedEfforts, setEditedEfforts] = useState({});
+  const [draftModelOption, setDraftModelOption] = useState();
+  const [effortSelected, setEffortSelected] = useState(0);
   const [modelSelected, setModelSelected] = useState(0);
   const [editingRole, setEditingRole] = useState();
   const [editDraft, setEditDraft] = useState("");
@@ -909,20 +696,37 @@ function App({
   const currentManageItems = report?.state === "missing" ? installManageItems : manageItems;
   const modelRows = modelRoles.map((role) => {
     const model = editedModels[role.role] ?? role.model;
+    const option = modelOptions.find((candidate) => candidate.id === model);
+    const metadata = metadataForModel(role, model, option);
+    const effort = editedEfforts[role.role] ?? role.effort ?? { kind: "inherit" };
+    const currentEffort = role.effort ?? { kind: "inherit" };
+    const effortDirty = effort.kind !== currentEffort.kind || effort.kind === "effort" && currentEffort.kind === "effort" && effort.value !== currentEffort.value;
     return {
-      ...role,
+      role: role.role,
       model,
+      effort,
+      ...metadata,
       currentModel: role.model,
-      dirty: model !== role.model
+      currentEffort,
+      dirty: model !== role.model || effortDirty
     };
   });
+  const modelChoiceOptions = editingRole ? choicesForRole(
+    editingRole,
+    modelOptions,
+    editedModels[editingRole.role] ?? editingRole.model
+  ) : modelOptions;
+  const selectedModelIndex = modelChoiceSelection.kind === "manual" ? modelChoiceOptions.length : modelChoiceOptions.findIndex(
+    (option) => option.id === modelChoiceSelection.id
+  );
+  const choiceSelected = selectedModelIndex < 0 ? 0 : selectedModelIndex;
   const dirtyRoles = changedRoles(modelRows);
   const modelActions = dirtyRoles.length > 0 ? ["Preview changes", "Apply changes", "Back"] : ["Back"];
   const modelMenuItems = [
     ...modelRows.map((role) => ({
       id: role.role,
       label: `${role.dirty ? "* " : ""}${role.role}`,
-      detail: role.model
+      detail: `${role.model} \xB7 ${role.effort?.kind === "effort" ? role.effort.value : "inherit"}`
     })),
     ...modelActions.map((action) => ({
       id: action,
@@ -946,6 +750,8 @@ function App({
       setView("manageHarness");
     } else if (view === "modelChoice") {
       setView("modelRoles");
+    } else if (view === "effortChoice") {
+      setView("modelChoice");
     } else if (view === "modelEdit") {
       setView("modelChoice");
     }
@@ -964,13 +770,44 @@ function App({
     setView("preview");
   }
   function openModelRoles(harness) {
+    const request = modelCatalogRequest.current + 1;
+    modelCatalogRequest.current = request;
     setModelHarness(harness);
     setModelRoles(operations.modelRoles(harness));
-    setModelOptions(operations.modelOptions(harness));
+    setModelOptions([]);
+    setModelCatalogLoading(true);
+    setModelCatalogError(void 0);
     setEditedModels({});
+    setEditedEfforts({});
     setModelResult(void 0);
     setModelSelected(0);
     setView("modelRoles");
+    void operations.modelOptions(harness).then((options) => {
+      if (modelCatalogRequest.current !== request) return;
+      setModelOptions(options);
+      setModelCatalogLoading(false);
+    }).catch((error) => {
+      if (modelCatalogRequest.current !== request) return;
+      setModelCatalogError(
+        error instanceof Error ? error.message : String(error)
+      );
+      setModelCatalogLoading(false);
+    });
+  }
+  function beginEffortSelection(role, model, option) {
+    const choices = effortChoicesForModel(option);
+    const pending = editedEfforts[role.role] ?? role.effort ?? { kind: "inherit" };
+    const nextEffort = pending.kind === "effort" && !option?.efforts.includes(pending.value) ? { kind: "inherit" } : pending;
+    setEditedModels((models) => ({ ...models, [role.role]: model }));
+    setModelChoiceSelection({ kind: "model", id: model });
+    setEditedEfforts((efforts) => ({
+      ...efforts,
+      [role.role]: nextEffort
+    }));
+    setDraftModelOption(option);
+    const nextIndex = nextEffort.kind === "effort" ? choices.indexOf(nextEffort.value) : 0;
+    setEffortSelected(nextIndex < 0 ? 0 : nextIndex);
+    setView("effortChoice");
   }
   function previewModelChanges(applyImmediately) {
     const nextPlan = operations.modelPlan(modelHarness, dirtyRoles);
@@ -982,12 +819,21 @@ function App({
       setModelResult(applyResult);
       if (applyResult.applied) {
         setModelRoles(
-          (roles) => roles.map((role) => ({
-            ...role,
-            model: editedModels[role.role] ?? role.model
-          }))
+          (roles) => roles.map((role) => {
+            const model = editedModels[role.role] ?? role.model;
+            const option = modelOptions.find(
+              (candidate) => candidate.id === model
+            );
+            return {
+              role: role.role,
+              model,
+              effort: editedEfforts[role.role] ?? role.effort ?? { kind: "inherit" },
+              ...metadataForModel(role, model, option)
+            };
+          })
         );
         setEditedModels({});
+        setEditedEfforts({});
       }
       return;
     }
@@ -1001,11 +847,7 @@ function App({
         return;
       }
       if (key.return && editingRole) {
-        setEditedModels((models) => ({
-          ...models,
-          [editingRole.role]: editDraft
-        }));
-        setView("modelRoles");
+        beginEffortSelection(editingRole, editDraft, void 0);
         return;
       }
       if (key.tab) {
@@ -1022,34 +864,67 @@ function App({
       }
       return;
     }
+    if (view === "effortChoice") {
+      if (key.escape) {
+        goBack();
+        return;
+      }
+      const choices = effortChoicesForModel(draftModelOption);
+      const choiceItems = choices.map((effort) => ({
+        id: effort,
+        label: effort,
+        detail: effort === "inherit" ? "Use the harness default" : "Set an explicit reasoning effort"
+      }));
+      if (key.upArrow || input === "k") {
+        setEffortSelected((current) => moveSelection(current, -1, choiceItems));
+      }
+      if (key.downArrow || input === "j") {
+        setEffortSelected((current) => moveSelection(current, 1, choiceItems));
+      }
+      if (key.return && editingRole) {
+        const selectedEffort = choices[effortSelected] ?? "inherit";
+        setEditedEfforts((efforts) => ({
+          ...efforts,
+          [editingRole.role]: selectedEffort === "inherit" ? { kind: "inherit" } : { kind: "effort", value: selectedEffort }
+        }));
+        setView("modelRoles");
+      }
+      return;
+    }
     if (view === "modelChoice") {
       if (key.escape) {
         goBack();
         return;
       }
       const choiceItems = [
-        ...modelOptions.map((option) => ({
+        ...modelChoiceOptions.map((option) => ({
           id: option.id,
           label: option.id,
           detail: option.provider
         })),
         { id: "manual", label: "Manual entry", detail: "Type a model ID" }
       ];
+      const selectChoiceAt = (index) => {
+        const option = modelChoiceOptions[index];
+        setModelChoiceSelection(
+          option ? { kind: "model", id: option.id } : { kind: "manual" }
+        );
+      };
       if (key.upArrow || input === "k") {
-        setChoiceSelected((current) => moveSelection(current, -1, choiceItems));
+        selectChoiceAt(moveSelection(choiceSelected, -1, choiceItems));
       }
       if (key.downArrow || input === "j") {
-        setChoiceSelected((current) => moveSelection(current, 1, choiceItems));
+        selectChoiceAt(moveSelection(choiceSelected, 1, choiceItems));
       }
       if (key.return && editingRole) {
-        const option = modelOptions[choiceSelected];
-        if (option) {
-          setEditedModels((models) => ({
-            ...models,
-            [editingRole.role]: option.id
-          }));
-          setView("modelRoles");
-          return;
+        if (modelChoiceSelection.kind === "model") {
+          const option = modelChoiceOptions.find(
+            (candidate) => candidate.id === modelChoiceSelection.id
+          );
+          if (option) {
+            beginEffortSelection(editingRole, option.id, option);
+            return;
+          }
         }
         setEditDraft(editingRole.model);
         setView("modelEdit");
@@ -1172,7 +1047,11 @@ function App({
           const role = modelRows[modelSelected];
           setEditingRole(role);
           setEditDraft(role?.model ?? "");
-          setChoiceSelected(0);
+          setDraftModelOption(void 0);
+          setModelChoiceSelection({
+            kind: "model",
+            id: role?.model ?? ""
+          });
           setView("modelChoice");
           return;
         }
@@ -1276,6 +1155,12 @@ function App({
           actions: modelActions
         }
       ),
+      modelCatalogLoading ? /* @__PURE__ */ jsx8(Text8, { color: theme.dim, children: "Loading model catalog\u2026" }) : null,
+      modelCatalogError ? /* @__PURE__ */ jsxs7(Text8, { color: theme.warning, children: [
+        "Could not load model catalog: ",
+        modelCatalogError,
+        ". Manual entry is still available."
+      ] }) : null,
       modelResult ? /* @__PURE__ */ jsx8(Text8, { color: modelResult.applied ? theme.ok : theme.warning, children: modelResult.summary }) : null
     ] });
   }
@@ -1304,7 +1189,7 @@ function App({
         Header,
         {
           title: `Choose ${editingRole.role} model`,
-          subtitle: "Select a catalog option or Manual entry."
+          subtitle: "Current model is selected first. Press Enter to continue to effort, or choose Manual entry."
         }
       ),
       /* @__PURE__ */ jsx8(
@@ -1312,9 +1197,39 @@ function App({
         {
           currentModel: editingRole.currentModel,
           draftModel: editedModels[editingRole.role] ?? editingRole.model,
-          options: modelOptions,
+          options: modelChoiceOptions,
           selected: choiceSelected
         }
+      ),
+      modelCatalogLoading ? /* @__PURE__ */ jsx8(Text8, { color: theme.dim, children: "Loading model catalog\u2026" }) : null,
+      modelCatalogError ? /* @__PURE__ */ jsxs7(Text8, { color: theme.warning, children: [
+        "Could not load model catalog: ",
+        modelCatalogError
+      ] }) : null
+    ] });
+  }
+  if (view === "effortChoice" && editingRole) {
+    const draftModel = editedModels[editingRole.role] ?? editingRole.model;
+    const effort = editedEfforts[editingRole.role] ?? {
+      kind: "inherit"
+    };
+    return /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx8(
+        Header,
+        {
+          title: `Choose ${editingRole.role} effort`,
+          subtitle: "Select inherit or an effort supported by this model."
+        }
+      ),
+      /* @__PURE__ */ jsx8(
+        EffortChoiceScreen,
+        {
+          model: draftModel,
+          currentEffort: editingRole.currentEffort.kind === "effort" ? editingRole.currentEffort.value : "inherit",
+          draftEffort: effort.kind === "effort" ? effort.value : "inherit",
+          choices: effortChoicesForModel(draftModelOption),
+          selected: effortSelected
+        }
       )
     ] });
   }