From 5f3ddbe4056c8f2b3f7d05629f4e296c24ce96c5 Mon Sep 17 00:00:00 2001 From: jdidion Date: Fri, 3 Oct 2025 11:34:17 -0700 Subject: [PATCH 1/6] wip --- Cargo.toml | 1 + src/hive/husk.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 56119a5..c5febb1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,6 +48,7 @@ harness = false [features] default = ["local-batch"] affinity = ["dep:core_affinity"] +async = ["tokio"] local-batch = [] retry = [] crossbeam = [] diff --git a/src/hive/husk.rs b/src/hive/husk.rs index 6bccb3b..c1b7e04 100644 --- a/src/hive/husk.rs +++ b/src/hive/husk.rs @@ -145,8 +145,8 @@ mod tests { use crate::bee::stock::{PunkWorker, Thunk, ThunkWorker}; use crate::hive::ChannelTaskQueues; use crate::hive::{ - Builder, ChannelBuilder, Outcome, OutcomeIteratorExt, OutcomeStore, TaskQueuesBuilder, - outcome_channel, + outcome_channel, Builder, ChannelBuilder, Outcome, OutcomeIteratorExt, OutcomeStore, + TaskQueuesBuilder, }; #[test] From e14ac9d40d667118210e9a78cdc24874e1f47f8e Mon Sep 17 00:00:00 2001 From: jdidion Date: Sun, 22 Mar 2026 07:56:50 -0700 Subject: [PATCH 2/6] Fix CI: replace deprecated actions-rs/cargo with direct run commands - Replace archived actions-rs/cargo@v1 with direct cargo commands - Add -- separator before -F flag for cargo-all-features compatibility - Pass toolchain matrix value to setup-rust-toolchain action Co-Authored-By: Claude Opus 4.6 --- .github/workflows/ci.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57c57f8..e1c24fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,15 +60,11 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 - - uses: actions-rs/cargo@v1 with: - command: install - args: cargo-all-features - - uses: actions-rs/cargo@v1 - with: - command: build-all-features - args: -F ${{ matrix.channel }} --all-targets - - uses: actions-rs/cargo@v1 - with: - command: test-all-features - args: -F ${{ matrix.channel }} --lib + toolchain: ${{ matrix.toolchain }} + - name: Install cargo-all-features + run: cargo install cargo-all-features + - name: Build all feature combinations + run: cargo build-all-features -- -F ${{ matrix.channel }} --all-targets + - name: Test all feature combinations + run: cargo test-all-features -- -F ${{ matrix.channel }} --lib From b6bdf7c7f5928a5379ae71cee9bd43b0f762e36d Mon Sep 17 00:00:00 2001 From: jdidion Date: Sun, 22 Mar 2026 08:43:48 -0700 Subject: [PATCH 3/6] Add tokio as optional dependency for async feature The async feature referenced tokio but it wasn't declared as a dependency, causing Cargo.toml parsing to fail. Co-Authored-By: Claude Opus 4.6 --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index c5febb1..f7a2149 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,8 @@ core_affinity = { version = "0.8.1", optional = true } # functionality of these crates internally (other than in tests) flume = { version = "0.11.1", optional = true } loole = { version = "0.4.0", optional = true } +# required with the `async` feature +tokio = { version = "1", optional = true } [dev-dependencies] divan = "0.1.17" From 0ba00589fe277547ea57c44a3c8e0d7844b17b41 Mon Sep 17 00:00:00 2001 From: jdidion Date: Sun, 22 Mar 2026 18:29:16 -0700 Subject: [PATCH 4/6] Fix clippy lint: add explicit lifetime on MutexGuard return type Co-Authored-By: Claude Opus 4.6 --- src/hive/inner/shared.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hive/inner/shared.rs b/src/hive/inner/shared.rs index dc9728d..0d0f415 100644 --- a/src/hive/inner/shared.rs +++ b/src/hive/inner/shared.rs @@ -143,7 +143,7 @@ impl, T: TaskQueues> Shared { } /// Returns the mutex guard for the results of spawing worker threads. - pub fn spawn_results(&self) -> MutexGuard, SpawnError>>> { + pub fn spawn_results(&self) -> MutexGuard<'_, Vec, SpawnError>>> { self.spawn_results.lock() } From 12ca3eb97eef17dad192108e06a27924933f4c31 Mon Sep 17 00:00:00 2001 From: jdidion Date: Sun, 22 Mar 2026 18:51:32 -0700 Subject: [PATCH 5/6] Fix cargo fmt formatting Co-Authored-By: Claude Opus 4.6 --- ...agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl | 1 + .omc/state/hud-state.json | 6 ++++++ .omc/state/hud-stdin-cache.json | 1 + .omc/state/idle-notif-cooldown.json | 3 +++ .omc/state/last-tool-error.json | 7 +++++++ .omc/state/subagent-tracking.json | 7 +++++++ src/hive/husk.rs | 4 ++-- 7 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl create mode 100644 .omc/state/hud-state.json create mode 100644 .omc/state/hud-stdin-cache.json create mode 100644 .omc/state/idle-notif-cooldown.json create mode 100644 .omc/state/last-tool-error.json create mode 100644 .omc/state/subagent-tracking.json diff --git a/.omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl b/.omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl new file mode 100644 index 0000000..c48c6dc --- /dev/null +++ b/.omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl @@ -0,0 +1 @@ +{"t":0,"agent":"ac091a0","agent_type":"unknown","event":"agent_stop","success":true} diff --git a/.omc/state/hud-state.json b/.omc/state/hud-state.json new file mode 100644 index 0000000..b43d6cd --- /dev/null +++ b/.omc/state/hud-state.json @@ -0,0 +1,6 @@ +{ + "timestamp": "2026-03-22T14:02:35.675Z", + "backgroundTasks": [], + "sessionStartTimestamp": "2026-03-22T04:30:43.857Z", + "sessionId": "12f05437-a3c3-4a6b-8db6-228f903a8dc8" +} \ No newline at end of file diff --git a/.omc/state/hud-stdin-cache.json b/.omc/state/hud-stdin-cache.json new file mode 100644 index 0000000..7c27296 --- /dev/null +++ b/.omc/state/hud-stdin-cache.json @@ -0,0 +1 @@ +{"session_id":"12f05437-a3c3-4a6b-8db6-228f903a8dc8","transcript_path":"/Users/jodidion/.claude/projects/-Users-jodidion-projects/12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl","cwd":"/Users/jodidion/projects/_maintenance/beekeeper","session_name":"github-repo-maintenance-audit","model":{"id":"global.anthropic.claude-opus-4-6-v1[1m]","display_name":"global.anthropic.claude-opus-4-6-v1[1m]"},"workspace":{"current_dir":"/Users/jodidion/projects/_maintenance/beekeeper","project_dir":"/Users/jodidion/projects","added_dirs":[]},"version":"2.1.81","output_style":{"name":"default"},"cost":{"total_cost_usd":29.37009125,"total_duration_ms":79447314,"total_api_duration_ms":2809414,"total_lines_added":633,"total_lines_removed":156},"context_window":{"total_input_tokens":59111,"total_output_tokens":119934,"context_window_size":1000000,"current_usage":{"input_tokens":3,"output_tokens":8,"cache_creation_input_tokens":391,"cache_read_input_tokens":176414},"used_percentage":18,"remaining_percentage":82},"exceeds_200k_tokens":false} \ No newline at end of file diff --git a/.omc/state/idle-notif-cooldown.json b/.omc/state/idle-notif-cooldown.json new file mode 100644 index 0000000..bac9a24 --- /dev/null +++ b/.omc/state/idle-notif-cooldown.json @@ -0,0 +1,3 @@ +{ + "lastSentAt": "2026-03-22T15:29:45.247Z" +} \ No newline at end of file diff --git a/.omc/state/last-tool-error.json b/.omc/state/last-tool-error.json new file mode 100644 index 0000000..1106c81 --- /dev/null +++ b/.omc/state/last-tool-error.json @@ -0,0 +1,7 @@ +{ + "tool_name": "Bash", + "tool_input_preview": "{\"command\":\"# Re-run rust-template to get fresh logs\\ngh run list -R jdidion/rust-template --limit 1 --json databaseId --jq '.[0].databaseId' | xargs -I{} gh run rerun {} -R jdidion/rust-template 2>&1...", + "error": "Exit code 1\nrun 19346752066 cannot be rerun; Unable to retry this workflow run because it was created over a month ago", + "timestamp": "2026-03-22T15:44:30.620Z", + "retry_count": 3 +} \ No newline at end of file diff --git a/.omc/state/subagent-tracking.json b/.omc/state/subagent-tracking.json new file mode 100644 index 0000000..c81beb9 --- /dev/null +++ b/.omc/state/subagent-tracking.json @@ -0,0 +1,7 @@ +{ + "agents": [], + "total_spawned": 0, + "total_completed": 0, + "total_failed": 0, + "last_updated": "2026-03-22T15:06:40.924Z" +} \ No newline at end of file diff --git a/src/hive/husk.rs b/src/hive/husk.rs index c1b7e04..6bccb3b 100644 --- a/src/hive/husk.rs +++ b/src/hive/husk.rs @@ -145,8 +145,8 @@ mod tests { use crate::bee::stock::{PunkWorker, Thunk, ThunkWorker}; use crate::hive::ChannelTaskQueues; use crate::hive::{ - outcome_channel, Builder, ChannelBuilder, Outcome, OutcomeIteratorExt, OutcomeStore, - TaskQueuesBuilder, + Builder, ChannelBuilder, Outcome, OutcomeIteratorExt, OutcomeStore, TaskQueuesBuilder, + outcome_channel, }; #[test] From 76f7b0ecf3ae7fd516412c8e4a22a784121534ea Mon Sep 17 00:00:00 2001 From: jdidion Date: Sun, 22 Mar 2026 18:53:29 -0700 Subject: [PATCH 6/6] Remove .omc state files and add to .gitignore --- .gitignore | 1 + ...agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl | 1 - .omc/state/hud-state.json | 6 ------ .omc/state/hud-stdin-cache.json | 1 - .omc/state/idle-notif-cooldown.json | 3 --- .omc/state/last-tool-error.json | 7 ------- .omc/state/subagent-tracking.json | 7 ------- 7 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl delete mode 100644 .omc/state/hud-state.json delete mode 100644 .omc/state/hud-stdin-cache.json delete mode 100644 .omc/state/idle-notif-cooldown.json delete mode 100644 .omc/state/last-tool-error.json delete mode 100644 .omc/state/subagent-tracking.json diff --git a/.gitignore b/.gitignore index 6959e18..8e8abb0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ Cargo.lock /target lcov.info +.omc/ diff --git a/.omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl b/.omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl deleted file mode 100644 index c48c6dc..0000000 --- a/.omc/state/agent-replay-12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl +++ /dev/null @@ -1 +0,0 @@ -{"t":0,"agent":"ac091a0","agent_type":"unknown","event":"agent_stop","success":true} diff --git a/.omc/state/hud-state.json b/.omc/state/hud-state.json deleted file mode 100644 index b43d6cd..0000000 --- a/.omc/state/hud-state.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "timestamp": "2026-03-22T14:02:35.675Z", - "backgroundTasks": [], - "sessionStartTimestamp": "2026-03-22T04:30:43.857Z", - "sessionId": "12f05437-a3c3-4a6b-8db6-228f903a8dc8" -} \ No newline at end of file diff --git a/.omc/state/hud-stdin-cache.json b/.omc/state/hud-stdin-cache.json deleted file mode 100644 index 7c27296..0000000 --- a/.omc/state/hud-stdin-cache.json +++ /dev/null @@ -1 +0,0 @@ -{"session_id":"12f05437-a3c3-4a6b-8db6-228f903a8dc8","transcript_path":"/Users/jodidion/.claude/projects/-Users-jodidion-projects/12f05437-a3c3-4a6b-8db6-228f903a8dc8.jsonl","cwd":"/Users/jodidion/projects/_maintenance/beekeeper","session_name":"github-repo-maintenance-audit","model":{"id":"global.anthropic.claude-opus-4-6-v1[1m]","display_name":"global.anthropic.claude-opus-4-6-v1[1m]"},"workspace":{"current_dir":"/Users/jodidion/projects/_maintenance/beekeeper","project_dir":"/Users/jodidion/projects","added_dirs":[]},"version":"2.1.81","output_style":{"name":"default"},"cost":{"total_cost_usd":29.37009125,"total_duration_ms":79447314,"total_api_duration_ms":2809414,"total_lines_added":633,"total_lines_removed":156},"context_window":{"total_input_tokens":59111,"total_output_tokens":119934,"context_window_size":1000000,"current_usage":{"input_tokens":3,"output_tokens":8,"cache_creation_input_tokens":391,"cache_read_input_tokens":176414},"used_percentage":18,"remaining_percentage":82},"exceeds_200k_tokens":false} \ No newline at end of file diff --git a/.omc/state/idle-notif-cooldown.json b/.omc/state/idle-notif-cooldown.json deleted file mode 100644 index bac9a24..0000000 --- a/.omc/state/idle-notif-cooldown.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lastSentAt": "2026-03-22T15:29:45.247Z" -} \ No newline at end of file diff --git a/.omc/state/last-tool-error.json b/.omc/state/last-tool-error.json deleted file mode 100644 index 1106c81..0000000 --- a/.omc/state/last-tool-error.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "tool_name": "Bash", - "tool_input_preview": "{\"command\":\"# Re-run rust-template to get fresh logs\\ngh run list -R jdidion/rust-template --limit 1 --json databaseId --jq '.[0].databaseId' | xargs -I{} gh run rerun {} -R jdidion/rust-template 2>&1...", - "error": "Exit code 1\nrun 19346752066 cannot be rerun; Unable to retry this workflow run because it was created over a month ago", - "timestamp": "2026-03-22T15:44:30.620Z", - "retry_count": 3 -} \ No newline at end of file diff --git a/.omc/state/subagent-tracking.json b/.omc/state/subagent-tracking.json deleted file mode 100644 index c81beb9..0000000 --- a/.omc/state/subagent-tracking.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "agents": [], - "total_spawned": 0, - "total_completed": 0, - "total_failed": 0, - "last_updated": "2026-03-22T15:06:40.924Z" -} \ No newline at end of file