pybao-cli 1.5.43 → 1.5.45

package/dist/{ask-QYJE6B5E.js.map → ask-BH7SPGEV.js.map}

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../src/app/ask.ts"],
   "sourcesContent": ["import { last } from 'lodash-es'\nimport { Command } from '@commands'\nimport { getSystemPrompt } from '@constants/prompts'\nimport { getContext } from '@context'\nimport { getTotalCost } from '@costTracker'\nimport { Message, query } from '@query'\nimport type { CanUseToolFn } from '@pyb-types/canUseTool'\nimport { Tool } from '@tool'\nimport { getModelManager } from '@utils/model'\nimport { setCwd } from '@utils/state'\nimport { getMessagesPath, overwriteLog } from '@utils/log'\nimport { createUserTurnMessageFromBlocks } from '@utils/messages'\nimport { ConversationTracker } from '@utils/session/conversationTracker'\nimport { FileSystemConversationPersistence } from '@utils/session/conversationPersistence'\nimport { beginReplSessionScope } from '@utils/session/replSessionBridge'\nimport { resolveXdgDataPath } from '@utils/config/env'\nimport { createConversationTrackerPersistenceTelemetryEmitter } from '@services/telemetry/conversationTrackerTelemetry'\nimport { join } from 'path'\n\ntype Props = {\n  commands: Command[]\n  safeMode?: boolean\n  hasPermissionsToUseTool: CanUseToolFn\n  messageLogName: string\n  prompt: string\n  cwd: string\n  tools: Tool[]\n  verbose?: boolean\n  initialMessages?: Message[]\n  persistSession?: boolean\n}\n\nfunction getProjectDirSlug(cwd: string): string {\n  return cwd.replace(/[^a-zA-Z0-9]/g, '-')\n}\n\nfunction getConversationTrackerPersistenceDir(cwd: string): string {\n  return resolveXdgDataPath(join(getProjectDirSlug(cwd), 'conversation-trackers'))\n}\n\nexport async function ask({\n  commands,\n  safeMode,\n  hasPermissionsToUseTool,\n  messageLogName,\n  prompt,\n  cwd,\n  tools,\n  verbose = false,\n  initialMessages,\n  persistSession = true,\n}: Props): Promise<{\n  resultText: string\n  totalCost: number\n  messageHistoryFile: string\n}> {\n  await setCwd(cwd)\n  const trackerSessionId = `ask:${messageLogName}:0`\n  const trackerPersistenceMode = 'required'\n  const restoreSessionScope = beginReplSessionScope(trackerSessionId)\n  const conversationTracker = new ConversationTracker({\n    sessionId: trackerSessionId,\n    persistence: new FileSystemConversationPersistence(\n      getConversationTrackerPersistenceDir(cwd),\n    ),\n    persistenceMode: trackerPersistenceMode,\n    onPersistenceEvent: createConversationTrackerPersistenceTelemetryEmitter('ask'),\n  })\n  conversationTracker.restore()\n  const message = createUserTurnMessageFromBlocks([{ type: 'text', text: prompt }])\n  const messages: Message[] = [...(initialMessages ?? []), message]\n\n  const [systemPrompt, context, model] = await Promise.all([\n    getSystemPrompt(),\n    getContext(),\n    getModelManager().getModelName('main'),\n  ])\n\n  try {\n    for await (const m of query(\n      messages,\n      systemPrompt,\n      context,\n      hasPermissionsToUseTool,\n      {\n        options: {\n          commands,\n          tools,\n          verbose,\n          safeMode,\n          forkNumber: 0,\n          messageLogName: 'unused',\n          maxThinkingTokens: 0,\n          persistSession,\n        },\n        abortController: new AbortController(),\n        messageId: undefined,\n        readFileTimestamps: {},\n        setToolJSX: () => {},\n        conversationTracker,\n      },\n    )) {\n      messages.push(m)\n    }\n  } finally {\n    restoreSessionScope()\n  }\n\n  const result = last(messages)\n  if (!result || result.type !== 'assistant') {\n    throw new Error('Expected content to be an assistant message')\n  }\n\n  const textContent = result.message.content.find(c => c.type === 'text')\n  if (!textContent) {\n    throw new Error(\n      `Expected at least one text content item, but got ${JSON.stringify(\n        result.message.content,\n        null,\n        2,\n      )}`,\n    )\n  }\n\n  const messageHistoryFile = getMessagesPath(messageLogName, 0, 0)\n  overwriteLog(messageHistoryFile, messages)\n\n  return {\n    resultText: textContent.text,\n    totalCost: getTotalCost(),\n    messageHistoryFile,\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,YAAY;AAiBrB,SAAS,YAAY;AAerB,SAAS,kBAAkB,KAAqB;AAC9C,SAAO,IAAI,QAAQ,iBAAiB,GAAG;AACzC;AAEA,SAAS,qCAAqC,KAAqB;AACjE,SAAO,mBAAmB,KAAK,kBAAkB,GAAG,GAAG,uBAAuB,CAAC;AACjF;AAEA,eAAsB,IAAI;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,UAAU;AAAA,EACV;AAAA,EACA,iBAAiB;AACnB,GAIG;AACD,QAAM,OAAO,GAAG;AAChB,QAAM,mBAAmB,OAAO,cAAc;AAC9C,QAAM,yBAAyB;AAC/B,QAAM,sBAAsB,sBAAsB,gBAAgB;AAClE,QAAM,sBAAsB,IAAI,oBAAoB;AAAA,IAClD,WAAW;AAAA,IACX,aAAa,IAAI;AAAA,MACf,qCAAqC,GAAG;AAAA,IAC1C;AAAA,IACA,iBAAiB;AAAA,IACjB,oBAAoB,qDAAqD,KAAK;AAAA,EAChF,CAAC;AACD,sBAAoB,QAAQ;AAC5B,QAAM,UAAU,gCAAgC,CAAC,EAAE,MAAM,QAAQ,MAAM,OAAO,CAAC,CAAC;AAChF,QAAM,WAAsB,CAAC,GAAI,mBAAmB,CAAC,GAAI,OAAO;AAEhE,QAAM,CAAC,cAAc,SAAS,KAAK,IAAI,MAAM,QAAQ,IAAI;AAAA,IACvD,gBAAgB;AAAA,IAChB,WAAW;AAAA,IACX,gBAAgB,EAAE,aAAa,MAAM;AAAA,EACvC,CAAC;AAED,MAAI;AACF,qBAAiB,KAAK;AAAA,MACpB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,QACE,SAAS;AAAA,UACP;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,YAAY;AAAA,UACZ,gBAAgB;AAAA,UAChB,mBAAmB;AAAA,UACnB;AAAA,QACF;AAAA,QACA,iBAAiB,IAAI,gBAAgB;AAAA,QACrC,WAAW;AAAA,QACX,oBAAoB,CAAC;AAAA,QACrB,YAAY,MAAM;AAAA,QAAC;AAAA,QACnB;AAAA,MACF;AAAA,IACF,GAAG;AACD,eAAS,KAAK,CAAC;AAAA,IACjB;AAAA,EACF,UAAE;AACA,wBAAoB;AAAA,EACtB;AAEA,QAAM,SAAS,KAAK,QAAQ;AAC5B,MAAI,CAAC,UAAU,OAAO,SAAS,aAAa;AAC1C,UAAM,IAAI,MAAM,6CAA6C;AAAA,EAC/D;AAEA,QAAM,cAAc,OAAO,QAAQ,QAAQ,KAAK,OAAK,EAAE,SAAS,MAAM;AACtE,MAAI,CAAC,aAAa;AAChB,UAAM,IAAI;AAAA,MACR,oDAAoD,KAAK;AAAA,QACvD,OAAO,QAAQ;AAAA,QACf;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AAEA,QAAM,qBAAqB,gBAAgB,gBAAgB,GAAG,CAAC;AAC/D,eAAa,oBAAoB,QAAQ;AAEzC,SAAO;AAAA,IACL,YAAY,YAAY;AAAA,IACxB,WAAW,aAAa;AAAA,IACxB;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,YAAY;AAiBrB,SAAS,YAAY;AAerB,SAAS,kBAAkB,KAAqB;AAC9C,SAAO,IAAI,QAAQ,iBAAiB,GAAG;AACzC;AAEA,SAAS,qCAAqC,KAAqB;AACjE,SAAO,mBAAmB,KAAK,kBAAkB,GAAG,GAAG,uBAAuB,CAAC;AACjF;AAEA,eAAsB,IAAI;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,UAAU;AAAA,EACV;AAAA,EACA,iBAAiB;AACnB,GAIG;AACD,QAAM,OAAO,GAAG;AAChB,QAAM,mBAAmB,OAAO,cAAc;AAC9C,QAAM,yBAAyB;AAC/B,QAAM,sBAAsB,sBAAsB,gBAAgB;AAClE,QAAM,sBAAsB,IAAI,oBAAoB;AAAA,IAClD,WAAW;AAAA,IACX,aAAa,IAAI;AAAA,MACf,qCAAqC,GAAG;AAAA,IAC1C;AAAA,IACA,iBAAiB;AAAA,IACjB,oBAAoB,qDAAqD,KAAK;AAAA,EAChF,CAAC;AACD,sBAAoB,QAAQ;AAC5B,QAAM,UAAU,gCAAgC,CAAC,EAAE,MAAM,QAAQ,MAAM,OAAO,CAAC,CAAC;AAChF,QAAM,WAAsB,CAAC,GAAI,mBAAmB,CAAC,GAAI,OAAO;AAEhE,QAAM,CAAC,cAAc,SAAS,KAAK,IAAI,MAAM,QAAQ,IAAI;AAAA,IACvD,gBAAgB;AAAA,IAChB,WAAW;AAAA,IACX,gBAAgB,EAAE,aAAa,MAAM;AAAA,EACvC,CAAC;AAED,MAAI;AACF,qBAAiB,KAAK;AAAA,MACpB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,QACE,SAAS;AAAA,UACP;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,YAAY;AAAA,UACZ,gBAAgB;AAAA,UAChB,mBAAmB;AAAA,UACnB;AAAA,QACF;AAAA,QACA,iBAAiB,IAAI,gBAAgB;AAAA,QACrC,WAAW;AAAA,QACX,oBAAoB,CAAC;AAAA,QACrB,YAAY,MAAM;AAAA,QAAC;AAAA,QACnB;AAAA,MACF;AAAA,IACF,GAAG;AACD,eAAS,KAAK,CAAC;AAAA,IACjB;AAAA,EACF,UAAE;AACA,wBAAoB;AAAA,EACtB;AAEA,QAAM,SAAS,KAAK,QAAQ;AAC5B,MAAI,CAAC,UAAU,OAAO,SAAS,aAAa;AAC1C,UAAM,IAAI,MAAM,6CAA6C;AAAA,EAC/D;AAEA,QAAM,cAAc,OAAO,QAAQ,QAAQ,KAAK,OAAK,EAAE,SAAS,MAAM;AACtE,MAAI,CAAC,aAAa;AAChB,UAAM,IAAI;AAAA,MACR,oDAAoD,KAAK;AAAA,QACvD,OAAO,QAAQ;AAAA,QACf;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AAEA,QAAM,qBAAqB,gBAAgB,gBAAgB,GAAG,CAAC;AAC/D,eAAa,oBAAoB,QAAQ;AAEzC,SAAO;AAAA,IACL,YAAY,YAAY;AAAA,IACxB,WAAW,aAAa;AAAA,IACxB;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/{autoUpdater-LAJDPNSA.js → autoUpdater-WQ7NSMS6.js}

@@ -5,9 +5,9 @@ import {
   checkAndNotifyUpdate,
   getLatestVersion,
   getUpdateCommandSuggestions
-} from "./chunk-QWWHPWOT.js";
-import "./chunk-WFZABDD5.js";
-import "./chunk-R473IZUI.js";
+} from "./chunk-FDU3LJPV.js";
+import "./chunk-HFEWWAXY.js";
+import "./chunk-T2V55G3O.js";
 import "./chunk-I3J4JYES.js";
 export {
   assertMinVersion,

package/dist/{chunk-IMTSYQJ5.js → chunk-2CFC3PYO.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-KFEHHKZ2.js";
 import {
   resolveXdgDataPath
-} from "./chunk-WFZABDD5.js";
+} from "./chunk-HFEWWAXY.js";
 
 // src/utils/session/sessionSqlStore.ts
 import { createRequire } from "node:module";

package/dist/chunk-2RXKUCFS.js

@@ -0,0 +1,56 @@
+import { createRequire as __pybCreateRequire } from "node:module";
+const require = __pybCreateRequire(import.meta.url);
+
+// src/lsp/errorCodes.ts
+var LSP_ERROR_CODES = {
+  LSP_UNAVAILABLE: {
+    category: "availability",
+    recoverable: true
+  },
+  LSP_TIMEOUT: {
+    category: "timeout",
+    recoverable: true
+  },
+  LSP_RUNTIME_ERROR: {
+    category: "runtime",
+    recoverable: true
+  }
+};
+
+// src/lsp/fallbackTelemetry.ts
+function toMessage(error) {
+  return String(error instanceof Error ? error.message : error);
+}
+function classifyLspToolFallbackError(error) {
+  const message = toMessage(error).toLowerCase();
+  if (message.includes("no lsp server") || message.includes("lsp unavailable") || message.includes("unable to initialize lsp")) {
+    return "LSP_UNAVAILABLE";
+  }
+  if (message.includes("timeout")) {
+    return "LSP_TIMEOUT";
+  }
+  return "LSP_RUNTIME_ERROR";
+}
+function toLspToolFallbackEvent(input) {
+  const message = toMessage(input.error);
+  const code = classifyLspToolFallbackError(input.error);
+  const codeInfo = LSP_ERROR_CODES[code];
+  return {
+    channel: "lsp",
+    phase: "LSP_TOOL_FALLBACK",
+    timestamp: input.timestamp ?? Date.now(),
+    data: {
+      tool: input.tool,
+      operation: input.operation,
+      code,
+      category: codeInfo.category,
+      message,
+      recoverable: input.recoverable ?? codeInfo.recoverable,
+      ...input.filePath ? { filePath: input.filePath } : {}
+    }
+  };
+}
+
+export {
+  toLspToolFallbackEvent
+};

package/dist/chunk-2RXKUCFS.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/lsp/errorCodes.ts", "../src/lsp/fallbackTelemetry.ts"],
+  "sourcesContent": ["export const LSP_ERROR_CODES = {\n  LSP_UNAVAILABLE: {\n    category: 'availability',\n    recoverable: true,\n  },\n  LSP_TIMEOUT: {\n    category: 'timeout',\n    recoverable: true,\n  },\n  LSP_RUNTIME_ERROR: {\n    category: 'runtime',\n    recoverable: true,\n  },\n} as const\n\nexport type LspErrorCode = keyof typeof LSP_ERROR_CODES\n\nexport function isKnownLspErrorCode(code: string): code is LspErrorCode {\n  return Object.prototype.hasOwnProperty.call(LSP_ERROR_CODES, code)\n}\n\n", "import { LSP_ERROR_CODES, type LspErrorCode } from './errorCodes'\n\nfunction toMessage(error: unknown): string {\n  return String(error instanceof Error ? error.message : error)\n}\n\nexport function classifyLspToolFallbackError(\n  error: unknown,\n): LspErrorCode {\n  const message = toMessage(error).toLowerCase()\n  if (\n    message.includes('no lsp server') ||\n    message.includes('lsp unavailable') ||\n    message.includes('unable to initialize lsp')\n  ) {\n    return 'LSP_UNAVAILABLE'\n  }\n  if (message.includes('timeout')) {\n    return 'LSP_TIMEOUT'\n  }\n  return 'LSP_RUNTIME_ERROR'\n}\n\nexport function toLspToolFallbackEvent(input: {\n  tool: 'FileEdit' | 'TaskOutput' | string\n  operation: string\n  error: unknown\n  filePath?: string\n  recoverable?: boolean\n  timestamp?: number\n}) {\n  const message = toMessage(input.error)\n  const code = classifyLspToolFallbackError(input.error)\n  const codeInfo = LSP_ERROR_CODES[code]\n  return {\n    channel: 'lsp',\n    phase: 'LSP_TOOL_FALLBACK',\n    timestamp: input.timestamp ?? Date.now(),\n    data: {\n      tool: input.tool,\n      operation: input.operation,\n      code,\n      category: codeInfo.category,\n      message,\n      recoverable: input.recoverable ?? codeInfo.recoverable,\n      ...(input.filePath ? { filePath: input.filePath } : {}),\n    },\n  }\n}\n"],
+  "mappings": ";;;;AAAO,IAAM,kBAAkB;AAAA,EAC7B,iBAAiB;AAAA,IACf,UAAU;AAAA,IACV,aAAa;AAAA,EACf;AAAA,EACA,aAAa;AAAA,IACX,UAAU;AAAA,IACV,aAAa;AAAA,EACf;AAAA,EACA,mBAAmB;AAAA,IACjB,UAAU;AAAA,IACV,aAAa;AAAA,EACf;AACF;;;ACXA,SAAS,UAAU,OAAwB;AACzC,SAAO,OAAO,iBAAiB,QAAQ,MAAM,UAAU,KAAK;AAC9D;AAEO,SAAS,6BACd,OACc;AACd,QAAM,UAAU,UAAU,KAAK,EAAE,YAAY;AAC7C,MACE,QAAQ,SAAS,eAAe,KAChC,QAAQ,SAAS,iBAAiB,KAClC,QAAQ,SAAS,0BAA0B,GAC3C;AACA,WAAO;AAAA,EACT;AACA,MAAI,QAAQ,SAAS,SAAS,GAAG;AAC/B,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAEO,SAAS,uBAAuB,OAOpC;AACD,QAAM,UAAU,UAAU,MAAM,KAAK;AACrC,QAAM,OAAO,6BAA6B,MAAM,KAAK;AACrD,QAAM,WAAW,gBAAgB,IAAI;AACrC,SAAO;AAAA,IACL,SAAS;AAAA,IACT,OAAO;AAAA,IACP,WAAW,MAAM,aAAa,KAAK,IAAI;AAAA,IACvC,MAAM;AAAA,MACJ,MAAM,MAAM;AAAA,MACZ,WAAW,MAAM;AAAA,MACjB;AAAA,MACA,UAAU,SAAS;AAAA,MACnB;AAAA,MACA,aAAa,MAAM,eAAe,SAAS;AAAA,MAC3C,GAAI,MAAM,WAAW,EAAE,UAAU,MAAM,SAAS,IAAI,CAAC;AAAA,IACvD;AAAA,EACF;AACF;",
+  "names": []
+}

package/dist/{chunk-BY5NKQMC.js → chunk-3V35SGQ7.js}

@@ -4,7 +4,7 @@ import {
   BunShell,
   execFileNoThrow,
   logError
-} from "./chunk-WFZABDD5.js";
+} from "./chunk-HFEWWAXY.js";
 
 // src/utils/system/ripgrep.ts
 import { findActualExecutable } from "spawn-rx";

package/dist/{chunk-6CJP4KDE.js → chunk-6TJCSOV3.js}

@@ -5,14 +5,14 @@ import {
 } from "./chunk-B6IMQJZM.js";
 import {
   loadSettingsWithLegacyFallback
-} from "./chunk-5HEO7RAF.js";
+} from "./chunk-BIRC5MFX.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
 import {
   getCwd,
   logError
-} from "./chunk-WFZABDD5.js";
+} from "./chunk-HFEWWAXY.js";
 
 // src/utils/session/pybHooks.ts
 import { spawn } from "child_process";
@@ -496,7 +496,7 @@ async function runPromptHook(args) {
     fallbackTimeoutMs: args.fallbackTimeoutMs
   });
   try {
-    const { queryQuick } = await import("./llmLazy-EG3IM7LV.js");
+    const { queryQuick } = await import("./llmLazy-6C5RDNID.js");
     const systemPrompt = [
       "You are executing a Pyb prompt hook.",
       "Return a single JSON object only (no markdown, no prose).",

package/dist/{chunk-O5YZTB5G.js → chunk-7BDU4UKY.js}

@@ -2,7 +2,7 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   getGlobalConfig
-} from "./chunk-3PDQTTHC.js";
+} from "./chunk-F6A7OSLF.js";
 
 // src/utils/theme/index.ts
 var lightTheme = {

package/dist/{chunk-UL4MJNFE.js → chunk-7XHORF4S.js}

@@ -2,7 +2,7 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   PERSISTENCE_VERSION
-} from "./chunk-UV4CROSJ.js";
+} from "./chunk-VHDLVHEI.js";
 
 // src/utils/session/conversationMessageState.ts
 function mapFinishReason(rawReason) {

package/dist/{chunk-2TSFRYBQ.js → chunk-A3E3KOP5.js}

@@ -4,17 +4,17 @@ import {
   LspServerRegistry,
   findNearestRoot,
   getInstallNotices
-} from "./chunk-HL57BCKA.js";
+} from "./chunk-BGT7XDPE.js";
 import {
   levenshtein
 } from "./chunk-UZ34JEUK.js";
 import {
   debug
-} from "./chunk-N22YCAOH.js";
+} from "./chunk-ZJJR2GKA.js";
 import {
   getCwd,
   getSessionRoot
-} from "./chunk-WFZABDD5.js";
+} from "./chunk-HFEWWAXY.js";
 
 // src/lsp/index.ts
 import { extname as extname2 } from "path";
@@ -565,7 +565,7 @@ var LspClientManager = class _LspClientManager {
     const safeCwd = /[^\x00-\x7F]/.test(resolvedRoot) ? process.cwd() : resolvedRoot;
     let initOpts = serverInfo.initializationOptions;
     if (serverInfo.id === "pyright" || serverInfo.id === "ty") {
-      const { detectPythonVenv } = await import("./registry-GQQQTCFQ.js");
+      const { detectPythonVenv } = await import("./registry-XAPOPN44.js");
       const pythonPath = detectPythonVenv(resolvedRoot);
       if (pythonPath) {
         initOpts = { ...initOpts ?? {}, pythonPath };
@@ -1606,7 +1606,10 @@ var parserCache = /* @__PURE__ */ new Map();
 var isInitialized = false;
 var resolveResourceDir = () => {
   const envDir = process.env.PYB_RESOURCE_DIR?.trim();
-  if (envDir) return envDir;
+  if (envDir) {
+    const absoluteEnvDir = path2.resolve(envDir);
+    return path2.basename(absoluteEnvDir) === "tree-sitter" ? absoluteEnvDir : path2.resolve(absoluteEnvDir, "tree-sitter");
+  }
   if (_dirname.includes("dist") || _dirname.includes("node_modules")) {
     return path2.resolve(_dirname, "../resources/tree-sitter");
   }