dsh-ntr 0.1.0 → 0.1.2

package/src/client/session-controls.tsx

@@ -49,10 +49,12 @@
  * different slots, so they share that module's phase clock rather than trying
  * to animate across slot boundaries.
  *
- * It is deliberately quiet: the base renders NOTHING for a conversation no ACP
- * agent has served, so an ordinary chat is untouched even before the gate
- * stands down. The ACP view tab is the entry point for those (and for re-entry
- * after a detour through another provider).
+ * It is deliberately quiet: outside ACP mode the gate never mounts it, and
+ * before the host has answered the agent roster it renders nothing. Once the
+ * roster is KNOWN to be empty the base stays and its picker carries the
+ * "open NTR settings" action — an NTR conversation with nothing configured
+ * still has a way forward instead of an empty cell. The ACP view tab remains
+ * the entry point for conversations no agent has served.
  */
 
 import { useEffect, useState } from 'react'
@@ -61,7 +63,7 @@ import type { CSSProperties } from 'react'
 import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
 import {
   AcpChip, AcpMenu, AcpShatterParts, buildAcpModelId, closeAcpMenu, ensureAcpStyle,
-  openAcpMenu, setAcpMenuError, splitAcpModelId, useAcpMenu, useUi,
+  openAcpMenu, openAcpSettingsDialog, setAcpMenuError, splitAcpModelId, useAcpMenu, useUi,
 } from './acp-ui.tsx'
 import { playAgentLockAnim, useAgentLockPhase } from './agent-lock-anim.ts'
 import type {
@@ -150,6 +152,23 @@ function routeAgentId(
   return undefined
 }
 
+/**
+ * Whether the agent base has anything honest to show.
+ *
+ * An empty roster has two meanings, and they must not be conflated: before the
+ * host answers `agents/list` it means "not read yet" (rendering a setup entry
+ * there would accuse a correctly configured deployment on every page load),
+ * while after the answer it means "nothing is configured" — exactly the state
+ * that must keep the base and offer the way into NTR settings.
+ */
+export function agentBaseHasData(
+  bound: ChatSessionView | undefined,
+  agents: readonly AgentView[],
+  rosterLoaded: boolean,
+): boolean {
+  return bound !== undefined || agents.length > 0 || rosterLoaded
+}
+
 /**
  * The agent this conversation is LOCKED to, if its first ACP turn has run.
  *
@@ -374,21 +393,29 @@ export function advancedOptions(
  * The tooltip claims only what the menu behind the chip does: switch the agent.
  * The agent's models and thought levels have chips of their own (user decision,
  * 2026-10-17), so the previous wording — "switch the agent, its model and the
- * thought level" — promised a menu that holds the roster alone.
+ * thought level" — promised a menu that holds the roster alone. An EMPTY
+ * roster is its own case: the menu cannot switch to anything, it offers the
+ * way into NTR settings, so the tooltip says that instead of promising a pick.
  */
 export function agentBaseChip(
   route: RouteInfo,
   routed: boolean,
   acp: AcpChatInjected['acp'],
+  rosterEmpty = false,
 ): { label: string; title: string } {
   const label = route.agentTitle === undefined
     ? (routed ? 'NTR' : acp.label('选择 Agent', 'Choose agent'))
     : `NTR · ${route.agentTitle}`
   const title = route.agentId === undefined
-    ? acp.label(
-      '这条会话当前没有 NTR agent 服务；点开可选择 agent',
-      'No NTR agent is serving this conversation right now — open to choose one',
-    )
+    ? rosterEmpty
+      ? acp.label(
+        '这条会话当前没有 NTR agent；点开可前往 NTR 设置添加',
+        'No NTR agent is serving this conversation — open to set one up in NTR settings',
+      )
+      : acp.label(
+        '这条会话当前没有 NTR agent 服务；点开可选择 agent',
+        'No NTR agent is serving this conversation right now — open to choose one',
+      )
     : acp.label(
       '这条会话由外接 NTR agent 服务；点开可切换 agent',
       'This conversation is served by an external NTR agent — open to switch the agent',
@@ -530,9 +557,12 @@ export function AcpSessionControls(props: AcpClusterProps) {
     lockedTo ?? ui.chatBoundAgent[sessionId],
     choice,
   )
-  // A conversation with no ACP story to tell gets no chrome: the ACP view tab
-  // owns the entry point for starting one.
-  if (bound === undefined && agents.length === 0) return null
+  // An empty roster is the SETUP case, not "no story": the base stays and its
+  // picker carries the way into NTR settings. Only the window before the host
+  // has answered `agents/list` stays blank — `agents: []` there means "not read
+  // yet", and the setup entry would accuse a configured deployment (see
+  // `agentBaseHasData`).
+  if (!agentBaseHasData(bound, agents, ui.agentsLoaded)) return null
   // Set up = an agent serves this conversation: a live session, a persisted
   // pick, the host's optimistic binding, OR the plugin default the guard's
   // route rewrite falls back to. The last one is what makes a brand-new
@@ -613,7 +643,7 @@ export function AcpSessionControls(props: AcpClusterProps) {
           itself is the shatter played here (see `shattering`). */}
       {showAgentBase && (
         <AcpChip
-          {...agentBaseChip(route, routed, acp)}
+          {...agentBaseChip(route, routed, acp, agents.length === 0)}
           active={routed}
           className={shattering ? 'ntr-acp-shatter' : undefined}
           onClick={shattering ? undefined : (trigger) => { open('agent', trigger) }}
@@ -648,6 +678,14 @@ export interface MenuContext {
  */
 export const REFRESH_CATALOG_ITEM = '__refresh-catalog__'
 
+/**
+ * The empty roster's setup action. Like the model picker's refresh row it is an
+ * ACTION inside the picker, not an agent: agent ids match
+ * `[a-z0-9][a-z0-9._-]{0,63}` (no leading underscore), so no real id can
+ * collide with it.
+ */
+export const OPEN_SETTINGS_ITEM = '__open-settings__'
+
 /** The agent roster rows: one row per configured ACP agent, current one marked. */
 function agentSection(context: MenuContext): AcpMenuSection {
   const { acp, route } = context
@@ -659,12 +697,21 @@ function agentSection(context: MenuContext): AcpMenuSection {
     active: route.agentId === agent.id,
   }))
   if (items.length === 0) {
+    // The base stays on an empty roster (see `agentBaseHasData`), so this menu
+    // is the setup surface: a status row that says what is missing, then an
+    // ACTION row that opens the NTR settings. The action is a row of its own
+    // because a disabled status row cannot be the way forward.
     items.push({
       id: 'none',
       label: acp.label('还没有配置 NTR agent', 'No NTR agent configured yet'),
-      detail: acp.label('设置 → NTR', 'Settings → NTR'),
+      detail: acp.label('添加并启用一个 agent 后即可开始对话', 'Add and enable an agent to start'),
       disabled: true,
     })
+    items.push({
+      id: OPEN_SETTINGS_ITEM,
+      label: acp.label('打开 NTR 设置', 'Open NTR settings'),
+      detail: acp.label('添加或启用 agent', 'Add or enable an agent'),
+    })
   }
   return {
     id: 'agent',
@@ -987,6 +1034,15 @@ export function AcpSessionMenu(props: AcpClusterProps) {
         if (agentId !== undefined) await acp.probeModels(agentId)
         return
       }
+      if (sectionId === 'agent' && itemId === OPEN_SETTINGS_ITEM) {
+        // The empty roster's way out (see `agentSection`): there is no agent to
+        // bind, so this row opens the NTR settings surface instead. Close the
+        // picker first — the dialog is a frame overlay and the menu must not
+        // linger behind it.
+        closeAcpMenu()
+        openAcpSettingsDialog()
+        return
+      }
       if (sectionId === 'agent') {
         await acp.bindChatAgent(sessionId, itemId)
       } else if (sectionId === 'model') {

package/src/client/settings-dialog.tsx

@@ -0,0 +1,73 @@
+/**
+ * The NTR settings dialog, opened from the agent base's empty-roster menu.
+ *
+ * WHY A DIALOG OF OUR OWN: the host settings shell owns its open state and
+ * exposes no programmatic way in. The sidebar seat that receives `openSettings`
+ * (`settings.launcher`) is a single-occupant slot already held by the account
+ * menu, and `openSection` is only handed to `settings.onboarding` registrants —
+ * so a conversation surface cannot drive the shell's modal. This dialog mounts
+ * the SAME `AcpSettingsSection` the shell mounts, on the frame's overlay layer
+ * (`shell.overlay`): one settings surface, two entrances, no duplicated
+ * configuration logic.
+ *
+ * The trigger (composer model seat) and this dialog (root overlay) live in
+ * unrelated slot trees, so the open state is the module-level store in
+ * `acp-ui.tsx` (`openAcpSettingsDialog`).
+ */
+
+import { useEffect } from 'react'
+import { AcpSettingsSection } from './panel.tsx'
+import {
+  closeAcpSettingsDialog,
+  ensureAcpStyle,
+  useAcpSettingsDialogOpen,
+} from './acp-ui.tsx'
+import type { AcpStore } from './store.ts'
+
+/** The root overlay entry's inject face. */
+export interface AcpSettingsDialogProps {
+  acp: AcpStore
+}
+
+/** Frame-wide NTR settings surface; renders nothing while closed. */
+export function AcpSettingsDialog(props: AcpSettingsDialogProps) {
+  ensureAcpStyle()
+  const { acp } = props
+  const open = useAcpSettingsDialogOpen()
+  useEffect(() => {
+    if (!open) return
+    const onKey = (event: KeyboardEvent): void => {
+      if (event.key !== 'Escape') return
+      event.preventDefault()
+      event.stopPropagation()
+      closeAcpSettingsDialog()
+    }
+    document.addEventListener('keydown', onKey, true)
+    return () => { document.removeEventListener('keydown', onKey, true) }
+  }, [open])
+  if (!open) return null
+  const title = acp.label('NTR 设置', 'NTR settings')
+  return (
+    <div className="ntr-acp-dialog-layer">
+      <div className="ntr-acp-dialog-mask" aria-hidden onClick={closeAcpSettingsDialog} />
+      <div className="ntr-acp-dialog" role="dialog" aria-modal="true" aria-label={title}>
+        <div className="ntr-acp-dialog-head">
+          <span className="ntr-acp-dialog-title">{title}</span>
+          <button
+            type="button"
+            className="ntr-acp-dialog-close"
+            title={acp.label('关闭', 'Close')}
+            aria-label={acp.label('关闭 NTR 设置', 'Close NTR settings')}
+            autoFocus
+            onClick={closeAcpSettingsDialog}
+          >
+            ✕
+          </button>
+        </div>
+        <div className="ntr-acp-dialog-body">
+          <AcpSettingsSection acp={acp} />
+        </div>
+      </div>
+    </div>
+  )
+}

package/src/client/store.ts

@@ -83,8 +83,20 @@ export interface ChatTranscript {
 
 export interface UiState {
   open: boolean
+  /**
+   * Bumped by {@link AcpStore.refreshLocale}. Labels resolve while rendering,
+   * but memoized transcript rows compare props — this counter is what tells
+   * them the language switched.
+   */
+  localeRev: number
   stream: 'init' | 'live' | 'down'
   agents: AgentView[]
+  /**
+   * Whether the host has answered `agents/list` at least once in this page.
+   * `agents: []` alone cannot tell "no agent configured" from "not read yet";
+   * a surface that offers a setup entry on an empty roster must wait for this.
+   */
+  agentsLoaded: boolean
   sessions: SessionView[]
   activeSessionId?: string
   blocks: Block[]
@@ -506,8 +518,10 @@ export const DEFAULT_KNOWN_PRESETS: DetectedAgentInfo[] = [
 export class AcpStore {
   private state: UiState = {
     open: false,
+    localeRev: 0,
     stream: 'init',
     agents: [],
+    agentsLoaded: false,
     sessions: [],
     blocks: [],
     permissions: [],
@@ -580,6 +594,8 @@ export class AcpStore {
   private readonly seatCatalogReads = new Set<string>()
   /** In-flight `agent/cached-models` reads, keyed by agent id. */
   private readonly cachedModelReads = new Set<string>()
+  /** Counts behind the last successful explicit re-detect, so a locale switch can re-render its summary. */
+  private detectCounts: { total: number; installed: number } | undefined
 
   constructor(private readonly rpc: RpcCall, private readonly locale: (zh: string, en: string) => string) {}
 
@@ -735,6 +751,7 @@ export class AcpStore {
       // Absent on an older host: keep the settings-panel card (degraded path).
       this.mutate({
         agents,
+        agentsLoaded: true,
         sessions,
         defaultAgent: defaultAgentInfo?.agentId,
         detectedAgents,
@@ -755,19 +772,18 @@ export class AcpStore {
       const result = await this.call<{ agents: DetectedAgentInfo[] }>('agents/detect')
       const agents = result.agents.length > 0 ? result.agents : [...DEFAULT_KNOWN_PRESETS]
       const installed = agents.filter(agent => agent.detected).length
+      this.detectCounts = { total: agents.length, installed }
       this.mutate({
         detectedAgents: agents,
         detecting: false,
-        detectSummary: this.locale(
-          `已检测 ${String(agents.length)} 个预设：${String(installed)} 个已安装，其余可从「添加智能体」启用。`,
-          `Detected ${String(agents.length)} presets: ${String(installed)} installed, enable the rest via "Add agent".`,
-        ),
+        detectSummary: this.detectSummaryOf(agents.length, installed),
       })
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error)
       const notice = msg.includes('unknown endpoint agents/detect')
         ? this.locale('宿主服务运行着旧版本代码，请在终端重启 dsh web 服务以激活主机检测功能。', 'Host running older version. Please restart dsh web to enable agent detection.')
         : msg
+      this.detectCounts = undefined
       this.mutate({
         detecting: false,
         notice,
@@ -778,6 +794,13 @@ export class AcpStore {
     }
   }
 
+  private detectSummaryOf(total: number, installed: number): string {
+    return this.locale(
+      `已检测 ${String(total)} 个预设：${String(installed)} 个已安装，其余可从「添加智能体」启用。`,
+      `Detected ${String(total)} presets: ${String(installed)} installed, enable the rest via "Add agent".`,
+    )
+  }
+
   async saveAgent(payload: AgentSavePayload): Promise<void> {
     try {
       await this.call('agent/save', payload)
@@ -1587,6 +1610,20 @@ export class AcpStore {
    */
   label: (zh: string, en: string) => string = (zh: string, en: string): string => this.locale(zh, en)
 
+  /**
+   * Republish the snapshot after a locale switch. Every `label()` resolves
+   * against the current language while rendering, so a notification is all
+   * that is needed — except the detect summary, which the store owns as an
+   * already-resolved string and rebuilds from its counts here.
+   */
+  refreshLocale(): void {
+    const counts = this.detectCounts
+    this.mutate({
+      localeRev: this.state.localeRev + 1,
+      ...(counts === undefined ? {} : { detectSummary: this.detectSummaryOf(counts.total, counts.installed) }),
+    })
+  }
+
   clearNotice(): void {
     this.mutate({ notice: undefined })
   }