@fungi.computer/oyster 0.6.0 → 0.7.0

package/dist/standalone/workflows.d.ts

@@ -5,10 +5,10 @@ import { GraphWorkflow, type GraphRunEnding, type GraphWorkflowBindings } from "
 import { type GraphReview, type GraphParams, type NodeCall, type NodeEvent, type NodeDispatcher } from "@fungi.computer/braid";
 import { type StandaloneTenancyEnv } from "./tenancy.js";
 import type { AppEventFact } from "@fungi.computer/puffball/app-event-facts";
+import { type ScheduleListInput } from "@fungi.computer/workflows-wire";
 import type { InvocationFacts } from "../invocation.js";
-import type { OysterPrincipal } from "../host.js";
 import type { OysterGitWorkerEnv, OysterGitWorkerHost } from "../workers-git.js";
-import { type TenantScope } from "../tenant.js";
+import { type TenantPrincipal, type TenantScope } from "../tenant.js";
 import type { GitWriter, RepositoryRef } from "@fungi.computer/agar/git";
 import { type WorkflowGitCredential, type WorkflowGitPassGrant } from "@fungi.computer/braid/runtime";
 import { reviewKey, type EventDisarmInput, type WorkflowGitPassRequest, type TriggerArmTarget, type ScheduleDisarmInput } from "./workflow-binding.js";
@@ -86,10 +86,16 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
     } | {
         error: string;
     }>;
-    schedules(facts: InvocationFacts): Promise<{
-        error: string;
-        schedules?: undefined;
+    pauseSchedule(facts: InvocationFacts, input: {
+        scheduleId: string;
+    }): Promise<{
+        kind: "not_found";
     } | {
+        kind: "paused";
+    } | {
+        error: string;
+    }>;
+    schedules(facts: InvocationFacts, input: ScheduleListInput): Promise<{
         schedules: {
             scheduleId: string;
             installationId: string;
@@ -99,7 +105,9 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
             state: "active" | "finished" | "paused" | "cancelled";
             lastError: string | null;
         }[];
-        error?: undefined;
+        nextCursor: string | null;
+    } | {
+        error: string;
     }>;
     armEventTrigger(facts: InvocationFacts, input: TriggerArmTarget): Promise<{
         kind: "armed";
@@ -143,7 +151,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
             runId: string;
             workflowId: string | undefined;
             commit: string | undefined;
-            source: "key" | "manual" | "agent" | "event" | "schedule";
+            source: "key" | "manual" | "agent" | "schedule" | "event";
             initiatedBy: Readonly<{
                 kind: "member";
                 memberId: string;
@@ -162,7 +170,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
             runId: string;
             workflowId: string | undefined;
             commit: string | undefined;
-            source: "key" | "manual" | "agent" | "event" | "schedule";
+            source: "key" | "manual" | "agent" | "schedule" | "event";
             initiatedBy: Readonly<{
                 kind: "member";
                 memberId: string;
@@ -183,7 +191,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
     /** Signed traffic uses the native fetch interface; no sender principal is accepted. */
     fetch(request: Request): Promise<Response>;
     /** Root-authenticated owner RPC; command data cannot nominate an actor or pin. */
-    webhookControl(principal: OysterPrincipal, installationId: string, raw: unknown): Promise<Response>;
+    webhookControl(principal: TenantPrincipal, installationId: string, raw: unknown): Promise<Response>;
     /**
      * The emitting App's Instance delivers each accepted event here. The
      * emitter's live Release must declare the event and its payload schema
@@ -271,13 +279,13 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                 readonly input: {
                     readonly [x: string]: S.Json;
                 };
+                readonly title: string;
                 readonly apps: {
                     readonly [x: string]: {
                         readonly appId: string;
                         readonly role?: string | undefined;
                     };
                 };
-                readonly title: string;
                 readonly nodes: readonly ({
                     readonly id: string;
                     readonly kind: "code";
@@ -315,19 +323,19 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                 } | {
                     readonly id: string;
                     readonly kind: "review";
-                    readonly timeout: number;
                     readonly title: string;
+                    readonly timeout: number;
                     readonly reviewers: "runner" | "owners";
                     readonly show: readonly {
                         readonly node: string;
                         readonly port: string;
                     }[];
+                    readonly detail?: string | undefined;
                     readonly choices?: readonly {
                         readonly label: string;
                         readonly id: string;
                         readonly description?: string | undefined;
                     }[] | undefined;
-                    readonly detail?: string | undefined;
                 } | {
                     readonly id: string;
                     readonly kind: "condition";
@@ -412,19 +420,19 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                         } | {
                             readonly id: string;
                             readonly kind: "review";
-                            readonly timeout: number;
                             readonly title: string;
+                            readonly timeout: number;
                             readonly reviewers: "runner" | "owners";
                             readonly show: readonly {
                                 readonly node: string;
                                 readonly port: string;
                             }[];
+                            readonly detail?: string | undefined;
                             readonly choices?: readonly {
                                 readonly label: string;
                                 readonly id: string;
                                 readonly description?: string | undefined;
                             }[] | undefined;
-                            readonly detail?: string | undefined;
                         } | {
                             readonly id: string;
                             readonly kind: "condition";
@@ -477,10 +485,10 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                 readonly triggers?: readonly ({
                     readonly id: string;
                     readonly on: "webhook";
+                    readonly when?: import("@fungi.computer/braid").Predicate | undefined;
                     readonly input?: {
                         readonly [x: string]: import("@fungi.computer/braid").Mapping;
                     } | undefined;
-                    readonly when?: import("@fungi.computer/braid").Predicate | undefined;
                     readonly title?: string | undefined;
                 } | {
                     readonly id: string;
@@ -495,14 +503,14 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                     readonly title?: string | undefined;
                 } | {
                     readonly id: string;
+                    readonly app: string;
                     readonly on: "event";
                     readonly event: string;
-                    readonly app: string;
                     readonly eventDigest: string;
+                    readonly when?: import("@fungi.computer/braid").Predicate | undefined;
                     readonly input?: {
                         readonly [x: string]: import("@fungi.computer/braid").Mapping;
                     } | undefined;
-                    readonly when?: import("@fungi.computer/braid").Predicate | undefined;
                     readonly repository?: import("@fungi.computer/braid").Mapping | undefined;
                     readonly title?: string | undefined;
                 })[] | undefined;
@@ -581,7 +589,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
             readonly title: string;
             readonly status?: {
                 readonly label: string;
-                readonly tone: "success" | "error" | "info" | "warning" | "neutral" | "primary" | "secondary" | "accent";
+                readonly tone: "success" | "error" | "neutral" | "primary" | "secondary" | "accent" | "info" | "warning";
             } | undefined;
             readonly media?: {
                 readonly path: string;
@@ -594,7 +602,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                 }[];
             } | undefined;
             readonly detail?: string | undefined;
-            readonly tone?: "error" | "running" | "settled" | "attention" | "muted" | undefined;
+            readonly tone?: "error" | "attention" | "running" | "settled" | "muted" | undefined;
         } | undefined;
     } | {
         readonly kind: "refused";
@@ -628,8 +636,8 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
         outcome: "active" | "terminal" | "cancelled" | null;
         events: readonly {
             readonly runId: string;
-            readonly state: "skipped" | "queued" | "running" | "failed" | "complete" | "waiting";
             readonly nodeId: string;
+            readonly state: "failed" | "running" | "complete" | "skipped" | "queued" | "waiting";
             readonly iteration: string;
             readonly attempt: number;
             readonly output?: {
@@ -647,7 +655,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                 readonly title: string;
                 readonly status?: {
                     readonly label: string;
-                    readonly tone: "success" | "error" | "info" | "warning" | "neutral" | "primary" | "secondary" | "accent";
+                    readonly tone: "success" | "error" | "neutral" | "primary" | "secondary" | "accent" | "info" | "warning";
                 } | undefined;
                 readonly media?: {
                     readonly path: string;
@@ -660,7 +668,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                     }[];
                 } | undefined;
                 readonly detail?: string | undefined;
-                readonly tone?: "error" | "running" | "settled" | "attention" | "muted" | undefined;
+                readonly tone?: "error" | "attention" | "running" | "settled" | "muted" | undefined;
             } | undefined;
             readonly graphId?: string | undefined;
             readonly poll?: number | undefined;
@@ -693,7 +701,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
             openedAt: number;
             expiresAt: number;
         }[];
-        status: "unknown" | "paused" | "queued" | "running" | "errored" | "terminated" | "complete" | "waiting" | "waitingForPause";
+        status: "unknown" | "running" | "complete" | "paused" | "queued" | "errored" | "terminated" | "waiting" | "waitingForPause";
         output: {} | null;
         error: {
             name: string;
@@ -712,15 +720,15 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
         reason: string;
     }>;
     /** Host-only MCP control reopens the configured owner's authority on every call. */
-    control(principal: OysterPrincipal, operation: "status" | "cancel", runId: string): Promise<{
+    control(principal: TenantPrincipal, operation: "status" | "cancel", runId: string): Promise<{
         runId: string;
         planDigest: string;
         title: string;
         outcome: "active" | "terminal" | "cancelled" | null;
         events: readonly {
             readonly runId: string;
-            readonly state: "skipped" | "queued" | "running" | "failed" | "complete" | "waiting";
             readonly nodeId: string;
+            readonly state: "failed" | "running" | "complete" | "skipped" | "queued" | "waiting";
             readonly iteration: string;
             readonly attempt: number;
             readonly output?: {
@@ -738,7 +746,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                 readonly title: string;
                 readonly status?: {
                     readonly label: string;
-                    readonly tone: "success" | "error" | "info" | "warning" | "neutral" | "primary" | "secondary" | "accent";
+                    readonly tone: "success" | "error" | "neutral" | "primary" | "secondary" | "accent" | "info" | "warning";
                 } | undefined;
                 readonly media?: {
                     readonly path: string;
@@ -751,7 +759,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
                     }[];
                 } | undefined;
                 readonly detail?: string | undefined;
-                readonly tone?: "error" | "running" | "settled" | "attention" | "muted" | undefined;
+                readonly tone?: "error" | "attention" | "running" | "settled" | "muted" | undefined;
             } | undefined;
             readonly graphId?: string | undefined;
             readonly poll?: number | undefined;
@@ -784,7 +792,7 @@ export declare abstract class StandaloneWorkflowRunsBase<Env extends StandaloneW
             openedAt: number;
             expiresAt: number;
         }[];
-        status: "unknown" | "paused" | "queued" | "running" | "errored" | "terminated" | "complete" | "waiting" | "waitingForPause";
+        status: "unknown" | "running" | "complete" | "paused" | "queued" | "errored" | "terminated" | "waiting" | "waitingForPause";
         output: {} | null;
         error: {
             name: string;

package/dist/standalone/workflows.js

@@ -11,7 +11,7 @@ import { createStandaloneWorkflowEvents, } from "./workflow-events.js";
 import { createStandaloneWorkflowTriggerHost, standaloneTriggerErrors, } from "./workflow-trigger-host.js";
 import { createWorkflowPublishedDefinitionPort, readPublishedWorkflow, } from "@fungi.computer/workflows-wire";
 import { workflowAgentAuthority } from "../workflow-agent-authority.js";
-import { defaultTenant, tenantScope } from "../tenant.js";
+import { defaultTenant, tenantScope, } from "../tenant.js";
 import { AppInstanceError } from "../index.js";
 import { createWorkflowGitPasses, createWorkflowGitPassStore, workflowGitPassWriter, workflowRunReport, wireRunInitiator, } from "@fungi.computer/braid/runtime";
 import { canonicalJson } from "@fungi.computer/braid";
@@ -403,8 +403,11 @@ export class StandaloneWorkflowRunsBase extends DurableObject {
     async disarmSchedule(facts, input) {
         return (await this.library(facts, "disarmSchedule")).schedules.disarm(facts, input);
     }
-    async schedules(facts) {
-        return (await this.library(facts, "schedules")).schedules.list(facts);
+    async pauseSchedule(facts, input) {
+        return (await this.library(facts, "pauseSchedule")).schedules.pause(facts, input);
+    }
+    async schedules(facts, input) {
+        return (await this.library(facts, "schedules")).schedules.list(facts, input);
     }
     async armEventTrigger(facts, input) {
         return (await this.library(facts, "armEventTrigger")).events.arm(facts, input);

package/dist/storage-frame.d.ts

@@ -8,7 +8,7 @@ export declare const storageFrameMethods: {
                 readonly kind: "accepted";
                 readonly value: {
                     readonly value: Schema.Json;
-                    readonly source: "member" | "team" | "none";
+                    readonly source: "team" | "member" | "none";
                     readonly team: {
                         readonly value: Schema.Json;
                         readonly revision: number;
@@ -21,7 +21,7 @@ export declare const storageFrameMethods: {
                 };
             } | {
                 readonly kind: "rejected";
-                readonly code: "unavailable" | "conflict" | "invalid" | "undeclared_key" | "scope_not_declared" | "owner_required" | "too_large" | "quota_exceeded";
+                readonly code: "unavailable" | "invalid" | "conflict" | "undeclared_key" | "scope_not_declared" | "owner_required" | "too_large" | "quota_exceeded";
             };
             requiredOperations: () => string[];
         };
@@ -29,7 +29,7 @@ export declare const storageFrameMethods: {
             decodeArgs: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => readonly [{
                 readonly value: Schema.Json;
                 readonly key: string;
-                readonly scope: "member" | "team";
+                readonly scope: "team" | "member";
                 readonly basedOn: number | null;
             }];
             decodeResult: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => {
@@ -39,14 +39,14 @@ export declare const storageFrameMethods: {
                 };
             } | {
                 readonly kind: "rejected";
-                readonly code: "unavailable" | "conflict" | "invalid" | "undeclared_key" | "scope_not_declared" | "owner_required" | "too_large" | "quota_exceeded";
+                readonly code: "unavailable" | "invalid" | "conflict" | "undeclared_key" | "scope_not_declared" | "owner_required" | "too_large" | "quota_exceeded";
             };
             requiredOperations: () => string[];
         };
         reset: {
             decodeArgs: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => readonly [{
                 readonly key: string;
-                readonly scope: "member" | "team";
+                readonly scope: "team" | "member";
                 readonly basedOn: number | null;
             }];
             decodeResult: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => {
@@ -56,7 +56,7 @@ export declare const storageFrameMethods: {
                 };
             } | {
                 readonly kind: "rejected";
-                readonly code: "unavailable" | "conflict" | "invalid" | "undeclared_key" | "scope_not_declared" | "owner_required" | "too_large" | "quota_exceeded";
+                readonly code: "unavailable" | "invalid" | "conflict" | "undeclared_key" | "scope_not_declared" | "owner_required" | "too_large" | "quota_exceeded";
             };
             requiredOperations: () => string[];
         };

package/dist/testing/capabilities.d.ts

@@ -1,4 +1,3 @@
-import { Hono } from "hono";
 import { type AppCapabilityId } from "@fungi.computer/puffball/app";
 import { type OysterAgents } from "../agents.js";
 import type { LiveOysterKey } from "../keys.js";
@@ -16,16 +15,18 @@ export type CapabilityFixtureOptions = Readonly<{
     fileSource?: FileSource;
     /** `false` clears the owner's approval after install. */
     admitted?: boolean;
-    /** Serve a public installation to an anonymous visitor. */
-    visitor?: boolean;
     authenticate?: (request: Request) => Promise<OysterAuthResult>;
     agents?: OysterAgents;
     liveKey?: (keyId: string) => Promise<LiveOysterKey | null>;
 }>;
 /** One Oyster host with a single installation whose capability grants the options shape. */
 export declare function capabilityFixture(options?: CapabilityFixtureOptions): Promise<{
-    app: Hono<import("../host.js").OysterEnv, import("hono/types").BlankSchema, "/">;
-    page: () => Response | Promise<Response>;
-    request: () => Response | Promise<Response>;
+    app: Readonly<{
+        fetch: (request: Request<unknown, CfProperties<unknown>>, env?: unknown, executionCtx?: import("hono").ExecutionContext | undefined) => Promise<Response>;
+        request: (input: string | Request<unknown, CfProperties<unknown>> | URL, requestInit?: RequestInit<CfProperties<unknown>> | undefined, Env?: unknown, executionCtx?: import("hono").ExecutionContext | undefined) => Promise<Response>;
+        servedPaths: () => readonly string[];
+    }>;
+    page: () => Promise<Response>;
+    request: () => Promise<Response>;
     removeDeclaration(): Promise<void>;
 }>;

package/dist/testing/capabilities.js

@@ -1,4 +1,4 @@
-import { Hono } from "hono";
+import { computer, routes as routeTable } from "../authorization.js";
 import * as Schema from "effect/Schema";
 import { releaseSchema } from "@fungi.computer/puffball/effect";
 import { parseArtifactRef, parseSha256Digest } from "@fungi.computer/puffball";
@@ -43,7 +43,7 @@ export async function capabilityFixture(options = {}) {
             },
         });
     }
-    const routes = new Hono().post("/list", (context) => context.json({ entries: [] }));
+    const routes = routeTable().post("/list", computer(), (context) => context.json({ entries: [] }));
     const capabilities = options.adapters ??
         (options.fileSource
             ? fileCapabilities(options.fileSource)
@@ -80,16 +80,13 @@ export async function capabilityFixture(options = {}) {
                 approval: null,
             },
         };
-    // An anonymous reader reaches only a public App, as the host's visitor.
-    if (options.visitor)
-        installation = { ...installation, visibility: "public" };
     const readOnly = () => Promise.reject(new Error("Fixture installations are read-only"));
     let base = {
         bootUi: () => Promise.resolve({ kind: "passed" }),
         auth: {
             resolve: () => Promise.reject(new Error("Capability fixture resolves no actor")),
             authenticate: options.authenticate ??
-                ((request) => Promise.resolve(options.visitor || request.headers.get("x-who") === "visitor"
+                ((request) => Promise.resolve(request.headers.get("x-who") === "anonymous"
                     ? { kind: "refused", status: 401 }
                     : {
                         kind: "admitted",

package/dist/testing/installation.d.ts

@@ -7,5 +7,4 @@ export declare function approvedInstallation(input: Readonly<{
     installationId: string;
     instanceId: Installation["instanceId"];
     descriptors?: readonly CapabilityOperationDescriptor[];
-    visibility?: Installation["visibility"];
 }>): Promise<Installation>;

package/dist/testing/installation.js

@@ -30,7 +30,7 @@ export async function approvedInstallation(input) {
         grant: { operations, resources: "tenant-scope" },
     }));
     if (changes.length === 0)
-        return { ...installed, visibility: input.visibility ?? "private" };
+        return installed;
     const approved = applyInstallationCommand(installed, { kind: "change-grants", changes }, {
         by: { kind: "member", memberId: "fixture-owner" },
         role: "owner",
@@ -42,8 +42,5 @@ export async function approvedInstallation(input) {
     });
     if (Result.isFailure(approved))
         throw new Error(approved.failure.code);
-    return {
-        ...approved.success.next,
-        visibility: input.visibility ?? "private",
-    };
+    return approved.success.next;
 }

package/dist/workers-git.d.ts

@@ -6,7 +6,6 @@ import { type OysterTenancy, type ResolvedTenant, type TenantScope } from "./ten
  */
 import { DurableObject } from "cloudflare:workers";
 import { type InvocationFrame } from "./invocation.js";
-import { Hono } from "hono";
 import { type GitBinding } from "@fungi.computer/agar/git";
 import { type GitDoorTarget, type StandardWebhookPayload } from "./git.js";
 import { type KeyStore } from "@fungi.computer/ear-tag/keys";
@@ -17,6 +16,7 @@ import { type ArtifactsNamespace } from "@fungi.computer/burrow";
 import { type HostEventSource, type HostRecipientEvent, type RecipientDelivery } from "./event-recipients.js";
 export type { HostEventSource, HostRecipientEvent, RecipientDelivery, } from "./event-recipients.js";
 import { type OysterAuth, type OysterCapability, type OysterEnv, type OysterGitHost, type OysterHost } from "./host.js";
+import { type Routes } from "./authorization.js";
 import type { GitWriter } from "@fungi.computer/agar/git";
 import { OysterInstance, type OysterBindingContext, type OysterBindingRow, type OysterBindingTable, type OysterWorkspace, type OysterWorkerEnv, type OysterInvocationHost } from "./workers.js";
 /** The GIT binding plus the credential only the host's git door may use. */
@@ -167,7 +167,7 @@ declare const OysterBinding_base: abstract new (ctx: ExecutionContext, env: Oyst
 export declare class OysterBinding extends OysterBinding_base {
 }
 /** Owner routes for keys and webhooks; `createOyster` mounts them owner-only. */
-export declare function gitAdminRoutes(env: OysterGitEnv, scope: TenantScope): Hono<OysterEnv>;
+export declare function gitAdminRoutes(env: OysterGitEnv, scope: TenantScope): Routes<OysterEnv>;
 /** A standalone Oyster Worker that also hosts git Apps. */
 export type OysterGitWorkerEnv = OysterWorkerEnv & OysterGitEnv & Readonly<{
     /** This Oyster's public origin, for clone URLs (e.g. https://oyster.example). */
@@ -191,6 +191,8 @@ export declare abstract class OysterGitInstance<Env extends OysterGitWorkerEnv =
  * `oysterGitRoot(options).hostFor`.
  */
 export type OysterGitWorkerOptions<Env extends OysterGitWorkerEnv> = Readonly<{
+    /** Picker facts through this host's existing, owner-admitted directories. */
+    permissionResources?: (env: Env, scope: TenantScope) => NonNullable<OysterHost["permissionResources"]>;
     /** Host-owned fleet control, admitted on every invocation by its durable owner. */
     computerControl?: (env: Env, scope: TenantScope) => NonNullable<OysterHost["computerControl"]>;
     /** Workflow controls supplied by the host's existing run owner. */
@@ -216,7 +218,7 @@ export type OysterGitWorkerOptions<Env extends OysterGitWorkerEnv> = Readonly<{
         auth: OysterAuth;
     }>) => OysterWorkspace | Promise<OysterWorkspace>;
     /** Additional capabilities share the exact workspace selected for the base host. */
-    capabilities?: (env: Env, workspace: OysterWorkspace, keysLive: OysterKeysLivePort) => readonly OysterCapability[];
+    capabilities?: (env: Env, workspace: OysterWorkspace) => readonly OysterCapability[];
     /** Admit a presented Workflow Git credential for one repository and scope;
      * omit when this host issues no Workflow Git credentials. */
     workflowGitPass?: (env: Env, scope: TenantScope, pass: string, target: GitDoorTarget) => Promise<Extract<GitWriter, {
@@ -227,7 +229,7 @@ export type OysterGitWorkerOptions<Env extends OysterGitWorkerEnv> = Readonly<{
         kind: "actor";
     }> | null>;
     /** Further owner-only routes this host serves, after the owner guard. */
-    ownerRoutes?: (env: Env, scope: TenantScope) => Hono<OysterEnv>;
+    ownerRoutes?: (env: Env, scope: TenantScope) => Routes<OysterEnv>;
 }>;
 /** A tenant's whole Git host: the App server, `host.git` and the owner routes. */
 export type OysterGitWorkerHost = OysterHost & Readonly<{
@@ -278,5 +280,11 @@ export declare function oysterWorkerGit<Env extends OysterGitWorkerEnv>(env: Env
  * `oysterGitRoot(options).hostFor`; a cold directory passes its own resolved tenant.
  */
 export declare function oysterGitWorkerHost<Env extends OysterGitWorkerEnv>(env: Env, options: OysterGitWorkerOptions<Env>, selected: ResolvedTenant, request?: Request): Promise<OysterGitWorkerHost>;
+/**
+ * A Git host's whole owner table: keys and webhooks, the root's own owner
+ * routes, and Agent approval and MCP server custody. The host and the
+ * authorization law both compose it here.
+ */
+export declare function oysterGitOwnerRoutes(env: OysterGitEnv, scope: TenantScope, hostOwnerRoutes: Routes<OysterEnv> | undefined, agents: OysterAgents | undefined): Routes<OysterEnv>;
 /** Deploy the MCP owner from the same root as createOysterGitWorker. */
 export declare function createOysterGitMcpOwner<Env extends OysterGitWorkerEnv>(root: OysterGitRoot<Env>): new (ctx: DurableObjectState, env: Env) => import("./mcp-owner.js").OysterMcpOwner<Env>;

package/dist/workers-git.js

@@ -13,7 +13,6 @@ import { APP_INVOCATION_CEILING_MS, invocationFacts, invocationCallerContext, }
 import { AppInstanceError, selectionOf } from "./index.js";
 import { ownerOrKeyAuth } from "./auth.js";
 import { causeClass } from "./cause-class.js";
-import { Hono } from "hono";
 import { HTTPException } from "hono/http-exception";
 import * as Schema from "effect/Schema";
 import { defineIdFamily } from "@fungi.computer/cairn";
@@ -26,7 +25,8 @@ import { agentCapabilities, agentApprovalRoutes, agentMcpServerRoutes, } from ".
 import { createArtifactsRestNamespace, } from "@fungi.computer/burrow";
 import { attemptWebhook } from "./webhook-delivery.js";
 import { createRecipientDeliveries, } from "./event-recipients.js";
-import { createOyster, oysterPrincipalIsOwner, } from "./host.js";
+import { createOyster, } from "./host.js";
+import { oysterPrincipalIsOwner, owner as ownerRoute, routes as routeTable, } from "./authorization.js";
 import { OysterInstance, oysterBindingEntrypoint, oysterBindings, oysterWorkerHost, r2FileSource, r2ArtifactStore, serveOysterBootCapability, } from "./workers.js";
 import { registryInstallations } from "./internal/registry-installations.js";
 import { refuseOlderOysterStore } from "./older-oyster-store-refusal.js";
@@ -763,36 +763,29 @@ const subscribeSchema = Schema.Struct({
     secret: Schema.optional(Schema.String.check(Schema.isMinLength(16))),
 });
 const keyNamePattern = /^[a-z0-9][a-z0-9-]{0,39}$/u;
-/** `invocation.ts:486` uses `team-key:visitor` for anonymous readers; a key can never claim that name. */
-const reservedKeyName = "visitor";
 const keysWire = keyWire(oysterKeyVocabulary);
 /** Owner routes for keys and webhooks; `createOyster` mounts them owner-only. */
 export function gitAdminRoutes(env, scope) {
-    const routes = new Hono();
+    const routes = routeTable();
     const keys = () => env.KEYS.getByName(scope.durableName("keys"));
-    routes.get("/api/keys", async (context) => {
-        const owner = context.get("principal");
-        if (!oysterPrincipalIsOwner(owner))
-            return Response.json({ error: "Owner only" }, { status: 403 });
-        const listed = await keys().list(owner.actor.memberId);
+    // Key and webhook custody is the owner's own, never through an App.
+    const owner = ownerRoute("direct");
+    routes.get("/api/keys", owner, async (_context, { principal }) => {
+        const listed = await keys().list(principal.actor.memberId);
         if (listed.kind === "error")
             return Response.json({ error: listed.error.code }, { status: 500 });
         return Response.json({ keys: listed.value.map(keysWire.toSummary) });
     });
-    routes.post("/api/keys", async (context) => {
+    routes.post("/api/keys", owner, async (context, { principal }) => {
         const body = keysWire.issue.safeParse(await context.req.json());
         if (!body.success)
             return Response.json({ error: "Invalid key" }, { status: 400 });
         // Named identities and rate policy belong to this host, not the wire grammar.
         if (!keyNamePattern.test(body.data.name) ||
-            body.data.name === reservedKeyName ||
             body.data.keyId !== undefined ||
             body.data.rateLimit !== undefined)
             return Response.json({ error: "Invalid key name" }, { status: 400 });
-        const owner = context.get("principal");
-        if (!oysterPrincipalIsOwner(owner))
-            return Response.json({ error: "Owner only" }, { status: 403 });
-        const issued = await keys().issue(owner.actor.memberId, {
+        const issued = await keys().issue(principal.actor.memberId, {
             name: body.data.name,
             grants: body.data.grants,
             expiresAt: body.data.expiresAt,
@@ -804,19 +797,16 @@ export function gitAdminRoutes(env, scope) {
             key: keysWire.toSummary(issued.value.record),
         }, { status: 201 });
     });
-    routes.post("/api/keys/revoke", async (context) => {
+    routes.post("/api/keys/revoke", owner, async (context, { principal }) => {
         const body = keysWire.revoke.safeParse(await context.req.json());
         if (!body.success)
             return Response.json({ error: "Invalid request" }, { status: 400 });
-        const owner = context.get("principal");
-        if (!oysterPrincipalIsOwner(owner))
-            return Response.json({ error: "Owner only" }, { status: 403 });
-        const revoked = await keys().revoke(owner.actor.memberId, body.data.requestId, body.data.keyId);
+        const revoked = await keys().revoke(principal.actor.memberId, body.data.requestId, body.data.keyId);
         if (revoked.kind === "error")
             return Response.json({ error: revoked.error.code }, { status: revoked.error.code === "denied" ? 404 : 400 });
         return Response.json({ key: keysWire.toSummary(revoked.value) });
     });
-    routes.post("/api/webhooks", async (context) => {
+    routes.post("/api/webhooks", owner, async (context) => {
         const body = Schema.decodeUnknownOption(subscribeSchema)(await context.req.json());
         if (body._tag === "None")
             return Response.json({ error: "Invalid subscription" }, { status: 400 });
@@ -825,9 +815,9 @@ export function gitAdminRoutes(env, scope) {
             types: body.value.types ?? [],
         }), { status: 201 });
     });
-    routes.get("/api/webhooks", async () => Response.json(await env.WEBHOOKS.getByName(scope.durableName("webhooks")).subscriptions()));
-    routes.get("/api/webhooks/:id/deliveries", async (context) => Response.json(await env.WEBHOOKS.getByName(scope.durableName("webhooks")).deliveries(context.req.param("id"))));
-    routes.delete("/api/webhooks/:id", async (context) => (await env.WEBHOOKS.getByName(scope.durableName("webhooks")).unsubscribe(context.req.param("id")))
+    routes.get("/api/webhooks", owner, async () => Response.json(await env.WEBHOOKS.getByName(scope.durableName("webhooks")).subscriptions()));
+    routes.get("/api/webhooks/:id/deliveries", owner, async (context) => Response.json(await env.WEBHOOKS.getByName(scope.durableName("webhooks")).deliveries(context.req.param("id"))));
+    routes.delete("/api/webhooks/:id", owner, async (context) => (await env.WEBHOOKS.getByName(scope.durableName("webhooks")).unsubscribe(context.req.param("id")))
         ? new Response(null, { status: 204 })
         : Response.json({ error: "Not found" }, { status: 404 }));
     return routes;
@@ -1136,8 +1126,8 @@ export async function oysterGitWorkerHost(env, options, selected, request) {
     const base = oysterWorkerHost(env, auth, policyOptions);
     const capabilities = [
         ...(base.capabilities ?? []),
-        ...(agents === undefined ? [] : agentCapabilities(agents, keysLive)),
-        ...(options.capabilities?.(env, workspace, keysLive) ?? []),
+        ...(agents === undefined ? [] : agentCapabilities(agents)),
+        ...(options.capabilities?.(env, workspace) ?? []),
     ];
     let gitOptions = { scope };
     if (options.workflowGitPass !== undefined)
@@ -1145,14 +1135,7 @@ export async function oysterGitWorkerHost(env, options, selected, request) {
     if (options.buildGitPass !== undefined)
         gitOptions = { ...gitOptions, buildGitPass: options.buildGitPass };
     const git = oysterWorkerGit(env, gitOptions);
-    const ownerRoutes = gitAdminRoutes(env, scope);
-    const hostOwnerRoutes = options.ownerRoutes?.(env, scope);
-    if (hostOwnerRoutes !== undefined)
-        ownerRoutes.route("/", hostOwnerRoutes);
-    if (agents !== undefined) {
-        ownerRoutes.route("/", agentApprovalRoutes(agents));
-        ownerRoutes.route("/", agentMcpServerRoutes(agents));
-    }
+    const ownerRoutes = oysterGitOwnerRoutes(env, scope, options.ownerRoutes?.(env, scope), agents);
     let host = {
         ...base,
         capabilities,
@@ -1168,8 +1151,28 @@ export async function oysterGitWorkerHost(env, options, selected, request) {
         host = { ...host, computerControl: options.computerControl(env, scope) };
     if (options.homeInstallationId !== undefined)
         host = { ...host, homeInstallationId: options.homeInstallationId(env) };
+    if (options.permissionResources !== undefined)
+        host = {
+            ...host,
+            permissionResources: options.permissionResources(env, scope),
+        };
     return host;
 }
+/**
+ * A Git host's whole owner table: keys and webhooks, the root's own owner
+ * routes, and Agent approval and MCP server custody. The host and the
+ * authorization law both compose it here.
+ */
+export function oysterGitOwnerRoutes(env, scope, hostOwnerRoutes, agents) {
+    const ownerRoutes = gitAdminRoutes(env, scope);
+    if (hostOwnerRoutes !== undefined)
+        ownerRoutes.include(hostOwnerRoutes);
+    if (agents !== undefined) {
+        ownerRoutes.include(agentApprovalRoutes(agents));
+        ownerRoutes.include(agentMcpServerRoutes(agents));
+    }
+    return ownerRoutes;
+}
 /**
  * Authenticate against the pinned tenant. A request admitted at the Worker's
  * top reuses that one admission; any other entry resolves its own.