@kyo-so/cli 0.2.0 → 0.3.0

package/README.ja.md

@@ -20,6 +20,14 @@ Kyoso はコード変更を適用しません。
 
 グローバルインストールは不要です。Kyoso は `npx` または `bunx` で実行します。
 
+### Claude Only / Codex Only
+
+Kyoso は Claude だけ、または Codex だけでも実行できます。利用できない backend は `kyoso.config.ts` で無効化してください。例は `examples/claude-only.config.ts` と `examples/codex-only.config.ts` にあります。
+
+single-agent mode では、残った backend が `combined_reviewer` として 1 回だけ実行され、implementation と architecture/security の両方を確認します。JSON output には `reviewMode: "single_agent"` と `agentsUsed` が入り、Markdown output には cross-model verification が行われていないことと disagreements が N/A であることを表示します。
+
+この mode では独立した cross-model validation はなく、自己レビュー bias が残ります。一方で、別プロセスの read-only review、temporary snapshots、adversarial review prompts、secret scanning、deterministic gates は利用できます。
+
 ### Claude Code
 
 1. Claude 認証を準備します。

package/README.md

@@ -18,6 +18,14 @@ Kyoso does not apply code changes.
 
 No global install is required. Run Kyoso through `npx` or `bunx`.
 
+### Claude Only / Codex Only
+
+Kyoso can run when only Claude or only Codex is available. Disable the missing backend in `kyoso.config.ts` using `examples/claude-only.config.ts` or `examples/codex-only.config.ts`.
+
+In single-agent mode, the remaining backend runs once as `combined_reviewer` and covers both implementation and architecture/security focus areas. JSON output includes `reviewMode: "single_agent"` and `agentsUsed`; Markdown output states that cross-model verification was not performed and marks disagreements as N/A.
+
+This mode does not provide independent cross-model validation and may retain self-review bias. It still provides a separate read-only review process, temporary snapshots, adversarial review prompts, secret scanning, and deterministic gates.
+
 ### Claude Code
 
 1. Prepare Claude authentication.

package/README.zh-CN.md

@@ -20,6 +20,14 @@ Kyoso 不会应用代码更改。
 
 无需全局安装。通过 `npx` 或 `bunx` 运行 Kyoso。
 
+### Claude Only / Codex Only
+
+Kyoso 可以在只有 Claude 或只有 Codex 可用时运行。请在 `kyoso.config.ts` 中禁用缺失的 backend；示例见 `examples/claude-only.config.ts` 和 `examples/codex-only.config.ts`。
+
+在 single-agent mode 中，剩余 backend 会以 `combined_reviewer` 运行一次，同时覆盖 implementation 和 architecture/security 两类关注点。JSON output 会包含 `reviewMode: "single_agent"` 和 `agentsUsed`；Markdown output 会说明未执行 cross-model verification，并将 disagreements 标记为 N/A。
+
+该 mode 不提供独立的 cross-model validation，仍可能有 self-review bias。它仍保留独立只读 review process、temporary snapshots、adversarial review prompts、secret scanning 和 deterministic gates。
+
 ### Claude Code
 
 1. 准备 Claude authentication。

package/dist/acp/prompts.d.ts

@@ -1,2 +1,2 @@
-import type { KyosoReviewRequest, ReviewTool } from "../core/types.js";
-export declare function buildAgentPrompt(tool: ReviewTool, request: KyosoReviewRequest, agent: "codex" | "claude"): string;
+import type { AgentName, AgentRole, KyosoReviewRequest, ReviewTool } from "../core/types.js";
+export declare function buildAgentPrompt(tool: ReviewTool, request: KyosoReviewRequest, agent: AgentName, role: AgentRole): string;

package/dist/bin/kyoso.js

@@ -169600,7 +169600,7 @@ function languageFromPath(path) {
 
 // src/cli/doctor.ts
 import { accessSync } from "node:fs";
-import { delimiter } from "node:path";
+import { delimiter as delimiter2 } from "node:path";
 
 // src/config/loadConfig.ts
 import { access as access2, readFile as readFile3 } from "node:fs/promises";
@@ -184013,7 +184013,11 @@ var agentSchema = exports_external.object({
   command: exports_external.string(),
   args: exports_external.array(exports_external.string()).default([]),
   model: exports_external.string().optional(),
-  role: exports_external.enum(["implementation_reviewer", "architecture_security_reviewer"]),
+  role: exports_external.enum([
+    "implementation_reviewer",
+    "architecture_security_reviewer",
+    "combined_reviewer"
+  ]),
   timeoutMs: exports_external.number().int().positive().default(120000),
   env: exports_external.record(exports_external.string(), exports_external.string()).default({}),
   auth: exports_external.object({
@@ -184293,7 +184297,7 @@ var REDACTION = "[KYOSO_REDACTED]";
 var DEFAULT_AGENT_TIMEOUT_MS = 120000;
 var RAW_OUTPUT_MAX_CHARS = 16384;
 var KYOSO_CHILD_AGENT = "KYOSO_CHILD_AGENT";
-var KYOSO_VERSION = "0.1.0";
+var KYOSO_VERSION = "0.3.0";
 
 // src/security/sanitizeText.ts
 var SENSITIVE_TEXT_PATTERNS = [
@@ -184555,7 +184559,7 @@ import { spawnSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { cp, mkdir as mkdir3, readFile as readFile4, writeFile as writeFile3 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { dirname as dirname4, join as join2 } from "node:path";
+import { delimiter, dirname as dirname4, join as join2 } from "node:path";
 import { fileURLToPath } from "node:url";
 async function runSetup(options) {
   const client = parseClient(options.client);
@@ -184564,6 +184568,7 @@ async function runSetup(options) {
   const context = {
     cwd: options.cwd,
     home: options.env?.HOME ?? homedir2(),
+    env: options.env ?? process.env,
     write: options.write,
     scope: options.global ? "global" : "project",
     mcpCommand: command,
@@ -184634,7 +184639,8 @@ async function setupCodex(context) {
       sourceDir: context.sourceSkillDir,
       destinationDir: skillDestination("codex", context.scope, context.cwd, context.home),
       write: context.write
-    })
+    }),
+    ...singleAgentAdvice(context, "codex")
   ];
 }
 async function setupClaudeCode(context) {
@@ -184645,7 +184651,8 @@ async function setupClaudeCode(context) {
       sourceDir: context.sourceSkillDir,
       destinationDir: skillDestination("claude-code", context.scope, context.cwd, context.home),
       write: context.write
-    })
+    }),
+    ...singleAgentAdvice(context, "claude-code")
   ];
 }
 async function ensureCodexMcp(context) {
@@ -184956,6 +184963,41 @@ function diffForJson(path, before, after) {
 function statusWord(value) {
   return value ? "ok" : "missing";
 }
+function singleAgentAdvice(context, client) {
+  if (client === "claude-code" && !commandExists("codex", context.env)) {
+    return [
+      {
+        title: "Single-agent config",
+        status: "skipped",
+        detail: [
+          "codex was not found on PATH. To use Claude only, add:",
+          "agents: {",
+          "  codex: { enabled: false },",
+          "}",
+          "Claude will run as combined_reviewer and cross-model verification will be marked unavailable."
+        ].join(`
+`)
+      }
+    ];
+  }
+  if (client === "codex" && !commandExists("claude", context.env)) {
+    return [
+      {
+        title: "Single-agent config",
+        status: "skipped",
+        detail: [
+          "claude was not found on PATH. To use Codex only, add:",
+          "agents: {",
+          "  claude: { enabled: false },",
+          "}",
+          "Codex will run as combined_reviewer and cross-model verification will be marked unavailable."
+        ].join(`
+`)
+      }
+    ];
+  }
+  return [];
+}
 function indent(value) {
   return value.split(`
 `).map((line) => `  ${line}`).join(`
@@ -184966,6 +185008,10 @@ function shellQuote(value) {
     return value;
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
+function commandExists(command, env) {
+  const paths = env.PATH?.split(delimiter) ?? [];
+  return paths.some((path) => existsSync(join2(path, command)));
+}
 function isMissingPathError2(error51) {
   return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT";
 }
@@ -184975,8 +185021,8 @@ async function runDoctor(options) {
   const env = options.env ?? process.env;
   const loaded = await loadConfig(options);
   const lines = ["Kyoso doctor", "", "Runtime"];
-  lines.push(`  Bun: ${commandExists("bun", env) ? "ok" : "warning not found"}`);
-  lines.push(`  Node/npm: ${commandExists("npm", env) ? "ok" : "warning npm not found"}`);
+  lines.push(`  Bun: ${commandExists2("bun", env) ? "ok" : "warning not found"}`);
+  lines.push(`  Node/npm: ${commandExists2("npm", env) ? "ok" : "warning npm not found"}`);
   lines.push("", "Config");
   lines.push(`  kyoso.config.ts: ${loaded.configPath ? `found ${loaded.configPath}` : "not found; using defaults"}`);
   lines.push(`  trusted config: ${formatTrustStatus(loaded.configTrustStatus)}`);
@@ -185004,12 +185050,16 @@ async function runDoctor(options) {
     lines.push("    next: run `npx @kyo-so/cli setup claude-code --write`");
   }
   lines.push("", "ACP agents");
+  const agentCommandExists = {
+    codex: commandExists2(loaded.config.agents.codex.command, env),
+    claude: commandExists2(loaded.config.agents.claude.command, env)
+  };
   for (const agent of ["codex", "claude"]) {
     const config2 = loaded.config.agents[agent];
-    const exists3 = commandExists(config2.command, env);
+    const exists3 = agentCommandExists[agent];
     lines.push(`  ${agent === "codex" ? "Codex" : "Claude"}: ${exists3 ? "ok" : "warning command not found"}`);
     lines.push(`    command: ${[config2.command, ...config2.args].join(" ")}`);
-    if (!exists3 && config2.command === "npx" && commandExists("bunx", env)) {
+    if (!exists3 && config2.command === "npx" && commandExists2("bunx", env)) {
       lines.push('    hint: replace command "npx" with "bunx" in kyoso.config.ts');
     }
     if (agent === "claude") {
@@ -185029,6 +185079,11 @@ async function runDoctor(options) {
       lines.push("    auth: detected or delegated");
     }
   }
+  if (agentCommandExists.codex !== agentCommandExists.claude) {
+    const missing = agentCommandExists.codex ? "claude" : "codex";
+    const remaining = agentCommandExists.codex ? "codex" : "claude";
+    lines.push(`  single-agent mode: set agents.${missing}.enabled: false to use ${remaining} only; the remaining agent will cover both review roles.`);
+  }
   const judgeProvider = loaded.config.judge.mode === "deterministic_only" ? "deterministic_fallback" : resolveJudgeProvider(loaded.config.judge.provider, env);
   lines.push("", "Judge");
   lines.push(`  provider: ${judgeProvider}`);
@@ -185063,8 +185118,8 @@ function formatClaudeDualAuthWarning(preferApiKey) {
 function hasEnv2(env, key) {
   return typeof env[key] === "string" && env[key].trim().length > 0;
 }
-function commandExists(command, env) {
-  const paths = env.PATH?.split(delimiter) ?? [];
+function commandExists2(command, env) {
+  const paths = env.PATH?.split(delimiter2) ?? [];
   return paths.some((path) => {
     try {
       accessSync(`${path}/${command}`);
@@ -198451,7 +198506,7 @@ function buildOpinion(agent, role, tool) {
 }
 
 // src/acp/prompts.ts
-function buildAgentPrompt(tool, request, agent) {
+function buildAgentPrompt(tool, request, agent, role) {
   const shared = [
     "You are running as a Kyoso child reviewer.",
     "Do not edit files.",
@@ -198464,15 +198519,26 @@ function buildAgentPrompt(tool, request, agent) {
     "Use empty arrays when no finding, test, risk, or question exists; do not copy the example finding."
   ].join(`
 `);
-  const role = agent === "codex" ? [
-    "You are the Codex implementation reviewer in Kyoso.",
-    "Focus on feasibility, minimal change, existing code consistency, regression risk, tests, migration risk, and maintainability."
-  ].join(`
-`) : [
-    "You are the Claude architecture and security reviewer in Kyoso.",
-    "Focus on architecture, threat modeling, authn/authz, secrets, privacy, secure defaults, CISA Secure by Design, and edge cases."
-  ].join(`
-`);
+  const roleInstructions = {
+    implementation_reviewer: [
+      "You are the implementation reviewer role in Kyoso.",
+      "Focus on feasibility, minimal change, existing code consistency, regression risk, tests, migration risk, and maintainability."
+    ].join(`
+`),
+    architecture_security_reviewer: [
+      "You are the architecture and security reviewer role in Kyoso.",
+      "Focus on architecture, threat modeling, authn/authz, secrets, privacy, secure defaults, CISA Secure by Design, and edge cases."
+    ].join(`
+`),
+    combined_reviewer: [
+      "You are the combined reviewer role in Kyoso.",
+      "Cover both implementation review and architecture/security review in one pass.",
+      "First assess feasibility, minimal change, existing code consistency, regression risk, tests, migration risk, and maintainability.",
+      "Then assess architecture, threat modeling, authn/authz, secrets, privacy, secure defaults, CISA Secure by Design, and edge cases.",
+      "Use finding category values so readers can distinguish implementation, architecture, and security concerns."
+    ].join(`
+`)
+  };
   const cisaInstruction = tool === "security_review" ? [
     "For security_review, include cisaMapping on each security-relevant finding when applicable.",
     "Also include cisaSecureByDesign with all four gate dimensions."
@@ -198480,7 +198546,9 @@ function buildAgentPrompt(tool, request, agent) {
 `) : "For plan_review and diff_review, include cisaMapping and cisaSecureByDesign only when relevant.";
   return `${shared}
 
-${role}
+Agent: ${agent}
+Role: ${role}
+${roleInstructions[role]}
 
 Tool: ${tool}
 ${cisaInstruction}
@@ -199067,6 +199135,7 @@ function renderMarkdownResult(tool, result, options = {}) {
     `**Decision:** ${result.decision}`,
     `**Mode:** ${tool}`,
     `**Agents:** ${result.agentOpinions.map((opinion) => `${title(opinion.agent)} ${opinion.status}`).join(", ")}`,
+    `**Review mode:** ${formatReviewMode(result)}`,
     `**Degraded:** ${String(result.degraded)}`,
     "",
     "## Summary",
@@ -199093,7 +199162,11 @@ function renderMarkdownResult(tool, result, options = {}) {
     lines.push(`### ${title(opinion.agent)}`, "", `${opinion.summary} (${opinion.status})`, "");
   }
   lines.push("", "## Disagreements", "");
-  lines.push(...result.disagreements.length > 0 ? result.disagreements.map((item) => `- ${item.topic}: ${item.judgeComment}`) : ["- None."]);
+  if (result.reviewMode === "single_agent") {
+    lines.push("- N/A - single-agent review.");
+  } else {
+    lines.push(...result.disagreements.length > 0 ? result.disagreements.map((item) => `- ${item.topic}: ${item.judgeComment}`) : ["- None."]);
+  }
   lines.push("", "## Notes", "", "Kyoso did not modify files. Review was performed on a temporary snapshot.");
   if (result.audit.networkMode === "unrestricted") {
     lines.push("Network mode was unrestricted. File modification policy remained denied.");
@@ -199107,6 +199180,14 @@ function defaultSummaryText(result) {
 function title(value) {
   return value.slice(0, 1).toUpperCase() + value.slice(1);
 }
+function formatReviewMode(result) {
+  if (result.reviewMode !== "single_agent")
+    return "multi-agent";
+  const opinion = result.agentOpinions[0];
+  const agent = opinion ? title(opinion.agent) : "single agent";
+  const role = opinion?.role === "combined_reviewer" ? "combined role" : "configured role";
+  return `single-agent (${agent}, ${role}; cross-model verification was not performed)`;
+}
 function notes(items) {
   return (items[0] ?? "No notes.").replaceAll("|", "\\|");
 }
@@ -199333,8 +199414,8 @@ async function createSnapshot(traceId, tool, request, options = {}) {
   }
   await writeFile5(join5(contextDir, "request.json"), JSON.stringify(stripContents(request), null, 2), "utf8");
   await writeFile5(join5(contextDir, "selected_files_manifest.json"), JSON.stringify(buildSelectedFilesManifest(request), null, 2), "utf8");
-  await writeFile5(join5(contextDir, "instructions.codex.md"), buildAgentPrompt(tool, request, "codex"), "utf8");
-  await writeFile5(join5(contextDir, "instructions.claude.md"), buildAgentPrompt(tool, request, "claude"), "utf8");
+  await writeFile5(join5(contextDir, "instructions.codex.md"), buildAgentPrompt(tool, request, "codex", options.agentRoles?.codex ?? "implementation_reviewer"), "utf8");
+  await writeFile5(join5(contextDir, "instructions.claude.md"), buildAgentPrompt(tool, request, "claude", options.agentRoles?.claude ?? "architecture_security_reviewer"), "utf8");
   if (request.repoSummary)
     await writeFile5(join5(contextDir, "repo_summary.md"), request.repoSummary, "utf8");
   if (request.currentPlan)
@@ -199496,9 +199577,11 @@ async function runReview(tool, request, options = {}) {
       allowPatterns
     });
     warnings.push(...built.warnings);
+    const agentRoles = resolveAgentRoles(loaded.config);
     snapshot = await createSnapshot(traceId, tool, built.request, {
       denyPatterns,
-      allowPatterns
+      allowPatterns,
+      agentRoles
     });
     await trace.write({
       type: "snapshot_created",
@@ -199518,6 +199601,8 @@ async function runReview(tool, request, options = {}) {
       trace
     });
     const normalizedAgentResults = agentResults.map(normalizeAgentRunResult);
+    const agentsUsed = normalizedAgentResults.map((result2) => result2.agent);
+    const reviewMode = agentsUsed.length === 1 ? "single_agent" : "multi_agent";
     const completed = normalizedAgentResults.filter((result2) => result2.status === "completed");
     const degraded = completed.length !== agentResults.length;
     let aggregate = aggregateAgentResults(normalizedAgentResults);
@@ -199569,6 +199654,8 @@ async function runReview(tool, request, options = {}) {
     const resultWithoutMarkdown = {
       decision,
       degraded,
+      agentsUsed,
+      reviewMode,
       findings: aggregate.findings,
       cisaSecureByDesign: cisa,
       disagreements: aggregate.disagreements,
@@ -199581,7 +199668,7 @@ async function runReview(tool, request, options = {}) {
         traceId,
         startedAt,
         completedAt,
-        agentsUsed: normalizedAgentResults.map((result2) => result2.agent),
+        agentsUsed,
         redactionsApplied: secretScan.redactions,
         networkMode,
         workspaceMode: "temp_snapshot",
@@ -199640,12 +199727,13 @@ async function runReview(tool, request, options = {}) {
   }
 }
 async function runAgents(input2) {
+  const agentRoles = resolveAgentRoles(input2.config);
   const agentInputs = ["codex", "claude"].filter((agent) => input2.config.agents[agent].enabled).map((agent) => ({
     traceId: input2.traceId,
     agent,
-    role: input2.config.agents[agent].role,
+    role: agentRoles[agent] ?? input2.config.agents[agent].role,
     tool: input2.tool,
-    prompt: buildAgentPrompt(input2.tool, input2.request, agent),
+    prompt: buildAgentPrompt(input2.tool, input2.request, agent, agentRoles[agent] ?? input2.config.agents[agent].role),
     workspaceDir: input2.workspaceDir,
     timeoutMs: input2.request.options?.maxAgentTimeoutMs ?? input2.config.agents[agent].timeoutMs ?? DEFAULT_AGENT_TIMEOUT_MS,
     networkMode: input2.networkMode
@@ -199654,6 +199742,7 @@ async function runAgents(input2) {
     type: "agent_started",
     traceId: input2.traceId,
     agent: agentInput.agent,
+    role: agentInput.role,
     timestamp: new Date().toISOString()
   })));
   const results = await input2.manager.runAll(agentInputs);
@@ -199662,6 +199751,7 @@ async function runAgents(input2) {
       type: "agent_completed",
       traceId: input2.traceId,
       agent: result.agent,
+      role: result.role,
       status: result.status,
       startedAt: result.startedAt,
       completedAt: result.completedAt,
@@ -199678,6 +199768,15 @@ async function runAgents(input2) {
   }));
   return results;
 }
+function resolveAgentRoles(config2) {
+  const enabledAgents = ["codex", "claude"].filter((agent) => config2.agents[agent].enabled);
+  const singleAgentMode = enabledAgents.length === 1;
+  const roles = {};
+  for (const agent of enabledAgents) {
+    roles[agent] = singleAgentMode ? "combined_reviewer" : config2.agents[agent].role;
+  }
+  return roles;
+}
 function defaultAgentManager(config2) {
   if (process.env.KYOSO_TEST_FAKE_AGENTS === "1")
     return new FakeAgentManager;
@@ -199715,6 +199814,8 @@ async function buildSecretBlockResult(input2) {
   const resultWithoutMarkdown = {
     decision: "block",
     degraded: false,
+    agentsUsed: [],
+    reviewMode: "multi_agent",
     findings: [finding],
     cisaSecureByDesign: cisa,
     disagreements: [],
@@ -199795,6 +199896,8 @@ async function buildPolicyBlockResult(input2) {
   const resultWithoutMarkdown = {
     decision: "block",
     degraded: false,
+    agentsUsed: [],
+    reviewMode: "multi_agent",
     findings: [input2.finding],
     cisaSecureByDesign: input2.tool === "security_review" ? computeCisaGate([input2.finding], []) : undefined,
     disagreements: [],

package/dist/config/schema.d.ts

@@ -23,6 +23,7 @@ export declare const kyosoConfigSchema: z.ZodObject<{
             role: z.ZodEnum<{
                 implementation_reviewer: "implementation_reviewer";
                 architecture_security_reviewer: "architecture_security_reviewer";
+                combined_reviewer: "combined_reviewer";
             }>;
             timeoutMs: z.ZodDefault<z.ZodNumber>;
             env: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
@@ -43,6 +44,7 @@ export declare const kyosoConfigSchema: z.ZodObject<{
             role: z.ZodEnum<{
                 implementation_reviewer: "implementation_reviewer";
                 architecture_security_reviewer: "architecture_security_reviewer";
+                combined_reviewer: "combined_reviewer";
             }>;
             timeoutMs: z.ZodDefault<z.ZodNumber>;
             env: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;

package/dist/core/constants.d.ts

@@ -4,4 +4,4 @@ export declare const DEFAULT_MAX_DIFF_BYTES = 300000;
 export declare const RAW_OUTPUT_MAX_CHARS = 16384;
 export declare const TRACE_DIR = ".kyoso/traces";
 export declare const KYOSO_CHILD_AGENT = "KYOSO_CHILD_AGENT";
-export declare const KYOSO_VERSION = "0.1.0";
+export declare const KYOSO_VERSION = "0.3.0";

package/dist/core/types.d.ts

@@ -59,7 +59,8 @@ export type CisaSecureByDesignResult = {
     notes: string[];
 };
 export type AgentName = "codex" | "claude";
-export type AgentRole = "implementation_reviewer" | "architecture_security_reviewer";
+export type AgentRole = "implementation_reviewer" | "architecture_security_reviewer" | "combined_reviewer";
+export type ReviewMode = "multi_agent" | "single_agent";
 export type NormalizedAgentOpinion = {
     agent: AgentName;
     role: string;
@@ -110,6 +111,8 @@ export type AgentRunResult = {
 export type KyosoResult = {
     decision: KyosoDecision;
     degraded: boolean;
+    agentsUsed: AgentName[];
+    reviewMode: ReviewMode;
     summaryMarkdown: string;
     findings: KyosoFinding[];
     cisaSecureByDesign?: CisaSecureByDesignResult;

package/dist/index.js

@@ -183783,7 +183783,11 @@ var agentSchema = exports_external.object({
   command: exports_external.string(),
   args: exports_external.array(exports_external.string()).default([]),
   model: exports_external.string().optional(),
-  role: exports_external.enum(["implementation_reviewer", "architecture_security_reviewer"]),
+  role: exports_external.enum([
+    "implementation_reviewer",
+    "architecture_security_reviewer",
+    "combined_reviewer"
+  ]),
   timeoutMs: exports_external.number().int().positive().default(120000),
   env: exports_external.record(exports_external.string(), exports_external.string()).default({}),
   auth: exports_external.object({
@@ -188100,7 +188104,7 @@ function buildOpinion(agent, role, tool) {
 }
 
 // src/acp/prompts.ts
-function buildAgentPrompt(tool, request, agent) {
+function buildAgentPrompt(tool, request, agent, role) {
   const shared = [
     "You are running as a Kyoso child reviewer.",
     "Do not edit files.",
@@ -188113,15 +188117,26 @@ function buildAgentPrompt(tool, request, agent) {
     "Use empty arrays when no finding, test, risk, or question exists; do not copy the example finding."
   ].join(`
 `);
-  const role = agent === "codex" ? [
-    "You are the Codex implementation reviewer in Kyoso.",
-    "Focus on feasibility, minimal change, existing code consistency, regression risk, tests, migration risk, and maintainability."
-  ].join(`
-`) : [
-    "You are the Claude architecture and security reviewer in Kyoso.",
-    "Focus on architecture, threat modeling, authn/authz, secrets, privacy, secure defaults, CISA Secure by Design, and edge cases."
-  ].join(`
-`);
+  const roleInstructions = {
+    implementation_reviewer: [
+      "You are the implementation reviewer role in Kyoso.",
+      "Focus on feasibility, minimal change, existing code consistency, regression risk, tests, migration risk, and maintainability."
+    ].join(`
+`),
+    architecture_security_reviewer: [
+      "You are the architecture and security reviewer role in Kyoso.",
+      "Focus on architecture, threat modeling, authn/authz, secrets, privacy, secure defaults, CISA Secure by Design, and edge cases."
+    ].join(`
+`),
+    combined_reviewer: [
+      "You are the combined reviewer role in Kyoso.",
+      "Cover both implementation review and architecture/security review in one pass.",
+      "First assess feasibility, minimal change, existing code consistency, regression risk, tests, migration risk, and maintainability.",
+      "Then assess architecture, threat modeling, authn/authz, secrets, privacy, secure defaults, CISA Secure by Design, and edge cases.",
+      "Use finding category values so readers can distinguish implementation, architecture, and security concerns."
+    ].join(`
+`)
+  };
   const cisaInstruction = tool === "security_review" ? [
     "For security_review, include cisaMapping on each security-relevant finding when applicable.",
     "Also include cisaSecureByDesign with all four gate dimensions."
@@ -188129,7 +188144,9 @@ function buildAgentPrompt(tool, request, agent) {
 `) : "For plan_review and diff_review, include cisaMapping and cisaSecureByDesign only when relevant.";
   return `${shared}
 
-${role}
+Agent: ${agent}
+Role: ${role}
+${roleInstructions[role]}
 
 Tool: ${tool}
 ${cisaInstruction}
@@ -188716,6 +188733,7 @@ function renderMarkdownResult(tool, result, options = {}) {
     `**Decision:** ${result.decision}`,
     `**Mode:** ${tool}`,
     `**Agents:** ${result.agentOpinions.map((opinion) => `${title(opinion.agent)} ${opinion.status}`).join(", ")}`,
+    `**Review mode:** ${formatReviewMode(result)}`,
     `**Degraded:** ${String(result.degraded)}`,
     "",
     "## Summary",
@@ -188742,7 +188760,11 @@ function renderMarkdownResult(tool, result, options = {}) {
     lines.push(`### ${title(opinion.agent)}`, "", `${opinion.summary} (${opinion.status})`, "");
   }
   lines.push("", "## Disagreements", "");
-  lines.push(...result.disagreements.length > 0 ? result.disagreements.map((item) => `- ${item.topic}: ${item.judgeComment}`) : ["- None."]);
+  if (result.reviewMode === "single_agent") {
+    lines.push("- N/A - single-agent review.");
+  } else {
+    lines.push(...result.disagreements.length > 0 ? result.disagreements.map((item) => `- ${item.topic}: ${item.judgeComment}`) : ["- None."]);
+  }
   lines.push("", "## Notes", "", "Kyoso did not modify files. Review was performed on a temporary snapshot.");
   if (result.audit.networkMode === "unrestricted") {
     lines.push("Network mode was unrestricted. File modification policy remained denied.");
@@ -188756,6 +188778,14 @@ function defaultSummaryText(result) {
 function title(value) {
   return value.slice(0, 1).toUpperCase() + value.slice(1);
 }
+function formatReviewMode(result) {
+  if (result.reviewMode !== "single_agent")
+    return "multi-agent";
+  const opinion = result.agentOpinions[0];
+  const agent = opinion ? title(opinion.agent) : "single agent";
+  const role = opinion?.role === "combined_reviewer" ? "combined role" : "configured role";
+  return `single-agent (${agent}, ${role}; cross-model verification was not performed)`;
+}
 function notes(items) {
   return (items[0] ?? "No notes.").replaceAll("|", "\\|");
 }
@@ -189209,8 +189239,8 @@ async function createSnapshot(traceId, tool, request, options = {}) {
   }
   await writeFile2(join3(contextDir, "request.json"), JSON.stringify(stripContents(request), null, 2), "utf8");
   await writeFile2(join3(contextDir, "selected_files_manifest.json"), JSON.stringify(buildSelectedFilesManifest(request), null, 2), "utf8");
-  await writeFile2(join3(contextDir, "instructions.codex.md"), buildAgentPrompt(tool, request, "codex"), "utf8");
-  await writeFile2(join3(contextDir, "instructions.claude.md"), buildAgentPrompt(tool, request, "claude"), "utf8");
+  await writeFile2(join3(contextDir, "instructions.codex.md"), buildAgentPrompt(tool, request, "codex", options.agentRoles?.codex ?? "implementation_reviewer"), "utf8");
+  await writeFile2(join3(contextDir, "instructions.claude.md"), buildAgentPrompt(tool, request, "claude", options.agentRoles?.claude ?? "architecture_security_reviewer"), "utf8");
   if (request.repoSummary)
     await writeFile2(join3(contextDir, "repo_summary.md"), request.repoSummary, "utf8");
   if (request.currentPlan)
@@ -189372,9 +189402,11 @@ async function runReview(tool, request, options = {}) {
       allowPatterns
     });
     warnings.push(...built.warnings);
+    const agentRoles = resolveAgentRoles(loaded.config);
     snapshot = await createSnapshot(traceId, tool, built.request, {
       denyPatterns,
-      allowPatterns
+      allowPatterns,
+      agentRoles
     });
     await trace.write({
       type: "snapshot_created",
@@ -189394,6 +189426,8 @@ async function runReview(tool, request, options = {}) {
       trace
     });
     const normalizedAgentResults = agentResults.map(normalizeAgentRunResult);
+    const agentsUsed = normalizedAgentResults.map((result2) => result2.agent);
+    const reviewMode = agentsUsed.length === 1 ? "single_agent" : "multi_agent";
     const completed = normalizedAgentResults.filter((result2) => result2.status === "completed");
     const degraded = completed.length !== agentResults.length;
     let aggregate = aggregateAgentResults(normalizedAgentResults);
@@ -189445,6 +189479,8 @@ async function runReview(tool, request, options = {}) {
     const resultWithoutMarkdown = {
       decision,
       degraded,
+      agentsUsed,
+      reviewMode,
       findings: aggregate.findings,
       cisaSecureByDesign: cisa,
       disagreements: aggregate.disagreements,
@@ -189457,7 +189493,7 @@ async function runReview(tool, request, options = {}) {
         traceId,
         startedAt,
         completedAt,
-        agentsUsed: normalizedAgentResults.map((result2) => result2.agent),
+        agentsUsed,
         redactionsApplied: secretScan.redactions,
         networkMode,
         workspaceMode: "temp_snapshot",
@@ -189516,12 +189552,13 @@ async function runReview(tool, request, options = {}) {
   }
 }
 async function runAgents(input) {
+  const agentRoles = resolveAgentRoles(input.config);
   const agentInputs = ["codex", "claude"].filter((agent) => input.config.agents[agent].enabled).map((agent) => ({
     traceId: input.traceId,
     agent,
-    role: input.config.agents[agent].role,
+    role: agentRoles[agent] ?? input.config.agents[agent].role,
     tool: input.tool,
-    prompt: buildAgentPrompt(input.tool, input.request, agent),
+    prompt: buildAgentPrompt(input.tool, input.request, agent, agentRoles[agent] ?? input.config.agents[agent].role),
     workspaceDir: input.workspaceDir,
     timeoutMs: input.request.options?.maxAgentTimeoutMs ?? input.config.agents[agent].timeoutMs ?? DEFAULT_AGENT_TIMEOUT_MS,
     networkMode: input.networkMode
@@ -189530,6 +189567,7 @@ async function runAgents(input) {
     type: "agent_started",
     traceId: input.traceId,
     agent: agentInput.agent,
+    role: agentInput.role,
     timestamp: new Date().toISOString()
   })));
   const results = await input.manager.runAll(agentInputs);
@@ -189538,6 +189576,7 @@ async function runAgents(input) {
       type: "agent_completed",
       traceId: input.traceId,
       agent: result.agent,
+      role: result.role,
       status: result.status,
       startedAt: result.startedAt,
       completedAt: result.completedAt,
@@ -189554,6 +189593,15 @@ async function runAgents(input) {
   }));
   return results;
 }
+function resolveAgentRoles(config2) {
+  const enabledAgents = ["codex", "claude"].filter((agent) => config2.agents[agent].enabled);
+  const singleAgentMode = enabledAgents.length === 1;
+  const roles = {};
+  for (const agent of enabledAgents) {
+    roles[agent] = singleAgentMode ? "combined_reviewer" : config2.agents[agent].role;
+  }
+  return roles;
+}
 function defaultAgentManager(config2) {
   if (process.env.KYOSO_TEST_FAKE_AGENTS === "1")
     return new FakeAgentManager;
@@ -189591,6 +189639,8 @@ async function buildSecretBlockResult(input) {
   const resultWithoutMarkdown = {
     decision: "block",
     degraded: false,
+    agentsUsed: [],
+    reviewMode: "multi_agent",
     findings: [finding],
     cisaSecureByDesign: cisa,
     disagreements: [],
@@ -189671,6 +189721,8 @@ async function buildPolicyBlockResult(input) {
   const resultWithoutMarkdown = {
     decision: "block",
     degraded: false,
+    agentsUsed: [],
+    reviewMode: "multi_agent",
     findings: [input.finding],
     cisaSecureByDesign: input.tool === "security_review" ? computeCisaGate([input.finding], []) : undefined,
     disagreements: [],

package/dist/workspace/createSnapshot.d.ts

@@ -1,4 +1,4 @@
-import type { KyosoReviewRequest, ReviewTool } from "../core/types.js";
+import type { AgentName, AgentRole, KyosoReviewRequest, ReviewTool } from "../core/types.js";
 export type Snapshot = {
     root: string;
     repoDir: string;
@@ -8,4 +8,5 @@ export type Snapshot = {
 export declare function createSnapshot(traceId: string, tool: ReviewTool, request: KyosoReviewRequest, options?: {
     denyPatterns?: string[];
     allowPatterns?: string[];
+    agentRoles?: Partial<Record<AgentName, AgentRole>>;
 }): Promise<Snapshot>;

package/examples/claude-only.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from "@kyo-so/cli";
+
+export default defineConfig({
+  agents: {
+    codex: {
+      enabled: false,
+    },
+  },
+});

package/examples/codex-only.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from "@kyo-so/cli";
+
+export default defineConfig({
+  agents: {
+    claude: {
+      enabled: false,
+    },
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kyo-so/cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Kyo-so: MCP-native, ACP-powered multi-agent review gates for AI coding workflows.",
   "license": "AGPL-3.0-or-later",
   "type": "module",