@amdahl/cli 0.3.5 → 0.3.7

package/README.md

@@ -140,8 +140,9 @@ Run codex, paste an email and say: "Use Amdahl to make this sound less like AI"
 Enter runs `codex mcp login amdahl` on your terminal (it prints the link and
 opens the browser). Ctrl+C there skips it and names the command to run
 later; if the sign-in does not finish, it says so and names the same
-command. Without `codex` on your PATH, the screen lists `codex mcp login
-amdahl` as step 1. With more than one tool, the screens follow one another
+command. Without `codex` on your PATH, and always on Windows (where `codex`
+is a `.cmd` file the CLI cannot start without a shell), the screen lists
+`codex mcp login amdahl` as step 1. With more than one tool, the screens follow one another
 and the "New to Amdahl?" line is printed once. A tool that fails (a broken
 `~/.cursor/mcp.json` or `~/.claude.json`, say) prints its error, the rest
 still run, and the exit code is the first failure's. In a terminal narrower
@@ -320,8 +321,10 @@ message, or bare `amdahl` to add Amdahl to Claude Code, Cursor or Codex.
 `amdahl optimize` with no file, at a terminal, asks you to paste the message
 (as the setup's "This terminal" does) and signs you in through the browser
 first if you are not signed in ("Sign in first, then paste your message."). With stdin piped, or `-`, it reads stdin
-whole as before. With `AMDAHL_NO_PROMPT=1` at a terminal it still says to
-give a file (exit 2).
+whole as before. At a terminal it still says to give a file (exit 2) when
+an agent runs it (`CLAUDECODE` or `CURSOR_AGENT` set), in CI (the same
+variables bare `amdahl` checks) or with `AMDAHL_NO_PROMPT=1`: none of them
+can paste.
 
 On a server or in CI, skip `login` and set an API key in `AMDAHL_KEY`.
 
@@ -500,6 +503,33 @@ nothing. `--site <origin>` sends both requests to another origin, for
 example a local copy of the site (`--site http://localhost:6782`). The
 origin must be `https`; `http` is allowed only for localhost.
 
+## Feedback link
+
+Without `--json`, `amdahl optimize` ends each run with its run id:
+
+```
+Run: 3f2c8a1e-...
+```
+
+Under `--json` the run id is in `result.run_id` and nothing extra prints.
+
+Amdahl staff can opt in to a feedback link after the run id. The link opens the
+run's internal page in the Amdahl console, which only staff can see. It is off
+by default. To turn it on:
+
+- Set `"feedbackLink": true` at the top level of the config file
+  (`${XDG_CONFIG_HOME:-~/.config}/amdahl/config.json`, or
+  `%APPDATA%\amdahl\config.json` on Windows).
+- Or set `AMDAHL_FEEDBACK_LINK=1` for one command or shell.
+  `AMDAHL_FEEDBACK_LINK=0` turns it off even when the config turns it on.
+
+The link uses the console for your API host (see
+[Targeting staging](#targeting-staging)).
+
+Every request to the Amdahl API sends the headers
+`X-Amdahl-Client: cli/<version>` and `User-Agent: amdahl-cli/<version>`, so
+Amdahl can tell which runs came from the CLI. The headers are only labels. It never changes what a credential can do.
+
 ## Targeting staging
 
 ```sh

package/dist/amdahl.js

@@ -8022,7 +8022,14 @@ Global options:
   -v, --version      Show the version
 `;
 
+// src/version.ts
+var VERSION = "0.3.7";
+
 // src/api.ts
+var CLIENT_HEADER = {
+  "X-Amdahl-Client": `cli/${VERSION}`,
+  "User-Agent": `amdahl-cli/${VERSION}`
+};
 var AmdahlApiError = class extends Error {
   constructor(message2, statusCode, path, responseBody, errorCode) {
     super(message2);
@@ -8110,7 +8117,7 @@ function createAmdahlClient(config) {
   const { baseUrl, token } = config;
   async function request(path, options = {}) {
     const { method = "GET", body, headers = {} } = options;
-    const allHeaders = { ...headers, Authorization: `Bearer ${token}` };
+    const allHeaders = { ...headers, ...CLIENT_HEADER, Authorization: `Bearer ${token}` };
     if (body && !allHeaders["Content-Type"]) allHeaders["Content-Type"] = "application/json";
     const response = await fetch(`${baseUrl}${path}`, {
       method,
@@ -8177,7 +8184,8 @@ function loadConfig(io) {
     return {
       version: 1,
       default_profile: typeof parsed.default_profile === "string" ? parsed.default_profile : null,
-      profiles: parsed.profiles && typeof parsed.profiles === "object" ? parsed.profiles : {}
+      profiles: parsed.profiles && typeof parsed.profiles === "object" ? parsed.profiles : {},
+      ...typeof parsed.feedbackLink === "boolean" ? { feedbackLink: parsed.feedbackLink } : {}
     };
   } catch {
     return emptyConfig();
@@ -8199,6 +8207,12 @@ function saveConfig(io, config) {
 function selectedProfileName(io, config, flag) {
   return flag || io.env.AMDAHL_PROFILE || config.default_profile || null;
 }
+function feedbackLinkOn(io, config) {
+  const env = io.env.AMDAHL_FEEDBACK_LINK?.trim().toLowerCase();
+  if (env === "0" || env === "false" || env === "off") return false;
+  if (env === "1" || env === "true" || env === "on") return true;
+  return config.feedbackLink ?? false;
+}
 
 // src/oauth.ts
 import { createHash, randomBytes } from "crypto";
@@ -8213,7 +8227,7 @@ function createPkce() {
 }
 async function send(url, init) {
   try {
-    return await fetch(url, init);
+    return await fetch(url, { ...init, headers: { ...init?.headers, ...CLIENT_HEADER } });
   } catch (err) {
     const message2 = err instanceof Error ? err.message : String(err);
     throw new CliError("network_error", `Could not reach ${new URL(url).host}: ${message2}`, EXIT.network, NETWORK_HINT);
@@ -9527,114 +9541,402 @@ async function keysRevoke(ctx, args) {
 }
 
 // src/commands/optimize.ts
-import { readFileSync as readFileSync4 } from "fs";
-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;
+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;
 }
-function readContext(path) {
-  let parsed;
+
+// src/commands/skills-guide.ts
+import { existsSync as existsSync4 } from "fs";
+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 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 = [];
+  if (targets.claude) dirs.push(join5(targets.base, ".claude", "skills", name));
+  if (targets.agents) dirs.push(join5(targets.base, ".agents", "skills", name));
+  return dirs;
+}
+var message = (err) => err instanceof Error ? err.message : String(err);
+function plainReason(err) {
+  const code = err.code;
+  if (code === "EACCES" || code === "EPERM") return "you do not have permission to write there";
+  if (code === "ENOSPC") return "the disk is full";
+  if (code === "EROFS") return "that disk is read-only";
+  if (code === "ENOTDIR" || code === "EEXIST") return "a file is in the way";
+  return message(err);
+}
+var leftBehind = (written) => written.length > 0 ? `It wrote ${written.join(" and ")} first.` : "Nothing was written.";
+function writeFailure(path, err, written = []) {
+  const code = err.code;
+  const left = leftBehind(written);
+  const fix = code === "EACCES" || code === "EPERM" ? " Run the command from a folder you can write to." : "";
+  return new CliError("write_failed", `Could not write ${path}: ${plainReason(err)}`, EXIT.general, `${left}${fix}`);
+}
+function sameFolder(dir, archive) {
+  let top;
   try {
-    parsed = JSON.parse(readFileSync4(path, "utf8"));
+    top = lstatSync2(dir);
   } catch (err) {
-    throw usageError(`Could not read --context ${path}: ${err instanceof Error ? err.message : String(err)}`);
+    if (err.code === "ENOENT") return null;
+    throw writeFailure(dir, err);
   }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw usageError("--context must be a JSON object with rules, voice_examples and facts.");
+  if (!top.isDirectory()) return false;
+  const want = new Map(archive.files.map((f) => [f.path, f]));
+  const wantDirs = new Set(archive.dirs);
+  let found = 0;
+  const walk = (rel) => {
+    for (const entry of readdirSync(join5(dir, rel), { withFileTypes: true })) {
+      const path = rel ? `${rel}/${entry.name}` : entry.name;
+      if (++found > want.size + wantDirs.size) return false;
+      if (entry.isDirectory()) {
+        if (!wantDirs.has(path) || !walk(path)) return false;
+      } else if (entry.isFile()) {
+        const file = want.get(path);
+        if (!file) return false;
+        const full = join5(dir, path);
+        if (process.platform !== "win32" && (lstatSync2(full).mode & 73 ? 493 : 420) !== file.mode) return false;
+        if (!readFileSync4(full).equals(file.bytes)) return false;
+      } else {
+        return false;
+      }
+    }
+    return true;
+  };
+  try {
+    return walk("") && found === want.size + wantDirs.size;
+  } catch (err) {
+    throw writeFailure(dir, err);
   }
-  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 refuseLinks(dir, file, written = []) {
+  const path = file ?? dir;
+  for (const part of [dirname2(dirname2(dir)), dirname2(dir), dir, ...file ? [file] : []]) {
+    let stat;
+    try {
+      stat = lstatSync2(part);
+    } catch (err) {
+      if (err.code === "ENOENT") return;
+      throw writeFailure(path, err, written);
+    }
+    const why = stat.isSymbolicLink() ? "is a link" : part === file && !stat.isFile() ? "is not a file" : "";
+    if (why) {
+      throw new CliError(
+        "link_in_the_way",
+        `Could not write ${path}: ${part} ${why}.`,
+        EXIT.general,
+        `${leftBehind(written)} Remove it, or install somewhere else.`
+      );
+    }
+  }
 }
-function text(value) {
-  return typeof value === "string" ? printable(value).trim() : "";
+function planInstall(dirs, payload) {
+  return dirs.map((dir) => {
+    if (payload.type === "archive") {
+      refuseLinks(dir);
+      const same = sameFolder(dir, payload.archive);
+      return { path: dir, action: same === null ? "wrote" : same ? "unchanged" : "replaced" };
+    }
+    const path = join5(dir, "SKILL.md");
+    refuseLinks(dir, path);
+    let current;
+    try {
+      current = lstatSync2(path, { throwIfNoEntry: false }) ? readFileSync4(path) : null;
+    } catch (err) {
+      throw writeFailure(path, err);
+    }
+    return { path, action: current === null ? "wrote" : current.equals(payload.body) ? "unchanged" : "replaced" };
+  });
 }
-function sentence(value) {
-  return /[.!?]$/.test(value) ? value : `${value}.`;
+function refuseClashes(plan, name, force) {
+  const clashes = plan.filter((p) => p.action === "replaced").map((p) => p.path);
+  if (clashes.length > 0 && !force) {
+    throw new CliError(
+      "skill_exists",
+      `A different ${name} skill is already at ${clashes.join(" and ")}.`,
+      EXIT.general,
+      "Nothing was written. Run again with --force to replace it."
+    );
+  }
 }
-function plural(n, one, many = `${one}s`) {
-  return `${n} ${n === 1 ? one : many}`;
+function stage(target, name, archive, staged) {
+  const s = { target, temp: "" };
+  staged.push(s);
+  refuseLinks(target);
+  s.createdParent = mkdirSync3(dirname2(target), { recursive: true }) ?? void 0;
+  refuseLinks(target);
+  s.temp = mkdtempSync(join5(dirname2(target), `.${name}.amdahl-tmp-`));
+  chmodSync4(s.temp, 493);
+  for (const dir of archive.dirs) mkdirSync3(join5(s.temp, dir));
+  for (const file of archive.files) writeFileSync3(join5(s.temp, file.path), file.bytes, { flag: "wx", mode: file.mode });
 }
-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");
+function rollBack(staged) {
+  for (const s of [...staged].reverse()) {
+    try {
+      if (s.swapped) {
+        rmSync3(s.target, { recursive: true, force: true });
+        if (s.backup) renameSync3(s.backup, s.target);
+      } else if (s.backup) {
+        renameSync3(s.backup, s.target);
+      }
+    } catch {
+    }
+    if (s.temp) rmSync3(s.temp, { recursive: true, force: true });
+    if (s.createdParent) rmSync3(s.createdParent, { recursive: true, force: true });
   }
-  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 writeFolders(plan, name, archive) {
+  const staged = [];
+  let current = "";
+  try {
+    for (const p of plan) {
+      if (p.action === "unchanged") continue;
+      current = p.path;
+      stage(p.path, name, archive, staged);
+    }
+    for (const s of staged) {
+      current = s.target;
+      if (plan.find((p) => p.path === s.target)?.action === "replaced") {
+        s.backup = `${s.temp}.old`;
+        renameSync3(s.target, s.backup);
+      }
+      renameSync3(s.temp, s.target);
+      s.swapped = true;
+    }
+  } catch (err) {
+    rollBack(staged);
+    if (err instanceof CliError) throw err;
+    throw writeFailure(current, err);
+  }
+  for (const s of staged) if (s.backup) rmSync3(s.backup, { recursive: true, force: true });
 }
-function whatAmdahlDid(result) {
-  const steps = result.unchanged === true ? { did: "", flagged: [] } : readSteps(list(result.steps) ?? []);
-  const flagged = [...steps.flagged];
-  let checked = "";
+function writeFiles(plan, body) {
+  const written = [];
+  for (const p of plan) {
+    if (p.action === "unchanged") continue;
+    refuseLinks(dirname2(p.path), p.path, written);
+    const temp = join5(dirname2(p.path), `.SKILL.md.amdahl-tmp-${randomBytes3(6).toString("hex")}`);
+    try {
+      mkdirSync3(dirname2(p.path), { recursive: true });
+      refuseLinks(dirname2(p.path), p.path, written);
+      writeFileSync3(temp, body, { flag: "wx", mode: 420 });
+      renameSync3(temp, p.path);
+    } catch (err) {
+      rmSync3(temp, { force: true });
+      if (err instanceof CliError) throw err;
+      throw writeFailure(p.path, err, written);
+    }
+    written.push(p.path);
+  }
+}
+function writeInstall(io, plan, name, payload) {
+  io.uninterruptible(() => payload.type === "archive" ? writeFolders(plan, name, payload.archive) : writeFiles(plan, payload.body));
+}
+
+// src/commands/skills-guide.ts
+function shouldGuide(ctx) {
+  const f = ctx.flags;
+  return !ctx.nonInteractive && ctx.io.stdoutIsTTY && !ctx.out.json && f.global !== true && f.agents !== true && f.yes !== true;
+}
+function shownPath(ctx, path) {
+  const under = (base) => {
+    const rel = relative(base, path);
+    return rel === "" || !rel.startsWith("..") && !rel.startsWith(sep) && !/^[a-zA-Z]:/.test(rel) ? rel : null;
+  };
+  const inCwd = under(ctx.io.cwd);
+  if (inCwd !== null) return inCwd ? `./${inCwd.split(sep).join("/")}` : ".";
+  const inHome = under(ctx.io.homedir);
+  if (inHome !== null) return inHome ? `~/${inHome.split(sep).join("/")}` : "~";
+  return path;
+}
+function agentsInUse(ctx) {
+  const bases = [ctx.io.cwd, ctx.io.homedir];
+  const seen = (dir) => bases.some((base) => existsSync4(join6(base, dir)));
+  const claude = seen(".claude") || Boolean(ctx.io.env.CLAUDECODE);
+  const codex = seen(".codex");
+  const cursor = seen(".cursor") || Boolean(ctx.io.env.CURSOR_AGENT);
+  const others = codex || cursor || seen(".agents");
+  if (!claude && !others) return { claude: true, agents: true, names: ["Claude Code", "Codex", "Cursor"] };
+  const names = [];
+  if (claude) names.push("Claude Code");
+  if (codex) names.push("Codex");
+  if (cursor) names.push("Cursor");
+  if (others && !codex && !cursor) names.push("other agents");
+  return { claude, agents: others, names };
+}
+function runningAgent(ctx) {
+  if (ctx.io.env.CLAUDECODE) return "claude";
+  if (ctx.io.env.CURSOR_AGENT) return "cursor";
+  return null;
+}
+function joinNames(names, word = "and") {
+  if (names.length <= 1) return names[0] ?? "";
+  return `${names.slice(0, -1).join(", ")} ${word} ${names[names.length - 1]}`;
+}
+function readable(slug) {
+  const words = slug.replace(/-/g, " ");
+  return words.charAt(0).toUpperCase() + words.slice(1);
+}
+async function guide(ctx, skill, payload) {
+  try {
+    return await ask(ctx, skill, payload);
+  } catch (err) {
+    if (err instanceof PromptCancelled) throw new CliError("cancelled", "Stopped. Nothing was written.", EXIT.cancelled);
+    throw err;
+  }
+}
+async function ask(ctx, skill, payload) {
+  const { io, out } = ctx;
+  const color = out.color;
+  const used = agentsInUse(ctx);
+  const count = payload.type === "archive" ? payload.archive.files.length : 1;
+  const version = skill.version ? `${skill.version.startsWith("v") ? "" : "v"}${skill.version}, ` : "";
+  out.info(`${readable(skill.name)}, by ${readable(skill.publisher)} (${version}${count} file${count === 1 ? "" : "s"}), for ${joinNames(used.names)}.`);
+  let base = io.homedir;
+  if (io.cwd !== io.homedir) {
+    const here = io.cwd.startsWith(io.homedir + sep) ? `~${io.cwd.slice(io.homedir.length).split(sep).join("/")}` : io.cwd;
+    const pick2 = await io.select("Install it in:", [`This project (${here})`, "Every project on this computer"], { initial: 0, color });
+    base = pick2 === 1 ? io.homedir : io.cwd;
+  }
+  const targets = { base, claude: used.claude, agents: used.agents };
+  const plan = planInstall(skillDirs(targets, skill.name), payload);
+  const clashes = plan.filter((p) => p.action === "replaced");
+  if (clashes.length === 0 || ctx.flags.force === true) return { kind: "install", targets, plan, force: true };
+  out.info(
+    [
+      "",
+      `A different copy of ${skill.name} is already at ${joinNames(clashes.map((p) => shownPath(ctx, p.path)))}.`,
+      "Replacing it deletes that copy, with any changes you made to it."
+    ].join("\n")
+  );
+  const pick = await io.select("Keep or replace it?", ["Keep your copy", "Replace it"], { initial: 0, color });
+  return pick === 1 ? { kind: "install", targets, plan, force: true } : { kind: "kept", targets, plan };
+}
+function skillsFolders(ctx, plan) {
+  return joinNames(plan.map((p) => shownPath(ctx, dirname3(p.path.endsWith("SKILL.md") ? dirname3(p.path) : p.path))));
+}
+function nextStep(ctx, targets, seen) {
+  const where = targets.base === ctx.io.homedir ? "in any folder" : "in this folder";
+  const names = seen.map((n) => n === "other agents" ? "other agent" : n);
+  return `Open a new ${joinNames(names, "or")} chat ${where} to use it.`;
+}
+
+// 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);
@@ -9673,6 +9975,13 @@ function whatAmdahlDid(result) {
   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);
 }
+function feedbackLines(ctx, result) {
+  const runId = text(result.run_id);
+  if (!runId) return [];
+  if (!feedbackLinkOn(ctx.io, ctx.config)) return [`Run: ${runId}`];
+  const url = `${consoleUrlFor(ctx.io, ctx.apiUrl)}/admin/optimizer/runs/${encodeURIComponent(runId)}`;
+  return [`Run: ${runId}`, `Feedback: ${url}`];
+}
 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) {
@@ -9745,14 +10054,14 @@ ${nextTimeLine(ctx)}`);
   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"));
+  out.info([...did, ...feedbackLines(ctx, result), 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) return optimizePasted(ctx);
+    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.",
@@ -9767,7 +10076,7 @@ async function optimize(ctx, args) {
   for (const file of files) {
     let message2;
     try {
-      message2 = file === "-" ? await io.readStdin() : readFileSync4(file, "utf8");
+      message2 = file === "-" ? await io.readStdin() : readFileSync5(file, "utf8");
     } catch (err) {
       throw usageError(`Could not read ${file}: ${err instanceof Error ? err.message : String(err)}`);
     }
@@ -9791,292 +10100,14 @@ async function optimize(ctx, args) {
       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"));
+      const lines = [...whatAmdahlDid(result), ...feedbackLines(ctx, result)];
+      if (lines.length) out.info(lines.join("\n"));
     }
   }
   if (out.json) out.result(results.length === 1 ? results[0] : results);
   return exit;
 }
 
-// src/commands/skills-guide.ts
-import { existsSync as existsSync4 } from "fs";
-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 { dirname as dirname2, join as join5 } from "path";
-function skillDirs(targets, name) {
-  const dirs = [];
-  if (targets.claude) dirs.push(join5(targets.base, ".claude", "skills", name));
-  if (targets.agents) dirs.push(join5(targets.base, ".agents", "skills", name));
-  return dirs;
-}
-var message = (err) => err instanceof Error ? err.message : String(err);
-function plainReason(err) {
-  const code = err.code;
-  if (code === "EACCES" || code === "EPERM") return "you do not have permission to write there";
-  if (code === "ENOSPC") return "the disk is full";
-  if (code === "EROFS") return "that disk is read-only";
-  if (code === "ENOTDIR" || code === "EEXIST") return "a file is in the way";
-  return message(err);
-}
-var leftBehind = (written) => written.length > 0 ? `It wrote ${written.join(" and ")} first.` : "Nothing was written.";
-function writeFailure(path, err, written = []) {
-  const code = err.code;
-  const left = leftBehind(written);
-  const fix = code === "EACCES" || code === "EPERM" ? " Run the command from a folder you can write to." : "";
-  return new CliError("write_failed", `Could not write ${path}: ${plainReason(err)}`, EXIT.general, `${left}${fix}`);
-}
-function sameFolder(dir, archive) {
-  let top;
-  try {
-    top = lstatSync2(dir);
-  } catch (err) {
-    if (err.code === "ENOENT") return null;
-    throw writeFailure(dir, err);
-  }
-  if (!top.isDirectory()) return false;
-  const want = new Map(archive.files.map((f) => [f.path, f]));
-  const wantDirs = new Set(archive.dirs);
-  let found = 0;
-  const walk = (rel) => {
-    for (const entry of readdirSync(join5(dir, rel), { withFileTypes: true })) {
-      const path = rel ? `${rel}/${entry.name}` : entry.name;
-      if (++found > want.size + wantDirs.size) return false;
-      if (entry.isDirectory()) {
-        if (!wantDirs.has(path) || !walk(path)) return false;
-      } else if (entry.isFile()) {
-        const file = want.get(path);
-        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;
-      } else {
-        return false;
-      }
-    }
-    return true;
-  };
-  try {
-    return walk("") && found === want.size + wantDirs.size;
-  } catch (err) {
-    throw writeFailure(dir, err);
-  }
-}
-function refuseLinks(dir, file, written = []) {
-  const path = file ?? dir;
-  for (const part of [dirname2(dirname2(dir)), dirname2(dir), dir, ...file ? [file] : []]) {
-    let stat;
-    try {
-      stat = lstatSync2(part);
-    } catch (err) {
-      if (err.code === "ENOENT") return;
-      throw writeFailure(path, err, written);
-    }
-    const why = stat.isSymbolicLink() ? "is a link" : part === file && !stat.isFile() ? "is not a file" : "";
-    if (why) {
-      throw new CliError(
-        "link_in_the_way",
-        `Could not write ${path}: ${part} ${why}.`,
-        EXIT.general,
-        `${leftBehind(written)} Remove it, or install somewhere else.`
-      );
-    }
-  }
-}
-function planInstall(dirs, payload) {
-  return dirs.map((dir) => {
-    if (payload.type === "archive") {
-      refuseLinks(dir);
-      const same = sameFolder(dir, payload.archive);
-      return { path: dir, action: same === null ? "wrote" : same ? "unchanged" : "replaced" };
-    }
-    const path = join5(dir, "SKILL.md");
-    refuseLinks(dir, path);
-    let current;
-    try {
-      current = lstatSync2(path, { throwIfNoEntry: false }) ? readFileSync5(path) : null;
-    } catch (err) {
-      throw writeFailure(path, err);
-    }
-    return { path, action: current === null ? "wrote" : current.equals(payload.body) ? "unchanged" : "replaced" };
-  });
-}
-function refuseClashes(plan, name, force) {
-  const clashes = plan.filter((p) => p.action === "replaced").map((p) => p.path);
-  if (clashes.length > 0 && !force) {
-    throw new CliError(
-      "skill_exists",
-      `A different ${name} skill is already at ${clashes.join(" and ")}.`,
-      EXIT.general,
-      "Nothing was written. Run again with --force to replace it."
-    );
-  }
-}
-function stage(target, name, archive, staged) {
-  const s = { target, temp: "" };
-  staged.push(s);
-  refuseLinks(target);
-  s.createdParent = mkdirSync3(dirname2(target), { recursive: true }) ?? void 0;
-  refuseLinks(target);
-  s.temp = mkdtempSync(join5(dirname2(target), `.${name}.amdahl-tmp-`));
-  chmodSync4(s.temp, 493);
-  for (const dir of archive.dirs) mkdirSync3(join5(s.temp, dir));
-  for (const file of archive.files) writeFileSync3(join5(s.temp, file.path), file.bytes, { flag: "wx", mode: file.mode });
-}
-function rollBack(staged) {
-  for (const s of [...staged].reverse()) {
-    try {
-      if (s.swapped) {
-        rmSync3(s.target, { recursive: true, force: true });
-        if (s.backup) renameSync3(s.backup, s.target);
-      } else if (s.backup) {
-        renameSync3(s.backup, s.target);
-      }
-    } catch {
-    }
-    if (s.temp) rmSync3(s.temp, { recursive: true, force: true });
-    if (s.createdParent) rmSync3(s.createdParent, { recursive: true, force: true });
-  }
-}
-function writeFolders(plan, name, archive) {
-  const staged = [];
-  let current = "";
-  try {
-    for (const p of plan) {
-      if (p.action === "unchanged") continue;
-      current = p.path;
-      stage(p.path, name, archive, staged);
-    }
-    for (const s of staged) {
-      current = s.target;
-      if (plan.find((p) => p.path === s.target)?.action === "replaced") {
-        s.backup = `${s.temp}.old`;
-        renameSync3(s.target, s.backup);
-      }
-      renameSync3(s.temp, s.target);
-      s.swapped = true;
-    }
-  } catch (err) {
-    rollBack(staged);
-    if (err instanceof CliError) throw err;
-    throw writeFailure(current, err);
-  }
-  for (const s of staged) if (s.backup) rmSync3(s.backup, { recursive: true, force: true });
-}
-function writeFiles(plan, body) {
-  const written = [];
-  for (const p of plan) {
-    if (p.action === "unchanged") continue;
-    refuseLinks(dirname2(p.path), p.path, written);
-    const temp = join5(dirname2(p.path), `.SKILL.md.amdahl-tmp-${randomBytes3(6).toString("hex")}`);
-    try {
-      mkdirSync3(dirname2(p.path), { recursive: true });
-      refuseLinks(dirname2(p.path), p.path, written);
-      writeFileSync3(temp, body, { flag: "wx", mode: 420 });
-      renameSync3(temp, p.path);
-    } catch (err) {
-      rmSync3(temp, { force: true });
-      if (err instanceof CliError) throw err;
-      throw writeFailure(p.path, err, written);
-    }
-    written.push(p.path);
-  }
-}
-function writeInstall(io, plan, name, payload) {
-  io.uninterruptible(() => payload.type === "archive" ? writeFolders(plan, name, payload.archive) : writeFiles(plan, payload.body));
-}
-
-// src/commands/skills-guide.ts
-function shouldGuide(ctx) {
-  const f = ctx.flags;
-  return !ctx.nonInteractive && ctx.io.stdoutIsTTY && !ctx.out.json && f.global !== true && f.agents !== true && f.yes !== true;
-}
-function shownPath(ctx, path) {
-  const under = (base) => {
-    const rel = relative(base, path);
-    return rel === "" || !rel.startsWith("..") && !rel.startsWith(sep) && !/^[a-zA-Z]:/.test(rel) ? rel : null;
-  };
-  const inCwd = under(ctx.io.cwd);
-  if (inCwd !== null) return inCwd ? `./${inCwd.split(sep).join("/")}` : ".";
-  const inHome = under(ctx.io.homedir);
-  if (inHome !== null) return inHome ? `~/${inHome.split(sep).join("/")}` : "~";
-  return path;
-}
-function agentsInUse(ctx) {
-  const bases = [ctx.io.cwd, ctx.io.homedir];
-  const seen = (dir) => bases.some((base) => existsSync4(join6(base, dir)));
-  const claude = seen(".claude") || Boolean(ctx.io.env.CLAUDECODE);
-  const codex = seen(".codex");
-  const cursor = seen(".cursor") || Boolean(ctx.io.env.CURSOR_AGENT);
-  const others = codex || cursor || seen(".agents");
-  if (!claude && !others) return { claude: true, agents: true, names: ["Claude Code", "Codex", "Cursor"] };
-  const names = [];
-  if (claude) names.push("Claude Code");
-  if (codex) names.push("Codex");
-  if (cursor) names.push("Cursor");
-  if (others && !codex && !cursor) names.push("other agents");
-  return { claude, agents: others, names };
-}
-function runningAgent(ctx) {
-  if (ctx.io.env.CLAUDECODE) return "claude";
-  if (ctx.io.env.CURSOR_AGENT) return "cursor";
-  return null;
-}
-function joinNames(names, word = "and") {
-  if (names.length <= 1) return names[0] ?? "";
-  return `${names.slice(0, -1).join(", ")} ${word} ${names[names.length - 1]}`;
-}
-function readable(slug) {
-  const words = slug.replace(/-/g, " ");
-  return words.charAt(0).toUpperCase() + words.slice(1);
-}
-async function guide(ctx, skill, payload) {
-  try {
-    return await ask(ctx, skill, payload);
-  } catch (err) {
-    if (err instanceof PromptCancelled) throw new CliError("cancelled", "Stopped. Nothing was written.", EXIT.cancelled);
-    throw err;
-  }
-}
-async function ask(ctx, skill, payload) {
-  const { io, out } = ctx;
-  const color = out.color;
-  const used = agentsInUse(ctx);
-  const count = payload.type === "archive" ? payload.archive.files.length : 1;
-  const version = skill.version ? `${skill.version.startsWith("v") ? "" : "v"}${skill.version}, ` : "";
-  out.info(`${readable(skill.name)}, by ${readable(skill.publisher)} (${version}${count} file${count === 1 ? "" : "s"}), for ${joinNames(used.names)}.`);
-  let base = io.homedir;
-  if (io.cwd !== io.homedir) {
-    const here = io.cwd.startsWith(io.homedir + sep) ? `~${io.cwd.slice(io.homedir.length).split(sep).join("/")}` : io.cwd;
-    const pick2 = await io.select("Install it in:", [`This project (${here})`, "Every project on this computer"], { initial: 0, color });
-    base = pick2 === 1 ? io.homedir : io.cwd;
-  }
-  const targets = { base, claude: used.claude, agents: used.agents };
-  const plan = planInstall(skillDirs(targets, skill.name), payload);
-  const clashes = plan.filter((p) => p.action === "replaced");
-  if (clashes.length === 0 || ctx.flags.force === true) return { kind: "install", targets, plan, force: true };
-  out.info(
-    [
-      "",
-      `A different copy of ${skill.name} is already at ${joinNames(clashes.map((p) => shownPath(ctx, p.path)))}.`,
-      "Replacing it deletes that copy, with any changes you made to it."
-    ].join("\n")
-  );
-  const pick = await io.select("Keep or replace it?", ["Keep your copy", "Replace it"], { initial: 0, color });
-  return pick === 1 ? { kind: "install", targets, plan, force: true } : { kind: "kept", targets, plan };
-}
-function skillsFolders(ctx, plan) {
-  return joinNames(plan.map((p) => shownPath(ctx, dirname3(p.path.endsWith("SKILL.md") ? dirname3(p.path) : p.path))));
-}
-function nextStep(ctx, targets, seen) {
-  const where = targets.base === ctx.io.homedir ? "in any folder" : "in this folder";
-  const names = seen.map((n) => n === "other agents" ? "other agent" : n);
-  return `Open a new ${joinNames(names, "or")} chat ${where} to use it.`;
-}
-
 // src/commands/setup.ts
 var SHOWN = [
   { client: "claude-code", name: "Claude Code" },
@@ -10179,12 +10210,6 @@ function finishLines(names, inClaudeCode = false) {
   };
   return [`Try it: ${AGENT_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;
-}
 function setupMode(io) {
   const { env } = io;
   const ci = ciVariable(env);
@@ -10256,7 +10281,7 @@ 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 (!await onPath(ctx, "codex")) {
+  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 ?? ""}`);
@@ -10310,13 +10335,15 @@ ${installLine()}
   if (detected.length > 0) {
     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 { ready } = await installEach(ctx, [tool]);
-        for (const r of ready) detail(r.detail);
+        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 EXIT.ok;
+      return exit2;
     }
   }
   const rows = [...SHOWN.map((c) => c.name), TERMINAL];
@@ -11002,9 +11029,6 @@ async function workspaceUse(ctx, args) {
   return EXIT.ok;
 }
 
-// src/version.ts
-var VERSION = "0.3.5";
-
 // src/main.ts
 var COMMANDS = {
   login: (ctx) => login(ctx),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amdahl/cli",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "type": "module",
   "description": "The amdahl command line: sign in, check setup, optimize messages, manage API keys, connect MCP clients.",
   "license": "Apache-2.0",