@fungi.computer/oyster 0.4.0 → 0.5.0

package/dist/agents.d.ts

@@ -7,6 +7,7 @@
  * transport (`/browser/…`), served by the adapter behind the same App grants.
  */
 import { Hono } from "hono";
+import { type LiveOysterKey } from "./keys.js";
 import type { AppToolPolicy } from "./apps/tools.js";
 import * as Schema from "effect/Schema";
 import { type OysterCapability, type OysterEnv, type OysterPrincipal } from "./host.js";
@@ -125,7 +126,7 @@ export type OysterAgents = Readonly<{
     visit(agentId: string, sessionId: string): Promise<boolean>;
 }>;
 /** Agent adapters admitted against each App's declared capabilities. */
-export declare function agentCapabilities(agents: OysterAgents): readonly OysterCapability[];
+export declare function agentCapabilities(agents: OysterAgents, liveKey: (keyId: string) => Promise<LiveOysterKey | null>): readonly OysterCapability[];
 /** Host-owned direct approval under the admitted owner; never an App capability. */
 export declare function agentApprovalRoutes(agents: OysterAgents): Hono<OysterEnv>;
 /**

package/dist/agents.js

@@ -7,6 +7,7 @@
  * transport (`/browser/…`), served by the adapter behind the same App grants.
  */
 import { Hono } from "hono";
+import { keyAgentAccess } from "./keys.js";
 import * as Schema from "effect/Schema";
 import { z } from "zod";
 import { oysterPrincipalIsOwner, } from "./host.js";
@@ -51,8 +52,8 @@ function refusal(status, error) {
     return Response.json({ error }, { status });
 }
 /** Agent adapters admitted against each App's declared capabilities. */
-export function agentCapabilities(agents) {
-    const routes = createAgentRoutes(agents);
+export function agentCapabilities(agents, liveKey) {
+    const routes = createAgentRoutes(agents, liveKey);
     const shared = { base: "/", routes };
     return [
         {
@@ -134,9 +135,41 @@ export function agentCapabilities(agents) {
         },
     ];
 }
-function createAgentRoutes(agents) {
+function createAgentRoutes(agents, liveKey) {
     const routes = new Hono();
-    routes.get("/agents", async () => Response.json(await agents.list()));
+    // Every Agent and Session lookup shares this live principal-scoped door.
+    const access = async (principal, agentId) => {
+        if (oysterPrincipalIsOwner(principal))
+            return true;
+        if (principal.actor.kind !== "team-key")
+            return false;
+        const key = await liveKey(principal.actor.keyId);
+        return key !== null && keyAgentAccess(key, agentId);
+    };
+    routes.use("/agents/:agentId/*", async (context, next) => {
+        if (!(await access(context.env.principal, context.req.param("agentId"))))
+            return refusal(403, "Agent access denied");
+        await next();
+        return undefined;
+    });
+    routes.use("/agent-policies/:agentId", async (context, next) => {
+        if (!(await access(context.env.principal, context.req.param("agentId"))))
+            return refusal(403, "Agent access denied");
+        await next();
+        return undefined;
+    });
+    routes.get("/agents", async (context) => {
+        const listed = await agents.list();
+        const actor = context.env.principal.actor;
+        if (oysterPrincipalIsOwner(context.env.principal))
+            return Response.json(listed);
+        if (actor.kind !== "team-key")
+            return Response.json([]);
+        const key = await liveKey(actor.keyId);
+        return Response.json(key === null
+            ? []
+            : listed.filter((agent) => keyAgentAccess(key, agent.agentId)));
+    });
     routes.post("/agents", async (context) => {
         const { principal } = context.env;
         if (!oysterPrincipalIsOwner(principal))
@@ -216,19 +249,37 @@ function createAgentRoutes(agents) {
         const response = await agents.fetch(agentId, new Request(target, incoming));
         return response ?? refusal(404, "No such agent");
     });
-    routes.get("/member/inbox", async () => {
+    routes.get("/member/inbox", async (context) => {
         const inbox = await agents.inbox();
+        const principal = context.env.principal;
+        if (oysterPrincipalIsOwner(principal))
+            return Response.json({
+                items: inbox.items,
+                next: null,
+                cursor: inbox.revision,
+            });
+        if (principal.actor.kind !== "team-key")
+            return refusal(403, "Agent access denied");
+        const key = await liveKey(principal.actor.keyId);
         return Response.json({
-            items: inbox.items,
+            items: key === null
+                ? []
+                : inbox.items.filter((item) => "agentId" in item && keyAgentAccess(key, item.agentId)),
             next: null,
-            cursor: inbox.revision,
+            // The global revision changes for ungranted Agents too. Key feeds have
+            // no scoped event stream, so expose neither that revision nor its events.
+            cursor: 0,
         });
     });
-    routes.get("/member/inbox/notices", () => Response.json({ items: [], next: null }));
+    routes.get("/member/inbox/notices", (context) => oysterPrincipalIsOwner(context.env.principal)
+        ? Response.json({ items: [], next: null })
+        : refusal(403, "Agent access denied"));
     routes.post("/member/inbox/visits", async (context) => {
         const body = Schema.decodeUnknownOption(visitSchema)(await context.req.json());
         if (body._tag === "None")
             return refusal(400, "Invalid visit");
+        if (!(await access(context.env.principal, body.value.agentId)))
+            return refusal(403, "Agent access denied");
         return (await agents.visit(body.value.agentId, body.value.sessionId))
             ? new Response(null, { status: 204 })
             : refusal(404, "No such Session");
@@ -236,6 +287,10 @@ function createAgentRoutes(agents) {
     // The feed is small (one person's agents), so a change is announced as a
     // `reset` and the client re-reads the whole inbox.
     routes.get("/member/inbox/events", (context) => {
+        // The unscoped revision also changes for other Agents. Do not expose it
+        // until a principal-scoped revision exists.
+        if (!oysterPrincipalIsOwner(context.env.principal))
+            return refusal(403, "Agent access denied");
         const after = Number(context.req.query("after") ?? "0");
         const signal = context.req.raw.signal;
         const encoder = new TextEncoder();

package/dist/app-builds.d.ts

@@ -97,7 +97,7 @@ export type OysterBuildView = Readonly<{
     appId: string;
     releaseId: string;
     sourceRevision: string;
-    status: "running" | "succeeded" | "failed" | "revoked";
+    status: "running" | "succeeded" | "failed" | "interrupted" | "revoked";
     detail: string | null;
     release: Release | null;
     installation: OysterBuildInstallation | null;

package/dist/app-builds.js

@@ -19,6 +19,7 @@
 import * as Schema from "effect/Schema";
 import * as Data from "effect/Data";
 import * as Option from "effect/Option";
+import { candidateFailureDiagnostic } from "./build/candidate-diagnostic.js";
 import { parseArtifactRef, parseReleaseId, } from "@fungi.computer/puffball";
 import { appIdSchema, releaseSchema, sha256DigestSchema, sourceRevisionSchema, } from "@fungi.computer/puffball/effect";
 import { capturedPinnedRecipeSchema, normalizeAppPublisherRecipe, digestPinnedRecipe, fitsPinnedRecipe, pinnedRecipeObjectBound, } from "./build/effect.js";
@@ -116,7 +117,13 @@ const jobRow = Schema.Struct({
     credential_id: Schema.String,
     upload_grant_digest: Schema.String,
     request_id: Schema.NullOr(Schema.String),
-    status: Schema.Literals(["running", "succeeded", "failed", "revoked"]),
+    status: Schema.Literals([
+        "running",
+        "succeeded",
+        "failed",
+        "interrupted",
+        "revoked",
+    ]),
     artifact_digest: Schema.NullOr(Schema.String),
     artifact_bytes: Schema.NullOr(Schema.Number),
     detail: Schema.NullOr(Schema.String),
@@ -186,12 +193,12 @@ export function createOysterAppBuilds(options) {
     // A job outlives the owner instance that started it: the Computer keeps
     // building and its own reports (objects, candidate, status) settle the
     // job, so an owner restart must not fail it. A job that reaches its expiry
-    // without a result can never settle, so it fails then instead of reading
+    // without a result can never settle, so it is interrupted instead of reading
     // as running for as long as anyone asks.
     const failedInstallation = `CASE WHEN installation IS NULL THEN NULL ELSE
     json_object('kind', 'failed', 'installationId', json_extract(installation, '$.installationId'),
       'detail', COALESCE(?, 'Build did not succeed')) END`;
-    const expire = () => owner.sql.exec(`UPDATE oyster_build_jobs SET installation=${failedInstallation}, status='failed', detail=? WHERE status='running' AND expires_at<=?`, "Build expired without a result", "Build expired without a result", now());
+    const expire = () => owner.sql.exec(`UPDATE oyster_build_jobs SET installation=${failedInstallation}, status='interrupted', detail=? WHERE status='running' AND expires_at<=?`, "Build expired without a result", "Build expired without a result", now());
     expire();
     const decodeRecipe = (recipe) => Schema.decodeUnknownSync(recipeCodec)(recipe);
     const grantAdmits = async (job, grant) => sameDigest(job.upload_grant_digest, await sha256Hex(new TextEncoder().encode(grant)));
@@ -269,6 +276,9 @@ export function createOysterAppBuilds(options) {
                 return Promise.resolve();
             },
             execute: async (input) => {
+                // The Computer's connection may close without a terminal execution
+                // reply. A missing output is not an exit; a rejected RPC carrying an
+                // Error (including an admission refusal) remains a definite failure.
                 const result = await options.computer.port.runBuild({
                     jobId: input.jobId,
                     command: input.command,
@@ -298,10 +308,10 @@ export function createOysterAppBuilds(options) {
             });
         }
         catch (cause) {
-            // Without a terminal result the build may still be running on the
-            // Computer; its own reports settle the job, or its expiry fails it.
+            // An unknown output can belong to a live builder. Its reports can
+            // still succeed; the existing build expiry interrupts it if abandoned.
             if (!(cause instanceof BuildOutcomeUnknown))
-                settle(jobId, "failed", cause instanceof Error ? cause.message : "Build failed");
+                settle(jobId, "failed", candidateFailureDiagnostic(cause));
         }
         return view(required(jobId));
     };

package/dist/apps/gate.d.ts

@@ -36,6 +36,10 @@ export declare const gateRequestSchema: z.ZodLazy<z.ZodDiscriminatedUnion<[z.Zod
     kind: z.ZodLiteral<"capability-route">;
     capability: z.ZodPipe<z.ZodUnknown, z.ZodTransform<"approvals" | "agent.list" | "agent.manage" | "agent.rename" | "agent.avatar" | "agent.toolPolicy" | "agent.read" | "agent.send" | "computer.list" | "computer.readFile" | "computer.writeFile" | "computer.execute" | "llm.generation" | "media.generation" | "games:servers" | "git.repository" | "apps.open" | "apps.call" | "app.storage" | "app.events.emit" | "team.workbenchHost" | "marketplace.browse" | "marketplace.purchase" | "workflow.run" | "workflow.publish" | "workflow.arm" | "world" | "channels.read" | "channels.personal.manage", unknown>>;
     operation: z.ZodString;
+    effect: z.ZodEnum<{
+        read: "read";
+        write: "write";
+    }>;
 }, z.core.$strict>, z.ZodObject<{
     kind: z.ZodLiteral<"binding">;
     binding: z.ZodPipe<z.ZodUnknown, z.ZodTransform<"BACKGROUND" | "GIT" | "EVENTS" | "APPS" | "WORKFLOWS" | "APP_STORAGE" | "MEDIA" | "COMPUTER" | "INBOX" | "AGENTS", unknown>>;

package/dist/apps/gate.js

@@ -26,6 +26,7 @@ export const gateRequestSchema = z.lazy(() => z.discriminatedUnion("kind", [
         kind: z.literal("capability-route"),
         capability: ownerCodec(appCapabilityIdSchema),
         operation: z.string().min(1),
+        effect: z.enum(["read", "write"]),
     }),
     z.strictObject({
         kind: z.literal("binding"),
@@ -259,6 +260,8 @@ export function admits(facts, rawRequest) {
         case "capability-route": {
             if (visitor)
                 return refusal("visitor_read_only");
+            if (request.effect === "write" && facts.access?.level === "read")
+                return refusal("level_too_low");
             if (!request.operation.startsWith("route:") ||
                 !facts.declaration.capabilities.includes(request.capability) ||
                 facts.declaredOperations.capabilities

package/dist/boot-capability.d.ts

@@ -75,10 +75,11 @@ export declare function issueBootCapability(input: Readonly<{
     ui: BootUi;
     bucket: BootCapabilityBucket;
     capabilities: BootCapabilityStore;
-    expiresAt: number;
+    now: () => number;
 }>): Promise<Readonly<{
     token: string;
     leaseId: string;
+    deadlineAt: number;
 }>>;
 /** What one boot page report needs from its host. */
 export type BootPageReportInput = Readonly<{

package/dist/boot-capability.js

@@ -73,11 +73,14 @@ export async function issueBootCapability(input) {
             throw new BootGateError("ui_mount_failed");
         byteLengths.push(head.size);
     }
+    // Metadata may take longer than the page budget; start the lease only once
+    // every asset has been verified, immediately before issuing it.
+    const deadlineAt = input.now() + BOOT_DEADLINE_MS;
     const lease = {
         id: bootCapabilityIds.lease.generate(),
         identity: input.ui.identity,
         base: input.ui.base,
-        expiresAt: input.expiresAt,
+        expiresAt: deadlineAt + BOOT_TRANSPORT_GRACE_MS,
         assets: capabilityAssets(input.ui.assets, byteLengths),
     };
     validateCapabilityAssetSet(lease);
@@ -87,7 +90,7 @@ export async function issueBootCapability(input) {
         .replace(/=+$/u, "");
     const tokenDigest = createHash("sha256").update(token, "utf8").digest("hex");
     await input.capabilities.issue({ lease, tokenDigest });
-    return { token, leaseId: lease.id };
+    return { token, leaseId: lease.id, deadlineAt };
 }
 /**
  * One UI page check for a Release, for every host, reading no UI bytes:
@@ -102,14 +105,13 @@ export async function reportBootPage(input) {
         return { kind: "passed" };
     if (input.check === null || input.origin === null)
         return { kind: "not_checked", code: "boot_browser_binding_missing" };
-    const deadlineAt = input.now() + BOOT_DEADLINE_MS;
     let issued;
     try {
         issued = await issueBootCapability({
             ui,
             bucket: input.bucket,
             capabilities: input.capabilities,
-            expiresAt: deadlineAt + BOOT_TRANSPORT_GRACE_MS,
+            now: input.now,
         });
     }
     catch (cause) {
@@ -123,7 +125,7 @@ export async function reportBootPage(input) {
             origin: input.origin,
             releaseId: ui.identity.releaseId,
             capability: { header: BOOT_CAPABILITY_HEADER, token: issued.token },
-            deadlineAt,
+            deadlineAt: issued.deadlineAt,
         });
     }
     finally {