@quenty/nevermore-cli 4.43.0-canary.783.30683872723.0 → 4.43.1

package/dist/utils/watch/stream-watch-loop.js

@@ -41,35 +41,17 @@ export async function runStreamWatchLoopAsync(options) {
     else {
         process.on('SIGINT', onSigint);
     }
-    const byWatchName = new Map(entries.map((e) => [e.watchName, e]));
-    /**
-     * What each place has actually been built from here, as an Open Cloud place
-     * version. Seeded from the lock and advanced only by a rebuild that
-     * succeeded: the service moves its own baseline whether or not anyone was
-     * listening, so this map is the only durable record of what exists.
-     */
-    const built = new Map(entries.map((e) => [e.watchName, e.baseline]));
-    /**
-     * The last service-side token each watch was settled at. Purely an
-     * optimization — a reconnect that reports the same token needs no Open Cloud
-     * call — and deliberately not advanced when a rebuild fails, so the next
-     * `ready` retries it.
-     */
-    const settledAt = new Map();
+    // One record per watch rather than parallel maps under the same key: every
+    // field above is a fact about the same thing, and holding them apart only
+    // creates the possibility of disagreeing about which watches exist.
+    const watches = new Map(entries.map((e) => [
+        e.watchName,
+        { entry: e, built: e.baseline, unreadable: false },
+    ]));
     let redeploys = 0;
     let failures = 0;
     let lastDropReason;
     let unobservable = false;
-    /**
-     * Watches the service has told us it cannot read, from either direction:
-     * the `ready` snapshot on connect, or a `poll-failed` event as it happens.
-     *
-     * Both are needed. A connection opened before the service's first failed
-     * poll gets a clean snapshot, and the next one is an hour away — so without
-     * the live tail a private base place would look fine for an hour before the
-     * watch admitted it was doing nothing.
-     */
-    const unreadable = new Set();
     /**
      * Give up the stream once nothing on it can ever fire, so the caller can
      * poll instead — this machine's credentials reach places the service's
@@ -79,13 +61,23 @@ export async function runStreamWatchLoopAsync(options) {
         // Counted against every entry this run owns, not against what the last
         // frame happened to mention: a watch the service has stopped reporting
         // altogether can no more produce a notification than one it cannot read.
-        if (unreadable.size < byWatchName.size) {
+        const all = [...watches.values()];
+        if (all.length === 0 || !all.every((w) => w.unreadable)) {
             return false;
         }
         unobservable = true;
         controller.abort();
         return true;
     };
+    /** Marks a watch unreadable, and says whether that was news worth printing. */
+    const markUnreadable = (name) => {
+        const state = watches.get(name);
+        if (state == null || state.unreadable) {
+            return false;
+        }
+        state.unreadable = true;
+        return true;
+    };
     OutputHelper.info(`Watching ${entries.length} base place${entries.length === 1 ? '' : 's'} over the watch service. Ctrl-C to stop.`);
     for (const entry of entries) {
         OutputHelper.info(`  ${entry.label} — base place ${entry.placeId} (${entry.versionType}${entry.baseline == null ? '' : ` v${entry.baseline}`})`);
@@ -99,8 +91,9 @@ export async function runStreamWatchLoopAsync(options) {
      * are not comparable — so a change is confirmed here by asking Open Cloud
      * what the place is actually at, which is the same number the build records.
      */
-    const settleAsync = async (entry, token) => {
-        if (token != null && settledAt.get(entry.watchName) === token) {
+    const settleAsync = async (state, token) => {
+        const entry = state.entry;
+        if (token != null && state.settledAt === token) {
             return;
         }
         let latest;
@@ -114,16 +107,16 @@ export async function runStreamWatchLoopAsync(options) {
                 (err instanceof Error ? err.message : String(err)));
             return;
         }
-        const previous = built.get(entry.watchName);
+        const previous = state.built;
         const settle = () => {
             if (token != null) {
-                settledAt.set(entry.watchName, token);
+                state.settledAt = token;
             }
         };
         if (previous === undefined) {
             // Never built here and nothing locked: adopt what is there rather than
             // reading "unknown -> something" as a change.
-            built.set(entry.watchName, latest);
+            state.built = latest;
             settle();
             return;
         }
@@ -135,7 +128,7 @@ export async function runStreamWatchLoopAsync(options) {
         try {
             await redeployAsync(entry, latest);
             redeploys++;
-            built.set(entry.watchName, latest);
+            state.built = latest;
             settle();
             OutputHelper.info(`${entry.label}: rebuilt from v${latest}.`);
         }
@@ -156,7 +149,7 @@ export async function runStreamWatchLoopAsync(options) {
                 // Every connection starts here, including reconnects. Nothing is
                 // replayed while a client is away, so this is the whole catch-up.
                 onReadyAsync: async (ready) => {
-                    const ours = ready.watches.filter((s) => byWatchName.has(s.name));
+                    const ours = ready.watches.filter((s) => watches.has(s.name));
                     // A source the service cannot read never fires, and the socket says
                     // nothing about it — the failure is visible only here. Waiting
                     // silently forever is the worst of the options, so a monitor that can
@@ -178,41 +171,40 @@ export async function runStreamWatchLoopAsync(options) {
                     // the same set means a partial snapshot falls back too, instead of
                     // holding the socket for the ones that remain and silently never
                     // rebuilding the rest.
-                    const missing = [...byWatchName.keys()].filter((name) => !ready.watches.some((s) => s.name === name));
+                    const missing = [...watches.keys()].filter((name) => !ready.watches.some((s) => s.name === name));
                     for (const name of missing) {
-                        if (unreadable.has(name)) {
+                        if (!markUnreadable(name)) {
                             continue;
                         }
-                        unreadable.add(name);
-                        OutputHelper.warn(`The watch monitor no longer holds ${byWatchName.get(name).label} — another checkout has probably re-registered it.`);
+                        OutputHelper.warn(`The watch monitor no longer holds ${watches.get(name).entry.label} — another checkout has probably re-registered it.`);
                     }
                     if (abandonIfNothingLeftToWatch()) {
                         return;
                     }
                     for (const status of failedToRead) {
-                        if (unreadable.has(status.name)) {
+                        if (!markUnreadable(status.name)) {
                             continue;
                         }
-                        unreadable.add(status.name);
-                        OutputHelper.warn(`The watch service cannot read ${byWatchName.get(status.name).label}` + (status.sourceError ? `: ${status.sourceError}` : '.'));
+                        OutputHelper.warn(`The watch service cannot read ${watches.get(status.name).entry.label}` + (status.sourceError ? `: ${status.sourceError}` : '.'));
                     }
                     if (abandonIfNothingLeftToWatch()) {
                         return;
                     }
                     for (const status of ours) {
-                        if (!unreadable.has(status.name)) {
-                            await settleAsync(byWatchName.get(status.name), status.currentVersion);
+                        const state = watches.get(status.name);
+                        if (!state.unreadable) {
+                            await settleAsync(state, status.currentVersion);
                         }
                     }
                 },
                 onNotifyAsync: async (notify) => {
-                    const entry = byWatchName.get(notify.watchName);
-                    if (!entry) {
+                    const state = watches.get(notify.watchName);
+                    if (!state) {
                         OutputHelper.verbose(`Ignoring a notification for "${notify.watchName}", which this ` +
                             'run does not watch.');
                         return;
                     }
-                    await settleAsync(entry, notify.version);
+                    await settleAsync(state, notify.version);
                 },
                 onEvent: (message) => {
                     OutputHelper.verbose(`  [${message.event.type}] ${message.event.message}`);
@@ -222,14 +214,13 @@ export async function runStreamWatchLoopAsync(options) {
                     // is polling something that could have been streamed, which still
                     // works.
                     const name = message.event.watchName;
-                    if (message.event.type !== 'poll-failed' ||
-                        name == null ||
-                        !byWatchName.has(name) ||
-                        unreadable.has(name)) {
+                    if (message.event.type !== 'poll-failed' || name == null) {
+                        return;
+                    }
+                    if (!markUnreadable(name)) {
                         return;
                     }
-                    unreadable.add(name);
-                    OutputHelper.warn(`The watch service cannot read ${byWatchName.get(name).label}: ${message.event.message}`);
+                    OutputHelper.warn(`The watch service cannot read ${watches.get(name).entry.label}: ${message.event.message}`);
                     abandonIfNothingLeftToWatch();
                 },
                 // The stream swallows a handler's throw so it cannot strand the watch

package/dist/utils/watch/stream-watch-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-watch-loop.js","sourceRoot":"","sources":["../../../src/utils/watch/stream-watch-loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream-watch-loop.js","sourceRoot":"","sources":["../../../src/utils/watch/stream-watch-loop.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/nevermore-cli",
-  "version": "4.43.0-canary.783.30683872723.0",
+  "version": "4.43.1",
   "description": "CLI interface for Nevermore",
   "type": "module",
   "keywords": [
@@ -26,10 +26,10 @@
   ],
   "dependencies": {
     "@quenty/cli-output-helpers": "1.17.1",
-    "@quenty/nevermore-cli-helpers": "1.17.0-canary.783.30683872723.0",
-    "@quenty/nevermore-deploy": "1.1.0-canary.783.30683872723.0",
+    "@quenty/nevermore-cli-helpers": "1.17.0",
+    "@quenty/nevermore-deploy": "1.1.0",
     "@quenty/nevermore-template-helpers": "1.18.1",
-    "@quenty/studio-bridge": "0.18.0-canary.783.30683872723.0",
+    "@quenty/studio-bridge": "0.18.0",
     "execa": "^9.6.1",
     "find-git-root": "^1.0.4",
     "inquirer": "^13.2.0",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "4e91c13904afd423fd39e26387087608a5da9e22"
+  "gitHead": "6964e315a963a65deddba8e347fc35288f279b3e"
 }

package/src/commands/batch-command/batch-deploy-command.ts

@@ -43,8 +43,16 @@ import {
   readPackageVersionAsync,
 } from '../../utils/nevermore-cli-utils.js';
 import { parseTestLogs } from '../../utils/testing/test-log-parser.js';
-import { parseWatchOption } from '@quenty/nevermore-deploy';
-import { registerWatchesAsync } from '../../utils/watch/register-watches.js';
+import {
+  buildWatchMonitorName,
+  parseWatchOption,
+  type BasePlaceResolver,
+  type WatchOption,
+} from '@quenty/nevermore-deploy';
+import {
+  registerWatchesAsync,
+  type WatchCandidate,
+} from '../../utils/watch/register-watches.js';
 
 const SMOKE_TEST_SCRIPT_PATH = resolvePackagePath(
   import.meta.url,
@@ -185,6 +193,27 @@ async function _runAsync(args: BatchDeployArgs): Promise<void> {
           'Use --all to deploy every package with this target, or --base <ref> to change the comparison ref.'
       );
     }
+    // Renew anyway. Registration derives from committed config plus the lock,
+    // so it does not need this run to have deployed anything — and the lease is
+    // the only thing keeping the watch alive. Returning here instead is how a
+    // repo whose scheduled builds all diff clean quietly stops being watched,
+    // with no failure anywhere to notice.
+    if (watchOption) {
+      OutputHelper.info(
+        'Renewing watches anyway, so the lease does not lapse.'
+      );
+      await _registerWatchesAsync({
+        targetName,
+        option: watchOption,
+        // Nothing deployed, so the lock is the whole truth about what each
+        // place was built from.
+        resolver: createLockOnlyBasePlaceResolver(),
+        useGhAuth: args.watchUseGhAuth,
+        shareApiKey: args.watchShareApiKey,
+        resolveApiKeyAsync: () => getApiKeyAsync(args),
+        dryrun: args.dryrun,
+      });
+    }
     return;
   }
 
@@ -197,20 +226,7 @@ async function _runAsync(args: BatchDeployArgs): Promise<void> {
     // lock file, so it runs for real even on a dryrun — that is what makes the
     // watch path testable without shipping a build.
     if (watchOption) {
-      OutputHelper.info(
-        '[DRYRUN] Registering separate dryrun watches and firing them, to ' +
-          'prove routing works. This does not build or upload here — but ' +
-          'firing really does dispatch the workflow once per package, and ' +
-          'each of those runs a real deploy on the runner.'
-      );
-      if (args.watchShareApiKey) {
-        OutputHelper.warn(
-          '[DRYRUN] Registering without the Open Cloud key, so a "saved" base ' +
-            'place is skipped here even though a real run would watch it.'
-        );
-      }
-      const allPackages = await discoverAllTargetPackagesAsync(targetName);
-      // Under its own monitor name, never the one a real run owns.
+      // Under its own monitor names, never the ones a real run owns.
       //
       // Re-registering replaces a monitor's entire watch list, and a dryrun
       // cannot reproduce a real registration: the Open Cloud key is resolved
@@ -219,18 +235,13 @@ async function _runAsync(args: BatchDeployArgs): Promise<void> {
       // driver and its content-hash vocabulary, dropping the baselines, and
       // deleting any "saved" watch outright, because an anonymous
       // registration skips those.
-      await registerWatchesAsync({
+      await _registerWatchesAsync({
+        targetName,
         option: watchOption,
-        monitorName: `${targetName}/dryrun`,
         resolver: createLockOnlyBasePlaceResolver(),
         useGhAuth: args.watchUseGhAuth,
-        triggerAfterRegister: true,
-        candidates: flattenToBatchTargets(allPackages).map((buildTarget) => ({
-          targetName,
-          packageName: buildTarget.packageName,
-          packagePath: buildTarget.path,
-          place: buildTarget.target,
-        })),
+        shareApiKey: args.watchShareApiKey,
+        dryrun: true,
       });
     }
     return;
@@ -394,25 +405,13 @@ async function _runAsync(args: BatchDeployArgs): Promise<void> {
     // re-registers the same wrong baseline. The failure becomes permanent and
     // invisible.
     if (watchOption && results.summary.failed === 0) {
-      // Deliberately every package with this target, not just the ones that
-      // deployed. One monitor holds the repo's watches for a target and a
-      // re-apply replaces its whole list, so registering only what changed
-      // would delete the watches of every package that happened not to change
-      // this run. Packages that did not deploy still have a lock entry, which
-      // is the correct baseline for them.
-      const allPackages = await discoverAllTargetPackagesAsync(targetName);
-      await registerWatchesAsync({
+      await _registerWatchesAsync({
+        targetName,
         option: watchOption,
-        monitorName: targetName,
         resolver: basePlaceResolver,
         useGhAuth: args.watchUseGhAuth,
-        robloxApiKey: args.watchShareApiKey ? apiKey : undefined,
-        candidates: flattenToBatchTargets(allPackages).map((buildTarget) => ({
-          targetName,
-          packageName: buildTarget.packageName,
-          packagePath: buildTarget.path,
-          place: buildTarget.target,
-        })),
+        shareApiKey: args.watchShareApiKey,
+        resolveApiKeyAsync: async () => apiKey,
       });
     }
   } catch (err) {
@@ -426,6 +425,101 @@ async function _runAsync(args: BatchDeployArgs): Promise<void> {
   process.exit(exitCode);
 }
 
+/**
+ * Register one monitor per package, covering every package with this target.
+ *
+ * Per package rather than one for the batch, because `deploy run --watch`
+ * registers a package's places too. Two names for one package's watches means
+ * two monitors on the same base place, so one artist publish dispatches twice
+ * and each rebuild races the other's lock write. Both paths take the name from
+ * `buildWatchMonitorName`, so registering from either replaces the same list.
+ *
+ * Every package with the target, never just the ones that deployed: a re-apply
+ * replaces a monitor's whole list, and a package that didn't change still has a
+ * lock entry, which is exactly the right baseline for it.
+ */
+async function _registerWatchesAsync(options: {
+  targetName: string;
+  option: WatchOption;
+  resolver: BasePlaceResolver;
+  useGhAuth?: boolean;
+  /** Whether `--watch-share-api-key` was passed. A dryrun never shares one. */
+  shareApiKey?: boolean;
+  /** Called only if a key is actually going to be sent. */
+  resolveApiKeyAsync?: () => Promise<string>;
+  dryrun?: boolean;
+}): Promise<void> {
+  const { targetName } = options;
+
+  if (options.dryrun) {
+    OutputHelper.info(
+      '[DRYRUN] Registering separate dryrun watches and firing them, to ' +
+        'prove routing works. This does not build or upload here — but ' +
+        'firing really does dispatch the workflow once per package, and ' +
+        'each of those runs a real deploy on the runner.'
+    );
+    if (options.shareApiKey) {
+      OutputHelper.warn(
+        '[DRYRUN] Registering without the Open Cloud key, so a "saved" base ' +
+          'place is skipped here even though a real run would watch it.'
+      );
+    }
+  }
+
+  const robloxApiKey =
+    options.shareApiKey && !options.dryrun
+      ? await options.resolveApiKeyAsync?.()
+      : undefined;
+
+  const allPackages = await discoverAllTargetPackagesAsync(targetName);
+
+  // Places that never asked to be watched are dropped here rather than passed
+  // in to be reported as skips. Most places in a batch are in that state, and
+  // per-package registration would otherwise warn about each package that has
+  // no watch at all. A place that asked and can't be watched still goes
+  // through, because that is the case worth saying out loud.
+  const byPackage = new Map<string, WatchCandidate[]>();
+  for (const buildTarget of flattenToBatchTargets(allPackages)) {
+    if (buildTarget.target.watch == null) {
+      continue;
+    }
+    const candidates = byPackage.get(buildTarget.packageName) ?? [];
+    candidates.push({
+      targetName,
+      packageName: buildTarget.packageName,
+      packagePath: buildTarget.path,
+      place: buildTarget.target,
+    });
+    byPackage.set(buildTarget.packageName, candidates);
+  }
+
+  if (byPackage.size === 0) {
+    OutputHelper.warn(
+      `--watch was requested, but no place in a "${targetName}" target has a ` +
+        '"watch" field. Add one naming the workflow that rebuilds it.'
+    );
+    return;
+  }
+
+  for (const [packageName, candidates] of byPackage) {
+    await registerWatchesAsync({
+      option: options.option,
+      monitorName: buildWatchMonitorName({
+        packageName,
+        targetName,
+        dryrun: options.dryrun,
+      }),
+      resolver: options.resolver,
+      useGhAuth: options.useGhAuth,
+      robloxApiKey,
+      // Firing proves the workflow really receives the selector, which is the
+      // half that historically breaks. Only a dryrun asks for it.
+      triggerAfterRegister: options.dryrun,
+      candidates,
+    });
+  }
+}
+
 function _annotateSmokeTestFailure(logs: string): string {
   const header =
     'Post-deploy smoke test failed. The deploy itself succeeded, but a server ' +

package/src/commands/deploy-command/index.ts

@@ -39,16 +39,20 @@ import {
   readPackageVersionAsync,
 } from '../../utils/nevermore-cli-utils.js';
 import {
+  WATCH_MODES,
+  buildWatchMonitorName,
+  checkBasePlaceWatchable,
   formatTargetSelector,
-  isBasePlaceVersionKeyword,
   loadDeployConfigAsync,
   parseTargetSelector,
   parseWatchOption,
   resolveDeployConfigPath,
   resolveDeployTargetPlaces,
+  resolveWatchDelivery,
   toManifestPlaceInfo,
   type BasePlaceResolver,
   type DeployConfig,
+  type WatchMode,
 } from '@quenty/nevermore-deploy';
 import {
   registerWatchesAsync,
@@ -77,14 +81,10 @@ const MULTI_PLACE_CONCURRENCY = 10;
 /**
  * Which base places a local watch polls.
  *
- * Deliberately looser than the cloud plan. `watch` is a GitHub workflow path —
- * a dispatch address — and nothing is dispatched locally, so requiring it would
- * only stop a developer hot-reloading a place that never intends to use CI.
- * `"saved"` is fair game too: the service cannot poll it yet, but this machine
- * has Open Cloud credentials and can.
- *
- * An exact version pin is still excluded, for the same reason as always: it
- * means "hold this still", so there is nothing to follow.
+ * Deliberately looser than the cloud plan, in exactly one way: `watch` is a
+ * dispatch address, nothing is dispatched locally, so requiring it would only
+ * stop a developer hot-reloading a place that never intends to use CI.
+ * Everything about the base place itself is the shared rule.
  */
 async function _buildLocalWatchEntriesAsync(
   config: DeployConfig,
@@ -95,21 +95,19 @@ async function _buildLocalWatchEntriesAsync(
   const entries: LocalWatchEntry[] = [];
   for (const place of resolveDeployTargetPlaces(config, targetName)) {
     const basePlace = place.basePlace;
-    if (basePlace == null) {
-      continue;
-    }
-    if (
-      basePlace.version != null &&
-      !isBasePlaceVersionKeyword(basePlace.version)
-    ) {
+    // The same rule a registration uses, asked with `credentialed: true`: this
+    // machine holds the Open Cloud key, so "saved" is readable here even when
+    // the service could not see it. Only the workflow half differs, and a local
+    // watch has nothing to dispatch.
+    const check = checkBasePlaceWatchable(basePlace, { credentialed: true });
+    if (basePlace == null || !check.watchable) {
       continue;
     }
-    const versionType = basePlace.version ?? 'published';
     entries.push({
       label: formatTargetSelector({ targetName, placeName: place.name }),
       universeId: basePlace.universeId,
       placeId: basePlace.placeId,
-      versionType,
+      versionType: check.versionType,
       baseline: await resolver.peekAsync(packagePath, basePlace),
     });
   }
@@ -130,6 +128,7 @@ export interface DeployArgs extends NevermoreGlobalArgs {
   output?: string;
   logs?: boolean;
   watch?: string;
+  watchMode?: WatchMode;
   watchShareApiKey?: boolean;
   watchUseGhAuth?: boolean;
 }
@@ -303,6 +302,16 @@ export class DeployCommand<T> implements CommandModule<T, DeployArgs> {
               'Takes the register endpoint URL, ending in the lease: https://<watch-service>/v1/register/7d',
             type: 'string',
           })
+          .option('watch-mode', {
+            describe:
+              'How the watch reaches whoever rebuilds: "dispatch" fires the workflow, ' +
+              '"notify" holds a stream here and rebuilds in this terminal. ' +
+              'Defaults to "auto", which dispatches on GitHub Actions and notifies elsewhere — ' +
+              'set it explicitly in any other automated context, where notifying would hang the run.',
+            type: 'string',
+            choices: WATCH_MODES,
+            default: 'auto',
+          })
           .option('watch-use-gh-auth', {
             describe:
               'Let the GitHub CLI supply the watch token when no environment variable does. ' +
@@ -420,7 +429,11 @@ export class DeployCommand<T> implements CommandModule<T, DeployArgs> {
         // registration skips those.
         await registerWatchesAsync({
           option: watchOption,
-          monitorName: `${packageName}/${watchedTarget}/dryrun`,
+          monitorName: buildWatchMonitorName({
+            packageName,
+            targetName: watchedTarget,
+            dryrun: true,
+          }),
           resolver: createLockOnlyBasePlaceResolver(),
           useGhAuth: args.watchUseGhAuth,
           triggerAfterRegister: true,
@@ -636,7 +649,7 @@ export class DeployCommand<T> implements CommandModule<T, DeployArgs> {
       // Only after a clean deploy: what happens next records the base place
       // version that just shipped, which is not a fact yet if the deploy failed.
       if (watchOption && first.failed === 0) {
-        if (isCI()) {
+        if (resolveWatchDelivery(args.watchMode, isCI()) === 'dispatch') {
           // The monitor is named for the whole target, so it has to carry every
           // place in that target — not just the ones this invocation deployed.
           // Re-registering replaces its watch list, so a narrowed selector
@@ -644,9 +657,10 @@ export class DeployCommand<T> implements CommandModule<T, DeployArgs> {
           // places' watches. Places that did not deploy keep their lock baseline.
           watchResult = await registerWatchesAsync({
             option: watchOption,
-            // Scoped to this package and target, so deploying one package can
-            // never replace the watch list another package registered.
-            monitorName: `${packageName}/${watchedTarget}`,
+            monitorName: buildWatchMonitorName({
+              packageName,
+              targetName: watchedTarget,
+            }),
             resolver: first.resolver,
             useGhAuth: args.watchUseGhAuth,
             robloxApiKey: args.watchShareApiKey ? apiKey : undefined,
@@ -680,7 +694,10 @@ export class DeployCommand<T> implements CommandModule<T, DeployArgs> {
 
           const notify = await tryRegisterNotifyWatchesAsync({
             option: watchOption,
-            monitorName: `${packageName}/${watchedTarget}`,
+            monitorName: buildWatchMonitorName({
+              packageName,
+              targetName: watchedTarget,
+            }),
             entries: localEntries,
             useGhAuth: args.watchUseGhAuth,
             robloxApiKey: args.watchShareApiKey ? apiKey : undefined,

package/src/utils/job-context/base-job-context.ts

@@ -150,8 +150,7 @@ export abstract class BaseJobContext implements JobContext {
       // Waiter: the in-flight build was started under a different
       // packageName, so emit our own 'building' phase change for the reporter.
       const resolvedName =
-        options.packageName ??
-        path.basename(options.packagePath);
+        options.packageName ?? path.basename(options.packagePath);
       this._reporter.onPackagePhaseChange(resolvedName, 'building');
       return existing.promise;
     }