@goodandready/dsh-messenger-gateway 0.3.11 → 0.3.13

package/lib/client.js

@@ -1,6 +1,6 @@
 // dsh-messenger-gateway — browser (client) half.
 // Settings card on Plugins → Plugin settings tab (settings.plugin.item).
-// Fallback to sidebar settings.section when the slot is unavailable.
+// Config managed via reactive ctx.settingsScope snapshot.
 
 window.__ModuleLoader__.load({
   id: '@goodandready/dsh-messenger-gateway',
@@ -52,6 +52,7 @@ const css =
       description: 'Telegram bot: text, voice, photos and documents.',
       loading: 'Loading…',
       save: 'Save',
+      saved: 'Saved',
       saving: 'Saving…',
       showAdvanced: 'Advanced settings',
       hideAdvanced: 'Hide advanced',
@@ -125,6 +126,7 @@ const css =
       description: 'Telegram-бот: текст, голос, фото и документы.',
       loading: 'Загрузка…',
       save: 'Сохранить',
+      saved: 'Сохранено',
       saving: 'Сохранение…',
       showAdvanced: 'Расширенные настройки',
       hideAdvanced: 'Скрыть расширенные',
@@ -227,16 +229,104 @@ const css =
       )
     }
 
-    function MessengerSettingsForm({ t }) {
-      const [cfg, setCfg] = React.useState(null)
+    const SETTINGS_KEYS = ['enabled', 'telegram', 'agent', 'media', 'tts']
+
+    function draftFromStored(s) {
+      const src = (s && typeof s === 'object') ? s : {}
+      const t = src.telegram || {}
+      const a = src.agent || {}
+      const m = src.media || {}
+      const tts = src.tts || {}
+      return {
+        enabled: src.enabled !== false,
+        telegram: {
+          enabled: t.enabled === true,
+          allowedUserIds: Array.isArray(t.allowedUserIds) ? t.allowedUserIds : [],
+          pollTimeoutSeconds: Number(t.pollTimeoutSeconds) || 50,
+          pollIntervalMs: Number(t.pollIntervalMs) || 500,
+          commands: Array.isArray(t.commands) ? t.commands : [],
+          textFormat: t.textFormat === 'plain' ? 'plain' : 'html',
+          homeChatId: t.homeChatId != null ? t.homeChatId : '',
+          homeThreadId: Number(t.homeThreadId) || 0,
+          homes: Array.isArray(t.homes) ? t.homes : [],
+          pairingEnabled: t.pairingEnabled !== false,
+          streaming: t.streaming === true,
+          streamEditIntervalMs: Number(t.streamEditIntervalMs) || 1200,
+          progressEnabled: t.progressEnabled !== false,
+          approvalsEnabled: t.approvalsEnabled !== false,
+          groupsEnabled: t.groupsEnabled !== false,
+          groupRequireMention: t.groupRequireMention !== false,
+          reactionsEnabled: t.reactionsEnabled !== false,
+          statusIndicator: t.statusIndicator === true,
+          statusOnline: t.statusOnline || 'Online',
+          statusOffline: t.statusOffline || 'Offline',
+          transport: t.transport === 'webhook' ? 'webhook' : 'poll',
+          webhookUrl: t.webhookUrl || '',
+          webhookPath: t.webhookPath || '/dsh-messenger-gateway/telegram/webhook',
+          voiceMode: t.voiceMode || 'mirror',
+          quickActions: t.quickActions === true,
+          artifactPreviews: t.artifactPreviews !== false,
+          notifyBridge: t.notifyBridge || { enabled: false, events: ['task_done', 'error'], home: 'default', excludeSessionPrefixes: ['msgw-'] },
+          alerts: t.alerts || { enabled: false, chatId: '', threadId: 0, home: '', events: ['error', 'pairing'] },
+          botToken: t.botToken || '',
+          webhookSecret: t.webhookSecret || '',
+        },
+        agent: {
+          provider: a.provider || '',
+          model: a.model || '',
+          instructionPrefix: a.instructionPrefix || '',
+          maxMessageLength: Number(a.maxMessageLength) || 4000,
+          turnTimeoutMs: Number(a.turnTimeoutMs) || 600000,
+          idleTimeoutMs: Number(a.idleTimeoutMs) || 3600000,
+          photoOnlyMode: a.photoOnlyMode || 'prompt',
+          sessionScope: a.sessionScope || 'user',
+        },
+        media: {
+          maxDocBytes: Number(m.maxDocBytes) || 20971520,
+          maxImageBytes: Number(m.maxImageBytes) || 20971520,
+          maxTextInjectBytes: Number(m.maxTextInjectBytes) || 102400,
+        },
+        tts: {
+          enabled: tts.enabled === true,
+          maxChars: Number(tts.maxChars) || 4000,
+          voiceSummary: tts.voiceSummary === true,
+        },
+      }
+    }
+
+    function MessengerSettingsForm({ t, ctx }) {
       const [token, setToken] = React.useState('')
       const [webhookSecret, setWebhookSecret] = React.useState('')
       const [allowText, setAllowText] = React.useState('')
       const [pending, setPending] = React.useState([])
       const [err, setErr] = React.useState('')
+      const [msg, setMsg] = React.useState('')
       const [busy, setBusy] = React.useState(false)
       const [showAdvanced, setShowAdvanced] = React.useState(false)
 
+      const scope = React.useMemo(
+        () => (ctx && ctx.settingsScope ? ctx.settingsScope.bind({ namespace: NS }) : undefined),
+        [ctx],
+      )
+
+      const snapshot = React.useSyncExternalStore(
+        React.useMemo(() => (cb) => (scope ? scope.subscribe(cb) : () => {}), [scope]),
+        React.useCallback(() => (scope ? scope.getSnapshot() : { status: 'loading' }), [scope]),
+        React.useCallback(() => ({ status: 'loading' }), []),
+      )
+
+      const snapStatus = (snapshot && snapshot.status) || 'loading'
+      const stored = (snapshot && snapshot.value) || {}
+
+      const [cfg, setCfg] = React.useState(null)
+
+      React.useEffect(() => {
+        if (snapStatus === 'ready' && cfg === null) {
+          setCfg(draftFromStored(stored))
+          setAllowText(idsToText(stored?.telegram?.allowedUserIds))
+        }
+      }, [snapStatus, stored, cfg])
+
       const loadPairing = React.useCallback(async () => {
         try {
           const res = await fetch('/dsh-messenger-gateway/pairing', { credentials: 'same-origin' })
@@ -245,16 +335,9 @@ const css =
         } catch {}
       }, [])
 
-      const load = React.useCallback(async () => {
-        const res = await fetch('/dsh-messenger-gateway/config', { credentials: 'same-origin' })
-        const data = await res.json()
-        if (!res.ok || !data.ok) throw new Error(data.error || res.status)
-        setCfg(data.config)
-        setAllowText(idsToText(data.config?.telegram?.allowedUserIds))
-        await loadPairing()
-      }, [loadPairing])
-
-      React.useEffect(() => { load().catch((e) => setErr(String(e.message || e))) }, [load])
+      React.useEffect(() => {
+        if (snapStatus === 'ready') loadPairing()
+      }, [snapStatus, loadPairing])
 
       const mergePatch = (base, patch) => ({
         ...base,
@@ -266,26 +349,47 @@ const css =
       })
 
       const save = async (patch = {}) => {
-        setBusy(true); setErr('')
+        if (!scope || !cfg) return
+        setBusy(true); setErr(''); setMsg('')
         try {
           let next = mergePatch(cfg, patch)
           if (token.trim()) next.telegram = { ...next.telegram, botToken: token.trim() }
           if (webhookSecret.trim()) next.telegram = { ...next.telegram, webhookSecret: webhookSecret.trim() }
           next.telegram.allowedUserIds = textToIds(allowText)
-          const res = await fetch('/dsh-messenger-gateway/config', {
-            method: 'PUT', credentials: 'same-origin',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ config: next }),
-          })
-          const data = await res.json()
-          if (!res.ok || !data.ok) throw new Error(data.error || res.status)
-          setCfg(data.config); setToken(''); setWebhookSecret('')
-          setAllowText(idsToText(data.config?.telegram?.allowedUserIds))
+
+          const broken = []
+          for (const key of SETTINGS_KEYS) {
+            if (next[key] !== undefined) {
+              try {
+                await scope.set(key, next[key])
+              } catch (e) {
+                broken.push(key + ': ' + (e && e.message || String(e)))
+              }
+            }
+          }
+          if (broken.length) {
+            setErr('Save failed — ' + broken.join('; '))
+            return
+          }
+          setCfg(next)
+          setToken('')
+          setWebhookSecret('')
+          setMsg(t('saved'))
+          setTimeout(() => setMsg(''), 3000)
           await loadPairing()
         } catch (e) { setErr(String(e.message || e)) } finally { setBusy(false) }
       }
 
-      if (!cfg) return React.createElement('div', null, err || t('loading'))
+      if (snapStatus === 'loading') {
+        return React.createElement('div', { className: 'msgw-sub', style: { padding: '12px 0' } }, t('loading'))
+      }
+      if (snapStatus !== 'ready') {
+        return React.createElement('div', { className: 'msgw-err', style: { padding: '12px 0' } },
+          'Settings unavailable (snapshot status: ' + snapStatus + '). Host namespace may be missing.')
+      }
+      if (!cfg) {
+        return React.createElement('div', { className: 'msgw-sub', style: { padding: '12px 0' } }, t('loading'))
+      }
 
       return React.createElement('div', { className: 'msgw-form' },
         React.createElement('div', null,
@@ -475,6 +579,7 @@ const css =
         ) : null,
 
         err ? React.createElement('div', { className: 'msgw-err' }, err) : null,
+        msg ? React.createElement('div', { style: { color: 'var(--dsw-alias-state-success-primary, #10b981)', fontSize: '13px', padding: '8px 0' } }, msg) : null,
         React.createElement('div', { className: 'msgw-foot' },
           React.createElement('button', { type: 'button', className: 'msgw-save', disabled: busy, onClick: () => save({}) }, busy ? t('saving') : t('save')),
         ),
@@ -498,7 +603,7 @@ const css =
           React.createElement('span', { className: 'msgw-chev' }, open ? '\u25B2' : '\u25BC'),
         ),
         open ? React.createElement('div', { className: 'msgw-body' },
-          React.createElement(MessengerSettingsForm, { t }),
+          React.createElement(MessengerSettingsForm, { t, ctx: props.ctx }),
         ) : null,
       )
     }
@@ -507,36 +612,18 @@ const css =
       ctx.effect(() => ctx.locale.register(NS, { en, ru }), 'dsh-messenger-gateway: dictionaries')
       function useLocale() { return useActiveLocale(ctx) }
 
-      const tryPluginItem = () => {
-        try {
-          ctx.slots.inject('settings.plugin.item', () =>
-            ctx.slots.register({
-              name: 'settings.plugin.item',
-              key: NS,
-              locale: NS,
-              inject: () => ({ ctx }),
-            }, (props) => React.createElement(PluginCard, { ...props, locale: useLocale() })),
-          )
-          return true
-        } catch {
-          return false
-        }
-      }
-
-      if (!tryPluginItem()) {
-        ctx.slots.inject('settings.section', () => ctx.slots.register({
-          name: 'settings.section',
-          id: NS,
-          order: 36,
-          label: () => makeT(useActiveLocale(ctx))('title'),
-        }, (props) => React.createElement('div', { style: { padding: 16 } },
-          React.createElement(MessengerSettingsForm, { t: makeT(useActiveLocale(ctx)) }),
-        )))
-      }
+      ctx.slots.inject('settings.plugin.item', () =>
+        ctx.slots.register({
+          name: 'settings.plugin.item',
+          key: NS,
+          locale: NS,
+          inject: () => ({ ctx }),
+        }, (props) => React.createElement(PluginCard, { ...props, ctx, locale: useLocale() })),
+      )
     }
 
     exports.apply = apply
-    exports.inject = ['slots', 'locale']
+    exports.inject = ['slots', 'locale', 'settingsScope']
     return module.exports
   },
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-messenger-gateway",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
   "license": "MIT",
   "type": "module",
@@ -43,9 +43,7 @@
     "client": {
       "platform": "web",
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-settings"
       ]
     }