martty 0.2.36 → 0.2.38

package/lib/acp-host.js

@@ -115,10 +115,101 @@ export function installPermissionPresetsCompatibility(permissionPresets) {
   return true
 }
 
+function snapshotRowHeader(row) {
+  if (row === null || typeof row !== 'object') return undefined
+  const header = row.header
+  if (header === null || typeof header !== 'object' || typeof header.id !== 'string') {
+    return undefined
+  }
+  return header
+}
+
+/**
+ * One legacy `list()` row: the header itself, plus the snapshot fields a newer
+ * Host consumer reads off the same row (`header`, `revision`, sizes).
+ */
+function legacyListRow(snapshot) {
+  const header = snapshotRowHeader(snapshot)
+  if (header === undefined) return undefined
+  const row = { ...header }
+  for (const key of ['header', 'revision', 'eventCount', 'sizeBytes']) {
+    if (snapshot[key] === undefined) continue
+    Object.defineProperty(row, key, {
+      configurable: true,
+      value: key === 'header' ? header : snapshot[key],
+    })
+  }
+  return row
+}
+
+/**
+ * dsh 0.1.5 folded `listSnapshots()` into `list()` and replaced `inspect()`
+ * with per-session handles: `list()` now resolves to `{ header, revision }`
+ * snapshots, and one stored log is read through `open(id, 'read')`. ACP 0.4.x
+ * still filters listed rows by the row's own `cwd` and replays titles and
+ * resume history through `inspect()`, so project the removed header/inspection
+ * surface back onto the live service until ACP can require the handle API.
+ *
+ * Rows stay snapshot-compatible, so a newer Host consumer reading `.header`
+ * keeps working while ACP reads the header fields directly.
+ */
+export function installSessionPersistenceCompatibility(ctx) {
+  const service = ctx?.get?.('sessionPersistence')
+  if (service === undefined || service === null) return false
+  const list = service.list
+  if (typeof list !== 'function' || typeof service.open !== 'function') return false
+  if (list.dshTuiReturnsHeaders === true) return false
+
+  const compatibleList = async function (options) {
+    const listed = await list.call(this, options)
+    if (!Array.isArray(listed)) return listed
+    return listed.map((row) => legacyListRow(row) ?? row)
+  }
+  Object.defineProperty(compatibleList, 'dshTuiReturnsHeaders', { value: true })
+
+  // The class methods live on the prototype: restore by deleting the own
+  // property when the patch shadowed one instead of replacing an own value.
+  const listDescriptor = Object.getOwnPropertyDescriptor(service, 'list')
+  Object.defineProperty(service, 'list', { configurable: true, value: compatibleList })
+
+  let compatibleInspect
+  if (typeof service.inspect !== 'function') {
+    compatibleInspect = async function (id, signal) {
+      const options = signal === undefined ? undefined : { signal }
+      const handle = await service.open(id, 'read', options)
+      try {
+        const { events } = await handle.read(0, undefined, options)
+        const header = handle.header
+        // `meta` is the old coordinator's field; `header` is what ACP reads.
+        return Object.freeze({
+          meta: header,
+          header,
+          inheritedEventCount: handle.inheritedEventCount,
+          events,
+        })
+      } finally {
+        await handle.close().catch(() => {})
+      }
+    }
+    Object.defineProperty(service, 'inspect', { configurable: true, value: compatibleInspect })
+  }
+
+  ctx.effect?.(() => () => {
+    if (service.list !== compatibleList) return
+    if (listDescriptor === undefined) delete service.list
+    else Object.defineProperty(service, 'list', listDescriptor)
+    if (service.inspect === compatibleInspect) delete service.inspect
+  }, 'dsh-tui.session-persistence-compatibility')
+  return true
+}
+
 async function mountHostCompatibility(ctx) {
   // The service can come from the active Host even when module resolution
   // below lands on ACP's older peer copy, so adapt the live instance directly.
   installPermissionPresetsCompatibility(ctx.permissionPresets ?? ctx.get?.('permissionPresets'))
+  // Not injected here on purpose: the profile's base bundle owns persistence,
+  // and `ctx.get` reads the live service without adding a mount dependency.
+  installSessionPersistenceCompatibility(ctx)
 
   const sessionModule = resolvedHostModule(ctx, '@deepseek-ai/dsh-session')
   if (sessionModule !== undefined) {

package/lib/creator-overlay.js

@@ -4,6 +4,7 @@
  */
 
 import { readFileSync } from 'node:fs'
+import { installSessionPersistenceCompatibility } from './acp-host.js'
 import { createTuiPluginStore } from './tui-plugin-store.js'
 
 export const name = 'tui-creator-overlay'
@@ -192,6 +193,11 @@ const skillContent = skillDocument.slice(skillFrontmatter[0].length)
  * @param {{ preset?: string }} [config]
  */
 export async function apply(ctx, config = {}) {
+  // Standalone launches mount this overlay directly into the ACP Host tree,
+  // which never loads martty/acp-host; both trees need the ACP compatibility
+  // surface, and the installer is idempotent when the profile path already
+  // applied it on this service instance.
+  installSessionPersistenceCompatibility(ctx)
   const preset = config.preset ?? 'cordis'
   if (typeof preset !== 'string' || preset.length === 0) {
     throw new Error('tui-creator-overlay: preset must be a non-empty string')

package/lib/mux.js

@@ -9,6 +9,7 @@
  * off the painter.
  */
 
+import { StringDecoder } from 'node:string_decoder'
 import { CORDIS_CAPABILITY, CORDIS_METHODS, readCordisCapability } from './cordis-protocol.js'
 
 const COMPOSITOR_METHODS = Object.freeze(new Set([
@@ -95,13 +96,20 @@ export function writeJsonLine(dest, value) {
 
 /**
  * Pipe NDJSON, invoking `onLine` for each complete line (trimmed, non-empty).
+ *
+ * Frames are UTF-8: decoding each chunk with `chunk.toString('utf8')` would
+ * turn any multi-byte character split across a chunk boundary into U+FFFD
+ * replacement characters (silent corruption in both directions). A
+ * `StringDecoder` carries the incomplete tail across chunks, and `end()`
+ * flushes a final frame that arrived without a trailing newline.
+ *
  * @param {import('node:stream').Readable} source
  * @param {(line: string) => void} onLine
  */
 export function onJsonLines(source, onLine) {
   let buffer = ''
-  source.on('data', (chunk) => {
-    buffer += chunk.toString('utf8')
+  const decoder = new StringDecoder('utf8')
+  const drain = () => {
     for (;;) {
       const newline = buffer.indexOf('\n')
       if (newline < 0) break
@@ -110,6 +118,17 @@ export function onJsonLines(source, onLine) {
       if (line.length === 0) continue
       onLine(line)
     }
+  }
+  source.on('data', (chunk) => {
+    buffer += typeof chunk === 'string' ? chunk : decoder.write(chunk)
+    drain()
+  })
+  source.on('end', () => {
+    buffer += decoder.end()
+    drain()
+    const line = buffer.trim()
+    buffer = ''
+    if (line.length > 0) onLine(line)
   })
 }
 

package/lib/tui-presets.js

@@ -1,6 +1,6 @@
 /** UI Presets compose several UI plugin contributions into one saved choice. */
 
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { Service } from '@deepseek-ai/cordis'
 import { CORDIS_METHODS } from './cordis-protocol.js'
@@ -72,7 +72,13 @@ function writePreferred(settingsPath, id) {
   const settings = readSettings(settingsPath)
   settings.uiPreset = id
   mkdirSync(path.dirname(settingsPath), { recursive: true })
-  writeFileSync(settingsPath, `${JSON.stringify(settings, null, 2)}\n`)
+  // Atomic write (temp + rename), matching tui-theme.js: a crash mid-write
+  // must never leave a truncated settings.json behind — every later launch
+  // would otherwise start from an unreadable file that also carries the
+  // painter's language/themeMode keys.
+  const temporary = `${settingsPath}.${process.pid}.${Date.now()}.tmp`
+  writeFileSync(temporary, `${JSON.stringify(settings, null, 2)}\n`)
+  renameSync(temporary, settingsPath)
 }
 
 function releaseOf(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "martty",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "description": "Terminal-native ACP client UI; Cordis client tree, any ACP agent",
   "license": "MIT",
   "repository": {
@@ -76,12 +76,12 @@
   },
   "dependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@openma/deepseek-harness-acp": "0.4.29",
+    "@openma/deepseek-harness-acp": "0.4.31",
     "cross-spawn": "^7.0.6",
     "node-downloader-helper": "2.1.11"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh": "0.1.1-rc.2"
+    "@deepseek-ai/dsh": "0.1.5-rc.1"
   },
   "engines": {
     "node": ">=18"