agent-trellis 0.1.0 → 0.3.0

package/dist/commands/migrate.js

@@ -12,7 +12,10 @@ import * as codexProbe from "../probes/codex.js";
 import * as kiroProbe from "../probes/kiro.js";
 import * as piProbe from "../probes/pi.js";
 import { AGENTS_MD_TEMPLATE } from "./init.js";
-import { dirContentsEqual } from "../lib/dirEquals.js";
+import { decideDirImport } from "../lib/dirEquals.js";
+import { deepEqual } from "../lib/deepEqual.js";
+import { readClaudeCodeMcpDefs, readCodexMcpDefs, readKiroMcpDefs } from "../lib/mcpMigrateRead.js";
+import { loadCanonicalSource, upsertServerYaml } from "../core/canonical.js";
 import { ALL_AGENTS } from "../core/types.js";
 const PROBES = {
     "claude-code": (homeDir) => claudeCodeProbe.probe(homeDir),
@@ -20,6 +23,14 @@ const PROBES = {
     kiro: (homeDir) => kiroProbe.probe(homeDir),
     pi: (homeDir) => piProbe.probe(homeDir),
 };
+/** pi has no static MCP config to read at all (roadmap.md P14/
+ * trellis-migrate-mcp-servers) — deliberately absent, not an oversight;
+ * `collectMigratePlan` skips the `mcp` category entirely for pi. */
+const MCP_READERS = {
+    "claude-code": readClaudeCodeMcpDefs,
+    kiro: readKiroMcpDefs,
+    codex: readCodexMcpDefs,
+};
 function planSkill(name, sourceDir, isSymlink, caseCorrect, canonicalDir) {
     if (isSymlink) {
         return { kind: "skill", name, action: "skip-symlink", detail: "shared in from elsewhere, not this agent's own content" };
@@ -27,13 +38,14 @@ function planSkill(name, sourceDir, isSymlink, caseCorrect, canonicalDir) {
     if (!caseCorrect) {
         return { kind: "skill", name, action: "skip-case-broken", detail: "already undiscoverable on at least one other agent — fix on the source before migrating" };
     }
-    if (!existsSync(canonicalDir)) {
-        return { kind: "skill", name, action: "create", detail: `will copy from ${sourceDir}`, sourceDir };
-    }
-    if (dirContentsEqual(sourceDir, canonicalDir)) {
-        return { kind: "skill", name, action: "already-migrated", detail: "canonical content is byte-identical" };
+    switch (decideDirImport(sourceDir, canonicalDir)) {
+        case "create":
+            return { kind: "skill", name, action: "create", detail: `will copy from ${sourceDir}`, sourceDir };
+        case "already-present":
+            return { kind: "skill", name, action: "already-migrated", detail: "canonical content is byte-identical" };
+        case "conflict":
+            return { kind: "skill", name, action: "conflict", detail: `canonical skills/${name}/ already exists with different content — resolve by hand` };
     }
-    return { kind: "skill", name, action: "conflict", detail: `canonical skills/${name}/ already exists with different content — resolve by hand` };
 }
 function planInstructions(snapshot, canonicalAgentsMd) {
     if (!snapshot.instructionsFile)
@@ -60,21 +72,56 @@ function planInstructions(snapshot, canonicalAgentsMd) {
     }
     return { kind: "instructions", name: "agents.md", action: "conflict", detail: "canonical agents.md already has different real content — resolve by hand" };
 }
-export async function collectMigratePlan(agent, homeDir = homedir()) {
+function planMcpServer(name, def, existing) {
+    if (existing === undefined) {
+        return { kind: "mcp", name, action: "create", detail: "will add to servers.yaml", mcpDef: def };
+    }
+    if (deepEqual(existing, def)) {
+        return { kind: "mcp", name, action: "already-migrated", detail: "canonical definition is already identical" };
+    }
+    return { kind: "mcp", name, action: "conflict", detail: `canonical mcp/servers.yaml already has a different definition for "${name}" — resolve by hand` };
+}
+/**
+ * `only` restricts which kind(s) are even considered — not a post-hoc
+ * filter on a fully-computed plan (trellis-migrate-category-selection
+ * design.md D3): the excluded kind's canonical path is never read for
+ * comparison and never appears in the plan, not even as a suppressed
+ * conflict. Omitting `only` (or passing both kinds) is exactly today's
+ * behavior.
+ */
+export async function collectMigratePlan(agent, homeDir = homedir(), only) {
     const snapshot = await PROBES[agent](homeDir);
     if (!snapshot.present) {
         return { agent, present: false, items: [] };
     }
     const canonicalRoot = join(homeDir, ".trellis");
     const items = [];
-    for (const root of snapshot.skillRoots) {
-        for (const skill of root.skills) {
-            items.push(planSkill(skill.name, skill.dir, skill.isSymlink, skill.caseCorrect, join(canonicalRoot, "skills", skill.name)));
+    const wants = (kind) => !only || only.includes(kind);
+    if (wants("skill")) {
+        for (const root of snapshot.skillRoots) {
+            for (const skill of root.skills) {
+                items.push(planSkill(skill.name, skill.dir, skill.isSymlink, skill.caseCorrect, join(canonicalRoot, "skills", skill.name)));
+            }
+        }
+    }
+    if (wants("instructions")) {
+        const instructionsItem = planInstructions(snapshot, join(canonicalRoot, "agents.md"));
+        if (instructionsItem)
+            items.push(instructionsItem);
+    }
+    if (wants("mcp")) {
+        const reader = MCP_READERS[agent];
+        if (reader) {
+            const canonicalServers = loadCanonicalSource(homeDir).mcp.servers;
+            const { entries, unsupported } = reader(homeDir);
+            for (const { name, def } of entries) {
+                items.push(planMcpServer(name, def, canonicalServers[name]));
+            }
+            for (const { name, reason } of unsupported) {
+                items.push({ kind: "mcp", name, action: "skip-unsupported", detail: reason });
+            }
         }
     }
-    const instructionsItem = planInstructions(snapshot, join(canonicalRoot, "agents.md"));
-    if (instructionsItem)
-        items.push(instructionsItem);
     return { agent, present: true, items };
 }
 export function applyMigratePlan(plan, homeDir = homedir()) {
@@ -91,8 +138,22 @@ export function applyMigratePlan(plan, homeDir = homedir()) {
             mkdirSync(canonicalRoot, { recursive: true });
             writeFileSync(join(canonicalRoot, "agents.md"), item.sourceContent);
         }
+        else if (item.kind === "mcp" && item.mcpDef) {
+            upsertServerYaml(join(canonicalRoot, "mcp", "servers.yaml"), item.name, item.mcpDef);
+        }
     }
 }
+const ONLY_VALUES = ["skills", "instructions", "mcp"];
+function isMigrateOnlyValue(value) {
+    return ONLY_VALUES.includes(value);
+}
+function toMigrateKinds(only) {
+    if (only === "skills")
+        return ["skill"];
+    if (only === "instructions")
+        return ["instructions"];
+    return ["mcp"];
+}
 export async function runMigrate(opts = {}) {
     const homeDir = opts.homeDir ?? homedir();
     if (!opts.from || !ALL_AGENTS.includes(opts.from)) {
@@ -100,7 +161,12 @@ export async function runMigrate(opts = {}) {
         return { exitCode: 1 };
     }
     const agent = opts.from;
-    const plan = await collectMigratePlan(agent, homeDir);
+    if (opts.only !== undefined && !isMigrateOnlyValue(opts.only)) {
+        console.error(`--only must be one of: ${ONLY_VALUES.join(", ")} (got ${opts.only})`);
+        return { exitCode: 1 };
+    }
+    const only = opts.only && isMigrateOnlyValue(opts.only) ? toMigrateKinds(opts.only) : undefined;
+    const plan = await collectMigratePlan(agent, homeDir, only);
     if (!plan.present) {
         console.error(`${agent} is not present on this machine — nothing to migrate.`);
         return { exitCode: 1 };
@@ -127,6 +193,7 @@ export function printPlan(plan, dryRun) {
         return;
     }
     for (const item of plan.items) {
-        console.log(`  [${item.action}] ${item.kind === "skill" ? `skill "${item.name}"` : "instructions"} — ${item.detail}`);
+        const label = item.kind === "skill" ? `skill "${item.name}"` : item.kind === "mcp" ? `mcp server "${item.name}"` : "instructions";
+        console.log(`  [${item.action}] ${label} — ${item.detail}`);
     }
 }

package/dist/commands/onboard.d.ts

@@ -1,13 +1,23 @@
 /**
- * `trellis onboard` — chains `init` → agent detection → base-agent
- * resolution → `migrate` → `sync` into one guided flow
- * (trellis-cli-onboard). Orchestrates existing commands' own
- * plan/apply logic; no new skill-copy, symlink, or conflict-detection
+ * `trellis onboard` — chains `init` → agent detection → migration-source
+ * resolution → migrate-category selection (trellis-migrate-category-
+ * selection) → managed-agent-set selection (install-then-manage for a
+ * selected, not-yet-present agent) → `migrate` → `sync` → `mcp sync` →
+ * `secrets audit` into one guided flow (trellis-cli-onboard,
+ * trellis-managed-agents) — a user should never have to type a second
+ * command by hand to finish onboarding. Source, categories, and managed
+ * set are three independent choices (design.md D2): importing from a
+ * source never writes back to it, and it is not implicitly added to the
+ * managed set. Orchestrates existing commands' own plan/apply logic; no
+ * new skill-copy, symlink, conflict-detection, or secrets-scanning
  * judgment is made here.
  */
 import type { AgentId } from "../core/types.js";
-import type { MigratePlan } from "./migrate.js";
+import type { MigrateKind, MigratePlan } from "./migrate.js";
 import type { SyncReport } from "./sync.js";
+import type { McpSyncReport } from "./mcp.js";
+import type { SecretsAuditReport } from "./secretsAudit.js";
+import type { ConfirmAndInstallOptions } from "../lib/installAgent.js";
 export interface OnboardAgentSummary {
     agent: AgentId;
     present: boolean;
@@ -20,7 +30,12 @@ export interface OnboardAgentSummary {
 }
 export declare function collectOnboardSummary(homeDir?: string): Promise<OnboardAgentSummary[]>;
 export interface RunOnboardOptions {
+    /** Non-interactive migration-source choice. */
     agent?: string;
+    /** Non-interactive managed-set choice: comma-separated agent ids, or
+     * the literal string "none" for "add nothing new this run" — distinct
+     * from omitting the flag, which requires a prompt or refuses. */
+    manage?: string;
     dryRun?: boolean;
     json?: boolean;
     /** Defaults to the real `~`; overridable for tests only. */
@@ -31,13 +46,43 @@ export interface RunOnboardOptions {
     /** Test-only: replaces the real readline prompt with a scripted
      * answer, so the prompt path is exercisable without a real terminal. */
     promptForAgent?: (present: OnboardAgentSummary[]) => Promise<string>;
+    /** Test-only: replaces the real readline multi-select prompt. Returns
+     * the raw answer string (same grammar as `--manage`'s value), not a
+     * pre-parsed list — so the same parsing/validation code path is
+     * exercised whether the answer came from a flag or a prompt. */
+    promptForManagedAgents?: (candidates: OnboardAgentSummary[], alreadyManaged: readonly AgentId[]) => Promise<string>;
+    /** Test-only: replaces the real migrate-category picker/default logic
+     * (trellis-migrate-category-selection). An empty array is a valid
+     * answer — "skip migrate for this run" (design.md D6) — distinct from
+     * `source` being unresolved at all. */
+    promptForMigrateCategories?: (source: OnboardAgentSummary) => Promise<MigrateKind[]>;
+    /** Test-only: injected into every `confirmAndInstall` call for a
+     * selected, not-yet-present agent. Never a real terminal prompt or a
+     * real `npm install` in a unit test. */
+    install?: ConfirmAndInstallOptions;
+}
+export interface OnboardInstallResult {
+    agent: AgentId;
+    installed: boolean;
+    installable: boolean;
 }
 export interface OnboardResult {
     summary: OnboardAgentSummary[];
-    base?: AgentId;
-    baseReason?: "auto-selected" | "flag" | "prompt";
+    source?: AgentId;
+    sourceReason?: "auto-selected" | "flag" | "prompt";
+    /** The full managed set this run acted against — the union of whatever
+     * was already in `managed.yaml` plus this run's own new selections
+     * that actually resolved (D3: never a subtraction). */
+    managedAgents?: AgentId[];
+    installResults?: OnboardInstallResult[];
     migratePlan?: MigratePlan;
+    /** Set when a source was resolved but zero migrate categories were
+     * selected (design.md D6) — distinct from `migratePlan` being absent
+     * because no source existed at all, which prints nothing here. */
+    migrateSkipped?: string;
     syncReport?: SyncReport;
+    mcpSyncReport?: McpSyncReport;
+    secretsAuditReport?: SecretsAuditReport;
     refusal?: string;
     /** Only set when no agent is present — the same values `--json` and
      * text output both surface, so a machine caller doesn't have to