@latentforce/shift 1.0.8 → 1.0.9

package/build/utils/api-client.js

@@ -30,49 +30,84 @@ export async function requestGuestKey() {
  * Matching extension's fetchProjects function in api-client.js
  */
 export async function fetchProjects(apiKey) {
-    try {
-        const response = await fetch(`${API_BASE_URL}/api/vscode-projects`, {
-            method: 'GET',
-            headers: {
-                'Authorization': `Bearer ${apiKey}`,
-            },
-        });
-        if (!response.ok) {
-            const text = await response.text();
-            throw new Error(text || `HTTP ${response.status}`);
-        }
-        const data = await response.json();
-        return data.projects || [];
-    }
-    catch (error) {
-        console.error('Failed to fetch projects:', error);
-        throw new Error(error.message || 'Failed to fetch projects');
+    const response = await fetch(`${API_BASE_URL}/api/v1/mcp/projects`, {
+        method: 'GET',
+        headers: {
+            'Authorization': `Bearer ${apiKey}`,
+        },
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(text || `HTTP ${response.status}`);
     }
+    const data = await response.json();
+    return data.projects || [];
 }
 /**
  * Send init scan to backend
  * Matching extension's init-scan API call
  */
 export async function sendInitScan(apiKey, projectId, payload) {
-    try {
-        const response = await fetch(`${API_BASE_URL_ORCH}/api/projects/${projectId}/init-scan`, {
-            method: 'POST',
-            headers: {
-                'Authorization': `Bearer ${apiKey}`,
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify(payload),
-        });
-        if (!response.ok) {
-            const text = await response.text();
-            throw new Error(text || `HTTP ${response.status}`);
-        }
-        return await response.json();
+    const response = await fetch(`${API_BASE_URL_ORCH}/api/projects/${projectId}/init-scan`, {
+        method: 'POST',
+        headers: {
+            'Authorization': `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(payload),
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(text || `HTTP ${response.status}`);
     }
-    catch (error) {
-        console.error('Failed to send init scan:', error);
-        throw error;
+    return await response.json();
+}
+/**
+ * Send update-drg request to backend
+ * Calls POST /api/v1/mcp/update-drg
+ */
+export async function sendUpdateDrg(apiKey, payload) {
+    const response = await fetch(`${API_BASE_URL}/api/v1/mcp/update-drg`, {
+        method: 'POST',
+        headers: {
+            'Authorization': `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(payload),
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(text || `HTTP ${response.status}`);
+    }
+    return await response.json();
+}
+export async function fetchMigrationTemplates(apiKey) {
+    const response = await fetch(`${API_BASE_URL}/api/v1/mcp/migration-templates`, {
+        method: 'GET',
+        headers: { 'Authorization': `Bearer ${apiKey}` },
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(text || `HTTP ${response.status}`);
+    }
+    const data = await response.json();
+    return data.templates || [];
+}
+export async function createProject(apiKey, params) {
+    const response = await fetch(`${API_BASE_URL}/api/v1/mcp/projects/create`, {
+        method: 'POST',
+        headers: {
+            'Authorization': `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(params),
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(text || `HTTP ${response.status}`);
     }
+    const data = await response.json();
+    return data.project || data;
 }
 /**
  * Fetch project indexing/work status
@@ -82,7 +117,7 @@ export async function fetchProjectStatus(apiKey, projectId) {
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), 5000); // 5 second timeout
     try {
-        const response = await fetch(`${API_BASE_URL}/api/projects/${projectId}/status`, {
+        const response = await fetch(`${API_BASE_URL}/api/v1/mcp/projects/${projectId}/status`, {
             method: 'GET',
             headers: {
                 'Authorization': `Bearer ${apiKey}`,

package/build/utils/auth-resolver.js

@@ -0,0 +1,184 @@
+import * as path from 'path';
+import { getApiKey, setApiKey, setGuestKey, isGuestKey, setProject, readProjectConfig, } from './config.js';
+import { requestGuestKey, fetchProjects, fetchMigrationTemplates, createProject, } from './api-client.js';
+import { promptApiKey, promptKeyChoice, promptSelectProject, promptProjectName, promptCreateOrSelect, promptSelectTemplate, } from './prompts.js';
+/**
+ * Resolve API key from flags, config, or interactive prompts.
+ * Guest flow returns both apiKey and projectId (from guest-key endpoint).
+ */
+export async function resolveApiKey(opts = {}) {
+    const label = opts.commandLabel || 'Shift';
+    const interactive = opts.interactive ?? true;
+    // If both --guest and --api-key, api-key wins
+    if (opts.guest && opts.apiKey) {
+        console.log(`[${label}] ⚠️  Both --guest and --api-key provided; using --api-key.`);
+    }
+    // 1. Explicit --api-key flag
+    if (opts.apiKey) {
+        setApiKey(opts.apiKey);
+        console.log(`[${label}] ✓ API key saved\n`);
+        return { apiKey: opts.apiKey };
+    }
+    // 2. Existing key in config
+    const existingKey = getApiKey();
+    if (existingKey) {
+        if (isGuestKey()) {
+            console.log(`[${label}] ✓ Guest key found\n`);
+        }
+        else {
+            console.log(`[${label}] ✓ API key found\n`);
+        }
+        return { apiKey: existingKey };
+    }
+    // 3. --guest flag
+    if (opts.guest) {
+        return await doGuestFlow(label);
+    }
+    // 4. Interactive fallback
+    if (interactive) {
+        const choice = await promptKeyChoice();
+        if (choice === 'paid') {
+            const apiKey = await promptApiKey();
+            setApiKey(apiKey);
+            console.log(`[${label}] ✓ API key saved\n`);
+            return { apiKey };
+        }
+        else {
+            return await doGuestFlow(label);
+        }
+    }
+    // 5. Non-interactive with no key
+    console.error(`\n❌ No API key found. Provide --api-key <key> or --guest.`);
+    process.exit(1);
+}
+async function doGuestFlow(label) {
+    console.log(`\n[${label}] Requesting guest session...`);
+    try {
+        const resp = await requestGuestKey();
+        setGuestKey(resp.api_key);
+        console.log(`[${label}] ✓ Guest session started\n`);
+        const result = { apiKey: resp.api_key };
+        // Guest endpoint may return a project_id
+        if (resp.project_id) {
+            result.projectId = resp.project_id;
+        }
+        return result;
+    }
+    catch (error) {
+        console.error(`\n❌ Failed to get guest key: ${error.message}`);
+        process.exit(1);
+    }
+}
+/**
+ * Resolve project from flags, local config, or interactive prompts.
+ * Can create new projects when --project-name is given.
+ */
+export async function resolveProject(opts) {
+    const label = opts.commandLabel || 'Shift';
+    const interactive = opts.interactive ?? true;
+    const projectRoot = opts.projectRoot || process.cwd();
+    // 1. Check existing local config
+    const existingConfig = readProjectConfig(projectRoot);
+    if (existingConfig) {
+        console.log(`[${label}] ✓ Project: ${existingConfig.project_name} (${existingConfig.project_id})\n`);
+        return { projectId: existingConfig.project_id, projectName: existingConfig.project_name };
+    }
+    // 2. Explicit --project-id
+    if (opts.projectId) {
+        const name = opts.projectName || 'CLI Project';
+        setProject(opts.projectId, name, projectRoot);
+        console.log(`[${label}] ✓ Project "${name}" saved (${opts.projectId})\n`);
+        return { projectId: opts.projectId, projectName: name };
+    }
+    // 3. --project-name: try to match existing, else create new
+    if (opts.projectName) {
+        return await resolveByName(opts, projectRoot, label);
+    }
+    // 4. Interactive fallback
+    if (interactive) {
+        return await interactiveProjectSetup(opts.apiKey, opts.template, projectRoot, label);
+    }
+    // 5. Non-interactive with no project info
+    console.error(`\n❌ No project configured. Provide --project-id or --project-name.`);
+    process.exit(1);
+}
+async function resolveByName(opts, projectRoot, label) {
+    const { apiKey, projectName, template } = opts;
+    const interactive = opts.interactive ?? true;
+    // Try to match existing project by name
+    console.log(`[${label}] Looking for project "${projectName}"...`);
+    try {
+        const projects = await fetchProjects(apiKey);
+        const match = projects.find((p) => p.project_name.toLowerCase() === projectName.toLowerCase());
+        if (match) {
+            setProject(match.project_id, match.project_name, projectRoot);
+            console.log(`[${label}] ✓ Found existing project "${match.project_name}" (${match.project_id})\n`);
+            return { projectId: match.project_id, projectName: match.project_name };
+        }
+    }
+    catch {
+        // Can't fetch projects — proceed to create
+    }
+    // No match — create new project
+    console.log(`[${label}] No existing project named "${projectName}". Creating new project...`);
+    return await createNewProject(apiKey, projectName, template, interactive, projectRoot, label);
+}
+async function createNewProject(apiKey, name, templateFlag, interactive, projectRoot, label) {
+    let templateId = templateFlag;
+    if (!templateId) {
+        // Fetch templates and let user select
+        try {
+            const templates = await fetchMigrationTemplates(apiKey);
+            if (templates.length > 0) {
+                if (interactive) {
+                    templateId = await promptSelectTemplate(templates);
+                }
+                else {
+                    // Non-interactive: use first template
+                    templateId = templates[0].template_id;
+                    console.log(`[${label}] Using default template: ${templates[0].name}`);
+                }
+            }
+        }
+        catch {
+            console.log(`[${label}] ⚠️  Could not fetch templates, proceeding without one.`);
+        }
+    }
+    try {
+        const project = await createProject(apiKey, {
+            project_name: name,
+            migration_template_id: templateId,
+        });
+        setProject(project.project_id, project.project_name, projectRoot);
+        console.log(`[${label}] ✓ Created project "${project.project_name}" (${project.project_id})\n`);
+        return { projectId: project.project_id, projectName: project.project_name };
+    }
+    catch (error) {
+        console.error(`\n❌ Failed to create project: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function interactiveProjectSetup(apiKey, templateFlag, projectRoot, label) {
+    // Always ask user what they want to do first
+    const action = await promptCreateOrSelect();
+    if (action === 'select') {
+        let projects = [];
+        try {
+            projects = await fetchProjects(apiKey);
+        }
+        catch {
+            // fetch failed
+        }
+        if (projects.length > 0) {
+            const selected = await promptSelectProject(projects);
+            setProject(selected.project_id, selected.project_name, projectRoot);
+            console.log(`[${label}] ✓ Project "${selected.project_name}" saved\n`);
+            return { projectId: selected.project_id, projectName: selected.project_name };
+        }
+        console.log(`[${label}] No existing projects found. Let's create one.\n`);
+    }
+    // Create new project — suggest directory name as default
+    const defaultName = path.basename(projectRoot);
+    const name = await promptProjectName(defaultName);
+    return await createNewProject(apiKey, name, templateFlag, true, projectRoot, label);
+}

package/build/utils/prompts.js

@@ -67,3 +67,48 @@ export async function promptKeyChoice() {
         process.exit(1);
     }
 }
+export async function promptCreateOrSelect() {
+    console.log('\nProject setup:');
+    console.log('');
+    console.log('  1. Select an existing project');
+    console.log('  2. Create a new project');
+    console.log('');
+    const answer = await prompt('Select an option (1 or 2): ');
+    const selection = parseInt(answer, 10);
+    if (selection === 1) {
+        return 'select';
+    }
+    else if (selection === 2) {
+        return 'create';
+    }
+    else {
+        console.error('Invalid selection.');
+        process.exit(1);
+    }
+}
+export async function promptProjectName(defaultName) {
+    const hint = defaultName ? ` (${defaultName})` : '';
+    const name = await prompt(`Enter project name${hint}: `);
+    const result = name || defaultName || '';
+    if (!result) {
+        console.error('Error: Project name is required.');
+        process.exit(1);
+    }
+    return result;
+}
+export async function promptSelectTemplate(templates) {
+    console.log('\nAvailable migration templates:');
+    console.log('-----------------------------');
+    templates.forEach((tmpl, index) => {
+        const desc = tmpl.description ? ` - ${tmpl.description}` : '';
+        console.log(`  ${index + 1}. ${tmpl.name}${desc}`);
+    });
+    console.log('');
+    const answer = await prompt(`Select a template (1-${templates.length}): `);
+    const selection = parseInt(answer, 10);
+    if (isNaN(selection) || selection < 1 || selection > templates.length) {
+        console.error('Invalid selection.');
+        process.exit(1);
+    }
+    return templates[selection - 1].template_id;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@latentforce/shift",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "Shift CLI - AI-powered code intelligence with MCP support",
     "type": "module",
     "main": "./build/index.js",