gencode-ai 0.2.0 → 0.3.0

package/src/config/merger.test.ts

@@ -92,14 +92,14 @@ describe('mergeSettings', () => {
       },
       {
         level: 'user',
-        path: '~/.gencode/settings.json',
-        namespace: 'gencode',
+        path: '~/.gen/settings.json',
+        namespace: 'gen',
         settings: { provider: 'anthropic' }, // Override provider
       },
       {
         level: 'project',
-        path: '.gencode/settings.json',
-        namespace: 'gencode',
+        path: '.gen/settings.json',
+        namespace: 'gen',
         settings: { model: 'claude-sonnet' }, // Override model
       },
     ];
@@ -122,8 +122,8 @@ describe('mergeSettings', () => {
       },
       {
         level: 'project',
-        path: '.gencode/settings.json',
-        namespace: 'gencode',
+        path: '.gen/settings.json',
+        namespace: 'gen',
         settings: {
           permissions: { allow: ['Bash(npm:*)'], deny: ['WebFetch'] },
         },
@@ -148,8 +148,8 @@ describe('extractManagedDeny', () => {
     const sources: ConfigSource[] = [
       {
         level: 'user',
-        path: '~/.gencode/settings.json',
-        namespace: 'gencode',
+        path: '~/.gen/settings.json',
+        namespace: 'gen',
         settings: {
           permissions: { deny: ['WebFetch'] },
         },
@@ -157,7 +157,7 @@ describe('extractManagedDeny', () => {
       {
         level: 'managed',
         path: '/etc/gencode/managed-settings.json',
-        namespace: 'gencode',
+        namespace: 'gen',
         settings: {
           permissions: { deny: ['Bash(curl:*)'] },
         },
@@ -184,7 +184,7 @@ describe('extractManagedDeny', () => {
       {
         level: 'managed',
         path: '/Library/.../GenCode/managed-settings.json',
-        namespace: 'gencode',
+        namespace: 'gen',
         settings: {
           permissions: { deny: ['Bash(curl:*)', 'WebFetch'] },
         },
@@ -200,8 +200,8 @@ describe('extractManagedDeny', () => {
     const sources: ConfigSource[] = [
       {
         level: 'user',
-        path: '~/.gencode/settings.json',
-        namespace: 'gencode',
+        path: '~/.gen/settings.json',
+        namespace: 'gen',
         settings: {
           permissions: { deny: ['WebFetch'] },
         },
@@ -262,14 +262,14 @@ describe('mergeAllSources', () => {
     const sources: ConfigSource[] = [
       {
         level: 'user',
-        path: '~/.gencode/settings.json',
-        namespace: 'gencode',
+        path: '~/.gen/settings.json',
+        namespace: 'gen',
         settings: { provider: 'anthropic' },
       },
       {
         level: 'managed',
         path: '/etc/gencode/managed-settings.json',
-        namespace: 'gencode',
+        namespace: 'gen',
         settings: {
           permissions: { deny: ['Bash(curl:*)'] },
         },
@@ -289,8 +289,8 @@ describe('mergeWithCliArgs', () => {
     const sources: ConfigSource[] = [
       {
         level: 'user',
-        path: '~/.gencode/settings.json',
-        namespace: 'gencode',
+        path: '~/.gen/settings.json',
+        namespace: 'gen',
         settings: { provider: 'openai', model: 'gpt-4' },
       },
     ];
@@ -309,7 +309,7 @@ describe('mergeWithCliArgs', () => {
       {
         level: 'managed',
         path: '/etc/gencode/managed-settings.json',
-        namespace: 'gencode',
+        namespace: 'gen',
         settings: {
           permissions: { deny: ['Bash(curl:*)'] },
         },
@@ -333,14 +333,14 @@ describe('createMergeSummary', () => {
     const sources: ConfigSource[] = [
       {
         level: 'user',
-        path: '~/.gencode/settings.json',
-        namespace: 'gencode',
+        path: '~/.gen/settings.json',
+        namespace: 'gen',
         settings: { provider: 'anthropic' },
       },
       {
         level: 'managed',
         path: '/etc/gencode/managed-settings.json',
-        namespace: 'gencode',
+        namespace: 'gen',
         settings: {
           permissions: { deny: ['Bash(curl:*)'] },
         },
@@ -351,8 +351,8 @@ describe('createMergeSummary', () => {
     const summary = createMergeSummary(merged);
 
     expect(summary).toContain('Configuration Sources');
-    expect(summary).toContain('user:gencode');
-    expect(summary).toContain('managed:gencode');
+    expect(summary).toContain('user:gen');
+    expect(summary).toContain('managed:gen');
     expect(summary).toContain('[enforced]');
     expect(summary).toContain('Managed Deny Rules');
     expect(summary).toContain('Bash(curl:*)');

package/src/config/merger.ts

@@ -191,7 +191,7 @@ export function mergeWithCliArgs(
       {
         level: 'cli',
         path: '<cli>',
-        namespace: 'gencode',
+        namespace: 'gen',
         settings: cliArgs,
       },
     ],

package/src/config/providers-config.ts

@@ -5,8 +5,9 @@
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as os from 'os';
-import type { ProvidersConfig, ProviderName } from './types.js';
+import type { ProvidersConfig, Provider, AuthMethod } from './types.js';
 import { DEFAULT_SETTINGS_DIR, PROVIDERS_FILE_NAME } from './types.js';
+import { parseModelCacheKey } from '../providers/store.js';
 
 export class ProvidersConfigManager {
   private settingsDir: string;
@@ -42,30 +43,23 @@ export class ProvidersConfigManager {
   }
 
   /**
-   * Infer provider from model ID using cached models in providers.json
-   * Returns undefined if model not found in any provider's cached list
+   * Infer provider and auth method from model ID using cached models
+   * Returns { provider, authMethod } if found, undefined if not in cache
    */
-  inferProvider(modelId: string): ProviderName | undefined {
+  inferProviderFromCache(
+    modelId: string
+  ): { provider: Provider; authMethod: AuthMethod } | undefined {
     if (!this.config?.models) {
       return undefined;
     }
 
-    for (const [providerKey, providerModels] of Object.entries(this.config.models)) {
+    for (const [key, providerModels] of Object.entries(this.config.models)) {
       const found = providerModels.list?.some((m) => m.id === modelId);
       if (found) {
-        // Map provider key to ProviderName
-        // Note: 'anthropic' in providers.json might use vertex connection
-        if (providerKey === 'gemini') {
-          return 'gemini';
-        } else if (providerKey === 'anthropic') {
-          // Check connection method to determine if vertex or direct
-          const connection = this.config.connections?.[providerKey];
-          if (connection?.method === 'vertex') {
-            return 'vertex-ai';
-          }
-          return 'anthropic';
-        } else if (providerKey === 'openai') {
-          return 'openai';
+        // Parse key to get provider and authMethod
+        const parsed = parseModelCacheKey(key);
+        if (parsed) {
+          return parsed;
         }
       }
     }
@@ -74,12 +68,20 @@ export class ProvidersConfigManager {
   }
 
   /**
-   * Get all model IDs for a provider
+   * Get all model IDs for a provider (across all authMethods)
    */
   getModelIds(provider: string): string[] {
-    if (!this.config?.models?.[provider]) {
+    if (!this.config?.models) {
       return [];
     }
-    return this.config.models[provider].list?.map((m) => m.id) ?? [];
+
+    const modelIds: string[] = [];
+    for (const [key, cache] of Object.entries(this.config.models)) {
+      const parsed = parseModelCacheKey(key);
+      if (parsed && parsed.provider === provider) {
+        modelIds.push(...(cache.list?.map((m) => m.id) ?? []));
+      }
+    }
+    return modelIds;
   }
 }

package/src/config/test-utils.ts

@@ -27,7 +27,7 @@ export async function createTestProject(prefix = 'gencode-test-'): Promise<TestP
     projectDir,
     cleanup: async () => {
       await fs.rm(tempDir, { recursive: true, force: true });
-      delete process.env.GENCODE_CONFIG_DIRS;
+      delete process.env.GEN_CONFIG;
     },
   };
 }
@@ -37,11 +37,11 @@ export async function createTestProject(prefix = 'gencode-test-'): Promise<TestP
  */
 export async function writeSettings(
   projectDir: string,
-  namespace: 'claude' | 'gencode',
+  namespace: 'claude' | 'gen',
   settings: Record<string, unknown>,
   local = false
 ): Promise<string> {
-  const dir = path.join(projectDir, namespace === 'claude' ? '.claude' : '.gencode');
+  const dir = path.join(projectDir, namespace === 'claude' ? '.claude' : '.gen');
   await fs.mkdir(dir, { recursive: true });
 
   const filename = local ? 'settings.local.json' : 'settings.json';
@@ -56,18 +56,18 @@ export async function writeSettings(
  */
 export async function writeMemory(
   projectDir: string,
-  namespace: 'claude' | 'gencode',
+  namespace: 'claude' | 'gen',
   content: string,
   options: { local?: boolean; inDir?: boolean } = {}
 ): Promise<string> {
   const { local = false, inDir = true } = options;
   const filename = namespace === 'claude'
     ? (local ? 'CLAUDE.local.md' : 'CLAUDE.md')
-    : (local ? 'AGENT.local.md' : 'AGENT.md');
+    : (local ? 'GEN.local.md' : 'GEN.md');
 
   let filePath: string;
   if (inDir) {
-    const dir = path.join(projectDir, namespace === 'claude' ? '.claude' : '.gencode');
+    const dir = path.join(projectDir, namespace === 'claude' ? '.claude' : '.gen');
     await fs.mkdir(dir, { recursive: true });
     filePath = path.join(dir, filename);
   } else {

package/src/config/types.ts

@@ -2,10 +2,10 @@
  * Configuration Types - Multi-level configuration system (Claude Code compatible)
  *
  * Configuration hierarchy (priority from low to high):
- * 1. User Level: ~/.gencode/ + ~/.claude/ (merged, gencode wins)
- * 2. Extra Dirs: GENCODE_CONFIG_DIRS environment variable
- * 3. Project Level: .gencode/ + .claude/ (merged, gencode wins)
- * 4. Local Level: .gencode/*.local.* + .claude/*.local.* (merged, gencode wins)
+ * 1. User Level: ~/.gen/ + ~/.claude/ (merged, gen wins)
+ * 2. Extra Dirs: GEN_CONFIG environment variable
+ * 3. Project Level: .gen/ + .claude/ (merged, gen wins)
+ * 4. Local Level: .gen/*.local.* + .claude/*.local.* (merged, gen wins)
  * 5. CLI Arguments: Command line overrides
  * 6. Managed Level: System-wide enforced settings (cannot be overridden)
  */
@@ -17,7 +17,12 @@ import * as path from 'path';
 // Provider Types
 // =============================================================================
 
-export type ProviderName = 'openai' | 'anthropic' | 'gemini' | 'vertex-ai';
+export type Provider = 'openai' | 'anthropic' | 'gemini';
+export type AuthMethod = 'api_key' | 'vertex' | 'bedrock' | 'azure' | 'oauth';
+
+// Legacy type alias for backward compatibility
+/** @deprecated Use Provider instead */
+export type ProviderName = Provider;
 
 // =============================================================================
 // Settings Types
@@ -39,7 +44,7 @@ export interface PermissionRules {
 export interface Settings {
   // Provider configuration
   model?: string;
-  provider?: ProviderName;
+  provider?: Provider;
 
   // Permissions
   permissions?: PermissionRules;
@@ -62,6 +67,9 @@ export interface Settings {
   enabledPlugins?: Record<string, boolean>;
   extraKnownMarketplaces?: Record<string, unknown>;
 
+  // Memory configuration
+  memoryMergeStrategy?: 'fallback' | 'both' | 'gen-only' | 'claude-only';
+
   // Managed-only fields (cannot be overridden by lower levels)
   strictKnownMarketplaces?: unknown[];
 
@@ -94,7 +102,7 @@ export interface ConfigLevel {
 export interface ConfigSource {
   level: ConfigLevelType;
   path: string;
-  namespace: 'gencode' | 'claude' | 'extra';
+  namespace: 'gen' | 'claude' | 'extra';
   settings: Settings;
 }
 
@@ -111,7 +119,7 @@ export interface MergedConfig {
 // Constants
 // =============================================================================
 
-export const GENCODE_CONFIG_DIRS_ENV = 'GENCODE_CONFIG_DIRS';
+export const GEN_CONFIG_ENV = 'GEN_CONFIG';
 
 // File names
 export const SETTINGS_FILE_NAME = 'settings.json';
@@ -120,31 +128,31 @@ export const MANAGED_SETTINGS_FILE_NAME = 'managed-settings.json';
 export const PROVIDERS_FILE_NAME = 'providers.json';
 
 // Directory names
-export const GENCODE_DIR = '.gencode';
+export const GEN_DIR = '.gen';
 export const CLAUDE_DIR = '.claude';
 
 // User directory paths
-export const USER_GENCODE_DIR = path.join(os.homedir(), GENCODE_DIR);
+export const USER_GEN_DIR = path.join(os.homedir(), GEN_DIR);
 export const USER_CLAUDE_DIR = path.join(os.homedir(), CLAUDE_DIR);
 
 // Managed settings locations by platform
-export function getManagedPaths(): { gencode: string; claude: string } {
+export function getManagedPaths(): { gen: string; claude: string } {
   const platform = os.platform();
 
   if (platform === 'darwin') {
     return {
-      gencode: '/Library/Application Support/GenCode',
+      gen: '/Library/Application Support/GenCode',
       claude: '/Library/Application Support/ClaudeCode',
     };
   } else if (platform === 'win32') {
     return {
-      gencode: 'C:\\Program Files\\GenCode',
+      gen: 'C:\\Program Files\\GenCode',
       claude: 'C:\\Program Files\\ClaudeCode',
     };
   } else {
     // Linux and other Unix-like systems
     return {
-      gencode: '/etc/gencode',
+      gen: '/etc/gencode',
       claude: '/etc/claude-code',
     };
   }
@@ -159,10 +167,10 @@ export interface SettingsManagerOptions {
 }
 
 // Legacy exports
-export const DEFAULT_SETTINGS_DIR = '~/.claude';
-export const PROJECT_SETTINGS_DIR = '.claude';
-export const FALLBACK_SETTINGS_DIR = '~/.gencode';
-export const FALLBACK_PROJECT_DIR = '.gencode';
+export const DEFAULT_SETTINGS_DIR = '~/.gen';
+export const PROJECT_SETTINGS_DIR = '.gen';
+export const FALLBACK_SETTINGS_DIR = '~/.claude';
+export const FALLBACK_PROJECT_DIR = '.claude';
 
 // =============================================================================
 // Provider Connection Types
@@ -172,7 +180,8 @@ export const FALLBACK_PROJECT_DIR = '.gencode';
  * Provider connection info
  */
 export interface ProviderConnection {
-  method: 'api_key' | 'vertex' | 'oauth';
+  authMethod: AuthMethod; // Authentication method
+  method?: string; // Legacy: Connection name (e.g., "Direct API", "Google Vertex AI")
   connectedAt: string;
 }
 
@@ -187,6 +196,7 @@ export interface CachedModel {
 
 /**
  * Cached models for a provider
+ * Note: provider and authMethod are encoded in the key as "provider:authMethod"
  */
 export interface ProviderModels {
   cachedAt: string;
@@ -194,7 +204,7 @@ export interface ProviderModels {
 }
 
 /**
- * Providers config file structure (~/.gencode/providers.json)
+ * Providers config file structure (~/.gen/providers.json)
  */
 export interface ProvidersConfig {
   connections: Record<string, ProviderConnection>;