opensteer 0.9.6 → 0.9.8

package/dist/local-view/serve-entry.cjs

@@ -6,9 +6,9 @@ var crypto = require('crypto');
 var path12 = require('path');
 var url = require('url');
 var child_process = require('child_process');
-var util = require('util');
-var os = require('os');
 var fs = require('fs');
+var os = require('os');
+var util = require('util');
 var module$1 = require('module');
 var enginePlaywright = require('@opensteer/engine-playwright');
 var http = require('http');
@@ -203,388 +203,174 @@ function isAlreadyExistsError(error) {
 }
 async function withFilesystemLock(lockPath, task) {
   await ensureDirectory(path12__default.default.dirname(lockPath));
+  const ownerToken = crypto.randomUUID();
   let attempt = 0;
   while (true) {
     try {
       await promises.mkdir(lockPath);
+      const acquiredAt = Date.now();
+      await writeLockMetadata(lockPath, {
+        version: LOCK_METADATA_VERSION,
+        ownerToken,
+        pid: process.pid,
+        acquiredAt,
+        heartbeatAt: acquiredAt
+      });
       break;
     } catch (error) {
       if (!isAlreadyExistsError(error)) {
         throw error;
       }
+      if (await tryRecoverFilesystemLock(lockPath)) {
+        attempt = 0;
+        continue;
+      }
       const delayMs = LOCK_RETRY_DELAYS_MS[Math.min(attempt, LOCK_RETRY_DELAYS_MS.length - 1)];
       attempt += 1;
       await new Promise((resolve4) => setTimeout(resolve4, delayMs));
     }
   }
+  const heartbeatTimer = setInterval(() => {
+    void touchLockMetadata(lockPath, ownerToken);
+  }, LOCK_HEARTBEAT_INTERVAL_MS);
+  heartbeatTimer.unref?.();
   try {
     return await task();
   } finally {
-    await promises.rm(lockPath, { recursive: true, force: true });
+    clearInterval(heartbeatTimer);
+    const metadata = await readLockMetadata(lockPath);
+    if (metadata?.ownerToken === ownerToken) {
+      await promises.rm(lockPath, { recursive: true, force: true });
+    }
   }
 }
-var LOCK_RETRY_DELAYS_MS;
-var init_filesystem = __esm({
-  "../runtime-core/src/internal/filesystem.ts"() {
-    init_json();
-    LOCK_RETRY_DELAYS_MS = [1, 2, 5, 10, 20, 50];
-  }
-});
-
-// src/internal/filesystem.ts
-var init_filesystem2 = __esm({
-  "src/internal/filesystem.ts"() {
-    init_filesystem();
+async function tryRecoverFilesystemLock(lockPath) {
+  if (!await shouldRecoverFilesystemLock(lockPath)) {
+    return false;
   }
-});
-function resolveLiveSessionRecordPath(rootPath, provider) {
-  return path12__default.default.join(rootPath, "live", provider === "local" ? "local.json" : "cloud.json");
+  await promises.rm(lockPath, { recursive: true, force: true });
+  return true;
 }
-async function readPersistedSessionRecord(rootPath, provider) {
-  const sessionPath = resolveLiveSessionRecordPath(rootPath, provider);
-  if (!await pathExists(sessionPath)) {
-    return void 0;
+async function shouldRecoverFilesystemLock(lockPath) {
+  const metadata = await readLockMetadata(lockPath);
+  if (metadata !== void 0) {
+    if (isProcessRunning(metadata.pid)) {
+      return false;
+    }
+    return Date.now() - metadata.heartbeatAt >= LOCK_ORPHAN_GRACE_MS;
   }
-  const parsed = await readJsonFile(sessionPath);
-  if (isPersistedLocalBrowserSessionRecord(parsed)) {
-    return parsed;
+  const lockStat = await promises.stat(lockPath).catch(() => void 0);
+  if (lockStat === void 0) {
+    return false;
   }
-  return void 0;
-}
-async function readPersistedLocalBrowserSessionRecord(rootPath) {
-  const record = await readPersistedSessionRecord(rootPath, "local");
-  return record?.provider === "local" ? record : void 0;
-}
-async function writePersistedSessionRecord(rootPath, record) {
-  await writeJsonFileAtomic(resolveLiveSessionRecordPath(rootPath, record.provider), record);
-}
-async function clearPersistedSessionRecord(rootPath, provider) {
-  await promises.rm(resolveLiveSessionRecordPath(rootPath, provider), { force: true });
+  return Date.now() - lockStat.mtimeMs >= LOCK_METADATALESS_STALE_MS;
 }
-function isPersistedLocalBrowserSessionRecord(value) {
-  return value.layout === OPENSTEER_LIVE_SESSION_LAYOUT && value.version === OPENSTEER_LIVE_SESSION_VERSION && value.provider === "local" && (value.engine === "playwright" || value.engine === "abp") && typeof value.pid === "number" && Number.isFinite(value.pid) && typeof value.startedAt === "number" && Number.isFinite(value.startedAt) && typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt) && typeof value.userDataDir === "string" && value.userDataDir.length > 0;
-}
-var OPENSTEER_LIVE_SESSION_LAYOUT, OPENSTEER_LIVE_SESSION_VERSION;
-var init_live_session = __esm({
-  "src/live-session.ts"() {
-    init_filesystem2();
-    OPENSTEER_LIVE_SESSION_LAYOUT = "opensteer-session";
-    OPENSTEER_LIVE_SESSION_VERSION = 1;
-  }
-});
-function parseProcessOwner(value) {
-  if (!value || typeof value !== "object") {
-    return null;
-  }
-  const parsed = value;
-  const pid = Number(parsed.pid);
-  const processStartedAtMs = Number(parsed.processStartedAtMs);
-  if (!Number.isInteger(pid) || pid <= 0) {
-    return null;
+async function readLockMetadata(lockPath) {
+  const metadataPath = path12__default.default.join(lockPath, LOCK_METADATA_FILENAME);
+  if (!await pathExists(metadataPath)) {
+    return void 0;
   }
-  if (!Number.isInteger(processStartedAtMs) || processStartedAtMs <= 0) {
-    return null;
+  try {
+    const parsed = await readJsonFile(metadataPath);
+    const pid = parsed.pid;
+    const acquiredAt = parsed.acquiredAt;
+    const heartbeatAt = parsed.heartbeatAt;
+    if (parsed.version !== LOCK_METADATA_VERSION || typeof parsed.ownerToken !== "string" || parsed.ownerToken.length === 0 || typeof pid !== "number" || !Number.isInteger(pid) || pid <= 0 || typeof acquiredAt !== "number" || !Number.isFinite(acquiredAt) || typeof heartbeatAt !== "number" || !Number.isFinite(heartbeatAt)) {
+      return void 0;
+    }
+    return {
+      version: LOCK_METADATA_VERSION,
+      ownerToken: parsed.ownerToken,
+      pid,
+      acquiredAt,
+      heartbeatAt
+    };
+  } catch {
+    return void 0;
   }
-  return {
-    pid,
-    processStartedAtMs
-  };
 }
-function processOwnersEqual(left, right) {
-  if (!left || !right) {
-    return left === right;
+async function writeLockMetadata(lockPath, metadata) {
+  try {
+    await writeJsonFileAtomic(path12__default.default.join(lockPath, LOCK_METADATA_FILENAME), metadata);
+  } catch (error) {
+    await promises.rm(lockPath, { recursive: true, force: true }).catch(() => void 0);
+    throw error;
   }
-  return left.pid === right.pid && left.processStartedAtMs === right.processStartedAtMs;
 }
-async function getProcessLiveness(owner) {
-  if (owner.pid === process.pid && hasMatchingProcessStartTime(owner.processStartedAtMs, PROCESS_STARTED_AT_MS)) {
-    return "live";
-  }
-  const startedAtMs = await readProcessStartedAtMs(owner.pid);
-  if (typeof startedAtMs === "number") {
-    return hasMatchingProcessStartTime(owner.processStartedAtMs, startedAtMs) ? "live" : "dead";
+async function touchLockMetadata(lockPath, ownerToken) {
+  const metadata = await readLockMetadata(lockPath);
+  if (metadata === void 0 || metadata.ownerToken !== ownerToken) {
+    return;
   }
-  return isProcessRunning(owner.pid) ? "unknown" : "dead";
+  await writeJsonFileAtomic(path12__default.default.join(lockPath, LOCK_METADATA_FILENAME), {
+    ...metadata,
+    heartbeatAt: Date.now()
+  }).catch(() => void 0);
 }
 function isProcessRunning(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) {
+    return false;
+  }
   try {
     process.kill(pid, 0);
     return true;
   } catch (error) {
-    const code = typeof error === "object" && error !== null && "code" in error && typeof error.code === "string" ? error.code : void 0;
-    return code !== "ESRCH";
+    return error?.code === "EPERM";
   }
 }
-function hasMatchingProcessStartTime(expectedStartedAtMs, actualStartedAtMs) {
-  return Math.abs(expectedStartedAtMs - actualStartedAtMs) <= PROCESS_START_TIME_TOLERANCE_MS;
-}
-async function readProcessStartedAtMs(pid) {
-  if (pid <= 0) {
-    return null;
-  }
-  if (process.platform === "linux") {
-    return readLinuxProcessStartedAtMs(pid);
-  }
-  if (process.platform === "win32") {
-    return readWindowsProcessStartedAtMs(pid);
+var LOCK_RETRY_DELAYS_MS, LOCK_METADATA_FILENAME, LOCK_METADATA_VERSION, LOCK_HEARTBEAT_INTERVAL_MS, LOCK_ORPHAN_GRACE_MS, LOCK_METADATALESS_STALE_MS;
+var init_filesystem = __esm({
+  "../runtime-core/src/internal/filesystem.ts"() {
+    init_json();
+    LOCK_RETRY_DELAYS_MS = [1, 2, 5, 10, 20, 50];
+    LOCK_METADATA_FILENAME = "owner.json";
+    LOCK_METADATA_VERSION = 1;
+    LOCK_HEARTBEAT_INTERVAL_MS = 1e3;
+    LOCK_ORPHAN_GRACE_MS = 2e3;
+    LOCK_METADATALESS_STALE_MS = 3e4;
   }
-  return readPsProcessStartedAtMs(pid);
-}
-async function readLinuxProcessStartedAtMs(pid) {
-  let statRaw;
-  try {
-    statRaw = await promises.readFile(`/proc/${String(pid)}/stat`, "utf8");
-  } catch {
-    return null;
+});
+
+// src/internal/filesystem.ts
+var init_filesystem2 = __esm({
+  "src/internal/filesystem.ts"() {
+    init_filesystem();
   }
-  const startTicks = parseLinuxProcessStartTicks(statRaw);
-  if (startTicks === null) {
-    return null;
+});
+function resolveBrandPlatformConfig(brand, platform = process.platform) {
+  if (platform === "darwin") {
+    return brand.darwin;
   }
-  const [bootTimeMs, clockTicksPerSecond] = await Promise.all([
-    readLinuxBootTimeMs(),
-    readLinuxClockTicksPerSecond()
-  ]);
-  if (bootTimeMs === null || clockTicksPerSecond === null) {
-    return null;
+  if (platform === "win32") {
+    return brand.win32;
   }
-  return Math.floor(bootTimeMs + startTicks * 1e3 / clockTicksPerSecond);
-}
-function parseLinuxProcessStartTicks(statRaw) {
-  const closingParenIndex = statRaw.lastIndexOf(")");
-  if (closingParenIndex === -1) {
-    return null;
+  if (platform === "linux") {
+    return brand.linux;
   }
-  const fields = statRaw.slice(closingParenIndex + 2).trim().split(/\s+/);
-  const startTicks = Number(fields[LINUX_STAT_START_TIME_FIELD_INDEX]);
-  return Number.isFinite(startTicks) && startTicks >= 0 ? startTicks : null;
+  return void 0;
 }
-async function readLinuxBootTimeMs() {
-  try {
-    const statRaw = await promises.readFile("/proc/stat", "utf8");
-    const bootTimeLine = statRaw.split("\n").find((line) => line.startsWith("btime "));
-    if (!bootTimeLine) {
-      return null;
+function detectInstalledBrowserBrands() {
+  const installations = [];
+  for (const brand of BROWSER_BRANDS) {
+    const platformConfig = resolveBrandPlatformConfig(brand);
+    if (!platformConfig) {
+      continue;
     }
-    const bootTimeSeconds = Number.parseInt(bootTimeLine.slice("btime ".length), 10);
-    return Number.isFinite(bootTimeSeconds) ? bootTimeSeconds * 1e3 : null;
-  } catch {
-    return null;
-  }
-}
-async function readLinuxClockTicksPerSecond() {
-  if (!linuxClockTicksPerSecondPromise) {
-    linuxClockTicksPerSecondPromise = execFileAsync("getconf", ["CLK_TCK"], {
-      encoding: "utf8",
-      maxBuffer: PROCESS_LIST_MAX_BUFFER_BYTES
-    }).then(({ stdout }) => {
-      const value = Number.parseInt(stdout.trim(), 10);
-      return Number.isFinite(value) && value > 0 ? value : null;
-    }).catch(() => null);
-  }
-  return linuxClockTicksPerSecondPromise;
-}
-async function readWindowsProcessStartedAtMs(pid) {
-  try {
-    const { stdout } = await execFileAsync(
-      "powershell.exe",
-      [
-        "-NoProfile",
-        "-Command",
-        `(Get-Process -Id ${String(pid)}).StartTime.ToUniversalTime().ToString("o")`
-      ],
-      {
-        encoding: "utf8",
-        maxBuffer: PROCESS_LIST_MAX_BUFFER_BYTES
-      }
+    const executablePath = firstExistingPath(
+      resolveExecutableCandidates(platformConfig.executableCandidates)
     );
-    const isoTimestamp = stdout.trim();
-    if (!isoTimestamp) {
-      return null;
+    if (!executablePath) {
+      continue;
     }
-    const startedAtMs = Date.parse(isoTimestamp);
-    return Number.isFinite(startedAtMs) ? startedAtMs : null;
-  } catch {
-    return null;
-  }
-}
-async function readPsProcessStartedAtMs(pid) {
-  try {
-    const { stdout } = await execFileAsync("ps", ["-o", "lstart=", "-p", String(pid)], {
-      encoding: "utf8",
-      env: PS_COMMAND_ENV,
-      maxBuffer: PROCESS_LIST_MAX_BUFFER_BYTES
+    installations.push({
+      brand,
+      brandId: brand.id,
+      displayName: brand.displayName,
+      executablePath,
+      userDataDir: path12.resolve(expandHome(platformConfig.userDataDir))
     });
-    const startedAt = stdout.trim();
-    if (!startedAt) {
-      return null;
-    }
-    const startedAtMs = Date.parse(startedAt.replace(/\s+/g, " "));
-    return Number.isFinite(startedAtMs) ? startedAtMs : null;
-  } catch {
-    return null;
   }
-}
-var execFileAsync, PROCESS_STARTED_AT_MS, PROCESS_START_TIME_TOLERANCE_MS, PROCESS_LIST_MAX_BUFFER_BYTES, PS_COMMAND_ENV, LINUX_STAT_START_TIME_FIELD_INDEX, CURRENT_PROCESS_OWNER, linuxClockTicksPerSecondPromise;
-var init_process_owner = __esm({
-  "src/local-browser/process-owner.ts"() {
-    execFileAsync = util.promisify(child_process.execFile);
-    PROCESS_STARTED_AT_MS = Math.floor(Date.now() - process.uptime() * 1e3);
-    PROCESS_START_TIME_TOLERANCE_MS = 1e3;
-    PROCESS_LIST_MAX_BUFFER_BYTES = 16 * 1024 * 1024;
-    PS_COMMAND_ENV = { ...process.env, LC_ALL: "C" };
-    LINUX_STAT_START_TIME_FIELD_INDEX = 19;
-    CURRENT_PROCESS_OWNER = {
-      pid: process.pid,
-      processStartedAtMs: PROCESS_STARTED_AT_MS
-    };
-    linuxClockTicksPerSecondPromise = null;
-  }
-});
-function resolveOpensteerStateDir() {
-  const explicit = process.env.OPENSTEER_HOME?.trim();
-  if (explicit) {
-    return path12__default.default.resolve(explicit);
-  }
-  if (process.platform === "win32") {
-    return path12__default.default.join(
-      process.env.LOCALAPPDATA ?? path12__default.default.join(os.homedir(), "AppData", "Local"),
-      "Opensteer"
-    );
-  }
-  if (process.platform === "darwin") {
-    return path12__default.default.join(os.homedir(), "Library", "Application Support", "Opensteer");
-  }
-  return path12__default.default.join(
-    process.env.XDG_STATE_HOME ?? path12__default.default.join(os.homedir(), ".local", "state"),
-    "opensteer"
-  );
-}
-function resolveLocalViewRootDir() {
-  return path12__default.default.join(resolveOpensteerStateDir(), "local-view");
-}
-function resolveLocalViewPreferencesPath() {
-  return path12__default.default.join(resolveLocalViewRootDir(), "preferences.json");
-}
-function resolveLocalViewServiceDir() {
-  return path12__default.default.join(resolveLocalViewRootDir(), "service");
-}
-function resolveLocalViewSessionsDir() {
-  return path12__default.default.join(resolveLocalViewRootDir(), "sessions");
-}
-function resolveLocalViewServiceLockDir() {
-  return path12__default.default.join(resolveLocalViewServiceDir(), "startup.lock");
-}
-function resolveLocalViewServiceStatePath() {
-  return path12__default.default.join(resolveLocalViewServiceDir(), "state.json");
-}
-var init_runtime_dir = __esm({
-  "src/local-view/runtime-dir.ts"() {
-  }
-});
-function buildLocalViewSessionId(input) {
-  const hash = crypto.createHash("sha256").update(`${input.rootPath}
-${String(input.pid)}
-${String(input.startedAt)}`).digest("hex");
-  return `local_${hash.slice(0, 24)}`;
-}
-function createLocalViewSessionManifest(input) {
-  return {
-    layout: OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT,
-    version: OPENSTEER_LOCAL_VIEW_SESSION_VERSION,
-    sessionId: buildLocalViewSessionId({
-      rootPath: input.rootPath,
-      pid: input.live.pid,
-      startedAt: input.live.startedAt
-    }),
-    rootPath: input.rootPath,
-    ...input.workspace === void 0 ? {} : { workspace: input.workspace },
-    engine: input.live.engine,
-    ownership: input.ownership,
-    pid: input.live.pid,
-    startedAt: input.live.startedAt,
-    updatedAt: Date.now()
-  };
-}
-async function writeLocalViewSessionManifest(manifest) {
-  await ensureDirectory(resolveLocalViewSessionsDir());
-  await writeJsonFileAtomic(resolveLocalViewSessionManifestPath(manifest.sessionId), manifest);
-}
-async function deleteLocalViewSessionManifest(sessionId) {
-  await promises.rm(resolveLocalViewSessionManifestPath(sessionId), { force: true }).catch(() => void 0);
-}
-async function readLocalViewSessionManifest(sessionId) {
-  const manifestPath = resolveLocalViewSessionManifestPath(sessionId);
-  if (!await pathExists(manifestPath)) {
-    return void 0;
-  }
-  const parsed = await readJsonFile(manifestPath);
-  return isPersistedLocalViewSessionManifest(parsed) ? parsed : void 0;
-}
-async function listLocalViewSessionManifests() {
-  const directoryPath = resolveLocalViewSessionsDir();
-  const fileNames = await listJsonFiles(directoryPath);
-  const manifests = await Promise.all(
-    fileNames.map(async (fileName) => {
-      const parsed = await readJsonFile(
-        path12__default.default.join(directoryPath, fileName)
-      ).catch(() => void 0);
-      return isPersistedLocalViewSessionManifest(parsed) ? parsed : void 0;
-    })
-  );
-  return manifests.filter((manifest) => manifest !== void 0).sort(
-    (left, right) => left.startedAt - right.startedAt || left.sessionId.localeCompare(right.sessionId)
-  );
-}
-function resolveLocalViewSessionManifestPath(sessionId) {
-  return path12__default.default.join(resolveLocalViewSessionsDir(), `${sessionId}.json`);
-}
-function isPersistedLocalViewSessionManifest(value) {
-  return value?.layout === OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT && value.version === OPENSTEER_LOCAL_VIEW_SESSION_VERSION && typeof value.sessionId === "string" && value.sessionId.length > 0 && typeof value.rootPath === "string" && value.rootPath.length > 0 && (value.engine === "playwright" || value.engine === "abp") && (value.ownership === "owned" || value.ownership === "attached" || value.ownership === "managed") && typeof value.pid === "number" && Number.isFinite(value.pid) && typeof value.startedAt === "number" && Number.isFinite(value.startedAt) && typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt);
-}
-var OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT, OPENSTEER_LOCAL_VIEW_SESSION_VERSION;
-var init_session_manifest = __esm({
-  "src/local-view/session-manifest.ts"() {
-    init_filesystem2();
-    init_runtime_dir();
-    OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT = "opensteer-local-view-session";
-    OPENSTEER_LOCAL_VIEW_SESSION_VERSION = 1;
-  }
-});
-function resolveBrandPlatformConfig(brand, platform = process.platform) {
-  if (platform === "darwin") {
-    return brand.darwin;
-  }
-  if (platform === "win32") {
-    return brand.win32;
-  }
-  if (platform === "linux") {
-    return brand.linux;
-  }
-  return void 0;
-}
-function detectInstalledBrowserBrands() {
-  const installations = [];
-  for (const brand of BROWSER_BRANDS) {
-    const platformConfig = resolveBrandPlatformConfig(brand);
-    if (!platformConfig) {
-      continue;
-    }
-    const executablePath = firstExistingPath(
-      resolveExecutableCandidates(platformConfig.executableCandidates)
-    );
-    if (!executablePath) {
-      continue;
-    }
-    installations.push({
-      brand,
-      brandId: brand.id,
-      displayName: brand.displayName,
-      executablePath,
-      userDataDir: path12.resolve(expandHome(platformConfig.userDataDir))
-    });
-  }
-  return installations;
+  return installations;
 }
 function resolveExecutableCandidates(candidates) {
   return candidates.map((candidate) => candidate ? path12.resolve(expandHome(candidate)) : null);
@@ -1033,116 +819,473 @@ async function probeCdpEndpoint(input) {
       httpUrl: target.httpUrl
     });
   }
-  if (target.fallbackBrowserWebSocketUrl !== void 0 && await isHttpEndpointReachable(target.httpUrl, timeoutMs)) {
-    return createInspectedCdpEndpoint({
-      browserWebSocketUrl: target.fallbackBrowserWebSocketUrl,
-      httpUrl: target.httpUrl
+  if (target.fallbackBrowserWebSocketUrl !== void 0 && await isHttpEndpointReachable(target.httpUrl, timeoutMs)) {
+    return createInspectedCdpEndpoint({
+      browserWebSocketUrl: target.fallbackBrowserWebSocketUrl,
+      httpUrl: target.httpUrl
+    });
+  }
+  return null;
+}
+function dedupeAndSortCandidates(candidates) {
+  const deduped = /* @__PURE__ */ new Map();
+  for (const candidate of [...candidates].sort(compareCandidates)) {
+    const existing = deduped.get(candidate.endpoint);
+    if (!existing || compareCandidates(candidate, existing) < 0) {
+      deduped.set(candidate.endpoint, candidate);
+    }
+  }
+  return [...deduped.values()].sort(compareCandidates);
+}
+function compareCandidates(left, right) {
+  return getAttachCandidatePriority(right) - getAttachCandidatePriority(left) || left.endpoint.localeCompare(right.endpoint) || (left.userDataDir ?? "").localeCompare(right.userDataDir ?? "");
+}
+function getAttachCandidatePriority(candidate) {
+  return candidate.source === "devtools-active-port" ? 2 : 1;
+}
+function createInspectedCdpEndpoint(input) {
+  const port = readPort(input.httpUrl);
+  return {
+    endpoint: input.browserWebSocketUrl,
+    ...input.browser === void 0 ? {} : { browser: input.browser },
+    ...input.protocolVersion === void 0 ? {} : { protocolVersion: input.protocolVersion },
+    httpUrl: input.httpUrl.toString(),
+    ...port === void 0 ? {} : { port }
+  };
+}
+function normalizeProbeTarget(endpoint) {
+  if (/^\d+$/.test(endpoint)) {
+    return {
+      httpUrl: new URL(`http://127.0.0.1:${endpoint}`)
+    };
+  }
+  if (endpoint.startsWith("ws://") || endpoint.startsWith("wss://")) {
+    const url = new URL(endpoint);
+    return {
+      fallbackBrowserWebSocketUrl: url.toString(),
+      httpUrl: new URL(`${url.protocol === "wss:" ? "https:" : "http:"}//${url.host}`)
+    };
+  }
+  try {
+    const url = endpoint.startsWith("http://") || endpoint.startsWith("https://") ? new URL(endpoint) : new URL(`http://${endpoint}`);
+    return {
+      httpUrl: new URL(`${url.protocol}//${url.host}`)
+    };
+  } catch {
+    throw new Error(`Invalid CDP endpoint "${endpoint}".`);
+  }
+}
+async function fetchJson(url, headers, timeoutMs) {
+  const response = await fetch(url, {
+    ...headers === void 0 ? {} : { headers },
+    signal: AbortSignal.timeout(timeoutMs)
+  }).catch(() => null);
+  if (!response?.ok) {
+    return null;
+  }
+  return await response.json();
+}
+async function isHttpEndpointReachable(url, timeoutMs) {
+  const response = await fetch(url, {
+    signal: AbortSignal.timeout(timeoutMs)
+  }).catch(() => null);
+  return response !== null;
+}
+function buildBrowserWebSocketUrl(httpUrl, webSocketPath) {
+  const protocol = httpUrl.protocol === "https:" ? "wss:" : "ws:";
+  return `${protocol}//${httpUrl.host}${normalizeWebSocketPath(webSocketPath)}`;
+}
+function normalizeWebSocketPath(path15) {
+  return path15.startsWith("/") ? path15 : `/${path15}`;
+}
+function rewriteBrowserWebSocketHost(browserWsUrl, requestedUrl) {
+  try {
+    const parsed = new URL(browserWsUrl);
+    parsed.protocol = requestedUrl.protocol === "https:" ? "wss:" : "ws:";
+    parsed.hostname = requestedUrl.hostname;
+    parsed.port = requestedUrl.port;
+    return parsed.toString();
+  } catch {
+    return browserWsUrl;
+  }
+}
+function readPort(url) {
+  const port = Number.parseInt(url.port, 10);
+  return Number.isInteger(port) && port > 0 ? port : void 0;
+}
+var DEFAULT_DISCOVERY_TIMEOUT_MS, DISCOVERY_FALLBACK_PORT, OpensteerAttachAmbiguousError;
+var init_cdp_discovery = __esm({
+  "src/local-browser/cdp-discovery.ts"() {
+    init_chrome_discovery();
+    DEFAULT_DISCOVERY_TIMEOUT_MS = 2e3;
+    DISCOVERY_FALLBACK_PORT = 9222;
+    OpensteerAttachAmbiguousError = class extends Error {
+      constructor(candidates) {
+        super(
+          "Multiple running Chromium DevTools endpoints were discovered. Specify the desired endpoint explicitly."
+        );
+        this.candidates = candidates;
+        this.name = "OpensteerAttachAmbiguousError";
+      }
+      code = "attach-ambiguous";
+    };
+  }
+});
+function resolveLiveSessionRecordPath(rootPath, provider) {
+  return path12__default.default.join(rootPath, "live", provider === "local" ? "local.json" : "cloud.json");
+}
+async function readPersistedSessionRecord(rootPath, provider) {
+  const sessionPath = resolveLiveSessionRecordPath(rootPath, provider);
+  if (!await pathExists(sessionPath)) {
+    return void 0;
+  }
+  const parsed = await readJsonFile(sessionPath);
+  if (isPersistedLocalBrowserSessionRecord(parsed)) {
+    return parsed;
+  }
+  return void 0;
+}
+async function readPersistedLocalBrowserSessionRecord(rootPath) {
+  const record = await readPersistedSessionRecord(rootPath, "local");
+  return record?.provider === "local" ? record : void 0;
+}
+async function writePersistedSessionRecord(rootPath, record) {
+  await writeJsonFileAtomic(resolveLiveSessionRecordPath(rootPath, record.provider), record);
+}
+async function clearPersistedSessionRecord(rootPath, provider) {
+  await promises.rm(resolveLiveSessionRecordPath(rootPath, provider), { force: true });
+}
+function getPersistedLocalBrowserSessionOwnership(record) {
+  return record.ownership === "attached" ? "attached" : "owned";
+}
+async function isAttachedLocalBrowserSessionReachable(record) {
+  if (getPersistedLocalBrowserSessionOwnership(record) !== "attached") {
+    return false;
+  }
+  if (record.engine !== "playwright" || record.endpoint === void 0) {
+    return false;
+  }
+  try {
+    await inspectCdpEndpoint({
+      endpoint: record.endpoint,
+      timeoutMs: 1500
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isPersistedLocalBrowserSessionRecord(value) {
+  return value.layout === OPENSTEER_LIVE_SESSION_LAYOUT && value.version === OPENSTEER_LIVE_SESSION_VERSION && value.provider === "local" && (value.engine === "playwright" || value.engine === "abp") && (value.ownership === void 0 || value.ownership === "owned" || value.ownership === "attached") && (value.activePageUrl === void 0 || typeof value.activePageUrl === "string") && (value.activePageTitle === void 0 || typeof value.activePageTitle === "string") && typeof value.pid === "number" && Number.isFinite(value.pid) && typeof value.startedAt === "number" && Number.isFinite(value.startedAt) && typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt) && typeof value.userDataDir === "string" && value.userDataDir.length > 0;
+}
+var OPENSTEER_LIVE_SESSION_LAYOUT, OPENSTEER_LIVE_SESSION_VERSION;
+var init_live_session = __esm({
+  "src/live-session.ts"() {
+    init_filesystem2();
+    init_cdp_discovery();
+    OPENSTEER_LIVE_SESSION_LAYOUT = "opensteer-session";
+    OPENSTEER_LIVE_SESSION_VERSION = 1;
+  }
+});
+function parseProcessOwner(value) {
+  if (!value || typeof value !== "object") {
+    return null;
+  }
+  const parsed = value;
+  const pid = Number(parsed.pid);
+  const processStartedAtMs = Number(parsed.processStartedAtMs);
+  if (!Number.isInteger(pid) || pid <= 0) {
+    return null;
+  }
+  if (!Number.isInteger(processStartedAtMs) || processStartedAtMs <= 0) {
+    return null;
+  }
+  return {
+    pid,
+    processStartedAtMs
+  };
+}
+function processOwnersEqual(left, right) {
+  if (!left || !right) {
+    return left === right;
+  }
+  return left.pid === right.pid && left.processStartedAtMs === right.processStartedAtMs;
+}
+async function getProcessLiveness(owner) {
+  if (owner.pid === process.pid && hasMatchingProcessStartTime(owner.processStartedAtMs, PROCESS_STARTED_AT_MS)) {
+    return "live";
+  }
+  const startedAtMs = await readProcessStartedAtMs(owner.pid);
+  if (typeof startedAtMs === "number") {
+    return hasMatchingProcessStartTime(owner.processStartedAtMs, startedAtMs) ? "live" : "dead";
+  }
+  return isProcessRunning2(owner.pid) ? "unknown" : "dead";
+}
+function isProcessRunning2(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    const code = typeof error === "object" && error !== null && "code" in error && typeof error.code === "string" ? error.code : void 0;
+    return code !== "ESRCH";
+  }
+}
+function hasMatchingProcessStartTime(expectedStartedAtMs, actualStartedAtMs) {
+  return Math.abs(expectedStartedAtMs - actualStartedAtMs) <= PROCESS_START_TIME_TOLERANCE_MS;
+}
+async function readProcessStartedAtMs(pid) {
+  if (pid <= 0) {
+    return null;
+  }
+  if (process.platform === "linux") {
+    return readLinuxProcessStartedAtMs(pid);
+  }
+  if (process.platform === "win32") {
+    return readWindowsProcessStartedAtMs(pid);
+  }
+  return readPsProcessStartedAtMs(pid);
+}
+async function readLinuxProcessStartedAtMs(pid) {
+  let statRaw;
+  try {
+    statRaw = await promises.readFile(`/proc/${String(pid)}/stat`, "utf8");
+  } catch {
+    return null;
+  }
+  const startTicks = parseLinuxProcessStartTicks(statRaw);
+  if (startTicks === null) {
+    return null;
+  }
+  const [bootTimeMs, clockTicksPerSecond] = await Promise.all([
+    readLinuxBootTimeMs(),
+    readLinuxClockTicksPerSecond()
+  ]);
+  if (bootTimeMs === null || clockTicksPerSecond === null) {
+    return null;
+  }
+  return Math.floor(bootTimeMs + startTicks * 1e3 / clockTicksPerSecond);
+}
+function parseLinuxProcessStartTicks(statRaw) {
+  const closingParenIndex = statRaw.lastIndexOf(")");
+  if (closingParenIndex === -1) {
+    return null;
+  }
+  const fields = statRaw.slice(closingParenIndex + 2).trim().split(/\s+/);
+  const startTicks = Number(fields[LINUX_STAT_START_TIME_FIELD_INDEX]);
+  return Number.isFinite(startTicks) && startTicks >= 0 ? startTicks : null;
+}
+async function readLinuxBootTimeMs() {
+  try {
+    const statRaw = await promises.readFile("/proc/stat", "utf8");
+    const bootTimeLine = statRaw.split("\n").find((line) => line.startsWith("btime "));
+    if (!bootTimeLine) {
+      return null;
+    }
+    const bootTimeSeconds = Number.parseInt(bootTimeLine.slice("btime ".length), 10);
+    return Number.isFinite(bootTimeSeconds) ? bootTimeSeconds * 1e3 : null;
+  } catch {
+    return null;
+  }
+}
+async function readLinuxClockTicksPerSecond() {
+  if (!linuxClockTicksPerSecondPromise) {
+    linuxClockTicksPerSecondPromise = execFileAsync("getconf", ["CLK_TCK"], {
+      encoding: "utf8",
+      maxBuffer: PROCESS_LIST_MAX_BUFFER_BYTES2
+    }).then(({ stdout }) => {
+      const value = Number.parseInt(stdout.trim(), 10);
+      return Number.isFinite(value) && value > 0 ? value : null;
+    }).catch(() => null);
+  }
+  return linuxClockTicksPerSecondPromise;
+}
+async function readWindowsProcessStartedAtMs(pid) {
+  try {
+    const { stdout } = await execFileAsync(
+      "powershell.exe",
+      [
+        "-NoProfile",
+        "-Command",
+        `(Get-Process -Id ${String(pid)}).StartTime.ToUniversalTime().ToString("o")`
+      ],
+      {
+        encoding: "utf8",
+        maxBuffer: PROCESS_LIST_MAX_BUFFER_BYTES2
+      }
+    );
+    const isoTimestamp = stdout.trim();
+    if (!isoTimestamp) {
+      return null;
+    }
+    const startedAtMs = Date.parse(isoTimestamp);
+    return Number.isFinite(startedAtMs) ? startedAtMs : null;
+  } catch {
+    return null;
+  }
+}
+async function readPsProcessStartedAtMs(pid) {
+  try {
+    const { stdout } = await execFileAsync("ps", ["-o", "lstart=", "-p", String(pid)], {
+      encoding: "utf8",
+      env: PS_COMMAND_ENV2,
+      maxBuffer: PROCESS_LIST_MAX_BUFFER_BYTES2
     });
+    const startedAt = stdout.trim();
+    if (!startedAt) {
+      return null;
+    }
+    const startedAtMs = Date.parse(startedAt.replace(/\s+/g, " "));
+    return Number.isFinite(startedAtMs) ? startedAtMs : null;
+  } catch {
+    return null;
   }
-  return null;
 }
-function dedupeAndSortCandidates(candidates) {
-  const deduped = /* @__PURE__ */ new Map();
-  for (const candidate of [...candidates].sort(compareCandidates)) {
-    const existing = deduped.get(candidate.endpoint);
-    if (!existing || compareCandidates(candidate, existing) < 0) {
-      deduped.set(candidate.endpoint, candidate);
-    }
+var execFileAsync, PROCESS_STARTED_AT_MS, PROCESS_START_TIME_TOLERANCE_MS, PROCESS_LIST_MAX_BUFFER_BYTES2, PS_COMMAND_ENV2, LINUX_STAT_START_TIME_FIELD_INDEX, CURRENT_PROCESS_OWNER, linuxClockTicksPerSecondPromise;
+var init_process_owner = __esm({
+  "src/local-browser/process-owner.ts"() {
+    execFileAsync = util.promisify(child_process.execFile);
+    PROCESS_STARTED_AT_MS = Math.floor(Date.now() - process.uptime() * 1e3);
+    PROCESS_START_TIME_TOLERANCE_MS = 1e3;
+    PROCESS_LIST_MAX_BUFFER_BYTES2 = 16 * 1024 * 1024;
+    PS_COMMAND_ENV2 = { ...process.env, LC_ALL: "C" };
+    LINUX_STAT_START_TIME_FIELD_INDEX = 19;
+    CURRENT_PROCESS_OWNER = {
+      pid: process.pid,
+      processStartedAtMs: PROCESS_STARTED_AT_MS
+    };
+    linuxClockTicksPerSecondPromise = null;
   }
-  return [...deduped.values()].sort(compareCandidates);
+});
+function resolveOpensteerStateDir() {
+  const explicit = process.env.OPENSTEER_HOME?.trim();
+  if (explicit) {
+    return path12__default.default.resolve(explicit);
+  }
+  if (process.platform === "win32") {
+    return path12__default.default.join(
+      process.env.LOCALAPPDATA ?? path12__default.default.join(os.homedir(), "AppData", "Local"),
+      "Opensteer"
+    );
+  }
+  if (process.platform === "darwin") {
+    return path12__default.default.join(os.homedir(), "Library", "Application Support", "Opensteer");
+  }
+  return path12__default.default.join(
+    process.env.XDG_STATE_HOME ?? path12__default.default.join(os.homedir(), ".local", "state"),
+    "opensteer"
+  );
 }
-function compareCandidates(left, right) {
-  return getAttachCandidatePriority(right) - getAttachCandidatePriority(left) || left.endpoint.localeCompare(right.endpoint) || (left.userDataDir ?? "").localeCompare(right.userDataDir ?? "");
+function resolveLocalViewRootDir() {
+  return path12__default.default.join(resolveOpensteerStateDir(), "local-view");
 }
-function getAttachCandidatePriority(candidate) {
-  return candidate.source === "devtools-active-port" ? 2 : 1;
+function resolveLocalViewPreferencesPath() {
+  return path12__default.default.join(resolveLocalViewRootDir(), "preferences.json");
 }
-function createInspectedCdpEndpoint(input) {
-  const port = readPort(input.httpUrl);
-  return {
-    endpoint: input.browserWebSocketUrl,
-    ...input.browser === void 0 ? {} : { browser: input.browser },
-    ...input.protocolVersion === void 0 ? {} : { protocolVersion: input.protocolVersion },
-    httpUrl: input.httpUrl.toString(),
-    ...port === void 0 ? {} : { port }
-  };
+function resolveLocalViewServiceDir() {
+  return path12__default.default.join(resolveLocalViewRootDir(), "service");
 }
-function normalizeProbeTarget(endpoint) {
-  if (/^\d+$/.test(endpoint)) {
-    return {
-      httpUrl: new URL(`http://127.0.0.1:${endpoint}`)
-    };
-  }
-  if (endpoint.startsWith("ws://") || endpoint.startsWith("wss://")) {
-    const url = new URL(endpoint);
-    return {
-      fallbackBrowserWebSocketUrl: url.toString(),
-      httpUrl: new URL(`${url.protocol === "wss:" ? "https:" : "http:"}//${url.host}`)
-    };
-  }
-  try {
-    const url = endpoint.startsWith("http://") || endpoint.startsWith("https://") ? new URL(endpoint) : new URL(`http://${endpoint}`);
-    return {
-      httpUrl: new URL(`${url.protocol}//${url.host}`)
-    };
-  } catch {
-    throw new Error(`Invalid CDP endpoint "${endpoint}".`);
+function resolveLocalViewSessionsDir() {
+  return path12__default.default.join(resolveLocalViewRootDir(), "sessions");
+}
+function resolveLocalViewServiceLockDir() {
+  return path12__default.default.join(resolveLocalViewServiceDir(), "startup.lock");
+}
+function resolveLocalViewServiceStatePath() {
+  return path12__default.default.join(resolveLocalViewServiceDir(), "state.json");
+}
+var init_runtime_dir = __esm({
+  "src/local-view/runtime-dir.ts"() {
   }
+});
+function buildLocalViewSessionId(input) {
+  const ownership = input.ownership ?? "owned";
+  const identity = ownership === "attached" ? input.endpoint ?? input.remoteDebuggingUrl ?? input.baseUrl ?? "attached" : `pid:${String(input.pid ?? 0)}`;
+  const hash = crypto.createHash("sha256").update(`${input.rootPath}
+${ownership}
+${identity}
+${String(input.startedAt)}`).digest("hex");
+  return `local_${hash.slice(0, 24)}`;
 }
-async function fetchJson(url, headers, timeoutMs) {
-  const response = await fetch(url, {
-    ...headers === void 0 ? {} : { headers },
-    signal: AbortSignal.timeout(timeoutMs)
-  }).catch(() => null);
-  if (!response?.ok) {
-    return null;
+function buildLocalViewSessionIdForRecord(input) {
+  const ownership = getPersistedLocalBrowserSessionOwnership(input.live);
+  if (ownership === "attached") {
+    return buildLocalViewSessionId({
+      rootPath: input.rootPath,
+      ownership,
+      startedAt: input.live.startedAt,
+      ...input.live.endpoint === void 0 ? {} : { endpoint: input.live.endpoint },
+      ...input.live.baseUrl === void 0 ? {} : { baseUrl: input.live.baseUrl },
+      ...input.live.remoteDebuggingUrl === void 0 ? {} : { remoteDebuggingUrl: input.live.remoteDebuggingUrl }
+    });
   }
-  return await response.json();
+  return buildLocalViewSessionId({
+    rootPath: input.rootPath,
+    ownership,
+    startedAt: input.live.startedAt,
+    pid: input.live.pid
+  });
 }
-async function isHttpEndpointReachable(url, timeoutMs) {
-  const response = await fetch(url, {
-    signal: AbortSignal.timeout(timeoutMs)
-  }).catch(() => null);
-  return response !== null;
+function createLocalViewSessionManifest(input) {
+  return {
+    layout: OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT,
+    version: OPENSTEER_LOCAL_VIEW_SESSION_VERSION,
+    sessionId: buildLocalViewSessionIdForRecord({
+      rootPath: input.rootPath,
+      live: input.live
+    }),
+    rootPath: input.rootPath,
+    ...input.workspace === void 0 ? {} : { workspace: input.workspace },
+    engine: input.live.engine,
+    ownership: input.ownership,
+    pid: input.live.pid,
+    startedAt: input.live.startedAt,
+    updatedAt: Date.now()
+  };
 }
-function buildBrowserWebSocketUrl(httpUrl, webSocketPath) {
-  const protocol = httpUrl.protocol === "https:" ? "wss:" : "ws:";
-  return `${protocol}//${httpUrl.host}${normalizeWebSocketPath(webSocketPath)}`;
+async function writeLocalViewSessionManifest(manifest) {
+  await ensureDirectory(resolveLocalViewSessionsDir());
+  await writeJsonFileAtomic(resolveLocalViewSessionManifestPath(manifest.sessionId), manifest);
 }
-function normalizeWebSocketPath(path15) {
-  return path15.startsWith("/") ? path15 : `/${path15}`;
+async function deleteLocalViewSessionManifest(sessionId) {
+  await promises.rm(resolveLocalViewSessionManifestPath(sessionId), { force: true }).catch(() => void 0);
 }
-function rewriteBrowserWebSocketHost(browserWsUrl, requestedUrl) {
-  try {
-    const parsed = new URL(browserWsUrl);
-    parsed.protocol = requestedUrl.protocol === "https:" ? "wss:" : "ws:";
-    parsed.hostname = requestedUrl.hostname;
-    parsed.port = requestedUrl.port;
-    return parsed.toString();
-  } catch {
-    return browserWsUrl;
+async function readLocalViewSessionManifest(sessionId) {
+  const manifestPath = resolveLocalViewSessionManifestPath(sessionId);
+  if (!await pathExists(manifestPath)) {
+    return void 0;
   }
+  const parsed = await readJsonFile(manifestPath);
+  return isPersistedLocalViewSessionManifest(parsed) ? parsed : void 0;
 }
-function readPort(url) {
-  const port = Number.parseInt(url.port, 10);
-  return Number.isInteger(port) && port > 0 ? port : void 0;
+async function listLocalViewSessionManifests() {
+  const directoryPath = resolveLocalViewSessionsDir();
+  const fileNames = await listJsonFiles(directoryPath);
+  const manifests = await Promise.all(
+    fileNames.map(async (fileName) => {
+      const parsed = await readJsonFile(
+        path12__default.default.join(directoryPath, fileName)
+      ).catch(() => void 0);
+      return isPersistedLocalViewSessionManifest(parsed) ? parsed : void 0;
+    })
+  );
+  return manifests.filter((manifest) => manifest !== void 0).sort(
+    (left, right) => left.startedAt - right.startedAt || left.sessionId.localeCompare(right.sessionId)
+  );
 }
-var DEFAULT_DISCOVERY_TIMEOUT_MS, DISCOVERY_FALLBACK_PORT, OpensteerAttachAmbiguousError;
-var init_cdp_discovery = __esm({
-  "src/local-browser/cdp-discovery.ts"() {
-    init_chrome_discovery();
-    DEFAULT_DISCOVERY_TIMEOUT_MS = 2e3;
-    DISCOVERY_FALLBACK_PORT = 9222;
-    OpensteerAttachAmbiguousError = class extends Error {
-      constructor(candidates) {
-        super(
-          "Multiple running Chromium DevTools endpoints were discovered. Specify the desired endpoint explicitly."
-        );
-        this.candidates = candidates;
-        this.name = "OpensteerAttachAmbiguousError";
-      }
-      code = "attach-ambiguous";
-    };
+function resolveLocalViewSessionManifestPath(sessionId) {
+  return path12__default.default.join(resolveLocalViewSessionsDir(), `${sessionId}.json`);
+}
+function isPersistedLocalViewSessionManifest(value) {
+  return value?.layout === OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT && value.version === OPENSTEER_LOCAL_VIEW_SESSION_VERSION && typeof value.sessionId === "string" && value.sessionId.length > 0 && typeof value.rootPath === "string" && value.rootPath.length > 0 && (value.engine === "playwright" || value.engine === "abp") && (value.ownership === "owned" || value.ownership === "attached" || value.ownership === "managed") && typeof value.pid === "number" && Number.isFinite(value.pid) && typeof value.startedAt === "number" && Number.isFinite(value.startedAt) && typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt);
+}
+var OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT, OPENSTEER_LOCAL_VIEW_SESSION_VERSION;
+var init_session_manifest = __esm({
+  "src/local-view/session-manifest.ts"() {
+    init_filesystem2();
+    init_live_session();
+    init_runtime_dir();
+    OPENSTEER_LOCAL_VIEW_SESSION_LAYOUT = "opensteer-local-view-session";
+    OPENSTEER_LOCAL_VIEW_SESSION_VERSION = 1;
   }
 });
 async function readLocalViewServiceState() {
@@ -2228,7 +2371,7 @@ var init_version = __esm({
   "../protocol/src/version.ts"() {
     init_json2();
     OPENSTEER_PROTOCOL_NAME = "opensteer";
-    OPENSTEER_PROTOCOL_COMPATIBILITY_REVISION = 2;
+    OPENSTEER_PROTOCOL_COMPATIBILITY_REVISION = 3;
     OPENSTEER_PROTOCOL_VERSION = `0.${OPENSTEER_PROTOCOL_COMPATIBILITY_REVISION}.0`;
     OPENSTEER_PROTOCOL_MEDIA_TYPE = `application/vnd.${OPENSTEER_PROTOCOL_NAME}+json;version=${OPENSTEER_PROTOCOL_VERSION}`;
     OPENSTEER_PROTOCOL_REST_BASE_PATH = `/api/v${OPENSTEER_PROTOCOL_COMPATIBILITY_REVISION}`;
@@ -2478,6 +2621,9 @@ var init_metadata = __esm({
       {
         pageRef: pageRefSchema,
         sessionRef: sessionRefSchema,
+        targetId: stringSchema({
+          description: "Underlying browser target identifier when available."
+        }),
         openerPageRef: pageRefSchema,
         url: stringSchema({
           description: "Current main-frame URL."
@@ -6252,14 +6398,14 @@ var init_interaction = __esm({
 function defineSemanticOperationSpec(spec) {
   return spec;
 }
-var opensteerComputerAnnotationNames, opensteerExposedSemanticOperationNames, opensteerPackageRunnableSemanticOperationNames, snapshotModeSchema, viewportSchema, opensteerBrowserLaunchOptionsSchema, attachBrowserOptionsSchema, opensteerBrowserOptionsSchema, opensteerBrowserContextOptionsSchema, targetByElementSchema2, targetByPersistSchema2, targetBySelectorSchema2, opensteerTargetInputSchema, opensteerResolvedTargetSchema, opensteerActionResultSchema, opensteerSnapshotCounterSchema, opensteerSessionStateSchema, opensteerOpenInputSchema, opensteerPageListInputSchema, opensteerPageListOutputSchema, opensteerPageNewInputSchema, opensteerPageActivateInputSchema, opensteerPageCloseInputSchema, opensteerPageCloseOutputSchema, opensteerPageGotoInputSchema, opensteerPageEvaluateInputSchema, opensteerPageEvaluateOutputSchema, opensteerAddInitScriptInputSchema, opensteerAddInitScriptOutputSchema, opensteerCapturedScriptSchema, opensteerCaptureScriptsInputSchema, opensteerCaptureScriptsOutputSchema, opensteerPageSnapshotInputSchema, opensteerPageSnapshotOutputSchema, opensteerComputerMouseButtonSchema, opensteerComputerKeyModifierSchema, opensteerDomClickInputSchema, opensteerDomHoverInputSchema, opensteerDomInputInputSchema, opensteerDomScrollInputSchema, opensteerExtractTemplateSchema, opensteerDomExtractInputSchema, jsonValueSchema2, opensteerDomExtractOutputSchema, opensteerSessionCloseInputSchema, opensteerSessionCloseOutputSchema, opensteerComputerAnnotationSchema, opensteerComputerClickActionSchema, opensteerComputerMoveActionSchema, opensteerComputerScrollActionSchema, opensteerComputerTypeActionSchema, opensteerComputerKeyActionSchema, opensteerComputerDragActionSchema, opensteerComputerScreenshotActionSchema, opensteerComputerWaitActionSchema, opensteerComputerActionSchema, opensteerComputerScreenshotOptionsSchema, opensteerComputerExecuteInputSchema, opensteerComputerTracePointSchema, opensteerComputerTraceEnrichmentSchema, opensteerComputerExecuteTimingSchema, opensteerComputerDisplayScaleSchema, opensteerComputerExecuteOutputSchema, opensteerSemanticOperationSpecificationsBase, exposedSemanticOperationNameSet, opensteerSemanticOperationSpecificationsInternal, opensteerSemanticOperationSpecifications, semanticRestBasePath;
+var opensteerComputerAnnotationNames, opensteerExposedSemanticOperationNames, opensteerPackageRunnableSemanticOperationNames, snapshotModeSchema, viewportSchema, opensteerBrowserLaunchOptionsSchema, attachBrowserOptionsSchema, opensteerBrowserOptionsSchema, opensteerBrowserContextOptionsSchema, targetByElementSchema2, targetByPersistSchema2, targetBySelectorSchema2, opensteerTargetInputSchema, opensteerActionResultSchema, opensteerSnapshotCounterSchema, opensteerNavigationSummarySchema, opensteerOpenInputSchema, opensteerPageListInputSchema, opensteerPageListOutputSchema, opensteerPageNewInputSchema, opensteerPageActivateInputSchema, opensteerPageCloseInputSchema, opensteerPageCloseOutputSchema, opensteerPageNewOutputSchema, opensteerPageGotoInputSchema, opensteerPageEvaluateInputSchema, opensteerPageEvaluateOutputSchema, opensteerAddInitScriptInputSchema, opensteerAddInitScriptOutputSchema, opensteerCapturedScriptSchema, opensteerCaptureScriptsInputSchema, opensteerCaptureScriptsOutputSchema, opensteerPageSnapshotInputSchema, opensteerPageSnapshotOutputSchema, opensteerComputerMouseButtonSchema, opensteerComputerKeyModifierSchema, opensteerDomClickInputSchema, opensteerDomHoverInputSchema, opensteerDomInputInputSchema, opensteerDomScrollInputSchema, opensteerExtractTemplateSchema, opensteerDomExtractInputSchema, jsonValueSchema2, opensteerDomExtractOutputSchema, opensteerSessionCloseInputSchema, opensteerSessionCloseOutputSchema, opensteerComputerAnnotationSchema, opensteerComputerClickActionSchema, opensteerComputerMoveActionSchema, opensteerComputerScrollActionSchema, opensteerComputerTypeActionSchema, opensteerComputerKeyActionSchema, opensteerComputerDragActionSchema, opensteerComputerScreenshotActionSchema, opensteerComputerWaitActionSchema, opensteerComputerActionSchema, opensteerComputerScreenshotOptionsSchema, opensteerComputerExecuteInputSchema, opensteerScreenshotSummarySchema, opensteerComputerExecuteOutputSchema, opensteerSemanticOperationSpecificationsBase, exposedSemanticOperationNameSet, opensteerSemanticOperationSpecificationsInternal, opensteerSemanticOperationSpecifications, semanticRestBasePath;
 var init_semantic = __esm({
   "../protocol/src/semantic.ts"() {
     init_json2();
+    init_binary_location();
     init_identity();
     init_geometry();
     init_metadata();
-    init_events();
     init_envelopes();
     init_snapshots();
     init_artifacts2();
@@ -6482,39 +6628,14 @@ var init_semantic = __esm({
         title: "OpensteerTargetInput"
       }
     );
-    opensteerResolvedTargetSchema = objectSchema(
-      {
-        pageRef: pageRefSchema,
-        frameRef: frameRefSchema,
-        documentRef: documentRefSchema,
-        documentEpoch: documentEpochSchema,
-        nodeRef: nodeRefSchema,
-        tagName: stringSchema(),
-        pathHint: stringSchema(),
-        persist: stringSchema(),
-        selectorUsed: stringSchema()
-      },
-      {
-        title: "OpensteerResolvedTarget",
-        required: [
-          "pageRef",
-          "frameRef",
-          "documentRef",
-          "documentEpoch",
-          "nodeRef",
-          "tagName",
-          "pathHint"
-        ]
-      }
-    );
     opensteerActionResultSchema = objectSchema(
       {
-        target: opensteerResolvedTargetSchema,
-        point: pointSchema
+        tagName: stringSchema({ minLength: 1 }),
+        persist: stringSchema({ minLength: 1 })
       },
       {
         title: "OpensteerActionResult",
-        required: ["target"]
+        required: ["tagName"]
       }
     );
     opensteerSnapshotCounterSchema = objectSchema(
@@ -6560,16 +6681,14 @@ var init_semantic = __esm({
         ]
       }
     );
-    opensteerSessionStateSchema = objectSchema(
+    opensteerNavigationSummarySchema = objectSchema(
       {
-        sessionRef: sessionRefSchema,
-        pageRef: pageRefSchema,
         url: stringSchema(),
         title: stringSchema()
       },
       {
-        title: "OpensteerSessionState",
-        required: ["sessionRef", "pageRef", "url", "title"]
+        title: "OpensteerNavigationSummary",
+        required: ["url", "title"]
       }
     );
     opensteerOpenInputSchema = objectSchema(
@@ -6633,8 +6752,19 @@ var init_semantic = __esm({
         pages: arraySchema(pageInfoSchema)
       },
       {
-        title: "OpensteerPageCloseOutput",
-        required: ["closedPageRef", "pages"]
+        title: "OpensteerPageCloseOutput",
+        required: ["closedPageRef", "pages"]
+      }
+    );
+    opensteerPageNewOutputSchema = objectSchema(
+      {
+        pageRef: pageRefSchema,
+        url: stringSchema(),
+        title: stringSchema()
+      },
+      {
+        title: "OpensteerPageNewOutput",
+        required: ["pageRef", "url", "title"]
       }
     );
     opensteerPageGotoInputSchema = objectSchema(
@@ -7023,72 +7153,28 @@ var init_semantic = __esm({
         required: ["action"]
       }
     );
-    opensteerComputerTracePointSchema = objectSchema(
-      {
-        role: enumSchema(["point", "start", "end"]),
-        point: pointSchema,
-        hitTest: hitTestResultSchema,
-        target: opensteerResolvedTargetSchema
-      },
-      {
-        title: "OpensteerComputerTracePoint",
-        required: ["role", "point"]
-      }
-    );
-    opensteerComputerTraceEnrichmentSchema = objectSchema(
-      {
-        points: arraySchema(opensteerComputerTracePointSchema)
-      },
-      {
-        title: "OpensteerComputerTraceEnrichment",
-        required: ["points"]
-      }
-    );
-    opensteerComputerExecuteTimingSchema = objectSchema(
+    opensteerScreenshotSummarySchema = objectSchema(
       {
-        actionMs: integerSchema({ minimum: 0 }),
-        waitMs: integerSchema({ minimum: 0 }),
-        totalMs: integerSchema({ minimum: 0 })
-      },
-      {
-        title: "OpensteerComputerExecuteTiming",
-        required: ["actionMs", "waitMs", "totalMs"]
-      }
-    );
-    opensteerComputerDisplayScaleSchema = objectSchema(
-      {
-        x: numberSchema({ exclusiveMinimum: 0 }),
-        y: numberSchema({ exclusiveMinimum: 0 })
+        payload: externalBinaryLocationSchema,
+        format: screenshotFormatSchema,
+        size: sizeSchema,
+        coordinateSpace: coordinateSpaceSchema,
+        clip: rectSchema
       },
       {
-        title: "OpensteerComputerDisplayScale",
-        required: ["x", "y"]
+        title: "OpensteerScreenshotSummary",
+        required: ["payload", "format", "size", "coordinateSpace"]
       }
     );
     opensteerComputerExecuteOutputSchema = objectSchema(
       {
-        action: opensteerComputerActionSchema,
-        pageRef: pageRefSchema,
-        screenshot: screenshotArtifactSchema,
-        displayViewport: viewportMetricsSchema,
-        nativeViewport: viewportMetricsSchema,
-        displayScale: opensteerComputerDisplayScaleSchema,
-        events: arraySchema(opensteerEventSchema),
-        timing: opensteerComputerExecuteTimingSchema,
-        trace: opensteerComputerTraceEnrichmentSchema
+        url: stringSchema(),
+        title: stringSchema(),
+        screenshot: opensteerScreenshotSummarySchema
       },
       {
         title: "OpensteerComputerExecuteOutput",
-        required: [
-          "action",
-          "pageRef",
-          "screenshot",
-          "displayViewport",
-          "nativeViewport",
-          "displayScale",
-          "events",
-          "timing"
-        ]
+        required: ["url", "title", "screenshot"]
       }
     );
     opensteerSemanticOperationSpecificationsBase = [
@@ -7096,7 +7182,7 @@ var init_semantic = __esm({
         name: "session.open",
         description: "Open or resume the current Opensteer session and primary page.",
         inputSchema: opensteerOpenInputSchema,
-        outputSchema: opensteerSessionStateSchema,
+        outputSchema: opensteerNavigationSummarySchema,
         requiredCapabilities: ["sessions.manage", "pages.manage"],
         resolveRequiredCapabilities: (input) => input.url === void 0 ? ["sessions.manage", "pages.manage"] : ["sessions.manage", "pages.manage", "pages.navigate"]
       }),
@@ -7111,7 +7197,7 @@ var init_semantic = __esm({
         name: "page.new",
         description: "Create and optionally navigate a new top-level page in the current session.",
         inputSchema: opensteerPageNewInputSchema,
-        outputSchema: opensteerSessionStateSchema,
+        outputSchema: opensteerPageNewOutputSchema,
         requiredCapabilities: ["pages.manage"],
         resolveRequiredCapabilities: (input) => input.url === void 0 ? ["pages.manage"] : ["pages.manage", "pages.navigate"]
       }),
@@ -7119,7 +7205,7 @@ var init_semantic = __esm({
         name: "page.activate",
         description: "Activate an existing top-level page in the current session.",
         inputSchema: opensteerPageActivateInputSchema,
-        outputSchema: opensteerSessionStateSchema,
+        outputSchema: opensteerNavigationSummarySchema,
         requiredCapabilities: ["pages.manage", "inspect.pages"]
       }),
       defineSemanticOperationSpec({
@@ -7133,7 +7219,7 @@ var init_semantic = __esm({
         name: "page.goto",
         description: "Navigate the current Opensteer page to a new URL.",
         inputSchema: opensteerPageGotoInputSchema,
-        outputSchema: opensteerSessionStateSchema,
+        outputSchema: opensteerNavigationSummarySchema,
         requiredCapabilities: ["pages.navigate"]
       }),
       defineSemanticOperationSpec({
@@ -8658,6 +8744,9 @@ var init_observations = __esm({
         this.store = store;
         this.sessionId = sessionId;
       }
+      configure(input) {
+        return this.store.configureSession(this.sessionId, input);
+      }
       append(input) {
         return this.store.appendEvent(this.sessionId, input);
       }
@@ -8688,40 +8777,14 @@ var init_observations = __esm({
         const sessionId = normalizeNonEmptyString("sessionId", input.sessionId);
         const openedAt = normalizeTimestamp("openedAt", input.openedAt ?? Date.now());
         const config = normalizeObservabilityConfig(input.config);
-        const redactor = createObservationRedactor(config);
-        this.redactors.set(sessionId, redactor);
-        const redactedLabels = redactor.redactLabels(config.labels);
-        const redactedTraceContext = redactor.redactTraceContext(config.traceContext);
-        await withFilesystemLock(this.sessionLockPath(sessionId), async () => {
-          const existing = await this.reconcileSessionManifest(sessionId);
-          if (existing === void 0) {
-            await ensureDirectory(this.sessionEventsDirectory(sessionId));
-            await ensureDirectory(this.sessionArtifactsDirectory(sessionId));
-            const session = {
-              sessionId,
-              profile: config.profile,
-              ...redactedLabels === void 0 ? {} : { labels: redactedLabels },
-              ...redactedTraceContext === void 0 ? {} : { traceContext: redactedTraceContext },
-              openedAt,
-              updatedAt: openedAt,
-              currentSequence: 0,
-              eventCount: 0,
-              artifactCount: 0
-            };
-            await writeJsonFileExclusive(this.sessionManifestPath(sessionId), session);
-            return;
-          }
-          const patched = {
-            ...existing,
-            profile: config.profile,
-            ...redactedLabels === void 0 ? {} : { labels: redactedLabels },
-            ...redactedTraceContext === void 0 ? {} : { traceContext: redactedTraceContext },
-            updatedAt: Math.max(existing.updatedAt, openedAt)
-          };
-          await writeJsonFileAtomic(this.sessionManifestPath(sessionId), patched);
-        });
+        await this.applySessionConfiguration(sessionId, config, openedAt);
         return new FilesystemSessionSink(this, sessionId);
       }
+      async configureSession(sessionId, input) {
+        const updatedAt = normalizeTimestamp("updatedAt", input.updatedAt ?? Date.now());
+        const config = normalizeObservabilityConfig(input.config);
+        await this.applySessionConfiguration(sessionId, config, updatedAt);
+      }
       async getSession(sessionId) {
         const manifestPath = this.sessionManifestPath(sessionId);
         if (!await pathExists(manifestPath)) {
@@ -8942,6 +9005,40 @@ var init_observations = __esm({
       sessionLockPath(sessionId) {
         return path12__default.default.join(this.sessionDirectory(sessionId), ".lock");
       }
+      async applySessionConfiguration(sessionId, config, timestamp) {
+        const redactor = createObservationRedactor(config);
+        this.redactors.set(sessionId, redactor);
+        const redactedLabels = redactor.redactLabels(config.labels);
+        const redactedTraceContext = redactor.redactTraceContext(config.traceContext);
+        await withFilesystemLock(this.sessionLockPath(sessionId), async () => {
+          const existing = await this.reconcileSessionManifest(sessionId);
+          if (existing === void 0) {
+            await ensureDirectory(this.sessionEventsDirectory(sessionId));
+            await ensureDirectory(this.sessionArtifactsDirectory(sessionId));
+            const session = {
+              sessionId,
+              profile: config.profile,
+              ...redactedLabels === void 0 ? {} : { labels: redactedLabels },
+              ...redactedTraceContext === void 0 ? {} : { traceContext: redactedTraceContext },
+              openedAt: timestamp,
+              updatedAt: timestamp,
+              currentSequence: 0,
+              eventCount: 0,
+              artifactCount: 0
+            };
+            await writeJsonFileExclusive(this.sessionManifestPath(sessionId), session);
+            return;
+          }
+          const patched = {
+            ...existing,
+            profile: config.profile,
+            ...redactedLabels === void 0 ? {} : { labels: redactedLabels },
+            ...redactedTraceContext === void 0 ? {} : { traceContext: redactedTraceContext },
+            updatedAt: Math.max(existing.updatedAt, timestamp)
+          };
+          await writeJsonFileAtomic(this.sessionManifestPath(sessionId), patched);
+        });
+      }
       async reconcileSessionManifest(sessionId) {
         const session = await this.getSession(sessionId);
         if (session === void 0) {
@@ -9800,6 +9897,7 @@ function toPersistedLocalBrowserSessionRecord(workspace, live) {
     version: 1,
     provider: "local",
     ...workspace === void 0 ? {} : { workspace },
+    ownership: live.ownership,
     engine: live.engine,
     ...live.endpoint === void 0 ? {} : { endpoint: live.endpoint },
     ...live.baseUrl === void 0 ? {} : { baseUrl: live.baseUrl },
@@ -9815,6 +9913,7 @@ function toPersistedLocalBrowserSessionRecord(workspace, live) {
 function toWorkspaceLiveBrowserRecord(record) {
   return {
     mode: "persistent",
+    ownership: getPersistedLocalBrowserSessionOwnership(record),
     engine: record.engine,
     ...record.endpoint === void 0 ? {} : { endpoint: record.endpoint },
     ...record.baseUrl === void 0 ? {} : { baseUrl: record.baseUrl },
@@ -9841,7 +9940,12 @@ function isAttachBrowserOptions(browser) {
 async function resolveAttachEndpoint(browser) {
   const endpoint = browser?.endpoint?.trim();
   if (endpoint && endpoint.length > 0) {
-    return endpoint;
+    const inspected = await inspectCdpEndpoint({
+      endpoint,
+      ...browser?.headers === void 0 ? {} : { headers: browser.headers },
+      timeoutMs: DEFAULT_TIMEOUT_MS
+    });
+    return inspected.endpoint;
   }
   const selection = await selectAttachBrowserCandidate({
     timeoutMs: DEFAULT_TIMEOUT_MS
@@ -10105,12 +10209,12 @@ async function waitForProcessExit(pid, timeoutMs) {
   }
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    if (!isProcessRunning(pid)) {
+    if (!isProcessRunning2(pid)) {
       return true;
     }
     await sleep2(50);
   }
-  return !isProcessRunning(pid);
+  return !isProcessRunning2(pid);
 }
 function resolveAbpSessionDir(workspace) {
   return path12__default.default.join(workspace.livePath, "abp-session");
@@ -10267,7 +10371,7 @@ var init_browser_manager = __esm({
         }
         const liveRecord = await this.readLivePersistentBrowser(await this.ensureWorkspaceStore());
         return {
-          mode: this.mode,
+          mode: liveRecord?.ownership === "attached" ? "attach" : this.mode,
           engine: liveRecord?.engine ?? this.engineName,
           ...this.workspace === void 0 ? {} : { workspace: this.workspace },
           live: liveRecord !== void 0
@@ -10395,6 +10499,7 @@ var init_browser_manager = __esm({
           });
           const liveRecord = {
             mode: "persistent",
+            ownership: "owned",
             engine: "abp",
             baseUrl: launched.baseUrl,
             remoteDebuggingUrl: launched.remoteDebuggingUrl,
@@ -10481,11 +10586,78 @@ var init_browser_manager = __esm({
       }
       async createAttachEngine() {
         const endpoint = await resolveAttachEndpoint(this.browserOptions);
-        return this.createAttachedEngine({
-          endpoint,
-          ...this.browserOptions?.headers === void 0 ? {} : { headers: this.browserOptions.headers },
-          freshTab: this.browserOptions?.freshTab ?? true,
-          onDispose: async () => void 0
+        if (this.workspace === void 0) {
+          return this.createAttachedEngine({
+            endpoint,
+            ...this.browserOptions?.headers === void 0 ? {} : { headers: this.browserOptions.headers },
+            freshTab: this.browserOptions?.freshTab ?? true,
+            onDispose: async () => void 0
+          });
+        }
+        const workspace = await this.ensureWorkspaceStore();
+        return workspace.lock(async () => {
+          const live = await this.readLivePersistentBrowser(workspace);
+          if (live) {
+            if (live.engine !== "playwright") {
+              throw new Error(
+                `workspace "${this.workspace}" already has a live ${live.engine} browser. Close it before attaching a Playwright browser.`
+              );
+            }
+            if (live.ownership !== "attached") {
+              throw new Error(
+                `workspace "${this.workspace}" already has a live Opensteer-owned browser. Close it before attaching another browser.`
+              );
+            }
+            if (live.endpoint === void 0) {
+              throw new Error("workspace live browser record is missing a DevTools endpoint.");
+            }
+            if (live.endpoint !== endpoint) {
+              throw new Error(
+                `workspace "${this.workspace}" is already attached to a different browser endpoint. Close it before reattaching.`
+              );
+            }
+            await bestEffortRegisterLocalViewSession({
+              rootPath: workspace.rootPath,
+              ...this.workspace === void 0 ? {} : { workspace: this.workspace },
+              live: toPersistedLocalBrowserSessionRecord(this.workspace, live),
+              ownership: "attached"
+            });
+            return this.createAttachedEngine({
+              endpoint: live.endpoint,
+              ...this.browserOptions?.headers === void 0 ? {} : { headers: this.browserOptions.headers },
+              freshTab: this.browserOptions?.freshTab ?? true,
+              onDispose: async () => void 0
+            });
+          }
+          const liveRecord = {
+            mode: "persistent",
+            ownership: "attached",
+            engine: "playwright",
+            endpoint,
+            pid: 0,
+            startedAt: Date.now(),
+            userDataDir: workspace.browserUserDataDir
+          };
+          await this.writeLivePersistentBrowser(workspace, liveRecord);
+          const persistedLiveRecord = toPersistedLocalBrowserSessionRecord(this.workspace, liveRecord);
+          await bestEffortRegisterLocalViewSession({
+            rootPath: workspace.rootPath,
+            ...this.workspace === void 0 ? {} : { workspace: this.workspace },
+            live: persistedLiveRecord,
+            ownership: "attached"
+          });
+          try {
+            return await this.createAttachedEngine({
+              endpoint,
+              ...this.browserOptions?.headers === void 0 ? {} : { headers: this.browserOptions.headers },
+              freshTab: this.browserOptions?.freshTab ?? true,
+              onDispose: async () => void 0
+            });
+          } catch (error) {
+            await this.unregisterLocalViewSessionForRecord(workspace.rootPath, persistedLiveRecord);
+            await clearPersistedSessionRecord(workspace.rootPath, "local").catch(() => void 0);
+            throw error;
+          }
         });
       }
       async createPersistentEngine() {
@@ -10505,7 +10677,7 @@ var init_browser_manager = __esm({
               rootPath: workspace.rootPath,
               ...this.workspace === void 0 ? {} : { workspace: this.workspace },
               live: toPersistedLocalBrowserSessionRecord(this.workspace, live),
-              ownership: "owned"
+              ownership: live.ownership
             });
             return this.createAttachedEngine({
               endpoint: live.endpoint,
@@ -10521,6 +10693,7 @@ var init_browser_manager = __esm({
           });
           const liveRecord = {
             mode: "persistent",
+            ownership: "owned",
             engine: "playwright",
             endpoint: launched.endpoint,
             pid: launched.pid,
@@ -10650,7 +10823,20 @@ var init_browser_manager = __esm({
         if (live === void 0) {
           return void 0;
         }
-        if (!isProcessRunning(live.pid)) {
+        if (live.ownership === "attached") {
+          const attachedRecord = toPersistedLocalBrowserSessionRecord(this.workspace, live);
+          if (!await isAttachedLocalBrowserSessionReachable(attachedRecord)) {
+            await this.unregisterLocalViewSessionForRecord(workspace.rootPath, attachedRecord);
+            await clearPersistedSessionRecord(workspace.rootPath, "local").catch(() => void 0);
+            return void 0;
+          }
+          return live;
+        }
+        if (!isProcessRunning2(live.pid)) {
+          await this.unregisterLocalViewSessionForRecord(
+            workspace.rootPath,
+            toPersistedLocalBrowserSessionRecord(this.workspace, live)
+          );
           await clearPersistedSessionRecord(workspace.rootPath, "local").catch(() => void 0);
           return void 0;
         }
@@ -10698,6 +10884,10 @@ var init_browser_manager = __esm({
           workspace.rootPath,
           toPersistedLocalBrowserSessionRecord(this.workspace, live)
         );
+        if (live.ownership === "attached") {
+          await clearPersistedSessionRecord(workspace.rootPath, "local").catch(() => void 0);
+          return;
+        }
         if (live.engine === "playwright") {
           if (live.endpoint !== void 0) {
             await requestBrowserClose(live.endpoint).catch(() => void 0);
@@ -10726,10 +10916,18 @@ var init_browser_manager = __esm({
       }
       async unregisterLocalViewSessionForRecord(rootPath, record) {
         await bestEffortUnregisterLocalViewSession(
-          buildLocalViewSessionId({
+          getPersistedLocalBrowserSessionOwnership(record) === "attached" ? buildLocalViewSessionId({
             rootPath,
-            pid: record.pid,
-            startedAt: record.startedAt
+            startedAt: record.startedAt,
+            ownership: "attached",
+            ...record.endpoint === void 0 ? {} : { endpoint: record.endpoint },
+            ...record.baseUrl === void 0 ? {} : { baseUrl: record.baseUrl },
+            ...record.remoteDebuggingUrl === void 0 ? {} : { remoteDebuggingUrl: record.remoteDebuggingUrl }
+          }) : buildLocalViewSessionId({
+            rootPath,
+            startedAt: record.startedAt,
+            ownership: "owned",
+            pid: record.pid
           })
         );
       }
@@ -10833,13 +11031,13 @@ async function resolveSessionSummary(manifest) {
   return {
     sessionId: manifest.sessionId,
     label: manifest.workspace ?? (path12__default.default.basename(manifest.rootPath) || manifest.sessionId),
-    status: isProcessRunning(record.pid) ? "live" : "stale",
+    status: getPersistedLocalBrowserSessionOwnership(record) === "attached" || isProcessRunning2(record.pid) ? "live" : "stale",
     ...manifest.workspace === void 0 ? {} : { workspace: manifest.workspace },
     rootPath: manifest.rootPath,
     engine: record.engine,
     ownership: manifest.ownership,
-    pid: record.pid,
     startedAt: record.startedAt,
+    ...record.pid > 0 ? { pid: record.pid } : {},
     ...browserName === void 0 ? {} : { browserName }
   };
 }
@@ -10867,7 +11065,16 @@ async function readLiveRecord(manifest) {
   if (!record) {
     return void 0;
   }
-  if (record.pid !== manifest.pid || record.startedAt !== manifest.startedAt || !isProcessRunning(record.pid)) {
+  if (buildLocalViewSessionIdForRecord({
+    rootPath: manifest.rootPath,
+    live: record
+  }) !== manifest.sessionId || record.startedAt !== manifest.startedAt || record.engine !== manifest.engine || getPersistedLocalBrowserSessionOwnership(record) !== manifest.ownership) {
+    return void 0;
+  }
+  if (getPersistedLocalBrowserSessionOwnership(record) === "attached") {
+    return await isAttachedLocalBrowserSessionReachable(record) ? record : void 0;
+  }
+  if (record.pid !== manifest.pid || !isProcessRunning2(record.pid)) {
     return void 0;
   }
   return record;
@@ -11161,6 +11368,172 @@ init_process_owner();
 init_service_state();
 init_service_state();
 
+// src/local-view/browser-target-order.ts
+async function readPageTargetId(page) {
+  const cdp = await page.context().newCDPSession(page);
+  try {
+    const result = await cdp.send("Target.getTargetInfo");
+    const targetId = result?.targetInfo?.targetId;
+    return typeof targetId === "string" && targetId.length > 0 ? targetId : null;
+  } finally {
+    await cdp.detach().catch(() => void 0);
+  }
+}
+async function readBrowserPageTargetOrder(browserContext) {
+  const browser = browserContext.browser();
+  if (!browser || !hasBrowserCdpSession(browser)) {
+    return [];
+  }
+  const cdp = await browser.newBrowserCDPSession();
+  try {
+    const result = await cdp.send("Target.getTargets");
+    return normalizeBrowserPageTargetOrder(result?.targetInfos ?? []);
+  } catch {
+    return [];
+  } finally {
+    await cdp.detach().catch(() => void 0);
+  }
+}
+async function orderPagesByBrowserTargetOrder(browserContext, pages) {
+  if (pages.length < 2) {
+    return pages;
+  }
+  const orderedTargetIds = await readBrowserPageTargetOrder(browserContext);
+  if (orderedTargetIds.length === 0) {
+    return pages;
+  }
+  const rankByTargetId = new Map(orderedTargetIds.map((targetId, index) => [targetId, index]));
+  const targetIds = await Promise.all(
+    pages.map((page) => readPageTargetId(page).catch(() => null))
+  );
+  return pages.map((page, index) => {
+    const targetId = targetIds[index] ?? void 0;
+    return {
+      page,
+      index,
+      rank: targetId === void 0 ? void 0 : rankByTargetId.get(targetId)
+    };
+  }).sort((left, right) => {
+    if (left.rank !== void 0 && right.rank !== void 0) {
+      return left.rank - right.rank;
+    }
+    if (left.rank !== void 0) {
+      return -1;
+    }
+    if (right.rank !== void 0) {
+      return 1;
+    }
+    return left.index - right.index;
+  }).map((entry) => entry.page);
+}
+function hasBrowserCdpSession(browser) {
+  return typeof browser.newBrowserCDPSession === "function";
+}
+function normalizeBrowserPageTargetOrder(targetInfos) {
+  const reversedPageInfos = [];
+  for (const targetInfo of targetInfos) {
+    if (targetInfo.type !== "page") {
+      continue;
+    }
+    const targetId = typeof targetInfo.targetId === "string" && targetInfo.targetId.length > 0 ? targetInfo.targetId : void 0;
+    if (targetId === void 0) {
+      continue;
+    }
+    reversedPageInfos.push({
+      targetId,
+      openerId: typeof targetInfo.openerId === "string" && targetInfo.openerId.length > 0 ? targetInfo.openerId : void 0
+    });
+  }
+  reversedPageInfos.reverse();
+  const rawTargetInfoById = new Map(
+    reversedPageInfos.map((targetInfo) => [targetInfo.targetId, targetInfo])
+  );
+  const targetInfoById = new Map(
+    reversedPageInfos.map(
+      (targetInfo) => [
+        targetInfo.targetId,
+        {
+          ...targetInfo,
+          openerId: resolveAcyclicOpenerId(targetInfo.targetId, rawTargetInfoById)
+        }
+      ]
+    )
+  );
+  const orderedTargetIds = [];
+  const placed = /* @__PURE__ */ new Set();
+  const placeTarget = (targetId) => {
+    if (placed.has(targetId)) {
+      return;
+    }
+    const targetInfo = targetInfoById.get(targetId);
+    if (!targetInfo) {
+      return;
+    }
+    const openerId = targetInfo.openerId;
+    if (openerId === void 0) {
+      orderedTargetIds.push(targetId);
+      placed.add(targetId);
+      return;
+    }
+    placeTarget(openerId);
+    const openerIndex = orderedTargetIds.indexOf(openerId);
+    const insertionIndex = openerIndex === -1 ? orderedTargetIds.length : findPopupInsertionIndex(orderedTargetIds, openerIndex, openerId, targetInfoById);
+    orderedTargetIds.splice(insertionIndex, 0, targetId);
+    placed.add(targetId);
+  };
+  for (const targetInfo of reversedPageInfos) {
+    placeTarget(targetInfo.targetId);
+  }
+  return orderedTargetIds;
+}
+function resolveAcyclicOpenerId(targetId, targetInfoById) {
+  const openerId = targetInfoById.get(targetId)?.openerId;
+  if (openerId === void 0 || !targetInfoById.has(openerId)) {
+    return void 0;
+  }
+  const visitedTargetIds = /* @__PURE__ */ new Set([targetId]);
+  let currentTargetId = openerId;
+  while (currentTargetId !== void 0) {
+    if (visitedTargetIds.has(currentTargetId)) {
+      return void 0;
+    }
+    visitedTargetIds.add(currentTargetId);
+    currentTargetId = targetInfoById.get(currentTargetId)?.openerId;
+  }
+  return openerId;
+}
+function findPopupInsertionIndex(orderedTargetIds, openerIndex, openerTargetId, targetInfoById) {
+  let index = openerIndex + 1;
+  while (index < orderedTargetIds.length) {
+    const candidateTargetId = orderedTargetIds[index];
+    if (!candidateTargetId || !isDescendantTarget(candidateTargetId, openerTargetId, targetInfoById)) {
+      break;
+    }
+    index += 1;
+  }
+  return index;
+}
+function isDescendantTarget(targetId, ancestorTargetId, targetInfoById) {
+  const visitedTargetIds = /* @__PURE__ */ new Set();
+  let currentTargetId = targetId;
+  while (currentTargetId !== void 0) {
+    if (visitedTargetIds.has(currentTargetId)) {
+      return false;
+    }
+    visitedTargetIds.add(currentTargetId);
+    const currentTargetInfo = targetInfoById.get(currentTargetId);
+    const openerId = currentTargetInfo?.openerId;
+    if (openerId === void 0) {
+      return false;
+    }
+    if (openerId === ancestorTargetId) {
+      return true;
+    }
+    currentTargetId = openerId;
+  }
+  return false;
+}
+
 // src/local-view/tab-state-tracker.ts
 var ACTIVATION_INTENT_DISCOVERY_GRACE_MS = 2e3;
 var TabStateTracker = class {
@@ -11176,6 +11549,7 @@ var TabStateTracker = class {
   boundContextCleanup = null;
   constructor(deps) {
     this.deps = deps;
+    this.lastActivePage = deps.initialActivePage ?? null;
   }
   start() {
     if (this.running) {
@@ -11300,7 +11674,7 @@ var TabStateTracker = class {
       this.updatePolling(pages.length);
       const preferredActivePage = this.lastActivePage ?? pages[0] ?? null;
       const pageStates = await Promise.all(
-        pages.map(async (page, index) => {
+        pages.map(async (page, originalIndex) => {
           const metadata = await this.readPageMetadata(page, {
             refresh: args.refreshMetadata
           });
@@ -11310,7 +11684,7 @@ var TabStateTracker = class {
           };
           return {
             page,
-            index,
+            originalIndex,
             targetId: metadata.targetId,
             url: page.url(),
             title: metadata.title,
@@ -11319,17 +11693,18 @@ var TabStateTracker = class {
           };
         })
       );
+      const orderedPageStates = await this.orderPageStates(pageStates);
       const activePage = this.pickActivePage(
-        pageStates,
+        orderedPageStates,
         this.lastActivePage,
         preferredActivePage,
-        this.resolveIntentPage(pageStates)
+        this.resolveIntentPage(orderedPageStates)
       );
       if (activePage && activePage !== this.lastActivePage) {
         this.lastActivePage = activePage;
         this.deps.onActivePageChanged(activePage);
       }
-      const tabs = pageStates.map((state) => ({
+      const tabs = orderedPageStates.map((state) => ({
         index: state.index,
         ...state.targetId === void 0 ? {} : { targetId: state.targetId },
         url: state.url,
@@ -11379,18 +11754,11 @@ var TabStateTracker = class {
     if (cached) {
       return cached;
     }
-    const cdp = await page.context().newCDPSession(page);
-    try {
-      const result = await cdp.send("Target.getTargetInfo");
-      const targetId = result?.targetInfo?.targetId;
-      if (typeof targetId === "string" && targetId.length > 0) {
-        this.targetIdByPage.set(page, targetId);
-        return targetId;
-      }
-      return null;
-    } finally {
-      await cdp.detach().catch(() => void 0);
+    const targetId = await readPageTargetId(page);
+    if (targetId) {
+      this.targetIdByPage.set(page, targetId);
     }
+    return targetId;
   }
   async readFocusState(page) {
     try {
@@ -11458,6 +11826,33 @@ var TabStateTracker = class {
     this.deps.runtimeState.clearPageActivationIntent(this.deps.sessionId, intent.targetId);
     return { page: matched.page };
   }
+  async orderPageStates(pageStates) {
+    if (pageStates.length < 2) {
+      return pageStates.map(({ originalIndex: _originalIndex, ...state }, index) => ({
+        ...state,
+        index
+      }));
+    }
+    const orderedTargetIds = await readBrowserPageTargetOrder(this.deps.browserContext);
+    const rankByTargetId = new Map(orderedTargetIds.map((targetId, index) => [targetId, index]));
+    return [...pageStates].sort((left, right) => {
+      const leftRank = left.targetId === void 0 ? void 0 : rankByTargetId.get(left.targetId);
+      const rightRank = right.targetId === void 0 ? void 0 : rankByTargetId.get(right.targetId);
+      if (leftRank !== void 0 && rightRank !== void 0) {
+        return leftRank - rightRank;
+      }
+      if (leftRank !== void 0) {
+        return -1;
+      }
+      if (rightRank !== void 0) {
+        return 1;
+      }
+      return left.originalIndex - right.originalIndex;
+    }).map(({ originalIndex: _originalIndex, ...state }, index) => ({
+      ...state,
+      index
+    }));
+  }
 };
 
 // src/local-view/view-stream-capture-policy.ts
@@ -11821,6 +12216,7 @@ var SessionViewStreamProducer = class {
       sessionId: this.deps.sessionId,
       pollMs: TAB_STATE_POLL_MS,
       runtimeState: this.deps.runtimeState,
+      initialActivePage: session.page,
       onActivePageChanged: (page) => {
         this.activePage = page;
         void this.queueBindToPage(page).catch(() => void 0);
@@ -11919,7 +12315,20 @@ var SessionViewStreamProducer = class {
       if (!context) {
         throw new Error("Connected browser did not expose a Chromium browser context.");
       }
-      const page = context.pages()[0] ?? await context.newPage();
+      const existingPages = context.pages();
+      if (existingPages.length === 0) {
+        const page2 = await context.newPage();
+        return {
+          browser,
+          context,
+          page: page2
+        };
+      }
+      const orderedPages = await orderPagesByBrowserTargetOrder(context, existingPages);
+      const page = await resolvePersistedActivePage(orderedPages, {
+        ...resolved.record.activePageUrl === void 0 ? {} : { activePageUrl: resolved.record.activePageUrl },
+        ...resolved.record.activePageTitle === void 0 ? {} : { activePageTitle: resolved.record.activePageTitle }
+      }) ?? orderedPages[0];
       return {
         browser,
         context,
@@ -12264,6 +12673,28 @@ async function disconnectPlaywrightChromiumBrowser(browser) {
   const { disconnectPlaywrightChromiumBrowser: disconnect } = await import('@opensteer/engine-playwright');
   await disconnect(browser);
 }
+async function resolvePersistedActivePage(pages, input) {
+  if (pages.length === 0) {
+    return null;
+  }
+  if (input.activePageUrl === void 0 && input.activePageTitle === void 0) {
+    return null;
+  }
+  const matchesByUrl = input.activePageUrl === void 0 ? pages : pages.filter((page) => page.url() === input.activePageUrl);
+  if (matchesByUrl.length === 0) {
+    return null;
+  }
+  if (input.activePageTitle === void 0) {
+    return matchesByUrl[0] ?? null;
+  }
+  for (const page of matchesByUrl) {
+    const title = await page.title().catch(() => "");
+    if (title === input.activePageTitle) {
+      return page;
+    }
+  }
+  return matchesByUrl[0] ?? null;
+}
 
 // src/local-view/server.ts
 var DEFAULT_MAX_FPS = 12;