@xalia/agent 0.5.8 → 0.6.0

package/dist/agent/src/tool/options.js

@@ -4,7 +4,7 @@ exports.pidFile = exports.supabaseKey = exports.supabaseUrl = exports.apiKey = e
 exports.secretOption = secretOption;
 const cmd_ts_1 = require("cmd-ts");
 const agentUtils_1 = require("../agent/agentUtils");
-const db_1 = require("../chat/db");
+const database_1 = require("../chat/data/database");
 /// Prevents env content from being displayed in the help text.
 function secretOption({ long, short, env, description, }) {
     if (env) {
@@ -21,7 +21,7 @@ function secretOption({ long, short, env, description, }) {
         type: (0, cmd_ts_1.optional)(cmd_ts_1.string),
         long,
         short,
-        description: `${description} (can also be set via ${env} env var)`,
+        description: `${description} (can also be set via ${env ?? "undefined"} env var)`,
     });
 }
 exports.promptFile = (0, cmd_ts_1.option)({
@@ -97,14 +97,14 @@ exports.supabaseUrl = (0, cmd_ts_1.option)({
     long: "supabase-url",
     description: "Supabase URL",
     env: "SUPABASE_URL",
-    defaultValue: () => db_1.SUPABASE_LOCAL_URL,
+    defaultValue: () => database_1.SUPABASE_LOCAL_URL,
 });
 exports.supabaseKey = (0, cmd_ts_1.option)({
     type: cmd_ts_1.string,
     long: "supabase-key",
     description: "Supabase Key",
     env: "SUPABASE_KEY",
-    defaultValue: () => db_1.SUPABASE_LOCAL_KEY,
+    defaultValue: () => database_1.SUPABASE_LOCAL_KEY,
 });
 exports.pidFile = (0, cmd_ts_1.option)({
     type: (0, cmd_ts_1.optional)(cmd_ts_1.string),

package/dist/agent/src/tool/prompt.js

@@ -16,19 +16,22 @@ class Prompt {
             prompt: DEFAULT_PROMPT,
         });
         this.prompt.on("line", (line) => {
-            this.line = line;
-            this.resolve();
+            this.resolve(line);
         });
         this.prompt.on("close", () => {
-            this.line = undefined;
-            this.resolve();
+            this.resolve("");
         });
     }
     async run(prompt) {
-        // Clear any line
-        this.line = "";
+        const savedOnline = this.online;
         return new Promise((r) => {
-            this.online = r;
+            // The "resolve" callback puts back any previous `online` callback.
+            // This allows nested prompts (e.g. toolcall approval in the middle of a
+            // message prompt).
+            this.online = (line) => {
+                r(line);
+                this.online = savedOnline;
+            };
             if (prompt) {
                 this.prompt.setPrompt(prompt);
             }
@@ -40,12 +43,12 @@ class Prompt {
     }
     async shutdown() {
         this.prompt.close();
+        return Promise.resolve();
     }
-    resolve() {
+    resolve(line) {
         if (this.online) {
-            this.online(this.line);
+            this.online(line);
         }
-        this.online = undefined;
     }
 }
 exports.Prompt = Prompt;
@@ -59,14 +62,17 @@ class ScriptPrompt {
     run(_prompt) {
         return new Promise((r) => {
             setTimeout(() => {
-                logger.debug(`[ScriptPrompt.run]: ${this.lines.length} remaining`);
+                logger.debug(`[ScriptPrompt.run]: ${String(this.lines.length)} remaining`);
                 if (this.lines.length === 0) {
                     logger.debug("[ScriptPrompt.run]: returning undefined");
-                    r(undefined);
+                    setTimeout(() => {
+                        r(undefined);
+                    }, 1000);
                 }
                 else {
                     const line = this.lines.shift();
-                    logger.debug(`[ScriptPrompt.run]: returning: ${line}`);
+                    logger.debug(`[ScriptPrompt.run]: returning: ${line ?? "undefined"}`);
+                    console.log(`[USER(script)] ${JSON.stringify(line)}`);
                     r(line);
                 }
             }, 1000);

package/eslint.config.mjs

@@ -3,7 +3,16 @@ import tseslint from "typescript-eslint";
 
 export default tseslint.config(
   eslint.configs.recommended,
-  tseslint.configs.recommended,
+  ...tseslint.configs.strict,
+  ...tseslint.configs.strictTypeChecked,
+  {
+    languageOptions: {
+      parserOptions: {
+        project: "./tsconfig.json",
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
   {
     rules: {
       "@typescript-eslint/no-unused-vars": [
@@ -22,4 +31,8 @@ export default tseslint.config(
       "linebreak-style": ["error", "unix"],
     },
   },
+  {
+    files: ["**/*.mjs", "**/*.js"],
+    ...tseslint.configs.disableTypeChecked,
+  },
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xalia/agent",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -13,24 +13,32 @@
   },
   "scripts": {
     "build": "tsc && node -e \"require('fs').chmodSync('dist/agent/src/tool/main.js', '755')\"",
-    "lint": "eslint src && yarn prettier --check src/**/*.ts",
+    "lint": "eslint src --max-warnings 0 && yarn prettier --check src/**/*.ts",
     "format": "yarn prettier --write src/**/*.ts",
-    "test": "yarn --emoji false build && mocha dist/agent/src/test/**.js --reporter-option maxDiffSize=0"
+    "test": "yarn build && vitest run"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "=1.11.1",
     "@supabase/supabase-js": "2.49.7",
     "@types/readline-sync": "^1.4.8",
     "chalk": "^4.1.2",
+    "cheerio": "^1.1.2",
     "cmd-ts": "^0.13.0",
     "dotenv": "^16.5.0",
+    "exa-js": "^1.9.2",
+    "expr-eval": "^2.0.2",
+    "google-search-ts": "^1.0.1",
+    "html-to-text": "^9.0.5",
+    "node-fetch": "^3.3.2",
     "openai": "=4.98.0",
     "readline-sync": "^1.4.10",
     "uuid": "^11.1.0",
-    "yocto-spinner": "^0.2.2",
-    "ws": "8.18.2"
+    "ws": "8.18.2",
+    "yocto-spinner": "^0.2.2"
   },
   "devDependencies": {
-    "@types/ws": "^8.18.0"
+    "@types/html-to-text": "^9.0.4",
+    "@types/ws": "^8.18.0",
+    "vitest": "^3.1.1"
   }
 }

package/scripts/chat_server

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Script to run the chat server so deployment logic does not have to know the
+# location of the entrypoint (which can change easily).
+
+this_dir=`dirname ${BASH_SOURCE[0]}`
+agent_dir=`realpath ${this_dir}/..`
+${agent_dir}/dist/agent/src/tool/main.js chat server $@

package/scripts/setup_chat

@@ -67,6 +67,9 @@ pushd _test_chat
       apikey1=`${client} admin create-api-key chatuser1 default [] | jq -r .api_key`
   fi
 
+  ${client} admin set-default-api-key chatuser0 default
+  ${client} admin set-default-api-key chatuser1 default
+
   echo "${apikey0}" > chatuser0.apikey
   echo "${apikey1}" > chatuser1.apikey
 
@@ -75,11 +78,13 @@ pushd _test_chat
 
   echo '{"system_prompt":"You are a helpful agent talking to multiple users.  Users put their name at the beginning of their messages, e.g. `chatuser1: <message>`.","mcp_settings":{"duckduckgo-search":[]}}' > profile0.json
   ${client} config --force --dev --api-key ${apikey0}
-  ${client} agent-profile set profile0 --profile profile0.json
+  ${client} agent-profile set profile0 --profile profile0.json | jq -r .uuid > profile0.uuid
 
 popd
 
+set +e
+set +x
 
 echo "================================"
-echo "==   CHAT SETUP COMPLETED    =="
+echo "==   CHAT SETUP COMPLETED     =="
 echo "================================"

package/scripts/shutdown_chat_server

@@ -34,6 +34,9 @@ stop_chat_server
 # Stop MCP server
 stop_mcppro_server
 
+set +e
+set +x
+
 echo "=========================="
 echo "==   SHUTDOWN COMPLETE  =="
 echo "==========================" 

package/scripts/test_chat

@@ -44,7 +44,14 @@ function stop_chat_server() {
 
 stop_chat_server
 
-LOG_LEVEL=debug ${agent} chat server --pid-file chat.pid > chat_server.log 2>&1 &
+# Start the server with full logging and short heartbeat timeout.
+export DEFAULT_LLM_MODEL=repeat
+export DEVELOPMENT=1
+
+LOG_LEVEL=debug \
+    COMPRESSION_TRIGGER_NUM_MESSAGES=3 \
+    HEARTBEAT_INTERVAL_MS=1000 \
+    scripts/chat_server --pid-file chat.pid > chat_server.log 2>&1 &
 sleep 1
 
 mkdir -p _test_chat
@@ -68,41 +75,152 @@ pushd _test_chat
       apikey1=`${client} admin create-api-key chatuser1 default [] | jq -r .api_key`
   fi
 
+  ${client} admin set-default-api-key chatuser0 default
+  ${client} admin set-default-api-key chatuser1 default
+
   echo "${apikey0}" > chatuser0.apikey
   echo "${apikey1}" > chatuser1.apikey
 
-  # User 0 creates an agent profile
-
-  echo '{"system_prompt":"You are a helpful agent in a multi-user chat session.  If you have nothing to contribute and are not being addressed, just say `No comment`.","model":"repeat","mcp_settings":{"duckduckgo-search":[]}}' > profile0.json
   ${client} config --force --dev --api-key ${apikey0}
-  ${client} agent-profile set profile0 --profile profile0.json
 
-  # User 0 creates a session and asks for a joke
+  # Create an agent to test crash scenarios using script:
+  #   test_data/dummyllm_script_crash.json  (relative to server cwd)
+
+  echo '{"system_prompt":"blah","model":"dummy:test_data/dummyllm_script_crash.json","mcp_settings":{}}' > crash_agent_profile.json
+  ${client} agent-profile set crash_agent_profile \
+            --profile crash_agent_profile.json \
+      | jq -r .uuid > crash_agent_profile.uuid
+  crash_agent_profile_id=`cat crash_agent_profile.uuid`
+
+  # Create an agent for the single-user tests
+
+  echo '{"system_prompt":"You are a helpful agent in a multi-user chat session.  If you have nothing to contribute and are not being addressed, just say `No comment`.","model":"'${DEFAULT_LLM_MODEL}'","mcp_settings":{}}' > agent_profile.json
+  ${client} agent-profile set profile0 --profile agent_profile.json | jq -r .uuid > agent_profile.uuid
+  agent_profile_id=`cat agent_profile.uuid`
+
+  # User 0 tries to join with invalid API key - fails with "invalid api key" error
+
+  invalid_apikey0="invalid_api_key"
+  ${agent} chat client --session-id no_such_session --api-key "${invalid_apikey0}" 2>&1 | tee invalid_apikey_test.log | grep -i "invalid api key" || \
+      (echo "Expected 'invalid api key' error message"; cat invalid_apikey_test.log; exit 1)
+
+  # User 0 tries to join non-existant session - fails
+
+  ${agent} chat clear-sessions
+  ${agent} chat client --session-id no_such_session && \
+      (echo "Should not be able to join"; exit 1)
+
+  # User 0 creates a new session with `crash_agent_profile` and interacts with
+  # it, exercising LLM error conditions.
+
+  echo ':si crash_session.id' > crash_script
+  echo 'Hello' >> crash_script
+  echo 'Hello again' >> crash_script
+  ${agent} chat client --session-title crash_test_session \
+           --agent-profile-id ${crash_agent_profile_id} \
+           --script crash_script
+
+  # User 0 creates empty session, which should not appear in the DB.
+
+  echo ':si empty_session.id' > empty_session
+  ${agent} chat client --session-title test_session \
+           --agent-profile-id ${agent_profile_id} \
+           --script empty_session
+  empty_session_id=`cat empty_session.id`
+  ${agent} chat list-sessions | grep  `cat empty_session.id` && \
+      (echo "Empty session should not be persisted"; exit 1)
+
+  # User 0 creates a user session, sends message and writes session id to file
+
+  echo 'tell me a joke' > init_session
+  echo ':si session.id' >> init_session
+  ${agent} chat client --session-title test_session \
+           --agent-profile-id ${agent_profile_id} \
+           --script init_session
+  session_id=`cat session.id`
+
+  # Check that the session got saved with the updated title
+
+  ${agent} chat list-sessions | grep '"title":"tell me a joke"'
+
+  # User 1 tries to join the session.  Should be rejected.
 
-  echo 'tell me a joke' > script0
-  ${agent} chat client --session test_session --agent-profile profile0 --script script0
+  ${agent} chat client --session-id ${session_id} --api-key ${apikey1} \
+           --script init_session > join_unauthorized.log 2>&1 && \
+      (echo "Should exit with error when joining invalid session"; exit 1)
 
+  grep -i "not authorized" join_unauthorized.log || \
+      (echo "Should include error message"; exit 1)
+
+  # User 0 create a team, and write team id to a file
+
+  echo ':ct team0' > script_create_team
+  echo ':ci team0.id' >> script_create_team
+  ${agent} chat client --session-id ${session_id} --script script_create_team
+  team_id=`cat team0.id`
+
+  # User 0 create a new team session (including a new agent), and write
+  # session id to a file.
+
+  echo 'tell me a joke' > script_team_chat
+  echo ':si team_session.id' >> script_team_chat
+  ${agent} chat client --session-title test_team_session \
+           --team-id ${team_id} \
+           --script script_team_chat
+  team_session_id=`cat team_session.id`
+
+  # Extract the agent uuid form the new session
+
+  get_profile_id_query='.[] | select(.uuid=="'${team_session_id}'") | .agent_profile_uuid'
+  ${agent} chat list-sessions | jq -r "${get_profile_id_query}" > team_agent.id
+  team_agent_id=`cat team_agent.id`
+
+  # User 1 tries to join the team session.  Should be rejected.
+
+  ${agent} chat client --session-id ${team_session_id} --api-key ${apikey1} \
+           --script init_session > join_unauthorized_team.log 2>&1 && \
+      (echo "Should exit with error when joining invalid team session"; exit 1)
+  grep -i "not authorized" join_unauthorized_team.log || \
+      (echo "Should include error message (no auth team session)"; exit 1)
+
+  # User 0 adds user 1 as a participant in team and checks the DB
+
+  echo ":ap ${team_id} chatuser1" > script_add_chatuser1
+  echo ':lp' >> script_add_chatuser1
+  ${agent} chat client  --session-id ${team_session_id} --script script_add_chatuser1
+  ${agent} chat list-participants --session ${team_session_id} | grep chatuser1
+
+  # Have a participant add duckduckgo-search
   # Check that the duckduckgo-search server is available
   # Have a participant remove it and check that got reflected in the db
-  # Have a participant re-add it and check that got reflected in the db
 
-  ${client} agent-profile get profile0 | grep duckduckgo
+  echo ":as duckduckgo-search" > script_add_duckduckgo
+  ${agent} chat client --session-id ${team_session_id} --script script_add_duckduckgo
+  ${client} agent-profile get ${team_agent_id} | grep duckduckgo
+  sleep 1
+
   echo ":rs duckduckgo-search" > script_rm_duckduckgo
-  ${agent} chat client --session chatuser0/test_session --script script_rm_duckduckgo
+  ${agent} chat client --session-id ${team_session_id} --script script_rm_duckduckgo
   sleep 1
-  (${client} agent-profile get profile0 | grep duckduckgo) && ( \
+  (${client} agent-profile get ${team_session_id} | grep duckduckgo) && ( \
       echo "ERROR: expected duckduckgo to be removed from agent profile" ; \
       exit 1 \
       )
-  echo ":as duckduckgo-search" > script_add_duckduckgo
-  ${agent} chat client --session chatuser0/test_session --script script_add_duckduckgo
-  ${client} agent-profile get profile0 | grep duckduckgo
+
+  # Set an image to the workspace and asks a question
+
+  echo ':sw file:../test_data/frog.png For context, this image represents our shared workspace' > script_set_workspace
+  echo 'Tell me about the image in our workspace?' >> script_set_workspace
+  echo ':sw' >> script_set_workspace
+  ${agent} chat client --session-id ${session_id} --script script_set_workspace
 
   # Run both clients with a script that continues the conversation
 
   echo -e "why is that funny?\ntell me another.\nwhat is my name?\nhow old are you?\nwhere are your parents?" > script1
-  ${agent} chat client --session chatuser0/test_session --api-key ${apikey1} --script script1 >chatuser1.output &
-  ${agent} chat client --session chatuser0/test_session --script script1
+  ${agent} chat client --session-id ${team_session_id} --script script1 &
+  pid0=$!
+  ${agent} chat client --session-id ${team_session_id} --api-key ${apikey1} --script script1 >chatuser1.output
+  wait ${pid0}
 
   # The name chatuser0 should appear in chatuser1's session output