Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2e24f9d56 | ||
|
|
5aa5c2a6c8 | ||
|
|
41b2daed0c | ||
|
|
e0a79b3990 | ||
|
|
e2d6b75b10 | ||
|
|
b4be999777 | ||
|
|
5c3bf0b642 | ||
|
|
be2b897149 | ||
|
|
f5a39cfb9b | ||
|
|
f5a6fa5b32 | ||
|
|
93ec6d916b | ||
|
|
c36fb29683 | ||
|
|
cac0f43b58 | ||
|
|
805364f201 | ||
|
|
3b2a3a7630 | ||
|
|
bf29d3640e | ||
|
|
de15bffc2f | ||
|
|
1377e7ebf2 | ||
|
|
d53ebbda95 | ||
|
|
b227df3c3f | ||
|
|
a3e0e5c1bb | ||
|
|
116f8a10fb | ||
|
|
116b03534f | ||
|
|
b697a12b89 | ||
|
|
7b64699ff1 | ||
|
|
1598b3cc74 | ||
|
|
212742e880 | ||
|
|
6693e60f6f | ||
|
|
c097e50405 | ||
|
|
ccbc9c7844 | ||
|
|
948a8d34fd | ||
|
|
e078b5c4bc | ||
|
|
4a24c0b31f | ||
|
|
e988d3cc40 | ||
|
|
cd20aeadad | ||
|
|
1bb7ba1248 | ||
|
|
fdafec3d9d | ||
|
|
0fcf792db3 | ||
|
|
9cd52dd9aa | ||
|
|
5290dab199 | ||
|
|
e17c7895e4 | ||
|
|
e4ea2eaabc | ||
|
|
12b9a57404 | ||
|
|
514c6cf61c | ||
|
|
bef0ecea3a | ||
|
|
5bb5d9b660 | ||
|
|
f30405ea2b | ||
|
|
f9efae8a5e | ||
|
|
819cfc655b | ||
|
|
5afe5bcf99 | ||
|
|
0c25b2f4a6 | ||
|
|
252895e01c | ||
|
|
3ea49c7e07 | ||
|
|
66a27bd7ef | ||
|
|
b070ce4715 | ||
|
|
84b581fde6 | ||
|
|
af5e11a734 | ||
|
|
522ced45ff | ||
|
|
79d7f2fa68 | ||
|
|
eb3ee14a0e | ||
|
|
6ed6b28d02 | ||
|
|
2f4e9bbe14 | ||
|
|
3057f054b2 | ||
|
|
a4e7ea8cc3 | ||
|
|
c812192800 | ||
|
|
81121d03b0 | ||
|
|
e5f03587c9 | ||
|
|
c25e70a588 | ||
|
|
b97c79aa0b | ||
|
|
2d2c39f9e5 | ||
|
|
673a5bc2ce | ||
|
|
df5ee243b1 | ||
|
|
71fa670512 | ||
|
|
d91ab1ab0f | ||
|
|
1eb05f0d24 | ||
|
|
a49e939609 | ||
|
|
e76e2fd317 | ||
|
|
2418a81a9e | ||
|
|
c4a441d1c3 | ||
|
|
c5c145f325 | ||
|
|
3683ce9082 | ||
|
|
80dc6ec8d0 | ||
|
|
12d6585586 | ||
|
|
53916b0f96 | ||
|
|
badbbf84bd | ||
|
|
d98352d003 | ||
|
|
542bd88040 | ||
|
|
81384939a2 | ||
|
|
c8ed5619c6 | ||
|
|
3b79155602 | ||
|
|
552ee93a47 | ||
|
|
7bf429b599 | ||
|
|
0792f0ba84 | ||
|
|
02ab747ca9 | ||
|
|
c53a98ee87 | ||
|
|
1e4aa8badc | ||
|
|
1e76c99b48 | ||
|
|
ff9b6c7196 | ||
|
|
7680dc5079 | ||
|
|
d0370ed9f7 | ||
|
|
7e3b3dbd78 | ||
|
|
6b71dc8108 | ||
|
|
307f2fc9e2 | ||
|
|
455de3d799 | ||
|
|
4e74ed37b4 | ||
|
|
7ef58293be | ||
|
|
27c9647a13 | ||
|
|
89541eb3b0 | ||
|
|
3a3a714cc4 | ||
|
|
b107e4452a | ||
|
|
2b514cb526 | ||
|
|
630c30de79 | ||
|
|
a69b3455d3 | ||
|
|
ddf8383784 | ||
|
|
c1bbeba18f | ||
|
|
1f99fb592e | ||
|
|
aae01431b4 | ||
|
|
3c99f69fee | ||
|
|
b7fd13923a | ||
|
|
0a47a95cc3 | ||
|
|
ef8d9af469 | ||
|
|
549f36a1f2 | ||
|
|
187e6e81ee | ||
|
|
e60ad551f0 | ||
|
|
a0617ad437 | ||
|
|
411736fdaa | ||
|
|
bea6567933 | ||
|
|
d6b693a9b2 | ||
|
|
b8bedf4d7b | ||
|
|
5c53dfb91b | ||
|
|
e0cbbc0895 | ||
|
|
40dd546564 | ||
|
|
b89d8cbab2 | ||
|
|
4b62912343 | ||
|
|
8a8c8cf7e9 | ||
|
|
201529414b | ||
|
|
3da1f918a4 | ||
|
|
f8d8e5b1e2 | ||
|
|
826d4849df | ||
|
|
0a18bfe21b | ||
|
|
5976b94fbc | ||
|
|
698548d6ef | ||
|
|
d0584279e5 | ||
|
|
62f248fd2c | ||
|
|
8f2750a266 | ||
|
|
2ea7f7cd38 | ||
|
|
75b3810856 | ||
|
|
30419532ba | ||
|
|
fff67838e0 | ||
|
|
15ebe24927 | ||
|
|
b2c1629925 | ||
|
|
0e8fcf70a0 | ||
|
|
4673b435b7 | ||
|
|
1e062fd7f0 | ||
|
|
74a3ec925c | ||
|
|
4944ec8473 | ||
|
|
204b65a0e3 | ||
|
|
cbedb8a504 | ||
|
|
a8dbab0cff | ||
|
|
789ff73fe9 | ||
|
|
5176938e95 | ||
|
|
69a1ee677d | ||
|
|
b3cf2c59a8 | ||
|
|
8ebaeb6d38 | ||
|
|
ce58768e6b |
No files matched your search
@@ -66,7 +66,7 @@ jobs:
|
||||
|
||||
- name: Install quality tools
|
||||
run: |
|
||||
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2
|
||||
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(cat .golangci-version)
|
||||
go install mvdan.cc/gofumpt@v0.11.0
|
||||
go install github.com/go-task/task/v3/cmd/task@v3.48.0
|
||||
|
||||
@@ -103,6 +103,12 @@ jobs:
|
||||
- name: Allow unprivileged user namespaces
|
||||
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
|
||||
|
||||
# The gate's uncached `go test ./...` runs the Docker-backed tests that
|
||||
# -short skips, and those start a container from alpine:3. A fresh runner
|
||||
# has no such image, so the suite failed on "No such image: alpine:3".
|
||||
- name: Pull test container images
|
||||
run: docker pull alpine:3
|
||||
|
||||
- name: Quality gate
|
||||
run: |
|
||||
# The formatter sequence has one owner: task fmt, which drives go fix
|
||||
@@ -170,9 +176,7 @@ jobs:
|
||||
echo "This commit is not a release, so the images are published as :edge and sha-<sha>; :latest keeps naming the newest release."
|
||||
fi
|
||||
|
||||
build-and-push:
|
||||
outputs:
|
||||
agent_digest: ${{ steps.agent.outputs.digest }}
|
||||
archied-image:
|
||||
needs: gate
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
@@ -264,6 +268,43 @@ jobs:
|
||||
cache-from: type=gha,scope=archied
|
||||
cache-to: type=gha,mode=max,scope=archied
|
||||
|
||||
|
||||
agent-image:
|
||||
outputs:
|
||||
agent_digest: ${{ steps.agent.outputs.digest }}
|
||||
needs: gate
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
# Annotated tags: dereference to the commit, as archied-image does.
|
||||
- name: Resolve the commit this ref points at
|
||||
id: commit
|
||||
run: |
|
||||
sha="$(git rev-parse "${GITHUB_REF}^{commit}")"
|
||||
echo "sha=$sha" >> "$GITHUB_OUTPUT"
|
||||
echo "short=${sha:0:12}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Log in to GHCR
|
||||
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
|
||||
|
||||
- name: Resolve runtime version
|
||||
id: versions
|
||||
run: |
|
||||
RUNTIME_TAG="$(git tag --points-at HEAD --list 'archie/v*' | sort -V | tail -1)"
|
||||
RELEASE_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -1)"
|
||||
RUNTIME_VERSION="${RUNTIME_TAG#archie/}"
|
||||
[ -n "$RUNTIME_VERSION" ] || RUNTIME_VERSION="${RELEASE_TAG#v}"
|
||||
echo "runtime_tag=$RUNTIME_TAG" >> "$GITHUB_OUTPUT"
|
||||
echo "release_tag=$RELEASE_TAG" >> "$GITHUB_OUTPUT"
|
||||
echo "runtime=$RUNTIME_VERSION" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Build and push archie-agent
|
||||
id: agent
|
||||
if: steps.versions.outputs.runtime_tag != '' || steps.versions.outputs.release_tag != ''
|
||||
@@ -283,14 +324,10 @@ jobs:
|
||||
# Packages every host-run binary (archied, archie-gateway,
|
||||
# archie-state-store, archie-ui, archie-messaging) as a
|
||||
# linux/amd64 zip for a
|
||||
# non-Docker install. Independent of build-and-push: it never touches the
|
||||
# archied/archie-agent image jobs, and a gateway-only release (no
|
||||
# archie/v* tag) still produces this zip -- it's keyed to the archied tag
|
||||
# alone. archie-agent is deliberately excluded: it only ever runs inside
|
||||
# the Docker image build-and-push already publishes, never as a host
|
||||
# binary (archie-core-8cda.4.7.1).
|
||||
# non-Docker install. It waits only for the agent image, whose digest
|
||||
# release.json pins; archie-agent itself never ships as a host binary.
|
||||
dist-zip:
|
||||
needs: [gate, build-and-push]
|
||||
needs: [gate, agent-image]
|
||||
# Not gated on github.ref. A release is pushed as main plus both tags at
|
||||
# one SHA, the concurrency group below collapses those into a single run,
|
||||
# and the survivor is whichever ref happened to start last -- for
|
||||
@@ -352,7 +389,7 @@ jobs:
|
||||
done
|
||||
cp deployments/INSTRUCTIONS.md CHANGELOG.md "$name/"
|
||||
cp scripts/archie-update-* "$name/"
|
||||
digest='${{ needs.build-and-push.outputs.agent_digest }}'
|
||||
digest='${{ needs.agent-image.outputs.agent_digest }}'
|
||||
test -n "$digest"
|
||||
jq --arg image "ghcr.io/samcharles93/archie-agent@$digest" '. + {agent_image: $image}' release.json > "$name/release.json"
|
||||
# README.md doesn't exist yet in this repo; include it once it does
|
||||
|
||||
@@ -33,7 +33,7 @@ jobs:
|
||||
- name: Install quality tools
|
||||
run: |
|
||||
go install github.com/go-task/task/v3/cmd/task@v3.48.0
|
||||
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2
|
||||
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(cat .golangci-version)
|
||||
go install mvdan.cc/gofumpt@v0.11.0
|
||||
bash tools/proto.sh install
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
v2.14.0
|
||||
+143
@@ -5,6 +5,149 @@ release's per-component sections are labelled beneath its heading.
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [1.53.0] - 2026-10-11
|
||||
|
||||
### archied
|
||||
|
||||
- Every organisation's data is its own. Chats, tasks, events, transitions, steps, tool calls, run statistics, event sources, event types, mappings, bindings and agent memory are read and written in the org that owns them, and a request can no longer write into another org. Rows written before orgs existed move to their owner's org on upgrade.
|
||||
- An instance admin decides what each org may reach: the models it can use, and whether it may register providers under its own credentials. Org Settings gains a Models tab and instance Models gains Org access. The system org is never restricted; another org uses nothing until it is granted.
|
||||
- Models are addressed by alias. Aliases replace model roles, one resolver serves every purpose (agent steps, implement, PR review, MCP sampling, chat, embedding, transcription), and an unknown alias fails instead of falling back to a default. The step editor and the chat picker offer aliases, and a workflow naming one that does not exist is refused when saved.
|
||||
- Chat sessions belong to one org; a chat resolves its models in the caller's org and is billed to it, and a task run from chat posts its outcome back to that chat.
|
||||
- Add a member by provider subject, or by email as a placeholder that the first sign-in the provider vouches for claims.
|
||||
- The workflow canvas authors parallel branches as lanes, adds a switch step that runs the case matching a reference, and edits a call's interface. A step shows its role, its number and its run trace.
|
||||
- The workflows list shows each workflow's running count and latest run result, the canvas reveals its data-edge handles on hover, and restoring a version asks for confirmation.
|
||||
- Store packages can auto-update: a package given the policy is moved to the catalogue's newest digest by a State Store ticker. An update asking for more authority than was accepted waits as a pending update with the running version untouched; approving it accepts the new authority, and a rollback restores the previous version with the authority accepted against it.
|
||||
- Model provider keys never enter an agent container: the runtime reaches its providers through the egress proxy, which holds the keys. A task's own credential can no longer replace the workflow definition its run is pinned to, and a package workflow's triggers, tools and forge calls are bounded by the authority accepted for the package.
|
||||
- The dashboard warns when it is reachable from off-host over plain HTTP, and the wildcard listen address counts as off-host rather than loopback. Instance health, logs, config and identities, the setup checklist and the skill catalogue are system-org only, and API requests are refused until the access chain has loaded.
|
||||
- `/approve` reaches Telegram; the router served it but nothing published it.
|
||||
- A worktree a killed container left root-owned is taken back by the daemon, and a PR review's benchmark runner works again on configured models and public PRs.
|
||||
- An unserved `/api` path returns 404 instead of the dashboard page, and an input group's select no longer loses clicks to its addon.
|
||||
|
||||
### archie-agent
|
||||
|
||||
- The runtime reaches model providers through the egress proxy, so provider keys stay out of the container.
|
||||
- Agent steps resolve model aliases and their own org's models and credentials, failing on an unknown alias instead of falling back.
|
||||
- A switch step runs the case matching its reference.
|
||||
- A call waiting on another step is reconciled from durable steps, so it resumes after a daemon restart rather than stranding.
|
||||
|
||||
## [1.52.0] - 2026-10-09
|
||||
|
||||
### archied
|
||||
|
||||
- The harness page's setup terminal opens a real session: it starts an ephemeral container from a Kit profile, runs the CLI's own login and captures the OAuth tokens at the provider's token endpoint. Point the dashboard at the daemon with `[services.harness].target` and a `HARNESS_TOKEN` and it stops answering 503; the terminal is created at your browser's size. Takeover of a live task is not in this release.
|
||||
- A credential's token endpoint is refused when the run is not granted that service, instead of proxy-ing the provider's real tokens into the container.
|
||||
- Settings → Profiles, Credential bindings and Playbooks are editable from the dashboard, and curator definitions can be changed and applied without a restart.
|
||||
- Settings say whether each one applies live or needs a restart, show what is consuming resources, and report whether an apply landed.
|
||||
- Status shows each service's dependency checks, the agent workers and the broker.
|
||||
- The Logs page reads recent logs from every service, not just the daemon.
|
||||
- Captures and webhook sources are scoped to the org that owns them: the list, retention and delivery authorization all act in the right org, and a workflow definition resolves in its own org.
|
||||
- Chat settings are attributed to the signed-in user, and Settings → Tokens explains when a personal token cannot be created.
|
||||
- A channel enabled after Archie started works immediately; a channel that fails on its own recovers; a failed channel is no longer reported as enabled, and stored channel settings no longer save duplicate or unnormalized values.
|
||||
- The task table sorts, the command palette no longer scrolls sideways or loses its highlight, unknown routes render a not-found page, and configuration reload failures are shown instead of passing silently.
|
||||
- A scheduled job whose payload names a dangerous command is refused.
|
||||
- A disabled model provider is never served from the ambient API key.
|
||||
- `generate_video` is backed by ai-sdk's MiniMax video provider.
|
||||
- A dashboard token is no longer written to the startup log.
|
||||
|
||||
### archie-agent
|
||||
|
||||
- `workflow.call`: a call is keyed on its declared step path, its key is freed once the callee reaches a terminal state, and a caller waiting on a callee releases its capacity instead of holding it.
|
||||
- `command.run` honours step retry and `on_failure`.
|
||||
- A value passed between steps keeps its declared type, and optional result booleans are enforced only when the workflow declares them.
|
||||
- Capture tools have their results checked against the declared schema.
|
||||
- A single-cycle run waits for its in-flight tasks before exiting, and identity tasks inherit live settings.
|
||||
- Kit containers run Docker's init as PID 1, so orphaned processes are reaped instead of accumulating inside a long task.
|
||||
|
||||
## [1.51.1] - 2026-10-08
|
||||
|
||||
### archied
|
||||
|
||||
- Chat with OpenAI's gpt-6 models (gpt-6-luna and the rest) works with tools; a turn failed with "Function tools with reasoning_effort are not supported".
|
||||
|
||||
## [1.51.0] - 2026-10-08
|
||||
|
||||
### archied
|
||||
|
||||
- A secret engine enabled after Archie started (Bitwarden, for example) now supplies its keys straight away; providers that depended on it no longer stay disabled until a restart.
|
||||
- The dashboard chat has a microphone button: record a voice message and it is transcribed like a Telegram voice note. It shows only when a `transcription` model role is set under Settings → Models.
|
||||
- A file Archie sends in the dashboard chat is a download link for an hour, instead of a note that it can't be delivered.
|
||||
- Typing `/model` or `/personality` on its own in the dashboard chat offers the choices as buttons.
|
||||
|
||||
## [1.50.1] - 2026-10-08
|
||||
|
||||
### archied
|
||||
|
||||
- When an update is rolled back, the log names the health check that failed instead of only "unhealthy".
|
||||
|
||||
## [1.50.0] - 2026-10-08
|
||||
|
||||
### archied
|
||||
|
||||
- Tools that need your approval ask for it again, and Archie can ask you a question or offer choices mid-reply. Since the services were split these never reached Telegram or the dashboard: approval-gated tools failed and questions were never asked.
|
||||
- The dashboard chat shows approvals as Approve / Always this session / Deny, choices as buttons, and questions with a reply field.
|
||||
- `/update` in the dashboard chat lists what's available with Install and Not now.
|
||||
- Settings → Status → Versions installs the update it shows; its Install button sent an empty request.
|
||||
|
||||
## [1.49.4] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- Settings → Status and Settings → Extensions are split into tabs instead of one long page; the Versions table's status column ends at the card's edge.
|
||||
- Tools & MCP has one "Add MCP server" button; the transport is chosen in the form, and an unnamed new server is not an unsaved change.
|
||||
- Settings → Repositories shows the add field when no repositories are configured, instead of a blank page.
|
||||
- The unsaved-changes bar always rests at the bottom of the window.
|
||||
|
||||
## [1.49.3] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- Settings → Status → Versions shows the Gateway as "Update available" with an Install button when a newer release exists; it read "Unknown" with no way to install. The Runtime row stays "Unknown" until an agent task has run.
|
||||
- The release channel buttons sit at the Updates card's right edge instead of mid-row.
|
||||
|
||||
## [1.49.2] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- Carries the 1.49.0 and 1.49.1 changes, whose builds were never published. The update check reads GitHub releases directly and still offers only releases with a verifiable linux-amd64 zip.
|
||||
|
||||
## [1.49.1] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- When the dashboard session expires, the page returns to the sign-in screen instead of showing errors on every page until a manual refresh.
|
||||
|
||||
## [1.49.0] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- Extensions that declare no egress hosts (vault, email, gitea) reach the network again; only packages that declare their hosts are confined to them. The Accept dialog shows "network: unrestricted" for the rest.
|
||||
- The update check finds releases itself, and reuses a found release for ten minutes so repeated checks stay under GitHub's rate limit.
|
||||
|
||||
## [1.48.1] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- **Settings → Status → Updates** now chooses only the release channel (stable, prereleases, or a pinned version). Update checks and installs always run the `archie-update-*` scripts installed beside the binaries; the dashboard can no longer set the command that runs.
|
||||
|
||||
## [1.48.0] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- **Settings → Status → Updates** edits the update check and install commands. They default to the `archie-update-*` scripts installed beside the binaries, so a zip install shows **Install** on the Versions card with nothing configured. The `update_check_command` and `update_install_command` keys under `[chat.telegram]` are no longer read; remove them from `config.toml`.
|
||||
- `archie-update-install` run from a shell now reads `~/.config/archie/env`, so the pre-update backup of the bundled database no longer fails with `no password supplied`. Run it with `--auto` to install the newest release.
|
||||
|
||||
## [1.47.3] - 2026-10-07
|
||||
|
||||
### archied
|
||||
|
||||
- **Settings → Extensions**: **Accept** in the authority review now accepts the extension, and **Remove** removes it. Both previously closed the dialog without doing anything.
|
||||
|
||||
## [1.47.2] - 2026-10-06
|
||||
|
||||
### archied
|
||||
|
||||
- **Events → Inspector** now lists your capture sources with their real URLs and a **New source** button, replacing the `/webhooks/capture/<source>` placeholder. Sources no longer sit on the Bindings tab.
|
||||
|
||||
## [1.47.1] - 2026-10-06
|
||||
|
||||
### archied
|
||||
|
||||
@@ -11,7 +11,7 @@ agent or tool in an isolated container, and the result lands somewhere for
|
||||
review or action. A repository is an optional input to a workflow, not the point
|
||||
of the product.
|
||||
|
||||
<temporary - this statement must be removed on 2026-10-10"> The product is
|
||||
<temporary - this statement must be removed on 2026-10-20"> The product is
|
||||
unfinished. Many features are half-built, and the codebase carries far more
|
||||
code, binaries, docs and tooling than it delivers. The job right now is to
|
||||
finish features and shrink the codebase, not to extend it. </temporary>
|
||||
@@ -27,6 +27,20 @@ When sources disagree, the higher one wins:
|
||||
5. Everything else (memories, comments, old docs) is a hint. Verify it against
|
||||
the code before acting on it.
|
||||
|
||||
## Working with the maintainer
|
||||
|
||||
- **A clear direction is the go-ahead.** Do it in the same turn. Do not restate
|
||||
the plan, offer options, or ask "shall I proceed?". Stop only for destructive
|
||||
or outward-facing actions (deleting data, pushing, touching a live host).
|
||||
- **Post outside the repo only when told.** Chat, tickets and any external
|
||||
service get a message only on the maintainer's instruction.
|
||||
- **Report, don't narrate.** Final replies say what changed, what was verified,
|
||||
and anything blocked, in a few lines. No preamble, no recap of the request, no
|
||||
closing offers of more help. Leave out what the maintainer can see or infer:
|
||||
a clean tree, unpushed commits, a passing gate (commits imply it), and steps
|
||||
skipped that the task never asked for. Name a skipped step only when the
|
||||
task required it.
|
||||
|
||||
## How to decide
|
||||
|
||||
- **Broken beats new.** A bug that blocks work gets fixed now, with the smallest
|
||||
|
||||
+34
-5
@@ -9,6 +9,35 @@ tasks:
|
||||
cmds:
|
||||
- task --list
|
||||
|
||||
setup:
|
||||
desc: Install the pinned tooling and dependencies a checkout needs
|
||||
cmds:
|
||||
# Report what this task cannot install for you, so a missing Go, Node or
|
||||
# Docker fails here by name rather than somewhere inside the gate.
|
||||
- |
|
||||
set -eu
|
||||
missing=
|
||||
for tool in go task node npm docker; do
|
||||
command -v "$tool" >/dev/null 2>&1 || missing="$missing $tool"
|
||||
done
|
||||
if [ -n "$missing" ]; then
|
||||
echo "warning: not installed (AGENTS.md, Build and gate):$missing" >&2
|
||||
fi
|
||||
# The pin is one file, read here and by .github/workflows, so the linter
|
||||
# running locally and the one running the gate cannot drift apart.
|
||||
- |
|
||||
set -eu
|
||||
want=$(cat {{.ROOT_DIR}}/.golangci-version)
|
||||
have=$(golangci-lint --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)
|
||||
if [ "$have" = "${want#v}" ]; then
|
||||
echo "golangci-lint $want already installed"
|
||||
else
|
||||
echo "installing golangci-lint $want (have: ${have:-none})"
|
||||
GOBIN="$(go env GOPATH)/bin" go install "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$want"
|
||||
fi
|
||||
- task: proto:install
|
||||
- task: ui:deps
|
||||
|
||||
fmt:
|
||||
desc: Fix and format Go source with the gate's configured formatters
|
||||
cmds:
|
||||
@@ -96,11 +125,6 @@ tasks:
|
||||
cmds:
|
||||
- golangci-lint run ./...
|
||||
|
||||
lint:playbooks:
|
||||
desc: Validate playbook bindings
|
||||
cmds:
|
||||
- go run ./cmd/archied playbooks lint -dir ./playbooks
|
||||
|
||||
vuln:
|
||||
desc: Scan for known vulnerabilities (requires network access)
|
||||
cmds:
|
||||
@@ -146,6 +170,11 @@ tasks:
|
||||
cmds:
|
||||
- bash tools/webhook-send.sh {{.CLI_ARGS}}
|
||||
|
||||
bench:prreview:
|
||||
desc: Run the PR review benchmark on the configured models and write docs/benchmarks/pr-review-*.md (-- -model ALIAS -judge-model REF; --help for flags)
|
||||
cmds:
|
||||
- go run ./cmd/archied prbench {{.CLI_ARGS}}
|
||||
|
||||
dev:
|
||||
desc: Run development services and Vite at http://localhost:5173
|
||||
deps: [dev:daemon, dev:gateway, dev:messaging, dev:state-store, dev:dashboard, dev:ui]
|
||||
|
||||
+7
-4
@@ -21,7 +21,6 @@ steps:
|
||||
- id: plan
|
||||
type: agent.run
|
||||
settings:
|
||||
role: planner
|
||||
read_only: true
|
||||
mission: |
|
||||
Plan this change: {{ task.prompt }}
|
||||
@@ -135,7 +134,7 @@ _runs without a repository._
|
||||
| `protect_tests` | bool | Write-block the repository test files. |
|
||||
| `read_only` | bool | Restrict the agent to read-only tools. |
|
||||
| `result` | mapping | A JSON Schema object the agent must return; later steps read it as steps.<id>.result. |
|
||||
| `role` | text | Which configured model role runs the agent, e.g. builder or planner. Empty means builder. |
|
||||
| `model` | text | The model alias that runs the agent, e.g. default or fast. Empty means default. |
|
||||
|
||||
### `command.run`
|
||||
|
||||
@@ -247,11 +246,15 @@ _runs without a repository._
|
||||
|
||||
| Setting | Type | Meaning |
|
||||
|---|---|---|
|
||||
| `inputs` | mapping | |
|
||||
| `outputs` | mapping | |
|
||||
| `inputs` | mapping | Callee input names mapped to scalar literals or `inputs.<name>` references to caller inputs. |
|
||||
| `outputs` | mapping | Callee output names mapped to `outputs.<name>` references to caller outputs; requires `wait: true`. |
|
||||
| `wait` | bool | Wait for the child run to finish before continuing. |
|
||||
| `workflow` | text | The workflow to start as a child run. |
|
||||
|
||||
The step must declare an `id`: the step's id is the key of the call it starts,
|
||||
so a retry of that call site returns the child already started instead of
|
||||
starting a second one.
|
||||
|
||||
### `workflow.finish`
|
||||
|
||||
_runs without a repository._
|
||||
|
||||
@@ -15,10 +15,22 @@ import (
|
||||
"syscall"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/agentworker"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/egress"
|
||||
)
|
||||
|
||||
type workerRunner func(context.Context, agentworker.Settings, *slog.Logger) error
|
||||
|
||||
// runHold blocks until signalled and exits 0. It is the keepalive for a Kit
|
||||
// container that runs no worker: the agent binary is archie's own and is
|
||||
// mounted into every Kit, so the container needs no binary the image may not
|
||||
// ship, and holds no environment of its own.
|
||||
func runHold() int {
|
||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||
defer stop()
|
||||
<-ctx.Done()
|
||||
return 0
|
||||
}
|
||||
|
||||
func main() {
|
||||
os.Exit(run())
|
||||
}
|
||||
@@ -28,6 +40,9 @@ func run() int {
|
||||
}
|
||||
|
||||
func runCommand(args []string, getenv func(string) string, stderr io.Writer, runWorker workerRunner) int {
|
||||
if len(args) > 0 && args[0] == "hold" {
|
||||
return runHold()
|
||||
}
|
||||
if len(args) > 0 && args[0] == "relay" {
|
||||
return runRelay(args[1:], stderr, agentworker.RunRelay)
|
||||
}
|
||||
@@ -76,6 +91,9 @@ func runCommand(args []string, getenv func(string) string, stderr io.Writer, run
|
||||
NATSToken: natsToken,
|
||||
StateStoreTarget: stateStoreURL,
|
||||
StateStoreToken: stateStoreToken,
|
||||
ModelProxy: getenv(egress.ModelProxyEnv),
|
||||
ModelProxyHosts: egress.ParseHosts(getenv(egress.ModelProxyHostsEnv)),
|
||||
ModelProxyCA: getenv(egress.ModelProxyCAEnv),
|
||||
}, log); err != nil {
|
||||
return 1
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
// This file enforces the dashboard's process boundary
|
||||
// (docs/prds/external-agent-harness.md, "Session contract", Transport): the
|
||||
// dashboard must not link the container or daemon internals, because only the
|
||||
// daemon owns containers. Go imports are atomic, so a single reference
|
||||
// relinks a runtime, and the boundary holds only while something re-measures
|
||||
// it. archie-core-h3s0 names this check; it was purged with the test suite and
|
||||
// is restored here.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestDashboardDoesNotLinkContainerRuntime(t *testing.T) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
defer cancel()
|
||||
out, err := exec.CommandContext(ctx, "go", "list", "-deps", ".").Output()
|
||||
if err != nil {
|
||||
t.Fatalf("go list -deps .: %v", err)
|
||||
}
|
||||
linked := map[string]bool{}
|
||||
for line := range strings.SplitSeq(strings.TrimSpace(string(out)), "\n") {
|
||||
linked[line] = true
|
||||
}
|
||||
for _, pkg := range []string{
|
||||
"github.com/samcharles93/archie-core/internal/container",
|
||||
"github.com/samcharles93/archie-core/internal/app/archied",
|
||||
"github.com/samcharles93/archie-core/internal/agentexec",
|
||||
} {
|
||||
t.Run(pkg, func(t *testing.T) {
|
||||
if linked[pkg] {
|
||||
t.Errorf("cmd/archie-ui links %s: only the daemon owns containers", pkg)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -38,6 +38,8 @@ func run() int {
|
||||
flag.StringVar(&options.Gateway.Token, "gateway-token", "", "bearer token presented to archie-gateway")
|
||||
flag.StringVar(&options.State.Target, "state-target", "", "archie-state-store gRPC address (defaults to [services.state].target)")
|
||||
flag.StringVar(&options.State.Token, "state-token", "", "bearer token presented to archie-state-store")
|
||||
flag.StringVar(&options.Harness.Target, "harness-target", "", "archied harness session gRPC address (defaults to [services.harness].target); empty leaves the setup terminal unwired")
|
||||
flag.StringVar(&options.Harness.Token, "harness-token", "", "bearer token presented to the daemon's harness contract")
|
||||
flag.DurationVar(&options.DependencyTimeout, "dependency-timeout", 0, "per-dependency readiness probe timeout (default 5s)")
|
||||
flag.DurationVar(&options.EventPollInterval, "event-poll-interval", 0, "how often the activity feed polls the State Store for new events (default 1s)")
|
||||
// BoolFunc rather than BoolVar so an unset flag stays distinguishable
|
||||
|
||||
+6
-2
@@ -6,6 +6,7 @@ import (
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/archied"
|
||||
"github.com/samcharles93/archie-core/internal/app/archieplaybooks"
|
||||
"github.com/samcharles93/archie-core/internal/app/prbench"
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -16,8 +17,8 @@ func main() {
|
||||
if archied.IsSetupArgs(args) {
|
||||
os.Exit(archied.RunSetup(args[1:], os.Stdin, os.Stdout, os.Stderr))
|
||||
}
|
||||
if len(args) > 0 && args[0] == "select-release" {
|
||||
os.Exit(archied.RunReleaseChannel(args[1:], os.Stdin, os.Stdout, os.Stderr))
|
||||
if len(args) > 0 && args[0] == "update" {
|
||||
os.Exit(archied.RunUpdate(args[1:], os.Stdout, os.Stderr))
|
||||
}
|
||||
if len(args) > 0 && args[0] == "update-image" {
|
||||
os.Exit(archied.RunUpdateImage(args[1:], os.Stderr))
|
||||
@@ -28,6 +29,9 @@ func main() {
|
||||
if len(args) > 0 && args[0] == "status" {
|
||||
os.Exit(archied.RunStatus(args[1:], os.Stdout, os.Stderr))
|
||||
}
|
||||
if len(args) > 0 && args[0] == "prbench" {
|
||||
os.Exit(prbench.Main(args[1:], os.Stdout, os.Stderr))
|
||||
}
|
||||
if len(args) > 0 && args[0] == "playbooks" {
|
||||
os.Exit(archieplaybooks.Run(args[1:], os.Stderr))
|
||||
}
|
||||
|
||||
+15
-11
@@ -17,9 +17,6 @@
|
||||
# database_url = "postgres://archie:archie@127.0.0.1:5432/archie?sslmode=disable"
|
||||
|
||||
# skills_dir = "~/.local/share/archie/skills" # SKILL.md search path; defaults under work_dir when unset
|
||||
# workflow_routing_file = "~/.local/share/archie/workflow-routing.yaml" # kind->workflow rebinding (bug/feature)
|
||||
# workflow_labels_file = "~/.local/share/archie/workflow-labels.yaml" # arbitrary forge label -> workflow (EDA playbook slice 2)
|
||||
# playbook_dirs = ["~/.local/share/archie/workflows"] # list of dirs of *.yaml binding files, merged with the two above (slice 3); a key bound twice across sources is a load failure
|
||||
|
||||
poll_interval = "60s"
|
||||
label = "archie"
|
||||
@@ -63,7 +60,8 @@ token = { engine = "env", key = "ARCHIE_GITHUB_TOKEN" }
|
||||
# intake per identity is a pending migration, not a setting.
|
||||
|
||||
# [[identities]] runs more than one bot identity from a single daemon, each
|
||||
# with its own forge/dispatch/models/providers/budgets/notify. Intake
|
||||
# with its own forge account and repository membership. Runtime settings
|
||||
# are shared and edited through the control plane. Intake
|
||||
# settings are rejected per identity, and [forge].intake = "webhook"/"both"
|
||||
# is rejected alongside [[identities]]. Minimal shape:
|
||||
# [[identities]]
|
||||
@@ -146,16 +144,9 @@ class = "ollama"
|
||||
# "openrouter/openai/gpt-5.6-sol",
|
||||
# ]
|
||||
|
||||
# Optional self-hosted update adapter. Both values are argv arrays (never
|
||||
# shell snippets). The check command must write a releaseupdate.Snapshot JSON
|
||||
# document to stdout; configure the installer as well to show Approve/Defer.
|
||||
# [chat.telegram]
|
||||
# The bot token from @BotFather, resolved through a configured secret engine.
|
||||
# token = { engine = "bws", key = "TELEGRAM_BOT_TOKEN" }
|
||||
# Run by archie-messaging, which serves /update, so these commands execute on
|
||||
# whichever host runs that process.
|
||||
# update_check_command = ["/usr/local/bin/archie-update-check"]
|
||||
# update_install_command = ["/usr/local/bin/archie-update-install"]
|
||||
|
||||
# Email and the generic inbound webhook are archipelago channel extensions
|
||||
# (channels/email, channels/webhook): install, accept and enable them from the
|
||||
@@ -299,6 +290,19 @@ target = "127.0.0.1:9090" # REQUIRED. The State Store gRPC address arch
|
||||
# # same remote store. See deployments/README.md for how to
|
||||
# # start archie-state-store.
|
||||
|
||||
# The daemon's harness session contract: the dashboard's setup terminal opens
|
||||
# a PTY into an ephemeral Kit container over it. Both ends are optional and
|
||||
# the dashboard's setup terminal degrades to 503 without them: the daemon
|
||||
# serves the contract only when target_token (or HARNESS_TOKEN) is set, and
|
||||
# archie-ui dials it only when a target is set.
|
||||
# [services.harness]
|
||||
# target = "127.0.0.1:8587" # The address archie-ui dials. Empty leaves the
|
||||
# # setup terminal unwired.
|
||||
# target_token = "..." # REQUIRED, even on loopback: a session is a
|
||||
# # shell in a container that holds an org credential.
|
||||
# # The daemon reads the same value to authenticate its
|
||||
# # clients. Leave unset to disable the listener.
|
||||
|
||||
# NATS is the sole autonomous workflow handoff. mode changes only where the
|
||||
# broker runs; every workflow still runs in a managed task container:
|
||||
# "embedded" – in-process nats-server (the default; no external server)
|
||||
|
||||
@@ -92,14 +92,15 @@ an install (or an upgrade across v1.30.0) needs its unit as well -- see
|
||||
|
||||
`archie-update-install` downloads the approved release's Linux/amd64 archive
|
||||
and verifies its `SHA256SUMS` entry before executing or installing it. Releases
|
||||
must include `release.json`, all host binaries, and the three updater scripts.
|
||||
must include `release.json`, all host binaries, and the two updater scripts.
|
||||
Older releases without this contract cannot be installed through the artifact
|
||||
path. `--from-source` (or `ARCHIE_UPDATE_SOURCE_BUILD=1`) explicitly clones and
|
||||
builds the selected release instead.
|
||||
|
||||
The update check command accepts `--channel stable` (default), `--channel next`
|
||||
(includes prereleases), or `--channel exact-pin --pin 1.2.3`. Set these arguments
|
||||
in the control plane's channel settings alongside the existing check command.
|
||||
`archied update check` finds the newest GitHub release with a linux-amd64 zip on
|
||||
the channel chosen under Settings → Status → Updates: stable, next (includes
|
||||
prereleases) or a pinned version. From a shell it reads
|
||||
`ARCHIE_UPDATE_RELEASE_CHANNEL` and `ARCHIE_UPDATE_PIN`, or `-channel` and `-pin`.
|
||||
The notification destination remains separate from the release channel.
|
||||
|
||||
For scheduled, unattended runs, `archie-update-install --auto` discovers the
|
||||
|
||||
@@ -76,6 +76,14 @@ A non-loopback `[web].listen` requires a dashboard token (`-token`, or
|
||||
binding-dispatch loop in `archied` consumes what arrives from the shared
|
||||
State Store.
|
||||
|
||||
The dashboard speaks plain HTTP. A non-loopback bind therefore carries the
|
||||
session cookie and the provider token in clear over the network, and
|
||||
archie-ui warns about exactly that at startup. Terminate TLS in front of it
|
||||
(a reverse proxy or the tunnel itself) and set
|
||||
`[web].trust_forwarded_headers = true` to declare the proxy and silence the
|
||||
warning; leaving it off while exposing the port directly is the case the
|
||||
warning names.
|
||||
|
||||
Auth note: unlike `archied`, archie-ui has no secret registry --
|
||||
`GATEWAY_TOKEN`/`STATE_STORE_TOKEN` resolve from its process environment
|
||||
only (or from `[services.*].target_token` in `config.toml`), so whatever
|
||||
|
||||
@@ -5,16 +5,11 @@ point an external app's webhook at archie, see the real payload it sends,
|
||||
map the fields you care about, bind them to a workflow, and watch the next
|
||||
matching event turn into a task -- no code, no redeploy, no restart.
|
||||
|
||||
## 1. Send a test event
|
||||
## 1. Create a source and send a test event
|
||||
|
||||
Point whatever external app you want archie to react to at:
|
||||
|
||||
```
|
||||
POST http://<your-archied-host>:8484/webhooks/capture/<source>
|
||||
```
|
||||
|
||||
`<source>` is a name you choose for this sender (e.g. `sentry`, `github-ci`,
|
||||
`stripe`) -- it's just a URL path segment, not a preset list. Send one real
|
||||
Open **Events → Inspector** and click **New source**. Archie shows the
|
||||
source's URL and signing secret once; copy both. Point the external app's
|
||||
webhook at that URL. Send one real
|
||||
event however is easiest for a first test, e.g.:
|
||||
|
||||
```bash
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
# PR review benchmark
|
||||
|
||||
```
|
||||
task bench:prreview
|
||||
```
|
||||
|
||||
Reviews the 38 runnable Martian pull requests once each at `deep` depth with
|
||||
the production pipeline, judges the posted comments against the golden
|
||||
comments in `internal/app/prbench/martian.json`, and writes
|
||||
`docs/benchmarks/pr-review-<timestamp>.md` (recall per PR, overall recall,
|
||||
precision, models, archie version). Commit that file with the run.
|
||||
|
||||
- Models come from the config at `~/.config/archie/config.toml`: the reviewer
|
||||
and judge both default to its `default` alias. Override with
|
||||
`task bench:prreview -- -model ALIAS_OR_PROVIDER/MODEL -judge-model ALIAS_OR_PROVIDER/MODEL`.
|
||||
Pick a judge other than the reviewer's model for an independent judgement.
|
||||
Aliases set only in the dashboard are not in the file; pass a
|
||||
`provider/model` ref instead.
|
||||
- Pull requests are public, so no credential is needed. `GH_TOKEN` or
|
||||
`GITHUB_TOKEN`, if set, only raises the GitHub API rate limit.
|
||||
- `-problems ID,ID` runs a partial smoke run; its report says it is not the
|
||||
acceptance run. A full run reports PASS when nothing failed and golden
|
||||
micro-recall is at least 0.70.
|
||||
- It is not part of `task test` and posts nothing to any pull request.
|
||||
@@ -63,7 +63,22 @@
|
||||
"/news/archie/1.46.0/": "/news/1.46.0/",
|
||||
"/news/archie/1.47.0/": "/news/1.47.0/",
|
||||
"/news/archie/1.47.1/": "/news/1.47.1/",
|
||||
"/news/archie/1.47.2/": "/news/1.47.2/",
|
||||
"/news/archie/1.47.3/": "/news/1.47.3/",
|
||||
"/news/archie/1.48.0/": "/news/1.48.0/",
|
||||
"/news/archie/1.48.1/": "/news/1.48.1/",
|
||||
"/news/archie/1.49.0/": "/news/1.49.0/",
|
||||
"/news/archie/1.49.1/": "/news/1.49.1/",
|
||||
"/news/archie/1.49.2/": "/news/1.49.2/",
|
||||
"/news/archie/1.49.3/": "/news/1.49.3/",
|
||||
"/news/archie/1.49.4/": "/news/1.49.4/",
|
||||
"/news/archie/1.5.0/": "/news/1.5.0/",
|
||||
"/news/archie/1.50.0/": "/news/1.50.0/",
|
||||
"/news/archie/1.50.1/": "/news/1.50.1/",
|
||||
"/news/archie/1.51.0/": "/news/1.51.0/",
|
||||
"/news/archie/1.51.1/": "/news/1.51.1/",
|
||||
"/news/archie/1.52.0/": "/news/1.52.0/",
|
||||
"/news/archie/1.53.0/": "/news/1.53.0/",
|
||||
"/news/archie/1.6.0/": "/news/1.6.0/",
|
||||
"/news/archie/1.7.0/": "/news/1.7.0/",
|
||||
"/news/archie/1.8.0/": "/news/1.8.0/",
|
||||
@@ -143,7 +158,22 @@
|
||||
"/news/archied/1.46.0/": "/news/1.46.0/",
|
||||
"/news/archied/1.47.0/": "/news/1.47.0/",
|
||||
"/news/archied/1.47.1/": "/news/1.47.1/",
|
||||
"/news/archied/1.47.2/": "/news/1.47.2/",
|
||||
"/news/archied/1.47.3/": "/news/1.47.3/",
|
||||
"/news/archied/1.48.0/": "/news/1.48.0/",
|
||||
"/news/archied/1.48.1/": "/news/1.48.1/",
|
||||
"/news/archied/1.49.0/": "/news/1.49.0/",
|
||||
"/news/archied/1.49.1/": "/news/1.49.1/",
|
||||
"/news/archied/1.49.2/": "/news/1.49.2/",
|
||||
"/news/archied/1.49.3/": "/news/1.49.3/",
|
||||
"/news/archied/1.49.4/": "/news/1.49.4/",
|
||||
"/news/archied/1.5.0/": "/news/1.5.0/",
|
||||
"/news/archied/1.50.0/": "/news/1.50.0/",
|
||||
"/news/archied/1.50.1/": "/news/1.50.1/",
|
||||
"/news/archied/1.51.0/": "/news/1.51.0/",
|
||||
"/news/archied/1.51.1/": "/news/1.51.1/",
|
||||
"/news/archied/1.52.0/": "/news/1.52.0/",
|
||||
"/news/archied/1.53.0/": "/news/1.53.0/",
|
||||
"/news/archied/1.6.0/": "/news/1.6.0/",
|
||||
"/news/archied/1.7.0/": "/news/1.7.0/",
|
||||
"/news/archied/1.8.0/": "/news/1.8.0/",
|
||||
|
||||
@@ -1,4 +1,79 @@
|
||||
[
|
||||
{
|
||||
"version": "1.53.0",
|
||||
"date": "2026-10-11",
|
||||
"body": "### archied\n\n- Every organisation's data is its own. Chats, tasks, events, transitions, steps, tool calls, run statistics, event sources, event types, mappings, bindings and agent memory are read and written in the org that owns them, and a request can no longer write into another org. Rows written before orgs existed move to their owner's org on upgrade.\n- An instance admin decides what each org may reach: the models it can use, and whether it may register providers under its own credentials. Org Settings gains a Models tab and instance Models gains Org access. The system org is never restricted; another org uses nothing until it is granted.\n- Models are addressed by alias. Aliases replace model roles, one resolver serves every purpose (agent steps, implement, PR review, MCP sampling, chat, embedding, transcription), and an unknown alias fails instead of falling back to a default. The step editor and the chat picker offer aliases, and a workflow naming one that does not exist is refused when saved.\n- Chat sessions belong to one org; a chat resolves its models in the caller's org and is billed to it, and a task run from chat posts its outcome back to that chat.\n- Add a member by provider subject, or by email as a placeholder that the first sign-in the provider vouches for claims.\n- The workflow canvas authors parallel branches as lanes, adds a switch step that runs the case matching a reference, and edits a call's interface. A step shows its role, its number and its run trace.\n- The workflows list shows each workflow's running count and latest run result, the canvas reveals its data-edge handles on hover, and restoring a version asks for confirmation.\n- Store packages can auto-update: a package given the policy is moved to the catalogue's newest digest by a State Store ticker. An update asking for more authority than was accepted waits as a pending update with the running version untouched; approving it accepts the new authority, and a rollback restores the previous version with the authority accepted against it.\n- Model provider keys never enter an agent container: the runtime reaches its providers through the egress proxy, which holds the keys. A task's own credential can no longer replace the workflow definition its run is pinned to, and a package workflow's triggers, tools and forge calls are bounded by the authority accepted for the package.\n- The dashboard warns when it is reachable from off-host over plain HTTP, and the wildcard listen address counts as off-host rather than loopback. Instance health, logs, config and identities, the setup checklist and the skill catalogue are system-org only, and API requests are refused until the access chain has loaded.\n- `/approve` reaches Telegram; the router served it but nothing published it.\n- A worktree a killed container left root-owned is taken back by the daemon, and a PR review's benchmark runner works again on configured models and public PRs.\n- An unserved `/api` path returns 404 instead of the dashboard page, and an input group's select no longer loses clicks to its addon.\n\n### archie-agent\n\n- The runtime reaches model providers through the egress proxy, so provider keys stay out of the container.\n- Agent steps resolve model aliases and their own org's models and credentials, failing on an unknown alias instead of falling back.\n- A switch step runs the case matching its reference.\n- A call waiting on another step is reconciled from durable steps, so it resumes after a daemon restart rather than stranding."
|
||||
},
|
||||
{
|
||||
"version": "1.52.0",
|
||||
"date": "2026-10-09",
|
||||
"body": "### archied\n\n- The harness page's setup terminal opens a real session: it starts an ephemeral container from a Kit profile, runs the CLI's own login and captures the OAuth tokens at the provider's token endpoint. Point the dashboard at the daemon with `[services.harness].target` and a `HARNESS_TOKEN` and it stops answering 503; the terminal is created at your browser's size. Takeover of a live task is not in this release.\n- A credential's token endpoint is refused when the run is not granted that service, instead of proxy-ing the provider's real tokens into the container.\n- Settings → Profiles, Credential bindings and Playbooks are editable from the dashboard, and curator definitions can be changed and applied without a restart.\n- Settings say whether each one applies live or needs a restart, show what is consuming resources, and report whether an apply landed.\n- Status shows each service's dependency checks, the agent workers and the broker.\n- The Logs page reads recent logs from every service, not just the daemon.\n- Captures and webhook sources are scoped to the org that owns them: the list, retention and delivery authorization all act in the right org, and a workflow definition resolves in its own org.\n- Chat settings are attributed to the signed-in user, and Settings → Tokens explains when a personal token cannot be created.\n- A channel enabled after Archie started works immediately; a channel that fails on its own recovers; a failed channel is no longer reported as enabled, and stored channel settings no longer save duplicate or unnormalized values.\n- The task table sorts, the command palette no longer scrolls sideways or loses its highlight, unknown routes render a not-found page, and configuration reload failures are shown instead of passing silently.\n- A scheduled job whose payload names a dangerous command is refused.\n- A disabled model provider is never served from the ambient API key.\n- `generate_video` is backed by ai-sdk's MiniMax video provider.\n- A dashboard token is no longer written to the startup log.\n\n### archie-agent\n\n- `workflow.call`: a call is keyed on its declared step path, its key is freed once the callee reaches a terminal state, and a caller waiting on a callee releases its capacity instead of holding it.\n- `command.run` honours step retry and `on_failure`.\n- A value passed between steps keeps its declared type, and optional result booleans are enforced only when the workflow declares them.\n- Capture tools have their results checked against the declared schema.\n- A single-cycle run waits for its in-flight tasks before exiting, and identity tasks inherit live settings.\n- Kit containers run Docker's init as PID 1, so orphaned processes are reaped instead of accumulating inside a long task."
|
||||
},
|
||||
{
|
||||
"version": "1.51.1",
|
||||
"date": "2026-10-08",
|
||||
"body": "### archied\n\n- Chat with OpenAI's gpt-6 models (gpt-6-luna and the rest) works with tools; a turn failed with \"Function tools with reasoning_effort are not supported\"."
|
||||
},
|
||||
{
|
||||
"version": "1.51.0",
|
||||
"date": "2026-10-08",
|
||||
"body": "### archied\n\n- A secret engine enabled after Archie started (Bitwarden, for example) now supplies its keys straight away; providers that depended on it no longer stay disabled until a restart.\n- The dashboard chat has a microphone button: record a voice message and it is transcribed like a Telegram voice note. It shows only when a `transcription` model role is set under Settings → Models.\n- A file Archie sends in the dashboard chat is a download link for an hour, instead of a note that it can't be delivered.\n- Typing `/model` or `/personality` on its own in the dashboard chat offers the choices as buttons."
|
||||
},
|
||||
{
|
||||
"version": "1.50.1",
|
||||
"date": "2026-10-08",
|
||||
"body": "### archied\n\n- When an update is rolled back, the log names the health check that failed instead of only \"unhealthy\"."
|
||||
},
|
||||
{
|
||||
"version": "1.50.0",
|
||||
"date": "2026-10-08",
|
||||
"body": "### archied\n\n- Tools that need your approval ask for it again, and Archie can ask you a question or offer choices mid-reply. Since the services were split these never reached Telegram or the dashboard: approval-gated tools failed and questions were never asked.\n- The dashboard chat shows approvals as Approve / Always this session / Deny, choices as buttons, and questions with a reply field.\n- `/update` in the dashboard chat lists what's available with Install and Not now.\n- Settings → Status → Versions installs the update it shows; its Install button sent an empty request."
|
||||
},
|
||||
{
|
||||
"version": "1.49.4",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- Settings → Status and Settings → Extensions are split into tabs instead of one long page; the Versions table's status column ends at the card's edge.\n- Tools & MCP has one \"Add MCP server\" button; the transport is chosen in the form, and an unnamed new server is not an unsaved change.\n- Settings → Repositories shows the add field when no repositories are configured, instead of a blank page.\n- The unsaved-changes bar always rests at the bottom of the window."
|
||||
},
|
||||
{
|
||||
"version": "1.49.3",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- Settings → Status → Versions shows the Gateway as \"Update available\" with an Install button when a newer release exists; it read \"Unknown\" with no way to install. The Runtime row stays \"Unknown\" until an agent task has run.\n- The release channel buttons sit at the Updates card's right edge instead of mid-row."
|
||||
},
|
||||
{
|
||||
"version": "1.49.2",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- Carries the 1.49.0 and 1.49.1 changes, whose builds were never published. The update check reads GitHub releases directly and still offers only releases with a verifiable linux-amd64 zip."
|
||||
},
|
||||
{
|
||||
"version": "1.49.1",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- When the dashboard session expires, the page returns to the sign-in screen instead of showing errors on every page until a manual refresh."
|
||||
},
|
||||
{
|
||||
"version": "1.49.0",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- Extensions that declare no egress hosts (vault, email, gitea) reach the network again; only packages that declare their hosts are confined to them. The Accept dialog shows \"network: unrestricted\" for the rest.\n- The update check finds releases itself, and reuses a found release for ten minutes so repeated checks stay under GitHub's rate limit."
|
||||
},
|
||||
{
|
||||
"version": "1.48.1",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- **Settings → Status → Updates** now chooses only the release channel (stable, prereleases, or a pinned version). Update checks and installs always run the `archie-update-*` scripts installed beside the binaries; the dashboard can no longer set the command that runs."
|
||||
},
|
||||
{
|
||||
"version": "1.48.0",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- **Settings → Status → Updates** edits the update check and install commands. They default to the `archie-update-*` scripts installed beside the binaries, so a zip install shows **Install** on the Versions card with nothing configured. The `update_check_command` and `update_install_command` keys under `[chat.telegram]` are no longer read; remove them from `config.toml`.\n- `archie-update-install` run from a shell now reads `~/.config/archie/env`, so the pre-update backup of the bundled database no longer fails with `no password supplied`. Run it with `--auto` to install the newest release."
|
||||
},
|
||||
{
|
||||
"version": "1.47.3",
|
||||
"date": "2026-10-07",
|
||||
"body": "### archied\n\n- **Settings → Extensions**: **Accept** in the authority review now accepts the extension, and **Remove** removes it. Both previously closed the dialog without doing anything."
|
||||
},
|
||||
{
|
||||
"version": "1.47.2",
|
||||
"date": "2026-10-06",
|
||||
"body": "### archied\n\n- **Events → Inspector** now lists your capture sources with their real URLs and a **New source** button, replacing the `/webhooks/capture/<source>` placeholder. Sources no longer sit on the Bindings tab."
|
||||
},
|
||||
{
|
||||
"version": "1.47.1",
|
||||
"date": "2026-10-06",
|
||||
|
||||
@@ -0,0 +1,354 @@
|
||||
# External agent harnesses
|
||||
|
||||
**Status:** Approved
|
||||
**Scope:** the harness model and, in "Session contract", the duplex session
|
||||
that the setup terminal and the run-scoped live view both use. Code cites
|
||||
this file for both (`ui/src/harness/SetupTerminal.vue`,
|
||||
`internal/infrastructure/postgres/queries/harness_secrets.sql`).
|
||||
|
||||
## Decision
|
||||
|
||||
A workflow stage can run on an external coding-agent CLI instead of the
|
||||
built-in agent loop: Claude Code, Codex, Pi, OMP, GitHub Copilot CLI, or any
|
||||
other CLI packaged as a Docker Sandbox Kit v3. Each authenticates with an API
|
||||
key or the operator's subscription login, and can carry the operator's own
|
||||
skills, plugins, subagents and instructions.
|
||||
|
||||
Two boundaries hold regardless of what the harness does:
|
||||
|
||||
- **The real credential never enters the container.** The container sees
|
||||
sentinel values; archie's egress proxy substitutes the real credential on
|
||||
outbound requests and performs OAuth refresh on the host.
|
||||
- **Archie's workflow guarantees are enforced outside the harness.** Git,
|
||||
protected paths, read-only stages, gates and budgets are checked by archie
|
||||
around the process and against the worktree afterwards.
|
||||
|
||||
## Kits
|
||||
|
||||
A harness is packaged as a Kit v3 image: an OCI image whose
|
||||
`vnd.docker.sandbox.kit.descriptor` manifest annotation declares what the
|
||||
harness needs. Archie reads descriptors with the published
|
||||
`github.com/docker/sandbox-kit-spec/v3/spec` package and does not maintain
|
||||
its own descriptor format. Published Kits run unmodified.
|
||||
|
||||
Archie is a partial Kit runtime. It implements these capability types:
|
||||
|
||||
| Type | Archie behaviour |
|
||||
| ------------------- | ----------------------------------------------------------------------------------------- |
|
||||
| `credential@1` | Proxy-managed only, described below. |
|
||||
| `network-policy@1` | Enforced by the egress proxy. |
|
||||
| `volume@1` | A Docker volume keyed by WorkflowExecution, deleted with it. |
|
||||
| `lifecycle@1` | Install and startup hooks run on container create. |
|
||||
| `agent-sessions@1` | The headless `prompt` and `resume` invocations for the stage. |
|
||||
| `agent-skills@1` | The operator's skills store (`skills_dir`), mounted read-only whatever the Kit asks. |
|
||||
| `agent-context@1` | The workload's profile file beside the workspace, indexing each Kit's guidance. |
|
||||
| `resources@1` | Container CPU and memory limits. |
|
||||
|
||||
Every other type fails closed: a required entry refuses the launch, an
|
||||
optional one is skipped and recorded on the step. `credential@1` with
|
||||
`passthrough: true` and any credential for a forge service are refused.
|
||||
|
||||
The operator's own setup (plugins, subagents, instructions, settings) is a
|
||||
mixin Kit, published with the harness Kit as a Kit set: the set merges their
|
||||
layers into one image. It is versioned image content, rewritten on every
|
||||
create, never state a run can modify.
|
||||
|
||||
## Contract
|
||||
|
||||
A harness run is a second implementation of `agentexec.Runner`. It takes the
|
||||
same `Request` and returns the same `Result`, so workflows, the daemon and
|
||||
the State Store do not know which runner ran a stage.
|
||||
|
||||
`agent-sessions@1` supplies the invocation. Archie supplies, per CLI, an
|
||||
output adapter that translates the CLI's JSON output stream into
|
||||
`ToolCallReporter` calls, `Usage` and a session ID. A CLI with no adapter can
|
||||
run stages with no capture tools, reporting no usage; its token budget falls
|
||||
back to wall clock.
|
||||
|
||||
Workflow definition validation rejects, at load time, a stage whose needs the
|
||||
selected harness cannot meet: capture tools without an adapter, or a gate
|
||||
retry without a `resume` verb.
|
||||
|
||||
## Selection
|
||||
|
||||
A harness is an agent profile. `docs/prds/event-automation.md` defines a
|
||||
profile as the execution environment a workflow selects; a harness profile
|
||||
names one Kit pinned by digest, a workload Kit or a published Kit set, in
|
||||
place of a container image. Archie runs that Kit's image and composes no Kits
|
||||
itself; a bare mixin is refused. Everything else about profiles
|
||||
holds: a workflow names its profile, a stage may name a different one, and a
|
||||
profile holds no secrets.
|
||||
|
||||
`archie-agent` builds the stage's runner from the stage's profile: the
|
||||
ai-sdk agent loop for an image profile, the harness runner for a Kit
|
||||
profile. Image profiles, and every workflow already written against them,
|
||||
are unchanged. A Kit profile named by no workflow is a validation error.
|
||||
|
||||
A stage naming a different profile than its workflow's is a separate run,
|
||||
not a mid-container runner switch: a Kit task runs in one container
|
||||
provisioned for one profile (Container layout), so a stage that needs a
|
||||
different one is its own callee, started the way `workflow.call` already
|
||||
starts one (`docs/prds/event-automation.md` "Workflows call workflows"),
|
||||
with its own agent profile resolved off its own task row. This needs no
|
||||
mechanism beyond `workflow.call` plus per-task profile resolution
|
||||
(`daemon.pinTaskProfile`), both of which already treat every task's
|
||||
profile independently of any caller's -- see
|
||||
`TestWorkflowCallerConformance` (staterpc) for the callee's independent
|
||||
`Workflow` field and `TestWorkflowCallGivesACalleeItsOwnProfile` (daemon)
|
||||
for the Kit-vs-image runner selection that independence produces.
|
||||
|
||||
Profiles are org resources in the State Store, so a Kit profile belongs to
|
||||
one org, is granted to its workspaces like any profile, and applies without
|
||||
a restart.
|
||||
|
||||
## Organisations
|
||||
|
||||
`docs/prds/orgs-and-access.md` is the boundary; a harness adds nothing that
|
||||
crosses it.
|
||||
|
||||
- A Kit profile, its credential bindings and its OAuth tokens belong to one
|
||||
org. No record is shared between orgs.
|
||||
- A harness run is a run like any other: it acts as the workflow's identity,
|
||||
under the run credential issued at dispatch.
|
||||
- The egress proxy injects a credential only when the run credential carries
|
||||
the secret the binding names. A Kit that declares a service the identity is
|
||||
not granted gets no credential: a required one refuses the launch, an
|
||||
optional one is skipped.
|
||||
- A Kit's network policy is what the Kit asks for; the identity's network
|
||||
grants are what the org allows. The proxy enforces the intersection.
|
||||
- Concurrency slots are counted per binding within its org.
|
||||
|
||||
## Credentials
|
||||
|
||||
A credential binding maps a Kit's `credential@1` `service` name to an org
|
||||
secret, which the org grants to identities like any secret. The secret holds
|
||||
one of:
|
||||
|
||||
- **API key:** a value in the org's secret store.
|
||||
- **OAuth:** tokens captured by the setup terminal, stored in the State Store
|
||||
under the at-rest envelope of `binding-secret-encryption.md` with its own
|
||||
domain separator.
|
||||
|
||||
The egress proxy resolves the binding for each request against the run
|
||||
credential. The container gets the Kit's sentinel in the named variable or
|
||||
credential file. OAuth refresh happens at the proxy, which intercepts the
|
||||
Kit's `tokenEndpoint`, so a refreshed token is written to the State Store and
|
||||
never returned to the container.
|
||||
|
||||
Runs sharing an OAuth binding share its subscription's rate limit.
|
||||
`max_concurrent` on the binding (default 1) caps its simultaneous runs. A
|
||||
stage waiting for a slot is `pending`, not `running`.
|
||||
|
||||
## Session contract
|
||||
|
||||
A **session** is a duplex PTY into a Kit container the daemon owns. One
|
||||
concept covers both targets; only the address, the lifetime and the
|
||||
established egress phase differ.
|
||||
|
||||
| | Setup session | Run session (deferred) |
|
||||
| --- | --- | --- |
|
||||
| Address | `{org, profile}` | `{org, task, attempt}` |
|
||||
| Container | ephemeral, from the profile's Kit | the task's running container |
|
||||
| Purpose | run the CLI's own login so the proxy captures the tokens | watch and optionally take over |
|
||||
| Lifetime | bounded by the session TTL; the container is removed on close | bounded by the task |
|
||||
|
||||
- **Transport.** The daemon serves `harness.v1.HarnessService`, a bidi gRPC
|
||||
stream, and the dashboard implements its `HarnessTerminal` interface
|
||||
(`internal/webui`) over that client; the browser's WebSocket route is
|
||||
unchanged. The contract lives on the daemon because the daemon owns
|
||||
containers: the dashboard process must not link `internal/container`,
|
||||
`internal/app/archied` or `internal/agentexec`.
|
||||
- **Authorisation.** Opening a session is the `update` action on the secret,
|
||||
decided by the dashboard's authorizer before the route runs
|
||||
(`internal/webui/authorize.go`). The dashboard then dials the daemon with
|
||||
the harness service token. The daemon does not re-authorise a human; it
|
||||
trusts the asserted `{org, profile}` exactly as the task-action RPC trusts
|
||||
an asserted actor. Because that authority is a shell in a container holding
|
||||
an org's credential, the harness listener requires `HARNESS_TOKEN` even on
|
||||
loopback, unlike the State Store's loopback convention.
|
||||
- **Egress phase.** Token interception is filtered by phase
|
||||
(`oauth.go`'s `rule.runtime == atRun`), and `EnterRuntime` is one-way. A
|
||||
setup session therefore follows a run's lifecycle exactly: install hooks at
|
||||
the install phase, `EnterRuntime` before the shell. A credential whose
|
||||
token endpoint must be captured declares `phase: runtime`; a credential
|
||||
capturing at install phase is captured by the install hooks that run before
|
||||
the switch.
|
||||
- **Credentials.** Capture is gated: the proxy intercepts a token endpoint
|
||||
only for a service the session is granted (`Proxy.granted`). A setup session
|
||||
has no task, so the daemon registers a session grant: its proxy token
|
||||
resolves to `{org, the Kit's declared credential services the org binds}`.
|
||||
That is the intersection the `update`-on-secret authorisation covers. The
|
||||
real token never enters the container: the response is sentinelized and
|
||||
stored as the org's harness secret.
|
||||
- **Container discipline.** The setup container runs a keepalive entrypoint
|
||||
with an empty `Config.Env`; the PTY is an exec as the Kit's harness user
|
||||
with the harness env and nothing inherited from any worker. No worktree is
|
||||
mounted. It is acquired through the container pool, so it carries the
|
||||
`archie-daemon` label, the concurrency cap and the max-uptime reaper; the
|
||||
session TTL is the smaller bound. Closing revokes the egress session,
|
||||
removes the sandbox network and the Kit volumes, then releases the
|
||||
container.
|
||||
- **Kit unavailable.** The daemon serves the contract only when it has a
|
||||
container pool and a Kit launcher; otherwise there is no listener, and a
|
||||
client's refused connection is gRPC's `Unavailable`. The dashboard's
|
||||
existing failure surface is the honest degrade; `/api/harness`'s `terminal`
|
||||
field means "a client is configured", not "the daemon can run a Kit".
|
||||
- **Run target.** Deferred (`archie-core-qi91`). `Open` answers `Unimplemented`
|
||||
for it in the setup slice. A finished or absent attempt will be `NotFound`,
|
||||
not `Unavailable`.
|
||||
- **Audit.** Opening and closing a session and a successful capture are
|
||||
recorded with the asserted org and profile.
|
||||
|
||||
Each session is the only interactive path into a harness container.
|
||||
|
||||
## Egress
|
||||
|
||||
Only Kit profiles run on the egress path. An image profile keeps the network
|
||||
access its identity is granted, because workflows such as a network
|
||||
investigator need raw DNS, ICMP and arbitrary TCP that no HTTP proxy
|
||||
carries.
|
||||
|
||||
- **Sandbox network.** Each Kit run gets its own internal Docker bridge on
|
||||
which the host holds no address. Host services, including those listening
|
||||
on every interface, are unreachable from it by any address.
|
||||
- **Relay.** One relay container, `archie-agent relay`, sits on the sandbox
|
||||
networks under a fixed alias and on the host-reachable network. It
|
||||
forwards three fixed ports, to the proxy, NATS and the State Store, and can
|
||||
reach nothing else. It holds no secrets.
|
||||
- **Proxy.** The proxy runs inside `archied`, listening on the host gateway
|
||||
of the host-reachable network. It terminates TLS with a per-daemon CA
|
||||
installed into the container at create, identifies the container by a
|
||||
per-run proxy token, and applies that run's network policy and credential
|
||||
inject rules. Upstream dials refuse loopback, and refuse internal addresses
|
||||
unless the policy names the exact IP, so an allowed name cannot resolve
|
||||
back into the host.
|
||||
|
||||
## Container layout
|
||||
|
||||
A Kit task runs in one container, from the Kit composition's image, on the
|
||||
task's sandbox network. The worker and every harness invocation share it;
|
||||
they are separated by user, not by container, so a run's cost scales with
|
||||
the run and not with how many agents it fans out to.
|
||||
|
||||
- **Worker.** Archie mounts its own `archie-agent` binary read-only and runs
|
||||
it as the container's entrypoint, as root. It holds the task's NATS and
|
||||
State Store credentials in its own environment and in root-only files,
|
||||
runs the workflow, and serves `archie-agent mcp`. The Kit image's
|
||||
entrypoint is not PID 1.
|
||||
- **Harness.** Every invocation runs as the Kit's user (the image's `User`,
|
||||
default uid 1000) with an explicit environment: the Kit's variables, the
|
||||
proxy environment and the credential sentinels, and nothing inherited from
|
||||
the worker. That user cannot read the worker's environment or files, or
|
||||
trace it. Sibling invocations in one run share the user and the worktree.
|
||||
- **Hooks.** `lifecycle@1` install and startup hooks run as the user each
|
||||
declares, before the worker accepts work.
|
||||
- **Mounts.** The task worktree at the Kit's workspace directory, owned by the
|
||||
Kit's user, and the read-only skills store. Nothing else from the host.
|
||||
- **Network.** The relay forwards three fixed ports on the sandbox network:
|
||||
the egress proxy, NATS and the State Store. The worker reaches NATS and the
|
||||
State Store with its credentials; a harness can open those ports but holds
|
||||
no credential either accepts.
|
||||
- **Volumes.** `volume@1` paths persist for the life of the
|
||||
WorkflowExecution, which covers session resume across gate iterations and
|
||||
retries. They are not shared between executions.
|
||||
|
||||
## Archie tools inside the harness
|
||||
|
||||
Capture tools, which are how a stage returns structured results, are served
|
||||
by `archie-agent mcp`, a stdio MCP server registered through the Kit's MCP
|
||||
configuration or the adapter's flags. It serves the stage's `CaptureTools`
|
||||
and the central tools the agent profile's `AllowTools` permits, never the
|
||||
`workspace` toolset. The runner's `ToolLimits` bound its results; the
|
||||
harness's own built-in tools are outside archie's limits.
|
||||
|
||||
## Enforcement around the harness
|
||||
|
||||
| Property | Enforcement |
|
||||
| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Model never runs git | No forge credential can be bound. Archie records `HEAD` and every ref before the run; any change fails the step (`failed`, policy class). The workflow commits the stage's changes. |
|
||||
| Protected paths | A diff touching a `Protection` path fails the step. |
|
||||
| Read-only stage | Any worktree diff fails the step. |
|
||||
| Gate | Archie runs the stage's gate after the harness exits. On failure it resumes the session with the gate output, up to the stage's iteration budget. |
|
||||
| Budget | Archie kills the process on wall-clock timeout, or when streamed usage passes the token budget. |
|
||||
| Cancellation | Cancelling the step kills the process group, then the container. |
|
||||
| Egress | Only the proxy is reachable; the Kit's network policy decides the rest. |
|
||||
|
||||
Harness settings that deny git or protected paths are added where the CLI
|
||||
supports them, to save wasted turns. They are never the enforcement.
|
||||
|
||||
## Execution tree
|
||||
|
||||
A harness run is one `agent` StepExecution. Subagents the harness spawns
|
||||
internally are not recorded as children. Their usage is included in the
|
||||
step's `tokens_used` when the adapter reports it.
|
||||
|
||||
## Agents never hold a harness
|
||||
|
||||
An Agent reaches a harness only by invoking a Workflow whose stage names it.
|
||||
No Agent tool, chat tool or capability exposes a harness, its setup terminal
|
||||
or its credential. The stage boundary is what carries the container, the git
|
||||
and path checks, the gate and the budget; a harness outside a stage has none
|
||||
of them.
|
||||
|
||||
## Out of scope
|
||||
|
||||
- Chat through a harness. The gateway chat loop stays on the built-in
|
||||
runtime.
|
||||
- `network-policy@2` HTTP method and path rules; a Kit requiring it is
|
||||
refused.
|
||||
- Recording the harness's internal subagents as StepExecutions.
|
||||
- Cost in currency.
|
||||
- Choosing a harness automatically per task.
|
||||
|
||||
## Plan
|
||||
|
||||
1. Descriptor resolution with the Kit spec package; capability support
|
||||
table and fail-closed refusal.
|
||||
2. Egress proxy: internal network, per-daemon CA, per-container token,
|
||||
`network-policy@1`.
|
||||
3. `credential@1`: API-key bindings, sentinel rendering, inject rules.
|
||||
4. Harness `Runner`: container create with worktree, volumes, lifecycle
|
||||
hooks and the mounted `archie-agent`; `agent-sessions@1` invocation;
|
||||
worktree checks for git, protected paths and read-only; budget and
|
||||
cancellation.
|
||||
5. Claude Code output adapter; `archie-agent mcp`; gate-and-resume loop.
|
||||
6. Kit profiles, runner selection from the stage's profile, and definition
|
||||
validation.
|
||||
7. OAuth bindings as org secrets: token-endpoint interception, encrypted
|
||||
storage, per-binding concurrency; dashboard setup terminal.
|
||||
8. Output adapters for Codex, Pi, OMP and GitHub Copilot CLI.
|
||||
|
||||
## Verification
|
||||
|
||||
- The same workflow definition completes on `builtin` and on the Claude Code
|
||||
Kit with the same `Result` shape and captures.
|
||||
- After `/login` in the setup terminal, the container's credential file holds
|
||||
only sentinels, the State Store holds the encrypted token, and a task run
|
||||
authenticates.
|
||||
- A real API key or OAuth token never appears in the container environment,
|
||||
filesystem, worktree, task log or event stream.
|
||||
- A request to a host outside the Kit's runtime allow list fails, including a
|
||||
direct connection that bypasses the proxy settings.
|
||||
- A harness instructed to `git commit` fails its step, and the task branch is
|
||||
unchanged.
|
||||
- A harness edit to a protected test file fails the step in a TDD fix stage.
|
||||
- A read-only feasibility stage that writes a file fails.
|
||||
- A file a run writes into a Kit-managed path such as the CLI's settings file
|
||||
is gone on the next execution.
|
||||
- A Kit requiring an unsupported capability is refused at launch with the
|
||||
capability named.
|
||||
- A stage with a failing gate resumes the same session with the gate output,
|
||||
then succeeds or exhausts its iterations.
|
||||
- Two tasks sharing an OAuth binding with `max_concurrent = 1` run one at a
|
||||
time; the second waits as `pending`.
|
||||
- Stopping a run kills the harness process and removes the container.
|
||||
- A harness invocation cannot read the worker's NATS or State Store
|
||||
credential from its environment, its files or `/proc`.
|
||||
- A run fanning out to many agent invocations uses one container.
|
||||
- A Kit profile in org A cannot be selected, and its binding cannot be
|
||||
resolved, by a workflow in org B.
|
||||
- A harness run whose identity is not granted a Kit's required credential is
|
||||
refused at launch; the proxy never injects a secret outside the run
|
||||
credential.
|
||||
- The firewall investigation example runs unchanged on an image profile with
|
||||
direct network access.
|
||||
@@ -1,13 +1,13 @@
|
||||
module github.com/samcharles93/archie-core
|
||||
|
||||
go 1.27.0
|
||||
go 1.27.2
|
||||
|
||||
require (
|
||||
cel.dev/expr v0.25.3 // indirect
|
||||
dario.cat/mergo v1.0.2 // indirect
|
||||
github.com/Azure/go-ansiterm v0.0.0-20260917205352-e937bb47801a // indirect
|
||||
github.com/Microsoft/go-winio v0.6.2 // indirect
|
||||
github.com/ProtonMail/go-crypto v1.5.1 // indirect
|
||||
github.com/Azure/go-ansiterm v0.0.0-20261008225312-e8a9660d7aea // indirect
|
||||
github.com/Microsoft/go-winio v0.6.3 // indirect
|
||||
github.com/ProtonMail/go-crypto v1.5.2 // indirect
|
||||
github.com/antithesishq/antithesis-sdk-go v0.8.0 // indirect
|
||||
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
|
||||
@@ -19,7 +19,7 @@ require (
|
||||
github.com/containerd/platforms v1.0.0-rc.5 // indirect
|
||||
github.com/cpuguy83/dockercfg v0.3.2 // indirect
|
||||
github.com/distribution/reference v0.6.0 // indirect
|
||||
github.com/docker/go-connections v0.8.1 // indirect
|
||||
github.com/docker/go-connections v0.8.2 // indirect
|
||||
github.com/docker/go-units v0.5.0 // indirect
|
||||
github.com/dustin/go-humanize v1.1.0 // indirect
|
||||
github.com/ebitengine/purego v0.11.1 // indirect
|
||||
@@ -34,17 +34,15 @@ require (
|
||||
github.com/go-ole/go-ole v1.3.0 // indirect
|
||||
github.com/golang/protobuf v1.5.4 // indirect
|
||||
github.com/google/go-tpm v0.9.8 // indirect
|
||||
github.com/google/jsonschema-go v0.4.3 // indirect
|
||||
github.com/hashicorp/yamux v0.1.2 // indirect
|
||||
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
|
||||
github.com/jackc/puddle/v2 v2.2.2 // indirect
|
||||
github.com/jackc/puddle/v2 v2.2.3 // indirect
|
||||
github.com/kevinburke/ssh_config v1.6.0 // indirect
|
||||
github.com/klauspost/compress v1.20.0 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.4.0 // indirect
|
||||
github.com/klauspost/compress v1.20.1 // indirect
|
||||
github.com/lufia/plan9stats v0.0.0-20260802145828-341c2f0c90b5 // indirect
|
||||
github.com/magiconair/properties v1.18.12 // indirect
|
||||
github.com/mattn/go-colorable v0.1.14 // indirect
|
||||
github.com/mattn/go-colorable v0.1.16 // indirect
|
||||
github.com/mattn/go-isatty v0.0.24 // indirect
|
||||
github.com/mfridman/interpolate v0.0.2 // indirect
|
||||
github.com/minio/highwayhash v1.0.4 // indirect
|
||||
@@ -58,15 +56,15 @@ require (
|
||||
github.com/nats-io/jwt/v2 v2.8.2 // indirect
|
||||
github.com/nats-io/nkeys v0.4.16 // indirect
|
||||
github.com/nats-io/nuid v1.0.1 // indirect
|
||||
github.com/oklog/run v1.1.0 // indirect
|
||||
github.com/pjbgf/sha1cd v0.6.0 // indirect
|
||||
github.com/oklog/run v1.2.0 // indirect
|
||||
github.com/pjbgf/sha1cd v0.7.0 // indirect
|
||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
|
||||
github.com/power-devops/perfstat v0.0.0-20260916203055-22a1a467d9f0 // indirect
|
||||
github.com/segmentio/asm v1.2.1 // indirect
|
||||
github.com/segmentio/encoding v0.5.4 // indirect
|
||||
github.com/sergi/go-diff v1.4.0 // indirect
|
||||
github.com/sethvargo/go-retry v0.4.0 // indirect
|
||||
github.com/shirou/gopsutil/v4 v4.26.8 // indirect
|
||||
github.com/sethvargo/go-retry v0.5.0 // indirect
|
||||
github.com/shirou/gopsutil/v4 v4.26.9 // indirect
|
||||
github.com/sirupsen/logrus v1.10.2 // indirect
|
||||
github.com/stretchr/testify v1.12.1 // indirect
|
||||
github.com/tklauser/go-sysconf v0.4.0 // indirect
|
||||
@@ -74,19 +72,20 @@ require (
|
||||
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
|
||||
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
||||
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 // indirect
|
||||
go.opentelemetry.io/otel v1.46.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.46.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.46.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.72.0 // indirect
|
||||
go.opentelemetry.io/otel v1.47.0 // indirect
|
||||
go.opentelemetry.io/otel/log v1.47.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.47.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.47.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
go.yaml.in/yaml/v3 v3.0.5 // indirect
|
||||
golang.org/x/crypto v0.57.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba // indirect
|
||||
golang.org/x/exp v0.0.0-20261007192929-f45ad48fbe92 // indirect
|
||||
golang.org/x/sync v0.23.0 // indirect
|
||||
golang.org/x/text v0.42.0 // indirect
|
||||
golang.org/x/time v0.16.0 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20261005182115-fad411399dd8 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20261005182115-fad411399dd8 // indirect
|
||||
modernc.org/libc v1.77.1 // indirect
|
||||
modernc.org/sqlite v1.59.0 // indirect
|
||||
)
|
||||
@@ -96,34 +95,35 @@ require (
|
||||
github.com/BurntSushi/toml v1.6.0
|
||||
github.com/cedar-policy/cedar-go v1.8.0
|
||||
github.com/coreos/go-oidc/v3 v3.21.0
|
||||
github.com/docker/sandbox-kit-spec/v3 v3.0.0-m.6
|
||||
github.com/go-git/go-billy/v6 v6.0.0-alpha.2
|
||||
github.com/go-git/go-git/v6 v6.0.0-alpha.5
|
||||
github.com/docker/sandbox-kit-spec/v3 v3.0.0-m.8
|
||||
github.com/go-git/go-billy/v6 v6.0.0-beta.1
|
||||
github.com/go-git/go-git/v6 v6.0.0-beta.1
|
||||
github.com/go-telegram/bot v1.27.0
|
||||
github.com/google/jsonschema-go v0.4.3
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/hashicorp/go-hclog v1.6.3
|
||||
github.com/hashicorp/go-plugin v1.8.0
|
||||
github.com/jackc/pgx/v5 v5.11.0
|
||||
github.com/moby/moby/api v1.56.0
|
||||
github.com/moby/moby/client v0.6.0
|
||||
github.com/moby/moby/api v1.56.1
|
||||
github.com/moby/moby/client v0.6.2
|
||||
github.com/modelcontextprotocol/go-sdk v1.8.0
|
||||
github.com/nats-io/nats-server/v2 v2.15.0
|
||||
github.com/nats-io/nats.go v1.54.0
|
||||
github.com/opencontainers/go-digest v1.0.0
|
||||
github.com/opencontainers/image-spec v1.1.1
|
||||
github.com/pressly/goose/v3 v3.28.0
|
||||
github.com/samcharles93/ai-sdk v0.1.42
|
||||
github.com/samcharles93/ai-sdk v0.1.43
|
||||
github.com/testcontainers/testcontainers-go v0.44.0
|
||||
github.com/testcontainers/testcontainers-go/modules/postgres v0.44.0
|
||||
go.lsp.dev/jsonrpc2 v1.0.1
|
||||
go.lsp.dev/protocol v1.0.1
|
||||
go.lsp.dev/uri v1.0.1
|
||||
golang.org/x/mod v0.41.0
|
||||
golang.org/x/net v0.59.0
|
||||
golang.org/x/net v0.60.0
|
||||
golang.org/x/oauth2 v0.37.0
|
||||
golang.org/x/sys v0.48.0
|
||||
golang.org/x/term v0.46.0
|
||||
google.golang.org/grpc v1.85.0-dev.0.20260825072537-93e31b48545e
|
||||
google.golang.org/grpc v1.86.0-dev
|
||||
google.golang.org/protobuf v1.36.12
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
oras.land/oras-go/v2 v2.6.2
|
||||
|
||||
@@ -6,14 +6,14 @@ dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
|
||||
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
|
||||
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
|
||||
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20260917205352-e937bb47801a h1:4hxax9ktNjSDoFn1tZSeL6gXMTRMpO0FzjdKfT01jgY=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20260917205352-e937bb47801a/go.mod h1:3EWSSOZ50kb+arhww0qIaEXHToib/3FjBj9Jj5lcP5g=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20261008225312-e8a9660d7aea h1:NdVLskj4PaItpD133shAdyHicndDbcDGpManoqR032g=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20261008225312-e8a9660d7aea/go.mod h1:Ue4ymb+lBljb9NjkybMTsOYOSjH/cJTim9nrhvRJAUU=
|
||||
github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
|
||||
github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
|
||||
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
|
||||
github.com/ProtonMail/go-crypto v1.5.1 h1:pTrLDQHyOT8y3DFYIpijgPBTw/7E2GLMimutvOlceuE=
|
||||
github.com/ProtonMail/go-crypto v1.5.1/go.mod h1:/RaSu30DaKO4RY+XdV/ACcCcZkGr7AhUIduq5sjzzCo=
|
||||
github.com/Microsoft/go-winio v0.6.3 h1:M/52tsoyTfwaxajLnXZm7PqkbMGRH8iSWP+8fcg9MQ4=
|
||||
github.com/Microsoft/go-winio v0.6.3/go.mod h1:ma0QpxizD4fyyzJ1C7MIblymTD2Nxz5Mho/3CepwIZg=
|
||||
github.com/ProtonMail/go-crypto v1.5.2 h1:cucYnvqcY7UOXVD//mSyjeaPY0SSN3v5cDkYPxumINk=
|
||||
github.com/ProtonMail/go-crypto v1.5.2/go.mod h1:/RaSu30DaKO4RY+XdV/ACcCcZkGr7AhUIduq5sjzzCo=
|
||||
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
|
||||
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
|
||||
github.com/antithesishq/antithesis-sdk-go v0.8.0 h1:bVV5ZAuwaREn4klRSJusYaA+A7NXq8Qi9C/knCaQ2N4=
|
||||
@@ -50,12 +50,12 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
|
||||
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
|
||||
github.com/docker/go-connections v0.8.1 h1:JibmG5hULs5qXSr/cp/w3Pw5fZuStt4MOHMUExb29/M=
|
||||
github.com/docker/go-connections v0.8.1/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q=
|
||||
github.com/docker/go-connections v0.8.2 h1:9d9DEokx5W7qlr0shkFXIxEA7+TTD+llwzcykSlxMNc=
|
||||
github.com/docker/go-connections v0.8.2/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q=
|
||||
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
|
||||
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
|
||||
github.com/docker/sandbox-kit-spec/v3 v3.0.0-m.6 h1:co7vn6GgImYEGO/KPlhPRJT9i5EPWgOKcB9q7bNJlFQ=
|
||||
github.com/docker/sandbox-kit-spec/v3 v3.0.0-m.6/go.mod h1:MrWO4PN3/VYC5xF8eyI8U82Nv/agTHcN4IUzheqA90c=
|
||||
github.com/docker/sandbox-kit-spec/v3 v3.0.0-m.8 h1:ay2XEj0yW3uzsNwN3KXS/c4nlneHONFKaHlrVhu2WCQ=
|
||||
github.com/docker/sandbox-kit-spec/v3 v3.0.0-m.8/go.mod h1:4G6VgFAp9eaQkwy7DbZbOfWRD/Mjvc/TnEtQBRRMEsA=
|
||||
github.com/dustin/go-humanize v1.1.0 h1:dbKTrvD0klcbBV/h4AWJdMuZogJACoMlvWIWZ5b2xWg=
|
||||
github.com/dustin/go-humanize v1.1.0/go.mod h1:hc1CvRkJMsgxqjmjMQF3QNRAZBwY8AXBAzKYoSX9sFI=
|
||||
github.com/ebitengine/purego v0.11.1 h1:2zpWRSQNVKN4eKsKO9eM1ILDgWfYMY9GwqRmK6XeQ/0=
|
||||
@@ -71,12 +71,12 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
|
||||
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
|
||||
github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo=
|
||||
github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs=
|
||||
github.com/go-git/go-billy/v6 v6.0.0-alpha.2 h1:1Sv5WemXL8CxKrAx1gioJ+uHNb2bZJhiQLfwSZ4Et8c=
|
||||
github.com/go-git/go-billy/v6 v6.0.0-alpha.2/go.mod h1:r/bsv9i/iDyyEU8/Z6mjC+YraOVwie1ddfUqBCElKXQ=
|
||||
github.com/go-git/go-billy/v6 v6.0.0-beta.1 h1:OJ4r207zcEbeq/DJNajQUOMd+pph3r9A7hRq1Sjl1bA=
|
||||
github.com/go-git/go-billy/v6 v6.0.0-beta.1/go.mod h1:QGOWN4CzmtRfpFeCw5paG3RJyKdTwsfGASkxBVkIaAU=
|
||||
github.com/go-git/go-git-fixtures/v6 v6.0.0-alpha.1 h1:gmqi2jvsreu0s8JMLylYDFq4sbjHwwlhktMw0DUg3mA=
|
||||
github.com/go-git/go-git-fixtures/v6 v6.0.0-alpha.1/go.mod h1:ECf1MqJlBdYpKggBrOXjo/0EnvRZx6D++I86UYjPgAQ=
|
||||
github.com/go-git/go-git/v6 v6.0.0-alpha.5 h1:sE+OlkHgYWNMVmN1s9sR7uyFgsWLtxcNWse/vBYKxRE=
|
||||
github.com/go-git/go-git/v6 v6.0.0-alpha.5/go.mod h1:3IjhiZnM+uBmUrOGSeqrJpsmi4Vd0H2NZO/uK2a7d0s=
|
||||
github.com/go-git/go-git/v6 v6.0.0-beta.1 h1:1t+vJYGDBN6f9GRWskgWx5UjXPFUa7wfffZZZ2C5GtA=
|
||||
github.com/go-git/go-git/v6 v6.0.0-beta.1/go.mod h1:ugDlr38Wwc+fOw85J+Oluh5TNXQtJgYMcriOljg3l4s=
|
||||
github.com/go-jose/go-jose/v4 v4.1.5 h1:RjgjO2LOtWOJKUC5wpwY9LR3B3vwVAz6JS2YHfYU6eA=
|
||||
github.com/go-jose/go-jose/v4 v4.1.5/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
|
||||
github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3 h1:UADEEmDKgfXbtnGJZ97beY5XLo9ZechG1nlU4KnRrkE=
|
||||
@@ -115,16 +115,14 @@ github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7Ulw
|
||||
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
|
||||
github.com/jackc/pgx/v5 v5.11.0 h1:IzBBtyK9AHqf98cctWFifYSci2hgQR/cd56wB4p+ogg=
|
||||
github.com/jackc/pgx/v5 v5.11.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
|
||||
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
|
||||
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
|
||||
github.com/jackc/puddle/v2 v2.2.3 h1:f8HoREISb3l5eO9coPgK7U3hKLhWGokOFVcThl5jrao=
|
||||
github.com/jackc/puddle/v2 v2.2.3/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
|
||||
github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
|
||||
github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
|
||||
github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY=
|
||||
github.com/kevinburke/ssh_config v1.6.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
|
||||
github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA=
|
||||
github.com/klauspost/compress v1.20.0/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI=
|
||||
github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw=
|
||||
github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU=
|
||||
github.com/klauspost/compress v1.20.1 h1:T7kKElXUMXrUJ2E9QhQhxFtcK5rPyLdsGZvdbLMPdiQ=
|
||||
github.com/klauspost/compress v1.20.1/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
@@ -140,8 +138,8 @@ github.com/magiconair/properties v1.18.12 h1:sT9zQpvTB3B4gzrX0tmZNTEaGyg8Zw55MFY
|
||||
github.com/magiconair/properties v1.18.12/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
|
||||
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
||||
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
||||
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
||||
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
||||
github.com/mattn/go-colorable v0.1.16 h1:+2YjeAe7xP1OQbZW1jERPWWCDLlNqFNCvjiqGiAt84A=
|
||||
github.com/mattn/go-colorable v0.1.16/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
|
||||
github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI=
|
||||
@@ -156,10 +154,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
|
||||
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
|
||||
github.com/moby/go-archive v0.3.3 h1:OxxR9paxsluYi+zDUEXTTaIxtkK3viymW+Ka7vRhhME=
|
||||
github.com/moby/go-archive v0.3.3/go.mod h1:Npdv43fFqlhZW7Xo8fbm3ZMYFvAGNviUPqX21VERbcE=
|
||||
github.com/moby/moby/api v1.56.0 h1:GQzua3NA599ASSIICx0iFgiJeO9YkdDARvQsm23ZZuQ=
|
||||
github.com/moby/moby/api v1.56.0/go.mod h1:sZ+THbVWkjOmBPPfbnzdD/G1LuIexWhqlSHHPTDQ1Uk=
|
||||
github.com/moby/moby/client v0.6.0 h1:AJjEB21QPbXSXjDsZorFBoDZPhMrfbpaPLgSMAW9Bgs=
|
||||
github.com/moby/moby/client v0.6.0/go.mod h1:OCo00wNRyA3m4lmJ228W3JbyCN4ZNNYjpOXiJydBdcQ=
|
||||
github.com/moby/moby/api v1.56.1 h1:PpWkvVPB7Fr/No8w+TfyJ/I6rWZ2YPZhT3JorIg+06c=
|
||||
github.com/moby/moby/api v1.56.1/go.mod h1:sZ+THbVWkjOmBPPfbnzdD/G1LuIexWhqlSHHPTDQ1Uk=
|
||||
github.com/moby/moby/client v0.6.2 h1:ekSPlMccrZGcw6Scb8T9D39qE0mB+XupU/yS0zNw9N4=
|
||||
github.com/moby/moby/client v0.6.2/go.mod h1:DGcnO7qmPJrqobx/ggQgQ/AUk+2wgVdQv7uxB0/mEsc=
|
||||
github.com/moby/patternmatcher v0.6.1 h1:qlhtafmr6kgMIJjKJMDmMWq7WLkKIo23hsrpR3x084U=
|
||||
github.com/moby/patternmatcher v0.6.1/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
|
||||
github.com/moby/sys/mount v0.3.5 h1:eS3fsZTjHaBihwjp4/+5Z3jxqLXYsbwxqpVSfFv3M00=
|
||||
@@ -188,14 +186,14 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
|
||||
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
|
||||
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
||||
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
||||
github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
|
||||
github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
|
||||
github.com/oklog/run v1.2.0 h1:O8x3yXwah4A73hJdlrwo/2X6J62gE5qTMusH0dvz60E=
|
||||
github.com/oklog/run v1.2.0/go.mod h1:mgDbKRSwPhJfesJ4PntqFUbKQRZ50NgmZTSPlFA0YFk=
|
||||
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
||||
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
|
||||
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
|
||||
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
|
||||
github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
|
||||
github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
|
||||
github.com/pjbgf/sha1cd v0.7.0 h1:ZRNPKHj+gfkLBf0KJv/p1Hmz+7bqCT5o311YX0nq+DA=
|
||||
github.com/pjbgf/sha1cd v0.7.0/go.mod h1:pKR5Li+qTCo+ebqITZfwPlJGoCFCvSO00qxjbNtTUFQ=
|
||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
|
||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
@@ -207,18 +205,18 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
||||
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
||||
github.com/samcharles93/ai-sdk v0.1.42 h1:YV4O6oV0OLIqDAnEWAotPyw19K1VH2YoAT0He7aW+Lg=
|
||||
github.com/samcharles93/ai-sdk v0.1.42/go.mod h1:u4zrQ9/Q58L5mNEut4bNQ1ks+RCKq71LN5EDz2N/0Zk=
|
||||
github.com/samcharles93/ai-sdk v0.1.43 h1:u/OER6FuRv/KkS/5xnRttABPD2UNHR2BmcJeRe07hyw=
|
||||
github.com/samcharles93/ai-sdk v0.1.43/go.mod h1:u4zrQ9/Q58L5mNEut4bNQ1ks+RCKq71LN5EDz2N/0Zk=
|
||||
github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
|
||||
github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
|
||||
github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0=
|
||||
github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0=
|
||||
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
|
||||
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
|
||||
github.com/sethvargo/go-retry v0.4.0 h1:9qy1OoIAxBL+gBYnkTnTnWle5wlfsXQlwRzIbbpdqPw=
|
||||
github.com/sethvargo/go-retry v0.4.0/go.mod h1:tvsjdKG6xfiCx4LSiUZ06kcv38xvdVQwv8R6/VnnVWg=
|
||||
github.com/shirou/gopsutil/v4 v4.26.8 h1:YQMTF/1J50B5+Y0vlo1eDRf5DoR7Gk69hY+8wjYkQeo=
|
||||
github.com/shirou/gopsutil/v4 v4.26.8/go.mod h1:5O9FjBiXoTDFatIWjZZosqj4pV0DRtLx598xGbBehzM=
|
||||
github.com/sethvargo/go-retry v0.5.0 h1:JYfFKmVJ8ER06GReN1efzc5cm52BrVsFVzmcHiKJwfY=
|
||||
github.com/sethvargo/go-retry v0.5.0/go.mod h1:tvsjdKG6xfiCx4LSiUZ06kcv38xvdVQwv8R6/VnnVWg=
|
||||
github.com/shirou/gopsutil/v4 v4.26.9 h1:CaBo/hBFqvlJoLvAQEKdHdf5GD97/MN2ACfyv63+2Ig=
|
||||
github.com/shirou/gopsutil/v4 v4.26.9/go.mod h1:nKH+8wX2zxr/mDbsR+AAy6Qd2z4ZOQ7wfQaEp+yrYmg=
|
||||
github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo=
|
||||
github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
@@ -250,30 +248,32 @@ go.lsp.dev/uri v1.0.1 h1:ywxJN1UXoQ+v0I9lkoQNMmsm7lub5G9ZG7KXT8YTx30=
|
||||
go.lsp.dev/uri v1.0.1/go.mod h1:06a0ghafs4PuqkLsJGUmlgPHw6+kH79edRXjOT/rA8s=
|
||||
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
|
||||
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 h1:3g7B90UzBltIDKq1/5mrTGxTnOFDV0ICOhLoxiZ8jlg=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0/go.mod h1:Ef8SuTh59BT7+ofpDxN9z+yOlc4t2GjLmKDgYNJL/NU=
|
||||
go.opentelemetry.io/otel v1.46.0 h1:FHt5/CDyVxi/8IM1CH7VE/rRgq3kLHa2mSTVMO8AWyc=
|
||||
go.opentelemetry.io/otel v1.46.0/go.mod h1:Gj3SEScelsNC45tp4nSxRYlS+f5iez7W8XPMCt905kE=
|
||||
go.opentelemetry.io/otel/metric v1.46.0 h1:yBnkXvgV7AXFILZc5K6IZe/CBFF3OS7BJ8ov6/lj0K8=
|
||||
go.opentelemetry.io/otel/metric v1.46.0/go.mod h1:iPmdWqifKUdzziPkvvzIJXITl56fQx2mGM/DHLB3/2o=
|
||||
go.opentelemetry.io/otel/sdk v1.46.0 h1:h5CNQQjEbuQXY/JfZtgt3i7HVFV3aHPO2OAwO2eTYPI=
|
||||
go.opentelemetry.io/otel/sdk v1.46.0/go.mod h1:GAERFXFt5SYCEB+YiKUbMBeza6UaDH7GmGOZEfh2gSM=
|
||||
go.opentelemetry.io/otel/sdk/metric v1.46.0 h1:0piZ26EG4RBfebb2jhDH6ERCYHoVWduc3kLgPCwSnSE=
|
||||
go.opentelemetry.io/otel/sdk/metric v1.46.0/go.mod h1:I1PbKrdVc8Qu8HYVDNtqVIwLwjNrhsV/uFuxfwg8mO4=
|
||||
go.opentelemetry.io/otel/trace v1.46.0 h1:OULy7ccdJnZtJ0UDYFOIGaCmiWzJ8Vi2G/Rsu60qs1c=
|
||||
go.opentelemetry.io/otel/trace v1.46.0/go.mod h1:J7GAXweO77XSFkB/rmAqk9D6ihszhFjLU+d9WuUxDLI=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.72.0 h1:LxwW/9ctSCv+QkE/cLR7M91ZIkXNMqJtEMi1vCw9U8s=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.72.0/go.mod h1:tOsftB4SslBwwErVEPaenU2RpThXWPIU8DoJHEC4dyw=
|
||||
go.opentelemetry.io/otel v1.47.0 h1:j7ALJ/zgkS7Z6aeJW09p8VC9804bC+PpeTfCD4XPnOM=
|
||||
go.opentelemetry.io/otel v1.47.0/go.mod h1:8wS9O2qfXrYrzp6hIF/HOYJJf/wIhFPhR2xLuP+iXQU=
|
||||
go.opentelemetry.io/otel/log v1.47.0 h1:cOTS1CcLbSQeZKanGJ+0JpF/+t4PELi3O3bbl2lqCcI=
|
||||
go.opentelemetry.io/otel/log v1.47.0/go.mod h1:9byitSQ5pLC6PpqwGXjqdMKya6ZTswHRZh2vvXT33nw=
|
||||
go.opentelemetry.io/otel/metric v1.47.0 h1:4PptaldXx3Eat1XjMZ68pPJEs5wrhlemctZE9a3UdWY=
|
||||
go.opentelemetry.io/otel/metric v1.47.0/go.mod h1:ADGSXxRrXM6bjbvLo535EstVFlPpPYZm4LBKixjDHwU=
|
||||
go.opentelemetry.io/otel/sdk v1.47.0 h1:zWXEr4j2lFefG87TU6Yg8a7ngfohIKFZHKp0Hf5hC6I=
|
||||
go.opentelemetry.io/otel/sdk v1.47.0/go.mod h1:VUc24kiOeoGsxG8G9ULx3fWKvB7jMhnGE8Oi607lgR0=
|
||||
go.opentelemetry.io/otel/sdk/metric v1.47.0 h1:lfISg2j93VT6yqdk9OfUaZmw/GfcZqCCV3jdXtsPnKw=
|
||||
go.opentelemetry.io/otel/sdk/metric v1.47.0/go.mod h1:ypLp+mW1Nt2x+Szt3b5/i1syodyts49lMOwxpDI3VGw=
|
||||
go.opentelemetry.io/otel/trace v1.47.0 h1:JOjX/Oci8K94QHddo+bbfya/Ai/nf6/dt9ZfrFNWSrM=
|
||||
go.opentelemetry.io/otel/trace v1.47.0/go.mod h1:jNaSLa2PZEYFG6fRjJABAu+bw4FS08uDmPg28lTghu0=
|
||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||
go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
|
||||
go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
|
||||
golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M=
|
||||
golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA=
|
||||
golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba h1:Ck8QetSgk912qxWLMCKxd0in+aiyBQyDSMae6e/xmpU=
|
||||
golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba/go.mod h1:50RgIsmK7OwqzTTeqcSXQW8SswW0o8fRcDxmqGluJ8E=
|
||||
golang.org/x/exp v0.0.0-20261007192929-f45ad48fbe92 h1:kc+Gi2MFkd0KWtdDlVxVwjw4KB98/77usJDFj+6YFQ8=
|
||||
golang.org/x/exp v0.0.0-20261007192929-f45ad48fbe92/go.mod h1:SRjTzy5WcYqRRqquLUvHeeovSwLO0CZ3xcltZNO4Fck=
|
||||
golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
|
||||
golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=
|
||||
golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues=
|
||||
golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
|
||||
golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU=
|
||||
golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
|
||||
golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98=
|
||||
golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58=
|
||||
golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=
|
||||
@@ -284,7 +284,6 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
@@ -296,16 +295,16 @@ golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
|
||||
golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
|
||||
golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=
|
||||
golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=
|
||||
golang.org/x/tools v0.50.0 h1:c2ifzfcuY7L90lZ2aKd8S4K2NpASF08SZx9ZuJkHmSU=
|
||||
golang.org/x/tools v0.50.0/go.mod h1:7ulVMw3831Mwi5EZD6RomGyffr4VFjuNYXf2BbCEAV0=
|
||||
golang.org/x/tools v0.51.0 h1:k4Xc/1Om9jwkBJBo4NVLMSARBoWtK10mx+W5BnXCeAI=
|
||||
golang.org/x/tools v0.51.0/go.mod h1:9eEncMayCV6zRMGhR5eZEC2iBx98qWcF1HZ9Z7wJOoA=
|
||||
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
|
||||
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459 h1:GS9OIt/j7c8bvBjYNgnKQysVfmV7e4jM0H8ZK95G4t8=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459/go.mod h1:PX5/4vemwVoXtwEcRDWwcR1/r0qrosfx3qoVADMwnVE=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 h1:b0xCahf3FK2m2Cv0p4vTozGPWncCvLfwV86UNg8xWU8=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc=
|
||||
google.golang.org/grpc v1.85.0-dev.0.20260825072537-93e31b48545e h1:ar+feAPij1Znzug45m6AoShUCc5AaR8FLA3I6LZd94k=
|
||||
google.golang.org/grpc v1.85.0-dev.0.20260825072537-93e31b48545e/go.mod h1:7aY/KlAHanMAVIWHnk8wloQsdlfwzDz/PP9vCbJG6CU=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20261005182115-fad411399dd8 h1:cFbkNigDInw+wVTXc+CyhUsoHGJCw0BR6mlNoRVfre0=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20261005182115-fad411399dd8/go.mod h1:QK6p7IgD7IZEZJBhhSUCib5X2vMOzlrGCGUw2XyVDh0=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20261005182115-fad411399dd8 h1:0SXBqli5dnuCKMjI/X3FM226zEaEa0GUcSCJtN1vL2o=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20261005182115-fad411399dd8/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc=
|
||||
google.golang.org/grpc v1.86.0-dev h1:FLq7hcApuJeJ70J9+k0FvmXsNCwS8B2/MeAfYdy3GHY=
|
||||
google.golang.org/grpc v1.86.0-dev/go.mod h1:Ovl0ECo4xx5r4kn/6d4BPSNB7OIFuu6EAjOzjtVAKaM=
|
||||
google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=
|
||||
google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
|
||||
@@ -8,6 +8,8 @@ import (
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"github.com/google/jsonschema-go/jsonschema"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/agentrun"
|
||||
)
|
||||
|
||||
@@ -62,7 +64,7 @@ func ProtectionMatcher(p agentrun.Protection, readOnly bool) func(string) bool {
|
||||
func ValidateCaptureArgs(spec agentrun.CaptureTool, value json.RawMessage) (string, bool) {
|
||||
var object map[string]json.RawMessage
|
||||
if err := json.Unmarshal(value, &object); err != nil {
|
||||
return spec.Name + " rejected: arguments must be a JSON object", false //nolint:nilerr // the agent loop must see malformed tool arguments as feedback it can correct, not as a failed tool call
|
||||
return spec.Name + " rejected: arguments must be a JSON object", false // the agent loop must see malformed tool arguments as feedback it can correct, not as a failed tool call
|
||||
}
|
||||
for _, check := range []func(agentrun.CaptureTool, map[string]json.RawMessage) (string, bool){
|
||||
checkRequiredFields,
|
||||
@@ -74,9 +76,52 @@ func ValidateCaptureArgs(spec agentrun.CaptureTool, value json.RawMessage) (stri
|
||||
return rejection, false
|
||||
}
|
||||
}
|
||||
// The derived checks above cover the common cases with friendly wording;
|
||||
// the schema is what enforces the rest of what the tool advertised --
|
||||
// enums, numeric types, nested objects, array shapes -- so a call the
|
||||
// agent could only make valid is rejected with the reason, not recorded.
|
||||
return checkSchema(spec, value)
|
||||
}
|
||||
|
||||
// checkSchema validates the arguments against the tool's advertised JSON
|
||||
// Schema. A tool with no schema, or one that will not resolve, is accepted
|
||||
// here: a schema that never resolves is a definition bug, refused where the
|
||||
// tool is built (workflow's agentResultTool), so the agent is never blamed
|
||||
// for it.
|
||||
func checkSchema(spec agentrun.CaptureTool, value json.RawMessage) (string, bool) {
|
||||
if len(spec.Parameters) == 0 {
|
||||
return "", true
|
||||
}
|
||||
resolved, err := resolveCaptureSchema(spec.Parameters)
|
||||
if err != nil {
|
||||
return "", true
|
||||
}
|
||||
var instance any
|
||||
if err := json.Unmarshal(value, &instance); err != nil {
|
||||
return spec.Name + " rejected: arguments must be JSON", false
|
||||
}
|
||||
if err := resolved.Validate(instance); err != nil {
|
||||
return fmt.Sprintf("%s rejected: %v", spec.Name, err), false
|
||||
}
|
||||
return "", true
|
||||
}
|
||||
|
||||
// resolveCaptureSchema parses and resolves a capture tool's JSON Schema. The
|
||||
// workflow parser resolves the same schema when it builds the tool, so an
|
||||
// unusable schema is refused at definition time rather than silently skipped
|
||||
// here.
|
||||
func resolveCaptureSchema(params json.RawMessage) (*jsonschema.Resolved, error) {
|
||||
var schema jsonschema.Schema
|
||||
if err := json.Unmarshal(params, &schema); err != nil {
|
||||
return nil, fmt.Errorf("capture tool schema: %w", err)
|
||||
}
|
||||
resolved, err := schema.Resolve(nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("capture tool schema: %w", err)
|
||||
}
|
||||
return resolved, nil
|
||||
}
|
||||
|
||||
func checkRequiredFields(spec agentrun.CaptureTool, object map[string]json.RawMessage) (string, bool) {
|
||||
for _, field := range spec.RequiredFields {
|
||||
if _, ok := object[field]; !ok {
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
package agentexec
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/agentrun"
|
||||
)
|
||||
|
||||
// resultSchema is the shape of a shipped planner result (triage's), with a
|
||||
// nested object and an array so every constraint kind the agent can violate
|
||||
// is exercised.
|
||||
const resultSchema = `{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"needs_code_change": {"type": "boolean"},
|
||||
"workflow": {"type": "string", "enum": ["implement", "tdd", "feasibility"]},
|
||||
"reasons": {"type": "string"},
|
||||
"labels": {"type": "array", "items": {"type": "string"}, "maxItems": 2},
|
||||
"plan": {"type": "object", "properties": {"risk": {"type": "integer"}}, "required": ["risk"]}
|
||||
},
|
||||
"required": ["needs_code_change", "workflow", "reasons"]
|
||||
}`
|
||||
|
||||
// TestValidateCaptureArgsEnforcesSchema pins that the advertised schema is
|
||||
// enforced, not merely offered to the agent: an enum, a numeric type, an
|
||||
// array's item type and length, and a nested object's shape all reject with a
|
||||
// message naming what was wrong, so the agent can correct it.
|
||||
func TestValidateCaptureArgsEnforcesSchema(t *testing.T) {
|
||||
base := `"needs_code_change": true, "workflow": "tdd", "reasons": "why"`
|
||||
tests := []struct {
|
||||
name string
|
||||
args string
|
||||
wantOK bool
|
||||
wantText string
|
||||
}{
|
||||
{name: "valid", args: `{` + base + `}`, wantOK: true},
|
||||
{name: "enum violation", args: `{` + base + `, "workflow": "banana"}`, wantText: "workflow"},
|
||||
{name: "wrong boolean type", args: `{"needs_code_change": "yes", "workflow": "tdd", "reasons": "why"}`, wantText: "needs_code_change"},
|
||||
{name: "string where integer expected", args: `{` + base + `, "plan": {"risk": "high"}}`, wantText: "plan"},
|
||||
{name: "array item type", args: `{` + base + `, "labels": [1, 2]}`, wantText: "labels"},
|
||||
{name: "array too long", args: `{` + base + `, "labels": ["a", "b", "c"]}`, wantText: "labels"},
|
||||
{name: "nested required missing", args: `{` + base + `, "plan": {}}`, wantText: "plan"},
|
||||
}
|
||||
spec := agentrun.CaptureTool{Name: "result", Parameters: json.RawMessage(resultSchema)}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
rejection, ok := ValidateCaptureArgs(spec, json.RawMessage(tt.args))
|
||||
if ok != tt.wantOK {
|
||||
t.Fatalf("ok = %v, rejection = %q; want ok %v", ok, rejection, tt.wantOK)
|
||||
}
|
||||
if ok {
|
||||
return
|
||||
}
|
||||
if !strings.HasPrefix(rejection, "result rejected: ") {
|
||||
t.Fatalf("rejection %q does not name the tool", rejection)
|
||||
}
|
||||
if !strings.Contains(rejection, tt.wantText) {
|
||||
t.Fatalf("rejection %q does not mention %q", rejection, tt.wantText)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestValidateCaptureArgsWithoutSchema pins that a tool with no schema, or one
|
||||
// whose schema cannot resolve, still accepts a call: the derived constraint
|
||||
// lists remain the whole check, so the agent is never blocked by a tool
|
||||
// definition the schema check cannot read.
|
||||
func TestValidateCaptureArgsWithoutSchema(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
spec agentrun.CaptureTool
|
||||
args string
|
||||
wantOK bool
|
||||
}{
|
||||
{name: "no schema", spec: agentrun.CaptureTool{Name: "note"}, args: `{"anything": 1}`, wantOK: true},
|
||||
{
|
||||
name: "unresolvable schema is not the agent's problem",
|
||||
spec: agentrun.CaptureTool{Name: "note", Parameters: json.RawMessage(`{"$ref": "#/definitions/missing"}`)},
|
||||
args: `{"anything": 1}`,
|
||||
wantOK: true,
|
||||
},
|
||||
{
|
||||
name: "derived checks still apply without a schema",
|
||||
spec: agentrun.CaptureTool{Name: "note", NonEmptyStrings: []string{"body"}},
|
||||
args: `{"body": " "}`,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
_, ok := ValidateCaptureArgs(tt.spec, json.RawMessage(tt.args))
|
||||
if ok != tt.wantOK {
|
||||
t.Fatalf("ok = %v, want %v", ok, tt.wantOK)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,7 @@ type LoopRunner struct {
|
||||
// Limits bounds the size of tool results fed back into the stage. The
|
||||
// zero value applies no limits.
|
||||
Limits ToolLimits
|
||||
// AllowTools is the profile's allowlist over archie-added tools. Empty allows
|
||||
// AllowTools is the allowlist over archie-added tools. Nil allows
|
||||
// all. Capture tools and agentloop's built-in file tools are never
|
||||
// filtered.
|
||||
AllowTools []string
|
||||
@@ -187,9 +187,9 @@ func makeCaptureHandler(spec agentrun.CaptureTool, captures map[string][]json.Ra
|
||||
}
|
||||
}
|
||||
|
||||
// allowedTools keeps the tools allow names; an empty allow keeps them all.
|
||||
// allowedTools keeps the tools allow names; a nil allow keeps them all.
|
||||
func allowedTools(set core.ToolSet, allow []string) core.ToolSet {
|
||||
if len(allow) == 0 {
|
||||
if allow == nil {
|
||||
return set
|
||||
}
|
||||
kept := core.ToolSet{}
|
||||
|
||||
@@ -4,31 +4,31 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"log/slog"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/ai-sdk/chat"
|
||||
"github.com/samcharles93/ai-sdk/core"
|
||||
"github.com/samcharles93/ai-sdk/runtime"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/agentexec/modelloop"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/usage"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
"github.com/samcharles93/archie-core/internal/tools/mcp"
|
||||
)
|
||||
|
||||
// taskSamplingModel returns the task's builder model, or "".
|
||||
func taskSamplingModel(cfg config.TaskConfig) string {
|
||||
return strings.TrimSpace(cfg.Models["builder"])
|
||||
}
|
||||
|
||||
// taskSamplingHandler answers MCP sampling requests with the task's model.
|
||||
// Without a runtime or model the request is refused.
|
||||
func taskSamplingHandler(llm *runtime.Runtime, cfg config.TaskConfig) mcp.SamplingHandler {
|
||||
// Without a runtime or model the request is refused. record receives each
|
||||
// call's model ref and token usage.
|
||||
func taskSamplingHandler(llm *runtime.Runtime, cfg config.TaskConfig, record func(context.Context, string, chat.Usage)) mcp.SamplingHandler {
|
||||
return func(ctx context.Context, req mcp.SamplingRequest) (mcp.SamplingResult, error) {
|
||||
if llm == nil {
|
||||
return mcp.SamplingResult{}, errors.New("mcp sampling: no model runtime is configured")
|
||||
}
|
||||
model := taskSamplingModel(cfg)
|
||||
if model == "" {
|
||||
return mcp.SamplingResult{}, errors.New("mcp sampling: no builder model is configured")
|
||||
model, err := config.ResolveModel(cfg.Models, "", config.PurposeAgent)
|
||||
if err != nil {
|
||||
return mcp.SamplingResult{}, fmt.Errorf("mcp sampling: %w", err)
|
||||
}
|
||||
messages, err := modelloop.SamplingMessages(req)
|
||||
if err != nil {
|
||||
@@ -45,6 +45,7 @@ func taskSamplingHandler(llm *runtime.Runtime, cfg config.TaskConfig) mcp.Sampli
|
||||
options.Temperature = float32(*req.Temperature)
|
||||
}
|
||||
result, err := llm.Chat(ctx, model, options)
|
||||
record(ctx, model, result.TotalUsage)
|
||||
if err != nil {
|
||||
return mcp.SamplingResult{}, fmt.Errorf("mcp sampling: %w", err)
|
||||
}
|
||||
@@ -56,3 +57,21 @@ func taskSamplingHandler(llm *runtime.Runtime, cfg config.TaskConfig) mcp.Sampli
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
||||
// samplingUsageRecorder records a task's MCP sampling calls against the task.
|
||||
// A failed write is logged, never fails the call.
|
||||
func samplingUsageRecorder(store workflow.Store, t *workflow.Task, log *slog.Logger) func(context.Context, string, chat.Usage) {
|
||||
return func(ctx context.Context, model string, used chat.Usage) {
|
||||
if store == nil || t == nil {
|
||||
return
|
||||
}
|
||||
record := usage.Record{
|
||||
Source: usage.SourceTask, TaskID: t.ID, Attempt: t.Attempt, Workflow: t.Workflow, Step: "mcp-sampling",
|
||||
InputTokens: int64(used.PromptTokens), OutputTokens: int64(used.CompletionTokens),
|
||||
CachedTokens: int64(used.CachedTokens), At: time.Now().UTC(),
|
||||
}.WithRef(model)
|
||||
if err := store.RecordUsage(ctx, record); err != nil && log != nil {
|
||||
log.Warn("record model usage failed", "model", model, "err", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -198,8 +198,6 @@ func stageRunners(req taskrun.Request, mcpSet *mcpProviderSet, newRunner runnerF
|
||||
// routeTask remains available for routing-only callers. Production execution
|
||||
// compiles the request's pinned YAML directly.
|
||||
func routeTask(req taskrun.Request, registry workflow.Registry) workflow.Workflow {
|
||||
workflow.SetKindWorkflows(req.KindWorkflows)
|
||||
workflow.SetLabelWorkflows(req.LabelWorkflows)
|
||||
return workflow.Route(req.Task, registry)
|
||||
}
|
||||
|
||||
@@ -233,7 +231,7 @@ func runTask(ctx context.Context, req taskrun.Request, dependencies taskDependen
|
||||
if len(req.MCPServers) > 0 {
|
||||
llm = modelloop.NewRuntime(req.Providers, req.Cfg.ModelLimits)
|
||||
}
|
||||
mcpSet, mcpErr := startMCPProviders(ctx, req.MCPServers, taskSamplingHandler(llm, req.Cfg), log)
|
||||
mcpSet, mcpErr := startMCPProviders(ctx, req.MCPServers, taskSamplingHandler(llm, req.Cfg, samplingUsageRecorder(dependencies.store, req.Task, log)), log)
|
||||
if mcpSet != nil {
|
||||
defer mcpSet.cleanup(ctx, log)
|
||||
}
|
||||
|
||||
@@ -3,16 +3,25 @@ package agentworker
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/agentexec"
|
||||
"github.com/samcharles93/archie-core/internal/domain/health"
|
||||
"github.com/samcharles93/archie-core/internal/domain/presence"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow/task"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/agentboot"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/agentgit"
|
||||
agentnats "github.com/samcharles93/archie-core/internal/infrastructure/agenttransport/nats"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/egress"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/readiness"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/workflowsteps"
|
||||
"github.com/samcharles93/archie-core/internal/installtype"
|
||||
"github.com/samcharles93/archie-core/internal/storage"
|
||||
"github.com/samcharles93/archie-core/internal/taskrun"
|
||||
"github.com/samcharles93/archie-core/internal/tools"
|
||||
@@ -41,17 +50,22 @@ type Settings struct {
|
||||
// NATS storerpc path is deleted.
|
||||
StateStoreTarget string
|
||||
StateStoreToken string
|
||||
|
||||
// ModelProxy, ModelProxyHosts and ModelProxyCA route model provider
|
||||
// requests through the daemon's egress proxy, which holds the keys.
|
||||
// Empty ModelProxy sends them directly.
|
||||
ModelProxy string
|
||||
ModelProxyHosts []string
|
||||
ModelProxyCA string
|
||||
}
|
||||
|
||||
type workerTransport interface {
|
||||
taskServiceTransport
|
||||
Close()
|
||||
LogPublisher() agentexec.LogPublisher
|
||||
EventPublisher() agentexec.EventPublisher
|
||||
SubscribeTasks(context.Context, int64, agentnats.TaskHandler, *slog.Logger) (agentnats.Subscription, error)
|
||||
Forger(identity, credential string, timeout time.Duration) workflow.Forger
|
||||
Store(time.Duration) workflow.Store
|
||||
Calls(time.Duration) task.Caller
|
||||
Trees(string, string, time.Duration) agentnats.RemoteTrees
|
||||
PutPresence(context.Context, storecontract.Presence) error
|
||||
BrokerReady() bool
|
||||
}
|
||||
|
||||
type workerDependencies struct {
|
||||
@@ -110,6 +124,15 @@ func run(ctx context.Context, settings Settings, log *slog.Logger, dependencies
|
||||
workDir = storage.WorktreeMountDir
|
||||
}
|
||||
|
||||
if settings.ModelProxy != "" {
|
||||
transport, err := egress.ModelTransport(settings.ModelProxy, settings.ModelProxyHosts, settings.ModelProxyCA)
|
||||
if err != nil {
|
||||
return &StartupError{Operation: "model proxy", Err: err}
|
||||
}
|
||||
// The model SDK builds its clients on the default transport and takes
|
||||
// no client of its own, so the process-wide default is the seam.
|
||||
http.DefaultTransport = transport
|
||||
}
|
||||
dependencies.markSafe(ctx, workDir, log)
|
||||
|
||||
// The task is known before connecting: without a broker token the
|
||||
@@ -148,6 +171,13 @@ func run(ctx context.Context, settings Settings, log *slog.Logger, dependencies
|
||||
}
|
||||
}()
|
||||
|
||||
registry := health.NewRegistry(readiness.NewContractProbe("nats", 0, func(context.Context) error {
|
||||
if !transport.BrokerReady() {
|
||||
return errors.New("broker disconnected")
|
||||
}
|
||||
return nil
|
||||
}))
|
||||
go presence.Run(ctx, presence.Agent, presence.Build{InstanceID: strconv.FormatInt(taskID, 10), Version: Version(), InstallType: installtype.Type()}, transport, registry, log)
|
||||
log.Info("archie-agent ready", "nats", settings.NATSURL)
|
||||
dependencies.wait(ctx, log)
|
||||
return nil
|
||||
|
||||
@@ -48,6 +48,8 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/configuration"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/eventbus/nats"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/extension"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/kitrun"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/logrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/messagingrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/modelcatalog"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/staterpc"
|
||||
@@ -94,6 +96,7 @@ type boot struct {
|
||||
// [services.state].target. It is set by openStateStoreAdapter, which
|
||||
// requires [services.state].target to be set.
|
||||
stateStore storecontract.TaskStore
|
||||
taskModels daemon.TaskModels
|
||||
// accessChain is the daemon's policy engine, built once from the stored
|
||||
// policies (openAccessChain); accessProblems is what the readiness
|
||||
// surface reports. Both are nil when no policy store is wired.
|
||||
@@ -158,8 +161,14 @@ type boot struct {
|
||||
containerPool *container.Pool
|
||||
// kitLauncher starts Kit profile tasks; nil when the egress path cannot
|
||||
// be built on this host.
|
||||
kitLauncher daemon.KitLauncher
|
||||
storeBackend storage.Backend
|
||||
kitLauncher *kitrun.Launcher
|
||||
// modelEgress gives native tasks model access through the egress proxy;
|
||||
// nil when the proxy cannot start.
|
||||
modelEgress daemon.ModelEgress
|
||||
// sessionGrants records live setup sessions' granted credential services
|
||||
// for the egress proxy's resolver.
|
||||
sessionGrants *sessionGrants
|
||||
storeBackend storage.Backend
|
||||
|
||||
// runtimeVersions records the version of every control-plane kind boot's
|
||||
// layering applied. Set once at boot before the runtime-resource watches
|
||||
@@ -178,14 +187,6 @@ type boot struct {
|
||||
// schedulingEngine is the cron/scheduling ticker engine (setupScheduling).
|
||||
schedulingEngine *scheduling.Engine
|
||||
|
||||
// kindWorkflows/labelWorkflows are the resolved kind/label -> workflow
|
||||
// routing bindings loaded by loadWorkflowRouting. They are handed to the
|
||||
// daemon so runViaAgent can carry them in taskrun.Request: workflow.Route
|
||||
// runs in the archie-agent process, which never sees the daemon's
|
||||
// package-level workflow state.
|
||||
kindWorkflows workflow.KindWorkflows
|
||||
labelWorkflows workflow.LabelWorkflows
|
||||
|
||||
// agentStatus records the most recent version/install-type an
|
||||
// archie-agent worker reported about itself. Allocated up front, before
|
||||
// any gateway goroutine (Telegram, webui) that might read it via
|
||||
@@ -269,6 +270,7 @@ func (b *boot) openStateStoreAdapter(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
b.stateStore = client
|
||||
b.taskModels = client
|
||||
b.controlPlaneRPC = client.ControlPlane()
|
||||
b.controlPlane = controlplane.NewRPCClient(b.controlPlaneRPC)
|
||||
b.applyStatus = applystatus.New(b.processName, client, b.log)
|
||||
@@ -340,7 +342,7 @@ func (b *boot) setupObservability(ctx context.Context) {
|
||||
|
||||
const reactionStreamMaxAge = 24 * time.Hour
|
||||
|
||||
func (b *boot) connectNATS(ctx context.Context) error { //nolint:nestif // embedded broker discovery and startup require explicit fallback branches
|
||||
func (b *boot) connectNATS(ctx context.Context) error { // embedded broker discovery and startup require explicit fallback branches
|
||||
cfg, log := b.cfg, b.log
|
||||
url := cfg.NATS.URL
|
||||
var natsToken string
|
||||
@@ -462,7 +464,7 @@ func (b *boot) setupContainers(ctx context.Context) func() {
|
||||
|
||||
// setupGatewayClient dials the Gateway, which owns every model call. The daemon
|
||||
// only enqueues the chat tasks scheduled workflows create.
|
||||
func (b *boot) setupGatewayClient() error {
|
||||
func (b *boot) setupGatewayClient(ctx context.Context) error {
|
||||
b.setupChatTasks(b.cfg)
|
||||
contract, cleanup, err := composeChatContract(b.cfg.Services, b.secrets)
|
||||
if err != nil {
|
||||
@@ -476,56 +478,11 @@ func (b *boot) setupGatewayClient() error {
|
||||
}
|
||||
b.addCleanup(closeMessaging)
|
||||
b.messaging = messaging
|
||||
go postOutcomes(ctx, b.stateStore, messaging.Deliver, b.log)
|
||||
b.setupReadinessProbes()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *boot) loadWorkflows() error {
|
||||
cfg, log := b.cfg, b.log
|
||||
if err := b.loadWorkflowRouting(cfg, log); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Info("workflow step registry built", "shipped_workflows", len(workflow.ShippedDefinitions().Definitions))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *boot) loadWorkflowRouting(cfg config.Config, log *slog.Logger) error {
|
||||
kindWorkflows, err := workflow.LoadKindWorkflowsYAML(cfg.WorkflowRoutingFile)
|
||||
if err != nil {
|
||||
log.Error("workflow routing file load failed", "path", cfg.WorkflowRoutingFile, "err", err)
|
||||
return err
|
||||
}
|
||||
|
||||
labelWorkflows, err := workflow.LoadLabelWorkflowsYAML(cfg.WorkflowLabelsFile)
|
||||
if err != nil {
|
||||
log.Error("workflow labels file load failed", "path", cfg.WorkflowLabelsFile, "err", err)
|
||||
return err
|
||||
}
|
||||
|
||||
dirKindWorkflows, dirLabelWorkflows, err := workflow.LoadPlaybookDirs(cfg.PlaybookDirs)
|
||||
if err != nil {
|
||||
log.Error("playbook dirs load failed", "dirs", cfg.PlaybookDirs, "err", err)
|
||||
return err
|
||||
}
|
||||
kindWorkflows, err = workflow.MergeKindWorkflows(kindWorkflows, dirKindWorkflows)
|
||||
if err != nil {
|
||||
log.Error("workflow binding collision between routing file and playbook dir", "err", err)
|
||||
return err
|
||||
}
|
||||
labelWorkflows, err = workflow.MergeLabelWorkflows(labelWorkflows, dirLabelWorkflows)
|
||||
if err != nil {
|
||||
log.Error("workflow binding collision between labels file and playbook dir", "err", err)
|
||||
return err
|
||||
}
|
||||
|
||||
workflow.SetKindWorkflows(kindWorkflows)
|
||||
workflow.SetLabelWorkflows(labelWorkflows)
|
||||
b.kindWorkflows = kindWorkflows
|
||||
b.labelWorkflows = labelWorkflows
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *boot) buildWorktreeManager() {
|
||||
cfg := b.cfg
|
||||
b.trees = &worktree.Manager{
|
||||
@@ -571,13 +528,18 @@ func (b *boot) registerNATSRPC() error {
|
||||
log.Error("nats connection unavailable for task RPC", "err", err)
|
||||
return err
|
||||
}
|
||||
unsubscribe, err := registerTaskRPCServers(coreConn, b.forgeClient, b.trees, b.identityRunners, b.stateStoreGrants.Client, log)
|
||||
unsubscribe, err := registerTaskRPCServers(coreConn, b.forgeClient, b.trees, b.identityRunners, b.stateStoreGrants.Client, installedAuthorities{b.stateStoreGrants.Client}, log)
|
||||
if err != nil {
|
||||
log.Error("task RPC server registration failed", "err", err)
|
||||
return err
|
||||
}
|
||||
b.addCleanup(unsubscribe)
|
||||
|
||||
stopLogs, err := logrpc.RegisterDaemon(coreConn, b.logFeed, log)
|
||||
if err != nil {
|
||||
return fmt.Errorf("register daemon logs: %w", err)
|
||||
}
|
||||
b.addCleanup(stopLogs)
|
||||
unsubscribeSystemLogs, err := subscribeSystemLogs(coreConn, b.taskLogs, log)
|
||||
if err != nil {
|
||||
log.Error("system log subscribe failed", "err", err)
|
||||
@@ -611,6 +573,7 @@ func (b *boot) buildDaemon() {
|
||||
Bus: b.bus,
|
||||
Forge: b.forgeClient,
|
||||
Trees: b.trees,
|
||||
PackageAuthorities: installedAuthorities{b.stateStoreGrants.Client},
|
||||
Storage: b.storeBackend,
|
||||
Log: log,
|
||||
Tasks: b.natsClient,
|
||||
@@ -618,15 +581,15 @@ func (b *boot) buildDaemon() {
|
||||
RunCredentials: b.stateStoreGrants,
|
||||
ContainerPool: b.containerPool,
|
||||
KitLauncher: b.kitLauncher,
|
||||
ModelEgress: b.modelEgress,
|
||||
TaskModels: b.taskModels,
|
||||
Identities: b.identityRunners,
|
||||
RootIdentityID: identity.StableID(servicekit.IdentityNames(b.cfg)[0]),
|
||||
TaskLogs: b.taskLogs,
|
||||
AgentStatus: b.agentStatus,
|
||||
KindWorkflows: b.kindWorkflows,
|
||||
LabelWorkflows: b.labelWorkflows,
|
||||
WorkflowDefinitions: b.workflowDefinitions,
|
||||
WorkflowEnablement: b.controlPlane,
|
||||
Playbooks: controlplane.NewLivePlaybooks(b.controlPlaneRPC, b.log),
|
||||
Playbooks: b.livePlaybooks(),
|
||||
}
|
||||
|
||||
if identities, ok := b.stateStore.(identity.Repository); ok {
|
||||
@@ -720,26 +683,11 @@ func (b *boot) publishConfig(ctx context.Context, cfg config.Config) {
|
||||
}
|
||||
}
|
||||
|
||||
func (b *boot) configOrigins() []webui.ConfigOrigin {
|
||||
provenance := b.currentProvenance.Load()
|
||||
if provenance == nil {
|
||||
return nil
|
||||
}
|
||||
origins := make([]webui.ConfigOrigin, 0, len(provenance.Origins))
|
||||
for _, origin := range provenance.Origins {
|
||||
origins = append(origins, webui.ConfigOrigin{
|
||||
Path: origin.Path, Role: string(origin.Role), Layer: string(origin.Layer), Feature: string(origin.Feature),
|
||||
})
|
||||
}
|
||||
return origins
|
||||
}
|
||||
|
||||
func (b *boot) configViewInput() webui.ConfigViewInput {
|
||||
catalog, _ := b.catalogState()
|
||||
catalog := b.catalogState()
|
||||
in := webui.ConfigViewInput{
|
||||
Config: b.cfgHolder.Get(),
|
||||
Provenance: b.configOrigins(),
|
||||
Catalog: catalogView(catalog),
|
||||
Config: b.cfgHolder.Get(),
|
||||
Catalog: catalogView(catalog),
|
||||
}
|
||||
if b.lastReload != nil {
|
||||
status := b.lastReload()
|
||||
@@ -805,12 +753,14 @@ func (b *boot) startServices(ctx context.Context) error {
|
||||
|
||||
func (b *boot) setupBackends(ctx context.Context) error {
|
||||
closeContainers := b.setupContainers(ctx)
|
||||
// Registered before the Kit launcher so its cleanups (the harness
|
||||
// listener and the egress relay) run first: cleanups unwind LIFO, and a
|
||||
// session teardown needs the Docker client the pool still owns.
|
||||
b.addCleanup(closeContainers)
|
||||
err := b.connectNATS(ctx)
|
||||
if err == nil {
|
||||
b.setupKitLauncher(ctx)
|
||||
}
|
||||
|
||||
b.addCleanup(closeContainers)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -826,6 +776,10 @@ func (b *boot) runLoop(ctx context.Context, once bool) error {
|
||||
b.announceReady()
|
||||
if once {
|
||||
b.d.Cycle(ctx)
|
||||
// A drain pass no longer waits for the tasks it submitted, so a
|
||||
// single-cycle invocation waits for them here: exiting while their
|
||||
// containers still run would kill work this pass accepted.
|
||||
b.d.WaitForTasks()
|
||||
return nil
|
||||
}
|
||||
b.log.Info("archied running", "repos", len(b.cfg.Repos), "poll", b.cfg.PollInterval.Std().String(), "label", b.cfg.Label)
|
||||
@@ -854,7 +808,7 @@ func (b *boot) addCleanup(fn func()) {
|
||||
b.cleanups = append(b.cleanups, fn)
|
||||
}
|
||||
|
||||
func (b *boot) catalogState() (modelcatalog.Snapshot, []string) { return b.catalog.State() }
|
||||
func (b *boot) catalogState() modelcatalog.Snapshot { return b.catalog.State() }
|
||||
|
||||
// loadCatalog layers the model catalog under the file config. A catalog that
|
||||
// cannot be read leaves the configured providers and models in effect.
|
||||
@@ -866,7 +820,7 @@ func (b *boot) loadCatalog(ctx context.Context) {
|
||||
}
|
||||
models := modelcatalog.Apply(&b.cfg, snapshot)
|
||||
b.cfgHolder.Set(b.cfg.Clone())
|
||||
b.catalog.Set(snapshot, models)
|
||||
b.catalog.Set(snapshot)
|
||||
b.log.Info("model catalog loaded", "providers", len(snapshot.Providers), "models", len(models))
|
||||
}
|
||||
|
||||
@@ -881,7 +835,7 @@ func (b *boot) refreshModelCatalog(ctx context.Context) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
b.catalog.Set(snapshot, models)
|
||||
b.catalog.Set(snapshot)
|
||||
b.publishConfig(ctx, cfg)
|
||||
b.log.Info("model catalog refreshed", "providers", len(snapshot.Providers), "models", len(models))
|
||||
return nil
|
||||
@@ -894,3 +848,9 @@ func (b *boot) startModelCatalogRefresh(ctx context.Context) {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (b *boot) livePlaybooks() *controlplane.LivePlaybooks {
|
||||
live := controlplane.NewLivePlaybooks(b.controlPlaneRPC, b.log)
|
||||
live.ApplyStatus = b.applyStatus
|
||||
return live
|
||||
}
|
||||
@@ -52,7 +52,7 @@ func (b *boot) reloadConfig(ctx context.Context, doc *configuration.Document) er
|
||||
// drop them from the running config even though the file is
|
||||
// unchanged. Re-apply the same merge (idempotent: a catalog that
|
||||
// failed to load merges to identity).
|
||||
catalog, _ := b.catalogState()
|
||||
catalog := b.catalogState()
|
||||
modelcatalog.Apply(&doc.Config, catalog)
|
||||
// Bounded: this runs on the signal loop, which handles nothing else
|
||||
// while it waits, and a State Store that has stopped answering must
|
||||
@@ -63,15 +63,17 @@ func (b *boot) reloadConfig(ctx context.Context, doc *configuration.Document) er
|
||||
if err != nil {
|
||||
return fmt.Errorf("runtime settings unavailable: %w", err)
|
||||
}
|
||||
doc.Config = cfg
|
||||
old := b.cfgHolder.Get()
|
||||
restartFields := changedNonReloadableFields(old, cfg)
|
||||
cfg = preserveForgeIdentity(old, cfg)
|
||||
doc.Config = cfg
|
||||
b.currentProvenance.Store(&doc.Provenance)
|
||||
b.publishConfig(ctx, cfg)
|
||||
// The container pool reads the published config on every acquire, but the
|
||||
// dispatcher holds its limit; a reloaded containers.max_concurrency must
|
||||
// reach it the same way a control-plane update does.
|
||||
b.resizeTaskDispatcher(cfg.Containers.MaxConcurrency)
|
||||
if fields := changedNonReloadableFields(old, cfg); len(fields) > 0 {
|
||||
if fields := restartFields; len(fields) > 0 {
|
||||
b.log.Warn("config reloaded; some changes require a restart",
|
||||
"fields", fields, "paths", doc.Provenance.Paths())
|
||||
} else {
|
||||
@@ -210,9 +212,6 @@ func applyExecutionBudgets(cfg *config.Config, settings workflow.ExecutionSettin
|
||||
MaxSteps: settings.MaxModelToolSteps, WallClock: config.Duration(settings.MaxRuntime), GateMaxFailures: settings.MaxConsecutiveGateFailures,
|
||||
TaskWallClock: config.Duration(settings.MaxTaskRuntime),
|
||||
}
|
||||
for i := range cfg.Identities {
|
||||
cfg.Identities[i].Budgets = cfg.Budgets
|
||||
}
|
||||
}
|
||||
|
||||
// startLiveSettings starts everything a live control-plane update needs
|
||||
@@ -263,8 +262,9 @@ func (b *boot) startLiveSettings(ctx context.Context) error {
|
||||
// restart-required. Each kind is watched in its own goroutine, exactly the
|
||||
// shape the workflow-execution-settings watch established.
|
||||
var runtimeResourceKinds = []string{
|
||||
controlplane.TaskPolicyKind,
|
||||
controlplane.ProviderSettingsKind,
|
||||
controlplane.ModelRoleAssignmentsKind,
|
||||
controlplane.ModelAliasesKind,
|
||||
controlplane.RepositoryPoliciesKind,
|
||||
controlplane.SchedulingPolicyKind,
|
||||
controlplane.ToolSettingsKind,
|
||||
@@ -370,7 +370,7 @@ func (b *boot) applyRuntimeResourceUpdate(ctx context.Context, kind string, upda
|
||||
// this read returns can lack the catalog's model limits and discovered
|
||||
// providers. The merge is idempotent, and reloadConfig re-applies it
|
||||
// before layering for the same reason.
|
||||
catalog, _ := b.catalogState()
|
||||
catalog := b.catalogState()
|
||||
modelcatalog.Apply(&base, catalog)
|
||||
cfg, _, err := b.runtimeConfig(ctx, base)
|
||||
if err != nil {
|
||||
|
||||
@@ -0,0 +1,224 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net"
|
||||
"os"
|
||||
"slices"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/status"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/servicekit"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/harness/v1"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/harnessrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/harnesssession"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/kitrun"
|
||||
)
|
||||
|
||||
// setupSessionTTL bounds a setup container's life independently of the pool's
|
||||
// max-uptime reaper: a login that never finishes must not hold a container
|
||||
// until the reaper's (longer) cap.
|
||||
const setupSessionTTL = 30 * time.Minute
|
||||
|
||||
// sessionGrants records the credential services each live setup session is
|
||||
// bound for. A session's proxy token names no task, so the egress proxy's run
|
||||
// resolver consults this registry: without it, the token endpoint is never
|
||||
// intercepted and no OAuth token is ever captured.
|
||||
type sessionGrants struct {
|
||||
mu sync.RWMutex
|
||||
m map[string]sessionGrant
|
||||
}
|
||||
|
||||
type sessionGrant struct {
|
||||
org string
|
||||
services []string
|
||||
}
|
||||
|
||||
func (g *sessionGrants) Grant(token, org string, services []string) {
|
||||
g.mu.Lock()
|
||||
defer g.mu.Unlock()
|
||||
if g.m == nil {
|
||||
g.m = map[string]sessionGrant{}
|
||||
}
|
||||
g.m[token] = sessionGrant{org: org, services: slices.Clone(services)}
|
||||
}
|
||||
|
||||
func (g *sessionGrants) Revoke(token string) {
|
||||
g.mu.Lock()
|
||||
defer g.mu.Unlock()
|
||||
delete(g.m, token)
|
||||
}
|
||||
|
||||
// GrantedFor reports the org and granted services a session token carries.
|
||||
func (g *sessionGrants) GrantedFor(token string) (string, []string, bool) {
|
||||
g.mu.RLock()
|
||||
defer g.mu.RUnlock()
|
||||
grant, ok := g.m[token]
|
||||
return grant.org, grant.services, ok
|
||||
}
|
||||
|
||||
// harnessServer serves the daemon's harness session contract.
|
||||
type harnessServer struct {
|
||||
pb.UnimplementedHarnessServiceServer
|
||||
sessions *harnesssession.Manager
|
||||
log *slog.Logger
|
||||
}
|
||||
|
||||
// Open dispatches on the first frame's target. Setup sessions are served; the
|
||||
// run-scoped target is reserved for archie-core-qi91.
|
||||
func (h *harnessServer) Open(stream pb.HarnessService_OpenServer) error {
|
||||
first, err := stream.Recv()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
target := first.GetTarget()
|
||||
if target == nil || target.GetOrg() == "" {
|
||||
return status.Error(codes.InvalidArgument, "the first frame must name a session target with an org")
|
||||
}
|
||||
switch t := target.GetTarget().(type) {
|
||||
case *pb.OpenTarget_Setup:
|
||||
if t.Setup.GetProfile() == "" {
|
||||
return status.Error(codes.InvalidArgument, "the setup target names no profile")
|
||||
}
|
||||
return h.openSetup(stream, target.GetOrg(), t.Setup.GetProfile(), first.GetSize())
|
||||
case *pb.OpenTarget_Run:
|
||||
return status.Error(codes.Unimplemented, "run-scoped sessions are not served yet")
|
||||
default:
|
||||
return status.Error(codes.InvalidArgument, "the target names no session")
|
||||
}
|
||||
}
|
||||
|
||||
// openSetup opens one setup session and pumps frames until the shell exits or
|
||||
// either side closes. Teardown runs on every return.
|
||||
func (h *harnessServer) openSetup(stream pb.HarnessService_OpenServer, org, profile string, size *pb.ConsoleSize) error {
|
||||
session, err := h.sessions.Open(stream.Context(), org, profile, int(size.GetRows()), int(size.GetCols()))
|
||||
if err != nil {
|
||||
h.log.Warn("setup session failed to open", "org", org, "profile", profile, "err", err)
|
||||
// The failure rides the stream as a frame, not only as a status: the
|
||||
// dashboard's terminal shows the frame's text, which is the operator's
|
||||
// only honest account of why the session did not open.
|
||||
return stream.Send(&pb.OpenResponse{Frame: &pb.OpenResponse_Error{Error: err.Error()}})
|
||||
}
|
||||
defer func() {
|
||||
_ = session.Close()
|
||||
h.log.Info("setup session closed", "org", org, "profile", profile)
|
||||
}()
|
||||
h.log.Info("setup session opened", "org", org, "profile", profile)
|
||||
|
||||
output := make(chan error, 1)
|
||||
go func() { output <- h.pumpOutput(stream, session) }()
|
||||
|
||||
input := make(chan error, 1)
|
||||
go func() { input <- h.pumpInput(stream, session) }()
|
||||
|
||||
select {
|
||||
case err := <-output:
|
||||
if err != nil {
|
||||
return status.Error(codes.Internal, err.Error())
|
||||
}
|
||||
code, codeErr := session.ExitCode(context.WithoutCancel(stream.Context()))
|
||||
if codeErr != nil {
|
||||
return nil
|
||||
}
|
||||
return stream.Send(&pb.OpenResponse{Frame: &pb.OpenResponse_ExitCode{ExitCode: int32(code)}})
|
||||
case err := <-input:
|
||||
if errors.Is(err, io.EOF) {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// pumpOutput copies terminal output to the stream until the shell ends.
|
||||
func (h *harnessServer) pumpOutput(stream pb.HarnessService_OpenServer, session *harnesssession.Session) error {
|
||||
buf := make([]byte, 32<<10)
|
||||
for {
|
||||
n, err := session.Read(buf)
|
||||
if n > 0 {
|
||||
frame := &pb.OpenResponse{Frame: &pb.OpenResponse_Stdout{Stdout: slices.Clone(buf[:n])}}
|
||||
if sendErr := stream.Send(frame); sendErr != nil {
|
||||
return sendErr
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
if errors.Is(err, io.EOF) {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// pumpInput copies client frames to the session until the client closes.
|
||||
func (h *harnessServer) pumpInput(stream pb.HarnessService_OpenServer, session *harnesssession.Session) error {
|
||||
for {
|
||||
req, err := stream.Recv()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if stdin, ok := req.GetFrame().(*pb.OpenRequest_Stdin); ok {
|
||||
if _, err := session.Write(stdin.Stdin); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// setupHarness serves the harness session contract on the configured listen
|
||||
// address. It is skipped, with the reason logged, when no service token is
|
||||
// configured: a session is a shell in a container that holds an org's
|
||||
// credential, so the token is required even on loopback.
|
||||
func (b *boot) setupHarness(ctx context.Context) {
|
||||
conn := b.cfg.Services.Get(config.ServiceNameHarness)
|
||||
listen, err := servicekit.ResolveListen(config.ServiceNameHarness, "", conn.Listen)
|
||||
if err != nil {
|
||||
b.log.Warn("harness sessions disabled", "err", err)
|
||||
return
|
||||
}
|
||||
token := b.cfg.Services.ResolvedToken(config.ServiceNameHarness, os.Getenv)
|
||||
if token == "" {
|
||||
b.log.Warn("harness sessions disabled: [services.harness].target_token or HARNESS_TOKEN is required, even on loopback")
|
||||
return
|
||||
}
|
||||
ln, err := (&net.ListenConfig{}).Listen(ctx, "tcp", listen)
|
||||
if err != nil {
|
||||
b.log.Warn("harness sessions disabled: listen", "err", err)
|
||||
return
|
||||
}
|
||||
manager := &harnesssession.Manager{
|
||||
Launcher: b.kitLauncher,
|
||||
Client: b.containerPool.Client(),
|
||||
Profile: func(name string) (config.AgentProfile, error) { return b.cfgHolder.Get().Containers.Profile(name) },
|
||||
TTL: setupSessionTTL,
|
||||
}
|
||||
srv := grpc.NewServer(
|
||||
//nolint:contextcheck // grpc.StreamServerInterceptor has no context.Context parameter; the interceptor derives its context from stream.Context()
|
||||
grpc.StreamInterceptor(harnessrpc.StreamServerInterceptor(token)),
|
||||
)
|
||||
pb.RegisterHarnessServiceServer(srv, &harnessServer{sessions: manager, log: b.log})
|
||||
go func() {
|
||||
if err := srv.Serve(ln); err != nil && !errors.Is(err, grpc.ErrServerStopped) {
|
||||
b.log.Error("harness listener stopped", "err", err)
|
||||
}
|
||||
}()
|
||||
b.addCleanup(func() {
|
||||
// An open session stream would hold GracefulStop until its TTL; give
|
||||
// in-flight frames a moment, then stop. Mirrors the State Store's
|
||||
// shutdown so a session cannot hold shutdown to the watchdog leash.
|
||||
timer := time.AfterFunc(10*time.Second, srv.Stop)
|
||||
srv.GracefulStop()
|
||||
timer.Stop()
|
||||
_ = ln.Close()
|
||||
})
|
||||
b.log.Info("harness sessions enabled", "addr", ln.Addr().String())
|
||||
}
|
||||
|
||||
var _ kitrun.GrantRegistry = (*sessionGrants)(nil)
|
||||
@@ -0,0 +1,21 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/storepkg"
|
||||
)
|
||||
|
||||
// installedAuthorities answers a package's accepted authority from the State
|
||||
// Store. A package the operator has not accepted has none.
|
||||
type installedAuthorities struct {
|
||||
packages storepkg.Installations
|
||||
}
|
||||
|
||||
func (a installedAuthorities) AcceptedAuthority(ctx context.Context, name string) (storepkg.Authority, error) {
|
||||
installed, err := a.packages.GetInstalled(ctx, name)
|
||||
if err != nil || installed.AcceptedAuthority == nil {
|
||||
return storepkg.Authority{}, err
|
||||
}
|
||||
return *installed.AcceptedAuthority, nil
|
||||
}
|
||||
@@ -42,11 +42,6 @@ func (b *boot) setupKitLauncher(ctx context.Context) {
|
||||
log.Warn("kit harness runs disabled: egress CA", "err", err)
|
||||
return
|
||||
}
|
||||
fetcher, err := fetch.New(fetch.WithDockerCredentials())
|
||||
if err != nil {
|
||||
log.Warn("kit harness runs disabled: kit registry client", "err", err)
|
||||
return
|
||||
}
|
||||
ln, err := (&net.ListenConfig{}).Listen(ctx, "tcp", net.JoinHostPort(pool.HostGateway(), "0"))
|
||||
if err != nil {
|
||||
log.Warn("kit harness runs disabled: egress proxy listener", "err", err)
|
||||
@@ -60,8 +55,10 @@ func (b *boot) setupKitLauncher(ctx context.Context) {
|
||||
return
|
||||
}
|
||||
// The proxy resolves each credential from the run credential the
|
||||
// container logs in with, against the live grants and bindings.
|
||||
resolver := runCredentialResolver{runs: b.stateStoreGrants.Client, config: b.cfgHolder, secrets: b.secrets}
|
||||
// container logs in with, against the live grants and bindings; a setup
|
||||
// session's token resolves through the session grants instead.
|
||||
b.sessionGrants = &sessionGrants{}
|
||||
resolver := runCredentialResolver{runs: b.stateStoreGrants.Client, sessions: b.sessionGrants, models: b.taskModels, config: b.cfgHolder, secrets: b.secrets}
|
||||
// Without a harness secret store, Register refuses a Kit with a
|
||||
// required OAuth credential.
|
||||
oauthStore, _ := b.stateStore.(egress.OAuthStore)
|
||||
@@ -72,16 +69,28 @@ func (b *boot) setupKitLauncher(ctx context.Context) {
|
||||
log.Error("egress proxy stopped", "err", err)
|
||||
}
|
||||
}()
|
||||
// Native tasks need only the proxy for model access, so it serves them
|
||||
// even when a Kit-only piece below fails.
|
||||
b.modelEgress = modelEgress{proxy: proxy, addr: ln.Addr().String(), caFile: egress.CACertPath(caDir), config: b.cfgHolder}
|
||||
fetcher, err := fetch.New(fetch.WithDockerCredentials())
|
||||
if err != nil {
|
||||
b.addCleanup(func() { _ = srv.Close() })
|
||||
log.Warn("kit harness runs disabled: kit registry client", "err", err)
|
||||
return
|
||||
}
|
||||
networks := egress.NewNetworks(pool.Client(), egress.RelaySpec{
|
||||
Name: relayName, Image: b.cfg.Containers.Image,
|
||||
Entrypoint: []string{"archie-agent"}, Cmd: cmd, Network: pool.NetworkName(),
|
||||
})
|
||||
b.addCleanup(shutdownEgress(networks, srv, log))
|
||||
b.kitLauncher = &kitrun.Launcher{
|
||||
kitLauncher := &kitrun.Launcher{
|
||||
Pool: pool, Fetch: fetcher, Proxy: proxy, Networks: networks,
|
||||
AgentBinary: agentBinary, CAFile: egress.CACertPath(caDir),
|
||||
Config: b.cfgHolder, Secrets: b.secrets, OAuth: oauthStore,
|
||||
Grants: b.sessionGrants,
|
||||
}
|
||||
b.kitLauncher = kitLauncher
|
||||
b.setupHarness(ctx)
|
||||
log.Info("kit harness runs enabled", "proxy", ln.Addr().String())
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"flag"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
@@ -29,6 +30,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/container"
|
||||
"github.com/samcharles93/archie-core/internal/daemon"
|
||||
"github.com/samcharles93/archie-core/internal/domain/applystatus"
|
||||
"github.com/samcharles93/archie-core/internal/domain/health"
|
||||
"github.com/samcharles93/archie-core/internal/domain/presence"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
@@ -36,6 +38,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/forge"
|
||||
"github.com/samcharles93/archie-core/internal/forgerpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/configuration"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/readiness"
|
||||
"github.com/samcharles93/archie-core/internal/logging"
|
||||
"github.com/samcharles93/archie-core/internal/secret"
|
||||
"github.com/samcharles93/archie-core/internal/storage"
|
||||
@@ -182,11 +185,12 @@ func Run() int { //nolint:cyclop,funlen // the composition root's setup sequence
|
||||
return 1
|
||||
}
|
||||
|
||||
if err := b.setupGatewayClient(); err != nil {
|
||||
if err := b.setupGatewayClient(ctx); err != nil {
|
||||
return 1
|
||||
}
|
||||
if ps, ok := b.stateStore.(storecontract.PresenceStore); ok {
|
||||
go presence.Run(ctx, b.processName, servicekit.Build(), ps, b.healthRegistry, b.log)
|
||||
b.reportBrokerPresence(ctx, ps)
|
||||
}
|
||||
// The daemon publishes the configuration view, which carries the catalog's
|
||||
// model limits.
|
||||
@@ -194,9 +198,6 @@ func Run() int { //nolint:cyclop,funlen // the composition root's setup sequence
|
||||
if err := b.buildTreesAndIdentities(ctx); err != nil {
|
||||
return 1
|
||||
}
|
||||
if err := b.loadWorkflows(); err != nil {
|
||||
return 1
|
||||
}
|
||||
|
||||
if err := b.registerNATSRPC(); err != nil {
|
||||
return 1
|
||||
@@ -288,6 +289,11 @@ func subscribeSystemLogs(nc *natsio.Conn, taskLogs *logging.TaskRegistry, log *s
|
||||
}
|
||||
// The NATS callback has no context of its own; the write is an append to
|
||||
// an already-open sink, so there is nothing to cancel.
|
||||
if entry.Fields == nil {
|
||||
entry.Fields = map[string]any{}
|
||||
}
|
||||
entry.Fields["service"] = presence.Agent
|
||||
entry.Fields["task_id"] = taskID
|
||||
taskLogs.Write(context.Background(), taskID, entry)
|
||||
})
|
||||
if err != nil {
|
||||
@@ -350,7 +356,7 @@ func subscribeAgentEvents(nc *natsio.Conn, bus *events.Bus, log *slog.Logger) (u
|
||||
// tasks, and one server pair per identity answers that identity's scoped
|
||||
// subjects so a container-mode task owned by a non-root identity has its RPC
|
||||
// calls served by its own forge client and worktree manager.
|
||||
func registerTaskRPCServers(nc *natsio.Conn, forgeClient forge.Forge, trees *worktree.Manager, identities []*daemon.IdentityRunner, runs worktreerpc.Runs, log *slog.Logger) (unsubscribe func(), err error) {
|
||||
func registerTaskRPCServers(nc *natsio.Conn, forgeClient forge.Forge, trees *worktree.Manager, identities []*daemon.IdentityRunner, runs worktreerpc.Runs, authorities forgerpc.Authorities, log *slog.Logger) (unsubscribe func(), err error) {
|
||||
unsubs := make([]func(), 0, 2+2*len(identities))
|
||||
unsubAll := func() {
|
||||
for _, u := range unsubs {
|
||||
@@ -359,7 +365,7 @@ func registerTaskRPCServers(nc *natsio.Conn, forgeClient forge.Forge, trees *wor
|
||||
}
|
||||
|
||||
registerForge := func(fg forge.Forge, identity string) error {
|
||||
srv := &forgerpc.Server{Forge: fg, Runs: runs, Log: log.With("rpc_identity", identity)}
|
||||
srv := &forgerpc.Server{Forge: fg, Runs: runs, Authorities: authorities, Log: log.With("rpc_identity", identity)}
|
||||
u, err := srv.RegisterFor(nc, identity)
|
||||
if err != nil {
|
||||
return fmt.Errorf("register forgerpc%s: %w", identitySuffix(identity), err)
|
||||
@@ -526,3 +532,15 @@ func resolveRegistryAuth(ref secret.SecretRef, secrets *secret.Registry, log *sl
|
||||
}
|
||||
return value
|
||||
}
|
||||
|
||||
func (b *boot) reportBrokerPresence(ctx context.Context, ps storecontract.PresenceStore) {
|
||||
if conn, err := b.natsClient.CoreConn(); err == nil {
|
||||
registry := health.NewRegistry(readiness.NewContractProbe("connection", 0, func(context.Context) error {
|
||||
if !conn.IsConnected() {
|
||||
return errors.New("broker disconnected")
|
||||
}
|
||||
return nil
|
||||
}))
|
||||
go presence.Run(ctx, presence.Broker, presence.Build{Version: conn.ConnectedServerVersion(), InstallType: b.cfg.NATS.Mode}, ps, registry, b.log)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"maps"
|
||||
"slices"
|
||||
|
||||
"github.com/docker/sandbox-kit-spec/v3/spec"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/daemon"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/egress"
|
||||
"github.com/samcharles93/archie-core/internal/storage"
|
||||
)
|
||||
|
||||
const modelProxyCAPath = "/opt/archie/egress-ca.pem"
|
||||
|
||||
// modelEgress opens native task containers' model sessions on the egress
|
||||
// proxy. Each keyed provider's key is the org's credential binding named
|
||||
// after the provider.
|
||||
type modelEgress struct {
|
||||
proxy *egress.Proxy
|
||||
addr string
|
||||
caFile string
|
||||
config *config.Holder
|
||||
}
|
||||
|
||||
func (m modelEgress) Open(token, org string, providers map[string]config.Provider) (daemon.ModelSession, error) {
|
||||
var keyed []string
|
||||
for _, name := range slices.Sorted(maps.Keys(providers)) {
|
||||
if providers[name].APIKeyEnv != "" {
|
||||
keyed = append(keyed, name)
|
||||
}
|
||||
}
|
||||
if len(keyed) == 0 {
|
||||
return daemon.ModelSession{}, nil
|
||||
}
|
||||
bound := m.config.Get().Containers.BoundCredentials(org, keyed, keyed)
|
||||
var (
|
||||
subs []egress.Substitution
|
||||
hosts []string
|
||||
env []string
|
||||
)
|
||||
for _, name := range keyed {
|
||||
p := providers[name]
|
||||
if _, ok := bound[name]; !ok {
|
||||
return daemon.ModelSession{}, fmt.Errorf("provider %q has no credential binding named %q in org %s", name, name, org)
|
||||
}
|
||||
host, err := egress.ProviderHost(p.Class, p.BaseURL)
|
||||
if err != nil {
|
||||
return daemon.ModelSession{}, fmt.Errorf("provider %q: %w", name, err)
|
||||
}
|
||||
subs = append(subs, egress.Substitution{Service: name, Host: host})
|
||||
hosts = append(hosts, host)
|
||||
env = append(env, p.APIKeyEnv+"="+egress.SentinelFor(name))
|
||||
}
|
||||
session, err := m.proxy.Register(egress.SessionOptions{
|
||||
Token: token, Org: org, Substitutions: subs,
|
||||
Network: &spec.PhasedNetwork{Runtime: &spec.NetworkRules{Allow: hosts}},
|
||||
})
|
||||
if err != nil {
|
||||
return daemon.ModelSession{}, err
|
||||
}
|
||||
session.EnterRuntime()
|
||||
return daemon.ModelSession{
|
||||
Env: append(env, egress.ModelProxyEnvFor(m.addr, token, hosts, modelProxyCAPath)...),
|
||||
Mounts: []storage.Mount{{Type: storage.MountTypeBind, Source: m.caFile, Destination: modelProxyCAPath}},
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (m modelEgress) Close(token string) { m.proxy.Revoke(token) }
|
||||
@@ -0,0 +1,72 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow/task"
|
||||
)
|
||||
|
||||
const outcomePostInterval = 15 * time.Second
|
||||
|
||||
type outcomeDeliverer func(ctx context.Context, channel, chatID, text string) error
|
||||
|
||||
// postOutcomes reports each finished chat task to the conversation that
|
||||
// spawned it. A task stays unposted until delivery succeeds, so a Messaging
|
||||
// Service that is down or restarting only delays the report.
|
||||
func postOutcomes(ctx context.Context, tasks storecontract.OutcomePoster, deliver outcomeDeliverer, log *slog.Logger) {
|
||||
ticker := time.NewTicker(outcomePostInterval)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
postPendingOutcomes(ctx, tasks, deliver, log)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-ticker.C:
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func postPendingOutcomes(ctx context.Context, tasks storecontract.OutcomePoster, deliver outcomeDeliverer, log *slog.Logger) {
|
||||
pending, err := tasks.UnpostedOutcomes(ctx)
|
||||
if err != nil {
|
||||
log.Warn("list unposted task outcomes", "err", err)
|
||||
return
|
||||
}
|
||||
for _, t := range pending {
|
||||
// An origin that names no chat can never be delivered; marking it
|
||||
// posted keeps it from being retried forever.
|
||||
if channel, chatID, ok := splitOrigin(t.Origin); ok {
|
||||
if err := deliver(ctx, channel, chatID, outcomeText(t)); err != nil {
|
||||
log.Warn("post task outcome", "task", t.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
}
|
||||
if err := tasks.MarkOutcomePosted(ctx, t.ID); err != nil {
|
||||
log.Warn("mark task outcome posted", "task", t.ID, "err", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// splitOrigin reads "<channel>:<chat>[/<thread>]", the form messaging.Origin
|
||||
// writes. Delivery addresses the chat; threads are not addressable.
|
||||
func splitOrigin(origin string) (channel, chatID string, ok bool) {
|
||||
channel, conversation, found := strings.Cut(origin, ":")
|
||||
chatID, _, _ = strings.Cut(conversation, "/")
|
||||
return channel, chatID, found && channel != "" && chatID != ""
|
||||
}
|
||||
|
||||
func outcomeText(t *task.Task) string {
|
||||
text := fmt.Sprintf("Task %d (%s) finished: %s", t.ID, t.Title, t.Status)
|
||||
if t.PRNumber > 0 {
|
||||
text += fmt.Sprintf(", PR #%d", t.PRNumber)
|
||||
}
|
||||
if t.ParkReason != "" {
|
||||
text += "\n" + t.ParkReason
|
||||
}
|
||||
return text
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
)
|
||||
|
||||
func RunReleaseChannel(args []string, in io.Reader, out, stderr io.Writer) int {
|
||||
flags := flag.NewFlagSet("select-release", flag.ContinueOnError)
|
||||
flags.SetOutput(stderr)
|
||||
channel := flags.String("channel", "stable", "stable, next, or exact-pin")
|
||||
pin := flags.String("pin", "", "exact release version")
|
||||
if err := flags.Parse(args); err != nil {
|
||||
return 1
|
||||
}
|
||||
data, err := io.ReadAll(in)
|
||||
if err != nil {
|
||||
fmt.Fprintln(stderr, err)
|
||||
return 1
|
||||
}
|
||||
version, err := releaseupdate.SelectRelease(strings.Fields(string(data)), *channel, *pin)
|
||||
if err != nil {
|
||||
fmt.Fprintln(stderr, err)
|
||||
return 1
|
||||
}
|
||||
fmt.Fprintln(out, version)
|
||||
return 0
|
||||
}
|
||||
@@ -117,21 +117,8 @@ var reloadableFields = map[string]bool{
|
||||
"ModelLimits": true,
|
||||
"Notify": true,
|
||||
"Review": true,
|
||||
// BotUser/BotEmail used to be poll-path only; ForTask now carries both
|
||||
// into the task snapshot as well, because the sandboxed worker builds
|
||||
// its own worktree.Manager and signs its own commits (agentworker
|
||||
// task_execution.go, config.go ForTask). The commit identity is
|
||||
// therefore per-dispatch and does reload. The startup-built daemon
|
||||
// trees (bootstrap.go:654) still capture both, but only to record
|
||||
// user.name/user.email in the clone's own .git/config
|
||||
// (worktree.go setIdentity) -- cosmetic, not the signature go-git
|
||||
// commits with -- so a reload applies where it counts and this stays
|
||||
// reloadable rather than requires-restart.
|
||||
"BotEmail": true,
|
||||
// cfg.Label additionally feeds IssuesWithLabel per poll cycle
|
||||
// (daemon.go:359,390) and cfg.BotUser feeds AssignedIssues (:364,377).
|
||||
"Label": true,
|
||||
"BotUser": true,
|
||||
// Poll loops read the dispatch label each cycle.
|
||||
"Label": true,
|
||||
// MaxRetries has two consumers, both re-reading it: the webui maxRetriesFor
|
||||
// handler (api_tasks.go:380,383) reads it per request, and ForTask carries
|
||||
// it into every dispatched TaskConfig, where the container's remediation
|
||||
@@ -148,7 +135,6 @@ var reloadableSubFields = map[string]map[string]bool{
|
||||
"VolumeTTL": true, "Profiles": true, "Credentials": true,
|
||||
"Image": true, "MaxConcurrency": true, "MaxUptime": true, "PullPolicy": true, "Network": true,
|
||||
},
|
||||
"Forge": {"Host": true},
|
||||
// Policy is carried into TaskConfig by ForTask (config.go); MCPServers,
|
||||
// WebFetch and Minimax are not and stay requires-restart.
|
||||
"Tools": {"Policy": true},
|
||||
@@ -188,3 +174,9 @@ func changedNonReloadableFields(old, next config.Config) []string {
|
||||
}
|
||||
return changed
|
||||
}
|
||||
|
||||
// Account credentials, identity namespaces and forge listeners survive a reload.
|
||||
func preserveForgeIdentity(old, next config.Config) config.Config {
|
||||
next.BotUser, next.BotEmail, next.Forge = old.BotUser, old.BotEmail, old.Forge
|
||||
return next
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"slices"
|
||||
"testing"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
)
|
||||
|
||||
func TestReloadPreservesForgeIdentity(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
name, field string
|
||||
change func(*config.Config)
|
||||
}{
|
||||
{"forge host", "Forge", func(c *config.Config) { c.Forge.Host = "other.example" }},
|
||||
{"bot user", "BotUser", func(c *config.Config) { c.BotUser = "other-account" }},
|
||||
{"commit email", "BotEmail", func(c *config.Config) { c.BotEmail = "other@example.test" }},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
old := config.Config{BotUser: "archie", BotEmail: "archie@example.test", Forge: config.Forge{Host: "forge.example"}}
|
||||
next := old.Clone()
|
||||
tt.change(&next)
|
||||
if restored := preserveForgeIdentity(old, next); restored.BotUser != old.BotUser || restored.BotEmail != old.BotEmail || restored.Forge != old.Forge {
|
||||
t.Fatal("reload changed the running forge identity")
|
||||
}
|
||||
if changed := changedNonReloadableFields(old, next); !slices.Contains(changed, tt.field) {
|
||||
t.Fatalf("identity change was reloadable: %v", changed)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,10 @@ package archied
|
||||
|
||||
import (
|
||||
"context"
|
||||
"slices"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/daemon"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/egress"
|
||||
)
|
||||
@@ -12,10 +14,21 @@ import (
|
||||
// credential for the run a run credential names, when the request is made,
|
||||
// from the live grants and bindings. A revoked credential, a grant removed
|
||||
// mid-run or a binding in another org stops resolving at once.
|
||||
//
|
||||
// A setup session's token names no task, so the resolver consults the session
|
||||
// grants first: the session is bound for the org's bindings of the Kit's
|
||||
// declared services, which is the intersection the operator's update-on-secret
|
||||
// authorisation covers.
|
||||
type runCredentialResolver struct {
|
||||
runs interface {
|
||||
TaskForCredential(ctx context.Context, token string) (*workflow.Task, error)
|
||||
}
|
||||
sessions interface {
|
||||
GrantedFor(token string) (org string, services []string, ok bool)
|
||||
}
|
||||
// models answers a task's org's own providers. Nil grants only the
|
||||
// instance providers.
|
||||
models daemon.TaskModels
|
||||
config *config.Holder
|
||||
secrets interface {
|
||||
Resolve(config.SecretRef) (string, error)
|
||||
@@ -23,19 +36,57 @@ type runCredentialResolver struct {
|
||||
}
|
||||
|
||||
func (r runCredentialResolver) Resolve(ctx context.Context, credential, service string) (string, error) {
|
||||
if r.sessions != nil {
|
||||
if org, services, ok := r.sessions.GrantedFor(credential); ok {
|
||||
return r.resolveBinding(org, services, service)
|
||||
}
|
||||
}
|
||||
task, err := r.runs.TaskForCredential(ctx, credential)
|
||||
if err != nil {
|
||||
return "", egress.ErrUnbound
|
||||
}
|
||||
cfg := r.config.Get()
|
||||
org, granted := cfg.CredentialAccess(task.Identity)
|
||||
_, granted := cfg.CredentialAccess(task.Identity)
|
||||
org := task.OrgOrDefault()
|
||||
// A configured model provider's key is granted to every run of the org:
|
||||
// any agent stage needs model access.
|
||||
if r.isModelProvider(ctx, cfg, task, service) {
|
||||
granted = append(slices.Clone(granted), service)
|
||||
}
|
||||
return r.resolveBinding(org, granted, service)
|
||||
}
|
||||
|
||||
// resolveBinding resolves service from the org's binding when the run or
|
||||
// session is granted it. An OAuth binding resolves to the empty string: the
|
||||
// proxy supplies the org's token set itself.
|
||||
func (r runCredentialResolver) resolveBinding(org string, granted []string, service string) (string, error) {
|
||||
cfg := r.config.Get()
|
||||
binding, ok := cfg.Containers.BoundCredentials(org, granted, []string{service})[service]
|
||||
if !ok {
|
||||
return "", egress.ErrUnbound
|
||||
}
|
||||
if binding.Secret == (config.SecretRef{}) {
|
||||
// An OAuth binding: the proxy supplies the org's token set itself.
|
||||
return "", nil
|
||||
}
|
||||
if r.secrets == nil {
|
||||
return "", egress.ErrUnbound
|
||||
}
|
||||
return r.secrets.Resolve(binding.Secret)
|
||||
}
|
||||
|
||||
// isModelProvider reports whether service is a provider the task's models
|
||||
// run on: an instance provider, or one of its org's own.
|
||||
func (r runCredentialResolver) isModelProvider(ctx context.Context, cfg config.Config, task *workflow.Task, service string) bool {
|
||||
if _, ok := cfg.Providers[service]; ok {
|
||||
return true
|
||||
}
|
||||
if r.models == nil {
|
||||
return false
|
||||
}
|
||||
models, err := r.models.TaskModels(ctx, task.ID)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
_, ok := models.Providers[service]
|
||||
return ok
|
||||
}
|
||||
@@ -29,17 +29,21 @@ func TestEgressResolvesOnlyGrantedCredentials(t *testing.T) {
|
||||
own := []string{"anthropic"}
|
||||
cfg := config.Config{
|
||||
GrantedCredentials: []string{"github"},
|
||||
Providers: map[string]config.Provider{"openai": {Class: "openai"}, "deepseek": {Class: "deepseek"}},
|
||||
Identities: []config.IdentityConfig{{Name: "acme-bot", Org: "acme", GrantedCredentials: &own}},
|
||||
Containers: config.ContainerConfig{Credentials: []config.CredentialBinding{
|
||||
{Service: "github", Secret: config.SecretRef{Engine: "env", Key: "GH"}},
|
||||
{Service: "anthropic", Secret: config.SecretRef{Engine: "env", Key: "ROOT_AI"}},
|
||||
{Service: "anthropic", Org: "acme", Secret: config.SecretRef{Engine: "env", Key: "ACME_AI"}},
|
||||
{Service: "openai", Secret: config.SecretRef{Engine: "env", Key: "ROOT_OPENAI"}},
|
||||
{Service: "openai", Org: "acme", Secret: config.SecretRef{Engine: "env", Key: "ACME_OPENAI"}},
|
||||
{Service: "deepseek", Secret: config.SecretRef{Engine: "env", Key: "ROOT_DEEPSEEK"}},
|
||||
}},
|
||||
}
|
||||
r := runCredentialResolver{
|
||||
runs: runsByToken{"root-run": {ID: 1}, "acme-run": {ID: 2, Identity: "acme-bot"}},
|
||||
runs: runsByToken{"root-run": {ID: 1}, "acme-run": {ID: 2, Identity: "acme-bot", Org: "acme"}, "acme-row-run": {ID: 3, Org: "acme"}},
|
||||
config: config.NewHolder(cfg),
|
||||
secrets: secretValues{"GH": "gh-secret", "ROOT_AI": "root-ai", "ACME_AI": "acme-ai"},
|
||||
secrets: secretValues{"GH": "gh-secret", "ROOT_AI": "root-ai", "ACME_AI": "acme-ai", "ROOT_OPENAI": "root-openai", "ACME_OPENAI": "acme-openai", "ROOT_DEEPSEEK": "root-deepseek"},
|
||||
}
|
||||
tests := []struct {
|
||||
name, credential, service, want string
|
||||
@@ -49,6 +53,10 @@ func TestEgressResolvesOnlyGrantedCredentials(t *testing.T) {
|
||||
{"identity run gets its own org's binding", "acme-run", "anthropic", "acme-ai"},
|
||||
{"identity grants replace the root's", "acme-run", "github", ""},
|
||||
{"unknown credential", "gone", "github", ""},
|
||||
{"a model provider key needs no grant", "root-run", "openai", "root-openai"},
|
||||
{"a model provider key is the run's own org's", "acme-run", "openai", "acme-openai"},
|
||||
{"another org's model provider key is unbound", "acme-run", "deepseek", ""},
|
||||
{"the task's own org decides, not the identity mapping", "acme-row-run", "openai", "acme-openai"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
@@ -65,3 +73,47 @@ func TestEgressResolvesOnlyGrantedCredentials(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestEgressResolvesASessionGrant pins that a setup session's token, which
|
||||
// names no task, resolves only the granted services of its own org. A grant
|
||||
// that widened to another org's binding would hand the container a credential
|
||||
// the operator's update-on-secret authorisation never covered.
|
||||
func TestEgressResolvesASessionGrant(t *testing.T) {
|
||||
cfg := config.Config{Containers: config.ContainerConfig{Credentials: []config.CredentialBinding{
|
||||
{Service: "github", Org: "acme", Secret: config.SecretRef{Engine: "env", Key: "ACME_GH"}},
|
||||
{Service: "linear", Org: "acme"},
|
||||
}}}
|
||||
sessions := &sessionGrants{}
|
||||
sessions.Grant("acme-session", "acme", []string{"github", "linear"})
|
||||
sessions.Grant("other-session", "other", []string{"github"})
|
||||
r := runCredentialResolver{
|
||||
runs: runsByToken{"acme-run": {ID: 1, Identity: "acme-bot", Org: "acme"}},
|
||||
sessions: sessions,
|
||||
config: config.NewHolder(cfg),
|
||||
secrets: secretValues{"ACME_GH": "acme-gh"},
|
||||
}
|
||||
tests := []struct {
|
||||
name, credential, service, want string
|
||||
bound bool
|
||||
}{
|
||||
{name: "a bound api key resolves", credential: "acme-session", service: "github", want: "acme-gh", bound: true},
|
||||
{name: "a bound oauth service resolves to the proxy's own token set", credential: "acme-session", service: "linear", bound: true},
|
||||
{name: "a service outside the grant is unbound", credential: "acme-session", service: "nope"},
|
||||
{name: "another org's binding is unbound", credential: "other-session", service: "github"},
|
||||
{name: "an unknown token falls through to the task path", credential: "acme-run", service: "github"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, err := r.Resolve(context.Background(), tt.credential, tt.service)
|
||||
if !tt.bound {
|
||||
if !errors.Is(err, egress.ErrUnbound) {
|
||||
t.Fatalf("got %q, %v; want ErrUnbound", got, err)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil || got != tt.want {
|
||||
t.Fatalf("got %q, %v; want %q", got, err, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -174,8 +174,6 @@ func (s scheduleResourceStore) MarkRun(ctx context.Context, id string, runAt tim
|
||||
// The stop path derives its own timeout budget from Background rather than
|
||||
// the boot context, which is already cancelled by the time shutdown runs --
|
||||
// the same reasoning as shutdownCuratorRuntime.
|
||||
//
|
||||
//nolint:contextcheck
|
||||
func shutdownSchedulingEngine(e *scheduling.Engine, log *slog.Logger) func() {
|
||||
return func() {
|
||||
stopCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
|
||||
@@ -72,18 +72,7 @@ func (b *boot) startWatchdog(ctx context.Context) {
|
||||
// beginning a fresh poll pass, and therefore how stale the progress marker may
|
||||
// be before the loop counts as stalled.
|
||||
//
|
||||
// It is the root poll interval, or the slowest configured identity in
|
||||
// multi-identity mode: each identity polls its own repos, identity poll
|
||||
// intervals are frozen at boot, and the marker is stamped by whichever identity
|
||||
// polled most recently -- so the worst case between stamps is the slowest
|
||||
// identity, not the fastest. The root value is re-read per sample, so a
|
||||
// reloaded poll_interval is honoured.
|
||||
// The shared interval is re-read so live polling changes are honoured.
|
||||
func (b *boot) loopCadence() time.Duration {
|
||||
cadence := b.cfgHolder.Get().PollInterval.Std()
|
||||
for _, id := range b.d.Identities {
|
||||
if override := id.Cfg.PollInterval.Std(); override > cadence {
|
||||
cadence = override
|
||||
}
|
||||
}
|
||||
return cadence
|
||||
return b.cfgHolder.Get().PollInterval.Std()
|
||||
}
|
||||
@@ -48,6 +48,8 @@ func (b *boot) openDaemonWorkflowDefinitions() error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("build workflow definitions client: %w", err)
|
||||
}
|
||||
definitions.ApplyStatus = b.applyStatus
|
||||
b.controlPlane.ApplyStatus = b.applyStatus
|
||||
b.workflowDefinitions = definitions
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
)
|
||||
|
||||
// RunUpdate serves `archied update check`, printing the release snapshot as
|
||||
// JSON. The channel defaults to the environment the installer passes on.
|
||||
func RunUpdate(args []string, out, stderr io.Writer) int {
|
||||
if len(args) == 0 || args[0] != "check" {
|
||||
fmt.Fprintln(stderr, "usage: archied update check [-channel stable|next|exact-pin] [-pin version]")
|
||||
return 2
|
||||
}
|
||||
flags := flag.NewFlagSet("update check", flag.ContinueOnError)
|
||||
flags.SetOutput(stderr)
|
||||
channel := flags.String("channel", envOr("ARCHIE_UPDATE_RELEASE_CHANNEL", "stable"), "stable, next, or exact-pin")
|
||||
pin := flags.String("pin", os.Getenv("ARCHIE_UPDATE_PIN"), "exact release version")
|
||||
if err := flags.Parse(args[1:]); err != nil {
|
||||
return 2
|
||||
}
|
||||
catalog := &releaseupdate.GitHubCatalog{Channel: func(context.Context) (string, string, error) { return *channel, *pin, nil }}
|
||||
snapshot, err := catalog.Check(context.Background())
|
||||
if err != nil {
|
||||
fmt.Fprintln(stderr, err)
|
||||
return 1
|
||||
}
|
||||
encoder := json.NewEncoder(out)
|
||||
encoder.SetIndent("", " ")
|
||||
if err := encoder.Encode(snapshot); err != nil {
|
||||
fmt.Fprintln(stderr, err)
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func envOr(key, fallback string) string {
|
||||
if value := os.Getenv(key); value != "" {
|
||||
return value
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
@@ -2,9 +2,13 @@ package archiegateway
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"slices"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/presence"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/logrpc"
|
||||
"github.com/samcharles93/archie-core/internal/logging"
|
||||
"github.com/samcharles93/archie-core/internal/skill"
|
||||
)
|
||||
|
||||
@@ -21,6 +25,7 @@ func (b *server) setSkillList(entries []skill.CatalogEntry) {
|
||||
// channels, so channel reload is left unset and answers Unavailable.
|
||||
func (b *server) chatCatalog() gatewayrpc.Catalog {
|
||||
return gatewayrpc.Catalog{
|
||||
Logs: b.recentLogs,
|
||||
Skills: b.skillEntries,
|
||||
Curators: b.curatorStates,
|
||||
}
|
||||
@@ -86,3 +91,14 @@ func skillSource(entry skill.CatalogEntry, workDir, sharedDir string) string {
|
||||
return "user-global skills"
|
||||
}
|
||||
}
|
||||
|
||||
func (b *server) recentLogs(ctx context.Context, service string, q logging.Query) (logging.Result, error) {
|
||||
switch service {
|
||||
case "", presence.Gateway:
|
||||
return b.logFeed.Read(q)
|
||||
case presence.Daemon:
|
||||
return logrpc.ReadDaemon(ctx, b.taskActionsConn, q)
|
||||
default:
|
||||
return logging.Result{}, fmt.Errorf("unknown log service %q", service)
|
||||
}
|
||||
}
|
||||
@@ -4,116 +4,51 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"slices"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/org"
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/modelcatalog"
|
||||
)
|
||||
|
||||
// chatModelManager owns the process-local model selected for interactive chat.
|
||||
// The configured role-to-model map supplies the available catalog; switching
|
||||
// chat models does not rewrite daemon configuration or affect workflow roles.
|
||||
// chatModelManager owns the process-local model alias selected for
|
||||
// interactive chat. Switching it does not rewrite configuration or affect
|
||||
// workflow steps.
|
||||
type chatModelManager struct {
|
||||
mu sync.RWMutex
|
||||
models []string
|
||||
active string
|
||||
// configured, explicit and catalog are the sources the offered set is
|
||||
// derived from: the role assignments (live via SetConfigured), the
|
||||
// [chat].models catalog (fixed for the process), and the model catalog's
|
||||
// own refs (replaced wholesale by SetModelCatalog).
|
||||
configured map[string]string
|
||||
explicit []string
|
||||
catalog []string
|
||||
mu sync.RWMutex
|
||||
aliases map[string]string
|
||||
active string
|
||||
details map[string]gateway.ModelDetails
|
||||
providerNames map[string]string
|
||||
// orgAliases answers the aliases the principal ctx carries may use. Nil
|
||||
// serves every caller the instance aliases.
|
||||
orgAliases func(ctx context.Context) (map[string]string, error)
|
||||
}
|
||||
|
||||
// pickChatDefault is the model the manager starts on: the chat role's
|
||||
// assignment, falling back to the builder role's.
|
||||
func pickChatDefault(configured map[string]string) string {
|
||||
if active := strings.TrimSpace(configured["chat"]); active != "" {
|
||||
return active
|
||||
}
|
||||
return strings.TrimSpace(configured["builder"])
|
||||
}
|
||||
|
||||
// mergeModelRefs is the model set the manager offers: the configured role
|
||||
// assignments plus every catalog, unique and sorted.
|
||||
func mergeModelRefs(configured map[string]string, catalogs ...[]string) []string {
|
||||
unique := make(map[string]struct{}, len(configured))
|
||||
for _, ref := range configured {
|
||||
ref = strings.TrimSpace(ref)
|
||||
if ref != "" {
|
||||
unique[ref] = struct{}{}
|
||||
}
|
||||
}
|
||||
for _, catalog := range catalogs {
|
||||
for _, ref := range catalog {
|
||||
ref = strings.TrimSpace(ref)
|
||||
if ref != "" {
|
||||
unique[ref] = struct{}{}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
models := make([]string, 0, len(unique))
|
||||
for ref := range unique {
|
||||
models = append(models, ref)
|
||||
}
|
||||
slices.Sort(models)
|
||||
return models
|
||||
}
|
||||
|
||||
func newChatModelManager(configured map[string]string, catalogs ...[]string) *chatModelManager {
|
||||
explicit := make([]string, 0, len(catalogs))
|
||||
for _, catalog := range catalogs {
|
||||
explicit = append(explicit, catalog...)
|
||||
}
|
||||
m := &chatModelManager{
|
||||
configured: configured,
|
||||
explicit: explicit,
|
||||
details: make(map[string]gateway.ModelDetails),
|
||||
providerNames: make(map[string]string),
|
||||
}
|
||||
m.active = pickChatDefault(configured)
|
||||
m.setModelsLocked()
|
||||
func newChatModelManager(aliases map[string]string) *chatModelManager {
|
||||
m := &chatModelManager{details: make(map[string]gateway.ModelDetails), providerNames: make(map[string]string)}
|
||||
m.SetConfigured(aliases)
|
||||
return m
|
||||
}
|
||||
|
||||
// setModelsLocked re-derives the offered set from the three sources and keeps
|
||||
// the active selection when the new set still carries it, falling back the way
|
||||
// construction does when it does not.
|
||||
func (m *chatModelManager) setModelsLocked() {
|
||||
m.models = mergeModelRefs(m.configured, m.explicit, m.catalog)
|
||||
if !slices.Contains(m.models, m.active) {
|
||||
m.active = pickChatDefault(m.configured)
|
||||
// SetConfigured replaces the alias table after a live change to model-aliases.
|
||||
// The active alias survives when it still exists; otherwise chat returns to
|
||||
// the default alias.
|
||||
func (m *chatModelManager) SetConfigured(aliases map[string]string) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
m.aliases = aliases
|
||||
if !slices.Contains(config.ChatAliases(aliases), m.active) {
|
||||
m.active = config.PurposeChat.DefaultAlias()
|
||||
}
|
||||
}
|
||||
|
||||
// SetConfigured re-derives the model set the manager offers after a live
|
||||
// change to model-role-assignments or provider-settings: the list is built
|
||||
// from the configured roles at construction, so a stored change would leave
|
||||
// the chat surfaces offering refs the runtime can no longer resolve. The
|
||||
// operator's active selection survives when the new roles still carry it; a
|
||||
// removed one falls back the way construction does.
|
||||
func (m *chatModelManager) SetConfigured(configured map[string]string) {
|
||||
// SetModelCatalog replaces the provider display names and per-model details
|
||||
// the catalog publishes.
|
||||
func (m *chatModelManager) SetModelCatalog(snapshot modelcatalog.Snapshot) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
m.configured = configured
|
||||
m.setModelsLocked()
|
||||
}
|
||||
|
||||
// SetModelCatalog replaces the model catalog's contribution to the manager:
|
||||
// the references it offers, the provider display names and the per-model
|
||||
// details. The previous snapshot's entries are dropped rather than merged --
|
||||
// a model or provider the catalog no longer publishes must stop being offered
|
||||
// and described, and these maps are the manager's own state rather than a
|
||||
// second catalogue to fall back on.
|
||||
func (m *chatModelManager) SetModelCatalog(snapshot modelcatalog.Snapshot, models []string) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
m.catalog = slices.Clone(models)
|
||||
m.details = make(map[string]gateway.ModelDetails)
|
||||
m.providerNames = make(map[string]string)
|
||||
for _, provider := range snapshot.Providers {
|
||||
@@ -129,7 +64,6 @@ func (m *chatModelManager) SetModelCatalog(snapshot modelcatalog.Snapshot, model
|
||||
}
|
||||
}
|
||||
}
|
||||
m.setModelsLocked()
|
||||
}
|
||||
|
||||
func (m *chatModelManager) ProviderDisplayName(provider string) string {
|
||||
@@ -145,80 +79,66 @@ func (m *chatModelManager) ModelDetails(ref string) (gateway.ModelDetails, bool)
|
||||
return details, ok
|
||||
}
|
||||
|
||||
// Models returns the aliases chat may switch between.
|
||||
func (m *chatModelManager) Models() []string {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return slices.Clone(m.models)
|
||||
return config.ChatAliases(m.aliases)
|
||||
}
|
||||
|
||||
func (m *chatModelManager) ActiveModel() string {
|
||||
func (m *chatModelManager) ActiveAlias() string {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return m.active
|
||||
}
|
||||
|
||||
func (m *chatModelManager) SetActiveModel(ctx context.Context, ref string) error {
|
||||
// ActiveModel returns the active alias's model ref, or "" when it is unset.
|
||||
func (m *chatModelManager) ActiveModel() string {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
ref, _ := config.ResolveModel(m.aliases, m.active, config.PurposeChat)
|
||||
return ref
|
||||
}
|
||||
|
||||
func (m *chatModelManager) SetActiveModel(ctx context.Context, alias string) error {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if !slices.Contains(m.models, ref) {
|
||||
return fmt.Errorf("model %q is not configured", ref)
|
||||
if !slices.Contains(config.ChatAliases(m.aliases), alias) {
|
||||
return fmt.Errorf("model alias %q is not configured", alias)
|
||||
}
|
||||
m.active = ref
|
||||
m.active = alias
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *chatModelManager) Providers() []string {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
seen := make(map[string]bool)
|
||||
var providers []string
|
||||
for _, model := range m.models {
|
||||
provider, _, ok := strings.Cut(model, "/")
|
||||
if ok && provider != "" && !seen[provider] {
|
||||
seen[provider] = true
|
||||
providers = append(providers, provider)
|
||||
}
|
||||
// aliasesFor is the alias table ctx's org resolves against: the instance's
|
||||
// for the system org, the org's own answer otherwise.
|
||||
func (m *chatModelManager) aliasesFor(ctx context.Context) (map[string]string, error) {
|
||||
if m.orgAliases == nil || org.OrgFromContext(ctx) == org.DefaultOrgID {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return m.aliases, nil
|
||||
}
|
||||
slices.Sort(providers)
|
||||
return providers
|
||||
return m.orgAliases(ctx)
|
||||
}
|
||||
|
||||
func (m *chatModelManager) ActiveProvider() string {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
provider, _, _ := strings.Cut(m.active, "/")
|
||||
return provider
|
||||
// ModelsFor returns the aliases ctx's org may switch between.
|
||||
func (m *chatModelManager) ModelsFor(ctx context.Context) ([]string, error) {
|
||||
aliases, err := m.aliasesFor(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return config.ChatAliases(aliases), nil
|
||||
}
|
||||
|
||||
func (m *chatModelManager) ModelsForProvider(provider string) []string {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
prefix := provider + "/"
|
||||
var models []string
|
||||
for _, model := range m.models {
|
||||
if strings.HasPrefix(model, prefix) {
|
||||
models = append(models, model)
|
||||
}
|
||||
// ModelFor resolves the active alias in ctx's org. An org that cannot use it
|
||||
// gets an error, never another model.
|
||||
func (m *chatModelManager) ModelFor(ctx context.Context) (string, error) {
|
||||
aliases, err := m.aliasesFor(ctx)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return models
|
||||
}
|
||||
|
||||
func (m *chatModelManager) SetActiveProvider(ctx context.Context, provider string) error {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
prefix := provider + "/"
|
||||
for _, model := range m.models {
|
||||
if strings.HasPrefix(model, prefix) {
|
||||
m.active = model
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return fmt.Errorf("provider %q is not configured", provider)
|
||||
return config.ResolveModel(aliases, m.ActiveAlias(), config.PurposeChat)
|
||||
}
|
||||
@@ -57,9 +57,9 @@ func (b *server) setupTranscriber(cfg config.Config, log *slog.Logger) {
|
||||
})
|
||||
if ok {
|
||||
b.transcriber = client
|
||||
log.Info("voice transcription enabled", "role", transcription.Role)
|
||||
} else if cfg.Models[transcription.Role] != "" {
|
||||
log.Warn("voice transcription configured but unavailable; capability disabled", "role", transcription.Role)
|
||||
log.Info("voice transcription enabled")
|
||||
} else if _, err := config.ResolveModel(cfg.Models, "", config.PurposeTranscription); err == nil {
|
||||
log.Warn("voice transcription configured but unavailable; capability disabled")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,18 +84,18 @@ func (b *server) startRateLimiter(ctx context.Context, cfg config.RateLimitConfi
|
||||
}
|
||||
|
||||
// rebuildChatModelRuntime re-derives the gateway chat runtime's provider set
|
||||
// after a live change to provider-settings or model-role-assignments. The
|
||||
// after a live change to provider-settings or model-aliases. The
|
||||
// turn runner reads the runtime through server.chatLLM, so the swap reaches its
|
||||
// next turn without rebuilding the runner, and the model manager re-derives
|
||||
// the references it offers from the new role assignments and the catalog.
|
||||
// the aliases it offers.
|
||||
func (b *server) rebuildChatModelRuntime(cfg config.Config) {
|
||||
if b.chatModels == nil {
|
||||
return // this process serves no chat turns
|
||||
}
|
||||
b.setLLM(modelloop.NewRuntime(executionProviders(cfg), cfg.ModelLimits))
|
||||
b.chatModels.SetConfigured(cfg.Models)
|
||||
catalog, models := b.catalogState()
|
||||
b.chatModels.SetModelCatalog(catalog, models)
|
||||
catalog := b.catalogState()
|
||||
b.chatModels.SetModelCatalog(catalog)
|
||||
b.log.Info("chat model runtime rebuilt", "providers", len(cfg.Providers), "models", len(cfg.Models))
|
||||
}
|
||||
|
||||
|
||||
@@ -15,8 +15,10 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/agentexec/modelloop"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/domain/usage"
|
||||
"github.com/samcharles93/archie-core/internal/events"
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
"github.com/samcharles93/archie-core/internal/installtype"
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
"github.com/samcharles93/archie-core/internal/tools"
|
||||
@@ -35,11 +37,13 @@ type chatSetup struct {
|
||||
// than the value captured when the runner was built.
|
||||
ToolLimits func() modelloop.ToolLimits
|
||||
// LLM resolves the provider runtime at each use: a live provider-settings
|
||||
// or model-role-assignments update swaps the runtime wholesale (ai-sdk's
|
||||
// or model-aliases update swaps the runtime wholesale (ai-sdk's
|
||||
// Runtime caches the provider instances it built), so the pointer cannot
|
||||
// be captured at construction. nil means no model runtime is configured.
|
||||
LLM func() *runtime.Runtime
|
||||
ChatModels gateway.ModelManager
|
||||
LLM func() *runtime.Runtime
|
||||
ChatModels gateway.ModelManager
|
||||
// Usage records each model call; nil records nothing.
|
||||
Usage *usageSink
|
||||
ToolReg *tools.Registry
|
||||
Soul gateway.SoulSource
|
||||
ChatTasks gateway.TaskCreator
|
||||
@@ -95,23 +99,9 @@ func componentInstallTypeEnricher(nats config.NATSConfig) func(string) (string,
|
||||
}
|
||||
}
|
||||
|
||||
func makeUpdateService(s chatSetup) *releaseupdate.Service {
|
||||
cfg := s.Cfg.Get()
|
||||
if len(cfg.Chat.Telegram.UpdateCheckCommand) == 0 {
|
||||
return nil
|
||||
}
|
||||
updates := &releaseupdate.Service{
|
||||
Catalog: releaseupdate.CommandCatalog{Command: cfg.Chat.Telegram.UpdateCheckCommand},
|
||||
StatePath: filepath.Join(cfg.WorkDir, "telegram-update-deferrals.json"),
|
||||
InstallType: installtype.Type(),
|
||||
Enrich: componentInstallTypeEnricher(cfg.NATS),
|
||||
}
|
||||
if len(cfg.Chat.Telegram.UpdateInstallCommand) != 0 {
|
||||
updates.Installer = releaseupdate.CommandInstaller{
|
||||
Command: cfg.Chat.Telegram.UpdateInstallCommand,
|
||||
HealthURL: cfg.Health.URL(),
|
||||
}
|
||||
}
|
||||
func makeUpdateService(reader controlplanerpc.ResourceReader, cfg config.Config) *releaseupdate.Service {
|
||||
updates := controlplanerpc.UpdateService(reader, filepath.Join(cfg.WorkDir, "telegram-update-deferrals.json"), cfg.Health.URL())
|
||||
updates.Enrich = componentInstallTypeEnricher(cfg.NATS)
|
||||
return updates
|
||||
}
|
||||
|
||||
@@ -142,7 +132,7 @@ func newChatTurnRunner(
|
||||
Sessions: sessionStore,
|
||||
Models: s.ChatModels,
|
||||
Soul: s.Soul,
|
||||
Model: newChatTurnModel(s.LLM, s.ToolReg, cfg.Chat.MaxSteps, s.ToolLimits, s.ProviderOutcomes),
|
||||
Model: newChatTurnModel(s.LLM, s.ToolReg, cfg.Chat.MaxSteps, s.ToolLimits, s.ProviderOutcomes, s.Usage),
|
||||
TaskLister: s.ChatTaskLister,
|
||||
Tasks: s.ChatTasks,
|
||||
TaskLogs: s.ChatTaskLogs,
|
||||
@@ -204,31 +194,38 @@ func chatRepoEnv(cfg config.Config, identity string) []gateway.RepoEnv {
|
||||
// and records at its own adapter (curatorLLMRunner). Anything that reaches the
|
||||
// runtime without recording leaves /status reporting a stale last-known
|
||||
// outcome, which is a /status that lies about the provider.
|
||||
func sendChatTurn(ctx context.Context, llm *runtime.Runtime, chatModel string, options core.GenerateOptions, turn gateway.TurnStream, outcomes *providerOutcomeRecorder, icons map[string]string) (string, error) {
|
||||
text, err := runChatTurn(ctx, llm, chatModel, options, turn, icons)
|
||||
func sendChatTurn(ctx context.Context, llm *runtime.Runtime, chatModel string, options core.GenerateOptions, turn gateway.TurnStream, outcomes *providerOutcomeRecorder, usageRecords *usageSink, icons map[string]string) (string, error) {
|
||||
text, used, err := runChatTurn(ctx, llm, chatModel, options, turn, icons)
|
||||
usageRecords.record(ctx, usage.SourceChat, chatModel, used)
|
||||
// record tolerates a nil recorder: a setup built without one (tests, a
|
||||
// deployment whose health surface is unwired) still makes its calls.
|
||||
outcomes.record(chatModel, err)
|
||||
return text, err
|
||||
}
|
||||
|
||||
func runChatTurn(ctx context.Context, llm *runtime.Runtime, chatModel string, options core.GenerateOptions, turn gateway.TurnStream, icons map[string]string) (string, error) {
|
||||
// runChatTurn returns the reply and the tokens the call used, which a
|
||||
// failed call may still report.
|
||||
func runChatTurn(ctx context.Context, llm *runtime.Runtime, chatModel string, options core.GenerateOptions, turn gateway.TurnStream, icons map[string]string) (string, chat.Usage, error) {
|
||||
if turn == nil {
|
||||
result, err := llm.Chat(ctx, chatModel, options)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("llm chat: %w", err)
|
||||
return "", result.TotalUsage, fmt.Errorf("llm chat: %w", err)
|
||||
}
|
||||
return result.Text, nil
|
||||
return result.Text, result.TotalUsage, nil
|
||||
}
|
||||
stream, err := llm.ChatStream(ctx, chatModel, options)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("llm chat stream: %w", err)
|
||||
return "", chat.Usage{}, fmt.Errorf("llm chat stream: %w", err)
|
||||
}
|
||||
text := drainChatStream(stream.FullStream, turn, icons)
|
||||
if _, err := stream.FinishReason(); err != nil {
|
||||
return "", fmt.Errorf("llm chat stream: %w", err)
|
||||
var used chat.Usage
|
||||
if stream.Usage != nil {
|
||||
used, _ = stream.Usage()
|
||||
}
|
||||
return text, nil
|
||||
if _, err := stream.FinishReason(); err != nil {
|
||||
return "", used, fmt.Errorf("llm chat stream: %w", err)
|
||||
}
|
||||
return text, used, nil
|
||||
}
|
||||
|
||||
// drainChatStream consumes a model stream to close, reporting assistant text
|
||||
@@ -337,6 +334,7 @@ type chatTitleGenerator struct {
|
||||
log *slog.Logger
|
||||
llm func() *runtime.Runtime
|
||||
chatModels gateway.ModelManager
|
||||
usage *usageSink
|
||||
}
|
||||
|
||||
// newChatTitleGenerator wires an LLM-backed title generator for a chat
|
||||
@@ -346,7 +344,7 @@ func newChatTitleGenerator(s chatSetup) gateway.TitleGenerator {
|
||||
if s.LLM == nil || s.ChatModels == nil {
|
||||
return nil
|
||||
}
|
||||
return &chatTitleGenerator{log: s.Log, llm: s.LLM, chatModels: s.ChatModels}
|
||||
return &chatTitleGenerator{log: s.Log, llm: s.LLM, chatModels: s.ChatModels, usage: s.Usage}
|
||||
}
|
||||
|
||||
func (g *chatTitleGenerator) GenerateTitle(ctx context.Context, sessionID, firstMessage string) (string, error) {
|
||||
@@ -370,7 +368,7 @@ func (g *chatTitleGenerator) GenerateTitle(ctx context.Context, sessionID, first
|
||||
return "", fmt.Errorf("no model runtime is configured")
|
||||
}
|
||||
text, err := sendChatTurn(ctx, llm, g.chatModels.ActiveModel(),
|
||||
core.GenerateOptions{Messages: messages, MaxSteps: 1}, nil, nil, nil)
|
||||
core.GenerateOptions{Messages: messages, MaxSteps: 1}, nil, nil, g.usage, nil)
|
||||
if err != nil {
|
||||
if g.log != nil {
|
||||
g.log.Error("session title generation failed", "session", sessionID, "err", err)
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/domain/taskactions"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
@@ -115,7 +116,7 @@ func (a chatTaskListerAdapter) ListChatTasks(ctx context.Context, identity strin
|
||||
// identity through the tool input.
|
||||
type chatTaskLogReaderAdapter struct {
|
||||
tasks func(context.Context, int64) (*workflow.Task, error)
|
||||
taskLogs *logging.TaskRegistry
|
||||
taskLogs storecontract.TaskLogStore
|
||||
}
|
||||
|
||||
func (a chatTaskLogReaderAdapter) ReadChatTaskLogs(
|
||||
@@ -141,19 +142,9 @@ func (a chatTaskLogReaderAdapter) ReadChatTaskLogs(
|
||||
if attempt <= 0 {
|
||||
attempt = task.Attempt
|
||||
}
|
||||
path := a.taskLogs.Path(taskID, attempt)
|
||||
if path == "" {
|
||||
return gateway.ChatTaskLogResult{Attempt: attempt, Entries: []gateway.ChatTaskLogEntry{}}, nil
|
||||
}
|
||||
|
||||
page, err := logging.Page(path, logging.Query{
|
||||
Component: q.Component,
|
||||
Contains: q.Contains,
|
||||
Levels: q.Levels,
|
||||
Since: q.Since,
|
||||
Until: q.Until,
|
||||
Limit: q.Limit,
|
||||
}, q.AfterID)
|
||||
page, err := a.taskLogs.TaskLog(ctx, taskID, attempt, logging.Query{
|
||||
Component: q.Component, Contains: q.Contains, Levels: q.Levels, Since: q.Since, Until: q.Until, Limit: q.Limit, BeforeID: q.AfterID,
|
||||
})
|
||||
if err != nil {
|
||||
return gateway.ChatTaskLogResult{}, err
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ type chatTurnModel struct {
|
||||
limits func() modelloop.ToolLimits
|
||||
// outcomes records each call's result for /status (see sendChatTurn).
|
||||
outcomes *providerOutcomeRecorder
|
||||
usage *usageSink
|
||||
}
|
||||
|
||||
func newChatTurnModel(
|
||||
@@ -37,6 +38,7 @@ func newChatTurnModel(
|
||||
maxSteps int,
|
||||
limits func() modelloop.ToolLimits,
|
||||
outcomes *providerOutcomeRecorder,
|
||||
usageRecords *usageSink,
|
||||
) gateway.TurnModel {
|
||||
return &chatTurnModel{
|
||||
llm: llm,
|
||||
@@ -44,6 +46,7 @@ func newChatTurnModel(
|
||||
maxSteps: maxSteps,
|
||||
limits: limits,
|
||||
outcomes: outcomes,
|
||||
usage: usageRecords,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,6 +73,7 @@ func (m *chatTurnModel) Prepare(
|
||||
toolInfo: toolSummaries(options.Tools),
|
||||
toolTokens: gateway.EstimateTokens(string(toolSchema)),
|
||||
outcomes: m.outcomes,
|
||||
usage: m.usage,
|
||||
icons: toolIcons(m.registry),
|
||||
}, nil
|
||||
}
|
||||
@@ -81,6 +85,7 @@ type preparedChatTurnModel struct {
|
||||
toolInfo []gateway.ToolSummary
|
||||
toolTokens int
|
||||
outcomes *providerOutcomeRecorder
|
||||
usage *usageSink
|
||||
// icons maps tool name to the icon that tool registered, for chat
|
||||
// surfaces to render. A nil map yields "" for every lookup, which is
|
||||
// the no-icon rendering.
|
||||
@@ -202,5 +207,5 @@ func (m *preparedChatTurnModel) Generate(
|
||||
if m.llm == nil {
|
||||
return "", fmt.Errorf("llm chat: no model runtime is configured")
|
||||
}
|
||||
return sendChatTurn(ctx, m.llm, m.model, options, stream, m.outcomes, m.icons)
|
||||
return sendChatTurn(ctx, m.llm, m.model, options, stream, m.outcomes, m.usage, m.icons)
|
||||
}
|
||||
@@ -11,7 +11,10 @@ import (
|
||||
"github.com/samcharles93/ai-sdk/runtime"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/agentexec/modelloop"
|
||||
"github.com/samcharles93/archie-core/internal/app/controlplane"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/curator"
|
||||
"github.com/samcharles93/archie-core/internal/domain/usage"
|
||||
"github.com/samcharles93/archie-core/internal/events"
|
||||
infraMemory "github.com/samcharles93/archie-core/internal/infrastructure/memory"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/sessioncurator"
|
||||
@@ -32,7 +35,7 @@ func (b *server) setupCurators(ctx context.Context) {
|
||||
MemoryEngines: b.memEngines,
|
||||
Skills: skillcurator.NewStore(skillsRoot),
|
||||
Conversations: sessioncurator.NewAdapter(b.chatSessionStore, b.cfg.BotUser),
|
||||
LLM: curatorLLMRunner{llm: b.chatLLM, outcomes: b.providerOutcomes},
|
||||
LLM: curatorLLMRunner{llm: b.chatLLM, outcomes: b.providerOutcomes, usage: b.usage},
|
||||
Model: b.chatModels.ActiveModel(),
|
||||
})
|
||||
|
||||
@@ -44,30 +47,6 @@ func (b *server) setupCurators(ctx context.Context) {
|
||||
log.Error("session-memory curator registration failed", "err", err)
|
||||
}
|
||||
|
||||
for _, def := range b.cfg.Curators {
|
||||
if !def.Enabled {
|
||||
continue
|
||||
}
|
||||
engine := curator.NewDefinitionEngine(curator.Definition{
|
||||
Name: def.Name,
|
||||
Enabled: def.Enabled,
|
||||
Instructions: def.Instructions,
|
||||
Manifest: curator.Manifest{
|
||||
Interval: def.Interval.Std(),
|
||||
Cooldown: def.Cooldown.Std(),
|
||||
OnInput: def.OnInput,
|
||||
Tools: def.Tools,
|
||||
Skills: def.Skills,
|
||||
MemoryEngine: def.MemoryEngine,
|
||||
Conversations: def.Conversations,
|
||||
Model: def.Model,
|
||||
},
|
||||
})
|
||||
if err := b.curatorRegistry.Register(engine); err != nil {
|
||||
log.Error("config curator registration failed", "curator", def.Name, "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
b.curatorRuntime = curator.NewRuntime(b.curatorRegistry, curator.RuntimeConfig{})
|
||||
curator.WakeOnPrimaryInput(ctx, b.bus, b.curatorRuntime, events.KindTurnCompleted)
|
||||
rt := b.curatorRuntime
|
||||
@@ -129,6 +108,7 @@ type curatorLLMRunner struct {
|
||||
// provider is demonstrably reachable -- or worse, keeps showing a much
|
||||
// older chat outcome as current.
|
||||
outcomes *providerOutcomeRecorder
|
||||
usage *usageSink
|
||||
}
|
||||
|
||||
func (r curatorLLMRunner) Chat(ctx context.Context, req curator.ChatRequest) (curator.ChatResult, error) {
|
||||
@@ -158,6 +138,7 @@ func (r curatorLLMRunner) Chat(ctx context.Context, req curator.ChatRequest) (cu
|
||||
MaxSteps: max(req.MaxSteps, 1),
|
||||
})
|
||||
r.outcomes.record(req.Model, err)
|
||||
r.usage.record(ctx, usage.SourceCurator, req.Model, res.TotalUsage)
|
||||
if err != nil {
|
||||
return curator.ChatResult{}, err
|
||||
}
|
||||
@@ -168,3 +149,23 @@ func (r curatorLLMRunner) Chat(ctx context.Context, req curator.ChatRequest) (cu
|
||||
}
|
||||
return curator.ChatResult{Text: res.Text, ToolCalls: calls}, nil
|
||||
}
|
||||
|
||||
func (b *server) applyCurators(ctx context.Context, defs []config.CuratorDefinition) error {
|
||||
definitions := make([]curator.Definition, 0, len(defs))
|
||||
for _, def := range defs {
|
||||
definitions = append(definitions, controlplane.CuratorDefinition(def))
|
||||
}
|
||||
return b.curatorRuntime.ReplaceDefinitions(ctx, definitions)
|
||||
}
|
||||
|
||||
func (b *server) watchCurators(ctx context.Context, version int64) error {
|
||||
updates, err := b.controlPlane.WatchCurators(ctx, version)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
watchStatus(ctx, b.applyStatus.Report, b.log, controlplane.CuratorsKind, "curators", version, updates, b.controlPlane.WatchCurators,
|
||||
func(update controlplane.AppliedCurators) int64 { return update.Version },
|
||||
func(update controlplane.AppliedCurators) error { return update.Err },
|
||||
func(update controlplane.AppliedCurators) error { return b.applyCurators(ctx, update.Definitions) })
|
||||
return nil
|
||||
}
|
||||
@@ -8,10 +8,13 @@ import (
|
||||
|
||||
"google.golang.org/grpc"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/controlplane"
|
||||
"github.com/samcharles93/archie-core/internal/domain/access"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/events"
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/rpcidentity"
|
||||
"github.com/samcharles93/archie-core/internal/plugin"
|
||||
)
|
||||
|
||||
@@ -66,6 +69,18 @@ func (b *server) startGatewayRuntime(ctx context.Context, actor gateway.ChatTask
|
||||
if err := b.curatorRuntime.Start(ctx); err != nil {
|
||||
b.log.Error("curator runtime startup", "err", err)
|
||||
}
|
||||
defs, version, err := b.controlPlane.Curators(ctx)
|
||||
if err == nil {
|
||||
err = b.applyCurators(ctx, defs)
|
||||
}
|
||||
b.applyStatus.Report(ctx, controlplane.CuratorsKind, version, err)
|
||||
if err != nil {
|
||||
b.log.Error("curator definitions apply failed", "err", err)
|
||||
}
|
||||
if err := b.watchCurators(ctx, version); err != nil {
|
||||
return nil, fmt.Errorf("watch curators: %w", err)
|
||||
}
|
||||
|
||||
return contract, nil
|
||||
}
|
||||
|
||||
@@ -85,14 +100,15 @@ const inboundMessageHeadroomBytes = 1 << 20
|
||||
// request carries a channel attachment's bytes: the channel frontend
|
||||
// downloads the file, and this process -- which runs the turn -- holds no
|
||||
// platform credential to fetch it again.
|
||||
func gatewayServerOpts(listen, token string) (opts []grpc.ServerOption, loopback bool, err error) {
|
||||
func gatewayServerOpts(listen, token string, principals access.PrincipalSource) (opts []grpc.ServerOption, loopback bool, err error) {
|
||||
callers := rpcidentity.Callers{Principals: principals}
|
||||
recv := grpc.MaxRecvMsgSize(messaging.MaxInboundAttachmentBytes + inboundMessageHeadroomBytes)
|
||||
loopback, err = gatewayrpc.TargetIsLoopback(listen)
|
||||
if err != nil {
|
||||
return nil, false, err
|
||||
}
|
||||
if loopback {
|
||||
return []grpc.ServerOption{recv}, true, nil
|
||||
return []grpc.ServerOption{recv, grpc.ChainUnaryInterceptor(callers.Unary()), grpc.ChainStreamInterceptor(callers.Stream())}, true, nil
|
||||
}
|
||||
if token == "" {
|
||||
return nil, false, fmt.Errorf(
|
||||
@@ -102,8 +118,8 @@ func gatewayServerOpts(listen, token string) (opts []grpc.ServerOption, loopback
|
||||
}
|
||||
return []grpc.ServerOption{
|
||||
recv,
|
||||
grpc.ChainUnaryInterceptor(gatewayrpc.UnaryServerInterceptor(token)),
|
||||
grpc.ChainStreamInterceptor(gatewayrpc.StreamServerInterceptor(token)),
|
||||
grpc.ChainUnaryInterceptor(gatewayrpc.UnaryServerInterceptor(token), callers.Unary()),
|
||||
grpc.ChainStreamInterceptor(gatewayrpc.StreamServerInterceptor(token), callers.Stream()),
|
||||
}, false, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -12,8 +12,10 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/buildinfo"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/agent"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/domain/taskactions"
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
"github.com/samcharles93/archie-core/internal/taskstate"
|
||||
"github.com/samcharles93/archie-core/internal/tools"
|
||||
)
|
||||
@@ -28,15 +30,15 @@ func (b *server) setupChatRuntime(ctx context.Context, cfg config.Config, actor
|
||||
// non-command message processing.
|
||||
providers := executionProviders(cfg)
|
||||
b.setLLM(modelloop.NewRuntime(providers, cfg.ModelLimits))
|
||||
// Transcription is a model-role capability, like the chat models it sits
|
||||
// Transcription is a model-alias capability, like the chat models it sits
|
||||
// beside: it is built here, on the model-owning side, from this process's
|
||||
// own [models]/[providers]. The Messaging Service carries a voice note's
|
||||
// bytes to the Gateway and never holds the credential.
|
||||
b.setupTranscriber(cfg, b.log)
|
||||
b.toolReg = tools.NewRegistry()
|
||||
chatModels := newChatModelManager(cfg.Models, cfg.Chat.Models)
|
||||
catalog, catalogModels := b.catalogState()
|
||||
chatModels.SetModelCatalog(catalog, catalogModels)
|
||||
chatModels := newChatModelManager(cfg.Models)
|
||||
catalog := b.catalogState()
|
||||
chatModels.SetModelCatalog(catalog)
|
||||
b.chatModels = chatModels
|
||||
|
||||
// ── Persona registry ─────────────────────────────────────────────
|
||||
@@ -72,6 +74,14 @@ func (b *server) setupChatRuntime(ctx context.Context, cfg config.Config, actor
|
||||
// later carries both: the recorder is written by sendChatTurn, the source
|
||||
// is read by /status.
|
||||
b.providerOutcomes = newProviderOutcomeRecorder()
|
||||
b.usage = &usageSink{models: b.chatModels, log: b.log}
|
||||
if b.stateStore != nil {
|
||||
b.usage.store = b.stateStore
|
||||
b.chatModels.orgAliases = func(ctx context.Context) (map[string]string, error) {
|
||||
_, aliases, err := b.stateStore.CallerModels(ctx)
|
||||
return aliases, err
|
||||
}
|
||||
}
|
||||
b.statusHealth = newStatusHealth(b)
|
||||
|
||||
b.setupChatTasks(cfg)
|
||||
@@ -86,7 +96,7 @@ func (b *server) setupChatRuntime(ctx context.Context, cfg config.Config, actor
|
||||
},
|
||||
cancelExecution: b.stateStore.CancelExecution,
|
||||
})
|
||||
b.updateService = makeUpdateService(chatSetup{Cfg: config.NewHolder(cfg)})
|
||||
b.updateService = makeUpdateService(b.controlPlane, cfg)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -115,7 +125,7 @@ func watchStatus[T any](
|
||||
open func(ctx context.Context, after int64) (<-chan T, error),
|
||||
versionOf func(T) int64,
|
||||
errOf func(T) error,
|
||||
deliver func(T),
|
||||
deliver func(T) error,
|
||||
) {
|
||||
var lastApplyErr, streamErr error
|
||||
watchOpen := func(ctx context.Context, after int64) (<-chan T, error) {
|
||||
@@ -140,7 +150,8 @@ func watchStatus[T any](
|
||||
log.Error("control-plane watch failed", "kind", kind, "err", err)
|
||||
return
|
||||
}
|
||||
deliver(update)
|
||||
lastApplyErr = deliver(update)
|
||||
report(ctx, kind, versionOf(update), lastApplyErr)
|
||||
},
|
||||
func() {
|
||||
// A refusal already on the record outranks the outage; it is the
|
||||
@@ -171,9 +182,9 @@ func (b *server) watchPersonas(ctx context.Context, version int64) error {
|
||||
b.controlPlane.WatchPersonas,
|
||||
func(update controlplane.AppliedPersonas) int64 { return update.Version },
|
||||
func(update controlplane.AppliedPersonas) error { return update.Err },
|
||||
func(update controlplane.AppliedPersonas) {
|
||||
func(update controlplane.AppliedPersonas) error {
|
||||
b.applyPersonas(update.Collection, update.Version)
|
||||
b.applyStatus.Report(ctx, controlplane.PersonasKind, update.Version, nil)
|
||||
return nil
|
||||
})
|
||||
return nil
|
||||
}
|
||||
@@ -200,9 +211,9 @@ func (b *server) watchSoul(ctx context.Context, version int64) error {
|
||||
b.controlPlane.WatchSoul,
|
||||
func(update controlplane.AppliedSoul) int64 { return update.Version },
|
||||
func(update controlplane.AppliedSoul) error { return update.Err },
|
||||
func(update controlplane.AppliedSoul) {
|
||||
func(update controlplane.AppliedSoul) error {
|
||||
b.applySoul(update.Soul, update.Version)
|
||||
b.applyStatus.Report(ctx, controlplane.SoulKind, update.Version, nil)
|
||||
return nil
|
||||
})
|
||||
return nil
|
||||
}
|
||||
@@ -220,6 +231,7 @@ func (b *server) setupGatewayChat(ctx context.Context, actor gateway.ChatTaskAct
|
||||
}
|
||||
cfg := b.cfg
|
||||
router := gateway.NewRouter(b.stateStore, nil, "web")
|
||||
router.Settings = messaging.NewSettingsCommand(controlplanerpc.NewSettingsClient(b.stateStore.ControlPlane())).WithIdentities(b.stateStore)
|
||||
router.Limiter = b.rateLimiter
|
||||
router.Version = fmt.Sprintf("Archie\nGateway: %s\nRuntime: %s", buildinfo.Version, buildinfo.Runtime)
|
||||
router.Models = b.chatModels
|
||||
@@ -237,7 +249,7 @@ func (b *server) setupGatewayChat(ctx context.Context, actor gateway.ChatTaskAct
|
||||
LLM: b.chatLLM, ChatModels: b.chatModels, ToolReg: b.toolReg,
|
||||
Soul: b.soul, ChatTasks: b.chatTasks,
|
||||
ChatTaskLister: chatTaskListerAdapter{tasks: b.stateStore.Tasks},
|
||||
ChatTaskLogs: chatTaskLogReaderAdapter{tasks: b.stateStore.TaskByID, taskLogs: b.taskLogs},
|
||||
ChatTaskLogs: chatTaskLogReaderAdapter{tasks: b.stateStore.TaskByID, taskLogs: b.stateStore},
|
||||
ChatTaskActor: actor,
|
||||
DefaultChatIdentity: b.defaultChatIdentity,
|
||||
Bus: b.bus, Log: b.log,
|
||||
@@ -249,6 +261,7 @@ func (b *server) setupGatewayChat(ctx context.Context, actor gateway.ChatTaskAct
|
||||
// The Gateway executes the web chat's turns, so it is the process
|
||||
// that must record their outcomes for /status.
|
||||
ProviderOutcomes: b.providerOutcomes,
|
||||
Usage: b.usage,
|
||||
}
|
||||
router.LLM, router.LLMStream = makeChatLLMResponder(ctx, "web", setup, b.chatSessionStore, router)
|
||||
router.Titles = newChatTitleGenerator(setup)
|
||||
@@ -256,5 +269,6 @@ func (b *server) setupGatewayChat(ctx context.Context, actor gateway.ChatTaskAct
|
||||
return &gateway.LocalChatAdapter{
|
||||
Router: router, Sessions: b.chatSessionStore, Turns: gateway.NewTurns(b.log),
|
||||
Models: b.chatModels, Personas: b.personas, TaskActor: actor, Tasks: b.stateStore,
|
||||
VoiceAvailable: b.transcriber != nil,
|
||||
}, nil
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"reflect"
|
||||
"slices"
|
||||
"strings"
|
||||
@@ -135,11 +136,7 @@ func (b *server) disconnectAbsentMCPServers(ctx context.Context, desired map[str
|
||||
// applyDesiredMCPServers connects, reconnects or restarts the servers the
|
||||
// stored document names, skipping the ones already running unchanged.
|
||||
func (b *server) applyDesiredMCPServers(ctx context.Context, desired map[string]config.MCPServer, state mcpRegistryState) []error {
|
||||
names := make([]string, 0, len(desired))
|
||||
for name := range desired {
|
||||
names = append(names, name)
|
||||
}
|
||||
slices.Sort(names)
|
||||
names := slices.Sorted(maps.Keys(desired))
|
||||
|
||||
var problems []error
|
||||
for _, name := range names {
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"github.com/samcharles93/ai-sdk/core"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/agentexec/modelloop"
|
||||
"github.com/samcharles93/archie-core/internal/domain/usage"
|
||||
"github.com/samcharles93/archie-core/internal/tools/mcp"
|
||||
)
|
||||
|
||||
@@ -48,6 +49,7 @@ func (b *server) mcpSamplingHandler() mcp.SamplingHandler {
|
||||
// recorded for /status like every other one; a nil recorder records
|
||||
// nothing.
|
||||
b.providerOutcomes.record(model, err)
|
||||
b.usage.record(ctx, usage.SourceChat, model, result.TotalUsage)
|
||||
if err != nil {
|
||||
return mcp.SamplingResult{}, fmt.Errorf("mcp sampling: %w", err)
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/applystatus"
|
||||
"github.com/samcharles93/archie-core/internal/domain/curator"
|
||||
"github.com/samcharles93/archie-core/internal/domain/health"
|
||||
domainmemory "github.com/samcharles93/archie-core/internal/domain/memory"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/domain/presence"
|
||||
@@ -28,6 +29,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/modelcatalog"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/readiness"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/secretengine"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/staterpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/taskactions"
|
||||
@@ -61,9 +63,9 @@ type server struct {
|
||||
cfgHolder *config.Holder
|
||||
cfgPath string
|
||||
log *slog.Logger
|
||||
taskLogs *logging.TaskRegistry
|
||||
|
||||
secrets *secret.Registry
|
||||
engines *secretengine.Runner
|
||||
stateStore *staterpc.Client
|
||||
controlPlane *controlplane.Client
|
||||
applyStatus *applystatus.Reporter
|
||||
@@ -71,6 +73,7 @@ type server struct {
|
||||
catalog *modelcatalog.Catalog
|
||||
chatPool *pgxpool.Pool
|
||||
chatSessionStore gateway.SessionStore
|
||||
logFeed *logging.Feed
|
||||
taskActionsConn *natsio.Conn
|
||||
|
||||
bus *events.Bus
|
||||
@@ -89,6 +92,7 @@ type server struct {
|
||||
curatorRegistry *curator.Registry
|
||||
curatorRuntime *curator.Runtime
|
||||
providerOutcomes *providerOutcomeRecorder
|
||||
usage *usageSink
|
||||
statusHealth gateway.HealthSource
|
||||
updateService *releaseupdate.Service
|
||||
|
||||
@@ -131,7 +135,7 @@ func Run(ctx context.Context, options Options) error {
|
||||
token = b.cfg.Services.ResolvedToken(config.ServiceNameGateway, b.secrets.Getenv)
|
||||
}
|
||||
//nolint:contextcheck // grpc.StreamServerInterceptor has no context.Context parameter; gatewayrpc.StreamServerInterceptor derives its context from stream.Context() instead
|
||||
opts, loopback, err := gatewayServerOpts(listen, token)
|
||||
opts, loopback, err := gatewayServerOpts(listen, token, b.stateStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -164,7 +168,7 @@ func (b *server) loadConfig(cfgPath, overlayPath string) error {
|
||||
b.catalog = modelcatalog.NewCatalog(cfgPath)
|
||||
b.cfgHolder = config.NewHolder(b.cfg)
|
||||
logs := servicekit.Logging(b.cfg, "gateway")
|
||||
b.log, b.taskLogs = logs.Log, logs.TaskLogs
|
||||
b.log, b.logFeed = logs.Log, logs.Feed
|
||||
b.addCleanup(func() { _ = logs.Closer.Close() })
|
||||
b.secrets = secret.NewRegistry()
|
||||
return nil
|
||||
@@ -191,7 +195,8 @@ func (b *server) openState(ctx context.Context) error {
|
||||
report := func(ctx context.Context, version int64, err error) {
|
||||
b.applyStatus.Report(ctx, controlplanerpc.ExtensionSettingsKind, version, err)
|
||||
}
|
||||
b.addCleanup(secretengine.Supervise(ctx, b.secrets, source, applystatus.Gateway, report, b.log).Close)
|
||||
b.engines = secretengine.Supervise(ctx, b.secrets, source, applystatus.Gateway, report, b.log)
|
||||
b.addCleanup(b.engines.Close)
|
||||
cfg, versions, err := b.runtimeConfig(ctx, b.cfg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("load runtime settings: %w", err)
|
||||
@@ -199,7 +204,7 @@ func (b *server) openState(ctx context.Context) error {
|
||||
b.cfg, b.runtimeVersions = cfg, versions
|
||||
b.cfgHolder.Set(cfg)
|
||||
go b.applyStatus.Run(ctx)
|
||||
go presence.Run(ctx, presence.Gateway, servicekit.Build(), client, nil, b.log)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -230,6 +235,16 @@ func (b *server) connectNATS(ctx context.Context) (*natsio.Conn, error) {
|
||||
}
|
||||
b.addCleanup(nc.Close)
|
||||
b.taskActionsConn = nc
|
||||
registry := health.NewRegistry(
|
||||
readiness.NewContractProbe("state_store", b.cfg.Health.DependencyTimeout.Std(), func(ctx context.Context) error { _, err := b.stateStore.StatusCounts(ctx); return err }),
|
||||
readiness.NewContractProbe("nats", b.cfg.Health.DependencyTimeout.Std(), func(context.Context) error {
|
||||
if !nc.IsConnected() {
|
||||
return fmt.Errorf("broker disconnected")
|
||||
}
|
||||
return nil
|
||||
}),
|
||||
)
|
||||
go presence.Run(ctx, presence.Gateway, servicekit.Build(), b.stateStore, registry, b.log)
|
||||
return nc, nil
|
||||
}
|
||||
|
||||
@@ -246,7 +261,7 @@ func (b *server) waitForNATSEndpoint(ctx context.Context) (servicekit.NATSEndpoi
|
||||
}
|
||||
}
|
||||
|
||||
func (b *server) catalogState() (modelcatalog.Snapshot, []string) { return b.catalog.State() }
|
||||
func (b *server) catalogState() modelcatalog.Snapshot { return b.catalog.State() }
|
||||
|
||||
// loadCatalog layers the model catalog under the running config. A catalog
|
||||
// that cannot be read leaves the configured providers and models in effect.
|
||||
@@ -256,9 +271,9 @@ func (b *server) loadCatalog(ctx context.Context) {
|
||||
b.log.Warn("model catalog unavailable; using configured providers and models", "err", err)
|
||||
return
|
||||
}
|
||||
models := modelcatalog.Apply(&b.cfg, snapshot)
|
||||
modelcatalog.Apply(&b.cfg, snapshot)
|
||||
b.cfgHolder.Set(b.cfg.Clone())
|
||||
b.catalog.Set(snapshot, models)
|
||||
b.catalog.Set(snapshot)
|
||||
}
|
||||
|
||||
func (b *server) startModelCatalogRefresh(ctx context.Context) {
|
||||
@@ -269,8 +284,8 @@ func (b *server) startModelCatalogRefresh(ctx context.Context) {
|
||||
return
|
||||
}
|
||||
base := b.cfgHolder.Get().Clone()
|
||||
models := modelcatalog.Apply(&base, snapshot)
|
||||
b.catalog.Set(snapshot, models)
|
||||
modelcatalog.Apply(&base, snapshot)
|
||||
b.catalog.Set(snapshot)
|
||||
if err := b.relayer(ctx, base, ""); err != nil {
|
||||
b.log.Warn("model catalog refresh rejected with the settings; the running settings stay", "err", err)
|
||||
}
|
||||
@@ -281,11 +296,19 @@ func (b *server) startModelCatalogRefresh(ctx context.Context) {
|
||||
// chat runtime and tool providers are built from.
|
||||
var gatewayRuntimeKinds = []string{
|
||||
controlplane.ProviderSettingsKind,
|
||||
controlplane.ModelRoleAssignmentsKind,
|
||||
controlplane.ModelAliasesKind,
|
||||
controlplane.ToolSettingsKind,
|
||||
}
|
||||
|
||||
func (b *server) startRuntimeWatches(ctx context.Context) error {
|
||||
// An engine that starts after boot answers references that failed then, so
|
||||
// the providers resolve again.
|
||||
b.engines.OnChange(func() {
|
||||
base := b.cfgHolder.Get()
|
||||
catalog := b.catalogState()
|
||||
modelcatalog.Apply(&base, catalog)
|
||||
_ = b.relayer(ctx, base, controlplane.ProviderSettingsKind)
|
||||
})
|
||||
for _, kind := range gatewayRuntimeKinds {
|
||||
updates, err := b.controlPlane.WatchResource(ctx, kind, b.runtimeVersions[kind])
|
||||
if err != nil {
|
||||
@@ -320,7 +343,7 @@ func (b *server) startRuntimeWatches(ctx context.Context) error {
|
||||
return
|
||||
}
|
||||
base := b.cfgHolder.Get()
|
||||
catalog, _ := b.catalogState()
|
||||
catalog := b.catalogState()
|
||||
modelcatalog.Apply(&base, catalog)
|
||||
lastApplyErr = b.relayer(ctx, base, kind)
|
||||
},
|
||||
|
||||
@@ -40,10 +40,18 @@ func (b *server) refreshSkills(ctx context.Context, applied *string) {
|
||||
cfg, log := b.cfg, b.log
|
||||
catalog, err := skill.CatalogRoots(skill.DefaultRoots(cfg.WorkDir, cfg.SkillsDir)...)
|
||||
if err != nil {
|
||||
b.applyStatus.Report(ctx, controlplane.SkillsKind, 0, err)
|
||||
log.Warn("skill catalog load failed", "err", err)
|
||||
return
|
||||
}
|
||||
catalog = append(catalog, b.storedSkills(ctx, catalog)...)
|
||||
stored, version, err := b.storedSkills(ctx, catalog)
|
||||
if err != nil {
|
||||
b.applyStatus.Report(ctx, controlplane.SkillsKind, version, err)
|
||||
return
|
||||
}
|
||||
var applyErr error
|
||||
defer func() { b.applyStatus.Report(ctx, controlplane.SkillsKind, version, applyErr) }()
|
||||
catalog = append(catalog, stored...)
|
||||
b.setSkillList(catalog)
|
||||
signature := catalogSignature(catalog)
|
||||
if signature == *applied {
|
||||
@@ -52,6 +60,7 @@ func (b *server) refreshSkills(ctx context.Context, applied *string) {
|
||||
b.toolReg.Unregister(skillActivateTool)
|
||||
if entry := skill.ActivateTool(cfg.WorkDir, catalog); entry != nil {
|
||||
if err := b.toolReg.Register(*entry); err != nil {
|
||||
applyErr = err
|
||||
log.Warn("skill_activate registration failed", "err", err)
|
||||
return
|
||||
}
|
||||
@@ -61,10 +70,10 @@ func (b *server) refreshSkills(ctx context.Context, applied *string) {
|
||||
}
|
||||
|
||||
// storedSkills reads the skills resource, leaving out any name already in
|
||||
// have. An unreadable resource contributes nothing this round.
|
||||
func (b *server) storedSkills(ctx context.Context, have []skill.CatalogEntry) []skill.CatalogEntry {
|
||||
// have. An unreadable resource leaves the running catalog in place.
|
||||
func (b *server) storedSkills(ctx context.Context, have []skill.CatalogEntry) ([]skill.CatalogEntry, int64, error) {
|
||||
var out []skill.CatalogEntry
|
||||
_, _, err := b.controlPlane.Query(ctx, controlplane.SkillsKind, func(value []byte) error {
|
||||
version, _, err := b.controlPlane.Query(ctx, controlplane.SkillsKind, func(value []byte) error {
|
||||
var collection controlplane.SkillCollection
|
||||
if err := json.Unmarshal(value, &collection); err != nil {
|
||||
return err
|
||||
@@ -72,8 +81,7 @@ func (b *server) storedSkills(ctx context.Context, have []skill.CatalogEntry) []
|
||||
for _, held := range collection.Skills {
|
||||
entry, err := skill.EntryFromContent([]byte(held.Content))
|
||||
if err != nil {
|
||||
b.log.Warn("stored skill skipped", "skill", held.Name, "err", err)
|
||||
continue
|
||||
return err
|
||||
}
|
||||
if !slices.ContainsFunc(have, func(e skill.CatalogEntry) bool { return e.Name == entry.Name }) {
|
||||
out = append(out, entry)
|
||||
@@ -84,7 +92,7 @@ func (b *server) storedSkills(ctx context.Context, have []skill.CatalogEntry) []
|
||||
if err != nil {
|
||||
b.log.Warn("skills resource unavailable", "err", err)
|
||||
}
|
||||
return out
|
||||
return out, version, err
|
||||
}
|
||||
|
||||
func catalogSignature(catalog []skill.CatalogEntry) string {
|
||||
|
||||
@@ -8,11 +8,13 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/ai-sdk/provider/minimax"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/agentexec/modelloop"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/plugin"
|
||||
"github.com/samcharles93/archie-core/internal/tools/mcp"
|
||||
"github.com/samcharles93/archie-core/internal/tools/minimax"
|
||||
minimaxtool "github.com/samcharles93/archie-core/internal/tools/minimax"
|
||||
toolprovider "github.com/samcharles93/archie-core/internal/tools/provider"
|
||||
builtintoolprovider "github.com/samcharles93/archie-core/internal/tools/provider/builtin"
|
||||
mcptoolprovider "github.com/samcharles93/archie-core/internal/tools/provider/mcp"
|
||||
@@ -123,7 +125,13 @@ func (b *server) registerMinimaxTool(cfg config.Config, log *slog.Logger) {
|
||||
return
|
||||
}
|
||||
|
||||
entry := minimax.Tool(minimax.Config{Enabled: true, APIKey: apiKey, BaseURL: cfg.Tools.Minimax.BaseURL})
|
||||
provider, err := minimax.New(minimax.Config{APIKey: apiKey, BaseURL: cfg.Tools.Minimax.BaseURL})
|
||||
if err != nil {
|
||||
log.Warn("minimax video generation enabled but the provider could not be built; tool not registered", "err", err)
|
||||
return
|
||||
}
|
||||
|
||||
entry := minimaxtool.Tool(provider)
|
||||
if entry == nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package archiegateway
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log/slog"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/ai-sdk/chat"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/usage"
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
)
|
||||
|
||||
const usageWriteTimeout = 5 * time.Second
|
||||
|
||||
// usageSink records the gateway's model calls. The State Store bills each to
|
||||
// the org of the principal the call was made for. A nil sink records nothing.
|
||||
type usageSink struct {
|
||||
store usage.Recorder
|
||||
models gateway.ModelManager
|
||||
log *slog.Logger
|
||||
}
|
||||
|
||||
// record appends one call's usage. It never fails the call: the write is
|
||||
// detached from the caller's cancellation and a failure is only logged.
|
||||
func (u *usageSink) record(ctx context.Context, source usage.Source, ref string, used chat.Usage) {
|
||||
if u == nil || u.store == nil || ref == "" {
|
||||
return
|
||||
}
|
||||
alias := ""
|
||||
if u.models != nil && u.models.ActiveModel() == ref {
|
||||
alias = u.models.ActiveAlias()
|
||||
}
|
||||
record := usage.Record{
|
||||
Source: source, Alias: alias,
|
||||
InputTokens: int64(used.PromptTokens), OutputTokens: int64(used.CompletionTokens),
|
||||
CachedTokens: int64(used.CachedTokens), At: time.Now().UTC(),
|
||||
}.WithRef(ref)
|
||||
ctx, cancel := context.WithTimeout(context.WithoutCancel(ctx), usageWriteTimeout)
|
||||
defer cancel()
|
||||
if err := u.store.RecordUsage(ctx, record); err != nil && u.log != nil {
|
||||
u.log.Warn("record model usage failed", "source", source, "model", ref, "err", err)
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@ func channelDescriptors(instances []*channelInstance) []status.Descriptor {
|
||||
descriptors = append(descriptors, status.Descriptor{
|
||||
ID: instance.name,
|
||||
Name: instance.name,
|
||||
Configured: true,
|
||||
Configured: instance.current() != nil,
|
||||
// The capability comes from the same place the action does, so a
|
||||
// channel cannot declare reload support and then answer nothing.
|
||||
ReloadSupported: reloadable(instance),
|
||||
@@ -35,7 +35,14 @@ func channelDescriptors(instances []*channelInstance) []status.Descriptor {
|
||||
// a reload performs; deriving them separately is how a dashboard ends up offering
|
||||
// a button that reports success and changes nothing.
|
||||
func reloadable(instance *channelInstance) bool {
|
||||
gateway, ok := instance.current().(*telegram.Gateway)
|
||||
return channelReloadable(instance.current())
|
||||
}
|
||||
|
||||
// channelReloadable reports whether a built channel can re-read its
|
||||
// configuration in place. A disabled channel (nil) cannot, which is what a
|
||||
// channel that enablement turned off should declare.
|
||||
func channelReloadable(ch channels.Channel) bool {
|
||||
gateway, ok := ch.(*telegram.Gateway)
|
||||
return ok && gateway.Reload != nil
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/messagingrpc"
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
"github.com/samcharles93/archie-core/internal/sdnotify"
|
||||
"github.com/samcharles93/archie-core/internal/secret"
|
||||
)
|
||||
@@ -43,6 +44,9 @@ type deps struct {
|
||||
// SettingsSource enables live channel-settings reconciliation. Nil disables
|
||||
// it.
|
||||
SettingsSource chatSettingsSource
|
||||
// Updates serves /update from the stored update settings. Nil without a
|
||||
// State Store.
|
||||
Updates *releaseupdate.Service
|
||||
// ApplyReporter records what this process applied. Nil reports nothing.
|
||||
ApplyReporter *applystatus.Reporter
|
||||
// AppliedVersion is the channel-settings version already running when the
|
||||
@@ -54,7 +58,7 @@ type deps struct {
|
||||
}
|
||||
|
||||
// channelInstance is one composed channel and what is needed to restart it.
|
||||
// mu guards channel and cancel.
|
||||
// mu guards every field below.
|
||||
type channelInstance struct {
|
||||
name string
|
||||
rebuild func(ResolvedConfig) (channels.Channel, error)
|
||||
@@ -64,6 +68,9 @@ type channelInstance struct {
|
||||
cancel context.CancelFunc
|
||||
supervised bool
|
||||
restartPending bool
|
||||
// notify wakes a supervisor that is between runs, so an explicit restart
|
||||
// starts the replacement instead of waiting out a backoff or a park.
|
||||
notify chan struct{}
|
||||
}
|
||||
|
||||
// current returns the channel instance currently serving, under the lock.
|
||||
@@ -104,6 +111,9 @@ type Service struct {
|
||||
appliedVersion atomic.Int64
|
||||
// reconcileInterval is how often the stored settings are re-read.
|
||||
reconcileInterval time.Duration
|
||||
// retry bounds how a supervisor retries a channel that fails on its own
|
||||
// before parking it for an explicit restart.
|
||||
retry channelRetryPolicy
|
||||
|
||||
mu sync.Mutex
|
||||
running bool
|
||||
@@ -131,6 +141,7 @@ func compose(ctx context.Context, d deps) (*Service, error) {
|
||||
if srv.reconcileInterval <= 0 {
|
||||
srv.reconcileInterval = applystatus.RestampInterval
|
||||
}
|
||||
srv.retry = defaultChannelRetry()
|
||||
|
||||
instances, err := composeChannels(ctx, d)
|
||||
if err != nil {
|
||||
@@ -149,13 +160,15 @@ func compose(ctx context.Context, d deps) (*Service, error) {
|
||||
// still restarted alone rather than through a process restart.
|
||||
func composeChannels(ctx context.Context, d deps) ([]*channelInstance, error) {
|
||||
instances := make([]*channelInstance, 0, 3)
|
||||
if d.Config.TelegramToken != "" {
|
||||
instance, err := composeTelegram(ctx, d)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
instances = append(instances, instance)
|
||||
// Telegram is composed whether or not it is enabled: a channel that
|
||||
// enablement can turn on has to exist for the supervisor to start. Its
|
||||
// channel is nil until a token is configured (composeTelegram). The other
|
||||
// channels are fixed by what the process can build at startup.
|
||||
telegramInstance, err := composeTelegram(ctx, d)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
instances = append(instances, telegramInstance)
|
||||
for _, instance := range d.ExtensionChannels {
|
||||
if slices.ContainsFunc(instances, func(have *channelInstance) bool { return have.name == instance.name }) {
|
||||
d.Log.Warn("channel extension skipped: a built-in channel has the same name", "channel", instance.name)
|
||||
@@ -163,18 +176,21 @@ func composeChannels(ctx context.Context, d deps) ([]*channelInstance, error) {
|
||||
}
|
||||
instances = append(instances, instance)
|
||||
}
|
||||
for _, instance := range instances {
|
||||
instance.notify = make(chan struct{}, 1)
|
||||
}
|
||||
return instances, nil
|
||||
}
|
||||
|
||||
func composeTelegram(ctx context.Context, d deps) (*channelInstance, error) {
|
||||
if len(d.Config.Telegram.AllowedUserIDs) == 0 {
|
||||
d.Log.Warn("chat.telegram has no allowed_user_ids: every sender will be rejected. " +
|
||||
"Add your Telegram user id to chat.telegram.allowed_user_ids to enable the bot.")
|
||||
}
|
||||
build := func(cfg ResolvedConfig) (channels.Channel, error) {
|
||||
if cfg.TelegramToken == "" {
|
||||
return nil, nil
|
||||
}
|
||||
if len(cfg.Telegram.AllowedUserIDs) == 0 {
|
||||
d.Log.Warn("chat.telegram has no allowed_user_ids: every sender will be rejected. " +
|
||||
"Add your Telegram user id to chat.telegram.allowed_user_ids to enable the bot.")
|
||||
}
|
||||
tg := telegram.New(cfg.TelegramToken, cfg.Telegram.AllowedUserIDs, d.Log)
|
||||
tg.Settings = d.Settings
|
||||
configureTelegram(ctx, tg, cfg, d)
|
||||
|
||||
@@ -0,0 +1,241 @@
|
||||
package archiemessaging
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"log/slog"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/channels"
|
||||
"github.com/samcharles93/archie-core/internal/channels/status"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/secret"
|
||||
)
|
||||
|
||||
// servingChannel reports itself running once it starts, which is what an
|
||||
// enable is reported active on: a channel that only reaches "starting" is not
|
||||
// serving yet.
|
||||
type servingChannel struct {
|
||||
mu sync.Mutex
|
||||
starts int
|
||||
}
|
||||
|
||||
func (c *servingChannel) Name() string { return "telegram" }
|
||||
|
||||
func (c *servingChannel) Start(ctx context.Context, _ messaging.ChatContract, lifecycle channels.Lifecycle) error {
|
||||
c.mu.Lock()
|
||||
c.starts++
|
||||
c.mu.Unlock()
|
||||
if lifecycle.Starting != nil {
|
||||
lifecycle.Starting()
|
||||
}
|
||||
if lifecycle.Running != nil {
|
||||
lifecycle.Running()
|
||||
}
|
||||
<-ctx.Done()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *servingChannel) Stop(context.Context) error { return nil }
|
||||
|
||||
func (c *servingChannel) ConfigSchema() json.RawMessage { return nil }
|
||||
|
||||
func (c *servingChannel) ValidateConfig(map[string]any) error { return nil }
|
||||
|
||||
func (c *servingChannel) count() int {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
return c.starts
|
||||
}
|
||||
|
||||
// waitCount blocks until count reaches want, so an async start is observed
|
||||
// rather than slept for.
|
||||
func waitCount(t *testing.T, count func() int, want int) {
|
||||
t.Helper()
|
||||
deadline := time.Now().Add(5 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
if count() >= want {
|
||||
return
|
||||
}
|
||||
time.Sleep(time.Millisecond)
|
||||
}
|
||||
t.Fatalf("channel started %d times, want at least %d", count(), want)
|
||||
}
|
||||
|
||||
// startEnablementService composes and starts a service with the Telegram
|
||||
// channel's factory replaced by a scripted channel, so enablement can be driven
|
||||
// without a real bot.
|
||||
func startEnablementService(t *testing.T, ch *servingChannel) *Service {
|
||||
t.Helper()
|
||||
srv, err := compose(context.Background(), deps{Log: slog.Default()})
|
||||
if err != nil {
|
||||
t.Fatalf("compose: %v", err)
|
||||
}
|
||||
inst := srv.instanceByID("telegram")
|
||||
if inst == nil {
|
||||
t.Fatal("telegram channel was not composed")
|
||||
}
|
||||
inst.rebuild = func(ResolvedConfig) (channels.Channel, error) { return ch, nil }
|
||||
srv.retry = channelRetryPolicy{attempts: 3, backoff: time.Millisecond, maxBackoff: time.Millisecond}
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer close(done)
|
||||
_ = srv.Start(ctx)
|
||||
}()
|
||||
t.Cleanup(func() {
|
||||
cancel()
|
||||
select {
|
||||
case <-done:
|
||||
case <-time.After(5 * time.Second):
|
||||
t.Error("service did not stop after cancel")
|
||||
}
|
||||
})
|
||||
waitSupervised(t, srv, "telegram")
|
||||
return srv
|
||||
}
|
||||
|
||||
// waitSupervised blocks until the channel's supervisor exists, so an enable
|
||||
// issued right after Start is not refused for racing it.
|
||||
func waitSupervised(t *testing.T, srv *Service, id string) {
|
||||
t.Helper()
|
||||
deadline := time.Now().Add(5 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
inst := srv.instanceByID(id)
|
||||
inst.mu.Lock()
|
||||
supervised := inst.supervised
|
||||
inst.mu.Unlock()
|
||||
if supervised {
|
||||
return
|
||||
}
|
||||
time.Sleep(time.Millisecond)
|
||||
}
|
||||
t.Fatalf("channel %q was never supervised", id)
|
||||
}
|
||||
|
||||
func channelByID(t *testing.T, srv *Service, id string) status.Status {
|
||||
t.Helper()
|
||||
for _, st := range srv.ChannelStatus() {
|
||||
if st.ID == id {
|
||||
return st
|
||||
}
|
||||
}
|
||||
t.Fatalf("no channel %q in status", id)
|
||||
return status.Status{}
|
||||
}
|
||||
|
||||
// TestChannelEnablementAppliesLive pins that enabling and disabling a channel
|
||||
// starts and stops it without a service restart, and that its declaration
|
||||
// follows: a channel that was never configured is not reported as configured,
|
||||
// and one that enablement stopped is reported stopped and unconfigured.
|
||||
func TestChannelEnablementAppliesLive(t *testing.T) {
|
||||
ch := &servingChannel{}
|
||||
srv := startEnablementService(t, ch)
|
||||
|
||||
if before := channelByID(t, srv, "telegram"); before.Configured || before.State != status.StateStopped {
|
||||
t.Fatalf("telegram before enable = %+v, want not configured and stopped", before)
|
||||
}
|
||||
|
||||
if err := srv.enableChannel("telegram", ResolvedConfig{TelegramToken: "token"}); err != nil {
|
||||
t.Fatalf("enable: %v", err)
|
||||
}
|
||||
waitCount(t, ch.count, 1)
|
||||
if enabled := channelByID(t, srv, "telegram"); !enabled.Configured || enabled.State != status.StateRunning {
|
||||
t.Fatalf("telegram after enable = %+v, want configured and running", enabled)
|
||||
}
|
||||
|
||||
if err := srv.disableChannel("telegram"); err != nil {
|
||||
t.Fatalf("disable: %v", err)
|
||||
}
|
||||
if disabled := channelByID(t, srv, "telegram"); disabled.Configured || disabled.State != status.StateStopped {
|
||||
t.Fatalf("telegram after disable = %+v, want not configured and stopped", disabled)
|
||||
}
|
||||
}
|
||||
|
||||
// fakeSettings serves a stored chat config at a version, the way the
|
||||
// control-plane client does.
|
||||
type fakeSettings struct {
|
||||
chat config.ChatConfig
|
||||
version int64
|
||||
}
|
||||
|
||||
func (f fakeSettings) RuntimeChatConfig(context.Context, config.ChatConfig) (config.ChatConfig, int64, error) {
|
||||
return f.chat, f.version, nil
|
||||
}
|
||||
|
||||
// fakeEngine resolves every key, so a stored token reference is resolvable.
|
||||
type fakeEngine struct{}
|
||||
|
||||
func (fakeEngine) Name() string { return "test" }
|
||||
func (fakeEngine) Resolve(key string) (string, error) { return "token-" + key, nil }
|
||||
|
||||
// TestReconcileOnceEnablesAndDisables drives the whole stored-settings path:
|
||||
// a settings version that configures a token enables the channel and is
|
||||
// recorded as applied only once the channel is running it; a later version
|
||||
// that clears the token disables it.
|
||||
func TestReconcileOnceEnablesAndDisables(t *testing.T) {
|
||||
ch := &servingChannel{}
|
||||
srv := startEnablementService(t, ch)
|
||||
srv.secrets = secret.NewRegistry()
|
||||
srv.secrets.Register(fakeEngine{})
|
||||
|
||||
srv.settingsSource = fakeSettings{
|
||||
chat: config.ChatConfig{Telegram: config.TelegramConfig{Token: secret.SecretRef{Engine: "test", Key: "bot"}}},
|
||||
version: 1,
|
||||
}
|
||||
if err := srv.reconcileOnce(context.Background()); err != nil {
|
||||
t.Fatalf("reconcile enable: %v", err)
|
||||
}
|
||||
waitCount(t, ch.count, 1)
|
||||
if got := channelByID(t, srv, "telegram"); !got.Configured {
|
||||
t.Fatalf("telegram not enabled by reconcile: %+v", got)
|
||||
}
|
||||
if srv.appliedVersion.Load() != 1 {
|
||||
t.Fatalf("appliedVersion = %d after enable, want 1", srv.appliedVersion.Load())
|
||||
}
|
||||
|
||||
srv.settingsSource = fakeSettings{version: 2}
|
||||
if err := srv.reconcileOnce(context.Background()); err != nil {
|
||||
t.Fatalf("reconcile disable: %v", err)
|
||||
}
|
||||
if got := channelByID(t, srv, "telegram"); got.Configured || got.State != status.StateStopped {
|
||||
t.Fatalf("telegram not disabled by reconcile: %+v", got)
|
||||
}
|
||||
if srv.appliedVersion.Load() != 2 {
|
||||
t.Fatalf("appliedVersion = %d after disable, want 2", srv.appliedVersion.Load())
|
||||
}
|
||||
}
|
||||
|
||||
// TestApplyChannelSettingsEnablesAndDisables pins the reconcile entry point:
|
||||
// a settings change that turns a channel on or off starts or stops it and
|
||||
// reports applied, and a tick that changes nothing is a no-op.
|
||||
func TestApplyChannelSettingsEnablesAndDisables(t *testing.T) {
|
||||
ch := &servingChannel{}
|
||||
srv := startEnablementService(t, ch)
|
||||
|
||||
applied, err := srv.applyChannelSettings(ResolvedConfig{TelegramToken: "token"})
|
||||
if err != nil || !applied {
|
||||
t.Fatalf("enable: applied=%v err=%v", applied, err)
|
||||
}
|
||||
waitCount(t, ch.count, 1)
|
||||
if got := channelByID(t, srv, "telegram"); !got.Configured || got.State == status.StateStopped {
|
||||
t.Fatalf("telegram not enabled: %+v", got)
|
||||
}
|
||||
|
||||
applied, err = srv.applyChannelSettings(ResolvedConfig{})
|
||||
if err != nil || !applied {
|
||||
t.Fatalf("disable: applied=%v err=%v", applied, err)
|
||||
}
|
||||
if got := channelByID(t, srv, "telegram"); got.Configured || got.State != status.StateStopped {
|
||||
t.Fatalf("telegram not disabled: %+v", got)
|
||||
}
|
||||
|
||||
applied, err = srv.applyChannelSettings(ResolvedConfig{})
|
||||
if err != nil || !applied {
|
||||
t.Fatalf("no-op tick: applied=%v err=%v", applied, err)
|
||||
}
|
||||
}
|
||||
@@ -85,30 +85,32 @@ func resolveChatSecrets(base ResolvedConfig, layered config.ChatConfig, secrets
|
||||
return next, nil
|
||||
}
|
||||
|
||||
// applyChannelSettings restarts only channels whose transport settings
|
||||
// changed and reports whether every restart succeeded. Enabling or
|
||||
// disabling a channel or changing a listen address needs a process restart.
|
||||
// applyChannelSettings applies the changed channel settings: channels whose
|
||||
// enablement changed are started or stopped, channels whose transport settings
|
||||
// changed are restarted, and the report is success only once every change is in
|
||||
// effect.
|
||||
func (s *Service) applyChannelSettings(next ResolvedConfig) (bool, error) {
|
||||
current := s.currentConfig()
|
||||
effective, outstanding := pinProcessBindings(current, next)
|
||||
|
||||
if next.ShowToolCalls != current.ShowToolCalls {
|
||||
s.applyShowToolCalls(next.ShowToolCalls)
|
||||
}
|
||||
|
||||
applied := true
|
||||
for _, id := range channelChanges(current, effective) {
|
||||
if err := s.restartChannel(id, effective); err != nil {
|
||||
outstanding := s.applyChannelEnablement(current, next)
|
||||
if len(outstanding) > 0 {
|
||||
applied = false
|
||||
}
|
||||
for _, id := range channelChanges(current, next) {
|
||||
if err := s.restartChannel(id, next); err != nil {
|
||||
outstanding = append(outstanding, err.Error())
|
||||
applied = false
|
||||
}
|
||||
}
|
||||
// A failed restart leaves the running configuration in place, so the next
|
||||
// tick sees the same change and retries it. A change that was carried out
|
||||
// (including a binding change that was refused and reported) is recorded, so
|
||||
// it is not applied again on every tick.
|
||||
// A failed change leaves the running configuration in place, so the next
|
||||
// tick sees the same difference and retries it.
|
||||
if applied {
|
||||
s.setConfig(effective)
|
||||
s.setConfig(next)
|
||||
}
|
||||
if len(outstanding) == 0 {
|
||||
return applied, nil
|
||||
@@ -116,6 +118,24 @@ func (s *Service) applyChannelSettings(next ResolvedConfig) (bool, error) {
|
||||
return applied, errors.New(strings.Join(outstanding, "; "))
|
||||
}
|
||||
|
||||
// applyChannelEnablement starts or stops the channels whose enablement the
|
||||
// stored settings changed, and reports only once the requested state is in
|
||||
// effect. A channel whose enablement did not change is left alone.
|
||||
func (s *Service) applyChannelEnablement(current, next ResolvedConfig) []string {
|
||||
var outstanding []string
|
||||
switch {
|
||||
case current.TelegramToken != "" && next.TelegramToken == "":
|
||||
if err := s.disableChannel("telegram"); err != nil {
|
||||
outstanding = append(outstanding, err.Error())
|
||||
}
|
||||
case current.TelegramToken == "" && next.TelegramToken != "":
|
||||
if err := s.enableChannel("telegram", next); err != nil {
|
||||
outstanding = append(outstanding, err.Error())
|
||||
}
|
||||
}
|
||||
return outstanding
|
||||
}
|
||||
|
||||
// applyShowToolCalls updates the running Telegram gateways in place. Nothing
|
||||
// else consumes the setting, and it is read per reply, so it needs no restart.
|
||||
func (s *Service) applyShowToolCalls(show bool) {
|
||||
@@ -126,28 +146,14 @@ func (s *Service) applyShowToolCalls(show bool) {
|
||||
}
|
||||
}
|
||||
|
||||
// pinProcessBindings holds the values a running process cannot change in place:
|
||||
// the set of channels it composed.
|
||||
// The returned configuration keeps the running value for each, and the returned
|
||||
// problems name what the operator changed and when it takes effect.
|
||||
func pinProcessBindings(current, next ResolvedConfig) (ResolvedConfig, []string) {
|
||||
effective := next
|
||||
var problems []string
|
||||
|
||||
if (current.TelegramToken != "") != (next.TelegramToken != "") {
|
||||
problems = append(problems, "chat.telegram enabled/disabled; takes effect on restart")
|
||||
effective.Telegram, effective.TelegramToken = current.Telegram, current.TelegramToken
|
||||
}
|
||||
return effective, problems
|
||||
}
|
||||
|
||||
// channelChanges returns the composed channels whose transport settings differ
|
||||
// between the running and the effective configuration. A channel absent from
|
||||
// current (not composed) never appears, and an unchanged channel is not
|
||||
// restarted.
|
||||
// between the running and the next configuration while remaining enabled. A
|
||||
// channel absent from current (not composed) never appears, an unchanged
|
||||
// channel is not restarted, and an enable or disable is applied as enablement
|
||||
// rather than as a transport change.
|
||||
func channelChanges(current, next ResolvedConfig) []string {
|
||||
var changed []string
|
||||
if current.TelegramToken != "" &&
|
||||
if current.TelegramToken != "" && next.TelegramToken != "" &&
|
||||
(current.TelegramToken != next.TelegramToken || !slices.Equal(current.Telegram.AllowedUserIDs, next.Telegram.AllowedUserIDs)) {
|
||||
changed = append(changed, "telegram")
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net"
|
||||
"path/filepath"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
|
||||
@@ -20,6 +21,8 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/messagingrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/secretengine"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/staterpc"
|
||||
"github.com/samcharles93/archie-core/internal/logging"
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
"github.com/samcharles93/archie-core/internal/secret"
|
||||
)
|
||||
|
||||
@@ -27,6 +30,7 @@ import (
|
||||
func Run(ctx context.Context, o Options) error {
|
||||
log := slog.Default().With("service", "archie-messaging")
|
||||
|
||||
log, feed := servicekit.Diagnostics(log, presence.Messaging)
|
||||
cfg, err := Resolve(o, log)
|
||||
if err != nil {
|
||||
return fmt.Errorf("resolve messaging options: %w", err)
|
||||
@@ -52,6 +56,7 @@ func Run(ctx context.Context, o Options) error {
|
||||
var settingsSource chatSettingsSource
|
||||
var applyReporter *applystatus.Reporter
|
||||
var appliedVersion int64
|
||||
var updates *releaseupdate.Service
|
||||
var extensionChannels []*channelInstance
|
||||
if cfg.Options.StateStore.Target != "" {
|
||||
stateStore, closeClient, dialErr := staterpc.Dial(cfg.Options.StateStore.Target, presence.Messaging, cfg.Options.StateStore.Token, staterpc.WaitForPeer)
|
||||
@@ -78,9 +83,10 @@ func Run(ctx context.Context, o Options) error {
|
||||
return fmt.Errorf("resolve database telegram token: %w", settingsErr)
|
||||
}
|
||||
extensionChannels = openExtensionChannels(ctx, extensions, secrets, log)
|
||||
settings = messaging.NewSettingsCommand(messagingControlPlane{client: stateStore.ControlPlane()}).WithIdentities(stateStore)
|
||||
settings = messaging.NewSettingsCommand(controlplanerpc.NewSettingsClient(stateStore.ControlPlane())).WithIdentities(stateStore)
|
||||
channelStatusStore, presenceStore = stateStore, stateStore
|
||||
settingsSource, applyReporter, appliedVersion = controlPlaneClient, reporter, channelVersion
|
||||
updates = controlplanerpc.UpdateService(controlPlaneClient, filepath.Join(cfg.WorkDir, "telegram-update-deferrals.json"), cfg.HealthURL)
|
||||
}
|
||||
|
||||
if cfg.Options.StateStore.Target == "" {
|
||||
@@ -101,15 +107,16 @@ func Run(ctx context.Context, o Options) error {
|
||||
SettingsSource: settingsSource,
|
||||
ApplyReporter: applyReporter,
|
||||
AppliedVersion: appliedVersion,
|
||||
Updates: updates,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return serve(ctx, cfg.Options, srv, log)
|
||||
return serve(ctx, cfg.Options, srv, log, feed)
|
||||
}
|
||||
|
||||
// serve runs srv and serves MessagingService over it until ctx is cancelled.
|
||||
func serve(ctx context.Context, o Options, srv *Service, log *slog.Logger) error {
|
||||
func serve(ctx context.Context, o Options, srv *Service, log *slog.Logger, feed *logging.Feed) error {
|
||||
opts, err := messagingrpc.ServerOptions(o.Listen, o.Token)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -119,7 +126,7 @@ func serve(ctx context.Context, o Options, srv *Service, log *slog.Logger) error
|
||||
return fmt.Errorf("listen messaging (%s): %w", o.Listen, err)
|
||||
}
|
||||
server := grpc.NewServer(opts...)
|
||||
messagingrpc.RegisterServer(server, srv)
|
||||
messagingrpc.RegisterServer(server, srv, feed)
|
||||
go func() {
|
||||
if err := server.Serve(listener); err != nil {
|
||||
log.Error("messaging gRPC server stopped", "err", err)
|
||||
|
||||
@@ -4,27 +4,46 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/channels"
|
||||
"github.com/samcharles93/archie-core/internal/channels/status"
|
||||
)
|
||||
|
||||
// runChannel runs one channel and starts its replacement after a requested
|
||||
// restart. A channel that exits on its own is not restarted.
|
||||
// runChannel supervises one channel for the service's lifetime. It starts the
|
||||
// channel and, when the run ends, decides what happens next: a requested
|
||||
// restart starts the replacement, a run that failed is retried with bounded
|
||||
// backoff, and a channel that keeps failing is parked until an explicit
|
||||
// restart. Only shutdown ends the supervisor, so a channel that stops is never
|
||||
// left without one to start it again.
|
||||
func (s *Service) runChannel(ctx context.Context, c *channelInstance) {
|
||||
defer s.wg.Done()
|
||||
defer c.supervisorExits()
|
||||
attempts := 0
|
||||
for {
|
||||
c.mu.Lock()
|
||||
ch := c.channel
|
||||
if ch == nil {
|
||||
// Disabled: there is no channel to run until an enable builds one.
|
||||
c.mu.Unlock()
|
||||
s.status.MarkStopped(c.name, "")
|
||||
if s.awaitChannel(ctx, c, 0) == channelShutdown {
|
||||
return
|
||||
}
|
||||
attempts = 0
|
||||
continue
|
||||
}
|
||||
runCtx, cancel := context.WithCancel(ctx)
|
||||
c.cancel = cancel
|
||||
c.mu.Unlock()
|
||||
|
||||
s.log.Info("starting channel", "name", c.name)
|
||||
err := ch.Start(runCtx, s.chat, s.lifecycleFor(c.name))
|
||||
attempts++
|
||||
|
||||
// Decide the next state under the same lock a restart takes, so a
|
||||
// restart racing this exit is either seen here (restartPending) or
|
||||
// observed as a channel that is no longer supervised.
|
||||
// delivered to the wait below (notify).
|
||||
c.mu.Lock()
|
||||
c.cancel = nil
|
||||
shutdown := ctx.Err() != nil
|
||||
@@ -32,9 +51,6 @@ func (s *Service) runChannel(ctx context.Context, c *channelInstance) {
|
||||
if !shutdown && restart {
|
||||
c.restartPending = false
|
||||
}
|
||||
if shutdown || !restart {
|
||||
c.supervised = false
|
||||
}
|
||||
c.mu.Unlock()
|
||||
cancel()
|
||||
|
||||
@@ -43,32 +59,168 @@ func (s *Service) runChannel(ctx context.Context, c *channelInstance) {
|
||||
// idempotent tail for the paths that leave a listener behind.
|
||||
s.stopChannel(ctx, c.name, ch)
|
||||
|
||||
if shutdown {
|
||||
if err != nil && !errors.Is(err, context.Canceled) {
|
||||
s.status.MarkFailed(c.name, err.Error())
|
||||
} else {
|
||||
s.status.MarkStopped(c.name, "")
|
||||
}
|
||||
next, wait := s.afterChannelRun(c, err, shutdown, restart, attempts)
|
||||
if next == nextStop {
|
||||
return
|
||||
}
|
||||
if restart {
|
||||
// The replacement is already in c.channel (see restartChannel); the
|
||||
// next pass starts it.
|
||||
if next == nextReplaced {
|
||||
attempts = 0
|
||||
continue
|
||||
}
|
||||
// The channel stopped on its own.
|
||||
if err != nil {
|
||||
s.status.MarkFailed(c.name, err.Error())
|
||||
s.log.Error("channel stopped with error", "name", c.name, "err", err)
|
||||
} else {
|
||||
s.status.MarkStopped(c.name, "")
|
||||
if attempts, next = s.holdAfterRun(ctx, c, next, wait, attempts); next == nextStop {
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// restartChannel builds a replacement for channel id from next, then stops
|
||||
// the old one and starts it. A channel not running is not restarted.
|
||||
// channelNext is what a supervisor does after one channel run ended.
|
||||
type channelNext int
|
||||
|
||||
const (
|
||||
// nextStop: the service is stopping; the supervisor returns.
|
||||
nextStop channelNext = iota
|
||||
// nextReplaced: a replacement is already in the instance; run it now.
|
||||
nextReplaced
|
||||
// nextPark: hold, with no timer, until an explicit restart or shutdown.
|
||||
nextPark
|
||||
// nextRetry: wait the backoff, then run the same channel again.
|
||||
nextRetry
|
||||
)
|
||||
|
||||
// afterChannelRun records the ended run's state and decides what the supervisor
|
||||
// does next. shutdown is the service stopping; restart is an explicit
|
||||
// replacement already waiting in the instance.
|
||||
func (s *Service) afterChannelRun(c *channelInstance, err error, shutdown, restart bool, attempts int) (channelNext, time.Duration) {
|
||||
switch {
|
||||
case shutdown:
|
||||
if err != nil && !errors.Is(err, context.Canceled) {
|
||||
s.status.MarkFailed(c.name, err.Error())
|
||||
} else {
|
||||
s.status.MarkStopped(c.name, "")
|
||||
}
|
||||
return nextStop, 0
|
||||
case restart:
|
||||
return nextReplaced, 0
|
||||
case err == nil:
|
||||
// The channel stopped itself. Hold it stopped rather than spending the
|
||||
// failure retry budget on a run that chose to end.
|
||||
s.status.MarkStopped(c.name, "")
|
||||
s.log.Info("channel stopped", "name", c.name)
|
||||
return nextPark, 0
|
||||
case attempts >= s.retry.attempts:
|
||||
s.status.MarkFailed(c.name, err.Error())
|
||||
s.log.Error("channel failed repeatedly; parked until an explicit restart",
|
||||
"name", c.name, "attempts", attempts, "err", err)
|
||||
return nextPark, 0
|
||||
default:
|
||||
s.status.MarkFailed(c.name, err.Error())
|
||||
wait := s.retry.backoffFor(attempts)
|
||||
s.log.Warn("channel failed; restarting", "name", c.name,
|
||||
"attempt", attempts, "of", s.retry.attempts, "in", wait, "err", err)
|
||||
return nextRetry, wait
|
||||
}
|
||||
}
|
||||
|
||||
// holdAfterRun waits out a park or a retry backoff, and reports the attempt
|
||||
// count to carry into the next run and whether the supervisor keeps going. A
|
||||
// restart delivered during a backoff starts the replacement with a fresh
|
||||
// budget; a shutdown ends the supervisor.
|
||||
func (s *Service) holdAfterRun(ctx context.Context, c *channelInstance, next channelNext, wait time.Duration, attempts int) (int, channelNext) {
|
||||
if next == nextRetry {
|
||||
switch s.awaitChannel(ctx, c, wait) {
|
||||
case channelShutdown:
|
||||
return attempts, nextStop
|
||||
case channelRestart:
|
||||
return 0, nextReplaced
|
||||
default:
|
||||
return attempts, nextRetry
|
||||
}
|
||||
}
|
||||
if s.awaitChannel(ctx, c, 0) == channelShutdown {
|
||||
return attempts, nextStop
|
||||
}
|
||||
return 0, nextReplaced
|
||||
}
|
||||
|
||||
// channelRetry bounds how a supervisor retries a channel that fails on its own
|
||||
// before parking it for an explicit restart.
|
||||
type channelRetryPolicy struct {
|
||||
attempts int
|
||||
backoff time.Duration
|
||||
maxBackoff time.Duration
|
||||
}
|
||||
|
||||
// defaultChannelRetry is the retry policy a composed service uses.
|
||||
func defaultChannelRetry() channelRetryPolicy {
|
||||
return channelRetryPolicy{attempts: 5, backoff: time.Second, maxBackoff: 30 * time.Second}
|
||||
}
|
||||
|
||||
// backoffFor is the wait before attempt n (1-based): doubling from backoff,
|
||||
// capped at maxBackoff so a long outage does not become a long silence between
|
||||
// retries.
|
||||
func (r channelRetryPolicy) backoffFor(attempt int) time.Duration {
|
||||
backoff := r.backoff << (attempt - 1)
|
||||
if backoff <= 0 || backoff > r.maxBackoff {
|
||||
return r.maxBackoff
|
||||
}
|
||||
return backoff
|
||||
}
|
||||
|
||||
// channelWait is how a supervisor's wait between runs ended.
|
||||
type channelWait int
|
||||
|
||||
const (
|
||||
// channelRetry: the backoff elapsed; run the channel again.
|
||||
channelRetry channelWait = iota
|
||||
// channelRestart: an explicit restart arrived; start the replacement.
|
||||
channelRestart
|
||||
// channelShutdown: the service is stopping.
|
||||
channelShutdown
|
||||
)
|
||||
|
||||
// awaitChannel blocks until an explicit restart arrives, the service stops, or
|
||||
// the backoff elapses. A delay of zero waits with no timer: the parked state
|
||||
// after a channel stopped or gave up, which only a restart or shutdown ends.
|
||||
func (s *Service) awaitChannel(ctx context.Context, c *channelInstance, delay time.Duration) channelWait {
|
||||
if delay <= 0 {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return channelShutdown
|
||||
case <-c.notify:
|
||||
return channelRestart
|
||||
}
|
||||
}
|
||||
timer := time.NewTimer(delay)
|
||||
defer timer.Stop()
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return channelShutdown
|
||||
case <-c.notify:
|
||||
return channelRestart
|
||||
case <-timer.C:
|
||||
// A restart delivered as the timer fired is read here rather than
|
||||
// lost between the two branches.
|
||||
select {
|
||||
case <-c.notify:
|
||||
return channelRestart
|
||||
default:
|
||||
return channelRetry
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// supervisorExits records that a channel's supervisor is leaving, so a restart
|
||||
// after shutdown is refused rather than signalling a goroutine that is gone.
|
||||
func (c *channelInstance) supervisorExits() {
|
||||
c.mu.Lock()
|
||||
c.supervised = false
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// restartChannel builds a replacement for channel id from next and starts it in
|
||||
// place of the running one. A supervisor that is between runs -- backing off a
|
||||
// failure, or parked after giving up -- is woken to start the replacement; a
|
||||
// channel with no supervisor (never started, or shut down) is refused.
|
||||
func (s *Service) restartChannel(id string, next ResolvedConfig) error {
|
||||
c := s.instanceByID(id)
|
||||
if c == nil {
|
||||
@@ -84,21 +236,126 @@ func (s *Service) restartChannel(id string, next ResolvedConfig) error {
|
||||
if replacement == nil {
|
||||
return fmt.Errorf("channel %q has no configuration", id)
|
||||
}
|
||||
return s.setChannelState(c, replacement)
|
||||
}
|
||||
|
||||
// setChannelState swaps the channel a supervisor runs; a nil replacement stops
|
||||
// it. It returns once the supervisor has been told, not once the channel is up:
|
||||
// a caller that needs the observable state awaits it (awaitChannelActive).
|
||||
func (s *Service) setChannelState(c *channelInstance, replacement channels.Channel) error {
|
||||
c.mu.Lock()
|
||||
if !c.supervised {
|
||||
c.mu.Unlock()
|
||||
return fmt.Errorf("channel %q is not running", id)
|
||||
return fmt.Errorf("channel %q is not running", c.name)
|
||||
}
|
||||
c.channel = replacement
|
||||
c.restartPending = true
|
||||
cancel := c.cancel
|
||||
if cancel != nil {
|
||||
// A run is in flight. Cancelling its context ends Start, and the
|
||||
// supervisor sees restartPending and starts the replacement.
|
||||
c.restartPending = true
|
||||
} else {
|
||||
// The supervisor is between runs. Wake it so it starts the replacement
|
||||
// now, rather than waiting out its backoff or its park.
|
||||
c.restartPending = false
|
||||
}
|
||||
c.mu.Unlock()
|
||||
if cancel != nil {
|
||||
cancel()
|
||||
return nil
|
||||
}
|
||||
select {
|
||||
case c.notify <- struct{}{}:
|
||||
default:
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// enableChannel builds and starts a channel that a settings change turned on,
|
||||
// and reports only once it is no longer stopped.
|
||||
func (s *Service) enableChannel(id string, next ResolvedConfig) error {
|
||||
c := s.instanceByID(id)
|
||||
if c == nil {
|
||||
return fmt.Errorf("no channel %q", id)
|
||||
}
|
||||
if c.rebuild == nil {
|
||||
return fmt.Errorf("channel %q cannot be rebuilt", id)
|
||||
}
|
||||
replacement, err := c.rebuild(next)
|
||||
if err != nil {
|
||||
return fmt.Errorf("build %q: %w", id, err)
|
||||
}
|
||||
if replacement == nil {
|
||||
return fmt.Errorf("channel %q has no configuration", id)
|
||||
}
|
||||
if err := s.setChannelState(c, replacement); err != nil {
|
||||
return err
|
||||
}
|
||||
s.status.Declare(id, true, channelReloadable(replacement))
|
||||
s.signalPublish()
|
||||
return s.awaitChannelActive(id, true)
|
||||
}
|
||||
|
||||
// disableChannel stops a channel that a settings change turned off, and reports
|
||||
// only once it has stopped.
|
||||
func (s *Service) disableChannel(id string) error {
|
||||
c := s.instanceByID(id)
|
||||
if c == nil || c.current() == nil {
|
||||
return nil
|
||||
}
|
||||
if err := s.setChannelState(c, nil); err != nil {
|
||||
return err
|
||||
}
|
||||
s.status.Declare(id, false, false)
|
||||
s.signalPublish()
|
||||
return s.awaitChannelActive(id, false)
|
||||
}
|
||||
|
||||
// channelApplyTimeout bounds how long reconcile waits for an enable or disable
|
||||
// to take effect before reporting it unapplied, which leaves the next tick to
|
||||
// retry it.
|
||||
const channelApplyTimeout = 5 * time.Second
|
||||
|
||||
// channelApplyPoll is how often that wait re-reads the channel's state.
|
||||
const channelApplyPoll = 10 * time.Millisecond
|
||||
|
||||
// awaitChannelActive waits, up to channelApplyTimeout, for a channel to leave
|
||||
// or reach the stopped state, so an enable or disable is reported applied only
|
||||
// once the channel is actually running (or not) rather than merely queued. A
|
||||
// failed channel is never active: reporting it so would mark the settings
|
||||
// version applied and retire a failure the next tick must retry. Only a
|
||||
// serving state counts, and a failed enable fails fast instead of burning the
|
||||
// timeout while no restart can succeed without one.
|
||||
func (s *Service) awaitChannelActive(id string, active bool) error {
|
||||
deadline := time.Now().Add(channelApplyTimeout)
|
||||
for {
|
||||
for _, st := range s.status.Snapshot() {
|
||||
if st.ID != id {
|
||||
continue
|
||||
}
|
||||
if active && st.State == status.StateFailed {
|
||||
return fmt.Errorf("channel %q failed to start", id)
|
||||
}
|
||||
// Serving counts, impaired or not; anything else is still in
|
||||
// flight, except a stopped channel answering a disable.
|
||||
if st.State == status.StateRunning || st.State == status.StateDegraded {
|
||||
if active {
|
||||
return nil
|
||||
}
|
||||
} else if !active && st.State == status.StateStopped {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
if time.Now().After(deadline) {
|
||||
if active {
|
||||
return fmt.Errorf("channel %q did not start", id)
|
||||
}
|
||||
return fmt.Errorf("channel %q did not stop", id)
|
||||
}
|
||||
time.Sleep(channelApplyPoll)
|
||||
}
|
||||
}
|
||||
|
||||
// stopChannel closes one channel's listener with its own bounded context, so a
|
||||
// stop that hangs cannot hold the shutdown past the configured timeout. The
|
||||
// parent context is stripped of its cancellation because this runs on the
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
package archiemessaging
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"log/slog"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/channels"
|
||||
"github.com/samcharles93/archie-core/internal/channels/status"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
)
|
||||
|
||||
// fakeChannel is a channel whose runs a test scripts: it counts starts and
|
||||
// either fails immediately or blocks until its run context ends.
|
||||
type fakeChannel struct {
|
||||
mu sync.Mutex
|
||||
starts int
|
||||
runErr error
|
||||
}
|
||||
|
||||
func (f *fakeChannel) Name() string { return "fake" }
|
||||
|
||||
func (f *fakeChannel) Start(ctx context.Context, _ messaging.ChatContract, lifecycle channels.Lifecycle) error {
|
||||
f.mu.Lock()
|
||||
f.starts++
|
||||
f.mu.Unlock()
|
||||
if lifecycle.Starting != nil {
|
||||
lifecycle.Starting()
|
||||
}
|
||||
if f.runErr != nil {
|
||||
return f.runErr
|
||||
}
|
||||
<-ctx.Done()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (f *fakeChannel) Stop(context.Context) error { return nil }
|
||||
|
||||
func (f *fakeChannel) ConfigSchema() json.RawMessage { return nil }
|
||||
|
||||
func (f *fakeChannel) ValidateConfig(map[string]any) error { return nil }
|
||||
|
||||
func (f *fakeChannel) count() int {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
return f.starts
|
||||
}
|
||||
|
||||
// startService composes and starts a service over one scripted channel, with a
|
||||
// retry policy the test drives without waiting out real backoff.
|
||||
func startService(t *testing.T, ch *fakeChannel, retry channelRetryPolicy) *Service {
|
||||
t.Helper()
|
||||
inst := &channelInstance{
|
||||
name: "fake",
|
||||
channel: ch,
|
||||
rebuild: func(ResolvedConfig) (channels.Channel, error) { return ch, nil },
|
||||
}
|
||||
srv, err := compose(context.Background(), deps{Log: slog.Default(), ExtensionChannels: []*channelInstance{inst}})
|
||||
if err != nil {
|
||||
t.Fatalf("compose: %v", err)
|
||||
}
|
||||
srv.retry = retry
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer close(done)
|
||||
_ = srv.Start(ctx)
|
||||
}()
|
||||
t.Cleanup(func() {
|
||||
cancel()
|
||||
select {
|
||||
case <-done:
|
||||
case <-time.After(5 * time.Second):
|
||||
t.Error("service did not stop after cancel")
|
||||
}
|
||||
})
|
||||
return srv
|
||||
}
|
||||
|
||||
func waitStarts(t *testing.T, ch *fakeChannel, want int) {
|
||||
t.Helper()
|
||||
deadline := time.Now().Add(5 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
if ch.count() >= want {
|
||||
return
|
||||
}
|
||||
time.Sleep(time.Millisecond)
|
||||
}
|
||||
t.Fatalf("channel started %d times, want at least %d", ch.count(), want)
|
||||
}
|
||||
|
||||
// TestAwaitChannelActiveStates pins what counts as up: running and degraded
|
||||
// satisfy an enable, only stopped satisfies a disable, and a failed enable
|
||||
// fails fast instead of reporting success the next tick would never retry.
|
||||
func TestAwaitChannelActiveStates(t *testing.T) {
|
||||
mark := map[string]func(*status.Manager){
|
||||
"running": func(m *status.Manager) { m.MarkRunning("fake") },
|
||||
"degraded": func(m *status.Manager) { m.MarkDegraded("fake", "slow") },
|
||||
"failed": func(m *status.Manager) { m.MarkFailed("fake", "boom") },
|
||||
"starting": func(m *status.Manager) { m.MarkStarting("fake") },
|
||||
}
|
||||
// Refusals that wait out the 5s timeout (disable while failed or
|
||||
// running) are pre-existing behavior, unchanged here, and too slow to
|
||||
// pin; every case below answers at once.
|
||||
tests := []struct {
|
||||
name string
|
||||
state string
|
||||
active bool
|
||||
wantErr bool
|
||||
}{
|
||||
{name: "enable accepts running", state: "running", active: true},
|
||||
{name: "enable accepts degraded", state: "degraded", active: true},
|
||||
{name: "enable refuses failed", state: "failed", active: true, wantErr: true},
|
||||
{name: "disable accepts stopped", state: "", active: false},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
manager := status.NewManager([]status.Descriptor{{ID: "fake"}})
|
||||
if tt.state == "" {
|
||||
manager.MarkStopped("fake", "")
|
||||
} else {
|
||||
mark[tt.state](manager)
|
||||
}
|
||||
srv := &Service{status: manager}
|
||||
// Every case above answers at once: success and failed-enable
|
||||
// refusal never reach the timeout wait.
|
||||
done := make(chan error, 1)
|
||||
go func() { done <- srv.awaitChannelActive("fake", tt.active) }()
|
||||
select {
|
||||
case err := <-done:
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Fatalf("err = %v, wantErr %v", err, tt.wantErr)
|
||||
}
|
||||
case <-time.After(6 * time.Second):
|
||||
t.Fatal("await did not answer")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestChannelSupervisorRetriesAndRestarts pins that a channel that fails on its
|
||||
// own is retried with bounded backoff and, once the budget is spent, parked so
|
||||
// an explicit restart brings it back rather than being refused.
|
||||
func TestChannelSupervisorRetriesAndRestarts(t *testing.T) {
|
||||
ch := &fakeChannel{runErr: errors.New("transport down")}
|
||||
srv := startService(t, ch, channelRetryPolicy{attempts: 3, backoff: time.Millisecond, maxBackoff: time.Millisecond})
|
||||
|
||||
// The supervisor retries the failed run instead of abandoning the channel.
|
||||
waitStarts(t, ch, 3)
|
||||
|
||||
if err := srv.restartChannel("fake", ResolvedConfig{}); err != nil {
|
||||
t.Fatalf("restart after the retry budget was spent: %v", err)
|
||||
}
|
||||
waitStarts(t, ch, 4)
|
||||
}
|
||||
|
||||
// TestChannelSupervisorRestartReplacesRunningChannel pins the in-flight path: a
|
||||
// restart of a channel whose run is live cancels the run and starts the
|
||||
// replacement, with no backoff.
|
||||
func TestChannelSupervisorRestartReplacesRunningChannel(t *testing.T) {
|
||||
ch := &fakeChannel{} // blocks until its run context ends
|
||||
srv := startService(t, ch, channelRetryPolicy{attempts: 3, backoff: time.Hour, maxBackoff: time.Hour})
|
||||
|
||||
waitStarts(t, ch, 1)
|
||||
if err := srv.restartChannel("fake", ResolvedConfig{}); err != nil {
|
||||
t.Fatalf("restart running channel: %v", err)
|
||||
}
|
||||
waitStarts(t, ch, 2)
|
||||
}
|
||||
|
||||
// TestChannelRestartRefusedWithoutSupervisor pins that a channel with no
|
||||
// supervisor -- never started, or already shut down -- is refused rather than
|
||||
// signalling a goroutine that is gone.
|
||||
func TestChannelRestartRefusedWithoutSupervisor(t *testing.T) {
|
||||
ch := &fakeChannel{}
|
||||
inst := &channelInstance{
|
||||
name: "fake",
|
||||
channel: ch,
|
||||
rebuild: func(ResolvedConfig) (channels.Channel, error) { return ch, nil },
|
||||
}
|
||||
srv, err := compose(context.Background(), deps{Log: slog.Default(), ExtensionChannels: []*channelInstance{inst}})
|
||||
if err != nil {
|
||||
t.Fatalf("compose: %v", err)
|
||||
}
|
||||
if err := srv.restartChannel("fake", ResolvedConfig{}); err == nil {
|
||||
t.Fatal("restart before the service started should be refused")
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer close(done)
|
||||
_ = srv.Start(ctx)
|
||||
}()
|
||||
waitStarts(t, ch, 1)
|
||||
cancel()
|
||||
select {
|
||||
case <-done:
|
||||
case <-time.After(5 * time.Second):
|
||||
t.Fatal("service did not stop")
|
||||
}
|
||||
if err := srv.restartChannel("fake", ResolvedConfig{}); err == nil {
|
||||
t.Fatal("restart after shutdown should be refused")
|
||||
}
|
||||
}
|
||||
@@ -9,14 +9,11 @@ import (
|
||||
"time"
|
||||
|
||||
configtemplate "github.com/samcharles93/archie-core"
|
||||
"github.com/samcharles93/archie-core/internal/app/servicekit"
|
||||
"github.com/samcharles93/archie-core/internal/buildinfo"
|
||||
"github.com/samcharles93/archie-core/internal/channels/telegram"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/domain/presence"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/installtype"
|
||||
"github.com/samcharles93/archie-core/internal/releaseannounce"
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
"github.com/samcharles93/archie-core/internal/secret"
|
||||
)
|
||||
|
||||
@@ -26,10 +23,10 @@ func configureTelegram(ctx context.Context, g *telegram.Gateway, cfg ResolvedCon
|
||||
g.Version = gatewayVersionReporter(ctx, d.Chat, cfg.Options.DependencyTimeout)
|
||||
g.SetShowToolCalls(cfg.ShowToolCalls)
|
||||
g.Reload = telegramReloader(cfg.Options, d.Secrets, d.Log)
|
||||
g.RunningVersions = runningVersions(ctx, d.Presence, cfg.Options.DependencyTimeout)
|
||||
g.RunningVersions = servicekit.RunningVersions(ctx, d.Presence, cfg.Options.DependencyTimeout)
|
||||
|
||||
if updates := updateService(cfg); updates != nil {
|
||||
g.Updates = updates
|
||||
if d.Updates != nil {
|
||||
g.Updates = d.Updates
|
||||
}
|
||||
if cfg.WorkDir != "" {
|
||||
g.UpdateReportPath = identityStatePath(cfg.WorkDir, "update-report", cfg.BotUser)
|
||||
@@ -42,34 +39,6 @@ func configureTelegram(ctx context.Context, g *telegram.Gateway, cfg ResolvedCon
|
||||
}
|
||||
}
|
||||
|
||||
// runningVersions reports the daemon version archied's own presence record
|
||||
// carries, so an update report is checked against what archied compiled in
|
||||
// rather than this process's build. A down or unreachable daemon, or a
|
||||
// missing store, leaves the daemon unverified. The agent stays unverified:
|
||||
// only archied observes it.
|
||||
func runningVersions(ctx context.Context, store storecontract.PresenceStore, timeout time.Duration) func() map[string]string {
|
||||
return func() map[string]string {
|
||||
if store == nil {
|
||||
return nil
|
||||
}
|
||||
if timeout <= 0 {
|
||||
timeout = 5 * time.Second
|
||||
}
|
||||
callCtx, cancel := context.WithTimeout(ctx, timeout)
|
||||
defer cancel()
|
||||
records, err := store.ListPresence(callCtx)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
for _, service := range presence.Mesh(records, time.Now()) {
|
||||
if service.Service == presence.Daemon && service.State != presence.StateDown {
|
||||
return map[string]string{releaseupdate.ComponentDaemon: service.Version}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// gatewayVersionReporter renders /version from the Gateway's build info,
|
||||
// fetched per call with a timeout.
|
||||
func gatewayVersionReporter(ctx context.Context, chat messaging.ChatContract, timeout time.Duration) func() string {
|
||||
@@ -91,26 +60,6 @@ func gatewayVersionReporter(ctx context.Context, chat messaging.ChatContract, ti
|
||||
}
|
||||
}
|
||||
|
||||
// updateService builds /update from [chat.telegram] commands, or nil when
|
||||
// none are configured.
|
||||
func updateService(cfg ResolvedConfig) *releaseupdate.Service {
|
||||
if len(cfg.Telegram.UpdateCheckCommand) == 0 {
|
||||
return nil
|
||||
}
|
||||
updates := &releaseupdate.Service{
|
||||
Catalog: releaseupdate.CommandCatalog{Command: cfg.Telegram.UpdateCheckCommand},
|
||||
StatePath: filepath.Join(cfg.WorkDir, "telegram-update-deferrals.json"),
|
||||
InstallType: installtype.Type(),
|
||||
}
|
||||
if len(cfg.Telegram.UpdateInstallCommand) != 0 {
|
||||
updates.Installer = releaseupdate.CommandInstaller{
|
||||
Command: cfg.Telegram.UpdateInstallCommand,
|
||||
HealthURL: cfg.HealthURL,
|
||||
}
|
||||
}
|
||||
return updates
|
||||
}
|
||||
|
||||
// telegramReloader re-resolves the token and allowlist from this service's own
|
||||
// configuration on /restart. A reload that cannot produce a token is refused so
|
||||
// the running bot keeps the credential it is already authenticated with.
|
||||
|
||||
@@ -36,32 +36,21 @@ func Run(args []string, stderr io.Writer) int {
|
||||
return cmd(args[1:], stderr)
|
||||
}
|
||||
|
||||
// runLint validates routing binding directories (-dir) and an EDA playbook
|
||||
// directory (-eda-dir) against the loaders the daemon runs at startup.
|
||||
// Exit codes: 0 clean, 1 findings, 2 usage error.
|
||||
// runLint validates an EDA playbook directory against the compiler the daemon
|
||||
// runs. Exit codes: 0 clean, 1 findings, 2 usage error.
|
||||
func runLint(args []string, stderr io.Writer) int {
|
||||
flags := flag.NewFlagSet("archied playbooks lint", flag.ContinueOnError)
|
||||
flags.SetOutput(stderr)
|
||||
var dirs multiFlag
|
||||
flags.Var(&dirs, "dir", "routing binding directory to lint (repeatable)")
|
||||
edaDir := flags.String("eda-dir", "", "EDA playbook directory to lint")
|
||||
if err := flags.Parse(args); err != nil {
|
||||
return 2 // flag.ContinueOnError already printed the message
|
||||
}
|
||||
if len(dirs) == 0 && *edaDir == "" {
|
||||
fmt.Fprintln(stderr, "lint: at least one -dir or an -eda-dir is required")
|
||||
if *edaDir == "" {
|
||||
fmt.Fprintln(stderr, "lint: -eda-dir is required")
|
||||
flags.Usage()
|
||||
return 2
|
||||
}
|
||||
|
||||
code := 0
|
||||
if len(dirs) > 0 {
|
||||
code = max(code, Lint(dirs, stderr).ExitCode)
|
||||
}
|
||||
if *edaDir != "" {
|
||||
code = max(code, LintEDA(*edaDir, stderr).ExitCode)
|
||||
}
|
||||
return code
|
||||
return LintEDA(*edaDir, stderr).ExitCode
|
||||
}
|
||||
|
||||
// runServe runs the language server on stdin/stdout until the editor
|
||||
@@ -87,13 +76,3 @@ type stdio struct{}
|
||||
func (stdio) Read(p []byte) (int, error) { return os.Stdin.Read(p) }
|
||||
func (stdio) Write(p []byte) (int, error) { return os.Stdout.Write(p) }
|
||||
func (stdio) Close() error { return os.Stdin.Close() }
|
||||
|
||||
// multiFlag collects repeated -dir flags.
|
||||
type multiFlag []string
|
||||
|
||||
func (m *multiFlag) String() string { return fmt.Sprint([]string(*m)) }
|
||||
|
||||
func (m *multiFlag) Set(v string) error {
|
||||
*m = append(*m, v)
|
||||
return nil
|
||||
}
|
||||
@@ -8,7 +8,6 @@ import (
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/eda/module"
|
||||
"github.com/samcharles93/archie-core/internal/domain/eda/playbook"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
)
|
||||
|
||||
// Result is the outcome of one lint run: the exit code for the process and
|
||||
@@ -18,25 +17,6 @@ type Result struct {
|
||||
Findings []string
|
||||
}
|
||||
|
||||
// Lint validates playbook directories with workflow.LoadPlaybookDirs and
|
||||
// reports every finding. It returns 0 when clean, 1 otherwise.
|
||||
func Lint(dirs []string, stderr io.Writer) Result {
|
||||
var findings []string
|
||||
|
||||
_, _, err := workflow.LoadPlaybookDirs(dirs)
|
||||
if err != nil {
|
||||
findings = append(findings, err.Error())
|
||||
}
|
||||
|
||||
if len(findings) > 0 {
|
||||
for _, f := range findings {
|
||||
fmt.Fprintln(stderr, f)
|
||||
}
|
||||
return Result{ExitCode: 1, Findings: findings}
|
||||
}
|
||||
return Result{ExitCode: 0, Findings: nil}
|
||||
}
|
||||
|
||||
// LintEDA validates a directory of EDA playbook documents with the compiler
|
||||
// the eda-playbooks resource validates against.
|
||||
func LintEDA(dir string, stderr io.Writer) Result {
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
package archieplaybooks
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
@@ -14,7 +12,6 @@ import (
|
||||
"go.lsp.dev/jsonrpc2"
|
||||
"go.lsp.dev/protocol"
|
||||
"go.lsp.dev/uri"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
// Serve runs the language server over rwc until the client disconnects or ctx
|
||||
@@ -87,12 +84,7 @@ func diagnose(u uri.URI) *protocol.PublishDiagnosticsParams {
|
||||
return out
|
||||
}
|
||||
path := u.FsPath()
|
||||
var result Result
|
||||
if isEDAPlaybook(path) {
|
||||
result = LintEDA(filepath.Dir(path), io.Discard)
|
||||
} else {
|
||||
result = Lint([]string{filepath.Dir(path)}, io.Discard)
|
||||
}
|
||||
result := LintEDA(filepath.Dir(path), io.Discard)
|
||||
for _, finding := range result.Findings {
|
||||
line, ok := findingLine(finding, path)
|
||||
if !ok {
|
||||
@@ -108,21 +100,6 @@ func diagnose(u uri.URI) *protocol.PublishDiagnosticsParams {
|
||||
return out
|
||||
}
|
||||
|
||||
// isEDAPlaybook reports whether the file is an EDA playbook document (it has
|
||||
// a top-level `trigger` key) rather than a routing binding file.
|
||||
func isEDAPlaybook(path string) bool {
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
var doc map[string]yaml.Node
|
||||
if yaml.NewDecoder(bytes.NewReader(data)).Decode(&doc) != nil {
|
||||
return false
|
||||
}
|
||||
_, ok := doc["trigger"]
|
||||
return ok
|
||||
}
|
||||
|
||||
// findingLine places a finding on path. A compiler-style `path:line:` prefix
|
||||
// gives the 0-based line; a finding naming path without a line goes on line
|
||||
// 0; a finding naming another file is not path's.
|
||||
|
||||
@@ -3,8 +3,10 @@ package archieui
|
||||
import (
|
||||
"context"
|
||||
"log/slog"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/servicekit"
|
||||
controlpb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/access"
|
||||
"github.com/samcharles93/archie-core/internal/domain/health"
|
||||
@@ -17,6 +19,7 @@ import (
|
||||
infraaccess "github.com/samcharles93/archie-core/internal/infrastructure/access"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/captureintake"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
"github.com/samcharles93/archie-core/internal/webhookguard"
|
||||
"github.com/samcharles93/archie-core/internal/webui"
|
||||
)
|
||||
@@ -29,6 +32,7 @@ type deps struct {
|
||||
Log *slog.Logger
|
||||
Store storecontract.TaskStore
|
||||
Chat messaging.ChatContract
|
||||
Updates *releaseupdate.Service
|
||||
Health *health.Registry
|
||||
ControlPlane controlpb.ControlPlaneServiceClient
|
||||
Identities identity.Repository
|
||||
@@ -48,7 +52,7 @@ type deps struct {
|
||||
|
||||
// compose builds the dashboard server from contract-backed dependencies.
|
||||
// Unset fields answer 501/503 or empty.
|
||||
func compose(d deps) *webui.Server {
|
||||
func compose(ctx context.Context, d deps) *webui.Server {
|
||||
srv := &webui.Server{
|
||||
Store: d.Store,
|
||||
Log: d.Log,
|
||||
@@ -59,6 +63,10 @@ func compose(d deps) *webui.Server {
|
||||
Health: d.Health,
|
||||
ControlPlane: d.ControlPlane,
|
||||
Identities: d.Identities,
|
||||
Issuer: strings.TrimSpace(d.Options.OidcIssuer),
|
||||
}
|
||||
if subjects, ok := d.Identities.(identity.SubjectBinding); ok {
|
||||
srv.Subjects = subjects
|
||||
}
|
||||
if snapshots, ok := d.Store.(storecontract.ConfigSnapshotStore); ok {
|
||||
srv.ConfigSource = webui.RemoteConfigView(snapshots)
|
||||
@@ -88,6 +96,7 @@ func compose(d deps) *webui.Server {
|
||||
wireOrgSurface(srv, d.Store)
|
||||
if presence, ok := d.Store.(storecontract.PresenceStore); ok {
|
||||
srv.Presence = presence
|
||||
srv.RunningVersions = servicekit.RunningVersions(ctx, presence, 0)
|
||||
}
|
||||
if applyStatus, ok := d.Store.(storecontract.ApplyStatusStore); ok {
|
||||
srv.ApplyStatus = applyStatus
|
||||
@@ -107,15 +116,13 @@ func compose(d deps) *webui.Server {
|
||||
srv.EventTypes = eventTypes
|
||||
}
|
||||
if d.Chat != nil {
|
||||
srv.Chat = &webui.ChatService{Contract: d.Chat}
|
||||
srv.Chat = &webui.ChatService{Contract: d.Chat, Updates: d.Updates}
|
||||
}
|
||||
wireCatalog(d, srv)
|
||||
// The policy chain: wired together or not at all.
|
||||
srv.Refusals = refusalStore(d.Store)
|
||||
if d.Access != nil {
|
||||
srv.Access = d.Access
|
||||
srv.ReloadAccess = d.Access.Reload
|
||||
}
|
||||
srv.Access = d.Access
|
||||
srv.ReloadAccess = d.Access.Reload
|
||||
srv.Principals = d.Principals
|
||||
srv.Denials = d.Denials
|
||||
wireTaskLogs(d, srv)
|
||||
@@ -191,7 +198,7 @@ func wireCaptureSurfaces(d deps, srv *webui.Server) {
|
||||
MaxEvents: capture.MaxEvents,
|
||||
MaxBodyBytes: int64(capture.MaxBodyBytes),
|
||||
Publish: captureArrivalPublisher(d),
|
||||
Delivery: deliveryAuthorizer(d.Access),
|
||||
Delivery: d.Access,
|
||||
Refusals: refusalStore(d.Store),
|
||||
Log: d.Log,
|
||||
}
|
||||
@@ -217,15 +224,6 @@ func captureArrivalPublisher(d deps) func(context.Context, events.Event) {
|
||||
// a hung State Store must not hold the sender's webhook past this.
|
||||
const captureEventTimeout = 5 * time.Second
|
||||
|
||||
// deliveryAuthorizer keeps a missing chain a nil authorizer, which admits
|
||||
// every sender.
|
||||
func deliveryAuthorizer(chain *infraaccess.Live) access.DeliveryAuthorizer {
|
||||
if chain == nil {
|
||||
return nil
|
||||
}
|
||||
return chain
|
||||
}
|
||||
|
||||
func refusalStore(store storecontract.TaskStore) storecontract.CaptureRefusalStore {
|
||||
refusals, _ := store.(storecontract.CaptureRefusalStore)
|
||||
return refusals
|
||||
|
||||
@@ -58,6 +58,8 @@ type projection struct {
|
||||
trustForwardedHeaders bool
|
||||
gateway ServiceTarget
|
||||
state ServiceTarget
|
||||
messaging ServiceTarget
|
||||
harness ServiceTarget
|
||||
capture CaptureOptions
|
||||
}
|
||||
|
||||
@@ -66,7 +68,9 @@ func project(cfg config.Config) projection {
|
||||
listen: cfg.Web.Listen,
|
||||
trustForwardedHeaders: cfg.Web.TrustForwardedHeaders,
|
||||
gateway: ServiceTarget{Target: cfg.Services.Get(config.ServiceNameGateway).Target, Token: cfg.Services.Get(config.ServiceNameGateway).TargetToken},
|
||||
messaging: ServiceTarget{Target: cfg.Services.Get(config.ServiceNameMessaging).Target, Token: cfg.Services.Get(config.ServiceNameMessaging).TargetToken},
|
||||
state: ServiceTarget{Target: cfg.Services.Get(config.ServiceNameState).Target, Token: cfg.Services.Get(config.ServiceNameState).TargetToken},
|
||||
harness: ServiceTarget{Target: cfg.Services.Get(config.ServiceNameHarness).Target, Token: cfg.Services.Get(config.ServiceNameHarness).TargetToken},
|
||||
capture: CaptureOptions{
|
||||
Retention: cfg.Capture.Retention.Std(),
|
||||
MaxEvents: cfg.Capture.MaxEvents,
|
||||
@@ -85,6 +89,12 @@ func withEnvTokens(o Options) Options {
|
||||
if o.State.Token == "" {
|
||||
o.State.Token = os.Getenv("STATE_STORE_TOKEN")
|
||||
}
|
||||
if o.Messaging.Token == "" {
|
||||
o.Messaging.Token = os.Getenv("MESSAGING_TOKEN")
|
||||
}
|
||||
if o.Harness.Token == "" {
|
||||
o.Harness.Token = os.Getenv("HARNESS_TOKEN")
|
||||
}
|
||||
return o
|
||||
}
|
||||
|
||||
@@ -97,18 +107,10 @@ func merge(o Options, p projection) Options {
|
||||
trust := p.trustForwardedHeaders
|
||||
o.TrustForwardedHeaders = &trust
|
||||
}
|
||||
if o.Gateway.Target == "" {
|
||||
o.Gateway.Target = p.gateway.Target
|
||||
}
|
||||
if o.Gateway.Token == "" {
|
||||
o.Gateway.Token = p.gateway.Token
|
||||
}
|
||||
if o.State.Target == "" {
|
||||
o.State.Target = p.state.Target
|
||||
}
|
||||
if o.State.Token == "" {
|
||||
o.State.Token = p.state.Token
|
||||
}
|
||||
o.Gateway = mergeTarget(o.Gateway, p.gateway)
|
||||
o.Messaging = mergeTarget(o.Messaging, p.messaging)
|
||||
o.State = mergeTarget(o.State, p.state)
|
||||
o.Harness = mergeTarget(o.Harness, p.harness)
|
||||
if o.Capture.Retention <= 0 {
|
||||
o.Capture.Retention = p.capture.Retention
|
||||
}
|
||||
@@ -128,6 +130,10 @@ func merge(o Options, p projection) Options {
|
||||
}
|
||||
|
||||
func withDefaults(o Options) Options {
|
||||
if o.Messaging.Target == "" {
|
||||
spec, _ := config.LookupService(config.ServiceNameMessaging)
|
||||
o.Messaging.Target = spec.Target
|
||||
}
|
||||
// "off" disables the daemon's dashboard but means the default listener here.
|
||||
if o.Listen == "" || o.Listen == "off" {
|
||||
o.Listen = defaultListen
|
||||
@@ -170,9 +176,19 @@ func (o Options) validate() error {
|
||||
}
|
||||
if !webui.IsLoopback(o.Listen) && o.Token == "" {
|
||||
return fmt.Errorf(
|
||||
"ui listen address %q is non-loopback; a reachable dashboard requires a token (-token) or a token file to mint one (-token-file) (docs/prds/ui-service-boundary.md, listen and authentication)",
|
||||
"ui listen address %q is non-loopback; a reachable dashboard requires a token (-token) or a token file to mint one (-token-file) (deployments/README.md, running the dashboard)",
|
||||
o.Listen,
|
||||
)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func mergeTarget(o, p ServiceTarget) ServiceTarget {
|
||||
if o.Target == "" {
|
||||
o.Target = p.Target
|
||||
}
|
||||
if o.Token == "" {
|
||||
o.Token = p.Token
|
||||
}
|
||||
return o
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package archieui
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/presence"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/messagingrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/staterpc"
|
||||
"github.com/samcharles93/archie-core/internal/logging"
|
||||
"github.com/samcharles93/archie-core/internal/webui"
|
||||
)
|
||||
|
||||
func wireServiceLogs(opts Options, srv *webui.Server, tasks *staterpc.Client, chat *gatewayrpc.Client, feed *logging.Feed) (func(), error) {
|
||||
srv.LogFeed = feed
|
||||
srv.LogSources = map[string]webui.LogSource{
|
||||
presence.UI: func(_ context.Context, q logging.Query) (logging.Result, error) { return feed.Read(q) },
|
||||
presence.StateStore: tasks.RecentLogs,
|
||||
presence.Gateway: func(ctx context.Context, q logging.Query) (logging.Result, error) {
|
||||
return chat.RecentLogs(ctx, presence.Gateway, q)
|
||||
},
|
||||
presence.Daemon: func(ctx context.Context, q logging.Query) (logging.Result, error) {
|
||||
return chat.RecentLogs(ctx, presence.Daemon, q)
|
||||
},
|
||||
}
|
||||
messaging, closeMessaging, dialErr := messagingrpc.Dial(opts.Messaging.Target, opts.Messaging.Token)
|
||||
if dialErr != nil {
|
||||
return nil, dialErr
|
||||
}
|
||||
srv.LogSources[presence.Messaging] = messaging.RecentLogs
|
||||
return closeMessaging, nil
|
||||
}
|
||||
@@ -67,8 +67,13 @@ type Options struct {
|
||||
Capture CaptureOptions
|
||||
|
||||
// Gateway and State are the two remote contracts the dashboard consumes.
|
||||
Gateway ServiceTarget
|
||||
State ServiceTarget
|
||||
Gateway ServiceTarget
|
||||
State ServiceTarget
|
||||
Messaging ServiceTarget
|
||||
// Harness is the daemon's session contract. Optional: empty leaves the
|
||||
// setup terminal unwired, and /api/harness reports terminal:false rather
|
||||
// than offering a control that would fail.
|
||||
Harness ServiceTarget
|
||||
|
||||
// DependencyTimeout bounds each readiness probe's call to a dependency.
|
||||
DependencyTimeout time.Duration
|
||||
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
// Store and, when one is configured, the sign-in provider.
|
||||
func newReadinessRegistry(o Options, tasks storecontract.TaskStore, chat messaging.ChatContract, chain *infraaccess.Live, provider *oidc.Provider) *health.Registry {
|
||||
probes := []health.Probe{
|
||||
readiness.NewProblemProbe("access_policies", problemSource(chain)),
|
||||
readiness.NewProblemProbe("access_policies", chain),
|
||||
captureRefusalProbe{store: refusalStore(tasks)},
|
||||
readiness.NewContractProbe("state_db", o.DependencyTimeout, func(ctx context.Context) error {
|
||||
_, err := tasks.StatusCounts(ctx)
|
||||
@@ -35,15 +35,6 @@ func newReadinessRegistry(o Options, tasks storecontract.TaskStore, chat messagi
|
||||
return health.NewRegistry(probes...)
|
||||
}
|
||||
|
||||
// problemSource keeps a missing chain a nil source, which the probe reports
|
||||
// as not wired.
|
||||
func problemSource(chain *infraaccess.Live) readiness.PolicyProblems {
|
||||
if chain == nil {
|
||||
return nil
|
||||
}
|
||||
return chain
|
||||
}
|
||||
|
||||
// captureRefusalProbe degrades when any source refused more events than it
|
||||
// accepted over the last hour: a sender being blocked, or someone probing.
|
||||
type captureRefusalProbe struct {
|
||||
|
||||
@@ -8,34 +8,30 @@ import (
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/status"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/servicekit"
|
||||
"github.com/samcharles93/archie-core/internal/domain/applystatus"
|
||||
"github.com/samcharles93/archie-core/internal/domain/presence"
|
||||
infraaccess "github.com/samcharles93/archie-core/internal/infrastructure/access"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/configuration"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/harnessrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/staterpc"
|
||||
"github.com/samcharles93/archie-core/internal/webui"
|
||||
)
|
||||
|
||||
// buildAccessChain builds the live access engine over the stored policies.
|
||||
// An unreachable State Store returns nil and logs a warning.
|
||||
func buildAccessChain(ctx context.Context, store *staterpc.Client, log *slog.Logger) (*infraaccess.Live, error) {
|
||||
live, err := infraaccess.NewLive(ctx, store.ListPolicies, log)
|
||||
if status.Code(err) == codes.Unavailable {
|
||||
log.Warn("access chain unavailable; the credential check is the gate", "err", err)
|
||||
return nil, nil
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// buildAccessChain starts the live access engine over the stored policies.
|
||||
// It refuses every request until Run's first load succeeds and keeps
|
||||
// retrying, so a State Store or database that is down or slow at start
|
||||
// closes the dashboard rather than opening it or stopping it.
|
||||
func buildAccessChain(ctx context.Context, store *staterpc.Client, log *slog.Logger) *infraaccess.Live {
|
||||
live := infraaccess.NewPending(store.ListPolicies, log)
|
||||
go live.Run(ctx, applystatus.RestampInterval)
|
||||
return live, nil
|
||||
return live
|
||||
}
|
||||
|
||||
// Run serves the dashboard until ctx is cancelled. It resolves its own
|
||||
@@ -44,18 +40,18 @@ func buildAccessChain(ctx context.Context, store *staterpc.Client, log *slog.Log
|
||||
// on shutdown.
|
||||
func Run(ctx context.Context, options Options) error {
|
||||
log := slog.New(slog.NewJSONHandler(os.Stderr, nil)).With("component", "ui")
|
||||
log, feed := servicekit.Diagnostics(log, presence.UI)
|
||||
opts, err := Resolve(options, log)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
warnPlainHTTP(log, opts)
|
||||
var cleanups []func()
|
||||
defer func() {
|
||||
for _, cleanup := range slices.Backward(cleanups) {
|
||||
cleanup()
|
||||
}
|
||||
}()
|
||||
|
||||
tasks, closeState, err := staterpc.Dial(opts.State.Target, presence.UI, opts.State.Token)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -66,12 +62,7 @@ func Run(ctx context.Context, options Options) error {
|
||||
return err
|
||||
}
|
||||
cleanups = append(cleanups, closeGateway)
|
||||
|
||||
chain, err := buildAccessChain(ctx, tasks, log)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
chain := buildAccessChain(ctx, tasks, log)
|
||||
provider, err := signInProvider(opts)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -81,12 +72,12 @@ func Run(ctx context.Context, options Options) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
srv := compose(deps{
|
||||
srv := compose(ctx, deps{
|
||||
Options: opts,
|
||||
Log: log,
|
||||
Store: tasks,
|
||||
Chat: chat,
|
||||
Updates: controlplanerpc.UpdateService(controlplanerpc.NewRPCClient(tasks.ControlPlane()), filepath.Join(configuration.DefaultWorkDir(), "ui-update-deferrals.json"), ""),
|
||||
Health: newReadinessRegistry(opts, tasks, chat, chain, provider),
|
||||
ControlPlane: tasks.ControlPlane(),
|
||||
Identities: tasks,
|
||||
@@ -96,33 +87,68 @@ func Run(ctx context.Context, options Options) error {
|
||||
Principals: tasks,
|
||||
Denials: tasks,
|
||||
})
|
||||
|
||||
// Live activity has no in-process bus in this process: the pump reads
|
||||
// events back out of the State Store over the same cursor SSE catch-up
|
||||
// uses. Backgrounded so priming past a large events table cannot delay the
|
||||
// listener.
|
||||
stopLogs, err := wireServiceLogs(opts, srv, tasks, chat, feed)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
cleanups = append(cleanups, stopLogs)
|
||||
if err := wireHarness(opts, srv, &cleanups); err != nil {
|
||||
return err
|
||||
}
|
||||
// Priming event history must not delay the listener.
|
||||
go pumpEvents(ctx, srv, opts.EventPollInterval, log)
|
||||
go presence.Run(ctx, presence.UI, servicekit.Build(), tasks, srv.Health, log)
|
||||
liveCtx, stopLive := context.WithCancel(ctx)
|
||||
defer stopLive()
|
||||
go srv.RunLive(liveCtx)
|
||||
|
||||
listener, err := (&net.ListenConfig{}).Listen(ctx, "tcp", opts.Listen)
|
||||
if err != nil {
|
||||
return fmt.Errorf("listen for ui: %w", err)
|
||||
}
|
||||
cleanups = append(cleanups, func() { _ = listener.Close() })
|
||||
log.Info(
|
||||
"archie-ui running",
|
||||
attrs := []any{
|
||||
"addr", listener.Addr().String(),
|
||||
"open", webui.DashboardURL(listener.Addr().String(), opts.Token),
|
||||
"open", webui.DashboardURL(listener.Addr().String()),
|
||||
"gateway", opts.Gateway.Target,
|
||||
"state", opts.State.Target,
|
||||
)
|
||||
|
||||
}
|
||||
// Name the file holding the token, never the token itself: this line
|
||||
// reaches the journal and any log an operator pastes.
|
||||
if opts.TokenFile != "" {
|
||||
attrs = append(attrs, "token_file", opts.TokenFile)
|
||||
}
|
||||
log.Info("archie-ui running", attrs...)
|
||||
return serve(ctx, listener, srv.Handler(), opts)
|
||||
}
|
||||
|
||||
// warnPlainHTTP names the exposure of a dashboard published off-host. The
|
||||
// process serves plain HTTP, so the session cookie and the provider token
|
||||
// cross the network in clear unless a TLS-terminating proxy sits in front of
|
||||
// it -- which [web].trust_forwarded_headers declares. A loopback bind is
|
||||
// reached over a tunnel or on the host, so it needs no warning.
|
||||
func warnPlainHTTP(log *slog.Logger, opts Options) {
|
||||
if webui.IsLoopback(opts.Listen) || opts.trustForwardedHeaders() {
|
||||
return
|
||||
}
|
||||
log.Warn("dashboard is reachable off-host over plain HTTP; session and provider tokens travel in clear unless TLS terminates in front of it (set [web].trust_forwarded_headers behind a TLS proxy)",
|
||||
"listen", opts.Listen)
|
||||
}
|
||||
|
||||
// wireHarness attaches the setup terminal to the daemon's session contract
|
||||
// when the operator configured one, and registers its cleanup.
|
||||
func wireHarness(opts Options, srv *webui.Server, cleanups *[]func()) error {
|
||||
if opts.Harness.Target == "" {
|
||||
return nil
|
||||
}
|
||||
harness, closeHarness, err := harnessrpc.Dial(opts.Harness.Target, opts.Harness.Token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
srv.HarnessTerminal = harness
|
||||
*cleanups = append(*cleanups, closeHarness)
|
||||
return nil
|
||||
}
|
||||
|
||||
// serve runs handler until ctx ends, then shuts down within
|
||||
// ShutdownTimeout.
|
||||
func serve(ctx context.Context, listener net.Listener, handler http.Handler, opts Options) error {
|
||||
|
||||
@@ -23,7 +23,7 @@ const ChannelSettingsKind = controlplanerpc.ChannelSettingsKind
|
||||
func seedChannels(cfg config.Config) any {
|
||||
chat := cfg.Chat
|
||||
return channelSettings{
|
||||
Operator: chat.Operator, Workspace: chat.Workspace, UnrestrictedFilesystem: chat.UnrestrictedFilesystem, ShowToolCalls: chat.ShowToolCalls, MaxSteps: chat.MaxSteps, Models: chat.Models,
|
||||
Operator: chat.Operator, Workspace: chat.Workspace, UnrestrictedFilesystem: chat.UnrestrictedFilesystem, ShowToolCalls: chat.ShowToolCalls, MaxSteps: chat.MaxSteps,
|
||||
Telegram: telegramSettings{AllowedUserIDs: chat.Telegram.AllowedUserIDs, Token: chat.Telegram.Token, CredentialConfigured: chat.Telegram.Token != (config.SecretRef{})},
|
||||
RateLimit: rateLimitSettings{Window: channelDuration(chat.RateLimit.Window), MaxRequests: chat.RateLimit.MaxRequests},
|
||||
}
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
package controlplane_test
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/controlplane"
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/postgres/pgstore"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/workflowsteps"
|
||||
)
|
||||
|
||||
func TestStoredChannelSettingsCanBeEdited(t *testing.T) {
|
||||
ctx := t.Context()
|
||||
db := pgstore.Open(t)
|
||||
if err := db.BootstrapIdentities(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.UpgradeDefaultOrg(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
steps, err := workflowsteps.NewManager()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server, err := controlplane.NewServer(db, steps)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client := workflowRPC(t, server, db).ControlPlane()
|
||||
stored, err := db.PutResource(ctx, storecontract.ResourceWrite{
|
||||
OrgID: storecontract.DefaultOrgID, Kind: controlplane.ChannelSettingsKind,
|
||||
Value: []byte(`{"email":{"listen_addr":""},"webhook":{},"webhook_addr":"","telegram":{"allowed_user_ids":[42],"token_ref":{"engine":"bws","key":"telegram"}},"workspace":"/workspace","max_steps":17,"rate_limit":{"window":"30s","max_requests":5}}`),
|
||||
Actor: "operator", Source: "test", RequestID: "old-settings",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got, err := client.Query(ctx, &pb.QueryRequest{Kind: controlplane.ChannelSettingsKind})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var settings controlplanerpc.ChannelSettings
|
||||
if err := json.Unmarshal(got.Resource.ValueJson, &settings); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var document map[string]json.RawMessage
|
||||
if err := json.Unmarshal(got.Resource.ValueJson, &document); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, retired := range []string{"email", "webhook", "webhook_addr"} {
|
||||
if _, exists := document[retired]; exists {
|
||||
t.Fatalf("served retired %s field in editable settings", retired)
|
||||
}
|
||||
}
|
||||
if settings.Telegram.Token.Key != "telegram" || len(settings.Telegram.AllowedUserIDs) != 1 || settings.Telegram.AllowedUserIDs[0] != 42 || settings.Workspace != "/workspace" || settings.MaxSteps != 17 || settings.RateLimit.MaxRequests != 5 {
|
||||
t.Fatalf("lost supported settings: %+v", settings)
|
||||
}
|
||||
settings.Telegram.AllowedUserIDs = []int64{42, 43}
|
||||
value, err := json.Marshal(settings)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
changed, err := client.Command(ctx, &pb.CommandRequest{Kind: controlplane.ChannelSettingsKind, Command: "replace", ValueJson: value, ExpectedVersion: got.Resource.Version, Actor: "operator", Source: "test", RequestId: "edit"})
|
||||
if err != nil {
|
||||
t.Fatalf("saving edited channel settings: %v", err)
|
||||
}
|
||||
if changed.Resource.Version != stored.Version+1 {
|
||||
t.Fatalf("saved version %d", changed.Resource.Version)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
package controlplane_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/credentials/insecure"
|
||||
"google.golang.org/grpc/status"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/controlplane"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/access"
|
||||
"github.com/samcharles93/archie-core/internal/domain/identity"
|
||||
"github.com/samcharles93/archie-core/internal/domain/messaging"
|
||||
"github.com/samcharles93/archie-core/internal/domain/org"
|
||||
"github.com/samcharles93/archie-core/internal/gateway"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/postgres/pgstore"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/rpcidentity"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/workflowsteps"
|
||||
)
|
||||
|
||||
func TestWebChatSettingsActor(t *testing.T) {
|
||||
ctx := t.Context()
|
||||
db := pgstore.Open(t)
|
||||
if err := db.BootstrapIdentities(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.UpgradeDefaultOrg(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
steps, err := workflowsteps.NewManager()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cp, err := controlplane.NewServer(db, steps)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, _, err := cp.ImportConfig(ctx, config.Config{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
state := workflowRPC(t, cp, db)
|
||||
router := gateway.NewRouter(state, nil, "web")
|
||||
router.Settings = messaging.NewSettingsCommand(controlplanerpc.NewSettingsClient(state.ControlPlane())).WithIdentities(state)
|
||||
listener, err := (&net.ListenConfig{}).Listen(ctx, "tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
callers := rpcidentity.Callers{Principals: state}
|
||||
srv := grpc.NewServer(grpc.ChainUnaryInterceptor(gatewayrpc.UnaryServerInterceptor("gateway-secret"), callers.Unary()), grpc.ChainStreamInterceptor(gatewayrpc.StreamServerInterceptor("gateway-secret"), callers.Stream()))
|
||||
gatewayrpc.RegisterServer(srv, &gateway.LocalChatAdapter{Router: router}, nil, gatewayrpc.Catalog{})
|
||||
go func() { _ = srv.Serve(listener) }()
|
||||
t.Cleanup(srv.Stop)
|
||||
person, err := db.PrincipalFor(ctx, identity.OperatorID())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
tests := []struct {
|
||||
name, token, sender string
|
||||
person, write, stream bool
|
||||
code codes.Code
|
||||
}{
|
||||
{name: "streamed signed-in person", stream: true, token: "gateway-secret", person: true, write: true},
|
||||
{name: "streamed wrong service credential", stream: true, token: "wrong", person: true, code: codes.Unauthenticated},
|
||||
{name: "signed-in person", token: "gateway-secret", person: true, write: true},
|
||||
{name: "message cannot spoof actor", token: "gateway-secret", sender: string(identity.SystemID), person: true, write: true},
|
||||
{name: "message alone cannot name a person", token: "gateway-secret", sender: string(identity.OperatorID())},
|
||||
{name: "wrong service credential cannot forward a principal", token: "wrong", person: true, code: codes.Unauthenticated},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
conn, err := grpc.NewClient(listener.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithUnaryInterceptor(gatewayrpc.UnaryClientTokenInterceptor(tt.token)), grpc.WithStreamInterceptor(gatewayrpc.StreamClientTokenInterceptor(tt.token)))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer conn.Close()
|
||||
requestCtx := ctx
|
||||
if tt.person {
|
||||
requestCtx = access.WithPrincipal(ctx, person)
|
||||
}
|
||||
before, err := db.Resource(ctx, string(org.DefaultOrgID), controlplane.ReviewSettingsKind)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
in := messaging.Inbound{Platform: "web", Message: messaging.Message{SenderID: tt.sender, Text: "/settings set review-settings precision_gate=true"}}
|
||||
client := gatewayrpc.NewClient(conn)
|
||||
reply, err := settingsReply(t, client, requestCtx, in, tt.stream, tt.code)
|
||||
if status.Code(err) != tt.code {
|
||||
t.Fatalf("route error = %v, want %s", err, tt.code)
|
||||
}
|
||||
after, err := db.Resource(ctx, string(org.DefaultOrgID), controlplane.ReviewSettingsKind)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !tt.write {
|
||||
if after.Version != before.Version {
|
||||
t.Fatal("unauthenticated command changed settings")
|
||||
}
|
||||
return
|
||||
}
|
||||
history, err := db.ResourceHistory(ctx, string(org.DefaultOrgID), controlplane.ReviewSettingsKind, 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(history) != 1 {
|
||||
t.Fatal("settings audit missing")
|
||||
}
|
||||
if !strings.Contains(reply.Text, "Updated review-settings") || after.Version != before.Version+1 || history[0].Actor != string(person.IdentityID) {
|
||||
t.Fatalf("reply %q, version %d -> %d, actor %q", reply.Text, before.Version, after.Version, history[0].Actor)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func settingsReply(t *testing.T, client *gatewayrpc.Client, ctx context.Context, in messaging.Inbound, stream bool, want codes.Code) (messaging.ChatReply, error) {
|
||||
t.Helper()
|
||||
if !stream {
|
||||
return client.Route(ctx, in)
|
||||
}
|
||||
events, err := client.Stream(ctx, in)
|
||||
if err != nil {
|
||||
return messaging.ChatReply{}, err
|
||||
}
|
||||
var reply messaging.ChatReply
|
||||
for event := range events {
|
||||
if event.Kind == "error" {
|
||||
if want == codes.OK || !strings.Contains(event.Text, "code = "+want.String()) {
|
||||
t.Fatalf("stream: %s", event.Text)
|
||||
}
|
||||
return messaging.ChatReply{}, status.Error(want, event.Text)
|
||||
}
|
||||
if event.Kind == "done" {
|
||||
reply.Text = event.Text
|
||||
}
|
||||
}
|
||||
return reply, nil
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/agent"
|
||||
"github.com/samcharles93/archie-core/internal/domain/applystatus"
|
||||
"github.com/samcharles93/archie-core/internal/domain/scheduling"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
@@ -20,7 +21,8 @@ import (
|
||||
// Service's client and adds resource-specific reads.
|
||||
type Client struct {
|
||||
*controlplanerpc.Client
|
||||
rpc pb.ControlPlaneServiceClient
|
||||
rpc pb.ControlPlaneServiceClient
|
||||
ApplyStatus *applystatus.Reporter
|
||||
}
|
||||
|
||||
// NewClient dials the control plane over an existing connection.
|
||||
@@ -36,8 +38,9 @@ func NewRPCClient(client pb.ControlPlaneServiceClient) *Client {
|
||||
// WorkflowDefinitionsClient reads and replaces the workflow-definitions
|
||||
// resource, resolving step types against the given vocabulary.
|
||||
type WorkflowDefinitionsClient struct {
|
||||
rpc pb.ControlPlaneServiceClient
|
||||
steps workflow.StepRegistry
|
||||
rpc pb.ControlPlaneServiceClient
|
||||
steps workflow.StepRegistry
|
||||
ApplyStatus *applystatus.Reporter
|
||||
}
|
||||
|
||||
func NewWorkflowDefinitionsClient(client pb.ControlPlaneServiceClient, steps *workflow.Manager) (*WorkflowDefinitionsClient, error) {
|
||||
@@ -59,9 +62,11 @@ func (c *Client) Catalog(ctx context.Context) ([]*pb.ResourceDescriptor, error)
|
||||
func (c *WorkflowDefinitionsClient) WorkflowDefinitions(ctx context.Context) (workflow.WorkflowDefinitionCollection, int64, error) {
|
||||
response, err := c.rpc.Query(ctx, &pb.QueryRequest{Kind: WorkflowDefinitionsKind})
|
||||
if err != nil {
|
||||
c.ApplyStatus.Report(ctx, WorkflowDefinitionsKind, 0, err)
|
||||
return workflow.WorkflowDefinitionCollection{}, 0, controlplanerpc.ClientError(err)
|
||||
}
|
||||
definitions, err := workflow.DecodeDefinitionCollection(response.Resource.ValueJson, c.steps)
|
||||
c.ApplyStatus.Report(ctx, WorkflowDefinitionsKind, response.Resource.Version, err)
|
||||
return definitions, response.Resource.Version, err
|
||||
}
|
||||
|
||||
@@ -238,12 +243,15 @@ func sendUpdate[T any](ctx context.Context, out chan<- T, update T) bool {
|
||||
func (c *Client) Schedules(ctx context.Context) ([]scheduling.JobSpec, int64, error) {
|
||||
response, err := c.rpc.Query(ctx, &pb.QueryRequest{Kind: SchedulesKind})
|
||||
if err != nil {
|
||||
c.ApplyStatus.Report(ctx, SchedulesKind, 0, err)
|
||||
return nil, 0, controlplanerpc.ClientError(err)
|
||||
}
|
||||
var jobs []scheduling.JobSpec
|
||||
if err := json.Unmarshal(response.Resource.ValueJson, &jobs); err != nil {
|
||||
c.ApplyStatus.Report(ctx, SchedulesKind, response.Resource.Version, err)
|
||||
return nil, 0, err
|
||||
}
|
||||
c.ApplyStatus.Report(ctx, SchedulesKind, response.Resource.Version, nil)
|
||||
return jobs, response.Resource.Version, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,9 @@ package controlplane
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -11,6 +13,7 @@ import (
|
||||
"google.golang.org/grpc/status"
|
||||
"google.golang.org/protobuf/types/known/timestamppb"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/org"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
@@ -33,6 +36,7 @@ var (
|
||||
// root asserts the State Store against it, so this is the single definition of
|
||||
// what a control-plane backing store must offer.
|
||||
type ResourceStore interface {
|
||||
ListResources(context.Context) ([]storecontract.Resource, error)
|
||||
Resource(ctx context.Context, orgID, kind string) (storecontract.Resource, error)
|
||||
ResourceHistory(ctx context.Context, orgID, kind string, limit int) ([]storecontract.Resource, error)
|
||||
Audit(ctx context.Context, table string, keys []string, limit int) ([]storecontract.AuditEntry, error)
|
||||
@@ -48,6 +52,7 @@ type Server struct {
|
||||
store ResourceStore
|
||||
definitions map[string]Definition
|
||||
ordered []Definition
|
||||
steps workflow.StepRegistry
|
||||
}
|
||||
|
||||
// NewServer builds the control plane server the State Store serves. steps is
|
||||
@@ -64,7 +69,7 @@ func NewServer(resources ResourceStore, steps *workflow.Manager) (*Server, error
|
||||
for _, definition := range definitions {
|
||||
byKind[definition.Kind] = definition
|
||||
}
|
||||
return &Server{store: resources, definitions: byKind, ordered: definitions}, nil
|
||||
return &Server{store: resources, definitions: byKind, ordered: definitions, steps: registry}, nil
|
||||
}
|
||||
|
||||
func (s *Server) Catalog(context.Context, *pb.CatalogRequest) (*pb.CatalogResponse, error) {
|
||||
@@ -80,7 +85,7 @@ func (s *Server) Query(ctx context.Context, request *pb.QueryRequest) (*pb.Query
|
||||
if _, ok := s.definitions[request.GetKind()]; !ok {
|
||||
return nil, status.Error(codes.NotFound, "resource not found")
|
||||
}
|
||||
resource, err := s.store.Resource(ctx, requestOrg(ctx), request.Kind)
|
||||
resource, err := s.resource(ctx, requestOrg(ctx), request.Kind)
|
||||
if err != nil {
|
||||
return nil, mapError(err)
|
||||
}
|
||||
@@ -167,6 +172,9 @@ func (s *Server) Command(ctx context.Context, request *pb.CommandRequest) (*pb.C
|
||||
if err != nil {
|
||||
return nil, mapError(err)
|
||||
}
|
||||
if err := s.checkOrgWrite(ctx, requestOrg(ctx), request.Kind, value); err != nil {
|
||||
return nil, mapError(err)
|
||||
}
|
||||
resource, err := s.store.PutResource(ctx, storecontract.ResourceWrite{OrgID: requestOrg(ctx), Kind: request.Kind, Value: value, Actor: request.Actor, Source: request.Source, RequestID: request.RequestId, ExpectedVersion: request.ExpectedVersion, At: time.Now().UTC()})
|
||||
if err != nil {
|
||||
return nil, mapError(err)
|
||||
@@ -182,7 +190,7 @@ func (s *Server) Watch(request *pb.WatchRequest, stream pb.ControlPlaneService_W
|
||||
ticker := time.NewTicker(250 * time.Millisecond)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
resource, err := s.store.Resource(stream.Context(), requestOrg(stream.Context()), request.Kind)
|
||||
resource, err := s.resource(stream.Context(), requestOrg(stream.Context()), request.Kind)
|
||||
if err == nil && resource.Version > version {
|
||||
if err := stream.Send(&pb.WatchResponse{Resource: resourceProto(resource)}); err != nil {
|
||||
return err
|
||||
@@ -199,12 +207,29 @@ func (s *Server) Watch(request *pb.WatchRequest, stream pb.ControlPlaneService_W
|
||||
}
|
||||
}
|
||||
|
||||
// resource seeds an org's workflow documents on first use, including orgs
|
||||
// created after this process started. File-derived settings are never copied.
|
||||
func (s *Server) resource(ctx context.Context, orgID, kind string) (storecontract.Resource, error) {
|
||||
resource, err := s.store.Resource(ctx, orgID, kind)
|
||||
if !errors.Is(err, storecontract.ErrResourceNotFound) || (kind != WorkflowDefinitionsKind && kind != WorkflowEnablementKind) {
|
||||
// Serve the current channel schema so stored settings remain editable.
|
||||
if err == nil && kind == ChannelSettingsKind {
|
||||
resource.Value, err = normalizeChannels(resource.Value)
|
||||
}
|
||||
return resource, err
|
||||
}
|
||||
if _, err := s.seedKind(ctx, orgID, s.definitions[kind], config.Config{}); err != nil && !errors.Is(err, storecontract.ErrResourceVersionConflict) {
|
||||
return storecontract.Resource{}, err
|
||||
}
|
||||
return s.store.Resource(ctx, orgID, kind)
|
||||
}
|
||||
|
||||
func resourceProto(resource storecontract.Resource) *pb.Resource {
|
||||
return &pb.Resource{OrgId: resource.OrgID, Kind: resource.Kind, Version: resource.Version, ValueJson: resource.Value, UpdatedAt: timestamp(resource.At)}
|
||||
}
|
||||
|
||||
// requestOrg is the org a request acts in, derived from the caller's
|
||||
// principal when the call carried one (staterpc.Callers).
|
||||
// principal when the call carried one (rpcidentity.Callers).
|
||||
func requestOrg(ctx context.Context) string {
|
||||
return string(org.OrgFromContext(ctx))
|
||||
}
|
||||
@@ -228,3 +253,20 @@ func mapError(err error) error {
|
||||
return status.Error(codes.Unavailable, err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
// checkModelAliases refuses workflow definitions whose agent steps name a
|
||||
// model alias the writing org cannot resolve.
|
||||
func (s *Server) checkModelAliases(ctx context.Context, orgID string, value []byte) error {
|
||||
models, err := s.ModelsFor(ctx, orgID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var collection workflow.WorkflowDefinitionCollection
|
||||
if err := json.Unmarshal(value, &collection); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := workflow.CheckModelAliases(collection, s.steps, models.Aliases); err != nil {
|
||||
return fmt.Errorf("%w: %w", ErrValidation, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
package controlplane
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/curator"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
)
|
||||
|
||||
const CuratorsKind = "curators"
|
||||
|
||||
func curatorDefinition() Definition {
|
||||
return Definition{
|
||||
Kind: CuratorsKind, Title: "Curators", Document: []config.CuratorDefinition{}, ApplyMode: "live",
|
||||
Seed: func(cfg config.Config) any { return cfg.Curators },
|
||||
Validate: func(input []byte) error {
|
||||
return validateAs(input, func(defs []config.CuratorDefinition) error {
|
||||
names := map[string]bool{"skill": true, "session-memory": true}
|
||||
for _, def := range defs {
|
||||
if strings.TrimSpace(def.Name) == "" || names[def.Name] {
|
||||
return fmt.Errorf("curator name %q is empty, reserved or repeated", def.Name)
|
||||
}
|
||||
names[def.Name] = true
|
||||
if def.Interval <= 0 {
|
||||
return fmt.Errorf("curator %s: interval must be positive", def.Name)
|
||||
}
|
||||
if err := CuratorDefinition(def).Manifest.Validate(); err != nil {
|
||||
return fmt.Errorf("curator %s: %w", def.Name, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func CuratorDefinition(def config.CuratorDefinition) curator.Definition {
|
||||
return curator.Definition{Name: def.Name, Enabled: def.Enabled, Instructions: def.Instructions, Manifest: curator.Manifest{
|
||||
Interval: def.Interval.Std(), Cooldown: def.Cooldown.Std(), OnInput: def.OnInput, Tools: def.Tools, Skills: def.Skills, MemoryEngine: def.MemoryEngine, Conversations: def.Conversations, Model: def.Model,
|
||||
}}
|
||||
}
|
||||
|
||||
func (c *Client) Curators(ctx context.Context) ([]config.CuratorDefinition, int64, error) {
|
||||
var defs []config.CuratorDefinition
|
||||
version, _, err := c.Query(ctx, CuratorsKind, func(value []byte) error { return json.Unmarshal(value, &defs) })
|
||||
return defs, version, err
|
||||
}
|
||||
|
||||
type AppliedCurators struct {
|
||||
Definitions []config.CuratorDefinition
|
||||
Version int64
|
||||
Err error
|
||||
}
|
||||
|
||||
func (c *Client) WatchCurators(ctx context.Context, after int64) (<-chan AppliedCurators, error) {
|
||||
stream, err := c.rpc.Watch(ctx, &pb.WatchRequest{Kind: CuratorsKind, AfterVersion: after})
|
||||
if err != nil {
|
||||
return nil, controlplanerpc.ClientError(err)
|
||||
}
|
||||
return watchUpdates(ctx, stream, func(resource *pb.Resource) AppliedCurators {
|
||||
update := AppliedCurators{Version: resource.Version}
|
||||
update.Err = json.Unmarshal(resource.ValueJson, &update.Definitions)
|
||||
return update
|
||||
}, func(err error) AppliedCurators { return AppliedCurators{Err: err} }), nil
|
||||
}
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
// Schemas are not declared here: each Definition names its document type, and
|
||||
// Definition.Descriptor derives the JSON Schema from it (internal/app/controlplane/schema.go).
|
||||
func builtinDefinitions(steps workflow.StepRegistry, settings map[string]any) []Definition {
|
||||
definitions := []Definition{workflowDefinition(), workflowDefinitionsDefinition(steps, settings), workflowEnablementDefinition(), personaDefinition(), soulDefinition(), scheduleDefinition(), agentProfileDefinition(), playbooksDefinition(), skillsDefinition(), credentialBindingsDefinition(), identityGrantsDefinition(), reviewSettingsDefinition()}
|
||||
definitions := []Definition{taskPolicyDefinition(), workflowDefinition(), workflowDefinitionsDefinition(steps, settings), workflowEnablementDefinition(), personaDefinition(), curatorDefinition(), soulDefinition(), scheduleDefinition(), agentProfileDefinition(), playbooksDefinition(), skillsDefinition(), credentialBindingsDefinition(), identityGrantsDefinition(), reviewSettingsDefinition(), orgModelPolicyDefinition()}
|
||||
definitions = append(definitions, modelDefinitions()...)
|
||||
definitions = append(definitions, operationalDefinitions()...)
|
||||
return definitions
|
||||
|
||||
@@ -2,7 +2,6 @@ package controlplane
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
@@ -75,21 +74,13 @@ func validServices(owner string, services []string) error {
|
||||
// each is its own resource, applies without a restart, and a stored value
|
||||
// replaces the file's outright.
|
||||
func layerCredentials(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, out *config.Config) error {
|
||||
if err := layerResource(ctx, reader, versions, CredentialBindingsKind, func(value []byte) error {
|
||||
var bindings []credentialBinding
|
||||
if err := json.Unmarshal(value, &bindings); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, CredentialBindingsKind, func(bindings []credentialBinding) error {
|
||||
out.Containers.Credentials = credentialBindingsSettings(bindings)
|
||||
return nil
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
return layerResource(ctx, reader, versions, IdentityGrantsKind, func(value []byte) error {
|
||||
var doc identityGrants
|
||||
if err := json.Unmarshal(value, &doc); err != nil {
|
||||
return err
|
||||
}
|
||||
return layerResource(ctx, reader, versions, IdentityGrantsKind, func(doc identityGrants) error {
|
||||
applyIdentityGrants(out, doc)
|
||||
return nil
|
||||
})
|
||||
|
||||
@@ -10,8 +10,8 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
ProviderSettingsKind = "provider-settings"
|
||||
ModelRoleAssignmentsKind = "model-role-assignments"
|
||||
ProviderSettingsKind = "provider-settings"
|
||||
ModelAliasesKind = "model-aliases"
|
||||
)
|
||||
|
||||
var bootDerivedProviderEnv = regexp.MustCompile(`^ARCHIE_PROVIDER_[0-9A-F]{16}_API_KEY$`)
|
||||
@@ -27,7 +27,7 @@ type providerDocument struct {
|
||||
func modelDefinitions() []Definition {
|
||||
return []Definition{
|
||||
{Kind: ProviderSettingsKind, Title: "Providers", ApplyMode: "live", Document: map[string]providerDocument{}, Seed: seedProviders, Validate: validateProviders},
|
||||
{Kind: ModelRoleAssignmentsKind, Title: "Model role assignments", ApplyMode: "live", Document: map[string]string{}, Seed: func(cfg config.Config) any { return cfg.Models }, Validate: validateModelRoles},
|
||||
{Kind: ModelAliasesKind, Title: "Model aliases", ApplyMode: "live", Document: map[string]string{}, Seed: func(cfg config.Config) any { return cfg.Models }, Validate: validateModelAliases},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,11 +66,16 @@ func rejectBootDerivedProviderEnv(name string, provider providerDocument) error
|
||||
return nil
|
||||
}
|
||||
|
||||
func validateModelRoles(input []byte) error {
|
||||
var modelAliasName = regexp.MustCompile(`^[a-z0-9][a-z0-9._-]*$`)
|
||||
|
||||
func validateModelAliases(input []byte) error {
|
||||
return validateAs(input, func(models map[string]string) error {
|
||||
for role, model := range models {
|
||||
if strings.TrimSpace(role) == "" || !strings.Contains(model, "/") {
|
||||
return fmt.Errorf("model role %q must reference provider/model", role)
|
||||
for alias, model := range models {
|
||||
if !modelAliasName.MatchString(alias) {
|
||||
return fmt.Errorf("model alias %q must be lowercase letters, digits, '.', '_' or '-'", alias)
|
||||
}
|
||||
if provider, name, ok := strings.Cut(model, "/"); !ok || provider == "" || name == "" {
|
||||
return fmt.Errorf("model alias %q must reference provider/model", alias)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/domain/workintake"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/configuration"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
"github.com/samcharles93/archie-core/internal/releaseupdate"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -18,6 +19,7 @@ const (
|
||||
PluginSettingsKind = "plugin-settings"
|
||||
ContainerRuntimePoliciesKind = "container-runtime-policies"
|
||||
ExtensionSettingsKind = controlplanerpc.ExtensionSettingsKind
|
||||
UpdateSettingsKind = controlplanerpc.UpdateSettingsKind
|
||||
)
|
||||
|
||||
type schedulingPolicy struct {
|
||||
@@ -34,7 +36,7 @@ type pluginSettings struct {
|
||||
|
||||
func operationalDefinitions() []Definition {
|
||||
return []Definition{
|
||||
{Kind: RepositoryPoliciesKind, Title: "Repository policies", ApplyMode: "live", Document: []config.Repo{}, Seed: func(cfg config.Config) any { return cfg.Repos }, Validate: validateRepositories},
|
||||
{Kind: RepositoryPoliciesKind, Title: "Repository policies", ApplyMode: "live", Document: []config.Repo{}, Seed: func(cfg config.Config) any { return append([]config.Repo{}, cfg.Repos...) }, Validate: validateRepositories},
|
||||
// Restart-required: the Messaging Service, which owns the channel
|
||||
// transports, reconciles them live and archied re-layers each update, but
|
||||
// the Gateway's chat surfaces (workspace tools, rate limit, model
|
||||
@@ -59,6 +61,8 @@ func operationalDefinitions() []Definition {
|
||||
{Kind: ExtensionSettingsKind, Title: "Extension settings", ApplyMode: "live", Document: controlplanerpc.ExtensionSettings{}, Seed: func(config.Config) any { return controlplanerpc.ExtensionSettings{} }, Validate: validateExtensions},
|
||||
// Live: the container pool reads these on every acquire and the dispatcher
|
||||
// is resized on publish.
|
||||
// Live: every check and install reads the channel afresh.
|
||||
{Kind: UpdateSettingsKind, Title: "Update settings", ApplyMode: "live", Document: controlplanerpc.UpdateSettings{}, Seed: func(config.Config) any { return controlplanerpc.UpdateSettings{Channel: "stable"} }, Validate: validateUpdateSettings},
|
||||
{Kind: ContainerRuntimePoliciesKind, Title: "Container runtime policies", ApplyMode: "live", Document: containerRuntimePolicies{}, Seed: seedContainerPolicies, Validate: validateContainers, Normalize: normalizeContainerPolicies},
|
||||
}
|
||||
}
|
||||
@@ -119,3 +123,10 @@ func validateScheduling(input []byte) error {
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
// validateUpdateSettings refuses a channel the update scripts cannot select.
|
||||
func validateUpdateSettings(input []byte) error {
|
||||
return validateAs(input, func(doc controlplanerpc.UpdateSettings) error {
|
||||
return releaseupdate.ValidateChannel(doc.Channel, doc.Pin)
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,234 @@
|
||||
package controlplane
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
)
|
||||
|
||||
// OrgModelPolicyKind is the instance's per-org model policy. Only the
|
||||
// system org writes it.
|
||||
const OrgModelPolicyKind = "org-model-policy"
|
||||
|
||||
// orgModelPolicy is what one org may use. An org with no entry may use
|
||||
// nothing until the instance admin allows it; the system org is never
|
||||
// restricted.
|
||||
type orgModelPolicy struct {
|
||||
// Allowed lists the "provider/model" refs the org may use; "provider/*"
|
||||
// allows every model of an instance provider.
|
||||
Allowed []string `json:"allowed"`
|
||||
// OwnProviders lets the org add providers under its own credentials.
|
||||
OwnProviders bool `json:"own_providers"`
|
||||
}
|
||||
|
||||
func (p *orgModelPolicy) allows(ref string) bool {
|
||||
if p == nil {
|
||||
return false
|
||||
}
|
||||
provider, _, _ := strings.Cut(ref, "/")
|
||||
return slices.Contains(p.Allowed, ref) || slices.Contains(p.Allowed, provider+"/*")
|
||||
}
|
||||
|
||||
func orgModelPolicyDefinition() Definition {
|
||||
return Definition{
|
||||
Kind: OrgModelPolicyKind, Title: "Org model policy", ApplyMode: "live",
|
||||
Document: map[string]orgModelPolicy{},
|
||||
Seed: func(config.Config) any { return map[string]orgModelPolicy{} },
|
||||
Validate: func(input []byte) error {
|
||||
return validateAs(input, func(policies map[string]orgModelPolicy) error {
|
||||
for orgID, policy := range policies {
|
||||
if orgID == storecontract.DefaultOrgID {
|
||||
return fmt.Errorf("the system org uses every instance model; it takes no policy")
|
||||
}
|
||||
for _, ref := range policy.Allowed {
|
||||
if provider, model, ok := strings.Cut(ref, "/"); !ok || provider == "" || model == "" {
|
||||
return fmt.Errorf("org %q allows %q; use provider/model or provider/*", orgID, ref)
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// ModelsFor resolves orgID's effective aliases and its own providers: the
|
||||
// instance aliases it may use, with its own aliases over them. An alias
|
||||
// whose model the org may not use is left out, so it fails as unknown.
|
||||
func (s *Server) ModelsFor(ctx context.Context, orgID string) (config.OrgModels, error) {
|
||||
instance, err := s.modelAliases(ctx, storecontract.DefaultOrgID)
|
||||
if err != nil || orgID == "" || orgID == storecontract.DefaultOrgID {
|
||||
return config.OrgModels{Org: orgID, Aliases: instance}, err
|
||||
}
|
||||
policy, err := s.orgPolicy(ctx, orgID)
|
||||
if err != nil {
|
||||
return config.OrgModels{}, err
|
||||
}
|
||||
providers, err := s.orgProviders(ctx, orgID, policy)
|
||||
if err != nil {
|
||||
return config.OrgModels{}, err
|
||||
}
|
||||
own, err := s.modelAliases(ctx, orgID)
|
||||
if err != nil {
|
||||
return config.OrgModels{}, err
|
||||
}
|
||||
aliases := make(map[string]string, len(instance)+len(own))
|
||||
for alias, ref := range instance {
|
||||
if policy.allows(ref) {
|
||||
aliases[alias] = ref
|
||||
}
|
||||
}
|
||||
for alias, ref := range own {
|
||||
if usable(ref, policy, providers) {
|
||||
aliases[alias] = ref
|
||||
} else {
|
||||
delete(aliases, alias)
|
||||
}
|
||||
}
|
||||
return config.OrgModels{Org: orgID, Aliases: aliases, Providers: providers}, nil
|
||||
}
|
||||
|
||||
func usable(ref string, policy *orgModelPolicy, own map[string]config.Provider) bool {
|
||||
provider, _, _ := strings.Cut(ref, "/")
|
||||
if _, ok := own[provider]; ok {
|
||||
return true
|
||||
}
|
||||
return policy.allows(ref)
|
||||
}
|
||||
|
||||
func (s *Server) orgPolicy(ctx context.Context, orgID string) (*orgModelPolicy, error) {
|
||||
var policies map[string]orgModelPolicy
|
||||
if err := s.readResource(ctx, storecontract.DefaultOrgID, OrgModelPolicyKind, &policies); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
policy, ok := policies[orgID]
|
||||
if !ok {
|
||||
return nil, nil
|
||||
}
|
||||
return &policy, nil
|
||||
}
|
||||
|
||||
// orgProviders is orgID's own providers, empty unless its policy allows them.
|
||||
func (s *Server) orgProviders(ctx context.Context, orgID string, policy *orgModelPolicy) (map[string]config.Provider, error) {
|
||||
out := map[string]config.Provider{}
|
||||
if policy == nil || !policy.OwnProviders {
|
||||
return out, nil
|
||||
}
|
||||
var docs map[string]providerDocument
|
||||
if err := s.readResource(ctx, orgID, ProviderSettingsKind, &docs); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for name, doc := range docs {
|
||||
out[name] = config.Provider{Class: doc.Class, BaseURL: doc.BaseURL, APIKeyEnv: doc.APIKeyEnv}
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (s *Server) modelAliases(ctx context.Context, orgID string) (map[string]string, error) {
|
||||
aliases := map[string]string{}
|
||||
return aliases, s.readResource(ctx, orgID, ModelAliasesKind, &aliases)
|
||||
}
|
||||
|
||||
// readResource decodes orgID's kind into into, leaving it untouched when the
|
||||
// org has none.
|
||||
func (s *Server) readResource(ctx context.Context, orgID, kind string, into any) error {
|
||||
resource, err := s.store.Resource(ctx, orgID, kind)
|
||||
if errors.Is(err, storecontract.ErrResourceNotFound) {
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := json.Unmarshal(resource.Value, into); err != nil {
|
||||
return fmt.Errorf("read %s %s: %w", orgID, kind, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// checkOrgWrite applies the rules a resource's static validation cannot: the
|
||||
// policy is the system org's alone, an org's providers need its policy's
|
||||
// leave and its own credentials, and every alias must name a model the
|
||||
// writing org may use.
|
||||
func (s *Server) checkOrgWrite(ctx context.Context, orgID, kind string, value []byte) error {
|
||||
switch kind {
|
||||
case OrgModelPolicyKind:
|
||||
if orgID != storecontract.DefaultOrgID {
|
||||
return fmt.Errorf("%w: only the system org sets org model policy", ErrValidation)
|
||||
}
|
||||
case ProviderSettingsKind:
|
||||
if orgID != storecontract.DefaultOrgID {
|
||||
return s.checkOrgProviders(ctx, orgID, value)
|
||||
}
|
||||
case ModelAliasesKind:
|
||||
return s.checkAliasWrite(ctx, orgID, value)
|
||||
case WorkflowDefinitionsKind:
|
||||
return s.checkModelAliases(ctx, orgID, value)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Server) checkOrgProviders(ctx context.Context, orgID string, value []byte) error {
|
||||
var docs map[string]providerDocument
|
||||
if err := json.Unmarshal(value, &docs); err != nil {
|
||||
return err
|
||||
}
|
||||
if len(docs) == 0 {
|
||||
return nil
|
||||
}
|
||||
policy, err := s.orgPolicy(ctx, orgID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if policy == nil || !policy.OwnProviders {
|
||||
return fmt.Errorf("%w: org %s may not add its own providers (instance Settings > Models > Org access)", ErrValidation, orgID)
|
||||
}
|
||||
var instance map[string]providerDocument
|
||||
if err := s.readResource(ctx, storecontract.DefaultOrgID, ProviderSettingsKind, &instance); err != nil {
|
||||
return err
|
||||
}
|
||||
for name, doc := range docs {
|
||||
if _, taken := instance[name]; taken {
|
||||
return fmt.Errorf("%w: provider %q is an instance provider; name yours differently", ErrValidation, name)
|
||||
}
|
||||
// The key comes from the org's own credential binding named after
|
||||
// the provider, never a secret this org could point at elsewhere.
|
||||
if doc.APIKey != (config.SecretRef{}) {
|
||||
return fmt.Errorf("%w: provider %q: an org provider takes its key from the org's credential binding named %q, not a secret reference", ErrValidation, name, name)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Server) checkAliasWrite(ctx context.Context, orgID string, value []byte) error {
|
||||
var aliases map[string]string
|
||||
if err := json.Unmarshal(value, &aliases); err != nil {
|
||||
return err
|
||||
}
|
||||
if orgID == storecontract.DefaultOrgID {
|
||||
if _, ok := aliases[config.DefaultModelAlias]; !ok && len(aliases) > 0 {
|
||||
return fmt.Errorf("%w: model alias %q is required", ErrValidation, config.DefaultModelAlias)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
policy, err := s.orgPolicy(ctx, orgID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
providers, err := s.orgProviders(ctx, orgID, policy)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, alias := range slices.Sorted(maps.Keys(aliases)) {
|
||||
if !usable(aliases[alias], policy, providers) {
|
||||
return fmt.Errorf("%w: model alias %q: org %s may not use %q", ErrValidation, alias, orgID, aliases[alias])
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
package controlplane_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"maps"
|
||||
"slices"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/controlplane"
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/identity"
|
||||
"github.com/samcharles93/archie-core/internal/domain/org"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/postgres/pgstore"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/workflowsteps"
|
||||
)
|
||||
|
||||
// An org reaches only the models the instance admin allows it and the
|
||||
// providers it was allowed to add; an org with no policy reaches nothing.
|
||||
func TestOrgModelPolicy(t *testing.T) {
|
||||
ctx := t.Context()
|
||||
db := pgstore.Open(t)
|
||||
if err := db.BootstrapIdentities(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.UpgradeDefaultOrg(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
steps, err := workflowsteps.NewManager()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server, err := controlplane.NewServer(db, steps)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
owner, err := db.Create(ctx, identity.Identity{ID: "owner", Kind: identity.KindUser, DisplayName: "Owner", Lifecycle: identity.LifecycleActive}, identity.Audit{ActorID: identity.SystemID, Source: "test", RequestID: "owner", At: time.Now()})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, id := range []org.OrgID{"acme", "newco"} {
|
||||
if _, err := db.CreateOrg(ctx, org.Org{ID: id, Name: string(id)}, owner.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
sys := org.WithOrg(ctx, org.DefaultOrgID)
|
||||
acme := org.WithOrg(ctx, "acme")
|
||||
put := func(ctx context.Context, kind, value string) error {
|
||||
_, err := server.Command(ctx, &pb.CommandRequest{Kind: kind, Command: "replace", ValueJson: []byte(value), Actor: "test", Source: "test", RequestId: kind + value})
|
||||
return err
|
||||
}
|
||||
for _, w := range [][2]string{
|
||||
{controlplane.ProviderSettingsKind, `{"openai":{"class":"openai","api_key_ref":{}},"deepseek":{"class":"deepseek","api_key_ref":{}}}`},
|
||||
{controlplane.ModelAliasesKind, `{"default":"openai/gpt-6-luna","cheap":"deepseek/chat"}`},
|
||||
{controlplane.OrgModelPolicyKind, `{"acme":{"allowed":["openai/*"],"own_providers":true}}`},
|
||||
} {
|
||||
if err := put(sys, w[0], w[1]); err != nil {
|
||||
t.Fatalf("seed %s: %v", w[0], err)
|
||||
}
|
||||
}
|
||||
|
||||
for _, tt := range []struct {
|
||||
name, kind, value string
|
||||
ok bool
|
||||
}{
|
||||
{"an alias to a model the org may not use", controlplane.ModelAliasesKind, `{"fast":"deepseek/chat"}`, false},
|
||||
{"an org provider named like an instance one", controlplane.ProviderSettingsKind, `{"openai":{"class":"openai","api_key_ref":{}}}`, false},
|
||||
{"an org provider pointing at a secret", controlplane.ProviderSettingsKind, `{"mine":{"class":"openai","api_key_ref":{"engine":"env","key":"X"}}}`, false},
|
||||
{"an org writing the instance policy", controlplane.OrgModelPolicyKind, `{"acme":{"allowed":["deepseek/*"]}}`, false},
|
||||
{"an org provider of its own", controlplane.ProviderSettingsKind, `{"mine":{"class":"openai","api_key_ref":{}}}`, true},
|
||||
{"aliases to allowed and own models", controlplane.ModelAliasesKind, `{"fast":"openai/gpt-6-mini","own":"mine/m1"}`, true},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if err := put(acme, tt.kind, tt.value); (err == nil) != tt.ok {
|
||||
t.Fatalf("err = %v, want ok %v", err, tt.ok)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
for _, tt := range []struct {
|
||||
org string
|
||||
aliases, prov []string
|
||||
}{
|
||||
{"acme", []string{"default", "fast", "own"}, []string{"mine"}},
|
||||
{"newco", nil, nil},
|
||||
{string(org.DefaultOrgID), []string{"cheap", "default"}, nil},
|
||||
} {
|
||||
t.Run("resolve "+tt.org, func(t *testing.T) {
|
||||
models, err := server.ModelsFor(ctx, tt.org)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := slices.Sorted(maps.Keys(models.Aliases)); strings.Join(got, ",") != strings.Join(tt.aliases, ",") {
|
||||
t.Fatalf("aliases = %v, want %v", got, tt.aliases)
|
||||
}
|
||||
if got := slices.Sorted(maps.Keys(models.Providers)); strings.Join(got, ",") != strings.Join(tt.prov, ",") {
|
||||
t.Fatalf("providers = %v, want %v", got, tt.prov)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"time"
|
||||
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/applystatus"
|
||||
"github.com/samcharles93/archie-core/internal/domain/eda/playbook"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/controlplanerpc"
|
||||
@@ -21,8 +22,9 @@ const playbookQueryTimeout = 5 * time.Second
|
||||
// cannot be reached, or a document that no longer compiles, leaves the last
|
||||
// good set in force.
|
||||
type LivePlaybooks struct {
|
||||
rpc pb.ControlPlaneServiceClient
|
||||
log *slog.Logger
|
||||
rpc pb.ControlPlaneServiceClient
|
||||
log *slog.Logger
|
||||
ApplyStatus *applystatus.Reporter
|
||||
|
||||
mu sync.Mutex
|
||||
version int64
|
||||
@@ -40,23 +42,28 @@ func (l *LivePlaybooks) current(ctx context.Context) *playbook.Store {
|
||||
defer cancel()
|
||||
response, err := l.rpc.Query(ctx, &pb.QueryRequest{Kind: PlaybooksKind})
|
||||
if err != nil {
|
||||
l.ApplyStatus.Report(ctx, PlaybooksKind, 0, err)
|
||||
l.log.Warn("eda playbooks unavailable; keeping the last good set", "err", controlplanerpc.ClientError(err))
|
||||
return l.store
|
||||
}
|
||||
if l.store != nil && response.Resource.Version == l.version {
|
||||
l.ApplyStatus.Report(ctx, PlaybooksKind, l.version, nil)
|
||||
return l.store
|
||||
}
|
||||
var collection PlaybookCollection
|
||||
if err := json.Unmarshal(response.Resource.ValueJson, &collection); err != nil {
|
||||
l.ApplyStatus.Report(ctx, PlaybooksKind, response.Resource.Version, err)
|
||||
l.log.Error("eda playbooks undecodable; keeping the last good set", "err", err)
|
||||
return l.store
|
||||
}
|
||||
store, err := CompilePlaybooks(collection)
|
||||
if err != nil {
|
||||
l.ApplyStatus.Report(ctx, PlaybooksKind, response.Resource.Version, err)
|
||||
l.log.Error("eda playbooks do not compile; keeping the last good set", "err", err)
|
||||
return l.store
|
||||
}
|
||||
l.version, l.store = response.Resource.Version, store
|
||||
l.ApplyStatus.Report(ctx, PlaybooksKind, l.version, nil)
|
||||
l.log.Info("eda playbooks loaded", "version", l.version, "playbooks", len(store.Playbooks))
|
||||
return store
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ func (s *Server) ImportConfig(ctx context.Context, cfg config.Config) (map[strin
|
||||
versions := make(map[string]int64, len(s.ordered))
|
||||
var skipped []SeedSkip
|
||||
for _, definition := range s.ordered {
|
||||
version, err := s.seedKind(ctx, definition, cfg)
|
||||
version, err := s.seedKind(ctx, storecontract.DefaultOrgID, definition, cfg)
|
||||
var refusal *seedRefusal
|
||||
switch {
|
||||
case errors.As(err, &refusal):
|
||||
@@ -100,6 +100,18 @@ func (s *Server) ImportConfig(ctx context.Context, cfg config.Config) (map[strin
|
||||
versions[definition.Kind] = version
|
||||
}
|
||||
}
|
||||
resources, err := s.store.ListResources(ctx)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
for _, resource := range resources {
|
||||
if resource.OrgID == storecontract.DefaultOrgID || resource.Kind != WorkflowDefinitionsKind {
|
||||
continue
|
||||
}
|
||||
if _, err := s.seedKind(ctx, resource.OrgID, s.definitions[resource.Kind], config.Config{}); err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
return versions, skipped, nil
|
||||
}
|
||||
|
||||
@@ -115,8 +127,8 @@ func (r *seedRefusal) Unwrap() error { return r.err }
|
||||
|
||||
// seedKind seeds, refreshes or leaves one kind and returns its version. A
|
||||
// *seedRefusal means the seed failed validation and nothing was written.
|
||||
func (s *Server) seedKind(ctx context.Context, definition Definition, cfg config.Config) (int64, error) {
|
||||
stored, storedErr := s.store.Resource(ctx, storecontract.DefaultOrgID, definition.Kind)
|
||||
func (s *Server) seedKind(ctx context.Context, orgID string, definition Definition, cfg config.Config) (int64, error) {
|
||||
stored, storedErr := s.store.Resource(ctx, orgID, definition.Kind)
|
||||
absent := errors.Is(storedErr, storecontract.ErrResourceNotFound)
|
||||
if storedErr != nil && !absent {
|
||||
return 0, storedErr
|
||||
@@ -133,7 +145,7 @@ func (s *Server) seedKind(ctx context.Context, definition Definition, cfg config
|
||||
return stored.Version, nil
|
||||
}
|
||||
if !absent {
|
||||
refresh, err := s.shippedValueIsStale(ctx, definition)
|
||||
refresh, err := s.shippedValueIsStale(ctx, orgID, definition)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
@@ -142,7 +154,7 @@ func (s *Server) seedKind(ctx context.Context, definition Definition, cfg config
|
||||
}
|
||||
}
|
||||
write := storecontract.ResourceWrite{
|
||||
OrgID: storecontract.DefaultOrgID, Kind: definition.Kind, Value: value,
|
||||
OrgID: orgID, Kind: definition.Kind, Value: value,
|
||||
Actor: seedActor, Source: seedSource,
|
||||
RequestID: seedRequestID(definition.Kind, value),
|
||||
ExpectedVersion: expectedVersion(stored, absent), At: time.Now().UTC(),
|
||||
@@ -165,18 +177,18 @@ func expectedVersion(stored storecontract.Resource, absent bool) int64 {
|
||||
|
||||
// shippedValueIsStale reports whether the newest stored revision of a
|
||||
// shipped document was written by the seed.
|
||||
func (s *Server) shippedValueIsStale(ctx context.Context, definition Definition) (bool, error) {
|
||||
func (s *Server) shippedValueIsStale(ctx context.Context, orgID string, definition Definition) (bool, error) {
|
||||
if definition.Defaults == nil {
|
||||
return false, nil
|
||||
}
|
||||
return s.seedWroteNewest(ctx, definition.Kind)
|
||||
return s.seedWroteNewest(ctx, orgID, definition.Kind)
|
||||
}
|
||||
|
||||
// seedWroteNewest reports whether the newest revision of kind was written by a
|
||||
// seed. It reads the ledger rather than the current row because the ledger is
|
||||
// what records who wrote a value, and the row does not.
|
||||
func (s *Server) seedWroteNewest(ctx context.Context, kind string) (bool, error) {
|
||||
history, err := s.store.ResourceHistory(ctx, storecontract.DefaultOrgID, kind, 1)
|
||||
func (s *Server) seedWroteNewest(ctx context.Context, orgID, kind string) (bool, error) {
|
||||
history, err := s.store.ResourceHistory(ctx, orgID, kind, 1)
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("read %s history: %w", kind, err)
|
||||
}
|
||||
@@ -231,19 +243,20 @@ func (s *Server) Owns(kind string) bool {
|
||||
// ValidateStored decodes every stored resource with its definition and
|
||||
// returns how many it checked. Errors name the kind and revision.
|
||||
func (s *Server) ValidateStored(ctx context.Context) (int, error) {
|
||||
resources, err := s.store.ListResources(ctx)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
checked := 0
|
||||
var failures []error
|
||||
for _, definition := range s.ordered {
|
||||
resource, err := s.store.Resource(ctx, storecontract.DefaultOrgID, definition.Kind)
|
||||
if errors.Is(err, storecontract.ErrResourceNotFound) {
|
||||
for _, resource := range resources {
|
||||
definition, ok := s.definitions[resource.Kind]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
return checked, fmt.Errorf("read %s: %w", definition.Kind, err)
|
||||
}
|
||||
checked++
|
||||
if _, err := definition.Decode(resource.Value); err != nil {
|
||||
failures = append(failures, fmt.Errorf("%s at version %d: %w", definition.Kind, resource.Version, err))
|
||||
failures = append(failures, fmt.Errorf("org %s: %s at version %d: %w", resource.OrgID, definition.Kind, resource.Version, err))
|
||||
}
|
||||
}
|
||||
return checked, errors.Join(failures...)
|
||||
|
||||
@@ -68,11 +68,7 @@ func (r storeReader) Query(ctx context.Context, kind string, decode func([]byte)
|
||||
func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReader, base config.Config) (config.Config, map[string]int64, error) {
|
||||
out := base.Clone()
|
||||
versions := map[string]int64{}
|
||||
if err := layerResource(ctx, reader, versions, ProviderSettingsKind, func(value []byte) error {
|
||||
var providers map[string]providerDocument
|
||||
if err := json.Unmarshal(value, &providers); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, ProviderSettingsKind, func(providers map[string]providerDocument) error {
|
||||
out.Providers = make(map[string]config.Provider, len(providers))
|
||||
for name, provider := range providers {
|
||||
if err := rejectBootDerivedProviderEnv(name, provider); err != nil {
|
||||
@@ -84,13 +80,9 @@ func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReade
|
||||
}); err != nil {
|
||||
return config.Config{}, nil, err
|
||||
}
|
||||
// Stored role assignments replace cfg.Models outright.
|
||||
if err := layerResource(ctx, reader, versions, ModelRoleAssignmentsKind, func(value []byte) error {
|
||||
var roles map[string]string
|
||||
if err := json.Unmarshal(value, &roles); err != nil {
|
||||
return err
|
||||
}
|
||||
out.Models = roles
|
||||
// Stored aliases replace cfg.Models outright.
|
||||
if err := layerResource(ctx, reader, versions, ModelAliasesKind, func(aliases map[string]string) error {
|
||||
out.Models = aliases
|
||||
return nil
|
||||
}); err != nil {
|
||||
return config.Config{}, nil, err
|
||||
@@ -103,11 +95,7 @@ func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReade
|
||||
return config.Config{}, nil, err
|
||||
}
|
||||
out.Chat, versions[ChannelSettingsKind] = chat, chatVersion
|
||||
if err := layerResource(ctx, reader, versions, SchedulingPolicyKind, func(value []byte) error {
|
||||
var policy schedulingPolicy
|
||||
if err := json.Unmarshal(value, &policy); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, SchedulingPolicyKind, func(policy schedulingPolicy) error {
|
||||
interval, err := time.ParseDuration(policy.PollInterval)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -125,11 +113,7 @@ func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReade
|
||||
// The two fields are assigned individually, not `out.Review = ...`: a field
|
||||
// added to config.Review later keeps the file's value until the stored
|
||||
// document carries it.
|
||||
if err := layerResource(ctx, reader, versions, ReviewSettingsKind, func(value []byte) error {
|
||||
var settings reviewSettings
|
||||
if err := json.Unmarshal(value, &settings); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, ReviewSettingsKind, func(settings reviewSettings) error {
|
||||
out.Review.PrecisionGate = settings.PrecisionGate
|
||||
out.Review.ApproveBeforePost = settings.ApproveBeforePost
|
||||
return nil
|
||||
@@ -140,11 +124,14 @@ func runtimeConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReade
|
||||
}
|
||||
|
||||
func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, out config.Config) (config.Config, map[string]int64, error) {
|
||||
if err := layerResource(ctx, reader, versions, ToolSettingsKind, func(value []byte) error {
|
||||
var settings toolSettings
|
||||
if err := json.Unmarshal(value, &settings); err != nil {
|
||||
return err
|
||||
}
|
||||
policy := taskPolicy{DiffCapLines: out.DiffCap(), NotifyWebhook: out.Notify.Webhook}
|
||||
if err := layerResourceJSON(ctx, reader, versions, TaskPolicyKind, &policy); err != nil {
|
||||
return config.Config{}, nil, err
|
||||
}
|
||||
out.DiffCapLines = new(policy.DiffCapLines)
|
||||
out.Notify.Webhook = policy.NotifyWebhook
|
||||
|
||||
if err := layerResource(ctx, reader, versions, ToolSettingsKind, func(settings toolSettings) error {
|
||||
headers := make(map[string]map[string]string, len(out.Tools.MCPServers))
|
||||
fileParallelToolCalls := make(map[string]bool, len(out.Tools.MCPServers))
|
||||
for _, server := range out.Tools.MCPServers {
|
||||
@@ -177,21 +164,13 @@ func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceR
|
||||
}); err != nil {
|
||||
return config.Config{}, nil, err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, PluginSettingsKind, func(value []byte) error {
|
||||
var settings pluginSettings
|
||||
if err := json.Unmarshal(value, &settings); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, PluginSettingsKind, func(settings pluginSettings) error {
|
||||
out.SkillsDir = settings.SkillsDir
|
||||
return nil
|
||||
}); err != nil {
|
||||
return config.Config{}, nil, err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, ContainerRuntimePoliciesKind, func(value []byte) error {
|
||||
var policies containerRuntimePolicies
|
||||
if err := json.Unmarshal(value, &policies); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, ContainerRuntimePoliciesKind, func(policies containerRuntimePolicies) error {
|
||||
// Keep the file-owned Profiles and RegistryAuth across the replacement.
|
||||
profiles := out.Containers.Profiles
|
||||
registryAuth := out.Containers.RegistryAuth
|
||||
@@ -203,11 +182,7 @@ func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceR
|
||||
return config.Config{}, nil, err
|
||||
}
|
||||
// Stored profiles replace the file's outright.
|
||||
if err := layerResource(ctx, reader, versions, AgentProfileKind, func(value []byte) error {
|
||||
var profiles map[string]agentProfile
|
||||
if err := json.Unmarshal(value, &profiles); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := layerResource(ctx, reader, versions, AgentProfileKind, func(profiles map[string]agentProfile) error {
|
||||
out.Containers.Profiles = agentProfilesSettings(profiles)
|
||||
return nil
|
||||
}); err != nil {
|
||||
@@ -217,9 +192,25 @@ func runtimeToolConfigFrom(ctx context.Context, reader controlplanerpc.ResourceR
|
||||
return out, versions, err
|
||||
}
|
||||
|
||||
// layerResource decodes a stored resource and records its version. A kind
|
||||
// with no stored value is skipped.
|
||||
func layerResource(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, decode func([]byte) error) error {
|
||||
// layerResource decodes a stored JSON resource into a T, applies it and
|
||||
// records its version. A kind with no stored value is skipped.
|
||||
func layerResource[T any](ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, apply func(T) error) error {
|
||||
return layerRaw(ctx, reader, versions, kind, func(value []byte) error {
|
||||
var v T
|
||||
if err := json.Unmarshal(value, &v); err != nil {
|
||||
return err
|
||||
}
|
||||
return apply(v)
|
||||
})
|
||||
}
|
||||
|
||||
// layerResourceJSON decodes a stored resource over target, keeping fields
|
||||
// the stored document omits.
|
||||
func layerResourceJSON(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, target any) error {
|
||||
return layerRaw(ctx, reader, versions, kind, func(value []byte) error { return json.Unmarshal(value, target) })
|
||||
}
|
||||
|
||||
func layerRaw(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, decode func([]byte) error) error {
|
||||
version, found, err := reader.Query(ctx, kind, decode)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -230,10 +221,6 @@ func layerResource(ctx context.Context, reader controlplanerpc.ResourceReader, v
|
||||
return nil
|
||||
}
|
||||
|
||||
func layerResourceJSON(ctx context.Context, reader controlplanerpc.ResourceReader, versions map[string]int64, kind string, target any) error {
|
||||
return layerResource(ctx, reader, versions, kind, func(value []byte) error { return json.Unmarshal(value, target) })
|
||||
}
|
||||
|
||||
// query returns the version of the resource it decoded, so callers that layer
|
||||
// a resource in can report the version they applied. A kind the store holds no
|
||||
// value for is reported as not found rather than as an error: the caller leaves
|
||||
|
||||
@@ -29,6 +29,9 @@ func scheduleDefinition() Definition {
|
||||
func validateSchedules(jobs []scheduling.JobSpec) error {
|
||||
seen := make(map[string]struct{}, len(jobs))
|
||||
for _, job := range jobs {
|
||||
if err := scheduling.RefuseDangerousJob(job); err != nil {
|
||||
return err
|
||||
}
|
||||
if strings.TrimSpace(job.ID) == "" {
|
||||
return fmt.Errorf("schedule ID is required")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package controlplane
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
)
|
||||
|
||||
const TaskPolicyKind = "task-policy"
|
||||
|
||||
type taskPolicy struct {
|
||||
DiffCapLines int `json:"diff_cap_lines"`
|
||||
NotifyWebhook string `json:"notify_webhook"`
|
||||
}
|
||||
|
||||
func taskPolicyDefinition() Definition {
|
||||
return Definition{Kind: TaskPolicyKind, Title: "Task policy", ApplyMode: "live", Document: taskPolicy{}, Seed: func(cfg config.Config) any {
|
||||
return taskPolicy{DiffCapLines: cfg.DiffCap(), NotifyWebhook: cfg.Notify.Webhook}
|
||||
}, Validate: func(input []byte) error {
|
||||
return validateAs(input, func(doc taskPolicy) error {
|
||||
if doc.DiffCapLines < 0 {
|
||||
return fmt.Errorf("diff_cap_lines must not be negative")
|
||||
}
|
||||
if doc.NotifyWebhook != "" {
|
||||
parsed, err := url.Parse(doc.NotifyWebhook)
|
||||
if err != nil || parsed.Host == "" || (parsed.Scheme != "http" && parsed.Scheme != "https") {
|
||||
return fmt.Errorf("notify_webhook must be an HTTP or HTTPS URL")
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}}
|
||||
}
|
||||
+86
-27
@@ -1,40 +1,68 @@
|
||||
{
|
||||
"description": "Shared accept/reject fixtures for the control-plane validators the dashboard hand-mirrors in ui/src/settings/validation.ts. The control plane is the authority: every case's `valid` is what internal/app/controlplane accepts or refuses. The Go test in this package runs the real server validators over these cases; the node test ui/test/control-plane-validator-parity.test.ts runs the real dashboard validators over the same cases. A one-sided change to either rule makes one of the two tests fail, which is the tie that stops the two implementations drifting apart (archie-core-ui-dashboard-3). Add a case here, never only to one side.",
|
||||
"cases": {
|
||||
"model-role-assignments": [
|
||||
"model-aliases": [
|
||||
{
|
||||
"why": "a plain provider/model value",
|
||||
"value": { "builder": "openai/gpt-4o" },
|
||||
"value": {
|
||||
"default": "openai/gpt-4o"
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"why": "a trailing space: the server only asks for a slash, so the dashboard must not refuse it",
|
||||
"value": { "builder": "openai/gpt-4o " },
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"why": "a leading space: the server only asks for a slash, so the dashboard must not refuse it",
|
||||
"value": { "builder": " openai/gpt-4o" },
|
||||
"why": "a trailing space: the server only splits on the slash, so the dashboard must not refuse it",
|
||||
"value": {
|
||||
"default": "openai/gpt-4o "
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"why": "a model id with a colon (a real ollama tag), which a stricter shape would wrongly refuse",
|
||||
"value": { "planner": "ollama/qwen2.5-coder:7b" },
|
||||
"value": {
|
||||
"default": "openai/gpt-4o",
|
||||
"fast": "ollama/qwen2.5-coder:7b"
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"why": "an empty table: nothing configured yet",
|
||||
"value": {},
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"why": "no slash at all",
|
||||
"value": { "builder": "gpt-4o" },
|
||||
"value": {
|
||||
"default": "gpt-4o"
|
||||
},
|
||||
"valid": false
|
||||
},
|
||||
{
|
||||
"why": "an empty model half",
|
||||
"value": {
|
||||
"default": "openai/"
|
||||
},
|
||||
"valid": false
|
||||
},
|
||||
{
|
||||
"why": "an empty model: the server refuses it, so the dashboard must too (SystemModelsPage deletes the key rather than storing one)",
|
||||
"value": { "builder": "" },
|
||||
"value": {
|
||||
"default": ""
|
||||
},
|
||||
"valid": false
|
||||
},
|
||||
{
|
||||
"why": "a blank role key",
|
||||
"value": { "": "openai/gpt-4o" },
|
||||
"why": "aliases without the default alias: an org's own table inherits the instance default, so only the instance save requires it",
|
||||
"value": {
|
||||
"fast": "openai/gpt-4o"
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"why": "an alias name with capitals or spaces",
|
||||
"value": {
|
||||
"default": "openai/gpt-4o",
|
||||
"Fast model": "openai/gpt-4o"
|
||||
},
|
||||
"valid": false
|
||||
}
|
||||
],
|
||||
@@ -45,7 +73,9 @@
|
||||
"poll_interval": "1m0s",
|
||||
"max_retries": 0,
|
||||
"label": "archie",
|
||||
"dispatch": { "trigger": "assignee" }
|
||||
"dispatch": {
|
||||
"trigger": "assignee"
|
||||
}
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
@@ -54,7 +84,9 @@
|
||||
"value": {
|
||||
"poll_interval": "30s",
|
||||
"max_retries": 3,
|
||||
"dispatch": { "trigger": "assignee" }
|
||||
"dispatch": {
|
||||
"trigger": "assignee"
|
||||
}
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
@@ -63,7 +95,9 @@
|
||||
"value": {
|
||||
"poll_interval": "1h30m",
|
||||
"label": "archie",
|
||||
"dispatch": { "trigger": "either" }
|
||||
"dispatch": {
|
||||
"trigger": "either"
|
||||
}
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
@@ -71,7 +105,9 @@
|
||||
"why": "a fractional duration the server's parser accepts",
|
||||
"value": {
|
||||
"poll_interval": "1.5h",
|
||||
"dispatch": { "trigger": "assignee" }
|
||||
"dispatch": {
|
||||
"trigger": "assignee"
|
||||
}
|
||||
},
|
||||
"valid": true
|
||||
},
|
||||
@@ -80,7 +116,9 @@
|
||||
"value": {
|
||||
"poll_interval": "0s",
|
||||
"label": "archie",
|
||||
"dispatch": { "trigger": "assignee" }
|
||||
"dispatch": {
|
||||
"trigger": "assignee"
|
||||
}
|
||||
},
|
||||
"valid": false
|
||||
},
|
||||
@@ -89,7 +127,9 @@
|
||||
"value": {
|
||||
"poll_interval": "nonsense",
|
||||
"label": "archie",
|
||||
"dispatch": { "trigger": "assignee" }
|
||||
"dispatch": {
|
||||
"trigger": "assignee"
|
||||
}
|
||||
},
|
||||
"valid": false
|
||||
},
|
||||
@@ -98,7 +138,9 @@
|
||||
"value": {
|
||||
"poll_interval": "30s",
|
||||
"max_retries": 3,
|
||||
"dispatch": { "trigger": "label" }
|
||||
"dispatch": {
|
||||
"trigger": "label"
|
||||
}
|
||||
},
|
||||
"valid": false
|
||||
},
|
||||
@@ -108,7 +150,9 @@
|
||||
"poll_interval": "30s",
|
||||
"max_retries": 0,
|
||||
"label": "",
|
||||
"dispatch": { "trigger": "either" }
|
||||
"dispatch": {
|
||||
"trigger": "either"
|
||||
}
|
||||
},
|
||||
"valid": false
|
||||
}
|
||||
@@ -120,7 +164,10 @@
|
||||
{
|
||||
"id": "daily",
|
||||
"kind": "workflow",
|
||||
"schedule": { "kind": "interval", "interval": "24h0m0s" }
|
||||
"schedule": {
|
||||
"kind": "interval",
|
||||
"interval": "24h0m0s"
|
||||
}
|
||||
}
|
||||
],
|
||||
"valid": true
|
||||
@@ -132,7 +179,10 @@
|
||||
"id": "nightly",
|
||||
"kind": "workflow",
|
||||
"pool": "parallel",
|
||||
"schedule": { "kind": "cron", "cron": "0 3 * * *" }
|
||||
"schedule": {
|
||||
"kind": "cron",
|
||||
"cron": "0 3 * * *"
|
||||
}
|
||||
}
|
||||
],
|
||||
"valid": true
|
||||
@@ -143,7 +193,10 @@
|
||||
{
|
||||
"id": "",
|
||||
"kind": "workflow",
|
||||
"schedule": { "kind": "interval", "interval": "24h0m0s" }
|
||||
"schedule": {
|
||||
"kind": "interval",
|
||||
"interval": "24h0m0s"
|
||||
}
|
||||
}
|
||||
],
|
||||
"valid": false
|
||||
@@ -154,12 +207,18 @@
|
||||
{
|
||||
"id": "daily",
|
||||
"kind": "workflow",
|
||||
"schedule": { "kind": "interval", "interval": "24h0m0s" }
|
||||
"schedule": {
|
||||
"kind": "interval",
|
||||
"interval": "24h0m0s"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "daily",
|
||||
"kind": "workflow",
|
||||
"schedule": { "kind": "interval", "interval": "1h0m0s" }
|
||||
"schedule": {
|
||||
"kind": "interval",
|
||||
"interval": "1h0m0s"
|
||||
}
|
||||
}
|
||||
],
|
||||
"valid": false
|
||||
|
||||
@@ -30,9 +30,11 @@ func workflowEnablementDefinition() Definition {
|
||||
func (c *Client) WorkflowEnablement(ctx context.Context) (task.WorkflowEnablement, error) {
|
||||
response, err := c.rpc.Query(ctx, &controlpb.QueryRequest{Kind: WorkflowEnablementKind})
|
||||
if err != nil {
|
||||
c.ApplyStatus.Report(ctx, WorkflowEnablementKind, 0, err)
|
||||
return task.WorkflowEnablement{}, controlplanerpc.ClientError(err)
|
||||
}
|
||||
var enablement task.WorkflowEnablement
|
||||
err = json.Unmarshal(response.Resource.ValueJson, &enablement)
|
||||
c.ApplyStatus.Report(ctx, WorkflowEnablementKind, response.Resource.Version, err)
|
||||
return enablement, err
|
||||
}
|
||||
@@ -0,0 +1,209 @@
|
||||
package controlplane_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/app/controlplane"
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
pb "github.com/samcharles93/archie-core/internal/contracts/controlplane/v1"
|
||||
"github.com/samcharles93/archie-core/internal/domain/access"
|
||||
"github.com/samcharles93/archie-core/internal/domain/identity"
|
||||
"github.com/samcharles93/archie-core/internal/domain/org"
|
||||
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
infraaccess "github.com/samcharles93/archie-core/internal/infrastructure/access"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/postgres/pgstore"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/postgres/pgtest"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/rpcidentity"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/staterpc"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/workflowsteps"
|
||||
"github.com/samcharles93/archie-core/internal/webui"
|
||||
)
|
||||
|
||||
func TestMain(m *testing.M) { os.Exit(pgtest.Main(m)) }
|
||||
|
||||
func TestOrgWorkflowResources(t *testing.T) {
|
||||
for _, kind := range []string{controlplane.WorkflowDefinitionsKind, controlplane.WorkflowEnablementKind} {
|
||||
t.Run(kind, func(t *testing.T) {
|
||||
ctx := t.Context()
|
||||
db := pgstore.Open(t)
|
||||
if err := db.BootstrapIdentities(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.UpgradeDefaultOrg(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
steps, err := workflowsteps.NewManager()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server, err := controlplane.NewServer(db, steps)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, _, err := server.ImportConfig(ctx, config.Config{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
owner, err := db.Create(ctx, identity.Identity{ID: "acme-owner", Kind: identity.KindUser, DisplayName: "Owner", Lifecycle: identity.LifecycleActive}, identity.Audit{ActorID: identity.SystemID, Source: "test", RequestID: "owner", At: time.Now()})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := db.CreateOrg(ctx, org.Org{ID: "acme", Name: "Acme"}, owner.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client := workflowRPC(t, server, db)
|
||||
principal, err := db.PrincipalFor(ctx, owner.ID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
other := access.WithPrincipal(ctx, principal)
|
||||
initial, err := client.ControlPlane().Query(other, &pb.QueryRequest{Kind: kind})
|
||||
if err != nil {
|
||||
t.Fatalf("new org cannot read its shipped %s: %v", kind, err)
|
||||
}
|
||||
if initial.Resource.OrgId != "acme" {
|
||||
t.Fatalf("read org %q", initial.Resource.OrgId)
|
||||
}
|
||||
value := []byte(`{"orgs":{"acme":{"disabled":["tdd"]}}}`)
|
||||
if kind == controlplane.WorkflowDefinitionsKind {
|
||||
collection := workflow.ShippedDefinitions()
|
||||
collection.Definitions = append(collection.Definitions, workflow.WorkflowDefinitionEntry{ID: "acme-only", YAML: "id: acme-only\nrepository: none\nsteps:\n - type: workflow.finish\n"})
|
||||
value, err = json.Marshal(collection)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
changed, err := client.ControlPlane().Command(other, &pb.CommandRequest{Kind: kind, Command: "replace", ValueJson: value, ExpectedVersion: initial.Resource.Version, Actor: "owner", Source: "test", RequestId: "edit"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, _, err := server.ImportConfig(ctx, config.Config{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, tc := range []struct {
|
||||
ctxOrg org.OrgID
|
||||
want bool
|
||||
}{{"acme", true}, {org.DefaultOrgID, false}} {
|
||||
queryCtx := ctx
|
||||
if tc.ctxOrg == "acme" {
|
||||
queryCtx = other
|
||||
}
|
||||
got, err := client.ControlPlane().Query(queryCtx, &pb.QueryRequest{Kind: kind})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if strings.Contains(string(got.Resource.ValueJson), "acme") != tc.want {
|
||||
t.Fatalf("org %q got %s", tc.ctxOrg, got.Resource.ValueJson)
|
||||
}
|
||||
if tc.want && got.Resource.Version != changed.Resource.Version {
|
||||
t.Fatalf("boot replaced operator's document")
|
||||
}
|
||||
}
|
||||
if kind == controlplane.WorkflowDefinitionsKind {
|
||||
checkWorkflowDashboard(t, db, client)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func workflowRPC(t *testing.T, control *controlplane.Server, db *pgstore.TaskDB) *staterpc.Client {
|
||||
t.Helper()
|
||||
listener, err := (&net.ListenConfig{}).Listen(t.Context(), "tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = listener.Close() })
|
||||
grants := &staterpc.TaskGrants{}
|
||||
callers := rpcidentity.Callers{Principals: db}
|
||||
srv := grpc.NewServer(grpc.ChainUnaryInterceptor(grants.UnaryInterceptor("test-token"), callers.Unary()), grpc.ChainStreamInterceptor(grants.StreamInterceptor("test-token"), callers.Stream()))
|
||||
staterpc.RegisterServer(srv, staterpc.Deps{ControlPlane: control, Tasks: db, Principals: db, Identities: db})
|
||||
t.Cleanup(srv.Stop)
|
||||
go func() { _ = srv.Serve(listener) }()
|
||||
client, closeClient, err := staterpc.Dial(listener.Addr().String(), "archie-ui", "test-token")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(closeClient)
|
||||
return client
|
||||
}
|
||||
|
||||
func TestValidateStoredOrgWorkflows(t *testing.T) {
|
||||
ctx := t.Context()
|
||||
db := pgstore.Open(t)
|
||||
if err := db.BootstrapIdentities(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.UpgradeDefaultOrg(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
steps, err := workflowsteps.NewManager()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server, err := controlplane.NewServer(db, steps)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := db.CreateOrg(ctx, org.Org{ID: "acme", Name: "Acme"}, identity.SystemID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := db.PutResource(ctx, storecontract.ResourceWrite{OrgID: "acme", Kind: controlplane.WorkflowDefinitionsKind, Value: []byte(`{"definitions":[{"id":"broken","yaml":"id: broken\nsteps:\n - type: nonexistent\n"}]}`), Actor: "owner", Source: "test", RequestID: "invalid"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := server.ValidateStored(ctx); err == nil || !strings.Contains(err.Error(), "acme") {
|
||||
t.Fatalf("invalid org workflow was not reported: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func checkWorkflowDashboard(t *testing.T, db *pgstore.TaskDB, client *staterpc.Client) {
|
||||
t.Helper()
|
||||
ctx := t.Context()
|
||||
policies := append(access.ShippedOrgPolicies("acme"), access.ShippedOrgPolicies(org.DefaultOrgID)...)
|
||||
chain := infraaccess.New(policies)
|
||||
srv := &webui.Server{Store: client, ControlPlane: client.ControlPlane(), Access: chain, Principals: client, Authenticate: func(ctx context.Context, token string) (identity.Identity, error) {
|
||||
return db.Get(ctx, identity.IdentityID(token))
|
||||
}}
|
||||
handler := srv.Handler()
|
||||
for _, tc := range []struct {
|
||||
method, path, body string
|
||||
status int
|
||||
}{
|
||||
{"GET", "/api/workflows", "", http.StatusOK},
|
||||
{"POST", "/api/work-requests", `{"identity":"acme-owner","workflow":"acme-only","title":"Org work","instructions":"Finish"}`, http.StatusCreated},
|
||||
} {
|
||||
r := httptest.NewRequestWithContext(ctx, tc.method, tc.path, strings.NewReader(tc.body))
|
||||
r.Header.Set("Authorization", "Bearer acme-owner")
|
||||
r.Header.Set("Content-Type", "application/json")
|
||||
r.Header.Set("X-Archie-CSRF", "1")
|
||||
w := httptest.NewRecorder()
|
||||
handler.ServeHTTP(w, r)
|
||||
if w.Code != tc.status {
|
||||
t.Fatalf("%s %s: %d %s", tc.method, tc.path, w.Code, w.Body.String())
|
||||
}
|
||||
if tc.method == "GET" && !strings.Contains(w.Body.String(), "acme-only") {
|
||||
t.Fatalf("dashboard omitted the org's workflow: %s", w.Body.String())
|
||||
}
|
||||
if tc.method == "POST" {
|
||||
var reply struct {
|
||||
TaskID int64 `json:"task_id"`
|
||||
}
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &reply); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run, err := db.TaskByID(ctx, reply.TaskID)
|
||||
if err != nil || run.Org != "acme" || run.Workflow != "acme-only" {
|
||||
t.Fatalf("admitted task %#v err %v", run, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,10 @@ func (p *WorkflowProjector) Apply(ctx context.Context, orgID, name, digest strin
|
||||
if err != nil {
|
||||
return fmt.Errorf("contributed workflow %q: %w", contentName, err)
|
||||
}
|
||||
entries = append(entries, workflow.WorkflowDefinitionEntry{ID: id, YAML: string(content)})
|
||||
if workflow.PackageOf(string(content)) != "" {
|
||||
return fmt.Errorf("contributed workflow %q: package is set by the installer, not the workflow", contentName)
|
||||
}
|
||||
entries = append(entries, workflow.WorkflowDefinitionEntry{ID: id, YAML: "package: " + strconv.Quote(name) + "\n" + string(content)})
|
||||
recorded = append(recorded, storepkg.ProjectionEntry{Family: storepkg.FamilyWorkflows, EntryID: id})
|
||||
}
|
||||
// One apply, one request: a retried PutResource reuses the same request ID
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
package prbench
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/samcharles93/ai-sdk/agent"
|
||||
"github.com/samcharles93/ai-sdk/core"
|
||||
"github.com/samcharles93/ai-sdk/runtime"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow/prreview"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow/prreview/bench"
|
||||
)
|
||||
|
||||
// modelJudge asks one model, independent of the reviewer's, which posted
|
||||
// comment catches each golden.
|
||||
type modelJudge struct {
|
||||
runtime *runtime.Runtime
|
||||
modelRef string
|
||||
}
|
||||
|
||||
func (j *modelJudge) Judge(ctx context.Context, p bench.Problem, comments []prreview.ScoredFinding) ([]bench.Verdict, error) {
|
||||
provider, model, err := j.runtime.ChatProvider(ctx, j.modelRef)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("resolve judge model %q: %w", j.modelRef, err)
|
||||
}
|
||||
var verdicts []bench.Verdict
|
||||
sub := agent.Subagent{
|
||||
Provider: provider,
|
||||
Model: model,
|
||||
System: judgeSystemPrompt,
|
||||
Tools: core.ToolSet{"record_verdict": recordVerdictTool(len(p.Goldens), len(comments), &verdicts)},
|
||||
MaxSteps: 2*len(p.Goldens) + 3,
|
||||
}
|
||||
// The verdicts are the judgement, not the closing reply: a run that recorded
|
||||
// some and then ran out of steps is checked for completeness by the caller.
|
||||
if _, err := sub.Run(ctx, judgePrompt(p, comments)); err != nil && len(verdicts) == 0 {
|
||||
return nil, err
|
||||
}
|
||||
return verdicts, nil
|
||||
}
|
||||
|
||||
const judgeSystemPrompt = `You score a code reviewer against known defects. You are given the pull request's known defects (goldens) and the numbered comments the reviewer posted.
|
||||
|
||||
For each golden, decide whether any posted comment identifies the same underlying defect: the same location and the same root cause. A comment about the same file but a different problem is not a match, and neither is a vague comment that would only be right by coincidence. Wording does not need to match.
|
||||
|
||||
Call record_verdict exactly once per golden. Pass the index of the matching comment, or -1 when no comment matches, and a one-sentence reason. When several comments match, pass the one that states the defect most directly.`
|
||||
|
||||
func judgePrompt(p bench.Problem, comments []prreview.ScoredFinding) string {
|
||||
var b strings.Builder
|
||||
fmt.Fprintf(&b, "Pull request: %s\n\n<goldens>\n", p.PRURL)
|
||||
for i, g := range p.Goldens {
|
||||
fmt.Fprintf(&b, "[%d] (%s) %s\n", i, g.Severity, g.Comment)
|
||||
}
|
||||
b.WriteString("</goldens>\n\n<comments>\n")
|
||||
for i, c := range comments {
|
||||
fmt.Fprintf(&b, "[%d] %s:%d-%d (%s) %s\n%s\n\n", i, c.File, c.LineStart, c.LineEnd, c.Severity, c.Title, c.Body)
|
||||
}
|
||||
b.WriteString("</comments>\n")
|
||||
return b.String()
|
||||
}
|
||||
|
||||
type verdictInput struct {
|
||||
Golden int `json:"golden" jsonschema:"description=Index of the golden this verdict is for."`
|
||||
Comment int `json:"comment" jsonschema:"description=Index of the comment that identifies the same defect, or -1 when none does."`
|
||||
Reason string `json:"reason" jsonschema:"description=One sentence on why the comment does or does not match."`
|
||||
}
|
||||
|
||||
func recordVerdictTool(goldens, comments int, verdicts *[]bench.Verdict) *core.Tool {
|
||||
return core.NewTypedTool(
|
||||
"record_verdict",
|
||||
"Record whether a posted comment catches one golden. Call once per golden.",
|
||||
func(_ context.Context, in verdictInput) (string, error) {
|
||||
if in.Golden < 0 || in.Golden >= goldens {
|
||||
return fmt.Sprintf("record_verdict rejected: golden must be 0..%d", goldens-1), nil
|
||||
}
|
||||
if in.Comment < bench.NoComment || in.Comment >= comments {
|
||||
return fmt.Sprintf("record_verdict rejected: comment must be -1..%d", comments-1), nil
|
||||
}
|
||||
for _, v := range *verdicts {
|
||||
if v.Golden == in.Golden {
|
||||
return fmt.Sprintf("record_verdict rejected: golden %d already has a verdict", in.Golden), nil
|
||||
}
|
||||
}
|
||||
*verdicts = append(*verdicts, bench.Verdict{Golden: in.Golden, Comment: in.Comment, Reason: in.Reason})
|
||||
return "verdict recorded", nil
|
||||
},
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
package prbench
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/domain/agentrun"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow/prreview"
|
||||
"github.com/samcharles93/archie-core/internal/domain/workflow/prreview/bench"
|
||||
"github.com/samcharles93/archie-core/internal/infrastructure/prsource"
|
||||
)
|
||||
|
||||
// liveReviewer runs the production pr-review decision phases on one problem.
|
||||
type liveReviewer struct {
|
||||
cfg config.Config
|
||||
agent agentrun.Runner
|
||||
source workflow.PRSource
|
||||
nextID atomic.Int64
|
||||
}
|
||||
|
||||
func (r *liveReviewer) Review(ctx context.Context, p bench.Problem) (bench.Review, error) {
|
||||
owner, repo, number, err := parsePRURL(p.PRURL)
|
||||
if err != nil {
|
||||
return bench.Review{}, err
|
||||
}
|
||||
slog.Info("benchmark review started", "problem", p.ID)
|
||||
tc := &workflow.TaskContext{
|
||||
Task: &workflow.Task{ID: r.nextID.Add(1), Attempt: 1, Owner: owner, Repo: repo, PRNumber: number, Workflow: "pr-review", Inputs: map[string]any{"depth": "deep"}},
|
||||
Cfg: r.cfg, Agent: r.agent, PRSource: r.source, Log: slog.Default(),
|
||||
}
|
||||
decision, err := workflow.ReviewPullRequest(ctx, tc)
|
||||
if err != nil {
|
||||
return bench.Review{}, err
|
||||
}
|
||||
// Non-nil empty comments means a completed pipeline found nothing.
|
||||
if decision.Comments == nil {
|
||||
decision.Comments = []prreview.ScoredFinding{}
|
||||
}
|
||||
slog.Info("benchmark review completed", "problem", p.ID, "comments", len(decision.Comments), "skipped_phases", decision.SkippedPhases)
|
||||
return bench.Review{Comments: decision.Comments, SkippedPhases: decision.SkippedPhases}, nil
|
||||
}
|
||||
|
||||
func parsePRURL(raw string) (string, string, int, error) {
|
||||
u, err := url.Parse(raw)
|
||||
if err != nil {
|
||||
return "", "", 0, fmt.Errorf("invalid pull request URL: %w", err)
|
||||
}
|
||||
parts := strings.Split(strings.Trim(u.Path, "/"), "/")
|
||||
if u.Scheme != "https" || u.Host != "github.com" || len(parts) != 4 || parts[2] != "pull" {
|
||||
return "", "", 0, fmt.Errorf("benchmark requires a GitHub pull request URL")
|
||||
}
|
||||
n, err := strconv.Atoi(parts[3])
|
||||
if err != nil || n <= 0 {
|
||||
return "", "", 0, fmt.Errorf("invalid pull request URL")
|
||||
}
|
||||
return parts[0], parts[1], n, nil
|
||||
}
|
||||
|
||||
// publicGitHub reads the benchmark's public pull requests anonymously. The
|
||||
// diff and archive come from hosts outside the API rate limit, so a full run
|
||||
// makes one API call per pull request. GH_TOKEN or GITHUB_TOKEN, when set,
|
||||
// only lifts that API limit.
|
||||
type publicGitHub struct {
|
||||
token string
|
||||
mu sync.Mutex
|
||||
prs map[string]prsource.PullRequest
|
||||
}
|
||||
|
||||
func newPublicGitHub() *publicGitHub {
|
||||
token := os.Getenv("GH_TOKEN")
|
||||
if token == "" {
|
||||
token = os.Getenv("GITHUB_TOKEN")
|
||||
}
|
||||
return &publicGitHub{token: token, prs: map[string]prsource.PullRequest{}}
|
||||
}
|
||||
|
||||
func (g *publicGitHub) get(ctx context.Context, rawURL string, api bool) (io.ReadCloser, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, rawURL, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if api && g.token != "" {
|
||||
req.Header.Set("Authorization", "Bearer "+g.token)
|
||||
}
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
_ = resp.Body.Close()
|
||||
return nil, fmt.Errorf("GET %s: %s", rawURL, resp.Status)
|
||||
}
|
||||
return resp.Body, nil
|
||||
}
|
||||
|
||||
func (g *publicGitHub) GetPullRequest(ctx context.Context, owner, repo string, number int) (prsource.PullRequest, error) {
|
||||
key := fmt.Sprintf("%s/%s#%d", owner, repo, number)
|
||||
g.mu.Lock()
|
||||
pr, ok := g.prs[key]
|
||||
g.mu.Unlock()
|
||||
if ok {
|
||||
return pr, nil
|
||||
}
|
||||
body, err := g.get(ctx, fmt.Sprintf("https://api.github.com/repos/%s/%s/pulls/%d", owner, repo, number), true)
|
||||
if err != nil {
|
||||
return prsource.PullRequest{}, err
|
||||
}
|
||||
defer body.Close()
|
||||
var raw struct {
|
||||
Title string `json:"title"`
|
||||
Body string `json:"body"`
|
||||
Head struct {
|
||||
SHA string `json:"sha"`
|
||||
} `json:"head"`
|
||||
}
|
||||
if err := json.NewDecoder(body).Decode(&raw); err != nil {
|
||||
return prsource.PullRequest{}, err
|
||||
}
|
||||
pr = prsource.PullRequest{Title: raw.Title, Body: raw.Body, HeadSHA: raw.Head.SHA}
|
||||
g.mu.Lock()
|
||||
g.prs[key] = pr
|
||||
g.mu.Unlock()
|
||||
return pr, nil
|
||||
}
|
||||
|
||||
func (g *publicGitHub) GetPullRequestDiff(ctx context.Context, owner, repo string, number int) (string, error) {
|
||||
body, err := g.get(ctx, fmt.Sprintf("https://github.com/%s/%s/pull/%d.diff", owner, repo, number), false)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer body.Close()
|
||||
data, err := io.ReadAll(body)
|
||||
return string(data), err
|
||||
}
|
||||
|
||||
func (g *publicGitHub) GetRepoArchive(ctx context.Context, owner, repo, ref string) (io.ReadCloser, error) {
|
||||
return g.get(ctx, fmt.Sprintf("https://codeload.github.com/%s/%s/tar.gz/%s", owner, repo, ref), false)
|
||||
}
|
||||
@@ -0,0 +1,638 @@
|
||||
[
|
||||
{
|
||||
"id": "cal_dot_com#10600",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/10600",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The exported function TwoFactor handles backup codes and is in BackupCode.tsx. Inconsistent naming.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Error message mentions 'backup code login' but this is a disable endpoint, not login",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Backup code validation is case-sensitive due to the use of indexOf(). This causes validation to fail if a user enters uppercase hex characters, as backup codes should be case-insensitive for a better user experience.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "Because backupCodes are decrypted and mutated in memory before being written back, two concurrent login requests using the same backupCode could both pass this check and update, so a single backup code may effectively be accepted more than once if used concurrently, weakening the intended one-time-use semantics.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#10967",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/10967",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Potential null reference if mainHostDestinationCalendar is undefined if evt.destinationCalendar is null or an empty array ",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "The optional chaining on mainHostDestinationCalendar?.integration is redundant since you already check mainHostDestinationCalendar in the ternary condition.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Logic error: when externalCalendarId is provided, you're searching for a calendar where externalId === externalCalendarId, but this will always fail since you're looking for a calendar that matches itself. Should likely find by credentialId or use different logic.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Logic inversion in organization creation: The slug property is now conditionally set when IS_TEAM_BILLING_ENABLED is true, instead of when it's false as originally intended. This change, combined with requestedSlug still being set when IS_TEAM_BILLING_ENABLED is true, results in both properties being set when billing is enabled, and neither when disabled",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "The Calendar interface now requires createEvent(event, credentialId), but some implementations (e.g., Lark/Office365) still declare createEvent(event) only—this breaks the interface contract (also applies to other locations in the PR).",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#11059",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/11059",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The parseRefreshTokenResponse function incorrectly sets refresh_token to the hardcoded string 'refresh_token' when it's missing from the OAuth refresh token response. This invalidates the token, breaking subsequent token refreshes and causing authentication failures.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Invalid Zod schema syntax. Computed property keys like [z.string().toString()] are not valid in Zod object schemas and will cause runtime errors. ",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "parseRefreshTokenResponse returns a Zod safeParse result ({ success, data, error }), not the credential key object. Persisting that as key stores the wrapper instead of the token payload; we should store the parsed data or use schema parse.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "When APP_CREDENTIAL_SHARING_ENABLED and CALCOM_CREDENTIAL_SYNC_ENDPOINT are set, the refreshFunction helper returns the fetch Response, but several callers (for example GoogleCalendarService.refreshAccessToken expecting res.data, and HubspotCalendarService.refreshAccessToken expecting a HubspotToken) assume it returns the integration-specific token object. That mismatch will cause runtime errors in the sync-enabled path unless the return type or those call sites are adjusted.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "When the sync endpoint path is used, res is a fetch Response and has no .data; res?.data will be undefined and token.access_token will throw at runtime. This relies on a consistent return shape from refreshOAuthTokens, which isn’t guaranteed currently.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#14740",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/14740",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Case sensitivity bypass in email blacklist",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "The logic for checking team admin/owner permissions is incorrect. This condition uses AND (&&) which requires both isTeamAdmin AND isTeamOwner to be true, but it should use OR (||) since a user needs to be either an admin OR an owner to have permission.",
|
||||
"severity": "Critical"
|
||||
},
|
||||
{
|
||||
"comment": "This calls the email sender with the original guests, so existing attendees included in the input will be treated as new when sending notifications, leading to incorrect emails.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "uniqueGuests filters out existing attendees and blacklisted emails but does not deduplicate duplicates within the input; createMany can insert duplicate attendee rows if the client submits repeated emails.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "Starting with an array containing an empty string may cause validation issues. Consider starting with an empty array [] and handling the empty state in the MultiEmail component instead.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#14943",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/14943",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Using retryCount: reminder.retryCount + 1 reads a possibly stale value and can lose increments under concurrency; consider an atomic increment via Prisma (increment: 1) to avoid race conditions (also applies to the similar update in the catch block).",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "The deletion logic in scheduleSMSReminders.ts incorrectly deletes non-SMS workflow reminders (e.g., Email, WhatsApp) that have retryCount > 1. This occurs because the retryCount condition within the OR clause for deletion lacks a method: WorkflowMethods.SMS filter, causing it to apply to all reminder types instead of only SMS reminders, which is the intended scope of this function.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#22345",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/22345",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "In getBaseConditions(), the else if (filterConditions) and final else branches are unreachable. This is because getAuthorizationConditions() always returns a non-null Prisma.Sql object, making authConditions always truthy, which means only the first two if/else if conditions are ever evaluated.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Fetching userIdsFromOrg only when teamsFromOrg.length > 0 can exclude org-level members for orgs without child teams; consider deriving from teamIds (which includes orgId) or removing the guard so org-only orgs still include member user bookings.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#22532",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/22532",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The updateManyByCredentialId call uses an empty data object, which prevents Prisma's @updatedAt decorator from updating the updatedAt timestamp. This results in inaccurate cache status tracking, as the timestamp isn't updated when the cache is refreshed. To fix this, explicitly set the updatedAt field.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "logic: macOS-specific sed syntax with empty string after -i flag will fail on Linux systems",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#7232",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/7232",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Asynchronous functions deleteScheduledEmailReminder and deleteScheduledSMSReminder are called without await inside forEach loops. This occurs during booking rescheduling/cancellation, and workflow/workflow step deletion/updates. Consequently, scheduled workflow reminders may not be reliably cancelled, potentially leaving them active.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "When immediateDelete is true, the deleteScheduledEmailReminder function cancels the SendGrid email but fails to delete the corresponding WorkflowReminder record from the database. This creates orphaned database entries and is inconsistent with the immediateDelete: false path, which marks the record as cancelled. The SendGrid DELETE API call is also omitted in this path.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#8087",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/8087",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Consider adding try-catch around the await to handle import failures gracefully",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "The code uses forEach with async callbacks, which causes asynchronous operations (e.g., calendar/video event deletions, payment refunds) to run concurrently without being awaited. This 'fire-and-forget' behavior leads to unhandled promise rejections, race conditions, and incomplete cleanup, as surrounding try-catch blocks cannot properly handle errors from these unawaited promises. Replace forEach with for...of loops or Promise.all() with map() to ensure proper sequential execution and error handling.",
|
||||
"severity": "Critical"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cal_dot_com#8330",
|
||||
"pr_url": "https://github.com/calcom/cal.com/pull/8330",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Incorrect end time calculation using slotStartTime instead of slotEndTime",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "Using === for dayjs object comparison will always return false as it compares object references, not values. Use .isSame() method instead: dayjs(date.start).add(utcOffset, 'minutes').isSame(dayjs(date.end).add(utcOffset, minutes))",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#103633",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/103633",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The Check operation exhibits asymmetric cache trust logic: cached permission grants are trusted and returned immediately, but cached denials from the same permission cache are ignored, leading to a fresh database lookup. This allows stale cached grants to provide access to revoked resources, posing a security risk. ",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "The test comment says the cached permissions 'allow access', but the map stores false for dashboards:uid:dash1, so checkPermission will still treat this scope as not allowed.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#106778",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/106778",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The rendered GrafanaRuleListItem is missing the required key prop for React list items. This can cause rendering issues when the list order changes.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "RuleActionsButtons is invoked with only promRule, but SilenceGrafanaRuleDrawer inside RuleActionsButtons still depends on a Grafana Ruler rule being present, so for Grafana rules coming from list views the 'Silence notifications' menu entry (now driven by Grafana Prom abilities) will toggle showSilenceDrawer without ever rendering the drawer. This means clicking 'Silence notifications' for these rules has no visible effect, even when abilities indicate silencing is allowed.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#107534",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/107534",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The applyTemplateVariables method is called with request.filters as the third parameter, but this parameter is not used in the corresponding test setup.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#76186",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/76186",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The ContextualLoggerMiddleware methods (QueryData, CallResource, CheckHealth, CollectMetrics) panic when a nil request is received. This occurs because they directly access req.PluginContext (via the instrumentContext function) without first checking if req is nil. This is a regression, as previous middleware layers gracefully handled nil requests.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "The traceID is no longer logged for plugin requests. During a refactoring, the tracing import and the logic to extract and add traceID from the context to log parameters were removed from the LoggerMiddleware. The newly introduced ContextualLoggerMiddleware does not add this information, resulting in missing traceID in plugin request logs and impacting debugging and request tracing capabilities.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#79265",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/79265",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Race condition: Multiple concurrent requests could pass the device count check simultaneously and create devices beyond the limit. Consider using a database transaction or lock.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Anonymous authentication now fails entirely if anonDeviceService.TagDevice returns ErrDeviceLimitReached. Previously, device tagging was asynchronous and non-blocking. This change prevents anonymous users from authenticating when the device limit is reached.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "This call won’t compile: dbSession.Exec(args...) is given a []interface{} where the first element is the query, but Exec’s signature requires a first parameter of type string (not an interface{} splat).",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "Returning ErrDeviceLimitReached when no rows were updated is misleading; the device might not exist.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Time window calculation inconsistency: Using device.UpdatedAt.UTC().Add(-anonymousDeviceExpiration) as the lower bound but device.UpdatedAt as the current time may not match the intended logic. Consider using time.Now().UTC() consistently.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#80329",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/80329",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The code uses Error log level for what appears to be debugging information. This will pollute error logs in production. Consider using Debug or Info level instead.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#90045",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/90045",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The context is being created with d.Log instead of the log variable that was initialized with additional context values (name, kind, method). This means those values won't be propagated to the logging context.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "Bug: calling recordLegacyDuration when storage operation fails should be recordStorageDuration.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Inconsistency: using name instead of options.Kind for metrics recording differs from other methods.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#90939",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/90939",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The GetWebAssets function implements an incomplete double-checked locking pattern for caching web assets. The function first checks if the cache is populated using a read lock (RLock), and if the cache is empty, it acquires a write lock to populate it. However, it fails to re-check whether the cache was populated by another goroutine while waiting to acquire the write lock.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "In addition to the missing double-check, the function has a critical flaw in its error handling: it unconditionally assigns the fetch result to the cache (line 69: entryPointAssetsCache = result) regardless of whether the fetch succeeded or failed. When an error occurs during asset fetching, result is nil, and this nil value overwrites any previously valid cache entry.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#94942",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/94942",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The enableSqlExpressions function has flawed logic that always returns false, effectively disabling SQL expressions unconditionally:",
|
||||
"severity": "Critical"
|
||||
},
|
||||
{
|
||||
"comment": "Several methods such as NewInMemoryDB().RunCommands and db.QueryFramesInto return 'not implemented'.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "grafana#97529",
|
||||
"pr_url": "https://github.com/grafana/grafana/pull/97529",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "A race condition in BuildIndex allows multiple goroutines to concurrently build the same expensive index for the same key. This is caused by moving the b.cacheMu lock from protecting the entire function to only protecting the final cache assignment. ",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Calling s.search.TotalDocs() here may race with concurrent index creation: TotalDocs iterates b.cache without synchronization, and the event watcher goroutine started just above could trigger BuildIndex writes concurrently, potentially causing a concurrent map read/write panic.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#32918",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/32918",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Recursive caching call using session instead of delegate",
|
||||
"severity": "Critical"
|
||||
},
|
||||
{
|
||||
"comment": "Cleanup reference uses incorrect alias - should be 'idp-alias-' + i instead of 'alias'.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#33832",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/33832",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Returns wrong provider (default keystore instead of BouncyCastle)",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Dead code exists where ASN1Encoder instances are created and written to, but their results are immediately discarded. The actual encoding is performed by new ASN1Encoder instances created in the subsequent return statement, rendering the earlier operations useless.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#36880",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/36880",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Inconsistent feature flag bug causing orphaned permissions. The AdminPermissions event listener, responsible for cleaning up permissions upon role, client, or group removal, is incorrectly guarded by the ADMIN_FINE_GRAINED_AUTHZ (V1) feature flag. This is inconsistent with other methods in the class that use ADMIN_FINE_GRAINED_AUTHZ_V2. Consequently, if ADMIN_FINE_GRAINED_AUTHZ_V2 is enabled but V1 is not, the permission cleanup logic will not execute, leading to orphaned permission data. Cleanup should occur regardless of which fine-grained authorization version is enabled.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "In hasPermission(ClientModel client, String scope), the resource lookup uses findByName(server, client.getId(), server.getId()), but AdminPermissionsSchema.getOrCreateResource creates per-client resources with the owner set to resourceServer.getClientId(), so this lookup will never find those resources and will always fall back to the 'all-clients' resource, effectively ignoring client-specific permissions.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "In getClientsWithPermission(String scope), iterating resourceStore.findByType(server, AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE) and returning resource.getName() will only ever consider the type-level 'Clients' resource (per-client resources have no type) and return its name, while AvailableRoleMappingResource#getRoleIdsWithPermissions expects actual client IDs to pass to realm.getClientById, which can lead to incorrect behavior or a null client and subsequent failures.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#36882",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/36882",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Incorrect method call for exit codes. The picocli.exit() method calls System.exit() directly, which is problematic:",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#37038",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/37038",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Incorrect permission check in canManage() method",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "In getGroupIdsWithViewPermission, hasPermission is called with groupResource.getId() and the same groupResource.getId() is added to granted, but hasPermission resolves resources by name (treating the argument as a group id) and the GroupPermissionEvaluator contract says this method returns group IDs that are later used as UserModel.GROUPS and in getUsersCount group filters. This mismatch means per-group VIEW_MEMBERS/MANAGE_MEMBERS permissions may not yield the expected group IDs for filtering and counts, and evaluation may effectively only look at the type-level 'all-groups' resource; consider revisiting whether this should operate on the underlying group ids (resource names) instead so it aligns with the JPA queries and the interface contract.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#37429",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/37429",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The translation is in Italian instead of Lithuanian. This should be translated to Lithuanian to match the file's locale (messages_lt.properties).",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "The totpStep1 value uses Traditional Chinese terms in the Simplified Chinese file (zh_CN), which is likely incorrect for this locale. Please verify the locale‑appropriate translation.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "The anchor sanitization logic has a potential issue where it consumes English matcher groups without proper validation. If the translated text has more anchor tags than the English text, this could lead to incorrect validation results.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "The method name 'santizeAnchors' should be 'sanitizeAnchors' (missing 'i').",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#37634",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/37634",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Wrong parameter in null check (grantType vs. rawTokenId)",
|
||||
"severity": "Critical"
|
||||
},
|
||||
{
|
||||
"comment": "In isAccessTokenId, the substring for the grant shortcut and the equality check look inverted: the grant shortcut occupies indices 4–5 (substring(4,6)), and a match should return true (combined with UUID check), not false.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Javadoc mentions \"usually like 3-letters shortcut\" but some implementations use 2-letter shortcuts (\"ac\", \"cc\", \"rt\", \"te\", \"pc\", \"ci\", \"ro\"). Consider updating documentation to reflect actual usage pattern.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": " Catching generic RuntimeException is too broad. The implementation throws IllegalArgumentException specifically - catch that instead for more precise testing.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#38446",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/38446",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Unsafe raw List deserialization without type safety. Calling Optional.get() directly on the Optional returned by RecoveryAuthnCodesUtils.getCredential(user) without checking isPresent() can lead to a NoSuchElementException if the Optional is empty.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "After creating the RecoveryAuthnCodesCredentialModel, consider setting its id from the stored credential (e.g., myUser.recoveryCodes.getId()); otherwise getId() will be null and downstream removal by id (e.g., removeStoredCredentialById in the authenticator flow) may not work.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#40940",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/40940",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Returning null from getSubGroupsCount() violates the GroupModel contract (Javadoc says it never returns null) and may lead to NPEs in callers that expect a non-null count.",
|
||||
"severity": "Critical"
|
||||
},
|
||||
{
|
||||
"comment": "The reader thread isn’t waited for; flipping deletedAll to true and asserting immediately can race and miss exceptions added just after the flag change, making this test flaky.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "keycloak#41249",
|
||||
"pr_url": "https://github.com/keycloak/keycloak/pull/41249",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "ConditionalPasskeysEnabled() called without UserModel parameter",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "With isConditionalPasskeysEnabled(UserModel user) requiring user != null, authenticate(...) will not call webauthnAuth.fillContextForm(context) on the initial login page where context.getUser() is still null, so conditional passkey UI will not be set up for first-time passkey login. Consider whether this should also be enabled when no user has been selected yet so ID-less passkey authentication on the initial login form continues to work.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#67876",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/67876",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Null reference if github_authenticated_user state is missing",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "OAuth state uses pipeline.signature (static) instead of a per-request random value",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "The code attempts to access integration.metadata[sender][login] without checking for the existence of the sender key. This causes a KeyError for integrations where the sender metadata was not set during creation",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#77754",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/77754",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Shared mutable default in dataclass timestamp",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "The method name has a typo: test_from_dict_inalid_data should be test_from_dict_invalid_data.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Method name says 'empty_array' but tests empty dict - consider renaming to 'test_from_dict_empty_dict' for clarity.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "to_dict() returns a datetime for queued; if this dict is passed in task kwargs (e.g., via apply_async), JSON serialization may fail depending on the serializer, which can cause enqueue errors.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#80168",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/80168",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "MetricAlertDetectorHandler inherits from StatefulDetectorHandler but only contains pass, failing to implement its required abstract methods: counter_names (property), get_dedupe_value(), get_group_key_values(), and build_occurrence_and_event_data(). This will cause a TypeError at runtime when the class is instantiated.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Docstring says this returns a list of DetectorEvaluationResult, but the method now returns a dict keyed by DetectorGroupKey. Consider updating the docstring to match the new return type.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#80528",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/80528",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The function modifies the config variable to include display values but then returns the original monitor.config instead of the modified version.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "The code fetches MonitorCheckIn objects by ID when the required data already exists in previous_checkins. This creates an unnecessary database query.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#92393",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/92393",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "OptimizedCursorPaginator negative-offset branch slices QuerySet with a negative start index",
|
||||
"severity": "Critical"
|
||||
},
|
||||
{
|
||||
"comment": "BasePaginator negative-offset branch slices QuerySet with a negative start index",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "OptimizedCursorPaginator.get_item_key uses floor/ceil on a datetime key (order_by='-datetime'), causing TypeError.",
|
||||
"severity": "High"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#93824",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/93824",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "Inconsistent metric tagging with 'shard' and 'shards'",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "Fixed sleep in tests can be flaky; wait on condition instead",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Because flusher processes are created via multiprocessing.get_context('spawn').Process, they are instances of multiprocessing.context.SpawnProcess, which on POSIX is not a subclass of multiprocessing.Process, so this isinstance check will always be false and hung processes won't be killed here.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "Sleep in test_consumer.py won’t actually wait because time.sleep was monkeypatched above; consider restoring sleep or using a different sync to ensure the flusher has time to process.",
|
||||
"severity": "Medium"
|
||||
},
|
||||
{
|
||||
"comment": "Breaking out of the loop when the deadline has elapsed can skip terminating remaining flusher processes, potentially leaving them running after shutdown; consider ensuring termination is attempted even if the deadline is exceeded.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#94376",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/94376",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "sample_rate = 0.0 is falsy and skipped",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "Using Python’s built-in hash() to build cache keys is non-deterministic across processes (hash randomization), so keys won’t match across workers and invalidate_upsampling_cache may fail to delete them. Use a deterministic serialization of project_ids for the cache key.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "The upsampling eligibility check passes the outer dataset instead of the actual dataset used by scoped_dataset. In paths where the query ultimately runs against discover (e.g., dashboard split) while the original dataset is metrics, upsampling may be skipped even when all projects are allowlisted.",
|
||||
"severity": "Medium"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "sentry#95633",
|
||||
"pr_url": "https://github.com/getsentry/sentry/pull/95633",
|
||||
"goldens": [
|
||||
{
|
||||
"comment": "The queue.shutdown() method with 'immediate=False' parameter may not exist in the standard Python queue module. This could cause AttributeError at runtime. Verify the correct API or implement a custom shutdown mechanism.",
|
||||
"severity": "High"
|
||||
},
|
||||
{
|
||||
"comment": "The magic number 50 for max_wait is used repeatedly throughout the tests. Consider extracting this as a named constant to improve maintainability.",
|
||||
"severity": "Low"
|
||||
},
|
||||
{
|
||||
"comment": "The test test_thread_queue_parallel_error_handling has a docstring that doesn't match the test implementation.",
|
||||
"severity": "Low"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
Loaded 100 of 545 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user