@surph_ai/cli 0.0.27 → 0.0.28

package/package.json

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

package/toolserver/routes/index.js

@@ -29,20 +29,22 @@ const readSurphSession = () => {
 
 router.get('/', async (req, res, next) => {
   try {
+    // res.json({data: 'test'})
+    // return
     const toolSlugs = Object.keys(manifest)
 
     // Mirror `userId` to `_id` (and `id`) so preloaded.user matches the
     // production shape the web app consumes — useSettings.js reads
     // `preloaded.user` and downstream code branches on `_id`.
     const session = readSurphSession()
-    // const { user, contexts, tides, tools } = session?.userId? await userConfiguration({ id: session.userId }) : null
+    // const { user, contexts, waves, tools } = session?.userId? await userConfiguration({ id: session.userId }) : null
     const userConfig = session?.userId? await userConfiguration({ id: session.userId }) : null
 
     let title = 'Surph AI'
     let ctx = null
     let board = null
     let tools = null
-    let tides = null
+    let waves = null
     let contexts = null
 
     if (req.surph_board) {
@@ -51,15 +53,15 @@ router.get('/', async (req, res, next) => {
       title = req.surph_board.name
 
       tools = req.surph_board.tools
-      tides = req.surph_board.tides
+      waves = req.surph_board.waves
       contexts = req.surph_board.contexts
     } else if (userConfig) {
       tools = userConfig.tools
-      tides = userConfig.tides
+      waves = userConfig.waves
       contexts = userConfig.contexts
     } else { // no user logged in, set empty:
       tools = []
-      tides = []
+      waves = []
       contexts = []
     }
 
@@ -67,17 +69,17 @@ router.get('/', async (req, res, next) => {
     const creator = userConfig ? { _id: user._id, username: user.username, avatar: user.avatar } : {}
     const localTools = toolSlugs.map(slug => {
       const tool = manifest[slug]
-      let isTideTool = false
-      tides.forEach(t => {
+      let isWaveTool = false
+      waves.forEach(t => {
         if (!t.tools)
           return
       
         if (t.tools.indexOf(slug) > -1) {
-          isTideTool = true
+          isWaveTool = true
         }
       })
 
-      return isTideTool ? { ...tool, creator, origin: 'tide' } : { ...tool, creator }
+      return isWaveTool ? { ...tool, creator, origin: 'wave' } : { ...tool, creator }
     })
 
     const context = {
@@ -89,7 +91,7 @@ router.get('/', async (req, res, next) => {
       user,
       config: { ...req.config, entry: 'web' },
       contexts,
-      tides,
+      waves,
       tools: localTools // sdk mode is for local tool development only, do not clutter with live tools.
       // tools: [ ...tools, ...localTools ]
     }

package/utils/boardConfiguration.js

@@ -32,10 +32,18 @@ const boardConfiguration = async (boardSlug) => {
             }
         });
         const { payload } = await response.json();
-        BOARD_CACHE[boardSlug] = payload;
-        // console.log('PAYLOAD: ' + JSON.stringify(payload));
-        const { board, contexts, tides, tools } = payload;
-        return { board, contexts, tides, tools };
+        // console.log('PAYLOAD: ' + JSON.stringify(payload))
+        if (!payload)
+            return null;
+        if (!payload.board)
+            return null;
+        // Tides are retired: drop the board's legacy tide list (still on the
+        // Mongo record and in the query payload) so nothing downstream sees it.
+        const { tides: _tides, ...board } = payload.board;
+        const { tides: _boardTides, ...config } = payload;
+        const result = { ...config, board };
+        BOARD_CACHE[boardSlug] = result;
+        return result;
     }
     catch (error) {
         console.error('Error fetching board: ', error.message);

package/utils/userConfiguration.js

@@ -1,29 +1,56 @@
 const REST_API_URL = 'https://surph-mongo-http-19075ff8d93f.herokuapp.com'
 
-// fetch user contexts, threads, tides, etc.
-const userConfiguration = async (user, includeTides = true) => {
-  try {
-    const userId = user?._id || user?.id || null;
-    if (!userId) return null;
-
-    const response = await fetch(`${REST_API_URL}/queries/user_configuration`, {
-      method: 'POST',
-      body: JSON.stringify({ user: userId}),
-      headers: {
-        'Accept': 'application/json',
-        'Content-type': 'application/json',
-        'x-surph-client': 'surph-webapp',
-      }
-    })
-
-    const { payload } = await response.json()
-    const { user: _user, contexts, tides, tools } = payload
-    // console.log('PAYLOAD: ' + JSON.stringify({ contexts, tides, tools }))
-
-    return { user: _user, contexts, tides, tools }
-  } catch (error) {
-    throw error
-  }
-}
+// The user_configuration query also adds the tools attached to the user's
+// waves, tagged `origin: 'wave'` (often a second copy of an installed tool).
+// Keep only the ones the user created, untagged, and one entry per slug.
+const withoutWaveTools = (tools, userId) => {
+    if (!Array.isArray(tools))
+        return tools;
+    const uid = String(userId);
+    const seen = new Set();
+    const out = [];
+    for (const t of tools) {
+        if (!t)
+            continue;
+        if (t.origin === 'wave') {
+            const creatorId = t.creator?._id || t.creator?.id || null;
+            if (creatorId == null || String(creatorId) !== uid)
+                continue;
+        }
+        const { origin: _origin, ...tool } = t;
+        const key = tool.slug || String(tool._id || '');
+        if (key && seen.has(key))
+            continue;
+        if (key)
+            seen.add(key);
+        out.push(tool);
+    }
+    return out;
+};
+// fetch user contexts, waves, tools, boards, etc.
+const userConfiguration = async (user) => {
+    try {
+        const userId = user?._id || user?.id || null;
+        if (!userId)
+            return null;
+        const response = await fetch(`${REST_API_URL}/queries/user_configuration`, {
+            method: 'POST',
+            body: JSON.stringify({ user: userId }),
+            headers: {
+                'Accept': 'application/json',
+                'Content-type': 'application/json',
+                'x-surph-client': 'surph-webapp',
+            }
+        });
+        const { payload } = await response.json();
+        const { user: _user, contexts, waves, tools, boards, templates } = payload;
+        // Tides are retired: drop the user's legacy subscribed-tide list.
+        const { tides: _tides, ...userRecord } = _user || {};
+        return { user: _user ? userRecord : _user, contexts, waves, tools: withoutWaveTools(tools, userId), boards, templates };
+    }
+    catch (error) {
+        throw error;
+    }
+};
 
 module.exports = userConfiguration;