@tyvm/knowhow 0.0.22 → 0.0.23

package/src/agents/tools/executeScript/examples/serialization-test.ts

@@ -2,14 +2,13 @@
 /**
  * Serialization Test for executeScript - demonstrates transfer issues
  * Usage: npx ts-node src/agents/tools/executeScript/examples/serialization-test.ts
- * 
+ *
  * This test demonstrates the "A non-transferable value was passed" errors
  * that occur when trying to return complex objects from executeScript.
  */
 
 import { executeScript } from "../../executeScript";
-import { Tools } from "../../../../services";
-import { Clients } from "../../../../clients";
+import { services } from "../../../../services";
 
 interface TestCase {
   name: string;
@@ -26,27 +25,27 @@ const testCases: TestCase[] = [
     script: `
       console.log("Testing primitive string return");
       return "Hello World";
-    `
+    `,
   },
-  
+
   {
-    name: "primitive-number", 
+    name: "primitive-number",
     expectedToWork: true,
     description: "Simple number return - should work",
     script: `
       console.log("Testing primitive number return");
       return 42;
-    `
+    `,
   },
 
   {
     name: "primitive-boolean",
     expectedToWork: true,
-    description: "Simple boolean return - should work", 
+    description: "Simple boolean return - should work",
     script: `
       console.log("Testing primitive boolean return");
       return true;
-    `
+    `,
   },
 
   {
@@ -56,21 +55,22 @@ const testCases: TestCase[] = [
     script: `
       console.log("Testing simple array return");
       return [1, 2, 3, "hello"];
-    `
+    `,
   },
 
   {
     name: "simple-object",
     expectedToWork: false, // This is where I got errors
-    description: "Simple object return - expected to fail with transferable error",
+    description:
+      "Simple object return - expected to fail with transferable error",
     script: `
       console.log("Testing simple object return");
-      return { 
-        message: "Hello", 
-        count: 42, 
-        success: true 
+      return {
+        message: "Hello",
+        count: 42,
+        success: true
       };
-    `
+    `,
   },
 
   {
@@ -86,7 +86,7 @@ const testCases: TestCase[] = [
         },
         status: "success"
       };
-    `
+    `,
   },
 
   {
@@ -100,7 +100,7 @@ const testCases: TestCase[] = [
         transform: function(x) { return x * 2; },
         helper: () => "test"
       };
-    `
+    `,
   },
 
   {
@@ -114,7 +114,7 @@ const testCases: TestCase[] = [
         { id: 2, name: "Bob" },
         { id: 3, name: "Charlie" }
       ];
-    `
+    `,
   },
 
   {
@@ -129,7 +129,7 @@ const testCases: TestCase[] = [
         nested: { key: "value" }
       };
       return JSON.stringify(data);
-    `
+    `,
   },
 
   {
@@ -138,10 +138,10 @@ const testCases: TestCase[] = [
     description: "Tool call result object - expected to fail",
     script: `
       console.log("Testing tool call result return");
-      
+
       try {
         const searchResult = await callTool("fileSearch", { searchTerm: "package.json" });
-        
+
         // Try to return a structured response with the tool result
         return {
           success: true,
@@ -154,7 +154,7 @@ const testCases: TestCase[] = [
           error: error.message
         };
       }
-    `
+    `,
   },
 
   {
@@ -164,7 +164,7 @@ const testCases: TestCase[] = [
     script: `
       console.log("Testing Date object return");
       return new Date();
-    `
+    `,
   },
 
   {
@@ -177,36 +177,33 @@ const testCases: TestCase[] = [
       map.set("key1", "value1");
       map.set("key2", "value2");
       return map;
-    `
-  }
+    `,
+  },
 ];
 
 async function runSerializationTests() {
   console.log("🧪 Running executeScript Serialization Tests\\n");
-  console.log("=" .repeat(80));
+  console.log("=".repeat(80));
 
   const results = {
     passed: 0,
     failed: 0,
     unexpected: 0,
-    details: [] as any[]
+    details: [] as any[],
   };
 
   for (const testCase of testCases) {
     console.log(`\\n📋 Testing: ${testCase.name}`);
     console.log(`📝 Description: ${testCase.description}`);
     console.log(`🎯 Expected to work: ${testCase.expectedToWork}`);
-    
+
     try {
       const result = await executeScript({
         script: testCase.script,
         maxToolCalls: 5,
         maxTokens: 500,
         maxExecutionTimeMs: 10000,
-        maxCostUsd: 0.1
-      }, {
-        tools: Tools,
-        clients: Clients,
+        maxCostUsd: 0.1,
       });
 
       const actualWorked = result.success;
@@ -217,7 +214,11 @@ async function runSerializationTests() {
         console.log(`✅ PASS - Behaved as expected`);
       } else {
         results.unexpected++;
-        console.log(`⚠️  UNEXPECTED - Expected ${testCase.expectedToWork ? 'success' : 'failure'}, got ${actualWorked ? 'success' : 'failure'}`);
+        console.log(
+          `⚠️  UNEXPECTED - Expected ${
+            testCase.expectedToWork ? "success" : "failure"
+          }, got ${actualWorked ? "success" : "failure"}`
+        );
       }
 
       results.details.push({
@@ -227,24 +228,27 @@ async function runSerializationTests() {
         matches: matchesExpectation,
         result: actualWorked ? result.result : null,
         error: actualWorked ? null : result.error,
-        consoleOutput: result.consoleOutput
+        consoleOutput: result.consoleOutput,
       });
 
       if (actualWorked) {
         console.log(`📊 Result type: ${typeof result.result}`);
-        console.log(`📊 Result: ${JSON.stringify(result.result).substring(0, 200)}${JSON.stringify(result.result).length > 200 ? '...' : ''}`);
+        console.log(
+          `📊 Result: ${JSON.stringify(result.result).substring(0, 200)}${
+            JSON.stringify(result.result).length > 200 ? "..." : ""
+          }`
+        );
       } else {
         console.log(`❌ Error: ${result.error}`);
       }
 
       if (result.consoleOutput.length > 0) {
-        console.log(`📝 Console: ${result.consoleOutput.join(', ')}`);
+        console.log(`📝 Console: ${result.consoleOutput.join(", ")}`);
       }
-
     } catch (error) {
       results.failed++;
       console.log(`💥 TEST FRAMEWORK ERROR: ${error.message}`);
-      
+
       results.details.push({
         name: testCase.name,
         expected: testCase.expectedToWork,
@@ -252,7 +256,7 @@ async function runSerializationTests() {
         matches: !testCase.expectedToWork,
         result: null,
         error: error.message,
-        consoleOutput: []
+        consoleOutput: [],
       });
     }
   }
@@ -269,9 +273,13 @@ async function runSerializationTests() {
   if (results.unexpected > 0) {
     console.log("\\n🔍 UNEXPECTED RESULTS:");
     results.details
-      .filter(d => !d.matches)
-      .forEach(detail => {
-        console.log(`  - ${detail.name}: Expected ${detail.expected ? 'success' : 'failure'}, got ${detail.actual ? 'success' : 'failure'}`);
+      .filter((d) => !d.matches)
+      .forEach((detail) => {
+        console.log(
+          `  - ${detail.name}: Expected ${
+            detail.expected ? "success" : "failure"
+          }, got ${detail.actual ? "success" : "failure"}`
+        );
         if (detail.error) {
           console.log(`    Error: ${detail.error}`);
         }
@@ -280,15 +288,19 @@ async function runSerializationTests() {
 
   // Analysis and recommendations
   console.log("\\n🔬 ANALYSIS:");
-  
-  const workingTypes = results.details.filter(d => d.actual).map(d => d.name);
-  const failingTypes = results.details.filter(d => !d.actual).map(d => d.name);
-  
+
+  const workingTypes = results.details
+    .filter((d) => d.actual)
+    .map((d) => d.name);
+  const failingTypes = results.details
+    .filter((d) => !d.actual)
+    .map((d) => d.name);
+
   console.log("\\n✅ Types that work:");
-  workingTypes.forEach(name => console.log(`  - ${name}`));
-  
+  workingTypes.forEach((name) => console.log(`  - ${name}`));
+
   console.log("\\n❌ Types that fail:");
-  failingTypes.forEach(name => console.log(`  - ${name}`));
+  failingTypes.forEach((name) => console.log(`  - ${name}`));
 
   console.log("\\n💡 RECOMMENDATIONS:");
   console.log("  1. Use JSON.stringify() for complex objects");
@@ -300,10 +312,10 @@ async function runSerializationTests() {
 }
 
 if (require.main === module) {
-  runSerializationTests().catch(error => {
+  runSerializationTests().catch((error) => {
     console.error("Test suite failed:", error);
     process.exit(1);
   });
 }
 
-export { runSerializationTests, testCases };
+export { runSerializationTests, testCases };

package/src/agents/tools/executeScript/examples/test-runner.ts

@@ -5,7 +5,7 @@
  */
 
 import { executeScript } from "../../executeScript";
-import { Tools } from "../../../../services";
+import { services } from "../../../../services";
 import { Clients } from "../../../../clients";
 import { includedTools } from "../../../tools/list";
 import * as allTools from "../../../tools";
@@ -105,15 +105,11 @@ await main().then(result => {
 
 async function runTest() {
   console.log("🚀 Starting executeScript test...\n");
+  const { Tools } = services();
 
   try {
     Tools.defineTools(includedTools, allTools);
 
-    const context = {
-      tools: Tools,
-      clients: Clients,
-    };
-
     console.log("📋 Test Parameters:");
     console.log("- Max Tool Calls: 10");
     console.log("- Max Tokens: 1000");
@@ -123,16 +119,13 @@ async function runTest() {
     const startTime = Date.now();
 
     // Execute the test script
-    const result = await executeScript(
-      {
-        script: testScript,
-        maxToolCalls: 10,
-        maxTokens: 1000,
-        maxExecutionTimeMs: 60000,
-        maxCostUsd: 0.5,
-      },
-      context
-    );
+    const result = await executeScript({
+      script: testScript,
+      maxToolCalls: 10,
+      maxTokens: 1000,
+      maxExecutionTimeMs: 60000,
+      maxCostUsd: 0.5,
+    });
 
     const executionTime = Date.now() - startTime;
 

package/src/agents/tools/executeScript/index.ts

@@ -1,17 +1,36 @@
 import { ScriptExecutor } from "../../../services/script-execution/ScriptExecutor";
-import { Tools } from "../../../services";
-import { Clients } from "../../../clients";
+import { ToolsService } from "../../../services/Tools";
 import {
   ExecutionRequest,
   ExecutionResult,
 } from "../../../services/script-execution/types";
+import { services } from "src/services";
 
-
-export const executeScript = async (
-  { script, maxToolCalls, maxTokens, maxExecutionTimeMs, maxCostUsd },
-  context
-) => {
+export async function executeScript({
+  script,
+  maxToolCalls,
+  maxTokens,
+  maxExecutionTimeMs,
+  maxCostUsd,
+}: {
+  script: string;
+  maxToolCalls?: number;
+  maxTokens?: number;
+  maxExecutionTimeMs?: number;
+  maxCostUsd?: number;
+}) {
   try {
+    // Get context from bound ToolsService
+    const toolService = (
+      this instanceof ToolsService ? this : services().Tools
+    ) as ToolsService;
+    const toolContext = toolService.getContext();
+    const { Clients, Tools } = toolContext;
+
+    if (!Clients) {
+      throw new Error("Clients not available in tool context");
+    }
+
     // Create script executor with access to tools and clients
     const executor = new ScriptExecutor(Tools, Clients);
 
@@ -71,4 +90,4 @@ export const executeScript = async (
       },
     };
   }
-};
+}

package/src/agents/vim/vim.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import { Message } from "../../clients/types";
-import { BaseAgent } from "../base/base";
+import { AgentContext, BaseAgent } from "../base/base";
 import { readFile, writeFile, execAsync, mkdir } from "../../utils";
 import { openai, singlePrompt, Models } from "../../ai";
 import { BASE_PROMPT } from "../base/prompt";
@@ -11,8 +11,8 @@ export class VimAgent extends BaseAgent {
 
   toolPath = ".knowhow/tools/vim";
 
-  constructor() {
-    super();
+  constructor(context: AgentContext) {
+    super(context);
     // this.disableTool("patchFile");
     this.setModelPreferences([
       { model: Models.anthropic.Sonnet4, provider: "anthropic" },
@@ -150,4 +150,3 @@ export class VimAgent extends BaseAgent {
   }
 }
 
-export const Vimmer = new VimAgent();

package/src/ai.ts

@@ -11,7 +11,7 @@ const config = getConfigSync();
 const OPENAI_KEY = process.env.OPENAI_KEY;
 
 import { Models } from "./types";
-import { Agents } from "./services";
+import { services } from "./services";
 export { Models };
 
 export const openai = new OpenAI({
@@ -20,6 +20,7 @@ export const openai = new OpenAI({
 });
 
 export async function singlePrompt(userPrompt: string, model = "", agent = "") {
+  const { Agents } = services();
   if (agent) {
     const agentConfig = await Agents.getAgent(agent);
     if (!agentConfig) {

package/src/chat.ts

@@ -13,10 +13,10 @@ import { Marked } from "./utils";
 import { ask } from "./utils";
 import { Plugins } from "./plugins/plugins";
 import { queryEmbedding, getConfiguredEmbeddingMap } from "./embeddings";
-import { Agents } from "./services/AgentService";
+import { services } from "./services/";
 import { FlagsService } from "./services/flags";
 import { IAgent } from "./agents/interface";
-import { Clients, Message } from "./clients";
+import { Message } from "./clients";
 import { recordAudio, voiceToText } from "./microphone";
 import { Models } from "./ai";
 import { BaseAgent } from "./agents";
@@ -129,6 +129,7 @@ The user has asked:
     { role: "user", content: gptPrompt },
   ] as Message[];
 
+  const { Clients } = services();
   const response = await Clients.createCompletion(provider, {
     messages: thread,
     model,
@@ -182,6 +183,7 @@ export async function chatLoop<E extends GptQuestionEmbedding>(
   embeddings: Embeddable<E>[],
   plugins: string[] = []
 ) {
+  const { Agents, Clients } = services();
   let activeAgent = Agents.getAgent("Developer") as BaseAgent;
   let provider = "openai" as keyof typeof Clients.clients;
   let model = ChatModelDefaults[provider];

package/src/cli.ts

@@ -4,26 +4,22 @@ import { generate, embed, upload, chat } from "./index";
 import { init } from "./config";
 
 import { download, purge } from ".";
-import { Agents } from "./services/AgentService";
-import { Researcher } from "./agents/researcher/researcher";
-import { Patcher } from "./agents/patcher/patcher";
-import { Vimmer } from "./agents/vim/vim";
-import { Developer } from "./agents/developer/developer";
-import { Tools } from "./services";
 import { includedTools } from "./agents/tools/list";
 import * as allTools from "./agents/tools";
-import { Mcp } from "./services/Mcp";
+import { services } from "./services";
 import { login } from "./login";
 import { worker } from "./worker";
-import { Clients } from "./clients";
+import { agents } from "./agents";
 
 const command = process.argv[2];
 
 async function main() {
+  const { Tools, Agents, Mcp, Clients } = services();
+  const { Researcher, Developer, Patcher } = agents();
   Agents.registerAgent(Researcher);
   Agents.registerAgent(Patcher);
   Agents.registerAgent(Developer);
-  Agents.loadAgentsFromConfig();
+  Agents.loadAgentsFromConfig(services());
 
   Tools.defineTools(includedTools, allTools);
 

package/src/dataset/diffs/test.ts

@@ -15,6 +15,7 @@ import {
   hunksToPatch,
 } from "../../agents/tools/patch";
 import { md5Hash } from "../../hashes";
+import { services } from "../../services";
 const dataset = [];
 
 class PatchTestAgent extends PatchingAgent {
@@ -44,7 +45,7 @@ class PatchTestAgent extends PatchingAgent {
 }
 
 async function testDataset() {
-  const patchAgent = new PatchTestAgent();
+  const patchAgent = new PatchTestAgent(services());
 
   let successCount = 0;
   let attempts = 0;

package/src/index.ts

@@ -42,10 +42,8 @@ import { abort } from "process";
 import { chatLoop } from "./chat";
 import { convertToText } from "./conversion";
 import { Plugins } from "./plugins/plugins";
-import { AwsS3 } from "./services/S3";
-import { GitHub } from "./services/GitHub";
 import { knowhowMcpClient } from "./services/Mcp";
-import { knowhowApiClient } from "./services/KnowhowClient";
+import { services } from "./services/";
 import { Models } from "./types";
 
 export * as clients from "./clients";
@@ -96,6 +94,7 @@ export async function purge(globPath: string) {
 
 export async function upload() {
   const config = await getConfig();
+  const { AwsS3, knowhowApiClient } = services();
 
   for (const source of config.embedSources) {
     const bucketName = source.remote;
@@ -324,6 +323,7 @@ export async function chat() {
 
 export async function download() {
   const config = await getConfig();
+  const { AwsS3, GitHub, knowhowApiClient } = services();
 
   for (const source of config.embedSources) {
     const { remote, remoteType } = source;

package/src/services/AgentService.ts

@@ -1,18 +1,19 @@
 import { getConfigSync } from "../config";
 import { IAgent } from "../agents/interface";
+import { EventService } from "./EventService";
+import { ToolsService } from "./Tools";
 import { ConfigAgent } from "../agents/configurable/ConfigAgent";
-import { Events } from "./EventService";
-import { Tools } from "./Tools";
+import { AgentContext } from "src/agents/base/base";
 
 export class AgentService {
   private agents: Map<string, IAgent> = new Map();
 
-  constructor() {
+  constructor(private tools: ToolsService, private events: EventService) {
     this.wireUp();
   }
 
   public wireUp() {
-    Tools.addTool({
+    this.tools.addTool({
       type: "function",
       function: {
         name: "agentCall",
@@ -35,13 +36,13 @@ export class AgentService {
         },
       },
     });
-    Events.on("agents:register", (data) => {
+    this.events.on("agents:register", (data) => {
       console.log(`Agent registered: ${data.name}`);
       const { name, agent } = data;
       this.registerAgentByName(name, agent);
     });
 
-    Events.on("agents:call", (data) => {
+    this.events.on("agents:call", (data) => {
       console.log(`Agent called: ${data.name}`);
       const { name, query, resolve, reject } = data;
       this.callAgent(name, query).then(resolve).catch(reject);
@@ -77,12 +78,12 @@ export class AgentService {
     });
   }
 
-  public loadAgentsFromConfig() {
+  public loadAgentsFromConfig(context: AgentContext) {
     const config = getConfigSync();
     const agents = config.agents || [];
 
     for (const agent of agents) {
-      this.registerAgent(new ConfigAgent(agent));
+      this.registerAgent(new ConfigAgent(agent, context));
     }
   }
 
@@ -94,5 +95,3 @@ export class AgentService {
     return agent.call(query);
   }
 }
-
-export const Agents = new AgentService();

package/src/services/EventService.ts

@@ -16,5 +16,3 @@ export class EventService extends EventEmitter {
     });
   }
 }
-
-export const Events = new EventService();

package/src/services/GitHub.ts

@@ -57,4 +57,3 @@ export class GitHubService {
   }
 }
 
-export const GitHub = new GitHubService();

package/src/services/KnowhowClient.ts

@@ -108,6 +108,3 @@ export class KnowhowSimpleClient {
   }
 }
 
-export const knowhowApiClient = new KnowhowSimpleClient(
-  process.env.KNOWHOW_API_URL
-);

package/src/services/Mcp.ts

@@ -286,5 +286,3 @@ export class McpService {
     return transformed;
   }
 }
-
-export const Mcp = new McpService();

package/src/services/S3.ts

@@ -123,4 +123,3 @@ export class S3Service {
   }
 }
 
-export const AwsS3 = new S3Service();