@sanity/cli 7.2.3 → 7.4.0

package/dist/actions/dev/registration/startDevServerRegistration.js

@@ -0,0 +1,121 @@
+import { getCliConfigUncached } from '@sanity/cli-core';
+import { registerDevServer } from '@sanity/workbench-cli/dev';
+import { checkForDeprecatedAppId, getAppId } from '../../../util/appId.js';
+import { extractCoreAppManifest } from '../../manifest/extractCoreAppManifest.js';
+import { deriveInterfaces } from './deriveInterfaces.js';
+import { extractStudioManifest } from './extractDevServerManifest.js';
+import { trackInterfaceSet } from './interfaceSetId.js';
+import { startDevManifestWatcher } from './startDevManifestWatcher.js';
+/**
+ * The address a dev server actually bound, preferring the live socket over the
+ * configured port — with non-strict ports the two can disagree. Used for the
+ * initial registration and again after an interface-set rebuild recreates the
+ * server, so the registry never advertises a port nothing listens on.
+ */ function serverAddress(server) {
+    const resolvedHost = server.config.server.host;
+    const addr = server.httpServer?.address();
+    return {
+        host: typeof resolvedHost === 'string' ? resolvedHost : 'localhost',
+        port: typeof addr === 'object' && addr ? addr.port : server.config.server.port
+    };
+}
+/**
+ * Register the dev server in the dev server registry and start a watcher for
+ * the manifest file. The workbench reads the registration to locate the dev
+ * server and display it in the UI; the manifest watcher keeps that registration
+ * pointed at the latest manifest, which the workbench renders as project metadata.
+ */ export async function startDevServerRegistration(options) {
+    const { cliConfig, isApp, onInterfaceSetChange, output, server, workDir } = options;
+    checkForDeprecatedAppId({
+        cliConfig,
+        output
+    });
+    const { host: appHost, port: appPort } = serverAddress(server);
+    // Interfaces (panels/workers/app view) are derived from the branded
+    // `unstable_defineApp` config and forwarded on the registry entry (alongside,
+    // not inside, the manifest) so the workbench renders local panels, runs local
+    // workers, and resolves the app view without a deploy. The watcher below
+    // re-derives them on every `sanity.cli.ts` edit so adding/removing a view or
+    // service re-syncs live (FR-024) — the way `title`/`icon` already do.
+    const interfaces = deriveInterfaces(cliConfig.app, {
+        isApp
+    });
+    const registration = registerDevServer({
+        host: appHost,
+        id: getAppId(cliConfig),
+        interfaces,
+        port: appPort,
+        projectId: cliConfig?.api?.projectId,
+        type: isApp ? 'coreApp' : 'studio',
+        workDir
+    });
+    // Tracks whether a watcher pass changed the *set* of interfaces (rebuild
+    // needed) vs. only the manifest (title/icon) or a view/service source file
+    // (HMR handles it — the set is unchanged). Committed separately from the
+    // detection so a failed rebuild stays eligible for retry (see below).
+    const interfaceSet = trackInterfaceSet(interfaces);
+    const watcher = await startDevManifestWatcher({
+        extract: isApp ? async ({ workDir: wd })=>({
+                // Interfaces are NOT part of the manifest — they're re-derived from the
+                // same config edit and forwarded as a separate registry field, so a
+                // `views`/`services`/`entry` change re-syncs live (FR-024).
+                interfaces: deriveInterfaces((await getCliConfigUncached(wd)).app, {
+                    isApp
+                }),
+                manifest: await extractCoreAppManifest({
+                    workDir: wd
+                })
+            }) : async (params)=>({
+                // Studios declare views/services in `sanity.cli.ts` too — re-derive
+                // them like the app extract does. The registry patch is a shallow
+                // merge, so a hardcoded `interfaces: undefined` here would wipe the
+                // panels/workers forwarded by the initial registration on the very
+                // first regeneration.
+                interfaces: deriveInterfaces((await getCliConfigUncached(params.workDir)).app, {
+                    isApp
+                }),
+                manifest: await extractStudioManifest(params)
+            }),
+        // A studio's project root resolves to `sanity.config.*`, but its workbench
+        // interfaces live in `sanity.cli.*` — watch that too so adding/removing a
+        // view or service regenerates without a manual restart. Apps already
+        // resolve their root to `sanity.cli.*`.
+        extraWatchFilenames: isApp ? undefined : [
+            'sanity.cli.js',
+            'sanity.cli.ts'
+        ],
+        output,
+        update: async (patch)=>{
+            if (!interfaceSet.changed(patch.interfaces)) {
+                // Set unchanged (reorder, or a manifest-only/source-file edit) — patch
+                // the registry and let HMR handle the rest; no rebuild needed.
+                registration.update(patch);
+                return;
+            }
+            // Rebuild the app remote first (so the new view/service has an expose +
+            // artifact), THEN patch the registry — the registry patch is what reloads
+            // the workbench page, and it must re-fetch a remote that already exposes
+            // the new interface.
+            const rebuiltServer = await onInterfaceSetChange?.();
+            // Commit only after the rebuild resolves: a thrown rebuild surfaces
+            // through the watcher's failure path with the set uncommitted, so the
+            // next pass over the same declarations retries instead of skipping.
+            interfaceSet.commit(patch.interfaces);
+            // The recreated server can bind a different port (non-strict ports), so
+            // the patch carries its actual address alongside the manifest fields.
+            registration.update(rebuiltServer ? {
+                ...patch,
+                ...serverAddress(rebuiltServer)
+            } : patch);
+        },
+        workDir
+    });
+    return {
+        close: async ()=>{
+            registration.release();
+            await watcher.close();
+        }
+    };
+}
+
+//# sourceMappingURL=startDevServerRegistration.js.map

package/dist/actions/dev/registration/startDevServerRegistration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/actions/dev/registration/startDevServerRegistration.ts"],"sourcesContent":["import {type CliConfig, getCliConfigUncached, type Output} from '@sanity/cli-core'\nimport {registerDevServer} from '@sanity/workbench-cli/dev'\nimport {type ViteDevServer} from 'vite'\n\nimport {checkForDeprecatedAppId, getAppId} from '../../../util/appId.js'\nimport {extractCoreAppManifest} from '../../manifest/extractCoreAppManifest.js'\nimport {deriveInterfaces} from './deriveInterfaces.js'\nimport {extractStudioManifest} from './extractDevServerManifest.js'\nimport {trackInterfaceSet} from './interfaceSetId.js'\nimport {startDevManifestWatcher} from './startDevManifestWatcher.js'\n\ninterface DevServerRegistrationOptions {\n  cliConfig: CliConfig\n  isApp: boolean\n  output: Output\n  server: ViteDevServer\n  workDir: string\n\n  /**\n   * Called when the declared interface *set* changes (a view/service added,\n   * removed, renamed, or repointed in `sanity.cli.ts`), awaited *before* the\n   * registry is patched — the registry patch is what reloads the workbench\n   * page, and it must re-fetch a remote that already exposes the new\n   * interface, so the caller's rebuild has to complete first. A view/service\n   * *source* edit doesn't change the set and never fires this. Studios\n   * declare views/services the same way apps do, so both pass a rebuild.\n   *\n   * Resolves with the recreated dev server so the registry entry can be\n   * patched with its actual address — workbench projects run with non-strict\n   * ports, so the replacement isn't guaranteed to bind the port registered at\n   * startup. Must reject when the restart doesn't produce a listening server:\n   * the set id stays uncommitted so the next config save retries the rebuild\n   * instead of advertising the new interface set on a dead port.\n   */\n  onInterfaceSetChange?: () => Promise<ViteDevServer>\n}\n\ninterface DevServerRegistrationHandle {\n  close: () => Promise<void>\n}\n\n/**\n * The address a dev server actually bound, preferring the live socket over the\n * configured port — with non-strict ports the two can disagree. Used for the\n * initial registration and again after an interface-set rebuild recreates the\n * server, so the registry never advertises a port nothing listens on.\n */\nfunction serverAddress(server: ViteDevServer) {\n  const resolvedHost = server.config.server.host\n  const addr = server.httpServer?.address()\n  return {\n    host: typeof resolvedHost === 'string' ? resolvedHost : 'localhost',\n    port: typeof addr === 'object' && addr ? addr.port : server.config.server.port,\n  }\n}\n\n/**\n * Register the dev server in the dev server registry and start a watcher for\n * the manifest file. The workbench reads the registration to locate the dev\n * server and display it in the UI; the manifest watcher keeps that registration\n * pointed at the latest manifest, which the workbench renders as project metadata.\n */\nexport async function startDevServerRegistration(\n  options: DevServerRegistrationOptions,\n): Promise<DevServerRegistrationHandle> {\n  const {cliConfig, isApp, onInterfaceSetChange, output, server, workDir} = options\n\n  checkForDeprecatedAppId({cliConfig, output})\n\n  const {host: appHost, port: appPort} = serverAddress(server)\n\n  // Interfaces (panels/workers/app view) are derived from the branded\n  // `unstable_defineApp` config and forwarded on the registry entry (alongside,\n  // not inside, the manifest) so the workbench renders local panels, runs local\n  // workers, and resolves the app view without a deploy. The watcher below\n  // re-derives them on every `sanity.cli.ts` edit so adding/removing a view or\n  // service re-syncs live (FR-024) — the way `title`/`icon` already do.\n  const interfaces = deriveInterfaces(cliConfig.app, {isApp})\n\n  const registration = registerDevServer({\n    host: appHost,\n    id: getAppId(cliConfig),\n    interfaces,\n    port: appPort,\n    projectId: cliConfig?.api?.projectId,\n    type: isApp ? 'coreApp' : 'studio',\n    workDir,\n  })\n\n  // Tracks whether a watcher pass changed the *set* of interfaces (rebuild\n  // needed) vs. only the manifest (title/icon) or a view/service source file\n  // (HMR handles it — the set is unchanged). Committed separately from the\n  // detection so a failed rebuild stays eligible for retry (see below).\n  const interfaceSet = trackInterfaceSet(interfaces)\n\n  const watcher = await startDevManifestWatcher({\n    extract: isApp\n      ? async ({workDir: wd}) => ({\n          // Interfaces are NOT part of the manifest — they're re-derived from the\n          // same config edit and forwarded as a separate registry field, so a\n          // `views`/`services`/`entry` change re-syncs live (FR-024).\n          interfaces: deriveInterfaces((await getCliConfigUncached(wd)).app, {isApp}),\n          manifest: await extractCoreAppManifest({workDir: wd}),\n        })\n      : async (params) => ({\n          // Studios declare views/services in `sanity.cli.ts` too — re-derive\n          // them like the app extract does. The registry patch is a shallow\n          // merge, so a hardcoded `interfaces: undefined` here would wipe the\n          // panels/workers forwarded by the initial registration on the very\n          // first regeneration.\n          interfaces: deriveInterfaces((await getCliConfigUncached(params.workDir)).app, {isApp}),\n          manifest: await extractStudioManifest(params),\n        }),\n    // A studio's project root resolves to `sanity.config.*`, but its workbench\n    // interfaces live in `sanity.cli.*` — watch that too so adding/removing a\n    // view or service regenerates without a manual restart. Apps already\n    // resolve their root to `sanity.cli.*`.\n    extraWatchFilenames: isApp ? undefined : ['sanity.cli.js', 'sanity.cli.ts'],\n    output,\n    update: async (patch) => {\n      if (!interfaceSet.changed(patch.interfaces)) {\n        // Set unchanged (reorder, or a manifest-only/source-file edit) — patch\n        // the registry and let HMR handle the rest; no rebuild needed.\n        registration.update(patch)\n        return\n      }\n      // Rebuild the app remote first (so the new view/service has an expose +\n      // artifact), THEN patch the registry — the registry patch is what reloads\n      // the workbench page, and it must re-fetch a remote that already exposes\n      // the new interface.\n      const rebuiltServer = await onInterfaceSetChange?.()\n      // Commit only after the rebuild resolves: a thrown rebuild surfaces\n      // through the watcher's failure path with the set uncommitted, so the\n      // next pass over the same declarations retries instead of skipping.\n      interfaceSet.commit(patch.interfaces)\n      // The recreated server can bind a different port (non-strict ports), so\n      // the patch carries its actual address alongside the manifest fields.\n      registration.update(rebuiltServer ? {...patch, ...serverAddress(rebuiltServer)} : patch)\n    },\n    workDir,\n  })\n\n  return {\n    close: async () => {\n      registration.release()\n      await watcher.close()\n    },\n  }\n}\n"],"names":["getCliConfigUncached","registerDevServer","checkForDeprecatedAppId","getAppId","extractCoreAppManifest","deriveInterfaces","extractStudioManifest","trackInterfaceSet","startDevManifestWatcher","serverAddress","server","resolvedHost","config","host","addr","httpServer","address","port","startDevServerRegistration","options","cliConfig","isApp","onInterfaceSetChange","output","workDir","appHost","appPort","interfaces","app","registration","id","projectId","api","type","interfaceSet","watcher","extract","wd","manifest","params","extraWatchFilenames","undefined","update","patch","changed","rebuiltServer","commit","close","release"],"mappings":"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"}

package/dist/actions/dev/servers/getDashboardAppUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/actions/dev/servers/getDashboardAppUrl.ts"],"sourcesContent":["import {getSanityUrl, subdebug} from '@sanity/cli-core'\n\nconst debug = subdebug('dev:getDashboardAppURL')\n\nconst DEFAULT_TIMEOUT = 5000\n\nconst getDefaultDashboardURL = ({\n  organizationId,\n  url,\n}: {\n  organizationId: string\n  url: string\n}): string => {\n  return getSanityUrl(\n    `/@${organizationId}?${new URLSearchParams({\n      dev: url,\n    }).toString()}`,\n  )\n}\n\n/**\n * Gets the dashboard URL from API or uses the default dashboard URL\n */\nexport const getDashboardAppURL = async ({\n  httpHost = 'localhost',\n  httpPort = 3333,\n  organizationId,\n}: {\n  httpHost?: string\n  httpPort?: number\n  organizationId: string\n}): Promise<string> => {\n  const url = `http://${httpHost}:${httpPort}`\n\n  const abortController = new AbortController()\n  // Wait for 5 seconds before aborting the request\n  const timer = setTimeout(() => abortController.abort(), DEFAULT_TIMEOUT)\n  try {\n    const queryParams = new URLSearchParams({\n      organizationId,\n      url,\n    })\n\n    const res = await globalThis.fetch(\n      getSanityUrl(`/api/dashboard/mode/development/resolve-url?${queryParams.toString()}`),\n      {\n        signal: abortController.signal,\n      },\n    )\n\n    if (!res.ok) {\n      debug(`Failed to fetch dashboard URL: ${res.statusText}`)\n      return getDefaultDashboardURL({organizationId, url})\n    }\n\n    const body = await res.json()\n    // <dashboard-app-url>/<orgniazationId>?dev=<dev-server-url>\n    return body?.url ?? getDefaultDashboardURL({organizationId, url})\n  } catch (err) {\n    debug(`Failed to fetch dashboard URL: ${err instanceof Error ? err.message : String(err)}`)\n    return getDefaultDashboardURL({organizationId, url})\n  } finally {\n    clearTimeout(timer)\n  }\n}\n"],"names":["getSanityUrl","subdebug","debug","DEFAULT_TIMEOUT","getDefaultDashboardURL","organizationId","url","URLSearchParams","dev","toString","getDashboardAppURL","httpHost","httpPort","abortController","AbortController","timer","setTimeout","abort","queryParams","res","globalThis","fetch","signal","ok","statusText","body","json","err","Error","message","String","clearTimeout"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,QAAQ,QAAO,mBAAkB;AAEvD,MAAMC,QAAQD,SAAS;AAEvB,MAAME,kBAAkB;AAExB,MAAMC,yBAAyB,CAAC,EAC9BC,cAAc,EACdC,GAAG,EAIJ;IACC,OAAON,aACL,CAAC,EAAE,EAAEK,eAAe,CAAC,EAAE,IAAIE,gBAAgB;QACzCC,KAAKF;IACP,GAAGG,QAAQ,IAAI;AAEnB;AAEA;;CAEC,GACD,OAAO,MAAMC,qBAAqB,OAAO,EACvCC,WAAW,WAAW,EACtBC,WAAW,IAAI,EACfP,cAAc,EAKf;IACC,MAAMC,MAAM,CAAC,OAAO,EAAEK,SAAS,CAAC,EAAEC,UAAU;IAE5C,MAAMC,kBAAkB,IAAIC;IAC5B,iDAAiD;IACjD,MAAMC,QAAQC,WAAW,IAAMH,gBAAgBI,KAAK,IAAId;IACxD,IAAI;QACF,MAAMe,cAAc,IAAIX,gBAAgB;YACtCF;YACAC;QACF;QAEA,MAAMa,MAAM,MAAMC,WAAWC,KAAK,CAChCrB,aAAa,CAAC,4CAA4C,EAAEkB,YAAYT,QAAQ,IAAI,GACpF;YACEa,QAAQT,gBAAgBS,MAAM;QAChC;QAGF,IAAI,CAACH,IAAII,EAAE,EAAE;YACXrB,MAAM,CAAC,+BAA+B,EAAEiB,IAAIK,UAAU,EAAE;YACxD,OAAOpB,uBAAuB;gBAACC;gBAAgBC;YAAG;QACpD;QAEA,MAAMmB,OAAO,MAAMN,IAAIO,IAAI;QAC3B,4DAA4D;QAC5D,OAAOD,MAAMnB,OAAOF,uBAAuB;YAACC;YAAgBC;QAAG;IACjE,EAAE,OAAOqB,KAAK;QACZzB,MAAM,CAAC,+BAA+B,EAAEyB,eAAeC,QAAQD,IAAIE,OAAO,GAAGC,OAAOH,MAAM;QAC1F,OAAOvB,uBAAuB;YAACC;YAAgBC;QAAG;IACpD,SAAU;QACRyB,aAAahB;IACf;AACF,EAAC"}

package/dist/actions/dev/servers/getDevServerConfig.js

@@ -0,0 +1,45 @@
+import path from 'node:path';
+import { getSanityEnvVar, isWorkbenchApp } from '@sanity/cli-core';
+import { spinner } from '@sanity/cli-core/ux';
+import { determineIsApp } from '../../../util/determineIsApp.js';
+import { getSharedServerConfig } from '../../../util/getSharedServerConfig.js';
+import { resolveReactStrictMode } from '../../../util/resolveReactStrictMode.js';
+export function getDevServerConfig({ cliConfig, flags, httpPort, output, workDir }) {
+    const configSpinner = spinner('Checking configuration files...');
+    const baseConfig = getSharedServerConfig({
+        cliConfig,
+        flags: {
+            host: flags.host,
+            port: flags.port
+        },
+        workDir
+    });
+    configSpinner.succeed();
+    const isApp = cliConfig ? determineIsApp(cliConfig) : false;
+    const reactStrictMode = resolveReactStrictMode(cliConfig);
+    // `views` is declared via `unstable_defineApp`, so read it off the branded
+    // app result rather than the legacy `app` config type.
+    const app = cliConfig?.app;
+    const envBasePath = getSanityEnvVar('BASEPATH', isApp ?? false);
+    if (envBasePath && cliConfig?.project?.basePath) {
+        output.warn(`Overriding configured base path (${cliConfig.project.basePath}) with value from environment variable (${envBasePath})`);
+    }
+    return {
+        ...baseConfig,
+        // The app's navigable entry. A branded app that omits `entry` has no app
+        // view (sanity-io/workbench spec 002-workbench-extension-api, US5): the runtime/federation skip the `./App` render path entirely.
+        entry: app?.entry,
+        // `devAction` passes an explicit port when a running workbench claimed the
+        // configured one; otherwise the shared resolution stands.
+        httpPort: httpPort ?? baseConfig.httpPort,
+        isWorkbenchApp: isWorkbenchApp(app),
+        reactCompiler: cliConfig && 'reactCompiler' in cliConfig ? cliConfig.reactCompiler : undefined,
+        reactStrictMode,
+        services: isWorkbenchApp(app) ? app.services : undefined,
+        staticPath: path.join(workDir, 'static'),
+        typegen: cliConfig?.typegen,
+        views: isWorkbenchApp(app) ? app.views : undefined
+    };
+}
+
+//# sourceMappingURL=getDevServerConfig.js.map

package/dist/actions/dev/servers/getDevServerConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/actions/dev/servers/getDevServerConfig.ts"],"sourcesContent":["import path from 'node:path'\n\nimport {type CliConfig, getSanityEnvVar, isWorkbenchApp, type Output} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\n\nimport {type DevServerOptions} from '../../../server/devServer.js'\nimport {determineIsApp} from '../../../util/determineIsApp.js'\nimport {getSharedServerConfig} from '../../../util/getSharedServerConfig.js'\nimport {resolveReactStrictMode} from '../../../util/resolveReactStrictMode.js'\nimport {type DevFlags} from '../types.js'\n\nexport function getDevServerConfig({\n  cliConfig,\n  flags,\n  httpPort,\n  output,\n  workDir,\n}: {\n  cliConfig?: CliConfig\n  flags: DevFlags\n  httpPort?: number\n  output: Output\n  workDir: string\n}): Omit<DevServerOptions, 'spinner'> {\n  const configSpinner = spinner('Checking configuration files...')\n\n  const baseConfig = getSharedServerConfig({\n    cliConfig,\n    flags: {\n      host: flags.host,\n      port: flags.port,\n    },\n    workDir,\n  })\n\n  configSpinner.succeed()\n\n  const isApp = cliConfig ? determineIsApp(cliConfig) : false\n  const reactStrictMode = resolveReactStrictMode(cliConfig)\n  // `views` is declared via `unstable_defineApp`, so read it off the branded\n  // app result rather than the legacy `app` config type.\n  const app = cliConfig?.app\n\n  const envBasePath = getSanityEnvVar('BASEPATH', isApp ?? false)\n  if (envBasePath && cliConfig?.project?.basePath) {\n    output.warn(\n      `Overriding configured base path (${cliConfig.project.basePath}) with value from environment variable (${envBasePath})`,\n    )\n  }\n\n  return {\n    ...baseConfig,\n    // The app's navigable entry. A branded app that omits `entry` has no app\n    // view (sanity-io/workbench spec 002-workbench-extension-api, US5): the runtime/federation skip the `./App` render path entirely.\n    entry: app?.entry,\n    // `devAction` passes an explicit port when a running workbench claimed the\n    // configured one; otherwise the shared resolution stands.\n    httpPort: httpPort ?? baseConfig.httpPort,\n    isWorkbenchApp: isWorkbenchApp(app),\n    reactCompiler: cliConfig && 'reactCompiler' in cliConfig ? cliConfig.reactCompiler : undefined,\n    reactStrictMode,\n    services: isWorkbenchApp(app) ? app.services : undefined,\n    staticPath: path.join(workDir, 'static'),\n    typegen: cliConfig?.typegen,\n    views: isWorkbenchApp(app) ? app.views : undefined,\n  }\n}\n"],"names":["path","getSanityEnvVar","isWorkbenchApp","spinner","determineIsApp","getSharedServerConfig","resolveReactStrictMode","getDevServerConfig","cliConfig","flags","httpPort","output","workDir","configSpinner","baseConfig","host","port","succeed","isApp","reactStrictMode","app","envBasePath","project","basePath","warn","entry","reactCompiler","undefined","services","staticPath","join","typegen","views"],"mappings":"AAAA,OAAOA,UAAU,YAAW;AAE5B,SAAwBC,eAAe,EAAEC,cAAc,QAAoB,mBAAkB;AAC7F,SAAQC,OAAO,QAAO,sBAAqB;AAG3C,SAAQC,cAAc,QAAO,kCAAiC;AAC9D,SAAQC,qBAAqB,QAAO,yCAAwC;AAC5E,SAAQC,sBAAsB,QAAO,0CAAyC;AAG9E,OAAO,SAASC,mBAAmB,EACjCC,SAAS,EACTC,KAAK,EACLC,QAAQ,EACRC,MAAM,EACNC,OAAO,EAOR;IACC,MAAMC,gBAAgBV,QAAQ;IAE9B,MAAMW,aAAaT,sBAAsB;QACvCG;QACAC,OAAO;YACLM,MAAMN,MAAMM,IAAI;YAChBC,MAAMP,MAAMO,IAAI;QAClB;QACAJ;IACF;IAEAC,cAAcI,OAAO;IAErB,MAAMC,QAAQV,YAAYJ,eAAeI,aAAa;IACtD,MAAMW,kBAAkBb,uBAAuBE;IAC/C,2EAA2E;IAC3E,uDAAuD;IACvD,MAAMY,MAAMZ,WAAWY;IAEvB,MAAMC,cAAcpB,gBAAgB,YAAYiB,SAAS;IACzD,IAAIG,eAAeb,WAAWc,SAASC,UAAU;QAC/CZ,OAAOa,IAAI,CACT,CAAC,iCAAiC,EAAEhB,UAAUc,OAAO,CAACC,QAAQ,CAAC,wCAAwC,EAAEF,YAAY,CAAC,CAAC;IAE3H;IAEA,OAAO;QACL,GAAGP,UAAU;QACb,yEAAyE;QACzE,kIAAkI;QAClIW,OAAOL,KAAKK;QACZ,2EAA2E;QAC3E,0DAA0D;QAC1Df,UAAUA,YAAYI,WAAWJ,QAAQ;QACzCR,gBAAgBA,eAAekB;QAC/BM,eAAelB,aAAa,mBAAmBA,YAAYA,UAAUkB,aAAa,GAAGC;QACrFR;QACAS,UAAU1B,eAAekB,OAAOA,IAAIQ,QAAQ,GAAGD;QAC/CE,YAAY7B,KAAK8B,IAAI,CAAClB,SAAS;QAC/BmB,SAASvB,WAAWuB;QACpBC,OAAO9B,eAAekB,OAAOA,IAAIY,KAAK,GAAGL;IAC3C;AACF"}

package/dist/actions/dev/servers/startAppDevServer.js

@@ -0,0 +1,78 @@
+import { styleText } from 'node:util';
+import { isWorkbenchApp as determineIsWorkbenchApp } from '@sanity/cli-core';
+import { startDevServer } from '../../../server/devServer.js';
+import { gracefulServerDeath } from '../../../server/gracefulServerDeath.js';
+import { devDebug } from '../devDebug.js';
+import { getDashboardAppURL } from './getDashboardAppUrl.js';
+import { getDevServerConfig } from './getDevServerConfig.js';
+export async function startAppDevServer(options) {
+    const { cliConfig, flags, httpPort, output, workbenchAvailable, workDir } = options;
+    const isWorkbenchApp = determineIsWorkbenchApp(cliConfig?.app);
+    // Workbench apps don't load through the dashboard, so the flag has no
+    // meaning for them and is ignored.
+    if (!isWorkbenchApp && !flags['load-in-dashboard']) {
+        output.warn(`Apps cannot run without the Sanity dashboard`);
+        output.warn(`Starting dev server with the --load-in-dashboard flag set to true`);
+    }
+    let organizationId;
+    if (cliConfig && 'app' in cliConfig && cliConfig.app?.organizationId) {
+        organizationId = cliConfig.app.organizationId;
+    }
+    if (!organizationId) {
+        output.error(`Apps require an organization ID (orgId) specified in your sanity.cli.ts file`, {
+            exit: 1
+        });
+        return {
+            reason: 'missing-organization-id',
+            started: false
+        };
+    }
+    const config = getDevServerConfig({
+        cliConfig,
+        flags,
+        httpPort,
+        output,
+        workDir
+    });
+    try {
+        output.log('Starting dev server');
+        const appTitle = cliConfig && 'app' in cliConfig ? cliConfig.app?.title : undefined;
+        const { close, server } = await startDevServer({
+            ...config,
+            appTitle,
+            isApp: true
+        });
+        const { port } = server.config.server;
+        if (isWorkbenchApp) {
+            // Federated apps surface through the workbench, so the dashboard URL is
+            // meaningless for them. When the workbench runs, devAction announces its
+            // URL instead — only the package-unavailable fallback logs from here.
+            if (!workbenchAvailable) {
+                output.log(`App dev server started on port ${port}`);
+            }
+        } else {
+            const httpHost = config.httpHost || 'localhost';
+            const dashboardAppUrl = await getDashboardAppURL({
+                httpHost,
+                httpPort: port,
+                organizationId
+            });
+            output.log(`Dev server started on port ${port}`);
+            output.log(`View your app in the Sanity dashboard here:`);
+            output.log(styleText([
+                'blue',
+                'underline'
+            ], dashboardAppUrl));
+        }
+        return {
+            close,
+            server,
+            started: true
+        };
+    } catch (err) {
+        devDebug('Error starting app dev server', err);
+        throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err);
+    }
+}
+
+//# sourceMappingURL=startAppDevServer.js.map

package/dist/actions/dev/servers/startAppDevServer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/actions/dev/servers/startAppDevServer.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {isWorkbenchApp as determineIsWorkbenchApp} from '@sanity/cli-core'\n\nimport {startDevServer} from '../../../server/devServer.js'\nimport {gracefulServerDeath} from '../../../server/gracefulServerDeath.js'\nimport {devDebug} from '../devDebug.js'\nimport {type DevActionOptions, type StartDevServerResult} from '../types.js'\nimport {getDashboardAppURL} from './getDashboardAppUrl.js'\nimport {getDevServerConfig} from './getDevServerConfig.js'\n\nexport async function startAppDevServer(options: DevActionOptions): Promise<StartDevServerResult> {\n  const {cliConfig, flags, httpPort, output, workbenchAvailable, workDir} = options\n\n  const isWorkbenchApp = determineIsWorkbenchApp(cliConfig?.app)\n\n  // Workbench apps don't load through the dashboard, so the flag has no\n  // meaning for them and is ignored.\n  if (!isWorkbenchApp && !flags['load-in-dashboard']) {\n    output.warn(`Apps cannot run without the Sanity dashboard`)\n    output.warn(`Starting dev server with the --load-in-dashboard flag set to true`)\n  }\n\n  let organizationId: string | undefined\n  if (cliConfig && 'app' in cliConfig && cliConfig.app?.organizationId) {\n    organizationId = cliConfig.app.organizationId\n  }\n\n  if (!organizationId) {\n    output.error(`Apps require an organization ID (orgId) specified in your sanity.cli.ts file`, {\n      exit: 1,\n    })\n    return {reason: 'missing-organization-id', started: false}\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, httpPort, output, workDir})\n\n  try {\n    output.log('Starting dev server')\n\n    const appTitle = cliConfig && 'app' in cliConfig ? cliConfig.app?.title : undefined\n    const {close, server} = await startDevServer({\n      ...config,\n      appTitle,\n      isApp: true,\n    })\n\n    const {port} = server.config.server\n\n    if (isWorkbenchApp) {\n      // Federated apps surface through the workbench, so the dashboard URL is\n      // meaningless for them. When the workbench runs, devAction announces its\n      // URL instead — only the package-unavailable fallback logs from here.\n      if (!workbenchAvailable) {\n        output.log(`App dev server started on port ${port}`)\n      }\n    } else {\n      const httpHost = config.httpHost || 'localhost'\n\n      const dashboardAppUrl = await getDashboardAppURL({\n        httpHost,\n        httpPort: port,\n        organizationId,\n      })\n      output.log(`Dev server started on port ${port}`)\n      output.log(`View your app in the Sanity dashboard here:`)\n      output.log(styleText(['blue', 'underline'], dashboardAppUrl))\n    }\n\n    return {close, server, started: true}\n  } catch (err) {\n    devDebug('Error starting app dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["styleText","isWorkbenchApp","determineIsWorkbenchApp","startDevServer","gracefulServerDeath","devDebug","getDashboardAppURL","getDevServerConfig","startAppDevServer","options","cliConfig","flags","httpPort","output","workbenchAvailable","workDir","app","warn","organizationId","error","exit","reason","started","config","log","appTitle","title","undefined","close","server","isApp","port","httpHost","dashboardAppUrl","err"],"mappings":"AAAA,SAAQA,SAAS,QAAO,YAAW;AAEnC,SAAQC,kBAAkBC,uBAAuB,QAAO,mBAAkB;AAE1E,SAAQC,cAAc,QAAO,+BAA8B;AAC3D,SAAQC,mBAAmB,QAAO,yCAAwC;AAC1E,SAAQC,QAAQ,QAAO,iBAAgB;AAEvC,SAAQC,kBAAkB,QAAO,0BAAyB;AAC1D,SAAQC,kBAAkB,QAAO,0BAAyB;AAE1D,OAAO,eAAeC,kBAAkBC,OAAyB;IAC/D,MAAM,EAACC,SAAS,EAAEC,KAAK,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,kBAAkB,EAAEC,OAAO,EAAC,GAAGN;IAE1E,MAAMR,iBAAiBC,wBAAwBQ,WAAWM;IAE1D,sEAAsE;IACtE,mCAAmC;IACnC,IAAI,CAACf,kBAAkB,CAACU,KAAK,CAAC,oBAAoB,EAAE;QAClDE,OAAOI,IAAI,CAAC,CAAC,4CAA4C,CAAC;QAC1DJ,OAAOI,IAAI,CAAC,CAAC,iEAAiE,CAAC;IACjF;IAEA,IAAIC;IACJ,IAAIR,aAAa,SAASA,aAAaA,UAAUM,GAAG,EAAEE,gBAAgB;QACpEA,iBAAiBR,UAAUM,GAAG,CAACE,cAAc;IAC/C;IAEA,IAAI,CAACA,gBAAgB;QACnBL,OAAOM,KAAK,CAAC,CAAC,4EAA4E,CAAC,EAAE;YAC3FC,MAAM;QACR;QACA,OAAO;YAACC,QAAQ;YAA2BC,SAAS;QAAK;IAC3D;IAEA,MAAMC,SAAShB,mBAAmB;QAACG;QAAWC;QAAOC;QAAUC;QAAQE;IAAO;IAE9E,IAAI;QACFF,OAAOW,GAAG,CAAC;QAEX,MAAMC,WAAWf,aAAa,SAASA,YAAYA,UAAUM,GAAG,EAAEU,QAAQC;QAC1E,MAAM,EAACC,KAAK,EAAEC,MAAM,EAAC,GAAG,MAAM1B,eAAe;YAC3C,GAAGoB,MAAM;YACTE;YACAK,OAAO;QACT;QAEA,MAAM,EAACC,IAAI,EAAC,GAAGF,OAAON,MAAM,CAACM,MAAM;QAEnC,IAAI5B,gBAAgB;YAClB,wEAAwE;YACxE,yEAAyE;YACzE,sEAAsE;YACtE,IAAI,CAACa,oBAAoB;gBACvBD,OAAOW,GAAG,CAAC,CAAC,+BAA+B,EAAEO,MAAM;YACrD;QACF,OAAO;YACL,MAAMC,WAAWT,OAAOS,QAAQ,IAAI;YAEpC,MAAMC,kBAAkB,MAAM3B,mBAAmB;gBAC/C0B;gBACApB,UAAUmB;gBACVb;YACF;YACAL,OAAOW,GAAG,CAAC,CAAC,2BAA2B,EAAEO,MAAM;YAC/ClB,OAAOW,GAAG,CAAC,CAAC,2CAA2C,CAAC;YACxDX,OAAOW,GAAG,CAACxB,UAAU;gBAAC;gBAAQ;aAAY,EAAEiC;QAC9C;QAEA,OAAO;YAACL;YAAOC;YAAQP,SAAS;QAAI;IACtC,EAAE,OAAOY,KAAK;QACZ7B,SAAS,iCAAiC6B;QAC1C,MAAM9B,oBAAoB,OAAOmB,OAAOS,QAAQ,EAAET,OAAOX,QAAQ,EAAEsB;IACrE;AACF"}

package/dist/actions/dev/{startStudioDevServer.js → servers/startStudioDevServer.js}

@@ -1,25 +1,26 @@
 import { styleText } from 'node:util';
-import { checkStudioDependencyVersions } from '@sanity/cli-build/_internal/build';
-import { getLocalPackageVersion, isInteractive } from '@sanity/cli-core';
+import { checkRequiredDependencies, checkStudioDependencyVersions } from '@sanity/cli-build/_internal/build';
+import { getLocalPackageVersion, isInteractive, isWorkbenchApp } from '@sanity/cli-core';
 import { confirm, logSymbols, spinner } from '@sanity/cli-core/ux';
 import { parse as semverParse } from 'semver';
-import { startDevServer } from '../../server/devServer.js';
-import { gracefulServerDeath } from '../../server/gracefulServerDeath.js';
-import { getProjectById } from '../../services/projects.js';
-import { getAppId } from '../../util/appId.js';
-import { compareDependencyVersions } from '../../util/compareDependencyVersions.js';
-import { getPackageManagerChoice } from '../../util/packageManager/packageManagerChoice.js';
-import { upgradePackages } from '../../util/packageManager/upgradePackages.js';
-import { checkRequiredDependencies } from '../build/checkRequiredDependencies.js';
-import { shouldAutoUpdate } from '../build/shouldAutoUpdate.js';
-import { devDebug } from './devDebug.js';
+import { startDevServer } from '../../../server/devServer.js';
+import { gracefulServerDeath } from '../../../server/gracefulServerDeath.js';
+import { getProjectById } from '../../../services/projects.js';
+import { getAppId } from '../../../util/appId.js';
+import { compareDependencyVersions } from '../../../util/compareDependencyVersions.js';
+import { getPackageManagerChoice } from '../../../util/packageManager/packageManagerChoice.js';
+import { upgradePackages } from '../../../util/packageManager/upgradePackages.js';
+import { shouldAutoUpdate } from '../../build/shouldAutoUpdate.js';
+import { devDebug } from '../devDebug.js';
 import { getDashboardAppURL } from './getDashboardAppUrl.js';
 import { getDevServerConfig } from './getDevServerConfig.js';
 export async function startStudioDevServer(options) {
-    const { cliConfig, flags, output, workDir } = options;
+    const { cliConfig, flags, httpPort, output, workbenchAvailable, workDir } = options;
     const projectId = cliConfig?.api?.projectId;
     let organizationId;
-    const loadInDashboard = flags['load-in-dashboard'];
+    // Workbench apps don't load through the dashboard, so the flag has no
+    // meaning for them and is ignored.
+    const loadInDashboard = flags['load-in-dashboard'] && !isWorkbenchApp(cliConfig?.app);
     // Check studio dependency versions
     await checkStudioDependencyVersions(workDir, output);
     const { installedSanityVersion } = await checkRequiredDependencies(options);
@@ -95,6 +96,7 @@ export async function startStudioDevServer(options) {
     const config = getDevServerConfig({
         cliConfig,
         flags,
+        httpPort,
         output,
         workDir
     });
@@ -139,10 +141,12 @@ export async function startStudioDevServer(options) {
             const appType = 'Sanity Studio';
             const viteVersion = await getLocalPackageVersion('vite', import.meta.url);
             spin.succeed();
-            loggerInfo(`${appType} ` + `using ${styleText('cyan', `vite@${viteVersion}`)} ` + `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)} ` + `and running at ${styleText('cyan', url)}`);
+            loggerInfo(`${appType} ` + `using ${styleText('cyan', `vite@${viteVersion}`)} ` + `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)}` + (workbenchAvailable ? '' : ` and running at ${styleText('cyan', url)}`));
         }
         return {
-            close
+            close,
+            server,
+            started: true
         };
     } catch (err) {
         devDebug('Error starting studio dev server', err);

package/dist/actions/dev/servers/startStudioDevServer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/actions/dev/servers/startStudioDevServer.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {\n  checkRequiredDependencies,\n  checkStudioDependencyVersions,\n} from '@sanity/cli-build/_internal/build'\nimport {getLocalPackageVersion, isInteractive, isWorkbenchApp} from '@sanity/cli-core'\nimport {confirm, logSymbols, spinner} from '@sanity/cli-core/ux'\nimport {parse as semverParse} from 'semver'\n\nimport {startDevServer} from '../../../server/devServer.js'\nimport {gracefulServerDeath} from '../../../server/gracefulServerDeath.js'\nimport {getProjectById} from '../../../services/projects.js'\nimport {getAppId} from '../../../util/appId.js'\nimport {compareDependencyVersions} from '../../../util/compareDependencyVersions.js'\nimport {getPackageManagerChoice} from '../../../util/packageManager/packageManagerChoice.js'\nimport {upgradePackages} from '../../../util/packageManager/upgradePackages.js'\nimport {shouldAutoUpdate} from '../../build/shouldAutoUpdate.js'\nimport {devDebug} from '../devDebug.js'\nimport {type DevActionOptions, type StartDevServerResult} from '../types.js'\nimport {getDashboardAppURL} from './getDashboardAppUrl.js'\nimport {getDevServerConfig} from './getDevServerConfig.js'\n\nexport async function startStudioDevServer(\n  options: DevActionOptions,\n): Promise<StartDevServerResult> {\n  const {cliConfig, flags, httpPort, output, workbenchAvailable, workDir} = options\n  const projectId = cliConfig?.api?.projectId\n  let organizationId: string | undefined\n\n  // Workbench apps don't load through the dashboard, so the flag has no\n  // meaning for them and is ignored.\n  const loadInDashboard = flags['load-in-dashboard'] && !isWorkbenchApp(cliConfig?.app)\n\n  // Check studio dependency versions\n  await checkStudioDependencyVersions(workDir, output)\n\n  const {installedSanityVersion} = await checkRequiredDependencies(options)\n\n  // Check if auto-updates are enabled\n  const autoUpdatesEnabled = shouldAutoUpdate({cliConfig, flags, output})\n\n  if (autoUpdatesEnabled) {\n    // Get the clean version without build metadata: https://semver.org/#spec-item-10\n    const cleanSanityVersion = semverParse(installedSanityVersion)?.version\n    if (!cleanSanityVersion) {\n      throw new Error(`Failed to parse installed Sanity version: ${installedSanityVersion}`)\n    }\n\n    const sanityDependencies = [\n      {name: 'sanity', version: cleanSanityVersion},\n      {name: '@sanity/vision', version: cleanSanityVersion},\n    ]\n\n    output.log(`${logSymbols.info} Running with auto-updates enabled`)\n\n    // Check local versions against deployed versions\n    let result: Awaited<ReturnType<typeof compareDependencyVersions>> | undefined\n\n    const appId = getAppId(cliConfig)\n\n    try {\n      result = await compareDependencyVersions(sanityDependencies, workDir, {appId})\n    } catch (err) {\n      output.warn(`Failed to compare local versions against auto-updating versions: ${err}`)\n    }\n\n    if (result?.unresolvedPrerelease.length) {\n      for (const mod of result.unresolvedPrerelease) {\n        output.warn(\n          `Your local version of ${mod.pkg} (${mod.version}) is a prerelease not available on the auto-updates CDN. The locally installed version will be used.`,\n        )\n      }\n    }\n\n    // mismatch between local and auto-updating dependencies\n    if (result?.mismatched.length) {\n      const message =\n        `The following local package versions are different from the versions currently served at runtime.\\n` +\n        `When using auto updates, we recommend that you run with the same versions locally as will be used when deploying.\\n\\n` +\n        `${result.mismatched.map((mod) => ` - ${mod.pkg} (local version: ${mod.installed}, runtime version: ${mod.remote})`).join('\\n')}\\n\\n`\n\n      if (isInteractive()) {\n        const shouldUpgrade = await confirm({\n          default: true,\n          message: styleText('yellow', `${message}Do you want to upgrade local versions?`),\n        })\n        if (shouldUpgrade) {\n          await upgradePackages(\n            {\n              packageManager: (await getPackageManagerChoice(workDir, {interactive: false})).chosen,\n              packages: result.mismatched.map((res) => [res.pkg, res.remote]),\n            },\n            {output, workDir},\n          )\n        }\n      } else {\n        // In this case we warn the user but we don't ask them if they want to upgrade because it's not interactive.\n        output.log(styleText('yellow', message))\n      }\n    }\n  }\n\n  if (cliConfig?.schemaExtraction?.enabled) {\n    output.log(`${logSymbols.info} Running dev server with schema extraction enabled`)\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, httpPort, output, workDir})\n\n  if (loadInDashboard) {\n    if (!projectId) {\n      output.error('Project Id is required to load in dashboard', {exit: 1})\n    }\n\n    try {\n      const project = await getProjectById(projectId!)\n      organizationId = project.organizationId!\n    } catch (error) {\n      devDebug('Error getting organization id from project id', error)\n      output.error('Failed to get organization id from project id', {exit: 1})\n    }\n  }\n\n  try {\n    const startTime = Date.now()\n    const spin = spinner('Starting dev server').start()\n    const {close, server} = await startDevServer(config)\n\n    const {info: loggerInfo} = server.config.logger\n    const {port} = server.config.server\n    const httpHost = config.httpHost || 'localhost'\n\n    if (loadInDashboard) {\n      spin.succeed()\n\n      output.log(`Dev server started on port ${port}`)\n      output.log(`View your studio in the Sanity dashboard here:`)\n      output.log(\n        styleText(\n          ['blue', 'underline'],\n          await getDashboardAppURL({\n            httpHost,\n            httpPort: port,\n            organizationId: organizationId!,\n          }),\n        ),\n      )\n    } else {\n      const startupDuration = Date.now() - startTime\n      const url = `http://${httpHost || 'localhost'}:${port}${config.basePath}`\n      const appType = 'Sanity Studio'\n\n      const viteVersion = await getLocalPackageVersion('vite', import.meta.url)\n      spin.succeed()\n\n      loggerInfo(\n        `${appType} ` +\n          `using ${styleText('cyan', `vite@${viteVersion}`)} ` +\n          `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)}` +\n          (workbenchAvailable ? '' : ` and running at ${styleText('cyan', url)}`),\n      )\n    }\n\n    return {close, server, started: true}\n  } catch (err) {\n    devDebug('Error starting studio dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["styleText","checkRequiredDependencies","checkStudioDependencyVersions","getLocalPackageVersion","isInteractive","isWorkbenchApp","confirm","logSymbols","spinner","parse","semverParse","startDevServer","gracefulServerDeath","getProjectById","getAppId","compareDependencyVersions","getPackageManagerChoice","upgradePackages","shouldAutoUpdate","devDebug","getDashboardAppURL","getDevServerConfig","startStudioDevServer","options","cliConfig","flags","httpPort","output","workbenchAvailable","workDir","projectId","api","organizationId","loadInDashboard","app","installedSanityVersion","autoUpdatesEnabled","cleanSanityVersion","version","Error","sanityDependencies","name","log","info","result","appId","err","warn","unresolvedPrerelease","length","mod","pkg","mismatched","message","map","installed","remote","join","shouldUpgrade","default","packageManager","interactive","chosen","packages","res","schemaExtraction","enabled","config","error","exit","project","startTime","Date","now","spin","start","close","server","loggerInfo","logger","port","httpHost","succeed","startupDuration","url","basePath","appType","viteVersion","Math","ceil","started"],"mappings":"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"}

package/dist/actions/dev/types.js

@@ -1,3 +1,9 @@
-export { };
+/**
+ * Result of starting an app/studio dev server. Discriminated on `started` so
+ * callers handle the didn't-start case explicitly instead of null-checking
+ * optional fields. A server that fails to *boot* still throws — the
+ * not-started arm is reserved for expected early exits the server has
+ * already reported to the user.
+ */ export { };
 
 //# sourceMappingURL=types.js.map

package/dist/actions/dev/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/dev/types.ts"],"sourcesContent":["import {type CliConfig, type Output} from '@sanity/cli-core'\n\nimport {type DevCommand} from '../../commands/dev.js'\n\nexport type DevFlags = DevCommand['flags']\n\nexport interface DevActionOptions {\n  cliConfig: CliConfig\n  flags: DevFlags\n  isApp: boolean\n  output: Output\n  workDir: string\n}\n"],"names":[],"mappings":"AAMA,WAMC"}
+{"version":3,"sources":["../../../src/actions/dev/types.ts"],"sourcesContent":["import {type CliConfig, type Output} from '@sanity/cli-core'\nimport {type ViteDevServer} from 'vite'\n\nimport {type DevCommand} from '../../commands/dev.js'\n\nexport type DevFlags = DevCommand['flags']\n\nexport interface DevActionOptions {\n  cliConfig: CliConfig\n  flags: DevFlags\n  isApp: boolean\n  output: Output\n  workDir: string\n\n  /**\n   * Port the app/studio dev server should bind. `devAction` sets it when a\n   * running workbench has claimed the configured port; otherwise it stays\n   * absent and the server resolves its port from flags/env/config.\n   */\n  httpPort?: number\n\n  workbenchAvailable?: boolean\n}\n\n/**\n * Result of starting an app/studio dev server. Discriminated on `started` so\n * callers handle the didn't-start case explicitly instead of null-checking\n * optional fields. A server that fails to *boot* still throws — the\n * not-started arm is reserved for expected early exits the server has\n * already reported to the user.\n */\nexport type StartDevServerResult =\n  | {close: () => Promise<void>; server: ViteDevServer; started: true}\n  | {reason: 'missing-organization-id'; started: false}\n"],"names":[],"mappings":"AAwBA;;;;;;CAMC,GACD,WAEuD"}