martty 0.2.29 → 0.2.31

package/README.md

@@ -64,7 +64,26 @@ profiles remain compatible.
 The profile Host mounts the ACP plugin on Base, then starts a separate TUI
 Client process over standard ACP stdin/stdout. For standalone use, run
 `martty` and use `--agent <cmd>` plus repeated `--agent-arg <arg>` for another
-ACP server. The Node Client process owns a Cordis tree and starts the Rust painter. A sibling
+ACP server. Named standalone harnesses can also be discovered, saved, and selected:
+
+```sh
+martty harness list
+martty harness add local --command local-acp --arg --stdio
+martty harness use local
+```
+
+The same registry is available through three entry points: edit
+`$MARTTY_HOME/settings.json`, use `martty harness`, or run `/harness` (or
+`/harness <id>`) inside the TUI. A saved choice takes effect on the next
+standalone launch, which starts a fresh ACP session. It does not replace a
+running or profile-owned Host, and it never carries a session across Harnesses.
+
+The selected entry is stored in `$MARTTY_HOME/settings.json` and takes effect
+on the next standalone launch through a new `session/new`. `--agent` and
+`DSH_TUI_AGENT` remain higher priority. This does not replace the Host-owned
+runtime or session of `dsh --profile martty`.
+
+The Node Client process owns a Cordis tree and starts the Rust painter. A sibling
 `tui-cordis-client-runner` publishes TUI Client capabilities and evaluates
 approved `code.client` packages from `dsh-tool-cordis` against that client tree.
 

package/bin/martty.js

@@ -4,7 +4,9 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { spawnSync } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
-import { bootClient, parseClientArgv, painterArgs } from '../lib/boot.js'
+import { resolveDependencyStack } from '../lib/agent.js'
+import { bootClient, parseClientArgv, painterArgs, uiSettingsPath } from '../lib/boot.js'
+import { runHarnessCommand } from '../lib/harnesses.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const platformKey = process.platform + '-' + process.arch
@@ -24,6 +26,33 @@ const wantDemo = argv.includes('--demo')
 const wantHelp = argv.includes('-h') || argv.includes('--help')
 const wantVersion = argv.includes('-V') || argv.includes('--version')
 
+if (argv[0] === 'harness') {
+  let defaults = []
+  try {
+    const agent = resolveDependencyStack()
+    defaults = [{
+      id: 'builtin-dsh',
+      label: 'Bundled DeepSeek Harness',
+      ...agent,
+      source: 'builtin',
+    }]
+  } catch {
+    // Source checkouts without installed dependencies still list PATH entries.
+  }
+  try {
+    const result = runHarnessCommand(argv.slice(1), {
+      settingsPath: uiSettingsPath(),
+      defaults,
+    })
+    if (result.stdout) process.stdout.write(result.stdout)
+    if (result.stderr) process.stderr.write(result.stderr)
+    process.exit(result.code)
+  } catch (error) {
+    console.error(`martty harness: ${error instanceof Error ? error.message : String(error)}`)
+    process.exit(1)
+  }
+}
+
 if (!fs.existsSync(binaryPath)) {
   let available = []
   try {

package/lib/acp-session-stats.js

@@ -25,6 +25,7 @@ function zero(sessionId) {
     usage: {
       input: 0, output: 0, cached: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0,
     },
+    context: { used: 0, size: 0 },
     stats: {
       turns: 0,
       steps: 0,
@@ -137,6 +138,19 @@ export function installAcpSessionStats(ctx, options = {}) {
     }
 
     const type = readString(update, 'sessionUpdate', 'session_update')
+    if (type === 'usage_update') {
+      // Harness-authoritative context gauge: `used` is the final prompt
+      // size (input + cache + output) of the last step and `size` the
+      // real model window from `request/context`. Client-side
+      // accumulation cannot derive either: per-prompt input sums every
+      // step's full context, and standard ACP does not carry the window.
+      const size = number(update.size)
+      if (size > 0) {
+        value.context = { used: number(update.used), size }
+        publish()
+      }
+      return
+    }
     const prompt = sessionId === undefined ? undefined : activePrompts.get(sessionId)
     if (prompt !== undefined && prompt.firstToken === undefined
       && (type === 'agent_message_chunk' || type === 'agent_thought_chunk')

package/lib/acp-session-status.js

@@ -16,9 +16,15 @@ export const inject = ['acpClientEvents', 'acpSessionConfig']
 const AUTH_REQUIRED_CODE = -32000
 const SETUP_METHODS = new Set(['session/new', 'session/load'])
 const RUNNING_UPDATE_TYPES = new Set([
+  'user_message_chunk',
   'agent_message_chunk',
   'agent_thought_chunk',
   'tool_call',
+  'tool_call_update',
+  'plan',
+  'plan_update',
+  'plan_removed',
+  'usage_update',
 ])
 
 class AcpSessionStatusService extends Service {
@@ -58,6 +64,7 @@ export function installAcpSessionStatus(ctx, options = {}) {
   let initializeId
   let pendingAuthenticate = new Set()
   const pendingSetup = new Map()
+  const pendingPrompts = new Map()
   let permissionPreset
   let sandboxMode
 
@@ -108,9 +115,15 @@ export function installAcpSessionStatus(ctx, options = {}) {
       )
       return
     }
-    if (message.method === 'session/prompt' && value.state === 'idle') {
-      value.state = 'starting'
-      publish()
+    if (message.method === 'session/prompt' && message.id !== undefined) {
+      pendingPrompts.set(
+        message.id,
+        readString(message.params, 'sessionId', 'session_id'),
+      )
+      if (value.state === 'idle') {
+        value.state = 'starting'
+        publish()
+      }
     }
   }
 
@@ -155,6 +168,21 @@ export function installAcpSessionStatus(ctx, options = {}) {
       publish()
       return
     }
+    if (response(message) && pendingPrompts.has(message.id)) {
+      pendingPrompts.delete(message.id)
+      let changed = false
+      if (message.error !== undefined && isAuthRequired(message.error)
+        && value.auth.status !== 'needs sign-in') {
+        value.auth.status = 'needs sign-in'
+        changed = true
+      }
+      if (pendingPrompts.size === 0 && value.state !== 'idle') {
+        value.state = 'idle'
+        changed = true
+      }
+      if (changed) publish()
+      return
+    }
     if (message.error !== undefined && isAuthRequired(message.error)) {
       value.auth.status = 'needs sign-in'
       publish()
@@ -163,7 +191,7 @@ export function installAcpSessionStatus(ctx, options = {}) {
 
     if (message.method === 'session.status' && object(message.params)) {
       const status = readString(message.params, 'status')
-      if (status === 'running' || status === 'idle') {
+      if (status === 'running' || (status === 'idle' && pendingPrompts.size === 0)) {
         value.state = status
         publish()
       }
@@ -200,14 +228,24 @@ export function installAcpSessionStatus(ctx, options = {}) {
       return
     }
     if (message.method !== 'session/update' || !object(message.params)) return
+    const sessionId = readString(message.params, 'sessionId', 'session_id')
     const update = object(message.params.update) ? message.params.update : undefined
     const type = readString(update, 'sessionUpdate', 'session_update')
-    if (value.state === 'starting' && RUNNING_UPDATE_TYPES.has(type)) {
+    if (value.state !== 'running' && hasPendingPrompt(sessionId)
+      && RUNNING_UPDATE_TYPES.has(type)) {
       value.state = 'running'
       publish()
     }
   }
 
+  function hasPendingPrompt(sessionId) {
+    if (sessionId === undefined) return false
+    for (const pendingSessionId of pendingPrompts.values()) {
+      if (pendingSessionId === sessionId) return true
+    }
+    return false
+  }
+
   function onConfigSnapshot(snapshot) {
     if (snapshot === null || typeof snapshot !== 'object') return
     if (typeof snapshot.sessionId === 'string' && snapshot.sessionId.length > 0
@@ -271,6 +309,11 @@ function object(value) {
   return value !== null && typeof value === 'object' && !Array.isArray(value)
 }
 
+function response(message) {
+  return !Object.hasOwn(message, 'method')
+    && (Object.hasOwn(message, 'result') || Object.hasOwn(message, 'error'))
+}
+
 export function apply(ctx, options = {}) {
   installAcpSessionStatus(ctx, options)
 }

package/lib/agent.js

@@ -5,6 +5,7 @@ import { createRequire } from 'node:module'
 import { homedir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { selectedHarness } from './harnesses.js'
 
 /**
  * Resolve the ACP package and TUI's internal Creator overlay bundle.
@@ -31,14 +32,21 @@ export function resolveDependencyStack(anchor = import.meta.url) {
 /**
  * Resolve the standalone ACP command without affecting the profile path.
  * @param {string | URL} [anchor]
+ * @param {{ settingsPath?: string }} [options]
  * @returns {{ command: string, args: string[] }}
  */
-export function resolveStackedAgent(anchor = import.meta.url) {
+export function resolveStackedAgent(anchor = import.meta.url, options = {}) {
   const envCmd = process.env.DSH_TUI_AGENT
   if (typeof envCmd === 'string' && envCmd.trim().length > 0) {
     const tokens = envCmd.trim().split(/\s+/)
     return { command: tokens[0], args: tokens.slice(1) }
   }
+  if (typeof options.settingsPath === 'string') {
+    const selected = selectedHarness(options.settingsPath)
+    if (selected !== undefined) {
+      return { command: selected.command, args: selected.args }
+    }
+  }
   try {
     return resolveDependencyStack(anchor)
   } catch {

package/lib/agents-view.js

@@ -5,29 +5,49 @@ export const inject = ['tuiAgents', 'tuiSlots', 'tuiCommands']
 
 export function apply(ctx) {
   let current = ctx.tuiAgents.current()
+  // Issue #80: `/agents` is an on/off switch for the panel. `visible` is
+  // the user preference; `forced` remembers `/agents on` so the summary
+  // stays open even after every task ended, until the next batch starts.
+  let visible = true
+  let forced = false
   let panel
 
   const stopSlot = ctx.tuiSlots.inject('conversation.navigation.dock', () => {
     panel = ctx.tuiSlots.register(
       { name: 'conversation.navigation.dock', id: 'agents-view', order: 0 },
-      dockNodes(current),
+      dockNodes(current, visible, forced),
     )
     return () => panel.dispose()
   })
   const stopAgents = ctx.tuiAgents.subscribe((snapshot) => {
     current = snapshot
-    panel?.update(dockNodes(current))
+    // A new running batch clears the forced-open state so the panel
+    // auto-closes again once this batch ends.
+    if (snapshot.items.some((item) => item.kind === 'subagent' && item.status === 'running')) {
+      forced = false
+    }
+    panel?.update(dockNodes(current, visible, forced))
   })
   const stopCommand = ctx.tuiCommands.register({
     name: 'agents',
-    description: 'Switch the visible Agent transcript',
+    description: 'Toggle the Agent panel (on/off)',
+    input: { hint: '[on|off|agent-id]' },
   }, async (args) => {
-    current = ctx.tuiAgents.current()
-    const target = args.trim()
-    if (target.length > 0) {
-      return ctx.tuiAgents.select(target)
+    const arg = args.trim().toLowerCase()
+    if (arg === 'on') {
+      visible = true
+      forced = true
+    } else if (arg === 'off') {
+      visible = false
+      forced = false
+    } else if (arg === '') {
+      visible = !visible
+      forced = visible
+    } else {
+      return ctx.tuiAgents.select(args.trim())
     }
-    return ctx.tuiAgents.navigate('begin')
+    panel?.update(dockNodes(current, visible, forced))
+    return true
   })
 
   return () => {
@@ -37,9 +57,10 @@ export function apply(ctx) {
   }
 }
 
-function dockNodes(snapshot) {
+function dockNodes(snapshot, visible = true, forced = false) {
   if (!Array.isArray(snapshot?.items) || snapshot.items.length < 2) return []
   const selecting = snapshot.selectedId !== null && snapshot.selectedId !== undefined
+  if (!visible && !selecting) return []
   if (!selecting) {
     const agents = snapshot.items.filter((item) => item.kind === 'subagent')
     const marked = agents.filter((item) => item.current !== false)
@@ -47,6 +68,10 @@ function dockNodes(snapshot) {
     const completed = current.filter((item) => item.status === 'finished' || item.status === 'failed').length
     const running = current.some((item) => item.status === 'running')
     const failed = current.some((item) => item.status === 'failed')
+    // Issue #80: auto-close once every Agent task has ended. A failed task
+    // keeps the summary so the failure stays visible; `/agents on` (forced)
+    // holds it open until the next batch starts running.
+    if (!running && !failed && !forced) return []
     return [
       {
         id: 'summary', kind: 'generic', title: '· Agents', body: `${completed}/${current.length}`,

package/lib/boot.js

@@ -33,7 +33,7 @@ import { homedir } from 'node:os'
 import path from 'node:path'
 import { apply as applyCordisClientRunner } from './inspect.js'
 import { apply as applyShell } from './index.js'
-import { resolveStackedAgent } from './agent.js'
+import { resolveDependencyStack, resolveStackedAgent } from './agent.js'
 import { apply as applySlots } from './tui-slots.js'
 import { apply as applyTheme } from './tui-theme.js'
 import { apply as applyAyu, inject as ayuInject } from './ayu.js'
@@ -42,6 +42,8 @@ import { apply as applyKanagawa, inject as kanagawaInject } from './kanagawa.js'
 import { apply as applyEverforest, inject as everforestInject } from './everforest.js'
 import { apply as applyIceberg, inject as icebergInject } from './iceberg.js'
 import { apply as applySolarized, inject as solarizedInject } from './solarized.js'
+import { apply as applyOne, inject as oneInject } from './one.js'
+import { apply as applyTomorrow, inject as tomorrowInject } from './tomorrow.js'
 import { apply as applyCommands } from './tui-commands.js'
 import { apply as applyOverlay } from './tui-overlay.js'
 import { apply as applyAgents } from './tui-agents.js'
@@ -54,6 +56,7 @@ import { apply as applyQueueView, inject as queueViewInject } from './queue-view
 import { apply as applyStatsView, inject as statsViewInject } from './stats-view.js'
 import { apply as applySessionStatus, inject as sessionStatusInject } from './acp-session-status.js'
 import { apply as applyStatusView, inject as statusViewInject } from './status-view.js'
+import { apply as applyHarnessView, inject as harnessViewInject } from './harness-view.js'
 import { apply as applyDeepseekLogo, inject as deepseekLogoInject } from './deepseek-logo.js'
 import { createTuiPluginStore, marttyHome } from './tui-plugin-store.js'
 import { installTuiLocalPlugins } from './tui-local-plugins.js'
@@ -65,6 +68,8 @@ import { installTuiLocalPlugins } from './tui-local-plugins.js'
  * @param {{ stdin: number | 'inherit', stdout: number | 'inherit' }} [options.tty]
  * @param {string} [options.settingsPath]
  * @param {string} [options.artifactRoot]
+ * @param {Array<{ id: string, label: string, command: string, args?: string[], source?: string }>} [options.harnessDefaults]
+ * @param {string} [options.harnessPathValue]
  * @param {Array<{ id: string, kind: 'theme' | 'ui', entry: string }>} [options.packagePlugins]
  */
 export async function bootClient(options = {}) {
@@ -78,6 +83,25 @@ export async function bootClient(options = {}) {
     migrateLegacyUiSettings(settingsPath, legacyUiSettingsPaths(options.extraArgs ?? []))
   }
   const presetConfig = { settingsPath }
+  let harnessDefaults = options.harnessDefaults
+  if (harnessDefaults === undefined) {
+    try {
+      harnessDefaults = [{
+        id: 'builtin-dsh',
+        label: 'Bundled DeepSeek Harness',
+        ...resolveDependencyStack(),
+        source: 'builtin',
+      }]
+    } catch {
+      harnessDefaults = []
+    }
+  }
+  const harnessConfig = {
+    settingsPath,
+    defaults: harnessDefaults,
+    pathValue: options.harnessPathValue,
+    hostOwned: options.stream !== undefined,
+  }
   if (typeof ctx.plugin === 'function') {
     await ctx.plugin({ name: 'tui-theme', inject: [], apply: applyTheme }, presetConfig)
     await ctx.plugin({ name: 'tui-theme-ayu', inject: ayuInject, apply: applyAyu })
@@ -86,6 +110,8 @@ 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 })
+    await ctx.plugin({ name: 'tui-theme-one', inject: oneInject, apply: applyOne })
+    await ctx.plugin({ name: 'tui-theme-tomorrow', inject: tomorrowInject, apply: applyTomorrow })
     restorePreferredTheme(ctx.get('tuiTheme'))
     await ctx.plugin({ name: 'tui-slots', inject: [], apply: applySlots })
     await ctx.plugin({ name: 'tui-commands', inject: [], apply: applyCommands })
@@ -101,6 +127,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-view', inject: harnessViewInject, apply: applyHarnessView }, harnessConfig)
     await ctx.plugin({ name: 'deepseek-logo', inject: deepseekLogoInject, apply: applyDeepseekLogo })
     const localPlugins = installTuiLocalPlugins(ctx, {
       store: createTuiPluginStore({ root: options.artifactRoot }),
@@ -144,6 +171,8 @@ export async function bootClient(options = {}) {
     applyEverforest(ctx)
     applyIceberg(ctx)
     applySolarized(ctx)
+    applyOne(ctx)
+    applyTomorrow(ctx)
     restorePreferredTheme(ctx.tuiTheme)
     applySlots(ctx)
     applyCommands(ctx)
@@ -159,6 +188,7 @@ export async function bootClient(options = {}) {
     applyStatsView(ctx)
     applySessionStatus(ctx)
     applyStatusView(ctx)
+    applyHarnessView(ctx, harnessConfig)
     applyDeepseekLogo(ctx)
     const localPlugins = installTuiLocalPlugins(ctx, {
       store: createTuiPluginStore({ root: options.artifactRoot }),
@@ -265,9 +295,10 @@ export function migrateLegacyUiSettings(settingsPath, legacyPaths) {
  * `--agent` is also forwarded via {@link painterArgs} so Terminal Auth can
  * re-exec the same command.
  * @param {string[]} argv
+ * @param {{ settingsPath?: string }} [options]
  * @returns {{ agent: { command: string, args: string[] }, rustArgs: string[] }}
  */
-export function parseClientArgv(argv) {
+export function parseClientArgv(argv, options = {}) {
   const rustArgs = []
   let command
   const args = []
@@ -286,7 +317,11 @@ export function parseClientArgv(argv) {
     rustArgs.push(token)
   }
   if (command === undefined) {
-    return { agent: resolveStackedAgent(), rustArgs }
+    const settingsPath = options.settingsPath ?? uiSettingsPath(rustArgs)
+    return {
+      agent: resolveStackedAgent(import.meta.url, { settingsPath }),
+      rustArgs,
+    }
   }
   return { agent: { command, args }, rustArgs }
 }

package/lib/harness-view.js

@@ -0,0 +1,61 @@
+/** Built-in Client Plugin: configure the next standalone ACP harness. */
+
+import {
+  activateHarness,
+  discoverHarnesses,
+  selectedHarness,
+  upsertHarness,
+} from './harnesses.js'
+
+export const name = 'harness-view'
+export const inject = ['tuiCommands', 'tuiOverlay']
+
+function entryOptions(settingsPath, options) {
+  return discoverHarnesses(settingsPath, options).map((entry) => ({
+    value: entry.id,
+    label: entry.label,
+    description: `${entry.source} · ${[entry.command, ...entry.args]
+      .map((part) => /\s/.test(part) ? JSON.stringify(part) : part)
+      .join(' ')}`,
+  }))
+}
+
+export function apply(ctx, options = {}) {
+  const settingsPath = options.settingsPath
+  const choices = () => entryOptions(settingsPath, options)
+  const save = (id) => {
+    const entry = discoverHarnesses(settingsPath, options).find(({ id: candidate }) => candidate === id)
+    if (entry === undefined) throw new Error(`unknown harness ${JSON.stringify(id)}`)
+    upsertHarness(settingsPath, entry)
+    activateHarness(settingsPath, id)
+    ctx.tuiOverlay.openView({
+      id: 'harness-saved',
+      title: 'Harness saved',
+      nodes: [{
+        id: 'notice',
+        kind: 'notice',
+        level: 'info',
+        text: options.hostOwned
+          ? `${entry.label} is saved for a new standalone session. The current dsh profile and session remain Host-owned.`
+          : `${entry.label} will start in a new session after restarting standalone Martty.`,
+      }],
+    })
+  }
+  const command = ctx.tuiCommands.register({
+    name: 'harness',
+    description: 'Switch harness in a new session on the next standalone launch',
+    input: { hint: '[id]', options: choices() },
+  }, async (args) => {
+    const requested = args.trim()
+    if (requested.length > 0) return save(requested)
+    const entries = choices()
+    const selected = selectedHarness(settingsPath)?.id
+    ctx.tuiOverlay.openSelect({
+      id: 'harness',
+      title: 'Harness · next standalone session',
+      value: entries.some(({ value }) => value === selected) ? selected : entries[0].value,
+      options: entries,
+    }, { onSubmit: save })
+  })
+  return () => command?.()
+}

package/lib/harnesses.js

@@ -0,0 +1,199 @@
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  renameSync,
+  statSync,
+  writeFileSync,
+} from 'node:fs'
+import path from 'node:path'
+
+const HARNESS_ID = /^[a-z0-9][a-z0-9-]*$/
+const HARNESS_HELP = `martty harness — configure standalone ACP harnesses
+
+USAGE:
+  martty harness list
+  martty harness add <id> --command <cmd> [--label <label>] [--arg <arg>]...
+  martty harness use <id>
+
+list discovers executable *-acp and *_acp commands on PATH. The active harness
+is saved in $MARTTY_HOME/settings.json. The next standalone launch starts that
+harness with a new ACP session; sessions are never carried across harnesses.
+`
+
+function readSettings(settingsPath) {
+  if (!existsSync(settingsPath)) return {}
+  let value
+  try {
+    value = JSON.parse(readFileSync(settingsPath, 'utf8'))
+  } catch (error) {
+    throw new Error(`invalid Martty settings: ${error.message}`)
+  }
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+    throw new Error('invalid Martty settings: root must be an object')
+  }
+  return value
+}
+
+function writeSettings(settingsPath, value) {
+  mkdirSync(path.dirname(settingsPath), { recursive: true })
+  const temporary = `${settingsPath}.${process.pid}.${Date.now()}.tmp`
+  writeFileSync(temporary, `${JSON.stringify(value, null, 2)}\n`)
+  renameSync(temporary, settingsPath)
+}
+
+function validateHarness(value) {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+    throw new Error('harness must be an object')
+  }
+  if (typeof value.id !== 'string' || !HARNESS_ID.test(value.id)) {
+    throw new Error('harness id must use lowercase letters, numbers, and hyphens')
+  }
+  if (typeof value.command !== 'string' || value.command.trim().length === 0) {
+    throw new Error('harness command must be a non-empty string')
+  }
+  const args = value.args === undefined ? [] : value.args
+  if (!Array.isArray(args) || args.some((arg) => typeof arg !== 'string')) {
+    throw new Error('harness args must be an array of strings')
+  }
+  return {
+    id: value.id,
+    label: typeof value.label === 'string' && value.label.trim().length > 0
+      ? value.label
+      : value.id,
+    command: value.command,
+    args: [...args],
+  }
+}
+
+function configuredHarnesses(settings) {
+  if (!Array.isArray(settings.harnesses)) return []
+  return settings.harnesses.map(validateHarness)
+}
+
+export function upsertHarness(settingsPath, harness) {
+  const next = validateHarness(harness)
+  const settings = readSettings(settingsPath)
+  const harnesses = configuredHarnesses(settings)
+  const index = harnesses.findIndex(({ id }) => id === next.id)
+  if (index === -1) harnesses.push(next)
+  else harnesses[index] = next
+  writeSettings(settingsPath, { ...settings, harnesses })
+  return next
+}
+
+export function activateHarness(settingsPath, id) {
+  const settings = readSettings(settingsPath)
+  const harnesses = configuredHarnesses(settings)
+  if (!harnesses.some((harness) => harness.id === id)) {
+    throw new Error(`unknown harness ${JSON.stringify(id)}`)
+  }
+  writeSettings(settingsPath, { ...settings, harnesses, activeHarness: id })
+}
+
+export function selectedHarness(settingsPath) {
+  const settings = readSettings(settingsPath)
+  if (typeof settings.activeHarness !== 'string') return undefined
+  return configuredHarnesses(settings).find(({ id }) => id === settings.activeHarness)
+}
+
+export function discoverPathHarnesses(pathValue = process.env.PATH ?? '') {
+  const found = []
+  const names = new Set()
+  for (const directory of pathValue.split(path.delimiter).filter(Boolean)) {
+    let entries
+    try {
+      entries = readdirSync(directory, { withFileTypes: true })
+    } catch {
+      continue
+    }
+    for (const entry of entries) {
+      if (!entry.isFile() && !entry.isSymbolicLink()) continue
+      const name = entry.name.replace(/\.(?:cmd|exe|bat|com)$/i, '')
+      if (!/(?:^|[-_])acp$/i.test(name) || names.has(name)) continue
+      const command = path.resolve(directory, entry.name)
+      try {
+        const stat = statSync(command)
+        if (!stat.isFile()) continue
+        if (process.platform !== 'win32' && (stat.mode & 0o111) === 0) continue
+      } catch {
+        continue
+      }
+      names.add(name)
+      found.push({
+        id: `path-${name.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`,
+        label: name,
+        command,
+        args: [],
+        source: 'path',
+      })
+    }
+  }
+  return found
+}
+
+export function discoverHarnesses(settingsPath, options = {}) {
+  const configured = configuredHarnesses(readSettings(settingsPath))
+    .map((harness) => ({ ...harness, source: 'configured' }))
+  const defaults = (options.defaults ?? []).map((entry) => ({
+    ...validateHarness(entry),
+    source: typeof entry.source === 'string' ? entry.source : 'builtin',
+  }))
+  const pathEntries = discoverPathHarnesses(options.pathValue)
+  const seen = new Set()
+  return [...configured, ...defaults, ...pathEntries].filter((entry) => {
+    if (seen.has(entry.id)) return false
+    seen.add(entry.id)
+    return true
+  })
+}
+
+export function runHarnessCommand(argv, options) {
+  const settingsPath = options?.settingsPath
+  if (typeof settingsPath !== 'string' || settingsPath.length === 0) {
+    throw new Error('harness command needs a settings path')
+  }
+  const [action, id, ...tokens] = argv
+  if (action === 'help' || action === undefined) {
+    return { code: 0, stdout: HARNESS_HELP, stderr: '' }
+  }
+  if (action === 'list') {
+    const settings = readSettings(settingsPath)
+    const active = typeof settings.activeHarness === 'string' ? settings.activeHarness : undefined
+    const stdout = discoverHarnesses(settingsPath, options).map((entry) => {
+      const marker = entry.id === active ? '*' : ' '
+      const command = [entry.command, ...entry.args]
+        .map((part) => /\s/.test(part) ? JSON.stringify(part) : part)
+        .join(' ')
+      return `${marker} ${entry.id}\t${entry.source}\t${entry.label}\t${command}`
+    }).join('\n')
+    return { code: 0, stdout: stdout.length > 0 ? `${stdout}\n` : '', stderr: '' }
+  }
+  if (action === 'use') {
+    const harness = discoverHarnesses(settingsPath, options).find((entry) => entry.id === id)
+    if (harness === undefined) throw new Error(`unknown harness ${JSON.stringify(id ?? '')}`)
+    upsertHarness(settingsPath, harness)
+    activateHarness(settingsPath, id)
+    return {
+      code: 0,
+      stdout: `active harness ${id}; next standalone launch starts a new session\n`,
+      stderr: '',
+    }
+  }
+  if (action !== 'add') throw new Error(`unknown harness command ${JSON.stringify(action ?? '')}`)
+  let command
+  let label
+  const args = []
+  for (let index = 0; index < tokens.length; index += 1) {
+    const token = tokens[index]
+    const value = tokens[index + 1]
+    if (token === '--command') command = value
+    else if (token === '--label') label = value
+    else if (token === '--arg') args.push(value ?? '')
+    else throw new Error(`unknown harness add option ${JSON.stringify(token)}`)
+    index += 1
+  }
+  upsertHarness(settingsPath, { id, label, command, args })
+  return { code: 0, stdout: `saved harness ${id}\n`, stderr: '' }
+}

package/lib/inspect.js

@@ -683,7 +683,9 @@ export function statusInspectProvider(acpSessionStatus) {
             call: 'ctx.acpSessionStatus.subscribe((snapshot) => { ... })',
             returns: { type: 'function', role: 'dispose', idempotent: true },
           },
-          transport: 'standard ACP initialize, authenticate, session and session/update messages',
+          transport: 'standard ACP initialize, authenticate, session, session/prompt response, '
+            + 'and session/update messages, plus optional Martty session.status/session.event '
+            + 'extensions',
         },
         referencedTypes: ['SessionStatusSnapshot'],
       }

package/lib/one.js

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

package/lib/palettes/one.json

@@ -0,0 +1,44 @@
+{
+  "id": "one",
+  "label": "One",
+  "dark": {
+    "bg": "#282c34",
+    "surface": "#282c34",
+    "panel": "#1e2127",
+    "fg": "#abb2bf",
+    "fg_secondary": "#5c6370",
+    "fg_tertiary": "#5c6370",
+    "caption": "#5c6370",
+    "brand": "#61afef",
+    "brand_soft": "#c678dd",
+    "bubble_bg": "#abb2bf",
+    "bubble_fg": "#282c34",
+    "border": "#5c6370",
+    "code_bg": "#282c34",
+    "ok": "#98c379",
+    "warn": "#d19a66",
+    "err": "#e06c75",
+    "hint": "#56b6c2",
+    "chip_bg": "#1e2127"
+  },
+  "light": {
+    "bg": "#f8f8f8",
+    "surface": "#f8f8f8",
+    "panel": "#bbbbbb",
+    "fg": "#2a2b33",
+    "fg_secondary": "#5c6370",
+    "fg_tertiary": "#5c6370",
+    "caption": "#5c6370",
+    "brand": "#2f5af3",
+    "brand_soft": "#a00095",
+    "bubble_bg": "#2a2b33",
+    "bubble_fg": "#f8f8f8",
+    "border": "#5c6370",
+    "code_bg": "#f8f8f8",
+    "ok": "#3e953a",
+    "warn": "#c18401",
+    "err": "#de3d35",
+    "hint": "#0184bc",
+    "chip_bg": "#bbbbbb"
+  }
+}

package/lib/palettes/tomorrow.json

@@ -0,0 +1,44 @@
+{
+  "id": "tomorrow",
+  "label": "Tomorrow",
+  "dark": {
+    "bg": "#000000",
+    "surface": "#000000",
+    "panel": "#424242",
+    "fg": "#eaeaea",
+    "fg_secondary": "#969896",
+    "fg_tertiary": "#969896",
+    "caption": "#969896",
+    "brand": "#7aa6da",
+    "brand_soft": "#c397d8",
+    "bubble_bg": "#424242",
+    "bubble_fg": "#eaeaea",
+    "border": "#969896",
+    "code_bg": "#000000",
+    "ok": "#b9ca4a",
+    "warn": "#e7c547",
+    "err": "#d54e53",
+    "hint": "#70c0b1",
+    "chip_bg": "#424242"
+  },
+  "light": {
+    "bg": "#ffffff",
+    "surface": "#ffffff",
+    "panel": "#d6d6d6",
+    "fg": "#4d4d4c",
+    "fg_secondary": "#8e908c",
+    "fg_tertiary": "#8e908c",
+    "caption": "#8e908c",
+    "brand": "#4271ae",
+    "brand_soft": "#8959a8",
+    "bubble_bg": "#d6d6d6",
+    "bubble_fg": "#4d4d4c",
+    "border": "#8e908c",
+    "code_bg": "#ffffff",
+    "ok": "#718c00",
+    "warn": "#eab700",
+    "err": "#c82829",
+    "hint": "#3e999f",
+    "chip_bg": "#d6d6d6"
+  }
+}

package/lib/plan-view.js

@@ -25,7 +25,7 @@ export function apply(ctx) {
     current = ctx.acpSessionPlan.current()
     ctx.tuiOverlay.openView({
       id: 'plan-view',
-      title: 'Plan',
+      title: viewTitle(current),
       nodes: viewNodes(current),
     })
   })
@@ -67,6 +67,18 @@ function dockNodes(plan) {
   }]
 }
 
+// The overlay window title: the `n/m` counter lives in the border, not in
+// the body, so the review never repeats its heading (issue #85).
+function viewTitle(plan) {
+  if (plan !== null && plan.kind === 'items') {
+    const total = plan.entries.length
+    if (total === 0) return 'Plan'
+    const completed = plan.entries.filter((entry) => entry.status === 'completed').length
+    return `Plan ${completed}/${total}`
+  }
+  return 'Plan'
+}
+
 function viewNodes(plan) {
   if (plan === null) {
     return [{ id: 'empty', kind: 'notice', level: 'info', text: 'No active plan' }]
@@ -78,10 +90,8 @@ function viewNodes(plan) {
     return [{ id: 'file', kind: 'notice', level: 'info', text: plan.uri }]
   }
   // Items render as one markdown node: a task-list review the transcript
-  // pipeline can fully render (headings, bold, strikethrough).
-  const total = plan.entries.length
-  const completed = plan.entries.filter((entry) => entry.status === 'completed').length
-  const lines = [`## Plan · ${completed}/${total}`, '']
+  // pipeline can fully render (bold, strikethrough).
+  const lines = []
   for (const entry of plan.entries) {
     const content = entry.content.replace(/\s*\n\s*/g, ' ')
     let item

package/lib/stats-view.js

@@ -1,47 +1,38 @@
 /** Built-in Client Plugin: standard ACP usage and timing in the composer dock. */
 
 export const name = 'stats-view'
-export const inject = ['acpSessionStats', 'acpSessionStatus', 'tuiSlots']
+export const inject = ['acpSessionStats', 'tuiSlots']
 
 export function apply(ctx) {
   let current = ctx.acpSessionStats.current()
-  let status = ctx.acpSessionStatus.current()
   let panel
   const stopSlot = ctx.tuiSlots.inject('conversation.composer.dock', () => {
     panel = ctx.tuiSlots.register(
       { name: 'conversation.composer.dock', id: 'stats' },
-      nodesOf(current, status),
+      nodesOf(current),
     )
     return () => panel.dispose()
   })
   const stopStats = ctx.acpSessionStats.subscribe((snapshot) => {
     current = snapshot
-    panel?.update(nodesOf(current, status))
-  })
-  const stopStatus = ctx.acpSessionStatus.subscribe((snapshot) => {
-    status = snapshot
-    panel?.update(nodesOf(current, status))
+    panel?.update(nodesOf(current))
   })
   return () => {
     stopStats?.()
-    stopStatus?.()
     stopSlot?.()
   }
 }
 
-function nodesOf(snapshot, status) {
+function nodesOf(snapshot) {
   const usage = snapshot?.usage ?? {}
   const stats = snapshot?.stats ?? {}
-  const model = status?.model
   const nodes = []
   if ((usage.input ?? 0) > 0 || (usage.output ?? 0) > 0) {
     nodes.push(node('tokens', `↑${formatTokens(usage.input)} · ↓${formatTokens(usage.output)}`))
-    const used = (usage.input ?? 0) + (usage.output ?? 0)
-      + (usage.cached ?? 0) + (usage.reasoning ?? 0)
-    const size = contextWindowOf(model)
-    if (used > 0 && size > 0) {
-      const pct = Math.min(100, used / size * 100).toFixed(1)
-      nodes.push(node('context', `${pct}%/${contextSizeLabel(size)}`))
+    const gauge = contextGauge(snapshot)
+    if (gauge.used > 0 && gauge.size > 0) {
+      const pct = Math.min(100, gauge.used / gauge.size * 100).toFixed(1)
+      nodes.push(node('context', `${pct}%/${contextSizeLabel(gauge.size)}`))
     }
   }
   if ((stats.turns ?? 0) > 0 || (stats.steps ?? 0) > 0) {
@@ -83,18 +74,19 @@ function node(id, title) {
 function plural(value, singular) { return value === 1 ? singular : `${singular}s` }
 
 /**
- * Context window of the current model (tokens). The ACP surface does not
- * carry the window size, so the known DeepSeek family sizes stand in;
- * unknown models fall back to a common 128K.
+ * Context-window gauge. Only the harness `usage_update` readout is shown:
+ * `used` is the final prompt size and `size` the real model window from
+ * `request/context`. Nothing client-side can reproduce either — per-turn
+ * usage sums every step's full context (multi-step turns over-report),
+ * and a model-name guess does not know the window (the old 128K guess is
+ * what pegged the dock at 100% early in issue #77). Without an
+ * authoritative readout the gauge is hidden instead of showing a wrong
+ * percentage.
  */
-function contextWindowOf(model) {
-  switch (model) {
-    case 'deepseek-v4-flash':
-    case 'deepseek-v4-pro':
-      return 1_000_000
-    default:
-      return 128_000
-  }
+function contextGauge(snapshot) {
+  const context = snapshot?.context
+  if (context?.size > 0) return { used: context.used ?? 0, size: context.size }
+  return { used: 0, size: 0 }
 }
 
 /** `1000000` → `1.0M`, `128000` → `128K` — keeps the one-decimal look of

package/lib/status-view.js

@@ -27,7 +27,8 @@ export function apply(ctx) {
 }
 
 /**
- * One `## status` markdown node. Run-state facts come from
+ * One markdown node of run-state facts (the window border already names
+ * the popup, so no in-body heading). Facts come from
  * `acpSessionStatus`; every token/turn/step/timing fact comes from
  * `acpSessionStats.current()` — the same snapshot `stats-view` renders in
  * the composer dock, so the two readouts can never drift apart.
@@ -37,7 +38,7 @@ function statusMarkdown(status, stats) {
   const folded = stats?.stats ?? {}
   const total = (usage.input ?? 0) + (usage.output ?? 0)
     + (usage.cached ?? 0) + (usage.reasoning ?? 0)
-  const lines = ['## status', '']
+  const lines = []
   lines.push(`- state · ${status.state ?? 'idle'}`)
   lines.push(`- acp · ${status.connection ?? 'not attached'}`)
   if (status.auth?.status !== undefined) {

package/lib/tomorrow.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "martty",
-  "version": "0.2.29",
+  "version": "0.2.31",
   "description": "Terminal-native ACP client UI; Cordis client tree, any ACP agent",
   "license": "MIT",
   "repository": {
@@ -15,7 +15,7 @@
   "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/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/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:profile-install-matrix": "node --test ../scripts/profile-install-matrix.test.mjs"
   },
   "publishConfig": {
@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@openma/deepseek-harness-acp": "0.4.26"
+    "@openma/deepseek-harness-acp": "0.4.27"
   },
   "devDependencies": {
     "@deepseek-ai/dsh": "0.1.1-rc.2"