martty 0.3.0 → 0.3.1-beta.0

package/README.md

@@ -272,16 +272,16 @@ credential, session, theme, and demo options.
 
 ## Supported platforms
 
-| Node platform key | Binary |
+| Node platform key | npm package |
 |---|---|
-| `darwin-arm64` | `vendor/darwin-arm64/martty` |
-| `darwin-x64` | `vendor/darwin-x64/martty` |
-| `linux-x64` | `vendor/linux-x64/martty` |
-| `linux-arm64` | `vendor/linux-arm64/martty` |
-| `win32-x64` | `vendor/win32-x64/martty.exe` |
-
-If installation succeeds but launch reports `no native binary for ...`, confirm
-that you installed the latest version and that your platform appears above.
+| `darwin-arm64` | `@openma/martty-darwin-arm64` |
+| `darwin-x64` | `@openma/martty-darwin-x64` |
+| `linux-x64` | `@openma/martty-linux-x64` |
+| `linux-arm64` | `@openma/martty-linux-arm64` |
+| `win32-x64` | `@openma/martty-win32-x64` |
+
+If launch reports a missing native package, reinstall with optional dependencies
+enabled (`npm install --include=optional martty`) and check the table above.
 
 ## Uninstall
 

package/bin/martty.js

@@ -8,26 +8,10 @@ import { createInterface } from 'node:readline/promises'
 import { resolveDependencyStack } from '../lib/agent.js'
 import { bootClient, parseClientArgv, painterArgs, uiSettingsPath } from '../lib/boot.js'
 import { runHarnessCommandAsync } from '../lib/harnesses.js'
+import { nativeBinary } from '../lib/spawn-tui.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const platformKey = process.platform + '-' + process.arch
-const vendorDir = path.join(__dirname, '..', 'vendor')
-const binaryName = process.platform === 'win32' ? 'martty.exe' : 'martty'
-const packaged = path.join(vendorDir, platformKey, binaryName)
 const configuredBin = process.env.MARTTY_BIN || process.env.DSH_TUI_BIN
-let binaryPath = packaged
-if (typeof configuredBin === 'string' && configuredBin.length > 0) {
-  if (fs.existsSync(configuredBin)) {
-    binaryPath = configuredBin
-  } else {
-    // Never silently fall back: the user believes they are running their
-    // own build (devlocalinstall.sh has caught this confusion before).
-    console.error(
-      `martty: ${configuredBin} (from ${process.env.MARTTY_BIN ? 'MARTTY_BIN' : 'DSH_TUI_BIN'})`
-        + ' does not exist — falling back to the bundled binary',
-    )
-  }
-}
 
 const argv = process.argv.slice(2)
 const wantDemoSkin = argv.includes('--demo-skin')
@@ -109,23 +93,19 @@ if (!wantHelp && !wantVersion && !wantDemo && !wantDemoSkin) {
   }
 }
 
-if (!fs.existsSync(binaryPath)) {
-  let available = []
-  try {
-    available = fs
-      .readdirSync(vendorDir, { withFileTypes: true })
-      .filter((e) => e.isDirectory())
-      .map((e) => e.name)
-  } catch {
-    // vendor dir missing entirely
-  }
-  console.error('martty: no bundled binary for this platform (' + platformKey + ').')
-  if (available.length > 0) {
-    console.error('Bundled platforms: ' + available.join(', '))
-  } else {
-    console.error('No platform binaries are bundled in this install.')
-  }
-  console.error('Hint: run scripts/build-npm.sh on this machine to build and package a native binary.')
+if (configuredBin && !fs.existsSync(configuredBin)) {
+  // Never silently fall back: the user believes they are running their
+  // own build (devlocalinstall.sh has caught this confusion before).
+  console.error(
+    `martty: ${configuredBin} (from ${process.env.MARTTY_BIN ? 'MARTTY_BIN' : 'DSH_TUI_BIN'})`
+      + ' does not exist — falling back to the installed native binary',
+  )
+}
+let binaryPath
+try {
+  binaryPath = nativeBinary({ envBin: configuredBin && fs.existsSync(configuredBin) ? configuredBin : null })
+} catch (error) {
+  console.error(`martty: ${error instanceof Error ? error.message : String(error)}`)
   process.exit(1)
 }
 

package/lib/spawn-tui.js

@@ -7,6 +7,7 @@
 
 import { spawn } from 'node:child_process'
 import { randomBytes, timingSafeEqual } from 'node:crypto'
+import { createRequire } from 'node:module'
 import fs from 'node:fs'
 import { createServer } from 'node:net'
 import path from 'node:path'
@@ -15,8 +16,8 @@ import { fileURLToPath } from 'node:url'
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 /** Select the first existing native painter in development-to-release order. */
-export function selectNativeBinary({ envBin, devBin, packagedBin }) {
-  for (const candidate of [envBin, devBin, packagedBin]) {
+export function selectNativeBinary({ envBin, devBin, optionalBin, packagedBin }) {
+  for (const candidate of [envBin, devBin, optionalBin, packagedBin]) {
     if (typeof candidate === 'string' && candidate.length > 0 && fs.existsSync(candidate)) {
       return candidate
     }
@@ -25,28 +26,34 @@ export function selectNativeBinary({ envBin, devBin, packagedBin }) {
 }
 
 /**
- * Packaged native binary for this platform, or throw if it was not staged.
+ * Installed optional platform binary, or the local development binary.
  * Honors `MARTTY_BIN`, with `DSH_TUI_BIN` as a compatibility fallback.
+ * @param {{ packageRoot?: string, platform?: string, arch?: string, envBin?: string | null, devBin?: string | null }} [options]
  * @returns {string}
  */
-export function nativeBinary() {
-  const envBin = process.env.MARTTY_BIN || process.env.DSH_TUI_BIN
-  const key = `${process.platform}-${process.arch}`
-  const exe = process.platform === 'win32' ? 'martty.exe' : 'martty'
-  const bin = path.join(__dirname, '..', 'vendor', key, exe)
-  const devBin = path.join(__dirname, '..', '..', 'target', 'debug', exe)
-  const selected = selectNativeBinary({ envBin, devBin, packagedBin: bin })
+export function nativeBinary(options = {}) {
+  const packageRoot = options.packageRoot ?? path.join(__dirname, '..')
+  const platform = options.platform ?? process.platform
+  const arch = options.arch ?? process.arch
+  const key = `${platform}-${arch}`
+  const exe = platform === 'win32' ? 'martty.exe' : 'martty'
+  const packageName = `@openma/martty-${key}`
+  const req = createRequire(path.join(packageRoot, 'package.json'))
+  let optionalBin
+  try { optionalBin = req.resolve(`${packageName}/bin/${exe}`) }
+  catch (error) {
+    if (error?.code !== 'MODULE_NOT_FOUND' && error?.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') throw error
+  }
+  const envBin = options.envBin === undefined
+    ? process.env.MARTTY_BIN || process.env.DSH_TUI_BIN : options.envBin
+  const devBin = options.devBin === undefined
+    ? path.join(packageRoot, '..', 'target', 'debug', exe) : options.devBin
+  const packagedBin = path.join(packageRoot, 'vendor', key, exe)
+  const selected = selectNativeBinary({ envBin, devBin, optionalBin, packagedBin })
   if (selected === undefined) {
-    let have = []
-    try {
-      have = fs.readdirSync(path.join(__dirname, '..', 'vendor'))
-    } catch {
-      // vendor dir missing entirely
-    }
     throw new Error(
-      `martty: no native binary for ${key}` +
-        ` (packaged: ${have.join(', ') || 'none'});` +
-      ' rebuild the package on this machine with scripts/build-npm.sh',
+      `Martty native package ${packageName} is missing for ${key}; reinstall Martty with optional dependencies`
+      + ' (npm install --include=optional). From source, build with scripts/build-npm.sh.',
     )
   }
   return selected

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "martty",
-  "version": "0.3.0",
+  "version": "0.3.1-beta.0",
   "description": "Terminal-native ACP client UI; Cordis client tree, any ACP agent",
   "license": "MIT",
   "repository": {
@@ -64,7 +64,6 @@
     "lib",
     "creator",
     "skills/tui-plugin-development/SKILL.md",
-    "vendor",
     "cordis.patch.yml",
     "README.md",
     "LICENSE"
@@ -95,5 +94,12 @@
     "agent",
     "acp",
     "agent-client-protocol"
-  ]
+  ],
+  "optionalDependencies": {
+    "@openma/martty-darwin-arm64": "0.3.1-beta.0",
+    "@openma/martty-darwin-x64": "0.3.1-beta.0",
+    "@openma/martty-linux-x64": "0.3.1-beta.0",
+    "@openma/martty-linux-arm64": "0.3.1-beta.0",
+    "@openma/martty-win32-x64": "0.3.1-beta.0"
+  }
 }