nolo-cli 0.29.2 → 0.30.0-alpha.2

package/{chunk-GC34RRTQ.js → chunk-SWYMCHM7.js}

@@ -1,7 +1,3 @@
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
-
 // packages/create/editor/transforms/slateToSimplifiedMarkdown.ts
 function renderTextNode(node) {
   if (!node || typeof node.text !== "string") return "";
@@ -152,70 +148,6 @@ function slateToSimplifiedMarkdown(nodes, options = {}) {
   return nodes.map((node) => renderNode(node, 0, options)).join("").trim() + "\n";
 }
 
-// packages/ai/tools/readDocTool.ts
-var readDocFunctionSchema = {
-  name: "readDoc",
-  description: [
-    "\u8BFB\u53D6\u6307\u5B9A\u9875\u9762\u7684\u5185\u5BB9\uFF0C\u5E76\u5C06\u7ED3\u6784\u5316\u7684\u6570\u636E\u8F6C\u6362\u4E3A Markdown \u683C\u5F0F\u8FD4\u56DE\u3002",
-    "\u5982\u679C\u4F60\u62FF\u5230\u4E86\u9875\u9762\u7684 dbKey\uFF08\u5982 page-xxx\uFF09\uFF0C\u8BF7\u4F7F\u7528\u6B64\u5DE5\u5177\u67E5\u770B\u9875\u9762\u5185\u5BB9\u3002"
-  ].join("\n"),
-  parameters: {
-    type: "object",
-    properties: {
-      id: {
-        type: "string",
-        description: "\u9875\u9762/\u6587\u6863\u7684\u6570\u636E\u5E93\u952E\uFF08dbKey\uFF09\uFF0C\u4F8B\u5982 page-xxx\u3002"
-      }
-    },
-    required: ["id"]
-  }
-};
-var readPageFunctionSchema = {
-  ...readDocFunctionSchema,
-  name: "readPage"
-};
-var buildReadDocResult = (pageData) => {
-  const markdownContent = slateToSimplifiedMarkdown(pageData.slateData || []);
-  const rawData = {
-    success: true,
-    id: pageData.dbKey,
-    title: pageData.title,
-    content: markdownContent,
-    metadata: {
-      spaceId: pageData.spaceId,
-      created: pageData.created
-    }
-  };
-  const displayData = `\u5DF2\u6210\u529F\u8BFB\u53D6\u9875\u9762\u300A${pageData.title}\u300B\u3002
-
-\u5185\u5BB9\u5982\u4E0B\uFF1A
-
-${markdownContent}`;
-  return { rawData, displayData };
-};
-async function readDocFunc(args, thunkApi) {
-  const id = args.id ?? args.doc ?? args.docKey ?? args.pageKey ?? args.key;
-  if (!id || !id.toLowerCase().startsWith("page-")) {
-    throw new Error(`\u65E0\u6548\u7684\u9875\u9762 ID: ${id}\u3002\u9875\u9762 ID \u901A\u5E38\u4EE5 "page-" \u5F00\u5934\u3002`);
-  }
-  try {
-    const { readAction } = await import("./read-C7Y6LSBM.js");
-    const pageData = await readAction({ dbKey: id }, thunkApi);
-    if (!pageData) {
-      throw new Error(`\u672A\u627E\u5230 ID \u4E3A ${id} \u7684\u9875\u9762\u3002`);
-    }
-    return buildReadDocResult(pageData);
-  } catch (error) {
-    throw new Error(`\u8BFB\u53D6\u9875\u9762\u65F6\u51FA\u9519: ${toErrorMessage(error)}`);
-  }
-}
-var readPageFunc = readDocFunc;
-
 export {
-  slateToSimplifiedMarkdown,
-  readDocFunctionSchema,
-  readPageFunctionSchema,
-  buildReadDocResult,
-  readDocFunc,
-  readPageFunc
+  slateToSimplifiedMarkdown
 };

package/{chunk-BBGRJB5E.js → chunk-SZ5CBYMZ.js}

@@ -1,7 +1,10 @@
 import {
   readDbRecord,
   writeAgentRecord
-} from "./chunk-QC6ZWDSV.js";
+} from "./chunk-56IUA7RU.js";
+import {
+  createSpaceKey
+} from "./chunk-YLADSPDU.js";
 import {
   buildSkillSummaryMarker
 } from "./chunk-VF4K2QE6.js";
@@ -11,9 +14,6 @@ import {
   resolveAuthToken,
   resolveServerUrl
 } from "./chunk-A7GB5UGH.js";
-import {
-  createSpaceKey
-} from "./chunk-JSB4N6NU.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";

package/chunk-T27IEBNQ.js

@@ -0,0 +1,149 @@
+// packages/agent-runtime/declaredToolNames.ts
+function extractDeclaredToolNames(tools) {
+  if (!Array.isArray(tools)) return void 0;
+  const names = /* @__PURE__ */ new Set();
+  for (const t of tools) {
+    const fn = t?.function;
+    if (fn && typeof fn.name === "string" && fn.name) names.add(fn.name);
+  }
+  return names;
+}
+
+// packages/agent-runtime/outboundHistorySanitize.ts
+function sanitizeForOutbound(messages, tools) {
+  return sanitizeOutboundHistory(messages, {
+    declaredToolNames: extractDeclaredToolNames(tools)
+  });
+}
+function stableToolCallId(assistantIndex, callIndex) {
+  return `call_sanitize_${assistantIndex}_${callIndex}`;
+}
+function isString(v) {
+  return typeof v === "string";
+}
+function isNonEmptyString(v) {
+  return typeof v === "string" && v.length > 0;
+}
+function joinLines(...parts) {
+  return parts.filter(isNonEmptyString).join("\n");
+}
+function jsonStringifyArguments(args) {
+  if (typeof args === "string") return args;
+  try {
+    return JSON.stringify(args ?? "");
+  } catch {
+    return "";
+  }
+}
+function renderToolCallAsText(call) {
+  const name = call?.function?.name ?? "unknown";
+  const rawArgs = call?.function?.arguments;
+  const args = jsonStringifyArguments(rawArgs);
+  return `[tool_call: ${name}(${args})]`;
+}
+function renderToolResultAsText(message) {
+  const name = isNonEmptyString(message.toolName) ? message.toolName : "tool";
+  const body = typeof message.content === "string" ? message.content : "";
+  return `[tool_result: ${name}: ${body}]`;
+}
+function normalizeToolCall(call, assistantIndex, callIndex) {
+  if (!call || typeof call !== "object") return null;
+  const c = call;
+  const fn = c.function;
+  if (!fn || typeof fn !== "object" || !isString(fn.name)) return null;
+  const id = isNonEmptyString(c.id) ? c.id : stableToolCallId(assistantIndex, callIndex);
+  return {
+    id,
+    type: isString(c.type) && c.type ? c.type : "function",
+    function: { name: fn.name, arguments: jsonStringifyArguments(fn.arguments) },
+    ...typeof c.thought_signature === "string" ? { thought_signature: c.thought_signature } : {}
+  };
+}
+function sanitizeOutboundHistory(messages, options) {
+  if (!Array.isArray(messages) || messages.length === 0) return messages;
+  const declared = options?.declaredToolNames;
+  const candidateCallIds = /* @__PURE__ */ new Set();
+  for (let i = 0; i < messages.length; i++) {
+    const m = messages[i];
+    if (m.role !== "assistant" || !Array.isArray(m.tool_calls)) continue;
+    m.tool_calls.forEach((call, callIndex) => {
+      const name = call?.function?.name;
+      const declaredAllows = !declared || isString(name) && declared.has(name);
+      if (!declaredAllows) return;
+      const id = isNonEmptyString(call?.id) ? call.id : stableToolCallId(i, callIndex);
+      candidateCallIds.add(id);
+    });
+  }
+  const resultIds = /* @__PURE__ */ new Set();
+  for (const m of messages) {
+    if (m.role === "tool" && isNonEmptyString(m.tool_call_id)) {
+      resultIds.add(m.tool_call_id);
+    }
+  }
+  const keepCallIds = /* @__PURE__ */ new Set();
+  for (const id of candidateCallIds) {
+    if (resultIds.has(id)) keepCallIds.add(id);
+  }
+  const out = [];
+  for (let i = 0; i < messages.length; i++) {
+    const m = messages[i];
+    if (m.role === "assistant") {
+      let toolCalls;
+      const downgradedLines = [];
+      if (Array.isArray(m.tool_calls) && m.tool_calls.length > 0) {
+        const kept = [];
+        m.tool_calls.forEach((call, callIndex) => {
+          const name = call?.function?.name;
+          const declaredAllows = !declared || isString(name) && declared.has(name);
+          const id = isNonEmptyString(call?.id) ? call.id : stableToolCallId(i, callIndex);
+          const keepStructural = declaredAllows && keepCallIds.has(id);
+          if (keepStructural) {
+            const normalized = normalizeToolCall(call, i, callIndex);
+            if (normalized) kept.push(normalized);
+          } else {
+            downgradedLines.push(renderToolCallAsText(call));
+          }
+        });
+        toolCalls = kept.length > 0 ? kept : void 0;
+      }
+      const downgradedText = joinLines(...downgradedLines);
+      const contentWithDowngrade = downgradedText.length > 0 ? combineContentWithText(m.content, downgradedText) : m.content;
+      const sanitizedAssistant = {
+        ...m,
+        content: contentWithDowngrade,
+        tool_calls: toolCalls
+      };
+      if (!toolCalls) delete sanitizedAssistant.tool_calls;
+      out.push(sanitizedAssistant);
+      continue;
+    }
+    if (m.role === "tool") {
+      const id = isNonEmptyString(m.tool_call_id) ? m.tool_call_id : "";
+      if (id && keepCallIds.has(id)) {
+        out.push({ ...m, content: m.content ?? "", tool_call_id: id });
+      } else {
+        out.push({
+          role: "assistant",
+          content: renderToolResultAsText(m)
+        });
+      }
+      continue;
+    }
+    out.push({ ...m });
+  }
+  return out;
+}
+function combineContentWithText(base, extra) {
+  if (typeof base === "string") {
+    return base ? `${base}
+${extra}` : extra;
+  }
+  if (Array.isArray(base)) {
+    return [...base, { type: "text", text: extra }];
+  }
+  return extra;
+}
+
+export {
+  sanitizeForOutbound
+};

package/{chunk-WX3ZOSTL.js → chunk-T3Y5EMJS.js}

@@ -11,7 +11,7 @@ import {
   getAntigravityUserAgent,
   normalizeAntigravityTokenPayload,
   refreshAntigravityToken
-} from "./chunk-2FX23RGA.js";
+} from "./chunk-TJYWZ3LO.js";
 import {
   writeOAuthCredential
 } from "./chunk-JZPBVBIY.js";
@@ -142,27 +142,6 @@ async function startCallbackServer(options) {
   }
 }
 
-// packages/cli/oauth/pkce.ts
-import { createHash, randomBytes } from "node:crypto";
-var PKCE_VERIFIER_LENGTH = 64;
-function generatePkceVerifier(length = PKCE_VERIFIER_LENGTH) {
-  if (length < 43 || length > 128) {
-    throw new Error("PKCE verifier length must be between 43 and 128 characters.");
-  }
-  return randomBytes(length).toString("base64url").slice(0, length);
-}
-function computePkceChallenge(verifier) {
-  return createHash("sha256").update(verifier).digest("base64url");
-}
-function generatePkcePair(length = PKCE_VERIFIER_LENGTH) {
-  const verifier = generatePkceVerifier(length);
-  return {
-    verifier,
-    challenge: computePkceChallenge(verifier),
-    method: "S256"
-  };
-}
-
 // packages/cli/oauth/flows/antigravity.ts
 var TIER_LEGACY = "legacy-tier";
 var PROJECT_ONBOARD_MAX_ATTEMPTS = 5;
@@ -312,7 +291,6 @@ async function runAntigravityOAuthLogin(deps = {}) {
   }
   try {
     const state = generateState();
-    const pkce = await generatePkcePair();
     const authParams = new URLSearchParams({
       client_id: ANTIGRAVITY_CLIENT_ID,
       response_type: "code",
@@ -345,8 +323,7 @@ async function runAntigravityOAuthLogin(deps = {}) {
         client_secret: ANTIGRAVITY_CLIENT_SECRET,
         code: callback.code,
         grant_type: "authorization_code",
-        redirect_uri: redirectUri,
-        code_verifier: pkce.verifier
+        redirect_uri: redirectUri
       })
     });
     if (!tokenResponse.ok) {
@@ -506,6 +483,27 @@ async function refreshOpenAiCodexToken(credential, deps = {}) {
   });
 }
 
+// packages/cli/oauth/pkce.ts
+import { createHash, randomBytes } from "node:crypto";
+var PKCE_VERIFIER_LENGTH = 64;
+function generatePkceVerifier(length = PKCE_VERIFIER_LENGTH) {
+  if (length < 43 || length > 128) {
+    throw new Error("PKCE verifier length must be between 43 and 128 characters.");
+  }
+  return randomBytes(length).toString("base64url").slice(0, length);
+}
+function computePkceChallenge(verifier) {
+  return createHash("sha256").update(verifier).digest("base64url");
+}
+function generatePkcePair(length = PKCE_VERIFIER_LENGTH) {
+  const verifier = generatePkceVerifier(length);
+  return {
+    verifier,
+    challenge: computePkceChallenge(verifier),
+    method: "S256"
+  };
+}
+
 // packages/cli/oauth/flows/openai-codex.ts
 var AUTHORIZATION_CODE_GRANT_TYPE = "authorization_code";
 var DEVICE_CODE_DEFAULT_INTERVAL_MS = 5e3;
@@ -1116,9 +1114,9 @@ var cursorRefresh = refreshCursorToken;
 
 export {
   startCallbackServer,
-  generatePkcePair,
   runAntigravityOAuthLogin,
   refreshAntigravityOAuthToken,
+  generatePkcePair,
   runOpenAiCodexDeviceCode,
   runOpenAiCodexBrowserPkce,
   refreshOpenAiCodexToken2 as refreshOpenAiCodexToken,