@flowscripter/dynamic-cli-framework 7.0.11 → 7.1.1

package/dist/src/cli/BaseCLI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseCLI.d.ts","sourceRoot":"","sources":["../../../src/cli/BaseCLI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yCAAyC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAsBzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAS3E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAC;AAGpD,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AAqCpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,YAAW,GAAG;;IAazC,YACE,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,cAAc,EACpC,oBAAoB,EAAE,cAAc,EACpC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,QAAQ,EACxB,cAAc,EAAE,QAAQ,EACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,qBAAqB,EAkEhC;IAED;;;;;;;OAOG;IACI,kBAAkB,CAAC,eAAe,EAAE,eAAe,QAEzD;IAED;;;;;;;;OAQG;IACH;;;;;OAKG;IACI,cAAc,CAAC,IAAI,EAAE,WAAW,QAEtC;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,QAQjC;IAEK,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CA8PzD;CACF"}
+{"version":3,"file":"BaseCLI.d.ts","sourceRoot":"","sources":["../../../src/cli/BaseCLI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yCAAyC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAsBzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAS3E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAC;AAGpD,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AAqCpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,YAAW,GAAG;;IAazC,YACE,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,cAAc,EACpC,oBAAoB,EAAE,cAAc,EACpC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,QAAQ,EACxB,cAAc,EAAE,QAAQ,EACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,qBAAqB,EAmEhC;IAED;;;;;;;OAOG;IACI,kBAAkB,CAAC,eAAe,EAAE,eAAe,QAEzD;IAED;;;;;;;;OAQG;IACH;;;;;OAKG;IACI,cAAc,CAAC,IAAI,EAAE,WAAW,QAEtC;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,QAQjC;IAEK,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAoQzD;CACF"}

package/dist/src/cli/BaseCLI.js

@@ -109,6 +109,7 @@ export default class BaseCLI {
             fetchServiceEnabled: false,
             upgradeServiceEnabled: false,
             upgradeLocationsConfig: { supportedPlatforms: [] },
+            restartAfterAutoUpgrade: false,
             pluginServiceEnabled: false,
             pluginServiceRemoteConfig: { name: "", registryUrl: "", packageJsonNamespace: "" },
             pluginServiceLocalConfig: { nodeModulesPath: "", packageJsonNamespace: "" },
@@ -229,7 +230,8 @@ export default class BaseCLI {
         }
         let upgradeServiceProvider;
         if (this.#options.upgradeServiceEnabled) {
-            upgradeServiceProvider = new UpgradeServiceProvider(UPGRADE_SERVICE_PRIORITY, this.#options.upgradeLocationsConfig);
+            upgradeServiceProvider = new UpgradeServiceProvider(UPGRADE_SERVICE_PRIORITY, this.#options.upgradeLocationsConfig, this.#options.restartAfterAutoUpgrade);
+            upgradeServiceProvider.setRestartArgs(args);
             this.addServiceProvider(upgradeServiceProvider);
         }
         if (this.#options.pluginServiceEnabled) {
@@ -285,6 +287,10 @@ export default class BaseCLI {
             this.#commandRegistry.addCommand(new VersionCommand());
             // run...
             const runResult = await run(args, this.#commandRegistry, this.#serviceProviderRegistry, configurationServiceProvider, keyValueServiceProvider, this.#context, defaultCommand, this.#startupServiceProvider.startupService);
+            // a startup task ended the run, having already handled its outcome itself
+            if (runResult.exitRequested) {
+                return { runState: runResult.runState };
+            }
             // then handle the result...
             if (runResult.runState === RunState.NO_COMMAND) {
                 // print usage

package/dist/src/cli/BaseCLIFeatureOptions.d.ts

@@ -12,6 +12,11 @@ export default interface BaseCLIFeatureOptions {
     readonly fetchServiceEnabled?: boolean;
     readonly upgradeServiceEnabled?: boolean;
     readonly upgradeLocationsConfig?: UpgradeLocationsConfig;
+    /**
+     * When an automatic upgrade on startup succeeds, run the upgraded executable with the same
+     * arguments and end this run with its result, rather than continuing on the old version.
+     */
+    readonly restartAfterAutoUpgrade?: boolean;
     readonly pluginServiceEnabled?: boolean;
     readonly pluginServiceRemoteConfig?: NpmjsPluginRepositoryConfig;
     readonly pluginServiceLocalConfig?: NpmPluginRepositoryConfig;

package/dist/src/cli/BaseCLIFeatureOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseCLIFeatureOptions.d.ts","sourceRoot":"","sources":["../../../src/cli/BaseCLIFeatureOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAEhD,MAAM,CAAC,OAAO,WAAW,qBAAqB;IAC5C,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAC5C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IACzC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,OAAO,CAAC;IAClD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAC5C,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAC9C,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IACzC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IACzD,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,2BAA2B,CAAC;IACjE,QAAQ,CAAC,wBAAwB,CAAC,EAAE,yBAAyB,CAAC;IAC9D,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACrC"}
+{"version":3,"file":"BaseCLIFeatureOptions.d.ts","sourceRoot":"","sources":["../../../src/cli/BaseCLIFeatureOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAEhD,MAAM,CAAC,OAAO,WAAW,qBAAqB;IAC5C,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAC5C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IACzC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,OAAO,CAAC;IAClD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAC5C,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAC9C,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IACzC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IACzD;;;OAGG;IACH,QAAQ,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAC3C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,2BAA2B,CAAC;IACjE,QAAQ,CAAC,wBAAwB,CAAC,EAAE,yBAAyB,CAAC;IAC9D,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACrC"}

package/dist/src/cli/DefaultRuntimeCLI.js

@@ -39,7 +39,7 @@ export default class DefaultRuntimeCLI extends BaseCLI {
         logger.debug(() => `keyReader constructed: ${keyReader !== undefined}`);
         const promptingEnabled = stdinIsTty && stderrIsTty;
         logger.debug(() => `promptingEnabled default: ${promptingEnabled}`);
-        super(cliConfig, Writable.toWeb(process.stdout), Writable.toWeb(process.stderr), supportsColor.stdout !== false, supportsColor.stderr !== false, stdoutTerminal, stderrTerminal, new TtyStyler(colorLevel, supportsHyperlinks(process.stderr)), keyReader, { promptingEnabled, ...options });
+        super(cliConfig, Writable.toWeb(process.stdout), Writable.toWeb(process.stderr), supportsColor.stdout !== false, supportsColor.stderr !== false, stdoutTerminal, stderrTerminal, new TtyStyler(colorLevel, supportsHyperlinks(process.stderr)), keyReader, { promptingEnabled, restartAfterAutoUpgrade: true, ...options });
     }
     async run() {
         const runResult = await super.run(process.argv.slice(2));

package/dist/src/runtime/runner.d.ts

@@ -6,6 +6,13 @@ import type ConfigurationServiceProvider from "../service/configuration/Configur
 import type KeyValueServiceProvider from "../service/configuration/KeyValueServiceProvider.ts";
 import type { Command } from "@flowscripter/dynamic-cli-framework-api";
 import DefaultStartupService from "../service/startup/DefaultStartupService.ts";
+/**
+ * The {@link RunResult} returned by {@link run}, with `exitRequested` set when a startup task ended
+ * the run early by returning an `exitRequest`.
+ */
+export type RunnerResult = RunResult & {
+    readonly exitRequested?: true;
+};
 /**
  * Scan arguments and execute the parsed {@link Command} clauses with provided argument values
  * using the provided {@link Context}.
@@ -34,6 +41,8 @@ import DefaultStartupService from "../service/startup/DefaultStartupService.ts";
  *    - Run the task: awaited before continuing if its mode is "blocking" (the default, and how
  *      every ServiceProvider's initService() behaves); fired without awaiting if "background"
  *      (errors logged, not propagated).
+ *    - Return immediately if a "blocking" task returned an exitRequest, using its runState and
+ *      skipping the remaining tasks and the command.
  * 2. Scan arguments for any GlobalModifierCommand clauses not provided by a StartupTask
  *    - For each discovered clause:
  *      - Set any argument defaults from ConfigurationServiceProvider
@@ -80,5 +89,5 @@ import DefaultStartupService from "../service/startup/DefaultStartupService.ts";
  * @param defaultCommand optional {@link SubCommand} or {@link GlobalCommand} implementation to attempt to parse arguments for and execute if
  * no non-modifier {@link Command} name is identified in the provided arguments.
  */
-export declare function run(args: ReadonlyArray<string>, commandRegistry: CommandRegistry, serviceProviderRegistry: ServiceProviderRegistry, configurationServiceProvider: ConfigurationServiceProvider | undefined, keyValueServiceProvider: KeyValueServiceProvider | undefined, context: Context, defaultCommand?: Command, startupService?: DefaultStartupService): Promise<RunResult>;
+export declare function run(args: ReadonlyArray<string>, commandRegistry: CommandRegistry, serviceProviderRegistry: ServiceProviderRegistry, configurationServiceProvider: ConfigurationServiceProvider | undefined, keyValueServiceProvider: KeyValueServiceProvider | undefined, context: Context, defaultCommand?: Command, startupService?: DefaultStartupService): Promise<RunnerResult>;
 //# sourceMappingURL=runner.d.ts.map

package/dist/src/runtime/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAiB/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAEvF,OAAO,KAAK,4BAA4B,MAAM,0DAA0D,CAAC;AACzG,OAAO,KAAK,uBAAuB,MAAM,qDAAqD,CAAC;AAK/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAKvE,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAqfhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyEG;AACH,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,eAAe,EAAE,eAAe,EAChC,uBAAuB,EAAE,uBAAuB,EAChD,4BAA4B,EAAE,4BAA4B,GAAG,SAAS,EACtE,uBAAuB,EAAE,uBAAuB,GAAG,SAAS,EAC5D,OAAO,EAAE,OAAO,EAChB,cAAc,CAAC,EAAE,OAAO,EACxB,cAAc,CAAC,EAAE,qBAAqB,GACrC,OAAO,CAAC,SAAS,CAAC,CA6JpB"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAiB/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAEvF,OAAO,KAAK,4BAA4B,MAAM,0DAA0D,CAAC;AACzG,OAAO,KAAK,uBAAuB,MAAM,qDAAqD,CAAC;AAK/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAKvE,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAKhF;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAkfzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2EG;AACH,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,eAAe,EAAE,eAAe,EAChC,uBAAuB,EAAE,uBAAuB,EAChD,4BAA4B,EAAE,4BAA4B,GAAG,SAAS,EACtE,uBAAuB,EAAE,uBAAuB,GAAG,SAAS,EAC5D,OAAO,EAAE,OAAO,EAChB,cAAc,CAAC,EAAE,OAAO,EACxB,cAAc,CAAC,EAAE,qBAAqB,GACrC,OAAO,CAAC,YAAY,CAAC,CAoKvB"}

package/dist/src/runtime/runner.js

@@ -389,6 +389,8 @@ async function findAndExecuteDefaultNonModifierCommand(availableArgs, unusedArgs
  *    - Run the task: awaited before continuing if its mode is "blocking" (the default, and how
  *      every ServiceProvider's initService() behaves); fired without awaiting if "background"
  *      (errors logged, not propagated).
+ *    - Return immediately if a "blocking" task returned an exitRequest, using its runState and
+ *      skipping the remaining tasks and the command.
  * 2. Scan arguments for any GlobalModifierCommand clauses not provided by a StartupTask
  *    - For each discovered clause:
  *      - Set any argument defaults from ConfigurationServiceProvider
@@ -477,7 +479,11 @@ export async function run(args, commandRegistry, serviceProviderRegistry, config
             ? keyValueServiceProvider.getContextForScope(context, "service", task.id)
             : context;
         if ((task.mode ?? "blocking") === "blocking") {
-            await task.run(taskContext);
+            const outcome = await task.run(taskContext);
+            if (outcome?.exitRequest) {
+                logger.debug(() => `Startup task '${task.id}' requested exit with run state ${outcome.exitRequest.runState}`);
+                return { runState: outcome.exitRequest.runState, exitRequested: true };
+            }
         }
         else {
             void task.run(taskContext).catch((error) => {

package/dist/src/service/completion/command/CompletionCompleteSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompletionCompleteSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionCompleteSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAMrF,qBAAa,4BAA6B,YAAW,UAAU;IAC7D,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,gDAAgD;IACpE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,yBAAyB,QAAQ;IAE1C,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAM;IAE7C,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAc7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBrE;CACF"}
+{"version":3,"file":"CompletionCompleteSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionCompleteSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAMrF,qBAAa,4BAA6B,YAAW,UAAU;IAC7D,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,gDAAgD;IACpE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,yBAAyB,QAAQ;IAE1C,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAM;IAE7C,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAc7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBrE;CACF"}

package/dist/src/service/completion/command/CompletionIntegrationSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompletionIntegrationSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionIntegrationSubCommand.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAMrF,qBAAa,+BAAgC,YAAW,UAAU;IAChE,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,WAAW,0CAA0C;IAC9D,QAAQ,CAAC,mBAAmB,SAAS;IAErC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAOrC;IAEF,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAO7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2DrE;CACF"}
+{"version":3,"file":"CompletionIntegrationSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionIntegrationSubCommand.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAMrF,qBAAa,+BAAgC,YAAW,UAAU;IAChE,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,WAAW,0CAA0C;IAC9D,QAAQ,CAAC,mBAAmB,SAAS;IAErC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAOrC;IAEF,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAO7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyDrE;CACF"}

package/dist/src/service/configuration/DefaultKeyValueService.d.ts

@@ -7,8 +7,16 @@ import type DefaultSecretService from "./DefaultSecretService.ts";
  */
 export default class DefaultKeyValueService implements KeyValueService {
     #private;
-    constructor(keyValueData: Map<string, ValueNode>, secretService?: DefaultSecretService);
+    /**
+     * @param keyValueData the scope's data.
+     * @param secretService optional secret service for {@link Secret} values.
+     * @param flushToStorage optional callback which writes every scope's pending changes to storage
+     * and marks them clean, invoked by {@link flush}.
+     */
+    constructor(keyValueData: Map<string, ValueNode>, secretService?: DefaultSecretService, flushToStorage?: () => Promise<void>);
     isDirty(): boolean;
+    markClean(): void;
+    flush(): Promise<void>;
     get<T extends ValueNode = ValueNode>(key: string): Promise<T>;
     has(key: string): Promise<boolean>;
     set(key: string, value: SettableValueNode): Promise<void>;

package/dist/src/service/configuration/DefaultKeyValueService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultKeyValueService.d.ts","sourceRoot":"","sources":["../../../../src/service/configuration/DefaultKeyValueService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAGlE;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;;IAKpE,YAAY,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,aAAa,CAAC,EAAE,oBAAoB,EAGrF;IAEM,OAAO,IAAI,OAAO,CAExB;IAEY,GAAG,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAsBzE;IAEM,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAExC;IAEY,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrE;IAsCY,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9C;CAsBF"}
+{"version":3,"file":"DefaultKeyValueService.d.ts","sourceRoot":"","sources":["../../../../src/service/configuration/DefaultKeyValueService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAGlE;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;;IAMpE;;;;;OAKG;IACH,YACE,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EACpC,aAAa,CAAC,EAAE,oBAAoB,EACpC,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAKrC;IAEM,OAAO,IAAI,OAAO,CAExB;IAEM,SAAS,IAAI,IAAI,CAEvB;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAEY,GAAG,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAsBzE;IAEM,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAExC;IAEY,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrE;IAsCY,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9C;CAsBF"}

package/dist/src/service/configuration/DefaultKeyValueService.js

@@ -9,13 +9,28 @@ export default class DefaultKeyValueService {
     #keyValueData;
     #dirty = false;
     #secretService;
-    constructor(keyValueData, secretService) {
+    #flushToStorage;
+    /**
+     * @param keyValueData the scope's data.
+     * @param secretService optional secret service for {@link Secret} values.
+     * @param flushToStorage optional callback which writes every scope's pending changes to storage
+     * and marks them clean, invoked by {@link flush}.
+     */
+    constructor(keyValueData, secretService, flushToStorage) {
         this.#keyValueData = keyValueData;
         this.#secretService = secretService;
+        this.#flushToStorage = flushToStorage;
     }
     isDirty() {
         return this.#dirty;
     }
+    markClean() {
+        this.#dirty = false;
+    }
+    async flush() {
+        await this.#flushToStorage?.();
+        this.#dirty = false;
+    }
     async get(key) {
         const value = this.#keyValueData.get(key);
         if (value === undefined) {

package/dist/src/service/configuration/KeyValueServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KeyValueServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/configuration/KeyValueServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EACV,eAAe,EAGhB,MAAM,yCAAyC,CAAC;AAIjD,OAAO,KAAK,4BAA4B,MAAM,mCAAmC,CAAC;AAClF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAgClF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAwB,YAAW,eAAe;;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAwB;IAClD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAIjC,SAAgB,sBAAsB,EAAE,OAAO,CAAC;IAChD,SAAgB,oBAAoB,EAAE,OAAO,CAAC;IAW9C;;;;;;;;OAQG;IACH,YACE,eAAe,EAAE,MAAM,EACvB,4BAA4B,EAAE,4BAA4B,EAC1D,sBAAsB,UAAQ,EAC9B,oBAAoB,UAAQ,EAY7B;IAEM,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAUhE;IAED;;;;;;;;;;OAUG;IACI,wBAAwB,CAC7B,SAAS,EAAE,wBAAwB,EACnC,QAAQ,EAAE,MAAM,GACf,eAAe,CAsBjB;IAED;;;;;;;;;;;;;;OAcG;IACI,kBAAkB,CACvB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,wBAAwB,EACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAaT;IAeY,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CASxD;CACF"}
+{"version":3,"file":"KeyValueServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/configuration/KeyValueServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EACV,eAAe,EAGhB,MAAM,yCAAyC,CAAC;AAIjD,OAAO,KAAK,4BAA4B,MAAM,mCAAmC,CAAC;AAClF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAoClF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAwB,YAAW,eAAe;;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAwB;IAClD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAIjC,SAAgB,sBAAsB,EAAE,OAAO,CAAC;IAChD,SAAgB,oBAAoB,EAAE,OAAO,CAAC;IAW9C;;;;;;;;OAQG;IACH,YACE,eAAe,EAAE,MAAM,EACvB,4BAA4B,EAAE,4BAA4B,EAC1D,sBAAsB,UAAQ,EAC9B,oBAAoB,UAAQ,EAY7B;IAEM,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAUhE;IAED;;;;;;;;;;OAUG;IACI,wBAAwB,CAC7B,SAAS,EAAE,wBAAwB,EACnC,QAAQ,EAAE,MAAM,GACf,eAAe,CAwBjB;IAED;;;;;;;;;;;;;;OAcG;IACI,kBAAkB,CACvB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,wBAAwB,EACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAaT;IAqBY,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CASxD;CACF"}

package/dist/src/service/configuration/KeyValueServiceProvider.js

@@ -22,6 +22,9 @@ class UnreachableKeyValueService {
     delete() {
         return Promise.reject(new Error(UnreachableKeyValueService.#message));
     }
+    flush() {
+        return Promise.reject(new Error(UnreachableKeyValueService.#message));
+    }
     static #message = "KeyValueService accessed without a resolved scope - this should be unreachable";
 }
 /**
@@ -151,7 +154,7 @@ export default class KeyValueServiceProvider {
         const secretService = this.secretServiceEnabled
             ? new DefaultSecretService(this.#cliConfigName, `${scopeType}_${scopeKey}`)
             : undefined;
-        const scopedService = new DefaultKeyValueService(keyValueData, secretService);
+        const scopedService = new DefaultKeyValueService(keyValueData, secretService, () => this.#flushDirtyScopes());
         scopedServices.set(scopeKey, scopedService);
         return scopedService;
     }
@@ -184,15 +187,19 @@ export default class KeyValueServiceProvider {
     }
     /**
      * Flush every scoped KeyValueService's data to the configuration file, if any of them report
-     * themselves dirty. Registered as a low-priority ShutdownTask (see {@link initService}) so it
-     * runs once, after other shutdown cleanup, regardless of how long any scope was written to.
+     * themselves dirty, then mark them all clean. Registered as a low-priority ShutdownTask (see
+     * {@link initService}) so it runs once, after other shutdown cleanup, regardless of how long any
+     * scope was written to. Also backs {@link KeyValueService.flush} for every scope.
      */
     async #flushDirtyScopes() {
-        const anyDirty = [
+        const scopedServices = [
             ...this.#commandScopedKeyValueServices.values(),
             ...this.#serviceScopedKeyValueServices.values(),
-        ].some((service) => service.isDirty());
-        await this.#configurationServiceProvider.flushIfDirty(anyDirty);
+        ];
+        await this.#configurationServiceProvider.flushIfDirty(scopedServices.some((service) => service.isDirty()));
+        for (const service of scopedServices) {
+            service.markClean();
+        }
     }
     async initService(context) {
         if (this.keyValueServiceEnabled || this.secretServiceEnabled) {

package/dist/src/service/prompter/DefaultPrompterService.d.ts

@@ -1,4 +1,4 @@
-import type { PrompterService } from "@flowscripter/dynamic-cli-framework-api";
+import type { Context, PrompterService } from "@flowscripter/dynamic-cli-framework-api";
 import { type Prompt, type PromptResult } from "@flowscripter/dynamic-cli-framework-api";
 import type Terminal from "../../terminal/Terminal.ts";
 import type KeyReader from "../../terminal/KeyReader.ts";
@@ -15,6 +15,7 @@ export default class DefaultPrompterService implements PrompterService {
     #private;
     promptEnabled: boolean;
     constructor(config: PrompterServiceConfig, terminal: Terminal, keyReader: KeyReader, printerService: PrinterService);
+    setContext(context: Context): void;
     prompt(promptDef: Prompt): Promise<PromptResult>;
     promptAll(prompts: ReadonlyArray<Prompt>): Promise<ReadonlyArray<PromptResult>>;
 }

package/dist/src/service/prompter/DefaultPrompterService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultPrompterService.d.ts","sourceRoot":"","sources":["../../../../src/service/prompter/DefaultPrompterService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EACL,KAAK,MAAM,EACX,KAAK,YAAY,EAElB,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,SAAS,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAS9E,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,eAAO,MAAM,uBAAuB,EAAE,qBAKrC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;;IACpE,aAAa,UAAQ;IAIrB,YACE,MAAM,EAAE,qBAAqB,EAC7B,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAG/B;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CA2B/C;IAEK,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAMpF;CACF"}
+{"version":3,"file":"DefaultPrompterService.d.ts","sourceRoot":"","sources":["../../../../src/service/prompter/DefaultPrompterService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EACL,KAAK,MAAM,EACX,KAAK,YAAY,EAElB,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,SAAS,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAS9E,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,eAAO,MAAM,uBAAuB,EAAE,qBAKrC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;;IACpE,aAAa,UAAQ;IAIrB,YACE,MAAM,EAAE,qBAAqB,EAC7B,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAG/B;IAED,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAEjC;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CA2B/C;IAEK,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAMpF;CACF"}

package/dist/src/service/prompter/DefaultPrompterService.js

@@ -17,6 +17,9 @@ export default class DefaultPrompterService {
     constructor(config, terminal, keyReader, printerService) {
         this.#ctx = { config, terminal, keyReader, printerService };
     }
+    setContext(context) {
+        this.#ctx = { ...this.#ctx, context };
+    }
     prompt(promptDef) {
         if (!this.promptEnabled) {
             if (promptDef.defaultOption) {

package/dist/src/service/prompter/PrompterServiceProvider.d.ts

@@ -1,13 +1,12 @@
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type { ServiceInfo, ServiceProvider } from "@flowscripter/dynamic-cli-framework-api";
-import type { PrompterService } from "@flowscripter/dynamic-cli-framework-api";
-import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+import type { CLIConfig, PrompterService } from "@flowscripter/dynamic-cli-framework-api";
 export default class PrompterServiceProvider implements ServiceProvider {
     readonly serviceId: string;
     readonly servicePriority: number;
     readonly prompterService: PrompterService;
     constructor(servicePriority: number, prompterService: PrompterService);
     getServiceInfo(_cliConfig: CLIConfig): Promise<ServiceInfo>;
-    initService(_context: Context): Promise<void>;
+    initService(context: Context): Promise<void>;
 }
 //# sourceMappingURL=PrompterServiceProvider.d.ts.map

package/dist/src/service/prompter/PrompterServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrompterServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/prompter/PrompterServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,MAAM,CAAC,OAAO,OAAO,uBAAwB,YAAW,eAAe;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAuB;IACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAE1C,YAAmB,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAG3E;IAEM,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAKjE;IAED,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5C;CACF"}
+{"version":3,"file":"PrompterServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/prompter/PrompterServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG5F,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1F,MAAM,CAAC,OAAO,OAAO,uBAAwB,YAAW,eAAe;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAuB;IACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAE1C,YAAmB,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAG3E;IAEM,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAKjE;IAED,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAK3C;CACF"}

package/dist/src/service/prompter/PrompterServiceProvider.js

@@ -1,5 +1,6 @@
 import { PROMPTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import NoPromptCommand from "./command/NoPromptCommand.js";
+import DefaultPrompterService from "./DefaultPrompterService.js";
 export default class PrompterServiceProvider {
     serviceId = PROMPTER_SERVICE_ID;
     servicePriority;
@@ -14,7 +15,10 @@ export default class PrompterServiceProvider {
             commands: [new NoPromptCommand(this.servicePriority)],
         });
     }
-    initService(_context) {
+    initService(context) {
+        if (this.prompterService instanceof DefaultPrompterService) {
+            this.prompterService.setContext(context);
+        }
         return Promise.resolve();
     }
 }

package/dist/src/service/prompter/prompt/PromptContext.d.ts

@@ -1,4 +1,4 @@
-import type { Prompt } from "@flowscripter/dynamic-cli-framework-api";
+import type { Context, Prompt, SpawnService } from "@flowscripter/dynamic-cli-framework-api";
 import type Terminal from "../../../terminal/Terminal.ts";
 import type KeyReader from "../../../terminal/KeyReader.ts";
 import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
@@ -8,7 +8,10 @@ export interface PromptContext {
     readonly terminal: Terminal;
     readonly keyReader: KeyReader;
     readonly printerService: PrinterService;
+    readonly context?: Context;
 }
+export declare function interrupt(ctx: PromptContext): void;
+export declare function getSpawnService(ctx: PromptContext): SpawnService | undefined;
 export declare function physicalLineCount(terminal: Terminal, text: string): number;
 export declare function headerLineCount(terminal: Terminal, promptDef: Prompt): number;
 export declare function renderPromptHeader(ctx: PromptContext, promptDef: Prompt): Promise<void>;

package/dist/src/service/prompter/prompt/PromptContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PromptContext.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/PromptContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,KAAK,SAAS,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CACzC;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAO1E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK7F"}
+{"version":3,"file":"PromptContext.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/PromptContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,MAAM,EAEN,YAAY,EACb,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,KAAK,SAAS,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CAElD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY,GAAG,SAAS,CAK5E;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAO1E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK7F"}

package/dist/src/service/prompter/prompt/PromptContext.js

@@ -1,3 +1,13 @@
+import { SHUTDOWN_SERVICE_ID, SPAWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export function interrupt(ctx) {
+    ctx.context?.getServiceById(SHUTDOWN_SERVICE_ID)?.interrupt();
+}
+export function getSpawnService(ctx) {
+    if (!ctx.context?.doesServiceExist(SPAWN_SERVICE_ID)) {
+        return undefined;
+    }
+    return ctx.context.getServiceById(SPAWN_SERVICE_ID);
+}
 export function physicalLineCount(terminal, text) {
     const cols = terminal.columns();
     if (cols <= 0)

package/dist/src/service/prompter/prompt/promptMultiSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promptMultiSelect.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptMultiSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAIpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,wBAA8B,iBAAiB,CAC7C,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA0EvB"}
+{"version":3,"file":"promptMultiSelect.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptMultiSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,wBAA8B,iBAAiB,CAC7C,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA0EvB"}

package/dist/src/service/prompter/prompt/promptMultiSelect.js

@@ -1,6 +1,5 @@
 import { SpecialKey } from "../../../terminal/KeyReader.js";
-import ShutdownServiceProvider from "../../shutdown/ShutdownServiceProvider.js";
-import { headerLineCount, renderPromptHeader } from "./PromptContext.js";
+import { headerLineCount, renderPromptHeader, interrupt } from "./PromptContext.js";
 export default async function promptMultiSelect(ctx, promptDef) {
     const options = promptDef.options;
     if (options.length === 0) {
@@ -63,7 +62,7 @@ export default async function promptMultiSelect(ctx, promptDef) {
             }
             else if (keyEvent.specialKey === SpecialKey.INTERRUPT) {
                 await ctx.terminal.showCursor();
-                ShutdownServiceProvider.onInterrupt();
+                interrupt(ctx);
                 throw new Error("Interrupted");
             }
         }

package/dist/src/service/prompter/prompt/promptOpenUrl.d.ts

@@ -1,4 +1,5 @@
-import type { Prompt, PromptResult } from "@flowscripter/dynamic-cli-framework-api";
+import type { Prompt, PromptResult, SpawnService } from "@flowscripter/dynamic-cli-framework-api";
 import type { PromptContext } from "./PromptContext.ts";
+export declare function defaultOpenUrl(spawnService: SpawnService, url: string): Promise<void>;
 export default function promptOpenUrl(ctx: PromptContext, promptDef: Prompt): Promise<PromptResult>;
 //# sourceMappingURL=promptOpenUrl.d.ts.map

package/dist/src/service/prompter/prompt/promptOpenUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promptOpenUrl.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptOpenUrl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAIpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA2BxD,wBAA8B,aAAa,CACzC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA+CvB"}
+{"version":3,"file":"promptOpenUrl.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptOpenUrl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGlG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMxD,wBAAsB,cAAc,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwB3F;AAED,wBAA8B,aAAa,CACzC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CAkDvB"}

package/dist/src/service/prompter/prompt/promptOpenUrl.js

@@ -1,10 +1,9 @@
 import { SpecialKey } from "../../../terminal/KeyReader.js";
-import ShutdownServiceProvider from "../../shutdown/ShutdownServiceProvider.js";
-import { renderPromptHeader } from "./PromptContext.js";
+import { getSpawnService, interrupt, renderPromptHeader } from "./PromptContext.js";
 function isRemoteSession() {
     return !!(process.env.SSH_CONNECTION || process.env.SSH_CLIENT || process.env.SSH_TTY);
 }
-async function defaultOpenUrl(url) {
+export async function defaultOpenUrl(spawnService, url) {
     const parsed = new URL(url);
     if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
         throw new Error(`Unsupported URL protocol: ${parsed.protocol}`);
@@ -20,11 +19,14 @@ async function defaultOpenUrl(url) {
     else {
         cmd = ["xdg-open", url];
     }
-    const proc = Bun.spawn(cmd, { stdout: "ignore", stderr: "ignore" });
-    const exitCode = await proc.exited;
-    if (exitCode !== 0) {
-        throw new Error(`Failed to open URL (exit code ${exitCode})`);
+    const result = await spawnService.spawn(cmd, { mode: "ignore", longRunning: false });
+    if (result.ok) {
+        return;
     }
+    if ("error" in result && result.error) {
+        throw result.error;
+    }
+    throw new Error(`Failed to open URL (exit code ${"exitCode" in result ? result.exitCode : "unknown"})`);
 }
 export default async function promptOpenUrl(ctx, promptDef) {
     if (promptDef.options.length === 0) {
@@ -32,8 +34,10 @@ export default async function promptOpenUrl(ctx, promptDef) {
     }
     const url = String(promptDef.options[0].returnedValue);
     const displayLabel = promptDef.options[0].displayValue;
-    const openUrlFn = ctx.config.openUrl ?? defaultOpenUrl;
-    const canOpenBrowser = !isRemoteSession();
+    const spawnService = getSpawnService(ctx);
+    const openUrlFn = ctx.config.openUrl ??
+        (spawnService ? (target) => defaultOpenUrl(spawnService, target) : undefined);
+    const canOpenBrowser = openUrlFn !== undefined && !isRemoteSession();
     ctx.keyReader.enableRawMode();
     try {
         await renderPromptHeader(ctx, promptDef);
@@ -59,7 +63,7 @@ export default async function promptOpenUrl(ctx, promptDef) {
                 throw new Error("Prompt cancelled");
             }
             else if (keyEvent.specialKey === SpecialKey.INTERRUPT) {
-                ShutdownServiceProvider.onInterrupt();
+                interrupt(ctx);
                 throw new Error("Interrupted");
             }
         }

package/dist/src/service/prompter/prompt/promptSingleSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promptSingleSelect.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptSingleSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAIpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,wBAA8B,kBAAkB,CAC9C,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA2EvB"}
+{"version":3,"file":"promptSingleSelect.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptSingleSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,wBAA8B,kBAAkB,CAC9C,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA2EvB"}

package/dist/src/service/prompter/prompt/promptSingleSelect.js

@@ -1,6 +1,5 @@
 import { SpecialKey } from "../../../terminal/KeyReader.js";
-import ShutdownServiceProvider from "../../shutdown/ShutdownServiceProvider.js";
-import { headerLineCount, renderPromptHeader } from "./PromptContext.js";
+import { headerLineCount, renderPromptHeader, interrupt } from "./PromptContext.js";
 export default async function promptSingleSelect(ctx, promptDef) {
     const options = promptDef.options;
     if (options.length === 0) {
@@ -62,7 +61,7 @@ export default async function promptSingleSelect(ctx, promptDef) {
             }
             else if (keyEvent.specialKey === SpecialKey.INTERRUPT) {
                 await ctx.terminal.showCursor();
-                ShutdownServiceProvider.onInterrupt();
+                interrupt(ctx);
                 throw new Error("Interrupted");
             }
         }

package/dist/src/service/prompter/prompt/promptText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promptText.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAKpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,wBAA8B,UAAU,CACtC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA+EvB"}
+{"version":3,"file":"promptText.d.ts","sourceRoot":"","sources":["../../../../../src/service/prompter/prompt/promptText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAIpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,wBAA8B,UAAU,CACtC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA+EvB"}

package/dist/src/service/prompter/prompt/promptText.js

@@ -1,6 +1,5 @@
 import { SpecialKey } from "../../../terminal/KeyReader.js";
-import ShutdownServiceProvider from "../../shutdown/ShutdownServiceProvider.js";
-import { renderPromptHeader } from "./PromptContext.js";
+import { renderPromptHeader, interrupt } from "./PromptContext.js";
 export default async function promptText(ctx, promptDef) {
     ctx.keyReader.enableRawMode();
     try {
@@ -24,7 +23,7 @@ export default async function promptText(ctx, promptDef) {
                 }
                 else if (keyEvent.specialKey === SpecialKey.INTERRUPT) {
                     await ctx.terminal.write("\n");
-                    ShutdownServiceProvider.onInterrupt();
+                    interrupt(ctx);
                     throw new Error("Interrupted");
                 }
                 else if (keyEvent.specialKey === SpecialKey.BACKSPACE) {

package/dist/src/service/shutdown/DefaultShutdownService.d.ts

@@ -1,10 +1,13 @@
 import type { ShutdownService, ShutdownTask } from "@flowscripter/dynamic-cli-framework-api";
 import PriorityTaskList from "../../runtime/lifecycle/PriorityTaskList.ts";
 export default class DefaultShutdownService implements ShutdownService {
+    #private;
     static readonly taskList: PriorityTaskList<ShutdownTask>;
+    constructor(onInterrupt?: () => void);
     registerTask(task: ShutdownTask): void;
     enterLongRunningMode(): void;
     leaveLongRunningMode(): void;
+    interrupt(): void;
     get isShutdownRequested(): boolean;
 }
 //# sourceMappingURL=DefaultShutdownService.d.ts.map

package/dist/src/service/shutdown/DefaultShutdownService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultShutdownService.d.ts","sourceRoot":"","sources":["../../../../src/service/shutdown/DefaultShutdownService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC7F,OAAO,gBAAgB,MAAM,6CAA6C,CAAC;AAG3E,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;IACpE,MAAM,CAAC,QAAQ,CAAC,QAAQ,iCAAwC;IAEhE,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAErC;IAED,oBAAoB,IAAI,IAAI,CAE3B;IAED,oBAAoB,IAAI,IAAI,CAE3B;IAED,IAAI,mBAAmB,IAAI,OAAO,CAEjC;CACF"}
+{"version":3,"file":"DefaultShutdownService.d.ts","sourceRoot":"","sources":["../../../../src/service/shutdown/DefaultShutdownService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC7F,OAAO,gBAAgB,MAAM,6CAA6C,CAAC;AAG3E,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;;IACpE,MAAM,CAAC,QAAQ,CAAC,QAAQ,iCAAwC;IAIhE,YAAmB,WAAW,GAAE,MAAM,IAAe,EAEpD;IAED,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAErC;IAED,oBAAoB,IAAI,IAAI,CAE3B;IAED,oBAAoB,IAAI,IAAI,CAE3B;IAED,SAAS,IAAI,IAAI,CAEhB;IAED,IAAI,mBAAmB,IAAI,OAAO,CAEjC;CACF"}

package/dist/src/service/shutdown/DefaultShutdownService.js

@@ -2,6 +2,10 @@ import PriorityTaskList from "../../runtime/lifecycle/PriorityTaskList.js";
 import { shutdownState } from "./ShutdownState.js";
 export default class DefaultShutdownService {
     static taskList = new PriorityTaskList();
+    #onInterrupt;
+    constructor(onInterrupt = () => { }) {
+        this.#onInterrupt = onInterrupt;
+    }
     registerTask(task) {
         DefaultShutdownService.taskList.add(task);
     }
@@ -11,6 +15,9 @@ export default class DefaultShutdownService {
     leaveLongRunningMode() {
         shutdownState.longRunningMode = false;
     }
+    interrupt() {
+        this.#onInterrupt();
+    }
     get isShutdownRequested() {
         return shutdownState.shutdownRequested;
     }

package/dist/src/service/shutdown/ShutdownServiceProvider.js

@@ -1,6 +1,6 @@
 import process from "node:process";
 import DefaultShutdownService from "./DefaultShutdownService.js";
-import { SHUTDOWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import { RunState, SHUTDOWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import getLogger from "../../util/logger.js";
 import { shutdownState } from "./ShutdownState.js";
 const logger = getLogger("ShutdownServiceProvider");
@@ -11,7 +11,7 @@ export default class ShutdownServiceProvider {
     static #shutdownInProgress = false;
     constructor(servicePriority) {
         this.servicePriority = servicePriority;
-        this.#shutdownService = new DefaultShutdownService();
+        this.#shutdownService = new DefaultShutdownService(ShutdownServiceProvider.onInterrupt);
         process.on("beforeExit", ShutdownServiceProvider.shutdown);
         process.on("SIGINT", ShutdownServiceProvider.onInterrupt);
         process.on("SIGTERM", ShutdownServiceProvider.onTerminate);
@@ -29,7 +29,7 @@ export default class ShutdownServiceProvider {
         shutdownState.interruptCount++;
         if (!shutdownState.longRunningMode || shutdownState.interruptCount >= 3) {
             ShutdownServiceProvider.shutdown().then(() => {
-                process.exit(130);
+                process.exit(RunState.INTERRUPTED);
             });
         }
         else {
@@ -38,7 +38,7 @@ export default class ShutdownServiceProvider {
     }
     static onTerminate() {
         ShutdownServiceProvider.shutdown().then(() => {
-            process.exit(143);
+            process.exit(RunState.TERMINATED);
         });
     }
     static async shutdown() {

package/dist/src/service/spawn/DefaultSpawnService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSpawnService.d.ts","sourceRoot":"","sources":["../../../../src/service/spawn/DefaultSpawnService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,OAAO,EAGP,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,yCAAyC,CAAC;AASjD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAa3E;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,YAAY;;IAGvD,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExC;IA+CY,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,WAAW,CAAC,CA0FtB;CACF"}
+{"version":3,"file":"DefaultSpawnService.d.ts","sourceRoot":"","sources":["../../../../src/service/spawn/DefaultSpawnService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,OAAO,EAGP,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,yCAAyC,CAAC;AASjD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAa3E;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,YAAY;;IAGvD,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExC;IA+CY,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,WAAW,CAAC,CA2FtB;CACF"}

package/dist/src/service/spawn/DefaultSpawnService.js

@@ -80,6 +80,7 @@ export default class DefaultSpawnService {
         try {
             proc = Bun.spawn(resolveForPlatform(command), {
                 cwd: options.cwd,
+                env: options.env === undefined ? undefined : { ...process.env, ...options.env },
                 stdin: mode === "inherit" ? "inherit" : "ignore",
                 stdout: mode === "wrapped" ? "pipe" : mode === "ignore" ? "ignore" : "inherit",
                 stderr: mode === "wrapped" ? "pipe" : mode === "ignore" ? "ignore" : "inherit",