flavor-code 1.3.23 → 1.4.0-beta.10

package/dist/agent/loop.d.ts

@@ -2,6 +2,7 @@ import type { ContextManager } from "../context/manager.js";
 import type { HallucinationGuard } from "../hallucination/guard.js";
 import type { HookBus } from "../hooks/bus.js";
 import type { ModelRegistry } from "../models/registry.js";
+import { MEMORY_PRESSURE_HEAP_RATIO } from "../utils/heap.js";
 import { type ModelMessage, type ModelTool } from "../models/types.js";
 import type { ToolRuntime } from "../tools/runtime.js";
 import type { AgentError, AgentEvent, AgentRunRequest } from "./types.js";
@@ -10,9 +11,10 @@ import type { AgentError, AgentEvent, AgentRunRequest } from "./types.js";
  * leak otherwise ends in a native OOM crash with no recovery; tripping this
  * watermark saves the session and lets the launcher relaunch on a fresh heap.
  * 0.8 keeps headroom for compaction payloads and the GC death spiral that
- * starts near ~0.95.
+ * starts near ~0.95. The reading is GC-verified: uncollected garbage alone
+ * must not stop a turn.
  */
-export declare const MEMORY_PRESSURE_HEAP_RATIO = 0.8;
+export { MEMORY_PRESSURE_HEAP_RATIO };
 export declare function memoryPressureError(heapUsed: number, heapLimit: number): AgentError | undefined;
 export interface AgentLoopOptions {
     registry: ModelRegistry;
@@ -46,6 +48,9 @@ export declare class AgentLoop {
     constructor(options: AgentLoopOptions);
     get modelId(): string;
     get iterationLimitMode(): "standard" | "d2c";
+    get maxIterations(): number;
+    get softLimitFactor(): number;
+    get extendIterations(): number;
     setModel(modelId: string): void;
     setFallbackModel(modelId: string): void;
     /** D2C keeps a hard cap, but may automatically expand it up to ten times. */

package/dist/{app-NTEUPJKJ.js → app-SMIB6P23.js}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module"; const require = createRequire(import.meta.url);
 import {
-  checkForUpdate,
   statusPresentation
-} from "./chunk-7OICVL2M.js";
+} from "./chunk-RAYH6K2H.js";
 import {
   COMMAND_DESCRIPTIONS,
   MVP_COMMANDS,
   charWidth,
+  checkForUpdate,
   createGlobTool,
   createProductionRuntime,
   createTranscriptState,
@@ -19,9 +19,9 @@ import {
   thinkingWindow,
   transcriptReducer,
   withTimeout
-} from "./chunk-Z62P4LL7.js";
-import "./chunk-CIVPKHF4.js";
-import "./chunk-RPFWB45Y.js";
+} from "./chunk-BYHO2CA5.js";
+import "./chunk-N5MXHJKD.js";
+import "./chunk-EXOSMO57.js";
 import {
   Box_default,
   ClockContext,
@@ -38,11 +38,10 @@ import {
   useStdout,
   use_app_default,
   use_input_default
-} from "./chunk-SUSLIHXO.js";
-import "./chunk-OTYFL4AG.js";
+} from "./chunk-XMRKRPNC.js";
 import {
   execFileNoThrow
-} from "./chunk-RQTYHUMK.js";
+} from "./chunk-ZJCAQXA7.js";
 import "./chunk-S32JRDZK.js";
 
 // src/ui/app.tsx
@@ -1008,7 +1007,7 @@ function TaskStatusLine({ block, interactive }) {
     thinkingScroll.current = { start: state.start, lastTime: time };
     return state.text;
   })() : void 0;
-  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "column", width: "100%", children: [
     /* @__PURE__ */ jsxs2(Box_default, { ref, flexDirection: "row", children: [
       /* @__PURE__ */ jsxs2(Text, { ...presentation.color === void 0 ? {} : { color: presentation.color }, children: [
         presentation.glyph,
@@ -1040,38 +1039,70 @@ function ThinkingLineView({ text }) {
     /* @__PURE__ */ jsx3(Text, { color: THINKING_TEXT, wrap: "truncate-end", children: text })
   ] });
 }
+var SPLIT_TRACK_MIN_COLUMNS = 72;
 function TaskProgressPanel({
   blocks,
   interactive,
   maxHeight = 8,
+  columns = 80,
   scrollRef,
   onHoverChange
 }) {
   if (blocks.length === 0 || maxHeight <= 0) return null;
+  const taskBlocks = blocks.filter((block) => block.task?.role === "main");
+  const subagentBlocks = blocks.filter((block) => block.task?.role === "subagent");
+  const hasTasks = taskBlocks.length > 0;
+  const hasSubagents = subagentBlocks.length > 0;
+  const split = hasTasks && hasSubagents && columns >= SPLIT_TRACK_MIN_COLUMNS;
   return /* @__PURE__ */ jsxs2(
     Box_default,
     {
       flexDirection: "column",
       flexShrink: 0,
+      width: "100%",
       maxHeight,
       onMouseEnter: () => onHoverChange?.(true),
       onMouseLeave: () => onHoverChange?.(false),
       children: [
-        /* @__PURE__ */ jsx3(Text, { dimColor: true, children: "\u2500\u2500 task progress \u2500\u2500" }),
+        split ? /* @__PURE__ */ jsx3(SplitTrackHeaders, {}) : /* @__PURE__ */ jsx3(TrackHeader, { role: hasTasks ? "main" : "subagent" }),
         maxHeight > 1 ? /* @__PURE__ */ jsx3(
           ScrollBox_default,
           {
             ...scrollRef === void 0 ? {} : { ref: scrollRef },
             flexDirection: "column",
             flexShrink: 1,
+            width: "100%",
             maxHeight: maxHeight - 1,
-            children: blocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
+            children: split ? pairedTrackRows(taskBlocks, subagentBlocks).map(([task, subagent], index) => /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", columnGap: 2, children: [
+              /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, flexDirection: "column", children: task === void 0 ? null : /* @__PURE__ */ jsx3(TaskStatusLine, { block: task, interactive }) }),
+              /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, flexDirection: "column", children: subagent === void 0 ? null : /* @__PURE__ */ jsx3(TaskStatusLine, { block: subagent, interactive }) })
+            ] }, `${task?.id ?? "task"}:${subagent?.id ?? "subagent"}:${index}`)) : hasTasks && hasSubagents ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
+              taskBlocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id)),
+              /* @__PURE__ */ jsx3(TrackHeader, { role: "subagent" }),
+              subagentBlocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
+            ] }) : (hasTasks ? taskBlocks : subagentBlocks).map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
           }
         ) : null
       ]
     }
   );
 }
+function TrackHeader({ role }) {
+  return /* @__PURE__ */ jsxs2(Text, { dimColor: true, children: [
+    "\u2500\u2500 ",
+    role === "main" ? "task plan" : "subagent exploration",
+    " \u2500\u2500"
+  ] });
+}
+function SplitTrackHeaders() {
+  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", columnGap: 2, children: [
+    /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsx3(TrackHeader, { role: "main" }) }),
+    /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsx3(TrackHeader, { role: "subagent" }) })
+  ] });
+}
+function pairedTrackRows(tasks, subagents) {
+  return Array.from({ length: Math.max(tasks.length, subagents.length) }, (_, index) => [tasks[index], subagents[index]]);
+}
 
 // src/ui/file-diff-style.ts
 var CONTENT = "#f8f8f2";
@@ -1308,7 +1339,7 @@ function WelcomeCard({
   columns
 }) {
   const wide = Math.max(1, Math.floor(columns)) >= WIDE_WELCOME_COLUMNS;
-  const updateHint = updateTo === void 0 ? null : /* @__PURE__ */ jsxs3(Text, { color: "yellowBright", wrap: "truncate-end", children: [
+  const updateHint = updateTo === void 0 ? null : /* @__PURE__ */ jsxs3(Text, { color: "yellowBright", wrap: "wrap", children: [
     "\u25B2 ",
     "Update available: v",
     packageVersion(),
@@ -1316,7 +1347,7 @@ function WelcomeCard({
     "\u2192",
     " v",
     updateTo,
-    " \xB7 run: flavor update"
+    "\nRun: flavor update"
   ] });
   return /* @__PURE__ */ jsx4(Box_default, { width: "100%", borderStyle: "round", borderColor: "yellow", paddingX: 1, children: wide ? /* @__PURE__ */ jsxs3(Box_default, { width: "100%", flexDirection: "row", children: [
     /* @__PURE__ */ jsxs3(
@@ -1523,160 +1554,45 @@ function isBridgeMethod(value, method) {
     && typeof value[method] === "function";
 }
 
-function safeDataForType(pasteboard, type) {
-  try {
-    return isBridgeMethod(pasteboard, "dataForType")
-      ? pasteboard.dataForType(type)
-      : null;
-  } catch (error) {
-    return null;
-  }
-}
-
-function pngDataFromTiff(tiff) {
-  if (!isBridgeMethod(tiff, "base64EncodedStringWithOptions")) {
-    return null;
-  }
-  try {
-    const representation = $.NSBitmapImageRep.imageRepWithData(tiff);
-    if (!isBridgeMethod(representation, "representationUsingTypeProperties")) {
-      return null;
-    }
-    const converted = representation.representationUsingTypeProperties(
-      $.NSBitmapImageFileTypePNG,
-      $({})
-    );
-    return isBridgeMethod(converted, "base64EncodedStringWithOptions")
-      ? converted
-      : null;
-  } catch (error) {
-    return null;
-  }
-}
-
-function base64FromData(data) {
-  if (!isBridgeMethod(data, "base64EncodedStringWithOptions")) {
-    return null;
-  }
-  try {
-    const encoded = data.base64EncodedStringWithOptions(0);
-    if (!encoded) {
-      return null;
-    }
-    const unwrapped = ObjC.unwrap(encoded);
-    return typeof unwrapped === "string" && unwrapped.length > 0
-      ? unwrapped
-      : null;
-  } catch (error) {
-    return null;
-  }
-}
-
-function firstReadableObject(pasteboard, objectClass) {
-  try {
-    if (!isBridgeMethod(pasteboard, "readObjectsForClassesOptions")) {
-      return null;
-    }
-    const classes = $.NSArray.arrayWithObject(objectClass);
-    const objects = pasteboard.readObjectsForClassesOptions(classes, $({}));
-    return objects === null || objects === undefined ? null : objects.firstObject;
-  } catch (error) {
-    return null;
-  }
-}
-
-function imageFromWholePasteboard(pasteboard) {
-  try {
-    const image = $.NSImage.alloc.initWithPasteboard(pasteboard);
-    return image === null || image === undefined ? null : image;
-  } catch (error) {
-    return null;
-  }
-}
-
-function imageFromFileUrl(pasteboard) {
-  try {
-    const url = firstReadableObject(pasteboard, $.NSURL);
-    if (url === null || url === undefined || !url.isFileURL) {
-      return null;
-    }
-    const image = $.NSImage.alloc.initWithContentsOfURL(url);
-    return image === null || image === undefined ? null : image;
-  } catch (error) {
-    return null;
-  }
-}
-
-function base64FromImage(image) {
-  try {
-    return image === null || image === undefined
-      ? null
-      : base64FromData(pngDataFromTiff(image.TIFFRepresentation));
-  } catch (error) {
-    return null;
-  }
-}
-
-function pasteboardTypeNames(pasteboard) {
-  try {
-    const types = pasteboard.types;
-    if (!isBridgeMethod(types, "objectAtIndex")) {
-      return [];
-    }
-    const count = Number(types.count);
-    const names = [];
-    for (let index = 0; index < count; index += 1) {
-      const name = ObjC.unwrap(types.objectAtIndex(index));
-      if (typeof name === "string") {
-        names.push(name);
+try {
+  const pasteboard = $.NSPasteboard.generalPasteboard;
+  let data = null;
+  if (isBridgeMethod(pasteboard, "dataForType")) {
+    const png = pasteboard.dataForType($.NSPasteboardTypePNG);
+    if (isBridgeMethod(png, "base64EncodedStringWithOptions")) {
+      data = png;
+    } else {
+      const tiff = pasteboard.dataForType($.NSPasteboardTypeTIFF);
+      // NSData.length is exposed by JXA as a property value, not a
+      // callable bridge method. Probe a real NSData method so a valid
+      // TIFF-only pasteboard item is not mistaken for ObjC nil.
+      if (isBridgeMethod(tiff, "base64EncodedStringWithOptions")) {
+        const representation = $.NSBitmapImageRep.imageRepWithData(tiff);
+        if (isBridgeMethod(representation, "representationUsingTypeProperties")) {
+          const converted = representation.representationUsingTypeProperties(
+            $.NSBitmapImageFileTypePNG,
+            $.NSDictionary.dictionary
+          );
+          if (isBridgeMethod(converted, "base64EncodedStringWithOptions")) {
+            data = converted;
+          }
+        }
       }
     }
-    return names;
-  } catch (error) {
-    return [];
   }
-}
-
-const pasteboard = $.NSPasteboard.generalPasteboard;
-let encoded = base64FromData(safeDataForType(pasteboard, $("public.png")));
-
-if (!encoded) {
-  encoded = base64FromData(
-    pngDataFromTiff(safeDataForType(pasteboard, $("public.tiff")))
-  );
-}
-
-// Ask AppKit for objects conforming to NSPasteboardReading. This covers image
-// formats and lazy providers that do not expose direct PNG/TIFF NSData.
-if (!encoded) {
-  encoded = base64FromImage(firstReadableObject(pasteboard, $.NSImage));
-}
-
-if (!encoded) {
-  encoded = base64FromImage(imageFromWholePasteboard(pasteboard));
-}
-
-// Finder copies files as file URLs instead of image bytes. Load the first
-// local file through NSImage, which also rejects non-image files.
-if (!encoded) {
-  encoded = base64FromImage(imageFromFileUrl(pasteboard));
-}
-
-if (!encoded) {
-  const types = pasteboardTypeNames(pasteboard);
-  const advertisedImage = types.some(function (type) {
-    return /image|png|tiff|jpeg|jpg|heic|gif|webp|bmp|pdf|file-url|filenames/i.test(type);
-  });
-  if (advertisedImage) {
-    throw new Error(
-      "Clipboard advertises image or file data but AppKit could not decode it. Types: "
-        + types.join(", ")
-    );
+  if (!data) {
+    $.exit(3);
+  }
+  const encoded = data.base64EncodedStringWithOptions(0);
+  if (!encoded) {
+    $.exit(3);
   }
+  const output = encoded.stringByAppendingString("\n")
+    .dataUsingEncoding($.NSUTF8StringEncoding);
+  $.NSFileHandle.fileHandleWithStandardOutput.writeData(output);
+} catch (error) {
   $.exit(3);
 }
-
-console.log(encoded);
 `.trim();
 function shouldReadClipboardImage(input, key, isPasted) {
   return (key.ctrl || key.meta === true) && input.toLowerCase() === "v" || isPasted && input.length === 0;
@@ -2666,6 +2582,7 @@ function TerminalLayout({
         blocks: activeTaskBlocks,
         interactive: activeSession,
         maxHeight: taskPanelRows,
+        columns,
         ...taskScrollRef === void 0 ? {} : { scrollRef: taskScrollRef },
         ...onTaskPanelHoverChange === void 0 ? {} : { onHoverChange: onTaskPanelHoverChange }
       }
@@ -3252,6 +3169,10 @@ function CommandPresentationView({
     ] }),
     stdout.total === 0 ? null : /* @__PURE__ */ jsx5(CommandOutputSection, { label: "OUTPUT", value: stdout, tone, error: false }),
     stderr.total === 0 ? null : /* @__PURE__ */ jsx5(CommandOutputSection, { label: "ERROR", value: stderr, tone, error: true }),
+    presentation.diagnostic === void 0 ? null : /* @__PURE__ */ jsxs4(Box_default, { children: [
+      /* @__PURE__ */ jsx5(Text, { color: tone, children: "\u2502  " }),
+      /* @__PURE__ */ jsx5(Text, { color: tone, children: presentation.diagnostic })
+    ] }),
     /* @__PURE__ */ jsxs4(Box_default, { children: [
       /* @__PURE__ */ jsx5(Text, { color: tone, children: "\u2514\u2500 " }),
       /* @__PURE__ */ jsx5(Text, { dimColor: true, children: commandFooter(presentation, state) })