dsh-code 1.3.0 → 1.5.0

package/src/{kernel-panels.ts → panels/kernel-panels.ts}

@@ -2,25 +2,29 @@
 
 import { createElement, useCallback, useEffect, useMemo, useRef, useState, type ReactElement } from 'react'
 import { Box, Text, useInput, useStdout } from 'ink'
-import type { ModelDirectory, ModelRow } from './models.ts'
-import type { SubagentRow } from './subagents.ts'
-import type { ScheduleRow } from './render/projection.ts'
-import type { PermissionRow } from './permissions.ts'
-import type { PresetRow } from './presets.ts'
-import type { PluginRow } from './plugin-inventory.ts'
-import type { SessionDirectoryOptions, SessionRow } from './session-directory.ts'
-import { formatRelativeTime, matchSessionRow } from './session-directory.ts'
-import type { ReviewBranch, ReviewCommit, ReviewSelection } from './git-workflow.ts'
-import { panelViewport, revealRow } from './render/inspector.ts'
-import { markdownLines, textLines, type LineStyle, type StyledLine } from './render/lines.ts'
-import { usageLines, type UsageView } from './render/usage.ts'
-import { deleteLastGrapheme } from './render/editor.ts'
-import { stripPasteMarkers } from './keyboard.ts'
-import { DEFAULT_STATUSLINE_ITEMS, localizedStatusItems, type StatusItemId } from './render/status.ts'
-import { singleLineText, truncateColumns } from './render/text.ts'
-import { panelAccent } from './panel-accent.ts'
-import { t } from './i18n.ts'
-import { getPalette, inkColor } from './theme.ts'
+import type { ModelDirectory, ModelRow } from '../models.ts'
+import type { SubagentRow } from '../session/subagents.ts'
+import type { SearchRow } from '../runner/search-rows.ts'
+export type { SearchRow } from '../runner/search-rows.ts'
+import type { ScheduleRow } from '../render/projection.ts'
+import type { PermissionRow } from '../permissions.ts'
+import type { PresetRow } from '../presets.ts'
+import type { PluginRow } from '../plugin-inventory.ts'
+import type { SessionDirectoryOptions, SessionRow } from '../session/session-directory.ts'
+import { formatRelativeTime, matchSessionRow } from '../session/session-directory.ts'
+import type { ReviewBranch, ReviewCommit, ReviewSelection } from '../git-workflow.ts'
+import { expandedDocumentViewport, panelViewport, revealRow } from '../render/inspector.ts'
+import { markdownLines, textLines, type LineStyle, type StyledLine } from '../render/lines.ts'
+import { usageLines, type UsageView } from '../render/usage.ts'
+import { deleteLastGrapheme } from '../render/editor.ts'
+import { stripPasteMarkers } from '../keyboard.ts'
+import { DEFAULT_STATUSLINE_ITEMS, localizedStatusItems, type StatusItemId } from '../render/status.ts'
+import { singleLineText, truncateColumns } from '../render/text.ts'
+import { panelAccent } from '../ui/panel-accent.ts'
+import { editQuery } from '../ui/query-editor.ts'
+export { editQuery } from '../ui/query-editor.ts'
+import { t } from '../i18n.ts'
+import { getPalette, inkColor } from '../theme.ts'
 
 interface ListFrameProps {
   readonly title: string
@@ -96,18 +100,6 @@ function ListFrame(props: ListFrameProps): ReactElement {
   )
 }
 
-/**
- * Apply one keystroke to a panel search query. IME commits arrive as one
- * multi-character chunk, so the whole printable run is appended; paste
- * markers are stripped and control-laden chunks are ignored.
- */
-export function editQuery(query: string, input: string, key: { backspace?: boolean; delete?: boolean }): string | undefined {
-  if (key.backspace || key.delete) return deleteLastGrapheme(query)
-  const text = stripPasteMarkers(input)
-  if (text !== '' && !/[\u0000-\u001f\u007f]/u.test(text)) return query + text
-  return undefined
-}
-
 export function ModePanel({ current, load, select, close }: {
   current: string
   load: () => Promise<readonly PresetRow[]>
@@ -472,24 +464,50 @@ function DocumentRows({ lines }: { lines: readonly StyledLine[] }): ReactElement
   )
 }
 
-function DocumentPanel({ title, text, error, close }: {
+function DocumentPanel({ title, text, error, close, onRefresh, onExpand }: {
   title: string
   text?: string
   error?: string
   close: () => void
+  /** Re-read the document; offered as `r` (running subagents keep moving). */
+  onRefresh?: () => void
+  /** Replace this preview with a fuller surface (subagent attachment). */
+  onExpand?: () => void
 }): ReactElement {
   const stdout = useStdout().stdout
-  const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30)
+  // Expanded mode: the document replaces the transcript area (near the whole
+  // terminal minus the bottom live region), entered from the preview with
+  // Enter/f. Esc leaves for the caller's list directly — the preview is a
+  // peek step, not a level to back through.
+  const [expanded, setExpanded] = useState(false)
+  const viewport = expanded
+    ? expandedDocumentViewport(stdout?.columns ?? 80, stdout?.rows ?? 30)
+    : panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30)
   const [scroll, setScroll] = useState(0)
   const lines = useMemo(() => text === undefined ? [] : markdownLines(text, viewport.contentColumns), [text, viewport.contentColumns])
+  const maxScroll = Math.max(0, lines.length - viewport.bodyRows)
   useInput((input, key) => {
     if (key.escape || input === 'q' || input === 't') return close()
+    // Ctrl+D keeps its step-out meaning: empty-draft exit in the composer,
+    // leave-the-document here.
+    if (expanded && key.ctrl && input === 'd') return close()
+    if (!expanded && (key.return || input === 'f')) {
+      if (onExpand !== undefined) {
+        close()
+        onExpand()
+        return
+      }
+      setExpanded(true)
+      setScroll(value => Math.min(value, Math.max(0, lines.length - expandedDocumentViewport(stdout?.columns ?? 80, stdout?.rows ?? 30).bodyRows)))
+      return
+    }
+    if (expanded && input === 'r' && onRefresh !== undefined) return onRefresh()
     if (key.upArrow) return setScroll(value => Math.max(0, value - 1))
-    if (key.downArrow) return setScroll(value => Math.min(Math.max(0, lines.length - viewport.bodyRows), value + 1))
+    if (key.downArrow) return setScroll(value => Math.min(maxScroll, value + 1))
     if (key.pageUp) return setScroll(value => Math.max(0, value - Math.max(1, viewport.bodyRows - 1)))
-    if (key.pageDown) return setScroll(value => Math.min(Math.max(0, lines.length - viewport.bodyRows), value + Math.max(1, viewport.bodyRows - 1)))
+    if (key.pageDown) return setScroll(value => Math.min(maxScroll, value + Math.max(1, viewport.bodyRows - 1)))
     if (input === 'g') return setScroll(0)
-    if (input === 'G') return setScroll(Math.max(0, lines.length - viewport.bodyRows))
+    if (input === 'G') return setScroll(maxScroll)
   })
   if (viewport.compact) return createElement(Text, { wrap: 'truncate-end' }, truncateColumns(t('document.compact'), viewport.contentColumns))
   const body: readonly StyledLine[] = error !== undefined
@@ -500,10 +518,12 @@ function DocumentPanel({ title, text, error, close }: {
   const accent = panelAccent('kernel-transcript', getPalette().dim, getPalette().brandBright)
   return createElement(
     Box,
-    { width: viewport.outerColumns, borderStyle: 'round', borderColor: inkColor(accent.border), flexDirection: 'column', paddingX: 1 },
-    createElement(Text, { color: inkColor(accent.title), wrap: 'truncate-end' }, truncateColumns(singleLineText(title), viewport.contentColumns)),
+    { width: viewport.outerColumns, borderStyle: 'round', borderColor: expanded ? inkColor(accent.title) : inkColor(accent.border), flexDirection: 'column', paddingX: 1 },
+    createElement(Text, { color: inkColor(accent.title), wrap: 'truncate-end' }, truncateColumns(singleLineText(title) + (expanded ? ` · ${t('document.expanded')}` : ''), viewport.contentColumns)),
     createElement(DocumentRows, { lines: body }),
-    createElement(Text, { dimColor: true, wrap: 'truncate-end' }, truncateColumns(t('document.footer', { from: lines.length === 0 ? 0 : scroll + 1, to: Math.min(lines.length, scroll + viewport.bodyRows), total: lines.length }), viewport.contentColumns)),
+    createElement(Text, { dimColor: true, wrap: 'truncate-end' }, truncateColumns(expanded
+      ? t('document.footerExpanded', { from: lines.length === 0 ? 0 : scroll + 1, to: Math.min(lines.length, scroll + viewport.bodyRows), total: lines.length, refresh: onRefresh === undefined ? '' : ` · ${t('document.refreshHint')}` })
+      : t('document.footer', { from: lines.length === 0 ? 0 : scroll + 1, to: Math.min(lines.length, scroll + viewport.bodyRows), total: lines.length }), viewport.contentColumns)),
   )
 }
 
@@ -747,24 +767,6 @@ export function ReviewPickerPanel({ loadBranches, loadCommits, choose, close }:
   )
 }
 
-/** One cross-session full-text search hit mapped from the session-query engine. */
-export interface SearchRow {
-  /** Session id (Enter resumes it through the switch machinery). */
-  readonly id: string
-  /** Display label: session title or the short id form. */
-  readonly label: string
-  /** Secondary facts line (workspace · preset markers). */
-  readonly detail: string
-  /** Bounded plain-text excerpt around the strongest match. */
-  readonly snippet: string
-  /** Match timestamp (relative labels derive from it). */
-  readonly updatedAt: number
-  /** Whether the hit is a delegated subagent conversation (not resumable). */
-  readonly subagent: boolean
-  /** Whether Enter may switch into it. */
-  readonly resumable: boolean
-}
-
 /**
  * The /search panel: full-text search over every persisted session through
  * the in-process session-query engine (the same corpus the model's
@@ -1092,13 +1094,15 @@ interface AgentsEntry {
  * Enter/t opening the child's full transcript in the shared read-only
  * document view (the same projection the exporter uses).
  */
-export function AgentsPanel({ live, load, readTranscript, close }: {
+export function AgentsPanel({ live, load, readTranscript, attach, close }: {
   /** Live feed rows (child sessions observed this process). */
   live: readonly SubagentRow[]
   /** Load this session's persisted child sessions by lineage. */
   load: () => Promise<readonly SessionRow[]>
   /** Read one child session's full transcript as markdown. */
   readTranscript: (id: string, signal?: AbortSignal) => Promise<string>
+  /** Attach to one child as the whole view (the runner's live buses). */
+  attach: ((id: string, label: string) => void) | undefined
   close: () => void
 }): ReactElement {
   const [dirRows, setDirRows] = useState<readonly SessionRow[] | undefined>(undefined)
@@ -1145,22 +1149,26 @@ export function AgentsPanel({ live, load, readTranscript, close }: {
     return [...feedRows, ...persisted]
   }, [live, dirRows])
   useEffect(() => setCursor(value => Math.min(value, Math.max(0, rows.length - 1))), [rows.length])
-  const openTranscript = (): void => {
-    const row = rows[cursor]
-    if (row === undefined) return
+  /** (Re-)read one child's transcript; the id is captured, not re-derived. */
+  const readTranscriptOf = (id: string): void => {
     transcriptLoad.current?.abort()
-    setTranscript({ id: row.id })
+    setTranscript({ id })
     const controller = new AbortController()
     transcriptLoad.current = controller
-    Promise.resolve().then(() => readTranscript(row.id, controller.signal)).then(
+    Promise.resolve().then(() => readTranscript(id, controller.signal)).then(
       text => {
-        if (!controller.signal.aborted) setTranscript({ id: row.id, text })
+        if (!controller.signal.aborted) setTranscript({ id, text })
       },
       reason => {
-        if (!controller.signal.aborted) setTranscript({ id: row.id, error: reason instanceof Error ? reason.message : String(reason) })
+        if (!controller.signal.aborted) setTranscript({ id, error: reason instanceof Error ? reason.message : String(reason) })
       },
     )
   }
+  const openTranscript = (): void => {
+    const row = rows[cursor]
+    if (row === undefined) return
+    readTranscriptOf(row.id)
+  }
   useInput((input, key) => {
     if (key.escape || input === 'q') return close()
     if (input === 'r') return refresh()
@@ -1177,6 +1185,17 @@ export function AgentsPanel({ live, load, readTranscript, close }: {
         transcriptLoad.current?.abort()
         setTranscript(undefined)
       },
+      // Running subagents keep moving: `r` re-reads the same child.
+      onRefresh: () => readTranscriptOf(transcript.id),
+      // Enter/f in the preview attaches the child as the whole view when the
+      // runner wired the live buses; without them the bordered expansion
+      // keeps serving the same document.
+      ...(attach === undefined ? {} : {
+        onExpand: () => {
+          const label = rows.find(row => row.id === transcript.id)?.label ?? transcript.id.slice(-12)
+          attach(transcript.id, label)
+        },
+      }),
     })
   }
   return createElement(ListFrame, {

package/src/{language-panel.ts → panels/language-panel.ts}

@@ -6,10 +6,10 @@
 
 import { createElement, useState, type ReactElement } from 'react'
 import { Box, Text, useInput, useStdout } from 'ink'
-import { panelViewport } from './render/inspector.ts'
-import { truncateColumns } from './render/text.ts'
-import { LANGUAGES, t, type LanguageName } from './i18n.ts'
-import { getPalette, inkColor } from './theme.ts'
+import { panelViewport } from '../render/inspector.ts'
+import { truncateColumns } from '../render/text.ts'
+import { LANGUAGES, t, type LanguageName } from '../i18n.ts'
+import { getPalette, inkColor } from '../theme.ts'
 
 export function LanguagePanel({ current, select, close }: {
   current: LanguageName