oh-my-codex 0.18.7 → 0.18.9

package/dist/cli/setup.js

@@ -20,10 +20,11 @@ import { readSessionState, isSessionStale } from "../hooks/session.js";
 import { getCatalogHeadlineCounts } from "./catalog-contract.js";
 import { tryReadCatalogManifest } from "../catalog/reader.js";
 import { DEFAULT_FRONTIER_MODEL } from "../config/models.js";
+import { teamModeEnabled, } from "../config/team-mode.js";
 import { addGeneratedAgentsMarker, hasOmxAgentsContract, hasOmxManagedAgentsSections, isOmxGeneratedAgentsMd, upsertManagedAgentsBlock, } from "../utils/agents-md.js";
 import { DEFAULT_HUD_CONFIG } from "../hud/types.js";
 import { SETUP_INSTALL_MODES, SETUP_MCP_MODES, SETUP_SCOPES, getSetupScopeFilePath, readPersistedSetupPreferences, } from "./setup-preferences.js";
-import { OMX_LOCAL_MARKETPLACE_NAME, OMX_PLUGIN_NAME, materializePackagedOmxPluginCache, resolvePackagedOmxMarketplace, upsertLocalOmxMarketplaceRegistration, upsertLocalOmxPluginEnablement, upsertLocalOmxPluginMcpServerEnablement, hasLocalOmxPluginMcpServerRegistrations, } from "./plugin-marketplace.js";
+import { OMX_LOCAL_MARKETPLACE_NAME, OMX_PLUGIN_NAME, materializePackagedOmxPluginCache, resolvePackagedOmxMarketplace, upsertLocalOmxMarketplaceRegistration, upsertLocalOmxPluginEnablement, upsertLocalOmxPluginMcpServerEnablement, hasLocalOmxPluginMcpServerRegistrations, pluginHookCacheMatchesPackaged, } from "./plugin-marketplace.js";
 import { resolveCodexHookFeatureSupportForCli } from "./codex-feature-probe.js";
 async function resolveStatusLinePresetForSetup(projectRoot, options) {
     if (options.force) {
@@ -46,6 +47,7 @@ async function resolveStatusLinePresetForSetup(projectRoot, options) {
 }
 import { resolveAgentsModelTableContext, upsertAgentsModelTable, } from "../utils/agents-model-table.js";
 export { SETUP_INSTALL_MODES, SETUP_MCP_MODES, SETUP_SCOPES };
+export { SETUP_TEAM_MODES } from "../config/team-mode.js";
 const PROJECT_GITIGNORE_ENTRIES = [
     ".omx/",
     ".codex/*",
@@ -61,6 +63,9 @@ const LEGACY_PROJECT_GITIGNORE_ENTRIES = [".codex/"];
 const SETUP_ONLY_INSTALLABLE_SKILLS = new Set(["wiki"]);
 const DEFAULT_SETUP_MCP_MODE = "none";
 const HARD_DEPRECATED_SKILL_NAMES = new Set(["web-clone"]);
+const TEAM_MODE_SKILL_NAMES = new Set(["team", "worker"]);
+const TEAM_MODE_PROMPT_NAMES = new Set(["team-executor"]);
+const TEAM_MODE_NATIVE_AGENT_NAMES = new Set(["team-executor"]);
 function isCatalogInstallableStatus(status) {
     return status === "active" || status === "internal";
 }
@@ -85,6 +90,65 @@ function applyPluginModeWordingToAgentsTemplate(content, scope) {
         : "`~/.codex/skills`";
     return scopedContent.replace(/Role prompts under `prompts\/\*\.md` are narrower execution surfaces\. They must follow this file, not override it\.\nWhen OMX is installed, load the installed prompt\/skill\/agent surfaces from [^\n]+active\)\./, `Registered Codex plugin marketplace surfaces supply OMX workflows and plugin-scoped companion resources when the plugin is installed. Native agent roles are installed as setup-owned Codex agent TOML files in plugin mode so agent_type routing works. They must follow this file, not override it.\nUser-installed skills may still live under ${userSkillPath}.`);
 }
+function stripNamedXmlSection(content, sectionName) {
+    return content.replace(new RegExp(`\\n?<${sectionName}>[\\s\\S]*?<\\/${sectionName}>\\n?`, "g"), "\n");
+}
+function applyTeamModeToAgentsTemplate(content, teamMode) {
+    if (teamModeEnabled(teamMode))
+        return content;
+    let next = content;
+    for (const section of ["team_compositions", "team_pipeline", "team_model_resolution"]) {
+        next = stripNamedXmlSection(next, section);
+    }
+    return next
+        .replace(/\(\+ \$team if needed\)/g, "")
+        .replace(/- `\$team` when[^\n]*\n/g, "")
+        .replace(/,?\s*`team`,?/g, "")
+        .replace(/\s*\|\s*`\$team ".*?"`\s*\|.*\|\n/g, "\n")
+        .replace(/,?\s*`\$team`/g, "")
+        .replace(/`\$team`,?\s*/g, "")
+        .replace(/\/?\s*`team`\/`swarm`/g, "`swarm`")
+        .split("\n")
+        .filter((line) => {
+        const normalized = line.toLowerCase();
+        if (normalized.includes("team mode"))
+            return false;
+        if (normalized.includes("team runtime"))
+            return false;
+        if (normalized.includes("team orchestration"))
+            return false;
+        if (normalized.includes("team/swarm"))
+            return false;
+        if (normalized.includes("team pipeline"))
+            return false;
+        if (normalized.includes("runtime/team"))
+            return false;
+        if (normalized.includes("team overlays"))
+            return false;
+        if (normalized.includes("team pane"))
+            return false;
+        if (normalized.startsWith("- teams may "))
+            return false;
+        if (normalized.includes("outside active `team`"))
+            return false;
+        if (normalized.includes("reserve `worker`"))
+            return false;
+        if (normalized.includes("worker` is a team-runtime"))
+            return false;
+        if (normalized.includes("team-plan"))
+            return false;
+        if (normalized.includes("omx team"))
+            return false;
+        return true;
+    })
+        .join("\n")
+        .replace(/\n{3,}/g, "\n\n");
+}
+function getAgentsModelTableDefinitionsForTeamMode(teamMode) {
+    if (teamModeEnabled(teamMode))
+        return AGENT_DEFINITIONS;
+    return Object.fromEntries(Object.entries(AGENT_DEFINITIONS).filter(([name]) => !TEAM_MODE_NATIVE_AGENT_NAMES.has(name)));
+}
 const REQUIRED_TEAM_CLI_API_MARKERS = [
     "if (subcommand === 'api')",
     "executeTeamApiOperation",
@@ -372,14 +436,17 @@ async function promptForFirstPartyMcpRemoval(configPath, registrationKinds) {
     }
 }
 function hasPersistedSetupPreferences(preferences) {
-    return Boolean(preferences?.scope || preferences?.installMode);
+    return Boolean(preferences?.scope || preferences?.installMode || preferences?.teamMode);
 }
 function formatPersistedSetupPreferenceSummary(preferences) {
-    return [
+    const summary = [
         `scope=${preferences.scope ?? "not recorded"}`,
         `installMode=${preferences.installMode ?? "not recorded"}`,
         `mcpMode=${preferences.mcpMode ?? "not recorded"}`,
-    ].join(", ");
+    ];
+    if (preferences.teamMode)
+        summary.push(`teamMode=${preferences.teamMode}`);
+    return summary.join(", ");
 }
 async function promptForPersistedSetupReview(preferences) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
@@ -631,6 +698,8 @@ async function refreshOmxPluginDiscoveryCache(pkgRoot, options, codexHomeDir = c
         const hookFilesMissing = !existsSync(join(cacheDir, "hooks", "hooks.json"))
             || !existsSync(join(cacheDir, "hooks", "codex-native-hook.mjs"))
             || !existsSync(join(cacheDir, "hooks", "omx-command.json"));
+        const hookFilesChanged = !hookFilesMissing
+            && !(await pluginHookCacheMatchesPackaged(cacheDir, packagedMarketplace));
         const skillListChanged = expectedSkillNames !== null &&
             cachedSkillNames !== null &&
             JSON.stringify(cachedSkillNames) !== JSON.stringify(expectedSkillNames);
@@ -638,6 +707,7 @@ async function refreshOmxPluginDiscoveryCache(pkgRoot, options, codexHomeDir = c
             !skillsPointerChanged &&
             !hooksPointerChanged &&
             !hookFilesMissing &&
+            !hookFilesChanged &&
             !skillListChanged)
             continue;
         staleDirs.push(cacheDir);
@@ -656,6 +726,7 @@ async function refreshOmxPluginDiscoveryCache(pkgRoot, options, codexHomeDir = c
                     ? `hooks pointer ${manifest.hooks ?? "missing"} -> ./hooks/hooks.json`
                     : null,
                 hookFilesMissing ? "plugin hook files missing" : null,
+                hookFilesChanged ? "plugin hook files changed" : null,
                 skillListChanged ? "skill directory list changed" : null,
             ].filter(Boolean);
             console.log(`  ${options.dryRun ? "would invalidate" : "invalidated"} Codex plugin discovery cache ${cacheDir} (${reasons.join(", ")})`);
@@ -1082,7 +1153,7 @@ async function cleanupPluginModeLegacyAgentsMd(agentsMdPath, backupContext, opti
     return true;
 }
 export async function setup(options = {}) {
-    const { force = false, dryRun = false, installMode: requestedInstallMode, mcpMode: requestedMcpMode, scope: requestedScope, verbose = false, setupScopePrompt, persistedSetupReviewPrompt, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, firstPartyMcpRemovalPrompt, } = options;
+    const { force = false, dryRun = false, installMode: requestedInstallMode, mcpMode: requestedMcpMode, teamMode: requestedTeamMode, scope: requestedScope, verbose = false, setupScopePrompt, persistedSetupReviewPrompt, installModePrompt, modelUpgradePrompt, pluginAgentsMdPrompt, pluginDeveloperInstructionsPrompt, pluginDeveloperInstructionsOverwritePrompt, firstPartyMcpRemovalPrompt, } = options;
     const pkgRoot = getPackageRoot();
     const projectRoot = process.cwd();
     const persistedPreferences = await readPersistedSetupPreferences(projectRoot, { warnOnLegacyScope: true });
@@ -1097,8 +1168,12 @@ export async function setup(options = {}) {
         Boolean(persistedPreferences?.mcpMode) &&
         (!persistedPreferences?.scope ||
             persistedPreferences.scope === effectiveScopeForInstallMode);
+    const wouldUsePersistedTeamMode = !requestedTeamMode &&
+        Boolean(persistedPreferences?.teamMode) &&
+        (!persistedPreferences?.scope ||
+            persistedPreferences.scope === effectiveScopeForInstallMode);
     const shouldReviewPersistedSetup = hasPersistedSetupPreferences(persistedPreferences) &&
-        (wouldUsePersistedScope || wouldUsePersistedInstallMode || wouldUsePersistedMcpMode) &&
+        (wouldUsePersistedScope || wouldUsePersistedInstallMode || wouldUsePersistedMcpMode || wouldUsePersistedTeamMode) &&
         (typeof persistedSetupReviewPrompt === "function" ||
             (process.stdin.isTTY && process.stdout.isTTY));
     if (shouldReviewPersistedSetup) {
@@ -1110,6 +1185,13 @@ export async function setup(options = {}) {
     const resolvedScope = await resolveSetupScope(projectRoot, requestedScope, persistedReviewDecision, persistedPreferences, setupScopePrompt);
     const resolvedInstallMode = await resolveSetupInstallMode(projectRoot, resolvedScope.scope, requestedInstallMode, installModePrompt, persistedReviewDecision, persistedPreferences);
     const resolvedMcpMode = resolveSetupMcpMode(resolvedScope.scope, requestedMcpMode, persistedReviewDecision, persistedPreferences);
+    const resolvedTeamMode = requestedTeamMode
+        ?? (persistedReviewDecision !== "reset" &&
+            (!persistedPreferences?.scope || persistedPreferences.scope === resolvedScope.scope)
+            ? persistedPreferences?.teamMode
+            : undefined)
+        ?? "enabled";
+    const isTeamModeEnabled = teamModeEnabled(resolvedTeamMode);
     const scopeDirs = resolveScopeDirectories(resolvedScope.scope, projectRoot);
     const existingConfigForMcpMigration = existsSync(scopeDirs.codexConfigFile)
         ? await readFile(scopeDirs.codexConfigFile, "utf-8")
@@ -1163,6 +1245,7 @@ export async function setup(options = {}) {
         ? " (from .omx/setup-scope.json)"
         : "";
     console.log(`Using setup MCP mode: ${resolvedMcpMode.mcpMode}${mcpModeSourceMessage}\n`);
+    console.log(`Using setup Team mode: ${resolvedTeamMode}\n`);
     if (shouldOfferFirstPartyMcpRemoval) {
         if (removeFirstPartyMcpRegistrations) {
             console.log("Deprecated first-party OMX MCP registrations will be removed from config.toml during this setup run.\n");
@@ -1200,6 +1283,9 @@ export async function setup(options = {}) {
     const setupPreferencesToPersist = {
         scope: resolvedScope.scope,
         mcpMode: resolvedMcpMode.mcpMode,
+        ...(requestedTeamMode || persistedPreferences?.teamMode || resolvedTeamMode === "disabled"
+            ? { teamMode: resolvedTeamMode }
+            : {}),
         ...(resolvedInstallMode &&
             (resolvedScope.scope === "user" ||
                 resolvedInstallMode.installMode === "plugin")
@@ -1234,7 +1320,7 @@ export async function setup(options = {}) {
                 : "  Prompt refresh skipped; no legacy OMX-managed prompt files found.\n");
         }
         else {
-            summary.prompts = await installPrompts(promptsSrc, promptsDst, backupContext, { force, dryRun, verbose });
+            summary.prompts = await installPrompts(promptsSrc, promptsDst, backupContext, { force, dryRun, verbose, teamMode: resolvedTeamMode });
             const cleanedLegacyPromptShims = await cleanupLegacySkillPromptShims(promptsSrc, promptsDst, {
                 dryRun,
                 verbose,
@@ -1282,6 +1368,7 @@ export async function setup(options = {}) {
                 force,
                 dryRun,
                 verbose,
+                teamMode: resolvedTeamMode,
             });
         }
         if (catalogCounts) {
@@ -1299,6 +1386,7 @@ export async function setup(options = {}) {
             dryRun,
             verbose,
             preserveUnmanagedObsoleteNativeAgents: true,
+            teamMode: resolvedTeamMode,
         });
         console.log(`  Native agent role refresh complete (${scopeDirs.nativeAgentsDir}); plugin mode still installs role TOML so agent_type routing works.\n`);
     }
@@ -1307,6 +1395,7 @@ export async function setup(options = {}) {
             force,
             dryRun,
             verbose,
+            teamMode: resolvedTeamMode,
         });
         console.log(`  Native agent refresh complete (${scopeDirs.nativeAgentsDir}).\n`);
     }
@@ -1385,7 +1474,7 @@ export async function setup(options = {}) {
         else if (pluginCacheRefresh.status === "unchanged") {
             console.log("  Codex plugin discovery cache already matches packaged plugin metadata.");
         }
-        const pluginCacheMaterialize = await materializePackagedOmxPluginCache(scopeDirs.codexHomeDir, packagedMarketplace, { dryRun });
+        const pluginCacheMaterialize = await materializePackagedOmxPluginCache(scopeDirs.codexHomeDir, packagedMarketplace, { dryRun, teamMode: resolvedTeamMode });
         if (pluginCacheMaterialize.status === "materialized") {
             console.log(`  ${dryRun ? "Would install" : "Installed"} local Codex plugin cache for ${OMX_LOCAL_MARKETPLACE_NAME}/${OMX_PLUGIN_NAME} at ${pluginCacheMaterialize.cacheDir}.`);
         }
@@ -1451,15 +1540,20 @@ export async function setup(options = {}) {
         await syncManagedWindowsNativeHookShim(scopeDirs.codexHomeDir, pkgRoot, summary.config, backupContext, { dryRun, verbose });
         console.log(`  Native Codex hooks refresh complete (${scopeDirs.codexHooksFile}).\n`);
     }
-    // Step 5.5: Verify team CLI interop surface is available.
+    // Step 5.5: Verify team CLI interop surface is available when Team is enabled.
     console.log("[5.5/8] Verifying Team CLI API interop...");
-    const teamToolsCheck = await verifyTeamCliApiInterop(pkgRoot);
-    if (teamToolsCheck.ok) {
-        console.log("  omx team api command detected (CLI-first interop ready)");
+    if (isTeamModeEnabled) {
+        const teamToolsCheck = await verifyTeamCliApiInterop(pkgRoot);
+        if (teamToolsCheck.ok) {
+            console.log("  omx team api command detected (CLI-first interop ready)");
+        }
+        else {
+            console.log(`  WARNING: ${teamToolsCheck.message}`);
+            console.log("  Run `npm run build` and then re-run `omx setup`.");
+        }
     }
     else {
-        console.log(`  WARNING: ${teamToolsCheck.message}`);
-        console.log("  Run `npm run build` and then re-run `omx setup`.");
+        console.log("  Skipped because Team mode is disabled for this setup.");
     }
     console.log();
     // Step 6: Generate AGENTS.md
@@ -1477,7 +1571,8 @@ export async function setup(options = {}) {
                 const modelTableContext = resolveAgentsModelTableContext(resolvedConfig, {
                     codexHomeOverride: scopeDirs.codexHomeDir,
                 });
-                const rewritten = upsertAgentsModelTable(addGeneratedAgentsMarker(applyPluginModeWordingToAgentsTemplate(content, resolvedScope.scope)), modelTableContext);
+                const modelTableDefinitions = getAgentsModelTableDefinitionsForTeamMode(resolvedTeamMode);
+                const rewritten = upsertAgentsModelTable(addGeneratedAgentsMarker(applyTeamModeToAgentsTemplate(applyPluginModeWordingToAgentsTemplate(content, resolvedScope.scope), resolvedTeamMode)), modelTableContext, modelTableDefinitions);
                 const result = await syncManagedAgentsContent(rewritten, pluginAgentsMdDst, summary.agentsMd, backupContext, {
                     agentsOverwritePrompt: options.agentsOverwritePrompt,
                     dryRun,
@@ -1526,9 +1621,11 @@ export async function setup(options = {}) {
             const modelTableContext = resolveAgentsModelTableContext(resolvedConfig, {
                 codexHomeOverride: scopeDirs.codexHomeDir,
             });
-            const rewritten = upsertAgentsModelTable(addGeneratedAgentsMarker(applyScopePathRewritesToAgentsTemplate(content, resolvedScope.scope)), modelTableContext);
+            const modelTableDefinitions = getAgentsModelTableDefinitionsForTeamMode(resolvedTeamMode);
+            const rewritten = upsertAgentsModelTable(addGeneratedAgentsMarker(applyTeamModeToAgentsTemplate(applyScopePathRewritesToAgentsTemplate(content, resolvedScope.scope), resolvedTeamMode)), modelTableContext, modelTableDefinitions);
             let changed = true;
             let canApplyManagedModelRefresh = false;
+            let canApplyManagedRefreshDuringActiveSession = false;
             let managedRefreshContent = "";
             let canApplyManagedAgentsMerge = false;
             let mergedAgentsContent = "";
@@ -1546,15 +1643,25 @@ export async function setup(options = {}) {
                 }
                 else {
                     if (hasOmxManagedAgentsSections(existing)) {
-                        managedRefreshContent = upsertAgentsModelTable(existing, modelTableContext);
+                        const existingIsGeneratedAgentsMd = isOmxGeneratedAgentsMd(existing);
+                        managedRefreshContent = teamModeEnabled(resolvedTeamMode)
+                            ? upsertAgentsModelTable(existing, modelTableContext, modelTableDefinitions)
+                            : existingIsGeneratedAgentsMd
+                                ? rewritten
+                                : upsertManagedAgentsBlock(existing, rewritten);
                         canApplyManagedModelRefresh = managedRefreshContent !== existing;
+                        canApplyManagedRefreshDuringActiveSession =
+                            canApplyManagedModelRefresh &&
+                                !teamModeEnabled(resolvedTeamMode) &&
+                                existingIsGeneratedAgentsMd;
                     }
                 }
             }
             if (resolvedScope.scope === "project" &&
                 sessionIsActive &&
                 agentsMdExists &&
-                (changed || canApplyManagedAgentsMerge || canApplyManagedModelRefresh)) {
+                (changed || canApplyManagedAgentsMerge || canApplyManagedModelRefresh) &&
+                !canApplyManagedRefreshDuringActiveSession) {
                 summary.agentsMd.skipped += 1;
                 console.log("  WARNING: Active omx session detected (pid " +
                     activeSession?.pid +
@@ -1833,6 +1940,13 @@ async function installPrompts(srcDir, dstDir, backupContext, options) {
         if (!file.endsWith(".md"))
             continue;
         const promptName = file.slice(0, -3);
+        if (!teamModeEnabled(options.teamMode) && TEAM_MODE_PROMPT_NAMES.has(promptName)) {
+            summary.skipped += 1;
+            if (options.verbose) {
+                console.log(`  skipped ${file} (Team mode disabled)`);
+            }
+            continue;
+        }
         const status = agentStatusByName?.get(promptName);
         if (manifest && !isSetupPromptAssetName(promptName, manifest)) {
             summary.skipped += 1;
@@ -1849,14 +1963,17 @@ async function installPrompts(srcDir, dstDir, backupContext, options) {
             continue;
         await syncManagedFileFromDisk(src, dst, summary, backupContext, options, `prompt ${file}`);
     }
-    if (options.force && manifest && existsSync(dstDir)) {
+    if (manifest && existsSync(dstDir)) {
         const installedFiles = await readdir(dstDir);
         for (const file of installedFiles) {
             if (!file.endsWith(".md"))
                 continue;
             const promptName = file.slice(0, -3);
             const status = agentStatusByName?.get(promptName);
-            if (isSetupPromptAssetName(promptName, manifest))
+            const disabledTeamPrompt = !teamModeEnabled(options.teamMode) && TEAM_MODE_PROMPT_NAMES.has(promptName);
+            if (isSetupPromptAssetName(promptName, manifest) && !disabledTeamPrompt)
+                continue;
+            if (!options.force && !disabledTeamPrompt)
                 continue;
             const stalePromptPath = join(dstDir, file);
             if (!existsSync(stalePromptPath))
@@ -1873,7 +1990,8 @@ async function installPrompts(srcDir, dstDir, backupContext, options) {
                     ? "would remove stale prompt"
                     : "removed stale prompt";
                 const label = status ?? "unlisted";
-                console.log(`  ${prefix} ${file} (status: ${label})`);
+                const reason = disabledTeamPrompt ? ", Team mode disabled" : "";
+                console.log(`  ${prefix} ${file} (status: ${label}${reason})`);
             }
         }
     }
@@ -1943,6 +2061,13 @@ async function refreshNativeAgentConfigs(pkgRoot, agentsDir, backupContext, opti
         : Object.keys(AGENT_DEFINITIONS).sort();
     for (const name of nativeAgentNames) {
         staleCandidateNativeAgentNames.add(name);
+        if (!teamModeEnabled(options.teamMode) && TEAM_MODE_NATIVE_AGENT_NAMES.has(name)) {
+            summary.skipped += 1;
+            if (options.verbose) {
+                console.log(`  skipped native agent ${name}.toml (Team mode disabled)`);
+            }
+            continue;
+        }
         const agent = AGENT_DEFINITIONS[name];
         if (!agent) {
             if (options.verbose) {
@@ -1968,14 +2093,17 @@ async function refreshNativeAgentConfigs(pkgRoot, agentsDir, backupContext, opti
         summary.backedUp += generatedCleanup.backedUp;
         summary.removed += generatedCleanup.removed;
     }
-    if (options.force && manifest && existsSync(agentsDir)) {
+    if (manifest && existsSync(agentsDir)) {
         const installedFiles = await readdir(agentsDir);
         for (const file of installedFiles) {
             if (!file.endsWith(".toml"))
                 continue;
             const agentName = file.slice(0, -5);
             const agentStatus = agentStatusByName?.get(agentName);
-            if (isNativeAgentInstallableStatus(agentStatus))
+            const disabledTeamAgent = !teamModeEnabled(options.teamMode) && TEAM_MODE_NATIVE_AGENT_NAMES.has(agentName);
+            if (isNativeAgentInstallableStatus(agentStatus) && !disabledTeamAgent)
+                continue;
+            if (!options.force && !disabledTeamAgent)
                 continue;
             if (!staleCandidateNativeAgentNames.has(agentName) &&
                 agentStatus === undefined)
@@ -1995,7 +2123,8 @@ async function refreshNativeAgentConfigs(pkgRoot, agentsDir, backupContext, opti
                     ? "would remove stale native agent"
                     : "removed stale native agent";
                 const label = agentStatus ?? "unlisted";
-                console.log(`  ${prefix} ${file} (status: ${label})`);
+                const reason = disabledTeamAgent ? ", Team mode disabled" : "";
+                console.log(`  ${prefix} ${file} (status: ${label}${reason})`);
             }
         }
     }
@@ -2060,6 +2189,13 @@ export async function installSkills(srcDir, dstDir, backupContext, options) {
         if (!entry.isDirectory())
             continue;
         staleCandidateSkillNames.add(entry.name);
+        if (!teamModeEnabled(options.teamMode) && TEAM_MODE_SKILL_NAMES.has(entry.name)) {
+            summary.skipped += 1;
+            if (options.verbose) {
+                console.log(`  skipped ${entry.name}/ (Team mode disabled)`);
+            }
+            continue;
+        }
         const status = skillStatusByName?.get(entry.name);
         if (skillStatusByName && !isSetupInstallableSkill(entry.name, status)) {
             summary.skipped += 1;
@@ -2107,10 +2243,11 @@ export async function installSkills(srcDir, dstDir, backupContext, options) {
     if (manifest && existsSync(dstDir)) {
         for (const staleSkill of staleCandidateSkillNames) {
             const status = skillStatusByName?.get(staleSkill);
-            if (isSetupInstallableSkill(staleSkill, status))
+            const disabledTeamSkill = !teamModeEnabled(options.teamMode) && TEAM_MODE_SKILL_NAMES.has(staleSkill);
+            if (isSetupInstallableSkill(staleSkill, status) && !disabledTeamSkill)
                 continue;
             const hardDeprecated = HARD_DEPRECATED_SKILL_NAMES.has(staleSkill);
-            if (!options.force && !hardDeprecated)
+            if (!options.force && !hardDeprecated && !disabledTeamSkill)
                 continue;
             const staleSkillDir = join(dstDir, staleSkill);
             if (!existsSync(staleSkillDir))
@@ -2124,7 +2261,9 @@ export async function installSkills(srcDir, dstDir, backupContext, options) {
                     ? "would remove stale skill"
                     : "removed stale skill";
                 const label = status ?? "unlisted";
-                const reason = hardDeprecated ? ", hard-deprecated" : "";
+                const reason = disabledTeamSkill
+                    ? ", Team mode disabled"
+                    : hardDeprecated ? ", hard-deprecated" : "";
                 console.log(`  ${prefix} ${staleSkill}/ (status: ${label}${reason})`);
             }
         }