@lowire/loop 0.0.15 → 0.0.16

package/lib/cache.d.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 import type * as types from './types';
-type ReplayCaches = {
+export type ReplayCaches = {
     input: types.ReplayCache;
     output: types.ReplayCache;
-    secrets: Record<string, string>;
 };
-export declare function cachedComplete(provider: types.Provider, conversation: types.Conversation, caches: ReplayCaches | undefined, options: types.CompletionOptions): ReturnType<types.Provider['complete']>;
-export {};
+export declare function cachedComplete(provider: types.Provider, conversation: types.Conversation, caches: ReplayCaches | undefined, options: types.CompletionOptions & {
+    secrets?: Record<string, string>;
+}): ReturnType<types.Provider['complete']>;

package/lib/cache.js

@@ -21,33 +21,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cachedComplete = cachedComplete;
 const crypto_1 = __importDefault(require("crypto"));
 async function cachedComplete(provider, conversation, caches, options) {
+    const c = hideSecrets(conversation, options.secrets);
+    const result = await cachedCompleteNoSecrets(provider, c, caches, options);
+    return unhideSecrets(result, options.secrets);
+}
+async function cachedCompleteNoSecrets(provider, conversation, caches, options) {
     if (!caches)
         return await provider.complete(conversation, options);
-    const secrets = caches.secrets || {};
-    const c = hideSecrets(conversation, secrets);
-    const key = calculateSha1(JSON.stringify(c));
+    const key = calculateSha1(JSON.stringify(conversation));
     if (!process.env.LOWIRE_NO_CACHE && caches.input[key]) {
         caches.output[key] = caches.input[key];
-        return unhideSecrets(caches.input[key] ?? caches.output[key], secrets);
+        return caches.input[key] ?? caches.output[key];
     }
     if (!process.env.LOWIRE_NO_CACHE && caches.output[key])
-        return unhideSecrets(caches.output[key], secrets);
+        return caches.output[key];
     if (process.env.LOWIRE_FORCE_CACHE)
         throw new Error('Cache missing but TL_FORCE_CACHE is set' + JSON.stringify(conversation, null, 2));
     const result = await provider.complete(conversation, options);
-    caches.output[key] = hideSecrets(result, secrets);
+    caches.output[key] = result;
     return result;
 }
-function hideSecrets(conversation, secrets) {
+function hideSecrets(conversation, secrets = {}) {
     let text = JSON.stringify(conversation);
     for (const [key, value] of Object.entries(secrets))
-        text = text.replaceAll(value, `<${key}>`);
+        text = text.replaceAll(value, `%${key}%`);
     return JSON.parse(text);
 }
-function unhideSecrets(message, secrets) {
+function unhideSecrets(message, secrets = {}) {
     let text = JSON.stringify(message);
     for (const [key, value] of Object.entries(secrets))
-        text = text.replaceAll(`<${key}>`, value);
+        text = text.replaceAll(`%${key}%`, value);
     return JSON.parse(text);
 }
 function calculateSha1(text) {

package/lib/loop.d.ts

@@ -45,10 +45,8 @@ export type LoopOptions = types.CompletionOptions & LoopEvents & {
     tools?: types.Tool[];
     callTool?: types.ToolCallback;
     maxTurns?: number;
-    cache?: {
-        messages: types.ReplayCache;
-        secrets: Record<string, string>;
-    };
+    cache?: types.ReplayCache;
+    secrets?: Record<string, string>;
     summarize?: boolean;
 };
 export declare class Loop {

package/lib/loop.js

@@ -47,9 +47,8 @@ class Loop {
                 throw new Error(`Budget tokens ${options.maxTokens} exhausted`);
             debug?.('lowire:loop')(`Turn ${turns + 1} of (max ${maxTurns})`);
             const caches = options.cache ? {
-                input: options.cache.messages,
+                input: options.cache,
                 output: this._cacheOutput,
-                secrets: options.cache.secrets
             } : undefined;
             const summarizedConversation = options.summarize ? this._summarizeConversation(task, conversation, options) : conversation;
             const beforeStatus = await options.onBeforeTurn?.({ conversation: summarizedConversation, totalUsage, budgetTokens });
@@ -161,5 +160,7 @@ function wrapToolWithIsDone(tool) {
     };
 }
 const systemPrompt = `
-You are an autonomous agent designed to complete tasks by interacting with tools. Perform the user task.
+- You are an autonomous agent designed to complete tasks by interacting with tools.
+- Perform the user task.
+- If you see text surrounded by %, it is a secret and you should preserve it as such. It will be replaced with the actual value before the tool call.
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowire/loop",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Small agentic loop",
   "repository": {
     "type": "git",