pybao-cli 1.4.15 → 1.4.17

package/dist/{chunk-NA7ROPOY.js → chunk-ZHPKJVUT.js}

@@ -2,13 +2,13 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   MarketplaceManifestSchema
-} from "./chunk-C6ZACFHI.js";
+} from "./chunk-7SGVFJWX.js";
 import {
   parseFrontmatter
-} from "./chunk-4E4ZHEYH.js";
+} from "./chunk-YJWJ5DGO.js";
 import {
   getCwd
-} from "./chunk-THJLROJB.js";
+} from "./chunk-CDKFT2GF.js";
 
 // src/services/plugins/pluginValidation.ts
 import { existsSync, lstatSync, readFileSync } from "node:fs";

package/dist/{chunk-2WZXH6PI.js → chunk-ZQ4IZUPH.js}

@@ -4,10 +4,10 @@ import {
   PRODUCT_NAME,
   execFileNoThrow,
   logError
-} from "./chunk-THJLROJB.js";
+} from "./chunk-CDKFT2GF.js";
 import {
   MACRO
-} from "./chunk-PVPXTCJH.js";
+} from "./chunk-PPTMKZPO.js";
 
 // src/utils/session/autoUpdater.ts
 async function getSemver() {
@@ -82,7 +82,7 @@ async function checkAndNotifyUpdate() {
     const [
       { isAutoUpdaterDisabled, getGlobalConfig, saveGlobalConfig },
       { env }
-    ] = await Promise.all([import("./config-LWY7BZXJ.js"), import("./env-EFQJVSUY.js")]);
+    ] = await Promise.all([import("./config-A7PN2NDW.js"), import("./env-MACCQLTW.js")]);
     if (await isAutoUpdaterDisabled()) return;
     if (await env.getIsDocker()) return;
     if (!await env.hasInternetAccess()) return;

package/dist/{cli-GPDT2IJU.js → cli-HMY2IU2T.js}

@@ -7,13 +7,13 @@ import {
 } from "./chunk-MWPFU2KU.js";
 import {
   getAllTools
-} from "./chunk-2WZY23LE.js";
+} from "./chunk-ULOUEAT2.js";
 import {
   PybAgentStructuredStdio
 } from "./chunk-5AGDLQAW.js";
 import {
   assertMinVersion
-} from "./chunk-2WZXH6PI.js";
+} from "./chunk-ZQ4IZUPH.js";
 import {
   getToolDescription
 } from "./chunk-XI4LTVYT.js";
@@ -32,18 +32,18 @@ import {
   review_default,
   useExitOnCtrlCD,
   useTerminalSize
-} from "./chunk-YY4XF7AZ.js";
-import "./chunk-NA7ROPOY.js";
-import "./chunk-BB7V4QKI.js";
-import "./chunk-MRMEHFMO.js";
-import "./chunk-6RKXEEHI.js";
+} from "./chunk-S4KCBRDZ.js";
+import "./chunk-ZHPKJVUT.js";
+import "./chunk-3H7JCOX7.js";
+import "./chunk-CIUNX2UP.js";
+import "./chunk-26DNH5MY.js";
 import "./chunk-5P7HBXTD.js";
-import "./chunk-37NXYZZP.js";
+import "./chunk-AHO6SRRR.js";
 import {
   clearOutputStyleCache
-} from "./chunk-YV4PKPBH.js";
-import "./chunk-5N64T4FL.js";
-import "./chunk-LOOXNX5Y.js";
+} from "./chunk-XM7MBTOO.js";
+import "./chunk-K45LL6PV.js";
+import "./chunk-JUVESM6V.js";
 import {
   addMcpServer,
   ensureConfigScope,
@@ -58,44 +58,44 @@ import {
   parseEnvVars,
   parseMcpHeaders,
   removeMcpServer
-} from "./chunk-ELWN7R7M.js";
-import "./chunk-C6ZACFHI.js";
-import "./chunk-EASHVVK6.js";
+} from "./chunk-CZRFLOQG.js";
+import "./chunk-7SGVFJWX.js";
+import "./chunk-QSP2L4AM.js";
 import "./chunk-UNNVICVU.js";
-import "./chunk-ONPK4QYB.js";
+import "./chunk-KKILDPBV.js";
 import "./chunk-ERMQRV55.js";
 import {
   clearAgentCache,
   setFlagAgentsFromCliJson
-} from "./chunk-33NX2JEV.js";
+} from "./chunk-26VECGIJ.js";
 import {
   setEnabledSettingSourcesFromCli
 } from "./chunk-A3BVXXA3.js";
-import "./chunk-PD6OTVLV.js";
+import "./chunk-5KZB52GW.js";
 import "./chunk-3DFBSQIT.js";
 import "./chunk-B6IMQJZM.js";
 import "./chunk-OUXHGDLH.js";
-import "./chunk-5TAP3RGJ.js";
+import "./chunk-QKOT6XYY.js";
 import "./chunk-QWIBSCDN.js";
-import "./chunk-L3W3K3QU.js";
-import "./chunk-IB6KSWDZ.js";
-import "./chunk-UO5X5SXI.js";
+import "./chunk-5IIJ6XQX.js";
+import "./chunk-AHK3NVAX.js";
+import "./chunk-KEBVFZAX.js";
 import "./chunk-UZ34JEUK.js";
-import "./chunk-4E4ZHEYH.js";
+import "./chunk-YJWJ5DGO.js";
 import "./chunk-BJSWTHRM.js";
 import {
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-2GNIL5UE.js";
+} from "./chunk-RJK6AYKB.js";
 import {
   getContext,
   removeContext,
   setContext
-} from "./chunk-TJOLXDG6.js";
-import "./chunk-ZTVPEF2F.js";
+} from "./chunk-X6LUQUI4.js";
+import "./chunk-XVZ7ZX2L.js";
 import {
   getTheme
-} from "./chunk-4YNWFMHH.js";
+} from "./chunk-DXIIHIJG.js";
 import {
   checkHasTrustDialogAccepted,
   deleteConfigForCLI,
@@ -109,14 +109,14 @@ import {
   saveGlobalConfig,
   setConfigForCLI,
   validateAndRepairAllGPT5Profiles
-} from "./chunk-BUEOTCMA.js";
+} from "./chunk-NSID4TSV.js";
 import {
   ConfigParseError
 } from "./chunk-RQVLBMP7.js";
 import {
   debug,
   initDebugLogger
-} from "./chunk-3D4D72TA.js";
+} from "./chunk-EHFY3DA7.js";
 import {
   BunShell,
   CACHE_PATHS,
@@ -132,10 +132,10 @@ import {
   parseLogFilename,
   setCwd,
   setOriginalCwd
-} from "./chunk-THJLROJB.js";
+} from "./chunk-CDKFT2GF.js";
 import {
   MACRO
-} from "./chunk-PVPXTCJH.js";
+} from "./chunk-PPTMKZPO.js";
 import "./chunk-I3J4JYES.js";
 
 // src/entrypoints/cli/runCli.tsx
@@ -295,7 +295,7 @@ function createPrintModeControlRequestHandler(args) {
 
 // src/entrypoints/cli/stdio/streamJsonSession.ts
 async function runPrintModeStreamJsonSession(args) {
-  const { runPybAgentStreamJsonSession } = await import("./pybAgentStreamJsonSession-6DZUR3ME.js");
+  const { runPybAgentStreamJsonSession } = await import("./pybAgentStreamJsonSession-JQPASPNN.js");
   await runPybAgentStreamJsonSession(args);
 }
 
@@ -449,18 +449,18 @@ async function runPrintMode({
 `);
     process.exit(0);
   }
-  const { createUserMessage } = await import("./messages-5JAJG44H.js");
-  const { getSystemPrompt } = await import("./prompts-KTT5FAYF.js");
-  const { getContext: getContext2 } = await import("./context-5AE67GYL.js");
+  const { createUserMessage } = await import("./messages-UYHRONQS.js");
+  const { getSystemPrompt } = await import("./prompts-ATUILKIJ.js");
+  const { getContext: getContext2 } = await import("./context-SXT7XLXT.js");
   const { getTotalCost } = await import("./costTracker-DJVFVAVZ.js");
-  const { query } = await import("./query-PSDZBJSO.js");
+  const { query } = await import("./query-ID3RUBSI.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-ZPBRNODI.js");
+  } = await import("./toolPermissionSettings-XJ6CKWDG.js");
   const { applyToolPermissionContextUpdates } = await import("./toolPermissionContext-BSFV23IL.js");
   const sessionIdForSdk = getPybAgentSessionId();
   const startedAt = Date.now();
@@ -840,9 +840,9 @@ async function setup(cwd2, safeMode) {
   grantReadPermissionForOriginalDir();
   let agentLoader;
   try {
-    agentLoader = await import("./loader-HQ56KK4K.js");
+    agentLoader = await import("./loader-VHBERR5P.js");
   } catch {
-    agentLoader = await import("./loader-HQ56KK4K.js");
+    agentLoader = await import("./loader-VHBERR5P.js");
   }
   const { startAgentWatcher } = agentLoader;
   await startAgentWatcher(() => {
@@ -1764,6 +1764,32 @@ function omitKeys(input, ...keys) {
   }
   return result;
 }
+function getCommandOptions(options) {
+  return options && typeof options === "object" && typeof options.opts === "function" ? options.opts() : options;
+}
+function getCwdFromArgv(argv) {
+  for (let i = argv.length - 1; i >= 0; i -= 1) {
+    const arg = argv[i];
+    if (arg === "--cwd") {
+      const next = argv[i + 1];
+      return typeof next === "string" && next.length > 0 ? next : void 0;
+    }
+    if (arg.startsWith("--cwd=")) {
+      const value = arg.slice("--cwd=".length);
+      return value.length > 0 ? value : void 0;
+    }
+  }
+  return void 0;
+}
+function resolveWorkingDir(options, program) {
+  const commandOptions = getCommandOptions(options);
+  const programCwd = program.opts().cwd;
+  const argvCwd = getCwdFromArgv(program.rawArgs ?? process.argv);
+  if (typeof argvCwd === "string") return argvCwd;
+  if (typeof commandOptions?.cwd === "string") return commandOptions.cwd;
+  if (typeof programCwd === "string") return programCwd;
+  return cwd();
+}
 async function runCli() {
   initDebugLogger();
   try {
@@ -2020,12 +2046,12 @@ async function parseArgs(stdinContent, renderContext) {
       assertMinVersion();
       {
         const requested = Array.isArray(pluginDir) && pluginDir.length > 0 ? pluginDir : [];
-        const { listEnabledInstalledPluginPackRoots } = await import("./skillMarketplace-CAGSV3Z6.js");
+        const { listEnabledInstalledPluginPackRoots } = await import("./skillMarketplace-VA7VL5D5.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-OW54XVUW.js");
+          const { configureSessionPlugins } = await import("./pluginRuntime-EP4ATLRC.js");
           const { errors } = await configureSessionPlugins({
             pluginDirs: deduped
           });
@@ -2035,9 +2061,9 @@ async function parseArgs(stdinContent, renderContext) {
         }
       }
       const [{ ask }, { getTools }, { getCommands }] = await Promise.all([
-        import("./ask-P3GOQDEX.js"),
-        import("./tools-M4GJRWEU.js"),
-        import("./commands-YV373ZFU.js")
+        import("./ask-7S7OPAEK.js"),
+        import("./tools-EVR75R24.js"),
+        import("./commands-AAP4MYTL.js")
       ]);
       const commands = await getCommands();
       const mcpClientsPromise = Array.isArray(mcpConfig) && mcpConfig.length > 0 || strictMcpConfig === true ? getClientsForCliMcpConfig({
@@ -2056,8 +2082,8 @@ async function parseArgs(stdinContent, renderContext) {
       const {
         loadPybAgentSessionMessages,
         findMostRecentPybAgentSessionId
-      } = await import("./pybAgentSessionLoad-YI2EVD6F.js");
-      const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-VJIKNW7O.js");
+      } = await import("./pybAgentSessionLoad-QZIINLCD.js");
+      const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-3XND5AZG.js");
       const { isUuid } = await import("./uuid-CVHEFGW4.js");
       const { setPybAgentSessionId, getPybAgentSessionId } = await import("./pybAgentSessionId-EPCAMQ25.js");
       const { randomUUID } = await import("crypto");
@@ -2182,7 +2208,7 @@ async function parseArgs(stdinContent, renderContext) {
               { getLatestVersion, getUpdateCommandSuggestions },
               semverMod
             ] = await Promise.all([
-              import("./autoUpdater-R4EXAJ7P.js"),
+              import("./autoUpdater-JB2N6XSK.js"),
               import("semver")
             ]);
             const semver = semverMod?.default ?? semverMod;
@@ -2243,7 +2269,7 @@ async function parseArgs(stdinContent, renderContext) {
         const isDefaultModel = await isDefaultSlowAndCapableModel();
         {
           const { render: render3 } = await import("ink");
-          const { REPL } = await import("./REPL-3X2W4SUH.js");
+          const { REPL } = await import("./REPL-2HTMFGA5.js");
           render3(
             /* @__PURE__ */ React10.createElement(
               REPL,
@@ -2331,7 +2357,7 @@ async function parseArgs(stdinContent, renderContext) {
         { replace: !!replace }
       );
       saveGlobalConfig(nextConfig);
-      await import("./model-VR6QZCYI.js").then(({ reloadModelManager }) => {
+      await import("./model-YPKZ4DQ3.js").then(({ reloadModelManager }) => {
         reloadModelManager();
       });
       if (warnings.length > 0) {
@@ -2350,7 +2376,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-VR6QZCYI.js");
+      const { reloadModelManager, getModelManager: getModelManager2 } = await import("./model-YPKZ4DQ3.js");
       reloadModelManager();
       const manager = getModelManager2();
       const config2 = getGlobalConfig();
@@ -2424,7 +2450,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-PX32PNPA.js");
+        const { validateAgentTemplates } = await import("./agentsValidate-JHFP6CBL.js");
         const report = await validateAgentTemplates({
           cwd: workingDir,
           paths: Array.isArray(paths) ? paths : [],
@@ -2468,7 +2494,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-CAGSV3Z6.js");
+        const { addMarketplace } = await import("./skillMarketplace-VA7VL5D5.js");
         console.log("Adding marketplace...");
         const { name } = await addMarketplace(source);
         console.log(`Successfully added marketplace: ${name}`);
@@ -2480,7 +2506,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-CAGSV3Z6.js");
+        const { listMarketplaces } = await import("./skillMarketplace-VA7VL5D5.js");
         const marketplaces = listMarketplaces();
         if (options.json) {
           console.log(JSON.stringify(marketplaces, null, 2));
@@ -2519,7 +2545,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-CAGSV3Z6.js");
+        const { removeMarketplace } = await import("./skillMarketplace-VA7VL5D5.js");
         removeMarketplace(name);
         console.log(`Successfully removed marketplace: ${name}`);
         process.exit(0);
@@ -2536,7 +2562,7 @@ Model profiles (${active.length}/${profiles.length} active):
           listMarketplaces,
           refreshAllMarketplacesAsync,
           refreshMarketplaceAsync
-        } = await import("./skillMarketplace-CAGSV3Z6.js");
+        } = await import("./skillMarketplace-VA7VL5D5.js");
         const trimmed = typeof name === "string" ? name.trim() : "";
         if (trimmed) {
           console.log(`Updating marketplace: ${trimmed}...`);
@@ -2587,9 +2613,9 @@ Model profiles (${active.length}/${profiles.length} active):
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-56C2ROYY.js");
+      const { setCwd: setCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { installSkillPlugin } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { installSkillPlugin } = await import("./skillMarketplace-VA7VL5D5.js");
       const result = installSkillPlugin(plugin, {
         scope,
         force: options.force === true
@@ -2616,9 +2642,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-56C2ROYY.js");
+      const { setCwd: setCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { uninstallSkillPlugin } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { uninstallSkillPlugin } = await import("./skillMarketplace-VA7VL5D5.js");
       const result = uninstallSkillPlugin(plugin, { scope });
       const skillList = result.removedSkills.length > 0 ? `Skills: ${result.removedSkills.join(", ")}` : "Skills: (none)";
       console.log(`Uninstalled ${result.pluginSpec}
@@ -2642,9 +2668,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2, getCwd: getCwd2 } = await import("./state-56C2ROYY.js");
+      const { setCwd: setCwd2, getCwd: getCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { listInstalledSkillPlugins } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { listInstalledSkillPlugins } = await import("./skillMarketplace-VA7VL5D5.js");
       const all = listInstalledSkillPlugins();
       const filtered = Object.fromEntries(
         Object.entries(all).filter(([, record]) => {
@@ -2688,9 +2714,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-56C2ROYY.js");
+      const { setCwd: setCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { enableSkillPlugin } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { enableSkillPlugin } = await import("./skillMarketplace-VA7VL5D5.js");
       const result = enableSkillPlugin(plugin, { scope });
       console.log(`Enabled ${result.pluginSpec}`);
       process.exit(0);
@@ -2712,9 +2738,9 @@ ${skillList}`);
         );
         process.exit(1);
       }
-      const { setCwd: setCwd2 } = await import("./state-56C2ROYY.js");
+      const { setCwd: setCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { disableSkillPlugin } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { disableSkillPlugin } = await import("./skillMarketplace-VA7VL5D5.js");
       const result = disableSkillPlugin(plugin, { scope });
       console.log(`Disabled ${result.pluginSpec}`);
       process.exit(0);
@@ -2725,9 +2751,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-56C2ROYY.js");
+      const { setCwd: setCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { formatValidationResult, validatePluginOrMarketplacePath } = await import("./pluginValidation-X2LVT22X.js");
+      const { formatValidationResult, validatePluginOrMarketplacePath } = await import("./pluginValidation-3ZURFUHM.js");
       const result = validatePluginOrMarketplacePath(path);
       console.log(
         `Validating ${result.fileType} manifest: ${result.filePath}
@@ -2749,9 +2775,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-56C2ROYY.js");
+      const { setCwd: setCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { installSkillPlugin } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { installSkillPlugin } = await import("./skillMarketplace-VA7VL5D5.js");
       const result = installSkillPlugin(plugin, {
         project: options.project === true,
         force: options.force === true
@@ -2767,9 +2793,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-56C2ROYY.js");
+      const { setCwd: setCwd2 } = await import("./state-GU2VJXIZ.js");
       await setCwd2(options.cwd ?? cwd());
-      const { uninstallSkillPlugin } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { uninstallSkillPlugin } = await import("./skillMarketplace-VA7VL5D5.js");
       const result = uninstallSkillPlugin(plugin, {
         project: options.project === true
       });
@@ -2784,7 +2810,7 @@ ${skillList}`);
   });
   skillsCmd.command("list-installed").description("List installed skill plugins").action(async () => {
     try {
-      const { listInstalledSkillPlugins } = await import("./skillMarketplace-CAGSV3Z6.js");
+      const { listInstalledSkillPlugins } = await import("./skillMarketplace-VA7VL5D5.js");
       console.log(JSON.stringify(listInstalledSkillPlugins(), null, 2));
       process.exit(0);
     } catch (error) {
@@ -3430,7 +3456,7 @@ ${skillList}`);
       const ink = await import("ink");
       const reactModule = await import("react");
       const inkjsui = await import("@inkjs/ui");
-      const utilsTheme = await import("./theme-DYILR2QC.js");
+      const utilsTheme = await import("./theme-GZQWHNWP.js");
       const { render: render3 } = ink;
       const React11 = reactModule;
       const { MultiSelect: MultiSelect2 } = inkjsui;
@@ -3570,12 +3596,11 @@ ${skillList}`);
   const lsp = program.command("lsp").description("LSP debug utilities");
   lsp.command("diagnostics <file>").description("Show diagnostics for a file").option("--cwd <cwd>", "The current working directory", String, cwd()).option("--max-items <count>", "Max diagnostics to show", Number).option("--wait", "Wait for fresh diagnostics", () => true).option("--timeout <ms>", "Timeout in milliseconds for waiting", Number).action(async (file, options) => {
     try {
-      const commandOptions = options && typeof options === "object" && typeof options.opts === "function" ? options.opts() : options;
-      const programCwd = program.opts().cwd;
-      const workingDir = typeof commandOptions?.cwd === "string" ? commandOptions.cwd : typeof programCwd === "string" ? programCwd : cwd();
+      const commandOptions = getCommandOptions(options);
+      const workingDir = resolveWorkingDir(commandOptions, program);
       await setup(workingDir, false);
-      const { getAbsolutePath } = await import("./file-VRVRLDK2.js");
-      const { LspFacade } = await import("./lsp-4GTQX6SE.js");
+      const { getAbsolutePath } = await import("./file-HC4EKI7Z.js");
+      const { LspFacade } = await import("./lsp-Y5UUXXVU.js");
       const { existsSync: existsSync2 } = await import("fs");
       const absPath = getAbsolutePath(file) ?? file;
       if (!existsSync2(absPath)) {
@@ -3604,11 +3629,9 @@ ${skillList}`);
   });
   lsp.command("symbols <query>").description("Search workspace symbols by query").option("--cwd <cwd>", "The current working directory", String, cwd()).action(async (query, options) => {
     try {
-      const commandOptions = options && typeof options === "object" && typeof options.opts === "function" ? options.opts() : options;
-      const programCwd = program.opts().cwd;
-      const workingDir = typeof commandOptions?.cwd === "string" ? commandOptions.cwd : typeof programCwd === "string" ? programCwd : cwd();
+      const workingDir = resolveWorkingDir(options, program);
       await setup(workingDir, false);
-      const { LspFacade } = await import("./lsp-4GTQX6SE.js");
+      const { LspFacade } = await import("./lsp-Y5UUXXVU.js");
       const result = await LspFacade.run({
         operation: "workspaceSymbol",
         filePath: query,
@@ -3623,12 +3646,10 @@ ${skillList}`);
   });
   lsp.command("document-symbols <file>").description("Show document symbols for a file").option("--cwd <cwd>", "The current working directory", String, cwd()).action(async (file, options) => {
     try {
-      const commandOptions = options && typeof options === "object" && typeof options.opts === "function" ? options.opts() : options;
-      const programCwd = program.opts().cwd;
-      const workingDir = typeof commandOptions?.cwd === "string" ? commandOptions.cwd : typeof programCwd === "string" ? programCwd : cwd();
+      const workingDir = resolveWorkingDir(options, program);
       await setup(workingDir, false);
-      const { getAbsolutePath } = await import("./file-VRVRLDK2.js");
-      const { LspFacade } = await import("./lsp-4GTQX6SE.js");
+      const { getAbsolutePath } = await import("./file-HC4EKI7Z.js");
+      const { LspFacade } = await import("./lsp-Y5UUXXVU.js");
       const { existsSync: existsSync2 } = await import("fs");
       const absPath = getAbsolutePath(file) ?? file;
       if (!existsSync2(absPath)) {
@@ -3649,11 +3670,9 @@ ${skillList}`);
   });
   lsp.command("status").description("Show aggregated LSP client status").option("--cwd <cwd>", "The current working directory", String, cwd()).action(async (options) => {
     try {
-      const commandOptions = options && typeof options === "object" && typeof options.opts === "function" ? options.opts() : options;
-      const programCwd = program.opts().cwd;
-      const workingDir = typeof commandOptions?.cwd === "string" ? commandOptions.cwd : typeof programCwd === "string" ? programCwd : cwd();
+      const workingDir = resolveWorkingDir(options, program);
       await setup(workingDir, false);
-      const { LspFacade } = await import("./lsp-4GTQX6SE.js");
+      const { LspFacade } = await import("./lsp-Y5UUXXVU.js");
       const status = LspFacade.status();
       console.log(JSON.stringify(status, null, 2));
       process.exit(0);
@@ -3664,11 +3683,10 @@ ${skillList}`);
   });
   lsp.command("status-server").description("Serve LSP status over HTTP").option("--cwd <cwd>", "The current working directory", String, cwd()).option("--host <host>", "Host to bind", String, "127.0.0.1").option("--port <port>", "Port to bind", Number, 7337).action(async (options) => {
     try {
-      const commandOptions = options && typeof options === "object" && typeof options.opts === "function" ? options.opts() : options;
-      const programCwd = program.opts().cwd;
-      const workingDir = typeof commandOptions?.cwd === "string" ? commandOptions.cwd : typeof programCwd === "string" ? programCwd : cwd();
+      const commandOptions = getCommandOptions(options);
+      const workingDir = resolveWorkingDir(commandOptions, program);
       await setup(workingDir, false);
-      const { LspFacade } = await import("./lsp-4GTQX6SE.js");
+      const { LspFacade } = await import("./lsp-Y5UUXXVU.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 });
@@ -3694,7 +3712,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-R4EXAJ7P.js");
+    const { getLatestVersion, getUpdateCommandSuggestions } = await import("./autoUpdater-JB2N6XSK.js");
     const latestVersion = await getLatestVersion();
     if (!latestVersion) {
       console.error("Failed to check for updates");
@@ -3749,8 +3767,8 @@ ${skillList}`);
       await setup(cwd2, safe);
       assertMinVersion();
       const [{ getTools }, { getCommands }] = await Promise.all([
-        import("./tools-M4GJRWEU.js"),
-        import("./commands-YV373ZFU.js")
+        import("./tools-EVR75R24.js"),
+        import("./commands-AAP4MYTL.js")
       ]);
       const [allTools, commands, mcpClients] = await Promise.all([
         getTools(
@@ -3761,8 +3779,8 @@ ${skillList}`);
       ]);
       const tools = disableSlashCommands === true ? allTools.filter((t) => t.name !== "SlashCommand") : allTools;
       if (identifier !== void 0) {
-        const { loadPybAgentSessionMessages } = await import("./pybAgentSessionLoad-YI2EVD6F.js");
-        const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-VJIKNW7O.js");
+        const { loadPybAgentSessionMessages } = await import("./pybAgentSessionLoad-QZIINLCD.js");
+        const { listPybAgentSessions, resolvePybResumeSessionIdentifier } = await import("./pybAgentSessionResume-3XND5AZG.js");
         const { setPybAgentSessionId } = await import("./pybAgentSessionId-EPCAMQ25.js");
         const rawIdentifier = String(identifier).trim();
         const isLegacyNumber = /^-?\\d+$/.test(rawIdentifier);
@@ -3832,7 +3850,7 @@ ${skillList}`);
           const isDefaultModel = await isDefaultSlowAndCapableModel();
           {
             const { render: render3 } = await import("ink");
-            const { REPL } = await import("./REPL-3X2W4SUH.js");
+            const { REPL } = await import("./REPL-2HTMFGA5.js");
             render3(
               /* @__PURE__ */ React10.createElement(
                 REPL,
@@ -3859,7 +3877,7 @@ ${skillList}`);
           process.exit(1);
         }
       } else {
-        const { listPybAgentSessions } = await import("./pybAgentSessionResume-VJIKNW7O.js");
+        const { listPybAgentSessions } = await import("./pybAgentSessionResume-3XND5AZG.js");
         const sessions = listPybAgentSessions({ cwd: cwd2 });
         if (sessions.length === 0) {
           console.error("No conversation found to resume");
@@ -3964,7 +3982,7 @@ async function gracefulExit(code = 0) {
   }
   isGracefulExitInProgress = true;
   try {
-    const { runSessionEndHooks } = await import("./pybHooks-U24NOHX7.js");
+    const { runSessionEndHooks } = await import("./pybHooks-J3KPSFJI.js");
     const { getPybAgentSessionId } = await import("./pybAgentSessionId-EPCAMQ25.js");
     const { tmpdir } = await import("os");
     const { join: join2 } = await import("path");