dsh-code 0.1.0 → 0.3.0

package/src/approval.ts

@@ -0,0 +1,126 @@
+/**
+ * The terminal approval answerer: one `approval/request` waterfall listener
+ * that renders the pending question as a y/n bar and resolves the decision
+ * back into the waterfall. Mirrors the web host's composer takeover — the
+ * service (audit pair, policy gate, fail-closed defaults) all live in
+ * dsh-base; this module only answers for agents this TUI owns.
+ *
+ * Vocabulary note: a client answerer may only ever resolve `'allowed-once'`
+ * or `'rejected'`; `'cancelled'` belongs to the request signal and
+ * `'unavailable'` to the fail-closed waterfall default.
+ *
+ * @module @deepseek-ai/dsh-code/approval
+ */
+
+import type { Context } from '@deepseek-ai/cordis'
+import type { Agent } from '@deepseek-ai/dsh-agent'
+import type { ApprovalOutcome, ApprovalRequest } from '@deepseek-ai/dsh-user-approval'
+
+/** The answer values a client answerer may resolve with. */
+export type ApprovalAnswer = 'allowed-once' | 'rejected'
+
+/** One pending approval question, derived from the request for rendering. */
+export interface PendingApproval {
+  /** The asker's human-readable explanation, or a generic fallback. */
+  headline: string
+  /** The tool the question is about. */
+  toolName: string
+  /** Command-line preview resolved from the paired streaming tool call. */
+  command: string
+  /** Resolve the ask; calling twice is inert (one-shot latch). */
+  answer(outcome: ApprovalAnswer): void
+}
+
+/** The pending-question snapshot the renderer subscribes to. */
+export interface ApprovalSnapshot {
+  /** The pending question, or undefined when none is being asked. */
+  pending: PendingApproval | undefined
+  /** Presentational: an answer was submitted, the ask has not settled yet. */
+  answered: boolean
+}
+
+/** Store the pending question lands in; the renderer reads, the answerer writes. */
+export interface ApprovalStore {
+  /** Subscribe to pending-state changes; returns the unsubscribe function. */
+  subscribe(listener: () => void): () => void
+  /** Read the current snapshot (identity-stable between changes). */
+  getSnapshot(): ApprovalSnapshot
+}
+
+/**
+ * Create the approval store and mount the answerer listener on the context.
+ * The listener claims only requests for `owns`-owned agents and defers every
+ * other request back into the waterfall (`next()`), so sibling answerers stay
+ * usable. An aborted ask never reaches the human. Plugin teardown removes the
+ * listener; the service then fails its own question closed.
+ * @param ctx - plugin context whose event bus carries `approval/request`.
+ * @param owns - agents this terminal answers for.
+ * @param preview - resolves a tool-call preview for a pending request (the
+ * request contract carries no arguments; the UI self-serves from the
+ * transcript projection via `callId`).
+ * @returns the store the renderer subscribes to.
+ */
+export function mountApprovalAnswerer(
+  ctx: Context,
+  owns: (agent: Agent) => boolean,
+  preview: (request: ApprovalRequest) => string,
+): ApprovalStore {
+  let snapshot: ApprovalSnapshot = { pending: undefined, answered: false }
+  const listeners = new Set<() => void>()
+  const set = (next: ApprovalSnapshot): void => {
+    snapshot = next
+    for (const listener of listeners) listener()
+  }
+
+  ctx.on('approval/request', (request: ApprovalRequest, next: () => Promise<ApprovalOutcome>) => {
+    if (!owns(request.agent)) return next()
+    // An already-aborted ask never reaches the human (mirrors the host bridge).
+    if (request.signal?.aborted === true) return Promise.resolve<ApprovalOutcome>('cancelled')
+
+    let resolved = false
+    let settle!: (outcome: ApprovalOutcome) => void
+    const withdraw = (): void => {
+      if (resolved) return
+      resolved = true
+      set({ pending: undefined, answered: false })
+      // The service's signal race would conclude 'cancelled' anyway; settle
+      // the same way so this listener never dangles a pending promise.
+      settle('cancelled')
+    }
+    if (request.signal !== undefined) {
+      request.signal.addEventListener('abort', withdraw, { once: true })
+    }
+    const pending: PendingApproval = {
+      headline: request.reason ?? `tool ${request.toolName} asks for your approval`,
+      toolName: request.toolName,
+      command: preview(request),
+      answer: (outcome: ApprovalAnswer): void => {
+        // One-shot latch: a second keypress after submission is inert.
+        if (resolved) return
+        resolved = true
+        set({ pending, answered: true })
+        settle(outcome)
+      },
+    }
+    set({ pending, answered: false })
+
+    return new Promise<ApprovalOutcome>((resolve) => {
+      settle = resolve
+    }).then((outcome) => {
+      if (outcome !== 'cancelled') set({ pending: undefined, answered: false })
+      return outcome
+    })
+  })
+
+  return {
+    subscribe(listener: () => void): () => void {
+      listeners.add(listener)
+      return () => {
+        listeners.delete(listener)
+      }
+    },
+    getSnapshot(): ApprovalSnapshot {
+      return snapshot
+    },
+  }
+}

package/src/commands.ts

@@ -0,0 +1,71 @@
+/**
+ * Slash-command bridge: forwards terminal command lines into the shared
+ * `ctx.commands` registry (the same surface the web composer dispatches
+ * through) and exposes the live descriptor list as completion candidates.
+ * The runner keeps only its own TUI-local commands (`/help`, `/quit`,
+ * `/clear`, `/model`) ahead of the registry dispatch.
+ *
+ * @module @deepseek-ai/dsh-tui/commands
+ */
+
+import type { Context } from '@deepseek-ai/cordis'
+import type { Agent } from '@deepseek-ai/dsh-agent'
+import type { CommandDescriptor } from '@deepseek-ai/dsh-commands'
+
+/** Descriptor list snapshot the completion menu renders from. */
+export interface CommandsView {
+  /** Name-sorted descriptors after scoped shadowing. */
+  readonly descriptors: readonly CommandDescriptor[]
+  /** Subscribe to list changes (`commands/change`); returns the unsubscribe function. */
+  subscribe(listener: () => void): () => void
+  /** Retarget the agent whose scoped view the list is read through. */
+  setAgent(agent: Agent): void
+}
+
+/**
+ * Watch the live command registry. Reads the current list immediately and
+ * re-reads on every registry mutation or agent retarget; notification
+ * failures are contained by the registry itself, so this watcher only ever
+ * re-reads. Without a `commands` service the view stays empty and all lines
+ * fall through to normal prompts.
+ * @param ctx - context carrying the `commands` service (optional).
+ * @returns the view the completion menu subscribes to.
+ */
+export function watchCommands(ctx: Context): CommandsView {
+  const commands = ctx.get('commands')
+  let agent: Agent | undefined
+  let descriptors: readonly CommandDescriptor[] = []
+  const listeners = new Set<() => void>()
+  const refresh = (): void => {
+    if (commands === undefined || agent === undefined) return
+    descriptors = commands.list(agent)
+    for (const listener of listeners) listener()
+  }
+  if (commands !== undefined) {
+    ctx.on('commands/change', () => refresh())
+  }
+  return {
+    get descriptors(): readonly CommandDescriptor[] {
+      return descriptors
+    },
+    subscribe(listener: () => void): () => void {
+      listeners.add(listener)
+      return () => {
+        listeners.delete(listener)
+      }
+    },
+    setAgent(next: Agent): void {
+      agent = next
+      refresh()
+    },
+  }
+}
+
+/**
+ * Whether one command line is a syntactically valid slash command.
+ * @param line - the complete candidate line.
+ * @returns true when the line parses as `/name` or `/name input`.
+ */
+export function isSlashLine(line: string): boolean {
+  return /^\/[a-z][a-z0-9_-]*(?=$|[\t ])/u.test(line)
+}

package/src/index.ts

@@ -1,12 +1,13 @@
 /**
- * @deepseek-ai/dsh-tui — the interactive terminal driver. The bundle patch
+ * @deepseek-ai/dsh-code — the interactive terminal driver. The bundle patch
  * rides over dsh-base without Host, HTTP, or browser plugins; this runner
- * creates one Agent through the core registry, mounts the Ink app (DeepSeek
- * blue, whale wordmark), folds submitted prompts into the same durable
- * session, streams `session/event` into the transcript, and on quit flushes
- * and requests process exit.
+ * creates (or resumes) one Agent through the core registry, mounts the Ink
+ * app (DeepSeek blue, whale wordmark), folds submitted prompts into the same
+ * durable session, answers approval asks with a y/n bar, dispatches slash
+ * commands through the shared registry, and on quit flushes and requests
+ * process exit.
  *
- * @module @deepseek-ai/dsh-tui
+ * @module @deepseek-ai/dsh-code
  */
 
 import { randomUUID } from 'node:crypto'
@@ -14,19 +15,28 @@ import { readFileSync } from 'node:fs'
 import { basename, join } from 'node:path'
 import { createElement } from 'react'
 import type { Context } from '@deepseek-ai/cordis'
+import z from '@deepseek-ai/schemastery'
 import { installModelSelection } from '@deepseek-ai/dsh-agent'
-import type { ModelSelectionRef } from '@deepseek-ai/dsh-agent'
+import type { Agent, ModelSelection, ModelSelectionRef } from '@deepseek-ai/dsh-agent'
 import type {} from '@deepseek-ai/dsh-agent-default-model'
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
-import { SessionId } from '@deepseek-ai/dsh-session'
-import type { Session, SessionEvent } from '@deepseek-ai/dsh-session'
+import { SessionId, type Session, type SessionEvent, type SessionHeader, type UserMessage } from '@deepseek-ai/dsh-session'
+import type { SessionPersistence } from '@deepseek-ai/dsh-session-persistence'
 // Empty type imports carry the loader Context merge for the settlement await
 // and the cmdline Context merge for the appExit host value.
 import type {} from '@deepseek-ai/cordis-plugin-loader'
 import type {} from '@deepseek-ai/dsh-cmdline'
 import { App } from './app.ts'
+import { mountApprovalAnswerer, type ApprovalStore } from './approval.ts'
+import { isSlashLine, watchCommands, type CommandsView } from './commands.ts'
 import { internals, type TuiMount } from './internals.ts'
+import { loadModelDirectory, type ModelRow } from './models.ts'
+import { createMentions, type MentionsApi } from './mentions.ts'
+import { mountQuestionProvider, type QuestionStore } from './questions.ts'
 import { createTranscriptStore } from './store.ts'
+import { watchSkills, type SkillsView } from './skills.ts'
+import { toolArgumentsPreview } from './render/tool-preview.ts'
+import type { TuiStartup } from './startup.ts'
 
 /** Stable Cordis plugin name. */
 export const name = 'tui-runner'
@@ -34,6 +44,19 @@ export const name = 'tui-runner'
 /** Core services required before the interactive session can start. */
 export const inject = ['agentDefaultModel', 'agents', 'sessions']
 
+/** Plugin config: the startup resolved from this app's injected provider service. */
+export interface Config {
+  /** How this invocation obtains its session identity (validated loosely; narrowed in {@link apply}). */
+  startup: { kind: string; sessionId?: string }
+}
+
+export const Config: z<Config> = z.object({
+  startup: z.object({
+    kind: z.string().required(),
+    sessionId: z.string(),
+  }),
+})
+
 /** Process-facing effects of the runner: the Ink mount plus the launcher's exit request. */
 interface TuiIo {
   mount: typeof internals.mount
@@ -62,40 +85,186 @@ function gitBranch(cwd: string): string {
   }
 }
 
+/** The session identity this invocation will run, plus whether it is resumed. */
+interface Target {
+  sessionId: string
+  resume: boolean
+}
+
+/**
+ * Resolve the invocation's target session against the persisted headers.
+ * @param startup - the parsed startup flags.
+ * @param persistence - the persistence service; required for resume/latest.
+ * @param cwd - the working directory `--continue` filters by.
+ * @returns the target identity.
+ * @throws with a user-facing message when the flags name nothing resolvable.
+ */
+async function resolveTarget(startup: TuiStartup, persistence: SessionPersistence | undefined, cwd: string): Promise<Target> {
+  if (startup.kind === 'fresh') return { sessionId: `session-${randomUUID()}`, resume: false }
+  if (startup.kind === 'named') return { sessionId: startup.sessionId, resume: false }
+  if (persistence === undefined) {
+    throw new Error('cannot resolve the requested session: session persistence is not configured')
+  }
+  const headers: readonly SessionHeader[] = await persistence.list()
+  if (startup.kind === 'resume') {
+    const wanted = startup.sessionId
+    const exact = headers.filter(header => header.id === wanted)
+    const matches = exact.length > 0 ? exact : headers.filter(header => header.id.startsWith(wanted))
+    if (matches.length === 0) throw new Error(`no persisted session matches "${wanted}"`)
+    if (matches.length > 1) {
+      throw new Error(`session prefix "${wanted}" is ambiguous (${matches.length} matches): use more of the id`)
+    }
+    return { sessionId: matches[0]!.id, resume: true }
+  }
+  // --continue: the newest persisted session whose header pins this cwd.
+  const local = headers
+    .filter(header => header.cwd === cwd)
+    .sort((left, right) => right.createdAt - left.createdAt)
+  if (local.length === 0) throw new Error(`no persisted session for this directory (${cwd}); start one without --continue`)
+  return { sessionId: local[0]!.id, resume: true }
+}
+
 /**
- * Run the interactive terminal session: create one Agent, mount the app, and
- * keep the process alive until the user quits.
+ * Resolve a bounded command preview for one pending approval: the request
+ * contract carries no arguments, so the bar self-serves from the transcript
+ * projection via `callId` (mirrors the web ApprovalPanel's argsRaw lookup).
+ * @param events - the transcript entries to search.
+ * @param callId - the tool call the question is about, when the asker had one.
+ * @param toolName - the tool the question is about.
+ * @returns a bounded preview line, '' when nothing useful resolves.
+ */
+function approvalCommandPreview(events: readonly { kind: string }[], callId: string | undefined, toolName: string): string {
+  if (callId === undefined) return ''
+  const entry = events.find(candidate =>
+    candidate.kind === 'tool' && (candidate as { callId?: string }).callId === callId)
+  if (entry === undefined) return ''
+  const args = (entry as { arguments?: string }).arguments ?? ''
+  return toolArgumentsPreview(args, toolName)
+}
+
+/** The runner's connection between the React app and the process side. */
+interface AppBridge {
+  /** Post one local notice line (feedback the transcript does not carry). */
+  notify(text: string): void
+}
+
+/**
+ * Run the interactive terminal session: resolve the target session, create or
+ * resume one Agent, mount the app, and keep the process alive until the user
+ * quits.
  * @param ctx - plugin context carrying the Agent, default model, Session, and launcher IO services.
+ * @param startup - the parsed invocation flags.
  * @param io - process-facing effects.
  */
-async function run(ctx: Context, io: TuiIo): Promise<void> {
+async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void> {
   // Loader siblings mount concurrently. Await the complete application before
   // creating an Agent so its scoped tools and adapters are not half-composed.
   await ctx.get('loader')?.await()
   const agents = ctx.get('agents')
   const defaultModel = ctx.get('agentDefaultModel')
   const sessions = ctx.get('sessions')
+  const persistence = ctx.get('sessionPersistence')
   // Early process shutdown can dispose the tree while settlement is pending.
   if (agents === undefined || defaultModel === undefined || sessions === undefined) return
 
-  const selection = defaultModel.currentSelection()
-  // This bundle composes no preset roster, so the model-facing rows sit in the
-  // host plane and the agent reads them from the global layer (mirrors dsh-headless).
-  const { agent } = await agents.create({
-    sessionId: SessionId(`session-${randomUUID()}`),
-    meta: { cwd: process.cwd() },
-    agentOptions: { provider: selection.provider, model: selection.model },
-    setup: (agentCtx) => {
-      const selected: ModelSelectionRef = { current: selection, assembled: undefined }
-      installModelSelection(agentCtx, selected)
-    },
-  })
+  const cwd = process.cwd()
+  const target = await resolveTarget(startup, persistence, cwd)
+
+  const defaults = defaultModel.currentSelection()
+  let picked: ModelSelection | undefined
+  let session: Session
+  let agent: Agent
+  if (target.resume) {
+    const resumed = await agents.resume({
+      resumeSessionId: SessionId(target.sessionId),
+      agentOptions: { provider: defaults.provider, model: defaults.model },
+      setup: (agentCtx) => {
+        // The getter order mirrors the web host's resume selection: an
+        // in-process switch wins, then the session's own last logged request
+        // header, then the deployment default. Without this, a resumed
+        // session's first request would silently fall back to the default.
+        const selection: ModelSelectionRef = {
+          get current(): ModelSelection | undefined {
+            if (picked !== undefined) return picked
+            const logged = agentCtx.agent?.session.requestHeader()?.config
+            if (logged !== undefined) {
+              return {
+                provider: logged.provider,
+                model: logged.model,
+                ...logged.reasoningEffort === undefined ? {} : { reasoningEffort: logged.reasoningEffort },
+              }
+            }
+            return defaults
+          },
+          set current(next: ModelSelection | undefined) {
+            picked = next
+          },
+          assembled: undefined,
+        }
+        installModelSelection(agentCtx, selection)
+      },
+    })
+    agent = resumed.agent
+    session = agent.session
+  } else {
+    const created = await agents.create({
+      sessionId: SessionId(target.sessionId),
+      meta: { cwd },
+      agentOptions: { provider: defaults.provider, model: defaults.model },
+      setup: (agentCtx) => {
+        // Same getter shape as resume, minus the logged-header arm (a fresh
+        // session has no request header yet).
+        const selection: ModelSelectionRef = {
+          get current(): ModelSelection | undefined {
+            return picked ?? defaults
+          },
+          set current(next: ModelSelection | undefined) {
+            picked = next
+          },
+          assembled: undefined,
+        }
+        installModelSelection(agentCtx, selection)
+      },
+    })
+    agent = created.agent
+    session = agent.session
+  }
 
-  const store = createTranscriptStore()
-  const off = ctx.on('session/event', (session: Session, event: SessionEvent) => {
-    if (session.id === agent.session.id) store.apply(event)
+  // Seed the transcript from the full session log: constructor seeds never
+  // fire on `session/event`, so a resumed session paints its history once,
+  // here, before the first render.
+  const store = createTranscriptStore(session.events)
+  const off = ctx.on('session/event', (subject: Session, event: SessionEvent) => {
+    if (subject.id === session.id) store.apply(event)
   })
 
+  const commands: CommandsView = watchCommands(ctx)
+  commands.setAgent(agent)
+
+  const skills: SkillsView = watchSkills(ctx)
+  skills.setAgent(agent)
+
+  // Approval answerer: renders the ask as a y/n bar; only this TUI's agent is
+  // claimed, every other ask falls through to the fail-closed waterfall.
+  const approval: ApprovalStore = mountApprovalAnswerer(
+    ctx,
+    candidate => candidate.id === agent.id,
+    request => approvalCommandPreview(store.getView().entries, request.callId, request.toolName),
+  )
+
+  // ask_user_question provider: the single UI provider on the shared service,
+  // one request on screen at a time. Plan reviews (exit_plan_mode) arrive
+  // through this same pipe.
+  const questions: QuestionStore = mountQuestionProvider(ctx)
+
+  // @mention support: workspace file scan plus the opt-in session-reference
+  // service (the patch mounts it); submission expands session mentions.
+  const mentions: MentionsApi = createMentions(ctx, agent, session.header.cwd ?? cwd)
+
+  // The bridge the React app registers on mount: local notices from the
+  // process side (unknown commands, switch confirmations, cancels).
+  const bridge: AppBridge = { notify: () => {} }
+
   // The mount handle lives in a box: quit closes over it, while the mount
   // itself is created after quit (the App element needs quit as a prop).
   const mountRef: { current?: TuiMount } = {}
@@ -105,7 +274,7 @@ async function run(ctx: Context, io: TuiIo): Promise<void> {
     quitting = true
     off()
     mountRef.current?.unmount()
-    void sessions.flush(agent.session)
+    void sessions.flush(session)
       .catch((flushError: unknown) => {
         // The session log already carries every durable event; a failed flush
         // must not trap the user in a dead terminal, so report and still exit.
@@ -114,27 +283,171 @@ async function run(ctx: Context, io: TuiIo): Promise<void> {
       .then(() => { io.exit(0) })
   }
 
+  /** Run one slash line through the command registry (closed namespace). */
+  const runSlash = (line: string): void => {
+    const registry = ctx.get('commands')
+    if (registry === undefined) {
+      bridge.notify('no command registry is mounted in this composition')
+      return
+    }
+    const controller = new AbortController()
+    void registry.execute(agent, line, controller.signal).then((execution) => {
+      if (execution === undefined) {
+        // No command owns this line: send it verbatim so a user-invocable
+        // skill gesture (`/skill-name`) reaches the host's tool-skill
+        // pre-step injection — the web composer's same fall-through.
+        agent.followup(createUserMessage({
+          content: [{ type: 'text', text: line }],
+          source: { kind: 'user' },
+        }))
+      }
+    }, (error: unknown) => {
+      bridge.notify(`command failed: ${error instanceof Error ? error.message : String(error)}`)
+    })
+  }
+
+  /** Deliver one readable line to the agent, expanding session mentions first. */
+  const send = (text: string, mode: 'followup' | 'steer'): void => {
+    const line = text.trim()
+    if (line === '') return
+    // The command registry is a closed namespace: slash lines run out of
+    // band and never reach the model through this path (steering keeps the
+    // registry out of the inbox, so slash lines steer as literal text).
+    if (isSlashLine(line) && mode === 'followup') {
+      runSlash(line)
+      return
+    }
+    let parsed: ReturnType<typeof mentions.parse>
+    try {
+      parsed = mentions.parse(line)
+    } catch (error: unknown) {
+      bridge.notify(`invalid session reference: ${error instanceof Error ? error.message : String(error)}`)
+      return
+    }
+    const deliver = (readable: string, context?: UserMessage): void => {
+      // Session snapshots ride the inbox as model-facing context ahead of
+      // the readable message (upstream README wiring: inject before the
+      // followup/steer that wakes the driver).
+      if (context !== undefined) agent.inject(context)
+      const message = createUserMessage({
+        content: [{ type: 'text', text: readable }],
+        source: { kind: 'user' },
+      })
+      if (mode === 'steer') {
+        agent.steer(message)
+        bridge.notify('steering queued — the next step sees it')
+      } else {
+        agent.followup(message)
+      }
+    }
+    if (parsed.references.length === 0) {
+      deliver(parsed.text)
+      return
+    }
+    const controller = new AbortController()
+    void mentions.prepare(parsed, controller.signal).then((prepared) => {
+      deliver(prepared.text, prepared.additionalContext)
+    }, (error: unknown) => {
+      if (controller.signal.aborted) return
+      bridge.notify(`session reference failed: ${error instanceof Error ? error.message : String(error)}`)
+    })
+  }
+
+  /** Dispatch one submitted line: slash commands to the registry, other text to the agent. */
+  const dispatch = (text: string): void => {
+    send(text, 'followup')
+  }
+
+  /**
+   * Submit steering: a running driver consumes the text at its next step
+   * boundary (the inbox delivers between steps); an idle driver just starts
+   * a turn, so this doubles as the busy-state submit path.
+   */
+  const steer = (text: string): void => {
+    send(text, 'steer')
+  }
+
+  /** Interrupt the running turn (Esc); true when a turn was actually cancelled. */
+  const interrupt = (): boolean => {
+    if (agent.status !== 'running') return false
+    agent.cancel({ kind: 'user' })
+    bridge.notify('turn cancelled — Ctrl+C or /quit to exit')
+    return true
+  }
+
+  /**
+   * Cycle to the next permission preset (Shift+Tab, the Claude-Code
+   * permission-mode convention mapped onto dsh presets). A session in a
+   * custom knob state wraps to the first declared preset.
+   */
+  const cyclePermission = (): string => {
+    const service = ctx.get('permissionPresets') as
+      | {
+        names: readonly string[]
+        current(events: readonly SessionEvent[]): string
+        set(target: Session, preset: string): void
+      }
+      | undefined
+    if (service === undefined || service.names.length === 0) {
+      bridge.notify('permission presets are not mounted in this composition')
+      return ''
+    }
+    const at = service.names.indexOf(service.current(session.events))
+    const next = service.names[(at + 1) % service.names.length] ?? ''
+    if (next === '') return ''
+    service.set(session, next)
+    return next
+  }
+
+  /** Apply one /model selection: takes effect from the next assembled step. */
+  const selectModel = (row: ModelRow): string => {
+    picked = { provider: row.provider, model: row.model }
+    return `${row.provider}/${row.model}`
+  }
+
+  const initialModel = store.getView().model !== ''
+    ? store.getView().model
+    : `${defaults.provider}/${defaults.model}`
+
   mountRef.current = io.mount(createElement(App, {
     store,
-    model: `${selection.provider}/${selection.model}`,
-    cwd: basename(process.cwd()),
-    branch: gitBranch(process.cwd()),
-    sessionId: agent.session.id.slice(-8),
-    onSubmit: (text: string) => {
-      agent.followup(createUserMessage({
-        content: [{ type: 'text', text }],
-        source: { kind: 'user' },
-      }))
+    approval,
+    questions,
+    commands,
+    skills,
+    model: initialModel,
+    cwd: basename(cwd),
+    branch: gitBranch(cwd),
+    sessionId: session.id.slice(-8),
+    resumed: target.resume,
+    dispatch,
+    steer,
+    interrupt,
+    quit,
+    loadModels: () => loadModelDirectory(ctx),
+    loadMentions: mentions.candidates,
+    cyclePermission,
+    selectModel,
+    onBridgeReady: (instance: AppBridge) => {
+      bridge.notify = instance.notify
     },
-    onQuit: quit,
   }))
 }
 
 /**
  * Mount the interactive terminal driver.
  * @param ctx - plugin context carrying core services and the launcher-provided exit request.
+ * @param config - validated startup config resolved from the tuiStartup provider.
  */
-export function apply(ctx: Context): void {
+export function apply(ctx: Context, config: Config): void {
+  const startup: TuiStartup =
+    config.startup.kind === 'resume' && config.startup.sessionId !== undefined
+      ? { kind: 'resume', sessionId: config.startup.sessionId }
+      : config.startup.kind === 'latest'
+        ? { kind: 'latest' }
+        : config.startup.kind === 'named' && config.startup.sessionId !== undefined
+          ? { kind: 'named', sessionId: config.startup.sessionId }
+          : { kind: 'fresh' }
   // Read through the global service store, not the property proxy: appExit is
   // an optional host value, never an injected dependency.
   const exit = ctx.get('appExit')
@@ -142,5 +455,5 @@ export function apply(ctx: Context): void {
     throw new Error('tui-runner: the launcher must provide ctx.appExit before the tree mounts')
   }
   const io: TuiIo = { mount: internals.mount, exit }
-  void run(ctx, io).catch((error: unknown) => { fail(io, error) })
+  void run(ctx, startup, io).catch((error: unknown) => { fail(io, error) })
 }