duoops 0.2.6 → 0.2.8

package/dist/commands/init.js

@@ -1,5 +1,5 @@
 import { BigQuery } from '@google-cloud/bigquery';
-import { confirm, input, password, select } from '@inquirer/prompts';
+import { checkbox, confirm, input, password, select } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
 import axios from 'axios';
 import { bold, gray, green, yellow } from 'kleur/colors';
@@ -46,6 +46,21 @@ const detectGitRemotePath = () => {
     }
     catch { /* ignore */ }
 };
+const resolveProjectId = async (auth, pathOrId) => {
+    const base = normalizeGitLabUrl(auth.baseUrl);
+    const encoded = encodeURIComponent(normalizeProjectPath(pathOrId));
+    try {
+        const res = await axios.get(`${base}/api/v4/projects/${encoded}`, {
+            headers: gitlabAuthHeaders(auth.token),
+            timeout: 5000,
+            validateStatus: () => true,
+        });
+        if (res.status === 200 && res.data?.id) {
+            return { id: res.data.id, name: res.data.name_with_namespace, path: res.data.path_with_namespace };
+        }
+    }
+    catch { /* ignore */ }
+};
 const normalizeProjectPath = (project) => project.replace(/^\/+/, '');
 const normalizeGitLabUrl = (url) => url.replace(/\/+$/, '');
 const setGitlabVariable = async (auth, projectPath, variable) => {
@@ -295,9 +310,16 @@ export default class Init extends Command {
                 message: 'GitLab Personal Access Token',
             });
         }
-        const enableMeasure = await confirm({
-            message: 'Enable Measure/Sustainability Tracking (BigQuery)?',
+        const features = await checkbox({
+            choices: [
+                { checked: true, name: 'Carbon measurement (BigQuery)', value: 'measure' },
+                { checked: true, name: 'Duo agents and flows', value: 'agents' },
+                { checked: true, name: 'MCP server (Cloud Run)', value: 'mcp' },
+                { checked: true, name: 'CI project wiring (variables + runner)', value: 'ci' },
+            ],
+            message: 'What would you like to set up?',
         });
+        const enableMeasure = features.includes('measure');
         let bigqueryDataset;
         let bigqueryTable;
         let googleProjectId;
@@ -369,11 +391,7 @@ export default class Init extends Command {
         };
         configManager.set(config);
         this.log(green('Configuration saved.'));
-        const setupAgents = await confirm({
-            default: true,
-            message: 'Set up DuoOps agents and flows in this project?',
-        });
-        if (setupAgents) {
+        if (features.includes('agents')) {
             const { scaffoldProject } = await import('../lib/scaffold.js');
             const result = scaffoldProject(process.cwd());
             for (const f of result.created) {
@@ -384,30 +402,20 @@ export default class Init extends Command {
             }
         }
         this.log(`\nTry '${this.config.bin} pipelines:list <project>' to verify GitLab access.\n`);
-        if (enableMeasure) {
-            const deployMcp = await confirm({
-                default: true,
-                message: 'Deploy the DuoOps MCP Server to Cloud Run now?',
-            });
-            if (deployMcp && googleProjectId && bigqueryDataset && bigqueryTable) {
-                try {
-                    await McpDeploy.run([
-                        '--gcp-project', googleProjectId,
-                        '--bq-dataset', bigqueryDataset,
-                        '--bq-table', bigqueryTable,
-                        '--gitlab-url', gitlabUrl,
-                    ]);
-                }
-                catch (error) {
-                    this.warn(`MCP Deployment failed: ${error}`);
-                }
+        if (features.includes('mcp') && googleProjectId && bigqueryDataset && bigqueryTable) {
+            try {
+                await McpDeploy.run([
+                    '--gcp-project', googleProjectId,
+                    '--bq-dataset', bigqueryDataset,
+                    '--bq-table', bigqueryTable,
+                    '--gitlab-url', gitlabUrl,
+                ]);
+            }
+            catch (error) {
+                this.warn(`MCP Deployment failed: ${error}`);
             }
         }
-        const configureProject = await confirm({
-            default: true,
-            message: 'Configure a GitLab project (CI variables + optional GCP runner) now?',
-        });
-        if (!configureProject) {
+        if (!features.includes('ci')) {
             return;
         }
         const updatedDefaultProject = await this.configureGitLabProject({ baseUrl: gitlabUrl, token: gitlabToken }, config.defaultProjectId);
@@ -447,13 +455,44 @@ export default class Init extends Command {
             this.warn('GitLab credentials missing, skipping project configuration.');
             return;
         }
-        const projectPath = await input({
-            default: currentDefault ?? detectGitRemotePath(),
-            message: 'GitLab project path (e.g., group/project)',
-        });
+        const detectedPath = detectGitRemotePath();
+        let projectPath;
+        let resolvedProject;
+        if (detectedPath) {
+            resolvedProject = await resolveProjectId(auth, detectedPath);
+        }
+        if (resolvedProject) {
+            const useDetected = await confirm({
+                default: true,
+                message: `Detected project: ${resolvedProject.name} (ID: ${resolvedProject.id}). Use it?`,
+            });
+            if (useDetected) {
+                projectPath = resolvedProject.path;
+            }
+            else {
+                projectPath = await input({
+                    default: currentDefault,
+                    message: 'GitLab project path or URL',
+                });
+                resolvedProject = await resolveProjectId(auth, projectPath);
+            }
+        }
+        else {
+            projectPath = await input({
+                default: currentDefault ?? detectedPath,
+                message: 'GitLab project path or URL',
+            });
+            resolvedProject = await resolveProjectId(auth, projectPath);
+        }
         if (!projectPath) {
             this.warn('Project path is required to configure CI variables.');
         }
+        if (resolvedProject) {
+            this.log(gray(`  Project: ${resolvedProject.name} (ID: ${resolvedProject.id})`));
+        }
+        else if (projectPath) {
+            this.warn(`Could not resolve project "${projectPath}". Continuing with path as-is.`);
+        }
         const setAsDefault = await confirm({
             default: !currentDefault,
             message: 'Use this project as the default for DuoOps commands?',

package/oclif.manifest.json

@@ -669,5 +669,5 @@
       ]
     }
   },
-  "version": "0.2.6"
+  "version": "0.2.8"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duoops",
   "description": "Toolset for Explainable and Sustainable CI on Gitlab.",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "author": "Younes Laaroussi",
   "bin": {
     "duoops": "./bin/run.js"