naisys 1.6.0 → 1.6.1

package/README.md

@@ -1,17 +1,17 @@
 ## NAISYS (Node.js Autonomous Intelligence System)
 
-NAISYS allows any LLM you want to operate a standard linux shell given your instructions. You can control how much
+NAISYS allows any LLM you want to operate a standard Linux shell given your instructions. You can control how much
 to spend, the maximum number of tokens to use per session, how long to wait between commands, etc.. Between each command
-NAISYS will wait a few seconds to accept any input you want to put in yourself in case you want to colllaborate with the 
-LLM, give it hints, and/or diagnose the session.  Once the LLM reaches the token max you specified for the sesssion it
-will wrap things up, and start a fresh shell for the LLM to continue on its work. 
+NAISYS will wait a few seconds to accept any input you want to put in yourself in case you want to colllaborate with the
+LLM, give it hints, and/or diagnose the session. Once the LLM reaches the token max you specified for the sesssion it
+will wrap things up, and start a fresh shell for the LLM to continue on its work.
 
-NAISYS tries to be a minimal wrapper, just helping the LLM operate in the shell 'better'. Making commands 'context friendly'. For instace if a command is long running, NAISYS will interrupt it, show the LLM the current output, and ask the LLM what it wants to 
-do next - wait, kill, or send input. The custom command prompt helps the LLM keep track of its token usage during the session. The 'comment' command helps the LLM think outloud without putting invalid commands into the shell. 
+NAISYS tries to be a minimal wrapper, just helping the LLM operate in the shell 'better'. Making commands 'context friendly'. For instace if a command is long running, NAISYS will interrupt it, show the LLM the current output, and ask the LLM what it wants to
+do next - wait, kill, or send input. The custom command prompt helps the LLM keep track of its token usage during the session. The 'comment' command helps the LLM think out loud without putting invalid commands into the shell.
 
-Some use cases are building websites, diagnosing a system for security concerns, mapping out the topology of the local 
-network, learning and performing arbitrary tasks, or just plain exploring the limits of autonomy. NAISYS has a built-in 
-system for inter-agent communiation. You can manually startup mulitple instances of NAISYS with different roles, or 
+Some use cases are building websites, diagnosing a system for security concerns, mapping out the topology of the local
+network, learning and performing arbitrary tasks, or just plain exploring the limits of autonomy. NAISYS has a built-in
+system for inter-agent communiation. You can manually startup mulitple instances of NAISYS with different roles, or
 you can allow agents to start their own sub-agents on demand with instructions defined by the LLM itself!
 
 [NPM](https://www.npmjs.com/package/naisys) | [Website](https://naisys.org) | [Discord](https://discord.gg/JBUPWSbaEt) | [Demo Video](https://www.youtube.com/watch?v=Ttya3ixjumo)
@@ -200,6 +200,8 @@ initialCommands:
 - Use the above instructions to install locally, and then continue with the instructions below
 - Install WSL (Windows Subsystem for Linux)
 - Install a Linux distribution, Ubuntu can easily be installed from the Microsoft Store
+- Make sure to the checked out code perserves the original line endings
+  - Files in the /bin folder should have LF endings only, not CRLF
 - The `NAISYS_FOLDER` and `WEBSITE_FOLDER` should be set to the WSL path
   - So `C:\var\naisys` should be `/mnt/c/var/naisys` in the `.env` file
 

package/bin/.gitattributes

@@ -0,0 +1,2 @@
+# Even on Windows, these bin commands are run by WSL so the line endings need to be LF, or bash will error out
+* text eol=lf

package/bin/naisys_testbin

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# ./src/command/commandHandler.ts has the same message
+echo "Successful: Naisys fallback bash commands are being caught."

package/dist/command/commandHandler.js

@@ -227,7 +227,8 @@ async function splitMultipleInputCommands(nextInput) {
     else if (newLinePos > 0 &&
         (nextInput.startsWith("comment ") ||
             nextInput.startsWith("genimg ") ||
-            nextInput.startsWith("trimsession "))) {
+            nextInput.startsWith("trimsession ") ||
+            nextInput.startsWith("pause "))) {
         input = nextInput.slice(0, newLinePos);
         nextInput = nextInput.slice(newLinePos).trim();
     }

package/dist/command/commandLoop.js

@@ -40,8 +40,7 @@ export async function run() {
         await output.commentAndLog("Starting Context:");
         const latestDream = await dreamMaker.goodmorning();
         if (latestDream) {
-            await contextManager.append("Previous Session Notes:");
-            await contextManager.append(latestDream);
+            await displayPreviousSessionNotes(latestDream, nextPromptIndex++);
         }
         for (const initialCommand of config.agent.initialCommands) {
             let prompt = await promptBuilder.getPrompt(0, false);
@@ -238,4 +237,13 @@ function setPromptIndex(prompt, index) {
     }
     return newPrompt;
 }
+async function displayPreviousSessionNotes(prevSessionNotes, nextPromptIndex) {
+    let prompt = await promptBuilder.getPrompt(0, false);
+    prompt = setPromptIndex(prompt, ++nextPromptIndex);
+    await contextManager.append(prompt, ContentSource.ConsolePrompt, nextPromptIndex);
+    const prevSessionNotesCommand = "cat ~/prev_session_notes";
+    await contextManager.append(prevSessionNotesCommand, ContentSource.LlmPromptResponse);
+    output.write(prompt + chalk[OutputColor.llm](prevSessionNotesCommand));
+    await contextManager.append(prevSessionNotes);
+}
 //# sourceMappingURL=commandLoop.js.map

package/dist/command/promptBuilder.js

@@ -19,7 +19,6 @@ const _writeEventName = "write";
 const _originalWrite = process.stdout.write.bind(process.stdout);
 process.stdout.write = (...args) => {
     _writeEventEmitter.emit(_writeEventName, false, ...args);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return _originalWrite.apply(process.stdout, args);
 };
 /**

package/dist/command/shellWrapper.js

@@ -89,6 +89,9 @@ function processOutput(rawDataStr, eventType, pid) {
         let finalOutput = _currentBufferType == "alternate"
             ? _getTerminalActiveBuffer()
             : _commandOutput.trim();
+        if (finalOutput.endsWith("command not found")) {
+            finalOutput += `\nNAISYS: Make sure that you are using valid linux commands, and that any non-commands are prefixed with the 'commment' command.`;
+        }
         finalOutput += `\nNAISYS: Command killed.`;
         resetProcess();
         _completeCommand(finalOutput);

package/dist/config.js

@@ -13,21 +13,25 @@ dotenv.config();
 export const hostname = "naisys";
 export const shellCommand = {
     /** Limits the size of files that can be read/wrote */
-    outputTokenMax: 3000,
+    outputTokenMax: 5000,
     /** The time NAISYS will wait for new shell output before giving up */
     timeoutSeconds: 15,
     /** These commands have their own timeout so the LLM doesn't have to continually waste tokens on wait commands */
     longRunningCommands: ["nmap", "traceroute", "tracepath", "mtr"],
     longRunningTimeoutSeconds: 120,
 };
+export const agent = loadAgentConfig();
 /** Web pages loaded with llmynx will be reduced down to around this number of tokens */
-export const webTokenMax = 2500;
+export const webTokenMax = 3000;
+/** Allows the LLM to end it's own session */
 export const endSessionEnabled = true;
-export const mailEnabled = true;
-export const webEnabled = true;
+/** Inter agent communication */
+export const mailEnabled = agent.mailEnabled || false;
+/** The LLM optimized browser */
+export const webEnabled = agent.webEnabled || false;
 /** Experimental, live updating spot in the context for the LLM to put files, to avoid having to continually cat */
 export const workspacesEnabled = false;
-/** Experimental, allow LLM to trim prompts from it's own session context */
+/** Experimental, allow LLM to trim it's own session context to avoid having to restart the session */
 export const trimSessionEnabled = false;
 /* .env is used for global configs across naisys, while agent configs are for the specific agent */
 export const naisysFolder = getEnv("NAISYS_FOLDER", true);
@@ -37,7 +41,7 @@ export const localLlmName = getEnv("LOCAL_LLM_NAME");
 export const openaiApiKey = getEnv("OPENAI_API_KEY");
 export const googleApiKey = getEnv("GOOGLE_API_KEY");
 export const anthropicApiKey = getEnv("ANTHROPIC_API_KEY");
-export const agent = loadAgentConfig();
+export const openRouterApiKey = getEnv("OPENROUTER_API_KEY");
 function loadAgentConfig() {
     const config = yaml.load(fs.readFileSync(program.args[0], "utf8"));
     config.hostpath = path.resolve(program.args[0]);
@@ -108,9 +112,7 @@ export function resolveConfigVars(templateString) {
     resolvedString = resolveTemplateVars(resolvedString, "env", process.env);
     return resolvedString;
 }
-function resolveTemplateVars(templateString, allowedVarString, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-mappedVar) {
+function resolveTemplateVars(templateString, allowedVarString, mappedVar) {
     const pattern = new RegExp(`\\$\\{${allowedVarString}\\.([^}]+)\\}`, "g");
     return templateString.replace(pattern, (match, key) => {
         const value = valueFromString(mappedVar, key);

package/dist/features/genimg.js

@@ -24,6 +24,10 @@ export async function handleCommand(args) {
     if (!filepath) {
         throw "Error: Filepath is required";
     }
+    // Validate path is fully qualified
+    if (!filepath.getNaisysPath().startsWith("/")) {
+        throw "Error: Filepath must be fully qualified";
+    }
     pathService.ensureFileDirExists(filepath);
     output.comment(`Generating image with ${config.agent.imageModel}...`);
     const openai = new OpenAI();
@@ -46,15 +50,14 @@ export async function handleCommand(args) {
     const hostPath = filepath.toHostPath();
     const fileExtension = path.extname(hostPath).substring(1);
     await sharp(imageBuffer)
-        .resize(256, 256, {
-        fit: "inside",
-    })
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        /*.resize(512, 512, {
+          fit: "inside",
+        })*/
         .toFormat(fileExtension)
         .toFile(hostPath);
     // Record the cost
     await costTracker.recordCost(model.cost, "genimg", model.name);
-    return "Image generated and saved to " + filepath.getNaisysPath();
+    return "1024x1024 Image generated and saved to " + filepath.getNaisysPath();
 }
 const imageModels = [
     {

package/dist/llm/llModels.js

@@ -4,57 +4,82 @@ export var LlmApiType;
     LlmApiType["OpenAI"] = "openai";
     LlmApiType["Google"] = "google";
     LlmApiType["Anthropic"] = "anthropic";
+    LlmApiType["OpenRouter"] = "openrouter";
 })(LlmApiType || (LlmApiType = {}));
 const llmModels = [
     {
-        key: "gpt4turbo",
-        name: "gpt-4-turbo",
+        key: "local",
+        name: config.localLlmName || "local",
+        baseUrl: config.localLlmUrl,
         apiType: LlmApiType.OpenAI,
+        maxTokens: 8000,
+        // Prices are per 1M tokens
+        inputCost: 0,
+        outputCost: 0,
+    },
+    // Open Router
+    {
+        key: "llama3-405b",
+        name: "meta-llama/llama-3.1-405b-instruct",
+        baseUrl: "https://openrouter.ai/api/v1",
+        apiType: LlmApiType.OpenRouter,
         maxTokens: 128000,
         // Prices are per 1M tokens
-        inputCost: 10,
-        outputCost: 30,
+        inputCost: 2.7,
+        outputCost: 2.7,
     },
+    // OpenAI Models
+    // https://openai.com/api/pricing/
     {
-        key: "gpt3turbo",
-        name: "gpt-3.5-turbo",
+        key: "gpto3mini",
+        name: "o3-mini",
         apiType: LlmApiType.OpenAI,
-        maxTokens: 16000,
+        maxTokens: 200000,
         // Prices are per 1M tokens
-        inputCost: 0.5,
-        outputCost: 1.5,
+        inputCost: 1.1,
+        outputCost: 4.4,
     },
     {
-        key: "local",
-        name: config.localLlmName || "local",
-        baseUrl: config.localLlmUrl,
+        key: "gpt4mini",
+        name: "gpt-4o-mini",
         apiType: LlmApiType.OpenAI,
-        maxTokens: 8000,
+        maxTokens: 128000,
         // Prices are per 1M tokens
-        inputCost: 0,
-        outputCost: 0,
+        inputCost: 0.15,
+        outputCost: 0.6,
     },
+    {
+        key: "gpt4o",
+        name: "gpt-4o",
+        apiType: LlmApiType.OpenAI,
+        maxTokens: 128000,
+        // Prices are per 1M tokens
+        inputCost: 2.5,
+        outputCost: 10,
+    },
+    // Google Models
     {
         key: "gemini1.5",
         name: "gemini-1.5-pro-latest",
         apiType: LlmApiType.Google,
-        maxTokens: 1048576,
+        maxTokens: 1000000,
         // 2 queries per minute free then the prices below are per 1000 characters
-        inputCost: 7,
-        outputCost: 21,
+        inputCost: 1.25,
+        outputCost: 5,
     },
     {
-        key: "gemini1.0",
-        name: "gemini-pro",
+        key: "gemini2.0flash",
+        name: "gemini-2.0-flash",
         apiType: LlmApiType.Google,
-        maxTokens: 30720,
+        maxTokens: 1000000,
         // 60 queries per minute free then the prices below are per 1000 characters
-        inputCost: 0.5,
-        outputCost: 1.5,
+        inputCost: 0.1,
+        outputCost: 0.4,
     },
+    // Anthropic Models
     {
         key: "claude3opus",
-        name: "claude-3-opus-20240229",
+        name: "claude-3-opus-latest",
         apiType: LlmApiType.Anthropic,
         maxTokens: 200000,
         // Prices are per 1M tokens
@@ -62,8 +87,8 @@ const llmModels = [
         outputCost: 75,
     },
     {
-        key: "claude3sonnet",
-        name: "claude-3-sonnet-20240229",
+        key: "claude3.7sonnet",
+        name: "claude-3-7-sonnet-latest",
         apiType: LlmApiType.Anthropic,
         maxTokens: 200000,
         // Prices are per 1M tokens
@@ -71,20 +96,24 @@ const llmModels = [
         outputCost: 15,
     },
     {
-        key: "claude3haiku",
-        name: "claude-3-haiku-20240307",
+        key: "claude3.5haiku",
+        name: "claude-3-5-haiku-latest",
         apiType: LlmApiType.Anthropic,
         maxTokens: 200000,
         // Prices are per 1M tokens
-        inputCost: 0.25,
-        outputCost: 1.25,
+        inputCost: 0.8,
+        outputCost: 4,
     },
 ];
-export function getLLModel(key) {
-    const model = llmModels.find((m) => m.key === key);
+export function getLLModel(keyName) {
+    const [key, name] = keyName.split("/");
+    const model = structuredClone(llmModels.find((m) => m.key === key));
     if (!model) {
         throw `Error, model not found: ${key}`;
     }
+    if (name) {
+        model.name = name;
+    }
     return model;
 }
 //# sourceMappingURL=llModels.js.map

package/dist/llm/llmService.js

@@ -18,14 +18,18 @@ export async function query(modelKey, systemMessage, context, source) {
     else if (model.apiType == LlmApiType.Anthropic) {
         return sendWithAnthropic(modelKey, systemMessage, context, source);
     }
-    else if (model.apiType == LlmApiType.OpenAI) {
-        return sendWithOpenAiCompatible(modelKey, systemMessage, context, source);
+    else if (model.apiType == LlmApiType.OpenAI ||
+        model.apiType == LlmApiType.OpenRouter) {
+        const apiKey = model.apiType == LlmApiType.OpenAI
+            ? config.openaiApiKey
+            : config.openRouterApiKey;
+        return sendWithOpenAiCompatible(modelKey, systemMessage, context, source, apiKey);
     }
     else {
         throw `Error, unknown LLM API type ${model.apiType}`;
     }
 }
-async function sendWithOpenAiCompatible(modelKey, systemMessage, context, source) {
+async function sendWithOpenAiCompatible(modelKey, systemMessage, context, source, apiKey) {
     const model = getLLModel(modelKey);
     if (model.key === "local") {
         if (!model.baseUrl) {
@@ -37,7 +41,7 @@ async function sendWithOpenAiCompatible(modelKey, systemMessage, context, source
     }
     const openAI = new OpenAI({
         baseURL: model.baseUrl,
-        apiKey: config.openaiApiKey,
+        apiKey,
     });
     // Assert the last message on the context is a user message
     const lastMessage = context[context.length - 1];
@@ -48,7 +52,7 @@ async function sendWithOpenAiCompatible(modelKey, systemMessage, context, source
         model: model.name,
         messages: [
             {
-                role: LlmRole.System,
+                role: LlmRole.System, // LlmRole.User, //
                 content: systemMessage,
             },
             ...context.map((m) => ({

package/dist/utils/utilities.js

@@ -1,7 +1,5 @@
 import { get_encoding } from "tiktoken";
-export function valueFromString(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-obj, path, defaultValue) {
+export function valueFromString(obj, path, defaultValue) {
     if (!path) {
         return obj;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "naisys",
   "description": "Node.js Autonomous Intelligence System",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "type": "module",
   "main": "dist/naisys.js",
   "preferGlobal": true,
@@ -9,16 +9,17 @@
     "naisys": "bin/naisys"
   },
   "scripts": {
-    "compile/run/attachable": "tsc && node --inspect dist/naisys.js ./agents/netmap.yaml",
+    "compile/run/attachable": "tsc && node --inspect dist/naisys.js ./agents/solo-websites/webdev-fansite.yaml",
     "agent:assistant": "node dist/naisys.js ./agents/assistant.yaml",
     "agent:nightwatch": "node dist/naisys.js ./agents/nightwatch.yaml",
     "clean": "rm -rf dist",
     "compile": "tsc",
-    "eslint": "npx eslint --rulesdir eslint-rules src",
+    "eslint": "npx eslint src",
     "test": "tsc && node --experimental-vm-modules node_modules/jest/bin/jest.js --testPathPattern=dist/__tests__",
     "prettier": "npx prettier --write .",
     "dependency-graph": "madge --image dependency-graph.png dist",
     "detect-cycles": "madge --circular dist",
+    "gen-tuning": "tsc && node dist/__fine-tuning__/gen-jsonl.js",
     "updates:check": "npm-check-updates",
     "updates:apply": "npm-check-updates -u && npm install",
     "npm:publish:dryrun": "npm run clean && npm ci && npm run compile && npm publish --dry-run",
@@ -42,32 +43,33 @@
   "devDependencies": {
     "@types/escape-html": "1.0.4",
     "@types/js-yaml": "4.0.9",
-    "@types/node": "20.12.7",
+    "@types/node": "22.13.5",
     "@types/text-table": "0.2.5",
-    "@typescript-eslint/eslint-plugin": "7.7.0",
-    "@typescript-eslint/parser": "7.7.0",
-    "eslint": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "8.25.0",
+    "@typescript-eslint/parser": "8.25.0",
+    "eslint": "9.21.0",
     "jest": "29.7.0",
-    "prettier": "3.2.5",
+    "prettier": "3.5.2",
     "ts-node": "10.9.2",
-    "typescript": "5.4.5"
+    "typescript": "5.7.3"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "0.20.5",
-    "@google/generative-ai": "0.7.1",
+    "@anthropic-ai/sdk": "0.38.0",
+    "@google/generative-ai": "0.22.0",
     "@xterm/headless": "5.5.0",
-    "chalk": "5.3.0",
-    "commander": "12.0.0",
-    "dotenv": "16.4.5",
+    "chalk": "5.4.1",
+    "commander": "13.1.0",
+    "dotenv": "16.4.7",
     "escape-html": "1.0.3",
     "js-yaml": "4.1.0",
-    "openai": "4.36.0",
-    "sharp": "0.33.3",
+    "openai": "4.86.1",
+    "sharp": "0.33.5",
     "sqlite": "5.1.1",
     "sqlite3": "5.1.7",
     "strip-ansi": "7.1.0",
     "text-table": "0.2.0",
-    "tiktoken": "1.0.14",
-    "tree-kill": "1.2.2"
+    "tiktoken": "1.0.20",
+    "tree-kill": "1.2.2",
+    "web-streams-polyfill": "4.1.0"
   }
 }