@dotdrelle/wiki-manager 0.14.12 → 0.14.16

package/src/shell/repl.test.js

@@ -5,7 +5,6 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import {
   applyRuntimeStateToShellSession,
-  appendRuntimePlanCompletionMessages,
   chatReadTools,
   createSession,
   runHeadlessChatTurn,
@@ -20,8 +19,109 @@ import {
   shouldHandleFreeTextLocally,
   submitRuntimeRun,
 } from './repl.js';
+import { readFile } from 'node:fs/promises';
 import { httpLinkParts, wrapHttpLinks } from './externalLinks.js';
 
+test('ShellUI inserts StyledText as a child instead of stringifying it through content', async () => {
+  const source = await readFile(new URL('./LeftPane.tsx', import.meta.url), 'utf8');
+  assert.doesNotMatch(source, /content=\{styledSegments\(/);
+  assert.match(source, /<text[^>]*>\{styledSegments\(line\.segments\)\}<\/text>/);
+});
+
+test('ShellUI renders the user header full-width before constraining only its body', async () => {
+  const source = await readFile(new URL('./LeftPane.tsx', import.meta.url), 'utf8');
+  const headerBranch = source.indexOf("line.copyContent !== undefined ? (");
+  const userBodyBranch = source.indexOf("line.role === 'user' && line.userBubbleWidth ? (", headerBranch);
+  assert.ok(headerBranch >= 0 && userBodyBranch > headerBranch);
+  assert.match(source, /const userBubbleWidth = message\.role === 'user'/);
+  assert.match(source, /Math\.floor\(columns \* 0\.6\)/);
+  assert.doesNotMatch(source, /Math\.floor\(columns \* 0\.5\)/);
+  assert.match(source.slice(userBodyBranch), /width=\{line\.userBubbleWidth\}/);
+  assert.match(source.slice(userBodyBranch), /justifyContent="flex-start"/);
+  assert.doesNotMatch(source.slice(userBodyBranch, source.indexOf(') : line.status ?', userBodyBranch)), /#12263A/);
+  assert.doesNotMatch(source, /messageHeaderSegments\(message\.role, contentColumns\)/);
+  assert.match(source, /messageHeaderSegments\(message\.role, columns\)/);
+});
+
+test('ShellUI renders newest-first order in both Runtime and Agent status', async () => {
+  const source = await readFile(new URL('./RightPane.tsx', import.meta.url), 'utf8');
+  const filteredLogs = source.slice(
+    source.indexOf('const filteredLogs ='),
+    source.indexOf('const allLines ='),
+  );
+  assert.match(filteredLogs, /activeLogTab\(\) === 'agent-status'/);
+  assert.match(filteredLogs, /isAgentStatus\(line\)/);
+  assert.doesNotMatch(filteredLogs, /\.reverse\(\)/);
+  const renderedLogs = source.slice(
+    source.indexOf('function logRenderLines'),
+    source.indexOf('function logEntryLines'),
+  );
+  assert.match(renderedLogs, /return blocks\.reverse\(\)\.flat\(\)/);
+});
+
+test('Activity uses only visible jobs and leaves remaining height to Flow/Trace', async () => {
+  const source = await readFile(new URL('./RightPane.tsx', import.meta.url), 'utf8');
+  const activityPanel = source.slice(
+    source.indexOf('export function ActivityPanel'),
+    source.indexOf('type LogSegment'),
+  );
+  assert.match(activityPanel, /<Index each=\{visibleSlots\(\)\}>/);
+  assert.doesNotMatch(activityPanel, /<Index each=\{ACTIVITY_SLOTS\}>/);
+  assert.match(activityPanel, /paddingX=\{1\}/);
+  assert.doesNotMatch(activityPanel, /updatedLine\(activity\(\)\)/);
+  assert.doesNotMatch(activityPanel, /marginTop=/);
+  const logPanel = source.slice(
+    source.indexOf('export function LogPanel'),
+    source.indexOf('export function QueuePanel'),
+  );
+  assert.doesNotMatch(logPanel, /marginTop=\{1\}/);
+  assert.match(activityPanel, /wrapLine\(activityDetailText\(item\), lineWidth\(\)\)\.slice\(0, 2\)/);
+  assert.match(source, /`Task \$\{Math\.max\(1, taskIndex\)\}\/\$\{taskTotal\}`/);
+  assert.match(source, /`Step \$\{Math\.max\(1, stepIndex\)\}\/\$\{stepTotal\}`/);
+  assert.match(source, /`Batch \$\{Math\.min\(batchCount, Math\.max\(1, batchIndex \+ 1\)\)\}\/\$\{batchCount\}`/);
+  assert.match(source, /instructionCount/);
+  assert.match(source, /stabilizeKept/);
+});
+
+test('ShellUI launcher never starts agents or workspace services implicitly', async () => {
+  const tui = await readFile(new URL('./tui.tsx', import.meta.url), 'utf8');
+  const startup = await readFile(new URL('./StartupScreen.tsx', import.meta.url), 'utf8');
+  assert.doesNotMatch(tui, /submitInput\('\/start (?:agents|agent|all)'\)/);
+  assert.doesNotMatch(startup, /start-services|Start services|start agents and services/i);
+  assert.doesNotMatch(startup, /open-logs|Open diagnostics/i);
+  assert.match(startup, /Select and load a workspace/);
+});
+
+test('ShellUI lets the right pane extend to the terminal edge', async () => {
+  const tui = await readFile(new URL('./tui.tsx', import.meta.url), 'utf8');
+  const pane = await readFile(new URL('./RightPane.tsx', import.meta.url), 'utf8');
+  assert.match(tui, /Math\.min\(58, Math\.floor\(width \* 0\.38\) \+ 2\)/);
+  assert.match(pane, /paddingLeft=\{1\}/);
+  assert.doesNotMatch(pane, /height="100%" flexDirection="column" padding=\{1\}/);
+});
+
+test('Flow/Trace does not repeat the runtime source prefix on every line', async () => {
+  const source = await readFile(new URL('./RightPane.tsx', import.meta.url), 'utf8');
+  const entryRenderer = source.slice(
+    source.indexOf('function logEntryLines'),
+    source.indexOf('export function LogPanel'),
+  );
+  assert.match(entryRenderer, /sourceMatch/);
+  assert.doesNotMatch(entryRenderer, /prefix\.push\(\{ text: `\$\{source\}/);
+  assert.match(entryRenderer, /prefix\.push\(\{ text: `\$\{parts\.time\} /);
+});
+
+test('runtime logs have a separator and a concise Runtime tab label', async () => {
+  const source = await readFile(new URL('./RightPane.tsx', import.meta.url), 'utf8');
+  const logPanel = source.slice(
+    source.indexOf('export function LogPanel'),
+    source.indexOf('export function QueuePanel'),
+  );
+  assert.match(logPanel, /content=\{'─'\.repeat\(lineWidth\(\)\)\}/);
+  assert.match(logPanel, /content=" Runtime "/);
+  assert.doesNotMatch(logPanel, /Flow \/ Trace/);
+});
+
 test('ShellUI turns HTTP URLs into valid links without trailing punctuation', () => {
   assert.deepEqual(httpLinkParts('Voir https://example.test/docs?q=ok.'), [
     { text: 'Voir ' },
@@ -47,6 +147,16 @@ test('ShellUI leaves malformed URLs as plain text', () => {
   assert.deepEqual(httpLinkParts('Erreur: https://'), [{ text: 'Erreur: https://' }]);
 });
 
+test('ShellUI preserves every URL when several links share one line', () => {
+  const links = wrapHttpLinks('Docs https://one.example/a puis https://two.example/b', 80)
+    .flat()
+    .filter((part) => part.url);
+  assert.deepEqual(links, [
+    { text: '[link: one.example]', url: 'https://one.example/a' },
+    { text: '[link: two.example]', url: 'https://two.example/b' },
+  ]);
+});
+
 test('runtime display preserves a failed plan and its diagnostic evidence', () => {
   const state = {
     status: 'error',
@@ -59,7 +169,7 @@ test('runtime display preserves a failed plan and its diagnostic evidence', () =
   assert.equal(sanitizeRuntimeStateForDisplay(state), state);
 });
 
-test('runtime display still clears completed historical execution state', () => {
+test('runtime display preserves completed plan and logs for post-run inspection', () => {
   const display = sanitizeRuntimeStateForDisplay({
     status: 'done',
     plan: [{ id: 'old', status: 'done' }],
@@ -68,10 +178,10 @@ test('runtime display still clears completed historical execution state', () =>
     conversation: [{ role: 'assistant', content: 'Old run.' }],
   });
 
-  assert.deepEqual(display.plan, []);
-  assert.deepEqual(display.activities, []);
-  assert.deepEqual(display.logs, []);
-  assert.deepEqual(display.conversation, []);
+  assert.deepEqual(display.plan, [{ id: 'old', status: 'done' }]);
+  assert.deepEqual(display.activities, [{ id: 'old-job', status: 'done' }]);
+  assert.deepEqual(display.logs, ['old log']);
+  assert.deepEqual(display.conversation, [{ role: 'assistant', content: 'Old run.' }]);
 });
 
 function stubFetch(handler) {
@@ -133,7 +243,7 @@ test('applyRuntimeStateToShellSession projects runtime state into shell session'
   assert.deepEqual(conversationMessages(session), []);
 });
 
-test('applyRuntimeStateToShellSession clears terminal plan and activities when runtime is idle', () => {
+test('applyRuntimeStateToShellSession preserves terminal diagnostics when runtime is idle', () => {
   const session = createSession();
   session.headlessPlan = [{ step: 1, description: 'Old read', status: 'failed' }];
   session.activities = { old: { key: 'old', status: 'failed', terminal: true } };
@@ -150,17 +260,17 @@ test('applyRuntimeStateToShellSession clears terminal plan and activities when r
     planPatches: [{ id: 'old-patch' }],
   });
 
-  assert.equal(session.headlessPlan, null);
-  assert.deepEqual(session.activities, {});
-  assert.equal(session.workflow, null);
-  assert.deepEqual(session.agentProjection.logs, []);
-  assert.equal(session.agentProjection.summary, null);
-  assert.deepEqual(session.agentProjection.conversation, []);
-  assert.deepEqual(session.agentProjection.chain, []);
-  assert.deepEqual(session.agentProjection.planPatches, []);
+  assert.deepEqual(session.headlessPlan, [{ step: 1, description: 'Old read', status: 'failed' }]);
+  assert.deepEqual(session.activities, { old: { key: 'old', status: 'failed', terminal: true } });
+  assert.deepEqual(session.workflow.nodes, [{ id: 'task:old' }]);
+  assert.deepEqual(session.agentProjection.logs, ['Runtime evaluator rejected the old run']);
+  assert.equal(session.agentProjection.summary, 'Old run failed');
+  assert.deepEqual(session.agentProjection.conversation, [{ role: 'assistant', content: 'Old failed answer' }]);
+  assert.deepEqual(session.agentProjection.chain, [{ id: 'old-step' }]);
+  assert.deepEqual(session.agentProjection.planPatches, [{ id: 'old-patch' }]);
 });
 
-test('runtime plan completion is appended once to the ShellUI conversation', () => {
+test('legacy runtime sync does not synthesize per-job or canned completion messages', () => {
   const session = createSession();
   applyRuntimeStateToShellSession(session, {
     runId: 'run-1',
@@ -178,27 +288,7 @@ test('runtime plan completion is appended once to the ShellUI conversation', ()
     plan: [{ id: 'build', label: 'Build documentation', status: 'done' }],
   });
 
-  assert.deepEqual(conversationMessages(session), [{
-    role: 'command',
-    content: '✓ Job terminé : Build documentation\nStatus: done',
-  }]);
-});
-
-test('runtime plan failure includes its available error description', () => {
-  const session = createSession();
-  appendRuntimePlanCompletionMessages(session, {
-    runId: 'run-2',
-    plan: [{ id: 'ingest', description: 'Ingest pages', status: 'running' }],
-  });
-  appendRuntimePlanCompletionMessages(session, {
-    runId: 'run-2',
-    plan: [{ id: 'ingest', description: 'Ingest pages', status: 'failed', result: { error: { message: 'Index unavailable' } } }],
-  });
-
-  assert.deepEqual(conversationMessages(session), [{
-    role: 'command',
-    content: '✗ Job terminé en erreur : Ingest pages\nStatus: failed\nErreur: Index unavailable',
-  }]);
+  assert.deepEqual(conversationMessages(session), []);
 });
 
 test('direct chat system prompt forbids unsolicited next steps', async () => {
@@ -312,7 +402,7 @@ test('/agent <question> submits one runtime request and remains in chat mode', a
     assert.equal(session.chatMode, true);
     assert.equal(result.oneShotAgent, true);
     assert.equal(result.runtimeOutcome.kind, 'accepted');
-    assert.deepEqual(conversationMessages(session), [{ role: 'user', content: 'lance ingestion' }]);
+    assert.deepEqual(conversationMessages(session), [{ role: 'user', content: 'lance ingestion', _pending: true }]);
   } finally {
     restore();
   }

package/src/shell/tui.tsx

@@ -12,7 +12,6 @@ import { useSession } from './useSession';
 import { buildMcpStatus } from '../core/mcp.js';
 import { loadWikircProfile, summarizeWikircConfig } from '../core/wikirc.js';
 import { listWorkspaces } from '../core/workspaces.js';
-import { postRuntimeShutdown } from '../runtime/client.js';
 import { runPreflightChecks, withRuntimePreflight } from '../core/startupCheck.js';
 
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
@@ -30,11 +29,13 @@ function emptyStartupInfo(version: string, workspace: { name: string } | null, w
   };
 }
 
-function startupInfo(packageJson: Record<string, unknown>) {
+function startupInfo(packageJson: Record<string, unknown>, preferredWorkspaceName?: string | null) {
   // listWorkspaces() order is filesystem-dependent (readdirSync), not stable —
   // sort so "the default workspace" is deterministic across runs/platforms.
   const workspaces = [...listWorkspaces()].sort((a, b) => a.name.localeCompare(b.name));
-  const workspace = workspaces[0] ?? null;
+  const workspace = preferredWorkspaceName
+    ? workspaces.find((item) => item.name === preferredWorkspaceName) ?? null
+    : workspaces[0] ?? null;
   const version = String(packageJson.version ?? '');
   if (!workspace) return emptyStartupInfo(version, null, []);
 
@@ -75,7 +76,11 @@ function startupInfo(packageJson: Record<string, unknown>) {
 
 function copyToClipboard(text: string, renderer: unknown) {
   try {
-    if ((renderer as any).copyToClipboardOSC52?.(text)) return true;
+    const osc52 = (renderer as any).copyToClipboardOSC52;
+    if (typeof osc52 === 'function') {
+      osc52.call(renderer, text);
+      return true;
+    }
   } catch {
     // Fall through to platform clipboard tools.
   }
@@ -105,11 +110,16 @@ function App(props: {
   packageJson: Record<string, unknown>;
   runtime?: any;
   preflight?: any;
+  initialWorkspaceName?: string | null;
+  // Shared handle the shell awaits after onDestroy resolves. One ref instead of
+  // two same-named `exitTask` bindings wired through a setter callback.
+  exitRef?: { current: Promise<void> };
 }) {
   const renderer = useRenderer();
   const dimensions = useTerminalDimensions();
   const [spinnerIndex, setSpinnerIndex] = createSignal(0);
   const [exitHint, setExitHint] = createSignal(false);
+  const [exitStatus, setExitStatus] = createSignal<string | null>(null);
   const [copyHint, setCopyHint] = createSignal<string | null>(null);
   const [chatInputHeight, setChatInputHeight] = createSignal(3);
   const [startupKeyboardEvent, setStartupKeyboardEvent] = createSignal<{ id: number; key: any } | null>(null);
@@ -128,7 +138,12 @@ function App(props: {
   const exitShell = () => {
     if (exiting) return;
     exiting = true;
-    void (async () => {
+    setExitStatus('Fermeture enclenchée…');
+    // Register the complete shutdown before destroying the renderer: onDestroy
+    // resolves runOpenTuiShell, which must still await this cleanup task.
+    const task = Promise.resolve().then(async () => {
+      renderer.destroy();
+      console.log('[wiki-manager] fermeture enclenchée — nettoyage en cours…');
       const messages: string[] = [];
       try {
         if (props.runtime?.url) {
@@ -138,25 +153,25 @@ function App(props: {
       } catch {
         // Best effort: never block the exit on runtime cleanup.
       }
-      renderer.destroy();
-      // Print AFTER destroy so the note survives on the restored terminal.
       for (const message of messages) console.log(`[wiki-manager] ${message}`);
-    })();
+      console.log('[wiki-manager] fermeture terminée — shell clos proprement.');
+    });
+    if (props.exitRef) props.exitRef.current = task;
   };
   let copyHintTimer: ReturnType<typeof setTimeout> | null = null;
   let selectionCopyTimer: ReturnType<typeof setTimeout> | null = null;
   let startupKeyboardEventId = 0;
   let lastCopiedSelection = '';
-  let runtimeShutdownRequested = false;
   const state = useSession(props);
-  const startup = createMemo(() => startupInfo(props.packageJson));
+  const startup = createMemo(() => startupInfo(props.packageJson, props.initialWorkspaceName));
   const conversationRows = createMemo(() => Math.max(4, dimensions().height - 5 - chatInputHeight()));
   const rightColumns = createMemo(() => {
     const width = dimensions().width;
-    // 38% / cap 56 (was 32% / cap 44): the Plan/Activity/Logs panes carry job
+    // 38% + 2 columns / cap 58: the Plan/Activity/Logs panes carry job
     // labels, file names and error messages — 40 columns truncated everything
-    // into unreadable stubs.
-    return Math.max(30, Math.min(56, Math.floor(width * 0.38)));
+    // into unreadable stubs. The small addition uses the terminal's right-side
+    // slack without making the conversation pane noticeably narrower.
+    return Math.max(32, Math.min(58, Math.floor(width * 0.38) + 2));
   });
   const leftColumns = createMemo(() => Math.max(32, dimensions().width - rightColumns() - 1));
   const conversationColumns = createMemo(() => {
@@ -187,7 +202,7 @@ function App(props: {
   // decide *which* workspace to load must re-read current state directly
   // (startupInfo(...)) rather than trust the frozen memo, the same way
   // closeSetup() already does.
-  const loadDefaultWorkspace = async () => loadWorkspace(startupInfo(props.packageJson).workspaceName);
+  const loadDefaultWorkspace = async () => loadWorkspace(startupInfo(props.packageJson, props.initialWorkspaceName).workspaceName);
 
   // The canonical status is the first useful view after entering ShellUI.
   // Run it only after /use has established the workspace so config, services,
@@ -196,18 +211,6 @@ function App(props: {
     if (workspaceLoaded) await state.submitInput('/status');
   };
 
-  // "Open a workspace" is really one composite action (load it, then bring
-  // its services up) — named here so it has one definition instead of being
-  // inlined as three sequential submitInput calls in openAction.
-  const openWorkspaceAndStartServices = async (workspaceName?: string | null) => {
-    const loaded = await loadWorkspace(workspaceName);
-    if (loaded) {
-      await state.submitInput('/start agents');
-      await state.submitInput('/start all');
-    }
-    return loaded;
-  };
-
   const refreshPreflight = async () => {
     setPreflightBusy(true);
     try {
@@ -227,37 +230,11 @@ function App(props: {
       void refreshPreflight();
       return;
     }
-    if (action === 'start-services') {
-      void (async () => {
-        setPreflightBusy(true);
-        try {
-          await openWorkspaceAndStartServices(workspaceName ?? startupInfo(props.packageJson).workspaceName);
-          const next = await runPreflightChecks();
-          setPreflight(withRuntimePreflight(next, props.runtime));
-        } finally {
-          setPreflightBusy(false);
-        }
-      })();
-      return;
-    }
-    if (action === 'open-logs') {
-      setScreen('main');
-      void (async () => {
-        const loaded = await loadDefaultWorkspace();
-        if (!loaded) return;
-        const containerCheck = preflight().checks?.find((check: any) => check.kind === 'containers');
-        const service = containerCheck?.context?.unavailable?.[0];
-        if (service) await state.submitInput(`/logs ${service} 120`);
-        else await state.submitInput('/services');
-        await state.submitInput('/mcp status');
-      })();
-      return;
-    }
     setScreen('main');
     void (async () => {
       try {
         if (action === 'open-workspace') {
-          const loaded = await openWorkspaceAndStartServices(workspaceName ?? startupInfo(props.packageJson).workspaceName);
+          const loaded = await loadWorkspace(workspaceName ?? startupInfo(props.packageJson, props.initialWorkspaceName).workspaceName);
           await showDefaultStatus(loaded);
         } else if (action === 'new-conversation' || action === 'run-workflow') {
           const loaded = await loadDefaultWorkspace();
@@ -275,7 +252,7 @@ function App(props: {
   };
 
   const closeSetup = () => {
-    const info = startupInfo(props.packageJson);
+    const info = startupInfo(props.packageJson, props.initialWorkspaceName);
     if (!info.hasWorkspace) {
       setScreen('startup');
       return;
@@ -307,10 +284,6 @@ function App(props: {
   onCleanup(() => {
     if (copyHintTimer) clearTimeout(copyHintTimer);
     if (selectionCopyTimer) clearTimeout(selectionCopyTimer);
-    if (props.runtime?.url && !runtimeShutdownRequested) {
-      runtimeShutdownRequested = true;
-      void postRuntimeShutdown({ url: props.runtime.url }).catch(() => {});
-    }
   });
 
   const spinnerTimer = setInterval(() => {
@@ -358,17 +331,24 @@ function App(props: {
     if (keyName === 'tab') state.completeSelected();
     if (keyName === 'pageup') state.scrollConversation(conversationRows());
     else if (keyName === 'pagedown') state.scrollConversation(-conversationRows());
-    if (keyName === 'up' && state.slash()) state.moveCompletion(-1);
-    else if (keyName === 'down' && state.slash()) state.moveCompletion(1);
-    else if (keyName === 'up' && !state.input().includes('\n')) state.historyUp();
-    else if (keyName === 'down' && !state.input().includes('\n')) state.historyDown();
-    else if (keyName === 'escape') {
+    if ((keyName === 'up' || keyName === 'down') && (state.slash() || !state.input().includes('\n'))) {
+      // The Plan scrollbox also listens to global arrow keys. Consume arrows
+      // handled by the chat input so one key press cannot move both widgets.
+      key.preventDefault?.();
+      key.stopPropagation?.();
+      if (state.slash()) state.moveCompletion(keyName === 'up' ? -1 : 1);
+      else if (keyName === 'up') state.historyUp();
+      else state.historyDown();
+      return;
+    }
+    if (keyName === 'escape') {
       if (state.slash()) state.dismissSlash();
       else state.setInput('');
     }
   });
 
   const hintLine = () => {
+    if (exitStatus()) return exitStatus();
     if (copyHint()) return copyHint();
     if (exitHint()) return 'Press Ctrl+C again to exit.';
     if (state.runtimeHint()) return state.runtimeHint();
@@ -416,6 +396,8 @@ function App(props: {
             queueInfo={state.queueInfo()}
             activeTab={state.rightTab()}
             logFilter={state.runtimeLogFilter()}
+            pendingApprovals={state.pendingApprovals()}
+            onApprove={() => { void state.submitInput('/approve'); }}
             onTabClick={state.selectRightTab}
           />
           <SlashDialog context={state.activeEditor() ? null : state.slash()} />
@@ -467,20 +449,33 @@ export async function runOpenTuiShell({
   packageJson,
   runtime = null,
   preflight = null,
+  initialWorkspaceName = null,
 }: {
   agent: unknown;
   packageJson: Record<string, unknown>;
   runtime?: any;
   preflight?: any;
+  initialWorkspaceName?: string | null;
 }) {
+  const exitRef = { current: Promise.resolve() as Promise<void> };
   await new Promise<void>((resolve, reject) => {
-    render(() => <App agent={agent} packageJson={packageJson} runtime={runtime} preflight={preflight} />, {
+    render(() => (
+      <App
+        agent={agent}
+        packageJson={packageJson}
+        runtime={runtime}
+        preflight={preflight}
+        initialWorkspaceName={initialWorkspaceName}
+        exitRef={exitRef}
+      />
+    ), {
       exitOnCtrlC: false,
       useMouse: true,
       targetFps: 30,
       onDestroy: resolve,
     }).catch(reject);
   });
+  await exitRef.current;
   return {};
 }
 

package/src/shell/useSession.ts

@@ -329,6 +329,11 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     const tagged = filterRuntimeLogs(runtimeLogs.map((line: any) => `runtime ${String(line)}`), filter);
     return [...logs(), ...tagged];
   });
+  const pendingApprovals = createMemo(() => {
+    version();
+    return (Array.isArray(runtimeState()?.approvals) ? runtimeState().approvals : [])
+      .filter((approval: any) => approval.status === 'pending_approval');
+  });
 
   // Index-aligned with each workspace's runtimeConversation array — not just
   // a length count. The server sometimes finalizes a streaming placeholder
@@ -379,16 +384,23 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
         continue;
       }
       if (role === 'user') {
-        // The user's own message was already pushed optimistically (see
-        // useAgent.ts) and marked _pending — confirm that entry instead of
-        // adding a second copy. No matching pending entry (e.g. history
-        // restored after a fresh reconnect) falls through to a normal push.
+        // The user's own message was already pushed optimistically — either
+        // marked _pending (web / runtime-submit path, useAgent.ts) OR as a plain
+        // entry by the interactive agent turn (repl.js runAgentTurn) that then
+        // delegated. Adopt whichever already exists instead of appending a
+        // second identical copy (the delegation seeds the run with the same
+        // objective, which comes back through this merge).
         const pendingIndex = target.findIndex((entry: any) => entry._pending && entry.role === 'user' && entry.content === content);
         if (pendingIndex !== -1) {
           delete target[pendingIndex]._pending;
           backed.push(target[pendingIndex]);
           continue;
         }
+        const localIndex = target.findIndex((entry: any) => entry.role === 'user' && entry.content === content && !backed.includes(entry));
+        if (localIndex !== -1) {
+          backed.push(target[localIndex]);
+          continue;
+        }
       }
       const entry = { role, content };
       target.push(entry);
@@ -397,19 +409,37 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
   }
 
   function syncRuntimeState() {
-    void fetchRuntimeState({ url: props.runtime.url, workspace: (session as any).workspace ?? null })
+    const workspace = (session as any).workspace ?? null;
+    const workspaceKey = workspace ?? '__global__';
+    if (runtimeSyncInFlight.has(workspaceKey)) return;
+    runtimeSyncInFlight.add(workspaceKey);
+    void fetchRuntimeState({ url: props.runtime.url, workspace })
       .then((state) => {
+        if (((session as any).workspace ?? null) !== workspace) return;
         const displayState = sanitizeRuntimeStateForDisplay(state);
         setRuntimeState(displayState);
+        // The per-job "Job terminé" lines and the canned plan summary are gone:
+        // the runtime now emits ONE natural-language Donna message at completion
+        // (see announceRunOutcome in runner.js), which arrives through the
+        // conversation merge below. Detect that the chat grew to keep the
+        // welcome-hidden / scroll-to-latest behavior.
+        const beforeLength = conversationMessages(session).length;
         mergeRuntimeConversation(displayState);
+        if (conversationMessages(session).length > beforeLength) {
+          setShowWelcome(false);
+          setConversationScroll(0);
+        }
         setRuntimeStatus('connected');
         refresh();
       })
       .catch(() => {
+        if (((session as any).workspace ?? null) !== workspace) return;
         setRuntimeStatus('disconnected');
         refresh();
-      });
+      })
+      .finally(() => { runtimeSyncInFlight.delete(workspaceKey); });
   }
+  const runtimeSyncInFlight = new Set<string>();
   let runtimeStreamAbort: AbortController | null = null;
   let runtimeSyncDebounce: ReturnType<typeof setTimeout> | null = null;
   let runtimeReconnectTimer: ReturnType<typeof setTimeout> | null = null;
@@ -446,6 +476,13 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     void subscribeRuntimeEvents();
   }
 
+  // Safety net only — the SSE stream (subscribeRuntimeEvents) is the primary
+  // sync path and already debounces on every agent_event. This just catches
+  // a missed/dropped event, so it can poll far less often than that.
+  const runtimeCompletionWatchdog = setInterval(() => {
+    if (props.runtime?.url && runtimeRunStatus() === 'running') syncRuntimeState();
+  }, 10000);
+
   let currentRuntimeWorkspace = (session as any).workspace ?? null;
   function resyncRuntimeWorkspaceIfChanged() {
     const workspace = (session as any).workspace ?? null;
@@ -466,6 +503,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     runtimeStreamAbort?.abort();
     if (runtimeSyncDebounce) clearTimeout(runtimeSyncDebounce);
     if (runtimeReconnectTimer) clearTimeout(runtimeReconnectTimer);
+    clearInterval(runtimeCompletionWatchdog);
   });
 
   const activityPollTimer = setInterval(() => {
@@ -690,6 +728,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     toggleRightTab,
     selectRightTab,
     plan,
+    pendingApprovals,
     conversationScroll,
     scrollConversation,
     conversationBusy,