martty 0.3.1 → 0.3.2-beta.0

package/README.md

@@ -198,10 +198,11 @@ Creator-authored UI Presets and Theme Plugins preview as process-local dynamic
 Packages, then persist explicitly under `$MARTTY_HOME/plugins` through
 `tui_plugin_save`; `tui_plugin_read` resumes authoring after restart.
 
-`MARTTY_HOME` resolves explicitly first, then to `$DSH_HOME/.martty`, then to
-`~/.martty`. UI choices live in `$MARTTY_HOME/settings.json`. On first use,
-legacy Creator artifacts and settings are copied forward without deleting or
-overwriting the old files.
+`MARTTY_HOME` (or `OMA_HOME`) resolves explicitly first, then to
+`$DSH_HOME/.oma`, then to `~/.oma` — the configuration home Martty shares
+with Backchat. UI choices live in `$MARTTY_HOME/settings.json`. On first use,
+a legacy `.martty` directory and old Creator artifacts/settings are copied
+forward without deleting or overwriting the old files.
 
 Third-party TUI plugins remain ordinary installed packages. Their Host-side
 registrar contributes an absolute Client module entry to `tuiClientPlugins`;

package/lib/acp-agent-pool.js

@@ -10,6 +10,21 @@ const identity = spec => JSON.stringify([spec.command, spec.args ?? [],
 const namespace = spec => createHash('sha256').update(identity(spec)).digest('hex').slice(0, 24)
 const setupMethods = new Set(['session/new', 'session/load', 'session/resume'])
 
+/** `configOptions` array from a setup/set result or a `config_option_update`. */
+function readConfigOptions(value) {
+  const found = value?.configOptions ?? value?.config_options
+  return Array.isArray(found) ? found : undefined
+}
+
+/** `[configId, value]` pair for one option entry, or undefined when incomplete. */
+function optionEntry(option) {
+  if (option === null || typeof option !== 'object' || Array.isArray(option)) return undefined
+  const id = option.id ?? option.configId ?? option.config_id
+  const value = option.currentValue ?? option.current_value
+  if (typeof id !== 'string' || id.length === 0 || value === undefined) return undefined
+  return [id, structuredClone(value)]
+}
+
 export function createAgentPool(initial, { spawnAgent, resolveAgent, diagnosticError, timeoutMs = 20 * 60_000 }) {
   const input = new PassThrough()
   const output = new PassThrough()
@@ -30,10 +45,15 @@ export function createAgentPool(initial, { spawnAgent, resolveAgent, diagnosticE
   const writeAgent = (owner, value) => owner.handle.stdin.write(JSON.stringify(value) + '\n')
 
   function metadata(owner) {
+    // Send Now reads this snapshot per session (`steer_route`). Steering and
+    // MiniMax extensions are advertised on initialize `_meta`, which
+    // `agentCapabilities` does not carry.
+    const negotiated = owner.init?._meta
     return {
       id: owner.id,
       agentInfo: owner.init?.agentInfo,
       agentCapabilities: owner.init?.agentCapabilities ?? {},
+      ...(negotiated && typeof negotiated === 'object' ? { _meta: negotiated } : {}),
       authMethods: (owner.init?.authMethods ?? []).map(method => {
         const id = owner.id === 'h1' ? method.id : `${owner.id}:${method.id}`
         authMethods.set(id, { owner, id: method.id })
@@ -80,9 +100,17 @@ export function createAgentPool(initial, { spawnAgent, resolveAgent, diagnosticE
     }
     if (setupMethods.has(pending.method) && result && typeof result === 'object') {
       const raw = result.sessionId ?? pending.params?.sessionId
-      result = { ...result, sessionId: sessionId(owner, raw),
+      const bound = sessionId(owner, raw)
+      recordOptions(owner, bound, readConfigOptions(result))
+      result = { ...result, sessionId: bound,
         _meta: { ...result._meta, marttyConnection: { ...metadata(owner), cwd: pending.params?.cwd } } }
     }
+    if (pending.method === 'session/set_config_option' && result && typeof result === 'object') {
+      recordOptions(owner, pending.sessionKey, readConfigOptions(result)
+        ?? (pending.params?.configId !== undefined
+          ? [{ id: pending.params.configId, currentValue: pending.params.value }]
+          : undefined))
+    }
     if (pending.method === 'session/list' && Array.isArray(result?.sessions)) {
       result = { ...result, sessions: result.sessions.map(session => ({ ...session,
         sessionId: sessionId(owner, session.sessionId) })) }
@@ -100,12 +128,60 @@ export function createAgentPool(initial, { spawnAgent, resolveAgent, diagnosticE
     owner.pending.clear()
   }
 
+  /**
+   * Track each session's config options and what the connection last applied.
+   * `session/set_config_option` is session-scoped in ACP, but agents like
+   * pi-acp apply it to global state — a newer session's defaults then leak
+   * into older sessions' turns. Remembering every session's own options lets
+   * `session/prompt` re-assert them first, so each turn runs the model and
+   * effort its session chose. New sessions never assert: they just record
+   * the defaults their setup snapshot reported.
+   * @param {*} owner
+   * @param {string} sessionKey - namespaced session id
+   * @param {Array|undefined} options - `configOptions` entries
+   */
+  function recordOptions(owner, sessionKey, options) {
+    if (typeof sessionKey !== 'string' || !options) return
+    const entries = options.map(optionEntry).filter(Boolean)
+    if (entries.length === 0) return
+    const config = owner.configs.get(sessionKey) ?? new Map()
+    for (const [id, value] of entries) {
+      config.set(id, value)
+      owner.applied.set(id, value)
+    }
+    owner.configs.set(sessionKey, config)
+  }
+
+  /**
+   * Re-apply a session's recorded config options the connection no longer
+   * holds — one `set_config_option` per drifted option, in recorded order.
+   * Best effort: a rejected assert must not block the turn it guarded.
+   */
+  async function applySessionConfig(owner, sessionKey) {
+    const config = owner.configs.get(sessionKey)
+    const bound = sessions.get(sessionKey)
+    if (!config || !bound || bound.owner !== owner || owner.failed || closed) return
+    for (const [configId, value] of config) {
+      if (JSON.stringify(owner.applied.get(configId)) === JSON.stringify(value)) continue
+      const id = `martty-config-${++nextRequest}`
+      const params = { sessionId: bound.raw, configId, value }
+      const result = await new Promise((resolve, reject) => {
+        owner.pending.set(id, { resolve, reject, method: 'session/set_config_option', params, sessionKey })
+        writeAgent(owner, { jsonrpc: '2.0', id, method: 'session/set_config_option', params })
+      }).catch(() => undefined)
+      if (result === undefined) break // assert failed — keep remaining options eligible
+      recordOptions(owner, sessionKey, readConfigOptions(result)
+        ?? [{ id: configId, currentValue: value }])
+    }
+  }
+
   function connection(spec) {
     const key = identity(spec)
     const existing = connections.get(key)
     if (existing && !existing.failed) return existing
     const owner = { id: `h${++nextConnection}`, namespace: namespace(spec), spec, handle: spawnAgent(spec),
-      sessions: new Map(), pending: new Map(), init: undefined, initializing: undefined, failed: undefined }
+      sessions: new Map(), pending: new Map(), init: undefined, initializing: undefined, failed: undefined,
+      configs: new Map(), applied: new Map(), configChain: Promise.resolve() }
     connections.set(key, owner)
     owner.handle.child.on('error', error => fail(owner, error))
     owner.handle.child.once('close', (code, signal) => fail(owner,
@@ -124,6 +200,10 @@ export function createAgentPool(initial, { spawnAgent, resolveAgent, diagnosticE
         return
       }
       const forwarded = { ...message, params: incomingParams(owner, message.params) }
+      if (message.method === 'session/update'
+        && forwarded.params?.update?.sessionUpdate === 'config_option_update') {
+        recordOptions(owner, forwarded.params.sessionId, readConfigOptions(forwarded.params.update))
+      }
       if (message.id !== undefined) {
         const id = `martty-agent-${++nextRequest}`
         callbacks.set(id, { owner, id: message.id })
@@ -214,6 +294,8 @@ export function createAgentPool(initial, { spawnAgent, resolveAgent, diagnosticE
       if (message.method.startsWith('_dsh/cordis/') && readCordisCapability(owner.init) === null) {
         throw new Error('agent has not advertised _dsh/cordis')
       }
+      const sessionKey = typeof params?.sessionId === 'string' ? params.sessionId
+        : typeof params?.session_id === 'string' ? params.session_id : undefined
       if (params && typeof params === 'object') {
         params = { ...params }
         for (const key of ['sessionId', 'session_id']) {
@@ -224,9 +306,22 @@ export function createAgentPool(initial, { spawnAgent, resolveAgent, diagnosticE
       const forwarded = { ...message, params }
       if (message.id !== undefined) {
         const id = `martty-client-${++nextRequest}`
-        owner.pending.set(id, { id: message.id, method: message.method, params })
+        owner.pending.set(id, { id: message.id, method: message.method, params, sessionKey })
         forwarded.id = id
       }
+      if (message.method === 'session/prompt' && sessionKey !== undefined) {
+        // The prompt lands on stdin only after its session's config options
+        // are re-asserted — the chain keeps cross-session order. Registering
+        // the pending reply above (never inside the chain) keeps close() able
+        // to settle it while an assert is still in flight.
+        owner.configChain = owner.configChain.then(async () => {
+          // Asserts resolve `undefined` on a failed set_config_option rather
+          // than rejecting, so this chain cannot drop the prompt.
+          await applySessionConfig(owner, sessionKey)
+          if (!closed && !owner.failed) writeAgent(owner, forwarded)
+        })
+        return
+      }
       writeAgent(owner, forwarded)
     } catch (error) {
       if (message.id !== undefined) {

package/lib/harness-registry.js

@@ -19,13 +19,13 @@ import { downloadFile } from './download.js'
 
 export const ACP_REGISTRY_URL = 'https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json'
 
-const OPENMA_PI_ACP = '@openma/pi-acp@0.1.3'
+export const OPENMA_PI_ACP = '@openma/pi-acp@latest'
 
 function preferMarttyPiAcp(records) {
   return records.map((record) => record.id === 'pi-acp' ? {
     ...record,
     label: 'Pi (OpenMA)',
-    version: '0.1.3',
+    version: 'latest',
     distributions: [{
       type: 'npx', command: 'npx', args: [OPENMA_PI_ACP], env: {},
     }],

package/lib/harnesses.js

@@ -16,12 +16,15 @@ import {
   installRegistryBinary,
   managedBinaryPath,
   normalizeAcpRegistry,
+  OPENMA_PI_ACP,
   readAcpRegistrySnapshot,
 } from './harness-registry.js'
 
 export { fetchAcpRegistry } from './harness-registry.js'
 
 const HARNESS_ID = /^[a-z0-9][a-z0-9-]*$/
+const PI_ACP_LATEST = OPENMA_PI_ACP
+const PI_ACP_SPEC = /^(?:@openma\/)?pi-acp(?:@.+)?$/
 const ANSI = Object.freeze({ reset: '\x1b[0m', bold: '\x1b[1m', dim: '\x1b[2m', cyan: '\x1b[36m', green: '\x1b[32m' })
 
 // Kept as a source-compatible empty export. The source of truth is the
@@ -361,8 +364,14 @@ function validateHarness(value) {
     || Object.entries(env).some(([key, item]) => key.length === 0 || typeof item !== 'string'))) {
     throw new Error('harness env must be an object of strings')
   }
-  const normalizedArgs = /^npx(?:\.(?:cmd|bat|exe))?$/i.test(path.win32.basename(value.command))
-    ? [...args].filter((arg) => arg !== '--yes' && arg !== '--prefer-offline')
+  const isNpx = /^npx(?:\.(?:cmd|bat|exe))?$/i.test(path.win32.basename(value.command))
+  const normalizedArgs = isNpx
+    ? [...args]
+      .filter((arg) => arg !== '--yes' && arg !== '--prefer-offline')
+      // A pinned pi-acp spec (any old `pi-acp@x` or `@openma/pi-acp@x` entry)
+      // always resolves `latest` at runtime instead — harness upgrades ship
+      // through npm, never through a Martty release.
+      .map((arg) => PI_ACP_SPEC.test(arg) ? PI_ACP_LATEST : arg)
     : [...args]
   return {
     id: value.id,

package/lib/tui-plugin-store.js

@@ -76,14 +76,45 @@ export function tuiPluginRoot(env = process.env) {
   return path.join(marttyHome(env), 'plugins')
 }
 
+/**
+ * Martty's configuration home, shared with Backchat: `~/.oma`.
+ * Resolution order: explicit `MARTTY_HOME`/`OMA_HOME`, then `$DSH_HOME/.oma`,
+ * then `~/.oma`. When the new home is missing but a legacy `.martty`
+ * directory sits next to it, its contents are migrated once (config, cache,
+ * sessions, managed binaries) so existing installs keep their state.
+ */
 export function marttyHome(env = process.env, userHome = homedir()) {
   if (typeof env.MARTTY_HOME === 'string' && env.MARTTY_HOME.length > 0) {
     return env.MARTTY_HOME
   }
-  if (typeof env.DSH_HOME === 'string' && env.DSH_HOME.length > 0) {
-    return path.join(env.DSH_HOME, '.martty')
+  if (typeof env.OMA_HOME === 'string' && env.OMA_HOME.length > 0) {
+    return env.OMA_HOME
   }
-  return path.join(userHome, '.martty')
+  const base = typeof env.DSH_HOME === 'string' && env.DSH_HOME.length > 0
+    ? env.DSH_HOME
+    : userHome
+  return migrateMarttyHome(base)
+}
+
+function migrateMarttyHome(base) {
+  const home = path.join(base, '.oma')
+  const legacy = path.join(base, '.martty')
+  if (existsSync(home) || !existsSync(legacy)) return home
+  // Stage the copy under a temporary sibling so a crash cannot leave a
+  // half-migrated `.oma` behind; the legacy directory is left untouched.
+  const staged = `${home}.migrating-${process.pid}`
+  try {
+    rmSync(staged, { recursive: true, force: true })
+    cpSync(legacy, staged, { recursive: true, errorOnExist: true })
+    renameSync(staged, home)
+    process.stderr.write(`martty: migrated ${legacy} to ${home} (shared with Backchat)\n`)
+  } catch {
+    rmSync(staged, { recursive: true, force: true })
+    // Migration is best effort: an unmigrated legacy directory keeps working
+    // under its old name rather than blocking startup.
+    return legacy
+  }
+  return home
 }
 
 export function legacyTuiPluginRoot(env = process.env, userHome = homedir()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "martty",
-  "version": "0.3.1",
+  "version": "0.3.2-beta.0",
   "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-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": "node --test ../scripts/download.test.mjs ../scripts/package-native.test.mjs ../scripts/check-release-tag.test.mjs ../scripts/release-check.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,13 +76,13 @@
   "dependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@lobehub/icons-static-svg": "1.95.0",
-    "@openma/deepseek-harness-acp": "0.4.35",
+    "@openma/deepseek-harness-acp": "0.4.37",
     "@resvg/resvg-js": "2.6.2",
     "cross-spawn": "^7.0.6",
     "node-downloader-helper": "2.1.11"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh": "0.1.7-rc.2"
+    "@deepseek-ai/dsh": "0.2.0-rc.2"
   },
   "engines": {
     "node": ">=22.19.0"
@@ -96,10 +96,10 @@
     "agent-client-protocol"
   ],
   "optionalDependencies": {
-    "@openma/martty-darwin-arm64": "0.3.1",
-    "@openma/martty-darwin-x64": "0.3.1",
-    "@openma/martty-linux-x64": "0.3.1",
-    "@openma/martty-linux-arm64": "0.3.1",
-    "@openma/martty-win32-x64": "0.3.1"
+    "@openma/martty-darwin-arm64": "0.3.2-beta.0",
+    "@openma/martty-darwin-x64": "0.3.2-beta.0",
+    "@openma/martty-linux-x64": "0.3.2-beta.0",
+    "@openma/martty-linux-arm64": "0.3.2-beta.0",
+    "@openma/martty-win32-x64": "0.3.2-beta.0"
   }
 }

package/skills/tui-plugin-development/SKILL.md

@@ -56,7 +56,7 @@ depend on a value returned by `apply()` as the disposer; register effects
 through the inspected Cordis APIs.
 
 The authoring root is `$MARTTY_HOME/plugins`; `MARTTY_HOME` resolves from the
-explicit environment variable, then `$DSH_HOME/.martty`, then `~/.martty`.
+explicit environment variable or `OMA_HOME`, then `$DSH_HOME/.oma`, then `~/.oma`.
 User selections live separately in `$MARTTY_HOME/settings.json`.
 
 ## Inspect is the authority