@moguiyu/dsh-tavily 0.2.6 → 0.2.8

package/lib/client.js

@@ -78,7 +78,7 @@ window.__ModuleLoader__.load({
     )
   }
 
-  function TavilyCard() {
+  function TavilySettingsCard() {
     const [enabled, setEnabled] = react.useState(null)
     const [expanded, setExpanded] = react.useState(false)
     const [server, setServer] = react.useState(null)
@@ -438,13 +438,45 @@ window.__ModuleLoader__.load({
     )
   }
 
+  // The card the host renders. 0.1.6-alpha.2 asks a bundle-config entry for
+  // `view: 'page'` only; the legacy keyed settings slot passes no view at all.
+  function TavilyCard(props) {
+    if (props && props.view === 'summary') return react.createElement(TavilySummary, null)
+    return react.createElement(TavilySettingsCard, null)
+  }
+
+  // One-liner for the summary view. Deliberately static and cheap: the page
+  // draws the title, the icon, and the crumb itself, and never asks this entry
+  // for anything but `page`.
+  function TavilySummary() {
+    return react.createElement('p', { style: { margin: 0, fontSize: 12, color: 'var(--dsw-alias-label-tertiary)' } },
+      'Rotating Tavily API keys for the advanced search tools. The built-in web_search keeps its native provider and is never replaced.'
+    )
+  }
+
   function apply(ctx) {
+    // 0.1.6-alpha.2 moved plugin configuration off the Settings page and
+    // replaced the keyed `settings.plugin.item` slot with the Plugins page's
+    // `plugins.*` family (`dsh-client-ui-plugin-manager` declares it).
+    // `slots.inject` fires only for a slot the host actually declares, so
+    // injecting both IS the feature detection: exactly one mounts per harness
+    // line, and neither throws on the other. Keep both -- dropping the retired
+    // name silently removes the card from rc.7 through 0.1.6-alpha.1, and
+    // dropping the new one silently removes it from 0.1.6-alpha.2 onward.
+    ctx.slots.inject('plugins.bundle.config', () => ctx.slots.register({
+      name: 'plugins.bundle.config',
+      // Keyed by the bundle's package name. The Plugins page renders this on
+      // the @moguiyu/dsh-tavily bundle page, between its description and rows.
+      key: '@moguiyu/dsh-tavily',
+      id: '@moguiyu/dsh-tavily'
+    }, TavilyCard))
+
     ctx.slots.inject('settings.plugin.item', () => ctx.slots.register({
       name: 'settings.plugin.item',
-      // rc.7 plugin management: this card is keyed by the settings namespace
-      // the Host serves (`tavily-search`); the Plugins configuration tab
-      // dispatches it when the namespace is present. The id/order/label props
-      // keep rc.6 list-slot deployments rendering the card as well.
+      // rc.7 through 0.1.6-alpha.1: keyed by the settings namespace the Host
+      // serves (`tavily-search`); the Plugins configuration tab dispatches it
+      // when the namespace is present. The id/order/label props keep rc.6
+      // list-slot deployments rendering the card as well.
       key: 'tavily-search',
       id: 'tavily-search',
       order: 30,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moguiyu/dsh-tavily",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Opt-in advanced Tavily model tools for DeepSeek Harness with the Tavily Search settings card (rc.7/rc.8 and the 0.1.2-0.1.6 plugin management lines). The built-in web_search is never replaced.",
   "type": "module",
   "main": "./src/index.js",
@@ -36,14 +36,16 @@
         "0.1.5-alpha.2": "compatible",
         "0.1.5-rc.1": "compatible",
         "0.1.5-rc.2": "compatible",
-        "0.1.6-alpha.1": "compatible"
+        "0.1.6-alpha.1": "compatible",
+        "0.1.6-alpha.2": "compatible"
       }
     },
     "client": {
       "platform": "web",
       "inject": [
         "@deepseek-ai/dsh-client-ui-settings",
-        "@deepseek-ai/dsh-client-ui-settings-plugins"
+        "@deepseek-ai/dsh-client-ui-settings-plugins",
+        "@deepseek-ai/dsh-client-ui-plugin-manager"
       ]
     }
   },

package/src/client.js

@@ -83,7 +83,7 @@ export function factory(require) {
     )
   }
 
-  function TavilyCard() {
+  function TavilySettingsCard() {
     const [enabled, setEnabled] = react.useState(null)
     const [expanded, setExpanded] = react.useState(false)
     const [server, setServer] = react.useState(null)
@@ -443,13 +443,45 @@ export function factory(require) {
     )
   }
 
+  // The card the host renders. 0.1.6-alpha.2 asks a bundle-config entry for
+  // `view: 'page'` only; the legacy keyed settings slot passes no view at all.
+  function TavilyCard(props) {
+    if (props && props.view === 'summary') return react.createElement(TavilySummary, null)
+    return react.createElement(TavilySettingsCard, null)
+  }
+
+  // One-liner for the summary view. Deliberately static and cheap: the page
+  // draws the title, the icon, and the crumb itself, and never asks this entry
+  // for anything but `page`.
+  function TavilySummary() {
+    return react.createElement('p', { style: { margin: 0, fontSize: 12, color: 'var(--dsw-alias-label-tertiary)' } },
+      'Rotating Tavily API keys for the advanced search tools. The built-in web_search keeps its native provider and is never replaced.'
+    )
+  }
+
   function apply(ctx) {
+    // 0.1.6-alpha.2 moved plugin configuration off the Settings page and
+    // replaced the keyed `settings.plugin.item` slot with the Plugins page's
+    // `plugins.*` family (`dsh-client-ui-plugin-manager` declares it).
+    // `slots.inject` fires only for a slot the host actually declares, so
+    // injecting both IS the feature detection: exactly one mounts per harness
+    // line, and neither throws on the other. Keep both -- dropping the retired
+    // name silently removes the card from rc.7 through 0.1.6-alpha.1, and
+    // dropping the new one silently removes it from 0.1.6-alpha.2 onward.
+    ctx.slots.inject('plugins.bundle.config', () => ctx.slots.register({
+      name: 'plugins.bundle.config',
+      // Keyed by the bundle's package name. The Plugins page renders this on
+      // the @moguiyu/dsh-tavily bundle page, between its description and rows.
+      key: '@moguiyu/dsh-tavily',
+      id: '@moguiyu/dsh-tavily'
+    }, TavilyCard))
+
     ctx.slots.inject('settings.plugin.item', () => ctx.slots.register({
       name: 'settings.plugin.item',
-      // rc.7 plugin management: this card is keyed by the settings namespace
-      // the Host serves (`tavily-search`); the Plugins configuration tab
-      // dispatches it when the namespace is present. The id/order/label props
-      // keep rc.6 list-slot deployments rendering the card as well.
+      // rc.7 through 0.1.6-alpha.1: keyed by the settings namespace the Host
+      // serves (`tavily-search`); the Plugins configuration tab dispatches it
+      // when the namespace is present. The id/order/label props keep rc.6
+      // list-slot deployments rendering the card as well.
       key: 'tavily-search',
       id: 'tavily-search',
       order: 30,

package/src/index.js

@@ -11,9 +11,15 @@
  * `tavily-search` settings section (the key the Plugins configuration tab
  * pairs the card against). The switch value lives both in that namespace and
  * in `~/.dsh/tavily-tool.json`; every write path converges on
- * `settings.update` (or the state file when no settings service exists),
- * persisted first, then the row restarts itself so the tool registers or
- * unregisters cleanly.
+ * `settings.update` (or the state file when no settings service exists).
+ *
+ * The switch owns the tool half's lifecycle DIRECTLY: it holds the disposer
+ * returned by {@link installTavilyTool} and disposes / re-installs it in place.
+ * Earlier versions instead restarted the composing row and let `apply()` re-run;
+ * that is gone on purpose. A row restart on 0.1.6 re-mounts the fiber into a
+ * scope the agent does not see, so the tools ended up registered nowhere and
+ * stayed missing for every session until DSH restarted (AGENTS.md §9 gate 5).
+ * Do not reintroduce the restart.
  *
  * The settings-card switch controls ONLY the opt-in `tavily_search` tool. The
  * built-in `web_search` tool is never replaced: this package registers no web
@@ -26,7 +32,7 @@ import { installBackend, readToolState, restoreToolState, writeToolState } from
 
 export const name = 'dsh-tavily'
 
-export const inject = ['tools', 'webServer', 'credentials', 'systemPrompt', 'loader']
+export const inject = ['tools', 'webServer', 'credentials', 'systemPrompt']
 
 export const Config = z.object({
   enabled: z.boolean().default(false),
@@ -44,31 +50,52 @@ export const Config = z.object({
 export const TAVILY_NS = 'tavily-search'
 
 export function apply(ctx, config) {
-  // The switch value the current fiber is acting on. Every write path updates
-  // this before the row restart so a watcher re-fired after a restart no-ops.
+  // The switch value this fiber is acting on. Every write path updates it
+  // before (un)registering, so a watcher re-fired afterwards no-ops.
   let lastApplied = isToolEnabled(config)
   // Settings seam state: the attached provider (null on hosts without one)
   // and the authoritative switch source — the resolved section while the
   // provider is attached, the composition entry otherwise.
   let settingsProvider = null
   let settingsSource = () => config
+  // The live registration of the tool half, or null while it is off.
+  let disposeTools = null
+
+  /**
+   * Add or remove the tool half to match `enabled`. This is the whole switch:
+   * `installTavilyTool` hands back a disposer covering its tools and prompt
+   * sections, so turning the capability off is a disposal rather than a row
+   * restart. See the module header for why the restart is gone.
+   */
+  function setTools(enabled) {
+    if (enabled) {
+      if (disposeTools === null) disposeTools = installTavilyTool(ctx)
+      return
+    }
+    if (disposeTools !== null) {
+      const dispose = disposeTools
+      disposeTools = null
+      dispose()
+    }
+  }
 
-  /** Persist the switch first, then restart this row so the tool (un)registers. */
+  // Seed from the composition entry / persisted switch, and hand the fiber the
+  // teardown so unloading the row leaves nothing registered.
+  setTools(lastApplied)
+  ctx.effect(() => () => { setTools(false) })
+
+  /** Persist the switch, then (un)register the tool half in place. */
   async function applySwitchLocal(enabled) {
     if (enabled === lastApplied) return
-    lastApplied = enabled
     const previous = readToolState()
+    lastApplied = enabled
     writeToolState(enabled)
     try {
-      const loader = ctx.get('loader')
-      const self = loader !== undefined && loader !== null ? loader.resolve('include:dsh-tavily') : undefined
-      if (self === undefined || self === null || self.fiber === undefined) {
-        throw new Error('dsh-tavily: row include:dsh-tavily is not loaded')
-      }
-      await self.fiber.update({ enabled }, true)
+      setTools(enabled)
     } catch (error) {
       lastApplied = previous !== null ? previous.enabled : (config.enabled !== false)
       restoreToolState(previous)
+      setTools(lastApplied)
       throw error
     }
   }
@@ -131,8 +158,8 @@ export function apply(ctx, config) {
     enabled: () => isToolEnabled(config),
     async applySwitch(enabled) {
       // Every write converges on one pipeline: the settings namespace when a
-      // settings service is attached (its watcher persists and restarts this
-      // row), or the plain state-file path otherwise.
+      // settings service is attached (its watcher persists and re-applies the
+      // switch in place), or the plain state-file path otherwise.
       if (settingsProvider !== null) {
         await settingsProvider.update(TAVILY_NS, { enabled })
       } else {
@@ -140,7 +167,4 @@ export function apply(ctx, config) {
       }
     },
   })
-
-  if (!isToolEnabled(config)) return
-  installTavilyTool(ctx)
 }