@botcord/daemon 0.2.86 → 0.2.87

package/dist/cloud-daemon.js

@@ -158,19 +158,24 @@ export async function startCloudDaemon(opts) {
         });
     };
     const installedAgentIds = new Set();
+    const runtimeByAgentId = new Map();
     let controlChannel = null;
     const pushInstalledAgentSkillSnapshot = (agentId, reason) => {
         if (!controlChannel)
             return;
-        const pushed = pushAgentSkillSnapshot(controlChannel, agentId);
+        const runtime = runtimeByAgentId.get(agentId) ?? opts.config.defaultRoute.adapter;
+        const pushed = pushAgentSkillSnapshot(controlChannel, agentId, { runtime });
         logger.info("cloud control-channel: agent_skill_snapshot pushed", {
             agentId,
+            runtime,
             reason,
             ok: pushed,
         });
     };
     const onAgentInstalled = (info) => {
         installedAgentIds.add(info.agentId);
+        if (info.runtime)
+            runtimeByAgentId.set(info.agentId, info.runtime);
         credentialPathByAgentId.set(info.agentId, info.credentialsFile);
         if (info.hubUrl)
             hubUrlByAgentId.set(info.agentId, info.hubUrl);

package/dist/daemon.d.ts

@@ -65,7 +65,9 @@ export interface RuntimeSnapshotSink {
  * or wait for the next daemon restart). Exported for unit tests.
  */
 export declare function pushRuntimeSnapshot(sink: RuntimeSnapshotSink, liveSnapshot?: GatewayRuntimeSnapshot): boolean;
-export declare function pushAgentSkillSnapshot(sink: RuntimeSnapshotSink, agentId: string): boolean;
+export declare function pushAgentSkillSnapshot(sink: RuntimeSnapshotSink, agentId: string, opts?: {
+    runtime?: string;
+}): boolean;
 /** Options accepted by {@link startDaemon} — the P0.5 compatibility shim. */
 export interface DaemonRuntimeOptions {
     config: DaemonConfig;

package/dist/daemon.js

@@ -165,8 +165,8 @@ export function pushRuntimeSnapshot(sink, liveSnapshot) {
     }
     return ok;
 }
-export function pushAgentSkillSnapshot(sink, agentId) {
-    const snap = collectAgentSkillSnapshot(agentId);
+export function pushAgentSkillSnapshot(sink, agentId, opts = {}) {
+    const snap = collectAgentSkillSnapshot(agentId, opts);
     const ok = sink.send({
         id: `skill_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
         type: "agent_skill_snapshot",
@@ -372,6 +372,12 @@ export async function startDaemon(opts) {
         // next room-context fetch re-loads the BotCordClient against the new
         // credential file.
         credentialPathByAgentId.set(info.agentId, info.credentialsFile);
+        if (info.runtime) {
+            agentRuntimes[info.agentId] = {
+                ...(agentRuntimes[info.agentId] ?? {}),
+                runtime: info.runtime,
+            };
+        }
         if (info.hubUrl)
             hubUrlByAgentId.set(info.agentId, info.hubUrl);
         if (info.displayName)
@@ -501,9 +507,11 @@ export async function startDaemon(opts) {
                 ok: pushed,
             });
             for (const agentId of agentIds) {
-                const skillsPushed = pushAgentSkillSnapshot(controlChannel, agentId);
+                const runtime = agentRuntimes[agentId]?.runtime ?? opts.config.defaultRoute.adapter;
+                const skillsPushed = pushAgentSkillSnapshot(controlChannel, agentId, { runtime });
                 logger.info("control-channel: initial agent_skill_snapshot push", {
                     agentId,
+                    runtime,
                     ok: skillsPushed,
                 });
             }

package/dist/gateway/dispatcher.d.ts

@@ -2,6 +2,22 @@ import type { GatewayLogger } from "./log.js";
 import { type SessionStore } from "./session-store.js";
 import { type TranscriptWriter } from "./transcript.js";
 import type { ChannelAdapter, GatewayConfig, GatewayInboundEnvelope, GatewayInboundMessage, GatewayRoute, InboundObserver, MemoryContextBuilder, OutboundObserver, RuntimeAdapter, RuntimeRecoveryContextBuilder, RuntimeRunResult, RuntimeCircuitBreakerSnapshot, SystemContextBuilder, TurnStatusSnapshot, UserTurnBuilder } from "./types.js";
+/**
+ * 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 declare function pickReplyToTarget(msg: GatewayInboundMessage): string;
 /** Factory signature for building a runtime adapter at turn dispatch time. */
 export type RuntimeFactory = (runtimeId: string, extraArgs?: string[]) => RuntimeAdapter;
 /** Constructor options for `Dispatcher`. */

package/dist/gateway/dispatcher.js

@@ -143,6 +143,30 @@ function buildRuntimeRecoveryPrompt(args) {
         args.userTurn,
     ].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) {
+    if (msg.replyTo)
+        return msg.replyTo;
+    const raw = msg.raw;
+    const envMsgId = raw && typeof raw.envelope?.msg_id === "string" && raw.envelope.msg_id
+        ? raw.envelope.msg_id
+        : null;
+    return envMsgId ?? msg.id;
+}
 /**
  * Reason carried on `AbortController.abort()` when a cancel-previous wave
  * is taking over the slot. Distinguishing this from a timeout abort lets
@@ -1775,7 +1799,7 @@ export class Dispatcher {
         return { ok: true };
     }
     providerReplyTo(msg) {
-        return msg.replyTo ?? msg.id;
+        return pickReplyToTarget(msg);
     }
     emitInbound(turnId, msg) {
         if (!this.transcript.enabled)

package/dist/provision.js

@@ -22,6 +22,11 @@ import { discoverRuntimeModelCatalog } from "./runtime-models.js";
 import { collectAgentSkillSnapshot } from "./skill-index.js";
 import { buildRuntimeSelectionExtraArgs, mergeRuntimeExtraArgs, } from "./runtime-route-options.js";
 import { handleCloudGatewayRuntimeInbound, } from "./cloud-gateway-runtime.js";
+function runtimeForLoadedAgent(gateway, agentId) {
+    return gateway.listManagedRoutes()
+        .find((route) => route.match?.accountId === agentId)
+        ?.runtime;
+}
 /**
  * Build a dispatcher function that routes a `ControlFrame` to the right
  * handler. Returned function signature matches
@@ -334,9 +339,11 @@ export function createProvisioner(opts) {
                         },
                     };
                 }
-                const result = collectAgentSkillSnapshot(params.agentId);
+                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 };

package/dist/skill-index.d.ts

@@ -19,6 +19,7 @@ export interface AgentSkillSnapshot {
 export interface SkillIndexOptions {
     extraDirs?: string[];
     includeGlobal?: boolean;
+    runtime?: string;
 }
 export declare function defaultSkillDirs(agentId: string, opts?: SkillIndexOptions): Array<{
     dir: string;

package/dist/skill-index.js

@@ -7,24 +7,29 @@ const MAX_DESCRIPTION_CHARS = 260;
 const MAX_SKILL_MD_READ_CHARS = 8192;
 export function defaultSkillDirs(agentId, opts = {}) {
     const includeGlobal = opts.includeGlobal !== false;
-    const dirs = [
-        {
-            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 = runtimeFamily(opts.runtime) === "codex"
+        ? [agentCodex, agentClaude]
+        : [agentClaude, agentCodex];
     if (includeGlobal) {
-        dirs.push({ dir: path.join(homedir(), ".claude", "skills"), source: "global-claude" }, { dir: path.join(homedir(), ".codex", "skills"), source: "global-codex" });
+        const globalClaude = { dir: path.join(homedir(), ".claude", "skills"), source: "global-claude" };
+        const globalCodex = { dir: path.join(homedir(), ".codex", "skills"), source: "global-codex" };
+        dirs.push(...(runtimeFamily(opts.runtime) === "codex"
+            ? [globalCodex, globalClaude]
+            : [globalClaude, globalCodex]));
     }
     const envDirs = parseSkillDirsEnv(process.env.BOTCORD_SKILL_DIRS);
     for (const dir of [...envDirs, ...(opts.extraDirs ?? [])]) {
         dirs.push({ dir, source: "external" });
     }
-    return dedupeDirs(dirs);
+    return dedupeDirs(expandSkillRoots(dirs));
 }
 export function scanSoftSkills(agentId, opts = {}) {
     const byName = new Map();
@@ -63,7 +68,7 @@ export function scanSoftSkills(agentId, opts = {}) {
                 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);
             }
         }
@@ -156,7 +161,38 @@ function dedupeDirs(dirs) {
     }
     return out;
 }
-function priority(source) {
+function expandSkillRoots(dirs) {
+    const out = [];
+    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) {
+    if (runtime === "codex")
+        return "codex";
+    if (runtime === "claude-code")
+        return "claude";
+    return "other";
+}
+function priority(source, runtime) {
+    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/dist/turn-text.js

@@ -118,6 +118,39 @@ function entryText(e) {
         return e.envelope.payload.text;
     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) {
+    if (!raw || typeof raw !== "object")
+        return null;
+    const rp = raw.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, fallback) {
     const r = raw && typeof raw === "object" ? raw : {};
     const roomId = typeof r.room_id === "string" && r.room_id ? r.room_id : fallback.id;
@@ -206,11 +239,13 @@ export function composeBotCordUserTurn(msg) {
             "they can decide whether to accept or reject it. Include the sender's " +
             "agent ID and any message they attached.]"
         : null;
+    const quoteLine = formatReplyQuoteLine(msg.raw);
     const lines = [
         headerFields.join(" | "),
         ...formatScheduleContext(msg.raw),
         ...(isGroup ? formatRoomContext(msg.raw, { id: conversation.id, title: roomTitle }) : []),
         `<${tag} sender="${sanitizedSenderLabel}" sender_kind="${senderKindAttr}">`,
+        ...(quoteLine ? [quoteLine] : []),
         trimmed,
         `</${tag}>`,
         "",
@@ -256,7 +291,9 @@ function composeBatchedTurn(msg, batch) {
         // non-owner. Still sanitize defensively.
         const safeBody = sanitizeUntrustedContent(raw);
         const tag = kind === "human" ? "human-message" : "agent-message";
-        blocks.push(`<${tag} sender="${safeLabel}" sender_kind="${kind}">\n${safeBody}\n</${tag}>`);
+        const quoteLine = formatReplyQuoteLine(entry);
+        const inner = quoteLine ? `${quoteLine}\n${safeBody}` : safeBody;
+        blocks.push(`<${tag} sender="${safeLabel}" sender_kind="${kind}">\n${inner}\n</${tag}>`);
         if (envelopeType === "contact_request") {
             contactRequestSenders.push(safeLabel);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botcord/daemon",
-  "version": "0.2.86",
+  "version": "0.2.87",
   "description": "BotCord local daemon — bridges Hub inbox push to local Claude Code / Codex / Gemini CLIs",
   "type": "module",
   "bin": {

package/src/__tests__/dispatcher-reply-to.test.ts

@@ -0,0 +1,61 @@
+import { describe, expect, it } from "vitest";
+import { pickReplyToTarget } from "../gateway/dispatcher.js";
+import type { GatewayInboundMessage } from "../gateway/index.js";
+
+function makeMsg(partial: Partial<GatewayInboundMessage> = {}): GatewayInboundMessage {
+  return {
+    id: partial.id ?? "h_abc123",
+    channel: partial.channel ?? "botcord",
+    accountId: partial.accountId ?? "ag_me",
+    conversation: partial.conversation ?? { id: "rm_room", kind: "group" },
+    sender: partial.sender ?? { id: "ag_alice", kind: "agent" },
+    text: partial.text ?? "hi",
+    raw: partial.raw ?? null,
+    receivedAt: partial.receivedAt ?? Date.now(),
+    mentioned: partial.mentioned ?? false,
+    replyTo: partial.replyTo ?? null,
+  };
+}
+
+describe("pickReplyToTarget", () => {
+  it("returns msg.replyTo when the inbound was already a reply (chain semantics)", () => {
+    const result = pickReplyToTarget(
+      makeMsg({
+        replyTo: "11111111-2222-3333-4444-555555555555",
+        id: "h_inbound",
+        raw: { envelope: { msg_id: "ignored-because-chain-takes-priority" } },
+      }),
+    );
+    expect(result).toBe("11111111-2222-3333-4444-555555555555");
+  });
+
+  it("returns envelope.msg_id (canonical UUID) when present and not chained", () => {
+    const result = pickReplyToTarget(
+      makeMsg({
+        id: "h_inbound",
+        raw: { envelope: { msg_id: "11111111-2222-3333-4444-555555555555" } },
+      }),
+    );
+    expect(result).toBe("11111111-2222-3333-4444-555555555555");
+    expect(result).not.toMatch(/^h_/);
+  });
+
+  it("falls back to hub_msg_id when envelope.msg_id is missing", () => {
+    const result = pickReplyToTarget(
+      makeMsg({ id: "h_inbound", raw: null }),
+    );
+    // Hub is lenient (accepts h_* via _load_reply_target), so this is still
+    // resolvable on the wire — but the helper should clearly mark the fallback.
+    expect(result).toBe("h_inbound");
+  });
+
+  it("ignores non-string envelope.msg_id and falls back to hub_msg_id", () => {
+    const result = pickReplyToTarget(
+      makeMsg({
+        id: "h_inbound",
+        raw: { envelope: { msg_id: 42 as unknown as string } },
+      }),
+    );
+    expect(result).toBe("h_inbound");
+  });
+});

package/src/__tests__/skill-index.test.ts

@@ -62,6 +62,45 @@ describe("skill snapshots", () => {
     expect(snapshot.probedAt).toBeGreaterThan(0);
   });
 
+  it("scans Codex .system skills and prefers Codex copies for Codex agents", () => {
+    const agentId = "ag_codex_system";
+    writeSkill(path.join(agentWorkspaceDir(agentId), ".claude", "skills"), "shared", "Claude copy");
+    writeSkill(path.join(agentCodexHomeDir(agentId), "skills"), "shared", "Codex copy");
+    writeSkill(
+      path.join(agentCodexHomeDir(agentId), "skills", ".system"),
+      "agent-system",
+      "Agent Codex system skill",
+    );
+    writeSkill(
+      path.join(tmpDir, ".codex", "skills", ".system"),
+      "imagegen",
+      "Codex global system skill",
+    );
+
+    const codexScanned = scanSoftSkills(agentId, { runtime: "codex" });
+    expect(codexScanned.map((s) => s.name).sort()).toEqual([
+      "agent-system",
+      "imagegen",
+      "shared",
+    ]);
+    expect(codexScanned.find((s) => s.name === "shared")).toMatchObject({
+      source: "agent-codex",
+      description: "Codex copy",
+    });
+
+    const claudeScanned = scanSoftSkills(agentId, { runtime: "claude-code" });
+    expect(claudeScanned.find((s) => s.name === "shared")).toMatchObject({
+      source: "agent-claude",
+      description: "Claude copy",
+    });
+
+    const snapshot = collectAgentSkillSnapshot(agentId, { runtime: "codex" });
+    expect(snapshot.skills.find((s) => s.name === "agent-system")?.source)
+      .toBe("workspace");
+    expect(snapshot.skills.find((s) => s.name === "imagegen")?.source)
+      .toBe("runtime-global");
+  });
+
   it("returns complete snapshots while keeping the prompt soft index capped", () => {
     const agentId = "ag_manyskills";
     const workspaceSkills = path.join(agentWorkspaceDir(agentId), ".claude", "skills");

package/src/__tests__/turn-text.test.ts

@@ -370,3 +370,124 @@ describe("composeBotCordUserTurn", () => {
     expect(headerLines.length).toBe(1);
   });
 });
+
+describe("composeBotCordUserTurn quote-reply", () => {
+  it("inserts a [quoting …] line above the body when reply_preview is present", () => {
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        text: "agreed, ship it",
+        sender: { id: "ag_alice", name: "Alice", kind: "agent" },
+        raw: {
+          reply_preview: {
+            msg_id: "h_orig",
+            sender_id: "ag_bob",
+            sender_display_name: "Bob",
+            text_preview: "We should ship the feature next sprint",
+            topic_id: null,
+            deleted: false,
+          },
+        },
+      }),
+    );
+    expect(out).toContain('<agent-message sender="ag_alice" sender_kind="agent">');
+    expect(out).toContain('[quoting Bob: "We should ship the feature next sprint"]');
+    expect(out).toContain("agreed, ship it");
+    // Quote line precedes body inside the tag block.
+    const quoteIdx = out.indexOf("[quoting Bob");
+    const bodyIdx = out.indexOf("agreed, ship it");
+    expect(quoteIdx).toBeGreaterThan(-1);
+    expect(quoteIdx).toBeLessThan(bodyIdx);
+  });
+
+  it("renders a tombstone line when the quote target was deleted", () => {
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        text: "RE: that thing",
+        sender: { id: "ag_alice", kind: "agent" },
+        raw: {
+          reply_preview: {
+            msg_id: "h_gone",
+            sender_id: null,
+            sender_display_name: null,
+            text_preview: null,
+            topic_id: null,
+            deleted: true,
+          },
+        },
+      }),
+    );
+    expect(out).toContain("[quoting (deleted message)]");
+    expect(out).toContain("RE: that thing");
+  });
+
+  it("falls back to sender_id when display name is missing", () => {
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        text: "ack",
+        sender: { id: "ag_alice", kind: "agent" },
+        raw: {
+          reply_preview: {
+            msg_id: "h_orig",
+            sender_id: "ag_bob",
+            sender_display_name: null,
+            text_preview: "hi",
+            topic_id: null,
+            deleted: false,
+          },
+        },
+      }),
+    );
+    expect(out).toContain('[quoting ag_bob: "hi"]');
+  });
+
+  it("emits no quote line when reply_preview is absent (regression guard)", () => {
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        text: "just a normal message",
+        sender: { id: "ag_alice", kind: "agent" },
+      }),
+    );
+    expect(out).not.toContain("[quoting");
+  });
+
+  it("renders per-entry quote lines in a batched turn", () => {
+    const batchedRaw = {
+      batch: [
+        {
+          hub_msg_id: "h_1",
+          text: "first reply",
+          envelope: { from: "ag_alice", type: "message" },
+          source_type: "agent",
+          reply_preview: {
+            msg_id: "h_orig1",
+            sender_id: "ag_bob",
+            sender_display_name: "Bob",
+            text_preview: "the plan",
+            topic_id: null,
+            deleted: false,
+          },
+        },
+        {
+          hub_msg_id: "h_2",
+          text: "second reply (no quote)",
+          envelope: { from: "ag_alice", type: "message" },
+          source_type: "agent",
+        },
+      ],
+    };
+    const out = composeBotCordUserTurn(
+      makeMessage({
+        text: "ignored — batch path reads raw.batch",
+        sender: { id: "ag_alice", kind: "agent" },
+        raw: batchedRaw,
+      }),
+    );
+    expect(out).toContain("[BotCord Messages (2 new)]");
+    expect(out).toContain('[quoting Bob: "the plan"]');
+    expect(out).toContain("first reply");
+    expect(out).toContain("second reply (no quote)");
+    // The second entry has no quote line.
+    const quoteCount = (out.match(/\[quoting /g) || []).length;
+    expect(quoteCount).toBe(1);
+  });
+});

package/src/cloud-daemon.ts

@@ -235,12 +235,15 @@ export async function startCloudDaemon(
   };
 
   const installedAgentIds = new Set<string>();
+  const runtimeByAgentId = new Map<string, string>();
   let controlChannel: ControlChannel | null = null;
   const pushInstalledAgentSkillSnapshot = (agentId: string, reason: string): void => {
     if (!controlChannel) return;
-    const pushed = pushAgentSkillSnapshot(controlChannel, agentId);
+    const runtime = runtimeByAgentId.get(agentId) ?? opts.config.defaultRoute.adapter;
+    const pushed = pushAgentSkillSnapshot(controlChannel, agentId, { runtime });
     logger.info("cloud control-channel: agent_skill_snapshot pushed", {
       agentId,
+      runtime,
       reason,
       ok: pushed,
     });
@@ -248,6 +251,7 @@ export async function startCloudDaemon(
 
   const onAgentInstalled: OnAgentInstalledHook = (info: InstalledAgentInfo) => {
     installedAgentIds.add(info.agentId);
+    if (info.runtime) runtimeByAgentId.set(info.agentId, info.runtime);
     credentialPathByAgentId.set(info.agentId, info.credentialsFile);
     if (info.hubUrl) hubUrlByAgentId.set(info.agentId, info.hubUrl);
     if (info.displayName) displayNameByAgent.set(info.agentId, info.displayName);

package/src/daemon.ts

@@ -249,8 +249,9 @@ export function pushRuntimeSnapshot(
 export function pushAgentSkillSnapshot(
   sink: RuntimeSnapshotSink,
   agentId: string,
+  opts: { runtime?: string } = {},
 ): boolean {
-  const snap = collectAgentSkillSnapshot(agentId);
+  const snap = collectAgentSkillSnapshot(agentId, opts);
   const ok = sink.send({
     id: `skill_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
     type: "agent_skill_snapshot",
@@ -529,6 +530,12 @@ export async function startDaemon(opts: DaemonRuntimeOptions): Promise<DaemonHan
     // next room-context fetch re-loads the BotCordClient against the new
     // credential file.
     credentialPathByAgentId.set(info.agentId, info.credentialsFile);
+    if (info.runtime) {
+      agentRuntimes[info.agentId] = {
+        ...(agentRuntimes[info.agentId] ?? {}),
+        runtime: info.runtime,
+      };
+    }
     if (info.hubUrl) hubUrlByAgentId.set(info.agentId, info.hubUrl);
     if (info.displayName) displayNameByAgent.set(info.agentId, info.displayName);
     if (!scBuilders.has(info.agentId)) {
@@ -670,9 +677,11 @@ export async function startDaemon(opts: DaemonRuntimeOptions): Promise<DaemonHan
         ok: pushed,
       });
       for (const agentId of agentIds) {
-        const skillsPushed = pushAgentSkillSnapshot(controlChannel, agentId);
+        const runtime = agentRuntimes[agentId]?.runtime ?? opts.config.defaultRoute.adapter;
+        const skillsPushed = pushAgentSkillSnapshot(controlChannel, agentId, { runtime });
         logger.info("control-channel: initial agent_skill_snapshot push", {
           agentId,
+          runtime,
           ok: skillsPushed,
         });
       }

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/provision.ts

@@ -89,6 +89,12 @@ 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
@@ -510,9 +516,11 @@ export function createProvisioner(opts: ProvisionerOptions): (
             },
           };
         }
-        const result = collectAgentSkillSnapshot(params.agentId);
+        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 };

package/src/skill-index.ts

@@ -39,6 +39,7 @@ export interface AgentSkillSnapshot {
 export interface SkillIndexOptions {
   extraDirs?: string[];
   includeGlobal?: boolean;
+  runtime?: string;
 }
 
 export function defaultSkillDirs(
@@ -46,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]),
     );
   }
 
@@ -69,7 +75,7 @@ export function defaultSkillDirs(
     dirs.push({ dir, source: "external" });
   }
 
-  return dedupeDirs(dirs);
+  return dedupeDirs(expandSkillRoots(dirs));
 }
 
 export function scanSoftSkills(
@@ -111,7 +117,7 @@ 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);
       }
     }
@@ -224,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);