Skip to content

sync: reconcile main into develop - #87

Merged
dollspace-gay merged 14 commits into
developfrom
agent/sync-main-into-develop-codex
Aug 16, 2026
Merged

sync: reconcile main into develop#87
dollspace-gay merged 14 commits into
developfrom
agent/sync-main-into-develop-codex

Conversation

@dollspace-gay

Copy link
Copy Markdown
Member

Summary

Reconcile main ancestry into develop before the next promotion.

Drift handling

  • Records current main and current develop as merge parents.
  • Keeps the resulting tree byte-for-byte identical to develop.
  • Prevents stale main-only kickoff/provider implementations from overwriting the completed Codex work.
  • Prevents incompatible main-only dependency artifacts from entering develop: the dashboard lock resolves ESLint 10 against a plugin capped at ESLint 9, and the fuzz lock does not match the current manifest.

Validation

dependabot Bot and others added 14 commits July 21, 2026 19:07
Bumps the cargo group with 1 update in the /crosslink/fuzz directory: [rand](https://github.com/rust-random/rand).


Updates `rand` from 0.8.5 to 0.8.7
- [Release notes](https://github.com/rust-random/rand/releases)
- [Changelog](https://github.com/rust-random/rand/blob/0.8.7/CHANGELOG.md)
- [Commits](rust-random/rand@0.8.5...0.8.7)

---
updated-dependencies:
- dependency-name: rand
  dependency-version: 0.8.7
  dependency-type: indirect
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
…fuzz/cargo-6310f337bc

chore(deps): Bump rand from 0.8.5 to 0.8.7 in /crosslink/fuzz in the cargo group across 1 directory
Bumps the npm_and_yarn group with 1 update in the /vscode-extension directory: [linkify-it](https://github.com/markdown-it/linkify-it).


Updates `linkify-it` from 5.0.1 to 5.0.2
- [Changelog](https://github.com/markdown-it/linkify-it/blob/master/CHANGELOG.md)
- [Commits](markdown-it/linkify-it@5.0.1...5.0.2)

---
updated-dependencies:
- dependency-name: linkify-it
  dependency-version: 5.0.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…ode-extension/npm_and_yarn-c2ac1729ee

chore(deps-dev): Bump linkify-it from 5.0.1 to 5.0.2 in /vscode-extension in the npm_and_yarn group across 1 directory
Bumps the npm_and_yarn group with 1 update in the /vscode-extension directory: [fast-uri](https://github.com/fastify/fast-uri).


Updates `fast-uri` from 3.1.2 to 3.1.4
- [Release notes](https://github.com/fastify/fast-uri/releases)
- [Commits](fastify/fast-uri@v3.1.2...v3.1.4)

---
updated-dependencies:
- dependency-name: fast-uri
  dependency-version: 3.1.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…ode-extension/npm_and_yarn-04db377a11

chore(deps-dev): Bump fast-uri from 3.1.2 to 3.1.4 in /vscode-extension in the npm_and_yarn group across 1 directory
…dates

Bumps the npm_and_yarn group with 3 updates in the /dashboard directory: [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router), [brace-expansion](https://github.com/juliangruber/brace-expansion) and [postcss](https://github.com/postcss/postcss).


Updates `react-router` from 7.18.0 to 8.3.0
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router@8.3.0/packages/react-router)

Updates `brace-expansion` from 5.0.7 to 5.0.8
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@v5.0.7...v5.0.8)

Updates `postcss` from 8.5.15 to 8.5.23
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.5.15...8.5.23)

---
updated-dependencies:
- dependency-name: react-router
  dependency-version: 8.3.0
  dependency-type: direct:production
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 5.0.8
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: postcss
  dependency-version: 8.5.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…hboard/npm_and_yarn-311b9c8e58

chore(deps): Bump the npm_and_yarn group across 1 directory with 3 updates
- Add configurable agent binary via hook-config.json `agent.binary` (default: claude)
  - New `read_agent_binary()` utility in `utils.rs`
  - Threaded through Kickoff, Orchestrator, Swarm, Sentinel (spawn_agent)
  - Container launches gate Anthropic credentials/mounts behind `agent_binary == "claude"`
- Add provider-agnostic pricing in `token_usage.rs`
  - `PricingConfig` with exact model / provider prefix / default resolution
  - Preserves Anthropic substring heuristics as fallback
  - 7 new tests, all existing tests pass via thin wrappers
- Sentinel `--model` override flag on run/watch/run-daemon
  - Threaded through dispatch/triage with CLI > tuning > config precedence
- Exhaustion -> triage issue: creates high-priority `agent-exhausted` issue before marking outcome
- DRY: single `read_agent_binary()` called from 10 sites (Kickoff×6, Orchestrator, Swarm, Sentinel)

All 2817 tests pass. Ready for any agent CLI supporting `--model` flag.

ref #786
…(gh#43)

Add agent.kickoff_template and agent.no_template to hook-config.json
so non-Claude agents can provide their own prompt or skip the built-in
template entirely.

- utils.rs: read_kickoff_template() reads custom template file content
- utils.rs: read_no_template() checks agent.no_template boolean
- run.rs: checks config before building prompt; uses custom template or empty
- launch.rs: gates --model/--allowedTools flags behind agent_binary == claude
- launch.rs: non-Claude agents receive prompt via stdin instead of $(cat)
…koff-template

feat(kickoff): add configurable prompt template via hook-config.json (gh#43)
@dollspace-gay
dollspace-gay marked this pull request as ready for review August 16, 2026 22:42
@dollspace-gay dollspace-gay self-assigned this Aug 16, 2026
@dollspace-gay
dollspace-gay merged commit 98085fe into develop Aug 16, 2026
7 checks passed
@dollspace-gay
dollspace-gay deleted the agent/sync-main-into-develop-codex branch August 16, 2026 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants