@dotdrelle/wiki-manager 0.11.4 → 0.11.7

package/src/shell/repl.js

@@ -5,7 +5,7 @@ import { execFileSync } from 'node:child_process';
 import { stdin as input, stdout as output } from 'node:process';
 import { marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
-import { buildAgentSystemPrompt, buildLimitedAgentResponse } from '../agent/graph.js';
+import { buildAgentSystemPrompt, formatLlmUnavailableMessage } from '../agent/graph.js';
 import { handleSlashCommand } from '../commands/slash.js';
 import { serviceDescription, serviceNames as composeServiceNames } from '../core/compose.js';
 import { extractActivity, parseJsonText, sessionActivities } from '../core/activity.js';
@@ -15,7 +15,7 @@ import { createAgentEvent, dispatchAgentEvent } from '../core/agentEvents.js';
 import { listSkills } from '../core/skills.js';
 import { listWikircProfiles } from '../core/wikirc.js';
 import { listWorkspaces } from '../core/workspaces.js';
-import { fetchRuntimeState, postRuntimeApprove, postRuntimeCancel, postRuntimeControl, postRuntimeRun, streamRuntimeEvents } from '../runtime/client.js';
+import { fetchRuntimeState, postRuntimeApprove, postRuntimeCancel, postRuntimeControl, postRuntimeRun, postRuntimeShutdown, streamRuntimeEvents } from '../runtime/client.js';
 
 marked.use(markedTerminal());
 // marked-terminal's text renderer extracts token.text (raw string) instead of
@@ -102,6 +102,31 @@ const SUBCOMMAND_COMPLETION_DESCRIPTIONS = {
   '/skills:show': 'Show one workspace skill.',
 };
 
+export function runtimeUnavailableReason(runtime) {
+  if (runtime?.url) return null;
+  const reason = runtime?.error ?? runtime?.unavailableReason ?? runtime?.reason ?? null;
+  return reason ? String(reason) : 'runtime introuvable';
+}
+
+export function runtimeUnavailableAgentMessage(runtime) {
+  const reason = runtimeUnavailableReason(runtime);
+  return reason ? `⚠ Runtime indisponible : ${reason} — /agent désactivé, /chat reste possible` : null;
+}
+
+export function runtimeStatusLine(runtime, session) {
+  if (runtime?.url) return `runtime: connected (${session?.workspace ?? 'no workspace'})`;
+  const reason = runtimeUnavailableReason(runtime);
+  if (reason) return `runtime: disconnected: ${reason}`;
+  return 'runtime: off';
+}
+
+export function recordRuntimeUnavailableAgentInput(session, line, runtime) {
+  const message = runtimeUnavailableAgentMessage(runtime);
+  conversationMessages(session).push({ role: 'user', content: line });
+  conversationMessages(session).push({ role: 'command', content: message ?? 'Runtime indisponible.' });
+  return message;
+}
+
 export function createSession() {
   return {
     workspace: null,
@@ -839,17 +864,18 @@ function isDurableActivityLine(label) {
   return /^[a-z0-9_-]+\.[a-z0-9_-]+:/i.test(String(label).trim());
 }
 
-function renderScreen({ packageJson, session, messages, inputBuffer, busy = false, spinnerFrame = 0, scrollOffset = 0, spinnerLabel = 'Thinking…', activityLines = [] }) {
+function renderScreen({ packageJson, session, messages, inputBuffer, busy = false, spinnerFrame = 0, scrollOffset = 0, spinnerLabel = 'Thinking…', activityLines = [], runtime = null }) {
   const columns = output.columns || 100;
   const rows = output.rows || 30;
   const banner = renderBannerWithMcpPanel(columns, session);
+  const runtimeBanner = runtimeUnavailableAgentMessage(runtime);
   const completions = busy ? [] : completionLines(inputBuffer, session, columns);
   const visibleCompletions = completions.slice(0, COMPLETION_PANEL_ROWS);
   const completionRows = visibleCompletions.length > 0 ? COMPLETION_PANEL_ROWS : 0;
   const activityRows = LOWER_DETAIL_ROWS - completionRows;
   const activity = renderActivityLines(activityLines, columns, activityRows);
   const productionActivityRows = 1;
-  const fixedRows = 4 + banner.length + productionActivityRows + 1 + LOWER_PANEL_ROWS + BOTTOM_PADDING_ROWS;
+  const fixedRows = 4 + banner.length + (runtimeBanner ? 1 : 0) + productionActivityRows + 1 + LOWER_PANEL_ROWS + BOTTOM_PADDING_ROWS;
   const middleHeight = Math.max(5, rows - fixedRows);
   lastMiddleHeight = middleHeight;
   const prompt = promptFor(session);
@@ -860,6 +886,7 @@ function renderScreen({ packageJson, session, messages, inputBuffer, busy = fals
     session.wikirc?.profile ? session.wikirc.profile : 'no wikirc',
     session.language ? session.language : 'no language',
     session.llm ? 'llm ready' : 'llm limited',
+    runtimeStatusLine(runtime, session),
   ].join('  ');
   const header = `${title}${' '.repeat(Math.max(0, columns - stripAnsi(title).length - context.length))}${context}`;
   const divider = '─'.repeat(columns);
@@ -910,6 +937,9 @@ function renderScreen({ packageJson, session, messages, inputBuffer, busy = fals
   if (banner.length > 0) {
     buf += `${banner.map((line) => line.padEnd(columns, ' ')).join('\n')}\n`;
   }
+  if (runtimeBanner) {
+    buf += `${padVisible(`${styles.yellow}${truncateAnsi(runtimeBanner, columns)}${styles.reset}`, columns)}\n`;
+  }
   buf += `${topDivider}\n`;
   buf += `${visibleBody.map((line) => padVisible(line, columns)).join('\n')}\n`;
   // Keep this line reserved: production jobs publish their progress here.
@@ -931,22 +961,22 @@ function renderScreen({ packageJson, session, messages, inputBuffer, busy = fals
   output.write(buf);
 }
 
-async function runAgentTurn(input, { agent, session, onUpdate, onStep }) {
+async function runAgentTurn(input, { agent, session, onUpdate, onStep, displayInput = input }) {
   const messages = conversationMessages(session);
   const history = toConversationHistory(messages);
   session._onStep = onStep ?? null;
   session.packageJson = session.packageJson ?? {};
   dispatchAgentEvent(session, createAgentEvent('run_started', {
     origin: 'user',
-    payload: { input },
+    payload: { input: displayInput },
   }));
   dispatchAgentEvent(session, createAgentEvent('user_message', {
     origin: 'user',
-    payload: { content: input },
+    payload: { content: displayInput },
   }));
 
   // Show the user's input in the conversation (mirrors runDirectChatTurn).
-  messages.push({ role: 'user', content: input });
+  messages.push({ role: 'user', content: displayInput });
   onUpdate?.();
 
   // Create the donna bubble immediately so "Thinking…" is visible during TTFT.
@@ -994,7 +1024,7 @@ async function runAgentTurn(input, { agent, session, onUpdate, onStep }) {
     // Non-abort error: surface it in the bubble rather than leaving "Thinking…" stuck.
     if (donnaMessage) {
       const msg = err instanceof Error ? err.message : String(err);
-      donnaMessage.content = buildLimitedAgentResponse({ input, session }, `LLM indisponible: ${msg}`);
+      donnaMessage.content = formatLlmUnavailableMessage(msg);
       onUpdate?.();
     }
     throw err;
@@ -1008,10 +1038,10 @@ async function runAgentTurn(input, { agent, session, onUpdate, onStep }) {
     if (donnaMessage) {
       donnaMessage.content = stripDsmlArtifacts(donnaMessage.content).trimEnd();
       if (!donnaMessage.content.trim()) {
-        donnaMessage.content = buildLimitedAgentResponse({ input, session }, 'LLM stream ended without content');
+        donnaMessage.content = formatLlmUnavailableMessage('flux vide');
       }
     } else {
-      messages.push({ role: 'donna', content: buildLimitedAgentResponse({ input, session }, 'LLM stream ended without content') });
+      messages.push({ role: 'donna', content: formatLlmUnavailableMessage('flux vide') });
     }
     onUpdate?.();
     return {};
@@ -1050,7 +1080,7 @@ async function runAgentTurn(input, { agent, session, onUpdate, onStep }) {
       }
       donnaMessage.content = stripDsmlArtifacts(donnaMessage.content).trimEnd();
       if (!donnaMessage.content.trim()) {
-        donnaMessage.content = buildLimitedAgentResponse({ input, session }, 'LLM stream ended without content');
+        donnaMessage.content = formatLlmUnavailableMessage('flux vide');
         onUpdate?.();
       }
     } catch (err) {
@@ -1060,16 +1090,16 @@ async function runAgentTurn(input, { agent, session, onUpdate, onStep }) {
         return { aborted: true };
       }
       const message = err instanceof Error ? err.message : String(err);
-      donnaMessage.content = buildLimitedAgentResponse({ input, session }, `LLM indisponible: ${message}`);
+      donnaMessage.content = formatLlmUnavailableMessage(message);
       onUpdate?.();
     }
     return {};
   }
 
   if (donnaMessage) {
-    donnaMessage.content = buildLimitedAgentResponse({ input, session });
+    donnaMessage.content = formatLlmUnavailableMessage('reponse vide');
   } else {
-    messages.push({ role: 'donna', content: buildLimitedAgentResponse({ input, session }) });
+    messages.push({ role: 'donna', content: formatLlmUnavailableMessage('reponse vide') });
   }
   onUpdate?.();
   return {};
@@ -1102,7 +1132,7 @@ async function runDirectChatTurn(input, { session, onUpdate, onStep }) {
     }
     donnaMessage.content = stripDsmlArtifacts(donnaMessage.content).trimEnd();
     if (!donnaMessage.content.trim()) {
-      donnaMessage.content = buildLimitedAgentResponse({ input, session }, 'LLM stream ended without content');
+      donnaMessage.content = formatLlmUnavailableMessage('flux vide');
       onUpdate?.();
     }
   } catch (err) {
@@ -1111,7 +1141,7 @@ async function runDirectChatTurn(input, { session, onUpdate, onStep }) {
       return { exit: false, aborted: true };
     }
     const message = err instanceof Error ? err.message : String(err);
-    donnaMessage.content = buildLimitedAgentResponse({ input, session }, `LLM indisponible: ${message}`);
+    donnaMessage.content = formatLlmUnavailableMessage(message);
     onUpdate?.();
   }
   return { exit: false };
@@ -1152,6 +1182,7 @@ export async function runLine(line, { agent, packageJson, session, onUpdate, onS
     onStep?.(`Shell: ${trimmed}`);
     const result = await handleSlashCommand(trimmed, { packageJson, session, onStep });
     const messages = conversationMessages(session);
+    const handoffRawToAgent = Boolean(result.rawOutput && result.agentTrigger && agent);
     if (result.output) {
       const parts = trimmed.split(/\s+/);
       if (parts[0] === '/mcp' && parts[1] === 'call' && parts[2]) {
@@ -1166,10 +1197,15 @@ export async function runLine(line, { agent, packageJson, session, onUpdate, onS
           rememberProductionActivity(session, payload);
         }
       }
+    }
+    if (result.output && !handoffRawToAgent) {
       messages.push({ role: 'command', content: result.output });
       onUpdate?.();
     }
-    if (result.agentTrigger && agent) {
+    if (handoffRawToAgent) {
+      const agentResult = await runAgentTurn(result.agentTrigger, { agent, session, onUpdate, onStep, displayInput: trimmed });
+      if (agentResult.aborted) return { exit: false, aborted: true };
+    } else if (result.agentTrigger && agent) {
       const agentResult = await runAgentTurn(result.agentTrigger, { agent, session, onUpdate, onStep });
       if (agentResult.aborted) return { exit: false, aborted: true };
     }
@@ -1243,16 +1279,28 @@ async function runTuiShell({ agent, packageJson, session, runtime = null }) {
   let runtimeReconnectTimer = null;
   let runtimeSyncTimer = null;
   let runtimeStreamStopped = false;
+  let runtimeShutdownRequested = false;
   let finish;
   const finished = new Promise((resolve) => {
     finish = resolve;
   });
 
+  async function shutdownRuntimeOnExit() {
+    if (!runtime?.url || runtimeShutdownRequested) return;
+    runtimeShutdownRequested = true;
+    try {
+      await postRuntimeShutdown({ url: runtime.url });
+    } catch {
+      // The shell is already exiting; an unavailable runtime should not block
+      // terminal restoration.
+    }
+  }
+
   input.setRawMode(true);
   input.resume();
   output.write('\u001b[?1049h');
 
-  const rerender = () => renderScreen({ packageJson, session, messages: conversationMessages(session), inputBuffer, busy, spinnerFrame, scrollOffset, spinnerLabel, activityLines });
+  const rerender = () => renderScreen({ packageJson, session, messages: conversationMessages(session), inputBuffer, busy, spinnerFrame, scrollOffset, spinnerLabel, activityLines, runtime });
   busy = true;
   spinnerLabel = 'Loading wiki-manager shell...';
   spinnerInterval = setInterval(() => {
@@ -1530,31 +1578,35 @@ async function runTuiShell({ agent, packageJson, session, runtime = null }) {
             conversationMessages(session).push({ role: 'command', content: `Approval ${result.approved ? 'accepted' : 'not found'}: ${id}` });
             syncRuntimeState();
           }
-        } else if (runtime?.url && !session.chatMode && !line.trim().startsWith('/')) {
-          conversationMessages(session).push({ role: 'user', content: line });
-          const outcome = await submitRuntimeRun(line, { runtime, session });
-          if (outcome.kind === 'accepted') {
-            conversationMessages(session).push({ role: 'command', content: `Runtime run queued: ${runtime.url}` });
-            activityLines = [...activityLines, 'runtime: run accepted'].slice(-LOWER_DETAIL_ROWS);
-          } else if (outcome.kind === 'queued') {
-            conversationMessages(session).push({ role: 'command', content: 'Runtime is busy — request added to the control queue, it will start automatically.' });
-            activityLines = [...activityLines, 'runtime: control queued'].slice(-LOWER_DETAIL_ROWS);
-          } else if (outcome.kind === 'observe' || outcome.kind === 'converse' || outcome.kind === 'mutate') {
-            const explanation = outcome.result?.explanation ?? 'Runtime control message accepted.';
-            conversationMessages(session).push({ role: 'command', content: explanation });
-            activityLines = [...activityLines, `runtime: ${outcome.kind}`].slice(-LOWER_DETAIL_ROWS);
-          } else if (outcome.kind === 'ambiguous') {
-            conversationMessages(session).push({ role: 'command', content: 'Runtime could not classify that message. Use /queue for a future run, or ask/status more explicitly.' });
-            activityLines = [...activityLines, 'runtime: ambiguous control'].slice(-LOWER_DETAIL_ROWS);
+        } else {
+          if (runtime?.url && !session.chatMode && !line.trim().startsWith('/')) {
+            conversationMessages(session).push({ role: 'user', content: line });
+            const outcome = await submitRuntimeRun(line, { runtime, session });
+            if (outcome.kind === 'accepted') {
+              activityLines = [...activityLines, 'runtime: run accepted'].slice(-LOWER_DETAIL_ROWS);
+            } else if (outcome.kind === 'queued') {
+              conversationMessages(session).push({ role: 'command', content: 'Runtime is busy — request added to the control queue, it will start automatically.' });
+              activityLines = [...activityLines, 'runtime: control queued'].slice(-LOWER_DETAIL_ROWS);
+            } else if (outcome.kind === 'observe' || outcome.kind === 'converse' || outcome.kind === 'mutate') {
+              const explanation = outcome.result?.explanation ?? 'Runtime control message accepted.';
+              conversationMessages(session).push({ role: 'command', content: explanation });
+              activityLines = [...activityLines, `runtime: ${outcome.kind}`].slice(-LOWER_DETAIL_ROWS);
+            } else if (outcome.kind === 'ambiguous') {
+              conversationMessages(session).push({ role: 'command', content: 'Runtime could not classify that message. Use /queue for a future run, or ask/status more explicitly.' });
+              activityLines = [...activityLines, 'runtime: ambiguous control'].slice(-LOWER_DETAIL_ROWS);
+            } else {
+              conversationMessages(session).push({ role: 'command', content: `Runtime error: ${outcome.message}` });
+              activityLines = [...activityLines, `runtime error: ${outcome.message}`].slice(-LOWER_DETAIL_ROWS);
+            }
+            syncRuntimeState();
+          } else if (!session.chatMode && !line.trim().startsWith('/')) {
+            const message = recordRuntimeUnavailableAgentInput(session, line, runtime);
+            activityLines = [...activityLines, message ?? 'runtime: disconnected'].slice(-LOWER_DETAIL_ROWS);
           } else {
-            conversationMessages(session).push({ role: 'command', content: `Runtime error: ${outcome.message}` });
-            activityLines = [...activityLines, `runtime error: ${outcome.message}`].slice(-LOWER_DETAIL_ROWS);
+            const result = await runLine(line, { agent, packageJson, session, onUpdate: rerender, onStep });
+            done = result.exit;
+            aborted = result.aborted ?? false;
           }
-          syncRuntimeState();
-        } else {
-          const result = await runLine(line, { agent, packageJson, session, onUpdate: rerender, onStep });
-          done = result.exit;
-          aborted = result.aborted ?? false;
         }
       } catch (err) {
         if (err.name !== 'AbortError') throw err;
@@ -1664,6 +1716,7 @@ async function runTuiShell({ agent, packageJson, session, runtime = null }) {
     input.setRawMode(false);
     input.pause();
     output.write('\u001b[?25h\u001b[H\u001b[2J\u001b[?1049l');
+    await shutdownRuntimeOnExit();
   }
 }
 

package/src/shell/repl.test.js

@@ -1,6 +1,18 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { applyRuntimeStateToShellSession, createSession, conversationMessages, submitRuntimeRun } from './repl.js';
+import { existsSync, mkdirSync, mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import {
+  applyRuntimeStateToShellSession,
+  createSession,
+  conversationMessages,
+  recordRuntimeUnavailableAgentInput,
+  runLine,
+  runtimeStatusLine,
+  runtimeUnavailableAgentMessage,
+  submitRuntimeRun,
+} from './repl.js';
 
 function stubFetch(handler) {
   const original = globalThis.fetch;
@@ -112,3 +124,49 @@ test('submitRuntimeRun reports a non-409 error without throwing or calling /cont
     restore();
   }
 });
+
+test('runLine does not update workspace profile before Donna handles the request', async () => {
+  const workspacePath = mkdtempSync(join(tmpdir(), 'donna-profile-shell-'));
+  mkdirSync(join(workspacePath, '.wiki'), { recursive: true });
+  try {
+    const session = createSession();
+    session.workspace = 'docs';
+    session.workspacePath = workspacePath;
+    const result = await runLine('ajoute a mon profil que les statuts Docker sont rendus en tableau', {
+      agent: null,
+      packageJson: { version: 'test' },
+      session,
+      chatMode: true,
+    });
+
+    assert.equal(result.exit, false);
+    assert.equal(existsSync(join(workspacePath, '.wiki', 'profile.md')), false);
+    assert.notDeepEqual(conversationMessages(session).map((message) => message.role), ['user', 'donna']);
+  } finally {
+    rmSync(workspacePath, { recursive: true, force: true });
+  }
+});
+
+test('agent mode without runtime records a visible error instead of falling back locally', () => {
+  const session = createSession();
+  session.chatMode = false;
+
+  const message = recordRuntimeUnavailableAgentInput(session, 'salut', { error: 'port 7788 already in use' });
+
+  assert.equal(message, '⚠ Runtime indisponible : port 7788 already in use — /agent désactivé, /chat reste possible');
+  assert.deepEqual(conversationMessages(session), [
+    { role: 'user', content: 'salut' },
+    { role: 'command', content: message },
+  ]);
+});
+
+test('runtime status exposes the disconnected reason', () => {
+  assert.equal(
+    runtimeStatusLine({ error: 'token mismatch' }, { workspace: 'juno' }),
+    'runtime: disconnected: token mismatch',
+  );
+  assert.equal(
+    runtimeUnavailableAgentMessage({ error: 'token mismatch' }),
+    '⚠ Runtime indisponible : token mismatch — /agent désactivé, /chat reste possible',
+  );
+});

package/src/shell/tui.tsx

@@ -1,7 +1,7 @@
 /** @jsxImportSource @opentui/solid */
 import { execFileSync } from 'node:child_process';
 import { render, useKeyboard, useRenderer, useSelectionHandler, useTerminalDimensions } from '@opentui/solid';
-import { createMemo, createSignal, onCleanup } from 'solid-js';
+import { createMemo, createSignal, onCleanup, Show } from 'solid-js';
 import { FileEditorDialog } from './FileEditorDialog';
 import { LeftPane } from './LeftPane';
 import { RightPane } from './RightPane';
@@ -12,6 +12,7 @@ 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';
 
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
@@ -109,6 +110,7 @@ function App(props: {
   const [exitHint, setExitHint] = createSignal(false);
   const [copyHint, setCopyHint] = createSignal<string | null>(null);
   const [chatInputHeight, setChatInputHeight] = createSignal(3);
+  const [startupKeyboardEvent, setStartupKeyboardEvent] = createSignal<{ id: number; key: any } | null>(null);
   // The app has exactly three mutually exclusive screens; one signal makes
   // that invariant structural instead of relying on two booleans staying in
   // sync at every call site.
@@ -116,7 +118,9 @@ function App(props: {
   let ctrlCTimer: ReturnType<typeof setTimeout> | null = null;
   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 conversationRows = createMemo(() => Math.max(4, dimensions().height - 5 - chatInputHeight()));
@@ -224,6 +228,10 @@ 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(() => {
@@ -236,6 +244,11 @@ function App(props: {
 
   useKeyboard((key) => {
     const keyName = String(key.name ?? '').toLowerCase();
+    if (screen() === 'startup') {
+      startupKeyboardEventId += 1;
+      setStartupKeyboardEvent({ id: startupKeyboardEventId, key });
+      return;
+    }
     if (screen() !== 'main') return;
     if (state.activeEditor()) {
       if (keyName === 'escape') state.closeEditor();
@@ -279,89 +292,91 @@ function App(props: {
   const hintLine = () => {
     if (copyHint()) return copyHint();
     if (exitHint()) return 'Press Ctrl+C again to exit.';
+    if (state.runtimeHint()) return state.runtimeHint();
     return null;
   };
 
-  if (screen() === 'startup') {
-    const info = startup();
-    return (
+  return (
+    <Show
+      when={screen() === 'startup'}
+      fallback={
+        <box width="100%" height="100%" flexDirection="row">
+          <LeftPane
+            width={leftColumns()}
+            title={state.title()}
+            statusLine={state.statusLine()}
+            hintLine={hintLine()}
+            showWelcome={state.showWelcome()}
+            messages={state.messages()}
+            prompt={state.prompt()}
+            input={state.input()}
+            busy={state.busy()}
+            chatMode={state.chatMode()}
+            chatFocused={!state.activeEditor()}
+            setInput={state.setInput}
+            submit={submit}
+            conversationRows={conversationRows()}
+            conversationColumns={conversationColumns()}
+            conversationScroll={state.conversationScroll()}
+            scrollConversation={state.scrollConversation}
+            spinnerFrame={SPINNER_FRAMES[spinnerIndex()] ?? SPINNER_FRAMES[0]}
+            onInputHeightChange={setChatInputHeight}
+            onCopy={(content) => showCopyHint(copyToClipboard(content, renderer) ? 'Copied.' : 'Copy failed.')}
+          />
+          <box width={1} height="100%" flexDirection="column">
+            {Array.from({ length: dimensions().height }, () => (
+              <text fg="#4B5563">│</text>
+            ))}
+          </box>
+          <RightPane
+            width={rightColumns()}
+            activities={state.activities()}
+            logs={state.logs()}
+            plan={state.plan()}
+            queueItems={state.queueItems()}
+            queueInfo={state.queueInfo()}
+            activeTab={state.rightTab()}
+            onTabClick={state.selectRightTab}
+          />
+          <SlashDialog context={state.activeEditor() ? null : state.slash()} />
+          <FileEditorDialog
+            editor={state.activeEditor()}
+            width={dimensions().width}
+            height={dimensions().height}
+            onSave={state.saveEditor}
+            onCancel={state.closeEditor}
+          />
+          {screen() === 'setup' ? (
+            <SetupWizard
+              mode="setup"
+              session={state.session}
+              width={dimensions().width}
+              height={dimensions().height}
+              initialRoute="workspace-name"
+              closeOnDone
+              onComplete={closeSetup}
+              onClose={closeSetup}
+            />
+          ) : null}
+        </box>
+      }
+    >
       <StartupScreen
-        version={info.version}
-        model={info.model}
-        connectedMcpServers={info.connectedMcpServers}
-        wikiReady={info.wikiReady}
-        workspaceName={info.workspaceName}
-        profileName={info.profileName}
-        workspaces={info.workspaces}
-        hasWorkspace={info.hasWorkspace}
+        version={startup().version}
+        model={startup().model}
+        connectedMcpServers={startup().connectedMcpServers}
+        wikiReady={startup().wikiReady}
+        workspaceName={startup().workspaceName}
+        profileName={startup().profileName}
+        workspaces={startup().workspaces}
+        hasWorkspace={startup().hasWorkspace}
         width={dimensions().width}
         height={dimensions().height}
+        keyboardEvent={startupKeyboardEvent()}
         onSelect={openAction}
         onQuit={() => renderer.destroy()}
       />
-    );
-  }
-
-  return (
-    <box width="100%" height="100%" flexDirection="row">
-      <LeftPane
-        width={leftColumns()}
-        title={state.title()}
-        statusLine={state.statusLine()}
-        hintLine={hintLine()}
-        showWelcome={state.showWelcome()}
-        messages={state.messages()}
-        prompt={state.prompt()}
-        input={state.input()}
-        busy={state.busy()}
-        chatMode={state.chatMode()}
-        chatFocused={!state.activeEditor()}
-        setInput={state.setInput}
-        submit={submit}
-        conversationRows={conversationRows()}
-        conversationColumns={conversationColumns()}
-        conversationScroll={state.conversationScroll()}
-        scrollConversation={state.scrollConversation}
-        spinnerFrame={SPINNER_FRAMES[spinnerIndex()] ?? SPINNER_FRAMES[0]}
-        onInputHeightChange={setChatInputHeight}
-        onCopy={(content) => showCopyHint(copyToClipboard(content, renderer) ? 'Copied.' : 'Copy failed.')}
-      />
-      <box width={1} height="100%" flexDirection="column">
-        {Array.from({ length: dimensions().height }, () => (
-          <text fg="#4B5563">│</text>
-        ))}
-      </box>
-      <RightPane
-        width={rightColumns()}
-        activities={state.activities()}
-        logs={state.logs()}
-        plan={state.plan()}
-        queueItems={state.queueItems()}
-        queueInfo={state.queueInfo()}
-        activeTab={state.rightTab()}
-        onTabClick={state.selectRightTab}
-      />
-      <SlashDialog context={state.activeEditor() ? null : state.slash()} />
-      <FileEditorDialog
-        editor={state.activeEditor()}
-        width={dimensions().width}
-        height={dimensions().height}
-        onSave={state.saveEditor}
-        onCancel={state.closeEditor}
-      />
-      {screen() === 'setup' ? (
-        <SetupWizard
-          mode="setup"
-          session={state.session}
-          width={dimensions().width}
-          height={dimensions().height}
-          initialRoute="workspace-name"
-          closeOnDone
-          onComplete={closeSetup}
-          onClose={closeSetup}
-        />
-      ) : null}
-    </box>
+    </Show>
   );
 }
 

package/src/shell/useAgent.ts

@@ -1,8 +1,8 @@
 import { createSignal } from 'solid-js';
 import { postRuntimeCancel } from '../runtime/client.js';
-import { conversationMessages, runLine, submitRuntimeRun } from './repl.js';
+import { conversationMessages, recordRuntimeUnavailableAgentInput, runLine, submitRuntimeRun } from './repl.js';
 
-export function useAgent(props: { agent: unknown; packageJson: Record<string, unknown>; session: Record<string, any>; chatMode: () => boolean; runtimeUrl?: string | null; refresh: () => void; addLog: (line: string) => void; onRuntimeAccepted?: () => void }) {
+export function useAgent(props: { agent: unknown; packageJson: Record<string, unknown>; session: Record<string, any>; chatMode: () => boolean; runtimeUrl?: string | null; runtimeUnavailableReason?: string | null; refresh: () => void; addLog: (line: string) => void; onRuntimeAccepted?: () => void }) {
   const [busy, setBusy] = createSignal(false);
   const [abortController, setAbortController] = createSignal<AbortController | null>(null);
 
@@ -19,13 +19,15 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
 
     try {
       if (props.runtimeUrl && !props.chatMode() && !trimmed.startsWith('/')) {
-        conversationMessages(props.session).push({ role: 'user', content: trimmed });
+        // Marked _pending so mergeRuntimeConversation (useSession.ts) can
+        // confirm this exact entry instead of pushing a second copy once the
+        // same user message comes back from the runtime's own /state.
+        conversationMessages(props.session).push({ role: 'user', content: trimmed, _pending: true });
         const outcome = await submitRuntimeRun(trimmed, {
           runtime: { url: props.runtimeUrl },
           session: props.session,
         });
         if (outcome.kind === 'accepted') {
-          conversationMessages(props.session).push({ role: 'command', content: `Runtime run queued: ${props.runtimeUrl}` });
           props.onRuntimeAccepted?.();
           props.addLog('runtime: run accepted');
         } else if (outcome.kind === 'queued') {
@@ -38,6 +40,14 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
         props.refresh();
         return { exit: false, runtime: true };
       }
+      if (!props.chatMode() && !trimmed.startsWith('/')) {
+        const message = recordRuntimeUnavailableAgentInput(props.session, trimmed, {
+          error: props.runtimeUnavailableReason ?? 'runtime introuvable',
+        });
+        props.addLog(message ?? 'runtime: disconnected');
+        props.refresh();
+        return { exit: false, runtimeUnavailable: true };
+      }
       const result = await runLine(trimmed, {
         agent: props.agent,
         packageJson: props.packageJson,