feat(hooks): push contention awareness via PostToolUse additionalContext#594
Merged
NagyVikt merged 2 commits intoJun 12, 2026
Conversation
added 2 commits
June 12, 2026 15:51
Mid-session contention was only visible at the next turn's preface. The PostToolUse hook now injects a one-line [Colony] note the moment an edit touches a file another live session holds — debounced 2 min per session via an awareness-push observation marker (one-shot hook processes hold no memory). autoClaimFromToolUse reports live-owner blocked takeovers in conflicts so the strongest contention signal reaches the note.
NagyVikt
deleted the
agent/claude/post-tool-use-contention-awareness-push-2026-06-12-15-43
branch
3 tasks
NagyVikt
added a commit
that referenced
this pull request
Jun 12, 2026
* fix(spec): forward-slash publish result paths; deterministic archive-target collision spec_change_path/plan_workspace_path returned OS-native separators, so Windows callers (and the plan.test.ts contains-assertions) saw backslash paths. archiveChange relied on renameSync failing onto an existing target — POSIX throws, Windows MoveFileEx clobbers — so the existence check is now explicit. * fix(spec,release): Windows-green plan tests + valid release plan - publishPlan returns forward-slash spec_change_path/plan_workspace_path so Windows callers (and plan.test.ts contains-assertions) see separator-stable reference paths. - archiveChange checks the archive target explicitly: POSIX renameSync threw on an existing target, Windows MoveFileEx silently clobbered — the 'delta written then archive throws' test now errors on every OS. - .changeset/post-tool-use-awareness-push.md referenced package 'colony' (not in workspace; the CLI is 'colonyq'), which crashed changesets' assemble-release-plan and failed every Release run since #594. * fix(cli,mcp): Windows-portable test expectations + structured already-archived error mcp-server going green on Windows exposed the next packages in pnpm's recursive run: 9 apps/cli failures, all path-portability in tests — expectations assumed POSIX literals where the implementation resolves and shell-quotes OS-natively. Added shellQuoteForTest mirroring the production quoting rule; cockpit/queen-health/agents-spawn expectations now derive from resolve(). PATH stubs join with path.delimiter. The gx/cue PATH-spawning integration tests gate to POSIX (both tools spawn via execFileSync without shell, which Windows cannot satisfy). spec_archive returns structured SPEC_ARCHIVE_ALREADY_EXISTS (status: already_archived) instead of an opaque throw on same-day re-archive (review follow-up). * chore(release): mark internal @colony/* packages private The npm @Colony scope is not ours (@colony/core@3.1.0 belongs to a different project), so 'changeset publish' would 403 on every public internal package and fail Release after versioning. colonyq is the product artifact and ships self-contained (prepack bundles, no @colony/* deps in the published tarball — e2e-publish green), so the ten internal packages are now private: publish ships exactly colonyq. * fix(spec,cli): review follow-ups — staging recovery, aligned shellQuote charset, normalized archived_path --------- Co-authored-by: NagyVikt <nagy.viktordp@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Final phase of the approved Colony plan (awareness slice):
[Colony] session X recently claimed <file> — coordinate via task_message…note into the agent's context the moment an edit touches a file another live session holds (Claude CodeadditionalContextvia hookSpecificOutput).awareness-pushobservation marker (hook processes are one-shot — the marker doubles as the audit trail; scan depth 200 so the marker can't scroll out within a turn).autoClaimFromToolUsenow reports live-owner blocked takeovers (CLAIM_HELD_BY_ACTIVE_OWNER/CLAIM_TAKEOVER_RECOMMENDED) inconflicts— the strongest contention signal previously vanished silently. Bash-redirect auto-claims feed the same note.Test plan
pnpm typecheck/pnpm lint/pnpm test(hooks 205) /pnpm buildbash scripts/e2e-publish.shgreen (hook stdout contract touched — required by repo rule)🤖 Generated with Claude Code