@robota-sdk/agent-cli 3.0.0-beta.44 → 3.0.0-beta.46

package/README.md

@@ -181,6 +181,34 @@ After the Edit tool runs, a `DiffBlock` component renders the change inline:
 
 Removed lines appear in red with `-`, added lines in green with `+`. Diffs longer than 10 lines show the first 8 + a `... and N more lines` summary.
 
+## Session Management
+
+The CLI supports continuing, resuming, forking, and naming sessions.
+
+### CLI Flags
+
+| Flag                  | Description                                      |
+| --------------------- | ------------------------------------------------ |
+| `-c`, `--continue`    | Continue the most recent session                 |
+| `-r`, `--resume <id>` | Resume a specific session by ID                  |
+| `--fork-session <id>` | Fork a session (new session with copied history) |
+| `--name <name>`       | Assign a name to the session at startup          |
+
+### TUI Commands
+
+| Command          | Description                         |
+| ---------------- | ----------------------------------- |
+| `/resume`        | List recent sessions and resume one |
+| `/rename <name>` | Rename the current session          |
+
+### Session Name Display
+
+When a session has a name, it appears in three places:
+
+- **Input border** — session name shown in the input area border
+- **Terminal title** — updated via ANSI escape sequences
+- **StatusBar** — displayed alongside mode, model, and context usage
+
 ## Slash Commands
 
 | Command                   | Description                                                |
@@ -195,6 +223,8 @@ Removed lines appear in red with `-`, added lines in green with `+`. Diffs longe
 | `/context`                | Context window details                                     |
 | `/permissions`            | Show permission rules                                      |
 | `/plugin [subcommand]`    | Plugin management TUI                                      |
+| `/resume`                 | List recent sessions and resume one                        |
+| `/rename <name>`          | Rename the current session                                 |
 | `/exit`                   | Exit CLI                                                   |
 
 Typing `/` triggers an autocomplete popup with arrow-key navigation, Tab completion, and Esc to dismiss. Commands with subcommands (e.g., `/mode`, `/model`) show a nested submenu. Skill commands discovered from `.agents/skills/` and `.claude/commands/` appear alongside built-in commands.

package/dist/node/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   startCli
-} from "./chunk-Y6VSMUKG.js";
+} from "./chunk-L5G6WFOL.js";
 
 // src/bin.ts
 process.on("uncaughtException", (err) => {

package/dist/node/{chunk-Y6VSMUKG.js → chunk-L5G6WFOL.js}

@@ -3,6 +3,7 @@ import { readFileSync as readFileSync3, existsSync as existsSync3, mkdirSync as
 import { join as join5, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 import { InteractiveSession as InteractiveSession2 } from "@robota-sdk/agent-sdk";
+import { SessionStore } from "@robota-sdk/agent-sessions";
 
 // src/utils/cli-args.ts
 import { parseArgs } from "util";
@@ -31,12 +32,14 @@ function parseCliArgs() {
     allowPositionals: true,
     options: {
       p: { type: "boolean", short: "p", default: false },
-      c: { type: "boolean", short: "c", default: false },
-      r: { type: "string", short: "r" },
+      continue: { type: "boolean", short: "c", default: false },
+      resume: { type: "string", short: "r" },
       model: { type: "string" },
       language: { type: "string" },
       "permission-mode": { type: "string" },
       "max-turns": { type: "string" },
+      "fork-session": { type: "boolean", default: false },
+      name: { type: "string", short: "n" },
       version: { type: "boolean", default: false },
       reset: { type: "boolean", default: false }
     }
@@ -44,12 +47,14 @@ function parseCliArgs() {
   return {
     positional: positionals,
     printMode: values["p"] ?? false,
-    continueMode: values["c"] ?? false,
-    resumeId: values["r"],
+    continueMode: values["continue"] ?? false,
+    resumeId: values["resume"],
     model: values["model"],
     language: values["language"],
     permissionMode: parsePermissionMode(values["permission-mode"]),
     maxTurns: parseMaxTurns(values["max-turns"]),
+    forkSession: values["fork-session"] ?? false,
+    sessionName: values["name"],
     version: values["version"] ?? false,
     reset: values["reset"] ?? false
   };
@@ -133,8 +138,8 @@ function createProviderFromSettings(cwd, modelOverride) {
 import { render } from "ink";
 
 // src/ui/App.tsx
-import { useState as useState9, useRef as useRef7 } from "react";
-import { Box as Box11, Text as Text13, useApp, useInput as useInput7 } from "ink";
+import { useState as useState10, useRef as useRef8, useEffect as useEffect4 } from "react";
+import { Box as Box12, Text as Text14, useApp, useInput as useInput8 } from "ink";
 import { getModelName, createSystemMessage as createSystemMessage2, messageToHistoryEntry as messageToHistoryEntry2 } from "@robota-sdk/agent-core";
 
 // src/ui/hooks/useInteractiveSession.ts
@@ -258,7 +263,11 @@ function initializeSession(props, permissionHandler) {
     provider: props.provider,
     permissionMode: props.permissionMode,
     maxTurns: props.maxTurns,
-    permissionHandler
+    permissionHandler,
+    sessionStore: props.sessionStore,
+    resumeSessionId: props.resumeSessionId,
+    forkSession: props.forkSession,
+    sessionName: props.sessionName
   });
   const registry = new CommandRegistry();
   registry.addSource(new BuiltinCommandSource());
@@ -313,6 +322,12 @@ function useInteractiveSession(props) {
   }
   const { interactiveSession, registry, manager } = stateRef.current;
   manager.onChange = () => forceRender((n) => n + 1);
+  if (manager.history.length === 0) {
+    const restored = interactiveSession.getFullHistory();
+    if (restored.length > 0) {
+      manager.syncHistory(restored);
+    }
+  }
   useEffect(() => {
     interactiveSession.on("text_delta", manager.onTextDelta);
     interactiveSession.on("tool_start", manager.onToolStart);
@@ -329,6 +344,10 @@ function useInteractiveSession(props) {
           usedTokens: ctx.usedTokens,
           maxTokens: ctx.maxTokens
         });
+        const restored = interactiveSession.getFullHistory();
+        if (restored.length > 0) {
+          manager.syncHistory(restored);
+        }
         clearInterval(initCheck);
       } catch {
       }
@@ -372,6 +391,14 @@ function useInteractiveSession(props) {
             effects._resetRequested = true;
             return;
           }
+          if (result.data?.triggerResumePicker) {
+            effects._triggerResumePicker = true;
+            return;
+          }
+          if (result.data?.name) {
+            effects._sessionName = result.data.name;
+            return;
+          }
           const ctx = interactiveSession.getContextState();
           manager.setContextState({
             percentage: ctx.usedPercentage,
@@ -764,7 +791,7 @@ function MessageList({ history }) {
 // src/ui/StatusBar.tsx
 import { Box as Box3, Text as Text3 } from "ink";
 import { formatTokenCount } from "@robota-sdk/agent-core";
-import { jsx as jsx2, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx2, jsxs as jsxs3 } from "react/jsx-runtime";
 var CONTEXT_YELLOW_THRESHOLD = 70;
 var CONTEXT_RED_THRESHOLD = 90;
 function getContextColor(percentage) {
@@ -780,7 +807,8 @@ function StatusBar({
   isThinking,
   contextPercentage,
   contextUsedTokens,
-  contextMaxTokens
+  contextMaxTokens,
+  sessionName
 }) {
   const contextColor = getContextColor(contextPercentage);
   return /* @__PURE__ */ jsxs3(
@@ -796,6 +824,10 @@ function StatusBar({
           /* @__PURE__ */ jsx2(Text3, { color: "cyan", bold: true, children: "Mode:" }),
           " ",
           /* @__PURE__ */ jsx2(Text3, { children: permissionMode }),
+          sessionName && /* @__PURE__ */ jsxs3(Fragment2, { children: [
+            "  |  ",
+            /* @__PURE__ */ jsx2(Text3, { color: "magenta", children: sessionName })
+          ] }),
           "  |  ",
           /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: modelName }),
           "  |  ",
@@ -1137,7 +1169,8 @@ function InputArea({
   isDisabled,
   isAborting,
   pendingPrompt,
-  registry
+  registry,
+  sessionName
 }) {
   const [value, setValue] = useState4("");
   const pasteStore = useRef3(/* @__PURE__ */ new Map());
@@ -1220,6 +1253,17 @@ function InputArea({
     },
     { isActive: !!pendingPrompt }
   );
+  const borderColor = isAborting ? "yellow" : pendingPrompt ? "cyan" : isDisabled ? "gray" : "green";
+  const innerWidth = Math.max(1, terminalColumns - BORDER_HORIZONTAL);
+  const topBorder = (() => {
+    if (sessionName) {
+      const label = ` "${sessionName}" `;
+      const rightPad = 2;
+      const leftLen = Math.max(0, innerWidth - label.length - rightPad);
+      return { left: "\u250C" + "\u2500".repeat(leftLen), label, right: "\u2500".repeat(rightPad) + "\u2510" };
+    }
+    return { left: "\u250C" + "\u2500".repeat(innerWidth), label: "", right: "\u2510" };
+  })();
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
     showPopup && /* @__PURE__ */ jsx6(
       SlashAutocomplete,
@@ -1230,34 +1274,31 @@ function InputArea({
         isSubcommandMode
       }
     ),
-    /* @__PURE__ */ jsx6(
-      Box5,
-      {
-        borderStyle: "single",
-        borderColor: isAborting ? "yellow" : pendingPrompt ? "cyan" : isDisabled ? "gray" : "green",
-        paddingLeft: 1,
-        children: isAborting ? /* @__PURE__ */ jsx6(Text7, { color: "yellow", children: " Interrupting..." }) : pendingPrompt ? /* @__PURE__ */ jsxs5(Text7, { color: "cyan", children: [
-          " ",
-          "Queued: ",
-          pendingPrompt.length > 50 ? pendingPrompt.slice(0, 47) + "..." : pendingPrompt,
-          " ",
-          /* @__PURE__ */ jsx6(Text7, { dimColor: true, children: "(Backspace to cancel)" })
-        ] }) : isDisabled ? /* @__PURE__ */ jsx6(WaveText, { text: "  Waiting for response... (ESC to interrupt)" }) : /* @__PURE__ */ jsxs5(Box5, { children: [
-          /* @__PURE__ */ jsx6(Text7, { color: "green", bold: true, children: "> " }),
-          /* @__PURE__ */ jsx6(
-            CjkTextInput,
-            {
-              value,
-              onChange: setValue,
-              onSubmit: handleSubmit,
-              onPaste: handlePaste,
-              placeholder: "Type a message or /help",
-              availableWidth
-            }
-          )
-        ] })
-      }
-    )
+    /* @__PURE__ */ jsxs5(Text7, { color: borderColor, children: [
+      topBorder.left,
+      topBorder.label ? /* @__PURE__ */ jsx6(Text7, { backgroundColor: borderColor, color: "black", bold: true, children: topBorder.label }) : null,
+      topBorder.right
+    ] }),
+    /* @__PURE__ */ jsx6(Box5, { borderStyle: "single", borderTop: false, borderColor, paddingLeft: 1, children: isAborting ? /* @__PURE__ */ jsx6(Text7, { color: "yellow", children: " Interrupting..." }) : pendingPrompt ? /* @__PURE__ */ jsxs5(Text7, { color: "cyan", children: [
+      " ",
+      "Queued: ",
+      pendingPrompt.length > 50 ? pendingPrompt.slice(0, 47) + "..." : pendingPrompt,
+      " ",
+      /* @__PURE__ */ jsx6(Text7, { dimColor: true, children: "(Backspace to cancel)" })
+    ] }) : isDisabled ? /* @__PURE__ */ jsx6(WaveText, { text: "  Waiting for response... (ESC to interrupt)" }) : /* @__PURE__ */ jsxs5(Box5, { children: [
+      /* @__PURE__ */ jsx6(Text7, { color: "green", bold: true, children: "> " }),
+      /* @__PURE__ */ jsx6(
+        CjkTextInput,
+        {
+          value,
+          onChange: setValue,
+          onSubmit: handleSubmit,
+          onPaste: handlePaste,
+          placeholder: "Type a message or /help",
+          availableWidth
+        }
+      )
+    ] }) })
   ] });
 }
 
@@ -1370,7 +1411,7 @@ function PermissionPrompt({ request }) {
 
 // src/ui/StreamingIndicator.tsx
 import { Box as Box8, Text as Text10 } from "ink";
-import { Fragment as Fragment2, jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
 function getToolStyle(t) {
   if (t.isRunning) return { color: "yellow", icon: "\u27F3", strikethrough: false };
   if (t.result === "error") return { color: "red", icon: "\u2717", strikethrough: true };
@@ -1381,7 +1422,7 @@ function StreamingIndicator({ text, activeTools }) {
   const hasTools = activeTools.length > 0;
   const hasText = text.length > 0;
   if (!hasTools && !hasText) {
-    return /* @__PURE__ */ jsx9(Fragment2, {});
+    return /* @__PURE__ */ jsx9(Fragment3, {});
   }
   return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
     hasTools && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", marginBottom: 1, children: [
@@ -1862,10 +1903,90 @@ function PluginTUI({ callbacks, onClose, addMessage }) {
   );
 }
 
-// src/ui/App.tsx
+// src/ui/ListPicker.tsx
+import { useState as useState9, useRef as useRef7 } from "react";
+import { Box as Box11, Text as Text13, useInput as useInput7 } from "ink";
 import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
+var DEFAULT_MAX_VISIBLE = 3;
+function ListPicker({
+  items,
+  renderItem,
+  onSelect,
+  onCancel,
+  maxVisible = DEFAULT_MAX_VISIBLE
+}) {
+  const [selectedIndex, setSelectedIndex] = useState9(0);
+  const [scrollOffset, setScrollOffset] = useState9(0);
+  const selectedRef = useRef7(0);
+  const resolvedRef = useRef7(false);
+  useInput7((_input, key) => {
+    if (resolvedRef.current) return;
+    if (key.escape) {
+      resolvedRef.current = true;
+      onCancel();
+      return;
+    }
+    if (items.length === 0) return;
+    if (key.upArrow) {
+      const next = selectedRef.current > 0 ? selectedRef.current - 1 : selectedRef.current;
+      selectedRef.current = next;
+      setSelectedIndex(next);
+      if (next < scrollOffset) {
+        setScrollOffset(next);
+      }
+    } else if (key.downArrow) {
+      const next = selectedRef.current < items.length - 1 ? selectedRef.current + 1 : selectedRef.current;
+      selectedRef.current = next;
+      setSelectedIndex(next);
+      if (next >= scrollOffset + maxVisible) {
+        setScrollOffset(next - maxVisible + 1);
+      }
+    } else if (key.return) {
+      const item = items[selectedRef.current];
+      if (item !== void 0) {
+        resolvedRef.current = true;
+        onSelect(item);
+      }
+    }
+  });
+  if (items.length === 0) {
+    return /* @__PURE__ */ jsx13(Box11, {});
+  }
+  const visibleItems = items.slice(scrollOffset, scrollOffset + maxVisible);
+  const hasMore = scrollOffset + maxVisible < items.length;
+  const hasLess = scrollOffset > 0;
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
+    hasLess && /* @__PURE__ */ jsxs11(Text13, { dimColor: true, children: [
+      " \u2191 ",
+      scrollOffset,
+      " more above"
+    ] }),
+    visibleItems.map((item, index) => /* @__PURE__ */ jsx13(Box11, { marginBottom: 1, children: renderItem(item, scrollOffset + index === selectedIndex) }, scrollOffset + index)),
+    hasMore && /* @__PURE__ */ jsxs11(Text13, { dimColor: true, children: [
+      " \u2193 ",
+      items.length - scrollOffset - maxVisible,
+      " more below"
+    ] })
+  ] });
+}
+
+// src/ui/App.tsx
+import { Fragment as Fragment4, jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 var EXIT_DELAY_MS = 500;
+var SESSION_ID_DISPLAY_LENGTH = 8;
 function App(props) {
+  const [activeSessionId, setActiveSessionId] = useState10(props.resumeSessionId);
+  return /* @__PURE__ */ jsx14(
+    AppInner,
+    {
+      ...props,
+      resumeSessionId: activeSessionId,
+      onSessionSwitch: (sessionId) => setActiveSessionId(sessionId)
+    },
+    activeSessionId ?? "__new__"
+  );
+}
+function AppInner(props) {
   const { exit } = useApp();
   const cwd = props.cwd;
   const {
@@ -1887,12 +2008,28 @@ function App(props) {
     cwd,
     provider: props.provider,
     permissionMode: props.permissionMode,
-    maxTurns: props.maxTurns
+    maxTurns: props.maxTurns,
+    sessionStore: props.sessionStore,
+    resumeSessionId: props.resumeSessionId,
+    forkSession: props.forkSession,
+    sessionName: props.sessionName
   });
   const pluginCallbacks = usePluginCallbacks(cwd);
-  const [pendingModelId, setPendingModelId] = useState9(null);
-  const pendingModelChangeRef = useRef7(null);
-  const [showPluginTUI, setShowPluginTUI] = useState9(false);
+  const [pendingModelId, setPendingModelId] = useState10(null);
+  const pendingModelChangeRef = useRef8(null);
+  const [showPluginTUI, setShowPluginTUI] = useState10(false);
+  const [showSessionPicker, setShowSessionPicker] = useState10(
+    props.resumeSessionId === "__picker__"
+  );
+  const [sessionName, setSessionName] = useState10(props.sessionName);
+  useEffect4(() => {
+    const name = interactiveSession?.getName?.();
+    if (name && !sessionName) setSessionName(name);
+  }, [interactiveSession, sessionName]);
+  useEffect4(() => {
+    const title = sessionName ? `Robota \u2014 ${sessionName}` : "Robota";
+    process.stdout.write(`\x1B]0;${title}\x07`);
+  }, [sessionName]);
   const handleSubmit = async (input) => {
     await baseHandleSubmit(input);
     const sideEffects = interactiveSession;
@@ -1937,14 +2074,26 @@ function App(props) {
       setShowPluginTUI(true);
       return;
     }
+    if (sideEffects._triggerResumePicker) {
+      delete sideEffects._triggerResumePicker;
+      setShowSessionPicker(true);
+      return;
+    }
+    if (sideEffects._sessionName) {
+      const name = sideEffects._sessionName;
+      delete sideEffects._sessionName;
+      interactiveSession.setName(name);
+      setSessionName(name);
+      return;
+    }
   };
-  useInput7(
+  useInput8(
     (_input, key) => {
       if (key.escape && isThinking) {
         handleAbort();
       }
     },
-    { isActive: !permissionRequest && !showPluginTUI }
+    { isActive: !permissionRequest && !showPluginTUI && !showSessionPicker }
   );
   let permissionMode = props.permissionMode ?? "default";
   let sessionId = "";
@@ -1954,26 +2103,26 @@ function App(props) {
     sessionId = session.getSessionId();
   } catch {
   }
-  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
-      /* @__PURE__ */ jsx13(Text13, { color: "cyan", bold: true, children: `
+  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ jsx14(Text14, { color: "cyan", bold: true, children: `
   ____   ___  ____   ___ _____  _
  |  _ \\ / _ \\| __ ) / _ \\_   _|/ \\
  | |_) | | | |  _ \\| | | || | / _ \\
  |  _ <| |_| | |_) | |_| || |/ ___ \\
  |_| \\_\\\\___/|____/ \\___/ |_/_/   \\_\\
 ` }),
-      /* @__PURE__ */ jsxs11(Text13, { dimColor: true, children: [
+      /* @__PURE__ */ jsxs12(Text14, { dimColor: true, children: [
         " v",
         props.version ?? "0.0.0"
       ] })
     ] }),
-    /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: [
-      /* @__PURE__ */ jsx13(MessageList, { history }),
-      (isThinking || activeTools.length > 0) && /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ jsx13(StreamingIndicator, { text: streamingText, activeTools }) })
+    /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: [
+      /* @__PURE__ */ jsx14(MessageList, { history }),
+      (isThinking || activeTools.length > 0) && /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ jsx14(StreamingIndicator, { text: streamingText, activeTools }) })
     ] }),
-    permissionRequest && /* @__PURE__ */ jsx13(PermissionPrompt, { request: permissionRequest }),
-    pendingModelId && /* @__PURE__ */ jsx13(
+    permissionRequest && /* @__PURE__ */ jsx14(PermissionPrompt, { request: permissionRequest }),
+    pendingModelId && /* @__PURE__ */ jsx14(
       ConfirmPrompt,
       {
         message: `Change model to ${getModelName(pendingModelId)}? This will restart the session.`,
@@ -2007,7 +2156,7 @@ function App(props) {
         }
       }
     ),
-    showPluginTUI && /* @__PURE__ */ jsx13(
+    showPluginTUI && /* @__PURE__ */ jsx14(
       PluginTUI,
       {
         callbacks: pluginCallbacks,
@@ -2015,7 +2164,52 @@ function App(props) {
         addMessage: (msg) => addEntry(messageToHistoryEntry2(createSystemMessage2(msg.content)))
       }
     ),
-    /* @__PURE__ */ jsx13(
+    showSessionPicker && /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ jsx14(Text14, { bold: true, color: "cyan", children: "Select a session to resume (ESC to cancel):" }),
+      /* @__PURE__ */ jsx14(
+        ListPicker,
+        {
+          items: (props.sessionStore?.list() ?? []).filter((s) => s.cwd === props.cwd),
+          renderItem: (session, isSelected) => {
+            const lastMsg = session.messages.slice().reverse().find((m) => {
+              const msg = m;
+              return msg.role === "assistant" && msg.content;
+            });
+            const rawPreview = lastMsg?.content?.replace(/[\n\r]+/g, " ").trim() ?? "";
+            const preview = rawPreview ? rawPreview.slice(0, 60) + (rawPreview.length > 60 ? "..." : "") : "";
+            return /* @__PURE__ */ jsxs12(Text14, { children: [
+              isSelected ? "> " : "  ",
+              /* @__PURE__ */ jsx14(Text14, { bold: true, children: session.name ?? session.id.slice(0, SESSION_ID_DISPLAY_LENGTH) }),
+              "  ",
+              /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: new Date(session.updatedAt).toLocaleString(void 0, {
+                month: "short",
+                day: "numeric",
+                hour: "2-digit",
+                minute: "2-digit"
+              }) }),
+              "  ",
+              /* @__PURE__ */ jsxs12(Text14, { dimColor: true, children: [
+                "msgs: ",
+                session.messages.length
+              ] }),
+              preview ? /* @__PURE__ */ jsxs12(Fragment4, { children: [
+                "\n    ",
+                /* @__PURE__ */ jsx14(Text14, { color: "gray", children: preview })
+              ] }) : null
+            ] });
+          },
+          onSelect: (session) => {
+            setShowSessionPicker(false);
+            props.onSessionSwitch(session.id);
+          },
+          onCancel: () => {
+            setShowSessionPicker(false);
+            addEntry(messageToHistoryEntry2(createSystemMessage2("Session resume cancelled.")));
+          }
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx14(
       StatusBar,
       {
         permissionMode,
@@ -2025,26 +2219,28 @@ function App(props) {
         isThinking,
         contextPercentage: contextState.percentage,
         contextUsedTokens: contextState.usedTokens,
-        contextMaxTokens: contextState.maxTokens
+        contextMaxTokens: contextState.maxTokens,
+        sessionName
       }
     ),
-    /* @__PURE__ */ jsx13(
+    /* @__PURE__ */ jsx14(
       InputArea,
       {
         onSubmit: handleSubmit,
         onCancelQueue: handleCancelQueue,
-        isDisabled: !!permissionRequest || showPluginTUI || isThinking && !!pendingPrompt,
+        isDisabled: !!permissionRequest || showPluginTUI || showSessionPicker || isThinking && !!pendingPrompt,
         isAborting,
         pendingPrompt,
-        registry
+        registry,
+        sessionName
       }
     ),
-    /* @__PURE__ */ jsx13(Text13, { children: " " })
+    /* @__PURE__ */ jsx14(Text14, { children: " " })
   ] });
 }
 
 // src/ui/render.tsx
-import { jsx as jsx14 } from "react/jsx-runtime";
+import { jsx as jsx15 } from "react/jsx-runtime";
 function renderApp(options) {
   process.on("unhandledRejection", (reason) => {
     process.stderr.write(`
@@ -2058,7 +2254,7 @@ function renderApp(options) {
   if (process.stdin.isTTY && process.stdout.isTTY) {
     process.stdout.write("\x1B[?2004h");
   }
-  const instance = render(/* @__PURE__ */ jsx14(App, { ...options }), {
+  const instance = render(/* @__PURE__ */ jsx15(App, { ...options }), {
     exitOnCtrlC: true
   });
   instance.waitUntilExit().then(() => {
@@ -2227,6 +2423,28 @@ async function startCli() {
   const providerSettings = readProviderSettings(cwd);
   const modelId = args.model ?? providerSettings.model;
   const provider = createProviderFromSettings(cwd, args.model);
+  const sessionStore = new SessionStore();
+  let resumeSessionId;
+  if (args.continueMode) {
+    const sessions = sessionStore.list().filter((s) => s.cwd === cwd);
+    if (sessions.length > 0) {
+      resumeSessionId = sessions[0].id;
+    }
+  } else if (args.resumeId !== void 0) {
+    if (args.resumeId === "") {
+      resumeSessionId = "__picker__";
+    } else {
+      const sessions = sessionStore.list();
+      const match = sessions.find((s) => s.id === args.resumeId || s.name === args.resumeId);
+      if (match) {
+        resumeSessionId = match.id;
+      } else {
+        process.stderr.write(`Session not found: ${args.resumeId}
+`);
+        process.exit(1);
+      }
+    }
+  }
   if (args.printMode) {
     const prompt = args.positional.join(" ").trim();
     if (prompt.length === 0) {
@@ -2237,7 +2455,9 @@ async function startCli() {
       cwd,
       provider,
       permissionMode: args.permissionMode ?? "bypassPermissions",
-      maxTurns: args.maxTurns
+      maxTurns: args.maxTurns,
+      sessionStore,
+      sessionName: args.sessionName
     });
     await new Promise((resolve, reject) => {
       session.on("complete", (result) => {
@@ -2260,7 +2480,11 @@ async function startCli() {
     language: args.language,
     permissionMode: args.permissionMode,
     maxTurns: args.maxTurns,
-    version: readVersion()
+    version: readVersion(),
+    sessionStore,
+    resumeSessionId,
+    forkSession: args.forkSession,
+    sessionName: args.sessionName
   });
 }
 

package/dist/node/index.cjs

@@ -39,6 +39,7 @@ var import_node_fs3 = require("fs");
 var import_node_path5 = require("path");
 var import_node_url = require("url");
 var import_agent_sdk3 = require("@robota-sdk/agent-sdk");
+var import_agent_sessions = require("@robota-sdk/agent-sessions");
 
 // src/utils/cli-args.ts
 var import_node_util = require("util");
@@ -67,12 +68,14 @@ function parseCliArgs() {
     allowPositionals: true,
     options: {
       p: { type: "boolean", short: "p", default: false },
-      c: { type: "boolean", short: "c", default: false },
-      r: { type: "string", short: "r" },
+      continue: { type: "boolean", short: "c", default: false },
+      resume: { type: "string", short: "r" },
       model: { type: "string" },
       language: { type: "string" },
       "permission-mode": { type: "string" },
       "max-turns": { type: "string" },
+      "fork-session": { type: "boolean", default: false },
+      name: { type: "string", short: "n" },
       version: { type: "boolean", default: false },
       reset: { type: "boolean", default: false }
     }
@@ -80,12 +83,14 @@ function parseCliArgs() {
   return {
     positional: positionals,
     printMode: values["p"] ?? false,
-    continueMode: values["c"] ?? false,
-    resumeId: values["r"],
+    continueMode: values["continue"] ?? false,
+    resumeId: values["resume"],
     model: values["model"],
     language: values["language"],
     permissionMode: parsePermissionMode(values["permission-mode"]),
     maxTurns: parseMaxTurns(values["max-turns"]),
+    forkSession: values["fork-session"] ?? false,
+    sessionName: values["name"],
     version: values["version"] ?? false,
     reset: values["reset"] ?? false
   };
@@ -166,11 +171,11 @@ function createProviderFromSettings(cwd, modelOverride) {
 }
 
 // src/ui/render.tsx
-var import_ink14 = require("ink");
+var import_ink15 = require("ink");
 
 // src/ui/App.tsx
-var import_react12 = require("react");
-var import_ink13 = require("ink");
+var import_react13 = require("react");
+var import_ink14 = require("ink");
 var import_agent_core4 = require("@robota-sdk/agent-core");
 
 // src/ui/hooks/useInteractiveSession.ts
@@ -286,7 +291,11 @@ function initializeSession(props, permissionHandler) {
     provider: props.provider,
     permissionMode: props.permissionMode,
     maxTurns: props.maxTurns,
-    permissionHandler
+    permissionHandler,
+    sessionStore: props.sessionStore,
+    resumeSessionId: props.resumeSessionId,
+    forkSession: props.forkSession,
+    sessionName: props.sessionName
   });
   const registry = new import_agent_sdk.CommandRegistry();
   registry.addSource(new import_agent_sdk.BuiltinCommandSource());
@@ -341,6 +350,12 @@ function useInteractiveSession(props) {
   }
   const { interactiveSession, registry, manager } = stateRef.current;
   manager.onChange = () => forceRender((n) => n + 1);
+  if (manager.history.length === 0) {
+    const restored = interactiveSession.getFullHistory();
+    if (restored.length > 0) {
+      manager.syncHistory(restored);
+    }
+  }
   (0, import_react.useEffect)(() => {
     interactiveSession.on("text_delta", manager.onTextDelta);
     interactiveSession.on("tool_start", manager.onToolStart);
@@ -357,6 +372,10 @@ function useInteractiveSession(props) {
           usedTokens: ctx.usedTokens,
           maxTokens: ctx.maxTokens
         });
+        const restored = interactiveSession.getFullHistory();
+        if (restored.length > 0) {
+          manager.syncHistory(restored);
+        }
         clearInterval(initCheck);
       } catch {
       }
@@ -400,6 +419,14 @@ function useInteractiveSession(props) {
             effects._resetRequested = true;
             return;
           }
+          if (result.data?.triggerResumePicker) {
+            effects._triggerResumePicker = true;
+            return;
+          }
+          if (result.data?.name) {
+            effects._sessionName = result.data.name;
+            return;
+          }
           const ctx = interactiveSession.getContextState();
           manager.setContextState({
             percentage: ctx.usedPercentage,
@@ -803,7 +830,8 @@ function StatusBar({
   isThinking,
   contextPercentage,
   contextUsedTokens,
-  contextMaxTokens
+  contextMaxTokens,
+  sessionName
 }) {
   const contextColor = getContextColor(contextPercentage);
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
@@ -819,6 +847,10 @@ function StatusBar({
           /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_ink3.Text, { color: "cyan", bold: true, children: "Mode:" }),
           " ",
           /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_ink3.Text, { children: permissionMode }),
+          sessionName && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
+            "  |  ",
+            /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_ink3.Text, { color: "magenta", children: sessionName })
+          ] }),
           "  |  ",
           /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_ink3.Text, { dimColor: true, children: modelName }),
           "  |  ",
@@ -1160,7 +1192,8 @@ function InputArea({
   isDisabled,
   isAborting,
   pendingPrompt,
-  registry
+  registry,
+  sessionName
 }) {
   const [value, setValue] = (0, import_react6.useState)("");
   const pasteStore = (0, import_react6.useRef)(/* @__PURE__ */ new Map());
@@ -1243,6 +1276,17 @@ function InputArea({
     },
     { isActive: !!pendingPrompt }
   );
+  const borderColor = isAborting ? "yellow" : pendingPrompt ? "cyan" : isDisabled ? "gray" : "green";
+  const innerWidth = Math.max(1, terminalColumns - BORDER_HORIZONTAL);
+  const topBorder = (() => {
+    if (sessionName) {
+      const label = ` "${sessionName}" `;
+      const rightPad = 2;
+      const leftLen = Math.max(0, innerWidth - label.length - rightPad);
+      return { left: "\u250C" + "\u2500".repeat(leftLen), label, right: "\u2500".repeat(rightPad) + "\u2510" };
+    }
+    return { left: "\u250C" + "\u2500".repeat(innerWidth), label: "", right: "\u2510" };
+  })();
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Box, { flexDirection: "column", children: [
     showPopup && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
       SlashAutocomplete,
@@ -1253,34 +1297,31 @@ function InputArea({
         isSubcommandMode
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-      import_ink7.Box,
-      {
-        borderStyle: "single",
-        borderColor: isAborting ? "yellow" : pendingPrompt ? "cyan" : isDisabled ? "gray" : "green",
-        paddingLeft: 1,
-        children: isAborting ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { color: "yellow", children: " Interrupting..." }) : pendingPrompt ? /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Text, { color: "cyan", children: [
-          " ",
-          "Queued: ",
-          pendingPrompt.length > 50 ? pendingPrompt.slice(0, 47) + "..." : pendingPrompt,
-          " ",
-          /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { dimColor: true, children: "(Backspace to cancel)" })
-        ] }) : isDisabled ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(WaveText, { text: "  Waiting for response... (ESC to interrupt)" }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Box, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { color: "green", bold: true, children: "> " }),
-          /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-            CjkTextInput,
-            {
-              value,
-              onChange: setValue,
-              onSubmit: handleSubmit,
-              onPaste: handlePaste,
-              placeholder: "Type a message or /help",
-              availableWidth
-            }
-          )
-        ] })
-      }
-    )
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Text, { color: borderColor, children: [
+      topBorder.left,
+      topBorder.label ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { backgroundColor: borderColor, color: "black", bold: true, children: topBorder.label }) : null,
+      topBorder.right
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Box, { borderStyle: "single", borderTop: false, borderColor, paddingLeft: 1, children: isAborting ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { color: "yellow", children: " Interrupting..." }) : pendingPrompt ? /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Text, { color: "cyan", children: [
+      " ",
+      "Queued: ",
+      pendingPrompt.length > 50 ? pendingPrompt.slice(0, 47) + "..." : pendingPrompt,
+      " ",
+      /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { dimColor: true, children: "(Backspace to cancel)" })
+    ] }) : isDisabled ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(WaveText, { text: "  Waiting for response... (ESC to interrupt)" }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Box, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { color: "green", bold: true, children: "> " }),
+      /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+        CjkTextInput,
+        {
+          value,
+          onChange: setValue,
+          onSubmit: handleSubmit,
+          onPaste: handlePaste,
+          placeholder: "Type a message or /help",
+          availableWidth
+        }
+      )
+    ] }) })
   ] });
 }
 
@@ -1885,11 +1926,91 @@ function PluginTUI({ callbacks, onClose, addMessage }) {
   );
 }
 
-// src/ui/App.tsx
+// src/ui/ListPicker.tsx
+var import_react12 = require("react");
+var import_ink13 = require("ink");
 var import_jsx_runtime14 = require("react/jsx-runtime");
+var DEFAULT_MAX_VISIBLE = 3;
+function ListPicker({
+  items,
+  renderItem,
+  onSelect,
+  onCancel,
+  maxVisible = DEFAULT_MAX_VISIBLE
+}) {
+  const [selectedIndex, setSelectedIndex] = (0, import_react12.useState)(0);
+  const [scrollOffset, setScrollOffset] = (0, import_react12.useState)(0);
+  const selectedRef = (0, import_react12.useRef)(0);
+  const resolvedRef = (0, import_react12.useRef)(false);
+  (0, import_ink13.useInput)((_input, key) => {
+    if (resolvedRef.current) return;
+    if (key.escape) {
+      resolvedRef.current = true;
+      onCancel();
+      return;
+    }
+    if (items.length === 0) return;
+    if (key.upArrow) {
+      const next = selectedRef.current > 0 ? selectedRef.current - 1 : selectedRef.current;
+      selectedRef.current = next;
+      setSelectedIndex(next);
+      if (next < scrollOffset) {
+        setScrollOffset(next);
+      }
+    } else if (key.downArrow) {
+      const next = selectedRef.current < items.length - 1 ? selectedRef.current + 1 : selectedRef.current;
+      selectedRef.current = next;
+      setSelectedIndex(next);
+      if (next >= scrollOffset + maxVisible) {
+        setScrollOffset(next - maxVisible + 1);
+      }
+    } else if (key.return) {
+      const item = items[selectedRef.current];
+      if (item !== void 0) {
+        resolvedRef.current = true;
+        onSelect(item);
+      }
+    }
+  });
+  if (items.length === 0) {
+    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink13.Box, {});
+  }
+  const visibleItems = items.slice(scrollOffset, scrollOffset + maxVisible);
+  const hasMore = scrollOffset + maxVisible < items.length;
+  const hasLess = scrollOffset > 0;
+  return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_ink13.Box, { flexDirection: "column", children: [
+    hasLess && /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_ink13.Text, { dimColor: true, children: [
+      " \u2191 ",
+      scrollOffset,
+      " more above"
+    ] }),
+    visibleItems.map((item, index) => /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink13.Box, { marginBottom: 1, children: renderItem(item, scrollOffset + index === selectedIndex) }, scrollOffset + index)),
+    hasMore && /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_ink13.Text, { dimColor: true, children: [
+      " \u2193 ",
+      items.length - scrollOffset - maxVisible,
+      " more below"
+    ] })
+  ] });
+}
+
+// src/ui/App.tsx
+var import_jsx_runtime15 = require("react/jsx-runtime");
 var EXIT_DELAY_MS = 500;
+var SESSION_ID_DISPLAY_LENGTH = 8;
 function App(props) {
-  const { exit } = (0, import_ink13.useApp)();
+  const [activeSessionId, setActiveSessionId] = (0, import_react13.useState)(props.resumeSessionId);
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+    AppInner,
+    {
+      ...props,
+      resumeSessionId: activeSessionId,
+      onSessionSwitch: (sessionId) => setActiveSessionId(sessionId)
+    },
+    activeSessionId ?? "__new__"
+  );
+}
+function AppInner(props) {
+  const { exit } = (0, import_ink14.useApp)();
   const cwd = props.cwd;
   const {
     interactiveSession,
@@ -1910,12 +2031,28 @@ function App(props) {
     cwd,
     provider: props.provider,
     permissionMode: props.permissionMode,
-    maxTurns: props.maxTurns
+    maxTurns: props.maxTurns,
+    sessionStore: props.sessionStore,
+    resumeSessionId: props.resumeSessionId,
+    forkSession: props.forkSession,
+    sessionName: props.sessionName
   });
   const pluginCallbacks = usePluginCallbacks(cwd);
-  const [pendingModelId, setPendingModelId] = (0, import_react12.useState)(null);
-  const pendingModelChangeRef = (0, import_react12.useRef)(null);
-  const [showPluginTUI, setShowPluginTUI] = (0, import_react12.useState)(false);
+  const [pendingModelId, setPendingModelId] = (0, import_react13.useState)(null);
+  const pendingModelChangeRef = (0, import_react13.useRef)(null);
+  const [showPluginTUI, setShowPluginTUI] = (0, import_react13.useState)(false);
+  const [showSessionPicker, setShowSessionPicker] = (0, import_react13.useState)(
+    props.resumeSessionId === "__picker__"
+  );
+  const [sessionName, setSessionName] = (0, import_react13.useState)(props.sessionName);
+  (0, import_react13.useEffect)(() => {
+    const name = interactiveSession?.getName?.();
+    if (name && !sessionName) setSessionName(name);
+  }, [interactiveSession, sessionName]);
+  (0, import_react13.useEffect)(() => {
+    const title = sessionName ? `Robota \u2014 ${sessionName}` : "Robota";
+    process.stdout.write(`\x1B]0;${title}\x07`);
+  }, [sessionName]);
   const handleSubmit = async (input) => {
     await baseHandleSubmit(input);
     const sideEffects = interactiveSession;
@@ -1960,14 +2097,26 @@ function App(props) {
       setShowPluginTUI(true);
       return;
     }
+    if (sideEffects._triggerResumePicker) {
+      delete sideEffects._triggerResumePicker;
+      setShowSessionPicker(true);
+      return;
+    }
+    if (sideEffects._sessionName) {
+      const name = sideEffects._sessionName;
+      delete sideEffects._sessionName;
+      interactiveSession.setName(name);
+      setSessionName(name);
+      return;
+    }
   };
-  (0, import_ink13.useInput)(
+  (0, import_ink14.useInput)(
     (_input, key) => {
       if (key.escape && isThinking) {
         handleAbort();
       }
     },
-    { isActive: !permissionRequest && !showPluginTUI }
+    { isActive: !permissionRequest && !showPluginTUI && !showSessionPicker }
   );
   let permissionMode = props.permissionMode ?? "default";
   let sessionId = "";
@@ -1977,26 +2126,26 @@ function App(props) {
     sessionId = session.getSessionId();
   } catch {
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_ink13.Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_ink13.Box, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink13.Text, { color: "cyan", bold: true, children: `
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_ink14.Box, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_ink14.Box, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink14.Text, { color: "cyan", bold: true, children: `
   ____   ___  ____   ___ _____  _
  |  _ \\ / _ \\| __ ) / _ \\_   _|/ \\
  | |_) | | | |  _ \\| | | || | / _ \\
  |  _ <| |_| | |_) | |_| || |/ ___ \\
  |_| \\_\\\\___/|____/ \\___/ |_/_/   \\_\\
 ` }),
-      /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_ink13.Text, { dimColor: true, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_ink14.Text, { dimColor: true, children: [
         " v",
         props.version ?? "0.0.0"
       ] })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_ink13.Box, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(MessageList, { history }),
-      (isThinking || activeTools.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink13.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(StreamingIndicator, { text: streamingText, activeTools }) })
+    /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_ink14.Box, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(MessageList, { history }),
+      (isThinking || activeTools.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink14.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(StreamingIndicator, { text: streamingText, activeTools }) })
     ] }),
-    permissionRequest && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(PermissionPrompt, { request: permissionRequest }),
-    pendingModelId && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+    permissionRequest && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(PermissionPrompt, { request: permissionRequest }),
+    pendingModelId && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
       ConfirmPrompt,
       {
         message: `Change model to ${(0, import_agent_core4.getModelName)(pendingModelId)}? This will restart the session.`,
@@ -2030,7 +2179,7 @@ function App(props) {
         }
       }
     ),
-    showPluginTUI && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+    showPluginTUI && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
       PluginTUI,
       {
         callbacks: pluginCallbacks,
@@ -2038,7 +2187,52 @@ function App(props) {
         addMessage: (msg) => addEntry((0, import_agent_core4.messageToHistoryEntry)((0, import_agent_core4.createSystemMessage)(msg.content)))
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+    showSessionPicker && /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_ink14.Box, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink14.Text, { bold: true, color: "cyan", children: "Select a session to resume (ESC to cancel):" }),
+      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        ListPicker,
+        {
+          items: (props.sessionStore?.list() ?? []).filter((s) => s.cwd === props.cwd),
+          renderItem: (session, isSelected) => {
+            const lastMsg = session.messages.slice().reverse().find((m) => {
+              const msg = m;
+              return msg.role === "assistant" && msg.content;
+            });
+            const rawPreview = lastMsg?.content?.replace(/[\n\r]+/g, " ").trim() ?? "";
+            const preview = rawPreview ? rawPreview.slice(0, 60) + (rawPreview.length > 60 ? "..." : "") : "";
+            return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_ink14.Text, { children: [
+              isSelected ? "> " : "  ",
+              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink14.Text, { bold: true, children: session.name ?? session.id.slice(0, SESSION_ID_DISPLAY_LENGTH) }),
+              "  ",
+              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink14.Text, { dimColor: true, children: new Date(session.updatedAt).toLocaleString(void 0, {
+                month: "short",
+                day: "numeric",
+                hour: "2-digit",
+                minute: "2-digit"
+              }) }),
+              "  ",
+              /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_ink14.Text, { dimColor: true, children: [
+                "msgs: ",
+                session.messages.length
+              ] }),
+              preview ? /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_jsx_runtime15.Fragment, { children: [
+                "\n    ",
+                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink14.Text, { color: "gray", children: preview })
+              ] }) : null
+            ] });
+          },
+          onSelect: (session) => {
+            setShowSessionPicker(false);
+            props.onSessionSwitch(session.id);
+          },
+          onCancel: () => {
+            setShowSessionPicker(false);
+            addEntry((0, import_agent_core4.messageToHistoryEntry)((0, import_agent_core4.createSystemMessage)("Session resume cancelled.")));
+          }
+        }
+      )
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
       StatusBar,
       {
         permissionMode,
@@ -2048,26 +2242,28 @@ function App(props) {
         isThinking,
         contextPercentage: contextState.percentage,
         contextUsedTokens: contextState.usedTokens,
-        contextMaxTokens: contextState.maxTokens
+        contextMaxTokens: contextState.maxTokens,
+        sessionName
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
       InputArea,
       {
         onSubmit: handleSubmit,
         onCancelQueue: handleCancelQueue,
-        isDisabled: !!permissionRequest || showPluginTUI || isThinking && !!pendingPrompt,
+        isDisabled: !!permissionRequest || showPluginTUI || showSessionPicker || isThinking && !!pendingPrompt,
         isAborting,
         pendingPrompt,
-        registry
+        registry,
+        sessionName
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink13.Text, { children: " " })
+    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink14.Text, { children: " " })
   ] });
 }
 
 // src/ui/render.tsx
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_jsx_runtime16 = require("react/jsx-runtime");
 function renderApp(options) {
   process.on("unhandledRejection", (reason) => {
     process.stderr.write(`
@@ -2081,7 +2277,7 @@ function renderApp(options) {
   if (process.stdin.isTTY && process.stdout.isTTY) {
     process.stdout.write("\x1B[?2004h");
   }
-  const instance = (0, import_ink14.render)(/* @__PURE__ */ (0, import_jsx_runtime15.jsx)(App, { ...options }), {
+  const instance = (0, import_ink15.render)(/* @__PURE__ */ (0, import_jsx_runtime16.jsx)(App, { ...options }), {
     exitOnCtrlC: true
   });
   instance.waitUntilExit().then(() => {
@@ -2251,6 +2447,28 @@ async function startCli() {
   const providerSettings = readProviderSettings(cwd);
   const modelId = args.model ?? providerSettings.model;
   const provider = createProviderFromSettings(cwd, args.model);
+  const sessionStore = new import_agent_sessions.SessionStore();
+  let resumeSessionId;
+  if (args.continueMode) {
+    const sessions = sessionStore.list().filter((s) => s.cwd === cwd);
+    if (sessions.length > 0) {
+      resumeSessionId = sessions[0].id;
+    }
+  } else if (args.resumeId !== void 0) {
+    if (args.resumeId === "") {
+      resumeSessionId = "__picker__";
+    } else {
+      const sessions = sessionStore.list();
+      const match = sessions.find((s) => s.id === args.resumeId || s.name === args.resumeId);
+      if (match) {
+        resumeSessionId = match.id;
+      } else {
+        process.stderr.write(`Session not found: ${args.resumeId}
+`);
+        process.exit(1);
+      }
+    }
+  }
   if (args.printMode) {
     const prompt = args.positional.join(" ").trim();
     if (prompt.length === 0) {
@@ -2261,7 +2479,9 @@ async function startCli() {
       cwd,
       provider,
       permissionMode: args.permissionMode ?? "bypassPermissions",
-      maxTurns: args.maxTurns
+      maxTurns: args.maxTurns,
+      sessionStore,
+      sessionName: args.sessionName
     });
     await new Promise((resolve, reject) => {
       session.on("complete", (result) => {
@@ -2284,7 +2504,11 @@ async function startCli() {
     language: args.language,
     permissionMode: args.permissionMode,
     maxTurns: args.maxTurns,
-    version: readVersion()
+    version: readVersion(),
+    sessionStore,
+    resumeSessionId,
+    forkSession: args.forkSession,
+    sessionName: args.sessionName
   });
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/node/index.js

@@ -1,6 +1,6 @@
 import {
   startCli
-} from "./chunk-Y6VSMUKG.js";
+} from "./chunk-L5G6WFOL.js";
 export {
   startCli
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robota-sdk/agent-cli",
-  "version": "3.0.0-beta.44",
+  "version": "3.0.0-beta.46",
   "description": "AI coding assistant CLI built on Robota SDK",
   "type": "module",
   "bin": {
@@ -25,6 +25,7 @@
     "dist"
   ],
   "dependencies": {
+    "@robota-sdk/agent-sessions": "3.0.0-beta.46",
     "chalk": "^5.3.0",
     "cli-highlight": "^2.1.0",
     "ink": "^6.8.0",
@@ -35,9 +36,9 @@
     "marked-terminal": "^7.3.0",
     "react": "19.2.4",
     "string-width": "^8.2.0",
-    "@robota-sdk/agent-core": "3.0.0-beta.44",
-    "@robota-sdk/agent-sdk": "3.0.0-beta.44",
-    "@robota-sdk/agent-provider-anthropic": "3.0.0-beta.44"
+    "@robota-sdk/agent-core": "3.0.0-beta.46",
+    "@robota-sdk/agent-sdk": "3.0.0-beta.46",
+    "@robota-sdk/agent-provider-anthropic": "3.0.0-beta.46"
   },
   "devDependencies": {
     "@types/marked": "^6.0.0",