humanish 0.48.0 → 0.49.0

package/dist/pricing.js

@@ -12,6 +12,28 @@
 // so a reader can never confuse an estimate for an authoritative charge (invariant 6).
 export const PRICING_SCHEMA = "humanish.pricing.v1";
 export const ACTOR_ESTIMATED_COST_SCHEMA = "humanish.actor-estimated-cost.v1";
+// The gpt-5.6 long-context tier: >272K input tokens re-prices the FULL request at 2x
+// input-side / 1.5x output (developers.openai.com/api/docs/models/gpt-5.6-sol, 2026-08-18).
+const GPT56_LONG_CONTEXT = {
+    thresholdInputTokens: 272_000,
+    inputMultiplier: 2,
+    outputMultiplier: 1.5
+};
+const GPT56_SOURCE = "developers.openai.com/api/docs/pricing (gpt-5.6 family, standard tier)";
+// One 5.6-family entry: rates in USD-per-1M for legibility, converted once. Cache writes bill at
+// 1.25x the uncached input rate on this family (`cache_write_tokens`, prompt-caching guide); the
+// built-in `computer` tool has no per-call fee on the live sheet.
+function gpt56Rate(inPer1M, cachedPer1M, writePer1M, outPer1M) {
+    return {
+        inputUsdPerToken: inPer1M * 1e-6,
+        cachedInputUsdPerToken: cachedPer1M * 1e-6,
+        cacheWriteUsdPerToken: writePer1M * 1e-6,
+        outputUsdPerToken: outPer1M * 1e-6,
+        longContext: { ...GPT56_LONG_CONTEXT },
+        asOf: "2026-08-18",
+        source: GPT56_SOURCE
+    };
+}
 // Per-model rates, keyed on the model id that lands in trace.ids.model (lookup is
 // case-insensitive on a trimmed id). An id NOT present here is DECLARED ABSENT, never guessed.
 export const MODEL_RATES = {
@@ -23,17 +45,32 @@ export const MODEL_RATES = {
         asOf: "2026-08-01",
         source: "openai.com/api/pricing (computer-use-preview)"
     },
-    // gpt-5.5 = the shipped CUA default (DEFAULT_OPENAI_CU_MODEL). $5 / 1M input, $30 / 1M output,
-    // $0.50 / 1M cached input. NOTE: OpenAI's live pricing page no longer lists gpt-5.5 (superseded
-    // by the gpt-5.6 family) — rate confirmed against public third-party sheets instead; refreshing
-    // the default model is tracked in issue #334.
+    // gpt-5.5: the PREVIOUS-generation CUA default, kept so pinned labs and old bundles still
+    // price. Pre-5.6 models bill no cache-write fee (prompt-caching guide) and no long-context
+    // tier was published for it.
     "gpt-5.5": {
         inputUsdPerToken: 5e-6,
         outputUsdPerToken: 30e-6,
         cachedInputUsdPerToken: 0.5e-6,
         asOf: "2026-08-05",
         source: "openrouter.ai/openai/gpt-5.5 (gpt-5.5 no longer on openai.com/api/pricing; see #334)"
-    }
+    },
+    // The gpt-5.6 family (live sheet 2026-08-18, standard tier, short-context base rates;
+    // the longContext block prices the >272K re-tier when per-request turns are recorded).
+    // sol = flagship (the shipped CUA default), terra = cost-balanced, luna = high-volume,
+    // cyber = the Daybreak frontier tier.
+    "gpt-5.6-sol": gpt56Rate(5, 0.5, 6.25, 30),
+    // "gpt-5.6" is OpenAI's own alias for gpt-5.6-sol (models index); priced identically so a
+    // lab configured with the alias never reads as unpriced.
+    "gpt-5.6": gpt56Rate(5, 0.5, 6.25, 30),
+    "gpt-5.6-terra": gpt56Rate(2, 0.2, 2.5, 12),
+    "gpt-5.6-luna": gpt56Rate(0.2, 0.02, 0.25, 1.2),
+    "gpt-5.6-cyber": gpt56Rate(12.5, 1.25, 15.625, 75),
+    // Daybreak program aliases (blue -> sol, red -> cyber today). OpenAI repoints these as new
+    // frontier models ship, so prefer the explicit tier id in labs; the entries exist so a
+    // configured alias still prices at what the alias bills TODAY.
+    "daybreak-blue-latest": gpt56Rate(5, 0.5, 6.25, 30),
+    "daybreak-red-latest": gpt56Rate(12.5, 1.25, 15.625, 75)
 };
 // E2B desktop sandbox compute, billed per-second by vCPU+RAM. Live sheet: 2 vCPU (default)
 // $0.000028/s + RAM $0.0000045/GiB/s => at an ASSUMED 4 GiB desktop, $0.000046/s ~= $0.00276/min
@@ -74,17 +111,70 @@ export function estimateActorCost(tokenUsage, modelId, rates = MODEL_RATES) {
     }
     const inTok = tokenUsage.input ?? 0;
     const outTok = tokenUsage.output ?? 0;
-    // Cached input is billed at a fraction of the full rate, and on a session that threads state
-    // through the provider it is the MAJORITY of input — a warm prefix is re-sent every turn. Pricing
-    // it at the full rate overstated real spend by up to ~10x on long sessions, which is enough to
-    // abort a run against its own cap for money it never spent (#391).
-    //
-    // Both halves are honestly absent: no reported cachedInput, or a rate sheet without a cached
-    // rate, prices exactly as before. We never assume a discount we cannot evidence.
-    const cachedTok = rate.cachedInputUsdPerToken === undefined ? 0 : Math.min(inTok, Math.max(0, tokenUsage.cachedInput ?? 0));
-    const fullTok = inTok - cachedTok;
-    const inputUsd = round6(fullTok * rate.inputUsdPerToken + cachedTok * (rate.cachedInputUsdPerToken ?? 0));
-    const outputUsd = round6(outTok * rate.outputUsdPerToken);
+    // Long-context tiering needs to know each REQUEST's input size (the provider re-prices whole
+    // requests past the threshold), so it engages only when per-turn usage records exist AND their
+    // input sums to the reported total — a partial turn ledger must not silently price the missing
+    // remainder at the wrong tier. Otherwise totals price on the base (short-context) rate exactly
+    // as before, which is the under-estimate direction and never trips a cap early.
+    const turns = tokenUsage.turns ?? [];
+    const sumOf = (field) => turns.reduce((sum, turn) => sum + (turn[field] ?? 0), 0);
+    // The ledger is trusted only when it decomposes the totals EXACTLY — all four sums, not just
+    // input/output. A ledger that carries request sizes but not the cache splits would otherwise
+    // price every token at the full rate while the session totals sit ignored (red-team finding:
+    // 3.5-5x overstatement, the #391 false-cap-trip direction). Inconsistent evidence falls back
+    // to the totals path, which honors the declared splits on the base tier.
+    const tiered = rate.longContext !== undefined &&
+        turns.length > 0 &&
+        sumOf("input") === inTok &&
+        sumOf("output") === outTok &&
+        sumOf("cachedInput") === (tokenUsage.cachedInput ?? 0) &&
+        sumOf("cacheWriteInput") === (tokenUsage.cacheWriteInput ?? 0);
+    let inputUsd = 0;
+    let outputUsd = 0;
+    let cachedTotal = 0;
+    let writeTotal = 0;
+    let longContextTurns = 0;
+    // Price one request's usage at one tier. Cached input is billed at a fraction of the full rate,
+    // and on a session that threads provider state it is the MAJORITY of input — pricing it at the
+    // full rate overstated real spend by up to ~10x (#391). Cache WRITES bill at their own rate
+    // (1.25x on OpenAI 5.6+) as the total rate for those tokens; a sheet without a write rate
+    // prices writes as plain input (pre-5.6: writes are free-of-extra-fee, i.e. plain input).
+    // Every piece is honestly absent: no reported split means no discount and no surcharge assumed.
+    const priceRequest = (usage, tierable) => {
+        const reqIn = usage.input ?? 0;
+        const reqOut = usage.output ?? 0;
+        // Tiering applies only to a real per-REQUEST record: session totals crossing the threshold
+        // say nothing about any single request, so totals always price on the base tier.
+        const long = tierable && rate.longContext !== undefined && reqIn > rate.longContext.thresholdInputTokens;
+        const inMul = long ? rate.longContext.inputMultiplier : 1;
+        const outMul = long ? rate.longContext.outputMultiplier : 1;
+        if (long)
+            longContextTurns += 1;
+        const cached = rate.cachedInputUsdPerToken === undefined ? 0 : Math.min(reqIn, Math.max(0, usage.cachedInput ?? 0));
+        const writes = Math.min(reqIn - cached, Math.max(0, usage.cacheWriteInput ?? 0));
+        const full = reqIn - cached - writes;
+        cachedTotal += cached;
+        writeTotal += writes;
+        inputUsd +=
+            full * rate.inputUsdPerToken * inMul +
+                cached * (rate.cachedInputUsdPerToken ?? 0) * inMul +
+                writes * (rate.cacheWriteUsdPerToken ?? rate.inputUsdPerToken) * inMul;
+        outputUsd += reqOut * rate.outputUsdPerToken * outMul;
+    };
+    if (tiered) {
+        for (const turn of turns)
+            priceRequest(turn, true);
+    }
+    else {
+        priceRequest({
+            input: inTok,
+            output: outTok,
+            ...(tokenUsage.cachedInput === undefined ? {} : { cachedInput: tokenUsage.cachedInput }),
+            ...(tokenUsage.cacheWriteInput === undefined ? {} : { cacheWriteInput: tokenUsage.cacheWriteInput })
+        }, false);
+    }
+    inputUsd = round6(inputUsd);
+    outputUsd = round6(outputUsd);
     return {
         schema: ACTOR_ESTIMATED_COST_SCHEMA,
         estimatedCostUsd: round6(inputUsd + outputUsd),
@@ -97,7 +187,9 @@ export function estimateActorCost(tokenUsage, modelId, rates = MODEL_RATES) {
             outputUsd,
             inputTokens: inTok,
             outputTokens: outTok,
-            ...(cachedTok > 0 ? { cachedInputTokens: cachedTok } : {})
+            ...(cachedTotal > 0 ? { cachedInputTokens: cachedTotal } : {}),
+            ...(writeTotal > 0 ? { cacheWriteInputTokens: writeTotal } : {}),
+            ...(longContextTurns > 0 ? { longContextTurns } : {})
         }
     };
 }

package/dist/pricing.js.map

@@ -1 +1 @@
-{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../src/pricing.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,0FAA0F;AAC1F,6FAA6F;AAC7F,uFAAuF;AACvF,EAAE;AACF,yFAAyF;AACzF,4FAA4F;AAC5F,2FAA2F;AAC3F,+FAA+F;AAC/F,2FAA2F;AAC3F,4FAA4F;AAC5F,uFAAuF;AAMvF,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAC;AACpD,MAAM,CAAC,MAAM,2BAA2B,GAAG,kCAAkC,CAAC;AAuE9E,kFAAkF;AAClF,+FAA+F;AAC/F,MAAM,CAAC,MAAM,WAAW,GAA8B;IACpD,yFAAyF;IACzF,6EAA6E;IAC7E,sBAAsB,EAAE;QACtB,gBAAgB,EAAE,IAAI;QACtB,iBAAiB,EAAE,KAAK;QACxB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,+CAA+C;KACxD;IACD,+FAA+F;IAC/F,gGAAgG;IAChG,gGAAgG;IAChG,8CAA8C;IAC9C,SAAS,EAAE;QACT,gBAAgB,EAAE,IAAI;QACtB,iBAAiB,EAAE,KAAK;QACxB,sBAAsB,EAAE,MAAM;QAC9B,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,sFAAsF;KAC/F;CACF,CAAC;AAEF,2FAA2F;AAC3F,iGAAiG;AACjG,0FAA0F;AAC1F,8FAA8F;AAC9F,gGAAgG;AAChG,mBAAmB;AACnB,MAAM,CAAC,MAAM,YAAY,GAAgB;IACvC,YAAY,EAAE,OAAO;IACrB,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,oFAAoF;IAC5F,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF;;6DAE6D;AAC7D,MAAM,UAAU,MAAM,CAAC,CAAS;IAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;AACnC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,UAAuC,EACvC,OAA2B,EAC3B,QAAmC,WAAW;IAE9C,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,CAAC,EAAE,CAAC;QACvF,OAAO,EAAE,MAAM,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACpH,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,MAAM,EAAE,2BAA2B;YACnC,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,mBAAmB;YAC3B,SAAS,EAAE,IAAI;YACf,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChC,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC;IACtC,6FAA6F;IAC7F,kGAAkG;IAClG,+FAA+F;IAC/F,mEAAmE;IACnE,EAAE;IACF,6FAA6F;IAC7F,iFAAiF;IACjF,MAAM,SAAS,GACb,IAAI,CAAC,sBAAsB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5G,MAAM,OAAO,GAAG,KAAK,GAAG,SAAS,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,gBAAgB,GAAG,SAAS,GAAG,CAAC,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1G,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC1D,OAAO;QACL,MAAM,EAAE,2BAA2B;QACnC,gBAAgB,EAAE,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9C,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,SAAS,EAAE;YACT,QAAQ;YACR,SAAS;YACT,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,MAAM;YACpB,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAA2B,EAC3B,OAAoB,YAAY;IAEhC,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,EAAE,CAAC;QAC7C,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3F,CAAC;IACD,OAAO;QACL,gBAAgB,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;QACrD,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../src/pricing.ts"],"names":[],"mappings":"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"}

package/dist/program.d.ts

@@ -1,4 +1,5 @@
 import { Command } from "commander";
+import { discoverProviderKeys } from "./key-resolution.js";
 import type { ObserverResult, ObserverServer } from "./observer.js";
 import type { OssMetaLabResult } from "./oss-meta-lab.js";
 export declare const CLI_RESPONSE_SCHEMA = "humanish.cli-response.v1";
@@ -15,7 +16,9 @@ export interface UnexpectedErrorEnvelope {
         message: string;
     };
 }
-export declare function createProgram(io?: Partial<CliIo>): Command;
+export declare function createProgram(io?: Partial<CliIo> & {
+    keyDiscovery?: typeof discoverProviderKeys;
+}): Command;
 /**
  * Default browser-open policy for a lab backend run. Mirrors the observe/watch gate:
  * an explicit --open/--no-open wins; --json (machine mode) never auto-opens; otherwise a

package/dist/program.js

@@ -6,6 +6,7 @@ import { fileURLToPath } from "node:url";
 import { Command, Option } from "commander";
 import { startCodexAppServerUi } from "./codex-app-server-ui.js";
 import { loadEnvFile } from "./env-file.js";
+import { discoverProviderKeys, listUserKeys, resolveKeyName, setUserKey, unsetUserKey, userKeyStorePath } from "./key-resolution.js";
 import { redactText } from "./redaction.js";
 import { draftFeedback, listFeedback, renderIssueMarkdown, renderIssueUrl, verifyFeedback } from "./feedback.js";
 import { runInit } from "./init.js";
@@ -136,6 +137,7 @@ function reportUnexpectedActionError(command, io, error) {
 }
 export function createProgram(io = {}) {
     const cliIo = { ...defaultIo, ...io };
+    keyDiscoveryFn = io.keyDiscovery ?? discoverProviderKeys;
     const program = new HumanishCommand(undefined, cliIo);
     // Bare `humanish` orients instead of printing sixteen subcommands (#367). --help is untouched;
     // this is only what happens when no command was chosen at all.
@@ -177,6 +179,7 @@ export function createProgram(io = {}) {
     ].join("\n"));
     registerInitCommand(program, cliIo);
     registerDoctorCommand(program, cliIo);
+    registerKeysCommand(program, cliIo);
     registerRunCommand(program, cliIo);
     registerVerifyCommand(program, cliIo);
     registerCleanupCommand(program, cliIo);
@@ -234,6 +237,146 @@ function registerDoctorCommand(parent, io) {
         io.setExitCode(result.ok ? 0 : 2);
     });
 }
+// The discovery fn the env seam calls; injectable via createProgram for hermetic CLI tests.
+let keyDiscoveryFn = discoverProviderKeys;
+const KEYS_RESULT_SCHEMA = "humanish.keys-result.v1";
+function formatKeysHuman(result) {
+    const lines = [`humanish keys ${result.ok ? "ok" : "failed"}`, `store: ${result.store}`, result.message];
+    if (result.action === "list" && result.names.length > 0) {
+        for (const name of result.names)
+            lines.push(`- ${name}`);
+    }
+    return `${lines.join("\n")}\n`;
+}
+/** Read one secret line: from a piped stdin when --stdin, else a hidden TTY prompt. */
+async function readSecretValue(useStdin, promptLabel, io) {
+    if (useStdin || !process.stdin.isTTY) {
+        const chunks = [];
+        for await (const chunk of process.stdin)
+            chunks.push(chunk);
+        const text = Buffer.concat(chunks).toString("utf8").trim();
+        return text.length > 0 ? text : null;
+    }
+    io.writeErr(`${promptLabel} (input hidden): `);
+    return await new Promise((resolve) => {
+        const stdin = process.stdin;
+        let value = "";
+        stdin.setRawMode?.(true);
+        stdin.resume();
+        stdin.setEncoding("utf8");
+        const onData = (key) => {
+            if (key === "\u0003") {
+                cleanup();
+                resolve(null);
+                return;
+            }
+            if (key === "\r" || key === "\n") {
+                cleanup();
+                io.writeErr("\n");
+                resolve(value.trim().length > 0 ? value.trim() : null);
+                return;
+            }
+            if (key === "\u007f" || key === "\b") {
+                value = value.slice(0, -1);
+                return;
+            }
+            value += key;
+        };
+        const cleanup = () => {
+            stdin.off("data", onData);
+            stdin.setRawMode?.(false);
+            stdin.pause();
+        };
+        stdin.on("data", onData);
+    });
+}
+function registerKeysCommand(parent, io) {
+    const keys = parent
+        .command("keys")
+        .description("Manage the humanish user-level key store used by provider-key discovery (#436).")
+        .summary("Manage the user-level provider key store.");
+    keys
+        .command("set")
+        .argument("<vendor-or-name>", "A vendor alias (openai, e2b, anthropic, github) or a raw ENV_NAME.")
+        .description("Store one provider key in the user store (0600), prompted with hidden input.")
+        .option("--stdin", "Read the value from stdin instead of prompting (for agents/pipes).")
+        .option("--json", JSON_OPTION_DESCRIPTION)
+        .action(async (vendorOrName, options, command) => {
+        const name = resolveKeyName(vendorOrName);
+        const storePath = userKeyStorePath(process.env);
+        if (name === null) {
+            const result = {
+                schema: KEYS_RESULT_SCHEMA, ok: false, action: "set", store: storePath, names: [],
+                message: `Not a vendor alias or valid env name: ${vendorOrName}. Vendors: openai, e2b, anthropic, github.`
+            };
+            writeResult(command, io, result, formatKeysHuman);
+            io.setExitCode(2);
+            return;
+        }
+        const value = await readSecretValue(options.stdin === true, `Value for ${name}`, io);
+        if (value === null) {
+            const result = {
+                schema: KEYS_RESULT_SCHEMA, ok: false, action: "set", store: storePath, names: [name],
+                message: "No value provided; nothing written."
+            };
+            writeResult(command, io, result, formatKeysHuman);
+            io.setExitCode(2);
+            return;
+        }
+        try {
+            const written = setUserKey(name, value, process.env);
+            const result = {
+                schema: KEYS_RESULT_SCHEMA, ok: true, action: "set", store: written.path, names: [name],
+                message: `${name} stored (0600). Live commands resolve it automatically; remove with "humanish keys unset ${name}".`
+            };
+            writeResult(command, io, result, formatKeysHuman);
+            io.setExitCode(0);
+        }
+        catch (error) {
+            const result = {
+                schema: KEYS_RESULT_SCHEMA, ok: false, action: "set", store: storePath, names: [name],
+                message: error instanceof Error ? error.message : "Failed to write the key store."
+            };
+            writeResult(command, io, result, formatKeysHuman);
+            io.setExitCode(2);
+        }
+    });
+    keys
+        .command("unset")
+        .argument("<vendor-or-name>", "A vendor alias or raw ENV_NAME to remove from the store.")
+        .description("Remove one key from the user store.")
+        .option("--json", JSON_OPTION_DESCRIPTION)
+        .action(async (vendorOrName, _options, command) => {
+        const name = resolveKeyName(vendorOrName);
+        const storePath = userKeyStorePath(process.env);
+        const had = name !== null && unsetUserKey(name, process.env);
+        const result = {
+            schema: KEYS_RESULT_SCHEMA, ok: name !== null, action: "unset", store: storePath,
+            names: name === null ? [] : [name],
+            message: name === null
+                ? `Not a vendor alias or valid env name: ${vendorOrName}.`
+                : had ? `${name} removed from the store.` : `${name} was not in the store; nothing changed.`
+        };
+        writeResult(command, io, result, formatKeysHuman);
+        io.setExitCode(name === null ? 2 : 0);
+    });
+    keys
+        .command("list")
+        .description("List the NAMES stored in the user store. Values are never printed.")
+        .option("--json", JSON_OPTION_DESCRIPTION)
+        .action(async (_options, command) => {
+        const storePath = userKeyStorePath(process.env);
+        const names = listUserKeys(process.env);
+        const result = {
+            schema: KEYS_RESULT_SCHEMA, ok: true, action: "list", store: storePath, names,
+            message: names.length === 0
+                ? "The store is empty. Add a key with `humanish keys set <vendor>`."
+                : `${names.length} key name(s) stored. Values are never printed.`
+        };
+        writeResult(command, io, result, formatKeysHuman);
+        io.setExitCode(0);
+    });
+}
 function registerRunCommand(parent, io) {
     parent
         .command("run")
@@ -2440,16 +2583,29 @@ async function renderAndMaybeFollowObserver(args) {
     }
 }
 async function applyEnvFileOption(args) {
-    if (!args.envFile) {
-        return true;
+    if (args.envFile) {
+        const result = await loadEnvFile(args.cwd, args.envFile);
+        if (!result.ok) {
+            writeResult(args.command, args.io, result, formatEnvFileHuman);
+            args.io.setExitCode(2);
+            return false;
+        }
+    }
+    // Provider-key discovery (#436): fill still-missing keys from the documented project
+    // overlay, the owning vendors' native stores, and the humanish user store — fill-only
+    // (an explicit --env-file or process env always wins), each fill announced by name and
+    // source on stderr, never by value. HUMANISH_STRICT_KEYS=1 restores env-only behavior.
+    try {
+        await keyDiscoveryFn({
+            cwd: args.cwd,
+            env: process.env,
+            announce: (line) => args.io.writeErr(`${line}\n`)
+        });
     }
-    const result = await loadEnvFile(args.cwd, args.envFile);
-    if (result.ok) {
-        return true;
+    catch {
+        // Discovery must never break a command; a rung that fails to read is a miss, not an error.
     }
-    writeResult(args.command, args.io, result, formatEnvFileHuman);
-    args.io.setExitCode(2);
-    return false;
+    return true;
 }
 function labReposOverride(options) {
     const override = [