@organizaone/o1-code 0.18.0 → 0.19.2

package/chunks/{daemon-git-worktree-guard-SFJD6ECH.js → daemon-git-worktree-guard-2AALKGC3.js}

@@ -8,81 +8,80 @@ import {
   SHELL_EXECUTING_TOOL_NAMES
 } from "./chunk-W3YES77O.js";
 import "./chunk-F4S6U26O.js";
-import "./chunk-DUWGDM5Z.js";
+import "./chunk-B5I3IUHG.js";
 import "./chunk-MYMATZAY.js";
 import "./chunk-6IFQXZTP.js";
 import "./chunk-YO3SEHXM.js";
-import "./chunk-GQ2KSD3A.js";
+import "./chunk-5F56IIHO.js";
 import "./chunk-4JDEAIW5.js";
 import "./chunk-AEGEUWVC.js";
-import "./chunk-5OGI74MG.js";
+import "./chunk-7ASCNDOR.js";
 import "./chunk-VT3TJFQR.js";
-import "./chunk-5X3UQC3X.js";
+import "./chunk-ZPZPI63H.js";
 import "./chunk-WK44MSGW.js";
-import "./chunk-STEU6EPN.js";
-import "./chunk-PHLEDGND.js";
+import "./chunk-C7QKP7FW.js";
+import "./chunk-COMBBGHN.js";
 import "./chunk-ZMZRVR62.js";
 import "./chunk-NWCDFCWK.js";
-import "./chunk-AHSULPEE.js";
-import "./chunk-VPFTCMMK.js";
-import "./chunk-L2DC3N5S.js";
+import "./chunk-52G2UZZU.js";
+import "./chunk-XOVXSDNN.js";
+import "./chunk-7UEP4GNM.js";
 import "./chunk-DQZYZDIL.js";
-import "./chunk-SZC5KW6R.js";
+import "./chunk-QVMFV3XM.js";
 import "./chunk-F3FKDGHN.js";
-import "./chunk-I6MC5RTP.js";
+import "./chunk-WGFFYBV3.js";
 import "./chunk-UBWL27PO.js";
 import "./chunk-DM6W2QYB.js";
 import "./chunk-UAACCQBD.js";
-import "./chunk-776VI66O.js";
-import "./chunk-RUWBI6MP.js";
+import "./chunk-H5AU3734.js";
+import "./chunk-RKYOZTZO.js";
 import "./chunk-FNALBCC7.js";
 import "./chunk-BZOAEOYF.js";
 import "./chunk-BIDB75DA.js";
 import "./chunk-GYGA6V6B.js";
 import "./chunk-EYWIFUPJ.js";
+import "./chunk-MZI6FDZT.js";
 import "./chunk-7H3GWNGJ.js";
 import "./chunk-X427DWFD.js";
 import {
   GitWorktreeService
-} from "./chunk-65JWVPGE.js";
+} from "./chunk-5ZVLINFZ.js";
 import "./chunk-DJOP5LOE.js";
-import "./chunk-2LHQQK25.js";
-import "./chunk-MZI6FDZT.js";
+import "./chunk-FDNTWDR3.js";
 import "./chunk-4MSX3ERA.js";
 import "./chunk-YGG52IIN.js";
 import "./chunk-EP7GGUVV.js";
 import "./chunk-KEPNWFUD.js";
 import "./chunk-OI7IVUEO.js";
-import "./chunk-4X3MIKOZ.js";
-import "./chunk-NQTVSCZM.js";
+import "./chunk-JOBNLOEW.js";
+import "./chunk-2S3W2BIT.js";
+import "./chunk-TC7UXK4M.js";
 import "./chunk-DS3COGEF.js";
-import "./chunk-6PCAKMV4.js";
+import "./chunk-OYDDO6OG.js";
 import "./chunk-4ESI3MQ5.js";
 import "./chunk-SYMKXR42.js";
 import "./chunk-JOBZWTVK.js";
 import "./chunk-CDYMT4OZ.js";
-import "./chunk-TC7UXK4M.js";
 import "./chunk-HPQNI3OQ.js";
-import "./chunk-NPUXXNCX.js";
+import "./chunk-LCZW6GXU.js";
+import "./chunk-DVPQSDMD.js";
 import "./chunk-CI2ZHR5C.js";
-import "./chunk-4OUIZHHJ.js";
+import "./chunk-5TQYTWUK.js";
 import "./chunk-WU3R2YUE.js";
 import "./chunk-M7AWQAB7.js";
+import "./chunk-Z2IHOXIK.js";
 import "./chunk-5JTXPGNQ.js";
 import {
-  getShellConfiguration,
   splitCommands
-} from "./chunk-J5UW3SF4.js";
-import "./chunk-Z2IHOXIK.js";
+} from "./chunk-ICS5D7OZ.js";
 import "./chunk-5QSLFAMR.js";
-import "./chunk-UNY7AZRV.js";
-import "./chunk-P63XJ747.js";
+import "./chunk-5PRQVH45.js";
 import "./chunk-4LCUE7BN.js";
 import "./chunk-RIN7SNJN.js";
 import "./chunk-GVWQRVLV.js";
 import "./chunk-4J6KRUQB.js";
-import "./chunk-P4F73WS7.js";
-import "./chunk-NOL6NAWN.js";
+import "./chunk-7LFCBMVX.js";
+import "./chunk-OJSW65PQ.js";
 import "./chunk-KQAVEXYD.js";
 import {
   require_shell_quote
@@ -96,63 +95,63 @@ import "./chunk-RCZHQZJJ.js";
 import "./chunk-6YS3YH6O.js";
 import "./chunk-OSMXNPJP.js";
 import "./chunk-HX6AICAX.js";
-import "./chunk-SYYP7ISB.js";
-import "./chunk-FJAZPBX2.js";
+import "./chunk-QWKLEJEY.js";
+import "./chunk-V75J4GJ2.js";
 import "./chunk-FOZEB37P.js";
+import "./chunk-ZQBNP2ZQ.js";
+import "./chunk-YCTMVTDP.js";
+import "./chunk-JSFADKTB.js";
+import "./chunk-OHAUN3Q5.js";
+import "./chunk-O7QDVXNJ.js";
+import "./chunk-SRFL3HFU.js";
 import "./chunk-BQAZCJF7.js";
 import "./chunk-2QYMJSSC.js";
 import "./chunk-AVCUVYSA.js";
 import "./chunk-65B6QBMP.js";
 import "./chunk-O4IWNFDK.js";
-import "./chunk-U6A5UM2I.js";
-import "./chunk-TC2TJAOF.js";
 import "./chunk-WMJL2XAM.js";
+import "./chunk-LZQYRRU3.js";
+import "./chunk-TC2TJAOF.js";
 import "./chunk-CP63SY5N.js";
-import "./chunk-55PFTA5J.js";
-import "./chunk-55BVGW3L.js";
-import "./chunk-ZGPPP7FC.js";
+import "./chunk-2HEFHPUO.js";
+import "./chunk-U3KIMPCC.js";
+import "./chunk-WN23CFGN.js";
 import "./chunk-242JUBPM.js";
 import {
   isWithinRoot
 } from "./chunk-ROO6F2BT.js";
+import "./chunk-3CMX5LCG.js";
 import "./chunk-5P5ZJMW2.js";
 import "./chunk-GADK6OTE.js";
 import "./chunk-IC57EPC7.js";
-import "./chunk-3CMX5LCG.js";
 import "./chunk-VEJCE7UR.js";
 import "./chunk-R7FX7HIR.js";
 import "./chunk-V4XETRAG.js";
 import "./chunk-ABTPVII7.js";
+import "./chunk-HOPKSSYR.js";
 import "./chunk-FFUKRRCR.js";
 import "./chunk-23AFREUQ.js";
-import "./chunk-HOPKSSYR.js";
 import "./chunk-IQEM74QW.js";
-import "./chunk-SPTU3FVH.js";
+import "./chunk-JFO6OCHQ.js";
 import "./chunk-FKI7XUZK.js";
 import "./chunk-EPSJPAHV.js";
 import "./chunk-2MXORWOC.js";
-import "./chunk-ZRO2FPEP.js";
-import "./chunk-YCTMVTDP.js";
-import "./chunk-SRFL3HFU.js";
-import "./chunk-JSFADKTB.js";
-import "./chunk-OHAUN3Q5.js";
-import "./chunk-O7QDVXNJ.js";
 import "./chunk-JOFGX5ZA.js";
 import "./chunk-NO2WYQWE.js";
 import "./chunk-V44Y3PCO.js";
 import "./chunk-IWYGXAQU.js";
-import "./chunk-3D2STYD6.js";
-import "./chunk-S7GOFMLU.js";
+import "./chunk-TYOWBAXR.js";
+import "./chunk-72EBG4FJ.js";
+import "./chunk-RC67CA5Z.js";
+import "./chunk-AK6T4SJC.js";
 import "./chunk-KMWAEX43.js";
 import "./chunk-EVC2HZ5T.js";
 import "./chunk-JKXGHDQ2.js";
 import "./chunk-EPJAMNLS.js";
-import "./chunk-7TK6OY2J.js";
-import "./chunk-226GUP72.js";
-import "./chunk-72EBG4FJ.js";
-import "./chunk-N5MM5VOZ.js";
+import "./chunk-DWQZQDYY.js";
 import "./chunk-LEXKU5FI.js";
 import "./chunk-HDGYCLNB.js";
+import "./chunk-7TK6OY2J.js";
 import "./chunk-UK2KIU2V.js";
 import "./chunk-HBBBH6YA.js";
 import "./chunk-S3HSUBBN.js";
@@ -418,7 +417,7 @@ var WINDOWS_CMD_BOUNDARY_CHARS = /* @__PURE__ */ new Set([
   "(",
   ")"
 ]);
-function preserveWindowsPathSeparators(segment, platform = process.platform, shell = getShellConfiguration().shell) {
+function preserveWindowsPathSeparators(segment, platform = process.platform, shell = "bash") {
   if (platform !== "win32" || shell === "bash") return segment;
   let single = false;
   let double = false;
@@ -460,7 +459,7 @@ function preserveWindowsPathSeparators(segment, platform = process.platform, she
   return out;
 }
 __name(preserveWindowsPathSeparators, "preserveWindowsPathSeparators");
-function containsCmdRewriteSyntax(segment, platform = process.platform, shell = getShellConfiguration().shell) {
+function containsCmdRewriteSyntax(segment, platform = process.platform, shell = "bash") {
   if (platform !== "win32" || shell !== "cmd") return false;
   let doubleQuoted = false;
   let percents = 0;
@@ -477,7 +476,7 @@ function containsCmdRewriteSyntax(segment, platform = process.platform, shell =
   return percents >= 2 || bangs >= 2;
 }
 __name(containsCmdRewriteSyntax, "containsCmdRewriteSyntax");
-function containsUnmodelledWindowsSyntax(command, platform = process.platform, shell = getShellConfiguration().shell) {
+function containsUnmodelledWindowsSyntax(command, platform = process.platform, shell = "bash") {
   if (platform !== "win32" || shell === "bash") return false;
   const trimmed = command.trim();
   if (shell === "cmd" && trimmed.length > 1 && trimmed.startsWith('"') && trimmed.endsWith('"') && trimmed.slice(1, -1).includes('"')) {
@@ -661,10 +660,10 @@ var GIT_WORD_PATTERN = /\bgit\b/i;
 var TEXT_RELOCATION_MARKER_WITHOUT_C_PATTERN = /(^|\s)(--git-dir=?|--work-tree=?|-execdir)|(^|[\s;&|(){}])(cd|chdir|pushd)([\s;&|]|$)|(^|[\s;&|(){}])(GIT_DIR|GIT_WORK_TREE|GIT_COMMON_DIR|GIT_INDEX_FILE|GIT_EXEC_PATH|PATH)\+?=/;
 var TEXT_RELOCATION_MARKER_PATTERN = /(^|\s)(-C|--git-dir=?|--work-tree=?|-execdir)|(^|[\s;&|(){}])(cd|chdir|pushd)([\s;&|]|$)|(^|[\s;&|(){}])(GIT_DIR|GIT_WORK_TREE|GIT_COMMON_DIR|GIT_INDEX_FILE|GIT_EXEC_PATH|PATH)\+?=/;
 var GIT_PROGRAM_ENV_KEYS = /* @__PURE__ */ new Set(["GIT_EXEC_PATH", "PATH"]);
-function recordEnvAssignment(token, state) {
+function recordEnvAssignment(token, state, shell) {
   const rawKey = leadingEnvAssignmentKey(token.text);
   if (rawKey === null) return;
-  const key = process.platform === "win32" && getShellConfiguration().shell !== "bash" ? rawKey.toUpperCase() : rawKey;
+  const key = process.platform === "win32" && shell !== "bash" ? rawKey.toUpperCase() : rawKey;
   if (GIT_PROGRAM_ENV_KEYS.has(key) || GIT_UNRESOLVABLE_ENV_KEYS.has(key) || GIT_NUMBERED_CONFIG_ENV_PATTERN.test(key)) {
     state.unresolved = true;
     return;
@@ -704,7 +703,7 @@ function recordChdirValue(value, state) {
   state.relocations.push({ target: value.text, kind: "cwd" });
 }
 __name(recordChdirValue, "recordChdirValue");
-function consumeEnvWrapper(run, start, state) {
+function consumeEnvWrapper(run, start, state, shell) {
   let index = start + 1;
   while (index < run.length) {
     const token = run[index];
@@ -783,7 +782,7 @@ function consumeEnvWrapper(run, start, state) {
       continue;
     }
     if (leadingEnvAssignmentKey(token.text) !== null) {
-      recordEnvAssignment(token, state);
+      recordEnvAssignment(token, state, shell);
       index++;
       continue;
     }
@@ -797,7 +796,7 @@ function consumeEnvWrapper(run, start, state) {
   return { next: index };
 }
 __name(consumeEnvWrapper, "consumeEnvWrapper");
-function consumeSudoWrapper(run, start, state) {
+function consumeSudoWrapper(run, start, state, shell) {
   let index = start + 1;
   while (index < run.length) {
     const token = run[index];
@@ -807,7 +806,7 @@ function consumeSudoWrapper(run, start, state) {
       continue;
     }
     if (leadingEnvAssignmentKey(token.text) !== null) {
-      recordEnvAssignment(token, state);
+      recordEnvAssignment(token, state, shell);
       index++;
       continue;
     }
@@ -1053,8 +1052,8 @@ function readDefinition(run) {
   return { name, body: joinArgvTexts(bodyTokens) };
 }
 __name(readDefinition, "readDefinition");
-function analyzeRun(run, platform = process.platform) {
-  if (platform === "win32" && getShellConfiguration().shell !== "bash") {
+function analyzeRun(run, shell, platform = process.platform) {
+  if (platform === "win32" && shell !== "bash") {
     run = splitFusedWindowsChdirs(run);
   }
   const state = { relocations: [], unresolved: false };
@@ -1066,7 +1065,7 @@ function analyzeRun(run, platform = process.platform) {
   while (index < run.length) {
     const token = run[index];
     if (leadingEnvAssignmentKey(token.text) !== null) {
-      recordEnvAssignment(token, state);
+      recordEnvAssignment(token, state, shell);
       assignments++;
       index++;
       continue;
@@ -1082,16 +1081,17 @@ function analyzeRun(run, platform = process.platform) {
     }
     if (EXPORT_BUILTINS.has(program)) {
       const operands = run.slice(index + 1);
-      for (const operand of operands) recordEnvAssignment(operand, state);
+      for (const operand of operands)
+        recordEnvAssignment(operand, state, shell);
       return { kind: "export", state, operands };
     }
-    if (platform === "win32" && getShellConfiguration().shell !== "bash" && (program === "path" || program === "doskey")) {
+    if (platform === "win32" && shell !== "bash" && (program === "path" || program === "doskey")) {
       state.unresolved = true;
       return { kind: "export", state, operands: [] };
     }
-    if (platform === "win32" && getShellConfiguration().shell !== "bash" && (program === "set" || program === "setx")) {
+    if (platform === "win32" && shell !== "bash" && (program === "set" || program === "setx")) {
       const operands = run.slice(index + 1);
-      if (program === "setx" || getShellConfiguration().shell === "powershell") {
+      if (program === "setx" || shell === "powershell") {
         state.unresolved = true;
         return { kind: "export", state, operands: [] };
       }
@@ -1100,7 +1100,7 @@ function analyzeRun(run, platform = process.platform) {
           state.unresolved = true;
           return { kind: "export", state, operands: [] };
         }
-        recordEnvAssignment(operand, state);
+        recordEnvAssignment(operand, state, shell);
       }
       return { kind: "export", state, operands };
     }
@@ -1113,11 +1113,12 @@ function analyzeRun(run, platform = process.platform) {
       }
     }
     if (program === "env") {
-      const scan = consumeEnvWrapper(run, index, state);
+      const scan = consumeEnvWrapper(run, index, state, shell);
       if (scan.undecidable) return { kind: "undecidable" };
       if (scan.payload !== void 0) {
         return {
           kind: "payload",
+          shell,
           payload: scan.payload,
           state,
           propagatesCwd: false
@@ -1127,7 +1128,7 @@ function analyzeRun(run, platform = process.platform) {
       continue;
     }
     if (program === "sudo") {
-      index = consumeSudoWrapper(run, index, state).next;
+      index = consumeSudoWrapper(run, index, state, shell).next;
       continue;
     }
     if (program === "timeout") {
@@ -1143,6 +1144,7 @@ function analyzeRun(run, platform = process.platform) {
       }
       return {
         kind: "payload",
+        shell,
         payload: joinTokenTexts(payloadTokens),
         state,
         // `eval` runs in the current shell, so a `cd` inside the payload
@@ -1161,6 +1163,7 @@ function analyzeRun(run, platform = process.platform) {
       if (scan.kind === "dynamic") return { kind: "undecidable" };
       return {
         kind: "payload",
+        shell: "bash",
         payload: scan.payload,
         state,
         propagatesCwd: false,
@@ -1176,7 +1179,7 @@ function analyzeRun(run, platform = process.platform) {
     if (program === "git") {
       return { kind: "git", tokens: run.slice(index), state };
     }
-    if (program === "cd" || program === "pushd" || program === "popd" || platform === "win32" && program === "chdir" || platform === "win32" && getShellConfiguration().shell === "powershell" && POWERSHELL_LOCATION_PROGRAMS.has(program)) {
+    if (program === "cd" || program === "pushd" || program === "popd" || platform === "win32" && program === "chdir" || platform === "win32" && shell === "powershell" && POWERSHELL_LOCATION_PROGRAMS.has(program)) {
       const variant = program === "chdir" || program === "set-location" || program === "sl" ? "cd" : program === "push-location" || program === "pushd" ? "pushd" : program === "pop-location" || program === "popd" ? "popd" : "cd";
       const rest = run.slice(index + 1);
       const namedIndex = rest.findIndex(
@@ -1688,6 +1691,7 @@ async function evaluateCommandWithCwd(command, startCwd, entryCwd, context, dept
   const relinkedTargets = scope.relink.targets;
   const activeContext = /* @__PURE__ */ __name(() => exported.relocations.length > 0 || exported.unresolved ? {
     canonicalEffectiveCwd: context.canonicalEffectiveCwd,
+    shell: context.shell,
     ambientRelocations: [
       ...context.ambientRelocations,
       ...exported.relocations
@@ -1727,12 +1731,13 @@ async function evaluateCommandWithCwd(command, startCwd, entryCwd, context, dept
     const prefix = { relocations: [], unresolved: false };
     for (const token of run.slice(0, programIndex)) {
       if (leadingEnvAssignmentKey(token.text) !== null) {
-        recordEnvAssignment(token, prefix);
+        recordEnvAssignment(token, prefix, context.shell);
       }
     }
     const base = activeContext();
     const bodyContext = prefix.relocations.length > 0 || prefix.unresolved ? {
       canonicalEffectiveCwd: base.canonicalEffectiveCwd,
+      shell: base.shell,
       ambientRelocations: [
         ...base.ambientRelocations,
         ...prefix.relocations
@@ -1768,7 +1773,7 @@ async function evaluateCommandWithCwd(command, startCwd, entryCwd, context, dept
     return void 0;
   }, "invokeDefinedBody");
   const platformNow = process.platform;
-  const shellNow = getShellConfiguration().shell;
+  const shellNow = context.shell;
   const windowsNative = platformNow === "win32" && shellNow !== "bash";
   const strippedCommand = windowsNative ? command : stripHeredocBodies(command);
   if (containsCmdRewriteSyntax(strippedCommand, platformNow, shellNow)) {
@@ -1936,7 +1941,7 @@ ${segment}`;
         if (denial) return { denial, cwdAfter: trackedCwd };
         continue;
       }
-      const analysis = analyzeRun(run, platformNow);
+      const analysis = analyzeRun(run, shellNow, platformNow);
       switch (analysis.kind) {
         case "cd": {
           const target = analysis.target === void 0 ? void 0 : expandShellLocals(analysis.target, shellLocals);
@@ -1966,6 +1971,7 @@ ${segment}`;
           const inherited = activeContext();
           const ambient = {
             canonicalEffectiveCwd: inherited.canonicalEffectiveCwd,
+            shell: analysis.shell,
             ambientRelocations: [
               ...inherited.ambientRelocations,
               ...analysis.state.relocations
@@ -2117,7 +2123,7 @@ ${segment}`;
               continue;
             }
             const pending = shellLocals.get(operand.text);
-            if (pending) recordEnvAssignment(pending, exported);
+            if (pending) recordEnvAssignment(pending, exported, shellNow);
             if (GIT_DIR_ENV_KEYS.has(operand.text) || GIT_WORK_TREE_ENV_KEYS.has(operand.text) || GIT_UNRESOLVABLE_ENV_KEYS.has(operand.text) || GIT_PROGRAM_ENV_KEYS.has(operand.text)) {
               exportedNames.add(operand.text);
             }
@@ -2218,7 +2224,7 @@ ${segment}`;
                 const key = leadingEnvAssignmentKey(token.text);
                 if (key === null) continue;
                 if (exportedNames.has(key)) {
-                  recordEnvAssignment(token, exported);
+                  recordEnvAssignment(token, exported, shellNow);
                   continue;
                 }
                 const previous = shellLocals.get(key);
@@ -2284,7 +2290,7 @@ ${segment}`;
   };
 }
 __name(evaluateCommandWithCwd, "evaluateCommandWithCwd");
-async function evaluateBuiltInGuard(request) {
+async function evaluateBuiltInGuard(request, shell) {
   if (!SHELL_EXECUTING_TOOL_NAMES.has(request.toolName)) return { allowed: true };
   const command = request.arguments["command"];
   if (typeof command !== "string") return { allowed: true };
@@ -2338,6 +2344,7 @@ async function evaluateBuiltInGuard(request) {
     startDirectory,
     {
       canonicalEffectiveCwd,
+      shell,
       ambientRelocations: [],
       ambientUnresolved: false
     },
@@ -2346,13 +2353,21 @@ async function evaluateBuiltInGuard(request) {
   return denial ?? { allowed: true };
 }
 __name(evaluateBuiltInGuard, "evaluateBuiltInGuard");
-function createDaemonToolGuard(externalGuard) {
+function createDaemonToolGuard(externalGuard, shellConfiguration) {
   return async (request) => {
     const trusted = request;
     if (typeof trusted.effectiveCwd !== "string") {
       throw new Error("Daemon tool guard requires trusted workspace context.");
     }
-    const builtInDecision = await evaluateBuiltInGuard(trusted);
+    if (!shellConfiguration)
+      return {
+        allowed: false,
+        reason: "Daemon tool guard requires a runtime shell configuration."
+      };
+    const builtInDecision = await evaluateBuiltInGuard(
+      trusted,
+      shellConfiguration.shell
+    );
     if (!builtInDecision.allowed || !externalGuard) return builtInDecision;
     if (trusted.promptId === void 0) {
       return { allowed: false, reason: PROMPTLESS_PROVIDER_DENIAL };