harivansh-afk/sandbox-agent
1
0
Fork 0
mirror of https://github.com/harivansh-afk/sandbox-agent.git synced 2026-04-18 02:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: move api cli commands under api subcommand

Browse source
This commit is contained in:
Nathan Flurry 2026-01-28 01:11:57 -08:00
parent 0ef3b998bb
commit 8a91b8e9aa
22 changed files with 351 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

17
README.md
View file

@ -127,6 +127,15 @@ curl -fsSL https://releases.rivet.dev/sandbox-agent/latest/install.sh | sh
sandbox-agent server --token "$SANDBOX_TOKEN" --host 127.0.0.1 --port 2468 sandbox-agent server --token "$SANDBOX_TOKEN" --host 127.0.0.1 --port 2468
``` ```
Optional: preinstall agent binaries (no server required; they will be installed lazily on first use if you skip this):
```bash
sandbox-agent install-agent claude
sandbox-agent install-agent codex
sandbox-agent install-agent opencode
sandbox-agent install-agent amp
```
To disable auth locally: To disable auth locally:
```bash ```bash
@ -147,14 +156,14 @@ npm install -g @sandbox-agent/cli
Create a session and send a message: Create a session and send a message:
```bash ```bash
sandbox-agent sessions create my-session --agent codex --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN" sandbox-agent api sessions create my-session --agent codex --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN"
sandbox-agent sessions send-message my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN" sandbox-agent api sessions send-message my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN"
sandbox-agent sessions send-message-stream my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN" sandbox-agent api sessions send-message-stream my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN"
``` ```
Docs: https://rivet.dev/docs/cli Docs: https://rivet.dev/docs/cli
### Extract credentials ### Tip: Extract credentials
```bash ```bash
sandbox-agent credentials extract-env --export sandbox-agent credentials extract-env --export

68
docs/cli.mdx
View file

@ -3,7 +3,7 @@ title: "CLI"
description: "CLI reference and server flags." description: "CLI reference and server flags."
--- ---
The `sandbox-agent` CLI mirrors the HTTP API so you can script everything without writing client code. The `sandbox-agent api` subcommand mirrors the HTTP API so you can script everything without writing client code.
## Server flags ## Server flags
@ -17,39 +17,57 @@ sandbox-agent server --token "$SANDBOX_TOKEN" --host 127.0.0.1 --port 2468
- `--cors-allow-origin`, `--cors-allow-method`, `--cors-allow-header`, `--cors-allow-credentials`: configure CORS. - `--cors-allow-origin`, `--cors-allow-method`, `--cors-allow-header`, `--cors-allow-credentials`: configure CORS.
- `--no-telemetry`: disable anonymous telemetry. - `--no-telemetry`: disable anonymous telemetry.
## Agent commands ## Install agent (no server required)
<details> <details>
<summary><strong>agents list</strong></summary> <summary><strong>install-agent</strong></summary>
```bash ```bash
sandbox-agent agents list --endpoint http://127.0.0.1:2468 sandbox-agent install-agent claude --reinstall
```
</details>
## API agent commands
<details>
<summary><strong>api agents list</strong></summary>
```bash
sandbox-agent api agents list --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>agents install</strong></summary> <summary><strong>api agents install</strong></summary>
```bash ```bash
sandbox-agent agents install claude --reinstall --endpoint http://127.0.0.1:2468 sandbox-agent api agents install claude --reinstall --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>agents modes</strong></summary> <summary><strong>api agents modes</strong></summary>
```bash ```bash
sandbox-agent agents modes claude --endpoint http://127.0.0.1:2468 sandbox-agent api agents modes claude --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
## Session commands ## API session commands
<details> <details>
<summary><strong>sessions create</strong></summary> <summary><strong>api sessions list</strong></summary>
```bash ```bash
sandbox-agent sessions create my-session \ sandbox-agent api sessions list --endpoint http://127.0.0.1:2468
```
</details>
<details>
<summary><strong>api sessions create</strong></summary>
```bash
sandbox-agent api sessions create my-session \
--agent claude \ --agent claude \
--agent-mode build \ --agent-mode build \
--permission-mode default \ --permission-mode default \
@ -58,64 +76,64 @@ sandbox-agent sessions create my-session \
</details> </details>
<details> <details>
<summary><strong>sessions send-message</strong></summary> <summary><strong>api sessions send-message</strong></summary>
```bash ```bash
sandbox-agent sessions send-message my-session \ sandbox-agent api sessions send-message my-session \
--message "Summarize the repository" \ --message "Summarize the repository" \
--endpoint http://127.0.0.1:2468 --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>sessions send-message-stream</strong></summary> <summary><strong>api sessions send-message-stream</strong></summary>
```bash ```bash
sandbox-agent sessions send-message-stream my-session \ sandbox-agent api sessions send-message-stream my-session \
--message "Summarize the repository" \ --message "Summarize the repository" \
--endpoint http://127.0.0.1:2468 --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>sessions events</strong></summary> <summary><strong>api sessions events</strong></summary>
```bash ```bash
sandbox-agent sessions events my-session --offset 0 --limit 50 --endpoint http://127.0.0.1:2468 sandbox-agent api sessions events my-session --offset 0 --limit 50 --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>sessions events-sse</strong></summary> <summary><strong>api sessions events-sse</strong></summary>
```bash ```bash
sandbox-agent sessions events-sse my-session --offset 0 --endpoint http://127.0.0.1:2468 sandbox-agent api sessions events-sse my-session --offset 0 --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>sessions reply-question</strong></summary> <summary><strong>api sessions reply-question</strong></summary>
```bash ```bash
sandbox-agent sessions reply-question my-session QUESTION_ID \ sandbox-agent api sessions reply-question my-session QUESTION_ID \
--answers "yes" \ --answers "yes" \
--endpoint http://127.0.0.1:2468 --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>sessions reject-question</strong></summary> <summary><strong>api sessions reject-question</strong></summary>
```bash ```bash
sandbox-agent sessions reject-question my-session QUESTION_ID --endpoint http://127.0.0.1:2468 sandbox-agent api sessions reject-question my-session QUESTION_ID --endpoint http://127.0.0.1:2468
``` ```
</details> </details>
<details> <details>
<summary><strong>sessions reply-permission</strong></summary> <summary><strong>api sessions reply-permission</strong></summary>
```bash ```bash
sandbox-agent sessions reply-permission my-session PERMISSION_ID \ sandbox-agent api sessions reply-permission my-session PERMISSION_ID \
--reply once \ --reply once \
--endpoint http://127.0.0.1:2468 --endpoint http://127.0.0.1:2468
``` ```

27
docs/quickstart.mdx
View file

@ -38,7 +38,18 @@ sandbox-agent server \
--cors-allow-credentials --cors-allow-credentials
``` ```
## 2. Create a session ## 2. Install agents (optional)
Agents install lazily on first use. To preinstall everything up front:
```bash
sandbox-agent install-agent claude
sandbox-agent install-agent codex
sandbox-agent install-agent opencode
sandbox-agent install-agent amp
```
## 3. Create a session
```bash ```bash
curl -X POST "http://127.0.0.1:2468/v1/sessions/my-session" \ curl -X POST "http://127.0.0.1:2468/v1/sessions/my-session" \
@ -47,7 +58,7 @@ curl -X POST "http://127.0.0.1:2468/v1/sessions/my-session" \
-d '{"agent":"claude","agentMode":"build","permissionMode":"default"}' -d '{"agent":"claude","agentMode":"build","permissionMode":"default"}'
``` ```
## 3. Send a message ## 4. Send a message
```bash ```bash
curl -X POST "http://127.0.0.1:2468/v1/sessions/my-session/messages" \ curl -X POST "http://127.0.0.1:2468/v1/sessions/my-session/messages" \
@ -56,7 +67,7 @@ curl -X POST "http://127.0.0.1:2468/v1/sessions/my-session/messages" \
-d '{"message":"Summarize the repository and suggest next steps."}' -d '{"message":"Summarize the repository and suggest next steps."}'
``` ```
## 4. Read events ## 5. Read events
```bash ```bash
curl "http://127.0.0.1:2468/v1/sessions/my-session/events?offset=0&limit=50" \ curl "http://127.0.0.1:2468/v1/sessions/my-session/events?offset=0&limit=50" \
@ -79,14 +90,14 @@ curl -N -X POST "http://127.0.0.1:2468/v1/sessions/my-session/messages/stream" \
-d '{"message":"Hello"}' -d '{"message":"Hello"}'
``` ```
## 5. CLI shortcuts ## 6. CLI shortcuts
The CLI mirrors the HTTP API: The `sandbox-agent api` subcommand mirrors the HTTP API:
```bash ```bash
sandbox-agent sessions create my-session --agent claude --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN" sandbox-agent api sessions create my-session --agent claude --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN"
sandbox-agent sessions send-message my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN" sandbox-agent api sessions send-message my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN"
sandbox-agent sessions send-message-stream my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN" sandbox-agent api sessions send-message-stream my-session --message "Hello" --endpoint http://127.0.0.1:2468 --token "$SANDBOX_TOKEN"
``` ```

76
examples/daytona/daytona.ts
View file

@ -1,76 +0,0 @@
import { Daytona } from "@daytonaio/sdk";
import { pathToFileURL, fileURLToPath } from "node:url";
import { dirname, resolve } from "node:path";
import {
ensureUrl,
logInspectorUrl,
runPrompt,
waitForHealth,
} from "@sandbox-agent/example-shared";
const DEFAULT_PORT = 3000;
const BINARY_PATH = resolve(dirname(fileURLToPath(import.meta.url)), "../../target/release/sandbox-agent");
export async function setupDaytonaSandboxAgent(): Promise<{
baseUrl: string;
token: string;
extraHeaders: Record<string, string>;
cleanup: () => Promise<void>;
}> {
const token = process.env.SANDBOX_TOKEN || "";
const port = Number.parseInt(process.env.SANDBOX_PORT || "", 10) || DEFAULT_PORT;
const language = process.env.DAYTONA_LANGUAGE || "typescript";
const daytona = new Daytona();
console.log("Creating sandbox...");
const sandbox = await daytona.create({ language });
// Daytona sandboxes can't reach releases.rivet.dev, so upload binary directly
console.log("Uploading sandbox-agent...");
await sandbox.fs.uploadFile(BINARY_PATH, "/home/daytona/sandbox-agent");
await sandbox.process.executeCommand("chmod +x /home/daytona/sandbox-agent");
console.log("Starting server...");
const tokenFlag = token ? `--token ${token}` : "--no-token";
await sandbox.process.executeCommand(
`nohup /home/daytona/sandbox-agent server ${tokenFlag} --host 0.0.0.0 --port ${port} >/tmp/sandbox-agent.log 2>&1 &`
);
const preview = await sandbox.getPreviewLink(port);
const extraHeaders: Record<string, string> = {
"x-daytona-skip-preview-warning": "true",
};
if (preview.token) {
extraHeaders["x-daytona-preview-token"] = preview.token;
}
const baseUrl = ensureUrl(preview.url);
console.log("Waiting for health...");
await waitForHealth({ baseUrl, token, extraHeaders });
logInspectorUrl({ baseUrl, token });
return {
baseUrl,
token,
extraHeaders,
cleanup: async () => {
try { await sandbox.delete(60); } catch {}
},
};
}
async function main(): Promise<void> {
const { baseUrl, token, extraHeaders, cleanup } = await setupDaytonaSandboxAgent();
process.on("SIGINT", () => void cleanup().then(() => process.exit(0)));
process.on("SIGTERM", () => void cleanup().then(() => process.exit(0)));
await runPrompt({ baseUrl, token, extraHeaders });
}
if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
main().catch((error) => {
console.error(error);
process.exit(1);
});
}

2
examples/daytona/package.json
View file

@ -3,7 +3,7 @@
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "tsx daytona.ts" "start": "tsx src/daytona.ts"
}, },
"dependencies": { "dependencies": {
"@daytonaio/sdk": "latest", "@daytonaio/sdk": "latest",

0
examples/daytona/daytona.test.ts → examples/daytona/src/daytona.test.ts
View file

65
examples/daytona/src/daytona.ts Normal file
View file

@ -0,0 +1,65 @@
import { Daytona, Image } from "@daytonaio/sdk";
import { logInspectorUrl, runPrompt } from "@sandbox-agent/example-shared";
if (
!process.env.DAYTONA_API_KEY ||
(!process.env.OPENAI_API_KEY && !process.env.ANTHROPIC_API_KEY)
) {
throw new Error(
"DAYTONA_API_KEY and (OPENAI_API_KEY or ANTHROPIC_API_KEY) required",
);
}
const SNAPSHOT = "sandbox-agent-ready";
const BINARY = "/usr/local/bin/sandbox-agent";
const daytona = new Daytona();
const hasSnapshot = await daytona.snapshot.get(SNAPSHOT).then(
() => true,
() => false,
);
if (!hasSnapshot) {
console.log(`Creating snapshot '${SNAPSHOT}' (one-time setup, ~1-2min)...`);
await daytona.snapshot.create(
{
name: SNAPSHOT,
image: Image.base("ubuntu:22.04").runCommands(
"apt-get update && apt-get install -y curl ca-certificates",
`curl -fsSL -o ${BINARY} https://releases.rivet.dev/sandbox-agent/latest/binaries/sandbox-agent-x86_64-unknown-linux-musl`,
`chmod +x ${BINARY}`,
),
},
{ onLogs: (log) => console.log(` ${log}`) },
);
console.log("Snapshot created. Future runs will be instant.");
}
console.log("Creating sandbox...");
const sandbox = await daytona.create({
snapshot: SNAPSHOT,
envVars: {
ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY,
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
},
autoStopInterval: 0,
});
console.log("Starting server...");
await sandbox.process.executeCommand(
`nohup ${BINARY} server --no-token --host 0.0.0.0 --port 3000 >/tmp/sandbox-agent.log 2>&1 &`,
);
const baseUrl = (await sandbox.getSignedPreviewUrl(3000, 4 * 60 * 60)).url;
logInspectorUrl({ baseUrl });
const cleanup = async () => {
console.log("Cleaning up...");
await sandbox.delete(60);
process.exit(0);
};
process.once("SIGINT", cleanup);
process.once("SIGTERM", cleanup);
await runPrompt({ baseUrl });
await cleanup();

2
examples/docker/package.json
View file

@ -3,7 +3,7 @@
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "tsx docker.ts" "start": "tsx src/docker.ts"
}, },
"dependencies": { "dependencies": {
"dockerode": "latest", "dockerode": "latest",

0
examples/docker/docker.test.ts → examples/docker/src/docker.test.ts
View file

0
examples/docker/docker.ts → examples/docker/src/docker.ts
View file

2
examples/e2b/package.json
View file

@ -3,7 +3,7 @@
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "tsx e2b.ts" "start": "tsx src/e2b.ts"
}, },
"dependencies": { "dependencies": {
"@e2b/code-interpreter": "latest", "@e2b/code-interpreter": "latest",

0
examples/e2b/e2b.test.ts → examples/e2b/src/e2b.test.ts
View file

0
examples/e2b/e2b.ts → examples/e2b/src/e2b.ts
View file

2
examples/shared/package.json
View file

@ -3,6 +3,6 @@
"private": true, "private": true,
"type": "module", "type": "module",
"exports": { "exports": {
".": "./sandbox-agent-client.ts" ".": "./src/sandbox-agent-client.ts"
} }
} }

124
examples/shared/sandbox-agent-client.ts → examples/shared/src/sandbox-agent-client.ts
View file

@ -140,7 +140,7 @@ export async function createSession({
const normalized = normalizeBaseUrl(baseUrl); const normalized = normalizeBaseUrl(baseUrl);
const sessionId = randomUUID(); const sessionId = randomUUID();
const body: Record<string, string> = { const body: Record<string, string> = {
agent: agentId || process.env.SANDBOX_AGENT || "codex", agent: agentId || process.env.SANDBOX_AGENT || "claude",
}; };
const envAgentMode = agentMode || process.env.SANDBOX_AGENT_MODE; const envAgentMode = agentMode || process.env.SANDBOX_AGENT_MODE;
const envPermissionMode = permissionMode || process.env.SANDBOX_PERMISSION_MODE; const envPermissionMode = permissionMode || process.env.SANDBOX_PERMISSION_MODE;
@ -163,28 +163,6 @@ export async function createSession({
return sessionId; return sessionId;
} }
export async function sendMessage({
baseUrl,
token,
extraHeaders,
sessionId,
message,
}: {
baseUrl: string;
token?: string;
extraHeaders?: Record<string, string>;
sessionId: string;
message: string;
}): Promise<void> {
const normalized = normalizeBaseUrl(baseUrl);
await fetchJson(`${normalized}/v1/sessions/${sessionId}/messages`, {
token,
extraHeaders,
method: "POST",
body: { message },
});
}
function extractTextFromItem(item: any): string { function extractTextFromItem(item: any): string {
if (!item?.content) return ""; if (!item?.content) return "";
const textParts = item.content const textParts = item.content
@ -197,53 +175,81 @@ function extractTextFromItem(item: any): string {
return JSON.stringify(item.content, null, 2); return JSON.stringify(item.content, null, 2);
} }
export async function waitForAssistantComplete({ export async function sendMessageStream({
baseUrl, baseUrl,
token, token,
extraHeaders, extraHeaders,
sessionId, sessionId,
offset = 0, message,
timeoutMs = 120_000, onText,
}: { }: {
baseUrl: string; baseUrl: string;
token?: string; token?: string;
extraHeaders?: Record<string, string>; extraHeaders?: Record<string, string>;
sessionId: string; sessionId: string;
offset?: number; message: string;
timeoutMs?: number; onText?: (text: string) => void;
}): Promise<{ text: string; offset: number }> { }): Promise<string> {
const normalized = normalizeBaseUrl(baseUrl); const normalized = normalizeBaseUrl(baseUrl);
const deadline = Date.now() + timeoutMs; const headers = buildHeaders({ token, extraHeaders, contentType: true });
let currentOffset = offset;
while (Date.now() < deadline) { const response = await fetch(`${normalized}/v1/sessions/${sessionId}/messages/stream`, {
const data = await fetchJson( method: "POST",
`${normalized}/v1/sessions/${sessionId}/events?offset=${currentOffset}&limit=100`, headers,
{ token, extraHeaders } body: JSON.stringify({ message }),
); });
for (const event of data.events || []) { if (!response.ok || !response.body) {
if (typeof event.sequence === "number") { const text = await response.text();
currentOffset = Math.max(currentOffset, event.sequence); throw new Error(`HTTP ${response.status} ${response.statusText}: ${text}`);
}
const reader = response.body.getReader();
const decoder = new TextDecoder();
let buffer = "";
let fullText = "";
while (true) {
const { done, value } = await reader.read();
if (done) break;
buffer += decoder.decode(value, { stream: true });
const lines = buffer.split("\n");
buffer = lines.pop() || "";
for (const line of lines) {
if (!line.startsWith("data: ")) continue;
const data = line.slice(6);
if (data === "[DONE]") continue;
try {
const event = JSON.parse(data);
// Handle text deltas
if (event.type === "item.delta" && event.data?.delta?.type === "text") {
const text = event.data.delta.text || "";
fullText += text;
onText?.(text);
}
// Handle completed assistant message
if (
event.type === "item.completed" &&
event.data?.item?.kind === "message" &&
event.data?.item?.role === "assistant"
) {
const itemText = extractTextFromItem(event.data.item);
if (itemText && !fullText) {
fullText = itemText;
}
}
} catch {
// Ignore parse errors
} }
if (
event.type === "item.completed" &&
event.data?.item?.kind === "message" &&
event.data?.item?.role === "assistant"
) {
return {
text: extractTextFromItem(event.data.item),
offset: currentOffset,
};
}
}
if (!data.hasMore) {
await delay(300);
} }
} }
throw new Error("Timed out waiting for assistant response"); return fullText;
} }
export async function runPrompt({ export async function runPrompt({
@ -258,7 +264,6 @@ export async function runPrompt({
agentId?: string; agentId?: string;
}): Promise<void> { }): Promise<void> {
const sessionId = await createSession({ baseUrl, token, extraHeaders, agentId }); const sessionId = await createSession({ baseUrl, token, extraHeaders, agentId });
let offset = 0;
console.log(`Session ${sessionId} ready. Type /exit to quit.`); console.log(`Session ${sessionId} ready. Type /exit to quit.`);
@ -280,16 +285,15 @@ export async function runPrompt({
} }
try { try {
await sendMessage({ baseUrl, token, extraHeaders, sessionId, message: trimmed }); await sendMessageStream({
const result = await waitForAssistantComplete({
baseUrl, baseUrl,
token, token,
extraHeaders, extraHeaders,
sessionId, sessionId,
offset, message: trimmed,
onText: (text) => process.stdout.write(text),
}); });
offset = result.offset; process.stdout.write("\n");
process.stdout.write(`${result.text}\n`);
} catch (error) { } catch (error) {
console.error(error instanceof Error ? error.message : error); console.error(error instanceof Error ? error.message : error);
} }

2
examples/vercel/package.json
View file

@ -3,7 +3,7 @@
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "tsx vercel-sandbox.ts" "start": "tsx src/vercel-sandbox.ts"
}, },
"dependencies": { "dependencies": {
"@vercel/sandbox": "latest", "@vercel/sandbox": "latest",

0
examples/vercel/vercel-sandbox.test.ts → examples/vercel/src/vercel-sandbox.test.ts
View file

0
examples/vercel/vercel-sandbox.ts → examples/vercel/src/vercel-sandbox.ts
View file

8
server/packages/extracted-agent-schemas/build.rs
View file

@ -56,10 +56,10 @@ fn main() {
fs::write(&out_path, formatted) fs::write(&out_path, formatted)
.unwrap_or_else(|e| panic!("Failed to write {}: {}", out_path.display(), e)); .unwrap_or_else(|e| panic!("Failed to write {}: {}", out_path.display(), e));
emit_stdout(&format!( // emit_stdout(&format!(
"cargo:warning=Generated {} types from {}", // "cargo:warning=Generated {} types from {}",
name, file // name, file
)); // ));
} }
} }

107
server/packages/sandbox-agent/src/main.rs
View file

@ -6,7 +6,7 @@ use std::sync::Arc;
use clap::{Args, Parser, Subcommand}; use clap::{Args, Parser, Subcommand};
use reqwest::blocking::Client as HttpClient; use reqwest::blocking::Client as HttpClient;
use reqwest::Method; use reqwest::Method;
use sandbox_agent_agent_management::agents::AgentManager; use sandbox_agent_agent_management::agents::{AgentId, AgentManager, InstallOptions};
use sandbox_agent_agent_management::credentials::{ use sandbox_agent_agent_management::credentials::{
extract_all_credentials, AuthType, CredentialExtractionOptions, ExtractedCredentials, extract_all_credentials, AuthType, CredentialExtractionOptions, ExtractedCredentials,
ProviderCredentials, ProviderCredentials,
@ -16,7 +16,9 @@ use sandbox_agent::router::{
PermissionReply, PermissionReplyRequest, QuestionReplyRequest, PermissionReply, PermissionReplyRequest, QuestionReplyRequest,
}; };
use sandbox_agent::telemetry; use sandbox_agent::telemetry;
use sandbox_agent::router::{AgentListResponse, AgentModesResponse, CreateSessionResponse, EventsResponse}; use sandbox_agent::router::{
AgentListResponse, AgentModesResponse, CreateSessionResponse, EventsResponse, SessionListResponse,
};
use sandbox_agent::router::{build_router_with_state, shutdown_servers}; use sandbox_agent::router::{build_router_with_state, shutdown_servers};
use sandbox_agent::ui; use sandbox_agent::ui;
use serde::Serialize; use serde::Serialize;
@ -47,10 +49,10 @@ struct Cli {
enum Command { enum Command {
/// Run the sandbox agent HTTP server. /// Run the sandbox agent HTTP server.
Server(ServerArgs), Server(ServerArgs),
/// Manage installed agents and their modes. /// Call the HTTP API without writing client code.
Agents(AgentsArgs), Api(ApiArgs),
/// Create sessions and interact with session events. /// Install or reinstall an agent without running the server.
Sessions(SessionsArgs), InstallAgent(InstallAgentArgs),
/// Inspect locally discovered credentials. /// Inspect locally discovered credentials.
Credentials(CredentialsArgs), Credentials(CredentialsArgs),
} }
@ -80,15 +82,9 @@ struct ServerArgs {
} }
#[derive(Args, Debug)] #[derive(Args, Debug)]
struct AgentsArgs { struct ApiArgs {
#[command(subcommand)] #[command(subcommand)]
command: AgentsCommand, command: ApiCommand,
}
#[derive(Args, Debug)]
struct SessionsArgs {
#[command(subcommand)]
command: SessionsCommand,
} }
#[derive(Args, Debug)] #[derive(Args, Debug)]
@ -98,13 +94,11 @@ struct CredentialsArgs {
} }
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
enum AgentsCommand { enum ApiCommand {
/// List all agents and install status. /// Manage installed agents and their modes.
List(ClientArgs), Agents(AgentsArgs),
/// Install or reinstall an agent. /// Create sessions and interact with session events.
Install(InstallAgentArgs), Sessions(SessionsArgs),
/// Show available modes for an agent.
Modes(AgentModesArgs),
} }
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
@ -116,8 +110,32 @@ enum CredentialsCommand {
ExtractEnv(CredentialsExtractEnvArgs), ExtractEnv(CredentialsExtractEnvArgs),
} }
#[derive(Args, Debug)]
struct AgentsArgs {
#[command(subcommand)]
command: AgentsCommand,
}
#[derive(Args, Debug)]
struct SessionsArgs {
#[command(subcommand)]
command: SessionsCommand,
}
#[derive(Subcommand, Debug)]
enum AgentsCommand {
/// List all agents and install status.
List(ClientArgs),
/// Install or reinstall an agent.
Install(ApiInstallAgentArgs),
/// Show available modes for an agent.
Modes(AgentModesArgs),
}
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
enum SessionsCommand { enum SessionsCommand {
/// List active sessions.
List(ClientArgs),
/// Create a new session for an agent. /// Create a new session for an agent.
Create(CreateSessionArgs), Create(CreateSessionArgs),
#[command(name = "send-message")] #[command(name = "send-message")]
@ -156,7 +174,7 @@ struct ClientArgs {
} }
#[derive(Args, Debug)] #[derive(Args, Debug)]
struct InstallAgentArgs { struct ApiInstallAgentArgs {
agent: String, agent: String,
#[arg(long, short = 'r')] #[arg(long, short = 'r')]
reinstall: bool, reinstall: bool,
@ -164,6 +182,13 @@ struct InstallAgentArgs {
client: ClientArgs, client: ClientArgs,
} }
#[derive(Args, Debug)]
struct InstallAgentArgs {
agent: String,
#[arg(long, short = 'r')]
reinstall: bool,
}
#[derive(Args, Debug)] #[derive(Args, Debug)]
struct AgentModesArgs { struct AgentModesArgs {
agent: String, agent: String,
@ -277,7 +302,7 @@ struct CredentialsExtractArgs {
provider: Option<String>, provider: Option<String>,
#[arg(long, short = 'd')] #[arg(long, short = 'd')]
home_dir: Option<PathBuf>, home_dir: Option<PathBuf>,
#[arg(long, short = 'n')] #[arg(long)]
no_oauth: bool, no_oauth: bool,
#[arg(long, short = 'r')] #[arg(long, short = 'r')]
reveal: bool, reveal: bool,
@ -290,7 +315,7 @@ struct CredentialsExtractEnvArgs {
export: bool, export: bool,
#[arg(long, short = 'd')] #[arg(long, short = 'd')]
home_dir: Option<PathBuf>, home_dir: Option<PathBuf>,
#[arg(long, short = 'n')] #[arg(long)]
no_oauth: bool, no_oauth: bool,
} }
@ -407,12 +432,19 @@ fn run_client(command: &Command, cli: &Cli) -> Result<(), CliError> {
Command::Server(_) => Err(CliError::Server( Command::Server(_) => Err(CliError::Server(
"server subcommand must be invoked as `sandbox-agent server`".to_string(), "server subcommand must be invoked as `sandbox-agent server`".to_string(),
)), )),
Command::Agents(subcommand) => run_agents(&subcommand.command, cli), Command::Api(subcommand) => run_api(&subcommand.command, cli),
Command::Sessions(subcommand) => run_sessions(&subcommand.command, cli), Command::InstallAgent(args) => install_agent_local(args),
Command::Credentials(subcommand) => run_credentials(&subcommand.command), Command::Credentials(subcommand) => run_credentials(&subcommand.command),
} }
} }
fn run_api(command: &ApiCommand, cli: &Cli) -> Result<(), CliError> {
match command {
ApiCommand::Agents(subcommand) => run_agents(&subcommand.command, cli),
ApiCommand::Sessions(subcommand) => run_sessions(&subcommand.command, cli),
}
}
fn run_agents(command: &AgentsCommand, cli: &Cli) -> Result<(), CliError> { fn run_agents(command: &AgentsCommand, cli: &Cli) -> Result<(), CliError> {
match command { match command {
AgentsCommand::List(args) => { AgentsCommand::List(args) => {
@ -440,6 +472,11 @@ fn run_agents(command: &AgentsCommand, cli: &Cli) -> Result<(), CliError> {
fn run_sessions(command: &SessionsCommand, cli: &Cli) -> Result<(), CliError> { fn run_sessions(command: &SessionsCommand, cli: &Cli) -> Result<(), CliError> {
match command { match command {
SessionsCommand::List(args) => {
let ctx = ClientContext::new(cli, args)?;
let response = ctx.get(&format!("{API_PREFIX}/sessions"))?;
print_json_response::<SessionListResponse>(response)
}
SessionsCommand::Create(args) => { SessionsCommand::Create(args) => {
let ctx = ClientContext::new(cli, &args.client)?; let ctx = ClientContext::new(cli, &args.client)?;
let body = CreateSessionRequest { let body = CreateSessionRequest {
@ -674,6 +711,24 @@ fn redact_key(key: &str) -> String {
format!("{prefix}...{suffix}") format!("{prefix}...{suffix}")
} }
fn install_agent_local(args: &InstallAgentArgs) -> Result<(), CliError> {
let agent_id = AgentId::parse(&args.agent).ok_or_else(|| {
CliError::Server(format!("unsupported agent: {}", args.agent))
})?;
let manager =
AgentManager::new(default_install_dir()).map_err(|err| CliError::Server(err.to_string()))?;
manager
.install(
agent_id,
InstallOptions {
reinstall: args.reinstall,
version: None,
},
)
.map_err(|err| CliError::Server(err.to_string()))?;
Ok(())
}
fn select_token_for_agent( fn select_token_for_agent(
credentials: &ExtractedCredentials, credentials: &ExtractedCredentials,
agent: CredentialAgent, agent: CredentialAgent,

93
server/packages/sandbox-agent/src/router.rs
View file

@ -2329,47 +2329,63 @@ impl SessionManager {
} }
}; };
let event_type = value.get("type").and_then(Value::as_str).unwrap_or(""); let event_type = value.get("type").and_then(Value::as_str).unwrap_or("");
if event_type == "assistant" { let native_session_id = value
.get("session_id")
.and_then(Value::as_str)
.or_else(|| value.get("sessionId").and_then(Value::as_str))
.map(|id| id.to_string());
if event_type == "assistant" || event_type == "result" || native_session_id.is_some() {
let mut sessions = self.sessions.lock().await; let mut sessions = self.sessions.lock().await;
if let Some(session) = Self::session_mut(&mut sessions, session_id) { if let Some(session) = Self::session_mut(&mut sessions, session_id) {
let id = value if let Some(native_session_id) = native_session_id.as_ref() {
.get("message") if session.native_session_id.is_none() {
.and_then(|message| message.get("id")) session.native_session_id = Some(native_session_id.clone());
.and_then(Value::as_str) }
.map(|id| id.to_string()) }
.unwrap_or_else(|| { if event_type == "assistant" {
session.claude_message_counter += 1; let id = value
let generated = .get("message")
format!("{}_message_{}", session.session_id, session.claude_message_counter); .and_then(|message| message.get("id"))
if let Some(message) = value.get_mut("message").and_then(Value::as_object_mut) .and_then(Value::as_str)
{ .map(|id| id.to_string())
message.insert("id".to_string(), Value::String(generated.clone())); .unwrap_or_else(|| {
} else if let Some(map) = value.as_object_mut() { session.claude_message_counter += 1;
map.insert( let generated = format!(
"message".to_string(), "{}_message_{}",
serde_json::json!({ session.session_id, session.claude_message_counter
"id": generated );
}), if let Some(message) =
); value.get_mut("message").and_then(Value::as_object_mut)
} {
generated message.insert("id".to_string(), Value::String(generated.clone()));
}); } else if let Some(map) = value.as_object_mut() {
session.last_claude_message_id = Some(id); map.insert(
} "message".to_string(),
} else if event_type == "result" { serde_json::json!({
let has_message_id = value.get("message_id").is_some() || value.get("messageId").is_some(); "id": generated
let mut sessions = self.sessions.lock().await; }),
if let Some(session) = Self::session_mut(&mut sessions, session_id) { );
if !has_message_id { }
let id = session.last_claude_message_id.take().unwrap_or_else(|| { generated
session.claude_message_counter += 1; });
format!("{}_message_{}", session.session_id, session.claude_message_counter) session.last_claude_message_id = Some(id);
}); } else if event_type == "result" {
if let Some(map) = value.as_object_mut() { let has_message_id =
map.insert("message_id".to_string(), Value::String(id)); value.get("message_id").is_some() || value.get("messageId").is_some();
if !has_message_id {
let id = session.last_claude_message_id.take().unwrap_or_else(|| {
session.claude_message_counter += 1;
format!(
"{}_message_{}",
session.session_id, session.claude_message_counter
)
});
if let Some(map) = value.as_object_mut() {
map.insert("message_id".to_string(), Value::String(id));
}
} else {
session.last_claude_message_id = None;
} }
} else {
session.last_claude_message_id = None;
} }
} }
} }
@ -3958,6 +3974,7 @@ fn normalize_permission_mode(
return Ok("bypass".to_string()); return Ok("bypass".to_string());
} }
let supported = match agent { let supported = match agent {
AgentId::Claude => false,
AgentId::Codex => matches!(mode, "default" | "plan" | "bypass"), AgentId::Codex => matches!(mode, "default" | "plan" | "bypass"),
AgentId::Amp => matches!(mode, "default" | "bypass"), AgentId::Amp => matches!(mode, "default" | "bypass"),
AgentId::Opencode => matches!(mode, "default"), AgentId::Opencode => matches!(mode, "default"),

2
todo.md
View file

@ -9,4 +9,6 @@
- [x] Add Docker/Vercel/Daytona/E2B examples with basic prompt scripts and tests. - [x] Add Docker/Vercel/Daytona/E2B examples with basic prompt scripts and tests.
- [x] Add unified AgentServerManager for shared agent servers (Codex/OpenCode). - [x] Add unified AgentServerManager for shared agent servers (Codex/OpenCode).
- [x] Expose server status details in agent list API (uptime/restarts/last error/base URL). - [x] Expose server status details in agent list API (uptime/restarts/last error/base URL).
- [x] Add local agent install CLI command and document optional preinstall step.
- [x] Move API CLI commands under the api subcommand.
- [ ] Regenerate TypeScript SDK from updated OpenAPI (blocked: Node/pnpm not available in env). - [ ] Regenerate TypeScript SDK from updated OpenAPI (blocked: Node/pnpm not available in env).