nolo-cli 0.54.0 → 0.61.0-alpha.2

package/{chunk-EJE33XNR.js → chunk-4C4ST2YE.js}

@@ -6,18 +6,17 @@ import {
   flushChatCompletionStream,
   providerHttpFailure,
   readSseFrames,
+  streamSseDataValues,
   throwIfChatCompletionStreamFailed
-} from "./chunk-3Y2K5O2R.js";
+} from "./chunk-7A3RRUCQ.js";
 import {
-  FRESH_TOOL_OUTPUT_MAX_CHARS,
-  MAX_HISTORICAL_TOOL_CONTENT_CHARS,
   clipToolText,
   hasImageInRuntimeMessages,
   resolveAgentImageInputSupport,
   resolveHistoricalToolContentCap,
   resolveToolOutputProfile,
   stripImagePartsFromMessages
-} from "./chunk-A65UV3M5.js";
+} from "./chunk-XOKOSO35.js";
 import {
   downgradeUnparsableToolCalls,
   hasParsableObjectArguments,
@@ -32,7 +31,6 @@ import {
 } from "./chunk-N7J63Q6C.js";
 import {
   TOOL_GUIDED_SECTION_ORDER,
-  buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks,
   estimateContextTokens,
@@ -41,7 +39,7 @@ import {
   requiresBareImageUrl,
   resolveToolGuidedSections,
   toBareImageUrlMessages
-} from "./chunk-BY2FF2C4.js";
+} from "./chunk-QEFJJS2I.js";
 import {
   convertMessagesToResponsesInput,
   extractReasoningFromResponseOutput,
@@ -51,19 +49,25 @@ import {
   shouldStripReasoningContentForOutbound,
   toOpenAiCompatibleMessages,
   toResponsesTools
-} from "./chunk-VZMUOPYG.js";
+} from "./chunk-XTJTN3RW.js";
+import {
+  getAntigravityUserAgent,
+  readAntigravityProjectId,
+  resolveAntigravityCloudCodeBaseUrl
+} from "./chunk-QEW2MFDQ.js";
 import {
   buildProviderAuthHeaders,
   buildProviderExecutionPlan
-} from "./chunk-KLIBF3BY.js";
+} from "./chunk-RDBARW6T.js";
 import {
   NOLO_WORKSPACE_TOOL_NAMES,
+  applyToolSurfaceConstraints,
   buildNoloWorkspaceCommandArgs,
   noloPositiveIntegerString,
   noloStringArg,
   parseNoloWorkspaceToolArguments,
   resolveNoloDialogInput
-} from "./chunk-ZVOHVJI3.js";
+} from "./chunk-RJ2SAFB5.js";
 import {
   buildDialogFallbackTitleFromUserInput
 } from "./chunk-2MBTWINN.js";
@@ -76,7 +80,7 @@ import {
   resolveEmptyAssistantFallbackMessage,
   resolveEmptyAssistantOutcome,
   resolveTruncatedReasoningTailLog
-} from "./chunk-K4NISKOR.js";
+} from "./chunk-5ZYA4JJ3.js";
 import {
   COMPACTION_SUMMARY_SCHEMA_VERSION,
   COMPACTION_SUMMARY_SYSTEM_PROMPT,
@@ -84,16 +88,23 @@ import {
   buildCompactionMetricsFromPlan,
   buildCompactionUserContent,
   clipCompactText,
-  estimateTokenCount,
+  createProviderCallTimingTracker,
+  finalizeProviderCallTiming,
   formatCompactionMetricsLog,
   formatFileOperationsFromMessages,
   formatMessagesForSummaryWithTruncation,
+  isMeaningfulResponsesOutput,
+  observeMeaningfulProviderResponse,
   planCompression,
-  planContextUsage
-} from "./chunk-BBTN4NQD.js";
+  planContextUsage,
+  withProviderCallTimingFields
+} from "./chunk-Z4QSJILV.js";
+import {
+  estimateTokenCount
+} from "./chunk-PSCNXBYA.js";
 import {
   resolveNoloStateDir
-} from "./chunk-FD36SCCD.js";
+} from "./chunk-ONXOABJR.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -693,14 +704,14 @@ var make2 = (isEquivalent) => (self, that) => self === that || isEquivalent(self
 var isArrayNonEmpty = (self) => self.length > 0;
 
 // node_modules/effect/dist/internal/doNotation.js
-var let_ = (map7) => dual(3, (self, name, f) => map7(self, (a) => ({
+var let_ = (map8) => dual(3, (self, name, f) => map8(self, (a) => ({
   ...a,
   [name]: f(a)
 })));
-var bindTo = (map7) => dual(2, (self, name) => map7(self, (a) => ({
+var bindTo = (map8) => dual(2, (self, name) => map8(self, (a) => ({
   [name]: a
 })));
-var bind = (map7, flatMap6) => dual(3, (self, name, f) => flatMap6(self, (a) => map7(f(a), (b) => ({
+var bind = (map8, flatMap6) => dual(3, (self, name, f) => flatMap6(self, (a) => map8(f(a), (b) => ({
   ...a,
   [name]: b
 }))));
@@ -2002,22 +2013,22 @@ var makeImpl = (cacheRoot, base, overlay, depth) => {
   self.baseHits = 0;
   return self;
 };
-var applyOverlays = (map7, overlay) => {
+var applyOverlays = (map8, overlay) => {
   if (!overlay) return;
-  applyOverlays(map7, overlay.parent);
-  map7.set(overlay.key, overlay.value);
+  applyOverlays(map8, overlay.parent);
+  map8.set(overlay.key, overlay.value);
 };
 var flatten3 = (self) => {
   if (self._flat) return self._flat;
   if (!self.overlay) return self._flat = self.base;
-  const map7 = new Map(self.base);
-  applyOverlays(map7, self.overlay);
-  return self._flat = map7;
+  const map8 = new Map(self.base);
+  applyOverlays(map8, self.overlay);
+  return self._flat = map8;
 };
 var withFlat = (self, f) => {
-  const map7 = new Map(self.mapUnsafe);
-  f(map7);
-  return makeUnsafe(map7);
+  const map8 = new Map(self.mapUnsafe);
+  f(map8);
+  return makeUnsafe(map8);
 };
 var notFound = /* @__PURE__ */ Symbol();
 var lookup = (self, key) => {
@@ -2077,9 +2088,9 @@ var addUnsafe = (self, key, service4) => {
   const impl = self;
   const cacheRoot = cacheKeys.has(key) ? void 0 : impl.cacheRoot;
   if (impl.depth >= MaxDepth) {
-    const map7 = new Map(impl.mapUnsafe);
-    map7.set(key, service4);
-    return makeImpl(cacheRoot, map7, void 0, 0);
+    const map8 = new Map(impl.mapUnsafe);
+    map8.set(key, service4);
+    return makeImpl(cacheRoot, map8, void 0, 0);
   }
   return makeImpl(cacheRoot, impl.base, {
     key,
@@ -2125,16 +2136,16 @@ var getOption = /* @__PURE__ */ dual(2, (self, service4) => {
 var merge = /* @__PURE__ */ dual(2, (self, that) => {
   if (self.mapUnsafe.size === 0) return that;
   if (that.mapUnsafe.size === 0) return self;
-  return withFlat(self, (map7) => that.mapUnsafe.forEach((value, key) => map7.set(key, value)));
+  return withFlat(self, (map8) => that.mapUnsafe.forEach((value, key) => map8.set(key, value)));
 });
 var mergeAll = (...ctxs) => {
-  const map7 = /* @__PURE__ */ new Map();
+  const map8 = /* @__PURE__ */ new Map();
   for (let i = 0; i < ctxs.length; i++) {
     ctxs[i].mapUnsafe.forEach((value, key) => {
-      map7.set(key, value);
+      map8.set(key, value);
     });
   }
-  return makeUnsafe(map7);
+  return makeUnsafe(map8);
 };
 var Reference = Service;
 
@@ -2726,6 +2737,15 @@ var ReducerSum = /* @__PURE__ */ make(sum, zero);
 var CombinerMax = /* @__PURE__ */ max(Order);
 var CombinerMin = /* @__PURE__ */ min(Order);
 
+// node_modules/effect/dist/Filter.js
+var composePassthrough = /* @__PURE__ */ dual(2, (left, right) => (input) => {
+  const leftOut = left(input);
+  if (isFailure2(leftOut)) return fail2(input);
+  const rightOut = right(leftOut.success);
+  if (isFailure2(rightOut)) return fail2(input);
+  return rightOut;
+});
+
 // node_modules/effect/dist/Scheduler.js
 var Scheduler = /* @__PURE__ */ Reference("effect/Scheduler", {
   fiberCached: true,
@@ -3955,7 +3975,7 @@ var flatMapEager = /* @__PURE__ */ dual(2, (self, f) => {
 var flatten4 = (self) => flatMap2(self, identity);
 var map3 = /* @__PURE__ */ dual(2, (self, f) => flatMap2(self, (a) => succeed3(internalCall(() => f(a)))));
 var mapEager = /* @__PURE__ */ dual(2, (self, f) => effectIsExit(self) ? exitMap(self, f) : map3(self, f));
-var mapErrorEager = /* @__PURE__ */ dual(2, (self, f) => effectIsExit(self) ? exitMapError(self, f) : mapError(self, f));
+var mapErrorEager = /* @__PURE__ */ dual(2, (self, f) => effectIsExit(self) ? exitMapError(self, f) : mapError2(self, f));
 var mapBothEager = /* @__PURE__ */ dual(2, (self, options) => effectIsExit(self) ? exitMapBoth(self, options) : mapBoth(self, options));
 var catchEager = /* @__PURE__ */ dual(2, (self, f) => {
   if (effectIsExit(self)) {
@@ -3968,8 +3988,16 @@ var catchEager = /* @__PURE__ */ dual(2, (self, f) => {
 });
 var exitInterrupt = (fiberId3) => exitFailCause(causeInterrupt(fiberId3));
 var exitIsSuccess = (self) => self._tag === "Success";
+var exitFilterSuccess = (self) => self._tag === "Success" ? succeed2(self) : fail2(self);
+var exitFilterValue = (self) => self._tag === "Success" ? succeed2(self.value) : fail2(self);
 var exitIsFailure = (self) => self._tag === "Failure";
+var exitFilterFailure = (self) => self._tag === "Failure" ? succeed2(self) : fail2(self);
 var exitFilterCause = (self) => self._tag === "Failure" ? succeed2(self.cause) : fail2(self);
+var exitFindError = /* @__PURE__ */ composePassthrough(exitFilterCause, findError);
+var exitFindDefect = /* @__PURE__ */ composePassthrough(exitFilterCause, findDefect);
+var exitHasInterrupts = (self) => self._tag === "Failure" && hasInterrupts(self.cause);
+var exitHasDies = (self) => self._tag === "Failure" && hasDies(self.cause);
+var exitHasFails = (self) => self._tag === "Failure" && hasFails(self.cause);
 var exitVoid = /* @__PURE__ */ exitSucceed(void 0);
 var exitMap = /* @__PURE__ */ dual(2, (self, f) => self._tag === "Success" ? exitSucceed(f(self.value)) : self);
 var exitMapError = /* @__PURE__ */ dual(2, (self, f) => {
@@ -3984,8 +4012,10 @@ var exitMapBoth = /* @__PURE__ */ dual(2, (self, options) => {
   if (isFailure2(error)) return self;
   return exitFail(options.onFailure(error.success));
 });
+var exitAs = /* @__PURE__ */ dual(2, (self, b) => exitIsSuccess(self) ? exitSucceed(b) : self);
 var exitZipRight = /* @__PURE__ */ dual(2, (self, that) => exitIsSuccess(self) ? that : self);
 var exitMatch = /* @__PURE__ */ dual(2, (self, options) => exitIsSuccess(self) ? options.onSuccess(self.value) : options.onFailure(self.cause));
+var exitAsVoid = /* @__PURE__ */ exitAs(void 0);
 var exitAsVoidAll = (exits) => {
   const failures = [];
   for (const exit3 of exits) {
@@ -3995,6 +4025,12 @@ var exitAsVoidAll = (exits) => {
   }
   return failures.length === 0 ? exitVoid : exitFailCause(causeFromReasons(failures));
 };
+var exitGetSuccess = (self) => exitIsSuccess(self) ? some2(self.value) : none2();
+var exitGetCause = (self) => exitIsFailure(self) ? some2(self.cause) : none2();
+var exitFindErrorOption = (self) => {
+  const error = exitFindError(self);
+  return isFailure2(error) ? none2() : some2(error.success);
+};
 var service = (service4) => service4;
 var serviceOption = (service4) => withFiber((fiber3) => succeed3(getOption(fiber3.context, service4)));
 var serviceOptional = (service4) => withFiber((fiber3) => fromOption2(getOption(fiber3.context, service4)));
@@ -4156,7 +4192,7 @@ var unwrapReason = /* @__PURE__ */ dual(2, (self, errorTag) => catchFilter(self,
   }
   return fail2(e);
 }, fail3));
-var mapError = /* @__PURE__ */ dual(2, (self, f) => catch_(self, (error) => failSync(() => f(error))));
+var mapError2 = /* @__PURE__ */ dual(2, (self, f) => catch_(self, (error) => failSync(() => f(error))));
 var mapBoth = /* @__PURE__ */ dual(2, (self, options) => matchEffect(self, {
   onFailure: (e) => failSync(() => options.onFailure(e)),
   onSuccess: (a) => sync(() => options.onSuccess(a))
@@ -4979,8 +5015,8 @@ var runPromiseExitWith = (context3) => {
   const runFork3 = runForkWith(context3);
   return (effect, options) => {
     const fiber3 = runFork3(effect, options);
-    return new Promise((resolve3) => {
-      fiber3.addObserver((exit3) => resolve3(exit3));
+    return new Promise((resolve5) => {
+      fiber3.addObserver((exit3) => resolve5(exit3));
     });
   };
 };
@@ -5638,7 +5674,7 @@ __export(Effect_exports, {
   annotateSpans: () => annotateSpans2,
   as: () => as3,
   asSome: () => asSome2,
-  asVoid: () => asVoid3,
+  asVoid: () => asVoid4,
   awaitAllChildren: () => awaitAllChildren2,
   bind: () => bind4,
   bindTo: () => bindTo4,
@@ -5724,11 +5760,11 @@ __export(Effect_exports, {
   logWithLevel: () => logWithLevel2,
   makeSpan: () => makeSpan2,
   makeSpanScoped: () => makeSpanScoped2,
-  map: () => map4,
-  mapBoth: () => mapBoth2,
+  map: () => map5,
+  mapBoth: () => mapBoth3,
   mapBothEager: () => mapBothEager2,
   mapEager: () => mapEager2,
-  mapError: () => mapError2,
+  mapError: () => mapError4,
   mapErrorEager: () => mapErrorEager2,
   match: () => match6,
   matchCause: () => matchCause2,
@@ -5853,6 +5889,36 @@ __export(Effect_exports, {
 });
 
 // node_modules/effect/dist/Exit.js
+var Exit_exports = {};
+__export(Exit_exports, {
+  asVoid: () => asVoid3,
+  asVoidAll: () => asVoidAll,
+  die: () => die3,
+  fail: () => fail4,
+  failCause: () => failCause2,
+  filterCause: () => filterCause,
+  filterFailure: () => filterFailure,
+  filterSuccess: () => filterSuccess,
+  filterValue: () => filterValue,
+  findDefect: () => findDefect2,
+  findError: () => findError3,
+  findErrorOption: () => findErrorOption2,
+  getCause: () => getCause,
+  getSuccess: () => getSuccess3,
+  hasDies: () => hasDies2,
+  hasFails: () => hasFails3,
+  hasInterrupts: () => hasInterrupts2,
+  interrupt: () => interrupt2,
+  isExit: () => isExit2,
+  isFailure: () => isFailure4,
+  isSuccess: () => isSuccess4,
+  map: () => map4,
+  mapBoth: () => mapBoth2,
+  mapError: () => mapError3,
+  match: () => match5,
+  succeed: () => succeed4,
+  void: () => void_3
+});
 var isExit2 = isExit;
 var succeed4 = exitSucceed;
 var failCause2 = exitFailCause;
@@ -5862,7 +5928,24 @@ var interrupt2 = exitInterrupt;
 var void_3 = exitVoid;
 var isSuccess4 = exitIsSuccess;
 var isFailure4 = exitIsFailure;
+var hasFails3 = exitHasFails;
+var hasDies2 = exitHasDies;
+var hasInterrupts2 = exitHasInterrupts;
+var filterSuccess = exitFilterSuccess;
+var filterValue = exitFilterValue;
+var filterFailure = exitFilterFailure;
+var filterCause = exitFilterCause;
+var findError3 = exitFindError;
+var findDefect2 = exitFindDefect;
 var match5 = exitMatch;
+var map4 = exitMap;
+var mapError3 = exitMapError;
+var mapBoth2 = exitMapBoth;
+var asVoid3 = exitAsVoid;
+var asVoidAll = exitAsVoidAll;
+var getSuccess3 = exitGetSuccess;
+var getCause = exitGetCause;
+var findErrorOption2 = exitFindErrorOption;
 
 // node_modules/effect/dist/Deferred.js
 var TypeId5 = "~effect/Deferred";
@@ -6639,10 +6722,10 @@ var tap3 = tap2;
 var result2 = result;
 var option2 = option;
 var exit2 = exit;
-var map4 = map3;
+var map5 = map3;
 var as3 = as2;
 var asSome2 = asSome;
-var asVoid3 = asVoid2;
+var asVoid4 = asVoid2;
 var flip2 = flip;
 var zip2 = zip;
 var zipWith3 = zipWith2;
@@ -6659,8 +6742,8 @@ var catchFilter2 = catchFilter;
 var catchNoSuchElement2 = catchNoSuchElement;
 var catchCauseIf2 = catchCauseIf;
 var catchCauseFilter2 = catchCauseFilter;
-var mapError2 = mapError;
-var mapBoth2 = mapBoth;
+var mapError4 = mapError2;
+var mapBoth3 = mapBoth;
 var orDie2 = orDie;
 var tapError2 = tapError;
 var tapErrorTag2 = tapErrorTag;
@@ -7309,7 +7392,7 @@ var makeAtomicUnbounded = (options) => {
 };
 var shutdown = (self) => uninterruptible2(withFiber2((fiber3) => {
   set2(self.shutdownFlag, true);
-  return close(self.scope, interrupt2(fiber3.id)).pipe(andThen3(self.strategy.shutdown), when2(self.shutdownHook.open), asVoid3);
+  return close(self.scope, interrupt2(fiber3.id)).pipe(andThen3(self.strategy.shutdown), when2(self.shutdownHook.open), asVoid4);
 }));
 var publish = /* @__PURE__ */ dual(2, (self, value) => suspend2(() => {
   if (self.shutdownFlag.current) {
@@ -7348,7 +7431,7 @@ var unsubscribe = (self) => uninterruptible2(withFiber2((state) => {
     self.subscription.unsubscribe();
     self.replayWindow.close();
     self.strategy.onPubSubEmptySpaceUnsafe(self.pubsub, self.subscribers);
-  })), when2(self.shutdownHook.open), asVoid3);
+  })), when2(self.shutdownHook.open), asVoid4);
 }));
 var take2 = (self) => suspend2(() => {
   if (self.shutdownFlag.current) {
@@ -8959,7 +9042,7 @@ var asyncQueue = (scope3, f, options) => make12({
   capacity: options?.bufferSize,
   strategy: options?.strategy
 }).pipe(tap3((queue) => addFinalizer2(scope3, shutdown2(queue))), tap3((queue) => forkIn2(provide(f(queue), scope3), scope3)));
-var callbackArray = (f, options) => fromTransform((_, scope3) => map4(asyncQueue(scope3, f, options), takeAll3));
+var callbackArray = (f, options) => fromTransform((_, scope3) => map5(asyncQueue(scope3, f, options), takeAll3));
 var suspend3 = (evaluate2) => fromTransform((upstream, scope3) => suspend2(() => toTransform(evaluate2())(upstream, scope3)));
 var acquireUseRelease3 = (acquire, use, release2) => fromTransformBracket(fnUntraced2(function* (upstream, scope3, forkedScope) {
   let option3 = none2();
@@ -9015,8 +9098,8 @@ var fromEffectDrain = (effect) => fromPull(flatMap3(effect, () => done2()));
 var fromEffectTake = (effect) => fromPull(succeed5(flatMap3(effect, toPull)));
 var fromQueueArray = (queue) => fromPull(succeed5(takeAll3(queue)));
 var fromSubscriptionArray = (subscription) => fromPull(succeed5(onInterrupt2(takeAll2(subscription), () => done2())));
-var fromPubSubArray = (pubsub) => unwrap(map4(subscribe(pubsub), fromSubscriptionArray));
-var fromPubSubTake = (pubsub) => unwrap(map4(subscribe(pubsub), (sub) => fromEffectTake(take2(sub))));
+var fromPubSubArray = (pubsub) => unwrap(map5(subscribe(pubsub), fromSubscriptionArray));
+var fromPubSubTake = (pubsub) => unwrap(map5(subscribe(pubsub), (sub) => fromEffectTake(take2(sub))));
 var fromReadableStream = (options) => fromTransform((_, scope3) => readableStreamToPullUnsafe({
   scope: scope3,
   readable: options.evaluate(),
@@ -9054,16 +9137,16 @@ var fromAsyncIterable = (iterable, onError5) => fromTransform(fnUntraced2(functi
     catch: onError5
   }), (result4) => result4.done ? done2(result4.value) : succeed5(result4.value));
 }));
-var fromAsyncIterableArray = (iterable, onError5) => map5(fromAsyncIterable(iterable, onError5), of);
-var map5 = /* @__PURE__ */ dual(2, (self, f) => transformPull(self, (pull) => sync2(() => {
+var fromAsyncIterableArray = (iterable, onError5) => map6(fromAsyncIterable(iterable, onError5), of);
+var map6 = /* @__PURE__ */ dual(2, (self, f) => transformPull(self, (pull) => sync2(() => {
   let i = 0;
-  return map4(pull, (o) => f(o, i++));
+  return map5(pull, (o) => f(o, i++));
 })));
 var concurrencyIsSequential = (concurrency) => concurrency === void 0 || concurrency !== "unbounded" && concurrency <= 1;
 var mapEffect = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, f, options) => concurrencyIsSequential(options?.concurrency) ? mapEffectSequential(self, f) : mapEffectConcurrent(self, f, options));
 var mapEffectSequential = (self, f) => fromTransform((upstream, scope3) => {
   let i = 0;
-  return map4(toTransform(self)(upstream, scope3), flatMap3((o) => f(o, i++)));
+  return map5(toTransform(self)(upstream, scope3), flatMap3((o) => f(o, i++)));
 });
 var mapEffectConcurrent = (self, f, options) => fromTransformBracket(fnUntraced2(function* (upstream, scope3, forkedScope) {
   let i = 0;
@@ -9111,7 +9194,7 @@ var mapEffectConcurrent = (self, f, options) => fromTransformBracket(fnUntraced2
   return take3(queue);
 }));
 var flatMap4 = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, f, options) => concurrencyIsSequential(options?.concurrency) ? flatMapSequential(self, f) : flatMapConcurrent(self, f, options));
-var flatMapSequential = (self, f) => fromTransform((upstream, scope3) => map4(toTransform(self)(upstream, scope3), (pull) => {
+var flatMapSequential = (self, f) => fromTransform((upstream, scope3) => map5(toTransform(self)(upstream, scope3), (pull) => {
   let childPull;
   let childScope;
   const makePull = flatMap3(pull, (value) => {
@@ -9132,7 +9215,7 @@ var flatMapSequential = (self, f) => fromTransform((upstream, scope3) => map4(to
   });
   return suspend2(() => childPull ?? makePull);
 }));
-var flatMapConcurrent = (self, f, options) => self.pipe(map5(f), mergeAll3(options));
+var flatMapConcurrent = (self, f, options) => self.pipe(map6(f), mergeAll3(options));
 var concatWith = /* @__PURE__ */ dual(2, (self, f) => fromTransform((upstream, scope3) => sync2(() => {
   let currentPull;
   const forkedScope = forkUnsafe2(scope3);
@@ -9153,7 +9236,7 @@ var combine2 = /* @__PURE__ */ dual(4, (self, that, s, f) => fromTransform(fnUnt
   let state = s();
   return suspend2(() => {
     const combinedPull = f(state, leftPull, rightPull);
-    return map4(combinedPull, ([a, s1]) => {
+    return map5(combinedPull, ([a, s1]) => {
       state = s1;
       return a;
     });
@@ -9206,20 +9289,20 @@ var flattenTake = (self) => mapEffectSequential(self, toPull);
 var drain = (self) => transformPull(self, (pull) => succeed5(forever4(pull, {
   disableYield: true
 })));
-var repeat4 = /* @__PURE__ */ dual(2, (self, schedule4) => toStepWithMetadata(typeof schedule4 === "function" ? schedule4(identity) : schedule4).pipe(map4((step) => {
+var repeat4 = /* @__PURE__ */ dual(2, (self, schedule4) => toStepWithMetadata(typeof schedule4 === "function" ? schedule4(identity) : schedule4).pipe(map5((step) => {
   let meta = CurrentMetadata2.defaultValue();
-  const loop = concatWith(provideServiceEffect3(self, CurrentMetadata2, sync2(() => meta)), (done4) => step(done4).pipe(map4((meta_) => {
+  const loop = concatWith(provideServiceEffect3(self, CurrentMetadata2, sync2(() => meta)), (done4) => step(done4).pipe(map5((meta_) => {
     meta = meta_;
     return loop;
   }), catchDone(() => succeed5(end2(done4))), unwrap));
   return loop;
 }), unwrap));
 var forever5 = (self) => concatWith(self, () => forever5(self));
-var schedule2 = /* @__PURE__ */ dual(2, (self, schedule4) => transformPull(self, (pull, _scope) => map4(toStepWithSleep(schedule4), (step) => {
+var schedule2 = /* @__PURE__ */ dual(2, (self, schedule4) => transformPull(self, (pull, _scope) => map5(toStepWithSleep(schedule4), (step) => {
   const pullWithStep = tap3(pull, step);
   return pullWithStep;
 })));
-var filter7 = /* @__PURE__ */ dual(2, (self, predicate) => fromTransform((upstream, scope3) => map4(toTransform(self)(upstream, scope3), (pull) => flatMap3(pull, function loop(elem) {
+var filter7 = /* @__PURE__ */ dual(2, (self, predicate) => fromTransform((upstream, scope3) => map5(toTransform(self)(upstream, scope3), (pull) => flatMap3(pull, function loop(elem) {
   return predicate(elem) ? succeed5(elem) : flatMap3(pull, loop);
 }))));
 var filterArray = /* @__PURE__ */ dual(2, (self, predicate) => transformPull(self, (pull) => succeed5(flatMap3(pull, function loop(arr) {
@@ -9250,7 +9333,7 @@ var filterArrayEffect = /* @__PURE__ */ dual(2, (self, predicate) => transformPu
 var filterMapArrayEffect = /* @__PURE__ */ dual(2, (self, filter9) => transformPull(self, (pull) => succeed5(flatMap3(pull, function loop(arr) {
   return flatMap3(filterMapEffect2(arr, filter9), (passes) => isReadonlyArrayNonEmpty(passes) ? succeed5(passes) : flatMap3(pull, loop));
 }))));
-var mapAccum = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, initial, f, options) => fromTransform((upstream, scope3) => map4(toTransform(self)(upstream, scope3), (pull) => {
+var mapAccum = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, initial, f, options) => fromTransform((upstream, scope3) => map5(toTransform(self)(upstream, scope3), (pull) => {
   let state = initial();
   let current;
   let index = 0;
@@ -9289,7 +9372,7 @@ var mapAccum = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, initi
   });
   return pump;
 })));
-var scanEffect = /* @__PURE__ */ dual(3, (self, initial, f) => fromTransform((upstream, scope3) => map4(toTransform(self)(upstream, scope3), (pull) => {
+var scanEffect = /* @__PURE__ */ dual(3, (self, initial, f) => fromTransform((upstream, scope3) => map5(toTransform(self)(upstream, scope3), (pull) => {
   let state = initial;
   let isFirst = true;
   return suspend2(() => {
@@ -9297,7 +9380,7 @@ var scanEffect = /* @__PURE__ */ dual(3, (self, initial, f) => fromTransform((up
       isFirst = false;
       return succeed5(state);
     }
-    return map4(flatMap3(pull, (a) => f(state, a)), (newState) => {
+    return map5(flatMap3(pull, (a) => f(state, a)), (newState) => {
       state = newState;
       return state;
     });
@@ -9305,7 +9388,7 @@ var scanEffect = /* @__PURE__ */ dual(3, (self, initial, f) => fromTransform((up
 })));
 var catchCause3 = /* @__PURE__ */ dual(2, (self, f) => fromTransform((upstream, scope3) => {
   let forkedScope = forkUnsafe2(scope3);
-  return map4(toTransform(self)(upstream, forkedScope), (pull) => {
+  return map5(toTransform(self)(upstream, forkedScope), (pull) => {
     let currentPull = pull.pipe(catchCause2((cause) => {
       if (isDoneCause(cause)) {
         return failCause4(cause);
@@ -9329,7 +9412,7 @@ var catchCauseFilter3 = /* @__PURE__ */ dual(3, (self, filter9, f) => catchCause
   return isFailure2(result4) ? failCause6(result4.failure) : f(result4.success, cause);
 }));
 var catch_3 = /* @__PURE__ */ dual(2, (self, f) => catchCauseFilter3(self, findError2, (e) => f(e)));
-var tapError3 = /* @__PURE__ */ dual(2, (self, f) => transformPull(self, (pull) => succeed5(tapError2(pull, (err) => isDone2(err) ? void_4 : asVoid3(f(err))))));
+var tapError3 = /* @__PURE__ */ dual(2, (self, f) => transformPull(self, (pull) => succeed5(tapError2(pull, (err) => isDone2(err) ? void_4 : asVoid4(f(err))))));
 var catchIf3 = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, predicate, f, orElse2) => catch_3(self, (err) => {
   return predicate(err) ? f(err) : orElse2 ? orElse2(err) : fail7(err);
 }));
@@ -9361,7 +9444,7 @@ var catchReasons3 = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self,
     return fail7(error);
   });
 });
-var mapError3 = /* @__PURE__ */ dual(2, (self, f) => catch_3(self, (err) => fail7(f(err))));
+var mapError5 = /* @__PURE__ */ dual(2, (self, f) => catch_3(self, (err) => fail7(f(err))));
 var orDie3 = (self) => catch_3(self, die5);
 var ignore3 = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, options) => {
   if (!options?.log) {
@@ -9394,7 +9477,7 @@ var retry3 = /* @__PURE__ */ dual(2, (self, schedule4) => suspend3(() => {
   }, (effect, error) => catchDone(effect, () => succeed5(fail7(error))), unwrap));
   return loop;
 }));
-var switchMap = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, f, options) => self.pipe(map5(f), mergeAll3({
+var switchMap = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, f, options) => self.pipe(map6(f), mergeAll3({
   ...options,
   concurrency: options?.concurrency ?? 1,
   switch: true
@@ -9566,7 +9649,7 @@ var splitLines = () => fromTransform((upstream, _scope) => sync2(() => {
 var pipeTo = /* @__PURE__ */ dual(2, (self, that) => fromTransform((upstream, scope3) => flatMap3(toTransform(self)(upstream, scope3), (upstream2) => toTransform(that)(upstream2, scope3))));
 var pipeToOrFail = /* @__PURE__ */ dual(2, (self, that) => fromTransform((upstream, scope3) => flatMap3(toTransform(self)(upstream, scope3), (upstream2) => {
   const upstreamPull = catchCause2(upstream2, (cause) => isDoneCause(cause) ? failCause4(cause) : die4(Done2(cause)));
-  return map4(toTransform(that)(upstreamPull, scope3), (pull) => catchDefect2(pull, (defect) => isDone2(defect) ? failCause4(defect.value) : die4(defect)));
+  return map5(toTransform(that)(upstreamPull, scope3), (pull) => catchDefect2(pull, (defect) => isDone2(defect) ? failCause4(defect.value) : die4(defect)));
 })));
 var unwrap = (channel) => fromTransform((upstream, scope3) => {
   let pull;
@@ -9575,7 +9658,7 @@ var unwrap = (channel) => fromTransform((upstream, scope3) => {
     return channel.pipe(provide(scope3), flatMap3((channel2) => toTransform(channel2)(upstream, scope3)), flatMap3((pull_) => pull = pull_));
   }));
 });
-var scoped3 = (self) => fromTransformBracket((upstream, scope3, forkedScope) => map4(provide(toTransform(self)(upstream, scope3), forkedScope), provide(forkedScope)));
+var scoped3 = (self) => fromTransformBracket((upstream, scope3, forkedScope) => map5(provide(toTransform(self)(upstream, scope3), forkedScope), provide(forkedScope)));
 var buffer = /* @__PURE__ */ dual(2, (self, options) => fromTransform(fnUntraced2(function* (upstream, scope3) {
   const pull = yield* toTransform(self)(upstream, scope3);
   const queue = yield* make12({
@@ -9634,10 +9717,10 @@ var runWith = (self, f, onHalt) => suspend2(() => {
   const makePull = toTransform(self)(done2(), scope3);
   return catchDone(flatMap3(makePull, f), onHalt ? onHalt : succeed5).pipe(onExit2((exit3) => close(scope3, exit3)));
 });
-var provideContext3 = /* @__PURE__ */ dual(2, (self, context3) => fromTransform((upstream, scope3) => map4(provideContext2(toTransform(self)(upstream, scope3), context3), provideContext2(context3))));
-var provideService3 = /* @__PURE__ */ dual(3, (self, key, service4) => fromTransform((upstream, scope3) => map4(provideService2(toTransform(self)(upstream, scope3), key, service4), provideService2(key, service4))));
+var provideContext3 = /* @__PURE__ */ dual(2, (self, context3) => fromTransform((upstream, scope3) => map5(provideContext2(toTransform(self)(upstream, scope3), context3), provideContext2(context3))));
+var provideService3 = /* @__PURE__ */ dual(3, (self, key, service4) => fromTransform((upstream, scope3) => map5(provideService2(toTransform(self)(upstream, scope3), key, service4), provideService2(key, service4))));
 var provideServiceEffect3 = /* @__PURE__ */ dual(3, (self, key, service4) => fromTransform((upstream, scope3) => flatMap3(service4, (s) => toTransform(provideService3(self, key, s))(upstream, scope3))));
-var provide5 = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, layer, options) => isContext(layer) ? provideContext3(self, layer) : fromTransform((upstream, scope3) => flatMap3(options?.local ? buildWithMemoMap(layer, makeMemoMapUnsafe(), scope3) : buildWithScope(layer, scope3), (context3) => map4(provideContext2(toTransform(self)(upstream, scope3), context3), provideContext2(context3)))));
+var provide5 = /* @__PURE__ */ dual((args2) => isChannel(args2[0]), (self, layer, options) => isContext(layer) ? provideContext3(self, layer) : fromTransform((upstream, scope3) => flatMap3(options?.local ? buildWithMemoMap(layer, makeMemoMapUnsafe(), scope3) : buildWithScope(layer, scope3), (context3) => map5(provideContext2(toTransform(self)(upstream, scope3), context3), provideContext2(context3)))));
 var updateContext3 = /* @__PURE__ */ dual(2, (self, f) => fromTransform((upstream, scope3) => contextWith2((context3) => {
   const toProvide = f(context3);
   return toTransform(provideContext3(self, toProvide))(upstream, scope3);
@@ -9666,7 +9749,7 @@ var runForEach = /* @__PURE__ */ dual(2, (self, f) => runWith(self, (pull) => fo
 var runForEachWhile = /* @__PURE__ */ dual(2, (self, f) => runWith(self, (pull) => pull.pipe(flatMap3(f), flatMap3((cont) => cont ? void_4 : done2()), forever4({
   disableYield: true
 }))));
-var mkUint8Array = (self) => map4(runFold(self, () => ({
+var mkUint8Array = (self) => map5(runFold(self, () => ({
   bytes: 0,
   arrays: []
 }), (acc, chunk) => {
@@ -9719,7 +9802,7 @@ var runFoldEffect = /* @__PURE__ */ dual(3, (self, initial, f) => suspend2(() =>
   let state = initial();
   return runWith(self, (pull) => whileLoop2({
     while: constTrue,
-    body: constant(pull.pipe(flatMap3((o) => f(state, o)), map4((s) => {
+    body: constant(pull.pipe(flatMap3((o) => f(state, o)), map5((s) => {
       state = s;
     }))),
     step: constVoid
@@ -9945,16 +10028,16 @@ __export(Stream_exports, {
   let: () => let_5,
   limitBytes: () => limitBytes,
   make: () => make16,
-  map: () => map6,
+  map: () => map7,
   mapAccum: () => mapAccum2,
   mapAccumArray: () => mapAccumArray,
   mapAccumArrayEffect: () => mapAccumArrayEffect,
   mapAccumEffect: () => mapAccumEffect,
   mapArray: () => mapArray,
   mapArrayEffect: () => mapArrayEffect,
-  mapBoth: () => mapBoth3,
+  mapBoth: () => mapBoth4,
   mapEffect: () => mapEffect2,
-  mapError: () => mapError4,
+  mapError: () => mapError6,
   merge: () => merge3,
   mergeAll: () => mergeAll4,
   mergeEffect: () => mergeEffect2,
@@ -10107,12 +10190,12 @@ var make13 = (options) => withFiber2((fiber3) => {
     if (self.state._tag === "Closed") {
       return void_4;
     }
-    const map7 = self.state.map;
+    const map8 = self.state.map;
     self.state = {
       _tag: "Closed"
     };
-    return forEach2(map7, ([, entry]) => exit2(close(entry.scope, void_3))).pipe(tap3(() => sync2(() => {
-      clear(map7);
+    return forEach2(map8, ([, entry]) => exit2(close(entry.scope, void_3))).pipe(tap3(() => sync2(() => {
+      clear(map8);
     })));
   }), self);
 });
@@ -10248,7 +10331,7 @@ var getState = (self) => uninterruptibleMask2(function loop(restore) {
         if (self.state._tag !== "Empty") {
           return loop(restore);
         }
-        return restore(provideContext2(self.acquire, add(self.context, Scope, scope3))).pipe(map4((value) => {
+        return restore(provideContext2(self.acquire, add(self.context, Scope, scope3))).pipe(map5((value) => {
           const state = {
             _tag: "Acquired",
             value,
@@ -10305,16 +10388,16 @@ var TypeId21 = "~effect/Stream";
 var isStream = (u) => hasProperty(u, TypeId21);
 var DefaultChunkSize2 = DefaultChunkSize;
 var fromChannel2 = fromChannel;
-var fromEffect2 = (effect) => fromChannel2(fromEffect(map4(effect, of)));
+var fromEffect2 = (effect) => fromChannel2(fromEffect(map5(effect, of)));
 var service3 = (service4) => fromEffect2(service2(service4));
 var serviceOption3 = (service4) => fromEffect2(serviceOption2(service4));
 var fromEffectDrain2 = (effect) => fromPull2(succeed5(flatMap3(effect, () => done2())));
-var fromEffectRepeat = (effect) => fromPull2(succeed5(map4(effect, of)));
+var fromEffectRepeat = (effect) => fromPull2(succeed5(map5(effect, of)));
 var fromEffectSchedule = (effect, schedule4) => fromPull2(gen3(function* () {
   const step = yield* toStepWithMetadata(schedule4);
   let s = yield* provideService2(effect, CurrentMetadata2, CurrentMetadata2.defaultValue());
   let initial = true;
-  const pull = suspend2(() => step(s)).pipe(flatMap3((meta) => provideService2(effect, CurrentMetadata2, meta)), map4((next) => {
+  const pull = suspend2(() => step(s)).pipe(flatMap3((meta) => provideService2(effect, CurrentMetadata2, meta)), map5((next) => {
     s = next;
     return of(next);
   }));
@@ -10355,17 +10438,17 @@ var die6 = (defect) => fromChannel2(die5(defect));
 var failCauseSync4 = (evaluate2) => fromChannel2(failCauseSync3(evaluate2));
 var fromIteratorSucceed = (iterator, maxChunkSize) => fromChannel2(fromIteratorArray(() => iterator, maxChunkSize));
 var fromIterable3 = (iterable, options) => Array.isArray(iterable) && options?.chunkSize === void 0 ? fromArray2(iterable) : fromChannel2(fromIterableArray(iterable, options?.chunkSize));
-var fromIterableEffect = (iterable) => unwrap2(map4(iterable, fromIterable3));
+var fromIterableEffect = (iterable) => unwrap2(map5(iterable, fromIterable3));
 var fromIterableEffectRepeat = (iterable) => flatMap5(fromEffectRepeat(iterable), fromIterable3);
 var fromArray2 = (array2) => isReadonlyArrayNonEmpty(array2) ? fromChannel2(succeed6(array2)) : empty5;
-var fromArrayEffect = (effect) => unwrap2(map4(effect, fromArray2));
+var fromArrayEffect = (effect) => unwrap2(map5(effect, fromArray2));
 var fromArrays = (...arrays) => fromChannel2(fromArray(filter3(arrays, isReadonlyArrayNonEmpty)));
 var fromQueue = (queue) => fromChannel2(fromQueueArray(queue));
 var fromPubSub = (pubsub) => fromChannel2(fromPubSubArray(pubsub));
 var fromPubSubTake2 = (pubsub) => fromChannel2(fromPubSubTake(pubsub));
 var fromReadableStream2 = (options) => fromChannel2(fromReadableStream(options));
 var fromAsyncIterable2 = (iterable, onError5) => fromChannel2(fromAsyncIterableArray(iterable, onError5));
-var fromSchedule = (schedule4) => fromPull2(map4(toStepWithSleep(schedule4), (step) => catchDone(map4(step(void 0), of), () => done2())));
+var fromSchedule = (schedule4) => fromPull2(map5(toStepWithSleep(schedule4), (step) => catchDone(map5(step(void 0), of), () => done2())));
 var fromSubscription = (pubsub) => fromChannel2(fromSubscriptionArray(pubsub));
 var fromEventListener = (target, type, options) => callback3((queue) => {
   function emit(event) {
@@ -10418,18 +10501,18 @@ var range2 = (min4, max4, chunkSize = DefaultChunkSize) => min4 > max4 ? empty5
   });
 }));
 var never4 = /* @__PURE__ */ fromChannel2(never3);
-var unwrap2 = (effect) => fromChannel2(unwrap(map4(effect, toChannel2)));
+var unwrap2 = (effect) => fromChannel2(unwrap(map5(effect, toChannel2)));
 var scoped4 = (self) => fromChannel2(scoped3(self.channel));
-var map6 = /* @__PURE__ */ dual(2, (self, f) => suspend4(() => {
+var map7 = /* @__PURE__ */ dual(2, (self, f) => suspend4(() => {
   let i = 0;
-  return fromChannel2(map5(self.channel, map2((o) => f(o, i++))));
+  return fromChannel2(map6(self.channel, map2((o) => f(o, i++))));
 }));
-var mapBoth3 = /* @__PURE__ */ dual(2, (self, options) => self.pipe(map6(options.onSuccess), mapError4(options.onFailure)));
-var mapArray = /* @__PURE__ */ dual(2, (self, f) => fromChannel2(map5(self.channel, f)));
-var mapEffect2 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, f, options) => self.channel.pipe(flattenArray, mapEffect(f, options), map5(of), fromChannel2));
+var mapBoth4 = /* @__PURE__ */ dual(2, (self, options) => self.pipe(map7(options.onSuccess), mapError6(options.onFailure)));
+var mapArray = /* @__PURE__ */ dual(2, (self, f) => fromChannel2(map6(self.channel, f)));
+var mapEffect2 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, f, options) => self.channel.pipe(flattenArray, mapEffect(f, options), map6(of), fromChannel2));
 var flattenEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, options) => mapEffect2(self, identity, options));
 var mapArrayEffect = /* @__PURE__ */ dual(2, (self, f) => fromChannel2(mapEffect(self.channel, f)));
-var result3 = (self) => self.pipe(map6(succeed2), catch_4((e) => succeed7(fail2(e))));
+var result3 = (self) => self.pipe(map7(succeed2), catch_4((e) => succeed7(fail2(e))));
 var tap4 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, f, options) => mapEffect2(self, (a) => as3(f(a), a), options));
 var tapBoth = /* @__PURE__ */ dual(2, (self, options) => self.pipe(tapError4(options.onError), tap4(options.onElement, {
   concurrency: options.concurrency
@@ -10484,7 +10567,7 @@ var flattenArray2 = (self) => fromChannel2(flattenArray(self.channel));
 var drain2 = (self) => fromChannel2(drain(self.channel));
 var drainFork = /* @__PURE__ */ dual(2, (self, that) => mergeEffect2(self, runDrain2(that)));
 var repeat5 = /* @__PURE__ */ dual(2, (self, schedule4) => fromChannel2(repeat4(self.channel, schedule4)));
-var schedule3 = /* @__PURE__ */ dual(2, (self, schedule4) => self.channel.pipe(flattenArray, schedule2(schedule4), map5(of), fromChannel2));
+var schedule3 = /* @__PURE__ */ dual(2, (self, schedule4) => self.channel.pipe(flattenArray, schedule2(schedule4), map6(of), fromChannel2));
 var timeout3 = /* @__PURE__ */ dual(2, (self, duration) => timeoutOrElse3(self, {
   duration,
   orElse: () => empty5
@@ -10504,7 +10587,7 @@ var timeoutOrElse3 = /* @__PURE__ */ dual(2, (self, options) => {
       deadline = clock.currentTimeMillisUnsafe() + durationMs;
       latch.openUnsafe();
       return pull;
-    }).pipe(map4((arr) => {
+    }).pipe(map5((arr) => {
       latch.closeUnsafe();
       deadline = void 0;
       return arr;
@@ -10527,7 +10610,7 @@ var timeoutOrElse3 = /* @__PURE__ */ dual(2, (self, options) => {
     return failCause7(cause);
   });
 });
-var repeatElements = /* @__PURE__ */ dual(2, (self, schedule4) => fromChannel2(fromTransform((upstream, scope3) => map4(toTransform(flattenArray(self.channel))(upstream, scope3), (pullElement) => {
+var repeatElements = /* @__PURE__ */ dual(2, (self, schedule4) => fromChannel2(fromTransform((upstream, scope3) => map5(toTransform(flattenArray(self.channel))(upstream, scope3), (pullElement) => {
   let pullRepeat = void 0;
   const pull = gen3(function* () {
     const element = yield* pullElement;
@@ -10548,12 +10631,12 @@ var concat = /* @__PURE__ */ dual(2, (self, that) => flatten6(fromArray2([self,
 var prepend2 = /* @__PURE__ */ dual(2, (self, values) => concat(fromIterable3(values), self));
 var merge3 = /* @__PURE__ */ dual((args2) => isStream(args2[0]) && isStream(args2[1]), (self, that, options) => fromChannel2(merge2(toChannel2(self), toChannel2(that), options)));
 var mergeEffect2 = /* @__PURE__ */ dual(2, (self, effect) => self.channel.pipe(mergeEffect(effect), fromChannel2));
-var mergeResult = /* @__PURE__ */ dual(2, (self, that) => merge3(map6(self, succeed2), map6(that, fail2)));
+var mergeResult = /* @__PURE__ */ dual(2, (self, that) => merge3(map7(self, succeed2), map7(that, fail2)));
 var mergeLeft = /* @__PURE__ */ dual(2, (left, right) => mergeEffect2(left, runDrain2(right)));
 var mergeRight = /* @__PURE__ */ dual(2, (left, right) => mergeEffect2(right, runDrain2(left)));
 var mergeAll4 = /* @__PURE__ */ dual(2, (streams, options) => flatten6(fromIterable3(streams), options));
 var cross = /* @__PURE__ */ dual(2, (left, right) => crossWith(left, right, (l, r) => [l, r]));
-var crossWith = /* @__PURE__ */ dual(3, (left, right, f) => flatMap5(left, (l) => map6(right, (r) => f(l, r))));
+var crossWith = /* @__PURE__ */ dual(3, (left, right, f) => flatMap5(left, (l) => map7(right, (r) => f(l, r))));
 var zipWith4 = /* @__PURE__ */ dual(3, (left, right, f) => zipWithArray(left, right, zipArrays(f)));
 var zipArrays = (f) => (leftArr, rightArr) => {
   const minLength = Math.min(leftArr.length, rightArr.length);
@@ -10612,7 +10695,7 @@ var zipRight2 = /* @__PURE__ */ dual(2, (left, right) => zipWithArray(left, righ
   return [output, leftoverLeft, leftoverRight];
 }));
 var zipFlatten = /* @__PURE__ */ dual(2, (self, that) => zipWith4(self, that, (a, a2) => [...a, a2]));
-var zipWithIndex = (self) => map6(self, (a, i) => [a, i]);
+var zipWithIndex = (self) => map7(self, (a, i) => [a, i]);
 var zipWithNext = (self) => mapAccumArray(self, none2, (acc, arr) => {
   let i = 0;
   if (acc._tag === "None") {
@@ -10687,7 +10770,7 @@ var zipLatestAll = (...streams) => fromChannel2(suspend3(() => {
   });
 }));
 var zipLatest = /* @__PURE__ */ dual(2, (left, right) => zipLatestAll(left, right));
-var zipLatestWith = /* @__PURE__ */ dual(3, (left, right, f) => map6(zipLatestAll(left, right), ([a, a2]) => f(a, a2)));
+var zipLatestWith = /* @__PURE__ */ dual(3, (left, right, f) => map7(zipLatestAll(left, right), ([a, a2]) => f(a, a2)));
 var raceAll3 = (...streams) => fromChannel2(fromTransform((_, scope3) => sync2(() => {
   let winner;
   const race4 = raceAll2(streams.map((stream) => {
@@ -10701,7 +10784,7 @@ var raceAll3 = (...streams) => fromChannel2(fromTransform((_, scope3) => sync2((
         return void_4;
       }
       return close(childScope, exit3);
-    }), map4(([, chunk]) => chunk));
+    }), map5(([, chunk]) => chunk));
   }));
   return suspend2(() => winner ?? race4);
 })));
@@ -10755,11 +10838,11 @@ var partitionQueue = /* @__PURE__ */ dual((args2) => isStream(args2[0]), /* @__P
   }), forkIn2(scope3));
   return [passes, fails];
 }));
-var partitionEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, filter9, options) => map4(partitionQueue(mapEffect2(self, (a) => filter9(a), options), (result4) => result4, options), ([passes, fails]) => [fromQueue(passes), fromQueue(fails)]));
-var partition4 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, filter9, options) => map4(partitionQueue(self, filter9, {
+var partitionEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, filter9, options) => map5(partitionQueue(mapEffect2(self, (a) => filter9(a), options), (result4) => result4, options), ([passes, fails]) => [fromQueue(passes), fromQueue(fails)]));
+var partition4 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, filter9, options) => map5(partitionQueue(self, filter9, {
   capacity: options?.bufferSize ?? 16
 }), ([passes, fails]) => [fromQueue(fails), fromQueue(passes)]));
-var when3 = /* @__PURE__ */ dual(2, (self, test) => test.pipe(map4((pass) => pass ? self : empty5), unwrap2));
+var when3 = /* @__PURE__ */ dual(2, (self, test) => test.pipe(map5((pass) => pass ? self : empty5), unwrap2));
 var peel = /* @__PURE__ */ dual(2, /* @__PURE__ */ fnUntraced2(function* (self, sink) {
   let cause = void 0;
   const originalPull = yield* toPull2(self.channel);
@@ -10802,7 +10885,7 @@ var catchReasons4 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, e
   const orElseHandler = orElse2 && ((reason, error) => orElse2(reason, error).channel);
   return fromChannel2(catchReasons3(self.channel, errorTag, handlers, orElseHandler));
 });
-var mapError4 = /* @__PURE__ */ dual(2, (self, f) => fromChannel2(mapError3(self.channel, f)));
+var mapError6 = /* @__PURE__ */ dual(2, (self, f) => fromChannel2(mapError5(self.channel, f)));
 var catchCauseIf4 = /* @__PURE__ */ dual(3, (self, predicate, f) => fromChannel2(catchCauseIf3(self.channel, predicate, (cause) => f(cause).channel)));
 var catchCauseFilter4 = /* @__PURE__ */ dual(3, (self, filter9, f) => fromChannel2(catchCauseFilter3(self.channel, filter9, (failure, cause) => f(failure, cause).channel)));
 var orElseIfEmpty2 = /* @__PURE__ */ dual(2, (self, orElse2) => fromChannel2(orElseIfEmpty(self.channel, (_) => toChannel2(orElse2()))));
@@ -10811,9 +10894,9 @@ var orDie4 = (self) => fromChannel2(orDie3(self.channel));
 var ignore4 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, options) => fromChannel2(ignore3(self.channel, options)));
 var ignoreCause4 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, options) => fromChannel2(ignoreCause3(self.channel, options)));
 var retry4 = /* @__PURE__ */ dual(2, (self, policy) => fromChannel2(retry3(self.channel, policy)));
-var retryWithoutReset = (self, schedule4) => unwrap2(map4(toStepWithMetadata(schedule4), (step) => {
+var retryWithoutReset = (self, schedule4) => unwrap2(map5(toStepWithMetadata(schedule4), (step) => {
   let meta = CurrentMetadata2.defaultValue();
-  const loop = () => catch_4(provideServiceEffect4(self, CurrentMetadata2, sync2(() => meta)), (error) => unwrap2(catchDone(map4(step(error), (meta_) => {
+  const loop = () => catch_4(provideServiceEffect4(self, CurrentMetadata2, sync2(() => meta)), (error) => unwrap2(catchDone(map5(step(error), (meta_) => {
     meta = meta_;
     return unwrap2(as3(yieldNow2, loop()));
   }), () => succeed5(fail8(error)))));
@@ -10835,7 +10918,7 @@ var withExecutionPlan3 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (se
   }));
   const emitter = options?.onEvent === void 0 ? void 0 : makeEventEmitter(options.onEvent, () => meta);
   let attemptState;
-  const instrument = emitter === void 0 ? identity : (attempt) => onExit4(onStart2(attempt, map4(emitter.begin, (state) => {
+  const instrument = emitter === void 0 ? identity : (attempt) => onExit4(onStart2(attempt, map5(emitter.begin, (state) => {
     attemptState = state;
   })), (exit3) => suspend2(() => {
     if (attemptState === void 0) return void_4;
@@ -10967,7 +11050,7 @@ var takeWhileFilter = /* @__PURE__ */ dual(2, (self, filter9) => transformPull2(
   });
   return pump;
 })));
-var takeWhileEffect = /* @__PURE__ */ dual(2, (self, predicate) => takeUntilEffect(self, (a, n) => map4(predicate(a, n), (b) => !b), {
+var takeWhileEffect = /* @__PURE__ */ dual(2, (self, predicate) => takeUntilEffect(self, (a, n) => map5(predicate(a, n), (b) => !b), {
   excludeLast: true
 }));
 var drop = /* @__PURE__ */ dual(2, (self, n) => transformPull2(self, (pull, _scope) => sync2(() => {
@@ -10981,7 +11064,7 @@ var drop = /* @__PURE__ */ dual(2, (self, n) => transformPull2(self, (pull, _sco
   return pump;
 })));
 var dropUntil = /* @__PURE__ */ dual(2, (self, predicate) => drop(dropWhile(self, (a, i) => !predicate(a, i)), 1));
-var dropUntilEffect = /* @__PURE__ */ dual(2, (self, predicate) => drop(dropWhileEffect(self, (a, i) => map4(predicate(a, i), (b) => !b)), 1));
+var dropUntilEffect = /* @__PURE__ */ dual(2, (self, predicate) => drop(dropWhileEffect(self, (a, i) => map5(predicate(a, i), (b) => !b)), 1));
 var dropWhile = /* @__PURE__ */ dual(2, (self, predicate) => transformPull2(self, (pull, _scope) => sync2(() => {
   let dropping3 = true;
   let index = 0;
@@ -11032,7 +11115,7 @@ var dropRight = /* @__PURE__ */ dual(2, (self, n) => {
     return emit;
   }));
 });
-var chunks = (self) => self.channel.pipe(map5(of), fromChannel2);
+var chunks = (self) => self.channel.pipe(map6(of), fromChannel2);
 var rechunk = /* @__PURE__ */ dual(2, (self, target) => {
   target = Math.max(1, target);
   return transformPull2(self, (pull, _scope) => sync2(() => {
@@ -11134,7 +11217,7 @@ var split = /* @__PURE__ */ dual(2, (self, predicate) => mapAccumArray(self, emp
     return isArrayNonEmpty2(arr) ? of(arr) : emptyArr;
   }
 }));
-var combine3 = /* @__PURE__ */ dual(4, (self, that, s, f) => combine2(flattenArray(self.channel), flattenArray(that.channel), s, f).pipe(map5(of), fromChannel2));
+var combine3 = /* @__PURE__ */ dual(4, (self, that, s, f) => combine2(flattenArray(self.channel), flattenArray(that.channel), s, f).pipe(map6(of), fromChannel2));
 var combineArray = /* @__PURE__ */ dual(4, (self, that, s, f) => fromChannel2(combine2(self.channel, that.channel, s, f)));
 var mapAccum2 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, initial, f, options) => fromChannel2(mapAccum(self.channel, initial, (state, arr) => {
   const acc = empty();
@@ -11161,13 +11244,13 @@ var mapAccumArray = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, i
   }
 } : void 0)));
 var emptyArr = /* @__PURE__ */ empty();
-var mapAccumEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, initial, f, options) => self.channel.pipe(flattenArray, mapAccum(initial, (state, a) => map4(f(state, a), ([state2, values]) => [state2, isReadonlyArrayNonEmpty(values) ? of(values) : empty()]), options?.onHalt ? {
+var mapAccumEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, initial, f, options) => self.channel.pipe(flattenArray, mapAccum(initial, (state, a) => map5(f(state, a), ([state2, values]) => [state2, isReadonlyArrayNonEmpty(values) ? of(values) : empty()]), options?.onHalt ? {
   onHalt(state) {
     const arr = options.onHalt(state);
     return isReadonlyArrayNonEmpty(arr) ? of(arr) : emptyArr;
   }
 } : void 0), fromChannel2));
-var mapAccumArrayEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, initial, f, options) => self.channel.pipe(mapAccum(initial, (state, a) => map4(f(state, a), ([state2, values]) => [state2, isReadonlyArrayNonEmpty(values) ? of(values) : emptyArr]), options?.onHalt ? {
+var mapAccumArrayEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, initial, f, options) => self.channel.pipe(mapAccum(initial, (state, a) => map5(f(state, a), ([state2, values]) => [state2, isReadonlyArrayNonEmpty(values) ? of(values) : emptyArr]), options?.onHalt ? {
   onHalt(state) {
     const arr = options.onHalt(state);
     return isReadonlyArrayNonEmpty(arr) ? of(arr) : emptyArr;
@@ -11188,7 +11271,7 @@ var scan = /* @__PURE__ */ dual(3, (self, initial, f) => suspend4(() => {
     return [state, of(states)];
   }));
 }));
-var scanEffect2 = /* @__PURE__ */ dual(3, (self, initial, f) => self.channel.pipe(flattenArray, scanEffect(initial, f), map5(of), fromChannel2));
+var scanEffect2 = /* @__PURE__ */ dual(3, (self, initial, f) => self.channel.pipe(flattenArray, scanEffect(initial, f), map6(of), fromChannel2));
 var debounce = /* @__PURE__ */ dual(2, (self, duration) => transformPull2(self, fnUntraced2(function* (pull, scope3) {
   const clock = yield* Clock;
   const durationMs = toMillis(fromInputUnsafe(duration));
@@ -11411,7 +11494,7 @@ var transduce = /* @__PURE__ */ dual(2, (self, sink) => transformPull2(self, (up
     done4 = fail4(error);
     return done2();
   }));
-  const pull = map4(suspend2(() => sink.transform(upstreamWithLeftover, scope3)), ([value, leftover_]) => {
+  const pull = map5(suspend2(() => sink.transform(upstreamWithLeftover, scope3)), ([value, leftover_]) => {
     leftover = leftover_;
     return of(value);
   });
@@ -11488,8 +11571,8 @@ var broadcastN = /* @__PURE__ */ dual(2, /* @__PURE__ */ fnUntraced2(function* (
   return streams;
 }));
 var makePubSub2 = (options) => acquireRelease2(options.capacity === "unbounded" ? unbounded(options) : options.strategy === "dropping" ? dropping(options) : options.strategy === "sliding" ? sliding(options) : bounded(options), shutdown);
-var broadcast = /* @__PURE__ */ dual(2, (self, options) => map4(toPubSubTake2(self, options), fromPubSubTake2));
-var share = /* @__PURE__ */ dual(2, (self, options) => map4(make15({
+var broadcast = /* @__PURE__ */ dual(2, (self, options) => map5(toPubSubTake2(self, options), fromPubSubTake2));
+var share = /* @__PURE__ */ dual(2, (self, options) => map5(make15({
   acquire: broadcast(self, options),
   idleTimeToLive: options.idleTimeToLive
 }), (ref) => unwrap2(get6(ref))));
@@ -11546,13 +11629,13 @@ var changesWithEffect = /* @__PURE__ */ dual(2, (self, f) => transformPull2(self
 })));
 var decodeText = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, options) => suspend4(() => {
   const decoder = new TextDecoder(options?.encoding);
-  return map6(self, (chunk) => decoder.decode(chunk, {
+  return map7(self, (chunk) => decoder.decode(chunk, {
     stream: true
   }));
 }));
 var encodeText = (self) => suspend4(() => {
   const encoder = new TextEncoder();
-  return map6(self, (chunk) => encoder.encode(chunk));
+  return map7(self, (chunk) => encoder.encode(chunk));
 });
 var splitLines2 = (self) => self.channel.pipe(pipeTo(splitLines()), fromChannel2);
 var intersperse = /* @__PURE__ */ dual(2, (self, element) => mapArray(self, (arr, i) => {
@@ -11621,22 +11704,22 @@ var withSpan4 = function() {
   return (self) => fromChannel2(withSpan3(self.channel, name, options));
 };
 var Do4 = /* @__PURE__ */ succeed7({});
-var let_5 = /* @__PURE__ */ dual(3, (self, name, f) => map6(self, (a) => ({
+var let_5 = /* @__PURE__ */ dual(3, (self, name, f) => map7(self, (a) => ({
   ...a,
   [name]: f(a)
 })));
-var bind5 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, tag, f, options) => flatMap5(self, (a) => map6(f(a), (b) => ({
+var bind5 = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, tag, f, options) => flatMap5(self, (a) => map7(f(a), (b) => ({
   ...a,
   [tag]: b
 })), options));
-var bindEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, tag, f, options) => mapEffect2(self, (a) => map4(f(a), (b) => ({
+var bindEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, tag, f, options) => mapEffect2(self, (a) => map5(f(a), (b) => ({
   ...a,
   [tag]: b
 })), options));
-var bindTo5 = /* @__PURE__ */ dual(2, (self, name) => map6(self, (a) => ({
+var bindTo5 = /* @__PURE__ */ dual(2, (self, name) => map7(self, (a) => ({
   [name]: a
 })));
-var run = /* @__PURE__ */ dual(2, (self, sink) => scopedWith2((scope3) => toPullScoped(self.channel, scope3).pipe(flatMap3((upstream) => sink.transform(upstream, scope3)), map4(([a]) => a))));
+var run = /* @__PURE__ */ dual(2, (self, sink) => scopedWith2((scope3) => toPullScoped(self.channel, scope3).pipe(flatMap3((upstream) => sink.transform(upstream, scope3)), map5(([a]) => a))));
 var runCollect = (self) => runFold(self.channel, () => [], (acc, chunk) => {
   for (let i = 0; i < chunk.length; i++) {
     acc.push(chunk[i]);
@@ -11659,7 +11742,7 @@ var runFold2 = /* @__PURE__ */ dual(3, (self, initial, f) => runFold(self.channe
 var runFoldEffect2 = /* @__PURE__ */ dual(3, (self, initial, f) => runFoldEffect(self.channel, initial, (acc, arr) => {
   let i = 0;
   let s = acc;
-  return map4(whileLoop2({
+  return map5(whileLoop2({
     while: () => i < arr.length,
     body: () => f(s, arr[i]),
     step(z) {
@@ -11668,8 +11751,8 @@ var runFoldEffect2 = /* @__PURE__ */ dual(3, (self, initial, f) => runFoldEffect
     }
   }), () => s);
 }));
-var runHead2 = (self) => map4(runHead(self.channel), map(getUnsafe(0)));
-var runLast2 = (self) => map4(runLast(self.channel), map(lastNonEmpty));
+var runHead2 = (self) => map5(runHead(self.channel), map(getUnsafe(0)));
+var runLast2 = (self) => map5(runLast(self.channel), map(lastNonEmpty));
 var runForEach2 = /* @__PURE__ */ dual(2, (self, f) => runForEach(self.channel, (arr) => {
   let i = 0;
   return whileLoop2({
@@ -11681,7 +11764,7 @@ var runForEach2 = /* @__PURE__ */ dual(2, (self, f) => runForEach(self.channel,
 var runForEachWhile2 = /* @__PURE__ */ dual(2, (self, f) => runForEachWhile(self.channel, (arr) => {
   let done4 = false;
   let i = 0;
-  return map4(whileLoop2({
+  return map5(whileLoop2({
     while: () => !done4 && i < arr.length,
     body: () => f(arr[i]),
     step(b) {
@@ -11694,7 +11777,7 @@ var runForEachArray = /* @__PURE__ */ dual(2, (self, f) => runForEach(self.chann
 var runDrain2 = (self) => runDrain(self.channel);
 var toPull3 = (self) => toPull2(self.channel);
 var mkString = (self) => runFold(self.channel, () => "", (acc, chunk) => acc + chunk.join(""));
-var mkArrayBuffer = (self) => map4(mkUint8Array(self.channel), (bytes) => bytes.buffer);
+var mkArrayBuffer = (self) => map5(mkUint8Array(self.channel), (bytes) => bytes.buffer);
 var mkUint8Array2 = (self) => mkUint8Array(self.channel);
 var toReadableStreamWith = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, context3, options) => {
   let currentResolve = void 0;
@@ -11719,19 +11802,19 @@ var toReadableStreamWith = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (
       });
     },
     pull() {
-      return new Promise((resolve3) => {
-        currentResolve = resolve3;
+      return new Promise((resolve5) => {
+        currentResolve = resolve5;
         latch.openUnsafe();
       });
     },
     cancel() {
       if (!fiber3) return;
-      return runPromise2(asVoid3(interrupt4(fiber3)));
+      return runPromise2(asVoid4(interrupt4(fiber3)));
     }
   }, options?.strategy);
 });
 var toReadableStream = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, options) => toReadableStreamWith(self, empty2(), options));
-var toReadableStreamEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, options) => map4(context2(), (context3) => toReadableStreamWith(self, context3, options)));
+var toReadableStreamEffect = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, options) => map5(context2(), (context3) => toReadableStreamWith(self, context3, options)));
 var toAsyncIterableWith = /* @__PURE__ */ dual(2, (self, context3) => ({
   [Symbol.asyncIterator]() {
     const runPromise3 = runPromiseWith2(context3);
@@ -11796,7 +11879,7 @@ var toAsyncIterableWith = /* @__PURE__ */ dual(2, (self, context3) => ({
     };
   }
 }));
-var toAsyncIterableEffect = (self) => map4(context2(), (context3) => toAsyncIterableWith(self, context3));
+var toAsyncIterableEffect = (self) => map5(context2(), (context3) => toAsyncIterableWith(self, context3));
 var toAsyncIterable = (self) => toAsyncIterableWith(self, empty2());
 var runIntoPubSub = /* @__PURE__ */ dual((args2) => isStream(args2[0]), (self, pubsub, options) => runIntoPubSubArray(self.channel, pubsub, options));
 var toPubSub = /* @__PURE__ */ dual(2, (self, options) => toPubSubArray(self.channel, options));
@@ -12109,6 +12192,9 @@ function summarizeToolArguments(toolName, rawArgs) {
   );
 }
 
+// packages/agent-runtime/leafFinalHandoff.ts
+var LEAF_FINAL_HANDOFF_INSTRUCTIONS = `Leaf subtask final: return only the result, blockers/findings, and minimal evidence the parent needs. Do not narrate your process or restate the task. Keep success minimal (a one-line result is enough); on failure include the blocker, severity when relevant, and an evidence reference (file:line, test command, commit, artifact, or run/dialog). If the task explicitly requires a long-form deliverable (document, translation, dataset, code, or other artifact), provide that deliverable in full and keep only the handoff around it concise.`;
+
 // packages/agent-runtime/contextBlockScope.ts
 var isContextBlockScope = (value) => {
   if (typeof value !== "object" || value === null) return false;
@@ -12860,6 +12946,10 @@ async function runCompleteWithTimeout(args2) {
       ...model ? { model } : {},
       ...typeof usage?.provider_call_id === "string" && usage.provider_call_id.trim() ? { providerCallId: usage.provider_call_id.trim() } : {},
       ...errorMessage ? { errorMessage } : {},
+      // 原始 usage 帧随行：CLI TUI 的实时积分（liveTurnCredits）靠它逐帧
+      // 折算，不必等整轮结束才看到 ⚡ 增长。与 cache 投影互补——cache 是
+      // token 级分析口径，usage 是计费口径（cost / billing_unit）。
+      ...usage && Object.keys(usage).length > 0 ? { usage } : {},
       ...inputTokens > 0 || cacheHit > 0 || cacheMiss > 0 ? {
         cache: {
           inputTokens,
@@ -13098,6 +13188,11 @@ ${metadataText}` : "";
   if (embeddedMetadataIndex >= 0 && content.length <= args2.maxChars) {
     return content;
   }
+  if (content.length <= args2.maxChars && content.includes(`
+
+[${args2.label}; originalChars=`)) {
+    return content;
+  }
   const headRatio = resolveToolOutputProfile(args2.toolName).headRatio;
   const initialBudget = Math.max(
     1,
@@ -13138,29 +13233,30 @@ ${suffix(clipped.length)}`;
   }
   return projected.length <= args2.maxChars ? projected : projected.slice(0, args2.maxChars);
 }
+var TOOL_OUTPUT_PROJECTION_LABEL = "in-turn tool result truncated/projected before next provider call";
 function summarizeHistoricalToolContent(content, toolName, metadata) {
   return projectToolContentForProvider({
     content,
     toolName,
     metadata,
-    // Same single source of truth as the server path and the read ledgers:
-    // read-family tools keep their profile historical cap (4800) cross-turn,
-    // unprofiled tools fall back to the flat historical budget.
-    maxChars: resolveHistoricalToolContentCap(toolName, MAX_HISTORICAL_TOOL_CONTENT_CHARS),
-    label: "historical tool result truncated for the next turn"
+    // Stable projection contract: the SAME per-tool profile budget and label
+    // as prepareMessagesForProviderCall, so the first provider-visible
+    // representation of a tool execution is byte-identical on every later
+    // round and across turns. Read-family profiles keep their ledger cap
+    // (4800); unprofiled tools use the default profile (4000) instead of the
+    // old flat 1600 — a historical rewrite below the fresh budget was itself
+    // a cache-prefix break (see docs/plans/2026-09-05-tool-output-cache-stability.md).
+    maxChars: resolveToolOutputProfile(toolName).maxChars,
+    label: TOOL_OUTPUT_PROJECTION_LABEL
   });
 }
 function prepareMessagesForProviderCall(messages) {
   const paired = sanitizeToolCallPairing(messages);
-  let freshRunStart = paired.length;
-  while (freshRunStart > 0 && paired[freshRunStart - 1].role === "tool") {
-    freshRunStart -= 1;
-  }
   let toolMessageCount = 0;
   let rawToolContentChars = 0;
   let projectedToolContentChars = 0;
   let truncatedToolResults = 0;
-  const projected = paired.map((message, index) => {
+  const projected = paired.map((message) => {
     const { context_reference: _contextReference, ...providerMessage } = message;
     const sanitizedContent = providerMessage.content == null ? "" : typeof providerMessage.content === "string" ? providerMessage.content : providerMessage.content;
     if (providerMessage.role !== "tool") {
@@ -13171,14 +13267,12 @@ function prepareMessagesForProviderCall(messages) {
     }
     toolMessageCount += 1;
     rawToolContentChars += contentCharCount(sanitizedContent);
-    const isFresh = index >= freshRunStart;
-    const maxChars = isFresh ? FRESH_TOOL_OUTPUT_MAX_CHARS : resolveToolOutputProfile(providerMessage.toolName).maxChars;
     const projectedContent = projectToolContentForProvider({
       content: sanitizedContent,
       toolName: providerMessage.toolName,
       metadata: providerMessage.tool_result_metadata,
-      maxChars,
-      label: "in-turn tool result truncated/projected before next provider call"
+      maxChars: resolveToolOutputProfile(providerMessage.toolName).maxChars,
+      label: TOOL_OUTPUT_PROJECTION_LABEL
     });
     projectedToolContentChars += contentCharCount(projectedContent);
     if (contentCharCount(projectedContent) < contentCharCount(sanitizedContent)) {
@@ -13415,7 +13509,7 @@ async function runLocalAgentTurn(input) {
   }
   try {
     loopTimingMark("turnStart", 0);
-    const agentConfig = await input.adapter.loadAgentConfig(input.agentRef);
+    let agentConfig = await input.adapter.loadAgentConfig(input.agentRef);
     if (!agentConfig) {
       const error = new Error(
         `agentRef "${input.agentRef}" \u672A\u5339\u914D\u5230\u672C\u5730 agent\u3002\u8FD9\u4E0D\u662F\u914D\u7F6E\u7F3A\u5931\uFF0C\u8BF7\u7528 listAgents \u67E5\u770B\u53EF\u7528 agent\uFF0C\u518D\u7528 readAgent \u89E3\u6790 agentKey\uFF0C\u52FF\u624B\u5DE5\u62FC key\u3002`
@@ -13424,6 +13518,26 @@ async function runLocalAgentTurn(input) {
       error.agentRef = input.agentRef;
       throw error;
     }
+    const runtimeContext = input.runtimeContext;
+    const runConstraints = {
+      allowedToolNames: Array.isArray(runtimeContext?.allowedToolNames) ? runtimeContext.allowedToolNames : void 0,
+      blockedToolNames: Array.isArray(runtimeContext?.blockedToolNames) ? runtimeContext.blockedToolNames : void 0
+    };
+    if (runConstraints.allowedToolNames !== void 0 || runConstraints.blockedToolNames !== void 0) {
+      const toolNames = Array.isArray(agentConfig.toolNames) ? agentConfig.toolNames : [];
+      const constrainedSurface = applyToolSurfaceConstraints(
+        { explicitToolNames: toolNames, injectedToolNames: [], finalToolNames: toolNames },
+        runConstraints
+      );
+      agentConfig = {
+        ...agentConfig,
+        toolNames: constrainedSurface.finalToolNames,
+        exposedToolNames: constrainedSurface.finalToolNames,
+        ...agentConfig.rawRecord ? { rawRecord: { ...agentConfig.rawRecord, toolNames: constrainedSurface.finalToolNames } } : {},
+        toolSurface: constrainedSurface,
+        runScopedToolSurface: constrainedSurface
+      };
+    }
     const rawBillingConfig = agentConfig.rawRecord ?? {};
     const billingConfig = {
       model: agentConfig.model || "unknown",
@@ -13469,11 +13583,9 @@ async function runLocalAgentTurn(input) {
       guidanceBlocks.emailRegistrationWorkflow,
       // 注入顺序遵循 TOOL_GUIDED_SECTION_ORDER（与 buildSystemPrompt 的显式
       // layer 列表同源），禁止用 Object.values 自行定序。
-      ...TOOL_GUIDED_SECTION_ORDER.map((id) => toolGuidedSections[id] ?? "")
+      ...TOOL_GUIDED_SECTION_ORDER.map((id) => toolGuidedSections[id] ?? ""),
+      ...input.runKind === "subtask" ? [LEAF_FINAL_HANDOFF_INSTRUCTIONS] : []
     ].map((content) => content.trim()).filter((content) => content.length > 0).map((content) => ({ content, cacheScope: "session" }));
-    const currentTimeScope = [
-      { content: buildCurrentTimeBlock(/* @__PURE__ */ new Date(), void 0), cacheScope: "turn" }
-    ];
     const callerScopes = normalizeContextBlockScopes(
       input.contextBlocks,
       input.contextBlockScopes
@@ -13481,7 +13593,6 @@ async function runLocalAgentTurn(input) {
     const mergedContextBlockScopes = [
       { content: identityBlock, cacheScope: "session" },
       ...guidanceScopes,
-      ...currentTimeScope,
       ...callerScopes
     ];
     loopTimingMark("buildContextBlocks", 0);
@@ -13702,6 +13813,14 @@ async function runLocalAgentTurn(input) {
           };
           break;
         }
+        if (result4.runtimeProviderFailure) {
+          result4 = {
+            ...result4,
+            error: true,
+            errorMessage: result4.runtimeProviderFailure.message
+          };
+          break;
+        }
         const toolCalls = result4.tool_calls ?? [];
         const rawToolCallsCount = (result4.tool_calls?.length ?? 0) || (Array.isArray(result4.raw_tool_calls) ? result4.raw_tool_calls.length : 0);
         loopTimingMark("postLlmProcessing", round);
@@ -13877,6 +13996,7 @@ ${reasoningTailLog}
                 arguments: toolCall.function.arguments,
                 ...userInputText ? { userInput: userInputText } : {},
                 ...input.runtimeContext ? { runtimeContext: input.runtimeContext } : {},
+                ...agentConfig.runScopedToolSurface?.finalToolNames ? { runToolNames: agentConfig.runScopedToolSurface.finalToolNames } : {},
                 ...input.abortSignal ? { abortSignal: input.abortSignal } : {}
               }, {
                 ...input.abortSignal ? { abortSignal: input.abortSignal } : {},
@@ -14187,7 +14307,14 @@ function createResponsesStreamCollector(callbacks) {
   let usage;
   let failure;
   let completedResponse;
+  let sawMeaningfulDelta = false;
+  const observeMeaningfulOnce = () => {
+    if (sawMeaningfulDelta) return;
+    sawMeaningfulDelta = true;
+    callbacks?.onMeaningfulDelta?.();
+  };
   const processEvent = (ev) => {
+    if (isMeaningfulResponsesOutput(ev)) observeMeaningfulOnce();
     const type = String(ev.type ?? "");
     if (type === "error") {
       failure = failure ?? toResponsesStreamFailure(ev.error, callbacks?.fallbackPrefix);
@@ -14264,7 +14391,10 @@ function createResponsesStreamCollector(callbacks) {
   };
 }
 function aggregateResponsesStream(events, options) {
-  const collector = createResponsesStreamCollector({ fallbackPrefix: options?.fallbackPrefix ?? "Codex" });
+  const collector = createResponsesStreamCollector({
+    fallbackPrefix: options?.fallbackPrefix ?? "Codex",
+    ...options?.onMeaningfulDelta ? { onMeaningfulDelta: options.onMeaningfulDelta } : {}
+  });
   for (const ev of events) {
     collector.processEvent(ev);
   }
@@ -14280,6 +14410,7 @@ async function readResponsesSseCompletion(args2) {
   const collector = createResponsesStreamCollector({
     onTextDelta: args2.onTextDelta,
     onReasoningDelta: args2.onReasoningDelta,
+    ...args2.onMeaningfulDelta ? { onMeaningfulDelta: args2.onMeaningfulDelta } : {},
     fallbackPrefix: args2.fallbackPrefix ?? "Responses"
   });
   for await (const frame of readSseFrames(args2.response)) {
@@ -14338,7 +14469,8 @@ function buildOpenAiCompatibleChatCompletionRequest(args2) {
   const body = isResponses ? buildResponsesRequestBody(rawBody, args2.providerConfig.model) : normalizeChatCompletionsBodyForProvider({
     body: rawBody,
     provider: args2.providerConfig.provider,
-    model: args2.providerConfig.model
+    model: args2.providerConfig.model,
+    endpoint: args2.providerConfig.endpoint
   });
   const endpoint = args2.providerConfig.endpoint;
   const headers = {
@@ -14423,6 +14555,7 @@ async function readOpenAiCompatibleSseCompletion(args2) {
     toolCallTextState: createToolCallTextParserState(),
     onTextDelta: args2.onTextDelta,
     onReasoningDelta: args2.onReasoningDelta,
+    ...args2.onMeaningfulDelta ? { onMeaningfulDelta: args2.onMeaningfulDelta } : {},
     sawDone: false
   };
   for await (const frame of readSseFrames(args2.response)) {
@@ -14443,6 +14576,8 @@ async function readOpenAiCompatibleSseCompletion(args2) {
 }
 async function executeOpenAiCompatibleChatCompletion(args2) {
   const isResponses = resolveOpenAiCompatibleWire(args2.providerConfig) === "responses";
+  const timingTracker = createProviderCallTimingTracker();
+  const observeMeaningful = () => observeMeaningfulProviderResponse(timingTracker);
   const send = async (apiKey2) => {
     const request3 = buildOpenAiCompatibleChatCompletionRequest({
       providerConfig: apiKey2 === args2.providerConfig.apiKey ? args2.providerConfig : { ...args2.providerConfig, apiKey: apiKey2 },
@@ -14486,14 +14621,22 @@ async function executeOpenAiCompatibleChatCompletion(args2) {
   await args2.onHttpResult?.({ status: res.status });
   const contentType = res.headers.get("content-type") ?? "";
   const isEventStream = contentType.includes("text/event-stream");
+  const withTiming = (result4) => {
+    const usage = withProviderCallTimingFields(
+      result4.usage,
+      finalizeProviderCallTiming(timingTracker)
+    );
+    return { ...result4, ...usage ? { usage } : {} };
+  };
   if (isEventStream) {
     if (isResponses) {
       const streamed2 = await readResponsesSseCompletion({
         response: res,
         ...args2.onTextDelta ? { onTextDelta: args2.onTextDelta } : {},
-        ...args2.onReasoningDelta ? { onReasoningDelta: args2.onReasoningDelta } : {}
+        ...args2.onReasoningDelta ? { onReasoningDelta: args2.onReasoningDelta } : {},
+        onMeaningfulDelta: observeMeaningful
       });
-      return {
+      return withTiming({
         content: streamed2.content,
         model: args2.providerConfig.model,
         provider: args2.providerConfig.provider,
@@ -14503,14 +14646,15 @@ async function executeOpenAiCompatibleChatCompletion(args2) {
         ...streamed2.stream_complete ? { stream_complete: true } : {},
         ...streamed2.finish_reason ? { finish_reason: streamed2.finish_reason } : {},
         trace: args2.messages
-      };
+      });
     }
     const streamed = await readOpenAiCompatibleSseCompletion({
       response: res,
       ...args2.onTextDelta ? { onTextDelta: args2.onTextDelta } : {},
-      ...args2.onReasoningDelta ? { onReasoningDelta: args2.onReasoningDelta } : {}
+      ...args2.onReasoningDelta ? { onReasoningDelta: args2.onReasoningDelta } : {},
+      onMeaningfulDelta: observeMeaningful
     });
-    return {
+    return withTiming({
       content: streamed.content,
       model: args2.providerConfig.model,
       provider: args2.providerConfig.provider,
@@ -14520,7 +14664,7 @@ async function executeOpenAiCompatibleChatCompletion(args2) {
       ...streamed.stream_complete ? { stream_complete: true } : {},
       ...streamed.finish_reason ? { finish_reason: streamed.finish_reason } : {},
       trace: args2.messages
-    };
+    });
   }
   const raw = await res.text().catch(() => "");
   let data = {};
@@ -14530,17 +14674,17 @@ async function executeOpenAiCompatibleChatCompletion(args2) {
     data = {};
   }
   if (isResponses) {
-    return parseOpenAiCompatibleResponsesResponse({
+    return withTiming(parseOpenAiCompatibleResponsesResponse({
       providerConfig: args2.providerConfig,
       data,
       trace: args2.messages
-    });
+    }));
   }
-  return parseOpenAiCompatibleChatCompletionResponse({
+  return withTiming(parseOpenAiCompatibleChatCompletionResponse({
     providerConfig: args2.providerConfig,
     data,
     trace: args2.messages
-  });
+  }));
 }
 
 // packages/agent-runtime/openAiCompatibleProviderConfig.ts
@@ -14703,6 +14847,11 @@ function dialogMessageRecordToAgentRuntimeMessage(record) {
     ...typeof record.toolCallId === "string" ? { tool_call_id: record.toolCallId } : {},
     ...Array.isArray(record.tool_calls) ? { tool_calls: record.tool_calls } : {},
     ...typeof record.toolName === "string" ? { toolName: record.toolName } : {},
+    // 写侧（dialogWritePlan）把 tool_result_metadata 以 `metadata` 字段落库；
+    // 回读必须还原，否则跨 turn 投影丢失 metadata 后缀，同一 tool 消息的字节
+    // 在 turn 边界漂移 → provider 前缀缓存断裂（stable projection 契约，
+    // 见 docs/plans/2026-09-05-tool-output-cache-stability.md）。
+    ...record.metadata && typeof record.metadata === "object" ? { tool_result_metadata: record.metadata } : {},
     ...(() => {
       const raw = record.createdAt;
       const ms = typeof raw === "number" ? raw : typeof raw === "string" ? Date.parse(raw) : NaN;
@@ -15460,6 +15609,9 @@ function resolveLocalToolPolicy(args2) {
   };
 }
 async function executeLocalToolWithPolicy(args2) {
+  if (args2.runToolNames !== void 0 && !args2.runToolNames.includes(normalizeLocalToolName(args2.call.name))) {
+    throw new Error(`${args2.call.name} is outside the final run tool surface.`);
+  }
   const decision = resolveLocalToolPolicy({
     env: args2.env,
     agentToolNames: args2.agentToolNames,
@@ -15502,9 +15654,9 @@ async function executeLocalToolWithPolicy(args2) {
 // packages/agent-runtime/localWorkspaceTools.ts
 import { existsSync as existsSync3 } from "node:fs";
 import { createHash as createHash3 } from "node:crypto";
-import { mkdir, readdir, readFile, stat, writeFile } from "node:fs/promises";
-import { dirname, relative as relative2, resolve as resolve2, sep } from "node:path";
-import { spawn as spawnChildProcess2 } from "node:child_process";
+import { lstat, mkdir, readdir as readdir2, readFile as readFile3, realpath, stat as stat3, writeFile } from "node:fs/promises";
+import { dirname, isAbsolute as isAbsolute2, relative as relative3, resolve as resolve4, sep } from "node:path";
+import { spawn as spawnChildProcess3 } from "node:child_process";
 
 // packages/core/readRangeLedger.ts
 function filterRetainedLedgerRecords(records, retainedCap) {
@@ -15691,9 +15843,9 @@ function spawnToWebStreams(options) {
     env: options.env,
     stdio: ["ignore", "pipe", "pipe"]
   });
-  const exited = new Promise((resolve3) => {
-    child.on("exit", (code) => resolve3(code ?? 1));
-    child.on("error", () => resolve3(127));
+  const exited = new Promise((resolve5) => {
+    child.on("exit", (code) => resolve5(code ?? 1));
+    child.on("error", () => resolve5(127));
   });
   const toWeb = (stream) => {
     if (!stream) return null;
@@ -15712,6 +15864,200 @@ function spawnToWebStreams(options) {
   };
 }
 
+// packages/agent-runtime/fileTextSearch.ts
+import { readdir, readFile as readFile2, stat as stat2 } from "node:fs/promises";
+import { basename, relative as relative2, resolve as resolve2 } from "node:path";
+import { spawn as spawnChildProcess } from "node:child_process";
+
+// packages/agent-runtime/gitignore.ts
+import { readFile, stat } from "node:fs/promises";
+import { resolve } from "node:path";
+async function readRootGitignorePatterns(workspaceRoot) {
+  const content = await readFile(resolve(workspaceRoot, ".gitignore"), "utf8").catch(() => null);
+  if (content === null) return [];
+  return content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line && !line.startsWith("#") && !line.startsWith("!")).flatMap((line) => {
+    const unanchored = line.replace(/^\//, "");
+    if (unanchored.endsWith("/")) return [`${unanchored}**`];
+    if (unanchored.includes("**")) return [unanchored];
+    return [unanchored, `${unanchored}/**`];
+  });
+}
+async function hasRootGitignore(workspaceRoot) {
+  try {
+    await stat(resolve(workspaceRoot, ".gitignore"));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// packages/agent-runtime/fileTextSearch.ts
+var normalizePath = (value) => value.replaceAll("\\", "/");
+var pathFor = (root, file, absolute = false) => absolute ? normalizePath(file) : normalizePath(relative2(root, file) || basename(file));
+var COMMAND_LIMIT_HEADROOM = 1;
+async function runCommand(binary, args2, cwd, maxResults) {
+  const recordLimit = maxResults === void 0 ? 0 : Math.max(0, maxResults) + COMMAND_LIMIT_HEADROOM;
+  return await new Promise((done4) => {
+    let stdout = "", stderr = "", recordCount = 0, stopped = false;
+    try {
+      const child = spawnChildProcess(binary, args2, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+      child.stdout.on("data", (chunk) => {
+        stdout += chunk.toString();
+        recordCount = parseMatches(cwd, stdout).length;
+        if (recordLimit > 0 && recordCount >= recordLimit && !stopped) {
+          stopped = true;
+          child.kill();
+        }
+      });
+      child.stderr.on("data", (chunk) => {
+        stderr += chunk.toString();
+      });
+      child.on("error", () => done4({ stdout, stderr, outcome: { kind: "spawn-failed" } }));
+      child.on("close", (exitCode) => done4({ stdout, stderr, outcome: stopped ? { kind: "stopped-by-limit" } : { kind: "completed", exitCode } }));
+    } catch {
+      done4({ stdout, stderr, outcome: { kind: "spawn-failed" } });
+    }
+  });
+}
+function commandArgs(o, binary, target) {
+  const args2 = binary === "rg" ? ["--line-number", "--no-heading", "--color", "never", "--null"] : ["-RIn", "--binary-files=without-match", "--null"];
+  if (binary === "rg") args2.push("--no-require-git");
+  if (o.regex !== true) args2.push(binary === "rg" ? "--fixed-strings" : "-F");
+  else if (binary === "grep") args2.push("-E");
+  if (o.caseSensitive === false) args2.push("-i");
+  if (binary === "rg") {
+    if (o.includeIgnored) args2.push("--no-ignore");
+    for (const x of o.exclude ?? []) args2.push("--glob", `!${x}`);
+    if (o.include) args2.push("--glob", o.include);
+  } else {
+    for (const x of o.exclude ?? []) {
+      const clean = x.replace(/\/\*\*$/, "");
+      if (clean && !clean.includes("/")) args2.push("--exclude-dir", clean);
+    }
+    if (o.include) args2.push("--include", o.include);
+  }
+  args2.push("--", o.query, target);
+  return args2;
+}
+function parseMatches(root, output) {
+  const records = [];
+  const pattern = /(?:^|\n)([^\0\n]+)\0(\d+):(.*?)(?=\n[^\0\n]+\0|$)/gs;
+  for (const match7 of output.matchAll(pattern)) {
+    records.push({ file: resolve2(root, match7[1] ?? ""), line: Number(match7[2]), text: (match7[3] ?? "").replace(/\n$/, "") });
+  }
+  return records;
+}
+async function decorate(root, raw, context3, absolute = false) {
+  const cache = /* @__PURE__ */ new Map(), out = [];
+  for (const x of raw) {
+    let lines = cache.get(x.file);
+    if (!lines) {
+      try {
+        lines = (await readFile2(x.file, "utf8")).split(/\r\n|\r|\n/);
+      } catch {
+        continue;
+      }
+      cache.set(x.file, lines);
+    }
+    const i = x.line - 1;
+    out.push({ path: pathFor(root, x.file, absolute), line: x.line, text: lines[i] ?? x.text, before: lines.slice(Math.max(0, i - context3), i), after: lines.slice(i + 1, i + context3 + 1) });
+  }
+  return out;
+}
+function globMatch(pattern, value) {
+  const p = normalizePath(pattern).replace(/^!/, "");
+  let source = "";
+  for (let i = 0; i < p.length; i++) {
+    const c = p[i];
+    if (c === "*" && p[i + 1] === "*") {
+      i++;
+      if (p[i + 1] === "/") {
+        i++;
+        source += "(?:.*/)?";
+      } else source += ".*";
+    } else if (c === "*") source += "[^/]*";
+    else if (c === "?") source += "[^/]";
+    else source += c.replace(/[.+^${}()|[\]\\]/g, "\\$&");
+  }
+  const r = new RegExp(`^${source}$`);
+  return r.test(value) || r.test(basename(value));
+}
+var defaultReadTextFile = (filePath) => readFile2(filePath, "utf8").catch(() => "");
+async function jsSearch(o, targetPath) {
+  const max4 = o.maxResults ?? Number.MAX_SAFE_INTEGER;
+  const excludes = o.exclude ?? [];
+  const readText = o.readTextFile ?? defaultReadTextFile;
+  const files = [];
+  const targetStat = await stat2(targetPath).catch(() => null);
+  if (!targetStat) return { matches: [], totalMatches: 0, truncated: false, engine: "js" };
+  const ignorePatterns = o.includeIgnored ? [] : await readRootGitignorePatterns(o.root);
+  const isIgnored = (rel) => ignorePatterns.some((pattern) => globMatch(pattern, rel));
+  const isSearchableFile = (filePath) => {
+    const rel = pathFor(o.root, filePath);
+    return !excludes.some((pattern) => globMatch(pattern, rel)) && !isIgnored(rel) && (!o.include || globMatch(o.include, rel));
+  };
+  if (targetStat.isFile()) {
+    if (isSearchableFile(targetPath)) files.push(targetPath);
+  } else {
+    const walk = async (dir) => {
+      for (const e of await readdir(dir, { withFileTypes: true })) {
+        const f = resolve2(dir, e.name), rel = pathFor(o.root, f);
+        if (e.isDirectory()) {
+          if (!excludes.some((p) => globMatch(p, rel))) await walk(f);
+        } else if (e.isFile() && !excludes.some((p) => globMatch(p, rel)) && !isIgnored(rel) && (!o.include || globMatch(o.include, rel))) {
+          files.push(f);
+        }
+      }
+    };
+    await walk(targetPath);
+  }
+  const matcher = o.regex ? new RegExp(o.query, o.caseSensitive === false ? "i" : "") : null;
+  const needle = o.caseSensitive === false ? o.query.toLowerCase() : o.query;
+  const out = [], context3 = o.contextLines ?? 0;
+  for (const file of files) {
+    const text = await readText(file);
+    if (!text || text.includes("\0")) continue;
+    const lines = text.split(/\r\n|\r|\n/);
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i] ?? "";
+      const hit = matcher ? matcher.test(line) : o.caseSensitive === false ? line.toLowerCase().includes(needle) : line.includes(needle);
+      if (!hit) continue;
+      if (out.length >= max4) return { matches: out, totalMatches: max4, truncated: true, engine: "js" };
+      out.push({ path: pathFor(o.root, file, o.absolutePaths === true), line: i + 1, text: line, before: lines.slice(Math.max(0, i - context3), i), after: lines.slice(i + 1, i + context3 + 1) });
+    }
+  }
+  return { matches: out, totalMatches: out.length, truncated: false, engine: "js" };
+}
+var COMMAND_ENGINES = [
+  { engine: "ripgrep", binaryOption: "resolveRipgrepBinary", binaryName: "rg", argsKey: "rg" },
+  { engine: "grep", binaryOption: "resolveGrepBinary", binaryName: "grep", argsKey: "grep" }
+];
+async function searchFileTextMatches(o) {
+  const targetPath = resolve2(o.root, o.target || ".");
+  const targetStat = await stat2(targetPath).catch(() => null);
+  if (!targetStat) return { matches: [], totalMatches: 0, truncated: false, engine: "js" };
+  if (targetStat.isFile()) return jsSearch(o, targetPath);
+  const run2 = o.runCommand ?? runCommand, max4 = o.maxResults;
+  for (const entry of COMMAND_ENGINES) {
+    const injectedResolver = o[entry.binaryOption];
+    const binary = injectedResolver ? injectedResolver() : resolveExecutableOnPath(entry.binaryName);
+    if (!binary) continue;
+    const result4 = await run2(binary, commandArgs(o, entry.argsKey, o.target || "."), o.root, max4);
+    const raw = parseMatches(o.root, result4.stdout);
+    const hardFailed = result4.outcome.kind === "spawn-failed" || result4.outcome.kind === "completed" && result4.outcome.exitCode !== 0 && result4.outcome.exitCode !== 1;
+    if (hardFailed) continue;
+    const truncated = raw.length > (max4 ?? Number.MAX_SAFE_INTEGER);
+    const matches = await decorate(o.root, raw.slice(0, max4), o.contextLines ?? 0, o.absolutePaths === true);
+    return {
+      matches,
+      totalMatches: truncated ? matches.length : raw.length,
+      truncated,
+      engine: entry.engine
+    };
+  }
+  return jsSearch(o, targetPath);
+}
+
 // packages/agent-runtime/processTask.ts
 var PROCESS_TASK_TERMINAL_STATUSES = [
   "stopped",
@@ -15844,9 +16190,38 @@ var ProcessRegistry = class {
   processes = /* @__PURE__ */ new Map();
   byTaskId = /* @__PURE__ */ new Map();
   eventLog;
+  terminalListeners = /* @__PURE__ */ new Set();
   constructor(eventLogOptions) {
     this.eventLog = new ProcessTaskEventLog(eventLogOptions);
   }
+  /**
+   * Subscribe to terminal transitions (markExited / kill). Fired synchronously
+   * at the same instant the terminal event is appended to the task event log,
+   * so consumers (TUI pending-notice buffer) observe the same ordering as the
+   * audit stream. Each task fires at most once: markExited is gated on the
+   * "running" status, kill()/stopAll() on the same guard, and late close
+   * events after a user stop are already suppressed by the status check.
+   *
+   * Returns an unsubscribe function. Registration does NOT replay terminal
+   * states for tasks that already terminated before subscription (no
+   * backfill): the event log keeps the audit trail, and replaying would
+   * double-notify tasks the previous session already surfaced.
+   */
+  onProcessTerminal(listener) {
+    this.terminalListeners.add(listener);
+    return () => {
+      this.terminalListeners.delete(listener);
+    };
+  }
+  /** Emit a terminal notice synchronously; listener errors must not break registry callers. */
+  emitTerminal(notice) {
+    for (const listener of [...this.terminalListeners]) {
+      try {
+        listener(notice);
+      } catch {
+      }
+    }
+  }
   /**
    * Pre-register an envelope right after a successful spawn and emit the
    * `started` event. Returns the stored record (with its stable taskId).
@@ -15944,6 +16319,13 @@ var ProcessRegistry = class {
       }
       item.status = "stopped";
       this.eventLog.append({ taskId: item.taskId, pid, type: "killed" });
+      this.emitTerminal({
+        taskId: item.taskId,
+        pid,
+        label: item.label,
+        command: item.command,
+        status: "stopped"
+      });
       return true;
     }
     return false;
@@ -15958,6 +16340,13 @@ var ProcessRegistry = class {
         }
         item.status = "stopped";
         this.eventLog.append({ taskId: item.taskId, pid: item.pid, type: "killed" });
+        this.emitTerminal({
+          taskId: item.taskId,
+          pid: item.pid,
+          label: item.label,
+          command: item.command,
+          status: "stopped"
+        });
       }
     }
   }
@@ -15972,6 +16361,14 @@ var ProcessRegistry = class {
         type: "exited",
         exitCode
       });
+      this.emitTerminal({
+        taskId: item.taskId,
+        pid,
+        label: item.label,
+        command: item.command,
+        status: item.status,
+        exitCode
+      });
     }
   }
   /**
@@ -16000,6 +16397,7 @@ var ProcessRegistry = class {
     this.processes.clear();
     this.byTaskId.clear();
     this.eventLog.clear();
+    this.terminalListeners.clear();
   }
 };
 var registry = null;
@@ -16011,8 +16409,8 @@ function getProcessRegistry() {
 }
 
 // packages/agent-runtime/workspaceShell.ts
-import { resolve } from "node:path";
-import { spawn as spawnChildProcess } from "node:child_process";
+import { resolve as resolve3 } from "node:path";
+import { spawn as spawnChildProcess2 } from "node:child_process";
 var EXEC_SHELL_TIMEOUT_ENV = "NOLO_EXEC_SHELL_TIMEOUT_MS";
 var EXEC_SHELL_DETACH_ENV = "NOLO_EXEC_SHELL_DETACH_MS";
 var DEFAULT_EXEC_SHELL_DETACH_MS = 12e4;
@@ -16121,30 +16519,34 @@ function tokenizeShellPrefix(command) {
   }
   return tokens;
 }
-function wrapPowerShellCommand(command) {
+function resolvePowerShellShellKind(executable) {
+  const base = (executable.split(/[\\/]/).pop() ?? "").toLowerCase();
+  return base === "pwsh" || base === "pwsh.exe" ? "pwsh" : "powershell5";
+}
+function wrapPowerShellCommand(command, shellKind = "pwsh") {
   return [
     "[Console]::InputEncoding=[System.Text.Encoding]::UTF8",
     "[Console]::OutputEncoding=[System.Text.Encoding]::UTF8",
     "$OutputEncoding=[System.Text.Encoding]::UTF8",
-    "$PSStyle.OutputRendering='PlainText'",
+    // $PSStyle only exists on PowerShell 7+; injecting it on 5.1 makes every
+    // command emit a PropertyNotFound error on stderr.
+    ...shellKind === "pwsh" ? ["$PSStyle.OutputRendering='PlainText'"] : [],
     command
   ].join("; ");
 }
 function findPowerShellExecutable() {
   return resolveExecutableOnPath("pwsh") || resolveExecutableOnPath("powershell.exe") || resolveExecutableOnPath("powershell");
 }
-function buildPowerShellCommand(command) {
-  const executable = findPowerShellExecutable();
-  if (!executable) throw new Error("PowerShell is not available on this machine.");
+function buildPowerShellSpawnArgs(args2) {
   return [
-    executable,
+    args2.executable,
     "-NoLogo",
     "-NoProfile",
     "-NonInteractive",
     "-ExecutionPolicy",
     "Bypass",
     "-Command",
-    wrapPowerShellCommand(command)
+    wrapPowerShellCommand(args2.command, resolvePowerShellShellKind(args2.executable))
   ];
 }
 function buildBashCommand(command) {
@@ -16152,10 +16554,26 @@ function buildBashCommand(command) {
   if (!executable) throw new Error("bash/sh is not available on this machine.");
   return [executable, "-lc", command];
 }
+function buildWorkspaceShellPlan(args2) {
+  if (args2.shell === "bash") {
+    const argv2 = buildBashCommand(args2.command);
+    return { argv: argv2, resolvedShell: "bash", executable: argv2[0] ?? "bash" };
+  }
+  if (args2.shell === "powershell" || process.platform === "win32") {
+    const executable = findPowerShellExecutable();
+    if (!executable) throw new Error("PowerShell is not available on this machine.");
+    return {
+      argv: buildPowerShellSpawnArgs({ executable, command: args2.command }),
+      resolvedShell: "powershell",
+      executable,
+      shellKind: resolvePowerShellShellKind(executable)
+    };
+  }
+  const argv = buildBashCommand(args2.command);
+  return { argv, resolvedShell: "bash", executable: argv[0] ?? "bash" };
+}
 function buildWorkspaceShellCommand(args2) {
-  if (args2.shell === "powershell") return buildPowerShellCommand(args2.command);
-  if (args2.shell === "bash") return buildBashCommand(args2.command);
-  return process.platform === "win32" ? buildPowerShellCommand(args2.command) : buildBashCommand(args2.command);
+  return buildWorkspaceShellPlan(args2).argv;
 }
 function findWorkspaceShellEscapeToken(command) {
   const tokens = tokenizeShellPrefix(command);
@@ -16379,8 +16797,8 @@ async function runWorkspaceCommand(args2) {
     ...args2.commandPrefix ?? [],
     ...args2.command
   ];
-  const proc = spawnChildProcess(command[0] ?? "", command.slice(1), {
-    cwd: resolve(args2.workspaceRoot),
+  const proc = spawnChildProcess2(command[0] ?? "", command.slice(1), {
+    cwd: resolve3(args2.workspaceRoot),
     stdio: [
       args2.stdin === void 0 ? "ignore" : "pipe",
       "pipe",
@@ -16588,7 +17006,7 @@ var TASK_WAIT_POLL_INTERVAL_MS = 250;
 var TASK_STOP_GRACE_MS = 2e3;
 var TERMINAL_EVENT_TYPES = /* @__PURE__ */ new Set(["exited", "killed"]);
 function defaultSleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
+  return new Promise((resolve5) => setTimeout(resolve5, ms));
 }
 function defaultSignalSender(pid, signal) {
   process.kill(pid, signal);
@@ -16823,7 +17241,7 @@ function buildExecShellToolDefinition(toolName = "execShell") {
     type: "function",
     function: {
       name: toolName,
-      description: `Execute a shell command from the workspace root. Prefer one compound command (e.g. 'git status && git diff --stat') to perform complete verification in one step instead of multiple small roundtrips. Do not cd into guessed paths; commands already run from the workspace root. Commands block until exit. Long-running commands (sleep over ${IMMEDIATE_DETACH_SLEEP_THRESHOLD_SECONDS}s, dev servers, watchers) automatically detach to background returning {detached: true, pid, label}; for persistent services, prefer launchProcess.`,
+      description: `Execute a shell command from the workspace root. Prefer one compound command (e.g. 'git status && git diff --stat') to perform complete verification in one step instead of multiple small roundtrips. Do not cd into guessed paths; commands already run from the workspace root. Commands block until exit. Long-running commands (sleep over ${IMMEDIATE_DETACH_SLEEP_THRESHOLD_SECONDS}s, dev servers, watchers) automatically detach to background returning {detached: true, pid, label}; for persistent services, prefer launchProcess. On Windows the resolved shell may be Windows PowerShell 5.1 (metadata.shellKind="powershell5"): it does not support '&&'/'||' or $PSStyle \u2014 join commands with ';' or split into multiple calls. metadata.shellKind="pwsh" means PowerShell 7+ with full syntax. Read resolvedShell/shellKind from any execShell result before writing Windows-specific syntax.`,
       parameters: {
         type: "object",
         properties: {
@@ -16911,13 +17329,14 @@ var execShellCapability = {
         }
       };
     }
+    const shellPlan = buildWorkspaceShellPlan({
+      toolName: "execShell",
+      command,
+      shell: normalized.shell
+    });
     const result4 = await runWorkspaceCommand({
       workspaceRoot,
-      command: buildWorkspaceShellCommand({
-        toolName: "execShell",
-        command,
-        shell: normalized.shell
-      }),
+      command: shellPlan.argv,
       timeoutMs: resolveExecShellTimeoutMs(ctx.commandTimeoutMs),
       outputLimit: ctx.commandOutputLimit,
       commandPrefix: ctx.commandPrefix,
@@ -16931,6 +17350,8 @@ var execShellCapability = {
         command,
         exitCode: result4.exitCode,
         timedOut: result4.timedOut,
+        resolvedShell: shellPlan.resolvedShell,
+        ...shellPlan.shellKind ? { shellKind: shellPlan.shellKind } : {},
         ...result4.aborted ? { aborted: true } : {},
         ...result4.detached ? {
           detached: true,
@@ -16960,7 +17381,8 @@ var WORKSPACE_TOOL_NAMES = [
   "taskWait",
   "taskLogs",
   "taskStop",
-  "tasks"
+  "tasks",
+  "openDesktopPreview"
 ];
 var SHELL_TOOL_NAMES = [
   "execShell",
@@ -17181,6 +17603,25 @@ function buildLaunchProcessTool() {
     }
   };
 }
+function buildOpenDesktopPreviewTool() {
+  return {
+    type: "function",
+    function: {
+      name: "openDesktopPreview",
+      description: "Open the desktop app's local preview split (main-area iframe) at the given URL. Use after `launchProcess` once the dev server is confirmed healthy. The preview appears inside the main window (right side of the split becomes the artifact area), keeping the conversation on the right. Only available on the desktop runtime; returns an error elsewhere.",
+      parameters: {
+        type: "object",
+        properties: {
+          url: {
+            type: "string",
+            description: "Absolute http(s) URL to load in the preview browser window."
+          }
+        },
+        required: ["url"]
+      }
+    }
+  };
+}
 function buildListProcessesTool() {
   return {
     type: "function",
@@ -17291,6 +17732,7 @@ function buildWorkspaceToolDefinition(toolName) {
   if (toolName === "captureVisualState") return buildCaptureVisualStateTool();
   if (toolName === "execShell") return buildExecShellTool(toolName);
   if (toolName === "launchProcess") return buildLaunchProcessTool();
+  if (toolName === "openDesktopPreview") return buildOpenDesktopPreviewTool();
   if (toolName === "listProcesses") return buildListProcessesTool();
   if (toolName === "taskWait") return buildTaskWaitTool();
   if (toolName === "taskLogs") return buildTaskLogsTool();
@@ -17322,8 +17764,17 @@ async function invokeCapability(capabilityOrName, input, ctx = {}) {
 }
 
 // packages/agent-runtime/localWorkspaceTools.ts
+async function hasRootGitignore2(workspaceRoot) {
+  return hasRootGitignore(workspaceRoot);
+}
+async function readRootGitignorePatterns2(workspaceRoot) {
+  return readRootGitignorePatterns(workspaceRoot);
+}
 var DEFAULT_LOCAL_API_ORIGIN = "http://127.0.0.1:38123";
 var ALWAYS_EXCLUDED_GLOBS = [
+  ".git/**",
+  ".nolo/**",
+  "node_modules/**",
   "*.tsbuildinfo",
   "dist/**",
   "build/**",
@@ -17411,11 +17862,11 @@ function parseWorkspaceToolArguments(raw) {
   }
 }
 function normalizeWorkspaceRelativePath(args2) {
-  const relativePath = relative2(args2.workspaceRoot, args2.targetPath);
+  const relativePath = relative3(args2.workspaceRoot, args2.targetPath);
   return relativePath || ".";
 }
 function isPathInsideWorkspace(args2) {
-  const relativePath = relative2(args2.workspaceRoot, args2.targetPath);
+  const relativePath = relative3(args2.workspaceRoot, args2.targetPath);
   return relativePath === "" || !relativePath.startsWith("..") && !relativePath.includes(`..${sep}`);
 }
 var PATH_FIELD_ALIASES = ["path", "file_path", "filePath", "filename", "file", "target_file", "targetFile", "file_to_read", "fileToRead", "target_path", "read_path", "path_to_read", "pathToRead"];
@@ -17681,7 +18132,7 @@ function readVisualStateCaptureArgs(args2) {
 }
 async function readWorkspacePackageScripts(workspaceRoot) {
   try {
-    const raw = await readFile(resolve2(workspaceRoot, "package.json"), "utf8");
+    const raw = await readFile3(resolve4(workspaceRoot, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     const scripts = parsed && typeof parsed === "object" && parsed.scripts && typeof parsed.scripts === "object" ? Object.keys(parsed.scripts).sort() : [];
     return { scripts };
@@ -17755,108 +18206,29 @@ function resolveRipgrepBinary(env = process.env) {
   }
   return resolveExecutableOnPath("rg");
 }
-function resolveGrepBinary() {
-  return resolveExecutableOnPath("grep");
-}
 var SEARCH_OUTPUT_CHAR_LIMIT = 2e4;
-async function runWorkspaceCommandLimitedLines(args2) {
-  const command = [
-    ...args2.commandPrefix ?? [],
-    ...args2.command
-  ];
-  const proc = spawnChildProcess2(command[0] ?? "", command.slice(1), {
-    cwd: resolve2(args2.workspaceRoot),
-    stdio: ["ignore", "pipe", "pipe"],
-    detached: false
-  });
-  const exitSettled = waitForNodeProcessExit(proc).then(
-    (code) => ({ ok: true, code }),
-    (error) => ({ ok: false, error })
-  );
-  const stderrPromise = readNodeStream(proc.stderr);
-  const lines = [];
-  let pending = "";
-  let limitedByMaxResults = false;
-  const stdoutPromise = new Promise((resolveRead, rejectRead) => {
-    proc.on("error", rejectRead);
-    proc.stdout?.on("data", (chunk) => {
-      pending += Buffer.isBuffer(chunk) ? chunk.toString("utf8") : String(chunk);
-      const parts2 = pending.split(/\r?\n/);
-      pending = parts2.pop() ?? "";
-      for (const part of parts2) {
-        if (!part) continue;
-        lines.push(part);
-        if (lines.length >= args2.maxLines) {
-          limitedByMaxResults = true;
-          try {
-            proc.kill("SIGTERM");
-          } catch {
-          }
-          break;
-        }
-      }
-    });
-    proc.stdout?.on("error", rejectRead);
-    proc.stdout?.on("end", () => resolveRead());
-    proc.stdout?.on("close", () => resolveRead());
-    if (!proc.stdout) {
-      void exitSettled.then((result4) => {
-        if (!result4.ok) rejectRead(result4.error);
-        else resolveRead();
-      });
-    }
-  });
+function isPathInsideRoot(root, targetPath) {
+  const rel = relative3(resolve4(root), resolve4(targetPath));
+  return rel === "" || rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute2(rel);
+}
+async function resolveRuntimeOwnedSpillPath(targetPath) {
+  const spillRoot = resolveNoloStateDir("spills");
+  if (!isPathInsideRoot(spillRoot, targetPath)) return null;
+  const rootStat = await lstat(spillRoot).catch(() => void 0);
+  if (rootStat?.isDirectory() !== true) return null;
   try {
-    await Promise.all([stdoutPromise, exitSettled]);
-  } catch (error) {
-    const settled2 = await exitSettled;
-    if (!settled2.ok) {
-      return {
-        stdout: "",
-        stderr: `spawn failed: ${toErrorMessage(settled2.error)}
-`,
-        exitCode: 127,
-        limitedByMaxResults: false,
-        spawnFailed: true
-      };
-    }
-    if (isSpawnFailureError(error)) {
-      return {
-        stdout: "",
-        stderr: `spawn failed: ${toErrorMessage(error)}
-`,
-        exitCode: 127,
-        limitedByMaxResults: false,
-        spawnFailed: true
-      };
-    }
-    throw error;
-  }
-  if (!limitedByMaxResults && pending.trim()) lines.push(pending);
-  const settled = await exitSettled;
-  if (!settled.ok) {
-    return {
-      stdout: "",
-      stderr: `spawn failed: ${toErrorMessage(settled.error)}
-`,
-      exitCode: 127,
-      limitedByMaxResults: false,
-      spawnFailed: true
-    };
+    const [realRoot, realTarget] = await Promise.all([realpath(spillRoot), realpath(targetPath)]);
+    return isPathInsideRoot(realRoot, realTarget) ? realTarget : null;
+  } catch {
+    return null;
   }
-  const exitCode = limitedByMaxResults ? 0 : settled.code;
-  const stderr = await stderrPromise;
-  return {
-    stdout: lines.slice(0, args2.maxLines).join("\n"),
-    stderr,
-    exitCode,
-    limitedByMaxResults
-  };
 }
 async function resolveLocalWorkspaceToolPath(args2) {
-  const workspaceRoot = resolve2(args2.workspaceRoot);
-  const targetPath = resolve2(workspaceRoot, args2.requestedPath);
-  if (!isPathInsideWorkspace({ workspaceRoot, targetPath })) {
+  const workspaceRoot = resolve4(args2.workspaceRoot);
+  const targetPath = resolve4(workspaceRoot, args2.requestedPath);
+  const insideWorkspace = isPathInsideWorkspace({ workspaceRoot, targetPath });
+  const trustedSpillPath = !insideWorkspace && args2.allowRuntimeOwnedSpill === true ? await resolveRuntimeOwnedSpillPath(targetPath) : null;
+  if (!insideWorkspace && trustedSpillPath === null) {
     if (args2.confirmExternalFileAccess) {
       const request3 = {
         id: "permission-file-external-access",
@@ -17881,7 +18253,7 @@ async function resolveLocalWorkspaceToolPath(args2) {
       }
     }
   }
-  return targetPath;
+  return trustedSpillPath ?? targetPath;
 }
 var READ_FILE_MAX_CHAR_LIMIT = 32e3;
 function defensivelyTruncateReadFile(args2) {
@@ -17933,9 +18305,10 @@ async function readFileTool(args2) {
   const absolutePath = await resolveLocalWorkspaceToolPath({
     workspaceRoot: args2.workspaceRoot,
     requestedPath,
+    allowRuntimeOwnedSpill: true,
     ...args2.confirmExternalFileAccess ? { confirmExternalFileAccess: args2.confirmExternalFileAccess } : {}
   });
-  const content = await readFile(absolutePath, "utf8");
+  const content = await readFile3(absolutePath, "utf8");
   const activity = extractActivity(parsed);
   const sliced = sliceReadFileContent({
     content,
@@ -17947,7 +18320,7 @@ async function readFileTool(args2) {
   });
   const isTruncated = sliced.truncated || truncatedRead.truncatedByCharLimit;
   const relativePath = normalizeWorkspaceRelativePath({
-    workspaceRoot: resolve2(args2.workspaceRoot),
+    workspaceRoot: resolve4(args2.workspaceRoot),
     targetPath: absolutePath
   });
   const force = parsed.force === true;
@@ -18014,7 +18387,7 @@ async function writeFileTool(args2) {
   await mkdir(dirname(absolutePath), { recursive: true });
   await writeFile(absolutePath, content, "utf8");
   const relativePath = normalizeWorkspaceRelativePath({
-    workspaceRoot: resolve2(args2.workspaceRoot),
+    workspaceRoot: resolve4(args2.workspaceRoot),
     targetPath: absolutePath
   });
   const activity = extractActivity(parsed);
@@ -18039,7 +18412,7 @@ async function editFileTool(args2) {
     requestedPath,
     ...args2.confirmExternalFileAccess ? { confirmExternalFileAccess: args2.confirmExternalFileAccess } : {}
   });
-  const content = await readFile(absolutePath, "utf8");
+  const content = await readFile3(absolutePath, "utf8");
   const { count: replacementCount, result: nextContent } = countAndReplaceEolTolerant({
     content,
     oldText,
@@ -18052,7 +18425,7 @@ async function editFileTool(args2) {
   }
   await writeFile(absolutePath, nextContent, "utf8");
   const relativePath = normalizeWorkspaceRelativePath({
-    workspaceRoot: resolve2(args2.workspaceRoot),
+    workspaceRoot: resolve4(args2.workspaceRoot),
     targetPath: absolutePath
   });
   const activity = extractActivity(parsed);
@@ -18068,28 +18441,9 @@ async function editFileTool(args2) {
     }
   };
 }
-async function hasRootGitignore(workspaceRoot) {
-  try {
-    await stat(resolve2(workspaceRoot, ".gitignore"));
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function readRootGitignorePatterns(workspaceRoot) {
-  try {
-    const content = await readFile(resolve2(workspaceRoot, ".gitignore"), "utf8");
-    return content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line && !line.startsWith("#") && !line.startsWith("!")).map((line) => {
-      const unanchored = line.replace(/^\//, "");
-      return unanchored.endsWith("/") ? `${unanchored}**` : unanchored;
-    });
-  } catch {
-    return [];
-  }
-}
 async function filterRootGitignoredFiles(args2) {
   if (args2.includeIgnored) return args2.files;
-  const patterns = await readRootGitignorePatterns(args2.workspaceRoot);
+  const patterns = await readRootGitignorePatterns2(args2.workspaceRoot);
   if (patterns.length === 0) return args2.files;
   const globs = patterns.map((pattern) => createGlob(pattern));
   return args2.files.filter((file) => !globs.some((glob) => glob.match(file)));
@@ -18102,94 +18456,18 @@ function scanWorkspaceGlobFiles(args2) {
     onlyFiles: true
   })).map((line) => line.trim().replace(/^\.\//, "")).filter(Boolean).filter((line) => !line.startsWith(".git/") && !line.startsWith("node_modules/")).filter((line) => !pathPrefix || line === args2.relativeSearchPath || line.startsWith(pathPrefix)).filter((line) => !args2.exclude.some((pattern) => createGlob(pattern).match(line))).sort((left, right) => left.localeCompare(right));
 }
-function dropAlwaysExcludedLines(lines) {
-  const globs = ALWAYS_EXCLUDED_GLOBS.map((pattern) => createGlob(pattern));
-  return lines.filter((line) => {
-    const filePath = line.match(/^(.*?):\d+[:-]/)?.[1];
-    if (!filePath) return true;
-    return !globs.some((glob) => glob.match(filePath));
-  });
-}
-function limitSearchOutputByMatches(lines, maxResults) {
-  if (!maxResults) return { lines, truncated: false };
-  const limited = [];
-  let matches = 0;
-  for (const line of lines) {
-    if (/:\d+:/.test(line)) {
-      if (matches >= maxResults) {
-        return { lines: limited, truncated: true };
-      }
-      matches += 1;
-    }
-    limited.push(line);
-  }
-  return { lines: limited, truncated: false };
-}
-async function scanWorkspaceTextMatches(args2) {
-  const files = scanWorkspaceGlobFiles({
-    workspaceRoot: args2.workspaceRoot,
-    pattern: "**/*",
-    relativeSearchPath: args2.relativeSearchPath,
-    exclude: args2.exclude
-  });
-  const results = [];
-  const seenContext = /* @__PURE__ */ new Set();
-  let matchCount = 0;
-  const literalQuery = args2.caseSensitive ? args2.query : args2.query.toLowerCase();
-  const regex = args2.literal ? void 0 : new RegExp(args2.query, args2.caseSensitive ? "" : "i");
-  const pushLine = (file, lineNumber, text, isMatch) => {
-    const separator = isMatch ? ":" : "-";
-    const key = `${file}:${lineNumber}:${separator}`;
-    if (seenContext.has(key)) return;
-    seenContext.add(key);
-    results.push(`${file}${separator}${lineNumber}${separator}${text}`);
-  };
-  for (const file of files) {
-    let content = "";
-    try {
-      content = await readFile(resolve2(args2.workspaceRoot, file), "utf8");
-    } catch {
-      continue;
-    }
-    if (content.includes("\0")) continue;
-    const lines = content.split(/\r?\n/);
-    for (let index = 0; index < lines.length; index += 1) {
-      const line = lines[index] ?? "";
-      const haystack = args2.caseSensitive ? line : line.toLowerCase();
-      const matched = args2.literal ? haystack.includes(literalQuery) : regex?.test(line) === true;
-      if (!matched) continue;
-      matchCount += 1;
-      const contextLines = args2.contextLines ?? 0;
-      const start = Math.max(0, index - contextLines);
-      const end3 = Math.min(lines.length - 1, index + contextLines);
-      for (let contextIndex = start; contextIndex <= end3; contextIndex += 1) {
-        pushLine(file, contextIndex + 1, lines[contextIndex] ?? "", contextIndex === index);
-      }
-      if (args2.maxResults && matchCount >= args2.maxResults) {
-        return {
-          lines: results,
-          limitedByMaxResults: true
-        };
-      }
-    }
-  }
-  return {
-    lines: results,
-    limitedByMaxResults: false
-  };
-}
 async function listWorkspaceEntries(args2) {
   const entries = [];
   let truncated = false;
   let limitedByMaxDepth = false;
   const visit = async (dirPath, depth) => {
     if (truncated) return;
-    const names = (await readdir(dirPath)).sort((left, right) => left.localeCompare(right));
+    const names = (await readdir2(dirPath)).sort((left, right) => left.localeCompare(right));
     for (const name of names) {
       if (truncated) break;
-      const absolutePath = resolve2(dirPath, name);
-      const info = await stat(absolutePath);
-      const relativePath = relative2(args2.dirPath, absolutePath) || ".";
+      const absolutePath = resolve4(dirPath, name);
+      const info = await stat3(absolutePath);
+      const relativePath = relative3(args2.dirPath, absolutePath) || ".";
       const isDirectory = info.isDirectory();
       entries.push(isDirectory ? `${relativePath}/` : relativePath);
       if (args2.maxResults && entries.length >= args2.maxResults) {
@@ -18199,7 +18477,7 @@ async function listWorkspaceEntries(args2) {
       if (isDirectory && depth < args2.maxDepth) {
         await visit(absolutePath, depth + 1);
       } else if (isDirectory && depth >= args2.maxDepth && !limitedByMaxDepth) {
-        const childNames = await readdir(absolutePath);
+        const childNames = await readdir2(absolutePath);
         limitedByMaxDepth = childNames.length > 0;
       }
     }
@@ -18209,169 +18487,48 @@ async function listWorkspaceEntries(args2) {
 }
 async function internalSearchWorkspace(args2) {
   const requestedPath = args2.path ?? ".";
-  const query = args2.query;
-  if (!query) {
-    throw new Error("internalSearchWorkspace requires a non-empty query.");
-  }
-  const maxResults = args2.maxResults ?? 200;
-  const contextLines = args2.contextLines;
-  const literal = false;
-  const caseSensitive = args2.caseSensitive === false ? false : true;
-  const exclude = [];
+  if (!args2.query) throw new Error("internalSearchWorkspace requires a non-empty query.");
   const searchPath = await resolveLocalWorkspaceToolPath({
     workspaceRoot: args2.workspaceRoot,
     requestedPath,
+    allowRuntimeOwnedSpill: true,
     ...args2.confirmExternalFileAccess ? { confirmExternalFileAccess: args2.confirmExternalFileAccess } : {}
   });
-  const isInside = isPathInsideWorkspace({
-    workspaceRoot: resolve2(args2.workspaceRoot),
-    targetPath: searchPath
+  const workspaceRoot = resolve4(args2.workspaceRoot);
+  const inside = isPathInsideWorkspace({ workspaceRoot, targetPath: searchPath });
+  const result4 = await searchFileTextMatches({
+    root: inside ? workspaceRoot : searchPath,
+    target: inside ? normalizeWorkspaceRelativePath({ workspaceRoot, targetPath: searchPath }) : ".",
+    query: args2.query,
+    regex: true,
+    caseSensitive: args2.caseSensitive !== false,
+    contextLines: args2.contextLines,
+    maxResults: args2.maxResults ?? 200,
+    includeIgnored: args2.workspaceRoot.includes(".worktrees") || !inside,
+    absolutePaths: !inside,
+    exclude: inside ? [...ALWAYS_EXCLUDED_GLOBS] : []
   });
-  const includeIgnored = args2.workspaceRoot.includes(".worktrees") || !isInside;
-  const execWorkspaceRoot = isInside ? args2.workspaceRoot : searchPath;
-  const relativeSearchPath = isInside ? normalizeWorkspaceRelativePath({
-    workspaceRoot: resolve2(args2.workspaceRoot),
-    targetPath: searchPath
-  }) : ".";
-  const rgBinary = resolveRipgrepBinary();
-  const grepBinary = resolveGrepBinary();
-  const rgCommand = rgBinary ? [
-    rgBinary,
-    "--line-number",
-    "--no-heading",
-    "--hidden",
-    ...literal ? ["--fixed-strings"] : [],
-    ...caseSensitive ? [] : ["--ignore-case"],
-    ...contextLines !== void 0 ? ["--context", String(contextLines)] : [],
-    ...includeIgnored ? ["--no-ignore"] : [],
-    "--glob",
-    "!node_modules",
-    "--glob",
-    "!.git",
-    ...isInside ? ALWAYS_EXCLUDED_GLOBS.flatMap((g) => ["--glob", `!${g}`]) : [],
-    ...exclude.flatMap((excludePattern) => ["--glob", `!${excludePattern}`]),
-    "--",
-    query,
-    relativeSearchPath
-  ] : null;
-  const grepExcludeArgs = [
-    ...ALWAYS_EXCLUDED_GLOBS.flatMap((g) => {
-      if (!g.endsWith("/**")) return ["--exclude", g];
-      const dir = g.replace(/\/\*\*$/, "");
-      return dir.includes("/") ? [] : [`--exclude-dir=${dir}`];
-    }),
-    ...exclude.flatMap((excludePattern) => ["--exclude", excludePattern])
-  ];
-  let searchEngine = "js";
-  let binariesUnavailable = !rgBinary && !grepBinary;
-  const result4 = await (async () => {
-    if (rgCommand) {
-      try {
-        const rgResult = maxResults && contextLines === void 0 ? await runWorkspaceCommandLimitedLines({
-          workspaceRoot: execWorkspaceRoot,
-          command: rgCommand,
-          maxLines: maxResults
-        }) : await runWorkspaceCommand({
-          workspaceRoot: execWorkspaceRoot,
-          command: rgCommand
-        });
-        if (!rgResult.spawnFailed) {
-          searchEngine = "ripgrep";
-          return rgResult;
-        }
-      } catch {
-      }
-    }
-    if (grepBinary) {
-      const grepCommand = [
-        grepBinary,
-        "-R",
-        "-n",
-        "-I",
-        ...literal ? ["-F"] : [],
-        ...caseSensitive ? [] : ["-i"],
-        ...contextLines !== void 0 ? ["-C", String(contextLines)] : [],
-        "--exclude-dir=node_modules",
-        "--exclude-dir=.git",
-        ...grepExcludeArgs,
-        query,
-        relativeSearchPath
-      ];
-      try {
-        const grepResult = maxResults && contextLines === void 0 ? await runWorkspaceCommandLimitedLines({
-          workspaceRoot: execWorkspaceRoot,
-          command: grepCommand,
-          maxLines: maxResults
-        }) : await runWorkspaceCommand({
-          workspaceRoot: execWorkspaceRoot,
-          command: grepCommand
-        });
-        if (!grepResult.spawnFailed) {
-          searchEngine = "grep";
-          return grepResult;
-        }
-        binariesUnavailable = true;
-      } catch {
-        binariesUnavailable = true;
-      }
-    } else {
-      binariesUnavailable = true;
-    }
-    return {
-      stdout: "",
-      stderr: "",
-      exitCode: 0,
-      limitedByMaxResults: false,
-      spawnFailed: true
-    };
-  })();
-  let outputLines = result4.stdout.split(/\r?\n/).map((line) => line.trimEnd().replace(/^\.\//, "")).filter(Boolean);
-  outputLines = dropAlwaysExcludedLines(outputLines);
-  let limitedByMaxResults = "limitedByMaxResults" in result4 && result4.limitedByMaxResults === true;
-  const forceJsFallback = binariesUnavailable || result4.spawnFailed === true;
-  if (outputLines.length === 0 && (forceJsFallback || result4.exitCode === 0 && (includeIgnored || !await hasRootGitignore(execWorkspaceRoot)))) {
-    const fallback = await scanWorkspaceTextMatches({
-      workspaceRoot: execWorkspaceRoot,
-      relativeSearchPath,
-      query,
-      exclude: [...ALWAYS_EXCLUDED_GLOBS, ...exclude],
-      maxResults,
-      literal,
-      caseSensitive,
-      contextLines
-    });
-    outputLines = fallback.lines;
-    limitedByMaxResults = fallback.limitedByMaxResults;
-    searchEngine = "js";
-  }
-  if (contextLines !== void 0 && outputLines.length > 0) {
-    const limited = limitSearchOutputByMatches(outputLines, maxResults);
-    outputLines = limited.lines;
-    limitedByMaxResults = limitedByMaxResults || limited.truncated;
-  }
-  const matchLines = outputLines.filter((line) => /:\d+:/.test(line));
-  const matchedFiles = Array.from(new Set(matchLines.flatMap((line) => {
-    const match7 = line.match(/^(.*?):\d+:/);
-    return match7?.[1] ? [match7[1]] : [];
-  })));
+  const outputLines = result4.matches.flatMap((match7) => [
+    ...match7.before.map((line, index) => `${match7.path}:${Math.max(1, match7.line - match7.before.length + index)}-${line}`),
+    `${match7.path}:${match7.line}:${match7.text}`,
+    ...match7.after.map((line, index) => `${match7.path}:${match7.line + index + 1}-${line}`)
+  ]);
   const rawContent = outputLines.join("\n");
   const content = truncateToolOutput(rawContent, SEARCH_OUTPUT_CHAR_LIMIT);
-  const truncatedByByteLimit = content.length !== rawContent.length;
+  const matchLines = result4.matches.map((match7) => `${match7.path}:${match7.line}:${match7.text}`);
   return {
     content,
     metadata: {
-      query,
+      query: args2.query,
       path: requestedPath,
-      searchedPath: relativeSearchPath,
+      searchedPath: inside ? normalizeWorkspaceRelativePath({ workspaceRoot, targetPath: searchPath }) : ".",
       count: outputLines.length,
-      matchCount: matchLines.length,
-      matchedFiles,
-      truncated: limitedByMaxResults || truncatedByByteLimit,
-      limitedByMaxResults,
-      ...truncatedByByteLimit ? { truncatedByByteLimit: true } : {},
-      ...maxResults ? { maxResults } : {},
-      exitCode: result4.exitCode,
-      searchEngine
+      matchCount: result4.totalMatches,
+      matchedFiles: Array.from(new Set(result4.matches.map((match7) => match7.path))),
+      truncated: result4.truncated || content.length !== rawContent.length,
+      limitedByMaxResults: result4.truncated,
+      ...args2.maxResults ? { maxResults: args2.maxResults } : {},
+      searchEngine: result4.engine
     }
   };
 }
@@ -18417,7 +18574,7 @@ async function globFilesTool(args2) {
     ...args2.confirmExternalFileAccess ? { confirmExternalFileAccess: args2.confirmExternalFileAccess } : {}
   });
   const relativeSearchPath = normalizeWorkspaceRelativePath({
-    workspaceRoot: resolve2(args2.workspaceRoot),
+    workspaceRoot: resolve4(args2.workspaceRoot),
     targetPath: searchPath
   });
   const pathPrefix = relativeSearchPath === "." ? "" : `${relativeSearchPath.replace(/\/+$/, "")}/`;
@@ -18465,7 +18622,7 @@ async function globFilesTool(args2) {
         files,
         includeIgnored
       });
-      if (files.length === 0 && (includeIgnored || !await hasRootGitignore(args2.workspaceRoot))) {
+      if (files.length === 0 && (includeIgnored || !await hasRootGitignore2(args2.workspaceRoot))) {
         files = scanWorkspaceGlobFiles({
           workspaceRoot: args2.workspaceRoot,
           pattern,
@@ -18618,8 +18775,8 @@ async function launchProcessTool(args2) {
     ...fullCommand
   ];
   const detached = process.platform !== "win32";
-  const proc = spawnChildProcess2(cmdArgs[0] ?? "", cmdArgs.slice(1), {
-    cwd: resolve2(args2.workspaceRoot),
+  const proc = spawnChildProcess3(cmdArgs[0] ?? "", cmdArgs.slice(1), {
+    cwd: resolve4(args2.workspaceRoot),
     stdio: ["ignore", "pipe", "pipe"],
     detached
   });
@@ -18766,9 +18923,66 @@ async function tasksTool(_args) {
     metadata: { count: result4.count, tasks: result4.tasks }
   };
 }
+async function openDesktopPreviewTool(args2) {
+  const parsed = parseWorkspaceToolArguments(args2.call.arguments);
+  const url = typeof parsed.url === "string" ? parsed.url.trim() : "";
+  if (!url) {
+    return {
+      content: JSON.stringify({ error: "openDesktopPreview requires a non-empty url." }),
+      metadata: { status: "failed" }
+    };
+  }
+  try {
+    const parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+      return {
+        content: JSON.stringify({ error: "url must be an absolute http(s) URL." }),
+        metadata: { status: "failed" }
+      };
+    }
+  } catch {
+    return {
+      content: JSON.stringify({ error: "url must be an absolute http(s) URL." }),
+      metadata: { status: "failed" }
+    };
+  }
+  const port = Number(process.env.NOLO_DESKTOP_SERVER_PORT ?? 3233);
+  try {
+    const response = await fetch(`http://127.0.0.1:${port}/api/desktop/preview/open`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ url })
+    });
+    const bodyText = await response.text();
+    let body;
+    try {
+      body = JSON.parse(bodyText);
+    } catch {
+      body = { raw: bodyText };
+    }
+    if (!response.ok) {
+      const message = isRecord(body) && typeof body.error === "string" ? body.error : `preview open failed (HTTP ${response.status})`;
+      return {
+        content: JSON.stringify({ error: message }),
+        metadata: { status: "failed", httpStatus: response.status }
+      };
+    }
+    return {
+      content: JSON.stringify({ ok: true, url, note: "desktop preview opened" }),
+      metadata: { status: "done", url }
+    };
+  } catch (error) {
+    return {
+      content: JSON.stringify({
+        error: "Desktop preview bridge unreachable; this tool only works inside Nolo Desktop. " + toErrorMessage(error)
+      }),
+      metadata: { status: "failed" }
+    };
+  }
+}
 function createLocalWorkspaceToolExecutors(args2) {
   const fileAccess = args2.confirmExternalFileAccess ? { confirmExternalFileAccess: args2.confirmExternalFileAccess } : {};
-  const readFileLedger = /* @__PURE__ */ new Map();
+  const readFileLedger = args2.readFileNoLedger === true ? null : /* @__PURE__ */ new Map();
   return {
     editFile: (call) => editFileTool({
       call,
@@ -18784,7 +18998,7 @@ function createLocalWorkspaceToolExecutors(args2) {
     readFile: (call) => readFileTool({
       call,
       workspaceRoot: args2.workspaceRoot,
-      readLedger: readFileLedger,
+      ...readFileLedger ? { readLedger: readFileLedger } : {},
       ...fileAccess
     }),
     writeFile: (call) => writeFileTool({
@@ -18828,7 +19042,8 @@ function createLocalWorkspaceToolExecutors(args2) {
       ...args2.commandOutputLimit !== void 0 ? { commandOutputLimit: args2.commandOutputLimit } : {}
     }),
     taskStop: (call) => taskStopTool({ call }),
-    tasks: (call) => tasksTool({ call })
+    tasks: (call) => tasksTool({ call }),
+    openDesktopPreview: (call) => openDesktopPreviewTool({ call })
   };
 }
 
@@ -18963,10 +19178,10 @@ function buildLoadSkillExecutor(args2) {
         metadata: { loadSkill: true, resolved: false }
       };
     }
-    const { resolveSkillByName } = await import("./skillDiscovery-2QTZINON.js");
+    const { resolveSkillByName } = await import("./skillDiscovery-NTRLM6KP.js");
     const resolved = resolveSkillByName(args2.cwd, name);
     if (!resolved) {
-      const { resolveCodingBuiltinSlug, buildCodingSkillContentBySlug } = await import("./codingSkills-BCQXRZOI.js");
+      const { resolveCodingBuiltinSlug, buildCodingSkillContentBySlug } = await import("./codingSkills-VDXQYWX4.js");
       const builtinSlug = resolveCodingBuiltinSlug(name);
       if (builtinSlug) {
         const body = buildCodingSkillContentBySlug(builtinSlug);
@@ -19001,7 +19216,7 @@ ${body}`,
   };
 }
 async function formatUnknownSkillMessage(cwd, requestedName) {
-  const { discoverSkills } = await import("./skillDiscovery-2QTZINON.js");
+  const { discoverSkills } = await import("./skillDiscovery-NTRLM6KP.js");
   let available = [];
   try {
     available = discoverSkills(cwd).map((s) => s.name);
@@ -19016,7 +19231,740 @@ No skills were discovered in this workspace.`;
 Available skills: ${available.join(", ")}`;
 }
 
+// packages/core/chat/upstreamErrorBody.ts
+function parseUpstreamErrorBody(errorText, statusText) {
+  if (errorText) {
+    try {
+      const parsed = JSON.parse(errorText);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        const error = parsed.error;
+        if (error && typeof error === "object" && !Array.isArray(error)) {
+          return parsed;
+        }
+      }
+    } catch {
+    }
+  }
+  return { error: { message: errorText || statusText } };
+}
+
+// packages/agent-runtime/antigravityCloudCodeProvider.ts
+import { randomUUID } from "node:crypto";
+
+// packages/agent-runtime/antigravityWireModel.ts
+var WIRE_PROFILES = {
+  // Antigravity discovery exposes 3.7 Flash as one tiered wire model.
+  // The UI labels its effort variants (Low/Medium/High), but the literal
+  // -medium/-high ids return 404 from streamGenerateContent.
+  "gemini-3.7-flash-tiered": { modelEnum: "MODEL_PLACEHOLDER_M301", maxOutputTokens: 65536 },
+  // Gemini 3.8 Flash 沿用 3.7 的 tiered 兼容策略：仓库内暂无 Antigravity discovery
+  // 证据确认 3.8 的 wire modelEnum，禁止虚构，先只声明同档输出上限；enum 待
+  // discovery 证据到位后补齐。
+  "gemini-3.8-flash-tiered": { maxOutputTokens: 65536 },
+  "gemini-3.6-flash-low": { maxOutputTokens: 65536 },
+  "gemini-3.6-flash-medium": { maxOutputTokens: 65536 },
+  "gemini-3.6-flash-high": { maxOutputTokens: 65536 },
+  // 旧模型 wire 映射保留：存量自定义 agent 仍可能引用（注册表已下线不影响此处）。
+  "gemini-3.5-flash-extra-low": { modelEnum: "MODEL_PLACEHOLDER_M187", maxOutputTokens: 65536 },
+  "gemini-3.5-flash-low": { modelEnum: "MODEL_PLACEHOLDER_M20", maxOutputTokens: 65536 },
+  "gemini-3-flash-agent": { modelEnum: "MODEL_PLACEHOLDER_M132", maxOutputTokens: 65536 },
+  "gemini-3.1-pro-low": { modelEnum: "MODEL_PLACEHOLDER_M36", maxOutputTokens: 65535 },
+  "gemini-pro-agent": { modelEnum: "MODEL_PLACEHOLDER_M16", maxOutputTokens: 65535 },
+  "claude-sonnet-5": { maxOutputTokens: 64e3 },
+  "claude-sonnet-4-6": { maxOutputTokens: 64e3 },
+  "claude-opus-4-6-thinking": { maxOutputTokens: 64e3 },
+  "gemini-2.5-flash": { maxOutputTokens: 65536 },
+  "gemini-2.5-pro": { maxOutputTokens: 65536 }
+};
+function resolveAntigravityWireModel(logicalModelId) {
+  const id = logicalModelId.trim();
+  const lower = id.toLowerCase();
+  if (lower === "gemini-3.5-flash") {
+    const wireModelId = "gemini-3.5-flash-low";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
+  if (lower === "gemini-3.7-flash" || ["gemini-3.7-flash-low", "gemini-3.7-flash-medium", "gemini-3.7-flash-high"].includes(lower)) {
+    const wireModelId = "gemini-3.7-flash-tiered";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
+  if (lower === "gemini-3.8-flash" || ["gemini-3.8-flash-low", "gemini-3.8-flash-medium", "gemini-3.8-flash-high"].includes(lower)) {
+    const wireModelId = "gemini-3.8-flash-tiered";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
+  if (lower === "gemini-3.6-flash") {
+    const wireModelId = "gemini-3.6-flash-low";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
+  if (lower === "gemini-3.1-pro" || lower === "gemini-3.1-pro-preview") {
+    const wireModelId = "gemini-3.1-pro-low";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
+  if (WIRE_PROFILES[id]) {
+    return { wireModelId: id, profile: WIRE_PROFILES[id] };
+  }
+  return { wireModelId: id };
+}
+
+// packages/agent-runtime/geminiNativeShared.ts
+var SKIP_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
+function resolveGeminiModelQuirks(modelId) {
+  const lower = modelId.toLowerCase();
+  const isGemini3 = lower.includes("gemini-3");
+  const isStrictSignatureModel = lower.includes("gemini-3.5") || lower.includes("flash-preview");
+  const isClaude = lower.includes("claude");
+  return {
+    requiresThoughtSignature: isGemini3,
+    allowsThoughtSignatureSentinel: isGemini3 && !isStrictSignatureModel,
+    isClaudeCrossModel: isClaude
+  };
+}
+function isGemini3Model(modelId) {
+  return resolveGeminiModelQuirks(modelId).requiresThoughtSignature;
+}
+function messageText(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  return content.filter(
+    (part) => part?.type === "text"
+  ).map((part) => part.text).join("\n").trim();
+}
+function parseDataUrlToInlineData(url) {
+  const match7 = /^data:([A-Za-z0-9.+-]+\/[A-Za-z0-9.+-]+);base64,([A-Za-z0-9+/=]*)$/.exec(
+    url
+  );
+  if (!match7) return null;
+  return { mimeType: match7[1], data: match7[2] };
+}
+function extractInlineDataParts(content) {
+  if (!Array.isArray(content)) return [];
+  const parts2 = [];
+  for (const part of content) {
+    if (!part || typeof part !== "object") continue;
+    if (part.type !== "image_url") continue;
+    const url = part.image_url?.url;
+    if (typeof url !== "string" || !url.trim()) continue;
+    const inline = parseDataUrlToInlineData(url);
+    if (inline) parts2.push({ inlineData: inline });
+  }
+  return parts2;
+}
+function convertOpenAiMessagesToGemini(messages, options) {
+  const contents = [];
+  const systemTexts = [];
+  let toolCallIndex = 0;
+  let pendingFunctionCalls = [];
+  const pushOrMergeContent = (role, parts2) => {
+    if (parts2.length === 0) return;
+    const last = contents[contents.length - 1];
+    if (last && last.role === role) {
+      last.parts.push(...parts2);
+    } else {
+      contents.push({ role, parts: parts2 });
+    }
+  };
+  const flushPendingFunctionCalls = () => {
+    if (pendingFunctionCalls.length === 0) return;
+    const dummyResponses = pendingFunctionCalls.map(
+      ({ name, id }) => ({
+        functionResponse: {
+          name,
+          response: { output: "{}" },
+          ...id ? { id } : {}
+        }
+      })
+    );
+    pendingFunctionCalls = [];
+    pushOrMergeContent("user", dummyResponses);
+  };
+  for (const raw of messages) {
+    if (!raw || typeof raw !== "object" || !("role" in raw)) continue;
+    const role = String(raw.role);
+    const content = "content" in raw ? raw.content : null;
+    if (role === "system") {
+      const text = messageText(
+        content
+      );
+      if (text) systemTexts.push(text);
+      continue;
+    }
+    if (role === "user") {
+      flushPendingFunctionCalls();
+      const text = messageText(
+        content
+      );
+      const imageParts = extractInlineDataParts(
+        content
+      );
+      if (!text && imageParts.length === 0) continue;
+      const parts2 = [];
+      if (text) parts2.push({ text });
+      for (const img of imageParts) parts2.push(img);
+      pushOrMergeContent("user", parts2);
+      continue;
+    }
+    if (role === "assistant") {
+      flushPendingFunctionCalls();
+      const text = messageText(
+        content
+      );
+      const toolCalls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls ?? [] : [];
+      const parts2 = [];
+      if (text) {
+        parts2.push({ text });
+      }
+      for (const call of toolCalls) {
+        const name = call?.function?.name?.trim();
+        if (!name) continue;
+        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 = !parts2.some(
+          (p) => "functionCall" in p
+        );
+        const signature = realSignature ?? (options.attachSkipThoughtSignature && isFirstFunctionCallPart ? SKIP_THOUGHT_SIGNATURE : void 0);
+        const part = {
+          functionCall: {
+            name,
+            args: parseToolArgs(call.function?.arguments),
+            ...id ? { id } : {}
+          },
+          ...signature ? { thoughtSignature: signature } : {}
+        };
+        parts2.push(part);
+      }
+      pushOrMergeContent("model", parts2);
+      continue;
+    }
+    if (role === "tool") {
+      const toolCallId = "tool_call_id" in raw && typeof raw.tool_call_id === "string" ? raw.tool_call_id : "";
+      const rawName = "name" in raw && typeof raw.name === "string" ? raw.name.trim() : "";
+      const pendingIndex = pendingFunctionCalls.findIndex(
+        (p) => toolCallId ? p.id === toolCallId : rawName ? p.name === rawName : true
+      );
+      if (pendingIndex === -1) continue;
+      const [{ name, id }] = pendingFunctionCalls.splice(pendingIndex, 1);
+      const output = messageText(content) || "{}";
+      pushOrMergeContent("user", [
+        {
+          functionResponse: {
+            name,
+            response: { output },
+            // 保留 OpenAI tool_call_id：antigravity Cloud Code Assist 网关把
+            // Gemini contents 转成 Claude messages 时需要 functionResponse →
+            // tool_result 的 tool_use_id；缺 id 时网关报
+            // "tool_result.tool_use_id: Field required"（HTTP 400）。
+            ...id ? { id } : {}
+          }
+        }
+      ]);
+    }
+  }
+  flushPendingFunctionCalls();
+  if (contents.length > 0 && contents[0]?.role === "model") {
+    contents.unshift({
+      role: "user",
+      parts: [{ text: "Continue the conversation." }]
+    });
+  }
+  return { contents, systemTexts };
+}
+function parseToolArgs(raw) {
+  if (typeof raw === "string") {
+    try {
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        return parsed;
+      }
+    } catch {
+    }
+  }
+  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+    return raw;
+  }
+  return {};
+}
+function sanitizeGeminiSchemaNode(node, active) {
+  const out = {};
+  if (!node || typeof node !== "object" || Array.isArray(node)) {
+    return { type: "string" };
+  }
+  if (active?.has(node)) {
+    return { type: "object", description: "(circular schema reference)" };
+  }
+  const seen = active ?? /* @__PURE__ */ new WeakSet();
+  seen.add(node);
+  try {
+    return sanitizeGeminiSchemaNodeInner(node, out, seen);
+  } finally {
+    seen.delete(node);
+  }
+}
+function sanitizeGeminiSchemaNodeInner(src, out, seen) {
+  if (Array.isArray(src.type)) {
+    const firstNonNull = src.type.find((t) => t !== "null");
+    if (typeof firstNonNull === "string") out.type = firstNonNull;
+    out.nullable = true;
+  } else if (typeof src.type === "string") {
+    out.type = src.type;
+  }
+  if (typeof src.description === "string") out.description = src.description;
+  if (typeof src.minimum === "number") out.minimum = src.minimum;
+  if (typeof src.maximum === "number") out.maximum = src.maximum;
+  if (Array.isArray(src.enum) && src.enum.length > 0) out.enum = src.enum;
+  if (src.nullable === true) out.nullable = true;
+  if ("const" in src && src.const !== void 0 && !out.enum) {
+    out.enum = [src.const];
+  }
+  const variantBranches = [
+    ...Array.isArray(src.oneOf) ? src.oneOf : [],
+    ...Array.isArray(src.anyOf) ? src.anyOf : []
+  ];
+  if (variantBranches.length > 0) {
+    const mergedProperties = {};
+    let requiredIntersection;
+    for (const branch of variantBranches) {
+      const sanitized = sanitizeGeminiSchemaNode(branch, seen);
+      const branchProperties = sanitized.properties ?? {};
+      for (const [key, value] of Object.entries(branchProperties)) {
+        const previous = mergedProperties[key];
+        const prevEnum = previous?.enum;
+        const nextEnum = value?.enum;
+        if (prevEnum && nextEnum) {
+          mergedProperties[key] = {
+            ...value,
+            enum: [.../* @__PURE__ */ new Set([...prevEnum, ...nextEnum])]
+          };
+        } else {
+          mergedProperties[key] = value;
+        }
+      }
+      const branchRequired = Array.isArray(sanitized.required) ? sanitized.required : [];
+      requiredIntersection = requiredIntersection === void 0 ? [...branchRequired] : requiredIntersection.filter((r) => branchRequired.includes(r));
+    }
+    out.properties = {
+      ...out.properties ?? {},
+      ...mergedProperties
+    };
+    if (requiredIntersection !== void 0 && requiredIntersection.length > 0) {
+      out.required = requiredIntersection;
+    }
+    if (typeof out.type !== "string") out.type = "object";
+  }
+  if (Array.isArray(src.allOf)) {
+    for (const branch of src.allOf) {
+      const sanitized = sanitizeGeminiSchemaNode(branch, seen);
+      out.properties = {
+        ...out.properties ?? {},
+        ...sanitized.properties ?? {}
+      };
+      if (Array.isArray(sanitized.required)) {
+        out.required = [
+          .../* @__PURE__ */ new Set([
+            ...out.required ?? [],
+            ...sanitized.required ?? []
+          ])
+        ];
+      }
+    }
+    if (typeof out.type !== "string") out.type = "object";
+  }
+  if (src.properties && typeof src.properties === "object") {
+    const properties = {};
+    for (const [key, value] of Object.entries(
+      src.properties
+    )) {
+      properties[key] = sanitizeGeminiSchemaNode(value, seen);
+    }
+    out.properties = properties;
+    if (typeof out.type !== "string") out.type = "object";
+  }
+  if (Array.isArray(src.required)) {
+    const properties = out.properties ?? {};
+    const required = [...new Set(src.required)].filter(
+      (r) => typeof r === "string" && r in properties
+    );
+    if (required.length > 0) out.required = required;
+  }
+  if (src.items !== void 0) {
+    out.items = sanitizeGeminiSchemaNode(src.items, seen);
+    if (typeof out.type !== "string") out.type = "array";
+  }
+  if (typeof out.type !== "string") out.type = "object";
+  return out;
+}
+function convertOpenAiToolsToGemini(tools) {
+  if (!Array.isArray(tools) || tools.length === 0) return void 0;
+  const declarations = [];
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object" || !("function" in tool)) continue;
+    const fn3 = tool.function;
+    const name = typeof fn3.name === "string" ? fn3.name : "";
+    if (!name) continue;
+    declarations.push({
+      name,
+      description: typeof fn3.description === "string" ? fn3.description : "",
+      parameters: sanitizeGeminiSchemaNode(
+        fn3.parameters ?? { type: "object", properties: {} }
+      )
+    });
+  }
+  if (declarations.length === 0) return void 0;
+  return [{ functionDeclarations: declarations }];
+}
+function createGeminiAccumulatorState() {
+  return {
+    text: "",
+    toolCalls: [],
+    reasoning: "",
+    events: []
+  };
+}
+function applyGeminiChunk(chunk, state, options) {
+  if (!chunk || typeof chunk !== "object") return;
+  const response = "response" in chunk && chunk.response && typeof chunk.response === "object" ? chunk.response : chunk;
+  if ("usageMetadata" in response && response.usageMetadata && typeof response.usageMetadata === "object") {
+    const meta = response.usageMetadata;
+    const prompt = typeof meta.promptTokenCount === "number" ? meta.promptTokenCount : 0;
+    const candidates2 = typeof meta.candidatesTokenCount === "number" ? meta.candidatesTokenCount : 0;
+    const total = typeof meta.totalTokenCount === "number" ? meta.totalTokenCount : prompt + candidates2;
+    const cached3 = typeof meta.cachedContentTokenCount === "number" && Number.isFinite(meta.cachedContentTokenCount) ? (
+      // cached ⊆ prompt；对畸形上游防御性钳位，避免 cache_read > input 破坏归一化与计费
+      Math.min(Math.max(0, Math.floor(meta.cachedContentTokenCount)), prompt)
+    ) : 0;
+    state.usage = {
+      prompt_tokens: prompt,
+      completion_tokens: candidates2,
+      total_tokens: total,
+      ...cached3 > 0 ? { cache_read_input_tokens: cached3 } : {}
+    };
+    state.events.push({ kind: "usage", usage: state.usage });
+  }
+  const candidates = Array.isArray(response.candidates) ? response.candidates : [];
+  for (const candidate of candidates) {
+    if (!candidate || typeof candidate !== "object") continue;
+    const candidateFinishReason = candidate.finishReason;
+    if (typeof candidateFinishReason === "string" && candidateFinishReason.trim()) {
+      state.finishReason = candidateFinishReason.trim();
+      state.events.push({ kind: "finish", reason: state.finishReason });
+    }
+    const parts2 = Array.isArray(
+      candidate.content?.parts
+    ) ? candidate.content.parts : [];
+    for (const part of parts2) {
+      if (!part || typeof part !== "object") continue;
+      const partSignature = part.thoughtSignature;
+      const isThought = Boolean(part.thought);
+      if ("text" in part && typeof part.text === "string") {
+        const piece = part.text;
+        if (!isThought) {
+          state.text += piece;
+          if (piece) {
+            state.events.push({ kind: "text", text: piece });
+            if (options?.onTextDelta) options.onTextDelta(piece);
+          }
+        } else {
+          state.reasoning += piece;
+          if (piece) {
+            state.events.push({ kind: "reasoning", text: piece });
+            if (options?.onReasoningDelta) options.onReasoningDelta(piece);
+          }
+        }
+      }
+      if (isThought && typeof partSignature === "string" && partSignature) {
+        state.pendingThoughtSignature = partSignature;
+      }
+      if ("functionCall" in part && part.functionCall) {
+        const call = part.functionCall;
+        const name = typeof call.name === "string" ? call.name : "tool";
+        const id = typeof call.id === "string" ? call.id : `${name}_${state.toolCalls.length}`;
+        const argsObj = call.args && typeof call.args === "object" ? call.args : {};
+        const resolvedSignature = typeof partSignature === "string" && partSignature ? partSignature : state.pendingThoughtSignature;
+        state.pendingThoughtSignature = void 0;
+        const toolCall = {
+          id,
+          type: "function",
+          function: { name, arguments: JSON.stringify(argsObj) },
+          ...typeof resolvedSignature === "string" && resolvedSignature ? { thought_signature: resolvedSignature } : {}
+        };
+        state.toolCalls.push(toolCall);
+        state.events.push({ kind: "tool_call", toolCall });
+      }
+    }
+  }
+}
+function accumulateGeminiChunks(chunks2, options) {
+  const state = createGeminiAccumulatorState();
+  for (const chunk of chunks2) {
+    applyGeminiChunk(chunk, state, options);
+  }
+  return {
+    text: state.text,
+    toolCalls: state.toolCalls,
+    usage: state.usage,
+    finishReason: state.finishReason,
+    reasoningContent: state.reasoning,
+    events: state.events
+  };
+}
+async function accumulateGeminiStream(stream, options) {
+  const state = createGeminiAccumulatorState();
+  for await (const chunk of stream) {
+    applyGeminiChunk(chunk, state, options);
+  }
+  return {
+    text: state.text,
+    toolCalls: state.toolCalls,
+    usage: state.usage,
+    finishReason: state.finishReason,
+    reasoningContent: state.reasoning,
+    events: state.events
+  };
+}
+function shouldUseGeminiNativeToolRoute(provider, model, tools, isImageModel) {
+  return provider === "google" && !isImageModel(model) && isGemini3Model(model) && Array.isArray(tools) && tools.length > 0;
+}
+function buildGeminiGenerateContentRequest(args2) {
+  const { contents, systemTexts } = convertOpenAiMessagesToGemini(
+    args2.messages,
+    { attachSkipThoughtSignature: args2.attachSkipThoughtSignature }
+  );
+  const request3 = { contents };
+  if (systemTexts.length > 0) {
+    request3.systemInstruction = {
+      role: "user",
+      parts: systemTexts.map((text) => ({ text }))
+    };
+  }
+  const toolsResult = convertOpenAiToolsToGemini(args2.tools);
+  if (toolsResult) {
+    request3.tools = toolsResult;
+    request3.toolConfig = { functionCallingConfig: { mode: "VALIDATED" } };
+  }
+  const generationConfig = {};
+  if (typeof args2.maxTokens === "number" && args2.maxTokens > 0) {
+    generationConfig.maxOutputTokens = args2.maxTokens;
+  }
+  if (typeof args2.temperature === "number") {
+    generationConfig.temperature = args2.temperature;
+  }
+  if (Object.keys(generationConfig).length > 0) {
+    request3.generationConfig = generationConfig;
+  }
+  return request3;
+}
+
+// packages/agent-runtime/antigravityCloudCodeProvider.ts
+var STREAM_PATH = "/v1internal:streamGenerateContent?alt=sse";
+function buildCloudCodeAssistPayload(args2) {
+  const projectId = readAntigravityProjectId(args2.metadata);
+  if (!projectId) {
+    throw new Error(
+      "Antigravity OAuth credential is missing metadata.projectId. Re-run `nolo auth antigravity`."
+    );
+  }
+  const logicalModel = asOptionalTrimmedString(args2.openAiBody.model) ?? asOptionalTrimmedString(args2.agentConfig.model) ?? "gemini-3.1-pro";
+  const { wireModelId: model, profile } = resolveAntigravityWireModel(logicalModel);
+  const rawMessages = Array.isArray(args2.openAiBody.messages) ? args2.openAiBody.messages : [];
+  const quirks = resolveGeminiModelQuirks(model);
+  const isClaude = quirks.isClaudeCrossModel;
+  const { contents, systemTexts } = convertOpenAiMessagesToGemini(rawMessages, {
+    attachSkipThoughtSignature: quirks.allowsThoughtSignatureSentinel
+  });
+  if (contents.length === 0) {
+    throw new Error("Antigravity Cloud Code Assist request has no user/model contents.");
+  }
+  const prompt = args2.agentConfig.prompt?.trim();
+  if (prompt) systemTexts.unshift(prompt);
+  const request3 = { contents };
+  if (systemTexts.length > 0) {
+    request3.systemInstruction = {
+      role: "user",
+      parts: systemTexts.map((text) => ({ text }))
+    };
+  }
+  const tools = convertOpenAiToolsToGemini(
+    Array.isArray(args2.openAiBody.tools) ? args2.openAiBody.tools : void 0
+  );
+  if (tools) {
+    request3.tools = tools;
+    request3.toolConfig = { functionCallingConfig: { mode: "VALIDATED" } };
+  }
+  const generationConfig = {};
+  if (profile?.maxOutputTokens) {
+    generationConfig.maxOutputTokens = profile.maxOutputTokens;
+  } else if (typeof args2.agentConfig.max_tokens === "number" && args2.agentConfig.max_tokens > 0) {
+    generationConfig.maxOutputTokens = args2.agentConfig.max_tokens;
+  }
+  if (typeof args2.agentConfig.temperature === "number") {
+    generationConfig.temperature = args2.agentConfig.temperature;
+  }
+  if (Object.keys(generationConfig).length > 0) {
+    request3.generationConfig = generationConfig;
+  }
+  const agentId = randomUUID();
+  const trajectoryId = randomUUID();
+  const step = 2;
+  const requestId = `agent/${agentId}/${Date.now()}/${trajectoryId}/${step}`;
+  const labels = {
+    trajectory_id: trajectoryId,
+    last_step_index: String(step - 1),
+    used_claude: String(isClaude),
+    used_claude_conservative: String(isClaude)
+  };
+  if (profile?.modelEnum) {
+    labels.model_enum = profile.modelEnum;
+  }
+  request3.labels = labels;
+  request3.sessionId = `-${Math.floor(Math.random() * 9e15)}`;
+  return {
+    url: `${resolveAntigravityCloudCodeBaseUrl(args2.agentConfig.customProviderUrl)}${STREAM_PATH}`,
+    envelope: {
+      project: projectId,
+      model,
+      request: request3,
+      requestId,
+      requestType: "agent",
+      userAgent: "antigravity"
+    }
+  };
+}
+function resolveAntigravityFinishReason(upstream) {
+  const normalized = (upstream ?? "").trim().toUpperCase();
+  if (normalized === "MAX_TOKENS") return "length";
+  if (normalized === "SAFETY" || normalized === "RECITATION" || normalized === "PROHIBITED_CONTENT" || normalized === "BLOCKLIST") {
+    return "content_filter";
+  }
+  return "stop";
+}
+function normalizeAntigravityCompletion(decoded) {
+  const { text, toolCalls, usage, finishReason, reasoningContent, events } = decoded;
+  const normalizedFinishReason = (finishReason ?? "").trim().toUpperCase();
+  if (!text && !reasoningContent && toolCalls.length === 0 && !finishReason && !usage) {
+    const body = {
+      error: {
+        message: "antigravity upstream returned an empty stream (no content, finishReason or usage); channel degradation, not model emptiness"
+      },
+      provider_events: events
+    };
+    return {
+      status: 502,
+      text: "",
+      toolCalls: [],
+      providerEvents: events,
+      body
+    };
+  }
+  if (normalizedFinishReason === "MALFORMED_FUNCTION_CALL") {
+    const message2 = "antigravity upstream returned MALFORMED_FUNCTION_CALL (model generated an invalid function call or tool arguments were rejected by upstream)";
+    const providerFailure = {
+      kind: "provider_failure",
+      provider: "antigravity",
+      code: "MALFORMED_FUNCTION_CALL",
+      message: message2,
+      providerReason: "MALFORMED_FUNCTION_CALL",
+      retryable: false,
+      status: 502
+    };
+    return {
+      status: 502,
+      text: "",
+      toolCalls: [],
+      finishReason,
+      providerEvents: events,
+      providerFailure,
+      runtimeProviderFailure: {
+        message: providerFailure.message,
+        retryable: providerFailure.retryable
+      },
+      body: {
+        error: {
+          message: message2,
+          code: "MALFORMED_FUNCTION_CALL",
+          category: "malformed_function_call",
+          providerReason: "MALFORMED_FUNCTION_CALL",
+          retryable: false
+        },
+        provider_failure: providerFailure,
+        provider_events: events
+      }
+    };
+  }
+  const message = {
+    role: "assistant",
+    content: text || null
+  };
+  if (toolCalls.length > 0) message.tool_calls = toolCalls;
+  if (reasoningContent) message.reasoning_content = reasoningContent;
+  return {
+    status: 200,
+    text,
+    ...reasoningContent ? { reasoningContent } : {},
+    toolCalls,
+    ...usage ? { usage } : {},
+    ...finishReason ? { finishReason } : {},
+    providerEvents: events,
+    body: {
+      choices: [{
+        index: 0,
+        message,
+        finish_reason: toolCalls.length > 0 ? "tool_calls" : resolveAntigravityFinishReason(finishReason)
+      }],
+      ...usage ? { usage } : {},
+      provider_events: events
+    }
+  };
+}
+async function fetchAntigravityCloudCodeCompletion(args2) {
+  const fetchImpl = args2.fetchImpl ?? fetch;
+  const { url, envelope } = buildCloudCodeAssistPayload(args2);
+  const response = await fetchImpl(url, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${args2.accessToken}`,
+      "Content-Type": "application/json",
+      "User-Agent": getAntigravityUserAgent()
+    },
+    body: JSON.stringify(envelope),
+    signal: args2.signal
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    return {
+      status: response.status,
+      text: "",
+      toolCalls: [],
+      providerEvents: [],
+      // 保留上游结构：Antigravity 的限流 body 同样携带结构化的重置信息，
+      // 压成字符串会让冷却退化成 5 分钟默认值。
+      body: parseUpstreamErrorBody(errorText, response.statusText)
+    };
+  }
+  const chunkStream = streamSseDataValues(response, parseSseDataLineJson);
+  const { text, toolCalls, usage, finishReason, reasoningContent, events } = await accumulateGeminiStream(chunkStream, {
+    onTextDelta: args2.onTextDelta,
+    onReasoningDelta: args2.onReasoningDelta
+  });
+  const normalized = normalizeAntigravityCompletion({
+    text,
+    toolCalls,
+    usage,
+    finishReason,
+    reasoningContent,
+    events
+  });
+  if (normalized.status !== 200 || !text && toolCalls.length === 0) {
+    console.warn(
+      `[antigravity] empty completion: finishReason=${JSON.stringify(finishReason)} reasoningLen=${reasoningContent?.length ?? 0} usage=${JSON.stringify(usage) ?? "none"} model=${String(envelope.model)} base=${new URL(url).host}`
+    );
+  }
+  return normalized;
+}
+
 export {
+  Option_exports,
+  Duration_exports,
+  Exit_exports,
+  Effect_exports,
   readCommandActionGatePayload,
   readActionGate,
   evaluateFileWritePolicy,
@@ -19049,11 +19997,19 @@ export {
   buildLocalWorkspaceToolset,
   buildLocalWorkspacePolicyToolNames,
   buildLocalWorkspaceOpenAiTools,
+  PATH_FIELD_ALIASES,
   internalSearchWorkspace,
   internalListWorkspaceEntries,
   createLocalWorkspaceToolExecutors,
   localDialogMessageRecordToRuntimeMessage,
   buildLocalDialogWritePlan,
   buildNoloWorkspaceCliToolExecutors,
-  buildLoadSkillExecutor
+  buildLoadSkillExecutor,
+  parseUpstreamErrorBody,
+  isGemini3Model,
+  accumulateGeminiChunks,
+  shouldUseGeminiNativeToolRoute,
+  buildGeminiGenerateContentRequest,
+  resolveAntigravityFinishReason,
+  fetchAntigravityCloudCodeCompletion
 };