wave-code 1.4.0 → 1.5.0

package/src/contexts/useChat.tsx

@@ -37,7 +37,6 @@ import {
   PLUGIN_CHANGE_PENDING_MESSAGE,
   PLUGIN_RELOADED_MESSAGE,
 } from "wave-agent-sdk";
-import { toString as qrToString } from "qrcode";
 import { logger } from "../utils/logger.js";
 import { displayUsageSummary } from "../utils/usageSummary.js";
 import { expandLongTextPlaceholders } from "../managers/inputHandlers.js";
@@ -47,54 +46,6 @@ import { readFile } from "node:fs/promises";
 
 import { BaseAppProps } from "../types.js";
 
-/** How long `/remote-control` waits for the relay's registration round trip. */
-const REMOTE_PAGE_WAIT_MS = 5_000;
-const REMOTE_PAGE_POLL_MS = 250;
-
-/**
- * Wait for the page address. It is assembled from this machine's channel key
- * after the relay registers it (an HTTP call) — nothing is pushed down the
- * WebSocket — so the first snapshot may not carry it yet.
- */
-async function waitForRemotePageUrl(
-  api: RemoteControlApi,
-): Promise<string | undefined> {
-  const deadline = Date.now() + REMOTE_PAGE_WAIT_MS;
-  while (Date.now() < deadline) {
-    const snapshot = api.getSnapshot();
-    if (snapshot.pageUrl) return snapshot.pageUrl;
-    if (snapshot.state === "error") return undefined;
-    await new Promise((resolve) => setTimeout(resolve, REMOTE_PAGE_POLL_MS));
-  }
-  return api.getSnapshot().pageUrl;
-}
-
-/**
- * The result block a TUI session shows: the same address and the same QR that
- * `wave remote-control on` prints, because that pair is the whole contract with
- * the phone — the two entry points must not diverge on how it is rendered.
- */
-async function describeRemotePage(pageUrl: string): Promise<string> {
-  const lines = [
-    "Remote control is on — this terminal's session is now served to your phone.",
-    `Page: ${pageUrl}`,
-  ];
-  try {
-    lines.push(
-      "",
-      await qrToString(pageUrl, {
-        type: "utf8",
-        errorCorrectionLevel: "L",
-      }),
-    );
-  } catch {
-    // The address above already carries the contract; a missing QR is not worth
-    // failing the command over.
-  }
-  lines.push("", "Turn it off with /remote-control off");
-  return lines.join("\n");
-}
-
 // Main Chat Context
 export interface PlanViewData {
   path?: string;
@@ -163,6 +114,10 @@ export interface ChatContextType {
   // Workflow runs
   workflowRuns: WorkflowRun[];
   stopWorkflowRun: (runId: string) => void;
+  saveWorkflowScript: (
+    runId: string,
+    options: { name: string; scope: "project" | "user"; overwrite?: boolean },
+  ) => Promise<{ name: string; path: string }>;
   // Tasks
   tasks: Task[];
   getBackgroundTaskOutput: (taskId: string) => {
@@ -192,13 +147,6 @@ export interface ChatContextType {
    * session that only exists here.
    */
   remoteControl: RemoteControlApi;
-  /**
-   * `/remote-control [on|off|status] [name]` — the TUI-side switch for the hook
-   * above. Its CLI namesake talks to the daemon instead; the two are not
-   * interchangeable, because a session that lives in this process is reachable
-   * only from this process.
-   */
-  remoteControlCommand: (args?: string) => Promise<void>;
   // /plan overlay state + handler
   planView: PlanViewData | null;
   setPlanView: (view: PlanViewData | null) => void;
@@ -233,7 +181,7 @@ export interface ChatContextType {
   backgroundCurrentTask: () => void;
   // Remount functionality
   remountKey: number;
-  forceRemount: () => void;
+  forceRemount: (options?: { preserveScrollback?: boolean }) => void;
   // Rewind functionality
   handleRewindSelect: (index: number) => Promise<void>;
   getFullMessageThread: () => Promise<{
@@ -431,6 +379,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   version,
   model,
   mcpServers,
+  onClearOutput,
 }) => {
   const { restoreSessionId, continueLastSession } = useAppConfig();
   const { stdout } = useStdout();
@@ -581,14 +530,29 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   // Remount state
   const [remountKey, setRemountKey] = useState(0);
 
-  // Full terminal clear + remount so Ink's append-only <Static> re-renders.
-  // Used on structural actions (/clear, /compact, rewind, ctrl-o) where stale
-  // Static output must not linger on screen.
-  const forceRemount = useCallback(() => {
-    stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H", () => {
-      setRemountKey((prev) => prev + 1);
-    });
-  }, [stdout]);
+  // Remount so Ink's append-only <Static> re-renders from scratch. Used on
+  // structural actions (/clear, session switch, rewind, ctrl-o) where the
+  // already-written Static output no longer matches the message list.
+  //
+  // The re-render duplicates whatever is still on screen, so the default erases
+  // the screen *and* the terminal scrollback. `/clear` passes
+  // `preserveScrollback`: it only wants a fresh conversation, and keeping the
+  // old one scrollable above is the point of the command.
+  const forceRemount = useCallback(
+    (options?: { preserveScrollback?: boolean }) => {
+      const remount = () => setRemountKey((prev) => prev + 1);
+      if (options?.preserveScrollback && onClearOutput) {
+        // ink's own clear erases just the frame it drew, leaving scrollback
+        // intact — and resets the row bookkeeping a hand-written escape
+        // sequence cannot reach.
+        onClearOutput();
+        remount();
+        return;
+      }
+      stdout?.write("\u001b[2J\u001b[3J\u001b[0;0H", remount);
+    },
+    [onClearOutput, stdout],
+  );
 
   // Status metadata state
   const [workingDirectory, setWorkingDirectory] = useState("");
@@ -603,14 +567,17 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
    */
   const remoteNotifyRef = useRef<RemoteNotify | undefined>(undefined);
 
-  // Full-list refresh — one-shot pull from the agent, used only for structural
-  // changes (compact/clear/rewind/collapse/init). Streaming updates flow through
-  // the incremental callbacks in initializeAgent below.
+  // Full-list refresh — used only for structural changes (compact/clear/rewind/
+  // collapse/init). Streaming updates flow through the incremental callbacks in
+  // initializeAgent below.
   const refreshMessages = useCallback(() => {
-    if (!isExpandedRef.current && agentRef.current) {
-      // Pull the full UI display stream (keeps pre-compaction history);
-      // `agent.messages` would only expose the folded API context.
-      const msgs = agentRef.current.displayMessages.map(snapshotMessage);
+    const agent = agentRef.current;
+    if (!isExpandedRef.current && agent) {
+      // `agent.messages` 是「最近一次压缩 + 其后消息」：CLI 屏幕只渲染最近几十
+      // 条、清屏重放也只放这些条数，压缩前的历史在这里没有任何读者，留着只是把
+      // 图片 base64 挂在堆上（spec ui/message-rendering-system.md「CLI 消息列表
+      // 只加载压缩之后」）。从未压缩过的会话这里就是整条线程。
+      const msgs = agent.messages.map(snapshotMessage);
       // The snapshot makes the SDK state authoritative: with no throttle
       // window there is nothing pending to cancel — every pre-pull update is
       // already applied and contained in `msgs`, and post-pull deltas append
@@ -807,6 +774,11 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           setIsCompacting(isCompactingState);
           if (!isCompactingState) {
             setCompactionStream("");
+            // 压缩结束 = 上下文已经折叠成「摘要 + 保留轮次」：列表要跟着收缩，
+            // 否则这一轮之后仍挂着压缩前的全量（自动压缩不走 `/compact` 那条
+            // refresh 路径）。见 spec ui/message-rendering-system.md「CLI 消息
+            // 列表只加载压缩之后」。
+            refreshMessages();
           }
         },
         onCompactionContentUpdate: (content) => {
@@ -840,8 +812,9 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
         onModelChange: (model) => {
           setCurrentModelState(model);
         },
+        // CLI 的选择器只要名字，能力标识是 webview 输入卡片的事。
         onConfiguredModelsChange: (models) => {
-          setConfiguredModels(models);
+          setConfiguredModels(models.map((m) => m.name));
         },
         onLoadingChange: (loading) => {
           setIsLoading(loading);
@@ -920,19 +893,22 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           agent.setWorktreeSession(session);
         }
 
-        // Get initial state — snapshot the SDK messages (never hold live
-        // references; see snapshotMessage). Uses the full display stream so a
-        // restored session shows pre-compaction history too.
+        // Get initial state — all synchronous reads, so a notification arriving
+        // mid-init cannot be overwritten by a stale read. The list is
+        // `agent.messages` (the API context): after compaction that is the
+        // summary plus the rounds the compaction kept, which is exactly what
+        // the CLI shows (spec ui/message-rendering-system.md「CLI 消息列表只加载
+        // 压缩之后」); a never-compacted session is the whole thread.
         setSessionId(agent.sessionId);
-        setMessages(agent.displayMessages.map(snapshotMessage));
-        setIsLoading(agent.isLoading);
+        setMessages(agent.messages.map(snapshotMessage));
         setLatestTotalTokens(extractLatestTotalTokens(agent.messages));
+        setIsLoading(agent.isLoading);
         setIsCommandRunning(agent.isCommandRunning);
         setIsCompacting(agent.isCompacting);
         setPermissionModeState(agent.getPermissionMode());
-        setWorkingDirectory(agent.workingDirectory);
+        setWorkingDirectory(agent.currentWorkdir);
         setCurrentModelState(agent.getModelConfig().model || "");
-        setConfiguredModels(agent.getConfiguredModels());
+        setConfiguredModels(agent.getConfiguredModels().map((m) => m.name));
         setMaxInputTokens(agent.getMaxInputTokens());
 
         // Get initial MCP servers state
@@ -984,6 +960,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       model,
       initialPermissionMode,
       mcpServers,
+      refreshMessages,
     ],
   );
 
@@ -1115,7 +1092,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   const clearMessages = useCallback(async () => {
     await agentRef.current?.clearMessages();
     refreshMessages();
-    forceRemount();
+    forceRemount({ preserveScrollback: true });
   }, [refreshMessages, forceRemount]);
 
   const compact = useCallback(
@@ -1249,7 +1226,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       }
 
       setSessionId(agent.sessionId);
-      setWorkingDirectory(agent.workingDirectory);
+      setWorkingDirectory(agent.currentWorkdir);
       setIsLoading(agent.isLoading);
       refreshMessages();
       forceRemount();
@@ -1351,6 +1328,19 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     agentRef.current?.stopWorkflowRun(runId);
   }, []);
 
+  const saveWorkflowScript = useCallback(
+    async (
+      runId: string,
+      options: { name: string; scope: "project" | "user"; overwrite?: boolean },
+    ) => {
+      if (!agentRef.current) {
+        throw new Error("Agent not available");
+      }
+      return agentRef.current.saveWorkflowScript(runId, options);
+    },
+    [],
+  );
+
   const hasSlashCommand = useCallback((commandId: string) => {
     if (!agentRef.current) return false;
     return agentRef.current.hasSlashCommand(commandId);
@@ -1445,6 +1435,9 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   // what keeps this the whole of the integration.
   const remoteControl = useRemoteControl({
     workdir: workdir ?? process.cwd(),
+    // 会话身份取 agent 的会话起点（不随 bash `cd` 漂移），不是上面那个会动的 workdir。
+    sessionCwd: () =>
+      agentRef.current?.sessionWorkdir ?? workdir ?? process.cwd(),
     sessionId,
     messages,
     isLoading,
@@ -1475,6 +1468,16 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     renameSession: (title) => agentRef.current?.renameSession(title),
     compact: (instructions) => compact(instructions),
     slashCommands: () => agentRef.current?.getSlashCommands() ?? [],
+    // 手机页取首屏尾段 / 补差都读 agent 手上那份列表（压缩后的上下文），不去
+    // 转录里找压缩前的历史。
+    messagePage: (window) =>
+      Promise.resolve(
+        agentRef.current?.getMessagePage(window) ?? { messages: [] },
+      ),
+    currentThread: () =>
+      Promise.resolve([...(agentRef.current?.messages ?? [])]),
+    threadSummary: () =>
+      agentRef.current?.getThreadSummary() ?? { messageCount: 0 },
   });
 
   // `initializeAgent` reads this ref when it runs, which is always in an effect
@@ -1483,87 +1486,6 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   // before anything can call the agent.
   remoteNotifyRef.current = remoteControl.notify;
 
-  /**
-   * `/remote-control [on|off|status] [name]` — offer this terminal's session to
-   * a phone. It is deliberately *not* a front end for `wave remote-control`:
-   * that subcommand drives the daemon, and this session exists only in this
-   * process, so the daemon could not serve it (spec: remote-control.md,
-   * "前台 CLI 会话也能被手机接管").
-   */
-  const remoteControlCommand = useCallback(
-    async (args?: string) => {
-      const showResult = (content: string) => {
-        setMessages((prev) => [
-          ...prev,
-          {
-            id: `msg-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`,
-            role: "assistant",
-            timestamp: new Date().toISOString(),
-            blocks: [{ type: "text", content, stage: "end" }],
-          },
-        ]);
-      };
-
-      const parts = (args ?? "").trim().split(/\s+/).filter(Boolean);
-      const action = parts[0]?.toLowerCase() ?? "";
-      if (
-        action &&
-        action !== "on" &&
-        action !== "off" &&
-        action !== "status"
-      ) {
-        showResult("Usage: /remote-control [on|off|status] [name]");
-        return;
-      }
-
-      if (!remoteControl.enabled) {
-        showResult(
-          'Remote control is unavailable in this process. Set "enableRemoteControl": true in ~/.wave/settings.json (or .wave/settings.json in the project), then restart the CLI — a process that is already running keeps the settings it started with.',
-        );
-        return;
-      }
-
-      if (action === "off") {
-        remoteControl.disconnect();
-        showResult(
-          "Remote control is off — this terminal's session is no longer served.",
-        );
-        return;
-      }
-
-      const current = remoteControl.getSnapshot();
-      const serving =
-        current.state === "online" || current.state === "connecting";
-      // A bare `/remote-control` means "start serving" the first time and
-      // "what is it doing?" afterwards, so a second one cannot silently dial
-      // again and cannot hide an address the user still needs.
-      if (action === "status" || (!action && serving)) {
-        showResult(
-          current.pageUrl
-            ? await describeRemotePage(current.pageUrl)
-            : `Remote control status: ${current.state}${
-                current.message ? ` — ${current.message}` : ""
-              }`,
-        );
-        return;
-      }
-
-      remoteControl.connect(parts[1]);
-      const pageUrl = await waitForRemotePageUrl(remoteControl);
-      const after = remoteControl.getSnapshot();
-      if (!pageUrl) {
-        showResult(
-          after.state === "error"
-            ? `Remote control failed: ${after.message ?? "unknown error"}`
-            : "Connected to the relay, but no page address came back yet — run /remote-control status in a moment.",
-        );
-        return;
-      }
-      showResult(await describeRemotePage(pageUrl));
-    },
-    [remoteControl],
-  );
-
   const backgroundCurrentTask = useCallback(() => {
     agentRef.current?.backgroundCurrentTask();
   }, []);
@@ -1608,7 +1530,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     if (!agentRef.current) {
       return [];
     }
-    return agentRef.current.getConfiguredModels();
+    return agentRef.current.getConfiguredModels().map((m) => m.name);
   }, []);
 
   const setModel = useCallback((model: string) => {
@@ -1682,6 +1604,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     backgroundTasks,
     workflowRuns,
     stopWorkflowRun,
+    saveWorkflowScript,
     tasks,
     getBackgroundTaskOutput,
     stopBackgroundTask,
@@ -1693,7 +1616,6 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     permissionMode,
     setPermissionMode,
     remoteControl,
-    remoteControlCommand,
     planView,
     setPlanView,
     handlePlanCommand,

package/src/daemon/commands.ts

@@ -135,7 +135,7 @@ function fail(message: string): never {
 
 interface DaemonSessionEntry {
   sessionId: string;
-  workingDirectory: string;
+  sessionCwd: string;
   isLoading: boolean;
   /**
    * The other two halves of the idle predicate `wait` / `status` share with
@@ -232,7 +232,7 @@ async function attachSession(
      */
     onInitialized?: (sessionId: string) => void;
   } = {},
-): Promise<{ sessionId: string; workingDirectory: string }> {
+): Promise<{ sessionId: string; currentWorkdir: string }> {
   const init = (await client.request("initialize", {
     workdir: process.cwd(),
     restoreSessionId: sessionId,
@@ -240,7 +240,7 @@ async function attachSession(
     // re-hosting client is the CLI, and the session file carries no record of
     // its original creator (see the entrypoint story in the telemetry spec).
     entrypoint: "cli",
-  })) as { sessionId: string; workingDirectory: string };
+  })) as { sessionId: string; currentWorkdir: string };
   const initId = init.sessionId;
   options.onInitialized?.(initId);
   try {
@@ -398,7 +398,7 @@ export async function daemonListCommand(socketPath: string): Promise<void> {
         // owns running background work.
         status: isIdleSession(s) ? "idle" : "generating",
         messageCount: String(s.messageCount),
-        workingDirectory: s.workingDirectory,
+        sessionCwd: s.sessionCwd,
       }));
       const width = (key: keyof (typeof rows)[number]) =>
         Math.max(...rows.map((r) => r[key].length), key.length);
@@ -409,7 +409,7 @@ export async function daemonListCommand(socketPath: string): Promise<void> {
       );
       for (const r of rows) {
         console.log(
-          `${pad(r.sessionId, width("sessionId"))}  ${pad(r.status, width("status"))}  ${pad(r.messageCount, width("messageCount"))}  ${r.workingDirectory}`,
+          `${pad(r.sessionId, width("sessionId"))}  ${pad(r.status, width("status"))}  ${pad(r.messageCount, width("messageCount"))}  ${r.sessionCwd}`,
         );
       }
     } else {
@@ -532,7 +532,7 @@ function parseAskUserQuestionAnswer(
 
 interface SessionSnapshot {
   sessionId: string;
-  workingDirectory: string;
+  currentWorkdir: string;
   /** `idle` / `generating` / `waiting for approval`. */
   status: string;
   pending: PendingPermission[];
@@ -552,7 +552,7 @@ interface SessionSnapshot {
  */
 function renderSessionSnapshot(snapshot: SessionSnapshot): void {
   console.log(`Session: ${snapshot.sessionId}`);
-  console.log(`Working directory: ${snapshot.workingDirectory}`);
+  console.log(`Working directory: ${snapshot.currentWorkdir}`);
   console.log(`Status: ${snapshot.status}`);
 
   if (snapshot.pending.length > 0) {
@@ -657,7 +657,7 @@ export async function daemonStatusCommand(
           : "idle";
     renderSessionSnapshot({
       sessionId: initId,
-      workingDirectory: init.workingDirectory,
+      currentWorkdir: init.currentWorkdir,
       status,
       pending,
       messages: messages.messages,
@@ -875,7 +875,7 @@ export async function daemonWaitCommand(
       };
       renderSessionSnapshot({
         sessionId: watch.id,
-        workingDirectory: init.workingDirectory,
+        currentWorkdir: init.currentWorkdir,
         status,
         pending,
         messages: result.messages ?? [],
@@ -1284,7 +1284,7 @@ function runGit(cwd: string, args: string[]): Promise<string> {
 }
 
 /**
- * Resolve the worktree hosting `workingDirectory` for removal, mirroring the
+ * Resolve the worktree hosting `sessionCwd` for removal, mirroring the
  * values protocol createWorktree returns: worktree path via
  * `git rev-parse --show-toplevel`, branch via `git branch --show-current`, and
  * repoRoot = the MAIN repo root (first entry of `git worktree list` — where
@@ -1293,7 +1293,7 @@ function runGit(cwd: string, args: string[]): Promise<string> {
  * check would pass trivially while removeWorktree's fs.rmSync fallback could
  * delete the whole repository.
  */
-async function resolveWorktreeForRemoval(workingDirectory: string): Promise<{
+async function resolveWorktreeForRemoval(sessionCwd: string): Promise<{
   path: string;
   branch: string;
   repoRoot: string;
@@ -1303,17 +1303,17 @@ async function resolveWorktreeForRemoval(workingDirectory: string): Promise<{
   let branch: string;
   try {
     const [toplevel, current] = await Promise.all([
-      runGit(workingDirectory, ["rev-parse", "--show-toplevel"]),
-      runGit(workingDirectory, ["branch", "--show-current"]),
+      runGit(sessionCwd, ["rev-parse", "--show-toplevel"]),
+      runGit(sessionCwd, ["branch", "--show-current"]),
     ]);
     worktreePath = toplevel;
     branch = current;
   } catch {
     throw new Error(
-      `Cannot remove worktree: ${workingDirectory} is not inside a git repository`,
+      `Cannot remove worktree: ${sessionCwd} is not inside a git repository`,
     );
   }
-  const repoRoot = getGitMainRepoRoot(workingDirectory);
+  const repoRoot = getGitMainRepoRoot(sessionCwd);
   if (path.resolve(worktreePath) === path.resolve(repoRoot)) {
     throw new Error(
       `Refusing to remove the main working tree: ${repoRoot} (not a linked worktree)`,
@@ -1333,7 +1333,7 @@ async function resolveWorktreeForRemoval(workingDirectory: string): Promise<{
  * abort there is no attach step: destroy is a pure registry operation keyed by
  * the envelope sessionId, so unknown sessions succeed without touching disk.
  * With --remove-worktree the session's git worktree is resolved from its
- * workingDirectory (getSessionInfo) and removed via protocol removeWorktree
+ * sessionCwd (getSessionInfo) and removed via protocol removeWorktree
  * first, then the session is destroyed.
  */
 export async function daemonDestroyCommand(
@@ -1349,8 +1349,8 @@ export async function daemonDestroyCommand(
         "getSessionInfo",
         undefined,
         sessionId,
-      )) as { workingDirectory: string };
-      const wt = await resolveWorktreeForRemoval(info.workingDirectory);
+      )) as { sessionCwd: string };
+      const wt = await resolveWorktreeForRemoval(info.sessionCwd);
       await client.request("removeWorktree", {
         path: wt.path,
         branch: wt.branch,

package/src/hooks/useInputManager.ts

@@ -7,7 +7,6 @@ import {
   ESC_DOUBLE_PRESS_TIMEOUT_MS,
   btwOverlayActiveRef,
 } from "../managers/inputReducer.js";
-import { createBracketedPasteDetector } from "../utils/bracketedPaste.js";
 import {
   searchFiles as searchFilesUtil,
   PermissionMode,
@@ -21,11 +20,6 @@ export const useInputManager = (
 ) => {
   const [state, dispatch] = useReducer(inputReducer, initialState);
 
-  // Detects bracketed paste (DECSET 2004) markers so pasted text is inserted
-  // without triggering submit — a pasted trailing \r must not be treated as
-  // Enter (see utils/bracketedPaste.ts).
-  const pasteDetectorRef = useRef(createBracketedPasteDetector());
-
   // Abort plumbing for the /btw side question: ABORT_BTW (set when the overlay
   // is dismissed while loading) aborts the in-flight onAskBtw call; the
   // dismissed ref suppresses the late SET_BTW_STATE dispatch / error logging.
@@ -64,7 +58,6 @@ export const useInputManager = (
     onReloadPlugins,
     onAddDir,
     onRenameSession,
-    onRemoteControlCommand,
     onPlanCommand,
     isIdle: isIdleProp,
   } = callbacks;
@@ -292,7 +285,7 @@ export const useInputManager = (
               } else if (command === "rename") {
                 await onRenameSession?.(effect.args);
               } else if (command === "remote-control") {
-                await onRemoteControlCommand?.(effect.args);
+                dispatch({ type: "SET_SHOW_REMOTE_CONTROL", payload: true });
               } else if (command === "plan") {
                 await onPlanCommand?.(effect.args);
               }
@@ -326,7 +319,6 @@ export const useInputManager = (
     onReloadPlugins,
     onAddDir,
     onRenameSession,
-    onRemoteControlCommand,
     onPlanCommand,
   ]);
 
@@ -537,6 +529,10 @@ export const useInputManager = (
     dispatch({ type: "SET_SHOW_STATUS_COMMAND", payload: show });
   }, []);
 
+  const setShowRemoteControl = useCallback((show: boolean) => {
+    dispatch({ type: "SET_SHOW_REMOTE_CONTROL", payload: show });
+  }, []);
+
   const setShowLoginCommand = useCallback((show: boolean) => {
     dispatch({ type: "SET_SHOW_LOGIN_COMMAND", payload: show });
   }, []);
@@ -632,44 +628,27 @@ export const useInputManager = (
     dispatch({ type: "CLEAR_LONG_TEXT_MAP" });
   }, []);
 
+  // Pasted text is insert-only. ink delivers a bracketed paste as one string on
+  // its own channel (`usePaste`), so a trailing newline inside it can never be
+  // mistaken for Enter — going through HANDLE_KEY would submit instead, because
+  // its coalesced-Enter branch fires on any chunk ending with a single \r.
+  const insertPastedText = useCallback((text: string) => {
+    if (text === "") {
+      return;
+    }
+    // \r → \n normalizes CRLF terminals to the newline the input uses.
+    dispatch({
+      type: "INSERT_TEXT_WITH_PLACEHOLDER",
+      payload: text.replace(/\r/g, "\n"),
+    });
+  }, []);
+
   const handleInput = useCallback(
     async (input: string, key: Key) => {
-      const result = pasteDetectorRef.current.process(input);
-
-      if (result.kind === "consume") {
-        // Content of an in-flight bracketed paste (or an empty paste):
-        // hold it, never submit or insert prematurely.
-        return true;
-      }
-
-      if (result.kind === "paste") {
-        if (result.leadingInput) {
-          dispatch({
-            type: "HANDLE_KEY",
-            payload: {
-              input: result.leadingInput,
-              key,
-              hasSlashCommand: (cmd) => !!onHasSlashCommand?.(cmd),
-              hasQueuedMessages: hasQueuedMessagesProp ?? false,
-              isIdle: isIdleProp ?? false,
-            },
-          });
-        }
-        if (result.text !== "") {
-          // Insert-only: \r → \n normalizes CRLF terminals, matching the
-          // canonical paste path (inputHandlers.handlePasteInput).
-          dispatch({
-            type: "INSERT_TEXT_WITH_PLACEHOLDER",
-            payload: result.text.replace(/\r/g, "\n"),
-          });
-        }
-        return true;
-      }
-
       dispatch({
         type: "HANDLE_KEY",
         payload: {
-          input: result.input,
+          input,
           key,
           hasSlashCommand: (cmd) => !!onHasSlashCommand?.(cmd),
           hasQueuedMessages: hasQueuedMessagesProp ?? false,
@@ -702,6 +681,7 @@ export const useInputManager = (
     showResumeSelector: state.showResumeSelector,
     showHelp: state.showHelp,
     showStatusCommand: state.showStatusCommand,
+    showRemoteControl: state.showRemoteControl,
     showLoginCommand: state.showLoginCommand,
     showPluginManager: state.showPluginManager,
     showModelSelector: state.showModelSelector,
@@ -750,6 +730,7 @@ export const useInputManager = (
     setShowRewindManager,
     setShowHelp,
     setShowStatusCommand,
+    setShowRemoteControl,
     setShowLoginCommand,
     setShowPluginManager,
     setShowModelSelector,
@@ -768,6 +749,7 @@ export const useInputManager = (
 
     // Paste and text handling
     handlePasteInput,
+    insertPastedText,
     handleSubmit,
     expandLongTextPlaceholders,
     clearLongTextMap,