llmist 2.0.0 → 2.2.0

package/dist/cli.cjs

@@ -1020,6 +1020,100 @@ var init_gadget = __esm({
           throw new AbortError();
         }
       }
+      /**
+       * Register a cleanup function to run when execution is aborted (timeout or cancellation).
+       * The cleanup function is called immediately if the signal is already aborted.
+       * Errors thrown by the cleanup function are silently ignored.
+       *
+       * Use this to clean up resources like browser instances, database connections,
+       * or child processes when the gadget is cancelled due to timeout.
+       *
+       * @param ctx - The execution context containing the abort signal
+       * @param cleanup - Function to run on abort (can be sync or async)
+       *
+       * @example
+       * ```typescript
+       * class BrowserGadget extends Gadget({
+       *   description: 'Fetches web page content',
+       *   schema: z.object({ url: z.string() }),
+       * }) {
+       *   async execute(params: this['params'], ctx?: ExecutionContext): Promise<string> {
+       *     const browser = await chromium.launch();
+       *     this.onAbort(ctx, () => browser.close());
+       *
+       *     const page = await browser.newPage();
+       *     this.onAbort(ctx, () => page.close());
+       *
+       *     await page.goto(params.url);
+       *     const content = await page.content();
+       *
+       *     await browser.close();
+       *     return content;
+       *   }
+       * }
+       * ```
+       */
+      onAbort(ctx, cleanup) {
+        if (!ctx?.signal) return;
+        const safeCleanup = () => {
+          try {
+            const result = cleanup();
+            if (result && typeof result === "object" && "catch" in result) {
+              result.catch(() => {
+              });
+            }
+          } catch {
+          }
+        };
+        if (ctx.signal.aborted) {
+          safeCleanup();
+          return;
+        }
+        ctx.signal.addEventListener("abort", safeCleanup, { once: true });
+      }
+      /**
+       * Create an AbortController linked to the execution context's signal.
+       * When the parent signal aborts, the returned controller also aborts with the same reason.
+       *
+       * Useful for passing abort signals to child operations like fetch() while still
+       * being able to abort them independently if needed.
+       *
+       * @param ctx - The execution context containing the parent abort signal
+       * @returns A new AbortController linked to the parent signal
+       *
+       * @example
+       * ```typescript
+       * class FetchGadget extends Gadget({
+       *   description: 'Fetches data from URL',
+       *   schema: z.object({ url: z.string() }),
+       * }) {
+       *   async execute(params: this['params'], ctx?: ExecutionContext): Promise<string> {
+       *     const controller = this.createLinkedAbortController(ctx);
+       *
+       *     // fetch() will automatically abort when parent times out
+       *     const response = await fetch(params.url, { signal: controller.signal });
+       *     return response.text();
+       *   }
+       * }
+       * ```
+       */
+      createLinkedAbortController(ctx) {
+        const controller = new AbortController();
+        if (ctx?.signal) {
+          if (ctx.signal.aborted) {
+            controller.abort(ctx.signal.reason);
+          } else {
+            ctx.signal.addEventListener(
+              "abort",
+              () => {
+                controller.abort(ctx.signal.reason);
+              },
+              { once: true }
+            );
+          }
+        }
+        return controller;
+      }
       /**
        * Auto-generated instruction text for the LLM.
        * Combines name, description, and parameter schema into a formatted instruction.
@@ -3741,6 +3835,23 @@ var init_agent = __esm({
           maxIterations: this.maxIterations
         });
         while (currentIteration < this.maxIterations) {
+          if (this.signal?.aborted) {
+            this.logger.info("Agent loop terminated by abort signal", {
+              iteration: currentIteration,
+              reason: this.signal.reason
+            });
+            await this.safeObserve(async () => {
+              if (this.hooks.observers?.onAbort) {
+                const context = {
+                  iteration: currentIteration,
+                  reason: this.signal?.reason,
+                  logger: this.logger
+                };
+                await this.hooks.observers.onAbort(context);
+              }
+            });
+            return;
+          }
           this.logger.debug("Starting iteration", { iteration: currentIteration });
           try {
             if (this.compactionManager) {
@@ -3802,6 +3913,17 @@ var init_agent = __esm({
                 llmOptions = { ...llmOptions, ...action.modifiedOptions };
               }
             }
+            await this.safeObserve(async () => {
+              if (this.hooks.observers?.onLLMCallReady) {
+                const context = {
+                  iteration: currentIteration,
+                  maxIterations: this.maxIterations,
+                  options: llmOptions,
+                  logger: this.logger
+                };
+                await this.hooks.observers.onLLMCallReady(context);
+              }
+            });
             this.logger.info("Calling LLM", { model: this.model });
             this.logger.silly("LLM request details", {
               model: llmOptions.model,
@@ -6888,7 +7010,6 @@ var OPTION_FLAGS = {
   logFile: "--log-file <path>",
   logReset: "--log-reset",
   logLlmRequests: "--log-llm-requests [dir]",
-  logLlmResponses: "--log-llm-responses [dir]",
   noBuiltins: "--no-builtins",
   noBuiltinInteraction: "--no-builtin-interaction",
   quiet: "-q, --quiet",
@@ -6907,8 +7028,7 @@ var OPTION_DESCRIPTIONS = {
   logLevel: "Log level: silly, trace, debug, info, warn, error, fatal.",
   logFile: "Path to log file. When set, logs are written to file instead of stderr.",
   logReset: "Reset (truncate) the log file at session start instead of appending.",
-  logLlmRequests: "Save raw LLM requests as plain text. Optional dir, defaults to ~/.llmist/logs/requests/",
-  logLlmResponses: "Save raw LLM responses as plain text. Optional dir, defaults to ~/.llmist/logs/responses/",
+  logLlmRequests: "Save LLM requests/responses to session directories. Optional dir, defaults to ~/.llmist/logs/requests/",
   noBuiltins: "Disable built-in gadgets (AskUser, TellUser).",
   noBuiltinInteraction: "Disable interactive gadgets (AskUser) while keeping TellUser.",
   quiet: "Suppress all output except content (text and TellUser messages).",
@@ -6925,7 +7045,7 @@ var import_commander2 = require("commander");
 // package.json
 var package_default = {
   name: "llmist",
-  version: "1.7.0",
+  version: "2.1.0",
   description: "Universal TypeScript LLM client with streaming-first agent framework. Works with any model - no structured outputs or native tool calling required. Implements its own flexible grammar for function calling.",
   type: "module",
   main: "dist/index.cjs",
@@ -7098,6 +7218,14 @@ ${addedLines}`;
 }
 
 // src/cli/approval/context-providers.ts
+function formatGadgetSummary(gadgetName, params) {
+  const paramEntries = Object.entries(params);
+  if (paramEntries.length === 0) {
+    return `${gadgetName}()`;
+  }
+  const paramStr = paramEntries.map(([k, v]) => `${k}=${JSON.stringify(v)}`).join(", ");
+  return `${gadgetName}(${paramStr})`;
+}
 var WriteFileContextProvider = class {
   gadgetName = "WriteFile";
   async getContext(params) {
@@ -7106,14 +7234,14 @@ var WriteFileContextProvider = class {
     const resolvedPath = (0, import_node_path2.resolve)(process.cwd(), filePath);
     if (!(0, import_node_fs2.existsSync)(resolvedPath)) {
       return {
-        summary: `Create new file: ${filePath}`,
+        summary: formatGadgetSummary(this.gadgetName, params),
         details: formatNewFileDiff(filePath, newContent)
       };
     }
     const oldContent = (0, import_node_fs2.readFileSync)(resolvedPath, "utf-8");
     const diff = (0, import_diff.createPatch)(filePath, oldContent, newContent, "original", "modified");
     return {
-      summary: `Modify: ${filePath}`,
+      summary: formatGadgetSummary(this.gadgetName, params),
       details: diff
     };
   }
@@ -7127,37 +7255,27 @@ var EditFileContextProvider = class {
       const newContent = String(params.content);
       if (!(0, import_node_fs2.existsSync)(resolvedPath)) {
         return {
-          summary: `Create new file: ${filePath}`,
+          summary: formatGadgetSummary(this.gadgetName, params),
           details: formatNewFileDiff(filePath, newContent)
         };
       }
       const oldContent = (0, import_node_fs2.readFileSync)(resolvedPath, "utf-8");
       const diff = (0, import_diff.createPatch)(filePath, oldContent, newContent, "original", "modified");
       return {
-        summary: `Modify: ${filePath}`,
+        summary: formatGadgetSummary(this.gadgetName, params),
         details: diff
       };
     }
     if ("commands" in params) {
       const commands = String(params.commands);
       return {
-        summary: `Edit: ${filePath}`,
+        summary: formatGadgetSummary(this.gadgetName, params),
         details: `Commands:
 ${commands}`
       };
     }
     return {
-      summary: `Edit: ${filePath}`
-    };
-  }
-};
-var RunCommandContextProvider = class {
-  gadgetName = "RunCommand";
-  async getContext(params) {
-    const command = String(params.command ?? "");
-    const cwd = params.cwd ? ` (in ${params.cwd})` : "";
-    return {
-      summary: `Execute: ${command}${cwd}`
+      summary: formatGadgetSummary(this.gadgetName, params)
     };
   }
 };
@@ -7166,27 +7284,15 @@ var DefaultContextProvider = class {
     this.gadgetName = gadgetName;
   }
   async getContext(params) {
-    const paramEntries = Object.entries(params);
-    if (paramEntries.length === 0) {
-      return {
-        summary: `${this.gadgetName}()`
-      };
-    }
-    const formatValue = (value) => {
-      const MAX_LEN = 50;
-      const str = JSON.stringify(value);
-      return str.length > MAX_LEN ? `${str.slice(0, MAX_LEN - 3)}...` : str;
-    };
-    const paramStr = paramEntries.map(([k, v]) => `${k}=${formatValue(v)}`).join(", ");
     return {
-      summary: `${this.gadgetName}(${paramStr})`
+      summary: formatGadgetSummary(this.gadgetName, params)
     };
   }
 };
 var builtinContextProviders = [
   new WriteFileContextProvider(),
-  new EditFileContextProvider(),
-  new RunCommandContextProvider()
+  new EditFileContextProvider()
+  // Note: RunCommand uses DefaultContextProvider - no custom details needed
 ];
 
 // src/cli/approval/manager.ts
@@ -7197,11 +7303,13 @@ var ApprovalManager = class {
    * @param config - Approval configuration with per-gadget modes
    * @param env - CLI environment for I/O operations
    * @param progress - Optional progress indicator to pause during prompts
+   * @param keyboard - Optional keyboard coordinator to disable ESC listener during prompts
    */
-  constructor(config, env, progress) {
+  constructor(config, env, progress, keyboard) {
     this.config = config;
     this.env = env;
     this.progress = progress;
+    this.keyboard = keyboard;
     for (const provider of builtinContextProviders) {
       this.registerProvider(provider);
     }
@@ -7270,26 +7378,34 @@ var ApprovalManager = class {
     const provider = this.providers.get(gadgetName.toLowerCase()) ?? new DefaultContextProvider(gadgetName);
     const context = await provider.getContext(params);
     this.progress?.pause();
-    this.env.stderr.write(`
+    if (this.keyboard?.cleanupEsc) {
+      this.keyboard.cleanupEsc();
+      this.keyboard.cleanupEsc = null;
+    }
+    try {
+      this.env.stderr.write(`
 ${import_chalk2.default.yellow("\u{1F512} Approval required:")} ${context.summary}
 `);
-    if (context.details) {
-      this.env.stderr.write(`
+      if (context.details) {
+        this.env.stderr.write(`
 ${renderColoredDiff(context.details)}
 `);
-    }
-    const response = await this.prompt("   \u23CE approve, or type to reject: ");
-    const isApproved = response === "" || response.toLowerCase() === "y";
-    if (isApproved) {
-      this.env.stderr.write(`   ${import_chalk2.default.green("\u2713 Approved")}
+      }
+      const response = await this.prompt("   \u23CE approve, or type to reject: ");
+      const isApproved = response === "" || response.toLowerCase() === "y";
+      if (isApproved) {
+        this.env.stderr.write(`   ${import_chalk2.default.green("\u2713 Approved")}
 
 `);
-      return { approved: true };
-    }
-    this.env.stderr.write(`   ${import_chalk2.default.red("\u2717 Denied")}
+        return { approved: true };
+      }
+      this.env.stderr.write(`   ${import_chalk2.default.red("\u2717 Denied")}
 
 `);
-    return { approved: false, reason: response || "Rejected by user" };
+      return { approved: false, reason: response || "Rejected by user" };
+    } finally {
+      this.keyboard?.restore();
+    }
   }
   /**
    * Prompts for user input.
@@ -7819,6 +7935,22 @@ var runCommand = createGadget({
       params: { argv: ["gh", "pr", "review", "123", "--comment", "--body", "Review with `backticks` and 'quotes'"], timeout: 3e4 },
       output: "status=0\n\n(no output)",
       comment: "Complex arguments with special characters - no escaping needed"
+    },
+    {
+      params: {
+        argv: [
+          "gh",
+          "pr",
+          "review",
+          "123",
+          "--approve",
+          "--body",
+          "## Review Summary\n\n**Looks good!**\n\n- Clean code\n- Tests pass"
+        ],
+        timeout: 3e4
+      },
+      output: "status=0\n\nApproving pull request #123",
+      comment: "Multiline body: --body flag and content must be SEPARATE array elements"
     }
   ],
   execute: async ({ argv, cwd, timeout }) => {
@@ -7826,6 +7958,7 @@ var runCommand = createGadget({
     if (argv.length === 0) {
       return "status=1\n\nerror: argv array cannot be empty";
     }
+    let timeoutId;
     try {
       const proc = Bun.spawn(argv, {
         cwd: workingDir,
@@ -7833,12 +7966,15 @@ var runCommand = createGadget({
         stderr: "pipe"
       });
       const timeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => {
+        timeoutId = setTimeout(() => {
           proc.kill();
           reject(new Error(`Command timed out after ${timeout}ms`));
         }, timeout);
       });
       const exitCode = await Promise.race([proc.exited, timeoutPromise]);
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       const stdout = await new Response(proc.stdout).text();
       const stderr = await new Response(proc.stderr).text();
       const output = [stdout, stderr].filter(Boolean).join("\n").trim();
@@ -7846,6 +7982,9 @@ var runCommand = createGadget({
 
 ${output || "(no output)"}`;
     } catch (error) {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       const message = error instanceof Error ? error.message : String(error);
       return `status=1
 
@@ -8018,6 +8157,30 @@ async function writeLogFile(dir, filename, content) {
   await (0, import_promises2.mkdir)(dir, { recursive: true });
   await (0, import_promises2.writeFile)((0, import_node_path7.join)(dir, filename), content, "utf-8");
 }
+function formatSessionTimestamp(date = /* @__PURE__ */ new Date()) {
+  const pad = (n) => n.toString().padStart(2, "0");
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hours = pad(date.getHours());
+  const minutes = pad(date.getMinutes());
+  const seconds = pad(date.getSeconds());
+  return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}`;
+}
+async function createSessionDir(baseDir) {
+  const timestamp = formatSessionTimestamp();
+  const sessionDir = (0, import_node_path7.join)(baseDir, timestamp);
+  try {
+    await (0, import_promises2.mkdir)(sessionDir, { recursive: true });
+    return sessionDir;
+  } catch (error) {
+    console.warn(`[llmist] Failed to create log session directory: ${sessionDir}`, error);
+    return void 0;
+  }
+}
+function formatCallNumber(n) {
+  return n.toString().padStart(4, "0");
+}
 
 // src/cli/utils.ts
 var import_chalk4 = __toESM(require("chalk"), 1);
@@ -8181,7 +8344,7 @@ function formatBytes(bytes) {
   }
   return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 }
-function formatGadgetSummary(result) {
+function formatGadgetSummary2(result) {
   const gadgetLabel = import_chalk3.default.magenta.bold(result.gadgetName);
   const timeLabel = import_chalk3.default.dim(`${Math.round(result.executionTimeMs)}ms`);
   const paramsStr = formatParametersInline(result.parameters);
@@ -8266,12 +8429,21 @@ function isInteractive(stream2) {
 }
 var ESC_KEY = 27;
 var ESC_TIMEOUT_MS = 50;
-function createEscKeyListener(stdin, onEsc) {
+var CTRL_C = 3;
+function createEscKeyListener(stdin, onEsc, onCtrlC) {
   if (!stdin.isTTY || typeof stdin.setRawMode !== "function") {
     return null;
   }
   let escTimeout = null;
   const handleData = (data) => {
+    if (data[0] === CTRL_C && onCtrlC) {
+      if (escTimeout) {
+        clearTimeout(escTimeout);
+        escTimeout = null;
+      }
+      onCtrlC();
+      return;
+    }
     if (data[0] === ESC_KEY) {
       if (data.length === 1) {
         escTimeout = setTimeout(() => {
@@ -8719,7 +8891,7 @@ function addCompleteOptions(cmd, defaults) {
     OPTION_DESCRIPTIONS.maxTokens,
     createNumericParser({ label: "Max tokens", integer: true, min: 1 }),
     defaults?.["max-tokens"]
-  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet).option(OPTION_FLAGS.logLlmRequests, OPTION_DESCRIPTIONS.logLlmRequests, defaults?.["log-llm-requests"]).option(OPTION_FLAGS.logLlmResponses, OPTION_DESCRIPTIONS.logLlmResponses, defaults?.["log-llm-responses"]);
+  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet).option(OPTION_FLAGS.logLlmRequests, OPTION_DESCRIPTIONS.logLlmRequests, defaults?.["log-llm-requests"]);
 }
 function addAgentOptions(cmd, defaults) {
   const gadgetAccumulator = (value, previous = []) => [
@@ -8743,7 +8915,7 @@ function addAgentOptions(cmd, defaults) {
     OPTION_FLAGS.noBuiltinInteraction,
     OPTION_DESCRIPTIONS.noBuiltinInteraction,
     defaults?.["builtin-interaction"] !== false
-  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet).option(OPTION_FLAGS.logLlmRequests, OPTION_DESCRIPTIONS.logLlmRequests, defaults?.["log-llm-requests"]).option(OPTION_FLAGS.logLlmResponses, OPTION_DESCRIPTIONS.logLlmResponses, defaults?.["log-llm-responses"]).option(OPTION_FLAGS.docker, OPTION_DESCRIPTIONS.docker).option(OPTION_FLAGS.dockerRo, OPTION_DESCRIPTIONS.dockerRo).option(OPTION_FLAGS.noDocker, OPTION_DESCRIPTIONS.noDocker).option(OPTION_FLAGS.dockerDev, OPTION_DESCRIPTIONS.dockerDev);
+  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet).option(OPTION_FLAGS.logLlmRequests, OPTION_DESCRIPTIONS.logLlmRequests, defaults?.["log-llm-requests"]).option(OPTION_FLAGS.docker, OPTION_DESCRIPTIONS.docker).option(OPTION_FLAGS.dockerRo, OPTION_DESCRIPTIONS.dockerRo).option(OPTION_FLAGS.noDocker, OPTION_DESCRIPTIONS.noDocker).option(OPTION_FLAGS.dockerDev, OPTION_DESCRIPTIONS.dockerDev);
 }
 function configToCompleteOptions(config) {
   const result = {};
@@ -8753,7 +8925,6 @@ function configToCompleteOptions(config) {
   if (config["max-tokens"] !== void 0) result.maxTokens = config["max-tokens"];
   if (config.quiet !== void 0) result.quiet = config.quiet;
   if (config["log-llm-requests"] !== void 0) result.logLlmRequests = config["log-llm-requests"];
-  if (config["log-llm-responses"] !== void 0) result.logLlmResponses = config["log-llm-responses"];
   return result;
 }
 function configToAgentOptions(config) {
@@ -8777,7 +8948,6 @@ function configToAgentOptions(config) {
     result.gadgetApproval = config["gadget-approval"];
   if (config.quiet !== void 0) result.quiet = config.quiet;
   if (config["log-llm-requests"] !== void 0) result.logLlmRequests = config["log-llm-requests"];
-  if (config["log-llm-responses"] !== void 0) result.logLlmResponses = config["log-llm-responses"];
   if (config.docker !== void 0) result.docker = config.docker;
   if (config["docker-cwd-permission"] !== void 0)
     result.dockerCwdPermission = config["docker-cwd-permission"];
@@ -8795,7 +8965,8 @@ var DOCKER_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "env-vars",
   "image-name",
   "dev-mode",
-  "dev-source"
+  "dev-source",
+  "docker-args"
 ]);
 var DEFAULT_IMAGE_NAME = "llmist-sandbox";
 var DEFAULT_CWD_PERMISSION = "rw";
@@ -8910,7 +9081,6 @@ var COMPLETE_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "log-file",
   "log-reset",
   "log-llm-requests",
-  "log-llm-responses",
   "type",
   // Allowed for inheritance compatibility, ignored for built-in commands
   "docker",
@@ -8943,7 +9113,6 @@ var AGENT_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "log-file",
   "log-reset",
   "log-llm-requests",
-  "log-llm-responses",
   "type",
   // Allowed for inheritance compatibility, ignored for built-in commands
   "docker",
@@ -9131,13 +9300,6 @@ function validateCompleteConfig(raw, section) {
       section
     );
   }
-  if ("log-llm-responses" in rawObj) {
-    result["log-llm-responses"] = validateStringOrBoolean(
-      rawObj["log-llm-responses"],
-      "log-llm-responses",
-      section
-    );
-  }
   return result;
 }
 function validateAgentConfig(raw, section) {
@@ -9216,13 +9378,6 @@ function validateAgentConfig(raw, section) {
       section
     );
   }
-  if ("log-llm-responses" in rawObj) {
-    result["log-llm-responses"] = validateStringOrBoolean(
-      rawObj["log-llm-responses"],
-      "log-llm-responses",
-      section
-    );
-  }
   return result;
 }
 function validateStringOrBoolean(value, field, section) {
@@ -9664,6 +9819,9 @@ function validateDockerConfig(raw, section) {
   if ("dev-source" in rawObj) {
     result["dev-source"] = validateString2(rawObj["dev-source"], "dev-source", section);
   }
+  if ("docker-args" in rawObj) {
+    result["docker-args"] = validateStringArray2(rawObj["docker-args"], "docker-args", section);
+  }
   return result;
 }
 
@@ -9675,6 +9833,8 @@ FROM oven/bun:1-debian
 
 # Install essential tools
 RUN apt-get update && apt-get install -y --no-install-recommends \\
+    # ed for EditFile gadget (line-oriented editor)
+    ed \\
     # ripgrep for fast file searching
     ripgrep \\
     # git for version control operations
@@ -9707,6 +9867,7 @@ FROM oven/bun:1-debian
 
 # Install essential tools (same as production)
 RUN apt-get update && apt-get install -y --no-install-recommends \\
+    ed \\
     ripgrep \\
     git \\
     curl \\
@@ -9941,6 +10102,9 @@ function buildDockerRunArgs(ctx, imageName, devMode) {
       }
     }
   }
+  if (ctx.config["docker-args"]) {
+    args.push(...ctx.config["docker-args"]);
+  }
   args.push(imageName);
   args.push(...ctx.forwardArgs);
   return args;
@@ -10107,6 +10271,8 @@ async function executeAgent(promptArg, options, env) {
       env.stderr.write(import_chalk5.default.yellow(`
 [Cancelled] ${progress.formatStats()}
 `));
+    } else {
+      handleQuit();
     }
   };
   const keyboard = {
@@ -10114,7 +10280,7 @@ async function executeAgent(promptArg, options, env) {
     cleanupSigint: null,
     restore: () => {
       if (stdinIsInteractive && stdinStream.isTTY && !wasCancelled) {
-        keyboard.cleanupEsc = createEscKeyListener(stdinStream, handleCancel);
+        keyboard.cleanupEsc = createEscKeyListener(stdinStream, handleCancel, handleCancel);
       }
     }
   };
@@ -10139,7 +10305,7 @@ async function executeAgent(promptArg, options, env) {
     process.exit(130);
   };
   if (stdinIsInteractive && stdinStream.isTTY) {
-    keyboard.cleanupEsc = createEscKeyListener(stdinStream, handleCancel);
+    keyboard.cleanupEsc = createEscKeyListener(stdinStream, handleCancel, handleCancel);
   }
   keyboard.cleanupSigint = createSigintListener(
     handleCancel,
@@ -10165,11 +10331,11 @@ async function executeAgent(promptArg, options, env) {
     gadgetApprovals,
     defaultMode: "allowed"
   };
-  const approvalManager = new ApprovalManager(approvalConfig, env, progress);
+  const approvalManager = new ApprovalManager(approvalConfig, env, progress, keyboard);
   let usage;
   let iterations = 0;
-  const llmRequestsDir = resolveLogDir(options.logLlmRequests, "requests");
-  const llmResponsesDir = resolveLogDir(options.logLlmResponses, "responses");
+  const llmLogsBaseDir = resolveLogDir(options.logLlmRequests, "requests");
+  let llmSessionDir;
   let llmCallCounter = 0;
   const countMessagesTokens = async (model, messages) => {
     try {
@@ -10201,10 +10367,19 @@ async function executeAgent(promptArg, options, env) {
         );
         progress.startCall(context.options.model, inputTokens);
         progress.setInputTokens(inputTokens, false);
-        if (llmRequestsDir) {
-          const filename = `${Date.now()}_call_${llmCallCounter}.request.txt`;
-          const content = formatLlmRequest(context.options.messages);
-          await writeLogFile(llmRequestsDir, filename, content);
+      },
+      // onLLMCallReady: Log the exact request being sent to the LLM
+      // This fires AFTER controller modifications (e.g., trailing messages)
+      onLLMCallReady: async (context) => {
+        if (llmLogsBaseDir) {
+          if (!llmSessionDir) {
+            llmSessionDir = await createSessionDir(llmLogsBaseDir);
+          }
+          if (llmSessionDir) {
+            const filename = `${formatCallNumber(llmCallCounter)}.request`;
+            const content = formatLlmRequest(context.options.messages);
+            await writeLogFile(llmSessionDir, filename, content);
+          }
         }
       },
       // onStreamChunk: Real-time updates as LLM generates tokens
@@ -10269,9 +10444,9 @@ async function executeAgent(promptArg, options, env) {
 `);
           }
         }
-        if (llmResponsesDir) {
-          const filename = `${Date.now()}_call_${llmCallCounter}.response.txt`;
-          await writeLogFile(llmResponsesDir, filename, context.rawResponse);
+        if (llmSessionDir) {
+          const filename = `${formatCallNumber(llmCallCounter)}.response`;
+          await writeLogFile(llmSessionDir, filename, context.rawResponse);
         }
       }
     },
@@ -10368,6 +10543,13 @@ Denied: ${result.reason ?? "by user"}`
     parameterMapping: (text) => ({ message: text, done: false, type: "info" }),
     resultMapping: (text) => `\u2139\uFE0F  ${text}`
   });
+  builder.withTrailingMessage(
+    (ctx) => [
+      `[Iteration ${ctx.iteration + 1}/${ctx.maxIterations}]`,
+      "Think carefully: what gadget invocations can you make in parallel right now?",
+      "Maximize efficiency by batching independent operations in a single response."
+    ].join(" ")
+  );
   const agent = builder.ask(prompt);
   let textBuffer = "";
   const flushTextBuffer = () => {
@@ -10393,7 +10575,7 @@ Denied: ${result.reason ?? "by user"}`
           }
         } else {
           const tokenCount = await countGadgetOutputTokens(event.result.result);
-          env.stderr.write(`${formatGadgetSummary({ ...event.result, tokenCount })}
+          env.stderr.write(`${formatGadgetSummary2({ ...event.result, tokenCount })}
 `);
         }
       }
@@ -10405,7 +10587,10 @@ Denied: ${result.reason ?? "by user"}`
   } finally {
     isStreaming = false;
     keyboard.cleanupEsc?.();
-    keyboard.cleanupSigint?.();
+    if (keyboard.cleanupSigint) {
+      keyboard.cleanupSigint();
+      process.once("SIGINT", () => process.exit(130));
+    }
   }
   flushTextBuffer();
   progress.complete();
@@ -10453,13 +10638,15 @@ async function executeComplete(promptArg, options, env) {
   }
   builder.addUser(prompt);
   const messages = builder.build();
-  const llmRequestsDir = resolveLogDir(options.logLlmRequests, "requests");
-  const llmResponsesDir = resolveLogDir(options.logLlmResponses, "responses");
-  const timestamp = Date.now();
-  if (llmRequestsDir) {
-    const filename = `${timestamp}_complete.request.txt`;
-    const content = formatLlmRequest(messages);
-    await writeLogFile(llmRequestsDir, filename, content);
+  const llmLogsBaseDir = resolveLogDir(options.logLlmRequests, "requests");
+  let llmSessionDir;
+  if (llmLogsBaseDir) {
+    llmSessionDir = await createSessionDir(llmLogsBaseDir);
+    if (llmSessionDir) {
+      const filename = "0001.request";
+      const content = formatLlmRequest(messages);
+      await writeLogFile(llmSessionDir, filename, content);
+    }
   }
   const stream2 = client.stream({
     model,
@@ -10498,9 +10685,9 @@ async function executeComplete(promptArg, options, env) {
   progress.endCall(usage);
   progress.complete();
   printer.ensureNewline();
-  if (llmResponsesDir) {
-    const filename = `${timestamp}_complete.response.txt`;
-    await writeLogFile(llmResponsesDir, filename, accumulatedResponse);
+  if (llmSessionDir) {
+    const filename = "0001.response";
+    await writeLogFile(llmSessionDir, filename, accumulatedResponse);
   }
   if (stderrTTY && !options.quiet) {
     const summary = renderSummary({ finishReason, usage, cost: progress.getTotalCost() });