@rigstate/cli 0.7.34 → 0.7.36

package/src/utils/config.ts

@@ -1,6 +1,8 @@
 import Conf from 'conf';
 import axios from 'axios';
 import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
 
 interface RigstateConfig {
     apiKey?: string;
@@ -20,6 +22,29 @@ const config = new Conf<RigstateConfig>({
  * @throws {Error} If no API key is found (user not logged in)
  */
 export function getApiKey(): string {
+    // 1. Check local manifest first (Folder Affinity)
+    try {
+        const cwd = process.cwd();
+        const manifestPaths = [
+            path.join(cwd, '.rigstate', 'identity.json'),
+            path.join(cwd, '.rigstate')
+        ];
+
+        for (const manifestPath of manifestPaths) {
+            if (fs.existsSync(manifestPath) && fs.statSync(manifestPath).isFile()) {
+                const content = fs.readFileSync(manifestPath, 'utf-8');
+                const manifest = JSON.parse(content);
+                if (manifest.api_key) return manifest.api_key;
+            }
+        }
+    } catch (e) { /* Fallback */ }
+
+    // 2. Check environment variable
+    if (process.env.RIGSTATE_API_KEY) {
+        return process.env.RIGSTATE_API_KEY;
+    }
+
+    // 3. Fall back to global config
     const apiKey = config.get('apiKey');
     if (!apiKey) {
         throw new Error(
@@ -40,7 +65,40 @@ export function setApiKey(key: string): void {
  * Get the default project ID (if set)
  */
 export function getProjectId(): string | undefined {
-    return config.get('projectId');
+    // 1. Check local manifest first (Folder Affinity)
+    try {
+        const cwd = process.cwd();
+        const manifestPaths = [
+            path.join(cwd, '.rigstate', 'identity.json'),
+            path.join(cwd, '.rigstate')
+        ];
+
+        for (const manifestPath of manifestPaths) {
+            if (fs.existsSync(manifestPath) && fs.statSync(manifestPath).isFile()) {
+                const content = fs.readFileSync(manifestPath, 'utf-8');
+                const manifest = JSON.parse(content);
+                if (manifest.project_id) {
+                    console.log(chalk.dim(`   [Auth] Context: Project ID ${manifest.project_id.substring(0, 8)}... (from ${path.basename(manifestPath)})`));
+                    return manifest.project_id;
+                }
+            }
+        }
+    } catch (e: any) {
+        console.log(chalk.red(`   [Error] Failed to read context: ${e.message}`));
+    }
+
+    // 2. Check environment variable
+    if (process.env.RIGSTATE_PROJECT_ID) {
+        console.log(chalk.dim(`   [Auth] Context: Project ID ${process.env.RIGSTATE_PROJECT_ID.substring(0, 8)}... (from ENV)`));
+        return process.env.RIGSTATE_PROJECT_ID;
+    }
+
+    // 3. Fall back to global config
+    const globalId = config.get('projectId');
+    if (globalId) {
+        console.log(chalk.dim(`   [Auth] Context: Project ID ${globalId.substring(0, 8)}... (from GLOBAL CONFIG)`));
+    }
+    return globalId;
 }
 
 /**
@@ -55,16 +113,33 @@ export function setProjectId(projectId: string): void {
  * Priority: Environment variable > Stored config > Production default
  */
 export function getApiUrl(): string {
-    // 1. Check environment variable first
+    // 1. Check local manifest first
+    try {
+        const cwd = process.cwd();
+        const manifestPaths = [
+            path.join(cwd, '.rigstate', 'identity.json'),
+            path.join(cwd, '.rigstate')
+        ];
+
+        for (const manifestPath of manifestPaths) {
+            if (fs.existsSync(manifestPath) && fs.statSync(manifestPath).isFile()) {
+                const content = fs.readFileSync(manifestPath, 'utf-8');
+                const manifest = JSON.parse(content);
+                if (manifest.api_url) return manifest.api_url;
+            }
+        }
+    } catch (e) { /* Fallback */ }
+
+    // 2. Check environment variable next
     if (process.env.RIGSTATE_API_URL) {
         return process.env.RIGSTATE_API_URL;
     }
-    // 2. Check stored config
+    // 3. Check stored config
     const storedUrl = config.get('apiUrl');
     if (storedUrl) {
         return storedUrl;
     }
-    // 3. Default to production
+    // 4. Default to production
     return 'https://app.rigstate.com';
 }
 

package/src/utils/manifest.ts

@@ -1,18 +1,75 @@
 import fs from 'fs/promises';
+import fsSync from 'fs';
 import path from 'path';
 
 export interface RigstateManifest {
     project_id: string;
     api_url?: string;
     linked_at?: string;
+    api_key?: string;
+    // Genesis Protocol status (cached locally to avoid API calls)
+    genesis_complete?: boolean;
+    genesis_template?: string;
+    genesis_stack_key?: string;
+    genesis_initialized_at?: string;
 }
 
+
 export async function loadManifest(): Promise<RigstateManifest | null> {
+    const cwd = process.cwd();
+    const manifestPaths = [
+        path.join(cwd, '.rigstate', 'identity.json'),
+        path.join(cwd, '.rigstate')
+    ];
+
+    for (const p of manifestPaths) {
+        try {
+            if (fsSync.existsSync(p) && fsSync.statSync(p).isFile()) {
+                const content = await fs.readFile(p, 'utf-8');
+                const data = JSON.parse(content);
+
+                // Handle both flat manifest and identity.json schema
+                return {
+                    project_id: data.project?.id || data.project_id,
+                    api_url: data.api_url,
+                    linked_at: data.linked_at || data.project?.created_at,
+                    api_key: data.api_key
+                };
+            }
+        } catch (e) {
+            continue;
+        }
+    }
+    return null;
+}
+
+/**
+ * Saves project context to the local manifest.
+ * Prioritizes .rigstate/identity.json if the directory exists.
+ */
+export async function saveManifest(data: Partial<RigstateManifest>): Promise<string> {
+    const cwd = process.cwd();
+    const rigstatePath = path.join(cwd, '.rigstate');
+    let targetFile = rigstatePath;
+
     try {
-        const manifestPath = path.join(process.cwd(), '.rigstate');
-        const content = await fs.readFile(manifestPath, 'utf-8');
-        return JSON.parse(content);
-    } catch {
-        return null;
+        const stats = await fs.stat(rigstatePath);
+        if (stats.isDirectory()) {
+            targetFile = path.join(rigstatePath, 'identity.json');
+        }
+    } catch (e) {
+        // Doesn't exist, will be created as file/dir below
     }
+
+    // Load existing to merge
+    const existing = await loadManifest() || {} as RigstateManifest;
+    const merged = { ...existing, ...data };
+
+    // If we need to create a directory for identity.json
+    if (targetFile.endsWith('identity.json')) {
+        await fs.mkdir(rigstatePath, { recursive: true });
+    }
+
+    await fs.writeFile(targetFile, JSON.stringify(merged, null, 2), 'utf-8');
+    return targetFile;
 }