@@ -4,9 +4,12 @@ import (
44 "context"
55 "crypto/rand"
66 "encoding/hex"
7+ "encoding/json"
8+ "flag"
79 "fmt"
810 "os"
911 "path/filepath"
12+ "strings"
1013 "time"
1114
1215 tea "charm.land/bubbletea/v2"
@@ -29,6 +32,15 @@ func main() {
2932 fmt.Fprintf(os.Stderr, "Warning: failed to setup logging: %v\n", err)
3033 }
3134
35+ // Parse CLI flags.
36+ flagSession := flag.String("s", "", "resume a session by ID")
37+ flagList := flag.Bool("l", false, "list sessions")
38+ flagContinue := flag.Bool("c", false, "continue most recent session")
39+ flag.StringVar(flagSession, "session", "", "resume a session by ID")
40+ flag.BoolVar(flagList, "list", false, "list sessions")
41+ flag.BoolVar(flagContinue, "continue", false, "continue most recent session")
42+ flag.Parse()
43+
3244 cfg, err := config.Load(filepath.Join(".", "config.toml"))
3345 if err != nil {
3446 fmt.Printf("Error loading config: %v\n", err)
@@ -59,18 +71,19 @@ func main() {
5971 defer svc.webCache.Close()
6072 }
6173
74+ // Handle --list: print sessions and exit.
75+ if *flagList {
76+ listSessions(svc.webCache)
77+ return
78+ }
79+
6280 tools, err := svc.proxy.ListTools(context.Background())
6381 if err != nil {
6482 fmt.Printf("Warning: Failed to list tools: %v\n", err)
6583 tools = []mcp.Tool{}
6684 }
6785
68- sessionID := newSessionID()
69- if svc.webCache != nil {
70- if err := svc.webCache.CreateSession(sessionID); err != nil {
71- fmt.Printf("Warning: failed to create session: %v\n", err)
72- }
73- }
86+ sessionID, resumeHistory := resolveSession(*flagSession, *flagContinue, svc.webCache)
7487
7588 // Build tree-sitter project symbol index.
7689 cwd, err := os.Getwd()
@@ -93,7 +106,7 @@ func main() {
93106 }
94107
95108 p := tea.NewProgram(
96- tui.New(prov, svc.proxy, tools, providerCfg.Model, svc.webCache, sessionID, tsIndex, svc.deltaTracker, svc.fileTracker, providerName, svc.scratchpad),
109+ tui.New(prov, svc.proxy, tools, providerCfg.Model, svc.webCache, sessionID, tsIndex, svc.deltaTracker, svc.fileTracker, providerName, svc.scratchpad, resumeHistory),
97110 tea.WithFilter(tui.MouseEventFilter),
98111 )
99112 svc.lspManager.SetCallback(func(absPath string, lines map[int]int) {
@@ -255,3 +268,115 @@ func setupFileLogging() error {
255268
256269 return nil
257270 }
271+
272+func listSessions(db *store.Cache) {
273+ if db == nil {
274+ fmt.Println("No cache available")
275+ return
276+ }
277+ sessions, err := db.ListSessions()
278+ if err != nil {
279+ fmt.Printf("Error listing sessions: %v\n", err)
280+ return
281+ }
282+ if len(sessions) == 0 {
283+ fmt.Println("No sessions found")
284+ return
285+ }
286+ for _, s := range sessions {
287+ ts := s.Timestamp.Format("2006-01-02 15:04")
288+ preview := s.Preview
289+ preview = strings.ReplaceAll(preview, "\n", " ")
290+ if len(preview) > 50 {
291+ preview = preview[:50]
292+ }
293+ fmt.Printf("%s %s %s\n", s.ID, ts, preview)
294+ }
295+}
296+
297+func storedToMessages(msgs []store.SessionMessage) []provider.Message {
298+ out := make([]provider.Message, 0, len(msgs))
299+ for _, m := range msgs {
300+ pm := provider.Message{
301+ Role: m.Role,
302+ Content: m.Content,
303+ Reasoning: m.Reasoning,
304+ ToolCallID: m.ToolCallID,
305+ CreatedAt: m.CreatedAt,
306+ }
307+ if len(m.ToolCalls) > 0 {
308+ var tcs []provider.ToolCall
309+ if err := json.Unmarshal(m.ToolCalls, &tcs); err == nil {
310+ pm.ToolCalls = tcs
311+ }
312+ }
313+ out = append(out, pm)
314+ }
315+ return out
316+}
317+
318+func resolveSession(flagSession string, flagContinue bool, db *store.Cache) (string, []provider.Message) {
319+ switch {
320+ case flagSession != "":
321+ if db != nil {
322+ ok, err := db.SessionExists(flagSession)
323+ if err != nil || !ok {
324+ fmt.Printf("Session %q not found\n", flagSession)
325+ os.Exit(1)
326+ }
327+ }
328+ msgs := loadHistory(flagSession, db)
329+ return flagSession, msgs
330+
331+ case flagContinue:
332+ if db == nil {
333+ fmt.Println("No cache available")
334+ os.Exit(1)
335+ }
336+ id, err := db.LatestSessionID()
337+ if err != nil {
338+ fmt.Printf("No sessions to continue: %v\n", err)
339+ os.Exit(1)
340+ }
341+ msgs := loadHistory(id, db)
342+ return id, msgs
343+
344+ default:
345+ sid := newSessionID()
346+ if db != nil {
347+ if err := db.CreateSession(sid); err != nil {
348+ fmt.Printf("Warning: failed to create session: %v\n", err)
349+ }
350+ }
351+ return sid, nil
352+ }
353+}
354+
355+func loadHistory(sessionID string, db *store.Cache) []provider.Message {
356+ if db == nil {
357+ return nil
358+ }
359+ stored, err := db.LoadMessages(sessionID)
360+ if err != nil {
361+ fmt.Printf("Warning: failed to load session history: %v\n", err)
362+ return nil
363+ }
364+ msgs := storedToMessages(stored)
365+ return trimIncomplete(msgs)
366+}
367+
368+// trimIncomplete removes trailing messages that form an incomplete turn.
369+// A valid history ends with an assistant message (finished response) or
370+// a system message (empty session). Trailing user/tool messages from a
371+// session killed mid-turn are dropped so the next user input doesn't
372+// create consecutive user messages which the API rejects.
373+func trimIncomplete(msgs []provider.Message) []provider.Message {
374+ for len(msgs) > 0 {
375+ last := msgs[len(msgs)-1]
376+ if last.Role == "assistant" || last.Role == "system" {
377+ break
378+ }
379+ msgs = msgs[:len(msgs)-1]
380+ }
381+ return msgs
382+}