@surph_ai/sdk 0.0.25 → 0.0.26

package/cli.js

@@ -0,0 +1,449 @@
+#!/usr/bin/env node
+
+// REFERENCE:
+// https://developer.atlassian.com/blog/2015/11/scripting-with-node/
+// https://www.npmjs.com/package/shelljs
+// https://github.com/expressjs/generator/blob/master/bin/express-cli.js
+// https://developer.atlassian.com/blog/2015/11/scripting-with-node/
+
+const { Command } = require('commander')
+const path = require('path')
+const fs = require('fs')
+const dotenv = require('dotenv')
+const prompt = require('prompt')
+const shell = require('shelljs')
+const colors = require('colors/safe')
+const AdmZip = require('adm-zip')
+// const auth = require('./auth')
+const deploy = require('./deploy')
+const scaffold = require('./scaffold')
+const utils = require('./utils')
+const packageJson = require('./package.json')
+
+const VERSION = packageJson.version
+const SURPH_REST_URL = 'https://surph-mongo-http-19075ff8d93f.herokuapp.com'
+// const RPC_URL = 'https://e3lunom2hka3u6iiotrlzrcez40uwdnk.lambda-url.us-east-1.on.aws'
+
+// FUTURE: Export as a referenceable type
+const ERRORS = {
+  // General errors
+  UNSPECIFIED: { exitCode: 1 },
+  INVALID_PARAMS: { exitCode: 2 },
+  NOT_LOGGED_IN: { exitCode: 3 },
+
+  // Deploy-specific errors
+  PROJECT_NOT_CONNECTED: { exitCode: 100 },
+  PROJECT_NOT_FOUND: { exitCode: 101 },
+  NOT_AUTHORIZED: { exitCode: 102 },
+};
+
+const surphSession = async () => {
+  try {
+    const userSessionPath = path.resolve(__dirname, '../../../.surph/session.json')
+    if (!fs.existsSync(userSessionPath)) {
+      console.log('Not logged in.')
+      return null
+    }
+    
+    const file = fs.readFileSync(userSessionPath, 'utf-8')
+    const session = JSON.parse(file)
+    return session
+  } catch (error) {
+    console.log('Not logged in.')
+    return null
+  }
+}
+
+const program = new Command()
+
+program.version(VERSION, '-v, --version', 'output the current version')
+
+program.command('help')
+.description('help')
+.action(() => {
+  console.log('HELP!')
+})
+
+program.command('version')
+.description('show current version')
+.action((cmd, options) => {
+  try {
+    const text = `${colors.cyan(`\nSurph Version: `)} ${colors.brightGreen(`${VERSION}`)}\n`
+    console.log(text)
+  } catch (error) {
+    // console.log(colors.red('\nError: '+err.message+'\n'))
+    utils.printError(error)
+  }
+})
+
+program.command('profile')
+.description('Current Surph user')
+.action(async (cmd, options) => {
+  // const userSessionPath = path.resolve(__dirname, '../../../.surph/session.json')
+  // if (!fs.existsSync(userSessionPath)) {
+  //   console.log('SESSION NOT FOUND:')
+  //   return
+  // }
+
+  // const file = fs.readFileSync(userSessionPath, 'utf-8')
+  // const data = JSON.parse(file)
+  // console.log('SESSION FOUND:' + JSON.stringify(data))
+
+  // const user = await auth.currentUser()
+  // if (user === false) {
+  //   program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
+  //     ERRORS.NOT_LOGGED_IN);
+  // }
+
+  // const text = `${colors.cyan(`\nLogged in as: `)} ${colors.brightGreen(`${user.username}`)}\n`
+  // console.log(text)
+})
+
+/*
+program.command('login')
+.description('login to Surph')
+.action(async (cmd, options) => {
+  try {
+    const credentials = await auth.showPrompt()
+
+    const resp = await axios({
+      url: `${PORTAL_URL}/auth/login`,
+      method: 'post',
+      data: credentials,
+      headers: { Accept: 'application/json'}
+    })
+
+    const { data } = resp.data
+		const user = { id: data._id, username: data.username }
+
+		shell.cd('')
+		utils.write('.Surph_user', JSON.stringify(user, null, 2) + '\n')
+
+    const successText = `${colors.cyan(`\nSuccess! `)} ${colors.brightGreen(`Currently Logged In As ${user.username}\n`)}`
+    console.log(successText)
+  } catch (error) {
+    utils.printError(error)
+  }
+})
+
+program.command('dev')
+.description('run dev server')
+.action(async (cmd, options) => {
+  try {
+  	// shell.cp('-R', path.join(__dirname, '../default/lambda/js/index.js'), 'vectors/js/index.js')
+		shell.cd(path.join(__dirname, 'base/Surph-base'))
+    shell.exec('npm run dev')
+		// shell.cd('Surph-base')
+
+    // shell.exec('gulp build --gulpfile node_modules/@turbo360/turbo-sdk/src/gulpfile.js --silent')
+
+  } catch (error) {
+    utils.printError(error)
+  }
+})
+*/
+
+program.command('new <name>')
+.description('create new Surph app')
+.action(name => scaffold(name, 'project'))
+
+program.command('toolserver')
+.description('run tool server')
+.action(async (cmd, options) => {
+  try {
+    shell.exec('nodemon --quiet ./node_modules/@surph_ai/sdk/toolserver/app')
+  } catch (error) {
+    utils.printError(error)
+  }
+})
+
+program.command('chatserver')
+.description('run chat server')
+.action(async (cmd, options) => {
+  try {
+    shell.exec('nodemon --quiet ./node_modules/@surph_ai/sdk/toolserver/chat')
+  } catch (error) {
+    utils.printError(error)
+  }
+})
+
+program.command('tool <name>')
+.description('create new Surph tool')
+.action(name => scaffold(name, 'tool'))
+
+program.command('manifest')
+.description('update manifest for Surph tool')
+.action(async (cmd, options) => {
+  try {
+    const manifestJson = require('../../../manifest.json')
+    const slug = Object.keys(manifestJson)[0]
+    const manifest = manifestJson[slug]
+    if (!manifest) {
+      throw new Error('manifest.json not found')
+    }
+
+    const schema = {
+      properties: {
+        description: {
+          description: colors.cyan('\nWhat does your tool do?'),
+          required: true
+        }
+      }
+    }
+
+    prompt.message = null
+    prompt.start()
+
+    const { description } = await prompt.get(schema)
+    // console.log('ARGS: ' + JSON.stringify(args))
+
+    const resp = await fetch('https://rpc.surph.ai/tools/manifest', {
+      method: "POST",
+      body: JSON.stringify({
+        description,
+        name: manifest.name,
+        slug: manifest.slug
+      }),
+      headers: {
+        'Accept': 'application/json',
+        'Content-type': 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
+    })
+
+    const { response } = await resp.json()
+    const updated = { ...manifest, ...response }
+
+		utils.write('manifest.json', JSON.stringify({[slug]: updated}, null, 2) + '\n')
+    console.log(colors.white('\n\nManifest updated. Check manifest.json for changes.\n'))
+  } catch (error) {
+    utils.printError(error)
+  }
+})
+
+
+/*
+program.command('connect')
+.description('Connect to Surph project')
+.action(async (cmd, options) => {
+  try {
+    const user = await auth.currentUser() // must be logged in.
+    if (user === false) {
+      program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
+        ERRORS.NOT_LOGGED_IN);
+    }
+
+    const projects = await Realm.restQuery('project', 'get', { 'members.id': user.id })
+    if (projects.length === 0) {
+      throw new Error(`No Projects not found.`)
+    }
+
+    // console.log('PROJECTS: ' + JSON.stringify(projects))
+
+    const _projects = projects.map(({ name }, idx) => `${idx + 1}. ${name}`)
+
+    const schema = {
+      properties: {
+        framework: {
+          message: `\n\n${_projects.join('\n')}\n\nSelect project number then press "enter"\n`,
+          required: true
+        }
+      }
+    }
+
+    prompt.start()
+
+    prompt.get(schema, (err, result) => {
+      if (err) {
+        console.log('\n')
+        return
+      }
+
+      const selected = result.framework.trim()
+      const index = parseInt(selected - 1)
+
+      if (index < 0) {
+        utils.printError(new Error('Invalid entry.'))
+        return
+      }
+
+      if (_projects.length < (index + 1)) {
+        utils.printError(new Error('Invalid entry.'))
+        return
+      }
+
+      const selectedApp = projects[index]
+      if (!selectedApp) {
+        utils.printError(new Error('Invalid entry.'))
+        return
+      }
+
+      // console.log('SELECTED: ' + JSON.stringify(selectedApp))
+      const { name, slug } = selectedApp
+      const envFile = utils.readFile('.env') || '{}'
+      const envJson = dotenv.parse(envFile)
+
+      const env = {
+        ...envJson,
+        'TURBO_PROJECT': name,
+        'TURBO_PROJECT_SLUG': slug
+      }
+
+      let envString = ''
+      Object.keys(env).forEach((key, i) => {
+        if (env[key] !== null) {
+          envString += key+'='+env[key]+'\n'
+        }
+      })
+
+      utils.write('.env', envString)
+      console.log('\nApp Connected!\nto deploy:\n\n$ vly deploy\n\n')
+    })
+  } catch (error) {
+    utils.printError(error)
+  }
+})
+*/
+
+program.command('publish')
+.description('Publish Surph tool')
+.action(async (cmd, options) => {
+  try {
+    const manifest = require('../../../manifest.json')
+    if (!manifest) {
+      throw new Error('manifest.json not found')
+    }
+
+    const keys = Object.keys(manifest)
+    if (keys.length === 0) {
+      throw new Error('invalid manifest.json')
+    }
+
+    const session = await surphSession()
+    if (!session) {
+      throw new Error('Not logged in.')
+    }
+
+    // console.log('SESSION: ' + JSON.stringify(session))
+    const userId = session?.userId
+
+    let resp = await fetch(`${SURPH_REST_URL}/rest/user/${userId}`, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
+    })
+
+    const { payload: user } = await resp.json()
+    // console.log('USER: ' + JSON.stringify(user))
+
+
+    const slug = keys[0]
+    resp = await fetch(`${SURPH_REST_URL}/rest/tool?slug=${slug}`, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
+    })
+
+    const { payload } = await resp.json()
+
+    const toolJson = manifest[slug]
+
+    // tool not registered yet, create:
+    if (payload.length === 0) {
+      const resp = await fetch(`${SURPH_REST_URL}/rest/tool`, {
+        method: 'POST',
+        body: JSON.stringify({
+          ...toolJson,
+          creator: {
+            _id: user._id,
+            username: user.username,
+            avatar: user.avatar
+          }
+        }),
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          'x-surph-client': 'surph-sdk'
+        }
+      })
+    
+      const { payload } = await resp.json()
+      console.log(`\nSurph tool registered. To view, visit:\n\nhttps://surph.ai/tool/${slug}\n`)
+      return
+    }
+
+    resp = await fetch(`${SURPH_REST_URL}/rest/tool/${payload[0]._id}`, {
+      method: 'PUT',
+      body: JSON.stringify({
+        ...toolJson,
+        creator: {
+          _id: user._id,
+          username: user.username,
+          avatar: user.avatar
+        }
+      }),
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
+    })
+  
+    const data = await resp.json()
+    console.log('\nSurph tool updated.')
+  } catch (error) {
+    console.log(colors.red('\nError: '+error.message+'\n'))
+  }
+})
+
+
+program.command('deploy')
+.description('Deploy to Surph')
+.action(async (cmd, options) => {
+  try {
+    /*
+    const { type } = cmd
+    if (type !== 'default' && type !== 'static') {
+      const msg = colors.red(`\nError: Invalid deployment type ${type}.\n`) +
+        colors.white(`Please select type "static" or omit type flag.\n`);
+      program.error(msg, ERRORS.INVALID_PARAMS)
+    }
+
+    const user = await auth.currentUser() // must be logged in.
+    if (user === false) {
+      program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
+        ERRORS.NOT_LOGGED_IN);
+    }
+
+    */
+
+    /*
+    const apps = await Realm.restQuery('project', 'get', { slug: TURBO_PROJECT_SLUG })
+    if (apps.length === 0) {
+      program.error(`App ${TURBO_PROJECT} not found.`, ERRORS.PROJECT_NOT_FOUND)
+    }
+
+    const { members } = apps[0]
+    if (!members.find(member => (member.id === user.id))) {
+      program.error('Unauthorized', ERRORS.NOT_AUTHORIZED)
+    }
+    */
+
+    const { SURPH_TOOL = null } = dotenv.parse(utils.readFile('.env') ?? '')
+
+    if (SURPH_TOOL === null) {
+      program.error('Surph project not connected. To connect, run:\n\n$ surph connect', ERRORS.PROJECT_NOT_CONNECTED)
+    }
+
+    await deploy.tool({ SURPH_TOOL_SLUG: SURPH_TOOL })
+  } catch (error) {
+    utils.printError(error)
+    program.error(`Unexpected error: ${error}`, ERRORS.UNSPECIFIED)
+  }
+})
+
+program.parse(process.argv)

package/index.js

@@ -1,449 +0,0 @@
-#!/usr/bin/env node
-
-// REFERENCE:
-// https://developer.atlassian.com/blog/2015/11/scripting-with-node/
-// https://www.npmjs.com/package/shelljs
-// https://github.com/expressjs/generator/blob/master/bin/express-cli.js
-// https://developer.atlassian.com/blog/2015/11/scripting-with-node/
-
-const { Command } = require('commander')
-const path = require('path')
-const fs = require('fs')
-const dotenv = require('dotenv')
-const prompt = require('prompt')
-const shell = require('shelljs')
-const colors = require('colors/safe')
-const AdmZip = require('adm-zip')
-const auth = require('./auth')
-const deploy = require('./deploy')
-const scaffold = require('./scaffold')
-const utils = require('./utils')
-const packageJson = require('./package.json')
-
-const VERSION = packageJson.version
-const SURPH_REST_URL = 'https://surph-mongo-http-19075ff8d93f.herokuapp.com'
-// const RPC_URL = 'https://e3lunom2hka3u6iiotrlzrcez40uwdnk.lambda-url.us-east-1.on.aws'
-
-// FUTURE: Export as a referenceable type
-const ERRORS = {
-  // General errors
-  UNSPECIFIED: { exitCode: 1 },
-  INVALID_PARAMS: { exitCode: 2 },
-  NOT_LOGGED_IN: { exitCode: 3 },
-
-  // Deploy-specific errors
-  PROJECT_NOT_CONNECTED: { exitCode: 100 },
-  PROJECT_NOT_FOUND: { exitCode: 101 },
-  NOT_AUTHORIZED: { exitCode: 102 },
-};
-
-const surphSession = async () => {
-  try {
-    const userSessionPath = path.resolve(__dirname, '../../../.surph/session.json')
-    if (!fs.existsSync(userSessionPath)) {
-      console.log('Not logged in.')
-      return null
-    }
-    
-    const file = fs.readFileSync(userSessionPath, 'utf-8')
-    const session = JSON.parse(file)
-    return session
-  } catch (error) {
-    console.log('Not logged in.')
-    return null
-  }
-}
-
-const program = new Command()
-
-program.version(VERSION, '-v, --version', 'output the current version')
-
-program.command('help')
-.description('help')
-.action(() => {
-  console.log('HELP!')
-})
-
-program.command('version')
-.description('show current version')
-.action((cmd, options) => {
-  try {
-    const text = `${colors.cyan(`\nSurph Version: `)} ${colors.brightGreen(`${VERSION}`)}\n`
-    console.log(text)
-  } catch (error) {
-    // console.log(colors.red('\nError: '+err.message+'\n'))
-    utils.printError(error)
-  }
-})
-
-program.command('profile')
-.description('Current Surph user')
-.action(async (cmd, options) => {
-  // const userSessionPath = path.resolve(__dirname, '../../../.surph/session.json')
-  // if (!fs.existsSync(userSessionPath)) {
-  //   console.log('SESSION NOT FOUND:')
-  //   return
-  // }
-
-  // const file = fs.readFileSync(userSessionPath, 'utf-8')
-  // const data = JSON.parse(file)
-  // console.log('SESSION FOUND:' + JSON.stringify(data))
-
-  // const user = await auth.currentUser()
-  // if (user === false) {
-  //   program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
-  //     ERRORS.NOT_LOGGED_IN);
-  // }
-
-  // const text = `${colors.cyan(`\nLogged in as: `)} ${colors.brightGreen(`${user.username}`)}\n`
-  // console.log(text)
-})
-
-/*
-program.command('login')
-.description('login to Surph')
-.action(async (cmd, options) => {
-  try {
-    const credentials = await auth.showPrompt()
-
-    const resp = await axios({
-      url: `${PORTAL_URL}/auth/login`,
-      method: 'post',
-      data: credentials,
-      headers: { Accept: 'application/json'}
-    })
-
-    const { data } = resp.data
-		const user = { id: data._id, username: data.username }
-
-		shell.cd('')
-		utils.write('.Surph_user', JSON.stringify(user, null, 2) + '\n')
-
-    const successText = `${colors.cyan(`\nSuccess! `)} ${colors.brightGreen(`Currently Logged In As ${user.username}\n`)}`
-    console.log(successText)
-  } catch (error) {
-    utils.printError(error)
-  }
-})
-
-program.command('dev')
-.description('run dev server')
-.action(async (cmd, options) => {
-  try {
-  	// shell.cp('-R', path.join(__dirname, '../default/lambda/js/index.js'), 'vectors/js/index.js')
-		shell.cd(path.join(__dirname, 'base/Surph-base'))
-    shell.exec('npm run dev')
-		// shell.cd('Surph-base')
-
-    // shell.exec('gulp build --gulpfile node_modules/@turbo360/turbo-sdk/src/gulpfile.js --silent')
-
-  } catch (error) {
-    utils.printError(error)
-  }
-})
-*/
-
-program.command('new <name>')
-.description('create new Surph app')
-.action(name => scaffold(name, 'project'))
-
-program.command('toolserver')
-.description('run tool server')
-.action(async (cmd, options) => {
-  try {
-    shell.exec('nodemon --quiet ./node_modules/@surph_ai/sdk/toolserver/app')
-  } catch (error) {
-    utils.printError(error)
-  }
-})
-
-program.command('chatserver')
-.description('run chat server')
-.action(async (cmd, options) => {
-  try {
-    shell.exec('nodemon --quiet ./node_modules/@surph_ai/sdk/toolserver/chat')
-  } catch (error) {
-    utils.printError(error)
-  }
-})
-
-program.command('tool <name>')
-.description('create new Surph tool')
-.action(name => scaffold(name, 'tool'))
-
-program.command('manifest')
-.description('update manifest for Surph tool')
-.action(async (cmd, options) => {
-  try {
-    const manifestJson = require('../../../manifest.json')
-    const slug = Object.keys(manifestJson)[0]
-    const manifest = manifestJson[slug]
-    if (!manifest) {
-      throw new Error('manifest.json not found')
-    }
-
-    const schema = {
-      properties: {
-        description: {
-          description: colors.cyan('\nWhat does your tool do?'),
-          required: true
-        }
-      }
-    }
-
-    prompt.message = null
-    prompt.start()
-
-    const { description } = await prompt.get(schema)
-    // console.log('ARGS: ' + JSON.stringify(args))
-
-    const resp = await fetch('https://rpc.surph.ai/tools/manifest', {
-      method: "POST",
-      body: JSON.stringify({
-        description,
-        name: manifest.name,
-        slug: manifest.slug
-      }),
-      headers: {
-        'Accept': 'application/json',
-        'Content-type': 'application/json',
-        'x-surph-client': 'surph-sdk'
-      }
-    })
-
-    const { response } = await resp.json()
-    const updated = { ...manifest, ...response }
-
-		utils.write('manifest.json', JSON.stringify({[slug]: updated}, null, 2) + '\n')
-    console.log(colors.white('\n\nManifest updated. Check manifest.json for changes.\n'))
-  } catch (error) {
-    utils.printError(error)
-  }
-})
-
-
-/*
-program.command('connect')
-.description('Connect to Surph project')
-.action(async (cmd, options) => {
-  try {
-    const user = await auth.currentUser() // must be logged in.
-    if (user === false) {
-      program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
-        ERRORS.NOT_LOGGED_IN);
-    }
-
-    const projects = await Realm.restQuery('project', 'get', { 'members.id': user.id })
-    if (projects.length === 0) {
-      throw new Error(`No Projects not found.`)
-    }
-
-    // console.log('PROJECTS: ' + JSON.stringify(projects))
-
-    const _projects = projects.map(({ name }, idx) => `${idx + 1}. ${name}`)
-
-    const schema = {
-      properties: {
-        framework: {
-          message: `\n\n${_projects.join('\n')}\n\nSelect project number then press "enter"\n`,
-          required: true
-        }
-      }
-    }
-
-    prompt.start()
-
-    prompt.get(schema, (err, result) => {
-      if (err) {
-        console.log('\n')
-        return
-      }
-
-      const selected = result.framework.trim()
-      const index = parseInt(selected - 1)
-
-      if (index < 0) {
-        utils.printError(new Error('Invalid entry.'))
-        return
-      }
-
-      if (_projects.length < (index + 1)) {
-        utils.printError(new Error('Invalid entry.'))
-        return
-      }
-
-      const selectedApp = projects[index]
-      if (!selectedApp) {
-        utils.printError(new Error('Invalid entry.'))
-        return
-      }
-
-      // console.log('SELECTED: ' + JSON.stringify(selectedApp))
-      const { name, slug } = selectedApp
-      const envFile = utils.readFile('.env') || '{}'
-      const envJson = dotenv.parse(envFile)
-
-      const env = {
-        ...envJson,
-        'TURBO_PROJECT': name,
-        'TURBO_PROJECT_SLUG': slug
-      }
-
-      let envString = ''
-      Object.keys(env).forEach((key, i) => {
-        if (env[key] !== null) {
-          envString += key+'='+env[key]+'\n'
-        }
-      })
-
-      utils.write('.env', envString)
-      console.log('\nApp Connected!\nto deploy:\n\n$ vly deploy\n\n')
-    })
-  } catch (error) {
-    utils.printError(error)
-  }
-})
-*/
-
-program.command('publish')
-.description('Publish Surph tool')
-.action(async (cmd, options) => {
-  try {
-    const manifest = require('../../../manifest.json')
-    if (!manifest) {
-      throw new Error('manifest.json not found')
-    }
-
-    const keys = Object.keys(manifest)
-    if (keys.length === 0) {
-      throw new Error('invalid manifest.json')
-    }
-
-    const session = await surphSession()
-    if (!session) {
-      throw new Error('Not logged in.')
-    }
-
-    // console.log('SESSION: ' + JSON.stringify(session))
-    const userId = session?.userId
-
-    let resp = await fetch(`${SURPH_REST_URL}/rest/user/${userId}`, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        'x-surph-client': 'surph-sdk'
-      }
-    })
-
-    const { payload: user } = await resp.json()
-    // console.log('USER: ' + JSON.stringify(user))
-
-
-    const slug = keys[0]
-    resp = await fetch(`${SURPH_REST_URL}/rest/tool?slug=${slug}`, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        'x-surph-client': 'surph-sdk'
-      }
-    })
-
-    const { payload } = await resp.json()
-
-    const toolJson = manifest[slug]
-
-    // tool not registered yet, create:
-    if (payload.length === 0) {
-      const resp = await fetch(`${SURPH_REST_URL}/rest/tool`, {
-        method: 'POST',
-        body: JSON.stringify({
-          ...toolJson,
-          creator: {
-            _id: user._id,
-            username: user.username,
-            avatar: user.avatar
-          }
-        }),
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          'x-surph-client': 'surph-sdk'
-        }
-      })
-    
-      const { payload } = await resp.json()
-      console.log(`\nSurph tool registered. To view, visit:\n\nhttps://surph.ai/tool/${slug}\n`)
-      return
-    }
-
-    resp = await fetch(`${SURPH_REST_URL}/rest/tool/${payload[0]._id}`, {
-      method: 'PUT',
-      body: JSON.stringify({
-        ...toolJson,
-        creator: {
-          _id: user._id,
-          username: user.username,
-          avatar: user.avatar
-        }
-      }),
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-        'x-surph-client': 'surph-sdk'
-      }
-    })
-  
-    const data = await resp.json()
-    console.log('\nSurph tool updated.')
-  } catch (error) {
-    console.log(colors.red('\nError: '+error.message+'\n'))
-  }
-})
-
-
-program.command('deploy')
-.description('Deploy to Surph')
-.action(async (cmd, options) => {
-  try {
-    /*
-    const { type } = cmd
-    if (type !== 'default' && type !== 'static') {
-      const msg = colors.red(`\nError: Invalid deployment type ${type}.\n`) +
-        colors.white(`Please select type "static" or omit type flag.\n`);
-      program.error(msg, ERRORS.INVALID_PARAMS)
-    }
-
-    const user = await auth.currentUser() // must be logged in.
-    if (user === false) {
-      program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
-        ERRORS.NOT_LOGGED_IN);
-    }
-
-    */
-
-    /*
-    const apps = await Realm.restQuery('project', 'get', { slug: TURBO_PROJECT_SLUG })
-    if (apps.length === 0) {
-      program.error(`App ${TURBO_PROJECT} not found.`, ERRORS.PROJECT_NOT_FOUND)
-    }
-
-    const { members } = apps[0]
-    if (!members.find(member => (member.id === user.id))) {
-      program.error('Unauthorized', ERRORS.NOT_AUTHORIZED)
-    }
-    */
-
-    const { SURPH_TOOL = null } = dotenv.parse(utils.readFile('.env') ?? '')
-
-    if (SURPH_TOOL === null) {
-      program.error('Surph project not connected. To connect, run:\n\n$ surph connect', ERRORS.PROJECT_NOT_CONNECTED)
-    }
-
-    await deploy.tool({ SURPH_TOOL_SLUG: SURPH_TOOL })
-  } catch (error) {
-    utils.printError(error)
-    program.error(`Unexpected error: ${error}`, ERRORS.UNSPECIFIED)
-  }
-})
-
-program.parse(process.argv)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surph_ai/sdk",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "index.js",
   "types": "./types.d.ts",
@@ -11,7 +11,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "surph": "./index.js"
+    "surph": "./cli.js"
   },
   "keywords": [],
   "author": "SurphAI",

package/toolserver/chat.js

@@ -44931,7 +44931,7 @@ var require_searchContextItems = __commonJS({
       const controller = new AbortController();
       const timeoutId = setTimeout(() => controller.abort(), 3e4);
       const params = { query: query.trim(), context: contextSlug, limit: cappedLimit };
-      console.log("SEARCH CONTEXT: ", JSON.stringify(params, null, 2));
+      console.log("[searchContextItems] SEARCH CONTEXT: ", JSON.stringify(params, null, 2));
       try {
         const res = await fetch(`${SURPH_RPC_URL}/tools/search`, {
           method: "POST",
@@ -45108,7 +45108,7 @@ var require_searchContext = __commonJS({
     };
     var fetchCollection = async ({ query, contextSlug, collection, limit, signal }) => {
       const params = { query, context: contextSlug, collection, limit };
-      console.log("SEARCH CONTEXT: ", JSON.stringify(params, null, 2));
+      console.log("[fetchCollection] SEARCH CONTEXT: ", JSON.stringify(params, null, 2));
       const res = await fetch(`${SURPH_RPC_URL}/tools/search`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -63359,6 +63359,7 @@ var require_queryRewriter = __commonJS({
     var LABEL = "[queryRewriter]";
     var HISTORY_TURNS = 4;
     var SKIP_TOKEN = "SKIP";
+    var DELEGATE_TOKEN = "DELEGATE";
     var MAX_KEYWORD_TOKENS = 128;
     var PREFETCH_LIMIT = 20;
     var MAX_ANGLES = 3;
@@ -63371,20 +63372,30 @@ var require_queryRewriter = __commonJS({
         return `${speaker}: ${text}`;
       }).join("\n\n");
     }
-    function buildSystemPrompt(contextMeta) {
+    function buildSystemPrompt(contextMeta, customTools = []) {
       const name = contextMeta.name || contextMeta.slug;
       const topics = Array.isArray(contextMeta.topics) ? contextMeta.topics : [];
       const topicsBlock = topics.length ? topics.map((t) => `- ${t?.name || "Untitled"}${t?.description ? ` \u2014 ${t.description}` : ""}`).join("\n") : "(no topics defined)";
+      const hasCustomTools = Array.isArray(customTools) && customTools.length > 0;
+      const customToolsBlock = hasCustomTools ? `
+
+The user also has these custom tools installed. Each one operates on this same context but returns its own curated/structured results:
+
+${customTools.map((t) => `- ${t.name}: ${t.description}`).join("\n")}
+` : "";
+      const delegateOption = hasCustomTools ? `
+- ${DELEGATE_TOKEN} \u2014 one of the custom tools above is clearly what the user is asking for (its description covers the turn). Skip prefetch so the main LLM invokes the tool directly. When in doubt, still emit keywords \u2014 the tool remains available for the main LLM to call.` : "";
+      const delegateInOutputRule = hasCustomTools ? `${DELEGATE_TOKEN}, ` : "";
       return `You are a query rewriter for a retrieval pipeline. A user is chatting inside a context named "${name}" (slug: ${contextMeta.slug}). The context indexes items across these topics:
 
-${topicsBlock}
+${topicsBlock}${customToolsBlock}
 
 For the latest user turn, decide whether the assistant needs to retrieve items from this context to answer it. Then output ONE of:
 
-- ${SKIP_TOKEN} \u2014 the latest turn does NOT need retrieval. Use this ONLY for: greetings, thanks, meta/small-talk, questions about the assistant itself ("who are you", "what can you do"), or pure clarification questions about the wording of the assistant's prior reply ("what did you mean by X", "can you rephrase point 3"). Anything unrelated to the topics above also SKIPs.
+- ${SKIP_TOKEN} \u2014 the latest turn does NOT need retrieval. Use this ONLY for: greetings, thanks, meta/small-talk, questions about the assistant itself ("who are you", "what can you do"), or pure clarification questions about the wording of the assistant's prior reply ("what did you mean by X", "can you rephrase point 3"). Anything unrelated to the topics above also SKIPs.${delegateOption}
 - 1 to ${MAX_ANGLES} keyword lines, one per line. Each line is a DISTINCT ANGLE on the same underlying question \u2014 different vocabulary, different specificity, different framings someone else might use for the same concept. The search index is keyword-based and narrow: multiple angles improve recall.
 
-Each line: 3 to 10 keywords or short phrases separated by spaces. No punctuation, no numbering, no bullets, no quotes, no explanations.
+Each keyword line: 3 to 10 keywords or short phrases separated by spaces. No punctuation, no numbering, no bullets, no quotes, no explanations.
 
 Example \u2014 user asks "what orgs help me raise investment?":
 startup investors venture capital funding
@@ -63397,7 +63408,7 @@ Rules:
 - If the question is narrow enough that one angle covers it (e.g. a specific named entity), one line is fine.
 - Short follow-ups that ask for a new facet of a prior subject (who/when/where/how/how much, "any others", "more like this") are CONTENT lookups, not meta chatter. Resolve the pronoun/topic from the conversation history and combine (a) the subject entity from the prior turn with (b) the new facet the user is asking about. Do NOT skip these.
 - Focus keywords on nouns, entities, and domain terms. Drop filler words. If the user's turn is a pronoun-only follow-up, the keywords MUST include the subject noun from the prior turn.
-- Output ONLY ${SKIP_TOKEN} or the keyword lines. Nothing else.`;
+- Output ONLY ${SKIP_TOKEN}, ${delegateInOutputRule}or the keyword lines. Nothing else.`;
     }
     async function runCheapModel({ provider, cheapModel, systemPrompt, userMessage }) {
       if (provider === "openai") {
@@ -63453,12 +63464,14 @@ Rules:
       if (!cleaned) return { skip: true };
       const lines = cleaned.split("\n").map((s) => s.trim()).filter(Boolean);
       if (lines.length === 0) return { skip: true };
-      if (lines[0].toUpperCase() === SKIP_TOKEN) return { skip: true };
-      const angles = lines.map((l) => l.replace(/^[-*•]+\s*|^\d+[.)]\s*/, "").replace(/^["'`]+|["'`]+$/g, "").trim()).filter((l) => l && l.toUpperCase() !== SKIP_TOKEN).slice(0, MAX_ANGLES);
+      const first = lines[0].toUpperCase();
+      if (first === SKIP_TOKEN) return { skip: true };
+      if (first === DELEGATE_TOKEN) return { delegate: true };
+      const angles = lines.map((l) => l.replace(/^[-*•]+\s*|^\d+[.)]\s*/, "").replace(/^["'`]+|["'`]+$/g, "").trim()).filter((l) => l && l.toUpperCase() !== SKIP_TOKEN && l.toUpperCase() !== DELEGATE_TOKEN).slice(0, MAX_ANGLES);
       if (angles.length === 0) return { skip: true };
       return { skip: false, angles };
     }
-    async function rewriteAndSearch({ messages, contextMeta, model, session, outputStream = null }) {
+    async function rewriteAndSearch({ messages, contextMeta, model, session, outputStream = null, customTools = [] }) {
       if (!contextMeta?.slug || !Array.isArray(messages) || messages.length === 0) {
         return { skipped: true, reason: "no-context-or-messages" };
       }
@@ -63468,12 +63481,15 @@ Rules:
         console.warn(`${LABEL} no cheap model for provider ${provider}; skipping rewrite`);
         return { skipped: true, reason: "no-cheap-model" };
       }
-      const systemPrompt = buildSystemPrompt(contextMeta);
+      const usableTools = Array.isArray(customTools) ? customTools.filter((t) => t && typeof t.name === "string" && t.name.trim() && typeof t.description === "string" && t.description.trim()) : [];
+      const hasCustomTools = usableTools.length > 0;
+      const systemPrompt = buildSystemPrompt(contextMeta, usableTools);
+      const outputChoices = hasCustomTools ? `${SKIP_TOKEN}, ${DELEGATE_TOKEN}, or 1-${MAX_ANGLES} keyword lines` : `${SKIP_TOKEN} or 1-${MAX_ANGLES} keyword lines`;
       const userMessage = `Conversation so far:
 
 ${formatConversation(messages)}
 
-Output ${SKIP_TOKEN} or 1-${MAX_ANGLES} keyword lines (one per line).`;
+Output ${outputChoices} (one per line).`;
       let raw = "";
       try {
         raw = await runCheapModel({ provider, cheapModel, systemPrompt, userMessage });
@@ -63486,6 +63502,14 @@ Output ${SKIP_TOKEN} or 1-${MAX_ANGLES} keyword lines (one per line).`;
         console.log(`${LABEL} SKIP raw="${raw.trim().slice(0, 80)}" context=${contextMeta.slug}`);
         return { skipped: true, reason: "model-skip" };
       }
+      if (parsed.delegate) {
+        if (hasCustomTools) {
+          console.log(`${LABEL} DELEGATE to custom tool context=${contextMeta.slug} tools=${usableTools.map((t) => t.name).join(",")}`);
+          return { skipped: true, reason: "delegate-to-custom-tool" };
+        }
+        console.log(`${LABEL} DELEGATE received but no custom tools installed \u2014 treating as SKIP context=${contextMeta.slug}`);
+        return { skipped: true, reason: "delegate-without-tools" };
+      }
       const displayKeywords = parsed.angles.join(" | ");
       console.log(`${LABEL} angles=${parsed.angles.length} keywords="${displayKeywords}" context=${contextMeta.slug}`);
       const searches = await Promise.all(
@@ -94448,6 +94472,17 @@ Rules:
 === Retrieved items (${items.length}) ===
 ${lines}
 === End retrieved items ===`;
+    }
+    function frameCustomToolRouting(customTools, contextMeta) {
+      if (!contextMeta?.slug) return null;
+      const usable = Array.isArray(customTools) ? customTools.filter((t) => t && typeof t.name === "string" && t.name.trim() && typeof t.description === "string" && t.description.trim()) : [];
+      if (usable.length === 0) return null;
+      const toolList = usable.map((t) => `- ${t.name}: ${t.description}`).join("\n");
+      return `The user has these custom tools installed. Each is purpose-built for a specific type of query about the active context:
+
+${toolList}
+
+Routing rule: when the user's turn matches one of these tools' descriptions, PREFER the custom tool over \`searchContext\`. The custom tool returns curated/structured results tailored to that query type; \`searchContext\` is a generic keyword search. Only fall back to \`searchContext\` for questions the custom tools don't cover.`;
     }
     function frameDate() {
       const now = /* @__PURE__ */ new Date();
@@ -94616,15 +94651,18 @@ Always use absolute paths for file operations. When the user asks to create a fi
       workingDirectory,
       systemFromHistory,
       contextMeta = null,
-      prefetch = null
+      prefetch = null,
+      customTools = []
     }) {
       const tideBlock = frameTide(params?.tide);
       const contextFramed = contextMeta ? frameContext(contextMeta) : null;
+      const customRoutingFramed = frameCustomToolRouting(customTools, contextMeta);
       const prefetchFramed = prefetch?.items?.length ? framePrefetchedItems({ contextMeta, items: prefetch.items, keywords: prefetch.keywords }) : null;
       const dateBlock = frameDate();
       const blocks = [];
       if (provider === "anthropic") {
         if (contextFramed) blocks.push({ text: contextFramed, cacheable: true });
+        if (customRoutingFramed) blocks.push({ text: customRoutingFramed, cacheable: false });
         if (prefetchFramed) blocks.push({ text: prefetchFramed, cacheable: false });
         blocks.push({ text: dateBlock, cacheable: false });
         if (systemFromHistory) blocks.push({ text: systemFromHistory, cacheable: false });
@@ -94633,6 +94671,7 @@ Always use absolute paths for file operations. When the user asks to create a fi
       }
       if (tideBlock) blocks.push({ text: tideBlock, cacheable: false });
       if (contextFramed) blocks.push({ text: contextFramed, cacheable: true });
+      if (customRoutingFramed) blocks.push({ text: customRoutingFramed, cacheable: false });
       if (prefetchFramed) blocks.push({ text: prefetchFramed, cacheable: false });
       blocks.push({ text: dateBlock, cacheable: false });
       const workingDirInstr = buildWorkingDirectoryInstruction(workingDirectory);
@@ -94718,9 +94757,10 @@ Always use absolute paths for file operations. When the user asks to create a fi
       }
       const activeContextSlug = params?.context?.slug || params?.currentContextSlug || null;
       const contextMeta = activeContextSlug ? await fetchContext({ slug: activeContextSlug }) : null;
+      const customTools = Array.isArray(params?.session?.user?.tools) ? params.session.user.tools : [];
       let prefetch = null;
       if (params?.context?.slug && contextMeta) {
-        const rw = await rewriteAndSearch({ messages, contextMeta, model, session, outputStream });
+        const rw = await rewriteAndSearch({ messages, contextMeta, model, session, outputStream, customTools });
         if (!rw.skipped && Array.isArray(rw.items) && rw.items.length > 0) {
           prefetch = { items: rw.items, keywords: rw.keywords };
         }
@@ -94734,7 +94774,8 @@ Always use absolute paths for file operations. When the user asks to create a fi
           workingDirectory,
           systemFromHistory,
           contextMeta,
-          prefetch
+          prefetch,
+          customTools
         });
         console.log(`
 

package/auth/index.js

@@ -1,147 +0,0 @@
-const prompt = require('prompt')
-const colors = require('colors/safe')
-const path = require('path')
-const os = require('os')
-const fs = require('fs')
-const utils = require('../utils')
-
-module.exports = {
-	showPrompt: () => {
-		return new Promise((resolve, reject) => {
-      const schema = {
-        properties: {
-          email: {
-            description: colors.cyan('\nEmail'),
-            required: true
-          },
-          password: {
-            description: colors.cyan('Password'),
-            required: true,
-            hidden: true
-          }
-        }
-      }
-
-      prompt.message = null
-      prompt.start()
-
-			// Get two properties from the user: username and email
-			prompt.get(schema, (err, result) => {
-				if (err) {
-					reject(err)
-					return
-				}
-
-				resolve(result)
-			})
-		})
-	},
-
-	isLoggedIn: () => {
-		const userProfilePath = path.join(os.homedir(), '.surph_user')
-		if (!fs.existsSync(userProfilePath)) {
-			return false
-		}
-
-		return true
-	},
-
-	connectApp: () => {
-		// https://www.npmjs.com/package/prompt
-		return new Promise((resolve, reject) => {
-			const schema = {
-				properties: {
-					siteId: {
-						description: colors.cyan('\nEnter Site ID'),
-						required: true
-					},
-					apiKey: {
-						description: colors.cyan('Enter Site API Key'),
-						required: true
-					}
-				}
-			}
-
-			prompt.message = null
-
-			prompt.start()
-			prompt.get(schema, (err, result) => {
-				if (err){
-					reject(err)
-					return
-				}
-
-				resolve(result)
-			})
-		})
-	},
-
-	currentUser: () => {
-		return new Promise((resolve, reject) => {
-			const userProfilePath = path.join(os.homedir(), '.surph_user')
-			if (!fs.existsSync(userProfilePath)) {
-				// Not logged in
-				resolve(false);
-				return
-			}
-
-      try {
-        const data = utils.readFile(userProfilePath)
-        const currentUser = JSON.parse(data)
-        resolve(currentUser)
-      } catch (error) {
-        reject(error)        
-      }
-		})
-	},
-
-	isAuthorized: (app, currentUser) => {
-		if (!currentUser)
-			return false
-
-		if (app.profile.id === currentUser.id) // user is admin
-			return true
-
-		// check if currentUser is a collaborator:
-		var isCollaborator = false
-		for (var i=0; i<app.collaborators.length; i++){
-			var collaborator = app.collaborators[i]
-			if (collaborator.id == currentUser.id){
-				isCollaborator = true
-				break
-			}
-		}
-
-		return isCollaborator
-	},
-
-	/*
-	awsConfig: function(){
-		return new Promise(function(resolve, reject){
-			var awsConfigPath = path.join(os.homedir(), '.turbo_aws_config')
-			if (fs.existsSync(awsConfigPath) == false) {
-				reject(new Error('AWS Config not set. To set:\n$ turbo awsConfig'))
-				return
-			}
-
-			utils.readFile(awsConfigPath)
-			.then(function(data){
-			    awsSettings = JSON.parse(data)
-			    resolve(awsSettings)
-			    return
-			})
-			.catch(function(err){
-				reject(err)
-			})
-		})
-	}
-
-	awsConfigSet: function(){
-		var awsConfigPath = path.join(os.homedir(), '.turbo_aws_config')
-		if (fs.existsSync(awsConfigPath) == false) {
-			return false
-		}
-
-		return true
-	} */
-}