open-azdo 0.3.2 → 0.3.4

package/dist/open-azdo.js

@@ -6779,18 +6779,18 @@ var require_set = __commonJS((exports) => {
     }
     static from(schema2, iterable, ctx) {
       const { replacer } = ctx;
-      const set7 = new this(schema2);
+      const set8 = new this(schema2);
       if (iterable && Symbol.iterator in Object(iterable))
         for (let value3 of iterable) {
           if (typeof replacer === "function")
             value3 = replacer.call(iterable, value3, value3);
-          set7.items.push(Pair.createPair(value3, null, ctx));
+          set8.items.push(Pair.createPair(value3, null, ctx));
         }
-      return set7;
+      return set8;
     }
   }
   YAMLSet.tag = "tag:yaml.org,2002:set";
-  var set6 = {
+  var set7 = {
     collection: "map",
     identify: (value3) => value3 instanceof Set,
     nodeClass: YAMLSet,
@@ -6809,7 +6809,7 @@ var require_set = __commonJS((exports) => {
     }
   };
   exports.YAMLSet = YAMLSet;
-  exports.set = set6;
+  exports.set = set7;
 });
 
 // ../../node_modules/.bun/yaml@2.8.2/node_modules/yaml/dist/schema/yaml-1.1/timestamp.js
@@ -6907,7 +6907,7 @@ var require_schema3 = __commonJS((exports) => {
   var merge6 = require_merge();
   var omap = require_omap();
   var pairs = require_pairs();
-  var set6 = require_set();
+  var set7 = require_set();
   var timestamp = require_timestamp();
   var schema2 = [
     map15.map,
@@ -6927,7 +6927,7 @@ var require_schema3 = __commonJS((exports) => {
     merge6.merge,
     omap.omap,
     pairs.pairs,
-    set6.set,
+    set7.set,
     timestamp.intTime,
     timestamp.floatTime,
     timestamp.timestamp
@@ -6951,7 +6951,7 @@ var require_tags = __commonJS((exports) => {
   var omap = require_omap();
   var pairs = require_pairs();
   var schema$2 = require_schema3();
-  var set6 = require_set();
+  var set7 = require_set();
   var timestamp = require_timestamp();
   var schemas = new Map([
     ["core", schema2.schema],
@@ -6977,7 +6977,7 @@ var require_tags = __commonJS((exports) => {
     omap: omap.omap,
     pairs: pairs.pairs,
     seq: seq.seq,
-    set: set6.set,
+    set: set7.set,
     timestamp: timestamp.timestamp
   };
   var coreKnownTags = {
@@ -6985,7 +6985,7 @@ var require_tags = __commonJS((exports) => {
     "tag:yaml.org,2002:merge": merge6.merge,
     "tag:yaml.org,2002:omap": omap.omap,
     "tag:yaml.org,2002:pairs": pairs.pairs,
-    "tag:yaml.org,2002:set": set6.set,
+    "tag:yaml.org,2002:set": set7.set,
     "tag:yaml.org,2002:timestamp": timestamp.timestamp
   };
   function getTags(customTags, schemaName, addMergeTag) {
@@ -21105,11 +21105,11 @@ var require_HTMLParser = __commonJS((exports, module) => {
     }
     return result4;
   }
-  function isA(elt, set9) {
-    if (typeof set9 === "string") {
-      return elt.namespaceURI === NAMESPACE.HTML && elt.localName === set9;
+  function isA(elt, set10) {
+    if (typeof set10 === "string") {
+      return elt.namespaceURI === NAMESPACE.HTML && elt.localName === set10;
     }
-    var tagnames = set9[elt.namespaceURI];
+    var tagnames = set10[elt.namespaceURI];
     return tagnames && tagnames[elt.localName];
   }
   function isMathmlTextIntegrationPoint(n) {
@@ -21209,9 +21209,9 @@ var require_HTMLParser = __commonJS((exports, module) => {
         this.elements.splice(idx, 1);
     }
   };
-  HTMLParser.ElementStack.prototype.clearToContext = function(set9) {
+  HTMLParser.ElementStack.prototype.clearToContext = function(set10) {
     for (var i = this.elements.length - 1;i > 0; i--) {
-      if (isA(this.elements[i], set9))
+      if (isA(this.elements[i], set10))
         break;
     }
     this.elements.length = i + 1;
@@ -21220,32 +21220,32 @@ var require_HTMLParser = __commonJS((exports, module) => {
   HTMLParser.ElementStack.prototype.contains = function(tag2) {
     return this.inSpecificScope(tag2, Object.create(null));
   };
-  HTMLParser.ElementStack.prototype.inSpecificScope = function(tag2, set9) {
+  HTMLParser.ElementStack.prototype.inSpecificScope = function(tag2, set10) {
     for (var i = this.elements.length - 1;i >= 0; i--) {
       var elt = this.elements[i];
       if (isA(elt, tag2))
         return true;
-      if (isA(elt, set9))
+      if (isA(elt, set10))
         return false;
     }
     return false;
   };
-  HTMLParser.ElementStack.prototype.elementInSpecificScope = function(target, set9) {
+  HTMLParser.ElementStack.prototype.elementInSpecificScope = function(target, set10) {
     for (var i = this.elements.length - 1;i >= 0; i--) {
       var elt = this.elements[i];
       if (elt === target)
         return true;
-      if (isA(elt, set9))
+      if (isA(elt, set10))
         return false;
     }
     return false;
   };
-  HTMLParser.ElementStack.prototype.elementTypeInSpecificScope = function(target, set9) {
+  HTMLParser.ElementStack.prototype.elementTypeInSpecificScope = function(target, set10) {
     for (var i = this.elements.length - 1;i >= 0; i--) {
       var elt = this.elements[i];
       if (elt instanceof target)
         return true;
-      if (isA(elt, set9))
+      if (isA(elt, set10))
         return false;
     }
     return false;
@@ -30300,6 +30300,12 @@ var fiberInterruptAll = (fibers) => withFiber((parent) => {
   }
   return asVoid2(fiberAwaitAll(fibers));
 });
+var fiberInterruptAllAs = /* @__PURE__ */ dual(2, (fibers, fiberId) => withFiber((parent) => {
+  const annotations = fiberStackAnnotations(parent);
+  for (const fiber of fibers)
+    fiber.interruptUnsafe(fiberId, annotations);
+  return asVoid2(fiberAwaitAll(fibers));
+}));
 var succeed3 = exitSucceed;
 var failCause = exitFailCause;
 var fail3 = exitFail;
@@ -32047,6 +32053,14 @@ var logWithLevel = (level) => (...message) => {
     return void_2;
   });
 };
+var withColor = (text, ...colors) => {
+  let out = "";
+  for (let i = 0;i < colors.length; i++) {
+    out += `\x1B[${colors[i]}m`;
+  }
+  return out + text + "\x1B[0m";
+};
+var withColorNoop = (text, ..._colors) => text;
 var colors = {
   bold: "1",
   red: "31",
@@ -32069,10 +32083,139 @@ var logLevelColors = {
   Error: [colors.red],
   Fatal: [colors.bgBrightRed, colors.black]
 };
+var logLevelStyle = {
+  None: "",
+  All: "",
+  Trace: "color:gray",
+  Debug: "color:blue",
+  Info: "color:green",
+  Warn: "color:orange",
+  Error: "color:red",
+  Fatal: "background-color:red;color:white"
+};
 var defaultDateFormat = (date) => `${date.getHours().toString().padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}:${date.getSeconds().toString().padStart(2, "0")}.${date.getMilliseconds().toString().padStart(3, "0")}`;
 var hasProcessStdout = typeof process === "object" && process !== null && typeof process.stdout === "object" && process.stdout !== null;
 var processStdoutIsTTY = hasProcessStdout && process.stdout.isTTY === true;
 var hasProcessStdoutOrDeno = hasProcessStdout || "Deno" in globalThis;
+var consolePretty = (options) => {
+  const mode_ = options?.mode ?? "auto";
+  const mode = mode_ === "auto" ? hasProcessStdoutOrDeno ? "tty" : "browser" : mode_;
+  const isBrowser = mode === "browser";
+  const showColors = typeof options?.colors === "boolean" ? options.colors : processStdoutIsTTY || isBrowser;
+  const formatDate2 = options?.formatDate ?? defaultDateFormat;
+  return isBrowser ? prettyLoggerBrowser({
+    colors: showColors,
+    formatDate: formatDate2
+  }) : prettyLoggerTty({
+    colors: showColors,
+    formatDate: formatDate2
+  });
+};
+var prettyLoggerTty = (options) => {
+  const processIsBun = typeof process === "object" && "isBun" in process && process.isBun === true;
+  const color = options.colors ? withColor : withColorNoop;
+  return loggerMake(({
+    cause,
+    date,
+    fiber: fiber2,
+    logLevel,
+    message: message_
+  }) => {
+    const console2 = fiber2.getRef(ConsoleRef);
+    const log = fiber2.getRef(LogToStderr) ? console2.error : console2.log;
+    const message = Array.isArray(message_) ? message_.slice() : [message_];
+    let firstLine = color(`[${options.formatDate(date)}]`, colors.white) + ` ${color(logLevel.toUpperCase(), ...logLevelColors[logLevel])}` + ` (#${fiber2.id})`;
+    const now = date.getTime();
+    const spans = fiber2.getRef(CurrentLogSpans);
+    for (const span of spans) {
+      firstLine += " " + formatLogSpan(span, now);
+    }
+    firstLine += ":";
+    let messageIndex = 0;
+    if (message.length > 0) {
+      const firstMaybeString = structuredMessage(message[0]);
+      if (typeof firstMaybeString === "string") {
+        firstLine += " " + color(firstMaybeString, colors.bold, colors.cyan);
+        messageIndex++;
+      }
+    }
+    log(firstLine);
+    if (!processIsBun)
+      console2.group();
+    if (cause.reasons.length > 0) {
+      log(causePretty(cause));
+    }
+    if (messageIndex < message.length) {
+      for (;messageIndex < message.length; messageIndex++) {
+        log(redact(message[messageIndex]));
+      }
+    }
+    const annotations = fiber2.getRef(CurrentLogAnnotations);
+    for (const [key, value] of Object.entries(annotations)) {
+      log(color(`${key}:`, colors.bold, colors.white), redact(value));
+    }
+    if (!processIsBun)
+      console2.groupEnd();
+  });
+};
+var prettyLoggerBrowser = (options) => {
+  const color = options.colors ? "%c" : "";
+  return loggerMake(({
+    cause,
+    date,
+    fiber: fiber2,
+    logLevel,
+    message: message_
+  }) => {
+    const console2 = fiber2.getRef(ConsoleRef);
+    const message = Array.isArray(message_) ? message_.slice() : [message_];
+    let firstLine = `${color}[${options.formatDate(date)}]`;
+    const firstParams = [];
+    if (options.colors) {
+      firstParams.push("color:gray");
+    }
+    firstLine += ` ${color}${logLevel.toUpperCase()}${color} (#${fiber2.id})`;
+    if (options.colors) {
+      firstParams.push(logLevelStyle[logLevel], "");
+    }
+    const now = date.getTime();
+    const spans = fiber2.getRef(CurrentLogSpans);
+    for (const span of spans) {
+      firstLine += " " + formatLogSpan(span, now);
+    }
+    firstLine += ":";
+    let messageIndex = 0;
+    if (message.length > 0) {
+      const firstMaybeString = structuredMessage(message[0]);
+      if (typeof firstMaybeString === "string") {
+        firstLine += ` ${color}${firstMaybeString}`;
+        if (options.colors) {
+          firstParams.push("color:deepskyblue");
+        }
+        messageIndex++;
+      }
+    }
+    console2.groupCollapsed(firstLine, ...firstParams);
+    if (cause.reasons.length > 0) {
+      console2.error(causePretty(cause));
+    }
+    if (messageIndex < message.length) {
+      for (;messageIndex < message.length; messageIndex++) {
+        console2.log(redact(message[messageIndex]));
+      }
+    }
+    const annotations = fiber2.getRef(CurrentLogAnnotations);
+    for (const [key, value] of Object.entries(annotations)) {
+      const redacted = redact(value);
+      if (options.colors) {
+        console2.log(`%c${key}:`, "color:gray", redacted);
+      } else {
+        console2.log(`${key}:`, redacted);
+      }
+    }
+    console2.groupEnd();
+  });
+};
 var defaultLogger = /* @__PURE__ */ loggerMake(({
   cause,
   date,
@@ -37505,10 +37648,30 @@ var getUnsafe3 = /* @__PURE__ */ dual(2, (self, index) => {
 var size = (self) => self.length;
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/Fiber.js
+var exports_Fiber = {};
+__export(exports_Fiber, {
+  runIn: () => runIn,
+  joinAll: () => joinAll,
+  join: () => join2,
+  isFiber: () => isFiber,
+  interruptAs: () => interruptAs,
+  interruptAllAs: () => interruptAllAs,
+  interruptAll: () => interruptAll,
+  interrupt: () => interrupt5,
+  getCurrent: () => getCurrent,
+  awaitAll: () => awaitAll,
+  await: () => await_
+});
 var TypeId21 = `~effect/Fiber/${version}`;
+var await_ = fiberAwait;
+var awaitAll = fiberAwaitAll;
 var join2 = fiberJoin;
 var joinAll = fiberJoinAll;
 var interrupt5 = fiberInterrupt;
+var interruptAs = fiberInterruptAs;
+var interruptAll = fiberInterruptAll;
+var interruptAllAs = fiberInterruptAllAs;
+var isFiber = (u) => hasProperty(u, FiberTypeId);
 var getCurrent = getCurrentFiber;
 var runIn = fiberRunIn;
 
@@ -58923,6 +59086,92 @@ function date2(name) {
   return schema(DateValid, name);
 }
 var nested2 = /* @__PURE__ */ dual(2, (self, name) => make30((provider) => self.parse(nested(provider, name))));
+// ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/Ref.js
+var exports_Ref = {};
+__export(exports_Ref, {
+  updateSomeAndGet: () => updateSomeAndGet,
+  updateSome: () => updateSome,
+  updateAndGet: () => updateAndGet,
+  update: () => update2,
+  setAndGet: () => setAndGet,
+  set: () => set6,
+  modifySome: () => modifySome,
+  modify: () => modify3,
+  makeUnsafe: () => makeUnsafe9,
+  make: () => make31,
+  getUnsafe: () => getUnsafe5,
+  getAndUpdateSome: () => getAndUpdateSome,
+  getAndUpdate: () => getAndUpdate,
+  getAndSet: () => getAndSet,
+  get: () => get9
+});
+var TypeId37 = "~effect/Ref";
+var RefProto = {
+  [TypeId37]: {
+    _A: identity
+  },
+  ...PipeInspectableProto,
+  toJSON() {
+    return {
+      _id: "Ref",
+      ref: this.ref
+    };
+  }
+};
+var makeUnsafe9 = (value3) => {
+  const self = Object.create(RefProto);
+  self.ref = make16(value3);
+  return self;
+};
+var make31 = (value3) => sync3(() => makeUnsafe9(value3));
+var get9 = (self) => sync3(() => self.ref.current);
+var set6 = /* @__PURE__ */ dual(2, (self, value3) => sync3(() => set2(self.ref, value3)));
+var getAndSet = /* @__PURE__ */ dual(2, (self, value3) => sync3(() => {
+  const current = self.ref.current;
+  self.ref.current = value3;
+  return current;
+}));
+var getAndUpdate = /* @__PURE__ */ dual(2, (self, f) => sync3(() => {
+  const current = self.ref.current;
+  self.ref.current = f(current);
+  return current;
+}));
+var getAndUpdateSome = /* @__PURE__ */ dual(2, (self, pf) => sync3(() => {
+  const current = self.ref.current;
+  const option5 = pf(current);
+  if (option5._tag === "Some") {
+    self.ref.current = option5.value;
+  }
+  return current;
+}));
+var setAndGet = /* @__PURE__ */ dual(2, (self, value3) => sync3(() => self.ref.current = value3));
+var modify3 = /* @__PURE__ */ dual(2, (self, f) => sync3(() => {
+  const [b, a] = f(self.ref.current);
+  self.ref.current = a;
+  return b;
+}));
+var modifySome = /* @__PURE__ */ dual(2, (self, pf) => modify3(self, (value3) => {
+  const [b, option5] = pf(value3);
+  return [b, option5._tag === "None" ? value3 : option5.value];
+}));
+var update2 = /* @__PURE__ */ dual(2, (self, f) => sync3(() => {
+  self.ref.current = f(self.ref.current);
+}));
+var updateAndGet = /* @__PURE__ */ dual(2, (self, f) => sync3(() => self.ref.current = f(self.ref.current)));
+var updateSome = /* @__PURE__ */ dual(2, (self, f) => sync3(() => {
+  const option5 = f(self.ref.current);
+  if (option5._tag === "Some") {
+    self.ref.current = option5.value;
+  }
+}));
+var updateSomeAndGet = /* @__PURE__ */ dual(2, (self, pf) => sync3(() => {
+  const option5 = pf(self.ref.current);
+  if (option5._tag === "Some") {
+    self.ref.current = option5.value;
+  }
+  return self.ref.current;
+}));
+var getUnsafe5 = (self) => self.ref.current;
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/Console.js
 var Console2 = ConsoleRef;
 var consoleWith = (f) => withFiber((fiber3) => f(fiber3.getRef(Console2)));
@@ -58934,34 +59183,34 @@ var log2 = (...args2) => consoleWith((console2) => sync(() => {
 }));
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/Stdio.js
-var TypeId37 = "~effect/Stdio";
-var Stdio2 = /* @__PURE__ */ Service(TypeId37);
-var make31 = (options) => ({
-  [TypeId37]: TypeId37,
+var TypeId38 = "~effect/Stdio";
+var Stdio2 = /* @__PURE__ */ Service(TypeId38);
+var make32 = (options) => ({
+  [TypeId38]: TypeId38,
   ...options
 });
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/Terminal.js
-var TypeId38 = "~effect/platform/Terminal";
+var TypeId39 = "~effect/platform/Terminal";
 var QuitErrorTypeId = "effect/platform/Terminal/QuitError";
 var isQuitError = (u) => hasProperty(u, QuitErrorTypeId);
 var Terminal2 = /* @__PURE__ */ Service("effect/platform/Terminal");
-var make32 = (impl) => Terminal2.of({
+var make33 = (impl) => Terminal2.of({
   ...impl,
-  [TypeId38]: TypeId38
+  [TypeId39]: TypeId39
 });
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/cli/CliError.js
-var TypeId39 = "~effect/cli/CliError";
-var isCliError = (u) => hasProperty(u, TypeId39);
+var TypeId40 = "~effect/cli/CliError";
+var isCliError = (u) => hasProperty(u, TypeId40);
 
-class UnrecognizedOption extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/UnrecognizedOption`)({
+class UnrecognizedOption extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/UnrecognizedOption`)({
   _tag: /* @__PURE__ */ tag("UnrecognizedOption"),
   option: String5,
   command: /* @__PURE__ */ optional(/* @__PURE__ */ Array4(String5)),
   suggestions: /* @__PURE__ */ Array4(String5)
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
   get message() {
     const suggestionText = this.suggestions.length > 0 ? `
 
@@ -58973,46 +59222,46 @@ class UnrecognizedOption extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/Unreco
   }
 }
 
-class DuplicateOption extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/DuplicateOption`)({
+class DuplicateOption extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/DuplicateOption`)({
   _tag: /* @__PURE__ */ tag("DuplicateOption"),
   option: String5,
   parentCommand: String5,
   childCommand: String5
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
   get message() {
     return `Duplicate flag name "${this.option}" in parent command "${this.parentCommand}" and subcommand "${this.childCommand}". ` + `Parent will always claim this flag (Mode A semantics). Consider renaming one of them to avoid confusion.`;
   }
 }
 
-class MissingOption extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/MissingOption`)({
+class MissingOption extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/MissingOption`)({
   _tag: /* @__PURE__ */ tag("MissingOption"),
   option: String5
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
   get message() {
     return `Missing required flag: --${this.option}`;
   }
 }
 
-class MissingArgument extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/MissingArgument`)({
+class MissingArgument extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/MissingArgument`)({
   _tag: /* @__PURE__ */ tag("MissingArgument"),
   argument: String5
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
   get message() {
     return `Missing required argument: ${this.argument}`;
   }
 }
 
-class InvalidValue2 extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/InvalidValue`)({
+class InvalidValue2 extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/InvalidValue`)({
   _tag: /* @__PURE__ */ tag("InvalidValue"),
   option: String5,
   value: String5,
   expected: String5,
   kind: /* @__PURE__ */ Union2([/* @__PURE__ */ Literal2("flag"), /* @__PURE__ */ Literal2("argument")])
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
   get message() {
     if (this.kind === "argument") {
       return `Invalid value for argument <${this.option}>: "${this.value}". Expected: ${this.expected}`;
@@ -59021,13 +59270,13 @@ class InvalidValue2 extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/InvalidValu
   }
 }
 
-class UnknownSubcommand extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/UnknownSubcommand`)({
+class UnknownSubcommand extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/UnknownSubcommand`)({
   _tag: /* @__PURE__ */ tag("UnknownSubcommand"),
   subcommand: String5,
   parent: /* @__PURE__ */ optional(/* @__PURE__ */ Array4(String5)),
   suggestions: /* @__PURE__ */ Array4(String5)
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
   get message() {
     const suggestionText = this.suggestions.length > 0 ? `
 
@@ -59038,20 +59287,20 @@ class UnknownSubcommand extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/Unknown
   }
 }
 
-class UserError extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/UserError`)({
+class UserError extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/UserError`)({
   _tag: /* @__PURE__ */ tag("UserError"),
   cause: Defect
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
 }
 var NonShowHelpErrors = /* @__PURE__ */ Union2([UnrecognizedOption, DuplicateOption, MissingOption, MissingArgument, InvalidValue2, UnknownSubcommand, UserError]);
 
-class ShowHelp extends (/* @__PURE__ */ ErrorClass(`${TypeId39}/ShowHelp`)({
+class ShowHelp extends (/* @__PURE__ */ ErrorClass(`${TypeId40}/ShowHelp`)({
   _tag: /* @__PURE__ */ tag("ShowHelp"),
   commandPath: /* @__PURE__ */ Array4(String5),
   errors: /* @__PURE__ */ Array4(NonShowHelpErrors)
 })) {
-  [TypeId39] = TypeId39;
+  [TypeId40] = TypeId40;
   [errorExitCode] = this.errors.length ? 1 : 0;
   [errorReported] = false;
   get message() {
@@ -59819,9 +60068,9 @@ var $visit = visit.visit;
 var $visitAsync = visit.visitAsync;
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/cli/Primitive.js
-var TypeId40 = "~effect/cli/Primitive";
+var TypeId41 = "~effect/cli/Primitive";
 var Proto7 = {
-  [TypeId40]: {
+  [TypeId41]: {
     _A: identity
   }
 };
@@ -59888,18 +60137,18 @@ var getTypeName = (primitive) => {
 var getChoiceKeys = (primitive) => primitive._tag === "Choice" ? primitive.choiceKeys : undefined;
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/cli/Param.js
-var TypeId41 = "~effect/cli/Param";
+var TypeId42 = "~effect/cli/Param";
 var argumentKind = "argument";
 var flagKind = "flag";
 var Proto8 = {
-  [TypeId41]: {
+  [TypeId42]: {
     _A: identity
   },
   pipe() {
     return pipeArguments(this, arguments);
   }
 };
-var isParam = (u) => hasProperty(u, TypeId41);
+var isParam = (u) => hasProperty(u, TypeId42);
 var isFlagParam = (single) => single.kind === "flag";
 var makeSingle = (params) => {
   const parse3 = (args2) => params.kind === argumentKind ? parsePositional(params.name, params.primitiveType, args2) : parseFlag(params.name, params.primitiveType, args2);
@@ -60252,7 +60501,7 @@ var reconstructTree = (tree, results) => {
 };
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/cli/internal/command.js
-var TypeId42 = "~effect/cli/Command";
+var TypeId43 = "~effect/cli/Command";
 var toImpl = (self) => self;
 var Proto9 = {
   ...YieldableProto,
@@ -60266,7 +60515,7 @@ var Proto9 = {
 var makeCommand = (options) => {
   const config = options.config;
   const contextConfig = options.contextConfig ?? emptyConfig;
-  const service3 = options.service ?? Service(`${TypeId42}/${options.name}`);
+  const service3 = options.service ?? Service(`${TypeId43}/${options.name}`);
   const annotations2 = options.annotations ?? empty3();
   const globalFlags = options.globalFlags ?? [];
   const subcommands = options.subcommands ?? [];
@@ -60337,7 +60586,7 @@ var makeCommand = (options) => {
     };
   };
   return Object.assign(Object.create(Proto9), {
-    [TypeId42]: TypeId42,
+    [TypeId43]: TypeId43,
     name: options.name,
     examples: options.examples ?? [],
     annotations: annotations2,
@@ -61074,8 +61323,8 @@ var scanCommandLevel = (tokens, context2) => {
 };
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/cli/Command.js
-var isCommand = (u) => hasProperty(u, TypeId42);
-var make33 = (name, config, handler) => {
+var isCommand = (u) => hasProperty(u, TypeId43);
+var make34 = (name, config, handler) => {
   const parsedConfig = parseConfig(config ?? {});
   return makeCommand({
     name,
@@ -61331,7 +61580,7 @@ var HandleProto = {
   }
 };
 var makeHandle = (params) => Object.assign(Object.create(HandleProto), params);
-var make34 = (spawn) => {
+var make35 = (spawn) => {
   const streamString = (command, options) => spawn(command).pipe(map8((handle) => decodeText(options?.includeStderr === true ? handle.all : handle.stdout)), unwrap4);
   const streamLines = (command, options) => splitLines2(streamString(command, options));
   return ChildProcessSpawner.of({
@@ -61348,11 +61597,11 @@ class ChildProcessSpawner extends (/* @__PURE__ */ Service()("effect/process/Chi
 }
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/process/ChildProcess.js
-var TypeId43 = "~effect/unstable/process/ChildProcess";
+var TypeId44 = "~effect/unstable/process/ChildProcess";
 var Proto10 = {
   ...PipeInspectableProto,
   ...YieldableProto,
-  [TypeId43]: TypeId43,
+  [TypeId44]: TypeId44,
   asEffect() {
     return ChildProcessSpawner.use((_) => _.spawn(this));
   }
@@ -61363,7 +61612,7 @@ var makeStandardCommand = (command, args2, options) => Object.assign(Object.crea
   args: args2,
   options
 });
-var make35 = function make36(...args2) {
+var make36 = function make37(...args2) {
   if (isTemplateString(args2[0])) {
     const [templates, ...expressions] = args2;
     const tokens = parseTemplates(templates, expressions);
@@ -61623,7 +61872,7 @@ var toPlatformError = (method, error2, command) => {
   }, "");
   return handleErrnoException("ChildProcess", method)(error2, [commandStr]);
 };
-var make37 = /* @__PURE__ */ gen3(function* () {
+var make38 = /* @__PURE__ */ gen3(function* () {
   const fs = yield* FileSystem;
   const path3 = yield* Path;
   const resolveWorkingDirectory = fnUntraced2(function* (options) {
@@ -61955,7 +62204,7 @@ var make37 = /* @__PURE__ */ gen3(function* () {
           const sourceStream = unwrap4(map8(handle, (h2) => getSourceStream(h2, options.from)));
           const toOption2 = options.to ?? "stdin";
           if (toOption2 === "stdin") {
-            handle = spawnCommand(make35(command.command, command.args, {
+            handle = spawnCommand(make36(command.command, command.args, {
               ...command.options,
               stdin: {
                 ...stdinConfig,
@@ -61967,7 +62216,7 @@ var make37 = /* @__PURE__ */ gen3(function* () {
             if (isNotUndefined(fd)) {
               const fdName2 = fdName(fd);
               const existingFds = command.options.additionalFds ?? {};
-              handle = spawnCommand(make35(command.command, command.args, {
+              handle = spawnCommand(make36(command.command, command.args, {
                 ...command.options,
                 additionalFds: {
                   ...existingFds,
@@ -61978,7 +62227,7 @@ var make37 = /* @__PURE__ */ gen3(function* () {
                 }
               }));
             } else {
-              handle = spawnCommand(make35(command.command, command.args, {
+              handle = spawnCommand(make36(command.command, command.args, {
                 ...command.options,
                 stdin: {
                   ...stdinConfig,
@@ -61992,9 +62241,9 @@ var make37 = /* @__PURE__ */ gen3(function* () {
       }
     }
   });
-  return make34(spawnCommand);
+  return make35(spawnCommand);
 });
-var layer = /* @__PURE__ */ effect(ChildProcessSpawner, make37);
+var layer = /* @__PURE__ */ effect(ChildProcessSpawner, make38);
 var flattenCommand = (command) => {
   const commands2 = [];
   const pipeOptions = [];
@@ -62446,7 +62695,7 @@ var layer4 = /* @__PURE__ */ succeed5(Path)({
 var layer5 = layer4;
 
 // ../../node_modules/.bun/@effect+platform-node-shared@4.0.0-beta.33+af2afa6dfab141e3/node_modules/@effect/platform-node-shared/dist/NodeStdio.js
-var layer6 = /* @__PURE__ */ succeed5(Stdio2, /* @__PURE__ */ make31({
+var layer6 = /* @__PURE__ */ succeed5(Stdio2, /* @__PURE__ */ make32({
   args: /* @__PURE__ */ sync3(() => process.argv.slice(2)),
   stdout: (options) => fromWritable({
     evaluate: () => process.stdout,
@@ -62485,7 +62734,7 @@ var layer7 = layer6;
 
 // ../../node_modules/.bun/@effect+platform-node-shared@4.0.0-beta.33+af2afa6dfab141e3/node_modules/@effect/platform-node-shared/dist/NodeTerminal.js
 import * as readline from "readline";
-var make38 = /* @__PURE__ */ fnUntraced2(function* (shouldQuit = defaultShouldQuit) {
+var make39 = /* @__PURE__ */ fnUntraced2(function* (shouldQuit = defaultShouldQuit) {
   const stdin = process.stdin;
   const stdout = process.stdout;
   const rlRef = yield* make21({
@@ -62542,14 +62791,14 @@ var make38 = /* @__PURE__ */ fnUntraced2(function* (shouldQuit = defaultShouldQu
       cause: err
     }))));
   }));
-  return make32({
+  return make33({
     columns,
     readInput,
     readLine,
     display
   });
 });
-var layer8 = /* @__PURE__ */ effect(Terminal2, /* @__PURE__ */ make38(defaultShouldQuit));
+var layer8 = /* @__PURE__ */ effect(Terminal2, /* @__PURE__ */ make39(defaultShouldQuit));
 function defaultShouldQuit(input) {
   return input.key.ctrl && (input.key.name === "c" || input.key.name === "d");
 }
@@ -62561,10 +62810,11 @@ var layer9 = layer8;
 var layer10 = /* @__PURE__ */ layer.pipe(/* @__PURE__ */ provideMerge(/* @__PURE__ */ mergeAll2(layer3, layer5, layer7, layer9)));
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/Logger.js
 var CurrentLoggers2 = CurrentLoggers;
+var LogToStderr2 = LogToStderr;
 var map17 = /* @__PURE__ */ dual(2, (self, f) => loggerMake((options) => f(self.log(options))));
-var withConsoleLog = (self) => loggerMake((options) => {
+var withConsoleError = (self) => loggerMake((options) => {
   const console2 = options.fiber.getRef(ConsoleRef);
-  return console2.log(self.log(options));
+  return console2.error(self.log(options));
 });
 var formatFiberId = (fiberId3) => `#${fiberId3}`;
 var formatStructured = /* @__PURE__ */ loggerMake(({
@@ -62597,7 +62847,7 @@ var formatStructured = /* @__PURE__ */ loggerMake(({
   };
 });
 var formatJson2 = /* @__PURE__ */ map17(formatStructured, formatJson);
-var consoleJson = /* @__PURE__ */ withConsoleLog(formatJson2);
+var consolePretty2 = consolePretty;
 var layer11 = (loggers, options) => effect(CurrentLoggers2, withFiber(fnUntraced(function* (fiber3) {
   const currentLoggers = new Set(options?.mergeWithExisting === true ? fiber3.getRef(CurrentLoggers) : []);
   for (const logger of loggers) {
@@ -62606,9 +62856,6 @@ var layer11 = (loggers, options) => effect(CurrentLoggers2, withFiber(fnUntraced
   return currentLoggers;
 })));
 
-// ../../packages/core/src/BaseRuntimeLayer.ts
-var BaseRuntimeLayer = exports_Layer.mergeAll(exports_BunServices.layer, layer11([consoleJson]));
-
 // ../../packages/core/src/Logging.ts
 var REDACTED = "<redacted>";
 var DEFAULT_PREVIEW_LENGTH = 400;
@@ -62653,15 +62900,23 @@ var truncateForLog = (value3, maxLength = DEFAULT_PREVIEW_LENGTH) => {
   }
   return `${value3.slice(0, maxLength)}... [truncated ${value3.length - maxLength} chars]`;
 };
+var makeRuntimeLogger = (jsonLogs) => jsonLogs ? withConsoleError(formatJson2) : consolePretty2({ colors: true, mode: "tty" });
 var withSanitizedAnnotations = (effect2, fields) => {
   if (!fields || Object.keys(fields).length === 0) {
     return effect2;
   }
   return effect2.pipe(exports_Effect.annotateLogs(sanitizeForLog(fields)));
 };
-var withLogAnnotations = (fields) => (effect2) => withSanitizedAnnotations(effect2, fields);
 var logInfo2 = (message, fields) => withSanitizedAnnotations(exports_Effect.logInfo(message), fields);
 var logError2 = (message, fields) => withSanitizedAnnotations(exports_Effect.logError(message), fields);
+var logWarning2 = (message, fields) => withSanitizedAnnotations(exports_Effect.logWarning(message), fields);
+var logDebug2 = (message, fields) => withSanitizedAnnotations(exports_Effect.logDebug(message), fields);
+
+// ../../packages/core/src/BaseRuntimeLayer.ts
+var makeBaseRuntimeLayer = ({ jsonLogs }) => exports_Layer.mergeAll(exports_BunServices.layer, layer11([makeRuntimeLogger(jsonLogs)]), exports_Layer.succeed(LogToStderr2)(true));
+var BaseRuntimeLayer = makeBaseRuntimeLayer({
+  jsonLogs: false
+});
 
 // ../../node_modules/.bun/jsonrepair@3.13.3/node_modules/jsonrepair/lib/esm/utils/JSONRepairError.js
 class JSONRepairError extends Error {
@@ -63362,11 +63617,11 @@ __export(exports_FetchHttpClient, {
 });
 
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/http/Headers.js
-var TypeId44 = /* @__PURE__ */ Symbol.for("~effect/http/Headers");
+var TypeId45 = /* @__PURE__ */ Symbol.for("~effect/http/Headers");
 var Proto11 = /* @__PURE__ */ Object.create(null);
 Object.defineProperties(Proto11, {
-  [TypeId44]: {
-    value: TypeId44
+  [TypeId45]: {
+    value: TypeId45
   },
   [symbolRedactable]: {
     value(context2) {
@@ -63395,7 +63650,7 @@ Object.defineProperties(Proto11, {
     value: BaseProto[NodeInspectSymbol]
   }
 });
-var make39 = (input) => Object.assign(Object.create(Proto11), input);
+var make40 = (input) => Object.assign(Object.create(Proto11), input);
 var Equivalence6 = /* @__PURE__ */ makeEquivalence4(/* @__PURE__ */ strictEqual());
 var empty12 = /* @__PURE__ */ Object.create(Proto11);
 var fromInput2 = (input) => {
@@ -63419,22 +63674,22 @@ var fromInput2 = (input) => {
   return out;
 };
 var fromRecordUnsafe = (input) => Object.setPrototypeOf(input, Proto11);
-var set6 = /* @__PURE__ */ dual(3, (self, key, value3) => {
-  const out = make39(self);
+var set7 = /* @__PURE__ */ dual(3, (self, key, value3) => {
+  const out = make40(self);
   out[key.toLowerCase()] = value3;
   return out;
 });
-var setAll = /* @__PURE__ */ dual(2, (self, headers) => make39({
+var setAll = /* @__PURE__ */ dual(2, (self, headers) => make40({
   ...self,
   ...fromInput2(headers)
 }));
 var merge6 = /* @__PURE__ */ dual(2, (self, headers) => {
-  const out = make39(self);
+  const out = make40(self);
   Object.assign(out, headers);
   return out;
 });
 var remove7 = /* @__PURE__ */ dual(2, (self, key) => {
-  const out = make39(self);
+  const out = make40(self);
   delete out[key.toLowerCase()];
   return out;
 });
@@ -63442,7 +63697,7 @@ var redact4 = /* @__PURE__ */ dual(2, (self, key) => {
   const out = {
     ...self
   };
-  const modify3 = (key2) => {
+  const modify4 = (key2) => {
     if (typeof key2 === "string") {
       const k = key2.toLowerCase();
       if (k in self) {
@@ -63458,10 +63713,10 @@ var redact4 = /* @__PURE__ */ dual(2, (self, key) => {
   };
   if (Array.isArray(key)) {
     for (let i = 0;i < key.length; i++) {
-      modify3(key[i]);
+      modify4(key[i]);
     }
   } else {
-    modify3(key);
+    modify4(key);
   }
   return out;
 });
@@ -63491,7 +63746,7 @@ __export(exports_HttpClient, {
   mapRequestEffect: () => mapRequestEffect,
   mapRequest: () => mapRequest,
   makeWith: () => makeWith2,
-  make: () => make42,
+  make: () => make43,
   layerMergedServices: () => layerMergedServices,
   isHttpClient: () => isHttpClient,
   head: () => head2,
@@ -63512,25 +63767,6 @@ __export(exports_HttpClient, {
   HttpClient: () => HttpClient
 });
 
-// ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/Ref.js
-var TypeId45 = "~effect/Ref";
-var RefProto = {
-  [TypeId45]: {
-    _A: identity
-  },
-  ...PipeInspectableProto,
-  toJSON() {
-    return {
-      _id: "Ref",
-      ref: this.ref
-    };
-  }
-};
-var get9 = (self) => sync3(() => self.ref.current);
-var update2 = /* @__PURE__ */ dual(2, (self, f) => sync3(() => {
-  self.ref.current = f(self.ref.current);
-}));
-
 // ../../node_modules/.bun/effect@4.0.0-beta.33/node_modules/effect/dist/unstable/http/Cookies.js
 var TypeId46 = "~effect/http/Cookies";
 var CookieTypeId = "~effect/http/Cookies/Cookie";
@@ -63853,9 +64089,9 @@ __export(exports_HttpClientRequest, {
   post: () => post,
   patch: () => patch,
   options: () => options,
-  modify: () => modify3,
+  modify: () => modify4,
   makeWith: () => makeWith,
-  make: () => make41,
+  make: () => make42,
   isHttpClientRequest: () => isHttpClientRequest,
   head: () => head,
   get: () => get10,
@@ -63901,7 +64137,7 @@ var Proto13 = {
     return array(this.params.flat());
   }
 };
-var make40 = (params) => {
+var make41 = (params) => {
   const self = Object.create(Proto13);
   self.params = params;
   return self;
@@ -63917,7 +64153,7 @@ var fromInput3 = (input) => {
       out.push(parsed[i]);
     }
   }
-  return make40(out);
+  return make41(out);
 };
 var fromInputNested = (input) => {
   const entries3 = typeof input[Symbol.iterator] === "function" ? fromIterable2(input) : Object.entries(input);
@@ -63955,13 +64191,13 @@ var UrlParamsSchema = /* @__PURE__ */ declare(isUrlParams, {
   expected: "UrlParams",
   toEquivalence: () => Equivalence7,
   toCodec: () => link()(Array4(Tuple2([String5, String5])), transform2({
-    decode: make40,
+    decode: make41,
     encode: (self) => self.params
   }))
 });
-var empty13 = /* @__PURE__ */ make40([]);
-var set8 = /* @__PURE__ */ dual(3, (self, key, value3) => make40(append(filter4(self.params, ([k]) => k !== key), [key, String(value3)])));
-var transform4 = /* @__PURE__ */ dual(2, (self, f) => make40(f(self.params)));
+var empty13 = /* @__PURE__ */ make41([]);
+var set9 = /* @__PURE__ */ dual(3, (self, key, value3) => make41(append(filter4(self.params, ([k]) => k !== key), [key, String(value3)])));
+var transform4 = /* @__PURE__ */ dual(2, (self, f) => make41(f(self.params)));
 var setAll2 = /* @__PURE__ */ dual(2, (self, input) => {
   const out = fromInput3(input);
   const params = out.params;
@@ -63976,7 +64212,7 @@ var setAll2 = /* @__PURE__ */ dual(2, (self, input) => {
   }
   return out;
 });
-var append3 = /* @__PURE__ */ dual(3, (self, key, value3) => make40(append(self.params, [key, String(value3)])));
+var append3 = /* @__PURE__ */ dual(3, (self, key, value3) => make41(append(self.params, [key, String(value3)])));
 var appendAll3 = /* @__PURE__ */ dual(2, (self, input) => transform4(self, appendAll(fromInput3(input).params)));
 class UrlParamsError extends (/* @__PURE__ */ TaggedError2("UrlParamsError")) {
 }
@@ -64203,20 +64439,20 @@ function makeWith(method, url2, urlParams2, hash3, headers, body) {
   return self;
 }
 var empty15 = /* @__PURE__ */ makeWith("GET", "", empty13, /* @__PURE__ */ none2(), empty12, empty14);
-var make41 = (method) => (url2, options) => modify3(empty15, {
+var make42 = (method) => (url2, options) => modify4(empty15, {
   method,
   url: url2,
   ...options ?? undefined
 });
-var get10 = /* @__PURE__ */ make41("GET");
-var post = /* @__PURE__ */ make41("POST");
-var patch = /* @__PURE__ */ make41("PATCH");
-var put = /* @__PURE__ */ make41("PUT");
-var del = /* @__PURE__ */ make41("DELETE");
-var head = /* @__PURE__ */ make41("HEAD");
-var options = /* @__PURE__ */ make41("OPTIONS");
-var trace = /* @__PURE__ */ make41("TRACE");
-var modify3 = /* @__PURE__ */ dual(2, (self, options2) => {
+var get10 = /* @__PURE__ */ make42("GET");
+var post = /* @__PURE__ */ make42("POST");
+var patch = /* @__PURE__ */ make42("PATCH");
+var put = /* @__PURE__ */ make42("PUT");
+var del = /* @__PURE__ */ make42("DELETE");
+var head = /* @__PURE__ */ make42("HEAD");
+var options = /* @__PURE__ */ make42("OPTIONS");
+var trace = /* @__PURE__ */ make42("TRACE");
+var modify4 = /* @__PURE__ */ dual(2, (self, options2) => {
   let result4 = self;
   if (options2.method) {
     result4 = setMethod(result4, options2.method);
@@ -64245,7 +64481,7 @@ var modify3 = /* @__PURE__ */ dual(2, (self, options2) => {
   return result4;
 });
 var setMethod = /* @__PURE__ */ dual(2, (self, method) => makeWith(method, self.url, self.urlParams, self.hash, self.headers, self.body));
-var setHeader = /* @__PURE__ */ dual(3, (self, key, value3) => makeWith(self.method, self.url, self.urlParams, self.hash, set6(self.headers, key, value3), self.body));
+var setHeader = /* @__PURE__ */ dual(3, (self, key, value3) => makeWith(self.method, self.url, self.urlParams, self.hash, set7(self.headers, key, value3), self.body));
 var setHeaders = /* @__PURE__ */ dual(2, (self, input) => makeWith(self.method, self.url, self.urlParams, self.hash, setAll(self.headers, input), self.body));
 var basicAuth = /* @__PURE__ */ dual(3, (self, username, password) => setHeader(self, "Authorization", `Basic ${btoa(`${stringOrRedacted(username)}:${stringOrRedacted(password)}`)}`));
 var bearerToken = /* @__PURE__ */ dual(2, (self, token) => setHeader(self, "Authorization", `Bearer ${stringOrRedacted(token)}`));
@@ -64280,7 +64516,7 @@ var joinSegments = (first, second) => {
   return needsTrim ? first + second.slice(1) : needsSlash ? first + "/" + second : first + second;
 };
 var updateUrl = /* @__PURE__ */ dual(2, (self, f) => makeWith(self.method, f(self.url), self.urlParams, self.hash, self.headers, self.body));
-var setUrlParam = /* @__PURE__ */ dual(3, (self, key, value3) => makeWith(self.method, self.url, set8(self.urlParams, key, value3), self.hash, self.headers, self.body));
+var setUrlParam = /* @__PURE__ */ dual(3, (self, key, value3) => makeWith(self.method, self.url, set9(self.urlParams, key, value3), self.hash, self.headers, self.body));
 var setUrlParams = /* @__PURE__ */ dual(2, (self, input) => makeWith(self.method, self.url, setAll2(self.urlParams, input), self.hash, self.headers, self.body));
 var appendUrlParam = /* @__PURE__ */ dual(3, (self, key, value3) => makeWith(self.method, self.url, append3(self.urlParams, key, value3), self.hash, self.headers, self.body));
 var appendUrlParams = /* @__PURE__ */ dual(2, (self, input) => makeWith(self.method, self.url, appendAll3(self.urlParams, input), self.hash, self.headers, self.body));
@@ -64292,10 +64528,10 @@ var setBody = /* @__PURE__ */ dual(2, (self, body) => {
     headers = remove7(remove7(headers, "Content-Type"), "Content-length");
   } else {
     if (body.contentType) {
-      headers = set6(headers, "content-type", body.contentType);
+      headers = set7(headers, "content-type", body.contentType);
     }
     if (body.contentLength !== undefined) {
-      headers = set6(headers, "content-length", body.contentLength.toString());
+      headers = set7(headers, "content-length", body.contentLength.toString());
     }
   }
   return makeWith(self.method, self.url, self.urlParams, self.hash, headers, body);
@@ -64607,10 +64843,10 @@ var Proto16 = {
     };
   },
   .../* @__PURE__ */ Object.fromEntries(/* @__PURE__ */ allShort.map(([fullMethod, method]) => [method, function(url2, options3) {
-    return this.execute(make41(fullMethod)(url2, options3));
+    return this.execute(make42(fullMethod)(url2, options3));
   }]))
 };
-var make42 = (f) => makeWith2((effect2) => flatMap5(effect2, (request3) => withFiber2((fiber3) => {
+var make43 = (f) => makeWith2((effect2) => flatMap5(effect2, (request3) => withFiber2((fiber3) => {
   const scopedController = scopedRequests.get(request3);
   const controller = scopedController ?? new AbortController;
   const urlResult = makeUrl(request3.url, request3.urlParams, getOrUndefined(request3.hash));
@@ -65002,7 +65238,7 @@ var Fetch = /* @__PURE__ */ Reference("effect/http/FetchHttpClient/Fetch", {
 
 class RequestInit extends (/* @__PURE__ */ Service()("effect/http/FetchHttpClient/RequestInit")) {
 }
-var fetch2 = /* @__PURE__ */ make42((request3, url2, signal, fiber3) => {
+var fetch2 = /* @__PURE__ */ make43((request3, url2, signal, fiber3) => {
   const fetch3 = fiber3.getRef(Fetch);
   const options3 = fiber3.services.mapUnsafe.get(RequestInit.key) ?? {};
   const headers = options3.headers ? merge6(fromInput2(options3.headers), request3.headers) : request3.headers;
@@ -66595,7 +66831,7 @@ var extractDiffLineMaps = (diffText) => {
 };
 var buildTargetRefCandidates = (targetBranch) => {
   const normalized = targetBranch.replace(/^refs\/heads\//, "");
-  return [targetBranch, `refs/remotes/origin/${normalized}`, `refs/heads/${normalized}`, normalized];
+  return [`refs/remotes/origin/${normalized}`, targetBranch, `refs/heads/${normalized}`, normalized];
 };
 var runGit = (workspace, operation, args2, allowNonZeroExit = false) => exports_Effect.gen(function* () {
   const git = yield* GitExec;
@@ -66606,6 +66842,7 @@ var runGit = (workspace, operation, args2, allowNonZeroExit = false) => exports_
     allowNonZeroExit
   });
 });
+var resolveCommitRef = (workspace, operation, ref) => runGit(workspace, operation, ["rev-parse", "--verify", `${ref}^{commit}`]).pipe(exports_Effect.map((result4) => result4.stdout.trim()));
 var resolveHeadReviewedSourceCommitCandidate = (workspace) => runGit(workspace, "Git.resolveReviewedSourceCommit.revList", ["rev-list", "--parents", "-n", "1", "HEAD"]).pipe(exports_Effect.map((result4) => {
   const hashes = result4.stdout.trim().split(/\s+/);
   return hashes.length === 3 ? "HEAD^2" : "HEAD";
@@ -66640,6 +66877,36 @@ var isAncestor = ({ workspace, ancestorRef, headRef }) => exports_Effect.gen(fun
     remediation: "Use `checkout: self` with `fetchDepth: 0` so the relevant commit history is available locally."
   });
 });
+var hasTargetMergeCommitInRange = ({
+  workspace,
+  baseRef,
+  headRef,
+  currentTargetRef
+}) => exports_Effect.gen(function* () {
+  const history = yield* runGit(workspace, "Git.hasTargetMergeCommitInRange.revList", [
+    "rev-list",
+    "--first-parent",
+    "--parents",
+    `${baseRef}..${headRef}`
+  ]);
+  for (const line of history.stdout.split(`
+`).map((entry) => entry.trim()).filter(Boolean)) {
+    const [, , ...mergedParents] = line.split(/\s+/);
+    if (mergedParents.length === 0) {
+      continue;
+    }
+    for (const mergedParent of mergedParents) {
+      if (yield* isAncestor({
+        workspace,
+        ancestorRef: mergedParent,
+        headRef: currentTargetRef
+      })) {
+        return true;
+      }
+    }
+  }
+  return false;
+});
 var resolveDiffRange = ({ workspace, baseRef, headRef }) => exports_Effect.gen(function* () {
   const diff = yield* runGit(workspace, "Git.resolveDiffRange.diff", [
     "diff",
@@ -66688,6 +66955,8 @@ var resolveTargetRef = ({ workspace, targetBranch }) => exports_Effect.gen(funct
   });
 });
 var resolvePullRequestDiff = (input) => exports_Effect.gen(function* () {
+  const targetRef = yield* resolveTargetRef(input);
+  const targetCommit = yield* resolveCommitRef(input.workspace, "Git.resolvePullRequestDiff.targetCommit", targetRef);
   const parents = yield* runGit(input.workspace, "Git.resolvePullRequestDiff.revList", [
     "rev-list",
     "--parents",
@@ -66698,10 +66967,10 @@ var resolvePullRequestDiff = (input) => exports_Effect.gen(function* () {
   const hashes = parents.stdout.trim().split(/\s+/);
   let baseRef = "";
   const headRef = "HEAD";
-  if (hashes.length === 3) {
-    baseRef = "HEAD^1";
+  const matchingTargetParent = hashes.slice(1).find((hash3) => hash3 === targetCommit);
+  if (matchingTargetParent) {
+    baseRef = matchingTargetParent;
   } else {
-    const targetRef = yield* resolveTargetRef(input);
     const mergeBase = yield* runGit(input.workspace, "Git.resolvePullRequestDiff.mergeBase", [
       "merge-base",
       targetRef,
@@ -66801,8 +67070,8 @@ var makeProcessRunner = exports_Effect.gen(function* () {
     const timeout4 = input.timeout ?? DEFAULT_TIMEOUT;
     const maxOutputBytes = input.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES;
     const encodedStdin = input.stdin === undefined ? "ignore" : exports_Stream.fromIterable([new TextEncoder().encode(input.stdin)]);
-    yield* logInfo2("Starting command.", commandLogFields(input, timeout4, maxOutputBytes));
-    const command = make35(input.command, [...input.args], {
+    yield* logDebug2("Starting command.", commandLogFields(input, timeout4, maxOutputBytes));
+    const command = make36(input.command, [...input.args], {
       ...input.cwd ? { cwd: input.cwd } : {},
       ...input.env ? { env: input.env, extendEnv: false } : {},
       stdin: encodedStdin,
@@ -66827,7 +67096,7 @@ var makeProcessRunner = exports_Effect.gen(function* () {
     }).pipe(exports_Effect.scoped, exports_Effect.timeoutOption(timeout4), exports_Effect.flatMap((maybeResult) => exports_Option.match(maybeResult, {
       onNone: () => exports_Effect.fail(toCommandExecutionError(input, `${commandLabel(input)} timed out after ${format2(timeout4)}.`)),
       onSome: exports_Effect.succeed
-    })), exports_Effect.tap((result4) => logInfo2("Command completed.", commandResultLogFields(input, timeout4, maxOutputBytes, result4))), exports_Effect.tapError((error2) => logError2("Command failed.", {
+    })), exports_Effect.tap((result4) => logDebug2("Command completed.", commandResultLogFields(input, timeout4, maxOutputBytes, result4))), exports_Effect.tapError((error2) => logError2("Command failed.", {
       ...commandLogFields(input, timeout4, maxOutputBytes),
       detail: error2.detail,
       exitCode: error2.exitCode,
@@ -69906,6 +70175,246 @@ var ignoreFailure = (effect2) => effect2.pipe(exports_Effect.match({
     return;
   }
 }));
+var initialOpenCodeProgressState = {
+  toolStatesByCallId: {},
+  seenRetryAttempts: [],
+  eventStreamFailed: false
+};
+var isAbortError = (error2) => error2 instanceof Error && (error2.name === "AbortError" || error2.message.includes("abort") || error2.message.includes("aborted") || error2.message.includes("The operation was aborted"));
+var emitProgressLog = (entry) => entry.level === "warning" ? logWarning2(entry.message, entry.fields) : logInfo2(entry.message, entry.fields);
+var mergeAbortSignals = (signal, lifetime) => signal === undefined || signal === null ? lifetime : AbortSignal.any([signal, lifetime]);
+var withSubscriptionLifetime = (client2, lifetime) => ({
+  event: Object.assign(Object.create(client2.event), {
+    subscribe: (input, options3) => client2.event.subscribe(input, {
+      ...options3,
+      signal: mergeAbortSignals(options3?.signal, lifetime)
+    })
+  })
+});
+var sessionStatusKey = (status) => status.type === "retry" ? `${status.type}:${status.attempt}` : status.type;
+var TOOL_TITLE_INPUT_KEYS = ["title", "filePath", "command", "query", "pattern", "path", "url"];
+var TOOL_PROGRESS_ICONS = {
+  bash: "\uD83D\uDD27",
+  read: "\uD83D\uDCD6",
+  glob: "\u2731",
+  edit: "\u270F\uFE0F",
+  grep: "\uD83D\uDD0E",
+  list: "\uD83D\uDCC2",
+  webfetch: "\uD83C\uDF10"
+};
+var titleFromToolInput = (input) => {
+  for (const key of TOOL_TITLE_INPUT_KEYS) {
+    const candidate = input[key];
+    if (typeof candidate === "string" && candidate.trim().length > 0) {
+      return candidate.trim();
+    }
+  }
+  return;
+};
+var getToolTitle = (part) => {
+  switch (part.state.status) {
+    case "running":
+    case "completed":
+      return titleFromToolInput(part.state.input) || part.state.title;
+    case "pending":
+    case "error":
+      return titleFromToolInput(part.state.input);
+  }
+};
+var getToolDurationMs = (part) => {
+  switch (part.state.status) {
+    case "completed":
+    case "error":
+      return Math.max(0, part.state.time.end - part.state.time.start);
+    case "pending":
+    case "running":
+      return;
+  }
+};
+var getToolProgressFields = (part) => {
+  const title = getToolTitle(part);
+  const durationMs = getToolDurationMs(part);
+  return {
+    tool: part.tool,
+    callId: part.callID,
+    ...title ? { title } : {},
+    ...durationMs !== undefined ? { durationMs } : {}
+  };
+};
+var getToolProgressIcon = (toolName) => TOOL_PROGRESS_ICONS[toolName] ?? "\u2699\uFE0F";
+var getToolProgressMessage = (phase, part, fields) => {
+  const title = fields.title ? truncateForLog(String(fields.title), 160) : undefined;
+  const icon = getToolProgressIcon(part.tool);
+  switch (phase) {
+    case "started":
+      return title ? `${icon} ${title}` : `${icon} ${part.tool}`;
+    case "failed":
+      return title ? `\u26A0\uFE0F ${part.tool}: ${title}` : `\u26A0\uFE0F ${part.tool}`;
+  }
+};
+var getAssistantRunMessage = (request3) => request3.variant ? `Starting OpenCode assistant run with ${request3.model.modelID} (${request3.variant}).` : "Starting OpenCode assistant run.";
+var summarizeTodoCounts = (todos) => {
+  const counts = {};
+  for (const todo of todos) {
+    counts[todo.status] = (counts[todo.status] ?? 0) + 1;
+  }
+  return counts;
+};
+var todoFingerprint = (counts) => Object.entries(counts).sort(([left], [right]) => left.localeCompare(right)).map(([status, count]) => `${status}:${count}`).join("|");
+var getEventSessionId = (event) => {
+  switch (event.type) {
+    case "message.part.delta":
+    case "message.part.updated":
+    case "session.idle":
+    case "session.status":
+    case "todo.updated":
+      return event.properties.sessionID;
+    case "message.updated":
+      return event.properties.info.sessionID;
+    case "session.error":
+      return event.properties.sessionID;
+    default:
+      return;
+  }
+};
+var isOpenCodeProgressEventForSession = (event, sessionId) => getEventSessionId(event) === sessionId;
+var reduceOpenCodeProgressBatch = (state, events) => {
+  const logs = [];
+  const seenRetryAttempts = new Set(state.seenRetryAttempts);
+  const toolStatesByCallId = {
+    ...state.toolStatesByCallId
+  };
+  let lastStatusKey = state.lastStatusKey;
+  let nextTodoFingerprint = state.todoFingerprint;
+  for (const event of events) {
+    switch (event.type) {
+      case "session.status": {
+        const statusKey = sessionStatusKey(event.properties.status);
+        if (event.properties.status.type === "retry") {
+          if (!seenRetryAttempts.has(event.properties.status.attempt)) {
+            seenRetryAttempts.add(event.properties.status.attempt);
+            logs.push({
+              level: "info",
+              message: "OpenCode is retrying the assistant response.",
+              fields: {
+                attempt: event.properties.status.attempt,
+                nextDelayMs: event.properties.status.next,
+                retryMessage: truncateForLog(event.properties.status.message, 160)
+              }
+            });
+          }
+        } else if (statusKey !== lastStatusKey) {
+          logs.push({
+            level: "info",
+            message: event.properties.status.type === "busy" ? "OpenCode assistant is working." : "OpenCode assistant is idle."
+          });
+        }
+        lastStatusKey = statusKey;
+        break;
+      }
+      case "message.part.updated": {
+        if (event.properties.part.type !== "tool") {
+          break;
+        }
+        const part = event.properties.part;
+        const previous = toolStatesByCallId[part.callID];
+        const baseFields = getToolProgressFields(part);
+        switch (part.state.status) {
+          case "running":
+            if (previous?.status !== "running") {
+              logs.push({
+                level: "info",
+                message: getToolProgressMessage("started", part, baseFields)
+              });
+            }
+            break;
+          case "completed":
+            break;
+          case "error":
+            if (previous?.status !== "error") {
+              logs.push({
+                level: "warning",
+                message: getToolProgressMessage("failed", part, baseFields),
+                fields: {
+                  ...baseFields,
+                  error: truncateForLog(part.state.error, 200)
+                }
+              });
+            }
+            break;
+          case "pending":
+            break;
+        }
+        toolStatesByCallId[part.callID] = {
+          status: part.state.status
+        };
+        break;
+      }
+      case "todo.updated": {
+        const counts = summarizeTodoCounts(event.properties.todos);
+        const fingerprint = todoFingerprint(counts);
+        if (fingerprint !== nextTodoFingerprint) {
+          logs.push({
+            level: "info",
+            message: "OpenCode updated its task plan.",
+            fields: {
+              total: event.properties.todos.length,
+              counts
+            }
+          });
+          nextTodoFingerprint = fingerprint;
+        }
+        break;
+      }
+      case "session.error": {
+        const error2 = event.properties.error;
+        logs.push({
+          level: "warning",
+          message: "OpenCode reported a session error.",
+          fields: {
+            ...error2?.name ? { name: error2.name } : {},
+            ...error2?.data && typeof error2.data === "object" && "message" in error2.data ? { errorMessage: truncateForLog(String(error2.data.message), 200) } : {}
+          }
+        });
+        break;
+      }
+    }
+  }
+  return {
+    state: {
+      lastStatusKey,
+      toolStatesByCallId,
+      seenRetryAttempts: [...seenRetryAttempts],
+      todoFingerprint: nextTodoFingerprint,
+      eventStreamFailed: state.eventStreamFailed
+    },
+    logs
+  };
+};
+var runOpenCodeProgressLogger = ({
+  events,
+  sessionId
+}) => exports_Effect.gen(function* () {
+  const stateRef = yield* exports_Ref.make(initialOpenCodeProgressState);
+  yield* exports_Stream.fromAsyncIterable(events, (error2) => error2).pipe(exports_Stream.filter((event) => isOpenCodeProgressEventForSession(event, sessionId)), exports_Stream.groupedWithin(32, "16 millis"), exports_Stream.runForEach((batch) => exports_Ref.modify(stateRef, (state) => {
+    const reduced = reduceOpenCodeProgressBatch(state, batch);
+    return [reduced.logs, reduced.state];
+  }).pipe(exports_Effect.flatMap((logs) => exports_Effect.forEach(logs, emitProgressLog, { discard: true })))), exports_Effect.catch((error2) => exports_Ref.modify(stateRef, (state) => {
+    if (state.eventStreamFailed || isAbortError(error2)) {
+      return [false, state];
+    }
+    return [
+      true,
+      {
+        ...state,
+        eventStreamFailed: true
+      }
+    ];
+  }).pipe(exports_Effect.flatMap((shouldLog) => shouldLog ? logWarning2("OpenCode event stream failed. Continuing without live progress updates.", {
+    detail: formatUnknownDetail(error2),
+    sessionId
+  }) : exports_Effect.void))));
+});
 var findAvailablePort = exports_Effect.tryPromise({
   try: () => new Promise((resolve4, reject) => {
     const server = createServer();
@@ -70040,7 +70549,7 @@ var decodePromptResult = ({
 };
 var spawnServer = (request3, spawner) => exports_Effect.gen(function* () {
   const port2 = yield* findAvailablePort;
-  const command = make35("opencode", ["serve", `--hostname=${SERVER_HOST}`, `--port=${port2}`], {
+  const command = make36("opencode", ["serve", `--hostname=${SERVER_HOST}`, `--port=${port2}`], {
     cwd: request3.workspace,
     env: {
       ...request3.inheritedEnv,
@@ -70076,6 +70585,40 @@ var createSession = (client2, timeout4) => exports_Effect.tryPromise({
 }).pipe((effect2) => awaitWithin(effect2, timeout4, () => toInvocationError({
   message: `Timed out creating the OpenCode session after ${exports_Duration.format(timeout4)}.`
 })));
+var subscribeToOpenCodeEvents = ({ client: client2 }) => exports_Effect.tryPromise({
+  try: (signal) => client2.event.subscribe({}, { signal }),
+  catch: (error2) => toInvocationError({
+    message: "Failed to subscribe to the OpenCode event stream.",
+    detail: formatUnknownDetail(error2)
+  })
+});
+var withOpenCodeProgressSubscription = ({
+  client: client2,
+  sessionId
+}, effect2) => exports_Effect.acquireRelease(exports_Effect.gen(function* () {
+  const streamLifetime = new AbortController;
+  const subscription = yield* subscribeToOpenCodeEvents({
+    client: withSubscriptionLifetime(client2, streamLifetime.signal)
+  }).pipe(exports_Effect.catch((error2) => logWarning2("OpenCode progress streaming is unavailable. Continuing without live milestones.", {
+    detail: error2.message,
+    ...error2.stderr ? { stderr: truncateForLog(error2.stderr, 200) } : {},
+    sessionId
+  }).pipe(exports_Effect.as(undefined))));
+  if (!subscription) {
+    return;
+  }
+  const fiber3 = yield* runOpenCodeProgressLogger({
+    events: subscription.stream,
+    sessionId
+  }).pipe(exports_Effect.forkScoped);
+  return {
+    stop: () => streamLifetime.abort(),
+    fiber: fiber3
+  };
+}), (resource) => resource ? exports_Effect.gen(function* () {
+  yield* exports_Effect.sync(() => resource.stop()).pipe(ignoreFailure);
+  yield* exports_Fiber.interrupt(resource.fiber).pipe(ignoreFailure);
+}) : exports_Effect.void).pipe(exports_Effect.flatMap(() => effect2), exports_Effect.scoped);
 var validatePromptModel = ({
   client: client2,
   request: request3
@@ -70117,7 +70660,10 @@ var promptSession = ({
 }) => validatePromptModel({
   client: client2,
   request: request3
-}).pipe(exports_Effect.flatMap(() => exports_Effect.tryPromise({
+}).pipe(exports_Effect.flatMap(() => withOpenCodeProgressSubscription({
+  client: client2,
+  sessionId
+}, exports_Effect.tryPromise({
   try: async () => {
     const result4 = await client2.session.prompt({
       sessionID: sessionId,
@@ -70141,7 +70687,7 @@ var promptSession = ({
     message: "Failed while prompting OpenCode.",
     detail: formatUnknownDetail(error2)
   })
-})), (effect2) => awaitWithin(effect2, request3.timeout, () => toInvocationError({
+}))), (effect2) => awaitWithin(effect2, request3.timeout, () => toInvocationError({
   message: `Timed out waiting for the OpenCode prompt after ${exports_Duration.format(request3.timeout)}.`
 })), exports_Effect.flatMap((response) => resolveAssistantReply({
   client: client2,
@@ -70160,6 +70706,8 @@ var makeOpenCodeSdkRuntime = exports_Effect.gen(function* () {
         directory: request3.workspace
       });
       const session = yield* createSession(client2, request3.timeout);
+      yield* logInfo2("Created OpenCode session.");
+      yield* logInfo2(getAssistantRunMessage(request3));
       return yield* promptSession({
         client: client2,
         sessionId: session.id,
@@ -70237,14 +70785,7 @@ var makeOpenCodeRunner = exports_Effect.gen(function* () {
   const run4 = exports_Effect.fn("OpenCodeRunner.run")(function* (request3) {
     const model = yield* parseModel(request3.model);
     const config = buildOpenCodeConfig(request3.agent);
-    yield* logInfo2("Preparing OpenCode execution.", {
-      agent: request3.agent,
-      model: request3.model,
-      workspace: request3.workspace,
-      variant: request3.variant,
-      promptChars: request3.prompt.length,
-      structuredRequested: request3.format?.type === "json_schema"
-    });
+    yield* logInfo2(`Preparing OpenCode execution for ${request3.model}.`);
     const result4 = yield* sdkRuntime.prompt({
       workspace: request3.workspace,
       model,
@@ -70256,17 +70797,6 @@ var makeOpenCodeRunner = exports_Effect.gen(function* () {
       format: request3.format,
       config
     });
-    yield* logInfo2("Received OpenCode response.", {
-      responseChars: result4.response.length,
-      responsePreview: truncateForLog(result4.response),
-      sessionId: result4.sessionId,
-      costUsd: result4.usage?.costUsd,
-      inputTokens: result4.usage?.tokens?.input,
-      outputTokens: result4.usage?.tokens?.output,
-      structuredDelivered: result4.structured !== undefined,
-      structuredErrorName: result4.modelError?.name,
-      structuredErrorRetries: result4.modelError?.retries
-    });
     return {
       response: result4.response,
       ...result4.structured !== undefined ? { structured: result4.structured } : {},
@@ -71216,22 +71746,6 @@ var writeStdout = exports_Effect.fn("ReviewWorkflow.writeStdout")(function* (tex
   const stdio = yield* Stdio2;
   yield* make22(text2).pipe(run(stdio.stdout()));
 });
-var reviewLogFields = (config) => ({
-  command: "review",
-  model: config.model,
-  opencodeVariant: config.opencodeVariant,
-  opencodeTimeout: format2(config.opencodeTimeout),
-  opencodeTimeoutMs: toMillis(config.opencodeTimeout),
-  workspace: config.workspace,
-  organization: config.organization,
-  project: config.project,
-  repositoryId: config.repositoryId,
-  pullRequestId: config.pullRequestId,
-  collectionUrl: config.collectionUrl,
-  agent: config.agent,
-  dryRun: config.dryRun,
-  json: config.json
-});
 var resolveReviewScope = ({
   config,
   fullPullRequestDiff,
@@ -71288,6 +71802,38 @@ var resolveReviewScope = ({
     return;
   }));
   if (previousCommitIsAncestor === true) {
+    const followUpContainsTargetMerge = yield* hasTargetMergeCommitInRange({
+      workspace: config.workspace,
+      baseRef: previousReviewedCommit,
+      headRef: reviewedSourceCommit,
+      currentTargetRef: fullPullRequestDiff.baseRef
+    }).pipe(exports_Effect.orElseSucceed(() => {
+      return;
+    }));
+    if (followUpContainsTargetMerge === true) {
+      yield* logInfo2("Follow-up range includes a merge from the target branch. Falling back to a full review to avoid reviewing target-only merge changes.", {
+        previousReviewedCommit,
+        reviewedSourceCommit,
+        currentPullRequestBaseRef: fullPullRequestDiff.baseRef
+      });
+      return {
+        reviewMode: "full",
+        scopedDiff: fullPullRequestDiff,
+        previousReviewedCommit
+      };
+    }
+    if (followUpContainsTargetMerge === undefined) {
+      yield* logInfo2("Could not validate whether the follow-up range includes a merge from the target branch. Falling back to a full review.", {
+        previousReviewedCommit,
+        reviewedSourceCommit,
+        currentPullRequestBaseRef: fullPullRequestDiff.baseRef
+      });
+      return {
+        reviewMode: "full",
+        scopedDiff: fullPullRequestDiff,
+        previousReviewedCommit
+      };
+    }
     return {
       reviewMode: "follow-up",
       scopedDiff: yield* resolveDiffRange({
@@ -71356,11 +71902,6 @@ var decodeStructuredReviewResult = ({
     source: "fallback"
   };
 });
-var reviewResultSourceLogFields = (source) => ({
-  structuredDelivered: source === "structured",
-  structuredRecovered: source === "repaired",
-  structuredFallback: source === "fallback"
-});
 var mapUsageTokens = (usage) => usage?.tokens ? {
   input: usage.tokens.input,
   output: usage.tokens.output,
@@ -71435,7 +71976,7 @@ var writeReviewWorkflowOutput = (config, output) => {
 var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen(function* () {
   const azureClient = yield* AzureDevOpsClient;
   const openCodeRunner = yield* OpenCodeRunner;
-  yield* logInfo2("Resolved review configuration.");
+  yield* logInfo2(`Resolved review configuration for ${config.model}.`);
   yield* logInfo2("Loading pull request metadata, git diff, source commit, and existing threads.");
   const [metadata, fullPullRequestDiff, reviewedSourceCommit, existingThreads] = yield* exports_Effect.all([
     azureClient.getPullRequestMetadata({
@@ -71455,15 +71996,7 @@ var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen
       token: config.systemAccessToken
     })
   ], { concurrency: "unbounded" });
-  yield* logInfo2("Loaded review inputs.", {
-    pullRequestTitle: metadata.title,
-    changedFiles: fullPullRequestDiff.changedFiles.length,
-    diffBytes: fullPullRequestDiff.diffText.length,
-    baseRef: fullPullRequestDiff.baseRef,
-    headRef: fullPullRequestDiff.headRef,
-    existingThreads: existingThreads.length,
-    reviewedSourceCommit
-  });
+  yield* logInfo2(`Loaded review inputs for ${fullPullRequestDiff.changedFiles.length} changed file(s).`);
   const previousSummaryState = findManagedSummaryThread(existingThreads)?.reviewState;
   const { reviewMode, scopedDiff, previousReviewedCommit } = yield* resolveReviewScope({
     config,
@@ -71488,10 +72021,7 @@ var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen
       scopedChangedLinesByFile: scopedDiff.changedLinesByFile,
       scopedDeletedLinesByFile: scopedDiff.deletedLinesByFile
     });
-    yield* logInfo2("Skipped review because no new commits were added since the last managed review.", {
-      reviewedSourceCommit,
-      actions: actions2.length
-    });
+    yield* logInfo2("Skipped review because no new commits were added since the last managed review.");
     return {
       metadata,
       connectedWorkItems: [],
@@ -71527,11 +72057,7 @@ var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen
     context: azureContext,
     token: config.systemAccessToken,
     workItemRefs: metadata.workItemRefs
-  }).pipe(exports_Effect.tap((workItems) => logInfo2("Loaded connected work item context.", {
-    workItemRefs: metadata.workItemRefs.length,
-    connectedWorkItems: workItems.length,
-    omittedConnectedWorkItems: Math.max(metadata.workItemRefs.length - workItems.length, 0)
-  })), exports_Effect.catchTags({
+  }).pipe(exports_Effect.tap((workItems) => logInfo2(workItems.length > 0 ? `Loaded ${workItems.length} connected work item(s).` : "No connected work items found.")), exports_Effect.catchTags({
     AzureDevOpsHttpError: (error2) => logInfo2("Failed to load connected work item context. Continuing without work item enrichment.", {
       workItemRefs: metadata.workItemRefs.length,
       status: error2.status,
@@ -71551,17 +72077,9 @@ var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen
     existingThreads,
     ...connectedWorkItems ? { connectedWorkItems } : {}
   });
-  yield* logInfo2("Built review context.", {
-    reviewMode,
-    changedFiles: reviewContext.changedFiles.length,
-    pullRequestThreads: reviewContext.pullRequestThreads?.items.length ?? 0,
-    omittedPullRequestThreads: reviewContext.pullRequestThreads?.omittedCount ?? 0,
-    manifestChars: stringifyJson2(reviewContext).length
-  });
+  yield* logInfo2(`Built ${reviewMode} review context.`);
   const prompt = yield* buildReviewPrompt(config.promptFile, reviewContext);
-  yield* logInfo2("Built review prompt.", {
-    promptChars: prompt.length
-  });
+  yield* logInfo2("Built review prompt.");
   const openCodeResult = yield* openCodeRunner.run({
     workspace: config.workspace,
     model: config.model,
@@ -71572,30 +72090,12 @@ var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen
     inheritedEnv: config.inheritedEnv,
     format: REVIEW_OUTPUT_FORMAT
   });
-  yield* logInfo2("Received OpenCode response.", {
-    responseChars: openCodeResult.response.length,
-    sessionId: openCodeResult.sessionId,
-    costUsd: openCodeResult.usage?.costUsd,
-    inputTokens: openCodeResult.usage?.tokens?.input,
-    outputTokens: openCodeResult.usage?.tokens?.output,
-    structuredRequested: true,
-    structuredDelivered: openCodeResult.structured !== undefined,
-    structuredErrorName: openCodeResult.modelError?.name,
-    structuredErrorRetries: openCodeResult.modelError?.retries
-  });
+  yield* logInfo2("Received OpenCode response.");
   const { reviewResult, source } = yield* decodeStructuredReviewResult({
     openCodeResult,
     changedLinesByFile: scopedDiff.changedLinesByFile
   });
-  yield* logInfo2("Decoded review result.", {
-    reviewMode,
-    verdict: reviewResult.verdict,
-    findings: reviewResult.findings.length,
-    inlineFindings: reviewResult.inlineFindings.length,
-    summaryOnlyFindings: reviewResult.summaryOnlyFindings.length,
-    unmappedNotes: reviewResult.unmappedNotes.length,
-    ...reviewResultSourceLogFields(source)
-  });
+  yield* logInfo2(`Decoded review result: ${reviewResult.verdict} with ${reviewResult.findings.length} finding(s).`);
   const outstandingReviewResult = reviewMode === "follow-up" ? mergeFollowUpReviewResult({
     existingThreads,
     scopedChangedLinesByFile: scopedDiff.changedLinesByFile,
@@ -71632,10 +72132,7 @@ var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen
     scopedChangedLinesByFile: scopedDiff.changedLinesByFile,
     scopedDeletedLinesByFile: scopedDiff.deletedLinesByFile
   });
-  yield* logInfo2("Published review result.", {
-    actions: actions.length,
-    reviewMode
-  });
+  yield* logInfo2(`Prepared ${actions.length} review action(s).`);
   return {
     metadata,
     connectedWorkItems: connectedWorkItems ?? [],
@@ -71663,7 +72160,7 @@ var planReviewWorkflow = (config, azureContext, buildLink) => exports_Effect.gen
       skipped: false
     }
   };
-}).pipe(withLogAnnotations(reviewLogFields(config)), exports_Effect.withLogSpan("open-azdo.review"));
+}).pipe(exports_Effect.withLogSpan("open-azdo.review"));
 var runReviewWorkflow = (config) => exports_Effect.gen(function* () {
   const azureContext = createAzureContext(config);
   const buildLink = buildBuildLink(config);
@@ -72546,25 +73043,34 @@ var executeSandboxCapture = exports_Effect.scoped(exports_Effect.gen(function* (
 }));
 
 // src/Runtime.ts
-var makeRuntimeLayer = (cliInput) => {
-  const appConfigLayer = makeAppConfigLayer(cliInput);
-  const processRunnerLayer = ProcessRunnerLive.pipe(exports_Layer.provide(BaseRuntimeLayer));
-  const platformLayer = exports_Layer.mergeAll(BaseRuntimeLayer, processRunnerLayer);
+var makePlatformRuntimeLayers = (jsonLogs) => {
+  const baseRuntimeLayer = makeBaseRuntimeLayer({
+    jsonLogs
+  });
+  const processRunnerLayer = ProcessRunnerLive.pipe(exports_Layer.provide(baseRuntimeLayer));
+  const platformLayer = exports_Layer.mergeAll(baseRuntimeLayer, processRunnerLayer);
   const gitExecLayer = GitExecLive.pipe(exports_Layer.provide(processRunnerLayer));
   const openCodeRunnerLayer = OpenCodeRunnerLive.pipe(exports_Layer.provide(platformLayer));
-  return exports_Layer.mergeAll(platformLayer, appConfigLayer, gitExecLayer, AzureDevOpsClientLive, openCodeRunnerLayer);
+  return {
+    appRuntimeLayer: exports_Layer.mergeAll(platformLayer, gitExecLayer, AzureDevOpsClientLive, openCodeRunnerLayer)
+  };
+};
+var makeRuntimeLayer = (cliInput) => {
+  const appConfigLayer = makeAppConfigLayer(cliInput);
+  const { appRuntimeLayer } = makePlatformRuntimeLayers(cliInput.json);
+  return exports_Layer.mergeAll(appRuntimeLayer, appConfigLayer);
 };
 var makeSandboxCaptureRuntimeLayer = (cliInput) => {
   const appConfigLayer = makeSandboxCaptureConfigLayer(cliInput);
-  const processRunnerLayer = ProcessRunnerLive.pipe(exports_Layer.provide(BaseRuntimeLayer));
-  const platformLayer = exports_Layer.mergeAll(BaseRuntimeLayer, processRunnerLayer);
-  const gitExecLayer = GitExecLive.pipe(exports_Layer.provide(processRunnerLayer));
-  const openCodeRunnerLayer = OpenCodeRunnerLive.pipe(exports_Layer.provide(platformLayer));
-  return exports_Layer.mergeAll(platformLayer, appConfigLayer, gitExecLayer, AzureDevOpsClientLive, openCodeRunnerLayer);
+  const { appRuntimeLayer } = makePlatformRuntimeLayers(cliInput.json);
+  return exports_Layer.mergeAll(appRuntimeLayer, appConfigLayer);
 };
 
 // src/Cli.ts
 var PositiveIntSchema = exports_Schema.Int.check(exports_Schema.isGreaterThan(0));
+var withCliLogger = (effect2, jsonLogs) => effect2.pipe(exports_Effect.provide(makeBaseRuntimeLayer({
+  jsonLogs
+})));
 var executeReview = exports_Effect.gen(function* () {
   const config = yield* AppConfig;
   return yield* runReviewWorkflow({
@@ -72578,9 +73084,9 @@ var runReviewCommand = (input) => exports_Effect.gen(function* () {
   const exit3 = yield* exports_Effect.exit(executeReviewWithInput(input));
   if (!exports_Exit.isSuccess(exit3)) {
     const failureReason = exports_Cause.pretty(exit3.cause);
-    yield* logError2("open-azdo failed during startup.", {
+    yield* withCliLogger(logError2("open-azdo failed during startup.", {
       cause: failureReason
-    }).pipe(exports_Effect.provide(BaseRuntimeLayer));
+    }), input.json);
     return yield* new OperationalError({
       message: "open-azdo failed during startup."
     });
@@ -72596,9 +73102,9 @@ var runSandboxCaptureCommand = (input) => exports_Effect.gen(function* () {
   const exit3 = yield* exports_Effect.exit(executeSandboxCaptureWithInput(input));
   if (!exports_Exit.isSuccess(exit3)) {
     const failureReason = exports_Cause.pretty(exit3.cause);
-    yield* logError2("open-azdo failed during sandbox capture.", {
+    yield* withCliLogger(logError2("open-azdo failed during sandbox capture.", {
       cause: failureReason
-    }).pipe(exports_Effect.provide(BaseRuntimeLayer));
+    }), input.json);
     return yield* new OperationalError({
       message: "open-azdo failed during sandbox capture."
     });
@@ -72625,7 +73131,7 @@ var reviewCommandConfig = {
   dryRun: boolean6("dry-run").pipe(withDefault4(false), withDescription2("Do not publish comments.")),
   json: boolean6("json").pipe(withDefault4(false), withDescription2("Emit machine-readable JSON."))
 };
-var reviewCommand = make33("review", reviewCommandConfig).pipe(withDescription3("Review an Azure DevOps pull request with OpenCode."), withHandler((input) => runReviewCommand(input)));
+var reviewCommand = make34("review", reviewCommandConfig).pipe(withDescription3("Review an Azure DevOps pull request with OpenCode."), withHandler((input) => runReviewCommand(input)));
 var sandboxCaptureCommandConfig = {
   model: string7("model").pipe(optional3, withDescription2("Model id, for example openai/gpt-5.4.")),
   opencodeVariant: string7("opencode-variant").pipe(optional3, withDescription2("Provider-specific variant or reasoning level.")),
@@ -72639,11 +73145,11 @@ var sandboxCaptureCommandConfig = {
   output: string7("output").pipe(optional3, withDescription2("Output path for the sandbox capture JSON.")),
   json: boolean6("json").pipe(withDefault4(false), withDescription2("Emit machine-readable JSON."))
 };
-var sandboxCaptureCommand = make33("capture", sandboxCaptureCommandConfig).pipe(withDescription3("Capture a real Azure DevOps PR review run into a local sandbox artifact."), withHandler((input) => runSandboxCaptureCommand(input)));
-var sandboxCommand = make33("sandbox").pipe(withDescription3("Sandbox tooling for live capture and local preview."), withSubcommands([sandboxCaptureCommand]));
-var openAzdoCli = make33("open-azdo").pipe(withDescription3("Secure Azure DevOps pull-request review CLI powered by OpenCode."), withSubcommands([reviewCommand, sandboxCommand]));
+var sandboxCaptureCommand = make34("capture", sandboxCaptureCommandConfig).pipe(withDescription3("Capture a real Azure DevOps PR review run into a local sandbox artifact."), withHandler((input) => runSandboxCaptureCommand(input)));
+var sandboxCommand = make34("sandbox").pipe(withDescription3("Sandbox tooling for live capture and local preview."), withSubcommands([sandboxCaptureCommand]));
+var openAzdoCli = make34("open-azdo").pipe(withDescription3("Secure Azure DevOps pull-request review CLI powered by OpenCode."), withSubcommands([reviewCommand, sandboxCommand]));
 // package.json
-var version2 = "0.3.2";
+var version2 = "0.3.4";
 
 // src/Main.ts
 var cliProgram = run3(openAzdoCli, { version: version2 }).pipe(exports_Effect.scoped, exports_Effect.provide(BaseRuntimeLayer));
@@ -72652,4 +73158,4 @@ var main = () => runMain2(cliProgram, { disableErrorReporting: true });
 // bin/open-azdo.ts
 main();
 
-//# debugId=3E966D7A63AFA1E264756E2164756E21
+//# debugId=2B0BDD0B7FAF788564756E2164756E21