@notis_ai/cli 0.2.13 → 0.2.15

package/src/runtime/app-dev-roots.js

@@ -0,0 +1,284 @@
+import { randomUUID } from 'node:crypto';
+import {
+  existsSync,
+  lstatSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  realpathSync,
+  renameSync,
+  rmSync,
+  statSync,
+  writeFileSync,
+} from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join, parse as parsePath, resolve } from 'node:path';
+
+import { usageError } from './errors.js';
+import { CONFIG_DIR } from './profiles.js';
+
+export const APP_DEV_ROOTS_VERSION = 1;
+export const DEFAULT_APP_DEV_ROOT = join(homedir(), '.notis', 'apps');
+export const DEFAULT_APP_DEV_ROOTS_FILE = join(CONFIG_DIR, 'app-dev-roots.json');
+const CONFIG_FILENAMES = ['notis.config.ts', 'notis.config.js', 'notis.config.mjs'];
+const LOCK_TIMEOUT_MS = 5_000;
+const lockWait = new Int32Array(new SharedArrayBuffer(4));
+
+function rootsFile(filePath) {
+  if (filePath) return resolve(filePath);
+  const envPath = process.env.NOTIS_APP_DEV_ROOTS_FILE;
+  return typeof envPath === 'string' && envPath.trim()
+    ? resolve(envPath.trim())
+    : DEFAULT_APP_DEV_ROOTS_FILE;
+}
+
+function legacyProjectsFile(filePath) {
+  const sessionsFile = filePath
+    || join(CONFIG_DIR, 'app-dev-sessions.json');
+  const parsed = parsePath(resolve(sessionsFile));
+  return join(parsed.dir, `${parsed.name}-projects${parsed.ext || '.json'}`);
+}
+
+function readLockOwner(lockPath) {
+  try {
+    return readFileSync(join(lockPath, 'owner'), 'utf8').trim();
+  } catch {
+    return null;
+  }
+}
+
+function withLock(filePath, callback) {
+  mkdirSync(dirname(filePath), { recursive: true, mode: 0o700 });
+  const lockPath = `${filePath}.lock`;
+  const owner = `${process.pid}.${randomUUID()}`;
+  const startedAt = Date.now();
+  while (true) {
+    try {
+      mkdirSync(lockPath, { mode: 0o700 });
+      writeFileSync(join(lockPath, 'owner'), owner, { mode: 0o600 });
+      break;
+    } catch (error) {
+      if (error?.code !== 'EEXIST') throw error;
+      try {
+        const stat = lstatSync(lockPath);
+        if (!stat.isDirectory() || stat.isSymbolicLink()) {
+          throw new Error(`Refusing unsafe app development roots lock: ${lockPath}`);
+        }
+        const existingOwner = readLockOwner(lockPath);
+        const pid = Number.parseInt(String(existingOwner || '').split('.')[0] || '', 10);
+        if (Number.isInteger(pid) && pid > 0) {
+          try {
+            process.kill(pid, 0);
+          } catch (ownerError) {
+            if (ownerError?.code === 'ESRCH') {
+              rmSync(lockPath, { recursive: true, force: true });
+              continue;
+            }
+          }
+        }
+      } catch (statError) {
+        if (statError?.code === 'ENOENT') continue;
+        throw statError;
+      }
+      if (Date.now() - startedAt >= LOCK_TIMEOUT_MS) {
+        throw new Error(`Timed out waiting for app development roots lock: ${filePath}`);
+      }
+      Atomics.wait(lockWait, 0, 0, 10);
+    }
+  }
+  try {
+    return callback();
+  } finally {
+    if (readLockOwner(lockPath) === owner) {
+      rmSync(lockPath, { recursive: true, force: true });
+    }
+  }
+}
+
+function canonicalExistingDirectory(inputPath) {
+  const absolute = resolve(String(inputPath || ''));
+  let stat;
+  try {
+    stat = statSync(absolute);
+  } catch {
+    throw usageError(`App development root does not exist: ${absolute}`);
+  }
+  if (!stat.isDirectory()) {
+    throw usageError(`App development root is not a directory: ${absolute}`);
+  }
+  return realpathSync(absolute);
+}
+
+function normalizeRegistry(raw) {
+  const roots = Array.isArray(raw?.roots) ? raw.roots : [];
+  const seen = new Set();
+  return roots
+    .map((entry) => typeof entry === 'string' ? { path: entry } : entry)
+    .filter((entry) => entry && typeof entry.path === 'string' && entry.path.trim())
+    .map((entry) => ({
+      path: resolve(entry.path),
+      registeredAt: typeof entry.registeredAt === 'string'
+        ? entry.registeredAt
+        : new Date(0).toISOString(),
+    }))
+    .filter((entry) => {
+      if (seen.has(entry.path)) return false;
+      seen.add(entry.path);
+      return true;
+    });
+}
+
+function readRaw(filePath) {
+  if (!existsSync(filePath)) return { version: APP_DEV_ROOTS_VERSION, roots: [] };
+  try {
+    return {
+      version: APP_DEV_ROOTS_VERSION,
+      roots: normalizeRegistry(JSON.parse(readFileSync(filePath, 'utf8'))),
+    };
+  } catch {
+    return { version: APP_DEV_ROOTS_VERSION, roots: [] };
+  }
+}
+
+function writeRaw(registry, filePath) {
+  mkdirSync(dirname(filePath), { recursive: true, mode: 0o700 });
+  const normalized = {
+    version: APP_DEV_ROOTS_VERSION,
+    roots: normalizeRegistry(registry),
+  };
+  const temporary = `${filePath}.${process.pid}.${randomUUID()}.tmp`;
+  writeFileSync(temporary, JSON.stringify(normalized, null, 2), { mode: 0o600 });
+  renameSync(temporary, filePath);
+  return normalized;
+}
+
+function migrateLegacyProjectsUnlocked(registry, options) {
+  const path = legacyProjectsFile(options.legacySessionsFilePath);
+  if (!existsSync(path)) return registry;
+  let projects = [];
+  try {
+    const raw = JSON.parse(readFileSync(path, 'utf8'));
+    projects = Array.isArray(raw?.projects) ? raw.projects : [];
+  } catch {
+    return registry;
+  }
+  const byPath = new Map(registry.roots.map((entry) => [entry.path, entry]));
+  for (const project of projects) {
+    if (typeof project?.projectDir !== 'string' || !project.projectDir.trim()) continue;
+    try {
+      const path = canonicalExistingDirectory(project.projectDir);
+      if (path === realpathIfExists(DEFAULT_APP_DEV_ROOT)) continue;
+      if (!byPath.has(path)) {
+        byPath.set(path, {
+          path,
+          registeredAt: typeof project.lastMountedAt === 'string'
+            ? project.lastMountedAt
+            : new Date().toISOString(),
+        });
+      }
+    } catch {
+      // Deleted or inaccessible legacy projects are intentionally not migrated.
+    }
+  }
+  rmSync(path, { force: true });
+  return { version: APP_DEV_ROOTS_VERSION, roots: [...byPath.values()] };
+}
+
+function realpathIfExists(path) {
+  try {
+    return realpathSync(path);
+  } catch {
+    return resolve(path);
+  }
+}
+
+export function readAppDevRoots(options = {}) {
+  const filePath = rootsFile(options.filePath);
+  let registry = readRaw(filePath);
+  if (options.migrateLegacy !== false) {
+    registry = withLock(filePath, () => {
+      const before = readRaw(filePath);
+      const after = migrateLegacyProjectsUnlocked(before, options);
+      const changed = JSON.stringify(before.roots) !== JSON.stringify(after.roots);
+      return changed ? writeRaw(after, filePath) : before;
+    });
+  }
+  const implicit = realpathIfExists(options.defaultRoot || DEFAULT_APP_DEV_ROOT);
+  const roots = [
+    { path: implicit, registeredAt: null, implicit: true },
+    ...registry.roots
+      .filter((entry) => entry.path !== implicit)
+      .map((entry) => ({ ...entry, implicit: false })),
+  ];
+  return { version: APP_DEV_ROOTS_VERSION, roots };
+}
+
+export function registerAppDevRoot(inputPath, options = {}) {
+  const path = canonicalExistingDirectory(inputPath);
+  const implicit = realpathIfExists(options.defaultRoot || DEFAULT_APP_DEV_ROOT);
+  if (path === implicit) return readAppDevRoots(options);
+  const filePath = rootsFile(options.filePath);
+  withLock(filePath, () => {
+    const registry = readRaw(filePath);
+    if (!registry.roots.some((entry) => entry.path === path)) {
+      registry.roots.push({ path, registeredAt: new Date().toISOString() });
+      writeRaw(registry, filePath);
+    }
+  });
+  return readAppDevRoots({ ...options, migrateLegacy: false });
+}
+
+export function removeAppDevRoot(inputPath, options = {}) {
+  const path = realpathIfExists(resolve(String(inputPath || '')));
+  const implicit = realpathIfExists(options.defaultRoot || DEFAULT_APP_DEV_ROOT);
+  if (path === implicit) {
+    throw usageError(`The default app development root cannot be removed: ${implicit}`);
+  }
+  const filePath = rootsFile(options.filePath);
+  let removed = false;
+  withLock(filePath, () => {
+    const registry = readRaw(filePath);
+    const next = registry.roots.filter((entry) => entry.path !== path);
+    removed = next.length !== registry.roots.length;
+    if (removed) writeRaw({ ...registry, roots: next }, filePath);
+  });
+  return { removed, path, registry: readAppDevRoots({ ...options, migrateLegacy: false }) };
+}
+
+function hasConfig(path) {
+  return CONFIG_FILENAMES.some((name) => existsSync(join(path, name)));
+}
+
+function childAppDirs(parent) {
+  if (!existsSync(parent)) return [];
+  let entries = [];
+  try {
+    entries = readdirSync(parent, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  return entries
+    .filter((entry) => entry.isDirectory())
+    .filter((entry) => !entry.name.startsWith('.') && !entry.name.startsWith('_'))
+    .filter((entry) => entry.name !== 'node_modules')
+    .map((entry) => join(parent, entry.name))
+    .filter(hasConfig);
+}
+
+export function discoverAppProjectsInRoot(inputRoot) {
+  const root = realpathIfExists(resolve(inputRoot));
+  const candidates = [];
+  if (hasConfig(root)) candidates.push(root);
+  candidates.push(...childAppDirs(root));
+  candidates.push(...childAppDirs(join(root, 'apps')));
+  return [...new Set(candidates.map(realpathIfExists))].sort();
+}
+
+export function discoverRegisteredAppProjects(options = {}) {
+  const roots = readAppDevRoots(options).roots;
+  return [...new Set(roots.flatMap((entry) => discoverAppProjectsInRoot(entry.path)))].sort();
+}
+
+export function getAppDevRootsFile(filePath) {
+  return rootsFile(filePath);
+}

package/src/runtime/app-dev-server.js

@@ -28,7 +28,10 @@ import {
   readLinkedState,
   writeLinkedState,
 } from './app-platform.js';
-import { linkAppDevSessionTarget } from './app-dev-sessions.js';
+import {
+  linkAppDevSessionTarget,
+  readAppDevSessions,
+} from './app-dev-sessions.js';
 
 const CONTENT_TYPES = {
   '.js': 'application/javascript; charset=utf-8',
@@ -251,17 +254,26 @@ function buildHarnessDescriptor({ state, manifest, appConfig, route, scenario =
   };
 }
 
+function plainObject(value) {
+  return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+}
+
+/**
+ * Resolve the fixture payload injected into one harness page load.
+ *
+ * A scenario may override individual `tools` / `requests` keys on top of the
+ * file-level defaults, which is how one route renders both its populated and
+ * its empty state. Each capture is its own page load, so a shallow per-key
+ * merge is all the isolation a scenario needs.
+ */
 function harnessFixtures(projectDir, scenario) {
   const fixtureConfig = readJsonFile(join(projectDir, 'metadata', 'screenshot-fixtures.json')) || {};
-  const scenarios = fixtureConfig.scenarios && typeof fixtureConfig.scenarios === 'object'
-    ? fixtureConfig.scenarios
-    : {};
+  const scenarios = plainObject(fixtureConfig.scenarios);
+  const selected = scenario ? plainObject(scenarios[scenario]) : null;
   return {
-    tools: fixtureConfig.tools && typeof fixtureConfig.tools === 'object' ? fixtureConfig.tools : {},
-    requests: fixtureConfig.requests && typeof fixtureConfig.requests === 'object' ? fixtureConfig.requests : {},
-    scenario: scenario && scenarios[scenario] && typeof scenarios[scenario] === 'object'
-      ? scenarios[scenario]
-      : null,
+    tools: { ...plainObject(fixtureConfig.tools), ...plainObject(selected?.tools) },
+    requests: { ...plainObject(fixtureConfig.requests), ...plainObject(selected?.requests) },
+    scenario: selected && Object.keys(selected).length > 0 ? selected : null,
   };
 }
 
@@ -288,7 +300,7 @@ function renderHarnessHtml({ state, manifest, appConfig, route, harnessOptions,
 /**
  * Start the dev server for one or more apps.
  *
- * @param {{apps: Array<{slug: string, projectDir: string, appId?: string, targetAppId?: string, userId?: string}>, port: number, watch?: boolean, sessionsFilePath?: string, harness?: { mode?: string, apiBase?: string, jwt?: string }, log?: (m: string) => void, logError?: (m: string) => void}} options
+ * @param {{apps: Array<{slug: string, projectDir: string, appId?: string, targetAppId?: string, userId?: string, profileKey?: string, sessionId?: string, mountNonce?: string}>, port: number, watch?: boolean, sessionsFilePath?: string, harness?: { mode?: string, apiBase?: string, jwt?: string }, log?: (m: string) => void, logError?: (m: string) => void}} options
  */
 export async function startAppDevServer({
   apps,
@@ -304,22 +316,43 @@ export async function startAppDevServer({
   }
 
   const appState = new Map();
-  for (const app of apps) {
-    appState.set(app.slug, {
+  // Sidebar reconciliation needs one stream for the shared host, not one
+  // long-lived HTTP/1.1 connection per discovered app. Keeping a stream per
+  // app exhausts Chromium's per-origin connection pool and can indefinitely
+  // queue the active view's bundle fetch during hot reload.
+  const hostSseClients = new Set();
+  const createAppState = (app) => {
+    let resolveBundleReady;
+    const bundleReadyPromise = new Promise((resolvePromise) => {
+      resolveBundleReady = resolvePromise;
+    });
+    return {
       slug: app.slug,
       projectDir: app.projectDir,
       appId: app.appId || null,
       targetAppId: app.targetAppId || null,
       userId: app.userId || null,
+      profileKey: app.profileKey || null,
+      sessionId: app.sessionId || null,
+      mountNonce: app.mountNonce || null,
       canonicalBundleDir: getBundleDir(app.projectDir),
       bundleDir: null,
       jsPath: null,
       sseClients: new Set(),
       watcher: null,
+      sourceWatchers: [],
+      prepareTimer: null,
+      reloadTimer: null,
       buildProcess: null,
       lastMtimeMs: 0,
       watchPollTimer: null,
-    });
+      bundleReady: false,
+      bundleReadyPromise,
+      resolveBundleReady,
+    };
+  };
+  for (const app of apps) {
+    appState.set(app.slug, createAppState(app));
   }
 
   function broadcastReload(slug) {
@@ -333,6 +366,14 @@ export async function startAppDevServer({
         state.sseClients.delete(res);
       }
     }
+    const hostPayload = `event: reload\ndata: ${JSON.stringify({ slug, at: Date.now() })}\n\n`;
+    for (const res of hostSseClients) {
+      try {
+        res.write(hostPayload);
+      } catch {
+        hostSseClients.delete(res);
+      }
+    }
   }
 
   function matchAppRoute(pathname) {
@@ -365,6 +406,10 @@ export async function startAppDevServer({
     state.jsPath = join(bundleDir, 'app.js');
     try {
       state.lastMtimeMs = statSync(state.jsPath).mtimeMs;
+      if (!state.bundleReady) {
+        state.bundleReady = true;
+        state.resolveBundleReady();
+      }
     } catch {
       state.lastMtimeMs = 0;
     }
@@ -442,6 +487,9 @@ export async function startAppDevServer({
             try {
               const body = await readRequestJson(req);
               const appId = typeof body.app_id === 'string' ? body.app_id.trim() : '';
+              const version = Number.isInteger(body.version) && body.version > 0
+                ? body.version
+                : null;
               if (!appId) {
                 res.writeHead(400, {
                   ...headers,
@@ -450,20 +498,69 @@ export async function startAppDevServer({
                 res.end(JSON.stringify({ error: 'app_id is required' }));
                 return;
               }
+              if (version === null) {
+                res.writeHead(400, {
+                  ...headers,
+                  'Content-Type': 'application/json; charset=utf-8',
+                });
+                res.end(JSON.stringify({ error: 'version must be a positive integer' }));
+                return;
+              }
+              const proofSession = readAppDevSessions(sessionsFilePath).sessions.find((session) => (
+                typeof body.session_id === 'string'
+                && typeof body.mount_nonce === 'string'
+                && session.sessionId === body.session_id
+                && session.mountNonce === body.mount_nonce
+                && session.devSlug === state.slug
+                && session.projectDir === state.projectDir
+              ));
+              if (!proofSession) {
+                res.writeHead(403, {
+                  ...headers,
+                  'Content-Type': 'application/json; charset=utf-8',
+                });
+                res.end(JSON.stringify({ error: 'invalid app development session proof' }));
+                return;
+              }
+              const expectedAppId = proofSession.targetAppId || proofSession.appId;
+              if (!expectedAppId || appId !== expectedAppId) {
+                res.writeHead(409, {
+                  ...headers,
+                  'Content-Type': 'application/json; charset=utf-8',
+                });
+                res.end(JSON.stringify({ error: 'app_id does not match this development session' }));
+                return;
+              }
 
-              const currentState = readLinkedState(state.projectDir) || {};
+              const currentState = readLinkedState(
+                state.projectDir,
+                proofSession.profileKey || state.profileKey,
+              ) || {};
               const now = new Date().toISOString();
-              writeLinkedState(state.projectDir, {
+              const promotedInPlace = proofSession.appId === appId;
+              const nextState = {
                 ...currentState,
                 app_id: appId,
-                dev_app_id: state.appId || currentState.dev_app_id,
                 linked_at: currentState.linked_at || now,
-                dev_linked_at: currentState.dev_linked_at || now,
+                version,
+                deployed_at: now,
                 updated_at: now,
-              });
-              state.targetAppId = appId;
+              };
+              if (promotedInPlace) {
+                delete nextState.dev_app_id;
+                delete nextState.dev_linked_at;
+              } else {
+                nextState.dev_app_id = proofSession.appId || currentState.dev_app_id;
+                nextState.dev_linked_at = currentState.dev_linked_at || now;
+              }
+              writeLinkedState(
+                state.projectDir,
+                nextState,
+                proofSession.profileKey || state.profileKey,
+              );
               linkAppDevSessionTarget({
-                appId: state.appId,
+                sessionId: proofSession.sessionId,
+                appId: proofSession.appId,
                 devSlug: state.slug,
                 targetAppId: appId,
                 lastHeartbeatAt: now,
@@ -471,8 +568,9 @@ export async function startAppDevServer({
               const response = {
                 ok: true,
                 app_id: appId,
-                dev_app_id: state.appId || null,
+                dev_app_id: promotedInPlace ? null : proofSession.appId || null,
                 target_app_id: appId,
+                version,
               };
               res.writeHead(200, {
                 ...headers,
@@ -516,6 +614,18 @@ export async function startAppDevServer({
       return;
     }
 
+    if (url.pathname === '/events') {
+      res.writeHead(200, {
+        ...headers,
+        'Content-Type': 'text/event-stream; charset=utf-8',
+        Connection: 'keep-alive',
+      });
+      res.write(': connected\n\n');
+      hostSseClients.add(res);
+      req.on('close', () => hostSseClients.delete(res));
+      return;
+    }
+
     const routed = matchAppRoute(url.pathname);
     if (!routed) {
       res.writeHead(404, headers);
@@ -635,15 +745,23 @@ export async function startAppDevServer({
     try {
       state.watcher = fsWatch(state.bundleDir, { persistent: false }, (_event, filename) => {
         if (!filename || filename !== 'app.js') return;
-        try {
-          const stat = statSync(state.jsPath);
-          if (stat.mtimeMs === state.lastMtimeMs) return;
-          state.lastMtimeMs = stat.mtimeMs;
-          log(`[notis apps dev] ${state.slug}: bundle updated — reloading portal`);
-          broadcastReload(state.slug);
-        } catch {
-          // Bundle file may be missing mid-write; ignore.
-        }
+        // Vite may emit the filesystem notification while its output file is
+        // still being replaced. Debounce the notification so consumers never
+        // fetch the previous or partially-written bundle under the new build
+        // revision.
+        if (state.reloadTimer) clearTimeout(state.reloadTimer);
+        state.reloadTimer = setTimeout(() => {
+          state.reloadTimer = null;
+          try {
+            const stat = statSync(state.jsPath);
+            if (stat.mtimeMs === state.lastMtimeMs) return;
+            state.lastMtimeMs = stat.mtimeMs;
+            log(`[notis apps dev] ${state.slug}: bundle updated — reloading portal`);
+            broadcastReload(state.slug);
+          } catch {
+            // Bundle file may be missing mid-write; the next change retries.
+          }
+        }, 100);
       });
     } catch (error) {
       logError(`[notis apps dev] ${state.slug}: watch failed: ${error.message}`);
@@ -660,9 +778,53 @@ export async function startAppDevServer({
     state.watchPollTimer = setTimeout(() => pollForBundleAndWatch(state), 300);
   }
 
+  function watchManifestInputs(state) {
+    const schedulePrepare = () => {
+      if (state.prepareTimer) clearTimeout(state.prepareTimer);
+      state.prepareTimer = setTimeout(() => {
+        state.prepareTimer = null;
+        void prepareArtifactBuild(state.projectDir).then(() => {
+          // Name, icon, and route metadata can change without changing the
+          // compiled JS bytes. Notify consumers immediately; a generated-entry
+          // change will produce the normal second reload after Vite rebuilds.
+          broadcastReload(state.slug);
+        }).catch((error) => {
+          const message = error instanceof Error ? error.message : String(error);
+          logError(`[notis apps dev] ${state.slug}: ${message}`);
+        });
+      }, 75);
+    };
+    try {
+      state.sourceWatchers.push(fsWatch(
+        state.projectDir,
+        { persistent: false },
+        (_event, filename) => {
+          if (filename && /^notis\.config\.(?:ts|js|mjs)$/.test(String(filename))) {
+            schedulePrepare();
+          }
+        },
+      ));
+    } catch (error) {
+      logError(`[notis apps dev] ${state.slug}: config watch failed: ${error.message}`);
+    }
+    const appDir = join(state.projectDir, 'app');
+    if (existsSync(appDir)) {
+      try {
+        state.sourceWatchers.push(fsWatch(
+          appDir,
+          { persistent: false, recursive: process.platform === 'darwin' || process.platform === 'win32' },
+          schedulePrepare,
+        ));
+      } catch (error) {
+        logError(`[notis apps dev] ${state.slug}: route watch failed: ${error.message}`);
+      }
+    }
+  }
+
   for (const state of appState.values()) {
     if (watch) {
       await prepareArtifactBuild(state.projectDir);
+      watchManifestInputs(state);
       pollForBundleAndWatch(state);
 
       state.buildProcess = spawn('npm', ['run', 'build', '--', '--watch'], {
@@ -685,8 +847,37 @@ export async function startAppDevServer({
 
   return {
     port,
+    updateApp(slug, updates = {}) {
+      const state = appState.get(slug);
+      if (!state) throw new Error(`unknown app: ${slug}`);
+      for (const key of ['appId', 'targetAppId', 'userId', 'profileKey', 'sessionId', 'mountNonce']) {
+        if (Object.prototype.hasOwnProperty.call(updates, key)) {
+          state[key] = updates[key] || null;
+        }
+      }
+    },
+    isBundleReady(slug) {
+      const state = appState.get(slug);
+      if (!state) throw new Error(`unknown app: ${slug}`);
+      return state.bundleReady;
+    },
+    waitForBundle(slug) {
+      const state = appState.get(slug);
+      if (!state) return Promise.reject(new Error(`unknown app: ${slug}`));
+      return state.bundleReadyPromise;
+    },
     async close() {
       for (const state of appState.values()) {
+        if (state.prepareTimer) clearTimeout(state.prepareTimer);
+        if (state.reloadTimer) clearTimeout(state.reloadTimer);
+        for (const watcher of state.sourceWatchers) {
+          try {
+            watcher.close();
+          } catch {
+            // ignore
+          }
+        }
+        state.sourceWatchers = [];
         if (state.watchPollTimer) clearTimeout(state.watchPollTimer);
         if (state.watcher) {
           try {
@@ -707,6 +898,14 @@ export async function startAppDevServer({
           state.buildProcess.kill('SIGTERM');
         }
       }
+      for (const res of hostSseClients) {
+        try {
+          res.end();
+        } catch {
+          // ignore
+        }
+      }
+      hostSseClients.clear();
       await new Promise((resolvePromise) => server.close(() => resolvePromise()));
     },
   };