tabminal 3.0.13 → 3.0.14

package/src/terminal-manager.mjs

@@ -80,6 +80,20 @@ function uniqueStringList(values) {
 function normalizeWorkspaceState(input = {}, fallback = {}) {
     const source = input && typeof input === 'object' ? input : {};
     const base = fallback && typeof fallback === 'object' ? fallback : {};
+    const activeWorkspaceTabKey = typeof source.activeWorkspaceTabKey === 'string'
+        ? source.activeWorkspaceTabKey
+        : (
+            typeof base.activeWorkspaceTabKey === 'string'
+                ? base.activeWorkspaceTabKey
+                : ''
+        );
+    const markdownSplitPath = typeof source.markdownSplitPath === 'string'
+        ? source.markdownSplitPath
+        : (
+            typeof base.markdownSplitPath === 'string'
+                ? base.markdownSplitPath
+                : ''
+        );
     return {
         updatedAt: Number.isFinite(source.updatedAt)
             ? source.updatedAt
@@ -100,7 +114,9 @@ function normalizeWorkspaceState(input = {}, fallback = {}) {
         terminalDisplayMode: source.terminalDisplayMode === 'tab'
             ? 'tab'
             : 'auto',
-        expandedPaths: uniqueStringList(source.expandedPaths)
+        expandedPaths: uniqueStringList(source.expandedPaths),
+        markdownSplitPath,
+        activeWorkspaceTabKey
     };
 }
 
@@ -131,6 +147,70 @@ export class TerminalManager {
         this.disposing = false;
     }
 
+    getLatestWorkspaceSession() {
+        let bestSession = null;
+        let bestWorkspaceUpdatedAt = -1;
+        let bestTerminalUpdatedAt = -1;
+        let bestCreatedAt = -1;
+
+        for (const session of this.sessions.values()) {
+            const cwd = typeof session?.cwd === 'string'
+                ? session.cwd.trim()
+                : '';
+            if (!cwd) continue;
+
+            const workspaceUpdatedAt = Number.isFinite(
+                session?.editorState?.updatedAt
+            )
+                ? session.editorState.updatedAt
+                : 0;
+            const terminalUpdatedAt = session?.updatedAt instanceof Date
+                ? session.updatedAt.getTime()
+                : Date.parse(session?.updatedAt || '') || 0;
+            const createdAt = session?.createdAt instanceof Date
+                ? session.createdAt.getTime()
+                : Date.parse(session?.createdAt || '') || 0;
+
+            const isBetterWorkspace = (
+                workspaceUpdatedAt > bestWorkspaceUpdatedAt
+            );
+            const isSameWorkspace = (
+                workspaceUpdatedAt === bestWorkspaceUpdatedAt
+            );
+            const isBetterTerminal = (
+                isSameWorkspace
+                && terminalUpdatedAt > bestTerminalUpdatedAt
+            );
+            const isSameTerminal = (
+                isSameWorkspace
+                && terminalUpdatedAt === bestTerminalUpdatedAt
+            );
+            const isBetterCreated = (
+                isSameTerminal
+                && createdAt > bestCreatedAt
+            );
+
+            if (
+                isBetterWorkspace
+                || isBetterTerminal
+                || isBetterCreated
+            ) {
+                bestSession = session;
+                bestWorkspaceUpdatedAt = workspaceUpdatedAt;
+                bestTerminalUpdatedAt = terminalUpdatedAt;
+                bestCreatedAt = createdAt;
+            }
+        }
+
+        return bestSession;
+    }
+
+    getDefaultSessionCwd() {
+        return this.getLatestWorkspaceSession()?.cwd
+            || process.env.TABMINAL_CWD
+            || os.homedir();
+    }
+
     queueSessionPersistence(id, operation) {
         const previous = this.sessionPersistenceChains.get(id)
             || Promise.resolve();
@@ -316,10 +396,25 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
     }
 
     createSession(restoredData = null) {
+        const isRestoredSession = !!(
+            restoredData
+            && typeof restoredData === 'object'
+            && (
+                restoredData.id
+                || restoredData.createdAt
+                || restoredData.executions
+                || restoredData.editorState
+                || restoredData.workspaceState
+            )
+        );
         return this._createPtySession({
             id: restoredData?.id,
             shell: resolveShell(),
-            cwd: restoredData?.cwd,
+            cwd: restoredData?.cwd || (
+                isRestoredSession
+                    ? undefined
+                    : this.getDefaultSessionCwd()
+            ),
             cols: restoredData?.cols,
             rows: restoredData?.rows,
             createdAt: restoredData?.createdAt,

package/src/terminal-session.mjs

@@ -167,6 +167,22 @@ function selectFallbackQueryResponder(clients, pendingClients) {
     return null;
 }
 
+function isIgnorablePtyResizeError(error) {
+    if (!error) {
+        return false;
+    }
+
+    if (error.code === 'EBADF') {
+        return true;
+    }
+
+    const message = String(error.message || '');
+    return (
+        /ioctl\(2\) failed/i.test(message)
+        || /bad file descriptor/i.test(message)
+    );
+}
+
 export class TerminalSession {
     constructor(pty, options = {}) {
         this.pty = pty;
@@ -488,7 +504,14 @@ export class TerminalSession {
 
     resize(cols, rows) {
         if (this.closed) return;
-        this.pty.resize(cols, rows);
+        try {
+            this.pty.resize(cols, rows);
+        } catch (error) {
+            if (isIgnorablePtyResizeError(error)) {
+                return;
+            }
+            throw error;
+        }
         this._queueSnapshotMutation(() => {
             this.snapshotTerminal.resize(cols, rows);
         });