@smoothbricks/cli 0.10.13 → 0.10.15

package/dist/cli.js

@@ -286,6 +286,7 @@ function buildProgram() {
         .option('--mode <mode>', 'auto, affected, or run-many', 'auto')
         .option('--configuration <configuration>')
         .option('--stage <stage>')
+        .option('--stream-output', 'stream Nx task output without prefixes')
         .action(async (options) => {
         const { githubCiNxSmart } = await import('./github-ci/index.js');
         await githubCiNxSmart(await findRepoRoot(), options);

package/dist/github-ci/index.d.ts

@@ -18,7 +18,7 @@ export interface GithubActionsEventPayload {
 }
 type NxSmartMode = 'auto' | 'affected' | 'run-many';
 export declare function cleanupGithubCiCache(root: string): Promise<void>;
-export declare function nxSmartArgs(target: string, mode: 'affected' | 'run-many', configuration?: string, stage?: string): string[];
+export declare function nxSmartArgs(target: string, mode: 'affected' | 'run-many', configuration?: string, stage?: string, streamOutput?: boolean): string[];
 export declare function githubCiNxSmart(root: string, options: {
     target: string;
     name?: string;
@@ -26,6 +26,7 @@ export declare function githubCiNxSmart(root: string, options: {
     mode?: NxSmartMode;
     configuration?: string;
     stage?: string;
+    streamOutput?: boolean;
 }): Promise<void>;
 export interface NxRunManyOptions {
     targets: string;
@@ -53,7 +54,7 @@ export interface GithubCiNxDeployOptions {
     verify?: boolean;
 }
 export interface GithubCiNxDeployDependencies {
-    listProjects?: (root: string, target: string, mode: 'affected' | 'run-many') => Promise<string[]>;
+    listProjects?: (root: string, target: string, mode: 'affected' | 'run-many', stage: DeploymentStage) => Promise<string[]>;
     runNx?: (args: string[], root: string) => Promise<number>;
     appendSummary?: (summaryPath: string, content: string) => Promise<void>;
     appendOutput?: (outputPath: string, content: string) => Promise<void>;
@@ -64,7 +65,7 @@ export interface GithubCiNxDeployDependencies {
 }
 export declare function githubCiNxDeploy(root: string, options: GithubCiNxDeployOptions, dependencies?: GithubCiNxDeployDependencies): Promise<void>;
 export declare function resolveDeploymentStage(explicit: string | undefined, environment: NodeJS.ProcessEnv, event: GithubActionsEventPayload | undefined): DeploymentStage;
-export declare function selectStageDeployProjects(candidates: string[], loadProject: (project: string) => Promise<unknown>): Promise<string[]>;
+export declare function selectStageDeployProjects(candidates: string[], stage: DeploymentStage, loadProject: (project: string) => Promise<unknown>): Promise<string[]>;
 export interface GithubApiProcessResult {
     exitCode: number;
     stdout: string;

package/dist/github-ci/index.d.ts.map

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

package/dist/github-ci/index.js

@@ -24,7 +24,7 @@ const isGithubDeployment = (() => {
 })();
 const isNxProjectDeployTarget = (() => {
     const _ip0 = input => true;
-    const _io0 = input => undefined === input.targets || "object" === typeof input.targets && null !== input.targets && false === Array.isArray(input.targets) && _io1(input.targets);
+    const _io0 = input => true && (undefined === input.targets || "object" === typeof input.targets && null !== input.targets && false === Array.isArray(input.targets) && _io1(input.targets));
     const _io1 = input => undefined === input.deploy || "object" === typeof input.deploy && null !== input.deploy && false === Array.isArray(input.deploy) && _io2(input.deploy);
     const _io2 = input => _ip0(input) && (undefined === input.options || "object" === typeof input.options && null !== input.options && false === Array.isArray(input.options) && _io3(input.options));
     const _io3 = input => _ip0(input);
@@ -32,7 +32,7 @@ const isNxProjectDeployTarget = (() => {
 })();
 const parseNxProjectDeployTarget = (() => {
     const _ip0 = input => true;
-    const _io0 = input => undefined === input.targets || "object" === typeof input.targets && null !== input.targets && false === Array.isArray(input.targets) && _io1(input.targets);
+    const _io0 = input => true && (undefined === input.targets || "object" === typeof input.targets && null !== input.targets && false === Array.isArray(input.targets) && _io1(input.targets));
     const _io1 = input => undefined === input.deploy || "object" === typeof input.deploy && null !== input.deploy && false === Array.isArray(input.deploy) && _io2(input.deploy);
     const _io2 = input => _ip0(input) && (undefined === input.options || "object" === typeof input.options && null !== input.options && false === Array.isArray(input.options) && _io3(input.options));
     const _io3 = input => _ip0(input);
@@ -138,7 +138,7 @@ async function addReferencesFrom(roots, path, cwd) {
         }
     }
 }
-export function nxSmartArgs(target, mode, configuration, stage) {
+export function nxSmartArgs(target, mode, configuration, stage, streamOutput = false) {
     const args = [mode, '-t', target];
     if (configuration) {
         args.push(`--configuration=${configuration}`);
@@ -146,6 +146,9 @@ export function nxSmartArgs(target, mode, configuration, stage) {
     if (stage) {
         args.push(`--stage=${stage}`);
     }
+    if (streamOutput) {
+        args.push('--outputStyle=stream-without-prefixes');
+    }
     args.push(`--exclude=tag:ci:skip:${target}`, `--parallel=${NX_PARALLEL}`);
     return args;
 }
@@ -154,7 +157,7 @@ export async function githubCiNxSmart(root, options) {
     const step = options.step ?? '';
     await createGithubStatus(name, step);
     const mode = resolveNxSmartMode(options.mode ?? 'auto');
-    const nxArgs = nxSmartArgs(options.target, mode, options.configuration, options.stage);
+    const nxArgs = nxSmartArgs(options.target, mode, options.configuration, options.stage, options.streamOutput);
     const status = await runStatus('nx', nxArgs, root);
     await updateGithubStatus(name, status === 0 ? 'success' : 'failure', step);
     if (status !== 0) {
@@ -330,7 +333,7 @@ export async function githubCiNxDeploy(root, options, dependencies = {}) {
     const mode = resolveNxSmartMode(options.mode ?? 'run-many');
     const listProjects = dependencies.listProjects ?? listNxProjectsWithTarget;
     const runNx = dependencies.runNx ?? ((args, commandRoot) => runStatus('nx', args, commandRoot));
-    const projects = await listProjects(root, 'deploy', mode);
+    const projects = await listProjects(root, 'deploy', mode, stage);
     if (projects.length === 0) {
         console.log(`No ${mode} deploy projects; skipping ${stage}.`);
         await setStatus('success');
@@ -344,7 +347,7 @@ export async function githubCiNxDeploy(root, options, dependencies = {}) {
             '-t',
             target,
             `--projects=${projectList}`,
-            '--exclude=tag:permanent-deploy-target',
+            `--exclude=${deployExclusions(stage)}`,
             `--parallel=${NX_PARALLEL}`,
         ];
         if (target === 'deploy') {
@@ -451,19 +454,25 @@ function readGithubActionsEvent(environment) {
         return undefined;
     }
 }
-async function listNxProjectsWithTarget(root, target, mode) {
+function deployExclusions(stage) {
+    const tags = ['tag:permanent-deploy-target'];
+    if (stage !== 'staging')
+        tags.push('tag:staging-deploy-target');
+    return tags.join(',');
+}
+async function listNxProjectsWithTarget(root, target, mode, stage) {
     const listArgs = ['show', 'projects'];
     if (mode === 'affected')
         listArgs.push('--affected');
     listArgs.push('--withTarget', target);
     if (target === 'deploy')
-        listArgs.push('--exclude=tag:permanent-deploy-target');
+        listArgs.push(`--exclude=${deployExclusions(stage)}`);
     listArgs.push('--json');
     const result = await $ `nx ${listArgs}`.cwd(root).quiet();
     const candidates = nxProjectList(decode(result.stdout)).sort((left, right) => left.localeCompare(right));
     if (target !== 'deploy')
         return candidates;
-    return selectStageDeployProjects(candidates, async (project) => {
+    return selectStageDeployProjects(candidates, stage, async (project) => {
         const projectResult = await $ `nx show project ${project} --json`.cwd(root).quiet();
         const parsed = parseNxProjectDeployTarget(decode(projectResult.stdout));
         if (!parsed)
@@ -471,7 +480,7 @@ async function listNxProjectsWithTarget(root, target, mode) {
         return parsed;
     });
 }
-export async function selectStageDeployProjects(candidates, loadProject) {
+export async function selectStageDeployProjects(candidates, stage, loadProject) {
     const selected = [];
     for (const project of candidates) {
         const definition = await loadProject(project);
@@ -479,7 +488,12 @@ export async function selectStageDeployProjects(candidates, loadProject) {
             continue;
         const deploy = definition.targets?.deploy;
         const commandValue = deploy?.options?.command ?? deploy?.command;
-        if (typeof commandValue === 'string' && commandValue.includes('smoo wrangler deploy-stage')) {
+        const tags = Array.isArray(definition.tags)
+            ? definition.tags.filter((tag) => typeof tag === 'string')
+            : [];
+        const isStageDerived = typeof commandValue === 'string' && commandValue.includes('smoo wrangler deploy-stage');
+        const isStagingOnly = tags.includes('staging-deploy-target');
+        if (isStageDerived || (stage === 'staging' && isStagingOnly)) {
             selected.push(project);
         }
     }

package/dist/monorepo/ci-workflow.js

@@ -253,7 +253,7 @@ function renderE2eDeploymentJob(options) {
         return '';
     return `
   e2e-deployment:
-    name: Deployment E2E
+    name: E2E Tests (Deployed Stage)
     needs: main
 ${renderRunsOnLine(options.runsOn)}
     timeout-minutes: 15
@@ -275,9 +275,9 @@ ${renderRunsOnLine(options.runsOn)}
         uses: ./.github/actions/setup-devenv
 
       # Step 4
-      - name: Deployment E2E
+      - name: E2E Tests (Deployed Stage)
         # prettier-ignore
-        run: smoo github-ci nx-smart --target e2e-deployment --mode run-many --stage "\${{ needs.main.outputs.deployment-stage }}" --name "Deployment E2E" --step 4
+        run: smoo github-ci nx-smart --target e2e-deployment --mode run-many --stage "\${{ needs.main.outputs.deployment-stage }}" --stream-output --name "E2E Tests (Deployed Stage)" --step 4
 
       # Step 5
       - name: 🧹 Cleanup and cache Nix/devenv

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smoothbricks/cli",
-  "version": "0.10.13",
+  "version": "0.10.15",
   "type": "module",
   "description": "SmoothBricks monorepo automation CLI",
   "bin": {

package/src/cli.ts

@@ -336,6 +336,7 @@ function buildProgram(): Command {
     .option('--mode <mode>', 'auto, affected, or run-many', 'auto')
     .option('--configuration <configuration>')
     .option('--stage <stage>')
+    .option('--stream-output', 'stream Nx task output without prefixes')
     .action(
       async (options: {
         target: string;
@@ -344,6 +345,7 @@ function buildProgram(): Command {
         mode?: 'auto' | 'affected' | 'run-many';
         configuration?: string;
         stage?: string;
+        streamOutput?: boolean;
       }) => {
         const { githubCiNxSmart } = await import('./github-ci/index.js');
         await githubCiNxSmart(await findRepoRoot(), options);

package/src/github-ci/index.test.ts

@@ -134,12 +134,13 @@ describe('GitHub CI Nx target expansion', () => {
     ).toEqual(['native:package-linux', 'native:compile-linux', 'native:build']);
   });
 
-  it('adds optional stage before the generic target skip tag only to nx-smart', () => {
-    expect(nxSmartArgs('e2e-deployment', 'run-many', undefined, 'pr123')).toEqual([
+  it('adds optional stage and streaming before the generic target skip tag only to nx-smart', () => {
+    expect(nxSmartArgs('e2e-deployment', 'run-many', undefined, 'pr123', true)).toEqual([
       'run-many',
       '-t',
       'e2e-deployment',
       '--stage=pr123',
+      '--outputStyle=stream-without-prefixes',
       '--exclude=tag:ci:skip:e2e-deployment',
       '--parallel=100%',
     ]);
@@ -572,7 +573,7 @@ describe('event-aware stage deployment', () => {
     ).toThrow(/same-repository/);
   });
 
-  it('selects only deploy targets owned by the stage convention', async () => {
+  it('selects stage-derived deploy targets plus staging-only infrastructure on staging', async () => {
     const definitions: Record<string, unknown> = {
       'conloca-app': {
         targets: {
@@ -582,17 +583,34 @@ describe('event-aware stage deployment', () => {
       'conloca-app-backend': {
         targets: { deploy: { command: 'smoo wrangler deploy-stage --stage {args.stage}' } },
       },
+      'conloca-e2e-mail-capture': {
+        tags: ['staging-deploy-target'],
+        targets: { deploy: { options: { command: 'bun scripts/deploy.ts --stage={args.stage}' } } },
+      },
       'conloca-oauth-redirect': {
+        tags: ['permanent-deploy-target'],
         targets: { deploy: { options: { command: 'wrangler deploy --config wrangler.toml' } } },
       },
       'conloca-website': {
         targets: { deploy: { options: { command: 'bun scripts/deploy-website.ts' } } },
       },
     };
+    const candidates = Object.keys(definitions);
+    const loadProject = async (project: string) => definitions[project];
 
-    await expect(
-      selectStageDeployProjects(Object.keys(definitions), async (project) => definitions[project]),
-    ).resolves.toEqual(['conloca-app', 'conloca-app-backend']);
+    await expect(selectStageDeployProjects(candidates, 'staging', loadProject)).resolves.toEqual([
+      'conloca-app',
+      'conloca-app-backend',
+      'conloca-e2e-mail-capture',
+    ]);
+    await expect(selectStageDeployProjects(candidates, 'pr123', loadProject)).resolves.toEqual([
+      'conloca-app',
+      'conloca-app-backend',
+    ]);
+    await expect(selectStageDeployProjects(candidates, 'production', loadProject)).resolves.toEqual([
+      'conloca-app',
+      'conloca-app-backend',
+    ]);
   });
 
   it('publishes GitHub deployment JSON through a real stdin process seam', async () => {
@@ -657,7 +675,7 @@ describe('event-aware stage deployment', () => {
 
   it('deploys app/backend, publishes PR metadata, and emits the resolved stage', async () => {
     const nxCalls: string[][] = [];
-    const listCalls: Array<[string, string]> = [];
+    const listCalls: Array<[string, string, string]> = [];
     const summaries: string[] = [];
     const deployments: Array<[string, string]> = [];
     const outputs: string[] = [];
@@ -677,8 +695,8 @@ describe('event-aware stage deployment', () => {
           repository: { full_name: 'owner/repo' },
           pull_request: { number: 123, head: { repo: { full_name: 'owner/repo' } } },
         },
-        listProjects: async (_root, target, mode) => {
-          listCalls.push([target, mode]);
+        listProjects: async (_root, target, mode, stage) => {
+          listCalls.push([target, mode, stage]);
           return ['conloca-app', 'conloca-app-backend'];
         },
         runNx: async (args) => {
@@ -697,10 +715,10 @@ describe('event-aware stage deployment', () => {
       },
     );
 
-    expect(listCalls).toEqual([['deploy', 'run-many']]);
+    expect(listCalls).toEqual([['deploy', 'run-many', 'pr123']]);
     expect(nxCalls).toHaveLength(1);
     expect(nxCalls[0]).toContain('--projects=conloca-app,conloca-app-backend');
-    expect(nxCalls[0]).toContain('--exclude=tag:permanent-deploy-target');
+    expect(nxCalls[0]).toContain('--exclude=tag:permanent-deploy-target,tag:staging-deploy-target');
     expect(nxCalls[0]).toContain('--stage=pr123');
     expect(nxCalls[0]).not.toContain('e2e-deployment');
     expect(summaries).toEqual(['## pr123 deployment\n\n[View deployment](https://app.pr123.conloca.com)\n']);

package/src/github-ci/index.ts

@@ -27,6 +27,7 @@ export interface GithubActionsEventPayload {
 }
 
 interface NxProjectDeployTarget {
+  tags?: unknown;
   targets?: {
     deploy?: {
       command?: unknown;
@@ -159,6 +160,7 @@ export function nxSmartArgs(
   mode: 'affected' | 'run-many',
   configuration?: string,
   stage?: string,
+  streamOutput = false,
 ): string[] {
   const args = [mode, '-t', target];
   if (configuration) {
@@ -167,19 +169,30 @@ export function nxSmartArgs(
   if (stage) {
     args.push(`--stage=${stage}`);
   }
+  if (streamOutput) {
+    args.push('--outputStyle=stream-without-prefixes');
+  }
   args.push(`--exclude=tag:ci:skip:${target}`, `--parallel=${NX_PARALLEL}`);
   return args;
 }
 
 export async function githubCiNxSmart(
   root: string,
-  options: { target: string; name?: string; step?: string; mode?: NxSmartMode; configuration?: string; stage?: string },
+  options: {
+    target: string;
+    name?: string;
+    step?: string;
+    mode?: NxSmartMode;
+    configuration?: string;
+    stage?: string;
+    streamOutput?: boolean;
+  },
 ): Promise<void> {
   const name = options.name ?? options.target;
   const step = options.step ?? '';
   await createGithubStatus(name, step);
   const mode = resolveNxSmartMode(options.mode ?? 'auto');
-  const nxArgs = nxSmartArgs(options.target, mode, options.configuration, options.stage);
+  const nxArgs = nxSmartArgs(options.target, mode, options.configuration, options.stage, options.streamOutput);
   const status = await runStatus('nx', nxArgs, root);
   await updateGithubStatus(name, status === 0 ? 'success' : 'failure', step);
   if (status !== 0) {
@@ -392,7 +405,12 @@ export interface GithubCiNxDeployOptions {
 }
 
 export interface GithubCiNxDeployDependencies {
-  listProjects?: (root: string, target: string, mode: 'affected' | 'run-many') => Promise<string[]>;
+  listProjects?: (
+    root: string,
+    target: string,
+    mode: 'affected' | 'run-many',
+    stage: DeploymentStage,
+  ) => Promise<string[]>;
   runNx?: (args: string[], root: string) => Promise<number>;
   appendSummary?: (summaryPath: string, content: string) => Promise<void>;
   appendOutput?: (outputPath: string, content: string) => Promise<void>;
@@ -420,7 +438,7 @@ export async function githubCiNxDeploy(
   const mode = resolveNxSmartMode(options.mode ?? 'run-many');
   const listProjects = dependencies.listProjects ?? listNxProjectsWithTarget;
   const runNx = dependencies.runNx ?? ((args: string[], commandRoot: string) => runStatus('nx', args, commandRoot));
-  const projects = await listProjects(root, 'deploy', mode);
+  const projects = await listProjects(root, 'deploy', mode, stage);
   if (projects.length === 0) {
     console.log(`No ${mode} deploy projects; skipping ${stage}.`);
     await setStatus('success');
@@ -435,7 +453,7 @@ export async function githubCiNxDeploy(
       '-t',
       target,
       `--projects=${projectList}`,
-      '--exclude=tag:permanent-deploy-target',
+      `--exclude=${deployExclusions(stage)}`,
       `--parallel=${NX_PARALLEL}`,
     ];
     if (target === 'deploy') {
@@ -553,20 +571,27 @@ function readGithubActionsEvent(environment: NodeJS.ProcessEnv): GithubActionsEv
   }
 }
 
+function deployExclusions(stage: DeploymentStage): string {
+  const tags = ['tag:permanent-deploy-target'];
+  if (stage !== 'staging') tags.push('tag:staging-deploy-target');
+  return tags.join(',');
+}
+
 async function listNxProjectsWithTarget(
   root: string,
   target: string,
   mode: 'affected' | 'run-many',
+  stage: DeploymentStage,
 ): Promise<string[]> {
   const listArgs = ['show', 'projects'];
   if (mode === 'affected') listArgs.push('--affected');
   listArgs.push('--withTarget', target);
-  if (target === 'deploy') listArgs.push('--exclude=tag:permanent-deploy-target');
+  if (target === 'deploy') listArgs.push(`--exclude=${deployExclusions(stage)}`);
   listArgs.push('--json');
   const result = await $`nx ${listArgs}`.cwd(root).quiet();
   const candidates = nxProjectList(decode(result.stdout)).sort((left, right) => left.localeCompare(right));
   if (target !== 'deploy') return candidates;
-  return selectStageDeployProjects(candidates, async (project) => {
+  return selectStageDeployProjects(candidates, stage, async (project) => {
     const projectResult = await $`nx show project ${project} --json`.cwd(root).quiet();
     const parsed = parseNxProjectDeployTarget(decode(projectResult.stdout));
     if (!parsed) throw new Error(`nx show project ${project} returned invalid JSON.`);
@@ -576,6 +601,7 @@ async function listNxProjectsWithTarget(
 
 export async function selectStageDeployProjects(
   candidates: string[],
+  stage: DeploymentStage,
   loadProject: (project: string) => Promise<unknown>,
 ): Promise<string[]> {
   const selected: string[] = [];
@@ -584,7 +610,12 @@ export async function selectStageDeployProjects(
     if (!isNxProjectDeployTarget(definition)) continue;
     const deploy = definition.targets?.deploy;
     const commandValue = deploy?.options?.command ?? deploy?.command;
-    if (typeof commandValue === 'string' && commandValue.includes('smoo wrangler deploy-stage')) {
+    const tags = Array.isArray(definition.tags)
+      ? definition.tags.filter((tag): tag is string => typeof tag === 'string')
+      : [];
+    const isStageDerived = typeof commandValue === 'string' && commandValue.includes('smoo wrangler deploy-stage');
+    const isStagingOnly = tags.includes('staging-deploy-target');
+    if (isStageDerived || (stage === 'staging' && isStagingOnly)) {
       selected.push(project);
     }
   }

package/src/monorepo/__tests__/ci-workflow.test.ts

@@ -77,7 +77,7 @@ describe('CI workflow definition', () => {
     const rendered = renderCiWorkflowYaml(options({ deploy: true, e2eDeployment: true, runsOn: [...nixosRunsOn] }));
 
     expect(rendered).toContain('deployment-stage: ${{ steps.deploy.outputs.stage }}');
-    expect(rendered).toContain('  e2e-deployment:\n    name: Deployment E2E\n    needs: main');
+    expect(rendered).toContain('  e2e-deployment:\n    name: E2E Tests (Deployed Stage)\n    needs: main');
     expect(rendered).not.toContain('\n\n\n  e2e-deployment:');
     expect(rendered).toContain(
       "if: ${{ needs.main.result == 'success' && needs.main.outputs.deployment-stage != '' }}",
@@ -88,9 +88,9 @@ describe('CI workflow definition', () => {
     );
     expect(rendered).toContain('# prettier-ignore\n        run: smoo github-ci nx-smart --target e2e-deployment');
     expect(rendered).toContain(
-      'smoo github-ci nx-smart --target e2e-deployment --mode run-many --stage "${{ needs.main.outputs.deployment-stage }}" --name "Deployment E2E" --step 4',
+      'smoo github-ci nx-smart --target e2e-deployment --mode run-many --stage "${{ needs.main.outputs.deployment-stage }}" --stream-output --name "E2E Tests (Deployed Stage)" --step 4',
     );
-    expect(rendered.match(/name: Deployment E2E/g)).toHaveLength(2);
+    expect(rendered.match(/name: E2E Tests \(Deployed Stage\)/g)).toHaveLength(2);
   });
 
   it('omits optional browser and deployment-E2E lanes when disabled', () => {

package/src/monorepo/ci-workflow.ts

@@ -295,7 +295,7 @@ function renderE2eDeploymentJob(options: CiWorkflowDefinitionOptions): string {
   if (!options.e2eDeployment) return '';
   return `
   e2e-deployment:
-    name: Deployment E2E
+    name: E2E Tests (Deployed Stage)
     needs: main
 ${renderRunsOnLine(options.runsOn)}
     timeout-minutes: 15
@@ -317,9 +317,9 @@ ${renderRunsOnLine(options.runsOn)}
         uses: ./.github/actions/setup-devenv
 
       # Step 4
-      - name: Deployment E2E
+      - name: E2E Tests (Deployed Stage)
         # prettier-ignore
-        run: smoo github-ci nx-smart --target e2e-deployment --mode run-many --stage "\${{ needs.main.outputs.deployment-stage }}" --name "Deployment E2E" --step 4
+        run: smoo github-ci nx-smart --target e2e-deployment --mode run-many --stage "\${{ needs.main.outputs.deployment-stage }}" --stream-output --name "E2E Tests (Deployed Stage)" --step 4
 
       # Step 5
       - name: 🧹 Cleanup and cache Nix/devenv