@distilled.cloud/fly-io 1.0.0-rc.7 → 1.0.0-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/fly-io",
-  "version": "1.0.0-rc.7",
+  "version": "1.0.0-rc.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -89,22 +89,22 @@
     }
   },
   "dependencies": {
-    "@distilled.cloud/core": "1.0.0-rc.7"
+    "@distilled.cloud/core": "1.0.0-rc.9"
   },
   "devDependencies": {
     "@types/bun": "latest",
     "@types/node": "latest",
-    "@effect/platform-bun": ">=4.0.0-rc.111 || >=4.0.0"
+    "@effect/platform-bun": ">=4.0.0-rc.112 || >=4.0.0"
   },
   "peerDependencies": {
-    "effect": ">=4.0.0-rc.111 || >=4.0.0"
+    "effect": ">=4.0.0-rc.112 || >=4.0.0"
   },
   "scripts": {
     "convert": "bun scripts/convert.ts",
     "generate": "bun scripts/generate.ts",
     "typecheck": "tsc -p tsconfig.json",
     "build": "tsc -b",
-    "specs:fetch": "git submodule update --force --init --recursive --depth=1 specs/distilled-spec-fly-io && git -C specs/distilled-spec-fly-io checkout -- .",
-    "specs:update": "git -C specs/distilled-spec-fly-io fetch && git -C specs/distilled-spec-fly-io checkout main && git -C specs/distilled-spec-fly-io pull"
+    "specs:fetch": "git submodule update --force --init --depth=1 specs/spec-mirror-fly-io",
+    "specs:update": "git submodule update --remote --force --depth=1 specs/spec-mirror-fly-io"
   }
 }

package/src/credentials.ts

@@ -7,7 +7,7 @@
  *
  * Alchemy and `flyctl` read `FLY_API_TOKEN`. `FLY_IO_API_KEY` is kept as a
  * fallback for older distilled consumers. Optional `FLY_API_HOSTNAME`
- * overrides the Machines API root (default `https://api.machines.dev/v1`).
+ * overrides the Machines API host (default `https://api.machines.dev`).
  *
  * Managed REST (MPG), GraphQL add-ons (Tigris, Redis), and Sprites all
  * reuse this token. Sprites never reads a separate env var: the protocol
@@ -20,7 +20,12 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
 
-export const DEFAULT_API_BASE_URL = "https://api.machines.dev/v1";
+/**
+ * Machines API host. The generated Machines routes carry the `/v1` prefix
+ * (`/v1/apps/{app_name}/machines`), as the upstream OpenAPI spells them, so
+ * the base URL must not.
+ */
+export const DEFAULT_API_BASE_URL = "https://api.machines.dev";
 
 /** UI-EX REST + GraphQL host (MPG, Tigris, Redis). Not overridable via an invented env var. */
 export const DEFAULT_FLY_API_BASE_URL = "https://api.fly.io";
@@ -29,17 +34,18 @@ export const DEFAULT_FLY_API_BASE_URL = "https://api.fly.io";
 export const DEFAULT_SPRITES_API_BASE_URL = "https://api.sprites.dev/v1";
 
 /**
- * Normalize a Fly API hostname into the Machines API root.
+ * Normalize a Fly API hostname into the Machines API base URL.
  *
- * - unset / empty → `https://api.machines.dev/v1`
- * - already ends with `/v1` → used as-is (trailing slashes stripped)
- * - otherwise `/v1` is appended
+ * - unset / empty → `https://api.machines.dev`
+ * - trailing slashes stripped
+ * - a trailing `/v1` is dropped: `flyctl` and older consumers set
+ *   `FLY_API_HOSTNAME` to the `/v1` root, and the routes already carry it
  */
 export const normalizeApiBaseUrl = (hostname?: string): string => {
   if (hostname === undefined) return DEFAULT_API_BASE_URL;
   const trimmed = hostname.trim().replace(/\/+$/, "");
   if (trimmed.length === 0) return DEFAULT_API_BASE_URL;
-  return trimmed.endsWith("/v1") ? trimmed : `${trimmed}/v1`;
+  return trimmed.endsWith("/v1") ? trimmed.slice(0, -3) : trimmed;
 };
 
 export interface Config {

package/src/protocol.ts

@@ -3,7 +3,7 @@
  * Sprites REST.
  *
  * Machines (`FlyIoProtocol`) is a plain bearer-token JSON API at
- * `api.machines.dev/v1`. MPG (`FlyApiProtocol`) is the same token against
+ * `api.machines.dev` (routes carry the `/v1` prefix). MPG (`FlyApiProtocol`) is the same token against
  * `https://api.fly.io`. GraphQL add-ons (`FlyGraphqlProtocol`) POST
  * `{ query, operationName, variables }` to `https://api.fly.io/graphql`.
  *
@@ -355,7 +355,7 @@ const discoverOrgSlug = (fly: Config) =>
     const token = Redacted.value(fly.apiKey);
     const machinesRoot = fly.apiBaseUrl.replace(/\/+$/, "");
     const currentReq = HttpClientRequest.make("GET")(
-      `${machinesRoot}/tokens/current`,
+      `${machinesRoot}/v1/tokens/current`,
     ).pipe(
       HttpClientRequest.setHeaders({
         Authorization: `Bearer ${token}`,