@surph_ai/cli 0.0.5 → 0.0.7

package/cli.js

@@ -17,7 +17,7 @@ const AdmZip = require('adm-zip')
 // const auth = require('./auth')
 const deploy = require('./deploy')
 const scaffold = require('./scaffold')
-const { ensureChat } = require('./toolserver/ensure-chat')
+const { ensureChat, chatNodePath } = require('./toolserver/ensure-chat')
 const utils = require('./utils')
 const packageJson = require('./package.json')
 
@@ -166,6 +166,7 @@ program.command('chatserver')
       cliVersion: VERSION,
       log: (msg) => console.log(colors.cyan(`\n${msg}\n`))
     })
+    process.env.NODE_PATH = chatNodePath()
     shell.exec(`nodemon --quiet "${chatPath}"`)
   } catch (error) {
     utils.printError(error)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surph_ai/cli",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "",
   "main": "index.js",
   "types": "./types.d.ts",

package/toolserver/ensure-chat.js

@@ -1,15 +1,29 @@
 const crypto = require('crypto')
 const fs = require('fs')
-const os = require('os')
 const path = require('path')
 
 const MANIFEST_URL = 'https://surph.s3.us-east-1.amazonaws.com/tools/cli/manifest.json'
 const CHAT_URL = 'https://surph.s3.us-east-1.amazonaws.com/tools/cli/chat.js'
-const CACHE_DIR = path.join(os.homedir(), '.surph', 'cache')
-const CACHE_FILE = path.join(CACHE_DIR, 'chat.js')
-const CACHE_META = path.join(CACHE_DIR, 'chat.meta.json')
+const CLI_NODE_MODULES = path.join(__dirname, '..', 'node_modules')
 const BUNDLED_FALLBACK = path.join(__dirname, 'chat.js')
 
+const cachePaths = () => {
+  const cacheDir = path.join(process.cwd(), 'node_modules', '@surph_ai', 'cache')
+  return {
+    cacheDir,
+    cacheFile: path.join(cacheDir, 'chat.js'),
+    cacheMeta: path.join(cacheDir, 'manifest.json')
+  }
+}
+
+const chatNodePath = () => {
+  const dirs = [
+    CLI_NODE_MODULES,
+    path.join(process.cwd(), 'node_modules')
+  ].filter((dir) => fs.existsSync(dir))
+  return [...dirs, process.env.NODE_PATH].filter(Boolean).join(path.delimiter)
+}
+
 const parseVersion = (value) => String(value || '0').split('.').map((part) => {
   const n = parseInt(part, 10)
   return Number.isFinite(n) ? n : 0
@@ -39,11 +53,12 @@ const readJsonFile = (filepath) => {
 }
 
 const cacheMatches = (manifest) => {
-  const meta = readJsonFile(CACHE_META)
+  const { cacheFile, cacheMeta } = cachePaths()
+  const meta = readJsonFile(cacheMeta)
   if (!meta || meta.sha256 !== manifest.sha256) return false
-  if (!fs.existsSync(CACHE_FILE)) return false
+  if (!fs.existsSync(cacheFile)) return false
   if (manifest.size) {
-    const { size } = fs.statSync(CACHE_FILE)
+    const { size } = fs.statSync(cacheFile)
     if (size !== manifest.size) return false
   }
   return true
@@ -80,15 +95,22 @@ const downloadChat = async (manifest) => {
     throw new Error('Chat server checksum mismatch')
   }
 
-  fs.mkdirSync(CACHE_DIR, { recursive: true, mode: 0o700 })
-  const tmp = `${CACHE_FILE}.tmp`
-  fs.writeFileSync(tmp, buf, { mode: 0o600 })
-  fs.renameSync(tmp, CACHE_FILE)
-  fs.writeFileSync(CACHE_META, JSON.stringify(manifest, null, 2) + '\n', { mode: 0o600 })
+  const { cacheDir, cacheFile, cacheMeta } = cachePaths()
+  fs.mkdirSync(cacheDir, { recursive: true })
+  fs.writeFileSync(path.join(cacheDir, 'package.json'), JSON.stringify({
+    name: '@surph_ai/cache',
+    private: true,
+    type: 'commonjs'
+  }, null, 2) + '\n')
+  const tmp = `${cacheFile}.tmp`
+  fs.writeFileSync(tmp, buf)
+  fs.renameSync(tmp, cacheFile)
+  fs.writeFileSync(cacheMeta, JSON.stringify(manifest, null, 2) + '\n')
 }
 
 const fallbackPath = () => {
-  if (fs.existsSync(CACHE_FILE)) return CACHE_FILE
+  const { cacheFile } = cachePaths()
+  if (fs.existsSync(cacheFile)) return cacheFile
   if (fs.existsSync(BUNDLED_FALLBACK)) return BUNDLED_FALLBACK
   return null
 }
@@ -112,14 +134,15 @@ const ensureChat = async ({ cliVersion, log } = {}) => {
     )
   }
 
+  const { cacheFile } = cachePaths()
   if (cacheMatches(manifest)) {
-    return CACHE_FILE
+    return cacheFile
   }
 
-  if (log) log('Downloading latest chat server...')
+  // if (log) log('Downloading latest chat server...')
   try {
     await downloadChat(manifest)
-    return CACHE_FILE
+    return cacheFile
   } catch (error) {
     const fallback = fallbackPath()
     if (fallback) {
@@ -130,4 +153,4 @@ const ensureChat = async ({ cliVersion, log } = {}) => {
   }
 }
 
-module.exports = { ensureChat }
+module.exports = { ensureChat, chatNodePath }