@cloud411716/fancy-webnovel 1.0.18 → 1.0.20

package/commands/bootstrap/index.js

@@ -7,7 +7,7 @@
 
 import { existsSync } from 'fs';
 import { join } from 'path';
-import { notify, askWithoutAcknowledgement } from '../../infra.js';
+import { notify } from '../../infra.js';
 import { initProject } from './init-project.js';
 
 // inject is declared in the root index.js; only apply() is imported by index.js
@@ -23,6 +23,7 @@ function isValidPath(p) {
 const bootstrap = {
   askPath() {
     return {
+      id: 'path',
       question: '📂 请输入项目根路径（输入 . 代表当前路径）',
     };
   },
@@ -76,8 +77,9 @@ export function apply(ctx) {
       let projectRoot = rawInput;
 
       if (!projectRoot) {
-        const result = await askWithoutAcknowledgement(ctx, session, {
+        const result = await ctx.userQuestions.ask({
           questions: [bootstrap.askPath()],
+          agent: invocation.agent,
           signal,
         });
         projectRoot = result.answers[0]?.custom?.trim() ?? '';
@@ -104,7 +106,7 @@ export function apply(ctx) {
       }
 
       // ---------- confirm ----------
-      const confirm = await askWithoutAcknowledgement(ctx, session, {
+      const confirm = await ctx.userQuestions.ask({
         questions: [{
           id: 'confirm',
           question: bootstrap.notify({ type: 'confirm', projectRoot }),
@@ -112,6 +114,7 @@ export function apply(ctx) {
           hideCustomInput: true,
           options: bootstrap.confirmOptions(),
         }],
+        agent: invocation.agent,
         signal,
       });
       const ans = confirm.answers[0];
@@ -122,10 +125,6 @@ export function apply(ctx) {
       }
 
       // ---------- init (in-process, no subprocess) ----------
-      // Yield to the event loop so DSH's "问卷已答" acknowledgement
-      // is flushed to the UI before we append our own messages.
-      await Promise.resolve();
-
       const result = await initProject(projectRoot);
 
       if (result.ok) {

package/commands/scan/index.js

@@ -7,7 +7,7 @@
 
 import { existsSync } from 'fs';
 import { join } from 'path';
-import { notify, llmFollowup, StatusLine, askWithoutAcknowledgement } from '../../infra.js';
+import { notify, llmFollowup, StatusLine } from '../../infra.js';
 import { runScans } from './scraper.js';
 import * as qidian from './platforms/qidian.js';
 import * as fanqie from './platforms/fanqie.js';
@@ -135,8 +135,9 @@ export function apply(ctx) {
       // ---------- platform selection ----------
       notify(session, scan.platformList());
 
-      const platformResult = await askWithoutAcknowledgement(ctx, session, {
+      const platformResult = await ctx.userQuestions.ask({
         questions: [scan.askPlatform()],
+        agent: invocation.agent,
         signal,
       });
       const answer = platformResult.answers[0]?.custom?.trim();
@@ -153,8 +154,9 @@ export function apply(ctx) {
       const platform = row[1];
 
       // ---------- rank selection (multi-select) ----------
-      const rankResult = await askWithoutAcknowledgement(ctx, session, {
+      const rankResult = await ctx.userQuestions.ask({
         questions: [scan.askRankList(platform)],
+        agent: invocation.agent,
         signal,
       });
       const selected = rankResult.answers[0]?.selected ?? [];

package/index.js

@@ -8,12 +8,9 @@
  * Architecture:
  *   - All scrapers run IN-PROCESS (no subprocess).
  *     DSH manages the lifecycle via ctx.effect() and AbortSignal.
- *     Progress is reported via ctx.events (fancy/scan:* events).
  *   - HTTP fetching uses Node.js native fetch (portable across all DSH UIs).
  *   - File operations use Node.js fs (project roots may be outside workspace).
  *   - ctx.timer (via ctx.timeout()) handles all delays/timeouts.
- *   - askWithoutAcknowledgement() wraps ctx.userQuestions.ask() to suppress
- *     the DSH "问卷已答" tool-result acknowledgement.
  *
  * Required Cordis services: commands, userQuestions, timer
  * (all are part of dsh-base, so this plugin works on dsh-tui, dsh-web, dsh-desktop).

package/infra.js

@@ -3,11 +3,9 @@
  *
  * Provides:
  *   notify(session, text)            — append a user-facing message to the session log
- *   llmFollowup(invocation,prompt)   — hand a prompt to the LLM as a user message
- *   askWithoutAcknowledgement(ctx, session, options) — ctx.userQuestions.ask() wrapper
- *     that suppresses the DSH "问卷已答" tool-result acknowledgement
+ *   llmFollowup(invocation,prompt) — hand a prompt to the LLM as a user message
  *   StatusLine(session)              — in-place updatable status bar via surfaceOp replace
- *   scanProgress(ctx, phase, data)  — emit structured scan progress events
+ *   scanProgress(ctx, phase, data) — emit structured scan progress events
  *   sleep(ctx, ms)                  — DSH-native promise delay via ctx.timeout()
  *
  * All fancy-* plugins import from this file.
@@ -34,48 +32,6 @@ export function notify(session, text) {
   );
 }
 
-// --------------------------------------------------------------------------
-// askWithoutAcknowledgement — ctx.userQuestions.ask() wrapper that suppresses
-// the DSH "问卷已答" tool-result acknowledgement by replacing the tool result
-// event in the session log with an empty one.
-// --------------------------------------------------------------------------
-
-/**
- * Wrapper around ctx.userQuestions.ask() that suppresses the DSH "问卷已答"
- * tool-result acknowledgement.
- *
- * After ctx.userQuestions.ask() resolves, DSH appends a tool/result event to the
- * session log. This function locates that event and replaces its content with
- * an empty array using session's surfaceOp replace — the event stays in the log
- * (so sequence is stable) but renders nothing.
- *
- * @param {object} ctx      - Cordis plugin context (has userQuestions service)
- * @param {object} session  - DSH Session object
- * @param {object} options  - same shape as ctx.userQuestions.ask() options
- * @param {AbortSignal} [options.signal]
- * @param {object[]} options.questions
- * @returns {Promise<{ answers: object[] }>} the raw result from userQuestions
- */
-export async function askWithoutAcknowledgement(ctx, session, options) {
-  const logLenBefore = session.log.length;
-  const result = await ctx.userQuestions.ask(options);
-
-  // DSH appended a tool/result event after userQuestions resolved.
-  // Find it and replace its content with empty so nothing renders.
-  if (session.log.length > logLenBefore) {
-    const lastEvent = session.log[session.log.length - 1];
-    if (lastEvent.type === 'tool/result') {
-      session.append(
-        'tool/result',
-        { message: { content: [] }, source: { kind: 'user' } },
-        { surfaceOp: { op: 'replace', start: lastEvent.seq, end: lastEvent.seq } }
-      );
-    }
-  }
-
-  return result;
-}
-
 // --------------------------------------------------------------------------
 // StatusLine — in-place updatable status bar using session surfaceOp replace
 // --------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud411716/fancy-webnovel",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "type": "module",
   "main": "index.js",
   "exports": {
@@ -9,7 +9,6 @@
   "files": [
     "index.js",
     "infra.js",
-    "events.js",
     "cordis.patch.yml",
     "commands/"
   ],