nterminal 1.3.25 → 1.3.27

package/dist/server/storage/terminalLayoutCleanup.js

@@ -0,0 +1,103 @@
+function pruneNode(node, ids) {
+    if (node.type === 'pane')
+        return ids.has(node.terminalId) ? node : null;
+    if (node.type === 'editor')
+        return node;
+    const first = pruneNode(node.first, ids);
+    const second = pruneNode(node.second, ids);
+    if (!first)
+        return second;
+    if (!second)
+        return first;
+    return first === node.first && second === node.second ? node : { ...node, first, second };
+}
+function terminalIds(node) {
+    if (node.type === 'pane')
+        return [node.terminalId];
+    if (node.type === 'editor')
+        return [];
+    return [...terminalIds(node.first), ...terminalIds(node.second)];
+}
+// Layout references cannot reconstruct a missing shell: old layouts contain
+// IDs, not per-pane cwd/launch metadata. Keep workspace settings and favorites.
+export function pruneMissingTerminalReferences(layout, ids) {
+    let changed = false;
+    const workspaces = layout.workspaces.map(workspace => {
+        const tabs = workspace.tabs.flatMap(tab => {
+            const root = pruneNode(tab.root, ids);
+            if (!root) {
+                changed = true;
+                return [];
+            }
+            const remaining = terminalIds(root);
+            const activeTerminalId = remaining.includes(tab.activeTerminalId) ? tab.activeTerminalId : remaining[0] ?? '';
+            if (root === tab.root && activeTerminalId === tab.activeTerminalId)
+                return [tab];
+            changed = true;
+            return [{ ...tab, root, activeTerminalId }];
+        });
+        const detachedTerminalIds = workspace.detachedTerminalIds.filter(id => ids.has(id));
+        const activeTabId = tabs.some(tab => tab.id === workspace.activeTabId) ? workspace.activeTabId : tabs[0]?.id ?? null;
+        if (detachedTerminalIds.length !== workspace.detachedTerminalIds.length || activeTabId !== workspace.activeTabId)
+            changed = true;
+        return { ...workspace, tabs, detachedTerminalIds, activeTabId };
+    });
+    return changed ? { ...layout, workspaces } : layout;
+}
+class InventorySuperseded extends Error {
+}
+// Capture before requesting the inventory. A layout edit or agent replacement
+// while that request is in flight invalidates cleanup, not the user's changes.
+export async function captureTerminalLayoutCleanup(store, agentId = null) {
+    const before = await store.read();
+    const slot = (state) => agentId === null ? state.terminalLayout : state.agentLayouts[agentId];
+    const saved = slot(before);
+    const agent = agentId === null ? null : before.agents.find(entry => entry.id === agentId);
+    const currentLayout = async (ids) => {
+        const state = await store.read();
+        if (agentId !== null && state.agents.find(entry => entry.id === agentId) !== agent)
+            return undefined;
+        const current = slot(state);
+        // Never pair newly created pane references with an older inventory: the
+        // browser would prune them while adopting the new revision, bypassing CAS.
+        if (!current || !current.layout.workspaces.every(workspace => workspace.detachedTerminalIds.every(id => ids.has(id)) &&
+            workspace.tabs.every(tab => terminalIds(tab.root).every(id => ids.has(id)))))
+            return undefined;
+        return current;
+    };
+    return async (response, status = 200) => {
+        if (!saved || (agentId !== null && !agent) || status !== 200 || !response || typeof response !== 'object')
+            return;
+        const inventory = response;
+        if (inventory.inventoryComplete !== true || !Array.isArray(inventory.terminals))
+            return;
+        const ids = new Set();
+        for (const terminal of inventory.terminals) {
+            if (!terminal || typeof terminal.id !== 'string' || !terminal.id ||
+                (terminal.status !== 'running' && terminal.status !== 'exited') || ids.has(terminal.id))
+                return;
+            ids.add(terminal.id);
+        }
+        const layout = pruneMissingTerminalReferences(saved.layout, ids);
+        if (layout === saved.layout)
+            return currentLayout(ids);
+        try {
+            await store.update(state => {
+                if (slot(state) !== saved || (agentId !== null && state.agents.find(entry => entry.id === agentId) !== agent)) {
+                    throw new InventorySuperseded();
+                }
+                const next = { layout, revision: saved.revision + 1, updatedAt: new Date().toISOString() };
+                return agentId === null ? { ...state, terminalLayout: next }
+                    : { ...state, agentLayouts: { ...state.agentLayouts, [agentId]: next } };
+            });
+        }
+        catch (error) {
+            if (!(error instanceof InventorySuperseded))
+                throw error;
+        }
+        // Pair inventory with the current main-owned layout. Parallel layout/list
+        // fetches must not leave the browser one revision behind its own cleanup.
+        return currentLayout(ids);
+    };
+}
+//# sourceMappingURL=terminalLayoutCleanup.js.map

package/dist/server/storage/terminalLayoutCleanup.js.map

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

package/dist/server/terminal/TerminalManager.d.ts

@@ -5,6 +5,7 @@ import { type PtyAdapter } from './PtyAdapter.js';
 import { type LifecycleEvent } from '../hooks/lifecycle.js';
 import { readHookOwner, validateHookTranscript, type HookProcessIdentity } from '../hooks/hookBinding.js';
 import { verifyHookPaneOwner } from '../hooks/hookProcess.js';
+import type { TerminalSessionStore } from './terminalSessionStore.js';
 export interface CreateTerminalOptions {
     parentTerminalId?: TerminalId;
     cwd?: string;
@@ -23,6 +24,7 @@ export interface TerminalAttachment {
     dispose(): void;
 }
 export interface TerminalManagerOptions {
+    sessionStore?: TerminalSessionStore;
     resolveCwd?: (pid: number) => Promise<string | null>;
     now?: () => Date;
     onCompletion?: (event: TerminalManagerCompletionEvent) => void | Promise<void>;
@@ -65,7 +67,7 @@ export interface TerminalManagerCompletionEvent {
     completionId?: string;
 }
 export interface TerminalManagerDiagnostic {
-    event: 'terminal.status_poll_failed' | 'terminal.process_snapshot_failed' | 'terminal.restore_failed' | 'terminal.transcript_poll_failed' | 'terminal.transcript_poll_slow' | 'terminal.reattach_failed' | 'terminal.destroy_failed' | 'terminal.close_failed';
+    event: 'terminal.status_poll_failed' | 'terminal.process_snapshot_failed' | 'terminal.restore_failed' | 'terminal.recovery_save_failed' | 'terminal.transcript_poll_failed' | 'terminal.transcript_poll_slow' | 'terminal.reattach_failed' | 'terminal.destroy_failed' | 'terminal.close_failed';
     terminalId?: TerminalId;
     queueDepth?: number;
     elapsedMs?: number;
@@ -115,6 +117,7 @@ export declare class TerminalManager {
     private readonly completionStates;
     private statusPollTimer;
     private restoreRetryTimer;
+    private restoreRetryDelayMs;
     private restoreInflight;
     private statusPollInflight;
     private activeTranscriptWorkers;
@@ -124,6 +127,14 @@ export declare class TerminalManager {
     private terminalMutationGeneration;
     private shutdownRequested;
     private disposed;
+    private readonly sessionStore;
+    private recoveryReady;
+    private recoveryTimer;
+    private recoveryWriteTimer;
+    private recoveryCheckpoint;
+    private readonly pendingSessionRestores;
+    private readonly creatingSessionIds;
+    private readonly pendingDeletionCancellations;
     constructor(config: AppConfig, ptyAdapter: PtyAdapter, options?: TerminalManagerOptions);
     private startStatusPoller;
     private runStatusPoll;
@@ -136,8 +147,16 @@ export declare class TerminalManager {
     dispose(): void;
     createTerminal(options?: CreateTerminalOptions): Promise<TerminalSummary>;
     private createTerminalUntracked;
+    private createRecord;
     restoreSessions(): Promise<void>;
     private restoreSessionsUntracked;
+    hasCompleteInventory(): boolean;
+    isRecoveryPending(): boolean;
+    private retrySessionRestore;
+    private assertRecoveryReady;
+    private saveRecoveryMetadata;
+    private scheduleRecoverySave;
+    checkpointRecovery(): Promise<void>;
     private scheduleRestoreRetry;
     private clearRestoreRetryTimer;
     private wireUpPty;
@@ -207,6 +226,9 @@ export declare class TerminalManager {
     private sealPendingScroll;
     private markClosing;
     private recoverOrFinalizeFailedClose;
+    private cancelFailedClose;
+    private retryDeletionCancellation;
+    private forgetRecoverySession;
     closeAll(): Promise<void>;
     destroyAllTerminals(): Promise<DestroyAllTerminalsResult>;
     private awaitPendingInitializations;