zcode-acp-server 0.22.0 → 0.23.0

package/dist/config/user-config.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Global user configuration (~/.config/zcode-acp/config.json).
+ *
+ * The file is the AUTHORITATIVE source for user preferences that must not
+ * depend on how a process was launched: the hub daemon is idle-exited and
+ * re-spawned by whichever bridge needs it next, so its birth env rotates
+ * between GUI-launched editors (no shell rc vars) and interactive shells.
+ * Every read is live (no cache) — editing the file takes effect on the next
+ * use (e.g. the next remote incubation) without restarting the hub.
+ *
+ * Precedence everywhere: config file > environment variable > built-in
+ * default. Env vars remain fully supported as a fallback for setups without
+ * a file and for one-off/test overrides of unspecified fields.
+ *
+ * Per-process plumbing (ZCODE_ACP_REMOTE_ORIGIN, _PIN_CWD,
+ * ZCODE_ACP_RESUME_SESSION) is deliberately NOT file-configurable — those
+ * carry per-request/per-role state, not user preference.
+ */
+/** Terminal incubation preferences for remote session-create (ADR-0016). */
+export interface TerminalPrefs {
+    /** false → remote session-create stays headless (no visible window). */
+    enabled?: boolean;
+    /** Terminal app name (Terminal, iTerm, wezterm, kitty, alacritty, ghostty, …). */
+    app?: string;
+    /** Shell command template; `{script}` is replaced with the quoted script path. */
+    command?: string;
+}
+/** The `remote` section of the user config file. */
+export interface RemoteUserConfig {
+    enabled?: boolean;
+    token?: string;
+    hubPort?: number;
+    hubHost?: string;
+    bridgePort?: number;
+    terminal?: TerminalPrefs;
+}
+export interface UserConfig {
+    remote?: RemoteUserConfig;
+}
+/** Resolve the config file path: $XDG_CONFIG_HOME/zcode-acp or ~/.config/zcode-acp. */
+export declare function userConfigPath(env?: NodeJS.ProcessEnv): string;
+/**
+ * Read and validate the user config. Best-effort: a missing file is the
+ * normal no-file path ({}), anything unreadable/malformed warns once and
+ * reads as absent so the env fallback keeps the process working.
+ */
+export declare function loadUserConfig(env?: NodeJS.ProcessEnv): UserConfig;
+//# sourceMappingURL=user-config.d.ts.map

package/dist/config/user-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-config.d.ts","sourceRoot":"","sources":["../../src/config/user-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAQH,4EAA4E;AAC5E,MAAM,WAAW,aAAa;IAC5B,wEAAwE;IACxE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kFAAkF;IAClF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,oDAAoD;AACpD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B;AAED,uFAAuF;AACvF,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAG3E;AAMD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,UAAU,CAqD/E"}

package/dist/config/user-config.js

@@ -0,0 +1,101 @@
+/**
+ * Global user configuration (~/.config/zcode-acp/config.json).
+ *
+ * The file is the AUTHORITATIVE source for user preferences that must not
+ * depend on how a process was launched: the hub daemon is idle-exited and
+ * re-spawned by whichever bridge needs it next, so its birth env rotates
+ * between GUI-launched editors (no shell rc vars) and interactive shells.
+ * Every read is live (no cache) — editing the file takes effect on the next
+ * use (e.g. the next remote incubation) without restarting the hub.
+ *
+ * Precedence everywhere: config file > environment variable > built-in
+ * default. Env vars remain fully supported as a fallback for setups without
+ * a file and for one-off/test overrides of unspecified fields.
+ *
+ * Per-process plumbing (ZCODE_ACP_REMOTE_ORIGIN, _PIN_CWD,
+ * ZCODE_ACP_RESUME_SESSION) is deliberately NOT file-configurable — those
+ * carry per-request/per-role state, not user preference.
+ */
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import path from "node:path";
+import { warn } from "../utils.js";
+/** Resolve the config file path: $XDG_CONFIG_HOME/zcode-acp or ~/.config/zcode-acp. */
+export function userConfigPath(env = process.env) {
+    const base = (env.XDG_CONFIG_HOME ?? "").trim() || path.join(homedir(), ".config");
+    return path.join(base, "zcode-acp", "config.json");
+}
+function isPlainObject(v) {
+    return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+/**
+ * Read and validate the user config. Best-effort: a missing file is the
+ * normal no-file path ({}), anything unreadable/malformed warns once and
+ * reads as absent so the env fallback keeps the process working.
+ */
+export function loadUserConfig(env = process.env) {
+    const file = userConfigPath(env);
+    let raw;
+    try {
+        raw = readFileSync(file, "utf8");
+    }
+    catch {
+        return {}; // missing (or unreadable) file — env fallback applies
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (e) {
+        warn(`config: ${file} is not valid JSON — ignoring (${e instanceof Error ? e.message : String(e)})`);
+        return {};
+    }
+    if (!isPlainObject(parsed)) {
+        warn(`config: ${file} is not a JSON object — ignoring`);
+        return {};
+    }
+    const remote = parsed["remote"];
+    if (remote === undefined)
+        return {};
+    if (!isPlainObject(remote)) {
+        warn(`config: "remote" in ${file} is not an object — ignoring the section`);
+        return {};
+    }
+    const out = {};
+    if (typeof remote["enabled"] === "boolean")
+        out.enabled = remote["enabled"];
+    if (typeof remote["token"] === "string" && remote["token"].trim())
+        out.token = remote["token"].trim();
+    for (const key of ["hubPort", "bridgePort"]) {
+        const v = remote[key];
+        if (v === undefined)
+            continue;
+        if (typeof v !== "number" || !Number.isInteger(v) || v < 1 || v > 65535) {
+            warn(`config: remote.${key}=${JSON.stringify(v)} is not a valid port — ignoring`);
+        }
+        else {
+            out[key] = v;
+        }
+    }
+    if (typeof remote["hubHost"] === "string" && remote["hubHost"].trim()) {
+        out.hubHost = remote["hubHost"].trim();
+    }
+    const terminal = remote["terminal"];
+    if (isPlainObject(terminal)) {
+        const t = {};
+        if (typeof terminal["enabled"] === "boolean")
+            t.enabled = terminal["enabled"];
+        if (typeof terminal["app"] === "string" && terminal["app"].trim())
+            t.app = terminal["app"].trim();
+        if (typeof terminal["command"] === "string" && terminal["command"].trim()) {
+            t.command = terminal["command"].trim();
+        }
+        if (Object.keys(t).length > 0)
+            out.terminal = t;
+    }
+    else if (terminal !== undefined) {
+        warn(`config: remote.terminal in ${file} is not an object — ignoring`);
+    }
+    return { remote: out };
+}
+//# sourceMappingURL=user-config.js.map

package/dist/config/user-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-config.js","sourceRoot":"","sources":["../../src/config/user-config.ts"],"names":[],"mappings":"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"}

package/dist/handlers/session.d.ts

@@ -20,6 +20,20 @@ import type { PendingTurn, ZcodeAcpServer } from "../server.js";
  * (the TUI's /new) create fresh sessions. Whitespace-only counts as unset.
  */
 export declare function consumeBootResumeTarget(): string | null;
+/**
+ * Banner-handshake trigger for a boot-resumed TUI (ADR-0017 follow-up).
+ * Martty's welcome banner paints INSTEAD of the transcript and only dives
+ * when text is submitted — so a boot-resumed TUI showed its replayed history
+ * only after the user's first message. The hub therefore also incubates the
+ * resume TUI with `DSH_TUI_AUTOPROMPT=<this string>`: martty auto-submits it
+ * at boot (banner dives immediately, the text queues until the boot bind),
+ * and the prompt path answers it with a one-line ack instead of a model
+ * turn — scoped to the booting connection (see bootResumeTriggerConnection).
+ * Plain text on purpose: a leading `/` would route through martty's
+ * slash dispatch (whose gates run before agent capabilities are known) and
+ * `!` would run a local shell command.
+ */
+export declare const BOOT_RESUME_TRIGGER = "resume session";
 /**
  * `session/new` → local placeholder id. The real zcode `session/create` is
  * deferred to first use (`ensureRealSession`) so an editor startup that never
@@ -34,7 +48,7 @@ export declare function consumeBootResumeTarget(): string | null;
  * back to a fresh session so the window still lands on a usable prompt
  * (the retired in-house REPL had the same fallback).
  */
-export declare function newSession(server: ZcodeAcpServer, params: acp.NewSessionRequest): Promise<acp.NewSessionResponse>;
+export declare function newSession(server: ZcodeAcpServer, params: acp.NewSessionRequest, client?: acp.AgentContext): Promise<acp.NewSessionResponse>;
 /**
  * Materialize a lazy `session/new` placeholder into a real backend session on
  * first use (prompt / set_config_option / extension methods). Idempotent:
@@ -68,7 +82,7 @@ export declare function loadSession(server: ZcodeAcpServer, params: acp.LoadSess
  * the continuation for real, and only the session/load replay later surfaced
  * the orphaned continuation bubble.
  */
-export declare function prompt(server: ZcodeAcpServer, params: acp.PromptRequest, cx: acp.AgentContext, requestId: number | string): Promise<acp.PromptResponse>;
+export declare function prompt(server: ZcodeAcpServer, params: acp.PromptRequest, cx: acp.AgentContext, requestId: number | string, client?: acp.AgentContext): Promise<acp.PromptResponse>;
 /**
  * `session/set_config_option` → dispatch model/mode/thought and emit the
  * resulting config_option_update (+ current_mode_update for mode).

package/dist/handlers/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/handlers/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/handlers/session.ts"],"names":[],"mappings":"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"}

package/dist/handlers/session.js

@@ -24,7 +24,7 @@ import { buildResumeRuntimeModel } from "../config/runtime-model.js";
 import { messages } from "../i18n.js";
 import { lookupLazySession, recordMaterializedSession, rememberLazySession, } from "../lazy-sessions.js";
 import { buildDiffContent, EventTranslator, extractLocations, formatTurnError, isTransientTurnError, ProjectionDiffer, } from "../translators/index.js";
-import { log, warn } from "../utils.js";
+import { clientConnectionRoot, log, warn } from "../utils.js";
 import { dispatchEvent } from "./dispatch.js";
 import { sendSessionUpdate, sendTextChunk, withReplayBatch } from "./io.js";
 import { fetchMessages, fullSlice, readTailLimit, replayMessages, sliceTail } from "./replay.js";
@@ -131,6 +131,20 @@ export function consumeBootResumeTarget() {
     delete process.env[BOOT_RESUME_ENV];
     return target || null;
 }
+/**
+ * Banner-handshake trigger for a boot-resumed TUI (ADR-0017 follow-up).
+ * Martty's welcome banner paints INSTEAD of the transcript and only dives
+ * when text is submitted — so a boot-resumed TUI showed its replayed history
+ * only after the user's first message. The hub therefore also incubates the
+ * resume TUI with `DSH_TUI_AUTOPROMPT=<this string>`: martty auto-submits it
+ * at boot (banner dives immediately, the text queues until the boot bind),
+ * and the prompt path answers it with a one-line ack instead of a model
+ * turn — scoped to the booting connection (see bootResumeTriggerConnection).
+ * Plain text on purpose: a leading `/` would route through martty's
+ * slash dispatch (whose gates run before agent capabilities are known) and
+ * `!` would run a local shell command.
+ */
+export const BOOT_RESUME_TRIGGER = "resume session";
 /**
  * `session/new` → local placeholder id. The real zcode `session/create` is
  * deferred to first use (`ensureRealSession`) so an editor startup that never
@@ -145,16 +159,36 @@ export function consumeBootResumeTarget() {
  * back to a fresh session so the window still lands on a usable prompt
  * (the retired in-house REPL had the same fallback).
  */
-export async function newSession(server, params) {
+export async function newSession(server, params, client) {
     const bootResume = consumeBootResumeTarget();
     if (bootResume) {
         try {
-            // replayHistory:false — the TUI does not render agent-replayed history
-            // (its transcript comes from its own local recording; it says so in its
-            // status line) and waits for this response, so a full replay would only
-            // stall the boot.
+            // replayHistory:false — a PRE-response replay would arrive for a session
+            // id the client has not adopted yet and be dropped; the tail replay is
+            // deferred past the response instead (below).
             const loaded = await loadSession(server, { sessionId: bootResume }, server.clients.broadcast(), { replayHistory: false });
             log(`session/new: boot-resume → ${bootResume}`);
+            // Deferred tail replay, same as the TUI's /resume (see resumeSession):
+            // once the session/new response is written the booting martty has
+            // adopted the returned session id, so post-response chunks can fold
+            // into its transcript. The chunks sit BEHIND martty's welcome banner
+            // until text is submitted — the DSH_TUI_AUTOPROMPT handshake armed
+            // below drops the banner for the user.
+            if (isMarttyClient(server)) {
+                // Scope the handshake to THIS connection: a phone app attached to the
+                // same bridge may prompt during the boot window and must not disarm it.
+                server.bootResumeTriggerConnection = clientConnectionRoot(client);
+                const cx = server.clients.broadcast();
+                const zcodeSid = server.resolveSid(bootResume);
+                if (zcodeSid) {
+                    setImmediate(() => {
+                        replayResumeHistory(server, cx, bootResume, zcodeSid).catch((e) => {
+                            warn(`session/new boot-resume: TUI history replay failed (non-fatal): ` +
+                                `${e instanceof Error ? e.message : String(e)}`);
+                        });
+                    });
+                }
+            }
             return {
                 sessionId: bootResume,
                 modes: loaded.modes,
@@ -431,7 +465,9 @@ async function resolveResumeTarget(server, acpSid) {
 const MARTTY_RESUME_TAIL = 200;
 /** True when the connecting client is Martty, the bundled TUI frontend. */
 function isMarttyClient(server) {
-    return (server.clientName ?? "").toLowerCase().includes("martty");
+    // Sticky flag first: clientName is last-write-wins and a remote client's
+    // initialize can land between the TUI's initialize and its session/new.
+    return server.marttyClientSeen || (server.clientName ?? "").toLowerCase().includes("martty");
 }
 /**
  * Stream a resumed session's history to the TUI as chunk updates — the same
@@ -654,8 +690,8 @@ export async function loadSession(server, params, cx, opts = {}) {
  * the continuation for real, and only the session/load replay later surfaced
  * the orphaned continuation bubble.
  */
-export async function prompt(server, params, cx, requestId) {
-    let result = await runPrompt(server, params, cx, requestId);
+export async function prompt(server, params, cx, requestId, client) {
+    let result = await runPrompt(server, params, cx, requestId, false, client);
     // Sandbox-allow continuation chaining, BOUNDED: each batched restart
     // cancels the in-flight round and queues a continuation for prompt() to
     // consume. A LATER batch (the user approving a second popup seconds after
@@ -703,7 +739,7 @@ export async function prompt(server, params, cx, requestId) {
     return result;
 }
 /** One prompt round: subscribe-before-send, run the event-driven turn loop. */
-async function runPrompt(server, params, cx, requestId, continuationRound = false) {
+async function runPrompt(server, params, cx, requestId, continuationRound = false, client) {
     // Project-level sandbox flip (ADR-0011): a .zcode/acp/sandbox.json created
     // after the backend spawned unsandboxed must arm on THIS prompt, not on the
     // next bridge restart — kill the old process; the ensureBackend() below
@@ -718,6 +754,25 @@ async function runPrompt(server, params, cx, requestId, continuationRound = fals
     // may drag in an image with no accompanying text).
     if (!text && attachments.length === 0)
         throw new Error("empty prompt");
+    // Boot-resume banner handshake (see BOOT_RESUME_TRIGGER): martty queues the
+    // auto-submitted trigger until its boot bind, so it arrives as the FIRST
+    // prompt OF THAT CONNECTION — ack with one chunk and end the turn without
+    // touching the backend. Scoped to the arming connection's identity: a
+    // phone app attached to the same bridge may prompt inside the boot window
+    // and must neither spend nor disarm the handshake (observed live: its
+    // prompt raced ahead and the trigger leaked to the model). The same
+    // connection submitting anything else first means the auto-submit was
+    // lost — disarm so the trigger text typed manually later stays a normal
+    // prompt.
+    if (server.bootResumeTriggerConnection !== null &&
+        clientConnectionRoot(client) === server.bootResumeTriggerConnection) {
+        server.bootResumeTriggerConnection = null;
+        if (text === BOOT_RESUME_TRIGGER) {
+            await sendTextChunk(cx, params.sessionId, messages().bootResumeAck, randomUUID());
+            log("session/prompt: boot-resume banner handshake acknowledged");
+            return { stopReason: "end_turn" };
+        }
+    }
     // Materialize a lazy session/new placeholder on first use. Placed after the
     // empty-prompt check so an invalid request doesn't create a backend session.
     const zcodeSid = await ensureRealSession(server, params.sessionId);