dsh-code 0.9.1 → 1.0.1

package/src/render/markdown.ts

@@ -40,34 +40,98 @@ export function visibleColumns(text: string): number {
   return columns
 }
 
-/** Walk a segment list, breaking it into lines that fit `width` columns. */
-function wrapSegments(segments: readonly MdSegment[], width: number): readonly MdSegment[][] {
-  const lines: MdSegment[][] = []
-  let current: MdSegment[] = []
-  let used = 0
+interface WrapUnit {
+  text: string
+  style: MdStyle
+}
+
+/** Punctuation that should not become the first visible glyph of a row. */
+function isClosingPunctuation(text: string): boolean {
+  return /^[,.;:!?%、。，．！？：；％）》」』】〕〉》”’]/u.test(text)
+}
+
+/**
+ * Split prose into soft-wrap units: ASCII words stay intact, while wide CJK
+ * glyphs become individual break opportunities. This keeps ordinary prose
+ * readable without allowing a Chinese paragraph to become one overlong word.
+ */
+function wrapUnits(segments: readonly MdSegment[]): readonly WrapUnit[] {
+  const units: WrapUnit[] = []
   for (const segment of segments) {
-    // Break the segment at spaces into words so long runs wrap mid-text.
-    const words = segment.text.split(/( )/u)
-    for (const word of words) {
-      if (word === '') continue
-      const columns = visibleColumns(word)
-      if (used + columns > width && used > 0) {
-        lines.push(current)
-        current = []
-        used = 0
+    let word = ''
+    const flushWord = (): void => {
+      if (word !== '') units.push({ text: word, style: segment.style })
+      word = ''
+    }
+    for (const char of segment.text) {
+      if (char === ' ') {
+        flushWord()
+        units.push({ text: char, style: segment.style })
+      } else if (visibleColumns(char) > 1) {
+        flushWord()
+        units.push({ text: char, style: segment.style })
+      } else {
+        word += char
       }
-      // A single word wider than the line still goes on its own line.
-      current.push({ text: word, style: segment.style })
+    }
+    flushWord()
+  }
+  return units
+}
+
+/** Walk styled units, keeping logical rows within the physical column budget. */
+function wrapSegments(segments: readonly MdSegment[], width: number): readonly (readonly MdSegment[])[] {
+  const limit = Math.max(1, Math.floor(width))
+  const lines: (readonly MdSegment[])[] = []
+  let current: WrapUnit[] = []
+  let used = 0
+  const flush = (): void => {
+    while (current.at(-1)?.text === ' ') {
+      used -= visibleColumns(current.pop()!.text)
+    }
+    if (current.length > 0) lines.push(merge(current))
+    current = []
+    used = 0
+  }
+  const appendAtom = (unit: WrapUnit): void => {
+    const columns = visibleColumns(unit.text)
+    if (used > 0 && used + columns > limit) flush()
+    current.push(unit)
+    used += columns
+  }
+  const append = (unit: WrapUnit): void => {
+    const columns = visibleColumns(unit.text)
+    if (used === 0 && columns > limit) {
+      for (const char of unit.text) appendAtom({ text: char, style: unit.style })
+      return
+    }
+    if (used + columns <= limit || current.length === 0) {
+      current.push(unit)
       used += columns
+      return
+    }
+    // Keep full-width punctuation attached to the preceding CJK glyph. If
+    // the row is full, move that glyph with the punctuation instead of
+    // producing a visually orphaned line beginning with '：' or '。'.
+    const previous = current.at(-1)
+    if (isClosingPunctuation(unit.text) && previous !== undefined && visibleColumns(previous.text) > 1) {
+      current.pop()
+      used -= visibleColumns(previous.text)
+      flush()
+      appendAtom(previous)
+      appendAtom(unit)
+      return
+    }
+    flush()
+    if (columns > limit) {
+      for (const char of unit.text) appendAtom({ text: char, style: unit.style })
+    } else {
+      appendAtom(unit)
     }
   }
-  if (current.length > 0) lines.push(current)
-  // Drop the trailing space a wrapped line picked up before the break.
-  return lines.map(line => {
-    const last = line[line.length - 1]
-    if (last !== undefined && last.text === ' ' && line.length > 1) return line.slice(0, -1)
-    return line
-  })
+  for (const unit of wrapUnits(segments)) append(unit)
+  flush()
+  return lines
 }
 
 /** Join adjacent same-style runs so the app renders fewer elements. */
@@ -448,10 +512,18 @@ function renderTableRecords(table: ParsedTable, width: number): readonly MdLine[
 }
 
 /** Render markdown text into styled lines of at most `width` columns. */
-export function renderMarkdown(text: string, width: number): readonly MdLine[] {
+export function renderMarkdown(
+  text: string,
+  width: number,
+  options: { physicalWrap?: boolean } = {},
+): readonly MdLine[] {
   const lines: MdLine[] = []
   let separatorPending = false
   const push = (segments: readonly MdSegment[]): void => {
+    if (options.physicalWrap === false) {
+      lines.push({ segments: merge(segments) })
+      return
+    }
     for (const wrapped of wrapSegments(segments, Math.max(10, width))) {
       lines.push({ segments: merge(wrapped) })
     }
@@ -520,12 +592,13 @@ export function renderMarkdown(text: string, width: number): readonly MdLine[] {
     }
     const ordered = ORDERED.exec(line)
     if (ordered !== null) {
-      push([seg(`  ${ordered[1] ?? ''}. `, 'accent'), ...parseInline(ordered[2] ?? '').map(run => seg(run.text, run.style))])
+      const prefix = options.physicalWrap === false ? `${ordered[1] ?? ''}. ` : `  ${ordered[1] ?? ''}. `
+      push([seg(prefix, 'accent'), ...parseInline(ordered[2] ?? '').map(run => seg(run.text, run.style))])
       continue
     }
     const unordered = UNORDERED.exec(line)
     if (unordered !== null) {
-      push([seg('  • ', 'accent'), ...parseInline(unordered[1] ?? '').map(run => seg(run.text, run.style))])
+      push([seg(options.physicalWrap === false ? '• ' : '  • ', 'accent'), ...parseInline(unordered[1] ?? '').map(run => seg(run.text, run.style))])
       continue
     }
 

package/src/render/projection.ts

@@ -7,7 +7,7 @@
  * @module @deepseek-ai/dsh-tui/render/projection
  */
 
-import { boundContextSummary, type ContentBlock, type MessageId } from '@deepseek-ai/dsh-llm'
+import { boundContextSummary, type ContentBlock, type ImageBlock, type MessageId } from '@deepseek-ai/dsh-llm'
 import type { SessionEvent, TodoItem } from '@deepseek-ai/dsh-session'
 // Type-only imports merge the plugin-owned SessionEventMap variants
 // (agent/inbox/spliced, command/*, compaction/*, goal/change, llm/retry*,
@@ -52,6 +52,8 @@ export interface UserEntry {
   /** True for collapsed injected context (plugin/continuation notices), which
    * the renderer marks with a dim ↳ instead of the user ❯ prompt. */
   notice: boolean
+  /** Durable image references carried by this prompt. */
+  images?: readonly ImageBlock['attachment'][]
 }
 
 /** One user message waiting in the agent inbox (the web's queued-message row). */
@@ -63,15 +65,20 @@ export interface PendingEntry {
   target: 'next-turn' | 'next-step'
   /** Full message text — Codex PendingSteer renders queued prompts exactly like user rows. */
   text: string
+  /** Durable image references queued with this prompt. */
+  images?: readonly ImageBlock['attachment'][]
 }
 
-/** One assembled assistant reply. */
+/** One authoritative assembled assistant reply. */
 export interface AssistantEntry {
   kind: 'assistant'
   /** Joined text blocks of the assistant message. */
   text: string
-  /** Joined reasoning blocks of the same message, empty when the model thought out loud. */
+  /** Joined reasoning blocks from the same assembled message. */
   reasoning: string
+  /** True when a cancelled stream's delivered prefix was finalized as this
+   * entry (rc.8 `assistant/message.interrupted`) — rendered with a marker. */
+  interrupted?: true
 }
 
 /** One model-requested tool invocation and its settled state. */
@@ -79,6 +86,13 @@ export interface ToolEntry {
   kind: 'tool'
   /** Correlation id shared with the matching `tool/result`. */
   callId: string
+  /**
+   * Global tool-call ordinal across the whole transcript (1, 2, 3…, never
+   * reset between turns). The tool-card badge and every error line that
+   * references the failed call share this number, so "call N" in an error
+   * always names the exact card the badge shows.
+   */
+  ordinal: number
   /** Tool name as the model addressed it. */
   name: string
   /** Raw arguments JSON string exactly as the model produced it. */
@@ -253,6 +267,12 @@ export interface TranscriptView {
   streamingReasoning: string
   /** Latest whole-list todo snapshot from `todo/write`, empty when none. */
   todos: readonly TodoItem[]
+  /**
+   * Global tool-call ordinal counter: the number the NEXT `tool/call` lands
+   * with (1-based). Never reset, so the counter and the badges/error lines
+   * stay consistent across turns and resumed sessions.
+   */
+  toolCallOrdinal: number
   /** True while a durable turn is open (`turn/start` … `turn/end`). */
   busy: boolean
   /** `turn/start` time of the open turn (0 while idle) — the web TurnStatus clock anchor. */
@@ -307,6 +327,31 @@ function textOf(content: readonly ContentBlock[]): string {
   return content.filter(block => block.type === 'text').map(block => block.text).join('')
 }
 
+/** Durable image references in their model-visible order. */
+function imagesOf(content: readonly ContentBlock[]): readonly ImageBlock['attachment'][] {
+  return content.filter((block): block is ImageBlock => block.type === 'image').map(block => block.attachment)
+}
+
+/** Human-readable bounded image labels for transcript, inspector, and export surfaces. */
+export function imageLabels(images: readonly ImageBlock['attachment'][] | undefined): string {
+  if (images === undefined || images.length === 0) return ''
+  return images.map((image, index) => {
+    const rawName = image.name?.trim() || `image ${index + 1}`
+    const name = rawName.length <= 80 ? rawName : `${rawName.slice(0, 79)}…`
+    const original = image.originalDimensions
+    const dimensions = original === undefined
+      ? `${image.width}×${image.height}`
+      : `${image.width}×${image.height} · original ${original.width}×${original.height}`
+    return `[image: ${name} · ${dimensions} · ${image.bytes} B]`
+  }).join('\n')
+}
+
+/** Prompt text with its durable image labels, without exposing local paths or bytes. */
+export function promptDisplayText(entry: Pick<UserEntry | PendingEntry, 'text' | 'images'>): string {
+  const labels = imageLabels(entry.images)
+  return entry.text === '' ? labels : labels === '' ? entry.text : `${entry.text}\n${labels}`
+}
+
 /** Join the reasoning blocks of a content list; non-reasoning blocks contribute nothing. */
 function reasoningOf(content: readonly ContentBlock[]): string {
   return content.filter(block => block.type === 'reasoning').map(block => block.text).join('')
@@ -337,6 +382,7 @@ export function createTranscriptView(): TranscriptView {
     streaming: '',
     streamingReasoning: '',
     todos: [],
+    toolCallOrdinal: 0,
     busy: false,
     busySince: 0,
     model: '',
@@ -381,11 +427,12 @@ export function projectEvent(view: TranscriptView, event: SessionEvent): Transcr
       // to a bounded notice row, exactly like collapsed transcript context
       // elsewhere in the product; only direct human prompts render in full.
       const text = textOf(message.content)
+      const images = imagesOf(message.content)
       if (message.source.kind === 'user') {
         return {
           ...view,
           pending,
-          entries: [...entries, { kind: 'user', text, notice: false }],
+          entries: [...entries, { kind: 'user', text, notice: false, ...(images.length === 0 ? {} : { images }) }],
           stats: {
             ...view.stats,
             contextSegments: {
@@ -436,6 +483,7 @@ export function projectEvent(view: TranscriptView, event: SessionEvent): Transcr
           messageId: message.id,
           target,
           text: pendingText(message.content),
+          ...imagesOf(message.content).length === 0 ? {} : { images: imagesOf(message.content) },
         }]
       }
       return { ...view, entries, pending: { ...view.pending, [target]: nextIds } }
@@ -459,10 +507,18 @@ export function projectEvent(view: TranscriptView, event: SessionEvent): Transcr
         }
       }
       if (chunk.type === 'text-delta') {
-        return { ...view, streaming: appendStreamingTail(view.streaming, chunk.text), stats }
+        return {
+          ...view,
+          streaming: appendStreamingTail(view.streaming, chunk.text),
+          stats,
+        }
       }
       if (chunk.type === 'reasoning-delta') {
-        return { ...view, streamingReasoning: appendStreamingTail(view.streamingReasoning, chunk.text), stats }
+        return {
+          ...view,
+          streamingReasoning: appendStreamingTail(view.streamingReasoning, chunk.text),
+          stats,
+        }
       }
       return view
     }
@@ -484,11 +540,7 @@ export function projectEvent(view: TranscriptView, event: SessionEvent): Transcr
         ...view,
         streaming: '',
         streamingReasoning: '',
-        entries: [...view.entries, {
-          kind: 'assistant',
-          text,
-          reasoning,
-        }],
+        entries: [...view.entries, { kind: 'assistant', text, reasoning, interrupted: event.data.interrupted === true ? true : undefined }],
         stats: {
           ...view.stats,
           llmMs: view.stats.llmMs + (started === undefined ? 0 : Math.max(0, event.time - started)),
@@ -519,11 +571,16 @@ export function projectEvent(view: TranscriptView, event: SessionEvent): Transcr
       const turnTools = view.anchors.turnTools.get(data.turn) ?? new Set<string>()
       turnTools.add(data.callId)
       view.anchors.turnTools.set(data.turn, turnTools)
+      const ordinal = view.toolCallOrdinal + 1
       return {
         ...view,
-        entries: [...view.entries, {
-          kind: 'tool',
+        toolCallOrdinal: ordinal,
+        entries: [
+          ...view.entries,
+          {
+            kind: 'tool',
           callId: data.callId,
+          ordinal,
           name: data.name,
           arguments: data.arguments,
           preview: toolArgumentsPreview(data.arguments, data.name),
@@ -607,7 +664,12 @@ export function projectEvent(view: TranscriptView, event: SessionEvent): Transcr
       }
       view.anchors.turnSteps.set(event.data.turn, key)
       view.anchors.stepStart.set(key, event.time)
-      return { ...view, stats: { ...view.stats, steps: view.stats.steps + 1 } }
+      return {
+        ...view,
+        streaming: '',
+        streamingReasoning: '',
+        stats: { ...view.stats, steps: view.stats.steps + 1 },
+      }
     }
     case 'turn/end': {
       const reason = event.data.reason
@@ -651,13 +713,24 @@ export function projectEvent(view: TranscriptView, event: SessionEvent): Transcr
         for (const callId of turnToolSet) view.anchors.toolStart.delete(callId)
         view.anchors.turnTools.delete(event.data.turn)
       }
-      if (appended.length === 0) return { ...view, busy: false, busySince: 0 }
-      return { ...view, busy: false, busySince: 0, entries: [...view.entries, ...appended] }
+      if (appended.length === 0) {
+        return { ...view, busy: false, busySince: 0, streaming: '', streamingReasoning: '' }
+      }
+      return {
+        ...view,
+        busy: false,
+        busySince: 0,
+        streaming: '',
+        streamingReasoning: '',
+        entries: [...view.entries, ...appended],
+      }
     }
     case 'llm/retry': {
       const data = event.data
       return {
         ...view,
+        streaming: '',
+        streamingReasoning: '',
         entries: [...view.entries, {
           kind: 'retry',
           retryId: data.retryId,
@@ -842,6 +915,8 @@ export interface ReplayAccumulator {
   streaming: string
   streamingReasoning: string
   todos: readonly TodoItem[]
+  /** Global tool-call ordinal counter (see `TranscriptView.toolCallOrdinal`). */
+  toolCallOrdinal: number
   busy: boolean
   busySince: number
   model: string
@@ -877,6 +952,7 @@ export function createReplayAccumulator(): ReplayAccumulator {
     streaming: '',
     streamingReasoning: '',
     todos: [],
+    toolCallOrdinal: 0,
     busy: false,
     busySince: 0,
     model: '',
@@ -980,8 +1056,9 @@ export function replayProjectEvent(acc: ReplayAccumulator, event: SessionEvent):
         }
       }
       const text = textOf(message.content)
+      const images = imagesOf(message.content)
       if (message.source.kind === 'user') {
-        appendReplayEntry(acc, { kind: 'user', text, notice: false })
+        appendReplayEntry(acc, { kind: 'user', text, notice: false, ...(images.length === 0 ? {} : { images }) })
         acc.stats = {
           ...acc.stats,
           contextSegments: {
@@ -1023,7 +1100,8 @@ export function replayProjectEvent(acc: ReplayAccumulator, event: SessionEvent):
         }
       }
       for (const message of inserted) {
-        appendReplayEntry(acc, { kind: 'pending', messageId: message.id, target, text: pendingText(message.content) })
+        const images = imagesOf(message.content)
+        appendReplayEntry(acc, { kind: 'pending', messageId: message.id, target, text: pendingText(message.content), ...(images.length === 0 ? {} : { images }) })
         indexList(acc.pendingIndex, message.id).push(acc.entries.length - 1)
         ids.push(message.id)
         acc.ops += 1
@@ -1068,7 +1146,7 @@ export function replayProjectEvent(acc: ReplayAccumulator, event: SessionEvent):
       const reasoning = reasoningOf(event.data.message.content)
       acc.streaming = ''
       acc.streamingReasoning = ''
-      appendReplayEntry(acc, { kind: 'assistant', text, reasoning })
+      appendReplayEntry(acc, { kind: 'assistant', text, reasoning, interrupted: event.data.interrupted === true ? true : undefined })
       acc.stats = {
         ...acc.stats,
         llmMs: acc.stats.llmMs + (started === undefined ? 0 : Math.max(0, event.time - started)),
@@ -1095,9 +1173,11 @@ export function replayProjectEvent(acc: ReplayAccumulator, event: SessionEvent):
       const turnTools = acc.turnTools.get(data.turn) ?? new Set<string>()
       turnTools.add(data.callId)
       acc.turnTools.set(data.turn, turnTools)
+      acc.toolCallOrdinal += 1
       appendReplayEntry(acc, {
         kind: 'tool',
         callId: data.callId,
+        ordinal: acc.toolCallOrdinal,
         name: data.name,
         arguments: data.arguments,
         preview: toolArgumentsPreview(data.arguments, data.name),
@@ -1173,12 +1253,16 @@ export function replayProjectEvent(acc: ReplayAccumulator, event: SessionEvent):
       }
       acc.turnSteps.set(event.data.turn, key)
       acc.stepStart.set(key, event.time)
+      acc.streaming = ''
+      acc.streamingReasoning = ''
       acc.stats = { ...acc.stats, steps: acc.stats.steps + 1 }
       return
     }
     case 'turn/end': {
       const reason = event.data.reason
       const appended: TranscriptEntry[] = []
+      acc.streamingReasoning = ''
+      acc.streaming = ''
       if (reason.kind === 'error') {
         const recovery = reason.error.code === 'MISSING_CREDENTIAL'
           ? ' · open /model to add an API key'
@@ -1217,6 +1301,8 @@ export function replayProjectEvent(acc: ReplayAccumulator, event: SessionEvent):
     }
     case 'llm/retry': {
       const data = event.data
+      acc.streaming = ''
+      acc.streamingReasoning = ''
       appendReplayEntry(acc, {
         kind: 'retry',
         retryId: data.retryId,
@@ -1354,6 +1440,7 @@ export function finishReplay(acc: ReplayAccumulator): TranscriptView {
     streaming: acc.streaming,
     streamingReasoning: acc.streamingReasoning,
     todos: acc.todos,
+    toolCallOrdinal: acc.toolCallOrdinal,
     busy: acc.busy,
     busySince: acc.busySince,
     model: acc.model,