Files
Derek Carr 5952a5a23f feat(workspace): add workspace resource model with scoping, membershi… (#2243)
* feat(workspace): implement workspace model (Phase 1 of RFC 0011)

Implements workspace and membership model providing hard isolation
boundaries for multi-player OpenShell deployments.

Workspace CRUD with Kubernetes-style Terminating phase for graceful
deletion. All resources scoped by workspace via ObjectMeta. Membership
RPCs for workspace access control. Persistence migration shifts name
uniqueness to (object_type, workspace, name). Provider profiles support
platform and workspace scoping. Service routing uses workspace-prefixed
DNS labels. Inference routes renamed and workspace-scoped with
DeleteInferenceRoute RPC. Python SDK with WorkspaceClient, two-method
list pattern (workspace-scoped and for_all_workspaces), and workspace
parameter on all methods. CLI workspace flags, TUI workspace cycling.
K8s driver filters unmanaged CRs and uses delete preconditions. Podman
driver uses immutable container IDs. Label serialization fixed across
all put_if call sites.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(cli): delegate sandbox upload command to existing upload function

The standalone `sandbox upload` command reimplemented upload logic
inline with two bugs: it used `Path::exists()` which follows symlinks
(rejecting dangling symlinks), and it ran git-aware filtering on
symlink sources. The `run::sandbox_upload()` function already handles
both cases correctly via `sandbox_upload_plan()`. Replace the inline
logic with a call to the existing function.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(e2e): shorten sandbox names and fix test compatibility

Shorten the sandbox name in initial_sparse_policy_is_acknowledged_as_loaded
from 'e2e-2159-sparse-enrich' (22 chars) to 'e2e-sparse-enrich' (17 chars)
to comply with MAX_ROUTABLE_NAME_LEN (19 chars).

Also capture stderr in create_keep_with_args so future sandbox creation
failures include the actual CLI error instead of reporting empty output.

Signed-off-by: Derek Carr <decarr@redhat.com>

* test(workspace): add test coverage for workspace CRUD and persistence isolation

Add unit tests for workspace create happy path, get round-trip, get
not-found, get empty-name rejection, already-exists error, and
resolve_workspace not-found. Add persistence test proving cross-workspace
name uniqueness (same name in different workspaces produces separate
records). Add workspace name max-length boundary tests. Fix e2e harness
to include stderr in name-parse-failure error path. Align Python e2e
test_workspace_crud with try/finally pattern. Document provider profile
catalog workspace scoping gap in RFC 0011.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(examples): update examples for workspace model compatibility

Shorten sandbox names in demo scripts to fit the 19-character
MAX_ROUTABLE_NAME_LEN limit: policy-demo prefix to pd-, multi-agent
notepad derives a short SANDBOX_TAG from the run ID, governance
interceptor uses gs-PID-RANDOM. Update vscode-remote-sandbox.md SSH
host aliases from openshell-{name} to openshell-{name}.{workspace}
format.

Signed-off-by: Derek Carr <decarr@redhat.com>

* feat(sdk): add workspace-scoped client and workspace CRUD

Add WorkspaceScopedClient modeled after kube::Api::namespaced — captures
workspace once and injects it into every sandbox request. Add workspace
CRUD methods (create, get, list, delete) and list_sandboxes_all_workspaces
on OpenShellClient. Extend SandboxRef with workspace field and add
WorkspaceRef type. Include mock tests for all new operations.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(lint): resolve clippy warnings in workspace test assertions

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(docs): convert indented code blocks to fenced in RFC 0011

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(lint): resolve clippy warnings and apply cargo fmt across workspace

Auto-format with cargo fmt and fix clippy warnings exposed by the
reformat: unnecessary qualifications, map_unwrap_or, identical match
arms, unused variable prefix, dead code annotations, and let-unit-value
in e2e harness.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(workspace): address workspace scoping issues from review

- Add workspace field to settings JSON output (CLI)
- Skip Podman containers missing workspace label instead of defaulting
  to empty string, matching K8s driver behavior
- Add resource_version to list_by_scope SELECT in both SQLite and
  Postgres backends, with regression test
- Gate PolicyLocalContext proposal/lookup routes on workspace readiness,
  returning 503 when workspace is not yet discovered
- Block sandbox and provider creation in TUI all-workspaces mode
- Clear workspace vectors in TUI reset_sandbox_state

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(workspace): make provider profile catalog workspace-aware

Thread workspace through snapshot_catalog so the
EffectiveProviderProfileCatalog enforces workspace boundaries on both
read and write paths. UserProviderProfileSource now loads platform-scoped
profiles (workspace "") plus the target workspace's profiles, preventing
cross-workspace duplicate profile ID collisions that previously caused
global catalog failures.

Update RFC 0011 to reflect catalog scoping is implemented in Phase 1
rather than deferred to future work.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(persistence): include workspace column in atomic policy revision INSERT

put_policy_revision_atomic omitted the workspace column from the INSERT
into the objects table in both SQLite and Postgres backends, causing
atomically-written policy revisions to lose their workspace association.
Add workspace field to AtomicPolicyRevisionWrite and thread it through
both backend INSERT statements, matching the non-atomic put_policy_revision
path which already included it.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(proxy): skip ancestor walk when socket owner is the entrypoint

collect_ancestor_identities walked the entire process tree above the
entrypoint when the connecting process was the entrypoint itself,
SHA256-hashing every ancestor binary (IDE, shell, container runtime).
On dev machines with large binaries in the ancestor chain this exceeded
the 30-second test timeout. When start_pid == stop_pid there are no
intermediate ancestors to verify, so return an empty list immediately.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(workspace): make provider profile catalog scope-aware

Allow the same profile ID at platform and workspace scopes by
introducing layered catalog entries where workspace profiles shadow
platform profiles. Add source and scope fields to the ProviderProfile
proto and CLI output. Migrate List/Get handlers to the catalog,
fixing divergence with runtime profile resolution.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(e2e): align podman e2e labels with centralized driver constants

The podman driver moved its container labels to the centralized
openshell.ai/ prefix, but the e2e test harness and cleanup script
still referenced the old openshell.sandbox-* keys, causing the
local_driver_token_restart test to fail on container lookup.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(e2e): align python profile isolation test with scope-aware catalog

Platform profiles are now visible in workspace listings as fallbacks
per the layered catalog design. Update the assertion to match.

Signed-off-by: Derek Carr <decarr@redhat.com>

* fix(workspace): honor profile_workspace in runtime profile resolution

Runtime profile lookups now consult provider.profile_workspace via
get_type_profile_for_scope. Providers created with --global-profile
(profile_workspace="") resolve to the platform profile even when a
workspace profile shadows the same ID. All 6 runtime call sites
updated; type-only call sites remain scope-agnostic.

Signed-off-by: Derek Carr <decarr@redhat.com>

---------

Signed-off-by: Derek Carr <decarr@redhat.com>
2026-07-21 00:59:18 +00:00
..

OpenShell Agents

scripts/agents/ contains repository-owned agent launchers. An agent is a manifest plus prompt assets that the shared launcher turns into an OpenShell sandbox run. Agents do not own harness implementations. Harness-specific setup and execution live in runtime/harnesses/<name>/.

Directory Layout

scripts/agents/
  run.sh                    # Generic manifest-driven launcher
  runtime/                  # Shared in-sandbox runtime
    entrypoint.sh           # Starts the in-sandbox supervisor
    supervisor.sh           # Runs bounded harness cycles in once/watch mode
    subagent.sh             # Generic subagent dispatcher
    harnesses/
      codex/                # Codex install and execution adapter
  <agent>/
    agent.yaml              # Agent manifest
    prompts/                # Prompt templates rendered at launch
    providers/              # Provider profile YAML files for this agent
    policy.yaml             # Optional image policy source

Agent directories should contain agent-specific intent and payloads: manifests, prompt templates, provider profiles, policies, and references to skills or subagents. They should not contain harnesses/codex, harnesses/opencode, or similar runtime code.

Agent Manifest

Each agent has an agent.yaml manifest. The launcher currently reads these sections:

  • id, display_name, description: human and runtime identity.
  • sandbox: default sandbox name prefix, gateway, source image or Dockerfile, and background log directory.
  • harness: default harness and per-harness settings such as model and reasoning effort.
  • runtime: in-sandbox run mode (once or watch), watch poll interval, and transient failure logging threshold.
  • profile_paths: ordered directories to scan for provider profile YAML files.
  • settings: gateway settings to apply before launch.
  • providers: provider instances to create or update, credential sources, and optional refresh configuration.
  • skills: files to inject into the sandbox payload.
  • subagents: subagent definitions to inject into the sandbox payload.
  • prompt_template: prompt template rendered into the immutable agent payload as agent-prompt.md.

Manifest paths support these prefixes:

  • repo://path: resolve from the repository root.
  • agent://path: resolve from the agent directory.
  • Relative paths without a prefix: resolve from the agent directory.
  • Absolute paths: use as-is.

Launch Order

scripts/agents/run.sh performs the launch in this order:

  1. Parse CLI flags and select the agent directory from --agent.
  2. Load agent.yaml, select the requested harness, and reject unsupported harness names.
  3. Resolve sandbox defaults from the manifest and CLI/environment overrides.
  4. Build a temporary payload directory.
  5. Copy runtime/ into the payload so every agent uses the same in-sandbox entrypoint and harness adapters.
  6. Optionally copy a host Codex binary into the shared Codex runtime path when --codex-bin is supplied.
  7. Copy manifest-declared skills and subagents into the payload.
  8. Render the prompt template with runtime values such as {{HARNESS}}, {{RUN_MODE}}, {{POLL_INTERVAL_SECONDS}}, {{USER_PROMPT}}, and manifest-declared subagent variables such as {{REVIEWER_COMMAND}}.
  9. Build a temporary Docker context that bakes the rendered payload into /etc/openshell/agent-payload.
  10. Apply manifest-declared gateway settings.
  11. Resolve provider profile IDs by scanning profile_paths in order.
  12. Import each provider profile into the gateway. If an active profile already exists, the launcher keeps going and uses it.
  13. Resolve provider credentials from host commands, JSON files, or literal manifest values.
  14. Create or update each provider instance and attach every selected provider to the sandbox.
  15. Configure and rotate refresh-backed provider credentials when declared by the manifest.
  16. Run openshell sandbox create from that temporary Dockerfile source.
  17. Inside the sandbox, run /etc/openshell/agent-payload/runtime/entrypoint.sh.
  18. The runtime entrypoint starts /etc/openshell/agent-payload/runtime/supervisor.sh.
  19. The supervisor invokes /etc/openshell/agent-payload/runtime/harnesses/<harness>/exec.sh as a bounded child execution.
  20. Harness adapters prepare harness-local auth/config and execute the agent prompt headlessly.

The payload directory is baked into the image under /etc/openshell, which the gator filesystem policy mounts read-only for agent processes. Prompts, skills, subagent definitions, and runtime scripts are agent guts, not workspace state. Agents should write session artifacts, checkouts, temporary files, and future memory records under /sandbox or /tmp instead.

Runtime Modes

Agents can run in once or watch mode. In once mode the supervisor runs one harness cycle and exits with the harness result unless the agent emits an OPENSHELL_AGENT_RESULT sentinel.

In watch mode the sandbox stays alive while the supervisor repeatedly runs bounded harness cycles. The harness must not sleep or poll indefinitely. Instead, it performs one reconciliation cycle, then prints a final-line sentinel:

OPENSHELL_AGENT_RESULT {"status":"waiting","next_poll_seconds":900,"reason":"checks_pending"}

Supported statuses are complete, waiting, blocked, transient_failure, and terminal_failure. The supervisor sleeps between waiting or blocked cycles without keeping the harness connected, then launches a fresh harness cycle inside the same sandbox. During active harness cycles and long sleeps, it prints a heartbeat every 60 seconds by default so operators can distinguish deliberate work or waiting from a stuck launch. Set OPENSHELL_AGENT_HEARTBEAT_SECONDS=0 to disable heartbeats or another integer to change the interval. In watch mode, missing or malformed result sentinels and harness transport failures are retried indefinitely with bounded backoff; only complete and terminal_failure stop the supervisor. This keeps long-lived agents resilient to upstream model errors while leaving durable state ownership to the agent domain.

The shared runtime does not prescribe the durable state store. Gator uses GitHub labels, comments, reviews, and checks. Other agents can use a repository branch, issue tracker, object store, database, or another domain-specific store as long as each cycle can reconcile from that state.

Use --once or --watch to override the manifest default. Use --poll-interval <seconds> to override the watch sleep interval.

Refresh-backed providers are bootstrapped from manifest credential sources when no gateway refresh state exists. Later launches preserve gateway-owned refresh material and request a credential rotation first. If that rotation fails, the launcher treats the host credential source as a repair source, replaces the gateway refresh material, and retries rotation once. Use --reset-refresh to skip the preserve-first path and intentionally replace gateway refresh material from the host credential source before rotating.

Long-lived harnesses must not persist revision-scoped provider placeholders such as openshell:resolve:env:v123_TOKEN into files they reuse across refreshes. Persist the current-name alias, for example openshell:resolve:env:TOKEN, so the sandbox proxy resolves the latest gateway-refreshed credential on each request.

Subagents

The launcher injects subagent definitions under /etc/openshell/agent-payload/subagents/. Prompt templates should refer to the generic command instead of a harness-specific script:

bash /etc/openshell/agent-payload/runtime/subagent.sh <subagent-id> < task.md

The shared subagent dispatcher forwards the task to the active harness adapter. For Codex, this runs a separate bounded codex exec invocation using the same model and reasoning defaults as the parent harness.

Providers

Listing a provider in agent.yaml means the provider is attached to the sandbox. Provider profiles describe credential shape, endpoint policy, discovery metadata, and refresh metadata. The launcher only creates provider instances and supplies runtime credential values.

profile_paths are ordered. The first profile file with the requested id wins. If the same directory contains duplicate profile IDs, the launcher fails. If a later profile path contains a profile ID that was already found, the launcher warns that the later file is shadowed.

Gator Example

gator/ is the first manifest-driven agent. It uses:

  • gator/agent.yaml for the launch contract.
  • gator/prompts/gator.md for the rendered operator prompt.
  • gator/providers/ for scoped GitHub and Codex provider profiles.
  • gator/Dockerfile for the local sandbox image.
  • runtime/harnesses/codex/ for Codex installation and execution.

Run it through the generic launcher:

./scripts/agents/run.sh \
  --agent gator \
  --gateway docker-dev \
  "Run gator on PR 1536 and keep watching until it closes or merges."