@angular/cli 21.1.1 → 21.2.0-next.0

package/src/commands/mcp/tools/modernize.js

@@ -9,9 +9,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MODERNIZE_TOOL = void 0;
 exports.runModernization = runModernization;
-const path_1 = require("path");
 const zod_1 = require("zod");
+const shared_options_1 = require("../shared-options");
 const utils_1 = require("../utils");
+const workspace_utils_1 = require("../workspace-utils");
 const tool_registry_1 = require("./tool-registry");
 const TRANSFORMATIONS = [
     {
@@ -58,14 +59,15 @@ const TRANSFORMATIONS = [
     },
 ];
 const modernizeInputSchema = zod_1.z.object({
-    directories: zod_1.z
-        .array(zod_1.z.string())
-        .optional()
-        .describe('A list of paths to directories with files to modernize.'),
+    ...shared_options_1.workspaceAndProjectOptions,
     transformations: zod_1.z
         .array(zod_1.z.enum(TRANSFORMATIONS.map((t) => t.name)))
         .optional()
         .describe('A list of specific transformations to apply.'),
+    path: zod_1.z
+        .string()
+        .optional()
+        .describe('The path to the file or directory to modernize, relative to the workspace root.'),
 });
 const modernizeOutputSchema = zod_1.z.object({
     instructions: zod_1.z
@@ -74,9 +76,8 @@ const modernizeOutputSchema = zod_1.z.object({
         .describe('Migration summary, as well as any instructions that need to be performed to complete the migrations.'),
     logs: zod_1.z.array(zod_1.z.string()).optional().describe('All logs from all executed commands.'),
 });
-async function runModernization(input, host) {
+async function runModernization(input, context) {
     const transformationNames = input.transformations ?? [];
-    const directories = input.directories ?? [];
     if (transformationNames.length === 0) {
         return (0, utils_1.createStructuredContentOutput)({
             instructions: [
@@ -85,22 +86,12 @@ async function runModernization(input, host) {
             ],
         });
     }
-    if (directories.length === 0) {
-        return (0, utils_1.createStructuredContentOutput)({
-            instructions: [
-                'Provide this tool with a list of directory paths in your workspace ' +
-                    'to run the modernization on.',
-            ],
-        });
-    }
-    const firstDir = directories[0];
-    const executionDir = (await host.stat(firstDir)).isDirectory() ? firstDir : (0, path_1.dirname)(firstDir);
-    const angularProjectRoot = (0, utils_1.findAngularJsonDir)(executionDir, host);
-    if (!angularProjectRoot) {
-        return (0, utils_1.createStructuredContentOutput)({
-            instructions: ['Could not find an angular.json file in the current or parent directories.'],
-        });
-    }
+    const { workspacePath, projectName } = await (0, workspace_utils_1.resolveWorkspaceAndProject)({
+        host: context.host,
+        workspacePathInput: input.workspace,
+        projectNameInput: input.project,
+        mcpWorkspace: context.workspace,
+    });
     const instructions = [];
     let logs = [];
     const transformationsToRun = TRANSFORMATIONS.filter((t) => transformationNames.includes(t.name));
@@ -115,20 +106,20 @@ async function runModernization(input, host) {
         }
         else {
             // Simple case, run the command.
-            for (const dir of directories) {
-                const relativePath = (0, path_1.relative)(angularProjectRoot, dir) || '.';
-                const command = 'ng';
-                const args = ['generate', `@angular/core:${transformation.name}`, '--path', relativePath];
-                try {
-                    logs = (await host.runCommand(command, args, {
-                        cwd: angularProjectRoot,
-                    })).logs;
-                    instructions.push(`Migration ${transformation.name} on directory ${relativePath} completed successfully.`);
-                }
-                catch (e) {
-                    logs = (0, utils_1.getCommandErrorLogs)(e);
-                    instructions.push(`Migration ${transformation.name} on directory ${relativePath} failed.`);
-                }
+            const command = 'ng';
+            const args = ['generate', `@angular/core:${transformation.name}`, '--project', projectName];
+            if (input.path) {
+                args.push('--path', input.path);
+            }
+            try {
+                logs = (await context.host.runCommand(command, args, {
+                    cwd: workspacePath,
+                })).logs;
+                instructions.push(`Migration ${transformation.name} completed successfully.`);
+            }
+            catch (e) {
+                logs = (0, utils_1.getCommandErrorLogs)(e);
+                instructions.push(`Migration ${transformation.name} failed.`);
             }
         }
     }
@@ -169,6 +160,6 @@ ${TRANSFORMATIONS.map((t) => `  * ${t.name}: ${t.description}`).join('\n')}
     outputSchema: modernizeOutputSchema.shape,
     isLocalOnly: true,
     isReadOnly: false,
-    factory: (context) => (input) => runModernization(input, context.host),
+    factory: (context) => (input) => runModernization(input, context),
 });
 //# sourceMappingURL=modernize.js.map

package/src/commands/mcp/tools/modernize.js.map

@@ -1 +1 @@
-{"version":3,"file":"modernize.js","sourceRoot":"","sources":["modernize.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modernize.js","sourceRoot":"","sources":["modernize.ts"],"names":[],"mappings":"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"}

package/src/commands/mcp/tools/onpush-zoneless-migration/migrate-test-file.js

@@ -11,7 +11,7 @@ exports.migrateTestFile = migrateTestFile;
 exports.searchForGlobalZoneless = searchForGlobalZoneless;
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
-const utils_1 = require("../../utils");
+const workspace_utils_1 = require("../../workspace-utils");
 const prompts_1 = require("./prompts");
 const ts_utils_1 = require("./ts-utils");
 async function migrateTestFile(sourceFile) {
@@ -36,7 +36,7 @@ async function migrateTestFile(sourceFile) {
     return (0, prompts_1.createFixResponseForZoneTests)(sourceFile);
 }
 async function searchForGlobalZoneless(startPath) {
-    const angularJsonDir = (0, utils_1.findAngularJsonDir)(startPath);
+    const angularJsonDir = (0, workspace_utils_1.findAngularJsonDir)(startPath);
     if (!angularJsonDir) {
         // Cannot determine project root, fallback to original behavior or assume false.
         // For now, let's assume no global setup if angular.json is not found.

package/src/commands/mcp/tools/onpush-zoneless-migration/migrate-test-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-test-file.js","sourceRoot":"","sources":["migrate-test-file.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAWH,0CAyBC;AAED,0DAwBC;AA5DD,qCAAmD;AACnD,+CAAwC;AAGxC,uCAAiD;AACjD,uCAAoG;AACpG,yCAA4C;AAGrC,KAAK,UAAU,eAAe,CAAC,UAAsB;IAC1D,MAAM,EAAE,GAAG,MAAM,IAAA,yBAAc,GAAE,CAAC;IAClC,yIAAyI;IACzI,IAAI,+BAA+B,GAAG,MAAM,uBAAuB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzF,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,IAAI;YAC7C,IACE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACzB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,gCAAgC,EACxE,CAAC;gBACD,+BAA+B,GAAG,IAAI,CAAC;gBAEvC,OAAO;YACT,CAAC;YACD,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,sEAAsE;QACtE,OAAO,IAAA,kDAAwC,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED,mIAAmI;IACnI,OAAO,IAAA,uCAA6B,EAAC,UAAU,CAAC,CAAC;AACnD,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAAC,SAAiB;IAC7D,MAAM,cAAc,GAAG,IAAA,0BAAkB,EAAC,SAAS,CAAC,CAAC;IACrD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,gFAAgF;QAChF,sEAAsE;QACtE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAA,eAAI,EAAC,GAAG,cAAc,UAAU,CAAC,CAAC;QAChD,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5C,IACE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;gBACvC,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAClD,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"migrate-test-file.js","sourceRoot":"","sources":["migrate-test-file.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAWH,0CAyBC;AAED,0DAwBC;AA5DD,qCAAmD;AACnD,+CAAwC;AAGxC,2DAA2D;AAC3D,uCAAoG;AACpG,yCAA4C;AAGrC,KAAK,UAAU,eAAe,CAAC,UAAsB;IAC1D,MAAM,EAAE,GAAG,MAAM,IAAA,yBAAc,GAAE,CAAC;IAClC,yIAAyI;IACzI,IAAI,+BAA+B,GAAG,MAAM,uBAAuB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzF,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,IAAI;YAC7C,IACE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACzB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,gCAAgC,EACxE,CAAC;gBACD,+BAA+B,GAAG,IAAI,CAAC;gBAEvC,OAAO;YACT,CAAC;YACD,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,sEAAsE;QACtE,OAAO,IAAA,kDAAwC,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED,mIAAmI;IACnI,OAAO,IAAA,uCAA6B,EAAC,UAAU,CAAC,CAAC;AACnD,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAAC,SAAiB;IAC7D,MAAM,cAAc,GAAG,IAAA,oCAAkB,EAAC,SAAS,CAAC,CAAC;IACrD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,gFAAgF;QAChF,sEAAsE;QACtE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAA,eAAI,EAAC,GAAG,cAAc,UAAU,CAAC,CAAC;QAChD,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5C,IACE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;gBACvC,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAClD,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/src/commands/mcp/tools/test.d.ts

@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { z } from 'zod';
-import { type Host } from '../host';
-import { type McpToolDeclaration } from './tool-registry';
+import { type McpToolContext, type McpToolDeclaration } from './tool-registry';
 declare const testToolInputSchema: z.ZodObject<{
-    project: z.ZodOptional<z.ZodString>;
     filter: z.ZodOptional<z.ZodString>;
+    workspace: z.ZodOptional<z.ZodString>;
+    project: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type TestToolInput = z.infer<typeof testToolInputSchema>;
 declare const testToolOutputSchema: z.ZodObject<{
@@ -21,7 +21,7 @@ declare const testToolOutputSchema: z.ZodObject<{
     logs: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
 export type TestToolOutput = z.infer<typeof testToolOutputSchema>;
-export declare function runTest(input: TestToolInput, host: Host): Promise<{
+export declare function runTest(input: TestToolInput, context: McpToolContext): Promise<{
     content: {
         type: "text";
         text: string;

package/src/commands/mcp/tools/test.js

@@ -10,27 +10,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TEST_TOOL = void 0;
 exports.runTest = runTest;
 const zod_1 = require("zod");
-const host_1 = require("../host");
+const shared_options_1 = require("../shared-options");
 const utils_1 = require("../utils");
+const workspace_utils_1 = require("../workspace-utils");
 const tool_registry_1 = require("./tool-registry");
 const testStatusSchema = zod_1.z.enum(['success', 'failure']);
 const testToolInputSchema = zod_1.z.object({
-    project: zod_1.z
-        .string()
-        .optional()
-        .describe('Which project to test in a monorepo context. If not provided, tests all projects.'),
+    ...shared_options_1.workspaceAndProjectOptions,
     filter: zod_1.z.string().optional().describe('Filter the executed tests by spec name.'),
 });
 const testToolOutputSchema = zod_1.z.object({
     status: testStatusSchema.describe('Test execution status.'),
     logs: zod_1.z.array(zod_1.z.string()).optional().describe('Output logs from `ng test`.'),
 });
-async function runTest(input, host) {
+async function runTest(input, context) {
+    const { workspacePath, projectName } = await (0, workspace_utils_1.resolveWorkspaceAndProject)({
+        host: context.host,
+        workspacePathInput: input.workspace,
+        projectNameInput: input.project,
+        mcpWorkspace: context.workspace,
+    });
     // Build "ng"'s command line.
-    const args = ['test'];
-    if (input.project) {
-        args.push(input.project);
-    }
+    const args = ['test', projectName];
     // This is ran by the agent so we want a non-watched, headless test.
     args.push('--browsers', 'ChromeHeadless');
     args.push('--watch', 'false');
@@ -40,7 +41,7 @@ async function runTest(input, host) {
     let status = 'success';
     let logs = [];
     try {
-        logs = (await host.runCommand('ng', args)).logs;
+        logs = (await context.host.runCommand('ng', args, { cwd: workspacePath })).logs;
     }
     catch (e) {
         status = 'failure';
@@ -73,6 +74,6 @@ Perform a one-off, non-watched unit test execution with ng test.
     isLocalOnly: true,
     inputSchema: testToolInputSchema.shape,
     outputSchema: testToolOutputSchema.shape,
-    factory: () => (input) => runTest(input, host_1.LocalWorkspaceHost),
+    factory: (context) => (input) => runTest(input, context),
 });
 //# sourceMappingURL=test.js.map

package/src/commands/mcp/tools/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AA2BH,0BA+BC;AAxDD,6BAAwB;AACxB,kCAAsE;AACtE,oCAA8E;AAC9E,mDAAuE;AAEvE,MAAM,gBAAgB,GAAG,OAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;AAGxD,MAAM,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,OAAO,EAAE,OAAC;SACP,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,mFAAmF,CAAC;IAChG,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,yCAAyC,CAAC;CAClF,CAAC,CAAC;AAIH,MAAM,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAC3D,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;CAC7E,CAAC,CAAC;AAII,KAAK,UAAU,OAAO,CAAC,KAAoB,EAAE,IAAU;IAC5D,6BAA6B;IAC7B,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,oEAAoE;IACpE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE9B,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,MAAM,GAAe,SAAS,CAAC;IACnC,IAAI,IAAI,GAAa,EAAE,CAAC;IAExB,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,SAAS,CAAC;QACnB,IAAI,GAAG,IAAA,2BAAmB,EAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,iBAAiB,GAAmB;QACxC,MAAM;QACN,IAAI;KACL,CAAC;IAEF,OAAO,IAAA,qCAA6B,EAAC,iBAAiB,CAAC,CAAC;AAC1D,CAAC;AAEY,QAAA,SAAS,GAGlB,IAAA,2BAAW,EAAC;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,WAAW,EAAE;;;;;;;;;;;;;CAad;IACC,UAAU,EAAE,KAAK;IACjB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,mBAAmB,CAAC,KAAK;IACtC,YAAY,EAAE,oBAAoB,CAAC,KAAK;IACxC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,yBAAkB,CAAC;CAC7D,CAAC,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAyBH,0BAmCC;AA1DD,6BAAwB;AACxB,sDAA+D;AAC/D,oCAA8E;AAC9E,wDAAgE;AAChE,mDAA4F;AAE5F,MAAM,gBAAgB,GAAG,OAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;AAGxD,MAAM,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,GAAG,2CAA0B;IAC7B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,yCAAyC,CAAC;CAClF,CAAC,CAAC;AAIH,MAAM,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAC3D,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;CAC7E,CAAC,CAAC;AAII,KAAK,UAAU,OAAO,CAAC,KAAoB,EAAE,OAAuB;IACzE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,4CAA0B,EAAC;QACtE,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,kBAAkB,EAAE,KAAK,CAAC,SAAS;QACnC,gBAAgB,EAAE,KAAK,CAAC,OAAO;QAC/B,YAAY,EAAE,OAAO,CAAC,SAAS;KAChC,CAAC,CAAC;IAEH,6BAA6B;IAC7B,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAEnC,oEAAoE;IACpE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE9B,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,MAAM,GAAe,SAAS,CAAC;IACnC,IAAI,IAAI,GAAa,EAAE,CAAC;IAExB,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAClF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,SAAS,CAAC;QACnB,IAAI,GAAG,IAAA,2BAAmB,EAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,iBAAiB,GAAmB;QACxC,MAAM;QACN,IAAI;KACL,CAAC;IAEF,OAAO,IAAA,qCAA6B,EAAC,iBAAiB,CAAC,CAAC;AAC1D,CAAC;AAEY,QAAA,SAAS,GAGlB,IAAA,2BAAW,EAAC;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,WAAW,EAAE;;;;;;;;;;;;;CAad;IACC,UAAU,EAAE,KAAK;IACjB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,mBAAmB,CAAC,KAAK;IACtC,YAAY,EAAE,oBAAoB,CAAC,KAAK;IACxC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC;CACzD,CAAC,CAAC"}

package/src/commands/mcp/utils.d.ts

@@ -5,12 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-/**
- * @fileoverview
- * Utility functions shared across MCP tools.
- */
-import { workspaces } from '@angular-devkit/core';
-import { McpToolContext } from './tools/tool-registry';
 /**
  * Returns simple structured content output from an MCP tool.
  *
@@ -23,31 +17,6 @@ export declare function createStructuredContentOutput<OutputType>(structuredCont
     }[];
     structuredContent: OutputType;
 };
-/**
- * Searches for an angular.json file by traversing up the directory tree from a starting directory.
- *
- * @param startDir The directory path to start searching from
- * @param host The workspace host instance used to check file existence. Defaults to LocalWorkspaceHost
- * @returns The absolute path to the directory containing angular.json, or null if not found
- *
- * @remarks
- * This function performs an upward directory traversal starting from `startDir`.
- * It checks each directory for the presence of an angular.json file until either:
- * - The file is found (returns the directory path)
- * - The root of the filesystem is reached (returns null)
- */
-export declare function findAngularJsonDir(startDir: string, host?: import("./host").Host): string | null;
-/**
- * Searches for a project in the current workspace, by name.
- */
-export declare function getProject(context: McpToolContext, name: string): workspaces.ProjectDefinition | undefined;
-/**
- * Returns the name of the default project in the current workspace, or undefined if none exists.
- *
- * If no default project is defined but there's only a single project in the workspace, its name will
- * be returned.
- */
-export declare function getDefaultProjectName(context: McpToolContext): string | undefined;
 /**
  * Get the logs of a failing command.
  *

package/src/commands/mcp/utils.js

@@ -8,11 +8,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStructuredContentOutput = createStructuredContentOutput;
-exports.findAngularJsonDir = findAngularJsonDir;
-exports.getProject = getProject;
-exports.getDefaultProjectName = getDefaultProjectName;
 exports.getCommandErrorLogs = getCommandErrorLogs;
-const node_path_1 = require("node:path");
+/**
+ * @fileoverview
+ * Utility functions shared across MCP tools.
+ */
 const host_1 = require("./host");
 /**
  * Returns simple structured content output from an MCP tool.
@@ -25,63 +25,6 @@ function createStructuredContentOutput(structuredContent) {
         structuredContent,
     };
 }
-/**
- * Searches for an angular.json file by traversing up the directory tree from a starting directory.
- *
- * @param startDir The directory path to start searching from
- * @param host The workspace host instance used to check file existence. Defaults to LocalWorkspaceHost
- * @returns The absolute path to the directory containing angular.json, or null if not found
- *
- * @remarks
- * This function performs an upward directory traversal starting from `startDir`.
- * It checks each directory for the presence of an angular.json file until either:
- * - The file is found (returns the directory path)
- * - The root of the filesystem is reached (returns null)
- */
-function findAngularJsonDir(startDir, host = host_1.LocalWorkspaceHost) {
-    let currentDir = startDir;
-    while (true) {
-        if (host.existsSync((0, node_path_1.join)(currentDir, 'angular.json'))) {
-            return currentDir;
-        }
-        const parentDir = (0, node_path_1.dirname)(currentDir);
-        if (parentDir === currentDir) {
-            return null;
-        }
-        currentDir = parentDir;
-    }
-}
-/**
- * Searches for a project in the current workspace, by name.
- */
-function getProject(context, name) {
-    const projects = context.workspace?.projects;
-    if (!projects) {
-        return undefined;
-    }
-    return projects.get(name);
-}
-/**
- * Returns the name of the default project in the current workspace, or undefined if none exists.
- *
- * If no default project is defined but there's only a single project in the workspace, its name will
- * be returned.
- */
-function getDefaultProjectName(context) {
-    const projects = context.workspace?.projects;
-    if (!projects) {
-        return undefined;
-    }
-    const defaultProjectName = context.workspace?.extensions['defaultProject'];
-    if (defaultProjectName) {
-        return defaultProjectName;
-    }
-    // No default project defined? This might still be salvageable if only a single project exists.
-    if (projects.size === 1) {
-        return Array.from(projects.keys())[0];
-    }
-    return undefined;
-}
 /**
  * Get the logs of a failing command.
  *

package/src/commands/mcp/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAiBH,sEAKC;AAeD,gDAYC;AAKD,gCAUC;AAQD,sDAkBC;AAOD,kDAQC;AAjGD,yCAA0C;AAC1C,iCAA0D;AAG1D;;;;GAIG;AACH,SAAgB,6BAA6B,CAAa,iBAA6B;IACrF,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QACtF,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,kBAAkB,CAAC,QAAgB,EAAE,IAAI,GAAG,yBAAkB;IAC5E,IAAI,UAAU,GAAG,QAAQ,CAAC;IAC1B,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,IAAI,CAAC,UAAU,CAAC,IAAA,gBAAI,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,MAAM,SAAS,GAAG,IAAA,mBAAO,EAAC,UAAU,CAAC,CAAC;QACtC,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,UAAU,GAAG,SAAS,CAAC;IACzB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,UAAU,CACxB,OAAuB,EACvB,IAAY;IAEZ,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC7C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,OAAuB;IAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC;IAE7C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAuB,CAAC;IACjG,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,+FAA+F;IAC/F,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,CAAU;IAC5C,IAAI,CAAC,YAAY,mBAAY,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAcH,sEAKC;AAOD,kDAQC;AAhCD;;;GAGG;AAEH,iCAAsC;AAEtC;;;;GAIG;AACH,SAAgB,6BAA6B,CAAa,iBAA6B;IACrF,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QACtF,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,CAAU;IAC5C,IAAI,CAAC,YAAY,mBAAY,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;AACH,CAAC"}

package/src/commands/mcp/workspace-utils.d.ts

@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+import { workspaces } from '@angular-devkit/core';
+import { AngularWorkspace } from '../../utilities/config';
+import { type Host } from './host';
+import { McpToolContext } from './tools/tool-registry';
+/**
+ * Searches for an angular.json file by traversing up the directory tree from a starting directory.
+ *
+ * @param startDir The directory path to start searching from
+ * @param host The workspace host instance used to check file existence. Defaults to LocalWorkspaceHost
+ * @returns The absolute path to the directory containing angular.json, or null if not found
+ *
+ * @remarks
+ * This function performs an upward directory traversal starting from `startDir`.
+ * It checks each directory for the presence of an angular.json file until either:
+ * - The file is found (returns the directory path)
+ * - The root of the filesystem is reached (returns null)
+ */
+export declare function findAngularJsonDir(startDir: string, host?: Host): string | null;
+/**
+ * Searches for a project in the current workspace, by name.
+ */
+export declare function getProject(context: McpToolContext, name: string): workspaces.ProjectDefinition | undefined;
+/**
+ * Returns the name of the default project in the current workspace, or undefined if none exists.
+ *
+ * If no default project is defined but there's only a single project in the workspace, its name will
+ * be returned.
+ */
+export declare function getDefaultProjectName(workspace: AngularWorkspace | undefined): string | undefined;
+/**
+ * Resolves workspace and project for tools to operate on.
+ *
+ * If `workspacePathInput` is absent, uses the MCP's configured workspace. If none is configured, use the
+ * current directory as the workspace.
+ * If `projectNameInput` is absent, uses the default project in the workspace.
+ */
+export declare function resolveWorkspaceAndProject({ host, workspacePathInput, projectNameInput, mcpWorkspace, }: {
+    host: Host;
+    workspacePathInput?: string;
+    projectNameInput?: string;
+    mcpWorkspace?: AngularWorkspace;
+}): Promise<{
+    workspace: AngularWorkspace;
+    workspacePath: string;
+    projectName: string;
+}>;

package/src/commands/mcp/workspace-utils.js

@@ -0,0 +1,138 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findAngularJsonDir = findAngularJsonDir;
+exports.getProject = getProject;
+exports.getDefaultProjectName = getDefaultProjectName;
+exports.resolveWorkspaceAndProject = resolveWorkspaceAndProject;
+const node_path_1 = require("node:path");
+const config_1 = require("../../utilities/config");
+const host_1 = require("./host");
+/**
+ * Searches for an angular.json file by traversing up the directory tree from a starting directory.
+ *
+ * @param startDir The directory path to start searching from
+ * @param host The workspace host instance used to check file existence. Defaults to LocalWorkspaceHost
+ * @returns The absolute path to the directory containing angular.json, or null if not found
+ *
+ * @remarks
+ * This function performs an upward directory traversal starting from `startDir`.
+ * It checks each directory for the presence of an angular.json file until either:
+ * - The file is found (returns the directory path)
+ * - The root of the filesystem is reached (returns null)
+ */
+function findAngularJsonDir(startDir, host = host_1.LocalWorkspaceHost) {
+    let currentDir = startDir;
+    while (true) {
+        if (host.existsSync((0, node_path_1.join)(currentDir, 'angular.json'))) {
+            return currentDir;
+        }
+        const parentDir = (0, node_path_1.dirname)(currentDir);
+        if (parentDir === currentDir) {
+            return null;
+        }
+        currentDir = parentDir;
+    }
+}
+/**
+ * Searches for a project in the current workspace, by name.
+ */
+function getProject(context, name) {
+    const projects = context.workspace?.projects;
+    if (!projects) {
+        return undefined;
+    }
+    return projects.get(name);
+}
+/**
+ * Returns the name of the default project in the current workspace, or undefined if none exists.
+ *
+ * If no default project is defined but there's only a single project in the workspace, its name will
+ * be returned.
+ */
+function getDefaultProjectName(workspace) {
+    const projects = workspace?.projects;
+    if (!projects) {
+        return undefined;
+    }
+    const defaultProjectName = workspace?.extensions['defaultProject'];
+    if (defaultProjectName) {
+        return defaultProjectName;
+    }
+    // No default project defined? This might still be salvageable if only a single project exists.
+    if (projects.size === 1) {
+        return Array.from(projects.keys())[0];
+    }
+    return undefined;
+}
+/**
+ * Resolves workspace and project for tools to operate on.
+ *
+ * If `workspacePathInput` is absent, uses the MCP's configured workspace. If none is configured, use the
+ * current directory as the workspace.
+ * If `projectNameInput` is absent, uses the default project in the workspace.
+ */
+async function resolveWorkspaceAndProject({ host, workspacePathInput, projectNameInput, mcpWorkspace, }) {
+    let workspacePath;
+    let workspace;
+    if (workspacePathInput) {
+        if (!host.existsSync(workspacePathInput)) {
+            throw new Error(`Workspace path does not exist: ${workspacePathInput}. ` +
+                "You can use 'list_projects' to find available workspaces.");
+        }
+        if (!host.existsSync((0, node_path_1.join)(workspacePathInput, 'angular.json'))) {
+            throw new Error(`No angular.json found at ${workspacePathInput}. ` +
+                "You can use 'list_projects' to find available workspaces.");
+        }
+        workspacePath = workspacePathInput;
+        const configPath = (0, node_path_1.join)(workspacePath, 'angular.json');
+        try {
+            workspace = await config_1.AngularWorkspace.load(configPath);
+        }
+        catch (e) {
+            throw new Error(`Failed to load workspace configuration at ${configPath}: ${e instanceof Error ? e.message : e}`);
+        }
+    }
+    else if (mcpWorkspace) {
+        workspace = mcpWorkspace;
+        workspacePath = workspace.basePath;
+    }
+    else {
+        const found = findAngularJsonDir(process.cwd(), host);
+        if (!found) {
+            throw new Error('Could not find an Angular workspace (angular.json) in the current directory. ' +
+                "You can use 'list_projects' to find available workspaces.");
+        }
+        workspacePath = found;
+        const configPath = (0, node_path_1.join)(workspacePath, 'angular.json');
+        try {
+            workspace = await config_1.AngularWorkspace.load(configPath);
+        }
+        catch (e) {
+            throw new Error(`Failed to load workspace configuration at ${configPath}: ${e instanceof Error ? e.message : e}`);
+        }
+    }
+    let projectName = projectNameInput;
+    if (projectName) {
+        if (!workspace.projects.has(projectName)) {
+            throw new Error(`Project '${projectName}' not found in workspace path ${workspacePath}. ` +
+                "You can use 'list_projects' to find available projects.");
+        }
+    }
+    else {
+        projectName = getDefaultProjectName(workspace);
+    }
+    if (!projectName) {
+        throw new Error(`No project name provided and no default project found in workspace path ${workspacePath}. ` +
+            'Please provide a project name or set a default project in angular.json. ' +
+            "You can use 'list_projects' to find available projects.");
+    }
+    return { workspace, workspacePath, projectName };
+}
+//# sourceMappingURL=workspace-utils.js.map

package/src/commands/mcp/workspace-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-utils.js","sourceRoot":"","sources":["workspace-utils.ts"],"names":[],"mappings":"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"}