iranti 0.2.43 → 0.2.45

package/dist/scripts/codex-setup.js

@@ -75,11 +75,11 @@ function printHelp() {
         'Notes:',
         '  - Registers a global Codex MCP entry using `codex mcp add`.',
         '  - Prefers the installed CLI path: `iranti mcp`.',
-        '  - When a project binding is available, also writes or merges a project-local `.mcp.json` entry pinned to that binding.',
+        '  - When a project binding is available, also writes or merges project-local `.mcp.json` and `.vscode/mcp.json` entries pinned to that binding.',
         '  - By default does not pin IRANTI_PROJECT_ENV, so Codex can resolve .env.iranti from the active project/workspace at runtime.',
         '  - Use --project-env only when you deliberately want to pin Codex globally to one project binding.',
         '  - Use --local-script only if you need to point Codex at this repo build directly.',
-        '  - Use --no-workspace-file only if you explicitly want global registration without a project-local `.mcp.json` update.',
+        '  - Use --no-workspace-file only if you explicitly want global registration without project-local MCP file updates.',
         '  - Does not store DATABASE_URL in Codex config; iranti-mcp loads project/instance env at runtime.',
         '  - Replaces any existing MCP entry with the same name.',
     ].join('\n'));
@@ -173,6 +173,29 @@ function makeWorkspaceMcpServer(options, projectEnv) {
         env,
     };
 }
+function makeVsCodeWorkspaceMcpServer(options, projectEnv) {
+    const projectPath = node_path_1.default.dirname(projectEnv);
+    const env = {
+        IRANTI_MCP_DEFAULT_AGENT: options.agent,
+        IRANTI_MCP_DEFAULT_SOURCE: options.source,
+    };
+    if (options.provider) {
+        env.LLM_PROVIDER = options.provider;
+    }
+    const localBinding = node_path_1.default.join(projectPath, '.env.iranti');
+    if (node_path_1.default.resolve(projectEnv) !== node_path_1.default.resolve(localBinding)) {
+        env.IRANTI_PROJECT_ENV = projectEnv;
+    }
+    return {
+        type: 'stdio',
+        command: 'iranti',
+        args: ['mcp'],
+        ...(node_path_1.default.resolve(projectEnv) === node_path_1.default.resolve(localBinding)
+            ? { envFile: '${workspaceFolder}/.env.iranti' }
+            : {}),
+        env,
+    };
+}
 function writeWorkspaceMcpFile(projectEnv, options) {
     const projectPath = node_path_1.default.dirname(projectEnv);
     const mcpFile = node_path_1.default.join(projectPath, '.mcp.json');
@@ -211,6 +234,46 @@ function writeWorkspaceMcpFile(projectEnv, options) {
     }, null, 2)}\n`, 'utf8');
     return { filePath: mcpFile, status: 'updated' };
 }
+function writeWorkspaceVsCodeMcpFile(projectEnv, options) {
+    const projectPath = node_path_1.default.dirname(projectEnv);
+    const vscodeDir = node_path_1.default.join(projectPath, '.vscode');
+    const mcpFile = node_path_1.default.join(vscodeDir, 'mcp.json');
+    const nextServer = makeVsCodeWorkspaceMcpServer(options, projectEnv);
+    node_fs_1.default.mkdirSync(vscodeDir, { recursive: true });
+    if (!node_fs_1.default.existsSync(mcpFile)) {
+        node_fs_1.default.writeFileSync(mcpFile, `${JSON.stringify({
+            servers: {
+                iranti: nextServer,
+            },
+        }, null, 2)}\n`, 'utf8');
+        return { filePath: mcpFile, status: 'created' };
+    }
+    let existing;
+    try {
+        existing = JSON.parse(node_fs_1.default.readFileSync(mcpFile, 'utf8'));
+    }
+    catch {
+        throw new Error(`Existing .vscode/mcp.json is not valid JSON: ${mcpFile}`);
+    }
+    if (!existing || typeof existing !== 'object' || Array.isArray(existing)) {
+        throw new Error(`Existing .vscode/mcp.json must contain a JSON object: ${mcpFile}`);
+    }
+    const existingServers = existing.servers && typeof existing.servers === 'object' && !Array.isArray(existing.servers)
+        ? existing.servers
+        : {};
+    const currentIranti = existingServers.iranti;
+    if (JSON.stringify(currentIranti) === JSON.stringify(nextServer)) {
+        return { filePath: mcpFile, status: 'unchanged' };
+    }
+    node_fs_1.default.writeFileSync(mcpFile, `${JSON.stringify({
+        ...existing,
+        servers: {
+            ...existingServers,
+            iranti: nextServer,
+        },
+    }, null, 2)}\n`, 'utf8');
+    return { filePath: mcpFile, status: 'updated' };
+}
 function canUseInstalledIranti(repoRoot) {
     try {
         run('iranti', ['mcp', '--help'], repoRoot);
@@ -267,8 +330,11 @@ function main() {
     const workspaceProjectEnv = options.writeWorkspaceFile
         ? resolveWorkspaceProjectEnv(options)
         : undefined;
-    const workspaceMcpResult = workspaceProjectEnv
-        ? writeWorkspaceMcpFile(workspaceProjectEnv, options)
+    const workspaceFilesResult = workspaceProjectEnv
+        ? {
+            mcp: writeWorkspaceMcpFile(workspaceProjectEnv, options),
+            vscode: writeWorkspaceVsCodeMcpFile(workspaceProjectEnv, options),
+        }
         : null;
     const registered = run('codex', ['mcp', 'get', options.name], repoRoot);
     console.log(registered);
@@ -296,11 +362,12 @@ function main() {
         console.log(`Launch with: codex -C "${repoRoot}"`);
     }
     if (options.writeWorkspaceFile) {
-        if (workspaceMcpResult) {
-            console.log(`Workspace .mcp.json: ${workspaceMcpResult.status} (${workspaceMcpResult.filePath})`);
+        if (workspaceFilesResult) {
+            console.log(`Workspace .mcp.json: ${workspaceFilesResult.mcp.status} (${workspaceFilesResult.mcp.filePath})`);
+            console.log(`Workspace .vscode/mcp.json: ${workspaceFilesResult.vscode.status} (${workspaceFilesResult.vscode.filePath})`);
         }
         else {
-            console.log('Workspace .mcp.json: unchanged (no project binding found from the current working directory)');
+            console.log('Workspace MCP files: unchanged (no project binding found from the current working directory)');
         }
     }
 }