opensteer 0.9.6 → 0.9.8

package/README.md

@@ -143,8 +143,8 @@ See the full [Workflow Guide](https://github.com/steerlabs/opensteer/blob/main/d
 
 ## Documentation
 
-| Resource                                           | Description                            |
-| -------------------------------------------------- | -------------------------------------- |
+| Resource                                                                                          | Description                            |
+| ------------------------------------------------------------------------------------------------- | -------------------------------------- |
 | [Package Guide](https://github.com/steerlabs/opensteer/blob/main/packages/opensteer/README.md)    | Full CLI and SDK reference             |
 | [Workflow Guide](https://github.com/steerlabs/opensteer/blob/main/docs/workflows.md)              | Discover-then-codify methodology       |
 | [Instrumentation Guide](https://github.com/steerlabs/opensteer/blob/main/docs/instrumentation.md) | Tracing and observability              |

package/dist/{chunk-3I3A5OLB.js → chunk-BPGXP3RF.js}

@@ -1,4 +1,4 @@
-import { writeLocalViewServiceState, CURRENT_PROCESS_OWNER, OPENSTEER_LOCAL_VIEW_SERVICE_VERSION, OPENSTEER_LOCAL_VIEW_SERVICE_LAYOUT, clearLocalViewServiceState, readLocalViewSessionManifest, listLocalViewSessionManifests, deleteLocalViewSessionManifest, isProcessRunning, pathExists, readPersistedLocalBrowserSessionRecord, inspectCdpEndpoint } from './chunk-T5P2QGZ3.js';
+import { writeLocalViewServiceState, CURRENT_PROCESS_OWNER, OPENSTEER_LOCAL_VIEW_SERVICE_VERSION, OPENSTEER_LOCAL_VIEW_SERVICE_LAYOUT, clearLocalViewServiceState, readLocalViewSessionManifest, listLocalViewSessionManifests, deleteLocalViewSessionManifest, getPersistedLocalBrowserSessionOwnership, isProcessRunning, pathExists, readPersistedLocalBrowserSessionRecord, buildLocalViewSessionIdForRecord, isAttachedLocalBrowserSessionReachable, inspectCdpEndpoint } from './chunk-GKYBP3KD.js';
 import { randomBytes } from 'crypto';
 import { createServer } from 'http';
 import { readFile } from 'fs/promises';
@@ -52,13 +52,13 @@ async function resolveSessionSummary(manifest) {
   return {
     sessionId: manifest.sessionId,
     label: manifest.workspace ?? (path2.basename(manifest.rootPath) || manifest.sessionId),
-    status: isProcessRunning(record.pid) ? "live" : "stale",
+    status: getPersistedLocalBrowserSessionOwnership(record) === "attached" || isProcessRunning(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 }
   };
 }
@@ -86,7 +86,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 || !isProcessRunning(record.pid)) {
     return void 0;
   }
   return record;
@@ -375,6 +384,172 @@ function safeCloseSocket(socket) {
   }
 }
 
+// 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 {
@@ -390,6 +565,7 @@ var TabStateTracker = class {
   boundContextCleanup = null;
   constructor(deps) {
     this.deps = deps;
+    this.lastActivePage = deps.initialActivePage ?? null;
   }
   start() {
     if (this.running) {
@@ -514,7 +690,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
           });
@@ -524,7 +700,7 @@ var TabStateTracker = class {
           };
           return {
             page,
-            index,
+            originalIndex,
             targetId: metadata.targetId,
             url: page.url(),
             title: metadata.title,
@@ -533,17 +709,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,
@@ -593,18 +770,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 {
@@ -672,6 +842,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
@@ -1035,6 +1232,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);
@@ -1133,7 +1331,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,
@@ -1478,6 +1689,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;
@@ -1661,7 +1894,7 @@ async function handleHttpRequest(args) {
       return;
     }
     const sessionId = decodeURIComponent(closeMatch[1]);
-    const { closeLocalViewSessionBrowser, LocalViewSessionCloseError } = await import('./session-control-U3L5H2ZI.js');
+    const { closeLocalViewSessionBrowser, LocalViewSessionCloseError } = await import('./session-control-FVKKD45R.js');
     try {
       await closeLocalViewSessionBrowser(sessionId);
     } catch (error) {
@@ -1796,5 +2029,5 @@ async function runLocalViewService() {
 }
 
 export { runLocalViewService };
-//# sourceMappingURL=chunk-3I3A5OLB.js.map
-//# sourceMappingURL=chunk-3I3A5OLB.js.map
+//# sourceMappingURL=chunk-BPGXP3RF.js.map
+//# sourceMappingURL=chunk-BPGXP3RF.js.map