wave-code 1.2.0 → 1.4.0

package/src/components/SessionSelector.tsx

@@ -1,5 +1,11 @@
-import React, { useReducer, useEffect, useRef } from "react";
-import { Box, Text, useInput } from "ink";
+import React, {
+  useReducer,
+  useEffect,
+  useRef,
+  useState,
+  useCallback,
+} from "react";
+import { Box, Text, useInput, type Key } from "ink";
 import type { SessionMetadata } from "wave-agent-sdk";
 import {
   selectorReducer,
@@ -23,8 +29,22 @@ export interface SessionSelectorProps {
   onToggleAllProjects?: (showAllProjects: boolean) => void;
   /** Emitted with the new scope when the user toggles all-worktrees (Ctrl+W). */
   onToggleAllWorktrees?: (showAllWorktrees: boolean) => void;
+  /**
+   * Ctrl+R renames the focused session. The parent persists the new title
+   * (the session may belong to another project, so only it knows the file);
+   * the row shows the new title as soon as the promise resolves. Rejecting
+   * keeps the old title and surfaces a visible failure notice.
+   */
+  onRename?: (sessionId: string, title: string) => Promise<void>;
 }
 
+type RenameState = {
+  sessionId: string;
+  value: string;
+  cursor: number;
+  saving: boolean;
+};
+
 export const SessionSelector: React.FC<SessionSelectorProps> = ({
   sessions,
   onSelect,
@@ -33,6 +53,7 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
   showProjectPath = false,
   onToggleAllProjects,
   onToggleAllWorktrees,
+  onRename,
 }) => {
   const [state, dispatch] = useReducer(selectorReducer<SessionItem>, {
     selectedIndex: 0,
@@ -50,12 +71,113 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
     showAllWorktrees,
   } = state;
 
+  // Titles committed during this picker session. The parent's list is only
+  // re-synced through SET_ITEMS (which resets the selection), so overlaying the
+  // new title here keeps the row, the scope and the selected index intact.
+  const [renamedTitles, setRenamedTitles] = useState<Record<string, string>>(
+    {},
+  );
+  const [renaming, setRenaming] = useState<RenameState | null>(null);
+  const [renameError, setRenameError] = useState<string | null>(null);
+
   // Sync sessions into reducer state
   useEffect(() => {
     dispatch({ type: "SET_ITEMS", items: sessions });
   }, [sessions]);
 
+  const submitRename = useCallback(async () => {
+    if (!renaming || renaming.saving) return;
+    const { sessionId, value } = renaming;
+    const title = value.trim();
+    // Blank title: nothing to save, just leave the editor (spec: 空标题为 no-op).
+    if (!title) {
+      setRenaming(null);
+      return;
+    }
+    setRenaming({ ...renaming, saving: true });
+    try {
+      await onRename?.(sessionId, title);
+      setRenamedTitles((prev) => ({ ...prev, [sessionId]: title }));
+      setRenameError(null);
+      setRenaming(null);
+    } catch (error) {
+      setRenaming(null);
+      setRenameError(
+        `Failed to rename: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      );
+    }
+  }, [renaming, onRename]);
+
+  const handleRenameKeys = (input: string, key: Key) => {
+    // While saving, swallow everything — the editor closes on the response.
+    if (!renaming || renaming.saving) return;
+
+    if (key.escape) {
+      setRenaming(null);
+      return;
+    }
+    if (key.return) {
+      void submitRename();
+      return;
+    }
+    if (key.backspace || key.delete) {
+      if (renaming.cursor === 0) return;
+      const nextCursor = renaming.cursor - 1;
+      setRenaming({
+        ...renaming,
+        value:
+          renaming.value.slice(0, nextCursor) +
+          renaming.value.slice(renaming.cursor),
+        cursor: nextCursor,
+      });
+      return;
+    }
+    if (key.leftArrow) {
+      setRenaming({
+        ...renaming,
+        cursor: Math.max(0, renaming.cursor - 1),
+      });
+      return;
+    }
+    if (key.rightArrow) {
+      setRenaming({
+        ...renaming,
+        cursor: Math.min(renaming.value.length, renaming.cursor + 1),
+      });
+      return;
+    }
+    if (
+      input &&
+      !key.ctrl &&
+      !key.meta &&
+      !key.return &&
+      !key.escape &&
+      !key.backspace &&
+      !key.delete &&
+      !key.leftArrow &&
+      !key.rightArrow
+    ) {
+      setRenaming({
+        ...renaming,
+        value:
+          renaming.value.slice(0, renaming.cursor) +
+          input +
+          renaming.value.slice(renaming.cursor),
+        cursor: renaming.cursor + input.length,
+      });
+    }
+  };
+
+  // One subscription for both modes: while the inline title editor is open it
+  // owns every key (spec: 编辑期间按键不得冒泡触发列表操作), so a single handler
+  // keeps the editor from racing a second `useInput` subscription.
   useInput((input, key) => {
+    if (renaming) {
+      handleRenameKeys(input, key);
+      return;
+    }
     // Ctrl+A — toggle all-projects scope (only when the parent supports it)
     if (key.ctrl && input.toLowerCase() === "a" && onToggleAllProjects) {
       dispatch({ type: "TOGGLE_ALL_PROJECTS" });
@@ -71,6 +193,24 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
       dispatch({ type: "TOGGLE_ALL_WORKTREES" });
       return;
     }
+    // Ctrl+R — rename the focused session in place
+    if (key.ctrl && input.toLowerCase() === "r" && onRename) {
+      const target = items[selectedIndex];
+      if (!target) return;
+      const initial =
+        renamedTitles[target.id] ??
+        target.customTitle ??
+        target.firstMessage ??
+        "";
+      setRenameError(null);
+      setRenaming({
+        sessionId: target.id,
+        value: initial,
+        cursor: initial.length,
+        saving: false,
+      });
+      return;
+    }
     dispatch({ type: "HANDLE_KEY", key, hasInsert: false });
   });
 
@@ -135,6 +275,14 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
     startIndex + MAX_VISIBLE_ITEMS,
   );
 
+  // Display precedence: custom title > first message > placeholder (shared with
+  // every other host — spec: session-management.md 用户故事「会话自定义标题」).
+  const sessionTitle = (session: SessionItem): string =>
+    renamedTitles[session.id] ??
+    session.customTitle ??
+    session.firstMessage ??
+    "";
+
   const hints = [
     onToggleAllProjects
       ? `Ctrl+A ${showAllProjects ? "current directory" : "all projects"}`
@@ -142,6 +290,7 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
     onToggleAllWorktrees && worktreePaths.length > 1
       ? `Ctrl+W ${showAllWorktrees ? "current worktree" : "all worktrees"}`
       : null,
+    onRename ? "Ctrl+R rename" : null,
     "↑↓ select",
     "Enter confirm",
     "Esc cancel",
@@ -171,6 +320,7 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
           const actualIndex = startIndex + index;
           const isSelected = actualIndex === selectedIndex;
           const lastActiveAt = new Date(session.lastActiveAt).toLocaleString();
+          const isRenaming = renaming?.sessionId === session.id;
 
           return (
             <Box key={session.id} flexDirection="column" width="100%">
@@ -200,12 +350,28 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
                   </Text>
                 </Box>
               </Box>
-              {isSelected && session.firstMessage && (
+              {isRenaming && renaming ? (
                 <Box marginLeft={2} width="100%">
-                  <Text dimColor italic wrap="truncate-end">
-                    {session.firstMessage.replace(/\n/g, "\\n")}
+                  <Text>
+                    <Text dimColor>Rename: </Text>
+                    {renaming.value.slice(0, renaming.cursor)}
+                    <Text backgroundColor="white" color="black">
+                      {renaming.cursor < renaming.value.length
+                        ? renaming.value[renaming.cursor]
+                        : " "}
+                    </Text>
+                    {renaming.value.slice(renaming.cursor + 1)}
                   </Text>
                 </Box>
+              ) : (
+                isSelected &&
+                sessionTitle(session) && (
+                  <Box marginLeft={2} width="100%">
+                    <Text dimColor italic wrap="truncate-end">
+                      {sessionTitle(session).replace(/\n/g, "\\n")}
+                    </Text>
+                  </Box>
+                )
               )}
             </Box>
           );
@@ -220,8 +386,20 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
         </Box>
       )}
 
+      {renameError && (
+        <Box>
+          <Text color="red">{renameError}</Text>
+        </Box>
+      )}
+
       <Box>
-        <Text dimColor>{hints}</Text>
+        <Text dimColor>
+          {renaming
+            ? renaming.saving
+              ? "Saving…"
+              : "Enter save  ·  Esc cancel"
+            : hints}
+        </Text>
       </Box>
     </Box>
   );

package/src/components/SessionSelectorFlow.tsx

@@ -0,0 +1,246 @@
+import React, { useState, useCallback, useEffect, useRef } from "react";
+import { Box, Text, useInput } from "ink";
+import {
+  listSessions,
+  listAllSessions,
+  setSessionCustomTitle,
+  truncateContent,
+  type SessionMetadata,
+} from "wave-agent-sdk";
+import { SessionSelector } from "./SessionSelector.js";
+import { setClipboardText } from "../utils/clipboard.js";
+import { resolveSessionOwnership } from "../utils/sessionOwnership.js";
+
+export interface SessionSelectorResult {
+  sessionId: string;
+  /**
+   * When the selected session belongs to a sibling git worktree of the same
+   * repo, the caller should chdir into this path before restoring.
+   */
+  resumeWorkdir?: string;
+}
+
+type SessionItem = SessionMetadata & { firstMessage?: string };
+
+/**
+ * Interactive session picker.
+ *
+ * Three scopes, toggled with Ctrl+A / Ctrl+W (mirroring Claude Code's resume
+ * picker):
+ * - current:   sessions in the current working directory (default)
+ * - worktrees: sessions in any worktree of the same git repository
+ * - all:       sessions across every project directory
+ *
+ * Resume decision on selection:
+ * - current dir session      → resume in place
+ * - same-repo worktree       → resume after chdir into that worktree
+ * - other project            → print `cd <path> && wave --restore <id>`,
+ *                              copy it to the clipboard, and finish
+ *
+ * Shared by `wave -r` (own Ink render) and the in-TUI `/resume` command, so
+ * the two can never drift in scopes or ownership resolution.
+ */
+export function SessionSelectorFlow({
+  currentWorkdir,
+  worktreePaths,
+  onDone,
+  crossProjectMode = "exit",
+}: {
+  currentWorkdir: string;
+  worktreePaths: string[];
+  onDone: (result: SessionSelectorResult | null) => void;
+  /**
+   * What happens after the cross-project `cd` command is shown:
+   * - "exit": finish the flow (the standalone `wave -r` picker then prints the
+   *   command and the process exits).
+   * - "dismiss": stay in the flow until Esc — used by the in-TUI `/resume`
+   *   picker, which must not tear down the surrounding conversation.
+   */
+  crossProjectMode?: "exit" | "dismiss";
+}): React.ReactNode {
+  const [showAllProjects, setShowAllProjects] = useState(false);
+  const [showAllWorktrees, setShowAllWorktrees] = useState(false);
+  const [sessions, setSessions] = useState<SessionItem[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [crossProjectCommand, setCrossProjectCommand] = useState<string | null>(
+    null,
+  );
+
+  // Mirror of the scope flags for use inside async reload/decision callbacks.
+  const scopeRef = useRef({ showAllProjects: false, showAllWorktrees: false });
+
+  const loadSessions = useCallback(
+    async (allProjects: boolean, allWorktrees: boolean) => {
+      if (allProjects) {
+        return listAllSessions();
+      }
+      if (allWorktrees) {
+        return listAllSessions({ worktreePaths, workdir: currentWorkdir });
+      }
+      return listSessions(currentWorkdir);
+    },
+    [worktreePaths, currentWorkdir],
+  );
+
+  const reload = useCallback(
+    async (allProjects: boolean, allWorktrees: boolean) => {
+      setLoading(true);
+      try {
+        const result = await loadSessions(allProjects, allWorktrees);
+        setSessions(
+          result.map((s) => ({
+            ...s,
+            firstMessage: truncateContent(s.firstMessage || "No content", 80),
+          })),
+        );
+      } finally {
+        setLoading(false);
+      }
+    },
+    [loadSessions],
+  );
+
+  // Initial load: current directory scope
+  useEffect(() => {
+    void reload(false, false);
+  }, [reload]);
+
+  const handleToggleAllProjects = useCallback(
+    (value: boolean) => {
+      scopeRef.current.showAllProjects = value;
+      setShowAllProjects(value);
+      void reload(value, scopeRef.current.showAllWorktrees);
+    },
+    [reload],
+  );
+
+  const handleToggleAllWorktrees = useCallback(
+    (value: boolean) => {
+      scopeRef.current.showAllWorktrees = value;
+      setShowAllWorktrees(value);
+      void reload(scopeRef.current.showAllProjects, value);
+    },
+    [reload],
+  );
+
+  const handleSelect = useCallback(
+    async (sessionId: string) => {
+      const session = sessions.find((s) => s.id === sessionId);
+      if (!session) return;
+
+      const ownership = await resolveSessionOwnership(session, {
+        worktreePaths,
+        currentWorkdir,
+      });
+
+      switch (ownership.kind) {
+        case "current":
+          onDone({ sessionId });
+          return;
+        case "worktree":
+          onDone({ sessionId, resumeWorkdir: ownership.resumeWorkdir });
+          return;
+        case "cross-project":
+          // Different project — show the cd command instead of resuming in place
+          await setClipboardText(ownership.command);
+          setCrossProjectCommand(ownership.command);
+          return;
+      }
+    },
+    [sessions, worktreePaths, currentWorkdir, onDone],
+  );
+
+  // Ctrl+R rename. The session may belong to another project (or a sibling
+  // worktree), so the write is addressed by the session's own workdir — the
+  // SDK falls back to scanning every project directory when that path no
+  // longer matches. Rejections bubble up so the picker can show the failure.
+  const handleRename = useCallback(
+    async (sessionId: string, title: string) => {
+      const session = sessions.find((s) => s.id === sessionId);
+      await setSessionCustomTitle(
+        sessionId,
+        session?.workdir ?? currentWorkdir,
+        title,
+      );
+    },
+    [sessions, currentWorkdir],
+  );
+
+  if (crossProjectCommand) {
+    return (
+      <CrossProjectMessage
+        command={crossProjectCommand}
+        onExit={() =>
+          crossProjectMode === "dismiss"
+            ? setCrossProjectCommand(null)
+            : onDone(null)
+        }
+        autoExit={crossProjectMode === "exit"}
+      />
+    );
+  }
+
+  if (loading) {
+    return (
+      <Box>
+        <Text dimColor>Loading conversations…</Text>
+      </Box>
+    );
+  }
+
+  return (
+    <Box padding={1}>
+      <SessionSelector
+        sessions={sessions}
+        worktreePaths={worktreePaths}
+        showProjectPath={showAllProjects || showAllWorktrees}
+        onSelect={(id) => void handleSelect(id)}
+        onCancel={() => onDone(null)}
+        onToggleAllProjects={handleToggleAllProjects}
+        onToggleAllWorktrees={handleToggleAllWorktrees}
+        onRename={handleRename}
+      />
+    </Box>
+  );
+}
+
+/**
+ * Cross-project notice. `wave -r` auto-exits after a short delay (mirrors
+ * Claude Code's resume picker, which prints the cd command and exits); the
+ * in-TUI `/resume` picker waits for Esc instead, so the conversation behind it
+ * survives.
+ */
+function CrossProjectMessage({
+  command,
+  onExit,
+  autoExit,
+}: {
+  command: string;
+  onExit: () => void;
+  autoExit: boolean;
+}): React.ReactNode {
+  useEffect(() => {
+    if (!autoExit) return;
+    const timer = setTimeout(onExit, 100);
+    return () => clearTimeout(timer);
+  }, [autoExit, onExit]);
+
+  useInput((_input, key) => {
+    if (!autoExit && key.escape) {
+      onExit();
+    }
+  });
+
+  return (
+    <Box flexDirection="column" gap={1}>
+      <Text>This conversation is from a different directory.</Text>
+      <Box flexDirection="column">
+        <Text>To resume, run:</Text>
+        <Text> {command}</Text>
+      </Box>
+      <Text dimColor>
+        {autoExit ? "(Command copied to clipboard)" : "Esc to go back"}
+      </Text>
+    </Box>
+  );
+}