alchemy 2.0.0-beta.75 → 2.0.0-beta.77

package/src/Cloudflare/Workers/WorkerProvider.ts

@@ -16,8 +16,7 @@ import { isHttpClientError } from "effect/unstable/http/HttpClientError";
 import * as crypto from "node:crypto";
 import { Unowned } from "../../AdoptPolicy.ts";
 import * as Artifacts from "../../Artifacts.ts";
-import type { ScopedPlanStatusSession } from "../../Cli/Cli.ts";
-import { hashDirectory, type MemoOptions } from "../../Command/Memo.ts";
+import type { ScopedPlanStatusSession } from "../../Report.ts";
 import { havePropsChanged, isResolved, stripEffects } from "../../Diff.ts";
 import * as ProviderLayer from "../../Local/ProviderLayer.ts";
 import * as Provider from "../../Provider.ts";
@@ -45,10 +44,10 @@ import { getCompatibility } from "./Compatibility.ts";
 import { isDurableObjectExport } from "./DurableObject.ts";
 import { LocalWorkerProvider } from "./LocalWorkerProvider.ts";
 import { makeSourceContext, resolveSource } from "./Source.ts";
+import { assertCloudflareTelemetryCompatibility } from "./Telemetry.ts";
 import {
   isSelfUrl,
   Worker,
-  type ViteOptions,
   type WorkerProps,
   type WorkerRouteConfig,
   type WorkerVersionAffinity,
@@ -57,6 +56,7 @@ import {
   getCacheBinding,
   getCronBindings,
   isContainerDecl,
+  resolveObservability,
 } from "./WorkerAsyncBindings.ts";
 import type {
   WireWorkerBinding,
@@ -1287,6 +1287,7 @@ export const LiveWorkerProvider = () =>
           if (desired.length > 0 || previous.length > 0 || live.length > 0) {
             yield* session.note(
               `Reconciling Cron Triggers (${desired.length}) ...`,
+              { kind: "status" },
             );
           }
 
@@ -2216,10 +2217,11 @@ export const LiveWorkerProvider = () =>
         );
       });
 
-      const prepareBundle = (id: string, props: WorkerProps) =>
+      const prepareBundle = (id: string, fqn: string, props: WorkerProps) =>
         (isPythonMain(props.main)
           ? readPythonWorkerBundle({
               id,
+              fqn,
               main: props.main,
               compatibility: getCompatibility(props),
             })
@@ -2251,6 +2253,8 @@ export const LiveWorkerProvider = () =>
         );
 
       const viteBuild = Effect.fn(function* (
+        id: string,
+        fqn: string,
         props: WorkerProps,
         selfUrl?: string,
       ) {
@@ -2313,6 +2317,7 @@ export const LiveWorkerProvider = () =>
               compatibilityFlags: compatibility.flags,
               viteEnvironments: props.vite?.viteEnvironments,
             },
+            fqn,
           );
         const [assets, bundle, input] = yield* Effect.all(
           [
@@ -2364,6 +2369,7 @@ export const LiveWorkerProvider = () =>
 
       const prepareAssetsAndBundle = (
         id: string,
+        fqn: string,
         workerName: string,
         props: WorkerProps,
         opts: { skipAssetsRead?: boolean; selfUrl?: string } = {},
@@ -2378,6 +2384,7 @@ export const LiveWorkerProvider = () =>
             const source = yield* resolveSource(props);
             const ctx = makeSourceContext({
               id,
+              fqn,
               workerName,
               props,
               compatibility: getCompatibility(props),
@@ -2420,7 +2427,7 @@ export const LiveWorkerProvider = () =>
             };
           }
           if (props.vite) {
-            return yield* viteBuild(props, opts.selfUrl);
+            return yield* viteBuild(id, fqn, props, opts.selfUrl);
           }
           // Assets-only Worker: no entry module at all. The script PUT goes
           // out with no modules and no main_module — Cloudflare's asset
@@ -2449,7 +2456,7 @@ export const LiveWorkerProvider = () =>
               opts.skipAssetsRead
                 ? Effect.succeed(undefined)
                 : prepareAssets(props.assets),
-              prepareBundle(id, props),
+              prepareBundle(id, fqn, props),
             ],
             { concurrency: "unbounded" },
           );
@@ -2802,6 +2809,7 @@ export const LiveWorkerProvider = () =>
        */
       const putWorkerVersion = Effect.fn(function* (
         id: string,
+        fqn: string,
         news: WorkerProps,
         bindings: ResourceBinding<Worker["Binding"]>[],
         session: ScopedPlanStatusSession,
@@ -2849,7 +2857,7 @@ export const LiveWorkerProvider = () =>
           assets,
           bundle,
           hash: preparedHash,
-        } = yield* prepareAssetsAndBundle(id, parentName, news, {
+        } = yield* prepareAssetsAndBundle(id, fqn, parentName, news, {
           skipAssetsRead: false,
         });
         const metadataHash = yield* resolveWorkerMetadataHash({
@@ -2907,7 +2915,9 @@ export const LiveWorkerProvider = () =>
           parentName,
         );
         const compatibility = getCompatibility(news);
-        yield* session.note(`Uploading version of ${parentName} ...`);
+        yield* session.note(`Uploading version of ${parentName} ...`, {
+          kind: "status",
+        });
         const created = yield* workers
           .createScriptVersion({
             accountId,
@@ -2957,6 +2967,7 @@ export const LiveWorkerProvider = () =>
         if (traffic > 0) {
           yield* session.note(
             `Deploying version at ${traffic}% of ${parentName}'s traffic ...`,
+            { kind: "status" },
           );
           deploymentId = yield* deployVersionTraffic({
             accountId,
@@ -3017,7 +3028,9 @@ export const LiveWorkerProvider = () =>
                 }),
               );
             }
-            yield* session.note("Reconciling version-affinity rules ...");
+            yield* session.note("Reconciling version-affinity rules ...", {
+              kind: "status",
+            });
           }
           const placed = yield* reconcileAffinityRules({
             scriptName: parentName,
@@ -3068,6 +3081,7 @@ export const LiveWorkerProvider = () =>
 
       const putWorker = Effect.fn(function* (
         id: string,
+        fqn: string,
         news: WorkerProps,
         bindings: ResourceBinding<Worker["Binding"]>[],
         olds: WorkerProps | undefined,
@@ -3118,7 +3132,7 @@ export const LiveWorkerProvider = () =>
           assets,
           bundle,
           hash: preparedHash,
-        } = yield* prepareAssetsAndBundle(id, name, news, {
+        } = yield* prepareAssetsAndBundle(id, fqn, name, news, {
           skipAssetsRead: prebuiltAssets?.skip,
           selfUrl,
         });
@@ -3234,6 +3248,7 @@ export const LiveWorkerProvider = () =>
               name,
               assets,
               session,
+              dispatchNamespace,
             );
             metadataAssets = {
               jwt,
@@ -3257,7 +3272,9 @@ export const LiveWorkerProvider = () =>
         const sizeKB = size / 1024;
         const sizeMB = sizeKB / 1024;
         const bundleSize = `${sizeKB > 1024 ? `${sizeMB.toFixed(2)} MB` : `${sizeKB.toFixed(2)} KB`}`;
-        yield* session.note(`Uploading worker (${bundleSize}) ...`);
+        yield* session.note(`Uploading worker (${bundleSize}) ...`, {
+          kind: "status",
+        });
 
         // Read existing worker settings for migration tracking
         const oldSettings =
@@ -3585,13 +3602,7 @@ export const LiveWorkerProvider = () =>
           logpush: news.logpush,
           mainModule: bundle.main,
           migrations,
-          observability: news.observability ?? {
-            enabled: true,
-            logs: {
-              enabled: true,
-              invocationLogs: true,
-            },
-          },
+          observability: resolveObservability(news, bindings),
           placement: news.placement,
           tags: metadataTags,
           tailConsumers,
@@ -3638,6 +3649,7 @@ export const LiveWorkerProvider = () =>
           }
           yield* session.note(
             `Uploading version of ${name} (${bundleSize}) ...`,
+            { kind: "status" },
           );
           const created = yield* workers
             .createScriptVersion({
@@ -3681,6 +3693,7 @@ export const LiveWorkerProvider = () =>
           if (rolloutTraffic > 0) {
             yield* session.note(
               `Deploying version at ${rolloutTraffic}% of traffic ...`,
+              { kind: "status" },
             );
             deploymentId = yield* deployVersionTraffic({
               accountId,
@@ -3812,6 +3825,7 @@ export const LiveWorkerProvider = () =>
         ) {
           yield* session.note(
             `${workersDev.enabled || workersDev.previewsEnabled ? "Enabling" : "Disabling"} workers.dev subdomain...`,
+            { kind: "status" },
           );
           // Cloudflare's script registry is eventually consistent — for the
           // first few hundred ms after `putScript` returns, POST /subdomain
@@ -3891,6 +3905,7 @@ export const LiveWorkerProvider = () =>
             : [];
           yield* session.note(
             `Reconciling custom domains (${desiredHostnames.length}) ...`,
+            { kind: "status" },
           );
           // Capture hostname → zone for *currently attached* domains before
           // reconcile detaches removed ones — a removed redirect hostname's
@@ -3936,6 +3951,7 @@ export const LiveWorkerProvider = () =>
         if (desiredRoutes.length > 0 || previousRoutes.length > 0) {
           yield* session.note(
             `Reconciling worker routes (${desiredRoutes.length}) ...`,
+            { kind: "status" },
           );
         }
         const routes = yield* reconcileRoutes(
@@ -3993,7 +4009,9 @@ export const LiveWorkerProvider = () =>
                 }),
               );
             }
-            yield* session.note("Reconciling version-affinity rules ...");
+            yield* session.note("Reconciling version-affinity rules ...", {
+              kind: "status",
+            });
           }
           const placed = yield* reconcileAffinityRules({
             scriptName: name,
@@ -4104,6 +4122,7 @@ export const LiveWorkerProvider = () =>
 
       const hasChanged = Effect.fn(function* (
         id: string,
+        fqn: string,
         props: WorkerProps,
         output: Worker["Attributes"],
         bindings: readonly ResourceBinding<Worker["Binding"]>[] | undefined,
@@ -4158,6 +4177,7 @@ export const LiveWorkerProvider = () =>
           const slots = yield* source.hash(
             makeSourceContext({
               id,
+              fqn,
               workerName: output.workerName,
               props,
               compatibility: getCompatibility(props),
@@ -4218,7 +4238,7 @@ export const LiveWorkerProvider = () =>
           }
           return yield* assetsChanged(props.assets, output);
         }
-        const bundleHash = yield* prepareBundle(id, props).pipe(
+        const bundleHash = yield* prepareBundle(id, fqn, props).pipe(
           Effect.map((b) => b.hash),
         );
         if (bundleHash !== output.hash?.bundle) {
@@ -4286,6 +4306,7 @@ export const LiveWorkerProvider = () =>
           }),
         diff: Effect.fn(function* ({
           id,
+          fqn,
           news: desired,
           olds,
           output,
@@ -4460,6 +4481,7 @@ export const LiveWorkerProvider = () =>
             cronsChanged ||
             (yield* hasChanged(
               id,
+              fqn,
               news,
               output,
               Array.isArray(newBindings)
@@ -4528,6 +4550,10 @@ export const LiveWorkerProvider = () =>
         }),
         precreate: Effect.fn(function* ({ id, news, session, bindings }) {
           const { accountId } = yield* yield* CloudflareEnvironment;
+          yield* assertCloudflareTelemetryCompatibility(
+            news as WorkerProps,
+            bindings,
+          );
           const name = yield* createWorkerName(id, news.name);
           // A version worker uploads to its parent's script during
           // reconcile; pre-creating a placeholder script under this
@@ -4679,7 +4705,7 @@ export const LiveWorkerProvider = () =>
               `Cloudflare Worker precreate: reusing existing ${name}`,
             );
           } else {
-            yield* session.note("Pre-creating worker...");
+            yield* session.note("Pre-creating worker...", { kind: "status" });
             const compatibility = getCompatibility(news);
             const mainModule = "main.js";
             const placeholderScript = `${doClasses.length > 0 ? 'import { DurableObject } from "cloudflare:workers";\n\n' : ""}export default { fetch() { return new Response("Alchemy worker is being deployed...") } };\n${doClasses
@@ -4720,13 +4746,7 @@ export const LiveWorkerProvider = () =>
                         newSqliteClasses: doClasses,
                       }
                     : undefined,
-                observability: news.observability ?? {
-                  enabled: true,
-                  logs: {
-                    enabled: true,
-                    invocationLogs: true,
-                  },
-                },
+                observability: resolveObservability(news, bindings),
                 tags,
               },
               files: [
@@ -4883,6 +4903,9 @@ export const LiveWorkerProvider = () =>
                 // `streaming_tail_consumers` field. Carry the last deployed
                 // value forward like other provider-managed caches.
                 streamingTailConsumers: output?.streamingTailConsumers,
+                // The bundle hash is computed locally during deployment and
+                // cannot be reconstructed from Cloudflare's read APIs.
+                hash: output?.hash,
               } satisfies Worker["Attributes"];
               return hasAlchemyWorkerTags(id, settings.tags ?? [])
                 ? attrs
@@ -5016,6 +5039,9 @@ export const LiveWorkerProvider = () =>
               // `streaming_tail_consumers` field. Carry the last deployed
               // value forward like other provider-managed caches.
               streamingTailConsumers: output?.streamingTailConsumers,
+              // The bundle hash is computed locally during deployment and
+              // cannot be reconstructed from Cloudflare's read APIs.
+              hash: output?.hash,
               // Rule placement is provider-managed state, not observed here
               // (a getPhas call per known zone on every read); carry the
               // cleanup list forward like any other stable cache.
@@ -5054,17 +5080,26 @@ export const LiveWorkerProvider = () =>
         ),
         reconcile: Effect.fn(function* ({
           id,
+          fqn,
           news,
           olds,
           bindings,
           output,
           session,
         }) {
+          yield* assertCloudflareTelemetryCompatibility(news, bindings);
           // A version worker uploads an immutable version to its parent's
           // script instead of owning a script of its own — none of the
           // script-level observation below applies.
           if (news.version?.parent != null) {
-            return yield* putWorkerVersion(id, news, bindings, session, output);
+            return yield* putWorkerVersion(
+              id,
+              fqn,
+              news,
+              bindings,
+              session,
+              output,
+            );
           }
           const { accountId } = yield* yield* CloudflareEnvironment;
           const name =
@@ -5125,6 +5160,7 @@ export const LiveWorkerProvider = () =>
 
           return yield* putWorker(
             id,
+            fqn,
             news,
             bindings,
             olds,

package/src/Cloudflare/Workers/cloudflare_workers.ts

@@ -7,8 +7,12 @@ import * as Effect from "effect/Effect";
 // assembly plus scheduler microtasks. Outside workerd (deploy/plan in Node,
 // vitest) the import rejects and the fallback stub is used; the `.catch` is
 // attached immediately so the rejection is always handled.
+// Type the import before chaining to avoid expanding the full module namespace
+// while TypeScript infers the catch result.
+const moduleImport: Promise<typeof import("cloudflare:workers")> =
+  import("cloudflare:workers");
 const modulePromise: Promise<typeof import("cloudflare:workers")> =
-  import("cloudflare:workers").catch(
+  moduleImport.catch(
     () =>
       ({
         env: {},

package/src/Cloudflare/Workers/index.ts

@@ -32,6 +32,7 @@ export * from "./SecretKey.ts";
 export * from "./SecretKeyBinding.ts";
 export * from "./Source.ts";
 export * from "./Subdomain.ts";
+export * from "./Telemetry.ts";
 export * from "./VersionMetadata.ts";
 export * from "./VersionMetadataBinding.ts";
 export * from "./WebSocket.ts";

package/src/Cloudflare/Workflows/Workflow.ts

@@ -40,12 +40,27 @@ export class WorkflowEvent extends Context.Service<
     timestamp: Date;
     instanceId: string;
     workflowName: string;
+    /**
+     * Present when Cloudflare created this instance from a native
+     * {@link WorkflowProps.schedules} cron expression. Absent for
+     * instances started with `create` / `createBatch`.
+     */
     schedule?: WorkflowCronSchedule;
   }
 >()("Cloudflare.Workflows.WorkflowEvent") {}
 
+/**
+ * Cron trigger metadata on a Workflow instance created by a native
+ * `schedules` expression. Mirrors Cloudflare's `event.schedule`.
+ */
 export interface WorkflowCronSchedule {
+  /**
+   * The matching cron expression that created this instance.
+   */
   cron: string;
+  /**
+   * The scheduled fire time, milliseconds since the Unix epoch.
+   */
   scheduledTime: number;
 }
 
@@ -319,6 +334,20 @@ export interface WorkflowRefProps {
    * the Worker that declares the binding; ignored when `scriptName` is set.
    */
   limits?: WorkflowLimits;
+  /**
+   * Cron expressions that create a new Workflow instance on each match.
+   * Wrangler-compatible: `schedules: ["0 * * * *"]`.
+   *
+   * Native Workflow schedules replace a Worker Cron Trigger whose
+   * `scheduled` handler called `workflow.create()`. Pass an empty
+   * array to remove all schedules.
+   *
+   * Only applies when the workflow is hosted by the Worker that declares
+   * the binding; ignored when `scriptName` is set.
+   *
+   * Account-wide limit: 100 cron expressions.
+   */
+  schedules?: string[];
 }
 
 /**
@@ -331,6 +360,17 @@ export interface WorkflowProps {
    * Limits applied to the workflow.
    */
   limits?: WorkflowLimits;
+  /**
+   * Cron expressions that create a new Workflow instance on each match.
+   * Wrangler-compatible: `schedules: ["0 * * * *"]`.
+   *
+   * Native Workflow schedules replace a Worker Cron Trigger whose
+   * `scheduled` handler called `workflow.create()`. Pass an empty
+   * array to remove all schedules.
+   *
+   * Account-wide limit: 100 cron expressions.
+   */
+  schedules?: string[];
 }
 
 /**
@@ -351,6 +391,8 @@ export interface WorkflowLike<Params = unknown> {
   /** @internal phantom */
   limits?: WorkflowLimits;
   /** @internal phantom */
+  schedules?: string[];
+  /** @internal phantom */
   Params?: Params;
 }
 
@@ -561,6 +603,26 @@ export class WorkflowScope extends Context.Service<
  * ) {}
  * ```
  *
+ * ### Scheduling instances
+ * Each matching cron expression creates a new instance automatically —
+ * no Worker Cron Trigger or `scheduled` handler required.
+ * **Example:** Native cron schedules
+ * ```typescript
+ * export default class HourlyWorkflow extends Cloudflare.Workflow<HourlyWorkflow>()(
+ *   "HourlyWorkflow",
+ *   { schedules: ["0 * * * *"] },
+ *   Effect.gen(function* () {
+ *     return Effect.fn(function* () {
+ *       const event = yield* Cloudflare.Workflows.WorkflowEvent;
+ *       if (event.schedule) {
+ *         return { cron: event.schedule.cron };
+ *       }
+ *       return {};
+ *     });
+ *   }),
+ * ) {}
+ * ```
+ *
  * ### Step Primitives
  * **Example:** Running a named task
  * ```typescript
@@ -729,6 +791,19 @@ export class WorkflowScope extends Context.Service<
  * });
  * ```
  *
+ * **Example:** Native cron schedules on an async Workflow binding
+ * ```typescript
+ * export const Worker = Cloudflare.Worker("Worker", {
+ *   main: "./src/worker.ts",
+ *   env: {
+ *     HOURLY: Cloudflare.Workflow("HourlyWorkflow", {
+ *       className: "HourlyWorkflow",
+ *       schedules: ["0 * * * *"],
+ *     }),
+ *   },
+ * });
+ * ```
+ *
  * **Example:** Using the Workflow from a plain async handler
  * ```typescript
  * // src/worker.ts
@@ -838,6 +913,7 @@ export const Workflow: WorkflowClass = taggedFunction(WorkflowScope, ((
       className: refProps?.className ?? name,
       scriptName: refProps?.scriptName,
       limits: refProps?.limits,
+      schedules: refProps?.schedules,
     } satisfies WorkflowLike;
   }
   const props = Effect.isEffect(second) ? undefined : (second as WorkflowProps);
@@ -853,6 +929,7 @@ export const Workflow: WorkflowClass = taggedFunction(WorkflowScope, ((
         className: name,
         scriptName: worker.workerName,
         limits: props?.limits,
+        schedules: props?.schedules,
       });
 
       // Add the workflow binding to the Worker metadata
@@ -940,6 +1017,11 @@ export interface WorkflowResourceProps {
   className: string;
   scriptName: string;
   limits?: WorkflowLimits;
+  /**
+   * Cron expressions that create a new Workflow instance on each match.
+   * Pass an empty array to remove all schedules.
+   */
+  schedules?: string[];
 }
 
 export interface WorkflowResourceAttrs {
@@ -948,6 +1030,10 @@ export interface WorkflowResourceAttrs {
   className: string;
   scriptName: string;
   accountId: string;
+  /**
+   * Cron expressions currently attached to this Workflow.
+   */
+  schedules: string[];
 }
 
 const WorkflowResourceTypeId = "Cloudflare.Workflow";
@@ -991,6 +1077,7 @@ export const ProviderLive = () =>
                 className: wf.className ?? "",
                 scriptName: wf.scriptName ?? "",
                 accountId,
+                schedules: fromObservedSchedules(wf.schedules),
               })),
             ),
           ),
@@ -1014,6 +1101,7 @@ export const ProviderLive = () =>
             className: workflow.className,
             scriptName: workflow.scriptName,
             accountId: acct,
+            schedules: fromObservedSchedules(workflow.schedules),
           })),
           Effect.catchTag("WorkflowNotFound", () => Effect.succeed(undefined)),
         );
@@ -1033,6 +1121,13 @@ export const ProviderLive = () =>
         className: news.className,
         scriptName: news.scriptName,
         limits: news.limits,
+        // Same as `limits`: only send when the prop is set. `[]` clears
+        // attached schedules; omitting the field leaves Cloudflare's
+        // current list untouched.
+        schedules:
+          news.schedules === undefined
+            ? undefined
+            : toPutSchedules(news.schedules),
       });
       return {
         workflowId: result.id,
@@ -1040,6 +1135,7 @@ export const ProviderLive = () =>
         className: result.className,
         scriptName: result.scriptName,
         accountId: acct,
+        schedules: news.schedules ?? output?.schedules ?? [],
       };
     }),
     delete: Effect.fn(function* ({ output }) {
@@ -1087,6 +1183,7 @@ export const ProviderLocal = () =>
         className: news.className,
         scriptName: news.scriptName,
         accountId: output?.accountId ?? accountId,
+        schedules: news.schedules ?? output?.schedules ?? [],
       };
     }),
     delete: Effect.fn(function* () {
@@ -1106,6 +1203,14 @@ export const WorkflowProvider = () =>
 // Helpers
 // ---------------------------------------------------------------------------
 
+const toPutSchedules = (
+  schedules: string[],
+): workflows.UpdateRequestSchedulesList => schedules.map((cron) => ({ cron }));
+
+const fromObservedSchedules = (
+  schedules?: ReadonlyArray<{ cron: string }> | null,
+): string[] => (schedules ?? []).map((s) => s.cron);
+
 const wrapInstance = <Result>(raw: any): WorkflowInstance<Result> => ({
   id: raw.id,
   status: () =>

package/src/Cloudflare/Workflows/WorkflowBridge.ts

@@ -131,7 +131,7 @@ const wrapWorkflowEvent = (event: any): WorkflowEventService["Service"] => ({
       : new Date(event.timestamp),
   instanceId: event.instanceId ?? "",
   workflowName: event.workflowName ?? "",
-  schedule: event.schedule,
+  schedule: event.schedule ?? undefined,
 });
 
 export const wrapWorkflowStep = (step: any): WorkflowStep["Service"] => ({
@@ -192,6 +192,8 @@ export const wrapWorkflowStep = (step: any): WorkflowStep["Service"] => ({
 const toWorkflowStepConfig = (
   options: WorkflowTaskOptions<any, any, any>,
 ): WorkflowStepConfig | undefined => {
-  if (!options.retries && !options.timeout) return undefined;
-  return { retries: options.retries, timeout: options.timeout };
+  const config: WorkflowStepConfig = {};
+  if (options.retries) config.retries = options.retries;
+  if (options.timeout !== undefined) config.timeout = options.timeout;
+  return Object.keys(config).length > 0 ? config : undefined;
 };

package/src/Command/Command.ts

@@ -22,7 +22,7 @@ import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import * as ChildProcess from "effect/unstable/process/ChildProcess";
 import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
-import type { ScopedPlanStatusSession } from "../Cli/Cli.ts";
+import type { ScopedPlanStatusSession } from "../Report.ts";
 import { isNonInteractive } from "../Util/interactive.ts";
 import {
   makeCommandRedactor,
@@ -385,8 +385,16 @@ export const CommandExecutorLive = () =>
             const execution = Effect.all(
               {
                 exitCode: child.exitCode,
-                stdout: collect(child.stdout, session.note, redactor),
-                stderr: collect(child.stderr, session.note, redactor),
+                stdout: collect(
+                  child.stdout,
+                  (line) => session.note(line, { kind: "output" }),
+                  redactor,
+                ),
+                stderr: collect(
+                  child.stderr,
+                  (line) => session.note(line, { kind: "output" }),
+                  redactor,
+                ),
               },
               { concurrency: "unbounded" },
             ).pipe(mapError(props));