dimcode 0.0.67-beta.8 → 0.0.67

package/bin/dim.mjs

@@ -4,21 +4,32 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import process from 'node:process'
-import { fileURLToPath, pathToFileURL } from 'node:url'
+import { fileURLToPath } from 'node:url'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 const isWindows = os.platform() === 'win32'
 
 let wrapperVersion = ''
+let wrapperName = 'dimcode'
 try {
   const pkg = JSON.parse(
     fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'),
   )
   wrapperVersion = pkg.version || ''
+  if (pkg.name)
+    wrapperName = pkg.name
 }
 catch {}
 
+// Inner binary file name shipped inside each platform sub-package's bin/.
+// dimcode → bin/dimcode(.exe); goatchain-cli → bin/goatchain(.exe).
+const BINARY_BASENAMES = {
+  'dimcode': 'dimcode',
+  'goatchain-cli': 'goatchain',
+}
+const binaryBasename = BINARY_BASENAMES[wrapperName] || wrapperName
+
 const wrapperDir = path.join(__dirname, '..').replace(/\\/g, '/').toLowerCase()
 const wrapperPm
   = wrapperDir.includes('.bun/') || wrapperDir.includes('bun/install/')
@@ -26,52 +37,13 @@ const wrapperPm
     : 'npm'
 
 const args = process.argv.slice(2)
-const routing = resolveRouting(args)
-
-if (routing.target === 'opentui') {
-  runOpentui(routing.forwardArgs)
-}
-else {
-  await runInk()
-}
-
-function resolveRouting(argv) {
-  // Explicit `dim ink ...` forces the Ink TUI fallback.
-  if (argv[0] === 'ink')
-    return { target: 'ink', forwardArgs: argv.slice(1) }
-  // Explicit `dim opentui ...` also routes to the opentui binary
-  // (kept for symmetry; opentui is the default).
-  if (argv[0] === 'opentui')
-    return { target: 'opentui', forwardArgs: argv.slice(1) }
-
-  // Default: everything goes to the opentui binary.
-  return { target: 'opentui', forwardArgs: argv }
-}
+const forwardArgs = args[0] === 'opentui' ? args.slice(1) : args
+runOpentui(forwardArgs).catch((err) => {
+  console.error('[dim] Unexpected error: ' + (err && err.stack ? err.stack : err))
+  process.exit(1)
+})
 
-async function runInk() {
-  const inkEntry = path.join(__dirname, '..', 'dist', 'ink.mjs')
-  if (!fs.existsSync(inkEntry)) {
-    console.error('[dim] Ink bundle missing: ' + inkEntry)
-    console.error('[dim] Try reinstalling dimcode@beta.')
-    process.exit(1)
-  }
-  // Inner CLI's DEFAULT_PACKAGE_NAME is already 'dimcode', so no override
-  // needed. Pass wrapper version through for diagnostics.
-  process.env.DIMCODE_NPM_PACKAGE = 'dimcode'
-  process.env.DIMCODE_NPM_PACKAGE_MANAGER = wrapperPm
-  if (wrapperVersion)
-    process.env.DIMCODE_NPM_PACKAGE_VERSION = wrapperVersion
-  try {
-    await import(pathToFileURL(inkEntry).href)
-  }
-  catch (err) {
-    console.error('[dim] Failed to start Ink TUI:')
-    console.error(err)
-    process.exit(1)
-  }
-}
-
-function runOpentui(restArgs) {
+async function runOpentui(restArgs) {
   const envPath = process.env.DIMCODE_BIN_PATH
   if (envPath) {
     if (!fs.existsSync(envPath)) {
@@ -91,17 +63,22 @@ function runOpentui(restArgs) {
   const archMap = { x64: 'x64', arm64: 'arm64' }
   const platform = platformMap[os.platform()] || os.platform()
   const arch = archMap[os.arch()] || os.arch()
-  const base = 'dimcode-' + platform + '-' + arch
-  const binary = platform === 'windows' ? 'dimcode.exe' : 'dimcode'
+  const base = wrapperName + '-' + platform + '-' + arch
+  const binary = platform === 'windows' ? binaryBasename + '.exe' : binaryBasename
 
   if (process.env.DIMCODE_DEBUG) {
-    console.error('[dim] Wrapper version: ' + wrapperVersion)
+    console.error('[dim] Wrapper: ' + wrapperName + '@' + wrapperVersion)
     console.error('[dim] Platform: ' + platform + ' Arch: ' + arch)
     console.error('[dim] Looking for package: ' + base)
     console.error('[dim] Script dir: ' + scriptDir)
   }
 
-  const resolved = findBinary(scriptDir, base, binary)
+  let resolved = findBinary(scriptDir, base, binary)
+
+  if (!resolved) {
+    resolved = await ensureCachedBinary(base, binary, wrapperVersion)
+  }
+
   if (!resolved) {
     console.error(
       '[dim] Could not find the opentui binary for your platform.\n'
@@ -112,7 +89,7 @@ function runOpentui(restArgs) {
       + '  Searched:  ' + scriptDir + ' (and parent directories)\n'
       + '\n'
       + 'Try uninstalling and reinstalling the beta channel:\n'
-      + '  npm uninstall -g dimcode && npm install -g dimcode@beta\n',
+      + '  npm uninstall -g ' + wrapperName + ' && npm install -g ' + wrapperName + '@beta\n',
     )
     process.exit(1)
   }
@@ -123,6 +100,128 @@ function runOpentui(restArgs) {
   spawnBinary(resolved, restArgs)
 }
 
+async function ensureCachedBinary(base, binary, version) {
+  if (!version) {
+    if (process.env.DIMCODE_DEBUG)
+      console.error('[dim] No wrapper version available; skipping registry fallback')
+    return null
+  }
+  if (process.env.DIMCODE_NO_DOWNLOAD === '1') {
+    if (process.env.DIMCODE_DEBUG)
+      console.error('[dim] DIMCODE_NO_DOWNLOAD=1; skipping registry fallback')
+    return null
+  }
+
+  const home = os.homedir()
+  const cacheDir = path.join(home, '.dimcode', 'binaries', base, version)
+  const cachedBin = path.join(cacheDir, 'bin', binary)
+  if (fs.existsSync(cachedBin)) {
+    if (process.env.DIMCODE_DEBUG)
+      console.error('[dim] Using cached binary: ' + cachedBin)
+    return cachedBin
+  }
+
+  if (typeof fetch !== 'function') {
+    console.error('[dim] Registry fallback requires Node 18+ (global fetch). Please reinstall after upgrading Node.')
+    return null
+  }
+
+  const registry = (process.env.DIMCODE_REGISTRY || 'https://registry.npmjs.org').replace(/\/+$/, '')
+  const url = registry + '/' + base + '/-/' + base + '-' + version + '.tgz'
+
+  console.error('[dim] Platform binary missing locally. Fetching ' + base + '@' + version + '...')
+  if (process.env.DIMCODE_DEBUG)
+    console.error('[dim] URL: ' + url)
+
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'dimcode-dl-'))
+  const tgzPath = path.join(tmpDir, 'pkg.tgz')
+
+  try {
+    await downloadFile(url, tgzPath)
+    fs.mkdirSync(cacheDir, { recursive: true })
+    extractTarball(tgzPath, cacheDir)
+    if (!isWindows && fs.existsSync(cachedBin)) {
+      try { fs.chmodSync(cachedBin, 0o755) }
+      catch {}
+    }
+  }
+  catch (err) {
+    console.error('[dim] Failed to fetch platform binary: ' + (err && err.message ? err.message : err))
+    console.error('[dim] You can retry, set DIMCODE_BIN_PATH to a local binary, or reinstall with:')
+    console.error('  npm uninstall -g ' + wrapperName + ' && npm install -g ' + wrapperName + '@beta')
+    return null
+  }
+  finally {
+    try { fs.rmSync(tmpDir, { recursive: true, force: true }) }
+    catch {}
+  }
+
+  if (!fs.existsSync(cachedBin)) {
+    console.error('[dim] Downloaded archive did not contain expected binary at ' + cachedBin)
+    return null
+  }
+
+  console.error('[dim] Cached at ' + cachedBin)
+  return cachedBin
+}
+
+async function downloadFile(url, dest) {
+  let currentUrl = url
+  for (let hop = 0; hop < 5; hop++) {
+    const res = await fetch(currentUrl, { redirect: 'manual' })
+    if (res.status >= 300 && res.status < 400 && res.headers.get('location')) {
+      currentUrl = new URL(res.headers.get('location'), currentUrl).toString()
+      continue
+    }
+    if (!res.ok)
+      throw new Error('HTTP ' + res.status + ' ' + res.statusText + ' for ' + currentUrl)
+
+    const total = Number(res.headers.get('content-length') || 0)
+    const out = fs.createWriteStream(dest)
+    let downloaded = 0
+    let lastShown = -1
+    const reader = res.body.getReader()
+    for (;;) {
+      const { done, value } = await reader.read()
+      if (done) break
+      out.write(Buffer.from(value))
+      downloaded += value.length
+      if (total && process.stderr.isTTY) {
+        const pct = Math.floor((downloaded / total) * 100)
+        if (pct !== lastShown && pct % 5 === 0) {
+          process.stderr.write('\r[dim] Downloading... ' + pct + '%')
+          lastShown = pct
+        }
+      }
+    }
+    out.end()
+    await new Promise((resolve, reject) => {
+      out.on('close', resolve)
+      out.on('error', reject)
+    })
+    if (process.stderr.isTTY)
+      process.stderr.write('\r[dim] Downloaded ' + (downloaded / 1024 / 1024).toFixed(1) + ' MB        \n')
+    else
+      console.error('[dim] Downloaded ' + (downloaded / 1024 / 1024).toFixed(1) + ' MB')
+    return
+  }
+  throw new Error('Too many redirects')
+}
+
+function extractTarball(tgzPath, destDir) {
+  const result = childProcess.spawnSync(
+    'tar',
+    ['-xzf', tgzPath, '-C', destDir, '--strip-components=1'],
+    { stdio: process.env.DIMCODE_DEBUG ? 'inherit' : 'pipe' },
+  )
+  if (result.error)
+    throw new Error('tar not available: ' + result.error.message)
+  if (result.status !== 0) {
+    const stderr = result.stderr ? result.stderr.toString() : ''
+    throw new Error('tar exited with status ' + result.status + (stderr ? ': ' + stderr.trim() : ''))
+  }
+}
+
 function findBinary(startDir, base, binary) {
   let current = startDir
   for (;;) {
@@ -142,7 +241,7 @@ function findBinary(startDir, base, binary) {
 function spawnBinary(target, forwardedArgs) {
   const env = {
     ...process.env,
-    DIMCODE_NPM_PACKAGE: 'dimcode',
+    DIMCODE_NPM_PACKAGE: wrapperName,
     DIMCODE_NPM_PACKAGE_MANAGER: wrapperPm,
     DIMCODE_NPM_PACKAGE_ROOT: path.resolve(__dirname, '..'),
   }
@@ -166,7 +265,7 @@ function spawnBinary(target, forwardedArgs) {
           '[dim] The binary file was not found. Try reinstalling:',
         )
         console.error(
-          '  npm uninstall -g dimcode && npm install -g dimcode@beta',
+          '  npm uninstall -g ' + wrapperName + ' && npm install -g ' + wrapperName + '@beta',
         )
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dimcode",
-  "version": "0.0.67-beta.8",
+  "version": "0.0.67",
   "description": "AI coding agent CLI and terminal coding assistant with an interactive TUI (beta channel)",
   "type": "module",
   "bin": {
@@ -8,14 +8,13 @@
     "dimcode": "./bin/dim.mjs"
   },
   "files": [
-    "bin",
-    "dist"
+    "bin"
   ],
   "optionalDependencies": {
-    "dimcode-darwin-arm64": "0.0.67-beta.8",
-    "dimcode-darwin-x64": "0.0.67-beta.8",
-    "dimcode-linux-arm64": "0.0.67-beta.8",
-    "dimcode-linux-x64": "0.0.67-beta.8",
-    "dimcode-windows-x64": "0.0.67-beta.8"
+    "dimcode-darwin-arm64": "0.0.67",
+    "dimcode-darwin-x64": "0.0.67",
+    "dimcode-linux-arm64": "0.0.67",
+    "dimcode-linux-x64": "0.0.67",
+    "dimcode-windows-x64": "0.0.67"
   }
 }