cc-mirror 1.1.2 → 1.1.5

package/dist/cc-mirror.mjs

@@ -179,8 +179,8 @@ var runTui = async () => {
 };
 
 // src/core/index.ts
-import fs13 from "node:fs";
-import path22 from "node:path";
+import fs14 from "node:fs";
+import path23 from "node:path";
 
 // src/core/constants.ts
 import os from "node:os";
@@ -731,6 +731,15 @@ var getUserLabel = () => {
 var formatUserMessage = (label) => ` [${label}] {} `;
 
 // src/brands/zai.ts
+var ZAI_BLOCKED_TOOLS = [
+  // Server-injected MCP tools (Z.ai injects these, we block them)
+  "mcp__4_5v_mcp__analyze_image",
+  "mcp__milk_tea_server__claim_milk_tea_coupon",
+  "mcp__web_reader__webReader",
+  // Builtin tools that should use zai-cli instead
+  "WebSearch",
+  "WebFetch"
+];
 var clamp = (value) => Math.max(0, Math.min(255, Math.round(value)));
 var hexToRgb = (hex) => {
   const normalized = hex.replace("#", "").trim();
@@ -912,7 +921,8 @@ var buildZaiTweakccConfig = () => ({
     toolsets: [
       {
         name: "zai",
-        allowedTools: "*"
+        allowedTools: "*",
+        blockedTools: ZAI_BLOCKED_TOOLS
       }
     ],
     defaultToolset: "zai",
@@ -921,6 +931,10 @@ var buildZaiTweakccConfig = () => ({
 });
 
 // src/brands/minimax.ts
+var MINIMAX_BLOCKED_TOOLS = [
+  // WebSearch should use mcp__MiniMax__web_search instead
+  "WebSearch"
+];
 var clamp2 = (value) => Math.max(0, Math.min(255, Math.round(value)));
 var hexToRgb2 = (hex) => {
   const normalized = hex.replace("#", "").trim();
@@ -1101,7 +1115,8 @@ var buildMinimaxTweakccConfig = () => ({
     toolsets: [
       {
         name: "minimax",
-        allowedTools: "*"
+        allowedTools: "*",
+        blockedTools: MINIMAX_BLOCKED_TOOLS
       }
     ],
     defaultToolset: "minimax",
@@ -1960,7 +1975,7 @@ var listVariants = (rootDir) => {
 };
 
 // src/core/variant-builder/VariantBuilder.ts
-import path16 from "node:path";
+import path17 from "node:path";
 
 // src/providers/index.ts
 var DEFAULT_TIMEOUT_MS = "3000000";
@@ -2290,8 +2305,8 @@ var InstallNpmStep = class {
 };
 
 // src/core/variant-builder/steps/TeamModeStep.ts
-import fs7 from "node:fs";
-import path8 from "node:path";
+import fs8 from "node:fs";
+import path9 from "node:path";
 
 // src/core/skills.ts
 import fs6 from "node:fs";
@@ -2384,7 +2399,7 @@ var ensureDevBrowserSkill = (opts) => {
     fs6.rmSync(tmpDir, { recursive: true, force: true });
   }
 };
-var ORCHESTRATOR_SKILL_NAME = "multi-agent-orchestrator";
+var ORCHESTRATOR_SKILL_NAME = "orchestration";
 var findBundledSkillDir = () => {
   const thisFile = fileURLToPath2(import.meta.url);
   const thisDir = path7.dirname(thisFile);
@@ -2515,6 +2530,69 @@ var ensureDevBrowserSkillAsync = async (opts) => {
   }
 };
 
+// src/team-pack/index.ts
+import fs7 from "node:fs";
+import path8 from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
+var __dirname = path8.dirname(fileURLToPath3(import.meta.url));
+var TEAM_PACK_FILES = [
+  { source: "tasklist.md", target: "tool-description-tasklist.md" },
+  { source: "taskupdate.md", target: "tool-description-taskupdate.md" },
+  { source: "task-extra-notes.md", target: "agent-prompt-task-tool-extra-notes.md" },
+  { source: "task-management-note.md", target: "system-prompt-task-management-note.md" },
+  { source: "orchestration-skill.md", target: "system-prompt-orchestration-skill.md" },
+  { source: "skill-tool-override.md", target: "tool-description-skill.md" }
+];
+var copyTeamPackPrompts = (systemPromptsDir) => {
+  const copied = [];
+  if (!fs7.existsSync(systemPromptsDir)) {
+    fs7.mkdirSync(systemPromptsDir, { recursive: true });
+  }
+  for (const file of TEAM_PACK_FILES) {
+    const sourcePath = path8.join(__dirname, file.source);
+    const targetPath = path8.join(systemPromptsDir, file.target);
+    if (fs7.existsSync(sourcePath)) {
+      fs7.copyFileSync(sourcePath, targetPath);
+      copied.push(file.target);
+    }
+  }
+  return copied;
+};
+var configureTeamToolset = (configPath) => {
+  if (!fs7.existsSync(configPath)) {
+    return false;
+  }
+  try {
+    const config = JSON.parse(fs7.readFileSync(configPath, "utf8"));
+    config.settings = config.settings || {};
+    const toolsets = Array.isArray(config.settings.toolsets) ? config.settings.toolsets : [];
+    const defaultToolsetName = config.settings.defaultToolset;
+    const existingDefaultToolset = toolsets.find(
+      (t) => t.name === defaultToolsetName
+    );
+    const existingBlockedTools = existingDefaultToolset?.blockedTools || [];
+    const mergedBlockedTools = [.../* @__PURE__ */ new Set([...existingBlockedTools, "TodoWrite"])];
+    const teamToolset = {
+      name: "team",
+      allowedTools: "*",
+      blockedTools: mergedBlockedTools
+    };
+    const existingTeamIndex = toolsets.findIndex((t) => t.name === "team");
+    if (existingTeamIndex >= 0) {
+      toolsets[existingTeamIndex] = teamToolset;
+    } else {
+      toolsets.push(teamToolset);
+    }
+    config.settings.toolsets = toolsets;
+    config.settings.defaultToolset = "team";
+    config.settings.planModeToolset = "team";
+    fs7.writeFileSync(configPath, JSON.stringify(config, null, 2));
+    return true;
+  } catch {
+    return false;
+  }
+};
+
 // src/core/variant-builder/steps/TeamModeStep.ts
 var TEAM_MODE_DISABLED = "function sU(){return!1}";
 var TEAM_MODE_ENABLED = "function sU(){return!0}";
@@ -2535,16 +2613,16 @@ var TeamModeStep = class {
   }
   patchCli(ctx) {
     const { state, params, paths } = ctx;
-    const cliPath = path8.join(paths.npmDir, "node_modules", "@anthropic-ai", "claude-code", "cli.js");
+    const cliPath = path9.join(paths.npmDir, "node_modules", "@anthropic-ai", "claude-code", "cli.js");
     const backupPath = `${cliPath}.backup`;
-    if (!fs7.existsSync(cliPath)) {
+    if (!fs8.existsSync(cliPath)) {
       state.notes.push("Warning: cli.js not found, skipping team mode patch");
       return;
     }
-    if (!fs7.existsSync(backupPath)) {
-      fs7.copyFileSync(cliPath, backupPath);
+    if (!fs8.existsSync(backupPath)) {
+      fs8.copyFileSync(cliPath, backupPath);
     }
-    let content = fs7.readFileSync(cliPath, "utf8");
+    let content = fs8.readFileSync(cliPath, "utf8");
     if (content.includes(TEAM_MODE_ENABLED)) {
       state.notes.push("Team mode already enabled");
       return;
@@ -2554,16 +2632,16 @@ var TeamModeStep = class {
       return;
     }
     content = content.replace(TEAM_MODE_DISABLED, TEAM_MODE_ENABLED);
-    fs7.writeFileSync(cliPath, content);
-    const verifyContent = fs7.readFileSync(cliPath, "utf8");
+    fs8.writeFileSync(cliPath, content);
+    const verifyContent = fs8.readFileSync(cliPath, "utf8");
     if (!verifyContent.includes(TEAM_MODE_ENABLED)) {
       state.notes.push("Warning: Team mode patch verification failed");
       return;
     }
-    const settingsPath = path8.join(paths.configDir, "settings.json");
-    if (fs7.existsSync(settingsPath)) {
+    const settingsPath = path9.join(paths.configDir, "settings.json");
+    if (fs8.existsSync(settingsPath)) {
       try {
-        const settings = JSON.parse(fs7.readFileSync(settingsPath, "utf8"));
+        const settings = JSON.parse(fs8.readFileSync(settingsPath, "utf8"));
         settings.env = settings.env || {};
         if (!settings.env.CLAUDE_CODE_TEAM_NAME) {
           settings.env.CLAUDE_CODE_TEAM_NAME = params.name;
@@ -2571,7 +2649,12 @@ var TeamModeStep = class {
         if (!settings.env.CLAUDE_CODE_AGENT_TYPE) {
           settings.env.CLAUDE_CODE_AGENT_TYPE = "team-lead";
         }
-        fs7.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+        settings.permissions = settings.permissions || {};
+        settings.permissions.allow = settings.permissions.allow || [];
+        if (!settings.permissions.allow.includes("Skill(orchestration)")) {
+          settings.permissions.allow.push("Skill(orchestration)");
+        }
+        fs8.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
       } catch {
         state.notes.push("Warning: Could not update settings.json with team env vars");
       }
@@ -2583,15 +2666,24 @@ var TeamModeStep = class {
     } else if (skillResult.status === "failed") {
       state.notes.push(`Warning: orchestrator skill install failed: ${skillResult.message}`);
     }
+    const systemPromptsDir = path9.join(paths.tweakDir, "system-prompts");
+    const copiedFiles = copyTeamPackPrompts(systemPromptsDir);
+    if (copiedFiles.length > 0) {
+      state.notes.push(`Team pack prompts installed (${copiedFiles.join(", ")})`);
+    }
+    const tweakccConfigPath = path9.join(paths.tweakDir, "config.json");
+    if (configureTeamToolset(tweakccConfigPath)) {
+      state.notes.push("Team toolset configured (TodoWrite blocked)");
+    }
   }
 };
 
 // src/core/variant-builder/steps/WriteConfigStep.ts
-import path10 from "node:path";
+import path11 from "node:path";
 
 // src/core/claude-config.ts
-import fs8 from "node:fs";
-import path9 from "node:path";
+import fs9 from "node:fs";
+import path10 from "node:path";
 var SETTINGS_FILE = "settings.json";
 var CLAUDE_CONFIG_FILE = ".claude.json";
 var PLACEHOLDER_KEY = "<API_KEY>";
@@ -2602,7 +2694,7 @@ var toStringOrNull = (value) => {
   return trimmed;
 };
 var readSettingsApiKey = (configDir) => {
-  const settingsPath = path9.join(configDir, SETTINGS_FILE);
+  const settingsPath = path10.join(configDir, SETTINGS_FILE);
   const settings = readJson(settingsPath);
   if (!settings?.env) return null;
   const env = settings.env;
@@ -2614,7 +2706,7 @@ var ZAI_DENY_TOOLS = [
   "mcp__web_reader__webReader"
 ];
 var ensureZaiMcpDeny = (configDir) => {
-  const settingsPath = path9.join(configDir, SETTINGS_FILE);
+  const settingsPath = path10.join(configDir, SETTINGS_FILE);
   const existing = readJson(settingsPath) || {};
   const permissions = existing.permissions || {};
   const deny = Array.isArray(permissions.deny) ? [...permissions.deny] : [];
@@ -2637,7 +2729,7 @@ var ensureZaiMcpDeny = (configDir) => {
   return true;
 };
 var ensureSettingsEnvDefaults = (configDir, defaults) => {
-  const settingsPath = path9.join(configDir, SETTINGS_FILE);
+  const settingsPath = path10.join(configDir, SETTINGS_FILE);
   const existing = readJson(settingsPath) || {};
   const env = { ...existing.env ?? {} };
   let changed = false;
@@ -2652,7 +2744,7 @@ var ensureSettingsEnvDefaults = (configDir, defaults) => {
   return true;
 };
 var ensureSettingsEnvOverrides = (configDir, overrides) => {
-  const settingsPath = path9.join(configDir, SETTINGS_FILE);
+  const settingsPath = path10.join(configDir, SETTINGS_FILE);
   const existing = readJson(settingsPath) || {};
   const env = { ...existing.env ?? {} };
   let changed = false;
@@ -2671,8 +2763,8 @@ var ensureApiKeyApproval = (configDir, apiKey) => {
   const resolvedKey = toStringOrNull(apiKey) || readSettingsApiKey(configDir);
   if (!resolvedKey) return false;
   const approvedToken = resolvedKey.slice(-20);
-  const configPath = path9.join(configDir, CLAUDE_CONFIG_FILE);
-  const exists = fs8.existsSync(configPath);
+  const configPath = path10.join(configDir, CLAUDE_CONFIG_FILE);
+  const exists = fs9.existsSync(configPath);
   let config = null;
   if (exists) {
     config = readJson(configPath);
@@ -2696,8 +2788,8 @@ var ensureApiKeyApproval = (configDir, apiKey) => {
   return true;
 };
 var ensureOnboardingState = (configDir, opts = {}) => {
-  const configPath = path9.join(configDir, CLAUDE_CONFIG_FILE);
-  const exists = fs8.existsSync(configPath);
+  const configPath = path10.join(configDir, CLAUDE_CONFIG_FILE);
+  const exists = fs9.existsSync(configPath);
   let config = null;
   if (exists) {
     config = readJson(configPath);
@@ -2731,8 +2823,8 @@ var ensureOnboardingState = (configDir, opts = {}) => {
 };
 var ensureMinimaxMcpServer = (configDir, apiKey) => {
   const resolvedKey = toStringOrNull(apiKey) || readSettingsApiKey(configDir);
-  const configPath = path9.join(configDir, CLAUDE_CONFIG_FILE);
-  const exists = fs8.existsSync(configPath);
+  const configPath = path10.join(configDir, CLAUDE_CONFIG_FILE);
+  const exists = fs9.existsSync(configPath);
   let config = null;
   if (exists) {
     config = readJson(configPath);
@@ -2789,7 +2881,7 @@ var WriteConfigStep = class {
       env.ANTHROPIC_API_KEY = "<API_KEY>";
     }
     const config = { env };
-    writeJson(path10.join(paths.configDir, "settings.json"), config);
+    writeJson(path11.join(paths.configDir, "settings.json"), config);
     state.env = env;
     state.resolvedApiKey = typeof env.ANTHROPIC_API_KEY === "string" ? env.ANTHROPIC_API_KEY : void 0;
     ensureApiKeyApproval(paths.configDir, state.resolvedApiKey);
@@ -2855,14 +2947,14 @@ var BrandThemeStep = class {
       }
     }
     if (params.noTweak && prefs.promptPackPreference) {
-      state.notes.push(`Prompt pack skipped (tweakcc disabled, ${prefs.promptPackModePreference}).`);
+      state.notes.push("Prompt pack skipped (tweakcc disabled).");
     }
   }
 };
 
 // src/core/prompt-pack.ts
-import fs9 from "node:fs";
-import path11 from "node:path";
+import fs10 from "node:fs";
+import path12 from "node:path";
 
 // src/core/prompt-pack/sanitize.ts
 var BACKTICK_REGEX = /`/g;
@@ -2884,12 +2976,11 @@ var verbositySpec = `
   What changed, Where, How to verify, Risks, Next steps, Open questions.
 </output_verbosity_spec>
 `.trim();
-var operatingSpec = (mode) => `
+var operatingSpec = () => `
 <system_reminder>
 - Operate like an ambitious, senior engineer: proactive, high-ownership, and precise.
 - Prefer concrete outputs: commands, file paths, diffs, and validation steps.
 - Respect permissions and confirm before destructive actions.
-${mode === "maximal" ? "- Parallelize independent work with Task/subagents when useful." : ""}
 </system_reminder>
 `.trim();
 var subjectiveWorkSpec = `
@@ -2900,6 +2991,13 @@ var subjectiveWorkSpec = `
 - When you catch yourself making assumptions about subjective quality, pause and ask instead.
 </subjective_work_guardrails>
 `.trim();
+var skillClarificationSpec = `
+<skill_clarification>
+The examples in the Skill tool description (commit, review-pr, pdf) are illustrative only.
+IMPORTANT: Only skills listed in <available_skills> are actually installed in this variant.
+If a user asks for a skill not in <available_skills>, inform them it's not installed.
+</skill_clarification>
+`.trim();
 
 // src/core/prompt-pack/providers/zai.ts
 var ZAI_BLOCKED_MCP_TOOLS = [
@@ -2923,7 +3021,7 @@ Quick start examples:
 - npx zai-cli repo search facebook/react "server components"
 - npx zai-cli repo --help
 `.trim();
-var buildZaiContract = (mode) => `
+var buildZaiContract = () => `
 <explicit_guidance>
 Provider: z.ai (GLM)
 
@@ -2968,7 +3066,7 @@ Blocked tools:
 ${ZAI_BLOCKED_MCP_TOOLS.map((tool) => `- ${tool}`).join("\n")}
 </warning>
 
-${operatingSpec(mode)}
+${operatingSpec()}
 
 ${subjectiveWorkSpec}
 
@@ -2986,8 +3084,8 @@ ${ZAI_BLOCKED_MCP_TOOLS.map((tool) => `- ${tool}`).join("\n")}
 
 ${subjectiveWorkSpec}
 `.trim();
-var buildZaiOverlays = (mode) => ({
-  main: buildZaiContract(mode),
+var buildZaiOverlays = () => ({
+  main: buildZaiContract(),
   mcpCli: `
 ${buildZaiExcerpt()}
 
@@ -3048,13 +3146,14 @@ ${ZAI_BLOCKED_MCP_TOOLS.map((tool) => `- ${tool}`).join("\n")}
 <explicit_guidance>
 Prefer zai-cli via Bash for web/search/vision. Only use other MCP tools if the user explicitly configured them and they are clearly relevant.
 </explicit_guidance>
-  `.trim()
+  `.trim(),
+  skill: skillClarificationSpec
 });
 
 // src/core/prompt-pack/providers/minimax.ts
 var MINIMAX_WEB_SEARCH = "mcp__MiniMax__web_search";
 var MINIMAX_UNDERSTAND_IMAGE = "mcp__MiniMax__understand_image";
-var buildMinimaxContract = (mode) => `
+var buildMinimaxContract = () => `
 <explicit_guidance>
 <tool_routing priority="critical">
 MiniMax MCP tools available (and ONLY these for web + vision):
@@ -3086,7 +3185,7 @@ Single-page URL retrieval:
 - Do NOT misuse web_search to fetch full page content.
 </tool_routing>
 
-${operatingSpec(mode)}
+${operatingSpec()}
 
 ${subjectiveWorkSpec}
 
@@ -3104,8 +3203,8 @@ MiniMax tool routing:
 
 ${subjectiveWorkSpec}
 `.trim();
-var buildMinimaxOverlays = (mode) => ({
-  main: buildMinimaxContract(mode),
+var buildMinimaxOverlays = () => ({
+  main: buildMinimaxContract(),
   mcpCli: `
 ${buildMinimaxExcerpt()}
 
@@ -3143,83 +3242,18 @@ MiniMax MCP tools:
 You MUST load the tool first:
 - MCPSearch query: select:${MINIMAX_WEB_SEARCH} or select:${MINIMAX_UNDERSTAND_IMAGE}
 </explicit_guidance>
-  `.trim()
+  `.trim(),
+  skill: skillClarificationSpec
 });
 
 // src/core/prompt-pack/overlays.ts
-var mergeOverlays = (base, extra) => ({
-  ...base,
-  ...Object.fromEntries(Object.entries(extra).filter(([, value]) => value && value.trim().length > 0))
-});
-var buildProviderExcerpt = (provider) => provider === "zai" ? buildZaiExcerpt() : buildMinimaxExcerpt();
-var buildMaximalOverlays = (provider) => ({
-  explore: `
-<system_reminder>
-- You are in Explore mode: go wide before deep.
-- Use tools early to validate assumptions and reduce guesswork.
-- Output: Findings (bullets), Risks/unknowns, Next steps.
-</system_reminder>
-
-${buildProviderExcerpt(provider)}
-  `.trim(),
-  planEnhanced: `
-<system_reminder>
-- Provide 2-3 viable options with tradeoffs.
-- Include risks, unknowns, and a validation checklist.
-- Output structure: Overview, Options, Recommendation, Steps, Verification, Risks.
-</system_reminder>
-
-${buildProviderExcerpt(provider)}
-  `.trim(),
-  planReminder: `
-<system_reminder>
-- In Plan Mode: surface options, tradeoffs, risks, and validation steps explicitly.
-</system_reminder>
-  `.trim(),
-  planReminderSub: `
-<system_reminder>
-- In Plan Mode (subagents): surface options, tradeoffs, risks, and validation steps explicitly.
-</system_reminder>
-  `.trim(),
-  taskTool: `
-Maximal mode: use Task to parallelize independent research/debugging and to keep the main thread focused.
-  `.trim(),
-  enterPlan: `
-Maximal mode: enter Plan Mode early for ambiguous, multi-step, or high-risk tasks.
-  `.trim(),
-  exitPlan: `
-Maximal mode: return a crisp plan with options, checkpoints, verification, and rollback considerations.
-  `.trim(),
-  skill: `
-Maximal mode: use Skills when they provide sharper domain knowledge or integrations; otherwise proceed normally.
-  `.trim(),
-  conversationSummary: `
-<system_reminder>
-- Capture decisions, constraints, open questions, and next steps.
-- Preserve critical commands, configs, and file paths.
-</system_reminder>
-  `.trim(),
-  conversationSummaryExtended: `
-<system_reminder>
-- Capture decisions, constraints, open questions, and next steps.
-- Preserve critical commands, configs, and file paths.
-</system_reminder>
-  `.trim(),
-  webfetchSummary: `
-<system_reminder>
-- Extract key facts, titles, and constraints.
-- Preserve URLs and important context verbatim.
-</system_reminder>
-  `.trim()
-});
-var buildProviderOverlays = (provider, mode) => {
-  if (provider === "zai") return buildZaiOverlays(mode);
-  return buildMinimaxOverlays(mode);
+var buildProviderOverlays = (provider) => {
+  if (provider === "zai") return buildZaiOverlays();
+  return buildMinimaxOverlays();
 };
-var resolveOverlays = (provider, mode) => {
-  const base = buildProviderOverlays(provider, mode);
-  const overlays = mode === "maximal" ? mergeOverlays(base, buildMaximalOverlays(provider)) : base;
-  return sanitizeOverlayMap(overlays);
+var resolveOverlays = (provider) => {
+  const base = buildProviderOverlays(provider);
+  return sanitizeOverlayMap(base);
 };
 
 // src/core/prompt-pack/targets.ts
@@ -3277,17 +3311,17 @@ ${block}
 };
 var updatePromptFile = (filePath, overlay) => {
   if (!overlay) return false;
-  if (!fs9.existsSync(filePath)) return false;
-  const content = fs9.readFileSync(filePath, "utf8");
+  if (!fs10.existsSync(filePath)) return false;
+  const content = fs10.readFileSync(filePath, "utf8");
   const updated = insertOverlay(content, overlay);
   if (updated === content) return false;
-  fs9.writeFileSync(filePath, updated);
+  fs10.writeFileSync(filePath, updated);
   return true;
 };
 var applyOverlays = (systemPromptsDir, overlays) => {
   const updated = [];
   for (const target of PROMPT_PACK_TARGETS) {
-    const filePath = path11.join(systemPromptsDir, target.filename);
+    const filePath = path12.join(systemPromptsDir, target.filename);
     const overlay = overlays[target.key];
     if (updatePromptFile(filePath, overlay)) {
       updated.push(target.filename);
@@ -3295,14 +3329,14 @@ var applyOverlays = (systemPromptsDir, overlays) => {
   }
   return updated;
 };
-var applyPromptPack = (tweakDir, providerKey, mode = "minimal") => {
+var applyPromptPack = (tweakDir, providerKey) => {
   if (!isPromptPackKey(providerKey)) {
-    return { changed: false, updated: [], mode };
+    return { changed: false, updated: [] };
   }
-  const overlays = resolveOverlays(providerKey, mode);
-  const systemPromptsDir = path11.join(tweakDir, "system-prompts");
+  const overlays = resolveOverlays(providerKey);
+  const systemPromptsDir = path12.join(tweakDir, "system-prompts");
   const updated = applyOverlays(systemPromptsDir, overlays);
-  return { changed: updated.length > 0, updated, mode };
+  return { changed: updated.length > 0, updated };
 };
 
 // src/core/variant-builder/steps/TweakccStep.ts
@@ -3321,10 +3355,10 @@ ${state.tweakResult.stdout ?? ""}`.trim();
       throw new Error(formatTweakccFailure(output));
     }
     if (prefs.promptPackEnabled) {
-      ctx.report(`Applying prompt pack (${prefs.promptPackModePreference})...`);
-      const packResult = applyPromptPack(paths.tweakDir, params.providerKey, prefs.promptPackModePreference);
+      ctx.report("Applying prompt pack...");
+      const packResult = applyPromptPack(paths.tweakDir, params.providerKey);
       if (packResult.changed) {
-        state.notes.push(`Prompt pack applied (${packResult.mode}, ${packResult.updated.join(", ")})`);
+        state.notes.push(`Prompt pack applied (${packResult.updated.join(", ")})`);
         ctx.report("Re-applying tweakcc...");
         const reapply = runTweakcc(paths.tweakDir, state.binaryPath, prefs.commandStdio);
         state.tweakResult = reapply;
@@ -3349,10 +3383,10 @@ ${state.tweakResult.stdout ?? ""}`.trim();
       throw new Error(formatTweakccFailure(output));
     }
     if (prefs.promptPackEnabled) {
-      await ctx.report(`Applying prompt pack (${prefs.promptPackModePreference})...`);
-      const packResult = applyPromptPack(paths.tweakDir, params.providerKey, prefs.promptPackModePreference);
+      await ctx.report("Applying prompt pack...");
+      const packResult = applyPromptPack(paths.tweakDir, params.providerKey);
       if (packResult.changed) {
-        state.notes.push(`Prompt pack applied (${packResult.mode}, ${packResult.updated.join(", ")})`);
+        state.notes.push(`Prompt pack applied (${packResult.updated.join(", ")})`);
         await ctx.report("Re-applying tweakcc...");
         const reapply = await runTweakccAsync(paths.tweakDir, state.binaryPath, prefs.commandStdio);
         state.tweakResult = reapply;
@@ -3367,10 +3401,10 @@ ${reapply.stdout ?? ""}`.trim();
 };
 
 // src/core/wrapper.ts
-import fs10 from "node:fs";
-import path12 from "node:path";
+import fs11 from "node:fs";
+import path13 from "node:path";
 var writeWrapper = (wrapperPath, configDir, binaryPath, runtime = "node") => {
-  const tweakDir = path12.join(path12.dirname(configDir), "tweakcc");
+  const tweakDir = path13.join(path13.dirname(configDir), "tweakcc");
   const execLine = runtime === "node" ? `exec node "${binaryPath}" "$@"` : `exec "${binaryPath}" "$@"`;
   const envLoader = [
     "if command -v node >/dev/null 2>&1; then",
@@ -3585,7 +3619,7 @@ var writeWrapper = (wrapperPath, configDir, binaryPath, runtime = "node") => {
     execLine,
     ""
   ].join("\n");
-  fs10.writeFileSync(wrapperPath, content, { mode: 493 });
+  fs11.writeFileSync(wrapperPath, content, { mode: 493 });
 };
 
 // src/core/variant-builder/steps/WrapperStep.ts
@@ -3602,9 +3636,9 @@ var WrapperStep = class {
 };
 
 // src/core/shell-env.ts
-import fs11 from "node:fs";
+import fs12 from "node:fs";
 import os5 from "node:os";
-import path13 from "node:path";
+import path14 from "node:path";
 var SETTINGS_FILE2 = "settings.json";
 var BLOCK_START = "# cc-mirror: Z.ai env start";
 var BLOCK_END = "# cc-mirror: Z.ai env end";
@@ -3618,20 +3652,20 @@ var normalizeApiKey = (value) => {
 var resolveShellProfile = () => {
   const home = os5.homedir();
   const shell = process.env.SHELL || "";
-  const name = path13.basename(shell);
+  const name = path14.basename(shell);
   if (name === "zsh") {
-    return path13.join(home, ".zshrc");
+    return path14.join(home, ".zshrc");
   }
   if (name === "bash") {
-    const bashrc = path13.join(home, ".bashrc");
-    if (fs11.existsSync(bashrc)) return bashrc;
-    return path13.join(home, ".bash_profile");
+    const bashrc = path14.join(home, ".bashrc");
+    if (fs12.existsSync(bashrc)) return bashrc;
+    return path14.join(home, ".bash_profile");
   }
   return null;
 };
 var readSettingsApiKey2 = (configDir) => {
-  const settingsPath = path13.join(configDir, SETTINGS_FILE2);
-  if (!fs11.existsSync(settingsPath)) return null;
+  const settingsPath = path14.join(configDir, SETTINGS_FILE2);
+  if (!fs12.existsSync(settingsPath)) return null;
   const settings = readJson(settingsPath);
   const key = settings?.env?.ANTHROPIC_API_KEY;
   if (typeof key !== "string") return null;
@@ -3686,7 +3720,7 @@ var ensureZaiShellEnv = (opts) => {
   if (!profile) {
     return { status: "failed", message: "Unsupported shell; set Z_AI_API_KEY manually" };
   }
-  const existing = fs11.existsSync(profile) ? fs11.readFileSync(profile, "utf8") : "";
+  const existing = fs12.existsSync(profile) ? fs12.readFileSync(profile, "utf8") : "";
   if (hasZaiKeyInProfile(existing)) {
     return { status: "skipped", message: "Z_AI_API_KEY already set in shell profile", path: profile };
   }
@@ -3694,7 +3728,7 @@ var ensureZaiShellEnv = (opts) => {
   if (next === existing) {
     return { status: "skipped", message: "Shell profile already up to date", path: profile };
   }
-  fs11.writeFileSync(profile, next);
+  fs12.writeFileSync(profile, next);
   return { status: "updated", path: profile, message: `Run: source ${profile}` };
 };
 
@@ -3733,7 +3767,7 @@ var ShellEnvStep = class {
 };
 
 // src/core/variant-builder/steps/SkillInstallStep.ts
-import path14 from "node:path";
+import path15 from "node:path";
 var SkillInstallStep = class {
   name = "SkillInstall";
   execute(ctx) {
@@ -3745,7 +3779,7 @@ var SkillInstallStep = class {
     const skillResult = ensureDevBrowserSkill({
       install: true,
       update: prefs.skillUpdateEnabled,
-      targetDir: path14.join(paths.configDir, "skills")
+      targetDir: path15.join(paths.configDir, "skills")
     });
     if (skillResult.status === "failed") {
       state.notes.push(`dev-browser skill install failed: ${skillResult.message || "unknown error"}`);
@@ -3762,7 +3796,7 @@ var SkillInstallStep = class {
     const skillResult = await ensureDevBrowserSkillAsync({
       install: true,
       update: prefs.skillUpdateEnabled,
-      targetDir: path14.join(paths.configDir, "skills")
+      targetDir: path15.join(paths.configDir, "skills")
     });
     if (skillResult.status === "failed") {
       state.notes.push(`dev-browser skill install failed: ${skillResult.message || "unknown error"}`);
@@ -3773,7 +3807,7 @@ var SkillInstallStep = class {
 };
 
 // src/core/variant-builder/steps/FinalizeStep.ts
-import path15 from "node:path";
+import path16 from "node:path";
 var FinalizeStep = class {
   name = "Finalize";
   execute(ctx) {
@@ -3798,7 +3832,6 @@ var FinalizeStep = class {
       tweakDir: paths.tweakDir,
       brand: prefs.brandKey ?? void 0,
       promptPack: prefs.promptPackPreference,
-      promptPackMode: prefs.promptPackModePreference,
       skillInstall: prefs.skillInstallEnabled,
       shellEnv: prefs.shellEnvEnabled,
       binDir: paths.resolvedBin,
@@ -3808,7 +3841,7 @@ var FinalizeStep = class {
       npmVersion: prefs.resolvedNpmVersion,
       teamModeEnabled
     };
-    writeJson(path15.join(paths.variantDir, "variant.json"), meta);
+    writeJson(path16.join(paths.variantDir, "variant.json"), meta);
     state.meta = meta;
   }
 };
@@ -3820,7 +3853,6 @@ var shouldEnablePromptPack = (providerKey, provider) => {
   if (provider?.noPromptPack) return false;
   return providerKey === "zai" || providerKey === "minimax";
 };
-var defaultPromptPackMode = (providerKey) => providerKey === "zai" || providerKey === "minimax" ? "maximal" : "minimal";
 var shouldInstallSkills = (providerKey) => providerKey === "zai" || providerKey === "minimax";
 var shouldEnableShellEnv = (providerKey) => providerKey === "zai";
 var yieldToEventLoop = () => new Promise((resolve) => setImmediate(resolve));
@@ -3830,10 +3862,11 @@ var VariantBuilder = class {
     this.steps = [
       new PrepareDirectoriesStep(),
       new InstallNpmStep(),
-      new TeamModeStep(),
-      // Patches cli.js for team mode (if enabled)
       new WriteConfigStep(),
       new BrandThemeStep(),
+      // Creates tweakcc/config.json
+      new TeamModeStep(),
+      // Patches cli.js and configures team toolset (needs config.json)
       new TweakccStep(),
       new WrapperStep(),
       new ShellEnvStep(),
@@ -3853,11 +3886,11 @@ var VariantBuilder = class {
     const binDir = params.binDir ?? DEFAULT_BIN_DIR;
     const resolvedRoot = expandTilde(rootDir) ?? rootDir;
     const resolvedBin = expandTilde(binDir) ?? binDir;
-    const variantDir = path16.join(resolvedRoot, params.name);
-    const configDir = path16.join(variantDir, "config");
-    const tweakDir = path16.join(variantDir, "tweakcc");
-    const wrapperPath = path16.join(resolvedBin, params.name);
-    const npmDir = path16.join(variantDir, "npm");
+    const variantDir = path17.join(resolvedRoot, params.name);
+    const configDir = path17.join(variantDir, "config");
+    const tweakDir = path17.join(variantDir, "tweakcc");
+    const wrapperPath = path17.join(resolvedBin, params.name);
+    const npmDir = path17.join(variantDir, "npm");
     const paths = {
       resolvedRoot,
       resolvedBin,
@@ -3870,7 +3903,6 @@ var VariantBuilder = class {
     const resolvedNpmPackage = normalizeNpmPackage(params.npmPackage);
     const resolvedNpmVersion = normalizeNpmVersion();
     const promptPackPreference = params.promptPack ?? shouldEnablePromptPack(params.providerKey, provider);
-    const promptPackModePreference = params.promptPackMode ?? defaultPromptPackMode(params.providerKey);
     const promptPackEnabled = !params.noTweak && promptPackPreference;
     const skillInstallEnabled = params.skillInstall ?? shouldInstallSkills(params.providerKey);
     const shellEnvEnabled = params.shellEnv ?? shouldEnableShellEnv(params.providerKey);
@@ -3880,7 +3912,6 @@ var VariantBuilder = class {
       resolvedNpmPackage,
       resolvedNpmVersion,
       promptPackPreference,
-      promptPackModePreference,
       promptPackEnabled,
       skillInstallEnabled,
       shellEnvEnabled,
@@ -3954,7 +3985,7 @@ var VariantBuilder = class {
 };
 
 // src/core/variant-builder/VariantUpdater.ts
-import path21 from "node:path";
+import path22 from "node:path";
 
 // src/core/variant-builder/update-steps/InstallNpmUpdateStep.ts
 var InstallNpmUpdateStep = class {
@@ -3989,8 +4020,8 @@ var InstallNpmUpdateStep = class {
 };
 
 // src/core/variant-builder/update-steps/TeamModeUpdateStep.ts
-import fs12 from "node:fs";
-import path17 from "node:path";
+import fs13 from "node:fs";
+import path18 from "node:path";
 var TEAM_MODE_DISABLED2 = "function sU(){return!1}";
 var TEAM_MODE_ENABLED2 = "function sU(){return!0}";
 var TeamModeUpdateStep = class {
@@ -4023,31 +4054,39 @@ var TeamModeUpdateStep = class {
     this.patchCli(ctx);
   }
   unpatchCli(ctx) {
-    const { state, meta } = ctx;
-    const cliPath = path17.join(meta.npmDir || "", "node_modules", "@anthropic-ai", "claude-code", "cli.js");
-    if (!fs12.existsSync(cliPath)) {
+    const { state, meta, paths } = ctx;
+    const cliPath = path18.join(paths.npmDir, "node_modules", "@anthropic-ai", "claude-code", "cli.js");
+    if (!fs13.existsSync(cliPath)) {
       state.notes.push("Warning: cli.js not found, skipping team mode unpatch");
+      this.removeSkill(ctx);
       return;
     }
-    let content = fs12.readFileSync(cliPath, "utf8");
+    let content = fs13.readFileSync(cliPath, "utf8");
     if (content.includes(TEAM_MODE_DISABLED2)) {
       state.notes.push("Team mode already disabled");
       meta.teamModeEnabled = false;
+      this.removeSkill(ctx);
       return;
     }
     if (!content.includes(TEAM_MODE_ENABLED2)) {
       state.notes.push("Warning: Team mode function not found in cli.js");
+      this.removeSkill(ctx);
       return;
     }
     content = content.replace(TEAM_MODE_ENABLED2, TEAM_MODE_DISABLED2);
-    fs12.writeFileSync(cliPath, content);
-    const verifyContent = fs12.readFileSync(cliPath, "utf8");
+    fs13.writeFileSync(cliPath, content);
+    const verifyContent = fs13.readFileSync(cliPath, "utf8");
     if (!verifyContent.includes(TEAM_MODE_DISABLED2)) {
       state.notes.push("Warning: Team mode unpatch verification failed");
+      this.removeSkill(ctx);
       return;
     }
     meta.teamModeEnabled = false;
     state.notes.push("Team mode disabled successfully");
+    this.removeSkill(ctx);
+  }
+  removeSkill(ctx) {
+    const { state, meta } = ctx;
     const skillResult = removeOrchestratorSkill(meta.configDir);
     if (skillResult.status === "removed") {
       state.notes.push("Multi-agent orchestrator skill removed");
@@ -4056,17 +4095,17 @@ var TeamModeUpdateStep = class {
     }
   }
   patchCli(ctx) {
-    const { state, meta, name } = ctx;
-    const cliPath = path17.join(meta.npmDir || "", "node_modules", "@anthropic-ai", "claude-code", "cli.js");
+    const { state, meta, name, paths } = ctx;
+    const cliPath = path18.join(paths.npmDir, "node_modules", "@anthropic-ai", "claude-code", "cli.js");
     const backupPath = `${cliPath}.backup`;
-    if (!fs12.existsSync(cliPath)) {
+    if (!fs13.existsSync(cliPath)) {
       state.notes.push("Warning: cli.js not found, skipping team mode patch");
       return;
     }
-    if (!fs12.existsSync(backupPath)) {
-      fs12.copyFileSync(cliPath, backupPath);
+    if (!fs13.existsSync(backupPath)) {
+      fs13.copyFileSync(cliPath, backupPath);
     }
-    let content = fs12.readFileSync(cliPath, "utf8");
+    let content = fs13.readFileSync(cliPath, "utf8");
     if (content.includes(TEAM_MODE_ENABLED2)) {
       state.notes.push("Team mode already enabled");
       meta.teamModeEnabled = true;
@@ -4077,16 +4116,16 @@ var TeamModeUpdateStep = class {
       return;
     }
     content = content.replace(TEAM_MODE_DISABLED2, TEAM_MODE_ENABLED2);
-    fs12.writeFileSync(cliPath, content);
-    const verifyContent = fs12.readFileSync(cliPath, "utf8");
+    fs13.writeFileSync(cliPath, content);
+    const verifyContent = fs13.readFileSync(cliPath, "utf8");
     if (!verifyContent.includes(TEAM_MODE_ENABLED2)) {
       state.notes.push("Warning: Team mode patch verification failed");
       return;
     }
-    const settingsPath = path17.join(meta.configDir, "settings.json");
-    if (fs12.existsSync(settingsPath)) {
+    const settingsPath = path18.join(meta.configDir, "settings.json");
+    if (fs13.existsSync(settingsPath)) {
       try {
-        const settings = JSON.parse(fs12.readFileSync(settingsPath, "utf8"));
+        const settings = JSON.parse(fs13.readFileSync(settingsPath, "utf8"));
         settings.env = settings.env || {};
         if (!settings.env.CLAUDE_CODE_TEAM_NAME) {
           settings.env.CLAUDE_CODE_TEAM_NAME = name;
@@ -4094,7 +4133,12 @@ var TeamModeUpdateStep = class {
         if (!settings.env.CLAUDE_CODE_AGENT_TYPE) {
           settings.env.CLAUDE_CODE_AGENT_TYPE = "team-lead";
         }
-        fs12.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+        settings.permissions = settings.permissions || {};
+        settings.permissions.allow = settings.permissions.allow || [];
+        if (!settings.permissions.allow.includes("Skill(orchestration)")) {
+          settings.permissions.allow.push("Skill(orchestration)");
+        }
+        fs13.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
       } catch {
         state.notes.push("Warning: Could not update settings.json with team env vars");
       }
@@ -4107,6 +4151,15 @@ var TeamModeUpdateStep = class {
     } else if (skillResult.status === "failed") {
       state.notes.push(`Warning: orchestrator skill install failed: ${skillResult.message}`);
     }
+    const systemPromptsDir = path18.join(meta.tweakDir, "system-prompts");
+    const copiedFiles = copyTeamPackPrompts(systemPromptsDir);
+    if (copiedFiles.length > 0) {
+      state.notes.push(`Team pack prompts installed (${copiedFiles.join(", ")})`);
+    }
+    const tweakccConfigPath = path18.join(meta.tweakDir, "config.json");
+    if (configureTeamToolset(tweakccConfigPath)) {
+      state.notes.push("Team toolset configured (TodoWrite blocked)");
+    }
   }
 };
 
@@ -4168,13 +4221,13 @@ ${tweakResult.stdout ?? ""}`.trim();
     }
     if (prefs.promptPackEnabled) {
       if (isAsync) {
-        await ctx.report(`Applying prompt pack (${prefs.promptPackModePreference})...`);
+        await ctx.report("Applying prompt pack...");
       } else {
-        ctx.report(`Applying prompt pack (${prefs.promptPackModePreference})...`);
+        ctx.report("Applying prompt pack...");
       }
-      const packResult = applyPromptPack(meta.tweakDir, meta.provider, prefs.promptPackModePreference);
+      const packResult = applyPromptPack(meta.tweakDir, meta.provider);
       if (packResult.changed) {
-        state.notes.push(`Prompt pack applied (${packResult.mode}, ${packResult.updated.join(", ")})`);
+        state.notes.push(`Prompt pack applied (${packResult.updated.join(", ")})`);
         if (isAsync) {
           await ctx.report("Re-applying tweakcc...");
         } else {
@@ -4193,7 +4246,7 @@ ${reapply.stdout ?? ""}`.trim();
 };
 
 // src/core/variant-builder/update-steps/WrapperUpdateStep.ts
-import path18 from "node:path";
+import path19 from "node:path";
 var WrapperUpdateStep = class {
   name = "Wrapper";
   execute(ctx) {
@@ -4211,7 +4264,7 @@ var WrapperUpdateStep = class {
     const resolvedBin = opts.binDir ? expandTilde(opts.binDir) ?? opts.binDir : meta.binDir;
     if (resolvedBin) {
       ensureDir(resolvedBin);
-      const wrapperPath = path18.join(resolvedBin, name);
+      const wrapperPath = path19.join(resolvedBin, name);
       writeWrapper(wrapperPath, meta.configDir, meta.binaryPath, "node");
       meta.binDir = resolvedBin;
     }
@@ -4303,7 +4356,7 @@ var ShellEnvUpdateStep = class {
 };
 
 // src/core/variant-builder/update-steps/SkillInstallUpdateStep.ts
-import path19 from "node:path";
+import path20 from "node:path";
 var SkillInstallUpdateStep = class {
   name = "SkillInstall";
   execute(ctx) {
@@ -4323,7 +4376,7 @@ var SkillInstallUpdateStep = class {
     const skillOpts = {
       install: true,
       update: prefs.skillUpdateEnabled,
-      targetDir: path19.join(meta.configDir, "skills")
+      targetDir: path20.join(meta.configDir, "skills")
     };
     const skillResult = isAsync ? await ensureDevBrowserSkillAsync(skillOpts) : ensureDevBrowserSkill(skillOpts);
     if (skillResult.status === "failed") {
@@ -4335,7 +4388,7 @@ var SkillInstallUpdateStep = class {
 };
 
 // src/core/variant-builder/update-steps/FinalizeUpdateStep.ts
-import path20 from "node:path";
+import path21 from "node:path";
 var FinalizeUpdateStep = class {
   name = "Finalize";
   execute(ctx) {
@@ -4350,10 +4403,10 @@ var FinalizeUpdateStep = class {
     const { meta, paths, prefs } = ctx;
     meta.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     meta.promptPack = prefs.promptPackPreference;
-    meta.promptPackMode = prefs.promptPackModePreference;
     meta.skillInstall = prefs.skillInstallEnabled;
     meta.shellEnv = prefs.shellEnvEnabled;
-    writeJson(path20.join(paths.variantDir, "variant.json"), meta);
+    delete meta.promptPackMode;
+    writeJson(path21.join(paths.variantDir, "variant.json"), meta);
   }
 };
 
@@ -4365,7 +4418,6 @@ var shouldEnablePromptPack2 = (providerKey) => {
   if (provider?.noPromptPack) return false;
   return providerKey === "zai" || providerKey === "minimax";
 };
-var defaultPromptPackMode2 = (providerKey) => providerKey === "zai" || providerKey === "minimax" ? "maximal" : "minimal";
 var shouldInstallSkills2 = (providerKey) => providerKey === "zai" || providerKey === "minimax";
 var shouldEnableShellEnv2 = (providerKey) => providerKey === "zai";
 var yieldToEventLoop2 = () => new Promise((resolve) => setImmediate(resolve));
@@ -4391,13 +4443,12 @@ var VariantUpdater = class {
    */
   initContext(rootDir, name, opts) {
     const resolvedRoot = expandTilde(rootDir || DEFAULT_ROOT) ?? rootDir;
-    const variantDir = path21.join(resolvedRoot, name);
+    const variantDir = path22.join(resolvedRoot, name);
     const meta = loadVariantMeta(variantDir);
     if (!meta) throw new Error(`Variant not found: ${name}`);
     const resolvedNpmPackage = normalizeNpmPackage2(opts.npmPackage ?? meta.npmPackage);
     const resolvedNpmVersion = normalizeNpmVersion2();
     const promptPackPreference = opts.promptPack ?? meta.promptPack ?? shouldEnablePromptPack2(meta.provider);
-    const promptPackModePreference = opts.promptPackMode ?? meta.promptPackMode ?? defaultPromptPackMode2(meta.provider);
     const promptPackEnabled = !opts.noTweak && promptPackPreference;
     const skillInstallEnabled = opts.skillInstall ?? meta.skillInstall ?? shouldInstallSkills2(meta.provider);
     const shellEnvEnabled = opts.shellEnv ?? meta.shellEnv ?? shouldEnableShellEnv2(meta.provider);
@@ -4407,13 +4458,12 @@ var VariantUpdater = class {
       resolvedRoot,
       resolvedBin: opts.binDir ? expandTilde(opts.binDir) ?? opts.binDir : meta.binDir,
       variantDir,
-      npmDir: meta.npmDir || path21.join(variantDir, "npm")
+      npmDir: meta.npmDir || path22.join(variantDir, "npm")
     };
     const prefs = {
       resolvedNpmPackage,
       resolvedNpmVersion,
       promptPackPreference,
-      promptPackModePreference,
       promptPackEnabled,
       skillInstallEnabled,
       shellEnvEnabled,
@@ -4489,17 +4539,17 @@ var updateVariant = (rootDir, name, opts = {}) => {
 };
 var removeVariant = (rootDir, name) => {
   const resolvedRoot = expandTilde(rootDir || DEFAULT_ROOT) ?? rootDir;
-  const variantDir = path22.join(resolvedRoot, name);
-  if (!fs13.existsSync(variantDir)) throw new Error(`Variant not found: ${name}`);
-  fs13.rmSync(variantDir, { recursive: true, force: true });
+  const variantDir = path23.join(resolvedRoot, name);
+  if (!fs14.existsSync(variantDir)) throw new Error(`Variant not found: ${name}`);
+  fs14.rmSync(variantDir, { recursive: true, force: true });
 };
 var doctor = (rootDir, binDir) => {
   const resolvedRoot = expandTilde(rootDir || DEFAULT_ROOT) ?? rootDir;
   const resolvedBin = expandTilde(binDir || DEFAULT_BIN_DIR) ?? binDir;
   const variants = listVariants(resolvedRoot);
   return variants.map(({ name, meta }) => {
-    const wrapperPath = path22.join(resolvedBin, name);
-    const ok = Boolean(meta && fs13.existsSync(meta.binaryPath) && fs13.existsSync(wrapperPath));
+    const wrapperPath = path23.join(resolvedBin, name);
+    const ok = Boolean(meta && fs14.existsSync(meta.binaryPath) && fs14.existsSync(wrapperPath));
     return {
       name,
       ok,
@@ -4511,7 +4561,7 @@ var doctor = (rootDir, binDir) => {
 var listVariants2 = (rootDir) => listVariants(rootDir);
 var tweakVariant = (rootDir, name) => {
   const resolvedRoot = expandTilde(rootDir || DEFAULT_ROOT) ?? rootDir;
-  const variantDir = path22.join(resolvedRoot, name);
+  const variantDir = path23.join(resolvedRoot, name);
   const meta = loadVariantMeta(variantDir);
   if (!meta) throw new Error(`Variant not found: ${name}`);
   ensureDir(meta.tweakDir);
@@ -4585,21 +4635,33 @@ function runTweakCommand({ opts }) {
 }
 
 // src/cli/commands/update.ts
-import path23 from "node:path";
+import path24 from "node:path";
 
 // src/cli/utils/printSummary.ts
 function printSummary(opts) {
   const { action, meta, wrapperPath, notes } = opts;
+  const getPromptPackDescription = () => {
+    if (!meta.promptPack) return "off";
+    if (meta.provider === "zai") return "on (zai-cli routing)";
+    if (meta.provider === "minimax") return "on (MCP routing)";
+    return "on";
+  };
+  const getTeamModeDescription = () => {
+    if (!meta.teamModeEnabled) return "off";
+    return "on (orchestrator skill, TodoWrite blocked)";
+  };
   console.log("");
   console.log(`\u2713 ${action}: ${meta.name}`);
   console.log(`  Provider: ${meta.provider}`);
   if (meta.promptPack !== void 0) {
-    const mode = meta.promptPackMode || "maximal";
-    console.log(`  Prompt pack: ${meta.promptPack ? `on (${mode})` : "off"}`);
+    console.log(`  Prompt pack: ${getPromptPackDescription()}`);
   }
   if (meta.skillInstall !== void 0) {
     console.log(`  dev-browser skill: ${meta.skillInstall ? "on" : "off"}`);
   }
+  if (meta.teamModeEnabled !== void 0) {
+    console.log(`  Team mode: ${getTeamModeDescription()}`);
+  }
   if (meta.shellEnv !== void 0 && meta.provider === "zai") {
     console.log(`  Shell env: ${meta.shellEnv ? "write Z_AI_API_KEY" : "manual"}`);
   }
@@ -4680,14 +4742,6 @@ function formatModelNote(overrides) {
   return `Model mapping: ${text}`;
 }
 
-// src/cli/utils/promptPack.ts
-function parsePromptPackMode(value) {
-  if (!value) return void 0;
-  const normalized = value.toLowerCase();
-  if (normalized === "minimal" || normalized === "maximal") return normalized;
-  return void 0;
-}
-
 // src/cli/utils/extraEnv.ts
 function buildExtraEnv(opts) {
   const env = Array.isArray(opts.env) ? [...opts.env] : [];
@@ -4709,10 +4763,11 @@ function runUpdateCommand({ opts }) {
     return;
   }
   const promptPack = opts["no-prompt-pack"] ? false : void 0;
-  const promptPackMode = parsePromptPackMode(opts["prompt-pack-mode"]);
   const skillInstall = opts["no-skill-install"] ? false : void 0;
   const skillUpdate = Boolean(opts["skill-update"]);
   const shellEnv = opts["no-shell-env"] ? false : opts["shell-env"] ? true : void 0;
+  const enableTeamMode = opts["enable-team-mode"] ? true : void 0;
+  const disableTeamMode = opts["disable-team-mode"] ? true : void 0;
   for (const name of names) {
     const result = updateVariant(rootDir, name, {
       binDir,
@@ -4720,13 +4775,13 @@ function runUpdateCommand({ opts }) {
       brand: opts.brand,
       noTweak: Boolean(opts.noTweak),
       promptPack,
-      promptPackMode,
       skillInstall,
       shellEnv,
       skillUpdate,
-      enableTeamMode: Boolean(opts["enable-team-mode"])
+      enableTeamMode,
+      disableTeamMode
     });
-    const wrapperPath = path23.join(binDir, name);
+    const wrapperPath = path24.join(binDir, name);
     printSummary({
       action: "Updated",
       meta: result.meta,
@@ -4785,7 +4840,6 @@ async function prepareCreateParams(opts) {
 async function handleQuickMode(opts, params) {
   const { provider } = params;
   const promptPack = opts["no-prompt-pack"] ? false : void 0;
-  const promptPackMode = parsePromptPackMode(opts["prompt-pack-mode"]);
   const skillInstall = opts["no-skill-install"] ? false : void 0;
   const skillUpdate = Boolean(opts["skill-update"]);
   let shellEnv = opts["no-shell-env"] ? false : opts["shell-env"] ? true : void 0;
@@ -4809,6 +4863,10 @@ async function handleQuickMode(opts, params) {
       shellEnv = answer.trim().toLowerCase().startsWith("y");
     }
   }
+  const enableTeamMode = opts["disable-team-mode"] ? false : true;
+  if (enableTeamMode) {
+    console.log("Team mode will be enabled (orchestrator skill installed)");
+  }
   const result = createVariant({
     name: params.name,
     providerKey: params.providerKey,
@@ -4821,12 +4879,11 @@ async function handleQuickMode(opts, params) {
     npmPackage: params.npmPackage,
     noTweak: Boolean(opts.noTweak),
     promptPack,
-    promptPackMode,
     skillInstall,
     shellEnv,
     skillUpdate,
     modelOverrides: resolvedModelOverrides,
-    enableTeamMode: Boolean(opts["enable-team-mode"]),
+    enableTeamMode,
     tweakccStdio: "pipe"
   });
   const modelNote = formatModelNote(resolvedModelOverrides);
@@ -4841,7 +4898,6 @@ async function handleQuickMode(opts, params) {
 async function handleInteractiveMode(opts, params) {
   const { provider } = params;
   const promptPack = opts["no-prompt-pack"] ? false : void 0;
-  const promptPackMode = parsePromptPackMode(opts["prompt-pack-mode"]);
   const skillInstall = opts["no-skill-install"] ? false : void 0;
   const skillUpdate = Boolean(opts["skill-update"]);
   let shellEnv = opts["no-shell-env"] ? false : opts["shell-env"] ? true : void 0;
@@ -4869,6 +4925,13 @@ async function handleInteractiveMode(opts, params) {
       shellEnv = answer.trim().toLowerCase().startsWith("y");
     }
   }
+  let enableTeamMode = true;
+  if (opts["disable-team-mode"]) {
+    enableTeamMode = false;
+  } else if (!opts["enable-team-mode"]) {
+    const answer = await prompt("Enable team mode (multi-agent collaboration)? (yes/no)", "yes");
+    enableTeamMode = answer.trim().toLowerCase().startsWith("y");
+  }
   const result = createVariant({
     name: nextName,
     providerKey: params.providerKey,
@@ -4881,12 +4944,11 @@ async function handleInteractiveMode(opts, params) {
     npmPackage: nextNpmPackage,
     noTweak: Boolean(opts.noTweak),
     promptPack,
-    promptPackMode,
     skillInstall,
     shellEnv,
     skillUpdate,
     modelOverrides: resolvedModelOverrides,
-    enableTeamMode: Boolean(opts["enable-team-mode"]),
+    enableTeamMode,
     tweakccStdio: "pipe"
   });
   const modelNote = formatModelNote(resolvedModelOverrides);
@@ -4900,7 +4962,6 @@ async function handleInteractiveMode(opts, params) {
 }
 async function handleNonInteractiveMode(opts, params) {
   const promptPack = opts["no-prompt-pack"] ? false : void 0;
-  const promptPackMode = parsePromptPackMode(opts["prompt-pack-mode"]);
   const skillInstall = opts["no-skill-install"] ? false : void 0;
   const skillUpdate = Boolean(opts["skill-update"]);
   const shellEnv = opts["no-shell-env"] ? false : opts["shell-env"] ? true : void 0;
@@ -4909,6 +4970,7 @@ async function handleNonInteractiveMode(opts, params) {
     throw new Error("Provider API key required (use --api-key)");
   }
   const resolvedModelOverrides = await ensureModelMapping(params.providerKey, opts, { ...modelOverrides });
+  const enableTeamMode = opts["disable-team-mode"] ? false : true;
   const result = createVariant({
     name: params.name,
     providerKey: params.providerKey,
@@ -4921,12 +4983,11 @@ async function handleNonInteractiveMode(opts, params) {
     npmPackage: params.npmPackage,
     noTweak: Boolean(opts.noTweak),
     promptPack,
-    promptPackMode,
     skillInstall,
     shellEnv,
     skillUpdate,
     modelOverrides: resolvedModelOverrides,
-    enableTeamMode: Boolean(opts["enable-team-mode"]),
+    enableTeamMode,
     tweakccStdio: "pipe"
   });
   const modelNote = formatModelNote(resolvedModelOverrides);