@cloud411716/fancy-webnovel 1.0.22 → 1.0.24

package/commands/bootstrap/index.js

@@ -86,23 +86,20 @@ export function apply(ctx) {
       }
 
       if (!projectRoot) {
-        notify(session, bootstrap.notify({ type: 'no_path' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', bootstrap.notify({ type: 'no_path' }));
       }
 
       if (projectRoot === '.') {
         projectRoot = session.header?.cwd ?? process.cwd();
-        notify(session, bootstrap.notify({ type: 'using_cwd', projectRoot }));
+        return notify(session, 'success', bootstrap.notify({ type: 'using_cwd', projectRoot }));
       }
 
       if (!isValidPath(projectRoot)) {
-        notify(session, bootstrap.notify({ type: 'invalid_path' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', bootstrap.notify({ type: 'invalid_path' }));
       }
 
       if (existsSync(join(projectRoot, '.fancy-deployed'))) {
-        notify(session, bootstrap.notify({ type: 'already_initialized' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', bootstrap.notify({ type: 'already_initialized' }));
       }
 
       // ---------- confirm ----------
@@ -120,20 +117,17 @@ export function apply(ctx) {
       const ans = confirm.answers[0];
       const chosen = ans?.selected?.[0] ?? ans?.custom;
       if (chosen !== '确认创建') {
-        notify(session, bootstrap.notify({ type: 'cancelled' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', bootstrap.notify({ type: 'cancelled' }));
       }
 
       // ---------- init (in-process, no subprocess) ----------
       const result = await initProject(projectRoot);
 
       if (result.ok) {
-        notify(session, bootstrap.notify({ type: 'success' }));
+        return notify(session, 'success', bootstrap.notify({ type: 'success' }));
       } else {
-        notify(session, bootstrap.notify({ type: 'error', err: result.error }));
+        return notify(session, 'error', bootstrap.notify({ type: 'error', err: result.error }));
       }
-
-      return { kind: 'success', text: '' };
     },
   });
 }

package/commands/scan/index.js

@@ -128,12 +128,11 @@ export function apply(ctx) {
       // ---------- check project root ----------
       const projectRoot = session.header?.cwd ?? process.cwd();
       if (!existsSync(join(projectRoot, '.fancy-deployed'))) {
-        notify(session, scan.notify({ type: 'not_initialized' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', scan.notify({ type: 'not_initialized' }));
       }
 
       // ---------- platform selection ----------
-      notify(session, scan.platformList());
+      notify(session, 'success', scan.platformList());
 
       const platformResult = await ctx.userQuestions.ask({
         questions: [scan.askPlatform()],
@@ -142,14 +141,12 @@ export function apply(ctx) {
       });
       const answer = platformResult.answers[0]?.custom?.trim();
       if (!answer) {
-        notify(session, scan.notify({ type: 'cancelled' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', scan.notify({ type: 'cancelled' }));
       }
       const numMatch = answer.match(/^(\d+)$/);
       const row = numMatch ? PLATFORM_TABLE.find(r => r[0] === numMatch[1]) : null;
       if (!row) {
-        notify(session, scan.notify({ type: 'invalid_choice' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', scan.notify({ type: 'invalid_choice' }));
       }
       const platform = row[1];
 
@@ -164,8 +161,7 @@ export function apply(ctx) {
 
       const rawChoices = selected.length > 0 ? selected : (custom ? [custom] : []);
       if (rawChoices.length === 0) {
-        notify(session, scan.notify({ type: 'cancelled' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', scan.notify({ type: 'cancelled' }));
       }
 
       const scraper = SCRAPERS[platform];
@@ -191,8 +187,7 @@ export function apply(ctx) {
       }
 
       if (rankEntries.length === 0) {
-        notify(session, scan.notify({ type: 'invalid_choice' }));
-        return { kind: 'success', text: '' };
+        return notify(session, 'error', scan.notify({ type: 'invalid_choice' }));
       }
 
       // ---------- in-process scraping (no subprocess) ----------
@@ -226,7 +221,7 @@ export function apply(ctx) {
 
       // ---------- output results ----------
       if (lastReceipt && totalFiles > 0) {
-        notify(session, scan.notify({
+        notify(session, 'success', scan.notify({
           type: 'handover',
           platform,
           files: lastReceipt.scan_files,
@@ -247,7 +242,7 @@ export function apply(ctx) {
         const lines = failedRanks.map(({ rank, err }) => {
           return `• ${rank.label}：${err}`;
         });
-        notify(session, `⚠️ 以下榜单采集失败（共 ${failedRanks.length} 项）：\n${lines.join('\n')}`);
+        return notify(session, 'error', `⚠️ 以下榜单采集失败（共 ${failedRanks.length} 项）：\n${lines.join('\n')}`);
       }
 
       return { kind: 'success', text: '' };

package/infra.js

@@ -2,7 +2,7 @@
  * infra.js — DSH Plugin Core Infrastructure
  *
  * Provides:
- *   notify(session, text)            — append a user-facing message (LLM-invisible)
+ *   notify(session, text)            — return error result shown as TUI toast + Web left-panel
  *   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
@@ -12,8 +12,9 @@
  */
 
 // --------------------------------------------------------------------------
-// notify — append a text message visible to the user but invisible to LLM
+// notify — return error result propagated through dsh-commands settleThrown()
 // --------------------------------------------------------------------------
+//
 
 /** Strip ANSI escape sequences from a string (defensive, prevents TTY leak). */
 function stripAnsi(str) {
@@ -21,15 +22,15 @@ function stripAnsi(str) {
 }
 
 /**
- * @param {object} session - DSH Session object
+ * @param {object} session - DSH Session object (unused, kept for API compatibility)
+ * @param {'error'|'success'} kind
  * @param {string} text
+ * @returns {{ kind: 'error'|'success', text: string }} Result propagated through
+ *   dsh-commands settleThrown() → command/done → channel.notify() (TUI toast)
+ *   and command/done (Web left-panel with real commandId prefix)
  */
-export function notify(session, text) {
-  session.append('command/done', {
-    commandId: `fancy-notify-${Date.now()}`,
-    kind: 'success',
-    text: stripAnsi(text),
-  });
+export function notify(session, kind, text) {
+  return { kind, text: stripAnsi(text) };
 }
 
 // --------------------------------------------------------------------------

package/package.json

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