nolo-cli 0.27.0 → 0.28.0

package/{chunk-7OYLPHDL.js → chunk-PASYOZYI.js}

@@ -1,12 +1,13 @@
 import {
+  anthropicRefresh,
   cursorRefresh,
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
-  refreshXaiOAuthToken
-} from "./chunk-VV4TYWNV.js";
+  xaiRefresh
+} from "./chunk-WX3ZOSTL.js";
 import {
   buildLocalAgentLookupKeys
-} from "./chunk-7WMLPRXP.js";
+} from "./chunk-UP7UFQOH.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -19,13 +20,13 @@ import {
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-J7PB5GXH.js";
+} from "./chunk-D36OKPFG.js";
 import {
   getAntigravityUserAgent,
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-UTYJ47H2.js";
+} from "./chunk-2FX23RGA.js";
 import {
   readXPostFunc,
   readXPostFunctionSchema,
@@ -34,7 +35,7 @@ import {
   rememberMemoryFunctionSchema,
   resolveAgentRequiredPackIds,
   setTodoListFunc
-} from "./chunk-HQFXBRI2.js";
+} from "./chunk-XMAELUQW.js";
 import {
   createDrainExhaustedResponse,
   isCoreDrainingBody,
@@ -49,13 +50,13 @@ import {
   prepareTokenUsageData,
   resolveBuiltinPlatformAgentConfig,
   runKeyed
-} from "./chunk-Q4TAIQTA.js";
+} from "./chunk-QUXMWSCQ.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-XOIF2TNF.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-QCUS52YR.js";
+} from "./chunk-SFFG3HJH.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
@@ -89,7 +90,7 @@ import {
   readOpenAiCompatibleSseCompletion,
   resolveAgentNextAvailableAt,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-TTPVLL5F.js";
+} from "./chunk-7IX2Z2IF.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -106,7 +107,7 @@ import {
 import {
   resolveHistoricalToolContentCap,
   summarizeToolArguments
-} from "./chunk-YZV4676I.js";
+} from "./chunk-A6WDXLAG.js";
 import {
   convertMessagesToResponsesInput,
   toResponsesTools
@@ -191,9 +192,6 @@ import {
   createUserKey,
   dialogMessageRange
 } from "./chunk-NRY4GCKJ.js";
-import {
-  asOptionalFiniteNumber
-} from "./chunk-WWC7I6TA.js";
 import {
   asTrimmedNonEmptyStringArray
 } from "./chunk-I42VC5KR.js";
@@ -10107,57 +10105,6 @@ function isCodexOAuthAgent(agentConfig) {
   return apiKeyRef === "chatgpt";
 }
 
-// packages/agent-runtime/oauthProviders.ts
-var XAI_ACCESS_TOKEN_CLIENT_SKEW_MS = 5 * 60 * 1e3;
-var decodeBase64 = (s) => Buffer.from(s, "base64").toString("utf8");
-var ANTIGRAVITY_CLIENT_ID = decodeBase64(
-  "MTA3MTAwNjA2MDU5MS10bWhzc2luMmgyMWxjcmUyMzV2dG9sb2poNGc0MDNlcC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbQ=="
-);
-var ANTIGRAVITY_CLIENT_SECRET = decodeBase64("R09DU1BYLUs1OEZXUjQ4NkxkTEoxbUxCOHNYQzR6NnFEQWY=");
-var ANTIGRAVITY_ACCESS_TOKEN_CLIENT_SKEW_MS = 5 * 60 * 1e3;
-var ANTHROPIC_OAUTH_CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
-var ANTHROPIC_OAUTH_TOKEN_URL = "https://api.anthropic.com/v1/oauth/token";
-var ANTHROPIC_ACCESS_TOKEN_CLIENT_SKEW_MS = 5 * 60 * 1e3;
-var anthropicRefresh = async (credential, deps = {}) => {
-  if (!credential.refreshToken) {
-    throw new Error("Claude credential has no refresh_token");
-  }
-  const fetchImpl = deps.fetchImpl ?? fetch;
-  const response = await fetchImpl(ANTHROPIC_OAUTH_TOKEN_URL, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "anthropic-beta": "oauth-2025-04-20",
-      "User-Agent": "nolo-cli userOAuthProvider"
-    },
-    body: JSON.stringify({
-      grant_type: "refresh_token",
-      client_id: ANTHROPIC_OAUTH_CLIENT_ID,
-      refresh_token: credential.refreshToken
-    }),
-    signal: AbortSignal.timeout(3e4)
-  });
-  const payload = await response.json().catch(() => ({}));
-  if (!response.ok) {
-    const detail = typeof payload.error_description === "string" ? payload.error_description : typeof payload.error === "string" ? payload.error : `HTTP ${response.status}`;
-    throw new Error(`Claude token refresh failed: ${detail}`);
-  }
-  if (typeof payload.access_token !== "string" || !payload.access_token) {
-    throw new Error("Claude token refresh response missing access_token");
-  }
-  const expiresIn = asOptionalFiniteNumber(payload.expires_in);
-  const now = deps.now?.() ?? Date.now();
-  return {
-    ...credential,
-    provider: "claude",
-    accessToken: payload.access_token,
-    refreshToken: typeof payload.refresh_token === "string" && payload.refresh_token ? payload.refresh_token : credential.refreshToken,
-    ...expiresIn !== void 0 ? { expiresAt: now + expiresIn * 1e3 - ANTHROPIC_ACCESS_TOKEN_CLIENT_SKEW_MS } : {},
-    scope: typeof payload.scope === "string" ? payload.scope : credential.scope,
-    obtainedAt: now
-  };
-};
-
 // packages/cli/oauth/apiKeyRefResolver.ts
 var REFRESH_BY_PROVIDER = {
   chatgpt: refreshOpenAiCodexToken,
@@ -10165,7 +10112,7 @@ var REFRESH_BY_PROVIDER = {
   // surfaced as "OAuth credential not found" even when ~/.nolo/credentials
   // still held a valid refresh_token.
   antigravity: refreshAntigravityOAuthToken,
-  xai: refreshXaiOAuthToken,
+  xai: xaiRefresh,
   claude: anthropicRefresh,
   cursor: cursorRefresh
 };
@@ -11230,6 +11177,11 @@ function createCliLocalRuntimeAdapter(deps) {
               model: agentConfig.model || "gemini-3.1-pro",
               provider: agentConfig.provider || "google-antigravity",
               ...tool_calls ? { tool_calls } : {},
+              // fetchAntigravityCloudCodeCompletion 已把 CCA 流聚合完毕并归一化成
+              // OpenAI chat.completions 形状：choices[0] + usage
+              // （prompt_tokens/completion_tokens/total_tokens）。必须透传，否则
+              // localLoop 的 lastUsage 无 token 数，TUI context chip 拿不到更新。
+              usage: result.body?.usage,
               trace: messages
             };
           }
@@ -11298,6 +11250,11 @@ function createCliLocalRuntimeAdapter(deps) {
               model: agentConfig.model || "claude-sonnet-5",
               provider: "anthropic",
               ...tool_calls ? { tool_calls } : {},
+              // fetchAnthropicMessagesCompletion 已把 Anthropic Messages 响应归一化成
+              // OpenAI chat.completions 形状：choices[0] + usage（prompt_tokens/
+              // output_tokens/cache_*）。必须透传，否则 localLoop 的 lastUsage 无
+              // token 数，TUI context chip 拿不到更新（与 Codex OAuth 分支同因）。
+              usage: result.body?.usage,
               trace: messages
             };
           }

package/{chunk-AL2V7U3E.js → chunk-PJY5AH5A.js}

@@ -77,20 +77,26 @@ var buildSpaceContextLayer = async (args) => {
     ].join("\n")
   );
 };
-var buildSkillDiscoveryLayer = (skills, boundFolder) => {
+var buildSkillDiscoveryLayer = (skills, _boundFolder) => {
   if (skills.length === 0) return null;
   const lines = [
     "--- \u53EF\u7528\u6280\u80FD\uFF08Skills\uFF09---",
-    `\u5DE5\u4F5C\u533A ${boundFolder} \u4E2D\u53D1\u73B0\u4E86 ${skills.length} \u4E2A\u6280\u80FD\uFF08SKILL.md\uFF09\uFF1A`,
-    "\u6A21\u578B\u53EF\u6309\u9700\u7528 loadSkill \u5DE5\u5177\u6309\u540D\u52A0\u8F7D\uFF0C\u628A SKILL.md \u5168\u6587\u62C9\u8FDB\u4E0A\u4E0B\u6587\u540E\u9075\u5FAA\u5176\u6307\u4EE4\uFF1B",
-    "\u5982 loadSkill \u4E0D\u53EF\u7528\u6216\u60F3\u76F4\u63A5\u8BFB\u53D6\u6587\u4EF6\uFF0C\u4E0B\u65B9 path \u4ECD\u53EF\u7528 readFile \u4F5C\u4E3A fallback\uFF1A",
-    "",
+    `\u5DE5\u4F5C\u533A\u4E2D\u53D1\u73B0\u4E86 ${skills.length} \u4E2A\u6280\u80FD\uFF08SKILL.md\uFF09\uFF0C\u6A21\u578B\u53EF\u6309\u9700\u7528 loadSkill \u6309\u540D\u52A0\u8F7D\u6216 readFile \u76F4\u63A5\u8BFB\u53D6\uFF1A`,
     ...skills.map(
-      (s) => `- ${s.name}: ${s.description}
-  path: ${s.relativePath}`
+      (s) => `- ${s.name}: ${s.description} (path: ${s.relativePath})`
     )
   ];
-  return makeLayer("skill-discovery", lines.join("\n"));
+  return makeLayer("skill-discovery", lines.join("\n"), "session");
+};
+var buildAgentsMdLayer = (content, fileName = "AGENTS.md") => {
+  const trimmed = content.trim();
+  if (!trimmed) return null;
+  return makeLayer(
+    "agents-md",
+    `--- \u9879\u76EE\u6307\u4EE4\uFF08${fileName}\uFF09---
+${trimmed}`,
+    "session"
+  );
 };
 var buildLinkedSpacesSection = async (args) => {
   const ids = (args.linkedSpaceIds ?? []).filter(
@@ -123,6 +129,14 @@ var buildLinkedSpacesSection = async (args) => {
     "\u63D0\u793A\uFF1A\u5982\u9700\u67E5\u8BE2\u8FD9\u4E9B\u7A7A\u95F4\u7684\u8BE6\u7EC6\u5185\u5BB9\uFF0C\u53EF\u4F7F\u7528 read \u5DE5\u5177\u914D\u5408\u5BF9\u5E94\u7684 dbKey\u3002"
   ].join("\n");
 };
+var renderTurnContextBlocksWithScope = (layers) => layers.filter((layer) => Boolean(layer?.content?.trim())).map((layer) => ({
+  content: layer.content.trim(),
+  cacheScope: layer.cacheScope
+}));
+var partitionScopedBlocks = (blocks) => [
+  ...blocks.filter((block) => block.cacheScope === "session"),
+  ...blocks.filter((block) => block.cacheScope === "turn")
+];
 var buildDialogSummaryLayer = (args) => {
   const historical = wrapHistoricalSummaryWithReplayGuard(
     asTrimmed(args.summary)
@@ -149,7 +163,10 @@ var buildMemoryUseGuidanceLayer = (args) => {
 export {
   buildSpaceContextLayer,
   buildSkillDiscoveryLayer,
+  buildAgentsMdLayer,
   buildLinkedSpacesSection,
+  renderTurnContextBlocksWithScope,
+  partitionScopedBlocks,
   buildDialogSummaryLayer,
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer