Merge remote-tracking branch 'upstream/dev/friel/subagent-inbox-injection' into repair/collab-stack-refresh-20260402

# Conflicts:
#	codex-rs/app-server/tests/suite/v2/thread_resume.rs

codex-rs/app-server/tests/suite/v2/thread_resume.rs

@@ -1,3 +1,7 @@
+use super::analytics::assert_basic_thread_initialized_event;
+use super::analytics::enable_analytics_capture;
+use super::analytics::thread_initialized_event;
+use super::analytics::wait_for_analytics_payload;
 use anyhow::Result;
 use app_test_support::ChatGptAuthFixture;
 use app_test_support::McpProcess;
@@ -68,14 +72,13 @@ use uuid::Uuid;
 use wiremock::Mock;
 use wiremock::MockServer;
 use wiremock::ResponseTemplate;
+
 use wiremock::matchers::method;
 use wiremock::matchers::path;
 
-use super::analytics::assert_basic_thread_initialized_event;
-use super::analytics::enable_analytics_capture;
-use super::analytics::thread_initialized_event;
-use super::analytics::wait_for_analytics_payload;
-
+#[cfg(windows)]
+const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(25);
+#[cfg(not(windows))]
 const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
 const CODEX_5_2_INSTRUCTIONS_TEMPLATE_DEFAULT: &str = "You are Codex, a coding agent based on GPT-5. You and the user share the same workspace and collaborate to achieve the user's goals.";
 

patches/aws-lc-sys_memcmp_check.patch

@@ -7,13 +7,13 @@ diff --git a/builder/cc_builder.rs b/builder/cc_builder.rs
  use std::collections::HashMap;
 -use std::path::PathBuf;
 +use std::path::{Path, PathBuf};
- 
+
  #[non_exhaustive]
  #[derive(PartialEq, Eq)]
 @@ -681,6 +681,16 @@
          }
          let mut memcmp_compile_args = Vec::from(memcmp_compiler.args());
- 
+
 +        // Keep the probe self-contained and avoid invoking external debug tools
 +        // (for example `dsymutil`) that may be missing in hermetic sandboxes.
 +        memcmp_compile_args.retain(|arg| {
@@ -30,7 +30,7 @@ diff --git a/builder/cc_builder.rs b/builder/cc_builder.rs
 @@ -692,6 +702,15 @@
              }
          }
- 
+
 +        if let Some(execroot) = Self::bazel_execroot(self.manifest_dir.as_path()) {
 +            // In Bazel build-script sandboxes, `cc` can pass `bazel-out/...` args
 +            // relative to the execroot while the process runs from elsewhere.

patches/llvm_windows_symlink_extract.patch

@@ -14,7 +14,7 @@ index 89dcf81..cf27c92 100644
 +        "llvm/utils/mlgo-utils/combine_training_corpus.py",
 +        "llvm/docs/_themes/llvm-theme",
      ]
- 
+
      test_docs_subprojects = [
 diff --git a/runtimes/mingw/BUILD.bazel b/runtimes/mingw/BUILD.bazel
 index ebd99db..9eb5d5b 100644
@@ -23,7 +23,7 @@ index ebd99db..9eb5d5b 100644
 @@ -334,6 +334,30 @@ stub_library(
      name = "stdc++",
  )
- 
+
 +# Clang may inject -lssp and -lssp_nonshared for windows-gnu links.
 +# Provide compatibility archives in the MinGW runtime search directory.
 +stub_library(

patches/rules_rs_windows_gnullvm_exec.patch

@@ -22,7 +22,7 @@ index b9a0ce1..67e491c 100644
 @@ -10,6 +10,11 @@ def _channel(version):
          return "beta"
      return "stable"
- 
+
 +def _exec_triple_suffix(exec_triple):
 +    if exec_triple.system == "windows":
 +        return "{}_{}_{}".format(exec_triple.system, exec_triple.arch, exec_triple.abi)
@@ -32,16 +32,16 @@ index b9a0ce1..67e491c 100644
          *,
          version,
 @@ -23,15 +28,14 @@ def declare_rustc_toolchains(
- 
+
      for triple in execs:
          exec_triple = _parse_triple(triple)
 -        triple_suffix = exec_triple.system + "_" + exec_triple.arch
 +        triple_suffix = _exec_triple_suffix(exec_triple)
- 
+
          rustc_repo_label = "@rustc_{}_{}//:".format(triple_suffix, version_key)
          cargo_repo_label = "@cargo_{}_{}//:".format(triple_suffix, version_key)
          clippy_repo_label = "@clippy_{}_{}//:".format(triple_suffix, version_key)
- 
+
 -        rust_toolchain_name = "{}_{}_{}_rust_toolchain".format(
 -            exec_triple.system,
 -            exec_triple.arch,
@@ -49,10 +49,10 @@ index b9a0ce1..67e491c 100644
 +            triple_suffix,
              version_key,
          )
- 
+
 @@ -90,11 +94,8 @@ def declare_rustc_toolchains(
              target_key = sanitize_triple(target_triple)
- 
+
              native.toolchain(
 -                name = "{}_{}_to_{}_{}".format(exec_triple.system, exec_triple.arch, target_key, version_key),
 -                exec_compatible_with = [
@@ -74,7 +74,7 @@ index a219209..ecb6b05 100644
 -load("//rs/experimental/platforms:triples.bzl", "SUPPORTED_EXEC_TRIPLES")
 +load("//rs/experimental/platforms:triples.bzl", "SUPPORTED_EXEC_TRIPLES", "triple_to_constraint_set")
  load("//rs/experimental/toolchains:toolchain_utils.bzl", "sanitize_version")
- 
+
 +def _exec_triple_suffix(exec_triple):
 +    if exec_triple.system == "windows":
 +        return "{}_{}_{}".format(exec_triple.system, exec_triple.arch, exec_triple.abi)
@@ -84,15 +84,15 @@ index a219209..ecb6b05 100644
      if version.startswith("nightly"):
          return "nightly"
 @@ -22,14 +27,13 @@ def declare_rustfmt_toolchains(
- 
+
      for triple in execs:
          exec_triple = _parse_triple(triple)
 -        triple_suffix = exec_triple.system + "_" + exec_triple.arch
 +        triple_suffix = _exec_triple_suffix(exec_triple)
- 
+
          rustc_repo_label = "@rustc_{}_{}//:".format(triple_suffix, version_key)
          rustfmt_repo_label = "@rustfmt_{}_{}//:".format(triple_suffix, rustfmt_version_key)
- 
+
 -        rustfmt_toolchain_name = "{}_{}_{}_rustfmt_toolchain".format(
 -            exec_triple.system,
 -            exec_triple.arch,
@@ -100,10 +100,10 @@ index a219209..ecb6b05 100644
 +            triple_suffix,
              version_key,
          )
- 
+
 @@ -43,11 +47,8 @@ def declare_rustfmt_toolchains(
          )
- 
+
          native.toolchain(
 -            name = "{}_{}_rustfmt_{}".format(exec_triple.system, exec_triple.arch, version_key),
 -            exec_compatible_with = [
@@ -122,7 +122,7 @@ index 7bb0205..ace556b 100644
 @@ -37,6 +37,11 @@ def _normalize_arch_name(arch):
          return "aarch64"
      return arch
- 
+
 +def _exec_triple_suffix(exec_triple):
 +    if exec_triple.system == "windows":
 +        return "{}_{}_{}".format(exec_triple.system, exec_triple.arch, exec_triple.abi)
@@ -130,22 +130,22 @@ index 7bb0205..ace556b 100644
 +
  def _sanitize_path_fragment(path):
      return path.replace("/", "_").replace(":", "_")
- 
+
 @@ -181,7 +186,7 @@ def _toolchains_impl(mctx):
          for triple in SUPPORTED_EXEC_TRIPLES:
              exec_triple = _parse_triple(triple)
- 
+
 -            triple_suffix = exec_triple.system + "_" + exec_triple.arch
 +            triple_suffix = _exec_triple_suffix(exec_triple)
              rustc_name = "rustc_{}_{}".format(triple_suffix, version_key)
- 
+
              rustc_repository(
 @@ -230,7 +235,7 @@ def _toolchains_impl(mctx):
- 
+
          for triple in SUPPORTED_EXEC_TRIPLES:
              exec_triple = _parse_triple(triple)
 -            triple_suffix = exec_triple.system + "_" + exec_triple.arch
 +            triple_suffix = _exec_triple_suffix(exec_triple)
- 
+
              rustfmt_repository(
                  name = "rustfmt_{}_{}".format(triple_suffix, version_key),

patches/rules_rust_windows_gnullvm_build_script.patch

@@ -4,7 +4,7 @@ diff --git a/cargo/private/cargo_build_script.bzl b/cargo/private/cargo_build_sc
 @@ -120,6 +120,63 @@
      executable = True,
  )
- 
+
 +def _strip_stack_protector_for_windows_llvm_mingw(toolchain, args):
 +    """Drop stack protector flags unsupported by llvm-mingw build-script probes."""
 +    if "windows-gnullvm" not in toolchain.target_flag_value:
@@ -64,11 +64,11 @@ diff --git a/cargo/private/cargo_build_script.bzl b/cargo/private/cargo_build_sc
 +
  def get_cc_compile_args_and_env(cc_toolchain, feature_configuration):
      """Gather cc environment variables from the given `cc_toolchain`
- 
+
 @@ -503,6 +560,10 @@
          if not env["AR"]:
              env["AR"] = cc_toolchain.ar_executable
- 
+
 +        cc_c_args = _strip_stack_protector_for_windows_llvm_mingw(toolchain, cc_c_args)
 +        cc_cxx_args = _strip_stack_protector_for_windows_llvm_mingw(toolchain, cc_cxx_args)
 +        cc_c_args = _rewrite_windows_exec_msvc_cc_args(toolchain, cc_c_args)

patches/rusty_v8_prebuilt_out_dir.patch

@@ -6,7 +6,7 @@
 +++ b/build.rs
 @@ -543,10 +543,15 @@
  }
- 
+
  fn static_lib_name(suffix: &str) -> String {
 -  let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
 -  if target_os == "windows" {
@@ -25,7 +25,7 @@
 @@ -577,7 +577,23 @@
    path
  }
- 
+
 +fn out_dir_abs() -> PathBuf {
 +  let cwd = env::current_dir().unwrap();
 +
@@ -45,10 +45,10 @@
 +
    build_dir().join("gn_out").join("obj")
  }
- 
+
 @@ -794,22 +810,23 @@
  }
- 
+
  fn print_link_flags() {
 +  let target = env::var("TARGET").unwrap();
    println!("cargo:rustc-link-lib=static=rusty_v8");
@@ -60,7 +60,7 @@
          .split_whitespace()
          .any(|ba| ba == "use_custom_libcxx=false")
      });
- 
+
    if should_dyn_link_libcxx {
      // Based on https://github.com/alexcrichton/cc-rs/blob/fba7feded71ee4f63cfe885673ead6d7b4f2f454/src/lib.rs#L2462
      if let Ok(stdlib) = env::var("CXXSTDLIB") {

patches/v8_bazel_rules.patch

@@ -8,7 +8,7 @@ index 9648e4a..88efd41 100644
 --- a/orig/v8-14.6.202.11/bazel/defs.bzl
 +++ b/mod/v8-14.6.202.11/bazel/defs.bzl
 @@ -97,7 +97,7 @@ v8_config = rule(
- 
+
  def _default_args():
      return struct(
 -        deps = [":define_flags", "@libcxx//:libc++"],
@@ -75,12 +75,12 @@ index 85f31b7..7314584 100644
 -    default = "none",
 +    default = "False",
  )
- 
+
  # Default setting for v8_enable_pointer_compression.
 @@ -4077,28 +4077,14 @@ filegroup(
      }),
  )
- 
+
 -v8_library(
 -  name = "lib_dragonbox",
 -  srcs = ["third_party/dragonbox/src/include/dragonbox/dragonbox.h"],
@@ -94,7 +94,7 @@ index 85f31b7..7314584 100644
 +    name = "lib_dragonbox",
 +    actual = "@dragonbox//:dragonbox",
  )
- 
+
 -v8_library(
 -  name = "lib_fp16",
 -  srcs = ["third_party/fp16/src/include/fp16.h"],
@@ -110,7 +110,7 @@ index 85f31b7..7314584 100644
 +    name = "lib_fp16",
 +    actual = "@fp16//:fp16",
  )
- 
+
  filegroup(
 @@ -4405,6 +4391,20 @@ genrule(
      srcs = [
@@ -155,11 +155,11 @@ index 85f31b7..7314584 100644
 +        requirement("markupsafe"),
      ],
  )
- 
+
 @@ -4448,6 +4451,15 @@ filegroup(
      ],
  )
- 
+
 +cc_library(
 +    name = "rusty_v8_internal_headers",
 +    hdrs = [
@@ -175,7 +175,7 @@ index 85f31b7..7314584 100644
 @@ -4567,16 +4579,9 @@ cc_library(
      ],
  )
- 
+
 -cc_library(
 -  name = "simdutf",
 -  srcs = ["third_party/simdutf/simdutf.cpp"],
@@ -190,7 +190,7 @@ index 85f31b7..7314584 100644
 +    name = "simdutf",
 +    actual = "@simdutf//:simdutf",
  )
- 
+
  v8_library(
 @@ -4593,7 +4598,7 @@ v8_library(
      copts = ["-Wno-implicit-fallthrough"],
@@ -216,7 +216,7 @@ index 85f31b7..7314584 100644
      actual = "icu/v8",
 +    visibility = ["//visibility:public"],
  )
- 
+
  v8_library(
 @@ -4715,7 +4721,7 @@ v8_binary(
      ],
@@ -226,7 +226,7 @@ index 85f31b7..7314584 100644
 +        "@icu//:icu",
      ],
  )
- 
+
 diff --git a/orig/v8-14.6.202.11/bazel/BUILD.icu b/mod/v8-14.6.202.11/bazel/BUILD.icu
 index 5fda2f4..381386c 100644
 --- a/orig/v8-14.6.202.11/bazel/BUILD.icu

patches/v8_module_deps.patch

@@ -62,13 +62,13 @@ diff --git a/orig/v8-14.6.202.11/MODULE.bazel b/mod/v8-14.6.202.11/MODULE.bazel
 +    commit = "3d2de1816307bac63c16a297e8c4dc501b4076df",
 +    remote = "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
 +)
- 
+
  pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
  pip.parse(
 @@ -22,171 +72,3 @@
  )
  use_repo(pip, "v8_python_deps")
- 
+
 -# Define the local LLVM toolchain repository
 -llvm_toolchain_repository = use_repo_rule("//bazel/toolchain:llvm_repository.bzl", "llvm_toolchain_repository")
 -
@@ -248,22 +248,22 @@ new file mode 100644
 +@@ -2,7 +2,7 @@
 + load("@bazel_skylib//lib:selects.bzl", "selects")
 + load("@rules_license//rules:license.bzl", "license")
-+ 
++
 +-load("@rules_cc//cc:defs.bzl", "cc_test")
 ++load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 + # Placeholder#2 for Guitar, do not remove
-+ 
++
 + package(
 +@@ -134,11 +134,7 @@ COPTS = select({
 +     ],
 + })
-+ 
++
 +-DEFINES = select({
 +-    ":compiler_msvc": ["HWY_SHARED_DEFINE"],
 +-    ":compiler_clangcl": ["HWY_SHARED_DEFINE"],
 +-    "//conditions:default": [],
 +-})
 ++DEFINES = []
-+ 
++
 + # Unused on Bazel builds, where this is not defined/known; Copybara replaces
 + # usages with an empty list.

patches/v8_source_portability.patch

@@ -8,7 +8,7 @@ index 179a10f..4791e96 100644
 +++ b/mod/v8-14.6.202.11/src/base/bits.h
 @@ -270,11 +270,17 @@ inline constexpr uint32_t RoundDownToPowerOfTwo32(uint32_t value) {
  }
- 
+
  // Precondition: 0 <= shift < 32
 +#ifdef RotateRight32
 +#undef RotateRight32
@@ -16,7 +16,7 @@ index 179a10f..4791e96 100644
  inline constexpr uint32_t RotateRight32(uint32_t value, uint32_t shift) {
    return (value >> shift) | (value << ((32 - shift) & 31));
  }
- 
+
  // Precondition: 0 <= shift < 32
 +#ifdef RotateLeft32
 +#undef RotateLeft32
@@ -31,7 +31,7 @@ index 6176ed4..a02043d 100644
 @@ -64,6 +64,7 @@ namespace {
  volatile sig_atomic_t in_signal_handler = 0;
  bool dump_stack_in_signal_handler = true;
- 
+
 +#if HAVE_EXECINFO_H
  // The prefix used for mangled symbols, per the Itanium C++ ABI:
  // http://www.codesourcery.com/cxx-abi/abi.html#mangling
@@ -39,7 +39,7 @@ index 6176ed4..a02043d 100644
 @@ -73,7 +74,6 @@ const char kMangledSymbolPrefix[] = "_Z";
  const char kSymbolCharacters[] =
      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
- 
+
 -#if HAVE_EXECINFO_H
  // Demangles C++ symbols in the given text. Example:
  //
@@ -49,14 +49,14 @@ index 861cfe4..1e73954 100644
 --- a/orig/v8-14.6.202.11/src/base/export-template.h
 +++ b/mod/v8-14.6.202.11/src/base/export-template.h
 @@ -153,8 +153,10 @@
- 
+
  EXPORT_TEMPLATE_TEST(DEFAULT, );
  EXPORT_TEMPLATE_TEST(DEFAULT, __attribute__((visibility("default"))));
 +#if defined(_MSC_VER)
  EXPORT_TEMPLATE_TEST(MSVC_HACK, __declspec(dllexport));
  EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport));
 +#endif
- 
+
  #undef EXPORT_TEMPLATE_TEST
  #undef EXPORT_TEMPLATE_TEST_DEFAULT_DEFAULT
 diff --git a/orig/v8-14.6.202.11/src/base/platform/platform-posix.cc b/mod/v8-14.6.202.11/src/base/platform/platform-posix.cc
@@ -65,12 +65,12 @@ index 420df0b..6f47969 100644
 +++ b/mod/v8-14.6.202.11/src/base/platform/platform-posix.cc
 @@ -95,7 +95,7 @@ extern int madvise(caddr_t, size_t, int);
  #endif
- 
+
  #if defined(V8_LIBC_GLIBC)
 -extern "C" void* __libc_stack_end;
 +extern "C" void* __libc_stack_end V8_WEAK;
  #endif
- 
+
  namespace v8 {
 @@ -1476,7 +1476,8 @@ Stack::StackSlot Stack::ObtainCurrentThreadStackStart() {
    // __libc_stack_end is process global and thus is only valid for
@@ -94,13 +94,13 @@ index f5d9ddc..542ea1a 100644
 -
 -#ifndef __MINGW64_VERSION_MAJOR
 +#if !defined(__MINGW64_VERSION_MAJOR)
- 
+
  #define _TRUNCATE 0
  #define STRUNCATE 80
 @@ -81,9 +79,6 @@ inline void MemoryFence() {
    __asm__ __volatile__("xchgl %%eax,%0 ":"=r" (barrier));
  }
- 
+
 -#endif  // __MINGW64_VERSION_MAJOR
 -
 -
@@ -110,25 +110,25 @@ index f5d9ddc..542ea1a 100644
 @@ -134,6 +129,8 @@ int strncpy_s(char* dest, size_t dest_size, const char* source, size_t count) {
    return 0;
  }
- 
+
 +#endif  // !defined(__MINGW64_VERSION_MAJOR)
 +
  #endif  // __MINGW32__
- 
+
  namespace v8 {
 @@ -743,8 +740,10 @@ void OS::StrNCpy(char* dest, int length, const char* src, size_t n) {
  }
- 
- 
+
+
 +#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
  #undef _TRUNCATE
  #undef STRUNCATE
 +#endif
- 
+
  DEFINE_LAZY_LEAKY_OBJECT_GETTER(RandomNumberGenerator,
                                  GetPlatformRandomNumberGenerator)
 @@ -1894,3 +1893,4 @@ Stack::StackSlot Stack::GetCurrentStackPosition() {
- 
+
  }  // namespace base
  }  // namespace v8
 +
@@ -294,9 +294,9 @@ index bda0e43..b44f1d9 100644
 --- a/orig/v8-14.6.202.11/src/libplatform/default-thread-isolated-allocator.cc
 +++ b/mod/v8-14.6.202.11/src/libplatform/default-thread-isolated-allocator.cc
 @@ -23,7 +23,7 @@ extern int pkey_free(int pkey) V8_WEAK;
- 
+
  namespace {
- 
+
 -bool KernelHasPkruFix() {
 +[[maybe_unused]] bool KernelHasPkruFix() {
    // PKU was broken on Linux kernels before 5.13 (see
@@ -319,9 +319,9 @@ index 27e748f..cbf886c 100644
 +#endif  // !V8_CC_MSVC || V8_OS_WIN
    memset(&gc_subroot_entries_, 0, sizeof(gc_subroot_entries_));
  }
- 
+
 @@ -3878,3 +3878,4 @@ void HeapSnapshotJSONSerializer::SerializeLocations() {
  }
- 
+
  }  // namespace v8::internal
 +

patches/windows-link.patch

@@ -6,5 +6,5 @@ index 2d5a2a2..6e8c4cd 100644
 -#![doc = include_str!("../readme.md")]
 +#![doc = "windows-link"]
  #![no_std]
- 
+
  /// Defines an external function to import.