argsbarg 4.0.4 → 4.1.0

package/src/skill/install.ts

@@ -5,19 +5,28 @@ import type { CliProgram } from "../types.ts";
 import { generateSkillBundle, type SkillTarget } from "./generate.ts";
 import { applySkillInstallHints } from "./hint.ts";
 
+export { skillDirNameForTarget, skillFrontmatterName, skillSlug } from "./naming.ts";
+
 export interface SkillInstallOpts {
   global?: boolean;
-  /** When true, remove an existing skill directory before writing. */
   rimraf?: boolean;
-  /** When true, skip writes but return paths that would change. */
   dry?: boolean;
 }
 
 function resolveSkillDir(target: SkillTarget, dirName: string, global: boolean): string {
-  const base = global
-    ? join(userHome(), target === "cursor" ? ".cursor" : ".claude", "skills")
-    : join(process.cwd(), target === "cursor" ? ".cursor" : ".claude", "skills");
-  return join(base, dirName);
+  const home = userHome();
+  switch (target) {
+    case "cursor":
+      return join(global ? home : process.cwd(), ".cursor", "skills", dirName);
+    case "claude":
+      return join(global ? home : process.cwd(), ".claude", "skills", dirName);
+    case "codex":
+      return join(global ? home : process.cwd(), ".codex", "skills", dirName);
+    case "opencode":
+      return join(global ? home : process.cwd(), ".config", "opencode", "skills", dirName);
+    case "openclaw":
+      return join(global ? home : process.cwd(), ".openclaw", "skills", dirName);
+  }
 }
 
 /** Writes SKILL.md and reference.md; returns changed file paths. */
@@ -47,3 +56,21 @@ export function cliSkillInstall(
   changed.push(skillPath, refPath);
   return changed;
 }
+
+/** Maps install action kind to skill target. */
+export function skillTargetFromActionKind(kind: string): SkillTarget | undefined {
+  switch (kind) {
+    case "cursor-skill":
+      return "cursor";
+    case "claude-skill":
+      return "claude";
+    case "codex-skill":
+      return "codex";
+    case "opencode-skill":
+      return "opencode";
+    case "openclaw-skill":
+      return "openclaw";
+    default:
+      return undefined;
+  }
+}

package/src/skill/naming.ts

@@ -0,0 +1,28 @@
+/** Agent skill install targets. */
+export type SkillTarget = "cursor" | "claude" | "codex" | "opencode" | "openclaw";
+
+import { sanitizeToolSegment } from "../mcp/tools.ts";
+
+/** Kebab-case skill folder + frontmatter name for agents that require hyphen slugs. */
+export function skillSlug(programKey: string): string {
+  return programKey
+    .replace(/[^a-zA-Z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .toLowerCase();
+}
+
+/** Directory name for a skill target (underscore vs kebab conventions). */
+export function skillDirNameForTarget(programKey: string, target: SkillTarget): string {
+  if (target === "cursor" || target === "claude") {
+    return sanitizeToolSegment(programKey);
+  }
+  return skillSlug(programKey);
+}
+
+/** Frontmatter `name` for SKILL.md by target. */
+export function skillFrontmatterName(programKey: string, target: SkillTarget): string {
+  if (target === "cursor" || target === "claude") {
+    return sanitizeToolSegment(programKey);
+  }
+  return skillSlug(programKey);
+}

package/src/types.ts

@@ -133,6 +133,10 @@ export interface CliMcpBundleConfig {
 export interface CliMcpServerConfig {
   /** When `true`, enables the `mcp` built-in and MCP stdio server. */
   enabled: boolean;
+  /** When `true`, `mcp bundle` writes `dist/<key>.mcpb` for Claude Desktop. Default false. */
+  mcpd?: boolean;
+  /** When `true`, `mcp bundle` also writes `dist/claude-plugin/<name>.zip`. Default false. */
+  claudePlugin?: boolean;
   /** Resource URI for schema export (default: `<sanitized root key>://schema`). */
   schemaResourceUri?: string;
   /**
@@ -224,8 +228,6 @@ export interface CliAppConfigEntry {
  * App configuration block on the program root ({@link CliProgram.appConfig}).
  */
 export interface CliAppConfig {
-  /** Default: `~/.config/<sanitized-key>/config` (or `%APPDATA%/<key>/config` on Windows). */
-  path?: string;
   /** Built-in `config get` / `config set`. Default: enabled when `appConfig` is set. */
   commands?: boolean | { enabled?: boolean; mcpSet?: boolean };
   /** Block JSON Schema (draft-07). When omitted, synthesize all-string schema from `entries`. */
@@ -237,8 +239,15 @@ export interface CliAppConfig {
 export interface CliInstallConfig {
   /** When `false`, hide/disable `install` (default: enabled). */
   enabled?: boolean;
-  /** Default bin directory (default: `~/.local/bin`). Overridden by `INSTALL_PREFIX` env and `--prefix`. */
-  prefix?: string;
+  /**
+   * Default agent integration for full install (`install --all`).
+   * - `'mcp'` when `mcpServer.enabled` (default): MCP targets in `--all`; paired skills excluded.
+   * - `'skill'` when MCP is off (default): skill targets in `--all`; paired MCP excluded.
+   * - `'both'`: install MCP and skill for the same host when both are available.
+   */
+  agentIntegration?: InstallAgentIntegration;
+  /** Per-artifact gates for full install/uninstall. See {@link resolveEffectiveInstallTargets}. */
+  targets?: CliInstallTargets;
   /**
    * When set, enables `install --update` on the program root.
    * Should download or locate the latest release binary and return its path.
@@ -246,6 +255,58 @@ export interface CliInstallConfig {
   updateGetLatest?: CliUpdateGetLatest;
 }
 
+/** Agent integration mode for install — MCP vs shell skill per host. */
+export type InstallAgentIntegration = "mcp" | "skill" | "both";
+
+/** Boolean or structured gate for one install artifact. */
+export type InstallTargetSpec =
+  | boolean
+  | {
+      /** When false, artifact is never installed (even with scoped CLI flags). Default true. */
+      enabled?: boolean;
+      /** When true, included in bare `install` / `install --all`. Default varies by key. */
+      includedInAll?: boolean;
+    };
+
+export interface ResolvedInstallTarget {
+  enabled: boolean;
+  includedInAll: boolean;
+}
+
+/** Per-artifact gates for full install/uninstall. See {@link resolveEffectiveInstallTargets}. */
+export interface CliInstallTargets {
+  /** Copy app to `~/.local/bin/<key>`. Default includedInAll true (opt-out). */
+  app?: InstallTargetSpec;
+  /** ChatGPT desktop MCP. Default false. */
+  chatgptMcp?: InstallTargetSpec;
+  /** Claude Code MCP (`~/.claude.json`). Default false. */
+  claudeCodeMcp?: InstallTargetSpec;
+  /** Claude Desktop MCP. Default false. */
+  claudeDesktopMcp?: InstallTargetSpec;
+  /** Claude Code skill. Default false. */
+  claudeSkill?: InstallTargetSpec;
+  /** Codex MCP (`codex mcp add`). Default false. */
+  codexMcp?: InstallTargetSpec;
+  /** Codex skill. Default false. */
+  codexSkill?: InstallTargetSpec;
+  /** Shell completions for detected shells. Default includedInAll true (opt-out). */
+  completions?: InstallTargetSpec;
+  /** App config: wizard on install, file removal on uninstall. Default includedInAll true. */
+  configure?: InstallTargetSpec;
+  /** Cursor MCP. Default false. */
+  cursorMcp?: InstallTargetSpec;
+  /** Cursor skill. Default false. */
+  cursorSkill?: InstallTargetSpec;
+  /** OpenClaw MCP. Default false. */
+  openclawMcp?: InstallTargetSpec;
+  /** OpenClaw skill. Default false. */
+  openclawSkill?: InstallTargetSpec;
+  /** OpenCode MCP. Default false. */
+  opencodeMcp?: InstallTargetSpec;
+  /** OpenCode skill. Default false. */
+  opencodeSkill?: InstallTargetSpec;
+}
+
 /**
  * One bundled documentation topic for the `docs` built-in (program root only).
  */

package/src/validate.ts

@@ -6,6 +6,7 @@ import { reservedCommandNames, resolveCapabilities } from "./capabilities.ts";
 import { reservedDocsTopicResourceUris } from "./docs/mcp-resources.ts";
 import { DOCS_BUILTIN_TOPIC_KEYS } from "./docs/resolve.ts";
 import { validateFormatValue } from "./formats.ts";
+import { AGENT_PAIRS } from "./install/target-registry.ts";
 import { resolveMcpSchemaUri } from "./mcp/tools.ts";
 import {
   type CliLeaf,
@@ -14,6 +15,8 @@ import {
   type CliProgram,
   CliSchemaValidationError,
   CliValueFormat,
+  type InstallAgentIntegration,
+  type InstallTargetSpec,
   isCliLeaf,
   isCliRouter,
 } from "./types.ts";
@@ -105,6 +108,69 @@ function validateConfigBlock(appConfigBlock: import("./types.ts").CliAppConfig):
   }
 }
 
+const PAIR_HOST_LABELS: Record<string, string> = {
+  cursorMcp: "cursor",
+  claudeCodeMcp: "claudeCode",
+  codexMcp: "codex",
+  opencodeMcp: "opencode",
+  openclawMcp: "openclaw",
+};
+
+function installTargetExplicitTruthy(spec: InstallTargetSpec | undefined): boolean {
+  if (spec === undefined || spec === false) return false;
+  if (spec === true) return true;
+  return spec.enabled !== false;
+}
+
+/** Validates `program.install` targets and agentIntegration. */
+function validateInstallConfig(program: CliProgram): void {
+  const install = program.install;
+  if (!install) return;
+
+  if ("prefix" in install) {
+    throw new CliSchemaValidationError(
+      "install.prefix removed; app installs to ~/.local/bin/<key>",
+    );
+  }
+
+  if (!install.targets) return;
+
+  const targets = install.targets;
+  if ("allSkills" in targets || "allMcps" in targets) {
+    throw new CliSchemaValidationError(
+      "install.targets.allSkills/allMcps removed; use agentIntegration and per-key targets",
+    );
+  }
+
+  const integration: InstallAgentIntegration =
+    install.agentIntegration ?? (program.mcpServer?.enabled === true ? "mcp" : "skill");
+
+  for (const [mcpKey, skillKey] of AGENT_PAIRS) {
+    const mcpSpec = targets[mcpKey];
+    const skillSpec = targets[skillKey];
+    const mcpOn = installTargetExplicitTruthy(mcpSpec);
+    const skillOn = installTargetExplicitTruthy(skillSpec);
+    const host = PAIR_HOST_LABELS[mcpKey] ?? mcpKey;
+
+    if (mcpOn && skillOn && integration !== "both") {
+      throw new CliSchemaValidationError(
+        `install.targets: ${host} has both MCP and skill configured; set agentIntegration: 'both' or disable one side`,
+      );
+    }
+
+    if (integration === "skill" && mcpOn) {
+      throw new CliSchemaValidationError(
+        `install.targets.${mcpKey} requires agentIntegration: 'both' when agentIntegration is 'skill'`,
+      );
+    }
+    if (integration === "mcp" && skillOn) {
+      throw new CliSchemaValidationError(
+        `install.targets.${skillKey} requires agentIntegration: 'both' when agentIntegration is 'mcp'`,
+      );
+    }
+  }
+}
+
 /** Validates a program schema. */
 export function cliValidateProgram(program: CliProgram): void {
   if (!program.version || program.version.trim().length === 0) {
@@ -142,6 +208,10 @@ export function cliValidateProgram(program: CliProgram): void {
     }
   }
 
+  if (program.install !== undefined) {
+    validateInstallConfig(program);
+  }
+
   const caps = resolveCapabilities(program);
   const reserved = reservedCommandNames(caps);