prizmkit 1.1.101 → 1.1.104

package/bundled/dev-pipeline/templates/sections/test-failure-recovery-agent.md

@@ -1,6 +1,6 @@
 ## Test Failure Recovery Protocol
 
-Use this protocol whenever implementation or review tests fail. Its purpose is to distinguish tolerated pre-existing failures from blockers introduced by this session.
+Use this protocol whenever the post-review PrizmKit Test gate fails. Its purpose is to distinguish tolerated pre-existing failures from blockers introduced by this session.
 
 ### Failure Classes
 
@@ -25,7 +25,7 @@ After **6 total test-fix rounds**, STOP trial-and-error. Write failure-log listi
 
 ### Success Rule
 
-Proceed to review only when:
+Proceed to retrospective/commit only when:
 
 1. all new regressions are fixed;
 2. baseline failures are documented;

package/bundled/dev-pipeline/templates/sections/test-failure-recovery-lite.md

@@ -1,6 +1,6 @@
 ## Test Failure Recovery Protocol
 
-Use this protocol whenever implementation tests fail. Its purpose is to distinguish tolerated pre-existing failures from blockers introduced by this session.
+Use this protocol whenever the post-review PrizmKit Test gate fails. Its purpose is to distinguish tolerated pre-existing failures from blockers introduced by this session.
 
 ### Failure Classes
 

package/bundled/dev-pipeline/tests/test_generate_bootstrap_prompt.py

@@ -406,7 +406,7 @@ class TestProcessModeBlocks:
 # ---------------------------------------------------------------------------
 
 class TestScopedFeatureTestGate:
-    def test_standard_sections_insert_prizmkit_test_between_implement_and_review(self):
+    def test_standard_sections_insert_prizmkit_test_after_review(self):
         sections_dir = Path(__file__).resolve().parents[1] / "templates" / "sections"
         sections = assemble_sections(
             "standard",
@@ -419,7 +419,7 @@ class TestScopedFeatureTestGate:
         names = [name for name, _ in sections]
 
         assert "phase-prizmkit-test" in names
-        assert names.index("phase-implement") < names.index("phase-prizmkit-test") < names.index("phase-review")
+        assert names.index("phase-implement") < names.index("phase-review") < names.index("phase-prizmkit-test")
 
         rendered = "\n".join(content for _, content in sections)
         assert "prizmkit-test-gate.py" in rendered
@@ -430,8 +430,12 @@ class TestScopedFeatureTestGate:
         assert ".prizmkit/refactor/" in rendered  # explicitly forbidden in the gate wording
         assert "latest_test_report=$(python3" not in rendered
         assert "boundary_columns_ok=$(awk" not in rendered
+        assert "Runs tests using `TEST_CMD` after each task" not in rendered
+        assert "Run the full test suite" not in rendered
+        assert "before code review" not in rendered
+        assert "Precondition: the `prizmkit-test` checkpoint is completed" not in rendered
 
-    def test_lite_sections_include_prizmkit_test_before_commit(self):
+    def test_lite_sections_include_review_before_prizmkit_test_and_commit(self):
         sections_dir = Path(__file__).resolve().parents[1] / "templates" / "sections"
         sections = assemble_sections(
             "lite",
@@ -444,10 +448,10 @@ class TestScopedFeatureTestGate:
         names = [name for name, _ in sections]
 
         assert "phase-prizmkit-test" in names
-        assert "phase-review" not in names
-        assert names.index("phase-implement") < names.index("phase-prizmkit-test") < names.index("phase-commit")
+        assert "phase-review" in names
+        assert names.index("phase-implement") < names.index("phase-review") < names.index("phase-prizmkit-test") < names.index("phase-commit")
 
-    def test_checkpoint_orders_prizmkit_test_between_implement_and_review(self):
+    def test_checkpoint_orders_prizmkit_test_after_review(self):
         sections_dir = Path(__file__).resolve().parents[1] / "templates" / "sections"
         sections = assemble_sections(
             "standard",
@@ -468,7 +472,7 @@ class TestScopedFeatureTestGate:
         )
         skills = [step["skill"] for step in checkpoint["steps"]]
 
-        assert skills.index("prizmkit-implement") < skills.index("prizmkit-test") < skills.index("prizmkit-code-review")
+        assert skills.index("prizmkit-implement") < skills.index("prizmkit-code-review") < skills.index("prizmkit-test")
         test_step = next(step for step in checkpoint["steps"] if step["skill"] == "prizmkit-test")
         assert test_step["required_artifacts"] == [
             ".prizmkit/specs/123-scope-test/test-report-path.txt",

package/bundled/dev-pipeline/tests/test_python_runner_parity.py

@@ -103,7 +103,7 @@ def test_python_parity_suite_declares_coverage_for_all_legacy_unix_snapshot_scen
         "envResolution": {
             "verboseAndStreamJson": ["test_python_env_resolution_scenarios_match_snapshot_contracts"],
             "effortModelAndCli": ["test_ai_session_command_builders_match_unix_runtime_snapshot"],
-            "worktreeIgnored": ["test_runner_environment_enables_worktree_by_default_and_accepts_falsey_opt_out"],
+            "worktreeIgnored": ["test_runner_environment_disables_worktree_by_default_and_accepts_truthy_opt_in"],
             "autoPushFlag": ["test_successful_worktree_session_merges_cleans_branch_and_honors_auto_push"],
         },
         "aiCliCommands": {
@@ -291,7 +291,7 @@ def test_runner_models_parse_legacy_args_and_environment(tmp_path):
     invocation = parse_invocation(
         family,
         "run",
-        ("custom-list.json", "F-2", "--features", "F-003:F-001", "--max-infra-retries=5", "--mode", "full", "--critic"),
+        ("custom-list.json", "F-2", "--features", "F-003:F-001", "--max-retries", "7", "--max-infra-retries=5", "--mode", "full", "--critic"),
     )
     env = RunnerEnvironment.from_env(
         {
@@ -300,6 +300,7 @@ def test_runner_models_parse_legacy_args_and_environment(tmp_path):
             "DEV_BRANCH": "dev/custom",
             "VERBOSE": "1",
             "STALE_KILL_THRESHOLD": "9",
+            "MAX_RETRIES": "9",
             "STRICT_BEHAVIOR_CHECK": "false",
         }
     )
@@ -307,6 +308,7 @@ def test_runner_models_parse_legacy_args_and_environment(tmp_path):
     assert invocation.list_path == Path("custom-list.json")
     assert invocation.item_id == "F-002"
     assert invocation.item_filter == "F-003:F-001"
+    assert invocation.max_retries == 7
     assert invocation.max_infra_retries == 5
     assert invocation.mode == "full"
     assert invocation.critic is True
@@ -314,16 +316,18 @@ def test_runner_models_parse_legacy_args_and_environment(tmp_path):
     assert env.auto_push is True
     assert env.dev_branch == "dev/custom"
     assert env.stale_kill_threshold_seconds == 9
+    assert env.max_retries == 9
     assert env.strict_behavior_check is False
 
 
-def test_runner_environment_enables_worktree_by_default_and_accepts_falsey_opt_out():
+def test_runner_environment_disables_worktree_by_default_and_accepts_truthy_opt_in():
     from prizmkit_runtime.runner_models import RunnerEnvironment
 
-    assert RunnerEnvironment.from_env({}).use_worktree is True
-    assert RunnerEnvironment.from_env({"USE_WORKTREE": "1"}).use_worktree is True
-    assert RunnerEnvironment.from_env({"USE_WORKTREE": "true"}).use_worktree is True
-    assert RunnerEnvironment.from_env({"USE_WORKTREE": "unexpected"}).use_worktree is True
+    assert RunnerEnvironment.from_env({}).use_worktree is False
+    assert RunnerEnvironment.from_env({"USE_WORKTREE": "unexpected"}).use_worktree is False
+
+    for truthy in ("1", "true", "yes", "on"):
+        assert RunnerEnvironment.from_env({"USE_WORKTREE": truthy}).use_worktree is True
 
     for falsey in ("0", "false", "no", "off"):
         assert RunnerEnvironment.from_env({"USE_WORKTREE": falsey}).use_worktree is False
@@ -355,6 +359,91 @@ def test_status_bridge_preserves_feature_filter_selection(tmp_path):
     assert update.data["context_overflow_count"] == 1
 
 
+def test_status_bridge_passes_max_retries_from_invocation_or_environment(monkeypatch, tmp_path):
+    import subprocess
+    from prizmkit_runtime.runner_models import family_for, parse_invocation
+    from prizmkit_runtime.runner_status import status_text
+
+    paths = _make_paths(tmp_path)
+    family = family_for("feature", paths)
+    explicit = parse_invocation(family, "run", ("--max-retries", "8"))
+    explicit = explicit.__class__(**{**explicit.__dict__, "list_path": paths.feature_plan})
+    fallback = parse_invocation(family, "run", ())
+    fallback = fallback.__class__(**{**fallback.__dict__, "list_path": paths.feature_plan})
+    calls = []
+
+    def fake_run(command, **kwargs):
+        calls.append(tuple(command))
+        return subprocess.CompletedProcess(command, 0, stdout="PIPELINE_COMPLETE\n", stderr="")
+
+    monkeypatch.setattr(subprocess, "run", fake_run)
+    monkeypatch.setenv("MAX_RETRIES", "6")
+
+    status_text(family, explicit, paths.project_root)
+    status_text(family, fallback, paths.project_root)
+
+    first = calls[0]
+    second = calls[1]
+    assert first[first.index("--max-retries") + 1] == "8"
+    assert second[second.index("--max-retries") + 1] == "6"
+
+
+def test_stop_on_failure_does_not_stop_on_retryable_pending(monkeypatch, tmp_path):
+    from prizmkit_runtime import runners
+    from prizmkit_runtime.runner_models import family_for, parse_invocation
+
+    paths = _make_paths(tmp_path)
+    family = family_for("feature", paths)
+    invocation = parse_invocation(family, "run", ())
+    invocation = invocation.__class__(**{**invocation.__dict__, "list_path": paths.feature_plan})
+    queue = [
+        SimpleNamespace(ok=True, stdout=json.dumps({"feature_id": "F-001"}), data={"feature_id": "F-001"}, text=""),
+        SimpleNamespace(ok=True, stdout=json.dumps({"feature_id": "F-002"}), data={"feature_id": "F-002"}, text=""),
+        SimpleNamespace(ok=True, stdout="PIPELINE_COMPLETE\n", data=None, text="PIPELINE_COMPLETE"),
+    ]
+    processed = []
+
+    monkeypatch.setenv("STOP_ON_FAILURE", "1")
+    monkeypatch.setattr(runners, "get_next", lambda *args, **kwargs: queue.pop(0))
+
+    def fake_process(_family, _invocation, item_id, _paths, *, initial_metadata):
+        processed.append(item_id)
+        return "pending" if item_id == "F-001" else "completed"
+
+    monkeypatch.setattr(runners, "_process_item", fake_process)
+
+    result = runners._run_pipeline(family, invocation, paths)
+
+    assert processed == ["F-001", "F-002"]
+    assert result.completed is True
+    assert result.stopped_reason == "pipeline_complete"
+    assert result.details == ("F-001:pending", "F-002:completed")
+
+
+def test_stop_on_failure_still_stops_on_terminal_status(monkeypatch, tmp_path):
+    from prizmkit_runtime import runners
+    from prizmkit_runtime.runner_models import family_for, parse_invocation
+
+    paths = _make_paths(tmp_path)
+    family = family_for("feature", paths)
+    invocation = parse_invocation(family, "run", ())
+    invocation = invocation.__class__(**{**invocation.__dict__, "list_path": paths.feature_plan})
+
+    monkeypatch.setenv("STOP_ON_FAILURE", "1")
+    monkeypatch.setattr(
+        runners,
+        "get_next",
+        lambda *args, **kwargs: SimpleNamespace(ok=True, stdout=json.dumps({"feature_id": "F-001"}), data={"feature_id": "F-001"}, text=""),
+    )
+    monkeypatch.setattr(runners, "_process_item", lambda *args, **kwargs: "failed")
+
+    result = runners._run_pipeline(family, invocation, paths)
+
+    assert result.completed is False
+    assert result.stopped_reason == "stop_on_failure"
+    assert result.last_status == "failed"
+
+
 def test_prompt_generation_result_preserves_per_item_model(monkeypatch, tmp_path):
     from prizmkit_runtime.runner_models import SessionPaths, family_for, parse_invocation
     from prizmkit_runtime.runner_prompts import generate_prompt
@@ -551,10 +640,11 @@ def _install_runner_session_fakes(monkeypatch, runners, *, statuses=("success",)
 
 
 @pytest.mark.parametrize(("kind", "item_id", "branch"), [("feature", "F-001", "dev/F-001-test"), ("bugfix", "B-001", "bugfix/B-001-test")])
-def test_feature_and_bugfix_default_worktree_launches_from_worktree_and_renders_worktree_root(monkeypatch, tmp_path, kind, item_id, branch):
+def test_feature_and_bugfix_explicit_worktree_launches_from_worktree_and_renders_worktree_root(monkeypatch, tmp_path, kind, item_id, branch):
     from prizmkit_runtime import runners
     from prizmkit_runtime.runner_models import family_for, parse_invocation
 
+    monkeypatch.setenv("USE_WORKTREE", "1")
     monkeypatch.setenv("DEV_BRANCH", branch)
     paths = _make_paths(tmp_path / kind)
     family = family_for(kind, paths)
@@ -584,6 +674,7 @@ def test_successful_worktree_session_merges_cleans_branch_and_honors_auto_push(m
     from prizmkit_runtime import runners
     from prizmkit_runtime.runner_models import family_for, parse_invocation
 
+    monkeypatch.setenv("USE_WORKTREE", "1")
     monkeypatch.setenv("DEV_BRANCH", "dev/F-001-test")
     monkeypatch.setenv("AUTO_PUSH", "1")
     paths = _make_paths(tmp_path)
@@ -604,6 +695,7 @@ def test_worktree_merge_conflict_writes_session_status_and_updates_merge_conflic
     from prizmkit_runtime import runners
     from prizmkit_runtime.runner_models import family_for, parse_invocation
 
+    monkeypatch.setenv("USE_WORKTREE", "1")
     monkeypatch.setenv("DEV_BRANCH", "dev/F-001-test")
     paths = _make_paths(tmp_path)
     family = family_for("feature", paths)
@@ -631,6 +723,7 @@ def test_terminal_worktree_failure_saves_wip_and_removes_worktree_without_deleti
     from prizmkit_runtime import runners
     from prizmkit_runtime.runner_models import family_for, parse_invocation
 
+    monkeypatch.setenv("USE_WORKTREE", "1")
     monkeypatch.setenv("DEV_BRANCH", "dev/F-001-test")
     paths = _make_paths(tmp_path)
     family = family_for("feature", paths)
@@ -647,7 +740,7 @@ def test_terminal_worktree_failure_saves_wip_and_removes_worktree_without_deleti
     assert observed.updates[-1][0] == "crashed"
 
 
-def test_default_worktree_materializes_ignored_support_assets_before_prompt_and_launch(monkeypatch, tmp_path):
+def test_explicit_worktree_materializes_ignored_support_assets_before_prompt_and_launch(monkeypatch, tmp_path):
     from prizmkit_runtime import runners
     from prizmkit_runtime.paths import resolve_runtime_paths
     from prizmkit_runtime.runner_models import PromptGenerationResult, SessionClassification, family_for, parse_invocation
@@ -678,6 +771,7 @@ def test_default_worktree_materializes_ignored_support_assets_before_prompt_and_
     invocation = invocation.__class__(**{**invocation.__dict__, "list_path": paths.feature_plan})
     launch_cwds = []
 
+    monkeypatch.setenv("USE_WORKTREE", "1")
     monkeypatch.setenv("DEV_BRANCH", "dev/F-001-support-assets")
     monkeypatch.setattr(
         runners,
@@ -742,11 +836,10 @@ def test_default_worktree_materializes_ignored_support_assets_before_prompt_and_
     assert not launch_cwds[0].exists()
 
 
-def test_use_worktree_false_preserves_main_worktree_branch_launch(monkeypatch, tmp_path):
+def test_default_no_worktree_preserves_main_worktree_branch_launch(monkeypatch, tmp_path):
     from prizmkit_runtime import runners
     from prizmkit_runtime.runner_models import family_for, parse_invocation
 
-    monkeypatch.setenv("USE_WORKTREE", "0")
     monkeypatch.setenv("DEV_BRANCH", "dev/F-001-test")
     paths = _make_paths(tmp_path)
     family = family_for("feature", paths)
@@ -775,6 +868,7 @@ def test_context_overflow_reuses_worktree_and_skips_cleanup_until_terminal_outco
     from prizmkit_runtime import runners
     from prizmkit_runtime.runner_models import family_for, parse_invocation
 
+    monkeypatch.setenv("USE_WORKTREE", "1")
     monkeypatch.setenv("DEV_BRANCH", "dev/F-001-test")
     paths = _make_paths(tmp_path)
     family = family_for("feature", paths)
@@ -1029,6 +1123,7 @@ def test_python_daemon_controlled_start_status_stop_matches_snapshot(tmp_path):
         "#!/usr/bin/env python3\n"
         "import os, sys, time\n"
         "print('payload env=' + os.environ.get('FOO', ''))\n"
+        "print('payload live=' + os.environ.get('PRIZMKIT_LIVE_OUTPUT', ''))\n"
         "print('payload args=' + ' '.join(sys.argv[1:]))\n"
         "sys.stdout.flush()\n"
         "time.sleep(30)\n",
@@ -1059,6 +1154,7 @@ def test_python_daemon_controlled_start_status_stop_matches_snapshot(tmp_path):
     assert json.loads(stop.render())["message"] in {"stopped", "already exited", "not running"}
     log_text = (paths.feature_state_dir / "pipeline-daemon.log").read_text(encoding="utf-8")
     assert "FOO=bar" in log_text or "payload env=bar" in log_text
+    assert "payload live=0" in log_text
     assert "--project-root" in log_text
 
 

package/bundled/dev-pipeline/tests/test_unified_cli.py

@@ -617,6 +617,82 @@ def test_session_dual_writes_progress_and_recovers_backup(tmp_path):
     assert second_log.read_text(encoding="utf-8") == "larger recovered log"
 
 
+def test_session_live_output_prints_paths_and_verbose_cli_output(tmp_path, capsys):
+    from prizmkit_runtime.sessions import AISessionConfig, AISessionLauncher
+
+    fake_cli = tmp_path / "live_cli.py"
+    fake_cli.write_text(
+        "#!/usr/bin/env python3\n"
+        "print('live-line', flush=True)\n",
+        encoding="utf-8",
+    )
+    fake_cli.chmod(0o755)
+    prompt = tmp_path / "prompt.md"
+    prompt.write_text("hello", encoding="utf-8")
+    session_log = tmp_path / "state" / "sessions" / "sess-live" / "logs" / "session.log"
+    progress = session_log.with_name("progress.json")
+    heartbeat = session_log.with_name("heartbeat.json")
+
+    result = AISessionLauncher(
+        AISessionConfig(
+            cli_command=str(fake_cli),
+            platform="codebuddy",
+            model=None,
+            prompt_path=prompt,
+            cwd=tmp_path,
+            log_path=session_log,
+            progress_path=progress,
+            heartbeat_path=heartbeat,
+            verbose=True,
+            live_output=True,
+        )
+    ).run()
+
+    captured = capsys.readouterr()
+    assert result.exit_code == 0
+    assert "live-line" in captured.out
+    assert "[prizmkit] AI session started" in captured.err
+    assert f"[prizmkit] Prompt: {prompt}" in captured.err
+    assert f"[prizmkit] Session log: {session_log}" in captured.err
+    assert f"[prizmkit] Progress: {progress}" in captured.err
+    assert f"[prizmkit] Heartbeat: {heartbeat}" in captured.err
+    assert "[prizmkit] AI session finished" in captured.err
+
+
+def test_session_live_output_does_not_forward_cli_output_without_verbose(tmp_path, capsys):
+    from prizmkit_runtime.sessions import AISessionConfig, AISessionLauncher
+
+    fake_cli = tmp_path / "quiet_cli.py"
+    fake_cli.write_text(
+        "#!/usr/bin/env python3\n"
+        "print('hidden-line', flush=True)\n",
+        encoding="utf-8",
+    )
+    fake_cli.chmod(0o755)
+    prompt = tmp_path / "prompt.md"
+    prompt.write_text("hello", encoding="utf-8")
+    session_log = tmp_path / "state" / "sessions" / "sess-quiet" / "logs" / "session.log"
+
+    result = AISessionLauncher(
+        AISessionConfig(
+            cli_command=str(fake_cli),
+            platform="codebuddy",
+            model=None,
+            prompt_path=prompt,
+            cwd=tmp_path,
+            log_path=session_log,
+            live_output=True,
+        )
+    ).run()
+
+    captured = capsys.readouterr()
+    assert result.exit_code == 0
+    assert "hidden-line" not in captured.out
+    assert "hidden-line" in session_log.read_text(encoding="utf-8")
+    assert "[prizmkit] AI session started" in captured.err
+    assert "[prizmkit] AI session finished" in captured.err
+
+
 def test_session_final_progress_merge_preserves_tracker_fatal_error(tmp_path):
     from prizmkit_runtime.sessions import AISessionConfig, AISessionLauncher
 

package/bundled/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.101",
+  "version": "1.1.104",
   "skills": {
     "prizm-kit": {
       "description": "Full-lifecycle dev toolkit. Covers spec-driven development, Prizm context docs, code quality, debugging, deployment, and knowledge management.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prizmkit",
-  "version": "1.1.101",
+  "version": "1.1.104",
   "description": "Create a new PrizmKit-powered project with clean initialization — no framework dev files, just what you need.",
   "type": "module",
   "bin": {

package/src/config.js

@@ -54,7 +54,7 @@ import {
   confirmTeamMode,
   confirmPipeline,
 } from './prompts.js';
-import { expandPlatforms, isKnownPlatform, platformLabel, projectMemoryFile } from './platforms.js';
+import { isKnownPlatform, platformLabel, projectMemoryFile, resolvePayloadPlatforms } from './platforms.js';
 import { normalizeRuntime, runtimeLabel } from './runtimes.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -490,9 +490,9 @@ export async function runConfig(directory, options = {}) {
   }
 
   // Warn about destructive changes
-  if (newConfig.platform !== currentConfig.platform) {
-    const oldPlatforms = expandPlatforms(currentConfig.platform);
-    const newPlatforms = expandPlatforms(newConfig.platform);
+  if (newConfig.platform !== currentConfig.platform || newConfig.aiCli !== currentConfig.aiCli) {
+    const oldPlatforms = resolvePayloadPlatforms(currentConfig.platform, currentConfig.aiCli);
+    const newPlatforms = resolvePayloadPlatforms(newConfig.platform, newConfig.aiCli);
     const dropping = oldPlatforms.filter(p => !newPlatforms.includes(p));
     if (dropping.length) {
       console.log(chalk.yellow(`\n  ⚠ 将移除 ${dropping.map(platformLabel).join(', ')} 的 PrizmKit 文件`));
@@ -521,8 +521,8 @@ export async function runConfig(directory, options = {}) {
 
   console.log(chalk.bold('\n  应用配置变更...\n'));
 
-  const oldPlatforms = expandPlatforms(currentConfig.platform);
-  const newPlatforms = expandPlatforms(newConfig.platform);
+  const oldPlatforms = resolvePayloadPlatforms(currentConfig.platform, currentConfig.aiCli);
+  const newPlatforms = resolvePayloadPlatforms(newConfig.platform, newConfig.aiCli);
   const platformsToRemove = oldPlatforms.filter(p => !newPlatforms.includes(p));
   const platformsToAdd = newPlatforms.filter(p => !oldPlatforms.includes(p));
   const platformsToUpdate = newPlatforms.filter(p => oldPlatforms.includes(p));
@@ -554,7 +554,7 @@ export async function runConfig(directory, options = {}) {
       version: pkg.version, platform: newConfig.platform, suite: newConfig.suite,
       skills: newSkillList, agents: newAgentFiles, rules: newRuleFiles,
       pipeline: newPipelineFiles, team: newConfig.team, aiCli: newConfig.aiCli,
-      runtime: newConfig.runtime, rulesPreset: newConfig.rules, extras: oldManifest?.files?.extras || [],
+      runtime: newConfig.runtime, rulesPreset: newConfig.rules, extras: oldManifest?.files?.extras || [], payloadPlatforms: newPlatforms,
     });
     const diff = diffManifest(oldManifest, newTempManifest);
 
@@ -580,6 +580,7 @@ export async function runConfig(directory, options = {}) {
     || newConfig.runtime !== currentConfig.runtime
     || newConfig.suite !== currentConfig.suite
     || newConfig.rules !== currentConfig.rules
+    || newConfig.aiCli !== currentConfig.aiCli
     || newConfig.team !== currentConfig.team;
 
   for (const p of allTargetPlatforms) {
@@ -675,6 +676,7 @@ export async function runConfig(directory, options = {}) {
     team: newConfig.team,
     aiCli: newConfig.aiCli,
     rulesPreset: newConfig.rules,
+    payloadPlatforms: newPlatforms,
     extras: oldManifest?.files?.extras || [],
   });
 

package/src/external-skills.js

@@ -14,7 +14,7 @@
 import { execSync } from 'node:child_process';
 import path from 'path';
 import fs from 'fs-extra';
-import { expandPlatforms } from './platforms.js';
+import { resolvePayloadPlatforms } from './platforms.js';
 
 /**
  * @param {Object} skill        - Skill definition from external_skills.known
@@ -23,9 +23,9 @@ import { expandPlatforms } from './platforms.js';
  *   skill.installAll {boolean} - If true, install all skills from the repo
  * @param {string} platform     - 'claude' | 'codebuddy' | 'codex' | 'all' ('both' supported only for legacy manifests)
  * @param {string} projectRoot  - Target project root
- * @param {boolean} dryRun
+ * @param {string} [aiCli]       - optional AI CLI command that may require an additional payload platform
  */
-export async function installExternalSkill(skill, platform, projectRoot, dryRun) {
+export async function installExternalSkill(skill, platform, projectRoot, dryRun, aiCli = '') {
   if (!skill.repo) {
     throw new Error(`Skill "${skill.name}" has no repo URL defined`);
   }
@@ -40,7 +40,7 @@ export async function installExternalSkill(skill, platform, projectRoot, dryRun)
     if (skill.installAll) {
       console.log(`      [dry-run] → all skills from ${skill.repo}`);
     } else {
-      const targets = getTargetDirs(platform, projectRoot)
+      const targets = getTargetDirs(platform, projectRoot, aiCli)
         .map(d => path.relative(projectRoot, path.join(d, skill.name, 'SKILL.md')));
       for (const t of targets) console.log(`      [dry-run] → ${t}`);
     }
@@ -61,7 +61,7 @@ export async function installExternalSkill(skill, platform, projectRoot, dryRun)
       .filter(d => d.isDirectory())
       .map(d => d.name);
 
-    for (const targetDir of getTargetDirs(platform, projectRoot)) {
+    for (const targetDir of getTargetDirs(platform, projectRoot, aiCli)) {
       for (const skillName of skillDirs) {
         const srcDir = path.join(agentsSkillsDir, skillName);
         const destDir = path.join(targetDir, skillName);
@@ -81,7 +81,7 @@ export async function installExternalSkill(skill, platform, projectRoot, dryRun)
 
     const content = await fs.readFile(canonicalSkillMd, 'utf8');
 
-    for (const targetDir of getTargetDirs(platform, projectRoot)) {
+    for (const targetDir of getTargetDirs(platform, projectRoot, aiCli)) {
       const skillDir = path.join(targetDir, skill.name);
       if (path.resolve(skillDir) === path.resolve(path.dirname(canonicalSkillMd))) {
         continue;
@@ -94,7 +94,7 @@ export async function installExternalSkill(skill, platform, projectRoot, dryRun)
 
   // Clean up npx skills artifacts after copying. Preserve .agents/skills when
   // Codex is selected because it is the official repository skill location.
-  if (!expandPlatforms(platform).includes('codex')) {
+  if (!resolvePayloadPlatforms(platform, aiCli).includes('codex')) {
     await fs.remove(path.join(projectRoot, '.agents')).catch(() => {});
   }
   await fs.remove(path.join(projectRoot, 'skills-lock.json')).catch(() => {});
@@ -104,15 +104,15 @@ export async function installExternalSkill(skill, platform, projectRoot, dryRun)
  * Remove all artifacts created by `npx skills` that are not needed by PrizmKit.
  * Call this once after all external skills have been installed.
  *
- * @param {string} projectRoot
  * @param {string} platform - 'claude' | 'codebuddy' | 'codex' | 'all' ('both' supported only for legacy manifests)
+ * @param {string} [aiCli] - optional AI CLI command that may require an additional payload platform
  */
-export async function cleanExternalSkillArtifacts(projectRoot, platform) {
+export async function cleanExternalSkillArtifacts(projectRoot, platform, aiCli = '') {
   const keepDirs = new Set(
-    getTargetDirs(platform, projectRoot).map(d => path.resolve(d))
+    getTargetDirs(platform, projectRoot, aiCli).map(d => path.resolve(d))
   );
 
-  const selectedPlatforms = expandPlatforms(platform);
+  const selectedPlatforms = resolvePayloadPlatforms(platform, aiCli);
   const dirsToCheck = [
     selectedPlatforms.includes('codex') ? null : '.agents',
     '.agent',
@@ -152,7 +152,7 @@ export async function cleanExternalSkillArtifacts(projectRoot, platform) {
     const abs = path.join(projectRoot, dir);
     if (!await fs.pathExists(abs)) continue;
     // Only remove if this platform dir is entirely unneeded
-    const isKept = getTargetDirs(platform, projectRoot)
+    const isKept = getTargetDirs(platform, projectRoot, aiCli)
       .some(d => path.resolve(d).startsWith(path.resolve(abs) + path.sep));
     if (isKept) continue;
     try {
@@ -166,8 +166,8 @@ export async function cleanExternalSkillArtifacts(projectRoot, platform) {
   await fs.remove(path.join(projectRoot, 'skills-lock.json')).catch(() => {});
 }
 
-function getTargetDirs(platform, projectRoot) {
-  return expandPlatforms(platform).map(p => {
+function getTargetDirs(platform, projectRoot, aiCli = '') {
+  return resolvePayloadPlatforms(platform, aiCli).map(p => {
     if (p === 'codebuddy') return path.join(projectRoot, '.codebuddy', 'skills');
     if (p === 'codex') return path.join(projectRoot, '.agents', 'skills');
     return path.join(projectRoot, '.claude', 'skills');

package/src/manifest.js

@@ -9,7 +9,7 @@
 
 import fs from 'fs-extra';
 import path from 'path';
-import { expandPlatforms, projectMemoryFile } from './platforms.js';
+import { projectMemoryFile, resolvePayloadPlatforms } from './platforms.js';
 import { normalizeRuntime } from './runtimes.js';
 
 const MANIFEST_FILE = 'manifest.json';
@@ -58,7 +58,7 @@ export async function writeManifest(projectRoot, data) {
  * @param {boolean} params.team - whether team config was installed
  * @param {string} [params.aiCli] - AI CLI command
  * @param {string} [params.rulesPreset] - rules preset name
- * @param {string[]} [params.extras] - installed extras (e.g. ['playwright-cli'])
+ * @param {string[]} [params.payloadPlatforms] - concrete platform payloads installed for platform + aiCli
  * @returns {Object} manifest
  */
 export function buildManifest({
@@ -74,8 +74,12 @@ export function buildManifest({
   aiCli,
   rulesPreset,
   extras,
+  payloadPlatforms,
 }) {
   const now = new Date().toISOString();
+  const installedPayloadPlatforms = payloadPlatforms?.length
+    ? [...new Set(payloadPlatforms)]
+    : resolvePayloadPlatforms(platform, aiCli);
   return {
     version,
     installedAt: now,
@@ -95,7 +99,8 @@ export function buildManifest({
       rules: [...rules],
       pipeline: pipeline ? [...pipeline] : [],
       extras: extras ? [...extras] : [],
-      other: [...new Set(expandPlatforms(platform).map(projectMemoryFile).filter(Boolean))],
+      payloadPlatforms: installedPayloadPlatforms,
+      other: [...new Set(installedPayloadPlatforms.map(projectMemoryFile).filter(Boolean))],
     },
   };
 }

package/src/platforms.js

@@ -10,6 +10,31 @@ export function expandPlatforms(platform) {
   return PLATFORM_GROUPS[platform] || LEGACY_PLATFORM_GROUPS[platform] || [platform];
 }
 
+export function platformFromAiCli(aiCli) {
+  if (!aiCli || typeof aiCli !== 'string') return null;
+  const token = aiCli.trim().split(/\s+/)[0]?.replace(/^['"]|['"]$/g, '');
+  const name = token.split(/[\\/]/).pop()?.toLowerCase() || '';
+  if (name.includes('claude')) return 'claude';
+  if (name.includes('codex')) return 'codex';
+  if (name.includes('cbc') || name.includes('codebuddy')) return 'codebuddy';
+  return null;
+}
+
+export function uniquePlatforms(platforms) {
+  return [...new Set(platforms.filter(p => PLATFORM_IDS.includes(p)))];
+}
+
+export function resolvePayloadPlatforms(platform, aiCli = '') {
+  const selected = uniquePlatforms(expandPlatforms(platform));
+  const cliPlatform = platformFromAiCli(aiCli);
+  return uniquePlatforms([...selected, cliPlatform].filter(Boolean));
+}
+
+export function payloadPlatformLabel(platform, aiCli = '') {
+  const payload = resolvePayloadPlatforms(platform, aiCli);
+  return payload.map(platformLabel).join(' + ');
+}
+
 export function isKnownPlatform(platform) {
   return PLATFORM_IDS.includes(platform) || Object.hasOwn(PLATFORM_GROUPS, platform);
 }