@cloud411716/fancy-webnovel 0.1.75 → 0.1.77

package/infra.js

@@ -5,13 +5,14 @@
  *   notify(session, text)       — 打印消息给用户（不触发 LLM）
  *   llmFollowup(invocation, prompt) — 发送消息给 LLM，让 LLM 继续处理
  *   spawnScript(cmd, args, opts)    — spawn 子进程，解析 stdout JSON
+ *   startActivity(session)  — 开始 Activity Line 计时，返回 stop 函数
  *
  * 所有 fancy-* 插件均直接 import 此文件。
  */
 
-// ---------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 // notify — 打印消息给用户（queueMicrotask 避免打断 LLM 输出顺序）
-// ---------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 
 export function notify(session, text) {
   queueMicrotask(() => {
@@ -25,7 +26,7 @@ export function notify(session, text) {
 
 // --------------------------------------------------------------------------
 // llmFollowup
-// ---------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 
 export function llmFollowup(invocation, content) {
   const prompt = typeof content === 'string' ? content : JSON.stringify(content);
@@ -35,19 +36,37 @@ export function llmFollowup(invocation, content) {
   });
 }
 
-// ---------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// startActivity — Activity Line 计时器（显示 Running… + 实时计时）
+// 调用 startActivity() 返回 stop 函数，进入新阶段时先 stop 再 start
+// --------------------------------------------------------------------------
+
+/**
+ * @param {import('@deepseek-ai/dsh-session').Session} session
+ * @returns {() => void} stop — 调用后停止计时
+ */
+export function startActivity(session) {
+  session.append('turn/start', { source: 'fancy-plugin' });
+  return () => session.append('turn/end', { source: 'fancy-plugin' });
+}
+
+// --------------------------------------------------------------------------
 // spawnScript — spawn 子进程，stdout 只收集 JSON，stderr 单独收集
-// ---------------------------------------------------------------------------
+// opts.stop() 会在进程终止时自动调用（用于清理 turn/start）
+// --------------------------------------------------------------------------
 
-export function spawnScript(cmd, args, { timeout = 30000, cwd } = {}) {
+export function spawnScript(cmd, args, { timeout = 30000, cwd, stop } = {}) {
   return new Promise(async (resolve) => {
     const { spawn } = await import('child_process');
     const proc = spawn(cmd, args, { timeout, cwd, stdio: ['ignore', 'pipe', 'pipe'] });
     const outParts = [], errParts = [];
     proc.stdout.on('data', (d) => { outParts.push(d.toString()); });
     proc.stderr.on('data', (d) => { errParts.push(d.toString()); });
+
+    const cleanup = () => { try { stop?.(); } catch (_) {} };
     proc.on('close', (code) => {
       const stdout = outParts.join(''), stderr = errParts.join('');
+      cleanup();
       try {
         const parsed = JSON.parse(stdout);
         resolve({
@@ -63,6 +82,6 @@ export function spawnScript(cmd, args, { timeout = 30000, cwd } = {}) {
         resolve({ ok: false, output: stdout, error: stderr || ('exit ' + code) });
       }
     });
-    proc.on('error', (err) => resolve({ ok: false, output: '', error: err.message }));
+    proc.on('error', (err) => { cleanup(); resolve({ ok: false, output: '', error: err.message }); });
   });
 }

package/package.json

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

package/plugins/fancy-bootstrap/index.js

@@ -4,7 +4,7 @@
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
-import { notify, spawnScript } from '../../infra.js';
+import { notify, spawnScript, startActivity } from '../../infra.js';
 import { bootstrap } from './templates.js';
 
 export const inject = ['commands', 'userQuestions'];
@@ -79,7 +79,11 @@ export async function apply(ctx) {
       }
 
       notify(session, bootstrap.notify({ type: 'initializing', projectRoot }));
-      const result = await spawnScript('node', [join(SCRIPTS_DIR, 'init.js'), projectRoot], { timeout: 30000 });
+      const stopActivity = startActivity(session);
+      const result = await spawnScript('node', [join(SCRIPTS_DIR, 'init.js'), projectRoot], {
+        timeout: 30000,
+        stop: stopActivity,
+      });
 
       if (result.ok) {
         notify(session, bootstrap.notify({ type: 'success' }));

package/plugins/fancy-scan/index.js

@@ -4,7 +4,7 @@
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
-import { notify, llmFollowup, spawnScript } from '../../infra.js';
+import { notify, llmFollowup, spawnScript, startActivity } from '../../infra.js';
 import { scan, PLATFORM_TABLE, platformLabel } from './templates.js';
 
 export const inject = ['commands', 'userQuestions'];
@@ -20,23 +20,6 @@ export async function apply(ctx) {
       const session = invocation.agent.session;
       const rawInput = invocation.rawInput ? invocation.rawInput.trim() : '';
 
-      // ─── TEST: 验证直接用 invocation.agent.session 追加事件 ─────────────────
-      {
-        // invocation.agent.session 就是 Session 对象，直接 append
-        const s = invocation.agent.session;
-        notify(session, `[TEST] session.id = ${s?.id ?? 'UNDEFINED'}`);
-        if (s) {
-          // 追加一个 fake tool/call，看 status bar 是否出现进度
-          s.append('tool/call', {
-            callId: 'test-call-1',
-            name: 'fancy-scan/progress',
-            arguments: JSON.stringify({ platform: 'test', length: 'test' }),
-          });
-          notify(session, '[TEST] session.append(tool/call) 成功');
-        }
-      }
-      // ─── TEST 结束 ───────────────────────────────────────────────────────
-
       // 获取项目根
       let projectRoot = rawInput ? rawInput.split(/\s+/)[0] : '';
       if (!projectRoot) projectRoot = process.cwd();
@@ -109,18 +92,14 @@ export async function apply(ctx) {
 
       notify(session, scan.notify({ type: 'collecting', platform, length }));
 
-      // 开始计时
-      session.append('turn/start', { source: 'fancy-scan' });
-
+      const stopActivity = startActivity(session);
       const scriptResult = await spawnScript(
         'node',
         [join(SCAN_SCRIPTS_DIR, 'run-scan.js'),
          '--project-root', projectRoot, '--platform', platform, '--length', length],
-        { timeout: 120000 }
+        { timeout: 120000, stop: stopActivity }
       );
 
-      session.append('turn/end', { source: 'fancy-scan' });
-
       if (!scriptResult.ok) {
         const err = (typeof scriptResult.error === 'object' && scriptResult.error !== null)
           ? (scriptResult.error.message || JSON.stringify(scriptResult.error))