Skip to content

Commit 66b25d3

Browse files
committed
feat(code): cli sandboxes, enterprise timeouts, secrets projections, resolver lift
1 parent 0bc4fb4 commit 66b25d3

317 files changed

Lines changed: 54036 additions & 4366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
---
2+
name: add-managed-cli
3+
description: Add or upgrade a curated, immutable managed CLI for Sim Function sandboxes, including client-safe catalog metadata, a pinned server-only installation recipe, checksum and executable verification, provider compatibility, PATH propagation, content-addressed image identity, and tests. Use when adding a CLI to the Sandbox managed-CLI selector or changing an existing managed CLI version or recipe.
4+
---
5+
6+
# Add a Managed CLI
7+
8+
Add CLIs through the curated registry. Never turn this surface into arbitrary commands or package names: system packages already cover validated Debian/APT coordinates, while managed CLIs require immutable artifacts and reproducible recipes.
9+
10+
## Read First
11+
12+
Read these live sources before editing; do not copy their current entries into this skill:
13+
14+
1. `apps/sim/lib/execution/remote-sandbox/cli-tools.ts` — persisted IDs and client-safe metadata.
15+
2. `apps/sim/lib/execution/remote-sandbox/cli-tools.server.ts` — server-only recipes and recipe helpers.
16+
3. `apps/sim/lib/execution/remote-sandbox/cli-tools.test.ts` — catalog and supply-chain invariants.
17+
4. `apps/sim/lib/execution/remote-sandbox/cli-tools-boundary.test.ts` — client/server import boundary.
18+
5. `apps/sim/lib/execution/remote-sandbox/sandbox-spec.ts` — content-addressed hash inputs.
19+
20+
Read `resolve.ts` and `e2b.ts` only when changing provisioning mechanics. A normal catalog addition should not require UI, API, database, resolver, or provider edits; those paths derive from the registries.
21+
22+
Do not modify the dedicated Function base image or the separate Mothership Shell template for a normal managed CLI addition. Managed recipes layer on the Function base image. Do not change `MAX_SANDBOX_CLI_TOOLS` from ten unless the user separately requests a product-limit change.
23+
24+
## 1. Verify the Upstream Release
25+
26+
Use primary upstream release documentation and official artifacts. Establish all of the following before writing code:
27+
28+
- Exact version and stable Linux x86-64 artifact URL. Never use `latest`, mutable redirects, or an unversioned installer.
29+
- SHA-256 for the exact artifact. Prefer a publisher-signed checksum; otherwise download the official artifact and compute it independently.
30+
- Archive layout and the exact executable paths to install.
31+
- Noninteractive, credential-free verification commands for every advertised executable, normally version commands.
32+
- Required PATH entries under `/opt/sim-cli`.
33+
- E2B and Daytona compatibility. Default to both only when the same Linux recipe works on both.
34+
35+
When the user does not name a version, select the current stable upstream release from primary sources and state the exact version chosen. Do not silently choose a prerelease or infer a version from an unverified secondary source.
36+
37+
Reject curl-to-shell installers, `npm install`, `pip install`, distro package repositories, arbitrary user commands, and artifacts from unofficial mirrors. Never place credentials, tokens, login commands, or account configuration in an image recipe or build log; authentication is runtime-only.
38+
39+
## 2. Choose an Immutable ID
40+
41+
Use `<tool>@<upstream-version>-r<recipe-revision>`.
42+
43+
- New upstream version: append a new ID ending in `-r1`.
44+
- Recipe-only change for the same upstream version: append `-r2`, `-r3`, and so on.
45+
- Never mutate or delete an existing ID or recipe. Persisted sandboxes must continue resolving to the bytes and behavior they selected.
46+
- On upgrade, retain the old ID and recipe and set its metadata to `selectable: false`. Only the newest version keeps the public label selectable.
47+
48+
Before shipping the first upgrade for a tool family, verify that editing a sandbox cannot leave both the retired and replacement IDs selected. If the generic selector and API validation do not already replace or reject colliding versions, address that once at the generic registry boundary with focused UI and contract tests; never special-case the individual CLI or silently install two versions that expose the same executable.
49+
50+
Recipe identity includes the ID, revision, and SHA-256 in the sandbox image hash. Keeping old entries is what makes that identity reproducible rather than merely cache-busting.
51+
52+
## 3. Add Client-Safe Metadata
53+
54+
In `cli-tools.ts`:
55+
56+
1. Append the ID to `SANDBOX_CLI_TOOL_IDS` in the same order used by the metadata and recipe registries.
57+
2. Add a `SANDBOX_CLI_TOOLS` entry whose key and `id` exactly match.
58+
3. Provide a unique selectable `label`, concise `description`, existing `category`, and useful executable/vendor aliases in `searchTerms`.
59+
4. Add a category only when no existing category is accurate, then ensure it has at least one selectable entry.
60+
61+
Keep this file safe for client bundles. It must not contain artifact URLs, checksums, install commands, verification commands, PATH recipes, provider SDKs, or imports from `cli-tools.server.ts`.
62+
63+
The API enum and searchable grouped selector derive from this registry. Do not add parallel option arrays or route-local wire types.
64+
65+
## 4. Add the Server-Only Recipe
66+
67+
In `cli-tools.server.ts`, use the narrowest existing helper:
68+
69+
- `defineBinaryRecipe` for one downloaded binary.
70+
- `defineTarGzipRecipe` or `defineZipRecipe` for archives containing binaries.
71+
- `defineVerifiedRecipe` for a vendor archive or installer layout that needs explicit commands.
72+
- A direct typed entry only when the helpers cannot faithfully model the release.
73+
74+
Provide every field the recipe contract requires:
75+
76+
- Exact `version`, `artifactUrl`, `artifactName`, and lowercase 64-character `sha256`.
77+
- Every installed `executable` and a corresponding `verificationCommands` entry.
78+
- Deterministic extraction/install commands into `/opt/sim-cli`; quote fixed paths and clean temporary artifacts.
79+
- `pathEntries` when the executable is not installed into the helper's default `bin` directory.
80+
- `supportedProviders` only when it differs from the E2B-and-Daytona default.
81+
- `revision` when it differs from `1`; it must agree with the ID suffix.
82+
83+
Verification must prove the command is discoverable through `sandboxCliEnvironment`, not authenticate or contact a user account. Recipe commands run as root during both prebuilt image creation and runtime provisioning.
84+
85+
If the artifact host is new, add only the exact official hostname to the `officialHosts` allowlist in `cli-tools.test.ts`. Treat that as a supply-chain review, not a way to silence the test.
86+
87+
## 5. Preserve Generic Behavior
88+
89+
Confirm the existing generic paths remain sufficient:
90+
91+
- `sandboxCliToolRecipes` canonicalizes and resolves the recipe.
92+
- `sandboxCliEnvironment` propagates PATH to Python subprocesses, JavaScript subprocesses, and Shell.
93+
- E2B bakes the recipe into the custom image; runtime-strategy providers install it within the Function timeout.
94+
- CLI-only sandboxes remain buildable even with no language packages.
95+
- `hashSandboxSpec` includes recipe ID, revision, and checksum while preserving the legacy hash for an empty CLI list.
96+
- The settings selector derives groups and search aliases from client-safe metadata.
97+
98+
Do not special-case a CLI in those layers unless the registry contract cannot express a genuine provider requirement. Extend the registry contract generically when multiple CLIs need the same new behavior.
99+
100+
## 6. Test the Addition
101+
102+
Extend tests when the new entry introduces behavior not already covered:
103+
104+
- For every upgrade, add a regression proving the old ID and recipe remain resolvable but non-selectable, while the replacement ID is selectable.
105+
- Add important executable aliases to the table-driven search assertion.
106+
- Add a focused assertion for a multi-executable recipe, custom PATH, or restricted provider.
107+
- Add an opt-in credentialed smoke test only when installation plus a real minimal command cannot be validated without authentication. Read credentials from test-only environment variables, skip by default, create them only at runtime, and always tear down the sandbox.
108+
109+
Never commit downloaded artifacts or credentials.
110+
111+
## Required Validation
112+
113+
From `apps/sim`:
114+
115+
```bash
116+
bunx vitest run \
117+
lib/execution/remote-sandbox/cli-tools.test.ts \
118+
lib/execution/remote-sandbox/cli-tools-boundary.test.ts \
119+
lib/execution/remote-sandbox/sandbox-spec.test.ts \
120+
lib/execution/remote-sandbox/resolve.test.ts \
121+
lib/api/contracts/sandboxes.test.ts \
122+
'app/workspace/[workspaceId]/settings/components/sandboxes/utils.test.ts' \
123+
'app/workspace/[workspaceId]/settings/components/sandboxes/components/sandbox-editor.test.tsx'
124+
```
125+
126+
From the repository root:
127+
128+
```bash
129+
bun run type-check
130+
bun run check:api-validation
131+
bunx biome check \
132+
apps/sim/lib/execution/remote-sandbox/cli-tools.ts \
133+
apps/sim/lib/execution/remote-sandbox/cli-tools.server.ts \
134+
apps/sim/lib/execution/remote-sandbox/cli-tools.test.ts
135+
git diff --check
136+
```
137+
138+
For a new recipe, also exercise its install and every verification command in an actual E2B or Daytona sandbox when credentials and network access are available. Report clearly when only registry/unit validation ran.
139+
140+
## Completion Checklist
141+
142+
- [ ] Official immutable Linux x86-64 artifact and SHA-256 verified.
143+
- [ ] Versioned ID appended; old IDs and recipes retained.
144+
- [ ] Client metadata is searchable, categorized, unique, and recipe-free.
145+
- [ ] Server recipe is pinned, integrity-checked, noninteractive, and credential-free.
146+
- [ ] Every advertised executable has an offline verification command and PATH entry.
147+
- [ ] Provider compatibility is explicit and accurate.
148+
- [ ] Catalog, boundary, hash, resolver, type, API-validation, format, and diff checks pass.
149+
- [ ] Real provider installation was tested, or the missing live verification is disclosed.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
interface:
2+
display_name: "Add Managed CLI"
3+
short_description: "Add a verified CLI to sandbox images"
4+
default_prompt: "Use $add-managed-cli to add a pinned, verified CLI to Sim sandbox images."
Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
---
2+
description: Add or upgrade a curated, immutable managed CLI for Sim Function sandboxes, including client-safe catalog metadata, a pinned server-only installation recipe, checksum and executable verification, provider compatibility, PATH propagation, content-addressed image identity, and tests. Use when adding a CLI to the Sandbox managed-CLI selector or changing an existing managed CLI version or recipe.
3+
---
4+
5+
# Add a Managed CLI
6+
7+
Add CLIs through the curated registry. Never turn this surface into arbitrary commands or package names: system packages already cover validated Debian/APT coordinates, while managed CLIs require immutable artifacts and reproducible recipes.
8+
9+
## Read First
10+
11+
Read these live sources before editing; do not copy their current entries into this skill:
12+
13+
1. `apps/sim/lib/execution/remote-sandbox/cli-tools.ts` — persisted IDs and client-safe metadata.
14+
2. `apps/sim/lib/execution/remote-sandbox/cli-tools.server.ts` — server-only recipes and recipe helpers.
15+
3. `apps/sim/lib/execution/remote-sandbox/cli-tools.test.ts` — catalog and supply-chain invariants.
16+
4. `apps/sim/lib/execution/remote-sandbox/cli-tools-boundary.test.ts` — client/server import boundary.
17+
5. `apps/sim/lib/execution/remote-sandbox/sandbox-spec.ts` — content-addressed hash inputs.
18+
19+
Read `resolve.ts` and `e2b.ts` only when changing provisioning mechanics. A normal catalog addition should not require UI, API, database, resolver, or provider edits; those paths derive from the registries.
20+
21+
Do not modify the dedicated Function base image or the separate Mothership Shell template for a normal managed CLI addition. Managed recipes layer on the Function base image. Do not change `MAX_SANDBOX_CLI_TOOLS` from ten unless the user separately requests a product-limit change.
22+
23+
## 1. Verify the Upstream Release
24+
25+
Use primary upstream release documentation and official artifacts. Establish all of the following before writing code:
26+
27+
- Exact version and stable Linux x86-64 artifact URL. Never use `latest`, mutable redirects, or an unversioned installer.
28+
- SHA-256 for the exact artifact. Prefer a publisher-signed checksum; otherwise download the official artifact and compute it independently.
29+
- Archive layout and the exact executable paths to install.
30+
- Noninteractive, credential-free verification commands for every advertised executable, normally version commands.
31+
- Required PATH entries under `/opt/sim-cli`.
32+
- E2B and Daytona compatibility. Default to both only when the same Linux recipe works on both.
33+
34+
When the user does not name a version, select the current stable upstream release from primary sources and state the exact version chosen. Do not silently choose a prerelease or infer a version from an unverified secondary source.
35+
36+
Reject curl-to-shell installers, `npm install`, `pip install`, distro package repositories, arbitrary user commands, and artifacts from unofficial mirrors. Never place credentials, tokens, login commands, or account configuration in an image recipe or build log; authentication is runtime-only.
37+
38+
## 2. Choose an Immutable ID
39+
40+
Use `<tool>@<upstream-version>-r<recipe-revision>`.
41+
42+
- New upstream version: append a new ID ending in `-r1`.
43+
- Recipe-only change for the same upstream version: append `-r2`, `-r3`, and so on.
44+
- Never mutate or delete an existing ID or recipe. Persisted sandboxes must continue resolving to the bytes and behavior they selected.
45+
- On upgrade, retain the old ID and recipe and set its metadata to `selectable: false`. Only the newest version keeps the public label selectable.
46+
47+
Before shipping the first upgrade for a tool family, verify that editing a sandbox cannot leave both the retired and replacement IDs selected. If the generic selector and API validation do not already replace or reject colliding versions, address that once at the generic registry boundary with focused UI and contract tests; never special-case the individual CLI or silently install two versions that expose the same executable.
48+
49+
Recipe identity includes the ID, revision, and SHA-256 in the sandbox image hash. Keeping old entries is what makes that identity reproducible rather than merely cache-busting.
50+
51+
## 3. Add Client-Safe Metadata
52+
53+
In `cli-tools.ts`:
54+
55+
1. Append the ID to `SANDBOX_CLI_TOOL_IDS` in the same order used by the metadata and recipe registries.
56+
2. Add a `SANDBOX_CLI_TOOLS` entry whose key and `id` exactly match.
57+
3. Provide a unique selectable `label`, concise `description`, existing `category`, and useful executable/vendor aliases in `searchTerms`.
58+
4. Add a category only when no existing category is accurate, then ensure it has at least one selectable entry.
59+
60+
Keep this file safe for client bundles. It must not contain artifact URLs, checksums, install commands, verification commands, PATH recipes, provider SDKs, or imports from `cli-tools.server.ts`.
61+
62+
The API enum and searchable grouped selector derive from this registry. Do not add parallel option arrays or route-local wire types.
63+
64+
## 4. Add the Server-Only Recipe
65+
66+
In `cli-tools.server.ts`, use the narrowest existing helper:
67+
68+
- `defineBinaryRecipe` for one downloaded binary.
69+
- `defineTarGzipRecipe` or `defineZipRecipe` for archives containing binaries.
70+
- `defineVerifiedRecipe` for a vendor archive or installer layout that needs explicit commands.
71+
- A direct typed entry only when the helpers cannot faithfully model the release.
72+
73+
Provide every field the recipe contract requires:
74+
75+
- Exact `version`, `artifactUrl`, `artifactName`, and lowercase 64-character `sha256`.
76+
- Every installed `executable` and a corresponding `verificationCommands` entry.
77+
- Deterministic extraction/install commands into `/opt/sim-cli`; quote fixed paths and clean temporary artifacts.
78+
- `pathEntries` when the executable is not installed into the helper's default `bin` directory.
79+
- `supportedProviders` only when it differs from the E2B-and-Daytona default.
80+
- `revision` when it differs from `1`; it must agree with the ID suffix.
81+
82+
Verification must prove the command is discoverable through `sandboxCliEnvironment`, not authenticate or contact a user account. Recipe commands run as root during both prebuilt image creation and runtime provisioning.
83+
84+
If the artifact host is new, add only the exact official hostname to the `officialHosts` allowlist in `cli-tools.test.ts`. Treat that as a supply-chain review, not a way to silence the test.
85+
86+
## 5. Preserve Generic Behavior
87+
88+
Confirm the existing generic paths remain sufficient:
89+
90+
- `sandboxCliToolRecipes` canonicalizes and resolves the recipe.
91+
- `sandboxCliEnvironment` propagates PATH to Python subprocesses, JavaScript subprocesses, and Shell.
92+
- E2B bakes the recipe into the custom image; runtime-strategy providers install it within the Function timeout.
93+
- CLI-only sandboxes remain buildable even with no language packages.
94+
- `hashSandboxSpec` includes recipe ID, revision, and checksum while preserving the legacy hash for an empty CLI list.
95+
- The settings selector derives groups and search aliases from client-safe metadata.
96+
97+
Do not special-case a CLI in those layers unless the registry contract cannot express a genuine provider requirement. Extend the registry contract generically when multiple CLIs need the same new behavior.
98+
99+
## 6. Test the Addition
100+
101+
Extend tests when the new entry introduces behavior not already covered:
102+
103+
- For every upgrade, add a regression proving the old ID and recipe remain resolvable but non-selectable, while the replacement ID is selectable.
104+
- Add important executable aliases to the table-driven search assertion.
105+
- Add a focused assertion for a multi-executable recipe, custom PATH, or restricted provider.
106+
- Add an opt-in credentialed smoke test only when installation plus a real minimal command cannot be validated without authentication. Read credentials from test-only environment variables, skip by default, create them only at runtime, and always tear down the sandbox.
107+
108+
Never commit downloaded artifacts or credentials.
109+
110+
## Required Validation
111+
112+
From `apps/sim`:
113+
114+
```bash
115+
bunx vitest run \
116+
lib/execution/remote-sandbox/cli-tools.test.ts \
117+
lib/execution/remote-sandbox/cli-tools-boundary.test.ts \
118+
lib/execution/remote-sandbox/sandbox-spec.test.ts \
119+
lib/execution/remote-sandbox/resolve.test.ts \
120+
lib/api/contracts/sandboxes.test.ts \
121+
'app/workspace/[workspaceId]/settings/components/sandboxes/utils.test.ts' \
122+
'app/workspace/[workspaceId]/settings/components/sandboxes/components/sandbox-editor.test.tsx'
123+
```
124+
125+
From the repository root:
126+
127+
```bash
128+
bun run type-check
129+
bun run check:api-validation
130+
bunx biome check \
131+
apps/sim/lib/execution/remote-sandbox/cli-tools.ts \
132+
apps/sim/lib/execution/remote-sandbox/cli-tools.server.ts \
133+
apps/sim/lib/execution/remote-sandbox/cli-tools.test.ts
134+
git diff --check
135+
```
136+
137+
For a new recipe, also exercise its install and every verification command in an actual E2B or Daytona sandbox when credentials and network access are available. Report clearly when only registry/unit validation ran.
138+
139+
## Completion Checklist
140+
141+
- [ ] Official immutable Linux x86-64 artifact and SHA-256 verified.
142+
- [ ] Versioned ID appended; old IDs and recipes retained.
143+
- [ ] Client metadata is searchable, categorized, unique, and recipe-free.
144+
- [ ] Server recipe is pinned, integrity-checked, noninteractive, and credential-free.
145+
- [ ] Every advertised executable has an offline verification command and PATH entry.
146+
- [ ] Provider compatibility is explicit and accurate.
147+
- [ ] Catalog, boundary, hash, resolver, type, API-validation, format, and diff checks pass.
148+
- [ ] Real provider installation was tested, or the missing live verification is disclosed.

0 commit comments

Comments
 (0)