fix(tmux): correct external session attach instructions

Author: jaromil

cmd/gestalt-agent/run.go

@@ -47,10 +47,16 @@ func printTmuxAttachHint(out io.Writer, sessionID string) {
 	if out == nil {
 		return
 	}
-	id := strings.TrimSpace(sessionID)
-	if id == "" {
-		id = "gestalt-agent"
-	}
+	target, err := tmuxTargetForSession(sessionID)
 	fmt.Fprintln(out, "Session is running in tmux.")
-	fmt.Fprintf(out, "Attach with: tmux attach -t %q\n", id)
+	if err != nil {
+		fmt.Fprintln(out, "Attach with: tmux attach")
+		return
+	}
+	if target.sessionName == "" {
+		fmt.Fprintf(out, "Switch with: tmux select-window -t %q\n", target.windowName)
+		return
+	}
+	fmt.Fprintf(out, "Attach with: tmux attach -t %q\n", target.sessionName)
+	fmt.Fprintf(out, "Then switch with: tmux select-window -t %q\n", target.windowName)
 }

cmd/gestalt-agent/run_test.go

@@ -6,6 +6,8 @@ import (
 	"errors"
 	"net/http"
 	"net/http/httptest"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -120,3 +122,38 @@ func newTestSessionServer(t *testing.T, handler func(w http.ResponseWriter)) *ht
 		handler(w)
 	}))
 }
+
+func TestPrintTmuxAttachHintOutsideTmux(t *testing.T) {
+	t.Setenv("TMUX", "")
+	var out bytes.Buffer
+	printTmuxAttachHint(&out, "Fixer 1")
+	text := out.String()
+	if !strings.Contains(text, "Session is running in tmux.") {
+		t.Fatalf("missing session message: %q", text)
+	}
+	if !strings.Contains(text, `Attach with: tmux attach -t "Gestalt `+filepath.Base(mustGetwd(t))+`"`) {
+		t.Fatalf("expected attach target for workdir session, got %q", text)
+	}
+	if !strings.Contains(text, `Then switch with: tmux select-window -t "Fixer 1"`) {
+		t.Fatalf("expected window switch hint, got %q", text)
+	}
+}
+
+func TestPrintTmuxAttachHintInsideTmux(t *testing.T) {
+	t.Setenv("TMUX", "1")
+	var out bytes.Buffer
+	printTmuxAttachHint(&out, "Fixer 1")
+	text := out.String()
+	if !strings.Contains(text, `Switch with: tmux select-window -t "Fixer 1"`) {
+		t.Fatalf("expected select-window hint, got %q", text)
+	}
+}
+
+func mustGetwd(t *testing.T) string {
+	t.Helper()
+	wd, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("getwd: %v", err)
+	}
+	return wd
+}

frontend/src/App.svelte

@@ -67,6 +67,10 @@
   $: crashState = $appHealthStore
   $: clipboardAvailable = canUseClipboard()
   $: activeTerminal = terminals.find((terminal) => terminal.id === activeId) || null
+  $: tmuxSessionName =
+    status?.working_dir && String(status.working_dir).trim()
+      ? `Gestalt ${buildTitle(status.working_dir)}`
+      : ''
   $: if (status) {
     setSessionUiConfigFromStatus(status)
   }
@@ -373,6 +377,7 @@
               visible={true}
               sessionInterface={activeTerminal.interface || ''}
               sessionRunner={activeTerminal.runner || ''}
+              tmuxSessionName={tmuxSessionName}
               guiModules={resolveGuiModules(activeTerminal.gui_modules, activeTerminal.runner)}
               onDelete={deleteTerminal}
             />

frontend/src/components/Terminal.svelte

@@ -14,6 +14,7 @@
   export let temporalUrl = ''
   export let sessionInterface = ''
   export let sessionRunner = ''
+  export let tmuxSessionName = ''
   export let guiModules = []
   export let planSidebarOpen = false
   export let onTogglePlan = () => {}
@@ -44,6 +45,7 @@
   let promptFilesLabel = ''
   let interfaceValue = ''
   let runnerValue = ''
+  let tmuxSessionValue = ''
   let isCLI = false
   let isExternal = false
   let hasPlanModule = false
@@ -172,6 +174,7 @@
   $: interfaceValue =
     typeof sessionInterface === 'string' ? sessionInterface.trim().toLowerCase() : ''
   $: runnerValue = typeof sessionRunner === 'string' ? sessionRunner.trim().toLowerCase() : ''
+  $: tmuxSessionValue = typeof tmuxSessionName === 'string' ? tmuxSessionName.trim() : ''
   $: isCLI = interfaceValue === 'cli'
   $: isExternal = runnerValue === 'external'
   $: hasPlanModule =
@@ -262,7 +265,13 @@
     {#if isExternal}
       <div class="terminal-external">
         <p>This session is managed in tmux.</p>
-        <p>Attach with: <code>tmux attach -t "{sessionId}"</code></p>
+        {#if tmuxSessionValue}
+          <p>Attach with: <code>tmux attach -t "{tmuxSessionValue}"</code></p>
+          <p>Then switch with: <code>tmux select-window -t "{sessionId}"</code></p>
+        {:else}
+          <p>Attach with: <code>tmux attach</code></p>
+          <p>If needed, list sessions first: <code>tmux ls</code></p>
+        {/if}
       </div>
     {:else if isCLI}
       <TerminalCanvas

frontend/src/views/TerminalView.svelte

@@ -11,6 +11,7 @@
   export let visible = true
   export let sessionInterface = ''
   export let sessionRunner = ''
+  export let tmuxSessionName = ''
   export let guiModules = []
   export let onDelete = () => {}
 
@@ -117,6 +118,7 @@
           {temporalUrl}
           {sessionInterface}
           {sessionRunner}
+          {tmuxSessionName}
           {guiModules}
           {planSidebarOpen}
           onTogglePlan={togglePlanSidebar}

frontend/tests/terminalComponent.test.js

@@ -250,10 +250,17 @@ describe('Terminal', () => {
     getTerminalState.mockReturnValue(buildState())
 
     const { getByText } = render(Terminal, {
-      props: { sessionId: 't1', sessionInterface: 'cli', sessionRunner: 'external' },
+      props: {
+        sessionId: 't1',
+        sessionInterface: 'cli',
+        sessionRunner: 'external',
+        tmuxSessionName: 'Gestalt workspace',
+      },
     })
 
     await tick()
     expect(getByText('This session is managed in tmux.')).toBeTruthy()
+    expect(getByText('Attach with:')).toBeTruthy()
+    expect(getByText('Then switch with:')).toBeTruthy()
   })
 })