@cloud411716/fancy-webnovel 1.0.16 → 1.0.18

package/commands/bootstrap/index.js

@@ -7,7 +7,7 @@
 
 import { existsSync } from 'fs';
 import { join } from 'path';
-import { notify } from '../../infra.js';
+import { notify, askWithoutAcknowledgement } from '../../infra.js';
 import { initProject } from './init-project.js';
 
 // inject is declared in the root index.js; only apply() is imported by index.js
@@ -76,7 +76,7 @@ export function apply(ctx) {
       let projectRoot = rawInput;
 
       if (!projectRoot) {
-        const result = await ctx.userQuestions.ask({
+        const result = await askWithoutAcknowledgement(ctx, session, {
           questions: [bootstrap.askPath()],
           signal,
         });
@@ -104,7 +104,7 @@ export function apply(ctx) {
       }
 
       // ---------- confirm ----------
-      const confirm = await ctx.userQuestions.ask({
+      const confirm = await askWithoutAcknowledgement(ctx, session, {
         questions: [{
           id: 'confirm',
           question: bootstrap.notify({ type: 'confirm', projectRoot }),

package/commands/scan/index.js

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

package/index.js

@@ -12,8 +12,10 @@
  *   - 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, tools
+ * Required Cordis services: commands, userQuestions, timer
  * (all are part of dsh-base, so this plugin works on dsh-tui, dsh-web, dsh-desktop).
  *
  * IMPORTANT: This plugin needs `danger-full-access` sandbox mode because it
@@ -21,9 +23,6 @@
  * specifies). Declare this in the profile's cordis.patch.yml.
  */
 
-import './events.js'; // documents fancy/scan:* event types (JSDoc, no runtime effect)
-
-import { defineTool }  from '@deepseek-ai/dsh-tools';
 import { apply as applyBootstrap } from './commands/bootstrap/index.js';
 import { apply as applyScan }      from './commands/scan/index.js';
 
@@ -31,75 +30,15 @@ import { apply as applyScan }      from './commands/scan/index.js';
  * Services this plugin requires from the Cordis context.
  * All are provided by dsh-base, so this works on every DSH UI.
  */
-export const inject = ['commands', 'userQuestions', 'timer', 'tools'];
+export const inject = ['commands', 'userQuestions', 'timer'];
 
 /**
  * Called once when the plugin is loaded into a Cordis context (fiber).
- * Registers slash commands and overrides the builtin ask_user_question tool
- * to suppress the "问卷已答" tool-result message.
+ * Registers slash commands; actual logic lives in per-command modules.
  *
  * @param {object} ctx - Cordis plugin context
  */
 export function apply(ctx) {
-  // Override the builtin ask_user_question tool so it returns null instead
-  // of { answers: [...] }, preventing DSH from appending a tool/result event
-  // (which renders as "问卷已答" in the web UI). ctx.userQuestions.ask()
-  // still works normally — only the tool result acknowledgement is suppressed.
-  ctx.tools.register(defineTool({
-    name: 'ask_user_question',
-    description: 'Ask the user a concise question when you need confirmation, a choice, or missing information before proceeding. Send one or more questions, each with a stable id that will be echoed in the answer.',
-    parameters: {
-      questions: {
-        type: 'array',
-        required: true,
-        description: 'Questions to ask the user before continuing.',
-        items: {
-          type: 'object',
-          additionalProperties: true,
-          properties: {
-            id:       { type: 'string',  required: true,  description: 'Stable id for this question; echoed in the answer.' },
-            question: { type: 'string',  required: true,  description: 'The specific question to ask the user.' },
-            header:   { type: 'string',               description: 'Optional short heading for the question.' },
-            options: {
-              type: 'array',
-              description: 'Optional choices to show the user.',
-              items: {
-                type: 'object',
-                additionalProperties: true,
-                properties: {
-                  label:       { type: 'string', required: true,  description: 'Short user-facing option label.' },
-                  description: { type: 'string',               description: 'One sentence explaining the option.' },
-                },
-              },
-            },
-            multi_select:    { type: 'boolean' },
-            hideCustomInput: { type: 'boolean' },
-          },
-        },
-      },
-    },
-    output: {
-      schema: { type: 'null' },
-      render() { return []; },
-    },
-    async execute(args, exec) {
-      await ctx.userQuestions.ask({
-        questions: args.questions.map((q) => ({
-          id:       q.id,
-          question: q.question,
-          ...q.header          !== undefined ? { header:          q.header          } : {},
-          ...q.options         !== undefined ? { options:         q.options         } : {},
-          ...q.multi_select    !== undefined ? { multiSelect:     q.multi_select    } : {},
-          ...q.hideCustomInput !== undefined ? { hideCustomInput: q.hideCustomInput } : {},
-        })),
-        ...exec.agent !== undefined ? { agent: exec.agent } : {},
-        signal: exec.signal,
-      });
-      // Return null to suppress the tool-result acknowledgement ("问卷已答").
-      return null;
-    },
-  }));
-
   applyBootstrap(ctx);
   applyScan(ctx);
 }

package/infra.js

@@ -2,11 +2,13 @@
  * infra.js — DSH Plugin Core Infrastructure
  *
  * 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
- *   StatusLine(session)            — in-place updatable status bar via surfaceOp replace
- *   scanProgress(ctx, phase, data)— emit structured scan progress events
- *   sleep(ctx, ms)                — DSH-native promise delay via ctx.timeout()
+ *   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
+ *   StatusLine(session)              — in-place updatable status bar via surfaceOp replace
+ *   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.
  */
@@ -32,6 +34,48 @@ 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.16",
+  "version": "1.0.18",
   "type": "module",
   "main": "index.js",
   "exports": {

package/events.js

@@ -1,19 +0,0 @@
-/**
- * events.js — Scan progress event vocabulary
- *
- * These are pure in-memory plugin events emitted via ctx.events.emit().
- * They flow through the DSH session log and are observable by the agent.
- *
- * Type declarations (for TypeScript users):
- * ```ts
- * // @ts-check
- * declare module '@deepseek-ai/cordis' {
- *   interface Events {
- *     'fancy/scan:start'(platform: string, channel: string, type: string, label: string): void
- *     'fancy/scan:book'(platform: string, channel: string, type: string, index: number, total: number, title: string, rank: number): void
- *     'fancy/scan:rank-done'(platform: string, channel: string, type: string, ok: boolean, written: number, failed: number, errorMsg?: string): void
- *     'fancy/scan:done'(platform: string, totalBooks: number, totalFiles: number, ok: boolean): void
- *   }
- * }
- * ```
- */