pushary 1.9.43 → 1.9.45

package/dist/{chunk-RXXKFM22.js → chunk-K7EGWMDU.js}

@@ -388,9 +388,9 @@ var CANONICAL_COMMAND_KEYS = ["command"];
 var SHELL_TOOLS = /* @__PURE__ */ new Set([SHELL_TOOL, POWERSHELL_TOOL]);
 var PATH_TOOLS = /* @__PURE__ */ new Set(["Write", "Edit", "MultiEdit", "NotebookEdit", "Read"]);
 var PHONE_ANSWERED_TOOLS = /* @__PURE__ */ new Set(["AskUserQuestion", "ExitPlanMode"]);
-var firstString = (record2, keys) => {
-  for (const key of keys) {
-    const value = record2[key];
+var firstString = (record3, keys2) => {
+  for (const key of keys2) {
+    const value = record3[key];
     if (typeof value === "string" && value.length > 0) return value;
   }
   return void 0;
@@ -406,12 +406,12 @@ var BLANK_TASK_INPUT_TOOL = "TaskInput";
 var typesText = (value) => typeof value === "string" && value.trim().length > 0;
 var taskIdOf = (control, toolInput) => typeof toolInput[control.taskKey] === "string" ? { task_id: toolInput[control.taskKey] } : {};
 var typedIntoTask = (control, toolInput) => {
-  const text = toolInput[control.inputKey];
-  if (typesText(text)) return { tool: SHELL_TOOL, input: { command: text }, unreadable: false };
-  if (text !== void 0 && typeof text !== "string") return { tool: control.name, input: toolInput, unreadable: true };
+  const text2 = toolInput[control.inputKey];
+  if (typesText(text2)) return { tool: SHELL_TOOL, input: { command: text2 }, unreadable: false };
+  if (text2 !== void 0 && typeof text2 !== "string") return { tool: control.name, input: toolInput, unreadable: true };
   return {
     tool: BLANK_TASK_INPUT_TOOL,
-    input: { ...taskIdOf(control, toolInput), input: text ?? "" },
+    input: { ...taskIdOf(control, toolInput), input: text2 ?? "" },
     unreadable: false
   };
 };
@@ -838,10 +838,10 @@ var secretRedactionRules = (shapes) => [
 var SECRET_REDACTION_RULES = secretRedactionRules(DISPLAYED_SECRET_SHAPES);
 var CUT_OFF_TEXT_REDACTION_RULES = secretRedactionRules(CUT_OFF_SECRET_SHAPES);
 var HIGH_ENTROPY_RULE = { pattern: /[A-Za-z0-9+/]{40,}={0,2}/g, replacement: "[redacted]" };
-var applyRedactionRules = (rules, text) => rules.reduce((acc, rule) => acc.replace(rule.pattern, rule.replacement), text);
-var redactSecrets = (text) => applyRedactionRules(SECRET_REDACTION_RULES, text);
-var redactSecretsFromContent = (text) => applyRedactionRules(CUT_OFF_TEXT_REDACTION_RULES, text);
-var redactSecretsDeep = (text) => redactSecrets(text).replace(HIGH_ENTROPY_RULE.pattern, HIGH_ENTROPY_RULE.replacement);
+var applyRedactionRules = (rules, text2) => rules.reduce((acc, rule) => acc.replace(rule.pattern, rule.replacement), text2);
+var redactSecrets = (text2) => applyRedactionRules(SECRET_REDACTION_RULES, text2);
+var redactSecretsFromContent = (text2) => applyRedactionRules(CUT_OFF_TEXT_REDACTION_RULES, text2);
+var redactSecretsDeep = (text2) => redactSecrets(text2).replace(HIGH_ENTROPY_RULE.pattern, HIGH_ENTROPY_RULE.replacement);
 
 // ../contracts/src/shell-analysis.ts
 var SHELL_WORD_SEPARATOR = /[ \t\n]/;
@@ -880,16 +880,16 @@ var splitShellSegments = (command) => {
   let consumed = -1;
   let readsPipe = false;
   for (const lexeme of lexemes) {
-    const { index, text, quote, kind } = lexeme;
+    const { index, text: text2, quote, kind } = lexeme;
     if (index <= consumed || kind !== "text" || quote === "'") continue;
-    if (text === "`" || text === "$" && command[index + 1] === "(") return null;
+    if (text2 === "`" || text2 === "$" && command[index + 1] === "(") return null;
     if (quote !== null) continue;
-    if (UNDECOMPOSABLE.has(text)) return null;
-    if (!SEGMENT_SEPARATORS.has(text)) continue;
-    const doubled = DOUBLED_SEPARATORS.has(text) && command[index + 1] === text;
+    if (UNDECOMPOSABLE.has(text2)) return null;
+    if (!SEGMENT_SEPARATORS.has(text2)) continue;
+    const doubled = DOUBLED_SEPARATORS.has(text2) && command[index + 1] === text2;
     consumed = index + (doubled ? 1 : 0);
     segments.push({ text: trimShellWhitespace(command.slice(start, index)), readsPipe });
-    readsPipe = text === PIPE && !doubled;
+    readsPipe = text2 === PIPE && !doubled;
     start = consumed + 1;
   }
   segments.push({ text: trimShellWhitespace(command.slice(start)), readsPipe });
@@ -987,10 +987,10 @@ var shellVisibleText = (command) => {
   const lexemes = scanShell(command);
   if (lexemes === null) return null;
   let visible = "";
-  for (const { text, quote, kind } of lexemes) {
+  for (const { text: text2, quote, kind } of lexemes) {
     if (kind === "escape" && quote === '"') return null;
-    const literal = kind === "text" && (quote === "'" || quote === '"' && LITERAL_IN_DOUBLE_QUOTES.has(text));
-    visible += literal ? "_".repeat(text.length) : text;
+    const literal = kind === "text" && (quote === "'" || quote === '"' && LITERAL_IN_DOUBLE_QUOTES.has(text2));
+    visible += literal ? "_".repeat(text2.length) : text2;
   }
   return visible;
 };
@@ -1006,14 +1006,14 @@ var shellWordsOf = (command) => {
   const lexemes = scanShell(command);
   if (lexemes === null) return null;
   const words = [];
-  let text = "";
+  let text2 = "";
   let plain = true;
   let expands = false;
   let comment = false;
   let started = false;
   const finishWord = () => {
-    if (started) words.push({ text, plain, expands, comment });
-    text = "";
+    if (started) words.push({ text: text2, plain, expands, comment });
+    text2 = "";
     plain = true;
     expands = false;
     comment = false;
@@ -1026,7 +1026,7 @@ var shellWordsOf = (command) => {
       continue;
     }
     if (lexeme.kind === "escape") {
-      text += lexeme.text.slice(1);
+      text2 += lexeme.text.slice(1);
       plain = false;
       started = true;
       continue;
@@ -1037,7 +1037,7 @@ var shellWordsOf = (command) => {
     }
     comment ||= lexeme.quote === null && !started && lexeme.text === "#";
     expands ||= lexeme.quote !== "'" && lexeme.text === "$";
-    text += lexeme.text;
+    text2 += lexeme.text;
     started = true;
   }
   finishWord();
@@ -1094,40 +1094,40 @@ var opensAHereString = (source, index) => {
   return source.charAt(index) === HERE_STRING_SIGIL && (SINGLE_QUOTES.has(quote) || DOUBLE_QUOTES.has(quote)) && HERE_STRING_HEADER_REST.test(source.slice(index + 2));
 };
 var singleQuotedTextAt = (source, open) => {
-  let text = "";
+  let text2 = "";
   for (let index = open + 1; index < source.length; index += 1) {
     const char = source.charAt(index);
     if (!SINGLE_QUOTES.has(char)) {
-      text += char;
+      text2 += char;
     } else if (SINGLE_QUOTES.has(source.charAt(index + 1))) {
-      text += char;
+      text2 += char;
       index += 1;
     } else {
-      return { end: index + 1, text, expands: false, nested: [] };
+      return { end: index + 1, text: text2, expands: false, nested: [] };
     }
   }
   return null;
 };
 var expandableTextUntil = (source, start, closesAt, nesting) => {
-  let text = "";
+  let text2 = "";
   let expands = false;
   const nested = [];
   for (let index = start; index < source.length; index += 1) {
     const char = source.charAt(index);
-    if (closesAt(index)) return { end: index + 1, text, expands, nested };
+    if (closesAt(index)) return { end: index + 1, text: text2, expands, nested };
     if (char === ESCAPE || DOUBLE_QUOTES.has(char) && DOUBLE_QUOTES.has(source.charAt(index + 1))) {
-      text += source.charAt(index + 1);
+      text2 += source.charAt(index + 1);
       index += 1;
     } else if (source.startsWith(SUBEXPRESSION_OPEN, index)) {
       const group = groupAt(source, index + SUBEXPRESSION_OPEN.length, ")", nesting + 1);
       if (group === null) return null;
       nested.push(group.inner);
-      text += SUBEXPRESSION_PLACEHOLDER;
+      text2 += SUBEXPRESSION_PLACEHOLDER;
       expands = true;
       index = group.end - 1;
     } else {
       expands ||= opensAVariable(source, index);
-      text += char;
+      text2 += char;
     }
   }
   return null;
@@ -1626,12 +1626,12 @@ var parameterValueOf = (command, fullName, shortestPrefix) => {
 };
 var operandTextsOf = (command) => command.args.flatMap((arg) => {
   const parameter = parameterOf(arg);
-  const text = parameter === null ? arg.text : parameter.value;
-  return text === void 0 ? [] : text.split(POWERSHELL_ARRAY_SEPARATOR);
+  const text2 = parameter === null ? arg.text : parameter.value;
+  return text2 === void 0 ? [] : text2.split(POWERSHELL_ARRAY_SEPARATOR);
 });
 var positionalTextsOf = (command) => command.args.filter((arg) => parameterOf(arg) === null).map((arg) => arg.text);
 var firstOperandOf = (command, isSwitch) => command.args.find((arg) => !isSwitch.test(arg.text))?.text;
-var namesASecretPath = (text, judge) => judge.namesASecretFile(fileNameOf(text.trim()));
+var namesASecretPath = (text2, judge) => judge.namesASecretFile(fileNameOf(text2.trim()));
 var isAssignmentTarget = (word) => POWERSHELL_ASSIGNMENT_TARGET.test(word.text) || word.text === POWERSHELL_ARRAY_SEPARATOR;
 var wordsAfterAnAssignment = (words) => {
   const operator = words.findIndex((word) => isPowerShellAssignmentOperator(word));
@@ -1690,7 +1690,7 @@ var copyDestinationOf = (command) => {
 };
 var writesASecretFileFromPowerShell = (command, judge) => {
   if (command.cmdlet !== COPY_ITEM) {
-    return POWERSHELL_FILE_WRITERS.has(command.cmdlet) && operandTextsOf(command).some((text) => namesASecretPath(text, judge));
+    return POWERSHELL_FILE_WRITERS.has(command.cmdlet) && operandTextsOf(command).some((text2) => namesASecretPath(text2, judge));
   }
   const destination = copyDestinationOf(command);
   return destination !== void 0 && namesASecretPath(destination, judge);
@@ -1698,7 +1698,7 @@ var writesASecretFileFromPowerShell = (command, judge) => {
 var formatsADisk = (command) => DISK_ERASERS.has(command.cmdlet);
 var changesAWindowsService = (command) => {
   if (WINDOWS_SERVICE_CHANGERS.has(command.cmdlet)) return true;
-  const [verb, ...operands] = command.args.map((arg) => arg.text.toLowerCase()).filter((text) => !text.startsWith(REMOTE_MACHINE_PREFIX));
+  const [verb, ...operands] = command.args.map((arg) => arg.text.toLowerCase()).filter((text2) => !text2.startsWith(REMOTE_MACHINE_PREFIX));
   if (command.name === SERVICE_CONTROL_PROGRAM) return SERVICE_CONTROL_VERBS_THAT_CHANGE.has(verb ?? "");
   return NET_PROGRAMS.has(command.name) && (NET_VERBS_THAT_CHANGE_A_SERVICE.has(verb ?? "") || verb === NET_START && operands.length > 0);
 };
@@ -1722,7 +1722,7 @@ var runsTextAsCode = (stage, judge) => {
   return SCRIPTBLOCK_FROM_TEXT.test(stage.source) || command !== null && (command.cmdlet === INVOKE_EXPRESSION || stage.readsAPipe && judge.runsWhatItReads(posixInvocationOf(command)));
 };
 var runsFetchedPowerShellCode = (stages, judge) => stages.some((stage) => fetchesWithPowerShell(stage, judge)) && stages.some((stage) => runsTextAsCode(stage, judge));
-var downloadedFileNameOf = (text) => fileNameOf(text.replace(URL_QUERY_OR_FRAGMENT, "")).toLowerCase();
+var downloadedFileNameOf = (text2) => fileNameOf(text2.replace(URL_QUERY_OR_FRAGMENT, "")).toLowerCase();
 var downloadedFileNamesOf = (stages, judge) => new Set(stages.filter((stage) => fetchesWithPowerShell(stage, judge)).flatMap((stage) => {
   const command = powerShellCommandOf(stage);
   return command === null ? [] : operandTextsOf(command).map(downloadedFileNameOf);
@@ -1754,12 +1754,12 @@ var hostedPowerShellScriptOf = (command) => {
   if (!POWERSHELL_HOSTS.has(command.name)) return { kind: "none" };
   const texts = command.args.map((arg) => arg.text);
   for (let index = 0; index < texts.length; index += 1) {
-    const text = (texts[index] ?? "").trim();
-    if (!text) continue;
-    if (!POWERSHELL_HOST_SWITCH.test(text)) {
+    const text2 = (texts[index] ?? "").trim();
+    if (!text2) continue;
+    if (!POWERSHELL_HOST_SWITCH.test(text2)) {
       return command.name === WINDOWS_POWERSHELL_HOST ? { kind: "script", script: texts.slice(index).join(" ") } : { kind: "none" };
     }
-    const option = text.toLowerCase().replace(POWERSHELL_HOST_SWITCH_PREFIX, "");
+    const option = text2.toLowerCase().replace(POWERSHELL_HOST_SWITCH_PREFIX, "");
     if (option && (POWERSHELL_HOST_ENCODED_PARAMETER.startsWith(option) || option === POWERSHELL_HOST_ENCODED_ALIAS)) {
       return { kind: "incomplete", reason: "encoded_command" };
     }
@@ -1809,9 +1809,9 @@ var wslCommandWordsOf = (command) => {
   const texts = command.args.map((arg) => arg.text);
   let index = 0;
   while (index < texts.length && POSIX_FLAG.test(texts[index] ?? "")) {
-    const text = texts[index] ?? "";
-    index += WSL_OPTIONS_WITH_A_VALUE.has(text) ? 2 : 1;
-    if (WSL_COMMAND_MARKERS.has(text)) break;
+    const text2 = texts[index] ?? "";
+    index += WSL_OPTIONS_WITH_A_VALUE.has(text2) ? 2 : 1;
+    if (WSL_COMMAND_MARKERS.has(text2)) break;
   }
   return index < texts.length ? texts.slice(index) : void 0;
 };
@@ -2010,8 +2010,8 @@ var quotedToken = (source, start, reading, inside) => {
   }
   if (swallowsABacktick(source, start, end, reading.lexicon)) return "uncertain";
   const quote = source.charAt(start);
-  const text = syntax.content === "hidden" ? STRING_PLACEHOLDER : visibleQuotedText(source.slice(start + opener.length, end - opener.length).replaceAll(quote + quote, quote));
-  return { text, end, insideExecutableComment: inside };
+  const text2 = syntax.content === "hidden" ? STRING_PLACEHOLDER : visibleQuotedText(source.slice(start + opener.length, end - opener.length).replaceAll(quote + quote, quote));
+  return { text: text2, end, insideExecutableComment: inside };
 };
 var lineCommentEnd = (source, start, lexicon) => {
   const terminator = endOfRun(source, start, (character) => !isLineCommentTerminator(character));
@@ -2061,9 +2061,9 @@ var dollarToken = (source, start, lexicon, inside) => {
 };
 var numberToken = (source, start, inside) => {
   const end = endOfRun(source, start, isWordCharacter);
-  const text = source.slice(start, end);
-  if (!DECIMAL_DIGITS.test(text) && dollarQuoteDelimiterAt(source, end) !== void 0) return "uncertain";
-  return { text, end, insideExecutableComment: inside };
+  const text2 = source.slice(start, end);
+  if (!DECIMAL_DIGITS.test(text2) && dollarQuoteDelimiterAt(source, end) !== void 0) return "uncertain";
+  return { text: text2, end, insideExecutableComment: inside };
 };
 var identifierToken = (source, start, inside) => {
   const end = endOfRun(source, start, isIdentifierPart);
@@ -2271,13 +2271,13 @@ var splitReading = (args, index, clusterBefore, attached) => {
   return { kind: "split", prefix, value: args[index + 1], rest: index + 2 };
 };
 var requiredValueStep = (args, index) => index + 1 < args.length ? nextOption(index + 2) : finished(EXITS);
-var shortOptionStep = (args, index, text, options) => {
-  for (let position = 1; position < text.length; position += 1) {
-    const letter = text.charAt(position);
+var shortOptionStep = (args, index, text2, options) => {
+  for (let position = 1; position < text2.length; position += 1) {
+    const letter = text2.charAt(position);
     if (options.switches.has(letter)) continue;
     if (!options.withAValue.has(letter)) return finished(EXITS);
-    const attached = text.slice(position + 1);
-    if (letter === SPLIT_STRING_LETTER) return finished(splitReading(args, index, text.slice(0, position), attached === "" ? void 0 : attached));
+    const attached = text2.slice(position + 1);
+    if (letter === SPLIT_STRING_LETTER) return finished(splitReading(args, index, text2.slice(0, position), attached === "" ? void 0 : attached));
     return attached === "" ? requiredValueStep(args, index) : nextOption(index + 1);
   }
   return nextOption(index + 1);
@@ -2288,8 +2288,8 @@ var gnuLongOptionAbbreviatedBy = (name, options) => {
   const candidates = options.filter((option) => option.name.startsWith(name));
   return candidates.length === 1 ? candidates[0] : void 0;
 };
-var longOptionStep = (args, index, text, options) => {
-  const body = text.slice(LONG_OPTION_PREFIX.length);
+var longOptionStep = (args, index, text2, options) => {
+  const body = text2.slice(LONG_OPTION_PREFIX.length);
   const separator = body.indexOf(ASSIGNMENT_SEPARATOR);
   const attached = separator === -1 ? void 0 : body.slice(separator + 1);
   const option = gnuLongOptionAbbreviatedBy(separator === -1 ? body : body.slice(0, separator), options);
@@ -2319,7 +2319,7 @@ var runsSomething = (reading) => reading.kind === "command" || reading.kind ===
 var sameEnvReading = (left, right) => {
   if (left.kind === "command" && right.kind === "command") return left.start === right.start;
   if (left.kind !== "split" || right.kind !== "split") return false;
-  return left.rest === right.rest && left.prefix.length === right.prefix.length && left.prefix.every((text, position) => text === right.prefix[position]) && left.value?.text === right.value?.text && left.value?.expands === right.value?.expands;
+  return left.rest === right.rest && left.prefix.length === right.prefix.length && left.prefix.every((text2, position) => text2 === right.prefix[position]) && left.value?.text === right.value?.text && left.value?.expands === right.value?.expands;
 };
 var envReadingOf = (args) => {
   const readings = ENV_FLAVORS.map((flavor) => flavorReadingOf(args, flavor));
@@ -2363,8 +2363,8 @@ var clusterReadingOf = (cluster, syntax) => {
     endsOptions: [...letters].some((letter) => syntax.lettersThatEndOptions.has(letter))
   };
 };
-var endsOptionParsing = (text) => text === END_OF_OPTIONS2 || text === LONE_DASH2;
-var isAnOperand = (text) => !text.startsWith("-") && !text.startsWith("+");
+var endsOptionParsing = (text2) => text2 === END_OF_OPTIONS2 || text2 === LONE_DASH2;
+var isAnOperand = (text2) => !text2.startsWith("-") && !text2.startsWith("+");
 var optionValueIsUnreadable = (value) => value === void 0 || value.expands;
 var shellCommandStringOf = (shell, args) => {
   const syntax = SHELL_OPTION_SYNTAX.get(shell);
@@ -2463,6 +2463,22 @@ var AUTH_REJECTION_REASONS = [
 
 // ../contracts/src/setup-wire.ts
 var PAIR_TTL_SECONDS = 900;
+var SETUP_ABORT_REASONS = [
+  "no-key",
+  "invalid-key",
+  "key-refused",
+  "pairing-cancelled",
+  "pairing-failed",
+  "login-rejected",
+  "no-agents-detected",
+  "interrupted",
+  "crashed"
+];
+var isSetupAbortReason = (value) => typeof value === "string" && SETUP_ABORT_REASONS.includes(value);
+var CODEX_TRUST_OUTCOMES = ["pretrusted", "manual", "verified", "unverified"];
+var isCodexTrustOutcome = (value) => typeof value === "string" && CODEX_TRUST_OUTCOMES.includes(value);
+var COMPUTER_OS_VALUES = ["mac", "windows", "linux"];
+var isComputerOs = (value) => typeof value === "string" && COMPUTER_OS_VALUES.includes(value);
 var computerOsOfPlatform = (platform) => {
   switch (platform) {
     case "darwin":
@@ -2475,6 +2491,10 @@ var computerOsOfPlatform = (platform) => {
       return null;
   }
 };
+var SETUP_STEP_MAX_LENGTH = 64;
+var SETUP_STEP_PATTERN = /^[a-z0-9][a-z0-9:_-]*$/;
+var isSetupStep = (value) => typeof value === "string" && value.length <= SETUP_STEP_MAX_LENGTH && SETUP_STEP_PATTERN.test(value);
+var isProcessExitCode = (value) => typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 255;
 var SETUP_AGENT_CHOICES = [
   "claude_code",
   "codex",
@@ -2487,10 +2507,99 @@ var SETUP_AGENT_CHOICES = [
   ...COMPATIBLE_AGENT_TYPES,
   "custom"
 ];
+var isSetupAgentChoice = (value) => typeof value === "string" && SETUP_AGENT_CHOICES.includes(value);
+var isSetupAgentCount = (value) => typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= SETUP_AGENT_CHOICES.length;
+var readSetupAgentChoices = (value) => Array.isArray(value) ? [...new Set(value.filter(isSetupAgentChoice))] : [];
 var isComputerAgent = (agent) => agent !== "custom";
 var NO_PAIRING_COMPUTER = { computerName: null, os: null, agents: null };
+var SETUP_AGENT_FAILURE_KINDS = [
+  "config-unparseable",
+  "config-unreadable",
+  "installer-error",
+  "not-wired",
+  "app-account-mismatch"
+];
+var isSetupAgentFailureKind = (value) => typeof value === "string" && SETUP_AGENT_FAILURE_KINDS.includes(value);
+var SETUP_AGENT_FAILURE_CODES = ["npm-missing", "npm-global-prefix-denied", "npm-file-in-use", "npm-install-failed", "config-write-failed"];
+var SETUP_AGENT_FAILURE_STAGES = ["runtime-install", "config-read", "config-write", "hook-validation", "account-check", "unknown"];
+var isSetupAgentFailureStage = (value) => typeof value === "string" && SETUP_AGENT_FAILURE_STAGES.includes(value);
+var SETUP_AGENT_FAILURE_REMEDIES = ["retry-agent", "install-node", "fix-npm-prefix", "close-node-programs", "match-mac-account"];
+var isSetupAgentFailureCode = (value) => typeof value === "string" && SETUP_AGENT_FAILURE_CODES.includes(value);
+var isSetupAgentFailureRemedy = (value) => typeof value === "string" && SETUP_AGENT_FAILURE_REMEDIES.includes(value);
+var isSetupAgentFailure = (value) => {
+  if (typeof value !== "object" || value === null) return false;
+  return "agent" in value && isSetupAgentChoice(value.agent) && "kind" in value && isSetupAgentFailureKind(value.kind);
+};
+var firstFailurePerAgent = (failures) => failures.filter((failure, index) => failures.findIndex((other) => other.agent === failure.agent) === index);
+var safeSetupFailure = (failure) => {
+  const diagnosticCode = "diagnosticCode" in failure ? failure.diagnosticCode : void 0;
+  const remedy = "remedy" in failure ? failure.remedy : void 0;
+  const stage = "stage" in failure ? failure.stage : void 0;
+  return {
+    agent: failure.agent,
+    kind: failure.kind,
+    ...isSetupAgentFailureCode(diagnosticCode) ? { diagnosticCode } : {},
+    ...isSetupAgentFailureRemedy(remedy) ? { remedy } : {},
+    ...isSetupAgentFailureStage(stage) ? { stage } : {}
+  };
+};
+var readSetupAgentFailures = (value) => Array.isArray(value) ? firstFailurePerAgent(value.filter(isSetupAgentFailure).map(safeSetupFailure)) : [];
+var SETUP_CLOSING_REASONS = [
+  "configured-nothing",
+  "agents-failed",
+  "stale-environment-key",
+  "control-unready",
+  "synthetic-answer",
+  "phone-unverified",
+  "roundtrip-unanswered",
+  "phone-skipped",
+  "complete",
+  "plan-inactive",
+  "key-unverified"
+];
+var isSetupClosingReason = (value) => typeof value === "string" && SETUP_CLOSING_REASONS.includes(value);
+var SETUP_CONTROL_FAILURE_STAGES = [
+  "package-install",
+  "service-install",
+  "daemon-start",
+  "remote-proof",
+  "server-readiness",
+  "lifecycle",
+  "unsupported"
+];
+var isSetupControlFailureStage = (value) => typeof value === "string" && SETUP_CONTROL_FAILURE_STAGES.includes(value);
+var SETUP_CONNECT_OUTCOMES = ["answered", "delivered", "unreachable", "skipped"];
+var isSetupConnectOutcome = (value) => typeof value === "string" && SETUP_CONNECT_OUTCOMES.includes(value);
+var CLI_VERSION_MAX_LENGTH = 64;
+var CLI_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/;
+var isCliVersion = (value) => typeof value === "string" && value.length <= CLI_VERSION_MAX_LENGTH && CLI_VERSION_PATTERN.test(value);
 var SETUP_CONNECT_MODES = ["app", "browser", "web", "none"];
 var isSetupConnectMode = (value) => typeof value === "string" && SETUP_CONNECT_MODES.includes(value);
+var SETUP_KEY_CHECKS = ["ok", "malformed", "rejected", "locked", "unreachable", "skipped", "unknown"];
+var isSetupKeyCheck = (value) => typeof value === "string" && SETUP_KEY_CHECKS.includes(value);
+var readOptional = (value, isValid) => isValid(value) ? value : null;
+var isBoolean = (value) => typeof value === "boolean";
+var readSetupOutcomeProperties = (body) => {
+  const agentFailures = readSetupAgentFailures(body.agentFailures);
+  return {
+    abortReason: readOptional(body.abortReason, isSetupAbortReason),
+    abandonedAt: readOptional(body.abandonedAt, isSetupStep),
+    exitCode: readOptional(body.exitCode, isProcessExitCode),
+    codexTrust: readOptional(body.codexTrust, isCodexTrustOutcome),
+    agentFailures,
+    failedAgentIds: agentFailures.map((failure) => failure.agent),
+    failedAgents: readOptional(body.failedAgents, isSetupAgentCount),
+    skippedAgents: readSetupAgentChoices(body.skippedAgents),
+    closingReason: readOptional(body.closingReason, isSetupClosingReason),
+    controlFailureStage: readOptional(body.controlFailureStage, isSetupControlFailureStage),
+    connectMode: readOptional(body.connectMode, isSetupConnectMode),
+    connectOutcome: readOptional(body.connectOutcome, isSetupConnectOutcome),
+    keyCheck: readOptional(body.keyCheck, isSetupKeyCheck),
+    nonInteractive: readOptional(body.nonInteractive, isBoolean),
+    cliVersion: readOptional(body.cliVersion, isCliVersion),
+    os: readOptional(body.os, isComputerOs)
+  };
+};
 
 // ../contracts/src/declined-agents.ts
 var DECLINED_AGENTS_FILE = "declined-agents.json";
@@ -2534,6 +2643,120 @@ var record = (value) => value !== null && typeof value === "object" && !Array.is
 var identifier = (value) => typeof value === "string" && value.length > 0 && value.length <= 200;
 var isQuestionOwner = (value) => record(value) && value.capability === PERSONAL_QUESTION_CAPABILITY && identifier(value.machineId) && identifier(value.generation) && identifier(value.threadId) && identifier(value.turnId) && identifier(value.itemId) && (identifier(value.requestId) || typeof value.requestId === "number" && Number.isSafeInteger(value.requestId)) && value.method === "item/tool/requestUserInput" && typeof value.subjectHash === "string" && /^[a-f0-9]{64}$/.test(value.subjectHash) && Object.keys(value).length === 9;
 
+// ../contracts/src/codex-native-approval.ts
+var CODEX_NATIVE_APPROVAL_CAPABILITY = "codex-native-approval-v1";
+var CODEX_NATIVE_APPROVAL_METHODS = ["item/commandExecution/requestApproval", "item/fileChange/requestApproval", "mcpServer/elicitation/request"];
+var CODEX_NATIVE_APPROVAL_CHOICES = { once: "Allow once", session: "Allow this conversation", deny: "Deny" };
+var record2 = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
+var identifier2 = (v) => typeof v === "string" && v.length > 0 && v.length <= 200;
+var text = (v) => typeof v === "string" && v.trim().length > 0 && v.length <= 16384;
+var optionalIdentifier = (v) => v == null || identifier2(v);
+var keys = (v, allowed) => Object.keys(v).every((key) => allowed.includes(key));
+var isMethod = (v) => typeof v === "string" && CODEX_NATIVE_APPROVAL_METHODS.some((method) => method === v);
+var boundedJson = (value) => {
+  try {
+    return JSON.stringify(value).length <= 64 * 1024;
+  } catch {
+    return false;
+  }
+};
+var BASE_KEYS = ["threadId", "turnId", "itemId", "startedAtMs", "reason"];
+var MCP_META_KEYS = ["codex_approval_kind", "codex_requires_user_input", "codex_request_type", "codex_strict_auto_review", "codex_sensitive_action", "approvals_reviewer", "persist", "source", "connector_id", "connector_name", "connector_description", "tool_name", "tool_title", "tool_description", "tool_params", "tool_params_display"];
+var COMPUTER_USE_META_KEYS = [...MCP_META_KEYS, "riskLevel", "subtitle", "tool_call_id"];
+var computerUseDisplay = (value) => Array.isArray(value) && value.length <= 16 && value.every((item) => record2(item) && keys(item, ["name", "display_name", "value"]) && text(item.name) && text(item.display_name) && text(item.value));
+var isExecpolicyAmendment = (value) => Array.isArray(value) && value.length > 0 && value.length <= 128 && value.every((token) => typeof token === "string" && token.length <= 16384);
+var isCommandDecision = (value) => {
+  if (typeof value === "string") return ["accept", "acceptForSession", "decline", "cancel"].includes(value);
+  if (!record2(value) || !keys(value, ["acceptWithExecpolicyAmendment"]) || !record2(value.acceptWithExecpolicyAmendment)) return false;
+  return keys(value.acceptWithExecpolicyAmendment, ["execpolicy_amendment"]) && isExecpolicyAmendment(value.acceptWithExecpolicyAmendment.execpolicy_amendment);
+};
+var parseCodexNativeApproval = (value) => {
+  if (!record2(value) || !keys(value, ["method", "params", "changes"]) || !isMethod(value.method) || !record2(value.params) || !boundedJson(value)) return null;
+  const p = value.params;
+  if (!identifier2(p.threadId) || !optionalIdentifier(p.turnId) || !optionalIdentifier(p.itemId)) return null;
+  const request = { method: value.method, params: p, ...Array.isArray(value.changes) ? { changes: value.changes } : {} };
+  const base = {
+    request,
+    threadId: p.threadId,
+    turnId: typeof p.turnId === "string" ? p.turnId : null,
+    itemId: typeof p.itemId === "string" ? p.itemId : null,
+    options: [CODEX_NATIVE_APPROVAL_CHOICES.once, CODEX_NATIVE_APPROVAL_CHOICES.deny],
+    negativeDecision: "decline"
+  };
+  if (value.method === "mcpServer/elicitation/request") {
+    const meta = p._meta;
+    const computerUse = record2(meta) && meta.connector_id === "computer-use";
+    if (value.changes !== void 0 || !keys(p, ["threadId", "turnId", "serverName", "mode", "message", "requestedSchema", "_meta"]) || !(p.mode === "form" || computerUse && (p.mode === "openai/form" || p.mode === "openaiForm")) || !identifier2(p.serverName) || !text(p.message) || p.message.length > 500 || !record2(p.requestedSchema) || !keys(p.requestedSchema, ["type", "properties", "required", "$schema"]) || p.requestedSchema.type !== "object" || !record2(p.requestedSchema.properties) || Object.keys(p.requestedSchema.properties).length !== 0 || p.requestedSchema.required != null && (!Array.isArray(p.requestedSchema.required) || p.requestedSchema.required.length !== 0)) return null;
+    if (!record2(meta) || !keys(meta, computerUse ? COMPUTER_USE_META_KEYS : MCP_META_KEYS) || meta.codex_approval_kind !== "mcp_tool_call" || !identifier2(meta.tool_name) || !record2(meta.tool_params) || meta.tool_params_display != null && !(computerUse ? computerUseDisplay(meta.tool_params_display) : record2(meta.tool_params_display))) return null;
+    if (computerUse && (meta.riskLevel !== "low" && meta.riskLevel !== "high" || meta.subtitle != null && !text(meta.subtitle) || !optionalIdentifier(meta.tool_call_id))) return null;
+    if (["codex_requires_user_input", "codex_strict_auto_review", "codex_sensitive_action"].some((key) => meta[key] != null && typeof meta[key] !== "boolean")) return null;
+    if (meta.approvals_reviewer != null && meta.approvals_reviewer !== "user") return null;
+    if (meta.codex_request_type != null && meta.codex_request_type !== "approval_request") return null;
+    if (["source", "connector_id", "connector_name", "connector_description", "tool_title", "tool_description"].some((key) => meta[key] != null && !text(meta[key]))) return null;
+    const persistence = meta.persist == null ? [] : typeof meta.persist === "string" ? [meta.persist] : meta.persist;
+    if (!Array.isArray(persistence) || persistence.some((v) => v !== "session" && v !== "always")) return null;
+    if (computerUse) {
+      if (!persistence.includes("session")) return null;
+      return {
+        ...base,
+        toolName: `mcp__${p.serverName}__${meta.tool_name}`,
+        toolInputs: [meta.tool_params],
+        question: p.message,
+        detail: [`Risk: ${meta.riskLevel}`, meta.subtitle, JSON.stringify(meta.tool_params)].filter(Boolean).join("\n"),
+        options: [CODEX_NATIVE_APPROVAL_CHOICES.session, CODEX_NATIVE_APPROVAL_CHOICES.deny]
+      };
+    }
+    return {
+      ...base,
+      toolName: `mcp__${p.serverName}__${meta.tool_name}`,
+      toolInputs: [meta.tool_params],
+      question: p.message,
+      detail: JSON.stringify(meta.tool_params),
+      options: persistence.includes("session") ? [CODEX_NATIVE_APPROVAL_CHOICES.once, CODEX_NATIVE_APPROVAL_CHOICES.session, CODEX_NATIVE_APPROVAL_CHOICES.deny] : base.options
+    };
+  }
+  if (!identifier2(p.turnId) || !identifier2(p.itemId) || !Number.isSafeInteger(p.startedAtMs) || p.reason != null && !text(p.reason)) return null;
+  if (value.method === "item/commandExecution/requestApproval") {
+    if (value.changes !== void 0 || !keys(p, [...BASE_KEYS, "approvalId", "kind", "environmentId", "command", "cwd", "commandActions", "networkApprovalContext", "proposedExecpolicyAmendment", "proposedNetworkPolicyAmendments", "availableDecisions"]) || !optionalIdentifier(p.approvalId) || p.kind != null && p.kind !== "command" || p.environmentId != null && p.environmentId !== "local" || p.networkApprovalContext != null || p.proposedNetworkPolicyAmendments != null || p.proposedExecpolicyAmendment != null && !isExecpolicyAmendment(p.proposedExecpolicyAmendment) || !text(p.command) || !text(p.cwd)) return null;
+    const decisions = p.availableDecisions ?? ["accept", "decline", "cancel"];
+    if (!Array.isArray(decisions) || !decisions.includes("accept") || !decisions.some((v) => v === "decline" || v === "cancel") || !decisions.every(isCommandDecision)) return null;
+    return {
+      ...base,
+      toolName: "Bash",
+      toolInputs: [{ command: p.command }],
+      cwd: p.cwd,
+      question: "Allow this command once?",
+      detail: p.command,
+      negativeDecision: decisions.includes("decline") ? "decline" : "cancel"
+    };
+  }
+  if (!keys(p, [...BASE_KEYS, "grantRoot"]) || p.grantRoot != null || !Array.isArray(value.changes) || value.changes.length === 0 || value.changes.length > 32) return null;
+  const paths = [], diffs = [];
+  for (const change of value.changes) {
+    if (!record2(change) || !keys(change, ["path", "kind", "diff"]) || !text(change.path) || typeof change.diff !== "string" || !record2(change.kind) || !keys(change.kind, ["type", "move_path"]) || !["add", "delete", "update"].includes(String(change.kind.type)) || change.kind.move_path != null) return null;
+    paths.push(change.path);
+    diffs.push(`${change.path}
+${change.diff}`);
+  }
+  return {
+    ...base,
+    toolName: "Edit",
+    toolInputs: paths.map((file_path) => ({ file_path })),
+    scopePaths: paths,
+    question: `Allow these ${paths.length} file changes once?`,
+    detail: diffs.join("\n\n")
+  };
+};
+var codexNativeApprovalResponse = (approval, answer) => {
+  const accepted = approval.options.includes(answer) && (answer === CODEX_NATIVE_APPROVAL_CHOICES.once || answer === CODEX_NATIVE_APPROVAL_CHOICES.session);
+  if (approval.request.method === "mcpServer/elicitation/request") return {
+    action: accepted ? "accept" : "decline",
+    content: null,
+    _meta: accepted && answer === CODEX_NATIVE_APPROVAL_CHOICES.session ? { persist: "session" } : null
+  };
+  return { decision: accepted ? "accept" : approval.negativeDecision };
+};
+
 // ../contracts/src/index.ts
 var KEY_SCOPES = ["full_access", "agent", "connector", "bound"];
 var normalizeKeyScope = (value) => typeof value === "string" && KEY_SCOPES.includes(value) ? value : null;
@@ -2561,6 +2784,8 @@ var approvalModeWithoutLocalPrompt = (mode) => {
 };
 var TIMEOUT_ACTION_THAT_REFUSES = "deny";
 var timeoutActionWithoutLocalPrompt = ({ mode, timeoutAction }) => mode !== "push_only" && timeoutAction === "approve" ? TIMEOUT_ACTION_THAT_REFUSES : timeoutAction;
+var TIMEOUT_ACTIONS = ["approve", "deny", "escalate", "wait"];
+var isTimeoutAction = (value) => typeof value === "string" && TIMEOUT_ACTIONS.includes(value);
 var MAX_AGENT_QUESTIONS = 4;
 var AGENT_QUESTION_HEADER_MAX = 40;
 var AGENT_QUESTION_OPTION_MAX = 100;
@@ -2608,9 +2833,9 @@ var isAgentQuestionSet = (value) => {
     const labels = /* @__PURE__ */ new Set();
     for (const option of question.options) {
       if (!option || typeof option !== "object" || Array.isArray(option)) return false;
-      const record2 = option;
-      const label = record2.label;
-      if (typeof label !== "string" || label.length === 0 || labels.has(label) || record2.description !== void 0 && typeof record2.description !== "string") return false;
+      const record3 = option;
+      const label = record3.label;
+      if (typeof label !== "string" || label.length === 0 || labels.has(label) || record3.description !== void 0 && typeof record3.description !== "string") return false;
       labels.add(label);
     }
     questions.add(question.question);
@@ -2727,7 +2952,7 @@ var HOOK_HOLD_BUDGET_FLAG = "--hold-budget";
 var HOOK_HOLD_BUDGET_ENV = "PUSHARY_HOLD_BUDGET_SECONDS";
 var HOOK_BRIDGE_SOURCE_FLAG = "--source";
 var HOOK_HOLD_BUDGET_SECONDS = /^[1-9]\d{0,5}$/;
-var hookHoldBudgetSeconds = (text) => text !== void 0 && HOOK_HOLD_BUDGET_SECONDS.test(text) ? Number(text) : void 0;
+var hookHoldBudgetSeconds = (text2) => text2 !== void 0 && HOOK_HOLD_BUDGET_SECONDS.test(text2) ? Number(text2) : void 0;
 var hookHoldBudgetArgument = (seconds) => `${HOOK_HOLD_BUDGET_FLAG}=${seconds}`;
 var withHookHoldBudget = (command, holdBudgetSeconds) => holdBudgetSeconds === void 0 ? command : `${command} ${hookHoldBudgetArgument(holdBudgetSeconds)}`;
 var registeredHookHoldBudget = (args) => {
@@ -2836,8 +3061,8 @@ var tokenizeGlob = (glob) => {
   return tokens;
 };
 var SLASH = "/".charCodeAt(0);
-var matchGlobTokens = (tokens, text) => {
-  const n = text.length;
+var matchGlobTokens = (tokens, text2) => {
+  const n = text2.length;
   let reachable = new Uint8Array(n + 1);
   reachable[0] = 1;
   for (const token of tokens) {
@@ -2845,13 +3070,13 @@ var matchGlobTokens = (tokens, text) => {
     if (token.kind === "literal") {
       const { value } = token;
       for (let p = 0; p <= n - value.length; p += 1) {
-        if (reachable[p] && text.startsWith(value, p)) next[p + value.length] = 1;
+        if (reachable[p] && text2.startsWith(value, p)) next[p + value.length] = 1;
       }
     } else {
       const spansSeparators = token.kind === "globstar";
       let open = 0;
       for (let p = 0; p <= n; p += 1) {
-        if (!spansSeparators && p > 0 && text.charCodeAt(p - 1) === SLASH) open = 0;
+        if (!spansSeparators && p > 0 && text2.charCodeAt(p - 1) === SLASH) open = 0;
         if (reachable[p]) open = 1;
         if (open) next[p] = 1;
       }
@@ -3232,7 +3457,7 @@ var argumentsMayExpand = (segment) => {
   const visible = shellVisibleText(segment);
   return visible === null || EXPANSION_THAT_CAN_BECOME_A_FLAG.test(visible.replace(SHELL_QUOTE_CHARACTERS, ""));
 };
-var blankedSafeRedirections = (text) => text.replace(SAFE_REDIRECTION, (redirection) => " ".repeat(redirection.length));
+var blankedSafeRedirections = (text2) => text2.replace(SAFE_REDIRECTION, (redirection) => " ".repeat(redirection.length));
 var segmentsSplitWhereVisible = (command, visible, separators) => {
   const segments = [];
   let start = 0;
@@ -3381,10 +3606,10 @@ var DESTRUCTIVE_WORDS_IN_ANY_CASE_BY_COMMAND = /* @__PURE__ */ new Map([
 ]);
 var namesDestructiveWordInAnyCase = (name, texts) => {
   const words = DESTRUCTIVE_WORDS_IN_ANY_CASE_BY_COMMAND.get(name);
-  return words !== void 0 && texts.some((text) => words.has(text.toLowerCase()));
+  return words !== void 0 && texts.some((text2) => words.has(text2.toLowerCase()));
 };
 var LONG_OPTION = /^--[A-Za-z]/;
-var namesDestructiveArgument = (text, destructiveArguments) => destructiveArguments.has(text) || LONG_OPTION.test(text) && [...destructiveArguments].some((argument) => argument.startsWith(text)) || [...SHORT_FLAG_CLUSTER.exec(text)?.[1] ?? ""].some((letter) => destructiveArguments.has(`-${letter}`));
+var namesDestructiveArgument = (text2, destructiveArguments) => destructiveArguments.has(text2) || LONG_OPTION.test(text2) && [...destructiveArguments].some((argument) => argument.startsWith(text2)) || [...SHORT_FLAG_CLUSTER.exec(text2)?.[1] ?? ""].some((letter) => destructiveArguments.has(`-${letter}`));
 var RUNNER_SUBCOMMANDS = /* @__PURE__ */ new Set(["exec", "dlx"]);
 var SUBCOMMAND_CLIS = /* @__PURE__ */ new Set([
   "git",
@@ -3511,7 +3736,7 @@ var argumentsHideTheEffect = (name, args) => {
   const texts = args.map((arg) => arg.text);
   if (INLINE_CODE_INTERPRETERS.has(name.replace(/\d+(?:\.\d+)*$/, "")) && interpreterRunsUnreadableCode(texts)) return true;
   const destructiveArguments = destructiveArgumentsOf(name, args);
-  if (destructiveArguments && texts.some((text) => namesDestructiveArgument(text, destructiveArguments))) return true;
+  if (destructiveArguments && texts.some((text2) => namesDestructiveArgument(text2, destructiveArguments))) return true;
   if (namesDestructiveWordInAnyCase(name, texts)) return true;
   if (!SUBCOMMAND_CLIS.has(name)) return false;
   const meaningful = argsAfterHarmlessGlobalFlags(args);
@@ -3530,7 +3755,7 @@ var normalizedInvocation = (invocation) => invocationTextWith(invocation, (word)
 var SHELL_METACHARACTER = /[\s;&|<>()$`\\"'*?[\]#~{}!]/;
 var SINGLE_QUOTE2 = "'";
 var ESCAPED_SINGLE_QUOTE = `'\\''`;
-var asOneShellWord = (text) => SHELL_METACHARACTER.test(text) ? `${SINGLE_QUOTE2}${text.replaceAll(SINGLE_QUOTE2, ESCAPED_SINGLE_QUOTE)}${SINGLE_QUOTE2}` : text;
+var asOneShellWord = (text2) => SHELL_METACHARACTER.test(text2) ? `${SINGLE_QUOTE2}${text2.replaceAll(SINGLE_QUOTE2, ESCAPED_SINGLE_QUOTE)}${SINGLE_QUOTE2}` : text2;
 var quotedInvocation = (invocation) => invocationTextWith(invocation, (word) => asOneShellWord(word.text));
 var normalizedCommand = (command) => {
   const segments = readableCommandSegments(command);
@@ -3631,8 +3856,8 @@ var SQL_WRITE_STATEMENT = new RegExp([
   String.raw`\.(?:insert|update|delete|replace|remove|drop|rename|create|bulkwrite|findoneand)\w*\s*\(`
 ].join("|"), "i");
 var SQL_READ_PHRASE = /\bshow\s+create\b/gi;
-var sqlTextWrites = (text) => {
-  const statement = text.replace(SQL_READ_PHRASE, "");
+var sqlTextWrites = (text2) => {
+  const statement = text2.replace(SQL_READ_PHRASE, "");
   return SQL_WRITE_STATEMENT.test(statement) || SQL_CLIENT_FILE_COMMAND.test(statement);
 };
 var writesThroughSql = (sql, lexicon) => {
@@ -3648,7 +3873,7 @@ var SQL_CLIENT_FILE_COMMAND = new RegExp([
 var SHORT_FLAG_CLUSTER_ONLY = /^-([A-Za-z0-9]+)$/;
 var LEADING_OPTION_DASHES = /^-+/;
 var NO_SQL = { script: false, sql: null, hidden: false };
-var shortFlagOf = (flags, text) => [...flags].find((flag) => /^-[A-Za-z]$/.test(flag) && text.startsWith(flag) && text.length > flag.length && !text.startsWith("--"));
+var shortFlagOf = (flags, text2) => [...flags].find((flag) => /^-[A-Za-z]$/.test(flag) && text2.startsWith(flag) && text2.length > flag.length && !text2.startsWith("--"));
 var sqlArgumentAt = (args, index, syntax) => {
   const arg = args[index];
   if (arg === void 0) return NO_SQL;
@@ -3668,7 +3893,7 @@ var sqlArgumentAt = (args, index, syntax) => {
   if (cluster && cluster.length > 1 && syntax.inlineFlags.has(last)) return valueOf(next);
   return { script: false, sql: arg.text.replace(LEADING_OPTION_DASHES, ""), hidden: false };
 };
-var namesALongFlagValue = (text, flags) => [...flags].some((flag) => flag.startsWith("--") && text.startsWith(`${flag}${FLAG_VALUE_SEPARATOR}`));
+var namesALongFlagValue = (text2, flags) => [...flags].some((flag) => flag.startsWith("--") && text2.startsWith(`${flag}${FLAG_VALUE_SEPARATOR}`));
 var positionalSqlIsHidden = (args, syntax) => syntax.positionalSql && args.filter((arg) => !arg.text.startsWith("-")).slice(1).some((arg) => arg.expands);
 var sqlClientSyntaxOf = ({ program }) => program === void 0 ? void 0 : SQL_CLIENT_SYNTAX.get(basenameOf(program.text));
 var sqlClientChangesData = (invocation) => {
@@ -4042,7 +4267,7 @@ var gitDiscardsWork = ({ program, args }) => {
   const [subcommand, ...rest] = argsAfterHarmlessGlobalFlags(args);
   const discards = GIT_WORK_DISCARDERS.get(subcommand?.text ?? "");
   const texts = rest.map((arg) => arg.text);
-  return discards !== void 0 && discards(texts.filter((text) => FLAG.test(text)), texts.filter((text) => !FLAG.test(text)));
+  return discards !== void 0 && discards(texts.filter((text2) => FLAG.test(text2)), texts.filter((text2) => !FLAG.test(text2)));
 };
 var PACKAGE_MANAGERS = /* @__PURE__ */ new Set([
   "npm",
@@ -4190,25 +4415,25 @@ var WRAPPER_SYNTAX = /* @__PURE__ */ new Map([
 ]);
 var EVAL = "eval";
 var MAX_CONSEQUENCE_DEPTH = 4;
-var shortValueOptionPosition = (text, options) => {
-  if (!text.startsWith("-") || text.startsWith("--")) return -1;
-  for (let index = 1; index < text.length; index += 1) {
-    if (options.has(`-${text[index]}`)) return index;
+var shortValueOptionPosition = (text2, options) => {
+  if (!text2.startsWith("-") || text2.startsWith("--")) return -1;
+  for (let index = 1; index < text2.length; index += 1) {
+    if (options.has(`-${text2[index]}`)) return index;
   }
   return -1;
 };
-var wrapperOptionConsumesNextWord = (text, options) => {
-  if (options.has(text)) return true;
-  const position = shortValueOptionPosition(text, options);
-  return position !== -1 && position === text.length - 1;
+var wrapperOptionConsumesNextWord = (text2, options) => {
+  if (options.has(text2)) return true;
+  const position = shortValueOptionPosition(text2, options);
+  return position !== -1 && position === text2.length - 1;
 };
 var commandStartAfterWrapper = (words, syntax) => {
   let index = 0;
   while (index < words.length) {
-    const text = words[index]?.text ?? "";
-    if (text === END_OF_OPTIONS3) return index + 1 + syntax.operandsBeforeTheCommand;
-    if (!SHELL_ENV_ASSIGNMENT.test(text) && (!FLAG.test(text) || text === STANDARD_INPUT_ARGUMENT)) break;
-    index += wrapperOptionConsumesNextWord(text, syntax.optionsWithAValue) ? 2 : 1;
+    const text2 = words[index]?.text ?? "";
+    if (text2 === END_OF_OPTIONS3) return index + 1 + syntax.operandsBeforeTheCommand;
+    if (!SHELL_ENV_ASSIGNMENT.test(text2) && (!FLAG.test(text2) || text2 === STANDARD_INPUT_ARGUMENT)) break;
+    index += wrapperOptionConsumesNextWord(text2, syntax.optionsWithAValue) ? 2 : 1;
   }
   return index + syntax.operandsBeforeTheCommand;
 };
@@ -4310,16 +4535,16 @@ var pipesFetchedCodeIntoAnInterpreter = (command, invocations) => invocations.so
 var WORDS_THAT_OPEN_A_COMMAND = String.raw`if|then|elif|else|do|while|until|!`;
 var SHELL_GROUPING_PREFIX = new RegExp(String.raw`^\s*(?:(?:${WORDS_THAT_OPEN_A_COMMAND})\s+|[({]\s*)+`);
 var GROUP_OPENER_BY_CLOSER = /* @__PURE__ */ new Map([[")", "("], ["}", "{"]]);
-var occurrencesOf = (text, character) => text.split(character).length - 1;
-var closesAGroupItDidNotOpen = (text) => {
-  const last = text.at(-1) ?? "";
+var occurrencesOf = (text2, character) => text2.split(character).length - 1;
+var closesAGroupItDidNotOpen = (text2) => {
+  const last = text2.at(-1) ?? "";
   const opener = GROUP_OPENER_BY_CLOSER.get(last);
-  return opener !== void 0 && occurrencesOf(text, last) > occurrencesOf(text, opener);
+  return opener !== void 0 && occurrencesOf(text2, last) > occurrencesOf(text2, opener);
 };
 var withoutShellGrouping = (segment) => {
-  let text = segment.replace(SHELL_GROUPING_PREFIX, "").trimEnd();
-  while (closesAGroupItDidNotOpen(text)) text = text.slice(0, -1).trimEnd();
-  return text;
+  let text2 = segment.replace(SHELL_GROUPING_PREFIX, "").trimEnd();
+  while (closesAGroupItDidNotOpen(text2)) text2 = text2.slice(0, -1).trimEnd();
+  return text2;
 };
 var HEREDOC_OPERATOR = /(?<!<)\d*<<(?!<)-?[ \t]*(?:'([A-Za-z_]\w*)'|"([A-Za-z_]\w*)"|\\?([A-Za-z_]\w*))/g;
 var HEREDOC_MARK = "\uE001";
@@ -4352,24 +4577,24 @@ var SEPARATORS_INSIDE_DOUBLE_QUOTES = /* @__PURE__ */ new Set(["$(", "`", ")"]);
 var PIPE3 = "|";
 var SUBSTITUTION_OPENERS = /* @__PURE__ */ new Set(["$(", "`"]);
 var QUOTE_CHARACTERS = /['"]/g;
-var roughPiecesOf = (text) => {
+var roughPiecesOf = (text2) => {
   const pieces = [];
   let current = "";
   let before = "";
   let quote = null;
-  for (let index = 0; index < text.length; index += 1) {
-    const char = text.charAt(index);
+  for (let index = 0; index < text2.length; index += 1) {
+    const char = text2.charAt(index);
     if (quote === "'") {
       current += char;
       if (char === "'") quote = null;
       continue;
     }
     if (char === "\\") {
-      current += text.slice(index, index + 2);
+      current += text2.slice(index, index + 2);
       index += 1;
       continue;
     }
-    const separator = ROUGH_SEPARATORS.find((candidate) => text.startsWith(candidate, index) && (quote === null || SEPARATORS_INSIDE_DOUBLE_QUOTES.has(candidate)));
+    const separator = ROUGH_SEPARATORS.find((candidate) => text2.startsWith(candidate, index) && (quote === null || SEPARATORS_INSIDE_DOUBLE_QUOTES.has(candidate)));
     if (separator !== void 0) {
       pieces.push({ text: current, before });
       current = "";
@@ -4382,14 +4607,14 @@ var roughPiecesOf = (text) => {
   }
   return [...pieces, { text: current, before }];
 };
-var invocationOfRoughPiece = (text) => {
-  const piece = withoutShellGrouping(text.replaceAll(REDIRECTED_INPUT_MARK, "").replaceAll(HEREDOC_MARK, ""));
+var invocationOfRoughPiece = (text2) => {
+  const piece = withoutShellGrouping(text2.replaceAll(REDIRECTED_INPUT_MARK, "").replaceAll(HEREDOC_MARK, ""));
   const parsed = invocationOf(piece);
   return parsed.program !== void 0 ? parsed : invocationOf(piece.replace(QUOTE_CHARACTERS, ""));
 };
 var roughSegmentsOf = (command) => {
-  const { text, bodies } = withHeredocBodiesSetAside(commandForReading(command));
-  const pieces = roughPiecesOf(text.replace(INPUT_REDIRECTION, ` ${REDIRECTED_INPUT_MARK} `).replace(OUTPUT_REDIRECTION, " "));
+  const { text: text2, bodies } = withHeredocBodiesSetAside(commandForReading(command));
+  const pieces = roughPiecesOf(text2.replace(INPUT_REDIRECTION, ` ${REDIRECTED_INPUT_MARK} `).replace(OUTPUT_REDIRECTION, " "));
   let heredocsSeen = 0;
   return pieces.map((piece, index) => {
     const heredocCount = occurrencesOf(piece.text, HEREDOC_MARK);
@@ -4426,7 +4651,7 @@ var commandHasAVisibleConsequenceAt = (toolName, command, depth) => {
 };
 var posixCommandOf = (words) => words.map(asOneShellWord).join(" ");
 var posixShellJudgeFor = (toolName) => ({
-  namesADestructiveAction: (text) => classifyDecisionRisk(toolName, text) === "destructive",
+  namesADestructiveAction: (text2) => classifyDecisionRisk(toolName, text2) === "destructive",
   invocationShowsAConsequence: (invocation) => invocationHasAVisibleConsequence(SHELL_TOOL, invocation, 0),
   commandShowsAConsequence: (words) => commandHasAVisibleConsequenceAt(SHELL_TOOL, posixCommandOf(words), 1),
   onlyReads: (words) => isSafeReadOnlyCommand(posixCommandOf(words)),
@@ -4469,9 +4694,9 @@ var GIT_GLOBAL_FLAGS = /* @__PURE__ */ new Set([
 var GIT_OPTION_AND_ITS_VALUE = 2;
 var GIT_OPTION_ALONE = 1;
 var NOT_A_GIT_GLOBAL_OPTION = 0;
-var gitGlobalOptionWidth = (text) => {
-  if (GIT_GLOBAL_OPTIONS_WITH_A_VALUE.has(text)) return GIT_OPTION_AND_ITS_VALUE;
-  const name = longOptionName(text);
+var gitGlobalOptionWidth = (text2) => {
+  if (GIT_GLOBAL_OPTIONS_WITH_A_VALUE.has(text2)) return GIT_OPTION_AND_ITS_VALUE;
+  const name = longOptionName(text2);
   return GIT_GLOBAL_OPTIONS_WITH_A_VALUE.has(name) || GIT_GLOBAL_FLAGS.has(name) ? GIT_OPTION_ALONE : NOT_A_GIT_GLOBAL_OPTION;
 };
 var argsAfterGitGlobalOptions = (args) => {
@@ -4490,7 +4715,7 @@ var gitReadingsPastGlobalOptions = ({ program, args }) => {
 };
 var CURRENT_DIRECTORY_STEP = /\/\.(?=\/)/g;
 var LEADING_CURRENT_DIRECTORY = /^(?:\.\/+)+(?=[^/])/;
-var canonicalPathWord = (text) => text.replace(CURRENT_DIRECTORY_STEP, "").replace(LEADING_CURRENT_DIRECTORY, "");
+var canonicalPathWord = (text2) => text2.replace(CURRENT_DIRECTORY_STEP, "").replace(LEADING_CURRENT_DIRECTORY, "");
 var verbatimInvocationText = (invocation) => wordsOfInvocation(invocation).map((word) => asOneShellWord(word.text)).join(" ");
 var canonicalInvocationText = (invocation) => invocationTextWith(invocation, (word) => asOneShellWord(canonicalPathWord(word.text)));
 var spellingsOfAnInvocation = (invocation, innermost) => [invocation, innermost, ...gitReadingsPastGlobalOptions(innermost), ...readingsPastGlobalFlags(innermost)].flatMap((reading) => [verbatimInvocationText(reading), canonicalInvocationText(reading)]);
@@ -4529,8 +4754,8 @@ var runsASubstitutionAsAProgram = (command) => {
   return visible !== null && SUBSTITUTION_AS_A_PROGRAM.test(visible);
 };
 var parsedSpelledSegment = (segment) => {
-  const text = withoutShellGrouping(segment);
-  return { text, invocation: invocationOf(text), heredocs: [], feedsASubstitution: false };
+  const text2 = withoutShellGrouping(segment);
+  return { text: text2, invocation: invocationOf(text2), heredocs: [], feedsASubstitution: false };
 };
 var roughSpelledSegment = ({ invocation, heredocs, feedsASubstitution }) => ({ text: verbatimInvocationText(invocation), invocation, heredocs, feedsASubstitution });
 var segmentHidesWhatItRuns = (segment, innermost, scripts) => programIsHidden(innermost) || scripts.kind === "hidden" || segment.feedsASubstitution && passesAnInlineScript(innermost);
@@ -4671,11 +4896,11 @@ var ASK_CONTEXT_MAX = 500;
 var ASK_AGENT_NAME_MAX = 100;
 var TRUNCATION_MARK = "\u2026";
 var isHighSurrogate = (code) => code >= 55296 && code <= 56319;
-var truncateLine = (text, max, mark = TRUNCATION_MARK) => {
-  if (text.length <= max) return text;
+var truncateLine = (text2, max, mark = TRUNCATION_MARK) => {
+  if (text2.length <= max) return text2;
   const end = max - mark.length;
-  const keep = isHighSurrogate(text.charCodeAt(end - 1)) ? end - 1 : end;
-  return `${text.slice(0, keep)}${mark}`;
+  const keep = isHighSurrogate(text2.charCodeAt(end - 1)) ? end - 1 : end;
+  return `${text2.slice(0, keep)}${mark}`;
 };
 var APPROVAL_FATIGUE_FLAG_PATTERNS = [
   /\brm\s+-[a-z]*r/i,
@@ -4737,9 +4962,9 @@ var addAlnumTokens = (source, set) => {
     if (raw) set.add(raw);
   }
 };
-var tokenize = (text) => {
+var tokenize = (text2) => {
   const set = /* @__PURE__ */ new Set();
-  for (const raw of text.toLowerCase().split(/[^a-z0-9]+/)) {
+  for (const raw of text2.toLowerCase().split(/[^a-z0-9]+/)) {
     if (raw && !DELTA_STOPWORDS.has(raw)) set.add(raw);
   }
   return set;
@@ -5010,19 +5235,19 @@ var deriveTargetClass = (path) => {
 var bucketArgCount = (n) => n <= 0 ? "none" : n <= 3 ? "few" : "many";
 var bucketLength = (n) => n < 40 ? "short" : n < 200 ? "medium" : "long";
 var deriveArgShape = (isCommand, commandText, path) => {
-  const text = isCommand ? commandText : path;
-  const tokenCount = isCommand ? text.trim().split(/\s+/).filter(Boolean).length : 0;
+  const text2 = isCommand ? commandText : path;
+  const tokenCount = isCommand ? text2.trim().split(/\s+/).filter(Boolean).length : 0;
   return {
-    hasPipe: isCommand && /(?<!\|)\|(?!\|)/.test(text),
-    hasRedirect: isCommand && /(?<![0-9])[<>]/.test(text),
-    hasChain: isCommand && /&&|\|\||;/.test(text),
-    hasSudo: /\bsudo\b/i.test(text),
-    hasGlob: isCommand && /[*?]/.test(text),
-    hasSubshell: isCommand && /\$\(|`/.test(text),
-    touchesSecretPath: SECRET_TARGET_PATTERNS.some((re) => re.test(text)),
+    hasPipe: isCommand && /(?<!\|)\|(?!\|)/.test(text2),
+    hasRedirect: isCommand && /(?<![0-9])[<>]/.test(text2),
+    hasChain: isCommand && /&&|\|\||;/.test(text2),
+    hasSudo: /\bsudo\b/i.test(text2),
+    hasGlob: isCommand && /[*?]/.test(text2),
+    hasSubshell: isCommand && /\$\(|`/.test(text2),
+    touchesSecretPath: SECRET_TARGET_PATTERNS.some((re) => re.test(text2)),
     // The command word itself is not an argument, so subtract one.
     argCountBucket: bucketArgCount(isCommand ? Math.max(0, tokenCount - 1) : 0),
-    lengthBucket: bucketLength(text.length)
+    lengthBucket: bucketLength(text2.length)
   };
 };
 var deriveReversibility = (capability, riskClass) => {
@@ -5340,8 +5565,8 @@ var isBlockedActionRequest = (request) => isBlockedActionEvent(request) && block
 var canonicalJsonText = (value) => {
   if (Array.isArray(value)) return `[${value.map(canonicalJsonText).join(",")}]`;
   if (value !== null && typeof value === "object") {
-    const record2 = value;
-    return `{${Object.keys(record2).filter((key) => record2[key] !== void 0).sort().map((key) => `${JSON.stringify(key)}:${canonicalJsonText(record2[key])}`).join(",")}}`;
+    const record3 = value;
+    return `{${Object.keys(record3).filter((key) => record3[key] !== void 0).sort().map((key) => `${JSON.stringify(key)}:${canonicalJsonText(record3[key])}`).join(",")}}`;
   }
   return JSON.stringify(value) ?? "null";
 };
@@ -5721,11 +5946,11 @@ var elicitationEnum = (property) => {
   return members.length === property.enum.length && members.length >= ELICITATION_MIN_OPTIONS ? members : null;
 };
 var readElicitationFields = (schema) => {
-  const record2 = elicitationRecord(schema);
-  const properties = elicitationRecord(record2?.properties);
-  if (!properties || record2?.type !== "object") return null;
-  if (Object.keys(record2).some((key) => !["type", "properties", "required", "$schema"].includes(key))) return null;
-  if (record2.required !== void 0 && (!Array.isArray(record2.required) || !record2.required.every((name) => typeof name === "string" && Object.hasOwn(properties, name)))) return null;
+  const record3 = elicitationRecord(schema);
+  const properties = elicitationRecord(record3?.properties);
+  if (!properties || record3?.type !== "object") return null;
+  if (Object.keys(record3).some((key) => !["type", "properties", "required", "$schema"].includes(key))) return null;
+  if (record3.required !== void 0 && (!Array.isArray(record3.required) || !record3.required.every((name) => typeof name === "string" && Object.hasOwn(properties, name)))) return null;
   const entries = Object.entries(properties);
   if (entries.length === 0) return null;
   const fields = [];
@@ -6040,8 +6265,10 @@ export {
   SETUP_AGENT_CHOICES,
   isComputerAgent,
   NO_PAIRING_COMPUTER,
+  readSetupAgentFailures,
   SETUP_CONNECT_MODES,
   isSetupConnectMode,
+  readSetupOutcomeProperties,
   DECLINED_AGENTS_FILE,
   parseDeclinedAgents,
   serializeDeclinedAgents,
@@ -6050,10 +6277,15 @@ export {
   isAutoUpdateResult,
   PERSONAL_QUESTION_CAPABILITY,
   isQuestionOwner,
+  CODEX_NATIVE_APPROVAL_CAPABILITY,
+  CODEX_NATIVE_APPROVAL_METHODS,
+  parseCodexNativeApproval,
+  codexNativeApprovalResponse,
   normalizeKeyScope,
   isApprovalMode,
   approvalModeWithoutLocalPrompt,
   timeoutActionWithoutLocalPrompt,
+  isTimeoutAction,
   AGENT_QUESTION_HEADER_MAX,
   AGENT_QUESTION_OPTION_MAX,
   AGENT_QUESTION_DESCRIPTION_MAX,