nolo-cli 0.8.0-alpha.14 → 0.8.0-alpha.19

package/{chunk-2IRF4LEX.js → chunk-4NDK6NWB.js}

@@ -1,3 +1,6 @@
+import {
+  resolveMachineId
+} from "./chunk-6HYVJV7B.js";
 import {
   createRunActivityTracker,
   finalizeRunRecord,
@@ -16,57 +19,50 @@ import {
   createCliCallAgentToolExecutor,
   createCliLocalRuntimeAdapter,
   isBuiltinNoloAgentRef
-} from "./chunk-EQHI2AR3.js";
+} from "./chunk-RM7KF6OT.js";
 import {
   getReadableCliDb
 } from "./chunk-W4NVOSFF.js";
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-RJKDVL4L.js";
+} from "./chunk-SDJDLO5W.js";
 import {
   normalizeAgentHandle
-} from "./chunk-DGFWICQJ.js";
+} from "./chunk-N54XAP77.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
 } from "./chunk-VHBWHNVT.js";
 import {
   applyModelLayerOverride,
-  buildMemoryOverlayLayer,
-  buildMemoryUseGuidanceLayer,
-  buildModelLayerOverride,
-  buildSkillDiscoveryLayer
-} from "./chunk-SL35K7AH.js";
+  buildModelLayerOverride
+} from "./chunk-LTRXGFMS.js";
 import {
   CliProviderQuotaError
-} from "./chunk-X7W4TNB4.js";
-import {
-  resolveMachineId
-} from "./chunk-6HYVJV7B.js";
+} from "./chunk-CMKUBIGW.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-GAKEBQD6.js";
 import {
   buildMemorySubjectsForAgent,
   resolveAgentMemoryPolicy
-} from "./chunk-VH4YK6KZ.js";
+} from "./chunk-OI54SUZ7.js";
 import {
-  load,
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
-} from "./chunk-ZQ2UM4KG.js";
+} from "./chunk-VC6OZXO5.js";
 import {
   touchMemoryItemsInDb
-} from "./chunk-3TZDXYSF.js";
+} from "./chunk-HNW7IJSK.js";
 import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb
-} from "./chunk-Q2YZULBH.js";
+} from "./chunk-XENYHRUE.js";
 import {
   getModelContextWindow,
   parseUiAskChoiceContent
-} from "./chunk-SRLZ7IVA.js";
+} from "./chunk-4P2MDGKS.js";
 import {
   readPipeText,
   spawnProcess
@@ -74,10 +70,17 @@ import {
 import {
   resolveAuthToken
 } from "./chunk-ISNCLGUZ.js";
+import {
+  buildSkillDiscoveryContextBlock
+} from "./chunk-AFON4QUU.js";
+import {
+  buildMemoryOverlayLayer,
+  buildMemoryUseGuidanceLayer
+} from "./chunk-C4FTUXVF.js";
 import {
   buildPlatformChatCompletionRequest,
   parsePlatformChatCompletionData
-} from "./chunk-DSNONPGW.js";
+} from "./chunk-5KLGBAAR.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-TILFE6LV.js";
@@ -86,16 +89,16 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-MXLQWBVM.js";
+} from "./chunk-4QEWT7KD.js";
 import {
   resolvePlatformChatCompletionsEndpoint
-} from "./chunk-XDVAYP26.js";
+} from "./chunk-JRKKFRAV.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
 import {
   findModelConfig
-} from "./chunk-572EKYLF.js";
+} from "./chunk-BBYVOSU2.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -108,9 +111,6 @@ import {
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
-import {
-  require_index_umd
-} from "./chunk-SH2CFQOH.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
@@ -129,9 +129,6 @@ import {
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
-import {
-  __toESM
-} from "./chunk-4VNS5WPM.js";
 
 // packages/cli/client/tokenUsage.ts
 var PROVIDER_LOOKUP_ORDER = [
@@ -1789,7 +1786,9 @@ var TOOL_LABELS = {
   // Web
   fetchWebpage: { en: "Fetch page", zh: "\u6293\u53D6\u7F51\u9875" },
   readPage: { en: "Read page", zh: "\u8BFB\u53D6\u7F51\u9875" },
-  exaSearch: { en: "Web search", zh: "\u8054\u7F51\u641C\u7D22" }
+  exaSearch: { en: "Web search", zh: "\u8054\u7F51\u641C\u7D22" },
+  // Skill loading
+  loadSkill: { en: "Used Skill", zh: "\u4F7F\u7528\u6280\u80FD" }
 };
 function toolLabel(name) {
   return TOOL_LABELS[name]?.[currentLocale] ?? name;
@@ -2084,6 +2083,16 @@ function formatFetchTreeBlockForCli(items, colorEnabled) {
   return `${headerLine}${treeLines}
 `;
 }
+function resolveLoadSkillName(event) {
+  const metaName = typeof event.metadata?.name === "string" ? event.metadata.name : void 0;
+  if (metaName) return metaName;
+  const argName = event.argumentsPreview?.trim();
+  if (argName && !argName.startsWith("{")) return argName;
+  const content = typeof event.content === "string" ? event.content : "";
+  const match = content.match(/Skill "([^"]+)" loaded inline/);
+  if (match?.[1]) return match[1];
+  return argName || "skill";
+}
 function formatCompactToolLine(event, pending, colorEnabled) {
   const toolName = event.toolName || pending?.toolName || "tool";
   if (isReadToolName(toolName) && event.type === "tool-result") {
@@ -2112,6 +2121,28 @@ function formatCompactToolLine(event, pending, colorEnabled) {
     const message = clip(event.message ?? t("toolFailed"), 96);
     return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${message}`, colorEnabled, "error");
   }
+  if (event.type === "tool-result" && toolName === "loadSkill") {
+    const skillName = resolveLoadSkillName(event);
+    const content = typeof event.content === "string" ? event.content : "";
+    const failed2 = /^Skill\s+"[^"]*"\s+not found/.test(content) || isFailedToolResult(event);
+    if (failed2) {
+      const message = clip(content.split("\n")[0] || t("toolFailed"), 96);
+      return formatToolTraceLine(`\u25B8 Used Skill (${skillName})  \u2717 ${message}`, colorEnabled, "error");
+    }
+    const resultLine = `Skill "${skillName}" loaded inline. Follow its instructions.`;
+    if (!colorEnabled) {
+      return `\u25CF Used Skill (${skillName})
+  ${resultLine}
+`;
+    }
+    const bullet = themeText("\u25CF", "success", true);
+    const labelPart = themeText("Used Skill", "muted", true);
+    const namePart = themeText(`(${skillName})`, "chrome", true);
+    const detail = themeText(`  ${resultLine}`, "muted", true);
+    return `${bullet} ${labelPart} ${namePart}
+${detail}
+`;
+  }
   if (event.type === "tool-result" && (event.toolName === "ui_ask_choice" || event.metadata?.uiAskChoice)) {
     const block = formatUiAskChoiceBlock(event, colorEnabled);
     if (block) return block;
@@ -2793,9 +2824,9 @@ function isKnownServerPlatformAgent(options) {
 }
 
 // packages/cli/client/agentRun.ts
-var import_ulid = __toESM(require_index_umd(), 1);
+import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-XL5PLRJV.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-ZYEIPTY4.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -3191,9 +3222,9 @@ async function runLocalAgentTurnForCli(options, settings) {
     ...options.parentWakeOnTerminal ? { parentWakeOnTerminal: true } : {},
     ...options.parentDialogId ? { parentThreadId: options.parentDialogId } : {}
   } : void 0;
-  const currentDialogId = options.continueDialogId ?? (0, import_ulid.ulid)();
+  const currentDialogId = options.continueDialogId ?? ulid();
   const runChildTurn = async (input) => {
-    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-XL5PLRJV.js");
+    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-ZYEIPTY4.js");
     return runLocalAgentTurn(input);
   };
   const createFreshChildBaseAdapter = () => {
@@ -3381,8 +3412,8 @@ async function runAgentTurn(options) {
 }
 
 // packages/cli/agentRunCommand.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
-import { join as join3 } from "node:path";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import { join as join2 } from "node:path";
 
 // packages/agent-runtime/quickChatIntentCore.ts
 var INTENT_MODEL = "deepseek-v4-flash";
@@ -3574,72 +3605,15 @@ async function classifyCliAutoRoute(text, options) {
   }
 }
 
-// packages/agent-runtime/skillDiscovery.ts
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
-import { join } from "node:path";
-var SKILL_SCAN_DIRS = [".agents/skills", "docs/skills"];
-var MAX_DISCOVERED_SKILLS = 50;
-function parseSkillFrontmatter(filePath) {
-  try {
-    const content = readFileSync(filePath, "utf8").slice(0, 2048);
-    const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
-    if (!fmMatch) return {};
-    const fm = load(fmMatch[1]);
-    if (!fm || typeof fm !== "object") return {};
-    const name = typeof fm.name === "string" ? fm.name : void 0;
-    const rawDesc = fm.description;
-    const description = typeof rawDesc === "string" ? rawDesc : rawDesc == null ? void 0 : String(rawDesc);
-    const sanitize = (s) => s?.trim().replace(/^["']|["']$/g, "").replace(/[\n\r]+/g, " ").slice(0, 200);
-    return { name: sanitize(name), description: sanitize(description) };
-  } catch {
-    return {};
-  }
-}
-function discoverSkills(cwd) {
-  const skills = [];
-  for (const dir of SKILL_SCAN_DIRS) {
-    if (skills.length >= MAX_DISCOVERED_SKILLS) break;
-    const absDir = join(cwd, dir);
-    if (!existsSync(absDir) || !statSync(absDir).isDirectory()) continue;
-    try {
-      for (const entry of readdirSync(absDir)) {
-        if (skills.length >= MAX_DISCOVERED_SKILLS) break;
-        const skillMdPath = join(absDir, entry, "SKILL.md");
-        if (existsSync(skillMdPath)) {
-          const { name, description } = parseSkillFrontmatter(skillMdPath);
-          skills.push({ name: name ?? entry, description: description ?? "", relativePath: join(dir, entry, "SKILL.md") });
-          continue;
-        }
-        if (dir === "docs/skills" && entry.endsWith(".md")) {
-          const flatPath = join(absDir, entry);
-          const { name, description } = parseSkillFrontmatter(flatPath);
-          skills.push({ name: name ?? entry.replace(/\.md$/, ""), description: description ?? "", relativePath: join(dir, entry) });
-        }
-      }
-    } catch {
-    }
-  }
-  return skills;
-}
-function buildSkillDiscoveryContextBlock(cwd) {
-  try {
-    const discovered = discoverSkills(cwd);
-    const layer = buildSkillDiscoveryLayer(discovered, cwd);
-    return layer?.content ?? null;
-  } catch {
-    return null;
-  }
-}
-
 // packages/cli/agentRunPrompts.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
-import { dirname, extname, isAbsolute, join as join2, relative as relativePath, resolve, sep } from "node:path";
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { dirname, extname, isAbsolute, join, relative as relativePath, resolve, sep } from "node:path";
 function workflowRefToCandidatePath(cwd, ref) {
   const normalized = ref.trim();
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
     const directPath = resolve(cwd, normalized);
-    if (existsSync2(directPath)) return directPath;
+    if (existsSync(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
   return resolve(cwd, "docs", "workflows", `${fileName}.md`);
@@ -3653,26 +3627,26 @@ function skillRefToCandidatePath(cwd, ref) {
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
     const directPath = resolve(cwd, normalized);
-    if (existsSync2(directPath)) return directPath;
+    if (existsSync(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
   for (const dir of SKILL_SEARCH_DIRS) {
     if (dir === "docs/skills") {
       const flatPath = resolve(cwd, dir, `${fileName}.md`);
-      if (existsSync2(flatPath)) return flatPath;
+      if (existsSync(flatPath)) return flatPath;
     } else {
       const skillMdPath = resolve(cwd, dir, fileName, "SKILL.md");
-      if (existsSync2(skillMdPath)) return skillMdPath;
+      if (existsSync(skillMdPath)) return skillMdPath;
     }
   }
   return resolve(cwd, "docs", "skills", `${fileName}.md`);
 }
 async function resolveWorkflowReference(ref, cwd = process.cwd()) {
   const path = workflowRefToCandidatePath(cwd, ref);
-  if (!path || !existsSync2(path)) {
+  if (!path || !existsSync(path)) {
     throw new Error(`Workflow reference not found: ${ref}`);
   }
-  const markdown = readFileSync2(path, "utf8");
+  const markdown = readFileSync(path, "utf8");
   const parsed = parseSkillDocProtocol(markdown);
   return {
     ref,
@@ -3689,8 +3663,8 @@ function inlineRelativeRefs(body, skillDir) {
     const absPath = resolve(skillDir, cleaned);
     const relative = relativePath(normalizedSkillDir, absPath);
     if (relative.startsWith("..") || isAbsolute(relative)) return match;
-    if (!existsSync2(absPath) || !absPath.endsWith(".md")) return match;
-    const refContent = readFileSync2(absPath, "utf8");
+    if (!existsSync(absPath) || !absPath.endsWith(".md")) return match;
+    const refContent = readFileSync(absPath, "utf8");
     return `
 
 ### ${label}
@@ -3701,9 +3675,9 @@ ${refContent}
   });
 }
 function listSkillScripts(skillDir) {
-  const scriptsDir = join2(skillDir, "scripts");
-  if (!existsSync2(scriptsDir) || !statSync2(scriptsDir).isDirectory()) return null;
-  const entries = readdirSync2(scriptsDir).filter((e) => !e.startsWith("."));
+  const scriptsDir = join(skillDir, "scripts");
+  if (!existsSync(scriptsDir) || !statSync(scriptsDir).isDirectory()) return null;
+  const entries = readdirSync(scriptsDir).filter((e) => !e.startsWith("."));
   if (entries.length === 0) return null;
   return [
     "",
@@ -3729,10 +3703,10 @@ async function resolveSkillReference(ref, options = {}) {
   } else {
     const cwd = options.cwd ?? process.cwd();
     const path = skillRefToCandidatePath(cwd, ref);
-    if (!path || !existsSync2(path)) {
+    if (!path || !existsSync(path)) {
       throw new Error(`Skill reference not found: ${ref}`);
     }
-    markdown = readFileSync2(path, "utf8");
+    markdown = readFileSync(path, "utf8");
     filePath = path;
     skillDir = dirname(path);
   }
@@ -3823,8 +3797,8 @@ function prependSubjectDialogMarker(message, subjectDialogKey) {
 function normalizeCliImageInput(input) {
   if (/^(https?:|data:|file:)/i.test(input)) return input;
   const absolutePath = resolve(input);
-  if (!existsSync2(absolutePath)) return input;
-  const base64 = readFileSync2(absolutePath).toString("base64");
+  if (!existsSync(absolutePath)) return input;
+  const base64 = readFileSync(absolutePath).toString("base64");
   return `data:${imageMimeTypeForPath(absolutePath)};base64,${base64}`;
 }
 function imageMimeTypeForPath(path) {
@@ -4473,10 +4447,10 @@ async function runAgentRunCommand(args, deps) {
   const extraContextBlocks = [];
   const AGENTS_MD_MAX = 8192;
   for (const name of ["AGENTS.md", "CLAUDE.md"]) {
-    const agentsMdPath = join3(cliCwd, name);
-    if (existsSync3(agentsMdPath)) {
+    const agentsMdPath = join2(cliCwd, name);
+    if (existsSync2(agentsMdPath)) {
       try {
-        let mdContent = readFileSync3(agentsMdPath, "utf8").trim();
+        let mdContent = readFileSync2(agentsMdPath, "utf8").trim();
         if (!mdContent) continue;
         if (Buffer.byteLength(mdContent, "utf8") > AGENTS_MD_MAX) {
           mdContent = Buffer.from(mdContent, "utf8").subarray(0, AGENTS_MD_MAX).toString("utf8") + "\n\n<!-- AGENTS.md truncated -->";
@@ -4496,7 +4470,7 @@ ${mdContent}`);
   let memoryPromptBlock = null;
   if (!deps.memoryRecallDisabled) {
     const memoryServerUrl = resolveServerUrl(env);
-    const memoryAuthToken = resolveAuthToken(env);
+    const memoryAuthToken = resolveAuthToken(args, env);
     const memoryAgentKey = effectiveAgentKey;
     const memorySpaceId = parsed.spaceId ?? void 0;
     try {
@@ -4738,7 +4712,6 @@ export {
   CLI_IMAGE_AGENT_KEY,
   CLI_AUTO_TIER_AGENT_KEY_TABLE,
   classifyCliAutoRoute,
-  buildSkillDiscoveryContextBlock,
   resolveWorkflowReference,
   resolveSkillReference,
   buildSkillContextBlocks,