humanish 0.115.0 → 0.116.0

package/dist/substrates/local/runtime-host.js

@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
 import { cli } from "../../cli/invocation.js";
-import { defaultVmSize, machineSize, vmSizeProblem, } from "./capacity.js";
+import { limaVmSize, machineSize, vmSizeProblem, } from "./capacity.js";
 import { plural } from "../../run/text.js";
 const exec = promisify(execFile);
 export const LIMA_INSTANCE = "humanish-runtime";
@@ -124,22 +124,18 @@ export async function limaStatus(options = {}) {
 export async function prepareLima(options = {}, progress) {
     const status = await limaStatus(options);
     const mac = machineSize(options.machine);
-    const current = status.size === undefined
-        ? defaultVmSize(mac)
-        : { memoryGiB: status.size.memoryBytes / 1024 ** 3, cpus: status.size.cpus };
-    const size = { ...current, ...options.size };
+    const current = limaVmSize(status, mac);
     if (options.size !== undefined) {
+        const size = sizeToApply(current, options.size);
         const problem = vmSizeProblem(size, mac);
         if (problem !== undefined)
             throw new Error(problem);
-    }
-    // An existing VM whose size Lima did not list gets the asked-for size without a comparison.
-    const differs = status.size === undefined
-        ? options.size !== undefined
-        : size.cpus !== current.cpus || size.memoryGiB !== current.memoryGiB;
-    if (status.exists && differs) {
-        await resizeLima(size, status.ready, options, progress);
-        return;
+        // An existing VM whose size Lima did not list gets the asked-for size without a comparison.
+        const differs = current === undefined || size.cpus !== current.cpus || size.memoryGiB !== current.memoryGiB;
+        if (status.exists && differs) {
+            await resizeLima(size, status.ready, options, progress);
+            return;
+        }
     }
     if (status.ready)
         return;
@@ -153,7 +149,7 @@ export async function prepareLima(options = {}, progress) {
         const work = await mkdtemp(path.join(tmpdir(), "humanish-lima-"));
         try {
             const file = path.join(work, "host.yaml");
-            await writeFile(file, limaTemplate(size), { mode: 0o600 });
+            await writeFile(file, limaTemplate(sizeToApply(current, options.size)), { mode: 0o600 });
             await hostExec("limactl", ["start", "--tty=false", "--name", LIMA_INSTANCE, file], options, 15 * 60_000);
         }
         finally {
@@ -161,6 +157,17 @@ export async function prepareLima(options = {}, progress) {
         }
     }
 }
+/**
+ * The size to create or resize the VM at: the asked-for values over the VM's current size. Only an
+ * existing VM that lists no size has no current size, so there a value not asked for is unknown.
+ */
+function sizeToApply(current, asked = {}) {
+    const memoryGiB = asked.memoryGiB ?? current?.memoryGiB;
+    const cpus = asked.cpus ?? current?.cpus;
+    if (memoryGiB === undefined || cpus === undefined)
+        throw new Error(`limactl lists no size for the humanish Lima VM, so humanish cannot tell which ${memoryGiB === undefined ? "--memory" : "--cpus"} to keep. Run ${cli("runtime setup --memory <GiB> --cpus <n>")} with both values.`);
+    return { memoryGiB, cpus };
+}
 /** Lima changes the memory and CPUs of a stopped instance only. Running desktops keep it running. */
 async function resizeLima(size, running, options, progress) {
     if (running) {

package/dist/substrates/local/runtime.js

@@ -6,24 +6,16 @@ import path from "node:path";
 import { Readable, Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { LOCAL_MEDIA_RUNTIME_RELEASES, LOCAL_RUNTIME_RELEASES } from "./runtime-release.js";
-import { defaultVmSize, localCapacity, machineSize, } from "./capacity.js";
+import { limaCapacity, localCapacity, machineSize, } from "./capacity.js";
 import { limaStatus, loadRuntimeArchive, prepareLima, runtimeArchitecture, runtimeDocker, runtimeExec, usesLima, } from "./runtime-host.js";
 import { cli } from "../../cli/invocation.js";
 const docker = async (args, options) => (await runtimeDocker(args, options)).stdout.trim();
 const runtimeRelease = (options) => options.release ??
     (options.media ? LOCAL_MEDIA_RUNTIME_RELEASES : LOCAL_RUNTIME_RELEASES)[runtimeArchitecture(options) ?? "amd64"];
-/** Desktops the existing Lima VM holds, the VM setup would create, or this Linux machine. */
+/** Desktops the Lima VM holds (or setup would create), or this Linux machine. */
 function runtimeCapacity(options, lima) {
-    if (lima === undefined)
-        return localCapacity("linux-host", machineSize(options.machine));
     const machine = machineSize(options.machine);
-    if (lima.size !== undefined)
-        return localCapacity("lima-vm", lima.size, { machine });
-    // An existing VM whose size Lima did not list has an unknown size, which no default replaces.
-    if (lima.exists)
-        return undefined;
-    const planned = defaultVmSize(machine);
-    return localCapacity("lima-vm", { memoryBytes: planned.memoryGiB * 1024 ** 3, cpus: planned.cpus }, { planned: true, machine });
+    return lima === undefined ? localCapacity("linux-host", machine) : limaCapacity(lima, machine);
 }
 /**
  * How many desktops the local runtime holds, read without starting anything. Undefined when the

package/dist/tui/contract.d.ts

@@ -14,6 +14,13 @@ import type { CommsRecoveryEntry } from "../comms/lease-store.js";
 interface TuiVersionInfo {
     cli: string;
 }
+/** One provider key as `humanish keys` lists it. Never its value. */
+export interface TuiKeyStatus {
+    name: string;
+    set: boolean;
+    /** The line `humanish keys` prints for this key: what it is for, and its source or how to add it. */
+    line: string;
+}
 /**
  * What the surface may do to the project. Deliberately a small, explicit list rather than a handle
  * to the whole library: the set of verbs a stakeholder surface can perform should be readable in
@@ -36,6 +43,10 @@ export interface TuiCapabilities {
             message: string;
         }>;
     };
+    /** The provider keys `humanish keys` lists, in its order. A key is entered through the host. */
+    keys?: {
+        status(): Promise<TuiKeyStatus[]>;
+    };
     /** Read every run in the project, cheapest source first. */
     readRunIndex(cwd: string, options?: ReadRunIndexOptions): Promise<RunIndexResult>;
     /**
@@ -82,8 +93,11 @@ export interface TuiCapabilities {
     initProject(cwd: string): Promise<TuiActionResult>;
 }
 export interface TuiOptions {
-    /** Return to setup after the host-owned hidden prompt has finished. */
-    initialScreen?: "connections";
+    /**
+     * Return to the keys list or the email connection after the host-owned hidden prompt has
+     * finished, showing `connectionNotice`.
+     */
+    initialScreen?: "keys" | "connections";
     connectionNotice?: string;
     /** The project the surface is reading. Already resolved by the CLI. */
     cwd: string;
@@ -100,18 +114,29 @@ export interface TuiOptions {
     exitAfterFirstFrame?: boolean;
 }
 /**
- * Start the surface. Resolves with the process exit code when the operator quits; the TUI owns the
- * screen until then, so the CLI must not write to stdout while this is pending.
+ * A key the person asked to enter. The surface unmounts, the host asks for the value with hidden
+ * input and stores it, then mounts the surface again on `initialScreen`.
  */
 export type TuiHandoff = {
     action: "agentmail-key";
+} | {
+    action: "provider-key";
+    name: string;
 };
+/**
+ * Start the surface. Resolves with the process exit code when the operator quits, or with a key
+ * handoff; the TUI owns the screen until then, so the CLI must not write to stdout while this is
+ * pending.
+ */
 export type StartTui = (options: TuiOptions) => Promise<number | TuiHandoff>;
 /** The shape `dist/tui-app.js` exports. Asserted at the load boundary in cli/commands/tui.ts. */
 export interface TuiModule {
     startTui: StartTui;
 }
-/** Node version the Ink runtime requires (ink@7 declares `engines.node >= 22`). */
+/**
+ * Node version the Ink runtime requires: ink 8.0.0, which tui/package.json pins, declares
+ * `engines.node` `>=22`.
+ */
 export declare const TUI_MIN_NODE_MAJOR = 22;
 /**
  * Whether this runtime can host the surface. Kept here, beside the reason, so the CLI's refusal and

package/dist/tui/contract.js

@@ -13,7 +13,10 @@
 // It also makes the UI testable without a terminal: a test hands `startTui` a fake index and reads
 // the frames back.
 import { cli } from "../cli/invocation.js";
-/** Node version the Ink runtime requires (ink@7 declares `engines.node >= 22`). */
+/**
+ * Node version the Ink runtime requires: ink 8.0.0, which tui/package.json pins, declares
+ * `engines.node` `>=22`.
+ */
 export const TUI_MIN_NODE_MAJOR = 22;
 /**
  * Whether this runtime can host the surface. Kept here, beside the reason, so the CLI's refusal and