@securityreviewai/securityreview-kit 0.1.37 → 0.1.39

package/README.md

@@ -28,10 +28,10 @@ npx @securityreviewai/securityreview-kit init --switch-project
 | Target | Flag | MCP Config | Workspace Rule |
 |---|---|---|---|
 | Cursor | `cursor` | `.cursor/mcp.json` | `.cursor/rules/srai-security-review.mdc`, `.cursor/rules/ctm_sync_rule.mdc`, `.cursor/commands/ctm_sync.md`, `.cursor/agents/ctm_sync.md`, `.cursor/commands/create-ide-workflow.md`, `.cursor/commands/srai-profile.md`, `.cursor/skills/threat-modelling/SKILL.md` |
-| Claude Code | `claude` | `.claude/settings.json` | `CLAUDE.md` |
+| Claude Code | `claude` | `.claude/settings.json` | `CLAUDE.md`, `.claude/skills/threat-modelling/SKILL.md`, `.claude/skills/guardrails-profiler/SKILL.md`, `.claude/skills/guardrails-selection/SKILL.md`, `.claude/agents/ctm_sync.md`, `.claude/commands/guardrails-init-profile.md` |
 | VS Code Copilot | `vscode` | `.vscode/mcp.json` | `.github/copilot-instructions.md`, `.github/skills/threat-modelling/SKILL.md`, `.github/skills/guardrails-profiler/SKILL.md`, `.github/skills/guardrails-selection/SKILL.md`, `.github/agents/ctm_sync.agent.md`, `.github/hooks/srai-session-policy.json` |
 | Windsurf | `windsurf` | `.windsurf/mcp_config.json` | `.windsurf/rules/srai-security-review.md` |
-| Codex | `codex` | `.codex/config.toml` | `AGENTS.md`, `.agents/skills/threat-modelling/SKILL.md`, `.agents/skills/guardrails-profiler/SKILL.md`, `.agents/skills/guardrails-selection/SKILL.md`, `.codex/agents/ctm_sync.toml`, `.codex/hooks.json`, `.codex/commands/guardrails-init-profile.md` |
+| Codex | `codex` | `.codex/config.toml` | `.codex/AGENTS.md`, `.codex/skills/threat-modelling/SKILL.md`, `.codex/skills/guardrails-profiler/SKILL.md`, `.codex/skills/guardrails-selection/SKILL.md`, `.codex/agents/ctm_sync.toml`, `.codex/hooks.json`, `.codex/commands/guardrails-init-profile.md` |
 | Gemini CLI | `gemini` | `.gemini/settings.json` | `GEMINI.md` |
 | Antigravity | `antigravity` | `.gemini/settings.json` | `.agents/rules/srai-security-review.md` |
 
@@ -52,8 +52,12 @@ Options:
   --skip-mcp              Skip MCP server config installation
   --skip-rules            Skip workspace rule installation
   --profile-repo          Run the guardrails profiler after init
+  --profiler-claude-login Run Claude Code login before profiling
   --profiler-copilot-login
                           Run GitHub Copilot CLI login before VS Code Copilot profiling
+  --profiler-codex-login  Run Codex login before Codex profiling
+  --profiler-verbose      Show live profiler output while profiling runs
+  --show-profiler-logs    Alias for --profiler-verbose
 ```
 
 ### `@securityreviewai/securityreview-kit init --switch-project`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@securityreviewai/securityreview-kit",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "Bootstrap security-review-mcp for AI IDEs and CLI tools",
   "author": "Debarshi Das <debarshi.das@we45.com>",
   "license": "UNLICENSED",

package/src/cli.js

@@ -37,10 +37,18 @@ export function run() {
             '--profiler-cursor-login',
             'Before Cursor profiling, run `agent login` (or `cursor-agent login`) in this terminal (then profiling runs in the same init)',
         )
+        .option(
+            '--profiler-claude-login',
+            'Before Claude Code profiling, run `claude auth login` in this terminal',
+        )
         .option(
             '--profiler-copilot-login',
             'Before VS Code Copilot profiling, run `copilot login` in this terminal',
         )
+        .option(
+            '--profiler-codex-login',
+            'Before Codex profiling, run `codex login --device-auth` in this terminal',
+        )
         .option(
             '--profiler-quiet',
             'When profiling, use the standard progress message (default; retained for compatibility)',
@@ -49,6 +57,10 @@ export function run() {
             '--profiler-verbose',
             'When profiling, show live agent output for troubleshooting',
         )
+        .option(
+            '--show-profiler-logs',
+            'Alias for --profiler-verbose; show live profiler logs while profiling runs',
+        )
         .action(async (options) => {
             try {
                 if (options.switchProject) {

package/src/commands/init.js

@@ -6,6 +6,8 @@ import { ensureIdeClisForTargets } from '../utils/ide-cli-install.js';
 import { writeGuardrailsSkillBundles } from '../utils/guardrails-profiler-bundle.js';
 import {
     pickProfilerAgentTarget,
+    runClaudeLogin,
+    runCodexLogin,
     runCopilotLogin,
     runCursorAgentLogin,
     runProfilerAgent,
@@ -485,27 +487,95 @@ export async function initCommand(options) {
                     }
                     console.log('');
                 }
+            } else if (agentTarget === 'claude') {
+                console.log(
+                    chalk.dim(
+                        '  Claude Code: profiling uses `.claude/settings.json`, the configured MCP server, and the Haiku model for this run.',
+                    ),
+                );
+
+                let runLogin = Boolean(options.profilerClaudeLogin);
+                if (!runLogin && interactive) {
+                    runLogin = await confirm({
+                        message:
+                            'Run Claude Code login in this terminal now? (Same init — profiling runs next. Choose No if already signed in.)',
+                        default: true,
+                    });
+                }
+                if (runLogin) {
+                    console.log('');
+                    console.log(chalk.bold.white('  Claude Code login'));
+                    console.log(chalk.dim('  Complete the browser prompt, then return here.\n'));
+                    const loginResult = runClaudeLogin(cwd);
+                    if (loginResult.ok) {
+                        console.log(chalk.green('  \u2713 Claude Code login step finished.'));
+                    } else {
+                        console.log(
+                            chalk.yellow(
+                                `  \u26a0  Claude login exited with status ${loginResult.status ?? 'unknown'}. Profiling will still be attempted; sign in and re-run init if it fails.`,
+                            ),
+                        );
+                    }
+                    console.log('');
+                }
+            } else if (agentTarget === 'codex') {
+                console.log(
+                    chalk.dim(
+                        '  Codex: profiling passes the SRAI MCP server directly to `codex exec` for this run.',
+                    ),
+                );
+
+                let runLogin = Boolean(options.profilerCodexLogin);
+                if (!runLogin && interactive) {
+                    runLogin = await confirm({
+                        message:
+                            'Run Codex login in this terminal now? (Same init — profiling runs next. Choose No if already signed in.)',
+                        default: true,
+                    });
+                }
+                if (runLogin) {
+                    console.log('');
+                    console.log(chalk.bold.white('  Codex login'));
+                    console.log(chalk.dim('  Complete the device-code prompt, then return here.\n'));
+                    const loginResult = runCodexLogin(cwd);
+                    if (loginResult.ok) {
+                        console.log(chalk.green('  \u2713 Codex login step finished.'));
+                    } else {
+                        console.log(
+                            chalk.yellow(
+                                `  \u26a0  Codex login exited with status ${loginResult.status ?? 'unknown'}. Profiling will still be attempted; sign in and re-run init if it fails.`,
+                            ),
+                        );
+                    }
+                    console.log('');
+                }
             } else {
                 console.log(chalk.dim('  (Sign-in or approvals may be required in your terminal.)'));
             }
             console.log('');
+            const profilerVerbose = Boolean(options.profilerVerbose || options.showProfilerLogs);
             const showProfilerOutput = Boolean(
-                options.profilerVerbose || (agentTarget === 'cursor' && options.profilerNoTrust),
+                profilerVerbose || (agentTarget === 'cursor' && options.profilerNoTrust),
             );
             if (showProfilerOutput) {
-                console.log(chalk.dim('  Profiling in progress. Agent output is visible for this run...'));
+                console.log(chalk.dim('  Profiling in progress. Live profiler logs are visible for this run...'));
             } else {
                 console.log(chalk.dim('  Profiling in progress. This can take a few minutes...'));
             }
             const pr = runProfilerAgent(cwd, {
                 target: agentTarget,
                 projectName: projectNameForSkill,
+                apiUrl: envVars?.apiUrl,
+                apiToken: envVars?.apiToken,
                 cursorTrust: !options.profilerNoTrust,
-                streamProgress: Boolean(options.profilerVerbose),
+                streamProgress: profilerVerbose,
                 showOutput: showProfilerOutput,
             });
             if (pr.ok) {
                 console.log(chalk.green('  \u2713 Profiler agent finished.'));
+                if (pr.logPath) {
+                    console.log(chalk.dim(`  Profiler log saved to ${pr.logPath}`));
+                }
             } else {
                 const detail =
                     pr.message ||
@@ -515,6 +585,9 @@ export async function initCommand(options) {
                         `  \u26a0  Profiler agent exited with an error: ${detail}. You can run the guardrails-init-profile workflow manually.`,
                     ),
                 );
+                if (pr.logPath) {
+                    console.log(chalk.dim(`  Profiler log saved to ${pr.logPath}`));
+                }
                 if (agentTarget === 'cursor') {
                     console.log('');
                     console.log(chalk.dim('  Typical fixes:'));
@@ -551,6 +624,42 @@ export async function initCommand(options) {
                             '    • MCP missing: re-run init with VS Code selected and MCP installation enabled so `.vscode/mcp.json` is written.',
                         ),
                     );
+                } else if (agentTarget === 'claude') {
+                    console.log('');
+                    console.log(chalk.dim('  Typical fixes:'));
+                    console.log(
+                        chalk.dim(
+                            '    • Not signed in: re-run `securityreview-kit init` and choose Yes for Claude Code login, or pass `--profiler-claude-login` with `--profile-repo`.',
+                        ),
+                    );
+                    console.log(
+                        chalk.dim(
+                            '    • CLI missing: install Claude Code and verify `claude --version`.',
+                        ),
+                    );
+                    console.log(
+                        chalk.dim(
+                            '    • MCP missing: re-run init with Claude Code selected and MCP installation enabled so `.claude/settings.json` is written.',
+                        ),
+                    );
+                } else if (agentTarget === 'codex') {
+                    console.log('');
+                    console.log(chalk.dim('  Typical fixes:'));
+                    console.log(
+                        chalk.dim(
+                            '    • Not signed in: re-run `securityreview-kit init` and choose Yes for Codex login, or pass `--profiler-codex-login` with `--profile-repo`.',
+                        ),
+                    );
+                    console.log(
+                        chalk.dim(
+                            '    • CLI missing: install Codex CLI and verify `codex --version`.',
+                        ),
+                    );
+                    console.log(
+                        chalk.dim(
+                            '    • MCP missing: re-run init with Codex selected and MCP installation enabled so the SRAI credentials are available for profiling.',
+                        ),
+                    );
                 }
             }
         }

package/src/generators/mcp/claude.js

@@ -2,6 +2,32 @@ import { join } from 'node:path';
 import { readJson, writeJson } from '../../utils/fs-helpers.js';
 import { MCP_SERVER_NAME, MCP_SERVER_PACKAGE } from '../../utils/constants.js';
 
+function getClaudeSessionStartHooks() {
+    const prompt = [
+        'MANDATORY SECURITY GATE (Claude Code Session Policy)',
+        '',
+        'For any request with security impact, follow this order:',
+        '1. Fetch Vibe Guardrails first using .claude/skills/guardrails-selection/SKILL.md.',
+        '2. Run PWNISMS threat modelling using .claude/skills/threat-modelling/SKILL.md.',
+        '3. Implement secure code using the hydrated guardrails and threat findings.',
+        '4. Invoke the ctm_sync agent using .claude/agents/ctm_sync.md after implementation or threat-model updates.',
+        '',
+        'Do not use project-profile exploration tools during normal coding tasks. No blocking and no deferral: guardrails first, PWNISMS second, implementation third, ctm_sync last.',
+    ].join('\n');
+
+    return [
+        {
+            matcher: '.*',
+            hooks: [
+                {
+                    type: 'prompt',
+                    prompt,
+                },
+            ],
+        },
+    ];
+}
+
 /**
  * Generate Claude Code MCP config at .claude/settings.json
  */
@@ -22,6 +48,15 @@ export function generate(cwd, envVars) {
         },
     };
 
+    const existingSessionStart = Array.isArray(existing.SessionStart) ? existing.SessionStart : [];
+    const marker = 'MANDATORY SECURITY GATE (Claude Code Session Policy)';
+    const ours = getClaudeSessionStartHooks();
+    const hasOurs = existingSessionStart.some((entry) =>
+        Array.isArray(entry?.hooks) &&
+        entry.hooks.some((hook) => hook?.type === 'prompt' && typeof hook?.prompt === 'string' && hook.prompt.includes(marker)),
+    );
+    existing.SessionStart = hasOurs ? existingSessionStart : [...existingSessionStart, ...ours];
+
     writeJson(filePath, existing);
     return filePath;
 }

package/src/generators/mcp/claude.test.js

@@ -0,0 +1,53 @@
+import { mkdirSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { generate } from './claude.js';
+
+test('Claude MCP generator writes mcp server and session hooks', () => {
+    const cwd = mkdtempSync(join(tmpdir(), 'securityreview-kit-claude-mcp-'));
+
+    generate(cwd, {
+        apiUrl: 'https://example.test',
+        apiToken: 'secret-token',
+    });
+
+    const config = JSON.parse(readFileSync(join(cwd, '.claude', 'settings.json'), 'utf8'));
+    assert.equal(config.mcpServers['security-review-mcp'].command, 'npx');
+    assert.equal(Array.isArray(config.SessionStart), true);
+    assert.match(config.SessionStart[0].hooks[0].prompt, /MANDATORY SECURITY GATE/);
+});
+
+test('Claude MCP generator preserves existing SessionStart hooks', () => {
+    const cwd = mkdtempSync(join(tmpdir(), 'securityreview-kit-claude-mcp-merge-'));
+    const configPath = join(cwd, '.claude', 'settings.json');
+    mkdirSync(join(cwd, '.claude'), { recursive: true });
+
+    writeFileSync(
+        configPath,
+        JSON.stringify(
+            {
+                SessionStart: [
+                    {
+                        matcher: '.*',
+                        hooks: [{ type: 'prompt', prompt: 'Existing hook' }],
+                    },
+                ],
+            },
+            null,
+            2,
+        ),
+        'utf8',
+    );
+
+    generate(cwd, {
+        apiUrl: 'https://example.test',
+        apiToken: 'secret-token',
+    });
+
+    const config = JSON.parse(readFileSync(configPath, 'utf8'));
+    assert.equal(config.SessionStart.length, 2);
+    assert.match(config.SessionStart[0].hooks[0].prompt, /Existing hook/);
+    assert.match(config.SessionStart[1].hooks[0].prompt, /MANDATORY SECURITY GATE/);
+});

package/src/generators/rules/claude.js

@@ -1,28 +1,83 @@
+import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { GUARDRAILS_PROFILER_SKILL_REL_DIR, GUARDRAILS_SELECTION_SKILL_REL_DIR } from '../../utils/constants.js';
+import {
+    CTM_SYNC_AGENT_REL_PATH,
+    GUARDRAILS_PROFILER_SKILL_REL_DIR,
+    GUARDRAILS_SELECTION_SKILL_REL_DIR,
+    THREAT_MODELLING_SKILL_REL_DIR,
+} from '../../utils/constants.js';
 import { upsertSentinelBlock, writeText } from '../../utils/fs-helpers.js';
-import { getRuleContent, getGuardrailsInitProfileContent } from './content.js';
+import {
+    getCtmSyncWorkflowContent,
+    getGuardrailsInitProfileContent,
+    getRuleContent,
+    getThreatModellingSkillContent,
+} from './content.js';
+
+function writeGeneratedText(filePath, content) {
+    const action = existsSync(filePath) ? 'updated' : 'created';
+    writeText(filePath, content);
+    return { filePath, action };
+}
+
+function getAgentBody(content) {
+    return content.replace(/^---\n[\s\S]*?\n---\n*/, '').trim();
+}
+
+function getClaudeCtmSyncAgentContent(options = {}) {
+    const body = getAgentBody(getCtmSyncWorkflowContent(options));
+    return [
+        '---',
+        'name: ctm_sync',
+        'description: Use this agent after security-relevant implementation or threat modelling work to synchronize the latest threat model, mitigations, and guardrails to SRAI.',
+        'model: inherit',
+        'color: blue',
+        '---',
+        '',
+        body,
+        '',
+    ].join('\n');
+}
 
 /**
  * Generate Claude Code workspace rule — appends to CLAUDE.md
  */
 export function generate(cwd, options = {}) {
-    const filePath = join(cwd, 'CLAUDE.md');
-    const content = getRuleContent({
+    const optionsWithSkillDirs = {
         ...options,
         guardrailsSelectionSkillDir: GUARDRAILS_SELECTION_SKILL_REL_DIR.claude,
-    });
+        threatModellingSkillDir: THREAT_MODELLING_SKILL_REL_DIR.claude,
+        ctmSyncAgentPath: CTM_SYNC_AGENT_REL_PATH.claude,
+    };
+    const filePath = join(cwd, 'CLAUDE.md');
+    const content = getRuleContent(optionsWithSkillDirs);
     const action = upsertSentinelBlock(filePath, content);
 
+    const threatSkillPath = join(cwd, THREAT_MODELLING_SKILL_REL_DIR.claude, 'SKILL.md');
+    const threatSkill = writeGeneratedText(
+        threatSkillPath,
+        getThreatModellingSkillContent(optionsWithSkillDirs),
+    );
+
+    const ctmSyncAgentPath = join(cwd, CTM_SYNC_AGENT_REL_PATH.claude);
+    const ctmSyncAgent = writeGeneratedText(
+        ctmSyncAgentPath,
+        getClaudeCtmSyncAgentContent(optionsWithSkillDirs),
+    );
+
     const guardrailsInitPath = join(cwd, '.claude', 'commands', 'guardrails-init-profile.md');
-    const guardrailsInitContent = getGuardrailsInitProfileContent({
-        ...options,
-        guardrailsSkillDir: GUARDRAILS_PROFILER_SKILL_REL_DIR.claude,
-    });
-    writeText(guardrailsInitPath, guardrailsInitContent);
+    const guardrailsInit = writeGeneratedText(
+        guardrailsInitPath,
+        getGuardrailsInitProfileContent({
+            ...optionsWithSkillDirs,
+            guardrailsSkillDir: GUARDRAILS_PROFILER_SKILL_REL_DIR.claude,
+        }),
+    );
 
     return [
         { filePath, action, kind: 'rule' },
-        { filePath: guardrailsInitPath, action: 'created', kind: 'command' },
+        { ...threatSkill, kind: 'skill' },
+        { ...ctmSyncAgent, kind: 'agent' },
+        { ...guardrailsInit, kind: 'command' },
     ];
 }

package/src/generators/rules/claude.test.js

@@ -0,0 +1,39 @@
+import { existsSync, mkdtempSync, readFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { generate } from './claude.js';
+
+test('Claude generator writes CLAUDE.md, threat skill, ctm_sync agent, and profiling command', () => {
+    const cwd = mkdtempSync(join(tmpdir(), 'securityreview-kit-claude-'));
+
+    const results = generate(cwd, { projectName: 'SmokeProject' });
+
+    const expectedPaths = [
+        'CLAUDE.md',
+        '.claude/skills/threat-modelling/SKILL.md',
+        '.claude/agents/ctm_sync.md',
+        '.claude/commands/guardrails-init-profile.md',
+    ];
+
+    for (const relPath of expectedPaths) {
+        assert.equal(existsSync(join(cwd, relPath)), true, `${relPath} should exist`);
+    }
+
+    assert.deepEqual(results.map((entry) => entry.kind), ['rule', 'skill', 'agent', 'command']);
+
+    const instructions = readFileSync(join(cwd, 'CLAUDE.md'), 'utf8');
+    assert.match(instructions, /\.claude\/skills\/guardrails-selection\/SKILL\.md/);
+    assert.match(instructions, /\.claude\/skills\/threat-modelling\/SKILL\.md/);
+    assert.match(instructions, /\.claude\/agents\/ctm_sync\.md/);
+
+    const threatSkill = readFileSync(join(cwd, '.claude/skills/threat-modelling/SKILL.md'), 'utf8');
+    assert.match(threatSkill, /\.claude\/agents\/ctm_sync\.md/);
+    assert.doesNotMatch(threatSkill, /get_project_profile_description/);
+
+    const agent = readFileSync(join(cwd, '.claude/agents/ctm_sync.md'), 'utf8');
+    assert.match(agent, /^---\nname: ctm_sync/m);
+    assert.match(agent, /model: inherit/);
+    assert.match(agent, /Configured SRAI project name: `SmokeProject`/);
+});

package/src/generators/rules/codex.js

@@ -26,20 +26,26 @@ function getCodexSessionHookContent() {
         '',
         'For any request with security impact (auth, authorization, crypto, input handling, secrets, network, data storage, dependencies, new APIs/endpoints, infrastructure, or code handling untrusted data), follow this order:',
         '',
-        '1. Fetch Vibe Guardrails first using .agents/skills/guardrails-selection/SKILL.md. Resolve the project, call get_guardrails, shortlist relevant guardrails, then call get_guardrail_by_id for the shortlist.',
-        '2. Run PWNISMS threat modelling using .agents/skills/threat-modelling/SKILL.md. Explicitly walk Product, Workload, Network, IAM, Secrets, Monitoring, and Supply Chain.',
+        '1. Fetch Vibe Guardrails first using .codex/skills/guardrails-selection/SKILL.md. Resolve the project, call get_guardrails, shortlist relevant guardrails, then call get_guardrail_by_id for the shortlist.',
+        '2. Run PWNISMS threat modelling using .codex/skills/threat-modelling/SKILL.md. Explicitly walk Product, Workload, Network, IAM, Secrets, Monitoring, and Supply Chain.',
         '3. Implement secure code using both the hydrated guardrails and PWNISMS findings.',
         '4. Invoke the ctm_sync subagent using .codex/agents/ctm_sync.toml after threat modelling or guardrail enforcement. Reuse the exact guardrail shortlist; do not re-query guardrails during CTM sync.',
         '',
         'Do not use project-profile exploration tools during normal coding tasks. No blocking and no deferral: guardrails first, PWNISMS second, implementation third, ctm_sync last.',
     ].join('\n');
 
-    const commandPayload = JSON.stringify({
+    const sessionStartPayload = JSON.stringify({
         hookSpecificOutput: {
             hookEventName: 'SessionStart',
             additionalContext,
         },
     });
+    const userPromptPayload = JSON.stringify({
+        hookSpecificOutput: {
+            hookEventName: 'UserPromptSubmit',
+            additionalContext,
+        },
+    });
 
     return JSON.stringify(
         {
@@ -50,13 +56,25 @@ function getCodexSessionHookContent() {
                         hooks: [
                             {
                                 type: 'command',
-                                command: `printf '%s\\n' '${commandPayload.replaceAll("'", "'\\''")}'`,
+                                command: `printf '%s\\n' '${sessionStartPayload.replaceAll("'", "'\\''")}'`,
                                 timeout: 5,
                                 statusMessage: 'Loading SRAI security session policy',
                             },
                         ],
                     },
                 ],
+                UserPromptSubmit: [
+                    {
+                        hooks: [
+                            {
+                                type: 'command',
+                                command: `printf '%s\\n' '${userPromptPayload.replaceAll("'", "'\\''")}'`,
+                                timeout: 5,
+                                statusMessage: 'Refreshing SRAI security session policy',
+                            },
+                        ],
+                    },
+                ],
             },
         },
         null,
@@ -90,7 +108,7 @@ export function generate(cwd, options = {}) {
         threatModellingSkillDir: THREAT_MODELLING_SKILL_REL_DIR.codex,
         ctmSyncAgentPath: CTM_SYNC_AGENT_REL_PATH.codex,
     };
-    const filePath = join(cwd, 'AGENTS.md');
+    const filePath = join(cwd, '.codex', 'AGENTS.md');
     const content = getRuleContent(optionsWithSkillDirs);
     const action = upsertSentinelBlock(filePath, content);
 

package/src/generators/rules/codex.test.js

@@ -11,8 +11,8 @@ test('Codex generator writes AGENTS, skills, subagent, hooks, and profiling comm
     const results = generate(cwd, { projectName: 'SmokeProject' });
 
     const expectedPaths = [
-        'AGENTS.md',
-        '.agents/skills/threat-modelling/SKILL.md',
+        '.codex/AGENTS.md',
+        '.codex/skills/threat-modelling/SKILL.md',
         '.codex/agents/ctm_sync.toml',
         '.codex/hooks.json',
         '.codex/commands/guardrails-init-profile.md',
@@ -24,13 +24,14 @@ test('Codex generator writes AGENTS, skills, subagent, hooks, and profiling comm
 
     assert.deepEqual(results.map((entry) => entry.kind), ['rule', 'skill', 'agent', 'hooks', 'command']);
 
-    const instructions = readFileSync(join(cwd, 'AGENTS.md'), 'utf8');
-    assert.match(instructions, /\.agents\/skills\/guardrails-selection\/SKILL\.md/);
-    assert.match(instructions, /\.agents\/skills\/threat-modelling\/SKILL\.md/);
+    const instructions = readFileSync(join(cwd, '.codex/AGENTS.md'), 'utf8');
+    assert.match(instructions, /\.codex\/skills\/guardrails-selection\/SKILL\.md/);
+    assert.match(instructions, /\.codex\/skills\/threat-modelling\/SKILL\.md/);
     assert.match(instructions, /\.codex\/agents\/ctm_sync\.toml/);
     assert.doesNotMatch(instructions, /\.cursor/);
+    assert.doesNotMatch(instructions, /\.agents\/skills/);
 
-    const threatSkill = readFileSync(join(cwd, '.agents/skills/threat-modelling/SKILL.md'), 'utf8');
+    const threatSkill = readFileSync(join(cwd, '.codex/skills/threat-modelling/SKILL.md'), 'utf8');
     for (const heading of ['Product', 'Workload', 'Network', 'IAM', 'Secrets', 'Monitoring', 'Supply Chain']) {
         assert.match(threatSkill, new RegExp(heading));
     }
@@ -44,4 +45,6 @@ test('Codex generator writes AGENTS, skills, subagent, hooks, and profiling comm
 
     const hooks = JSON.parse(readFileSync(join(cwd, '.codex/hooks.json'), 'utf8'));
     assert.equal(hooks.hooks.SessionStart[0].hooks[0].type, 'command');
+    assert.equal(hooks.hooks.UserPromptSubmit[0].hooks[0].type, 'command');
+    assert.match(hooks.hooks.UserPromptSubmit[0].hooks[0].command, /"hookEventName":"UserPromptSubmit"/);
 });

package/src/generators/rules/guardrails-init-profile.md

@@ -31,6 +31,14 @@ During `securityreview-kit init`, choose **Yes** when asked to run Cursor login
 
 You can still sign in manually with `agent login` (or `cursor-agent login`). To handle trust/login interactively in the terminal, omit `--trust` and `--approve-mcps`.
 
+## Claude Code CLI (scripted)
+
+From the repo root, non-interactive runs should execute with the project settings file and the Haiku model for this profiling pass:
+
+`claude -p "<your profiling instructions>" --settings .claude/settings.json --model haiku`
+
+During `securityreview-kit init`, choose **Yes** when asked to run Claude Code login, or pass **`--profiler-claude-login`** with **`--profile-repo`** so `claude auth login` and profiling stay in one run.
+
 ## GitHub Copilot CLI (scripted)
 
 From the repo root, non-interactive runs should load the SRAI MCP server and allow the tools needed to scan, write profile files, and call MCP:
@@ -38,3 +46,9 @@ From the repo root, non-interactive runs should load the SRAI MCP server and all
 `copilot -p "<your profiling instructions>" --additional-mcp-config '{"mcpServers":{"security-review-mcp":{"type":"stdio","command":"npx","args":["-y","@securityreviewai/security-review-mcp@latest"]}}}' --allow-all`
 
 During `securityreview-kit init`, choose **Yes** when asked to run GitHub Copilot CLI login, or pass **`--profiler-copilot-login`** with **`--profile-repo`** so `copilot login` and profiling stay in one run.
+
+## Codex CLI (scripted)
+
+From the repo root, non-interactive runs should execute via `codex exec` and include the SRAI MCP server configuration for that run.
+
+During `securityreview-kit init`, choose **Yes** when asked to run Codex login, or pass **`--profiler-codex-login`** with **`--profile-repo`** so `codex login --device-auth` and profiling stay in one run.

package/src/generators/rules/guardrails-profiler/SKILL.md

@@ -11,7 +11,7 @@ Configured SRAI project name: `<SRAI_PROJECT_NAME>`
 
 ## Canonical paths
 
-- **This skill & signal registry (read-only):** `<GUARDRAILS_SKILL_DIR>/` — e.g. `.cursor/skills/guardrails-profiler`, `.github/skills/guardrails-profiler`, `.claude/skills/guardrails-profiler`, or `.agents/skills/guardrails-profiler` for Codex depending on where this file was installed.
+- **This skill & signal registry (read-only):** `<GUARDRAILS_SKILL_DIR>/` — e.g. `.cursor/skills/guardrails-profiler`, `.github/skills/guardrails-profiler`, `.claude/skills/guardrails-profiler`, or `.codex/skills/guardrails-profiler` for Codex depending on where this file was installed.
 - **Signal registry file:** `<GUARDRAILS_SKILL_DIR>/references/signal-registry.json`
 - **Local guardrails file:** `.guardrails/profile.json`
 - **Combined manifest (project root):** `profile.json` — includes guardrails profile, vibe profile fields for MCP, and default pack payload

package/src/utils/constants.js

@@ -38,7 +38,7 @@ export const TARGETS = {
     codex: {
         name: 'Codex',
         mcpConfigPath: '.codex/config.toml',
-        rulePath: 'AGENTS.md',
+        rulePath: '.codex/AGENTS.md',
         ruleMode: 'append',
         detectDirs: ['.codex'],
     },
@@ -64,7 +64,7 @@ export const GUARDRAILS_PROFILER_SKILL_REL_DIR = {
     cursor: '.cursor/skills/guardrails-profiler',
     claude: '.claude/skills/guardrails-profiler',
     vscode: '.github/skills/guardrails-profiler',
-    codex: '.agents/skills/guardrails-profiler',
+    codex: '.codex/skills/guardrails-profiler',
 };
 
 /** Relative workspace dirs for the guardrails-selection skill (per IDE / CLI). */
@@ -72,19 +72,21 @@ export const GUARDRAILS_SELECTION_SKILL_REL_DIR = {
     cursor: '.cursor/skills/guardrails-selection',
     claude: '.claude/skills/guardrails-selection',
     vscode: '.github/skills/guardrails-selection',
-    codex: '.agents/skills/guardrails-selection',
+    codex: '.codex/skills/guardrails-selection',
 };
 
 /** Relative workspace dirs for the PWNISMS threat-modelling skill (per IDE / CLI). */
 export const THREAT_MODELLING_SKILL_REL_DIR = {
     cursor: '.cursor/skills/threat-modelling',
+    claude: '.claude/skills/threat-modelling',
     vscode: '.github/skills/threat-modelling',
-    codex: '.agents/skills/threat-modelling',
+    codex: '.codex/skills/threat-modelling',
 };
 
 /** Relative workspace paths for the CTM sync agent/workflow (per IDE / CLI). */
 export const CTM_SYNC_AGENT_REL_PATH = {
     cursor: '.cursor/agents/ctm_sync.md',
+    claude: '.claude/agents/ctm_sync.md',
     vscode: '.github/agents/ctm_sync.agent.md',
     codex: '.codex/agents/ctm_sync.toml',
 };

package/src/utils/profiler-agent.js

@@ -1,8 +1,8 @@
 import { spawnSync } from 'node:child_process';
 import { join } from 'node:path';
-import { GUARDRAILS_PROFILER_SKILL_REL_DIR, MCP_SERVER_NAME } from './constants.js';
+import { GUARDRAILS_PROFILER_SKILL_REL_DIR, MCP_SERVER_NAME, MCP_SERVER_PACKAGE } from './constants.js';
 import { augmentPathEnv, resolveCursorAgentExecutable } from './cursor-agent-path.js';
-import { readJson } from './fs-helpers.js';
+import { readJson, readText, writeText } from './fs-helpers.js';
 
 const PREFERRED_ORDER = ['cursor', 'vscode', 'claude', 'codex'];
 
@@ -11,6 +11,43 @@ function commandOk(cmd, args = ['--version'], env = process.env) {
     return r.status === 0;
 }
 
+export function getProfilerLogPath(cwd, target) {
+    return join(cwd, '.guardrails', 'logs', `profiler-${target}.log`);
+}
+
+function buildProfilerEnv(target, streamProgress) {
+    const env = augmentPathEnv(process.env);
+    if (target === 'codex' && streamProgress && !env.RUST_LOG) {
+        env.RUST_LOG = 'info';
+    }
+    return env;
+}
+
+function persistProfilerLog(cwd, target, result) {
+    if (!result || (result.stdout == null && result.stderr == null)) {
+        return null;
+    }
+
+    const stdout = String(result.stdout || '');
+    const stderr = String(result.stderr || '');
+    const body = [
+        `target=${target}`,
+        `status=${result.status ?? ''}`,
+        `signal=${result.signal ?? ''}`,
+        '',
+        '--- stdout ---',
+        stdout,
+        '',
+        '--- stderr ---',
+        stderr,
+        '',
+    ].join('\n');
+
+    const logPath = getProfilerLogPath(cwd, target);
+    writeText(logPath, body);
+    return logPath;
+}
+
 export function buildProfilerAgentPrompt(projectName, agentTarget = 'cursor') {
     const p = String(projectName || '').trim() || '<SRAI_PROJECT_NAME>';
     const skillRoot =
@@ -72,6 +109,75 @@ export function runCopilotLogin(cwd) {
     return { ok: r.status === 0, status: r.status, message: r.status !== 0 ? spawnErr : undefined };
 }
 
+/**
+ * Run Claude Code login in the current terminal.
+ */
+export function runClaudeLogin(cwd) {
+    const env = augmentPathEnv(process.env);
+    if (!commandOk('claude', ['--version'], env)) {
+        return {
+            ok: false,
+            status: null,
+            message: 'Claude Code CLI not found (`claude`). Install from https://claude.ai/code.',
+        };
+    }
+    const r = spawnSync('claude', ['auth', 'login', '--claudeai'], { cwd, stdio: 'inherit', env });
+    const spawnErr = r.error ? r.error.message : null;
+    if (r.status === null && spawnErr) {
+        return { ok: false, status: null, message: spawnErr };
+    }
+    return { ok: r.status === 0, status: r.status, message: r.status !== 0 ? spawnErr : undefined };
+}
+
+/**
+ * Run Codex login in the current terminal. Device auth keeps the flow in-terminal.
+ */
+export function runCodexLogin(cwd) {
+    const env = augmentPathEnv(process.env);
+    if (!commandOk('codex', ['--version'], env)) {
+        return {
+            ok: false,
+            status: null,
+            message: 'Codex CLI not found (`codex`). Install with `npm install -g @openai/codex`.',
+        };
+    }
+    const r = spawnSync('codex', ['login', '--device-auth'], { cwd, stdio: 'inherit', env });
+    const spawnErr = r.error ? r.error.message : null;
+    if (r.status === null && spawnErr) {
+        return { ok: false, status: null, message: spawnErr };
+    }
+    return { ok: r.status === 0, status: r.status, message: r.status !== 0 ? spawnErr : undefined };
+}
+
+function escapeTomlString(value) {
+    return String(value || '').replaceAll('\\', '\\\\').replaceAll('"', '\\"');
+}
+
+function readCodexMcpEnv(cwd) {
+    const config = readText(join(cwd, '.codex', 'config.toml'));
+    const apiUrl = config.match(/^\s*SECURITY_REVIEW_API_URL\s*=\s*"([^"]*)"/m)?.[1] || '';
+    const apiToken = config.match(/^\s*SECURITY_REVIEW_API_TOKEN\s*=\s*"([^"]*)"/m)?.[1] || '';
+    return { apiUrl, apiToken };
+}
+
+export function buildCodexConfigOverrides(cwd, overrides = {}) {
+    const fileValues = readCodexMcpEnv(cwd);
+    const apiUrl = String(overrides.apiUrl || fileValues.apiUrl || '').trim();
+    const apiToken = String(overrides.apiToken || fileValues.apiToken || '').trim();
+
+    if (!apiUrl || !apiToken) {
+        return null;
+    }
+
+    return [
+        'features.codex_hooks=true',
+        `mcp_servers.${MCP_SERVER_NAME}.command="npx"`,
+        `mcp_servers.${MCP_SERVER_NAME}.args=["-y","${MCP_SERVER_PACKAGE}@latest"]`,
+        `mcp_servers.${MCP_SERVER_NAME}.env.SECURITY_REVIEW_API_URL="${escapeTomlString(apiUrl)}"`,
+        `mcp_servers.${MCP_SERVER_NAME}.env.SECURITY_REVIEW_API_TOKEN="${escapeTomlString(apiToken)}"`,
+    ];
+}
+
 export function pickProfilerAgentTarget(targets) {
     for (const t of PREFERRED_ORDER) {
         if (targets.includes(t)) {
@@ -94,10 +200,18 @@ export function pickProfilerAgentTarget(targets) {
  */
 export function runProfilerAgent(
     cwd,
-    { target, projectName, cursorTrust = true, streamProgress = false, showOutput = streamProgress },
+    {
+        target,
+        projectName,
+        apiUrl,
+        apiToken,
+        cursorTrust = true,
+        streamProgress = false,
+        showOutput = streamProgress,
+    },
 ) {
     const prompt = buildProfilerAgentPrompt(projectName, target);
-    const env = augmentPathEnv(process.env);
+    const env = buildProfilerEnv(target, streamProgress);
     const opts = showOutput
         ? { cwd, stdio: 'inherit', env }
         : { cwd, stdio: ['ignore', 'pipe', 'pipe'], env, encoding: 'utf8', maxBuffer: 10 * 1024 * 1024 };
@@ -129,27 +243,45 @@ export function runProfilerAgent(
         if (r.error) {
             return { ok: false, message: r.error.message };
         }
-        return buildProfilerResult(r);
+        return buildProfilerResult(r, { logPath: showOutput ? null : persistProfilerLog(cwd, target, r) });
     }
 
     if (target === 'claude') {
         if (!commandOk('claude', ['--version'], env)) {
             return { ok: false, message: 'claude not on PATH' };
         }
-        const args = streamProgress
-            ? ['-p', '--output-format', 'stream-json', '--include-partial-messages', '--verbose', prompt]
-            : ['-p', prompt];
+        const settingsPath = join(cwd, '.claude', 'settings.json');
+        const args = ['-p', '--settings', settingsPath, '--model', 'haiku'];
+        if (streamProgress) {
+            args.push('--output-format', 'stream-json', '--include-partial-messages', '--include-hook-events', '--verbose');
+        }
+        args.push(prompt);
         const r = spawnSync('claude', args, opts);
-        return buildProfilerResult(r);
+        return buildProfilerResult(r, { logPath: showOutput ? null : persistProfilerLog(cwd, target, r) });
     }
 
     if (target === 'codex') {
         if (!commandOk('codex', ['--version'], env)) {
             return { ok: false, message: 'codex not on PATH' };
         }
-        const args = streamProgress ? ['exec', '--json', prompt] : ['exec', prompt];
+        const configOverrides = buildCodexConfigOverrides(cwd, { apiUrl, apiToken });
+        if (!configOverrides) {
+            return {
+                ok: false,
+                message:
+                    'Codex profiling needs SRAI MCP credentials. Re-run init with Codex selected and MCP installation enabled.',
+            };
+        }
+        const args = ['exec', '--full-auto'];
+        for (const override of configOverrides) {
+            args.push('-c', override);
+        }
+        if (streamProgress) {
+            args.push('--json');
+        }
+        args.push(prompt);
         const r = spawnSync('codex', args, opts);
-        return buildProfilerResult(r);
+        return buildProfilerResult(r, { logPath: showOutput ? null : persistProfilerLog(cwd, target, r) });
     }
 
     if (target === 'vscode') {
@@ -177,7 +309,7 @@ export function runProfilerAgent(
             args.push('--output-format', 'json');
         }
         const r = spawnSync('copilot', args, opts);
-        return buildProfilerResult(r);
+        return buildProfilerResult(r, { logPath: showOutput ? null : persistProfilerLog(cwd, target, r) });
     }
 
     return { ok: false, message: 'unsupported agent target' };
@@ -207,13 +339,13 @@ export function buildCopilotAdditionalMcpConfig(cwd) {
     });
 }
 
-function buildProfilerResult(result) {
+function buildProfilerResult(result, extras = {}) {
     if (result.error) {
-        return { ok: false, status: result.status, message: result.error.message };
+        return { ok: false, status: result.status, message: result.error.message, ...extras };
     }
 
     if (result.status === 0) {
-        return { ok: true, status: result.status };
+        return { ok: true, status: result.status, ...extras };
     }
 
     const outputTail = summarizeProfilerOutput(result.stderr || result.stdout || '');
@@ -228,6 +360,7 @@ function buildProfilerResult(result) {
         ok: false,
         status: result.status,
         message: outputTail ? `${exitDetail}; last output: ${outputTail}` : exitDetail,
+        ...extras,
     };
 }
 

package/src/utils/profiler-agent.test.js

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import {
+    buildCodexConfigOverrides,
     buildCopilotAdditionalMcpConfig,
     pickProfilerAgentTarget,
 } from './profiler-agent.js';
@@ -39,3 +40,34 @@ test('buildCopilotAdditionalMcpConfig converts VS Code MCP config', () => {
     assert.equal(converted.mcpServers['security-review-mcp'].command, 'npx');
     assert.deepEqual(converted.mcpServers['security-review-mcp'].tools, ['*']);
 });
+
+test('buildCodexConfigOverrides builds inline MCP config for profiling', () => {
+    const cwd = join(tmpdir(), `securityreview-kit-codex-${Date.now()}`);
+    mkdirSync(join(cwd, '.codex'), { recursive: true });
+    writeFileSync(
+        join(cwd, '.codex', 'config.toml'),
+        [
+            '[features]',
+            'codex_hooks = true',
+            '',
+            '[mcp_servers.security-review-mcp]',
+            'command = "npx"',
+            'args = ["-y", "@securityreviewai/security-review-mcp@latest"]',
+            '',
+            '[mcp_servers.security-review-mcp.env]',
+            'SECURITY_REVIEW_API_URL = "https://api.example.test"',
+            'SECURITY_REVIEW_API_TOKEN = "token"',
+            '',
+        ].join('\n'),
+    );
+
+    const overrides = buildCodexConfigOverrides(cwd);
+
+    assert.deepEqual(overrides, [
+        'features.codex_hooks=true',
+        'mcp_servers.security-review-mcp.command="npx"',
+        'mcp_servers.security-review-mcp.args=["-y","@securityreviewai/security-review-mcp@latest"]',
+        'mcp_servers.security-review-mcp.env.SECURITY_REVIEW_API_URL="https://api.example.test"',
+        'mcp_servers.security-review-mcp.env.SECURITY_REVIEW_API_TOKEN="token"',
+    ]);
+});