@amdahl/cli 0.3.4 → 0.3.6

package/dist/amdahl.js

@@ -7367,10 +7367,10 @@ var require_dist = __commonJS({
 import { spawn } from "child_process";
 import { accessSync, constants, statSync } from "fs";
 import { homedir, hostname } from "os";
-import { createInterface } from "readline";
+import { createInterface as createInterface2 } from "readline";
 
 // src/select.ts
-import { emitKeypressEvents } from "readline";
+import { createInterface, emitKeypressEvents } from "readline";
 var HINT = "(Use the arrow keys, then Enter)";
 var MULTI_HINT = "\u2191\u2193 move \xB7 Space tick/untick \xB7 Enter to accept";
 var OFF = "\x1B[0m";
@@ -7441,7 +7441,7 @@ ${SHOW_CURSOR}`);
       emitKeypressEvents(input);
       input.setRawMode?.(true);
       const cols = width();
-      const top = [question, ...note ? wrapWords(note, cols) : []];
+      const top = [question, ...note ? note.split("\n").flatMap((line) => wrapWords(line, cols)) : []];
       headLines = top.reduce((n, line) => n + screenLines(line, cols), 0);
       output.write(`${HIDE_CURSOR}${top.map((line) => `${line}
 `).join("")}${frame()}`);
@@ -7497,7 +7497,8 @@ function selectMenu(input, output, question, choices, options = {}) {
 }
 function multiSelectMenu(input, output, question, choices, options = {}) {
   const ticked = choices.map((_, i) => options.ticked?.[i] === true);
-  let current = Math.max(ticked.indexOf(true), 0);
+  const start = Math.min(Math.max(options.initial ?? 0, 0), choices.length - 1);
+  let current = ticked.includes(true) ? ticked.indexOf(true) : start;
   const pointer = `${marker(options)}>${OFF}`;
   const pad = Math.max(...choices.map((c) => c.length));
   const label = (i) => {
@@ -7568,6 +7569,56 @@ function listenForEnter(input, onEnter, onCancel) {
   }
   return stop;
 }
+var PASTE_ON = "\x1B[?2004h";
+var PASTE_OFF = "\x1B[?2004l";
+var PASTE_SETTLE_MS = 150;
+function readPaste(input, output, question) {
+  output.write(`${question}
+`);
+  const rl = createInterface({ input, output, terminal: true, prompt: "" });
+  output.write(PASTE_ON);
+  return new Promise((resolve2, reject) => {
+    const lines = [];
+    let pasting = false;
+    let settle;
+    let settled = false;
+    const finish = (outcome) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(settle);
+      input.removeListener("keypress", onKeypress);
+      output.write(PASTE_OFF);
+      rl.close();
+      if ("text" in outcome) resolve2(outcome.text);
+      else reject(outcome.error);
+    };
+    const done = () => finish({ text: lines.join("\n").trim() });
+    const onKeypress = (_text, key) => {
+      if (key?.name === "paste-start") pasting = true;
+      else if (key?.name === "paste-end") pasting = false;
+      else if (settle && key?.name !== "return" && key?.name !== "enter") {
+        clearTimeout(settle);
+        settle = void 0;
+      }
+    };
+    input.on("keypress", onKeypress);
+    rl.on("line", (line) => {
+      if (line.trim() || pasting) {
+        lines.push(line);
+        return;
+      }
+      if (lines.length === 0) return;
+      lines.push(line);
+      clearTimeout(settle);
+      settle = setTimeout(done, PASTE_SETTLE_MS);
+    });
+    rl.on("SIGINT", () => {
+      output.write("\n");
+      finish({ error: new PromptCancelled() });
+    });
+    rl.on("close", done);
+  });
+}
 
 // src/io.ts
 var PromptCancelled = class extends Error {
@@ -7601,7 +7652,7 @@ async function readAllStdin() {
   return Buffer.concat(chunks).toString("utf8");
 }
 function promptLine(question) {
-  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  const rl = createInterface2({ input: process.stdin, output: process.stderr });
   return new Promise((resolve2, reject) => {
     let settled = false;
     const cancel = () => {
@@ -7620,6 +7671,22 @@ function promptLine(question) {
     });
   });
 }
+function runOnTerminal(command, args) {
+  const hold = () => {
+  };
+  process.on("SIGINT", hold);
+  return new Promise((resolve2) => {
+    let child;
+    try {
+      child = spawn(command, args, { stdio: "inherit" });
+    } catch {
+      resolve2(-1);
+      return;
+    }
+    child.on("error", () => resolve2(-1));
+    child.on("close", (code) => resolve2(code ?? -1));
+  }).finally(() => process.off("SIGINT", hold));
+}
 function uninterruptible(fn) {
   const hold = () => {
   };
@@ -7653,6 +7720,7 @@ function realIo() {
     stdoutIsTTY: Boolean(process.stdout.isTTY),
     stderrIsTTY: Boolean(process.stderr.isTTY),
     readStdin: readAllStdin,
+    readPaste: (question) => readPaste(process.stdin, process.stderr, question),
     prompt: promptLine,
     select: (question, choices, options) => selectMenu(process.stdin, process.stderr, question, choices, {
       ...options,
@@ -7667,6 +7735,7 @@ function realIo() {
     listenForEnter: (onEnter, onCancel) => listenForEnter(process.stdin, onEnter, onCancel),
     uninterruptible,
     run: runProcess,
+    runInteractive: runOnTerminal,
     openUrl: async (url) => {
       const [cmd, args] = openerFor(process.platform, url);
       return (await runProcess(cmd, args)).code === 0;
@@ -7694,7 +7763,7 @@ function startedByNpx(io) {
   return io.env.npm_command === "exec" || io.env.npm_lifecycle_event === "npx" || /[\\/]_npx[\\/]/.test(io.scriptPath ?? "");
 }
 function setCommandName(io) {
-  prefix = startedByNpx(io) ? "npx amdahl" : "amdahl";
+  prefix = startedByNpx(io) ? "npx -y amdahl" : "amdahl";
 }
 function amdahlCommand(rest = "") {
   return rest ? `${prefix} ${rest}` : prefix;
@@ -7848,7 +7917,7 @@ function parseCommandLine(argv) {
       const ref = second && second.includes("/") ? second : "<publisher>/<skill>";
       throw usageError(
         second === void 0 ? "`amdahl skills` needs a subcommand." : `Unknown command \`amdahl skills ${second}\`.`,
-        `To add a skill: npx amdahl skills add ${ref}`
+        `To add a skill: npx -y amdahl skills add ${ref}`
       );
     }
     if (second === void 0) throw usageError(`\`amdahl ${first}\` needs a subcommand.`);
@@ -7890,12 +7959,14 @@ function parseErrorMessage(err) {
 var USAGE = `Usage: amdahl <command> [options]
 
 What you can do:
-  amdahl                         Set up Claude Code, Cursor or Codex. In a
-                                 terminal it asks which and signs you in.
-                                 Run by an agent or with no terminal, it
-                                 sets up that agent, or every client it
-                                 finds, and asks nothing (also: amdahl setup)
+  amdahl                         Set up Claude Code, Cursor or Codex, or try
+                                 Amdahl in this terminal. In a terminal it
+                                 asks which. Run by an agent or with no
+                                 terminal, it sets up that agent, or every
+                                 client it finds, and asks nothing (also:
+                                 amdahl setup)
   amdahl optimize draft.md       Rewrite an outbound email or LinkedIn message
+                                 (with no file, at a terminal, paste it)
   amdahl status                  Check that this workspace can optimize
   amdahl keys create --name ci   Make an API key for a server or CI
   amdahl install claude-code     Connect one AI client (also codex, cursor)
@@ -8836,6 +8907,8 @@ async function browserSignIn(ctx) {
     };
     ctx.config.default_profile = name;
     ctx.saveConfig();
+    ctx.profileName = name;
+    ctx.profile = ctx.config.profiles[name] ?? null;
     return { profile: name, me, workspace: ws };
   } finally {
     stopKeys();
@@ -8845,6 +8918,10 @@ async function browserSignIn(ctx) {
 function signedInLine(ctx, { profile, me, workspace }) {
   return `Signed in as ${printable(me.email ?? me.user_id)} to ${ctx.out.bold(printable(workspace.name))} (${printable(workspace.slug)}). Profile: ${profile}.`;
 }
+function loginNextLine() {
+  return `Next: run \`${amdahlCommand("optimize")}\` and paste an email,
+or \`${amdahlCommand()}\` to add Amdahl to Claude Code, Cursor or Codex.`;
+}
 async function login(ctx) {
   const signedIn = await browserSignIn(ctx);
   const { profile, me, workspace } = signedIn;
@@ -8857,7 +8934,8 @@ async function login(ctx) {
       scopes: me.scopes,
       api_url: ctx.apiUrl
     },
-    signedInLine(ctx, signedIn)
+    `${signedInLine(ctx, signedIn)}
+${loginNextLine()}`
   );
   return EXIT.ok;
 }
@@ -9043,9 +9121,14 @@ async function npmGlobalPrefix(ctx) {
   return prefix2 || null;
 }
 async function claudeHasAmdahl(ctx, command, mcpUrl) {
-  const res = await ctx.io.run(command, ["mcp", "get", "amdahl"]);
-  return res.code === 0 && res.stdout.split("\n").some((line) => line.trim() === `URL: ${mcpUrl}`);
+  let answer = claudeAnswers.get(ctx);
+  if (!answer) {
+    answer = ctx.io.run(command, ["mcp", "get", "amdahl"]).then((res) => res.code === 0 && res.stdout.split("\n").some((line) => line.trim() === `URL: ${mcpUrl}`));
+    claudeAnswers.set(ctx, answer);
+  }
+  return answer;
 }
+var claudeAnswers = /* @__PURE__ */ new WeakMap();
 var CONFIG_HINT = "Fix the file, or move it away, then run the same command again.";
 function readJsonObject(path) {
   if (!existsSync3(path)) return { config: {}, existed: false };
@@ -9138,10 +9221,7 @@ function updateConfig(path, fn) {
     throw new CliError("write_failed", `Could not update ${path} (${reason}).`, EXIT.general);
   }
 }
-async function isInstalled(ctx, client) {
-  const skill = skillPath(client, ctx.io.homedir);
-  const current = existsSync3(skill) ? readFileSync3(skill, "utf8") : null;
-  if (current === null || current !== SKILL_TEXT && isShippedSkill(current)) return false;
+async function hasAmdahl(ctx, client) {
   const mcpUrl = `${ctx.apiUrl}/mcp`;
   if (client === "claude-code") {
     if (claudeFileHasAmdahl(claudeConfigPath(ctx), mcpUrl)) return true;
@@ -9159,6 +9239,12 @@ async function isInstalled(ctx, client) {
     return false;
   }
 }
+async function isInstalled(ctx, client) {
+  const skill = skillPath(client, ctx.io.homedir);
+  const current = existsSync3(skill) ? readFileSync3(skill, "utf8") : null;
+  if (current === null || current !== SKILL_TEXT && isShippedSkill(current)) return false;
+  return hasAmdahl(ctx, client);
+}
 async function installClient(ctx, client, print) {
   const mcp = await installMcp(ctx, client, print);
   return { mcp, skill: installSkill(ctx, client, print) };
@@ -9211,6 +9297,7 @@ async function installMcp(ctx, client, print) {
     if (claudeFileHasAmdahl(claudeConfigPath(ctx), mcpUrl) || await claudeHasAmdahl(ctx, route.command, mcpUrl)) {
       return { data: { ok: true, client, action: "unchanged", command }, human: `Claude Code already has Amdahl at ${mcpUrl}; nothing changed.`, notes: [] };
     }
+    claudeAnswers.delete(ctx);
     const res = await io.run(route.command, args);
     if (res.code !== 0) {
       throw new CliError("install_failed", `\`${command}\` failed: ${res.stderr.trim() || `exit ${res.code}`}`, EXIT.general);
@@ -9440,221 +9527,14 @@ async function keysRevoke(ctx, args) {
 }
 
 // src/commands/optimize.ts
-import { readFileSync as readFileSync4 } from "fs";
-var OPTIMIZE_TIMEOUT_MS = 18e4;
-var CHANNELS = ["email", "linkedin"];
-var EVIDENCE = ["off", "workspace"];
-var ON_UNSUPPORTED = ["flag", "remove"];
-function oneOf(flag, value, allowed) {
-  if (value === void 0) return void 0;
-  if (!allowed.includes(value)) throw usageError(`--${flag} must be one of: ${allowed.join(", ")}.`);
-  return value;
-}
-function readContext(path) {
-  let parsed;
-  try {
-    parsed = JSON.parse(readFileSync4(path, "utf8"));
-  } catch (err) {
-    throw usageError(`Could not read --context ${path}: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw usageError("--context must be a JSON object with rules, voice_examples and facts.");
-  }
-  return parsed;
-}
-function withTimeout(promise, ms, file) {
-  let timer;
-  const timeout = new Promise((_, reject) => {
-    timer = setTimeout(
-      () => reject(new CliError("timeout", `Optimizing ${file} timed out after ${ms / 1e3} s.`, EXIT.network)),
-      ms
-    );
-  });
-  return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
-}
-var WEAKEST = {
-  rules: "how it follows your rules",
-  ask: "the ask",
-  opener: "the opener",
-  fit: "how it fits the recipient",
-  proof: "its proof points",
-  length: "the length",
-  style: "the tone",
-  preference: "how it matches your preferences",
-  voice: "how much it sounds like you"
-};
-var CONCERNS = {
-  conflicts_with_callers_ask: "it asks for a different length or time than your ask",
-  drops_ask: "it leaves out your ask",
-  adds_claim: "it states something neither your draft nor your facts support",
-  drops_entity: "it drops a name, link or placeholder you had",
-  inflates: "it is longer than you asked for",
-  no_gain: "it changed little beyond the wording",
-  breaks_rules: "it breaks one of your rules"
-};
-var EVIDENCE_MISSED = {
-  corpus_empty: "the workspace has none yet",
-  evidence_unavailable: "this environment does not read them",
-  evidence_read_failed: "the read failed, so a retry may work"
-};
-var MAX_LINES = 3;
-function list(value) {
-  return Array.isArray(value) ? value.filter((v) => !!v && typeof v === "object") : null;
-}
-function record(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
-}
-function text(value) {
-  return typeof value === "string" ? printable(value).trim() : "";
-}
-function sentence(value) {
-  return /[.!?]$/.test(value) ? value : `${value}.`;
-}
-function plural(n, one, many = `${one}s`) {
-  return `${n} ${n === 1 ? one : many}`;
-}
-function readSteps(steps) {
-  const reasonOf = (node) => text(steps.find((s) => s.node === node)?.reason);
-  const changed = (node) => steps.some((s) => s.node === node && s.changed === true);
-  const counts = new Map(
-    reasonOf("w3").split(",").map((part) => part.split(":")).filter(([, n]) => /^\d+$/.test(n ?? "")).map(([code, n]) => [code, Number(n)])
-  );
-  const did = [];
-  const repaired = counts.get("repaired") ?? 0;
-  const deleted = counts.get("deleted") ?? 0;
-  if (repaired && deleted) did.push(`Rewrote ${plural(repaired, "sentence")} and cut ${deleted} that nothing backed.`);
-  else if (repaired) did.push(`Rewrote ${plural(repaired, "sentence")} that did not hold up.`);
-  else if (deleted) did.push(`Cut ${plural(deleted, "sentence")} that nothing backed.`);
-  const repair = reasonOf("w5");
-  if (changed("w5") && repair.startsWith("repaired:")) {
-    const weakest = WEAKEST[repair.slice("repaired:".length)];
-    did.push(weakest ? `Reworked ${weakest}.` : "Reworked its weakest part.");
-  }
-  const flagged = [];
-  const open = counts.get("open");
-  if (open) flagged.push(`${plural(open, "sentence problem")} it could not fix`);
-  const second = reasonOf("w6");
-  if (changed("w6") && !second.startsWith("kept_before_repair")) {
-    const concern = CONCERNS[second];
-    flagged.push(concern ? `a second-check concern (${concern})` : "a second-check concern");
-  }
-  return { did: did.join(" "), flagged };
-}
-function and(parts) {
-  return parts.length < 2 ? parts[0] ?? "" : `${parts.slice(0, -1).join(", ")} and ${parts[parts.length - 1]}`;
-}
-function whatAmdahlDid(result) {
-  const steps = result.unchanged === true ? { did: "", flagged: [] } : readSteps(list(result.steps) ?? []);
-  const flagged = [...steps.flagged];
-  let checked = "";
-  let removed = "";
-  const evidence = record(result.evidence);
-  const claims = list(result.unsupported_claims);
-  if (evidence?.used === true) {
-    const quotes = record(result.lift)?.quotes;
-    const read = typeof quotes === "number" && quotes > 0 ? ` (${plural(quotes, "quote")})` : "";
-    if (claims) {
-      const still = claims.filter((c) => c.status !== "removed").length;
-      const cut = claims.length - still;
-      if (cut) removed = `Removed ${plural(cut, "claim")} your calls don't back.`;
-      if (still) flagged.unshift(`${plural(still, "claim")} your calls don't back`);
-      checked = `Checked every claim against your calls${read}${claims.length ? "" : " and found none they don't back"}.`;
-    } else checked = `Checked the message against your calls${read}.`;
-  } else if (evidence?.requested === "workspace" && EVIDENCE_MISSED[text(evidence.reason)]) {
-    checked = `Skipped checking claims against your calls: ${EVIDENCE_MISSED[text(evidence.reason)]}.`;
-  }
-  const used = (list(record(result.context_use)?.rows) ?? []).filter((r) => r.verdict === "pass");
-  const sources = [
-    used.some((r) => r.bucket === "internal") ? "Amdahl's own records" : "",
-    used.some((r) => r.bucket === "external") ? "what their company or market published" : ""
-  ].filter(Boolean);
-  const usedLine = sources.length ? `Used ${plural(sources.length, "source")}: ${and(sources)}.` : "";
-  const omitted = list(result.omitted) ?? [];
-  const whys = [...new Set(omitted.map((o) => text(o.why)).filter(Boolean))];
-  const more = whys.length > 1 ? ` (${plural(whys.length - 1, "more reason")} in --json)` : "";
-  const leftOut = omitted.length ? `Left out ${plural(omitted.length, "thing")}${whys[0] ? `: ${sentence(whys[0])}` : "."}${more}` : "";
-  const lines = [
-    { rank: 2, line: sentence(text(result.what_changed)) },
-    { rank: 5, line: checked },
-    { rank: 3, line: removed },
-    { rank: 6, line: usedLine },
-    { rank: 7, line: steps.did },
-    { rank: 4, line: leftOut },
-    { rank: 1, line: flagged.length ? `Flagged ${and(flagged)}; check before sending.` : "" }
-  ].filter((l) => l.line && l.line !== ".");
-  const kept = new Set([...lines].sort((a, b) => a.rank - b.rank).slice(0, MAX_LINES));
-  return lines.filter((l) => kept.has(l)).map((l) => l.line);
-}
-async function optimize(ctx, args) {
-  const { io, out, flags } = ctx;
-  let files = args;
-  if (files.length === 0) {
-    if (io.stdinIsTTY) {
-      throw usageError(
-        "Give a file to optimize, or pipe the message on stdin.",
-        "Usage: amdahl optimize <file>... | - [--channel email|linkedin]"
-      );
-    }
-    files = ["-"];
-  }
-  if (files.filter((f) => f === "-").length > 1) throw usageError("Stdin (-) can be read only once.");
-  const base = {};
-  const channel = oneOf("channel", str(flags.channel), CHANNELS);
-  const evidence = oneOf("evidence", str(flags.evidence), EVIDENCE);
-  const onUnsupported = oneOf("on-unsupported", str(flags["on-unsupported"]), ON_UNSUPPORTED);
-  if (channel) base.channel = channel;
-  if (evidence) base.evidence = evidence;
-  if (onUnsupported) base.on_unsupported = onUnsupported;
-  if (flags.tries === true) base.include_tries = true;
-  const contextPath = str(flags.context);
-  if (contextPath) base.context = readContext(contextPath);
-  const inputs = [];
-  for (const file of files) {
-    let message2;
-    try {
-      message2 = file === "-" ? await io.readStdin() : readFileSync4(file, "utf8");
-    } catch (err) {
-      throw usageError(`Could not read ${file}: ${err instanceof Error ? err.message : String(err)}`);
-    }
-    if (!message2.trim()) throw usageError(`${file === "-" ? "Stdin" : file} is empty.`);
-    inputs.push({ file, message: message2 });
-  }
-  const credential = await resolveCredential(ctx);
-  const client = apiClient(ctx, credential);
-  const results = [];
-  let exit = EXIT.ok;
-  for (const { file, message: message2 } of inputs) {
-    let result;
-    try {
-      result = await withTimeout(
-        client.request("/api/platform/v1/messages/optimize", {
-          method: "POST",
-          body: { message: message2, ...base }
-        }),
-        OPTIMIZE_TIMEOUT_MS,
-        file
-      );
-    } catch (err) {
-      throw toCliError(err);
-    }
-    const ok = result.ok !== false;
-    results.push({ ok, file, result });
-    if (!ok) {
-      exit = EXIT.general;
-      out.info(`${file}: not optimized (${String(result.reason ?? "unknown")}): ${String(result.detail ?? "")}`);
-      continue;
-    }
-    if (!out.json) {
-      if (inputs.length > 1) out.info(`== ${file} ==`);
-      if (result.unchanged === true) out.info("No rewrite beat your draft; it is returned unchanged.");
-      else if (typeof result.summary === "string") out.info(result.summary);
-      out.result({}, String(result.message ?? ""));
-      const did = whatAmdahlDid(result);
-      if (did.length) out.info(did.join("\n"));
-    }
-  }
-  if (out.json) out.result(results.length === 1 ? results[0] : results);
-  return exit;
+import { readFileSync as readFileSync5 } from "fs";
+
+// src/ci.ts
+var isSet = (value) => Boolean(value) && value !== "false" && value !== "0";
+function ciVariable(env) {
+  const named = ["CI", "JENKINS_URL", "TF_BUILD", "CODEBUILD_BUILD_ID", "TEAMCITY_VERSION", "GITHUB_ACTIONS", "GITLAB_CI", "BUILDKITE", "CIRCLECI"].find((name) => isSet(env[name]));
+  if (named) return named;
+  return isSet(env.BUILD_NUMBER) && isSet(env.JENKINS_HOME) ? "BUILD_NUMBER with JENKINS_HOME" : null;
 }
 
 // src/commands/skills-guide.ts
@@ -9663,7 +9543,7 @@ import { dirname as dirname3, join as join6, relative, sep } from "path";
 
 // src/commands/skills-install.ts
 import { randomBytes as randomBytes3 } from "crypto";
-import { chmodSync as chmodSync4, lstatSync as lstatSync2, mkdirSync as mkdirSync3, mkdtempSync, readdirSync, readFileSync as readFileSync5, renameSync as renameSync3, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
+import { chmodSync as chmodSync4, lstatSync as lstatSync2, mkdirSync as mkdirSync3, mkdtempSync, readdirSync, readFileSync as readFileSync4, renameSync as renameSync3, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname2, join as join5 } from "path";
 function skillDirs(targets, name) {
   const dirs = [];
@@ -9710,7 +9590,7 @@ function sameFolder(dir, archive) {
         if (!file) return false;
         const full = join5(dir, path);
         if (process.platform !== "win32" && (lstatSync2(full).mode & 73 ? 493 : 420) !== file.mode) return false;
-        if (!readFileSync5(full).equals(file.bytes)) return false;
+        if (!readFileSync4(full).equals(file.bytes)) return false;
       } else {
         return false;
       }
@@ -9755,7 +9635,7 @@ function planInstall(dirs, payload) {
     refuseLinks(dir, path);
     let current;
     try {
-      current = lstatSync2(path, { throwIfNoEntry: false }) ? readFileSync5(path) : null;
+      current = lstatSync2(path, { throwIfNoEntry: false }) ? readFileSync4(path) : null;
     } catch (err) {
       throw writeFailure(path, err);
     }
@@ -9935,40 +9815,379 @@ function nextStep(ctx, targets, seen) {
   return `Open a new ${joinNames(names, "or")} chat ${where} to use it.`;
 }
 
-// src/commands/setup.ts
-var SHOWN = [
-  { client: "claude-code", name: "Claude Code" },
-  { client: "cursor", name: "Cursor" },
-  { client: "codex", name: "Codex" }
-];
-var QUESTION = "Where should Amdahl work?";
-var FOUND_TAG = "found on your machine";
-var NONE_FOUND = "We didn't find any of these on this computer. Tick the ones you use.";
-var MENU_HINT = "\u2191\u2193 move \xB7 Space tick/untick \xB7 Enter to install";
-var ASK = 'say "make this email sound less like AI"';
-function finishLines(names, inClaudeCode = false) {
-  const [only] = names;
+// src/commands/optimize.ts
+var NEW_USER = "New to Amdahl? The sign-in sets up your free workspace.";
+var OPTIMIZE_TIMEOUT_MS = 18e4;
+var CHANNELS = ["email", "linkedin"];
+var EVIDENCE = ["off", "workspace"];
+var ON_UNSUPPORTED = ["flag", "remove"];
+function oneOf(flag, value, allowed) {
+  if (value === void 0) return void 0;
+  if (!allowed.includes(value)) throw usageError(`--${flag} must be one of: ${allowed.join(", ")}.`);
+  return value;
+}
+function readContext(path) {
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync5(path, "utf8"));
+  } catch (err) {
+    throw usageError(`Could not read --context ${path}: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw usageError("--context must be a JSON object with rules, voice_examples and facts.");
+  }
+  return parsed;
+}
+function withTimeout(promise, ms, file) {
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(
+      () => reject(new CliError("timeout", `Optimizing ${file} timed out after ${ms / 1e3} s.`, EXIT.network)),
+      ms
+    );
+  });
+  return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
+}
+var WEAKEST = {
+  rules: "how it follows your rules",
+  ask: "the ask",
+  opener: "the opener",
+  fit: "how it fits the recipient",
+  proof: "its proof points",
+  length: "the length",
+  style: "the tone",
+  preference: "how it matches your preferences",
+  voice: "how much it sounds like you"
+};
+var CONCERNS = {
+  conflicts_with_callers_ask: "it asks for a different length or time than your ask",
+  drops_ask: "it leaves out your ask",
+  adds_claim: "it states something neither your draft nor your facts support",
+  drops_entity: "it drops a name, link or placeholder you had",
+  inflates: "it is longer than you asked for",
+  no_gain: "it changed little beyond the wording",
+  breaks_rules: "it breaks one of your rules"
+};
+var EVIDENCE_MISSED = {
+  corpus_empty: "the workspace has none yet",
+  evidence_unavailable: "this environment does not read them",
+  evidence_read_failed: "the read failed, so a retry may work"
+};
+var MAX_LINES = 3;
+function list(value) {
+  return Array.isArray(value) ? value.filter((v) => !!v && typeof v === "object") : null;
+}
+function record(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function text(value) {
+  return typeof value === "string" ? printable(value).trim() : "";
+}
+function sentence(value) {
+  return /[.!?]$/.test(value) ? value : `${value}.`;
+}
+function plural(n, one, many = `${one}s`) {
+  return `${n} ${n === 1 ? one : many}`;
+}
+function readSteps(steps) {
+  const reasonOf = (node) => text(steps.find((s) => s.node === node)?.reason);
+  const changed = (node) => steps.some((s) => s.node === node && s.changed === true);
+  const counts = new Map(
+    reasonOf("w3").split(",").map((part) => part.split(":")).filter(([, n]) => /^\d+$/.test(n ?? "")).map(([code, n]) => [code, Number(n)])
+  );
+  const did = [];
+  const repaired = counts.get("repaired") ?? 0;
+  const deleted = counts.get("deleted") ?? 0;
+  if (repaired && deleted) did.push(`Rewrote ${plural(repaired, "sentence")} and cut ${deleted} that nothing backed.`);
+  else if (repaired) did.push(`Rewrote ${plural(repaired, "sentence")} that did not hold up.`);
+  else if (deleted) did.push(`Cut ${plural(deleted, "sentence")} that nothing backed.`);
+  const repair = reasonOf("w5");
+  if (changed("w5") && repair.startsWith("repaired:")) {
+    const weakest = WEAKEST[repair.slice("repaired:".length)];
+    did.push(weakest ? `Reworked ${weakest}.` : "Reworked its weakest part.");
+  }
+  const flagged = [];
+  const open = counts.get("open");
+  if (open) flagged.push(`${plural(open, "sentence problem")} it could not fix`);
+  const second = reasonOf("w6");
+  if (changed("w6") && !second.startsWith("kept_before_repair")) {
+    const concern = CONCERNS[second];
+    flagged.push(concern ? `a second-check concern (${concern})` : "a second-check concern");
+  }
+  return { did: did.join(" "), flagged };
+}
+function and(parts) {
+  return parts.length < 2 ? parts[0] ?? "" : `${parts.slice(0, -1).join(", ")} and ${parts[parts.length - 1]}`;
+}
+function whatAmdahlDid(result) {
+  const steps = result.unchanged === true ? { did: "", flagged: [] } : readSteps(list(result.steps) ?? []);
+  const flagged = [...steps.flagged];
+  let checked = "";
+  let removed = "";
+  const evidence = record(result.evidence);
+  const claims = list(result.unsupported_claims);
+  if (evidence?.used === true) {
+    const quotes = record(result.lift)?.quotes;
+    const read = typeof quotes === "number" && quotes > 0 ? ` (${plural(quotes, "quote")})` : "";
+    if (claims) {
+      const still = claims.filter((c) => c.status !== "removed").length;
+      const cut = claims.length - still;
+      if (cut) removed = `Removed ${plural(cut, "claim")} your calls don't back.`;
+      if (still) flagged.unshift(`${plural(still, "claim")} your calls don't back`);
+      checked = `Checked every claim against your calls${read}${claims.length ? "" : " and found none they don't back"}.`;
+    } else checked = `Checked the message against your calls${read}.`;
+  } else if (evidence?.requested === "workspace" && EVIDENCE_MISSED[text(evidence.reason)]) {
+    checked = `Skipped checking claims against your calls: ${EVIDENCE_MISSED[text(evidence.reason)]}.`;
+  }
+  const used = (list(record(result.context_use)?.rows) ?? []).filter((r) => r.verdict === "pass");
+  const sources = [
+    used.some((r) => r.bucket === "internal") ? "Amdahl's own records" : "",
+    used.some((r) => r.bucket === "external") ? "what their company or market published" : ""
+  ].filter(Boolean);
+  const usedLine = sources.length ? `Used ${plural(sources.length, "source")}: ${and(sources)}.` : "";
+  const omitted = list(result.omitted) ?? [];
+  const whys = [...new Set(omitted.map((o) => text(o.why)).filter(Boolean))];
+  const more = whys.length > 1 ? ` (${plural(whys.length - 1, "more reason")} in --json)` : "";
+  const leftOut = omitted.length ? `Left out ${plural(omitted.length, "thing")}${whys[0] ? `: ${sentence(whys[0])}` : "."}${more}` : "";
+  const lines = [
+    { rank: 2, line: sentence(text(result.what_changed)) },
+    { rank: 5, line: checked },
+    { rank: 3, line: removed },
+    { rank: 6, line: usedLine },
+    { rank: 7, line: steps.did },
+    { rank: 4, line: leftOut },
+    { rank: 1, line: flagged.length ? `Flagged ${and(flagged)}; check before sending.` : "" }
+  ].filter((l) => l.line && l.line !== ".");
+  const kept = new Set([...lines].sort((a, b) => a.rank - b.rank).slice(0, MAX_LINES));
+  return lines.filter((l) => kept.has(l)).map((l) => l.line);
+}
+var PASTE_PROMPT = "Paste an email or LinkedIn message, then press Enter on an empty line:";
+var VERSION_RULE = "\u2500\u2500 Amdahl's version \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
+function nextTimeLine(ctx) {
+  const file = amdahlCommand("optimize draft.txt");
+  return ctx.io.platform === "darwin" ? `Next time: ${file},
+or pbpaste | ${amdahlCommand("optimize -")}` : `Next time: ${file}`;
+}
+function requestOptions(ctx) {
+  const { flags } = ctx;
+  const base = {};
+  const channel = oneOf("channel", str(flags.channel), CHANNELS);
+  const evidence = oneOf("evidence", str(flags.evidence), EVIDENCE);
+  const onUnsupported = oneOf("on-unsupported", str(flags["on-unsupported"]), ON_UNSUPPORTED);
+  if (channel) base.channel = channel;
+  if (evidence) base.evidence = evidence;
+  if (onUnsupported) base.on_unsupported = onUnsupported;
+  if (flags.tries === true) base.include_tries = true;
+  const contextPath = str(flags.context);
+  if (contextPath) base.context = readContext(contextPath);
+  return base;
+}
+async function optimizeOne(ctx, credential, message2, base, file) {
+  try {
+    return await withTimeout(
+      apiClient(ctx, credential).request("/api/platform/v1/messages/optimize", {
+        method: "POST",
+        body: { message: message2, ...base }
+      }),
+      OPTIMIZE_TIMEOUT_MS,
+      file
+    );
+  } catch (err) {
+    throw toCliError(err);
+  }
+}
+async function credentialOrSignIn(ctx) {
+  try {
+    return await resolveCredential(ctx);
+  } catch (err) {
+    if (!(err instanceof CliError && err.exit === EXIT.unauthenticated)) throw err;
+  }
+  ctx.out.info(`Sign in first, then paste your message.
+${NEW_USER}`);
+  const signedIn = await browserSignIn(ctx);
+  ctx.out.info(`\u2713 Signed in \xB7 ${printable(signedIn.workspace.name)}`);
+  return resolveCredential(ctx);
+}
+async function optimizePasted(ctx) {
+  const { io, out } = ctx;
+  const base = requestOptions(ctx);
+  const credential = await credentialOrSignIn(ctx);
+  const message2 = await io.readPaste(PASTE_PROMPT);
+  if (!message2.trim()) {
+    out.info(`Nothing pasted, so nothing was sent.
+${nextTimeLine(ctx)}`);
+    return EXIT.ok;
+  }
+  out.info("Amdahl is rewriting it. This can take a minute.");
+  const result = await optimizeOne(ctx, credential, message2, base, "your message");
+  if (result.ok === false) {
+    if (out.json) out.result({ ok: false, file: "-", result });
+    out.info(`Not optimized (${String(result.reason ?? "unknown")}): ${String(result.detail ?? "")}`);
+    return EXIT.general;
+  }
+  if (out.json) {
+    out.result({ ok: true, file: "-", result });
+    return EXIT.ok;
+  }
+  out.info(VERSION_RULE);
+  if (result.unchanged === true) out.info("No rewrite beat your draft; it is returned unchanged.");
+  out.result({}, String(result.message ?? ""));
+  const did = whatAmdahlDid(result);
+  out.info([...did, nextTimeLine(ctx)].join("\n"));
+  return EXIT.ok;
+}
+async function optimize(ctx, args) {
+  const { io, out } = ctx;
+  let files = args;
+  if (files.length === 0) {
+    if (io.stdinIsTTY && !ctx.nonInteractive && runningAgent(ctx) === null && !ciVariable(io.env)) return optimizePasted(ctx);
+    if (io.stdinIsTTY) {
+      throw usageError(
+        "Give a file to optimize, or pipe the message on stdin.",
+        "Usage: amdahl optimize <file>... | - [--channel email|linkedin]"
+      );
+    }
+    files = ["-"];
+  }
+  if (files.filter((f) => f === "-").length > 1) throw usageError("Stdin (-) can be read only once.");
+  const base = requestOptions(ctx);
+  const inputs = [];
+  for (const file of files) {
+    let message2;
+    try {
+      message2 = file === "-" ? await io.readStdin() : readFileSync5(file, "utf8");
+    } catch (err) {
+      throw usageError(`Could not read ${file}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    if (!message2.trim()) throw usageError(`${file === "-" ? "Stdin" : file} is empty.`);
+    inputs.push({ file, message: message2 });
+  }
+  const credential = await resolveCredential(ctx);
+  const results = [];
+  let exit = EXIT.ok;
+  for (const { file, message: message2 } of inputs) {
+    const result = await optimizeOne(ctx, credential, message2, base, file);
+    const ok = result.ok !== false;
+    results.push({ ok, file, result });
+    if (!ok) {
+      exit = EXIT.general;
+      out.info(`${file}: not optimized (${String(result.reason ?? "unknown")}): ${String(result.detail ?? "")}`);
+      continue;
+    }
+    if (!out.json) {
+      if (inputs.length > 1) out.info(`== ${file} ==`);
+      if (result.unchanged === true) out.info("No rewrite beat your draft; it is returned unchanged.");
+      else if (typeof result.summary === "string") out.info(result.summary);
+      out.result({}, String(result.message ?? ""));
+      const did = whatAmdahlDid(result);
+      if (did.length) out.info(did.join("\n"));
+    }
+  }
+  if (out.json) out.result(results.length === 1 ? results[0] : results);
+  return exit;
+}
+
+// src/commands/setup.ts
+var SHOWN = [
+  { client: "claude-code", name: "Claude Code" },
+  { client: "cursor", name: "Cursor" },
+  { client: "codex", name: "Codex" }
+];
+var QUESTION = "Where should Amdahl work?";
+var TERMINAL = "This terminal";
+var FOUND_TAG = "found on your machine";
+var CONNECT_URL = "https://amdahl.ai/connect";
+var NONE_FOUND = `We didn't find Claude Code, Cursor or Codex on this computer.
+Using the Claude or ChatGPT app? Connect it at ${CONNECT_URL}`;
+var MENU_HINT = "\u2191\u2193 move \xB7 Space tick/untick \xB7 Enter continue";
+var ASK = '"Use Amdahl to make this sound less like AI"';
+var SIGN_IN = {
+  "Claude Code": "If it's open, quit and reopen it. Type /mcp, pick amdahl, sign in.",
+  // Cursor reads ~/.cursor/mcp.json at start, and lists its MCP servers under Customize > MCPs.
+  Cursor: "If it's open, quit and reopen it. In Customize > MCPs, sign in to amdahl."
+};
+var TRY_IN = {
+  "Claude Code": `Paste an email and say: ${ASK}`,
+  Cursor: `In chat, paste an email, say: ${ASK}`,
+  Codex: `In codex, paste an email, say: ${ASK}`
+};
+var CODEX_TRY = `Run codex, paste an email and say: ${ASK}`;
+var CODEX_LOGIN = "codex mcp login amdahl";
+function toolScreen(name, already) {
+  return [
+    already ? `\u2713 ${name} already has Amdahl.` : `\u2713 Added Amdahl to ${name}.`,
+    `One step left, in ${name}:`,
+    `  1. ${SIGN_IN[name] ?? ""}`,
+    `  2. ${TRY_IN[name] ?? ""}`
+  ];
+}
+function allSetLines(names) {
+  const [only] = names;
+  if (only === void 0) return [];
+  const tryHere2 = `Want to try it here instead? Run: ${amdahlCommand("optimize")}`;
+  if (names.length === 1) {
+    const done = {
+      "Claude Code": ["If you've already run /mcp, you're done.", "If not: quit and reopen Claude Code, type /mcp, pick amdahl, sign in."],
+      Cursor: ["If you've already signed in under Customize > MCPs, you're done.", "If not: quit and reopen Cursor, then sign in to amdahl there."],
+      Codex: [`If you've already run ${CODEX_LOGIN}, you're done.`, `If not, run it now in this terminal.`]
+    };
+    return [`Amdahl is in ${only}. You're all set.`, `Paste an email there and say: ${ASK}`, ...done[only] ?? [], tryHere2];
+  }
+  const step = {
+    "Claude Code": "quit and reopen it, type /mcp, pick amdahl, sign in",
+    Cursor: "quit and reopen it, then in Customize > MCPs, sign in to amdahl",
+    Codex: `run ${CODEX_LOGIN}`
+  };
+  return [
+    `Amdahl is in ${joinNames(names)}. You're all set.`,
+    `Paste an email in ${names.length === 2 ? "either" : "any of them"} and say: ${ASK}`,
+    "If you've already signed each one in, you're done. If not:",
+    ...names.map((n) => `  ${n}: ${step[n] ?? ""}`),
+    tryHere2
+  ];
+}
+function nothingPickedLines() {
+  return [
+    "Nothing picked, so nothing changed.",
+    `To try it here, run ${amdahlCommand()} again and tick "${TERMINAL}".`,
+    `Using the Claude or ChatGPT app? Connect it at ${CONNECT_URL}`
+  ];
+}
+function wrapLine(line, columns) {
+  if (!columns || [...line].length <= columns) return [line];
+  const lead = /^\s*(?:\d+\.\s+)?/.exec(line)?.[0] ?? "";
+  const indent = " ".repeat(lead.length);
+  const lines = [];
+  let current = lead;
+  let words = 0;
+  for (const word of line.slice(lead.length).split(" ")) {
+    if (words > 0 && [...`${current} ${word}`].length > columns) {
+      lines.push(current);
+      current = indent + word;
+    } else current = words > 0 ? `${current} ${word}` : current + word;
+    words++;
+  }
+  lines.push(current);
+  return lines;
+}
+var AGENT_ASK = `paste an email and say ${ASK}`;
+function finishLines(names, inClaudeCode = false) {
+  const [only] = names;
   if (only === void 0) return [];
   if (names.length === 1) {
     const step2 = {
       "Claude Code": inClaudeCode ? "Before that, restart Claude Code and run /mcp once to connect Amdahl." : "Before that, run /mcp once in Claude Code to connect Amdahl.",
       Cursor: "Before that, sign in when Cursor asks, the first time you use Amdahl.",
-      Codex: "Before that, run `codex mcp login amdahl` once to connect Amdahl."
+      Codex: `Before that, run \`${CODEX_LOGIN}\` once to connect Amdahl.`
     };
-    return [`Try it: ${ASK} in ${only}.`, step2[only] ?? ""];
+    return [`Try it: ${AGENT_ASK} in ${only}.`, step2[only] ?? ""];
   }
   const step = {
     "Claude Code": inClaudeCode ? "restart it, then run /mcp" : "run /mcp",
     Cursor: "sign in when it asks, on first use",
-    Codex: "run `codex mcp login amdahl`"
+    Codex: `run \`${CODEX_LOGIN}\``
   };
-  return [`Try it: ${ASK} in any of them.`, "Before that, connect each one once:", ...names.map((n) => `  ${n}: ${step[n] ?? ""}`)];
-}
-var isSet = (value) => Boolean(value) && value !== "false" && value !== "0";
-function ciVariable(env) {
-  const named = ["CI", "JENKINS_URL", "TF_BUILD", "CODEBUILD_BUILD_ID", "TEAMCITY_VERSION", "GITHUB_ACTIONS", "GITLAB_CI", "BUILDKITE", "CIRCLECI"].find((name) => isSet(env[name]));
-  if (named) return named;
-  return isSet(env.BUILD_NUMBER) && isSet(env.JENKINS_HOME) ? "BUILD_NUMBER with JENKINS_HOME" : null;
+  return [`Try it: ${AGENT_ASK} in any of them.`, "Before that, connect each one once:", ...names.map((n) => `  ${n}: ${step[n] ?? ""}`)];
 }
 function setupMode(io) {
   const { env } = io;
@@ -10008,35 +10227,70 @@ function reportError(io, err) {
 ${err.hint ? `${err.hint}
 ` : ""}`);
 }
-async function installEach(ctx, clients, detail) {
+async function installEach(ctx, tools) {
   let exit = EXIT.ok;
   const ready = [];
-  for (const { client, name } of clients) {
+  for (const tool of tools) {
     let steps;
     try {
-      steps = await installClient(ctx, client, false);
+      steps = await installClient(ctx, tool.client, false);
     } catch (raw) {
-      const err = raw instanceof CliError ? raw : new CliError("install_failed", `Could not set up ${name}: ${raw instanceof Error ? raw.message : String(raw)}`, EXIT.general);
+      const err = raw instanceof CliError ? raw : new CliError("install_failed", `Could not set up ${tool.name}: ${raw instanceof Error ? raw.message : String(raw)}`, EXIT.general);
       reportError(ctx.io, err);
       if (exit === EXIT.ok) exit = err.exit;
       continue;
     }
-    ctx.io.stdout(`${steps.mcp.data.action === "unchanged" ? `\u2713 ${name} already has Amdahl` : `\u2713 Added to ${name}`}
-`);
-    ready.push(name);
-    detail([steps.mcp.human, ...steps.mcp.notes, steps.skill.human, ...steps.skill.notes].filter(Boolean).join("\n"));
+    const detail = [steps.mcp.human, ...steps.mcp.notes, steps.skill.human, ...steps.skill.notes].filter(Boolean).join("\n");
+    ready.push({ ...tool, already: steps.mcp.data.action === "unchanged", detail });
   }
   return { ready, exit };
 }
+function enterOrSkip(io) {
+  return new Promise((resolve2) => {
+    const stop = io.listenForEnter(
+      () => {
+        stop();
+        resolve2(true);
+      },
+      () => resolve2(false)
+    );
+  });
+}
+async function codexScreen(ctx, tool, say, detail, lead) {
+  say(tool.already ? "\u2713 Codex already has Amdahl." : "\u2713 Added Amdahl to Codex.");
+  detail(tool.detail);
+  for (const line of lead) say(line);
+  if (ctx.io.platform === "win32" || !await onPath(ctx, "codex")) {
+    say("One step left, in your terminal:");
+    say(`  1. Run: ${CODEX_LOGIN}`);
+    say(`  2. ${TRY_IN.Codex ?? ""}`);
+    return;
+  }
+  say("Press Enter to sign Codex in to Amdahl (opens your browser).");
+  if (!await enterOrSkip(ctx.io)) {
+    say(`Skipped. To connect it later, run: ${CODEX_LOGIN}`);
+    say(CODEX_TRY);
+    return;
+  }
+  const code = await ctx.io.runInteractive("codex", ["mcp", "login", "amdahl"]);
+  if (code === 0) say("\u2713 Codex is connected.");
+  else {
+    say("");
+    say(`Codex didn't finish signing in. To try again, run: ${CODEX_LOGIN}`);
+  }
+  say(CODEX_TRY);
+}
 async function setup(ctx, mode) {
   const { io, out } = ctx;
   const verbose = ctx.flags.verbose === true;
-  const say = (line) => io.stdout(`${line}
+  const say = (line) => {
+    for (const part of mode === "menu" ? wrapLine(line, io.columns()) : [line]) io.stdout(`${part}
 `);
+  };
   const detail = (text2) => {
-    if (verbose && text2) say(text2.replace(/^/gm, "  "));
+    if (verbose && text2) io.stdout(`${text2.replace(/^/gm, "  ")}
+`);
   };
-  const inClaudeCode = Boolean(io.env.CLAUDECODE);
   say(`${out.bold("Amdahl")} \xB7 predictive ML for GTM`);
   const found = await detectClients(ctx);
   const detected = SHOWN.filter((c) => found[c.client]);
@@ -10049,43 +10303,43 @@ ${installLine()}
 `);
       return EXIT.general;
     }
-    const { ready, exit: exit2 } = await installEach(ctx, targets, detail);
-    for (const line of finishLines(ready, inClaudeCode)) say(line);
+    const { ready, exit: exit2 } = await installEach(ctx, targets);
+    for (const tool of ready) {
+      say(tool.already ? `\u2713 ${tool.name} already has Amdahl` : `\u2713 Added to ${tool.name}`);
+      detail(tool.detail);
+    }
+    for (const line of finishLines(ready.map((t) => t.name), Boolean(io.env.CLAUDECODE))) say(line);
     return exit2;
   }
-  let who;
   if (detected.length > 0) {
-    const installed = await Promise.all(detected.map((c) => isInstalled(ctx, c.client)));
-    if (installed.every(Boolean)) {
-      let unreachable = false;
-      try {
-        who = await signIn(ctx);
-      } catch (err) {
-        if (!(err instanceof CliError && err.exit === EXIT.network)) throw err;
-        unreachable = true;
-      }
-      if (unreachable || who?.kind === "in") {
-        say(`You're set up in ${joinNames(detected.map((c) => c.name))}.${unreachable ? " (Could not reach Amdahl to check your sign-in.)" : ""}`);
-        for (const line of finishLines(detected.map((c) => c.name), inClaudeCode)) say(line);
-        return EXIT.ok;
-      }
-    }
-  }
-  const picks = await io.multiSelect(
-    QUESTION,
-    SHOWN.map((c) => c.name),
-    {
-      ticked: SHOWN.map((c) => found[c.client]),
-      tags: SHOWN.map((c) => found[c.client] ? FOUND_TAG : void 0),
-      note: detected.length === 0 ? NONE_FOUND : void 0,
-      hint: MENU_HINT,
-      color: out.color
-    }
-  );
+    const there = await Promise.all(detected.map((c) => hasAmdahl(ctx, c.client)));
+    if (there.every(Boolean)) {
+      let exit2 = EXIT.ok;
+      for (const tool of detected) {
+        if (await isInstalled(ctx, tool.client)) continue;
+        const refreshed = await installEach(ctx, [tool]);
+        for (const r of refreshed.ready) detail(r.detail);
+        if (exit2 === EXIT.ok) exit2 = refreshed.exit;
+      }
+      for (const line of allSetLines(detected.map((c) => c.name))) say(line);
+      return exit2;
+    }
+  }
+  const rows = [...SHOWN.map((c) => c.name), TERMINAL];
+  const picks = await io.multiSelect(QUESTION, rows, {
+    ticked: [...SHOWN.map((c) => found[c.client]), false],
+    tags: [...SHOWN.map((c) => found[c.client] ? FOUND_TAG : void 0), void 0],
+    note: detected.length === 0 ? NONE_FOUND : void 0,
+    // With no tool here, the marker starts on "This terminal": Space, then Enter.
+    initial: detected.length === 0 ? SHOWN.length : void 0,
+    hint: MENU_HINT,
+    color: out.color
+  });
   if (picks.length === 0) {
-    say("Nothing picked, so nothing changed.");
+    for (const line of nothingPickedLines()) say(line);
     return EXIT.ok;
   }
+  const here = picks.includes(SHOWN.length);
   let exit = EXIT.ok;
   const chosen = [];
   for (const pick of picks.flatMap((i) => SHOWN[i] ?? [])) {
@@ -10097,22 +10351,51 @@ ${installLine()}
     reportError(io, err);
     if (exit === EXIT.ok) exit = err.exit;
   }
-  if (chosen.length === 0) return exit;
-  who ??= await signIn(ctx);
+  const done = await installEach(ctx, chosen);
+  if (exit === EXIT.ok) exit = done.exit;
+  let lead = [NEW_USER];
+  for (const [i, tool] of done.ready.entries()) {
+    if (i > 0) say("");
+    if (tool.client === "codex") {
+      await codexScreen(ctx, tool, say, detail, lead);
+    } else {
+      const [first, ...steps] = toolScreen(tool.name, tool.already);
+      say(first ?? "");
+      detail(tool.detail);
+      for (const line of [...steps, ...lead]) say(line);
+    }
+    lead = [];
+  }
+  if (!here) return exit;
+  if (done.ready.length > 0) say("");
+  try {
+    const code = await tryHere(ctx, say, lead);
+    return exit === EXIT.ok ? code : exit;
+  } catch (err) {
+    if (err instanceof PromptCancelled && done.ready.length > 0) {
+      throw new CliError("cancelled", `Stopped. Amdahl is still set up in ${joinNames(done.ready.map((t) => t.name))}.`, EXIT.cancelled);
+    }
+    throw err;
+  }
+}
+async function tryHere(ctx, say, lead) {
+  const { out } = ctx;
+  const verbose = ctx.flags.verbose === true;
+  const who = await signIn(ctx);
   if (who.kind === "in") {
     say(`\u2713 Signed in \xB7 ${who.workspace}`);
-    detail(`Signed in as ${who.email}.`);
+    if (verbose) say(`  Signed in as ${who.email}.`);
   } else if (who.kind === "out") {
+    for (const line of lead) say(line);
     const signedIn = await browserSignIn(ctx);
     say(`\u2713 Signed in \xB7 ${printable(signedIn.workspace.name)}`);
-    detail(signedInLine(ctx, signedIn));
+    if (verbose) say(`  ${signedInLine(ctx, signedIn)}`);
   } else {
     const name = who.source === "flag" ? "--api-key" : who.source.slice("env:".length);
-    out.info(`Amdahl rejected the key in ${name}. Skipping the browser sign-in, because that key would still be used instead. Fix it, or unset it and run \`${amdahlCommand("login")}\`.`);
+    out.info(`Amdahl rejected the key in ${name}, so a message can't be tried here. Fix it, or unset it and run \`${amdahlCommand("login")}\`.`);
+    return EXIT.unauthenticated;
   }
-  const done = await installEach(ctx, chosen, detail);
-  for (const line of finishLines(done.ready, inClaudeCode)) say(line);
-  return exit === EXIT.ok ? done.exit : exit;
+  return optimizePasted(ctx);
 }
 
 // src/commands/skills.ts
@@ -10726,7 +11009,7 @@ async function workspaceUse(ctx, args) {
 }
 
 // src/version.ts
-var VERSION = "0.3.4";
+var VERSION = "0.3.6";
 
 // src/main.ts
 var COMMANDS = {