dsh-code 1.3.0 → 1.4.0

package/src/internals.ts

@@ -19,7 +19,7 @@ import {
   shouldEnableKeyboardEnhancement,
 } from './keyboard.ts'
 import { createSplitStdin } from './input-split.ts'
-import { ensureVsCodeTabTitleSetting } from './terminal-title.ts'
+import { ensureVsCodeTabTitleSetting } from './ui/terminal-title.ts'
 
 /** A mounted terminal app instance; the runner owns unmount ordering. */
 export interface TuiMount {

package/src/locales/en.ts

@@ -103,8 +103,15 @@ export const en = {
 
   // Transcript document panel (/resume details)
   'document.loading': 'loading transcript…',
+  'attach.bar': 'observing · {label} · r reload · esc/ctrl+d back',
+  'attach.loading': 'loading {label}\'s conversation…',
+  'attach.status': 'subagent {label} · {id} · {turns} turns',
+  'notice.attachUnavailable': 'subagent attachment is unavailable in this profile',
   'document.compact': 'transcript · esc close',
-  'document.footer': 'lines {from}-{to}/{total} · ↑↓/pg/g/G · t/esc close',
+  'document.expanded': 'expanded',
+  'document.refreshHint': 'r refresh',
+  'document.footerExpanded': 'lines {from}-{to}/{total} · ↑↓/pg/g/G{refresh} · esc/ctrl+d back',
+  'document.footer': 'lines {from}-{to}/{total} · ↑↓/pg/g/G · enter/f expand · t/esc close',
 
   // /review picker
   'review.picker.title': '/review · choose a target',
@@ -456,7 +463,6 @@ export const en = {
   'panel.provider.notConfiguredDivider': '── not configured ──',
   'panel.provider.title': '/model — providers',
   'panel.provider.titleCount': '/model — providers · {index}/{total}',
-  'panel.provider.state': '{route} · {value}',
   'panel.provider.key': 'key {value}',
   'panel.provider.authConfigured': 'provider auth',
   'panel.provider.noKey': 'key missing',
@@ -471,7 +477,7 @@ export const en = {
   'panel.provider.readOnlyLogin': 'this login record is read-only',
   'panel.provider.notManaged': 'this provider is not managed by Harness settings',
   'panel.providers.compact': '/model providers · enter configure · d remove key · esc back',
-  'panel.providers.footer': '↑↓ move · enter configure · l login · o logout · d remove key · x remove provider · r retry · esc back',
+  'panel.providers.footer': '↑↓ move · enter configure · d remove key · x remove provider · r retry · esc back',
   'panel.update.compact': '/update · {summary}',
   'panel.update.checking': 'checking…',
   'panel.update.probeFailed': 'probe failed',
@@ -499,8 +505,14 @@ export const en = {
   'panel.setup.copyInto': 'copy verbatim into {id}',
   'panel.setup.copyTitle': '/model — copy efforts',
   'panel.setup.copyFooter': '↑↓ move · enter copy · esc back',
+  'panel.setup.mode.subscribe': 'Subscription',
+  'panel.setup.mode.key': 'Key',
+  'panel.setup.mode.login.plan': 'signed in · plan',
+  'panel.setup.mode.login.none': 'not signed in',
+  'panel.setup.mode.login.running': 'signing in…',
+  'panel.setup.mode.overridden': '⚠ the settings key overrides the plan sign-in',
   'panel.setup.title': '/model — configure {provider}',
-  'panel.setup.footer': '↑↓ move · ←→ in/out · space remove · e efforts · c copy efforts · tab discover · enter save · esc back',
+  'panel.setup.footer': '↑↓ move · ←→ in/out · space remove · e efforts · c copy efforts · tab per channel (subscription = web sign-in, key = discover) · enter save · esc back',
   'panel.discovery.compact': 'model discovery · terminal too small · esc back',
   'panel.discovery.loading': 'discovering models…',
   'panel.discovery.empty': 'the endpoint advertised no models; add ids by hand on the setup page',

package/src/locales/zh.ts

@@ -105,8 +105,15 @@ export const zh: MessageCatalog = {
 
   // Transcript document panel (/resume details)
   'document.loading': '转录加载中…',
+  'attach.bar': '观察模式 · {label} · r 重新载入 · esc/ctrl+d 返回',
+  'attach.loading': '正在载入 {label} 的子会话…',
+  'attach.status': '子代理 {label} · {id} · {turns} 回合',
+  'notice.attachUnavailable': '当前配置无法附加子代理会话',
   'document.compact': '转录 · esc 关闭',
-  'document.footer': '行 {from}-{to}/{total} · ↑↓/pg/g/G · t/esc 关闭',
+  'document.expanded': '全屏',
+  'document.refreshHint': 'r 刷新',
+  'document.footerExpanded': '行 {from}-{to}/{total} · ↑↓/pg/g/G{refresh} · esc/ctrl+d 返回',
+  'document.footer': '行 {from}-{to}/{total} · ↑↓/pg/g/G · enter/f 全屏 · t/esc 关闭',
 
   // /review picker
   'review.picker.title': '/review · 选择审查目标',
@@ -458,7 +465,6 @@ export const zh: MessageCatalog = {
   'panel.provider.notConfiguredDivider': '── 未配置 ──',
   'panel.provider.title': '/model — 供应商',
   'panel.provider.titleCount': '/model — 供应商 · {index}/{total}',
-  'panel.provider.state': '{route} · {value}',
   'panel.provider.key': '密钥 {value}',
   'panel.provider.authConfigured': '供应商认证',
   'panel.provider.noKey': '缺少密钥',
@@ -473,7 +479,7 @@ export const zh: MessageCatalog = {
   'panel.provider.readOnlyLogin': '该登录记录为只读',
   'panel.provider.notManaged': '该供应商不受 Harness settings 管理',
   'panel.providers.compact': '/model providers · 回车配置 · d 删除密钥 · esc 返回',
-  'panel.providers.footer': '↑↓ 移动 · 回车配置 · l 登录 · o 登出 · d 删除密钥 · x 删除供应商 · r 重试 · esc 返回',
+  'panel.providers.footer': '↑↓ 移动 · 回车配置 · d 删除密钥 · x 删除供应商 · r 重试 · esc 返回',
   'panel.update.compact': '/update · {summary}',
   'panel.update.checking': '检查中…',
   'panel.update.probeFailed': '检查失败',
@@ -501,8 +507,14 @@ export const zh: MessageCatalog = {
   'panel.setup.copyInto': '原样复制到 {id}',
   'panel.setup.copyTitle': '/model — 复制推理档位',
   'panel.setup.copyFooter': '↑↓ 移动 · 回车复制 · esc 返回',
+  'panel.setup.mode.subscribe': '订阅',
+  'panel.setup.mode.key': 'Key',
+  'panel.setup.mode.login.plan': '已登录 · 套餐',
+  'panel.setup.mode.login.none': '未登录',
+  'panel.setup.mode.login.running': '登录中…',
+  'panel.setup.mode.overridden': '⚠ 设置中的 Key 覆盖订阅登录',
   'panel.setup.title': '/model — 配置 {provider}',
-  'panel.setup.footer': '↑↓ 移动 · ←→ 输入/输出 · 空格移除 · e 推理档位 · c 复制推理档位 · tab 发现 · 回车保存 · esc 返回',
+  'panel.setup.footer': '↑↓ 移动 · ←→ 输入/输出 · 空格移除 · e 推理档位 · c 复制推理档位 · tab 按当前方式（订阅=网页登录 / Key=发现） · 回车保存 · esc 返回',
   'panel.discovery.compact': '模型发现 · 终端过窄 · esc 返回',
   'panel.discovery.loading': '正在发现模型…',
   'panel.discovery.empty': '端点未提供模型；请在配置页手动添加 ID',

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

@@ -10,12 +10,12 @@ import {
   type AuthorizationStatus,
 } from '@deepseek-ai/dsh-authorization'
 import type { CredentialKey } from '@deepseek-ai/dsh-credentials'
-import type { ProviderAuthorizationRow } from './authorization.ts'
-import { panelViewport } from './render/inspector.ts'
-import { displayText, singleLineText, truncateColumns } from './render/text.ts'
-import { panelAccent } from './panel-accent.ts'
-import { getPalette, inkColor } from './theme.ts'
-import { t } from './i18n.ts'
+import type { ProviderAuthorizationRow } from '../authorization.ts'
+import { panelViewport } from '../render/inspector.ts'
+import { displayText, singleLineText, truncateColumns } from '../render/text.ts'
+import { panelAccent } from '../ui/panel-accent.ts'
+import { getPalette, inkColor } from '../theme.ts'
+import { t } from '../i18n.ts'
 
 interface PromptReply {
   readonly resolve: (value: string) => void
@@ -25,6 +25,11 @@ interface PromptReply {
 
 export interface ProviderAuthorizationPanelProps {
   readonly row: ProviderAuthorizationRow
+  /**
+   * Start this method immediately instead of showing the picker: a
+   * single-method provider signs in with no extra step.
+   */
+  readonly autoStartMethod?: string
   begin(
     row: ProviderAuthorizationRow,
     method: string,
@@ -78,6 +83,20 @@ export function ProviderAuthorizationPanel(props: ProviderAuthorizationPanelProp
   const propsRef = useRef(props)
   propsRef.current = props
   const rowKey = props.row.key
+  // One-shot auto start (single-method providers): guarded by a ref so a
+  // remount of the same row cannot start a second attempt.
+  const autoStarted = useRef(false)
+  useEffect(() => {
+    const method = props.autoStartMethod
+    if (method === undefined || autoStarted.current) return
+    autoStarted.current = true
+    if (phase !== 'methods') return
+    if (props.row.methods.some(entry => entry.id === method)) start(method)
+    // One mount-time decision: the auto method, the method list, and the
+    // phase are fixed for this mount, so re-running on their identity would
+    // risk starting a second attempt.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.autoStartMethod])
   useEffect(() => () => {
     controllerRef.current?.abort()
     propsRef.current.cancel(rowKey)

package/src/panels/completion-panel.ts

@@ -0,0 +1,79 @@
+/** Bounded slash-command and mention completion menu. */
+
+import { createElement, type ReactElement } from 'react'
+import { Box, Text, useStdout } from 'ink'
+import type { CompletionCandidate } from '../completion.ts'
+import { selectionWindow } from '../render/inspector.ts'
+import { visibleColumns } from '../render/markdown.ts'
+import { displayText, padColumns, singleLineText, truncateColumns } from '../render/text.ts'
+import { dim, getPalette, inkColor } from '../theme.ts'
+
+/** Shared geometry used by both the menu view and the App dynamic-row budget. */
+function completionMenuMetrics(terminalRows: number): { limit: number; showFooter: boolean; verticalPadding: number } {
+  const showFooter = terminalRows >= 12
+  const verticalPadding = terminalRows >= 14 ? 1 : 0
+  const limit = Math.max(1, Math.min(6, terminalRows - (showFooter ? 11 : 10) - verticalPadding * 2))
+  return { limit, showFooter, verticalPadding }
+}
+
+/** Total physical rows occupied by the completion menu at this terminal height. */
+export function completionMenuRowCount(terminalRows: number, rowCount: number): number {
+  const { limit, showFooter, verticalPadding } = completionMenuMetrics(terminalRows)
+  const visible = rowCount === 0 ? 1 : Math.min(rowCount, limit)
+  const hidden = rowCount === 0 ? 0 : rowCount - visible
+  return visible + (hidden > 0 ? 1 : 0) + (showFooter ? 1 : 0) + verticalPadding * 2
+}
+
+/** Completion view anchored directly above the composer band. */
+export function CompletionMenu({ active, mention, index, rows, error }: {
+  active: boolean
+  mention: boolean
+  index: number
+  rows: readonly CompletionCandidate[]
+  error?: string
+}): ReactElement | undefined {
+  const stdout = useStdout().stdout
+  const columns = stdout?.columns ?? 80
+  const terminalRows = stdout?.rows ?? 30
+  if (!active) return undefined
+  const contentColumns = Math.max(1, columns - 4)
+  const nameWidth = mention
+    ? Math.max(1, contentColumns - 2)
+    : Math.min(18, Math.max(1, contentColumns - 2), Math.max(0, ...rows.map(row => visibleColumns(row.label))) + 2)
+  const descBudget = Math.max(0, contentColumns - nameWidth - 2)
+  const { limit, showFooter, verticalPadding } = completionMenuMetrics(terminalRows)
+  const selected = rows.length === 0 ? 0 : index % rows.length
+  const first = selectionWindow(selected, rows.length, limit)
+  const visible = rows.slice(first, first + limit)
+  const hidden = rows.length - visible.length
+  return createElement(
+    Box,
+    { flexDirection: 'column', marginLeft: 2, paddingY: verticalPadding },
+    ...(rows.length === 0
+      ? [error === undefined
+        ? createElement(Text, { key: 'loading', dimColor: true }, 'searching…')
+        : createElement(
+          Text,
+          { key: 'error', color: inkColor(getPalette().error), wrap: 'truncate-end' },
+          truncateColumns(`workspace search unavailable: ${singleLineText(error)} · keep typing to retry`, contentColumns),
+        )]
+      : visible.map((candidate, at) => {
+        const absolute = first + at
+        return createElement(
+          Text,
+          {
+            key: candidate.label,
+            color: absolute === selected ? inkColor(getPalette().brandBright) : inkColor(getPalette().dim),
+            wrap: 'truncate-end',
+          },
+          `${absolute === selected ? '❯ ' : '  '}${padColumns(candidate.label, nameWidth)}${dim(truncateColumns(displayText(candidate.description), descBudget))}`,
+        )
+      })),
+    hidden > 0
+      ? createElement(Text, { key: 'more', color: inkColor(getPalette().dim), wrap: 'truncate-end' }, `  … +${hidden} more`)
+      : undefined,
+    showFooter
+      ? createElement(Text, { color: inkColor(getPalette().dim), wrap: 'truncate-end' }, dim(mention ? `↑↓ choose · ${rows.length} items · tab insert` : `↑↓ choose · ${rows.length} items · tab complete`))
+      : undefined,
+  )
+}