trellis 3.1.15 → 3.1.19

package/dist/cli/index.js

@@ -5789,115 +5789,147 @@ async function runInit(rootPath, opts = {}) {
   if (isInteractive) {
     console.log(source_default.cyan(`
   Configuring workspace...`));
-    const frameworkChoices = [
-      { name: "React", value: "react" },
-      { name: "Vue", value: "vue" },
-      { name: "Svelte", value: "svelte" },
-      { name: "Next.js", value: "next" },
-      { name: "Nuxt", value: "nuxt" },
-      { name: "Remotion", value: "remotion" },
-      { name: "Expo / React Native", value: "expo" },
-      { name: "Bun runtime", value: "bun" },
-      { name: "Node.js server", value: "node" },
-      { name: "CLI tool", value: "cli" },
-      { name: "Library / Package", value: "library" },
-      { name: "Animation studio", value: "animation" },
-      { name: "Games", value: "games" },
-      { name: "None / Vanilla", value: "none" }
-    ];
-    framework = await dist_default5({
-      message: detectedFramework ? `What type of project are you building? (detected: ${detectedFramework})` : "What type of project are you building?",
-      choices: frameworkChoices,
-      default: opts.framework || detectedFramework || "none"
-    });
-    const ideChoices = [
-      {
-        name: "Cursor",
-        value: "cursor",
-        checked: selectedIdes.includes("cursor") || selectedIdes.length === 0
-      },
-      {
-        name: "Windsurf",
-        value: "windsurf",
-        checked: selectedIdes.includes("windsurf")
-      },
-      {
-        name: "Claude Desktop",
-        value: "claude",
-        checked: selectedIdes.includes("claude")
-      },
-      {
-        name: "VS Code Copilot",
-        value: "copilot",
-        checked: selectedIdes.includes("copilot")
-      },
-      {
-        name: "Google Gemini (Code Assist)",
-        value: "gemini",
-        checked: selectedIdes.includes("gemini")
-      },
-      {
-        name: "OpenAI Codex",
-        value: "codex",
-        checked: selectedIdes.includes("codex")
-      }
-    ];
-    selectedIdes = await dist_default4({
-      message: "Which IDEs/agents do you want to scaffold for?",
-      choices: ideChoices
-    });
-    footprint = await dist_default5({
-      message: "How minimal do you want your workspace?",
-      choices: [
-        { name: "Minimal (just agent rules)", value: "minimal" },
-        { name: "Standard (includes skills + workflows)", value: "standard" },
-        { name: "Full (kitchen sink)", value: "full" }
-      ],
-      default: footprint
-    });
-    plugins = await dist_default4({
-      message: "Select features:",
+    const setupType = await dist_default5({
+      message: "Choose your setup mode:",
       choices: [
         {
-          name: "Sub-projects (monorepo, workspaces)",
-          value: "sub-projects",
-          checked: plugins.includes("sub-projects")
+          name: "\u26A1 Minimal Setup (One-shot setup with detected defaults)",
+          value: "minimal"
         },
-        { name: "P2P Sync", value: "p2p", checked: plugins.includes("p2p") },
         {
-          name: "MCP Server",
-          value: "mcp",
-          checked: plugins.includes("mcp")
+          name: "\uD83D\uDD27 Custom Guided Setup (Customize framework, IDEs, footprint, features)",
+          value: "custom"
+        }
+      ],
+      default: "minimal"
+    });
+    if (setupType === "minimal") {
+      footprint = "minimal";
+      framework = detectedFramework || "none";
+      const ides = [];
+      const envKeys = Object.keys(process.env).join(",").toLowerCase();
+      if (process.env.TERM_PROGRAM === "Windsurf" || envKeys.includes("windsurf")) {
+        ides.push("windsurf");
+      } else if (process.env.TERM_PROGRAM === "vscode" || envKeys.includes("cursor")) {
+        ides.push("cursor");
+      } else {
+        ides.push("cursor", "windsurf");
+      }
+      selectedIdes = ides;
+      plugins = [];
+      console.log(source_default.green(`  \u2713 Detected project type: ${source_default.bold(framework)}`));
+      console.log(source_default.green(`  \u2713 Scaffolding rules for: ${source_default.bold(selectedIdes.join(", "))}`));
+    } else {
+      const frameworkChoices = [
+        { name: "React", value: "react" },
+        { name: "Vue", value: "vue" },
+        { name: "Svelte", value: "svelte" },
+        { name: "Next.js", value: "next" },
+        { name: "Nuxt", value: "nuxt" },
+        { name: "Remotion", value: "remotion" },
+        { name: "Expo / React Native", value: "expo" },
+        { name: "Bun runtime", value: "bun" },
+        { name: "Node.js server", value: "node" },
+        { name: "CLI tool", value: "cli" },
+        { name: "Library / Package", value: "library" },
+        { name: "Animation studio", value: "animation" },
+        { name: "Games", value: "games" },
+        { name: "None / Vanilla", value: "none" }
+      ];
+      framework = await dist_default5({
+        message: detectedFramework ? `What type of project are you building? (detected: ${detectedFramework})` : "What type of project are you building?",
+        choices: frameworkChoices,
+        default: opts.framework || detectedFramework || "none"
+      });
+      const ideChoices = [
+        {
+          name: "Cursor",
+          value: "cursor",
+          checked: selectedIdes.includes("cursor") || selectedIdes.length === 0
         },
         {
-          name: "UI Components",
-          value: "ui-components",
-          checked: plugins.includes("ui-components")
+          name: "Windsurf",
+          value: "windsurf",
+          checked: selectedIdes.includes("windsurf")
         },
         {
-          name: "Media Pipelines",
-          value: "media-pipelines",
-          checked: plugins.includes("media-pipelines")
+          name: "Claude Desktop",
+          value: "claude",
+          checked: selectedIdes.includes("claude")
         },
         {
-          name: "Brand System",
-          value: "brand-system",
-          checked: plugins.includes("brand-system")
+          name: "VS Code Copilot",
+          value: "copilot",
+          checked: selectedIdes.includes("copilot")
         },
         {
-          name: "Agent Memory",
-          value: "agent-memory",
-          checked: plugins.includes("agent-memory")
+          name: "Google Gemini (Code Assist)",
+          value: "gemini",
+          checked: selectedIdes.includes("gemini")
         },
         {
-          name: "Workflows",
-          value: "workflows",
-          checked: plugins.includes("workflows") || footprint !== "minimal"
+          name: "OpenAI Codex",
+          value: "codex",
+          checked: selectedIdes.includes("codex")
         }
-      ]
-    });
-    if (plugins.includes("sub-projects") && !plugins.includes("workflows")) {
-      plugins.push("workflows");
+      ];
+      selectedIdes = await dist_default4({
+        message: "Which IDEs/agents do you want to scaffold for?",
+        choices: ideChoices
+      });
+      footprint = await dist_default5({
+        message: "How minimal do you want your workspace?",
+        choices: [
+          { name: "Minimal (just agent rules)", value: "minimal" },
+          { name: "Standard (includes skills + workflows)", value: "standard" },
+          { name: "Full (kitchen sink)", value: "full" }
+        ],
+        default: footprint
+      });
+      plugins = await dist_default4({
+        message: "Select features:",
+        choices: [
+          {
+            name: "Sub-projects (monorepo, workspaces)",
+            value: "sub-projects",
+            checked: plugins.includes("sub-projects")
+          },
+          { name: "P2P Sync", value: "p2p", checked: plugins.includes("p2p") },
+          {
+            name: "MCP Server",
+            value: "mcp",
+            checked: plugins.includes("mcp")
+          },
+          {
+            name: "UI Components",
+            value: "ui-components",
+            checked: plugins.includes("ui-components")
+          },
+          {
+            name: "Media Pipelines",
+            value: "media-pipelines",
+            checked: plugins.includes("media-pipelines")
+          },
+          {
+            name: "Brand System",
+            value: "brand-system",
+            checked: plugins.includes("brand-system")
+          },
+          {
+            name: "Agent Memory",
+            value: "agent-memory",
+            checked: plugins.includes("agent-memory")
+          },
+          {
+            name: "Workflows",
+            value: "workflows",
+            checked: plugins.includes("workflows") || footprint !== "minimal"
+          }
+        ]
+      });
+      if (plugins.includes("sub-projects") && !plugins.includes("workflows")) {
+        plugins.push("workflows");
+      }
     }
   }
   const engine = new TrellisVcsEngine({ rootPath });
@@ -8589,7 +8621,16 @@ program2.command("code").alias("ide").description('Launch OpenCode in "Harness"
   let mcpProcess = null;
   if (opts.web) {
     console.log(source_default.dim(`   Starting MCP server on port ${mcpPort}\u2026`));
-    mcpProcess = spawn("bun", ["run", mcp, "--quiet", "--path", rootPath, "--http", "--port", String(mcpPort)], {
+    mcpProcess = spawn("bun", [
+      "run",
+      mcp,
+      "--quiet",
+      "--path",
+      rootPath,
+      "--http",
+      "--port",
+      String(mcpPort)
+    ], {
       stdio: ["pipe", "pipe", "pipe"],
       detached: false
     });
@@ -8810,4 +8851,28 @@ cmsCmd.command("register-library <pkg>").description("Register a Svelte 5 compon
     process.exit(1);
   }
 });
+program2.command("skills").description("Install Trellis agent skills using the skills CLI (npx skills)").argument("[args...]", "Additional arguments to pass to the skills CLI").allowUnknownOption().action(async () => {
+  const skillsIndex = process.argv.indexOf("skills");
+  const extraArgs = skillsIndex !== -1 ? process.argv.slice(skillsIndex + 1) : [];
+  const { spawnSync } = await import("child_process");
+  const skillsArgs = ["skills", "add", "trentbrew/trellis", ...extraArgs];
+  console.log(source_default.cyan("  Installing Trellis agent skills..."));
+  console.log(source_default.dim(`  Running: npx ${skillsArgs.join(" ")}
+`));
+  if (process.env.TRELLIS_CLI_DRY_RUN === "1") {
+    return;
+  }
+  const result = spawnSync("npx", skillsArgs, {
+    stdio: "inherit",
+    shell: true
+  });
+  if (result.error) {
+    console.error(source_default.red(`
+\u2717 Failed to run skills CLI: ${result.error.message}`));
+    process.exit(1);
+  }
+  if (result.status !== 0) {
+    process.exit(result.status ?? 1);
+  }
+});
 program2.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trellis",
-  "version": "3.1.15",
+  "version": "3.1.19",
   "description": "Agentic State Engine — event-sourced causal graph with branching, decision traces, and realtime sync for AI-native applications",
   "type": "module",
   "main": "./dist/index.js",