wave-code 1.2.0 → 1.4.0

package/src/components/InputBox.tsx

@@ -10,6 +10,7 @@ import { AgentsManager } from "./AgentsManager.js";
 import { SkillsManager } from "./SkillsManager.js";
 import { HooksManager } from "./HooksManager.js";
 import { RewindCommand } from "./RewindCommand.js";
+import { ResumeCommand } from "./ResumeCommand.js";
 import { HelpView } from "./HelpView.js";
 import { StatusCommand } from "./StatusCommand.js";
 import { LoginCommand } from "./LoginCommand.js";
@@ -86,6 +87,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
     permissionMode: chatPermissionMode,
     setPermissionMode: setChatPermissionMode,
     handleRewindSelect,
+    resumeSession,
     backgroundCurrentTask,
     messages,
     getFullMessageThread,
@@ -95,10 +97,14 @@ export const InputBox: React.FC<InputBoxProps> = ({
     clearMessages,
     compact,
     addDir,
+    renameSession,
+    remoteControlCommand,
     currentModel,
     configuredModels,
     setModel,
-    recreateAgent,
+    reloadPlugins,
+    notifyPluginChange,
+    pluginHint,
     recallQueuedMessage,
     queuedMessages,
     setIsBtwActive,
@@ -153,6 +159,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
     showMcpManager,
     showAgentsManager,
     showRewindManager,
+    showResumeSelector,
     showHelp,
     showStatusCommand,
     showLoginCommand,
@@ -165,6 +172,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
     setShowMcpManager,
     setShowAgentsManager,
     setShowRewindManager,
+    setShowResumeSelector,
     setShowHelp,
     setShowStatusCommand,
     setShowLoginCommand,
@@ -191,7 +199,10 @@ export const InputBox: React.FC<InputBoxProps> = ({
     onAskBtw: askBtw,
     onClearMessages: clearMessages,
     onCompact: compact,
+    onReloadPlugins: reloadPlugins,
     onAddDir: addDir,
+    onRenameSession: renameSession,
+    onRemoteControlCommand: remoteControlCommand,
     onHasSlashCommand: hasSlashCommand,
     onAbortMessage: abortMessage,
     onBackgroundCurrentTask: backgroundCurrentTask,
@@ -230,6 +241,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
     if (
       planView ||
       showRewindManager ||
+      showResumeSelector ||
       showHelp ||
       showStatusCommand ||
       showLoginCommand ||
@@ -283,6 +295,21 @@ export const InputBox: React.FC<InputBoxProps> = ({
     await handleRewindSelect(index);
   };
 
+  const handleResumeSelectWithClose = async (
+    sessionId: string,
+    resumeWorkdir?: string,
+  ) => {
+    setShowResumeSelector(false);
+    // The switch replaces the whole conversation; a draft typed for the old
+    // session would otherwise silently become the first message of the new one.
+    setInputText("");
+    await resumeSession(sessionId, resumeWorkdir);
+  };
+
+  const handleResumeCancel = () => {
+    setShowResumeSelector(false);
+  };
+
   return (
     <Box flexDirection="column">
       <BtwDisplay btwState={btwState} />
@@ -363,6 +390,15 @@ export const InputBox: React.FC<InputBoxProps> = ({
         />
       )}
 
+      {showResumeSelector && (
+        <ResumeCommand
+          workdir={workingDirectory}
+          isBusy={!isIdle}
+          onSelect={handleResumeSelectWithClose}
+          onCancel={handleResumeCancel}
+        />
+      )}
+
       {showHelp && (
         <HelpView
           onCancel={() => setShowHelp(false)}
@@ -381,7 +417,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
       {showPluginManager && (
         <PluginManagerShell
           onCancel={() => setShowPluginManager(false)}
-          onPluginInstalled={recreateAgent}
+          onPluginChanged={notifyPluginChange}
         />
       )}
 
@@ -411,7 +447,9 @@ export const InputBox: React.FC<InputBoxProps> = ({
             showMcpManager ||
             showAgentsManager ||
             showSkillsManager ||
+            showHooksManager ||
             showRewindManager ||
+            showResumeSelector ||
             showHelp ||
             showStatusCommand ||
             showLoginCommand ||
@@ -451,6 +489,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
                     latestTotalTokens={latestTotalTokens}
                     maxInputTokens={maxInputTokens}
                     showLoginHint={showLoginHint}
+                    pluginHint={pluginHint}
                   />
                 </Box>
               </Box>

package/src/components/Markdown.tsx

@@ -137,21 +137,34 @@ class AnsiRenderer extends Renderer<string> {
 
 const createRenderer = (columns: number) => new AnsiRenderer(columns);
 
+/** Renders Markdown to ANSI-styled text using the same renderer as <Markdown>.
+ *  Callers that must linearize content into rows (e.g. the confirmation
+ *  details area, which slices rows for PgUp/PgDn scrolling) render first and
+ *  then split the result into lines. */
+export const renderMarkdownToAnsi = (
+  content: string,
+  columns: number,
+): string => {
+  const ansi = marked.parse(content, {
+    renderer: createRenderer(columns),
+    gfm: true,
+    breaks: true,
+  }) as string;
+  return ansi.trim();
+};
+
 // Markdown component using custom ANSI renderer
 export const Markdown = React.memo(({ children }: MarkdownProps) => {
   const { stdout } = useStdout();
   const columns = stdout?.columns ?? 80;
-  const ansiContent = useMemo(() => {
-    return marked.parse(children, {
-      renderer: createRenderer(columns),
-      gfm: true,
-      breaks: true,
-    }) as string;
-  }, [children, columns]);
+  const ansiContent = useMemo(
+    () => renderMarkdownToAnsi(children, columns),
+    [children, columns],
+  );
 
   return (
     <Box flexDirection="column">
-      <Text>{ansiContent.trim()}</Text>
+      <Text>{ansiContent}</Text>
     </Box>
   );
 });

package/src/components/MarketplaceDetail.tsx

@@ -1,4 +1,4 @@
-import React, { useReducer, useEffect, useMemo } from "react";
+import React, { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
 import { usePluginManagerContext } from "../contexts/PluginManagerContext.js";
 import {
@@ -6,6 +6,13 @@ import {
   type SelectorState,
 } from "../reducers/selectorReducer.js";
 
+const ACTIONS = [
+  // 先刷新该市场检出，再把该市场内所有可更新插件一次升掉（范围恒为当前市场，
+  // spec 插件市场场景 13）
+  { id: "update", label: "Update plugins (batch)" },
+  { id: "remove", label: "Remove marketplace" },
+] as const;
+
 export const MarketplaceDetail: React.FC = () => {
   const { state, marketplaces, actions } = usePluginManagerContext();
   const [selectorState, dispatch] = useReducer(
@@ -25,23 +32,10 @@ export const MarketplaceDetail: React.FC = () => {
 
   const marketplace = marketplaces.find((m) => m.name === state.selectedId);
 
-  const ACTIONS = useMemo(
-    () =>
-      [
-        {
-          id: "toggle-auto-update",
-          label: `${marketplace?.autoUpdate ? "Disable" : "Enable"} auto-update`,
-        },
-        { id: "update", label: "Update marketplace" },
-        { id: "remove", label: "Remove marketplace" },
-      ] as const,
-    [marketplace?.autoUpdate],
-  );
-
   // Sync ACTIONS into reducer state
   useEffect(() => {
     dispatch({ type: "SET_ITEMS", items: [...ACTIONS] });
-  }, [ACTIONS]);
+  }, []);
 
   useInput((_input, key) => {
     if (state.isLoading && !key.escape) return;
@@ -58,9 +52,7 @@ export const MarketplaceDetail: React.FC = () => {
 
     if (pendingDecision === "select" && marketplace && !state.isLoading) {
       const action = actionsList[selectedActionIndex]?.id;
-      if (action === "toggle-auto-update") {
-        actions.toggleAutoUpdate(marketplace.name, !marketplace.autoUpdate);
-      } else if (action === "update") {
+      if (action === "update") {
         actions.updateMarketplace(marketplace.name);
       } else if (action === "remove") {
         actions.removeMarketplace(marketplace.name);
@@ -104,15 +96,6 @@ export const MarketplaceDetail: React.FC = () => {
         <Text>Source: {JSON.stringify(marketplace.source)}</Text>
       </Box>
 
-      <Box marginBottom={1}>
-        <Text>
-          Auto-update:{" "}
-          <Text color={marketplace.autoUpdate ? "green" : "red"}>
-            {marketplace.autoUpdate ? "Enabled" : "Disabled"}
-          </Text>
-        </Text>
-      </Box>
-
       {marketplace.lastUpdated && (
         <Box marginBottom={1}>
           <Text>

package/src/components/MarketplaceView.tsx

@@ -10,7 +10,12 @@ import {
 import { MarketplaceList } from "./MarketplaceList.js";
 
 export const MarketplaceView: React.FC = () => {
-  const { marketplaces, actions } = usePluginManagerContext();
+  const {
+    marketplaces,
+    checkingForUpdates,
+    state: managerState,
+    actions,
+  } = usePluginManagerContext();
   const [state, dispatch] = useReducer(selectorReducer<KnownMarketplace>, {
     selectedIndex: 0,
     pendingDecision: null,
@@ -19,10 +24,16 @@ export const MarketplaceView: React.FC = () => {
 
   const { selectedIndex, pendingDecision, items } = state;
 
-  // Sync marketplaces into reducer state
+  // Sync marketplaces into reducer state；焦点落到当前选中的市场（新增市场后由
+  // addMarketplace 设成新市场名，spec「管理市场」场景 5），没有匹配（首帧、市场被
+  // 移除）时保持 SET_ITEMS 归零后的列表首项。
   useEffect(() => {
     dispatch({ type: "SET_ITEMS", items: marketplaces });
-  }, [marketplaces]);
+    const index = marketplaces.findIndex(
+      (m) => m.name === managerState.selectedId,
+    );
+    if (index > 0) dispatch({ type: "SET_INDEX", index });
+  }, [marketplaces, managerState.selectedId]);
 
   useInput((input, key) => {
     if (input === "a") {
@@ -52,6 +63,9 @@ export const MarketplaceView: React.FC = () => {
     <Box flexDirection="column">
       <Box marginBottom={1}>
         <Text color="green">Press 'a' to add a new marketplace</Text>
+        {/* 打开插件管理器触发的后台清单刷新（只拉检出、不升级插件）：不阻塞
+            列表浏览，完成后重读并呈现最新清单（spec ecosystem/plugin 场景 12） */}
+        {checkingForUpdates && <Text dimColor> Checking for updates...</Text>}
       </Box>
       <MarketplaceList
         marketplaces={marketplaces}

package/src/components/MessageBlockItem.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import { Box, Text } from "ink";
 import type { Message, MessageBlock } from "wave-agent-sdk";
-import { MessageSource } from "wave-agent-sdk";
 import { ToolDisplay } from "./ToolDisplay.js";
 import { CompactDisplay } from "./CompactDisplay.js";
 import { ReasoningDisplay } from "./ReasoningDisplay.js";
@@ -25,11 +24,6 @@ export const MessageBlockItem = ({
     <Box flexDirection="column" paddingTop={paddingTop}>
       {block.type === "text" && block.content.trim() && (
         <Box>
-          {block.source === MessageSource.HOOK && (
-            <Text color="magenta" bold>
-              ~{" "}
-            </Text>
-          )}
           {message.role === "user" || isExpanded ? (
             <Text
               backgroundColor={message.role === "user" ? "gray" : undefined}

package/src/components/Notifications.tsx

@@ -5,12 +5,18 @@ export interface NotificationsProps {
   latestTotalTokens?: number;
   maxInputTokens?: number;
   showLoginHint?: boolean;
+  /**
+   * 一次性中性提示（插件变更待应用 / 重载完成）。由宿主显式设置并在数秒后清除，
+   * 不提供持久可见标识（docs/specs/ecosystem/plugin.md「插件变更提示」）。
+   */
+  pluginHint?: string | null;
 }
 
 export const Notifications: React.FC<NotificationsProps> = ({
   latestTotalTokens = 0,
   maxInputTokens = 200000,
   showLoginHint = false,
+  pluginHint = null,
 }) => {
   const percentage =
     latestTotalTokens > 0
@@ -22,6 +28,7 @@ export const Notifications: React.FC<NotificationsProps> = ({
 
   return (
     <Box gap={1}>
+      {pluginHint && <Text color="gray">{pluginHint}</Text>}
       {showLoginHint && <Text color="gray">Type /login to authenticate</Text>}
       {percentage > 0 && (
         <Text color={contextColor}>{percentage}% context</Text>

package/src/components/PlanView.tsx

@@ -1,6 +1,7 @@
-import React from "react";
+import React, { useState } from "react";
 import { Box, Text, useInput, useWindowSize } from "ink";
 import { useLineScroll } from "../hooks/useLineScroll.js";
+import { ScrolledContent } from "./ScrolledContent.js";
 
 // Row budget for the scroll indicators (↑ more / ↓ more, up to one each).
 const SCROLL_INDICATOR_BUDGET = 2;
@@ -60,8 +61,11 @@ export const PlanView: React.FC<PlanViewProps> = ({
     !isMessageOnly && content !== undefined && content !== ""
       ? content.split("\n")
       : [];
+  // Rows really occupied by the plan (wrapped rows included), measured after
+  // layout by <ScrolledContent>.
+  const [contentRows, setContentRows] = useState(0);
   const { scrollOffset, hasMoreAbove, hasMoreBelow } = useLineScroll({
-    totalLines: planLines.length,
+    totalLines: contentRows,
     visibleCount,
   });
 
@@ -81,11 +85,6 @@ export const PlanView: React.FC<PlanViewProps> = ({
     );
   }
 
-  const visibleLines = planLines.slice(
-    scrollOffset,
-    scrollOffset + visibleCount,
-  );
-
   return (
     <Box
       flexDirection="column"
@@ -110,19 +109,25 @@ export const PlanView: React.FC<PlanViewProps> = ({
           </Text>
         </Box>
       )}
-      {visibleLines.length > 0 ? (
-        visibleLines.map((line, index) => (
-          <Box key={scrollOffset + index}>
-            <Text>{line || " "}</Text>
-          </Box>
-        ))
-      ) : (
-        <Text>No plan written yet.</Text>
-      )}
+      <ScrolledContent
+        visibleRows={visibleCount}
+        scrollOffset={scrollOffset}
+        onMeasuredRows={setContentRows}
+      >
+        {planLines.length > 0 ? (
+          planLines.map((line, index) => (
+            <Box key={index}>
+              <Text>{line || " "}</Text>
+            </Box>
+          ))
+        ) : (
+          <Text>No plan written yet.</Text>
+        )}
+      </ScrolledContent>
       {hasMoreBelow && (
         <Box>
           <Text color="gray" dimColor>
-            ↓ {planLines.length - scrollOffset - visibleCount} more
+            ↓ {contentRows - scrollOffset - visibleCount} more
           </Text>
         </Box>
       )}

package/src/components/PluginManagerShell.tsx

@@ -13,9 +13,9 @@ import { PluginManagerContext } from "../contexts/PluginManagerContext.js";
 export const PluginManagerShell: React.FC<{
   children?: React.ReactNode;
   onCancel?: () => void;
-  onPluginInstalled?: () => void;
-}> = ({ children, onCancel, onPluginInstalled }) => {
-  const pluginManager = usePluginManager({ onPluginInstalled });
+  onPluginChanged?: () => void;
+}> = ({ children, onCancel, onPluginChanged }) => {
+  const pluginManager = usePluginManager({ onPluginChanged });
   const { state, actions, discoverablePlugins } = pluginManager;
 
   const setView = (view: ViewType) => {

package/src/components/PluginManagerTypes.ts

@@ -24,6 +24,8 @@ export interface PluginManagerState {
 export interface PluginManagerContextType {
   state: PluginManagerState;
   marketplaces: KnownMarketplace[];
+  /** 打开插件管理器触发的后台清单刷新是否仍在进行（只拉检出、不升级插件）。 */
+  checkingForUpdates: boolean;
   installedPlugins: (InstalledPlugin & { enabled: boolean })[];
   discoverablePlugins: (MarketplacePluginEntry & {
     marketplace: string;
@@ -49,7 +51,6 @@ export interface PluginManagerContextType {
     ) => Promise<void>;
     uninstallPlugin: (name: string, marketplace: string) => Promise<void>;
     updatePlugin: (name: string, marketplace: string) => Promise<void>;
-    toggleAutoUpdate: (name: string, enabled: boolean) => Promise<void>;
     refresh: () => Promise<void>;
     clearPluginFeedback: () => void;
   };

package/src/components/ResumeCommand.tsx

@@ -0,0 +1,84 @@
+import React, { useEffect, useState } from "react";
+import { Box, Text, useInput } from "ink";
+import { SessionSelectorFlow } from "./SessionSelectorFlow.js";
+import { listWorktrees } from "../utils/worktree.js";
+
+export interface ResumeCommandProps {
+  /** The session's current working directory (the picker's default scope). */
+  workdir: string;
+  /**
+   * True while a turn is in flight. Switching mid-turn is refused: the running
+   * turn must not be aborted (its abort error would land in the session being
+   * left behind), so the picker is replaced by a notice.
+   */
+  isBusy: boolean;
+  /**
+   * Called with the chosen session. `resumeWorkdir` is set when the session
+   * belongs to a sibling worktree of the same repo — the session then moves
+   * into that directory.
+   */
+  onSelect: (sessionId: string, resumeWorkdir?: string) => void;
+  onCancel: () => void;
+}
+
+/**
+ * In-TUI `/resume` picker. Thin wrapper over the shared `SessionSelectorFlow`:
+ * the worktree list is loaded lazily on open (it needs a `git worktree list`
+ * round-trip), and a cross-project selection shows a dismissible notice instead
+ * of tearing down the TUI.
+ */
+export const ResumeCommand: React.FC<ResumeCommandProps> = ({
+  workdir,
+  isBusy,
+  onSelect,
+  onCancel,
+}) => {
+  const [worktreePaths, setWorktreePaths] = useState<string[] | null>(null);
+
+  useInput((_input, key) => {
+    if (isBusy && key.escape) {
+      onCancel();
+    }
+  });
+
+  useEffect(() => {
+    if (isBusy) return;
+    let cancelled = false;
+    listWorktrees(workdir).then((paths) => {
+      if (!cancelled) setWorktreePaths(paths);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [workdir, isBusy]);
+
+  if (isBusy) {
+    return (
+      <Box flexDirection="column" paddingX={1}>
+        <Text color="yellow">
+          Cannot resume a conversation while the agent is running.
+        </Text>
+        <Text dimColor>Esc to go back</Text>
+      </Box>
+    );
+  }
+
+  if (!worktreePaths) {
+    return (
+      <Box paddingX={1}>
+        <Text dimColor>Loading conversations…</Text>
+      </Box>
+    );
+  }
+
+  return (
+    <SessionSelectorFlow
+      currentWorkdir={workdir}
+      worktreePaths={worktreePaths}
+      crossProjectMode="dismiss"
+      onDone={(result) =>
+        result ? onSelect(result.sessionId, result.resumeWorkdir) : onCancel()
+      }
+    />
+  );
+};

package/src/components/ScrolledContent.tsx

@@ -0,0 +1,71 @@
+import React, { useLayoutEffect, useRef } from "react";
+import { Box, type DOMElement } from "ink";
+
+export interface ScrolledContentProps {
+  /** Every content row — rows are never sliced, the viewport clips them. */
+  children: React.ReactNode;
+  /** Largest height the viewport may take, in terminal rows (the row budget
+   *  for the content area). Shorter content keeps its natural height. */
+  visibleRows: number;
+  /** Rows scrolled off the top. */
+  scrollOffset: number;
+  /** Reports the content height in terminal rows, re-reporting on change. */
+  onMeasuredRows: (rows: number) => void;
+}
+
+/**
+ * Hard-bounded, clipping viewport for content that can be wider than the
+ * terminal: the content is rendered once and translated up by `scrollOffset`
+ * rows, and rows outside the viewport are clipped away.
+ *
+ * Height is bounded by construction — a line that wraps grows the content
+ * instead of the frame — so the row budget of the surrounding layout holds no
+ * matter how many rows the content really needs.
+ *
+ * The row count is read back from the layout rather than predicted from the
+ * text: by the time this effect runs, Yoga has wrapped the content to the
+ * terminal width, so the computed height already includes wrapped rows.
+ */
+export const ScrolledContent: React.FC<ScrolledContentProps> = ({
+  children,
+  visibleRows,
+  scrollOffset,
+  onMeasuredRows,
+}) => {
+  const contentRef = useRef<DOMElement | null>(null);
+  const reportedRows = useRef(0);
+
+  useLayoutEffect(() => {
+    const yogaNode = contentRef.current?.yogaNode;
+    if (!yogaNode) {
+      return;
+    }
+    const rows = Math.round(yogaNode.getComputedHeight());
+    if (rows > 0 && rows !== reportedRows.current) {
+      reportedRows.current = rows;
+      onMeasuredRows(rows);
+    }
+  });
+
+  return (
+    <Box
+      maxHeight={visibleRows}
+      overflow="hidden"
+      flexShrink={0}
+      flexDirection="column"
+    >
+      <Box
+        ref={contentRef}
+        flexDirection="column"
+        // Without this the fixed-height parent shrinks the content to fit and
+        // renders garbled rows instead of clipping them.
+        flexShrink={0}
+        marginTop={-scrollOffset}
+      >
+        {children}
+      </Box>
+    </Box>
+  );
+};
+
+ScrolledContent.displayName = "ScrolledContent";