@withbuddi/buddi 0.1.0-pre.37 → 0.1.0-pre.38

package/extension/background.js

@@ -229,10 +229,83 @@ function sentence(error) {
   return /[.!?]$/.test(trimmed) ? trimmed : `${trimmed}.`;
 }
 
+// src/bar.ts
+var OWNER_WAIT_MS = 3e4;
+var BAR_AFTER_MS = 3e3;
+var BAR_POLL_MS = 500;
+async function waitForOwner(probes, limits = {}) {
+  const waitMs = limits.waitMs ?? OWNER_WAIT_MS;
+  const barAfter = limits.barAfterMs ?? BAR_AFTER_MS;
+  const poll = limits.pollMs ?? BAR_POLL_MS;
+  const start = probes.now();
+  let shown = false;
+  const maxPolls = Math.ceil(waitMs / poll);
+  try {
+    for (let polls = 0; ; polls++) {
+      if (!await probes.watched()) return "left";
+      const elapsed = Math.max(probes.now() - start, polls * poll);
+      if (!shown && elapsed >= barAfter) {
+        shown = true;
+        await probes.show().catch(() => void 0);
+      }
+      if (shown) {
+        const choice = await probes.choice().catch(() => void 0);
+        if (choice) return choice;
+      }
+      if (elapsed >= waitMs || polls >= maxPolls) return "timeout";
+      await probes.wait(poll);
+    }
+  } finally {
+    if (shown) await probes.hide().catch(() => void 0);
+  }
+}
+function showBar(agent) {
+  const holder = globalThis;
+  holder["__buddiBar"] = { choice: void 0 };
+  const doc = globalThis.document;
+  if (!doc || doc.getElementById("buddi-working-bar")) return;
+  const host = doc.createElement("div");
+  host.id = "buddi-working-bar";
+  host.setAttribute("style", "position:fixed;top:0;left:0;right:0;z-index:2147483647;all:initial;");
+  const root = host.attachShadow({ mode: "closed" });
+  const bar = doc.createElement("div");
+  bar.setAttribute("role", "status");
+  bar.setAttribute("style", "position:fixed;top:0;left:0;right:0;display:flex;gap:12px;align-items:center;justify-content:flex-end;padding:6px 16px;font:13px/1.4 system-ui,-apple-system,sans-serif;background:#1f2a44;color:#fff;box-shadow:0 1px 4px rgba(0,0,0,.25);");
+  const label = doc.createElement("span");
+  label.textContent = `${agent || "buddi"} is working here`;
+  label.setAttribute("style", "margin-right:auto;");
+  const button = (text2, choice, primary) => {
+    const b = doc.createElement("button");
+    b.type = "button";
+    b.textContent = text2;
+    b.setAttribute("style", `font:inherit;cursor:pointer;border-radius:6px;padding:3px 10px;border:1px solid #fff;${primary ? "background:#fff;color:#1f2a44;" : "background:transparent;color:#fff;"}`);
+    b.addEventListener("click", () => {
+      holder["__buddiBar"] = { choice };
+    });
+    return b;
+  };
+  bar.append(label, button("Take over", "takeover", false), button("Let it continue", "continue", true));
+  root.append(bar);
+  (doc.documentElement ?? doc.body).append(host);
+}
+function readBar() {
+  const holder = globalThis;
+  const choice = holder["__buddiBar"]?.choice;
+  if (choice) holder["__buddiBar"] = { choice: void 0 };
+  return choice;
+}
+function hideBar() {
+  const doc = globalThis.document;
+  doc?.getElementById("buddi-working-bar")?.remove();
+  const holder = globalThis;
+  delete holder["__buddiBar"];
+}
+
 // src/commands.ts
 var TAKEN = "The owner took this tab; observe again to continue in a new one.";
 var MOVED = "This page has changed since that observation. Observe again.";
-var WATCHED = "You are looking at this tab. buddi only acts in background tabs; observe again to continue in a new one.";
+var WATCHED = "You are looking at this tab. buddi waited and asked in the tab; nothing was done.";
+var TAKEN_IN_TAB = "The owner took over this tab from the bar in it.";
 var GROUP_TITLE = "buddi";
 var MAX_FRAMES = 11;
 var MAX_TREE = 32e3;
@@ -427,14 +500,20 @@ var BrowserCommands = class {
   #uuid;
   #contentFile;
   #onFrame;
+  #onEvent;
+  /** Sessions the owner let carry on in a tab they are looking at, by tab id. */
+  #inView = /* @__PURE__ */ new Map();
   #now;
   #wait;
   /** How many things want the debugger on this tab. A screencast is one of them, and it outlives a command. */
   #attached = /* @__PURE__ */ new Map();
   #casts = /* @__PURE__ */ new Map();
   #castsByTab = /* @__PURE__ */ new Map();
+  #ownerWaitMs;
   constructor(chrome2, options = {}) {
     this.#chrome = chrome2;
+    this.#onEvent = options.onEvent ?? (() => void 0);
+    this.#ownerWaitMs = options.ownerWaitMs;
     this.#wait = options.wait ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
     this.#onFrame = options.onFrame ?? (() => void 0);
     this.#now = options.now ?? (() => Date.now());
@@ -499,6 +578,7 @@ var BrowserCommands = class {
     for (const session of [...this.#casts.keys()]) void this.#stopScreencast(session).catch(() => void 0);
     this.#sessions.clear();
     this.#refs.clear();
+    this.#inView.clear();
   }
   /* ---- sessions and tabs ---- */
   async #session(session) {
@@ -542,13 +622,50 @@ var BrowserCommands = class {
    * Reading a tab is harmless; typing into one the owner is reading is not.
    *
    * Unless the typing is theirs: a command marked `owner` came from the hand on
-   * the dashboard, and refusing it would refuse the owner their own browser.
+   * the dashboard. Otherwise, a tab the owner is looking at is waited on: up to
+   * thirty seconds for them to leave it, with the bar in the tab after three
+   * (Take over · Let it continue). Let it continue lets the agent act in view
+   * for as long as that tab stays the one; Take over tells the gateway, which
+   * hands the page to the owner exactly like the Canvas button.
    */
-  async #background(tab, owner = false) {
-    if (owner) return;
-    if (tab.active !== true || tab.windowId === void 0) return;
+  async #background(tab, command) {
+    if (command.owner) return;
+    if (tab.id === void 0 || !await this.#watched(tab.id)) return;
+    if (this.#inView.get(command.session) === tab.id) return;
+    const tabId = tab.id;
+    const outcome = await waitForOwner({
+      watched: () => this.#watched(tabId),
+      show: async () => {
+        await this.#chrome.scripting.executeScript({ target: { tabId }, func: showBar, args: ["buddi"] });
+      },
+      hide: async () => {
+        await this.#chrome.scripting.executeScript({ target: { tabId }, func: hideBar });
+      },
+      choice: async () => {
+        const [frame] = await this.#chrome.scripting.executeScript({ target: { tabId }, func: readBar });
+        const choice = frame?.result;
+        return choice === "continue" || choice === "takeover" ? choice : void 0;
+      },
+      wait: (ms) => this.#wait(ms),
+      now: () => this.#now()
+    }, this.#ownerWaitMs !== void 0 ? { waitMs: this.#ownerWaitMs } : {});
+    if (outcome === "left") return;
+    if (outcome === "continue") {
+      this.#inView.set(command.session, tabId);
+      return;
+    }
+    if (outcome === "takeover") {
+      this.#onEvent({ type: "event", name: "takeover", session: command.session });
+      throw new PreconditionError(TAKEN_IN_TAB);
+    }
+    throw new PreconditionError(WATCHED);
+  }
+  /** Is the owner looking at this tab right now: active, in a focused window? */
+  async #watched(tabId) {
+    const tab = await this.#chrome.tabs.get(tabId).catch(() => void 0);
+    if (!tab || tab.active !== true || tab.windowId === void 0) return false;
     const window = await this.#chrome.windows.get(tab.windowId).catch(() => void 0);
-    if (window?.focused) throw new PreconditionError(WATCHED);
+    return window?.focused === true;
   }
   /** Where the tab actually is now, which a redirect may have changed. */
   #liveUrl(tab) {
@@ -636,6 +753,7 @@ var BrowserCommands = class {
   }
   /** Closes this session's own tabs, and only the ones still in its group. */
   async #close(command, cancel) {
+    this.#inView.delete(command.session);
     const session = this.#sessions.get(command.session);
     if (!session) return {};
     const ids = [];
@@ -821,7 +939,7 @@ Scroll: ${scroll.x}, ${scroll.y}`.slice(0, MAX_TREE);
     const ref = this.#ref(command.session, session, command.args["target"]);
     const tab = await this.#ownTab(session, ref.tabKey);
     if (ref.frameId === 0 && this.#liveUrl(tab) !== ref.docUrl) throw new PreconditionError(MOVED);
-    await this.#background(tab, command.owner);
+    await this.#background(tab, command);
     cancel.check();
     return { ref, tab };
   }
@@ -1006,7 +1124,7 @@ Scroll: ${scroll.x}, ${scroll.y}`.slice(0, MAX_TREE);
       await this.#stopScreencast(command.session);
       throw new PreconditionError(TAKEN);
     }
-    await this.#background(tab, command.owner);
+    await this.#background(tab, command);
     const event = inputEvent(command.args);
     cancel.check();
     cancel.dispatch();
@@ -1060,7 +1178,7 @@ Scroll: ${scroll.x}, ${scroll.y}`.slice(0, MAX_TREE);
     const ref = this.#ref(command.session, session, { ref: str(command.args, "ref") });
     const tab = await this.#ownTab(session, ref.tabKey);
     if (ref.frameId === 0 && this.#liveUrl(tab) !== ref.docUrl) throw new PreconditionError(MOVED);
-    await this.#background(tab, command.owner);
+    await this.#background(tab, command);
     cancel.check();
     const [frame] = await this.#chrome.scripting.executeScript({
       target: { tabId: ref.tabId, frameIds: [ref.frameId] },
@@ -1088,7 +1206,7 @@ Scroll: ${scroll.x}, ${scroll.y}`.slice(0, MAX_TREE);
     if (value === "") throw new PreconditionError("The fill arrived with nothing in it.");
     const tab = await this.#ownTab(session, ref.tabKey);
     if (ref.frameId === 0 && this.#liveUrl(tab) !== ref.docUrl) throw new PreconditionError(MOVED);
-    await this.#background(tab, command.owner);
+    await this.#background(tab, command);
     cancel.check();
     cancel.dispatch();
     const [frame] = await this.#chrome.scripting.executeScript({
@@ -1148,7 +1266,7 @@ Scroll: ${scroll.x}, ${scroll.y}`.slice(0, MAX_TREE);
     if (!observed || observed.generation !== session.generation) throw new PreconditionError("Stale page observation. Observe again before scrolling.");
     const tab = await this.#ownTab(session, observed.tabKey);
     if (this.#liveUrl(tab) !== observed.url) throw new PreconditionError(MOVED);
-    await this.#background(tab, command.owner);
+    await this.#background(tab, command);
     const tabId = tab.id;
     const direction = str(command.args, "direction") === "up" ? "up" : "down";
     cancel.check();
@@ -1310,7 +1428,7 @@ function flush(open) {
     }
   }
 }
-var commands = new BrowserCommands(chrome, { onFrame: send });
+var commands = new BrowserCommands(chrome, { onFrame: send, onEvent: send });
 var attempt = 0;
 var timer;
 var silence;

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "buddi",
-  "version": "0.1.0.37",
+  "version": "0.1.0.38",
   "description": "Lets your buddi work in background tabs of this browser. The sites it opens are the ones you ask it for; it opens none on its own.",
   "minimum_chrome_version": "116",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwR4JT/OlKKPcZQ33euO9mSv7RrSIWNVanldhT2Uzc9YfzF/X0lg5NfXLc+G/UGFjB8v+uMCbpMhRBZ2SVwDHQH3buv3VEUzuOIDTPHgv99T5lq5imZrDxmIE+EL/fWrsjhcXaIB4e4fn0tJqw6ivJUGmYpG5XhWn65nlLniHfFBKMpZ/y7bVnvfzAgMQUa13qTAVxPTpMRtNl/flQq4Q/vWYm28H7W7OzygDV+/4X2azUrB8yPk67QsipbdDLxiX2GMxjXuKK6iD5CQiytoxTsAqUzB886HbOZsxJfQpRIjrUgBmGjLyaKuz617ZGJW9zS23LmnlL6mkX3+ggca1AQIDAQAB",
@@ -38,5 +38,5 @@
     "48": "icons/48.png",
     "128": "icons/128.png"
   },
-  "version_name": "0.1.0-pre.37"
+  "version_name": "0.1.0-pre.38"
 }