fix:修复在运行中不可切换会话避免会话丢失

Author: wynxing

internal/tui/core/app/update.go

@@ -44,6 +44,8 @@ const (
 
 const providerAddSelectTimeout = 10 * time.Second
 
+const sessionSwitchBusyMessage = "cannot switch sessions while run or compact is active"
+
 var panelOrder = []panel{panelTranscript, panelActivity, panelInput}
 var persistProviderUserEnvVar = config.PersistUserEnvVar
 var deleteProviderUserEnvVar = config.DeleteUserEnvVar
@@ -378,6 +380,12 @@ func (a App) updateInputPanel(msg tea.Msg, typed tea.KeyMsg, cmds []tea.Cmd) (te
 				}
 				return a, tea.Batch(cmds...)
 			case slashCommandSession:
+				if err := a.ensureSessionSwitchAllowed(""); err != nil {
+					a.state.ExecutionError = err.Error()
+					a.state.StatusText = err.Error()
+					a.appendActivity("session", "Failed to open session picker", err.Error(), true)
+					return a, tea.Batch(cmds...)
+				}
 				if err := a.refreshSessionPicker(); err != nil {
 					a.state.ExecutionError = err.Error()
 					a.state.StatusText = err.Error()
@@ -774,6 +782,9 @@ func (a *App) activateSelectedSession() error {
 	if !ok {
 		return nil
 	}
+	if err := a.ensureSessionSwitchAllowed(item.Summary.ID); err != nil {
+		return err
+	}
 
 	a.state.ActiveSessionID = item.Summary.ID
 	a.state.ActiveSessionTitle = item.Summary.Title
@@ -784,6 +795,9 @@ func (a *App) activateSelectedSession() error {
 }
 
 func (a *App) activateSessionByID(sessionID string) error {
+	if err := a.ensureSessionSwitchAllowed(sessionID); err != nil {
+		return err
+	}
 	for _, s := range a.state.Sessions {
 		if s.ID == sessionID {
 			a.state.ActiveSessionID = s.ID
@@ -796,6 +810,16 @@ func (a *App) activateSessionByID(sessionID string) error {
 	return fmt.Errorf("session not found: %s", sessionID)
 }
 
+// ensureSessionSwitchAllowed 统一阻止运行中切换到其他会话，避免 UI 脱离仍在执行的 run 上下文。
+func (a *App) ensureSessionSwitchAllowed(targetSessionID string) error {
+	targetSessionID = strings.TrimSpace(targetSessionID)
+	activeSessionID := strings.TrimSpace(a.state.ActiveSessionID)
+	if !a.isBusy() || (targetSessionID != "" && strings.EqualFold(targetSessionID, activeSessionID)) {
+		return nil
+	}
+	return fmt.Errorf(sessionSwitchBusyMessage)
+}
+
 func (a *App) syncActiveSessionTitle() {
 	if strings.TrimSpace(a.state.ActiveSessionID) == "" {
 		if strings.TrimSpace(a.state.ActiveSessionTitle) == "" {
@@ -1894,6 +1918,12 @@ func (a *App) handleImmediateSlashCommand(input string) (bool, tea.Cmd) {
 	case slashCommandForget:
 		return true, a.handleForgetCommand(rest)
 	case slashCommandSession:
+		if err := a.ensureSessionSwitchAllowed(""); err != nil {
+			a.state.ExecutionError = err.Error()
+			a.state.StatusText = err.Error()
+			a.appendActivity("session", "Failed to open session picker", err.Error(), true)
+			return true, nil
+		}
 		if err := a.refreshSessionPicker(); err != nil {
 			a.state.ExecutionError = err.Error()
 			a.state.StatusText = err.Error()

internal/tui/core/app/update_test.go

@@ -1761,6 +1761,35 @@ func TestUpdatePickerSessionEnterActivatesSelectedSession(t *testing.T) {
 	}
 }
 
+func TestUpdatePickerSessionEnterWhileBusyRejectsSwitch(t *testing.T) {
+	app, runtime := newTestApp(t)
+	now := time.Now()
+	runtime.listSessions = []agentsession.Summary{
+		{ID: "s1", Title: "One", UpdatedAt: now.Add(-time.Minute)},
+		{ID: "s2", Title: "Two", UpdatedAt: now},
+	}
+	if err := app.refreshSessionPicker(); err != nil {
+		t.Fatalf("refreshSessionPicker() error = %v", err)
+	}
+	app.state.ActiveSessionID = "s1"
+	app.state.ActiveSessionTitle = "One"
+	app.state.IsAgentRunning = true
+	app.openPicker(pickerSession, statusChooseSession, &app.sessionPicker, "s1")
+	app.sessionPicker.Select(1)
+
+	model, cmd := app.updatePicker(tea.KeyMsg{Type: tea.KeyEnter})
+	if cmd != nil {
+		t.Fatalf("expected nil cmd for rejected session switch")
+	}
+	app = model.(App)
+	if app.state.ActiveSessionID != "s1" {
+		t.Fatalf("expected active session to remain unchanged, got %q", app.state.ActiveSessionID)
+	}
+	if !strings.Contains(app.state.ExecutionError, sessionSwitchBusyMessage) {
+		t.Fatalf("expected busy session switch error, got %q", app.state.ExecutionError)
+	}
+}
+
 func TestActivateSessionByIDNotFound(t *testing.T) {
 	app, _ := newTestApp(t)
 	app.state.Sessions = []agentsession.Summary{{ID: "s1", Title: "one"}}
@@ -1786,6 +1815,25 @@ func TestHandleImmediateSlashCommandSession(t *testing.T) {
 	}
 }
 
+func TestHandleImmediateSlashCommandSessionWhileBusy(t *testing.T) {
+	app, _ := newTestApp(t)
+	app.state.IsAgentRunning = true
+
+	handled, cmd := app.handleImmediateSlashCommand("/session")
+	if !handled {
+		t.Fatalf("expected /session to be handled immediately")
+	}
+	if cmd != nil {
+		t.Fatalf("expected busy /session to avoid returning cmd")
+	}
+	if app.state.ActivePicker != pickerNone {
+		t.Fatalf("expected session picker to stay closed while busy")
+	}
+	if !strings.Contains(app.state.ExecutionError, sessionSwitchBusyMessage) {
+		t.Fatalf("expected busy session switch error, got %q", app.state.ExecutionError)
+	}
+}
+
 func TestRuntimeEventToolStatusHandler(t *testing.T) {
 	app, _ := newTestApp(t)
 	payload := tuiservices.RuntimeToolStatusPayload{ToolCallID: "tool-1", ToolName: "bash", Status: string(tuistate.ToolLifecyclePlanned)}