@memnexus-ai/mx-agent-cli 0.1.303 → 0.1.304
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-config/.mx-config-generation.json +2 -2
- package/dist/agent-config/AGENTS.md.template +1 -1
- package/dist/agent-config/agents/bar-raiser.md +41 -1
- package/dist/agent-config/agents/git-expert.md +58 -54
- package/dist/agent-config/claude-md/CLAUDE.core.md +1 -1
- package/dist/agent-config/hooks/session-idle-gate.sh +14 -1
- package/dist/agent-config/hooks/subagent-write-guard.sh +198 -12
- package/dist/agent-config/hooks/worktree-guard.sh +8 -6
- package/dist/agent-config/skills/mx-post-merge-sync/SKILL.md +57 -51
- package/dist/commands/codex-agent-gate.d.ts +1 -2
- package/dist/commands/codex-agent-gate.d.ts.map +1 -1
- package/dist/commands/codex-agent-gate.js +1 -2
- package/dist/commands/codex-agent-gate.js.map +1 -1
- package/dist/commands/codex-deploy-config.d.ts +6 -0
- package/dist/commands/codex-deploy-config.d.ts.map +1 -1
- package/dist/commands/codex-deploy-config.js +28 -8
- package/dist/commands/codex-deploy-config.js.map +1 -1
- package/dist/commands/codex-prove-guards.d.ts +2 -0
- package/dist/commands/codex-prove-guards.d.ts.map +1 -1
- package/dist/commands/codex-prove-guards.js +31 -3
- package/dist/commands/codex-prove-guards.js.map +1 -1
- package/dist/commands/codex-trust-keys.d.ts +2 -0
- package/dist/commands/codex-trust-keys.d.ts.map +1 -1
- package/dist/commands/codex-trust-keys.js +27 -7
- package/dist/commands/codex-trust-keys.js.map +1 -1
- package/dist/commands/coordination.d.ts +16 -0
- package/dist/commands/coordination.d.ts.map +1 -1
- package/dist/commands/coordination.js +24 -2
- package/dist/commands/coordination.js.map +1 -1
- package/dist/commands/create.d.ts +164 -7
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +293 -91
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/doctor.d.ts +17 -0
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +33 -0
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/gh.d.ts +3 -2
- package/dist/commands/gh.d.ts.map +1 -1
- package/dist/commands/gh.js +3 -2
- package/dist/commands/gh.js.map +1 -1
- package/dist/commands/new.d.ts +132 -17
- package/dist/commands/new.d.ts.map +1 -1
- package/dist/commands/new.js +426 -74
- package/dist/commands/new.js.map +1 -1
- package/dist/commands/start.d.ts +6 -0
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +105 -17
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/status.d.ts +7 -0
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +21 -1
- package/dist/commands/status.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +28 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/agent-session.d.ts +11 -0
- package/dist/lib/agent-session.d.ts.map +1 -1
- package/dist/lib/agent-session.js +26 -7
- package/dist/lib/agent-session.js.map +1 -1
- package/dist/lib/behavioral-injection.d.ts.map +1 -1
- package/dist/lib/behavioral-injection.js +25 -7
- package/dist/lib/behavioral-injection.js.map +1 -1
- package/dist/lib/catalog-commit.d.ts.map +1 -1
- package/dist/lib/catalog-commit.js +17 -14
- package/dist/lib/catalog-commit.js.map +1 -1
- package/dist/lib/catalog.d.ts +93 -2
- package/dist/lib/catalog.d.ts.map +1 -1
- package/dist/lib/catalog.js +116 -9
- package/dist/lib/catalog.js.map +1 -1
- package/dist/lib/claude.d.ts.map +1 -1
- package/dist/lib/claude.js +28 -4
- package/dist/lib/claude.js.map +1 -1
- package/dist/lib/fleet-data.d.ts +98 -9
- package/dist/lib/fleet-data.d.ts.map +1 -1
- package/dist/lib/fleet-data.js +353 -34
- package/dist/lib/fleet-data.js.map +1 -1
- package/dist/lib/fleet-render.d.ts +8 -1
- package/dist/lib/fleet-render.d.ts.map +1 -1
- package/dist/lib/fleet-render.js +10 -3
- package/dist/lib/fleet-render.js.map +1 -1
- package/dist/lib/gh-remote.d.ts +15 -1
- package/dist/lib/gh-remote.d.ts.map +1 -1
- package/dist/lib/gh-remote.js +27 -2
- package/dist/lib/gh-remote.js.map +1 -1
- package/dist/lib/gh-token-run.d.ts +140 -14
- package/dist/lib/gh-token-run.d.ts.map +1 -1
- package/dist/lib/gh-token-run.js +187 -15
- package/dist/lib/gh-token-run.js.map +1 -1
- package/dist/lib/git-identity.d.ts +6 -2
- package/dist/lib/git-identity.d.ts.map +1 -1
- package/dist/lib/git-identity.js +17 -8
- package/dist/lib/git-identity.js.map +1 -1
- package/dist/lib/guarded-read.d.ts +15 -0
- package/dist/lib/guarded-read.d.ts.map +1 -0
- package/dist/lib/guarded-read.js +73 -0
- package/dist/lib/guarded-read.js.map +1 -0
- package/dist/lib/machine-setup.d.ts +165 -0
- package/dist/lib/machine-setup.d.ts.map +1 -0
- package/dist/lib/machine-setup.js +441 -0
- package/dist/lib/machine-setup.js.map +1 -0
- package/dist/lib/native-realpath.d.ts +70 -0
- package/dist/lib/native-realpath.d.ts.map +1 -0
- package/dist/lib/native-realpath.js +95 -0
- package/dist/lib/native-realpath.js.map +1 -0
- package/dist/lib/project-config.d.ts +2 -6
- package/dist/lib/project-config.d.ts.map +1 -1
- package/dist/lib/project-config.js.map +1 -1
- package/dist/lib/project-name.d.ts +15 -0
- package/dist/lib/project-name.d.ts.map +1 -0
- package/dist/lib/project-name.js +22 -0
- package/dist/lib/project-name.js.map +1 -0
- package/dist/lib/push-to.d.ts +113 -0
- package/dist/lib/push-to.d.ts.map +1 -0
- package/dist/lib/push-to.js +240 -0
- package/dist/lib/push-to.js.map +1 -0
- package/dist/lib/runtime/claude-gateway-routing.d.ts +161 -0
- package/dist/lib/runtime/claude-gateway-routing.d.ts.map +1 -0
- package/dist/lib/runtime/claude-gateway-routing.js +466 -0
- package/dist/lib/runtime/claude-gateway-routing.js.map +1 -0
- package/dist/lib/runtime/codex-adapter.d.ts +91 -5
- package/dist/lib/runtime/codex-adapter.d.ts.map +1 -1
- package/dist/lib/runtime/codex-adapter.js +204 -44
- package/dist/lib/runtime/codex-adapter.js.map +1 -1
- package/dist/lib/runtime/codex-config.d.ts +6 -12
- package/dist/lib/runtime/codex-config.d.ts.map +1 -1
- package/dist/lib/runtime/codex-config.js +17 -24
- package/dist/lib/runtime/codex-config.js.map +1 -1
- package/dist/lib/runtime/codex-guard-proof.d.ts +4 -7
- package/dist/lib/runtime/codex-guard-proof.d.ts.map +1 -1
- package/dist/lib/runtime/codex-guard-proof.js +16 -14
- package/dist/lib/runtime/codex-guard-proof.js.map +1 -1
- package/dist/lib/runtime/codex-hooks-list.d.ts +20 -0
- package/dist/lib/runtime/codex-hooks-list.d.ts.map +1 -1
- package/dist/lib/runtime/codex-hooks-list.js +20 -8
- package/dist/lib/runtime/codex-hooks-list.js.map +1 -1
- package/dist/lib/runtime/types.d.ts +1 -1
- package/dist/lib/runtime/types.d.ts.map +1 -1
- package/dist/lib/standards.d.ts +3 -0
- package/dist/lib/standards.d.ts.map +1 -1
- package/dist/lib/standards.js +1 -0
- package/dist/lib/standards.js.map +1 -1
- package/dist/lib/team-identity.d.ts.map +1 -1
- package/dist/lib/team-identity.js +18 -53
- package/dist/lib/team-identity.js.map +1 -1
- package/dist/lib/team-restore.d.ts +281 -0
- package/dist/lib/team-restore.d.ts.map +1 -0
- package/dist/lib/team-restore.js +533 -0
- package/dist/lib/team-restore.js.map +1 -0
- package/dist/lib/window-view.d.ts +5 -0
- package/dist/lib/window-view.d.ts.map +1 -1
- package/dist/lib/window-view.js +67 -6
- package/dist/lib/window-view.js.map +1 -1
- package/dist/lib/worktree-sync.d.ts +139 -11
- package/dist/lib/worktree-sync.d.ts.map +1 -1
- package/dist/lib/worktree-sync.js +327 -46
- package/dist/lib/worktree-sync.js.map +1 -1
- package/dist/standards/merge-gates.md +26 -0
- package/package.json +2 -2
|
@@ -3,43 +3,41 @@ name: mx-post-merge-sync
|
|
|
3
3
|
description: Sync worktree branch after a PR is squash-merged to main. Use immediately after every PR merge — do not start new work before running this.
|
|
4
4
|
---
|
|
5
5
|
|
|
6
|
-
After a squash merge,
|
|
6
|
+
After a squash merge, main holds the branch's work as one new commit, and the branch's own commits are redundant. Sync with one command: `mx-agent worktree sync --assert-no-teammates-active`. It finds the merged pull request's last commit and rebases only the commits made after it (`rebase --onto`). It checkpoints a dirty working tree to a ref first and restores it afterwards, so do not stash. It runs git in-process, so `git-mutation-guard` does not block it and no `GIT_EXPERT=1` override is needed (`agent-config/hooks/git-mutation-guard.sh`, the #172 exception).
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
The command needs two things:
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
> `git stash pop stash@{0}` / `git stash drop stash@{n}`) — the index you
|
|
13
|
-
> resolve can point at another worktree's entry after a concurrent stash op
|
|
14
|
-
> (a time-of-check/time-of-use race). Address your own entry by its commit SHA.
|
|
10
|
+
- **A leader session.** Run it from the leader session of this worktree, or from a teammate that leader spawned in the same session. A teammate in a separate session asks the leader to run it.
|
|
11
|
+
- **`gh` authenticated with read access to the repository.** It looks the squash point up on GitHub. Without `gh` it refuses (`refused-gh-unavailable`); it never falls back to a plain rebase.
|
|
15
12
|
|
|
16
|
-
|
|
17
|
-
# GIT_EXPERT=1 prefixes below are DELIBERATE: git-mutation-guard blocks
|
|
18
|
-
# `git stash push/apply/drop` and `git reset --hard` to prevent accidental
|
|
19
|
-
# work loss in this shared worktree. This is the one sanctioned, SHA-addressed
|
|
20
|
-
# flow that genuinely needs them, so each mutating call overrides the guard
|
|
21
|
-
# explicitly. Read-only calls (stash list, rev-parse, status, fetch) are not
|
|
22
|
-
# prefixed — the guard already lets them through.
|
|
23
|
-
#
|
|
24
|
-
# Only stash if the worktree is actually dirty. In the normal (clean) case,
|
|
25
|
-
# skip stashing entirely: a positional pop would restore a FOREIGN stash from
|
|
26
|
-
# another worktree, silently injecting its changes here.
|
|
27
|
-
WT="$(basename "$(git rev-parse --show-toplevel)")"
|
|
28
|
-
STASH_TOKEN="post-merge-sync-${WT}-$$-${RANDOM}${RANDOM}" # nonce guards against PID/name collisions
|
|
29
|
-
|
|
30
|
-
STASH_SHA=""
|
|
31
|
-
if [ -n "$(git status --porcelain)" ]; then
|
|
32
|
-
GIT_EXPERT=1 git stash push -m "$STASH_TOKEN"
|
|
33
|
-
# Capture the stash's immutable commit SHA now — restore by SHA, not by index.
|
|
34
|
-
STASH_SHA="$(git rev-parse 'stash@{0}')"
|
|
35
|
-
fi
|
|
13
|
+
## Step 1: Sync Branch
|
|
36
14
|
|
|
37
|
-
|
|
38
|
-
#
|
|
15
|
+
```bash
|
|
16
|
+
# Precheck: see which commits the sync will replay. After a clean squash merge
|
|
17
|
+
# every commit listed here belongs to the merged PR, and the sync replays none.
|
|
39
18
|
git fetch origin main
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
19
|
+
git status --short
|
|
20
|
+
git log --oneline origin/main..HEAD
|
|
21
|
+
|
|
22
|
+
# Sync, and read the result of THIS run. Run from here to the verify line in
|
|
23
|
+
# ONE shell call: HEAD_BEFORE and SYNC_RC do not survive between calls.
|
|
24
|
+
# Pass the flag only after confirming no teammate is writing in this worktree:
|
|
25
|
+
# the assertion is self-reported and recorded in the audit line.
|
|
26
|
+
# Binary note: the PATH `mx-agent` can be the shared /workspace build, which
|
|
27
|
+
# lags main, so `worktree sync` may be missing or old there. If it is, use
|
|
28
|
+
# `node mx-agent-system/cli/dist/index.js` in place of `mx-agent` in this block.
|
|
29
|
+
# That path is relative to the worktree root, and it needs the CLI built in this
|
|
30
|
+
# worktree first (`npm run build` in mx-agent-system/cli): dist/ is not tracked,
|
|
31
|
+
# so a fresh worktree has none.
|
|
32
|
+
HEAD_BEFORE="$(git rev-parse HEAD)"
|
|
33
|
+
mx-agent worktree sync --assert-no-teammates-active; SYNC_RC=$?
|
|
34
|
+
# The audit file is shared by every worktree under this home directory. Match
|
|
35
|
+
# this worktree AND the HEAD recorded just before the run.
|
|
36
|
+
LINE="$(grep -F "\"worktree\":\"$(basename "$(git rev-parse --show-toplevel)")\"" ~/.mx-agent/logs/worktree-sync.jsonl | grep -F "\"headBefore\":\"$HEAD_BEFORE\"" | tail -n 1)"
|
|
37
|
+
echo "exit code: $SYNC_RC"
|
|
38
|
+
echo "audit line: $LINE"
|
|
39
|
+
|
|
40
|
+
# Hook-completeness guard (#4428): a sync can leave hooks REGISTERED in
|
|
43
41
|
# .claude/settings.json but ABSENT on disk — settings.json itself may survive,
|
|
44
42
|
# so the old "settings.json missing" check does not fire. A registered-but-
|
|
45
43
|
# missing hook fails OPEN silently (Claude Code skips a hook whose script is
|
|
@@ -52,32 +50,40 @@ if mx-agent verify-hooks --heal; then
|
|
|
52
50
|
elif [ ! -f ".claude/settings.json" ]; then
|
|
53
51
|
# Fallback for a CLI that predates `verify-hooks`: regenerate if settings.json
|
|
54
52
|
# itself vanished (the original Phase 4 migration guard).
|
|
55
|
-
echo "Phase 4 migration: .claude/ missing after
|
|
53
|
+
echo "Phase 4 migration: .claude/ missing after sync — regenerating from agent-config source..."
|
|
56
54
|
node mx-agent-system/cli/scripts/generate-claude.mjs --repo-root "$PWD" 2>&1 || echo "WARN: generator failed — run 'mx-agent start' to recover."
|
|
57
55
|
fi
|
|
58
56
|
|
|
59
|
-
# Restore ONLY our own stash, addressed by SHA — never a positional pop.
|
|
60
|
-
if [ -n "$STASH_SHA" ]; then
|
|
61
|
-
if GIT_EXPERT=1 git stash apply "$STASH_SHA"; then
|
|
62
|
-
# Drop our entry by re-locating the SHA immediately before dropping, so the
|
|
63
|
-
# index we drop is the one holding our SHA right now — never stash@{n}.
|
|
64
|
-
REF="$(git stash list --format='%gd %H' | awk -v sha="$STASH_SHA" '$2==sha{print $1; exit}')"
|
|
65
|
-
if [ -n "$REF" ]; then
|
|
66
|
-
GIT_EXPERT=1 git stash drop "$REF"
|
|
67
|
-
else
|
|
68
|
-
echo "WARN: applied stash $STASH_SHA but its ref vanished before drop — skipping drop."
|
|
69
|
-
fi
|
|
70
|
-
else
|
|
71
|
-
echo "WARN: could not restore own stash $STASH_SHA — another process may have dropped it."
|
|
72
|
-
echo " Recover manually: git stash list --format='%gd %H'"
|
|
73
|
-
fi
|
|
74
|
-
fi
|
|
75
|
-
|
|
76
57
|
# Verify: must return 0
|
|
77
58
|
git rev-list --count HEAD..origin/main
|
|
78
59
|
```
|
|
79
60
|
|
|
80
|
-
|
|
61
|
+
### Reading the result
|
|
62
|
+
|
|
63
|
+
A dirty tree prints its checkpoint before the sync, in the form `Checkpoint: refs/mx/checkpoint/<worktree>/<epoch-ms>-<rand6>`, followed by the `git show` and `git checkout` lines that recover from it. The last line printed is `Audit: <path>`, normally `~/.mx-agent/logs/worktree-sync.jsonl`. That file holds one JSON line per run, from every worktree under this home directory, so Step 1 reads only the line whose `worktree` is this one and whose `headBefore` is the HEAD recorded just before the run.
|
|
64
|
+
|
|
65
|
+
The exit code decides. Exit 0 means `ok`. Any other exit code means the sync did not succeed, whatever the audit line says. The line's `outcome` field tells you which row of this table applies.
|
|
66
|
+
|
|
67
|
+
The `verify-hooks --heal` step prints its own lines after the sync. A line such as `Hook freshness: healed 1 stale hook from origin/main: worktree-guard.sh` means a hook changed on main and was re-copied from `origin/main` into this worktree's `.claude/`. That is expected after a merge that changed a hook, and it does not change the sync result. A line starting with `✗` means the heal failed: tell the leader.
|
|
68
|
+
|
|
69
|
+
<!-- sync-outcome-table:start -->
|
|
70
|
+
| Outcome | What the agent does |
|
|
71
|
+
|---|---|
|
|
72
|
+
| No matching audit line, or the exit code disagrees with the line | Stop. Quote what you have: the exit code, the console output including any `Checkpoint:` line, and the audit line if there is one. Ask the PO. |
|
|
73
|
+
| `ok` | Done, only if the exit code is 0. Go to the verify line. |
|
|
74
|
+
| `refused-no-quiescence-assertion` | Re-run with `--assert-no-teammates-active` after confirming no teammate is writing in this worktree. |
|
|
75
|
+
| `refused-no-leader-lock` | Run it from the leader session. A teammate the leader spawned in that session qualifies. A teammate in a separate session asks the leader to run it. |
|
|
76
|
+
| `refused-not-quiescent` | Something is writing in the worktree. Find and stop the writer (a teammate or an editor), re-run once, then tell the leader. Never re-run while the writer is still active. |
|
|
77
|
+
| `refused-sync-lock-held` | Wait 30 seconds and re-run, at most twice. Then tell the leader. |
|
|
78
|
+
| `refused-fetch-failed` | Re-run, up to 3 times: GitHub has returned transient 404s. Then tell the leader. |
|
|
79
|
+
| `refused-gh-unavailable`, `refused-pr-lookup-failed` | The leader checks `gh auth status`. If `gh` is authenticated, ask the PO. |
|
|
80
|
+
| `refused-rebase-in-progress`, `refused-detached-head`, `refused-no-origin-remote`, `refused-base-ref-missing`, `refused-status-unreadable`, `refused-invalid-checkpoint-ref` | Stop and tell the leader. The worktree is in an unexpected state. |
|
|
81
|
+
| `refused-unaccounted-commits`, `refused-squash-point-not-ancestor`, `conflict`, `restore-conflict`, `rebase-failed`, `restore-failed`, `in-progress`, `error` | Stop. Quote the printed checkpoint ref and the audit line. Ask the PO. Never run a plain rebase or `reset --hard`. |
|
|
82
|
+
<!-- sync-outcome-table:end -->
|
|
83
|
+
|
|
84
|
+
If the command refuses (any `refused-*` outcome) or reports `conflict`, do not work around it. A plain `git rebase origin/main` after a squash merge replays commits main already holds and conflicts (#552). `git reset --hard origin/main` discards any commit that is not on main. Either one runs only with the product owner's approval, given for that run.
|
|
85
|
+
|
|
86
|
+
If verification returns non-zero, re-run Step 1 from `HEAD_BEFORE` in one shell call and read the result again.
|
|
81
87
|
|
|
82
88
|
## Step 2: Verify Deployment
|
|
83
89
|
|
|
@@ -36,8 +36,7 @@
|
|
|
36
36
|
* that ambiguity without weakening anything: an absent field is still a refusal.
|
|
37
37
|
*
|
|
38
38
|
* DO NOT re-widen this on a hunch. If a Codex upgrade changes the payload, the schema
|
|
39
|
-
* above is re-derivable in one command
|
|
40
|
-
* .devcontainer/codex-version.pin exist precisely so that upgrade is a deliberate act.
|
|
39
|
+
* above is re-derivable in one command. The devcontainer keeps its install pinned.
|
|
41
40
|
*
|
|
42
41
|
* ─── THIS CONSTANT APPLIES TO `SubagentStart` ONLY (#4859 review, Should Fixes) ────
|
|
43
42
|
* An earlier revision also read `agent_type` out of a spawn tool's `tool_input`, and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-agent-gate.d.ts","sourceRoot":"","sources":["../../src/commands/codex-agent-gate.ts"],"names":[],"mappings":"AA4HA
|
|
1
|
+
{"version":3,"file":"codex-agent-gate.d.ts","sourceRoot":"","sources":["../../src/commands/codex-agent-gate.ts"],"names":[],"mappings":"AA4HA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAE7C,MAAM,WAAW,YAAY;IAC3B,qEAAqE;IACrE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAChB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAMhE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,GAAG,YAAY,CA0Ef;AAED,2EAA2E;AAC3E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAYvE;AAgBD,2FAA2F;AAC3F,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,SAAS,MAAM,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAQnF"}
|
|
@@ -156,8 +156,7 @@ const SPAWN_REFUSAL = 'codex agent gate: subagent spawning is unavailable under
|
|
|
156
156
|
* that ambiguity without weakening anything: an absent field is still a refusal.
|
|
157
157
|
*
|
|
158
158
|
* DO NOT re-widen this on a hunch. If a Codex upgrade changes the payload, the schema
|
|
159
|
-
* above is re-derivable in one command
|
|
160
|
-
* .devcontainer/codex-version.pin exist precisely so that upgrade is a deliberate act.
|
|
159
|
+
* above is re-derivable in one command. The devcontainer keeps its install pinned.
|
|
161
160
|
*
|
|
162
161
|
* ─── THIS CONSTANT APPLIES TO `SubagentStart` ONLY (#4859 review, Should Fixes) ────
|
|
163
162
|
* An earlier revision also read `agent_type` out of a spawn tool's `tool_input`, and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-agent-gate.js","sourceRoot":"","sources":["../../src/commands/codex-agent-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;;;;;;;;GAQG;AACH,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,IAAI,wBAAwB,GAAG,CAAC,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,MAAM,aAAa,GACjB,4FAA4F;IAC5F,6FAA6F;IAC7F,gFAAgF;IAChF,6FAA6F;IAC7F,4FAA4F;IAC5F,4FAA4F;IAC5F,+FAA+F;IAC/F,8FAA8F;IAC9F,6FAA6F;IAC7F,4FAA4F;IAC5F,2FAA2F;IAC3F,yFAAyF;IACzF,6DAA6D,CAAC;AAEhE
|
|
1
|
+
{"version":3,"file":"codex-agent-gate.js","sourceRoot":"","sources":["../../src/commands/codex-agent-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export interface CodexDeployTarget {
|
|
|
8
8
|
branch: string | null;
|
|
9
9
|
baseBranch: string;
|
|
10
10
|
projectSlug: string;
|
|
11
|
+
sessionModel?: string;
|
|
11
12
|
}
|
|
12
13
|
/**
|
|
13
14
|
* Resolve the team slug that owns a worktree directory — the inverse of
|
|
@@ -66,6 +67,11 @@ export declare function resolveCodexDeployTarget(opts?: ResolveTargetOptions): {
|
|
|
66
67
|
};
|
|
67
68
|
export interface DeployConfigOutcome {
|
|
68
69
|
ok: boolean;
|
|
70
|
+
/**
|
|
71
|
+
* Set when the deploy refused before writing anything, such as a `sessionModel` that
|
|
72
|
+
* starts with `-` (#1029 item 6). The entry point prints it as an error and exits 1.
|
|
73
|
+
*/
|
|
74
|
+
refusal?: string;
|
|
69
75
|
lines: CodexDeployReportLine[];
|
|
70
76
|
/** Files written, relative to the worktree. Empty when the target did not resolve. */
|
|
71
77
|
written: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-deploy-config.d.ts","sourceRoot":"","sources":["../../src/commands/codex-deploy-config.ts"],"names":[],"mappings":"AAyEA,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,gCAAgC,CAAC;AAGxC,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-deploy-config.d.ts","sourceRoot":"","sources":["../../src/commands/codex-deploy-config.ts"],"names":[],"mappings":"AAyEA,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,gCAAgC,CAAC;AAGxC,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GACf;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAwBtC;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAEoC,CAAC;AAErE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CA+D1C;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,IAAI,CAGf;AAED,MAAM,WAAW,oBAAoB;IACnC,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,wBAAwB,CACtC,IAAI,GAAE,oBAAyB,GAC9B;IAAE,MAAM,EAAE,iBAAiB,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAsEnD;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC/B,sFAAsF;IACtF,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;;;OAMG;IACH,qBAAqB,EAAE,OAAO,CAAC;IAC/B,+EAA+E;IAC/E,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;OAIG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GACnF,qBAAqB,CAmCvB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,mBAAmB,CAiFpF;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,mGAAmG;AACnG,wBAAgB,oBAAoB,CAAC,IAAI,GAAE,2BAAgC,GAAG,IAAI,CAiCjF"}
|
|
@@ -71,7 +71,7 @@ import { existsSync, lstatSync, realpathSync, statSync } from 'fs';
|
|
|
71
71
|
import { basename, dirname, join, resolve } from 'path';
|
|
72
72
|
import { listTeams } from '../lib/catalog.js';
|
|
73
73
|
import { loadProjectConfig, resolveProjectConfig } from '../lib/project-config.js';
|
|
74
|
-
import {
|
|
74
|
+
import { codexDeployReportLines, resolveCodexSessionModel, deployCodexConfig, instructionChainOverBudgetMessage, } from '../lib/runtime/codex-config.js';
|
|
75
75
|
import { findProjectRoot, getCurrentBranch, getSlot } from '../lib/worktree.js';
|
|
76
76
|
/**
|
|
77
77
|
* Resolve the team slug that owns a worktree directory — the inverse of
|
|
@@ -203,7 +203,8 @@ export function resolveCodexDeployTarget(opts = {}) {
|
|
|
203
203
|
catch (err) {
|
|
204
204
|
return { error: err instanceof Error ? err.message : String(err) };
|
|
205
205
|
}
|
|
206
|
-
const
|
|
206
|
+
const projectConfig = loadProjectConfig(projectRoot);
|
|
207
|
+
const cfg = resolveProjectConfig(projectConfig);
|
|
207
208
|
const worktreePath = resolve(opts.path ?? opts.cwd ?? process.cwd());
|
|
208
209
|
if (!existsSync(worktreePath) || !statSync(worktreePath).isDirectory()) {
|
|
209
210
|
return { error: `${worktreePath} is not a directory — there is no worktree to deploy into.` };
|
|
@@ -256,6 +257,7 @@ export function resolveCodexDeployTarget(opts = {}) {
|
|
|
256
257
|
slot,
|
|
257
258
|
branch: getCurrentBranch(realWorktreePath),
|
|
258
259
|
baseBranch: cfg.baseBranch,
|
|
260
|
+
sessionModel: projectConfig?.sessionModel,
|
|
259
261
|
projectSlug: cfg.projectSlug,
|
|
260
262
|
},
|
|
261
263
|
};
|
|
@@ -303,6 +305,24 @@ export function closingTrustGuidance(outcome) {
|
|
|
303
305
|
* so the tests can assert the outcome and the CLI entry point owns the exit code.
|
|
304
306
|
*/
|
|
305
307
|
export function deployCodexConfigOnly(target) {
|
|
308
|
+
// #1029 item 6: a refused sessionModel stops the deploy before anything is written.
|
|
309
|
+
let model;
|
|
310
|
+
try {
|
|
311
|
+
model = resolveCodexSessionModel(target.sessionModel);
|
|
312
|
+
}
|
|
313
|
+
catch (err) {
|
|
314
|
+
const refusal = `refusing to deploy: ${err instanceof Error ? err.message : String(err)}`;
|
|
315
|
+
return {
|
|
316
|
+
ok: false,
|
|
317
|
+
refusal,
|
|
318
|
+
lines: [{ level: 'warn', text: refusal }],
|
|
319
|
+
written: [],
|
|
320
|
+
hookTrustInvalidated: false,
|
|
321
|
+
hookTrustUnverifiable: false,
|
|
322
|
+
writeRefusals: [],
|
|
323
|
+
writeFailures: [],
|
|
324
|
+
};
|
|
325
|
+
}
|
|
306
326
|
const result = deployCodexConfig({
|
|
307
327
|
projectRoot: target.projectRoot,
|
|
308
328
|
worktreePath: target.worktreePath,
|
|
@@ -310,12 +330,7 @@ export function deployCodexConfigOnly(target) {
|
|
|
310
330
|
branch: target.branch,
|
|
311
331
|
slot: target.slot,
|
|
312
332
|
teamSlug: target.teamSlug,
|
|
313
|
-
|
|
314
|
-
// `runStart` passes no model for Codex). The generated config.toml carries the
|
|
315
|
-
// model, so a different default here would produce different bytes than a launch
|
|
316
|
-
// does — and the operator would be granting hook trust against bytes `start` is
|
|
317
|
-
// about to replace.
|
|
318
|
-
model: CODEX_DEFAULT_MODEL,
|
|
333
|
+
model,
|
|
319
334
|
baseBranch: target.baseBranch,
|
|
320
335
|
...(target.projectSlug ? { projectSlug: target.projectSlug } : {}),
|
|
321
336
|
});
|
|
@@ -382,6 +397,11 @@ export function runCodexDeployConfig(opts = {}) {
|
|
|
382
397
|
const { target } = resolved;
|
|
383
398
|
console.log(chalk.dim(` Worktree: ${target.worktreePath} (team ${target.teamSlug}, slot ${target.slot})`));
|
|
384
399
|
const outcome = deployCodexConfigOnly(target);
|
|
400
|
+
if (outcome.refusal) {
|
|
401
|
+
// Nothing was written, so the deploy report and the trust guidance below do not apply.
|
|
402
|
+
console.error(chalk.red(`Error: ${outcome.refusal}`));
|
|
403
|
+
process.exit(1);
|
|
404
|
+
}
|
|
385
405
|
for (const line of outcome.lines) {
|
|
386
406
|
console.log(line.level === 'warn' ? chalk.yellow(` ⚠ ${line.text}`) : chalk.dim(` ${line.text}`));
|
|
387
407
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-deploy-config.js","sourceRoot":"","sources":["../../src/commands/codex-deploy-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmEG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACnF,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"codex-deploy-config.js","sourceRoot":"","sources":["../../src/commands/codex-deploy-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,6 +75,8 @@ export declare function proveCodexGuards(opts: {
|
|
|
75
75
|
}): ProveGuardsResult;
|
|
76
76
|
export interface RunProveGuardsOptions {
|
|
77
77
|
path?: string;
|
|
78
|
+
/** The PATH to resolve `codex` against. Defaults to `process.env.PATH`. A test seam. */
|
|
79
|
+
pathEnv?: string;
|
|
78
80
|
}
|
|
79
81
|
/** CLI entry point. Exits non-zero when nothing was proven — a failed proof is not a pass. */
|
|
80
82
|
export declare function runCodexProveGuards(opts?: RunProveGuardsOptions): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-prove-guards.d.ts","sourceRoot":"","sources":["../../src/commands/codex-prove-guards.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codex-prove-guards.d.ts","sourceRoot":"","sources":["../../src/commands/codex-prove-guards.ts"],"names":[],"mappings":"AAiFA;;;;;;;;;GASG;AACH,MAAM,MAAM,oBAAoB,GAC5B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5C,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,mFAAmF;AACnF,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,YAAY,CAAC;AAYlB,kFAAkF;AAClF,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAahE;AAED,iFAAiF;AACjF,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAahD;AAQD,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,qCAAqC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;IAClB,qFAAqF;IACrF,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,wBAAgB,eAAe,IAAI,cAAc,EAAE,CAwBlD;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,OAAO,CAAC;IACZ,4DAA4D;IAC5D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2FAA2F;IAC3F,GAAG,EAAE,MAAM,CAAC;IACZ,6DAA6D;IAC7D,YAAY,EAAE,MAAM,CAAC;IACrB,gFAAgF;IAChF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,kFAAkF;IAClF,MAAM,EAAE,oBAAoB,CAAC;CAC9B,GAAG,iBAAiB,CA6NpB;AA8BD,MAAM,WAAW,qBAAqB;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,8FAA8F;AAC9F,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,qBAA0B,GAAG,IAAI,CAwF1E"}
|
|
@@ -54,6 +54,8 @@ import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'fs';
|
|
|
54
54
|
import { tmpdir } from 'os';
|
|
55
55
|
import { join } from 'path';
|
|
56
56
|
import { CODEX_HOOKS_FILENAME, PHASE1_PORTED_GUARDS, buildCodexHooksJson, codexAgentGateCommand, codexHookCommand, codexHookTrustPreconditions, readDeployedHooksDoc, resolveCodexHome, } from '../lib/runtime/codex-config.js';
|
|
57
|
+
import { absolutePathEntries, codexVersionToken, resolveOnPath } from '../lib/runtime/codex-adapter.js';
|
|
58
|
+
import { stripInheritedRelayVars } from '../lib/runtime/claude-gateway-routing.js';
|
|
57
59
|
import { queryCodexHooksList } from '../lib/runtime/codex-hooks-list.js';
|
|
58
60
|
import { buildTrustKeyReport, shaCodexHooksFiles } from '../lib/runtime/codex-trust-keys.js';
|
|
59
61
|
import { renderTrustKeyReport } from './codex-trust-keys.js';
|
|
@@ -346,13 +348,39 @@ function sha256Text(text) {
|
|
|
346
348
|
/** CLI entry point. Exits non-zero when nothing was proven — a failed proof is not a pass. */
|
|
347
349
|
export function runCodexProveGuards(opts = {}) {
|
|
348
350
|
const worktreePath = opts.path ?? process.cwd();
|
|
349
|
-
|
|
351
|
+
// #1042 S1: resolve codex to an absolute path the same way the launch does, and use
|
|
352
|
+
// that one path for the version probe and the hooks/list query. A bare `codex` here
|
|
353
|
+
// could name a different binary from the one a later launch runs.
|
|
354
|
+
const codexPath = resolveOnPath('codex', opts.pathEnv ?? process.env.PATH);
|
|
355
|
+
if (!codexPath) {
|
|
356
|
+
console.error('codex CLI not found in any absolute PATH entry. Refusing to record a proof of a ' +
|
|
357
|
+
'runtime that is not installed. Install via devcontainer or run: npm i -g @openai/codex');
|
|
358
|
+
process.exit(1);
|
|
359
|
+
}
|
|
360
|
+
// #1029 SF1 (CWE-427): the codex children get the PATH with relative and empty entries
|
|
361
|
+
// removed, as the launch does. The npm shim's `#!/usr/bin/env node` looks `node` up on
|
|
362
|
+
// this PATH, and a `.` entry would let the working directory supply it.
|
|
363
|
+
const childEnv = {
|
|
364
|
+
...process.env,
|
|
365
|
+
PATH: absolutePathEntries(opts.pathEnv ?? process.env.PATH),
|
|
366
|
+
};
|
|
367
|
+
// #1099: neither the version probe nor the hooks/list query below carries an inherited
|
|
368
|
+
// relay token. Silent: a probe, not a launch.
|
|
369
|
+
stripInheritedRelayVars(childEnv);
|
|
370
|
+
const probe = spawnSync(codexPath, ['--version'], { stdio: 'pipe', encoding: 'utf-8', env: childEnv });
|
|
350
371
|
if (probe.error || probe.status !== 0) {
|
|
351
372
|
console.error('codex CLI not found — refusing to record a proof of a runtime that is not installed. ' +
|
|
352
373
|
'Install via devcontainer or run: npm i -g @openai/codex');
|
|
353
374
|
process.exit(1);
|
|
354
375
|
}
|
|
355
|
-
|
|
376
|
+
// #1029 item 2: the same parser the launch gate uses, so the recorded token and the
|
|
377
|
+
// live token are read alike. First line only, and it must have the version shape.
|
|
378
|
+
const codexVersion = codexVersionToken(probe.stdout ?? '');
|
|
379
|
+
if (!codexVersion) {
|
|
380
|
+
console.error('codex --version reported no version of the form MAJOR.MINOR.PATCH on its first line. ' +
|
|
381
|
+
'Refusing to record a proof that no launch could match.');
|
|
382
|
+
process.exit(1);
|
|
383
|
+
}
|
|
356
384
|
// #4876: read Codex's own per-entry hashes before proving anything. This costs one
|
|
357
385
|
// `codex app-server` invocation (seconds), which is affordable here — this is a
|
|
358
386
|
// human-run command with a person waiting — and is NOT wired into the launch banner
|
|
@@ -381,7 +409,7 @@ export function runCodexProveGuards(opts = {}) {
|
|
|
381
409
|
worktreePath,
|
|
382
410
|
mainRepoPath,
|
|
383
411
|
codexHome: codexHomeResolution.home,
|
|
384
|
-
hooksList: queryCodexHooksList({ cwd: worktreePath }),
|
|
412
|
+
hooksList: queryCodexHooksList({ cwd: worktreePath, codexPath, env: childEnv }),
|
|
385
413
|
shaBefore,
|
|
386
414
|
});
|
|
387
415
|
const result = proveCodexGuards({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-prove-guards.js","sourceRoot":"","sources":["../../src/commands/codex-prove-guards.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-prove-guards.js","sourceRoot":"","sources":["../../src/commands/codex-prove-guards.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@ export interface RunTrustKeysOptions {
|
|
|
5
5
|
codexHome?: string;
|
|
6
6
|
/** Injected for tests — otherwise `hooks/list` is run against the worktree. */
|
|
7
7
|
report?: TrustKeyReport;
|
|
8
|
+
/** The PATH to resolve `codex` against. Defaults to `process.env.PATH`. A test seam. */
|
|
9
|
+
pathEnv?: string;
|
|
8
10
|
}
|
|
9
11
|
export declare function renderTrustKeyReport(report: TrustKeyReport): string[];
|
|
10
12
|
/** CLI entry point. Exits non-zero when any entry is not verifiably granted. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-trust-keys.d.ts","sourceRoot":"","sources":["../../src/commands/codex-trust-keys.ts"],"names":[],"mappings":"AAwBA,OAAO,EAKL,KAAK,cAAc,EAEpB,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-trust-keys.d.ts","sourceRoot":"","sources":["../../src/commands/codex-trust-keys.ts"],"names":[],"mappings":"AAwBA,OAAO,EAKL,KAAK,cAAc,EAEpB,MAAM,oCAAoC,CAAC;AAa5C,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,EAAE,CA6ErE;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,mBAAwB,GAAG,IAAI,CAqFtE"}
|
|
@@ -24,6 +24,8 @@ import { loadProjectConfig, resolveProjectConfig } from '../lib/project-config.j
|
|
|
24
24
|
import { resolveCodexHome } from '../lib/runtime/codex-config.js';
|
|
25
25
|
import { buildTrustKeyReport, shaCodexHooksFiles, trustGrantToml, CODEX_HASH_SHAPE, } from '../lib/runtime/codex-trust-keys.js';
|
|
26
26
|
import { queryCodexHooksList } from '../lib/runtime/codex-hooks-list.js';
|
|
27
|
+
import { absolutePathEntries, resolveOnPath } from '../lib/runtime/codex-adapter.js';
|
|
28
|
+
import { stripInheritedRelayVars } from '../lib/runtime/claude-gateway-routing.js';
|
|
27
29
|
import { findProjectRoot } from '../lib/worktree.js';
|
|
28
30
|
const STATUS_LABEL = {
|
|
29
31
|
granted: 'granted',
|
|
@@ -141,21 +143,39 @@ export function runCodexTrustKeys(opts = {}) {
|
|
|
141
143
|
}
|
|
142
144
|
codexHome = resolved.home;
|
|
143
145
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
146
|
+
let report;
|
|
147
|
+
if (opts.report) {
|
|
148
|
+
report = opts.report;
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
// #1029: resolve codex to an absolute path the way prove-guards and the launch do, and
|
|
152
|
+
// give the hooks/list children the PATH with relative and empty entries removed. A bare
|
|
153
|
+
// `codex` could name a different binary, and a `.` entry could supply the shim's `node`.
|
|
154
|
+
const pathEnv = opts.pathEnv ?? process.env.PATH;
|
|
155
|
+
const codexPath = resolveOnPath('codex', pathEnv);
|
|
156
|
+
if (!codexPath) {
|
|
157
|
+
console.error(chalk.red('Error: codex CLI not found in any absolute PATH entry, so its own hook hashes cannot be ' +
|
|
158
|
+
'read. Install via devcontainer or run: npm i -g @openai/codex'));
|
|
159
|
+
process.exit(1);
|
|
160
|
+
}
|
|
161
|
+
const env = { ...process.env, PATH: absolutePathEntries(pathEnv) };
|
|
162
|
+
// #1099: no Codex child carries an inherited relay token. Silent: a probe, not a launch.
|
|
163
|
+
stripInheritedRelayVars(env);
|
|
164
|
+
// Hashed BEFORE the call, and again inside `buildTrustKeyReport` after it. The
|
|
165
|
+
// carry-over claims two files are byte-identical; that claim has to hold across the
|
|
166
|
+
// whole `hooks/list` invocation, not at one instant after it (SF-8).
|
|
167
|
+
const shaBefore = shaCodexHooksFiles([worktreePath, mainRepoPath]);
|
|
168
|
+
report = buildTrustKeyReport({
|
|
150
169
|
worktreePath,
|
|
151
170
|
mainRepoPath,
|
|
152
171
|
codexHome,
|
|
153
172
|
// Asked about the WORKTREE, deliberately: that is the cwd a session runs in, so it
|
|
154
173
|
// is the resolution #27133 affects, and the answer names the file Codex would
|
|
155
174
|
// really use via `sourcePath`.
|
|
156
|
-
hooksList: queryCodexHooksList({ cwd: worktreePath }),
|
|
175
|
+
hooksList: queryCodexHooksList({ cwd: worktreePath, codexPath, env }),
|
|
157
176
|
...(shaBefore ? { shaBefore } : {}),
|
|
158
177
|
});
|
|
178
|
+
}
|
|
159
179
|
if (opts.json) {
|
|
160
180
|
console.log(JSON.stringify(report, (_k, v) => (v instanceof Map ? Object.fromEntries(v) : v), 2));
|
|
161
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-trust-keys.js","sourceRoot":"","sources":["../../src/commands/codex-trust-keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,gBAAgB,GAGjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,YAAY,GAA0C;IAC1D,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,YAAY;IAC1B,YAAY,EAAE,cAAc;CAC7B,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-trust-keys.js","sourceRoot":"","sources":["../../src/commands/codex-trust-keys.ts"],"names":[],"mappings":"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"}
|