newcraw 1.0.2 → 1.0.4

package/dist/chunk-ARCEUG3V.js

@@ -0,0 +1,88 @@
+import { createRequire as __newcrawCreateRequire } from "node:module";
+const require = __newcrawCreateRequire(import.meta.url);
+
+// src/core/queryOptionsFactory.ts
+async function createQueryOptions(opts) {
+  const [
+    { getCommands },
+    { getTools },
+    { getClients },
+    { getMaxThinkingTokens },
+    { getLastAssistantMessageId },
+    { getToolPermissionContextForConversationKey }
+  ] = await Promise.all([
+    import("./commands-JSY7CGSU.js"),
+    import("./tools-7FVKB7BG.js"),
+    import("./mcp-DUYSIR5L.js"),
+    import("./thinking-TTNUZUB3.js"),
+    import("./messages-23ICFVMC.js"),
+    import("./toolPermissionContextState-R6ZGMKP6.js")
+  ]);
+  const mcpClientsPromise = opts.mcpClients ? Promise.resolve(opts.mcpClients) : getClients();
+  const [commands, tools, mcpClients, maxThinkingTokens] = await Promise.all([
+    getCommands(),
+    getTools(),
+    mcpClientsPromise,
+    getMaxThinkingTokens(opts.messages)
+  ]);
+  return {
+    options: {
+      commands,
+      tools,
+      mcpClients,
+      verbose: opts.verbose ?? false,
+      safeMode: opts.safeMode ?? false,
+      forkNumber: opts.forkNumber ?? 0,
+      messageLogName: opts.messageLogName,
+      maxThinkingTokens,
+      persistSession: opts.persistSession,
+      toolPermissionContext: getToolPermissionContextForConversationKey({
+        conversationKey: `${opts.messageLogName}:${opts.forkNumber ?? 0}`,
+        isBypassPermissionsModeAvailable: !(opts.safeMode ?? false)
+      })
+    },
+    messageId: getLastAssistantMessageId(opts.messages),
+    readFileTimestamps: {},
+    setToolJSX: (() => {
+    })
+  };
+}
+
+// src/core/skillMatcher.ts
+async function matchSkillForPrompt(userPrompt) {
+  let skills;
+  try {
+    const { loadCustomCommands } = await import("./customCommands-XCINU5TG.js");
+    const all = await loadCustomCommands();
+    skills = all.filter(
+      (cmd) => cmd.type === "prompt" && cmd.disableModelInvocation !== true && (cmd.hasUserSpecifiedDescription || cmd.whenToUse)
+    );
+  } catch {
+    return null;
+  }
+  if (skills.length === 0) return null;
+  const promptLower = userPrompt.toLowerCase();
+  for (const skill of skills) {
+    const triggers = skill.whenToUse;
+    if (!triggers) continue;
+    const keywords = triggers.split(/[,;|，；、\n]+/).map((k) => k.trim().toLowerCase()).filter((k) => k.length >= 2);
+    for (const kw of keywords) {
+      if (promptLower.includes(kw)) {
+        return {
+          skillName: skill.userFacingName?.() ?? skill.name,
+          description: skill.description ?? ""
+        };
+      }
+    }
+  }
+  return null;
+}
+function buildSkillMatchDirective(match) {
+  return `[\u26A1 \u6280\u80FD\u5339\u914D] \u68C0\u6D4B\u5230\u7528\u6237\u8BF7\u6C42\u5339\u914D\u5DF2\u5B89\u88C5\u6280\u80FD"${match.skillName}"\uFF08${match.description}\uFF09\u3002\u4F60\u5FC5\u987B\u5C06 Skill("${match.skillName}") \u4F5C\u4E3A\u7B2C\u4E00\u4E2A\u5DE5\u5177\u8C03\u7528\uFF0C\u5728\u6B64\u4E4B\u524D\u4E0D\u5F97\u8C03\u7528\u4EFB\u4F55\u5176\u4ED6\u5DE5\u5177\uFF08\u5305\u62EC WebSearch\u3001WebFetch\u3001Bash \u7B49\uFF09\u3002\u8FD9\u662F\u5F3A\u5236\u8981\u6C42\u3002`;
+}
+
+export {
+  createQueryOptions,
+  matchSkillForPrompt,
+  buildSkillMatchDirective
+};

package/dist/chunk-ARCEUG3V.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/core/queryOptionsFactory.ts", "../src/core/skillMatcher.ts"],
+  "sourcesContent": ["import type { Message } from '@query'\r\nimport type { WrappedClient } from '@services/mcp'\r\n\r\nexport interface SmartQueryOptions {\r\n  messages: Message[]\r\n  safeMode?: boolean\r\n  messageLogName: string\r\n  verbose?: boolean\r\n  mcpClients?: WrappedClient[]\r\n  forkNumber?: number\r\n  persistSession?: boolean\r\n}\r\n\r\nexport async function createQueryOptions(opts: SmartQueryOptions) {\r\n  const [\r\n    { getCommands },\r\n    { getTools },\r\n    { getClients },\r\n    { getMaxThinkingTokens },\r\n    { getLastAssistantMessageId },\r\n    { getToolPermissionContextForConversationKey },\r\n  ] = await Promise.all([\r\n    import('@commands'),\r\n    import('@tools'),\r\n    import('@services/mcp'),\r\n    import('@utils/model/thinking'),\r\n    import('@utils/messages'),\r\n    import('@utils/permissions/toolPermissionContextState'),\r\n  ])\r\n\r\n  const mcpClientsPromise = opts.mcpClients\r\n    ? Promise.resolve(opts.mcpClients)\r\n    : getClients()\r\n\r\n  const [commands, tools, mcpClients, maxThinkingTokens] = await Promise.all([\r\n    getCommands(),\r\n    getTools(),\r\n    mcpClientsPromise,\r\n    getMaxThinkingTokens(opts.messages),\r\n  ])\r\n\r\n  return {\r\n    options: {\r\n      commands,\r\n      tools,\r\n      mcpClients,\r\n      verbose: opts.verbose ?? false,\r\n      safeMode: opts.safeMode ?? false,\r\n      forkNumber: opts.forkNumber ?? 0,\r\n      messageLogName: opts.messageLogName,\r\n      maxThinkingTokens,\r\n      persistSession: opts.persistSession,\r\n      toolPermissionContext: getToolPermissionContextForConversationKey({\r\n        conversationKey: `${opts.messageLogName}:${opts.forkNumber ?? 0}`,\r\n        isBypassPermissionsModeAvailable: !(opts.safeMode ?? false),\r\n      }),\r\n    },\r\n    messageId: getLastAssistantMessageId(opts.messages),\r\n    readFileTimestamps: {} as Record<string, number>,\r\n    setToolJSX: (() => {}) as (jsx: any) => void,\r\n  }\r\n}\r\n", "import type { CustomCommandWithScope } from '@services/customCommands'\r\n\r\nexport interface SkillMatch {\r\n  skillName: string\r\n  description: string\r\n}\r\n\r\n/**\r\n * Programmatically checks if the user's prompt matches any installed skill's\r\n * trigger keywords (whenToUse). Returns the first match, or null.\r\n *\r\n * This runs BEFORE the LLM sees the message, so skill priority is code-enforced\r\n * rather than relying on the model following prompt instructions.\r\n */\r\nexport async function matchSkillForPrompt(\r\n  userPrompt: string,\r\n): Promise<SkillMatch | null> {\r\n  let skills: CustomCommandWithScope[]\r\n  try {\r\n    const { loadCustomCommands } = await import('@services/customCommands')\r\n    const all = await loadCustomCommands()\r\n    skills = all.filter(\r\n      cmd =>\r\n        cmd.type === 'prompt' &&\r\n        cmd.disableModelInvocation !== true &&\r\n        (cmd.hasUserSpecifiedDescription || cmd.whenToUse),\r\n    )\r\n  } catch {\r\n    return null\r\n  }\r\n\r\n  if (skills.length === 0) return null\r\n\r\n  const promptLower = userPrompt.toLowerCase()\r\n\r\n  for (const skill of skills) {\r\n    const triggers = skill.whenToUse\r\n    if (!triggers) continue\r\n\r\n    const keywords = triggers\r\n      .split(/[,;|\uFF0C\uFF1B\u3001\\n]+/)\r\n      .map(k => k.trim().toLowerCase())\r\n      .filter(k => k.length >= 2)\r\n\r\n    for (const kw of keywords) {\r\n      if (promptLower.includes(kw)) {\r\n        return {\r\n          skillName: skill.userFacingName?.() ?? skill.name,\r\n          description: skill.description ?? '',\r\n        }\r\n      }\r\n    }\r\n  }\r\n\r\n  return null\r\n}\r\n\r\nexport function buildSkillMatchDirective(match: SkillMatch): string {\r\n  return `[\u26A1 \u6280\u80FD\u5339\u914D] \u68C0\u6D4B\u5230\u7528\u6237\u8BF7\u6C42\u5339\u914D\u5DF2\u5B89\u88C5\u6280\u80FD\"${match.skillName}\"\uFF08${match.description}\uFF09\u3002\u4F60\u5FC5\u987B\u5C06 Skill(\"${match.skillName}\") \u4F5C\u4E3A\u7B2C\u4E00\u4E2A\u5DE5\u5177\u8C03\u7528\uFF0C\u5728\u6B64\u4E4B\u524D\u4E0D\u5F97\u8C03\u7528\u4EFB\u4F55\u5176\u4ED6\u5DE5\u5177\uFF08\u5305\u62EC WebSearch\u3001WebFetch\u3001Bash \u7B49\uFF09\u3002\u8FD9\u662F\u5F3A\u5236\u8981\u6C42\u3002`\r\n}\r\n"],
+  "mappings": ";;;;AAaA,eAAsB,mBAAmB,MAAyB;AAChE,QAAM;AAAA,IACJ,EAAE,YAAY;AAAA,IACd,EAAE,SAAS;AAAA,IACX,EAAE,WAAW;AAAA,IACb,EAAE,qBAAqB;AAAA,IACvB,EAAE,0BAA0B;AAAA,IAC5B,EAAE,2CAA2C;AAAA,EAC/C,IAAI,MAAM,QAAQ,IAAI;AAAA,IACpB,OAAO,wBAAW;AAAA,IAClB,OAAO,qBAAQ;AAAA,IACf,OAAO,mBAAe;AAAA,IACtB,OAAO,wBAAuB;AAAA,IAC9B,OAAO,wBAAiB;AAAA,IACxB,OAAO,0CAA+C;AAAA,EACxD,CAAC;AAED,QAAM,oBAAoB,KAAK,aAC3B,QAAQ,QAAQ,KAAK,UAAU,IAC/B,WAAW;AAEf,QAAM,CAAC,UAAU,OAAO,YAAY,iBAAiB,IAAI,MAAM,QAAQ,IAAI;AAAA,IACzE,YAAY;AAAA,IACZ,SAAS;AAAA,IACT;AAAA,IACA,qBAAqB,KAAK,QAAQ;AAAA,EACpC,CAAC;AAED,SAAO;AAAA,IACL,SAAS;AAAA,MACP;AAAA,MACA;AAAA,MACA;AAAA,MACA,SAAS,KAAK,WAAW;AAAA,MACzB,UAAU,KAAK,YAAY;AAAA,MAC3B,YAAY,KAAK,cAAc;AAAA,MAC/B,gBAAgB,KAAK;AAAA,MACrB;AAAA,MACA,gBAAgB,KAAK;AAAA,MACrB,uBAAuB,2CAA2C;AAAA,QAChE,iBAAiB,GAAG,KAAK,cAAc,IAAI,KAAK,cAAc,CAAC;AAAA,QAC/D,kCAAkC,EAAE,KAAK,YAAY;AAAA,MACvD,CAAC;AAAA,IACH;AAAA,IACA,WAAW,0BAA0B,KAAK,QAAQ;AAAA,IAClD,oBAAoB,CAAC;AAAA,IACrB,aAAa,MAAM;AAAA,IAAC;AAAA,EACtB;AACF;;;AC/CA,eAAsB,oBACpB,YAC4B;AAC5B,MAAI;AACJ,MAAI;AACF,UAAM,EAAE,mBAAmB,IAAI,MAAM,OAAO,8BAA0B;AACtE,UAAM,MAAM,MAAM,mBAAmB;AACrC,aAAS,IAAI;AAAA,MACX,SACE,IAAI,SAAS,YACb,IAAI,2BAA2B,SAC9B,IAAI,+BAA+B,IAAI;AAAA,IAC5C;AAAA,EACF,QAAQ;AACN,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,WAAW,EAAG,QAAO;AAEhC,QAAM,cAAc,WAAW,YAAY;AAE3C,aAAW,SAAS,QAAQ;AAC1B,UAAM,WAAW,MAAM;AACvB,QAAI,CAAC,SAAU;AAEf,UAAM,WAAW,SACd,MAAM,aAAa,EACnB,IAAI,OAAK,EAAE,KAAK,EAAE,YAAY,CAAC,EAC/B,OAAO,OAAK,EAAE,UAAU,CAAC;AAE5B,eAAW,MAAM,UAAU;AACzB,UAAI,YAAY,SAAS,EAAE,GAAG;AAC5B,eAAO;AAAA,UACL,WAAW,MAAM,iBAAiB,KAAK,MAAM;AAAA,UAC7C,aAAa,MAAM,eAAe;AAAA,QACpC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,yBAAyB,OAA2B;AAClE,SAAO,0HAA2B,MAAM,SAAS,UAAK,MAAM,WAAW,+CAAiB,MAAM,SAAS;AACzG;",
+  "names": []
+}

package/dist/{chunk-RUXIBQ3B.js → chunk-BJYXLCRS.js}

@@ -3,7 +3,7 @@ const require = __newcrawCreateRequire(import.meta.url);
 
 // src/services/ai/llmLazy.ts
 async function queryLLM(messages, systemPrompt, maxThinkingTokens, tools, signal, options) {
-  const { queryLLM: inner } = await import("./llm-CYUDKJNR.js");
+  const { queryLLM: inner } = await import("./llm-OJZ6DZVC.js");
   return inner(
     messages,
     systemPrompt,
@@ -14,15 +14,15 @@ async function queryLLM(messages, systemPrompt, maxThinkingTokens, tools, signal
   );
 }
 async function queryQuick(args) {
-  const { queryQuick: inner } = await import("./llm-CYUDKJNR.js");
+  const { queryQuick: inner } = await import("./llm-OJZ6DZVC.js");
   return inner(args);
 }
 async function verifyApiKey(apiKey, baseURL, provider) {
-  const { verifyApiKey: inner } = await import("./llm-CYUDKJNR.js");
+  const { verifyApiKey: inner } = await import("./llm-OJZ6DZVC.js");
   return inner(apiKey, baseURL, provider);
 }
 async function fetchAnthropicModels(apiKey, baseURL) {
-  const { fetchAnthropicModels: inner } = await import("./llm-CYUDKJNR.js");
+  const { fetchAnthropicModels: inner } = await import("./llm-OJZ6DZVC.js");
   return inner(apiKey, baseURL);
 }
 

package/dist/{chunk-VKI7ORIO.js → chunk-BMKE6FT5.js}

@@ -22,59 +22,69 @@ import {
   countTokens,
   getAbsolutePath,
   getAgentPrompt,
-  getMaxThinkingTokens,
   hasPermissionsToUseTool,
-  hasReadPermission,
   query
-} from "./chunk-OJIMOLIC.js";
+} from "./chunk-3CKC4ABU.js";
+import {
+  hasReadPermission
+} from "./chunk-Q2OBTLBI.js";
+import {
+  getMaxThinkingTokens
+} from "./chunk-MMF5RMLU.js";
+import {
+  queryLLM
+} from "./chunk-BJYXLCRS.js";
 import {
   FallbackToolUseRejectedMessage,
   MCPTool,
   getClients,
   getMCPTools
-} from "./chunk-WWDVA4NV.js";
-import {
-  queryLLM
-} from "./chunk-RUXIBQ3B.js";
+} from "./chunk-QJ7MQIHN.js";
 import {
   generateAgentId
-} from "./chunk-UYRR6F5S.js";
+} from "./chunk-FIMCETCB.js";
 import {
   getActiveAgents,
   getAgentByType,
   getAvailableAgentTypes
-} from "./chunk-LOIZNQOU.js";
+} from "./chunk-ZM5FMRLS.js";
 import {
   INTERRUPT_MESSAGE,
   createAssistantMessage,
   createUserMessage,
   getLastAssistantMessageId
-} from "./chunk-A7X6OCZE.js";
+} from "./chunk-IXFBUXQW.js";
 import {
-  getModelManager
-} from "./chunk-F3COCCAE.js";
+  getModelManager,
+  init_model
+} from "./chunk-QX5Y5CE5.js";
 import {
   getContext
-} from "./chunk-53A4JHFW.js";
+} from "./chunk-MJ3MLGVB.js";
 import {
   getTheme
-} from "./chunk-DEF3KFP7.js";
+} from "./chunk-GVLJUD6R.js";
 import {
-  debug
-} from "./chunk-GZTCXXSS.js";
+  debug,
+  init_debugLogger
+} from "./chunk-QT5GS374.js";
 import {
   BunShell,
   getCwd,
   getMessagesPath,
   getNextAvailableLogSidechainNumber,
+  init_log,
+  init_shell,
+  init_state,
+  init_taskOutputStore,
   logError,
   overwriteLog,
   readTaskOutput
-} from "./chunk-IM33F5CM.js";
+} from "./chunk-XYQZLDRB.js";
 import {
   formatDuration,
   formatNumber
-} from "./chunk-755HIAI3.js";
+} from "./chunk-HLBLZKZH.js";
 
 // src/tools/index.ts
 import { memoize as memoize2 } from "lodash-es";
@@ -83,8 +93,12 @@ import { memoize as memoize2 } from "lodash-es";
 import * as React from "react";
 import { Box, Text } from "ink";
 import { z } from "zod";
+init_model();
+init_log();
 
 // src/utils/session/expertChatStorage.ts
+init_debugLogger();
+init_log();
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
@@ -158,6 +172,7 @@ function getSessionMessages(sessionId) {
 }
 
 // src/tools/ai/AskExpertModelTool/AskExpertModelTool.tsx
+init_debugLogger();
 var inputSchema = z.strictObject({
   question: z.string().describe(
     "COMPLETE SELF-CONTAINED QUESTION: Must include full background context, relevant details, and a clear independent question. The expert model will receive ONLY this content with no access to previous conversation or external context. Structure as: 1) Background/Context 2) Specific situation/problem 3) Clear question. Ensure the expert can fully understand and respond without needing additional information."
@@ -545,6 +560,7 @@ Please check your model configuration with /model command.`
 };
 
 // src/tools/system/TaskOutputTool/TaskOutputTool.tsx
+init_shell();
 import { Box as Box2, Text as Text2 } from "ink";
 import React2 from "react";
 import { z as z2 } from "zod";
@@ -673,6 +689,7 @@ var PROMPT = `- Retrieves output from a running or completed task (background sh
 - Works with all task types: background shells, async agents, and remote sessions`;
 
 // src/tools/system/TaskOutputTool/TaskOutputTool.tsx
+init_taskOutputStore();
 var inputSchema2 = z2.strictObject({
   task_id: z2.string().describe("The task ID to get output from"),
   block: z2.boolean().optional().default(true).describe("Whether to wait for completion"),
@@ -1021,6 +1038,7 @@ var ListMcpResourcesTool = {
 };
 
 // src/tools/search/LspTool/LspTool.tsx
+init_state();
 import { existsSync as existsSync2, readFileSync as readFileSync2, statSync } from "fs";
 import { Box as Box4, Text as Text4 } from "ink";
 import { createRequire } from "node:module";
@@ -1877,6 +1895,7 @@ import { Box as Box6, Text as Text6 } from "ink";
 import { z as z6 } from "zod";
 import { randomUUID as randomUUID2 } from "crypto";
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+init_log();
 
 // src/utils/agent/transcripts.ts
 var transcripts = /* @__PURE__ */ new Map();