@botcord/daemon 0.2.2 → 0.2.4

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

@@ -102,3 +102,26 @@ export interface BatchedInboxRaw extends InboxMessage {
  */
 export declare function createBotCordChannel(options: BotCordChannelOptions): ChannelAdapter;
 export { normalizeInbox as __normalizeInboxForTests };
+export { normalizeBlockForHub as __normalizeBlockForHubForTests };
+/**
+ * Reshape a runtime StreamBlock `{ raw, kind, seq }` into the
+ * `{ kind, payload, seq }` form the owner-chat frontend renders.
+ *
+ * Daemon-internal kinds are Claude Code / Codex specific; the dashboard's
+ * StreamBlocksView expects a smaller vocabulary (`assistant`, `tool_call`,
+ * `tool_result`, `reasoning`) with structured `payload` fields. Without this
+ * remap the UI falls back to printing the bare kind string per step, which
+ * is what users see as "system / assistant_text / other / other".
+ *
+ * Extraction is best-effort — unknown shapes pass through as `other` with
+ * an empty payload rather than throwing.
+ */
+declare function normalizeBlockForHub(block: {
+    raw?: unknown;
+    kind?: string;
+    seq?: number;
+} | undefined, seq: number): {
+    kind: string;
+    seq: number;
+    payload: Record<string, unknown>;
+};

package/dist/gateway/channels/botcord.js

@@ -555,6 +555,7 @@ export function createBotCordChannel(options) {
             try {
                 const token = await client.ensureToken();
                 const block = ctx.block;
+                const seq = typeof block?.seq === "number" ? block.seq : 0;
                 const resp = await fetch(`${hubUrl}/hub/stream-block`, {
                     method: "POST",
                     headers: {
@@ -563,8 +564,8 @@ export function createBotCordChannel(options) {
                     },
                     body: JSON.stringify({
                         trace_id: ctx.traceId,
-                        seq: typeof block?.seq === "number" ? block.seq : 0,
-                        block: ctx.block,
+                        seq,
+                        block: normalizeBlockForHub(block, seq),
                     }),
                     signal: AbortSignal.timeout(10_000),
                 });
@@ -586,5 +587,94 @@ export function createBotCordChannel(options) {
     };
     return adapter;
 }
-// Re-export the normalizer for tests that want to exercise it directly.
+// Re-export the normalizers for tests that want to exercise them directly.
 export { normalizeInbox as __normalizeInboxForTests };
+export { normalizeBlockForHub as __normalizeBlockForHubForTests };
+/**
+ * Reshape a runtime StreamBlock `{ raw, kind, seq }` into the
+ * `{ kind, payload, seq }` form the owner-chat frontend renders.
+ *
+ * Daemon-internal kinds are Claude Code / Codex specific; the dashboard's
+ * StreamBlocksView expects a smaller vocabulary (`assistant`, `tool_call`,
+ * `tool_result`, `reasoning`) with structured `payload` fields. Without this
+ * remap the UI falls back to printing the bare kind string per step, which
+ * is what users see as "system / assistant_text / other / other".
+ *
+ * Extraction is best-effort — unknown shapes pass through as `other` with
+ * an empty payload rather than throwing.
+ */
+function normalizeBlockForHub(block, seq) {
+    const raw = (block?.raw ?? {});
+    const kind = block?.kind ?? "other";
+    const payload = {};
+    if (kind === "assistant_text") {
+        // Claude Code: {type:"assistant", message:{content:[{type:"text",text}]}}
+        // Codex:       {type:"item.completed", item:{type:"agent_message", text}}
+        let text = "";
+        const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+        for (const c of contents) {
+            if (c?.type === "text" && typeof c.text === "string")
+                text += c.text;
+        }
+        if (!text && typeof raw?.item?.text === "string")
+            text = raw.item.text;
+        return { kind: "assistant", seq, payload: { text } };
+    }
+    if (kind === "tool_use") {
+        // Claude Code: assistant message w/ content[].type === "tool_use" → {id,name,input}
+        // Codex:       item.started / item.completed for command_execution, file_change, mcp_tool_call, web_search
+        const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+        const tu = contents.find((c) => c?.type === "tool_use");
+        if (tu) {
+            payload.name = typeof tu.name === "string" ? tu.name : "tool";
+            if (tu.input && typeof tu.input === "object")
+                payload.params = tu.input;
+            if (typeof tu.id === "string")
+                payload.id = tu.id;
+        }
+        else if (raw?.item && typeof raw.item === "object") {
+            payload.name = typeof raw.item.type === "string" ? raw.item.type : "tool";
+            payload.params = raw.item;
+        }
+        return { kind: "tool_call", seq, payload };
+    }
+    if (kind === "tool_result") {
+        // Claude Code: {type:"user", message:{content:[{type:"tool_result",tool_use_id,content}]}}
+        const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+        const tr = contents.find((c) => c?.type === "tool_result");
+        if (tr) {
+            let resultStr = "";
+            if (typeof tr.content === "string") {
+                resultStr = tr.content;
+            }
+            else if (Array.isArray(tr.content)) {
+                resultStr = tr.content
+                    .map((c) => (typeof c?.text === "string" ? c.text : JSON.stringify(c)))
+                    .join("\n");
+            }
+            payload.result = resultStr;
+            if (typeof tr.tool_use_id === "string")
+                payload.tool_use_id = tr.tool_use_id;
+        }
+        return { kind: "tool_result", seq, payload };
+    }
+    if (kind === "system") {
+        if (typeof raw?.subtype === "string")
+            payload.subtype = raw.subtype;
+        if (typeof raw?.session_id === "string")
+            payload.session_id = raw.session_id;
+        if (typeof raw?.model === "string")
+            payload.model = raw.model;
+        return { kind: "system", seq, payload };
+    }
+    // "other" — e.g. Claude Code `type:"result"` end-of-turn summary.
+    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 };
+}

package/dist/gateway/runtimes/claude-code.js

@@ -76,18 +76,30 @@ export class ClaudeCodeAdapter extends NdjsonStreamAdapter {
     }
     buildArgs(opts) {
         const args = ["-p", opts.text, "--output-format", "stream-json", "--verbose"];
+        // Headless `-p` mode does not load project `.claude/` by default, so
+        // per-agent skills seeded at `<workspace>/.claude/skills/` are invisible
+        // unless we opt in. `extraArgs` wins so operators can still override.
+        if (!opts.extraArgs?.some((a) => a.startsWith("--setting-sources"))) {
+            args.push("--setting-sources", "project");
+        }
         if (opts.sessionId) {
             if (!isValidClaudeSessionId(opts.sessionId))
                 throw new Error(invalidClaudeSessionIdError());
             args.push("--resume", opts.sessionId);
         }
         // Permission-mode policy:
-        //  - owner: acceptEdits (owner trusts their own agent).
-        //  - non-owner (trusted/public): default (let Claude Code prompt / reject edits per its own rules).
+        //  - owner: bypassPermissions (owner fully trusts their own agent; daemon
+        //    has no authorization-relay UI yet, so any other mode causes Bash /
+        //    WebFetch / MCP tool calls to deadlock waiting for a prompt that
+        //    never reaches the user — see issue #332 for the planned MCP-bridge
+        //    relay that will let us tighten this back up).
+        //  - non-owner (trusted/public): default (let Claude Code prompt / reject
+        //    per its own rules — we must NOT auto-bypass for agents the operator
+        //    doesn't own).
         // `extraArgs` still wins — operators who know what they're doing can override either.
         if (!opts.extraArgs?.some((a) => a.startsWith("--permission-mode"))) {
             if (opts.trustLevel === "owner") {
-                args.push("--permission-mode", "acceptEdits");
+                args.push("--permission-mode", "bypassPermissions");
             }
             else {
                 args.push("--permission-mode", "default");

package/dist/index.js

@@ -34,15 +34,18 @@ Commands:
                                           Without --agent, the daemon discovers
                                           identities from ~/.botcord/credentials
                                           at startup (repeat --agent to pin).
-  start [--foreground] [--relogin] [--hub <url>] [--label <name>]
-                                          Start the daemon. Without credentials
-                                          and on a TTY, runs the interactive
-                                          device-code login first. --hub defaults
-                                          to ${DEFAULT_HUB} (or the URL stored in
-                                          a previous login). --relogin forces
-                                          re-login. --label is sent to the Hub
-                                          on connect for the dashboard device
-                                          list (defaults to hostname). Non-TTY
+  start [--background|-d] [--relogin] [--hub <url>] [--label <name>]
+                                          Start the daemon in the foreground by
+                                          default. Pass --background (alias -d)
+                                          to detach and return to the shell.
+                                          Without credentials and on a TTY, runs
+                                          the interactive device-code login
+                                          first. --hub defaults to ${DEFAULT_HUB}
+                                          (or the URL stored in a previous
+                                          login). --relogin forces re-login.
+                                          --label is sent to the Hub on connect
+                                          for the dashboard device list
+                                          (defaults to hostname). Non-TTY
                                           environments must mount a pre-existing
                                           user-auth.json (plan §6.4).
   stop                                    Stop the running daemon (SIGTERM)
@@ -79,6 +82,8 @@ Env:
 /** Known boolean flags — never consume the following token as a value. */
 const BOOLEAN_FLAGS = new Set([
     "foreground",
+    "background",
+    "d",
     "f",
     "follow",
     "json",
@@ -285,9 +290,12 @@ async function ensureUserAuthForStart(args) {
 }
 async function cmdStart(args) {
     const cfg = loadConfig();
-    const foreground = args.flags.foreground === true;
+    // Foreground is now the default. --background (alias -d) detaches.
+    // --foreground is still accepted (no-op) for backwards compatibility and
+    // is also what the detached child re-execs itself with.
+    const background = args.flags.background === true || args.flags.d === true;
     log.info("cmd start", {
-        foreground,
+        background,
         relogin: args.flags.relogin === true,
         child: process.env.BOTCORD_DAEMON_CHILD === "1",
     });
@@ -304,7 +312,7 @@ async function cmdStart(args) {
     if (process.env.BOTCORD_DAEMON_CHILD !== "1") {
         await ensureUserAuthForStart(args);
     }
-    if (!foreground) {
+    if (background) {
         // Detached child re-exec in foreground mode. The child writes the PID
         // file once it's up; the parent only polls to confirm startup so the
         // two never race on the same file.

package/package.json

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

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

@@ -484,7 +484,11 @@ describe("createBotCordChannel — streamBlock()", () => {
         traceId: "m_trace",
         accountId: "ag_self",
         conversationId: "rm_oc_1",
-        block: { kind: "assistant_text", seq: 3, raw: { text: "partial" } },
+        block: {
+          kind: "assistant_text",
+          seq: 3,
+          raw: { type: "assistant", message: { content: [{ type: "text", text: "partial" }] } },
+        },
         log: silentLog,
       });
       expect(fetchSpy).toHaveBeenCalledTimes(1);
@@ -493,10 +497,13 @@ describe("createBotCordChannel — streamBlock()", () => {
       expect(init.method).toBe("POST");
       const body = JSON.parse(init.body as string);
       expect(body.trace_id).toBe("m_trace");
+      expect(body.seq).toBe(3);
+      // The channel remaps daemon-internal kinds into the shape the dashboard
+      // renders: `{ kind, payload, seq }` with `assistant_text` → `assistant`.
       expect(body.block).toEqual({
-        kind: "assistant_text",
+        kind: "assistant",
         seq: 3,
-        raw: { text: "partial" },
+        payload: { text: "partial" },
       });
       expect((init.headers as Record<string, string>).Authorization).toBe("Bearer test-token");
     } finally {

package/src/gateway/__tests__/claude-code-adapter.test.ts

@@ -211,7 +211,7 @@ process.stdout.write(JSON.stringify({type:"result", subtype:"success", session_i
 `,
       );
 
-    it("owner → --permission-mode acceptEdits", async () => {
+    it("owner → --permission-mode bypassPermissions", async () => {
       const adapter = new ClaudeCodeAdapter({ binary: echoScript() });
       const ctrl = new AbortController();
       const res = await adapter.run({
@@ -225,7 +225,7 @@ process.stdout.write(JSON.stringify({type:"result", subtype:"success", session_i
       const argv = JSON.parse(res.text) as string[];
       const modeIdx = argv.indexOf("--permission-mode");
       expect(modeIdx).toBeGreaterThanOrEqual(0);
-      expect(argv[modeIdx + 1]).toBe("acceptEdits");
+      expect(argv[modeIdx + 1]).toBe("bypassPermissions");
     });
 
     it("public → --permission-mode default", async () => {

package/src/gateway/channels/botcord.ts

@@ -664,6 +664,7 @@ export function createBotCordChannel(options: BotCordChannelOptions): ChannelAda
       try {
         const token = await client.ensureToken();
         const block = ctx.block as { raw?: unknown; kind?: string; seq?: number } | undefined;
+        const seq = typeof block?.seq === "number" ? block.seq : 0;
         const resp = await fetch(`${hubUrl}/hub/stream-block`, {
           method: "POST",
           headers: {
@@ -672,8 +673,8 @@ export function createBotCordChannel(options: BotCordChannelOptions): ChannelAda
           },
           body: JSON.stringify({
             trace_id: ctx.traceId,
-            seq: typeof block?.seq === "number" ? block.seq : 0,
-            block: ctx.block,
+            seq,
+            block: normalizeBlockForHub(block, seq),
           }),
           signal: AbortSignal.timeout(10_000),
         });
@@ -697,5 +698,90 @@ export function createBotCordChannel(options: BotCordChannelOptions): ChannelAda
   return adapter;
 }
 
-// Re-export the normalizer for tests that want to exercise it directly.
+// Re-export the normalizers for tests that want to exercise them directly.
 export { normalizeInbox as __normalizeInboxForTests };
+export { normalizeBlockForHub as __normalizeBlockForHubForTests };
+
+/**
+ * Reshape a runtime StreamBlock `{ raw, kind, seq }` into the
+ * `{ kind, payload, seq }` form the owner-chat frontend renders.
+ *
+ * Daemon-internal kinds are Claude Code / Codex specific; the dashboard's
+ * StreamBlocksView expects a smaller vocabulary (`assistant`, `tool_call`,
+ * `tool_result`, `reasoning`) with structured `payload` fields. Without this
+ * remap the UI falls back to printing the bare kind string per step, which
+ * is what users see as "system / assistant_text / other / other".
+ *
+ * Extraction is best-effort — unknown shapes pass through as `other` with
+ * an empty payload rather than throwing.
+ */
+function normalizeBlockForHub(
+  block: { raw?: unknown; kind?: string; seq?: number } | undefined,
+  seq: number,
+): { kind: string; seq: number; payload: Record<string, unknown> } {
+  const raw = (block?.raw ?? {}) as any;
+  const kind = block?.kind ?? "other";
+  const payload: Record<string, unknown> = {};
+
+  if (kind === "assistant_text") {
+    // Claude Code: {type:"assistant", message:{content:[{type:"text",text}]}}
+    // Codex:       {type:"item.completed", item:{type:"agent_message", text}}
+    let text = "";
+    const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+    for (const c of contents) {
+      if (c?.type === "text" && typeof c.text === "string") text += c.text;
+    }
+    if (!text && typeof raw?.item?.text === "string") text = raw.item.text;
+    return { kind: "assistant", seq, payload: { text } };
+  }
+
+  if (kind === "tool_use") {
+    // Claude Code: assistant message w/ content[].type === "tool_use" → {id,name,input}
+    // Codex:       item.started / item.completed for command_execution, file_change, mcp_tool_call, web_search
+    const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+    const tu = contents.find((c: any) => c?.type === "tool_use");
+    if (tu) {
+      payload.name = typeof tu.name === "string" ? tu.name : "tool";
+      if (tu.input && typeof tu.input === "object") payload.params = tu.input;
+      if (typeof tu.id === "string") payload.id = tu.id;
+    } else if (raw?.item && typeof raw.item === "object") {
+      payload.name = typeof raw.item.type === "string" ? raw.item.type : "tool";
+      payload.params = raw.item;
+    }
+    return { kind: "tool_call", seq, payload };
+  }
+
+  if (kind === "tool_result") {
+    // Claude Code: {type:"user", message:{content:[{type:"tool_result",tool_use_id,content}]}}
+    const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+    const tr = contents.find((c: any) => c?.type === "tool_result");
+    if (tr) {
+      let resultStr = "";
+      if (typeof tr.content === "string") {
+        resultStr = tr.content;
+      } else if (Array.isArray(tr.content)) {
+        resultStr = tr.content
+          .map((c: any) => (typeof c?.text === "string" ? c.text : JSON.stringify(c)))
+          .join("\n");
+      }
+      payload.result = resultStr;
+      if (typeof tr.tool_use_id === "string") payload.tool_use_id = tr.tool_use_id;
+    }
+    return { kind: "tool_result", seq, payload };
+  }
+
+  if (kind === "system") {
+    if (typeof raw?.subtype === "string") payload.subtype = raw.subtype;
+    if (typeof raw?.session_id === "string") payload.session_id = raw.session_id;
+    if (typeof raw?.model === "string") payload.model = raw.model;
+    return { kind: "system", seq, payload };
+  }
+
+  // "other" — e.g. Claude Code `type:"result"` end-of-turn summary.
+  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 };
+}

package/src/gateway/runtimes/claude-code.ts

@@ -96,17 +96,29 @@ export class ClaudeCodeAdapter extends NdjsonStreamAdapter {
 
   protected buildArgs(opts: RuntimeRunOptions): string[] {
     const args = ["-p", opts.text, "--output-format", "stream-json", "--verbose"];
+    // Headless `-p` mode does not load project `.claude/` by default, so
+    // per-agent skills seeded at `<workspace>/.claude/skills/` are invisible
+    // unless we opt in. `extraArgs` wins so operators can still override.
+    if (!opts.extraArgs?.some((a) => a.startsWith("--setting-sources"))) {
+      args.push("--setting-sources", "project");
+    }
     if (opts.sessionId) {
       if (!isValidClaudeSessionId(opts.sessionId)) throw new Error(invalidClaudeSessionIdError());
       args.push("--resume", opts.sessionId);
     }
     // Permission-mode policy:
-    //  - owner: acceptEdits (owner trusts their own agent).
-    //  - non-owner (trusted/public): default (let Claude Code prompt / reject edits per its own rules).
+    //  - owner: bypassPermissions (owner fully trusts their own agent; daemon
+    //    has no authorization-relay UI yet, so any other mode causes Bash /
+    //    WebFetch / MCP tool calls to deadlock waiting for a prompt that
+    //    never reaches the user — see issue #332 for the planned MCP-bridge
+    //    relay that will let us tighten this back up).
+    //  - non-owner (trusted/public): default (let Claude Code prompt / reject
+    //    per its own rules — we must NOT auto-bypass for agents the operator
+    //    doesn't own).
     // `extraArgs` still wins — operators who know what they're doing can override either.
     if (!opts.extraArgs?.some((a) => a.startsWith("--permission-mode"))) {
       if (opts.trustLevel === "owner") {
-        args.push("--permission-mode", "acceptEdits");
+        args.push("--permission-mode", "bypassPermissions");
       } else {
         args.push("--permission-mode", "default");
       }

package/src/index.ts

@@ -74,15 +74,18 @@ Commands:
                                           Without --agent, the daemon discovers
                                           identities from ~/.botcord/credentials
                                           at startup (repeat --agent to pin).
-  start [--foreground] [--relogin] [--hub <url>] [--label <name>]
-                                          Start the daemon. Without credentials
-                                          and on a TTY, runs the interactive
-                                          device-code login first. --hub defaults
-                                          to ${DEFAULT_HUB} (or the URL stored in
-                                          a previous login). --relogin forces
-                                          re-login. --label is sent to the Hub
-                                          on connect for the dashboard device
-                                          list (defaults to hostname). Non-TTY
+  start [--background|-d] [--relogin] [--hub <url>] [--label <name>]
+                                          Start the daemon in the foreground by
+                                          default. Pass --background (alias -d)
+                                          to detach and return to the shell.
+                                          Without credentials and on a TTY, runs
+                                          the interactive device-code login
+                                          first. --hub defaults to ${DEFAULT_HUB}
+                                          (or the URL stored in a previous
+                                          login). --relogin forces re-login.
+                                          --label is sent to the Hub on connect
+                                          for the dashboard device list
+                                          (defaults to hostname). Non-TTY
                                           environments must mount a pre-existing
                                           user-auth.json (plan §6.4).
   stop                                    Stop the running daemon (SIGTERM)
@@ -128,6 +131,8 @@ interface ParsedArgs {
 /** Known boolean flags — never consume the following token as a value. */
 const BOOLEAN_FLAGS = new Set([
   "foreground",
+  "background",
+  "d",
   "f",
   "follow",
   "json",
@@ -363,9 +368,13 @@ async function ensureUserAuthForStart(args: ParsedArgs): Promise<UserAuthRecord
 
 async function cmdStart(args: ParsedArgs): Promise<void> {
   const cfg = loadConfig();
-  const foreground = args.flags.foreground === true;
+  // Foreground is now the default. --background (alias -d) detaches.
+  // --foreground is still accepted (no-op) for backwards compatibility and
+  // is also what the detached child re-execs itself with.
+  const background =
+    args.flags.background === true || args.flags.d === true;
   log.info("cmd start", {
-    foreground,
+    background,
     relogin: args.flags.relogin === true,
     child: process.env.BOTCORD_DAEMON_CHILD === "1",
   });
@@ -385,7 +394,7 @@ async function cmdStart(args: ParsedArgs): Promise<void> {
     await ensureUserAuthForStart(args);
   }
 
-  if (!foreground) {
+  if (background) {
     // Detached child re-exec in foreground mode. The child writes the PID
     // file once it's up; the parent only polls to confirm startup so the
     // two never race on the same file.