@drunkcoding/agents-and-skills 0.0.44 → 0.0.46

package/.claude-plugin/marketplace.json

@@ -8,40 +8,11 @@
     "description": "Personal agents and skills marketplace"
   },
   "plugins": [
-    {
-      "name": "tech-graph",
-      "source": "./plugins/tech-graph",
-      "description": "6-step wizard for technical diagrams (SVG/PNG) via fireworks-tech-graph",
-      "version": "0.0.44",
-      "category": "diagram",
-      "keywords": [
-        "diagram",
-        "svg",
-        "architecture",
-        "uml",
-        "flowchart"
-      ]
-    },
-    {
-      "name": "html-effectiveness",
-      "source": "./plugins/html-effectiveness",
-      "description": "Generate self-contained interactive HTML reports from 20 upstream templates via a conversational agent.",
-      "version": "0.0.44",
-      "category": "reports",
-      "keywords": [
-        "html",
-        "report",
-        "status",
-        "incident",
-        "slide-deck",
-        "decision-matrix"
-      ]
-    },
     {
       "name": "plugin-validator",
       "source": "./plugins/plugin-validator",
       "description": "Orchestrated validator for Claude Code plugins — validates skills, agents, commands, and hooks across every plugin under plugins/**.",
-      "version": "0.0.44",
+      "version": "0.0.46",
       "category": "tooling",
       "keywords": [
         "validation",
@@ -53,27 +24,11 @@
         "hooks"
       ]
     },
-    {
-      "name": "team-share",
-      "source": "./plugins/team-share",
-      "description": "Onboard your team with an interactive setup menu: install CodeGraph, build the Understand-Anything knowledge graph, and share Claude Code settings — run any combination, all idempotent.",
-      "version": "0.0.44",
-      "category": "tooling",
-      "keywords": [
-        "onboarding",
-        "team",
-        "claude",
-        "settings",
-        "codegraph",
-        "understand-anything",
-        "git-lfs"
-      ]
-    },
     {
       "name": "multica-tool",
       "source": "./plugins/multica-tool",
       "description": "Export, import, and sync Multica skills, agents, and squads between workspaces.",
-      "version": "0.0.44",
+      "version": "0.0.46",
       "category": "workflow",
       "keywords": [
         "multica",

package/README.md

@@ -8,11 +8,8 @@ Published on npm as [`@drunkcoding/agents-and-skills`](https://www.npmjs.com/pac
 
 | Plugin | Description |
 |--------|-------------|
-| [`tech-graph`](plugins/tech-graph) | 6-step wizard for technical diagrams (SVG + PNG). |
-| [`html-effectiveness`](plugins/html-effectiveness) | Conversational agent that generates self-contained interactive HTML reports from 20 templates. |
 | [`team-superpower`](plugins/team-superpower) | Shape-adaptive engineering team running the Superpowers skill chain — up to 8 roles (designer, planner, software-architect, security-engineer, backend-developer, frontend-developer, qa-engineer, reviewer); spawns 7 or 8 depending on stack (`full-stack` / `be-only` / `fe-only`) declared in `CLAUDE.md`. Test/build commands, contract publish + sync, security checklist, and CI gate before merge are all driven by the project's `CLAUDE.md` `team-superpower` block. |
 | [`plugin-validator`](plugins/plugin-validator) | Orchestrated validator that checks every plugin's skills, agents, commands, and hooks for spec compliance — runs in parallel and proposes batched fixes. |
-| [`team-share`](plugins/team-share) | Onboarding helper that shares Claude plugin settings, scaffolds `CLAUDE.md` when missing, refreshes the Understand-Anything graph, and stages the resulting repo artifacts for review. |
 | [`auto-power`](plugins/auto-power) | Single-command hands-off pipeline that wraps `obra/superpowers`. Auto-answers safe clarifying questions during spec, then runs plan → arch+sec → impl → verify → review → ff-merge with no further touchpoints. Checkpointed and resumable. Escalates on substantive failures. |
 | [`multica-tool`](plugins/multica-tool) | Export, import, and sync Multica skills, agents, and squads between workspaces. |
 
@@ -52,8 +49,8 @@ Add the marketplace once:
 Then install any plugin individually:
 
 ```text
-/plugin install tech-graph@drunkcoding
-/plugin install html-effectiveness@drunkcoding --scope local
+/plugin install plugin-validator@drunkcoding
+/plugin install multica-tool@drunkcoding --scope local
 ```
 
 Reload after install:
@@ -69,7 +66,7 @@ Only the plugin you install loads; others stay dormant.
 Install into a project's `.claude/` instead of your user profile:
 
 ```text
-/plugin install tech-graph@drunkcoding --scope project
+/plugin install plugin-validator@drunkcoding --scope project
 ```
 
 #### Manage installed plugins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drunkcoding/agents-and-skills",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Personal collection of Claude Code skills and agents, installable via `npx skills`.",
   "keywords": [
     "claude-code",
@@ -26,6 +26,9 @@
     "README.md",
     "LICENSE"
   ],
+  "scripts": {
+    "build:opencode": "node plugins/multica-tool/scripts/build-dist.mjs"
+  },
   "private": false,
   "publishConfig": {
     "access": "public"

package/plugins/multica-tool/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "multica-tool",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Export, import, and sync Multica skills, agents, and squads between workspaces via the multica CLI."
 }

package/plugins/multica-tool/scripts/lib.mjs

@@ -59,6 +59,21 @@ export const listAgentsIncludingArchived = (cli) => cli.json(["agent", "list", "
 export const listSquads = (cli) => cli.json(["squad", "list"]);
 export const listWorkspaceMembers = (cli) => cli.json(["workspace", "member", "list"]);
 
+// --- Workspace MCP server library ------------------------------------------
+// `workspace mcp list` returns only id/name/transport — the server entry JSON
+// (command/args/env, and any token inside it) is write-only: `workspace mcp
+// add/update` take it, nothing reads it back. So the library travels as a
+// NAME + TRANSPORT roster only, and import reports each entry as needing its
+// config re-entered by hand rather than pretending it round-trips.
+export const listWorkspaceMcpServers = (cli) =>
+  (cli.json(["workspace", "mcp", "list"]) ?? []).map((s) => ({ id: s.id, name: s.name, transport: s.transport }));
+
+// Which workspace MCP servers an agent uses, and whether each is on. Keyed by
+// NAME (the server id is re-minted per workspace); `agent mcp add/enable/disable`
+// take a server id, which import resolves from the destination library by name.
+export const listAgentMcpServers = (cli, agentId) =>
+  (cli.json(["agent", "mcp", "list", agentId]) ?? []).map((s) => ({ name: s.name, enabled: !!s.enabled }));
+
 // Get-wrappers: the ONLY place that knows the raw CLI field names — an
 // explicit allow-list, so unexpected/internal CLI fields never leak into a
 // bundle. Field names mirror the CLI's own snake_case; nothing is renamed.
@@ -137,16 +152,19 @@ export const listAutopilots = (cli) => cli.json(["autopilot", "list"]).autopilot
 
 // `autopilot get` wraps the record as {autopilot, collaborators, triggers} — only
 // autopilot + triggers are portable; collaborators/can_write/can_manage_access are
-// caller-relative and never bundled. `priority` is accepted by `autopilot
-// create`/`update` but never present in this response (verified live) — kept as a
-// field anyway so this starts round-tripping automatically if the API adds it.
+// caller-relative and never bundled. `priority` is deliberately absent: the API
+// never returns it on read, and as of multica 0.4.36 `autopilot create`/`update`
+// no longer accept `--priority` either — so it can be neither captured nor
+// restored. Import reports every autopilot under `priorityNotCaptured`.
 export function getAutopilot(cli, id) {
   const r = cli.json(["autopilot", "get", id]);
   const a = r.autopilot;
   return {
     id: a.id, title: a.title, description: a.description ?? "",
+    // Source status (active|paused). Import never auto-activates — it is captured
+    // so the operator can be told which autopilots were live at the source.
+    status: a.status ?? null,
     execution_mode: a.execution_mode, issue_title_template: a.issue_title_template ?? null,
-    priority: a.priority ?? null,
     project_id: a.project_id ?? null,
     assignee_id: a.assignee_id, assignee_type: a.assignee_type,
     subscribers: (a.subscribers ?? []).map((s) => ({ user_id: s.user_id, user_type: s.user_type })),
@@ -156,3 +174,34 @@ export function getAutopilot(cli, id) {
     })),
   };
 }
+
+// --- Workspace-scoped issue taxonomy (multica 0.4.36) -----------------------
+// Labels and custom properties are defined per WORKSPACE, not per project — the
+// CLI has no project-scoped variant of either. They are bundled with project
+// exports (and `all`) so a migrated project lands somewhere its issues can
+// actually be labelled and filled in.
+
+// `id` is kept: `label update` addresses a label by id only.
+// `resource_type`/`usage_count`/timestamps are server-owned with no CLI setter.
+// `description` IS captured, but `label create`/`update` expose no
+// `--description` flag — import reports it as unrestorable rather than dropping
+// it silently.
+export const listLabels = (cli) =>
+  (cli.json(["label", "list"]) ?? []).map((l) => ({
+    id: l.id, name: l.name, color: l.color, description: l.description ?? "",
+  }));
+
+// Archived definitions included so an archived property round-trips as archived
+// instead of silently reappearing in every picker at the destination.
+// No `id`: `property get/update/archive/unarchive` all accept `<id-or-name>`,
+// and names are what issue values reference, so name is the portable key.
+// `position`/`usage_count` are server-assigned and have no CLI setter.
+export const listProperties = (cli) =>
+  (cli.json(["property", "list", "--include-archived"]) ?? []).map((p) => ({
+    name: p.name, type: p.type, description: p.description ?? "", icon: p.icon ?? "",
+    archived: !!p.archived,
+    // Only select/multi_select carry options; every other type reports null.
+    // Option ids are re-minted at the destination — `property update` re-matches
+    // existing options BY NAME, so name+color is the whole portable payload.
+    options: (p.config?.options ?? []).map((o) => ({ name: o.name, color: o.color ?? null })),
+  }));

package/plugins/multica-tool/scripts/multica-export.mjs

@@ -1,10 +1,30 @@
 import * as nodeFs from "node:fs";
 import { spawnSync } from "node:child_process";
 import { dirname } from "node:path";
-import { slugify, getSkill, getAgent, getAgentCustomEnv, getSquad, getSquadMembers, listRuntimes, listSkills, listAgents, listAgentsIncludingArchived, listSquads, listProjects, getProject, getProjectResources, listWorkspaceMembers, getAutopilot, makeCli, realExec, requireAuth, resolveWorkspaceId } from "./lib.mjs";
+import { slugify, getSkill, getAgent, getAgentCustomEnv, getSquad, getSquadMembers, listRuntimes, listSkills, listAgents, listAgentsIncludingArchived, listSquads, listProjects, getProject, getProjectResources, listWorkspaceMembers, listAutopilots, getAutopilot, listLabels, listProperties, listWorkspaceMcpServers, listAgentMcpServers, makeCli, realExec, requireAuth, resolveWorkspaceId } from "./lib.mjs";
+
+// Export levels for a WHOLE-WORKSPACE export, lowest tier first. A level pulls
+// in its own tier plus every tier below it, so `project` is the full workspace
+// and `skill` is skills alone. Single-resource exports (`--scope <type> --id`)
+// ignore this and always bundle what that one resource needs.
+export const LEVELS = ["skill", "agent", "squad", "project"];
+export const levelRank = (level) => LEVELS.indexOf(level);
+export const levelAtLeast = (level, tier) => levelRank(level) >= levelRank(tier);
 
 const nonEmpty = (v) => v && typeof v === "object" && Object.keys(v).length > 0;
 
+// Externalize a prose field to a sibling .md next to `jsonRel`
+// (e.g. agents/x.json + ".description.md" → agents/x.description.md), and record
+// the `<field>_file` pointer on `record`. Empty prose writes nothing and adds no
+// key — same sibling-file pattern as avatar_file, applied uniformly to every
+// resource's instructions/description so no prose is ever embedded in the JSON.
+function writeSidecar(fs, outDir, jsonRel, suffix, text, record, key) {
+  if (!text) return;
+  const rel = jsonRel.replace(/\.json$/, suffix);
+  fs.writeFileSync(`${outDir}/${rel}`, text);
+  record[key] = rel;
+}
+
 // An avatar_url is either an uploaded-image URL (http[s]://…) or an inline
 // "emoji:🦍" marker. Only image URLs carry bytes worth bundling; emoji markers
 // are just carried as strings in the record.
@@ -31,7 +51,7 @@ export function redactAgent(a) {
   // a is a normalized agent from getAgent, with `custom_env`/
   // `custom_env_fetch_failed` attached by the caller (collectAgent) — getAgent
   // itself never fetches custom_env, since it requires a separate audited call.
-  const { id, has_custom_env, mcp_config_redacted, custom_env_fetch_failed, mcp_config, custom_env, skills, runtime_id, instructions, archived_at, ...rest } = a;
+  const { id, has_custom_env, mcp_config_redacted, custom_env_fetch_failed, mcp_config, custom_env, skills, runtime_id, instructions, description, archived_at, ...rest } = a;
   const mcpUsable = !mcp_config_redacted && nonEmpty(mcp_config);
   const envUsable = !custom_env_fetch_failed && nonEmpty(custom_env);
   // mcp_config_redacted / custom_env_fetch_failed alone still flag hadSecrets even
@@ -51,13 +71,14 @@ export function redactAgent(a) {
       had_secrets: hadSecrets,
     },
     hadSecrets,
-    // instructions are written to a sibling .md by the caller (see avatar_file),
-    // never embedded in the JSON record.
+    // instructions and description are written to sibling .md files by the caller
+    // (see avatar_file), never embedded in the JSON record.
     instructions: instructions ?? "",
+    description: description ?? "",
   };
 }
 
-export function buildManifest({ scope, sourceWorkspaceId, skills, agents, squads, projects, autopilots }) {
+export function buildManifest({ scope, level, sourceWorkspaceId, skills, agents, squads, projects, autopilots, labels, properties, mcpServers }) {
   const seenSkills = new Map();
   for (const s of skills) if (!seenSkills.has(s.name)) seenSkills.set(s.name, s);
   const seenAgents = new Map();
@@ -67,14 +88,18 @@ export function buildManifest({ scope, sourceWorkspaceId, skills, agents, squads
   return {
     version: "1",
     scope,
+    // null for a single-resource export; the requested tier for a workspace export.
+    level: level ?? null,
     source_workspace_id: sourceWorkspaceId,
     skills: [...seenSkills.values()].map((s) => ({ name: s.name, dir: `skills/${slugify(s.name)}`, source_id: s.source_id })),
     agents: [...seenAgents.values()].map((a) => ({ name: a.name, file: `agents/${slugify(a.name)}.json`, source_id: a.source_id, source_runtime_id: a.source_runtime_id, source_runtime_provider: a.source_runtime_provider ?? null, skill_names: a.skill_names, had_secrets: !!a.had_secrets })),
     squads: (squads ?? []).map((squad) => {
       const file = `squads/${slugify(squad.name)}.json`;
-      const entry = { name: squad.name, file, description: squad.description ?? "", avatar_url: squad.avatar_url ?? null, leader_name: squad.leader_name, members: squad.members };
-      // Instructions go to a sibling .md (see squad write loop); only referenced when non-empty.
+      const entry = { name: squad.name, file, avatar_url: squad.avatar_url ?? null, leader_name: squad.leader_name, members: squad.members };
+      // Instructions and description go to sibling .md files (see squad write
+      // loop); only referenced when non-empty.
       if (squad.instructions) entry.instructions_file = file.replace(/\.json$/, ".md");
+      if (squad.description) entry.description_file = file.replace(/\.json$/, ".description.md");
       return entry;
     }),
     projects: [...seenProjects.values()].map((p) => ({
@@ -86,6 +111,30 @@ export function buildManifest({ scope, sourceWorkspaceId, skills, agents, squads
       assignee_type: ap.assignee_type, assignee_name: ap.assignee_name,
       project_title: ap.project_title, had_webhook_trigger: ap.had_webhook_trigger,
     })),
+    // Labels, properties and the workspace MCP roster are workspace-wide sets
+    // with no per-resource file to point at, so each gets its own flat folder
+    // (labels/, properties/, mcp/) and the manifest carries only a pointer plus
+    // a count. Import reads the pointer, falling back to a legacy bundle's
+    // inline array. `id` is dropped from labels: both labels and properties are
+    // matched by NAME at the destination.
+    labels_file: (labels ?? []).length ? "labels/labels.json" : null,
+    labels_count: (labels ?? []).length,
+    properties_file: (properties ?? []).length ? "properties/properties.json" : null,
+    properties_count: (properties ?? []).length,
+    mcp_servers_file: (mcpServers ?? []).length ? "mcp/servers.json" : null,
+    mcp_servers_count: (mcpServers ?? []).length,
+  };
+}
+
+// The payloads written to labels/, properties/ and mcp/. Kept next to
+// buildManifest so the manifest pointers and the files they name can't drift.
+export function buildTaxonomyFiles({ labels, properties, mcpServers }) {
+  return {
+    "labels/labels.json": (labels ?? []).map(({ id, ...rest }) => rest),
+    "properties/properties.json": properties ?? [],
+    // The server entry JSON is not readable via the CLI — only name/transport
+    // travel, so import re-creates the roster as a to-do list, not a copy.
+    "mcp/servers.json": (mcpServers ?? []).map(({ id, ...rest }) => rest),
   };
 }
 
@@ -115,6 +164,13 @@ function collectAgent(cli, id, agentsById, skills, providerById) {
       a.custom_env_fetch_failed = true; // e.g. insufficient permission — non-fatal, warned via hadSecrets
     }
   }
+  // Workspace MCP servers assigned to this agent (name + enabled). Separate from
+  // `mcp_config`, which is the agent's own inline server JSON.
+  try {
+    a.mcp_servers = listAgentMcpServers(cli, id);
+  } catch {
+    a.mcp_servers = []; // e.g. insufficient permission — non-fatal
+  }
   const skill_names = a.skills.map((sk) => collectSkill(cli, sk.id, skills));
   const red = redactAgent(a);
   const entry = { raw: a, red, skill_names };
@@ -122,7 +178,7 @@ function collectAgent(cli, id, agentsById, skills, providerById) {
   return entry;
 }
 
-export function exportResource({ cli, scope, ids, outDir, sourceWorkspaceId, fs = nodeFs, download = fetchBinary }) {
+export function exportResource({ cli, scope, level, ids, outDir, sourceWorkspaceId, fs = nodeFs, download = fetchBinary }) {
   const skills = new Map();       // name -> normalized skill
   const agentsById = new Map();   // id   -> { raw, red, skill_names }
   const squads = [];
@@ -169,6 +225,12 @@ export function exportResource({ cli, scope, ids, outDir, sourceWorkspaceId, fs
     };
   }
 
+  // A squad can be reached twice in one export (listed at level `squad`, then
+  // again as an autopilot's assignee) — keep exactly one copy, by name.
+  function pushSquad(built) {
+    if (built && !squads.some((s) => s.name === built.name)) squads.push(built);
+  }
+
   // Collect a project's portable metadata + its lead agent (bundled, like a
   // squad leader) and github_repo/other resources. An archived lead is dropped
   // (project still exports, just with no lead set) — unlike a squad, a project
@@ -193,19 +255,26 @@ export function exportResource({ cli, scope, ids, outDir, sourceWorkspaceId, fs
     };
   }
 
-  // Collect a single autopilot: its assignee (agent, or squad + members + skills)
-  // and, when present, the destination-portable project title / subscriber names.
+  // Collect a single autopilot. Its assignee is BUNDLED (like a squad leader or a
+  // project lead) so the bundle is self-contained — import resolves the assignee
+  // by name, which only works if that agent/squad travels with it or already
+  // exists at the destination.
   // Webhook trigger secrets (url/token) are never read into the bundle — only
   // kind/label/enabled, matching the existing agent MCP/env redaction pattern.
   function collectOneAutopilot(autopilotId) {
     const ap = getAutopilot(cli, autopilotId);
     let assignee_name = null;
     if (ap.assignee_type === "agent") {
-      const entry = collectAgent(cli, ap.assignee_id, agentsById, skills, getProviderById());
-      assignee_name = entry.archived ? null : entry.raw.name;
+      try {
+        const entry = collectAgent(cli, ap.assignee_id, agentsById, skills, getProviderById());
+        if (entry.archived) recordArchivedSkip(entry.name, "autopilot assignee", ap.title);
+        else assignee_name = entry.raw.name;
+      } catch { assignee_name = null; }
     } else if (ap.assignee_type === "squad") {
-      const sq = collectOneSquad(ap.assignee_id);
-      if (sq) { squads.push(sq); assignee_name = sq.name; }
+      try {
+        const built = collectOneSquad(ap.assignee_id);
+        if (built) { pushSquad(built); assignee_name = built.name; }
+      } catch { assignee_name = null; }
     }
     let project_title = null;
     if (ap.project_id) {
@@ -218,6 +287,7 @@ export function exportResource({ cli, scope, ids, outDir, sourceWorkspaceId, fs
     }
     return {
       title: ap.title, source_id: ap.id, description: ap.description,
+      status: ap.status,
       execution_mode: ap.execution_mode, issue_title_template: ap.issue_title_template,
       priority: ap.priority, project_title, assignee_type: ap.assignee_type, assignee_name,
       subscriber_names, had_webhook_trigger: ap.triggers.some((t) => t.kind === "webhook"),
@@ -227,33 +297,51 @@ export function exportResource({ cli, scope, ids, outDir, sourceWorkspaceId, fs
     };
   }
 
+  // Labels, custom properties and the workspace MCP roster are workspace-wide,
+  // not per-project — three cheap list calls, bundled only where issue-bearing
+  // work travels: a single `project` export, or a workspace export at level
+  // `project`. Never for a lone skill/agent/squad/autopilot.
+  const wantsTaxonomy = scope === "project" || (scope === "workspace" && levelAtLeast(level, "project"));
+  const labels = wantsTaxonomy ? listLabels(cli) : [];
+  const properties = wantsTaxonomy ? listProperties(cli) : [];
+  const mcpServers = wantsTaxonomy ? listWorkspaceMcpServers(cli) : [];
+
   if (scope === "skill") collectSkill(cli, ids.skillId, skills);
   else if (scope === "agent") {
     const entry = collectAgent(cli, ids.agentId, agentsById, skills, getProviderById());
     if (entry.archived) throw new Error(`Cannot export agent "${entry.name}": it is archived`);
   }
-  else if (scope === "squad") { const sq = collectOneSquad(ids.squadId); if (sq) squads.push(sq); }
+  else if (scope === "squad") pushSquad(collectOneSquad(ids.squadId));
   else if (scope === "project") projects.push(collectProject(ids.projectId));
-  else if (scope === "projects") for (const p of listProjects(cli)) projects.push(collectProject(p.id));
   else if (scope === "autopilot") autopilots.push(collectOneAutopilot(ids.autopilotId));
-  else if (scope === "all") {
+  else if (scope === "workspace") {
+    // Tiers are cumulative: every level bundles skills; `agent` and up add every
+    // agent; `squad` and up add every squad; `project` adds projects + autopilots
+    // (plus the taxonomy above).
     for (const s of listSkills(cli)) collectSkill(cli, s.id, skills);
-    for (const a of listAgents(cli)) collectAgent(cli, a.id, agentsById, skills, getProviderById());
-    for (const sq of listSquads(cli)) { const built = collectOneSquad(sq.id); if (built) squads.push(built); }
-    for (const p of listProjects(cli)) projects.push(collectProject(p.id));
-    // listAgents() above already excludes archived agents server-side — surface
-    // that exclusion in the report too, not just the squad/project paths.
-    for (const a of listAgentsIncludingArchived(cli)) {
-      if (a.archived_at) recordArchivedSkip(a.name, "workspace listing");
+    if (levelAtLeast(level, "agent")) {
+      for (const a of listAgents(cli)) collectAgent(cli, a.id, agentsById, skills, getProviderById());
+      // listAgents() above already excludes archived agents server-side — surface
+      // that exclusion in the report too, not just the squad/project paths.
+      for (const a of listAgentsIncludingArchived(cli)) {
+        if (a.archived_at) recordArchivedSkip(a.name, "workspace listing");
+      }
+    }
+    if (levelAtLeast(level, "squad")) {
+      for (const sq of listSquads(cli)) pushSquad(collectOneSquad(sq.id));
+    }
+    if (levelAtLeast(level, "project")) {
+      for (const p of listProjects(cli)) projects.push(collectProject(p.id));
+      for (const ap of listAutopilots(cli)) autopilots.push(collectOneAutopilot(ap.id));
     }
   }
 
   // Orphan-skill cleanup: drop skills that no exported agent references via its
-  // skill_names. Only `all` ever produces these — standalone workspace skills
-  // from listSkills that no agent uses. Skipped for `skill` scope: its one
-  // skill is the explicit target, not an orphan.
+  // skill_names. Skipped for `scope: skill` (its one skill IS the target, not an
+  // orphan) and for a workspace export at level `skill`, where the skills tier is
+  // itself what was asked for.
   const pruned_skills = [];
-  if (scope !== "skill") {
+  if (scope !== "skill" && !(scope === "workspace" && level === "skill")) {
     const referenced = new Set();
     for (const a of agentsById.values()) for (const n of a.skill_names) referenced.add(n);
     for (const name of [...skills.keys()]) {
@@ -262,12 +350,15 @@ export function exportResource({ cli, scope, ids, outDir, sourceWorkspaceId, fs
   }
 
   const manifest = buildManifest({
-    scope, sourceWorkspaceId,
+    scope, level, sourceWorkspaceId,
     skills: [...skills.values()].map((s) => ({ name: s.name, source_id: s.id })),
     agents: [...agentsById.values()].map((a) => ({ name: a.raw.name, source_id: a.raw.id, source_runtime_id: a.raw.runtime_id, source_runtime_provider: a.raw.source_runtime_provider, skill_names: a.skill_names, had_secrets: a.red.hadSecrets })),
     squads,
     projects,
     autopilots,
+    labels,
+    properties,
+    mcpServers,
   });
 
   const warnings = [];
@@ -304,37 +395,57 @@ export function exportResource({ cli, scope, ids, outDir, sourceWorkspaceId, fs
         record.avatar_file = rel;
       }
     }
-    // Instructions live in a sibling .md for reviewability (same sibling-file
-    // pattern as avatar_file); only written when non-empty.
-    if (red.instructions) {
-      const rel = entry.file.replace(/\.json$/, ".md");
-      fs.writeFileSync(`${outDir}/${rel}`, red.instructions);
-      record.instructions_file = rel;
-    }
+    // Instructions and description each live in a sibling .md for reviewability.
+    writeSidecar(fs, outDir, entry.file, ".md", red.instructions, record, "instructions_file");
+    writeSidecar(fs, outDir, entry.file, ".description.md", red.description, record, "description_file");
     fs.writeFileSync(`${outDir}/${entry.file}`, JSON.stringify(record, null, 2));
   }
-  const squadInstrByName = new Map(squads.map((s) => [s.name, s.instructions ?? ""]));
+  const squadByName = new Map(squads.map((s) => [s.name, s]));
   for (const entry of manifest.squads) {
     fs.mkdirSync(`${outDir}/squads`, { recursive: true });
-    if (entry.instructions_file) {
-      fs.writeFileSync(`${outDir}/${entry.instructions_file}`, squadInstrByName.get(entry.name) ?? "");
-    }
+    const s = squadByName.get(entry.name);
+    if (entry.instructions_file) fs.writeFileSync(`${outDir}/${entry.instructions_file}`, s?.instructions ?? "");
+    if (entry.description_file) fs.writeFileSync(`${outDir}/${entry.description_file}`, s?.description ?? "");
     fs.writeFileSync(`${outDir}/${entry.file}`, JSON.stringify(entry, null, 2));
   }
   const projectByTitle = new Map(projects.map((p) => [p.title, p]));
   for (const entry of manifest.projects) {
     fs.mkdirSync(`${outDir}/projects`, { recursive: true });
-    fs.writeFileSync(`${outDir}/${entry.file}`, JSON.stringify(projectByTitle.get(entry.title), null, 2));
+    const record = { ...projectByTitle.get(entry.title) };
+    const desc = record.description; delete record.description;
+    writeSidecar(fs, outDir, entry.file, ".description.md", desc, record, "description_file");
+    fs.writeFileSync(`${outDir}/${entry.file}`, JSON.stringify(record, null, 2));
   }
   const autopilotByTitle = new Map(autopilots.map((a) => [a.title, a]));
   for (const entry of manifest.autopilots) {
     fs.mkdirSync(`${outDir}/autopilots`, { recursive: true });
-    fs.writeFileSync(`${outDir}/${entry.file}`, JSON.stringify(autopilotByTitle.get(entry.title), null, 2));
+    const record = { ...autopilotByTitle.get(entry.title) };
+    const desc = record.description; delete record.description;
+    writeSidecar(fs, outDir, entry.file, ".description.md", desc, record, "description_file");
+    fs.writeFileSync(`${outDir}/${entry.file}`, JSON.stringify(record, null, 2));
+  }
+  // labels/, properties/, mcp/ — one flat folder per object type, matching the
+  // per-type folders written above. Only written when the manifest points at them.
+  const taxonomyFiles = buildTaxonomyFiles({ labels, properties, mcpServers });
+  for (const rel of [manifest.labels_file, manifest.properties_file, manifest.mcp_servers_file]) {
+    if (!rel) continue;
+    fs.mkdirSync(`${outDir}/${dirname(rel)}`, { recursive: true });
+    fs.writeFileSync(`${outDir}/${rel}`, JSON.stringify(taxonomyFiles[rel], null, 2));
   }
   fs.writeFileSync(`${outDir}/manifest.json`, JSON.stringify(manifest, null, 2));
   return {
     manifest, warnings, pruned_skills, archivedAgentsSkipped,
+    // Autopilots that were live at the source. Import always lands them paused,
+    // so activation is a deliberate manual step at the destination.
+    autopilotsActiveAtSource: autopilots.filter((a) => a.status === "active").map((a) => a.title),
+    // Only name/transport are readable via `workspace mcp list` — the server
+    // entry JSON (and any token in it) must be re-entered at the destination.
+    mcpServerConfigsNotPortable: mcpServers.map((m) => m.name),
     autopilotWebhookTriggers: autopilots.filter((a) => a.had_webhook_trigger).map((a) => a.title),
+    // Captured in the bundle for review, but `label create`/`update` have no
+    // --description flag — flagged at export time so the gap is known before the
+    // migration, not discovered at the far end.
+    labelDescriptionsNotPortable: labels.filter((l) => l.description).map((l) => l.name),
   };
 }
 
@@ -342,14 +453,24 @@ function main() {
   const args = process.argv.slice(2);
   const get = (flag) => { const i = args.indexOf(flag); return i !== -1 ? args[i + 1] : null; };
 
-  const scope     = get("--scope");
+  const rawScope  = get("--scope");
+  const rawLevel  = get("--level");
   const id        = get("--id");
   const out       = get("--out");
   const workspace = get("--workspace"); // optional: source workspace name
 
-  if (!scope || !out || (scope !== "all" && scope !== "projects" && !id)) {
-    console.error("Usage: multica-export.mjs --scope <skill|agent|squad|project|projects|autopilot|all> --id <id> --out <dir> [--workspace <name>]  (--id not needed for --scope all|projects)");
-    process.exit(1);
+  const USAGE = "Usage: multica-export.mjs --out <dir> [--level skill|agent|squad|project] [--workspace <name>]\n" +
+                "   or: multica-export.mjs --scope <skill|agent|squad|project|autopilot> --id <id> --out <dir> [--workspace <name>]\n" +
+                "  --level exports the WHOLE workspace down to that tier (default: squad); --scope exports one named resource.";
+
+  // No --scope means a whole-workspace export driven by --level (default squad).
+  const scope = rawScope ?? "workspace";
+  const level = scope === "workspace" ? (rawLevel ?? "squad") : null;
+
+  if (rawScope && rawLevel) { console.error("--scope and --level are mutually exclusive.\n" + USAGE); process.exit(1); }
+  if (!out || (scope !== "workspace" && !id)) { console.error(USAGE); process.exit(1); }
+  if (scope === "workspace" && !LEVELS.includes(level)) {
+    console.error(`Unknown level "${level}" — use ${LEVELS.join("|")}`); process.exit(1);
   }
 
   requireAuth(realExec);
@@ -364,12 +485,11 @@ function main() {
   else if (scope === "agent")  ids.agentId  = id;
   else if (scope === "squad")  ids.squadId  = id;
   else if (scope === "project")  ids.projectId = id;
-  else if (scope === "projects") { /* all projects — no id */ }
   else if (scope === "autopilot") ids.autopilotId = id;
-  else if (scope === "all")    { /* whole workspace — no id */ }
-  else { console.error(`Unknown scope "${scope}" — use skill|agent|squad|project|projects|autopilot|all`); process.exit(1); }
+  else if (scope === "workspace") { /* whole workspace — no id */ }
+  else { console.error(`Unknown scope "${scope}" — use skill|agent|squad|project|autopilot`); process.exit(1); }
 
-  const result = exportResource({ cli, scope, ids, outDir: out, sourceWorkspaceId, fs: nodeFs });
+  const result = exportResource({ cli, scope, level, ids, outDir: out, sourceWorkspaceId, fs: nodeFs });
   console.log(JSON.stringify(result, null, 2));
 }