@surph_ai/sdk 0.0.25 → 0.0.27

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/toolserver/routes/tool.js

@@ -96,8 +96,8 @@ router.post('/custom', async (req, res, next) => {
 
     const tools = await loadTool()
     const response = await handler({ args, context, user }, tools)
-    if (resp.error) {
-      throw new Error(resp.error);
+    if (response.error) {
+      throw new Error(response.error);
     }
 
     res.json({ response })

package/types.d.ts

@@ -61,3 +61,12 @@ export type ToolHandler<
   TArgs = Record<string, unknown>,
   TResult = unknown,
 > = (input: ToolHandlerInput<TArgs>) => Promise<TResult> | TResult;
+
+export interface Surph {
+  fetchUser(username: string): Promise<User>;
+  fetchContext(slug: string | ToolContext): Promise<unknown>;
+  searchContext(ctxSlug: string, query: string): Promise<unknown>;
+  search(query: string, ctxSlug?: string | null): Promise<unknown>;
+}
+
+export declare const surph: Surph;

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
-	} */
-}