dsh-caveman 0.1.3 → 0.1.5

package/lib/client.js

@@ -6,6 +6,110 @@ window.__ModuleLoader__.load({
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
     const React = require("react");
 
+    // ---- Settings → General row: caveman default mode --------------------
+    // Reads and writes the host's global default through /caveman/default
+    // (the settings-document namespace 'caveman'). New sessions start with
+    // this default; the badge still cycles the per-session value. Mirrors
+    // dsh-rtk's row — without this client-side slot registration the settings
+    // page shows no caveman entry at all (the host namespace alone is not
+    // enough; the panel enumerates slot items, not namespaces).
+    const CAVEMAN_MODES = [
+      "off",
+      "lite",
+      "full",
+      "ultra",
+      "wenyan-lite",
+      "wenyan-full",
+      "wenyan-ultra",
+    ];
+    function CavemanDefaultRow() {
+      const [mode, setMode] = React.useState(null);
+      React.useEffect(() => {
+        let cancelled = false;
+        fetch("/caveman/default")
+          .then((r) => (r.ok ? r.json() : null))
+          .then((data) => {
+            if (!cancelled && data && CAVEMAN_MODES.indexOf(data.defaultMode) !== -1) {
+              setMode(data.defaultMode);
+            }
+          })
+          .catch(() => {});
+        return () => {
+          cancelled = true;
+        };
+      }, []);
+      const change = (next) => {
+        fetch("/caveman/default", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ defaultMode: next }),
+        })
+          .then((r) => (r.ok ? r.json() : null))
+          .then((data) => {
+            if (data && data.ok) setMode(data.defaultMode);
+          })
+          .catch(() => {});
+      };
+      return React.createElement(
+        "div",
+        {
+          style: {
+            borderBottom: "1px solid var(--dsw-alias-border-l2)",
+            alignItems: "center",
+            gap: "8px",
+            padding: "16px 0",
+            display: "flex",
+          },
+        },
+        React.createElement(
+          "div",
+          {
+            style: {
+              flexDirection: "column",
+              flex: "1",
+              gap: "4px",
+              minWidth: "0",
+              paddingRight: "48px",
+              display: "flex",
+            },
+          },
+          React.createElement(
+            "div",
+            { style: { color: "var(--dsw-alias-label-primary)", fontSize: "14px", lineHeight: "22px" } },
+            "caveman 默认档位",
+          ),
+          React.createElement(
+            "div",
+            { style: { color: "var(--dsw-alias-label-tertiary)", fontSize: "12px", lineHeight: "18px" } },
+            "新会话默认档位（默认 full）；徽章仍按会话切换",
+          ),
+        ),
+        React.createElement(
+          "select",
+          {
+            value: mode === null ? "" : mode,
+            disabled: mode === null,
+            onChange: (e) => change(e.target.value),
+            title: mode === null ? "loading" : mode,
+            style: {
+              background: "var(--dsw-alias-bg-module-platform)",
+              height: "36px",
+              color: "var(--dsw-alias-label-primary)",
+              cursor: "pointer",
+              border: "none",
+              borderRadius: "18px",
+              padding: "0 14px",
+              fontSize: "14px",
+              lineHeight: "22px",
+            },
+          },
+          mode === null
+            ? React.createElement("option", { value: "" }, "…")
+            : CAVEMAN_MODES.map((m) => React.createElement("option", { key: m, value: m }, m)),
+        ),
+      );
+    }
+
     // Badge display is centralized in dsh-badges: this plugin only registers
     // a badge descriptor (fetch-mode: initial GET + toggle-response self-
     // update + 5s re-sync). No session projection is involved; per-session
@@ -74,6 +178,24 @@ window.__ModuleLoader__.load({
         if (register()) return;
         Promise.resolve().then(() => tryRegister(500));
       });
+
+      // Settings → General row: registered when the settings section is
+      // declared (slots.inject defers until then). The row owns its own
+      // read/write via /caveman/default — no inject face needed.
+      ctx.slots.inject("settings.general.item", () => {
+        try {
+          ctx.slots.register(
+            {
+              name: "settings.general.item",
+              id: "caveman-default",
+              order: 11,
+            },
+            CavemanDefaultRow,
+          );
+        } catch (e) {
+          console.error("[dsh-caveman] settings row registration failed:", e);
+        }
+      });
     }
 
     exports.apply = apply;

package/lib/index.js

@@ -21,7 +21,8 @@ import { appendFileSync, mkdirSync, readFileSync, renameSync, writeFileSync } fr
 import { dirname, join } from 'node:path'
 import { KNOWN_SESSION_EVENT_TYPES } from '@deepseek-ai/dsh-session'
 import { dshHomePath } from '@deepseek-ai/dsh-home-paths'
-import { settingsNamespace } from '@deepseek-ai/dsh-settings'
+// NOTE: no `settingsNamespace` import — the brand helper was removed from
+// dsh-settings@0.1.2+ (see dsh-rtk for the same fix). Namespace is a literal.
 import zs from '@deepseek-ai/schemastery'
 
 const require = createRequire(import.meta.url)
@@ -82,7 +83,7 @@ export function apply(ctx) {
   if (settings !== undefined) {
     try {
       cavemanScope = settings.register(
-        settingsNamespace('caveman'),
+        'caveman',
         zs.object({ defaultMode: zs.union(VALID.map((v) => zs.const(v))).default('full') }),
         { applies: 'live' },
       )
@@ -255,6 +256,67 @@ export function apply(ctx) {
     }
   }
 
+  // ---- Settings row read/write: GET/POST /caveman/default -----------------
+  // The Settings → General row ('caveman-default') reads and writes the global
+  // default mode through this route; all state lives in the settings document
+  // via the registered 'caveman' namespace (same shape as dsh-rtk's
+  // /rtk/default, which is the only reason rtk showed a row and caveman did
+  // not — the row is a CLIENT registration, not an automatic consequence of
+  // the namespace).
+  if (webServer !== undefined) {
+    try {
+      webServer.register({
+      kind: 'exact',
+      path: '/caveman/default',
+      handler: async (req, res) => {
+        const send = (status, body) => {
+          res.writeHead(status, { 'content-type': 'application/json' })
+          res.end(JSON.stringify(body))
+        }
+        if (req.method === 'GET') {
+          send(200, { defaultMode })
+          return
+        }
+        if (req.method !== 'POST') {
+          send(405, { ok: false, error: 'method not allowed' })
+          return
+        }
+        if (cavemanScope === null) {
+          send(503, { ok: false, error: 'settings unavailable' })
+          return
+        }
+        let raw = ''
+        try {
+          for await (const chunk of req) raw += chunk
+        } catch (e) {
+          send(400, { ok: false, error: 'bad body' })
+          return
+        }
+        let next
+        try {
+          next = JSON.parse(raw || '{}').defaultMode
+        } catch (e) {
+          next = undefined
+        }
+        if (typeof next !== 'string' || !VALID.includes(next)) {
+          send(400, { ok: false, error: 'defaultMode must be one of: ' + VALID.join(', ') })
+          return
+        }
+        try {
+          await cavemanScope.update({ defaultMode: next })
+          const stored = cavemanScope.get()
+          defaultMode = stored && VALID.includes(stored.defaultMode) ? stored.defaultMode : 'full'
+          send(200, { ok: true, defaultMode })
+        } catch (e) {
+          send(500, { ok: false, error: 'persist failed' })
+        }
+      },
+      })
+    } catch (e) {
+      console.error('[caveman] /caveman/default route registration failed:', e && e.message)
+    }
+  }
+
   const systemPrompt = ctx.get('systemPrompt')
   if (systemPrompt !== undefined) {
     systemPrompt.section({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-caveman",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -8,7 +8,7 @@
     "./client": "./lib/client.js",
     "./package.json": "./package.json"
   },
-  "description": "Per-session caveman mode state + composer dock badge + /caveman command + prompt-section injection. Writes NO session events: mode state lives in a $DSH_HOME/plugin-state sidecar keyed by session id (default from the 'caveman' settings namespace), and the badge reads GET /caveman/state (fetch mode). The KNOWN event-type registration is kept read-only for legacy sessions. Caveman skills ship from the deployment shared skill library (see ~/.dsh/skills), not from this package.",
+  "description": "Per-session caveman mode state + composer dock badge + /caveman command + prompt-section injection. Writes NO session events: mode state lives in a $DSH_HOME/plugin-state sidecar keyed by session id (default from the 'caveman' settings namespace), and the badge reads GET /caveman/state (fetch mode). The KNOWN event-type registration is kept read-only for legacy sessions. Caveman skills ship from the deployment shared skill library (see ~/.dsh/skills), not from this package. Compatible with @deepseek-ai/dsh-settings 0.1.2+: the namespace is passed as a literal string because the settingsNamespace brand helper was removed upstream (broken named import on 0.1.2-rc.1 boot). 0.1.5 adds the Settings -> General row (client slot settings.general.item + host route GET/POST /caveman/default) so the default mode is editable in the UI; a registered host namespace alone does NOT produce a settings row.",
   "license": "MIT",
   "keywords": [
     "dsh",