Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
71c4e4c
Add isolated extension workers for native shell panes
demrom Oct 17, 2026
a3e8a22
Embed pinned Herdr runtime in the mini app
demrom Oct 17, 2026
751c239
Merge master into feature/extension-shell-workers
demrom Oct 18, 2026
dced303
Merge master into feature/embedded-herdr
demrom Oct 18, 2026
1b8fe97
Merge current master into extension shell workers
demrom Oct 20, 2026
38d15ce
Export worker pane callbacks in Release builds
demrom Oct 20, 2026
6ad68a7
Avoid status RPCs while shell workers are running
demrom Oct 20, 2026
1ac4bdb
Cap concurrent shell workers at the physical core count, raisable in …
demrom Oct 20, 2026
5e0a701
Merge upstream master into embedded Herdr integration
demrom Oct 22, 2026
e1b2de4
Merge current master into extension shell workers
demrom Oct 23, 2026
12c0849
Add ashell_pane_spawn_ex: separate stderr and an optional terminal fo…
demrom Oct 20, 2026
b48641d
Broker nested shell spawns through the host worker pool
demrom Oct 23, 2026
cfe5cdc
Expose an explicit host pane broker and report lost worker connections
demrom Oct 23, 2026
b33ae54
Close pane descriptors when stream setup fails
demrom Oct 23, 2026
cf020ff
Document host pane interrupt and usage contracts
demrom Oct 23, 2026
ad7d258
Report individual worker completion assertion failures
demrom Oct 23, 2026
97551c9
Keep worker fixtures independent of Dash login profiles
demrom Oct 23, 2026
41192c3
Compare worker fixture HOME by directory identity
demrom Oct 23, 2026
83eb230
Merge remote-tracking branch 'origin/master' into local/publication82…
demrom Oct 23, 2026
83b0c1d
Merge master into embedded Herdr
demrom Oct 24, 2026
ee8e228
Merge commit '83b0c1d0cae09e564c35da9d0ef1507158a12cca' into feature/…
demrom Oct 25, 2026
04db79a
Add nested shell-worker requests and shared-container admission
demrom Oct 25, 2026
0c59f8d
Add worker-backed tmux 3.8 to the mini app
demrom Oct 25, 2026
c81ab82
Merge master into extension shell workers
demrom Nov 6, 2026
b5fba5c
Merge current worker base into embedded Herdr
demrom Nov 6, 2026
d537b22
Merge current worker and Herdr bases into tmux
demrom Nov 6, 2026
60b42fe
Merge branch 'master' into feature/tmux-local
demrom Nov 8, 2026
872f30f
Point the noPython libpng reference at the downloaded xcframework
demrom Nov 9, 2026
e3d2944
Merge branch 'master' into feature/tmux-local
demrom Nov 9, 2026
0cede69
Merge #1168 (libpng path fix) to unbreak the noPython CI builds
demrom Nov 10, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 201 additions & 0 deletions Herdr/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
28 changes: 28 additions & 0 deletions Herdr/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Embedded Herdr

The mini target embeds Herdr v0.9.3 (`7b116c05bfda646af39d2524c54e70c751f57ee8`). Its original Rust client, server, renderer and Ghostty terminal engine run inside the app. Each pane runs its shell in a Generic Non-UI extension worker through `ashell_pane_*`.

Install Rust 1.96.1 with the appropriate iOS target, Zig 0.16.0, Git and Xcode. Build the static archive before building the mini app:

```sh
rustup target add --toolchain 1.96.1 aarch64-apple-ios-sim
./Herdr/build.sh aarch64-apple-ios-sim
```

For a signed device build, select `aarch64-apple-ios` in both commands. The recipe downloads the pinned source, applies the adapter patches, builds with the locked dependencies and prints the archive checksum. `Herdr/build/` contains generated files and is ignored. Rerunning resets only the recipe's generated source checkout and preserves its build caches. Set `ZIG` to select a Zig executable or `ZIG_GLOBAL_CACHE_DIR` to use an existing package cache.

The mini target selects the archive matching its SDK, retains `herdr_ios_main` for command lookup, registers `herdr`, forwards terminal resize events and includes Herdr's Apache 2.0 license in the app resources. The worker pool requires iOS 26 or later and its matching ios_system and Dash prerequisites.

Run `herdr` in the app terminal. `herdr --version`, `--help`, `--skill` and `--default-config` write to the current command streams. Other desktop CLI operations return status 78. One embedded Herdr instance owns the host terminal at a time; another returns status 16. The client and server communicate through an in-process socket pair during that command. There is no detached background server or desktop IPC service.

The adapter forwards pane input, output, geometry, exit status, interrupts and close to the pool. Cwd defaults to the current command directory and pane calls are serialized per worker handle. Restored container paths are relocated under the current app home. Worker capacity, termination and recovery follow the pool contract in `ShellWorkers/NativePane.h` and the root README.

To check an installed disposable Simulator app, install AXe and jq, start with a fresh shell in a portrait iPhone Simulator and keep Herdr's default keybindings and tab-name prompts. Run:

```sh
./Herdr/tests/three-panes.sh SIMULATOR_UDID APP_BUNDLE_ID URL_SCHEME
```

The harness enters commands through the public terminal UI with paced keystrokes, confirms each new tab's name, and checks that three panes produce distinct worker PIDs belonging to the installed app and remain alive together. It then detaches and checks `herdr --version` through the same app process. Receipt files stay in the app's Documents directory. Against an app without Herdr, the same harness fails on the first missing receipt.

CPU overlap, pane isolation and cancellation, physical-device behavior, application backgrounding, saved-session migration and worker WASM routing require separate qualification.
52 changes: 52 additions & 0 deletions Herdr/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!/bin/bash
# Build the pinned embedded runtime; all generated files stay in Herdr/build.
set -euo pipefail
root=$(cd "$(dirname "$0")" && pwd)
source_root="$root/build/source"
target=${1:-aarch64-apple-ios-sim}
revision=7b116c05bfda646af39d2524c54e70c751f57ee8
case "$target" in
aarch64-apple-ios-sim | aarch64-apple-ios) ;;
*)
echo "usage: $0 [aarch64-apple-ios-sim|aarch64-apple-ios]" >&2
exit 2
;;
esac
command -v cargo >/dev/null
command -v git >/dev/null
command -v "${ZIG:-zig}" >/dev/null
if [ -L "$root/build" ] || [ -L "$source_root" ]; then
echo "Herdr build directories must not be symbolic links" >&2
exit 2
fi
mkdir -p "$root/build"
if [ ! -d "$source_root/.git" ]; then
git clone --depth 1 --branch v0.9.3 https://github.com/herdrdev/herdr.git "$source_root"
fi
if [ "$(git -C "$source_root" remote get-url origin)" != https://github.com/herdrdev/herdr.git ]; then
echo "unexpected origin in the generated Herdr checkout" >&2
exit 2
fi
if [ "$(git -C "$source_root" rev-parse HEAD)" != "$revision" ]; then
echo "Herdr v0.9.3 does not match the pinned source revision" >&2
exit 2
fi
# This checkout contains only generated build inputs. Keep user repositories out.
git -C "$source_root" reset --hard --quiet "$revision"
git -C "$source_root" clean -fdq
git -C "$source_root" apply "$root/native/platform.patch"
git -C "$source_root" apply "$root/native/entry.patch"
git -C "$source_root" apply --unidiff-zero "$root/native/runtime.patch"
git -C "$source_root" apply "$root/native/input-startup.patch"
cp "$root/native/ios_entry.rs" "$source_root/src/ios_entry.rs"
cp "$root/native/host_io.rs" "$source_root/src/host_io.rs"
cp "$root/native/ios_ipc.rs" "$source_root/src/ios_ipc.rs"
cp "$root/native/ios_pty.rs" "$source_root/src/pty/ios.rs"
export CARGO_TARGET_DIR="$root/build/target"
export ZIG_GLOBAL_CACHE_DIR="${ZIG_GLOBAL_CACHE_DIR:-$root/build/zig-cache}"
export LIBGHOSTTY_VT_SIMD=false LIBGHOSTTY_VT_OPTIMIZE=ReleaseSmall
(
cd "$source_root"
cargo +1.96.1 build --locked --release --lib --target "$target"
)
shasum -a 256 "$CARGO_TARGET_DIR/$target/release/libherdr_ios.a"
86 changes: 86 additions & 0 deletions Herdr/native/entry.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,11 @@
"LICENSE",
"Cargo.toml",
]
+
+[lib]
+name = "herdr_ios"
+path = "src/main.rs"
+crate-type = ["staticlib"]

[workspace]
members = ["crates/ghostty-vt"]
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,20 @@
+#[cfg(target_os = "ios")]
+macro_rules! print { ($($arg:tt)*) => { crate::ios_entry::output(false, format_args!($($arg)*)) }; }
+#[cfg(target_os = "ios")]
+macro_rules! println {
+ () => { print!("\n") };
+ ($($arg:tt)*) => { print!("{}\n", format_args!($($arg)*)) };
+}
+#[cfg(target_os = "ios")]
+macro_rules! eprint { ($($arg:tt)*) => { crate::ios_entry::output(true, format_args!($($arg)*)) }; }
+#[cfg(target_os = "ios")]
+macro_rules! eprintln {
+ () => { eprint!("\n") };
+ ($($arg:tt)*) => { eprint!("{}\n", format_args!($($arg)*)) };
+}
+#[cfg(target_os = "ios")]
+mod ios_entry;
+
use std::io;

pub(crate) const HERDR_ENV_VAR: &str = "HERDR_ENV";
@@ -512,9 +529,14 @@
std::process::exit(2);
}
};
+ run_main(raw_args)
+}
+
+fn run_main(raw_args: Vec<String>) -> io::Result<()> {
if let Some(outcome) = cli::maybe_run_machine(&raw_args) {
return finish_cli(outcome);
}
+ #[cfg(not(target_os = "ios"))]
let args = match session::configure_from_args(&raw_args) {
Ok(args) => args,
Err(err) => {
@@ -523,6 +545,8 @@
std::process::exit(2);
}
};
+ #[cfg(target_os = "ios")]
+ let args = raw_args;
let (args, remote_launch) = match remote::extract_remote_args(&args) {
Ok(parsed) => parsed,
Err(err) => {
--- a/src/platform/unix_common.rs
+++ b/src/platform/unix_common.rs
@@ -253,10 +253,12 @@
}
}

+#[cfg(not(target_os = "ios"))]
pub(crate) fn begin_cli_output() {
set_sigpipe_disposition(libc::SIG_DFL);
}

+#[cfg(not(target_os = "ios"))]
pub(crate) fn end_cli_output() {
set_sigpipe_disposition(libc::SIG_IGN);
}
@@ -634,3 +636,9 @@
std::fs::remove_dir_all(dir).unwrap();
}
}
+
+// The embedding host owns signal dispositions, not an informational command.
+#[cfg(target_os = "ios")]
+pub(crate) fn begin_cli_output() {}
+#[cfg(target_os = "ios")]
+pub(crate) fn end_cli_output() {}
23 changes: 23 additions & 0 deletions Herdr/native/herdr_ios.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef HERDR_IOS_H
#define HERDR_IOS_H

#ifdef __cplusplus
extern "C" {
#endif

/* Call on an ios_system command thread with streams already installed.
* argv is borrowed. The command owns duplicated descriptors, not host FILEs.
* Supports original local UI and informational flags. Other CLI paths return 78.
* Status: 0 success, 1 I/O error, 2 invalid arguments, 16 singleton busy,
* 70 caught Rust panic, 78 unsupported embedded operation.
* Server and socketpair endpoints live only during this embedded command.
* The host supplies the seven-argument ashell_pane_spawn ABI and related functions.
*/
int herdr_ios_main(int argc, const char **argv);
/* Call when host terminal dimensions change. Zero dimensions are ignored. */
void herdr_ios_resize(unsigned short cols, unsigned short rows);

#ifdef __cplusplus
}
#endif
#endif
Loading
Loading