mixdog 0.9.174 → 1.0.0

package/src/tui/session/agent-envelope.mjs

@@ -1,489 +1 @@
-/**
- * src/tui/session/agent-envelope.mjs - parse agent/background-task/shell
- * notification envelopes into synthetic tool-item shapes, and derive
- * status/result text. parseBackgroundTaskEnvelope
- * remains part of session-local.mjs's public surface.
- */
-import { isBackgroundErrorOnlyBody } from '../../runtime/shared/err-text.mjs';
-import { textBetweenTag } from '../../runtime/shared/tool-result-summary.mjs';
-import { parseTaskNotification, taskNotificationHasBody } from '../../runtime/shared/task-notification-envelope.mjs';
-
-// The terminal status words that mark an agent/background result as an error.
-// The near-variants further down (isErrorToolStatus, the shell result branch)
-// deliberately drop `denied`/`canceled` and must stay written out separately.
-const TERMINAL_ERROR_STATUS = /^(failed|error|timeout|cancelled|canceled|killed|denied)$/i;
-
-// Execution surfaces that render as their own tool card; any other surface
-// renders as a generic task card.
-const CARD_SURFACES = new Set(['agent', 'shell', 'web_search']);
-
-function stripSyntheticAgentTags(text) {
-  const value = String(text ?? '').trim();
-  const finalAnswer = textBetweenTag(value, 'final-answer');
-  if (finalAnswer) return finalAnswer;
-  const taskResult = textBetweenTag(value, 'result');
-  if (taskResult) return taskResult;
-  return value
-    .replace(/^agent result[^\n]*(?:\n|$)/i, '')
-    .replace(
-      /<\/?(?:final-answer|task-id|tool-use-id|output-file|result|status|summary|usage|total_tokens|tool_uses|duration_ms|worktree|worktreePath|worktreeBranch)[^>]*>/gi,
-      ''
-    )
-    .trim();
-}
-
-function splitBridgeEnvelope(text) {
-  const value = String(text ?? '').trim();
-  if (!value) return { body: '' };
-  const match = /\n\s*\n/.exec(value);
-  if (!match) return { body: '' };
-  return {
-    body: value.slice(match.index + match[0].length).trim(),
-  };
-}
-
-function agentJobStatusText(parsed) {
-  if (!parsed) return '';
-  const parts = [];
-  if (parsed.status) parts.push(`status: ${parsed.status}`);
-  if (parsed.taskId) parts.push(`task_id: ${parsed.taskId}`);
-  return parts.join(' · ');
-}
-
-export function agentJobResultText(text, parsed = parseAgentJob(text)) {
-  const value = String(text ?? '').trim();
-  if (!value) return '';
-  const notification = parseTaskNotification(value);
-  if (notification) return notification.result || notification.error || notification.summary;
-  if (parsed?.taskId) {
-    const { body } = splitBridgeEnvelope(value);
-    const cleanBody = stripSyntheticAgentTags(body);
-    if (cleanBody) return cleanBody;
-    return agentJobStatusText(parsed);
-  }
-  return stripSyntheticAgentTags(value) || value;
-}
-
-export function parseAgentResultEnvelope(text, fallback = {}) {
-  const value = String(text ?? '').trim();
-  if (!/^agent result\b/i.test(value)) return null;
-  const [head = '', ...restLines] = value.split('\n');
-  const body = stripSyntheticAgentTags(restLines.join('\n'));
-  const attrs = {};
-  const attrRe = /([a-zA-Z][\w-]*)=("[^"]*"|'[^']*'|\S+)/g;
-  for (const match of head.matchAll(attrRe)) {
-    attrs[match[1].toLowerCase()] = String(match[2] || '').replace(/^["']|["']$/g, '');
-  }
-  const providerModel = /\s([a-zA-Z0-9_.-]+)\/([^\s]+)\s*$/i.exec(head);
-  const agent = attrs.agent || fallback.agent || '';
-  const status = fallback.status || attrs.status || 'completed';
-  const taskId = fallback.taskId || attrs.task_id || attrs.taskid || '';
-  return {
-    name: 'agent',
-    label: String(status).toLowerCase(),
-    args: {
-      type: 'result',
-      status,
-      task_id: taskId || undefined,
-      tag: fallback.tag || attrs.tag || undefined,
-      agent: agent || undefined,
-      provider: fallback.provider || attrs.provider || providerModel?.[1] || undefined,
-      model: fallback.model || attrs.model || providerModel?.[2] || undefined,
-      preset: fallback.preset || attrs.preset || undefined,
-      effort: fallback.effort || attrs.effort || undefined,
-      fast: fallback.fast ?? attrs.fast,
-    },
-    result: body || agentJobStatusText({ status, taskId }),
-    isError: TERMINAL_ERROR_STATUS.test(status),
-  };
-}
-
-export function parseBackgroundTaskEnvelope(text) {
-  const value = String(text ?? '').trim();
-  const notification = parseTaskNotification(value);
-  if (notification) {
-    return {
-      name: notification.surface,
-      label: notification.status,
-      args: {
-        type: 'result',
-        status: notification.status,
-        task_id: notification.taskId,
-        surface: notification.surface,
-        tag: notification.tag || undefined,
-        label: notification.tag || undefined,
-        error: notification.error || undefined,
-      },
-      result: notification.result || notification.error || notification.summary,
-      rawResult: value,
-      isError: isErrorToolStatus(notification.status),
-    };
-  }
-  if (!/^background task\b/i.test(value)) return null;
-  const allLines = value.split('\n');
-  const rest = allLines.slice(1);
-  const blank = rest.findIndex((line) => !line.trim());
-  const headLines = blank >= 0 ? rest.slice(0, blank) : rest;
-  const body =
-    blank >= 0
-      ? rest
-          .slice(blank + 1)
-          .join('\n')
-          .trim()
-      : '';
-  const fields = {};
-  for (const line of headLines) {
-    const match = /^([a-zA-Z][\w-]*):\s*(.*)$/.exec(line.trim());
-    if (match) fields[match[1].toLowerCase()] = match[2].trim();
-  }
-  const surface = String(fields.surface || fields.operation || 'task').toLowerCase();
-  const name = CARD_SURFACES.has(surface) ? surface : 'task';
-  const status = String(fields.status || '').toLowerCase();
-  const taskId = fields.task_id || fields.taskid || '';
-  const errorText = fields.error || '';
-  const agentResult = parseAgentResultEnvelope(body, {
-    status,
-    taskId,
-    tag: fields.tag || fields.label || '',
-    agent: fields.agent || '',
-    provider: fields.provider || '',
-    model: fields.model || '',
-    preset: fields.preset || '',
-    effort: fields.effort || '',
-    fast: fields.fast,
-  });
-  if (agentResult) return { ...agentResult, rawResult: value };
-  const errorOnlyBody = isBackgroundErrorOnlyBody(body, errorText);
-  const resultBody = body && !errorOnlyBody ? body : '';
-  const nonTerminal = /^(running|pending|queued)$/i.test(status);
-  let envelopeType = fields.operation || 'status';
-  if (body) envelopeType = nonTerminal ? 'progress' : 'result';
-  const statusLine = [status ? `status: ${status}` : '', taskId ? `task_id: ${taskId}` : '']
-    .filter(Boolean)
-    .join(' · ');
-  return {
-    name,
-    label: status || 'notification',
-    args: {
-      type: envelopeType,
-      status,
-      task_id: taskId || undefined,
-      surface,
-      operation: fields.operation || undefined,
-      label: fields.label || undefined,
-      tag: fields.tag || undefined,
-      agent: fields.agent || undefined,
-      provider: fields.provider || undefined,
-      model: fields.model || undefined,
-      preset: fields.preset || undefined,
-      effort: fields.effort || undefined,
-      fast: fields.fast || undefined,
-      error: errorText || undefined,
-      startedAt: fields.started || fields.startedat || undefined,
-      finishedAt: fields.finished || fields.finishedat || undefined,
-    },
-    result: resultBody || (errorText ? '' : statusLine),
-    rawResult: value,
-    isError: TERMINAL_ERROR_STATUS.test(status) || /^error:/i.test(body) || Boolean(errorText),
-  };
-}
-
-export function parseModelVisibleCompletionWrapper(text) {
-  const value = String(text ?? '').trim();
-  if (parseTaskNotification(value)) return parseBackgroundTaskEnvelope(value);
-  const split = /\n\nResult:\n/.exec(value);
-  if (!split) return null;
-  const preamble = value.slice(0, split.index).trim();
-  if (!/^Async \S+.* finished\.$/i.test(preamble)) {
-    return null;
-  }
-  const quotedLines = value.slice(split.index + split[0].length).split(/\r?\n/);
-  if (quotedLines.length === 0 || quotedLines.some((line) => line && !/^> /.test(line))) return null;
-  const unquoted = quotedLines
-    .map((line) => line.replace(/^> ?/, ''))
-    .join('\n')
-    .trim();
-  const parsed = parseSyntheticAgentMessage(unquoted);
-  return parsed ? { ...parsed, rawResult: unquoted } : null;
-}
-
-/**
- * Tool card for a task notification from its STRUCTURAL provenance
- * (pending-messages `execution`: surface/id/status) — the text parser above
- * stays first choice because it recovers the richer body fields, but a body
- * that misses the "background task" header (restart-recovery notices, agent
- * relays) must still land as a card, never as a user bubble or nothing.
- */
-export function completionCardFromExecution(execution, text) {
-  const parsed = parseModelVisibleCompletionWrapper(text);
-  if (parsed) return parsed;
-  const exec = execution && typeof execution === 'object' ? execution : null;
-  const value = String(text ?? '').trim();
-  if (!exec && !value) return null;
-  const surface = String(exec?.surface || 'task').toLowerCase();
-  const name = CARD_SURFACES.has(surface) ? surface : 'task';
-  const status = String(exec?.status || toolResultStatus(value) || '').toLowerCase();
-  const split = /\n\nResult:\n/.exec(value);
-  const body = split
-    ? value
-        .slice(split.index + split[0].length)
-        .split(/\r?\n/)
-        .map((line) => line.replace(/^> ?/, ''))
-        .join('\n')
-        .trim()
-    : value;
-  const taskId = exec?.id || bracketField(body, 'task_id') || undefined;
-  return {
-    name,
-    label: status || 'notification',
-    args: {
-      type: 'result',
-      status: status || undefined,
-      task_id: taskId,
-      surface,
-    },
-    result: body,
-    rawResult: value,
-    isError: isErrorToolStatus(status) || /^error:/i.test(body),
-  };
-}
-
-export function isStatusOnlyAgentCompletionNotification(text) {
-  if (parseTaskNotification(text)) return false;
-  const background = parseBackgroundTaskEnvelope(text);
-  if (background?.name === 'agent' && /^(completed|cancelled|canceled)$/i.test(background.label || '')) {
-    return !(hasAgentResponseResultText(background.result) || hasAgentResponseResultText(text));
-  }
-  const parsed = parseAgentJob(text);
-  const result = agentJobResultText(text, parsed);
-  if (!parsed?.taskId || !/^(completed|cancelled|canceled)$/i.test(parsed.status || '')) return false;
-  return !(hasAgentResponseResultText(result) || hasAgentResponseResultText(text));
-}
-
-export function hasAgentResponseResultText(text) {
-  const value = String(text || '').trim();
-  if (!value) return false;
-  const notification = parseTaskNotification(value);
-  if (notification) return Boolean(notification.result);
-  if (
-    /^status:\s*(?:running|pending|queued|completed|failed|cancelled|canceled)(?:\s*·\s*task_id:\s*\S+)?$/i.test(value)
-  )
-    return false;
-  if (/^(?:background task\b|agent task:|task_id:)/i.test(value) && !/\n\s*\n[\s\S]*\S/.test(value)) return false;
-  return true;
-}
-
-function bracketField(text, name) {
-  const re = new RegExp(`^\\[${name}:\\s*([^\\]]*)\\]`, 'mi');
-  return re.exec(String(text ?? ''))?.[1]?.trim() || '';
-}
-
-function toolResultStatus(text) {
-  const value = String(text ?? '');
-  const tagged = textBetweenTag(value, 'status');
-  if (tagged) return tagged.trim();
-  const bracketed = bracketField(value, 'status');
-  if (bracketed) return bracketed.trim();
-  const inline = /^(?:status|state):\s*([^\s·,;]+)/im.exec(value);
-  return inline ? inline[1].trim() : '';
-}
-
-function isErrorToolStatus(status) {
-  return /^(failed|error|timeout|cancelled|canceled|killed)$/i.test(String(status || '').trim());
-}
-
-export function parseSyntheticAgentMessage(text) {
-  const value = String(text ?? '').trim();
-  if (!value) return null;
-  if (parseTaskNotification(value)) return parseBackgroundTaskEnvelope(value);
-  const finalAnswer = textBetweenTag(value, 'final-answer');
-  if (finalAnswer) {
-    return {
-      name: 'agent',
-      label: 'final',
-      args: { type: 'read', description: 'agent result' },
-      result: finalAnswer,
-    };
-  }
-  const agentResult = parseAgentResultEnvelope(value);
-  if (agentResult) return agentResult;
-  const backgroundTask = parseBackgroundTaskEnvelope(value);
-  if (backgroundTask) return backgroundTask;
-  const shellTaskId = bracketField(value, 'task_id');
-  if (shellTaskId) {
-    const status = bracketField(value, 'status') || 'done';
-    const exit = bracketField(value, 'exit');
-    const command = bracketField(value, 'command');
-    return {
-      name: 'shell',
-      label: status,
-      args: { type: 'result', task_id: shellTaskId, command },
-      result: value,
-      isError: /^(failed|error|timeout|cancelled|killed)$/i.test(status) || (exit && exit !== '0' && exit !== 'n/a'),
-    };
-  }
-  const agentJob = parseAgentJob(value);
-  if (agentJob?.taskId) {
-    const label = agentJob.status || 'notification';
-    const result = agentJobResultText(value, agentJob);
-    return {
-      name: 'agent',
-      label,
-      args: agentArgsWithResultMetadata(
-        { type: agentJob.type || 'notification', description: 'agent notification' },
-        agentJob
-      ),
-      result: result || agentJobStatusText(agentJob) || 'agent notification',
-      isError: TERMINAL_ERROR_STATUS.test(label),
-    };
-  }
-  return null;
-}
-
-export function buildExecutionResponseToolItem(
-  text,
-  { id, responseKey = '', executionSurface = '', executionStatus = '', now = Date.now() } = {}
-) {
-  const surface = String(executionSurface || '')
-    .trim()
-    .toLowerCase();
-  const status = String(executionStatus || '')
-    .trim()
-    .toLowerCase();
-  const explicitName = CARD_SURFACES.has(surface) ? surface : '';
-  const parsed = parseSyntheticAgentMessage(text);
-  const synthetic =
-    parsed ||
-    (explicitName
-      ? {
-          name: explicitName,
-          label: status || 'completed',
-          args: {
-            type: 'result',
-            status: status || undefined,
-            task_id: responseKey || undefined,
-            surface: explicitName,
-          },
-          result: String(text ?? '').trim(),
-        }
-      : null);
-  if (!synthetic) return null;
-  const label = synthetic.label || 'notification';
-  const name = explicitName || synthetic.name || 'task';
-  const isAgent = name === 'agent';
-  const args = {
-    ...(synthetic.args && typeof synthetic.args === 'object'
-      ? synthetic.args
-      : {
-          type: label,
-          task_id: synthetic.taskId || undefined,
-          description: synthetic.summary || 'execution notification',
-        }),
-    ...(surface ? { surface } : {}),
-    ...(status ? { status } : {}),
-    ...(isAgent ? { type: 'result' } : {}),
-  };
-  const rawResult = synthetic.rawResult ?? text;
-  const responseHasBody = taskNotificationHasBody(text);
-  const key = String(responseKey || args.task_id || '').trim();
-  return {
-    kind: 'tool',
-    id,
-    name,
-    args,
-    result: synthetic.result,
-    rawResult,
-    isError: synthetic.isError ?? TERMINAL_ERROR_STATUS.test(label),
-    expanded: false,
-    count: 1,
-    completedCount: 1,
-    startedAt: now,
-    completedAt: now,
-    ...(isAgent
-      ? {
-          agentDirection: 'inbound',
-          agentResponseKey: key,
-          agentResponseHasBody: responseHasBody,
-          agentResponseAggregate: false,
-          agentResponseEntries: [
-            {
-              key,
-              raw: String(rawResult ?? '').trim(),
-              result: synthetic.result,
-              hasBody: responseHasBody,
-              isError: synthetic.isError === true,
-            },
-          ],
-        }
-      : {}),
-  };
-}
-
-export function parseAgentJob(text) {
-  const value = String(text || '');
-  const notification = parseTaskNotification(value);
-  if (notification)
-    return { taskId: notification.taskId, status: notification.status, type: 'result', target: notification.tag };
-  const idMatch = /^agent task:\s*([^\s]+)/m.exec(value) || /^task_id:\s*([^\s]+)/m.exec(value);
-  if (!idMatch) return null;
-  const statusMatch = /^status:\s*([^\s(]+)/m.exec(value);
-  const typeMatch = /^type:\s*(.+)$/m.exec(value);
-  const targetMatch = /^target:\s*(.+)$/m.exec(value);
-  const agentMatch = /^agent:\s*(.+)$/m.exec(value);
-  const presetMatch = /^preset:\s*(.+)$/m.exec(value);
-  // Spawn acknowledgements normally use `model: provider/model`, but agent
-  // completion envelopes carry the resolved route as separate provider/model
-  // fields. A generic tool result can also contain task_id/provider/model
-  // diagnostics, so only recognize either route shape on an agent envelope.
-  const isAgentEnvelope =
-    /^agent task:\s*/im.test(value) || /^agent result\b/im.test(value) || /^surface:\s*agent\s*$/im.test(value);
-  const providerMatch = isAgentEnvelope ? /^provider:\s*(.+)$/m.exec(value) : null;
-  const modelLineMatch = isAgentEnvelope ? /^model:\s*(.+)$/m.exec(value) : null;
-  const providerModelMatch = /^([^/\s]+)\/(.+)$/.exec(modelLineMatch?.[1]?.trim() || '');
-  const effortMatch = /^effort:\s*(.+)$/m.exec(value);
-  const fastMatch = /^fast:\s*(on|off|true|false)$/m.exec(value);
-  return {
-    taskId: idMatch[1],
-    status: (statusMatch?.[1] || '').toLowerCase(),
-    type: (typeMatch?.[1] || '').trim(),
-    target: (targetMatch?.[1] || '').trim(),
-    agent: (agentMatch?.[1] || '').trim(),
-    preset: (presetMatch?.[1] || '').trim(),
-    provider: (providerMatch?.[1] || providerModelMatch?.[1] || '').trim(),
-    model: (providerModelMatch?.[2] || modelLineMatch?.[1] || '').trim(),
-    effort: (effortMatch?.[1] || '').trim(),
-    fast: fastMatch ? /^(on|true)$/i.test(fastMatch[1]) : undefined,
-  };
-}
-
-export function agentArgsWithResultMetadata(args, parsed) {
-  if (!parsed) return args;
-  const next = { ...(args && typeof args === 'object' ? args : {}) };
-  const requestedAction = String(next.type || next.action || next.mode || '')
-    .trim()
-    .toLowerCase();
-  if (parsed.type) {
-    // Job status envelopes report the original job type (usually "spawn").
-    // Preserve the user's current agent tool action ("status", "read", …) so
-    // manual checks render as "Reviewer status" instead of another
-    // "Spawning Reviewer" card. Keep the job type as metadata for detail.
-    if (!requestedAction || /^(notification|result|completion)$/i.test(requestedAction)) next.type = parsed.type;
-    else next.jobType = parsed.type;
-  }
-  if (parsed.status) next.status = parsed.status;
-  if (parsed.taskId) next.task_id = parsed.taskId;
-  if (parsed.agent) next.agent = parsed.agent;
-  if (parsed.preset) next.preset = parsed.preset;
-  const hasExplicitProvider = [next.provider, next.providerId, next.provider_id].some((value) =>
-    String(value || '').trim()
-  );
-  if (parsed.provider && !hasExplicitProvider) next.provider = parsed.provider;
-  if (parsed.model && !String(next.model || '').trim()) next.model = parsed.model;
-  if (parsed.effort) next.effort = parsed.effort;
-  if (parsed.fast !== undefined) next.fast = parsed.fast;
-  if (!next.tag && parsed.target) {
-    const target = parsed.target.split(/\s+/)[0];
-    if (target && !target.startsWith('sess_')) next.tag = target;
-  }
-  return next;
-}
+export * from '../../runtime/agent/orchestrator/session/transcript-restore/agent-envelope.mjs';

package/src/tui/session/context-state.mjs

@@ -5,8 +5,8 @@
  * snapshot. The two sync helpers stage immutable draft patches through
  * updateState; callers still follow with set(...) to schedule publication.
  */
-import { contextMeasurementStats } from '../../ui/context-measurement.mjs';
-import { goalStateSnapshot } from '../../session-runtime/goal-state.mjs';
+import { contextMeasurementStats } from '../../runtime/shared/context-measurement.mjs';
+import { goalStateSnapshot } from '../../runtime/agent/orchestrator/runtime-core/goal-state.mjs';
 
 export function createContextState({ runtime, getState, updateState, getPendingSessionReset, getVisibleGoal }) {
   const autoClearState = () =>

package/src/tui/session/goal-continuation/continuation-queue.mjs

@@ -2,7 +2,7 @@
 // queued entry passes before it runs, and the deferred enqueue of the next
 // continuation prompt once the session is idle.
 import { clean } from '../../../runtime/shared/clean.mjs';
-import { goalDeadlineReached } from '../../../session-runtime/goal-text.mjs';
+import { goalDeadlineReached } from '../../../runtime/agent/orchestrator/runtime-core/goal-text.mjs';
 import { isGoalQueuedEntry } from '../queue-helpers.mjs';
 
 export function createContinuationQueue({ runtime, flags, getState, getPending, enqueue, visibility }) {

package/src/tui/session/goal-continuation/deadline-delivery.mjs

@@ -1,7 +1,7 @@
 // Deadline notices for the running Goal: the advance warning and the closeout
 // once the duration is reached.
 import { clean } from '../../../runtime/shared/clean.mjs';
-import { goalDeadlineReached, goalDeadlineWarning } from '../../../session-runtime/goal-text.mjs';
+import { goalDeadlineReached, goalDeadlineWarning } from '../../../runtime/agent/orchestrator/runtime-core/goal-text.mjs';
 import { isGoalQueuedEntry } from '../queue-helpers.mjs';
 
 export function createDeadlineDelivery({ runtime, getState, getPending, enqueue, halted }) {

package/src/tui/session/goal-continuation/goal-visibility.mjs

@@ -3,7 +3,7 @@
 // archiveCompletedGoalOnUserInput), so both stay masked until that archive
 // write lands; the raw record still holds the finished Goal in that window.
 import { clean } from '../../../runtime/shared/clean.mjs';
-import { goalStateSnapshot } from '../../../session-runtime/goal-state.mjs';
+import { goalStateSnapshot } from '../../../runtime/agent/orchestrator/runtime-core/goal-state.mjs';
 
 const ARCHIVED_STATUSES = ['complete', 'stopped'];
 

package/src/tui/session/initial-state.mjs

@@ -3,7 +3,7 @@
  */
 import { buildMergedPromptHistory, loadPromptHistory } from '../prompt-history-store.mjs';
 import { createSessionStats } from './session-stats.mjs';
-import { goalStateSnapshot } from '../../session-runtime/goal-state.mjs';
+import { goalStateSnapshot } from '../../runtime/agent/orchestrator/runtime-core/goal-state.mjs';
 
 export function createInitialSessionState({ runtime, runtimeCwd, baseRouteState }) {
   return {

package/src/tui/session/live-share/wire.mjs

@@ -18,6 +18,9 @@ export function destroyQuietly(socket) {
 
 export function attachLineReader(socket, onFrame, onOverflow) {
   let buffer = '';
+  // Decode as a stream: a multibyte character split across chunks must not
+  // turn into U+FFFD when the raw Buffers are concatenated as strings.
+  socket.setEncoding?.('utf8');
   socket.on('data', (chunk) => {
     buffer += chunk;
     if (buffer.length > MAX_BUFFER_BYTES) {

package/src/tui/session/oauth-flows.mjs

@@ -156,13 +156,7 @@ export function createSessionOAuthFlowRegistry({ ttlMs = DEFAULT_FLOW_TTL_MS } =
     const flow = requireFlow(id);
     if (flow.state !== 'pending') return oauthFlowStatus(flow);
     finishFlow(flow, 'cancelled');
-    let failure = null;
-    try {
-      await flow.cancel?.();
-    } catch (error) {
-      failure = error;
-    }
-    if (failure) throw failure;
+    await flow.cancel?.();
     return oauthFlowStatus(flow);
   }
 

package/src/tui/session/session-api/commands.mjs

@@ -4,7 +4,6 @@
  * a turn is running). Each shows a command status while it holds the lock.
  */
 import { compactEventDetail } from '../labels.mjs';
-import { formatDoctorReport, runDoctorChecks } from '../../app/doctor.mjs';
 
 export function createSessionCommandsApi(bag) {
   const {
@@ -18,6 +17,9 @@ export function createSessionCommandsApi(bag) {
     routeState,
     syncContextStats,
     replaceItems,
+    // Injected by the store composer (session-local.mjs): the doctor checks
+    // live in the app layer, which the session layer must not import.
+    doctor,
   } = bag;
 
   // Run `work` under the command lock with a visible commandStatus.
@@ -150,8 +152,8 @@ export function createSessionCommandsApi(bag) {
         // Yield one event-loop turn so Ink paints the running indicator
         // before the health checks start — same pattern as compact.
         await new Promise((resolve) => setTimeout(resolve, 0));
-        const result = await runDoctorChecks(runtime, getState);
-        if (options.notice) pushNotice(formatDoctorReport(result), 'info');
+        const result = await doctor.runDoctorChecks(runtime, getState);
+        if (options.notice) pushNotice(doctor.formatDoctorReport(result), 'info');
         return result;
       });
     },

package/src/tui/session/session-api/controls.mjs

@@ -6,7 +6,7 @@ import { projectNameFromPath } from '../labels.mjs';
 import { recomputePromptHistory } from '../prompt-history.mjs';
 import { appendPromptHistory, buildMergedPromptHistory, loadPromptHistory } from '../../prompt-history-store.mjs';
 import { abortGoalTurn } from '../goal-turn-state.mjs';
-import { goalStateSnapshot } from '../../../session-runtime/goal-state.mjs';
+import { goalStateSnapshot } from '../../../runtime/agent/orchestrator/runtime-core/goal-state.mjs';
 import { createApiHelpers } from './shared.mjs';
 
 export function createSessionControlsApi(bag) {

package/src/tui/session/session-api/intake/submission.mjs

@@ -61,9 +61,14 @@ export function createSubmissionIntake(bag) {
     // If autoClearBeforeSubmit rejects (e.g. compaction timeout throws), the
     // prompt must still be queued — swallow the rejection so enqueue always
     // runs and the submit is never silently lost.
-    void autoClearBeforeSubmit()
-      .catch(() => {})
-      .then(() => enqueueSubmission(intake));
+    // A synchronous throw is the same failure as a rejection.
+    let autoClear;
+    try {
+      autoClear = Promise.resolve(autoClearBeforeSubmit());
+    } catch {
+      autoClear = Promise.resolve();
+    }
+    void autoClear.catch(() => {}).then(() => enqueueSubmission(intake));
     return true;
   };
 

package/src/tui/session/session-api/integrations.mjs

@@ -9,7 +9,7 @@ import { createApiHelpers } from './shared.mjs';
 
 /** Per-file line counts of a unified diff, shaped like a Git snapshot's
  *  files (the turn review bar renders either the same way). */
-export function filesFromPatch(patch) {
+function filesFromPatch(patch) {
   const files = [];
   let current = null;
   for (const line of String(patch || '').split('\n')) {

package/src/tui/session/session-api/routes.mjs

@@ -49,8 +49,13 @@ export function createSessionRouteApi(bag) {
     resetStats,
     resetStatsAndSyncContext,
   } = bag;
-  const { withCommandLock } = createApiHelpers({ getState, set, resetStatsAndSyncContext, routeState });
-  const publishRoute = () => set({ ...routeState(), stats: { ...getState().stats } });
+  const { withCommandLock, publishRoute, deferStatsRefresh } = createApiHelpers({
+    getState,
+    set,
+    resetStatsAndSyncContext,
+    routeState,
+    syncContextStats,
+  });
   let routeWrite = null;
   let routeSequence = 0;
 
@@ -182,12 +187,8 @@ export function createSessionRouteApi(bag) {
       const result = await runtime.setOutputStyle?.(styleId);
       resetStats();
       publishRoute();
-      // Defer the context recompute (transcript scan) off this tick so the
-      // style change repaints immediately; stats settle right after.
-      setTimeout(() => {
-        syncContextStats({ allowEstimated: true });
-        set({ stats: { ...getState().stats } });
-      }, 0);
+      // Style change repaints immediately; stats settle right after.
+      deferStatsRefresh();
       return result;
     }),
     setWorkflow: withCommandLock(async (workflowId) => {