From 5d438aed455bb9dd4b955ba353eaf45536b99da9 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Mon, 28 Sep 2026 02:10:39 +1000 Subject: [PATCH] feat(kitrun): mount the operator's skills store for agent-skills@1 A Kit's agent-skills@1 path now gets the shared skills store (skills_dir/.agents/skills) bind-mounted read-only, whatever mode the Kit asks for; with no skills_dir the host withholds the mount. skills_dir is read live on every launch. skill.StoreDir exposes the store path so the launcher does not copy the package's directory constant. Part of archie-core-egkf.6. --- .../skills/archie-config-and-flags/SKILL.md | 2 +- docs/data/generated/dev-docs.json | 2 +- docs/prds/external-agent-harness.md | 4 +- internal/config/config.go | 3 +- internal/infrastructure/kitrun/launcher.go | 95 +++++++++++++------ .../infrastructure/kitrun/launcher_test.go | 15 +++ internal/skill/skill.go | 4 + 7 files changed, 90 insertions(+), 35 deletions(-) diff --git a/.agents/skills/archie-config-and-flags/SKILL.md b/.agents/skills/archie-config-and-flags/SKILL.md index 8968acca3..508a4b073 100644 --- a/.agents/skills/archie-config-and-flags/SKILL.md +++ b/.agents/skills/archie-config-and-flags/SKILL.md @@ -107,7 +107,7 @@ Do not expose these helper flags as daemon settings. | Keys | Default, validation, and consumer | Status | | -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | | `work_dir`, `state_dir` | Derive from `$XDG_DATA_HOME/archie`, else `$HOME/.local/share/archie`; explicit `~` paths are home-expanded. `state_dir` holds the embedded NATS store and endpoint file, task logs and the readiness disk target. | production-wired | -| `skills_dir` | Empty falls back to `work_dir` for startup workflow registry. | partially-wired | +| `skills_dir` | Empty falls back to `work_dir` for startup workflow registry. Also the skills store `kitrun.Launcher` mounts read-only at a Kit's `agent-skills@1` path, read live per launch; empty withholds the mount. | partially-wired | | `plugin_dir` | Empty disables daemon plugin loading; configured directory loaded in `internal/app/archied`. | production-wired | | `poll_interval` | Default `60s`; root poll loop uses it, identities may override only interval. | production-wired | | `label` | No default or validation; used for `dispatch.trigger = "label"` or `"either"`. | production-wired | diff --git a/docs/data/generated/dev-docs.json b/docs/data/generated/dev-docs.json index 05bba1a0b..ebdae1d25 100644 --- a/docs/data/generated/dev-docs.json +++ b/docs/data/generated/dev-docs.json @@ -328,7 +328,7 @@ "url": "/dev/prds/external-agent-harness/", "title": "External agent harnesses", "section": "PRDs", - "body": "# External agent harnesses\n\n**Status:** Approved\n**Authority:** `docs/architecture/agent-system.md` (agent execution as a data\nboundary); settles the harness non-goal deferred by\n`docs/prds/service-decomposition.md`.\n**Compounds with:** `docs/prds/execution-tree-state-machine.md` (a harness\nrun is one `agent` StepExecution), `docs/prds/binding-secret-encryption.md`\n(the at-rest envelope reused for harness credentials).\n\n## Decision\n\nA workflow stage can run on an external coding-agent CLI instead of the\nbuilt-in agent loop: Claude Code, Codex, Pi, OMP, GitHub Copilot CLI, or any\nother CLI packaged as a Docker Sandbox Kit v3. Each authenticates with an API\nkey or the operator's subscription login, and can carry the operator's own\nskills, plugins, subagents and instructions.\n\nTwo boundaries hold regardless of what the harness does:\n\n- **The real credential never enters the container.** The container sees\n sentinel values; archie's egress proxy substitutes the real credential on\n outbound requests and performs OAuth refresh on the host.\n- **Archie's workflow guarantees are enforced outside the harness.** Git,\n protected paths, read-only stages, gates and budgets are checked by archie\n around the process and against the worktree afterwards.\n\n## Kits\n\nA harness is packaged as a Kit v3 image: an OCI image whose\n`vnd.docker.sandbox.kit.descriptor` manifest annotation declares what the\nharness needs. Archie reads descriptors with the published\n`github.com/docker/sandbox-kit-spec/v3/spec` package and does not maintain\nits own descriptor format. Published Kits run unmodified.\n\nArchie is a partial Kit runtime. It implements these capability types:\n\n| Type | Archie behaviour |\n| ------------------- | ----------------------------------------------------------------------------------------- |\n| `credential@1` | Proxy-managed only, described below. |\n| `network-policy@1` | Enforced by the egress proxy. |\n| `volume@1` | A Docker volume keyed by WorkflowExecution, deleted with it. |\n| `lifecycle@1` | Install and startup hooks run on container create. |\n| `agent-sessions@1` | The headless `prompt` and `resume` invocations for the stage. |\n| `agent-skills@1` | The operator's skills store, mounted read-only whatever the Kit asks. |\n| `agent-context@1` | Archie's stage instructions, delivered where the Kit declares. |\n| `resources@1` | Container CPU and memory limits. |\n\nEvery other type fails closed: a required entry refuses the launch, an\noptional one is skipped and recorded on the step. `credential@1` with\n`passthrough: true` and any credential for a forge service are refused.\n\nThe operator's own setup (plugins, subagents, instructions, settings) is a\nmixin Kit, published with the harness Kit as a Kit set: the set merges their\nlayers into one image. It is versioned image content, rewritten on every\ncreate, never state a run can modify.\n\n## Contract\n\nA harness run is a second implementation of `agentexec.Runner`. It takes the\nsame `Request` and returns the same `Result`, so workflows, the daemon and\nthe State Store do not know which runner ran a stage.\n\n`agent-sessions@1` supplies the invocation. Archie supplies, per CLI, an\noutput adapter that translates the CLI's JSON output stream into\n`ToolCallReporter` calls, `Usage` and a session ID. A CLI with no adapter can\nrun stages with no capture tools, reporting no usage; its token budget falls\nback to wall clock.\n\nWorkflow definition validation rejects, at load time, a stage whose needs the\nselected harness cannot meet: capture tools without an adapter, or a gate\nretry without a `resume` verb.\n\n## Selection\n\nA harness is an agent profile. `docs/prds/event-automation.md` defines a\nprofile as the execution environment a workflow selects; a harness profile\nnames one Kit pinned by digest, a workload Kit or a published Kit set, in\nplace of a container image. Archie runs that Kit's image and composes no Kits\nitself; a bare mixin is refused. Everything else about profiles\nholds: a workflow names its profile, a stage may name a different one, and a\nprofile holds no secrets.\n\n`archie-agent` builds the stage's runner from the stage's profile: the\nai-sdk agent loop for an image profile, the harness runner for a Kit\nprofile. Image profiles, and every workflow already written against them,\nare unchanged. A Kit profile named by no workflow is a validation error.\n\nA stage naming a different profile than its workflow's is a separate run,\nnot a mid-container runner switch: a Kit task runs in one container\nprovisioned for one profile (Container layout), so a stage that needs a\ndifferent one is its own callee, started the way `workflow.call` already\nstarts one (`docs/prds/event-automation.md` \"Workflows call workflows\"),\nwith its own agent profile resolved off its own task row. This needs no\nmechanism beyond `workflow.call` plus per-task profile resolution\n(`daemon.pinTaskProfile`), both of which already treat every task's\nprofile independently of any caller's -- see\n`TestWorkflowCallerConformance` (staterpc) for the callee's independent\n`Workflow` field and `TestWorkflowCallGivesACalleeItsOwnProfile` (daemon)\nfor the Kit-vs-image runner selection that independence produces.\n\nProfiles are org resources in the State Store, so a Kit profile belongs to\none org, is granted to its workspaces like any profile, and applies without\na restart.\n\n## Organisations\n\n`docs/prds/orgs-and-access.md` is the boundary; a harness adds nothing that\ncrosses it.\n\n- A Kit profile, its credential bindings and its OAuth tokens belong to one\n org. No record is shared between orgs.\n- A harness run is a run like any other: it acts as the workflow's identity,\n under the run credential issued at dispatch.\n- The egress proxy injects a credential only when the run credential carries\n the secret the binding names. A Kit that declares a service the identity is\n not granted gets no credential: a required one refuses the launch, an\n optional one is skipped.\n- A Kit's network policy is what the Kit asks for; the identity's network\n grants are what the org allows. The proxy enforces the intersection.\n- Concurrency slots are counted per binding within its org.\n\n## Credentials\n\nA credential binding maps a Kit's `credential@1` `service` name to an org\nsecret, which the org grants to identities like any secret. The secret holds\none of:\n\n- **API key:** a value in the org's secret store.\n- **OAuth:** tokens captured by the setup terminal, stored in the State Store\n under the at-rest envelope of `binding-secret-encryption.md` with its own\n domain separator.\n\nThe egress proxy resolves the binding for each request against the run\ncredential. The container gets the Kit's sentinel in the named variable or\ncredential file. OAuth refresh happens at the proxy, which intercepts the\nKit's `tokenEndpoint`, so a refreshed token is written to the State Store and\nnever returned to the container.\n\nRuns sharing an OAuth binding share its subscription's rate limit.\n`max_concurrent` on the binding (default 1) caps its simultaneous runs. A\nstage waiting for a slot is `pending`, not `running`.\n\n## Setup terminal\n\nThe dashboard opens a terminal (xterm.js over a WebSocket to a PTY) into an\nephemeral container built from a Kit profile, on the same egress path. The\nmember runs the CLI's own login. The proxy captures the tokens at the token\nendpoint into the org secret the binding names. The container is removed when\nthe terminal closes. No worktree is mounted into it.\n\nOpening the terminal is the `update` action on the secret, decided by the\nAuthorizer like any other; the shipped roles give it to org owners and\nadmins. It is the only interactive path into a harness container.\n\n## Egress\n\nOnly Kit profiles run on the egress path. An image profile keeps the network\naccess its identity is granted, because workflows such as a network\ninvestigator need raw DNS, ICMP and arbitrary TCP that no HTTP proxy\ncarries.\n\n- **Sandbox network.** Each Kit run gets its own internal Docker bridge on\n which the host holds no address. Host services, including those listening\n on every interface, are unreachable from it by any address.\n- **Relay.** One relay container, `archie-agent relay`, sits on the sandbox\n networks under a fixed alias and on the host-reachable network. It\n forwards three fixed ports, to the proxy, NATS and the State Store, and can\n reach nothing else. It holds no secrets.\n- **Proxy.** The proxy runs inside `archied`, listening on the host gateway\n of the host-reachable network. It terminates TLS with a per-daemon CA\n installed into the container at create, identifies the container by a\n per-run proxy token, and applies that run's network policy and credential\n inject rules. Upstream dials refuse loopback, and refuse internal addresses\n unless the policy names the exact IP, so an allowed name cannot resolve\n back into the host.\n\n## Container layout\n\nA Kit task runs in one container, from the Kit composition's image, on the\ntask's sandbox network. The worker and every harness invocation share it;\nthey are separated by user, not by container, so a run's cost scales with\nthe run and not with how many agents it fans out to.\n\n- **Worker.** Archie mounts its own `archie-agent` binary read-only and runs\n it as the container's entrypoint, as root. It holds the task's NATS and\n State Store credentials in its own environment and in root-only files,\n runs the workflow, and serves `archie-agent mcp`. The Kit image's\n entrypoint is not PID 1.\n- **Harness.** Every invocation runs as the Kit's user (the image's `User`,\n default uid 1000) with an explicit environment: the Kit's variables, the\n proxy environment and the credential sentinels, and nothing inherited from\n the worker. That user cannot read the worker's environment or files, or\n trace it. Sibling invocations in one run share the user and the worktree.\n- **Hooks.** `lifecycle@1` install and startup hooks run as the user each\n declares, before the worker accepts work.\n- **Mounts.** The task worktree at the Kit's workspace directory, owned by the\n Kit's user, and the read-only skills store. Nothing else from the host.\n- **Network.** The relay forwards three fixed ports on the sandbox network:\n the egress proxy, NATS and the State Store. The worker reaches NATS and the\n State Store with its credentials; a harness can open those ports but holds\n no credential either accepts.\n- **Volumes.** `volume@1` paths persist for the life of the\n WorkflowExecution, which covers session resume across gate iterations and\n retries. They are not shared between executions.\n\n## Archie tools inside the harness\n\nCapture tools, which are how a stage returns structured results, are served\nby `archie-agent mcp`, a stdio MCP server registered through the Kit's MCP\nconfiguration or the adapter's flags. It serves the stage's `CaptureTools`\nand the central tools the agent profile's `AllowTools` permits, never the\n`workspace` toolset. The runner's `ToolLimits` bound its results; the\nharness's own built-in tools are outside archie's limits.\n\n## Enforcement around the harness\n\n| Property | Enforcement |\n| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |\n| 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. |\n| Protected paths | A diff touching a `Protection` path fails the step. |\n| Read-only stage | Any worktree diff fails the step. |\n| 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. |\n| Budget | Archie kills the process on wall-clock timeout, or when streamed usage passes the token budget. |\n| Cancellation | Cancelling the step kills the process group, then the container. |\n| Egress | Only the proxy is reachable; the Kit's network policy decides the rest. |\n\nHarness settings that deny git or protected paths are added where the CLI\nsupports them, to save wasted turns. They are never the enforcement.\n\n## Execution tree\n\nA harness run is one `agent` StepExecution. Subagents the harness spawns\ninternally are not recorded as children. Their usage is included in the\nstep's `tokens_used` when the adapter reports it.\n\n## Agents never hold a harness\n\nAn Agent reaches a harness only by invoking a Workflow whose stage names it.\nNo Agent tool, chat tool or capability exposes a harness, its setup terminal\nor its credential. The stage boundary is what carries the container, the git\nand path checks, the gate and the budget; a harness outside a stage has none\nof them.\n\n## Out of scope\n\n- Chat through a harness. The gateway chat loop stays on the built-in\n runtime.\n- `network-policy@2` HTTP method and path rules; a Kit requiring it is\n refused.\n- Recording the harness's internal subagents as StepExecutions.\n- Cost in currency.\n- Choosing a harness automatically per task.\n\n## Plan\n\n1. Descriptor resolution with the Kit spec package; capability support\n table and fail-closed refusal.\n2. Egress proxy: internal network, per-daemon CA, per-container token,\n `network-policy@1`.\n3. `credential@1`: API-key bindings, sentinel rendering, inject rules.\n4. Harness `Runner`: container create with worktree, volumes, lifecycle\n hooks and the mounted `archie-agent`; `agent-sessions@1` invocation;\n worktree checks for git, protected paths and read-only; budget and\n cancellation.\n5. Claude Code output adapter; `archie-agent mcp`; gate-and-resume loop.\n6. Kit profiles, runner selection from the stage's profile, and definition\n validation.\n7. OAuth bindings as org secrets: token-endpoint interception, encrypted\n storage, per-binding concurrency; dashboard setup terminal.\n8. Output adapters for Codex, Pi, OMP and GitHub Copilot CLI.\n\n## Verification\n\n- The same workflow definition completes on `builtin` and on the Claude Code\n Kit with the same `Result` shape and captures.\n- After `/login` in the setup terminal, the container's credential file holds\n only sentinels, the State Store holds the encrypted token, and a task run\n authenticates.\n- A real API key or OAuth token never appears in the container environment,\n filesystem, worktree, task log or event stream.\n- A request to a host outside the Kit's runtime allow list fails, including a\n direct connection that bypasses the proxy settings.\n- A harness instructed to `git commit` fails its step, and the task branch is\n unchanged.\n- A harness edit to a protected test file fails the step in a TDD fix stage.\n- A read-only feasibility stage that writes a file fails.\n- A file a run writes into a Kit-managed path such as the CLI's settings file\n is gone on the next execution.\n- A Kit requiring an unsupported capability is refused at launch with the\n capability named.\n- A stage with a failing gate resumes the same session with the gate output,\n then succeeds or exhausts its iterations.\n- Two tasks sharing an OAuth binding with `max_concurrent = 1` run one at a\n time; the second waits as `pending`.\n- Stopping a run kills the harness process and removes the container.\n- A harness invocation cannot read the worker's NATS or State Store\n credential from its environment, its files or `/proc`.\n- A run fanning out to many agent invocations uses one container.\n- A Kit profile in org A cannot be selected, and its binding cannot be\n resolved, by a workflow in org B.\n- A harness run whose identity is not granted a Kit's required credential is\n refused at launch; the proxy never injects a secret outside the run\n credential.\n- The firewall investigation example runs unchanged on an image profile with\n direct network access.\n" + "body": "# External agent harnesses\n\n**Status:** Approved\n**Authority:** `docs/architecture/agent-system.md` (agent execution as a data\nboundary); settles the harness non-goal deferred by\n`docs/prds/service-decomposition.md`.\n**Compounds with:** `docs/prds/execution-tree-state-machine.md` (a harness\nrun is one `agent` StepExecution), `docs/prds/binding-secret-encryption.md`\n(the at-rest envelope reused for harness credentials).\n\n## Decision\n\nA workflow stage can run on an external coding-agent CLI instead of the\nbuilt-in agent loop: Claude Code, Codex, Pi, OMP, GitHub Copilot CLI, or any\nother CLI packaged as a Docker Sandbox Kit v3. Each authenticates with an API\nkey or the operator's subscription login, and can carry the operator's own\nskills, plugins, subagents and instructions.\n\nTwo boundaries hold regardless of what the harness does:\n\n- **The real credential never enters the container.** The container sees\n sentinel values; archie's egress proxy substitutes the real credential on\n outbound requests and performs OAuth refresh on the host.\n- **Archie's workflow guarantees are enforced outside the harness.** Git,\n protected paths, read-only stages, gates and budgets are checked by archie\n around the process and against the worktree afterwards.\n\n## Kits\n\nA harness is packaged as a Kit v3 image: an OCI image whose\n`vnd.docker.sandbox.kit.descriptor` manifest annotation declares what the\nharness needs. Archie reads descriptors with the published\n`github.com/docker/sandbox-kit-spec/v3/spec` package and does not maintain\nits own descriptor format. Published Kits run unmodified.\n\nArchie is a partial Kit runtime. It implements these capability types:\n\n| Type | Archie behaviour |\n| ------------------- | ----------------------------------------------------------------------------------------- |\n| `credential@1` | Proxy-managed only, described below. |\n| `network-policy@1` | Enforced by the egress proxy. |\n| `volume@1` | A Docker volume keyed by WorkflowExecution, deleted with it. |\n| `lifecycle@1` | Install and startup hooks run on container create. |\n| `agent-sessions@1` | The headless `prompt` and `resume` invocations for the stage. |\n| `agent-skills@1` | The operator's skills store (`skills_dir`), mounted read-only whatever the Kit asks. |\n| `agent-context@1` | The workload's profile file beside the workspace, indexing each Kit's guidance. |\n| `resources@1` | Container CPU and memory limits. |\n\nEvery other type fails closed: a required entry refuses the launch, an\noptional one is skipped and recorded on the step. `credential@1` with\n`passthrough: true` and any credential for a forge service are refused.\n\nThe operator's own setup (plugins, subagents, instructions, settings) is a\nmixin Kit, published with the harness Kit as a Kit set: the set merges their\nlayers into one image. It is versioned image content, rewritten on every\ncreate, never state a run can modify.\n\n## Contract\n\nA harness run is a second implementation of `agentexec.Runner`. It takes the\nsame `Request` and returns the same `Result`, so workflows, the daemon and\nthe State Store do not know which runner ran a stage.\n\n`agent-sessions@1` supplies the invocation. Archie supplies, per CLI, an\noutput adapter that translates the CLI's JSON output stream into\n`ToolCallReporter` calls, `Usage` and a session ID. A CLI with no adapter can\nrun stages with no capture tools, reporting no usage; its token budget falls\nback to wall clock.\n\nWorkflow definition validation rejects, at load time, a stage whose needs the\nselected harness cannot meet: capture tools without an adapter, or a gate\nretry without a `resume` verb.\n\n## Selection\n\nA harness is an agent profile. `docs/prds/event-automation.md` defines a\nprofile as the execution environment a workflow selects; a harness profile\nnames one Kit pinned by digest, a workload Kit or a published Kit set, in\nplace of a container image. Archie runs that Kit's image and composes no Kits\nitself; a bare mixin is refused. Everything else about profiles\nholds: a workflow names its profile, a stage may name a different one, and a\nprofile holds no secrets.\n\n`archie-agent` builds the stage's runner from the stage's profile: the\nai-sdk agent loop for an image profile, the harness runner for a Kit\nprofile. Image profiles, and every workflow already written against them,\nare unchanged. A Kit profile named by no workflow is a validation error.\n\nA stage naming a different profile than its workflow's is a separate run,\nnot a mid-container runner switch: a Kit task runs in one container\nprovisioned for one profile (Container layout), so a stage that needs a\ndifferent one is its own callee, started the way `workflow.call` already\nstarts one (`docs/prds/event-automation.md` \"Workflows call workflows\"),\nwith its own agent profile resolved off its own task row. This needs no\nmechanism beyond `workflow.call` plus per-task profile resolution\n(`daemon.pinTaskProfile`), both of which already treat every task's\nprofile independently of any caller's -- see\n`TestWorkflowCallerConformance` (staterpc) for the callee's independent\n`Workflow` field and `TestWorkflowCallGivesACalleeItsOwnProfile` (daemon)\nfor the Kit-vs-image runner selection that independence produces.\n\nProfiles are org resources in the State Store, so a Kit profile belongs to\none org, is granted to its workspaces like any profile, and applies without\na restart.\n\n## Organisations\n\n`docs/prds/orgs-and-access.md` is the boundary; a harness adds nothing that\ncrosses it.\n\n- A Kit profile, its credential bindings and its OAuth tokens belong to one\n org. No record is shared between orgs.\n- A harness run is a run like any other: it acts as the workflow's identity,\n under the run credential issued at dispatch.\n- The egress proxy injects a credential only when the run credential carries\n the secret the binding names. A Kit that declares a service the identity is\n not granted gets no credential: a required one refuses the launch, an\n optional one is skipped.\n- A Kit's network policy is what the Kit asks for; the identity's network\n grants are what the org allows. The proxy enforces the intersection.\n- Concurrency slots are counted per binding within its org.\n\n## Credentials\n\nA credential binding maps a Kit's `credential@1` `service` name to an org\nsecret, which the org grants to identities like any secret. The secret holds\none of:\n\n- **API key:** a value in the org's secret store.\n- **OAuth:** tokens captured by the setup terminal, stored in the State Store\n under the at-rest envelope of `binding-secret-encryption.md` with its own\n domain separator.\n\nThe egress proxy resolves the binding for each request against the run\ncredential. The container gets the Kit's sentinel in the named variable or\ncredential file. OAuth refresh happens at the proxy, which intercepts the\nKit's `tokenEndpoint`, so a refreshed token is written to the State Store and\nnever returned to the container.\n\nRuns sharing an OAuth binding share its subscription's rate limit.\n`max_concurrent` on the binding (default 1) caps its simultaneous runs. A\nstage waiting for a slot is `pending`, not `running`.\n\n## Setup terminal\n\nThe dashboard opens a terminal (xterm.js over a WebSocket to a PTY) into an\nephemeral container built from a Kit profile, on the same egress path. The\nmember runs the CLI's own login. The proxy captures the tokens at the token\nendpoint into the org secret the binding names. The container is removed when\nthe terminal closes. No worktree is mounted into it.\n\nOpening the terminal is the `update` action on the secret, decided by the\nAuthorizer like any other; the shipped roles give it to org owners and\nadmins. It is the only interactive path into a harness container.\n\n## Egress\n\nOnly Kit profiles run on the egress path. An image profile keeps the network\naccess its identity is granted, because workflows such as a network\ninvestigator need raw DNS, ICMP and arbitrary TCP that no HTTP proxy\ncarries.\n\n- **Sandbox network.** Each Kit run gets its own internal Docker bridge on\n which the host holds no address. Host services, including those listening\n on every interface, are unreachable from it by any address.\n- **Relay.** One relay container, `archie-agent relay`, sits on the sandbox\n networks under a fixed alias and on the host-reachable network. It\n forwards three fixed ports, to the proxy, NATS and the State Store, and can\n reach nothing else. It holds no secrets.\n- **Proxy.** The proxy runs inside `archied`, listening on the host gateway\n of the host-reachable network. It terminates TLS with a per-daemon CA\n installed into the container at create, identifies the container by a\n per-run proxy token, and applies that run's network policy and credential\n inject rules. Upstream dials refuse loopback, and refuse internal addresses\n unless the policy names the exact IP, so an allowed name cannot resolve\n back into the host.\n\n## Container layout\n\nA Kit task runs in one container, from the Kit composition's image, on the\ntask's sandbox network. The worker and every harness invocation share it;\nthey are separated by user, not by container, so a run's cost scales with\nthe run and not with how many agents it fans out to.\n\n- **Worker.** Archie mounts its own `archie-agent` binary read-only and runs\n it as the container's entrypoint, as root. It holds the task's NATS and\n State Store credentials in its own environment and in root-only files,\n runs the workflow, and serves `archie-agent mcp`. The Kit image's\n entrypoint is not PID 1.\n- **Harness.** Every invocation runs as the Kit's user (the image's `User`,\n default uid 1000) with an explicit environment: the Kit's variables, the\n proxy environment and the credential sentinels, and nothing inherited from\n the worker. That user cannot read the worker's environment or files, or\n trace it. Sibling invocations in one run share the user and the worktree.\n- **Hooks.** `lifecycle@1` install and startup hooks run as the user each\n declares, before the worker accepts work.\n- **Mounts.** The task worktree at the Kit's workspace directory, owned by the\n Kit's user, and the read-only skills store. Nothing else from the host.\n- **Network.** The relay forwards three fixed ports on the sandbox network:\n the egress proxy, NATS and the State Store. The worker reaches NATS and the\n State Store with its credentials; a harness can open those ports but holds\n no credential either accepts.\n- **Volumes.** `volume@1` paths persist for the life of the\n WorkflowExecution, which covers session resume across gate iterations and\n retries. They are not shared between executions.\n\n## Archie tools inside the harness\n\nCapture tools, which are how a stage returns structured results, are served\nby `archie-agent mcp`, a stdio MCP server registered through the Kit's MCP\nconfiguration or the adapter's flags. It serves the stage's `CaptureTools`\nand the central tools the agent profile's `AllowTools` permits, never the\n`workspace` toolset. The runner's `ToolLimits` bound its results; the\nharness's own built-in tools are outside archie's limits.\n\n## Enforcement around the harness\n\n| Property | Enforcement |\n| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |\n| 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. |\n| Protected paths | A diff touching a `Protection` path fails the step. |\n| Read-only stage | Any worktree diff fails the step. |\n| 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. |\n| Budget | Archie kills the process on wall-clock timeout, or when streamed usage passes the token budget. |\n| Cancellation | Cancelling the step kills the process group, then the container. |\n| Egress | Only the proxy is reachable; the Kit's network policy decides the rest. |\n\nHarness settings that deny git or protected paths are added where the CLI\nsupports them, to save wasted turns. They are never the enforcement.\n\n## Execution tree\n\nA harness run is one `agent` StepExecution. Subagents the harness spawns\ninternally are not recorded as children. Their usage is included in the\nstep's `tokens_used` when the adapter reports it.\n\n## Agents never hold a harness\n\nAn Agent reaches a harness only by invoking a Workflow whose stage names it.\nNo Agent tool, chat tool or capability exposes a harness, its setup terminal\nor its credential. The stage boundary is what carries the container, the git\nand path checks, the gate and the budget; a harness outside a stage has none\nof them.\n\n## Out of scope\n\n- Chat through a harness. The gateway chat loop stays on the built-in\n runtime.\n- `network-policy@2` HTTP method and path rules; a Kit requiring it is\n refused.\n- Recording the harness's internal subagents as StepExecutions.\n- Cost in currency.\n- Choosing a harness automatically per task.\n\n## Plan\n\n1. Descriptor resolution with the Kit spec package; capability support\n table and fail-closed refusal.\n2. Egress proxy: internal network, per-daemon CA, per-container token,\n `network-policy@1`.\n3. `credential@1`: API-key bindings, sentinel rendering, inject rules.\n4. Harness `Runner`: container create with worktree, volumes, lifecycle\n hooks and the mounted `archie-agent`; `agent-sessions@1` invocation;\n worktree checks for git, protected paths and read-only; budget and\n cancellation.\n5. Claude Code output adapter; `archie-agent mcp`; gate-and-resume loop.\n6. Kit profiles, runner selection from the stage's profile, and definition\n validation.\n7. OAuth bindings as org secrets: token-endpoint interception, encrypted\n storage, per-binding concurrency; dashboard setup terminal.\n8. Output adapters for Codex, Pi, OMP and GitHub Copilot CLI.\n\n## Verification\n\n- The same workflow definition completes on `builtin` and on the Claude Code\n Kit with the same `Result` shape and captures.\n- After `/login` in the setup terminal, the container's credential file holds\n only sentinels, the State Store holds the encrypted token, and a task run\n authenticates.\n- A real API key or OAuth token never appears in the container environment,\n filesystem, worktree, task log or event stream.\n- A request to a host outside the Kit's runtime allow list fails, including a\n direct connection that bypasses the proxy settings.\n- A harness instructed to `git commit` fails its step, and the task branch is\n unchanged.\n- A harness edit to a protected test file fails the step in a TDD fix stage.\n- A read-only feasibility stage that writes a file fails.\n- A file a run writes into a Kit-managed path such as the CLI's settings file\n is gone on the next execution.\n- A Kit requiring an unsupported capability is refused at launch with the\n capability named.\n- A stage with a failing gate resumes the same session with the gate output,\n then succeeds or exhausts its iterations.\n- Two tasks sharing an OAuth binding with `max_concurrent = 1` run one at a\n time; the second waits as `pending`.\n- Stopping a run kills the harness process and removes the container.\n- A harness invocation cannot read the worker's NATS or State Store\n credential from its environment, its files or `/proc`.\n- A run fanning out to many agent invocations uses one container.\n- A Kit profile in org A cannot be selected, and its binding cannot be\n resolved, by a workflow in org B.\n- A harness run whose identity is not granted a Kit's required credential is\n refused at launch; the proxy never injects a secret outside the run\n credential.\n- The firewall investigation example runs unchanged on an image profile with\n direct network access.\n" }, { "url": "/dev/prds/identity-decision/", diff --git a/docs/prds/external-agent-harness.md b/docs/prds/external-agent-harness.md index b7ccfc2bd..527b96dcf 100644 --- a/docs/prds/external-agent-harness.md +++ b/docs/prds/external-agent-harness.md @@ -42,8 +42,8 @@ Archie is a partial Kit runtime. It implements these capability types: | `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, mounted read-only whatever the Kit asks. | -| `agent-context@1` | Archie's stage instructions, delivered where the Kit declares. | +| `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 diff --git a/internal/config/config.go b/internal/config/config.go index 561daefca..faff0caf7 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -388,7 +388,8 @@ type Config struct { // containing .agents/skills/*/SKILL.md files. When set, the // daemon builds its workflow registry from the skill catalog // (plugin-defined workflows override built-ins). When empty, - // only built-in workflows are available. + // only built-in workflows are available. Its skills are also the + // store a Kit's agent-skills@1 mounts, read-only, into the harness. SkillsDir string `toml:"skills_dir" yaml:"skills_dir"` // WorkflowRoutingFile is an optional path to a YAML file rebinding // which registered workflow an intake Kind (bug/feature/bootstrap) diff --git a/internal/infrastructure/kitrun/launcher.go b/internal/infrastructure/kitrun/launcher.go index c2996f5c8..8a5e85df5 100644 --- a/internal/infrastructure/kitrun/launcher.go +++ b/internal/infrastructure/kitrun/launcher.go @@ -19,6 +19,7 @@ import ( "github.com/samcharles93/archie-core/internal/container" "github.com/samcharles93/archie-core/internal/infrastructure/egress" "github.com/samcharles93/archie-core/internal/infrastructure/kit" + "github.com/samcharles93/archie-core/internal/skill" ) // SecretResolver resolves a credential binding's secret value. *secret.Registry @@ -119,26 +120,15 @@ func (l *Launcher) Launch(ctx context.Context, req Request) (*Run, error) { if err := l.startEgress(ctx); err != nil { return nil, err } - plan, img, err := l.compose(ctx, req.Kit) + k, err := l.read(ctx, req.Kit, req.GateRetries) if err != nil { return nil, err } - if err := kit.ValidateNeeds(plan, req.GateRetries); err != nil { - return nil, err - } - network, err := spec.NetworkPolicyOf(plan.Capabilities) - if err != nil { - return nil, err - } - creds, err := spec.CredentialsOf(plan.Capabilities) - if err != nil { - return nil, err - } - granted, bound := l.resolveCredentials(req, creds) + granted, bound := l.resolveCredentials(req, k.creds) if l.Grants != nil { l.Grants.Grant(req.Execution, granted) } - session, err := l.Proxy.Register(egress.SessionOptions{Run: req.Execution, Org: req.Org, Network: network, Credentials: creds}) + session, err := l.Proxy.Register(egress.SessionOptions{Run: req.Execution, Org: req.Org, Network: k.network, Credentials: k.creds}) if err != nil { if l.Grants != nil { l.Grants.RevokeGrant(req.Execution) @@ -146,7 +136,7 @@ func (l *Launcher) Launch(ctx context.Context, req Request) (*Run, error) { return nil, err } run := &Run{network: "archie-kit-" + req.Execution, token: session.Token(), execution: req.Execution} - launch, err := kit.Assemble(plan, img, kit.LaunchParams{Execution: req.Execution, ProxyToken: session.Token(), CAPath: caPath, Bound: bound}) + launch, err := kit.Assemble(k.plan, k.img, kit.LaunchParams{Execution: req.Execution, ProxyToken: session.Token(), CAPath: caPath, Bound: bound}) if err != nil { l.release(run) return nil, err @@ -163,11 +153,11 @@ func (l *Launcher) Launch(ctx context.Context, req Request) (*Run, error) { Network: run.network, Worker: []string{agentPath}, WorkerEnv: req.WorkerEnv, - Binds: []string{ + Binds: append([]string{ l.AgentBinary + ":" + agentPath + ":ro", l.CAFile + ":" + caPath + ":ro", req.WorkDir + ":" + kit.WorkspaceDir, - }, + }, skillsBinds(k.skills, l.skillsDir())...), Launch: launch, InstallDone: session.EnterRuntime, }) @@ -235,25 +225,54 @@ func (l *Launcher) release(run *Run) { l.Proxy.Revoke(run.token) } -// compose reads the profile's Kit and the config of the image it runs. -func (l *Launcher) compose(ctx context.Context, ref string) (*kit.Plan, kit.ImageConfig, error) { - reqs := []fetch.Request{{Reference: ref}} - merged, err := l.Fetch.Assemble(ctx, reqs, kit.MergeOptions) +// kitNeeds is what a profile's Kit asks of its run, read from its admitted +// plan. +type kitNeeds struct { + plan *kit.Plan + img kit.ImageConfig + network *spec.PhasedNetwork + creds []spec.CredentialCapability + skills []spec.AgentSkillsCapability +} + +// read fetches and admits the profile's Kit, checks it can meet the +// workflow's gate retries, and decodes what it asks of the run. +func (l *Launcher) read(ctx context.Context, ref string, gateRetries int) (kitNeeds, error) { + merged, err := l.Fetch.Assemble(ctx, []fetch.Request{{Reference: ref}}, kit.MergeOptions) if err != nil { - return nil, kit.ImageConfig{}, fmt.Errorf("read kit: %w", err) + return kitNeeds{}, fmt.Errorf("read kit: %w", err) } - plan, err := kit.FromMerge(merged.MergeResult) - if err != nil { - return nil, kit.ImageConfig{}, err + k := kitNeeds{} + if k.plan, err = kit.FromMerge(merged.MergeResult); err != nil { + return kitNeeds{}, err } - img, err := l.imageConfig(ctx, ref) - if err != nil { - return nil, kit.ImageConfig{}, err + if err := kit.ValidateNeeds(k.plan, gateRetries); err != nil { + return kitNeeds{}, err + } + if k.img, err = l.imageConfig(ctx, ref); err != nil { + return kitNeeds{}, err } for _, name := range slices.Sorted(maps.Keys(merged.Env)) { - img.Env = append(img.Env, name+"="+merged.Env[name]) + k.img.Env = append(k.img.Env, name+"="+merged.Env[name]) } - return plan, img, nil + if k.network, err = spec.NetworkPolicyOf(k.plan.Capabilities); err != nil { + return kitNeeds{}, err + } + if k.creds, err = spec.CredentialsOf(k.plan.Capabilities); err != nil { + return kitNeeds{}, err + } + if k.skills, err = spec.AgentSkillsOf(k.plan.Capabilities); err != nil { + return kitNeeds{}, err + } + return k, nil +} + +// skillsDir is the operator's live skills_dir, or "" with no config. +func (l *Launcher) skillsDir() string { + if l.Config == nil { + return "" + } + return l.Config.Get().SkillsDir } // Release stops the run's container, then removes its network, revokes its @@ -301,3 +320,19 @@ func (l *Launcher) imageConfig(ctx context.Context, ref string) (kit.ImageConfig Env: slices.Clone(cfg.Env), User: cfg.User, }, nil } + +// skillsBinds mounts the operator's shared skills store read-only at each +// path the Kit asks for it, whatever mode the Kit asks for. With no +// skills_dir configured the host withholds the mount. +func skillsBinds(asks []spec.AgentSkillsCapability, sharedDir string) []string { + if sharedDir == "" { + return nil + } + var binds []string + for _, a := range asks { + if a.Path != "" { + binds = append(binds, skill.StoreDir(sharedDir)+":"+a.Path+":ro") + } + } + return binds +} diff --git a/internal/infrastructure/kitrun/launcher_test.go b/internal/infrastructure/kitrun/launcher_test.go index cfdd11b09..2b6ad4a27 100644 --- a/internal/infrastructure/kitrun/launcher_test.go +++ b/internal/infrastructure/kitrun/launcher_test.go @@ -135,3 +135,18 @@ func TestResolveCredentialsIsAnIntersection(t *testing.T) { }) } } + +// The skills store is mounted read-only whatever mode a Kit asks for, and +// not at all when the operator configured none. +func TestSkillsBinds(t *testing.T) { + asks := []spec.AgentSkillsCapability{ + {Path: "/home/agent/.claude/skills", Mode: "readwrite"}, + } + got := skillsBinds(asks, "/srv/shared") + if len(got) != 1 || got[0] != "/srv/shared/.agents/skills:/home/agent/.claude/skills:ro" { + t.Fatalf("skillsBinds = %v, want the store mounted read-only at the Kit's path", got) + } + if got := skillsBinds(asks, ""); len(got) != 0 { + t.Fatalf("skillsBinds with no skills_dir = %v, want none", got) + } +} diff --git a/internal/skill/skill.go b/internal/skill/skill.go index e61bc38f5..e80af043b 100644 --- a/internal/skill/skill.go +++ b/internal/skill/skill.go @@ -162,6 +162,10 @@ func SkillForWorkflow(catalog []CatalogEntry, workflow string) *CatalogEntry { const skillsDir = ".agents/skills" +// StoreDir is where root keeps its skills: the directory a skills store +// mounted into a harness exposes. +func StoreDir(root string) string { return filepath.Join(root, skillsDir) } + // Parse extracts YAML frontmatter and body from SKILL.md content. // The frontmatter is delimited by "---" lines. If no frontmatter is found, // the entire content is returned as the body with a zero Frontmatter.