@camerontaylor/paseo-cli 0.13.0-fork.2 → 0.15.2-fork.261106-2234.gae9279071e78

package/dist/commands/daemon/restart.js

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { readDaemonInstance, isSameDaemonInstance, DaemonInstanceError, } from "@camerontaylor/paseo-server/daemon-control";
+import { readDaemonInstance, isSameDaemonInstance, DaemonInstanceError, retryUnconfirmedTerminalCleanup, TerminalCleanupNotConfirmedError, } from "@camerontaylor/paseo-server/daemon-control";
 import { setTimeout as delay } from "node:timers/promises";
 import { connectToDaemon } from "../../utils/client.js";
 import { withOutput } from "../../output/index.js";
@@ -9,12 +9,29 @@ import { parseTimeoutMs, rejectRemovedLaunchFlags } from "./local-daemon.js";
 export function daemonRestartCommand() {
     return rejectRemovedLaunchFlags(addJsonAndDaemonHostOptions(new Command("restart").description("Restart the selected daemon worker, retaining its supervisor launch")))
         .option("--timeout <seconds>", "Replacement readiness deadline (default: 600)")
+        .option("--kill-terminals", "Close every terminal instead of keeping them across the restart")
         .action(withOutput(runRestartCommand));
 }
 export async function runRestartCommand(options, _command) {
     const target = options.daemonTarget;
     const deadline = Date.now() + parseTimeoutMs(options.timeout);
     const remaining = () => Math.max(1, deadline - Date.now());
+    const killTerminals = options.killTerminals === true;
+    // The supervisor reaps before the respawn and the replacement retries what that left;
+    // anything still named by a closing record survived both. A local caller retries once more
+    // itself; a remote one has only what the replacement reports.
+    const confirmTerminalsClosed = async (status) => {
+        if (!killTerminals)
+            return;
+        if (target.kind === "instance") {
+            await retryUnconfirmedTerminalCleanup(target.home);
+            return;
+        }
+        // Absent on daemons without terminalsSurviveRestart, which have no terminal cleanup.
+        const unconfirmed = status.terminalCleanupUnconfirmed ?? [];
+        if (unconfirmed.length > 0)
+            throw new TerminalCleanupNotConfirmedError(unconfirmed);
+    };
     const instance = target.kind === "instance" ? await readDaemonInstance(target.home) : null;
     async function checkSupervisor() {
         if (target.kind !== "instance")
@@ -37,7 +54,10 @@ export async function runRestartCommand(options, _command) {
         workerPid = (await client.getDaemonStatus({ timeout: remaining() })).pid;
         await checkSupervisor();
         try {
-            await client.restartServer("cli_restart", undefined, { timeout: remaining() });
+            await client.restartServer("cli_restart", undefined, {
+                timeout: remaining(),
+                killTerminals,
+            });
             acknowledged = true;
         }
         catch (error) {
@@ -63,6 +83,7 @@ export async function runRestartCommand(options, _command) {
                 const status = await replacement.getDaemonStatus({ timeout: remaining() });
                 if (status.pid !== workerPid) {
                     await checkSupervisor();
+                    await confirmTerminalsClosed(status);
                     return {
                         type: "single",
                         data: {

package/dist/commands/daemon/status.js

@@ -84,6 +84,7 @@ async function probeDaemonStatus(target, instance, local) {
                 daemonNode: status.nodePath,
                 providers: status.providers,
                 relay: status.relay,
+                ...(status.terminalsUnavailable ? { terminals: status.terminalsUnavailable } : {}),
             };
         }
     }

package/dist/commands/daemon/stop.d.ts

@@ -1,7 +1,29 @@
 import { Command } from "commander";
+import { type DaemonClient } from "@camerontaylor/paseo-client/internal/daemon-client";
+import { type ConnectOptions } from "../../utils/client.js";
 import { type CommandOptions } from "../../output/index.js";
 export declare function daemonStopCommand(): Command;
-export declare function runStopCommand(options: CommandOptions, _command: Command): Promise<{
+export type StopDaemonConnection = Pick<DaemonClient, "getLastServerInfoMessage" | "shutdownServer" | "close">;
+export interface StopCommandDeps {
+    connectToDaemon(options: ConnectOptions): Promise<StopDaemonConnection>;
+}
+export declare const runStopCommand: (options: CommandOptions, _command: Command) => Promise<{
+    type: "single";
+    data: {
+        action: string;
+        home?: string;
+        host?: string;
+        pid?: number | null;
+        forced?: boolean;
+        usedLifecycleRpc?: boolean;
+    };
+    schema: {
+        idField: "action";
+        columns: never[];
+        renderHuman: () => string;
+    };
+}>;
+export declare function createStopCommandRunner(deps: StopCommandDeps): (options: CommandOptions, _command: Command) => Promise<{
     type: "single";
     data: {
         action: string;

package/dist/commands/daemon/stop.js

@@ -1,4 +1,5 @@
 import { Command } from "commander";
+import { requireTerminalKeepCapability, } from "@camerontaylor/paseo-client/internal/daemon-client";
 import { stopDaemonInstance } from "@camerontaylor/paseo-server/daemon-control";
 import { connectToDaemon } from "../../utils/client.js";
 import { withOutput } from "../../output/index.js";
@@ -9,18 +10,28 @@ export function daemonStopCommand() {
     return addJsonAndDaemonHostOptions(new Command("stop").description("Stop the selected daemon"))
         .option("--timeout <seconds>", "Graceful exit deadline (default: 15)")
         .option("--force", "Permit forced local process cleanup")
+        .option("--keep-terminals", "Leave terminals running; the next daemon started for this home takes them back")
         .option("--kill-timeout <seconds>", "Forced exit deadline (default: 3)")
         .action(withOutput(runStopCommand));
 }
-export async function runStopCommand(options, _command) {
+export const runStopCommand = createStopCommandRunner({ connectToDaemon });
+export function createStopCommandRunner(deps) {
+    return (options, _command) => runStop(options, deps);
+}
+async function runStop(options, deps) {
     const target = options.daemonTarget;
     const timeoutMs = parseTimeoutMs(options.timeout, 15000);
     const deadline = Date.now() + timeoutMs;
     const remaining = () => Math.max(1, deadline - Date.now());
+    const keepTerminals = options.keepTerminals === true;
     const requestShutdown = async (instance) => {
-        const client = await connectToDaemon({ target, timeout: remaining(), instance });
+        const client = await deps.connectToDaemon({ target, timeout: remaining(), instance });
         try {
-            await client.shutdownServer({ timeout: remaining() });
+            // Checked on the connection that carries the shutdown: a daemon without the capability
+            // would close the terminals it was asked to keep.
+            if (keepTerminals)
+                requireTerminalKeepCapability(client, describeDaemonTarget(target));
+            await client.shutdownServer({ timeout: remaining(), keepTerminals });
         }
         finally {
             await client.close();
@@ -31,10 +42,16 @@ export async function runStopCommand(options, _command) {
             code: "INVALID_OPTIONS",
             message: "--force requires a local --home; an endpoint gives no remote process authority.",
         };
+    if (options.force && keepTerminals)
+        throw {
+            code: "INVALID_OPTIONS",
+            message: "--force kills terminals; it cannot be combined with --keep-terminals.",
+        };
     const result = target.kind === "instance"
         ? {
             ...(await stopDaemonInstance(target.home, {
                 force: options.force === true,
+                keepTerminals,
                 timeoutMs,
                 killTimeoutMs: parseTimeoutMs(options.killTimeout, 3000),
                 requestShutdown,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camerontaylor/paseo-cli",
-  "version": "0.13.0-fork.2",
+  "version": "0.15.2-fork.261106-2234.gae9279071e78",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@camerontaylor/paseo-client": "0.13.0-fork.2",
-    "@camerontaylor/paseo-protocol": "0.13.0-fork.2",
-    "@camerontaylor/paseo-server": "0.13.0-fork.2",
+    "@camerontaylor/paseo-client": "0.15.2-fork.261106-2234.gae9279071e78",
+    "@camerontaylor/paseo-protocol": "0.15.2-fork.261106-2234.gae9279071e78",
+    "@camerontaylor/paseo-server": "0.15.2-fork.261106-2234.gae9279071e78",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",