martty 0.2.28-beta.0 → 0.2.29

package/lib/acp-client.js

@@ -80,12 +80,31 @@ export function apply(ctx, config = {}) {
     provide(ctx, liveAgent)
     return
   }
+  // Replacing the agent: the previous child must not outlive its spec.
+  if (liveAgent !== null && liveAgent.child.exitCode === null) {
+    try {
+      liveAgent.child.kill('SIGTERM')
+    } catch {
+      // already gone
+    }
+  }
+  liveAgent = null
   const child = spawn(agent.command, agent.args ?? [], {
     stdio: ['pipe', 'pipe', 'inherit'],
     env: { ...process.env, ...(agent.env ?? {}) },
   })
   child.stdin.on('error', () => {})
   child.stdout.on('error', () => {})
+  child.on('error', (err) => {
+    // A failed spawn (ENOENT, EACCES) emits 'error' on the child; without a
+    // listener it is an uncaught exception. Surface EOF to the transport
+    // instead so pending requests fail instead of hanging, and drop the
+    // cached handle so the next apply() retries the spawn.
+    console.error(`acp-client: failed to spawn agent ${agent.command}: ${err.message}`)
+    if (liveAgent?.child === child) liveAgent = null
+    child.stdin.destroy()
+    child.stdout.destroy()
+  })
   const service = {
     kind: 'spawn',
     command: agent.command,

package/lib/boot.js

@@ -1,3 +1,24 @@
+/**
+ * Boot-time restore of a statically-registered gallery palette (ayu,
+ * iceberg, …). `/theme` persistence writes `settings.theme`; dynamic
+ * packs are restored by tui-local-plugins (they have an owner), but the
+ * builtin gallery registers with no owner, so nothing would re-activate
+ * the saved pick on the next launch. Runs after every static theme
+ * Plugin is registered; `activate` notifies the painter (or queues until
+ * `bindNotify` flushes). A broken or unknown id must not block boot.
+ */
+export function restorePreferredTheme(tuiTheme) {
+  const preferred = tuiTheme?.preferred?.()
+  if (typeof preferred !== 'string' || preferred === 'default') return
+  if (tuiTheme?.owner?.(preferred) !== undefined) return
+  if (!tuiTheme?.isLoaded?.(preferred)) return
+  try {
+    tuiTheme.activate(preferred)
+  } catch {
+    // a broken pack must not block TUI startup
+  }
+}
+
 /**
  * Cordis client boot: tuiTheme + tuiSlots + acp-client + TUI shell.
  *
@@ -65,6 +86,7 @@ export async function bootClient(options = {}) {
     await ctx.plugin({ name: 'tui-theme-everforest', inject: everforestInject, apply: applyEverforest })
     await ctx.plugin({ name: 'tui-theme-iceberg', inject: icebergInject, apply: applyIceberg })
     await ctx.plugin({ name: 'tui-theme-solarized', inject: solarizedInject, apply: applySolarized })
+    restorePreferredTheme(ctx.get('tuiTheme'))
     await ctx.plugin({ name: 'tui-slots', inject: [], apply: applySlots })
     await ctx.plugin({ name: 'tui-commands', inject: [], apply: applyCommands })
     await ctx.plugin({ name: 'tui-overlay', inject: [], apply: applyOverlay })
@@ -122,6 +144,7 @@ export async function bootClient(options = {}) {
     applyEverforest(ctx)
     applyIceberg(ctx)
     applySolarized(ctx)
+    restorePreferredTheme(ctx.tuiTheme)
     applySlots(ctx)
     applyCommands(ctx)
     applyOverlay(ctx)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "martty",
-  "version": "0.2.28-beta.0",
+  "version": "0.2.29",
   "description": "Terminal-native ACP client UI; Cordis client tree, any ACP agent",
   "license": "MIT",
   "repository": {