martty 0.2.39-beta.0 → 0.2.39

package/lib/acp-client.js

@@ -8,6 +8,7 @@
  */
 
 import spawn from 'cross-spawn'
+import { harnessEnvironment } from './harness-environment.js'
 import { installAcpClientEvents } from './acp-client-events.js'
 import { installAcpSessionConfig } from './acp-session-config.js'
 import { installAcpSessionPlan } from './acp-session-plan.js'
@@ -115,7 +116,7 @@ export function apply(ctx, config = {}) {
 function spawnAgent(agent) {
   const child = spawn(agent.command, agent.args ?? [], {
     stdio: ['pipe', 'pipe', 'pipe'],
-    env: { ...process.env, ...(agent.env ?? {}) },
+    env: harnessEnvironment(agent.env),
   })
   child.stdin.on('error', () => {})
   child.stdout.on('error', () => {})

package/lib/acp-session-status.js

@@ -252,6 +252,7 @@ export function installAcpSessionStatus(ctx, options = {}) {
             let facts = connections.get(owner.id)
             if (!facts) {
               facts = { connection: 'attached', server: owner.agentInfo?.name,
+                runtime: { command: owner.command, args: owner.args ?? [] },
                 auth: { status: owner.authMethods?.length ? 'configured' : undefined, method: undefined } }
               connections.set(owner.id, facts)
             }

package/lib/boot.js

@@ -1,3 +1,4 @@
+import { apply as applyHarnessBadge, inject as harnessBadgeInject } from './harness-badge.js'
 /**
  * Boot-time restore of a statically-registered gallery palette (ayu,
  * iceberg, …). `/theme` persistence writes `settings.theme`; dynamic
@@ -142,6 +143,7 @@ export async function bootClient(options = {}) {
     await ctx.plugin({ name: 'stats-view', inject: statsViewInject, apply: applyStatsView })
     await ctx.plugin({ name: 'acp-session-status', inject: sessionStatusInject, apply: applySessionStatus })
     await ctx.plugin({ name: 'status-view', inject: statusViewInject, apply: applyStatusView })
+    await ctx.plugin({ name: 'harness-badge', inject: harnessBadgeInject, apply: applyHarnessBadge }, harnessConfig)
     await ctx.plugin({ name: 'harness-view', inject: harnessViewInject, apply: applyHarnessView }, harnessConfig)
     await ctx.plugin({ name: 'deepseek-logo', inject: deepseekLogoInject, apply: applyDeepseekLogo })
     const localPlugins = installTuiLocalPlugins(ctx, {
@@ -203,6 +205,7 @@ export async function bootClient(options = {}) {
     applyStatsView(ctx)
     applySessionStatus(ctx)
     applyStatusView(ctx)
+    applyHarnessBadge(ctx, harnessConfig)
     applyHarnessView(ctx, harnessConfig)
     applyDeepseekLogo(ctx)
     const localPlugins = installTuiLocalPlugins(ctx, {

package/lib/harness-badge.js

@@ -0,0 +1,137 @@
+/** Registry-owned Harness marks. Only the Rust painter touches the terminal. */
+import { createHash, randomUUID } from 'node:crypto'
+import { promises as fs } from 'node:fs'
+import path from 'node:path'
+import { createRequire } from 'node:module'
+import { readAcpRegistrySnapshot } from './harness-registry.js'
+import { discoverHarnesses } from './harnesses.js'
+
+export const name = 'harness-badge'
+export const inject = ['acpSessionStatus', 'tuiSlots']
+// ACP Registry does not list DeepSeek yet. Use Lobe's MIT-licensed mark,
+// supplied by the installed SVG library. Registry always takes priority.
+const deepseekBadge = {
+  label: 'DeepSeek',
+  icon: 'lobe:deepseek',
+}
+const require = createRequire(import.meta.url)
+const MAX_BYTES = 512 * 1024
+const png = bytes => bytes.length <= MAX_BYTES && bytes.subarray(0, 8).equals(Buffer.from([137,80,78,71,13,10,26,10]))
+
+export function createIconCache(options = {}) {
+  const pending = new Map()
+  return function load(url) {
+    if (typeof url !== 'string' || (url !== 'lobe:deepseek' && !url.startsWith('https://'))) return Promise.resolve(undefined)
+    if (pending.has(url)) return pending.get(url)
+    const promise = (async () => {
+      const local = url === 'lobe:deepseek'
+      const version = local ? require('@lobehub/icons-static-svg/package.json').version : ''
+      const key = createHash('sha256').update(local ? `${url}@${version}` : url).digest('hex')
+      const file = options.settingsPath && path.join(path.dirname(options.settingsPath), 'cache', 'harness-icons', `${key}.png`)
+      if (file) {
+        try {
+          if ((await fs.stat(file)).size <= MAX_BYTES) {
+            const cached = await fs.readFile(file)
+            if (png(cached)) return cached.toString('base64')
+          }
+        } catch { /* Missing cache: fetch below. */ }
+      }
+      let source
+      if (local) {
+        source = await fs.readFile(require.resolve('@lobehub/icons-static-svg/icons/deepseek.svg'))
+        if (source.length > MAX_BYTES) throw new Error('Icon too large')
+      } else {
+        const response = await (options.fetchImpl ?? fetch)(url, { signal: AbortSignal.timeout(5000) })
+        if (!response.ok) throw new Error('Icon unavailable')
+        if (Number(response.headers.get('content-length')) > MAX_BYTES) throw new Error('Icon too large')
+        const chunks = []
+        let size = 0
+        for await (const chunk of response.body) {
+          size += chunk.length
+          if (size > MAX_BYTES) throw new Error('Icon too large')
+          chunks.push(chunk)
+        }
+        source = Buffer.concat(chunks)
+      }
+      // Lazy import: an unavailable optional native renderer still leaves the name usable.
+      const { Resvg } = await import('@resvg/resvg-js')
+      let bytes
+      if (png(source)) {
+        bytes = source
+      } else {
+        const renderer = new Resvg(source.toString('utf8').replaceAll('currentColor', '#a0a0a0'), {
+          fitTo: { mode: 'width', value: 64 }, font: { loadSystemFonts: false },
+        })
+        if (renderer.width <= 0 || renderer.height <= 0 || renderer.height / renderer.width > 4) throw new Error('Invalid icon dimensions')
+        bytes = renderer.render().asPng()
+      }
+      if (!png(bytes)) throw new Error('Invalid icon')
+      if (file) {
+        const temporary = `${file}.${randomUUID()}.tmp`
+        try {
+          await fs.mkdir(path.dirname(file), { recursive: true })
+          await fs.writeFile(temporary, bytes)
+          await fs.rename(temporary, file)
+        } catch { /* A read-only cache must not hide a downloaded icon. */ }
+        finally { await fs.rm(temporary, { force: true }).catch(() => {}) }
+      }
+      return bytes.toString('base64')
+    })().catch(() => undefined)
+    pending.set(url, promise)
+    return promise
+  }
+}
+
+function packageName(spec) {
+  if (typeof spec !== 'string') return undefined
+  return /^(?:(@[^/\s]+\/[^@/\s]+)|([^@/\s:]+))(?:@[^\s]+)?$/.exec(spec)?.slice(1).find(Boolean)
+}
+
+function runtimePackage(runtime) {
+  if (!runtime || !/(?:^|[/\\])npx(?:\.cmd|\.exe)?$/i.test(runtime.command ?? '')) return undefined
+  const args = runtime.args ?? []
+  const explicit = args.findIndex(arg => arg === '--package' || arg === '-p')
+  return packageName(explicit >= 0 ? args[explicit + 1] : args.find(arg => !arg.startsWith('-')))
+}
+
+export function apply(ctx, options = {}) {
+  const loadIcon = options.loadIcon ?? createIconCache(options)
+  let panel, disposed = false, generation = 0, lastKey
+  let nodes = []
+  const stopSlot = ctx.tuiSlots.inject('conversation.harness', () => {
+    panel = ctx.tuiSlots.register({ name: 'conversation.harness', id: 'harness' }, nodes)
+    return () => panel.dispose()
+  })
+  function update(status) {
+    const session = status.session?.bound ? status.session.sessionId : undefined
+    const key = JSON.stringify([session, status.server, status.runtime])
+    if (key === lastKey) return
+    lastKey = key
+    const token = ++generation
+    if (!session) { nodes = []; panel?.update(nodes); return }
+    const registry = options.registry ?? readAcpRegistrySnapshot(options)
+    const runtime = status.runtime
+    const entries = options.entries ?? discoverHarnesses(options.settingsPath, { ...options, registry, pathValue: '' })
+    const entry = runtime && entries.find(candidate => candidate.command === runtime.command
+      && JSON.stringify(candidate.args ?? []) === JSON.stringify(runtime.args ?? []))
+    const npmPackage = runtimePackage(runtime) ?? packageName(status.server)
+    const record = registry.find(candidate => candidate.id === entry?.id)
+      ?? registry.find(candidate => candidate.id === status.server || candidate.label === status.server)
+      ?? (npmPackage && registry.find(candidate => candidate.distributions?.some(distribution =>
+        distribution.type === 'npx' && packageName(distribution.args?.[0]) === npmPackage)))
+      ?? (['dsh-acp', '@deepseek-ai/dsh-acp', '@openma/deepseek-harness-acp'].includes(status.server)
+        || ['@deepseek-ai/dsh-acp', '@openma/deepseek-harness-acp'].includes(npmPackage)
+        ? deepseekBadge : undefined)
+    const label = (record?.label ?? entry?.label ?? status.server ?? runtime?.command)?.replace(/\s+harness$/i, '')
+    nodes = label ? [{ id: session, kind: 'image', name: label, mime: 'image/png' }] : []
+    panel?.update(nodes)
+    if (record?.icon && nodes.length) void loadIcon(record.icon).then(dataBase64 => {
+      if (disposed || token !== generation || !dataBase64) return
+      nodes = [{ ...nodes[0], dataBase64 }]
+      panel?.update(nodes)
+    })
+  }
+  update(ctx.acpSessionStatus.current())
+  const stopStatus = ctx.acpSessionStatus.subscribe(update)
+  return () => { disposed = true; ++generation; stopStatus?.(); stopSlot?.() }
+}

package/lib/harness-environment.js

@@ -0,0 +1,9 @@
+/** npm exec exports its invocation selectors to children. They belong to Martty's
+ * launcher, not a nested Harness runner (npx otherwise treats a package as a bin).
+ * Keep registry/proxy/cache/auth settings and explicit Harness overrides intact.
+ */
+export function harnessEnvironment(overrides = {}, inherited = process.env) {
+  const env = Object.fromEntries(Object.entries(inherited).filter(([key]) =>
+    !/^npm_config_(package|call|workspace|workspaces|include_workspace_root)$/i.test(key)))
+  return { ...env, ...overrides }
+}

package/lib/harness-package.js

@@ -1,3 +1,4 @@
+import { harnessEnvironment } from './harness-environment.js'
 import { StringDecoder } from 'node:string_decoder'
 import spawn from 'cross-spawn'
 
@@ -155,7 +156,7 @@ export async function prepareHarnessPackage(entry, options = {}) {
     try {
       child = (options.spawnImpl ?? spawn)(runner, args, {
         cwd: options.cwd,
-        env: { ...process.env, ...distribution.env, ...entry.env, ...options.env },
+        env: harnessEnvironment({ ...distribution.env, ...entry.env, ...options.env }),
         stdio: ['ignore', 'pipe', 'pipe'],
         windowsHide: true,
         detached: process.platform !== 'win32',

package/lib/harness-registry.js

@@ -128,6 +128,7 @@ export function normalizeAcpRegistry(value, options = {}) {
     return [{
       id: agent.id,
       label: agent.name,
+      ...(typeof agent.icon === 'string' ? { icon: agent.icon } : {}),
       version: agent.version,
       description: typeof agent.description === 'string' ? agent.description : '',
       distributions,

package/lib/harness-view.js

@@ -238,7 +238,8 @@ export function apply(ctx, options = {}) {
       notifyDownloads()
     }
     const newSession = () => ({ action: 'new-session' })
-    if (openNow && !options.hostOwned) return newSession()
+    const emptySession = ctx.acpSessionStatus?.current()?.session?.started === false
+    if (!options.hostOwned && (openNow || emptySession)) return newSession()
     openView({ id: 'harness-saved', title: 'Default Harness saved', nodes: [{
       id: 'notice', kind: 'notice', level: 'info',
       text: options.hostOwned

package/lib/lobe-icons.LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 LobeHub
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/tui-slots.js

@@ -16,9 +16,11 @@ export const SLOT_NAMES = Object.freeze([
   'conversation.input.dock',
   'conversation.navigation.dock',
   'conversation.composer.dock',
+  'conversation.harness',
 ])
 
 const SLOT_DEFINITIONS = Object.freeze({
+  'conversation.harness': Object.freeze({ kind: 'single', scope: 'session' }),
   'welcome.hero': Object.freeze({ kind: 'single', scope: 'root' }),
   'welcome.info': Object.freeze({ kind: 'single', scope: 'root' }),
   'chrome.right': Object.freeze({ kind: 'list', scope: 'root' }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "martty",
-  "version": "0.2.39-beta.0",
+  "version": "0.2.39",
   "description": "Terminal-native ACP client UI; Cordis client tree, any ACP agent",
   "license": "MIT",
   "repository": {
@@ -16,7 +16,7 @@
   "scripts": {
     "test:harness-ui": "node --test ../scripts/harness-management-tui.test.mjs ../scripts/harness-session-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/acp-agent-pool.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": "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/acp-agent-pool.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-badge.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": {
@@ -76,7 +76,9 @@
   },
   "dependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
+    "@lobehub/icons-static-svg": "1.95.0",
     "@openma/deepseek-harness-acp": "0.4.31",
+    "@resvg/resvg-js": "2.6.2",
     "cross-spawn": "^7.0.6",
     "node-downloader-helper": "2.1.11"
   },