xiaotime 0.2.0 → 0.3.0

package/dist/ui_state.js

@@ -0,0 +1,460 @@
+"use strict";
+/**
+ * Session-UI state machine for the xiaotime dev CLI.
+ *
+ * SPRINT-CLI-STATE-MACHINE-1 (#6163 / closes #6127) shipped the original
+ * state machine + raw-mode approval prompt. That fix eliminated the
+ * defaults-to-N half of the "yy" double-echo bug but the visible-yy half
+ * persisted because `readline.createInterface({ terminal: true })` attaches
+ * its own keypress handler to stdin that echoes characters via its own
+ * stdout writes; `rl.pause()` stops `line` events but does NOT detach that
+ * echo path, and `setRawMode(true)` only suppresses kernel-level echo, not
+ * readline's.
+ *
+ * SPRINT-CLI-APPROVAL-MENU-1 (#6509) replaces `promptApproval`'s `[y/N]`
+ * one-shot prompt with `promptApprovalMenu` — a three-option numbered menu
+ * (Run / Run + allowlist / Reject + feedback). The rl is explicitly
+ * **closed and recreated** around the menu render so its keypress echo
+ * physically can't fire (the rl object is gone for the duration of the
+ * menu). Persistent close listeners survive the recreation via
+ * `onRlClose()` — callers that need a stable close hook register through
+ * that instead of `getRl().on("close", ...)`.
+ *
+ * The state machine has four states:
+ *
+ *   IDLE              — at the `you:` prompt, awaiting user input.
+ *   GENERATING        — model is streaming tokens (or about to). Spinner.
+ *   RUNNING_TOOL      — a server-side tool is running. Spinner.
+ *   AWAITING_APPROVAL — user must navigate the approval menu for a
+ *                       client-side tool. Main rl is closed; raw stdin
+ *                       captures keystrokes.
+ *
+ * The WS handler in `ws.ts` is the sole driver. Transitions:
+ *
+ *   IDLE              -- user line received    -> GENERATING
+ *   GENERATING        -- text_delta            -> GENERATING (refresh)
+ *   GENERATING        -- tool_call (server)    -> RUNNING_TOOL
+ *   GENERATING        -- tool_call (client+approval) -> AWAITING_APPROVAL
+ *   AWAITING_APPROVAL -- menu selection        -> RUNNING_TOOL
+ *   RUNNING_TOOL      -- tool_result sent      -> GENERATING
+ *   GENERATING        -- message_stop          -> IDLE
+ *   ANY               -- error                 -> IDLE
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionUI = void 0;
+const readline = __importStar(require("readline"));
+const chalk_1 = __importDefault(require("chalk"));
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+const SPINNER_INTERVAL_MS = 100;
+const ELAPSED_THRESHOLD_MS = 3000; // show elapsed time after this
+const MENU_OPTIONS = [
+    "Run",
+    "Run and don't ask again",
+    "Reject and tell Claude why",
+];
+const MENU_HINT = "(1-3, ↑↓ Enter, Esc to reject)";
+class SessionUI {
+    state = "idle";
+    spinnerTimer = null;
+    spinnerFrame = 0;
+    spinnerStartedAt = 0;
+    spinnerLabel = "";
+    // True only while the spinner has written something to the line and
+    // we owe a clear. Set on first frame, cleared on stopSpinner. Lets
+    // text_delta callers know they need to clear the spinner line
+    // before printing the first token.
+    spinnerLineDirty = false;
+    rl;
+    lineListener = null;
+    /**
+     * Close-listener callbacks that should survive rl recreations. The
+     * approval-menu path closes + recreates `rl` to physically detach
+     * readline's keypress echo. ws.ts registers its "Session paused"
+     * resume hint here so it stays attached across recreations.
+     */
+    closeListeners = [];
+    constructor() {
+        this.rl = this._makeRl();
+    }
+    /** Hand the underlying readline to callers that need it for cleanup. */
+    getRl() {
+        return this.rl;
+    }
+    /**
+     * Register a callback to fire when the rl reports a non-suppressed
+     * `close` event (the only one users observe is Ctrl+C at the main
+     * prompt — close-during-approval is suppressed via removeAllListeners
+     * before `rl.close()`). Callbacks are re-attached on every rl
+     * recreation so they outlive `promptApprovalMenu`.
+     */
+    onRlClose(listener) {
+        this.closeListeners.push(listener);
+        this.rl.on("close", listener);
+    }
+    /** Set the explicit current state. Drives spinner start/stop. */
+    setState(next) {
+        if (next === this.state)
+            return;
+        const prev = this.state;
+        this.state = next;
+        // Transition out of any spinner state.
+        if (prev === "generating" || prev === "running_tool") {
+            this.stopSpinner();
+        }
+        // Transition in.
+        if (next === "generating") {
+            this.startSpinner("thinking");
+        }
+        else if (next === "running_tool") {
+            this.startSpinner("running tool");
+        }
+        // `awaiting_approval` / `idle` => no spinner. Approval-menu path
+        // takes over stdin in `promptApprovalMenu`.
+    }
+    getState() {
+        return this.state;
+    }
+    /** Wait for one line of user input on the main rl. */
+    promptLine() {
+        return new Promise((resolve) => {
+            // Drop any previous one-shot listener that didn't fire.
+            if (this.lineListener) {
+                this.rl.off("line", this.lineListener);
+            }
+            const listener = (line) => {
+                this.lineListener = null;
+                resolve(line.trim());
+            };
+            this.lineListener = listener;
+            this.rl.once("line", listener);
+        });
+    }
+    /**
+     * Three-option numbered approval menu. Replaces the pre-#6509
+     * `[y/N]` one-shot prompt.
+     *
+     * Visual:
+     *   ❯ 1. Run
+     *     2. Run and don't ask again
+     *     3. Reject and tell Claude why
+     *     (1-3, ↑↓ Enter, Esc to reject)
+     *
+     * Controls:
+     *   - Number key 1/2/3       — one-shot select
+     *   - Arrow Up/Down          — move focus
+     *   - Enter                  — select focused
+     *   - Esc                    — equivalent to option 3 (reject)
+     *   - Ctrl+C                 — reject + propagate SIGINT (cancels session)
+     *
+     * The rl is closed before the menu render and recreated after. This
+     * physically removes readline's keypress echo from stdin for the
+     * duration of the menu — the bug fix the #6163 patch attempted via
+     * `rl.pause()` (which only stops `line` events, not the keypress
+     * echo). Persistent close listeners are stashed in
+     * `this.closeListeners` and re-attached on recreate; the close event
+     * triggered by THIS close() is suppressed via removeAllListeners
+     * before the call so it doesn't fire the "Session paused" hint.
+     *
+     * For option 3, after the menu resolves the recreated rl prompts
+     * once for a free-form rejection reason (line-mode). Empty input is
+     * allowed.
+     *
+     * The returned `allowlistRequested: true` (option 2) is a signal to
+     * the caller — PR2 wires it to write the pattern to
+     * `~/.xiaotime/settings.json`. PR1 callers may ignore it.
+     */
+    async promptApprovalMenu(toolHeader) {
+        this.setState("awaiting_approval");
+        if (toolHeader) {
+            process.stdout.write(toolHeader);
+        }
+        // Recreate the rl in `finally` so it ALWAYS lands — even if the
+        // no-TTY bail-out fires inside `_renderMenuAndGetSelection`. The
+        // next `promptLine` call needs a live rl regardless of how the
+        // menu resolved.
+        let selectedIdx;
+        try {
+            selectedIdx = await this._renderMenuAndGetSelection();
+        }
+        finally {
+            this.rl = this._makeRl();
+        }
+        // -1 → bail-out from `_renderMenuAndGetSelection` because stdin is
+        // not a TTY (CI / piped invocation / test runner). Skip the
+        // rejection-reason readline prompt because nothing would feed it.
+        if (selectedIdx === -1) {
+            return { approved: false, rejectReason: "(no TTY)" };
+        }
+        if (selectedIdx === 0) {
+            process.stdout.write(chalk_1.default.green("  ✓ Approved\n"));
+            return { approved: true, allowlistRequested: false };
+        }
+        if (selectedIdx === 1) {
+            process.stdout.write(chalk_1.default.green("  ✓ Approved (allowlist requested)\n"));
+            return { approved: true, allowlistRequested: true };
+        }
+        // selectedIdx === 2 — rejection. Prompt for free-form reason via
+        // the recreated rl (line-mode, single line, empty allowed).
+        process.stdout.write(chalk_1.default.yellow("  Reason (Enter to send empty): "));
+        const reason = await new Promise((resolve) => {
+            this.rl.once("line", (line) => resolve(line.trim()));
+        });
+        return { approved: false, rejectReason: reason };
+    }
+    // ── Menu internals ───────────────────────────────────────────────
+    _makeRl() {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+            terminal: true,
+        });
+        for (const l of this.closeListeners) {
+            rl.on("close", l);
+        }
+        return rl;
+    }
+    async _renderMenuAndGetSelection() {
+        // Suppress the close-listener side effects for this internal
+        // close — we don't want the "Session paused" hint firing
+        // mid-approval. Stash the listeners on this.closeListeners so
+        // _makeRl can re-attach them after the menu resolves.
+        this.rl.removeAllListeners("close");
+        this.rl.close();
+        const stdin = process.stdin;
+        // Bail BEFORE rendering the menu if stdin isn't a TTY. setRawMode
+        // can silently no-op on non-TTY stdin in some environments
+        // (vitest, piped invocation) — in that case the data listener
+        // would attach but never receive bytes, hanging the caller
+        // indefinitely. -1 sentinel tells promptApprovalMenu to skip the
+        // rejection-reason prompt (which would also hang).
+        if (!stdin.isTTY) {
+            process.stdout.write(chalk_1.default.red("Rejected (no TTY)\n"));
+            return -1;
+        }
+        const wasRaw = stdin.isRaw === true;
+        try {
+            stdin.setRawMode(true);
+        }
+        catch {
+            // Belt + suspenders — isTTY guard above should cover this, but a
+            // mid-session TTY loss could surface here.
+            process.stdout.write(chalk_1.default.red("Rejected (no TTY)\n"));
+            return -1;
+        }
+        stdin.resume();
+        let focusedIdx = 0;
+        this._renderMenu(focusedIdx);
+        // #6532 CR-r1: function-level finally guarantees onData removal +
+        // setRawMode restore even if the Promise body throws or the
+        // process is signalled. The previous design relied on every
+        // `finish()` call doing the cleanup, leaving leak windows when
+        // onData itself threw or when an awaiter rejected without
+        // routing through finish().
+        let onData = null;
+        try {
+            return await new Promise((resolve, reject) => {
+                const finish = (idx) => {
+                    this._clearMenu();
+                    resolve(idx);
+                };
+                onData = (chunk) => {
+                    try {
+                        const s = chunk.toString();
+                        // Ctrl+C → reject + propagate SIGINT so the WS handler's
+                        // close path runs and the session ends cleanly.
+                        if (s.includes("\x03")) {
+                            finish(2);
+                            process.kill(process.pid, "SIGINT");
+                            return;
+                        }
+                        // Allowlisted escape-prefixed sequences. Esc alone (no
+                        // `[`) → option 3 (reject). Arrow up/down rotate focus.
+                        // Any OTHER `\x1b`-prefixed input is explicitly rejected
+                        // (logged to stderr at debug level + ignored) per #6532
+                        // CR-r1: previously such sequences silently no-op'd,
+                        // which is currently safe due to the no-echo policy but
+                        // would become a terminal-injection vector if a future
+                        // diagnostic change started echoing unknown input.
+                        if (s.charCodeAt(0) === 0x1b) {
+                            if (s === "\x1b") {
+                                finish(2);
+                                return;
+                            }
+                            if (s === "\x1b[A") {
+                                focusedIdx =
+                                    (focusedIdx - 1 + MENU_OPTIONS.length) % MENU_OPTIONS.length;
+                                this._rerenderMenu(focusedIdx);
+                                return;
+                            }
+                            if (s === "\x1b[B") {
+                                focusedIdx = (focusedIdx + 1) % MENU_OPTIONS.length;
+                                this._rerenderMenu(focusedIdx);
+                                return;
+                            }
+                            // Unrecognized escape sequence — log + ignore. Use the
+                            // hex form so a malicious paste of bell/CSI bytes is
+                            // not re-rendered through stderr.
+                            const hex = Array.from(chunk)
+                                .map((b) => b.toString(16).padStart(2, "0"))
+                                .join(" ");
+                            process.stderr.write(chalk_1.default.dim(`\n[approval-menu] ignored unrecognized escape: ${hex}\n`));
+                            return;
+                        }
+                        // Number-key one-shot selectors.
+                        if (s === "1" || s === "2" || s === "3") {
+                            finish(Number(s) - 1);
+                            return;
+                        }
+                        // Enter on focused row.
+                        if (s === "\r" || s === "\n") {
+                            finish(focusedIdx);
+                            return;
+                        }
+                        // Anything else — ignore. No echo, no bounce. The visible
+                        // menu stays put so the user can try again.
+                    }
+                    catch (err) {
+                        reject(err);
+                    }
+                };
+                stdin.on("data", onData);
+            });
+        }
+        finally {
+            if (onData) {
+                stdin.removeListener("data", onData);
+            }
+            try {
+                stdin.setRawMode(wasRaw);
+            }
+            catch {
+                /* setRawMode can throw if stdin lost its TTY mid-session. */
+            }
+        }
+    }
+    /** Total lines the menu occupies: one per option + one hint line. */
+    _menuLineCount() {
+        return MENU_OPTIONS.length + 1;
+    }
+    _renderMenu(focusedIdx) {
+        for (let i = 0; i < MENU_OPTIONS.length; i++) {
+            const marker = i === focusedIdx ? chalk_1.default.cyan("❯") : " ";
+            const numText = chalk_1.default.cyan(`${i + 1}.`);
+            process.stdout.write(`  ${marker} ${numText} ${MENU_OPTIONS[i]}\n`);
+        }
+        process.stdout.write(chalk_1.default.dim(`  ${MENU_HINT}\n`));
+    }
+    _rerenderMenu(focusedIdx) {
+        // Move cursor up to top of menu, clear each line, redraw.
+        const lines = this._menuLineCount();
+        process.stdout.write(`\x1b[${lines}A`);
+        for (let i = 0; i < MENU_OPTIONS.length; i++) {
+            process.stdout.write("\x1b[K");
+            const marker = i === focusedIdx ? chalk_1.default.cyan("❯") : " ";
+            const numText = chalk_1.default.cyan(`${i + 1}.`);
+            process.stdout.write(`  ${marker} ${numText} ${MENU_OPTIONS[i]}\n`);
+        }
+        process.stdout.write("\x1b[K");
+        process.stdout.write(chalk_1.default.dim(`  ${MENU_HINT}\n`));
+    }
+    _clearMenu() {
+        const lines = this._menuLineCount();
+        process.stdout.write(`\x1b[${lines}A`);
+        for (let i = 0; i < lines; i++) {
+            process.stdout.write("\x1b[K");
+            if (i < lines - 1)
+                process.stdout.write("\n");
+        }
+        // Cursor left at start of the (now-cleared) first menu line so
+        // the post-selection echo lands there cleanly.
+        process.stdout.write(`\x1b[${lines - 1}A\r`);
+    }
+    // ── Spinner internals ────────────────────────────────────────────
+    startSpinner(label) {
+        this.spinnerLabel = label;
+        this.spinnerFrame = 0;
+        this.spinnerStartedAt = Date.now();
+        this.spinnerLineDirty = false;
+        this.spinnerTimer = setInterval(() => this.renderSpinnerFrame(), SPINNER_INTERVAL_MS);
+        // Render the first frame immediately so there's no perceptible
+        // delay between state-set and visible feedback.
+        this.renderSpinnerFrame();
+    }
+    renderSpinnerFrame() {
+        const frame = SPINNER_FRAMES[this.spinnerFrame % SPINNER_FRAMES.length];
+        const elapsed = Date.now() - this.spinnerStartedAt;
+        const elapsedStr = elapsed >= ELAPSED_THRESHOLD_MS
+            ? chalk_1.default.dim(` (${Math.floor(elapsed / 1000)}s)`)
+            : "";
+        // Clear-to-end-of-line (`\x1b[K`) after the spinner content
+        // rather than trailing spaces — robust against terminals where
+        // the last frame was longer than the current one (the trailing
+        // spaces approach left orphaned chars on shrinking labels).
+        process.stdout.write(`\r${chalk_1.default.cyan(frame)} ${chalk_1.default.dim(this.spinnerLabel)}${elapsedStr}\x1b[K`);
+        this.spinnerLineDirty = true;
+        this.spinnerFrame++;
+    }
+    stopSpinner() {
+        if (this.spinnerTimer) {
+            clearInterval(this.spinnerTimer);
+            this.spinnerTimer = null;
+        }
+        if (this.spinnerLineDirty) {
+            // Clear the spinner line so the next print doesn't overlap.
+            process.stdout.write("\r\x1b[K");
+            this.spinnerLineDirty = false;
+        }
+    }
+    /** Called by the text_delta renderer the first time a real model
+     * token arrives during a `generating` state. Clears the spinner so
+     * the token prints cleanly, but leaves the state at `generating`
+     * (token streaming continues without re-spinning). */
+    onFirstToken() {
+        if (this.spinnerLineDirty) {
+            process.stdout.write("\r\x1b[K");
+            this.spinnerLineDirty = false;
+        }
+        if (this.spinnerTimer) {
+            clearInterval(this.spinnerTimer);
+            this.spinnerTimer = null;
+        }
+    }
+}
+exports.SessionUI = SessionUI;
+//# sourceMappingURL=ui_state.js.map

package/dist/ui_state.js.map

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

package/dist/ws.d.ts

@@ -1,5 +1,10 @@
 /**
  * WebSocket connection and main message loop.
+ *
+ * SPRINT-CLI-STATE-MACHINE-1 (#6163 / closes #6127) — drives the
+ * SessionUI state machine from incoming WS events so the user gets
+ * a spinner while the model is generating / a tool is running, and
+ * approval prompts don't race the main rl on keystrokes.
  */
 export declare function runSession(sessionId: string): Promise<void>;
 //# sourceMappingURL=ws.d.ts.map

package/dist/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"AAAA;;GAEG;AAeH,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0HjE"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgBH,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgMjE"}