llmist 16.0.1 → 16.0.3

package/dist/index.cjs

@@ -658,11 +658,11 @@ var init_execution_tree = __esm({
             yield this.eventQueue.shift();
           }
           if (this.isCompleted) break;
-          const event = await new Promise((resolve) => {
+          const event = await new Promise((resolve2) => {
             if (this.eventQueue.length > 0) {
-              resolve(this.eventQueue.shift());
+              resolve2(this.eventQueue.shift());
             } else {
-              this.eventWaiters.push(resolve);
+              this.eventWaiters.push(resolve2);
             }
           });
           yield event;
@@ -4084,6 +4084,62 @@ var init_registry = __esm({
 });
 
 // src/agent/file-logging.ts
+function createFileLoggingState() {
+  return {
+    counters: /* @__PURE__ */ new Map(),
+    subagentDirectories: /* @__PURE__ */ new Map(),
+    activeDirectoryByContext: /* @__PURE__ */ new Map()
+  };
+}
+function getDefaultState() {
+  if (!defaultState) {
+    defaultState = createFileLoggingState();
+  }
+  return defaultState;
+}
+function getNextCounter(state, directory) {
+  const current = state.counters.get(directory) ?? 0;
+  const next = current + 1;
+  state.counters.set(directory, next);
+  return next;
+}
+function getContextKey(subagentContext) {
+  if (!subagentContext) return "root:0";
+  return `${subagentContext.parentGadgetInvocationId}:${subagentContext.depth}`;
+}
+function resetFileLoggingState() {
+  defaultState = void 0;
+}
+function findParentContextKey(state, currentDepth) {
+  const parentDepth = currentDepth - 1;
+  if (parentDepth === 0) return "root:0";
+  for (const [key, _path] of state.activeDirectoryByContext) {
+    if (key.endsWith(`:${parentDepth}`)) {
+      return key;
+    }
+  }
+  return "root:0";
+}
+function resolveLoggingDirectory(state, baseDirectory, counterPadding, subagentContext) {
+  const contextKey = getContextKey(subagentContext);
+  if (!subagentContext) {
+    state.activeDirectoryByContext.set(contextKey, baseDirectory);
+    return baseDirectory;
+  }
+  const { parentGadgetInvocationId, depth } = subagentContext;
+  const parentContextKey = findParentContextKey(state, depth);
+  const parentDir = state.activeDirectoryByContext.get(parentContextKey) ?? baseDirectory;
+  const subagentKey = `${parentDir}:${parentGadgetInvocationId}`;
+  let fullPath = state.subagentDirectories.get(subagentKey);
+  if (!fullPath) {
+    const chronoNumber = getNextCounter(state, parentDir);
+    const subdirName = `${formatCallNumber(chronoNumber, counterPadding)}-${parentGadgetInvocationId}`;
+    fullPath = (0, import_node_path3.join)(parentDir, subdirName);
+    state.subagentDirectories.set(subagentKey, fullPath);
+  }
+  state.activeDirectoryByContext.set(contextKey, fullPath);
+  return fullPath;
+}
 function formatLlmRequest(messages) {
   const lines = [];
   for (const msg of messages) {
@@ -4100,16 +4156,20 @@ async function writeLogFile(dir, filename, content) {
   await (0, import_promises2.mkdir)(dir, { recursive: true });
   await (0, import_promises2.writeFile)((0, import_node_path3.join)(dir, filename), content, "utf-8");
 }
-function createFileLoggingHooks(options) {
+function createFileLoggingHooks(options, state = getDefaultState()) {
   const {
-    directory,
     startingCounter = 1,
     counterPadding = 4,
     skipSubagents = true,
     formatRequest = formatLlmRequest,
     onFileWritten
   } = options;
-  let callCounter = startingCounter - 1;
+  const baseDirectory = (0, import_node_path3.resolve)(options.directory);
+  if (!state.counters.has(baseDirectory)) {
+    state.counters.set(baseDirectory, startingCounter - 1);
+  }
+  let currentCallNumber = 0;
+  let currentDirectory = baseDirectory;
   return {
     observers: {
       /**
@@ -4119,17 +4179,25 @@ function createFileLoggingHooks(options) {
         if (skipSubagents && context.subagentContext) {
           return;
         }
-        callCounter++;
-        const filename = `${formatCallNumber(callCounter, counterPadding)}.request`;
+        currentDirectory = resolveLoggingDirectory(
+          state,
+          baseDirectory,
+          counterPadding,
+          context.subagentContext
+        );
+        currentCallNumber = getNextCounter(state, currentDirectory);
+        const filename = `${formatCallNumber(currentCallNumber, counterPadding)}.request`;
         const content = formatRequest(context.options.messages);
         try {
-          await writeLogFile(directory, filename, content);
+          await writeLogFile(currentDirectory, filename, content);
           if (onFileWritten) {
             onFileWritten({
-              filePath: (0, import_node_path3.join)(directory, filename),
+              filePath: (0, import_node_path3.join)(currentDirectory, filename),
               type: "request",
-              callNumber: callCounter,
-              contentLength: content.length
+              callNumber: currentCallNumber,
+              contentLength: content.length,
+              parentGadgetInvocationId: context.subagentContext?.parentGadgetInvocationId,
+              depth: context.subagentContext?.depth
             });
           }
         } catch (error) {
@@ -4143,16 +4211,22 @@ function createFileLoggingHooks(options) {
         if (skipSubagents && context.subagentContext) {
           return;
         }
-        const filename = `${formatCallNumber(callCounter, counterPadding)}.response`;
+        if (currentCallNumber === 0) {
+          console.warn("[file-logging] Skipping response write: no matching request recorded");
+          return;
+        }
+        const filename = `${formatCallNumber(currentCallNumber, counterPadding)}.response`;
         const content = context.rawResponse;
         try {
-          await writeLogFile(directory, filename, content);
+          await writeLogFile(currentDirectory, filename, content);
           if (onFileWritten) {
             onFileWritten({
-              filePath: (0, import_node_path3.join)(directory, filename),
+              filePath: (0, import_node_path3.join)(currentDirectory, filename),
               type: "response",
-              callNumber: callCounter,
-              contentLength: content.length
+              callNumber: currentCallNumber,
+              contentLength: content.length,
+              parentGadgetInvocationId: context.subagentContext?.parentGadgetInvocationId,
+              depth: context.subagentContext?.depth
             });
           }
         } catch (error) {
@@ -4169,7 +4243,7 @@ function getEnvFileLoggingHooks() {
   }
   return createFileLoggingHooks({ directory });
 }
-var import_promises2, import_node_path3, ENV_LOG_RAW_DIRECTORY;
+var import_promises2, import_node_path3, defaultState, ENV_LOG_RAW_DIRECTORY;
 var init_file_logging = __esm({
   "src/agent/file-logging.ts"() {
     "use strict";
@@ -14435,7 +14509,7 @@ var init_stream_processor = __esm({
           const allDone = this.inFlightExecutions.size > 0 ? Promise.all(this.inFlightExecutions.values()).then(() => "done") : Promise.resolve("done");
           const result = await Promise.race([
             allDone,
-            new Promise((resolve) => setTimeout(() => resolve("poll"), POLL_INTERVAL_MS))
+            new Promise((resolve2) => setTimeout(() => resolve2("poll"), POLL_INTERVAL_MS))
           ]);
           yield* this.drainCompletedResults();
           if (result === "done" && this.getTotalActiveGadgetCount() === 0 && !this.hasQueuedGadgets()) {
@@ -15577,7 +15651,7 @@ var init_agent = __esm({
        * Simple sleep utility for rate limit delays.
        */
       sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
+        return new Promise((resolve2) => setTimeout(resolve2, ms));
       }
       /**
        * Handle LLM error through controller.
@@ -16033,6 +16107,7 @@ __export(index_exports, {
   collectText: () => collectText,
   complete: () => complete,
   createAnthropicProviderFromEnv: () => createAnthropicProviderFromEnv,
+  createFileLoggingState: () => createFileLoggingState,
   createGadget: () => createGadget,
   createGadgetOutputViewer: () => createGadgetOutputViewer,
   createGeminiProviderFromEnv: () => createGeminiProviderFromEnv,
@@ -16095,6 +16170,7 @@ __export(index_exports, {
   parseManifest: () => parseManifest,
   parseRetryAfterHeader: () => parseRetryAfterHeader,
   randomDelay: () => randomDelay,
+  resetFileLoggingState: () => resetFileLoggingState,
   resolveConfig: () => resolveConfig,
   resolveHintTemplate: () => resolveHintTemplate,
   resolveModel: () => resolveModel,
@@ -16772,10 +16848,10 @@ function randomDelay(min, max) {
 }
 async function humanDelay(min = 50, max = 150) {
   const delay = randomDelay(min, max);
-  return new Promise((resolve) => setTimeout(resolve, delay));
+  return new Promise((resolve2) => setTimeout(resolve2, delay));
 }
 async function withTimeout(fn, timeoutMs, signal) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     if (signal?.aborted) {
       reject(new Error("Operation aborted"));
       return;
@@ -16801,7 +16877,7 @@ async function withTimeout(fn, timeoutMs, signal) {
         settled = true;
         clearTimeout(timeoutId);
         signal?.removeEventListener("abort", abortHandler);
-        resolve(result);
+        resolve2(result);
       }
     }).catch((error) => {
       if (!settled) {
@@ -16834,7 +16910,7 @@ async function withRetry(fn, options = {}) {
       }
       const waitTime = Math.min(currentDelay, maxDelay);
       onRetry?.(error, attempt + 1, waitTime);
-      await new Promise((resolve) => setTimeout(resolve, waitTime));
+      await new Promise((resolve2) => setTimeout(resolve2, waitTime));
       if (backoff === "exponential") {
         currentDelay *= 2;
       } else {
@@ -16914,6 +16990,7 @@ function getHostExports2(ctx) {
   collectText,
   complete,
   createAnthropicProviderFromEnv,
+  createFileLoggingState,
   createGadget,
   createGadgetOutputViewer,
   createGeminiProviderFromEnv,
@@ -16976,6 +17053,7 @@ function getHostExports2(ctx) {
   parseManifest,
   parseRetryAfterHeader,
   randomDelay,
+  resetFileLoggingState,
   resolveConfig,
   resolveHintTemplate,
   resolveModel,