@ms-cloudpack/cli 0.72.52 → 0.72.54

package/lib/commands/init/init.js

@@ -1,4 +1,3 @@
-import { TaskRunner } from '@ms-cloudpack/api-server';
 import { createPartialApiContext } from '@ms-cloudpack/api-server';
 import { writeGeneratedConfig } from '@ms-cloudpack/config';
 import { evaluatePath } from './evaluatePath.js';
@@ -12,41 +11,23 @@ import { bulletedList } from '@ms-cloudpack/task-reporter';
 /**
  * Init execution function.
  */
-export async function init(parameters) {
-    const { options, contexts, autoDispose, appSummaries } = parameters;
-    const summaries = [];
-    const taskRunner = new TaskRunner();
-    for (const appContext of contexts) {
-        await appContext.telemetryClient.tracer.startActiveSpan('INIT_APP', async (span) => {
-            const summary = await initApp({
-                appContext,
-                options,
-                autoDispose,
-                summaryData: appSummaries[appContext.appPath],
-                taskRunner,
-                isMultiApp: contexts.length > 1,
-                span,
-            });
-            summaries.push(summary);
-        });
-    }
-    return summaries;
+export async function init(params) {
+    const { options, summaryData, isMultiApp, config, telemetryClient } = params;
+    await telemetryClient.tracer.startActiveSpan('INIT_APP', async (span) => {
+        // Run prerequisites for the app.
+        await runPrerequisites(params);
+        // If --reset is specified, reset the generated config.
+        if (options.reset) {
+            config.generated = {};
+        }
+        const apiContext = await createPartialApiContext(params);
+        await initApp({ apiContext, span, summaryData, options, isMultiApp });
+    });
 }
 async function initApp(params) {
-    const { appContext, options, autoDispose, summaryData, taskRunner, isMultiApp, span } = params;
-    const { appPath, config } = appContext;
-    // Run prerequisites for the app.
-    await runPrerequisites(appContext);
-    // If --reset is specified, reset the generated config.
-    if (options.reset) {
-        config.generated = {};
-    }
-    const apiContext = await createPartialApiContext({
-        ...appContext,
-        items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],
-        taskRunner,
-    });
-    autoDispose(apiContext);
+    const { apiContext, options, summaryData, span, isMultiApp } = params;
+    const { config } = apiContext.session;
+    const { appPath } = config;
     const resolveMap = apiContext.session.resolveMap;
     // Ensure config.generated.packageSettings is initialized.
     config.generated.packageSettings ??= [];
@@ -150,8 +131,11 @@ async function initApp(params) {
         console.log('\nWriting resolve map to `resolve-map.json`.');
         await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);
     }
-    // Only do extra checks if there's not a major error already
-    if (!isExitingPrematurely) {
+    if (isExitingPrematurely) {
+        span.setAttribute('isExitingPrematurely', true);
+    }
+    else {
+        // Only do extra checks if there's not a major error already
         if (config.features?.optimizeDependencies) {
             // Conditionally scan dependency usage so that we can populate
             // include/excludeDependencies automatically, ensuring the dep list
@@ -167,18 +151,16 @@ async function initApp(params) {
             }
         }
     }
-    const summary = summaryData.summarize(options);
     // The feature "removeUnusedExports" doesn't (yet) write summary changes, but we still
     // want to write the generated config if that featureFlag is on.
-    const hasSummaryChanges = config.features?.removeUnusedExports || summary.totalChanges;
+    const hasSummaryChanges = config.features?.removeUnusedExports || summaryData.hasChanges();
     if (!options.check && hasSummaryChanges) {
         // Update the generated config: either write it if there are settings, or delete it if it
         // previously existed but is no longer needed.
         const generatedResult = await writeGeneratedConfig(config.generated, appPath);
         if (generatedResult === 'deleted') {
-            summary.deletedGeneratedConfig = true;
+            summaryData.deletedGeneratedConfig = true;
         }
     }
-    return summary;
 }
 //# sourceMappingURL=init.js.map

package/lib/commands/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Context, TaskRunner } from '@ms-cloudpack/api-server';\nimport type { PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\nimport { verifyExports } from './verifyExports.js';\nimport type { AppCommandContext } from '../../types/CommandAction.js';\nimport path from 'path';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\nimport type { Span } from '@ms-cloudpack/telemetry';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  contexts: AppCommandContext[];\n  autoDispose: AutoDispose;\n  /**\n   * App summary objects, created ahead of time so that a partial summary can be generated\n   * if the process is interrupted.\n   */\n  appSummaries: Record<string, InitSummaryData>;\n}): Promise<InitSummary[]> {\n  const { options, contexts, autoDispose, appSummaries } = parameters;\n\n  const summaries: InitSummary[] = [];\n\n  const taskRunner = new TaskRunner();\n\n  for (const appContext of contexts) {\n    await appContext.telemetryClient.tracer.startActiveSpan('INIT_APP', async (span) => {\n      const summary = await initApp({\n        appContext,\n        options,\n        autoDispose,\n        summaryData: appSummaries[appContext.appPath],\n        taskRunner,\n        isMultiApp: contexts.length > 1,\n        span,\n      });\n      summaries.push(summary);\n    });\n  }\n\n  return summaries;\n}\n\nasync function initApp(params: {\n  appContext: AppCommandContext;\n  options: InitOptions;\n  autoDispose: AutoDispose;\n  summaryData: InitSummaryData;\n  taskRunner: TaskRunner;\n  isMultiApp: boolean;\n  span: Span;\n}): Promise<InitSummary> {\n  const { appContext, options, autoDispose, summaryData, taskRunner, isMultiApp, span } = params;\n  const { appPath, config } = appContext;\n\n  // Run prerequisites for the app.\n  await runPrerequisites(appContext);\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const apiContext: Context = await createPartialApiContext({\n    ...appContext,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n    taskRunner,\n  });\n  autoDispose(apiContext);\n  const resolveMap = apiContext.session.resolveMap;\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  let isExitingPrematurely = false;\n\n  await new Promise<void>((resolve) => {\n    let pending = 0;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n    const priorityMap = new Map<string, number>();\n\n    // Start with the app path or requested matches\n    const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];\n    if (!initialPaths.length) {\n      summaryData.addErrors(appPath, [{ text: `No packages found matching ${options.match}`, source: 'init' }]);\n      resolve();\n    }\n\n    enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>): void {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          console.debug(`Skipping ${packagePath} as it has already been visited.`);\n          continue;\n        }\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        // Get the priority value for this package path, defaults to 0.\n        const priority = priorityMap.get(packagePath) ?? 0;\n        // Lower priority of this package path by 1.\n        priorityMap.set(packagePath, priority - 1);\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          appPath,\n          packagePath,\n          importerContext,\n          config,\n          span,\n          resolveMap,\n          initOptions: options,\n          summaryData,\n          ctx: apiContext,\n          // No need to force if we're in a multi-app scenario\n          // as we'll re-evaluate packages if they are different since we use a different task id.\n          shouldForce: !isMultiApp && shouldForce,\n          isMultiApp,\n          priority,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size) {\n              // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them\n              // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through\n              // on single app runs.\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              console.debug(\n                `Enqueuing paths found from ${packagePath}:\\n` +\n                  bulletedList(\n                    [...pathsToEvaluate].map(([newPath, newContext]) => `${newPath} ${JSON.stringify(newContext)}`),\n                  ),\n              );\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error) => {\n            // Record the exception as an init error for the package.\n            // This gives better context than a stack trace which could have come from any package.\n            let prefix = 'evaluating package';\n            if (importerContext) {\n              prefix += ` (context: ${JSON.stringify(importerContext, null, 2).replace(/\\s+/g, ' ')})`;\n            }\n            summaryData.recordException({ packagePath, error, source: 'init', context: prefix });\n\n            // Don't immediately stop evaluation, but don't enqueue more paths.\n            isExitingPrematurely = true;\n          });\n      }\n    }\n  }).catch((error) => {\n    // If there's an error thrown from some other part of the promise besides evaluatePath (not likely),\n    // record it as an init error for the app instead of allowing it to propagate.\n    // This allows the overall init summary and any other errors to be logged as usual.\n    isExitingPrematurely = true;\n    summaryData.recordException({ packagePath: appPath, error, source: 'init', context: 'running init' });\n  });\n\n  // Log the resolve map to a file if requested. Do this *after* the main init process in case\n  // any additional deps were discovered and added.\n  if (options.logResolveMap) {\n    console.log('\\nWriting resolve map to `resolve-map.json`.');\n    await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);\n  }\n\n  // Only do extra checks if there's not a major error already\n  if (!isExitingPrematurely) {\n    if (config.features?.optimizeDependencies) {\n      // Conditionally scan dependency usage so that we can populate\n      // include/excludeDependencies automatically, ensuring the dep list\n      // is both minimal (remove unused deps) and complete (include\n      // specific devDeps.)\n      const excludedDependenciesChanges = await optimizeDependencies(summaryData.getResults(), apiContext);\n      summaryData.recordGeneratedChanges(excludedDependenciesChanges);\n    }\n\n    if (config.features?.verifyExports) {\n      const packageResults = await verifyExports(summaryData.getResults(), apiContext);\n      for (const [packagePath, errors] of Object.entries(packageResults)) {\n        summaryData.addErrors(packagePath, errors);\n      }\n    }\n  }\n\n  const summary = summaryData.summarize(options);\n\n  // The feature \"removeUnusedExports\" doesn't (yet) write summary changes, but we still\n  // want to write the generated config if that featureFlag is on.\n  const hasSummaryChanges = config.features?.removeUnusedExports || summary.totalChanges;\n\n  if (!options.check && hasSummaryChanges) {\n    // Update the generated config: either write it if there are settings, or delete it if it\n    // previously existed but is no longer needed.\n    const generatedResult = await writeGeneratedConfig(config.generated, appPath);\n    if (generatedResult === 'deleted') {\n      summary.deletedGeneratedConfig = true;\n    }\n  }\n\n  return summary;\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { InitOptions } from './types/InitOptions.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\nimport { verifyExports } from './verifyExports.js';\nimport type { AppCommandContext, CommandActionParams } from '../../types/CommandAction.js';\nimport path from 'path';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\nimport type { Span } from '@ms-cloudpack/telemetry';\n\n/**\n * Init execution function.\n */\nexport async function init(\n  params: Pick<CommandActionParams<InitOptions>, keyof AppCommandContext | 'options' | 'autoDispose' | 'isMultiApp'> & {\n    /**\n     * App summary object, created ahead of time so that a partial summary can be generated\n     * if the process is interrupted.\n     */\n    summaryData: InitSummaryData;\n  },\n): Promise<void> {\n  const { options, summaryData, isMultiApp, config, telemetryClient } = params;\n\n  await telemetryClient.tracer.startActiveSpan('INIT_APP', async (span) => {\n    // Run prerequisites for the app.\n    await runPrerequisites(params);\n\n    // If --reset is specified, reset the generated config.\n    if (options.reset) {\n      config.generated = {};\n    }\n\n    const apiContext = await createPartialApiContext(params);\n\n    await initApp({ apiContext, span, summaryData, options, isMultiApp });\n  });\n}\n\nasync function initApp(\n  params: Pick<Parameters<typeof init>[0], 'summaryData' | 'isMultiApp' | 'options'> & {\n    apiContext: EnsurePackageBundledContext;\n    span: Span;\n  },\n): Promise<void> {\n  const { apiContext, options, summaryData, span, isMultiApp } = params;\n  const { config } = apiContext.session;\n  const { appPath } = config;\n\n  const resolveMap = apiContext.session.resolveMap;\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  let isExitingPrematurely = false;\n\n  await new Promise<void>((resolve) => {\n    let pending = 0;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n    const priorityMap = new Map<string, number>();\n\n    // Start with the app path or requested matches\n    const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];\n    if (!initialPaths.length) {\n      summaryData.addErrors(appPath, [{ text: `No packages found matching ${options.match}`, source: 'init' }]);\n      resolve();\n    }\n\n    enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>): void {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          console.debug(`Skipping ${packagePath} as it has already been visited.`);\n          continue;\n        }\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        // Get the priority value for this package path, defaults to 0.\n        const priority = priorityMap.get(packagePath) ?? 0;\n        // Lower priority of this package path by 1.\n        priorityMap.set(packagePath, priority - 1);\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          appPath,\n          packagePath,\n          importerContext,\n          config,\n          span,\n          resolveMap,\n          initOptions: options,\n          summaryData,\n          ctx: apiContext,\n          // No need to force if we're in a multi-app scenario\n          // as we'll re-evaluate packages if they are different since we use a different task id.\n          shouldForce: !isMultiApp && shouldForce,\n          isMultiApp,\n          priority,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size) {\n              // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them\n              // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through\n              // on single app runs.\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              console.debug(\n                `Enqueuing paths found from ${packagePath}:\\n` +\n                  bulletedList(\n                    [...pathsToEvaluate].map(([newPath, newContext]) => `${newPath} ${JSON.stringify(newContext)}`),\n                  ),\n              );\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error: unknown) => {\n            // Record the exception as an init error for the package.\n            // This gives better context than a stack trace which could have come from any package.\n            let prefix = 'evaluating package';\n            if (importerContext) {\n              prefix += ` (context: ${JSON.stringify(importerContext, null, 2).replace(/\\s+/g, ' ')})`;\n            }\n            summaryData.recordException({ packagePath, error, source: 'init', context: prefix });\n\n            // Don't immediately stop evaluation, but don't enqueue more paths.\n            isExitingPrematurely = true;\n          });\n      }\n    }\n  }).catch((error: unknown) => {\n    // If there's an error thrown from some other part of the promise besides evaluatePath (not likely),\n    // record it as an init error for the app instead of allowing it to propagate.\n    // This allows the overall init summary and any other errors to be logged as usual.\n    isExitingPrematurely = true;\n    summaryData.recordException({ packagePath: appPath, error, source: 'init', context: 'running init' });\n  });\n\n  // Log the resolve map to a file if requested. Do this *after* the main init process in case\n  // any additional deps were discovered and added.\n  if (options.logResolveMap) {\n    console.log('\\nWriting resolve map to `resolve-map.json`.');\n    await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);\n  }\n\n  if (isExitingPrematurely) {\n    span.setAttribute('isExitingPrematurely', true);\n  } else {\n    // Only do extra checks if there's not a major error already\n    if (config.features?.optimizeDependencies) {\n      // Conditionally scan dependency usage so that we can populate\n      // include/excludeDependencies automatically, ensuring the dep list\n      // is both minimal (remove unused deps) and complete (include\n      // specific devDeps.)\n      const excludedDependenciesChanges = await optimizeDependencies(summaryData.getResults(), apiContext);\n      summaryData.recordGeneratedChanges(excludedDependenciesChanges);\n    }\n\n    if (config.features?.verifyExports) {\n      const packageResults = await verifyExports(summaryData.getResults(), apiContext);\n      for (const [packagePath, errors] of Object.entries(packageResults)) {\n        summaryData.addErrors(packagePath, errors);\n      }\n    }\n  }\n\n  // The feature \"removeUnusedExports\" doesn't (yet) write summary changes, but we still\n  // want to write the generated config if that featureFlag is on.\n  const hasSummaryChanges = config.features?.removeUnusedExports || summaryData.hasChanges();\n\n  if (!options.check && hasSummaryChanges) {\n    // Update the generated config: either write it if there are settings, or delete it if it\n    // previously existed but is no longer needed.\n    const generatedResult = await writeGeneratedConfig(config.generated, appPath);\n    if (generatedResult === 'deleted') {\n      summaryData.deletedGeneratedConfig = true;\n    }\n  }\n}\n"]}

package/lib/commands/link/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CA0D9C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CAyD9C,CAAC"}

package/lib/commands/link/execute.js

@@ -8,9 +8,8 @@ import path from 'path';
  */
 export const execute = async (params) => {
     // Use the current directory as the default package path.
-    const { options, contexts, reporter } = params;
+    const { options, appPath, reporter } = params;
     const { ignore: ignoredPackages, all: includeAll, ignoreResolutions, resolveStrategy, logResolveMap, cachePath, } = options;
-    const { appPath } = contexts[0];
     console.debug('Linking packages...');
     console.debug('Include all:', !!includeAll);
     console.debug('Ignored packages:', ignoredPackages?.join(', ') || 'none');

package/lib/commands/link/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport type { LinkOptions } from './types/LinkOptions.js';\nimport { getSessionToLink } from './getSessionToLink.js';\nimport { createCloudpackClient } from '@ms-cloudpack/api-server';\nimport { formatLinkSummary } from './formatLinkSummary.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\n\n/**\n * Defines the \"link\" verb entry point.\n */\nexport const execute: CommandAction<LinkOptions> = async (params) => {\n  // Use the current directory as the default package path.\n  const { options, contexts, reporter } = params;\n  const {\n    ignore: ignoredPackages,\n    all: includeAll,\n    ignoreResolutions,\n    resolveStrategy,\n    logResolveMap,\n    cachePath,\n  } = options;\n  const { appPath } = contexts[0];\n\n  console.debug('Linking packages...');\n  console.debug('Include all:', !!includeAll);\n  console.debug('Ignored packages:', ignoredPackages?.join(', ') || 'none');\n  console.debug('Apply host resolutions:', !ignoreResolutions);\n  console.debug('Resolve strategy:', resolveStrategy);\n\n  const sessionResult = await getSessionToLink({ reporter, cachePath });\n  if (!sessionResult.session) {\n    return sessionResult;\n  }\n  const { session } = sessionResult;\n  const client = await createCloudpackClient({ url: session.urls.apiServer, reporter });\n\n  const includeMessage = includeAll ? ' including all internal paths' : '';\n  const message = `Linking paths for ${session.projectName} at \"${appPath}\"${includeMessage}`;\n  const task = reporter.addTask(message);\n\n  // Send request to api server to link paths.\n  const { resolveMap, linkedPaths } = await client.linkPath.query({\n    linkedPath: {\n      path: appPath,\n      ignoredPackages,\n      includeAll,\n      ignoreResolutions,\n      resolveStrategy,\n    },\n  });\n  await client.close();\n\n  if (linkedPaths.find((p) => p.path === appPath) === undefined) {\n    // Close down with an error.\n    task.complete({ status: 'fail', message: `Failed to link paths.`, forceShow: true });\n    return { hasErrors: true, message: 'Failed to link paths.' };\n  }\n\n  if (logResolveMap) {\n    // Write the linked resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map-linked.json'), resolveMap);\n  }\n\n  // Close down successfully.\n  task.complete({ status: 'complete', message: `Linked paths`, forceShow: true });\n  const linkSummary = formatLinkSummary({ session, resolveMap, linkedPaths, resolveStrategy });\n\n  return { message: linkSummary };\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/link/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport type { LinkOptions } from './types/LinkOptions.js';\nimport { getSessionToLink } from './getSessionToLink.js';\nimport { createCloudpackClient } from '@ms-cloudpack/api-server';\nimport { formatLinkSummary } from './formatLinkSummary.js';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\n\n/**\n * Defines the \"link\" verb entry point.\n */\nexport const execute: CommandAction<LinkOptions> = async (params) => {\n  // Use the current directory as the default package path.\n  const { options, appPath, reporter } = params;\n  const {\n    ignore: ignoredPackages,\n    all: includeAll,\n    ignoreResolutions,\n    resolveStrategy,\n    logResolveMap,\n    cachePath,\n  } = options;\n\n  console.debug('Linking packages...');\n  console.debug('Include all:', !!includeAll);\n  console.debug('Ignored packages:', ignoredPackages?.join(', ') || 'none');\n  console.debug('Apply host resolutions:', !ignoreResolutions);\n  console.debug('Resolve strategy:', resolveStrategy);\n\n  const sessionResult = await getSessionToLink({ reporter, cachePath });\n  if (!sessionResult.session) {\n    return sessionResult;\n  }\n  const { session } = sessionResult;\n  const client = await createCloudpackClient({ url: session.urls.apiServer, reporter });\n\n  const includeMessage = includeAll ? ' including all internal paths' : '';\n  const message = `Linking paths for ${session.projectName} at \"${appPath}\"${includeMessage}`;\n  const task = reporter.addTask(message);\n\n  // Send request to api server to link paths.\n  const { resolveMap, linkedPaths } = await client.linkPath.query({\n    linkedPath: {\n      path: appPath,\n      ignoredPackages,\n      includeAll,\n      ignoreResolutions,\n      resolveStrategy,\n    },\n  });\n  await client.close();\n\n  if (linkedPaths.find((p) => p.path === appPath) === undefined) {\n    // Close down with an error.\n    task.complete({ status: 'fail', message: `Failed to link paths.`, forceShow: true });\n    return { hasErrors: true, message: 'Failed to link paths.' };\n  }\n\n  if (logResolveMap) {\n    // Write the linked resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map-linked.json'), resolveMap);\n  }\n\n  // Close down successfully.\n  task.complete({ status: 'complete', message: `Linked paths`, forceShow: true });\n  const linkSummary = formatLinkSummary({ session, resolveMap, linkedPaths, resolveStrategy });\n\n  return { message: linkSummary };\n};\n"]}

package/lib/commands/setup/execute.js

@@ -1,7 +1,7 @@
 import { setup } from '@ms-cloudpack/setup-utilities';
 /** Executor for the "setup" verb */
 export const execute = async (params) => {
-    const { config, appPath: cwd } = params.contexts[0];
+    const { config, appPath: cwd } = params;
     const { server = {} } = config;
     const { domain, https } = server;
     if (domain || https) {

package/lib/commands/setup/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/setup/execute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAMtD,oCAAoC;AACpC,MAAM,CAAC,MAAM,OAAO,GAAgC,KAAK,EAAE,MAAM,EAAE,EAAE;IACnE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpD,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAEjC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,CAAC;YACV,MAAM;YACN,uBAAuB,EAAE,KAAK,KAAK,IAAI;YACvC,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACxC,CAAC,CAAC","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport { setup } from '@ms-cloudpack/setup-utilities';\n\nexport interface SetupOptions {\n  force?: boolean;\n}\n\n/** Executor for the \"setup\" verb */\nexport const execute: CommandAction<SetupOptions> = async (params) => {\n  const { config, appPath: cwd } = params.contexts[0];\n  const { server = {} } = config;\n  const { domain, https } = server;\n\n  if (domain || https) {\n    await setup({\n      domain,\n      shouldCreateCertificate: https === true,\n      cwd,\n    });\n  }\n\n  return { message: 'Setup complete.' };\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/setup/execute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAMtD,oCAAoC;AACpC,MAAM,CAAC,MAAM,OAAO,GAAgC,KAAK,EAAE,MAAM,EAAE,EAAE;IACnE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IACxC,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAEjC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,CAAC;YACV,MAAM;YACN,uBAAuB,EAAE,KAAK,KAAK,IAAI;YACvC,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACxC,CAAC,CAAC","sourcesContent":["import type { CommandAction } from '../../types/CommandAction.js';\nimport { setup } from '@ms-cloudpack/setup-utilities';\n\nexport interface SetupOptions {\n  force?: boolean;\n}\n\n/** Executor for the \"setup\" verb */\nexport const execute: CommandAction<SetupOptions> = async (params) => {\n  const { config, appPath: cwd } = params;\n  const { server = {} } = config;\n  const { domain, https } = server;\n\n  if (domain || https) {\n    await setup({\n      domain,\n      shouldCreateCertificate: https === true,\n      cwd,\n    });\n  }\n\n  return { message: 'Setup complete.' };\n};\n"]}

package/lib/commands/start/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAIlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CAoH/C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAIlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,YAAY,CAoH/C,CAAC"}

package/lib/commands/start/execute.js

@@ -1,4 +1,4 @@
-import { createPartialApiContext, ensurePackageBundled, } from '@ms-cloudpack/api-server';
+import { createApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';
 import { writeJson } from '@ms-cloudpack/json-utilities';
 import { isExternalPackage, resolve } from '@ms-cloudpack/path-utilities';
 import { makeUrl } from '@ms-cloudpack/path-string-parsing';
@@ -13,12 +13,10 @@ import { getCertificate } from '@ms-cloudpack/setup-utilities';
  * Defines the "start" verb entry point.
  */
 export const execute = async (params) => {
-    const { contexts, options, autoDispose } = params;
-    const apiContextOptions = contexts[0];
-    const { appPath, config } = apiContextOptions;
+    const { appPath, config, options, autoDispose } = params;
     console.log('App path:', yellow(appPath));
     console.log('Bundle mode:', yellow(options.mode));
-    await runPrerequisites(apiContextOptions);
+    await runPrerequisites(params);
     const currentDir = path.dirname(fileURLToPath(import.meta.url));
     let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);
     // If overlay is an internal package, resolve the overlay from the current package's linked node modules
@@ -28,19 +26,9 @@ export const execute = async (params) => {
         overlayPath = cliPath ? path.join(cliPath, 'node_modules', '@ms-cloudpack/overlay') : undefined;
     }
     const shouldUseRemoteCache = config.features?.enableCloudHosted || config.features?.enableRemoteCacheDownloads;
-    const [apiContext] = autoDispose(await createPartialApiContext({
-        ...apiContextOptions,
-        items: [
-            'bus',
-            'watcher',
-            'taskRunner',
-            'packages',
-            'session',
-            'packageImportPaths',
-            'packageHashes',
-            shouldUseRemoteCache && 'remoteCacheClient',
-        ],
-        remoteCacheClientLoginMethod: options.login,
+    const apiContext = autoDispose(await createApiContext({
+        ...params,
+        remoteCacheClientLoginMethod: shouldUseRemoteCache ? options.login : undefined,
         overlayPath,
     }));
     const { packages, session } = apiContext;
@@ -94,16 +82,29 @@ export const execute = async (params) => {
     autoDispose({ dispose: cleanup });
     const defaultUrl = makeUrl(config.server?.defaultPath || '', session.urls.appServer).href;
     // Open the browser.
-    if (options.open !== false) {
-        openBrowser({ options: { url: defaultUrl }, context: apiContext }).catch((err) => {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    if (options.open === false) {
+        console.log('Please open the browser manually to:', defaultUrl);
+    }
+    else {
+        let urlToOpen;
+        if (typeof options.open === 'string') {
+            // If the string doesn't start with http or https, pick a protocol based on config.server.https
+            if (!options.open.startsWith('http://') && !options.open.startsWith('https://')) {
+                urlToOpen = `${config.server?.https ? 'https' : 'http'}://${options.open}`;
+            }
+            else {
+                urlToOpen = options.open;
+            }
+        }
+        else {
+            // Use the default path from the config with the first domain.
+            urlToOpen = defaultUrl;
+        }
+        void openBrowser({ options: { url: urlToOpen }, context: apiContext }).catch((err) => {
             console.warn('Error opening browser:', err?.stack || err);
             console.warn('Please open the browser manually to:', defaultUrl);
         });
     }
-    else {
-        console.log('Please open the browser manually to:', defaultUrl);
-    }
     return null; // the command should keep running
 };
 /**
@@ -114,7 +115,7 @@ async function createApiServer(options, apiContext) {
     const { config } = session;
     const { server, appPath } = config;
     // If a cert is needed, check that it exists.
-    if (server?.https === true && !(await getCertificate({ domain: server?.domain, cwd: appPath }))) {
+    if (server?.https === true && !(await getCertificate({ domain: server.domain, cwd: appPath }))) {
         return {
             hasErrors: true,
             message: `The local site is configured to use https in cloudpack.config.json, but is missing a cert.\n\n` +

package/lib/commands/start/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createPartialApiContext,\n  ensurePackageBundled,\n  type CloudpackServer,\n  type Context,\n} from '@ms-cloudpack/api-server';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isExternalPackage, resolve } from '@ms-cloudpack/path-utilities';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport { cyan, yellow, bold } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { openBrowser } from './openBrowser.js';\nimport { trackSession } from './trackSession.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { getCertificate } from '@ms-cloudpack/setup-utilities';\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async (params) => {\n  const { contexts, options, autoDispose } = params;\n  const apiContextOptions = contexts[0];\n  const { appPath, config } = apiContextOptions;\n\n  console.log('App path:', yellow(appPath));\n  console.log('Bundle mode:', yellow(options.mode));\n\n  await runPrerequisites(apiContextOptions);\n\n  const currentDir = path.dirname(fileURLToPath(import.meta.url));\n  let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);\n\n  // If overlay is an internal package, resolve the overlay from the current package's linked node modules\n  // to \"externalize\" it, so that we always use the bundled version of the overlay instead of the source.\n  if (overlayPath && !isExternalPackage(overlayPath)) {\n    const cliPath = await resolve('@ms-cloudpack/cli', currentDir);\n    overlayPath = cliPath ? path.join(cliPath, 'node_modules', '@ms-cloudpack/overlay') : undefined;\n  }\n\n  const shouldUseRemoteCache = config.features?.enableCloudHosted || config.features?.enableRemoteCacheDownloads;\n  const [apiContext] = autoDispose(\n    await createPartialApiContext({\n      ...apiContextOptions,\n      items: [\n        'bus',\n        'watcher',\n        'taskRunner',\n        'packages',\n        'session',\n        'packageImportPaths',\n        'packageHashes',\n        shouldUseRemoteCache && 'remoteCacheClient',\n      ],\n      remoteCacheClientLoginMethod: options.login,\n      overlayPath,\n    }),\n  );\n  const { packages, session } = apiContext;\n\n  // Increment the session version if caching is disabled.\n  if (options.cache === false) {\n    session.incrementSessionVersion();\n  }\n\n  // Make sure the package has a valid definition.\n  const definition = await packages.get(appPath);\n\n  if (options.logResolveMap) {\n    // Write the resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n  }\n\n  // Start api server for tracking status and handling remote requests.\n  const apiServerResult = await createApiServer(options, apiContext);\n  if (apiServerResult.hasErrors) {\n    return apiServerResult;\n  }\n  const { apiServer } = apiServerResult;\n\n  // Kick off bundling app package as soon as api server is ready.\n  void ensurePackageBundled({\n    input: { name: definition.name, version: definition.version },\n    ctx: apiContext,\n  });\n\n  // Then start bundle and app servers for hosting the app.\n  const { startServers } = await import('@ms-cloudpack/app-server');\n  const servers = await startServers(\n    {\n      definition,\n      bundleServerOptions: { disableCache: !options.cache, port: options.bundleServerPort },\n      port: options.appServerPort,\n    },\n    apiContext,\n  );\n\n  // Save the session to active sessions.\n  const sessionTracker = await trackSession(session);\n\n  const cleanup = async () => {\n    // Stop tracking the session.\n    await sessionTracker.close();\n\n    await Promise.all(\n      Object.entries({ apiServer, ...servers }).map(async ([name, server]) => {\n        if (!server) return;\n\n        const desc = `${name} (${server.url})`;\n        console.info(`Closing ${desc}`);\n        try {\n          await server.close();\n          console.info(`Closed ${desc}`);\n        } catch (err) {\n          console.warn(`Error closing ${desc}:`, err);\n        }\n      }),\n    );\n  };\n\n  autoDispose({ dispose: cleanup });\n\n  const defaultUrl = makeUrl(config.server?.defaultPath || '', session.urls.appServer).href;\n\n  // Open the browser.\n  if (options.open !== false) {\n    openBrowser({ options: { url: defaultUrl }, context: apiContext }).catch((err) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      console.warn('Error opening browser:', err?.stack || err);\n      console.warn('Please open the browser manually to:', defaultUrl);\n    });\n  } else {\n    console.log('Please open the browser manually to:', defaultUrl);\n  }\n\n  return null; // the command should keep running\n};\n\n/**\n * Create the API server, or return an error message if the server could not be created.\n */\nasync function createApiServer(\n  options: StartOptions,\n  apiContext: Context,\n): Promise<{ hasErrors: false; apiServer: CloudpackServer } | { hasErrors: true; message: string }> {\n  const { session } = apiContext;\n  const { config } = session;\n  const { server, appPath } = config;\n\n  // If a cert is needed, check that it exists.\n  if (server?.https === true && !(await getCertificate({ domain: server?.domain, cwd: appPath }))) {\n    return {\n      hasErrors: true,\n      message:\n        `The local site is configured to use https in cloudpack.config.json, but is missing a cert.\\n\\n` +\n        `Run \"${cyan(bold('cloudpack setup'))}\" to create the required certificate and try start again.\\n`,\n    };\n  }\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  try {\n    const apiServer = await createCloudpackServer({ port: options.apiServerPort }, apiContext);\n    return { hasErrors: false, apiServer };\n  } catch (err) {\n    let message: string;\n    if ((err as { code: string }).code === 'EADDRNOTAVAIL' && server?.domain) {\n      const primaryDomain = (Array.isArray(server.domain) ? server.domain : [server.domain])[0];\n      message =\n        `The domain \"${cyan(bold(primaryDomain))}\" in cloudpack.config.json is not resolvable.\\n\\n` +\n        `Run \"${cyan(bold('cloudpack setup'))}\" to add the appropriate entries to your hosts file and ` +\n        `try start again.\\n`;\n    } else {\n      message = `Error creating API server: ${(err as Error).stack || err}`;\n    }\n    return { hasErrors: true, message };\n  }\n}\n\n// cspell:ignore Prereqs\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createApiContext, ensurePackageBundled, type CloudpackServer, type Context } from '@ms-cloudpack/api-server';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isExternalPackage, resolve } from '@ms-cloudpack/path-utilities';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport { cyan, yellow, bold } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { openBrowser } from './openBrowser.js';\nimport { trackSession } from './trackSession.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { getCertificate } from '@ms-cloudpack/setup-utilities';\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async (params) => {\n  const { appPath, config, options, autoDispose } = params;\n\n  console.log('App path:', yellow(appPath));\n  console.log('Bundle mode:', yellow(options.mode));\n\n  await runPrerequisites(params);\n\n  const currentDir = path.dirname(fileURLToPath(import.meta.url));\n  let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);\n\n  // If overlay is an internal package, resolve the overlay from the current package's linked node modules\n  // to \"externalize\" it, so that we always use the bundled version of the overlay instead of the source.\n  if (overlayPath && !isExternalPackage(overlayPath)) {\n    const cliPath = await resolve('@ms-cloudpack/cli', currentDir);\n    overlayPath = cliPath ? path.join(cliPath, 'node_modules', '@ms-cloudpack/overlay') : undefined;\n  }\n\n  const shouldUseRemoteCache = config.features?.enableCloudHosted || config.features?.enableRemoteCacheDownloads;\n  const apiContext = autoDispose(\n    await createApiContext({\n      ...params,\n      remoteCacheClientLoginMethod: shouldUseRemoteCache ? options.login : undefined,\n      overlayPath,\n    }),\n  );\n  const { packages, session } = apiContext;\n\n  // Increment the session version if caching is disabled.\n  if (options.cache === false) {\n    session.incrementSessionVersion();\n  }\n\n  // Make sure the package has a valid definition.\n  const definition = await packages.get(appPath);\n\n  if (options.logResolveMap) {\n    // Write the resolve map to disk.\n    await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n  }\n\n  // Start api server for tracking status and handling remote requests.\n  const apiServerResult = await createApiServer(options, apiContext);\n  if (apiServerResult.hasErrors) {\n    return apiServerResult;\n  }\n  const { apiServer } = apiServerResult;\n\n  // Kick off bundling app package as soon as api server is ready.\n  void ensurePackageBundled({\n    input: { name: definition.name, version: definition.version },\n    ctx: apiContext,\n  });\n\n  // Then start bundle and app servers for hosting the app.\n  const { startServers } = await import('@ms-cloudpack/app-server');\n  const servers = await startServers(\n    {\n      definition,\n      bundleServerOptions: { disableCache: !options.cache, port: options.bundleServerPort },\n      port: options.appServerPort,\n    },\n    apiContext,\n  );\n\n  // Save the session to active sessions.\n  const sessionTracker = await trackSession(session);\n\n  const cleanup = async () => {\n    // Stop tracking the session.\n    await sessionTracker.close();\n\n    await Promise.all(\n      Object.entries({ apiServer, ...servers }).map(async ([name, server]) => {\n        if (!server) return;\n\n        const desc = `${name} (${server.url})`;\n        console.info(`Closing ${desc}`);\n        try {\n          await server.close();\n          console.info(`Closed ${desc}`);\n        } catch (err) {\n          console.warn(`Error closing ${desc}:`, err);\n        }\n      }),\n    );\n  };\n\n  autoDispose({ dispose: cleanup });\n\n  const defaultUrl = makeUrl(config.server?.defaultPath || '', session.urls.appServer).href;\n\n  // Open the browser.\n  if (options.open === false) {\n    console.log('Please open the browser manually to:', defaultUrl);\n  } else {\n    let urlToOpen: string;\n    if (typeof options.open === 'string') {\n      // If the string doesn't start with http or https, pick a protocol based on config.server.https\n      if (!options.open.startsWith('http://') && !options.open.startsWith('https://')) {\n        urlToOpen = `${config.server?.https ? 'https' : 'http'}://${options.open}`;\n      } else {\n        urlToOpen = options.open;\n      }\n    } else {\n      // Use the default path from the config with the first domain.\n      urlToOpen = defaultUrl;\n    }\n\n    void openBrowser({ options: { url: urlToOpen }, context: apiContext }).catch((err: unknown) => {\n      console.warn('Error opening browser:', (err as Error | undefined)?.stack || err);\n      console.warn('Please open the browser manually to:', defaultUrl);\n    });\n  }\n\n  return null; // the command should keep running\n};\n\n/**\n * Create the API server, or return an error message if the server could not be created.\n */\nasync function createApiServer(\n  options: StartOptions,\n  apiContext: Context,\n): Promise<{ hasErrors: false; apiServer: CloudpackServer } | { hasErrors: true; message: string }> {\n  const { session } = apiContext;\n  const { config } = session;\n  const { server, appPath } = config;\n\n  // If a cert is needed, check that it exists.\n  if (server?.https === true && !(await getCertificate({ domain: server.domain, cwd: appPath }))) {\n    return {\n      hasErrors: true,\n      message:\n        `The local site is configured to use https in cloudpack.config.json, but is missing a cert.\\n\\n` +\n        `Run \"${cyan(bold('cloudpack setup'))}\" to create the required certificate and try start again.\\n`,\n    };\n  }\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  try {\n    const apiServer = await createCloudpackServer({ port: options.apiServerPort }, apiContext);\n    return { hasErrors: false, apiServer };\n  } catch (err) {\n    let message: string;\n    if ((err as { code: string }).code === 'EADDRNOTAVAIL' && server?.domain) {\n      const primaryDomain = (Array.isArray(server.domain) ? server.domain : [server.domain])[0];\n      message =\n        `The domain \"${cyan(bold(primaryDomain))}\" in cloudpack.config.json is not resolvable.\\n\\n` +\n        `Run \"${cyan(bold('cloudpack setup'))}\" to add the appropriate entries to your hosts file and ` +\n        `try start again.\\n`;\n    } else {\n      message = `Error creating API server: ${(err as Error).stack || err}`;\n    }\n    return { hasErrors: true, message };\n  }\n}\n\n// cspell:ignore Prereqs\n"]}

package/lib/commands/start/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAK9E,gCAAgC;AAChC,eAAO,MAAM,IAAI,EAAE,mBAqBlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAK9E,gCAAgC;AAChC,eAAO,MAAM,IAAI,EAAE,mBAwBlB,CAAC"}

package/lib/commands/start/index.js

@@ -9,7 +9,10 @@ export const init = (program) => {
         options: {
             mode: reusedOptions.mode({ action: 'run' }),
             app: reusedOptions.app(),
-            open: new Option('--no-open', 'Do not open the browser.'),
+            open: [
+                new Option('--open <url>', 'Open the browser to a specific url.'),
+                new Option('--no-open', 'Do not open the browser.'),
+            ],
             cache: reusedOptions.cache(),
             logResolveMap: reusedOptions.logResolveMap(),
             logBundleInfo: reusedOptions.logBundleInfo({ requiresNoCache: true }),

package/lib/commands/start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,gCAAgC;AAChC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAe;QAClC,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,qCAAqC;QAClD,OAAO,EAAE;YACP,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAC3C,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE;YACxB,IAAI,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;YACzD,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE;YAC5B,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;YAC5C,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;YACrE,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC;YAC/D,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC;YAC/D,gBAAgB,EAAE,aAAa,CAAC,6BAA6B,EAAE,QAAQ,CAAC;YACxE,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE;SAC7B;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;QACzC,2FAA2F;QAC3F,qCAAqC;QACrC,gBAAgB,EAAE,QAAQ;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,IAAY;IAChD,OAAO,IAAI,MAAM,CAAC,KAAK,EAAE,uBAAuB,IAAI,wDAAwD,CAAC;SAC1G,SAAS,CAAC,UAAU,CAAC;SACrB,QAAQ,EAAE,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,oBAAoB,CAAC,wBAAwB,KAAK,GAAG,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,oBAAoB,CAAC,qCAAqC,KAAK,GAAG,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { InvalidArgumentError, Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { portNumbers } from 'get-port';\nimport { reusedOptions } from '../../utilities/reusedOptions.js';\n\n/** Defines the \"start\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<StartOptions>({\n    name: 'start',\n    description: 'Starts a web inner-loop for an app.',\n    options: {\n      mode: reusedOptions.mode({ action: 'run' }),\n      app: reusedOptions.app(),\n      open: new Option('--no-open', 'Do not open the browser.'),\n      cache: reusedOptions.cache(),\n      logResolveMap: reusedOptions.logResolveMap(),\n      logBundleInfo: reusedOptions.logBundleInfo({ requiresNoCache: true }),\n      apiServerPort: getPortOption('--api-server-port <port>', 'API'),\n      appServerPort: getPortOption('--app-server-port <port>', 'app'),\n      bundleServerPort: getPortOption('--bundle-server-port <port>', 'bundle'),\n      login: reusedOptions.login(),\n    },\n    getExecutor: () => import('./execute.js'),\n    // If cwd isn't a cloudpack app, discover other cloudpack apps and possibly prompt the user\n    // to choose one. Also handles --app.\n    discoverAppPaths: 'single',\n  });\n};\n\nfunction getPortOption(flags: string, name: string): Option {\n  return new Option(flags, `Port to use for the ${name} server (single, comma-separated, or range with dash).`)\n    .argParser(parsePorts)\n    .hideHelp();\n}\n\nfunction parsePorts(value: string): number[] {\n  if (value.includes('-')) {\n    const split = value.split('-');\n    if (split.length !== 2) {\n      throw new InvalidArgumentError(`Invalid port range: \"${value}\"`);\n    }\n    return [...portNumbers(parseNumber(split[0]), parseNumber(split[1]))];\n  }\n\n  return value.split(',').map(parseNumber);\n}\n\nfunction parseNumber(value: string): number {\n  value = value.trim();\n  const parsed = parseInt(value, 10);\n  if (isNaN(parsed)) {\n    throw new InvalidArgumentError(`Port must be a number; received: \"${value}\"`);\n  }\n  return parsed;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,gCAAgC;AAChC,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,OAAO,EAAE,EAAE;IACnD,OAAO,CAAC,aAAa,CAAe;QAClC,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,qCAAqC;QAClD,OAAO,EAAE;YACP,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAC3C,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE;YACxB,IAAI,EAAE;gBACJ,IAAI,MAAM,CAAC,cAAc,EAAE,qCAAqC,CAAC;gBACjE,IAAI,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;aACpD;YACD,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE;YAC5B,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;YAC5C,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;YACrE,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC;YAC/D,aAAa,EAAE,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC;YAC/D,gBAAgB,EAAE,aAAa,CAAC,6BAA6B,EAAE,QAAQ,CAAC;YACxE,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE;SAC7B;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;QACzC,2FAA2F;QAC3F,qCAAqC;QACrC,gBAAgB,EAAE,QAAQ;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,IAAY;IAChD,OAAO,IAAI,MAAM,CAAC,KAAK,EAAE,uBAAuB,IAAI,wDAAwD,CAAC;SAC1G,SAAS,CAAC,UAAU,CAAC;SACrB,QAAQ,EAAE,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,oBAAoB,CAAC,wBAAwB,KAAK,GAAG,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,oBAAoB,CAAC,qCAAqC,KAAK,GAAG,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { InvalidArgumentError, Option } from 'commander';\nimport type { CommandInitFunction } from '../../types/CommandInitFunction.js';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { portNumbers } from 'get-port';\nimport { reusedOptions } from '../../utilities/reusedOptions.js';\n\n/** Defines the \"start\" verb. */\nexport const init: CommandInitFunction = (program) => {\n  program.addSubCommand<StartOptions>({\n    name: 'start',\n    description: 'Starts a web inner-loop for an app.',\n    options: {\n      mode: reusedOptions.mode({ action: 'run' }),\n      app: reusedOptions.app(),\n      open: [\n        new Option('--open <url>', 'Open the browser to a specific url.'),\n        new Option('--no-open', 'Do not open the browser.'),\n      ],\n      cache: reusedOptions.cache(),\n      logResolveMap: reusedOptions.logResolveMap(),\n      logBundleInfo: reusedOptions.logBundleInfo({ requiresNoCache: true }),\n      apiServerPort: getPortOption('--api-server-port <port>', 'API'),\n      appServerPort: getPortOption('--app-server-port <port>', 'app'),\n      bundleServerPort: getPortOption('--bundle-server-port <port>', 'bundle'),\n      login: reusedOptions.login(),\n    },\n    getExecutor: () => import('./execute.js'),\n    // If cwd isn't a cloudpack app, discover other cloudpack apps and possibly prompt the user\n    // to choose one. Also handles --app.\n    discoverAppPaths: 'single',\n  });\n};\n\nfunction getPortOption(flags: string, name: string): Option {\n  return new Option(flags, `Port to use for the ${name} server (single, comma-separated, or range with dash).`)\n    .argParser(parsePorts)\n    .hideHelp();\n}\n\nfunction parsePorts(value: string): number[] {\n  if (value.includes('-')) {\n    const split = value.split('-');\n    if (split.length !== 2) {\n      throw new InvalidArgumentError(`Invalid port range: \"${value}\"`);\n    }\n    return [...portNumbers(parseNumber(split[0]), parseNumber(split[1]))];\n  }\n\n  return value.split(',').map(parseNumber);\n}\n\nfunction parseNumber(value: string): number {\n  value = value.trim();\n  const parsed = parseInt(value, 10);\n  if (isNaN(parsed)) {\n    throw new InvalidArgumentError(`Port must be a number; received: \"${value}\"`);\n  }\n  return parsed;\n}\n"]}

package/lib/commands/start/openBrowser.d.ts

@@ -10,4 +10,6 @@ export declare function openBrowser(params: {
 export declare function disableOpenBrowser(): void;
 /** Get the most recently opened URL (for tests) */
 export declare function getLastOpenedUrl(): string | undefined;
+/** Reset the most recently opened URL (for tests) */
+export declare function resetLastOpenedUrl(): void;
 //# sourceMappingURL=openBrowser.d.ts.map

package/lib/commands/start/openBrowser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openBrowser.d.ts","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAOxD,wBAAwB;AACxB,wBAAsB,WAAW,CAAC,MAAM,EAAE;IACxC,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;CAC3C,GAAG,OAAO,CAAC,IAAI,CAAC,CAahB;AAED,8CAA8C;AAC9C,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAErD"}
+{"version":3,"file":"openBrowser.d.ts","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAOxD,wBAAwB;AACxB,wBAAsB,WAAW,CAAC,MAAM,EAAE;IACxC,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;CAC3C,GAAG,OAAO,CAAC,IAAI,CAAC,CAahB;AAED,8CAA8C;AAC9C,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAErD;AAED,qDAAqD;AACrD,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}

package/lib/commands/start/openBrowser.js

@@ -19,4 +19,8 @@ export function disableOpenBrowser() {
 export function getLastOpenedUrl() {
     return lastOpenedUrl;
 }
+/** Reset the most recently opened URL (for tests) */
+export function resetLastOpenedUrl() {
+    lastOpenedUrl = undefined;
+}
 //# sourceMappingURL=openBrowser.js.map

package/lib/commands/start/openBrowser.js.map

@@ -1 +1 @@
-{"version":3,"file":"openBrowser.js","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,IAAI,kBAAkB,GAAG,IAAI,CAAC;AAC9B,IAAI,aAAiC,CAAC;AAEtC,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAGjC;IACC,MAAM,EACJ,OAAO,EAAE,EAAE,eAAe,EAAE,EAC5B,OAAO,EAAE,EAAE,GAAG,EAAE,GACjB,GAAG,MAAM,CAAC;IAEX,aAAa,GAAG,GAAG,CAAC;IACpB,IAAI,kBAAkB,EAAE,CAAC;QACvB,mEAAmE;QACnE,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,EAAE,GAAG,EAAE,CAC1G,IAAI,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAClC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,kBAAkB;IAChC,kBAAkB,GAAG,KAAK,CAAC;AAC7B,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport open from 'open';\nimport { getCliStartTime } from '../../utilities/getCliStartTime.js';\n\nlet openBrowserEnabled = true;\nlet lastOpenedUrl: string | undefined;\n\n/** Open the browser. */\nexport async function openBrowser(params: {\n  options: { url: string };\n  context: Pick<Context, 'telemetryClient'>;\n}): Promise<void> {\n  const {\n    context: { telemetryClient },\n    options: { url },\n  } = params;\n\n  lastOpenedUrl = url;\n  if (openBrowserEnabled) {\n    // Log the time it takes to open the browser since the CLI started.\n    await telemetryClient.tracer.startActiveSpan('TIME_TO_OPEN_BROWSER', { startTime: getCliStartTime() }, () =>\n      open(url, { newInstance: false }),\n    );\n  }\n}\n\n/** Disable opening the browser (for tests) */\nexport function disableOpenBrowser(): void {\n  openBrowserEnabled = false;\n}\n\n/** Get the most recently opened URL (for tests) */\nexport function getLastOpenedUrl(): string | undefined {\n  return lastOpenedUrl;\n}\n"]}
+{"version":3,"file":"openBrowser.js","sourceRoot":"","sources":["../../../src/commands/start/openBrowser.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,IAAI,kBAAkB,GAAG,IAAI,CAAC;AAC9B,IAAI,aAAiC,CAAC;AAEtC,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAGjC;IACC,MAAM,EACJ,OAAO,EAAE,EAAE,eAAe,EAAE,EAC5B,OAAO,EAAE,EAAE,GAAG,EAAE,GACjB,GAAG,MAAM,CAAC;IAEX,aAAa,GAAG,GAAG,CAAC;IACpB,IAAI,kBAAkB,EAAE,CAAC;QACvB,mEAAmE;QACnE,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,EAAE,GAAG,EAAE,CAC1G,IAAI,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAClC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,kBAAkB;IAChC,kBAAkB,GAAG,KAAK,CAAC;AAC7B,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,kBAAkB;IAChC,aAAa,GAAG,SAAS,CAAC;AAC5B,CAAC","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport open from 'open';\nimport { getCliStartTime } from '../../utilities/getCliStartTime.js';\n\nlet openBrowserEnabled = true;\nlet lastOpenedUrl: string | undefined;\n\n/** Open the browser. */\nexport async function openBrowser(params: {\n  options: { url: string };\n  context: Pick<Context, 'telemetryClient'>;\n}): Promise<void> {\n  const {\n    context: { telemetryClient },\n    options: { url },\n  } = params;\n\n  lastOpenedUrl = url;\n  if (openBrowserEnabled) {\n    // Log the time it takes to open the browser since the CLI started.\n    await telemetryClient.tracer.startActiveSpan('TIME_TO_OPEN_BROWSER', { startTime: getCliStartTime() }, () =>\n      open(url, { newInstance: false }),\n    );\n  }\n}\n\n/** Disable opening the browser (for tests) */\nexport function disableOpenBrowser(): void {\n  openBrowserEnabled = false;\n}\n\n/** Get the most recently opened URL (for tests) */\nexport function getLastOpenedUrl(): string | undefined {\n  return lastOpenedUrl;\n}\n\n/** Reset the most recently opened URL (for tests) */\nexport function resetLastOpenedUrl(): void {\n  lastOpenedUrl = undefined;\n}\n"]}

package/lib/commands/start/types/StartOptions.d.ts

@@ -1,7 +1,7 @@
 import type { ReusedOptions } from '../../../types/ReusedOptions.js';
 export interface StartOptions extends Pick<ReusedOptions, 'app' | 'cache' | 'login' | 'logBundleInfo' | 'logResolveMap' | 'mode'> {
-    /** Whether to open the browser (default true) */
-    open?: boolean;
+    /** Whether to open the browser or a specific url to open the browser to (default true) */
+    open?: boolean | string;
     /** Mostly for testing: custom port for the API server */
     apiServerPort?: number | number[];
     /** Mostly for testing: custom port for the app server (also set in config via `server.port`) */

package/lib/commands/start/types/StartOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StartOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,MAAM,WAAW,YACf,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,eAAe,GAAG,eAAe,GAAG,MAAM,CAAC;IACnG,iDAAiD;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,gGAAgG;IAChG,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACtC"}
+{"version":3,"file":"StartOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,MAAM,WAAW,YACf,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,eAAe,GAAG,eAAe,GAAG,MAAM,CAAC;IACnG,0FAA0F;IAC1F,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,gGAAgG;IAChG,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACtC"}

package/lib/commands/start/types/StartOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"StartOptions.js","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReusedOptions } from '../../../types/ReusedOptions.js';\n\nexport interface StartOptions\n  extends Pick<ReusedOptions, 'app' | 'cache' | 'login' | 'logBundleInfo' | 'logResolveMap' | 'mode'> {\n  /** Whether to open the browser (default true) */\n  open?: boolean;\n\n  /** Mostly for testing: custom port for the API server */\n  apiServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the app server (also set in config via `server.port`) */\n  appServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the bundle server */\n  bundleServerPort?: number | number[];\n}\n"]}
+{"version":3,"file":"StartOptions.js","sourceRoot":"","sources":["../../../../src/commands/start/types/StartOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ReusedOptions } from '../../../types/ReusedOptions.js';\n\nexport interface StartOptions\n  extends Pick<ReusedOptions, 'app' | 'cache' | 'login' | 'logBundleInfo' | 'logResolveMap' | 'mode'> {\n  /** Whether to open the browser or a specific url to open the browser to (default true) */\n  open?: boolean | string;\n\n  /** Mostly for testing: custom port for the API server */\n  apiServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the app server (also set in config via `server.port`) */\n  appServerPort?: number | number[];\n\n  /** Mostly for testing: custom port for the bundle server */\n  bundleServerPort?: number | number[];\n}\n"]}

package/lib/commands/sync/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,aAAa,EAEnB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CA+F9C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,aAAa,EAEnB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CA8E9C,CAAC"}

package/lib/commands/sync/execute.js

@@ -7,10 +7,8 @@ function checkErrorCode(error, code) {
     return error instanceof Error && 'code' in error && error.code === code;
 }
 export const execute = async (params) => {
-    const { options, contexts, autoDispose } = params;
+    const { options, config, telemetryClient } = params;
     const { login, upload } = options;
-    const apiContextOptions = contexts[0];
-    const { config, telemetryClient } = apiContextOptions;
     try {
         // Await here to ensure that try-catch block catches any errors thrown inside the async function
         return await telemetryClient.tracer.startActiveSpan('SYNC_EXECUTE', async (span) => {
@@ -29,29 +27,18 @@ export const execute = async (params) => {
             }
             let syncResult;
             if (upload) {
-                await runPrerequisites(apiContextOptions);
-                const [ctx] = autoDispose(await createPartialApiContext({
-                    ...apiContextOptions,
-                    items: [
-                        'bus',
-                        'taskRunner',
-                        'watcher',
-                        'packages',
-                        'session',
-                        'packageImportPaths',
-                        'packageHashes',
-                        'remoteCacheClient',
-                    ],
+                await runPrerequisites(params);
+                const ctx = await createPartialApiContext({
+                    ...params,
                     remoteCacheClientLoginMethod: login,
-                }));
+                });
                 syncResult = await syncUpload({ input: undefined, ctx });
             }
             else {
-                const [ctx] = autoDispose(await createPartialApiContext({
-                    ...apiContextOptions,
-                    items: ['packages', 'session', 'packageHashes', 'remoteCacheClient'],
+                const ctx = await createPartialApiContext({
+                    ...params,
                     remoteCacheClientLoginMethod: login,
-                }));
+                });
                 syncResult = await syncDownload({ input: undefined, ctx });
             }
             return {

package/lib/commands/sync/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPartialApiContext, syncDownload, syncUpload, type SyncResult } from '@ms-cloudpack/api-server';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport { red } from '@ms-cloudpack/task-reporter';\nimport {\n  ExitCodeAuthenticationError,\n  ExitCodeGenericError,\n  type CommandAction,\n  type CommandExitParams,\n} from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\n\nfunction checkErrorCode(error: unknown, code: string): boolean {\n  return error instanceof Error && 'code' in error && error.code === code;\n}\n\nexport const execute: CommandAction<SyncOptions> = async (params) => {\n  const { options, contexts, autoDispose } = params;\n  const { login, upload } = options;\n  const apiContextOptions = contexts[0];\n  const { config, telemetryClient } = apiContextOptions;\n\n  try {\n    // Await here to ensure that try-catch block catches any errors thrown inside the async function\n    return await telemetryClient.tracer.startActiveSpan('SYNC_EXECUTE', async (span): Promise<CommandExitParams> => {\n      if (!config.features?.syncBundles) {\n        return { message: 'Sync is disabled' };\n      }\n\n      if (!environmentInfo.cloudpack.isSyncEnabled) {\n        span.setAttribute('syncDisabled', true);\n        return { message: 'Sync is disabled by the user (CLOUDPACK_SYNC environment variable is set).' };\n      }\n\n      const remoteCacheConfig = config.remoteCache;\n      if (!remoteCacheConfig) {\n        return {\n          message:\n            'Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.',\n        };\n      }\n\n      let syncResult: SyncResult;\n      if (upload) {\n        await runPrerequisites(apiContextOptions);\n\n        const [ctx] = autoDispose(\n          await createPartialApiContext({\n            ...apiContextOptions,\n            items: [\n              'bus',\n              'taskRunner',\n              'watcher',\n              'packages',\n              'session',\n              'packageImportPaths',\n              'packageHashes',\n              'remoteCacheClient',\n            ],\n            remoteCacheClientLoginMethod: login,\n          }),\n        );\n        syncResult = await syncUpload({ input: undefined, ctx });\n      } else {\n        const [ctx] = autoDispose(\n          await createPartialApiContext({\n            ...apiContextOptions,\n            items: ['packages', 'session', 'packageHashes', 'remoteCacheClient'],\n            remoteCacheClientLoginMethod: login,\n          }),\n        );\n        syncResult = await syncDownload({ input: undefined, ctx });\n      }\n\n      return {\n        message:\n          `Sync completed with ${syncResult.success} successes, ${syncResult.failed} failures, ` +\n          `and ${syncResult['already-exist'] + syncResult['not-found']} items that did not require syncing.`,\n      };\n    });\n  } catch (error) {\n    if (error instanceof Error) {\n      if (error.name === 'AuthenticationRequiredError' && error.message.includes('CrossPlatformLockError')) {\n        return {\n          message: red(\n            `Cloudpack encountered an issue acquiring the authentication lock. It seems \"cloudpack sync\" may already ` +\n              `be running in another process. Please wait for the other process to complete and then try again.`,\n          ),\n          exitCode: ExitCodeGenericError,\n        };\n      }\n      if (\n        error.name === 'AuthenticationRequiredError' ||\n        ('statusCode' in error && (error.statusCode === '401' || error.statusCode === '403'))\n      ) {\n        return {\n          message: red('Authentication error. Please check your credentials and try again.'),\n          exitCode: ExitCodeAuthenticationError,\n        };\n      }\n\n      if (checkErrorCode(error, 'REQUEST_SEND_ERROR')) {\n        return {\n          message: red('Connection error. Please check your connection and try again.'),\n          exitCode: ExitCodeGenericError,\n        };\n      }\n    }\n\n    throw error;\n  }\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPartialApiContext, syncDownload, syncUpload, type SyncResult } from '@ms-cloudpack/api-server';\nimport { environmentInfo } from '@ms-cloudpack/environment';\nimport { red } from '@ms-cloudpack/task-reporter';\nimport {\n  ExitCodeAuthenticationError,\n  ExitCodeGenericError,\n  type CommandAction,\n  type CommandExitParams,\n} from '../../types/CommandAction.js';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport type { SyncOptions } from './types/SyncOptions.js';\n\nfunction checkErrorCode(error: unknown, code: string): boolean {\n  return error instanceof Error && 'code' in error && error.code === code;\n}\n\nexport const execute: CommandAction<SyncOptions> = async (params) => {\n  const { options, config, telemetryClient } = params;\n  const { login, upload } = options;\n\n  try {\n    // Await here to ensure that try-catch block catches any errors thrown inside the async function\n    return await telemetryClient.tracer.startActiveSpan('SYNC_EXECUTE', async (span): Promise<CommandExitParams> => {\n      if (!config.features?.syncBundles) {\n        return { message: 'Sync is disabled' };\n      }\n\n      if (!environmentInfo.cloudpack.isSyncEnabled) {\n        span.setAttribute('syncDisabled', true);\n        return { message: 'Sync is disabled by the user (CLOUDPACK_SYNC environment variable is set).' };\n      }\n\n      const remoteCacheConfig = config.remoteCache;\n      if (!remoteCacheConfig) {\n        return {\n          message:\n            'Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.',\n        };\n      }\n\n      let syncResult: SyncResult;\n      if (upload) {\n        await runPrerequisites(params);\n\n        const ctx = await createPartialApiContext({\n          ...params,\n          remoteCacheClientLoginMethod: login,\n        });\n        syncResult = await syncUpload({ input: undefined, ctx });\n      } else {\n        const ctx = await createPartialApiContext({\n          ...params,\n          remoteCacheClientLoginMethod: login,\n        });\n        syncResult = await syncDownload({ input: undefined, ctx });\n      }\n\n      return {\n        message:\n          `Sync completed with ${syncResult.success} successes, ${syncResult.failed} failures, ` +\n          `and ${syncResult['already-exist'] + syncResult['not-found']} items that did not require syncing.`,\n      };\n    });\n  } catch (error) {\n    if (error instanceof Error) {\n      if (error.name === 'AuthenticationRequiredError' && error.message.includes('CrossPlatformLockError')) {\n        return {\n          message: red(\n            `Cloudpack encountered an issue acquiring the authentication lock. It seems \"cloudpack sync\" may already ` +\n              `be running in another process. Please wait for the other process to complete and then try again.`,\n          ),\n          exitCode: ExitCodeGenericError,\n        };\n      }\n      if (\n        error.name === 'AuthenticationRequiredError' ||\n        ('statusCode' in error && (error.statusCode === '401' || error.statusCode === '403'))\n      ) {\n        return {\n          message: red('Authentication error. Please check your credentials and try again.'),\n          exitCode: ExitCodeAuthenticationError,\n        };\n      }\n\n      if (checkErrorCode(error, 'REQUEST_SEND_ERROR')) {\n        return {\n          message: red('Connection error. Please check your connection and try again.'),\n          exitCode: ExitCodeGenericError,\n        };\n      }\n    }\n\n    throw error;\n  }\n};\n"]}

package/lib/commands/unlink/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/unlink/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAO9D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,aAAa,CA0ChD,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/unlink/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAO9D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,aAAa,CAyChD,CAAC"}