Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
fi
case "$v" in 0.0.0-*) echo "::error::secure_exec_version must be a real release, not a preview"; exit 1;; esac
npm view "@secure-exec/core@$v" version >/dev/null
curl -sf "https://crates.io/api/v1/crates/secure-exec-sidecar/$v" >/dev/null || { echo "::error::secure-exec-sidecar@$v is not on crates.io"; exit 1; }
curl -sf "https://index.crates.io/se/cu/secure-exec-sidecar" | grep -q "\"vers\":\"$v\"" || { echo "::error::secure-exec-sidecar@$v is not on crates.io"; exit 1; }
echo "version=$v" >> "$GITHUB_OUTPUT"
echo "registry_tag=latest" >> "$GITHUB_OUTPUT"
exit 0
Expand Down Expand Up @@ -404,11 +404,14 @@ jobs:
pnpm --filter=publish exec tsx src/ci/bin.ts bump-versions \
--version ${{ needs.context.outputs.version }} \
--version-only
- name: Install wasm-pack (for @rivet-dev/agentos-browser wasm build)
run: |
rustup target add wasm32-unknown-unknown
curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
- name: Build TypeScript packages
run: |
npx turbo build \
--filter='!@rivet-dev/agentos-playground' \
--filter='!@agentos/website' \
--filter='!./examples/*' \
--filter='!./examples/quickstart/*'
- name: Finalize package versions for publish (inject optionalDeps)
Expand Down
22 changes: 15 additions & 7 deletions crates/client/src/agent_os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ impl AgentOs {
| wire::ResponsePayload::PersistenceFlushedResponse(_)
| wire::ResponsePayload::VmFetchResponse(_)
| wire::ResponsePayload::ExtEnvelope(_)
| wire::ResponsePayload::GuestKernelResultResponse(_)
| wire::ResponsePayload::ResourceSnapshotResponse(_)
| wire::ResponsePayload::PackageLinkedResponse(_) => {
return Err(ClientError::Sidecar(
"unexpected open_session response".to_string(),
Expand Down Expand Up @@ -370,6 +372,8 @@ impl AgentOs {
| wire::ResponsePayload::PersistenceFlushedResponse(_)
| wire::ResponsePayload::VmFetchResponse(_)
| wire::ResponsePayload::ExtEnvelope(_)
| wire::ResponsePayload::GuestKernelResultResponse(_)
| wire::ResponsePayload::ResourceSnapshotResponse(_)
| wire::ResponsePayload::PackageLinkedResponse(_) => {
return Err(ClientError::Sidecar(
"unexpected create_vm response".to_string(),
Expand Down Expand Up @@ -451,6 +455,8 @@ impl AgentOs {
| wire::ResponsePayload::PersistenceFlushedResponse(_)
| wire::ResponsePayload::VmFetchResponse(_)
| wire::ResponsePayload::ExtEnvelope(_)
| wire::ResponsePayload::GuestKernelResultResponse(_)
| wire::ResponsePayload::ResourceSnapshotResponse(_)
| wire::ResponsePayload::PackageLinkedResponse(_) => {
return Err(ClientError::Sidecar(
"unexpected configure_vm response".to_string(),
Expand Down Expand Up @@ -528,6 +534,8 @@ impl AgentOs {
| wire::ResponsePayload::PersistenceFlushedResponse(_)
| wire::ResponsePayload::VmFetchResponse(_)
| wire::ResponsePayload::ExtEnvelope(_)
| wire::ResponsePayload::GuestKernelResultResponse(_)
| wire::ResponsePayload::ResourceSnapshotResponse(_)
| wire::ResponsePayload::PackageLinkedResponse(_) => {
return Err(ClientError::Sidecar(
"unexpected register_host_callbacks response".to_string(),
Expand Down Expand Up @@ -633,12 +641,11 @@ impl AgentOs {
.request_wire(
wire_vm_ownership(&inner.connection_id, &inner.session_id, &inner.vm_id),
wire::RequestPayload::LinkPackageRequest(wire::LinkPackageRequest {
// The wire `PackageDescriptor` carries `{ name, dir, acpEntrypoint? }`;
// forward all three from the client-side descriptor.
// The wire `PackageDescriptor` carries only `{ dir }`; the
// sidecar reads `name`/`acpEntrypoint` from the package's
// `agentos-package.json` at `dir`.
package: wire::PackageDescriptor {
name: descriptor.name,
dir: descriptor.dir,
acp_entrypoint: descriptor.acp_entrypoint,
},
}),
)
Expand Down Expand Up @@ -1039,6 +1046,7 @@ fn serialize_create_vm_config_for_sidecar(
// it forwards no snapshot. TODO: expose a snapshot bundle input on
// the Rust client config for parity if a Rust consumer needs it.
snapshot_userland_code: None,
high_resolution_time: None,
}
}),
})
Expand Down Expand Up @@ -3614,11 +3622,11 @@ fn build_package_descriptors(
) -> Result<Vec<wire::PackageDescriptor>, ClientError> {
let mut descriptors = Vec::with_capacity(config.packages.len());
for package in &config.packages {
let manifest = read_agentos_package_manifest(&package.dir)?;
// Validate the package dir has a manifest, but the wire descriptor now
// carries only `dir`; the sidecar re-reads name/acpEntrypoint from it.
let _manifest = read_agentos_package_manifest(&package.dir)?;
descriptors.push(wire::PackageDescriptor {
name: manifest.name,
dir: package.dir.clone(),
acp_entrypoint: manifest.agent.and_then(|agent| agent.acp_entrypoint),
});
}
Ok(descriptors)
Expand Down
14 changes: 10 additions & 4 deletions crates/client/src/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -527,10 +527,16 @@ impl AgentOs {
let result = self
.guest_fs_call(Self::fs_request(GuestFilesystemOperation::ReadDir, path))
.await?;
// secure-exec's READ_DIR returns basenames only (`entries: list<str>`);
// the typed [`Self::read_dir_with_types`] path derives each entry's type
// with a per-child `lstat`.
Ok(result.entries.unwrap_or_default())
// secure-exec's READ_DIR now returns rich entries (`entries:
// list<GuestDirEntry>` with name + is_directory + is_symbolic_link);
// this name-only accessor projects the basenames. The richer fields back
// the typed [`Self::read_dir_with_types`] path.
Ok(result
.entries
.unwrap_or_default()
.into_iter()
.map(|entry| entry.name)
.collect())
}

async fn kernel_stat(&self, path: &str) -> Result<VirtualStat> {
Expand Down
Loading