@mnemom/mnemom 0.17.0-next.6 → 0.17.0-next.8

package/dist/commands/{code.js → agent.js}

@@ -1,5 +1,5 @@
 /**
- * `mnemom code <scenario>` — the CLI's first-class governed-coding-agent launcher.
+ * `mnemom agent <scenario>` — the CLI's first-class governed-coding-agent launcher.
  *
  * Launches your coding-agent CLI (Claude Code in v1) with its dev-time model
  * traffic routed through the Mnemom gateway's /anthropic door for observability +
@@ -11,7 +11,7 @@
  *     no router door / Mnemom key). `--cli` selects the executable to run (name or
  *     full path) so codex/cursor/github adapters can be added later.
  *   - The us-2/PROD gateway is the DEFAULT door (https://gateway.mnemom.ai); an
- *     explicit MNEMOM_CODE_GATEWAY / --gateway still wins, never silently prod.
+ *     explicit MNEMOM_AGENT_GATEWAY / --gateway still wins, never silently prod.
  *   - Three launch shapes: `terminal` (DEFAULT), `remote-control` (interactive RC
  *     in this terminal), `server` (headless RC dispatcher). RC runs the CLI
  *     UNTOUCHED behind a bundled local TLS proxy (rc-proxy.mjs) — Claude Code
@@ -20,7 +20,7 @@
  *   - yolo (`--dangerously-skip-permissions`) is ON by default; `--no-yolo` opts out.
  *
  * The Anthropic key is resolved from a credential source with ZERO 1Password
- * dependency (env → the CLI's own ~/.mnemom/code.json store → interactive
+ * dependency (env → the CLI's own ~/.mnemom/launcher.json store → interactive
  * prompt) and placed ONLY in the launched process (an `ANTHROPIC_CUSTOM_HEADERS`
  * line, or the proxy's stdin under RC). It is never logged, printed, or passed as
  * an argv value.
@@ -31,31 +31,41 @@ import { tmpdir, homedir } from "node:os";
 import { basename, join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { MNEMOM_DIR } from "../lib/config.js";
-import { configKeySpec, loadCodeConfig, writeCodeConfig } from "../lib/code-config.js";
+import { configKeySpec, loadLauncherConfig, writeLauncherConfig } from "../lib/launcher-config.js";
 import { fmt } from "../lib/format.js";
-import { askInput, askYesNo, isInteractive } from "../lib/prompt.js";
-import { goalAlignmentLine, resolveSessionSetup } from "./code-session.js";
-import { defaultAgentSlug, ensureGovernedAgent, ensureSessionAndBalance, isQuietPreambleExit, resolveDefaultSlug, } from "./code-setup.js";
-import { assembleContract, buildCustomHeaders, isProdGateway, launchPreferenceExplicit, resolveAnthropicDoor, resolveConversationId, resolveGatewayHost, resolveLaunchShape, sanitizeAgentName, } from "../lib/code.js";
-/** The CLI's own provider-key store (zero 1Password): ~/.mnemom/code.json, 0600. */
-const CODE_STORE = join(MNEMOM_DIR, "code.json");
+import { askInput, askSelect, askYesNo, isInteractive } from "../lib/prompt.js";
+import { goalAlignmentLine, resolveSessionSetup } from "./agent-session.js";
+import { defaultAgentSlug, ensureGovernedAgent, ensureSessionAndBalance, isQuietPreambleExit, resolveDefaultSlug, } from "./agent-setup.js";
+import { assembleContract, buildGoalModeHeader, buildCustomHeaders, isProdGateway, launchPreferenceExplicit, resolveAnthropicDoor, resolveConversationId, resolveGatewayHost, resolveLaunchShape, sanitizeAgentName, } from "../lib/agent.js";
+/** The CLI's own provider-key store (zero 1Password): ~/.mnemom/launcher.json, 0600. */
+const CODE_STORE = join(MNEMOM_DIR, "launcher.json");
 const say = (line = "") => console.error(line);
-/** Entry point for `mnemom code [scenario]`. Throws on fatal misconfig. */
-export async function codeCommand(scenarioArg, options = {}) {
-    // ── session name + goal ── (a bare `mnemom code` in a terminal asks for both,
-    // explaining goal alignment; no goal ⇒ no contract header ⇒ goal alignment off)
-    const session = await resolveSessionSetup({ scenario: scenarioArg, goal: options.goal, interactive: isInteractive() }, { askInput: (q) => askInput(q), askYesNo: (q, d) => askYesNo(q, d) });
+/** Entry point for `mnemom agent [scenario]`. Throws on fatal misconfig. */
+export async function agentCommand(scenarioArg, options = {}) {
+    // ── session name + goal ── (a bare `mnemom agent` in a terminal asks for both,
+    // explaining goal alignment: infer it from your messages (implicit), type a
+    // one-line goal (sealed), or off — no contract header and no mode header)
+    const session = await resolveSessionSetup({
+        scenario: scenarioArg,
+        goal: options.goal,
+        implicit: options.implicit,
+        interactive: isInteractive(),
+    }, {
+        askInput: (q) => askInput(q),
+        askYesNo: (q, d) => askYesNo(q, d),
+        askSelect: (q, o) => askSelect(q, o),
+    });
     const scenario = session.scenario;
     const env = process.env;
     let shape = resolveLaunchShape({ remoteControl: options.remoteControl, server: options.server }, env);
     const shapeExplicit = launchPreferenceExplicit({ remoteControl: options.remoteControl, server: options.server }, env);
-    // ── governed identity ── (default: per-customer `code-<handle>`, not a shared
+    // ── governed identity ── (default: per-customer `agent-<handle>`, not a shared
     // "code-agent" — see defaultAgentSlug; provisioning claims exactly this slug.
     // `let` because a brand-new user who signs in during the pre-launch gate below
     // gets their real handle re-derived once the session exists.)
     let agent = sanitizeAgentName(options.agent?.trim() || defaultAgentSlug());
     if (!agent) {
-        throw new Error("mnemom code: --agent sanitised to an empty string — pick a value with at least one letter or digit.");
+        throw new Error("mnemom agent: --agent sanitised to an empty string — pick a value with at least one letter or digit.");
     }
     const conversationId = resolveConversationId(options.conversationId);
     // ── contract (built only if a contract flag was given; --goal then required) ──
@@ -68,6 +78,15 @@ export async function codeCommand(scenarioArg, options = {}) {
         budget: options.budget,
         maxTurns: options.maxTurns,
         stall: options.stall,
+        implicit: options.implicit,
+    });
+    // ── implicit goal mode (no contract; the gateway infers the goal from the user's
+    // messages) — the guardrail ceilings ride on the mode header instead ──
+    const goalMode = buildGoalModeHeader({
+        implicit: options.implicit,
+        budget: options.budget,
+        maxTurns: options.maxTurns,
+        stall: options.stall,
     });
     // ── door ──
     const gatewayHost = resolveGatewayHost(env);
@@ -98,16 +117,16 @@ export async function codeCommand(scenarioArg, options = {}) {
             shape = "remote-control";
         }
         else {
-            say(`mnemom code: launching terminal-only (Remote Control unavailable: ${rc.missing.join("; ")}).`);
-            say("mnemom code: once those are in place, `mnemom code <scenario> --remote-control` (or `config set launch remote-control`) gives you a session steerable from claude.ai and the Claude app too.");
+            say(`mnemom agent: launching terminal-only (Remote Control unavailable: ${rc.missing.join("; ")}).`);
+            say("mnemom agent: once those are in place, `mnemom agent <scenario> --remote-control` (or `config set launch remote-control`) gives you a session steerable from claude.ai and the Claude app too.");
         }
     };
     if (cli)
         applyAutoShape(cli);
     if (options.dryRun) {
         const planCli = cli ?? {
-            bin: "(not found — pass --cli <path> or `mnemom code config set cli <path>`)",
-            name: basename((options.cli || env.MNEMOM_CODE_CLI || "claude").trim()),
+            bin: "(not found — pass --cli <path> or `mnemom agent config set cli <path>`)",
+            name: basename((options.cli || env.MNEMOM_AGENT_CLI || "claude").trim()),
         };
         printPlan({
             scenario,
@@ -117,6 +136,7 @@ export async function codeCommand(scenarioArg, options = {}) {
             door,
             cellNote,
             envelope,
+            goalMode,
             yolo,
             cli: planCli,
         });
@@ -135,7 +155,7 @@ export async function codeCommand(scenarioArg, options = {}) {
         keySource: options.keySource,
     });
     // ── account + µ-balance gate (no free tier) ─────────────────────────────────
-    // mnemom code runs governed and on µ, so before we seal a contract or launch we
+    // mnemom agent runs governed and on µ, so before we seal a contract or launch we
     // (1) ensure a Mnemom session — offering the try-me-style sign-in / sign-up when
     // there isn't one — and (2) enforce a positive µ balance on the org the agent
     // lives in (default: the user's personal org). No µ ⇒ blocked with a
@@ -150,7 +170,7 @@ export async function codeCommand(scenarioArg, options = {}) {
     }
     // Now that a session exists, a defaulted slug uses the real login handle from
     // /v1/auth/me (the stored token has no email, so the pre-sign-in value was the
-    // "code-user" fallback). Only when the caller didn't name an agent.
+    // "agent-user" fallback). Only when the caller didn't name an agent.
     if (!options.agent?.trim()) {
         const refreshed = sanitizeAgentName(await resolveDefaultSlug());
         if (refreshed)
@@ -172,11 +192,11 @@ export async function codeCommand(scenarioArg, options = {}) {
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
-            say(fmt.warn(`mnemom code: agent setup did not complete (${msg}) — launching with the unclaimed identity.`));
+            say(fmt.warn(`mnemom agent: agent setup did not complete (${msg}) — launching with the unclaimed identity.`));
         }
     }
-    logLaunch({ shape, door, agent, conversationId, cellNote, envelope, cli });
-    say(goalAlignmentLine(envelope !== null));
+    logLaunch({ shape, door, agent, conversationId, cellNote, envelope, goalMode, cli });
+    say(goalAlignmentLine(goalAlignmentMode(envelope, goalMode)));
     if (shape === "terminal") {
         launchTerminal({
             cli,
@@ -185,6 +205,7 @@ export async function codeCommand(scenarioArg, options = {}) {
             agent,
             conversationId,
             envelope,
+            goalMode,
             options,
             yolo,
             contextHint,
@@ -200,6 +221,7 @@ export async function codeCommand(scenarioArg, options = {}) {
         conversationId,
         scenario,
         envelope,
+        goalMode,
         options,
         yolo,
     });
@@ -210,8 +232,8 @@ export async function codeCommand(scenarioArg, options = {}) {
 /**
  * Resolve the Anthropic key with NO 1Password dependency (built for external
  * customer adoption), in order:
- *   1. env: MNEMOM_CODE_ANTHROPIC_KEY, else ANTHROPIC_API_KEY
- *   2. the CLI's own store: ~/.mnemom/code.json (`anthropic_key`)
+ *   1. env: MNEMOM_AGENT_ANTHROPIC_KEY, else ANTHROPIC_API_KEY
+ *   2. the CLI's own store: ~/.mnemom/launcher.json (`anthropic_key`)
  *   3. interactive prompt (masked), offering to save it to the store
  * Never logged / printed. Throws with guidance when nothing resolves — we refuse
  * to launch un-routed.
@@ -220,42 +242,48 @@ export async function resolveAnthropicKey(env, opts) {
     const source = opts.keySource;
     // "prompt" forces the interactive prompt (skips env + store).
     if (source !== "prompt") {
-        const fromEnv = (env.MNEMOM_CODE_ANTHROPIC_KEY || env.ANTHROPIC_API_KEY || "").trim();
+        const fromEnv = stripCrlf(env.MNEMOM_AGENT_ANTHROPIC_KEY || env.ANTHROPIC_API_KEY || "");
         if (fromEnv)
             return fromEnv;
         // "env" restricts to env only — no store, no prompt.
         if (source === "env") {
-            throw new Error("mnemom code: key_source is 'env' but no Anthropic key is set.\n" +
-                "  Set one:   export MNEMOM_CODE_ANTHROPIC_KEY=sk-ant-...   (or ANTHROPIC_API_KEY)");
+            throw new Error("mnemom agent: key_source is 'env' but no Anthropic key is set.\n" +
+                "  Set one:   export MNEMOM_AGENT_ANTHROPIC_KEY=sk-ant-...   (or ANTHROPIC_API_KEY)");
         }
         const stored = readStoredKey();
         if (stored)
             return stored;
+        // "store" restricts to env → store — never the interactive prompt.
+        if (source === "store") {
+            throw new Error("mnemom agent: key_source is 'store' but no Anthropic key is set in env or ~/.mnemom/launcher.json.\n" +
+                "  Set one:   export MNEMOM_AGENT_ANTHROPIC_KEY=sk-ant-...   (or ANTHROPIC_API_KEY)\n" +
+                "  Or store it: `mnemom agent config set key_source prompt`, run `mnemom agent` once and accept the save.");
+        }
     }
-    // (source can only be "store", "prompt", or undefined here — "env" threw above.)
+    // (source can only be "prompt" or undefined here — "env" and "store" threw above.)
     if (opts.allowPrompt && isInteractive()) {
-        say("mnemom code: no Anthropic key in env (MNEMOM_CODE_ANTHROPIC_KEY / ANTHROPIC_API_KEY) or ~/.mnemom/code.json.");
-        const entered = (await askInput("Enter your Anthropic API key (sk-ant-…):", true)).trim();
+        say("mnemom agent: no Anthropic key in env (MNEMOM_AGENT_ANTHROPIC_KEY / ANTHROPIC_API_KEY) or ~/.mnemom/launcher.json.");
+        const entered = stripCrlf(await askInput("Enter your Anthropic API key (sk-ant-…):", true));
         if (entered) {
-            if (await askYesNo("Save it to ~/.mnemom/code.json (0600) for next time?", true)) {
+            if (await askYesNo("Save it to ~/.mnemom/launcher.json (0600) for next time?", true)) {
                 storeKey(entered);
-                say("mnemom code: saved to ~/.mnemom/code.json.");
+                say("mnemom agent: saved to ~/.mnemom/launcher.json.");
             }
             return entered;
         }
     }
-    throw new Error("mnemom code: no Anthropic key found — refusing to launch un-routed.\n" +
-        "  Set one:   export MNEMOM_CODE_ANTHROPIC_KEY=sk-ant-...   (or ANTHROPIC_API_KEY)\n" +
-        "  Or save it: run `mnemom code` interactively and accept the save prompt\n" +
-        "  (stored 0600 at ~/.mnemom/code.json).");
+    throw new Error("mnemom agent: no Anthropic key found — refusing to launch un-routed.\n" +
+        "  Set one:   export MNEMOM_AGENT_ANTHROPIC_KEY=sk-ant-...   (or ANTHROPIC_API_KEY)\n" +
+        "  Or save it: run `mnemom agent` interactively and accept the save prompt\n" +
+        "  (stored 0600 at ~/.mnemom/launcher.json).");
 }
 /**
  * Where an Anthropic key would resolve from RIGHT NOW, without reading its value:
- * "env" (MNEMOM_CODE_ANTHROPIC_KEY / ANTHROPIC_API_KEY), "store" (~/.mnemom/code.json),
- * or null (would fall to the interactive prompt). For `mnemom code doctor`.
+ * "env" (MNEMOM_AGENT_ANTHROPIC_KEY / ANTHROPIC_API_KEY), "store" (~/.mnemom/launcher.json),
+ * or null (would fall to the interactive prompt). For `mnemom agent doctor`.
  */
 export function anthropicKeySource(env = process.env) {
-    if ((env.MNEMOM_CODE_ANTHROPIC_KEY || env.ANTHROPIC_API_KEY || "").trim())
+    if ((env.MNEMOM_AGENT_ANTHROPIC_KEY || env.ANTHROPIC_API_KEY || "").trim())
         return "env";
     if (readStoredKey())
         return "store";
@@ -265,14 +293,14 @@ export function anthropicKeySource(env = process.env) {
 function readStoredKey() {
     try {
         const data = JSON.parse(readFileSync(CODE_STORE, "utf8"));
-        const key = typeof data.anthropic_key === "string" ? data.anthropic_key.trim() : "";
+        const key = typeof data.anthropic_key === "string" ? stripCrlf(data.anthropic_key) : "";
         return key || undefined;
     }
     catch {
         return undefined;
     }
 }
-/** Persist the provider key to ~/.mnemom/code.json at 0600 (atomic). Best-effort. */
+/** Persist the provider key to ~/.mnemom/launcher.json at 0600 (atomic). Best-effort. */
 function storeKey(key) {
     try {
         mkdirSync(MNEMOM_DIR, { recursive: true });
@@ -285,7 +313,7 @@ function storeKey(key) {
     }
 }
 /**
- * Resolve which coding-agent CLI to launch. `--cli` (or MNEMOM_CODE_CLI) is a
+ * Resolve which coding-agent CLI to launch. `--cli` (or MNEMOM_AGENT_CLI) is a
  * name or a full path; default "claude". A value with a path separator is used
  * verbatim (must exist); a bare name is resolved on PATH, then — for claude — the
  * fnm/nvm/asdf install dirs (a version-manager shim / shell function is absent in
@@ -293,12 +321,12 @@ function storeKey(key) {
  * a non-claude executable is launched through it with a warning.
  */
 export function resolveCliBin(cliOpt, env) {
-    const requested = (cliOpt || env.MNEMOM_CODE_CLI || "claude").trim();
+    const requested = (cliOpt || env.MNEMOM_AGENT_CLI || "claude").trim();
     const name = basename(requested);
     if (requested.includes("/")) {
         if (existsSync(requested))
             return { bin: requested, name };
-        throw new Error(`mnemom code: --cli path '${requested}' not found.`);
+        throw new Error(`mnemom agent: --cli path '${requested}' not found.`);
     }
     for (const dir of (env.PATH || "").split(":")) {
         // Skip ephemeral cmux CLI shims: they only work inside a cmux session and,
@@ -334,10 +362,10 @@ export function resolveCliBin(cliOpt, env) {
             }
         }
     }
-    throw new Error(`mnemom code: coding-agent CLI '${requested}' not found.\n` +
+    throw new Error(`mnemom agent: coding-agent CLI '${requested}' not found.\n` +
         "  Looked on $PATH" +
         (name === "claude" ? " and in the fnm/nvm/asdf node dirs" : "") +
-        ".\n  Pass --cli <name|/full/path> or set MNEMOM_CODE_CLI.");
+        ".\n  Pass --cli <name|/full/path> or set MNEMOM_AGENT_CLI.");
 }
 export /**
  * Recover when the coding-agent CLI can't be found — a good experience beats a
@@ -346,11 +374,11 @@ export /**
  * so they never retype it). A non-interactive session re-throws the clear,
  * actionable error rather than hanging on a prompt.
  */ async function promptForCliPath(cliOpt, env, origErr) {
-    const requested = (cliOpt || env.MNEMOM_CODE_CLI || "claude").trim();
+    const requested = (cliOpt || env.MNEMOM_AGENT_CLI || "claude").trim();
     if (!isInteractive()) {
-        throw origErr ?? new Error(`mnemom code: coding-agent CLI '${requested}' not found.`);
+        throw origErr ?? new Error(`mnemom agent: coding-agent CLI '${requested}' not found.`);
     }
-    say(`mnemom code: couldn't find the '${requested}' CLI on your PATH.`);
+    say(`mnemom agent: couldn't find the '${requested}' CLI on your PATH.`);
     if (requested === "claude") {
         say("  If Claude Code is installed, paste its full path (find it with: which claude).");
         say("  Not installed yet? Get it at https://claude.com/claude-code, then re-run.");
@@ -361,9 +389,9 @@ export /**
     for (let attempt = 0; attempt < 3; attempt++) {
         const entered = (await askInput("Path to your coding-agent CLI (Enter to cancel):")).trim();
         if (!entered) {
-            throw new Error("mnemom code: no coding-agent CLI available.\n" +
+            throw new Error("mnemom agent: no coding-agent CLI available.\n" +
                 "  Install Claude Code (https://claude.com/claude-code), or pass --cli <path> " +
-                "(or save it: mnemom code config set cli <path>).");
+                "(or save it: mnemom agent config set cli <path>).");
         }
         if (!existsSync(entered)) {
             say(`  '${entered}' doesn't exist — try again.`);
@@ -371,9 +399,9 @@ export /**
         }
         if (await askYesNo("Save this as your default CLI so you don't retype it?", true)) {
             try {
-                const cfg = loadCodeConfig();
+                const cfg = loadLauncherConfig();
                 configKeySpec("cli").set(cfg, entered);
-                writeCodeConfig(cfg);
+                writeLauncherConfig(cfg);
                 say("  Saved — future launches will use it.");
             }
             catch {
@@ -382,7 +410,7 @@ export /**
         }
         return { bin: entered, name: basename(entered) };
     }
-    throw new Error("mnemom code: couldn't resolve a coding-agent CLI path — pass --cli <path>.");
+    throw new Error("mnemom agent: couldn't resolve a coding-agent CLI path — pass --cli <path>.");
 }
 function commandExists(cmd) {
     const res = spawnSync("sh", ["-c", `command -v "$1" >/dev/null 2>&1`, "sh", cmd], {
@@ -408,7 +436,7 @@ export function cliSupportsRemoteControl(bin) {
 /**
  * Can we launch the DEFAULT Remote-Control-in-terminal shape on this machine?
  * Needs node + openssl (the local proxy mints an ephemeral CA) and a claude
- * adapter that advertises `--remote-control`. Used both by `mnemom code doctor`
+ * adapter that advertises `--remote-control`. Used both by `mnemom agent doctor`
  * and by the auto-default selection (a bare launch prefers RC when capable).
  */
 export function checkRcCapability(cli) {
@@ -429,7 +457,7 @@ export function checkRcCapability(cli) {
 /** Warn once when a non-claude executable rides the v1 Claude Code adapter. */
 function warnAdapter(cli) {
     if (cli.name !== "claude") {
-        say(`mnemom code: only the Claude Code adapter is wired in v1 — launching '${cli.name}' with the Anthropic gateway env. codex/cursor/github adapters are coming.`);
+        say(`mnemom agent: only the Claude Code adapter is wired in v1 — launching '${cli.name}' with the Anthropic gateway env. codex/cursor/github adapters are coming.`);
     }
 }
 // ───────────────────────────────────────────────────────────────────────────
@@ -442,6 +470,7 @@ function launchTerminal(ctx) {
         agent: ctx.agent,
         conversationId: ctx.conversationId,
         contractB64: ctx.envelope?.base64,
+        goalMode: ctx.goalMode ?? undefined,
     });
     const args = buildCliArgs(ctx.options, { yolo: ctx.yolo, allowCliFlags: true });
     // Claude Code logged in via claude.ai (OAuth) PREEMPTS ANTHROPIC_API_KEY, so
@@ -459,7 +488,7 @@ function launchTerminal(ctx) {
     }
     const child = spawn(ctx.cli.bin, args, { stdio: "inherit", env: childEnv });
     child.on("error", (err) => {
-        say(`mnemom code: failed to launch ${ctx.cli.name}: ${err.message}`);
+        say(`mnemom agent: failed to launch ${ctx.cli.name}: ${err.message}`);
         process.exit(1);
     });
     child.on("exit", (code, signal) => {
@@ -476,21 +505,22 @@ function launchRemoteControl(ctx) {
     warnAdapter(ctx.cli);
     for (const tool of ["node", "openssl"]) {
         if (!commandExists(tool)) {
-            throw new Error(`mnemom code: --remote-control needs '${tool}' on PATH (the local proxy is a Node script that mints an ephemeral CA with openssl).`);
+            throw new Error(`mnemom agent: --remote-control needs '${tool}' on PATH (the local proxy is a Node script that mints an ephemeral CA with openssl).`);
         }
     }
     const proxyScript = resolveProxyScript();
     const rcDir = mkdtempSync(join(tmpdir(), "mnemom-code-rc."));
-    const proxyLog = process.env.MNEMOM_CODE_RC_PROXY_LOG || join(rcDir, "proxy.log");
+    const proxyLog = process.env.MNEMOM_AGENT_RC_PROXY_LOG || join(rcDir, "proxy.log");
     const proxy = spawn("node", [proxyScript], {
         env: {
             ...process.env,
-            MNEMOM_CODE_RC_DOOR: ctx.door,
-            MNEMOM_CODE_RC_AGENT: ctx.agent,
-            MNEMOM_CODE_RC_CONVERSATION_ID: ctx.conversationId,
-            MNEMOM_CODE_RC_CONTRACT_B64: ctx.envelope?.base64 ?? "",
-            MNEMOM_CODE_RC_PROXY_LOG: proxyLog,
-            MNEMOM_CODE_RC_PARENT_PID: String(process.pid),
+            MNEMOM_AGENT_RC_DOOR: ctx.door,
+            MNEMOM_AGENT_RC_AGENT: ctx.agent,
+            MNEMOM_AGENT_RC_CONVERSATION_ID: ctx.conversationId,
+            MNEMOM_AGENT_RC_CONTRACT_B64: ctx.envelope?.base64 ?? "",
+            MNEMOM_AGENT_RC_GOAL_MODE: ctx.goalMode ?? "",
+            MNEMOM_AGENT_RC_PROXY_LOG: proxyLog,
+            MNEMOM_AGENT_RC_PARENT_PID: String(process.pid),
         },
         stdio: ["pipe", "pipe", "inherit"],
     });
@@ -526,7 +556,7 @@ function launchRemoteControl(ctx) {
             const port = m[1];
             const ca = m[2].trim();
             if (!existsSync(ca)) {
-                say("mnemom code: malformed READY line from the Remote Control proxy.");
+                say("mnemom agent: malformed READY line from the Remote Control proxy.");
                 onExit();
                 process.exit(1);
             }
@@ -534,13 +564,13 @@ function launchRemoteControl(ctx) {
             return;
         }
         if (proxy.exitCode !== null) {
-            say("mnemom code: the Remote Control proxy exited before it was ready — refusing to launch un-routed.");
+            say("mnemom agent: the Remote Control proxy exited before it was ready — refusing to launch un-routed.");
             redactedProxyLog(proxyLog);
             onExit();
             process.exit(1);
         }
         if (Date.now() - start > 15_000) {
-            say("mnemom code: the Remote Control proxy did not report READY within 15s.");
+            say("mnemom agent: the Remote Control proxy did not report READY within 15s.");
             onExit();
             process.exit(1);
         }
@@ -550,7 +580,7 @@ function launchRemoteControl(ctx) {
         stdoutBuf += chunk.toString("utf8");
     });
     proxy.on("error", (err) => {
-        say(`mnemom code: failed to launch the Remote Control proxy: ${err.message}`);
+        say(`mnemom agent: failed to launch the Remote Control proxy: ${err.message}`);
         onExit();
         process.exit(1);
     });
@@ -602,7 +632,7 @@ function spawnRcCli(ctx) {
         if (ctx.options.model)
             childEnv.ANTHROPIC_MODEL = ctx.options.model;
         args = ["remote-control", "--name", rcName, ...passthrough];
-        say(`mnemom code: remote-control: headless server (session name '${rcName}'); drive the sessions it spawns from claude.ai/code or the Claude app. Stop this command to stop the server.`);
+        say(`mnemom agent: remote-control: headless server (session name '${rcName}'); drive the sessions it spawns from claude.ai/code or the Claude app. Stop this command to stop the server.`);
     }
     else {
         // Interactive RC in THIS terminal: the CLI's own `--remote-control <name>`
@@ -610,11 +640,11 @@ function spawnRcCli(ctx) {
         // buildCliArgs already includes the (name-stripped) passthrough.
         const flagArgs = buildCliArgs(scopedOptions, { yolo: ctx.yolo, allowCliFlags: true });
         args = ["--remote-control", rcName, ...flagArgs];
-        say(`mnemom code: remote-control: interactive session in THIS terminal with Remote Control on (session name '${rcName}'); it also appears under Remote Control at claude.ai/code and in the Claude app. Exit the CLI to stop everything.`);
+        say(`mnemom agent: remote-control: interactive session in THIS terminal with Remote Control on (session name '${rcName}'); it also appears under Remote Control at claude.ai/code and in the Claude app. Exit the CLI to stop everything.`);
     }
     const child = spawn(ctx.cli.bin, args, { stdio: "inherit", env: childEnv });
     child.on("error", (err) => {
-        say(`mnemom code: failed to launch ${ctx.cli.name} under Remote Control: ${err.message}`);
+        say(`mnemom agent: failed to launch ${ctx.cli.name} under Remote Control: ${err.message}`);
         ctx.onExit();
         process.exit(1);
     });
@@ -628,20 +658,20 @@ function spawnRcCli(ctx) {
 }
 function warnServerDrops(options, yolo) {
     if (options.effort) {
-        say("mnemom code: --effort is not applied under --server (set it from the session instead).");
+        say("mnemom agent: --effort is not applied under --server (set it from the session instead).");
     }
     if (options.trimMcp) {
-        say("mnemom code: --trim-mcp is not applied under --server (sessions load the full MCP set).");
+        say("mnemom agent: --trim-mcp is not applied under --server (sessions load the full MCP set).");
     }
     if (yolo) {
-        say("mnemom code: yolo (--dangerously-skip-permissions) is not applied under --server; set permissions from the driven sessions.");
+        say("mnemom agent: yolo (--dangerously-skip-permissions) is not applied under --server; set permissions from the driven sessions.");
     }
 }
 function resolveProxyScript() {
     const here = dirname(fileURLToPath(import.meta.url));
     const cand = join(here, "..", "rc-proxy.mjs");
     if (!existsSync(cand)) {
-        throw new Error(`mnemom code: the Remote Control proxy is missing (expected ${cand}). Reinstall the CLI.`);
+        throw new Error(`mnemom agent: the Remote Control proxy is missing (expected ${cand}). Reinstall the CLI.`);
     }
     return cand;
 }
@@ -720,16 +750,32 @@ function seedContextHintFlag(childEnv) {
 // ───────────────────────────────────────────────────────────────────────────
 // Human-facing logging (never prints the key)
 // ───────────────────────────────────────────────────────────────────────────
-function logLaunch(ctx) {
-    say(`mnemom code: routing ${ctx.cli.name} through ${ctx.door} [${ctx.cellNote}] as '${ctx.agent}' (conversation ${ctx.conversationId}).`);
+/**
+ * Which goal-alignment mode the launch status line names: a sealed contract →
+ * "on"; `--implicit` (mode header, no contract) → "implicit"; neither → "off".
+ * A sealed contract and a mode header never coexist (`assembleContract` refuses
+ * the combination), so the first arm winning is not a precedence choice.
+ */
+export function goalAlignmentMode(envelope, goalMode) {
+    if (envelope)
+        return "on";
+    if (goalMode)
+        return "implicit";
+    return "off";
+}
+export function logLaunch(ctx) {
+    say(`mnemom agent: routing ${ctx.cli.name} through ${ctx.door} [${ctx.cellNote}] as '${ctx.agent}' (conversation ${ctx.conversationId}).`);
     if (ctx.envelope) {
-        say(`mnemom code: contract statement: ${ctx.envelope.contract.statement}`);
-        say(`mnemom code: contract sha256[0:16]: ${ctx.envelope.sha}`);
+        say(`mnemom agent: contract statement: ${ctx.envelope.contract.statement}`);
+        say(`mnemom agent: contract sha256[0:16]: ${ctx.envelope.sha}`);
+    }
+    else if (ctx.goalMode) {
+        say(`mnemom agent: goal mode: ${ctx.goalMode} (inferred from your messages; watch x-mnemom-goal-revision / x-mnemom-goal-steer on each response)`);
     }
 }
-function printPlan(ctx) {
+export function printPlan(ctx) {
     const L = [];
-    L.push("mnemom code — launch plan (dry run)");
+    L.push("mnemom agent — launch plan (dry run)");
     L.push(`  scenario:      ${ctx.scenario}`);
     L.push(`  cli:           ${ctx.cli.name} (${ctx.cli.bin})`);
     L.push(`  shape:         ${ctx.shape}`);
@@ -741,6 +787,10 @@ function printPlan(ctx) {
         L.push(`  contract:      ${ctx.envelope.canonical}`);
         L.push(`  contract sha:  ${ctx.envelope.sha}`);
     }
+    else if (ctx.goalMode) {
+        L.push("  contract:      (none — implicit goal mode: the gateway infers the goal from your messages)");
+        L.push(`  goal mode:     ${ctx.goalMode}`);
+    }
     else {
         L.push("  contract:      (none — no contract flag given)");
     }
@@ -748,3 +798,11 @@ function printPlan(ctx) {
     L.push("  Dry run — no key was read and nothing was launched.");
     process.stdout.write(`${L.join("\n")}\n`);
 }
+/**
+ * Header-value hygiene for the Anthropic key: the key is spliced into the newline-joined
+ * ANTHROPIC_CUSTOM_HEADERS block (`x-api-key: <key>`), so an embedded CR/LF from a multi-line
+ * paste would inject extra header lines. Same rule resolveConversationId applies to its input.
+ */
+function stripCrlf(raw) {
+    return raw.replace(/[\r\n]+/g, "").trim();
+}

package/dist/commands/agents.d.ts

@@ -26,7 +26,7 @@ export interface AgentsClaimOptions {
  */
 export declare function deriveHashProof(apiKey: string, agentName?: string): string;
 /**
- * `mnemom agents claim <id-or-name> [--org <slug>] (--key <k> | --hash-proof <h>)`
+ * `mnemom agent claim <id-or-name> [--org <slug>] (--key <k> | --hash-proof <h>)`
  *
  * Claims an agent into an org (ADR-062). Possession of the agent's key (via
  * `--key`, from which the CLI derives the proof) or a pre-computed
@@ -42,7 +42,7 @@ export interface AgentsMoveOptions {
     json?: boolean;
 }
 /**
- * `mnemom agents move <id-or-name> --to <slug|id>`
+ * `mnemom agent move <id-or-name> --to <slug|id>`
  *
  * Role-based relocation between orgs (the counterpart to re-claim, which is
  * possession-based). The server requires the caller to be an owner/admin of

package/dist/commands/agents.js

@@ -121,7 +121,7 @@ function extractClaimableOrgs(details) {
     return list.filter((o) => !!o && typeof o === "object" && typeof o.org_id === "string");
 }
 /**
- * `mnemom agents claim <id-or-name> [--org <slug>] (--key <k> | --hash-proof <h>)`
+ * `mnemom agent claim <id-or-name> [--org <slug>] (--key <k> | --hash-proof <h>)`
  *
  * Claims an agent into an org (ADR-062). Possession of the agent's key (via
  * `--key`, from which the CLI derives the proof) or a pre-computed
@@ -148,7 +148,7 @@ export async function agentsClaimCommand(idOrName, options = {}) {
             // The arg names an agent we can't see yet (unclaimed agents aren't in
             // your fleet), so we have no id to address the claim — guide to the id.
             console.log(fmt.error(`Could not resolve '${idOrName}' to an agent id you can see yet — unclaimed agents are not in your fleet.`));
-            console.log(fmt.dim(`  Pass the agent id directly: mnemom agents claim mnm-... --key <key> [--name ${idOrName}]`) + "\n");
+            console.log(fmt.dim(`  Pass the agent id directly: mnemom agent claim mnm-... --key <key> [--name ${idOrName}]`) + "\n");
             process.exit(1);
             return;
         }
@@ -286,7 +286,7 @@ export async function agentsClaimCommand(idOrName, options = {}) {
             console.log(fmt.error("Failed to claim agent: the --key (and agent name) didn't match the agent's stored proof (invalid hash proof)."));
             console.log(fmt.dim(`  Confirm --key is the exact provider key the agent runs with.\n` +
                 `  If the name couldn't be auto-resolved from the id, pass it explicitly:\n` +
-                `    mnemom agents claim ${agentId} --key <key> --name <provisioned-name>`) + "\n");
+                `    mnemom agent claim ${agentId} --key <key> --name <provisioned-name>`) + "\n");
             process.exit(1);
             return;
         }
@@ -335,7 +335,7 @@ export async function agentsClaimCommand(idOrName, options = {}) {
     console.log();
 }
 /**
- * `mnemom agents move <id-or-name> --to <slug|id>`
+ * `mnemom agent move <id-or-name> --to <slug|id>`
  *
  * Role-based relocation between orgs (the counterpart to re-claim, which is
  * possession-based). The server requires the caller to be an owner/admin of
@@ -400,7 +400,7 @@ export async function agentsMoveCommand(idOrName, options = {}) {
     catch (err) {
         if (err instanceof MnemomApiError && err.effectiveStatus === 403) {
             console.log(fmt.error("Move denied: you must be an owner/admin of BOTH the agent's current org and the destination org.") + "\n");
-            console.log(fmt.dim("  Check your roles with `mnemom org list`. If you hold the agent's key instead, re-claim can move it: mnemom agents claim <id> --org <slug> --key <key>.") + "\n");
+            console.log(fmt.dim("  Check your roles with `mnemom org list`. If you hold the agent's key instead, re-claim can move it: mnemom agent claim <id> --org <slug> --key <key>.") + "\n");
             process.exit(1);
             return;
         }

package/dist/commands/onboard.js

@@ -262,7 +262,7 @@ async function claimIdentity(agentId, scannedName, options, result, json, steps,
             if (status === 403 &&
                 (err.code === "invalid_hash_proof" || /hash[ _]?proof/i.test(err.message))) {
                 throw teachingClaimError(agentId, "the --key (and agent name) didn't match the agent's stored proof (invalid hash proof).", "Confirm --key is the exact provider key the agent runs with. If the name couldn't be " +
-                    `auto-resolved, pass it via \`mnemom agents claim ${agentId} --key <key> --name <name>\`.`, json, result, steps);
+                    `auto-resolved, pass it via \`mnemom agent claim ${agentId} --key <key> --name <name>\`.`, json, result, steps);
             }
             if (status === 403 && err.code === "agent_cross_tenant") {
                 throw teachingClaimError(agentId, "this agent is already claimed by a different owner.", "Onboard an agent you own, or provision a fresh one with `mnemom wrap`.", json, result, steps);

package/dist/commands/wrap.js

@@ -323,7 +323,7 @@ function renderClaimInstructions(agentId) {
         "",
         fmt.dim("  Claim this agent so you own its identity on the platform:"),
         "",
-        `    mnemom agents claim ${agentId}`,
+        `    mnemom agent claim ${agentId}`,
         "",
         fmt.dim("  After claiming, traces appear in `mnemom logs`."),
     ];