@botcord/daemon 0.2.14 → 0.2.16

package/dist/agent-workspace.js

@@ -16,9 +16,11 @@
  *                       systemContext does not clobber the user/agent-
  *                       editable workspace AGENTS.md.
  */
-import { chmodSync, copyFileSync, existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync, symlinkSync, unlinkSync, writeFileSync, } from "node:fs";
+import { chmodSync, copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync, symlinkSync, unlinkSync, writeFileSync, } from "node:fs";
+import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import path from "node:path";
+const require = createRequire(import.meta.url);
 // Accepted agent id pattern. Enforced at every path-builder entry so a
 // malicious / malformed agentId (e.g. "../../etc") cannot escape
 // ~/.botcord/agents/ and end up under `rmSync(..., { recursive: true })`
@@ -329,6 +331,49 @@ export function ensureAgentHermesWorkspace(agentId) {
     mergeHermesProviderEnv(path.join(hermesHome, ".env"));
     return { hermesHome, hermesWorkspace };
 }
+/**
+ * Bundled Claude Code skills shipped inside `@botcord/cli/skills/`. Seeded
+ * into every agent workspace so the spawned `claude` runtime (which loads
+ * `.claude/` via `--setting-sources project`) can discover the BotCord CLI
+ * skill without any manual setup.
+ */
+const BUNDLED_CC_SKILLS = ["botcord", "botcord-user-guide"];
+function resolveBundledCliSkillsRoot() {
+    try {
+        const pkgJsonPath = require.resolve("@botcord/cli/package.json");
+        const root = path.join(path.dirname(pkgJsonPath), "skills");
+        return existsSync(root) ? root : null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Copy daemon-owned Claude Code skills into the workspace. Re-copied on every
+ * `ensureAgentWorkspace` call (force-overwrite) so daemon upgrades propagate;
+ * users wanting custom skills should pick a different directory name under
+ * `.claude/skills/` — those are not touched here.
+ */
+function seedClaudeCodeSkills(workspace) {
+    const sourceRoot = resolveBundledCliSkillsRoot();
+    if (!sourceRoot)
+        return;
+    const skillsDir = path.join(workspace, ".claude", "skills");
+    mkdirTolerant(path.join(workspace, ".claude"));
+    mkdirTolerant(skillsDir);
+    for (const name of BUNDLED_CC_SKILLS) {
+        const src = path.join(sourceRoot, name);
+        if (!existsSync(src))
+            continue;
+        const dst = path.join(skillsDir, name);
+        try {
+            cpSync(src, dst, { recursive: true, force: true, dereference: true });
+        }
+        catch {
+            /* best-effort */
+        }
+    }
+}
 /**
  * Idempotently create the agent's home / workspace / state directories and
  * seed the workspace Markdown files. Existing files are never overwritten —
@@ -356,6 +401,7 @@ export function ensureAgentWorkspace(agentId, seed) {
     writeIfMissing(path.join(workspace, "memory.md"), MEMORY_MD);
     writeIfMissing(path.join(workspace, "task.md"), TASK_MD);
     writeIfMissing(path.join(notes, ".gitkeep"), "");
+    seedClaudeCodeSkills(workspace);
 }
 const DISPLAY_NAME_LINE = /^- \*\*Display name\*\*: .*$/m;
 // Match the Bio section's body. Anchor on the next `##` heading when one

package/dist/index.js

@@ -329,8 +329,9 @@ async function runDeviceCodeFlow(opts) {
  * plane (legacy P0 behavior — caller may still log a warning).
  *
  * Decision tree (plan §4.4 + §6.4):
- * 1. Have existing creds and no `--relogin` → return existing record.
- * 2. `--install-token` → redeem the one-time dashboard ticket.
+ * 1. Have existing creds, no `--relogin`, no `--install-token` → return existing record.
+ * 2. `--install-token` (overrides existing creds — they may be stale or
+ *    belong to a different account) → redeem the one-time dashboard ticket.
  * 3. `--relogin` → device-code login.
  * 4. No creds + TTY → device-code login.
  * 5. No creds + no TTY → exit 1 with the §6.4 hint.
@@ -341,7 +342,7 @@ async function ensureUserAuthForStart(args) {
     const installToken = typeof args.flags["install-token"] === "string" ? args.flags["install-token"] : undefined;
     const relogin = args.flags.relogin === true;
     const existing = safeLoadUserAuth();
-    if (!relogin && existing) {
+    if (!relogin && !installToken && existing) {
         // A previously-set auth-expired flag is stale by definition once the
         // operator runs `start` again — if creds genuinely don't work, the
         // control channel will re-write the flag on the next 4401/4403.
@@ -355,9 +356,6 @@ async function ensureUserAuthForStart(args) {
         if (labelFlag && existing.label !== labelFlag) {
             console.error(`note: --label "${labelFlag}" ignored (already logged in as "${existing.label ?? "<unset>"}"); pass --relogin to change it`);
         }
-        if (installToken) {
-            console.error("note: --install-token ignored because daemon is already logged in");
-        }
         return existing;
     }
     // Need a fresh login. Resolve hubUrl: explicit --hub > existing record > DEFAULT_HUB.

package/package.json

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

package/src/__tests__/agent-workspace.test.ts

@@ -80,6 +80,31 @@ describe("ensureAgentWorkspace", () => {
     expect(existsSync(path.join(agentWorkspaceDir("ag_notes"), "notes", ".gitkeep"))).toBe(true);
   });
 
+  it("seeds bundled Claude Code skills under .claude/skills/", () => {
+    ensureAgentWorkspace("ag_skills", {});
+    const skillsDir = path.join(agentWorkspaceDir("ag_skills"), ".claude", "skills");
+    expect(existsSync(path.join(skillsDir, "botcord", "SKILL.md"))).toBe(true);
+    expect(existsSync(path.join(skillsDir, "botcord-user-guide", "SKILL.md"))).toBe(true);
+  });
+
+  it("re-seeds skills on a second call so daemon upgrades propagate", () => {
+    ensureAgentWorkspace("ag_skill_upgrade", {});
+    const skillFile = path.join(
+      agentWorkspaceDir("ag_skill_upgrade"),
+      ".claude",
+      "skills",
+      "botcord",
+      "SKILL.md",
+    );
+    writeFileSync(skillFile, "stale content from a prior daemon version\n");
+
+    ensureAgentWorkspace("ag_skill_upgrade", {});
+
+    const reseeded = readFileSync(skillFile, "utf8");
+    expect(reseeded).not.toBe("stale content from a prior daemon version\n");
+    expect(reseeded).toContain("name: botcord");
+  });
+
   it("does not overwrite a user-modified memory.md on a second call", () => {
     ensureAgentWorkspace("ag_keep", {});
     const memoryPath = path.join(agentWorkspaceDir("ag_keep"), "memory.md");

package/src/agent-workspace.ts

@@ -19,6 +19,7 @@
 import {
   chmodSync,
   copyFileSync,
+  cpSync,
   existsSync,
   lstatSync,
   mkdirSync,
@@ -28,9 +29,12 @@ import {
   unlinkSync,
   writeFileSync,
 } from "node:fs";
+import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import path from "node:path";
 
+const require = createRequire(import.meta.url);
+
 // Accepted agent id pattern. Enforced at every path-builder entry so a
 // malicious / malformed agentId (e.g. "../../etc") cannot escape
 // ~/.botcord/agents/ and end up under `rmSync(..., { recursive: true })`
@@ -364,6 +368,48 @@ export function ensureAgentHermesWorkspace(agentId: string): {
   return { hermesHome, hermesWorkspace };
 }
 
+/**
+ * Bundled Claude Code skills shipped inside `@botcord/cli/skills/`. Seeded
+ * into every agent workspace so the spawned `claude` runtime (which loads
+ * `.claude/` via `--setting-sources project`) can discover the BotCord CLI
+ * skill without any manual setup.
+ */
+const BUNDLED_CC_SKILLS = ["botcord", "botcord-user-guide"] as const;
+
+function resolveBundledCliSkillsRoot(): string | null {
+  try {
+    const pkgJsonPath = require.resolve("@botcord/cli/package.json");
+    const root = path.join(path.dirname(pkgJsonPath), "skills");
+    return existsSync(root) ? root : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Copy daemon-owned Claude Code skills into the workspace. Re-copied on every
+ * `ensureAgentWorkspace` call (force-overwrite) so daemon upgrades propagate;
+ * users wanting custom skills should pick a different directory name under
+ * `.claude/skills/` — those are not touched here.
+ */
+function seedClaudeCodeSkills(workspace: string): void {
+  const sourceRoot = resolveBundledCliSkillsRoot();
+  if (!sourceRoot) return;
+  const skillsDir = path.join(workspace, ".claude", "skills");
+  mkdirTolerant(path.join(workspace, ".claude"));
+  mkdirTolerant(skillsDir);
+  for (const name of BUNDLED_CC_SKILLS) {
+    const src = path.join(sourceRoot, name);
+    if (!existsSync(src)) continue;
+    const dst = path.join(skillsDir, name);
+    try {
+      cpSync(src, dst, { recursive: true, force: true, dereference: true });
+    } catch {
+      /* best-effort */
+    }
+  }
+}
+
 /**
  * Idempotently create the agent's home / workspace / state directories and
  * seed the workspace Markdown files. Existing files are never overwritten —
@@ -392,6 +438,7 @@ export function ensureAgentWorkspace(agentId: string, seed: WorkspaceSeed): void
   writeIfMissing(path.join(workspace, "memory.md"), MEMORY_MD);
   writeIfMissing(path.join(workspace, "task.md"), TASK_MD);
   writeIfMissing(path.join(notes, ".gitkeep"), "");
+  seedClaudeCodeSkills(workspace);
 }
 
 /** Patch fields accepted by {@link applyAgentIdentity}. `bio = null` clears it. */

package/src/index.ts

@@ -417,8 +417,9 @@ async function runDeviceCodeFlow(opts: {
  * plane (legacy P0 behavior — caller may still log a warning).
  *
  * Decision tree (plan §4.4 + §6.4):
- * 1. Have existing creds and no `--relogin` → return existing record.
- * 2. `--install-token` → redeem the one-time dashboard ticket.
+ * 1. Have existing creds, no `--relogin`, no `--install-token` → return existing record.
+ * 2. `--install-token` (overrides existing creds — they may be stale or
+ *    belong to a different account) → redeem the one-time dashboard ticket.
  * 3. `--relogin` → device-code login.
  * 4. No creds + TTY → device-code login.
  * 5. No creds + no TTY → exit 1 with the §6.4 hint.
@@ -432,7 +433,7 @@ async function ensureUserAuthForStart(args: ParsedArgs): Promise<UserAuthRecord
 
   const existing = safeLoadUserAuth();
 
-  if (!relogin && existing) {
+  if (!relogin && !installToken && existing) {
     // A previously-set auth-expired flag is stale by definition once the
     // operator runs `start` again — if creds genuinely don't work, the
     // control channel will re-write the flag on the next 4401/4403.
@@ -448,9 +449,6 @@ async function ensureUserAuthForStart(args: ParsedArgs): Promise<UserAuthRecord
         `note: --label "${labelFlag}" ignored (already logged in as "${existing.label ?? "<unset>"}"); pass --relogin to change it`,
       );
     }
-    if (installToken) {
-      console.error("note: --install-token ignored because daemon is already logged in");
-    }
     return existing;
   }