@moguiyu/dsh-tavily 0.2.0 → 0.2.2

package/README.md

@@ -10,9 +10,10 @@ for key/usage management.
 - **`tavily_extract` / `tavily_map` / `tavily_crawl`** — read a known URL's content, map a
   site's links, or crawl a site and return its pages. Same key-rotation/failover as search.
 - **Settings card** — key list, usage gauge, strategy selector, and the advanced-tool switch.
-- **Plugin-config settings card** — the Host registers the `tavily-search` settings namespace
+- **Plugin-config settings card** — the Host installs the `tavily-search` settings section
   and the card is keyed by it (keyed `settings.plugin.item`), so the Plugins configuration tab
-  serves the card exactly when this plugin is composed (needs DSH **0.1.0-rc.7 or newer**).
+  serves the card exactly when this plugin is composed (needs DSH **0.1.0-rc.7 or newer**,
+  including `0.1.2-alpha.x` — both seam generations are detected at runtime).
   The switch writes the namespace and restarts the row; the choice is mirrored to
   `~/.dsh/tavily-tool.json`.
 - **`web_search` is never replaced** — no `ctx.web` provider is registered and

package/lib/client.js

@@ -285,8 +285,12 @@ window.__ModuleLoader__.load({
 
     const isOff = enabled === false
 
-    return react.createElement('div', { style: { border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 10, minWidth: 0, overflow: 'hidden' } },
-      react.createElement('style', null, '.dts-icon-btn:hover{background:var(--dsw-alias-interactive-bg-hover)}.dts-icon-btn:disabled{opacity:.4;cursor:default}.dts-icon-btn-danger:hover{background:var(--dsw-alias-interactive-bg-hover-danger)}'),
+    // Card box mirrors the native plugin-config card (PluginCard.module.css,
+    // ui-settings-plugins): bg-layer-3 fill, .5px border-l4, 16px radius,
+    // hover/open border lift, and the open state's bg-layer-2 upgrade — so
+    // the card sits at the same elevation as native cards in dark mode too.
+    return react.createElement('div', { className: expanded ? 'dts-card dts-card-open' : 'dts-card', style: { minWidth: 0 } },
+      react.createElement('style', null, '.dts-card{border:.5px solid var(--dsw-alias-border-l4);border-radius:16px;background:var(--dsw-alias-bg-layer-3);transition:border-color .16s,background .16s}.dts-card:hover{border-color:var(--dsw-alias-label-dimmed)}.dts-card-open{background:var(--dsw-alias-bg-layer-2);border-color:var(--dsw-alias-label-dimmed)}.dts-icon-btn:hover{background:var(--dsw-alias-interactive-bg-hover)}.dts-icon-btn:disabled{opacity:.4;cursor:default}.dts-icon-btn-danger:hover{background:var(--dsw-alias-interactive-bg-hover-danger)}'),
       react.createElement('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 12, padding: '12px 14px', minHeight: 52, boxSizing: 'border-box' } },
         react.createElement('button', {
           type: 'button',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moguiyu/dsh-tavily",
-  "version": "0.2.0",
-  "description": "Opt-in advanced Tavily model tools for DeepSeek Harness with the Tavily Search settings card (rc.8 plugin management). The built-in web_search is never replaced.",
+  "version": "0.2.2",
+  "description": "Opt-in advanced Tavily model tools for DeepSeek Harness with the Tavily Search settings card (rc.7/rc.8 and 0.1.2 plugin management). The built-in web_search is never replaced.",
   "type": "module",
   "main": "./src/index.js",
   "exports": {
@@ -53,17 +53,17 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8"
+    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.8 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.8 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8 || ^0.1.2-alpha.2"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@moguiyu/dsh-tavily-backend": "^0.1.12",
-    "@moguiyu/dsh-tool-tavily-search": "^0.2.0"
+    "@moguiyu/dsh-tavily-backend": "^0.2.1",
+    "@moguiyu/dsh-tool-tavily-search": "^0.2.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.8"
+    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.2-alpha.2"
   }
 }

package/src/client.js

@@ -290,8 +290,12 @@ export function factory(require) {
 
     const isOff = enabled === false
 
-    return react.createElement('div', { style: { border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 10, minWidth: 0, overflow: 'hidden' } },
-      react.createElement('style', null, '.dts-icon-btn:hover{background:var(--dsw-alias-interactive-bg-hover)}.dts-icon-btn:disabled{opacity:.4;cursor:default}.dts-icon-btn-danger:hover{background:var(--dsw-alias-interactive-bg-hover-danger)}'),
+    // Card box mirrors the native plugin-config card (PluginCard.module.css,
+    // ui-settings-plugins): bg-layer-3 fill, .5px border-l4, 16px radius,
+    // hover/open border lift, and the open state's bg-layer-2 upgrade — so
+    // the card sits at the same elevation as native cards in dark mode too.
+    return react.createElement('div', { className: expanded ? 'dts-card dts-card-open' : 'dts-card', style: { minWidth: 0 } },
+      react.createElement('style', null, '.dts-card{border:.5px solid var(--dsw-alias-border-l4);border-radius:16px;background:var(--dsw-alias-bg-layer-3);transition:border-color .16s,background .16s}.dts-card:hover{border-color:var(--dsw-alias-label-dimmed)}.dts-card-open{background:var(--dsw-alias-bg-layer-2);border-color:var(--dsw-alias-label-dimmed)}.dts-icon-btn:hover{background:var(--dsw-alias-interactive-bg-hover)}.dts-icon-btn:disabled{opacity:.4;cursor:default}.dts-icon-btn-danger:hover{background:var(--dsw-alias-interactive-bg-hover-danger)}'),
       react.createElement('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 12, padding: '12px 14px', minHeight: 52, boxSizing: 'border-box' } },
         react.createElement('button', {
           type: 'button',

package/src/index.js

@@ -7,8 +7,8 @@
  * - tool half — `@moguiyu/dsh-tool-tavily-search` {@link installTavilyTool};
  * - backend half — `@moguiyu/dsh-tavily-backend` {@link installBackend}.
  *
- * This package adds the rc.7 plugin-management seam: the Host registers the
- * `tavily-search` settings namespace (the key the Plugins configuration tab
+ * This package adds the plugin-management seam: the Host installs the
+ * `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),
@@ -20,7 +20,6 @@
  * search provider and never rewrites `web.searchProvider` — `web_search`
  * keeps its native provider.
  */
-import { settingsNamespace } from '@deepseek-ai/dsh-settings'
 import z from '@deepseek-ai/schemastery'
 import { isToolEnabled, installTavilyTool } from '@moguiyu/dsh-tool-tavily-search'
 import { installBackend, readToolState, restoreToolState, writeToolState } from '@moguiyu/dsh-tavily-backend'
@@ -35,16 +34,24 @@ export const Config = z.object({
 
 /**
  * Settings namespace owned by this package. It is the join key between the
- * Host half and the browser card: the rc.7 Plugins configuration tab serves
- * this namespace and dispatches the card registered under the same key.
+ * Host half and the browser card: the Plugins configuration tab serves this
+ * namespace and dispatches the card registered under the same key. A plain
+ * lowercase-hyphenated string, valid on every supported host line: rc.7/rc.8
+ * treat the namespace as a branded string (runtime-identical), and 0.1.2
+ * validates and brands it on registration (`settingsNamespace()` was
+ * removed upstream).
  */
-export const TAVILY_NS = settingsNamespace('tavily-search')
+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.
   let lastApplied = isToolEnabled(config)
-  let settingsScope = null
+  // 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
 
   /** Persist the switch first, then restart this row so the tool (un)registers. */
   async function applySwitchLocal(enabled) {
@@ -66,39 +73,68 @@ export function apply(ctx, config) {
     }
   }
 
-  // First-class settings integration (rc.7 plugin management): register the
-  // `tavily-search` namespace so the Plugins configuration surface serves it
-  // and pairs this package's card. The row config is the composition base
-  // layer; the user document overlays it. Runs whether or not the tool is on.
-  const settings = ctx.get('settings')
-  if (settings !== undefined && settings !== null && typeof settings.register === 'function') {
+  /** Re-judge the switch from a resolved settings value (either seam's shape). */
+  function applySwitchValue(value) {
+    const nextEnabled = value !== null && typeof value === 'object' && typeof value.enabled === 'boolean'
+      ? value.enabled
+      : false
+    applySwitchLocal(nextEnabled).catch((error) => {
+      ctx.logger.warn('tavily-search: applying settings switch failed: %s', error instanceof Error ? error.message : String(error))
+    })
+  }
+
+  // First-class settings integration: install the `tavily-search` section so
+  // the Plugins configuration surface serves it and pairs this package's
+  // card. Runtime-optional on purpose: the row boots (state-file path) even
+  // on hosts that never provide a settings service. Two host seams are
+  // supported by feature detection, so ONE package version covers both host
+  // lines:
+  //
+  // - 0.1.2 (`installSection`) — the row config is the composition entry
+  //   (base layer while a provider is attached, fallback value when one
+  //   detaches); `onChange` re-judges the switch on attach, on detach, and
+  //   on every committed change.
+  // - rc.7/rc.8 (`register`) — the row config is the composition base layer
+  //   and the scope watcher re-judges the switch on every committed change
+  //   (`applies: 'restart'`, the 0.2.0 behavior).
+  ctx.inject(['settings'], (settingsCtx) => {
+    const provider = settingsCtx.settings
     try {
-      settingsScope = settings.register(TAVILY_NS, Config, {
-        base: { enabled: config.enabled },
-        applies: 'restart',
-      })
-      settingsScope.watch((next) => {
-        const nextEnabled = next !== null && typeof next === 'object' && typeof next.enabled === 'boolean'
-          ? next.enabled
-          : false
-        applySwitchLocal(nextEnabled).catch((error) => {
-          ctx.logger.warn('tavily-search: applying settings switch failed: %s', error instanceof Error ? error.message : String(error))
+      if (typeof provider.installSection === 'function') {
+        provider.installSection(ctx, TAVILY_NS, Config, config, {
+          setSource: (current) => { settingsSource = current },
+          onChange: () => { applySwitchValue(settingsSource()) },
+        })
+        settingsProvider = provider
+        return
+      }
+      if (typeof provider.register === 'function') {
+        const scope = provider.register(TAVILY_NS, Config, {
+          base: { enabled: config.enabled },
+          applies: 'restart',
         })
-      })
+        if (scope !== undefined && scope !== null && typeof scope.watch === 'function') {
+          scope.watch((next) => { applySwitchValue(next) })
+          settingsProvider = provider
+        } else {
+          ctx.logger.warn('tavily-search: settings scope exposes no watcher; using the state-file path')
+        }
+        return
+      }
+      ctx.logger.warn('tavily-search: settings service exposes neither installSection nor register; using the state-file path')
     } catch (error) {
-      ctx.logger.warn('tavily-search: settings namespace registration failed: %s', error instanceof Error ? error.message : String(error))
-      settingsScope = null
+      ctx.logger.warn('tavily-search: settings section installation failed: %s', error instanceof Error ? error.message : String(error))
     }
-  }
+  })
 
   installBackend(ctx, {
     enabled: () => isToolEnabled(config),
     async applySwitch(enabled) {
       // Every write converges on one pipeline: the settings namespace when a
-      // settings service is served (its watcher persists and restarts this
+      // settings service is attached (its watcher persists and restarts this
       // row), or the plain state-file path otherwise.
-      if (settings !== undefined && settingsScope !== null) {
-        await settings.update(TAVILY_NS, { enabled })
+      if (settingsProvider !== null) {
+        await settingsProvider.update(TAVILY_NS, { enabled })
       } else {
         await applySwitchLocal(enabled)
       }