@organizaone/o1-code 0.8.0 → 0.10.4

package/chunks/{chunk-HLWXBJCH.js → chunk-WZCKDUBO.js}

@@ -35,9 +35,13 @@ var require_quote = __commonJS({
       ]
     );
     var LINE_TERMINATORS = /[\n\r\u2028\u2029]/;
-    var GLOB_SHELL_SPECIAL = /[\s#!"$&'():;<=>@\\^`|]/g;
+    var GLOB_SHELL_SPECIAL = /[\s#!"$&'():;<=>@\\^`|~]/g;
     module.exports = /* @__PURE__ */ __name(function quote(xs) {
+      var sawComment = false;
       return xs.map(function(s) {
+        if (sawComment && typeof s === "string" && LINE_TERMINATORS.test(s)) {
+          throw new TypeError("a token after a `comment` must not contain line terminators");
+        }
         if (s === "") {
           return (
             /** @type {const} */
@@ -52,6 +56,12 @@ var require_quote = __commonJS({
             if (LINE_TERMINATORS.test(s.pattern)) {
               throw new TypeError("glob `pattern` must not contain line terminators");
             }
+            if (s.pattern === "") {
+              return (
+                /** @type {const} */
+                "''"
+              );
+            }
             return s.pattern.replace(GLOB_SHELL_SPECIAL, "\\$&");
           }
           if ("op" in s && typeof s.op === "string") {
@@ -64,15 +74,19 @@ var require_quote = __commonJS({
             if (LINE_TERMINATORS.test(s.comment)) {
               throw new TypeError("`comment` must not contain line terminators");
             }
+            sawComment = true;
             return "#" + s.comment;
           }
           throw new TypeError("unrecognized object token shape");
         }
+        if (/'/.test(s) && /!/.test(s)) {
+          return "'" + s.replace(/'/g, `'"'"'`) + "'";
+        }
         if (/["\s\\]/.test(s) && !/'/.test(s)) {
-          return "'" + s.replace(/(['])/g, "\\$1") + "'";
+          return "'" + s + "'";
         }
         if (/["'\s]/.test(s)) {
-          return '"' + s.replace(/(["\\$`!])/g, "\\$1") + '"';
+          return '"' + s.replace(/(["\\$`])/g, "\\$1") + '"';
         }
         return String(s).replace(/([A-Za-z]:)?([#!"$&'()*,:;<=>?@[\\\]^`{|}~])/g, "$1\\$2");
       }).join(" ");
@@ -112,12 +126,13 @@ var require_parse = __commonJS({
     );
     var SINGLE_QUOTE = (
       /** @type {const} */
-      '"((\\\\"|[^"])*?)"'
-    );
-    var DOUBLE_QUOTE = (
-      /** @type {const} */
-      "'((\\\\'|[^'])*?)'"
+      "'([^']*?)'"
     );
+    var ANSI_C_BODY = "(?:\\\\[\\s\\S]|[^\\\\'])*?";
+    var ANSI_C_QUOTE = "\\$'" + ANSI_C_BODY + "'";
+    var ansiCAt = new RegExp("\\$'" + ANSI_C_BODY + "(?:(')|\\\\?$)", "g");
+    var ANSI_C_LETTERS = "abeEfnrtv";
+    var ANSI_C_CHARS = "\x07\b\x1B\x1B\f\n\r	\v";
     var hash = /^#$/;
     var SQ = (
       /** @type {const} */
@@ -168,16 +183,49 @@ var require_parse = __commonJS({
       return pre + r;
     }
     __name(getVar, "getVar");
+    var ansiCEscape = /\\([0-7]{1,3}|x[\dA-Fa-f]{1,2}|u[\dA-Fa-f]{1,4}|U[\dA-Fa-f]{1,8}|c(?:\\\\|[\s\S])|[abeEfnrtv\\'"?])/g;
+    function expandAnsiCEscape(m, escape) {
+      var kind = escape.charAt(0);
+      if (kind === "c") {
+        var ctrl = escape.charAt(1);
+        return ctrl === "?" ? "\x7F" : String.fromCharCode(ctrl.charCodeAt(0) & 31);
+      }
+      if (kind === "x" || kind === "u" || kind === "U") {
+        var cp = parseInt(escape.slice(1), 16);
+        if (cp > 1114111) {
+          return m;
+        }
+        return String.fromCharCode.apply(null, cp > 65535 ? [55232 + (cp >> 10), 56320 + (cp & 1023)] : [cp]);
+      }
+      if (kind >= "0" && kind <= "7") {
+        return String.fromCharCode(parseInt(escape, 8) & 255);
+      }
+      var letter = ANSI_C_LETTERS.indexOf(escape);
+      return letter < 0 ? escape : ANSI_C_CHARS.charAt(letter);
+    }
+    __name(expandAnsiCEscape, "expandAnsiCEscape");
+    function expandAnsiC(body) {
+      return body.replace(ansiCEscape, expandAnsiCEscape).split("\0")[0];
+    }
+    __name(expandAnsiC, "expandAnsiC");
+    function closesAnsiC(s, i2) {
+      ansiCAt.lastIndex = i2;
+      return !!/** @type {RegExpExecArray} */
+      ansiCAt.exec(s)[1];
+    }
+    __name(closesAnsiC, "closesAnsiC");
     function parseInternal(string, env, opts) {
       if (!opts) {
         opts = {};
       }
       var BS = opts.escape || "\\";
-      var BAREWORD = "(\\" + BS + `['"` + META + `]|[^\\s'"` + META + "])+";
+      var ifs = opts.splitUnquoted === true ? " 	\n" : typeof opts.splitUnquoted === "string" ? opts.splitUnquoted : "";
+      var BAREWORD = "(\\" + BS + `['"$\\` + BS + META + "]|\\$\\$|\\$(?!" + ANSI_C_QUOTE.slice(2) + `)|[^\\s'"$` + META + "])+";
+      var DOUBLE_QUOTE = '"(?:\\' + BS + '[\\s\\S]|[^"\\' + BS + '])*"';
       var chunker = new RegExp([
         "(" + CONTROL + ")",
         // control chars
-        "(" + BAREWORD + "|" + SINGLE_QUOTE + "|" + DOUBLE_QUOTE + ")+"
+        "(" + ANSI_C_QUOTE + "|" + BAREWORD + "|" + DOUBLE_QUOTE + "|" + SINGLE_QUOTE + ")+"
       ].join("|"), "g");
       var matches = matchAll(string, chunker);
       if (matches.length === 0) {
@@ -201,6 +249,9 @@ var require_parse = __commonJS({
         var quote = false;
         var esc = false;
         var out = "";
+        var words = [];
+        var sawQuote = false;
+        var pendingNw = null;
         var isGlob = false;
         var i2;
         function parseEnvVar() {
@@ -213,15 +264,24 @@ var require_parse = __commonJS({
             if (s.charAt(i2) === "}") {
               throw new Error("Bad substitution: " + s.slice(i2 - 2, i2 + 1));
             }
-            varend = s.indexOf("}", i2);
-            if (varend < 0) {
+            var depth = 1;
+            varend = i2;
+            while (depth > 0 && varend < s.length) {
+              if (s.charAt(varend) === "{" && s.charAt(varend - 1) === "$") {
+                depth += 1;
+              } else if (s.charAt(varend) === "}") {
+                depth -= 1;
+              }
+              varend += 1;
+            }
+            if (depth !== 0) {
               throw new Error("Bad substitution: " + s.slice(i2));
             }
+            varend -= 1;
             varname = s.slice(i2, varend);
             i2 = varend;
-          } else if (/[*@#?$!_-]/.test(char)) {
+          } else if (/[*@#?$!-]/.test(char)) {
             varname = char;
-            i2 += 1;
           } else {
             var slicedFromI = s.slice(i2);
             varend = slicedFromI.match(/[^\w\d_]/);
@@ -242,8 +302,30 @@ var require_parse = __commonJS({
           );
         }
         __name(parseEnvVar, "parseEnvVar");
+        function flushRun() {
+          if (pendingNw === null) {
+            return;
+          }
+          if (pendingNw === 0) {
+            if (out !== "") {
+              words[words.length] = out;
+              out = "";
+            }
+          } else {
+            words[words.length] = out;
+            out = "";
+            for (var fe = 1; fe < pendingNw; fe += 1) {
+              words[words.length] = "";
+            }
+          }
+          pendingNw = null;
+        }
+        __name(flushRun, "flushRun");
         for (i2 = 0; i2 < s.length; i2++) {
           var c = s.charAt(i2);
+          if (ifs && c !== DS) {
+            flushRun();
+          }
           isGlob = isGlob || !quote && (c === "*" || c === "?");
           if (esc) {
             out += c;
@@ -270,6 +352,7 @@ var require_parse = __commonJS({
             }
           } else if (c === DQ || c === SQ) {
             quote = c;
+            sawQuote = true;
           } else if (controlRE.test(c)) {
             return (
               /** @type {ControlOperator} */
@@ -290,8 +373,28 @@ var require_parse = __commonJS({
             );
           } else if (c === BS) {
             esc = true;
+          } else if (c === DS && s.charAt(i2 + 1) === SQ && closesAnsiC(s, i2)) {
+            flushRun();
+            sawQuote = true;
+            out += expandAnsiC(s.slice(i2 + 2, ansiCAt.lastIndex - 1));
+            i2 = ansiCAt.lastIndex - 1;
           } else if (c === DS) {
-            out += parseEnvVar();
+            var value = parseEnvVar();
+            if (!ifs) {
+              out += value;
+            } else {
+              for (var vi = 0; vi < value.length; vi += 1) {
+                var vc = value.charAt(vi);
+                if (ifs.indexOf(vc) < 0) {
+                  flushRun();
+                  out += vc;
+                } else if (pendingNw === null) {
+                  pendingNw = vc === " " || vc === "	" || vc === "\n" ? 0 : 1;
+                } else if (vc !== " " && vc !== "	" && vc !== "\n") {
+                  pendingNw += 1;
+                }
+              }
+            }
           } else {
             out += c;
           }
@@ -302,6 +405,19 @@ var require_parse = __commonJS({
             { op: "glob", pattern: out }
           );
         }
+        if (ifs) {
+          if (pendingNw !== null && pendingNw > 0) {
+            words[words.length] = out;
+            out = "";
+            for (var te = 1; te < pendingNw; te += 1) {
+              words[words.length] = "";
+            }
+          }
+          if (out !== "" || sawQuote && words.length === 0) {
+            words[words.length] = out;
+          }
+          return words;
+        }
         return out;
       }).reduce(
         function(prev, arg) {

package/chunks/{chunk-Y37FNMS7.js → chunk-X427DWFD.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-OI7IVUEO.js";
 import {
   require_proper_lockfile
-} from "./chunk-ZFZB6WC5.js";
+} from "./chunk-4LCUE7BN.js";
 import {
   Mutex
 } from "./chunk-242JUBPM.js";

package/chunks/{chunk-35RKSP4A.js → chunk-XHYWPHWN.js}

@@ -3,7 +3,7 @@
 import {
   execCommand,
   isCommandAvailable
-} from "./chunk-V23Q4GBY.js";
+} from "./chunk-J5UW3SF4.js";
 import {
   resolveBundleDir
 } from "./chunk-Z2IHOXIK.js";

package/chunks/{chunk-OMJU4YIQ.js → chunk-XOVXSDNN.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-CDYMT4OZ.js";
 import {
   isSubagentLikeExecutionContext
-} from "./chunk-NGPEFWU4.js";
+} from "./chunk-OJSW65PQ.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation

package/chunks/{chunk-W5NM2DOQ.js → chunk-XRY6XLJD.js}

@@ -23190,6 +23190,9 @@ var require_proxy_addr = __commonJS({
       return /* @__PURE__ */ __name(function trust(addr) {
         if (!isip(addr)) return false;
         var ip = parseip(addr);
+        if (ip.kind() === "ipv6" && ip.isIPv4MappedAddress()) {
+          ip = ip.toIPv4Address();
+        }
         var ipconv;
         var kind = ip.kind();
         for (var i = 0; i < subnets.length; i++) {
@@ -23202,10 +23205,15 @@ var require_proxy_addr = __commonJS({
             if (subnetkind === "ipv4" && !ip.isIPv4MappedAddress()) {
               continue;
             }
+            if (subnetkind !== "ipv4" && !(subnetrange >= 96 && subnetip.isIPv4MappedAddress())) {
+              continue;
+            }
             if (!ipconv) {
               ipconv = subnetkind === "ipv4" ? ip.toIPv4Address() : ip.toIPv4MappedAddress();
             }
             trusted = ipconv;
+          } else if (kind === "ipv6" && subnetip.isIPv4MappedAddress()) {
+            continue;
           }
           if (trusted.match(subnetip, subnetrange)) {
             return true;
@@ -23223,12 +23231,20 @@ var require_proxy_addr = __commonJS({
       return /* @__PURE__ */ __name(function trust(addr) {
         if (!isip(addr)) return false;
         var ip = parseip(addr);
+        if (ip.kind() === "ipv6" && ip.isIPv4MappedAddress()) {
+          ip = ip.toIPv4Address();
+        }
         var kind = ip.kind();
         if (kind !== subnetkind) {
           if (subnetisipv4 && !ip.isIPv4MappedAddress()) {
             return false;
           }
+          if (!subnetisipv4 && !(subnetrange >= 96 && subnetip.isIPv4MappedAddress())) {
+            return false;
+          }
           ip = subnetisipv4 ? ip.toIPv4Address() : ip.toIPv4MappedAddress();
+        } else if (kind === "ipv6" && subnetip.isIPv4MappedAddress()) {
+          return false;
         }
         return ip.match(subnetip, subnetrange);
       }, "trust");

package/chunks/{chunk-ZXWZU5JK.js → chunk-Y6AFQKTE.js}

@@ -16,14 +16,14 @@ import {
   MODIFIER_SHIFT_BIT,
   MODIFIER_SUPER_BIT,
   clipboardHasImage
-} from "./chunk-4P7BNWDO.js";
+} from "./chunk-NSH5JHZH.js";
 import {
   require_jsx_runtime
 } from "./chunk-SKTOH6US.js";
 import {
   use_stdin_default,
   use_stdout_default
-} from "./chunk-IBPY5AJI.js";
+} from "./chunk-U5KZBWKF.js";
 import {
   require_react
 } from "./chunk-2KK65OQ6.js";
@@ -33,7 +33,7 @@ import {
 import {
   KittySequenceOverflowEvent,
   logKittySequenceOverflow
-} from "./chunk-G5Q6NMUW.js";
+} from "./chunk-RX5J7HHZ.js";
 import {
   createDebugLogger
 } from "./chunk-UK2KIU2V.js";
@@ -285,6 +285,7 @@ function KeypressProvider({
     }
     let isPaste = false;
     let pasteChunks = [];
+    let pasteReceivedBytes = 0;
     let pasteAlreadyFlushed = false;
     let pasteIdleTimeout = null;
     let lastPasteChunkAt = 0;
@@ -361,6 +362,7 @@ function KeypressProvider({
       const buffered = pasteChunks.join("");
       isPaste = false;
       pasteChunks = [];
+      setPasteProgress({ active: false, receivedBytes: 0 });
       pasteAlreadyFlushed = true;
       if (buffered.length > 0) {
         broadcast({
@@ -734,6 +736,7 @@ function KeypressProvider({
         if (isPaste || pasteChunks.length > 0) {
           isPaste = false;
           pasteChunks = [];
+          setPasteProgress({ active: false, receivedBytes: 0 });
           pasteAlreadyFlushed = true;
           clearPasteIdleTimeout();
         }
@@ -761,12 +764,15 @@ function KeypressProvider({
       }
       if (key.name === "paste-start") {
         isPaste = true;
+        pasteReceivedBytes = 0;
+        setPasteProgress({ active: true, receivedBytes: 0 });
         pasteAlreadyFlushed = false;
         startPasteIdleTimeout();
         return;
       }
       if (key.name === "paste-end") {
         clearPasteIdleTimeout();
+        setPasteProgress({ active: false, receivedBytes: 0 });
         if (pasteAlreadyFlushed) {
           pasteAlreadyFlushed = false;
           isPaste = false;
@@ -805,6 +811,7 @@ function KeypressProvider({
       }
       if (isPaste) {
         pasteChunks.push(key.sequence);
+        pasteReceivedBytes += Buffer.byteLength(key.sequence);
         startPasteIdleTimeout();
         return;
       }
@@ -1060,6 +1067,8 @@ function KeypressProvider({
       }
       rawDataBuffer = data.slice(cursor);
       if (rawDataBuffer.length === 0) {
+        if (isPaste)
+          setPasteProgress({ active: true, receivedBytes: pasteReceivedBytes });
         return;
       }
       if (isPaste || !shouldFlushRawDataAsPaste(rawDataBuffer)) {
@@ -1070,6 +1079,8 @@ function KeypressProvider({
         handleKeypress(void 0, createPasteKeyEvent("paste-end"));
       }
       rawDataBuffer = Buffer.alloc(0);
+      if (isPaste)
+        setPasteProgress({ active: true, receivedBytes: pasteReceivedBytes });
       clearRawFlushTimeout();
     }, "flushRawBuffer");
     const handleRawKeypress = /* @__PURE__ */ __name((_data) => {

package/chunks/{chunk-HQ5DN5W7.js → chunk-Y75AMWDB.js}

@@ -18,7 +18,7 @@ async function getPackageJson() {
   if (packageJson) {
     return packageJson;
   }
-  const { readPackageUp } = await import("./read-package-up-BNFTU7FA.js");
+  const { readPackageUp } = await import("./read-package-up-MAONTKXW.js");
   const result = await readPackageUp({ cwd: __dirname });
   if (!result) {
     return;