Skip to content

fix(sandbox): keep VM resources per instance #1606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NathanFlurry wants to merge 1 commit into
base: stack/refactor-agentos-rename-toolkits-to-bindings-klpqskyp
Choose a base branch
from
Open

fix(sandbox): keep VM resources per instance #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 5 additions & 142 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions examples/agent-to-agent/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"dependencies": {
"@rivet-dev/agentos-core": "workspace:*",
"@rivet-dev/agentos-sandbox": "workspace:*",
"sandbox-agent": "^0.4.2",
"dockerode": "^4.0.9",
"get-port": "^7.1.0",
"@agentos-software/git": "link:../../../secure-exec/registry/software/git",
"@agentos-software/claude-code": "link:../../../secure-exec/registry/agent/claude",
"@agentos-software/opencode": "link:../../../secure-exec/registry/agent/opencode",
Expand Down
3 changes: 0 additions & 3 deletions examples/approvals/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"dependencies": {
"@rivet-dev/agentos-core": "workspace:*",
"@rivet-dev/agentos-sandbox": "workspace:*",
"sandbox-agent": "^0.4.2",
"dockerode": "^4.0.9",
"get-port": "^7.1.0",
"@agentos-software/git": "link:../../../secure-exec/registry/software/git",
"@agentos-software/claude-code": "link:../../../secure-exec/registry/agent/claude",
"@agentos-software/opencode": "link:../../../secure-exec/registry/agent/opencode",
Expand Down
3 changes: 0 additions & 3 deletions examples/authentication/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"dependencies": {
"@rivet-dev/agentos-core": "workspace:*",
"@rivet-dev/agentos-sandbox": "workspace:*",
"sandbox-agent": "^0.4.2",
"dockerode": "^4.0.9",
"get-port": "^7.1.0",
"@agentos-software/git": "link:../../../secure-exec/registry/software/git",
"@agentos-software/claude-code": "link:../../../secure-exec/registry/agent/claude",
"@agentos-software/opencode": "link:../../../secure-exec/registry/agent/opencode",
Expand Down
3 changes: 0 additions & 3 deletions examples/bindings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"dependencies": {
"@rivet-dev/agentos-core": "workspace:*",
"@rivet-dev/agentos-sandbox": "workspace:*",
"sandbox-agent": "^0.4.2",
"dockerode": "^4.0.9",
"get-port": "^7.1.0",
"@agentos-software/git": "link:../../../secure-exec/registry/software/git",
"@agentos-software/claude-code": "link:../../../secure-exec/registry/agent/claude",
"@agentos-software/opencode": "link:../../../secure-exec/registry/agent/opencode",
Expand Down
5 changes: 2 additions & 3 deletions examples/browser-terminal/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ Override the web→server endpoint with `VITE_AGENTOS_ENDPOINT` (default

## Notes

- Software: `@agentos-software/common` (provides `sh` + coreutils) plus `git`,
`curl`, `ripgrep`, `jq`, and `sqlite3`. Agent OS has no vim/editor package, so
there is no in-VM editor.
- Software: `@agentos-software/common` provides `sh` plus the standard shell
tools. Agent OS has no vim/editor package, so there is no in-VM editor.
- The shipped actor has no `listShells` action and keeps no server-side
scrollback, so reconnect re-adopts saved shell ids and resumes **live** output
only (history from before the reload is not replayed). Stale ids (VM recreated)
Expand Down
5 changes: 0 additions & 5 deletions examples/browser-terminal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
},
"dependencies": {
"@agentos-software/common": "link:../../../secure-exec/registry/software/common",
"@agentos-software/curl": "link:../../../secure-exec/registry/software/curl",
"@agentos-software/git": "link:../../../secure-exec/registry/software/git",
"@agentos-software/jq": "link:../../../secure-exec/registry/software/jq",
"@agentos-software/ripgrep": "link:../../../secure-exec/registry/software/ripgrep",
"@agentos-software/sqlite3": "link:../../../secure-exec/registry/software/sqlite3",
"@rivet-dev/agentos": "workspace:*",
"@rivetkit/react": "catalog:rivetkit",
"@xterm/addon-fit": "^0.10.0",
Expand Down
2 changes: 0 additions & 2 deletions examples/browser-terminal/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import common from "@agentos-software/common";
import { agentOS, setup } from "@rivet-dev/agentos";

// TEMP (local debug): only `common` (sha 42d8146) has valid projected packs;
// `sqlite3` (efc374f) is missing its `dist/package`, so it's dropped for now.
const shellVm = agentOS({
software: [common],
});
Expand Down
10 changes: 7 additions & 3 deletions examples/browser-terminal/src/ActorView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ interface ShellExitPayload {
shellId: string;
}

interface ShellEventConnection {
on(name: "shellData", cb: (payload: ShellDataPayload) => void): () => void;
on(name: "shellStderr", cb: (payload: ShellDataPayload) => void): () => void;
on(name: "shellExit", cb: (payload: ShellExitPayload) => void): () => void;
}

function toBytes(data: unknown): Uint8Array {
if (data instanceof Uint8Array) return data;
if (data instanceof ArrayBuffer) return new Uint8Array(data);
Expand Down Expand Up @@ -89,9 +95,7 @@ export function ActorView({ actorId }: { actorId: string }) {

useEffect(() => {
if (!conn) return;
const events = conn as unknown as {
on(name: string, cb: (p: never) => void): () => void;
};
const events = conn as ShellEventConnection;
const offData = events.on("shellData", (p: ShellDataPayload) =>
dispatchData(p.shellId, toBytes(p.data)),
);
Expand Down
Loading