martty 0.2.17 → 0.2.18

package/lib/palettes/catppuccin.json

@@ -0,0 +1,44 @@
+{
+  "id": "catppuccin",
+  "label": "Catppuccin",
+  "dark": {
+    "bg": "#1e1e2e",
+    "surface": "#1e1e2e",
+    "panel": "#45475a",
+    "fg": "#cdd6f4",
+    "fg_secondary": "#585b70",
+    "fg_tertiary": "#585b70",
+    "caption": "#585b70",
+    "brand": "#89b4fa",
+    "brand_soft": "#f5c2e7",
+    "bubble_bg": "#353748",
+    "bubble_fg": "#cdd6f4",
+    "border": "#585b70",
+    "code_bg": "#1e1e2e",
+    "ok": "#a6e3a1",
+    "warn": "#f9e2af",
+    "err": "#f38ba8",
+    "hint": "#94e2d5",
+    "chip_bg": "#45475a"
+  },
+  "light": {
+    "bg": "#eff1f5",
+    "surface": "#eff1f5",
+    "panel": "#bcc0cc",
+    "fg": "#4c4f69",
+    "fg_secondary": "#6c6f85",
+    "fg_tertiary": "#6c6f85",
+    "caption": "#6c6f85",
+    "brand": "#1e66f5",
+    "brand_soft": "#ea76cb",
+    "bubble_bg": "#d8dae1",
+    "bubble_fg": "#4c4f69",
+    "border": "#6c6f85",
+    "code_bg": "#eff1f5",
+    "ok": "#40a02b",
+    "warn": "#df8e1d",
+    "err": "#d20f39",
+    "hint": "#179299",
+    "chip_bg": "#bcc0cc"
+  }
+}

package/lib/palettes/everforest.json

@@ -0,0 +1,44 @@
+{
+  "id": "everforest",
+  "label": "Everforest",
+  "dark": {
+    "bg": "#2d353b",
+    "surface": "#2d353b",
+    "panel": "#343f44",
+    "fg": "#d3c6aa",
+    "fg_secondary": "#859289",
+    "fg_tertiary": "#859289",
+    "caption": "#859289",
+    "brand": "#7fbbb3",
+    "brand_soft": "#d699b6",
+    "bubble_bg": "#414b51",
+    "bubble_fg": "#d3c6aa",
+    "border": "#859289",
+    "code_bg": "#2d353b",
+    "ok": "#a7c080",
+    "warn": "#dbbc7f",
+    "err": "#e67e80",
+    "hint": "#83c092",
+    "chip_bg": "#343f44"
+  },
+  "light": {
+    "bg": "#fdf6e3",
+    "surface": "#fdf6e3",
+    "panel": "#f4f0d9",
+    "fg": "#5c6a72",
+    "fg_secondary": "#939f91",
+    "fg_tertiary": "#939f91",
+    "caption": "#939f91",
+    "brand": "#3a94c5",
+    "brand_soft": "#df69ba",
+    "bubble_bg": "#efe9d5",
+    "bubble_fg": "#5c6a72",
+    "border": "#939f91",
+    "code_bg": "#fdf6e3",
+    "ok": "#8da101",
+    "warn": "#dfa000",
+    "err": "#f85552",
+    "hint": "#35a77c",
+    "chip_bg": "#f4f0d9"
+  }
+}

package/lib/palettes/iceberg.json

@@ -0,0 +1,44 @@
+{
+  "id": "iceberg",
+  "label": "Iceberg",
+  "dark": {
+    "bg": "#161821",
+    "surface": "#161821",
+    "panel": "#1e2132",
+    "fg": "#c6c8d1",
+    "fg_secondary": "#6b7089",
+    "fg_tertiary": "#6b7089",
+    "caption": "#6b7089",
+    "brand": "#84a0c6",
+    "brand_soft": "#a093c7",
+    "bubble_bg": "#272c42",
+    "bubble_fg": "#c6c8d1",
+    "border": "#6b7089",
+    "code_bg": "#161821",
+    "ok": "#b4be82",
+    "warn": "#e2a478",
+    "err": "#e27878",
+    "hint": "#89b8c2",
+    "chip_bg": "#1e2132"
+  },
+  "light": {
+    "bg": "#e8e9ec",
+    "surface": "#e8e9ec",
+    "panel": "#dcdfe7",
+    "fg": "#33374c",
+    "fg_secondary": "#8389a3",
+    "fg_tertiary": "#8389a3",
+    "caption": "#8389a3",
+    "brand": "#2d539e",
+    "brand_soft": "#7759b4",
+    "bubble_bg": "#cacdd7",
+    "bubble_fg": "#33374c",
+    "border": "#8389a3",
+    "code_bg": "#e8e9ec",
+    "ok": "#668e3d",
+    "warn": "#c57339",
+    "err": "#cc517a",
+    "hint": "#3f83a6",
+    "chip_bg": "#dcdfe7"
+  }
+}

package/lib/palettes/kanagawa.json

@@ -0,0 +1,44 @@
+{
+  "id": "kanagawa",
+  "label": "Kanagawa",
+  "dark": {
+    "bg": "#1f1f28",
+    "surface": "#1f1f28",
+    "panel": "#16161d",
+    "fg": "#dcd7ba",
+    "fg_secondary": "#727169",
+    "fg_tertiary": "#727169",
+    "caption": "#727169",
+    "brand": "#7e9cd8",
+    "brand_soft": "#957fb8",
+    "bubble_bg": "#2d4f67",
+    "bubble_fg": "#c8c093",
+    "border": "#727169",
+    "code_bg": "#1f1f28",
+    "ok": "#76946a",
+    "warn": "#c0a36e",
+    "err": "#c34043",
+    "hint": "#6a9589",
+    "chip_bg": "#16161d"
+  },
+  "light": {
+    "bg": "#f2ecbc",
+    "surface": "#f2ecbc",
+    "panel": "#c9cbd1",
+    "fg": "#545464",
+    "fg_secondary": "#8a8980",
+    "fg_tertiary": "#8a8980",
+    "caption": "#8a8980",
+    "brand": "#4d699b",
+    "brand_soft": "#b35b79",
+    "bubble_bg": "#c9cbd1",
+    "bubble_fg": "#43436c",
+    "border": "#8a8980",
+    "code_bg": "#f2ecbc",
+    "ok": "#6f894e",
+    "warn": "#77713f",
+    "err": "#c84053",
+    "hint": "#597b75",
+    "chip_bg": "#c9cbd1"
+  }
+}

package/lib/palettes/solarized.json

@@ -0,0 +1,44 @@
+{
+  "id": "solarized",
+  "label": "Solarized",
+  "dark": {
+    "bg": "#002b36",
+    "surface": "#002b36",
+    "panel": "#073642",
+    "fg": "#839496",
+    "fg_secondary": "#586e75",
+    "fg_tertiary": "#586e75",
+    "caption": "#586e75",
+    "brand": "#268bd2",
+    "brand_soft": "#d33682",
+    "bubble_bg": "#073642",
+    "bubble_fg": "#93a1a1",
+    "border": "#586e75",
+    "code_bg": "#002b36",
+    "ok": "#859900",
+    "warn": "#b58900",
+    "err": "#dc322f",
+    "hint": "#2aa198",
+    "chip_bg": "#073642"
+  },
+  "light": {
+    "bg": "#fdf6e3",
+    "surface": "#fdf6e3",
+    "panel": "#eee8d5",
+    "fg": "#657b83",
+    "fg_secondary": "#586e75",
+    "fg_tertiary": "#586e75",
+    "caption": "#586e75",
+    "brand": "#268bd2",
+    "brand_soft": "#d33682",
+    "bubble_bg": "#eee8d5",
+    "bubble_fg": "#586e75",
+    "border": "#586e75",
+    "code_bg": "#fdf6e3",
+    "ok": "#859900",
+    "warn": "#b58900",
+    "err": "#dc322f",
+    "hint": "#2aa198",
+    "chip_bg": "#eee8d5"
+  }
+}

package/lib/runner.js

@@ -9,7 +9,7 @@
 
 import { spawn } from 'node:child_process'
 import { createRequire } from 'node:module'
-import { fileURLToPath } from 'node:url'
+import { fileURLToPath, pathToFileURL } from 'node:url'
 
 export const name = 'dsh-tui-runner'
 export const inject = ['loader', 'acpServer', 'cmdlineArgs', 'appExit', 'tuiClientPlugins']
@@ -20,7 +20,7 @@ const requireFromTui = createRequire(import.meta.url)
 function ownAcpBridge() {
   const specifier = '@openma/deepseek-harness-acp/bridge'
   try {
-    return requireFromTui.resolve(specifier)
+    return pathToFileURL(requireFromTui.resolve(specifier)).href
   } catch {
     // A source-linked package may rely on the active profile's installation.
     return specifier

package/lib/solarized.js

@@ -0,0 +1,21 @@
+/**
+ * Gallery palette pack `solarized`. Registers complete dark/light token maps:
+ * dark from Solarized Dark, light from Solarized Light (terminalcolors.com/themes/solarized). Does not activate:
+ * `/theme` covers it. `inject = ['tuiTheme']`: sibling profile row, not
+ * `ctx.plugin` inside the runner.
+ */
+
+import { readFileSync } from 'node:fs'
+
+const solarizedPalette = JSON.parse(
+  readFileSync(new URL('./palettes/solarized.json', import.meta.url), 'utf8'),
+)
+
+export const name = 'tui-theme-solarized'
+export const inject = ['tuiTheme']
+
+export function apply(ctx) {
+  ctx.effect(() => ctx.tuiTheme.register(solarizedPalette, { activate: false }))
+}
+
+export { solarizedPalette }

package/lib/tui-client-plugin-registry.js

@@ -8,7 +8,7 @@ export const name = 'tui-client-plugin-registry'
 export const inject = []
 
 const ID = /^[a-z0-9][a-z0-9-]*$/
-const KINDS = new Set(['theme', 'ui-preset'])
+const KINDS = new Set(['theme', 'ui', 'ui-preset'])
 
 function normalizeEntry(value) {
   if (typeof value !== 'string' || value.length === 0) {
@@ -41,14 +41,14 @@ class TuiClientPluginsService extends Service {
       throw new Error('tuiClientPlugins.register: id must be a lowercase package identifier')
     }
     if (!KINDS.has(options.kind)) {
-      throw new Error('tuiClientPlugins.register: kind must be "theme" or "ui-preset"')
+      throw new Error('tuiClientPlugins.register: kind must be "theme" or "ui"')
     }
     if (this.entries.has(options.id)) {
       throw new Error(`tuiClientPlugins.register: id ${JSON.stringify(options.id)} is already registered`)
     }
     const entry = {
       id: options.id,
-      kind: options.kind,
+      kind: options.kind === 'ui-preset' ? 'ui' : options.kind,
       entry: normalizeEntry(options.entry),
     }
     this.entries.set(entry.id, entry)

package/lib/tui-local-plugins.js

@@ -9,7 +9,7 @@ const PACKAGE_PREFIX = 'tui-package:'
  * @param {object} ctx
  * @param {{
  *   store: object,
- *   packages?: Array<{ id: string, kind: 'theme' | 'ui-preset', entry: string }>,
+ *   packages?: Array<{ id: string, kind: 'theme' | 'ui', entry: string }>,
  *   tuiTheme?: object,
  *   tuiPresets?: object,
  *   tuiSlots?: object,
@@ -34,6 +34,7 @@ export function installTuiLocalPlugins(ctx, options) {
 
   const env = (pluginId) => ({
     pluginId,
+    pluginSource: 'static',
     tuiTheme: options.tuiTheme,
     tuiPresets: options.tuiPresets,
     tuiSlots: options.tuiSlots,

package/lib/tui-plugin-store.js

@@ -14,7 +14,7 @@ import { homedir } from 'node:os'
 import path from 'node:path'
 
 const ARTIFACT_ID = /^[a-z0-9][a-z0-9-]*$/
-const KINDS = new Set(['theme', 'ui-preset'])
+const KINDS = new Set(['theme', 'ui', 'ui-preset'])
 const MANIFEST = 'plugin.json'
 
 function artifactId(value) {
@@ -38,7 +38,8 @@ function validateManifest(value, expectedId) {
   if (value.schemaVersion !== 0) throw new Error('schemaVersion must be 0')
   const id = artifactId(value.id)
   if (id !== expectedId) throw new Error(`manifest id must match directory ${JSON.stringify(expectedId)}`)
-  if (!KINDS.has(value.kind)) throw new Error('kind must be "theme" or "ui-preset"')
+  if (!KINDS.has(value.kind)) throw new Error('kind must be "theme" or "ui"')
+  const kind = value.kind === 'ui-preset' ? 'ui' : value.kind
   const name = nonEmpty(value.name, 'name')
   const purpose = nonEmpty(value.purpose, 'purpose')
   if (value.source === null || typeof value.source !== 'object' || Array.isArray(value.source)) {
@@ -53,7 +54,7 @@ function validateManifest(value, expectedId) {
   return {
     schemaVersion: 0,
     id,
-    kind: value.kind,
+    kind,
     name,
     purpose,
     source: { pluginId, packageId },

package/lib/tui-presets.js

@@ -3,6 +3,7 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { Service } from '@deepseek-ai/cordis'
+import { CORDIS_METHODS } from './cordis-protocol.js'
 
 export const name = 'tui-presets'
 export const inject = ['tuiCommands', 'tuiOverlay']
@@ -19,6 +20,10 @@ class TuiPresetsService extends Service {
     return this.core.register(options, mount)
   }
 
+  registerOwned(owner, options, mount, registerOptions) {
+    return this.core.registerOwned(owner, options, mount, registerOptions)
+  }
+
   activate(id) {
     return this.core.activate(id)
   }
@@ -27,6 +32,26 @@ class TuiPresetsService extends Service {
     return this.core.list()
   }
 
+  catalog() {
+    return this.core.catalog()
+  }
+
+  owner(id) {
+    return this.core.owner(id)
+  }
+
+  isLoaded(id) {
+    return this.core.isLoaded(id)
+  }
+
+  bindLifecycle(fn) {
+    return this.core.bindLifecycle(fn)
+  }
+
+  bindNotify(fn) {
+    return this.core.bindNotify(fn)
+  }
+
   active() {
     return this.core.active()
   }
@@ -67,6 +92,26 @@ export function installTuiPresets(ctx, options = {}) {
   let releaseActive
   let presetSelector
   let disposed = false
+  let lifecycle
+  let send = typeof options.notify === 'function' ? options.notify : undefined
+  const queue = []
+
+  function emit(params) {
+    if (send !== undefined) send(CORDIS_METHODS.uiUpdate, params)
+    else queue.push(params)
+  }
+
+  function publish() {
+    emit({ protocol: 0, plugins: catalog() })
+  }
+
+  function bindNotify(fn) {
+    if (typeof fn !== 'function') throw new Error('tuiPresets.bindNotify needs a function')
+    send = fn
+    const pending = queue.splice(0, queue.length)
+    for (const params of pending) send(CORDIS_METHODS.uiUpdate, params)
+    publish()
+  }
 
   function mount(entry) {
     const mounted = entry.mount()
@@ -109,31 +154,45 @@ export function installTuiPresets(ctx, options = {}) {
     if (entry === undefined) {
       throw new Error(`tuiPresets.activate: preset "${id}" is not registered`)
     }
+    if (!entry.loaded) {
+      throw new Error(`tuiPresets.activate: UI Plugin for "${id}" is not loaded`)
+    }
     switchTo(entry)
     if (persist) {
       preferredId = id
       writePreferred(settingsPath, id)
     }
+    publish()
   }
 
   function fallback() {
-    const next = entries.get(preferredId) ?? entries.get('default') ?? entries.values().next().value
+    const preferred = entries.get(preferredId)
+    const stock = entries.get('default')
+    const next = (preferred?.loaded === true ? preferred : undefined)
+      ?? (stock?.loaded === true ? stock : undefined)
+      ?? [...entries.values()].find((entry) => entry.loaded)
     if (next !== undefined) switchTo(next)
   }
 
   function refreshCommandInput() {
     stopCommand?.update?.({
       input: {
-        hint: 'preset',
-        options: list().map((entry) => ({
+        hint: 'plugin',
+        options: catalog().map((entry) => ({
           value: entry.id,
           label: entry.label,
+          description: `${entry.source} · ${entry.status}`,
         })),
       },
     })
+    publish()
   }
 
   function register(options, mountPreset) {
+    return registerOwned(undefined, options, mountPreset, { source: 'static' })
+  }
+
+  function registerOwned(owner, options, mountPreset, registerOptions = {}) {
     if (disposed) throw new Error('tuiPresets: registry is disposed')
     if (options === null || typeof options !== 'object' || Array.isArray(options)) {
       throw new Error('tuiPresets.register: options must be an object')
@@ -151,10 +210,23 @@ export function installTuiPresets(ctx, options = {}) {
     if (typeof mountPreset !== 'function') {
       throw new Error('tuiPresets.register: mount must be a function')
     }
-    if (entries.has(options.id)) {
+    if (owner !== undefined && (typeof owner !== 'string' || owner.length === 0)) {
+      throw new Error('tuiPresets.registerOwned: owner must be a non-empty string')
+    }
+    const source = owner === undefined ? 'static' : registerOptions.source ?? 'dynamic'
+    if (source !== 'static' && source !== 'dynamic') {
+      throw new Error('tuiPresets.register: source must be static or dynamic')
+    }
+    const retained = entries.get(options.id)
+    const resumesOwner = owner !== undefined
+      && retained?.owner === owner
+      && retained.loaded === false
+    if (retained !== undefined && !resumesOwner) {
       throw new Error(`tuiPresets.register: preset "${options.id}" is already registered`)
     }
-    const entry = { id: options.id, label: options.label, mount: mountPreset }
+    const entry = resumesOwner
+      ? Object.assign(retained, { label: options.label, mount: mountPreset, source, loaded: true })
+      : { id: options.id, label: options.label, mount: mountPreset, owner, source, loaded: true }
     entries.set(entry.id, entry)
     refreshCommandInput()
     if (activeEntry === undefined || entry.id === preferredId) fallback()
@@ -170,7 +242,8 @@ export function installTuiPresets(ctx, options = {}) {
         activeEntry = undefined
         releaseActive = undefined
       }
-      entries.delete(entry.id)
+      if (entry.owner === undefined) entries.delete(entry.id)
+      else entry.loaded = false
       refreshCommandInput()
       if (wasActive) fallback()
     }
@@ -180,30 +253,69 @@ export function installTuiPresets(ctx, options = {}) {
     return [...entries.values()].map(({ id, label }) => ({ id, label }))
   }
 
+  function catalog() {
+    return [...entries.values()].map((entry) => ({
+      id: entry.id,
+      label: entry.label,
+      source: entry.source,
+      status: activeEntry === entry ? 'active' : entry.loaded
+        ? (entry.source === 'dynamic' ? 'running' : 'ready')
+        : 'stopped',
+      ...(entry.owner === undefined ? {} : { owner: { pluginId: entry.owner } }),
+    }))
+  }
+
+  function owner(id) {
+    return entries.get(id)?.owner
+  }
+
+  function isLoaded(id) {
+    return entries.get(id)?.loaded === true
+  }
+
+  function bindLifecycle(fn) {
+    if (typeof fn !== 'function') throw new Error('tuiPresets.bindLifecycle needs a function')
+    lifecycle = fn
+    return () => {
+      if (lifecycle === fn) lifecycle = undefined
+    }
+  }
+
+  async function requestActivate(id) {
+    const entry = entries.get(id)
+    if (entry === undefined) throw new Error(`tuiPresets.activate: preset "${id}" is not registered`)
+    if (entry.loaded) return activate(id)
+    if (lifecycle === undefined || entry.owner === undefined) {
+      throw new Error(`tuiPresets.activate: UI Plugin for "${id}" is not loaded`)
+    }
+    await lifecycle(id, entry.owner)
+    if (entries.get(id)?.loaded === true && active() !== id) activate(id)
+  }
+
   function active() {
     return activeEntry?.id
   }
 
   const stopCommand = ctx.tuiCommands.register({
     name: 'ui',
-    description: 'Switch UI preset',
+    description: 'Switch UI Plugin',
   }, async (args = '') => {
     const id = args.trim().toLowerCase()
     if (id.length === 0) {
-      const choices = list()
       presetSelector?.close()
       presetSelector = ctx.tuiOverlay.openSelect({
         id: 'ui-preset',
-        title: 'UI preset',
+        title: 'UI Plugin',
         value: active(),
-        options: choices.map((entry) => ({
+        options: catalog().map((entry) => ({
           value: entry.id,
           label: entry.label,
+          description: `${entry.source} · ${entry.status}`,
         })),
       }, {
         onSubmit(value) {
           presetSelector = undefined
-          activate(value)
+          return requestActivate(value)
         },
         onCancel() {
           presetSelector = undefined
@@ -211,7 +323,7 @@ export function installTuiPresets(ctx, options = {}) {
       })
       return
     }
-    activate(id)
+    await requestActivate(id)
   })
   refreshCommandInput()
 
@@ -225,9 +337,13 @@ export function installTuiPresets(ctx, options = {}) {
     activeEntry = undefined
     releaseActive = undefined
     entries.clear()
+    lifecycle = undefined
   }
 
-  const core = { register, activate, list, active, dispose }
+  const core = {
+    register, registerOwned, activate, list, catalog, owner, isLoaded, bindLifecycle, bindNotify,
+    active, dispose,
+  }
   const service = typeof ctx.provide === 'function'
     ? new TuiPresetsService(ctx, core)
     : core

package/lib/tui-theme.js

@@ -242,7 +242,7 @@ export function installTuiTheme(ctx, options = {}) {
   let activationRevision = 0
 
   const builtin = validatePalette(defaultPalette)
-  palettes.set(builtin.id, { palette: builtin, owner: undefined, loaded: true })
+  palettes.set(builtin.id, { palette: builtin, owner: undefined, loaded: true, source: 'static' })
 
   function emit(method, params) {
     if (typeof send === 'function') {
@@ -279,7 +279,14 @@ export function installTuiTheme(ctx, options = {}) {
     activeId = id
     activationRevision += 1
     if (notifyPainter) {
-      emit(CORDIS_METHODS.themeUpdate, { protocol: PROTOCOL, palette, activate: true })
+      emit(CORDIS_METHODS.themeUpdate, {
+        protocol: PROTOCOL,
+        palette,
+        activate: true,
+        loaded: entry.loaded,
+        source: entry.source,
+        ...(entry.owner === undefined ? {} : { owner: { pluginId: entry.owner } }),
+      })
     }
     if (previousId !== id) {
       for (const listener of [...listeners]) {
@@ -336,13 +343,18 @@ export function installTuiTheme(ctx, options = {}) {
     const setup = () => {
       const previousId = cover ? activeId : undefined
       let leaseRevision
-      entry = { palette: validated, owner, loaded: true }
+      const source = owner === undefined ? 'static' : registerOptions.source ?? 'dynamic'
+      if (source !== 'static' && source !== 'dynamic') {
+        throw new Error('tuiTheme.register: source must be static or dynamic')
+      }
+      entry = { palette: validated, owner, loaded: true, source }
       palettes.set(validated.id, entry)
       emit(CORDIS_METHODS.themeUpdate, {
         protocol: PROTOCOL,
         palette: validated,
         activate: false,
         loaded: true,
+        source,
         ...(owner === undefined ? {} : { owner: { pluginId: owner } }),
       })
       if (cover) {
@@ -372,6 +384,7 @@ export function installTuiTheme(ctx, options = {}) {
             palette: validated,
             activate: false,
             loaded: false,
+            source: entry.source,
             owner: { pluginId: owner },
           })
         }
@@ -400,6 +413,7 @@ export function installTuiTheme(ctx, options = {}) {
         palette: next,
         activate: false,
         loaded: true,
+        source: entry.source,
         ...(owner === undefined ? {} : { owner: { pluginId: owner } }),
       })
     }