@cloud411716/fancy-webnovel 1.0.41 → 1.0.43

package/commands/bootstrap/index.js

@@ -12,6 +12,9 @@ import { initProject } from './init-project.js';
 
 // inject is declared in the root index.js; only apply() is imported by index.js
 
+/** UserQuestionError codes that indicate user cancellation */
+const USER_CANCEL_CODES = new Set(['ASK_CANCELLED', 'ASK_ABORTED']);
+
 function isValidPath(p) {
   return (
     !p.includes('..') &&
@@ -77,11 +80,19 @@ export function apply(ctx) {
       let projectRoot = rawInput;
 
       if (!projectRoot) {
-        const result = await ctx.userQuestions.ask({
-          questions: [bootstrap.askPath()],
-          agent: invocation.agent,
-          signal,
-        });
+        let result;
+        try {
+          result = await ctx.userQuestions.ask({
+            questions: [bootstrap.askPath()],
+            agent: invocation.agent,
+            signal,
+          });
+        } catch (err) {
+          if (err?.code && USER_CANCEL_CODES.has(err.code)) {
+            return notify(session, 'error', bootstrap.notify({ type: 'cancelled' }));
+          }
+          throw err;
+        }
         projectRoot = result.answers[0]?.custom?.trim() ?? '';
       }
 
@@ -103,17 +114,25 @@ export function apply(ctx) {
       }
 
       // ---------- confirm ----------
-      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,
-      });
+      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 (err) {
+        if (err?.code && USER_CANCEL_CODES.has(err.code)) {
+          return notify(session, 'error', bootstrap.notify({ type: 'cancelled' }));
+        }
+        throw err;
+      }
       const ans = confirm.answers[0];
       const chosen = ans?.selected?.[0] ?? ans?.custom;
       if (chosen !== '确认创建') {

package/commands/scan/index.js

@@ -14,6 +14,9 @@ import * as fanqie from './platforms/fanqie.js';
 import * as jinjiang from './platforms/jinjiang.js';
 import * as qimao from './platforms/qimao.js';
 
+/** UserQuestionError codes that indicate user cancellation */
+const USER_CANCEL_CODES = new Set(['ASK_CANCELLED', 'ASK_ABORTED']);
+
 // inject is declared in the root index.js; only apply() is imported by index.js
 
 const PLATFORM_TABLE = [
@@ -133,15 +136,25 @@ export function apply(ctx) {
       }
 
       // ---------- platform selection ----------
-      const platformResult = await ctx.userQuestions.ask({
-        questions: [{
-          id: 'platform',
-          ...scan.askPlatform(),
-          question: `${scan.platformList()}\n\n请选择要扫的平台（输入编号 1-4）：`,
-        }],
-        agent: invocation.agent,
-        signal,
-      });
+      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 (err) {
+        // Handle user cancellation (ASK_CANCELLED, ASK_ABORTED, or any cancellation)
+        if (err?.code && USER_CANCEL_CODES.has(err.code)) {
+          return notify(session, 'error', scan.notify({ type: 'cancelled' }));
+        }
+        // Re-throw unexpected errors
+        throw err;
+      }
       const answer = platformResult.answers[0]?.custom?.trim();
       if (!answer) {
         return notify(session, 'error', scan.notify({ type: 'cancelled' }));
@@ -154,11 +167,19 @@ export function apply(ctx) {
       const platform = row[1];
 
       // ---------- rank selection (multi-select) ----------
-      const rankResult = await ctx.userQuestions.ask({
-        questions: [scan.askRankList(platform)],
-        agent: invocation.agent,
-        signal,
-      });
+      let rankResult;
+      try {
+        rankResult = await ctx.userQuestions.ask({
+          questions: [scan.askRankList(platform)],
+          agent: invocation.agent,
+          signal,
+        });
+      } catch (err) {
+        if (err?.code && USER_CANCEL_CODES.has(err.code)) {
+          return notify(session, 'error', scan.notify({ type: 'cancelled' }));
+        }
+        throw err;
+      }
       const selected = rankResult.answers[0]?.selected ?? [];
       const custom = rankResult.answers[0]?.custom?.trim();
 

package/package.json

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