Merge branch 'fix/t3code-gitea-provider'

This commit is contained in:
m3tam3re committed 2026-11-01 13:27:48 +01:00
commit 0c52f97bde
12 files changed
+359 -84

No files matched your search

+7
View File
@@ -71,3 +71,10 @@ bd.db
# They would override fork protection in .git/info/exclude. # They would override fork protection in .git/info/exclude.
# Config files (metadata.json, config.yaml) are tracked by git by default # Config files (metadata.json, config.yaml) are tracked by git by default
# since no pattern above ignores them. # since no pattern above ignores them.
# Added by bd (missing required patterns)
*.gate.lock*
last_pull
proxieddb/
dolt-server-config.yaml
proxied_server_client_info.json
+2 -1
View File
@@ -53,4 +53,5 @@
# - github.org # - github.org
# - github.repo # - github.repo
sync.remote: "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixos-config.git" sync:
remote: "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixos-config.git"
+46 -11
View File
@@ -1,24 +1,59 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# --- BEGIN BEADS INTEGRATION v1.0.3 --- # --- BEGIN BEADS INTEGRATION v1.3.2 ---
# This section is managed by beads. Do not remove these markers. # This section is managed by beads. Do not remove these markers.
if command -v bd >/dev/null 2>&1; then if command -v bd >/dev/null 2>&1; then
export BD_GIT_HOOK=1 export BD_GIT_HOOK=1
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300} _bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
if command -v timeout >/dev/null 2>&1; then case "$_bd_timeout" in
timeout "$_bd_timeout" bd hooks run post-checkout "$@" *[!0-9]*|'') _bd_timeout_invalid=1 ;;
_bd_exit=$? *[1-9]*) _bd_timeout_invalid=0 ;;
if [ $_bd_exit -eq 124 ]; then *) _bd_timeout_invalid=1 ;;
echo >&2 "beads: hook 'post-checkout' timed out after ${_bd_timeout}s — continuing without beads" esac
if [ "$_bd_timeout_invalid" -eq 1 ]; then
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
_bd_timeout=300
fi
_bd_timeout_backend=none
_bd_timeout_command=
for _bd_timeout_candidate in timeout gtimeout; do
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
case "$_bd_timeout_version" in
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
esac
fi
fi
done
if [ -n "$_bd_timeout_command" ]; then
_bd_timeout_backend=coreutils
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run post-checkout "$@"; then
_bd_exit=0 _bd_exit=0
else
_bd_exit=$?
fi
elif command -v perl >/dev/null 2>&1; then
_bd_timeout_backend=perl
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run post-checkout "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi fi
else else
bd hooks run post-checkout "$@" echo >&2 "beads: hook 'post-checkout' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
_bd_exit=$? if bd hooks run post-checkout "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi
fi fi
if [ $_bd_exit -eq 3 ]; then if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
echo >&2 "beads: hook 'post-checkout' timed out after ${_bd_timeout}s — continuing without beads"
_bd_exit=0
fi
if [ "$_bd_exit" -eq 3 ]; then
echo >&2 "beads: database not initialized — skipping hook 'post-checkout'" echo >&2 "beads: database not initialized — skipping hook 'post-checkout'"
_bd_exit=0 _bd_exit=0
fi fi
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
fi fi
# --- END BEADS INTEGRATION v1.0.3 --- # --- END BEADS INTEGRATION v1.3.2 ---
+46 -11
View File
@@ -1,24 +1,59 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# --- BEGIN BEADS INTEGRATION v1.0.3 --- # --- BEGIN BEADS INTEGRATION v1.3.2 ---
# This section is managed by beads. Do not remove these markers. # This section is managed by beads. Do not remove these markers.
if command -v bd >/dev/null 2>&1; then if command -v bd >/dev/null 2>&1; then
export BD_GIT_HOOK=1 export BD_GIT_HOOK=1
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300} _bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
if command -v timeout >/dev/null 2>&1; then case "$_bd_timeout" in
timeout "$_bd_timeout" bd hooks run post-merge "$@" *[!0-9]*|'') _bd_timeout_invalid=1 ;;
_bd_exit=$? *[1-9]*) _bd_timeout_invalid=0 ;;
if [ $_bd_exit -eq 124 ]; then *) _bd_timeout_invalid=1 ;;
echo >&2 "beads: hook 'post-merge' timed out after ${_bd_timeout}s — continuing without beads" esac
if [ "$_bd_timeout_invalid" -eq 1 ]; then
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
_bd_timeout=300
fi
_bd_timeout_backend=none
_bd_timeout_command=
for _bd_timeout_candidate in timeout gtimeout; do
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
case "$_bd_timeout_version" in
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
esac
fi
fi
done
if [ -n "$_bd_timeout_command" ]; then
_bd_timeout_backend=coreutils
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run post-merge "$@"; then
_bd_exit=0 _bd_exit=0
else
_bd_exit=$?
fi
elif command -v perl >/dev/null 2>&1; then
_bd_timeout_backend=perl
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run post-merge "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi fi
else else
bd hooks run post-merge "$@" echo >&2 "beads: hook 'post-merge' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
_bd_exit=$? if bd hooks run post-merge "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi
fi fi
if [ $_bd_exit -eq 3 ]; then if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
echo >&2 "beads: hook 'post-merge' timed out after ${_bd_timeout}s — continuing without beads"
_bd_exit=0
fi
if [ "$_bd_exit" -eq 3 ]; then
echo >&2 "beads: database not initialized — skipping hook 'post-merge'" echo >&2 "beads: database not initialized — skipping hook 'post-merge'"
_bd_exit=0 _bd_exit=0
fi fi
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
fi fi
# --- END BEADS INTEGRATION v1.0.3 --- # --- END BEADS INTEGRATION v1.3.2 ---
+46 -11
View File
@@ -1,24 +1,59 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# --- BEGIN BEADS INTEGRATION v1.0.3 --- # --- BEGIN BEADS INTEGRATION v1.3.2 ---
# This section is managed by beads. Do not remove these markers. # This section is managed by beads. Do not remove these markers.
if command -v bd >/dev/null 2>&1; then if command -v bd >/dev/null 2>&1; then
export BD_GIT_HOOK=1 export BD_GIT_HOOK=1
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300} _bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
if command -v timeout >/dev/null 2>&1; then case "$_bd_timeout" in
timeout "$_bd_timeout" bd hooks run pre-commit "$@" *[!0-9]*|'') _bd_timeout_invalid=1 ;;
_bd_exit=$? *[1-9]*) _bd_timeout_invalid=0 ;;
if [ $_bd_exit -eq 124 ]; then *) _bd_timeout_invalid=1 ;;
echo >&2 "beads: hook 'pre-commit' timed out after ${_bd_timeout}s — continuing without beads" esac
if [ "$_bd_timeout_invalid" -eq 1 ]; then
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
_bd_timeout=300
fi
_bd_timeout_backend=none
_bd_timeout_command=
for _bd_timeout_candidate in timeout gtimeout; do
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
case "$_bd_timeout_version" in
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
esac
fi
fi
done
if [ -n "$_bd_timeout_command" ]; then
_bd_timeout_backend=coreutils
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run pre-commit "$@"; then
_bd_exit=0 _bd_exit=0
else
_bd_exit=$?
fi
elif command -v perl >/dev/null 2>&1; then
_bd_timeout_backend=perl
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run pre-commit "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi fi
else else
bd hooks run pre-commit "$@" echo >&2 "beads: hook 'pre-commit' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
_bd_exit=$? if bd hooks run pre-commit "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi
fi fi
if [ $_bd_exit -eq 3 ]; then if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
echo >&2 "beads: hook 'pre-commit' timed out after ${_bd_timeout}s — continuing without beads"
_bd_exit=0
fi
if [ "$_bd_exit" -eq 3 ]; then
echo >&2 "beads: database not initialized — skipping hook 'pre-commit'" echo >&2 "beads: database not initialized — skipping hook 'pre-commit'"
_bd_exit=0 _bd_exit=0
fi fi
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
fi fi
# --- END BEADS INTEGRATION v1.0.3 --- # --- END BEADS INTEGRATION v1.3.2 ---
+46 -11
View File
@@ -1,24 +1,59 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# --- BEGIN BEADS INTEGRATION v1.0.3 --- # --- BEGIN BEADS INTEGRATION v1.3.2 ---
# This section is managed by beads. Do not remove these markers. # This section is managed by beads. Do not remove these markers.
if command -v bd >/dev/null 2>&1; then if command -v bd >/dev/null 2>&1; then
export BD_GIT_HOOK=1 export BD_GIT_HOOK=1
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300} _bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
if command -v timeout >/dev/null 2>&1; then case "$_bd_timeout" in
timeout "$_bd_timeout" bd hooks run pre-push "$@" *[!0-9]*|'') _bd_timeout_invalid=1 ;;
_bd_exit=$? *[1-9]*) _bd_timeout_invalid=0 ;;
if [ $_bd_exit -eq 124 ]; then *) _bd_timeout_invalid=1 ;;
echo >&2 "beads: hook 'pre-push' timed out after ${_bd_timeout}s — continuing without beads" esac
if [ "$_bd_timeout_invalid" -eq 1 ]; then
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
_bd_timeout=300
fi
_bd_timeout_backend=none
_bd_timeout_command=
for _bd_timeout_candidate in timeout gtimeout; do
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
case "$_bd_timeout_version" in
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
esac
fi
fi
done
if [ -n "$_bd_timeout_command" ]; then
_bd_timeout_backend=coreutils
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run pre-push "$@"; then
_bd_exit=0 _bd_exit=0
else
_bd_exit=$?
fi
elif command -v perl >/dev/null 2>&1; then
_bd_timeout_backend=perl
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run pre-push "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi fi
else else
bd hooks run pre-push "$@" echo >&2 "beads: hook 'pre-push' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
_bd_exit=$? if bd hooks run pre-push "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi
fi fi
if [ $_bd_exit -eq 3 ]; then if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
echo >&2 "beads: hook 'pre-push' timed out after ${_bd_timeout}s — continuing without beads"
_bd_exit=0
fi
if [ "$_bd_exit" -eq 3 ]; then
echo >&2 "beads: database not initialized — skipping hook 'pre-push'" echo >&2 "beads: database not initialized — skipping hook 'pre-push'"
_bd_exit=0 _bd_exit=0
fi fi
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
fi fi
# --- END BEADS INTEGRATION v1.0.3 --- # --- END BEADS INTEGRATION v1.3.2 ---
+46 -11
View File
@@ -1,24 +1,59 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# --- BEGIN BEADS INTEGRATION v1.0.3 --- # --- BEGIN BEADS INTEGRATION v1.3.2 ---
# This section is managed by beads. Do not remove these markers. # This section is managed by beads. Do not remove these markers.
if command -v bd >/dev/null 2>&1; then if command -v bd >/dev/null 2>&1; then
export BD_GIT_HOOK=1 export BD_GIT_HOOK=1
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300} _bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
if command -v timeout >/dev/null 2>&1; then case "$_bd_timeout" in
timeout "$_bd_timeout" bd hooks run prepare-commit-msg "$@" *[!0-9]*|'') _bd_timeout_invalid=1 ;;
_bd_exit=$? *[1-9]*) _bd_timeout_invalid=0 ;;
if [ $_bd_exit -eq 124 ]; then *) _bd_timeout_invalid=1 ;;
echo >&2 "beads: hook 'prepare-commit-msg' timed out after ${_bd_timeout}s — continuing without beads" esac
if [ "$_bd_timeout_invalid" -eq 1 ]; then
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
_bd_timeout=300
fi
_bd_timeout_backend=none
_bd_timeout_command=
for _bd_timeout_candidate in timeout gtimeout; do
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
case "$_bd_timeout_version" in
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
esac
fi
fi
done
if [ -n "$_bd_timeout_command" ]; then
_bd_timeout_backend=coreutils
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run prepare-commit-msg "$@"; then
_bd_exit=0 _bd_exit=0
else
_bd_exit=$?
fi
elif command -v perl >/dev/null 2>&1; then
_bd_timeout_backend=perl
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run prepare-commit-msg "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi fi
else else
bd hooks run prepare-commit-msg "$@" echo >&2 "beads: hook 'prepare-commit-msg' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
_bd_exit=$? if bd hooks run prepare-commit-msg "$@"; then
_bd_exit=0
else
_bd_exit=$?
fi
fi fi
if [ $_bd_exit -eq 3 ]; then if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
echo >&2 "beads: hook 'prepare-commit-msg' timed out after ${_bd_timeout}s — continuing without beads"
_bd_exit=0
fi
if [ "$_bd_exit" -eq 3 ]; then
echo >&2 "beads: database not initialized — skipping hook 'prepare-commit-msg'" echo >&2 "beads: database not initialized — skipping hook 'prepare-commit-msg'"
_bd_exit=0 _bd_exit=0
fi fi
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
fi fi
# --- END BEADS INTEGRATION v1.0.3 --- # --- END BEADS INTEGRATION v1.3.2 ---
+2
View File
@@ -49,6 +49,8 @@
# with allowUnfree). Do NOT flatten to top-level attrs — see # with allowUnfree). Do NOT flatten to top-level attrs — see
# overlays/default.nix. # overlays/default.nix.
inputs.llm-agents.overlays.shared-nixpkgs inputs.llm-agents.overlays.shared-nixpkgs
# Wraps pkgs.llm-agents.t3code* with the agents' m3ta-chiron identity.
outputs.overlays.t3code-agent-identity
# You can also add overlays exported from other flakes: # You can also add overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default # neovim-nightly-overlay.overlays.default
+4
View File
@@ -1,6 +1,10 @@
{ {
age = { age = {
secrets = { secrets = {
hermes-gitea-token = {
file = ../../secrets/hermes-gitea-token.age;
owner = "m3tam3re";
};
hermes-env = { hermes-env = {
file = ../../secrets/hermes-env.age; file = ../../secrets/hermes-env.age;
}; };
+19 -28
View File
@@ -16,12 +16,14 @@
# so no deploy token) into ~/.agents/skills + ~/.config/opencode/*. A # so no deploy token) into ~/.agents/skills + ~/.config/opencode/*. A
# path unit mirrors skills into ~/.claude/skills for Claude Code # path unit mirrors skills into ~/.claude/skills for Claude Code
# (port of m3ta-home profiles/sets/coding/agents/claude-skills.nix). # (port of m3ta-home profiles/sets/coding/agents/claude-skills.nix).
# - Git identity: every harness spawned by `t3 serve` commits as the # - Git identity and Gitea push auth: m3ta-chiron for every harness spawned
# m3ta-chiron bot account — via service env vars, deliberately NOT via # by T3, baked into the package (overlays/default.nix,
# ~/.gitconfig, so m3tam3re's interactive git on this host is untouched. # t3code-agent-identity), so m3tam3re's interactive git is untouched.
# - Gitea SSH: m3tam3re's ssh config pins User gitea + key ~/.ssh/gitea # - Gitea SSH: m3tam3re's ssh config pins User gitea + key ~/.ssh/gitea
# (one-time keygen; pubkey added to the m3ta-chiron account) — covers # (one-time keygen; pubkey added to the m3ta-chiron account) for
# git remotes AND git+ssh:// flake inputs. Host key pinned system-wide. # interactive use and git+ssh:// flake inputs. Host key pinned system-wide.
# - Gitea change requests: tea with the hermes-gitea-token agenix secret,
# baked into the same package.
# #
# One-time interactive steps after deploy (deliberately NOT declarative — # One-time interactive steps after deploy (deliberately NOT declarative —
# subscription auth must live in each harness's own credential store and # subscription auth must live in each harness's own credential store and
@@ -53,16 +55,6 @@
cockpitUser = "m3tam3re"; cockpitUser = "m3tam3re";
cockpitHome = "/home/${cockpitUser}"; cockpitHome = "/home/${cockpitUser}";
# Commit identity of the T3 Code agents: the fleet bot account. Env
# vars are respected by git in every process the service spawns; they
# survive restarts and stay out of m3tam3re's dotfiles.
gitIdentityEnv = {
GIT_AUTHOR_NAME = "m3ta-chiron";
GIT_AUTHOR_EMAIL = "m3ta-chiron@agentmail.to";
GIT_COMMITTER_NAME = "m3ta-chiron";
GIT_COMMITTER_EMAIL = "m3ta-chiron@agentmail.to";
};
# SSH to the private Gitea for the T3 lane. Sits in m3tam3re's ssh # SSH to the private Gitea for the T3 lane. Sits in m3tam3re's ssh
# config (per-user — Hermes' own gitea access via its own ssh config # config (per-user — Hermes' own gitea access via its own ssh config
# is unaffected). URL-embedded users (gitea@code.m3ta.dev) match the # is unaffected). URL-embedded users (gitea@code.m3ta.dev) match the
@@ -115,6 +107,7 @@ in {
pkgs.llm-agents.t3code pkgs.llm-agents.t3code
pkgs.llm-agents.opencode2 pkgs.llm-agents.opencode2
pkgs.llm-agents.claude-code pkgs.llm-agents.claude-code
pkgs.llm-agents.beads
pkgs.agent-lib pkgs.agent-lib
]; ];
@@ -134,25 +127,21 @@ in {
RestartSec = "5"; RestartSec = "5";
}; };
environment = environment = {
{ T3CODE_PORT = toString port;
T3CODE_PORT = toString port; # Deterministic service context: HOME explicit so tools resolve ~ in
# Deterministic service context: HOME explicit so ssh/git resolve # every process this service spawns, however deep t3's pty/sandbox
# ~ in every process this service spawns, however deep t3's # chain resets the environment.
# pty/sandbox chain resets the environment. HOME = cockpitHome;
HOME = cockpitHome; };
# Independent of HOME entirely: git uses exactly this ssh config
# (absolute store path) for every gitea remote.
GIT_SSH_COMMAND = "ssh -F ${t3SshConfig}";
}
// gitIdentityEnv;
# Harness CLIs and git for the agents T3 Code spawns. # Harness CLIs, git and the issue tracker for the agents T3 Code spawns.
path = with pkgs; [ path = with pkgs; [
git git
openssh openssh
llm-agents.opencode2 llm-agents.opencode2
llm-agents.claude-code llm-agents.claude-code
llm-agents.beads
]; ];
}; };
@@ -171,6 +160,8 @@ in {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d ${cockpitHome}/.ssh 0700 ${cockpitUser} users -" "d ${cockpitHome}/.ssh 0700 ${cockpitUser} users -"
"L+ ${cockpitHome}/.ssh/config - - - - ${t3SshConfig}" "L+ ${cockpitHome}/.ssh/config - - - - ${t3SshConfig}"
# The fleet-wide key path the T3 package expects (see t3code-agent-identity).
"L+ ${cockpitHome}/.ssh/m3ta-chiron - - - - ${cockpitHome}/.ssh/gitea"
]; ];
# ── agent-lib v2 client: skills/commands/agents for the harnesses ──── # ── agent-lib v2 client: skills/commands/agents for the harnesses ────
+4
View File
@@ -1,6 +1,10 @@
{ {
age = { age = {
secrets = { secrets = {
hermes-gitea-token = {
file = ../../secrets/hermes-gitea-token.age;
owner = "m3tam3re";
};
anytype-key = { anytype-key = {
file = ../../secrets/anytype-key.age; file = ../../secrets/anytype-key.age;
owner = "m3tam3re"; owner = "m3tam3re";
+91
View File
@@ -74,6 +74,97 @@
opencode-desktop = final.llm-agents.opencode2-desktop; opencode-desktop = final.llm-agents.opencode2-desktop;
}; };
# T3 Code agents act as the m3ta-chiron bot on every host. Baked into the
# T3 packages rather than a session or service: everything T3 spawns
# inherits it, however T3 was launched (desktop launcher, systemd, shell),
# and any host installing T3 gets it. Must come AFTER shared-nixpkgs.
#
# Push auth needs ~/.ssh/m3ta-chiron on each host, with its pubkey on the
# m3ta-chiron Gitea account. A missing key fails the push instead of falling
# back to a personal key. Other hosts keep the user's own ssh config.
#
# Change requests need the agenix secret hermes-gitea-token on each host,
# owned by the T3 user. Without it T3 cannot recognize code.m3ta.dev as Gitea.
t3code-agent-identity = final: prev: let
identity = {
name = "m3ta-chiron";
email = "m3ta-chiron@agentmail.to";
};
giteaKnownHosts = final.writeText "gitea-known-hosts" ''
code.m3ta.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmmqZ4GgDEXJgj8uYrZAr/EoLIA6LJGkTIyKGQD/60a
'';
# ssh expands ~ from passwd, so this does not depend on $HOME.
sshConfig = final.writeText "t3-agent-ssh-config" ''
Host code.m3ta.dev
User gitea
IdentityFile ~/.ssh/m3ta-chiron
IdentitiesOnly yes
UserKnownHostsFile ${giteaKnownHosts}
# Conditional: IdentityFile accumulates across matching blocks, so a
# personal code.m3ta.dev entry must not be read for this host.
Host * !code.m3ta.dev
Include ~/.ssh/config
'';
# T3 only recognizes a Gitea on a custom domain through a matching tea
# login. The config lives in a private temp dir per call, so the token stays
# out of the nix store and a personal ~/.config/tea is left alone.
giteaTokenFile = "/run/agenix/hermes-gitea-token";
agentTea = final.writeShellApplication {
name = "tea";
text = ''
config="$(${final.coreutils}/bin/mktemp -d)"
trap '${final.coreutils}/bin/rm -rf "$config"' EXIT
${final.coreutils}/bin/mkdir "$config/tea"
if [ -r ${giteaTokenFile} ]; then
${final.coreutils}/bin/cat > "$config/tea/config.yml" <<EOF
logins:
- name: m3ta
url: https://code.m3ta.dev
token: $(${final.coreutils}/bin/cat ${giteaTokenFile})
user: ${identity.name}
default: true
EOF
fi
XDG_CONFIG_HOME="$config" ${final.tea}/bin/tea "$@"
'';
};
wrapperArgs = final.lib.concatStringsSep " " (final.lib.mapAttrsToList (name: value: "--set ${name} ${final.lib.escapeShellArg value}") {
GIT_AUTHOR_NAME = identity.name;
GIT_AUTHOR_EMAIL = identity.email;
GIT_COMMITTER_NAME = identity.name;
GIT_COMMITTER_EMAIL = identity.email;
JJ_USER = identity.name;
JJ_EMAIL = identity.email;
# bd otherwise falls back to the user's git user.name for its audit trail.
BEADS_ACTOR = identity.name;
GIT_SSH_COMMAND = "${final.openssh}/bin/ssh -F ${sshConfig}";
});
wrapT3 = package:
final.symlinkJoin {
inherit (package) name meta passthru;
paths = [package];
nativeBuildInputs = [final.makeWrapper];
postBuild = ''
for program in $out/bin/*; do
wrapProgram "$program" ${wrapperArgs} --prefix PATH : ${agentTea}/bin
done
'';
};
in {
llm-agents =
prev.llm-agents
// {
t3code = wrapT3 prev.llm-agents.t3code;
t3code-desktop = wrapT3 prev.llm-agents.t3code-desktop;
};
};
# temp-packages = final: _prev: { # temp-packages = final: _prev: {
# temp = import inputs.nixpkgs-9e9486b { # temp = import inputs.nixpkgs-9e9486b {
# system = final.stdenv.hostPlatform.system; # system = final.stdenv.hostPlatform.system;