@spacefast/common 0.0.3 → 0.0.6

package/dist/contracts/internal.d.ts

@@ -18,8 +18,8 @@ export declare const pendingUploadSchema: z.ZodObject<{
     sourceUrl: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare const uploadSessionModeSchema: z.ZodEnum<{
-    dist: "dist";
     source: "source";
+    dist: "dist";
 }>;
 export declare const uploadTargetSchema: z.ZodObject<{
     path: z.ZodString;
@@ -41,8 +41,8 @@ export declare const uploadTargetSchema: z.ZodObject<{
 export declare const uploadInstructionsSchema: z.ZodObject<{
     id: z.ZodString;
     mode: z.ZodEnum<{
-        dist: "dist";
         source: "source";
+        dist: "dist";
     }>;
     expiresAt: z.ZodString;
     summary: z.ZodObject<{
@@ -90,9 +90,9 @@ export declare const uploadInstructionsSchema: z.ZodObject<{
             message: z.ZodString;
             path: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             provider: z.ZodOptional<z.ZodNullable<z.ZodEnum<{
+                registrar: "registrar";
                 wpcloud: "wpcloud";
                 dns: "dns";
-                registrar: "registrar";
                 runtime: "runtime";
             }>>>;
             details: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>>;

package/dist/contracts/mcp.d.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
 export declare const hostedMcpSessionStatusSchema: z.ZodEnum<{
-    closed: "closed";
-    expired: "expired";
     active: "active";
+    expired: "expired";
+    closed: "closed";
     interrupted: "interrupted";
 }>;
 export declare const hostedMcpWorkspaceSummarySchema: z.ZodObject<{
@@ -22,9 +22,9 @@ export declare const hostedMcpSessionSchema: z.ZodObject<{
         tools: z.ZodString;
     }, z.core.$strip>;
     status: z.ZodEnum<{
-        closed: "closed";
-        expired: "expired";
         active: "active";
+        expired: "expired";
+        closed: "closed";
         interrupted: "interrupted";
     }>;
     metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -77,11 +77,11 @@ export declare const hostedMcpSessionEventSchema: z.ZodObject<{
     createdAt: z.ZodString;
 }, z.core.$strip>;
 export declare const hostedMcpExecutionRunStatusSchema: z.ZodEnum<{
-    completed: "completed";
     failed: "failed";
+    completed: "completed";
+    canceled: "canceled";
     queued: "queued";
     running: "running";
-    canceled: "canceled";
     approval_required: "approval_required";
 }>;
 export declare const hostedMcpExecutionStepSchema: z.ZodObject<{
@@ -104,8 +104,8 @@ export declare const hostedMcpExecutionArtifactSchema: z.ZodObject<{
         warning: "warning";
         resource: "resource";
         summary: "summary";
-        log: "log";
         result: "result";
+        log: "log";
     }>;
     name: z.ZodString;
     mimeType: z.ZodNullable<z.ZodString>;
@@ -120,11 +120,11 @@ export declare const hostedMcpExecutionRunSchema: z.ZodObject<{
     tool: z.ZodString;
     mode: z.ZodNullable<z.ZodString>;
     status: z.ZodEnum<{
-        completed: "completed";
         failed: "failed";
+        completed: "completed";
+        canceled: "canceled";
         queued: "queued";
         running: "running";
-        canceled: "canceled";
         approval_required: "approval_required";
     }>;
     approvalId: z.ZodNullable<z.ZodString>;
@@ -154,8 +154,8 @@ export declare const hostedMcpExecutionRunSchema: z.ZodObject<{
             warning: "warning";
             resource: "resource";
             summary: "summary";
-            log: "log";
             result: "result";
+            log: "log";
         }>;
         name: z.ZodString;
         mimeType: z.ZodNullable<z.ZodString>;
@@ -167,8 +167,8 @@ export declare const hostedMcpExecutionRunSchema: z.ZodObject<{
 export declare const hostedMcpToolPolicySchema: z.ZodObject<{
     tool: z.ZodString;
     runtime: z.ZodEnum<{
-        hosted: "hosted";
         "on-device": "on-device";
+        hosted: "hosted";
         both: "both";
     }>;
     category: z.ZodString;
@@ -191,8 +191,8 @@ export declare const hostedMcpPolicyDefaultsSchema: z.ZodObject<{
     toolPolicies: z.ZodArray<z.ZodObject<{
         tool: z.ZodString;
         runtime: z.ZodEnum<{
-            hosted: "hosted";
             "on-device": "on-device";
+            hosted: "hosted";
             both: "both";
         }>;
         category: z.ZodString;
@@ -257,8 +257,8 @@ export declare const hostedMcpDashboardSchema: z.ZodObject<{
         toolPolicies: z.ZodArray<z.ZodObject<{
             tool: z.ZodString;
             runtime: z.ZodEnum<{
-                hosted: "hosted";
                 "on-device": "on-device";
+                hosted: "hosted";
                 both: "both";
             }>;
             category: z.ZodString;
@@ -285,9 +285,9 @@ export declare const hostedMcpDashboardSchema: z.ZodObject<{
             tools: z.ZodString;
         }, z.core.$strip>;
         status: z.ZodEnum<{
-            closed: "closed";
-            expired: "expired";
             active: "active";
+            expired: "expired";
+            closed: "closed";
             interrupted: "interrupted";
         }>;
         metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -346,11 +346,11 @@ export declare const hostedMcpDashboardSchema: z.ZodObject<{
         tool: z.ZodString;
         mode: z.ZodNullable<z.ZodString>;
         status: z.ZodEnum<{
-            completed: "completed";
             failed: "failed";
+            completed: "completed";
+            canceled: "canceled";
             queued: "queued";
             running: "running";
-            canceled: "canceled";
             approval_required: "approval_required";
         }>;
         approvalId: z.ZodNullable<z.ZodString>;
@@ -380,8 +380,8 @@ export declare const hostedMcpDashboardSchema: z.ZodObject<{
                 warning: "warning";
                 resource: "resource";
                 summary: "summary";
-                log: "log";
                 result: "result";
+                log: "log";
             }>;
             name: z.ZodString;
             mimeType: z.ZodNullable<z.ZodString>;
@@ -422,8 +422,8 @@ export declare const hostedMcpDashboardResponseSchema: z.ZodObject<{
             toolPolicies: z.ZodArray<z.ZodObject<{
                 tool: z.ZodString;
                 runtime: z.ZodEnum<{
-                    hosted: "hosted";
                     "on-device": "on-device";
+                    hosted: "hosted";
                     both: "both";
                 }>;
                 category: z.ZodString;
@@ -450,9 +450,9 @@ export declare const hostedMcpDashboardResponseSchema: z.ZodObject<{
                 tools: z.ZodString;
             }, z.core.$strip>;
             status: z.ZodEnum<{
-                closed: "closed";
-                expired: "expired";
                 active: "active";
+                expired: "expired";
+                closed: "closed";
                 interrupted: "interrupted";
             }>;
             metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -511,11 +511,11 @@ export declare const hostedMcpDashboardResponseSchema: z.ZodObject<{
             tool: z.ZodString;
             mode: z.ZodNullable<z.ZodString>;
             status: z.ZodEnum<{
-                completed: "completed";
                 failed: "failed";
+                completed: "completed";
+                canceled: "canceled";
                 queued: "queued";
                 running: "running";
-                canceled: "canceled";
                 approval_required: "approval_required";
             }>;
             approvalId: z.ZodNullable<z.ZodString>;
@@ -545,8 +545,8 @@ export declare const hostedMcpDashboardResponseSchema: z.ZodObject<{
                     warning: "warning";
                     resource: "resource";
                     summary: "summary";
-                    log: "log";
                     result: "result";
+                    log: "log";
                 }>;
                 name: z.ZodString;
                 mimeType: z.ZodNullable<z.ZodString>;
@@ -570,9 +570,9 @@ export declare const hostedMcpCloseSessionResponseSchema: z.ZodObject<{
             tools: z.ZodString;
         }, z.core.$strip>;
         status: z.ZodEnum<{
-            closed: "closed";
-            expired: "expired";
             active: "active";
+            expired: "expired";
+            closed: "closed";
             interrupted: "interrupted";
         }>;
         metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -636,9 +636,9 @@ export declare const hostedMcpSessionEventsResponseSchema: z.ZodObject<{
                 tools: z.ZodString;
             }, z.core.$strip>;
             status: z.ZodEnum<{
-                closed: "closed";
-                expired: "expired";
                 active: "active";
+                expired: "expired";
+                closed: "closed";
                 interrupted: "interrupted";
             }>;
             metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -676,11 +676,11 @@ export declare const hostedMcpExecutionRunsResponseSchema: z.ZodObject<{
             tool: z.ZodString;
             mode: z.ZodNullable<z.ZodString>;
             status: z.ZodEnum<{
-                completed: "completed";
                 failed: "failed";
+                completed: "completed";
+                canceled: "canceled";
                 queued: "queued";
                 running: "running";
-                canceled: "canceled";
                 approval_required: "approval_required";
             }>;
             approvalId: z.ZodNullable<z.ZodString>;
@@ -710,8 +710,8 @@ export declare const hostedMcpExecutionRunsResponseSchema: z.ZodObject<{
                     warning: "warning";
                     resource: "resource";
                     summary: "summary";
-                    log: "log";
                     result: "result";
+                    log: "log";
                 }>;
                 name: z.ZodString;
                 mimeType: z.ZodNullable<z.ZodString>;
@@ -730,11 +730,11 @@ export declare const hostedMcpExecutionRunResponseSchema: z.ZodObject<{
         tool: z.ZodString;
         mode: z.ZodNullable<z.ZodString>;
         status: z.ZodEnum<{
-            completed: "completed";
             failed: "failed";
+            completed: "completed";
+            canceled: "canceled";
             queued: "queued";
             running: "running";
-            canceled: "canceled";
             approval_required: "approval_required";
         }>;
         approvalId: z.ZodNullable<z.ZodString>;
@@ -764,8 +764,8 @@ export declare const hostedMcpExecutionRunResponseSchema: z.ZodObject<{
                 warning: "warning";
                 resource: "resource";
                 summary: "summary";
-                log: "log";
                 result: "result";
+                log: "log";
             }>;
             name: z.ZodString;
             mimeType: z.ZodNullable<z.ZodString>;
@@ -776,9 +776,7 @@ export declare const hostedMcpExecutionRunResponseSchema: z.ZodObject<{
     }, z.core.$strip>;
 }, z.core.$strip>;
 export type HostedMcpSession = z.infer<typeof hostedMcpSessionSchema>;
-export type HostedMcpWorkspaceSummary = z.infer<typeof hostedMcpWorkspaceSummarySchema>;
 export type HostedMcpApproval = z.infer<typeof hostedMcpApprovalSchema>;
-export type HostedMcpApprovalDecisionRequest = z.infer<typeof hostedMcpApprovalDecisionRequestSchema>;
 export type HostedMcpSessionEvent = z.infer<typeof hostedMcpSessionEventSchema>;
 export type HostedMcpExecutionRun = z.infer<typeof hostedMcpExecutionRunSchema>;
 export type HostedMcpExecutionStep = z.infer<typeof hostedMcpExecutionStepSchema>;

package/dist/contracts/me.d.ts

@@ -2,10 +2,10 @@ import { z } from "zod";
 export declare const meResponseSchema: z.ZodObject<{
     subject: z.ZodObject<{
         type: z.ZodEnum<{
+            team: "team";
             external: "external";
-            user: "user";
             system: "system";
-            team: "team";
+            user: "user";
         }>;
         id: z.ZodString;
     }, z.core.$strip>;
@@ -33,11 +33,11 @@ export declare const meResponseSchema: z.ZodObject<{
         slug: z.ZodNullable<z.ZodString>;
         role: z.ZodNullable<z.ZodString>;
         plan: z.ZodEnum<{
-            personal: "personal";
+            free: "free";
+            internal: "internal";
             work: "work";
+            personal: "personal";
             enterprise: "enterprise";
-            internal: "internal";
-            free: "free";
         }>;
     }, z.core.$strip>>;
     intercom: z.ZodNullable<z.ZodObject<{
@@ -51,11 +51,11 @@ export declare const meResponseSchema: z.ZodObject<{
             company_id: z.ZodString;
             name: z.ZodString;
             plan: z.ZodOptional<z.ZodEnum<{
-                personal: "personal";
+                free: "free";
+                internal: "internal";
                 work: "work";
+                personal: "personal";
                 enterprise: "enterprise";
-                internal: "internal";
-                free: "free";
             }>>;
         }, z.core.$strip>>;
         intercom_user_jwt: z.ZodString;

package/dist/contracts/me.js

@@ -97,7 +97,7 @@ export const meResponseSchema = z.object({
             slug: z.string().nullable().describe("Team slug."),
             source: betaEligibleTeamSourceSchema,
         }))
-            .describe("Teams the user may join via the picker (pending invitation or auto-enroll match)."),
+            .describe("Teams the user may join via the picker (pending invitation, auto-enroll match, or Automattician access)."),
     })
         .describe("Private-beta state. Dashboards key the blocked screen on gateEnabled && !enrolled, " +
         "never on !enrolled alone — else launch-day flag-off would still block people."),

package/dist/contracts/oauth-resources.d.ts

@@ -1,9 +1,8 @@
 export declare const OAUTH_AUTHORIZATION_SERVER_PATH: "/v1/auth";
-export declare const OAUTH_RESOURCE_PATHS: {
-    readonly api: "/v1";
-    readonly mcp: "/mcp";
-};
-export type OAuthResourceKey = keyof typeof OAUTH_RESOURCE_PATHS;
+/** The API resource is a path on the api origin; the MCP resource is the whole
+ * mcp origin (`https://mcp.<domain>`), so it has no path entry here. */
+export declare const OAUTH_API_RESOURCE_PATH: "/v1";
+export type OAuthResourceKey = "api" | "mcp";
 export declare const OAUTH_API_RESOURCE_SCOPES: readonly ["teams:read", "spaces:read", "spaces:write", "publish:write", "domains:read", "domains:write"];
 export declare const OAUTH_MCP_TOOL_SCOPE: "mcp:tools";
 export declare const OAUTH_MCP_RESOURCE_SCOPES: readonly ["mcp:tools", "teams:read", "spaces:read", "spaces:write", "publish:write", "domains:read", "domains:write"];
@@ -11,20 +10,32 @@ export declare const OAUTH_PROVIDER_SCOPES: readonly ["openid", "profile", "emai
 export declare const OAUTH_RESOURCE_DEFINITIONS: {
     readonly api: {
         readonly key: "api";
-        readonly path: "/v1";
         readonly name: "Spacefast API";
         readonly accessTokenTtlSeconds: number;
         readonly allowedScopes: readonly ["teams:read", "spaces:read", "spaces:write", "publish:write", "domains:read", "domains:write"];
     };
     readonly mcp: {
         readonly key: "mcp";
-        readonly path: "/mcp";
         readonly name: "Spacefast MCP";
         readonly accessTokenTtlSeconds: number;
         readonly allowedScopes: readonly ["mcp:tools", "teams:read", "spaces:read", "spaces:write", "publish:write", "domains:read", "domains:write"];
     };
 };
-export declare function oauthResourceUrl(origin: string | URL, resource: OAuthResourceKey): string;
+/** Resource identifier for the public API: `https://api.<domain>/v1`. */
+export declare function oauthApiResourceUrl(apiOrigin: string | URL): string;
+/**
+ * Resource identifier for hosted MCP: the mcp origin itself, in RFC 8707
+ * canonical form (lowercase scheme/host, no trailing slash) — this is the
+ * exact string MCP clients send as the `resource` parameter.
+ */
+export declare function oauthMcpResourceUrl(mcpOrigin: string | URL): string;
+export declare function normalizeOAuthResourceIdentifier(resource: string): string;
+/**
+ * Derive the mcp origin from a configured api origin (`api.X` → `mcp.X`).
+ * Returns null when the api host doesn't follow the `api.` convention
+ * (loopback dev, docker test hosts) — callers fall back to the api origin.
+ */
+export declare function oauthMcpOriginFromApiOrigin(apiOrigin: string | URL): string | null;
 export declare function oauthAuthorizationServerUrl(origin: string | URL): string;
 export declare function oauthTokenEndpointUrl(origin: string | URL): string;
 export declare function oauthResourceKeyForPathname(pathname: string): OAuthResourceKey | null;

package/dist/contracts/oauth-resources.js

@@ -1,8 +1,7 @@
 export const OAUTH_AUTHORIZATION_SERVER_PATH = "/v1/auth";
-export const OAUTH_RESOURCE_PATHS = {
-    api: "/v1",
-    mcp: "/mcp",
-};
+/** The API resource is a path on the api origin; the MCP resource is the whole
+ * mcp origin (`https://mcp.<domain>`), so it has no path entry here. */
+export const OAUTH_API_RESOURCE_PATH = "/v1";
 export const OAUTH_API_RESOURCE_SCOPES = [
     "teams:read",
     "spaces:read",
@@ -27,21 +26,56 @@ export const OAUTH_PROVIDER_SCOPES = [
 export const OAUTH_RESOURCE_DEFINITIONS = {
     api: {
         key: "api",
-        path: OAUTH_RESOURCE_PATHS.api,
         name: "Spacefast API",
         accessTokenTtlSeconds: 15 * 60,
         allowedScopes: OAUTH_API_RESOURCE_SCOPES,
     },
     mcp: {
         key: "mcp",
-        path: OAUTH_RESOURCE_PATHS.mcp,
         name: "Spacefast MCP",
         accessTokenTtlSeconds: 15 * 60,
         allowedScopes: OAUTH_MCP_RESOURCE_SCOPES,
     },
 };
-export function oauthResourceUrl(origin, resource) {
-    return new URL(OAUTH_RESOURCE_PATHS[resource], origin).toString();
+/** Resource identifier for the public API: `https://api.<domain>/v1`. */
+export function oauthApiResourceUrl(apiOrigin) {
+    return new URL(OAUTH_API_RESOURCE_PATH, apiOrigin).toString();
+}
+/**
+ * Resource identifier for hosted MCP: the mcp origin itself, in RFC 8707
+ * canonical form (lowercase scheme/host, no trailing slash) — this is the
+ * exact string MCP clients send as the `resource` parameter.
+ */
+export function oauthMcpResourceUrl(mcpOrigin) {
+    return new URL(mcpOrigin).origin;
+}
+export function normalizeOAuthResourceIdentifier(resource) {
+    const trimmed = resource.trim();
+    if (!trimmed) {
+        return trimmed;
+    }
+    const url = new URL(trimmed);
+    if (!url.search && !url.hash && url.pathname === "/") {
+        return url.origin;
+    }
+    if (!url.search && !url.hash && url.pathname === `${OAUTH_API_RESOURCE_PATH}/`) {
+        url.pathname = OAUTH_API_RESOURCE_PATH;
+        return url.toString();
+    }
+    return url.toString();
+}
+/**
+ * Derive the mcp origin from a configured api origin (`api.X` → `mcp.X`).
+ * Returns null when the api host doesn't follow the `api.` convention
+ * (loopback dev, docker test hosts) — callers fall back to the api origin.
+ */
+export function oauthMcpOriginFromApiOrigin(apiOrigin) {
+    const url = new URL(apiOrigin);
+    if (!url.hostname.startsWith("api.")) {
+        return null;
+    }
+    url.hostname = `mcp.${url.hostname.slice("api.".length)}`;
+    return url.origin;
 }
 export function oauthAuthorizationServerUrl(origin) {
     return new URL(OAUTH_AUTHORIZATION_SERVER_PATH, origin).toString();
@@ -50,11 +84,8 @@ export function oauthTokenEndpointUrl(origin) {
     return new URL(`${OAUTH_AUTHORIZATION_SERVER_PATH}/oauth2/token`, origin).toString();
 }
 export function oauthResourceKeyForPathname(pathname) {
-    if (pathname === OAUTH_RESOURCE_PATHS.mcp) {
-        return "mcp";
-    }
-    if (pathname === OAUTH_RESOURCE_PATHS.api ||
-        pathname.startsWith(`${OAUTH_RESOURCE_PATHS.api}/`)) {
+    if (pathname === OAUTH_API_RESOURCE_PATH ||
+        pathname.startsWith(`${OAUTH_API_RESOURCE_PATH}/`)) {
         return "api";
     }
     return null;

package/dist/contracts/operations.d.ts

@@ -11,10 +11,10 @@ export declare const operationListResponseSchema: z.ZodObject<{
         kind: z.ZodString;
         status: z.ZodEnum<{
             failed: "failed";
+            canceled: "canceled";
             queued: "queued";
             running: "running";
             succeeded: "succeeded";
-            canceled: "canceled";
         }>;
         resources: z.ZodArray<z.ZodObject<{
             type: z.ZodString;
@@ -35,9 +35,9 @@ export declare const operationListResponseSchema: z.ZodObject<{
             message: z.ZodString;
             path: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             provider: z.ZodOptional<z.ZodNullable<z.ZodEnum<{
+                registrar: "registrar";
                 wpcloud: "wpcloud";
                 dns: "dns";
-                registrar: "registrar";
                 runtime: "runtime";
             }>>>;
             details: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>>;

package/dist/contracts/plan-policy.d.ts

@@ -19,8 +19,8 @@ export type PlanDisabledBehavior = z.infer<typeof planDisabledBehaviorSchema>;
 export declare const PlanPolicyResponseSchema: z.ZodObject<{
     principal: z.ZodObject<{
         type: z.ZodEnum<{
-            space: "space";
             site: "site";
+            space: "space";
             team: "team";
             external_principal: "external_principal";
         }>;
@@ -30,10 +30,10 @@ export declare const PlanPolicyResponseSchema: z.ZodObject<{
     spaceId: z.ZodOptional<z.ZodString>;
     plan: z.ZodEnum<{
         free: "free";
-        personal: "personal";
+        internal: "internal";
         work: "work";
+        personal: "personal";
         enterprise: "enterprise";
-        internal: "internal";
     }>;
     limits: z.ZodObject<{
         storageBytes: z.ZodUnion<readonly [z.ZodNumber, z.ZodLiteral<"unlimited">]>;
@@ -59,9 +59,9 @@ export declare const PlanPolicyResponseSchema: z.ZodObject<{
     }, z.core.$strip>>;
     warnings: z.ZodOptional<z.ZodArray<z.ZodObject<{
         severity: z.ZodEnum<{
-            error: "error";
             info: "info";
             warning: "warning";
+            error: "error";
         }>;
         code: z.ZodString;
         message: z.ZodString;