@aria-cli/tools 1.0.19 → 1.0.33

package/dist-cjs/executors/pty-session-store.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PTYSessionStore = void 0;
+class PTYSessionStore {
+    sessions = new Map();
+    add(pid, session) {
+        this.sessions.set(pid, session);
+    }
+    get(pid) {
+        return this.sessions.get(pid);
+    }
+    has(pid) {
+        return this.sessions.has(pid);
+    }
+    remove(pid) {
+        this.sessions.delete(pid);
+    }
+    async closeAll() {
+        const sessions = Array.from(this.sessions.values());
+        this.sessions.clear();
+        await Promise.allSettled(sessions.map((s) => {
+            try {
+                return Promise.resolve(s.close());
+            }
+            catch {
+                return Promise.resolve();
+            }
+        }));
+    }
+    get size() {
+        return this.sessions.size;
+    }
+}
+exports.PTYSessionStore = PTYSessionStore;
+//# sourceMappingURL=pty-session-store.js.map

package/dist-cjs/executors/pty.js

@@ -0,0 +1,289 @@
+"use strict";
+/**
+ * @aria/tools - PTY executor for interactive terminal programs
+ *
+ * Provides PTY (pseudo-terminal) support for running interactive programs
+ * that require a terminal environment (like vim, less, etc.)
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PTYSession = exports.PTYError = exports.PTYTimeoutError = void 0;
+exports.createPTYSession = createPTYSession;
+exports.runInPTY = runInPTY;
+function loadNodePty() {
+    try {
+        return require("node-pty"); // eslint-disable-line
+    }
+    catch {
+        throw new Error("Interactive PTY sessions require node-pty (optional dependency).\n" +
+            "Install it with: npm install node-pty\n" +
+            "Or use non-interactive mode: spawn(interactive=false)");
+    }
+}
+const shell_js_1 = require("./shell.js");
+/**
+ * Error thrown when a PTY operation times out.
+ */
+class PTYTimeoutError extends Error {
+    output;
+    constructor(message, output) {
+        super(message);
+        this.output = output;
+        this.name = "PTYTimeoutError";
+    }
+}
+exports.PTYTimeoutError = PTYTimeoutError;
+/**
+ * Error thrown when a PTY operation fails.
+ */
+class PTYError extends Error {
+    output;
+    constructor(message, output) {
+        super(message);
+        this.output = output;
+        this.name = "PTYError";
+    }
+}
+exports.PTYError = PTYError;
+/**
+ * A session wrapping a PTY process.
+ * Provides methods for interacting with the process and collecting output.
+ */
+class PTYSession {
+    static MAX_OUTPUT = 10 * 1024 * 1024; // 10MB
+    _output = "";
+    _isRunning = true;
+    _exitCode;
+    _exitPromise;
+    _exitResolve;
+    _pty;
+    _dataDisposable;
+    _exitDisposable;
+    constructor(pty) {
+        this._pty = pty;
+        // Set up exit promise
+        this._exitPromise = new Promise((resolve) => {
+            this._exitResolve = resolve;
+        });
+        // Collect output with buffer cap
+        this._dataDisposable = pty.onData((data) => {
+            this._output += data;
+            if (this._output.length > PTYSession.MAX_OUTPUT) {
+                this._output = this._output.slice(-PTYSession.MAX_OUTPUT);
+            }
+        });
+        // Handle exit
+        this._exitDisposable = pty.onExit(({ exitCode }) => {
+            this._isRunning = false;
+            this._exitCode = exitCode;
+            this._exitResolve(exitCode);
+        });
+    }
+    /**
+     * Write data to the terminal input.
+     */
+    write(data) {
+        if (!this._isRunning) {
+            throw new PTYError("Cannot write to a closed PTY session");
+        }
+        this._pty.write(data);
+    }
+    /**
+     * Resize the terminal.
+     */
+    resize(cols, rows) {
+        if (!this._isRunning) {
+            throw new PTYError("Cannot resize a closed PTY session");
+        }
+        this._pty.resize(cols, rows);
+    }
+    /**
+     * Wait for a pattern to appear in the output.
+     * @param pattern String or RegExp to match
+     * @param timeoutMs Timeout in milliseconds (default: 5000)
+     * @returns The output accumulated up to and including the match
+     */
+    async waitFor(pattern, timeoutMs = 5000) {
+        const startTime = Date.now();
+        const regex = typeof pattern === "string" ? new RegExp(escapeRegExp(pattern)) : pattern;
+        // Check if pattern already matches
+        if (regex.test(this._output)) {
+            return this._output;
+        }
+        return new Promise((resolve, reject) => {
+            let checkInterval;
+            let timeoutHandle;
+            const cleanup = () => {
+                if (checkInterval)
+                    clearInterval(checkInterval);
+                if (timeoutHandle)
+                    clearTimeout(timeoutHandle);
+            };
+            const check = () => {
+                if (regex.test(this._output)) {
+                    cleanup();
+                    resolve(this._output);
+                    return true;
+                }
+                if (!this._isRunning) {
+                    cleanup();
+                    reject(new PTYError(`Process exited before pattern was found: ${pattern}`, this._output));
+                    return true;
+                }
+                return false;
+            };
+            // Initial check
+            if (check())
+                return;
+            // Set up polling
+            checkInterval = setInterval(() => {
+                check();
+            }, 10);
+            // Set up timeout
+            timeoutHandle = setTimeout(() => {
+                cleanup();
+                const elapsed = Date.now() - startTime;
+                reject(new PTYTimeoutError(`Timeout (${elapsed}ms) waiting for pattern: ${pattern}`, this._output));
+            }, timeoutMs);
+        });
+    }
+    /**
+     * Wait for the process to exit.
+     * @param timeoutMs Timeout in milliseconds (default: 30000)
+     * @returns The complete output
+     */
+    async waitForExit(timeoutMs = 30000) {
+        if (!this._isRunning) {
+            return this._output;
+        }
+        return new Promise((resolve, reject) => {
+            let timeoutHandle;
+            timeoutHandle = setTimeout(() => {
+                reject(new PTYTimeoutError(`Timeout (${timeoutMs}ms) waiting for process to exit`, this._output));
+            }, timeoutMs);
+            this._exitPromise
+                .then(() => {
+                if (timeoutHandle)
+                    clearTimeout(timeoutHandle);
+                resolve(this._output);
+            })
+                .catch(reject);
+        });
+    }
+    /**
+     * Kill the process.
+     * @param signal Signal to send (default: SIGHUP on Unix)
+     */
+    kill(signal) {
+        if (!this._isRunning) {
+            return;
+        }
+        try {
+            this._pty.kill(signal);
+        }
+        catch {
+            // Process may already be dead
+        }
+    }
+    /**
+     * Close the session and clean up resources.
+     */
+    close() {
+        // Kill the process first before disposing handlers
+        if (this._isRunning) {
+            this.kill("SIGKILL");
+            // Mark as not running since we won't receive the exit event
+            // after disposing the handlers
+            this._isRunning = false;
+            // Resolve the exit promise to unblock any waiters
+            // Use -1 to indicate forced termination
+            this._exitResolve(-1);
+        }
+        this._dataDisposable.dispose();
+        this._exitDisposable.dispose();
+    }
+    /**
+     * Get the current output buffer.
+     */
+    get output() {
+        return this._output;
+    }
+    /**
+     * Check if the process is still running.
+     */
+    get isRunning() {
+        return this._isRunning;
+    }
+    /**
+     * Get the process ID.
+     */
+    get pid() {
+        return this._pty.pid;
+    }
+    /**
+     * Get the exit code (undefined if still running).
+     */
+    get exitCode() {
+        return this._exitCode;
+    }
+    /**
+     * Get the current terminal columns.
+     */
+    get cols() {
+        return this._pty.cols;
+    }
+    /**
+     * Get the current terminal rows.
+     */
+    get rows() {
+        return this._pty.rows;
+    }
+}
+exports.PTYSession = PTYSession;
+/**
+ * Create a new PTY session.
+ * @param options Options for the PTY
+ * @returns A PTYSession wrapping the process
+ */
+async function createPTYSession(options) {
+    const defaultCols = 80;
+    const defaultRows = 24;
+    const pty = loadNodePty().spawn(options.command, options.args ?? [], {
+        name: "xterm-256color",
+        cols: options.cols ?? defaultCols,
+        rows: options.rows ?? defaultRows,
+        cwd: options.cwd ?? process.cwd(),
+        env: {
+            ...(0, shell_js_1.sanitizeEnv)(options.env),
+            TERM: "xterm-256color",
+        },
+    });
+    return new PTYSession(pty);
+}
+/**
+ * Run a command in a PTY and wait for it to complete.
+ * This is a convenience function for commands that don't require interaction.
+ *
+ * @param options Options for the PTY, with optional timeout
+ * @returns The output and exit code
+ */
+async function runInPTY(options) {
+    const { timeoutMs = 30000, ...ptyOptions } = options;
+    const session = await createPTYSession(ptyOptions);
+    try {
+        const output = await session.waitForExit(timeoutMs);
+        return {
+            output,
+            exitCode: session.exitCode ?? 0,
+        };
+    }
+    finally {
+        session.close();
+    }
+}
+/**
+ * Escape special regex characters in a string.
+ */
+function escapeRegExp(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+//# sourceMappingURL=pty.js.map

package/dist-cjs/executors/restart.js

@@ -0,0 +1,156 @@
+"use strict";
+/**
+ * @aria/tools - Restart executor
+ *
+ * Single restart path for both TUI and daemon:
+ * Register an 'exit' handler to spawn a replacement process, then SIGINT
+ * the current process for graceful shutdown. The replacement starts fresh
+ * and goes through normal startup (heap check, createCliContext, REPL/daemon).
+ */
+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;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeRestart = executeRestart;
+const utils_js_1 = require("./utils.js");
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const os = __importStar(require("node:os"));
+const types_1 = require("@aria-cli/types");
+function findBunWorkspaceRoot(startDir) {
+    let dir = (0, node_path_1.resolve)(startDir);
+    while (true) {
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(dir, "bunfig.toml")) || (0, node_fs_1.existsSync)((0, node_path_1.join)(dir, "bun.lock")))
+            return dir;
+        const parent = (0, node_path_1.dirname)(dir);
+        if (parent === dir)
+            return null;
+        dir = parent;
+    }
+}
+function getBunCommand() {
+    return process.platform === "win32" ? "bun.exe" : "bun";
+}
+async function rebuildWorkspaceIfPresent(startDir) {
+    const root = findBunWorkspaceRoot(startDir);
+    if (!root)
+        return { attempted: false };
+    const bun = getBunCommand();
+    await new Promise((resolvePromise, rejectPromise) => {
+        const child = (0, node_child_process_1.spawn)(bun, ["run", "build"], {
+            cwd: root,
+            env: process.env,
+            stdio: "inherit",
+        });
+        child.on("error", rejectPromise);
+        child.on("close", (code) => {
+            if (code === 0)
+                resolvePromise();
+            else
+                rejectPromise(new Error(`bun run build failed with exit code ${code ?? "unknown"}`));
+        });
+    });
+    return { attempted: true };
+}
+/**
+ * Find the daemon PID for the current ARIA_HOME by scanning owner records.
+ * Owner records live at $RUNTIME_ROOT/owners/*.json where RUNTIME_ROOT is
+ * XDG_RUNTIME_DIR/aria or ~/.aria/run.
+ */
+function findDaemonPid() {
+    const ariaHome = process.env.ARIA_HOME?.trim() || (0, node_path_1.join)(os.homedir(), ".aria");
+    const runtimeDir = process.env.XDG_RUNTIME_DIR?.trim();
+    const runtimeRoot = runtimeDir ? (0, node_path_1.join)(runtimeDir, "aria") : (0, node_path_1.join)(ariaHome, "run");
+    const ownersDir = (0, node_path_1.join)(runtimeRoot, "owners");
+    if (!(0, node_fs_1.existsSync)(ownersDir))
+        return null;
+    const canonicalHome = (0, node_path_1.resolve)(ariaHome);
+    for (const file of (0, node_fs_1.readdirSync)(ownersDir).filter((f) => f.endsWith(".json"))) {
+        try {
+            const record = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(ownersDir, file), "utf8"));
+            if (record.ariaHome && (0, node_path_1.resolve)(record.ariaHome) === canonicalHome) {
+                return typeof record.runtimePid === "number" ? record.runtimePid : null;
+            }
+        }
+        catch {
+            // Skip malformed records
+        }
+    }
+    return null;
+}
+async function executeRestart(input, ctx) {
+    if (ctx.abortSignal?.aborted)
+        return (0, utils_js_1.fail)("Operation cancelled");
+    const reason = (input.reason ?? "").trim() || "Restart requested";
+    // Note: tool definition has requiresConfirmation: true, so the framework
+    // already prompts the user before execute() is called. No need to confirm again.
+    process.stderr.write(`[aria] Rebuilding workspace before restart...\n`);
+    try {
+        const rebuilt = await rebuildWorkspaceIfPresent(ctx.workingDir || process.cwd());
+        if (!rebuilt.attempted) {
+            process.stderr.write(`[aria] No bun workspace detected; skipping build\n`);
+        }
+    }
+    catch (error) {
+        process.stderr.write(`[aria] Build failed; continuing restart: ${error.message}\n`);
+    }
+    process.stderr.write(`[aria] Restarting: ${reason}\n`);
+    const sessionId = process.env[types_1.RESUME_SESSION_ENV] ?? null;
+    const arionName = process.env[types_1.RESUME_ARION_ENV] || "ARIA";
+    // Write disk-backed marker so the replacement process can resume the session.
+    (0, types_1.writeRelaunchMarker)({
+        sessionId,
+        arionName,
+        pid: process.ppid || process.pid,
+        timestamp: new Date().toISOString(),
+    });
+    // Spawn replacement on exit, then SIGINT for graceful shutdown.
+    // Works for both TUI and daemon — no supervisor needed.
+    const targetPid = findDaemonPid() ?? process.pid;
+    process.once("exit", () => {
+        (0, node_child_process_1.spawn)(process.execPath, [...process.execArgv, ...process.argv.slice(1)], {
+            detached: true,
+            stdio: "ignore",
+        }).unref();
+    });
+    process.stderr.write(`[aria] Sending SIGINT to pid ${targetPid} for graceful restart\n`);
+    try {
+        process.kill(targetPid, "SIGINT");
+    }
+    catch {
+        process.kill(process.pid, "SIGINT");
+    }
+    return (0, utils_js_1.success)("Restarting...");
+}
+//# sourceMappingURL=restart.js.map