Merge branch 'master' into 1036-apify-validate-schema-should-validate-all-schemas-in-actorjson-not-just-input_schema

Author: l2ysho

.gitignore

@@ -12,7 +12,7 @@ _mytests
 .idea
 .zed
 docs/changelog.md
-.generated
+__generated__
 
 # Yarn files
 .yarn/install-state.gz

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+<!-- git-cliff-unreleased-start -->
+
+## 1.5.1 - **not yet released**
+
+### 🚀 Features
+
+- **generate-schema-types:** Change default output path to src&#x2F;**generated**&#x2F;actor&#x2F; ([#1104](https://github.com/apify/apify-cli/pull/1104)) ([9b44152](https://github.com/apify/apify-cli/commit/9b441522eae7c23ff0744e1a903b87664c66f36e)) by [@vladfrangu](https://github.com/vladfrangu)
+
+<!-- git-cliff-unreleased-end -->
+
 ## [1.5.0](https://github.com/apify/apify-cli/releases/tag/v1.5.0) (2026-04-27)
 
 ### 🚀 Features

docs/reference.md

@@ -492,7 +492,7 @@ FLAGS
       --all-optional    Mark all properties as optional in
                         generated types.
   -o, --output=<value>  Directory where the generated files
-                        should be outputted. Defaults to src/.generated/actor/ to
+                        should be outputted. Defaults to src/__generated__/actor/ to
                         stay within the typical tsconfig rootDir.
       --strict          Whether generated interfaces should be
                         strict (no index signature [key: string]: unknown).

eslint.config.mjs

@@ -55,6 +55,14 @@ export default [
 			// Not ideal, but we still use any for simplicity
 			'@typescript-eslint/no-explicit-any': 'off',
 
+			// Allow underscore-prefixed variables (including `using _name = ...`
+			// bindings kept alive solely for their Symbol.dispose effect) in
+			// addition to the base config's underscore-prefixed args exemption.
+			'@typescript-eslint/no-unused-vars': [
+				'error',
+				{ argsIgnorePattern: '^_', varsIgnorePattern: '^_', ignoreRestSiblings: true },
+			],
+
 			// '@typescript-eslint/array-type': 'error',
 			// '@typescript-eslint/no-empty-object-type': 'off',
 		},

package.json

@@ -1,6 +1,6 @@
 {
     "name": "apify-cli",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "description": "Apify command-line interface (CLI) helps you manage the Apify cloud platform and develop, build, and deploy Apify Actors.",
     "exports": "./dist/index.js",
     "type": "module",
@@ -18,7 +18,7 @@
         "format": "biome format . && prettier --check \"**/*.{md,yml,yaml}\"",
         "format:fix": "biome format --write . && prettier --write \"**/*.{md,yml,yaml}\"",
         "clean": "rimraf dist",
-        "build": "yarn clean && tsc && tsup",
+        "build": "yarn clean && tsc && tsdown",
         "build-bundles": "bun run scripts/build-cli-bundles.ts",
         "prepack": "yarn insert-cli-metadata && yarn build && yarn update-docs",
         "insert-cli-metadata": "tsx scripts/insert-cli-metadata.ts",
@@ -143,7 +143,7 @@
         "lint-staged": "^16.0.0",
         "mock-stdin": "^1.0.0",
         "prettier": "^3.5.3",
-        "tsup": "^8.5.0",
+        "tsdown": "^0.21.9",
         "tsx": "^4.16.5",
         "typescript": "^6.0.0",
         "typescript-eslint": "^8.31.0",

src/commands/actor/generate-schema-types.ts

@@ -79,9 +79,9 @@ Optionally specify custom schema path to use.`;
 		output: Flags.string({
 			char: 'o',
 			description:
-				'Directory where the generated files should be outputted. Defaults to src/.generated/actor/ to stay within the typical tsconfig rootDir.',
+				'Directory where the generated files should be outputted. Defaults to src/__generated__/actor/ to stay within the typical tsconfig rootDir.',
 			required: false,
-			default: path.join('src', '.generated', 'actor'),
+			default: path.join('src', '__generated__', 'actor'),
 		}),
 		strict: Flags.boolean({
 			description: 'Whether generated interfaces should be strict (no index signature [key: string]: unknown).',

src/commands/actors/push.ts

@@ -14,6 +14,7 @@ import { Args } from '../../lib/command-framework/args.js';
 import { Flags } from '../../lib/command-framework/flags.js';
 import { CommandExitCodes, DEPRECATED_LOCAL_CONFIG_NAME, LOCAL_CONFIG_PATH } from '../../lib/consts.js';
 import { sumFilesSizeInBytes } from '../../lib/files.js';
+import { useAbortJobOnSignal } from '../../lib/hooks/useAbortJobOnSignal.js';
 import { useActorConfig } from '../../lib/hooks/useActorConfig.js';
 import { error, info, link, run, success, warning } from '../../lib/outputs.js';
 import { transformEnvToEnvVars } from '../../lib/secrets.js';
@@ -362,6 +363,17 @@ Skipping push. Use --force to override.`,
 		});
 
 		try {
+			// While the log is streaming, forward interrupt signals to a
+			// platform-side abort so the build doesn't keep running after the
+			// user gives up waiting (Ctrl+C, SIGTERM from a parent process,
+			// SIGHUP from a closing terminal). The `using` binding guarantees
+			// the listener is removed before we poll for final status.
+			using _signalHandler = useAbortJobOnSignal({
+				apifyClient,
+				kind: 'build',
+				jobId: build.id,
+			});
+
 			await outputJobLog({ job: build, timeoutMillis: waitForFinishMillis, apifyClient });
 		} catch (err) {
 			warning({ message: 'Can not get log:' });

src/commands/builds/create.ts

@@ -4,6 +4,7 @@ import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 import { Args } from '../../lib/command-framework/args.js';
 import { Flags } from '../../lib/command-framework/flags.js';
 import { resolveActorContext } from '../../lib/commands/resolve-actor-context.js';
+import { useAbortJobOnSignal } from '../../lib/hooks/useAbortJobOnSignal.js';
 import { error, simpleLog } from '../../lib/outputs.js';
 import {
 	getLoggedClientOrThrow,
@@ -158,6 +159,17 @@ export class BuildsCreateCommand extends ApifyCommand<typeof BuildsCreateCommand
 		});
 
 		if (log) {
+			// While the log is streaming, forward interrupt signals to a
+			// platform-side abort so the build doesn't keep running after the
+			// user gives up waiting (Ctrl+C, SIGTERM from a parent process,
+			// SIGHUP from a closing terminal). The `using` binding guarantees
+			// the listener is removed when the block exits.
+			using _signalHandler = useAbortJobOnSignal({
+				apifyClient: client,
+				kind: 'build',
+				jobId: build.id,
+			});
+
 			try {
 				await outputJobLog({ job: build, apifyClient: client });
 			} catch (err) {

src/commands/run.ts

@@ -16,6 +16,7 @@ import { getInputOverride } from '../lib/commands/resolve-input.js';
 import {
 	CommandExitCodes,
 	DEFAULT_LOCAL_STORAGE_DIR,
+	INTERRUPT_SIGNALS,
 	LEGACY_LOCAL_STORAGE_DIR,
 	MINIMUM_SUPPORTED_PYTHON_VERSION,
 	SUPPORTED_NODEJS_VERSION,
@@ -338,6 +339,7 @@ export class RunCommand extends ApifyCommand<typeof RunCommand> {
 							cmd: runtime.executablePath,
 							args: [entrypoint],
 							opts: { env, cwd },
+							forwardSignals: INTERRUPT_SIGNALS,
 						});
 					} else {
 						// Assert the package.json content for scripts
@@ -369,6 +371,7 @@ export class RunCommand extends ApifyCommand<typeof RunCommand> {
 							args: ['run', entrypoint],
 							opts: { env, cwd },
 							overrideCommand: runtime.pmName,
+							forwardSignals: INTERRUPT_SIGNALS,
 						});
 					}
 
@@ -392,12 +395,14 @@ export class RunCommand extends ApifyCommand<typeof RunCommand> {
 							cmd: runtime.executablePath,
 							args: ['-m', entrypoint],
 							opts: { env, cwd },
+							forwardSignals: INTERRUPT_SIGNALS,
 						});
 					} else {
 						await execWithLog({
 							cmd: runtime.executablePath,
 							args: [entrypoint],
 							opts: { env, cwd },
+							forwardSignals: INTERRUPT_SIGNALS,
 						});
 					}
 

src/lib/commands/run-on-cloud.ts

@@ -7,6 +7,7 @@ import { ACTOR_JOB_STATUSES } from '@apify/consts';
 
 import { Flags } from '../command-framework/flags.js';
 import { CommandExitCodes } from '../consts.js';
+import { useAbortJobOnSignal } from '../hooks/useAbortJobOnSignal.js';
 import { error, run as runLog, success, warning } from '../outputs.js';
 import { outputJobLog } from '../utils.js';
 import { resolveInput } from './resolve-input.js';
@@ -90,6 +91,20 @@ export async function* runActorOrTaskOnCloud(apifyClient: ApifyClient, options:
 		throw err;
 	}
 
+	// From this point on the run exists on the platform. Forward interrupt
+	// signals to a platform-side abort so the run does not keep burning
+	// compute units after the user gives up waiting locally (Ctrl+C, SIGTERM
+	// from a parent process, SIGHUP from a closing terminal). The `using`
+	// binding removes the listener when this generator finishes or is
+	// terminated by the consumer (e.g. `break` out of `for await`).
+	using _signalHandler = useAbortJobOnSignal({
+		apifyClient,
+		kind: 'run',
+		jobId: run.id,
+		runType: type,
+		silent,
+	});
+
 	// Return the started run right away
 	yield run;