nolo-cli 0.38.0-alpha.2 → 0.47.0-alpha.1

package/{chunk-YNAGAUJT.js → chunk-GYSVYO35.js}

@@ -5,14 +5,14 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-EJAL5LSG.js";
+} from "./chunk-NC3CSWVT.js";
 import {
   INVALID_TOOL_ARGS_REPLACEMENT,
   buildInvalidToolCallSelfHealResult,
   parseToolCallArguments,
   performFetchRequest,
   sanitizeOutboundMessages
-} from "./chunk-FXZBSLFK.js";
+} from "./chunk-NSQNNYGW.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -23,30 +23,27 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-JK7UM3LT.js";
+} from "./chunk-SEIOEDBB.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
 import {
   getCurrentSpaceId
-} from "./chunk-D72M3G32.js";
+} from "./chunk-FM6ZGNMV.js";
 import {
   addToolMessage,
   messageStreamEnd,
   messageStreaming,
   updateToolMessage
-} from "./chunk-ARFXKWJH.js";
+} from "./chunk-5PFBRLJN.js";
 import {
   streamAgentChatTurn
-} from "./chunk-CVXDBLYH.js";
+} from "./chunk-XOFZEJGM.js";
 import {
   addActiveController,
   removeActiveController,
   tokenUsageLiveUpdate
 } from "./chunk-MRWGHF56.js";
-import {
-  EMPTY_ASSISTANT_REPAIR_PROMPT
-} from "./chunk-P66M7LSQ.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -57,25 +54,26 @@ import {
   processThinkChunk
 } from "./chunk-N7J63Q6C.js";
 import {
+  EMPTY_ASSISTANT_REPAIR_PROMPT,
   getModelInfo
-} from "./chunk-WRP5TTM6.js";
+} from "./chunk-4MXGXSYN.js";
 import {
   getApiEndpoint
-} from "./chunk-C6ELZQ7H.js";
+} from "./chunk-OZVGA4SY.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import {
   selectCurrentServer
-} from "./chunk-B6H5XCT2.js";
+} from "./chunk-EMEUU5IY.js";
 import {
   write
-} from "./chunk-23KKIMD5.js";
+} from "./chunk-WVGEBWA6.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,
   toTrimmedString
-} from "./chunk-2WKUUY2E.js";
+} from "./chunk-SVEUG45B.js";
 import {
   extractCustomId
 } from "./chunk-BJIRLHJR.js";
@@ -313,10 +311,18 @@ function updateTotalUsage(currentUsage, newUsageChunk) {
     return currentUsage;
   }
   if (!currentUsage) {
+    const hasExplicitTokenField = [
+      "prompt_tokens",
+      "completion_tokens",
+      "total_tokens",
+      "input_tokens",
+      "output_tokens"
+    ].some((field) => Object.prototype.hasOwnProperty.call(newUsageChunk, field));
     const first = {
-      completion_tokens: 0,
-      prompt_tokens: 0,
-      total_tokens: 0,
+      // Do not synthesize zero token fields for metadata-only events such as
+      // `{provider_call_id}`. Explicit provider zeros remain real reported
+      // usage; only pure metadata is eligible for estimated fallback.
+      ...hasExplicitTokenField ? { completion_tokens: 0, prompt_tokens: 0, total_tokens: 0 } : {},
       ...newUsageChunk
     };
     applyResponsesUsageFields(first, newUsageChunk);
@@ -356,6 +362,10 @@ function updateTotalUsage(currentUsage, newUsageChunk) {
   if (billingModel) {
     updatedUsage.billing_model = billingModel;
   }
+  const providerCallId = asOptionalTrimmedString(newUsageChunk.provider_call_id);
+  if (providerCallId) {
+    updatedUsage.provider_call_id = providerCallId;
+  }
   return updatedUsage;
 }
 function applyResponsesUsageFields(target, chunk) {
@@ -1017,9 +1027,24 @@ function createInitialStreamState() {
     hasHandedOff: false,
     hasProcessedToolCalls: false,
     alreadyFinalized: false,
-    finishReason: null
+    finishReason: null,
+    billingFailed: false,
+    skipBilling: false
   };
 }
+function shouldSkipBillingForUserAbort(error, totalUsage) {
+  if (!isAbortError(error)) return false;
+  if (!totalUsage || typeof totalUsage !== "object") return true;
+  const hasTokenField = [
+    "prompt_tokens",
+    "completion_tokens",
+    "total_tokens",
+    "input_tokens",
+    "output_tokens"
+  ].some((field) => Object.prototype.hasOwnProperty.call(totalUsage, field));
+  const hasCost = Object.prototype.hasOwnProperty.call(totalUsage, "cost") && typeof totalUsage.cost === "number";
+  return !(hasTokenField || hasCost);
+}
 function buildRequestBodyWithTools(bodyData, agentConfig, disableToolsForThisRequest) {
   const messagesForBody = Array.isArray(bodyData?.messages) ? sanitizeOutboundMessages(bodyData.messages) : bodyData?.messages;
   const baseBody = messagesForBody !== bodyData?.messages ? { ...bodyData, messages: messagesForBody } : bodyData;
@@ -1079,7 +1104,9 @@ async function finalizeStream(state, ctx) {
       reasoningBuffer: state.reasoningBuffer,
       messageMetadata: ctx.messageMetadata,
       toolCalls: state.assistantToolCalls,
-      spaceId: ctx.spaceId
+      spaceId: ctx.spaceId,
+      billingFailed: state.billingFailed,
+      skipBilling: state.skipBilling
     })
   );
   return {
@@ -1099,7 +1126,8 @@ function markEmptyCompletionAsError(state, ctx) {
     contentBuffer: appendTextChunk(
       state.contentBuffer,
       `[\u9519\u8BEF: ${EMPTY_UPSTREAM_STREAM_MESSAGE}]`
-    )
+    ),
+    billingFailed: true
   };
 }
 function markStreamMessageAborted(ctx, errorMessage) {
@@ -1435,7 +1463,7 @@ async function handleStreamCompletion(state, ctx, finalizeCtx) {
     };
   }
   if (!state.hasProcessedToolCalls && state.accumulatedToolCalls.length > 0) {
-    if (state.totalUsage) {
+    if (state.totalUsage && !state.billingFailed) {
       ctx.dispatch(tokenUsageLiveUpdate({
         input_tokens: state.totalUsage.prompt_tokens ?? state.totalUsage.input_tokens,
         output_tokens: state.totalUsage.completion_tokens ?? state.totalUsage.output_tokens,
@@ -1532,7 +1560,8 @@ var sendOpenAICompletionsRequest = async ({
     hasHandedOff: hasHandedOffOverall,
     finishReason: lastFinishReason,
     messageId,
-    usage: streamState.totalUsage ?? void 0
+    usage: streamState.totalUsage ?? void 0,
+    billingFailed: streamState.billingFailed
   });
   try {
     if (!parentMessageId) {
@@ -1615,7 +1644,8 @@ var sendOpenAICompletionsRequest = async ({
         contentBuffer: appendTextChunk(
           streamState.contentBuffer,
           `[\u9519\u8BEF: ${errorMessage}]`
-        )
+        ),
+        billingFailed: true
       };
       streamState = await finalizeStream(streamState, finalizeCtx);
       return buildMeta();
@@ -1711,7 +1741,8 @@ var sendOpenAICompletionsRequest = async ({
                 streamState.contentBuffer,
                 `
 [API Error] ${errorMsg}`
-              )
+              ),
+              billingFailed: true
             };
             await reader.cancel();
             break;
@@ -1744,29 +1775,6 @@ var sendOpenAICompletionsRequest = async ({
             streamState.finishReason = finishReason;
             if (finishReason === "tool_calls") {
               throttler.flush();
-              if (streamState.totalUsage) {
-                dispatch(tokenUsageLiveUpdate({
-                  input_tokens: streamState.totalUsage.prompt_tokens ?? streamState.totalUsage.input_tokens,
-                  output_tokens: streamState.totalUsage.completion_tokens ?? streamState.totalUsage.output_tokens,
-                  cost: streamState.totalUsage.cost,
-                  dialogKey
-                }));
-              }
-              const toolResult = await processAccumulatedToolCalls(
-                streamState,
-                {
-                  dispatch,
-                  agentConfig,
-                  dialogId,
-                  dialogKey,
-                  messageId,
-                  messageMetadata
-                }
-              );
-              streamState = toolResult.state;
-              hasHandedOffOverall ||= toolResult.hasHandedOff;
-              hasPendingInteractionOverall ||= toolResult.hasPendingInteraction;
-              streamState = await finalizeStream(streamState, finalizeCtx);
             } else if (finishReason !== "stop") {
               const finishErrorMessage = finishReason === "error" ? getChoiceFinishErrorMessage(data, choice) : null;
               streamState = {
@@ -1776,7 +1784,8 @@ var sendOpenAICompletionsRequest = async ({
                   finishErrorMessage ? `
 [API Error] Error: ${finishErrorMessage}` : finishReason === "error" ? "\n[API Error] Error: \u6A21\u578B\u54CD\u5E94\u4EE5 error \u7ED3\u675F\uFF0C\u4F46\u4E0A\u6E38\u672A\u8FD4\u56DE\u5177\u4F53\u9519\u8BEF\u3002\u8BF7\u91CD\u8BD5\uFF0C\u6216\u5207\u6362\u5230\u5176\u4ED6\u652F\u6301\u56FE\u7247\u8F93\u5165\u7684\u6A21\u578B\u3002" : `
 [\u6D41\u7ED3\u675F\u539F\u56E0: ${finishReason}]`
-                )
+                ),
+                ...finishReason === "error" ? { billingFailed: true } : {}
               };
             }
           }
@@ -1787,6 +1796,7 @@ var sendOpenAICompletionsRequest = async ({
     throttler.flush();
     let errorText;
     const isAbort = isAbortError(error);
+    const skipBilling = shouldSkipBillingForUserAbort(error, streamState.totalUsage);
     if (isAbort) {
       errorText = "\n[\u7528\u6237\u4E2D\u65AD]";
     } else {
@@ -1796,7 +1806,9 @@ var sendOpenAICompletionsRequest = async ({
     console.error("[SSE] sendOpenAICompletionsRequest error:", error);
     streamState = {
       ...streamState,
-      contentBuffer: appendTextChunk(streamState.contentBuffer, errorText)
+      contentBuffer: appendTextChunk(streamState.contentBuffer, errorText),
+      billingFailed: isAbort ? streamState.billingFailed : true,
+      skipBilling: streamState.skipBilling || skipBilling
     };
     if (!isAbort) {
       markStreamMessageAborted(

package/{chunk-JIADXJYU.js → chunk-H2G6JXTR.js}

@@ -1,6 +1,6 @@
 import {
   dialogMessageKey
-} from "./chunk-2WKUUY2E.js";
+} from "./chunk-SVEUG45B.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";

package/{chunk-MGIHZ5CJ.js → chunk-HAPCUPEO.js}

@@ -1,9 +1,9 @@
 import {
   selectCurrentServer
-} from "./chunk-B6H5XCT2.js";
+} from "./chunk-EMEUU5IY.js";
 import {
   patch
-} from "./chunk-23KKIMD5.js";
+} from "./chunk-WVGEBWA6.js";
 import {
   selectIdentityToken
 } from "./chunk-HHBXCRJS.js";

package/{chunk-LD6Y6RJY.js → chunk-HGDOIDQ4.js}

@@ -1,7 +1,7 @@
 import {
   selectCurrentServer,
   selectRemoteServers
-} from "./chunk-B6H5XCT2.js";
+} from "./chunk-EMEUU5IY.js";
 import {
   createUserKey,
   extractAgentInfo,
@@ -10,7 +10,7 @@ import {
   sanitizeShareData,
   shareKey,
   toNonEmptyString
-} from "./chunk-2WKUUY2E.js";
+} from "./chunk-SVEUG45B.js";
 import {
   noloDeleteRequest,
   noloWriteRequest,

package/{chunk-IZNJDUJ4.js → chunk-I4JISVWK.js}

@@ -11,7 +11,7 @@ import {
   getAntigravityUserAgent,
   normalizeAntigravityTokenPayload,
   refreshAntigravityToken
-} from "./chunk-PV734VZX.js";
+} from "./chunk-EXLOROHG.js";
 import {
   writeOAuthCredential
 } from "./chunk-FD36SCCD.js";

package/{chunk-N4XRDM26.js → chunk-IA3A5373.js}

@@ -1,6 +1,6 @@
 import {
   resolveNoloHome
-} from "./chunk-LM6IYQ3F.js";
+} from "./chunk-GLKOYSRU.js";
 
 // packages/cli/localRuntimeDb.ts
 import path from "node:path";
@@ -14,7 +14,7 @@ function buildCliLocalRuntimeDbEnv(env = process.env) {
   };
 }
 async function getDefaultCliLocalRuntimeDb(options = {}) {
-  const { getDefaultCliLocalRuntimeDb: getAuthorityBackedDb } = await import("./localRuntimeAuthority-S77B5QVB.js");
+  const { getDefaultCliLocalRuntimeDb: getAuthorityBackedDb } = await import("./localRuntimeAuthority-KQDAE64E.js");
   return getAuthorityBackedDb(options);
 }
 

package/{chunk-X2K2JSO4.js → chunk-IWUMSAQF.js}

@@ -113,6 +113,9 @@ function parseResetAtText(value, now) {
   const parsed = Date.parse(m[1]);
   return Number.isFinite(parsed) && parsed > now ? parsed : void 0;
 }
+function matchesPeriodicUsageLimitText(text) {
+  return /weekly usage limit|monthly usage limit/i.test(text);
+}
 function resolveNextAvailableAt(body, now, headers) {
   const headerRetryAfter = headers && typeof headers.get === "function" ? headers.get("retry-after") : headers?.["retry-after"] ?? headers?.["Retry-After"];
   const retryAfter = headerRetryAfter ? readRetryAfterTimestamp({ retryAfter: headerRetryAfter }, now) : readRetryAfterTimestamp(body, now);
@@ -124,7 +127,8 @@ function resolveNextAvailableAt(body, now, headers) {
     return clampCooldownDeadline(absolute, now);
   }
   const text = typeof body === "string" ? body : JSON.stringify(body ?? "");
-  const parsed = parseResetAtText(text, now) ?? now + (parseResetsInMs(text) ?? DEFAULT_PROVIDER_RETRY_MS);
+  const absoluteFromText = parseResetAtText(text, now);
+  const parsed = absoluteFromText ?? (matchesPeriodicUsageLimitText(text) ? now + MAX_COOLDOWN_MS : now + (parseResetsInMs(text) ?? DEFAULT_PROVIDER_RETRY_MS));
   return clampCooldownDeadline(parsed, now);
 }
 function resolveAvailabilityAction(status, body, now, headers) {

package/{chunk-GEPHJJW4.js → chunk-L7NG2M6H.js}

@@ -1,6 +1,6 @@
 import {
   resolveNoloHome
-} from "./chunk-LM6IYQ3F.js";
+} from "./chunk-GLKOYSRU.js";
 
 // packages/database-engine/cliAuthorityBrokerClient.ts
 import { createConnection } from "node:net";

package/{chunk-XQES6LXQ.js → chunk-LFLWZX76.js}

@@ -1,7 +1,7 @@
 import {
   readDbRecord,
   writeAgentRecord
-} from "./chunk-GZRMWK5R.js";
+} from "./chunk-DQLYEGP7.js";
 import {
   buildSkillSummaryMarker
 } from "./chunk-VF4K2QE6.js";
@@ -13,7 +13,7 @@ import {
 } from "./chunk-A7GB5UGH.js";
 import {
   createSpaceKey
-} from "./chunk-MJWX4JQO.js";
+} from "./chunk-3EEK7T3D.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";

package/{chunk-IIOHYLIG.js → chunk-LGUQHYAL.js}

@@ -22,7 +22,7 @@ var CODE_WORK_DISCIPLINE_BODY = `## \u6548\u7387\u4F18\u5148\uFF08\u7701 token\u
 - **\u5EFA\u8BAE\u6C47\u62A5**\uFF1A\u4EA4\u4ED8\u65F6\u628A\u8FC7\u7A0B\u4E2D\u53D1\u73B0\u7684**\u4EFB\u4F55\u503C\u5F97\u7528\u6237\u77E5\u9053\u7684\u4E8B**\u90FD\u5217\u51FA\u6765\uFF08\u9884\u5B58\u65E0\u5173\u6539\u52A8\u3001\u65E2\u6709\u6D4B\u8BD5\u9694\u79BB\u95EE\u9898\u3001\u6F5C\u5728\u98CE\u9669\u3001\u540E\u7EED\u53EF\u4F18\u5316\u70B9\u3001\u9700\u7528\u6237\u51B3\u7B56\u7684\u4E8B\u9879\uFF09\uFF0C\u4E0D\u8981\u53EA\u62A5\u300C\u505A\u5B8C\u4E86\u300D\u3002
 
 ## Review \u7EAA\u5F8B\uFF08commit \u524D\u786C\u95E8\uFF09
-- \u9664 \u22642 \u6B65\u96F6\u903B\u8F91\u98CE\u9669\u7684\u673A\u68B0\u6539\u52A8\uFF08\u9519\u522B\u5B57/\u683C\u5F0F/CSS \u5FAE\u8C03\uFF09\u5916\uFF0C\u6240\u6709\u4EE3\u7801\u53D8\u66F4 commit \u524D\u5FC5\u987B\u5148\u6D3E**\u5176\u4ED6 agent**\uFF08\u4E0D\u540C\u6A21\u578B\u5BB6\u65CF\u4F18\u5148\uFF09review \u5DE5\u4F5C\u533A diff\uFF08\`git diff\`\uFF0C\u672A\u63D0\u4EA4\u7684\u6539\u52A8\uFF09\u3002reviewer \u4E0D\u53EF\u662F\u81EA\u5DF1\u3002\u65E0 review \u4E0D commit\u2014\u2014\u8FD9\u662F\u786C\u95E8\uFF0C\u4E0D\u662F\u5EFA\u8BAE\u3002
+- \u9664 \u22642 \u6B65\u96F6\u903B\u8F91\u98CE\u9669\u7684\u673A\u68B0\u6539\u52A8\uFF08\u9519\u522B\u5B57/\u683C\u5F0F/CSS \u5FAE\u8C03\uFF09\u5916\uFF0C\u6240\u6709\u4EE3\u7801\u53D8\u66F4 commit \u524D\u5FC5\u987B\u5148\u6D3E**\u5176\u4ED6 agent**\uFF08\u4E0D\u540C\u6A21\u578B\u5BB6\u65CF\u4F18\u5148\uFF09review \u5DE5\u4F5C\u533A diff\uFF08\`git diff\`\uFF0C\u672A\u63D0\u4EA4\u7684\u6539\u52A8\uFF09\u3002reviewer \u4E0D\u53EF\u662F\u672C\u6B21\u6539\u52A8\u7684\u4F5C\u8005\uFF08\u7F16\u6392\u8005\u4EE5\u81EA\u8EAB agent \u8EAB\u4EFD\u6D3E\u51FA\u7684\u5168\u65B0\u5B9E\u4F8B\u4E0D\u5171\u4EAB\u7F16\u6392\u8005\u4E0A\u4E0B\u6587\uFF0C\u4E0E\u4F5C\u8005\u8DE8\u6A21\u578B\u5BB6\u65CF\u65F6\u4E0D\u7B97\u300C\u81EA\u5DF1\u300D\uFF0C\u8DE8\u5BB6\u65CF\u4F18\u5148\u975E\u5F3A\u5236\uFF09\u3002\u65E0 review \u4E0D commit\u2014\u2014\u8FD9\u662F\u786C\u95E8\uFF0C\u4E0D\u662F\u5EFA\u8BAE\u3002
 - \u6D3E\u53D1\u8D70 \`startAgentRun(agentKey, task, { ephemeral: true })\`\uFF08web/\u684C\u9762\u7AEF\u6CA1\u6709 nolo CLI\uFF0C\u6240\u6709 host \u90FD\u6709\u8FD9\u4E2A\u5DE5\u5177\uFF09\u3002ephemeral \u8BA9 review \u5B8C\u6210\u540E\u4E0D\u7559 dialog \u8BB0\u5F55\u3002
 - task \u91CC\u5FC5\u987B\u5199\u660E\u5BA1\u67E5\u5BF9\u8C61\uFF08\`git diff\` \u770B\u5DE5\u4F5C\u533A\u6539\u52A8\uFF0C\u6216 \`git diff alpha...HEAD\` \u770B\u5DF2\u63D0\u4EA4\u6539\u52A8\uFF09\uFF0C\u5426\u5219 reviewer \u4E0D\u77E5\u9053\u5BA1\u4EC0\u4E48\u3002
 - \u6309\u89D2\u8272\u52A0\u8F7D\u5BF9\u5E94 skill\uFF1Areviewer \u5148 \`loadSkill("coding-review")\` \u62FF\u901A\u7528\u6D41\u7A0B\uFF0C\u518D\u6309\u89D2\u8272 \`loadSkill("coding-review-<role>")\` \u62FF\u68C0\u67E5\u9879\u3002\u89D2\u8272\u6E05\u5355\uFF1Acode-quality\uFF08**\u5FC5\u8DD1**\uFF09/ architecture\uFF08**\u5355\u72EC\u6D3E\u53D1**\uFF0C\u4E2D\u7EA7\u4EE5\u4E0A\u95EE\u9898\uFF09/ security\uFF08\u6309\u9700 + \u5B89\u5168\u654F\u611F\u89E6\u53D1\u5FC5\u8DD1\uFF09/ frontend-ux\uFF08\u6D89\u53CA UI \u65F6\uFF09/ backend-data\uFF08\u6D89\u53CA server \u65F6\uFF09\u3002\u89D2\u8272\u5207\u5272\u7684\u76EE\u7684\u662F\u6CE8\u610F\u529B\u9694\u79BB\u2014\u2014\u6BCF\u4E2A\u89D2\u8272\u53EA\u76EF\u81EA\u5DF1\u7684\u68C0\u67E5\u9762\uFF0C\u6309\u9700\u542F\u7528\uFF0C\u907F\u514D\u4E00\u4E2A reviewer \u80CC\u6240\u6709\u89D2\u8272\u5BFC\u81F4\u6CE8\u610F\u529B\u7A00\u91CA\u3002

package/{chunk-4AWH4LQA.js → chunk-LYGNQHUW.js}

@@ -183,6 +183,7 @@ function parseAgentRunArgs(args, options = {}) {
   const dodCommands = readRepeatedFlagValues(args, "--dod").map((v) => v.trim()).filter(Boolean);
   const taskRowDbKey = readFlagValue(args, "--task-row-dbkey");
   const artifactIds = readFlagValue(args, "--artifact-ids")?.split(",").map((item) => item.trim()).filter(Boolean);
+  const queueFile = readFlagValue(args, "--queue-file");
   return {
     agentKey,
     message,
@@ -217,7 +218,8 @@ function parseAgentRunArgs(args, options = {}) {
     ...cwd ? { cwd } : {},
     ...blockedToolNames.length ? { blockedToolNames } : {},
     ...dodCommands.length ? { dodCommands } : {},
-    ...typeof timeoutMs === "number" ? { timeoutMs } : {}
+    ...typeof timeoutMs === "number" ? { timeoutMs } : {},
+    ...queueFile ? { queueFile } : {}
   };
 }
 

package/{db-3H3JECGY.js → chunk-M5PVFLD4.js}

@@ -1,30 +1,13 @@
 import {
   createLegacyServerDb,
   createLevelAuthorityStore
-} from "./chunk-J6WH4PYZ.js";
-import {
-  isLevelLockError
-} from "./chunk-URMS4XY2.js";
+} from "./chunk-CIF4X6ZM.js";
 import {
   Level
-} from "./chunk-6WD3OOJS.js";
-import {
-  resolveServerDbPath
-} from "./chunk-LM6IYQ3F.js";
+} from "./chunk-UV6VISQJ.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
-import "./chunk-4VNS5WPM.js";
-
-// packages/database-engine/ensureDbOpen.ts
-async function ensureDbOpen(db) {
-  if (db.status === "open") {
-    return;
-  }
-  if (typeof db.open === "function") {
-    await db.open();
-  }
-}
 
 // packages/database-engine/serverStoreFactory.ts
 import fs from "fs";
@@ -343,151 +326,21 @@ function getOrCreateServerStoreRuntime(dbPath, options = {}) {
   } else if (!cachedDriver) {
     globalScope.__serverAuthorityStoreDriver = driver;
   }
-  const authorityStore2 = globalScope.__serverAuthorityStore;
+  const authorityStore = globalScope.__serverAuthorityStore;
   if (!globalScope.__serverDb) {
-    globalScope.__serverDb = createLegacyServerDb(authorityStore2);
+    globalScope.__serverDb = createLegacyServerDb(authorityStore);
   }
   return {
-    authorityStore: authorityStore2,
+    authorityStore,
     serverDb: globalScope.__serverDb
   };
 }
 
-// packages/database-engine/db.ts
-var DB_PATH = resolveServerDbPath();
-console.log("\u6570\u636E\u5E93\u914D\u7F6E:");
-console.log("- \u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55:", process.cwd());
-console.log("- \u6570\u636E\u5E93\u8DEF\u5F84:", DB_PATH);
-function isServerDbLockError(error) {
-  const queue = [error];
-  const seen = /* @__PURE__ */ new Set();
-  while (queue.length > 0) {
-    const current = queue.shift();
-    if (!current || seen.has(current)) continue;
-    seen.add(current);
-    if (isLevelLockError(current)) return true;
-    if (current?.cause) queue.push(current.cause);
-    if (Array.isArray(current?.errors)) {
-      queue.push(...current.errors);
-    }
-  }
-  return false;
-}
-var ServerDbShuttingDownError = class extends Error {
-  code = "SERVER_DB_SHUTTING_DOWN";
-  // advisory-only：现有调用方检查 isLevelLifecycleError（匹配 LEVEL_*_NOT_OPEN），
-  // 不消费此字段。保留是为了未来可能的 shutdown-aware retry 逻辑。
-  retryable = true;
-  constructor(message) {
-    super(message);
-    this.name = "ServerDbShuttingDownError";
-  }
-};
-var {
-  authorityStore,
-  serverDb
-} = getOrCreateServerStoreRuntime(DB_PATH);
-console.log("- LevelDB\u5B9E\u9645\u8DEF\u5F84:", serverDb.location);
-var db_default = serverDb;
-function getServerAuthorityStore() {
-  return authorityStore;
-}
-var DEFAULT_SERVER_DB_OPEN_LOCK_TIMEOUT_MS = 8e3;
-var DEFAULT_SERVER_DB_OPEN_LOCK_INTERVAL_MS = 25;
-var serverDbShuttingDown = false;
-function markServerDbShuttingDown() {
-  serverDbShuttingDown = true;
-}
-function clearServerDbShuttingDown() {
-  serverDbShuttingDown = false;
-}
-function resolveServerDbOpenLockTimeoutMs(env = process.env) {
-  const raw = env.NOLO_SERVER_DB_OPEN_LOCK_TIMEOUT_MS;
-  if (!raw) return DEFAULT_SERVER_DB_OPEN_LOCK_TIMEOUT_MS;
-  const parsed = Number(raw);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_SERVER_DB_OPEN_LOCK_TIMEOUT_MS;
-}
-function defaultSleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-async function ensureServerDbOpen(options) {
-  const status = authorityStore.status;
-  if (status === "open") return;
-  if (serverDbShuttingDown) {
-    throw new ServerDbShuttingDownError(
-      "Server DB is shutting down (blue-green phase 2 drain); cannot reopen LevelDB"
-    );
-  }
-  const timeoutMs = options?.timeoutMs ?? resolveServerDbOpenLockTimeoutMs();
-  const intervalMs = options?.intervalMs ?? DEFAULT_SERVER_DB_OPEN_LOCK_INTERVAL_MS;
-  const sleep = options?.sleep ?? defaultSleep;
-  const now = options?.now ?? Date.now;
-  const deadline = now() + timeoutMs;
-  let lastLockWarnAt = Number.NEGATIVE_INFINITY;
-  for (let attempt = 1; ; attempt += 1) {
-    if (serverDbShuttingDown) {
-      throw new ServerDbShuttingDownError(
-        "Server DB shutdown signaled during lock retry; aborting reopen"
-      );
-    }
-    try {
-      await ensureDbOpen(authorityStore);
-      if (status !== "opening" && !options?.quiet) {
-        console.log("\u2705 LevelDB \u5DF2\u6253\u5F00");
-      }
-      return;
-    } catch (err) {
-      if (!isServerDbLockError(err)) {
-        if (!options?.quiet) console.error("\u274C \u6253\u5F00 LevelDB \u5931\u8D25:", err);
-        throw err;
-      }
-      const remainingMs = deadline - now();
-      if (remainingMs <= 0) {
-        if (!options?.quiet) {
-          console.error(
-            `\u274C \u6253\u5F00 LevelDB \u5931\u8D25: \u9501\u88AB\u5176\u4ED6\u8FDB\u7A0B\u6301\u6709\uFF0C\u5DF2\u91CD\u8BD5 ${attempt} \u6B21 / ${timeoutMs}ms\u3002 \u901A\u5E38\u662F\u4E0A\u4E00\u4E2A server \u8FDB\u7A0B\u672A\u5B8C\u5168\u9000\u51FA\uFF08\u6CE8\u610F\u7236\u5B50\u8FDB\u7A0B\u6811\uFF09\uFF0C \u6392\u67E5\uFF1Afuser -v ${authorityStore.location ?? "<dbPath>"}/LOCK`
-          );
-        }
-        throw err;
-      }
-      if (!options?.quiet && now() - lastLockWarnAt >= 1e3) {
-        lastLockWarnAt = now();
-        console.warn(
-          `\u26A0\uFE0F LevelDB \u88AB\u5176\u4ED6\u8FDB\u7A0B\u5360\u7528\uFF08\u5DF2\u5C1D\u8BD5 ${attempt} \u6B21\uFF0C\u8DDD\u8D85\u65F6\u7EA6 ${Math.max(1, Math.ceil(remainingMs / 1e3))}s\uFF09\uFF0C${intervalMs}ms \u540E\u7EE7\u7EED`
-        );
-      }
-      await sleep(intervalMs);
-    }
-  }
-}
-async function openServerDb() {
-  return ensureServerDbOpen();
-}
-async function closeServerDb() {
-  markServerDbShuttingDown();
-  for (let i = 0; i < 50; i++) {
-    const s = authorityStore.status;
-    if (s !== "opening") break;
-    await defaultSleep(100);
-  }
-  const status = authorityStore.status;
-  if (status !== "open") return;
-  try {
-    await authorityStore.close();
-    console.log("\u2705 LevelDB \u5DF2\u5173\u95ED");
-  } catch (err) {
-    console.error("\u274C \u5173\u95ED LevelDB \u5931\u8D25:", err);
-  }
-}
 export {
-  ServerDbShuttingDownError,
-  clearServerDbShuttingDown,
-  closeServerDb,
-  db_default as default,
-  ensureServerDbOpen,
-  getServerAuthorityStore,
-  isServerDbLockError,
-  markServerDbShuttingDown,
-  openServerDb,
-  serverDb
+  safeJsonEncoding,
+  ensureServerDbDirectory,
+  createLevelBackedAuthorityStore,
+  resolveServerStoreDriver,
+  createAuthorityStoreForDriver,
+  getOrCreateServerStoreRuntime
 };

package/{chunk-WN5AJG5I.js → chunk-MKZRKDQM.js}

@@ -1,6 +1,6 @@
 import {
   requireTokenUser
-} from "./chunk-XQES6LXQ.js";
+} from "./chunk-LFLWZX76.js";
 import {
   resolveServerUrl
 } from "./chunk-A7GB5UGH.js";