dsh-code 1.0.5 → 1.0.6

package/src/internals.ts

@@ -44,46 +44,67 @@ export const internals: {
     // the keyboard protocol on terminals that can safely own those key events.
     const keyboardEnhanced = shouldEnableKeyboardEnhancement()
     const focusReporting = isVsCodeTerminalEnv()
-    process.stdout.write(
-      (keyboardEnhanced ? KEYBOARD_ENHANCE_ENABLE : '')
-      + BRACKETED_PASTE_ENABLE
-      + (focusReporting ? TERMINAL_FOCUS_REPORT_ENABLE : ''),
-    )
-    // App owns Ctrl+C's deliberate three-state contract (interrupt, clear
-    // draft, quit). Ink's default `exitOnCtrlC: true` would intercept the
-    // normalized control byte first, unmount only its renderer, and leave the
-    // Harness runner plus the pushed keyboard protocol alive.
-    // stdin travels through the keypress splitter: Ink parses one chunk as
-    // one keypress, so a coalesced space-then-enter would drop both keys.
-    const tuiStdin = createSplitStdin(process.stdin)
-    // Ink only touches isTTY/setRawMode/ref/read on stdin; the object-mode
-    // proxy satisfies that contract without the full ReadStream surface.
-    const instance = render(element, {
-      exitOnCtrlC: false,
-      stdin: tuiStdin.stdin as unknown as NodeJS.ReadStream,
-      stdout: process.stdout,
-    })
-    return {
-      rerender(element: ReactElement): void {
-        instance.rerender(element)
-      },
-      unmount(): void {
-        // The cleanup below must run even when Ink's unmount throws (a
-        // render-teardown failure): a stdin tap or pushed terminal-protocol
-        // stack outliving the app wedges the terminal for whatever runs
-        // next, and a stray exception here must not skip the exit sequence.
-        try {
-          instance.unmount()
-        } finally {
-          tuiStdin.dispose()
-          // Pop only a stack this mount pushed, then disable bracketed paste.
-          process.stdout.write(
-            (keyboardEnhanced ? KEYBOARD_ENHANCE_DISABLE : '')
-            + BRACKETED_PASTE_DISABLE
-            + (focusReporting ? TERMINAL_FOCUS_REPORT_DISABLE : ''),
-          )
-        }
-      },
+    // Enter raw mode BEFORE pushing any protocol: xterm.js answers `?1004h`
+    // with an immediate focus report (ESC[I), and while the tty still carries
+    // the shell's cooked+ECHO settings that report is echoed to the screen as
+    // a literal `^[[I`. Ink only takes raw mode after its first commit, so
+    // this mount owns the window; the call is idempotent with Ink's later one.
+    if (process.stdin.isTTY === true) process.stdin.setRawMode?.(true)
+    try {
+      process.stdout.write(
+        (keyboardEnhanced ? KEYBOARD_ENHANCE_ENABLE : '')
+        + BRACKETED_PASTE_ENABLE
+        + (focusReporting ? TERMINAL_FOCUS_REPORT_ENABLE : ''),
+      )
+      // App owns Ctrl+C's deliberate three-state contract (interrupt, clear
+      // draft, quit). Ink's default `exitOnCtrlC: true` would intercept the
+      // normalized control byte first, unmount only its renderer, and leave the
+      // Harness runner plus the pushed keyboard protocol alive.
+      // stdin travels through the keypress splitter: Ink parses one chunk as
+      // one keypress, so a coalesced space-then-enter would drop both keys.
+      const tuiStdin = createSplitStdin(process.stdin)
+      // Ink only touches isTTY/setRawMode/ref/read on stdin; the object-mode
+      // proxy satisfies that contract without the full ReadStream surface.
+      const instance = render(element, {
+        exitOnCtrlC: false,
+        stdin: tuiStdin.stdin as unknown as NodeJS.ReadStream,
+        stdout: process.stdout,
+      })
+      return {
+        rerender(element: ReactElement): void {
+          instance.rerender(element)
+        },
+        unmount(): void {
+          // The cleanup below must run even when Ink's unmount throws (a
+          // render-teardown failure): a stdin tap or pushed terminal-protocol
+          // stack outliving the app wedges the terminal for whatever runs
+          // next, and a stray exception here must not skip the exit sequence.
+          // Pop the stack while raw mode still hides echo — xterm.js keeps
+          // reporting focus changes until `?1004l` lands, and one arriving
+          // after Ink restores the cooked tty would print as `^[[I`.
+          try {
+            process.stdout.write(
+              (keyboardEnhanced ? KEYBOARD_ENHANCE_DISABLE : '')
+              + BRACKETED_PASTE_DISABLE
+              + (focusReporting ? TERMINAL_FOCUS_REPORT_DISABLE : ''),
+            )
+          } finally {
+            try {
+              instance.unmount()
+            } finally {
+              tuiStdin.dispose()
+              // Belt and braces: give the tty back its cooked mode even when
+              // Ink never took raw mode over (idempotent at the termios level).
+              if (process.stdin.isTTY === true) process.stdin.setRawMode?.(false)
+            }
+          }
+        },
+      }
+    } catch (error) {
+      // The synchronous mount path failed before Ink could own the terminal:
+      // undo the raw mode entered above so the shell keeps its echo.
+      if (process.stdin.isTTY === true) process.stdin.setRawMode?.(false)
+      throw error
     }
   },
   stderr: process.stderr,

package/src/provider-settings.ts

@@ -33,6 +33,8 @@ interface LlmFace {
     readonly settingsNs: string
     readonly settingsPath: readonly string[]
     readonly declared?: boolean
+    /** Configuration diagnostic for repair; unaffected models may remain serviceable. */
+    readonly error?: string
   }[]
   /**
    * Registered endpoint model discovery; absent on an older service. The
@@ -256,18 +258,6 @@ export interface DiscoveredModelView {
   readonly maxTokens?: number
 }
 
-/** One model an endpoint reported about itself (mirrors LlmDiscoveredModel). */
-export interface DiscoveredModelView {
-  /** Model id the endpoint accepts. */
-  readonly id: string
-  /** Human-readable name when the endpoint supplies one. */
-  readonly name?: string
-  /** Context window when disclosed; adoption still owes it if absent. */
-  readonly contextWindow?: number
-  /** Output cap when disclosed. */
-  readonly maxTokens?: number
-}
-
 /**
  * The seven canonical reasoning levels a reasoningEfforts key may name -
  * pi-ai's THINKING_LEVELS. A pi-ai upgrade that adds or removes one fails
@@ -362,6 +352,12 @@ export interface ProviderTargetView {
   readonly configuration: ProviderConfiguration
   /** The owning adapter reports this route as hand-declared (absent when it draws no distinction). */
   readonly declared?: boolean
+  /**
+   * Configuration diagnostic the adapter reported for this route (catalog or
+   * profile damage): the row stays listed and repairable instead of the whole
+   * provider vanishing; absent when the route reads clean.
+   */
+  readonly diagnostic?: string
 }
 
 /** The resolved provider/settings/credential join. */
@@ -431,6 +427,7 @@ export async function loadProviderSettings(ctx: Context): Promise<ProviderSettin
     settingsNs: string
     settingsPath: readonly string[]
     declared?: boolean
+    error?: string
   }> = []
   if (llm.listConfigurableProviders !== undefined) {
     try {
@@ -462,6 +459,7 @@ export async function loadProviderSettings(ctx: Context): Promise<ProviderSettin
     settingsNs: string
     settingsPath: readonly string[]
     declared?: boolean
+    error?: string
   }> = [
     ...directoryEntries.map(entry => ({
       provider: entry.provider,
@@ -470,6 +468,7 @@ export async function loadProviderSettings(ctx: Context): Promise<ProviderSettin
       settingsNs: entry.settingsNs,
       settingsPath: entry.settingsPath,
       ...entry.declared === undefined ? {} : { declared: entry.declared },
+      ...entry.error === undefined ? {} : { error: singleLine(entry.error) },
     })),
     ...registered
       .filter(provider => !declared.has(provider.id))
@@ -508,6 +507,7 @@ export async function loadProviderSettings(ctx: Context): Promise<ProviderSettin
       ...credentialRef === undefined ? {} : { credentialRef },
       suggestedRef: deriveCredentialRef(base.provider),
       ...base.declared === undefined ? {} : { declared: base.declared },
+      ...base.error === undefined ? {} : { diagnostic: base.error },
     }
   })
   const refs = [...new Set(rows.flatMap(row => row.credentialRef === undefined ? [] : [row.credentialRef]))]