@ddtcorex/dsh-maestro-config 0.1.1 → 0.2.0

package/src/client/index.tsx

@@ -1,5 +1,5 @@
-// Verbatim legacy-card port (fields/styles preserved; see maestro-card.tsx).
-import { MaestroSettingsTab } from './maestro-card.jsx'
+// DSH-native redesign — reuses DSH tokens & primitive geometry maximally (see MaestroSettings.tsx).
+import { MaestroSettingsTab } from './MaestroSettings.js'
 import { MAESTRO_RPC_CHANNEL } from './api.js'
 import { registerSettingsNavIcon, SETTINGS_NAV_MARKER } from './settings-nav-icon.js'
 
@@ -7,12 +7,13 @@ import { registerSettingsNavIcon, SETTINGS_NAV_MARKER } from './settings-nav-ico
  * DSH 0.1.x gives external settings sections a generic gear and exposes no
  * icon field in the settings.section contract (mirrors dsh-better-sidebar):
  * the marker only claims this plugin's localized row and this CSS paints the
- * Lucide "audio-lines" glyph as a currentColor mask so it follows native nav
- * hover/active colors at the shell's 16px icon rhythm.
+ * Maestro M-logo glyph as a currentColor mask so it follows native nav
+ * hover/active colors at the shell's 16px icon rhythm. The path matches the
+ * sidebar MaestroTrigger (trigger.tsx#MaestroLogo) — M2 11 L5 4 L8 9 L11 4 L14 11.
  */
 const SETTINGS_NAV_CSS = `
 
-/* maestro: replace the settings-nav fallback gear with the maestro glyph */
+/* maestro: replace the settings-nav fallback gear with the Maestro M-logo glyph */
 [${SETTINGS_NAV_MARKER}] > svg:first-child {
   display: none;
 }
@@ -23,8 +24,8 @@ const SETTINGS_NAV_CSS = `
   width: 16px;
   height: 16px;
   background: currentColor;
-  -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2 10v3'/%3E%3Cpath d='M6 4v16'/%3E%3Cpath d='M10 8v8'/%3E%3Cpath d='M14 4v16'/%3E%3Cpath d='M18 6v12'/%3E%3Cpath d='M22 10v3'/%3E%3C/svg%3E") center / contain no-repeat;
-  mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2 10v3'/%3E%3Cpath d='M6 4v16'/%3E%3Cpath d='M10 8v8'/%3E%3Cpath d='M14 4v16'/%3E%3Cpath d='M18 6v12'/%3E%3Cpath d='M22 10v3'/%3E%3C/svg%3E") center / contain no-repeat;
+  -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2 11 L5 4 L8 9 L11 4 L14 11'/%3E%3C/svg%3E") center / contain no-repeat;
+  mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2 11 L5 4 L8 9 L11 4 L14 11'/%3E%3C/svg%3E") center / contain no-repeat;
 }
 `
 
@@ -42,6 +43,8 @@ interface ClientCtx {
   effect(fn: () => () => void, label?: string): unknown
 }
 
+export const inject = ['slots', 'connection'] as const
+
 function installNavIconStyle(): () => void {
   const tag = document.createElement('style')
   tag.dataset.plugin = '@ddtcorex/dsh-maestro-config'

package/src/client/maestro-card.jsx

@@ -86,6 +86,32 @@ const codeStyle = {
   wordBreak: 'break-all',
 }
 
+const textareaStyle = {
+  ...inputStyle,
+  height: 120,
+  padding: '8px 12px',
+  resize: 'vertical',
+}
+
+const tabBarStyle = {
+  display: 'flex',
+  gap: 8,
+  borderBottom: '1px solid var(--dsw-alias-border-l2)',
+  marginBottom: 16,
+}
+
+const tabButtonStyle = (active) => ({
+  padding: '8px 14px',
+  border: 'none',
+  borderBottom: active ? '2px solid var(--dsw-alias-button-primary-fill)' : '2px solid transparent',
+  background: 'transparent',
+  color: active ? 'var(--dsw-alias-label-primary)' : 'var(--dsw-alias-label-secondary)',
+  font: 'inherit',
+  fontSize: 13,
+  fontWeight: active ? 600 : 400,
+  cursor: 'pointer',
+})
+
 /** QR code centered in a light tile with an even scanner-friendly quiet zone. */
 function QrImage({ url, size = 104 }) {
   const [dataUrl, setDataUrl] = useState(null)
@@ -373,26 +399,6 @@ function ToggleField({ label, caption, checked, onChange }) {
   )
 }
 
-/** Newest-first list of recorded review runs from the host's reviews.json. */
-function ReviewHistoryPanel({ rpcCall }) {
-  const [entries, setEntries] = useState(null)
-  useEffect(() => {
-    rpcCall(MAESTRO_ENDPOINTS.reviewsList, {})
-      .then(res => { if (res?.ok) setEntries(res.value ?? []) })
-      .catch(() => setEntries([]))
-  }, [])
-  if (entries === null) return h('p', { style: captionStyle }, 'Loading review history…')
-  if (entries.length === 0) return h('p', { style: captionStyle }, 'No reviews recorded yet.')
-  const icon = entry => entry.status === 'completed' ? '✅' : entry.status === 'failed' ? '⚠️' : '👀'
-  return h('ul', { style: { listStyle: 'none', margin: 0, padding: 0 } },
-    entries.map(entry => h('li', { key: entry.id, style: { padding: '6px 0', borderBottom: '1px solid var(--dsw-alias-separator-default, #333)', fontSize: 13 } },
-      h('span', null, `${icon(entry)} ${entry.projectPath} !${entry.mrIid} · ${entry.mode}${entry.trigger !== 'mention' ? ` · ${entry.trigger}` : ''}`),
-      h('div', { style: captionStyle },
-        `${new Date(entry.startedAt).toLocaleString()}${entry.summary ? ` — ${entry.summary}` : ''}${entry.error ? ` — ${entry.error}` : ''}`),
-    )),
-  )
-}
-
 /** One selectable LAN address chip + the QR of the currently selected URL. */
 function LanAccess({ proxyStatus, lanPin }) {
   const urls = proxyStatus?.lanUrls ?? []
@@ -492,6 +498,13 @@ export function MaestroSettingsTab({ rpcCall, configRpcCall }) {
   const [lanPinEnabled, setLanPinEnabled] = useState(false)
   const [lanPin, setLanPin] = useState(null)
   const [showLanPin, setShowLanPin] = useState(false)
+  // Task 3: Guard/Blacklist/Supervisor/Notifier tabs state
+  const [activeTab, setActiveTab] = useState('guard')
+  const [guard, setGuard] = useState({})
+  const [patternsText, setPatternsText] = useState('')
+  const [placeholdersText, setPlaceholdersText] = useState('')
+  const [supervisorCfg, setSupervisorCfg] = useState({})
+  const [notifierCfg, setNotifierCfg] = useState({})
 
   const call = async (endpoint, payload) => {
     const res = await rpcCall(endpoint, payload)
@@ -499,6 +512,60 @@ export function MaestroSettingsTab({ rpcCall, configRpcCall }) {
     return res.value
   }
 
+  // Helpers for guard/supervisor/notifier domains via generic config RPC (Task 3)
+  const unwrap = (res) => {
+    if (res && typeof res === 'object' && 'ok' in res) {
+      if (res.ok) return res.value
+      throw new Error(res.error?.message ?? 'RPC failed')
+    }
+    return res
+  }
+  const cfgGet = async (domain) => {
+    if (!configRpcCall) throw new Error('config RPC not available')
+    const res = await configRpcCall('get', { domain })
+    return unwrap(res)
+  }
+  const cfgSet = async (domain, patch) => {
+    if (!configRpcCall) throw new Error('config RPC not available')
+    const res = await configRpcCall('set', { domain, patch })
+    return unwrap(res)
+  }
+  const saveGuard = async (patch) => {
+    setError(null)
+    const next = { ...guard, ...patch }
+    if (patch.gitProtection && guard.gitProtection) next.gitProtection = { ...guard.gitProtection, ...patch.gitProtection }
+    setGuard(next)
+    try { await cfgSet('guard', patch) } catch (e) { setError(e.message ?? String(e)) }
+  }
+  const commitBlacklistPatterns = async (text) => {
+    const patterns = text.split('\n').map(s => s.trim()).filter(Boolean)
+    setError(null)
+    try { await cfgSet('guardBlacklist', { patterns }) } catch (e) { setError(e.message ?? String(e)) }
+  }
+  const commitPlaceholders = async () => {
+    setError(null)
+    let obj = {}
+    try { obj = placeholdersText.trim() ? JSON.parse(placeholdersText) : {}; if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) throw new Error('placeholders must be JSON object') } catch (e) { setError(`placeholders JSON invalid: ${e.message ?? String(e)}`); return }
+    try { await cfgSet('guardBlacklist', { placeholders: obj }) } catch (e) { setError(e.message ?? String(e)) }
+  }
+  const saveSupervisorCfg = async (patch) => {
+    setError(null)
+    setSupervisorCfg(prev => ({ ...prev, ...patch }))
+    try { await cfgSet('supervisor', patch) } catch (e) { setError(e.message ?? String(e)) }
+  }
+  const saveNotifierCfg = async (patch) => {
+    setError(null)
+    setNotifierCfg(prev => {
+      const next = { ...prev }
+      for (const [k, v] of Object.entries(patch)) {
+        if (k === 'telegram' && typeof v === 'object' && v !== null) next.telegram = { ...(prev.telegram ?? {}), ...v }
+        else next[k] = v
+      }
+      return next
+    })
+    try { await cfgSet('notifier', patch) } catch (e) { setError(e.message ?? String(e)) }
+  }
+
   const refresh = async () => {
     try { setStatus(await call(MAESTRO_ENDPOINTS.status, {})) } catch { /* transient failure, ignore */ }
     try { setProxyStatus(await call(MAESTRO_ENDPOINTS.proxyStatus, {})) } catch { /* proxy row may be starting */ }
@@ -520,6 +587,21 @@ export function MaestroSettingsTab({ rpcCall, configRpcCall }) {
           }
         })
         .catch(() => { /* supervisor domain not yet set or config service unavailable */ })
+      // Task 3: load Guard/Blacklist/Supervisor/Notifier domains
+      Promise.all([
+        cfgGet('guard').catch(() => ({})),
+        cfgGet('guardBlacklist').catch(() => ({ patterns: [], placeholders: {} })),
+        cfgGet('supervisor').catch(() => ({})),
+        cfgGet('notifier').catch(() => ({})),
+      ]).then(([g, bl, sup, not]) => {
+        setGuard(g ?? {})
+        const pats = Array.isArray(bl?.patterns) ? bl.patterns : []
+        const ph = bl?.placeholders && typeof bl.placeholders === 'object' ? bl.placeholders : {}
+        setPatternsText(pats.join('\n'))
+        setPlaceholdersText(JSON.stringify(ph, null, 2))
+        setSupervisorCfg(sup ?? {})
+        setNotifierCfg(not ?? {})
+      }).catch(() => {})
     }
     call(MAESTRO_ENDPOINTS.lanPinStatus, {})
       .then(value => { setLanPinEnabled(value.enabled); if (value.enabled) setLanPin(value.pin ?? null) })
@@ -720,7 +802,6 @@ export function MaestroSettingsTab({ rpcCall, configRpcCall }) {
         checked: config.autoRereviewOnPush,
         onChange: checked => saveField('autoRereviewOnPush', checked),
       }),
-      h(ReviewHistoryPanel, { rpcCall }),
     ),
 
     h('div', { style: sectionStyle },
@@ -754,6 +835,129 @@ export function MaestroSettingsTab({ rpcCall, configRpcCall }) {
       h(ProjectMappingsEditor, { mappings: config.projectMappings ?? [], onChange: mappings => saveField('projectMappings', mappings), catalog, globalReviewModel: config.reviewModel ?? null }),
     ),
 
+    // Task 3: Guard/Blacklist/Supervisor/Notifier tabs — data-driven over guard domains
+    h('div', { style: sectionStyle },
+      h('h4', { style: headingStyle }, 'Guard / Blacklist / Supervisor / Notifier'),
+      h('div', { style: tabBarStyle },
+        h('button', { type: 'button', style: tabButtonStyle(activeTab === 'guard'), onClick: () => setActiveTab('guard') }, 'Guard'),
+        h('button', { type: 'button', style: tabButtonStyle(activeTab === 'blacklist'), onClick: () => setActiveTab('blacklist') }, 'Blacklist'),
+        h('button', { type: 'button', style: tabButtonStyle(activeTab === 'supervisor'), onClick: () => setActiveTab('supervisor') }, 'Supervisor'),
+        h('button', { type: 'button', style: tabButtonStyle(activeTab === 'notifier'), onClick: () => setActiveTab('notifier') }, 'Notifier'),
+      ),
+      activeTab === 'guard' && h('div', { 'data-tab': 'guard' },
+        h('p', { style: captionStyle }, 'Enforce publish block, git protection and cwd containment.'),
+        h(ToggleField, {
+          label: 'publishBlocked',
+          caption: 'Block publish-related commands when enabled.',
+          checked: guard.publishBlocked === true,
+          onChange: v => saveGuard({ publishBlocked: v }),
+        }),
+        h(ToggleField, {
+          label: 'gitProtection.enabled',
+          caption: 'Protect pushes to protected branches.',
+          checked: guard.gitProtection?.enabled === true,
+          onChange: v => saveGuard({ gitProtection: { enabled: v, branches: guard.gitProtection?.branches ?? ['master', 'main'] } }),
+        }),
+        h('label', { style: fieldLabelStyle }, 'gitProtection.branches (comma separated)'),
+        h('input', {
+          style: inputStyle,
+          value: (guard.gitProtection?.branches ?? ['master', 'main']).join(', '),
+          placeholder: 'master, main',
+          onChange: e => {
+            const branches = e.target.value.split(',').map(s => s.trim()).filter(Boolean)
+            saveGuard({ gitProtection: { enabled: guard.gitProtection?.enabled ?? true, branches } })
+          },
+        }),
+        h(ToggleField, {
+          label: 'cwdContainment',
+          caption: 'Contain file operations to the session cwd.',
+          checked: guard.cwdContainment === true,
+          onChange: v => saveGuard({ cwdContainment: v }),
+        }),
+        h('label', { style: fieldLabelStyle }, 'credentialPaths (comma separated)'),
+        h('input', {
+          style: inputStyle,
+          value: (guard.credentialPaths ?? []).join(', '),
+          placeholder: '~/.config/credentials.yaml, ~/.config/cloudflared',
+          onChange: e => {
+            const credentialPaths = e.target.value.split(',').map(s => s.trim()).filter(Boolean)
+            saveGuard({ credentialPaths })
+          },
+        }),
+      ),
+      activeTab === 'blacklist' && h('div', { 'data-tab': 'blacklist' },
+        h('p', { style: captionStyle }, 'One pattern per line. These are blocked from being committed or published.'),
+        h('label', { style: fieldLabelStyle }, 'patterns (one per line)'),
+        h('textarea', {
+          style: textareaStyle,
+          value: patternsText,
+          placeholder: 'example-project\nacme-shop',
+          onChange: e => setPatternsText(e.target.value),
+          onBlur: e => commitBlacklistPatterns(e.target.value),
+        }),
+        h('label', { style: fieldLabelStyle }, 'placeholders JSON'),
+        h('textarea', {
+          style: { ...textareaStyle, height: 90 },
+          value: placeholdersText,
+          placeholder: '{"example-project":"my-project"}',
+          onChange: e => setPlaceholdersText(e.target.value),
+          onBlur: () => commitPlaceholders(),
+        }),
+        h('p', { style: captionStyle }, 'Map blocked patterns to their placeholder suggestions.'),
+        h('button', { type: 'button', style: { ...secondaryButtonStyle, marginTop: 8 }, onClick: () => { commitBlacklistPatterns(patternsText); commitPlaceholders() } }, 'Save Blacklist'),
+      ),
+      activeTab === 'supervisor' && h('div', { 'data-tab': 'supervisor' },
+        h('p', { style: captionStyle }, 'Background daemon that auto-resumes crashed sessions.'),
+        h('label', { style: fieldLabelStyle }, 'intervalMs'),
+        h('input', {
+          type: 'number',
+          style: inputStyle,
+          value: supervisorCfg.intervalMs ?? '',
+          placeholder: '5000',
+          onChange: e => { const v = e.target.value === '' ? undefined : Number(e.target.value); saveSupervisorCfg({ intervalMs: v }) },
+        }),
+        h('label', { style: fieldLabelStyle }, 'downThreshold'),
+        h('input', {
+          type: 'number',
+          style: inputStyle,
+          value: supervisorCfg.downThreshold ?? '',
+          placeholder: '3',
+          onChange: e => { const v = e.target.value === '' ? undefined : Number(e.target.value); saveSupervisorCfg({ downThreshold: v }) },
+        }),
+        h(ToggleField, {
+          label: 'autoResumeEnabled',
+          caption: 'Automatically resume down sessions.',
+          checked: supervisorCfg.autoResumeEnabled === true,
+          onChange: v => saveSupervisorCfg({ autoResumeEnabled: v }),
+        }),
+      ),
+      activeTab === 'notifier' && h('div', { 'data-tab': 'notifier' },
+        h('p', { style: captionStyle }, 'Telegram notifications for Maestro events.'),
+        h('label', { style: fieldLabelStyle }, 'telegram.botToken'),
+        h('input', {
+          type: 'password',
+          autoComplete: 'off',
+          style: inputStyle,
+          value: notifierCfg.telegram?.botToken ?? '',
+          placeholder: '123456:ABC-DEF...',
+          onChange: e => saveNotifierCfg({ telegram: { botToken: e.target.value } }),
+        }),
+        h('label', { style: fieldLabelStyle }, 'telegram.chatId'),
+        h('input', {
+          style: inputStyle,
+          value: notifierCfg.telegram?.chatId ?? '',
+          placeholder: '-1001234567890',
+          onChange: e => saveNotifierCfg({ telegram: { chatId: e.target.value } }),
+        }),
+        h(ToggleField, {
+          label: 'telegram.reviewNotifications',
+          caption: 'Also notify about finished reviews.',
+          checked: notifierCfg.telegram?.reviewNotifications === true || notifierCfg.policy?.reviewNotifications === true,
+          onChange: v => saveNotifierCfg({ telegram: { reviewNotifications: v } }),
+        }),
+      ),
+    ),
+
     error && h('p', { style: errorStyle }, error),
   )
 }

package/src/host/index.ts

@@ -1,6 +1,7 @@
-import type {} from '@deepseek-ai/dsh-client-connection'
 import type { Context } from '@deepseek-ai/cordis'
-import type { RpcErrorDetailsMap, RpcResult } from '@deepseek-ai/dsh-host-apiproxy/api'
+
+type RpcResult<T> = { ok: true; value: T } | { ok: false; error: { code: string; message: string; details: object } }
+type RpcErrorDetailsMap = { 'bad-request': { issues: object[] } }
 import { createMaestroConfigService, type MaestroConfigService } from './service.ts'
 
 export const name = 'maestro-config'
@@ -11,6 +12,7 @@ const RPC_CHANNEL = '/dsh-maestro-config'
 declare module '@deepseek-ai/cordis' {
   interface Context {
     maestroConfig: MaestroConfigService
+    connection: { rpc: { handle: (channel: string, handler: (endpoint: string, payload: unknown) => Promise<RpcResult<unknown>>, opts?: unknown) => () => void } }
   }
 }
 
@@ -31,7 +33,13 @@ function fail(message: string): RpcResult<never> {
   }
 }
 
-/** Publish maestroConfig over the shared store + loopback RPC for clients. */
+/**
+ * Publish maestroConfig over the shared store + loopback RPC for clients.
+ * Exposes guard/guardBlacklist/supervisor/notifier domains (Task 1 validators)
+ * via generic get/set — validation is delegated to the lib's domain validators.
+ * Host also handles '/dsh-maestro-config/get' and '/dsh-maestro-config/set'
+ * style calls through the single channel with endpoint dispatch.
+ */
 export function apply(ctx: Context): void {
   const svc = createMaestroConfigService()
   ctx.provide('maestroConfig', svc)
@@ -43,6 +51,7 @@ export function apply(ctx: Context): void {
       }
       if (endpoint === 'get') {
         if (typeof body.domain !== 'string') return fail('domain (string) is required')
+        // guard / guardBlacklist / supervisor / notifier are all valid domains here
         return ok(await svc.get(body.domain))
       }
       if (endpoint === 'set') {