@bsbofmusic/cdper-doubao 1.0.2 → 1.0.4

package/README.md

@@ -11,9 +11,9 @@ npm install -g @bsbofmusic/cdper-doubao
 Requirements:
 
 - Node.js 18+
-- CDP Bridge running on the user's browser host
-- Doubao logged in in that browser profile
-- CDP WS configured through `CDP_WS`, `~/.cdp-auth.json`, or `~/.cdp-bridge/config.json`
+- A real Chrome/Edge profile with Doubao logged in
+- Either local Chrome DevTools on `127.0.0.1:9222` or a remote CDP Bridge
+- Optional explicit CDP WS through `CDP_WS`, `~/.cdp-auth.json`, or `~/.cdp-bridge/config.json`
 
 ## Use
 
@@ -54,6 +54,17 @@ const result = await queryDoubao('请用一句话回答：1+1等于几？', {
 });
 ```
 
+
+## Release notes — 1.0.3
+
+- Depends on `@bsbofmusic/cdper-core@^1.2.7`, so `status --json` correctly reports healthy local CDP as `ok=true`.
+- Removed the dead `url-action` query branch from the live Doubao query path. Fresh/followup queries now consistently use the composer path: open clean Doubao home, switch `快速 → 专家`, insert prompt text, click send, and verify submission.
+- Kept `url-action` only as a URL-pattern guard for conversation-id parsing (`/chat/url-action` is not a real followup anchor).
+- Pack/install smoke was verified from the generated tarball in an isolated npm prefix before publish.
+
+Design note: Doubao link reading is more reliable when URLs are included in the composer prompt and handled by the page’s native preview/search flow. A hidden url-action branch created false confidence and made fallback logic unreachable.
+
+---
 ## Security
 
-All browser control happens through the user's CDP Bridge. Tokens are redacted from diagnostic output. Do not commit `CDP_WS` or full WebSocket URLs containing `token=`.
+All browser control happens through the user's real browser via local CDP or CDP Bridge. Tokens are redacted from diagnostic output. Do not commit `CDP_WS` or full WebSocket URLs containing `token=`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsbofmusic/cdper-doubao",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Standalone Doubao CLI controlled through a user's real Chrome/Edge via CDP Bridge",
   "type": "commonjs",
   "main": "src/public-api.js",
@@ -39,7 +39,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@bsbofmusic/cdper-core": "^1.2.6",
+    "@bsbofmusic/cdper-core": "~1.2.8",
     "yargs": "^17.7.2"
   }
-}
+}

package/src/doubao.js

@@ -12,8 +12,8 @@ const { runState } = require('@bsbofmusic/cdper-core/state_machine');
 const { getRuntimeStatus } = require('@bsbofmusic/cdper-core/runtime_status');
 const { WRAPPER_STATUSES, buildWrapperResult } = require('@bsbofmusic/cdper-core/wrapper_result');
 const {
-  randomInt, humanPause, withLocalTimeout, withAbortableTimeout, throwIfAborted, ensureMinimumPageDwell, humanWarmup,
-  computeSendTimeoutMs, computeTypingDelay, shouldUseDirectTextInsert, insertTextViaCdp,
+  randomInt, humanPause, withLocalTimeout, throwIfAborted, ensureMinimumPageDwell, humanWarmup,
+  computeSendTimeoutMs, insertTextViaCdp,
   buildWaitPlan, createProgressRecorder,
   resolveConversationPolicy, buildConversationAnchor,
   prefersShortAnswer, handlePluginQueryError,
@@ -22,7 +22,6 @@ const {
 
 const PLATFORM = 'doubao';
 const STATE_TIMEOUTS = { open: 150000, ensure_session: 30000, ensure_mode: 45000, send: 45000, extract: 10000 };
-const FALLBACK_TIMEOUT_MS = 90000;
 const WAIT_PROFILES = {
   short:     { minWait: 8000,  maxWait: 90000,          maxExtends: 2,  pollInterval: 2500 },
   normal:    { minWait: 12000, maxWait: 300000,          maxExtends: 6,  pollInterval: 2500 },
@@ -30,40 +29,11 @@ const WAIT_PROFILES = {
   very_long: { minWait: 30000, maxWait: 45 * 60 * 1000, maxExtends: 10, pollInterval: 2500 },
 };
 
-function directActionMode(mode) {
-  return mode === 'quick' ? 'quick' : 'deep';
-}
-
-function buildDoubaoUrlAction(queryText, mode = 'deep') {
-  const payload = { text: String(queryText || '') };
-  const action = { pluginId: 'Send_Message', payload };
-  if (directActionMode(mode) === 'deep') {
-    payload.extraExt = {
-      input_skill: JSON.stringify({ skill_type: 20 }),
-      use_deep_think: '1',
-    };
-    action.options = {
-      deepThinkingActiveType: '2',
-      superTaskStatus: { switchValue: 0, taskMode: 0, safeToken: '' },
-    };
-  }
-  const url = new URL('https://www.doubao.com/chat/url-action');
-  url.searchParams.set('action', JSON.stringify(action));
-  return url.toString();
-}
-
 function emptyDoubaoSnapshot() {
   return { text: '', normalized: '', length: 0, candidateCount: 0 };
 }
 
-function buildDoubaoModeState(usedUrlAction, urlActionMode, expertModeConfirmed) {
-  if (usedUrlAction) {
-    return {
-      modePath: urlActionMode === 'quick' ? 'url_action_quick' : 'url_action_deep',
-      modeConfirmed: true,
-      modeConfidence: 'high',
-    };
-  }
+function buildDoubaoModeState(expertModeConfirmed) {
   return {
     modePath: expertModeConfirmed ? 'composer_expert' : 'composer_quick',
     modeConfirmed: Boolean(expertModeConfirmed),
@@ -369,68 +339,6 @@ async function openDoubaoHome(page, sessionId) {
   throw new Error('Doubao 页面未准备好：输入框未出现');
 }
 
-async function getDoubaoDirectState(page) {
-  return page.evaluate(() => {
-    const bodyText = document.body?.innerText || '';
-    const inputs = Array.from(document.querySelectorAll('textarea, [contenteditable="true"], [role="textbox"]'));
-    const input = inputs.find((element) => {
-      const rect = element.getBoundingClientRect();
-      return rect.width >= 80 && rect.height >= 20 && element.getAttribute('aria-hidden') !== 'true' && !element.disabled;
-    });
-    const inputText = String(input?.value || input?.innerText || input?.textContent || '').trim();
-    const isVisible = (element) => {
-      if (!element) return false;
-      const rect = element.getBoundingClientRect();
-      const style = window.getComputedStyle(element);
-      return rect.width > 0 && rect.height > 0 && style.visibility !== 'hidden' && style.display !== 'none' && element.getAttribute('aria-hidden') !== 'true';
-    };
-    const stopButton = Array.from(document.querySelectorAll('button,[role="button"]')).find((button) => {
-      if (!isVisible(button) || button.disabled || button.getAttribute('aria-disabled') === 'true') return false;
-      const text = button.innerText || '';
-      const aria = button.getAttribute('aria-label') || '';
-      return /停止生成|停止回答|Stop generating|stop-button/i.test(`${text} ${aria}`) || !!button.querySelector('svg[icon="stop"]');
-    });
-    const loading = Array.from(document.querySelectorAll('[class*="loading"], [class*="spinner"], [class*="skeleton"]')).find((element) => isVisible(element) && /loading|spinner|生成中|思考中|回答中/i.test(String(element.className || '') + ' ' + (element.innerText || '')));
-    const replyContainers = Array.from(document.querySelectorAll('[class*="flow-markdown-body"], [class*="container-P2rR72"], [class*="mdbox-theme"], [class*="message"], [class*="response"], [class*="answer"], .prose'))
-      .filter((element) => {
-        const cls = String(element.className || '');
-        if (/message-list|suggest|recommend|bg-g-send/i.test(cls)) return false;
-        const rect = element.getBoundingClientRect();
-        const text = (element.innerText || '').trim();
-        return rect.width > 0 && rect.height > 0 && text && !/历史对话|内容由豆包 AI 生成/.test(text);
-      });
-    return {
-      url: location.href,
-      title: document.title || '',
-      bodySample: bodyText.slice(0, 1200),
-      hasInput: !!input,
-      inputText,
-      isGenerating: !!stopButton || !!loading,
-      candidateCount: replyContainers.length,
-      unavailable: bodyText.includes('该页面暂时不可用'),
-    };
-  });
-}
-
-async function openDoubaoUrlAction(page, queryText, mode, sessionId) {
-  const targetUrl = buildDoubaoUrlAction(queryText, mode);
-  await page.goto(targetUrl, { timeout: 60000, waitUntil: 'domcontentloaded' });
-  await humanPause(1800, 3800);
-  await recoverDoubaoUnavailablePage(page);
-  await assertNoChallenge(page, sessionId);
-  const deadline = Date.now() + 30000;
-  let state = null;
-  while (Date.now() < deadline) {
-    state = await getDoubaoDirectState(page);
-    if (state.unavailable) await recoverDoubaoUnavailablePage(page);
-    if (state.candidateCount > 0 || state.isGenerating) return { accepted: true, needsManualSubmit: false, state, url: targetUrl };
-    if (state.hasInput && state.inputText) return { accepted: false, needsManualSubmit: true, state, url: targetUrl };
-    await humanPause(400, 800);
-  }
-  state = state || await getDoubaoDirectState(page).catch(() => null);
-  return { accepted: false, needsManualSubmit: true, state, url: targetUrl };
-}
-
 async function hasDoubaoConversationContent(page) {
   const snapshot = await captureDoubaoReplySnapshot(page).catch(() => null);
   return Number(snapshot?.length || 0) > 0;
@@ -635,7 +543,7 @@ async function switchToExpert(page, sessionId) {
 
 // ─── Main query ───────────────────────────────────────────────────────────────
 async function queryDoubao(queryText, opts = {}) {
-  const { mode = 'expert', sessionId, _retried = false, _quickFallback = false } = opts;
+  const { mode = 'expert', sessionId, _retried = false } = opts;
   const abortSignal = opts.abortSignal || null;
   const fallbackMeta = opts._fallbackMeta || null;
   throwIfAborted(abortSignal, 'Doubao query');
@@ -654,9 +562,6 @@ async function queryDoubao(queryText, opts = {}) {
   let initialReplySnapshot = null;
   let inputReadyAfterOpen = false;
   let promptSubmitted = false;
-  let usedUrlAction = false;
-  let urlActionNeedsManualSubmit = false;
-  let urlActionMode = directActionMode(mode);
   let expertModeConfirmed = false;
   let page, browser;
 
@@ -713,7 +618,6 @@ async function queryDoubao(queryText, opts = {}) {
 
     throwIfAborted(abortSignal, 'Doubao query');
     await runState(flow, 'ensure_session', async () => {
-      if (usedUrlAction && promptSubmitted) return;
       if (inputReadyAfterOpen && await hasDoubaoInput(page, 1800)) return;
       const existingInput = await hasDoubaoInput(page, 12000);
       if (!existingInput) {
@@ -730,46 +634,29 @@ async function queryDoubao(queryText, opts = {}) {
 
     throwIfAborted(abortSignal, 'Doubao query');
     expertModeConfirmed = await runState(flow, 'ensure_mode', async () => {
-      // If url-action already auto-submitted the prompt server-side, mode
-      // switching is too late for the current query — skip gracefully.
-      if (usedUrlAction && promptSubmitted && !urlActionNeedsManualSubmit) return false;
-      // For all other cases (including url-action that still needs manual
-      // submission), verify and switch to expert mode via the 快速→专家 menu.
+      // Fresh/followup queries always use the composer path; verify and switch
+      // to expert mode via the 快速→专家 menu before sending.
       const confirmed = await switchToExpert(page, session.sessionId);
       await assertNoChallenge(page, session.sessionId);
       if (confirmed) await waitForDoubaoModeSettled(page, { timeoutMs: 6000, sessionId: session.sessionId }).catch(() => false);
       return confirmed;
     }, { timeoutMs: STATE_TIMEOUTS.ensure_mode });
-    log('INFO', '[doubao]', { component: 'doubao', plugin: 'cdper-doubao', session_id: session.sessionId, step: 'flow', action: 'stage_complete', stage: 'ensure_mode', status: 'ok', ...buildDoubaoModeState(usedUrlAction, urlActionMode, expertModeConfirmed), ...(usedUrlAction ? {} : { expertModeConfirmed }) });
-    // Block sending only when expert mode could not be confirmed and the
-    // prompt hasn't already been submitted.  Already-submitted url-action
-    // prompts cannot be un-sent, so we let them through.
-    const modeBlockingBypass = usedUrlAction && promptSubmitted && !urlActionNeedsManualSubmit;
-    if (!modeBlockingBypass && !expertModeConfirmed) {
+    log('INFO', '[doubao]', { component: 'doubao', plugin: 'cdper-doubao', session_id: session.sessionId, step: 'flow', action: 'stage_complete', stage: 'ensure_mode', status: 'ok', ...buildDoubaoModeState(expertModeConfirmed), expertModeConfirmed });
+    // Block sending when expert mode could not be confirmed; composer path
+    // should not silently degrade into the quick model.
+    if (!expertModeConfirmed) {
       log('WARN', '[doubao]', { component: 'doubao', plugin: 'cdper-doubao', session_id: session.sessionId, step: 'mode', action: 'expert_confirm', status: 'blocked', message: '未确认进入专家模式，停止发送以避免错误模式输出' });
       throw new Error('Doubao 专家模式未确认，需要人工接管');
     }
 
     throwIfAborted(abortSignal, 'Doubao query');
     await runState(flow, 'send', async () => {
-      if (usedUrlAction) {
-        if (!initialReplySnapshot) initialReplySnapshot = emptyDoubaoSnapshot();
-        if (promptSubmitted && !urlActionNeedsManualSubmit) {
-          flow.enter('send', { submitVerified: true, submitSignal: 'url_action_accepted', submitElapsed: 0, mode: urlActionMode });
-          log('INFO', '[doubao]', { component: 'doubao', plugin: 'cdper-doubao', session_id: session.sessionId, step: 'query', action: 'submit', status: 'ok', message: '问题已通过 url-action 发送' });
-          return;
-        }
-      }
       const input = await hasDoubaoInput(page, 18000);
       if (!input) throw new Error('Doubao 输入框未就绪');
       await assertNoChallenge(page, session.sessionId);
-      if (!usedUrlAction) {
-        initialReplySnapshot = await captureDoubaoReplySnapshot(page).catch(() => null);
-        await clearDoubaoInput(page, input.handle);
-        await typeIntoDoubaoInput(page, input.handle, queryText);
-      } else {
-        await input.handle.focus();
-      }
+      initialReplySnapshot = await captureDoubaoReplySnapshot(page).catch(() => null);
+      await clearDoubaoInput(page, input.handle);
+      await typeIntoDoubaoInput(page, input.handle, queryText);
       await assertNoChallenge(page, session.sessionId);
       await humanPause(900, 1800);
       const clicked = await clickDoubaoSend(page);
@@ -848,18 +735,6 @@ async function queryDoubao(queryText, opts = {}) {
 
     const completenessScore = result.completeness?.score || 0;
     const contentMarkedIncomplete = result.completeness?.isComplete === false;
-    if (!_quickFallback && conversationPlan.effective === 'fresh' && usedUrlAction && urlActionMode === 'deep' && completenessScore < 70 && contentMarkedIncomplete && !prefersShortAnswer(queryText)) {
-      log('WARN', '[doubao]', { component: 'doubao', plugin: 'cdper-doubao', session_id: session.sessionId, step: 'query', action: 'fallback', status: 'degraded', message: 'deep url-action produced low-completeness content; retrying quick url-action (score=' + completenessScore + ')' });
-      if (page || browser) await disconnect(page, browser).catch(() => undefined);
-      page = null;
-      browser = null;
-      return await withAbortableTimeout(
-        (signal) => queryDoubao(queryText, { ...opts, mode: 'quick', conversationPolicy: 'fresh', _quickFallback: true, abortSignal: signal, _fallbackMeta: { attempted: true, fromMode: urlActionMode, toMode: 'quick', reason: 'low_completeness', timeoutMs: FALLBACK_TIMEOUT_MS } }),
-        'quick url-action fallback',
-        FALLBACK_TIMEOUT_MS
-      );
-    }
-
     if (wrapperStatus === WRAPPER_STATUSES.PARTIAL_TIMEOUT && result.content) {
       return buildWrapperResult({
         status: WRAPPER_STATUSES.PARTIAL_TIMEOUT,
@@ -875,7 +750,7 @@ async function queryDoubao(queryText, opts = {}) {
       return updateSession(session.sessionId, { turns: session.turns + 1, conversation });
     }, { timeoutMs: STATE_TIMEOUTS.extract });
 
-    const modeState = buildDoubaoModeState(usedUrlAction, urlActionMode, expertModeConfirmed);
+    const modeState = buildDoubaoModeState(expertModeConfirmed);
     const contentIsComplete = result.completeness?.isComplete === true;
     const finalStatus = ['complete', 'complete_short'].includes(result.exitReason) && contentIsComplete ? 'ok' : 'degraded';
     log('INFO', '[doubao]', { component: 'doubao', plugin: 'cdper-doubao', session_id: session.sessionId, step: 'query', action: 'complete', status: finalStatus, message: '回复完成：' + result.content.length + ' 字，完整度 ' + (result.completeness?.score || 0) + '分，exitReason=' + (result.exitReason || 'unknown') });
@@ -885,7 +760,7 @@ async function queryDoubao(queryText, opts = {}) {
       session: activeSession,
       flow,
       runtimeStatus: await getRuntimeStatus('doubao'),
-      doneMeta: { status: finalStatus, turn: activeSession.turns, ...modeState, ...(usedUrlAction ? {} : { expertModeConfirmed }), usedUrlAction, urlActionMode: usedUrlAction ? urlActionMode : null, conversationPolicy: conversationPlan.effective },
+      doneMeta: { status: finalStatus, turn: activeSession.turns, ...modeState, expertModeConfirmed, conversationPolicy: conversationPlan.effective },
       payload: {
         content: result.content,
         score: completenessScore,
@@ -894,9 +769,7 @@ async function queryDoubao(queryText, opts = {}) {
         fallback: fallbackMeta,
         exitReason: result.exitReason || 'unknown',
         ...modeState,
-        ...(usedUrlAction ? {} : { expertModeConfirmed }),
-        usedUrlAction,
-        urlActionMode: usedUrlAction ? urlActionMode : null,
+        expertModeConfirmed,
         detectedChallenge: result.detectedChallenge || null,
         conversationPolicy: conversationPlan.requested,
         effectiveConversationPolicy: conversationPlan.effective,
@@ -906,17 +779,6 @@ async function queryDoubao(queryText, opts = {}) {
       },
     });
   } catch (error) {
-    if (!_quickFallback && error.code !== 'FALLBACK_TIMEOUT' && conversationPlan.effective === 'fresh' && usedUrlAction && urlActionMode === 'deep') {
-      log('WARN', '[doubao]', { component: 'doubao', plugin: 'cdper-doubao', session_id: session.sessionId, step: 'query', action: 'fallback', status: 'degraded', message: 'deep url-action failed; retrying quick url-action: ' + error.message });
-      if (page || browser) await disconnect(page, browser).catch(() => undefined);
-      page = null;
-      browser = null;
-      return await withAbortableTimeout(
-        (signal) => queryDoubao(queryText, { ...opts, mode: 'quick', conversationPolicy: 'fresh', _quickFallback: true, abortSignal: signal, _fallbackMeta: { attempted: true, fromMode: urlActionMode, toMode: 'quick', reason: error.message, timeoutMs: FALLBACK_TIMEOUT_MS } }),
-        'quick url-action fallback',
-        FALLBACK_TIMEOUT_MS
-      );
-    }
     return handlePluginQueryError(error, {
       flow, pluginName: 'doubao', retried: _retried,
       retryFn: () => queryDoubao(queryText, { ...opts, _retried: true }),