chatgpt-pro-research 0.2.0 → 0.2.3

package/lib/client.js

@@ -34,8 +34,135 @@ var import_react = require("react");
 var RESEARCH_ICON = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-40 -76 200 200"><title>Anyvia R</title><defs><mask id="R-mono-black-standard-gap" maskUnits="userSpaceOnUse" x="-100" y="-100" width="400" height="400"><rect x="-100" y="-100" width="400" height="400" fill="white"/><path d="M77.18032292691355 52.74975779269961 A3 3 0 0 1 79.72446721538282 48.16 L108.02474889607315 48.16 A3 3 0 0 1 110.56889318454242 49.57024220730038 L139.21290427606598 95.41024220730039 A3 3 0 0 1 136.6687599875967 100 L108.36847830690638 100 A3 3 0 0 1 105.82433401843711 98.58975779269961 Z" transform="translate(-30 -12)" fill="black" stroke="black" stroke-width="6" stroke-linejoin="round"/></mask></defs><g mask="url(#R-mono-black-standard-gap)"><path d="M3.46 -40 H67 A39 39 0 0 1 67 38 H36.81354211962983 V84.54 Q36.81354211962983 88 33.35354211962983 88 H3.46 Q0 88 0 84.54 V-36.54 Q0 -40 3.46 -40 Z M36.81354211962983 -14 V12 H67 A13 13 0 0 0 67 -14 Z" fill="currentColor" fill-rule="evenodd"/></g><path d="M77.18032292691355 52.74975779269961 A3 3 0 0 1 79.72446721538282 48.16 L108.02474889607315 48.16 A3 3 0 0 1 110.56889318454242 49.57024220730038 L139.21290427606598 95.41024220730039 A3 3 0 0 1 136.6687599875967 100 L108.36847830690638 100 A3 3 0 0 1 105.82433401843711 98.58975779269961 Z" transform="translate(-30 -12)" fill="currentColor"/></svg>';
 var DESIGN_ICON = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-22.599456503942804 -56 200 200"><title>Anyvia X</title><defs><mask id="X-mono-black-standard-gap" maskUnits="userSpaceOnUse" x="-100" y="-100" width="400" height="400"><rect x="-100" y="-100" width="400" height="400" fill="white"/><path d="M77.18032292691355 52.74975779269961 A3 3 0 0 1 79.72446721538282 48.16 L108.02474889607315 48.16 A3 3 0 0 1 110.56889318454242 49.57024220730038 L139.21290427606598 95.41024220730039 A3 3 0 0 1 136.6687599875967 100 L108.36847830690638 100 A3 3 0 0 1 105.82433401843711 98.58975779269961 Z" transform="translate(-12 0)" fill="black" stroke="black" stroke-width="6" stroke-linejoin="round"/></mask></defs><g mask="url(#X-mono-black-standard-gap)"><path d="M89.67202319894069 -10.373520654246889 A3.46 3.46 0 0 1 92.60626961164192 -12 L127.85608887910462 -12 A3.46 3.46 0 0 1 130.79033529180586 -6.706479345753113 L65.12906379317373 98.37352065424689 A3.46 3.46 0 0 1 62.19481738047249 100 L26.94499811300981 100 A3.46 3.46 0 0 1 24.010751700308575 94.70647934575311 Z" fill="currentColor"/><path d="M28.027942559241307 -6.706479345753113 A3.46 3.46 0 0 1 30.96218897194254 -12 L58.17762652153973 -12 A3.46 3.46 0 0 1 61.111872934240964 -10.373520654246889 L91.78046072595076 38.70647934575311 A3.46 3.46 0 0 1 88.84621431324952 44 L61.63077676365233 44 A3.46 3.46 0 0 1 58.69653035095109 42.37352065424689 Z" fill="currentColor"/></g><path d="M77.18032292691355 52.74975779269961 A3 3 0 0 1 79.72446721538282 48.16 L108.02474889607315 48.16 A3 3 0 0 1 110.56889318454242 49.57024220730038 L139.21290427606598 95.41024220730039 A3 3 0 0 1 136.6687599875967 100 L108.36847830690638 100 A3 3 0 0 1 105.82433401843711 98.58975779269961 Z" transform="translate(-12 0)" fill="currentColor"/></svg>';
 
+// client/sidebar-status.ts
+var POLL_MS = 5e3;
+function countTopics(topics) {
+  const counts = { active: 0, completed: 0, failed: 0 };
+  for (const topic of topics) {
+    switch (topic.status) {
+      case "queued":
+      case "uploading":
+      case "submitted":
+      case "waiting":
+      case "answered":
+      case "adjudicating":
+        counts.active += 1;
+        break;
+      case "completed":
+        counts.completed += 1;
+        break;
+      case "failed":
+      case "stalled":
+        counts.failed += 1;
+        break;
+      default:
+        break;
+    }
+  }
+  return counts;
+}
+function badgeText(counts) {
+  const parts = [];
+  if (counts.active > 0) parts.push(`${counts.active} \u8FDB\u884C`);
+  if (counts.completed > 0) parts.push(`${counts.completed} \u5B8C\u6210`);
+  if (counts.failed > 0) parts.push(`${counts.failed} \u5931\u8D25`);
+  return parts.join(" \xB7 ");
+}
+function mountSidebarStatus(options) {
+  if (typeof document === "undefined") return () => {
+  };
+  let badge;
+  let text = "";
+  let disposed = false;
+  let polling = false;
+  let attachTimer;
+  let observer;
+  const rowFor = () => {
+    const buttons = document.querySelectorAll("button[aria-label]");
+    for (const button of buttons) {
+      if (button.getAttribute("aria-label") === options.label) return button;
+    }
+    return void 0;
+  };
+  const applyText = (next) => {
+    text = next;
+    if (badge !== void 0 && badge.textContent !== text) badge.textContent = text;
+    ensureMounted();
+  };
+  const ensureMounted = () => {
+    if (disposed) return;
+    if (text === "") {
+      badge?.remove();
+      badge = void 0;
+      return;
+    }
+    const row = rowFor();
+    if (row === void 0) return;
+    const title = row.querySelector('[class*="panelTitle"]');
+    if (title === null) {
+      badge?.remove();
+      badge = void 0;
+      return;
+    }
+    if (badge !== void 0 && badge.parentElement === row) {
+      if (badge.textContent !== text) badge.textContent = text;
+      return;
+    }
+    badge = document.createElement("span");
+    badge.dataset.dshProBadge = options.panelId;
+    badge.textContent = text;
+    badge.setAttribute("aria-hidden", "true");
+    badge.style.cssText = [
+      "margin-left:auto",
+      "display:inline-flex",
+      "align-items:center",
+      "flex:0 0 auto",
+      "font-size:10px",
+      "line-height:1",
+      "opacity:.62",
+      "white-space:nowrap",
+      "font-variant-numeric:tabular-nums",
+      "pointer-events:none"
+    ].join(";");
+    row.appendChild(badge);
+  };
+  const refresh = async () => {
+    if (disposed || polling) return;
+    polling = true;
+    try {
+      const response = await fetch(`${options.routes}/topics`, { headers: { accept: "application/json" } });
+      if (!response.ok) return;
+      const data = await response.json();
+      applyText(badgeText(countTopics(data.topics ?? [])));
+    } catch {
+    } finally {
+      polling = false;
+    }
+  };
+  observer = new MutationObserver(() => {
+    if (attachTimer !== void 0) return;
+    attachTimer = window.setTimeout(() => {
+      attachTimer = void 0;
+      ensureMounted();
+    }, 100);
+  });
+  observer.observe(document.body, { childList: true, subtree: true });
+  const timer = window.setInterval(() => {
+    void refresh();
+  }, POLL_MS);
+  void refresh();
+  return () => {
+    disposed = true;
+    window.clearInterval(timer);
+    if (attachTimer !== void 0) window.clearTimeout(attachTimer);
+    observer?.disconnect();
+    badge?.remove();
+    badge = void 0;
+  };
+}
+
 // client/panel.tsx
-var POLL_MS = 3e3;
+var POLL_MS2 = 3e3;
 var config = {
   routes: "/chatgpt-pro-research",
   panelId: "chatgpt-pro-research",
@@ -126,7 +253,7 @@ function Panel() {
     void loadList();
     const timer = setInterval(() => {
       void loadList();
-    }, POLL_MS);
+    }, POLL_MS2);
     return () => clearInterval(timer);
   }, [loadList]);
   (0, import_react.useEffect)(() => {
@@ -134,7 +261,7 @@ function Panel() {
     void loadDetail(selected);
     const timer = setInterval(() => {
       void loadDetail(selected);
-    }, POLL_MS);
+    }, POLL_MS2);
     return () => clearInterval(timer);
   }, [selected, loadDetail, topics]);
   const act = (0, import_react.useCallback)(async (action, conclusion) => {
@@ -315,6 +442,8 @@ function Icon({ kind }) {
 function apply(ctx) {
   ctx.slots.inject("main", () => ctx.slots.register({ name: "main", key: config.panelId }, () => (0, import_react.createElement)(Panel)));
   ctx.slots.inject("sidebar.panellist", () => ctx.slots.register({ name: "sidebar.panellist", id: config.panelId, order: 21, label: () => config.label }, () => (0, import_react.createElement)(Icon, { kind: config.icon })));
+  const disposeBadge = mountSidebarStatus({ label: config.label, routes: config.routes, panelId: config.panelId });
+  if (typeof ctx.effect === "function") ctx.effect(() => disposeBadge, `${config.panelId}: sidebar status badge`);
 }
 
 // client/index.tsx

package/lib/index.js

@@ -2,7 +2,7 @@
 
 // src/plugin.ts
 import { homedir } from "node:os";
-import { dirname as dirname2, extname, isAbsolute, join as join3, resolve as resolve2, sep } from "node:path";
+import { dirname as dirname2, extname, isAbsolute, join as join3, resolve as resolve3, sep } from "node:path";
 import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile2 } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import z from "@deepseek-ai/schemastery";
@@ -597,7 +597,7 @@ var ResearchEngine = class {
       if (this.active !== void 0) {
         await this.active.promise;
       } else {
-        await new Promise((resolve3) => setTimeout(resolve3, 0));
+        await new Promise((resolve4) => setTimeout(resolve4, 0));
       }
     }
   }
@@ -733,7 +733,9 @@ var ResearchEngine = class {
         try {
           return await this.options.transport.fetch({ submissionId });
         } catch (error) {
-          if (polled.answer !== void 0) return { answer: polled.answer };
+          if (polled.answer !== void 0) {
+            return { answer: polled.answer.startsWith("image:") ? "" : polled.answer };
+          }
           throw error;
         }
       }
@@ -838,14 +840,16 @@ ${result.summary}
     if (topic.status === "completed" || topic.status === "cancelled") return;
     if (error instanceof TransportError) {
       if (error.failure === "worker") {
-        await this.transition(topic, "failed");
+        await this.transition(topic, "failed", { stopReason: error.message });
         return;
       }
       const reason = error.failure === "login" || error.failure === "upload" || error.failure === "ui" ? error.failure : "timeout";
-      await this.transition(topic, "stalled", { stallReason: reason });
+      await this.transition(topic, "stalled", { stallReason: reason, stopReason: error.message });
       return;
     }
-    await this.transition(topic, "failed");
+    await this.transition(topic, "failed", {
+      stopReason: error instanceof Error ? error.message : String(error)
+    });
   }
   async transition(topic, next, extra) {
     assertTransition(topic.status, next);
@@ -901,7 +905,15 @@ var SELECTORS = {
     '[data-markdown-text-style="assistant-message"]',
     '[data-message-author-role="assistant"]'
   ].join(", "),
-  fileInput: 'input[type="file"]',
+  // The composer has several file inputs (camera, photos, videos). The general
+  // attachment input is the one without an `accept` filter; the camera input
+  // rejects multiple files.
+  fileInput: [
+    'input[type="file"][aria-label="\u9644\u52A0\u6587\u4EF6"]',
+    'input[type="file"][aria-label*="Attach" i]:not([capture])',
+    'form input[type="file"][multiple]:not([accept]):not([capture])',
+    'input[type="file"][multiple]:not([accept]):not([capture])'
+  ].join(", "),
   modelPicker: [
     'button[aria-label*="\u9009\u62E9 ChatGPT \u6A21\u578B"]',
     'button[aria-label*="\u6A21\u578B"]',
@@ -922,6 +934,16 @@ function advanceCompletion(previous, text, streaming) {
   return { lastText: text, stable: 1, answered: false };
 }
 
+// ../transport/src/assets.ts
+function parseDataUrlImage(source) {
+  const match = /^data:([^;,]+);base64,(.*)$/s.exec(source);
+  if (match === null) return void 0;
+  const mime = match[1];
+  const base64 = match[2];
+  if (mime === void 0 || base64 === void 0) return void 0;
+  return { mime, base64: base64.replace(/\s/g, "") };
+}
+
 // ../transport/src/chatgpt.ts
 function sha256(value) {
   return createHash3("sha256").update(value, "utf8").digest("hex");
@@ -947,6 +969,7 @@ async function firstVisible(page, selector, timeoutMs) {
 }
 var ChatGptWebTransport = class {
   context;
+  launching;
   submissions = /* @__PURE__ */ new Map();
   options;
   constructor(options) {
@@ -957,6 +980,15 @@ var ChatGptWebTransport = class {
   }
   async ensureContext() {
     if (this.context !== void 0) return this.context;
+    if (this.launching !== void 0) return this.launching;
+    this.launching = this.launchContext();
+    try {
+      return await this.launching;
+    } finally {
+      this.launching = void 0;
+    }
+  }
+  async launchContext() {
     await mkdir2(this.options.profileDir, { recursive: true });
     const base = {
       headless: this.options.headless ?? false,
@@ -964,7 +996,12 @@ var ChatGptWebTransport = class {
       args: ["--disable-blink-features=AutomationControlled"]
     };
     try {
-      this.context = await chromium.launchPersistentContext(this.options.profileDir, { ...base, channel: "chrome" });
+      const context = await chromium.launchPersistentContext(this.options.profileDir, { ...base, channel: "chrome" });
+      context.on("close", () => {
+        if (this.context === context) this.context = void 0;
+      });
+      this.context = context;
+      return context;
     } catch (error) {
       throw new TransportError(
         `cannot launch Chrome with profile ${this.options.profileDir}; install Google Chrome or pass browser.headless=false plus a Playwright browser. ${error instanceof Error ? error.message : String(error)}`,
@@ -972,7 +1009,6 @@ var ChatGptWebTransport = class {
         { cause: error }
       );
     }
-    return this.context;
   }
   async probe() {
     const context = await this.ensureContext();
@@ -1116,13 +1152,24 @@ ${attachments.join("\n")}`);
     const images = [];
     for (const [index, source] of sources.slice(0, 8).entries()) {
       try {
+        if (source.startsWith("data:")) {
+          const parsed = parseDataUrlImage(source);
+          if (parsed === void 0) continue;
+          if (Buffer.from(parsed.base64, "base64").byteLength < 2e4) continue;
+          images.push({
+            name: `image-${String(index + 1).padStart(2, "0")}.${extensionFor(parsed.mime)}`,
+            mime: parsed.mime,
+            base64: parsed.base64
+          });
+          continue;
+        }
         if (source.startsWith("blob:")) {
           const dataUrl = await page.evaluate(async (src) => {
             const response = await fetch(src);
             const blob = await response.blob();
-            return await new Promise((resolve3, reject) => {
+            return await new Promise((resolve4, reject) => {
               const reader = new FileReader();
-              reader.onload = () => resolve3(String(reader.result));
+              reader.onload = () => resolve4(String(reader.result));
               reader.onerror = () => reject(reader.error);
               reader.readAsDataURL(blob);
             });
@@ -1213,8 +1260,8 @@ ${attachments.join("\n")}`);
   async richAnswerText(page) {
     const text = await this.lastAssistantText(page);
     if (text !== "") return text;
-    const images = await page.evaluate(() => [...document.querySelectorAll("main img")].filter((image) => image.naturalWidth >= 300).map((image) => image.src));
-    return images.length > 0 ? `image:${images.join("|")}` : "";
+    const images = await page.evaluate(() => [...document.querySelectorAll("main img")].filter((image) => image.naturalWidth >= 300).map((image) => `${image.naturalWidth}x${image.naturalHeight}`));
+    return images.length > 0 ? `image:${images.length}:${images.join(",")}` : "";
   }
   async lastAssistantText(page) {
     const messages = page.locator(SELECTORS.assistantMessage);
@@ -1224,6 +1271,41 @@ ${attachments.join("\n")}`);
   }
 };
 
+// ../transport/src/shared.ts
+import { resolve as resolve2 } from "node:path";
+var REGISTRY = /* @__PURE__ */ Symbol.for("dsh-pro.transport.shared.v1");
+function registry() {
+  const holder = globalThis;
+  const existing = holder[REGISTRY];
+  if (existing instanceof Map) return existing;
+  const created = /* @__PURE__ */ new Map();
+  holder[REGISTRY] = created;
+  return created;
+}
+function acquireSharedTransport(options, create = () => new ChatGptWebTransport(options)) {
+  const key = resolve2(options.profileDir);
+  const slots = registry();
+  let slot = slots.get(key);
+  if (slot === void 0) {
+    slot = { transport: create(), refs: 0 };
+    slots.set(key, slot);
+  }
+  slot.refs += 1;
+  const target = slot;
+  let released = false;
+  return {
+    transport: target.transport,
+    release: () => {
+      if (released) return;
+      released = true;
+      target.refs -= 1;
+      if (target.refs > 0) return;
+      if (slots.get(key) === target) slots.delete(key);
+      void target.transport.close();
+    }
+  };
+}
+
 // src/plugin.ts
 var Config = z.object({
   rounds: z.number().step(1).min(1).max(10).default(3).description("\u6BCF\u4E3B\u9898\u9ED8\u8BA4\u8F6E\u6B21\u4E0A\u9650\uFF081\u201310\uFF09\u3002"),
@@ -1331,6 +1413,7 @@ var ProResearchService = class {
   stores = /* @__PURE__ */ new Map();
   topicSessions = /* @__PURE__ */ new Map();
   transport;
+  shared;
   rootFor(cwd) {
     return cwd.trim() === "" ? process.cwd() : cwd;
   }
@@ -1354,10 +1437,11 @@ var ProResearchService = class {
   }
   transportFor() {
     if (this.transport !== void 0) return this.transport;
-    this.transport = new ChatGptWebTransport({
+    this.shared = acquireSharedTransport({
       profileDir: this.config.browser.profileDir,
       headless: this.config.browser.headless
     });
+    this.transport = this.shared.transport;
     return this.transport;
   }
   judge() {
@@ -1532,8 +1616,8 @@ ${input.answer.slice(0, 3e4)}`
     if (entry === void 0) throw new Error(`unknown topic: ${id}`);
     const store = this.storeAt(entry.root, entry.mode);
     const dir = await store.dirOf(id);
-    const artifactsRoot = resolve2(dir, "artifacts");
-    const target = resolve2(dir, relativePath);
+    const artifactsRoot = resolve3(dir, "artifacts");
+    const target = resolve3(dir, relativePath);
     if (target !== artifactsRoot && !target.startsWith(`${artifactsRoot}${sep}`)) {
       throw new Error("artifact path escapes the topic");
     }
@@ -1611,7 +1695,7 @@ ${input.answer.slice(0, 3e4)}`
   withSources(cwd, refs) {
     return refs.map((ref) => ({
       ...ref,
-      source: isAbsolute(ref.path) ? ref.path : resolve2(cwd, ref.path)
+      source: isAbsolute(ref.path) ? ref.path : resolve3(cwd, ref.path)
     }));
   }
   withDesignCount(brief, designs) {
@@ -1686,7 +1770,9 @@ ${input.answer.slice(0, 3e4)}`
     };
   }
   dispose() {
-    void this.transport?.close();
+    this.shared?.release();
+    this.shared = void 0;
+    this.transport = void 0;
   }
 };
 function registerSkill(ctx, spec2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-pro-research",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "ChatGPT Pro Research: unattended multi-round research through a real ChatGPT Pro web session, with local records and a DSH sidebar.",
   "private": false,
   "type": "module",