@dosu/cli 0.36.0 → 0.37.0-alpha.2

package/README.md

@@ -92,7 +92,7 @@ Or right-click the binary, select "Open", and click "Open" in the dialog.
 | `dosu setup` | Run the setup wizard (auth → deployment → detect tools → configure) |
 | `dosu login` | Authenticate with Dosu via browser OAuth |
 | `dosu logout` | Clear saved credentials |
-| `dosu status` | Show current authentication and MCP status |
+| `dosu status [--json]` | Show current authentication and MCP status |
 | `dosu mcp list` | List supported AI tools |
 | `dosu mcp add <tool>` | Add the Dosu MCP server to a specific tool |
 | `dosu logs` | View or manage debug logs (`--tail`, `--clear`) |

package/bin/dosu.js

@@ -4759,7 +4759,7 @@ var init_dist4 = __esm(() => {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.36.0", INSTALL_CHANNEL = "npm";
+var VERSION = "0.37.0-alpha.2", INSTALL_CHANNEL = "npm";
 
 // src/debug/logger.ts
 import {
@@ -10449,13 +10449,24 @@ var init_skill_update_check = __esm(() => {
 
 // src/commands/skill.ts
 import { execSync as execSync2 } from "node:child_process";
-function supportedSkillAgentArgs() {
-  return SUPPORTED_SKILL_AGENTS.map((agent) => `-a ${agent}`).join(" ");
+function skillAgentIDsForProviders(providerIDs) {
+  return [
+    ...new Set(providerIDs.map((providerID) => SKILL_AGENT_BY_PROVIDER[providerID]).filter((agent) => Boolean(agent)))
+  ];
+}
+function skillAgentArgs(providerIDs) {
+  const agents = providerIDs === undefined ? SUPPORTED_SKILL_AGENTS : skillAgentIDsForProviders(providerIDs);
+  return agents.map((agent) => `-a ${agent}`).join(" ");
 }
-async function installSkill() {
+async function installSkill(providerIDs, options = {}) {
+  const agentArgs = skillAgentArgs(providerIDs);
+  if (!agentArgs) {
+    logger.debug("skill", "No selected providers support the Dosu skill");
+    return { success: true };
+  }
   try {
-    execSync2(`npx skills add ${SKILL_REPO} -g ${supportedSkillAgentArgs()} -s ${SKILL_NAME} -y`, {
-      stdio: "inherit"
+    execSync2(`npx skills add ${SKILL_REPO} -g ${agentArgs} -s ${SKILL_NAME} -y`, {
+      stdio: options.quiet ? "pipe" : "inherit"
     });
   } catch (err) {
     logger.error("skill", `Failed to install skill: ${err}`);
@@ -10514,7 +10525,7 @@ Failed to update skill.`));
   });
   return cmd;
 }
-var import_picocolors13, SKILL_REPO = "dosu-ai/dosu-skill", SKILL_NAME = "dosu", SUPPORTED_SKILL_AGENTS;
+var import_picocolors13, SKILL_REPO = "dosu-ai/dosu-skill", SKILL_NAME = "dosu", SUPPORTED_SKILL_AGENTS, SKILL_AGENT_BY_PROVIDER;
 var init_skill = __esm(() => {
   init_commander();
   init_logger();
@@ -10532,6 +10543,20 @@ var init_skill = __esm(() => {
     "opencode",
     "antigravity"
   ];
+  SKILL_AGENT_BY_PROVIDER = {
+    claude: "claude-code",
+    cursor: "cursor",
+    vscode: "github-copilot",
+    gemini: "gemini-cli",
+    codex: "codex",
+    windsurf: "windsurf",
+    zed: "zed",
+    cline: "cline",
+    "cline-cli": "cline",
+    copilot: "github-copilot",
+    opencode: "opencode",
+    antigravity: "antigravity"
+  };
 });
 
 // src/mcp/constants.ts
@@ -11163,78 +11188,185 @@ var init_providers = __esm(() => {
   init_zed();
 });
 
-// src/setup/audit-handoff.ts
-import { spawnSync as spawnSync2 } from "node:child_process";
-function buildAuditHandoffPrompt(dosuCmd = dosuInvocation()) {
-  return [
-    "Audit this repository to see what docs Dosu can generate for it.",
-    "1. Run the codebase audit from the Dosu skill. It writes findings to .dosu/audit.json.",
-    "2. Show me the findings and which docs you recommend Dosu generate.",
-    `3. Once I confirm, run \`${dosuCmd} audit --tasks <comma-separated task ids> --json\` to kick off generation. Dosu opens a PR and the CLI notifies me when it's ready.`
-  ].join(`
-`);
+// src/rules/installer.ts
+import { existsSync as existsSync16, mkdirSync as mkdirSync8, readFileSync as readFileSync14, unlinkSync, writeFileSync as writeFileSync7 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname5, join as join26 } from "node:path";
+function claudeConfigDir() {
+  return process.env.CLAUDE_CONFIG_DIR || join26(homedir3(), ".claude");
 }
-function binOnPath(bin) {
-  const cmd = process.platform === "win32" ? "where" : "which";
-  try {
-    return spawnSync2(cmd, [bin], { stdio: "ignore" }).status === 0;
-  } catch {
-    return false;
+function codexHome2() {
+  return process.env.CODEX_HOME || join26(homedir3(), ".codex");
+}
+function isRuleAgent(agent) {
+  return Object.hasOwn(RULE_TARGETS, agent);
+}
+function rulePathForAgent(agent) {
+  return isRuleAgent(agent) ? RULE_TARGETS[agent].path() : null;
+}
+function normalizeRule(content) {
+  return `${content.trim()}
+`;
+}
+async function fetchDosuRule(fetchImpl = globalThis.fetch) {
+  for (const url of DOSU_RULE_URLS) {
+    try {
+      const response = await fetchImpl(url);
+      if (!response.ok)
+        continue;
+      const content = await response.text();
+      if (content.trim())
+        return normalizeRule(content);
+    } catch {}
   }
+  return normalizeRule(FALLBACK_DOSU_RULE);
 }
-function claudeCliAvailable() {
-  return binOnPath("claude");
+function ensureParent(path3) {
+  mkdirSync8(dirname5(path3), { recursive: true });
 }
-function dosuInvocation() {
-  return binOnPath("dosu") ? "dosu" : "npx -y @dosu/cli";
+function writeIfChanged(path3, content) {
+  if (!existsSync16(path3)) {
+    ensureParent(path3);
+    writeFileSync7(path3, content, "utf-8");
+    return "created";
+  }
+  if (readFileSync14(path3, "utf-8") === content)
+    return "unchanged";
+  writeFileSync7(path3, content, "utf-8");
+  return "updated";
 }
-function printManualAuditNudge() {
-  log.message(`See what docs Dosu can generate for this repo:
-
-${info("Ask Dosu to audit this repo and show what docs it can generate.")}
-
-Or run ${info(`${dosuInvocation()} audit`)} after your agent writes the audit.`);
+function findSection(content) {
+  const startMatch = content.match(DOSU_RULE_SECTION_START_RE);
+  const start = startMatch?.index ?? -1;
+  const end = content.indexOf(DOSU_RULE_SECTION_END, Math.max(start, 0));
+  if (start === -1 && end === -1)
+    return null;
+  if (start === -1 || end < start) {
+    throw new Error("Dosu rule markers are incomplete; refusing to overwrite the instruction file");
+  }
+  return { start, end };
 }
-async function offerAuditHandoff() {
-  if (!detectGitRepo())
-    return false;
-  if (!claudeCliAvailable()) {
-    printManualAuditNudge();
-    return false;
+function lineEndingFor(content) {
+  return content.includes(`\r
+`) ? `\r
+` : `
+`;
+}
+function buildSection(content, lineEnding = `
+`) {
+  const body = content.trimEnd().replace(/\r?\n/g, lineEnding);
+  return `${DOSU_RULE_SECTION_START}${lineEnding}${body}${lineEnding}${DOSU_RULE_SECTION_END}`;
+}
+function upsertSection(path3, content) {
+  if (!existsSync16(path3)) {
+    const section2 = buildSection(content);
+    ensureParent(path3);
+    writeFileSync7(path3, `${section2}
+`, "utf-8");
+    return "created";
   }
-  const go = await confirm({
-    message: "Kick off the codebase audit in Claude Code now?",
-    initialValue: true
-  });
-  if (isCancel(go) || !go) {
-    printManualAuditNudge();
-    return false;
+  const existing = readFileSync14(path3, "utf-8");
+  const lineEnding = lineEndingFor(existing);
+  const section = buildSection(content, lineEnding);
+  const location = findSection(existing);
+  let next;
+  if (location) {
+    next = existing.slice(0, location.start) + section + existing.slice(location.end + DOSU_RULE_SECTION_END.length);
+  } else {
+    const separator = existing.length > 0 && !existing.endsWith(lineEnding) ? `${lineEnding}${lineEnding}` : existing.length > 0 ? lineEnding : "";
+    next = `${existing}${separator}${section}${lineEnding}`;
   }
-  return true;
+  if (next === existing)
+    return "unchanged";
+  writeFileSync7(path3, next, "utf-8");
+  return "updated";
 }
-function launchAuditAgent() {
-  logger.info("setup", "Handing off to Claude Code for the codebase audit");
-  const result = spawnSync2("claude", ["--model", AUDIT_AGENT_MODEL, buildAuditHandoffPrompt()], {
-    stdio: "inherit",
-    shell: process.platform === "win32"
-  });
-  if (result.error) {
-    logger.warn("setup", `Claude Code launch failed: ${result.error.message}`);
-    printManualAuditNudge();
+function installRuleForAgent(agent, content) {
+  if (!isRuleAgent(agent))
+    return null;
+  const target = RULE_TARGETS[agent];
+  const path3 = target.path();
+  const normalized = normalizeRule(content);
+  const action = target.kind === "file" ? writeIfChanged(path3, target.cursorFrontmatter ? `${CURSOR_FRONTMATTER}${normalized}` : normalized) : upsertSection(path3, normalized);
+  return { agent, path: path3, action };
+}
+function removeRuleForAgent(agent) {
+  if (!isRuleAgent(agent))
+    return null;
+  const target = RULE_TARGETS[agent];
+  const path3 = target.path();
+  if (!existsSync16(path3))
+    return { agent, path: path3, action: "not_found" };
+  if (target.kind === "file") {
+    unlinkSync(path3);
+    return { agent, path: path3, action: "removed" };
+  }
+  const existing = readFileSync14(path3, "utf-8");
+  const lineEnding = lineEndingFor(existing);
+  const location = findSection(existing);
+  if (!location)
+    return { agent, path: path3, action: "not_found" };
+  const next = (existing.slice(0, location.start) + existing.slice(location.end + DOSU_RULE_SECTION_END.length)).replace(/(?:\r?\n){3,}/g, `${lineEnding}${lineEnding}`).replace(/^(?:\r?\n)+/, "").trimEnd();
+  if (!next) {
+    unlinkSync(path3);
+  } else {
+    writeFileSync7(path3, `${next}${lineEnding}`, "utf-8");
   }
+  return { agent, path: path3, action: "removed" };
 }
-var AUDIT_AGENT_MODEL = "haiku";
-var init_audit_handoff = __esm(() => {
-  init_dist8();
-  init_logger();
-  init_github_step();
-  init_styles();
+var DOSU_RULE_SECTION_VERSION = 1, DOSU_RULE_SECTION_START, DOSU_RULE_SECTION_END = "<!-- dosu:rules:end -->", DOSU_RULE_SECTION_START_RE, CURSOR_FRONTMATTER = `---
+alwaysApply: true
+---
+
+`, DOSU_RULE_URLS, FALLBACK_DOSU_RULE = `The team you are assisting maintains shared knowledge in Dosu: consult it to build on prior work, and contribute durable knowledge so future teammates and agents do not have to rediscover it. Always use only tools currently listed by the server.
+
+When \`read_knowledge\` is listed, call it before non-trivial code or documentation work involving architecture, conventions, prior decisions, gotchas, incidents, ownership, or branch history. **If unsure whether relevant context exists, read first.** Pass \`repo\` and \`branch\` when available. Skip generic questions, trivial or self-contained edits, and context already injected by Dosu. Treat results as leads and verify them against current code and state.
+
+When \`write_knowledge\` is listed, use it after the task for durable, non-obvious knowledge that future work would otherwise have to rediscover. Do not save task or PR summaries, progress, test results, obvious facts, speculation, duplicates, or sensitive data. **If nothing durable was learned, do not write.**
+
+Use \`review_knowledge\` only when the user asks to inspect or manage pending knowledge. Preview one item at a time and require explicit confirmation before making changes.
+`, RULE_TARGETS, SUPPORTED_RULE_AGENT_IDS;
+var init_installer = __esm(() => {
+  DOSU_RULE_SECTION_START = `<!-- dosu:rules:start v${DOSU_RULE_SECTION_VERSION} -->`;
+  DOSU_RULE_SECTION_START_RE = /<!-- dosu:rules:start(?: v\d+)? -->/;
+  DOSU_RULE_URLS = [
+    "https://raw.githubusercontent.com/dosu-ai/dosu-cli/main/rules/dosu.md",
+    "https://raw.githubusercontent.com/dosu-ai/dosu-cli/master/rules/dosu.md"
+  ];
+  RULE_TARGETS = {
+    claude: {
+      kind: "file",
+      path: () => join26(claudeConfigDir(), "rules", "dosu.md")
+    },
+    cursor: {
+      kind: "file",
+      path: () => join26(homedir3(), ".cursor", "rules", "dosu.mdc"),
+      cursorFrontmatter: true
+    },
+    codex: {
+      kind: "section",
+      path: () => join26(codexHome2(), "AGENTS.md")
+    },
+    opencode: {
+      kind: "section",
+      path: () => join26(homedir3(), ".config", "opencode", "AGENTS.md")
+    },
+    gemini: {
+      kind: "section",
+      path: () => join26(homedir3(), ".gemini", "GEMINI.md")
+    },
+    antigravity: {
+      kind: "section",
+      path: () => join26(homedir3(), ".gemini", "GEMINI.md")
+    }
+  };
+  SUPPORTED_RULE_AGENT_IDS = Object.keys(RULE_TARGETS);
 });
 
 // src/setup/agents-md-step.ts
 import { execSync as execSync3 } from "node:child_process";
-import { existsSync as existsSync16, readFileSync as readFileSync14, writeFileSync as writeFileSync7 } from "node:fs";
-import { join as join26 } from "node:path";
+import { existsSync as existsSync17, readFileSync as readFileSync15, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join27 } from "node:path";
 function inGitWorkTree(cwd = process.cwd()) {
   try {
     const stdout2 = execSync3("git rev-parse --is-inside-work-tree", {
@@ -11246,51 +11378,58 @@ function inGitWorkTree(cwd = process.cwd()) {
     return false;
   }
 }
-function buildDosuAgentsSection(dosuCmd = dosuInvocation()) {
-  return [
-    DOSU_SECTION_START,
-    "## Dosu",
-    "",
-    "Shared team knowledge lives in [Dosu](https://dosu.dev), via the Dosu MCP server.",
-    "",
-    "- Before a task, and for any codebase or docs questions: pull context with `read_knowledge` before digging through source.",
-    "- After a task: save durable learnings with `write_knowledge`.",
-    "",
-    `Missing these tools? Run \`${dosuCmd} setup --help\` — it covers agent-assisted setup.`,
-    DOSU_SECTION_END
-  ].join(`
+function lineEndingFor2(content) {
+  return content.includes(`\r
+`) ? `\r
+` : `
+`;
+}
+function renderDosuAgentsSection(content, lineEnding) {
+  const body = content.trim().replace(/\r?\n/g, lineEnding);
+  return `${DOSU_SECTION_START}${lineEnding}${body}${lineEnding}${DOSU_SECTION_END}`;
+}
+function buildDosuAgentsSection(content = FALLBACK_DOSU_RULE) {
+  return renderDosuAgentsSection(content, `
 `);
 }
-function upsertDosuAgentsSection(cwd = process.cwd(), dosuCmd = dosuInvocation()) {
-  const path3 = join26(cwd, "AGENTS.md");
-  const section = buildDosuAgentsSection(dosuCmd);
-  if (!existsSync16(path3)) {
-    writeFileSync7(path3, `${section}
+function findSection2(content) {
+  const startMatch = content.match(SECTION_START_RE);
+  const start = startMatch?.index ?? -1;
+  const end = content.indexOf(DOSU_SECTION_END, Math.max(start, 0));
+  if (start === -1 && end === -1)
+    return null;
+  if (start === -1 || end < start) {
+    throw new Error("Dosu AGENTS.md markers are incomplete; refusing to overwrite the file");
+  }
+  return { start, end };
+}
+function upsertDosuAgentsSection(cwd = process.cwd(), content = FALLBACK_DOSU_RULE) {
+  const path3 = join27(cwd, "AGENTS.md");
+  if (!existsSync17(path3)) {
+    const section2 = buildDosuAgentsSection(content);
+    writeFileSync8(path3, `${section2}
 `);
     return { path: path3, action: "created" };
   }
-  const existing = readFileSync14(path3, "utf-8");
-  const startMatch = existing.match(SECTION_START_RE);
-  const start = startMatch?.index ?? -1;
-  const end = existing.indexOf(DOSU_SECTION_END);
+  const existing = readFileSync15(path3, "utf-8");
+  const lineEnding = lineEndingFor2(existing);
+  const section = renderDosuAgentsSection(content, lineEnding);
+  const location = findSection2(existing);
   let next;
-  if (start !== -1 && end !== -1 && end >= start) {
-    next = existing.slice(0, start) + section + existing.slice(end + DOSU_SECTION_END.length);
+  if (location) {
+    next = existing.slice(0, location.start) + section + existing.slice(location.end + DOSU_SECTION_END.length);
   } else {
-    next = `${existing.trimEnd()}
-
-${section}
-`;
+    next = `${existing.trimEnd()}${lineEnding}${lineEnding}${section}${lineEnding}`;
   }
   if (next === existing)
     return { path: path3, action: "unchanged" };
-  writeFileSync7(path3, next);
+  writeFileSync8(path3, next);
   return { path: path3, action: "updated" };
 }
-function stepUpdateAgentsMd(cwd = process.cwd()) {
+async function stepUpdateAgentsMd(cwd = process.cwd(), content) {
   logger.info("setup", "Step: update AGENTS.md");
   try {
-    const result = upsertDosuAgentsSection(cwd);
+    const result = upsertDosuAgentsSection(cwd, content ?? await fetchDosuRule());
     logger.info("setup", `AGENTS.md ${result.action} at ${result.path}`);
     if (result.action === "unchanged") {
       log.success(`AGENTS.md
@@ -11307,11 +11446,11 @@ ${dim(`Dosu section ${result.action} — ${result.path}`)}`);
     return false;
   }
 }
-var DOSU_SECTION_VERSION = 1, DOSU_SECTION_START, DOSU_SECTION_END = "<!-- dosu:mcp:end -->", SECTION_START_RE;
+var DOSU_SECTION_VERSION = 2, DOSU_SECTION_START, DOSU_SECTION_END = "<!-- dosu:mcp:end -->", SECTION_START_RE;
 var init_agents_md_step = __esm(() => {
   init_dist8();
   init_logger();
-  init_audit_handoff();
+  init_installer();
   init_styles();
   DOSU_SECTION_START = `<!-- dosu:mcp:start v${DOSU_SECTION_VERSION} -->`;
   SECTION_START_RE = /<!-- dosu:mcp:start(?: v(\d+))? -->/;
@@ -11403,6 +11542,153 @@ var init_analytics = __esm(() => {
   init_logger();
 });
 
+// src/setup/audit-handoff.ts
+import { spawnSync as spawnSync2 } from "node:child_process";
+function buildAuditHandoffPrompt(dosuCmd = dosuInvocation()) {
+  return [
+    "Audit this repository to see what docs Dosu can generate for it.",
+    "1. Run the codebase audit from the Dosu skill. It writes findings to .dosu/audit.json.",
+    "2. Show me the findings and which docs you recommend Dosu generate.",
+    `3. Once I confirm, run \`${dosuCmd} audit --tasks <comma-separated task ids> --json\` to kick off generation. Dosu opens a PR and the CLI notifies me when it's ready.`
+  ].join(`
+`);
+}
+function binOnPath(bin) {
+  const cmd = process.platform === "win32" ? "where" : "which";
+  try {
+    return spawnSync2(cmd, [bin], { stdio: "ignore" }).status === 0;
+  } catch {
+    return false;
+  }
+}
+function claudeCliAvailable() {
+  return binOnPath("claude");
+}
+function dosuInvocation() {
+  return binOnPath("dosu") ? "dosu" : "npx -y @dosu/cli";
+}
+function printManualAuditNudge() {
+  log.message(`See what docs Dosu can generate for this repo:
+
+${info("Ask Dosu to audit this repo and show what docs it can generate.")}
+
+Or run ${info(`${dosuInvocation()} audit`)} after your agent writes the audit.`);
+}
+async function offerAuditHandoff() {
+  if (!detectGitRepo())
+    return false;
+  if (!claudeCliAvailable()) {
+    printManualAuditNudge();
+    return false;
+  }
+  const go = await confirm({
+    message: "Kick off the codebase audit in Claude Code now?",
+    initialValue: true
+  });
+  if (isCancel(go) || !go) {
+    printManualAuditNudge();
+    return false;
+  }
+  return true;
+}
+function launchAuditAgent() {
+  logger.info("setup", "Handing off to Claude Code for the codebase audit");
+  const result = spawnSync2("claude", ["--model", AUDIT_AGENT_MODEL, buildAuditHandoffPrompt()], {
+    stdio: "inherit",
+    shell: process.platform === "win32"
+  });
+  if (result.error) {
+    logger.warn("setup", `Claude Code launch failed: ${result.error.message}`);
+    printManualAuditNudge();
+  }
+}
+var AUDIT_AGENT_MODEL = "haiku";
+var init_audit_handoff = __esm(() => {
+  init_dist8();
+  init_logger();
+  init_github_step();
+  init_styles();
+});
+
+// src/setup/rules-step.ts
+function successfulAgentIDs(results, action) {
+  return new Set(results.filter((result) => result.action === action && !result.error).map((result) => result.provider.id()));
+}
+function logRuleResults(results) {
+  const ready = results.filter((result) => !result.error && (result.action === "created" || result.action === "updated" || result.action === "unchanged"));
+  const removed = results.filter((result) => !result.error && result.action === "removed");
+  if (ready.length > 0) {
+    const lines = ready.map((result) => `+ ${result.provider.name()}
+  ${dim(result.path)}`).join(`
+`);
+    log.success(`Rules ready for ${ready.length} agent(s):
+${lines}`);
+  }
+  if (removed.length > 0) {
+    const lines = removed.map((result) => `- ${result.provider.name()}
+  ${dim(result.path)}`).join(`
+`);
+    log.info(`Rules removed from ${removed.length} agent(s):
+${lines}`);
+  }
+}
+async function stepConfigureAgentRules(selection, mcpResults) {
+  const successfulInstalls = successfulAgentIDs(mcpResults, "install");
+  const successfulRemovals = successfulAgentIDs(mcpResults, "remove");
+  const toInstall = selection.toInstall.filter((provider) => successfulInstalls.has(provider.id()) && isRuleAgent(provider.id()));
+  const toRemove = selection.toRemove.filter((provider) => successfulRemovals.has(provider.id()) && isRuleAgent(provider.id()));
+  const results = [];
+  if (toInstall.length > 0) {
+    const content = await fetchDosuRule();
+    for (const provider of toInstall) {
+      try {
+        const installed = installRuleForAgent(provider.id(), content);
+        if (installed)
+          results.push({ provider, action: installed.action, path: installed.path });
+      } catch (err) {
+        const error = err instanceof Error ? err : new Error(String(err));
+        logger.error("setup", `Rule install failed for ${provider.name()}: ${error.stack ?? error.message}`);
+        log.error(`Failed to install ${provider.name()} rule: ${error.message}`);
+        results.push({
+          provider,
+          action: "not_found",
+          path: rulePathForAgent(provider.id()) ?? "",
+          error
+        });
+      }
+    }
+  }
+  const retainedPaths = new Set(toInstall.map((provider) => rulePathForAgent(provider.id())).filter((path3) => path3 !== null));
+  for (const provider of toRemove) {
+    const path3 = rulePathForAgent(provider.id());
+    if (path3 && retainedPaths.has(path3))
+      continue;
+    try {
+      const removed = removeRuleForAgent(provider.id());
+      if (removed)
+        results.push({ provider, action: removed.action, path: removed.path });
+    } catch (err) {
+      const error = err instanceof Error ? err : new Error(String(err));
+      logger.error("setup", `Rule removal failed for ${provider.name()}: ${error.stack ?? error.message}`);
+      log.error(`Failed to remove ${provider.name()} rule: ${error.message}`);
+      results.push({
+        provider,
+        action: "not_found",
+        path: path3 ?? "",
+        error
+      });
+    }
+  }
+  logRuleResults(results);
+  return results;
+}
+var init_rules_step = __esm(() => {
+  init_dist8();
+  init_logger();
+  init_installer();
+  init_styles();
+});
+
 // src/auth/errors.ts
 var exports_errors = {};
 __export(exports_errors, {
@@ -11989,48 +12275,33 @@ async function runSetup(opts = {}) {
   }
   updateTarget(cfg, { api_key: apiKey });
   saveConfig(cfg);
-  const choices = await stepOneShotConfirm(inGitWorkTree());
-  if (!choices) {
+  const configured = await stepConfigureMcpTools(cfg);
+  if (configured === null) {
     await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_cancelled", {
-      reason: "options_cancelled"
+      reason: "mcp_selection_cancelled"
     });
     return;
   }
-  await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_options_selected", {
-    configure_mcp: choices.configureMcp,
-    install_skill: choices.installSkill,
-    update_agents_md: choices.updateAgentsMd
-  });
-  let mcpConfiguredThisRun = false;
-  let mcpCompleted = false;
-  let skillCompleted = false;
-  if (choices.configureMcp) {
-    const configured = await stepConfigureMcpTools(cfg);
-    if (configured === null) {
-      await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_cancelled", {
-        reason: "mcp_selection_cancelled"
-      });
-      return;
-    }
-    mcpConfiguredThisRun = configured.some((r2) => r2.action === "install" || r2.action === "skip");
-    const configuredProviders = configured.filter((r2) => (r2.action === "install" || r2.action === "skip") && !r2.error);
-    mcpCompleted = configuredProviders.length > 0;
-    if (mcpCompleted) {
-      await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_mcp_configured", {
-        provider_count: configuredProviders.length,
-        providers: configuredProviders.map((r2) => r2.provider.id())
-      });
-    }
+  const mcpConfiguredThisRun = configured.some((result) => result.action === "install" || result.action === "skip");
+  const configuredProviders = configured.filter((result) => (result.action === "install" || result.action === "skip") && !result.error);
+  const mcpCompleted = configuredProviders.length > 0;
+  if (mcpCompleted) {
+    await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_mcp_configured", {
+      provider_count: configuredProviders.length,
+      providers: configuredProviders.map((result) => result.provider.id())
+    });
   }
-  if (choices.installSkill) {
-    skillCompleted = await runInstallSkill();
+  let skillCompleted = false;
+  const selectedProviderIDs = configuredProviders.map((result) => result.provider.id());
+  if (skillAgentIDsForProviders(selectedProviderIDs).length > 0) {
+    skillCompleted = await runInstallSkill(selectedProviderIDs);
     if (skillCompleted) {
       await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_skill_installed");
     }
   }
   let agentsMdCompleted = false;
-  if (choices.updateAgentsMd) {
-    agentsMdCompleted = stepUpdateAgentsMd();
+  if (mcpCompleted && inGitWorkTree()) {
+    agentsMdCompleted = await stepUpdateAgentsMd();
   }
   let handoffToAudit = false;
   if (mcpConfiguredThisRun && cfg.mode !== MODE_OSS) {
@@ -12071,31 +12342,6 @@ function applyModeOverride(cfg, opts) {
   }
   saveConfig(cfg);
 }
-async function stepOneShotConfirm(offerAgentsMd) {
-  const items = [
-    { value: "configureMcp", label: "Install Dosu MCP" },
-    { value: "installSkill", label: "Install Dosu skill" }
-  ];
-  if (offerAgentsMd) {
-    items.push({ value: "updateAgentsMd", label: "Add Dosu instructions to AGENTS.md" });
-  }
-  const selected = await multiselect({
-    message: "Dosu will set these up — press Enter to accept, space to toggle",
-    options: items.map((it) => ({ value: it.value, label: it.label })),
-    initialValues: items.map((it) => it.value),
-    required: false
-  });
-  if (isCancel(selected)) {
-    logger.info("setup", "One-shot confirm cancelled");
-    return null;
-  }
-  const chosen = new Set(selected);
-  return {
-    configureMcp: chosen.has("configureMcp"),
-    installSkill: chosen.has("installSkill"),
-    updateAgentsMd: chosen.has("updateAgentsMd")
-  };
-}
 async function stepConfigureMcpTools(cfg) {
   const detected = stepDetectTools();
   if (detected.length === 0) {
@@ -12108,12 +12354,13 @@ Run ${info("dosu mcp add <agent>")} to manually configure an agent.`);
     return null;
   const results = stepConfigureTools(cfg, selection);
   stepShowSummary(results);
+  await stepConfigureAgentRules(selection, results);
   return results;
 }
-async function runInstallSkill() {
+async function runInstallSkill(providerIDs) {
   logger.info("setup", "Step: install skill");
   try {
-    const result = await installSkill();
+    const result = await installSkill(providerIDs);
     if (result.success) {
       logger.info("setup", `Skill installed${result.sha ? ` sha=${result.sha}` : ""}`);
       log.success("Skill installed");
@@ -12574,12 +12821,13 @@ var init_flow2 = __esm(() => {
   init_agents_md_step();
   init_analytics();
   init_audit_handoff();
+  init_rules_step();
   init_styles();
 });
 
 // src/commands/insights.ts
-import { existsSync as existsSync17, mkdirSync as mkdirSync8, readdirSync, unlinkSync, writeFileSync as writeFileSync8 } from "node:fs";
-import { dirname as dirname5, join as join27 } from "node:path";
+import { existsSync as existsSync18, mkdirSync as mkdirSync9, readdirSync, unlinkSync as unlinkSync2, writeFileSync as writeFileSync9 } from "node:fs";
+import { dirname as dirname6, join as join28 } from "node:path";
 function shuffled(arr) {
   const copy2 = [...arr];
   for (let i2 = copy2.length - 1;i2 > 0; i2--) {
@@ -12683,17 +12931,17 @@ function makeAskFn(cfg) {
   };
 }
 function insightsDir() {
-  return join27(getConfigDir(), "insights");
+  return join28(getConfigDir(), "insights");
 }
 function reportPath(timestamp) {
   const dir = insightsDir();
   if (!timestamp)
-    return join27(dir, "latest.html");
+    return join28(dir, "latest.html");
   const iso = timestamp.toISOString().slice(0, 19).replace(/:/g, "-");
-  return join27(dir, `report-${iso}Z.html`);
+  return join28(dir, `report-${iso}Z.html`);
 }
 function pruneOldReports(dir, keepN) {
-  if (!existsSync17(dir))
+  if (!existsSync18(dir))
     return;
   let entries;
   try {
@@ -12705,7 +12953,7 @@ function pruneOldReports(dir, keepN) {
   const reports = entries.filter((f2) => REPORT_FILE_PATTERN.test(f2)).sort().reverse();
   for (const f2 of reports.slice(keepN)) {
     try {
-      unlinkSync(join27(dir, f2));
+      unlinkSync2(join28(dir, f2));
     } catch (err) {
       logger.debug("insights", `failed to prune ${f2}: ${err instanceof Error ? err.message : err}`);
     }
@@ -12777,10 +13025,10 @@ function defaultRunner(cfg) {
     build: buildInsights,
     render: renderHTML,
     writeFile: (path3, content) => {
-      const dir = dirname5(path3);
-      if (!existsSync17(dir))
-        mkdirSync8(dir, { recursive: true, mode: 448 });
-      writeFileSync8(path3, content, { mode: 384 });
+      const dir = dirname6(path3);
+      if (!existsSync18(dir))
+        mkdirSync9(dir, { recursive: true, mode: 448 });
+      writeFileSync9(path3, content, { mode: 384 });
     },
     prune: pruneOldReports,
     openInBrowser: async (path3) => {
@@ -13274,9 +13522,71 @@ async function runAgentSetup(opts) {
     });
     return 1;
   }
+  let instruction;
+  try {
+    if (isRuleAgent(provider.id())) {
+      instruction = await fetchDosuRule();
+      const rule = installRuleForAgent(provider.id(), instruction);
+      if (rule) {
+        emitStep({
+          step: "rule_install",
+          tool: provider.id(),
+          tool_name: provider.name(),
+          rule_path: rule.path,
+          action: rule.action
+        });
+      }
+    }
+  } catch (err) {
+    emitError({
+      step: "rule_install",
+      reason: "install_failed",
+      agent_next_steps: `Dosu MCP was installed, but its rule could not be installed for ${provider.name()}: ${err instanceof Error ? err.message : String(err)}. Re-run this setup command; installation is idempotent.`
+    });
+    return 1;
+  }
+  if (skillAgentIDsForProviders([provider.id()]).length > 0) {
+    try {
+      const skill = await installSkill([provider.id()], { quiet: true });
+      if (!skill.success) {
+        throw new Error("the skills installer failed");
+      }
+      emitStep({
+        step: "skill_install",
+        tool: provider.id(),
+        tool_name: provider.name(),
+        source: "dosu-ai/dosu-skill"
+      });
+    } catch (err) {
+      emitError({
+        step: "skill_install",
+        reason: "install_failed",
+        agent_next_steps: `Dosu MCP and its rule were installed, but the skill could not be installed for ${provider.name()}: ${err instanceof Error ? err.message : String(err)}. Re-run this setup command; installation is idempotent.`
+      });
+      return 1;
+    }
+  }
+  if (inGitWorkTree()) {
+    try {
+      instruction ??= await fetchDosuRule();
+      const agentsMd = upsertDosuAgentsSection(process.cwd(), instruction);
+      emitStep({
+        step: "agents_md_install",
+        path: agentsMd.path,
+        action: agentsMd.action
+      });
+    } catch (err) {
+      emitError({
+        step: "agents_md_install",
+        reason: "install_failed",
+        agent_next_steps: `Dosu's agent integrations were installed, but AGENTS.md could not be updated: ${err instanceof Error ? err.message : String(err)}. Re-run this setup command; installation is idempotent.`
+      });
+      return 1;
+    }
+  }
   emitStep({
     step: "done",
-    agent_next_steps: `Dosu MCP is configured for ${provider.name()}. Tell the user setup is complete and they can ask their agent a Dosu question. Run 'dosu status' to verify.`
+    agent_next_steps: `Dosu is configured for ${provider.name()}. Tell the user setup is complete and they can ask their agent a Dosu question. Run 'dosu status --json' to verify.`
   });
   return 0;
 }
@@ -13508,16 +13818,19 @@ var NPX_INVOCATION = "npx @dosu/cli@latest";
 var init_flow3 = __esm(() => {
   init_ticket();
   init_client();
+  init_skill();
   init_config();
   init_logger();
   init_providers();
+  init_installer();
+  init_agents_md_step();
   init_flow2();
 });
 
 // src/cli/cli.ts
 init_commander();
 init_client();
-import { readFileSync as readFileSync17, unlinkSync as unlinkSync2 } from "node:fs";
+import { readFileSync as readFileSync18, unlinkSync as unlinkSync3 } from "node:fs";
 
 // src/commands/analytics.ts
 init_commander();
@@ -15609,7 +15922,7 @@ init_dist();
 init_commander();
 init_trpc();
 var import_picocolors19 = __toESM(require_picocolors(), 1);
-import { readFileSync as readFileSync15 } from "node:fs";
+import { readFileSync as readFileSync16 } from "node:fs";
 function requireConfig10() {
   return requireLoginConfig();
 }
@@ -15785,7 +16098,7 @@ function reviewCommand() {
     let body = opts.body;
     if (opts.bodyFile) {
       try {
-        body = readFileSync15(opts.bodyFile, "utf-8");
+        body = readFileSync16(opts.bodyFile, "utf-8");
       } catch (err) {
         console.error(import_picocolors19.default.red(`Failed to read --body-file: ${err.message}`));
         process.exit(1);
@@ -16305,8 +16618,8 @@ init_skill_update_check();
 init_config();
 init_logger();
 var import_picocolors24 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync18, mkdirSync as mkdirSync9, readFileSync as readFileSync16, writeFileSync as writeFileSync9 } from "node:fs";
-import { join as join28 } from "node:path";
+import { existsSync as existsSync19, mkdirSync as mkdirSync10, readFileSync as readFileSync17, writeFileSync as writeFileSync10 } from "node:fs";
+import { join as join29 } from "node:path";
 var CACHE_FILENAME3 = "update-check.json";
 var CHECK_INTERVAL_MS3 = 24 * 60 * 60 * 1000;
 var FETCH_TIMEOUT_MS3 = 5000;
@@ -16329,14 +16642,14 @@ function isNewerVersion(latest, current) {
   return false;
 }
 function getCachePath3() {
-  return join28(getConfigDir(), CACHE_FILENAME3);
+  return join29(getConfigDir(), CACHE_FILENAME3);
 }
 function readCache() {
   try {
     const path3 = getCachePath3();
-    if (!existsSync18(path3))
+    if (!existsSync19(path3))
       return null;
-    const data = JSON.parse(readFileSync16(path3, "utf-8"));
+    const data = JSON.parse(readFileSync17(path3, "utf-8"));
     if (typeof data.lastCheck === "number" && typeof data.latestVersion === "string") {
       return data;
     }
@@ -16348,10 +16661,10 @@ function readCache() {
 function writeCache(cache) {
   try {
     const dir = getConfigDir();
-    if (!existsSync18(dir)) {
-      mkdirSync9(dir, { recursive: true, mode: 448 });
+    if (!existsSync19(dir)) {
+      mkdirSync10(dir, { recursive: true, mode: 448 });
     }
-    writeFileSync9(getCachePath3(), JSON.stringify(cache), { mode: 384 });
+    writeFileSync10(getCachePath3(), JSON.stringify(cache), { mode: 384 });
   } catch {}
 }
 async function fetchLatestVersion() {
@@ -16562,14 +16875,45 @@ Run 'dosu --help' to see available commands.`;
     saveConfig(cfg);
     console.log("Successfully logged out.");
   });
-  program2.command("status").description("Show current authentication and MCP status").action(async () => {
+  program2.command("status").description("Show current authentication and MCP status").option("--json", "Output as JSON").action(async (opts) => {
     const cfg = loadConfig();
+    const mode = cfg.mode === MODE_OSS ? "oss" : "cloud";
     if (!isAuthenticated(cfg)) {
+      if (opts.json) {
+        console.log(JSON.stringify({
+          authenticated: false,
+          session_status: "missing",
+          mode,
+          mcp: {
+            status: "not_configured",
+            deployment_id: null,
+            deployment_name: null
+          }
+        }, null, 2));
+        return;
+      }
       console.log("Status: Not logged in");
       console.log("Run 'dosu login' to authenticate.");
       return;
     }
-    if (isTokenExpired(cfg) && !await ensureFreshSession(cfg)) {
+    const sessionStatus = isTokenExpired(cfg) && !await ensureFreshSession(cfg) ? "expired" : "valid";
+    if (opts.json) {
+      const deploymentId = cfg.active_account.target?.deployment_id ?? null;
+      const deploymentName = cfg.active_account.target?.deployment_name ?? null;
+      const mcpStatus = cfg.mode === MODE_OSS ? "public_libraries" : deploymentId ? "configured" : "not_configured";
+      console.log(JSON.stringify({
+        authenticated: sessionStatus === "valid",
+        session_status: sessionStatus,
+        mode,
+        mcp: {
+          status: mcpStatus,
+          deployment_id: deploymentId,
+          deployment_name: deploymentName
+        }
+      }, null, 2));
+      return;
+    }
+    if (sessionStatus === "expired") {
       console.log("Status: Token expired");
       console.log("Run 'dosu login' to re-authenticate.");
     } else {
@@ -16700,7 +17044,7 @@ Use 'dosu mcp add <agent>' to add Dosu MCP to a tool.`);
     const logPath = logger.getLogPath();
     if (opts.clear) {
       try {
-        unlinkSync2(logPath);
+        unlinkSync3(logPath);
         console.log("Log file deleted.");
       } catch {
         console.log("No log file to delete.");
@@ -16710,7 +17054,7 @@ Use 'dosu mcp add <agent>' to add Dosu MCP to a tool.`);
     if (opts.tail !== undefined) {
       const n2 = typeof opts.tail === "string" ? parseInt(opts.tail, 10) || 50 : 50;
       try {
-        const content = readFileSync17(logPath, "utf-8");
+        const content = readFileSync18(logPath, "utf-8");
         const lines = content.split(`
 `);
         console.log(lines.slice(-n2).join(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosu/cli",
-  "version": "0.36.0",
+  "version": "0.37.0-alpha.2",
   "type": "module",
   "description": "Dosu CLI - Manage MCP servers for AI tools",
   "license": "MIT",