@rivet-dev/agentos-core 0.2.4 → 0.2.5-rc.2

package/dist/sidecar/agentos-protocol.d.ts

@@ -60,6 +60,21 @@ export type AcpResumeSessionRequest = {
 };
 export declare function readAcpResumeSessionRequest(bc: bare.ByteCursor): AcpResumeSessionRequest;
 export declare function writeAcpResumeSessionRequest(bc: bare.ByteCursor, x: AcpResumeSessionRequest): void;
+/**
+ * Browser RESUMABLE path only (AGENTOS-WEB-ASYNC-AGENTS.md §3.2.1): the kernel
+ * worker feeds a chunk of the agent's stdout into the in-flight create_session /
+ * session/prompt handshake. The synchronous sidecar would block inside one
+ * pushFrame; the resumable browser path returns between steps so the worker can
+ * service the agent's own syscalls (incl. pi's net call for inference) on fresh,
+ * non-nested pushFrames. `processId` is the handshake handle returned in the
+ * AcpPendingResponse for the originating create/prompt request.
+ */
+export type AcpDeliverAgentOutputRequest = {
+    readonly processId: string;
+    readonly chunk: ArrayBuffer;
+};
+export declare function readAcpDeliverAgentOutputRequest(bc: bare.ByteCursor): AcpDeliverAgentOutputRequest;
+export declare function writeAcpDeliverAgentOutputRequest(bc: bare.ByteCursor, x: AcpDeliverAgentOutputRequest): void;
 export type AcpRequest = {
     readonly tag: "AcpCreateSessionRequest";
     readonly val: AcpCreateSessionRequest;
@@ -75,6 +90,9 @@ export type AcpRequest = {
 } | {
     readonly tag: "AcpResumeSessionRequest";
     readonly val: AcpResumeSessionRequest;
+} | {
+    readonly tag: "AcpDeliverAgentOutputRequest";
+    readonly val: AcpDeliverAgentOutputRequest;
 };
 export declare function readAcpRequest(bc: bare.ByteCursor): AcpRequest;
 export declare function writeAcpRequest(bc: bare.ByteCursor, x: AcpRequest): void;
@@ -134,6 +152,18 @@ export type AcpErrorResponse = {
 };
 export declare function readAcpErrorResponse(bc: bare.ByteCursor): AcpErrorResponse;
 export declare function writeAcpErrorResponse(bc: bare.ByteCursor, x: AcpErrorResponse): void;
+/**
+ * Browser RESUMABLE path: the create_session / session/prompt request (and each
+ * AcpDeliverAgentOutputRequest that has not yet completed the handshake) returns
+ * this, carrying the `processId` handle the kernel worker drives the interaction
+ * with. The real result (AcpSessionCreatedResponse / AcpSessionRpcResponse) is
+ * delivered as the response to the AcpDeliverAgentOutputRequest that completes it.
+ */
+export type AcpPendingResponse = {
+    readonly processId: string;
+};
+export declare function readAcpPendingResponse(bc: bare.ByteCursor): AcpPendingResponse;
+export declare function writeAcpPendingResponse(bc: bare.ByteCursor, x: AcpPendingResponse): void;
 export type AcpResponse = {
     readonly tag: "AcpSessionCreatedResponse";
     readonly val: AcpSessionCreatedResponse;
@@ -152,6 +182,9 @@ export type AcpResponse = {
 } | {
     readonly tag: "AcpErrorResponse";
     readonly val: AcpErrorResponse;
+} | {
+    readonly tag: "AcpPendingResponse";
+    readonly val: AcpPendingResponse;
 };
 export declare function readAcpResponse(bc: bare.ByteCursor): AcpResponse;
 export declare function writeAcpResponse(bc: bare.ByteCursor, x: AcpResponse): void;
@@ -171,12 +204,40 @@ export type AcpAgentStderrEvent = {
 };
 export declare function readAcpAgentStderrEvent(bc: bare.ByteCursor): AcpAgentStderrEvent;
 export declare function writeAcpAgentStderrEvent(bc: bare.ByteCursor, x: AcpAgentStderrEvent): void;
+/**
+ * Emitted when the ACP adapter process exits without an explicit close_session —
+ * a crash from the host's perspective (any spontaneous exit, including code 0).
+ * `restart` reports the sidecar's bounded auto-restart outcome:
+ *   "restarted"   — adapter respawned and the session was natively re-attached
+ *                   (session/load | session/resume) under the same sessionId;
+ *                   the session stays live.
+ *   "unsupported" — the respawned adapter does not advertise a native resume
+ *                   capability; the session record was evicted.
+ *   "failed"      — the respawn or the native re-attach errored; evicted.
+ *   "exhausted"   — maxRestarts was already spent for this session; evicted.
+ * `exitCode` is absent when the exit was observed indirectly (e.g. a write to
+ * the adapter's stdin failed because the process was already gone).
+ */
+export type AcpAgentExitedEvent = {
+    readonly sessionId: string;
+    readonly agentType: string;
+    readonly processId: string;
+    readonly exitCode: i32 | null;
+    readonly restart: string;
+    readonly restartCount: u32;
+    readonly maxRestarts: u32;
+};
+export declare function readAcpAgentExitedEvent(bc: bare.ByteCursor): AcpAgentExitedEvent;
+export declare function writeAcpAgentExitedEvent(bc: bare.ByteCursor, x: AcpAgentExitedEvent): void;
 export type AcpEvent = {
     readonly tag: "AcpSessionEvent";
     readonly val: AcpSessionEvent;
 } | {
     readonly tag: "AcpAgentStderrEvent";
     readonly val: AcpAgentStderrEvent;
+} | {
+    readonly tag: "AcpAgentExitedEvent";
+    readonly val: AcpAgentExitedEvent;
 };
 export declare function readAcpEvent(bc: bare.ByteCursor): AcpEvent;
 export declare function writeAcpEvent(bc: bare.ByteCursor, x: AcpEvent): void;

package/dist/sidecar/agentos-protocol.js

@@ -173,6 +173,16 @@ export function writeAcpResumeSessionRequest(bc, x) {
     bare.writeString(bc, x.cwd);
     write1(bc, x.env);
 }
+export function readAcpDeliverAgentOutputRequest(bc) {
+    return {
+        processId: bare.readString(bc),
+        chunk: bare.readData(bc),
+    };
+}
+export function writeAcpDeliverAgentOutputRequest(bc, x) {
+    bare.writeString(bc, x.processId);
+    bare.writeData(bc, x.chunk);
+}
 export function readAcpRequest(bc) {
     const offset = bc.offset;
     const tag = bare.readU8(bc);
@@ -187,6 +197,8 @@ export function readAcpRequest(bc) {
             return { tag: "AcpCloseSessionRequest", val: readAcpCloseSessionRequest(bc) };
         case 4:
             return { tag: "AcpResumeSessionRequest", val: readAcpResumeSessionRequest(bc) };
+        case 5:
+            return { tag: "AcpDeliverAgentOutputRequest", val: readAcpDeliverAgentOutputRequest(bc) };
         default: {
             bc.offset = offset;
             throw new bare.BareError(offset, "invalid tag");
@@ -220,6 +232,11 @@ export function writeAcpRequest(bc, x) {
             writeAcpResumeSessionRequest(bc, x.val);
             break;
         }
+        case "AcpDeliverAgentOutputRequest": {
+            bare.writeU8(bc, 5);
+            writeAcpDeliverAgentOutputRequest(bc, x.val);
+            break;
+        }
     }
 }
 export function encodeAcpRequest(x, config) {
@@ -353,6 +370,14 @@ export function writeAcpErrorResponse(bc, x) {
     bare.writeString(bc, x.code);
     bare.writeString(bc, x.message);
 }
+export function readAcpPendingResponse(bc) {
+    return {
+        processId: bare.readString(bc),
+    };
+}
+export function writeAcpPendingResponse(bc, x) {
+    bare.writeString(bc, x.processId);
+}
 export function readAcpResponse(bc) {
     const offset = bc.offset;
     const tag = bare.readU8(bc);
@@ -369,6 +394,8 @@ export function readAcpResponse(bc) {
             return { tag: "AcpSessionResumedResponse", val: readAcpSessionResumedResponse(bc) };
         case 5:
             return { tag: "AcpErrorResponse", val: readAcpErrorResponse(bc) };
+        case 6:
+            return { tag: "AcpPendingResponse", val: readAcpPendingResponse(bc) };
         default: {
             bc.offset = offset;
             throw new bare.BareError(offset, "invalid tag");
@@ -407,6 +434,11 @@ export function writeAcpResponse(bc, x) {
             writeAcpErrorResponse(bc, x.val);
             break;
         }
+        case "AcpPendingResponse": {
+            bare.writeU8(bc, 6);
+            writeAcpPendingResponse(bc, x.val);
+            break;
+        }
     }
 }
 export function encodeAcpResponse(x, config) {
@@ -447,6 +479,26 @@ export function writeAcpAgentStderrEvent(bc, x) {
     bare.writeString(bc, x.processId);
     bare.writeData(bc, x.chunk);
 }
+export function readAcpAgentExitedEvent(bc) {
+    return {
+        sessionId: bare.readString(bc),
+        agentType: bare.readString(bc),
+        processId: bare.readString(bc),
+        exitCode: read6(bc),
+        restart: bare.readString(bc),
+        restartCount: bare.readU32(bc),
+        maxRestarts: bare.readU32(bc),
+    };
+}
+export function writeAcpAgentExitedEvent(bc, x) {
+    bare.writeString(bc, x.sessionId);
+    bare.writeString(bc, x.agentType);
+    bare.writeString(bc, x.processId);
+    write6(bc, x.exitCode);
+    bare.writeString(bc, x.restart);
+    bare.writeU32(bc, x.restartCount);
+    bare.writeU32(bc, x.maxRestarts);
+}
 export function readAcpEvent(bc) {
     const offset = bc.offset;
     const tag = bare.readU8(bc);
@@ -455,6 +507,8 @@ export function readAcpEvent(bc) {
             return { tag: "AcpSessionEvent", val: readAcpSessionEvent(bc) };
         case 1:
             return { tag: "AcpAgentStderrEvent", val: readAcpAgentStderrEvent(bc) };
+        case 2:
+            return { tag: "AcpAgentExitedEvent", val: readAcpAgentExitedEvent(bc) };
         default: {
             bc.offset = offset;
             throw new bare.BareError(offset, "invalid tag");
@@ -473,6 +527,11 @@ export function writeAcpEvent(bc, x) {
             writeAcpAgentStderrEvent(bc, x.val);
             break;
         }
+        case "AcpAgentExitedEvent": {
+            bare.writeU8(bc, 2);
+            writeAcpAgentExitedEvent(bc, x.val);
+            break;
+        }
     }
 }
 export function encodeAcpEvent(x, config) {

package/dist/sidecar/rpc-client.js

@@ -7,6 +7,30 @@ const PROTECTED_READ_ONLY_GUEST_ROOTS = ["/etc/agentos"];
 const TRAILING_OUTPUT_DRAIN_INTERVAL_MS = 10;
 const TRAILING_OUTPUT_DRAIN_MAX_MS = 250;
 const TRAILING_OUTPUT_DRAIN_QUIET_TURNS = 2;
+function shouldLogStructuredSidecarEvent(name) {
+    const normalized = name.toLowerCase();
+    return (normalized === "limit_warning" ||
+        normalized.startsWith("security.") ||
+        normalized.includes("warning") ||
+        normalized.includes("failed") ||
+        normalized.includes("error"));
+}
+function formatStructuredSidecarDetail(detail) {
+    const entries = Object.entries(detail);
+    if (entries.length === 0) {
+        return "";
+    }
+    return entries.map(([key, value]) => `${key}=${JSON.stringify(value)}`).join(" ");
+}
+function logStructuredSidecarEvent(name, detail) {
+    if (!shouldLogStructuredSidecarEvent(name)) {
+        return;
+    }
+    const formatted = formatStructuredSidecarDetail(detail);
+    console.warn(formatted
+        ? `[agent-os] sidecar ${name}: ${formatted}`
+        : `[agent-os] sidecar ${name}`);
+}
 async function drainTrailingProcessOutputTurn(delayMs = 0) {
     // Native-sidecar `process_output` events can lag one macrotask behind the
     // terminal `process_exited` notification for very short-lived processes, and
@@ -142,7 +166,10 @@ function parseSimpleExecCommand(command) {
     return tokens;
 }
 function canUseDirectExec(driver, commandName) {
-    return driver === "wasmvm" || (driver === "node" && commandName === "node");
+    return (driver === "wasmvm" ||
+        (driver === "node" && commandName === "node") ||
+        (driver === "python" &&
+            (commandName === "python" || commandName === "python3")));
 }
 function shellSingleQuote(value) {
     if (value.length === 0) {
@@ -494,7 +521,11 @@ export class NativeSidecarKernelProxy {
             processId,
             command: spawnCommand,
             args: spawnArgs,
-            driver: spawnCommand === "node" ? "node" : "wasmvm",
+            driver: spawnCommand === "node"
+                ? "node"
+                : spawnCommand === "python" || spawnCommand === "python3"
+                    ? "python"
+                    : "wasmvm",
             cwd: options?.cwd ?? this.cwd,
             env: {
                 ...(options?.env ?? {}),
@@ -526,16 +557,16 @@ export class NativeSidecarKernelProxy {
             pid,
             writeStdin: (data) => {
                 if (entry.exitCode !== null) {
-                    return;
+                    return Promise.resolve();
                 }
                 entry.pendingStdin.push(data);
-                void this.flushPendingStdin(entry).catch((error) => {
+                return this.flushPendingStdin(entry).catch((error) => {
                     this.handleBackgroundProcessError(entry, error);
                 });
             },
             closeStdin: () => {
                 entry.pendingCloseStdin = true;
-                void this.closeTrackedStdin(entry).catch((error) => {
+                return this.closeTrackedStdin(entry).catch((error) => {
                     this.handleBackgroundProcessError(entry, error);
                 });
             },
@@ -579,7 +610,6 @@ export class NativeSidecarKernelProxy {
         const args = options?.args ??
             (command === "sh" || command === "/bin/sh" ? ["-i"] : []);
         const synthesizePrompt = !options?.command && !options?.args;
-        const autoCloseExplicitCommandStdin = Boolean(options?.command) && !["sh", "/bin/sh", "bash"].includes(command);
         const promptText = "sh-0.4$ ";
         const textEncoder = new TextEncoder();
         const textDecoder = new TextDecoder();
@@ -589,14 +619,18 @@ export class NativeSidecarKernelProxy {
             .replace(/\u001b\[[0-9;]*m/g, "")
             .replace(/^.*WARN could not retrieve pid for child process\n?/gm, "")
             .replace(/^ProcessExitError:.*\n(?:\s+at .*\n)*/gm, "");
+        const sanitizeNativeShellOutput = (chunk) => {
+            const text = textDecoder.decode(chunk);
+            const sanitized = text.replace(/^.*WARN could not retrieve pid for child process\n?/gm, "");
+            return sanitized.length > 0 ? textEncoder.encode(sanitized) : null;
+        };
         let bufferedInput = "";
         let bufferedCommand = "";
         let activeForegroundProcess = null;
-        let shellEnv = { ...(options?.env ?? {}) };
+        let shellEnv = { ...(options?.env ?? {}), AGENTOS_EXEC_TTY: "1" };
         let shellCwd = options?.cwd ?? this.cwd;
         let syntheticCommandQueue = Promise.resolve();
         let promptTimer = null;
-        let closeStdinTimer = null;
         let commandInFlight = false;
         let syntheticCursorAtLineStart = true;
         const syntheticPid = this.nextSyntheticPid++;
@@ -611,12 +645,6 @@ export class NativeSidecarKernelProxy {
                 promptTimer = null;
             }
         };
-        const clearCloseStdinTimer = () => {
-            if (closeStdinTimer !== null) {
-                clearTimeout(closeStdinTimer);
-                closeStdinTimer = null;
-            }
-        };
         const normalizeSyntheticTerminalText = (text) => text.replace(/\r?\n/g, "\r\n");
         const updateSyntheticCursor = (text) => {
             if (!text) {
@@ -712,15 +740,36 @@ export class NativeSidecarKernelProxy {
             }
             return parsed;
         };
-        const writeForegroundInput = (proc, data) => {
+        const writeForegroundInput = async (proc, data) => {
             if (typeof data === "string") {
                 for (const character of data) {
-                    proc.writeStdin(character);
+                    await proc.writeStdin(character);
                 }
                 return;
             }
             for (const byte of data) {
-                proc.writeStdin(new Uint8Array([byte]));
+                await proc.writeStdin(new Uint8Array([byte]));
+            }
+        };
+        const appendSyntheticInput = (input) => {
+            for (const character of input) {
+                if (character === "\u0004") {
+                    continue;
+                }
+                if (character === "\b" || character === "\u007f") {
+                    if (bufferedInput.length > 0) {
+                        bufferedInput = bufferedInput.slice(0, -1);
+                        emitSyntheticTerminal("\b \b");
+                    }
+                    continue;
+                }
+                bufferedInput += character;
+                if (character === "\n") {
+                    emitSyntheticTerminal("\n");
+                }
+                else if (character >= " ") {
+                    emitSyntheticTerminal(character);
+                }
             }
         };
         let onData = null;
@@ -732,7 +781,7 @@ export class NativeSidecarKernelProxy {
             schedulePrompt(0);
             return {
                 pid: syntheticPid,
-                write(data) {
+                async write(data) {
                     if (syntheticExitCode !== null) {
                         return;
                     }
@@ -743,13 +792,13 @@ export class NativeSidecarKernelProxy {
                         if (rawText.includes("\u0003")) {
                             const [beforeInterrupt] = rawText.split("\u0003");
                             if (beforeInterrupt) {
-                                writeForegroundInput(activeForegroundProcess, beforeInterrupt);
+                                await writeForegroundInput(activeForegroundProcess, beforeInterrupt);
                             }
                             emitSyntheticTerminal("^C\n");
                             activeForegroundProcess.kill(2);
                             return;
                         }
-                        writeForegroundInput(activeForegroundProcess, data);
+                        await writeForegroundInput(activeForegroundProcess, data);
                         return;
                     }
                     const rawText = typeof data === "string"
@@ -772,7 +821,7 @@ export class NativeSidecarKernelProxy {
                         finishSyntheticShell(0);
                         return;
                     }
-                    bufferedInput += text.replace(/\u0004/g, "");
+                    appendSyntheticInput(text.replace(/\r\n/g, "\n").replace(/\r/g, "\n"));
                     while (true) {
                         const newlineIndex = bufferedInput.indexOf("\n");
                         if (newlineIndex < 0) {
@@ -782,7 +831,6 @@ export class NativeSidecarKernelProxy {
                             .slice(0, newlineIndex)
                             .replace(/\r$/, "");
                         bufferedInput = bufferedInput.slice(newlineIndex + 1);
-                        emitSyntheticStdout(`${line}\n`);
                         const nextCommand = bufferedCommand
                             ? `${bufferedCommand}\n${line}`
                             : line;
@@ -881,20 +929,33 @@ export class NativeSidecarKernelProxy {
             };
         }
         const proc = this.spawn(command, args, {
-            env: options?.env,
+            env: {
+                ...(options?.env ?? {}),
+                ...(options?.cols ? { COLUMNS: String(Math.trunc(options.cols)) } : {}),
+                ...(options?.rows ? { LINES: String(Math.trunc(options.rows)) } : {}),
+                AGENTOS_EXEC_TTY: "1",
+            },
             cwd: options?.cwd,
             streamStdin: true,
             onStdout: (chunk) => {
+                const sanitized = sanitizeNativeShellOutput(chunk);
+                if (!sanitized) {
+                    return;
+                }
                 for (const handler of stdoutHandlers) {
-                    handler(chunk);
+                    handler(sanitized);
                 }
                 if (commandInFlight) {
                     schedulePrompt(120);
                 }
             },
             onStderr: (chunk) => {
+                const sanitized = sanitizeNativeShellOutput(chunk);
+                if (!sanitized) {
+                    return;
+                }
                 for (const handler of stderrHandlers) {
-                    handler(chunk);
+                    handler(sanitized);
                 }
                 if (commandInFlight) {
                     schedulePrompt(120);
@@ -903,18 +964,11 @@ export class NativeSidecarKernelProxy {
         });
         return {
             pid: proc.pid,
-            write(data) {
+            async write(data) {
                 if (synthesizePrompt) {
                     return;
                 }
-                proc.writeStdin(data);
-                if (autoCloseExplicitCommandStdin) {
-                    clearCloseStdinTimer();
-                    closeStdinTimer = setTimeout(() => {
-                        closeStdinTimer = null;
-                        proc.closeStdin();
-                    }, 100);
-                }
+                await proc.writeStdin(data);
                 if (synthesizePrompt &&
                     typeof data === "string" &&
                     (data.includes("\n") || data.includes("\r"))) {
@@ -928,11 +982,18 @@ export class NativeSidecarKernelProxy {
             set onData(handler) {
                 onData = handler;
             },
-            resize() {
-                // The current stdio-native path is process-backed rather than PTY-backed.
+            resize: (cols, rows) => {
+                const entry = this.trackedProcesses.get(proc.pid);
+                if (!entry || entry.exitCode !== null) {
+                    return;
+                }
+                void entry.startPromise
+                    .then(() => this.client.resizePty(this.session, this.vm, entry.processId, Math.trunc(cols), Math.trunc(rows)))
+                    .catch((error) => {
+                    this.handleBackgroundProcessError(entry, error);
+                });
             },
             kill(signal) {
-                clearCloseStdinTimer();
                 clearPromptTimer();
                 proc.kill(signal);
             },
@@ -1282,6 +1343,10 @@ export class NativeSidecarKernelProxy {
                     }
                     void this.refreshProcessSnapshot().catch(() => { });
                     this.finishProcess(entry, event.payload.exit_code);
+                    continue;
+                }
+                if (event.payload.type === "structured") {
+                    logStructuredSidecarEvent(event.payload.name, event.payload.detail);
                 }
             }
             catch (error) {
@@ -1779,6 +1844,10 @@ function buildCommandMap(commandGuestPaths) {
         ["node", "node"],
         ["npm", "node"],
         ["npx", "node"],
+        // `python` / `python3` are served by the embedded Pyodide runtime,
+        // mirroring how `node` is served by the embedded V8 runtime.
+        ["python", "python"],
+        ["python3", "python"],
     ]);
     for (const name of commandGuestPaths.keys()) {
         commands.set(name, "wasmvm");

package/dist/types.d.ts

@@ -1,10 +1,11 @@
-export type { AgentCapabilities, AgentInfo, AgentOsCreateSidecarOptions, AgentOsLimits, AgentOsOptions, AgentOsSharedSidecarOptions, AgentOsSidecarConfig, AgentOsSidecarDescription, AgentStderrEvent, AgentStderrHandler, AgentRegistryEntry, BatchReadResult, BatchWriteEntry, BatchWriteResult, CreateSessionOptions, DirEntry, LimitWarning, LimitWarningHandler, McpServerConfig, McpServerConfigLocal, McpServerConfigRemote, MountConfig, MountConfigJsonObject, MountConfigJsonPrimitive, MountConfigJsonValue, NativeMountConfig, NativeMountPluginDescriptor, OverlayMountConfig, PermissionReply, PermissionRequest, PermissionRequestHandler, PlainMountConfig, ProcessTreeNode, PromptResult, ReaddirRecursiveOptions, ResumeSessionOptions, ResumeSessionResult, RootFilesystemConfig, RootLowerInput, SessionConfigOption, SessionEventHandler, SessionInfo, SessionInitData, SessionMode, SessionModeState, SpawnedProcessInfo, } from "./agent-os.js";
+export type { AgentCapabilities, AgentInfo, AgentOsCreateSidecarOptions, AgentOsLimits, AgentOsOptions, AgentOsSharedSidecarOptions, AgentOsSidecarConfig, AgentOsSidecarDescription, AgentExitEvent, AgentExitHandler, AgentRestartOutcome, AgentStderrEvent, AgentStderrHandler, AgentRegistryEntry, BatchReadResult, BatchWriteEntry, BatchWriteResult, CreateSessionOptions, DirEntry, LimitWarning, LimitWarningHandler, McpServerConfig, McpServerConfigLocal, McpServerConfigRemote, MountConfig, MountConfigJsonObject, MountConfigJsonPrimitive, MountConfigJsonValue, NativeMountConfig, NativeMountPluginDescriptor, OverlayMountConfig, PermissionReply, PermissionRequest, PermissionRequestHandler, PlainMountConfig, ProcessTreeNode, PromptResult, ReaddirRecursiveOptions, ResumeSessionOptions, ResumeSessionResult, RootFilesystemConfig, RootLowerInput, SessionConfigOption, SessionEventHandler, SessionInfo, SessionInitData, SessionMode, SessionModeState, SpawnedProcessInfo, } from "./agent-os.js";
 export type { AgentConfig, AgentType } from "./agents.js";
 export type { CronAction, CronEvent, CronEventHandler, CronJob, CronJobInfo, CronJobOptions, ScheduleDriver, ScheduleEntry, ScheduleHandle, } from "./cron/index.js";
 export type { HostDirBackendOptions, HostDirMountPluginConfig, NodeModulesMountConfig, } from "./host-dir-mount.js";
 export type { HostTool, ToolExample, ToolKit } from "./host-tools.js";
 export type { AcpTimeoutErrorData, JsonRpcError, JsonRpcErrorData, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, UnknownSessionErrorData, } from "./json-rpc.js";
 export type { FilesystemSnapshotExport, LayerHandle, LayerStore, OverlayFilesystemMode, RootSnapshotExport, SnapshotImportSource, SnapshotLayerHandle, WritableLayerHandle, } from "./layers.js";
-export type { AgentSoftwareDescriptor, AnySoftwareDescriptor, SoftwareContext, SoftwareDescriptor, SoftwareInput, SoftwareRoot, ToolSoftwareDescriptor, WasmCommandDirDescriptor, WasmCommandSoftwareDescriptor, } from "./packages.js";
+export type { SoftwareInput, SoftwareRoot } from "./packages.js";
+export type { AgentBlock, PackageDescriptor, PackageRef, SoftwarePackageRef, } from "./agentos-package.js";
 export type { ChildProcessPermissions, ConnectTerminalOptions, EnvPermissions, ExecOptions, ExecResult, FsPermissionRule, FsPermissions, KernelExecOptions, KernelExecResult, KernelSpawnOptions, NetworkAccessRequest, NetworkPermissions, OpenShellOptions, PatternPermissionRule, PermissionDecision, PermissionMode, Permissions, ProcessInfo, RulePermissions, StdioChannel, TimingMitigation, VirtualDirEntry, VirtualFileSystem, VirtualStat, } from "./runtime.js";
 export type { PromptCapabilities } from "./agent-session-types.js";

package/package.json

@@ -1,13 +1,12 @@
 {
 	"name": "@rivet-dev/agentos-core",
-	"version": "0.2.4",
+	"version": "0.2.5-rc.2",
 	"type": "module",
 	"license": "Apache-2.0",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
 	"files": [
-		"dist",
-		"fixtures"
+		"dist"
 	],
 	"exports": {
 		".": {
@@ -54,11 +53,17 @@
 		"test": "vitest run --reporter=verbose"
 	},
 	"dependencies": {
-		"@agentos-software/common": "0.3.0",
+		"@agentos-software/claude-code": "0.3.1",
+		"@agentos-software/codex-cli": "0.3.1",
+		"@agentos-software/common": "0.3.1",
+		"@agentos-software/manifest": "0.3.1",
+		"@agentos-software/opencode": "0.3.1",
+		"@agentos-software/pi": "0.3.1",
+		"@agentos-software/pi-cli": "0.3.1",
 		"@aws-sdk/client-s3": "^3.1019.0",
-		"@rivet-dev/agentos-sidecar": "0.2.4",
+		"@rivet-dev/agentos-sidecar": "0.2.5-rc.2",
 		"@rivetkit/bare-ts": "^0.6.2",
-		"@secure-exec/core": "0.3.3",
+		"@secure-exec/core": "0.3.4-rc.1",
 		"@xterm/headless": "^6.0.0",
 		"better-sqlite3": "^12.8.0",
 		"croner": "^10.0.1",
@@ -70,39 +75,39 @@
 		"zod-to-json-schema": "^3.25.2"
 	},
 	"devDependencies": {
+		"@agentos-software/claude-code": "0.3.1",
+		"@agentos-software/codex": "0.3.1",
+		"@agentos-software/coreutils": "0.3.1",
+		"@agentos-software/curl": "0.3.1",
+		"@agentos-software/diffutils": "0.3.1",
+		"@agentos-software/duckdb": "0.0.0-nathan-agentos-package-resolution.efc374f",
+		"@agentos-software/fd": "0.3.1",
+		"@agentos-software/file": "0.3.1",
+		"@agentos-software/findutils": "0.3.1",
+		"@agentos-software/gawk": "0.3.1",
+		"@agentos-software/git": "0.3.1",
+		"@agentos-software/grep": "0.3.1",
+		"@agentos-software/gzip": "0.3.1",
+		"@agentos-software/http-get": "0.3.1",
+		"@agentos-software/jq": "0.3.1",
+		"@agentos-software/opencode": "0.3.1",
+		"@agentos-software/pi": "0.3.1",
+		"@agentos-software/pi-cli": "0.3.1",
+		"@agentos-software/ripgrep": "0.3.1",
+		"@agentos-software/sed": "0.3.1",
+		"@agentos-software/tar": "0.3.1",
+		"@agentos-software/tree": "0.3.1",
+		"@agentos-software/vim": "0.3.1",
+		"@agentos-software/yq": "0.3.1",
 		"@anthropic-ai/claude-agent-sdk": "^0.2.87",
 		"@anthropic-ai/claude-code": "^2.1.86",
+		"@bare-ts/tools": "0.15.0",
 		"@browserbasehq/browse-cli": "0.5.0",
 		"@browserbasehq/cli": "0.5.4",
 		"@browserbasehq/sdk": "2.10.0",
-		"@bare-ts/tools": "0.15.0",
 		"@copilotkit/llmock": "^1.6.0",
-		"@rivet-dev/agentos-sandbox": "link:../agentos-sandbox",
-		"@agentos-software/git": "0.3.0",
-		"@secure-exec/google-drive": "0.3.3",
-		"@secure-exec/s3": "0.3.3",
 		"@mariozechner/pi-coding-agent": "^0.60.0",
-		"@agentos-software/claude-code": "0.2.1",
-		"@agentos-software/codex-cli": "0.3.0",
-		"@agentos-software/codex": "0.2.0",
-		"@agentos-software/coreutils": "0.3.0",
-		"@agentos-software/curl": "0.3.0",
-		"@agentos-software/diffutils": "0.3.0",
-		"@agentos-software/fd": "0.3.0",
-		"@agentos-software/file": "0.3.0",
-		"@agentos-software/findutils": "0.3.0",
-		"@agentos-software/gawk": "0.3.0",
-		"@agentos-software/grep": "0.3.0",
-		"@agentos-software/gzip": "0.3.0",
-		"@agentos-software/jq": "0.3.0",
-		"@agentos-software/opencode": "0.2.1",
-		"@agentos-software/pi": "0.2.1",
-		"@agentos-software/pi-cli": "0.2.1",
-		"@agentos-software/ripgrep": "0.3.0",
-		"@agentos-software/sed": "0.3.0",
-		"@agentos-software/tar": "0.3.0",
-		"@agentos-software/tree": "0.3.0",
-		"@agentos-software/yq": "0.3.0",
+		"@rivet-dev/agentos-sandbox": "link:../agentos-sandbox",
 		"@types/node": "^22.10.2",
 		"pi-acp": "^0.0.23",
 		"sandbox-agent": "^0.4.2",