chatgpt-pro-research 0.2.0 → 0.2.1

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));
       }
     }
   }
@@ -838,14 +838,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 +903,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"]',
@@ -947,6 +957,7 @@ async function firstVisible(page, selector, timeoutMs) {
 }
 var ChatGptWebTransport = class {
   context;
+  launching;
   submissions = /* @__PURE__ */ new Map();
   options;
   constructor(options) {
@@ -957,6 +968,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 +984,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 +997,6 @@ var ChatGptWebTransport = class {
         { cause: error }
       );
     }
-    return this.context;
   }
   async probe() {
     const context = await this.ensureContext();
@@ -1120,9 +1144,9 @@ ${attachments.join("\n")}`);
           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);
             });
@@ -1224,6 +1248,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 +1390,7 @@ var ProResearchService = class {
   stores = /* @__PURE__ */ new Map();
   topicSessions = /* @__PURE__ */ new Map();
   transport;
+  shared;
   rootFor(cwd) {
     return cwd.trim() === "" ? process.cwd() : cwd;
   }
@@ -1354,10 +1414,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 +1593,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 +1672,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 +1747,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.1",
   "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",