@xgspz/cli-ui 0.6.14 → 0.6.16

package/src/operator/node/Chat.tsx

@@ -4,15 +4,16 @@ import { parentMessages, type SubagentTranscript } from "../../core/subagents";
 import { jget } from "./api";
 import { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import type { AskQuestion, AskAnswers } from "./protocol/types";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { agentLabel } from "./agents";
 import { Avatar, Skel } from "./shared";
 import { splitAttachments } from "./format";
 import type { ProjectRow, TaskRow, Msg, AgentsBundle } from "./types";
 import { MessageView, SessionBreak } from "./Transcript";
-import { RENDER_MAX, RENDER_STEP, RENDER_WINDOW, buildTranscriptItems, hasOpenAsk } from "./transcriptModel";
+import { buildTranscriptItems, hasOpenAsk } from "../../ui/transcriptModel";
+import { useTranscriptWindow } from "../../ui/useTranscriptWindow";
 import { OperatorBoardContext } from "./boardInteraction";
-import { toolDataOf } from "./transcriptModel";
+import { toolDataOf } from "../../ui/transcriptModel";
 import { FileLinkContext } from "./fileLinks";
 import { Composer } from "./Composer";
 import { QueuedMessages } from "../../ui/QueuedMessages";
@@ -187,267 +188,16 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
   useEffect(() => { lastActivityRef.current = Date.now(); }, [messages]);
   const turnStartedAt = runSeenAt ?? lastUserTs;
 
-  // Auto-scroll only while the user is parked at the bottom. If they scroll up to
-  // read earlier output, we leave their position alone even as new messages stream
-  // in, and surface a "jump to bottom" button instead.
-  const pinned = useRef(true);
-  const [atBottom, setAtBottom] = useState(true);
-
-  // ---------- windowed transcript ----------
+  // ---------- windowed transcript (shared with CliChat: ui/useTranscriptWindow) ----------
   // Only a window of rows is in the DOM — never more than RENDER_MAX — so a task
   // with thousands of messages renders, scrolls and streams like a short one.
-  // While following the output it's the newest RENDER_WINDOW rows. Scrolling back
-  // reveals RENDER_STEP more above at a time (paging older messages in from the
-  // server once the loaded ones run out) and drops rows far below; scrolling down
-  // brings those back. "Jump to latest" returns to following.
-  const items = useMemo(() => buildTranscriptItems(parent, older > 0), [parent, older]);
-  // First / last rendered row by key; null = derived (newest rows).
-  const [win, setWin] = useState<{ start: string | null; end: string | null }>({ start: null, end: null });
-  const { startIdx, endIdx } = useMemo(() => {
-    const find = (key: string | null) => (key ? items.findIndex((it) => it.key === key) : -1);
-    const e = find(win.end);
-    const last = e >= 0 ? e : items.length - 1;
-    let s = find(win.start);
-    // The window is pinned on message rows (labels move when older pages load);
-    // show the session label / break right above its first message.
-    if (s >= 0) while (s > 0 && items[s - 1].kind !== "msg") s--;
-    return { startIdx: s >= 0 && s <= last ? s : Math.max(0, last + 1 - RENDER_WINDOW), endIdx: last };
-  }, [items, win]);
-  const shown = useMemo(() => items.slice(startIdx, endIdx + 1), [items, startIdx, endIdx]);
-  const hiddenAbove = useMemo(() => {
-    let n = older;
-    for (let i = 0; i < startIdx; i++) if (items[i].kind === "msg") n++;
-    return n;
-  }, [items, startIdx, older]);
-  const hiddenBelow = useMemo(() => {
-    let n = 0;
-    for (let i = endIdx + 1; i < items.length; i++) if (items[i].kind === "msg") n++;
-    return n;
-  }, [items, endIdx]);
-  const [loadingOlder, setLoadingOlder] = useState(false);
-  const [expandReq, setExpandReq] = useState(0);
-  const itemsRef = useRef(items);
-  itemsRef.current = items;
-  const rangeRef = useRef({ startIdx, endIdx });
-  rangeRef.current = { startIdx, endIdx };
-  const winRef = useRef(win);
-  winRef.current = win;
-  const olderRef = useRef(older);
-  olderRef.current = older;
-  const hiddenRef = useRef({ above: hiddenAbove, below: hiddenBelow });
-  hiddenRef.current = { above: hiddenAbove, below: hiddenBelow };
-  const loadingOlderRef = useRef(false);
-  // A rendered row and where it sat on screen, measured right before rows are
-  // added or dropped above it and restored once THAT window change commits, so
-  // the reader's view stays put.
-  type Anchor = { key: string; top: number };
-  const anchorRef = useRef<(Anchor & { win: typeof win }) | null>(null);
-  // Measured just before an older page is applied (see revealEarlier).
-  const pageAnchorRef = useRef<Anchor | null>(null);
-  // A message-nav click that had to reveal rows first: finish it afterwards.
-  const navAfterRevealRef = useRef<0 | -1 | 1>(0);
-
-  const measure = useCallback((key?: string): Anchor | null => {
-    const el = scrollRef.current;
-    const node = key ? el?.querySelector<HTMLElement>(`[data-tkey="${CSS.escape(key)}"]`) : el?.querySelector<HTMLElement>("[data-tkey][data-msg]");
-    return node?.dataset.tkey ? { key: node.dataset.tkey, top: node.getBoundingClientRect().top } : null;
-  }, []);
-  // Window edges are stored as MESSAGE keys: a session label's position shifts
-  // when older messages are paged in above it, a message's never does.
-  const setRange = useCallback((s: number, e: number, anchor?: Anchor | null) => {
-    const its = itemsRef.current;
-    let a = s;
-    while (a < its.length && its[a].kind !== "msg") a++;
-    let b = e;
-    while (b > 0 && its[b].kind !== "msg") b--;
-    const next = { start: its[a]?.key ?? null, end: e >= its.length - 1 ? null : its[b]?.key ?? null };
-    // Same window: no state change (and no anchor left waiting for a commit that won't come).
-    if (winRef.current.start === next.start && winRef.current.end === next.end) return;
-    if (anchor) anchorRef.current = { ...anchor, win: next };
-    setWin(next);
-  }, []);
-
-  // Grow the window upward over rows already loaded (dropping rows far below).
-  // The current first row stays rendered (RENDER_MAX > RENDER_STEP) and anchors.
-  const growUp = useCallback((anchor?: Anchor | null): boolean => {
-    const { startIdx: s, endIdx: e } = rangeRef.current;
-    if (s <= 0) return false;
-    const ns = Math.max(0, s - RENDER_STEP);
-    setRange(ns, Math.min(e, ns + RENDER_MAX - 1), anchor ?? measure());
-    return true;
-  }, [measure, setRange]);
-
-  // Show earlier rows: loaded ones first, then a page from the server.
-  const revealEarlier = useCallback(async () => {
-    if (loadingOlderRef.current || growUp()) return;
-    if (olderRef.current > 0 && onLoadOlder) {
-      // Hold the window on its current rows so the prepended page lands above
-      // it; the expansion effect below then reveals the bottom of that page,
-      // anchored on where the first row sat right before the page went in.
-      const { startIdx: s, endIdx: e } = rangeRef.current;
-      setRange(s, e);
-      loadingOlderRef.current = true;
-      setLoadingOlder(true);
-      try {
-        if (await onLoadOlder(() => { pageAnchorRef.current = measure(); })) setExpandReq((n) => n + 1);
-      } finally {
-        loadingOlderRef.current = false;
-        setLoadingOlder(false);
-      }
-    }
-  }, [growUp, setRange, measure, onLoadOlder]);
-  // Show later rows again (after scrolling back), dropping rows far above —
-  // anchored on the first row that stays.
-  const revealLater = useCallback(() => {
-    const its = itemsRef.current;
-    const { startIdx: s, endIdx: e } = rangeRef.current;
-    if (e >= its.length - 1) return;
-    const ne = Math.min(its.length - 1, e + RENDER_STEP);
-    const ns = Math.max(s, ne - RENDER_MAX + 1);
-    setRange(ns, ne, ns > s ? measure(its[ns].key) : null);
-  }, [measure, setRange]);
-  const revealRef = useRef({ earlier: revealEarlier, later: revealLater });
-  revealRef.current = { earlier: revealEarlier, later: revealLater };
-
-  // A page of older messages arrived above the window: reveal the bottom of it.
-  useLayoutEffect(() => {
-    if (!expandReq) return;
-    const anchor = pageAnchorRef.current;
-    pageAnchorRef.current = null;
-    growUp(anchor);
-  }, [expandReq, growUp]);
-
-  const onScroll = useCallback(() => {
-    const el = scrollRef.current;
-    if (!el) return;
-    // "At the bottom" means at the newest output — not merely at the end of a
-    // window that stops short of it.
-    const bottom = el.scrollHeight - el.scrollTop - el.clientHeight < 60 && winRef.current.end === null;
-    pinned.current = bottom;
-    setAtBottom(bottom);
-    if (!bottom && winRef.current.start === null) {
-      // Reading back: freeze the window, so new output arriving below doesn't
-      // drop the rows above the reader.
-      const first = itemsRef.current.slice(rangeRef.current.startIdx).find((it) => it.kind === "msg");
-      if (first) setWin((w) => ({ ...w, start: first.key }));
-    } else if (bottom && winRef.current.start !== null) {
-      // Back at the newest output: follow it again (sheds the rows revealed above).
-      setWin({ start: null, end: null });
-    }
-  }, []);
-
-  // Reveal more as the reader nears either end of the window (never while
-  // following the output).
-  const topSentinelRef = useRef<HTMLDivElement>(null);
-  const bottomSentinelRef = useRef<HTMLDivElement>(null);
+  // This adapter does not draw the folded browser-wait rows, so it asks for none.
+  const items = useMemo(() => buildTranscriptItems(parent, older > 0, { fold: false }), [parent, older]);
+  const loadOlderPage = useCallback((beforeApply: () => void) => onLoadOlder ? onLoadOlder(beforeApply) : Promise.resolve(false), [onLoadOlder]);
+  const { shown, hiddenAbove, hiddenBelow, loadingOlder, atBottom, onScroll, revealEarlier, revealLater, scrollToBottom, scrollToUserMsg, unpin, topSentinelRef, bottomSentinelRef } =
+    useTranscriptWindow({ scrollRef, items, older, loadOlder: loadOlderPage, messages, running, remountKey: `${hasSession}|${view}` });
   const hasAbove = hiddenAbove > 0;
   const hasBelow = hiddenBelow > 0;
-  useEffect(() => {
-    const root = scrollRef.current;
-    if (!root || typeof IntersectionObserver === "undefined") return;
-    const watch = (target: HTMLElement | null, margin: string, go: () => void) => {
-      if (!target) return null;
-      const io = new IntersectionObserver((entries) => {
-        if (!pinned.current && entries.some((e) => e.isIntersecting)) go();
-      }, { root, rootMargin: margin });
-      io.observe(target);
-      return io;
-    };
-    const up = hasAbove ? watch(topSentinelRef.current, "1800px 0px 0px 0px", () => void revealRef.current.earlier()) : null;
-    const down = hasBelow ? watch(bottomSentinelRef.current, "0px 0px 1800px 0px", () => revealRef.current.later()) : null;
-    return () => { up?.disconnect(); down?.disconnect(); };
-    // `view`: on mobile the chat pane remounts when toggling chat/changes.
-  }, [hasAbove, hasBelow, view]);
-
-  // Reading back while a long turn keeps streaming: the window's bottom edge
-  // follows the output, so cap it at RENDER_MAX. Reader in the upper half →
-  // stop extending (new output waits below the "show later" control); in the
-  // lower half → drop the oldest rows above instead, holding the view in place.
-  useLayoutEffect(() => {
-    // +2: a session break and label may sit above the first message row.
-    if (win.start === null || win.end !== null || endIdx - startIdx + 1 <= RENDER_MAX + 2) return;
-    const el = scrollRef.current;
-    if (!el) return;
-    if (el.scrollTop < (el.scrollHeight - el.clientHeight) / 2) {
-      setRange(startIdx, startIdx + RENDER_MAX - 1);
-    } else {
-      const ns = endIdx - RENDER_MAX + 1;
-      setRange(ns, endIdx, measure(itemsRef.current[ns].key));
-    }
-  }, [win, startIdx, endIdx, setRange, measure]);
-
-  const scrollToBottom = useCallback((behavior: ScrollBehavior = "smooth") => {
-    const el = scrollRef.current;
-    if (!el) return;
-    pinned.current = true;
-    setAtBottom(true);
-    // Not showing the newest rows: switch back to following; the pinned layout
-    // effect below lands on the bottom once they render.
-    if (winRef.current.start !== null || winRef.current.end !== null) { setWin({ start: null, end: null }); return; }
-    el.scrollTo({ top: el.scrollHeight, behavior });
-  }, []);
-
-  // Jump between the user's own messages in the transcript. dir < 0 goes to the
-  // previous one above the current scroll position, dir > 0 to the next below it;
-  // queued (not-yet-sent) bubbles are excluded so nav only lands on real turns.
-  // Past the edge of the rendered window it reveals more rows first.
-  const scrollToUserMsg = useCallback((dir: -1 | 1) => {
-    const el = scrollRef.current;
-    if (!el) return;
-    const base = el.getBoundingClientRect().top;
-    const tops = Array.from(el.querySelectorAll<HTMLElement>(".msg.user:not(.queued)"))
-      .map((n) => n.getBoundingClientRect().top - base + el.scrollTop);
-    const cur = el.scrollTop;
-    const eps = 8;
-    const candidates = dir < 0 ? tops.filter((t) => t < cur - eps) : tops.filter((t) => t > cur + eps);
-    if (!candidates.length && (dir < 0 ? hiddenRef.current.above : hiddenRef.current.below) > 0) {
-      navAfterRevealRef.current = dir;
-      if (dir < 0) void revealRef.current.earlier();
-      else revealRef.current.later();
-      return;
-    }
-    if (!tops.length) return;
-    const target = candidates.length ? (dir < 0 ? candidates[candidates.length - 1] : candidates[0]) : dir < 0 ? tops[0] : tops[tops.length - 1];
-    el.scrollTo({ top: Math.max(0, target - 12), behavior: "smooth" });
-  }, []);
-
-  // The window moved: put the anchored row back where it was (a no-op where the
-  // browser's own scroll anchoring already did it), then finish a pending nav.
-  // Only the commit of the window change the anchor was measured for restores
-  // it — an intermediate commit (an older page landing) must not consume it.
-  useLayoutEffect(() => {
-    const a = anchorRef.current;
-    const el = scrollRef.current;
-    if (a && a.win === win) {
-      anchorRef.current = null;
-      const node = el?.querySelector<HTMLElement>(`[data-tkey="${CSS.escape(a.key)}"]`);
-      if (el && node) {
-        const delta = node.getBoundingClientRect().top - a.top;
-        if (Math.abs(delta) > 1) el.scrollTop += delta;
-      }
-    }
-    const nav = navAfterRevealRef.current;
-    if (nav && !anchorRef.current) {
-      navAfterRevealRef.current = 0;
-      scrollToUserMsg(nav);
-    }
-  }, [win, scrollToUserMsg]);
-
-  // Following the output: stay on the newest row as content arrives or the
-  // window sheds rows above. Layout effect, so it lands before paint (no jump).
-  useLayoutEffect(() => {
-    if (pinned.current && scrollRef.current) scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
-  }, [messages, running, startIdx, endIdx, win]);
-  // …and when the pane itself resizes (the composer growing, a banner
-  // appearing). Content resizes are left alone, so expanding a tool card at
-  // the bottom doesn't yank its top out of view.
-  useEffect(() => {
-    const el = scrollRef.current;
-    if (!el || typeof ResizeObserver === "undefined") return;
-    const ro = new ResizeObserver(() => { if (pinned.current) el.scrollTop = el.scrollHeight; });
-    ro.observe(el);
-    return () => ro.disconnect();
-  }, [hasSession, view]);
 
   const flowPositioned=useRef(!task.parent_task_id);
   useLayoutEffect(()=>{
@@ -456,7 +206,7 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
     const boundary=Array.from(el?.querySelectorAll<HTMLElement>(".branch-nav")??[]).find(e=>e.dataset.parentId===task.parent_task_id);
     if(!el || !boundary) return;
     el.scrollTop+=boundary.getBoundingClientRect().top-el.getBoundingClientRect().top-60;
-    pinned.current=false; setAtBottom(false); flowPositioned.current=true;
+    unpin(); flowPositioned.current=true;
   },[active,flow.ready,task.parent_task_id]);
   useEffect(()=>{if(!task.parent_task_id && active) scrollToBottom("auto");},[active,task.id]);
   const queued = <QueuedMessages scopeKey={task.id} messages={messages.filter(message => message.role === "queued")} onCancel={message => cancelQueued(message.id)}
@@ -498,6 +248,11 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
               <div key={it.key} data-tkey={it.key} className="session-label"><span className="ln" />第 {it.n} 次会话{it.current ? " · 当前" : ""}<span className="ln" /></div>
             ) : it.kind === "break" ? (
               <div key={it.key} data-tkey={it.key}><SessionBreak summary={it.summary} /></div>
+            ) : it.kind === "fold" ? (
+              // Not requested here ({ fold: false }); kept total so a folded row can never vanish.
+              <div key={it.key} data-tkey={it.key} data-msg="">
+                {it.msgs.map((m) => <MessageView key={m.id} m={m} initial={false} hideWho running={running} agent={task.agent} agentLabel={agentLabel(agents, task.agent)} onAnswer={stableAnswer} onCancelQueued={stableCancelQueued} onClear={stableClear} onReconnect={stableReconnect} onRetry={stableRetry} onInput={stableInput} onBrowser={stableBrowser} onQuote={(msg,selected)=>quote(msg,task,selected)} />)}
+              </div>
             ) : (
               <div key={it.key} data-tkey={it.key} data-msg="">
                 <MessageView m={it.m} initial={it.initial} hideWho={it.hideWho} running={running} agent={task.agent} agentLabel={agentLabel(agents, task.agent)} onAnswer={stableAnswer} onCancelQueued={stableCancelQueued} onClear={stableClear} onReconnect={stableReconnect} onRetry={stableRetry} onInput={stableInput} onBrowser={stableBrowser} onQuote={(m,selected)=>quote(m,task,selected)} />

package/src/operator/node/CommandPalette.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useMemo, useRef, useState } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { jget } from "./api";
 import type { PaletteTaskRow, ProjectRow } from "./types";
 import { StatusDot } from "./shared";

package/src/operator/node/Composer.tsx

@@ -4,7 +4,7 @@ import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState, type
 import { DOCUMENT_MAX_BYTES, FILE_UPLOAD_ACCEPT, isOriginalDocument, uploadFileType, UPLOAD_OTHER_MAX_BYTES } from "../../core/documentUpload";
 import { Popover } from "./shared";
 import type { TaskRow } from "./types";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { attachmentMarker, fileAttachmentMarker } from "./format";
 import { MAX_MESSAGE_CHARS, PASTE_ATTACH_THRESHOLD } from "./protocol/promptLimits";
 import { RunControls, type RunControlProps } from "./RunControls";

package/src/operator/node/Layout.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useRef, useState } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { TerminalView } from "./Terminal";
 import { Skel } from "./shared";
 

package/src/operator/node/Markdown.tsx

@@ -1,11 +1,7 @@
 "use client";
 
-import { memo, useContext } from "react";
-import ReactMarkdown, { defaultUrlTransform } from "react-markdown";
-import remarkGfm from "remark-gfm";
-import rehypeHighlight from "rehype-highlight";
-import type { ComponentProps } from "react";
-import { inlineFilePath } from "../../ui/fileLinks";
+import { useContext, type ComponentProps } from "react";
+import { createMarkdown } from "../../ui/Markdown";
 import { OperatorBoardContext } from "./boardInteraction";
 import { FileLinkContext, localFilePath, rewriteFileHref, rewriteFileSrc } from "./fileLinks";
 
@@ -22,11 +18,6 @@ function MdLink({ href, ...props }: ComponentProps<"a">) {
       if(scope&&path&&open?.({kind:'file',taskId:scope.taskId,path}))event.preventDefault();}} />;
 }
 
-function MdCode({children, ...props}: ComponentProps<"code">) {
-  const path=inlineFilePath(children);
-  return path ? <MdLink href={path}><code {...props}>{children}</code></MdLink> : <code {...props}>{children}</code>;
-}
-
 function MdImg({ src, alt, ...props }: ComponentProps<"img">) {
   const scope = useContext(FileLinkContext);
   const local = typeof src === "string" ? rewriteFileSrc(scope, src) : null;
@@ -34,28 +25,7 @@ function MdImg({ src, alt, ...props }: ComponentProps<"img">) {
   return <img {...props} alt={alt ?? ""} src={local ?? src} />;
 }
 
-// The default transform blanks any non-web scheme; let file: (and C:\ paths)
-// through so MdLink can map them to the task's file route.
-const urlTransform = (url: string) => (/^file:/i.test(url) || /^[a-z]:[\\/]/i.test(url) ? url : defaultUrlTransform(url));
-
-// Renders Claude's markdown output: headings, lists, tables, fenced code blocks
-// (syntax-highlighted), inline code, links. Used for assistant + user messages.
-//
-// Perf: `detect: false` — only fenced blocks with an explicit language get
-// highlighted; hljs auto-detection ran over every bare code block and was a
-// hot spot during streaming turns. Memoized so messages whose text hasn't
-// changed skip the whole markdown parse + highlight on transcript re-renders.
-export const Markdown = memo(function Markdown({ children }: { children: string }) {
-  return (
-    <div className="md">
-      <ReactMarkdown
-        remarkPlugins={[remarkGfm]}
-        rehypePlugins={[[rehypeHighlight, { detect: false, ignoreMissing: true }]]}
-        components={{ a: MdLink, img: MdImg, code: MdCode }}
-        urlTransform={urlTransform}
-      >
-        {children}
-      </ReactMarkdown>
-    </div>
-  );
-});
+// Rendering rules (plugins, highlighting, inline file-path code, memo) are shared
+// with the center adapter (ui/Markdown createMarkdown); only how a local file
+// link / image resolves is node-specific: the task's file route and board.
+export const Markdown = createMarkdown({ Link: MdLink, Image: MdImg });

package/src/operator/node/Modal.tsx

@@ -2,7 +2,7 @@
 
 import { useCallback, useEffect, useRef, useState } from "react";
 import type { Priority } from "./protocol/types";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { jget, jsend } from "./api";
 import { SLABEL, type FsListing, type TaskRow } from "./types";
 import { StatusDot, Skel, ErrNote } from "./shared";

package/src/operator/node/OnboardingWizard.tsx

@@ -1,11 +1,11 @@
 "use client";
 
 import { useCallback, useEffect, useState } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { jget, jsend } from "./api";
 import { AgentConnect } from "./AgentConnect";
 import type { AgentInfoT, AgentsResponseT, ClaudeVerifyT, OnboardingT, OnbStep } from "./types";
-import { useBoundedPoll } from "./boundedPoll";
+import { useRecheckOnReturn } from "./recheckOnReturn";
 
 // The first-run wizard, trimmed to the two irreducible auth steps: connect a
 // coding agent, then verify it responds. "An agent" — not Claude specifically:
@@ -48,9 +48,9 @@ export function OnboardingWizard({
 
   // While nothing is connected yet, re-check: a login can settle server-side
   // after a missed onConnected (e.g. the connect card was remounted mid-login),
-  // and without this the Continue button stays locked until a reload. Bounded:
-  // a window of checks, renewed when the user comes back to the tab.
-  useBoundedPoll(step === "connect" && connected.length === 0, load, 3_000, 10 * 60_000);
+  // and without this the Continue button stays locked until a reload. Checked
+  // when the user comes back to the tab or presses 重新检查 — no polling.
+  useRecheckOnReturn(step === "connect" && connected.length === 0, load);
   const verifyAgent =
     (justConnected && connected.find((a) => a.id === justConnected)) || connected[0] || null;
 
@@ -91,6 +91,7 @@ export function OnboardingWizard({
               bundle={bundle}
               done={connected.length > 0}
               onConnected={(id) => { setJustConnected(id); load(); }}
+              onRecheck={load}
               onContinue={() => goto("verify")}
             />
           )}
@@ -125,11 +126,13 @@ function ConnectStep({
   bundle,
   done,
   onConnected,
+  onRecheck,
   onContinue,
 }: {
   bundle: AgentsResponseT | null;
   done: boolean;
   onConnected: (agentId: string) => void;
+  onRecheck: () => void;
   onContinue: () => void;
 }) {
   const agents = bundle?.agents ?? [];
@@ -165,6 +168,7 @@ function ConnectStep({
         )}
       </div>
       <div className="wiz-foot">
+        {!done && bundle && <button className="linkbtn" onClick={onRecheck} title="在别处登录过了？重新读取连接状态">已经登录过？重新检查</button>}
         <span className="spacer" />
         <button className="btn btn-accent" disabled={!done} onClick={onContinue}>
           继续 {Icon.chevRight()}

package/src/operator/node/Orchestrator.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useState, useEffect, useRef } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { TerminalView, type TermApi } from "./Terminal";
 import { PROJ_W, TASK_W, DEFAULT_LAYOUT } from "./types";
 import { useOrchestrator } from "./useOrchestrator";

package/src/operator/node/ProjectLanding.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { Markdown } from "./Markdown";
 import { relTime } from "./format";
 import { ErrNote } from "./shared";

package/src/operator/node/ProjectsColumn.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { fmtCost, relTime } from "./format";
 import { SEARCH_MIN, type AgentInfo, type ProjectRow } from "./types";
 import { SearchBar } from "./shared";

package/src/operator/node/ProviderAuth.tsx

@@ -7,11 +7,11 @@
 // routes; rendered by AgentConnect when capabilities.supportsProviderAuth.
 
 import { useCallback, useEffect, useMemo, useRef, useState, type CSSProperties } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { jget, jsend } from "./api";
 import type { AgentInfoT, ClaudeVerifyT } from "./types";
 import type { AgentLoginEvent, AgentLoginPrompt, AgentProviderInfo, AgentProviderLogin } from "./protocol/agents/types";
-import { useBoundedPoll } from "./boundedPoll";
+import { useRecheckOnReturn } from "./recheckOnReturn";
 
 // The global .field rules style text/number inputs only; selects and password
 // inputs here get the same look inline instead of widening those shared rules.
@@ -92,14 +92,16 @@ export function ProviderAuthPanel({ agent, onConnected }: { agent: AgentInfoT; o
     }
   }, [agent.connected, agent.id, agent.label, load, onConnected]);
 
-  // Re-check while the flow runs — for a bounded window, and again when the user
-  // comes back to this tab (useBoundedPoll); finish once it settles.
-  useBoundedPoll(login?.status === "running", () => {
+  // Re-check while the flow runs — when the user comes back to this tab or presses
+  // 检查状态 (useRecheckOnReturn; no polling); finish once it settles. Answers to the
+  // flow's prompts return the next state directly.
+  const checkLogin = useCallback(() => {
     jget<AgentProviderLogin | null>(`${base}/login`).then((l) => {
       if (!l) { setLogin(null); return; }
       setLogin(l);
     }).catch(() => {});
-  }, 1500, 10 * 60_000);
+  }, [base]);
+  useRecheckOnReturn(login?.status === "running", checkLogin);
 
   useEffect(() => {
     if (login?.status === "success") { setNote({ ok: true, text: `已登录 ${nameOf(login.provider)}。` }); void afterChange(); }
@@ -290,7 +292,7 @@ export function ProviderAuthPanel({ agent, onConnected }: { agent: AgentInfoT; o
             <KeyForm provider={picked} onSave={(input) => saveKey(picked, input)} onCancel={() => setKeyFor(null)} />
           </div>
         )}
-        {login && <LoginFlow login={login} name={nameOf(login.provider)} busy={busy === "answer"} onAnswer={answer} onCancel={cancel} onDismiss={() => setLogin(null)} />}
+        {login && <LoginFlow login={login} name={nameOf(login.provider)} busy={busy === "answer"} onAnswer={answer} onCancel={cancel} onDismiss={() => setLogin(null)} onCheck={checkLogin} />}
       </div>
 
       {/* ---- user-defined endpoints ---- */}
@@ -391,9 +393,9 @@ function PromptInput({ prompt, busy, onAnswer }: { prompt: AgentLoginPrompt; bus
   );
 }
 
-function LoginFlow({ login, name, busy, onAnswer, onCancel, onDismiss }: {
+function LoginFlow({ login, name, busy, onAnswer, onCancel, onDismiss, onCheck }: {
   login: AgentProviderLogin; name: string; busy: boolean;
-  onAnswer: (p: AgentLoginPrompt, v: string) => void; onCancel: () => void; onDismiss: () => void;
+  onAnswer: (p: AgentLoginPrompt, v: string) => void; onCancel: () => void; onDismiss: () => void; onCheck: () => void;
 }) {
   if (login.status === "success") {
     return <div className="wiz-connected" style={{ marginTop: 10 }}><span className="wiz-ok">{Icon.check()}</span><div className="wiz-ok-t">已登录 {name}</div></div>;
@@ -416,7 +418,7 @@ function LoginFlow({ login, name, busy, onAnswer, onCancel, onDismiss }: {
       {login.prompt ? (
         <PromptInput prompt={login.prompt} busy={busy} onAnswer={onAnswer} />
       ) : (
-        <div className="wiz-verify" style={{ marginTop: 6 }}><span className="wiz-spin" /> <span>等待授权完成…</span></div>
+        <div className="wiz-verify" style={{ marginTop: 6 }}><span className="wiz-spin" /> <span>等待授权完成…回到这个页面时会自动检查。</span> <button className="linkbtn" onClick={onCheck}>检查状态</button></div>
       )}
       <button className="linkbtn" style={{ marginTop: 10 }} onClick={onCancel}>取消</button>
     </div>

package/src/operator/node/RunSwitch.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { Fragment, useState } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { Popover } from "./shared";
 import { agentLabel, agentStateHint, capsFor } from "./agents";
 import { modelLabel } from "./format";

package/src/operator/node/Services.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useRef, useState } from "react";
-import { Icon } from "./icons";
+import { Icon } from "../../ui/icons";
 import { jsend } from "./api";
 import { openLive } from "./liveStream";
 import { LoadNote } from "./shared";