cli-jaw 2.0.2 → 2.0.4

package/public/js/features/process-block.ts

@@ -1,11 +1,18 @@
 import { escapeHtml } from '../render.js';
 import { ICONS } from '../icons.js';
+
+declare global {
+    interface Window {
+        __jawProcessBlockLayoutMutation?: (anchor: Element | null, mutate: () => void) => void;
+    }
+}
 export interface ProcessStep {
     id: string;
     type: 'tool' | 'thinking' | 'search' | 'subagent';
     icon: string;
     rawIcon?: string | undefined;
     label: string;
+    isEmployee?: boolean | undefined;
     detail?: string;
     detailPreview?: string | undefined;
     detailLength?: number | undefined;
@@ -36,6 +43,7 @@ export interface StoredProcessStepMeta {
     icon: string;
     rawIcon?: string | undefined;
     label: string;
+    isEmployee?: boolean | undefined;
     stepRef?: string | undefined;
     traceRunId?: string | undefined; traceSeq?: number | undefined; detailAvailable?: boolean | undefined; detailBytes?: number | undefined; rawRetentionStatus?: string | undefined;
     status: ProcessStep['status'];
@@ -117,6 +125,7 @@ export function compactProcessStepForStorage(step: ProcessStep): ProcessStep {
         icon: step.icon,
         rawIcon: step.rawIcon,
         label: step.label,
+        isEmployee: step.isEmployee,
         stepRef: step.stepRef,
         traceRunId: step.traceRunId, traceSeq: step.traceSeq, detailAvailable: step.detailAvailable,
         detailBytes: step.detailBytes, rawRetentionStatus: step.rawRetentionStatus,
@@ -164,6 +173,7 @@ function updateStoredStepMeta(step: ProcessStep): void {
         icon: compact.icon,
         rawIcon: compact.rawIcon,
         label: compact.label,
+        isEmployee: compact.isEmployee,
         stepRef: compact.stepRef,
         traceRunId: compact.traceRunId, traceSeq: compact.traceSeq, detailAvailable: compact.detailAvailable,
         detailBytes: compact.detailBytes, rawRetentionStatus: compact.rawRetentionStatus,
@@ -204,6 +214,9 @@ function renderStep(step: ProcessStep): string {
     const badgeClass = `process-step-badge ${step.type}`;
     const badgeText = step.type.toUpperCase();
     const label = escapeHtml(step.label || step.icon || '');
+    const employeeMarker = step.isEmployee
+        ? '<span class="process-step-origin" aria-label="Employee tool">(E)</span>'
+        : '';
     const icon = renderTrustedIcon(step.icon);
     const detail = step.detailPreview || step.detail || '';
     const detailId = `process-detail-${step.id}`;
@@ -217,6 +230,7 @@ function renderStep(step: ProcessStep): string {
         data-step-id="${step.id}"
         data-type="${escapeHtml(step.type)}"
         data-status="${escapeHtml(step.status)}"
+        data-is-employee="${step.isEmployee ? 'true' : ''}"
         data-step-ref="${escapeHtml(step.stepRef || '')}"
         data-trace-run-id="${escapeHtml(step.traceRunId || '')}"
         data-trace-seq="${String(step.traceSeq || '')}"
@@ -226,6 +240,7 @@ function renderStep(step: ProcessStep): string {
             <span class="process-step-icon" aria-hidden="true">${icon}</span>
             <span class="${badgeClass}">${badgeText}</span>
             <span class="process-step-main">
+                ${employeeMarker}
                 <span class="process-step-label">${label}</span>
                 ${snippetHtml}
             </span>
@@ -300,6 +315,15 @@ function toggleStepDetails(toggle: HTMLElement): void {
     if (chevron) chevron.innerHTML = expanding ? ICONS.chevronDown : ICONS.chevronRight;
 }
 
+function withProcessBlockLayoutMutation(anchor: Element | null, mutate: () => void): void {
+    const hook = window.__jawProcessBlockLayoutMutation;
+    if (typeof hook === 'function') {
+        hook(anchor, mutate);
+        return;
+    }
+    mutate();
+}
+
 export function bindProcessBlockInteractions(root: HTMLElement): void {
     if (root.dataset['processBlockBound'] === '1') return;
     root.addEventListener('click', (event) => {
@@ -318,7 +342,9 @@ export function bindProcessBlockInteractions(root: HTMLElement): void {
 
         const stepToggle = target.closest('.process-step-toggle') as HTMLElement | null;
         if (stepToggle) {
-            toggleStepDetails(stepToggle);
+            withProcessBlockLayoutMutation(stepToggle.closest('.process-step, .process-block'), () => {
+                toggleStepDetails(stepToggle);
+            });
             return;
         }
 
@@ -326,11 +352,13 @@ export function bindProcessBlockInteractions(root: HTMLElement): void {
         if (summary) {
             const block = summary.closest('.process-block');
             if (!block) return;
-            const expanding = block.classList.contains('collapsed');
-            block.classList.toggle('collapsed', !expanding);
-            summary.setAttribute('aria-expanded', expanding ? 'true' : 'false');
-            const chevron = summary.querySelector('.process-chevron');
-            if (chevron) chevron.innerHTML = expanding ? ICONS.chevronDown : ICONS.chevronRight;
+            withProcessBlockLayoutMutation(block, () => {
+                const expanding = block.classList.contains('collapsed');
+                block.classList.toggle('collapsed', !expanding);
+                summary.setAttribute('aria-expanded', expanding ? 'true' : 'false');
+                const chevron = summary.querySelector('.process-chevron');
+                if (chevron) chevron.innerHTML = expanding ? ICONS.chevronDown : ICONS.chevronRight;
+            });
         }
     });
     root.dataset['processBlockBound'] = '1';

package/public/js/features/process-step-match.ts

@@ -4,7 +4,8 @@ export function findLegacyRunningMatch(steps: ProcessStep[], step: ProcessStep):
     const matches = steps.filter(s => s.status === 'running'
         && !s.stepRef
         && s.label === step.label
-        && s.type === step.type);
+        && s.type === step.type
+        && Boolean(s.isEmployee) === Boolean(step.isEmployee));
     return matches.length === 1 ? matches[0]! : null;
 }
 

package/public/js/ui.ts

@@ -42,6 +42,12 @@ interface MessageItem { role: string; content: string; tool_log?: string | null;
 interface QueuedOverlayItem { id: string; prompt: string; source?: string; ts?: number; }
 interface ActiveRunSnapshot { running?: boolean; cli?: string; text?: string; toolLog?: ToolLogEntry[]; startedAt?: number; }
 
+declare global {
+    interface Window {
+        __jawProcessBlockLayoutMutation?: (anchor: Element | null, mutate: () => void) => void;
+    }
+}
+
 function processStepType(toolType?: string): ProcessStep['type'] {
     return toolType === 'thinking' || toolType === 'search' || toolType === 'subagent'
         ? toolType
@@ -82,6 +88,7 @@ function toProcessSteps(tools: ToolLogEntry[], runStartedAt?: number): ProcessSt
         icon: tool.icon ? emojiToIcon(tool.icon) : ICONS.tool,
         rawIcon: tool.rawIcon || tool.icon || '',
         label: fallbackToolLabel(tool),
+        isEmployee: tool.isEmployee === true,
         type: processStepType(tool.toolType),
         detail: tool.detail || '',
         stepRef: tool.stepRef || '',
@@ -170,6 +177,7 @@ function processStepFromDom(row: HTMLElement): ProcessStep | null {
         icon: storedMeta?.icon || icon,
         rawIcon: storedMeta?.rawIcon,
         label: storedMeta?.label || label,
+        isEmployee: storedMeta?.isEmployee === true || row.dataset['isEmployee'] === 'true',
         detail,
         detailPreview: storedMeta?.preview,
         detailLength: storedMeta?.detailLength,
@@ -205,6 +213,7 @@ function processStepToToolLog(step: ProcessStep, finalize = false): ToolLogEntry
         icon: step.rawIcon || step.icon || ICONS.tool,
         rawIcon: step.rawIcon || step.icon || '',
         label: step.label || 'tool',
+        isEmployee: step.isEmployee === true,
         detail,
         toolType: step.type,
         stepRef: step.stepRef || '',
@@ -225,6 +234,7 @@ function processStepFromMeta(stepId: string, finalize = false): ToolLogEntry | n
         icon: meta.rawIcon || meta.icon || ICONS.tool,
         rawIcon: meta.rawIcon || meta.icon || '',
         label: meta.label || 'tool',
+        isEmployee: meta.isEmployee === true,
         detail: getStoredProcessStepDetail(stepId) || meta.preview || '',
         toolType: meta.type,
         stepRef: meta.stepRef || '',
@@ -473,6 +483,7 @@ export function showProcessStep(step: ProcessStep): void {
                 .find(s => s.status === 'running'
                     && s.label === step.label
                     && s.type === step.type
+                    && Boolean(s.isEmployee) === Boolean(step.isEmployee)
                     && !s.detail);
             if (ghost) {
                 replaceStep(state.currentProcessBlock, ghost.id, step);
@@ -762,19 +773,74 @@ export function addMessage(role: string, text: string, cli?: string | null): HTM
 
 let scrollRAF: number | null = null;
 let userNearBottom = true;
+type ScrollIntent = 'unknown' | 'following' | 'pinnedAway';
+let scrollIntent: ScrollIntent = 'unknown';
 let scrollTrackingBound = false;
 const SCROLL_BOTTOM_THRESHOLD = 80; // px
 const RESTORE_INDICATOR_SETTLE_MS = 1100;
 let chatRestoreIndicatorHideTimer: number | null = null;
+const chatRestorePassTimers = new Set<number>();
+const chatRestorePassRafs = new Set<number>();
+
+function canFollowAfterRestore(): boolean {
+    return scrollIntent !== 'pinnedAway';
+}
+
+function markFollowingBottom(): void {
+    userNearBottom = true;
+    scrollIntent = 'following';
+}
+
+function updateScrollIntentFromDistance(dist: number): void {
+    userNearBottom = dist < SCROLL_BOTTOM_THRESHOLD;
+    scrollIntent = userNearBottom ? 'following' : 'pinnedAway';
+    if (scrollIntent === 'pinnedAway') cancelPendingChatRestorePasses();
+}
+
+function cancelPendingChatRestorePasses(): void {
+    for (const timer of chatRestorePassTimers) window.clearTimeout(timer);
+    chatRestorePassTimers.clear();
+    for (const raf of chatRestorePassRafs) cancelAnimationFrame(raf);
+    chatRestorePassRafs.clear();
+}
+
+function requestChatRestoreFrame(callback: () => void): void {
+    const raf = requestAnimationFrame(() => {
+        chatRestorePassRafs.delete(raf);
+        callback();
+    });
+    chatRestorePassRafs.add(raf);
+}
+
+function trackChatRestoreTimer(timer: number): void {
+    chatRestorePassTimers.add(timer);
+}
+
+function scheduleChatRestoreTimer(callback: () => void, delayMs: number): void {
+    const timer = window.setTimeout(() => {
+        chatRestorePassTimers.delete(timer);
+        callback();
+    }, delayMs);
+    trackChatRestoreTimer(timer);
+}
 
 function ensureScrollTracking(): void {
+    getVirtualScroll().setRestoreFollowPredicate(canFollowAfterRestore);
+    window.__jawProcessBlockLayoutMutation = (anchor, mutate) => {
+        const vs = getVirtualScroll();
+        if (vs.active) {
+            vs.preserveScrollDuringMutation(anchor, mutate);
+            return;
+        }
+        mutate();
+    };
     if (scrollTrackingBound) return;
     const c = document.getElementById('chatMessages');
     if (!c) return;
     scrollTrackingBound = true;
     c.addEventListener('scroll', () => {
         const dist = c.scrollHeight - c.scrollTop - c.clientHeight;
-        userNearBottom = dist < SCROLL_BOTTOM_THRESHOLD;
+        updateScrollIntentFromDistance(dist);
     }, { passive: true });
 }
 
@@ -791,7 +857,7 @@ export function isChatNearBottom(): boolean {
 export function reconcileChatBottomAfterLayout(shouldFollow = isChatNearBottom()): void {
     ensureScrollTracking();
     if (!shouldFollow) return;
-    userNearBottom = true;
+    markFollowingBottom();
     const vs = getVirtualScroll();
     if (vs.active) {
         vs.reconcileBottomAfterLayout('reconnect', true);
@@ -847,22 +913,36 @@ export function reconcileChatBottomAfterRestore(reason: string): void {
     showChatRestoreIndicator(reason);
     hideChatRestoreIndicatorAfterSettle();
     ensureScrollTracking();
-    userNearBottom = true;
     const vs = getVirtualScroll();
     if (vs.active) {
-        vs.forceBottomAfterRestore(reason as RestoreReason);
+        vs.reconcileAfterRestore(reason as RestoreReason, canFollowAfterRestore);
         return;
     }
-    const scroll = () => {
+    if (!canFollowAfterRestore()) return;
+    const scrollIfFollowing = () => {
+        if (!canFollowAfterRestore()) {
+            cancelPendingChatRestorePasses();
+            return;
+        }
         const c = document.getElementById('chatMessages');
-        if (c) c.scrollTop = c.scrollHeight;
+        if (c) {
+            c.scrollTop = c.scrollHeight;
+            markFollowingBottom();
+        }
+    };
+    const runRestorePass = () => {
+        if (!canFollowAfterRestore()) {
+            cancelPendingChatRestorePasses();
+            return;
+        }
+        requestChatRestoreFrame(scrollIfFollowing);
     };
-    scroll();
-    requestAnimationFrame(scroll);
-    requestAnimationFrame(() => requestAnimationFrame(scroll));
-    window.setTimeout(scroll, 250);
-    window.setTimeout(scroll, 1000);
-    void document.fonts?.ready.then(scroll);
+    runRestorePass();
+    requestChatRestoreFrame(runRestorePass);
+    requestChatRestoreFrame(() => requestChatRestoreFrame(runRestorePass));
+    scheduleChatRestoreTimer(runRestorePass, 250);
+    scheduleChatRestoreTimer(runRestorePass, 1000);
+    void document.fonts?.ready.then(runRestorePass);
 }
 
 /** Scroll chat to bottom.
@@ -872,7 +952,7 @@ export function scrollToBottom(force = false): void {
     if (!force && !userNearBottom) return;
     // After force scroll, mark as near-bottom so subsequent
     // streaming chunks keep auto-scrolling until user scrolls up
-    if (force) userNearBottom = true;
+    if (force) markFollowingBottom();
 
     const vs = getVirtualScroll();
     if (vs.active) {
@@ -993,6 +1073,13 @@ function makeBootstrapDeps(
         setItems: (items, opts) => vs.setItems(items, opts),
         activateIfNeeded: (toBottom) => vs.activateIfNeeded(toBottom),
         scrollToBottom: () => vs.scrollToBottom(),
+        shouldFollowBottom: canFollowAfterRestore,
+        onBeforeVirtualHistoryBootstrap: () => {
+            ensureScrollTracking();
+        },
+        onAfterVirtualHistoryBottomed: () => {
+            markFollowingBottom();
+        },
     };
 }
 

package/public/js/virtual-scroll-bootstrap.ts

@@ -9,6 +9,9 @@ export interface VirtualHistoryBootstrapDeps {
     setItems: (items: VirtualItem[], options?: { autoActivate?: boolean; toBottom?: boolean }) => void;
     activateIfNeeded: (toBottom: boolean) => void;
     scrollToBottom: () => void;
+    shouldFollowBottom?: () => boolean;
+    onBeforeVirtualHistoryBootstrap?: () => void;
+    onAfterVirtualHistoryBottomed?: () => void;
 }
 
 /**
@@ -22,8 +25,12 @@ export function bootstrapVirtualHistory(
     items: VirtualItem[],
     deps: VirtualHistoryBootstrapDeps,
 ): void {
+    deps.onBeforeVirtualHistoryBootstrap?.();
     deps.registerCallbacks();
     deps.setItems(items, { autoActivate: false });
-    deps.activateIfNeeded(true);
+    const shouldFollowBottom = deps.shouldFollowBottom?.() ?? true;
+    deps.activateIfNeeded(shouldFollowBottom);
+    if (!shouldFollowBottom) return;
     deps.scrollToBottom();
+    deps.onAfterVirtualHistoryBottomed?.();
 }

package/public/js/virtual-scroll.ts

@@ -34,7 +34,12 @@ export interface VirtualItem {
 }
 
 export type LazyRenderCallback = (targets: HTMLElement[]) => void;
+export type RestoreFollowPredicate = () => boolean;
 type MeasurableVirtualElement = Pick<HTMLElement, 'getBoundingClientRect'>;
+interface ScrollAnchor {
+    el: HTMLElement;
+    top: number;
+}
 
 function readMeasuredHeight(el: MeasurableVirtualElement): number {
     const height = Math.ceil(el.getBoundingClientRect().height);
@@ -73,6 +78,7 @@ export class VirtualScroll {
     private mounted = new Map<number, HTMLElement>();
     private itemGap = 0;
     private restorePassTimers = new Set<number>();
+    private shouldFollowAfterRestore: RestoreFollowPredicate = () => true;
 
     onLazyRender: LazyRenderCallback | null = null;
     onPostRender: ((viewport: HTMLElement) => void) | null = null;
@@ -193,6 +199,10 @@ export class VirtualScroll {
         return dist < threshold;
     }
 
+    setRestoreFollowPredicate(predicate: RestoreFollowPredicate | null): void {
+        this.shouldFollowAfterRestore = predicate ?? (() => true);
+    }
+
     reconcileBottomAfterLayout(reason: RestoreReason, shouldFollow = this.isNearBottom()): void {
         if (!shouldFollow) return;
         void reason;
@@ -204,37 +214,98 @@ export class VirtualScroll {
         });
     }
 
+    reconcileAfterRestore(reason: RestoreReason, shouldFollow: RestoreFollowPredicate = this.shouldFollowAfterRestore): void {
+        if (!shouldFollow()) {
+            this.invalidateLayout();
+            return;
+        }
+        this.scheduleRestoreReconcile(reason, shouldFollow);
+    }
+
     forceBottomAfterRestore(reason: RestoreReason): void {
         this.scheduleRestoreReconcile(reason);
     }
 
-    private scheduleRestoreReconcile(reason: RestoreReason): void {
-        this.runRestoreReconcilePass(reason);
-        requestAnimationFrame(() => this.runRestoreReconcilePass(reason));
+    cancelRestoreReconcile(_reason?: RestoreReason): void {
+        this.clearRestoreTimers();
+    }
+
+    preserveScrollDuringMutation<T>(anchorEl: Element | null, mutate: () => T): T {
+        const wasNearBottom = this.isNearBottom();
+        const anchor = this.captureScrollAnchor(anchorEl);
+        const result = mutate();
+        this.invalidateLayout();
+        if (wasNearBottom) {
+            this.reconcileBottomAfterLayout('manual', true);
+            return result;
+        }
+        this.restoreScrollAnchor(anchor);
+        return result;
+    }
+
+    private scheduleRestoreReconcile(reason: RestoreReason, shouldFollow?: RestoreFollowPredicate): void {
+        this.runRestoreReconcilePass(reason, shouldFollow);
+        requestAnimationFrame(() => this.runRestoreReconcilePass(reason, shouldFollow));
         requestAnimationFrame(() => {
-            requestAnimationFrame(() => this.runRestoreReconcilePass(reason));
+            requestAnimationFrame(() => this.runRestoreReconcilePass(reason, shouldFollow));
         });
-        this.scheduleRestoreTimer(reason, 250);
-        this.scheduleRestoreTimer(reason, 1000);
-        void document.fonts?.ready.then(() => this.runRestoreReconcilePass(reason));
+        this.scheduleRestoreTimer(reason, 250, shouldFollow);
+        this.scheduleRestoreTimer(reason, 1000, shouldFollow);
+        void document.fonts?.ready.then(() => this.runRestoreReconcilePass(reason, shouldFollow));
     }
 
-    private scheduleRestoreTimer(reason: RestoreReason, delayMs: number): void {
+    private scheduleRestoreTimer(reason: RestoreReason, delayMs: number, shouldFollow?: RestoreFollowPredicate): void {
         const timer = window.setTimeout(() => {
             this.restorePassTimers.delete(timer);
-            this.runRestoreReconcilePass(reason);
+            this.runRestoreReconcilePass(reason, shouldFollow);
         }, delayMs);
         this.restorePassTimers.add(timer);
     }
 
-    private runRestoreReconcilePass(reason: RestoreReason): void {
+    private runRestoreReconcilePass(reason: RestoreReason, shouldFollow?: RestoreFollowPredicate): void {
         if (!this.virtualizer) return;
         void reason;
+        if (shouldFollow && !shouldFollow()) {
+            this.cancelRestoreReconcile(reason);
+            this.invalidateLayout();
+            return;
+        }
         this.invalidateLayout();
         remeasureMountedVirtualItems(this.items, this.mounted, this.virtualizer);
         this.scrollToBottom();
     }
 
+    private captureScrollAnchor(preferred: Element | null): ScrollAnchor | null {
+        const preferredEl = preferred instanceof HTMLElement ? preferred : null;
+        const chosen = preferredEl && this.isVisibleInContainer(preferredEl)
+            ? preferredEl
+            : this.firstVisibleMountedItem();
+        return chosen ? { el: chosen, top: chosen.getBoundingClientRect().top } : null;
+    }
+
+    private restoreScrollAnchor(anchor: ScrollAnchor | null): void {
+        if (!anchor || !anchor.el.isConnected) return;
+        const afterTop = anchor.el.getBoundingClientRect().top;
+        const delta = afterTop - anchor.top;
+        if (Number.isFinite(delta) && delta !== 0) {
+            this.container.scrollTop += delta;
+        }
+    }
+
+    private firstVisibleMountedItem(): HTMLElement | null {
+        const mounted = Array.from(this.mounted.entries()).sort(([a], [b]) => a - b);
+        for (const [, el] of mounted) {
+            if (this.isVisibleInContainer(el)) return el;
+        }
+        return null;
+    }
+
+    private isVisibleInContainer(el: HTMLElement): boolean {
+        const rect = el.getBoundingClientRect();
+        const containerRect = this.container.getBoundingClientRect();
+        return rect.bottom > containerRect.top && rect.top < containerRect.bottom;
+    }
+
     private clearRestoreTimers(): void {
         for (const timer of this.restorePassTimers) {
             window.clearTimeout(timer);
@@ -337,10 +408,9 @@ export class VirtualScroll {
 
         // ── Browser restore reconciliation ──
         // Resume/discard paths can restore stale virtualizer measurements.
-        // Product policy: browser restore/reconnect forces the newest message.
         const restoreBottomAfterLayout = (reason: RestoreReason) => {
             if (!this.virtualizer) return;
-            this.forceBottomAfterRestore(reason);
+            this.reconcileAfterRestore(reason, this.shouldFollowAfterRestore);
         };
         const onPageShow = (e: PageTransitionEvent) => {
             if (!e.persisted) return;
@@ -394,7 +464,7 @@ export class VirtualScroll {
         const wasDiscarded = 'wasDiscarded' in document
             && Boolean((document as Document & { wasDiscarded?: boolean }).wasDiscarded);
         if (wasDiscarded) {
-            this.forceBottomAfterRestore('discard');
+            restoreBottomAfterLayout('discard');
         }
     }
 

package/public/js/ws.ts

@@ -66,7 +66,7 @@ interface WsMessage {
     detailBytes?: number;
     rawRetentionStatus?: string;
     text?: string;
-    toolLog?: { icon: string; label: string; detail?: string; toolType?: string; stepRef?: string; traceRunId?: string; traceSeq?: number; detailAvailable?: boolean; detailBytes?: number; rawRetentionStatus?: string }[];
+    toolLog?: { icon: string; label: string; detail?: string; toolType?: string; stepRef?: string; isEmployee?: boolean; traceRunId?: string; traceSeq?: number; detailAvailable?: boolean; detailBytes?: number; rawRetentionStatus?: string }[];
     from?: string;
     to?: string;
     source?: string;
@@ -377,7 +377,6 @@ export function connect(): void {
                 addSystemMsg(t('ws.roundRetry', { round: msg.round || 0 }));
             }
         } else if (msg.type === 'agent_tool') {
-            const empPrefix = msg.isEmployee ? '(E) ' : '';
             const stepType = msg.toolType === 'thinking' ? 'thinking'
                 : msg.toolType === 'search' ? 'search'
                     : msg.toolType === 'subagent' ? 'subagent' : 'tool';
@@ -386,7 +385,8 @@ export function connect(): void {
                 type: stepType,
                 icon: msg.icon || ICONS.tool,
                 rawIcon: msg.rawIcon || msg.icon || '',
-                label: empPrefix + (msg.label || ''),
+                label: msg.label || '',
+                isEmployee: msg.isEmployee === true,
                 detail: msg.detail || '',
                 stepRef: msg.stepRef || '',
                 traceRunId: msg.traceRunId || '',

package/public/locales/en.json

@@ -141,7 +141,8 @@
     "chat.file.sentWithMsg": "\n\nUser message: {text}",
     "chat.file.uploadFail": "File upload failed: {msg}",
     "chat.requestFail": "Request failed ({status})",
-    "chat.continue": "Continuing from previous worklog.",
+    "chat.continue": "Continuing the current task.",
+    "chat.noPendingContinue": "No pending work to continue.",
     "chat.voice.label": "🎤 [Voice message]",
     "skill.loadFail": "Failed to load skills",
     "skill.count": "{active} active / {total} total",

package/public/locales/ja.json

@@ -141,7 +141,8 @@
     "chat.file.sentWithMsg": "\n\nユーザーメッセージ: {text}",
     "chat.file.uploadFail": "ファイルのアップロードに失敗しました: {msg}",
     "chat.requestFail": "リクエストに失敗しました（{status}）",
-    "chat.continue": "前回の worklog から続行しています。",
+    "chat.continue": "現在の作業を続行しています。",
+    "chat.noPendingContinue": "続行できる保留中の作業はありません。",
     "chat.voice.label": "🎤 [音声メッセージ]",
     "skill.loadFail": "スキルを読み込めませんでした",
     "skill.count": "有効 {active} 件 / 全 {total} 件",

package/public/locales/ko.json

@@ -141,7 +141,8 @@
     "chat.file.sentWithMsg": "\n\n사용자 메시지: {text}",
     "chat.file.uploadFail": "파일 업로드 실패: {msg}",
     "chat.requestFail": "요청 실패 ({status})",
-    "chat.continue": "이전 worklog 기준으로 이어서 진행합니다.",
+    "chat.continue": "현재 작업을 이어서 진행합니다.",
+    "chat.noPendingContinue": "이어갈 작업이 없습니다.",
     "chat.voice.label": "🎤 [음성 메시지]",
     "skill.loadFail": "스킬 로드 실패",
     "skill.count": "활성 {active}개 / 전체 {total}개",

package/public/locales/zh.json

@@ -141,7 +141,8 @@
     "chat.file.sentWithMsg": "\n\n用户消息：{text}",
     "chat.file.uploadFail": "文件上传失败：{msg}",
     "chat.requestFail": "请求失败（{status}）",
-    "chat.continue": "正在从上一个 worklog 继续。",
+    "chat.continue": "正在继续当前任务。",
+    "chat.noPendingContinue": "没有可继续的待处理工作。",
     "chat.voice.label": "🎤 [语音消息]",
     "skill.loadFail": "无法加载技能",
     "skill.count": "{active} 个启用 / 共 {total} 个",

package/public/manager/src/App.tsx

@@ -24,7 +24,7 @@ import { DashboardSettingsSidebar, type DashboardSettingsSection } from './dashb
 import { DashboardSettingsWorkspace } from './dashboard-settings/DashboardSettingsWorkspace';
 import { summarizeActivityTitleSupport } from './dashboard-settings/activity-title-support';
 import { dashboardSettingsUiFromView } from './dashboard-settings/dashboard-settings-ui';
-import { NotesSidebar } from './notes/NotesSidebar';
+import { NotesSidebar, type NotesSidebarMode } from './notes/NotesSidebar';
 import { NotesWorkspace } from './notes/NotesWorkspace';
 import { useNotesModel } from './notes/useNotesModel';
 import { publishInvalidation } from './sync/invalidation-bus';
@@ -84,6 +84,8 @@ export function App() {
     const [activeProfileIds, setActiveProfileIds] = useState<string[]>([]);
     const [settingsDirty, setSettingsDirty] = useState(false);
     const [notesDirtyPath, setNotesDirtyPath] = useState<string | null>(null);
+    const [notesSidebarMode, setNotesSidebarMode] = useState<NotesSidebarMode>('files');
+    const [notesSearchFocusToken, setNotesSearchFocusToken] = useState(0);
     const [dashboardSettingsSection, setDashboardSettingsSection] = useState<DashboardSettingsSection>('display');
     const [boardView, setBoardView] = useState<BoardView>({ kind: 'overall' });
     const [scheduleGroup, setScheduleGroup] = useState<ScheduleGroup>('today');
@@ -341,6 +343,11 @@ export function App() {
         view.setNotesSelectedPath(path); void saveUi({ notesSelectedPath: path });
     }
 
+    function openNotesSidebarSearch(): void {
+        setNotesSidebarMode('search');
+        setNotesSearchFocusToken(token => token + 1);
+    }
+
     function handleNotesViewModeChange(mode: DashboardNotesViewMode): void {
         view.setNotesViewMode(mode); void saveUi({ notesViewMode: mode });
     }
@@ -517,7 +524,7 @@ export function App() {
                                     {view.sidebarMode === 'settings' ? (
                                         <DashboardSettingsSidebar activeSection={dashboardSettingsSection} locale={view.locale} onSectionChange={setDashboardSettingsSection} />
                                     ) : view.sidebarMode === 'notes' ? (
-                                        <NotesSidebar tree={notesModel.tree} loading={notesModel.loading} error={notesModel.error} notesRoot={notesModel.notesRoot} selectedPath={view.notesSelectedPath} dirtyPath={notesDirtyPath} treeWidth={view.notesTreeWidth} onSelectedPathChange={handleNotesSelectedPathChange} onRefreshTree={notesModel.refresh} />
+                                        <NotesSidebar tree={notesModel.tree} loading={notesModel.loading} error={notesModel.error} notesRoot={notesModel.notesRoot} selectedPath={view.notesSelectedPath} dirtyPath={notesDirtyPath} treeWidth={view.notesTreeWidth} mode={notesSidebarMode} searchFocusToken={notesSearchFocusToken} onModeChange={setNotesSidebarMode} onOpenSearch={openNotesSidebarSearch} onSelectedPathChange={handleNotesSelectedPathChange} onRefreshTree={notesModel.refresh} />
                                     ) : view.sidebarMode === 'board' ? (
                                         <DashboardBoardSidebar view={boardView} onViewChange={setBoardView} instances={instances} titlesByPort={messageActivity.titlesByPort} busyPorts={messageActivity.busyPorts} />
                                     ) : SCHEDULE_WORKSPACE_ENABLED && view.sidebarMode === 'schedule' ? (
@@ -552,7 +559,7 @@ export function App() {
                                         )} logs={detailContent('logs')} settings={detailContent('settings')} />
                                     </WorkspaceSurface>
                                     <WorkspaceSurface active={view.sidebarMode === 'notes'}>
-                                        <NotesWorkspace active={view.sidebarMode === 'notes'} selectedPath={view.notesSelectedPath} vaultIndex={notesModel.index} viewMode={view.notesViewMode} authoringMode={view.notesAuthoringMode} wordWrap={view.notesWordWrap} treeWidth={view.notesTreeWidth} onSelectedPathChange={handleNotesSelectedPathChange} onDirtyPathChange={setNotesDirtyPath} onViewModeChange={handleNotesViewModeChange} onAuthoringModeChange={handleNotesAuthoringModeChange} onWordWrapChange={handleNotesWordWrapChange} onTreeWidthChange={handleNotesTreeWidthChange} />
+                                        <NotesWorkspace active={view.sidebarMode === 'notes'} selectedPath={view.notesSelectedPath} vaultIndex={notesModel.index} viewMode={view.notesViewMode} authoringMode={view.notesAuthoringMode} wordWrap={view.notesWordWrap} treeWidth={view.notesTreeWidth} onOpenSidebarSearch={openNotesSidebarSearch} onSelectedPathChange={handleNotesSelectedPathChange} onDirtyPathChange={setNotesDirtyPath} onViewModeChange={handleNotesViewModeChange} onAuthoringModeChange={handleNotesAuthoringModeChange} onWordWrapChange={handleNotesWordWrapChange} onTreeWidthChange={handleNotesTreeWidthChange} />
                                     </WorkspaceSurface>
                                     <WorkspaceSurface active={view.sidebarMode === 'settings'}>
                                         <DashboardSettingsWorkspace activeSection={dashboardSettingsSection} ui={dashboardSettingsUi} titleSupport={titleSupport} onUiPatch={handleDashboardSettingsPatch} />