alchemy 2.0.0-beta.84 → 2.0.0-beta.85

package/lib/Cli/main.js

@@ -1,4 +1,4 @@
-import { AlchemyContextLive } from "alchemy/AlchemyContext";
+import { AlchemyContext, AlchemyContextLive } from "alchemy/AlchemyContext";
 import { ArtifactStore, createArtifactStore } from "alchemy/Artifacts";
 import { CredentialsStoreLive } from "alchemy/Auth/Credentials";
 import { ProfileStoreLive } from "alchemy/Auth/Profile";
@@ -6,22 +6,28 @@ import * as Contributions from "alchemy/Contributions";
 import { TelemetryLive } from "alchemy/Telemetry/Layer";
 import { moduleExtension } from "alchemy/Util/Node";
 import { PlatformServices } from "alchemy/Util/PlatformServices";
-import * as Cause from "effect/Cause";
 import * as CliConfig from "effect/cli/CliConfig";
 import * as CliError from "effect/cli/CliError";
 import * as Command from "effect/cli/Command";
 import * as Flag from "effect/cli/Flag";
 import * as GlobalFlag from "effect/cli/GlobalFlag";
 import * as ConfigProvider from "effect/ConfigProvider";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as FetchHttpClient from "effect/http/FetchHttpClient";
+import * as HttpClient from "effect/http/HttpClient";
 import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
+import * as Scope from "effect/Scope";
 import packageJson from "../../package.json" with { type: "json" };
+import * as Interaction from "../Interaction.js";
+import { logShutdown } from "../Util/Shutdown.js";
 import { checkLatestVersion } from "./checkVersion.js";
-import * as CliKit from "./CliKit/index.js";
 import { compatibilityCommand, compatibilityCommands, } from "./commands/compat.js";
 import { handleCliErrors } from "./commands/errors.js";
-import { GlobalLogLive, logRunHeader } from "./GlobalLog.js";
+import { VersionCheck } from "./commands/instrument.js";
+import { GlobalLogLive, LogFormatFlag, LogLevelFlag } from "./GlobalLog.js";
 import { selectCliServices } from "./selectCli.js";
 const commandMetadata = [
     ["provider", "Manage cloud provider prerequisites and utilities"],
@@ -80,7 +86,7 @@ const requestedCommand = argv.find((value) => commandNames.has(value));
 const loadEveryCommand = argv.includes("--completions");
 const commands = await Promise.all(commandMetadata.map(([name, description]) => loadEveryCommand || name === requestedCommand
     ? loadCommand(name)
-    : placeholderCommand(name, description)));
+    : Promise.resolve(placeholderCommand(name, description))));
 /**
  * `--no-input` forces plain, prompt-free output regardless of TTY or env
  * detection. The value is read via an argv scan in `Util/interactive.ts`
@@ -90,6 +96,15 @@ const commands = await Promise.all(commandMetadata.map(([name, description]) =>
 const NoInput = GlobalFlag.Setting("no-input")({
     flag: Flag.Boolean("no-input").pipe(Flag.withDescription("Disable prompts and the interactive TUI (plain output; commands needing input fail)"), Flag.withDefault(false)),
 });
+/**
+ * `--fast-distilled` loads distilled SDKs through their lazy service stubs
+ * under Node. The launcher (`bin/cli.js`) reads it from argv before any
+ * module loads and passes it on as `ALCHEMY_FAST_DISTILLED=1`; this
+ * registration exists so the parser accepts the flag.
+ */
+const FastDistilled = GlobalFlag.Setting("fast-distilled")({
+    flag: Flag.Boolean("fast-distilled").pipe(Flag.withDescription("Load distilled SDK operations on first use (Node only; lowers startup memory)"), Flag.withDefault(false)),
+});
 const root = Command.make("alchemy", {}, () => Effect.fail(CliError.ShowHelp.make({ commandPath: ["alchemy"], errors: [] }))).pipe(Command.withDescription("Define, deploy, and operate cloud infrastructure with type-safe Effect programs."), Command.withExamples([
     { command: "alchemy deploy" },
     { command: "alchemy plan --stage prod" },
@@ -98,7 +113,7 @@ const root = Command.make("alchemy", {}, () => Effect.fail(CliError.ShowHelp.mak
 ]), Command.withSubcommands([
     ...commands,
     ...Object.keys(compatibilityCommands).map((name) => compatibilityCommand(name)),
-]), Command.withGlobalFlags([NoInput]));
+]), Command.withGlobalFlags([NoInput, FastDistilled, LogLevelFlag, LogFormatFlag]));
 /**
  * How this CLI process is running, appended to `--version` in a checkout
  * for debugging the launcher's implicit mode selection (`bin/cli.js`): the
@@ -116,33 +131,27 @@ const cli = Command.run(root, {
     version: devRunMode === undefined ? packageJson.version : `${packageJson.version} (${devRunMode})`,
 });
 const services = Layer.mergeAll(CliConfig.layer({
-    builtIns: [GlobalFlag.Help, GlobalFlag.Version, GlobalFlag.Completions, GlobalFlag.LogLevel],
+    builtIns: [GlobalFlag.Help, GlobalFlag.Version, GlobalFlag.Completions],
 }), Layer.provideMerge(AlchemyContextLive, PlatformServices), Layer.provide(ProfileStoreLive, PlatformServices), Layer.provide(CredentialsStoreLive, PlatformServices), 
 // Ambient per-CLI-run artifact root. Commands that define their own run
 // boundary (deploy, drift) provide a fresh store closer to the work, which
 // wins over this one.
-Layer.succeed(ArtifactStore, createArtifactStore()), FetchHttpClient.layer, ConfigProvider.layer(ConfigProvider.fromEnv()), Layer.provide(Layer.provideMerge(Layer.mergeAll(selectCliServices(), CliKit.CliKitInteraction), CliKit.layer()), PlatformServices), 
-// Debug run log under ~/.alchemy/logs — the console noise floor stays at
+Layer.succeed(ArtifactStore, createArtifactStore()), FetchHttpClient.layer, ConfigProvider.layer(ConfigProvider.fromEnv()), Layer.provide(Layer.provideMerge(selectCliServices(), Interaction.layer()), PlatformServices), 
+// Debug run log in the project's .alchemy/log — the console noise floor stays at
 // Info, but full causes and auth-flow breadcrumbs land in the file so
 // support can ask users for it.
-//
-// Telemetry sits on top of the console/file loggers so its OTLP logger
-// merges with them. Listed as `mergeAll` siblings, whichever came last
-// would win the `CurrentLoggers` slot and silently drop the other.
-Layer.provideMerge(TelemetryLive, Layer.provide(GlobalLogLive, PlatformServices)));
+Layer.provide(GlobalLogLive, PlatformServices), TelemetryLive);
 const program = Effect.gen(function* () {
-    yield* logRunHeader;
-    // Best-effort check for a newer published version. Runs to completion
-    // before the command so the warning prints before any interactive
-    // prompts; the registry response is cached for a day and the fetch is
-    // bounded by a short timeout, so this stays fast.
-    yield* checkLatestVersion;
-    return yield* cli;
-}).pipe(
-// The terminal shows the friendly message; the run log keeps the full
-// cause chain. Must sit inside the service provision so the file logger
-// is still installed.
-Effect.tapCause((cause) => Effect.logDebug(`command failed:\n${Cause.pretty(cause)}`)));
+    // Best-effort check for a newer published version, run by each command
+    // before its handler: the console flags are parsed by then, and the
+    // warning prints before any interactive prompt. Cached for a day and
+    // bounded by a short timeout, so it stays fast. Its fetch may finish in
+    // the background, in this scope.
+    // Only the check's own services, so the command's flags and loggers win.
+    const services = Context.pick(AlchemyContext, FileSystem.FileSystem, HttpClient.HttpClient, Path.Path, Scope.Scope)(yield* Effect.context());
+    const check = yield* Effect.cached(Effect.provideContext(checkLatestVersion, services));
+    return yield* cli.pipe(Effect.provideService(VersionCheck, check));
+}).pipe(logShutdown("cli"));
 const mainEffect = program.pipe(
 // $USER and $ALCHEMY_STAGE are set by the environment
 Effect.provide(services), Effect.scoped, handleCliErrors);

package/lib/Cli/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/Cli/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/Cli/main.ts"],"names":[],"mappings":"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"}

package/lib/Cli/selectCli.d.ts

@@ -1,7 +1,7 @@
 import type * as Prompt from "effect/cli/Prompt";
 import * as Layer from "effect/Layer";
+import { Interaction } from "../Interaction.ts";
 import type { Cli } from "../Report.ts";
-import { CliKit } from "./CliKit/CliKit.ts";
 /** Select the interactive or append-only root renderer. */
-export declare const selectCliServices: () => Layer.Layer<Cli, never, CliKit | Prompt.Environment>;
+export declare const selectCliServices: () => Layer.Layer<Cli, never, Interaction | Prompt.Environment>;
 //# sourceMappingURL=selectCli.d.ts.map

package/lib/Cli/selectCli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectCli.d.ts","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAM5C,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,4DAkB3B,CAAC"}
+{"version":3,"file":"selectCli.d.ts","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAMxC,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,iEAkB3B,CAAC"}

package/lib/Cli/selectCli.js

@@ -1,12 +1,12 @@
 import * as CliOutput from "effect/cli/CliOutput";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { CliKit } from "./CliKit/CliKit.js";
+import { Interaction } from "../Interaction.js";
 import { LoggingCli } from "./LoggingCli.js";
 import { plainCliFormatter } from "./PlainCliFormatter.js";
 /** Select the interactive or append-only root renderer. */
 export const selectCliServices = () => Layer.unwrap(Effect.gen(function* () {
-    const cli = yield* CliKit;
+    const cli = yield* Interaction;
     if (!cli.terminal.input) {
         const plain = Layer.mergeAll(LoggingCli, CliOutput.layer(plainCliFormatter({ columns: cli.terminal.columns })));
         return plain;

package/lib/Cli/selectCli.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectCli.js","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,2DAA2D;AAC3D,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CACpC,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC1B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,KAAK,GAAgB,KAAK,CAAC,QAAQ,CACvC,UAAU,EACV,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CACtE,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAc,KAAK,IAAI,EAAE;QACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,+BAAgC,CAAC,CAAC;QACpE,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA4B,CAAC,CAAC;QAC3E,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"selectCli.js","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,2DAA2D;AAC3D,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CACpC,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;IAC/B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,KAAK,GAAgB,KAAK,CAAC,QAAQ,CACvC,UAAU,EACV,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CACtE,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAc,KAAK,IAAI,EAAE;QACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,+BAAgC,CAAC,CAAC;QACpE,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA4B,CAAC,CAAC;QAC3E,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CACH,CAAC"}

package/lib/Command/Command.js

@@ -80,7 +80,7 @@ const TERMINATION_GRACE_PERIOD = Duration.seconds(1);
 const TERMINATION_SIGNAL_DISPATCH_TIMEOUT = Duration.millis(25);
 const parseExecutionTimeout = (props) => {
     if (props.timeout === undefined)
-        return Effect.succeed(undefined);
+        return Effect.undefined;
     const decoded = Duration.fromInput(props.timeout);
     if (Option.isNone(decoded) ||
         !Duration.isFinite(decoded.value) ||

package/lib/Command/Command.js.map

@@ -1 +1 @@
-{"version":3,"file":"Command.js","sourceRoot":"","sources":["../../src/Command/Command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Command.js","sourceRoot":"","sources":["../../src/Command/Command.ts"],"names":[],"mappings":"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"}

package/lib/Command/Dev.d.ts

@@ -1,15 +1,39 @@
 import * as Provider from "../Provider.ts";
 import { Resource } from "../Resource.ts";
-import { Stage } from "../Stage.ts";
 import { CommandExecutor, type CommandProps } from "./Command.ts";
 export interface DevProps extends CommandProps {
+    /**
+     * Make the URL required: the resource is ready only once the command
+     * prints a URL, however long that takes, and fails if the command exits
+     * first. Without it, the resource waits 5 seconds and settles with
+     * `url: undefined` when no URL appears.
+     *
+     * A localhost/IP URL is still preferred: when the first URL printed is
+     * another one, the resource waits up to 5 seconds more for a local one
+     * before settling with it.
+     *
+     * @default false
+     */
+    waitForUrl?: boolean;
+    /**
+     * The port the command listens on. Alchemy sets `PORT` to it, over any
+     * `env.PORT`, and the resource is ready once the port accepts a
+     * connection, however long that takes. Output isn't scanned for a URL,
+     * so `waitForUrl` has no effect: `url` is `http://localhost:<port>`.
+     *
+     * The resource fails if the command exits before the port opens, or if
+     * another process already listens on the port when the command starts.
+     */
+    port?: number;
 }
 export interface Dev extends Resource<"Command.Dev", DevProps, {
     /**
      * URL extracted from stdout/stderr. A `localhost`/IP URL (the dev
      * server's own address) is preferred over any other URL the command
      * prints; a non-local URL is only used as a fallback if no local one
-     * appears. Best-effort: `undefined` if no URL appears within 5 seconds.
+     * appears. Best-effort: `undefined` if no URL appears within 5 seconds,
+     * unless `waitForUrl` is set, which waits until one does. With `port`,
+     * it is `http://localhost:<port>`.
      */
     url: string | undefined;
 }> {
@@ -41,6 +65,36 @@ export interface Dev extends Resource<"Command.Dev", DevProps, {
  * yield* Console.log(dev.url); // e.g. "http://localhost:5173"
  * ```
  *
+ * ### Requiring a URL
+ * By default the resource waits 5 seconds for a URL and settles with
+ * `url: undefined` if none appears. Set `waitForUrl` when downstream
+ * resources depend on the URL: the resource is ready only once the
+ * command prints one, however long the server takes to start, and fails
+ * if the command exits first.
+ *
+ * **Example:** Wait for a slow server's URL
+ * ```typescript
+ * const engine = yield* Dev("Engine", {
+ *   command: "rivet-engine start",
+ *   waitForUrl: true,
+ * });
+ * ```
+ *
+ * ### Known Port
+ * When you choose the port, pass it as `port`: Alchemy sets `PORT` to it
+ * and the resource is ready once the port accepts a connection, with no
+ * output scanning. This suits servers that print no URL, and wrappers
+ * that route the port elsewhere.
+ *
+ * **Example:** Serve on port 4000
+ * ```typescript
+ * const api = yield* Dev("Api", {
+ *   command: "node server.ts",
+ *   port: 4000,
+ * });
+ * yield* Console.log(api.url); // "http://localhost:4000"
+ * ```
+ *
  * ### Working Directory
  * Use `cwd` to run the command in a subdirectory — useful in
  * monorepos where each package has its own dev server.
@@ -72,9 +126,9 @@ export interface Dev extends Resource<"Command.Dev", DevProps, {
  * @resource
  */
 export declare const Dev: import("../Resource.ts").ResourceClass<Dev>;
-export declare const DevProvider: () => import("effect/Layer").Layer<Provider.Provider<Dev>, never, import("../AlchemyContext.ts").AlchemyContext | import("../Artifacts.ts").ArtifactStore | CommandExecutor | import("effect/FileSystem").FileSystem | import("effect/Path").Path | import("../Stack.ts").Stack | Stage>;
+export declare const DevProvider: () => import("effect/Layer").Layer<Provider.Provider<Dev>, never, import("../AlchemyContext.ts").AlchemyContext | import("../Artifacts.ts").ArtifactStore | CommandExecutor | import("../Stack.ts").Stack>;
 export declare const DevProviderLive: () => import("effect/Layer").Layer<Provider.Provider<Dev>, never, never>;
-export declare const DevProviderLocal: () => import("effect/Layer").Layer<Provider.Provider<Dev>, never, import("../AlchemyContext.ts").AlchemyContext | import("../Artifacts.ts").ArtifactStore | CommandExecutor | import("effect/FileSystem").FileSystem | import("effect/Path").Path | import("../Stack.ts").Stack | Stage>;
+export declare const DevProviderLocal: () => import("effect/Layer").Layer<Provider.Provider<Dev>, never, import("../AlchemyContext.ts").AlchemyContext | import("../Artifacts.ts").ArtifactStore | CommandExecutor | import("../Stack.ts").Stack>;
 /**
  * Extract a URL from `text`, favoring a localhost/IP URL (the dev server's
  * own address) over any other URL. Returns the first localhost/IP URL if one

package/lib/Command/Dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Dev.d.ts","sourceRoot":"","sources":["../../src/Command/Dev.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,OAAO,EAAE,eAAe,EAAoC,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAGpG,MAAM,WAAW,QAAS,SAAQ,YAAY;CAAG;AAEjD,MAAM,WAAW,GAAI,SAAQ,QAAQ,CACnC,aAAa,EACb,QAAQ,EACR;IACE;;;;;OAKG;IACH,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CACzB,CACF;CAAG;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,eAAO,MAAM,GAAG,6CAA+B,CAAC;AAEhD,eAAO,MAAM,WAAW,0RAIpB,CAAC;AAEL,eAAO,MAAM,eAAe,0EAMxB,CAAC;AAEL,eAAO,MAAM,gBAAgB,0RA0G1B,CAAC;AAaJ;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,uBAWtC,CAAC"}
+{"version":3,"file":"Dev.d.ts","sourceRoot":"","sources":["../../src/Command/Dev.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAoC,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAGpG,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,GAAI,SAAQ,QAAQ,CACnC,aAAa,EACb,QAAQ,EACR;IACE;;;;;;;OAOG;IACH,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CACzB,CACF;CAAG;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsFG;AACH,eAAO,MAAM,GAAG,6CAA+B,CAAC;AAEhD,eAAO,MAAM,WAAW,4MAIpB,CAAC;AAEL,eAAO,MAAM,eAAe,0EAMxB,CAAC;AAEL,eAAO,MAAM,gBAAgB,4MA8H1B,CAAC;AAaJ;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,uBAWtC,CAAC"}

package/lib/Command/Dev.js

@@ -1,15 +1,14 @@
+import * as NodeNet from "node:net";
 import { stripVTControlCharacters } from "node:util";
-import * as ConsoleService from "effect/Console";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import { SystemError } from "effect/PlatformError";
+import * as Schedule from "effect/Schedule";
 import * as Stream from "effect/Stream";
-import { FQN_SEPARATOR } from "../FQN.js";
-import { makeDevLogOpener } from "../Local/DevLog.js";
 import * as LocalProvider from "../Local/LocalProvider.js";
 import * as ProviderLayer from "../Local/ProviderLayer.js";
 import * as Provider from "../Provider.js";
 import { Resource } from "../Resource.js";
-import { Stage } from "../Stage.js";
 import { moduleExtension } from "../Util/Node.js";
 import { makeResourceOutput } from "../Util/ResourceOutput.js";
 import { CommandExecutor, UnexpectedExit, makeCommandError } from "./Command.js";
@@ -41,6 +40,36 @@ import { makeCommandRedactor } from "./Redaction.js";
  * yield* Console.log(dev.url); // e.g. "http://localhost:5173"
  * ```
  *
+ * ### Requiring a URL
+ * By default the resource waits 5 seconds for a URL and settles with
+ * `url: undefined` if none appears. Set `waitForUrl` when downstream
+ * resources depend on the URL: the resource is ready only once the
+ * command prints one, however long the server takes to start, and fails
+ * if the command exits first.
+ *
+ * **Example:** Wait for a slow server's URL
+ * ```typescript
+ * const engine = yield* Dev("Engine", {
+ *   command: "rivet-engine start",
+ *   waitForUrl: true,
+ * });
+ * ```
+ *
+ * ### Known Port
+ * When you choose the port, pass it as `port`: Alchemy sets `PORT` to it
+ * and the resource is ready once the port accepts a connection, with no
+ * output scanning. This suits servers that print no URL, and wrappers
+ * that route the port elsewhere.
+ *
+ * **Example:** Serve on port 4000
+ * ```typescript
+ * const api = yield* Dev("Api", {
+ *   command: "node server.ts",
+ *   port: 4000,
+ * });
+ * yield* Console.log(api.url); // "http://localhost:4000"
+ * ```
+ *
  * ### Working Directory
  * Use `cwd` to run the command in a subdirectory — useful in
  * monorepos where each package has its own dev server.
@@ -84,26 +113,30 @@ export const DevProviderLive = () => Provider.succeed(Dev, {
 });
 export const DevProviderLocal = () => LocalProvider.make(Dev, import.meta.resolve(`./Local${moduleExtension(import.meta.url)}`, import.meta.url), Effect.gen(function* () {
     const { spawn } = yield* CommandExecutor;
-    const stage = yield* Stage;
-    const openDevLog = yield* makeDevLogOpener;
-    const baseConsole = yield* ConsoleService.Console;
     return {
         // The dev process is spawned into the instance scope the helper
         // provides: it keeps running after `start` returns (readiness) and
         // is killed when the helper closes the scope on restart/delete.
         start: Effect.fn(function* ({ fqn, news: props, invalidate }) {
-            const child = yield* spawn(props);
+            const { port } = props;
+            // A restart has already killed the previous process group, so a
+            // listener now is someone else's (an orphaned server, say), and
+            // the readiness probe below would mistake it for this command.
+            if (port !== undefined && (yield* isListening(port))) {
+                return yield* makeCommandError(props, new SystemError({
+                    _tag: "Busy",
+                    module: "Command",
+                    method: "Dev",
+                    pathOrDescriptor: port,
+                    description: "another process already listens on this port",
+                }));
+            }
+            const child = yield* spawn(port === undefined ? props : { ...props, env: { ...props.env, PORT: `${port}` } });
             const redactor = makeCommandRedactor(props.env);
-            // One log file per process generation, closed with the instance
-            // scope: log/{stage}/{fqn…}/{timestamp}.log (namespaces nest as dirs). Terminal lines
-            // carry the resource's pnpm-style prefix; the file gets raw text.
-            const devLog = yield* openDevLog(stage, ...fqn.split(FQN_SEPARATOR));
-            yield* Effect.log(`[${fqn}] Logs → ${devLog.path}`);
-            // Through the Console SERVICE, never a raw fd write: the process
-            // that owns the terminal runs an ink renderer, and a bare write
-            // to its stdout tears the animated region. The CLI's console
-            // capture inserts these lines above it instead.
-            const prefixed = makeResourceOutput(fqn, baseConsole);
+            // Through the logger, never a raw fd write: the process that owns
+            // the terminal renders the records and writes them to the run log
+            // (and a bare write to its stdout would tear the animated region).
+            const prefixed = yield* makeResourceOutput(fqn);
             yield* Effect.addFinalizer(() => Effect.sync(() => {
                 prefixed.stdout.flush();
                 prefixed.stderr.flush();
@@ -115,16 +148,16 @@ export const DevProviderLocal = () => LocalProvider.make(Dev, import.meta.resolv
             // always wins if one shows up. See issue #695.
             let fallbackUrl;
             const deferred = yield* Deferred.make();
-            const mirror = (sink) => child[sink].pipe(Stream.decodeText, redactor.stream, Stream.tap((text) => Effect.sync(() => {
-                prefixed[sink].push(text);
-                devLog.write(text);
-            })), Stream.tap((text) => Effect.sync(() => {
+            // Done when the first URL of any kind appears.
+            const anyUrl = yield* Deferred.make();
+            const mirror = (sink) => child[sink].pipe(Stream.decodeText, redactor.stream, Stream.tap((text) => Effect.sync(() => prefixed[sink].push(text))), Stream.tap((text) => Effect.sync(() => {
                 if (Deferred.isDoneUnsafe(deferred))
                     return;
                 buffer += text;
                 const url = extractUrl(buffer);
                 if (!url)
                     return;
+                Deferred.doneUnsafe(anyUrl, Effect.void);
                 if (isLocalUrl(url)) {
                     // The dev server's own address — resolve immediately.
                     Deferred.doneUnsafe(deferred, Effect.succeed(url));
@@ -136,15 +169,25 @@ export const DevProviderLocal = () => LocalProvider.make(Dev, import.meta.resolv
             })), Stream.runDrain, Effect.forkScoped);
             yield* mirror("stdout");
             yield* mirror("stderr");
-            // Readiness: a URL appears (or the 5s budget elapses), unless the
-            // process exits first — an exit before readiness is a failure.
+            // Readiness: a localhost/IP URL appears, or 5 seconds pass and we
+            // settle with any other URL we saw (`undefined` with none). With
+            // `waitForUrl`, those 5 seconds start only once some URL appears,
+            // so the URL is required and there is no deadline: the only other
+            // way out is the process exiting, which is a failure. With `port`,
+            // readiness is the port opening instead, again with no deadline.
+            const awaitLocalUrl = Deferred.await(deferred).pipe(Effect.timeoutOrElse({
+                duration: "5 seconds",
+                orElse: () => Effect.succeed(fallbackUrl),
+            }));
             const url = yield* Effect.raceAllFirst([
-                Deferred.await(deferred).pipe(Effect.timeoutOrElse({
-                    duration: "5 seconds",
-                    // No localhost/IP URL appeared in time — fall back to any
-                    // other URL we saw (or `undefined` if it stayed silent).
-                    orElse: () => Effect.succeed(fallbackUrl),
-                })),
+                port !== undefined
+                    ? isListening(port).pipe(Effect.repeat({
+                        schedule: Schedule.spaced("100 millis"),
+                        until: (listening) => listening,
+                    }), Effect.as(`http://localhost:${port}`))
+                    : props.waitForUrl
+                        ? Deferred.await(anyUrl).pipe(Effect.andThen(awaitLocalUrl))
+                        : awaitLocalUrl,
                 child.exitCode.pipe(Effect.mapError((error) => makeCommandError(props, error.reason)), Effect.flatMap((exitCode) => makeCommandError(props, new UnexpectedExit({ exitCode, stderr: buffer })))),
             ]);
             // The process may die on its own after readiness (crash, manual
@@ -181,4 +224,18 @@ export const extractUrl = (text) => {
     return url?.replace(/^(https?:\/\/)(?:0\.0\.0\.0|\[::\]|\[0+:0+:0+:0+:0+:0+:0+:0+\])(?=[:/]|$)/, "$1localhost");
 };
 const isLocalUrl = (url) => LOCAL_URL_REGEX.test(url);
+// Whether a TCP connection to `port` succeeds on either loopback address:
+// a server bound to `localhost` may listen on only one of them.
+const isListening = (port) => Effect.all([connects("127.0.0.1", port), connects("::1", port)], {
+    concurrency: "unbounded",
+}).pipe(Effect.map(([ipv4, ipv6]) => ipv4 || ipv6));
+const connects = (host, port) => Effect.callback((resume) => {
+    const socket = NodeNet.connect({ host, port });
+    socket.once("connect", () => {
+        socket.destroy();
+        resume(Effect.succeed(true));
+    });
+    socket.once("error", () => resume(Effect.succeed(false)));
+    return Effect.sync(() => socket.destroy());
+});
 //# sourceMappingURL=Dev.js.map

package/lib/Command/Dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"Dev.js","sourceRoot":"","sources":["../../src/Command/Dev.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Dev.js","sourceRoot":"","sources":["../../src/Command/Dev.ts"],"names":[],"mappings":"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"}

package/lib/Command/Local.d.ts

@@ -3,6 +3,6 @@
  * `Local/Sidecar.ts`), so a dev server process outlives exec-child reloads.
  */
 import * as Layer from "effect/Layer";
-declare const _default: Layer.Layer<import("../Provider.ts").Provider<import("./Dev.ts").Dev>, never, import("../AlchemyContext.ts").AlchemyContext | import("../Artifacts.ts").ArtifactStore | import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/FileSystem").FileSystem | import("effect/Path").Path | import("../Stack.ts").Stack | import("../Stage.ts").Stage>;
+declare const _default: Layer.Layer<import("../Provider.ts").Provider<import("./Dev.ts").Dev>, never, import("../AlchemyContext.ts").AlchemyContext | import("../Artifacts.ts").ArtifactStore | import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/Path").Path | import("../Stack.ts").Stack>;
 export default _default;
 //# sourceMappingURL=Local.d.ts.map

package/lib/Command/Memo.js

@@ -123,7 +123,7 @@ const Memo = Effect.gen(function* () {
                     "pnpm-lock.yaml",
                     "yarn.lock",
                 ]).pipe(Effect.map((lockfile) => lockfile ? path.relative(options.cwd, lockfile) : undefined))
-                : Effect.succeed(undefined),
+                : Effect.undefined,
         ], { concurrency: "unbounded" });
         if (lockfile && !files.includes(lockfile)) {
             files.push(lockfile);