dsh-ntr 0.2.1 → 0.3.0

package/src/client/panel.tsx

@@ -19,7 +19,7 @@ import { useEffect, useRef, useState, useSyncExternalStore } from 'react'
 import { formatCommandLine, isAbsolutePathLike, splitCommandLine } from './acp-ui.tsx'
 import { DEFAULT_KNOWN_PRESETS } from './store.ts'
 import type { AcpStore, UiState } from './store.ts'
-import type { AcpAgentDef, AcpApprovalDeadlines, AcpCatalogChoice, AcpMcpServerDef, AgentSavePayload, AgentView, DetectedAgentInfo, PermissionTimeoutMode } from '../protocol.ts'
+import type { AcpAgentDef, AcpApprovalDeadlines, AcpCatalogChoice, AcpMcpServerDef, AgentSavePayload, AgentView, DetectedAgentInfo, PermissionTimeoutMode, PluginUpdateState } from '../protocol.ts'
 
 interface WithStore { acp: AcpStore }
 
@@ -83,7 +83,7 @@ const STYLE = `
 }
 .dwa-page-header { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin-bottom: 28px; }
 .dwa-page-heading { min-width: 0; }
-.dwa-page-title { margin: 0; font-size: 20px; line-height: 1.35; font-weight: 550; letter-spacing: -0.02em; }
+.dwa-page-title { margin: 0; font-size: 20px; line-height: 1.35; font-weight: 550; letter-spacing: -0.02em; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
 .dwa-page-description { margin: 5px 0 0; color: var(--ntr-muted); font-size: var(--ntr-font-sm); }
 .dwa-btn {
   min-height: 32px; box-sizing: border-box; font: inherit; border-radius: var(--ntr-radius-sm);
@@ -115,6 +115,20 @@ const STYLE = `
 .dwa-badge-success { background: var(--dsw-alias-state-success-tertiary, #dcfce7); color: var(--ntr-success); }
 .dwa-badge-warn { background: var(--dsw-alias-state-warn-tertiary, #fef3c7); color: var(--ntr-warn); }
 .dwa-badge-info { background: var(--dsw-alias-state-business-tertiary, #dbeafe); color: var(--dsw-alias-state-business-primary, #2563eb); }
+/* The update badge is a button (it expands the update card): strip the
+   browser's default button chrome, keep the badge look. */
+.dwa-update-badge { border: 0; font-family: inherit; cursor: pointer; }
+.dwa-update-badge:hover { opacity: 0.85; }
+/* The version badge doubles as the update entry: same badge look, no chrome. */
+.dwa-version-btn { border: 0; font-family: inherit; cursor: pointer; }
+.dwa-version-btn:hover { opacity: 0.85; }
+.dwa-version { font-family: var(--ds-font-family-code, monospace); }
+/* The update card sits between the page header and the permission mirror. */
+.dwa-update-card { margin-bottom: 16px; }
+.dwa-update-summary { display: flex; align-items: baseline; gap: 8px; flex-wrap: wrap; font-weight: 550; }
+.dwa-update-copy { margin: 6px 0 0; color: var(--ntr-muted); font-size: var(--ntr-font-xs); }
+.dwa-update-message { margin: 6px 0 0; color: var(--ntr-muted); font-size: var(--ntr-font-xs); white-space: pre-wrap; overflow-wrap: anywhere; }
+.dwa-update-actions { margin-top: 10px; }
 .dwa-dot { width: 7px; height: 7px; border-radius: 50%; display: inline-block; flex-shrink: 0; }
 .dwa-agent-list { display: flex; flex-direction: column; border-top: var(--ntr-line); }
 .dwa-agent-card { border-bottom: var(--ntr-line); min-width: 0; }
@@ -854,6 +868,157 @@ function ApprovalDeadlinesCard(props: { acp: AcpStore; ui: UiState }) {
 
 type SettingsPage = 'agents' | 'add' | 'approvals' | 'appearance' | 'diagnostics'
 
+/** The states that carry an update badge next to the version badge. */
+function updateBadgeText(update: PluginUpdateState, acp: AcpStore): string | undefined {
+  if (update.status === 'available') {
+    return acp.label(`可更新 v${update.latest ?? update.current}`, `Update v${update.latest ?? update.current}`)
+  }
+  if (update.status === 'applying') return acp.label('更新中…', 'Updating…')
+  if (update.status === 'applied') {
+    const installed = update.installed ?? update.latest ?? update.current
+    return acp.label(`已更新 v${installed}`, `Updated v${installed}`)
+  }
+  if (update.status === 'restart-required') {
+    // Only a KNOWN disk version can be named. An interrupted install leaves
+    // `installed` unset, and a badge would have to invent a version.
+    if (update.installed === undefined) return undefined
+    // Neutral: the disk version can be newer OR older than the running one.
+    return acp.label(`待重启 v${update.installed}`, `Restart for v${update.installed}`)
+  }
+  return undefined
+}
+
+/**
+ * The version badge's update companion. Every badge is a button, `applying`
+ * included: the card is where the install's outcome is read, so the running
+ * install must be able to open it too. States without anything to act on get
+ * no badge at all — the version badge itself still opens the card.
+ */
+function PluginUpdateBadge(props: { acp: AcpStore; update: PluginUpdateState; open: boolean; onToggle: () => void }) {
+  const { acp, update, open, onToggle } = props
+  const text = updateBadgeText(update, acp)
+  if (text === undefined) return null
+  return (
+    <button
+      type="button"
+      className="dwa-badge dwa-badge-info dwa-update-badge"
+      aria-expanded={open}
+      aria-controls="ntr-plugin-update-card"
+      onClick={onToggle}
+    >
+      {text}
+    </button>
+  )
+}
+
+/**
+ * The update card. In-page, no dialog: the settings page already owns the one
+ * action (install the exact version the host reported), and a modal on top of
+ * a settings section would hide the version it is updating.
+ *
+ * The copy stays to one line per state (constraint 33); the host's raw error
+ * (`message`) is the only long text, and it wraps on its own line so a stack
+ * trace or a registry error is readable without stretching the card.
+ */
+function PluginUpdateCard(props: { acp: AcpStore; update: PluginUpdateState; onClose: () => void }) {
+  const { acp, update, onClose } = props
+  const applying = update.status === 'applying'
+  const latest = update.latest ?? update.current
+  const onDisk = update.installed !== undefined && update.installed !== update.current
+    ? update.installed
+    : undefined
+  const published = update.publishedAt !== undefined && !Number.isNaN(new Date(update.publishedAt).getTime())
+    ? new Date(update.publishedAt).toLocaleDateString()
+    : undefined
+  const copy = update.status === 'available'
+    ? acp.label('更新会卸载并重装插件，之后可能需要重启 DSH。', 'Updating uninstalls and reinstalls the plugin, and may require restarting DSH.')
+    : update.status === 'applied'
+      ? acp.label('已应用，刷新页面即可使用新版本。', 'Applied. Reload the page to use the new version.')
+      : update.status === 'restart-required'
+        ? update.installed !== undefined
+          ? acp.label(
+            `磁盘已是 v${update.installed}，重启 DSH 后生效（桌面 App 退出重开；命令行重启 dsh web）。`,
+            `On disk v${update.installed}. Restart DSH to apply (quit and reopen the app, or restart dsh web).`,
+          )
+          : acp.label(
+            '更新可能已完成，请刷新页面确认当前版本。',
+            'The update may already be complete. Refresh the page to confirm the current version.',
+          )
+        : update.status === 'busy'
+          ? acp.label('有进行中的对话，结束后才能更新。', 'Finish the running conversation before updating.')
+          : update.status === 'failed'
+            ? acp.label('更新失败。', 'Update failed.')
+            : update.status === 'current'
+              ? acp.label('已是最新版本。', 'Up to date.')
+              : update.status === 'source-install'
+                ? acp.label(
+                  '源码或本地安装，无法通过 registry 更新。',
+                  'Source or local install; update it through its own checkout.',
+                )
+                : update.status === 'managed'
+                  ? acp.label('此安装由宿主管理，不能在这里更新。', 'This install is managed by the host and cannot be updated here.')
+                  : undefined
+  const showMessage = (update.status === 'failed' || update.status === 'busy' || update.status === 'managed')
+    && update.message !== undefined
+  const apply = async (): Promise<void> => {
+    if (update.latest === undefined) return
+    try {
+      await acp.applyPluginUpdate(update.latest)
+    } catch {
+      // The store keeps the "disk may have changed" state and writes its own notice.
+    }
+  }
+  return (
+    <div
+      id="ntr-plugin-update-card"
+      className="dwa-card dwa-update-card"
+      role="group"
+      aria-label={acp.label('插件更新', 'Plugin update')}
+    >
+      <div className="dwa-update-summary">
+        <span>{acp.label(`当前 v${update.current}`, `Current v${update.current}`)}</span>
+        {onDisk !== undefined && <span className="dwa-hint">{acp.label(`磁盘 v${onDisk}`, `On disk v${onDisk}`)}</span>}
+        {update.latest !== undefined && (
+          <>
+            <span aria-hidden="true">→</span>
+            <span>{acp.label(`最新 v${latest}`, `Latest v${latest}`)}</span>
+            {published !== undefined && <span className="dwa-hint">{published}</span>}
+          </>
+        )}
+      </div>
+      {copy !== undefined && <p className="dwa-update-copy">{copy}</p>}
+      {showMessage && <div className="dwa-update-message">{update.message}</div>}
+      <div className="dwa-row-actions dwa-update-actions">
+        {update.status === 'available' && (
+          <button type="button" className="dwa-btn dwa-btn-primary" onClick={() => { void apply() }}>
+            {acp.label('更新', 'Update')}
+          </button>
+        )}
+        {applying && (
+          <button type="button" className="dwa-btn dwa-btn-primary" disabled>
+            {acp.label('正在更新…', 'Updating…')}
+          </button>
+        )}
+        {update.status !== 'applying' && (
+          <button type="button" className="dwa-btn" onClick={onClose}>{acp.label('关闭', 'Close')}</button>
+        )}
+        <button type="button" className="dwa-btn dwa-btn-quiet" disabled={applying} onClick={() => void acp.checkPluginUpdate(true)}>
+          {acp.label('重新检查', 'Check again')}
+        </button>
+      </div>
+    </div>
+  )
+}
+
+/**
+ * The card is drawn for every state a host can report about this install,
+ * except the two where there is no install to talk about at all.
+ */
+function updateCardVisible(update: PluginUpdateState | undefined, open: boolean): boolean {
+  if (update === undefined || !open) return false
+  return update.status !== 'unsupported' && update.status !== 'not-installed'
+}
+
 export function AcpSettingsSection(props: WithStore) {
   const acp = props.acp
   ensureStyle()
@@ -862,6 +1027,12 @@ export function AcpSettingsSection(props: WithStore) {
   const [page, setPage] = useState<SettingsPage>('agents')
   const [addOpen, setAddOpen] = useState(false)
   const [addTarget, setAddTarget] = useState<DetectedAgentInfo | undefined>(undefined)
+  const [updateOpen, setUpdateOpen] = useState(false)
+  // The store throttles this to one registry read per ten minutes, so every
+  // remount (both settings entries mount this section) is cheap.
+  useEffect(() => {
+    void acp.checkPluginUpdate()
+  }, [acp])
   const { configured, available } = partitionAgents(ui.detectedAgents, ui.agents)
   const selected = addTarget ?? available[0] ?? NEW_AGENT_SEED
   const openAdd = (): void => {
@@ -869,12 +1040,49 @@ export function AcpSettingsSection(props: WithStore) {
     setPage('add')
   }
   const presetProblem = ui.preset !== undefined && (!ui.preset.installed || ui.preset.problem !== undefined)
+  const update = ui.pluginUpdate
+  // A source install cannot be replaced by this browser; the version badge
+  // says so on hover. Neutral wording: a checkout may be git or not.
+  const versionTitle = update?.status === 'source-install'
+    ? acp.label('源码或本地安装，无法通过 registry 更新。', 'Source or local install; update it through its own checkout.')
+    : undefined
+  // The running version is the update entry: every state with a real install
+  // report can open the card, including "up to date" (which offers a re-check).
+  const versionOpensUpdate = update !== undefined
+    && update.status !== 'unsupported'
+    && update.status !== 'not-installed'
 
   return (
     <div className="dwa-root">
       <header className="dwa-page-header">
         <div className="dwa-page-heading">
-          <h2 className="dwa-page-title">{acp.label('NTR 设置', 'NTR settings')}</h2>
+          <h2 className="dwa-page-title" aria-label={acp.label('NTR 设置', 'NTR settings')}>
+            {acp.label('NTR 设置', 'NTR settings')}
+            {ui.pluginVersion !== undefined && (
+              versionOpensUpdate
+                ? (
+                  <button
+                    type="button"
+                    className="dwa-badge dwa-version dwa-version-btn"
+                    title={versionTitle}
+                    aria-expanded={updateOpen}
+                    aria-controls="ntr-plugin-update-card"
+                    onClick={() => setUpdateOpen(open => !open)}
+                  >
+                    {`v${ui.pluginVersion}`}
+                  </button>
+                )
+                : <span className="dwa-badge dwa-version" title={versionTitle}>{`v${ui.pluginVersion}`}</span>
+            )}
+            {update !== undefined && (
+              <PluginUpdateBadge
+                acp={acp}
+                update={update}
+                open={updateOpen}
+                onToggle={() => setUpdateOpen(open => !open)}
+              />
+            )}
+          </h2>
           <p className="dwa-page-description">
             {acp.label('连接智能体，设置你的对话偏好。', 'Connect agents and set your conversation preferences.')}
           </p>
@@ -886,6 +1094,10 @@ export function AcpSettingsSection(props: WithStore) {
         )}
       </header>
 
+      {update !== undefined && updateCardVisible(update, updateOpen) && (
+        <PluginUpdateCard acp={acp} update={update} onClose={() => setUpdateOpen(false)} />
+      )}
+
       {/* The cross-session mirror: the conversation dock answers the asks
           belonging to the open conversation; this card answers the rest. */}
       {ledger.visible && (

package/src/client/store.ts

@@ -6,7 +6,7 @@
  * Deliberately framework-free: React binds through `useSyncExternalStore`.
  */
 
-import type { AcpApprovalDeadlines, AcpConversationChoice, AcpEvent, AcpPresetStatus, AcpTagHalo, AgentCatalogResult, AgentProbeModelsResult, AgentSavePayload, AgentTestResult, AgentView, ChatSessionView, ChatTranscriptView, ApprovalDeadlinesSetPayload, ApprovalDeadlinesResult, DetectedAgentInfo, PermissionTimeoutMode, SessionView } from '../protocol.ts'
+import type { AcpApprovalDeadlines, AcpConversationChoice, AcpEvent, AcpPresetStatus, AcpTagHalo, AgentCatalogResult, AgentProbeModelsResult, AgentSavePayload, AgentTestResult, AgentView, ChatSessionView, ChatTranscriptView, ApprovalDeadlinesSetPayload, ApprovalDeadlinesResult, DetectedAgentInfo, PermissionTimeoutMode, PluginUpdateState, PluginVersionResult, SessionView } from '../protocol.ts'
 import { DEFAULT_TAG_HALO } from '../protocol.ts'
 
 /** One slash command the ACP agent declared, whole row (the menu draws name, description and `input.hint`). */
@@ -298,6 +298,18 @@ export interface UiState {
    * (`preset/status` answering `null`), in which case the panel hides the block.
    */
   preset?: AcpPresetStatus
+  /**
+   * The installed host package's version (`plugin/version`), rendered as the
+   * settings page badge. Absent on a host half without the endpoint, which
+   * hides the badge rather than naming a version this browser invented.
+   */
+  pluginVersion?: string
+  /**
+   * The running version and its update status (`plugin/update-check`). Absent
+   * on a host half without the endpoint, which hides the update entry instead
+   * of offering an install this browser cannot perform.
+   */
+  pluginUpdate?: PluginUpdateState
 }
 
 interface Listener { (): void }
@@ -309,6 +321,13 @@ const MAX_WATCHED = 6
 /** Raw JSON budget for one event block; the cut is marked. */
 const RAW_MAX = 256_000
 
+/**
+ * How long a fetched update state stays fresh. The settings panel asks on every
+ * mount; without this, every open would hit the registry. A forced check (the
+ * card's own button) always goes out.
+ */
+const PLUGIN_UPDATE_TTL_MS = 10 * 60 * 1000
+
 /** Pretty-printed JSON of an agent message (never throws, cuts only at {@link RAW_MAX} with a marker). */
 export function jsonText(value: unknown): string {
   let text: string
@@ -531,6 +550,14 @@ export const DEFAULT_KNOWN_PRESETS: DetectedAgentInfo[] = [
     defaultCommand: 'opencode',
     defaultArgs: ['acp'],
   },
+  {
+    id: 'cursor',
+    name: 'Cursor CLI',
+    description: 'Cursor CLI — run as `agent acp` over stdio (legacy alias `cursor-agent acp`)',
+    detected: false,
+    defaultCommand: 'agent',
+    defaultArgs: ['acp'],
+  },
   {
     id: 'qwen',
     name: 'Qwen Code',
@@ -646,6 +673,22 @@ export class AcpStore {
   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
+  /** When {@link UiState.pluginUpdate} was last read from the host (epoch ms). */
+  private pluginUpdateFetchedAt = 0
+  /**
+   * The shared in-flight `plugin/update-check`. The settings section mounts
+   * twice (both entries) and the update popover asks too; without this, two
+   * mounts in the same tick each fire their own registry read.
+   */
+  private pluginUpdateInflight?: Promise<PluginUpdateState | undefined>
+  /** Re-entry guard for `plugin/update-apply` (a double click is one install). */
+  private pluginUpdateApplying = false
+  /**
+   * Update read generation. An apply bumps it so a check that was already in
+   * flight (started before the install) cannot land afterwards and overwrite
+   * the install's verdict with the pre-install `available`.
+   */
+  private pluginUpdateGeneration = 0
 
   constructor(private readonly rpc: RpcCall, private readonly locale: (zh: string, en: string) => string) {}
 
@@ -783,7 +826,7 @@ export class AcpStore {
   /** Snapshot refresh used on panel open and after a stream outage. */
   async resync(): Promise<void> {
     try {
-      const [{ agents }, { sessions }, defaultAgentInfo, detectResult, presetResult, tagHaloResult, deadlinesResult] = await Promise.all([
+      const [{ agents }, { sessions }, defaultAgentInfo, detectResult, presetResult, tagHaloResult, deadlinesResult, versionResult] = await Promise.all([
         this.call<{ agents: AgentView[] }>('agents/list'),
         this.call<{ sessions: SessionView[] }>('sessions/list'),
         // The plugin's OWN default ACP agent — a plugin-private id, not a DSH
@@ -797,6 +840,9 @@ export class AcpStore {
         // `undefined` (older half) hides the deadline card instead of showing a
         // number this browser made up.
         this.call<ApprovalDeadlinesResult>('ui/approval-deadlines').catch(() => ({ deadlines: undefined })),
+        // The settings badge's data source; older halves answer `unknown
+        // endpoint`, which hides the badge.
+        this.call<PluginVersionResult>('plugin/version').catch(() => null),
       ])
       const detectedAgents = (detectResult && detectResult.agents.length > 0)
         ? detectResult.agents
@@ -811,6 +857,7 @@ export class AcpStore {
         preset: presetResult?.preset ?? undefined,
         tagHalo: tagHaloResult?.halo ?? { ...DEFAULT_TAG_HALO },
         approvalDeadlines: deadlinesResult.deadlines,
+        pluginVersion: versionResult?.version !== undefined && versionResult.version !== '' ? versionResult.version : undefined,
       })
       const active = this.state.activeSessionId ?? sessions[0]?.sessionId
       if (active !== undefined) await this.loadTranscript(active)
@@ -819,6 +866,103 @@ export class AcpStore {
     }
   }
 
+  /**
+   * Read the plugin's update state (`plugin/update-check`). Throttled to ten
+   * minutes unless `force`: the settings panel asks on mount, and every
+   * remount must not hit the registry.
+   *
+   * An older host serves no such endpoint (`unknown endpoint`). That is a
+   * normal degradation, not an error worth a notice: the answer is `undefined`
+   * and the panel simply keeps its update entry hidden.
+   */
+  async checkPluginUpdate(force = false): Promise<PluginUpdateState | undefined> {
+    // One read for every caller while it is in flight, force included: the
+    // settings page and the popover mounting together must not hit the
+    // registry twice.
+    if (this.pluginUpdateInflight !== undefined) return this.pluginUpdateInflight
+    const current = this.state.pluginUpdate
+    if (!force && current !== undefined && Date.now() - this.pluginUpdateFetchedAt < PLUGIN_UPDATE_TTL_MS) {
+      return current
+    }
+    const generation = this.pluginUpdateGeneration
+    const inflight = this.readPluginUpdate(generation)
+    this.pluginUpdateInflight = inflight
+    try {
+      return await inflight
+    } finally {
+      this.pluginUpdateInflight = undefined
+    }
+  }
+
+  private async readPluginUpdate(generation: number): Promise<PluginUpdateState | undefined> {
+    try {
+      const pluginUpdate = await this.call<PluginUpdateState>('plugin/update-check')
+      // An install started while this read was in flight: its answer is
+      // already stale, and the install's verdict owns the state now.
+      if (generation !== this.pluginUpdateGeneration) return undefined
+      this.pluginUpdateFetchedAt = Date.now()
+      this.mutate({ pluginUpdate })
+      return pluginUpdate
+    } catch {
+      return undefined
+    }
+  }
+
+  /**
+   * Install one exact version (`plugin/update-apply`). The status flips to
+   * `applying` first so the badge answers the click; the host's answer then
+   * becomes the state.
+   *
+   * A failed call does NOT prove the install did not happen: on an HMR host
+   * the update uninstalls the plugin before reinstalling it, which can cut the
+   * response. Whatever the error, the disk may already carry the new version,
+   * so the state becomes `restart-required` (the one neutral verdict for "the
+   * running code is not the disk's") with `installed` dropped (unknown, not a
+   * fact to display) and the notice asks for a reload rather than restoring
+   * `available` and pretending nothing changed.
+   */
+  async applyPluginUpdate(version: string): Promise<PluginUpdateState | undefined> {
+    if (this.pluginUpdateApplying) return undefined
+    this.pluginUpdateApplying = true
+    // Any check already in flight predates the install; its answer must not
+    // land on top of the install's verdict.
+    this.pluginUpdateGeneration += 1
+    const previous = this.state.pluginUpdate
+    if (previous !== undefined) {
+      this.mutate({ pluginUpdate: { ...previous, status: 'applying' } })
+    }
+    try {
+      const pluginUpdate = await this.call<PluginUpdateState>('plugin/update-apply', { version })
+      this.pluginUpdateFetchedAt = Date.now()
+      this.mutate({ pluginUpdate })
+      return pluginUpdate
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      // The disk state is UNKNOWN here: the install may have completed before
+      // the response was cut. Keep `latest` for display, drop `installed` so no
+      // surface can claim a disk version we never read, and reset the throttle
+      // so the next check actually asks the host instead of serving this
+      // unknown verdict for ten minutes.
+      const interrupted: PluginUpdateState = previous !== undefined
+        ? { ...previous, status: 'restart-required', installed: undefined, message }
+        : { status: 'restart-required', current: this.state.pluginVersion ?? '?', message }
+      this.pluginUpdateFetchedAt = 0
+      this.mutate({
+        pluginUpdate: interrupted,
+        notice: this.locale(
+          '更新请求已中断；请刷新页面确认当前版本。',
+          'The update request was interrupted. Reload the page to confirm the installed version.',
+        ),
+      })
+      return undefined
+    } finally {
+      // Invalidate reads that STARTED during the install: their "applying"
+      // answer would otherwise land on top of this call's final verdict.
+      this.pluginUpdateGeneration += 1
+      this.pluginUpdateApplying = false
+    }
+  }
+
   async detectAgents(): Promise<void> {
     this.mutate({ detecting: true })
     try {

package/src/impl.ts

@@ -8,7 +8,7 @@
 import { randomUUID } from './ids.ts'
 import type {
   AcpAgentCatalog, AcpAgentDef, AcpCatalogOption, AcpApprovalDeadlines, AcpConversationChoice, AcpEvent, AcpMcpServerDef, AcpPluginConfig, AcpPresetStatus, AcpTagHalo, AgentCatalogResult, AgentProbeModelsResult, AgentTestResult,
-  AgentView, ApprovalDeadlineKey, ApprovalDeadlinePatch, ChatSessionView, ChatTranscriptView, DetectedAgentInfo, PermissionOptionView, PermissionOutcome, PermissionTimeoutMode, RpcResult,
+  AgentView, ApprovalDeadlineKey, ApprovalDeadlinePatch, ChatSessionView, ChatTranscriptView, DetectedAgentInfo, PermissionOptionView, PermissionOutcome, PermissionTimeoutMode, PluginUpdateState, RpcResult,
 } from './protocol.ts'
 import { DEFAULT_TAG_HALO } from './protocol.ts'
 
@@ -535,6 +535,22 @@ export function validateConfig(raw: unknown): AcpPluginConfig {
   if (typeof staleCancelMaxRetries !== 'number' || !Number.isInteger(staleCancelMaxRetries) || staleCancelMaxRetries < 0 || staleCancelMaxRetries > 5) {
     throw new AcpError('bad_config', 'acp: staleCancelMaxRetries must be an integer in [0, 5]')
   }
+  // Stall-recovery windows (inactivity watchdog). Two lengths on purpose: a
+  // silent turn with the floor is a stuck agent, but a turn waiting on a TOOL
+  // call is a working agent, and the tool half may take as long as the guard's
+  // own tool-output wait. `0` means "off" / "fall back", never "expire now".
+  const turnStallMs = value.turnStallMs ?? 600_000
+  if (typeof turnStallMs !== 'number' || !Number.isInteger(turnStallMs) || turnStallMs < 0 || turnStallMs > 86_400_000) {
+    throw new AcpError('bad_config', 'acp: turnStallMs must be an integer in [0, 86400000] (0 = disable the watchdog)')
+  }
+  const turnStallToolMs = value.turnStallToolMs ?? 1_800_000
+  if (typeof turnStallToolMs !== 'number' || !Number.isInteger(turnStallToolMs) || turnStallToolMs < 0 || turnStallToolMs > 86_400_000) {
+    throw new AcpError('bad_config', 'acp: turnStallToolMs must be an integer in [0, 86400000] (0 = fall back to turnStallMs)')
+  }
+  const turnStallTickMs = value.turnStallTickMs ?? 30_000
+  if (typeof turnStallTickMs !== 'number' || !Number.isInteger(turnStallTickMs) || turnStallTickMs < 1 || turnStallTickMs > 60_000) {
+    throw new AcpError('bad_config', 'acp: turnStallTickMs must be an integer in [1, 60000]')
+  }
   return {
     agents,
     transcriptMaxEntries: max,
@@ -545,6 +561,9 @@ export function validateConfig(raw: unknown): AcpPluginConfig {
     cancelFallbackMs,
     staleCancelRetryDelayMs,
     staleCancelMaxRetries,
+    turnStallMs,
+    turnStallToolMs,
+    turnStallTickMs,
   }
 }
 
@@ -1649,6 +1668,19 @@ export class PermissionLedger {
     return [...this.pending.values()].map(e => ({ requestId: e.requestId, sessionId: e.sessionId }))
   }
 
+  /**
+   * Whether ANY outstanding ask belongs to `sessionId`, a HOST session id
+   * (`LiveSession.sessionId`) — NOT the ACP protocol session id. Used by the
+   * stall watchdog: a turn blocked on a human is not a silent turn, so the
+   * session with a pending permission must not be finalized as stalled.
+   */
+  hasPendingFor(sessionId: string): boolean {
+    for (const entry of this.pending.values()) {
+      if (entry.sessionId === sessionId) return true
+    }
+    return false
+  }
+
   /**
    * Outstanding asks WITH the view the browser was shown, for the reconnect
    * replay. Entries created without a view are skipped: replaying a frame the
@@ -1874,6 +1906,24 @@ export interface AcpManager {
    * the registry service), which hides the panel block instead of guessing.
    */
   presetStatus?(): Promise<AcpPresetStatus | undefined>
+  /**
+   * The installed host package's version, reported for the settings page's
+   * badge. `undefined` on a host half that predates the endpoint, which hides
+   * the badge rather than showing a number the browser invented.
+   */
+  pluginVersion?(): string | undefined
+  /**
+   * Ask the host's plugin manager what is published for this package. Read-only
+   * toward the installation: never downloads, never swaps files, never restarts
+   * the host. Absent on a host half from before the updater existed.
+   */
+  pluginUpdateCheck?(): Promise<PluginUpdateState>
+  /**
+   * Install one exact stable version THROUGH the host's plugin manager. The
+   * manager owns download/restart semantics; this plugin only relays. Absent on
+   * an older host half.
+   */
+  pluginUpdateApply?(version: string): Promise<PluginUpdateState>
 }
 
 function ok<T>(value: T): RpcResult<T> {
@@ -2038,6 +2088,21 @@ export async function dispatchRpc(manager: AcpManager, endpoint: string, payload
       }
       case 'preset/status':
         return ok({ preset: await manager.presetStatus?.() ?? null })
+      case 'plugin/version':
+        // Absent on a host half from before the badge existed: the browser
+        // hides it instead of naming a version it cannot know.
+        return ok({ version: manager.pluginVersion?.() })
+      case 'plugin/update-check':
+        // An older host half answers `unsupported` rather than failing: the
+        // settings card then hides the update section.
+        return ok(await (manager.pluginUpdateCheck?.() ?? { status: 'unsupported' as const, current: '' }))
+      case 'plugin/update-apply': {
+        const version = str(body, 'version', 64)
+        if (!/^\d+\.\d+\.\d+$/.test(version)) {
+          throw new AcpError('bad_payload', 'acp: version must be a stable semver (x.y.z)')
+        }
+        return ok(await (manager.pluginUpdateApply?.(version) ?? { status: 'unsupported' as const, current: '' }))
+      }
       case 'agent/stop':
         await manager.stopAgent(str(body, 'agentId', 64)); return ok({ done: true })
       case 'default/agent':

package/src/index.ts

@@ -8,10 +8,12 @@
 import type { Context } from '@deepseek-ai/cordis'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import type { ConnectionRpcHandler, HostConnectionHandle } from '@deepseek-ai/dsh-client-connection'
-import { ACP_PRESET_ID, AcpLlmAdapter, BridgeManager } from './bridge.ts'
+import { ACP_PRESET_ID, AcpLlmAdapter, BridgeManager, PLUGIN_VERSION } from './bridge.ts'
 import { EventHub, dispatchRpc, permissionReplayFrames, sessionAgentPreset, sessionAgentPresetFromLog, validateConfig } from './impl.ts'
 import type { AcpEvent, ApprovalDeadlineKey } from './protocol.ts'
 import type { RosterPresetRow, SessionLogLike } from './impl.ts'
+import { UpdateService } from './update.ts'
+import type { UpdateManagerLike } from './update.ts'
 
 export const name = 'dsh-ntr'
 // Deliberately minimal: every other host service is probed structurally
@@ -86,9 +88,22 @@ export function apply(ctx: Context, config?: unknown): void {
       cancelFallbackMs: resolved.cancelFallbackMs,
       staleCancelRetryDelayMs: resolved.staleCancelRetryDelayMs,
       staleCancelMaxRetries: resolved.staleCancelMaxRetries,
+      turnStallMs: resolved.turnStallMs,
+      turnStallToolMs: resolved.turnStallToolMs,
+      turnStallTickMs: resolved.turnStallTickMs,
     },
   )
   const adapter = new AcpLlmAdapter(manager)
+  // Built-in update: the plugin never downloads or swaps files itself. The
+  // harness plugin manager owns the install; this only relays its facts.
+  // `resolveManager` re-probes on every call so a late-loading service is
+  // picked up without an `inject` dependency (a host without it must still
+  // load this plugin, and then reports `unsupported`).
+  manager.setUpdateService(new UpdateService({
+    resolveManager: () => (typeof ctx.get === 'function' ? ctx.get('pluginManager') : undefined) as UpdateManagerLike | undefined,
+    currentVersion: PLUGIN_VERSION,
+    isBusy: () => manager.hasActiveTurns(),
+  }))
   // The RAW patch-file deadlines, before validation filled the defaults in.
   // `validateConfig` returns a number for every knob, so the validated object
   // cannot tell "the deployment asked for 10 minutes" from "the deployment said