From 4463b3c67e4ff7d2029cbc8fb62fa74ab0b30a7f Mon Sep 17 00:00:00 2001 From: mergetest Date: Wed, 16 Sep 2026 13:18:51 -0700 Subject: [PATCH] fix(onboard): advance declared commands without obsolete stamps Remove the retired Stop-hook stamp requirement from onboarding state. Focused onboarding/bootstrap regressions passed; full-suite failure is disclosed as unchanged compose-worker-prompt baseline timing evidence. Co-Authored-By: Codex --- agentkit/skills/.shared/scripts/onboard-state.sh | 2 +- tests/test-bootstrap-repo.sh | 2 +- tests/test-onboard-state.sh | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/agentkit/skills/.shared/scripts/onboard-state.sh b/agentkit/skills/.shared/scripts/onboard-state.sh index 77ecf97f..fccaebbb 100755 --- a/agentkit/skills/.shared/scripts/onboard-state.sh +++ b/agentkit/skills/.shared/scripts/onboard-state.sh @@ -35,7 +35,7 @@ elif [[ ! -r $board ]]; then else command_declared=no grep -qE '^AGENT_CMD_[A-Z][A-Z0-9_]*=' "$config" 2> /dev/null && command_declared=yes - if [[ $command_declared == no || ( ! -r $repo_root/.agent/cache/stamp-verify && ! -r $repo_root/.agent/cache/stamp-test ) ]]; then + if [[ $command_declared == no ]]; then state=declared; next=verify else tracked=no diff --git a/tests/test-bootstrap-repo.sh b/tests/test-bootstrap-repo.sh index a2476a6c..62f80579 100755 --- a/tests/test-bootstrap-repo.sh +++ b/tests/test-bootstrap-repo.sh @@ -390,7 +390,7 @@ assert_rc 0 'the generated board is ignored by git' -- \ # asserted by actually staging. mkdir -p "$repo/.agent/cache" "$repo/.agent/logs" printf 'account=someone home=/home/someone\n' > "$repo/.agent/env-contract.txt" -printf 'x\n' > "$repo/.agent/cache/stamp-verify" +printf 'discovered\n' > "$repo/.agent/cache/onboarding-stage" printf 'x\n' > "$repo/.agent/logs/run.log" git -C "$repo" add -A > /dev/null 2>&1 staged=$(git -C "$repo" diff --cached --name-only -- .agent | sort | tr '\n' ' ') diff --git a/tests/test-onboard-state.sh b/tests/test-onboard-state.sh index 49b02f4d..be779498 100755 --- a/tests/test-onboard-state.sh +++ b/tests/test-onboard-state.sh @@ -36,9 +36,8 @@ assert_contains "$out" 'stage=declared' 'config and board are declared' assert_contains "$out" 'next=verify' 'declared reports verification as next' printf 'AGENT_CMD_VERIFY=true\n' >> "$repo/.agent/config.env" -touch "$repo/.agent/cache/stamp-verify" out=$("$state_sh" --repo-root "$repo" --report) -assert_contains "$out" 'stage=verified' 'a command plus verify evidence reaches verified' +assert_contains "$out" 'stage=verified' 'a declared command reaches verified without legacy stamp files' assert_contains "$out" 'next=commit' 'verified reports commit as next' # The blessed local model arms after verification once both declarations are @@ -70,7 +69,6 @@ make_repo "$feature" printf 'AGENT_REPO_SLUG=o/r\nAGENT_BASE_BRANCH=main\nAGENT_CMD_VERIFY=true\n' > "$feature/.agent/config.env" printf '{"project":{}}\n' > "$feature/.agent/board.json" printf '.agent/*\n!.agent/config.env\n!.agent/board.json\n' > "$feature/.gitignore" -touch "$feature/.agent/cache/stamp-verify" git -C "$feature" add -- .agent/config.env .agent/board.json .gitignore git -C "$feature" -c user.name=t -c user.email=t@example.invalid commit -qm trunk-base git -C "$feature" checkout -qb feat/onboarding