@olane/o-core 0.4.4 → 0.6.1

package/dist/src/plan/use/use.plan.js

@@ -3,6 +3,11 @@ import { oPlan } from '../o-plan.js';
 import { oPlanType } from '../interfaces/plan-type.enum.js';
 import { oToolError } from '../../error/tool.error.js';
 import { oToolErrorCodes } from '../../error/enums/codes.error.js';
+import { oPlanContext } from '../plan.context.js';
+import { oAgentPlan } from '../agent.plan.js';
+import { CONFIGURE_INSTRUCTIONS } from '../prompts/configure.prompt.js';
+import { v4 as uuidv4 } from 'uuid';
+import { ObjectUtils } from '../../utils/object.utils.js';
 /**
  * We know what tool we want to use, let's use it.
  */
@@ -19,53 +24,126 @@ export class oUsePlan extends oPlan {
         }
         return response;
     }
+    static hasOlaneAddress(value) {
+        return (!!value &&
+            typeof value === 'string' &&
+            !!value?.match(/o:\/\/.*(placeholder)+(?:\/[\w.-]+)+/g));
+    }
+    static extractAddresses(value) {
+        const matches = value.matchAll(/o:\/\/.*(placeholder)+(?:\/[\w.-]+)+/g);
+        return Array.from(matches, (match) => match[0]);
+    }
     async run() {
         this.logger.debug('Running...');
         if (!this.config.receiver) {
             throw new Error('Receiver is required');
         }
-        // do handshake to get the method + parameters + dependencies
-        const handshakeResponse = await this.node.use(this.config.receiver, {
-            method: 'handshake',
-            params: {
-                intent: this.config.intent,
-                // sequence: this.sequence.map((s) => {
-                //   return {
-                //     config: s.toCIDInput(),
-                //     result: s.result,
-                //   };
-                // }),
-            },
-        });
-        this.logger.debug('Handshake response: ', handshakeResponse);
-        const data = handshakeResponse.result.data;
-        this.logger.debug('Handshake data: ', data);
-        const { handshake, error } = data;
-        if (error) {
-            return error;
-        }
-        if (!handshake) {
-            throw new oToolError(oToolErrorCodes.TOOL_ERROR, 'Failed to configure the tool use');
+        try {
+            // do MCP handshake to get the method + parameters + dependencies
+            const handshakeResponse = await this.node.use(this.config.receiver, {
+                method: 'handshake',
+                params: {
+                    intent: this.config.intent,
+                },
+            });
+            const { tools, methods, successes, failures } = handshakeResponse.result
+                .data;
+            const pc = new oAgentPlan({
+                ...this.config,
+                sequence: this.sequence,
+                intent: `This is a configure request, prioritize "Configure Request Instructions". You have already found the tool to resolve the user's intent: ${this.config.receiver}. Configure the request to use the tool with user intent: ${this.config.intent}`,
+                context: new oPlanContext([
+                    `[Method Metadata Begin]\n${JSON.stringify(methods, null, 2)}\n[Method Metadata End]`,
+                    `[Method Options Begin]\n${(tools || []).join(', ')}\n[Method Options End]`,
+                ]),
+                extraInstructions: CONFIGURE_INSTRUCTIONS,
+                parentId: this.id,
+            });
+            const result = await pc.execute();
+            this.addSequencePlan(pc);
+            this.logger.debug('Configure result: ', result);
+            const { configure, error: configureError } = result;
+            if (configureError) {
+                return {
+                    error: configureError,
+                    type: 'error',
+                };
+            }
+            if (!configure || !configure.task) {
+                throw new oToolError(oToolErrorCodes.TOOL_ERROR, 'Failed to configure the tool use');
+            }
+            const { task } = configure;
+            let params = task.payload?.params;
+            params = await ObjectUtils.allKeyValues(params, async (key, val) => {
+                let value = val;
+                if (!oUsePlan.hasOlaneAddress(value)) {
+                    return value;
+                }
+                // extract the addresses & process them if LFS is needed
+                this.logger.debug('Has olane address: ', value);
+                const addresses = oUsePlan.extractAddresses(value);
+                for (const address of addresses) {
+                    const largeDataResponse = await this.node.use(new oAddress(address));
+                    this.logger.debug('Large data response: ', largeDataResponse.result.data);
+                    value = value.replace(address, largeDataResponse.result.data?.value || 'unknown value');
+                    this.logger.debug('Updated the value with LFS value: ', value);
+                }
+                return value;
+            });
+            const response = await this.node.use(this.config.receiver, {
+                method: task.payload?.method,
+                params: params,
+            });
+            return {
+                result: `Tool input: ${JSON.stringify(task || {}, null, 2)}\nTool output: ${JSON.stringify(response.result, null, 2)}`,
+                type: 'result',
+            };
         }
-        const response = await this.node.use(this.config.receiver, {
-            method: handshake.payload?.method,
-            params: handshake.payload?.params,
-        });
-        this.logger.debug('Use response: ', response);
-        // check for error
-        if (response.result.error) {
+        catch (error) {
+            this.logger.error('Error executing use plan: ', error);
+            if (error instanceof oToolError) {
+                return {
+                    error: error.toString(),
+                    type: 'error',
+                };
+            }
             return {
-                error: {
-                    ...response.result.error,
-                    // methodMetadata: data.methodMetadata,
-                    // methods: data.methods,
-                },
+                error: error?.message || error || 'Unknown error',
                 type: 'error',
             };
         }
-        return {
-            result: response.result,
-            type: 'result',
-        };
+    }
+    async postflight(result) {
+        // if the response is larger than 10,000 characters, then put it in an address
+        const THRESHOLD_DATA_SIZE = 1000;
+        if (this.config?.receiver &&
+            this.config.receiver.toString().indexOf('placeholder') === -1 &&
+            JSON.stringify(result).length > THRESHOLD_DATA_SIZE) {
+            let data = result.result;
+            data = await ObjectUtils.allKeyValues(data, async (key, val) => {
+                const value = val;
+                if (value &&
+                    typeof value === 'string' &&
+                    value.length > THRESHOLD_DATA_SIZE) {
+                    const addressKey = uuidv4();
+                    this.logger.debug('Storing large data in address: ', value);
+                    const largeDataResponse = await this.node.use(new oAddress('o://placeholder'), {
+                        method: 'put',
+                        params: {
+                            key: addressKey,
+                            value: value,
+                            intent: this.config.intent,
+                        },
+                    });
+                    const { instructions } = largeDataResponse.result.data;
+                    return instructions;
+                }
+            });
+            // update the response data
+            result.result = data;
+        }
+        this.result = result;
+        await super.postflight(result);
+        return result;
     }
 }

package/dist/src/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './object.utils.js';
+export * from './regex.utils.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC"}

package/dist/src/utils/index.js

@@ -0,0 +1,2 @@
+export * from './object.utils.js';
+export * from './regex.utils.js';

package/dist/src/utils/object.utils.d.ts

@@ -0,0 +1,5 @@
+export declare class ObjectUtils {
+    static isObject(obj: any): boolean;
+    static allKeyValues(obj: any, callback: (key: string, value: any) => Promise<any>): Promise<any>;
+}
+//# sourceMappingURL=object.utils.d.ts.map

package/dist/src/utils/object.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/object.utils.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;WAIrB,YAAY,CACvB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,GAClD,OAAO,CAAC,GAAG,CAAC;CAkBhB"}

package/dist/src/utils/object.utils.js

@@ -0,0 +1,23 @@
+export class ObjectUtils {
+    static isObject(obj) {
+        return obj !== null && typeof obj === 'object';
+    }
+    static async allKeyValues(obj, callback) {
+        if (!ObjectUtils.isObject(obj)) {
+            return obj;
+        }
+        for (const key in obj) {
+            let value = obj[key];
+            // iterate over the object if not a primitive
+            if (ObjectUtils.isObject(value)) {
+                value = await ObjectUtils.allKeyValues(value, callback);
+            }
+            else {
+                value = await callback(key, value);
+            }
+            // update the object
+            obj[key] = value;
+        }
+        return obj;
+    }
+}

package/dist/src/utils/regex.utils.d.ts

@@ -0,0 +1,4 @@
+export declare class RegexUtils {
+    static extractResultFromAI(message: string): any;
+}
+//# sourceMappingURL=regex.utils.d.ts.map

package/dist/src/utils/regex.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"regex.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/regex.utils.ts"],"names":[],"mappings":"AAAA,qBAAa,UAAU;IACrB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;CAajD"}

package/dist/src/utils/regex.utils.js

@@ -0,0 +1,13 @@
+export class RegexUtils {
+    static extractResultFromAI(message) {
+        // handle 4 levels of nested JSON
+        const match = message.match(/\{.+\}/s);
+        const json = match ? match[0] : null;
+        if (!json) {
+            throw new Error('AI failed to return a valid JSON object');
+        }
+        // process the result and react
+        const planResult = JSON.parse(json);
+        return planResult;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-core",
-  "version": "0.4.4",
+  "version": "0.6.1",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -19,6 +19,7 @@
     "test": "aegir test",
     "test:node": "aegir test -t node",
     "test:browser": "aegir test -t browser",
+    "deep:clean": "rm -rf node_modules && rm package-lock.json",
     "dev": "DEBUG=o-protocol:* npx tsx src/tests/index.ts",
     "build": "tsc",
     "start:prod": "node dist/index.js",
@@ -35,6 +36,8 @@
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.29.0",
+    "@olane/o-config": "file:packages/o-config",
+    "@olane/o-protocol": "file:packages/o-protocol",
     "@tsconfig/node20": "^20.1.6",
     "@types/jest": "^30.0.0",
     "@types/uuid": "^10.0.0",
@@ -54,8 +57,8 @@
     "typescript": "^5.8.3"
   },
   "peerDependencies": {
-    "@olane/o-config": "^0.4.3",
-    "@olane/o-protocol": "^0.4.3"
+    "@olane/o-config": "^0.6.0",
+    "@olane/o-protocol": "^0.6.0"
   },
   "dependencies": {
     "chalk": "^5.4.1",

package/dist/src/plan/configure/configure.plan.d.ts

@@ -1,11 +0,0 @@
-import { oPlan } from '../o-plan.js';
-import { oPlanType } from '../interfaces/plan-type.enum.js';
-import { oPlanConfig } from '../interfaces/plan-config.interface.js';
-/**
- * We know what tool we want to use, let's configure it.
- */
-export declare class oConfigurePlan extends oPlan {
-    constructor(config: oPlanConfig);
-    type(): oPlanType;
-}
-//# sourceMappingURL=configure.plan.d.ts.map

package/dist/src/plan/configure/configure.plan.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"configure.plan.d.ts","sourceRoot":"","sources":["../../../../src/plan/configure/configure.plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAGrE;;GAEG;AACH,qBAAa,cAAe,SAAQ,KAAK;gBAC3B,MAAM,EAAE,WAAW;IAK/B,IAAI;CAGL"}

package/dist/src/plan/configure/configure.plan.js

@@ -1,15 +0,0 @@
-import { oPlan } from '../o-plan.js';
-import { oPlanType } from '../interfaces/plan-type.enum.js';
-import { CONFIGURE_PROMPT } from '../prompts/configure.prompt.js';
-/**
- * We know what tool we want to use, let's configure it.
- */
-export class oConfigurePlan extends oPlan {
-    constructor(config) {
-        super(config);
-        this.config.promptFunction = CONFIGURE_PROMPT;
-    }
-    type() {
-        return oPlanType.CONFIGURE;
-    }
-}

package/dist/src/plan/error/error.plan.d.ts

@@ -1,11 +0,0 @@
-import { oPlanConfig } from '../interfaces/plan-config.interface.js';
-import { oPlanResult } from '../interfaces/plan.result.js';
-import { oPlan } from '../o-plan.js';
-export declare class oErrorPlan extends oPlan {
-    private error;
-    constructor(config: oPlanConfig & {
-        error: any;
-    });
-    run(): Promise<oPlanResult>;
-}
-//# sourceMappingURL=error.plan.d.ts.map

package/dist/src/plan/error/error.plan.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"error.plan.d.ts","sourceRoot":"","sources":["../../../../src/plan/error/error.plan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAGrC,qBAAa,UAAW,SAAQ,KAAK;IACnC,OAAO,CAAC,KAAK,CAAM;gBACP,MAAM,EAAE,WAAW,GAAG;QAAE,KAAK,EAAE,GAAG,CAAA;KAAE;IAK1C,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;CAalC"}

package/dist/src/plan/error/error.plan.js

@@ -1,20 +0,0 @@
-import { oAddress } from '../../core/o-address.js';
-import { oPlan } from '../o-plan.js';
-import { ERROR_PROMPT } from '../prompts/error.prompt.js';
-export class oErrorPlan extends oPlan {
-    constructor(config) {
-        super(config);
-        this.error = config.error;
-    }
-    async run() {
-        const prompt = ERROR_PROMPT(this.error, this.agentHistory);
-        this.logger.debug('Error prompt: ', prompt);
-        const response = await this.node.use(new oAddress('o://intelligence'), {
-            method: 'prompt',
-            params: {
-                prompt: prompt,
-            },
-        });
-        return response.result.data;
-    }
-}

package/dist/src/plan/prompts/error.prompt.d.ts

@@ -1,2 +0,0 @@
-export declare const ERROR_PROMPT: (error: any, agentHistory: string) => string;
-//# sourceMappingURL=error.prompt.d.ts.map

package/dist/src/plan/prompts/error.prompt.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"error.prompt.d.ts","sourceRoot":"","sources":["../../../../src/plan/prompts/error.prompt.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,GAAI,OAAO,GAAG,EAAE,cAAc,MAAM,WAsC5D,CAAC"}

package/dist/src/plan/prompts/error.prompt.js

@@ -1,39 +0,0 @@
-export const ERROR_PROMPT = (error, agentHistory) => `
-You are an AI agent that helps the user fix an error.
-
-General Information:
-- You have access to tools that are interconnected through a p2p network.
-- You have access to a knowledge vector database tool that can provide information about tools and general knowledge.
-- Network addresses are used to access tools.
-- Other networks may be accessible through the network address resolution system.
-- Context from searching across networks is added to the "Additional Context" section.
-- The state of solving the user's intent is logged in the "Agent State" section.
-
-Error: ${JSON.stringify(error, null, 2)}
-
-Rules:
-1. Do not explain the reasoning process, just return the output.
-2. Do not include \`\`\`json or \`\`\` in your output.
-
-Steps:
-1. Review the error and determine the cause.
-2. Check the agentic state history to see if there was a better choice that could have been made to prevent this error.
-3. Review the method options to see if there was a better method that could have been used to prevent this error.
-4. Review the method metadata to see if the error is due to a missing method or parameter.
-5. If you can fix the error, provide a solution.
-6. If you cannot fix the error, create a human readable explanation on how to solve the error.
-5. The explanation should summarize the intent and explain why it failed concisely.
-
-Error Output Format:
-{
-  "error": {
-    "message": string,
-    "solution": string,
-    "explanation": string,
-  },
-  "type": "error",
-}
-
-[Agentic State]
-${agentHistory}
-`;

package/dist/src/plan/prompts/search.prompt.d.ts

@@ -1,2 +0,0 @@
-export declare const SEARCH_PROMPT: (intent: string, context: string) => string;
-//# sourceMappingURL=search.prompt.d.ts.map

package/dist/src/plan/prompts/search.prompt.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"search.prompt.d.ts","sourceRoot":"","sources":["../../../../src/plan/prompts/search.prompt.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,SAAS,MAAM,WA0C5D,CAAC"}

package/dist/src/plan/prompts/search.prompt.js

@@ -1,43 +0,0 @@
-export const SEARCH_PROMPT = (intent, context) => `
-You are a helpful assistant that searches for unknown entities in the user's input or returns a tool address that helps complete the user's task.
-
-All entities are hosted within a network of p2p nodes and are tools, data, or other items.
-The p2p nodes and their contained data are accessible via the network address resolution system.
-
-All entity data is stored within a vector database that can be queried for more information.
-
-User Input: ${intent}
-
-Rules:
-1. Do not explain the reasoning process, just return the output.
-2. Your output should be a search query or the tool address to use to answer the user's input.
-3. Do not include \`\`\`json or \`\`\` in your output.
-
-Steps:
-1. If you know a tool that can help with the user's input, return it in the format of a task output.
-2. Create a list of unknown entities mentioned in the user's input.
-3. Generate a vector db query for each unknown entity.
-4. Do not return a tool address unless you have seen it in the context.
-
-Task Output Format:
-{
-  "task": {
-    "address": string,
-  },
-  "type": "task",
-}
-
-Search Output Format:
-{
-  "queries": [
-    {
-      "query": string,
-      "explanation": string,
-    }
-  ],
-  "type": "search",
-}
-
-Additional Context: ${context}
-
-`;