tabminal 3.0.36 → 3.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabminal",
-  "version": "3.0.36",
+  "version": "3.0.38",
   "description": "Tab(ter)minal, a Cloud-Native terminal and ACP agent workspace for desktop, tablet, and phone.",
   "type": "module",
   "bin": {

package/public/app.js

@@ -8213,6 +8213,14 @@ class EditorManager {
             if (!agentTab) return;
             const session = agentTab.getLinkedSession();
             if (!session) return;
+            this.#renderAgentCommandSuggestions([{
+                kind: 'info',
+                label: 'Opening previous session...',
+                description: command.displayName
+                    || command.title
+                    || command.sessionId
+                    || ''
+            }]);
             try {
                 let targetAgentTab = null;
                 let targetPromptDraft = '';
@@ -8265,11 +8273,13 @@ class EditorManager {
                     targetPromptDraft,
                     targetAgentTab || getActiveAgentTab() || agentTab
                 );
+                this.hideAgentCommandMenu();
             } catch (error) {
                 alert(error.message, {
                     type: 'error',
                     title: getAgentBaseName(agentTab)
                 });
+                this.hideAgentCommandMenu();
             }
             return;
         }
@@ -14719,27 +14729,53 @@ async function activateAgentTab(session, agentTab, options = {}) {
     return agentTab;
 }
 
+const pendingAgentHistoryResumes = new Map();
+
+function getAgentHistoryResumeKey(session, agentTab, historySession) {
+    return [
+        session?.server?.id || '',
+        session?.key || '',
+        agentTab?.agentId || '',
+        String(historySession?.sessionId || '').trim()
+    ].join('\0');
+}
+
 async function resumeAgentTabFromHistory(session, agentTab, historySession) {
     if (!session || !agentTab || !historySession?.sessionId) return null;
-    const response = await session.server.fetch('/api/agents/tabs/resume', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-            agentId: agentTab.agentId,
-            cwd: agentTab.cwd || session.cwd || session.initialCwd || '/',
-            terminalSessionId: session.id,
-            sessionId: historySession.sessionId,
-            title: historySession.title || ''
-        })
-    });
-    if (!response.ok) {
-        await throwResponseError(response, 'Failed to resume agent session');
+    const resumeKey = getAgentHistoryResumeKey(session, agentTab, historySession);
+    const pendingResume = pendingAgentHistoryResumes.get(resumeKey);
+    if (pendingResume) {
+        return await pendingResume;
+    }
+
+    const resumePromise = (async () => {
+        const response = await session.server.fetch('/api/agents/tabs/resume', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                agentId: agentTab.agentId,
+                cwd: agentTab.cwd || session.cwd || session.initialCwd || '/',
+                terminalSessionId: session.id,
+                sessionId: historySession.sessionId,
+                title: historySession.title || ''
+            })
+        });
+        if (!response.ok) {
+            await throwResponseError(response, 'Failed to resume agent session');
+        }
+        const data = await response.json();
+        return await activateAgentTab(
+            session,
+            upsertAgentTab(session.server, data)
+        );
+    })();
+    pendingAgentHistoryResumes.set(resumeKey, resumePromise);
+
+    try {
+        return await resumePromise;
+    } finally {
+        pendingAgentHistoryResumes.delete(resumeKey);
     }
-    const data = await response.json();
-    return await activateAgentTab(
-        session,
-        upsertAgentTab(session.server, data)
-    );
 }
 
 function getServerEndpointKey(server) {

package/src/acp-manager.mjs

@@ -3890,6 +3890,7 @@ export class AcpManager {
         this.loadConfigs = options.loadConfigs || persistence.loadAgentConfigs;
         this.saveConfigs = options.saveConfigs || persistence.saveAgentConfigs;
         this.persistenceChain = Promise.resolve();
+        this.pendingResumeTabs = new Map();
         this.transcriptPersistDelayMs = options.transcriptPersistDelayMs
             || DEFAULT_TRANSCRIPT_PERSIST_DELAY_MS;
         this.persistTabsTimer = null;
@@ -4569,12 +4570,21 @@ export class AcpManager {
             return existingTab;
         }
 
+        const resumeKey = [
+            definition.id,
+            String(options.sessionId || '').trim()
+        ].join('\0');
+        const pendingResume = this.pendingResumeTabs.get(resumeKey);
+        if (pendingResume) {
+            return await pendingResume;
+        }
+
         const cwd = path.resolve(options.cwd || process.cwd());
         const { runtimeEntry, createdRuntime, runtimeStoreKey } =
             this.#ensureRuntimeEntry(definition, cwd);
         const tabId = crypto.randomUUID();
 
-        try {
+        const resumePromise = (async () => {
             const rawSerialized = await runtimeEntry.runtime.resumeTab({
                 id: tabId,
                 acpSessionId: options.sessionId,
@@ -4603,6 +4613,11 @@ export class AcpManager {
             this.#clearDefinitionAvailabilityOverride(definition.id);
             await this.persistTabs();
             return tabEntry.serialize();
+        })();
+        this.pendingResumeTabs.set(resumeKey, resumePromise);
+
+        try {
+            return await resumePromise;
         } catch (error) {
             const shouldDisposeRuntime = createdRuntime
                 || runtimeEntry.runtime.tabs.size === 0;
@@ -4610,6 +4625,8 @@ export class AcpManager {
                 await this.#disposeRuntimeEntry(runtimeStoreKey, runtimeEntry);
             }
             throw error;
+        } finally {
+            this.pendingResumeTabs.delete(resumeKey);
         }
     }