@iowarp/clio-coder 0.4.5 → 0.4.6

package/dist/{chunk-KYKNBD4Y.js → chunk-F5Z7EWMN.js}

@@ -1,15 +1,19 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  editTextExternally,
+  resolveExternalEditor
+} from "./chunk-R2CT5YDO.js";
 import {
   createDelayedManualCodeInput,
   promptOAuthSelection
-} from "./chunk-QEQISF75.js";
+} from "./chunk-LK2FN5JY.js";
 import {
   createLifecyclePresenter,
   shortenPath
 } from "./chunk-6YA46L5A.js";
 import {
   fingerprintNativeRuntime
-} from "./chunk-MC3JSVR6.js";
+} from "./chunk-QJMRYTCX.js";
 import {
   INHERITED_PROJECT_CONTEXT,
   acceptInteropAgents,
@@ -18,10 +22,10 @@ import {
   interopProposals,
   renderProposalEntry,
   resolveOnPath
-} from "./chunk-6SYEGZI3.js";
+} from "./chunk-B3MOMLJ4.js";
 import {
   initializeClioHome
-} from "./chunk-T53XI6I7.js";
+} from "./chunk-6VRRJT7L.js";
 import {
   column,
   terminalColumns,
@@ -43,17 +47,24 @@ import {
   probeCapabilitiesForModel,
   readTargetModelSnapshot,
   recordTargetModelSnapshot
-} from "./chunk-TEG3RYVZ.js";
+} from "./chunk-4U4TKZFR.js";
 import {
   credentialsPresent
 } from "./chunk-J2FYEQ5L.js";
 import {
+  AUTONOMY_LEVELS
+} from "./chunk-EM2WNQS2.js";
+import {
+  SettingsValidationError,
   bindAgentProfileInSettings,
   readSettings,
   removeTargetFromSettings,
   settingsPath,
-  updateSettings
-} from "./chunk-FKIOX6DS.js";
+  updateSavedSettingsDocument,
+  updateSettings,
+  validateSettings,
+  withSettingsLock
+} from "./chunk-WNGF5AJX.js";
 import {
   warnLegacyNaming
 } from "./chunk-DVNAPPXU.js";
@@ -62,11 +73,14 @@ import {
 } from "./chunk-GD55RTIW.js";
 import {
   greetLmStudio,
-  registerBuiltinRuntimes
-} from "./chunk-ICO4TQ2F.js";
+  probeJson,
+  registerBuiltinRuntimes,
+  targetRootUrl
+} from "./chunk-WV6TDAPN.js";
 import {
+  DEFAULT_SETTINGS_YAML,
   THINKING_LEVELS
-} from "./chunk-SE4ZKILO.js";
+} from "./chunk-3BJGMT2D.js";
 import {
   buildProviderSupportEntry,
   configuredTargetsForRuntime,
@@ -83,6 +97,12 @@ import {
   resolveRuntimeAuthTarget,
   targetRequiresAuth
 } from "./chunk-HXHFDHB6.js";
+import {
+  require_dist
+} from "./chunk-B5GGDIHT.js";
+import {
+  safeResourceWrite
+} from "./chunk-ZZFWWYLX.js";
 import {
   getRuntimeRegistry
 } from "./chunk-SRCEQKQS.js";
@@ -93,18 +113,19 @@ import {
   resolveClioDirs
 } from "./chunk-CTTI7G3T.js";
 import {
+  __toESM,
   init_esm_shims
 } from "./chunk-ECBHH7LU.js";
 
 // src/cli/configure.ts
 init_esm_shims();
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { stdin as input, stdout as output2 } from "node:process";
-import { createInterface as createInterface2 } from "node:readline/promises";
 
 // src/cli/ask.ts
 init_esm_shims();
 async function ask(rl, label, defaultValue) {
+  if (rl.text) return rl.text(label, defaultValue);
   const suffix = defaultValue && defaultValue.length > 0 ? ` [${defaultValue}]` : "";
   try {
     const answer = (await rl.question(`${label}${suffix}: `)).trim();
@@ -116,6 +137,7 @@ async function ask(rl, label, defaultValue) {
   }
 }
 async function askYesNo(rl, label, defaultValue) {
+  if (rl.choose && rl.interactive) return await rl.choose(label, ["yes", "no"], defaultValue ? "yes" : "no") === "yes";
   const marker = defaultValue ? "Y/n" : "y/N";
   for (; ; ) {
     const answer = await ask(rl, `${label} [${marker}]`);
@@ -129,6 +151,53 @@ async function askYesNo(rl, label, defaultValue) {
   }
 }
 
+// src/cli/configure-editor.ts
+init_esm_shims();
+var import_yaml = __toESM(require_dist(), 1);
+import { existsSync, readFileSync } from "node:fs";
+async function editSettings(prompts) {
+  const file = settingsPath();
+  const original = existsSync(file) ? readFileSync(file, "utf8") : null;
+  let draft = original ?? DEFAULT_SETTINGS_YAML;
+  const editor = resolveExternalEditor();
+  for (; ; ) {
+    const result = editTextExternally(draft, editor, ".yaml");
+    if (!result.ok || result.text === void 0) throw new Error(result.error ?? "Editor did not return a draft");
+    draft = `${result.text}
+`;
+    if (draft === original) {
+      prompts.output.write("Settings unchanged.\n");
+      return false;
+    }
+    try {
+      const validated = validateSettings((0, import_yaml.parse)(draft));
+      if (validated.issues.length) throw new SettingsValidationError(validated.issues);
+    } catch (error) {
+      prompts.output.write(`${error instanceof Error ? error.message : String(error)}
+`);
+      if (await prompts.choose("Invalid draft", ["Return to editor", "Discard draft"], "Return to editor") === "Return to editor")
+        continue;
+      return false;
+    }
+    const choice = await prompts.choose(
+      "Save validated settings?",
+      ["Save", "Return to editor", "Discard draft"],
+      "Save"
+    );
+    if (choice === "Return to editor") continue;
+    if (choice !== "Save") return false;
+    withSettingsLock(() => {
+      const current = existsSync(file) ? readFileSync(file, "utf8") : null;
+      if (current !== original)
+        throw new Error("Settings changed while the editor was open. Reopen the editor to keep those changes.");
+      safeResourceWrite(file, draft, { encoding: "utf8", mode: 420, backup: original !== null });
+    });
+    prompts.output.write(`Settings saved to ${file}${original === null ? "" : `; previous file: ${file}.bak`}
+`);
+    return true;
+  }
+}
+
 // src/cli/configure-interop.ts
 init_esm_shims();
 import { stdout as output } from "node:process";
@@ -226,6 +295,13 @@ function deriveTargetId(runtimeId, existing) {
   }
   return `${base}-${Date.now()}`;
 }
+function targetApiKeyRef(targetId, targets) {
+  const taken = new Set(targets.filter((target) => target.id !== targetId).map((target) => target.auth?.apiKeyRef));
+  const base = `target:${targetId}`;
+  let ref = base;
+  for (let suffix = 2; taken.has(ref); suffix += 1) ref = `${base}-${suffix}`;
+  return ref;
+}
 async function buildProbeContext(runtime, target) {
   const probeCtx = {
     credentialsPresent: credentialsPresent(),
@@ -459,8 +535,11 @@ function buildDescriptor(runtime, id, parts) {
   if (parts.litellm) descriptor.litellm = parts.litellm;
   return descriptor;
 }
-function describeAuthStatus(runtime) {
-  const status = openAuthStorage().statusForTarget(resolveRuntimeAuthTarget(runtime), { includeFallback: false });
+function describeAuthStatus(runtime, target) {
+  const status = openAuthStorage().statusForTarget(
+    target ? resolveAuthTarget(target, runtime) : resolveRuntimeAuthTarget(runtime),
+    { includeFallback: false }
+  );
   if (!status.available) return "none stored";
   if (status.source === "environment") return `environment${status.detail ? ` (${status.detail})` : ""}`;
   if (status.source === "stored-api-key") return "stored api key";
@@ -647,7 +726,7 @@ function viewportFor(output3, overhead, total, requested) {
 async function promptSelect(options) {
   const input2 = options.input ?? process.stdin;
   const output3 = options.output ?? process.stdout;
-  const choices = options.choices;
+  let choices = options.choices;
   if (choices.length === 0) return { kind: "back" };
   const rail = options.railPrefix ?? "";
   const railWidth = 3;
@@ -655,14 +734,24 @@ async function promptSelect(options) {
   const frame = makeFrame(output3);
   let index = Math.min(Math.max(options.initialIndex ?? 0, 0), choices.length - 1);
   let windowStart = 0;
+  let query = "";
+  const filter = () => {
+    choices = options.choices.filter((choice) => choice.label.toLowerCase().includes(query.toLowerCase()));
+    index = 0;
+    windowStart = 0;
+    render();
+  };
   const render = () => {
-    const viewport = viewportFor(output3, head.length + 5, choices.length, options.maxVisible);
+    const viewport = viewportFor(output3, head.length + (options.searchable ? 6 : 5), choices.length, options.maxVisible);
     if (index < windowStart) windowStart = index;
     else if (index >= windowStart + viewport) windowStart = index - viewport + 1;
     windowStart = Math.max(0, Math.min(windowStart, choices.length - viewport));
     const lines = [];
     for (const line of head) lines.push(`${rail}${line}`.trimEnd());
     if (head.length > 0) lines.push(rail.trimEnd());
+    if (options.searchable)
+      lines.push(`${rail}${truncate(`Filter: ${query || "(type to search)"}`, terminalColumns(output3) - railWidth)}`);
+    if (choices.length === 0) lines.push(`${rail}No matching models`);
     lines.push(
       ...choiceRows(
         {
@@ -681,7 +770,8 @@ async function promptSelect(options) {
     lines.push(rail.trimEnd());
     const legend = ["\u2191/\u2193 move", "enter select"];
     if (options.backLabel !== void 0 && options.backLabel !== "quit") legend.push(`esc ${options.backLabel}`);
-    legend.push(options.backLabel === "quit" ? "esc or q quit" : "q quit");
+    if (options.searchable) legend.push("type to filter", "ctrl-u clear", "ctrl-c quit");
+    else legend.push(options.backLabel === "quit" ? "esc or q quit" : "q quit");
     lines.push(`${rail}${source_default.dim(legend.join(" \xB7 "))}`);
     frame.draw(lines);
   };
@@ -690,11 +780,29 @@ async function promptSelect(options) {
     output3,
     true,
     render,
-    (_str, key, finish2) => {
+    (str, key, finish2) => {
       if (key.ctrl && (key.name === "c" || key.name === "d")) {
         finish2({ kind: "quit" });
         return;
       }
+      if (options.searchable) {
+        if (key.ctrl && key.name === "u") {
+          query = "";
+          filter();
+          return;
+        }
+        if (key.name === "backspace") {
+          query = query.slice(0, -1);
+          filter();
+          return;
+        }
+        if (!key.ctrl && !key.meta && str?.length === 1 && str >= " " && str !== "\x7F") {
+          query += str;
+          filter();
+          return;
+        }
+        if (choices.length === 0 && !["escape", "left"].includes(key.name ?? "")) return;
+      }
       switch (key.name) {
         case "up":
         case "k":
@@ -1315,18 +1423,29 @@ function allEntries() {
   return listProviderSupportEntries(getRuntimeRegistry().list());
 }
 function draftDescriptor(answers, runtime, withModel) {
-  const apiKeyRef = answers.credential === "stored" || answers.credential === "keep" ? runtime.id : void 0;
-  return buildDescriptor(runtime, answers.targetId ?? runtime.id, {
+  const apiKeyRef = answers.credential === "stored" ? targetApiKeyRef(answers.targetId ?? runtime.id, readSettings().targets) : answers.credential === "keep" ? answers.existing?.auth?.apiKeyRef ?? runtime.id : void 0;
+  const configured = buildDescriptor(runtime, answers.targetId ?? runtime.id, {
     ...answers.url !== void 0 ? { url: answers.url } : {},
     ...withModel && answers.model !== void 0 ? { model: answers.model } : {},
     ...answers.apiKeyEnv !== void 0 ? { apiKeyEnv: answers.apiKeyEnv } : {},
     ...apiKeyRef !== void 0 ? { apiKeyRef } : {},
-    ...runtime.auth === "oauth" ? { oauthProfile: runtime.oauthProviderId ?? runtime.id } : {}
+    ...runtime.auth === "oauth" ? { oauthProfile: answers.existing?.auth?.oauthProfile ?? runtime.oauthProviderId ?? runtime.id } : {}
   });
+  const descriptor = { ...answers.existing, ...configured };
+  if (!withModel) delete descriptor.defaultModel;
+  if (answers.existing?.auth || configured.auth) {
+    descriptor.auth = { ...answers.existing?.auth, ...configured.auth };
+    if (runtime.auth === "api-key") {
+      if (answers.credential !== "env") delete descriptor.auth.apiKeyEnvVar;
+      if (answers.credential !== "stored" && answers.credential !== "keep") delete descriptor.auth.apiKeyRef;
+    }
+    if (Object.keys(descriptor.auth).length === 0) delete descriptor.auth;
+  }
+  return descriptor;
 }
 var CATEGORY_STEP = {
   id: "category",
-  applies: () => true,
+  applies: (answers) => answers.mode !== "edit" && !answers.fixedRuntime,
   run: async (wizard, answers) => {
     const current = CONFIGURE_CATEGORY_CHOICES.findIndex((choice2) => choice2.category === answers.category);
     const result = await promptSelect({
@@ -1357,12 +1476,12 @@ var CATEGORY_STEP = {
 };
 var RUNTIME_STEP = {
   id: "runtime",
-  applies: () => true,
+  applies: (answers) => answers.mode !== "edit" && !answers.fixedRuntime,
   run: async (wizard, answers) => {
     const registry = getRuntimeRegistry();
     const chatEntries = allEntries().filter((entry) => {
       const runtime2 = registry.get(entry.runtimeId);
-      return runtime2 !== null && isOrchestratorEligibleRuntime(runtime2);
+      return runtime2 !== null && (answers.mode !== "first" || isOrchestratorEligibleRuntime(runtime2));
     });
     const entries = answers.category ? runtimesForCategory(chatEntries, answers.category) : chatEntries;
     const usable = entries.length > 0 ? entries : chatEntries;
@@ -1390,6 +1509,9 @@ var RUNTIME_STEP = {
       answers.apiKeyEnv = void 0;
       answers.apiKeyLiteral = void 0;
       answers.model = void 0;
+      answers.thinking = void 0;
+      answers.contextWindow = void 0;
+      answers.probe = void 0;
       answers.inventory = void 0;
       answers.inventoryKey = void 0;
     }
@@ -1400,7 +1522,7 @@ var RUNTIME_STEP = {
 };
 var TARGET_ID_STEP = {
   id: "target-id",
-  applies: () => true,
+  applies: (answers) => answers.mode !== "edit",
   run: async (wizard, answers) => {
     const runtime = answers.runtime;
     if (!runtime) return "back";
@@ -1414,6 +1536,8 @@ var TARGET_ID_STEP = {
       validate: (value) => {
         if (value.length === 0) return "a target id is required";
         if (/\s/u.test(value)) return "a target id cannot contain spaces";
+        if (readSettings().targets.some((target) => target.id === value))
+          return "that target id already exists; choose another or use Edit a target";
         return null;
       },
       input: wizard.input,
@@ -1484,7 +1608,7 @@ async function reportReachability(wizard, answers, runtime, url) {
 }
 var DETECTED_RUNTIME_STEP = {
   id: "detected-runtime",
-  applies: (answers) => answers.detected !== void 0 && answers.runtime !== void 0,
+  applies: (answers) => answers.mode !== "edit" && answers.detected !== void 0 && answers.runtime !== void 0,
   run: async (wizard, answers) => {
     const detected = answers.detected;
     const runtime = answers.runtime;
@@ -1540,10 +1664,15 @@ var CREDENTIAL_STEP = {
   run: async (wizard, answers) => {
     const runtime = answers.runtime;
     if (!runtime) return "back";
-    const stored = describeAuthStatus(runtime);
+    const stored = describeAuthStatus(runtime, answers.existing);
     if (runtime.auth === "oauth") {
       const result2 = await promptSelect({
-        heading: ["", source_default.bold(`Sign in to ${runtime.displayName}`), source_default.dim(`credential: ${stored}`)],
+        heading: [
+          "",
+          source_default.bold(`Sign in to ${runtime.displayName}`),
+          source_default.dim(`credential: ${stored}`),
+          "Sign-in stores credentials immediately; target settings wait for Save."
+        ],
         choices: [
           { value: "oauth-connect", label: "Connect now", hint: "opens your browser and waits for the callback" },
           {
@@ -1575,7 +1704,7 @@ var CREDENTIAL_STEP = {
       wizard.answer("Credential", "not connected yet");
       return "next";
     }
-    const hasStored = stored !== "none stored";
+    const hasStored = answers.existing?.auth?.apiKeyRef !== void 0 || stored !== "none stored";
     const choices = [
       {
         value: "env",
@@ -1609,6 +1738,7 @@ var CREDENTIAL_STEP = {
     if (result.kind === "back") return "back";
     answers.credential = result.value;
     if (result.value !== "env") answers.apiKeyEnv = void 0;
+    answers.inventoryKey = void 0;
     if (result.value !== "stored") answers.apiKeyLiteral = void 0;
     if (result.value === "keep") wizard.answer("Credential", stored);
     if (result.value === "skip") wizard.answer("Credential", "none");
@@ -1627,6 +1757,7 @@ var CREDENTIAL_VALUE_STEP = {
       initial: wantsEnv ? answers.apiKeyEnv ?? runtime.credentialsEnvVar ?? "" : "",
       hint: wantsEnv ? "Clio reads it every time it calls the provider, so the key never lands on disk" : `stored at ${shortenPath(authStoragePath())}`,
       ...wantsEnv ? {} : { mask: true },
+      validate: (value) => value.length > 0 ? null : `Enter ${wantsEnv ? "an environment variable" : "a key"}, or press Escape to choose No key.`,
       railPrefix: wizard.rail,
       backLabel: "back",
       clearOnExit: true,
@@ -1742,7 +1873,7 @@ var MODEL_STEP = {
 };
 async function readModelCapabilities(answers, runtime) {
   const descriptor = draftDescriptor(answers, runtime, true);
-  const probe = await runtimeProbe(runtime, descriptor);
+  const probe = await runtimeProbe(runtime, descriptor, answers.apiKeyLiteral);
   answers.probe = probe;
   if (probe?.ok && probe.models) {
     recordTargetModelSnapshot(descriptor, probe.models, probe.modelLabels ? { modelLabels: probe.modelLabels } : {});
@@ -1760,6 +1891,7 @@ var THINKING_HINTS = {
 var THINKING_STEP = {
   id: "thinking",
   applies: (answers) => {
+    if (answers.mode !== "first" && !PROTOCOL_COMPAT_RUNTIME_IDS.has(answers.runtime?.id ?? "")) return false;
     const runtime = answers.runtime;
     if (!runtime || answers.model === void 0) return false;
     if (PROTOCOL_COMPAT_RUNTIME_IDS.has(runtime.id)) return true;
@@ -1768,7 +1900,13 @@ var THINKING_STEP = {
   run: async (wizard, answers) => {
     const current = THINKING_LEVELS.indexOf(answers.thinking ?? "low");
     const result = await promptSelect({
-      heading: ["", source_default.bold("How hard should it think?"), source_default.dim("changeable any time in `clio-coder configure`")],
+      heading: [
+        "",
+        source_default.bold("How hard should it think?"),
+        source_default.dim(
+          answers.mode === "first" ? "changeable any time in `clio-coder configure`" : "off disables reasoning for this target; chat and fleet thinking defaults stay unchanged"
+        )
+      ],
       choices: THINKING_LEVELS.map((level) => ({ value: level, label: level, hint: THINKING_HINTS[level] })),
       initialIndex: current >= 0 ? current : 0,
       railPrefix: wizard.rail,
@@ -1786,7 +1924,7 @@ var THINKING_STEP = {
 };
 var ANTIGRAVITY_COLLEAGUE_STEP = {
   id: "antigravity-colleague",
-  applies: (answers) => answers.runtime !== void 0 && isOrchestratorEligibleRuntime(answers.runtime) && resolveOnPath(["agy"]).presence === "present" && !readSettings().targets.some((target) => target.runtime === "antigravity-code"),
+  applies: (answers) => answers.mode === "first" && answers.runtime !== void 0 && isOrchestratorEligibleRuntime(answers.runtime) && resolveOnPath(["agy"]).presence === "present" && !readSettings().targets.some((target) => target.runtime === "antigravity-code"),
   run: async (wizard, answers) => {
     const runtime = getRuntimeRegistry().get("antigravity-code");
     if (!runtime) return "next";
@@ -1845,22 +1983,54 @@ var ANTIGRAVITY_COLLEAGUE_STEP = {
     return "next";
   }
 };
-var PEERS_STEP = {
-  id: "peers",
-  applies: () => true,
+var CONTEXT_STEP = {
+  id: "context-window",
+  applies: (answers) => PROTOCOL_COMPAT_RUNTIME_IDS.has(answers.runtime?.id ?? "") || answers.mode === "edit",
   run: async (wizard, answers) => {
-    const outcome = await reviewInteropAgents({
-      rl: null,
-      streams: wizard.streams,
-      presenter: wizard.presenter,
-      rail: wizard.rail,
-      quiet: true
+    const result = await promptText({
+      heading: ["", source_default.bold("Context window in tokens")],
+      initial: answers.contextWindow === void 0 ? "" : String(answers.contextWindow),
+      hint: "optional override; blank uses detected capabilities or the runtime default",
+      validate: (value) => value === "" || Number.isSafeInteger(Number(value)) && Number(value) > 0 ? null : "enter a positive whole number, or leave blank",
+      railPrefix: wizard.rail,
+      backLabel: "back",
+      clearOnExit: true,
+      input: wizard.input,
+      output: wizard.output
     });
-    if (outcome.back) return "back";
-    answers.wiredPeers = outcome.wired;
+    if (result.kind !== "value") return result.kind;
+    answers.contextWindow = result.value ? Number(result.value) : void 0;
+    wizard.answer("Context", result.value || "detected / runtime default");
     return "next";
   }
 };
+var REVIEW_STEP = {
+  id: "review",
+  applies: () => true,
+  run: async (wizard, answers) => {
+    const result = await promptSelect({
+      heading: [
+        "",
+        source_default.bold("Review target"),
+        `${answers.targetId} \xB7 ${answers.runtime?.id} \xB7 ${answers.model}`,
+        answers.mode === "first" ? "Use for chat and fleet." : "Existing chat, fleet, memory, and profile defaults stay in place.",
+        "Escape returns to the previous step; settings are saved only when you choose Save."
+      ],
+      choices: [
+        { value: "save", label: "Save target" },
+        { value: "back", label: "Back" },
+        { value: "cancel", label: "Cancel setup" }
+      ],
+      railPrefix: wizard.rail,
+      backLabel: "back",
+      clearOnExit: true,
+      input: wizard.input,
+      output: wizard.output
+    });
+    if (result.kind !== "selected") return result.kind;
+    return result.value === "save" ? "next" : result.value === "back" ? "back" : "cancel";
+  }
+};
 var STEPS = [
   CATEGORY_STEP,
   RUNTIME_STEP,
@@ -1871,31 +2041,37 @@ var STEPS = [
   DETECTED_RUNTIME_STEP,
   MODEL_STEP,
   THINKING_STEP,
+  CONTEXT_STEP,
   ANTIGRAVITY_COLLEAGUE_STEP,
-  PEERS_STEP
+  REVIEW_STEP
 ];
-function persist(answers, descriptor, chatEligible) {
-  updateSettings((settings) => {
-    applyTarget(settings, descriptor);
-    if (chatEligible) setOrchestratorPointer(settings, descriptor, answers.model ?? null);
-    setWorkerDefaultPointer(settings, descriptor, answers.model ?? null);
-    if (answers.thinking !== void 0) {
-      settings.chat.thinkingLevel = answers.thinking;
-      settings.fleet.default.thinkingLevel = answers.thinking;
-    }
-    if (answers.antigravity !== void 0) {
-      const antigravityRuntime = getRuntimeRegistry().get("antigravity-code");
-      if (!antigravityRuntime) throw new Error("Antigravity runtime disappeared before settings were written");
-      const external = buildDescriptor(antigravityRuntime, answers.antigravity.targetId, {
-        model: answers.antigravity.model
-      });
-      applyTarget(settings, external);
-      setWorkerProfilePointer(settings, "world-knowledge-external", external, answers.antigravity.model);
-      bindAgentProfileInSettings(settings, "world-knowledge", "world-knowledge-external");
-    }
-  });
+function applyAnswers(settings, answers, descriptor, chatEligible) {
+  const current = settings.targets.find((target) => target.id === descriptor.id);
+  if (answers.mode === "edit") {
+    if (JSON.stringify(current) !== JSON.stringify(answers.existing))
+      throw new Error("This target changed during setup; reopen Edit to keep those changes.");
+  } else if (current) throw new Error(`Target '${descriptor.id}' already exists; use Edit a target.`);
+  applyTarget(settings, descriptor);
+  if (answers.mode === "first" && chatEligible) setOrchestratorPointer(settings, descriptor, answers.model ?? null);
+  if (answers.mode === "first") setWorkerDefaultPointer(settings, descriptor, answers.model ?? null);
+  if (answers.mode === "first" && answers.thinking !== void 0) {
+    settings.chat.thinkingLevel = answers.thinking;
+    settings.fleet.default.thinkingLevel = answers.thinking;
+  }
+  if (answers.antigravity !== void 0) {
+    const antigravityRuntime = getRuntimeRegistry().get("antigravity-code");
+    if (!antigravityRuntime) throw new Error("Antigravity runtime disappeared before settings were written");
+    const external = buildDescriptor(antigravityRuntime, answers.antigravity.targetId, {
+      model: answers.antigravity.model
+    });
+    applyTarget(settings, external);
+    setWorkerProfilePointer(settings, "world-knowledge-external", external, answers.antigravity.model);
+    bindAgentProfileInSettings(settings, "world-knowledge", "world-knowledge-external");
+  }
 }
-async function runOnboardingWizard(streams) {
+async function runOnboardingWizard(streams, options = {
+  mode: "first"
+}) {
   const writer = railWriter(streams.out);
   const presenter = createLifecyclePresenter({ stream: writer.stream });
   const rail = railPrefix(presenter.isPlain());
@@ -1910,10 +2086,30 @@ async function runOnboardingWizard(streams) {
       presenter.fields([[label.padEnd(LABEL_WIDTH), truncate(value, Math.max(12, columns - LABEL_WIDTH - 6))]]);
     }
   };
-  presenter.header("Welcome to Clio Coder", "configure");
-  presenter.note("Pick the model you want Clio to talk to; escape goes back a step and changes nothing.");
+  presenter.header(
+    options.mode === "edit" ? `Edit target: ${options.target.id}` : options.mode === "first" ? "Welcome to Clio Coder" : "Add a target",
+    "configure"
+  );
+  presenter.note("Pick a model; escape goes back. Review and save when ready.");
   presenter.note(`Result: ${shortenPath(settingsPath())}`);
-  const answers = {};
+  const existing = options.mode === "edit" ? options.target : void 0;
+  const answers = {
+    mode: options.mode,
+    existing,
+    runtime: existing ? getRuntimeRegistry().get(existing.runtime) ?? void 0 : options.mode !== "edit" ? options.runtime : void 0,
+    fixedRuntime: options.mode !== "edit" && options.runtime !== void 0,
+    targetId: existing?.id,
+    url: existing?.url,
+    model: existing?.defaultModel,
+    credential: existing?.auth?.apiKeyEnvVar ? "env" : existing?.auth?.apiKeyRef ? "keep" : void 0,
+    apiKeyEnv: existing?.auth?.apiKeyEnvVar,
+    contextWindow: existing?.capabilities?.contextWindow,
+    thinking: existing?.capabilities?.reasoning === false ? "off" : void 0
+  };
+  if (existing && !answers.runtime) {
+    presenter.fail(`Unknown runtime: ${existing.runtime}`);
+    return 2;
+  }
   const marks = new Array(STEPS.length).fill(writer.mark());
   let cursor = 0;
   let direction = 1;
@@ -1922,70 +2118,76 @@ async function runOnboardingWizard(streams) {
     if (step === void 0) break;
     if (!step.applies(answers)) {
       cursor += direction;
-      if (cursor < 0) return cancel(presenter);
+      if (cursor < 0) return cancel(presenter, answers);
       continue;
     }
     marks[cursor] = writer.mark();
     const outcome = await step.run(wizard, answers);
-    if (outcome === "quit") return cancel(presenter);
+    if (outcome === "quit" || outcome === "cancel") return cancel(presenter, answers, outcome === "quit");
     if (outcome === "back") {
       direction = -1;
       cursor -= 1;
       while (cursor >= 0 && !(STEPS[cursor]?.applies(answers) ?? false)) cursor -= 1;
-      if (cursor < 0) return cancel(presenter);
+      if (cursor < 0) return cancel(presenter, answers);
       writer.rewindTo(marks[cursor] ?? writer.mark());
       continue;
     }
     direction = 1;
     cursor += 1;
   }
-  return finish(wizard, answers);
+  const code = finish(wizard, answers);
+  if (code === 0 && answers.mode === "first") {
+    await reviewInteropAgents({ rl: null, streams, presenter, rail, quiet: true });
+  }
+  return code;
 }
-function cancel(presenter) {
-  presenter.done("Cancelled, nothing written");
-  printError("configuration cancelled");
-  return 130;
+function cancel(presenter, answers, quit = false) {
+  presenter.done("Cancelled; target settings not saved");
+  if (answers.mode === "first") printError("configuration cancelled");
+  return answers.mode === "first" || quit ? 130 : 0;
 }
 function finish(wizard, answers) {
   const runtime = answers.runtime;
   const targetId = answers.targetId;
-  if (!runtime || targetId === void 0) return cancel(wizard.presenter);
+  if (!runtime || targetId === void 0) return cancel(wizard.presenter, answers);
   const presenter = wizard.presenter;
-  if (answers.apiKeyLiteral !== void 0) {
-    const auth = openAuthStorage();
-    auth.setApiKey(runtime.id, answers.apiKeyLiteral);
-    if (credentialWriteFailed(auth, `credential for ${runtime.id} was not stored; target '${targetId}' not saved`)) {
-      presenter.done("Nothing written");
-      return 1;
-    }
-    printPlaintextCredentialWarning();
-  }
   const reasoning = PROTOCOL_COMPAT_RUNTIME_IDS.has(runtime.id) && answers.thinking !== void 0 ? answers.thinking !== "off" : void 0;
-  const descriptor = buildDescriptor(runtime, targetId, {
-    ...answers.url !== void 0 ? { url: answers.url } : {},
-    ...answers.model !== void 0 ? { model: answers.model } : {},
-    ...answers.apiKeyEnv !== void 0 ? { apiKeyEnv: answers.apiKeyEnv } : {},
-    ...answers.credential === "stored" || answers.credential === "keep" ? { apiKeyRef: runtime.id } : {},
-    ...runtime.auth === "oauth" ? { oauthProfile: runtime.oauthProviderId ?? runtime.id } : {},
-    ...reasoning === void 0 ? {} : { reasoning }
-  });
+  const descriptor = draftDescriptor(answers, runtime, true);
+  descriptor.capabilities = { ...descriptor.capabilities };
+  if (reasoning !== void 0) descriptor.capabilities.reasoning = reasoning;
+  if (answers.contextWindow === void 0) delete descriptor.capabilities.contextWindow;
+  else descriptor.capabilities.contextWindow = answers.contextWindow;
   const chatEligible = isOrchestratorEligibleRuntime(runtime);
   try {
-    persist(answers, descriptor, chatEligible);
+    const preview = readSettings();
+    applyAnswers(preview, answers, descriptor, chatEligible);
+    const validated = validateSettings(preview);
+    if (validated.issues.length) throw new SettingsValidationError(validated.issues);
+    initializeClioHome();
+    if (answers.apiKeyLiteral !== void 0 && descriptor.auth?.apiKeyRef) {
+      const auth = openAuthStorage();
+      auth.setApiKey(descriptor.auth.apiKeyRef, answers.apiKeyLiteral);
+      if (credentialWriteFailed(auth, `credential for ${runtime.id} was not stored; target '${targetId}' not saved`)) {
+        presenter.done("Nothing written");
+        return 1;
+      }
+      printPlaintextCredentialWarning();
+    }
+    updateSettings((settings) => applyAnswers(settings, answers, descriptor, chatEligible));
   } catch (error) {
     presenter.fail("settings were not written", error instanceof Error ? error.message : String(error));
-    presenter.done("Nothing written");
+    presenter.done("Target settings not saved");
     return 1;
   }
   presenter.completedStep(`target ${targetId} saved, runtime ${runtime.id}`);
-  if (chatEligible)
+  if (answers.mode === "first" && chatEligible)
     presenter.completedStep(`chat runs on ${targetId}${answers.model ? `, model ${answers.model}` : ""}`);
-  else presenter.completedStep(`${runtime.id} cannot answer chat; ${targetId} is registered for dispatch only`);
-  presenter.completedStep(`fleet default is ${targetId}`);
-  if (answers.thinking !== void 0) presenter.completedStep(`thinking level ${answers.thinking}`);
-  for (const peer of answers.wiredPeers ?? []) {
-    presenter.completedStep(`delegation agent ${peer} added; use \`/delegate ${peer} <task>\``);
-  }
+  else if (!chatEligible)
+    presenter.completedStep(`${runtime.id} cannot answer chat; ${targetId} is registered for dispatch only`);
+  if (answers.mode === "first") presenter.completedStep(`fleet default is ${targetId}`);
+  else presenter.note("Use Targets & Auth to change chat, fleet, or background defaults.");
+  if (answers.mode === "first" && answers.thinking !== void 0)
+    presenter.completedStep(`thinking level ${answers.thinking}`);
   if (answers.antigravity !== void 0) {
     presenter.completedStep(
       `world-knowledge bound read-only to ${answers.antigravity.targetId}/${answers.antigravity.model}`
@@ -2003,19 +2205,318 @@ function finish(wizard, answers) {
   return 0;
 }
 
+// src/cli/configure-prompts.ts
+init_esm_shims();
+import { createInterface as createInterface2 } from "node:readline/promises";
+var ConfigureNavigation = class extends Error {
+  constructor(kind) {
+    super(kind);
+    this.kind = kind;
+  }
+  kind;
+};
+var ConfigurePrompts = class {
+  constructor(input2, output3) {
+    this.input = input2;
+    this.output = output3;
+  }
+  input;
+  output;
+  get interactive() {
+    return canSelect(this.input, this.output);
+  }
+  clearScreen() {
+    if (this.interactive) this.output.write("\x1B[H\x1B[2J");
+  }
+  async question(query, options) {
+    const rl = createInterface2({ input: this.input, output: this.output });
+    try {
+      return await new Promise((resolve, reject) => {
+        rl.once("close", () => reject(new ConfigureNavigation("quit")));
+        rl.once("SIGINT", () => reject(new ConfigureNavigation("quit")));
+        rl.question(query, options ?? {}).then(resolve, reject);
+      });
+    } finally {
+      rl.close();
+    }
+  }
+  async text(label, initial = "", mask = false) {
+    if (!this.interactive) {
+      const value = (await this.question(`${label}${initial ? ` [${initial}]` : ""}: `)).trim();
+      if (/^(q|quit)$/iu.test(value)) throw new ConfigureNavigation("quit");
+      return value || initial;
+    }
+    const result = await promptText({
+      heading: ["", label],
+      railPrefix: railPrefix(createLifecyclePresenter({ stream: this.output }).isPlain()),
+      initial,
+      mask,
+      backLabel: "back",
+      clearOnExit: true,
+      input: this.input,
+      output: this.output
+    });
+    if (result.kind !== "value") throw new ConfigureNavigation(result.kind);
+    return result.value;
+  }
+  async choose(label, choices, current, searchable = false) {
+    if (!this.interactive) return this.text(`${label} [${choices.join("|")}]`, current);
+    const result = await promptSelect({
+      heading: ["", label],
+      railPrefix: railPrefix(createLifecyclePresenter({ stream: this.output }).isPlain()),
+      choices: choices.map((value) => ({ value, label: value })),
+      initialIndex: Math.max(0, choices.indexOf(current)),
+      ...searchable ? { searchable: true, maxVisible: 8 } : {},
+      backLabel: "back",
+      clearOnExit: true,
+      input: this.input,
+      output: this.output
+    });
+    if (result.kind !== "selected") throw new ConfigureNavigation(result.kind);
+    return result.value;
+  }
+};
+
+// src/cli/configure-quick.ts
+init_esm_shims();
+function endpointUrl(value) {
+  const url = new URL(value.includes("://") ? value : `http://${value}`);
+  if (!["http:", "https:"].includes(url.protocol) || !url.hostname)
+    throw new Error("Use an http:// or https:// endpoint URL.");
+  if (url.username || url.password)
+    throw new Error("Enter the endpoint without credentials; Clio asks for a key when needed.");
+  return url.toString().replace(/\/$/u, "");
+}
+async function connect(url, key) {
+  const settings = readSettings();
+  const registry = getRuntimeRegistry();
+  const matches = settings.targets.filter((target2) => {
+    const runtime2 = registry.get(target2.runtime);
+    if (!target2.url || !runtime2 || !isOrchestratorEligibleRuntime(runtime2)) return false;
+    try {
+      return endpointUrl(target2.url) === url;
+    } catch {
+      return false;
+    }
+  });
+  const existing = matches.find((target2) => target2.id === settings.chat.target) ?? matches[0];
+  let runtime = existing ? registry.get(existing.runtime) : null;
+  let token = key;
+  if (existing && runtime && token === void 0) {
+    const auth = await openAuthStorage().resolveForTarget(resolveAuthTarget(existing, runtime), {
+      includeFallback: false
+    });
+    token = auth.apiKey;
+  }
+  const ctx = { credentialsPresent: /* @__PURE__ */ new Set(), httpTimeoutMs: 5e3, authToken: token ?? "" };
+  if (!runtime) {
+    const root = targetRootUrl({ id: "quick", runtime: "openai-compat", url }) ?? url;
+    const headers = token ? { Authorization: `Bearer ${token}` } : {};
+    const native = await fingerprintNativeRuntime(root, headers);
+    let id = native?.runtimeId ?? "openai-compat";
+    if (!native) {
+      const info = await probeJson({
+        url: `${root}/v1/model/info`,
+        headers,
+        timeoutMs: 1e3
+      });
+      if (info.ok && info.data?.data?.some((row) => typeof row.model_name === "string" && row.model_info !== void 0))
+        id = "litellm";
+    }
+    runtime = registry.get(id);
+  }
+  if (!runtime) throw new Error("No compatible runtime is available. Open Settings \u2192 Targets & Auth.");
+  const target = existing ? structuredClone(existing) : {
+    id: deriveTargetId(runtime.id, settings.targets),
+    runtime: runtime.id,
+    url
+  };
+  let probe = await runtime.probe?.(target, ctx) ?? {
+    ok: false,
+    error: "This connection does not support endpoint checks."
+  };
+  let models = probe.ok ? probe.models ?? await runtime.probeModels?.(target, ctx) ?? [] : [];
+  if (!existing && runtime.id === "openai-compat" && !probe.ok && /HTTP (401|403|404)/u.test(probe.error ?? "")) {
+    const anthropic = registry.get("anthropic-compat");
+    if (anthropic) {
+      const candidate = { ...target, runtime: anthropic.id };
+      const catalog = await anthropic.probeModels?.(candidate, ctx) ?? [];
+      if (catalog.length > 0) {
+        runtime = anthropic;
+        target.runtime = anthropic.id;
+        target.id = deriveTargetId(anthropic.id, settings.targets);
+        models = catalog;
+        probe = { ok: true, models };
+      }
+    }
+  }
+  models = [...new Set(models)].filter((id) => probe.modelCapabilities?.[id]?.chat !== false);
+  return { runtime, target, existing, probe, models };
+}
+async function runQuickConnect(prompts) {
+  const initial = readSettings();
+  const first = initial.targets.length === 0;
+  const current = initial.targets.find((target) => target.id === initial.chat.target);
+  let url = current?.url ?? "";
+  let key;
+  let connection;
+  let model = "";
+  let step = "url";
+  let askedKey = false;
+  let optionalKey = false;
+  let notice = "";
+  const presenter = createLifecyclePresenter({ stream: prompts.output });
+  for (; ; ) {
+    prompts.clearScreen();
+    presenter.header("Quick Connect", "configure");
+    presenter.note("Connect one model to power Clio. Change other settings whenever you need them.");
+    if (notice) {
+      presenter.warn(notice);
+      notice = "";
+    }
+    try {
+      if (step === "url") {
+        presenter.note("LM Studio: localhost:1234 \xB7 Ollama: localhost:11434");
+        const answer = await prompts.text("Endpoint URL", url);
+        if (!answer) {
+          notice = "Enter the endpoint URL shown by your model server or API provider.";
+          continue;
+        }
+        try {
+          url = endpointUrl(answer);
+        } catch (error) {
+          notice = error instanceof Error ? error.message : String(error);
+          continue;
+        }
+        key = void 0;
+        askedKey = false;
+        connection = void 0;
+      } else if (step === "key") {
+        presenter.note(`Endpoint: ${url}`);
+        if (optionalKey)
+          presenter.note("Some APIs publish models publicly but require a key for chat. Leave blank for a keyless server.");
+        key = await prompts.text("API key (saved locally when you choose Connect)", "", true) || void 0;
+        if (!key && !optionalKey) {
+          notice = "Enter a key, or press Escape to change the endpoint.";
+          continue;
+        }
+        askedKey = true;
+      }
+      if (step === "url" || step === "key") {
+        presenter.note("Checking the endpoint and reading its model list\u2026");
+        connection = await connect(url, key);
+        if (!connection.probe.ok) {
+          if (connection.probe.authFailed || /HTTP (401|403)/u.test(connection.probe.error ?? "")) {
+            optionalKey = false;
+            notice = key ? "The endpoint rejected that key. Try again, or Escape to go back." : "This endpoint needs an API key.";
+            step = "key";
+          } else {
+            notice = `Could not connect: ${connection.probe.error ?? "no reply"}. Check the URL and that the server is running.`;
+            step = "url";
+          }
+          continue;
+        }
+        if (!connection.existing && !askedKey && connection.runtime.auth === "api-key" && connection.runtime.tier !== "local-native") {
+          optionalKey = true;
+          step = "key";
+          continue;
+        }
+        if (connection.models.length === 0) {
+          notice = "The endpoint offered no chat models. Load a model and retry. Servers without model discovery can use Settings \u2192 Targets & Auth.";
+          step = "url";
+          continue;
+        }
+        const preferred = connection.existing?.id === initial.chat.target ? initial.chat.model : connection.target.defaultModel;
+        model = preferred && connection.models.includes(preferred) ? preferred : connection.models[0] ?? "";
+        step = connection.models.length === 1 ? "save" : "model";
+        continue;
+      }
+      if (!connection) {
+        step = "url";
+        continue;
+      }
+      if (step === "model") {
+        presenter.note(`Connected: ${url} (${connection.runtime.displayName})`);
+        model = await prompts.choose("Choose the model for Clio", connection.models, model, true);
+        if (!connection.models.includes(model)) {
+          notice = "Choose a model from the endpoint's live list.";
+          continue;
+        }
+        step = "save";
+        continue;
+      }
+      presenter.fields([
+        ["Endpoint", url],
+        ["Model", model],
+        ["Connection", "live model discovery passed"]
+      ]);
+      presenter.note(
+        first ? "Ready with recommended defaults: workspace edits, approval for unrecognized commands, one worker, $5 tracked session budget." : "Use this model for chat. Your other settings and role assignments stay in place."
+      );
+      const choice = await prompts.choose("Ready to connect", ["Connect", "Back"], "Connect");
+      if (choice !== "Connect") throw new ConfigureNavigation("back");
+      const descriptor = structuredClone(connection.target);
+      if (!connection.existing) descriptor.defaultModel = model;
+      if (key) {
+        descriptor.auth = { ...descriptor.auth, apiKeyRef: targetApiKeyRef(descriptor.id, readSettings().targets) };
+        delete descriptor.auth.apiKeyEnvVar;
+      }
+      const apply = (settings) => {
+        const target = settings.targets.find((entry) => entry.id === descriptor.id);
+        if (JSON.stringify(target) !== JSON.stringify(connection?.existing))
+          throw new Error("This target changed during setup. Reopen Quick Connect to keep those changes.");
+        applyTarget(settings, descriptor);
+        setOrchestratorPointer(settings, descriptor, model);
+        if (first && !settings.fleet.default.target) setWorkerDefaultPointer(settings, descriptor, model);
+      };
+      const preview = readSettings();
+      apply(preview);
+      const validated = validateSettings(preview);
+      if (validated.issues.length) throw new SettingsValidationError(validated.issues);
+      initializeClioHome();
+      if (key && descriptor.auth?.apiKeyRef) {
+        const auth = openAuthStorage();
+        auth.setApiKey(descriptor.auth.apiKeyRef, key);
+        if (credentialWriteFailed(auth, "The key was not saved; connection settings were not changed."))
+          throw new Error("The key could not be saved. Check permissions on the credentials file and retry.");
+        printPlaintextCredentialWarning();
+      }
+      updateSettings(apply);
+      presenter.done(`Connected: ${descriptor.id} / ${model}`);
+      presenter.commandAdvice("Start Clio:", "clio-coder");
+      return "connected";
+    } catch (error) {
+      if (!(error instanceof ConfigureNavigation)) {
+        notice = error instanceof Error ? error.message : String(error);
+        step = "url";
+        continue;
+      }
+      if (error.kind === "quit" || step === "url") {
+        presenter.done("Quick Connect cancelled; connection settings not saved.");
+        return error.kind;
+      }
+      step = step === "save" && (connection?.models.length ?? 0) > 1 ? "model" : step === "model" || step === "save" ? askedKey ? "key" : "url" : "url";
+    }
+  }
+}
+
 // src/cli/configure.ts
 var HELP = `clio-coder configure
 
 Configure model targets and runtime settings for chat and fleet dispatch.
 
 Usage:
-  clio-coder configure                   interactive configuration wizard
+  clio-coder configure                   Quick Connect, Settings, or Diagnostics
+  clio-coder configure --quick           connect an endpoint with recommended defaults
+  clio-coder configure --settings        open the complete settings menu
   clio-coder configure --section <name>  open one section directly:
                                          targets, models, chat, fleet,
-                                         permissions, panes, skills, diagnostics
+                                         permissions, panes, skills, diagnostics, advanced
                                          Without a terminal this prints the
                                          section's values and exits.
   clio-coder configure --json            emit the effective settings as JSON
+  clio-coder configure --edit            edit all user settings in VISUAL/EDITOR;
+                                         validate and review before saving
   clio-coder configure --interop         review detected coding agents as delegation peers
   clio-coder configure --list            list target runtimes (user-facing only)
   clio-coder configure --list --all      list every registered runtime including aliases
@@ -2060,6 +2561,9 @@ function parseSetupArgs(argv) {
     all: false,
     interop: false,
     json: false,
+    edit: false,
+    quick: false,
+    settings: false,
     force: false,
     gateway: false,
     setOrchestrator: false,
@@ -2082,6 +2586,15 @@ function parseSetupArgs(argv) {
       case "--json":
         out.json = true;
         break;
+      case "--edit":
+        out.edit = true;
+        break;
+      case "--quick":
+        out.quick = true;
+        break;
+      case "--settings":
+        out.settings = true;
+        break;
       case "--section":
         out.section = need();
         break;
@@ -2197,7 +2710,9 @@ function printRuntimeList(includeHidden) {
   const rows = [];
   for (const entry of listProviderSupportEntries(getRuntimeRegistry().list(), { includeHidden })) {
     const runtime = getRuntimeRegistry().get(entry.runtimeId);
-    const status = runtime && entry.connectable ? auth.statusForTarget(resolveRuntimeAuthTarget(runtime), { includeFallback: false }) : null;
+    const status = runtime && entry.connectable ? auth.statusForTarget(resolveRuntimeAuthTarget(runtime), {
+      includeFallback: false
+    }) : null;
     const authLabel = runtime?.auth === "oauth" ? status?.available ? "connected" : "login" : runtime?.auth === "api-key" ? status?.available ? "credential" : targetRequiresAuth({ id: entry.runtimeId, runtime: entry.runtimeId }, runtime) ? "needs-key" : "key-optional" : runtime?.auth ?? "none";
     rows.push({
       group: supportGroupLabel(entry.group),
@@ -2292,6 +2807,7 @@ async function runNonInteractive(runtime, args) {
     );
     return 2;
   }
+  initializeClioHome();
   const settings = readSettings();
   const auth = openAuthStorage();
   const support = buildProviderSupportEntry(runtime);
@@ -2323,24 +2839,32 @@ async function runNonInteractive(runtime, args) {
       );
     }
   }
-  const authStatus = auth.statusForTarget(resolveRuntimeAuthTarget(runtime), { includeFallback: false });
+  const authStatus = auth.statusForTarget(
+    existing ? resolveAuthTarget(existing, runtime) : resolveRuntimeAuthTarget(runtime),
+    { includeFallback: false }
+  );
   const apiKeyEnv = args.apiKeyEnv ?? existing?.auth?.apiKeyEnvVar;
-  const apiKeyRef = runtime.auth === "api-key" && (args.apiKey || existing?.auth?.apiKeyRef || authStatus.source === "stored-api-key") ? runtime.id : void 0;
+  const apiKeyRef = runtime.auth === "api-key" && (args.apiKey || existing?.auth?.apiKeyRef || authStatus.source === "stored-api-key") ? args.apiKey ? targetApiKeyRef(args.id, settings.targets) : existing?.auth?.apiKeyRef ?? runtime.id : void 0;
   const oauthProfile = runtime.auth === "oauth" ? existing?.auth?.oauthProfile ?? runtime.oauthProviderId ?? runtime.id : void 0;
-  const seed = buildDescriptor(runtime, args.id, {
-    ...url !== void 0 ? { url } : {},
-    ...args.model !== void 0 ? { model: args.model } : existing?.defaultModel ? { model: existing.defaultModel } : support.defaultModel ? { model: support.defaultModel } : {},
-    ...apiKeyEnv !== void 0 ? { apiKeyEnv } : {},
-    ...apiKeyRef !== void 0 ? { apiKeyRef } : {},
-    ...oauthProfile !== void 0 ? { oauthProfile } : {},
-    gateway: args.gateway || existing?.gateway === true,
-    ...args.lifecycle !== void 0 ? { lifecycle: args.lifecycle } : existing?.lifecycle !== void 0 ? { lifecycle: existing.lifecycle } : {},
-    ...args.contextWindow !== void 0 ? { contextWindow: args.contextWindow } : {},
-    ...args.maxTokens !== void 0 ? { maxTokens: args.maxTokens } : {},
-    ...args.reasoning !== void 0 ? { reasoning: args.reasoning } : {},
-    ...existing?.lmstudio ? { lmstudio: existing.lmstudio } : {},
-    ...existing?.litellm ? { litellm: existing.litellm } : {}
-  });
+  const seed = {
+    ...existing,
+    ...buildDescriptor(runtime, args.id, {
+      ...url !== void 0 ? { url } : {},
+      ...args.model !== void 0 ? { model: args.model } : existing?.defaultModel ? { model: existing.defaultModel } : support.defaultModel ? { model: support.defaultModel } : {},
+      ...apiKeyEnv !== void 0 ? { apiKeyEnv } : {},
+      ...apiKeyRef !== void 0 ? { apiKeyRef } : {},
+      ...oauthProfile !== void 0 ? { oauthProfile } : {},
+      gateway: args.gateway || existing?.gateway === true,
+      ...args.lifecycle !== void 0 ? { lifecycle: args.lifecycle } : existing?.lifecycle !== void 0 ? { lifecycle: existing.lifecycle } : {},
+      ...args.contextWindow !== void 0 ? { contextWindow: args.contextWindow } : {},
+      ...args.maxTokens !== void 0 ? { maxTokens: args.maxTokens } : {},
+      ...args.reasoning !== void 0 ? { reasoning: args.reasoning } : {},
+      ...existing?.lmstudio ? { lmstudio: existing.lmstudio } : {},
+      ...existing?.litellm ? { litellm: existing.litellm } : {}
+    })
+  };
+  seed.capabilities = { ...existing?.capabilities, ...seed.capabilities };
+  if (seed.auth) seed.auth = { ...existing?.auth, ...seed.auth };
   const inventory = await resolveSupportedWireModels(runtime, seed, existing, args.apiKey);
   const wireModels = inventory.models;
   const model = args.model ?? existing?.defaultModel ?? (inventory.source === "probe" ? wireModels[0] : support.defaultModel) ?? (support.modelSource === "catalog" ? void 0 : wireModels[0]);
@@ -2350,20 +2874,25 @@ async function runNonInteractive(runtime, args) {
   }
   if (!validateResolvedModel(runtime, seed, model, args.force, inventory)) return 2;
   if (!validateContextWindowOverride(runtime, model, args.contextWindow, args.force)) return 2;
-  const descriptor = buildDescriptor(runtime, args.id, {
-    ...url !== void 0 ? { url } : {},
-    ...model ? { model } : {},
-    ...apiKeyEnv !== void 0 ? { apiKeyEnv } : {},
-    ...apiKeyRef !== void 0 ? { apiKeyRef } : {},
-    ...oauthProfile !== void 0 ? { oauthProfile } : {},
-    gateway: args.gateway || existing?.gateway === true,
-    ...args.lifecycle !== void 0 ? { lifecycle: args.lifecycle } : existing?.lifecycle !== void 0 ? { lifecycle: existing.lifecycle } : {},
-    ...args.contextWindow !== void 0 ? { contextWindow: args.contextWindow } : {},
-    ...args.maxTokens !== void 0 ? { maxTokens: args.maxTokens } : {},
-    ...args.reasoning !== void 0 ? { reasoning: args.reasoning } : {},
-    ...existing?.lmstudio ? { lmstudio: existing.lmstudio } : {},
-    ...existing?.litellm ? { litellm: existing.litellm } : {}
-  });
+  const descriptor = {
+    ...existing,
+    ...buildDescriptor(runtime, args.id, {
+      ...url !== void 0 ? { url } : {},
+      ...model ? { model } : {},
+      ...apiKeyEnv !== void 0 ? { apiKeyEnv } : {},
+      ...apiKeyRef !== void 0 ? { apiKeyRef } : {},
+      ...oauthProfile !== void 0 ? { oauthProfile } : {},
+      gateway: args.gateway || existing?.gateway === true,
+      ...args.lifecycle !== void 0 ? { lifecycle: args.lifecycle } : existing?.lifecycle !== void 0 ? { lifecycle: existing.lifecycle } : {},
+      ...args.contextWindow !== void 0 ? { contextWindow: args.contextWindow } : {},
+      ...args.maxTokens !== void 0 ? { maxTokens: args.maxTokens } : {},
+      ...args.reasoning !== void 0 ? { reasoning: args.reasoning } : {},
+      ...existing?.lmstudio ? { lmstudio: existing.lmstudio } : {},
+      ...existing?.litellm ? { litellm: existing.litellm } : {}
+    })
+  };
+  descriptor.capabilities = { ...existing?.capabilities, ...descriptor.capabilities };
+  if (descriptor.auth) descriptor.auth = { ...existing?.auth, ...descriptor.auth };
   const setOrchestrator = args.setOrchestrator || args.orchestratorModel !== void 0;
   const setBackground = args.setBackground || args.backgroundModel !== void 0;
   if ((setOrchestrator || setBackground) && !isOrchestratorEligibleRuntime(runtime)) {
@@ -2378,8 +2907,8 @@ async function runNonInteractive(runtime, args) {
     printError(error instanceof Error ? error.message : String(error));
     return 1;
   }
-  if (args.apiKey) {
-    auth.setApiKey(runtime.id, args.apiKey);
+  if (args.apiKey && apiKeyRef) {
+    auth.setApiKey(apiKeyRef, args.apiKey);
     if (credentialWriteFailed(auth, `credential for ${runtime.id} was not stored; target '${descriptor.id}' not saved`))
       return 1;
     printPlaintextCredentialWarning();
@@ -2404,12 +2933,14 @@ async function runNonInteractive(runtime, args) {
   };
   applyConfiguration(settings);
   updateSettings(applyConfiguration);
-  const probe = await runtimeProbe(runtime, descriptor);
+  const probe = await runtimeProbe(runtime, descriptor, args.apiKey);
   if (probe?.ok && probe.models) {
     recordTargetModelSnapshot(descriptor, probe.models, probe.modelLabels ? { modelLabels: probe.modelLabels } : {});
   }
   printSummary(settings, descriptor, probe);
-  if (runtime.auth === "oauth" && !auth.statusForTarget(resolveRuntimeAuthTarget(runtime), { includeFallback: false }).available) {
+  if (runtime.auth === "oauth" && !auth.statusForTarget(existing ? resolveAuthTarget(existing, runtime) : resolveRuntimeAuthTarget(runtime), {
+    includeFallback: false
+  }).available) {
     process.stdout.write(
       `note: authenticate ${runtime.id} with \`clio-coder auth login ${runtime.id}\` before using this target
 `
@@ -2541,7 +3072,7 @@ async function runTargetSetupInteractive(rl, runtime, defaults) {
   let support = buildProviderSupportEntry(runtime);
   const initialRuntimeId = runtime.id;
   const existingForRuntime = configuredTargetsForRuntime(settings, initialRuntimeId);
-  const existing = (defaults.id ? settings.targets.find((entry) => entry.id === defaults.id && entry.runtime === initialRuntimeId) : null) ?? existingForRuntime[0] ?? null;
+  const existing = defaults.id ? settings.targets.find((entry) => entry.id === defaults.id && entry.runtime === initialRuntimeId) ?? null : null;
   if (existingForRuntime.length > 0) {
     process.stdout.write(`
 Existing targets for ${runtime.id}:
@@ -2554,7 +3085,7 @@ Existing targets for ${runtime.id}:
   process.stdout.write(`
 Selected runtime: ${runtime.id} (${support.summary})
 `);
-  process.stdout.write(`Credentials: ${describeAuthStatus(runtime)}
+  process.stdout.write(`Credentials: ${describeAuthStatus(runtime, existing ?? void 0)}
 `);
   if (support.modelHints.length > 0) {
     process.stdout.write(`Known models: ${describeRuntimeModels(support, 4)}
@@ -2601,10 +3132,13 @@ Selected runtime: ${runtime.id} (${support.summary})
   let apiKeyLiteral;
   let apiKeyRef = existing?.auth?.apiKeyRef;
   let oauthProfile = runtime.auth === "oauth" ? existing?.auth?.oauthProfile ?? runtime.oauthProviderId ?? runtime.id : void 0;
-  const authStatus = auth.statusForTarget(resolveRuntimeAuthTarget(runtime), { includeFallback: false });
+  const authStatus = auth.statusForTarget(
+    existing ? resolveAuthTarget(existing, runtime) : resolveRuntimeAuthTarget(runtime),
+    { includeFallback: false }
+  );
   if (runtime.auth === "api-key") {
     const needsCredential = targetRequiresAuth({ id: targetId, runtime: runtime.id }, runtime);
-    const defaultSource = authStatus.source === "stored-api-key" ? "keep" : authStatus.source === "environment" || existing?.auth?.apiKeyEnvVar || needsCredential ? "env" : "skip";
+    const defaultSource = existing?.auth?.apiKeyRef || authStatus.source === "stored-api-key" ? "keep" : authStatus.source === "environment" || existing?.auth?.apiKeyEnvVar || needsCredential ? "env" : "skip";
     process.stdout.write(
       "\nCredential source: env reads a key from an environment variable, stored writes one to\ncredentials.yaml, keep leaves the current one alone, skip uses no key at all.\n"
     );
@@ -2612,10 +3146,10 @@ Selected runtime: ${runtime.id} (${support.summary})
     if (choice === null) return 0;
     const normalized = choice.trim().toLowerCase();
     if (normalized === "stored") {
-      const literal = await ask(rl, "API key literal (stored in credentials.yaml, mode 0600)");
+      const literal = await rl.text("API key literal (stored in credentials.yaml, mode 0600)", "", true);
       if (literal !== null && literal.length > 0) {
         apiKeyLiteral = literal;
-        apiKeyRef = runtime.id;
+        apiKeyRef = targetApiKeyRef(targetId, settings.targets);
       }
     } else if (normalized === "env") {
       const envDefault = defaults.apiKeyEnv ?? existing?.auth?.apiKeyEnvVar ?? runtime.credentialsEnvVar ?? "";
@@ -2637,7 +3171,7 @@ Selected runtime: ${runtime.id} (${support.summary})
       const connected = await loginOAuthRuntime(rl, runtime);
       if (!connected) return 1;
     }
-    oauthProfile = runtime.oauthProviderId ?? runtime.id;
+    oauthProfile = existing?.auth?.oauthProfile ?? runtime.oauthProviderId ?? runtime.id;
   }
   let model = defaults.model;
   let inventory = { models: [], source: "none" };
@@ -2654,8 +3188,9 @@ Selected runtime: ${runtime.id} (${support.summary})
     ...existing?.lmstudio ? { lmstudio: existing.lmstudio } : {},
     ...existing?.litellm ? { litellm: existing.litellm } : {}
   });
+  if (existing?.auth?.headers) tentative.auth = { ...tentative.auth, headers: existing.auth.headers };
   if (runtime.kind === "http" || runtime.externalAgentLoop?.modelCatalog === "live-authoritative") {
-    inventory = await resolveSupportedWireModels(runtime, tentative, existing ?? void 0);
+    inventory = await resolveSupportedWireModels(runtime, tentative, existing ?? void 0, apiKeyLiteral);
   }
   const wireModels = inventory.models;
   const catalogOrdered = support.modelSource === "catalog";
@@ -2721,7 +3256,7 @@ Selected runtime: ${runtime.id} (${support.summary})
   if (!validateContextWindowOverride(runtime, model, contextWindowChoice, defaults.force)) return 2;
   const gatewayDefault = defaults.gateway || existing?.gateway === true;
   const gatewayAnswer = gatewayDefault ? true : await askYesNo(rl, "Mark as gateway?", false);
-  const descriptor = buildDescriptor(runtime, targetId, {
+  const configured = buildDescriptor(runtime, targetId, {
     ...url !== void 0 ? { url } : {},
     ...model !== void 0 ? { model } : {},
     ...apiKeyEnv !== void 0 ? { apiKeyEnv } : {},
@@ -2735,19 +3270,20 @@ Selected runtime: ${runtime.id} (${support.summary})
     ...existing?.lmstudio ? { lmstudio: existing.lmstudio } : {},
     ...existing?.litellm ? { litellm: existing.litellm } : {}
   });
+  const descriptor = {
+    ...existing,
+    ...configured,
+    capabilities: { ...existing?.capabilities, ...configured.capabilities }
+  };
+  if (existing?.auth?.headers) descriptor.auth = { ...configured.auth, headers: existing.auth.headers };
+  else if (!configured.auth) delete descriptor.auth;
   try {
     assertOrchestratorReplacementEligible(settings, descriptor);
   } catch (error) {
     printError(error instanceof Error ? error.message : String(error));
     return 1;
   }
-  if (apiKeyLiteral) {
-    auth.setApiKey(runtime.id, apiKeyLiteral);
-    if (credentialWriteFailed(auth, `credential for ${runtime.id} was not stored; target '${descriptor.id}' not saved`))
-      return 1;
-    printPlaintextCredentialWarning();
-  }
-  const probe = await runtimeProbe(runtime, descriptor);
+  const probe = await runtimeProbe(runtime, descriptor, apiKeyLiteral);
   if (probe?.ok && probe.models) recordTargetModelSnapshot(descriptor, probe.models);
   if (probe) {
     process.stdout.write("\n");
@@ -2785,6 +3321,12 @@ Selected runtime: ${runtime.id} (${support.summary})
     settings.context.memory.target === targetId ? settings.context.memory.model ?? model : model
   ) : void 0;
   if (backgroundModel === null) return 0;
+  if (apiKeyLiteral && apiKeyRef) {
+    auth.setApiKey(apiKeyRef, apiKeyLiteral);
+    if (credentialWriteFailed(auth, `credential for ${runtime.id} was not stored; target '${descriptor.id}' not saved`))
+      return 1;
+    printPlaintextCredentialWarning();
+  }
   const applyWizardChoice = (target) => {
     applyTarget(target, descriptor);
     if (setOrchestrator) setOrchestratorPointer(target, descriptor, orchestratorModel);
@@ -2833,11 +3375,16 @@ function runTargetRename(oldId, newId) {
     for (const profile of Object.values(settings.fleet.profiles)) {
       if (profile.target === oldId) profile.target = newId;
     }
-    settings.chat.modelPicker.cycleSet = settings.chat.modelPicker.cycleSet.map((entry) => {
+    for (const roster of Object.values(settings.fleet.rosters)) {
+      for (const member of roster.members) if (member.target === oldId) member.target = newId;
+    }
+    const renameRef = (entry) => {
       const [head, ...rest] = entry.split("/");
       if (head !== oldId) return entry;
       return rest.length === 0 ? newId : `${newId}/${rest.join("/")}`;
-    });
+    };
+    settings.chat.modelPicker.cycleSet = settings.chat.modelPicker.cycleSet.map(renameRef);
+    settings.chat.modelPicker.favorites = settings.chat.modelPicker.favorites.map(renameRef);
   });
   printOk(`renamed ${oldId} to ${newId}`);
   return 0;
@@ -2849,27 +3396,42 @@ async function askInteger(io, label, current, apply, min = 0) {
   const answer = await ask(io.rl, label, String(current));
   if (answer === null) return;
   const parsed = Number(answer);
-  if (!Number.isFinite(parsed) || parsed < min) {
-    io.out.write(`  ${label} must be a number of at least ${min}; left at ${current}
+  if (!Number.isSafeInteger(parsed) || parsed < min) {
+    io.warn(`${label} must be a whole number of at least ${min}; left at ${current}
 `);
     return;
   }
-  const value = Math.floor(parsed);
+  const value = parsed;
   apply(value);
   io.ok(`${label} set to ${value}`);
 }
 async function askChoice(io, label, allowed, current, apply) {
-  const answer = await ask(io.rl, `${label} [${allowed.join("|")}]`, current);
+  const answer = await io.rl.choose(label, allowed, current);
   if (answer === null) return;
   const value = answer.trim().toLowerCase();
   if (!allowed.includes(value)) {
-    io.out.write(`  ${label} must be one of ${allowed.join(", ")}; left at ${current}
+    io.warn(`${label} must be one of ${allowed.join(", ")}; left at ${current}
 `);
     return;
   }
   apply(value);
   io.ok(`${label} set to ${value}`);
 }
+async function runTargetWizard(io, options) {
+  const before = readSettings().targets;
+  io.rl.clearScreen();
+  const code = await runOnboardingWizard(io.streams, options);
+  if (code === 130) throw new ConfigureNavigation("quit");
+  if (code !== 0) {
+    await io.rl.text("Press Enter to return");
+    io.warn("Target settings were not saved.");
+    return;
+  }
+  const changed = readSettings().targets.find(
+    (target) => JSON.stringify(target) !== JSON.stringify(before.find((entry) => entry.id === target.id))
+  );
+  if (changed) io.ok(`Target ${changed.id} saved`);
+}
 var SECTIONS = [
   {
     id: "targets",
@@ -2900,6 +3462,10 @@ var SECTIONS = [
         label: "Add a target",
         hint: "register a provider endpoint",
         run: async (io) => {
+          if (canRunOnboarding(io.streams)) {
+            await runTargetWizard(io, { mode: readSettings().targets.length === 0 ? "first" : "add" });
+            return;
+          }
           const runtime = await pickRuntimeViaCategory(io.rl);
           if (runtime) await runTargetSetupInteractive(io.rl, runtime, emptyArgs());
         }
@@ -2924,17 +3490,59 @@ var SECTIONS = [
           const settings = readSettings();
           const ids = settings.targets.map((target) => target.id);
           if (ids.length === 0) {
-            io.out.write("  No targets to remove.\n");
+            io.warn("No targets to remove.");
             return;
           }
           io.out.write(`  Registered: ${ids.join(", ")}
 `);
-          const chosen = await ask(io.rl, "Target id to remove");
+          const chosen = await io.rl.choose("Target to remove", ids, ids[0] ?? "");
           if (chosen === null || !ids.includes(chosen)) return;
           if (await askYesNo(io.rl, `Remove target '${chosen}'?`, false)) {
-            runTargetRemove(chosen);
+            if (runTargetRemove(chosen) === 0) io.ok(`Removed target ${chosen}`);
+            else io.warn(`Could not remove target ${chosen}`);
+          }
+        }
+      },
+      {
+        label: "Edit a target",
+        hint: "endpoint, credentials, model, capabilities",
+        run: async (io) => {
+          const targets = readSettings().targets;
+          if (targets.length === 0) return;
+          const id = await io.rl.choose(
+            "Target to edit",
+            targets.map((target2) => target2.id),
+            targets[0]?.id ?? ""
+          );
+          const target = targets.find((entry) => entry.id === id);
+          if (!target) return;
+          if (canRunOnboarding(io.streams)) {
+            await runTargetWizard(io, { mode: "edit", target });
+          } else {
+            const runtime = getRuntimeRegistry().get(target.runtime);
+            if (runtime) await runTargetSetupInteractive(io.rl, runtime, { ...emptyArgs(), id });
+          }
+        }
+      },
+      {
+        label: "Rename a target",
+        run: async (io) => {
+          const ids = readSettings().targets.map((target) => target.id);
+          if (ids.length === 0) return;
+          const id = await io.rl.choose("Target to rename", ids, ids[0] ?? "");
+          const name = await ask(io.rl, "New target id", id);
+          if (!name || name === id) return;
+          if (ids.includes(name)) {
+            io.warn(`Target id already exists: ${name}`);
+            return;
           }
+          if (runTargetRename(id, name) === 0) io.ok(`Renamed ${id} to ${name}`);
+          else io.warn(`Could not rename target ${id}`);
         }
+      },
+      {
+        label: "Set the background memory target",
+        run: async (io) => assignTarget(io, "memory")
       }
     ]
   },
@@ -2992,8 +3600,10 @@ var SECTIONS = [
             readSettings().chat.model ?? ""
           );
           if (model === null) return;
-          updateSettings((draft) => {
-            draft.chat.model = model.length > 0 ? model : null;
+          updateSavedSettingsDocument((saved) => {
+            const document = saved;
+            document.chat = { ...document.chat, model: model.length > 0 ? model : null };
+            return document;
           });
           io.ok(model.length > 0 ? `Chat default model set to ${model}` : "Chat default model cleared");
         }
@@ -3149,7 +3759,7 @@ var SECTIONS = [
           }
           const parsed = Number(answer);
           if (!Number.isFinite(parsed) || parsed < 1) {
-            io.out.write(`  Concurrency limit must be auto or at least 1; left at ${current}
+            io.warn(`Concurrency limit must be auto or at least 1; left at ${current}
 `);
             return;
           }
@@ -3194,7 +3804,7 @@ var SECTIONS = [
           if (answer === null) return;
           const parsed = Number(answer);
           if (!Number.isFinite(parsed) || parsed < 1) {
-            io.out.write(`  Run timeout must be at least 1 second; left at ${current}s
+            io.warn(`Run timeout must be at least 1 second; left at ${current}s
 `);
             return;
           }
@@ -3224,22 +3834,16 @@ var SECTIONS = [
     actions: [
       {
         label: "Autonomy level",
-        hint: "interactive | assisted | auto-edit | full",
+        hint: AUTONOMY_LEVELS.join(" | "),
         run: async (io) => {
           io.out.write(
-            "  interactive prompts for everything, assisted auto-reads and confirms writes,\n  auto-edit confirms only bash, full runs unattended.\n"
-          );
-          await askChoice(
-            io,
-            "Autonomy level",
-            ["interactive", "assisted", "auto-edit", "full"],
-            readSettings().safety.autonomy,
-            (value) => {
-              updateSettings((draft) => {
-                draft.safety.autonomy = value;
-              });
-            }
+            "  read-only inspects; suggest asks before changes; auto-edit permits workspace\n  edits; full-auto skips autonomy prompts. Safety rules still apply at every level.\n"
           );
+          await askChoice(io, "Autonomy level", AUTONOMY_LEVELS, readSettings().safety.autonomy, (value) => {
+            updateSettings((draft) => {
+              draft.safety.autonomy = value;
+            });
+          });
         }
       },
       {
@@ -3268,7 +3872,7 @@ var SECTIONS = [
           if (answer === null) return;
           const parsed = Number(answer);
           if (!Number.isFinite(parsed) || parsed <= 0) {
-            io.out.write(`  Session cost limit must be greater than 0; left at $${current}
+            io.warn(`Session cost limit must be greater than 0; left at $${current}
 `);
             return;
           }
@@ -3319,7 +3923,7 @@ var SECTIONS = [
         ["Panes capability", settings.interface.panes.enabled],
         ["Startup layout", settings.interface.panes.layout],
         ["TUI mode", settings.interface.mode],
-        ["Output detail", settings.interface.outputDetail],
+        ["Output style", settings.interface.outputDetail],
         ["Desktop notifications", onOff(settings.interface.desktopNotifications)],
         ["Git commit attribution", onOff(settings.integrations.git.commitAttribution)]
       ];
@@ -3371,13 +3975,13 @@ var SECTIONS = [
         }
       },
       {
-        label: "Output detail",
-        hint: "minimal | default | verbose",
+        label: "Output style",
+        hint: "compact | standard | detailed",
         run: async (io) => {
           await askChoice(
             io,
-            "Output detail",
-            ["minimal", "default", "verbose"],
+            "Output style",
+            ["compact", "standard", "detailed"],
             readSettings().interface.outputDetail,
             (value) => {
               updateSettings((draft) => {
@@ -3489,23 +4093,44 @@ var SECTIONS = [
       {
         label: "Run doctor",
         hint: "read-only health check",
-        run: async () => {
-          const { runDoctorCommand } = await import("./doctor-N3LCM2LG.js");
+        run: async (io) => {
+          const { runDoctorCommand } = await import("./doctor-JJVGPZWT.js");
           await runDoctorCommand([]);
+          await io.rl.text("Press Enter to return");
         }
       },
       {
         label: "Show raw settings.yaml",
         run: async (io) => {
           const file = settingsPath();
-          if (!existsSync(file)) {
+          if (!existsSync2(file)) {
             io.out.write("  settings.yaml does not exist yet.\n");
             return;
           }
           io.out.write(`
 --- ${shortenPath(file)} ---
-${readFileSync(file, "utf8")}--- end ---
+${readFileSync2(file, "utf8")}--- end ---
 `);
+          await io.rl.text("Press Enter to return");
+        }
+      }
+    ]
+  },
+  {
+    id: "advanced",
+    title: "All Settings",
+    summary: "validated editor for every setting",
+    aliases: ["all", "settings"],
+    fields: () => [
+      ["Settings file", shortenPath(settingsPath())],
+      ["Reference", "clio-coder docs configuration-reference"]
+    ],
+    actions: [
+      {
+        label: "Edit all settings",
+        hint: "VISUAL / EDITOR; validate before saving",
+        run: async (io) => {
+          if (await editSettings(io.rl)) io.ok("Settings saved; previous file kept at settings.yaml.bak");
         }
       }
     ]
@@ -3519,6 +4144,9 @@ function emptyArgs() {
     all: false,
     interop: false,
     json: false,
+    edit: false,
+    quick: false,
+    settings: false,
     force: false,
     gateway: false,
     setOrchestrator: false,
@@ -3535,39 +4163,47 @@ async function askList(io, label, current, apply) {
 }
 async function assignTarget(io, role) {
   const settings = readSettings();
-  const ids = settings.targets.map((target2) => target2.id);
+  const ids = settings.targets.filter((target2) => {
+    const runtime = getRuntimeRegistry().get(target2.runtime);
+    return role === "fleet" || runtime !== null && isOrchestratorEligibleRuntime(runtime);
+  }).map((target2) => target2.id);
   if (ids.length === 0) {
-    io.out.write("  No targets registered yet. Add one first.\n");
+    io.warn("No eligible targets registered yet. Add one first.");
     return;
   }
   io.out.write(`  Registered: ${ids.join(", ")}
 `);
-  const currentTarget = role === "chat" ? settings.chat.target : settings.fleet.default.target;
-  const chosen = await ask(io.rl, `${role === "chat" ? "Chat" : "Fleet"} target id`, currentTarget ?? ids[0] ?? "");
+  const currentTarget = role === "chat" ? settings.chat.target : role === "fleet" ? settings.fleet.default.target : settings.context.memory.target;
+  const label = role === "chat" ? "Chat" : role === "fleet" ? "Fleet" : "Background memory";
+  const chosen = await io.rl.choose(`${label} target`, ids, currentTarget ?? ids[0] ?? "");
   if (chosen === null) return;
   if (!ids.includes(chosen)) {
-    io.out.write(`  ${chosen} is not a registered target; nothing changed.
-`);
+    io.warn(`${chosen} is not a registered target; nothing changed.`);
     return;
   }
   const target = settings.targets.find((entry) => entry.id === chosen);
-  const model = await ask(io.rl, "Model (blank for the target default)", target?.defaultModel ?? "");
+  const model = await ask(io.rl, `Model override (blank uses ${target?.defaultModel ?? "the target default"})`, "");
   if (model === null) return;
   updateSettings((draft) => {
     if (role === "chat") {
       draft.chat.target = chosen;
       draft.chat.model = model.length > 0 ? model : null;
-    } else {
+    } else if (role === "fleet") {
       draft.fleet.default.target = chosen;
       draft.fleet.default.model = model.length > 0 ? model : null;
+    } else {
+      draft.context.memory.target = chosen;
+      draft.context.memory.model = model.length > 0 ? model : null;
     }
   });
-  io.ok(`${role === "chat" ? "Chat" : "Fleet"} target set to ${chosen}`);
+  io.ok(`${label} target set to ${chosen}`);
 }
-async function pickEntry(rl, io, entries, backLabel, plain) {
+async function pickEntry(rl, io, entries, backLabel, plain, initialIndex = 0) {
   const out = io.out;
   if (canSelect(io.in, out)) {
     const result = await promptSelect({
+      initialIndex,
+      clearOnExit: true,
       choices: entries.map((entry, index2) => ({
         value: index2,
         label: entry.label,
@@ -3608,40 +4244,98 @@ function renderSection(spec, out) {
   return presenter;
 }
 async function runSection(rl, streams, spec, backLabel) {
+  let selected = 0;
+  let notice;
   for (; ; ) {
+    rl.clearScreen();
     const presenter = renderSection(spec, streams.out);
+    if (notice) {
+      if (notice.warning) presenter.warn(notice.text);
+      else presenter.completedStep(notice.text);
+      notice = void 0;
+    }
     const io = {
       rl,
       out: streams.out,
       streams,
       ok: (text) => {
-        presenter.completedStep(text);
+        notice = { text, warning: false };
+      },
+      warn: (text) => {
+        notice = { text: text.trim(), warning: true };
       }
     };
     presenter.blank();
-    const choice = await pickEntry(rl, streams, spec.actions, backLabel, presenter.isPlain());
+    const choice = await pickEntry(rl, streams, spec.actions, backLabel, presenter.isPlain(), selected);
     if (choice.kind !== "index") return choice.kind;
-    const action = spec.actions[choice.index];
-    if (action !== void 0) await action.run(io);
+    selected = choice.index;
+    const action = spec.actions[selected];
+    try {
+      if (action !== void 0) await action.run(io);
+    } catch (error) {
+      if (error instanceof ConfigureNavigation) {
+        if (error.kind === "quit") return "quit";
+      } else
+        notice = { text: `Change not saved: ${error instanceof Error ? error.message : String(error)}`, warning: true };
+    }
   }
 }
-async function runConfigSectionsMenu(rl, streams) {
+async function runConfigSectionsMenu(rl, streams, backLabel = "quit") {
+  let selected = 0;
   for (; ; ) {
+    rl.clearScreen();
     const presenter = createLifecyclePresenter({ stream: streams.out });
-    presenter.header("Clio Coder Configuration", "configure");
+    presenter.header("Clio Coder Settings", "configure");
     presenter.note(`Source: ${shortenPath(settingsPath())}`);
     presenter.blank();
     const choice = await pickEntry(
       rl,
       streams,
       SECTIONS.map((section) => ({ label: section.title, hint: section.summary })),
-      "quit",
-      presenter.isPlain()
+      backLabel,
+      presenter.isPlain(),
+      selected
     );
-    if (choice.kind !== "index") return 0;
-    const spec = SECTIONS[choice.index];
+    if (choice.kind !== "index") return choice.kind;
+    selected = choice.index;
+    const spec = SECTIONS[selected];
     if (spec === void 0) continue;
-    if (await runSection(rl, streams, spec, "back") === "quit") return 0;
+    if (await runSection(rl, streams, spec, "back") === "quit") return "quit";
+  }
+}
+async function runConfigLauncher(rl, streams) {
+  let selected = 0;
+  const exitCode = () => readSettings().chat.target ? 0 : 130;
+  for (; ; ) {
+    rl.clearScreen();
+    const presenter = createLifecyclePresenter({ stream: streams.out });
+    presenter.header("Clio Coder", "configure");
+    presenter.note("Connect a model and start coding. Everything else is optional.");
+    presenter.blank();
+    const choice = await pickEntry(
+      rl,
+      streams,
+      [
+        { label: "Quick Connect", hint: "endpoint \u2192 model \u2192 ready" },
+        { label: "Settings", hint: "all configuration options" },
+        { label: "Diagnostics", hint: "check an existing installation" }
+      ],
+      "quit",
+      presenter.isPlain(),
+      selected
+    );
+    if (choice.kind !== "index") return exitCode();
+    selected = choice.index;
+    if (selected === 0) {
+      const result = await runQuickConnect(rl);
+      if (result === "connected") return 0;
+      if (result === "quit") return exitCode();
+    } else if (selected === 1) {
+      if (await runConfigSectionsMenu(rl, streams, "back") === "quit") return exitCode();
+    } else {
+      const section = findSection("diagnostics");
+      if (section && await runSection(rl, streams, section, "back") === "quit") return exitCode();
+    }
   }
 }
 function findSection(name) {
@@ -3650,7 +4344,23 @@ function findSection(name) {
 }
 var SECTION_IDS = SECTIONS.map((section) => section.id);
 async function runInteractive(rl, preselectedRuntime, defaults, streams) {
+  if (defaults.quick) {
+    if (!canRunOnboarding(streams)) {
+      printError("--quick needs a terminal; use --id and --runtime for unattended setup");
+      return 2;
+    }
+    return await runQuickConnect(rl) === "connected" ? 0 : 130;
+  }
+  if (defaults.settings) {
+    await runConfigSectionsMenu(rl, streams);
+    return 0;
+  }
   if (preselectedRuntime) {
+    if (canRunOnboarding(streams))
+      return runOnboardingWizard(streams, {
+        mode: readSettings().targets.length === 0 ? "first" : "add",
+        runtime: preselectedRuntime
+      });
     return await runTargetSetupInteractive(rl, preselectedRuntime, defaults);
   }
   if (defaults.section !== void 0) {
@@ -3666,11 +4376,8 @@ async function runInteractive(rl, preselectedRuntime, defaults, streams) {
     await runSection(rl, streams, spec, "quit");
     return 0;
   }
+  if (canRunOnboarding(streams)) return runConfigLauncher(rl, streams);
   if (readSettings().targets.length === 0) {
-    if (canRunOnboarding(streams)) {
-      rl.close();
-      return await runOnboardingWizard(streams);
-    }
     const runtime = await pickRuntimeViaCategory(rl);
     if (!runtime) {
       printError("configuration cancelled");
@@ -3678,7 +4385,8 @@ async function runInteractive(rl, preselectedRuntime, defaults, streams) {
     }
     return await runTargetSetupInteractive(rl, runtime, defaults);
   }
-  return await runConfigSectionsMenu(rl, streams);
+  await runConfigSectionsMenu(rl, streams);
+  return 0;
 }
 async function runConfigureCommand(argv, inStream = input, outStream = output2) {
   let args;
@@ -3693,8 +4401,21 @@ async function runConfigureCommand(argv, inStream = input, outStream = output2)
     process.stdout.write(HELP);
     return 0;
   }
-  initializeClioHome();
   ensureRegistryPopulated();
+  if (args.edit) {
+    if (!inStream.isTTY || !outStream.isTTY) {
+      printError("--edit needs a terminal; use configure --json to inspect settings without one");
+      return 2;
+    }
+    try {
+      await editSettings(new ConfigurePrompts(inStream, outStream));
+      return 0;
+    } catch (error) {
+      if (error instanceof ConfigureNavigation) return 0;
+      printError(error instanceof Error ? error.message : String(error));
+      return 1;
+    }
+  }
   if (args.json) {
     const settings = readSettings();
     outStream.write(`${JSON.stringify(settings, null, 2)}
@@ -3706,13 +4427,9 @@ async function runConfigureCommand(argv, inStream = input, outStream = output2)
     return 0;
   }
   if (args.interop) {
-    if (!input.isTTY) return runInteropReview({ rl: null });
-    const rl2 = createInterface2({ input, output: output2 });
-    try {
-      return await runInteropReview({ rl: rl2, streams: { in: input, out: output2 } });
-    } finally {
-      rl2.close();
-    }
+    if (!inStream.isTTY) return runInteropReview({ rl: null });
+    const rl2 = new ConfigurePrompts(inStream, outStream);
+    return runInteropReview({ rl: rl2, streams: { in: inStream, out: outStream } });
   }
   if (args.remove) return runTargetRemove(args.remove);
   if (args.renameOld && args.renameNew) return runTargetRename(args.renameOld, args.renameNew);
@@ -3735,23 +4452,26 @@ async function runConfigureCommand(argv, inStream = input, outStream = output2)
       warnLegacyNaming(runtimeId, runtime.id);
     }
   }
-  const hasTargetSetupFlag = args.id !== void 0 || args.url !== void 0 || args.model !== void 0 || args.workerProfile !== void 0 || args.workerProfileModel !== void 0 || args.apiKey !== void 0 || args.apiKeyEnv !== void 0 || args.gateway || args.lifecycle !== void 0 || args.setOrchestrator || args.setWorkerDefault || args.contextWindow !== void 0 || args.maxTokens !== void 0 || args.reasoning !== void 0;
+  const hasTargetSetupFlag = args.id !== void 0 || args.url !== void 0 || args.model !== void 0 || args.workerProfile !== void 0 || args.workerProfileModel !== void 0 || args.apiKey !== void 0 || args.apiKeyEnv !== void 0 || args.gateway || args.lifecycle !== void 0 || args.setOrchestrator || args.setBackground || args.backgroundModel !== void 0 || args.orchestratorModel !== void 0 || args.workerModel !== void 0 || args.bindAgent !== void 0 || args.setWorkerDefault || args.contextWindow !== void 0 || args.maxTokens !== void 0 || args.reasoning !== void 0;
   const nonInteractive = runtime !== null && hasTargetSetupFlag;
   if (nonInteractive && runtime) return runNonInteractive(runtime, args);
-  if ((runtimeId !== void 0 || hasTargetSetupFlag) && !input.isTTY) {
+  if ((runtimeId !== void 0 || hasTargetSetupFlag) && !inStream.isTTY) {
     printError(
       runtime === null ? "--runtime is required when configuring a target non-interactively" : "--id is required when passing flags non-interactively"
     );
     return 2;
   }
-  const rl = createInterface2({ input: inStream, output: outStream });
+  const rl = new ConfigurePrompts(inStream, outStream);
   try {
     return await runInteractive(rl, runtime, args, { in: inStream, out: outStream });
   } catch (err) {
+    if (err instanceof ConfigureNavigation) {
+      if (readSettings().targets.length > 0) return 0;
+      printError("configuration cancelled");
+      return 130;
+    }
     printError(err instanceof Error ? err.message : String(err));
     return 1;
-  } finally {
-    rl.close();
   }
 }
 
@@ -3761,4 +4481,4 @@ export {
   runTargetRename,
   runConfigureCommand
 };
-//# sourceMappingURL=chunk-KYKNBD4Y.js.map
+//# sourceMappingURL=chunk-F5Z7EWMN.js.map