@fungi.computer/computer 0.2.2 → 0.3.0

package/dist/apply-patch/build.mjs

@@ -10,6 +10,8 @@
 // container behind. Any other host builds its own target natively through
 // rustup. One immutable artifact per pin, wrapper and target is cached under
 // ${XDG_CACHE_HOME:-~/.cache}/fungi/native-patch and restored on later calls.
+// Turbo's strict environment lends only tool homes, so under Turbo the cache
+// follows HOME; a caller that wants a private cache sets a private HOME.
 import { spawn } from "node:child_process";
 import { homedir } from "node:os";
 import { resolve } from "node:path";

package/dist/apply-patch/cache.mjs

@@ -50,7 +50,7 @@ async function digest(path) {
     .digest("hex");
 }
 
-/** One immutable artifact per Codex pin/target, shared by every checkout and updater. */
+/** One immutable artifact per Codex pin/target/wrapper, shared by every checkout and updater. */
 export async function ensureNativePatchArtifact({
   cacheRoot,
   pin: inputPin,
@@ -62,7 +62,7 @@ export async function ensureNativePatchArtifact({
   const pin = pinSchema.parse(inputPin);
   const target = targetSchema.parse(inputTarget);
   const wrapperSha256 = await digest(wrapper);
-  const key = join(cacheRoot, pin.version, target);
+  const key = join(cacheRoot, pin.version, target, wrapperSha256);
   const artifact = join(key, "artifact");
   await mkdir(key, { recursive: true, mode: 0o700 });
   async function published() {
@@ -82,7 +82,7 @@ export async function ensureNativePatchArtifact({
       receipt.wrapperSha256 !== wrapperSha256
     )
       throw new Error(
-        `Cached patch artifact does not match this pin or wrapper: ${artifact}. Use a new pin before rebuilding.`,
+        `Cached patch artifact does not match this pin or wrapper: ${artifact}. The artifact was not used or rebuilt.`,
       );
     if (
       (await digest(join(artifact, "fungi-apply-patch"))) !==

package/dist/apply-patch/compile.mjs

@@ -114,7 +114,11 @@ const nativePathFlags = [
   .map((flag) => JSON.stringify(flag))
   .join(" ");
 ensureNativeHostToolchain({ toolchain: codexPatchPin.rustToolchain });
-const { command: cargoCommand, args: cargoArgs } = selectCargoInvocation({
+const {
+  command: cargoCommand,
+  args: cargoArgs,
+  env: cargoEnv,
+} = selectCargoInvocation({
   toolchain: codexPatchPin.rustToolchain,
   cargoArgs: [
     crossMac ? "zigbuild" : "build",
@@ -139,6 +143,7 @@ const cargo = spawnSync(cargoCommand, cargoArgs, {
   maxBuffer: 64 * 1024 * 1024,
   env: {
     ...process.env,
+    ...cargoEnv,
     CARGO_TARGET_DIR: resolve(scratch, "target"),
     CARGO_ENCODED_RUSTFLAGS: [
       `--remap-path-prefix=${scratch}=/build`,

package/dist/apply-patch/main.rs

@@ -242,6 +242,20 @@ async fn run() -> Result<(), Box<dyn std::error::Error>> {
             }
         }
     }
+    // Inspection uses the same upstream parser and admission as application.
+    // The host uses these NUL-delimited paths to enforce protected mounts
+    // before offering an approval and again immediately before dispatch.
+    if std::env::args().nth(1).as_deref() == Some("--inspect") {
+        use std::io::Write;
+        let mut output = io::stdout().lock();
+        let mut paths: Vec<_> = paths.into_iter().collect();
+        paths.sort();
+        for path in paths {
+            output.write_all(path.as_os_str().as_encoded_bytes())?;
+            output.write_all(&[0])?;
+        }
+        return Ok(());
+    }
     let cwd = PathUri::from_abs_path(&AbsolutePathBuf::try_from(PathBuf::from(&root))?);
     let mode = ApplyPatchFileUpdateMode::PreserveLineEndings;
     let diagnostic_hunks = parsed.hunks.clone();

package/dist/apply-patch/toolchain.mjs

@@ -4,16 +4,36 @@
 // image's builder stage) installs Rust through rustup. A non-rustup `cargo`
 // earlier on `PATH` (for example Homebrew's) rejects the `+toolchain`
 // directive, so the build asks rustup's ordinary interface for the pinned
-// toolchain's `cargo` explicitly.
+// toolchain's `cargo` explicitly. Cargo itself still resolves `rustc` from
+// `PATH`, so a Homebrew `rustc` listed first would compile with the wrong
+// compiler; the invocation pins `RUSTC` to the toolchain's own compiler too.
 import { spawnSync } from "node:child_process";
 
 /**
- * Builds the `{ command, args }` cargo invocation for the pinned toolchain.
+ * Builds the `{ command, args, env }` cargo invocation for the pinned
+ * toolchain. `env` carries `RUSTC` and must be merged into the child's
+ * environment.
  *
  * @param {{ toolchain: string, cargoArgs: string[] }} options
  */
 export function selectCargoInvocation({ toolchain, cargoArgs }) {
-  return { command: "rustup", args: ["run", toolchain, "cargo", ...cargoArgs] };
+  const which = spawnSync(
+    "rustup",
+    ["which", "--toolchain", toolchain, "rustc"],
+    {
+      encoding: "utf8",
+    },
+  );
+  if (which.error) throw which.error;
+  if (which.status !== 0)
+    throw new Error(
+      `rustup could not locate the Rust ${toolchain} toolchain's rustc: ${which.stderr.trim()}`,
+    );
+  return {
+    command: "rustup",
+    args: ["run", toolchain, "cargo", ...cargoArgs],
+    env: { RUSTC: which.stdout.trim() },
+  };
 }
 
 /**

package/dist/fleet/wire.d.ts

@@ -8,9 +8,6 @@ export declare const computerActionSchema: z.ZodEnum<{
     mkdir: "mkdir";
     backing: "backing";
     bash: "bash";
-    exposePort: "exposePort";
-    listPorts: "listPorts";
-    unexposePort: "unexposePort";
     "files.read": "files.read";
     "files.readBytes": "files.readBytes";
     "files.write": "files.write";
@@ -25,6 +22,9 @@ export declare const computerActionSchema: z.ZodEnum<{
     processStart: "processStart";
     processList: "processList";
     processKill: "processKill";
+    exposePort: "exposePort";
+    unexposePort: "unexposePort";
+    listPorts: "listPorts";
 }>;
 export type ComputerAction = z.output<typeof computerActionSchema>;
 /** Opaque host identities; the fleet does not derive authority from their text. */
@@ -43,9 +43,6 @@ export declare const computerGrantSchema: z.ZodObject<{
         mkdir: "mkdir";
         backing: "backing";
         bash: "bash";
-        exposePort: "exposePort";
-        listPorts: "listPorts";
-        unexposePort: "unexposePort";
         "files.read": "files.read";
         "files.readBytes": "files.readBytes";
         "files.write": "files.write";
@@ -60,6 +57,9 @@ export declare const computerGrantSchema: z.ZodObject<{
         processStart: "processStart";
         processList: "processList";
         processKill: "processKill";
+        exposePort: "exposePort";
+        unexposePort: "unexposePort";
+        listPorts: "listPorts";
     }>>>;
     expiresAt: z.ZodNumber;
     egress: z.ZodOptional<z.ZodJSONSchema>;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { createLocalBackendReplayStore } from "./local-backend-replay.js";
-import { Workspace, WorkspaceProxy, WorkspaceServiceProxy, type WorkspaceStubHost } from "@fungi.computer/cloudflare-computer";
+import { Workspace, WorkspaceProxy, WorkspaceServiceProxy, type WorkspaceStub } from "@fungi.computer/cloudflare-computer";
 import { type WorkerShellBackendOptions } from "@fungi.computer/cloudflare-computer/backends/worker-shell";
 import { type IWorkspaceContainerAPI } from "@fungi.computer/cloudflare-computer/backends/container";
 import { DurableObject } from "cloudflare:workers";
@@ -10,8 +10,13 @@ import { createWorkspaceFilesPort } from "./files.js";
 import { OnBoxVmContainerHost, type OnBoxVmEnv, type OnBoxVmPlacement } from "./on-box-vm.js";
 import { type AttachedBackend, type AttachedBackendView, type BackendNeed, type BackendRoute, type ContainerRuntimeStart, type HostedBacking } from "./computer-backends.js";
 import { LocalBackendConnections } from "./local-backend.js";
+/** Files needs only the native Workspace lease and its atomic replacement door. */
+export type ComputerFilesRpc = Readonly<{
+    __getWorkspaceStub(): Promise<WorkspaceStub>;
+    replaceFileIfUnchanged(input: ComputerFileReplacement): Promise<ComputerFileReplacementResult>;
+}>;
 /** The exact RPC surface of one Computer Durable Object. */
-export type ComputerRpc = WorkspaceStubHost & Readonly<{
+export type ComputerRpc = ComputerFilesRpc & Readonly<{
     getCapabilities: ComputerDO["getCapabilities"];
     call: (capabilityId: ComputerValue, input: ComputerValue) => Promise<ComputerValue>;
     readFile: (input: ComputerFileReadInput) => Promise<ReadableStream<Uint8Array>>;
@@ -31,7 +36,6 @@ export type ComputerRpc = WorkspaceStubHost & Readonly<{
         port: number;
         removed: boolean;
     }>;
-    replaceFileIfUnchanged: (input: ComputerFileReplacement) => Promise<ComputerFileReplacementResult>;
 }>;
 /** The Cloudflare binding projection needed to select one named Computer. */
 export type ComputerNamespace = Readonly<{
@@ -120,7 +124,7 @@ declare class ContainerComputer extends ContainerComputerBase {
      */
     protected readyWorkspace(): Promise<Workspace>;
     /** `getWorkspace(stub)` reaches the current generation through this door. */
-    __getWorkspaceStub(): Promise<import("@fungi.computer/cloudflare-computer").WorkspaceStub>;
+    __getWorkspaceStub(): Promise<WorkspaceStub>;
     /**
      * Backend doors. An attached machine dials in on its public connect path.
      * A container backend's `/ws` upgrade and egress: the platform container's
@@ -130,7 +134,7 @@ declare class ContainerComputer extends ContainerComputerBase {
     fetch(request: Request): Promise<Response>;
 }
 /** One upstream Cloudflare Workspace that advertises and runs its capabilities. */
-export declare class ComputerDO extends ContainerComputer {
+export declare class ComputerDO extends ContainerComputer implements ComputerFilesRpc {
     #private;
     constructor(ctx: DurableObjectState, env: ComputerEnv);
     /** Host-admitted settings write; egress reads the current durable value. */
@@ -294,7 +298,7 @@ export { computerContainerSleepAfterMs } from "./container-policy.js";
 export * from "./computer-backends.js";
 export { LocalBackendOfflineError, localBackendAudience, localBackendDialPath, verifyLocalBackendDial, } from "./local-backend.js";
 /** Keep each native Workspace lease inside the operation that uses it. */
-export declare function createComputerFilesPort(computer: ComputerRpc): FilesPort;
+export declare function createComputerFilesPort(computer: ComputerFilesRpc | Rpc.Provider<ComputerFilesRpc>): FilesPort;
 export { createWorkspaceFilesPort, type WorkspaceFilesOwner } from "./files.js";
 export { ComputerOperationConflictError, ComputerOperationLimitError, ComputerRequestInvalidError, } from "./operation-record.js";
 export type { ContainerComputer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fungi.computer/computer",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "author": "Levi <levi@technomancy.dev>",
   "description": "Cloudflare Computer host for one durable Fungi Computer",
   "type": "module",
@@ -35,6 +35,10 @@
       "types": "./dist/fleet/wire.d.ts",
       "import": "./dist/fleet/wire.js"
     },
+    "./fleet/inventory-wire": {
+      "types": "./dist/fleet/inventory-wire.d.ts",
+      "import": "./dist/fleet/inventory-wire.js"
+    },
     "./fleet": {
       "types": "./dist/fleet/index.d.ts",
       "import": "./dist/fleet/index.js"
@@ -55,11 +59,11 @@
     "@fungi.computer/cairn": "0.1.0",
     "@fungi.computer/capnweb": "0.12.0",
     "@fungi.computer/cloudflare-computer": "0.2.1-fungi.2",
-    "@fungi.computer/cordyceps": "0.3.1",
-    "@fungi.computer/knapsack": "0.2.1",
-    "@fungi.computer/seam": "0.1.0",
+    "@fungi.computer/cordyceps": "0.4.0",
+    "@fungi.computer/knapsack": "0.3.0",
+    "@fungi.computer/seam": "0.2.0",
     "@fungi.computer/watchdog": "0.1.0",
-    "@fungi.computer/computer-contract": "0.0.2",
+    "@fungi.computer/computer-contract": "0.0.3",
     "effect": "4.0.2",
     "just-bash": "3.4.2",
     "zod": "4.4.3"