@monotykamary/localterm-server 2.74.1 → 2.76.0

package/dist/index.js

@@ -22,7 +22,7 @@ import { detectWithExplicitPort } from "./cdp/discover-explicit-endpoint.js";
 import { DaemonConfigStore } from "./daemon-config-store.js";
 import { formatCandidates, resolveCandidates, resolveCompletionContext, } from "./completion/index.js";
 import { z } from "zod";
-import { ACTIVITY_DIRNAME, ACTIVITY_REFRESH_DEBOUNCE_MS, ACTIVITY_WATCHED_PROGRAMS, AUTOMATION_EVENT_DEBOUNCE_MS, AUTOMATION_RECONCILE_MIN_DOWNTIME_MS, AUTOMATION_RUN_QUERY_PARAM, AUTOMATION_WATCH_DEBOUNCE_MS, AUTOMATION_WATCH_POST_RUN_GRACE_MS, AUTOMATION_WEBHOOK_DEBOUNCE_MS, DEFAULT_HOST, DEFAULT_PORT, FRIENDLY_HOSTNAME, GIT_DIRTY_THROTTLE_MS, GIT_MAX_REF_LENGTH, HERDR_THEME_SYNC_DEBOUNCE_MS, HTTP_STATUS_ACCEPTED, HTTP_STATUS_BAD_REQUEST, HTTP_STATUS_CONFLICT, HTTP_STATUS_CREATED, HTTP_STATUS_NOT_FOUND, HTTP_STATUS_PAYLOAD_TOO_LARGE, HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE, MAX_AUTOMATIONS, MAX_IMAGE_UPLOAD_BYTES, MAX_IMAGE_UPLOAD_REQUEST_BYTES, MAX_PROCESSES, MAX_SECRETS, MS_PER_MINUTE, PROCESSES_FILENAME, SECRETS_FILENAME, THEMES_FILENAME, FONTS_FILENAME, SECRETS_SHIMS_DIRNAME, SECRET_EXPORT_SCRYPT_WORK_FACTOR, AUTOMATION_AGENT_SESSIONS_DIRNAME, SERVER_STOP_GRACE_MS, SESSION_ID_QUERY_PARAM, WORKSPACE_FILENAME, WORKSPACE_RESTORE_SETTLE_MS, WORKSPACE_SNAPSHOT_DEBOUNCE_MS, SESSION_ACTIVITY_WINDOW_MS, WINDOW_ID_QUERY_PARAM, WAIT_DEFAULT_TIMEOUT_MS, WS_BACKPRESSURE_THRESHOLD_BYTES, WS_CLOSE_BACKPRESSURE, WS_CLOSE_CAPACITY_REACHED, WS_CLOSE_POLICY_VIOLATION, WS_HEARTBEAT_GRACE_MS, WS_HEARTBEAT_INTERVAL_MS, WS_HEARTBEAT_TIMEOUT_MS, WS_MAX_INBOUND_PAYLOAD_BYTES, WS_READY_STATE_OPEN, AUTH_SECRET_FILENAME, AUTH_COOKIE_NAME, UPDATE_CHECK_FILENAME, } from "./constants.js";
+import { ACTIVITY_DIRNAME, ACTIVITY_REFRESH_DEBOUNCE_MS, ACTIVITY_WATCHED_PROGRAMS, AUTOMATION_EVENT_DEBOUNCE_MS, AUTOMATION_RECONCILE_MIN_DOWNTIME_MS, AUTOMATION_RUN_QUERY_PARAM, AUTOMATION_WATCH_DEBOUNCE_MS, AUTOMATION_WATCH_POST_RUN_GRACE_MS, AUTOMATION_WEBHOOK_DEBOUNCE_MS, DEFAULT_HOST, DEFAULT_PORT, FRIENDLY_HOSTNAME, GIT_DIRTY_THROTTLE_MS, GIT_MAX_REF_LENGTH, HERDR_THEME_SYNC_DEBOUNCE_MS, HIBERNATE_FILENAME, HTTP_STATUS_ACCEPTED, HTTP_STATUS_BAD_REQUEST, HTTP_STATUS_CONFLICT, HTTP_STATUS_CREATED, HTTP_STATUS_NOT_FOUND, HTTP_STATUS_PAYLOAD_TOO_LARGE, HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE, MAX_AUTOMATIONS, MAX_IMAGE_UPLOAD_BYTES, MAX_IMAGE_UPLOAD_REQUEST_BYTES, MAX_PROCESSES, MAX_SECRETS, MS_PER_MINUTE, PROCESSES_FILENAME, SECRETS_FILENAME, THEMES_FILENAME, FONTS_FILENAME, SECRETS_SHIMS_DIRNAME, SECRET_EXPORT_SCRYPT_WORK_FACTOR, AUTOMATION_AGENT_SESSIONS_DIRNAME, SERVER_STOP_GRACE_MS, SESSION_ID_QUERY_PARAM, WORKSPACE_FILENAME, WORKSPACE_RESTORE_SETTLE_MS, WORKSPACE_SNAPSHOT_DEBOUNCE_MS, SESSION_ACTIVITY_WINDOW_MS, WINDOW_ID_QUERY_PARAM, WAIT_DEFAULT_TIMEOUT_MS, WS_BACKPRESSURE_THRESHOLD_BYTES, WS_CLOSE_BACKPRESSURE, WS_CLOSE_CAPACITY_REACHED, WS_CLOSE_POLICY_VIOLATION, WS_HEARTBEAT_GRACE_MS, WS_HEARTBEAT_INTERVAL_MS, WS_HEARTBEAT_TIMEOUT_MS, WS_MAX_INBOUND_PAYLOAD_BYTES, WS_READY_STATE_OPEN, AUTH_SECRET_FILENAME, AUTH_COOKIE_NAME, UPDATE_CHECK_FILENAME, } from "./constants.js";
 import { getDefaultShell, listKnownShells, resolveShellOverride } from "./default-shell.js";
 import { resolveWindowId } from "./utils/resolve-window-id.js";
 import { resolveTermBackspaceSequence } from "./utils/resolve-term-backspace-sequence.js";
@@ -39,6 +39,7 @@ import { SessionEventManager } from "./session-event-manager.js";
 import { WebhookTriggerManager } from "./webhook-trigger-manager.js";
 import { getGitBranchInfo, getGitBranchPr, getGitDiff, getGitDiffFileContents, getGitDiffFilePatch, getGitDiffFiles, getGitDiffSummary, } from "./git-diff.js";
 import { HeartbeatStore } from "./heartbeat-store.js";
+import { HibernateStore } from "./hibernate-store.js";
 import { WorkspaceStore } from "./workspace-store.js";
 import { createDefaultSecretBackend } from "./secret-backend.js";
 import { SecretStore } from "./secret-store.js";
@@ -1770,6 +1771,10 @@ export const createServer = async (options = {}) => {
     const caffeinatePreferencesStore = new CaffeinatePreferencesStore(path.join(stateDirectory, "caffeinate.json"));
     const worktreeConfigStore = new WorktreeConfigStore(stateDirectory);
     const workspaceStore = new WorkspaceStore(path.join(stateDirectory, WORKSPACE_FILENAME));
+    const hibernateStore = new HibernateStore(path.join(stateDirectory, HIBERNATE_FILENAME));
+    // Immutable shutdown snapshot for this daemon lifetime. Exact old session ids
+    // let surviving or CDP-restored browser tabs recover only their own text.
+    const startupHibernateEntries = hibernateStore.read();
     // Per-process secret injection: a backend (macOS Keychain on darwin) holds
     // secret values; a secret is an identity + the env var it exports
     // (~/.localterm/secrets.json, names + env var only — never values), and a
@@ -2355,14 +2360,23 @@ export const createServer = async (options = {}) => {
         }
         workspaceStore.write(registry.workspaceEntries());
     };
-    const buildSpawnTabUrl = (cwd, shell) => {
+    const buildSpawnTabUrl = (cwd, shell, sessionId) => {
         const url = new URL(localOrigin ?? publicOrigin ?? `http://${FRIENDLY_HOSTNAME}:${actualPort}`);
         if (cwd)
             url.searchParams.set("cwd", cwd);
         if (shell)
             url.searchParams.set("shell", shell);
+        if (sessionId)
+            url.searchParams.set(SESSION_ID_QUERY_PARAM, sessionId);
         return url.toString();
     };
+    const hibernatedTabFor = (owner, windowId, sessionId) => {
+        if (!windowId || !sessionId)
+            return undefined;
+        return startupHibernateEntries
+            .find((entry) => entry.owner === owner && entry.windowId === windowId)
+            ?.tabs.find((tab) => tab.sessionId === sessionId);
+    };
     const restoredWorkspaceKeys = new Set();
     const workspaceRestoreTimers = new Map();
     const scheduleWorkspaceRestore = (owner, windowId) => {
@@ -2389,45 +2403,42 @@ export const createServer = async (options = {}) => {
             return;
         if (!cdpClient || !cdpClient.isConnected())
             return;
-        const entry = workspaceStore
+        const hibernatedEntry = startupHibernateEntries.find((candidate) => candidate.owner === owner && candidate.windowId === windowId);
+        const workspaceEntry = workspaceStore
             .read()
             .find((candidate) => candidate.owner === owner && candidate.windowId === windowId);
-        if (!entry || entry.tabs.length === 0)
+        const manifest = hibernatedEntry?.tabs ?? workspaceEntry?.tabs ?? [];
+        if (manifest.length === 0)
             return;
-        const manifest = entry.tabs;
+        const urlFor = (index) => {
+            const tab = manifest[index];
+            const sessionId = "sessionId" in tab && typeof tab.sessionId === "string" ? tab.sessionId : undefined;
+            return buildSpawnTabUrl(tab.cwd, tab.shell, sessionId);
+        };
         const openCount = registry.attachedClientCount(owner, windowId);
         if (openCount >= manifest.length)
             return;
         if (openCount === 0) {
-            for (const tab of manifest) {
-                await cdpClient.openBackgroundTab(buildSpawnTabUrl(tab.cwd, tab.shell));
+            for (let index = 0; index < manifest.length; index += 1) {
+                await cdpClient.openBackgroundTab(urlFor(index));
             }
             return;
         }
         if (openCount === 1) {
-            // Browser was fully closed; the lone bootstrap tab is repointed to the
-            // first restored shell (navigate-the-bootstrap) so the reopen lands
-            // exactly N tabs in the manifest's cwds instead of N−1 + one stray in
-            // the default directory.
+            // Browser was fully closed; repoint the lone bootstrap to the first tab.
             const firstTargetId = [...wsToTargetId.entries()].find(([ws]) => {
                 const profile = registry.clientProfile(ws);
                 return profile !== null && profile.owner === owner && profile.windowId === windowId;
             })?.[1];
-            if (firstTargetId) {
-                await cdpClient.navigateTab(firstTargetId, buildSpawnTabUrl(manifest[0].cwd, manifest[0].shell));
-            }
-            for (let index = 1; index < manifest.length; index++) {
-                await cdpClient.openBackgroundTab(buildSpawnTabUrl(manifest[index].cwd, manifest[index].shell));
+            if (firstTargetId)
+                await cdpClient.navigateTab(firstTargetId, urlFor(0));
+            for (let index = 1; index < manifest.length; index += 1) {
+                await cdpClient.openBackgroundTab(urlFor(index));
             }
             return;
         }
-        // Partial survival (a daemon restart with some tabs left open): surviving
-        // tabs self-healed to their live cwds, so only the deficit is opened. Which
-        // manifest cwds the survivors cover can't be matched (their URLs carry the
-        // spawn cwd, stale after a `cd`), so the tail is opened as a best-effort
-        // placement — the count is exact, the cwd placement is approximate.
-        for (let index = openCount; index < manifest.length; index++) {
-            await cdpClient.openBackgroundTab(buildSpawnTabUrl(manifest[index].cwd, manifest[index].shell));
+        for (let index = openCount; index < manifest.length; index += 1) {
+            await cdpClient.openBackgroundTab(urlFor(index));
         }
     };
     const updateCheckStore = new UpdateCheckStore({
@@ -2603,6 +2614,9 @@ export const createServer = async (options = {}) => {
                             /* automation cwd vanished since creation; fall back to default */
                         }
                     }
+                    const hibernatedTab = claimedRun || requestedInitialCommand
+                        ? undefined
+                        : hibernatedTabFor(owner, requestedWindowId, requestedSid);
                     const automation = claimedRun
                         ? {
                             automationId: claimedRun.automationId,
@@ -2611,8 +2625,9 @@ export const createServer = async (options = {}) => {
                         }
                         : undefined;
                     const spawned = registry.spawnAndAttach(ws, {
-                        cwd: sessionCwd,
-                        shell: requestedShell,
+                        cwd: hibernatedTab?.cwd ?? sessionCwd,
+                        shell: hibernatedTab?.shell ?? requestedShell,
+                        replaySeed: hibernatedTab?.scrollback,
                         initialCommand: claimedRun && claimedRun.runner.kind === "shell"
                             ? claimedRun.runner.command
                             : requestedInitialCommand,
@@ -2905,58 +2920,65 @@ export const createServer = async (options = {}) => {
             // No debug-enabled Chromium browser reachable — runs use `open -g`.
         });
     }
-    const stop = async () => {
-        flushWorkspaceSnapshot();
-        automationScheduler.dispose();
-        folderWatchManager.dispose();
-        automationGitWatcher.dispose();
-        updateCheckStore.dispose();
-        webhookTriggerManager.dispose();
-        caffeinateManager.dispose();
-        processActivityWatcher?.dispose();
-        herdrThemeSync?.dispose();
-        cdpClient?.close();
-        registry.disposeAll();
-        // Forcibly tear down every WS first. node-pty + ws upgraded sockets
-        // aren't tracked in http.Server's keep-alive set, so target.close() would
-        // otherwise wait forever for them and the CLI's force-exit fallback would
-        // fire on every shutdown.
-        for (const client of wss.clients) {
+    let stopPromise = null;
+    const stop = () => {
+        if (stopPromise)
+            return stopPromise;
+        stopPromise = (async () => {
+            flushWorkspaceSnapshot();
+            hibernateStore.write(await registry.hibernateEntries());
+            automationScheduler.dispose();
+            folderWatchManager.dispose();
+            automationGitWatcher.dispose();
+            updateCheckStore.dispose();
+            webhookTriggerManager.dispose();
+            caffeinateManager.dispose();
+            processActivityWatcher?.dispose();
+            herdrThemeSync?.dispose();
+            cdpClient?.close();
+            registry.disposeAll();
+            // Forcibly tear down every WS first. node-pty + ws upgraded sockets
+            // aren't tracked in http.Server's keep-alive set, so target.close() would
+            // otherwise wait forever for them and the CLI's force-exit fallback would
+            // fire on every shutdown.
+            for (const client of wss.clients) {
+                try {
+                    client.terminate();
+                }
+                catch {
+                    /* socket already torn down */
+                }
+            }
             try {
-                client.terminate();
+                wss.close();
             }
             catch {
-                /* socket already torn down */
+                /* idempotent close — wss may already be closed */
             }
-        }
-        try {
-            wss.close();
-        }
-        catch {
-            /* idempotent close — wss may already be closed */
-        }
-        if (!httpServer)
-            return;
-        const target = httpServer;
-        const closeAllConnections = Reflect.get(target, "closeAllConnections");
-        if (typeof closeAllConnections === "function") {
-            closeAllConnections.call(target);
-        }
-        await new Promise((resolve) => {
-            let settled = false;
-            const settle = () => {
-                if (settled)
-                    return;
-                settled = true;
-                resolve();
-            };
-            const grace = setTimeout(settle, SERVER_STOP_GRACE_MS);
-            grace.unref?.();
-            target.close(() => {
-                clearTimeout(grace);
-                settle();
+            if (!httpServer)
+                return;
+            const target = httpServer;
+            const closeAllConnections = Reflect.get(target, "closeAllConnections");
+            if (typeof closeAllConnections === "function") {
+                closeAllConnections.call(target);
+            }
+            await new Promise((resolve) => {
+                let settled = false;
+                const settle = () => {
+                    if (settled)
+                        return;
+                    settled = true;
+                    resolve();
+                };
+                const grace = setTimeout(settle, SERVER_STOP_GRACE_MS);
+                grace.unref?.();
+                target.close(() => {
+                    clearTimeout(grace);
+                    settle();
+                });
             });
-        });
+        })();
+        return stopPromise;
     };
     return { port: actualPort, host, registry, automationStore, setPublicUrl, setLocalUrl, stop };
 };