martty 0.2.33 → 0.2.35

package/lib/index.js

@@ -223,8 +223,10 @@ export async function applyShell(ctx, options = {}) {
       },
       onAcp(direction, message) {
         if (direction === 'client') {
+          agent.observeClient?.(message)
           clientEvents.observeClient(message)
         } else {
+          agent.observeAgent?.(message)
           clientEvents.observeAgent(message)
         }
       },
@@ -260,6 +262,8 @@ export async function applyShell(ctx, options = {}) {
         throw new Error(`unsupported Cordis TUI method: ${String(message.method)}`)
       },
     })
+    agent.onSwitch?.(() => mux.resetAgent())
+    agent.onFailure?.((error) => mux.failAgent(error))
     const notifyTui = (method, params) => mux.notifyTui(method, params)
     republishCompositorState = () => {
       handle.bindNotify(notifyTui)

package/lib/mux.js

@@ -126,6 +126,8 @@ export function onJsonLines(source, onLine) {
  *   notifyTui: (method: string, params?: object) => void,
  *   requestAgent: (method: string, params?: object) => Promise<unknown>,
  *   requestTui: (method: string, params?: object) => Promise<unknown>,
+ *   resetAgent: () => void,
+ *   failAgent: (error: Error) => void,
  * }}
  */
 export function muxAcpAndCompositor(opts) {
@@ -137,6 +139,7 @@ export function muxAcpAndCompositor(opts) {
   /** @type {Map<string, { resolve: (value: unknown) => void, reject: (error: Error) => void }>} */
   const pendingAgent = new Map()
   const pendingTui = new Map()
+  const pendingClient = new Set()
   let nextHostId = 0
   let nextTuiId = 0
   /** @type {unknown} */
@@ -167,6 +170,7 @@ export function muxAcpAndCompositor(opts) {
       if (agentCordis !== null) onHost?.(message)
       return
     }
+    if (message?.id !== undefined && typeof message.method !== 'string') pendingClient.delete(message.id)
     onAcp?.('agent', message)
     tui.output.write(`${line}\n`)
     if (initializeId !== undefined && message && typeof message === 'object' && message.id === initializeId) {
@@ -244,10 +248,29 @@ export function muxAcpAndCompositor(opts) {
       initializeId = outgoing.id
     }
     onAcp?.('client', outgoing)
+    if (outgoing.id !== undefined && typeof outgoing.method === 'string') pendingClient.add(outgoing.id)
     writeJsonLine(agent.stdin, outgoing)
   })
 
+  const failAgent = (error) => {
+    for (const waiter of pendingAgent.values()) waiter.reject(error)
+    pendingAgent.clear()
+    const requests = [...pendingClient]
+    pendingClient.clear()
+    for (const id of requests) {
+      const response = { jsonrpc: '2.0', id, error: { code: -32603, message: error.message } }
+      onAcp?.('agent', response)
+      writeJsonLine(tui.output, response)
+    }
+  }
+
   return {
+    failAgent,
+    resetAgent() {
+      initializeId = undefined
+      agentCordis = null
+      failAgent(new Error('ACP Agent was replaced'))
+    },
     notifyTui(method, params) {
       writeJsonLine(
         tui.output,

package/lib/plan-view.js

@@ -43,7 +43,7 @@ function dockNodes(plan) {
     const total = plan.entries.length
     if (total === 0) return []
     const completed = plan.entries.filter((entry) => entry.status === 'completed').length
-    const focus = plan.entries.find((entry) => entry.status === 'in_progress')
+    const focus = plan.entries.find((entry) => isInProgress(entry.status))
       ?? plan.entries.find((entry) => entry.status !== 'completed')
       ?? plan.entries.at(-1)
     const action = { kind: 'command', name: 'plan-view', args: '' }
@@ -53,7 +53,10 @@ function dockNodes(plan) {
         tone: 'caption', status: completed === total ? 'done' : 'running', action,
       },
       ...(focus ? [{
-        id: 'focus', kind: 'generic', title: focus.content, body: '', tone: 'caption', action,
+        id: 'focus', kind: 'generic', title: focus.content,
+        body: statusLabel(focus.status),
+        ...(isInProgress(focus.status) ? { status: 'running' } : {}),
+        tone: 'caption', action,
       }] : []),
     ]
   }
@@ -100,10 +103,22 @@ function viewNodes(plan) {
     } else if (entry.status === 'cancelled' || entry.status === 'failed') {
       item = `- [ ] ~~${content}~~`
     } else {
-      item = entry.status === 'in_progress' ? `- [ ] **${content}**` : `- [ ] ${content}`
+      item = isInProgress(entry.status) ? `- ◐ **${content}** · in progress` : `- [ ] ${content}`
     }
     if (entry.priority) item += ` · priority · ${entry.priority}`
     lines.push(item)
   }
   return [{ id: 'content', kind: 'markdown', text: lines.join('\n') }]
 }
+
+function isInProgress(status) {
+  return status === 'in_progress' || status === 'in-progress'
+}
+
+function statusLabel(status) {
+  if (isInProgress(status)) return 'in progress'
+  if (status === 'completed') return 'completed'
+  if (status === 'cancelled') return 'cancelled'
+  if (status === 'failed') return 'failed'
+  return 'pending'
+}

package/lib/status-view.js

@@ -41,8 +41,10 @@ function statusMarkdown(status, stats) {
   const lines = []
   lines.push(`- state · ${status.state ?? 'idle'}`)
   lines.push(`- acp · ${status.connection ?? 'not attached'}`)
+  if (status.error) lines.push(`- connection error · ${status.error}`)
   if (status.auth?.status !== undefined) {
     lines.push(`- auth · ${status.auth.status}${status.auth.method ? ` · ${status.auth.method}` : ''}`)
+    if (status.auth.message) lines.push(`- auth error · ${status.auth.message}`)
   }
   lines.push(`- session · ${status.session?.bound ? status.session.sessionId : 'unbound'}`)
   if (status.server !== undefined) lines.push(`- server · ${status.server}`)

package/lib/tui-commands.js

@@ -75,7 +75,7 @@ function validateInput(input) {
         throw new Error('tuiCommands.register: each input option must be an object')
       }
       const unknown = Object.keys(option)
-        .filter((key) => !['value', 'label', 'description'].includes(key))
+        .filter((key) => !['value', 'label', 'description', 'disabled'].includes(key))
       if (unknown.length > 0) {
         throw new Error(`tuiCommands.register: unknown input option field(s) ${unknown.join(', ')}`)
       }
@@ -90,6 +90,7 @@ function validateInput(input) {
       }
       return {
         value: option.value,
+        ...(option.disabled === undefined ? {} : { disabled: booleanOption(option.disabled) }),
         ...(option.label === undefined ? {} : { label: option.label }),
         ...(option.description === undefined ? {} : { description: option.description }),
       }
@@ -98,6 +99,11 @@ function validateInput(input) {
   return normalized
 }
 
+function booleanOption(value) {
+  if (typeof value !== 'boolean') throw new Error('tuiCommands.register: input option disabled must be a boolean')
+  return value
+}
+
 /**
  * @param {object} ctx
  * @param {{ notify?: (method: string, params: object) => void }} [options]

package/lib/tui-overlay.js

@@ -151,17 +151,31 @@ function validateSelect(input) {
     if (option.description !== undefined && typeof option.description !== 'string') {
       throw new Error(`tuiOverlay.openSelect: options[${index}].description must be a string`)
     }
+    if (option.disabled !== undefined && typeof option.disabled !== 'boolean') {
+      throw new Error(`tuiOverlay.openSelect: options[${index}].disabled must be a boolean`)
+    }
+    if (option.deletable !== undefined && typeof option.deletable !== 'boolean') {
+      throw new Error(`tuiOverlay.openSelect: options[${index}].deletable must be a boolean`)
+    }
+    if (option.group !== undefined && (typeof option.group !== 'string'
+      || option.group.trim().length === 0 || /[\x00-\x1f\x7f-\x9f\u2028\u2029]/.test(option.group))) {
+      throw new Error(`tuiOverlay.openSelect: options[${index}].group must be a non-empty single-line string`)
+    }
     return {
       value: option.value,
       label: option.label,
+      ...(option.disabled === undefined ? {} : { disabled: option.disabled }),
+      ...(option.deletable === undefined ? {} : { deletable: option.deletable }),
       ...(option.description === undefined ? {} : { description: option.description }),
+      ...(option.group === undefined ? {} : { group: option.group }),
     }
   })
   const value = input.value === undefined ? options[0].value : input.value
   if (typeof value !== 'string' || !values.has(value)) {
     throw new Error('tuiOverlay.openSelect: value must match one option')
   }
-  return { kind: 'select', id: input.id, title: input.title, value, options }
+  return { kind: 'select', id: input.id, title: input.title, value, options,
+    ...(input.searchable === true ? { searchable: true } : {}) }
 }
 
 /**
@@ -213,10 +227,15 @@ export function installTuiOverlay(ctx, options = {}) {
   }
 
   function openSelect(options, handlers = {}) {
+    const select = validateSelect(options)
     if (current !== null) {
-      throw new Error(`tuiOverlay.openSelect: overlay "${current.overlay.id}" is already open`)
+      if (current.overlay.kind !== 'select' || current.overlay.id !== select.id) {
+        throw new Error(`tuiOverlay.openSelect: overlay "${current.overlay.id}" is already open`)
+      }
+      // A background catalog refresh replaces only this modal's snapshot.
+      // Retire its old handles so an earlier async callback cannot close it.
+      current.closed = true
     }
-    const select = validateSelect(options)
     const entry = { overlay: select, handlers, closed: false }
     current = entry
     publish(structuredClone(select))
@@ -265,7 +284,7 @@ export function installTuiOverlay(ctx, options = {}) {
     }
 
     if (entry.overlay.kind === 'select') {
-      if (!['change', 'submit', 'cancel'].includes(params.event)) {
+      if (!['change', 'submit', 'cancel', 'delete'].includes(params.event)) {
         throw new Error(`tuiOverlay.dispatch: unknown select event "${String(params.event)}"`)
       }
       if (params.event !== 'cancel') {
@@ -273,6 +292,9 @@ export function installTuiOverlay(ctx, options = {}) {
           || !entry.overlay.options.some((option) => option.value === params.value)) {
           throw new Error('tuiOverlay.dispatch: select value is not an option')
         }
+        if (entry.overlay.options.find((option) => option.value === params.value)?.disabled) return
+        if (params.event === 'delete' && (!entry.overlay.options.find(option => option.value === params.value)?.deletable
+          || typeof entry.handlers.onDelete !== 'function')) return
         entry.overlay.value = params.value
       }
       if (params.event === 'change') {
@@ -280,7 +302,7 @@ export function installTuiOverlay(ctx, options = {}) {
       }
       const handler = params.event === 'submit'
         ? entry.handlers.onSubmit
-        : entry.handlers.onCancel
+        : params.event === 'delete' ? entry.handlers.onDelete : entry.handlers.onCancel
       entry.closed = true
       if (current === entry) {
         current = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "martty",
-  "version": "0.2.33",
+  "version": "0.2.35",
   "description": "Terminal-native ACP client UI; Cordis client tree, any ACP agent",
   "license": "MIT",
   "repository": {
@@ -14,8 +14,9 @@
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "pretest": "node --test ../scripts/workflow-release.test.mjs ../scripts/package-alias.test.mjs",
-    "test": "node --test ../scripts/package-native.test.mjs ../scripts/check-release-tag.test.mjs ../scripts/check-static-elf.test.mjs ../scripts/smoke-old-linux.test.mjs ../scripts/cargo-guard.test.mjs ../scripts/build-npm.test.mjs ../scripts/client-profile.test.mjs ../scripts/plugin-runner.test.mjs ../scripts/profile-link-resolution.test.mjs ../scripts/packaged-acp-permission.test.mjs ../scripts/profile-smoke-tui.test.mjs ../scripts/release.test.mjs ../scripts/jsonrpc-line-transport.test.mjs ../scripts/tui-theme.test.mjs ../scripts/tui-presets.test.mjs ../scripts/tui-plugin-store.test.mjs ../scripts/tui-local-plugins.test.mjs ../scripts/tui-client-plugin-registry.test.mjs ../scripts/tui-slots.test.mjs ../scripts/tui-commands.test.mjs ../scripts/tui-overlay.test.mjs ../scripts/tui-agents.test.mjs ../scripts/tui-queue.test.mjs ../scripts/mux.test.mjs ../scripts/acp-client.test.mjs ../scripts/harnesses.test.mjs ../scripts/harness-view.test.mjs ../scripts/acp-client-events.test.mjs ../scripts/acp-session-config.test.mjs ../scripts/acp-session-plan.test.mjs ../scripts/acp-session-stats.test.mjs ../scripts/acp-session-status.test.mjs ../scripts/agents-view.test.mjs ../scripts/plan-view.test.mjs ../scripts/queue-view.test.mjs ../scripts/stats-view.test.mjs ../scripts/status-view.test.mjs ../scripts/deepseek-logo.test.mjs ../scripts/runner.test.mjs ../scripts/inspect.test.mjs ../scripts/creator-overlay.test.mjs ../scripts/real-agent-e2e.test.mjs",
+    "test:harness-ui": "node --test ../scripts/harness-management-tui.test.mjs",
+    "pretest": "node --test ../scripts/workflow-release.test.mjs ../scripts/package-alias.test.mjs ../scripts/harness-removal.test.mjs",
+    "test": "node --test ../scripts/download.test.mjs ../scripts/package-native.test.mjs ../scripts/check-release-tag.test.mjs ../scripts/check-static-elf.test.mjs ../scripts/smoke-old-linux.test.mjs ../scripts/cargo-guard.test.mjs ../scripts/build-npm.test.mjs ../scripts/client-profile.test.mjs ../scripts/plugin-runner.test.mjs ../scripts/profile-link-resolution.test.mjs ../scripts/packaged-acp-permission.test.mjs ../scripts/profile-smoke-tui.test.mjs ../scripts/release.test.mjs ../scripts/jsonrpc-line-transport.test.mjs ../scripts/tui-theme.test.mjs ../scripts/tui-presets.test.mjs ../scripts/tui-plugin-store.test.mjs ../scripts/tui-local-plugins.test.mjs ../scripts/tui-client-plugin-registry.test.mjs ../scripts/tui-slots.test.mjs ../scripts/tui-commands.test.mjs ../scripts/tui-overlay.test.mjs ../scripts/tui-agents.test.mjs ../scripts/tui-queue.test.mjs ../scripts/mux.test.mjs ../scripts/acp-client.test.mjs ../scripts/harnesses.test.mjs ../scripts/harness-discovery.test.mjs ../scripts/harness-discovery-scenario.test.mjs ../scripts/harness-view.test.mjs ../scripts/harness-onboarding.test.mjs ../scripts/harness-registry.test.mjs ../scripts/harness-package.test.mjs ../scripts/acp-client-events.test.mjs ../scripts/acp-session-config.test.mjs ../scripts/acp-session-plan.test.mjs ../scripts/acp-session-stats.test.mjs ../scripts/acp-session-status.test.mjs ../scripts/agents-view.test.mjs ../scripts/plan-view.test.mjs ../scripts/queue-view.test.mjs ../scripts/stats-view.test.mjs ../scripts/status-view.test.mjs ../scripts/deepseek-logo.test.mjs ../scripts/runner.test.mjs ../scripts/inspect.test.mjs ../scripts/creator-overlay.test.mjs ../scripts/real-agent-e2e.test.mjs",
     "test:profile-install-matrix": "node --test ../scripts/profile-install-matrix.test.mjs"
   },
   "publishConfig": {
@@ -75,7 +76,9 @@
   },
   "dependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@openma/deepseek-harness-acp": "0.4.27"
+    "@openma/deepseek-harness-acp": "0.4.29",
+    "cross-spawn": "^7.0.6",
+    "node-downloader-helper": "2.1.11"
   },
   "devDependencies": {
     "@deepseek-ai/dsh": "0.1.1-rc.2"