@botcord/daemon 0.2.79 → 0.2.81

package/dist/daemon-singleton.d.ts

@@ -4,6 +4,14 @@ export interface SingletonLogger {
 }
 export declare function readPid(pidPath?: string): number | null;
 export declare function pidAlive(pid: number): boolean;
+export interface DaemonProcessInfo {
+    pid: number;
+    command: string;
+}
+export declare function parseDaemonProcesses(psOutput: string, currentPid?: number): DaemonProcessInfo[];
+export declare function findOtherDaemonProcesses(opts?: {
+    currentPid?: number;
+}): DaemonProcessInfo[];
 export declare function waitForPidExit(pid: number, timeoutMs: number): Promise<boolean>;
 export declare function stopExistingDaemonForRestart(pid: number, opts?: {
     pidPath?: string;
@@ -15,6 +23,11 @@ export declare function stopDaemonFromPidFileForRestart(opts?: {
     currentPid?: number;
     logger?: SingletonLogger;
 }): Promise<void>;
+export declare function stopOtherDaemonProcessesForRestart(opts?: {
+    currentPid?: number;
+    logger?: SingletonLogger;
+    processes?: DaemonProcessInfo[];
+}): Promise<DaemonProcessInfo[]>;
 export declare function ensureNoOtherDaemonFromPidFile(opts?: {
     pidPath?: string;
     currentPid?: number;

package/dist/daemon-singleton.js

@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { PID_PATH } from "./config.js";
 const noopLogger = {
@@ -24,6 +25,36 @@ export function pidAlive(pid) {
         return false;
     }
 }
+export function parseDaemonProcesses(psOutput, currentPid = process.pid) {
+    const out = [];
+    for (const line of psOutput.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        const match = /^(\d+)\s+(.+)$/.exec(trimmed);
+        if (!match)
+            continue;
+        const pid = Number(match[1]);
+        if (!Number.isFinite(pid) || pid <= 0 || pid === currentPid)
+            continue;
+        const command = match[2] ?? "";
+        if (!isBotCordDaemonStartCommand(command))
+            continue;
+        out.push({ pid, command });
+    }
+    return out;
+}
+export function findOtherDaemonProcesses(opts = {}) {
+    const currentPid = opts.currentPid ?? process.pid;
+    try {
+        const output = execFileSync("ps", ["-axo", "pid=,command="], {
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+        });
+        return parseDaemonProcesses(output, currentPid).filter((p) => pidAlive(p.pid));
+    }
+    catch {
+        return [];
+    }
+}
 export async function waitForPidExit(pid, timeoutMs) {
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
@@ -66,6 +97,36 @@ export async function stopDaemonFromPidFileForRestart(opts = {}) {
         await stopExistingDaemonForRestart(existing, opts);
     }
 }
+export async function stopOtherDaemonProcessesForRestart(opts = {}) {
+    const currentPid = opts.currentPid ?? process.pid;
+    const logger = opts.logger ?? noopLogger;
+    const processes = opts.processes ?? findOtherDaemonProcesses({ currentPid });
+    for (const proc of processes) {
+        logger.info("additional daemon process found; restarting", {
+            pid: proc.pid,
+            command: proc.command,
+        });
+        try {
+            process.kill(proc.pid, "SIGTERM");
+        }
+        catch {
+            continue;
+        }
+        if (!(await waitForPidExit(proc.pid, 5_000))) {
+            logger.warn("additional daemon did not stop after SIGTERM; sending SIGKILL", {
+                pid: proc.pid,
+            });
+            try {
+                process.kill(proc.pid, "SIGKILL");
+            }
+            catch {
+                // ignore
+            }
+            await waitForPidExit(proc.pid, 2_000);
+        }
+    }
+    return processes;
+}
 export function ensureNoOtherDaemonFromPidFile(opts = {}) {
     const pidPath = opts.pidPath ?? PID_PATH;
     const currentPid = opts.currentPid ?? process.pid;
@@ -86,6 +147,13 @@ export function removePidFile(pidPath = PID_PATH) {
         // ignore
     }
 }
+function isBotCordDaemonStartCommand(command) {
+    if (!/\bstart\b/.test(command))
+        return false;
+    return (command.includes("botcord-daemon") ||
+        /(?:^|\s)\S*botcord\S*\/daemon\/dist\/index\.js(?:\s|$)/.test(command) ||
+        /(?:^|\s)\S*packages\/daemon\/dist\/index\.js(?:\s|$)/.test(command));
+}
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }

package/dist/gateway/channels/botcord.d.ts

@@ -133,4 +133,5 @@ declare function normalizeBlockForHub(block: {
     kind: string;
     seq: number;
     payload: Record<string, unknown>;
+    raw?: unknown;
 };

package/dist/gateway/channels/botcord.js

@@ -838,6 +838,7 @@ function normalizeBlockForHub(block, seq) {
     const raw = (block?.raw ?? {});
     const kind = block?.kind ?? "other";
     const payload = {};
+    const withRaw = (out) => (block && "raw" in block ? { ...out, raw: block.raw } : out);
     if (kind === "assistant_text") {
         // Claude Code: {type:"assistant", message:{content:[{type:"text",text}]}}
         // Codex:       {type:"item.completed", item:{type:"agent_message", text}}
@@ -880,7 +881,7 @@ function normalizeBlockForHub(block, seq) {
             if (call.status)
                 payload.status = call.status;
         }
-        return { kind: "tool_call", seq, payload };
+        return withRaw({ kind: "tool_call", seq, payload });
     }
     if (kind === "tool_result") {
         const result = extractToolResult(raw);
@@ -891,7 +892,7 @@ function normalizeBlockForHub(block, seq) {
             if (result.id)
                 payload.tool_use_id = result.id;
         }
-        return { kind: "tool_result", seq, payload };
+        return withRaw({ kind: "tool_result", seq, payload });
     }
     if (kind === "system") {
         if (typeof raw?.subtype === "string")
@@ -901,7 +902,7 @@ function normalizeBlockForHub(block, seq) {
         if (typeof raw?.model === "string")
             payload.model = raw.model;
         payload.details = formatBlockDetails(raw);
-        return { kind: "system", seq, payload };
+        return withRaw({ kind: "system", seq, payload });
     }
     if (kind === "thinking") {
         // Daemon-synthesized lifecycle marker. `raw` carries `{ phase, label?, source? }`
@@ -915,7 +916,7 @@ function normalizeBlockForHub(block, seq) {
         if (typeof raw?.source === "string")
             payload.source = raw.source;
         payload.details = formatBlockDetails(raw);
-        return { kind: "thinking", seq, payload };
+        return withRaw({ kind: "thinking", seq, payload });
     }
     // "other" — e.g. Claude Code `type:"result"` end-of-turn summary.
     if (isTerminalRuntimeBlock(raw)) {
@@ -925,7 +926,7 @@ function normalizeBlockForHub(block, seq) {
         const embedded = typeof raw?.payload?.event === "string" ? raw.payload.event : undefined;
         if (event || embedded)
             payload.event = event ?? embedded;
-        return { kind: "other", seq, payload };
+        return withRaw({ kind: "other", seq, payload });
     }
     if (raw?.type === "result") {
         if (typeof raw.result === "string")
@@ -935,7 +936,7 @@ function normalizeBlockForHub(block, seq) {
         if (typeof raw.total_cost_usd === "number")
             payload.total_cost_usd = raw.total_cost_usd;
     }
-    return { kind: "other", seq, payload };
+    return withRaw({ kind: "other", seq, payload });
 }
 function isTerminalRuntimeBlock(raw) {
     const event = typeof raw?.event === "string" ? raw.event : undefined;
@@ -1060,18 +1061,28 @@ function extractDeepseekToolCall(raw) {
                 : {};
         const item = inner.item && typeof inner.item === "object" ? inner.item : undefined;
         const tool = inner.tool && typeof inner.tool === "object" ? inner.tool : item?.tool;
+        const itemParams = parseMaybeJson(item?.input ?? item?.arguments ?? item?.detail);
+        const detailParams = itemParams !== undefined
+            ? itemParams
+            : typeof item?.detail === "string" && item.detail.trim()
+                ? item.detail.trim()
+                : undefined;
         return {
             name: stringField(tool, "name") ??
                 stringField(inner, "name") ??
                 stringField(item, "name") ??
+                inferDeepseekToolName(item) ??
                 stringField(item, "type") ??
                 "tool",
             params: parseMaybeJson(tool?.input ??
                 tool?.rawInput ??
                 tool?.arguments ??
+                tool?.params ??
                 inner.input ??
+                inner.arguments ??
+                inner.params ??
                 item?.input ??
-                item?.arguments) ?? tool ?? item,
+                item?.arguments) ?? detailParams ?? tool ?? item,
             id: stringField(tool, "id") ?? stringField(inner, "id") ?? stringField(item, "id"),
             status: stringField(tool, "status") ?? stringField(inner, "status") ?? stringField(item, "status"),
         };
@@ -1112,7 +1123,10 @@ function extractDeepseekToolResult(raw) {
             item ??
             inner;
         return {
-            name: stringField(item, "name") ?? stringField(item, "type") ?? stringField(inner, "name"),
+            name: stringField(item, "name") ??
+                inferDeepseekToolName(item) ??
+                stringField(inner, "name") ??
+                stringField(item, "type"),
             result: stringifyToolResult(result),
             id: stringField(item, "id") ?? stringField(inner, "id"),
         };
@@ -1232,6 +1246,17 @@ function parseMaybeJson(value) {
         return value;
     }
 }
+function inferDeepseekToolName(item) {
+    const candidates = [stringField(item, "summary"), stringField(item, "detail")];
+    for (const candidate of candidates) {
+        if (!candidate)
+            continue;
+        const match = candidate.match(/^([A-Za-z0-9_.:-]+)\s*(?:started|completed|failed|returned|:)/);
+        if (match?.[1] && match[1] !== "tool_call")
+            return match[1];
+    }
+    return undefined;
+}
 function isEmptyRecord(value) {
     return !!value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0;
 }

package/dist/gateway/runtimes/deepseek-tui.js

@@ -97,10 +97,12 @@ export class DeepseekTuiAdapter {
                 signal: turnAbort.signal,
             });
             const text = runResult.text;
+            const error = runResult.error ??
+                (text === "" ? emptyCompletionError(handle.stderrTail) : undefined);
             return {
                 text,
                 newSessionId: threadId,
-                ...(runResult.error ? { error: runResult.error } : {}),
+                ...(error ? { error } : {}),
             };
         }
         catch (err) {
@@ -326,6 +328,7 @@ export class DeepseekTuiAdapter {
                     const label = stringField(payload, "name") ??
                         stringField(payload?.tool, "name") ??
                         stringField(payload?.payload?.tool, "name") ??
+                        inferDeepseekToolName(payload?.item ?? payload?.payload?.item) ??
                         "tool";
                     opts.onStatus?.({ kind: "thinking", phase: "updated", label });
                 }
@@ -423,7 +426,8 @@ function isDeepseekTerminalEvent(eventName, payload) {
         embedded === "done");
 }
 function isToolStarted(eventName, payload) {
-    return ((eventName === "item.started" && (!!payload?.tool || payload?.item?.kind === "tool_call")) ||
+    return ((eventName === "item.started" &&
+        (!!payload?.tool || payload?.item?.kind === "tool_call" || payload?.payload?.item?.kind === "tool_call")) ||
         (payload?.event === "item.started" && !!payload?.payload?.tool));
 }
 function isToolCompleted(eventName, payload) {
@@ -443,6 +447,26 @@ function isAgentReasoningItem(payload) {
 function extractDeepseekDelta(payload) {
     return stringField(payload, "delta") ?? stringField(payload?.payload, "delta") ?? "";
 }
+function inferDeepseekToolName(item) {
+    const candidates = [stringField(item, "summary"), stringField(item, "detail")];
+    for (const candidate of candidates) {
+        if (!candidate)
+            continue;
+        const match = candidate.match(/^([A-Za-z0-9_.:-]+)\s*(?:started|completed|failed|returned|:)/);
+        if (match?.[1] && match[1] !== "tool_call")
+            return match[1];
+    }
+    return undefined;
+}
+function emptyCompletionError(stderrTail) {
+    const tail = stderrTail.trim();
+    if (!tail) {
+        return "deepseek runtime completed with no assistant_message (check DEEPSEEK_API_KEY / model availability)";
+    }
+    const lines = tail.split(/\r?\n/).filter((line) => line.trim().length > 0);
+    const lastLines = lines.slice(-5).join("\n").slice(-500);
+    return `deepseek runtime completed with no assistant_message; stderr tail: ${lastLines}`;
+}
 function extractDeepseekError(eventName, payload) {
     if (eventName === "error") {
         return (stringField(payload, "message") ??

package/dist/index.js

@@ -5,7 +5,7 @@ import { homedir, hostname } from "node:os";
 import path from "node:path";
 import { augmentProcessPath } from "./path-env.js";
 import { loadConfig, saveConfig, initDefaultConfig, resolveConfiguredAgentIds, SNAPSHOT_PATH, CONFIG_FILE_PATH, CONFIG_MISSING, } from "./config.js";
-import { ensureNoOtherDaemonFromPidFile, pidAlive, readPid, removePidFile, stopDaemonFromPidFileForRestart, writeCurrentPid, } from "./daemon-singleton.js";
+import { ensureNoOtherDaemonFromPidFile, findOtherDaemonProcesses, pidAlive, readPid, removePidFile, stopDaemonFromPidFileForRestart, stopOtherDaemonProcessesForRestart, writeCurrentPid, } from "./daemon-singleton.js";
 import { resolveBootAgents } from "./agent-discovery.js";
 import { defaultTranscriptRoot, resolveTranscriptEnabled, transcriptAgentRoot, transcriptFilePath, } from "./gateway/index.js";
 import { startDaemon } from "./daemon.js";
@@ -469,6 +469,7 @@ async function cmdStart(args) {
     if (process.env.BOTCORD_DAEMON_CHILD !== "1") {
         await ensureUserAuthForStart(args);
         await stopDaemonFromPidFileForRestart({ logger: log });
+        await stopOtherDaemonProcessesForRestart({ logger: log });
     }
     else {
         const existing = ensureNoOtherDaemonFromPidFile();
@@ -487,7 +488,7 @@ async function cmdStart(args) {
             env: { ...process.env, BOTCORD_DAEMON_CHILD: "1" },
         });
         child.unref();
-        const deadline = Date.now() + 500;
+        const deadline = Date.now() + 5_000;
         let observed = null;
         while (Date.now() < deadline) {
             const p = readPid();
@@ -498,7 +499,7 @@ async function cmdStart(args) {
             await new Promise((r) => setTimeout(r, 50));
         }
         if (!observed) {
-            console.error(`daemon did not record pid within 500ms (expected child pid ${child.pid})`);
+            console.error(`daemon did not record pid within 5000ms (expected child pid ${child.pid})`);
             process.exit(1);
         }
         console.log(`daemon started (pid ${observed})`);
@@ -539,6 +540,7 @@ async function cmdStartCloud(_args) {
         hubUrl: cloudConfig.hubUrl,
     });
     await stopDaemonFromPidFileForRestart({ logger: log });
+    await stopOtherDaemonProcessesForRestart({ logger: log });
     writeCurrentPid();
     // Cloud daemons always start with an empty in-memory config — every
     // agent + route arrives over the control plane. We synthesize the
@@ -628,6 +630,7 @@ async function cmdStatus(args) {
     const file = readSnapshotFile();
     const now = Date.now();
     const snapshotAgeMs = file ? now - file.writtenAt : null;
+    const daemonProcesses = findOtherDaemonProcesses().filter((p) => p.pid !== pid);
     if (args.flags.json === true) {
         const payload = {
             pid,
@@ -652,6 +655,7 @@ async function cmdStatus(args) {
             snapshotWrittenAt: file?.writtenAt ?? null,
             snapshotAgeMs,
             snapshotPath: SNAPSHOT_PATH,
+            daemonProcesses,
         };
         console.log(JSON.stringify(payload, null, 2));
         return;
@@ -664,6 +668,7 @@ async function cmdStatus(args) {
         configPath,
         snapshot: file?.snapshot ?? null,
         snapshotAgeMs,
+        daemonProcesses,
     };
     console.log(renderStatus(input, now));
     if (userAuth) {

package/dist/status-render.d.ts

@@ -5,6 +5,10 @@ export declare const STALE_THRESHOLD_MS = 30000;
 export interface StatusRenderInput {
     pid: number | null;
     alive: boolean;
+    daemonProcesses?: Array<{
+        pid: number;
+        command?: string;
+    }> | null;
     /**
      * Effective list of agent ids the daemon is bound to. Single-agent installs
      * show one entry; multi-agent configs show all. `agentId` (scalar) is kept

package/dist/status-render.js

@@ -71,10 +71,23 @@ function renderRuntimeCircuitBreakers(snap, now) {
 export function renderStatus(input, now = Date.now()) {
     const lines = [];
     if (input.pid === null) {
-        lines.push("daemon: stopped");
+        const extras = input.daemonProcesses ?? [];
+        if (extras.length > 0) {
+            lines.push("daemon: no pid file");
+            lines.push(`warning: ${extras.length} daemon process${extras.length === 1 ? "" : "es"} detected without pid file`);
+            lines.push(`pids: ${extras.map((p) => p.pid).join(", ")}`);
+        }
+        else {
+            lines.push("daemon: stopped");
+        }
         return lines.join("\n");
     }
     lines.push(`daemon: pid ${input.pid} (${input.alive ? "alive" : "not alive"})`);
+    const extras = (input.daemonProcesses ?? []).filter((p) => p.pid !== input.pid);
+    if (extras.length > 0) {
+        lines.push(`warning: ${extras.length} additional daemon process${extras.length === 1 ? "" : "es"} detected`);
+        lines.push(`extra pids: ${extras.map((p) => p.pid).join(", ")}`);
+    }
     const agents = input.agents && input.agents.length > 0
         ? input.agents
         : input.agentId

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botcord/daemon",
-  "version": "0.2.79",
+  "version": "0.2.81",
   "description": "BotCord local daemon — bridges Hub inbox push to local Claude Code / Codex / Gemini CLIs",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@botcord/cli": "^0.1.7",
-    "@botcord/protocol-core": "^0.2.10",
+    "@botcord/protocol-core": "^0.2.11",
     "@larksuiteoapi/node-sdk": "^1.63.1",
     "ws": "^8.20.1"
   },

package/src/__tests__/daemon-singleton.test.ts

@@ -5,8 +5,10 @@ import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import {
   ensureNoOtherDaemonFromPidFile,
+  parseDaemonProcesses,
   readPid,
   removePidFile,
+  stopOtherDaemonProcessesForRestart,
   stopDaemonFromPidFileForRestart,
   writeCurrentPid,
 } from "../daemon-singleton.js";
@@ -73,6 +75,36 @@ describe("daemon singleton pid helpers", () => {
 
     expect(readPid(pidPath)).toBeNull();
   });
+
+  it("finds botcord daemon start commands in ps output", () => {
+    const out = parseDaemonProcesses(
+      [
+        "  111 node /Users/me/.botcord/daemon/node_modules/.bin/botcord-daemon start --foreground",
+        "  222 node /opt/botcord/daemon/dist/index.js start --foreground",
+        "  333 node /tmp/other.js",
+        `  ${process.pid} node /Users/me/.botcord/daemon/node_modules/.bin/botcord-daemon start --foreground`,
+      ].join("\n"),
+      process.pid,
+    );
+
+    expect(out.map((p) => p.pid)).toEqual([111, 222]);
+  });
+
+  it("terminates extra daemon processes discovered outside the pid file", async () => {
+    const child = spawn(process.execPath, ["-e", "setInterval(() => {}, 1000)"], {
+      stdio: "ignore",
+    });
+    children.push(child);
+    await waitForPid(child);
+
+    await stopOtherDaemonProcessesForRestart({
+      currentPid: process.pid,
+      processes: [{ pid: child.pid!, command: "node /opt/botcord/daemon/dist/index.js start --foreground" }],
+    });
+
+    await waitForExit(child);
+    expect(child.exitCode === null && child.signalCode === null).toBe(false);
+  });
 });
 
 async function waitForPid(child: ChildProcess): Promise<void> {

package/src/__tests__/status-render.test.ts

@@ -18,6 +18,18 @@ describe("renderStatus", () => {
     expect(out).toContain("stopped");
   });
 
+  it("reports daemon processes even when the pid file is missing", () => {
+    const out = renderStatus({
+      pid: null,
+      alive: false,
+      daemonProcesses: [{ pid: 1342 }, { pid: 1527 }],
+    });
+
+    expect(out).toContain("daemon: no pid file");
+    expect(out).toContain("warning: 2 daemon processes detected without pid file");
+    expect(out).toContain("pids: 1342, 1527");
+  });
+
   it("prints pid + agent + config when only PID state is known (no snapshot)", () => {
     const out = renderStatus(
       {
@@ -95,6 +107,17 @@ describe("renderStatus", () => {
     expect(out).toContain("agent:  ag_solo");
   });
 
+  it("warns when extra daemon processes are detected", () => {
+    const out = renderStatus({
+      pid: 42,
+      alive: true,
+      daemonProcesses: [{ pid: 1001 }, { pid: 1002 }],
+    });
+
+    expect(out).toContain("warning: 2 additional daemon processes detected");
+    expect(out).toContain("extra pids: 1001, 1002");
+  });
+
   it("surfaces ⚠ stale when snapshotAgeMs exceeds the threshold", () => {
     const out = renderStatus(
       {

package/src/daemon-singleton.ts

@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { PID_PATH } from "./config.js";
 
@@ -31,6 +32,46 @@ export function pidAlive(pid: number): boolean {
   }
 }
 
+export interface DaemonProcessInfo {
+  pid: number;
+  command: string;
+}
+
+export function parseDaemonProcesses(
+  psOutput: string,
+  currentPid: number = process.pid,
+): DaemonProcessInfo[] {
+  const out: DaemonProcessInfo[] = [];
+  for (const line of psOutput.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    const match = /^(\d+)\s+(.+)$/.exec(trimmed);
+    if (!match) continue;
+    const pid = Number(match[1]);
+    if (!Number.isFinite(pid) || pid <= 0 || pid === currentPid) continue;
+    const command = match[2] ?? "";
+    if (!isBotCordDaemonStartCommand(command)) continue;
+    out.push({ pid, command });
+  }
+  return out;
+}
+
+export function findOtherDaemonProcesses(
+  opts: {
+    currentPid?: number;
+  } = {},
+): DaemonProcessInfo[] {
+  const currentPid = opts.currentPid ?? process.pid;
+  try {
+    const output = execFileSync("ps", ["-axo", "pid=,command="], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+    });
+    return parseDaemonProcesses(output, currentPid).filter((p) => pidAlive(p.pid));
+  } catch {
+    return [];
+  }
+}
+
 export async function waitForPidExit(pid: number, timeoutMs: number): Promise<boolean> {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
@@ -85,6 +126,41 @@ export async function stopDaemonFromPidFileForRestart(
   }
 }
 
+export async function stopOtherDaemonProcessesForRestart(
+  opts: {
+    currentPid?: number;
+    logger?: SingletonLogger;
+    processes?: DaemonProcessInfo[];
+  } = {},
+): Promise<DaemonProcessInfo[]> {
+  const currentPid = opts.currentPid ?? process.pid;
+  const logger = opts.logger ?? noopLogger;
+  const processes = opts.processes ?? findOtherDaemonProcesses({ currentPid });
+  for (const proc of processes) {
+    logger.info("additional daemon process found; restarting", {
+      pid: proc.pid,
+      command: proc.command,
+    });
+    try {
+      process.kill(proc.pid, "SIGTERM");
+    } catch {
+      continue;
+    }
+    if (!(await waitForPidExit(proc.pid, 5_000))) {
+      logger.warn("additional daemon did not stop after SIGTERM; sending SIGKILL", {
+        pid: proc.pid,
+      });
+      try {
+        process.kill(proc.pid, "SIGKILL");
+      } catch {
+        // ignore
+      }
+      await waitForPidExit(proc.pid, 2_000);
+    }
+  }
+  return processes;
+}
+
 export function ensureNoOtherDaemonFromPidFile(
   opts: {
     pidPath?: string;
@@ -117,6 +193,15 @@ export function removePidFile(pidPath = PID_PATH): void {
   }
 }
 
+function isBotCordDaemonStartCommand(command: string): boolean {
+  if (!/\bstart\b/.test(command)) return false;
+  return (
+    command.includes("botcord-daemon") ||
+    /(?:^|\s)\S*botcord\S*\/daemon\/dist\/index\.js(?:\s|$)/.test(command) ||
+    /(?:^|\s)\S*packages\/daemon\/dist\/index\.js(?:\s|$)/.test(command)
+  );
+}
+
 function delay(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }

package/src/gateway/__tests__/botcord-channel.test.ts

@@ -699,7 +699,7 @@ describe("createBotCordChannel — streamBlock()", () => {
         },
         1,
       ),
-    ).toEqual({
+    ).toMatchObject({
       kind: "tool_call",
       seq: 1,
       payload: {
@@ -725,7 +725,7 @@ describe("createBotCordChannel — streamBlock()", () => {
         },
         2,
       ),
-    ).toEqual({
+    ).toMatchObject({
       kind: "tool_call",
       seq: 2,
       payload: {
@@ -758,7 +758,7 @@ describe("createBotCordChannel — streamBlock()", () => {
         },
         3,
       ),
-    ).toEqual({
+    ).toMatchObject({
       kind: "tool_result",
       seq: 3,
       payload: {
@@ -782,7 +782,7 @@ describe("createBotCordChannel — streamBlock()", () => {
         },
         4,
       ),
-    ).toEqual({
+    ).toMatchObject({
       kind: "tool_call",
       seq: 4,
       payload: {
@@ -982,7 +982,7 @@ describe("createBotCordChannel — streamBlock()", () => {
         },
         7,
       ),
-    ).toEqual({
+    ).toMatchObject({
       kind: "tool_call",
       seq: 7,
       payload: {
@@ -991,6 +991,102 @@ describe("createBotCordChannel — streamBlock()", () => {
         params: { query: "上海天气" },
         status: "in_progress",
       },
+      raw: {
+        event: "item.started",
+        payload: {
+          item: { id: "item_tool", kind: "tool_call", status: "in_progress" },
+          tool: { id: "call_1", name: "web_search", input: { query: "上海天气" } },
+        },
+      },
+    });
+  });
+
+  it("infers current DeepSeek tool input from item summary and detail", () => {
+    expect(
+      __normalizeBlockForHubForTests(
+        {
+          kind: "tool_use",
+          seq: 8,
+          raw: {
+            event: "item.started",
+            payload: {
+              item: {
+                id: "item_exec",
+                kind: "tool_call",
+                status: "in_progress",
+                summary: "exec_shell started",
+                detail: "{\"cmd\":\"botcord-daemon --version\"}",
+              },
+            },
+          },
+        },
+        8,
+      ),
+    ).toMatchObject({
+      kind: "tool_call",
+      seq: 8,
+      payload: {
+        id: "item_exec",
+        name: "exec_shell",
+        params: { cmd: "botcord-daemon --version" },
+        status: "in_progress",
+      },
+      raw: {
+        event: "item.started",
+        payload: {
+          item: {
+            id: "item_exec",
+            kind: "tool_call",
+            status: "in_progress",
+            summary: "exec_shell started",
+            detail: "{\"cmd\":\"botcord-daemon --version\"}",
+          },
+        },
+      },
+    });
+  });
+
+  it("infers current DeepSeek tool result name from item summary", () => {
+    expect(
+      __normalizeBlockForHubForTests(
+        {
+          kind: "tool_result",
+          seq: 9,
+          raw: {
+            event: "item.completed",
+            payload: {
+              item: {
+                id: "item_exec",
+                kind: "tool_call",
+                status: "completed",
+                summary: "exec_shell: botcord-daemon 0.2.78",
+                detail: "botcord-daemon 0.2.78",
+              },
+            },
+          },
+        },
+        9,
+      ),
+    ).toMatchObject({
+      kind: "tool_result",
+      seq: 9,
+      payload: {
+        name: "exec_shell",
+        result: "botcord-daemon 0.2.78",
+        tool_use_id: "item_exec",
+      },
+      raw: {
+        event: "item.completed",
+        payload: {
+          item: {
+            id: "item_exec",
+            kind: "tool_call",
+            status: "completed",
+            summary: "exec_shell: botcord-daemon 0.2.78",
+            detail: "botcord-daemon 0.2.78",
+          },
+        },
+      },
     });
   });
 
@@ -1015,10 +1111,22 @@ describe("createBotCordChannel — streamBlock()", () => {
         },
         8,
       ),
-    ).toEqual({
+    ).toMatchObject({
       kind: "thinking",
       seq: 8,
       payload: { details: "I should answer briefly." },
+      raw: {
+        event: "item.completed",
+        payload: {
+          item: {
+            id: "item_reasoning",
+            kind: "agent_reasoning",
+            status: "completed",
+            summary: "I should answer briefly.",
+            detail: "I should answer briefly.",
+          },
+        },
+      },
     });
   });
 
@@ -1090,10 +1198,11 @@ describe("createBotCordChannel — streamBlock()", () => {
         log: silentLog,
       });
       const body = JSON.parse(fetchSpy.mock.calls[0][1].body as string);
-      expect(body.block).toEqual({
+      expect(body.block).toMatchObject({
         kind: "thinking",
         seq: 7,
         payload: { phase: "updated", label: "Searching web", source: "runtime", details: "Searching web" },
+        raw: { phase: "updated", label: "Searching web", source: "runtime" },
       });
     } finally {
       globalThis.fetch = realFetch;

package/src/gateway/__tests__/deepseek-tui-adapter.test.ts

@@ -304,6 +304,55 @@ describe("DeepseekTuiAdapter", () => {
     }
   });
 
+  it("infers current DeepSeek tool status labels without a payload.tool object", async () => {
+    const server = await startMockDeepseekServer({
+      events: [
+        {
+          event: "turn.started",
+          data: { thread_id: "thr_test", turn_id: "turn_test", event: "turn.started" },
+        },
+        {
+          event: "item.started",
+          data: {
+            thread_id: "thr_test",
+            turn_id: "turn_test",
+            event: "item.started",
+            payload: {
+              item: {
+                id: "item_exec",
+                kind: "tool_call",
+                status: "in_progress",
+                summary: "exec_shell started",
+                detail: "{\"cmd\":\"botcord-daemon --version\"}",
+              },
+            },
+          },
+        },
+        {
+          event: "item.delta",
+          data: {
+            thread_id: "thr_test",
+            turn_id: "turn_test",
+            event: "item.delta",
+            payload: { kind: "agent_message", delta: "done" },
+          },
+        },
+        {
+          event: "turn.completed",
+          data: { thread_id: "thr_test", turn_id: "turn_test", event: "turn.completed" },
+        },
+      ],
+    });
+    try {
+      const { result, blocks, status } = runAdapter(server.baseUrl, server.token);
+      await expect(result).resolves.toMatchObject({ text: "done" });
+      expect(blocks).toEqual(expect.arrayContaining(["tool_use", "assistant_text"]));
+      expect(status).toContainEqual({ phase: "updated", label: "exec_shell" });
+    } finally {
+      await server.close();
+    }
+  });
+
   it("emits current DeepSeek agent_reasoning completions as thinking blocks", async () => {
     const server = await startMockDeepseekServer({
       events: [
@@ -410,6 +459,43 @@ describe("DeepseekTuiAdapter", () => {
     }
   });
 
+  it("surfaces a diagnostic error when DeepSeek completes a turn with no assistant_message", async () => {
+    const server = await startMockDeepseekServer({
+      events: [
+        { event: "turn.started", data: { thread_id: "thr_test", turn_id: "turn_test" } },
+        {
+          event: "item.completed",
+          data: {
+            thread_id: "thr_test",
+            turn_id: "turn_test",
+            event: "item.completed",
+            payload: {
+              item: {
+                id: "item_reasoning",
+                kind: "agent_reasoning",
+                status: "completed",
+                summary: "thinking...",
+              },
+            },
+          },
+        },
+        {
+          event: "turn.completed",
+          data: { thread_id: "thr_test", turn_id: "turn_test", payload: { turn: { status: "completed" } } },
+        },
+      ],
+    });
+    try {
+      const { result } = runAdapter(server.baseUrl, server.token);
+      const res = await result;
+      expect(res.text).toBe("");
+      expect(res.newSessionId).toBe("thr_test");
+      expect(res.error).toMatch(/no assistant_message/);
+    } finally {
+      await server.close();
+    }
+  });
+
   it("returns a runtime error when DeepSeek completes the turn as failed", async () => {
     const server = await startMockDeepseekServer({
       events: [

package/src/gateway/channels/botcord.ts

@@ -977,10 +977,13 @@ export { normalizeBlockForHub as __normalizeBlockForHubForTests };
 function normalizeBlockForHub(
   block: { raw?: unknown; kind?: string; seq?: number } | undefined,
   seq: number,
-): { kind: string; seq: number; payload: Record<string, unknown> } {
+): { kind: string; seq: number; payload: Record<string, unknown>; raw?: unknown } {
   const raw = (block?.raw ?? {}) as any;
   const kind = block?.kind ?? "other";
   const payload: Record<string, unknown> = {};
+  const withRaw = (out: { kind: string; seq: number; payload: Record<string, unknown> }) => (
+    block && "raw" in block ? { ...out, raw: block.raw } : out
+  );
 
   if (kind === "assistant_text") {
     // Claude Code: {type:"assistant", message:{content:[{type:"text",text}]}}
@@ -1022,7 +1025,7 @@ function normalizeBlockForHub(
       if (call.id) payload.id = call.id;
       if (call.status) payload.status = call.status;
     }
-    return { kind: "tool_call", seq, payload };
+    return withRaw({ kind: "tool_call", seq, payload });
   }
 
   if (kind === "tool_result") {
@@ -1032,7 +1035,7 @@ function normalizeBlockForHub(
       payload.result = result.result;
       if (result.id) payload.tool_use_id = result.id;
     }
-    return { kind: "tool_result", seq, payload };
+    return withRaw({ kind: "tool_result", seq, payload });
   }
 
   if (kind === "system") {
@@ -1040,7 +1043,7 @@ function normalizeBlockForHub(
     if (typeof raw?.session_id === "string") payload.session_id = raw.session_id;
     if (typeof raw?.model === "string") payload.model = raw.model;
     payload.details = formatBlockDetails(raw);
-    return { kind: "system", seq, payload };
+    return withRaw({ kind: "system", seq, payload });
   }
 
   if (kind === "thinking") {
@@ -1052,7 +1055,7 @@ function normalizeBlockForHub(
     if (typeof raw?.label === "string") payload.label = raw.label;
     if (typeof raw?.source === "string") payload.source = raw.source;
     payload.details = formatBlockDetails(raw);
-    return { kind: "thinking", seq, payload };
+    return withRaw({ kind: "thinking", seq, payload });
   }
 
   // "other" — e.g. Claude Code `type:"result"` end-of-turn summary.
@@ -1062,14 +1065,14 @@ function normalizeBlockForHub(
     const event = typeof raw?.event === "string" ? raw.event : undefined;
     const embedded = typeof raw?.payload?.event === "string" ? raw.payload.event : undefined;
     if (event || embedded) payload.event = event ?? embedded;
-    return { kind: "other", seq, payload };
+    return withRaw({ kind: "other", seq, payload });
   }
   if (raw?.type === "result") {
     if (typeof raw.result === "string") payload.text = raw.result;
     if (typeof raw.subtype === "string") payload.subtype = raw.subtype;
     if (typeof raw.total_cost_usd === "number") payload.total_cost_usd = raw.total_cost_usd;
   }
-  return { kind: "other", seq, payload };
+  return withRaw({ kind: "other", seq, payload });
 }
 
 function isTerminalRuntimeBlock(raw: any): boolean {
@@ -1213,21 +1216,32 @@ function extractDeepseekToolCall(raw: any): { name: string; params?: unknown; id
           : {};
     const item = inner.item && typeof inner.item === "object" ? inner.item : undefined;
     const tool = inner.tool && typeof inner.tool === "object" ? inner.tool : item?.tool;
+    const itemParams = parseMaybeJson(item?.input ?? item?.arguments ?? item?.detail);
+    const detailParams =
+      itemParams !== undefined
+        ? itemParams
+        : typeof item?.detail === "string" && item.detail.trim()
+          ? item.detail.trim()
+          : undefined;
     return {
       name:
         stringField(tool, "name") ??
         stringField(inner, "name") ??
         stringField(item, "name") ??
+        inferDeepseekToolName(item) ??
         stringField(item, "type") ??
         "tool",
       params: parseMaybeJson(
         tool?.input ??
           tool?.rawInput ??
           tool?.arguments ??
+          tool?.params ??
           inner.input ??
+          inner.arguments ??
+          inner.params ??
           item?.input ??
           item?.arguments,
-      ) ?? tool ?? item,
+      ) ?? detailParams ?? tool ?? item,
       id: stringField(tool, "id") ?? stringField(inner, "id") ?? stringField(item, "id"),
       status: stringField(tool, "status") ?? stringField(inner, "status") ?? stringField(item, "status"),
     };
@@ -1275,7 +1289,11 @@ function extractDeepseekToolResult(raw: any): { name?: string; result: string; i
       item ??
       inner;
     return {
-      name: stringField(item, "name") ?? stringField(item, "type") ?? stringField(inner, "name"),
+      name:
+        stringField(item, "name") ??
+        inferDeepseekToolName(item) ??
+        stringField(inner, "name") ??
+        stringField(item, "type"),
       result: stringifyToolResult(result),
       id: stringField(item, "id") ?? stringField(inner, "id"),
     };
@@ -1392,6 +1410,16 @@ function parseMaybeJson(value: unknown): unknown {
   }
 }
 
+function inferDeepseekToolName(item: any): string | undefined {
+  const candidates = [stringField(item, "summary"), stringField(item, "detail")];
+  for (const candidate of candidates) {
+    if (!candidate) continue;
+    const match = candidate.match(/^([A-Za-z0-9_.:-]+)\s*(?:started|completed|failed|returned|:)/);
+    if (match?.[1] && match[1] !== "tool_call") return match[1];
+  }
+  return undefined;
+}
+
 function isEmptyRecord(value: unknown): boolean {
   return !!value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0;
 }

package/src/gateway/runtimes/deepseek-tui.ts

@@ -143,11 +143,14 @@ export class DeepseekTuiAdapter implements RuntimeAdapter {
         signal: turnAbort.signal,
       });
       const text = runResult.text;
+      const error =
+        runResult.error ??
+        (text === "" ? emptyCompletionError(handle.stderrTail) : undefined);
 
       return {
         text,
         newSessionId: threadId,
-        ...(runResult.error ? { error: runResult.error } : {}),
+        ...(error ? { error } : {}),
       };
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
@@ -393,6 +396,7 @@ export class DeepseekTuiAdapter implements RuntimeAdapter {
             stringField(payload, "name") ??
             stringField(payload?.tool, "name") ??
             stringField(payload?.payload?.tool, "name") ??
+            inferDeepseekToolName(payload?.item ?? payload?.payload?.item) ??
             "tool";
           opts.onStatus?.({ kind: "thinking", phase: "updated", label });
         } else if (isDeepseekTerminalEvent(eventName, payload)) {
@@ -494,7 +498,8 @@ function isDeepseekTerminalEvent(eventName: string, payload: any): boolean {
 
 function isToolStarted(eventName: string, payload: any): boolean {
   return (
-    (eventName === "item.started" && (!!payload?.tool || payload?.item?.kind === "tool_call")) ||
+    (eventName === "item.started" &&
+      (!!payload?.tool || payload?.item?.kind === "tool_call" || payload?.payload?.item?.kind === "tool_call")) ||
     (payload?.event === "item.started" && !!payload?.payload?.tool)
   );
 }
@@ -522,6 +527,26 @@ function extractDeepseekDelta(payload: any): string {
   return stringField(payload, "delta") ?? stringField(payload?.payload, "delta") ?? "";
 }
 
+function inferDeepseekToolName(item: any): string | undefined {
+  const candidates = [stringField(item, "summary"), stringField(item, "detail")];
+  for (const candidate of candidates) {
+    if (!candidate) continue;
+    const match = candidate.match(/^([A-Za-z0-9_.:-]+)\s*(?:started|completed|failed|returned|:)/);
+    if (match?.[1] && match[1] !== "tool_call") return match[1];
+  }
+  return undefined;
+}
+
+function emptyCompletionError(stderrTail: string): string {
+  const tail = stderrTail.trim();
+  if (!tail) {
+    return "deepseek runtime completed with no assistant_message (check DEEPSEEK_API_KEY / model availability)";
+  }
+  const lines = tail.split(/\r?\n/).filter((line) => line.trim().length > 0);
+  const lastLines = lines.slice(-5).join("\n").slice(-500);
+  return `deepseek runtime completed with no assistant_message; stderr tail: ${lastLines}`;
+}
+
 function extractDeepseekError(eventName: string, payload: any): string | undefined {
   if (eventName === "error") {
     return (

package/src/index.ts

@@ -18,10 +18,12 @@ import {
 } from "./config.js";
 import {
   ensureNoOtherDaemonFromPidFile,
+  findOtherDaemonProcesses,
   pidAlive,
   readPid,
   removePidFile,
   stopDaemonFromPidFileForRestart,
+  stopOtherDaemonProcessesForRestart,
   writeCurrentPid,
 } from "./daemon-singleton.js";
 import { resolveBootAgents } from "./agent-discovery.js";
@@ -585,6 +587,7 @@ async function cmdStart(args: ParsedArgs): Promise<void> {
   if (process.env.BOTCORD_DAEMON_CHILD !== "1") {
     await ensureUserAuthForStart(args);
     await stopDaemonFromPidFileForRestart({ logger: log });
+    await stopOtherDaemonProcessesForRestart({ logger: log });
   } else {
     const existing = ensureNoOtherDaemonFromPidFile();
     if (existing) {
@@ -603,7 +606,7 @@ async function cmdStart(args: ParsedArgs): Promise<void> {
       env: { ...process.env, BOTCORD_DAEMON_CHILD: "1" },
     });
     child.unref();
-    const deadline = Date.now() + 500;
+    const deadline = Date.now() + 5_000;
     let observed: number | null = null;
     while (Date.now() < deadline) {
       const p = readPid();
@@ -614,7 +617,7 @@ async function cmdStart(args: ParsedArgs): Promise<void> {
       await new Promise((r) => setTimeout(r, 50));
     }
     if (!observed) {
-      console.error(`daemon did not record pid within 500ms (expected child pid ${child.pid})`);
+      console.error(`daemon did not record pid within 5000ms (expected child pid ${child.pid})`);
       process.exit(1);
     }
     console.log(`daemon started (pid ${observed})`);
@@ -659,6 +662,7 @@ async function cmdStartCloud(_args: ParsedArgs): Promise<void> {
     hubUrl: cloudConfig.hubUrl,
   });
   await stopDaemonFromPidFileForRestart({ logger: log });
+  await stopOtherDaemonProcessesForRestart({ logger: log });
   writeCurrentPid();
 
   // Cloud daemons always start with an empty in-memory config — every
@@ -755,6 +759,7 @@ async function cmdStatus(args: ParsedArgs): Promise<void> {
   const file = readSnapshotFile();
   const now = Date.now();
   const snapshotAgeMs = file ? now - file.writtenAt : null;
+  const daemonProcesses = findOtherDaemonProcesses().filter((p) => p.pid !== pid);
 
   if (args.flags.json === true) {
     const payload = {
@@ -780,6 +785,7 @@ async function cmdStatus(args: ParsedArgs): Promise<void> {
       snapshotWrittenAt: file?.writtenAt ?? null,
       snapshotAgeMs,
       snapshotPath: SNAPSHOT_PATH,
+      daemonProcesses,
     };
     console.log(JSON.stringify(payload, null, 2));
     return;
@@ -793,6 +799,7 @@ async function cmdStatus(args: ParsedArgs): Promise<void> {
     configPath,
     snapshot: file?.snapshot ?? null,
     snapshotAgeMs,
+    daemonProcesses,
   };
   console.log(renderStatus(input, now));
   if (userAuth) {

package/src/status-render.ts

@@ -7,6 +7,7 @@ export const STALE_THRESHOLD_MS = 30_000;
 export interface StatusRenderInput {
   pid: number | null;
   alive: boolean;
+  daemonProcesses?: Array<{ pid: number; command?: string }> | null;
   /**
    * Effective list of agent ids the daemon is bound to. Single-agent installs
    * show one entry; multi-agent configs show all. `agentId` (scalar) is kept
@@ -114,10 +115,22 @@ function renderRuntimeCircuitBreakers(
 export function renderStatus(input: StatusRenderInput, now: number = Date.now()): string {
   const lines: string[] = [];
   if (input.pid === null) {
-    lines.push("daemon: stopped");
+    const extras = input.daemonProcesses ?? [];
+    if (extras.length > 0) {
+      lines.push("daemon: no pid file");
+      lines.push(`warning: ${extras.length} daemon process${extras.length === 1 ? "" : "es"} detected without pid file`);
+      lines.push(`pids: ${extras.map((p) => p.pid).join(", ")}`);
+    } else {
+      lines.push("daemon: stopped");
+    }
     return lines.join("\n");
   }
   lines.push(`daemon: pid ${input.pid} (${input.alive ? "alive" : "not alive"})`);
+  const extras = (input.daemonProcesses ?? []).filter((p) => p.pid !== input.pid);
+  if (extras.length > 0) {
+    lines.push(`warning: ${extras.length} additional daemon process${extras.length === 1 ? "" : "es"} detected`);
+    lines.push(`extra pids: ${extras.map((p) => p.pid).join(", ")}`);
+  }
   const agents =
     input.agents && input.agents.length > 0
       ? input.agents