@claude-collective/cli 0.8.0 → 0.13.1

package/dist/commands/edit.js

@@ -1,64 +1,66 @@
 #!/usr/bin/env node
 import {
   bumpPluginVersion
-} from "../chunk-OLBOTK3O.js";
+} from "../chunk-P26A2K5N.js";
 import {
   getAgentDefinitions
-} from "../chunk-C4ZTIYFR.js";
+} from "../chunk-SVYPSDWY.js";
 import {
   detectInstallation
-} from "../chunk-3ZCB5K33.js";
+} from "../chunk-SGJ23HIP.js";
 import {
   recompileAgents
-} from "../chunk-FNOYEXUE.js";
-import "../chunk-MYAVQ23U.js";
-import {
-  copySkillsToPluginFromSource
-} from "../chunk-G2FBJOZG.js";
+} from "../chunk-LE6IY6IT.js";
 import {
   Wizard
-} from "../chunk-ED73HCW2.js";
-import "../chunk-A65SBAAJ.js";
-import "../chunk-HNDT5QRB.js";
-import "../chunk-ALEPJ6YN.js";
-import "../chunk-XKEG3SCV.js";
-import "../chunk-Q6DR5QUH.js";
-import "../chunk-LVKRVFYR.js";
-import "../chunk-UOWHJ6BE.js";
-import "../chunk-Y3V43XCU.js";
-import "../chunk-PPNTD5LO.js";
-import "../chunk-K7PTOVX4.js";
-import "../chunk-Q2LH2DAB.js";
-import "../chunk-LQTST4WY.js";
-import "../chunk-MJSFR562.js";
-import "../chunk-SEBPPFUW.js";
+} from "../chunk-6DCSSORF.js";
+import "../chunk-E3FJH4TF.js";
+import "../chunk-HLJX2FTL.js";
+import "../chunk-CDX4W4DM.js";
+import "../chunk-I2DSLOXZ.js";
+import "../chunk-ZENYS6KW.js";
+import "../chunk-7Q44DMSP.js";
+import "../chunk-Z7G4B5HJ.js";
+import "../chunk-BDLUZVKU.js";
+import "../chunk-X6QONICW.js";
+import "../chunk-Y2LW7R3Y.js";
+import "../chunk-D237EVNB.js";
+import "../chunk-Z2CWURZ6.js";
+import "../chunk-DRXPNNPB.js";
+import "../chunk-GDH553MV.js";
+import "../chunk-I4TPKIYX.js";
 import {
   getCollectivePluginDir,
   getPluginSkillIds,
   getPluginSkillsDir
-} from "../chunk-3HBTELJN.js";
+} from "../chunk-ED4E6Q2T.js";
+import "../chunk-CJEHB4TB.js";
+import {
+  copySkillsToPluginFromSource
+} from "../chunk-K7EVM5LY.js";
+import "../chunk-KAAEN2PO.js";
 import {
   loadSkillsMatrixFromSource
-} from "../chunk-DKGL77IY.js";
-import "../chunk-QGGSLMO3.js";
-import "../chunk-NGBFJJ7Q.js";
-import "../chunk-QESUUPOE.js";
-import "../chunk-A3J6IAXK.js";
+} from "../chunk-CPZOTVCI.js";
+import "../chunk-B7CCVP6Q.js";
+import "../chunk-IMDW5ZUP.js";
 import {
   BaseCommand,
   EXIT_CODES
-} from "../chunk-SYQ7R2JO.js";
-import "../chunk-TOPAIL5W.js";
+} from "../chunk-EHS3TWWP.js";
+import "../chunk-V46GGCCI.js";
+import "../chunk-3U3R4NCG.js";
 import {
   directoryExists,
   ensureDir,
   remove
-} from "../chunk-MMDXNZPF.js";
+} from "../chunk-TKFPKEV3.js";
+import "../chunk-76DWXGQE.js";
 import {
   init_esm_shims
 } from "../chunk-DHET7RCE.js";
 
-// src/cli-v2/commands/edit.tsx
+// src/cli/commands/edit.tsx
 init_esm_shims();
 import { Flags } from "@oclif/core";
 import { render } from "ink";
@@ -125,8 +127,8 @@ var Edit = class _Edit extends BaseCommand {
         {
           matrix: sourceResult.matrix,
           initialSkills: currentSkillIds,
-          onComplete: (result) => {
-            wizardResult = result;
+          onComplete: (result2) => {
+            wizardResult = result2;
           },
           onCancel: () => {
             this.log("\nEdit cancelled");
@@ -135,25 +137,26 @@ var Edit = class _Edit extends BaseCommand {
       )
     );
     await waitUntilExit();
-    if (!wizardResult || wizardResult.cancelled) {
-      this.exit(EXIT_CODES.CANCELLED);
+    const result = wizardResult;
+    if (!result || result.cancelled) {
+      this.error("Cancelled", { exit: EXIT_CODES.CANCELLED });
     }
-    if (!wizardResult.validation.valid) {
-      this.error("Selection has validation errors:");
-      for (const error of wizardResult.validation.errors) {
-        this.log(`  ${error.message}`);
-      }
-      this.exit(EXIT_CODES.ERROR);
+    if (!result.validation.valid) {
+      const errorMessages = result.validation.errors.map((e) => e.message).join("\n  ");
+      this.error(`Selection has validation errors:
+  ${errorMessages}`, {
+        exit: EXIT_CODES.ERROR
+      });
     }
-    const addedSkills = wizardResult.selectedSkills.filter(
+    const addedSkills = result.selectedSkills.filter(
       (id) => !currentSkillIds.includes(id)
     );
     const removedSkills = currentSkillIds.filter(
-      (id) => !wizardResult.selectedSkills.includes(id)
+      (id) => !result.selectedSkills.includes(id)
     );
-    if (wizardResult.validation.warnings.length > 0) {
+    if (result.validation.warnings.length > 0) {
       this.log("\nWarnings:");
-      for (const warning of wizardResult.validation.warnings) {
+      for (const warning of result.validation.warnings) {
         this.warn(`  ! ${warning.message}`);
       }
       this.log("");
@@ -180,13 +183,13 @@ var Edit = class _Edit extends BaseCommand {
       }
       await ensureDir(pluginSkillsDir);
       await copySkillsToPluginFromSource(
-        wizardResult.selectedSkills,
+        result.selectedSkills,
         pluginDir,
         sourceResult.matrix,
         sourceResult
       );
       this.log(
-        `\u2713 Plugin updated with ${wizardResult.selectedSkills.length} skills
+        `\u2713 Plugin updated with ${result.selectedSkills.length} skills
 `
       );
     } catch (error) {

package/dist/commands/edit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/cli-v2/commands/edit.tsx"],"sourcesContent":["import { Flags } from \"@oclif/core\";\nimport { render } from \"ink\";\nimport React from \"react\";\nimport { BaseCommand } from \"../base-command.js\";\nimport { Wizard, WizardResult } from \"../components/wizard/wizard.js\";\nimport { loadSkillsMatrixFromSource } from \"../lib/source-loader.js\";\nimport { directoryExists, ensureDir, remove } from \"../utils/fs.js\";\nimport {\n  getCollectivePluginDir,\n  getPluginSkillsDir,\n  getPluginSkillIds,\n} from \"../lib/plugin-finder.js\";\nimport { copySkillsToPluginFromSource } from \"../lib/skill-copier.js\";\nimport { recompileAgents } from \"../lib/agent-recompiler.js\";\nimport { bumpPluginVersion } from \"../lib/plugin-version.js\";\nimport { getAgentDefinitions } from \"../lib/agent-fetcher.js\";\nimport { EXIT_CODES } from \"../lib/exit-codes.js\";\nimport { detectInstallation } from \"../lib/installation.js\";\n\nexport default class Edit extends BaseCommand {\n  static summary = \"Edit skills in the plugin\";\n  static description =\n    \"Modify the currently installed skills via interactive wizard\";\n\n  static flags = {\n    ...BaseCommand.baseFlags,\n    refresh: Flags.boolean({\n      description: \"Force refresh from remote sources\",\n      default: false,\n    }),\n    \"agent-source\": Flags.string({\n      description: \"Remote agent partials source (default: local CLI)\",\n    }),\n  };\n\n  async run(): Promise<void> {\n    const { flags } = await this.parse(Edit);\n\n    // Detect installation mode\n    const installation = await detectInstallation();\n\n    if (!installation) {\n      this.error(\n        \"No installation found. Run 'cc init' first to set up Claude Collective.\",\n        { exit: EXIT_CODES.ERROR },\n      );\n    }\n\n    const pluginDir = getCollectivePluginDir();\n    const pluginSkillsDir =\n      installation.mode === \"local\"\n        ? installation.skillsDir\n        : getPluginSkillsDir(pluginDir);\n\n    const modeLabel = installation.mode === \"local\" ? \"Local\" : \"Plugin\";\n    this.log(`Edit ${modeLabel} Skills\\n`);\n\n    // Load skills matrix\n    this.log(\"Resolving marketplace source...\");\n    let sourceResult;\n    try {\n      sourceResult = await loadSkillsMatrixFromSource({\n        sourceFlag: flags.source,\n        projectDir: process.cwd(),\n        forceRefresh: flags.refresh,\n      });\n\n      const sourceInfo = sourceResult.isLocal\n        ? \"local\"\n        : sourceResult.sourceConfig.sourceOrigin;\n      this.log(\n        `✓ Loaded ${Object.keys(sourceResult.matrix.skills).length} skills (${sourceInfo})\\n`,\n      );\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Load current skills\n    this.log(\"Reading current skills...\");\n    let currentSkillIds: string[];\n    try {\n      currentSkillIds = await getPluginSkillIds(\n        pluginSkillsDir,\n        sourceResult.matrix,\n      );\n      this.log(`✓ Current plugin has ${currentSkillIds.length} skills\\n`);\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Run wizard with initial skills\n    let wizardResult: WizardResult | null = null;\n\n    const { waitUntilExit } = render(\n      <Wizard\n        matrix={sourceResult.matrix}\n        initialSkills={currentSkillIds}\n        onComplete={(result) => {\n          wizardResult = result;\n        }}\n        onCancel={() => {\n          this.log(\"\\nEdit cancelled\");\n        }}\n      />,\n    );\n\n    await waitUntilExit();\n\n    // Handle cancellation\n    if (!wizardResult || wizardResult.cancelled) {\n      this.exit(EXIT_CODES.CANCELLED);\n    }\n\n    // Validate selection\n    if (!wizardResult.validation.valid) {\n      this.error(\"Selection has validation errors:\");\n      for (const error of wizardResult.validation.errors) {\n        this.log(`  ${error.message}`);\n      }\n      this.exit(EXIT_CODES.ERROR);\n    }\n\n    // Calculate changes\n    const addedSkills = wizardResult.selectedSkills.filter(\n      (id) => !currentSkillIds.includes(id),\n    );\n    const removedSkills = currentSkillIds.filter(\n      (id) => !wizardResult.selectedSkills.includes(id),\n    );\n\n    // Show warnings if any\n    if (wizardResult.validation.warnings.length > 0) {\n      this.log(\"\\nWarnings:\");\n      for (const warning of wizardResult.validation.warnings) {\n        this.warn(`  ! ${warning.message}`);\n      }\n      this.log(\"\");\n    }\n\n    // Check if there are no changes\n    if (addedSkills.length === 0 && removedSkills.length === 0) {\n      this.log(\"No changes made.\");\n      this.log(\"Plugin unchanged\\n\");\n      return;\n    }\n\n    // Show changes\n    this.log(\"\\nChanges:\");\n    for (const skillId of addedSkills) {\n      const skill = sourceResult.matrix.skills[skillId];\n      this.log(`  + ${skill?.name || skillId}`);\n    }\n    for (const skillId of removedSkills) {\n      const skill = sourceResult.matrix.skills[skillId];\n      this.log(`  - ${skill?.name || skillId}`);\n    }\n    this.log(\"\");\n\n    // Update plugin skills\n    this.log(\"Updating plugin skills...\");\n    try {\n      if (await directoryExists(pluginSkillsDir)) {\n        await remove(pluginSkillsDir);\n      }\n      await ensureDir(pluginSkillsDir);\n\n      await copySkillsToPluginFromSource(\n        wizardResult.selectedSkills,\n        pluginDir,\n        sourceResult.matrix,\n        sourceResult,\n      );\n      this.log(\n        `✓ Plugin updated with ${wizardResult.selectedSkills.length} skills\\n`,\n      );\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Fetch agent partials\n    let sourcePath: string;\n    this.log(\n      flags[\"agent-source\"]\n        ? \"Fetching agent partials...\"\n        : \"Loading agent partials...\",\n    );\n    try {\n      const agentDefs = await getAgentDefinitions(flags[\"agent-source\"], {\n        forceRefresh: flags.refresh,\n      });\n      sourcePath = agentDefs.sourcePath;\n      this.log(\n        flags[\"agent-source\"]\n          ? \"✓ Agent partials fetched\\n\"\n          : \"✓ Agent partials loaded\\n\",\n      );\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Recompile agents\n    this.log(\"Recompiling agents...\");\n    try {\n      const recompileResult = await recompileAgents({\n        pluginDir,\n        sourcePath,\n      });\n\n      if (recompileResult.failed.length > 0) {\n        this.log(\n          `✓ Recompiled ${recompileResult.compiled.length} agents (${recompileResult.failed.length} failed)\\n`,\n        );\n        for (const warning of recompileResult.warnings) {\n          this.warn(warning);\n        }\n      } else if (recompileResult.compiled.length > 0) {\n        this.log(`✓ Recompiled ${recompileResult.compiled.length} agents\\n`);\n      } else {\n        this.log(\"✓ No agents to recompile\\n\");\n      }\n    } catch (error) {\n      this.warn(\n        `Agent recompilation failed: ${error instanceof Error ? error.message : String(error)}`,\n      );\n      this.log(\"You can manually recompile with 'cc compile'.\\n\");\n    }\n\n    // Update plugin version\n    this.log(\"Updating plugin version...\");\n    try {\n      const newVersion = await bumpPluginVersion(pluginDir, \"patch\");\n      this.log(`✓ Version bumped to ${newVersion}\\n`);\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    this.log(\n      `\\n✓ Plugin updated! (${addedSkills.length} added, ${removedSkills.length} removed)\\n`,\n    );\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA,SAAS,aAAa;AACtB,SAAS,cAAc;AA6FjB;AA3EN,IAAqB,OAArB,MAAqB,cAAa,YAAY;AAAA,EAC5C,OAAO,UAAU;AAAA,EACjB,OAAO,cACL;AAAA,EAEF,OAAO,QAAQ;AAAA,IACb,GAAG,YAAY;AAAA,IACf,SAAS,MAAM,QAAQ;AAAA,MACrB,aAAa;AAAA,MACb,SAAS;AAAA,IACX,CAAC;AAAA,IACD,gBAAgB,MAAM,OAAO;AAAA,MAC3B,aAAa;AAAA,IACf,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,MAAqB;AACzB,UAAM,EAAE,MAAM,IAAI,MAAM,KAAK,MAAM,KAAI;AAGvC,UAAM,eAAe,MAAM,mBAAmB;AAE9C,QAAI,CAAC,cAAc;AACjB,WAAK;AAAA,QACH;AAAA,QACA,EAAE,MAAM,WAAW,MAAM;AAAA,MAC3B;AAAA,IACF;AAEA,UAAM,YAAY,uBAAuB;AACzC,UAAM,kBACJ,aAAa,SAAS,UAClB,aAAa,YACb,mBAAmB,SAAS;AAElC,UAAM,YAAY,aAAa,SAAS,UAAU,UAAU;AAC5D,SAAK,IAAI,QAAQ,SAAS;AAAA,CAAW;AAGrC,SAAK,IAAI,iCAAiC;AAC1C,QAAI;AACJ,QAAI;AACF,qBAAe,MAAM,2BAA2B;AAAA,QAC9C,YAAY,MAAM;AAAA,QAClB,YAAY,QAAQ,IAAI;AAAA,QACxB,cAAc,MAAM;AAAA,MACtB,CAAC;AAED,YAAM,aAAa,aAAa,UAC5B,UACA,aAAa,aAAa;AAC9B,WAAK;AAAA,QACH,iBAAY,OAAO,KAAK,aAAa,OAAO,MAAM,EAAE,MAAM,YAAY,UAAU;AAAA;AAAA,MAClF;AAAA,IACF,SAAS,OAAO;AACd,WAAK,YAAY,KAAK;AAAA,IACxB;AAGA,SAAK,IAAI,2BAA2B;AACpC,QAAI;AACJ,QAAI;AACF,wBAAkB,MAAM;AAAA,QACtB;AAAA,QACA,aAAa;AAAA,MACf;AACA,WAAK,IAAI,6BAAwB,gBAAgB,MAAM;AAAA,CAAW;AAAA,IACpE,SAAS,OAAO;AACd,WAAK,YAAY,KAAK;AAAA,IACxB;AAGA,QAAI,eAAoC;AAExC,UAAM,EAAE,cAAc,IAAI;AAAA,MACxB;AAAA,QAAC;AAAA;AAAA,UACC,QAAQ,aAAa;AAAA,UACrB,eAAe;AAAA,UACf,YAAY,CAAC,WAAW;AACtB,2BAAe;AAAA,UACjB;AAAA,UACA,UAAU,MAAM;AACd,iBAAK,IAAI,kBAAkB;AAAA,UAC7B;AAAA;AAAA,MACF;AAAA,IACF;AAEA,UAAM,cAAc;AAGpB,QAAI,CAAC,gBAAgB,aAAa,WAAW;AAC3C,WAAK,KAAK,WAAW,SAAS;AAAA,IAChC;AAGA,QAAI,CAAC,aAAa,WAAW,OAAO;AAClC,WAAK,MAAM,kCAAkC;AAC7C,iBAAW,SAAS,aAAa,WAAW,QAAQ;AAClD,aAAK,IAAI,KAAK,MAAM,OAAO,EAAE;AAAA,MAC/B;AACA,WAAK,KAAK,WAAW,KAAK;AAAA,IAC5B;AAGA,UAAM,cAAc,aAAa,eAAe;AAAA,MAC9C,CAAC,OAAO,CAAC,gBAAgB,SAAS,EAAE;AAAA,IACtC;AACA,UAAM,gBAAgB,gBAAgB;AAAA,MACpC,CAAC,OAAO,CAAC,aAAa,eAAe,SAAS,EAAE;AAAA,IAClD;AAGA,QAAI,aAAa,WAAW,SAAS,SAAS,GAAG;AAC/C,WAAK,IAAI,aAAa;AACtB,iBAAW,WAAW,aAAa,WAAW,UAAU;AACtD,aAAK,KAAK,OAAO,QAAQ,OAAO,EAAE;AAAA,MACpC;AACA,WAAK,IAAI,EAAE;AAAA,IACb;AAGA,QAAI,YAAY,WAAW,KAAK,cAAc,WAAW,GAAG;AAC1D,WAAK,IAAI,kBAAkB;AAC3B,WAAK,IAAI,oBAAoB;AAC7B;AAAA,IACF;AAGA,SAAK,IAAI,YAAY;AACrB,eAAW,WAAW,aAAa;AACjC,YAAM,QAAQ,aAAa,OAAO,OAAO,OAAO;AAChD,WAAK,IAAI,OAAO,OAAO,QAAQ,OAAO,EAAE;AAAA,IAC1C;AACA,eAAW,WAAW,eAAe;AACnC,YAAM,QAAQ,aAAa,OAAO,OAAO,OAAO;AAChD,WAAK,IAAI,OAAO,OAAO,QAAQ,OAAO,EAAE;AAAA,IAC1C;AACA,SAAK,IAAI,EAAE;AAGX,SAAK,IAAI,2BAA2B;AACpC,QAAI;AACF,UAAI,MAAM,gBAAgB,eAAe,GAAG;AAC1C,cAAM,OAAO,eAAe;AAAA,MAC9B;AACA,YAAM,UAAU,eAAe;AAE/B,YAAM;AAAA,QACJ,aAAa;AAAA,QACb;AAAA,QACA,aAAa;AAAA,QACb;AAAA,MACF;AACA,WAAK;AAAA,QACH,8BAAyB,aAAa,eAAe,MAAM;AAAA;AAAA,MAC7D;AAAA,IACF,SAAS,OAAO;AACd,WAAK,YAAY,KAAK;AAAA,IACxB;AAGA,QAAI;AACJ,SAAK;AAAA,MACH,MAAM,cAAc,IAChB,+BACA;AAAA,IACN;AACA,QAAI;AACF,YAAM,YAAY,MAAM,oBAAoB,MAAM,cAAc,GAAG;AAAA,QACjE,cAAc,MAAM;AAAA,MACtB,CAAC;AACD,mBAAa,UAAU;AACvB,WAAK;AAAA,QACH,MAAM,cAAc,IAChB,oCACA;AAAA,MACN;AAAA,IACF,SAAS,OAAO;AACd,WAAK,YAAY,KAAK;AAAA,IACxB;AAGA,SAAK,IAAI,uBAAuB;AAChC,QAAI;AACF,YAAM,kBAAkB,MAAM,gBAAgB;AAAA,QAC5C;AAAA,QACA;AAAA,MACF,CAAC;AAED,UAAI,gBAAgB,OAAO,SAAS,GAAG;AACrC,aAAK;AAAA,UACH,qBAAgB,gBAAgB,SAAS,MAAM,YAAY,gBAAgB,OAAO,MAAM;AAAA;AAAA,QAC1F;AACA,mBAAW,WAAW,gBAAgB,UAAU;AAC9C,eAAK,KAAK,OAAO;AAAA,QACnB;AAAA,MACF,WAAW,gBAAgB,SAAS,SAAS,GAAG;AAC9C,aAAK,IAAI,qBAAgB,gBAAgB,SAAS,MAAM;AAAA,CAAW;AAAA,MACrE,OAAO;AACL,aAAK,IAAI,iCAA4B;AAAA,MACvC;AAAA,IACF,SAAS,OAAO;AACd,WAAK;AAAA,QACH,+BAA+B,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK,CAAC;AAAA,MACvF;AACA,WAAK,IAAI,iDAAiD;AAAA,IAC5D;AAGA,SAAK,IAAI,4BAA4B;AACrC,QAAI;AACF,YAAM,aAAa,MAAM,kBAAkB,WAAW,OAAO;AAC7D,WAAK,IAAI,4BAAuB,UAAU;AAAA,CAAI;AAAA,IAChD,SAAS,OAAO;AACd,WAAK,YAAY,KAAK;AAAA,IACxB;AAEA,SAAK;AAAA,MACH;AAAA,0BAAwB,YAAY,MAAM,WAAW,cAAc,MAAM;AAAA;AAAA,IAC3E;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/cli/commands/edit.tsx"],"sourcesContent":["import { Flags } from \"@oclif/core\";\nimport { render } from \"ink\";\nimport React from \"react\";\nimport { BaseCommand } from \"../base-command.js\";\nimport { Wizard, WizardResultV2 } from \"../components/wizard/wizard.js\";\nimport { loadSkillsMatrixFromSource } from \"../lib/source-loader.js\";\nimport { directoryExists, ensureDir, remove } from \"../utils/fs.js\";\nimport {\n  getCollectivePluginDir,\n  getPluginSkillsDir,\n  getPluginSkillIds,\n} from \"../lib/plugin-finder.js\";\nimport { copySkillsToPluginFromSource } from \"../lib/skill-copier.js\";\nimport { recompileAgents } from \"../lib/agent-recompiler.js\";\nimport { bumpPluginVersion } from \"../lib/plugin-version.js\";\nimport { getAgentDefinitions } from \"../lib/agent-fetcher.js\";\nimport { EXIT_CODES } from \"../lib/exit-codes.js\";\nimport { detectInstallation } from \"../lib/installation.js\";\n\nexport default class Edit extends BaseCommand {\n  static summary = \"Edit skills in the plugin\";\n  static description =\n    \"Modify the currently installed skills via interactive wizard\";\n\n  static flags = {\n    ...BaseCommand.baseFlags,\n    refresh: Flags.boolean({\n      description: \"Force refresh from remote sources\",\n      default: false,\n    }),\n    \"agent-source\": Flags.string({\n      description: \"Remote agent partials source (default: local CLI)\",\n    }),\n  };\n\n  async run(): Promise<void> {\n    const { flags } = await this.parse(Edit);\n\n    // Detect installation mode\n    const installation = await detectInstallation();\n\n    if (!installation) {\n      this.error(\n        \"No installation found. Run 'cc init' first to set up Claude Collective.\",\n        { exit: EXIT_CODES.ERROR },\n      );\n    }\n\n    const pluginDir = getCollectivePluginDir();\n    const pluginSkillsDir =\n      installation.mode === \"local\"\n        ? installation.skillsDir\n        : getPluginSkillsDir(pluginDir);\n\n    const modeLabel = installation.mode === \"local\" ? \"Local\" : \"Plugin\";\n    this.log(`Edit ${modeLabel} Skills\\n`);\n\n    // Load skills matrix\n    this.log(\"Resolving marketplace source...\");\n    let sourceResult;\n    try {\n      sourceResult = await loadSkillsMatrixFromSource({\n        sourceFlag: flags.source,\n        projectDir: process.cwd(),\n        forceRefresh: flags.refresh,\n      });\n\n      const sourceInfo = sourceResult.isLocal\n        ? \"local\"\n        : sourceResult.sourceConfig.sourceOrigin;\n      this.log(\n        `✓ Loaded ${Object.keys(sourceResult.matrix.skills).length} skills (${sourceInfo})\\n`,\n      );\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Load current skills\n    this.log(\"Reading current skills...\");\n    let currentSkillIds: string[];\n    try {\n      currentSkillIds = await getPluginSkillIds(\n        pluginSkillsDir,\n        sourceResult.matrix,\n      );\n      this.log(`✓ Current plugin has ${currentSkillIds.length} skills\\n`);\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Run wizard with initial skills\n    let wizardResult: WizardResultV2 | null = null;\n\n    const { waitUntilExit } = render(\n      <Wizard\n        matrix={sourceResult.matrix}\n        initialSkills={currentSkillIds}\n        onComplete={(result) => {\n          // Wizard always returns WizardResultV2 in the current implementation\n          wizardResult = result as WizardResultV2;\n        }}\n        onCancel={() => {\n          this.log(\"\\nEdit cancelled\");\n        }}\n      />,\n    );\n\n    await waitUntilExit();\n\n    // Cast to WizardResultV2 since that's what the current wizard implementation returns\n    // Use non-null assertion here since we know the wizard has completed\n    const result = wizardResult as WizardResultV2 | null;\n\n    // Handle cancellation - use error() which throws and TypeScript understands\n    if (!result || result.cancelled) {\n      this.error(\"Cancelled\", { exit: EXIT_CODES.CANCELLED });\n    }\n\n    // Validate selection - use error() which throws and TypeScript understands\n    if (!result.validation.valid) {\n      const errorMessages = result.validation.errors\n        .map((e) => e.message)\n        .join(\"\\n  \");\n      this.error(`Selection has validation errors:\\n  ${errorMessages}`, {\n        exit: EXIT_CODES.ERROR,\n      });\n    }\n\n    // Calculate changes\n    const addedSkills = result.selectedSkills.filter(\n      (id: string) => !currentSkillIds.includes(id),\n    );\n    const removedSkills = currentSkillIds.filter(\n      (id) => !result.selectedSkills.includes(id),\n    );\n\n    // Show warnings if any\n    if (result.validation.warnings.length > 0) {\n      this.log(\"\\nWarnings:\");\n      for (const warning of result.validation.warnings) {\n        this.warn(`  ! ${warning.message}`);\n      }\n      this.log(\"\");\n    }\n\n    // Check if there are no changes\n    if (addedSkills.length === 0 && removedSkills.length === 0) {\n      this.log(\"No changes made.\");\n      this.log(\"Plugin unchanged\\n\");\n      return;\n    }\n\n    // Show changes\n    this.log(\"\\nChanges:\");\n    for (const skillId of addedSkills) {\n      const skill = sourceResult.matrix.skills[skillId];\n      this.log(`  + ${skill?.name || skillId}`);\n    }\n    for (const skillId of removedSkills) {\n      const skill = sourceResult.matrix.skills[skillId];\n      this.log(`  - ${skill?.name || skillId}`);\n    }\n    this.log(\"\");\n\n    // Update plugin skills\n    this.log(\"Updating plugin skills...\");\n    try {\n      if (await directoryExists(pluginSkillsDir)) {\n        await remove(pluginSkillsDir);\n      }\n      await ensureDir(pluginSkillsDir);\n\n      await copySkillsToPluginFromSource(\n        result.selectedSkills,\n        pluginDir,\n        sourceResult.matrix,\n        sourceResult,\n      );\n      this.log(\n        `✓ Plugin updated with ${result.selectedSkills.length} skills\\n`,\n      );\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Fetch agent partials\n    let sourcePath: string;\n    this.log(\n      flags[\"agent-source\"]\n        ? \"Fetching agent partials...\"\n        : \"Loading agent partials...\",\n    );\n    try {\n      const agentDefs = await getAgentDefinitions(flags[\"agent-source\"], {\n        forceRefresh: flags.refresh,\n      });\n      sourcePath = agentDefs.sourcePath;\n      this.log(\n        flags[\"agent-source\"]\n          ? \"✓ Agent partials fetched\\n\"\n          : \"✓ Agent partials loaded\\n\",\n      );\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    // Recompile agents\n    this.log(\"Recompiling agents...\");\n    try {\n      const recompileResult = await recompileAgents({\n        pluginDir,\n        sourcePath,\n      });\n\n      if (recompileResult.failed.length > 0) {\n        this.log(\n          `✓ Recompiled ${recompileResult.compiled.length} agents (${recompileResult.failed.length} failed)\\n`,\n        );\n        for (const warning of recompileResult.warnings) {\n          this.warn(warning);\n        }\n      } else if (recompileResult.compiled.length > 0) {\n        this.log(`✓ Recompiled ${recompileResult.compiled.length} agents\\n`);\n      } else {\n        this.log(\"✓ No agents to recompile\\n\");\n      }\n    } catch (error) {\n      this.warn(\n        `Agent recompilation failed: ${error instanceof Error ? error.message : String(error)}`,\n      );\n      this.log(\"You can manually recompile with 'cc compile'.\\n\");\n    }\n\n    // Update plugin version\n    this.log(\"Updating plugin version...\");\n    try {\n      const newVersion = await bumpPluginVersion(pluginDir, \"patch\");\n      this.log(`✓ Version bumped to ${newVersion}\\n`);\n    } catch (error) {\n      this.handleError(error);\n    }\n\n    this.log(\n      `\\n✓ Plugin updated! (${addedSkills.length} added, ${removedSkills.length} removed)\\n`,\n    );\n  }\n}\n"],"mappings":"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","names":["result"]}

package/dist/commands/eject.js

@@ -1,65 +1,53 @@
 #!/usr/bin/env node
 import {
-  getCollectivePluginDir,
-  getPluginSkillsDir
-} from "../chunk-3HBTELJN.js";
+  copySkillsToLocalFlattened
+} from "../chunk-K7EVM5LY.js";
+import "../chunk-KAAEN2PO.js";
 import {
-  DIRS,
-  PROJECT_ROOT
-} from "../chunk-A3J6IAXK.js";
+  loadSkillsMatrixFromSource
+} from "../chunk-CPZOTVCI.js";
+import "../chunk-B7CCVP6Q.js";
+import "../chunk-IMDW5ZUP.js";
 import {
   BaseCommand,
   EXIT_CODES
-} from "../chunk-SYQ7R2JO.js";
-import "../chunk-TOPAIL5W.js";
+} from "../chunk-EHS3TWWP.js";
+import {
+  loadProjectConfig,
+  resolveSource
+} from "../chunk-V46GGCCI.js";
+import "../chunk-3U3R4NCG.js";
 import {
   copy,
   directoryExists,
   ensureDir,
   fileExists,
+  readFile,
   writeFile
-} from "../chunk-MMDXNZPF.js";
+} from "../chunk-TKFPKEV3.js";
+import {
+  CLAUDE_SRC_DIR,
+  DIRS,
+  LOCAL_SKILLS_PATH,
+  PROJECT_ROOT
+} from "../chunk-76DWXGQE.js";
 import {
   init_esm_shims
 } from "../chunk-DHET7RCE.js";
 
-// src/cli-v2/commands/eject.ts
+// src/cli/commands/eject.ts
 init_esm_shims();
 import { Args, Flags } from "@oclif/core";
 import path from "path";
 import os from "os";
-var EJECT_TYPES = ["templates", "config", "skills", "agents", "all"];
-var DEFAULT_CONFIG_CONTENT = `# Claude Collective Configuration
-# Agent-skill mappings for this project
-
-name: my-project
-description: Project description
-
-# Agents to compile
-agents:
-  - web-developer
-  - api-developer
-  - web-tester
-  - web-pm
-
-# Agent-specific skill assignments (optional)
-# If not specified, all available skills are given to all agents
-agent_skills:
-  web-developer:
-    - react
-    - zustand
-    - scss-modules
-  api-developer:
-    - hono
-    - drizzle
-    - better-auth
-`;
+import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
+var EJECT_TYPES = ["agent-partials", "skills", "all"];
 var Eject = class _Eject extends BaseCommand {
-  static summary = "Eject bundled content for local customization";
-  static description = "Copy templates, config, skills, or agent partials to your project for customization";
+  static summary = "Eject skills or agent partials for local customization";
+  static description = "Copy agent partials or skills to your project for customization. Agent partials are always copied from the CLI. Skills are copied from the configured source (public marketplace by default).";
   static args = {
     type: Args.string({
-      description: "What to eject: templates, config, skills, agents, all",
+      description: "What to eject: agent-partials, skills, all",
       required: false,
       options: EJECT_TYPES
     })
@@ -74,6 +62,10 @@ var Eject = class _Eject extends BaseCommand {
     output: Flags.string({
       char: "o",
       description: "Output directory (default: .claude/ in current directory)"
+    }),
+    refresh: Flags.boolean({
+      description: "Force refresh from remote source",
+      default: false
     })
   };
   async run() {
@@ -81,7 +73,7 @@ var Eject = class _Eject extends BaseCommand {
     const projectDir = process.cwd();
     if (!args.type) {
       this.error(
-        "Please specify what to eject: templates, config, skills, agents, or all",
+        "Please specify what to eject: agent-partials, skills, or all",
         { exit: EXIT_CODES.INVALID_ARGS }
       );
     }
@@ -100,7 +92,7 @@ var Eject = class _Eject extends BaseCommand {
         });
       }
     } else {
-      outputBase = path.join(projectDir, ".claude");
+      outputBase = path.join(projectDir, CLAUDE_SRC_DIR);
     }
     this.log("");
     this.log("Claude Collective Eject");
@@ -110,96 +102,187 @@ var Eject = class _Eject extends BaseCommand {
     }
     const ejectType = args.type;
     const directOutput = !!flags.output;
+    let sourceResult;
+    if (ejectType === "skills" || ejectType === "all") {
+      sourceResult = await loadSkillsMatrixFromSource({
+        sourceFlag: flags.source,
+        projectDir,
+        forceRefresh: flags.refresh
+      });
+    }
     switch (ejectType) {
-      case "templates":
-        await this.ejectTemplates(outputBase, flags.force, directOutput);
-        break;
-      case "config":
-        await this.ejectConfig(outputBase, flags.force, directOutput);
+      case "agent-partials":
+        await this.ejectAgentPartials(outputBase, flags.force, directOutput);
         break;
       case "skills":
-        await this.ejectSkills(outputBase, flags.force, directOutput);
-        break;
-      case "agents":
-        await this.ejectAgents(outputBase, flags.force, directOutput);
+        await this.ejectSkills(
+          projectDir,
+          flags.force,
+          directOutput,
+          sourceResult,
+          directOutput ? outputBase : void 0
+        );
         break;
       case "all":
-        await this.ejectTemplates(outputBase, flags.force, directOutput);
-        await this.ejectConfig(outputBase, flags.force, directOutput);
-        await this.ejectSkills(outputBase, flags.force, directOutput);
-        await this.ejectAgents(outputBase, flags.force, directOutput);
+        await this.ejectAgentPartials(outputBase, flags.force, directOutput);
+        await this.ejectSkills(
+          projectDir,
+          flags.force,
+          directOutput,
+          sourceResult,
+          directOutput ? outputBase : void 0
+        );
         break;
     }
+    if (flags.source) {
+      await this.saveSourceToProjectConfig(projectDir, flags.source);
+    }
+    await this.ensureMinimalConfig(projectDir, flags.source, sourceResult);
     this.log("");
     this.logSuccess("Eject complete!");
     this.log("");
   }
-  async ejectTemplates(outputBase, force, directOutput = false) {
-    const sourceDir = path.join(PROJECT_ROOT, DIRS.templates);
-    const destDir = directOutput ? outputBase : path.join(outputBase, "templates");
-    if (await directoryExists(destDir) && !force) {
-      this.warn(
-        `Templates already exist at ${destDir}. Use --force to overwrite.`
-      );
-      return;
+  /**
+   * Save source to project-level .claude-src/config.yaml.
+   * Creates the config file if it doesn't exist, or merges with existing config.
+   */
+  async saveSourceToProjectConfig(projectDir, source) {
+    const configPath = path.join(projectDir, CLAUDE_SRC_DIR, "config.yaml");
+    let config = {};
+    if (await fileExists(configPath)) {
+      const content = await readFile(configPath);
+      config = parseYaml(content) || {};
     }
-    await ensureDir(destDir);
-    await copy(sourceDir, destDir);
-    this.logSuccess(`Templates ejected to ${destDir}`);
-    this.log("You can now customize agent.liquid and partials locally.");
+    config.source = source;
+    await ensureDir(path.join(projectDir, CLAUDE_SRC_DIR));
+    await writeFile(configPath, stringifyYaml(config, { indent: 2 }));
+    this.log(`Source saved to .claude-src/config.yaml`);
   }
-  async ejectConfig(outputBase, force, directOutput = false) {
-    const destPath = path.join(outputBase, "config.yaml");
-    if (await fileExists(destPath) && !force) {
-      this.warn(
-        `Config already exists at ${destPath}. Use --force to overwrite.`
-      );
+  /**
+   * Ensure a minimal config.yaml exists so that `cc compile` can work after eject.
+   * Only creates if config doesn't already exist.
+   * Includes all resolved config values: source, marketplace, author, agents_source.
+   */
+  async ensureMinimalConfig(projectDir, sourceFlag, sourceResult) {
+    const configPath = path.join(projectDir, CLAUDE_SRC_DIR, "config.yaml");
+    if (await fileExists(configPath)) {
       return;
     }
-    await ensureDir(path.dirname(destPath));
-    await writeFile(destPath, DEFAULT_CONFIG_CONTENT);
-    this.logSuccess(`Config template ejected to ${destPath}`);
-    this.log("Customize agent-skill mappings for your project.");
+    const projectName = path.basename(projectDir);
+    const config = {
+      name: projectName,
+      installMode: "local"
+    };
+    const resolvedConfig = sourceResult?.sourceConfig ?? await resolveSource(sourceFlag, projectDir);
+    if (sourceFlag) {
+      config.source = sourceFlag;
+    } else if (resolvedConfig.source) {
+      config.source = resolvedConfig.source;
+    }
+    if (resolvedConfig.marketplace) {
+      config.marketplace = resolvedConfig.marketplace;
+    }
+    const existingProjectConfig = await loadProjectConfig(projectDir);
+    if (existingProjectConfig?.author) {
+      config.author = existingProjectConfig.author;
+    }
+    if (existingProjectConfig?.agents_source) {
+      config.agents_source = existingProjectConfig.agents_source;
+    }
+    await ensureDir(path.join(projectDir, CLAUDE_SRC_DIR));
+    let configContent = stringifyYaml(config, { indent: 2 });
+    const exampleStackComment = `
+# Example stack configuration (uncomment and customize):
+#
+# skills:
+#   - web-framework-react
+#   - web-styling-scss-modules
+#   - api-framework-hono
+#   - api-database-drizzle
+#
+# agents:
+#   - web-developer
+#   - api-developer
+#   - web-reviewer
+#
+# stack:
+#   web-developer:
+#     framework: web-framework-react
+#     styling: web-styling-scss-modules
+#   api-developer:
+#     api: api-framework-hono
+#     database: api-database-drizzle
+`;
+    configContent += exampleStackComment;
+    await writeFile(configPath, configContent);
+    this.logSuccess(`Created ${CLAUDE_SRC_DIR}/config.yaml`);
   }
-  async ejectSkills(outputBase, force, directOutput = false) {
-    const pluginDir = getCollectivePluginDir();
-    const sourceDir = getPluginSkillsDir(pluginDir);
+  /**
+   * Eject agent partials (templates + agent partial files).
+   *
+   * Combines the old templates and agents eject into a single operation:
+   * - Copies `PROJECT_ROOT/src/agents/_templates/` to `<dest>/_templates/`
+   * - Copies agent partials from `PROJECT_ROOT/src/agents/` (excluding `_templates`) to `<dest>/`
+   *
+   * Always copies from CLI's PROJECT_ROOT - the `--source` flag has no effect.
+   */
+  async ejectAgentPartials(outputBase, force, directOutput = false) {
+    const sourceDir = path.join(PROJECT_ROOT, DIRS.agents);
     if (!await directoryExists(sourceDir)) {
-      this.warn("No skills found in installed plugin.");
-      this.log("Install skills with 'cc init' first, then try again.");
+      this.warn("No agent partials found in CLI.");
       return;
     }
-    const destDir = directOutput ? outputBase : path.join(outputBase, "skills");
+    const destDir = directOutput ? outputBase : path.join(outputBase, "agents");
     if (await directoryExists(destDir) && !force) {
       this.warn(
-        `Skills already exist at ${destDir}. Use --force to overwrite.`
+        `Agent partials already exist at ${destDir}. Use --force to overwrite.`
       );
       return;
     }
     await ensureDir(destDir);
     await copy(sourceDir, destDir);
-    this.logSuccess(`Skills ejected to ${destDir}`);
-    this.log("You can now customize skill content locally.");
+    this.logSuccess(`Agent partials ejected to ${destDir}`);
+    this.log(
+      "You can now customize templates, agent intro, workflow, and examples locally."
+    );
   }
-  async ejectAgents(outputBase, force, directOutput = false) {
-    const sourceDir = path.join(PROJECT_ROOT, DIRS.agents);
-    if (!await directoryExists(sourceDir)) {
-      this.warn("No agent partials found.");
-      return;
-    }
-    const destDir = directOutput ? outputBase : path.join(outputBase, "agents", "_partials");
+  /**
+   * Eject skills from the configured source to local .claude/skills/ directory.
+   *
+   * Uses the source resolution system:
+   * - Default: Public marketplace
+   * - `--source /path`: Custom local source
+   * - `--source url`: Custom remote source
+   *
+   * Skills are copied in a flattened structure using their normalized skill IDs.
+   */
+  async ejectSkills(projectDir, force, directOutput = false, sourceResult, customOutputBase) {
+    const destDir = directOutput && customOutputBase ? customOutputBase : path.join(projectDir, LOCAL_SKILLS_PATH);
     if (await directoryExists(destDir) && !force) {
       this.warn(
-        `Agent partials already exist at ${destDir}. Use --force to overwrite.`
+        `Skills already exist at ${destDir}. Use --force to overwrite.`
       );
       return;
     }
+    const skillIds = Object.keys(sourceResult.matrix.skills).filter(
+      (skillId) => !sourceResult.matrix.skills[skillId].local
+    );
+    if (skillIds.length === 0) {
+      this.warn("No skills found in source to eject.");
+      return;
+    }
     await ensureDir(destDir);
-    await copy(sourceDir, destDir);
-    this.logSuccess(`Agent partials ejected to ${destDir}`);
-    this.log(
-      "You can now customize agent intro, workflow, and examples locally."
+    const copiedSkills = await copySkillsToLocalFlattened(
+      skillIds,
+      destDir,
+      sourceResult.matrix,
+      sourceResult
+    );
+    const sourceLabel = sourceResult.isLocal ? sourceResult.sourcePath : sourceResult.marketplace || sourceResult.sourceConfig.source;
+    this.logSuccess(
+      `${copiedSkills.length} skills ejected to ${destDir} from ${sourceLabel}`
     );
+    this.log("You can now customize skill content locally.");
   }
 };
 export {