nolo-cli 0.33.0-alpha.9 → 0.34.0-alpha.3

package/{chunk-KHCLMKZZ.js → chunk-EY7V7REW.js}

@@ -1,4 +1,11 @@
-// node_modules/js-yaml/dist/js-yaml.mjs
+import {
+  asTrimmedNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
+import {
+  asOptionalTrimmedString
+} from "./chunk-G3SUCT4W.js";
+
+// packages/ai/node_modules/js-yaml/dist/js-yaml.mjs
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
@@ -1276,16 +1283,21 @@ function requireLoader() {
       state.result += _result;
     }
   }
+  function chargeMergeWork(state) {
+    state.totalMergeKeys++;
+    if (state.maxTotalMergeKeys !== -1 && state.totalMergeKeys > state.maxTotalMergeKeys) {
+      throwError(state, "merge keys exceeded maxTotalMergeKeys (" + state.maxTotalMergeKeys + ")");
+    }
+  }
   function mergeMappings(state, destination, source, overridableKeys) {
     if (!common2.isObject(source)) {
       throwError(state, "cannot merge mappings; the provided source object is unacceptable");
     }
+    chargeMergeWork(state);
     const sourceKeys = Object.keys(source);
     for (let index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {
       const key = sourceKeys[index];
-      if (state.maxTotalMergeKeys !== -1 && ++state.totalMergeKeys > state.maxTotalMergeKeys) {
-        throwError(state, "merge keys exceeded maxTotalMergeKeys (" + state.maxTotalMergeKeys + ")");
-      }
+      chargeMergeWork(state);
       if (!_hasOwnProperty.call(destination, key)) {
         setProperty(destination, key, source[key]);
         overridableKeys[key] = true;
@@ -1313,6 +1325,9 @@ function requireLoader() {
     }
     if (keyTag === "tag:yaml.org,2002:merge") {
       if (Array.isArray(valueNode)) {
+        if (valueNode.length > 100) {
+          throwError(state, "abnormal merge sequence size");
+        }
         for (let index = 0, quantity = valueNode.length; index < quantity; index += 1) {
           mergeMappings(state, _result, valueNode[index], overridableKeys);
         }
@@ -3056,7 +3071,266 @@ var {
   safeDump
 } = yaml;
 
+// packages/ai/skills/skillDocProtocol.ts
+var SKILL_DOC_ENUMS = {
+  triggerMode: ["explicit", "required", "recommended"],
+  // budgetTier 只服务 WorkflowReferenceConfig；skill 侧已移除（零读点）。
+  budgetTier: ["low", "medium", "high"],
+  modality: ["text", "image", "video", "audio", "3d"],
+  docKind: ["knowledge", "instruction", "skill"]
+};
+var SKILL_CONFIG_BLOCK = "skill-config";
+var EVAL_CONFIG_BLOCK = "eval-config";
+var WORKFLOW_CONFIG_BLOCK = "workflow-config";
+var normalizeStringArray = (value) => {
+  if (!Array.isArray(value)) return void 0;
+  const items = [...new Set(asTrimmedNonEmptyStringArray(value))];
+  return items.length > 0 ? items : void 0;
+};
+var normalizeSkillEnumValue = (key, value) => typeof value === "string" && SKILL_DOC_ENUMS[key].includes(value) ? value : void 0;
+var normalizeSkillModalities = (value) => {
+  const raw = normalizeStringArray(value);
+  if (!raw) return void 0;
+  const filtered = raw.flatMap((item) => {
+    const modality = normalizeSkillEnumValue("modality", item);
+    return modality ? [modality] : [];
+  });
+  return filtered.length > 0 ? Array.from(new Set(filtered)) : void 0;
+};
+var normalizeSkillConfig = (value, fallbackTools) => {
+  if (!value || typeof value !== "object") return void 0;
+  const record = value;
+  const name = asOptionalTrimmedString(record.name) ?? "";
+  const description = asOptionalTrimmedString(record.description) ?? "";
+  if (!name || !description) return void 0;
+  const triggerMode = normalizeSkillEnumValue("triggerMode", record.triggerMode);
+  const modalities = normalizeSkillModalities(record.modalities);
+  const toolNames = normalizeStringArray(record.toolNames) ?? normalizeStringArray(fallbackTools) ?? void 0;
+  return {
+    version: "0.1",
+    kind: "skill",
+    id: asOptionalTrimmedString(record.id),
+    name,
+    description,
+    triggerMode,
+    toolNames,
+    modalities,
+    requiredSkills: normalizeStringArray(record.requiredSkills),
+    recommendedSkills: normalizeStringArray(record.recommendedSkills),
+    promptPatch: asOptionalTrimmedString(record.promptPatch)
+  };
+};
+var normalizeEvalConfig = (value) => {
+  if (!value || typeof value !== "object") return void 0;
+  const record = value;
+  if (!Array.isArray(record.cases)) return void 0;
+  const cases = [];
+  for (const item of record.cases) {
+    if (!item || typeof item !== "object") continue;
+    const testCase = item;
+    const input = asOptionalTrimmedString(testCase.input) ?? "";
+    if (!input) continue;
+    cases.push({
+      input,
+      expectedTools: normalizeStringArray(testCase.expectedTools),
+      expectedSignals: normalizeStringArray(testCase.expectedSignals),
+      forbiddenSignals: normalizeStringArray(testCase.forbiddenSignals)
+    });
+  }
+  return cases.length > 0 ? {
+    version: "0.1",
+    cases
+  } : void 0;
+};
+var normalizeWorkflowConfig = (value) => {
+  if (!value || typeof value !== "object") return void 0;
+  const record = value;
+  const name = asOptionalTrimmedString(record.name) ?? "";
+  const description = asOptionalTrimmedString(record.description) ?? "";
+  if (!name || !description) return void 0;
+  const budgetTier = normalizeSkillEnumValue("budgetTier", record.budgetTier);
+  return {
+    version: "0.1",
+    kind: "workflow",
+    id: asOptionalTrimmedString(record.id),
+    name,
+    description,
+    defaultAgent: asOptionalTrimmedString(record.defaultAgent),
+    inputs: normalizeStringArray(record.inputs),
+    recommendedTools: normalizeStringArray(record.recommendedTools),
+    requiredTools: normalizeStringArray(record.requiredTools),
+    requiredOutputs: normalizeStringArray(record.requiredOutputs),
+    gates: normalizeStringArray(record.gates),
+    budgetTier,
+    contextStrategy: asOptionalTrimmedString(record.contextStrategy),
+    failureProtocol: asOptionalTrimmedString(record.failureProtocol)
+  };
+};
+var normalizePageSkillMetadata = (value, fallbackTools) => {
+  if (!value || typeof value !== "object") return void 0;
+  const record = value;
+  const kind = normalizeSkillEnumValue("docKind", record.kind);
+  const meta = {
+    kind,
+    requiredSkills: normalizeStringArray(record.requiredSkills),
+    recommendedSkills: normalizeStringArray(record.recommendedSkills),
+    skillConfig: normalizeSkillConfig(record.skillConfig, fallbackTools),
+    evalConfig: normalizeEvalConfig(record.evalConfig),
+    workflowConfig: normalizeWorkflowConfig(record.workflowConfig)
+  };
+  if (meta.skillConfig && !meta.kind) {
+    meta.kind = "skill";
+  }
+  if (meta.workflowConfig && !meta.kind) {
+    meta.kind = "instruction";
+  }
+  return meta.kind || meta.requiredSkills || meta.recommendedSkills || meta.skillConfig || meta.evalConfig || meta.workflowConfig ? meta : void 0;
+};
+var extractCommentBlock = (markdown, blockName) => {
+  if (!markdown) return void 0;
+  const matcher = new RegExp(
+    `<!--\\s*${blockName}\\s*\\n([\\s\\S]*?)-->`,
+    "i"
+  );
+  const match = markdown.match(matcher);
+  return asOptionalTrimmedString(match?.[1]);
+};
+var removeCommentBlock = (markdown, blockName) => markdown.replace(
+  new RegExp(`\\n?<!--\\s*${blockName}\\s*\\n[\\s\\S]*?-->\\s*`, "gi"),
+  "\n\n"
+);
+var parseYamlObject = (raw) => {
+  if (!raw) return void 0;
+  try {
+    const parsed = load(raw);
+    return parsed && typeof parsed === "object" ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+};
+var parseSkillDocProtocol = (markdown, existingMeta, fallbackTools) => {
+  const source = typeof markdown === "string" ? markdown : "";
+  const skillBlock = parseYamlObject(extractCommentBlock(source, SKILL_CONFIG_BLOCK));
+  const evalBlock = parseYamlObject(extractCommentBlock(source, EVAL_CONFIG_BLOCK));
+  const workflowBlock = parseYamlObject(extractCommentBlock(source, WORKFLOW_CONFIG_BLOCK));
+  const cleanedContent = removeCommentBlock(
+    removeCommentBlock(
+      removeCommentBlock(source, SKILL_CONFIG_BLOCK),
+      EVAL_CONFIG_BLOCK
+    ),
+    WORKFLOW_CONFIG_BLOCK
+  ).replace(/\n{3,}/g, "\n\n").trim();
+  const parsedMeta = normalizePageSkillMetadata(
+    {
+      ...existingMeta ?? {},
+      ...skillBlock ? {
+        kind: existingMeta?.kind === "skill" || skillBlock.kind === "skill" ? "skill" : existingMeta?.kind,
+        requiredSkills: skillBlock.requiredSkills ?? existingMeta?.requiredSkills,
+        recommendedSkills: skillBlock.recommendedSkills ?? existingMeta?.recommendedSkills,
+        skillConfig: skillBlock
+      } : {},
+      ...evalBlock ? { evalConfig: evalBlock } : {},
+      ...workflowBlock ? { workflowConfig: workflowBlock } : {}
+    },
+    fallbackTools
+  );
+  return {
+    content: cleanedContent,
+    meta: parsedMeta
+  };
+};
+var resolvePageSkillMetadata = (page) => {
+  if (!page) return void 0;
+  const existingMeta = normalizePageSkillMetadata(page.meta, page.tools);
+  return parseSkillDocProtocol(page.content ?? "", existingMeta, page.tools).meta;
+};
+var yamlBlock = (value) => dump(value, { lineWidth: 120, noRefs: true }).trim();
+var buildSkillConfigComment = (config) => {
+  const payload = {
+    version: config.version,
+    kind: config.kind,
+    ...config.id ? { id: config.id } : {},
+    name: config.name,
+    description: config.description,
+    ...config.triggerMode ? { triggerMode: config.triggerMode } : {},
+    ...config.requiredSkills?.length ? { requiredSkills: config.requiredSkills } : {},
+    ...config.recommendedSkills?.length ? { recommendedSkills: config.recommendedSkills } : {},
+    ...config.toolNames?.length ? { toolNames: config.toolNames } : {},
+    ...config.modalities?.length ? { modalities: config.modalities } : {},
+    ...config.promptPatch ? { promptPatch: config.promptPatch } : {}
+  };
+  return `<!-- ${SKILL_CONFIG_BLOCK}
+${yamlBlock(payload)}
+-->`;
+};
+var buildEvalConfigComment = (config) => `<!-- ${EVAL_CONFIG_BLOCK}
+${yamlBlock({
+  version: config.version,
+  cases: config.cases
+})}
+-->`;
+var buildWorkflowConfigComment = (config) => `<!-- ${WORKFLOW_CONFIG_BLOCK}
+${yamlBlock({
+  version: config.version,
+  kind: config.kind,
+  ...config.id ? { id: config.id } : {},
+  name: config.name,
+  description: config.description,
+  ...config.defaultAgent ? { defaultAgent: config.defaultAgent } : {},
+  ...config.inputs?.length ? { inputs: config.inputs } : {},
+  ...config.recommendedTools?.length ? { recommendedTools: config.recommendedTools } : {},
+  ...config.requiredTools?.length ? { requiredTools: config.requiredTools } : {},
+  ...config.requiredOutputs?.length ? { requiredOutputs: config.requiredOutputs } : {},
+  ...config.gates?.length ? { gates: config.gates } : {},
+  ...config.budgetTier ? { budgetTier: config.budgetTier } : {},
+  ...config.contextStrategy ? { contextStrategy: config.contextStrategy } : {},
+  ...config.failureProtocol ? { failureProtocol: config.failureProtocol } : {}
+})}
+-->`;
+var buildSkillDocMarkdown = (options) => {
+  const sections = [
+    asOptionalTrimmedString(options.body) ?? "",
+    buildSkillConfigComment(options.skillConfig),
+    options.evalConfig ? buildEvalConfigComment(options.evalConfig) : "",
+    options.workflowConfig ? buildWorkflowConfigComment(options.workflowConfig) : ""
+  ].filter(Boolean);
+  return sections.join("\n\n").trim();
+};
+var extractFrontmatter = (markdown) => {
+  const match = markdown.match(/^\s*---\s*\n([\s\S]*?)\n\s*---\s*\n?/);
+  if (!match) return { body: markdown.trim() };
+  const frontmatter = parseYamlObject(match[1]);
+  const body = markdown.slice(match[0].length).trim();
+  return { frontmatter, body };
+};
+var normalizeAllowedTools = (value) => {
+  if (Array.isArray(value)) {
+    return normalizeStringArray(value) ?? [];
+  }
+  if (typeof value === "string") {
+    return value.split(/\s+/).map((item) => item.trim()).filter(Boolean);
+  }
+  return [];
+};
+var parseExternalSkillMarkdown = (markdown) => {
+  const { frontmatter, body } = extractFrontmatter(markdown);
+  return {
+    name: asOptionalTrimmedString(frontmatter?.name),
+    description: asOptionalTrimmedString(frontmatter?.description),
+    compatibility: asOptionalTrimmedString(frontmatter?.compatibility),
+    allowedTools: normalizeAllowedTools(frontmatter?.["allowed-tools"]),
+    metadata: frontmatter?.metadata && typeof frontmatter.metadata === "object" ? Object.fromEntries(
+      Object.entries(frontmatter.metadata).filter(([, value]) => typeof value === "string").map(([key, value]) => [key, String(value)])
+    ) : void 0,
+    body
+  };
+};
+
 export {
-  load,
-  dump
+  normalizeStringArray,
+  normalizeSkillModalities,
+  parseSkillDocProtocol,
+  resolvePageSkillMetadata,
+  buildSkillDocMarkdown,
+  parseExternalSkillMarkdown
 };

package/{chunk-JZPBVBIY.js → chunk-FD36SCCD.js}

@@ -7,14 +7,24 @@ import {
   unlinkSync,
   writeFileSync
 } from "node:fs";
+import { join as join2 } from "node:path";
+
+// packages/agent-runtime/noloStateDir.ts
 import { homedir } from "node:os";
 import { join } from "node:path";
+function resolveNoloStateDir(name, homeDir) {
+  if (homeDir) return join(homeDir, ".nolo", name);
+  const noloHome = process.env.NOLO_HOME?.trim();
+  return noloHome ? join(noloHome, name) : join(homedir(), ".nolo", name);
+}
+
+// packages/agent-runtime/oauthTokenStore.ts
 var DEFAULT_REFRESH_SKEW_MS = 5 * 60 * 1e3;
-function getCredentialsDir(homeDir = homedir()) {
-  return join(homeDir, ".nolo", "credentials");
+function getCredentialsDir(homeDir) {
+  return resolveNoloStateDir("credentials", homeDir);
 }
-function getCredentialPath(provider, homeDir = homedir()) {
-  return join(getCredentialsDir(homeDir), `${provider}.json`);
+function getCredentialPath(provider, homeDir) {
+  return join2(getCredentialsDir(homeDir), `${provider}.json`);
 }
 function ensurePrivateDir(dir) {
   mkdirSync(dir, { recursive: true, mode: 448 });
@@ -30,7 +40,7 @@ function writePrivateFile(path, body) {
   } catch {
   }
 }
-function readOAuthCredential(provider, homeDir = homedir()) {
+function readOAuthCredential(provider, homeDir) {
   const path = getCredentialPath(provider, homeDir);
   if (!existsSync(path)) return null;
   const raw = readFileSync(path, "utf8");
@@ -42,18 +52,18 @@ function readOAuthCredential(provider, homeDir = homedir()) {
     return null;
   }
 }
-function writeOAuthCredential(provider, credential, homeDir = homedir()) {
+function writeOAuthCredential(provider, credential, homeDir) {
   const path = getCredentialPath(provider, homeDir);
   ensurePrivateDir(getCredentialsDir(homeDir));
   writePrivateFile(path, `${JSON.stringify(credential, null, 2)}
 `);
 }
-function removeOAuthCredential(provider, homeDir = homedir()) {
+function removeOAuthCredential(provider, homeDir) {
   const path = getCredentialPath(provider, homeDir);
   if (!existsSync(path)) return;
   unlinkSync(path);
 }
-function createOAuthTokenStore(homeDir = homedir()) {
+function createOAuthTokenStore(homeDir) {
   return {
     read(provider) {
       return readOAuthCredential(provider, homeDir);
@@ -85,6 +95,7 @@ async function resolveFreshAccessToken(args) {
 }
 
 export {
+  resolveNoloStateDir,
   getCredentialsDir,
   readOAuthCredential,
   writeOAuthCredential,

package/{chunk-DKMOY3QI.js → chunk-FGLKRJDI.js}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-DWLEOOGR.js";
 import {
   addContentAction
-} from "./chunk-4F5M2MW5.js";
+} from "./chunk-MJWX4JQO.js";
 import {
   upload
-} from "./chunk-UM4H3URE.js";
+} from "./chunk-23KKIMD5.js";
 import {
   getRuntimeServerContext
-} from "./chunk-X664KVEV.js";
+} from "./chunk-HHBXCRJS.js";
 import {
   API_ENDPOINTS
 } from "./chunk-LCBAMY2M.js";
@@ -318,6 +318,8 @@ var planContextUsage = (params) => {
 // packages/ai/context/planCompression.ts
 var MIN_COMPRESS_COUNT = 5;
 var ACTIVE_SUMMARY_TAIL_KEEP_COUNT = 2;
+var STUB_KEEP_COUNT = 3;
+var TOOL_STUB_TEXT = "[tool output cleared to save context]";
 var getMessageTokenCount = (msg) => {
   const content = serializeMessageContent(msg.content) || "";
   let tokens = estimateTokenCount(content);
@@ -432,6 +434,45 @@ function calculateCompressCount(pendingMsgs, rawMessageBudget, opts) {
   }
   return pendingMsgs.length - keepCount;
 }
+function tryComputeStubPlan(pendingMsgs, totalUsed, historyBudget, startIndex) {
+  const toolIndices = [];
+  for (let i = 0; i < pendingMsgs.length; i++) {
+    if (pendingMsgs[i].role === "tool") {
+      const content = serializeMessageContent(pendingMsgs[i].content) || "";
+      if (content !== TOOL_STUB_TEXT) toolIndices.push(i);
+    }
+  }
+  if (toolIndices.length <= STUB_KEEP_COUNT) return null;
+  const firstStubbedIdx = toolIndices[toolIndices.length - STUB_KEEP_COUNT - 1];
+  const beforeMsg = pendingMsgs[firstStubbedIdx];
+  if (!beforeMsg) return null;
+  const stubOverhead = estimateTokenCount(TOOL_STUB_TEXT);
+  const stubbedMsgs = pendingMsgs.slice(0, firstStubbedIdx + 1).filter(
+    (m) => m.role === "tool"
+  );
+  const originalTokens = stubbedMsgs.reduce(
+    (s, m) => s + getMessageTokenCount(m),
+    0
+  );
+  const savedTokens = Math.max(0, originalTokens - stubOverhead * stubbedMsgs.length);
+  if (totalUsed - savedTokens > historyBudget) return null;
+  const keptMsgs = pendingMsgs.slice(firstStubbedIdx + 1);
+  return {
+    shouldCompress: true,
+    compressCount: stubbedMsgs.length,
+    msgsToCompress: stubbedMsgs,
+    msgsToKeep: keptMsgs,
+    newSummarizedBeforeId: void 0,
+    startIndex,
+    stub: {
+      // beforeId = 第一条被 stub 的 tool 结果的消息 id；投影端按
+      // 「abs index <= beforeId 的 index 的 tool 消息」判定是否 stub。
+      beforeId: beforeMsg.id,
+      stubbedCount: stubbedMsgs.length,
+      savedTokens
+    }
+  };
+}
 function guardToolChainBoundary(pendingMsgs, compressCount) {
   let count = compressCount;
   while (count > 0 && count < pendingMsgs.length && pendingMsgs[count].role === "tool") {
@@ -479,6 +520,13 @@ function planCompression(input) {
     lastMsg: pendingMsgs[pendingMsgs.length - 1]
   });
   if (!trigger) return emptyPlan(startIndex);
+  const stubPlan = tryComputeStubPlan(
+    pendingMsgs,
+    totalUsed,
+    historyBudget,
+    startIndex
+  );
+  if (stubPlan) return stubPlan;
   let compressCount = calculateCompressCount(pendingMsgs, rawMessageBudget, {
     keepTailCount: shouldRunActiveSummary || triggeredByRealUsage,
     totalUsed,
@@ -500,6 +548,7 @@ function planCompression(input) {
 }
 
 // packages/ai/context/compactionShared.ts
+var COMPACTION_SUMMARY_SCHEMA_VERSION = 1;
 var COMPACTION_SUMMARY_SYSTEM_PROMPT = `\u4F60\u662F\u5BF9\u8BDD\u4E0A\u4E0B\u6587\u538B\u7F29\u5668\u3002\u6839\u636E\u3010\u73B0\u6709\u8BB0\u5FC6\u3011\u548C\u3010\u65B0\u589E\u5BF9\u8BDD\u3011\uFF0C\u8F93\u51FA\u53EF\u66FF\u4EE3\u539F\u59CB\u6D88\u606F\u7684\u4E8B\u5B9E\u6027\u8981\u70B9\uFF0C\u4F9B\u540E\u7EED\u5BF9\u8BDD\u76F4\u63A5\u4F7F\u7528\u3002
 
 \u4E25\u683C\u53EA\u8F93\u51FA\u4E0B\u9762\u4E09\u90E8\u5206\uFF0C\u6807\u9898\u5FC5\u987B\u5B8C\u5168\u4E00\u81F4\uFF1A
@@ -666,7 +715,9 @@ export {
   buildDatabaseFileContentUrl,
   serializeMessageContent,
   normalizeAssistantContentBuffer,
+  TOOL_STUB_TEXT,
   planCompression,
+  COMPACTION_SUMMARY_SCHEMA_VERSION,
   COMPACTION_SUMMARY_SYSTEM_PROMPT,
   buildCompactionUserContent,
   formatFileOperationsFromMessages,