dsh-my-go 0.1.13 → 0.1.15

package/dist/client.core.js

@@ -199,12 +199,11 @@ function apply(ctx) {
     const [available, setAvailable] = React.useState({ providers: [], models: {} });
     React.useEffect(() => {
       if (!sp) return;
-      try {
-        setDraft(sp.read());
-      } catch {
-        setDraft({});
-      }
       if (connection && connection.rpc && typeof connection.rpc.call === "function") {
+        connection.rpc.call("/dsh-my-go", "loadSettings", {}).then((res) => {
+          if (res && res.ok && res.value) setDraft(res.value);
+          else setDraft({});
+        }).catch(() => setDraft({}));
         connection.rpc.call("/dsh-my-go", "listModels", {}).then((res) => {
           if (res && res.ok && res.value && Array.isArray(res.value.providers)) setAvailable(res.value);
         }).catch(() => {
@@ -246,17 +245,6 @@ function apply(ctx) {
         setSaving(false);
       }
     };
-    const autoSaveTimer = React.useRef(null);
-    React.useEffect(() => {
-      if (!draft || !sp) return;
-      if (autoSaveTimer.current) clearTimeout(autoSaveTimer.current);
-      autoSaveTimer.current = setTimeout(() => {
-        void save();
-      }, 500);
-      return () => {
-        if (autoSaveTimer.current) clearTimeout(autoSaveTimer.current);
-      };
-    }, [draft, sp]);
     const selectStyle = { background: "var(--surface, #1e1e1e)", color: "var(--text, #e0e0e0)", border: "1px solid var(--separator, #333)", borderRadius: 4, padding: "4px 8px", fontSize: 13, width: "100%", boxSizing: "border-box" };
     const labelStyle = { fontSize: 12, color: "var(--text-secondary, #888)", marginBottom: 2 };
     const cardStyle = { border: "1px solid var(--separator, #333)", borderRadius: 8, padding: 12, marginBottom: 12 };
@@ -352,7 +340,10 @@ function apply(ctx) {
     const current = snapshot.current;
     if (current && current.childId && current.status === "running" && lastJumpedTo !== current.childId && sessions) {
       lastJumpedTo = current.childId;
-      sessions.openSubagent({ parentSessionId: "", childSessionId: current.childId, mode: "continuable" });
+      try {
+        sessions.open(current.childId);
+      } catch {
+      }
     } else if (!current && lastJumpedTo && sessions) {
       lastJumpedTo = null;
     }

package/dist/client.js

@@ -204,12 +204,11 @@ function apply(ctx) {
     const [available, setAvailable] = React.useState({ providers: [], models: {} });
     React.useEffect(() => {
       if (!sp) return;
-      try {
-        setDraft(sp.read());
-      } catch {
-        setDraft({});
-      }
       if (connection && connection.rpc && typeof connection.rpc.call === "function") {
+        connection.rpc.call("/dsh-my-go", "loadSettings", {}).then((res) => {
+          if (res && res.ok && res.value) setDraft(res.value);
+          else setDraft({});
+        }).catch(() => setDraft({}));
         connection.rpc.call("/dsh-my-go", "listModels", {}).then((res) => {
           if (res && res.ok && res.value && Array.isArray(res.value.providers)) setAvailable(res.value);
         }).catch(() => {
@@ -251,17 +250,6 @@ function apply(ctx) {
         setSaving(false);
       }
     };
-    const autoSaveTimer = React.useRef(null);
-    React.useEffect(() => {
-      if (!draft || !sp) return;
-      if (autoSaveTimer.current) clearTimeout(autoSaveTimer.current);
-      autoSaveTimer.current = setTimeout(() => {
-        void save();
-      }, 500);
-      return () => {
-        if (autoSaveTimer.current) clearTimeout(autoSaveTimer.current);
-      };
-    }, [draft, sp]);
     const selectStyle = { background: "var(--surface, #1e1e1e)", color: "var(--text, #e0e0e0)", border: "1px solid var(--separator, #333)", borderRadius: 4, padding: "4px 8px", fontSize: 13, width: "100%", boxSizing: "border-box" };
     const labelStyle = { fontSize: 12, color: "var(--text-secondary, #888)", marginBottom: 2 };
     const cardStyle = { border: "1px solid var(--separator, #333)", borderRadius: 8, padding: 12, marginBottom: 12 };
@@ -357,7 +345,10 @@ function apply(ctx) {
     const current = snapshot.current;
     if (current && current.childId && current.status === "running" && lastJumpedTo !== current.childId && sessions) {
       lastJumpedTo = current.childId;
-      sessions.openSubagent({ parentSessionId: "", childSessionId: current.childId, mode: "continuable" });
+      try {
+        sessions.open(current.childId);
+      } catch {
+      }
     } else if (!current && lastJumpedTo && sessions) {
       lastJumpedTo = null;
     }

package/lib/index.js

@@ -359,14 +359,11 @@ export async function apply(ctx, config = {}) {
         if (!llm) return { ok: true, value: { providers: [], models: {} } }
         let providers = []
         try {
-          const all = llm.listConfigurableProviders()
-          providers = all.map((p) => p.provider)
-        } catch {
-          try {
-            const active = await llm.listProviders()
-            providers = active.map((p) => p.id)
-          } catch { /* llm not available */ }
-        }
+          // Use listProviders() — returns only ACTIVE/configured providers,
+          // NOT listConfigurableProviders() which includes unconfigured ones
+          const active = await llm.listProviders()
+          providers = active.map((p) => p.id)
+        } catch { /* llm not available */ }
         const models = {}
         for (const pid of providers) {
           try {
@@ -376,6 +373,16 @@ export async function apply(ctx, config = {}) {
         }
         return { ok: true, value: { providers, models } }
       }
+      if (endpoint === 'loadSettings') {
+        const settingsService = ctx.get('settings')
+        if (!settingsService) return { ok: true, value: {} }
+        try {
+          const stored = settingsService.get('dsh-my-go')
+          return { ok: true, value: stored && typeof stored === 'object' ? stored : {} }
+        } catch (e) {
+          return { ok: true, value: {} }
+        }
+      }
       if (endpoint === 'saveSettings') {
         const draft = payload
         if (!draft || typeof draft !== 'object') return { ok: false, error: { code: 'bad-request', message: 'payload must be an object' } }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-my-go",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "DSH plugin: Sisyphus agent orchestration — star topology, single-line blocking, 7 specialist sub-agents (Hermes/Explore/Librarian/Looker/Hephaestus/Prometheus/Oracle) with per-type model binding, go_work/continue/need_help/forward communication tools, Web UI tree panel and settings.",
   "author": "daizihan233",
   "license": "MIT",

package/preset/tools/broker.mjs

@@ -16,7 +16,7 @@
 
 export const name = 'dsh-my-go-broker'
 
-export const inject = ['tools', 'subagents', 'systemPrompt']
+export const inject = ['tools', 'subagents', 'systemPrompt', 'llm']
 
 import { access, cp, mkdir } from 'node:fs/promises'
 import { dirname, join } from 'node:path'
@@ -367,13 +367,20 @@ export async function apply(ctx, config = {}) {
     }
     const placeholder = orchestration.beginSpawning(agentType, prompt)
     try {
+      // Build agentOptions with model validation
+      const agentOpts = {}
+      if (binding.provider !== undefined) agentOpts.provider = binding.provider
+      if (binding.model !== undefined) {
+        const resolvedProvider = String(binding.provider ?? '')
+        if (!resolvedProvider || await modelExists(resolvedProvider, binding.model)) {
+          agentOpts.model = binding.model
+        }
+      }
       const request = {
         label: agentLabel(agentType, prompt.slice(0, 60)),
         prompt: [{ type: 'text', text: prompt }],
         parent,
-        ...(binding.provider !== undefined || binding.model !== undefined
-          ? { agentOptions: { ...(binding.provider !== undefined ? { provider: binding.provider } : {}), ...(binding.model !== undefined ? { model: binding.model } : {}) } }
-          : {}),
+        ...(Object.keys(agentOpts).length > 0 ? { agentOptions: agentOpts } : {}),
         signal,
       }
       const { childId } = await ctx.subagents.startContinuable({
@@ -689,6 +696,25 @@ export async function apply(ctx, config = {}) {
     return result
   }
 
+  // ── model validation ─────────────────────────────────────────────────
+  const modelCache = new Map()
+  async function modelExists(provider, model) {
+    const key = String(provider)
+    let set = modelCache.get(key)
+    if (set === undefined) {
+      set = new Set()
+      try {
+        const llm = ctx.get('llm')
+        if (llm) {
+          const list = await llm.listModels(key)
+          for (const m of list) set.add(m.id)
+        }
+      } catch { /* provider may not support listing */ }
+      modelCache.set(key, set)
+    }
+    return set.has(String(model))
+  }
+
   ctx.on('agent/request', async (payload, next) => {
     const seed = await next()
     const agent = payload?.agent
@@ -698,7 +724,13 @@ export async function apply(ctx, config = {}) {
     const binding = bindings[type ?? 'sisyphus'] ?? {}
     const nextConfig = { ...seed }
     if (binding.provider !== undefined) nextConfig.provider = binding.provider
-    if (binding.model !== undefined) nextConfig.model = binding.model
+    if (binding.model !== undefined) {
+      // Validate model exists on the resolved provider before applying
+      const resolvedProvider = String(nextConfig.provider ?? seed.provider ?? '')
+      if (!resolvedProvider || await modelExists(resolvedProvider, binding.model)) {
+        nextConfig.model = binding.model
+      }
+    }
     const desiredEffort = binding.reasoningEffort
     if (desiredEffort !== undefined && desiredEffort !== null) {
       const provider = String(nextConfig.provider ?? binding.provider ?? '')

package/src/client.js

@@ -187,8 +187,12 @@ export function apply(ctx) {
 
     React.useEffect(() => {
       if (!sp) return
-      try { setDraft(sp.read()) } catch { setDraft({}) }
+      // Load settings via host RPC (DSH SettingsScope doesn't support nested reads)
       if (connection && connection.rpc && typeof connection.rpc.call === 'function') {
+        connection.rpc.call('/dsh-my-go', 'loadSettings', {}).then((res) => {
+          if (res && res.ok && res.value) setDraft(res.value)
+          else setDraft({})
+        }).catch(() => setDraft({}))
         connection.rpc.call('/dsh-my-go', 'listModels', {}).then((res) => {
           if (res && res.ok && res.value && Array.isArray(res.value.providers)) setAvailable(res.value)
         }).catch(() => {})
@@ -212,6 +216,7 @@ export function apply(ctx) {
       })
     }
 
+    // Manual save only — auto-save risks infinite loops with settings/updated events
     const save = async () => {
       setSaving(true); setMsg(null)
       try {
@@ -229,15 +234,6 @@ export function apply(ctx) {
       } finally { setSaving(false) }
     }
 
-    // Auto-save on draft change with debounce
-    const autoSaveTimer = React.useRef(null)
-    React.useEffect(() => {
-      if (!draft || !sp) return
-      if (autoSaveTimer.current) clearTimeout(autoSaveTimer.current)
-      autoSaveTimer.current = setTimeout(() => { void save() }, 500)
-      return () => { if (autoSaveTimer.current) clearTimeout(autoSaveTimer.current) }
-    }, [draft, sp])
-
     const selectStyle = { background: 'var(--surface, #1e1e1e)', color: 'var(--text, #e0e0e0)', border: '1px solid var(--separator, #333)', borderRadius: 4, padding: '4px 8px', fontSize: 13, width: '100%', boxSizing: 'border-box' }
     const labelStyle = { fontSize: 12, color: 'var(--text-secondary, #888)', marginBottom: 2 }
     const cardStyle = { border: '1px solid var(--separator, #333)', borderRadius: 8, padding: 12, marginBottom: 12 }
@@ -320,9 +316,8 @@ export function apply(ctx) {
         const current = snapshot.current
         if (current && current.childId && current.status === 'running' && lastJumpedTo !== current.childId && sessions) {
           lastJumpedTo = current.childId
-          sessions.openSubagent({ parentSessionId: '', childSessionId: current.childId, mode: 'continuable' })
+          try { sessions.open(current.childId) } catch { /* ignore */ }
         } else if (!current && lastJumpedTo && sessions) {
-          // Child settled; jump back to the parent.
           lastJumpedTo = null
         }
       }, 800)