pikiloom 0.4.28 → 0.4.29

package/dist/channels/dingtalk/bot.js

@@ -521,7 +521,6 @@ export class DingtalkBot extends Bot {
         this.processRuntimeCleanup?.();
         this.processRuntimeCleanup = registerProcessRuntime({
             label: 'dingtalk',
-            getActiveTaskCount: () => this.activeTasks.size,
             prepareForRestart: () => this.cleanupRuntimeForExit(),
         });
         this.installSignalHandlers();

package/dist/channels/discord/bot.js

@@ -520,7 +520,6 @@ export class DiscordBot extends Bot {
         this.processRuntimeCleanup?.();
         this.processRuntimeCleanup = registerProcessRuntime({
             label: 'discord',
-            getActiveTaskCount: () => this.activeTasks.size,
             prepareForRestart: () => this.cleanupRuntimeForExit(),
         });
         this.installSignalHandlers();

package/dist/channels/feishu/bot.js

@@ -1151,7 +1151,6 @@ export class FeishuBot extends Bot {
         this.processRuntimeCleanup?.();
         this.processRuntimeCleanup = registerProcessRuntime({
             label: 'feishu',
-            getActiveTaskCount: () => this.activeTasks.size,
             prepareForRestart: () => this.cleanupRuntimeForExit(),
             buildRestartEnv: () => this.buildRestartEnv(),
         });

package/dist/channels/slack/bot.js

@@ -522,7 +522,6 @@ export class SlackBot extends Bot {
         this.processRuntimeCleanup?.();
         this.processRuntimeCleanup = registerProcessRuntime({
             label: 'slack',
-            getActiveTaskCount: () => this.activeTasks.size,
             prepareForRestart: () => this.cleanupRuntimeForExit(),
         });
         this.installSignalHandlers();

package/dist/channels/telegram/bot.js

@@ -1189,7 +1189,6 @@ export class TelegramBot extends Bot {
         this.processRuntimeCleanup?.();
         this.processRuntimeCleanup = registerProcessRuntime({
             label: 'telegram',
-            getActiveTaskCount: () => this.activeTasks.size,
             prepareForRestart: () => this.cleanupRuntimeForExit(),
             buildRestartEnv: () => this.buildRestartEnv(),
         });

package/dist/channels/wecom/bot.js

@@ -530,7 +530,6 @@ export class WeComBot extends Bot {
         this.processRuntimeCleanup?.();
         this.processRuntimeCleanup = registerProcessRuntime({
             label: 'wecom',
-            getActiveTaskCount: () => this.activeTasks.size,
             prepareForRestart: () => this.cleanupRuntimeForExit(),
         });
         this.installSignalHandlers();

package/dist/channels/weixin/bot.js

@@ -886,7 +886,6 @@ export class WeixinBot extends Bot {
         this.processRuntimeCleanup?.();
         this.processRuntimeCleanup = registerProcessRuntime({
             label: 'weixin',
-            getActiveTaskCount: () => this.activeTasks.size,
             prepareForRestart: () => this.cleanupRuntimeForExit(),
         });
         this.installSignalHandlers();

package/dist/core/process-control.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { spawn } from 'node:child_process';
+import { execFileSync, spawn } from 'node:child_process';
 import { pathContainsSegment } from './platform.js';
 import { STATE_DIR_NAME } from './constants.js';
 export const PROCESS_RESTART_EXIT_CODE = 75;
@@ -118,12 +118,77 @@ export function registerProcessRuntime(runtime) {
 export function getRegisteredRuntimeCount() {
     return runtimes.size;
 }
-export function getActiveTaskCount() {
-    let total = 0;
-    for (const runtime of runtimes.values()) {
-        total += Math.max(0, runtime.getActiveTaskCount?.() || 0);
+function readProcessParentMap() {
+    const children = new Map();
+    try {
+        const rows = [];
+        if (process.platform === 'win32') {
+            const out = execFileSync('wmic', ['process', 'get', 'ParentProcessId,ProcessId'], { encoding: 'utf8', windowsHide: true });
+            for (const line of out.split(/\r?\n/)) {
+                const m = line.trim().match(/^(\d+)\s+(\d+)$/);
+                if (m)
+                    rows.push({ ppid: Number(m[1]), pid: Number(m[2]) });
+            }
+        }
+        else {
+            const out = execFileSync('ps', ['-Ao', 'pid=,ppid='], { encoding: 'utf8' });
+            for (const line of out.split('\n')) {
+                const m = line.trim().match(/^(\d+)\s+(\d+)$/);
+                if (m)
+                    rows.push({ pid: Number(m[1]), ppid: Number(m[2]) });
+            }
+        }
+        for (const { pid, ppid } of rows) {
+            const list = children.get(ppid);
+            if (list)
+                list.push(pid);
+            else
+                children.set(ppid, [pid]);
+        }
+    }
+    catch { }
+    return children;
+}
+function collectDescendantPids(rootPid) {
+    const children = readProcessParentMap();
+    const descendants = [];
+    const seen = new Set([rootPid]);
+    const stack = [rootPid];
+    while (stack.length) {
+        const current = stack.pop();
+        for (const child of children.get(current) || []) {
+            if (seen.has(child))
+                continue;
+            seen.add(child);
+            descendants.push(child);
+            stack.push(child);
+        }
     }
-    return total;
+    return descendants;
+}
+export async function killChildProcesses(rootPid = process.pid, opts = {}) {
+    const pids = collectDescendantPids(rootPid);
+    if (!pids.length)
+        return 0;
+    opts.log?.(`restart: terminating ${pids.length} child process(es) before restart`);
+    for (const pid of pids) {
+        try {
+            process.kill(pid, 'SIGTERM');
+        }
+        catch { }
+    }
+    const graceMs = opts.graceMs ?? 1500;
+    if (graceMs > 0)
+        await new Promise(resolve => setTimeout(resolve, graceMs));
+    for (const pid of pids) {
+        if (isProcessAlive(pid)) {
+            try {
+                process.kill(pid, 'SIGKILL');
+            }
+            catch { }
+        }
+    }
+    return pids.length;
 }
 export function createRestartStateFilePath(ownerPid = process.pid) {
     const dir = path.join(os.tmpdir(), 'pikiloom');
@@ -223,21 +288,7 @@ function spawnReplacementProcess(bin, args, env, log) {
 }
 export async function requestProcessRestart(opts = {}) {
     if (restartInFlight) {
-        return {
-            ok: true,
-            restarting: true,
-            error: null,
-            activeTasks: 0,
-        };
-    }
-    const activeTasks = getActiveTaskCount();
-    if (activeTasks > 0) {
-        return {
-            ok: false,
-            restarting: false,
-            error: `${activeTasks} task(s) still running. Wait for them to finish or try again.`,
-            activeTasks,
-        };
+        return { ok: true, restarting: true, error: null };
     }
     restartInFlight = true;
     const log = opts.log;
@@ -245,6 +296,7 @@ export async function requestProcessRestart(opts = {}) {
     try {
         const extraEnv = collectRestartEnv();
         await prepareRuntimesForRestart(log);
+        await killChildProcesses(process.pid, { log });
         if (process.env.PIKILOOM_DAEMON_CHILD === '1') {
             const restartStateFile = process.env[PROCESS_RESTART_STATE_FILE_ENV];
             if (restartStateFile) {
@@ -255,22 +307,17 @@ export async function requestProcessRestart(opts = {}) {
             }
             log?.('restart: handing off to daemon supervisor');
             exit(PROCESS_RESTART_EXIT_CODE);
-            return { ok: true, restarting: true, error: null, activeTasks: 0 };
+            return { ok: true, restarting: true, error: null };
         }
         const { bin, args } = buildRestartCommand(opts.argv || process.argv.slice(2), opts.restartCmd);
         log?.(`restart: spawning \`${bin} ${args.join(' ')}\``);
         spawnReplacementProcess(bin, args, buildRestartEnvForSpawn(extraEnv), log);
         exit(0);
-        return { ok: true, restarting: true, error: null, activeTasks: 0 };
+        return { ok: true, restarting: true, error: null };
     }
     catch (err) {
         restartInFlight = false;
-        return {
-            ok: false,
-            restarting: false,
-            error: err instanceof Error ? err.message : String(err),
-            activeTasks: 0,
-        };
+        return { ok: false, restarting: false, error: err instanceof Error ? err.message : String(err) };
     }
 }
 export function terminateProcessTree(target, opts = {}) {

package/dist/dashboard/routes/config.js

@@ -12,7 +12,7 @@ import { validateDingtalkConfig, validateDiscordConfig, validateFeishuConfig, va
 import { resolveGuiIntegrationConfig } from '../../agent/mcp/bridge.js';
 import { normalizeWeixinBaseUrl, startWeixinQrLogin, waitForWeixinQrLogin, } from '../../channels/weixin/api.js';
 import { getConfiguredRemoteCdpUrl, getManagedBrowserStatus, launchManagedBrowserSetup, } from '../../browser-profile.js';
-import { requestProcessRestart, getActiveTaskCount, } from '../../core/process-control.js';
+import { requestProcessRestart, } from '../../core/process-control.js';
 import { getPermissionsStatus, getHostTerminalApp, isValidPermissionKey, requestPermission, } from '../platform.js';
 import { VERSION } from '../../core/version.js';
 import { runtime } from '../runtime.js';
@@ -389,14 +389,6 @@ app.post('/api/open-preferences', async (c) => {
     return c.json(result, result.ok ? 200 : 500);
 });
 app.post('/api/restart', (c) => {
-    const activeTasks = getActiveTaskCount();
-    if (activeTasks > 0) {
-        return c.json({
-            ok: false,
-            activeTasks,
-            error: `${activeTasks} task(s) still running — can't restart. Wait for them to finish or stop them, then retry.`,
-        }, 409);
-    }
     setTimeout(() => {
         void requestProcessRestart({ log: message => runtime.log(message) });
     }, 50);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pikiloom",
-  "version": "0.4.28",
+  "version": "0.4.29",
   "description": "Put the world's smartest AI agents in your pocket. Command local Claude & Gemini via IM. | 让最好用的 IM 变成你电脑上的顶级 Agent 控制台",
   "type": "module",
   "bin": {