pybao-cli 1.4.81 → 1.4.82

package/dist/{cli-VNT2RTPP.js → cli-ECB4WYUZ.js}

@@ -9,13 +9,13 @@ import {
   getAllTools,
   toTaskDetail,
   toTaskListItem
-} from "./chunk-PRRYL2E2.js";
+} from "./chunk-2S2V2ZI7.js";
 import {
   PybAgentStructuredStdio
 } from "./chunk-5AGDLQAW.js";
 import {
   assertMinVersion
-} from "./chunk-AB3F7T5N.js";
+} from "./chunk-TWWQYBVK.js";
 import {
   getToolDescription
 } from "./chunk-XI4LTVYT.js";
@@ -39,18 +39,23 @@ import {
   review_default,
   useExitOnCtrlCD,
   useTerminalSize
-} from "./chunk-TVUG5GLX.js";
-import "./chunk-7ANXEZRS.js";
-import "./chunk-FDGIVQNE.js";
-import "./chunk-VW3NZKCP.js";
-import "./chunk-4NNDWUSZ.js";
+} from "./chunk-XOOHCC63.js";
+import "./chunk-GZT2DWED.js";
+import "./chunk-ZW25QNXS.js";
+import "./chunk-LM665HND.js";
+import {
+  beginReplSessionScope
+} from "./chunk-F4AXICO7.js";
+import "./chunk-AYVB6VUF.js";
+import "./chunk-UBX7JQR2.js";
 import "./chunk-5P7HBXTD.js";
-import "./chunk-KH3U5BR5.js";
+import "./chunk-IIVG2SHE.js";
 import {
   clearOutputStyleCache
-} from "./chunk-4VUECEM6.js";
-import "./chunk-MKNRYFQR.js";
-import "./chunk-BJMVIICS.js";
+} from "./chunk-UXVOYFKL.js";
+import "./chunk-JT3RE7UH.js";
+import "./chunk-XKYHFZEC.js";
+import "./chunk-HJWUPFGF.js";
 import {
   addMcpServer,
   ensureConfigScope,
@@ -65,43 +70,43 @@ import {
   parseEnvVars,
   parseMcpHeaders,
   removeMcpServer
-} from "./chunk-HIZXCXUG.js";
-import "./chunk-HNHWG52B.js";
-import "./chunk-BX6HNPWQ.js";
+} from "./chunk-QUWUFGZF.js";
+import "./chunk-GSAG6WNQ.js";
+import "./chunk-SZEYDC6A.js";
 import "./chunk-UNNVICVU.js";
-import "./chunk-2NFKKANF.js";
+import "./chunk-PXPTGNYH.js";
 import {
   clearAgentCache,
   setFlagAgentsFromCliJson
-} from "./chunk-CLGB56HY.js";
+} from "./chunk-GUTLXPN6.js";
 import {
   setEnabledSettingSourcesFromCli
 } from "./chunk-A3BVXXA3.js";
-import "./chunk-H44O47XJ.js";
+import "./chunk-AUGXOUTX.js";
 import "./chunk-3DFBSQIT.js";
 import "./chunk-B6IMQJZM.js";
 import "./chunk-OUXHGDLH.js";
-import "./chunk-EYY3QDKX.js";
+import "./chunk-DZTZPEPA.js";
 import "./chunk-QWIBSCDN.js";
-import "./chunk-GS4PRJHV.js";
-import "./chunk-5KAIY3II.js";
-import "./chunk-JVF6KNE3.js";
+import "./chunk-JQVZNIKI.js";
+import "./chunk-2YM35XWE.js";
+import "./chunk-2AG4BTRV.js";
 import "./chunk-UZ34JEUK.js";
-import "./chunk-4SWM6FWR.js";
+import "./chunk-KNWW4HGV.js";
 import "./chunk-BJSWTHRM.js";
 import {
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-Z73SPR4B.js";
+} from "./chunk-NTL5PKCX.js";
 import {
   getContext,
   removeContext,
   setContext
-} from "./chunk-B3NR3UMC.js";
-import "./chunk-37ZXN5M4.js";
+} from "./chunk-WVYIFMLG.js";
+import "./chunk-VMWEFYQB.js";
 import {
   getTheme
-} from "./chunk-GMKASRN7.js";
+} from "./chunk-Y5JPSTQ4.js";
 import {
   checkHasTrustDialogAccepted,
   deleteConfigForCLI,
@@ -115,14 +120,14 @@ import {
   saveGlobalConfig,
   setConfigForCLI,
   validateAndRepairAllGPT5Profiles
-} from "./chunk-ZE75JZFY.js";
+} from "./chunk-2WIUQUTU.js";
 import {
   ConfigParseError
 } from "./chunk-RQVLBMP7.js";
 import {
   debug,
   initDebugLogger
-} from "./chunk-6XINCIUI.js";
+} from "./chunk-DYJD66YF.js";
 import {
   BunShell,
   CACHE_PATHS,
@@ -138,10 +143,10 @@ import {
   parseLogFilename,
   setCwd,
   setOriginalCwd
-} from "./chunk-UUS77RPP.js";
+} from "./chunk-U265OPSO.js";
 import {
   MACRO
-} from "./chunk-CCF52HVZ.js";
+} from "./chunk-WBBMOYXK.js";
 import "./chunk-I3J4JYES.js";
 
 // src/entrypoints/cli/runCli.tsx
@@ -301,8 +306,14 @@ function createPrintModeControlRequestHandler(args) {
 
 // src/entrypoints/cli/stdio/streamJsonSession.ts
 async function runPrintModeStreamJsonSession(args) {
-  const { runPybAgentStreamJsonSession } = await import("./pybAgentStreamJsonSession-5IBYEXS5.js");
-  await runPybAgentStreamJsonSession(args);
+  const { beginReplSessionScope: beginReplSessionScope2 } = await import("./replSessionBridge-EBXNFUAD.js");
+  const { runPybAgentStreamJsonSession } = await import("./pybAgentStreamJsonSession-UP4WOINX.js");
+  const restoreSessionScope = beginReplSessionScope2(args.sessionId);
+  try {
+    await runPybAgentStreamJsonSession(args);
+  } finally {
+    restoreSessionScope();
+  }
 }
 
 // src/entrypoints/cli/stdio/structuredStdio.ts
@@ -455,338 +466,347 @@ async function runPrintMode({
 `);
     process.exit(0);
   }
-  const { createUserMessage } = await import("./messages-ICKAWGUW.js");
-  const { getSystemPrompt } = await import("./prompts-P4JU57HZ.js");
-  const { getContext: getContext2 } = await import("./context-QHTEENJ6.js");
+  const { createUserMessage } = await import("./messages-6BHCXDWR.js");
+  const { ConversationTracker } = await import("./conversationTracker-SC6NCQHL.js");
+  const { getSystemPrompt } = await import("./prompts-5576MRUX.js");
+  const { getContext: getContext2 } = await import("./context-ZZI53BPM.js");
   const { getTotalCost } = await import("./costTracker-DJVFVAVZ.js");
-  const { query } = await import("./query-NHQFKSCC.js");
+  const { query } = await import("./query-LMPE4HBF.js");
   const { getPybAgentSessionId } = await import("./pybAgentSessionId-EPCAMQ25.js");
   const { pybMessageToSdkMessage, makeSdkInitMessage, makeSdkResultMessage } = await import("./pybAgentStreamJson-EQPO52B6.js");
   const { PybAgentStructuredStdio: PybAgentStructuredStdio2 } = await import("./pybAgentStructuredStdio-ROCSOGNT.js");
   const {
     loadToolPermissionContextFromDisk,
     persistToolPermissionUpdateToDisk
-  } = await import("./toolPermissionSettings-TALALPH3.js");
+  } = await import("./toolPermissionSettings-PDGMFGN2.js");
   const { applyToolPermissionContextUpdates } = await import("./toolPermissionContext-BSFV23IL.js");
   const sessionIdForSdk = getPybAgentSessionId();
+  const restoreSessionScope = beginReplSessionScope(sessionIdForSdk);
+  const conversationTracker = new ConversationTracker();
   const startedAt = Date.now();
   const sdkMessages = [];
-  const baseSystemPrompt = typeof systemPromptOverride === "string" && systemPromptOverride.trim() ? [systemPromptOverride] : await getSystemPrompt({ disableSlashCommands });
-  const systemPrompt = typeof appendSystemPrompt === "string" && appendSystemPrompt.trim() ? [...baseSystemPrompt, appendSystemPrompt] : baseSystemPrompt;
-  const normalizedJsonSchema = typeof jsonSchema === "string" ? jsonSchema.trim() : "";
-  const parsedJsonSchema = (() => {
-    if (!normalizedJsonSchema) return null;
-    try {
-      const parsed = JSON.parse(normalizedJsonSchema);
-      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-        throw new Error("Schema must be a JSON object");
+  try {
+    const baseSystemPrompt = typeof systemPromptOverride === "string" && systemPromptOverride.trim() ? [systemPromptOverride] : await getSystemPrompt({ disableSlashCommands });
+    const systemPrompt = typeof appendSystemPrompt === "string" && appendSystemPrompt.trim() ? [...baseSystemPrompt, appendSystemPrompt] : baseSystemPrompt;
+    const normalizedJsonSchema = typeof jsonSchema === "string" ? jsonSchema.trim() : "";
+    const parsedJsonSchema = (() => {
+      if (!normalizedJsonSchema) return null;
+      try {
+        const parsed = JSON.parse(normalizedJsonSchema);
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+          throw new Error("Schema must be a JSON object");
+        }
+        return parsed;
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        console.error(`Error: Invalid --json-schema: ${msg}`);
+        process.exit(1);
       }
-      return parsed;
-    } catch (error) {
-      const msg = error instanceof Error ? error.message : String(error);
-      console.error(`Error: Invalid --json-schema: ${msg}`);
-      process.exit(1);
-    }
-  })();
-  if (parsedJsonSchema) {
-    systemPrompt.push(
-      [
-        "You MUST respond with ONLY valid JSON.",
-        "The JSON MUST validate against the following JSON Schema.",
-        "Do not wrap the JSON in markdown code fences and do not add extra commentary.",
-        "",
-        `<json_schema>${JSON.stringify(parsedJsonSchema)}</json_schema>`
-      ].join("\n")
-    );
-  }
-  const ctx = await getContext2();
-  const isBypassAvailable = !safe || Boolean(allowDangerouslySkipPermissions) || Boolean(dangerouslySkipPermissions);
-  let toolPermissionContext = loadToolPermissionContextFromDisk({
-    projectDir: cwd2,
-    includePybProjectConfig: true,
-    isBypassPermissionsModeAvailable: isBypassAvailable
-  });
-  const cliRuleList = (value) => {
-    if (!value) return [];
-    const raw = Array.isArray(value) ? value : [value];
-    return raw.flatMap((v) => String(v ?? "").split(",")).map((v) => v.trim()).filter(Boolean);
-  };
-  const allowedRules = cliRuleList(allowedTools);
-  const deniedRules = cliRuleList(disallowedTools);
-  const additionalDirs = cliRuleList(addDir);
-  const updates = [];
-  if (allowedRules.length > 0) {
-    updates.push({
-      type: "addRules",
-      destination: "cliArg",
-      behavior: "allow",
-      rules: allowedRules
-    });
-  }
-  if (deniedRules.length > 0) {
-    updates.push({
-      type: "addRules",
-      destination: "cliArg",
-      behavior: "deny",
-      rules: deniedRules
-    });
-  }
-  if (additionalDirs.length > 0) {
-    updates.push({
-      type: "addDirectories",
-      destination: "cliArg",
-      directories: additionalDirs
-    });
-  }
-  const normalizedPermissionMode = typeof permissionMode === "string" ? permissionMode.trim() : "";
-  if (normalizedPermissionMode) {
-    const normalized = normalizedPermissionMode === "delegate" ? "default" : normalizedPermissionMode;
-    const allowed = /* @__PURE__ */ new Set([
-      "acceptEdits",
-      "bypassPermissions",
-      "default",
-      "dontAsk",
-      "plan"
-    ]);
-    if (!allowed.has(normalized)) {
-      console.error(
-        `Error: Invalid --permission-mode "${normalizedPermissionMode}". Expected one of: acceptEdits, bypassPermissions, default, delegate, dontAsk, plan`
+    })();
+    if (parsedJsonSchema) {
+      systemPrompt.push(
+        [
+          "You MUST respond with ONLY valid JSON.",
+          "The JSON MUST validate against the following JSON Schema.",
+          "Do not wrap the JSON in markdown code fences and do not add extra commentary.",
+          "",
+          `<json_schema>${JSON.stringify(parsedJsonSchema)}</json_schema>`
+        ].join("\n")
       );
-      process.exit(1);
     }
-    updates.push({
-      type: "setMode",
-      destination: "cliArg",
-      mode: normalized
-    });
-  }
-  if (dangerouslySkipPermissions) {
-    updates.push({
-      type: "setMode",
-      destination: "cliArg",
-      mode: "bypassPermissions"
+    const ctx = await getContext2();
+    const isBypassAvailable = !safe || Boolean(allowDangerouslySkipPermissions) || Boolean(dangerouslySkipPermissions);
+    let toolPermissionContext = loadToolPermissionContextFromDisk({
+      projectDir: cwd2,
+      includePybProjectConfig: true,
+      isBypassPermissionsModeAvailable: isBypassAvailable
     });
-  }
-  if (updates.length > 0) {
-    toolPermissionContext = applyToolPermissionContextUpdates(
-      toolPermissionContext,
-      updates
-    );
-  }
-  const printOptions = {
-    commands,
-    tools: toolsForPrint,
-    verbose: true,
-    safeMode: safe,
-    forkNumber: 0,
-    messageLogName: "unused",
-    maxThinkingTokens: 0,
-    persistSession: sessionPersistence !== false,
-    toolPermissionContext,
-    mcpClients,
-    shouldAvoidPermissionPrompts: normalizedInputFormat !== "stream-json",
-    model: typeof model === "string" && model.trim() ? model.trim() : void 0
-  };
-  const availableTools = toolsForPrint.map((t) => t.name);
-  const slashCommands = disableSlashCommands === true ? void 0 : commands.filter((c) => !c.isHidden).map((c) => `/${c.userFacingName()}`);
-  const initMsg = makeSdkInitMessage({
-    sessionId: sessionIdForSdk,
-    cwd: cwd2,
-    tools: availableTools,
-    slashCommands
-  });
-  const writeSdkLine = (obj) => {
-    process.stdout.write(JSON.stringify(obj) + "\n");
-  };
-  if (normalizedOutputFormat === "stream-json") {
-    writeSdkLine(initMsg);
-  } else {
-    sdkMessages.push(initMsg);
-  }
-  let activeTurnAbortController = null;
-  const structured = createPrintModeStructuredStdio({
-    enabled: normalizedInputFormat === "stream-json",
-    stdin: process.stdin,
-    stdout: process.stdout,
-    onInterrupt: () => {
-      activeTurnAbortController?.abort();
-    },
-    onControlRequest: createPrintModeControlRequestHandler({
-      printOptions,
-      mcpClients
-    })
-  });
-  if (structured) structured.start();
-  const permissionTimeoutMs = (() => {
-    const raw = process.env.PYB_STDIO_PERMISSION_TIMEOUT_MS;
-    const n = raw ? Number(raw) : NaN;
-    return Number.isFinite(n) && n > 0 ? n : 3e4;
-  })();
-  const canUseTool = createStdioCanUseTool({
-    normalizedPermissionPromptTool,
-    structured,
-    permissionTimeoutMs,
-    cwd: cwd2,
-    printOptions,
-    hasPermissionsToUseTool,
-    applyToolPermissionContextUpdates,
-    persistToolPermissionUpdateToDisk
-  });
-  if (normalizedInputFormat === "stream-json") {
-    if (!structured) {
-      console.error("Error: Structured stdin is not available");
-      process.exit(1);
+    const cliRuleList = (value) => {
+      if (!value) return [];
+      const raw = Array.isArray(value) ? value : [value];
+      return raw.flatMap((v) => String(v ?? "").split(",")).map((v) => v.trim()).filter(Boolean);
+    };
+    const allowedRules = cliRuleList(allowedTools);
+    const deniedRules = cliRuleList(disallowedTools);
+    const additionalDirs = cliRuleList(addDir);
+    const updates = [];
+    if (allowedRules.length > 0) {
+      updates.push({
+        type: "addRules",
+        destination: "cliArg",
+        behavior: "allow",
+        rules: allowedRules
+      });
     }
-    await runPrintModeStreamJsonSession({
-      structured,
-      query,
-      writeSdkLine,
-      sessionId: sessionIdForSdk,
-      systemPrompt,
-      jsonSchema: parsedJsonSchema,
-      context: ctx,
-      canUseTool,
-      toolUseContextBase: {
-        options: printOptions,
-        messageId: void 0,
-        readFileTimestamps: {},
-        setToolJSX: () => {
-        }
-      },
-      replayUserMessages: Boolean(replayUserMessages),
-      getTotalCostUsd: () => getTotalCost(),
-      onActiveTurnAbortControllerChanged: (controller) => {
-        activeTurnAbortController = controller;
-      },
-      initialMessages
-    });
-    process.exit(0);
-  }
-  const abortController = new AbortController();
-  const userMsg = await (async () => {
-    if (normalizedInputFormat !== "stream-json") {
-      addToHistory(inputPrompt);
-      return createUserMessage(inputPrompt);
+    if (deniedRules.length > 0) {
+      updates.push({
+        type: "addRules",
+        destination: "cliArg",
+        behavior: "deny",
+        rules: deniedRules
+      });
     }
-    if (!structured) {
-      console.error("Error: Structured stdin is not available");
-      process.exit(1);
+    if (additionalDirs.length > 0) {
+      updates.push({
+        type: "addDirectories",
+        destination: "cliArg",
+        directories: additionalDirs
+      });
     }
-    const sdkUser2 = await structured.nextUserMessage({
-      signal: abortController.signal,
-      timeoutMs: 3e4
-    });
-    if (!sdkUser2 || typeof sdkUser2 !== "object") {
-      console.error("Error: Invalid stream-json input (missing user message)");
-      process.exit(1);
+    const normalizedPermissionMode = typeof permissionMode === "string" ? permissionMode.trim() : "";
+    if (normalizedPermissionMode) {
+      const normalized = normalizedPermissionMode === "delegate" ? "default" : normalizedPermissionMode;
+      const allowed = /* @__PURE__ */ new Set([
+        "acceptEdits",
+        "bypassPermissions",
+        "default",
+        "dontAsk",
+        "plan"
+      ]);
+      if (!allowed.has(normalized)) {
+        console.error(
+          `Error: Invalid --permission-mode "${normalizedPermissionMode}". Expected one of: acceptEdits, bypassPermissions, default, delegate, dontAsk, plan`
+        );
+        process.exit(1);
+      }
+      updates.push({
+        type: "setMode",
+        destination: "cliArg",
+        mode: normalized
+      });
     }
-    const sdkMessage = sdkUser2.message;
-    const sdkContent = sdkMessage?.content;
-    if (typeof sdkContent !== "string" && !Array.isArray(sdkContent)) {
-      console.error("Error: Invalid stream-json user message content");
-      process.exit(1);
+    if (dangerouslySkipPermissions) {
+      updates.push({
+        type: "setMode",
+        destination: "cliArg",
+        mode: "bypassPermissions"
+      });
     }
-    const m = createUserMessage(sdkContent);
-    if (typeof sdkUser2.uuid === "string" && sdkUser2.uuid) {
-      ;
-      m.uuid = String(sdkUser2.uuid);
+    if (updates.length > 0) {
+      toolPermissionContext = applyToolPermissionContextUpdates(
+        toolPermissionContext,
+        updates
+      );
     }
-    return m;
-  })();
-  const baseMessages = [...initialMessages ?? [], userMsg];
-  const sdkUser = pybMessageToSdkMessage(userMsg, sessionIdForSdk);
-  if (sdkUser) {
+    const printOptions = {
+      commands,
+      tools: toolsForPrint,
+      verbose: true,
+      safeMode: safe,
+      forkNumber: 0,
+      messageLogName: "unused",
+      maxThinkingTokens: 0,
+      persistSession: sessionPersistence !== false,
+      toolPermissionContext,
+      mcpClients,
+      shouldAvoidPermissionPrompts: normalizedInputFormat !== "stream-json",
+      model: typeof model === "string" && model.trim() ? model.trim() : void 0
+    };
+    const availableTools = toolsForPrint.map((t) => t.name);
+    const slashCommands = disableSlashCommands === true ? void 0 : commands.filter((c) => !c.isHidden).map((c) => `/${c.userFacingName()}`);
+    const initMsg = makeSdkInitMessage({
+      sessionId: sessionIdForSdk,
+      cwd: cwd2,
+      tools: availableTools,
+      slashCommands
+    });
+    const writeSdkLine = (obj) => {
+      process.stdout.write(JSON.stringify(obj) + "\n");
+    };
     if (normalizedOutputFormat === "stream-json") {
-      writeSdkLine(sdkUser);
+      writeSdkLine(initMsg);
     } else {
-      sdkMessages.push(sdkUser);
+      sdkMessages.push(initMsg);
     }
-  }
-  let lastAssistant = null;
-  let queryError = null;
-  try {
-    for await (const m of query(baseMessages, systemPrompt, ctx, canUseTool, {
-      options: printOptions,
-      abortController,
-      messageId: void 0,
-      readFileTimestamps: {},
-      setToolJSX: () => {
+    let activeTurnAbortController = null;
+    const structured = createPrintModeStructuredStdio({
+      enabled: normalizedInputFormat === "stream-json",
+      stdin: process.stdin,
+      stdout: process.stdout,
+      onInterrupt: () => {
+        activeTurnAbortController?.abort();
+      },
+      onControlRequest: createPrintModeControlRequestHandler({
+        printOptions,
+        mcpClients
+      })
+    });
+    if (structured) structured.start();
+    const permissionTimeoutMs = (() => {
+      const raw = process.env.PYB_STDIO_PERMISSION_TIMEOUT_MS;
+      const n = raw ? Number(raw) : NaN;
+      return Number.isFinite(n) && n > 0 ? n : 3e4;
+    })();
+    const canUseTool = createStdioCanUseTool({
+      normalizedPermissionPromptTool,
+      structured,
+      permissionTimeoutMs,
+      cwd: cwd2,
+      printOptions,
+      hasPermissionsToUseTool,
+      applyToolPermissionContextUpdates,
+      persistToolPermissionUpdateToDisk
+    });
+    if (normalizedInputFormat === "stream-json") {
+      if (!structured) {
+        console.error("Error: Structured stdin is not available");
+        process.exit(1);
+      }
+      await runPrintModeStreamJsonSession({
+        structured,
+        query,
+        writeSdkLine,
+        sessionId: sessionIdForSdk,
+        systemPrompt,
+        jsonSchema: parsedJsonSchema,
+        context: ctx,
+        canUseTool,
+        toolUseContextBase: {
+          options: printOptions,
+          messageId: void 0,
+          readFileTimestamps: {},
+          setToolJSX: () => {
+          },
+          conversationTracker
+        },
+        replayUserMessages: Boolean(replayUserMessages),
+        getTotalCostUsd: () => getTotalCost(),
+        onActiveTurnAbortControllerChanged: (controller) => {
+          activeTurnAbortController = controller;
+        },
+        initialMessages
+      });
+      process.exit(0);
+    }
+    const abortController = new AbortController();
+    const userMsg = await (async () => {
+      if (normalizedInputFormat !== "stream-json") {
+        addToHistory(inputPrompt);
+        return createUserMessage(inputPrompt);
+      }
+      if (!structured) {
+        console.error("Error: Structured stdin is not available");
+        process.exit(1);
+      }
+      const sdkUser2 = await structured.nextUserMessage({
+        signal: abortController.signal,
+        timeoutMs: 3e4
+      });
+      if (!sdkUser2 || typeof sdkUser2 !== "object") {
+        console.error("Error: Invalid stream-json input (missing user message)");
+        process.exit(1);
+      }
+      const sdkMessage = sdkUser2.message;
+      const sdkContent = sdkMessage?.content;
+      if (typeof sdkContent !== "string" && !Array.isArray(sdkContent)) {
+        console.error("Error: Invalid stream-json user message content");
+        process.exit(1);
       }
-    })) {
-      if (m.type === "assistant") lastAssistant = m;
-      const sdk = pybMessageToSdkMessage(m, sessionIdForSdk);
-      if (!sdk) continue;
+      const m = createUserMessage(sdkContent);
+      if (typeof sdkUser2.uuid === "string" && sdkUser2.uuid) {
+        ;
+        m.uuid = String(sdkUser2.uuid);
+      }
+      return m;
+    })();
+    const baseMessages = [...initialMessages ?? [], userMsg];
+    const sdkUser = pybMessageToSdkMessage(userMsg, sessionIdForSdk);
+    if (sdkUser) {
       if (normalizedOutputFormat === "stream-json") {
-        writeSdkLine(sdk);
+        writeSdkLine(sdkUser);
       } else {
-        sdkMessages.push(sdk);
+        sdkMessages.push(sdkUser);
       }
     }
-  } catch (e) {
-    abortController.abort();
-    queryError = e;
-  }
-  const textFromAssistant = lastAssistant?.message?.content?.find(
-    (c) => c.type === "text"
-  )?.text;
-  let text = typeof textFromAssistant === "string" ? textFromAssistant : queryError instanceof Error ? queryError.message : queryError ? String(queryError) : "";
-  let structuredOutput;
-  if (parsedJsonSchema && !queryError) {
+    let lastAssistant = null;
+    let queryError = null;
     try {
-      const raw = typeof textFromAssistant === "string" ? textFromAssistant : "";
-      const fenced = raw.trim();
-      const unfenced = (() => {
-        const m = fenced.match(/^```(?:json)?\\s*([\\s\\S]*?)\\s*```$/i);
-        return m ? m[1].trim() : fenced;
-      })();
-      const parsed = JSON.parse(unfenced);
-      const Ajv = (await import("ajv")).default;
-      const ajv = new Ajv({ allErrors: true, strict: false });
-      const validate = ajv.compile(parsedJsonSchema);
-      const ok = validate(parsed);
-      if (!ok) {
-        const errorText = typeof ajv.errorsText === "function" ? ajv.errorsText(validate.errors, { separator: "; " }) : JSON.stringify(validate.errors ?? []);
-        throw new Error(
-          `Structured output failed JSON schema validation: ${errorText}`
-        );
-      }
-      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-        throw new Error("Structured output must be a JSON object");
+      for await (const m of query(baseMessages, systemPrompt, ctx, canUseTool, {
+        options: printOptions,
+        abortController,
+        messageId: void 0,
+        readFileTimestamps: {},
+        setToolJSX: () => {
+        },
+        conversationTracker
+      })) {
+        if (m.type === "assistant") lastAssistant = m;
+        const sdk = pybMessageToSdkMessage(m, sessionIdForSdk);
+        if (!sdk) continue;
+        if (normalizedOutputFormat === "stream-json") {
+          writeSdkLine(sdk);
+        } else {
+          sdkMessages.push(sdk);
+        }
       }
-      structuredOutput = parsed;
     } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      queryError = new Error(msg);
-      text = msg;
+      abortController.abort();
+      queryError = e;
     }
-  }
-  const usage = lastAssistant?.message?.usage;
-  const totalCostUsd = getTotalCost();
-  const durationMs = Date.now() - startedAt;
-  const resultMsg = makeSdkResultMessage({
-    sessionId: sessionIdForSdk,
-    result: String(text),
-    structuredOutput,
-    numTurns: 1,
-    usage,
-    totalCostUsd,
-    durationMs,
-    durationApiMs: 0,
-    isError: Boolean(queryError)
-  });
-  if (normalizedOutputFormat === "stream-json") {
-    writeSdkLine(resultMsg);
-    process.exit(0);
-  }
-  sdkMessages.push(resultMsg);
-  if (verbose) {
-    process.stdout.write(`${JSON.stringify(sdkMessages, null, 2)}
+    const textFromAssistant = lastAssistant?.message?.content?.find(
+      (c) => c.type === "text"
+    )?.text;
+    let text = typeof textFromAssistant === "string" ? textFromAssistant : queryError instanceof Error ? queryError.message : queryError ? String(queryError) : "";
+    let structuredOutput;
+    if (parsedJsonSchema && !queryError) {
+      try {
+        const raw = typeof textFromAssistant === "string" ? textFromAssistant : "";
+        const fenced = raw.trim();
+        const unfenced = (() => {
+          const m = fenced.match(/^```(?:json)?\\s*([\\s\\S]*?)\\s*```$/i);
+          return m ? m[1].trim() : fenced;
+        })();
+        const parsed = JSON.parse(unfenced);
+        const Ajv = (await import("ajv")).default;
+        const ajv = new Ajv({ allErrors: true, strict: false });
+        const validate = ajv.compile(parsedJsonSchema);
+        const ok = validate(parsed);
+        if (!ok) {
+          const errorText = typeof ajv.errorsText === "function" ? ajv.errorsText(validate.errors, { separator: "; " }) : JSON.stringify(validate.errors ?? []);
+          throw new Error(
+            `Structured output failed JSON schema validation: ${errorText}`
+          );
+        }
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+          throw new Error("Structured output must be a JSON object");
+        }
+        structuredOutput = parsed;
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        queryError = new Error(msg);
+        text = msg;
+      }
+    }
+    const usage = lastAssistant?.message?.usage;
+    const totalCostUsd = getTotalCost();
+    const durationMs = Date.now() - startedAt;
+    const resultMsg = makeSdkResultMessage({
+      sessionId: sessionIdForSdk,
+      result: String(text),
+      structuredOutput,
+      numTurns: 1,
+      usage,
+      totalCostUsd,
+      durationMs,
+      durationApiMs: 0,
+      isError: Boolean(queryError)
+    });
+    if (normalizedOutputFormat === "stream-json") {
+      writeSdkLine(resultMsg);
+      process.exit(0);
+    }
+    sdkMessages.push(resultMsg);
+    if (verbose) {
+      process.stdout.write(`${JSON.stringify(sdkMessages, null, 2)}
 `);
-  } else {
-    process.stdout.write(`${JSON.stringify(resultMsg, null, 2)}
+    } else {
+      process.stdout.write(`${JSON.stringify(resultMsg, null, 2)}
 `);
+    }
+    process.exit(0);
+  } finally {
+    restoreSessionScope();
   }
-  process.exit(0);
 }
 
 // src/utils/session/cleanup.ts
@@ -846,9 +866,9 @@ async function setup(cwd2, safeMode) {
   grantReadPermissionForOriginalDir();
   let agentLoader;
   try {
-    agentLoader = await import("./loader-JPKYTFFC.js");
+    agentLoader = await import("./loader-OWZ3WD2X.js");
   } catch {
-    agentLoader = await import("./loader-JPKYTFFC.js");
+    agentLoader = await import("./loader-OWZ3WD2X.js");
   }
   const { startAgentWatcher } = agentLoader;
   await startAgentWatcher(() => {
@@ -2068,12 +2088,12 @@ async function parseArgs(stdinContent, renderContext) {
       assertMinVersion();
       {
         const requested = Array.isArray(pluginDir) && pluginDir.length > 0 ? pluginDir : [];
-        const { listEnabledInstalledPluginPackRoots } = await import("./skillMarketplace-UITGQNZD.js");
+        const { listEnabledInstalledPluginPackRoots } = await import("./skillMarketplace-ATLDIEEX.js");
         const installed = listEnabledInstalledPluginPackRoots();
         const all = [...installed, ...requested].filter(Boolean);
         const deduped = Array.from(new Set(all));
         if (deduped.length > 0) {
-          const { configureSessionPlugins } = await import("./pluginRuntime-KJ3YFO2O.js");
+          const { configureSessionPlugins } = await import("./pluginRuntime-PQ3VZRX7.js");
           const { errors } = await configureSessionPlugins({
             pluginDirs: deduped
           });
@@ -2083,9 +2103,9 @@ async function parseArgs(stdinContent, renderContext) {
         }
       }
       const [{ ask }, { getTools }, { getCommands }] = await Promise.all([
-        import("./ask-CUR6IJ2W.js"),
-        import("./tools-HVGZBEHZ.js"),
-        import("./commands-LAZD5O4M.js")
+        import("./ask-TI3ITWN7.js"),
+        import("./tools-45UHHM5S.js"),
+        import("./commands-3B77L2SI.js")
       ]);
       const commands = await getCommands();
       const mcpClientsPromise = Array.isArray(mcpConfig) && mcpConfig.length > 0 || strictMcpConfig === true ? getClientsForCliMcpConfig({
@@ -2104,8 +2124,8 @@ async function parseArgs(stdinContent, renderContext) {
       const {
         loadPybAgentSessionMessages,
         findMostRecentPybAgentSessionId
-      } = await import("./pybAgentSessionLoad-TRSWA62U.js");
-      const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-3IRNTCVI.js");
+      } = await import("./pybAgentSessionLoad-5MWAY2A4.js");
+      const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-NZGSUGGS.js");
       const { isUuid } = await import("./uuid-CVHEFGW4.js");
       const { setPybAgentSessionId, getPybAgentSessionId } = await import("./pybAgentSessionId-EPCAMQ25.js");
       const { randomUUID } = await import("crypto");
@@ -2230,7 +2250,7 @@ async function parseArgs(stdinContent, renderContext) {
               { getLatestVersion, getUpdateCommandSuggestions },
               semverMod
             ] = await Promise.all([
-              import("./autoUpdater-DEH233RT.js"),
+              import("./autoUpdater-MRK5BD2L.js"),
               import("semver")
             ]);
             const semver = semverMod?.default ?? semverMod;
@@ -2291,7 +2311,7 @@ async function parseArgs(stdinContent, renderContext) {
         const isDefaultModel = await isDefaultSlowAndCapableModel();
         {
           const { render: render3 } = await import("ink");
-          const { REPL } = await import("./REPL-WXPYXBW2.js");
+          const { REPL } = await import("./REPL-VOJCD6X6.js");
           render3(
             /* @__PURE__ */ React10.createElement(
               REPL,
@@ -2459,7 +2479,7 @@ async function parseArgs(stdinContent, renderContext) {
         { replace: !!replace }
       );
       saveGlobalConfig(nextConfig);
-      await import("./model-P33QONA2.js").then(({ reloadModelManager }) => {
+      await import("./model-5NDSZPIL.js").then(({ reloadModelManager }) => {
         reloadModelManager();
       });
       if (warnings.length > 0) {
@@ -2478,7 +2498,7 @@ async function parseArgs(stdinContent, renderContext) {
       const workingDir = typeof options?.cwd === "string" ? options.cwd : typeof programCwd === "string" ? programCwd : cwd();
       const asJson = options?.json === true;
       await setup(workingDir, false);
-      const { reloadModelManager, getModelManager: getModelManager2 } = await import("./model-P33QONA2.js");
+      const { reloadModelManager, getModelManager: getModelManager2 } = await import("./model-5NDSZPIL.js");
       reloadModelManager();
       const manager = getModelManager2();
       const config2 = getGlobalConfig();
@@ -2552,7 +2572,7 @@ Model profiles (${active.length}/${profiles.length} active):
       try {
         const workingDir = typeof options?.cwd === "string" ? options.cwd : cwd();
         await setup(workingDir, false);
-        const { validateAgentTemplates } = await import("./agentsValidate-LQFWOCPZ.js");
+        const { validateAgentTemplates } = await import("./agentsValidate-35AHZXNB.js");
         const report = await validateAgentTemplates({
           cwd: workingDir,
           paths: Array.isArray(paths) ? paths : [],
@@ -2596,7 +2616,7 @@ Model profiles (${active.length}/${profiles.length} active):
   const registerMarketplaceCommands = (marketplaceCmd2) => {
     marketplaceCmd2.command("add <source>").description("Add a marketplace from a URL, path, or GitHub repo").action(async (source) => {
       try {
-        const { addMarketplace } = await import("./skillMarketplace-UITGQNZD.js");
+        const { addMarketplace } = await import("./skillMarketplace-ATLDIEEX.js");
         console.log("Adding marketplace...");
         const { name } = await addMarketplace(source);
         console.log(`Successfully added marketplace: ${name}`);
@@ -2608,7 +2628,7 @@ Model profiles (${active.length}/${profiles.length} active):
     });
     marketplaceCmd2.command("list").description("List all configured marketplaces").option("--json", "Output as JSON").action(async (options) => {
       try {
-        const { listMarketplaces } = await import("./skillMarketplace-UITGQNZD.js");
+        const { listMarketplaces } = await import("./skillMarketplace-ATLDIEEX.js");
         const marketplaces = listMarketplaces();
         if (options.json) {
           console.log(JSON.stringify(marketplaces, null, 2));
@@ -2647,7 +2667,7 @@ Model profiles (${active.length}/${profiles.length} active):
     });
     marketplaceCmd2.command("remove <name>").alias("rm").description("Remove a configured marketplace").action(async (name) => {
       try {
-        const { removeMarketplace } = await import("./skillMarketplace-UITGQNZD.js");
+        const { removeMarketplace } = await import("./skillMarketplace-ATLDIEEX.js");
         removeMarketplace(name);
         console.log(`Successfully removed marketplace: ${name}`);
         process.exit(0);
@@ -2664,7 +2684,7 @@ Model profiles (${active.length}/${profiles.length} active):
           listMarketplaces,
           refreshAllMarketplacesAsync,
           refreshMarketplaceAsync
-        } = await import("./skillMarketplace-UITGQNZD.js");
+        } = await import("./skillMarketplace-ATLDIEEX.js");
         const trimmed = typeof name === "string" ? name.trim() : "";
         if (trimmed) {
           console.log(`Updating marketplace: ${trimmed}...`);
@@ -2715,9 +2735,9 @@ Model profiles (${active.length}/${profiles.length} active):
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { installSkillPlugin } = await import("./skillMarketplace-UITGQNZD.js");
+      const { installSkillPlugin } = await import("./skillMarketplace-ATLDIEEX.js");
       const result = installSkillPlugin(plugin, {
         scope,
         force: options.force === true
@@ -2744,9 +2764,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { uninstallSkillPlugin } = await import("./skillMarketplace-UITGQNZD.js");
+      const { uninstallSkillPlugin } = await import("./skillMarketplace-ATLDIEEX.js");
       const result = uninstallSkillPlugin(plugin, { scope });
       const skillList = result.removedSkills.length > 0 ? `Skills: ${result.removedSkills.join(", ")}` : "Skills: (none)";
       console.log(`Uninstalled ${result.pluginSpec}
@@ -2770,9 +2790,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2, getCwd: getCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2, getCwd: getCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { listInstalledSkillPlugins } = await import("./skillMarketplace-UITGQNZD.js");
+      const { listInstalledSkillPlugins } = await import("./skillMarketplace-ATLDIEEX.js");
       const all = listInstalledSkillPlugins();
       const filtered = Object.fromEntries(
         Object.entries(all).filter(([, record]) => {
@@ -2816,9 +2836,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { enableSkillPlugin } = await import("./skillMarketplace-UITGQNZD.js");
+      const { enableSkillPlugin } = await import("./skillMarketplace-ATLDIEEX.js");
       const result = enableSkillPlugin(plugin, { scope });
       console.log(`Enabled ${result.pluginSpec}`);
       process.exit(0);
@@ -2840,9 +2860,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { disableSkillPlugin } = await import("./skillMarketplace-UITGQNZD.js");
+      const { disableSkillPlugin } = await import("./skillMarketplace-ATLDIEEX.js");
       const result = disableSkillPlugin(plugin, { scope });
       console.log(`Disabled ${result.pluginSpec}`);
       process.exit(0);
@@ -2853,9 +2873,9 @@ ${skillList}`);
   });
   pluginCmd.command("validate <path>").description("Validate a plugin or marketplace manifest").option("--cwd <cwd>", "The current working directory", String, cwd()).action(async (path, options) => {
     try {
-      const { setCwd: setCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { formatValidationResult, validatePluginOrMarketplacePath } = await import("./pluginValidation-MR5GV7PL.js");
+      const { formatValidationResult, validatePluginOrMarketplacePath } = await import("./pluginValidation-RQ34XQY3.js");
       const result = validatePluginOrMarketplacePath(path);
       console.log(
         `Validating ${result.fileType} manifest: ${result.filePath}
@@ -2877,9 +2897,9 @@ ${skillList}`);
   registerMarketplaceCommands(marketplaceCmd);
   skillsCmd.command("install <plugin>").description("Install a skill plugin pack (<plugin>@<marketplace>)").option("--cwd <cwd>", "The current working directory", String, cwd()).option("--project", "Install into this project (.pyb/...)", () => true).option("--force", "Overwrite existing installed files", () => true).action(async (plugin, options) => {
     try {
-      const { setCwd: setCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { installSkillPlugin } = await import("./skillMarketplace-UITGQNZD.js");
+      const { installSkillPlugin } = await import("./skillMarketplace-ATLDIEEX.js");
       const result = installSkillPlugin(plugin, {
         project: options.project === true,
         force: options.force === true
@@ -2895,9 +2915,9 @@ ${skillList}`);
   });
   skillsCmd.command("uninstall <plugin>").description("Uninstall a skill plugin pack (<plugin>@<marketplace>)").option("--cwd <cwd>", "The current working directory", String, cwd()).option("--project", "Uninstall from this project (.pyb/...)", () => true).action(async (plugin, options) => {
     try {
-      const { setCwd: setCwd2 } = await import("./state-I7LIGIFJ.js");
+      const { setCwd: setCwd2 } = await import("./state-Y2Q4MPY5.js");
       await setCwd2(options.cwd ?? cwd());
-      const { uninstallSkillPlugin } = await import("./skillMarketplace-UITGQNZD.js");
+      const { uninstallSkillPlugin } = await import("./skillMarketplace-ATLDIEEX.js");
       const result = uninstallSkillPlugin(plugin, {
         project: options.project === true
       });
@@ -2912,7 +2932,7 @@ ${skillList}`);
   });
   skillsCmd.command("list-installed").description("List installed skill plugins").action(async () => {
     try {
-      const { listInstalledSkillPlugins } = await import("./skillMarketplace-UITGQNZD.js");
+      const { listInstalledSkillPlugins } = await import("./skillMarketplace-ATLDIEEX.js");
       console.log(JSON.stringify(listInstalledSkillPlugins(), null, 2));
       process.exit(0);
     } catch (error) {
@@ -3558,7 +3578,7 @@ ${skillList}`);
       const ink = await import("ink");
       const reactModule = await import("react");
       const inkjsui = await import("@inkjs/ui");
-      const utilsTheme = await import("./theme-RVIXXPSQ.js");
+      const utilsTheme = await import("./theme-3L66ZU5Z.js");
       const { render: render3 } = ink;
       const React11 = reactModule;
       const { MultiSelect: MultiSelect2 } = inkjsui;
@@ -3701,8 +3721,8 @@ ${skillList}`);
       const commandOptions = getCommandOptions(options);
       const workingDir = resolveWorkingDir(commandOptions, program);
       await setup(workingDir, false);
-      const { getAbsolutePath } = await import("./file-KHYC624L.js");
-      const { LspFacade } = await import("./lsp-B7QJVI2U.js");
+      const { getAbsolutePath } = await import("./file-LCS77XWE.js");
+      const { LspFacade } = await import("./lsp-NLPSJYH4.js");
       const { existsSync: existsSync2 } = await import("fs");
       const absPath = getAbsolutePath(file) ?? file;
       if (!existsSync2(absPath)) {
@@ -3733,7 +3753,7 @@ ${skillList}`);
     try {
       const workingDir = resolveWorkingDir(options, program);
       await setup(workingDir, false);
-      const { LspFacade } = await import("./lsp-B7QJVI2U.js");
+      const { LspFacade } = await import("./lsp-NLPSJYH4.js");
       const result = await LspFacade.run({
         operation: "workspaceSymbol",
         filePath: query,
@@ -3750,8 +3770,8 @@ ${skillList}`);
     try {
       const workingDir = resolveWorkingDir(options, program);
       await setup(workingDir, false);
-      const { getAbsolutePath } = await import("./file-KHYC624L.js");
-      const { LspFacade } = await import("./lsp-B7QJVI2U.js");
+      const { getAbsolutePath } = await import("./file-LCS77XWE.js");
+      const { LspFacade } = await import("./lsp-NLPSJYH4.js");
       const { existsSync: existsSync2 } = await import("fs");
       const absPath = getAbsolutePath(file) ?? file;
       if (!existsSync2(absPath)) {
@@ -3774,7 +3794,7 @@ ${skillList}`);
     try {
       const workingDir = resolveWorkingDir(options, program);
       await setup(workingDir, false);
-      const { LspFacade } = await import("./lsp-B7QJVI2U.js");
+      const { LspFacade } = await import("./lsp-NLPSJYH4.js");
       const status = LspFacade.status();
       console.log(JSON.stringify(status, null, 2));
       process.exit(0);
@@ -3788,7 +3808,7 @@ ${skillList}`);
       const commandOptions = getCommandOptions(options);
       const workingDir = resolveWorkingDir(commandOptions, program);
       await setup(workingDir, false);
-      const { LspFacade } = await import("./lsp-B7QJVI2U.js");
+      const { LspFacade } = await import("./lsp-NLPSJYH4.js");
       const host = typeof commandOptions?.host === "string" && commandOptions.host.length > 0 ? commandOptions.host : "127.0.0.1";
       const port = typeof commandOptions?.port === "number" && !Number.isNaN(commandOptions.port) ? commandOptions.port : 7337;
       const server = LspFacade.serveStatus({ host, port });
@@ -3814,7 +3834,7 @@ ${skillList}`);
   program.command("update").description("Show manual upgrade commands (no auto-install)").action(async () => {
     console.log(`Current version: ${MACRO.VERSION}`);
     console.log("Checking for updates...");
-    const { getLatestVersion, getUpdateCommandSuggestions } = await import("./autoUpdater-DEH233RT.js");
+    const { getLatestVersion, getUpdateCommandSuggestions } = await import("./autoUpdater-MRK5BD2L.js");
     const latestVersion = await getLatestVersion();
     if (!latestVersion) {
       console.error("Failed to check for updates");
@@ -3869,8 +3889,8 @@ ${skillList}`);
       await setup(cwd2, safe);
       assertMinVersion();
       const [{ getTools }, { getCommands }] = await Promise.all([
-        import("./tools-HVGZBEHZ.js"),
-        import("./commands-LAZD5O4M.js")
+        import("./tools-45UHHM5S.js"),
+        import("./commands-3B77L2SI.js")
       ]);
       const [allTools, commands, mcpClients] = await Promise.all([
         getTools(
@@ -3881,8 +3901,8 @@ ${skillList}`);
       ]);
       const tools = disableSlashCommands === true ? allTools.filter((t) => t.name !== "SlashCommand") : allTools;
       if (identifier !== void 0) {
-        const { loadPybAgentSessionMessages } = await import("./pybAgentSessionLoad-TRSWA62U.js");
-        const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-3IRNTCVI.js");
+        const { loadPybAgentSessionMessages } = await import("./pybAgentSessionLoad-5MWAY2A4.js");
+        const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-NZGSUGGS.js");
         const { setPybAgentSessionId } = await import("./pybAgentSessionId-EPCAMQ25.js");
         const rawIdentifier = String(identifier).trim();
         const isLegacyNumber = /^-?\\d+$/.test(rawIdentifier);
@@ -3952,7 +3972,7 @@ ${skillList}`);
           const isDefaultModel = await isDefaultSlowAndCapableModel();
           {
             const { render: render3 } = await import("ink");
-            const { REPL } = await import("./REPL-WXPYXBW2.js");
+            const { REPL } = await import("./REPL-VOJCD6X6.js");
             render3(
               /* @__PURE__ */ React10.createElement(
                 REPL,
@@ -3979,7 +3999,7 @@ ${skillList}`);
           process.exit(1);
         }
       } else {
-        const { listPybAgentSessions } = await import("./pybAgentSessionResume-3IRNTCVI.js");
+        const { listPybAgentSessions } = await import("./pybAgentSessionResume-NZGSUGGS.js");
         const sessions = listPybAgentSessions({ cwd: cwd2 });
         if (sessions.length === 0) {
           console.error("No conversation found to resume");
@@ -4084,7 +4104,7 @@ async function gracefulExit(code = 0) {
   }
   isGracefulExitInProgress = true;
   try {
-    const { runSessionEndHooks } = await import("./pybHooks-HFAKEYDS.js");
+    const { runSessionEndHooks } = await import("./pybHooks-HILU7ZB4.js");
     const { getPybAgentSessionId } = await import("./pybAgentSessionId-EPCAMQ25.js");
     const { tmpdir } = await import("os");
     const { join: join2 } = await import("path");