@botcord/daemon 0.2.85 → 0.2.87

package/src/gateway/channels/botcord.ts

@@ -1196,27 +1196,46 @@ function extractToolResult(raw: any): { name?: string; result: string; id?: stri
 function extractDeepseekToolCall(raw: any): { name: string; params?: unknown; id?: string; status?: string } | null {
   const payload = raw?.payload;
   if (!payload || typeof payload !== "object") return null;
+  const innerPayload = unwrapDeepseekPayload(raw);
+  const event = stringField(raw, "event") ?? stringField(payload, "event");
 
-  if (raw?.event === "tool.started") {
-    const tool = payload.tool && typeof payload.tool === "object" ? payload.tool : undefined;
+  if (event === "tool.started") {
+    const tool = innerPayload?.tool && typeof innerPayload.tool === "object" ? innerPayload.tool : undefined;
     return {
-      name: stringField(payload, "name") ?? stringField(tool, "name") ?? "tool",
-      params: parseMaybeJson(payload.input ?? payload.arguments ?? payload.params ?? tool?.input ?? tool?.rawInput),
-      id: stringField(payload, "id") ?? stringField(tool, "id"),
-      status: stringField(payload, "status") ?? stringField(tool, "status"),
+      name: stringField(innerPayload, "name") ?? stringField(tool, "name") ?? "tool",
+      params: parseMaybeJson(
+        innerPayload?.input ??
+          innerPayload?.arguments ??
+          innerPayload?.params ??
+          tool?.input ??
+          tool?.rawInput ??
+          tool?.arguments ??
+          tool?.params,
+      ),
+      id: stringField(innerPayload, "id") ?? stringField(tool, "id"),
+      status: stringField(innerPayload, "status") ?? stringField(tool, "status"),
     };
   }
 
-  if (raw?.event === "item.started" || payload.event === "item.started") {
-    const inner =
-      raw?.event === "item.started"
-        ? payload
-        : payload.payload && typeof payload.payload === "object"
-          ? payload.payload
-          : {};
+  if (event === "item.started") {
+    const inner = innerPayload ?? {};
     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 metadata = item?.metadata && typeof item.metadata === "object" ? item.metadata : undefined;
+    const metadataCommand =
+      metadata && (metadata.command ?? metadata.cmd)
+        ? { [metadata.command ? "command" : "cmd"]: metadata.command ?? metadata.cmd }
+        : undefined;
+    const itemParams = parseMaybeJson(
+      item?.input ??
+        item?.arguments ??
+        item?.params ??
+        metadata?.input ??
+        metadata?.arguments ??
+        metadata?.params ??
+        metadataCommand ??
+        item?.detail,
+    );
     const detailParams =
       itemParams !== undefined
         ? itemParams
@@ -1240,9 +1259,18 @@ function extractDeepseekToolCall(raw: any): { name: string; params?: unknown; id
           inner.arguments ??
           inner.params ??
           item?.input ??
-          item?.arguments,
+          item?.arguments ??
+          item?.params ??
+          metadata?.input ??
+          metadata?.arguments ??
+          metadata?.params ??
+          metadataCommand,
       ) ?? detailParams ?? tool ?? item,
-      id: stringField(tool, "id") ?? stringField(inner, "id") ?? stringField(item, "id"),
+      id:
+        stringField(tool, "id") ??
+        stringField(inner, "id") ??
+        stringField(item, "id") ??
+        stringField(payload, "item_id"),
       status: stringField(tool, "status") ?? stringField(inner, "status") ?? stringField(item, "status"),
     };
   }
@@ -1253,28 +1281,26 @@ function extractDeepseekToolCall(raw: any): { name: string; params?: unknown; id
 function extractDeepseekToolResult(raw: any): { name?: string; result: string; id?: string } | null {
   const payload = raw?.payload;
   if (!payload || typeof payload !== "object") return null;
+  const innerPayload = unwrapDeepseekPayload(raw);
+  const event = stringField(raw, "event") ?? stringField(payload, "event");
 
-  if (raw?.event === "tool.completed") {
-    const result = payload.output ?? payload.result ?? payload.content ?? payload.error ?? payload;
+  if (event === "tool.completed") {
+    const result =
+      innerPayload?.output ??
+      innerPayload?.result ??
+      innerPayload?.content ??
+      innerPayload?.error ??
+      innerPayload ??
+      payload;
     return {
-      name: stringField(payload, "name"),
+      name: stringField(innerPayload, "name"),
       result: stringifyToolResult(result),
-      id: stringField(payload, "id"),
+      id: stringField(innerPayload, "id"),
     };
   }
 
-  if (
-    raw?.event === "item.completed" ||
-    raw?.event === "item.failed" ||
-    payload.event === "item.completed" ||
-    payload.event === "item.failed"
-  ) {
-    const inner =
-      raw?.event === "item.completed" || raw?.event === "item.failed"
-        ? payload
-        : payload.payload && typeof payload.payload === "object"
-          ? payload.payload
-          : {};
+  if (event === "item.completed" || event === "item.failed") {
+    const inner = innerPayload ?? {};
     const item = inner.item && typeof inner.item === "object" ? inner.item : undefined;
     const result =
       item?.output ??
@@ -1295,13 +1321,35 @@ function extractDeepseekToolResult(raw: any): { name?: string; result: string; i
         stringField(inner, "name") ??
         stringField(item, "type"),
       result: stringifyToolResult(result),
-      id: stringField(item, "id") ?? stringField(inner, "id"),
+      id: stringField(item, "id") ?? stringField(inner, "id") ?? stringField(payload, "item_id"),
     };
   }
 
   return null;
 }
 
+function unwrapDeepseekPayload(raw: any): any {
+  const payload = raw?.payload;
+  if (!payload || typeof payload !== "object") return undefined;
+  const nested = payload.payload;
+  if (nested && typeof nested === "object") {
+    const outerEvent = stringField(payload, "event");
+    if (
+      outerEvent ||
+      nested.item ||
+      nested.tool ||
+      nested.turn ||
+      nested.kind ||
+      nested.output ||
+      nested.result ||
+      nested.error
+    ) {
+      return nested;
+    }
+  }
+  return payload;
+}
+
 function formatBlockDetails(raw: unknown): string {
   if (!raw || typeof raw !== "object") return "";
   const r = raw as any;

package/src/gateway/dispatcher.ts

@@ -208,6 +208,31 @@ function buildRuntimeRecoveryPrompt(args: {
   ].join("\n");
 }
 
+/**
+ * Pick the canonical reply_to value to attach to outbound replies for a given
+ * inbound `GatewayInboundMessage`. Priority:
+ *
+ *   1. `msg.replyTo` — the inbound was itself a reply; preserve the chain so
+ *      receipts and threaded replies point at the original target.
+ *   2. `raw.envelope.msg_id` — the wire-protocol identifier (UUID per a2a/0.1).
+ *      This is the canonical form the hub stores in `reply_to_msg_id`.
+ *   3. `msg.id` — fallback to the hub_msg_id (`h_*`) the BotCord channel
+ *      stamps on every inbound. The hub accepts this form via
+ *      `_load_reply_target`'s prefix-based discriminator, but emitting it is
+ *      lossy because the hub then has to resolve it back to msg_id.
+ *
+ * Exported for unit testing; production code paths use Dispatcher.providerReplyTo.
+ */
+export function pickReplyToTarget(msg: GatewayInboundMessage): string {
+  if (msg.replyTo) return msg.replyTo;
+  const raw = msg.raw as { envelope?: { msg_id?: unknown } } | null | undefined;
+  const envMsgId =
+    raw && typeof raw.envelope?.msg_id === "string" && raw.envelope.msg_id
+      ? raw.envelope.msg_id
+      : null;
+  return envMsgId ?? msg.id;
+}
+
 /** Factory signature for building a runtime adapter at turn dispatch time. */
 export type RuntimeFactory = (
   runtimeId: string,
@@ -2132,7 +2157,7 @@ export class Dispatcher {
   }
 
   private providerReplyTo(msg: GatewayInboundMessage): string {
-    return msg.replyTo ?? msg.id;
+    return pickReplyToTarget(msg);
   }
 
   private emitInbound(turnId: string, msg: GatewayInboundEnvelope["message"]): void {

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

@@ -497,9 +497,15 @@ function isDeepseekTerminalEvent(eventName: string, payload: any): boolean {
 }
 
 function isToolStarted(eventName: string, payload: any): boolean {
+  const itemKind = payload?.payload?.item?.kind ?? payload?.item?.kind;
   return (
     (eventName === "item.started" &&
-      (!!payload?.tool || payload?.item?.kind === "tool_call" || payload?.payload?.item?.kind === "tool_call")) ||
+      (
+        !!payload?.tool ||
+        itemKind === "tool_call" ||
+        itemKind === "command_execution" ||
+        itemKind === "file_change"
+      )) ||
     (payload?.event === "item.started" && !!payload?.payload?.tool)
   );
 }

package/src/index.ts

@@ -17,6 +17,7 @@ import {
   type RouteRuleMatch,
 } from "./config.js";
 import {
+  acquireDaemonSingletonLock,
   ensureNoOtherDaemonFromPidFile,
   findOtherDaemonProcesses,
   pidAlive,
@@ -625,13 +626,22 @@ async function cmdStart(args: ParsedArgs): Promise<void> {
   }
 
   // Foreground: we ARE the daemon.
+  const singletonLock = await acquireDaemonSingletonLock({ logger: log });
   writeCurrentPid();
-  const handle = await startDaemon({ config: cfg, configPath: CONFIG_FILE_PATH });
+  let handle: Awaited<ReturnType<typeof startDaemon>>;
+  try {
+    handle = await startDaemon({ config: cfg, configPath: CONFIG_FILE_PATH });
+  } catch (err) {
+    removePidFile();
+    singletonLock.release();
+    throw err;
+  }
 
   const shutdown = async (sig: string) => {
     log.info("signal received", { sig });
     await handle.stop(sig);
     removePidFile();
+    singletonLock.release();
     process.exit(0);
   };
   process.on("SIGTERM", () => shutdown("SIGTERM"));
@@ -661,6 +671,7 @@ async function cmdStartCloud(_args: ParsedArgs): Promise<void> {
     daemonInstanceId: cloudConfig.daemonInstanceId,
     hubUrl: cloudConfig.hubUrl,
   });
+  const singletonLock = await acquireDaemonSingletonLock({ logger: log });
   await stopDaemonFromPidFileForRestart({ logger: log });
   await stopOtherDaemonProcessesForRestart({ logger: log });
   writeCurrentPid();
@@ -676,16 +687,24 @@ async function cmdStartCloud(_args: ParsedArgs): Promise<void> {
   saveConfig(cfg);
   log.info("cloud mode config initialized", { configPath: CONFIG_FILE_PATH });
 
-  const handle = await startCloudDaemon({
-    cloudConfig,
-    config: cfg,
-    configPath: CONFIG_FILE_PATH,
-  });
+  let handle: Awaited<ReturnType<typeof startCloudDaemon>>;
+  try {
+    handle = await startCloudDaemon({
+      cloudConfig,
+      config: cfg,
+      configPath: CONFIG_FILE_PATH,
+    });
+  } catch (err) {
+    removePidFile();
+    singletonLock.release();
+    throw err;
+  }
 
   const shutdown = async (sig: string): Promise<void> => {
     log.info("signal received", { sig });
     await handle.stop(sig);
     removePidFile();
+    singletonLock.release();
     process.exit(0);
   };
   process.on("SIGTERM", () => void shutdown("SIGTERM"));

package/src/provision.ts

@@ -13,6 +13,7 @@ import {
   defaultCredentialsFile,
   derivePublicKey,
   loadStoredCredentials,
+  normalizeTokenExpiresAt,
   writeCredentialsFile,
   type AgentIdentitySnapshot,
   type ControlAck,
@@ -74,6 +75,7 @@ import { log as daemonLog } from "./log.js";
 import { discoverAgentCredentials } from "./agent-discovery.js";
 import { resolveMemoryDir } from "./working-memory.js";
 import { discoverRuntimeModelCatalog } from "./runtime-models.js";
+import { collectAgentSkillSnapshot } from "./skill-index.js";
 import {
   buildRuntimeSelectionExtraArgs,
   mergeRuntimeExtraArgs,
@@ -83,6 +85,16 @@ import {
   type CloudGatewayTypingEmitter,
 } from "./cloud-gateway-runtime.js";
 
+interface ListAgentSkillsParams {
+  agentId: string;
+}
+
+function runtimeForLoadedAgent(gateway: Gateway, agentId: string): string | undefined {
+  return gateway.listManagedRoutes()
+    .find((route) => route.match?.accountId === agentId)
+    ?.runtime;
+}
+
 /**
  * Information passed to {@link OnAgentInstalledHook} after a successful
  * provision. Mirrors the credential fields the daemon's per-agent caches
@@ -486,6 +498,34 @@ export function createProvisioner(opts: ProvisionerOptions): (
         return { ok: true, result };
       }
 
+      case "list_agent_skills": {
+        const params = (frame.params ?? {}) as unknown as ListAgentSkillsParams;
+        if (!params.agentId) {
+          return {
+            ok: false,
+            error: { code: "bad_params", message: "list_agent_skills requires params.agentId" },
+          };
+        }
+        const channels = gateway.snapshot().channels;
+        if (!channels[params.agentId]) {
+          return {
+            ok: false,
+            error: {
+              code: "agent_not_loaded",
+              message: `agent ${params.agentId} is not loaded in daemon gateway`,
+            },
+          };
+        }
+        const runtime = runtimeForLoadedAgent(gateway, params.agentId);
+        const result = collectAgentSkillSnapshot(params.agentId, { runtime });
+        daemonLog.debug("list_agent_skills", {
+          agentId: params.agentId,
+          runtime,
+          count: result.skills.length,
+        });
+        return { ok: true, result };
+      }
+
       case "wake_agent": {
         return handleWakeAgent(gateway, frame.params);
       }
@@ -1227,7 +1267,8 @@ async function materializeCredentials(
     };
     if (c.displayName) record.displayName = c.displayName;
     if (c.token) record.token = c.token;
-    if (typeof c.tokenExpiresAt === "number") record.tokenExpiresAt = c.tokenExpiresAt;
+    const tokenExpiresAt = normalizeTokenExpiresAt(c.tokenExpiresAt);
+    if (tokenExpiresAt !== undefined) record.tokenExpiresAt = tokenExpiresAt;
     if (runtime) record.runtime = runtime;
     const runtimeSelection = pickRuntimeSelection(params);
     if (runtimeSelection.runtimeModel) record.runtimeModel = runtimeSelection.runtimeModel;

package/src/skill-index.ts

@@ -23,9 +23,23 @@ export interface SoftSkillEntry {
   mtimeMs: number;
 }
 
+export interface AgentSkillSnapshotEntry {
+  name: string;
+  source: string;
+  description?: string;
+  mtimeMs: number;
+}
+
+export interface AgentSkillSnapshot {
+  agentId: string;
+  skills: AgentSkillSnapshotEntry[];
+  probedAt: number;
+}
+
 export interface SkillIndexOptions {
   extraDirs?: string[];
   includeGlobal?: boolean;
+  runtime?: string;
 }
 
 export function defaultSkillDirs(
@@ -33,21 +47,26 @@ export function defaultSkillDirs(
   opts: SkillIndexOptions = {},
 ): Array<{ dir: string; source: string }> {
   const includeGlobal = opts.includeGlobal !== false;
-  const dirs: Array<{ dir: string; source: string }> = [
-    {
-      dir: path.join(agentWorkspaceDir(agentId), ".claude", "skills"),
-      source: "agent-claude",
-    },
-    {
-      dir: path.join(agentCodexHomeDir(agentId), "skills"),
-      source: "agent-codex",
-    },
-  ];
+  const agentClaude = {
+    dir: path.join(agentWorkspaceDir(agentId), ".claude", "skills"),
+    source: "agent-claude",
+  };
+  const agentCodex = {
+    dir: path.join(agentCodexHomeDir(agentId), "skills"),
+    source: "agent-codex",
+  };
+  const dirs: Array<{ dir: string; source: string }> =
+    runtimeFamily(opts.runtime) === "codex"
+      ? [agentCodex, agentClaude]
+      : [agentClaude, agentCodex];
 
   if (includeGlobal) {
+    const globalClaude = { dir: path.join(homedir(), ".claude", "skills"), source: "global-claude" };
+    const globalCodex = { dir: path.join(homedir(), ".codex", "skills"), source: "global-codex" };
     dirs.push(
-      { dir: path.join(homedir(), ".claude", "skills"), source: "global-claude" },
-      { dir: path.join(homedir(), ".codex", "skills"), source: "global-codex" },
+      ...(runtimeFamily(opts.runtime) === "codex"
+        ? [globalCodex, globalClaude]
+        : [globalClaude, globalCodex]),
     );
   }
 
@@ -56,7 +75,7 @@ export function defaultSkillDirs(
     dirs.push({ dir, source: "external" });
   }
 
-  return dedupeDirs(dirs);
+  return dedupeDirs(expandSkillRoots(dirs));
 }
 
 export function scanSoftSkills(
@@ -70,7 +89,7 @@ export function scanSoftSkills(
     if (!existsSync(root.dir)) continue;
     let children: string[];
     try {
-      children = readdirSync(root.dir);
+      children = readdirSync(root.dir).sort((a, b) => a.localeCompare(b));
     } catch {
       continue;
     }
@@ -98,22 +117,37 @@ export function scanSoftSkills(
         description: parsed.description,
         mtimeMs: st.mtimeMs,
       };
-      if (!existing || priority(root.source) < priority(existing.source)) {
+      if (!existing || priority(root.source, opts.runtime) < priority(existing.source, opts.runtime)) {
         byName.set(entry.name, entry);
       }
     }
   }
 
   return Array.from(byName.values())
-    .sort((a, b) => a.name.localeCompare(b.name))
-    .slice(0, MAX_SKILLS);
+    .sort((a, b) => a.name.localeCompare(b.name));
+}
+
+export function collectAgentSkillSnapshot(
+  agentId: string,
+  opts: SkillIndexOptions = {},
+): AgentSkillSnapshot {
+  return {
+    agentId,
+    skills: scanSoftSkills(agentId, opts).map((skill) => ({
+      name: skill.name,
+      source: skill.source.startsWith("agent-") ? "workspace" : "runtime-global",
+      ...(skill.description ? { description: skill.description } : {}),
+      mtimeMs: skill.mtimeMs,
+    })),
+    probedAt: Date.now(),
+  };
 }
 
 export function buildSoftSkillIndexPrompt(
   agentId: string,
   opts: SkillIndexOptions = {},
 ): string | null {
-  const skills = scanSoftSkills(agentId, opts);
+  const skills = scanSoftSkills(agentId, opts).slice(0, MAX_SKILLS);
   if (skills.length === 0) return null;
 
   const lines = [
@@ -196,7 +230,41 @@ function dedupeDirs(
   return out;
 }
 
-function priority(source: string): number {
+function expandSkillRoots(
+  dirs: Array<{ dir: string; source: string }>,
+): Array<{ dir: string; source: string }> {
+  const out: Array<{ dir: string; source: string }> = [];
+  for (const entry of dirs) {
+    out.push(entry);
+    if (entry.source.includes("codex")) {
+      out.push({ dir: path.join(entry.dir, ".system"), source: entry.source });
+    }
+  }
+  return out;
+}
+
+function runtimeFamily(runtime: string | undefined): "codex" | "claude" | "other" {
+  if (runtime === "codex") return "codex";
+  if (runtime === "claude-code") return "claude";
+  return "other";
+}
+
+function priority(source: string, runtime: string | undefined): number {
+  if (runtimeFamily(runtime) === "codex") {
+    switch (source) {
+      case "agent-codex":
+        return 0;
+      case "global-codex":
+        return 1;
+      case "agent-claude":
+        return 2;
+      case "global-claude":
+        return 3;
+      default:
+        return 4;
+    }
+  }
+
   switch (source) {
     case "agent-claude":
       return 0;

package/src/turn-text.ts

@@ -112,6 +112,18 @@ interface BatchedEntry {
   source_type?: unknown;
   source_user_name?: unknown;
   mentioned?: unknown;
+  reply_preview?: ReplyPreviewRaw | null;
+}
+
+/** Structural mirror of protocol-core ReplyPreview — kept local so the
+ * composer has no cross-package import. */
+interface ReplyPreviewRaw {
+  msg_id?: unknown;
+  sender_id?: unknown;
+  sender_display_name?: unknown;
+  text_preview?: unknown;
+  topic_id?: unknown;
+  deleted?: unknown;
 }
 
 interface RoomContextRaw {
@@ -196,6 +208,40 @@ function entryText(e: BatchedEntry): string {
   return "";
 }
 
+/**
+ * Format the inline quote-reply context line that prefixes a message body
+ * when the inbound envelope replies to another message. Single layer — we
+ * never render a quote-of-a-quote chain. Returns `null` when the source
+ * carries no reply_preview, so the caller can skip emitting an empty line.
+ *
+ * Both sender label and preview body are sanitized; the preview is hard-
+ * capped at 120 chars to mirror the backend truncation.
+ */
+function formatReplyQuoteLine(raw: unknown): string | null {
+  if (!raw || typeof raw !== "object") return null;
+  const rp = (raw as { reply_preview?: ReplyPreviewRaw | null }).reply_preview;
+  if (!rp || typeof rp !== "object") return null;
+  if (rp.deleted === true) {
+    return "[quoting (deleted message)]";
+  }
+  const senderRaw =
+    typeof rp.sender_display_name === "string" && rp.sender_display_name
+      ? rp.sender_display_name
+      : typeof rp.sender_id === "string" && rp.sender_id
+        ? rp.sender_id
+        : "unknown";
+  const sender = sanitizeSenderName(senderRaw);
+  const previewRaw =
+    typeof rp.text_preview === "string" ? rp.text_preview : "";
+  const previewClean = sanitizeUntrustedContent(previewRaw)
+    .replace(/[\r\n]+/g, " ")
+    .slice(0, 120);
+  if (!previewClean) {
+    return `[quoting ${sender}]`;
+  }
+  return `[quoting ${sender}: "${previewClean}"]`;
+}
+
 function formatRoomContext(raw: unknown, fallback: { id: string; title?: string }): string[] {
   const r = raw && typeof raw === "object" ? (raw as RoomContextRaw) : {};
   const roomId = typeof r.room_id === "string" && r.room_id ? r.room_id : fallback.id;
@@ -293,11 +339,13 @@ export function composeBotCordUserTurn(msg: GatewayInboundMessage): string {
       "agent ID and any message they attached.]"
     : null;
 
+  const quoteLine = formatReplyQuoteLine(msg.raw);
   const lines: string[] = [
     headerFields.join(" | "),
     ...formatScheduleContext(msg.raw),
     ...(isGroup ? formatRoomContext(msg.raw, { id: conversation.id, title: roomTitle }) : []),
     `<${tag} sender="${sanitizedSenderLabel}" sender_kind="${senderKindAttr}">`,
+    ...(quoteLine ? [quoteLine] : []),
     trimmed,
     `</${tag}>`,
     "",
@@ -350,8 +398,10 @@ function composeBatchedTurn(
     // non-owner. Still sanitize defensively.
     const safeBody = sanitizeUntrustedContent(raw);
     const tag = kind === "human" ? "human-message" : "agent-message";
+    const quoteLine = formatReplyQuoteLine(entry);
+    const inner = quoteLine ? `${quoteLine}\n${safeBody}` : safeBody;
     blocks.push(
-      `<${tag} sender="${safeLabel}" sender_kind="${kind}">\n${safeBody}\n</${tag}>`,
+      `<${tag} sender="${safeLabel}" sender_kind="${kind}">\n${inner}\n</${tag}>`,
     );
     if (envelopeType === "contact_request") {
       contactRequestSenders.push(safeLabel);