@agent-smith/server 0.0.7 → 0.0.9

package/dist/server/server.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-import { default as color } from "ansi-colors";
+import { executeAgent, executeWorkflow } from '@agent-smith/core';
+import cors from '@koa/cors';
 import Koa from 'koa';
 import bodyParser from "koa-bodyparser";
-import cors from '@koa/cors';
-import { useRouter } from './router.js';
-import websockify from 'koa-websocket';
 import route from 'koa-route';
 import serve from "koa-static";
-import { executeTask, executeWorkflow, init } from '@agent-smith/cli';
+import websockify from 'koa-websocket';
+import { buildCallbacks } from "../callbacks.js";
+import { useRouter } from './router.js';
 /* import { argv } from 'process';
 
 let env = "production";
@@ -35,22 +35,11 @@ app.use(cors({
 app.ws.use((ctx, next) => {
     return next();
 });
-function createAwaiter() {
-    let resolveFn;
-    let rejectFn;
-    const promise = new Promise((resolve, reject) => {
-        resolveFn = resolve;
-        rejectFn = reject;
-    });
-    return {
-        promise,
-        resolve: resolveFn,
-        reject: rejectFn
-    };
-}
 function runserver(routes, staticDir) {
+    //state.init();
     const router = useRouter(routes);
-    const sendTokensInterval = 100;
+    //console.log(router.apiRouter.stack.map(i => i.path));
+    //console.log(router.baseRouter.stack.map(i => i.path));
     const confirmToolCalls = {};
     app.ws.use(route.all('/ws', function (ctx) {
         //ctx.websocket.send('Hello World');
@@ -75,6 +64,7 @@ function runserver(routes, staticDir) {
                     if (!(msg.payload.id in confirmToolCalls)) {
                         const rsm = {
                             type: "error",
+                            from: "server",
                             msg: `can not confirm tool call: unknown tool id ${msg.payload.id}`,
                         };
                         ctx.websocket.send(JSON.stringify(rsm));
@@ -96,173 +86,17 @@ function runserver(routes, staticDir) {
                 if (!msg?.payload) {
                     const rsm = {
                         type: "error",
+                        from: "server",
                         msg: "provide a payload",
                     };
                     ctx.websocket.send(JSON.stringify(rsm));
                     return;
                 }
-                await init();
-                if (msg.feature == "task") {
-                    let buf = "";
-                    msg.options.onToken = (t) => {
-                        buf += t;
-                        process.stdout.write(t);
-                    };
-                    msg.options.onTurnEnd = (ht) => {
-                        const rsm = {
-                            type: "turnend",
-                            msg: JSON.stringify(ht),
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.onAssistant = (txt) => {
-                        const rsm = {
-                            type: "assistant",
-                            msg: txt,
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.onThink = (txt) => {
-                        const rsm = {
-                            type: "think",
-                            msg: txt,
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
+                // ---------- task -------------
+                if (msg.feature == "agent") {
+                    buildCallbacks(msg, ctx, confirmToolCalls);
                     try {
-                        const it = setInterval(() => {
-                            const rsm = {
-                                type: "token",
-                                msg: buf,
-                            };
-                            if (buf !== "") {
-                                // model is loading if no buffer
-                                ctx.websocket.send(JSON.stringify(rsm));
-                            }
-                            buf = "";
-                        }, sendTokensInterval);
-                        const res = await executeTask(msg.command, msg.payload, msg.options);
-                        //setTimeout(() => {
-                        clearInterval(it);
-                        //}, sendTokensInterval);
-                        //console.dir(res, { depth: 3 });
-                        let r;
-                        if (res.template.id == "none") {
-                            r = { assistant: res.answer.text };
-                        }
-                        else {
-                            r = res.template.history.pop();
-                        }
-                        const rsm = {
-                            type: "finalresult",
-                            msg: JSON.stringify(r),
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    }
-                    catch (e) {
-                        const rsm = {
-                            type: "error",
-                            msg: `${e}`,
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    }
-                }
-                else if (msg.feature == "agent") {
-                    msg.options.onToolsTurnStart = (tcs) => {
-                        const rsm = {
-                            type: "toolsturnstart",
-                            msg: JSON.stringify(tcs),
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.onToolsTurnEnd = (tr) => {
-                        const rsm = {
-                            type: "toolsturnend",
-                            msg: JSON.stringify(tr),
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.onTurnEnd = (ht) => {
-                        const rsm = {
-                            type: "turnend",
-                            msg: JSON.stringify(ht),
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.onAssistant = (txt) => {
-                        const rsm = {
-                            type: "assistant",
-                            msg: txt,
-                        };
-                        //console.log("SRV ON ASSISTANT", txt);
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.onThink = (txt) => {
-                        const rsm = {
-                            type: "think",
-                            msg: txt,
-                        };
-                        //console.log("SRV ON THINK", txt);
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.onToolCall = (tc) => {
-                        if (!tc?.id) {
-                            tc.id = crypto.randomUUID();
-                        }
-                        const rsm = {
-                            type: "toolcall",
-                            msg: JSON.stringify(tc),
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
-                        console.log("\n⚒️ ", color.bold(msg.command), "=>", `${color.yellowBright(tc.name)}`, tc.arguments);
-                    };
-                    msg.options.onToolCallEnd = (id, tr) => {
-                        let toolResData;
-                        if (typeof tr == 'object') {
-                            if (tr?.answer?.text) {
-                                // comes from an inference task
-                                toolResData = tr.answer.text;
-                            }
-                            else {
-                                toolResData = JSON.stringify(tr);
-                            }
-                        }
-                        else {
-                            toolResData = tr.toString();
-                        }
-                        const rsm = {
-                            type: "toolcallend",
-                            msg: `${id}<|xtool_call_id|>` + toolResData,
-                        };
-                        //console.log("TOOL CALL END", toolResData);
-                        ctx.websocket.send(JSON.stringify(rsm));
-                    };
-                    msg.options.confirmToolUsage = async (tc) => {
-                        if (!tc?.id) {
-                            tc.id = crypto.randomUUID();
-                        }
-                        const rsm = {
-                            type: "toolcallconfirm",
-                            msg: JSON.stringify(tc),
-                        };
-                        const { promise, resolve } = createAwaiter();
-                        confirmToolCalls[tc.id] = resolve;
-                        ctx.websocket.send(JSON.stringify(rsm));
-                        const res = await promise;
-                        return res;
-                    };
-                    msg.options.isAgent = true;
-                    try {
-                        //let buf = "";
-                        msg.options.onToken = (t) => {
-                            const rsm2 = {
-                                type: "token",
-                                msg: t,
-                            };
-                            ctx.websocket.send(JSON.stringify(rsm2));
-                            //buf += t;
-                            process.stdout.write(t);
-                        };
+                        //let buf = "";            
                         /*const it = setInterval(() => {
                           if (buf == "") { return };
                           const rsm: WsRawServerMsg = {
@@ -272,21 +106,23 @@ function runserver(routes, staticDir) {
                           ctx.websocket.send(JSON.stringify(rsm));
                           buf = "";
                         }, sendTokensInterval);*/
-                        const res = await executeTask(msg.command, msg.payload, msg.options);
+                        //console.log("AGENT SRV EXEC", msg);
+                        await executeAgent(msg.command, msg.payload, msg.options);
                         //setTimeout(() => {
                         //clearInterval(it);
                         //}, sendTokensInterval);
-                        const ht = JSON.stringify(res.template.history.pop());
                         //console.log("FINAL MSG", ht)
-                        const rsm = {
-                            type: "finalresult",
-                            msg: ht,
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
+                        /*const rsm: WsRawServerMsg = {
+                          type: "finalresult",
+                          from: "server",
+                          msg: JSON.stringify(res),
+                        }
+                        ctx.websocket.send(JSON.stringify(rsm));*/
                     }
                     catch (e) {
                         const rsm = {
                             type: "error",
+                            from: "server",
                             msg: `${e}`
                         };
                         ctx.websocket.send(JSON.stringify(rsm));
@@ -295,15 +131,17 @@ function runserver(routes, staticDir) {
                 else if (msg.feature == "workflow") {
                     try {
                         const res = await executeWorkflow(msg.command, msg.payload, msg.options);
-                        const rsm = {
-                            type: "finalresult",
-                            msg: res,
-                        };
-                        ctx.websocket.send(JSON.stringify(rsm));
+                        /*const rsm: WsRawServerMsg = {
+                          type: "finalresult",
+                          from: "server",
+                          msg: res,
+                        }
+                        ctx.websocket.send(JSON.stringify(rsm));*/
                     }
                     catch (e) {
                         const rsm = {
                             type: "error",
+                            from: "server",
                             msg: `${e}`
                         };
                         ctx.websocket.send(JSON.stringify(rsm));
@@ -320,6 +158,7 @@ function runserver(routes, staticDir) {
                 else {
                     const rsm = {
                         type: "error",
+                        from: "server",
                         msg: "command type " + msg.feature + " not supported"
                     };
                     ctx.websocket.send(JSON.stringify(rsm));
@@ -332,20 +171,26 @@ function runserver(routes, staticDir) {
         app.use(serve(staticDir));
     }
     app.use(logger);
-    app.use(router.routes()).use(router.allowedMethods());
+    const { baseRouter, apiRouter } = router;
+    app
+        .use(baseRouter.routes()).use(baseRouter.allowedMethods())
+        .use(apiRouter.routes()).use(apiRouter.allowedMethods());
     // 404 middleware - runs after router
-    app.use((ctx) => {
-        if (!ctx.matched || ctx.matched.length === 0) {
-            ctx.status = 404;
-            //console.log("404 ROUTE", ctx);
-            ctx.body = {
-                error: 'Not Found',
-                path: ctx.path
-            };
-        }
-    });
+    /*app.use((ctx) => {
+      if (!ctx.matched || ctx.matched.length === 0) {
+        ctx.redirect('/')
+        ctx.status = 301
+  
+        /*ctx.status = 404;
+        //console.log("404 ROUTE", ctx);
+        ctx.body = {
+          error: 'Not Found',
+          path: ctx.path
+        };
+      }
+    });*/
     app.listen(5184, () => {
-        console.log('Please open url localhost:5184 in a browser');
+        console.log('Please open url http://localhost:5184 in a browser');
     });
 }
 export { runserver };

package/dist/utils.d.ts

@@ -4,4 +4,10 @@ declare function getConfig(): {
     conf: ConfigFile;
     path: string;
 };
-export { getConfig, };
+declare function createAwaiter<T>(): {
+    promise: Promise<T>;
+    resolve: (value: T) => void;
+    reject: (reason?: any) => void;
+};
+declare const excludedTaskTypes: string[];
+export { getConfig, createAwaiter, excludedTaskTypes, };

package/dist/utils.js

@@ -1,4 +1,4 @@
-import { db, readConf } from "@agent-smith/cli";
+import { db, conf } from "@agent-smith/core";
 function getConfig() {
     const fp = db.readFilePaths();
     let confFilePath = "";
@@ -12,7 +12,21 @@ function getConfig() {
     if (confFilePath == "") {
         return { found: false, conf: {}, path: "" };
     }
-    const c = readConf(confFilePath);
+    const c = conf.readConf(confFilePath);
     return { found: c.found, conf: c.data, path: confFilePath };
 }
-export { getConfig, };
+function createAwaiter() {
+    let resolveFn;
+    let rejectFn;
+    const promise = new Promise((resolve, reject) => {
+        resolveFn = resolve;
+        rejectFn = reject;
+    });
+    return {
+        promise,
+        resolve: resolveFn,
+        reject: rejectFn
+    };
+}
+const excludedTaskTypes = ["app", "workflow", "terminal"];
+export { getConfig, createAwaiter, excludedTaskTypes, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-smith/server",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Agent Smith Nodejs server",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -10,7 +10,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@agent-smith/cli": "^0.0.115",
+    "@agent-smith/core": "^0.0.1",
     "@koa/cors": "^5.0.0",
     "@koa/router": "^15.4.0",
     "ansi-colors": "^4.1.3",
@@ -22,8 +22,7 @@
     "yaml": "^2.8.3"
   },
   "devDependencies": {
-    "@agent-smith/types": "^0.0.3",
-    "@locallm/types": "^0.7.1",
+    "@agent-smith/types": "^0.0.5",
     "@types/better-sqlite3": "^7.6.13",
     "@types/koa": "^3.0.2",
     "@types/koa__cors": "^5.0.1",
@@ -31,10 +30,10 @@
     "@types/koa-route": "^3.2.9",
     "@types/koa-static": "^4.0.4",
     "@types/koa-websocket": "^5.0.11",
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.5.2",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "preferGlobal": true,
   "main": "./dist/main.js",

package/dist/routes/task_settings.d.ts

@@ -1,4 +0,0 @@
-import type Router from '@koa/router';
-declare function getTaskSettingsCmd(r: Router): void;
-declare function updateTaskSettingsCmd(r: Router): void;
-export { getTaskSettingsCmd, updateTaskSettingsCmd, };

package/dist/routes/task_settings.js

@@ -1,21 +0,0 @@
-import { db } from '@agent-smith/cli';
-function getTaskSettingsCmd(r) {
-    r.get('/tasks/settings', async (ctx, next) => {
-        const ts = db.getTaskSettings();
-        ctx.body = ts;
-        ctx.status = 200;
-    });
-}
-function updateTaskSettingsCmd(r) {
-    r.post('/tasks/settings/update', async (ctx, next) => {
-        const data = ctx.request.body;
-        //console.log("DATA", data);
-        const name = data.name;
-        const settings = data.settings;
-        const ts = db.upsertTaskSettings(name, settings);
-        db.getTaskSettings(true);
-        ctx.body = ts;
-        ctx.status = 200;
-    });
-}
-export { getTaskSettingsCmd, updateTaskSettingsCmd, };

package/dist/routes/tasks.d.ts

@@ -1,4 +0,0 @@
-import type Router from '@koa/router';
-declare function getTasksRoute(r: Router): void;
-declare function getTaskRoute(r: Router): void;
-export { getTasksRoute, getTaskRoute, };

package/dist/routes/tasks.js

@@ -1,24 +0,0 @@
-import { db, fs } from '@agent-smith/cli';
-function getTasksRoute(r) {
-    r.get('/tasks', async (ctx, next) => {
-        const tasks = db.readFeaturesType("task");
-        ctx.body = tasks;
-        ctx.status = 200;
-    });
-}
-function getTaskRoute(r) {
-    r.get('/task/:id', async (ctx, next) => {
-        //console.log(ctx.params.id)
-        const taskSpec = fs.openTaskSpec(ctx.params.id);
-        ctx.body = taskSpec.taskFileSpec;
-        ctx.status = 200;
-    });
-}
-function saveTasksRoute(r) {
-    r.post('/save', async (ctx, next) => {
-        //const payload = ctx.request.body;
-        ctx.body = "ok";
-        ctx.status = 200;
-    });
-}
-export { getTasksRoute, getTaskRoute, };