git.iko.soy/crush
on main help sign in
feat: add support for `--session` and `--continue` for the tui (#2422)
630ff8cAndrey Nering
internal/cmd/root.go+22−1
compare with main
unifiedsplit
@@ -37,6 +37,9 @@ func init() {
37 rootCmd.PersistentFlags().BoolP("debug", "d", false, "Debug")
37 rootCmd.PersistentFlags().BoolP("debug", "d", false, "Debug")
38 rootCmd.Flags().BoolP("help", "h", false, "Help")
38 rootCmd.Flags().BoolP("help", "h", false, "Help")
39 rootCmd.Flags().BoolP("yolo", "y", false, "Automatically accept all permissions (dangerous mode)")
39 rootCmd.Flags().BoolP("yolo", "y", false, "Automatically accept all permissions (dangerous mode)")
40+ rootCmd.Flags().StringP("session", "s", "", "Continue a previous session by ID")
41+ rootCmd.Flags().BoolP("continue", "C", false, "Continue the most recent session")
42+ rootCmd.MarkFlagsMutuallyExclusive("session", "continue")
40
43
41 rootCmd.AddCommand(
44 rootCmd.AddCommand(
42 runCmd,
45 runCmd,
@@ -73,21 +76,39 @@ crush --yolo
73
76
74# Run with custom data directory
77# Run with custom data directory
75crush --data-dir /path/to/custom/.crush
78crush --data-dir /path/to/custom/.crush
79+
80+# Continue a previous session
81+crush --session {session-id}
82+
83+# Continue the most recent session
84+crush --continue
76 `,
85 `,
77 RunE: func(cmd *cobra.Command, args []string) error {
86 RunE: func(cmd *cobra.Command, args []string) error {
87+ sessionID, _ := cmd.Flags().GetString("session")
88+ continueLast, _ := cmd.Flags().GetBool("continue")
89+
78 app, err := setupAppWithProgressBar(cmd)
90 app, err := setupAppWithProgressBar(cmd)
79 if err != nil {
91 if err != nil {
80 return err
92 return err
81 }
93 }
82 defer app.Shutdown()
94 defer app.Shutdown()
83
95
96+ // Resolve session ID if provided
97+ if sessionID != "" {
98+ sess, err := resolveSessionID(cmd.Context(), app.Sessions, sessionID)
99+ if err != nil {
100+ return err
101+ }
102+ sessionID = sess.ID
103+ }
104+
84 event.AppInitialized()
105 event.AppInitialized()
85
106
86 // Set up the TUI.
107 // Set up the TUI.
87 var env uv.Environ = os.Environ()
108 var env uv.Environ = os.Environ()
88
109
89 com := common.DefaultCommon(app)
110 com := common.DefaultCommon(app)
90− model := ui.New(com)
111+ model := ui.New(com, sessionID, continueLast)
91
112
92 program := tea.NewProgram(
113 program := tea.NewProgram(
93 model,
114 model,
internal/ui/model/ui.go+33−1
@@ -139,6 +139,11 @@ type UI struct {
139 // keeps track of read files while we don't have a session id
139 // keeps track of read files while we don't have a session id
140 sessionFileReads []string
140 sessionFileReads []string
141
141
142+ // initialSessionID is set when loading a specific session on startup.
143+ initialSessionID string
144+ // continueLastSession is set to continue the most recent session on startup.
145+ continueLastSession bool
146+
142 lastUserMessageTime int64
147 lastUserMessageTime int64
143
148
144 // The width and height of the terminal in cells.
149 // The width and height of the terminal in cells.
@@ -242,7 +247,7 @@ type UI struct {
242}
247}
243
248
244// New creates a new instance of the [UI] model.
249// New creates a new instance of the [UI] model.
245−func New(com *common.Common) *UI {
250+func New(com *common.Common, initialSessionID string, continueLast bool) *UI {
246 // Editor components
251 // Editor components
247 ta := textarea.New()
252 ta := textarea.New()
248 ta.SetStyles(com.Styles.TextArea)
253 ta.SetStyles(com.Styles.TextArea)
@@ -298,6 +303,8 @@ func New(com *common.Common) *UI {
298 mcpStates: make(map[string]mcp.ClientInfo),
303 mcpStates: make(map[string]mcp.ClientInfo),
299 notifyBackend: notification.NoopBackend{},
304 notifyBackend: notification.NoopBackend{},
300 notifyWindowFocused: true,
305 notifyWindowFocused: true,
306+ initialSessionID: initialSessionID,
307+ continueLastSession: continueLast,
301 }
308 }
302
309
303 status := NewStatus(com, ui)
310 status := NewStatus(com, ui)
@@ -346,9 +353,34 @@ func (m *UI) Init() tea.Cmd {
346 cmds = append(cmds, m.loadCustomCommands())
353 cmds = append(cmds, m.loadCustomCommands())
347 // load prompt history async
354 // load prompt history async
348 cmds = append(cmds, m.loadPromptHistory())
355 cmds = append(cmds, m.loadPromptHistory())
356+ // load initial session if specified
357+ if cmd := m.loadInitialSession(); cmd != nil {
358+ cmds = append(cmds, cmd)
359+ }
349 return tea.Batch(cmds...)
360 return tea.Batch(cmds...)
350}
361}
351
362
363+// loadInitialSession loads the initial session if one was specified on startup.
364+func (m *UI) loadInitialSession() tea.Cmd {
365+ switch {
366+ case m.state != uiLanding:
367+ // Only load if we're in landing state (i.e., fully configured)
368+ return nil
369+ case m.initialSessionID != "":
370+ return m.loadSession(m.initialSessionID)
371+ case m.continueLastSession:
372+ return func() tea.Msg {
373+ sess, err := m.com.App.Sessions.GetLast(context.Background())
374+ if err != nil {
375+ return nil
376+ }
377+ return m.loadSession(sess.ID)()
378+ }
379+ default:
380+ return nil
381+ }
382+}
383+
352// sendNotification returns a command that sends a notification if allowed by policy.
384// sendNotification returns a command that sends a notification if allowed by policy.
353func (m *UI) sendNotification(n notification.Notification) tea.Cmd {
385func (m *UI) sendNotification(n notification.Notification) tea.Cmd {
354 if !m.shouldSendNotification() {
386 if !m.shouldSendNotification() {