@cloud411716/fancy-webnovel 1.0.40 → 1.0.42

package/commands/bootstrap/index.js

@@ -103,22 +103,17 @@ export function apply(ctx) {
       }
 
       // ---------- confirm ----------
-      let confirm;
-      try {
-        confirm = await ctx.userQuestions.ask({
-          questions: [{
-            id: 'confirm',
-            question: bootstrap.notify({ type: 'confirm', projectRoot }),
-            detail: projectRoot,
-            hideCustomInput: true,
-            options: bootstrap.confirmOptions(),
-          }],
-          agent: invocation.agent,
-          signal,
-        });
-      } catch {
-        return notify(session, 'error', bootstrap.notify({ type: 'cancelled' }));
-      }
+      const confirm = await ctx.userQuestions.ask({
+        questions: [{
+          id: 'confirm',
+          question: bootstrap.notify({ type: 'confirm', projectRoot }),
+          detail: projectRoot,
+          hideCustomInput: true,
+          options: bootstrap.confirmOptions(),
+        }],
+        agent: invocation.agent,
+        signal,
+      });
       const ans = confirm.answers[0];
       const chosen = ans?.selected?.[0] ?? ans?.custom;
       if (chosen !== '确认创建') {

package/commands/scan/index.js

@@ -52,10 +52,9 @@ const scan = {
     return {
       id: 'rank',
       question: `${pLabel} 有多个榜单，支持多选。请选择要采集的榜单：`,
-      detail: opts.map(o => o.label).join('、'),
       hideCustomInput: true,
       multiSelect: true,
-      options: [...opts, { id: 'cancel', label: '取消' }],
+      options: opts,
     };
   },
 
@@ -134,20 +133,15 @@ export function apply(ctx) {
       }
 
       // ---------- platform selection ----------
-      let platformResult;
-      try {
-        platformResult = await ctx.userQuestions.ask({
-          questions: [{
-            id: 'platform',
-            ...scan.askPlatform(),
-            question: `${scan.platformList()}\n\n请选择要扫的平台（输入编号 1-4）：`,
-          }],
-          agent: invocation.agent,
-          signal,
-        });
-      } catch {
-        return notify(session, 'error', scan.notify({ type: 'cancelled' }));
-      }
+      const platformResult = await ctx.userQuestions.ask({
+        questions: [{
+          id: 'platform',
+          ...scan.askPlatform(),
+          question: `${scan.platformList()}\n\n请选择要扫的平台（输入编号 1-4）：`,
+        }],
+        agent: invocation.agent,
+        signal,
+      });
       const answer = platformResult.answers[0]?.custom?.trim();
       if (!answer) {
         return notify(session, 'error', scan.notify({ type: 'cancelled' }));
@@ -160,24 +154,14 @@ export function apply(ctx) {
       const platform = row[1];
 
       // ---------- rank selection (multi-select) ----------
-      let rankResult;
-      try {
-        rankResult = await ctx.userQuestions.ask({
-          questions: [scan.askRankList(platform)],
-          agent: invocation.agent,
-          signal,
-        });
-      } catch {
-        return notify(session, 'error', scan.notify({ type: 'cancelled' }));
-      }
+      const rankResult = await ctx.userQuestions.ask({
+        questions: [scan.askRankList(platform)],
+        agent: invocation.agent,
+        signal,
+      });
       const selected = rankResult.answers[0]?.selected ?? [];
       const custom = rankResult.answers[0]?.custom?.trim();
 
-      // "取消" is an explicit option — treat it as cancelled (like bootstrap confirm)
-      if (selected.includes('取消')) {
-        return notify(session, 'error', scan.notify({ type: 'cancelled' }));
-      }
-
       const rawChoices = selected.length > 0 ? selected : (custom ? [custom] : []);
       if (rawChoices.length === 0) {
         return notify(session, 'error', scan.notify({ type: 'cancelled' }));
@@ -218,12 +202,12 @@ export function apply(ctx) {
       const statusLine = new StatusLine(session);
       let currentRankLabel = '';
 
-      disposers.push(ctx.events.on('fancy/scan:start', (_ctx, p, _ch, _ty, label) => {
+      disposers.push(ctx.events.on('fancy/scan:start', (_ctx, platform, _channel, _type, label) => {
         currentRankLabel = label;
-        statusLine.update(`[${SPINNER[_spinnerIdx++ % 4]}] 正在采集：${platformLabel(p)} ${label} …`);
+        statusLine.update(`[${SPINNER[_spinnerIdx++ % 4]}] 正在采集：${platformLabel(platform)} ${label} …`);
       }));
 
-      disposers.push(ctx.events.on('fancy/scan:rank-done', (_ctx, _p, _ch, _ty, ok, written) => {
+      disposers.push(ctx.events.on('fancy/scan:rank-done', (_ctx, _platform, _channel, _type, ok, written) => {
         statusLine.update(`[${SPINNER[_spinnerIdx++ % 4]}] ${currentRankLabel} ${ok ? `✓ 写入 ${written} 条` : '✗ 失败'}`);
       }));
 

package/index.js

@@ -12,7 +12,7 @@
  *   - File operations use Node.js fs (project roots may be outside workspace).
  *   - ctx.timer (via ctx.timeout()) handles all delays/timeouts.
  *
- * Required Cordis services: commands, userQuestions, timer, fs
+ * 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
@@ -27,7 +27,7 @@ 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', 'fs'];
+export const inject = ['commands', 'userQuestions', 'timer'];
 
 /**
  * Called once when the plugin is loaded into a Cordis context (fiber).

package/infra.js

@@ -12,8 +12,9 @@
  */
 
 // --------------------------------------------------------------------------
-// notify — return error/success result propagated through dsh-commands settle()
+// notify — return error result propagated through dsh-commands settleThrown()
 // --------------------------------------------------------------------------
+//
 
 /** Strip ANSI escape sequences from a string (defensive, prevents TTY leak). */
 function stripAnsi(str) {
@@ -25,7 +26,7 @@ function stripAnsi(str) {
  * @param {'error'|'success'} kind
  * @param {string} text
  * @returns {{ kind: 'error'|'success', text: string }} Result propagated through
- *   dsh-commands settle() → command/done → channel.notify() (TUI toast)
+ *   dsh-commands settleThrown() → command/done → channel.notify() (TUI toast)
  *   and command/done (Web left-panel with real commandId prefix)
  */
 export function notify(session, kind, text) {
@@ -121,18 +122,18 @@ export function scanProgress(ctx, phase, data) {
   switch (phase) {
     case 'start':
       ctx.events.emit('fancy/scan:start', data.platform, data.channel, data.type, data.label);
-      break;
+      break
     case 'book':
       ctx.events.emit('fancy/scan:book', data.platform, data.channel, data.type,
         data.index, data.total, data.title, data.rank);
-      break;
+      break
     case 'rank-done':
       ctx.events.emit('fancy/scan:rank-done', data.platform, data.channel, data.type,
         data.ok, data.written, data.failed, data.errorMsg);
-      break;
+      break
     case 'done':
       ctx.events.emit('fancy/scan:done', data.platform, data.totalBooks, data.totalFiles, data.ok);
-      break;
+      break
   }
 }
 
@@ -155,3 +156,5 @@ export async function writeFile(filepath, content, encoding = 'utf-8') {
   mkdirSync(dirname(filepath), { recursive: true });
   writeFileSync(filepath, content, encoding);
 }
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud411716/fancy-webnovel",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "type": "module",
   "main": "index.js",
   "exports": {