naisys 1.3.0 → 1.4.0

package/README.md

@@ -75,6 +75,10 @@ dreamModel: claude3opus
 # defaults to the shellModel if omitted
 webModel: gemini-pro
 
+# The model used by the 'genimg' command. If not defined then the genimg command is not available to the LLM
+# Valid values: dalle2-256, dalle2-512, dalle2-1024, dalle3-1024, dalle3-1024-HD
+imageModel: dalle3-1024
+
 # A system like prompt explaining the agent's role and responsibilities
 # You can use config variables in this string
 agentPrompt: |
@@ -161,10 +165,11 @@ initialCommands:
   - `comment "<note>"` - The LLM is directed to use this for 'thinking out loud' which avoids 'invalid command' errors
   - `endsession "<note>"` - Clear the context and start a new session.
     - The LLM is directed to track it's context size and to end the session with a note before running over the context limit
-  - `pause <seconds>` - Can be used by the debug agent or the LLM to pause execution indefinitely, or until a new message is received from another agent, or for a set number of seconds
+  - `pause <seconds>` - Can be used by the debug agent or the LLM to pause execution for a set number of seconds
 - NAISYS apps
   - `llmail` - A context friendly 'mail system' used for agent to agent communication
   - `llmynx` - A context friendly wrapping on the lynx browser that can use a separate LLM to reduce the size of a large webpage into something that can fit into the LLM's context
+  - `genimg "<description>" <filepath>` - Generates an image with the given description, save at the specified path
 
 ## Running NAISYS from Source
 
@@ -188,3 +193,11 @@ initialCommands:
 - If you want to use NAISYS for a website
   - Install a local web server, for example [XAMPP](https://www.apachefriends.org/) on Windows
   - Start the server and put the URL in the `.env` file
+
+## Changelog
+
+- 1.4: `genimg` command for generating images
+- 1.3: Post-session 'dreaming' as well as a mail 'blackout' period
+- 1.2: Created stand-in shell commands for custom Naisys commands
+- 1.1: Added command protection settings to prevent unwanted writes
+- 1.0: Initial release

package/bin/genimg

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "'genimg' cannot be used with other commands on the same prompt."

package/bin/naisys

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Make sure to enable this script for execution with `chmod +x runteam.sh`
+# Make sure to enable this script for execution with `chmod +x naisys`
 
 # Check if an argument is provided
 if [ $# -eq 0 ]; then

package/dist/apps/genimg.js

@@ -0,0 +1,97 @@
+import * as fs from "fs";
+import OpenAI from "openai";
+import path from "path";
+import sharp from "sharp";
+import * as config from "../config.js";
+import * as costTracker from "../llm/costTracker.js";
+import * as output from "../utils/output.js";
+import { unixToHostPath } from "../utils/utilities.js";
+/** genimg "<description>" <filepath>: Generate an image with the description and save it to the file path */
+export async function handleCommand(args) {
+    // genimg sholdn't even be presented as an available command unless it is defined in the config
+    if (!config.agent.imageModel) {
+        throw "Agent config: Error, 'imageModel' is not defined";
+    }
+    const description = args.split('"')[1].trim();
+    const filepath = args.split('"')[2].trim();
+    if (!description) {
+        throw "Error: Description is required";
+    }
+    if (!filepath) {
+        throw "Error: Filepath is required";
+    }
+    // Check directory exists
+    const hostpath = unixToHostPath(filepath);
+    const dirname = path.dirname(hostpath);
+    if (!fs.existsSync(dirname)) {
+        throw `Error: Directory does not exist`;
+    }
+    output.comment(`Generating image with ${config.agent.imageModel}...`);
+    const openai = new OpenAI();
+    const model = getImageModel(config.agent.imageModel);
+    const response = await openai.images.generate({
+        prompt: description,
+        model: model.name,
+        size: model.size,
+        quality: model.quality,
+        response_format: "b64_json",
+    });
+    // save to filepath
+    const base64Image = response.data[0].b64_json;
+    if (!base64Image) {
+        throw 'Error: "b64_json" not found in response';
+    }
+    // Convert the base64 string to a buffer
+    const imageBuffer = Buffer.from(base64Image, "base64");
+    // Use sharp to convert the buffer and save it as a JPG file
+    //const currentPath = unixToHostPath(await shellWrapper.getCurrentPath());
+    //const filepath = path.join(currentPath, filename);
+    const fileExtension = path.extname(filepath).substring(1);
+    await sharp(imageBuffer)
+        .toFormat(fileExtension)
+        .toFile(hostpath);
+    // Record the cost
+    await costTracker.recordCost(model.cost, "genimg", model.name);
+    return "Image generated and saved to " + filepath;
+}
+const imageModels = [
+    {
+        key: "dalle3-1024-HD",
+        name: "dall-e-3",
+        size: "1024x1024",
+        quality: "hd",
+        cost: 0.08,
+    },
+    {
+        key: "dalle3-1024",
+        name: "dall-e-3",
+        size: "1024x1024",
+        cost: 0.04,
+    },
+    {
+        key: "dalle2-1024",
+        name: "dall-e-2",
+        size: "1024x1024",
+        cost: 0.02,
+    },
+    {
+        key: "dalle2-512",
+        name: "dall-e-2",
+        size: "512x512",
+        cost: 0.018,
+    },
+    {
+        key: "dalle2-256",
+        name: "dall-e-2",
+        size: "256x256",
+        cost: 0.016,
+    },
+];
+function getImageModel(key) {
+    const model = imageModels.find((m) => m.key === key);
+    if (!model) {
+        throw `Error, image model not found: ${key}`;
+    }
+    return model;
+}
+//# sourceMappingURL=genimg.js.map

package/dist/apps/llmail.js

@@ -3,8 +3,8 @@ import table from "text-table";
 import * as config from "../config.js";
 import * as dbUtils from "../utils/dbUtils.js";
 import * as utilities from "../utils/utilities.js";
-import { naisysToHostPath } from "../utils/utilities.js";
-const _dbFilePath = naisysToHostPath(`${config.naisysFolder}/lib/llmail.db`);
+import { unixToHostPath } from "../utils/utilities.js";
+const _dbFilePath = unixToHostPath(`${config.naisysFolder}/lib/llmail.db`);
 let _myUserId = -1;
 /** Threading is not currently used so this doesn't matter */
 const _threadTokenMax = config.mailMessageTokenMax * 5;
@@ -69,6 +69,7 @@ async function init() {
         }
     });
 }
+export const waitingForMailMessage = "Waiting for new mail messages...";
 export async function handleCommand(args) {
     const argParams = args.split(" ");
     if (!argParams[0]) {
@@ -85,6 +86,7 @@ export async function handleCommand(args) {
                 return `llmail <command>
   users: Get list of users on the system
   send "<users>" "subject" "message": Send a message. ${config.mailMessageTokenMax} token max.
+  wait: Pause the session until a new mail message is received
   
 * Attachments are not supported, use file paths to refence files in emails as all users are on the same machine`;
             }
@@ -93,6 +95,7 @@ export async function handleCommand(args) {
   no params: List all active threads
   users: Get list of users on the system
   send "<users>" "subject" "message": Send a new mail, starting a new thread
+  wait: Pause the session until a new mail message is received
   read <id>: Read a thread
   reply <id> <message>: Reply to a thread
   adduser <id> <username>: Add a user to thread with id
@@ -106,6 +109,9 @@ export async function handleCommand(args) {
             const message = newParams[5];
             return await newThread(usernames, subject, message);
         }
+        case "wait": {
+            return waitingForMailMessage;
+        }
         case "read": {
             const threadId = parseInt(argParams[1]);
             return await readThread(threadId);

package/dist/command/commandHandler.js

@@ -1,4 +1,5 @@
 import chalk from "chalk";
+import * as genimg from "../apps/genimg.js";
 import * as llmail from "../apps/llmail.js";
 import * as llmynx from "../apps/llmynx.js";
 import * as config from "../config.js";
@@ -90,15 +91,17 @@ export async function processCommand(prompt, consoleInput) {
                 }
                 break;
             }
-            // With no argument, in debug mode, pause will pause forever,
-            // in LLM mode it will pause until a message is receieved
-            //    Don't want the llm to hang itself, but it still can if it's the only agent or if all the agents pause..
-            // The setting only lasts for the next command, next loop it uses the agent default
             case "pause": {
+                const pauseSeconds = cmdArgs ? parseInt(cmdArgs) : 0;
+                // Don't allow the LLM to hang itself
+                if (inputMode.current === InputMode.LLM && !pauseSeconds) {
+                    await contextManager.append("Puase command requires a number of seconds to pause for");
+                    break;
+                }
                 return {
                     nextCommandAction: NextCommandAction.Continue,
-                    pauseSeconds: cmdArgs ? parseInt(cmdArgs) : 0,
-                    wakeOnMessage: inputMode.current === InputMode.LLM,
+                    pauseSeconds,
+                    wakeOnMessage: false, // llmail has a 'wait' command that is useful in multi-agent situations
                 };
             }
             case "cost": {
@@ -114,6 +117,18 @@ export async function processCommand(prompt, consoleInput) {
             case "llmail": {
                 const mailResponse = await llmail.handleCommand(cmdArgs);
                 await contextManager.append(mailResponse);
+                if (mailResponse == llmail.waitingForMailMessage) {
+                    return {
+                        nextCommandAction: NextCommandAction.Continue,
+                        pauseSeconds: 0,
+                        wakeOnMessage: true,
+                    };
+                }
+                break;
+            }
+            case "genimg": {
+                const genimgResponse = await genimg.handleCommand(cmdArgs);
+                await contextManager.append(genimgResponse);
                 break;
             }
             case "context":
@@ -190,7 +205,8 @@ async function splitMultipleInputCommands(nextInput) {
         }
     }
     // If the LLM forgets the quote on the comment, treat it as a single line comment
-    else if (newLinePos > 0 && nextInput.startsWith("comment ")) {
+    else if (newLinePos > 0 &&
+        (nextInput.startsWith("comment ") || nextInput.startsWith("genimg "))) {
         input = nextInput.slice(0, newLinePos);
         nextInput = nextInput.slice(newLinePos).trim();
     }

package/dist/command/commandLoop.js

@@ -40,7 +40,9 @@ export async function run() {
             await contextManager.append(latestDream);
         }
         for (const initialCommand of config.agent.initialCommands) {
-            await commandHandler.processCommand(await promptBuilder.getPrompt(0, false), config.resolveConfigVars(initialCommand));
+            const prompt = await promptBuilder.getPrompt(0, false);
+            await contextManager.append(prompt, ContentSource.ConsolePrompt);
+            await commandHandler.processCommand(prompt, config.resolveConfigVars(initialCommand));
         }
         inputMode.toggle(InputMode.Debug);
         let pauseSeconds = config.agent.debugPauseSeconds;
@@ -141,12 +143,22 @@ async function handleErrorAndSwitchToDebugMode(e, llmErrorCount, addToContext) {
         wakeOnMessage,
     };
 }
+let mailBlackoutCountdown = 0;
 async function checkNewMailNotification() {
+    let supressMail = false;
+    if (mailBlackoutCountdown > 0) {
+        mailBlackoutCountdown--;
+        supressMail = true;
+    }
     // Check for unread threads
     const unreadThreads = await llmail.getUnreadThreads();
     if (!unreadThreads.length) {
         return;
     }
+    if (supressMail) {
+        await output.commentAndLog(`New mail notifications blackout in effect. ${mailBlackoutCountdown} cycles remaining.`);
+        return;
+    }
     // Get the new messages for each thread
     const newMessages = [];
     for (const { threadId, newMsgId } of unreadThreads) {
@@ -166,10 +178,11 @@ async function checkNewMailNotification() {
         for (const unreadThread of unreadThreads) {
             await llmail.markAsRead(unreadThread.threadId);
         }
+        mailBlackoutCountdown = config.mailBlackoutCycles;
     }
     else if (llmail.simpleMode) {
         await contextManager.append(`You have new mail, but not enough context to read them.\n` +
-            `Finish up what you're doing. After you 'endsession' and the context resets, you will be able to read them.`, ContentSource.Console);
+            `After you 'endsession' and the context resets, you will be able to read them.`, ContentSource.Console);
     }
     // LLM will in many cases end the session here, when the new session starts
     // this code will run again, and show a full preview of the messages

package/dist/command/shellCommand.js

@@ -47,6 +47,9 @@ export async function handleCommand(input) {
         if (outputLimitExceeded) {
             await contextManager.append(`\nThe shell command generated too much output (${tokenCount} tokens). Only 2,000 tokens worth are shown above.`);
         }
+        if (text.endsWith(": command not found")) {
+            await contextManager.append("Please enter a valid Linux or NAISYS command after the prompt. Use the 'comment' command for thoughts.");
+        }
     }
     response.hasErrors = output.hasErrors;
     return response;

package/dist/command/shellWrapper.js

@@ -3,7 +3,7 @@ import * as fs from "fs";
 import * as os from "os";
 import * as config from "../config.js";
 import * as output from "../utils/output.js";
-import { naisysToHostPath } from "../utils/utilities.js";
+import { unixToHostPath } from "../utils/utilities.js";
 var ShellEvent;
 (function (ShellEvent) {
     ShellEvent["Ouptput"] = "stdout";
@@ -57,13 +57,13 @@ function errorIfNotEmpty(response) {
         output.error(response.value);
     }
 }
-export function processOutput(dataStr, eventType) {
+function processOutput(dataStr, eventType) {
     if (!_resolveCurrentCommand) {
         output.comment(eventType + " without handler: " + dataStr);
         return;
     }
     if (eventType === ShellEvent.Exit) {
-        output.error("SHELL EXITED. PID: " + (_process === null || _process === void 0 ? void 0 : _process.pid) + " CODE: " + dataStr);
+        output.error("SHELL EXITED. PID: " + _process?.pid + " CODE: " + dataStr);
     }
     else {
         //_log += "OUTPUT: " + dataStr;
@@ -127,7 +127,7 @@ export async function executeCommand(command) {
         _resolveCurrentCommand = resolve;
         const commandWithDelimiter = `${command.trim()}\necho "${_commandDelimiter} LINE:\${LINENO}"\n`;
         //_log += "INPUT: " + commandWithDelimiter;
-        _process === null || _process === void 0 ? void 0 : _process.stdin.write(commandWithDelimiter);
+        _process?.stdin.write(commandWithDelimiter);
         // If no response, kill and reset the shell, often hanging on some unescaped input
         _currentCommandTimeout = setTimeout(resetShell, config.shellCommmandTimeoutSeconds * 1000);
     });
@@ -136,8 +136,8 @@ function resetShell() {
     if (!_resolveCurrentCommand) {
         return;
     }
-    _process === null || _process === void 0 ? void 0 : _process.kill();
-    output.error("SHELL TIMEMOUT/KILLED. PID: " + (_process === null || _process === void 0 ? void 0 : _process.pid));
+    _process?.kill();
+    output.error("SHELL TIMEMOUT/KILLED. PID: " + _process?.pid);
     const outputWithError = _commandOutput.trim() +
         `\nError: Command timed out after ${config.shellCommmandTimeoutSeconds} seconds.`;
     resetProcess();
@@ -163,7 +163,7 @@ function resetCommand() {
 }
 function resetProcess() {
     resetCommand();
-    _process === null || _process === void 0 ? void 0 : _process.removeAllListeners();
+    _process?.removeAllListeners();
     _process = undefined;
 }
 /** Wraps multi line commands in a script to make it easier to diagnose the source of errors based on line number
@@ -176,7 +176,7 @@ set -e
 cd ${_currentPath}
 ${command.trim()}`;
     // create/writewrite file
-    fs.writeFileSync(naisysToHostPath(scriptPath), scriptContent);
+    fs.writeFileSync(unixToHostPath(scriptPath), scriptContent);
     // `Path` is set to the ./bin folder because custom NAISYS commands that follow shell commands will be handled by the shell, which will fail
     // so we need to remind the LLM that 'naisys commands cannot be used with other commands on the same prompt'
     // `source` will run the script in the current shell, so any change directories in the script will persist in the current shell

package/dist/config.js

@@ -1,17 +1,24 @@
 import { program } from "commander";
 import dotenv from "dotenv";
 import * as fs from "fs";
+import { readFile } from "fs/promises";
 import yaml from "js-yaml";
+import path from "path";
+import { fileURLToPath } from "url";
 import { CommandProtection } from "./utils/enums.js";
-import { valueFromString } from "./utils/utilities.js";
+import { hostToUnixPath, valueFromString } from "./utils/utilities.js";
 program.argument("<agent-path>", "Path to agent configuration file").parse();
 dotenv.config();
 /** The system name that shows after the @ in the command prompt */
 export const hostname = "naisys";
-export const shellOutputTokenMax = 2500; // Limits the size of files that can be read/wrote
-export const shellCommmandTimeoutSeconds = 15; // The number of seconds NAISYS will wait for a shell command to complete
-export const webTokenMax = 2500;
+/** Limits the size of files that can be read/wrote */
+export const shellOutputTokenMax = 3000; //
+/** The number of seconds NAISYS will wait for a shell command to complete */
+export const shellCommmandTimeoutSeconds = 15;
+export const webTokenMax = 3000;
 export const mailMessageTokenMax = 400;
+/** Used to prevent the agent from constantly responding to mail and not getting any work done */
+export const mailBlackoutCycles = 3;
 /* .env is used for global configs across naisys, while agent configs are for the specific agent */
 export const naisysFolder = getEnv("NAISYS_FOLDER", true);
 export const websiteFolder = getEnv("WEBSITE_FOLDER");
@@ -22,8 +29,9 @@ export const googleApiKey = getEnv("GOOGLE_API_KEY");
 export const anthropicApiKey = getEnv("ANTHROPIC_API_KEY");
 export const agent = loadAgentConfig();
 function loadAgentConfig() {
-    const agentPath = program.args[0];
-    const config = yaml.load(fs.readFileSync(agentPath, "utf8"));
+    const config = yaml.load(fs.readFileSync(program.args[0], "utf8"));
+    config.path = hostToUnixPath(path.resolve(program.args[0]));
+    config.directory = config.path.substring(0, config.path.lastIndexOf("/"));
     // throw if any property is undefined
     for (const key of [
         "username",
@@ -65,11 +73,14 @@ export const binPath = getBinPath();
  * otherwise need to rip it from the package ourselves relative to where this file is located */
 async function getVersion() {
     try {
-        const packageJsonPath = new URL("../package.json", import.meta.url);
-        const packageJson = await import(packageJsonPath.href, {
-            assert: { type: "json" },
-        });
-        return packageJson.default.version;
+        /* Removed for compatibility with https://bundlephobia.com/package/naisys
+        const packageJson = await import(packageJsonUrl.href, {
+          assert: { type: "json" },
+        });*/
+        const packageJsonUrl = new URL("../package.json", import.meta.url);
+        const packageJsonPath = fileURLToPath(packageJsonUrl);
+        const packageJson = JSON.parse(await readFile(packageJsonPath, "utf8"));
+        return packageJson.version;
     }
     catch (e) {
         return "0.1";

package/dist/llm/contextManager.js

@@ -18,6 +18,11 @@ export function getSystemMessage() {
     if (_cachedSystemMessage) {
         return _cachedSystemMessage;
     }
+    let genImgCmd = "";
+    if (config.agent.imageModel) {
+        genImgCmd = `
+  genimg "<description>" <filepath>: Generate an image with the description and save it to the given filename`;
+    }
     // Fill out the templates in the agent prompt and stick it to the front of the system message
     // A lot of the stipulations in here are to prevent common LLM mistakes
     // Like we can't jump between standard and special commands in a single prompt, which the LLM will try to do if not warned
@@ -31,6 +36,7 @@ Don't try to guess the output of commands. Don't put commands in \`\`\` blocks.
 For example when you run 'cat' or 'ls', don't write what you think the output will be. Let the system do that.
 Your role is that of the user. The system will provide responses and next command prompt. Don't output your own command prompt.
 Be careful when writing files through the command prompt with cat. Make sure to close and escape quotes properly.
+Don't blindly overwrite existing files without reading them first.
 
 NAISYS ${config.packageVersion} Shell
 Welcome back ${config.agent.username}!
@@ -43,9 +49,9 @@ LINUX Commands:
   Do not input notes after the prompt. Only valid commands.
 NAISYS Commands: (cannot be used with other commands on the same prompt)
   llmail: A local mail system for communicating with your team
-  llmynx: A context optimized web browser. Enter 'llmynx help' to learn how to use it
+  llmynx: A context optimized web browser. Enter 'llmynx help' to learn how to use it${genImgCmd}
   comment "<thought>": Any non-command output like thinking out loud, prefix with the 'comment' command
-  pause <seconds>: Pause for <seconds> or indeterminite if no argument is provided. Auto wake up on new mail message
+  pause <seconds>: Pause for <seconds>
   endsession "<note>": Ends this session, clears the console log and context.
     The note should help you find your bearings in the next session. 
     The note should contain your next goal, and important things should you remember.

package/dist/llm/costTracker.js

@@ -1,7 +1,7 @@
 import * as config from "../config.js";
 import * as dbUtils from "../utils/dbUtils.js";
-import { naisysToHostPath } from "../utils/utilities.js";
-const _dbFilePath = naisysToHostPath(`${config.naisysFolder}/lib/costs.db`);
+import { unixToHostPath } from "../utils/utilities.js";
+const _dbFilePath = unixToHostPath(`${config.naisysFolder}/lib/costs.db`);
 await init();
 async function init() {
     const newDbCreated = await dbUtils.initDatabase(_dbFilePath);

package/dist/llm/dreamMaker.js

@@ -1,11 +1,11 @@
 import * as config from "../config.js";
 import * as dbUtils from "../utils/dbUtils.js";
 import * as output from "../utils/output.js";
-import { naisysToHostPath } from "../utils/utilities.js";
+import { unixToHostPath } from "../utils/utilities.js";
 import * as contextManager from "./contextManager.js";
 import { LlmRole } from "./llmDtos.js";
 import * as llmService from "./llmService.js";
-const _dbFilePath = naisysToHostPath(`${config.naisysFolder}/lib/dream.db`);
+const _dbFilePath = unixToHostPath(`${config.naisysFolder}/lib/dream.db`);
 await init();
 async function init() {
     const newDbCreated = await dbUtils.initDatabase(_dbFilePath);
@@ -27,7 +27,7 @@ export async function goodmorning() {
        FROM DreamLog 
        WHERE username = ? 
        ORDER BY date DESC LIMIT 1`, config.agent.username);
-        return row === null || row === void 0 ? void 0 : row.dream;
+        return row?.dream;
     });
 }
 export async function goodnight() {
@@ -39,8 +39,10 @@ export async function goodnight() {
 async function runDreamSequence() {
     const systemMessage = `You are ${config.agent.username}'s unconcious sleep process. You compile all ${config.agent.username}'s
 thoughts during the day and reduce them down to important things to remember - references, plans, project structure, schemas, 
-file locations, urls, and more. You are the sleep process, and you are the most important process. Using your results, 
-when ${config.agent.username} wakes up they'll know exactly what to do and how to do it.`;
+file locations, urls, and more. You don't need to summarize what happened today, or what to do in the far future, just focus on the
+near term. Check what happened during the day for inconsistencies, things to fix and/or check tomorrow. You are the sleep process, 
+and you are the most important process. Using your results, when ${config.agent.username} wakes up they'll know exactly what to do 
+and how to do it with minimal time spent scanning existing work because you've laid everything out so well.`;
     const allTheThings = contextManager.messages.map((m) => m.content).join("\n");
     return await llmService.query(config.agent.dreamModel, systemMessage, [
         {

package/dist/llm/llmService.js

@@ -68,7 +68,6 @@ async function sendWithOpenAiCompatible(modelKey, systemMessage, context, source
     return chatResponse.choices[0].message.content || "";
 }
 async function sendWithGoogle(modelKey, systemMessage, context, source) {
-    var _a;
     if (!config.googleApiKey) {
         throw "Error, googleApiKey is not defined";
     }
@@ -116,7 +115,7 @@ async function sendWithGoogle(modelKey, systemMessage, context, source) {
         },
     });
     const result = await chat.sendMessage(lastMessage.content);
-    if ((_a = result.response.promptFeedback) === null || _a === void 0 ? void 0 : _a.blockReason) {
+    if (result.response.promptFeedback?.blockReason) {
         throw `Google API Request Blocked, ${result.response.promptFeedback.blockReason}`;
     }
     const responseText = result.response.text();
@@ -131,7 +130,6 @@ async function sendWithGoogle(modelKey, systemMessage, context, source) {
     return responseText;
 }
 async function sendWithAnthropic(modelKey, systemMessage, context, source) {
-    var _a;
     const model = getLLModel(modelKey);
     if (!config.anthropicApiKey) {
         throw "Error, anthropicApiKey is not defined";
@@ -171,6 +169,6 @@ async function sendWithAnthropic(modelKey, systemMessage, context, source) {
     else {
         throw "Error, no usage data returned from Anthropic API.";
     }
-    return ((_a = msgResponse.content.find((c) => c.type == "text")) === null || _a === void 0 ? void 0 : _a.text) || "";
+    return msgResponse.content.find((c) => c.type == "text")?.text || "";
 }
 //# sourceMappingURL=llmService.js.map

package/dist/utils/logService.js

@@ -3,10 +3,10 @@ import * as fs from "fs";
 import * as config from "../config.js";
 import { LlmRole } from "../llm/llmDtos.js";
 import * as dbUtils from "./dbUtils.js";
-import { ensureFileDirExists, naisysToHostPath } from "./utilities.js";
-const _dbFilePath = naisysToHostPath(`${config.naisysFolder}/lib/log.db`);
-const _combinedLogFilePath = naisysToHostPath(`${config.websiteFolder || config.naisysFolder}/logs/combined-log.html`);
-const _userLogFilePath = naisysToHostPath(`${config.websiteFolder || config.naisysFolder}/logs/${config.agent.username}-log.html`);
+import { ensureFileDirExists, unixToHostPath } from "./utilities.js";
+const _dbFilePath = unixToHostPath(`${config.naisysFolder}/lib/log.db`);
+const _combinedLogFilePath = unixToHostPath(`${config.websiteFolder || config.naisysFolder}/logs/combined-log.html`);
+const _userLogFilePath = unixToHostPath(`${config.websiteFolder || config.naisysFolder}/logs/${config.agent.username}-log.html`);
 await init();
 async function init() {
     initLogFile(_combinedLogFilePath);

package/dist/utils/utilities.js

@@ -1,17 +1,26 @@
 import * as fs from "fs";
 import * as os from "os";
+import path from "path";
 import { get_encoding } from "tiktoken";
-/** Take a NAISYS path and convert to something that can be
+/** Take a unix path and convert to something that can be
  *  opened by the host with the native fs library and such */
-export function naisysToHostPath(filePath) {
-    if (os.platform() === "win32" && filePath.startsWith("/mnt/")) {
-        // "/mnt/c/" -> "c:/"
-        filePath = filePath.substring(5);
-        return filePath[0] + ":" + filePath.substring(1);
+export function unixToHostPath(unixPath) {
+    const match = unixPath.match(/^\/mnt\/([a-zA-Z])\//);
+    if (os.platform() === "win32" && match) {
+        // Replace '/mnt/c/' with 'C:/' and convert forward slashes to backslashes
+        return unixPath
+            .replace(`/mnt/${match[1]}/`, `${match[1].toLowerCase()}:\\`)
+            .replace(/\//g, "\\");
     }
-    else {
-        return filePath;
+    return unixPath;
+}
+export function hostToUnixPath(hostPath) {
+    const match = hostPath.match(/^([a-zA-Z]):\\(.*)/);
+    if (os.platform() === "win32" && match) {
+        // Replace 'C:\' with '/mnt/c/' and convert backslashes to forward slashes
+        return `/mnt/${match[1].toLowerCase()}/${match[2].replace(/\\/g, "/")}`;
     }
+    return hostPath; // Return the original path if it doesn't match the pattern
 }
 export function valueFromString(obj, path, defaultValue) {
     if (!path) {
@@ -20,7 +29,7 @@ export function valueFromString(obj, path, defaultValue) {
     const keys = path.split(".");
     let result = obj;
     for (const key of keys) {
-        result = result === null || result === void 0 ? void 0 : result[key];
+        result = result?.[key];
         if (result === undefined) {
             return defaultValue;
         }
@@ -32,9 +41,9 @@ export function getTokenCount(text) {
     return _gpt2encoding.encode(text).length;
 }
 export function ensureFileDirExists(filePath) {
-    const dir = filePath.split("/").slice(0, -1).join("/");
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
+    const dirname = path.dirname(filePath);
+    if (!fs.existsSync(dirname)) {
+        fs.mkdirSync(dirname, { recursive: true });
     }
 }
 export function trimChars(text, charList) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "naisys",
   "description": "Node.js Autonomous Intelligence System",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "type": "module",
   "main": "dist/naisys.js",
   "preferGlobal": true,
@@ -9,10 +9,9 @@
     "naisys": "bin/naisys"
   },
   "scripts": {
-    "compile/run/attachable": "tsc && node --inspect dist/naisys.js ./agents/webdev-fansite.yaml",
-    "agent:dev": "node dist/naisys.js ./agents/3-team-dev-db-content/dev.yaml",
-    "agent:db": "node dist/naisys.js ./agents/3-team-dev-db-content/db.yaml",
-    "agent:content": "node dist/naisys.js ./agents/3-team-dev-db-content/content.yaml",
+    "compile/run/attachable": "tsc && node --inspect dist/naisys.js ./agents/mud/mud.yaml",
+    "agent:claude": "node dist/naisys.js ./agents/mud/battle-claude.yaml",
+    "agent:gpt": "node dist/naisys.js ./agents/mud/battle-gpt.yaml",
     "clean": "rm -rf dist",
     "compile": "tsc",
     "eslint": "npx eslint --rulesdir eslint-rules src",
@@ -22,7 +21,7 @@
     "detect-cycles": "madge --circular dist",
     "updates:check": "npm-check-updates",
     "updates:apply": "npm-check-updates -u && npm install",
-    "npm:publish:dryrun": "npm run clean && npm install && npm run compile && npm publish --dry-run",
+    "npm:publish:dryrun": "npm run clean && npm ci && npm run compile && npm publish --dry-run",
     "postinstall": "chmod +x ./bin/*"
   },
   "repository": {
@@ -61,10 +60,11 @@
     "dotenv": "16.4.5",
     "escape-html": "1.0.3",
     "js-yaml": "4.1.0",
-    "openai": "4.29.0",
+    "openai": "4.29.1",
+    "sharp": "0.33.2",
     "sqlite": "5.1.1",
     "sqlite3": "5.1.7",
     "text-table": "0.2.0",
     "tiktoken": "1.0.13"
   }
-}
+}