nolo-cli 0.30.0 → 0.31.0-alpha.1

package/{chunk-DI6MXJK5.js → chunk-C3NYMZTQ.js}

@@ -5,10 +5,10 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-W2YKDXT7.js";
+} from "./chunk-2YT3KLHX.js";
 import {
   EMPTY_ASSISTANT_REPAIR_PROMPT
-} from "./chunk-KW47OSRJ.js";
+} from "./chunk-WMH2G6XJ.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -20,12 +20,12 @@ import {
 } from "./chunk-N7J63Q6C.js";
 import {
   performFetchRequest
-} from "./chunk-DCWBP2O7.js";
+} from "./chunk-YJZGAAVX.js";
 import {
   createSSEParser,
   findToolExecutor,
   toolDefinitionsByName
-} from "./chunk-SWOTB2TX.js";
+} from "./chunk-2MSOY7A5.js";
 import {
   createToolRunId,
   getToolResultErrorData,
@@ -33,21 +33,23 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-OYK7PA5U.js";
+} from "./chunk-XPML3KYZ.js";
 import {
   getPublicImageAgentMode
-} from "./chunk-YWGSCF37.js";
+} from "./chunk-E3APEOIM.js";
+import {
+  selectCurrentSpaceId
+} from "./chunk-XGJ75KN2.js";
 import {
   addToolMessage,
   getModelInfo,
   messageStreamEnd,
   messageStreaming,
-  selectCurrentSpaceId,
   updateToolMessage
-} from "./chunk-THTAR67C.js";
+} from "./chunk-RJ7KLCWY.js";
 import {
   streamAgentChatTurn
-} from "./chunk-GAGUBI42.js";
+} from "./chunk-5MVFYKBL.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -58,23 +60,23 @@ import {
 } from "./chunk-3ASDTTEI.js";
 import {
   getApiEndpoint
-} from "./chunk-VSTUQGLT.js";
+} from "./chunk-2K4NDPT5.js";
 import {
   selectCurrentServer
-} from "./chunk-446VANPP.js";
+} from "./chunk-G5GVZAXF.js";
 import {
   write
-} from "./chunk-A4JDTA5T.js";
+} from "./chunk-LAXMH7JY.js";
 import {
   extractCustomId
 } from "./chunk-TOW4E763.js";
 import {
   createAsyncThunk,
   selectIdentityToken
-} from "./chunk-ZFTCLBEX.js";
+} from "./chunk-2IJAKBK2.js";
 import {
   isAbortError
-} from "./chunk-R5V5G73M.js";
+} from "./chunk-5RDLGLAP.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,

package/{chunk-HI7QZNWX.js → chunk-CPUZW54L.js}

@@ -1,16 +1,16 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-MMCVBEAD.js";
+} from "./chunk-E2CFIWQR.js";
 import {
   runLocalAgentTurn
-} from "./chunk-KW47OSRJ.js";
+} from "./chunk-WMH2G6XJ.js";
 import {
   clipMultilineText
-} from "./chunk-OYK7PA5U.js";
+} from "./chunk-XPML3KYZ.js";
 import {
   resolveLocalRuntimeEnvFromPolicy
-} from "./chunk-GAGUBI42.js";
+} from "./chunk-5MVFYKBL.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";

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

@@ -1,7 +1,7 @@
 import {
   MEMORY_USE_GUIDANCE,
   wrapHistoricalSummaryWithReplayGuard
-} from "./chunk-4PWB7JRR.js";
+} from "./chunk-XFG3BAKN.js";
 
 // packages/agent-runtime/turnContext.ts
 var DEFAULT_RECENT_CONTENT_LIMIT = 10;

package/{chunk-MMCVBEAD.js → chunk-E2CFIWQR.js}

@@ -4,7 +4,7 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   xaiRefresh
-} from "./chunk-T3Y5EMJS.js";
+} from "./chunk-SFWZUTCI.js";
 import {
   ackRunRecord,
   checkStaleRun,
@@ -15,8 +15,9 @@ import {
   gcRunRecords,
   queryRunRecords,
   releaseRunRecordAck,
-  spawnLocalBackgroundRun
-} from "./chunk-4SAV7BD7.js";
+  spawnLocalBackgroundRun,
+  terminateRunProcess
+} from "./chunk-7KNERA53.js";
 import {
   CliProviderQuotaError,
   executeCli
@@ -26,7 +27,7 @@ import {
 } from "./chunk-WJRJDX2W.js";
 import {
   buildLocalAgentLookupKeys
-} from "./chunk-66O5MZYH.js";
+} from "./chunk-NEGMZP6Q.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -53,7 +54,7 @@ import {
   readOpenAiCompatibleSseCompletion,
   resolveAgentNextAvailableAt,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-UKC5HU2C.js";
+} from "./chunk-EATVNXFX.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -63,7 +64,7 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-MEUZFIAJ.js";
+} from "./chunk-7S54ZGF6.js";
 import {
   buildCliPrompt
 } from "./chunk-ATNTHIZI.js";
@@ -73,25 +74,25 @@ import {
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-W2YKDXT7.js";
+} from "./chunk-2YT3KLHX.js";
 import {
   inferCaptureIntent,
   resolveHistoricalToolContentCap,
   summarizeToolArguments
-} from "./chunk-KW47OSRJ.js";
+} from "./chunk-WMH2G6XJ.js";
 import {
   getAntigravityUserAgent,
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-TJYWZ3LO.js";
+} from "./chunk-YHGHADBQ.js";
 import {
   convertMessagesToResponsesInput,
   toResponsesTools
 } from "./chunk-D34RI6NI.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-XD5NQEOH.js";
+} from "./chunk-UDA3ZYLW.js";
 import {
   buildDialogFallbackTitleFromUserInput,
   normalizeDialogTitle
@@ -103,7 +104,7 @@ import {
   readXhsProfileFunctionSchema,
   rememberMemoryFunctionSchema,
   setTodoListFunc
-} from "./chunk-SWOTB2TX.js";
+} from "./chunk-2MSOY7A5.js";
 import {
   createDrainExhaustedResponse,
   isCoreDrainingBody,
@@ -127,24 +128,24 @@ import {
   parseNoloWorkspaceToolArguments,
   resolveAgentRequiredPackIds,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-OYK7PA5U.js";
+} from "./chunk-XPML3KYZ.js";
 import {
   applyTokenUsageToDayStats,
   prepareTokenUsageData,
   resolveBuiltinPlatformAgentConfig,
   runKeyed
-} from "./chunk-THTAR67C.js";
+} from "./chunk-RJ7KLCWY.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG,
   clipCompactText
-} from "./chunk-OB6FBSH3.js";
+} from "./chunk-BGTUGS3T.js";
 import {
   createFileCredentialBroker,
   fetchServerSyncedCredential,
   resolveCurrentRunRuntimeToolPolicy,
   resolveLocalWorkspaceExecutorOptionsFromPolicy,
   resolveRequestedRuntimeToolNames
-} from "./chunk-GAGUBI42.js";
+} from "./chunk-5MVFYKBL.js";
 import {
   createOAuthTokenStore,
   isTokenExpired,
@@ -162,7 +163,7 @@ import {
 } from "./chunk-DWLEOOGR.js";
 import {
   isAdaptiveThinkingModelId
-} from "./chunk-VSTUQGLT.js";
+} from "./chunk-2K4NDPT5.js";
 import {
   isCompiledBinary,
   parseUserIdFromAuthToken
@@ -175,7 +176,7 @@ import {
 } from "./chunk-QSJ3HFEF.js";
 import {
   isSystemBuiltinTrustedAgentKey
-} from "./chunk-DWQNDGO7.js";
+} from "./chunk-ZJH3LKEW.js";
 import {
   NOLO_CLUSTER_SERVERS
 } from "./chunk-LCBAMY2M.js";
@@ -2713,12 +2714,19 @@ function createCliControlAgentRunExecutor(deps = {}) {
       }
     }
     if (typeof record.pid === "number") {
-      try {
-        (deps.kill ?? ((pid, signal) => process.kill(pid, signal)))(
-          record.pid,
-          "SIGTERM"
-        );
-      } catch {
+      const confirmed = await terminateRunProcess(record, "SIGTERM", deps);
+      if (!confirmed) {
+        return {
+          content: JSON.stringify({
+            runId: record.runId,
+            found: true,
+            status: record.status,
+            stopConfirmed: false
+          }),
+          metadata: {
+            displayData: `stop failed: process ${record.pid} still alive after SIGKILL`
+          }
+        };
       }
     }
     finalizeRunRecord(record.runId, { status: "killed" }, deps);
@@ -3091,7 +3099,7 @@ function extractInlineDataParts(content) {
 function convertOpenAiMessagesToGemini(messages, options) {
   const contents = [];
   const systemTexts = [];
-  const toolNamesById = /* @__PURE__ */ new Map();
+  let toolCallIndex = 0;
   let pendingFunctionCalls = [];
   const pushOrMergeContent = (role, parts) => {
     if (parts.length === 0) return;
@@ -3105,8 +3113,12 @@ function convertOpenAiMessagesToGemini(messages, options) {
   const flushPendingFunctionCalls = () => {
     if (pendingFunctionCalls.length === 0) return;
     const dummyResponses = pendingFunctionCalls.map(
-      ({ name }) => ({
-        functionResponse: { name, response: { output: "{}" } }
+      ({ name, id }) => ({
+        functionResponse: {
+          name,
+          response: { output: "{}" },
+          ...id ? { id } : {}
+        }
       })
     );
     pendingFunctionCalls = [];
@@ -3144,16 +3156,14 @@ function convertOpenAiMessagesToGemini(messages, options) {
         content
       );
       const toolCalls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls ?? [] : [];
-      if (text) pushOrMergeContent("model", [{ text }]);
-      if (toolCalls.length > 0 && contents.length > 0 && contents[contents.length - 1]?.role !== "user") {
-        contents.push({ role: "user", parts: [{ text: "" }] });
-      }
       const parts = [];
+      if (text) {
+        parts.push({ text });
+      }
       for (const call of toolCalls) {
         const name = call?.function?.name?.trim();
         if (!name) continue;
-        const id = call.id?.trim() || `${name}_${toolNamesById.size}`;
-        toolNamesById.set(id, name);
+        const id = call.id?.trim() || `${name}_${toolCallIndex++}`;
         pendingFunctionCalls.push({ name, id });
         const realSignature = typeof call.thought_signature === "string" && call.thought_signature ? call.thought_signature : void 0;
         const isFirstFunctionCallPart = !parts.some(

package/{chunk-YWGSCF37.js → chunk-E3APEOIM.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-CWMSB67P.js";
 import {
   getModelConfig
-} from "./chunk-VSTUQGLT.js";
+} from "./chunk-2K4NDPT5.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";

package/{chunk-UKC5HU2C.js → chunk-EATVNXFX.js}

@@ -4,14 +4,14 @@ import {
   providerHttpFailure,
   readSseFrames,
   throwIfChatCompletionStreamFailed
-} from "./chunk-MEUZFIAJ.js";
+} from "./chunk-7S54ZGF6.js";
 import {
   sanitizeForOutbound
 } from "./chunk-T27IEBNQ.js";
 import {
   parseToolArgumentsJson,
   resolveHistoricalToolContentCap
-} from "./chunk-KW47OSRJ.js";
+} from "./chunk-WMH2G6XJ.js";
 import {
   createThinkParserState,
   createToolCallAccumulator,
@@ -22,7 +22,7 @@ import {
 import {
   requiresBareImageUrl,
   toBareImageUrlMessages
-} from "./chunk-7CD24PU4.js";
+} from "./chunk-NMK2JHKM.js";
 import {
   shouldStripReasoningContentForOutbound,
   toOpenAiCompatibleMessages
@@ -30,7 +30,7 @@ import {
 import {
   buildProviderAuthHeaders,
   buildProviderExecutionPlan
-} from "./chunk-XD5NQEOH.js";
+} from "./chunk-UDA3ZYLW.js";
 import {
   buildDialogFallbackTitleFromUserInput
 } from "./chunk-2MBTWINN.js";
@@ -39,7 +39,7 @@ import {
   buildNoloWorkspaceCommandArgs,
   noloStringArg,
   parseNoloWorkspaceToolArguments
-} from "./chunk-OYK7PA5U.js";
+} from "./chunk-XPML3KYZ.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -4086,7 +4086,7 @@ function buildLoadSkillExecutor(args) {
         metadata: { loadSkill: true, resolved: false }
       };
     }
-    const { resolveSkillByName } = await import("./skillDiscovery-I3QRA7NE.js");
+    const { resolveSkillByName } = await import("./skillDiscovery-Y3HALY2U.js");
     const resolved = resolveSkillByName(args.cwd, name);
     if (!resolved) {
       const { resolveCodingBuiltinSlug, buildCodingSkillContentBySlug } = await import("./codingSkills-V35TRR4Y.js");
@@ -4124,7 +4124,7 @@ ${body}`,
   };
 }
 async function formatUnknownSkillMessage(cwd, requestedName) {
-  const { discoverSkills } = await import("./skillDiscovery-I3QRA7NE.js");
+  const { discoverSkills } = await import("./skillDiscovery-Y3HALY2U.js");
   let available = [];
   try {
     available = discoverSkills(cwd).map((s) => s.name);

package/{chunk-G5JHHUAK.js → chunk-F3MP7CP6.js}

@@ -52,7 +52,7 @@ async function readDocFunc(args, thunkApi) {
     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-QK7ZRX6G.js");
+    const { readAction } = await import("./read-64OQDO3I.js");
     const pageData = await readAction({ dbKey: id }, thunkApi);
     if (!pageData) {
       throw new Error(`\u672A\u627E\u5230 ID \u4E3A ${id} \u7684\u9875\u9762\u3002`);

package/{chunk-FS5TTXPS.js → chunk-FLYQAMF4.js}

@@ -1,6 +1,6 @@
 import {
   updateContentTitle
-} from "./chunk-THTAR67C.js";
+} from "./chunk-XGJ75KN2.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
@@ -13,7 +13,7 @@ import {
 import {
   patch,
   readAndWait
-} from "./chunk-A4JDTA5T.js";
+} from "./chunk-LAXMH7JY.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -367,7 +367,7 @@ async function saveDocState(arg, { dispatch, getState }) {
   }
 }
 async function createDocState(args, thunkApi) {
-  const { createPageAction } = await import("./createPageAction-QYTG656R.js");
+  const { createPageAction } = await import("./createPageAction-KRTBWM2S.js");
   return createPageAction(args, thunkApi);
 }
 function subscribe(listener) {

package/{chunk-446VANPP.js → chunk-G5GVZAXF.js}

@@ -7,13 +7,13 @@ import {
   toTimestampMs,
   upsert,
   write
-} from "./chunk-A4JDTA5T.js";
+} from "./chunk-LAXMH7JY.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   BUILTIN_NOLO_AGENT_KEY
-} from "./chunk-DWQNDGO7.js";
+} from "./chunk-ZJH3LKEW.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
@@ -21,12 +21,12 @@ import {
   createAsyncThunk,
   createSelector,
   selectIdentityUserId
-} from "./chunk-ZFTCLBEX.js";
+} from "./chunk-2IJAKBK2.js";
 import {
   getAllServers,
   getIsDesktopApp,
   isProduction
-} from "./chunk-R5V5G73M.js";
+} from "./chunk-5RDLGLAP.js";
 import {
   SERVERS
 } from "./chunk-LCBAMY2M.js";

package/{chunk-KWKD3BCC.js → chunk-H6COXALE.js}

@@ -19,12 +19,12 @@ import {
   parseAgentRunEvent,
   t,
   toolLabel
-} from "./chunk-MMCVBEAD.js";
+} from "./chunk-E2CFIWQR.js";
 import {
   createRunActivityTracker,
   finalizeRunRecord,
   spawnLocalBackgroundRun
-} from "./chunk-4SAV7BD7.js";
+} from "./chunk-7KNERA53.js";
 import {
   CliProviderQuotaError
 } from "./chunk-JDSUTNYY.js";
@@ -38,14 +38,14 @@ import {
   normalizeAgentHandle,
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-56IUA7RU.js";
+} from "./chunk-K76HYM3O.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
 } from "./chunk-K6QEHQZ3.js";
 import {
   buildSkillDiscoveryContextLayer
-} from "./chunk-KWCLUYGQ.js";
+} from "./chunk-QL6ELRVS.js";
 import {
   applyModelLayerOverride,
   buildModelLayerOverride
@@ -58,7 +58,7 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-KW47OSRJ.js";
+} from "./chunk-WMH2G6XJ.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -70,13 +70,13 @@ import {
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-PJY5AH5A.js";
+} from "./chunk-DPR66GY6.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-XD5NQEOH.js";
+} from "./chunk-UDA3ZYLW.js";
 import {
   formatAgentListCard
-} from "./chunk-SWOTB2TX.js";
+} from "./chunk-2MSOY7A5.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-Z5MXSEOJ.js";
@@ -95,17 +95,17 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-QLV2GKU5.js";
+} from "./chunk-OT2AXEQD.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-THTAR67C.js";
+} from "./chunk-RJ7KLCWY.js";
 import {
   clipCompactText
-} from "./chunk-OB6FBSH3.js";
+} from "./chunk-BGTUGS3T.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -114,7 +114,7 @@ import {
 } from "./chunk-DWLEOOGR.js";
 import {
   findModelConfig
-} from "./chunk-VSTUQGLT.js";
+} from "./chunk-2K4NDPT5.js";
 import {
   readPipeText,
   spawnProcess
@@ -124,14 +124,14 @@ import {
 } from "./chunk-A7GB5UGH.js";
 import {
   parsePositiveFiniteNumberOrFallback
-} from "./chunk-446VANPP.js";
+} from "./chunk-G5GVZAXF.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   BUILTIN_NOLO_AGENT_KEY,
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY
-} from "./chunk-DWQNDGO7.js";
+} from "./chunk-ZJH3LKEW.js";
 import {
   isLoopbackUrl
 } from "./chunk-4SN6J65J.js";
@@ -3538,7 +3538,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-I57YSGH4.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-G7GK545E.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -4464,6 +4464,28 @@ var KIND_TITLES = {
   semantic: "Semantic",
   procedural: "Procedural"
 };
+var estimateTokens = (text) => {
+  let cjk = 0;
+  let ascii = 0;
+  for (const ch of text) {
+    const code = ch.codePointAt(0) ?? 0;
+    if (code >= 13312 && code <= 40959) cjk += 1;
+    else ascii += 1;
+  }
+  return Math.ceil(cjk * 1.5 + ascii / 4);
+};
+var OVERLAY_HEADER_LINES = [
+  "--- Memory Overlay ---",
+  "\u4EE5\u4E0B\u662F\u5F53\u524D\u8BF7\u6C42\u53EF\u7528\u7684\u8BB0\u5FC6\u4E8B\u5B9E\uFF1B\u76F8\u5173\u65F6\u76F4\u63A5\u57FA\u4E8E\u8FD9\u4E9B\u8BB0\u5FC6\u56DE\u7B54\u3002",
+  "\u7528\u6237\u5F53\u524D\u8F93\u5165\u4F18\u5148\u4E8E\u8BB0\u5FC6\uFF1B\u8BB0\u5FC6\u53EA\u8F85\u52A9\u7406\u89E3\uFF0C\u4E0D\u8981\u6C42\u8FCE\u5408\u3002",
+  ""
+];
+var OVERLAY_HEADER_TOKENS = estimateTokens(OVERLAY_HEADER_LINES.join("\n"));
+var KIND_PRIORITY = {
+  semantic: 0,
+  procedural: 1,
+  episodic: 2
+};
 var normalizeDisplayContent = (item) => {
   const normalized = item.content.trim().replace(/^(你要记住|请记住|以后记住|记住)[，,。.\s:：]*/u, "").replace(/[。！？!?]+$/u, "").trim();
   const stripPrefix = (prefix) => normalized.startsWith(prefix) ? normalized.slice(prefix.length).trim() : normalized;
@@ -4503,8 +4525,10 @@ var normalizeDisplayContent = (item) => {
   }
   return normalized;
 };
-var buildMemoryOverlay = (items) => {
+var buildMemoryOverlay = (items, options) => {
   if (items.length === 0) return null;
+  const maxTokens = options?.maxTokens ?? 800;
+  const perKindLimit = options?.perKindLimit ?? 3;
   const byKind = {
     episodic: [],
     semantic: [],
@@ -4513,17 +4537,43 @@ var buildMemoryOverlay = (items) => {
   for (const item of items) {
     byKind[item.kind].push(item);
   }
-  const sections = Object.entries(byKind).filter(([, list]) => list.length > 0).map(([kind, list]) => {
-    const lines = list.slice(0, 3).map((item) => `- ${normalizeDisplayContent(item)}`);
-    return [`[${KIND_TITLES[kind]}]`, ...lines].join("\n");
+  const cappedByKind = Object.entries(byKind).filter(([, list]) => list.length > 0).map(([kind, list]) => [kind, list.slice(0, perKindLimit)]);
+  const remainingBudget = maxTokens - OVERLAY_HEADER_TOKENS;
+  if (remainingBudget <= 0) {
+    return OVERLAY_HEADER_LINES.join("\n");
+  }
+  const allLines = [];
+  for (const [kind, list] of cappedByKind) {
+    for (const item of list) {
+      const lineText = `- ${normalizeDisplayContent(item)}`;
+      allLines.push({
+        kind,
+        lineText,
+        lineTokens: estimateTokens(lineText)
+      });
+    }
+  }
+  allLines.sort((a, b) => {
+    const pa = KIND_PRIORITY[a.kind] ?? 99;
+    const pb = KIND_PRIORITY[b.kind] ?? 99;
+    return pa - pb;
   });
-  return [
-    "--- Memory Overlay ---",
-    "\u4EE5\u4E0B\u662F\u5F53\u524D\u8BF7\u6C42\u53EF\u7528\u7684\u8BB0\u5FC6\u4E8B\u5B9E\uFF1B\u76F8\u5173\u65F6\u76F4\u63A5\u57FA\u4E8E\u8FD9\u4E9B\u8BB0\u5FC6\u56DE\u7B54\u3002",
-    "\u7528\u6237\u5F53\u524D\u8F93\u5165\u4F18\u5148\u4E8E\u8BB0\u5FC6\uFF1B\u8BB0\u5FC6\u53EA\u8F85\u52A9\u7406\u89E3\uFF0C\u4E0D\u8981\u6C42\u8FCE\u5408\u3002",
-    "",
-    ...sections
-  ].join("\n");
+  let usedTokens = 0;
+  const keptByKind = {};
+  for (const candidate of allLines) {
+    if (usedTokens + candidate.lineTokens > remainingBudget) continue;
+    usedTokens += candidate.lineTokens;
+    if (!keptByKind[candidate.kind]) keptByKind[candidate.kind] = [];
+    keptByKind[candidate.kind].push(candidate.lineText);
+  }
+  const kindOrder = ["semantic", "procedural", "episodic"];
+  const sections = kindOrder.filter((kind) => keptByKind[kind] && keptByKind[kind].length > 0).map((kind) => {
+    return [`[${KIND_TITLES[kind]}]`, ...keptByKind[kind]].join("\n");
+  });
+  if (sections.length === 0) {
+    return OVERLAY_HEADER_LINES.join("\n");
+  }
+  return [...OVERLAY_HEADER_LINES, ...sections].join("\n");
 };
 
 // packages/ai/memory/rank.ts
@@ -4632,6 +4682,7 @@ var rankMemoryCandidates = (items, query, context) => {
 
 // packages/ai/memory/runtime.ts
 var COLD_STORAGE_CONFIDENCE = 0.3;
+var MEMORY_OVERLAY_TOKEN_BUDGET = 800;
 var normalizeSelectedContent = (text) => text.trim().replace(/^(你要记住|请记住|以后记住|记住)[，,。.\s:：]*/u, "").replace(/[。！？!?]+$/u, "").trim();
 var STACK_TERMS = [
   "typescript",
@@ -4776,7 +4827,7 @@ var resolveMemoryRuntime = async (input) => {
   await touchMemoryItemsInDb(input.db, ranked);
   return {
     selectedItems: ranked,
-    promptBlock: buildMemoryOverlay(ranked)
+    promptBlock: buildMemoryOverlay(ranked, { maxTokens: MEMORY_OVERLAY_TOKEN_BUDGET })
   };
 };