@codemieai/code 0.14.1 → 0.15.1

package/dist/providers/plugins/sso/sso.setup-steps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sso.setup-steps.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EACV,kBAAkB,EAMnB,MAAM,qBAAqB,CAAC;AAc7B;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,kBA2S3B,CAAC"}
+{"version":3,"file":"sso.setup-steps.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EACV,kBAAkB,EAInB,MAAM,qBAAqB,CAAC;AAc7B;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,kBAyR3B,CAAC"}

package/dist/providers/plugins/sso/sso.setup-steps.js

@@ -25,50 +25,33 @@ export const SSOSetupSteps = {
     /**
      * Step 1: Gather credentials/configuration
      *
-     * Prompts for CodeMie URL and performs browser-based authentication.
-     *
-     * When the setup wizard already completed a CodeMie handshake (its
-     * mandatory-integration gate authenticates before provider selection), that
-     * session is reused so the user is not prompted for the portal URL and sent
-     * through the browser a second time in one `codemie setup` run.
+     * Prompts for CodeMie URL and performs browser-based authentication
      */
-    async getCredentials(_isUpdate = false, context) {
-        const session = context?.codeMieSession;
-        let codeMieUrl;
-        let authResult;
+    async getCredentials() {
+        const codeMieUrl = await promptForCodeMieUrl(DEFAULT_CODEMIE_BASE_URL);
+        // Authenticate via browser
+        console.log(chalk.cyan('\n🔐 Authenticating via browser...\n'));
+        const authResult = await authenticateWithCodeMie(codeMieUrl, 120000);
+        if (!authResult.success) {
+            throw new Error(`SSO authentication failed: ${authResult.error || 'Unknown error'}`);
+        }
+        console.log(chalk.green('✓ Authentication successful!\n'));
+        // === NEW STEP: Fetch applications and select project ===
         let selectedProject;
         let selectedUserEmail;
-        if (session) {
-            codeMieUrl = session.codeMieUrl;
-            authResult = session.authResult;
-            selectedProject = session.project;
-            selectedUserEmail = session.userEmail;
-            console.log(chalk.green(`✓ Using existing authenticated session for ${codeMieUrl}`));
-            console.log(chalk.dim(`  Project: ${selectedProject}\n`));
-        }
-        else {
-            codeMieUrl = await promptForCodeMieUrl(DEFAULT_CODEMIE_BASE_URL);
-            // Authenticate via browser
-            console.log(chalk.cyan('\n🔐 Authenticating via browser...\n'));
-            authResult = await authenticateWithCodeMie(codeMieUrl, 120000);
-            if (!authResult.success) {
-                throw new Error(`SSO authentication failed: ${authResult.error || 'Unknown error'}`);
-            }
-            console.log(chalk.green('✓ Authentication successful!\n'));
-            // === NEW STEP: Fetch applications and select project ===
-            try {
-                console.log(chalk.cyan('📂 Fetching available projects...\n'));
-                ({ project: selectedProject, userEmail: selectedUserEmail } = await selectCodeMieProject(authResult));
-            }
-            catch (error) {
-                const errorMsg = error instanceof Error ? error.message : String(error);
-                console.log(chalk.red(`✗ Project selection failed: ${errorMsg}\n`));
-                // Fail fast - project selection is required
-                throw new Error(`Project selection required: ${errorMsg}`);
+        try {
+            console.log(chalk.cyan('📂 Fetching available projects...\n'));
+            // Ensure API URL and cookies are available
+            if (!authResult.apiUrl || !authResult.cookies) {
+                throw new Error('API URL or cookies not found in authentication result');
             }
+            ({ project: selectedProject, userEmail: selectedUserEmail } = await selectCodeMieProject(authResult));
         }
-        if (!authResult.apiUrl || !authResult.cookies) {
-            throw new Error('API URL or cookies not found in authentication result');
+        catch (error) {
+            const errorMsg = error instanceof Error ? error.message : String(error);
+            console.log(chalk.red(`✗ Project selection failed: ${errorMsg}\n`));
+            // Fail fast - project selection is required
+            throw new Error(`Project selection required: ${errorMsg}`);
         }
         // Check for LiteLLM integrations
         let integrations;

package/dist/providers/plugins/sso/sso.setup-steps.js.map

@@ -1 +1 @@
-{"version":3,"file":"sso.setup-steps.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sso.setup-steps.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"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"}

package/dist/utils/config.d.ts

@@ -1,4 +1,4 @@
-import { CodeMieConfigOptions, ProviderProfile, MultiProviderConfig, CodeMieIntegrationInfo, ConfigWithSource, ConfigWithSources, CodemieAssistant, CodemieSkill, StorageScope } from '../env/types.js';
+import { CodeMieConfigOptions, ProviderProfile, MultiProviderConfig, WorkspaceConfig, CodeMieIntegrationInfo, ConfigWithSource, ConfigWithSources, CodemieAssistant, CodemieSkill, StorageScope } from '../env/types.js';
 export type { CodeMieConfigOptions, CodeMieIntegrationInfo, ConfigWithSource, ConfigWithSources };
 export { StorageScope };
 /**
@@ -26,6 +26,13 @@ export declare class ConfigLoader {
      * CLI args > Env vars > Project config > Global config > Defaults
      */
     static load(workingDir?: string, cliOverrides?: Partial<CodeMieConfigOptions>): Promise<CodeMieConfigOptions>;
+    /**
+     * Resolve the workspace-level (repo/tooling-context) configuration for a working
+     * directory, by whole-object override: the local scope's `workspace` if it is
+     * defined, else the global scope's, else `{}`. Never mixes fields between scopes —
+     * this is what lets switching the active profile keep workspace context intact.
+     */
+    static resolveWorkspace(workingDir: string): Promise<WorkspaceConfig>;
     /**
      * Load full configuration including analytics
      * Returns the complete multi-provider config with analytics settings
@@ -62,32 +69,6 @@ export declare class ConfigLoader {
      * 4. The selected global profile name (backward compatibility for single-profile local configs).
      */
     private static resolveLocalProfileName;
-    /**
-     * Fields that belong to the repository/project context rather than to the provider
-     * identity. When a user explicitly selects a different global provider profile via
-     * --profile, these fields should still be supplied by the team's local profile so the
-     * repository context is not lost.
-     */
-    private static readonly PROJECT_FIELDS;
-    /**
-     * Returns true when the local team profile's project context (codeMieProject,
-     * codeMieIntegration, codeMieUrl) is safe to compose with the selected global
-     * profile. The composition is only safe when both profiles target the same
-     * CodeMie environment — otherwise the local project/integration IDs reference
-     * the wrong env's database rows and the URL is outright wrong.
-     *
-     * The gate is conservative: it only blocks composition when both URLs are
-     * explicitly set and normalized-differ. A missing URL on either side is
-     * treated as "no signal of conflict" and composition proceeds. This matches
-     * the common case where a local profile sets only `codeMieProject` and relies
-     * on the global profile for the URL.
-     */
-    private static shouldPreserveProjectContext;
-    /**
-     * Keep only project-level fields from a local profile. Used when the selected global
-     * profile differs from the team's local default profile.
-     */
-    private static filterProjectFields;
     /**
      * Load configuration with validation (throws if required fields missing)
      */
@@ -120,6 +101,18 @@ export declare class ConfigLoader {
      */
     static saveMultiProviderConfig(config: MultiProviderConfig): Promise<void>;
     static saveUserEmail(email: string): Promise<void>;
+    /**
+     * Keys that belong to WorkspaceConfig (repo/tooling-context) rather than to a
+     * ProviderProfile. Used to split a saved profile's input into its profile half
+     * and its workspace half — see splitProfileAndWorkspace().
+     */
+    private static readonly WORKSPACE_KEYS;
+    /**
+     * Partition a profile-shaped input into its provider-identity half and its
+     * workspace half, so callers that persist a profile can route each half to
+     * where it belongs (profiles[name] vs. the scope's workspace).
+     */
+    private static splitProfileAndWorkspace;
     /**
      * Add or update a profile
      */

package/dist/utils/config.d.ts.map

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

package/dist/utils/config.js

@@ -85,27 +85,21 @@ export class ConfigLoader {
         // 4. Global config (~/.codemie/codemie-cli.config.json)
         const globalConfig = await this.loadGlobalConfigProfile(selectedProfileName);
         Object.assign(config, this.removeUndefined(globalConfig));
-        // 3. Project-local config (.codemie/codemie-cli.config.json)
+        // 3. Project-local config (.codemie/codemie-cli.config.json) — provider identity
+        // (name/model/baseUrl/apiKey/etc.). Repo/tooling-context fields no longer live on
+        // the profile; they resolve independently below via resolveWorkspace().
         const localConfig = await this.loadLocalConfigProfile(workingDir, localProfileName);
-        // When the selected global profile differs from the team's local profile, keep only
-        // project-level local fields. The selection may come from --profile or activeProfile;
-        // either way, the local team fallback must not replace provider, model, or credentials.
+        // When the selected global profile differs from the team's local profile, the local
+        // team profile must not replace provider, model, or credentials — apply none of it.
         const applyProjectOnly = Boolean(selectedProfileName && localProfileName && selectedProfileName !== localProfileName);
-        // When applying project-only composition, gate it on URL equality. If the
-        // selected global profile targets a different CodeMie env than the local
-        // team profile, the team's project/integration/URL all reference the wrong
-        // env's records — drop the project-context bundle and let the global
-        // profile supply everything.
-        const selectedProfileDefinesProjectContext = Boolean(globalConfig.codeMieProject || globalConfig.codeMieIntegration);
-        const preserveProjectContext = applyProjectOnly &&
-            !selectedProfileDefinesProjectContext &&
-            this.shouldPreserveProjectContext(localConfig.codeMieUrl, globalConfig.codeMieUrl);
-        const effectiveLocalConfig = preserveProjectContext
-            ? this.filterProjectFields(localConfig)
-            : applyProjectOnly
-                ? {}
-                : localConfig;
+        const effectiveLocalConfig = applyProjectOnly ? {} : localConfig;
         Object.assign(config, this.removeUndefined(effectiveLocalConfig));
+        // Workspace (repo/tooling-context) fields resolve by whole-object override — the
+        // local scope's workspace if defined, else the global scope's — independent of
+        // which profile is active, so switching the active profile never drops workspace
+        // context.
+        const workspace = await this.resolveWorkspace(workingDir);
+        Object.assign(config, this.removeUndefined(workspace));
         // 2. Environment variables (load .env first if in project)
         const envPath = path.join(workingDir, '.env');
         try {
@@ -166,6 +160,24 @@ export class ConfigLoader {
         }
         return config;
     }
+    /**
+     * Resolve the workspace-level (repo/tooling-context) configuration for a working
+     * directory, by whole-object override: the local scope's `workspace` if it is
+     * defined, else the global scope's, else `{}`. Never mixes fields between scopes —
+     * this is what lets switching the active profile keep workspace context intact.
+     */
+    static async resolveWorkspace(workingDir) {
+        // `!= null` (loose) deliberately also excludes an explicit `"workspace": null` —
+        // e.g. from a hand-edited or externally-written config file — which is not a
+        // valid WorkspaceConfig object and must fall back to the next scope rather than
+        // being treated as "defined" and passed downstream to Object.entries().
+        const localMultiConfig = await this.loadLocalMultiProviderConfig(workingDir);
+        if (localMultiConfig.workspace != null) {
+            return localMultiConfig.workspace;
+        }
+        const globalMultiConfig = await this.loadMultiProviderConfig();
+        return globalMultiConfig.workspace ?? {};
+    }
     /**
      * Load full configuration including analytics
      * Returns the complete multi-provider config with analytics settings
@@ -299,49 +311,6 @@ export class ConfigLoader {
         // Fallback: keep the original 2-level lookup behavior.
         return selectedProfileName;
     }
-    /**
-     * Fields that belong to the repository/project context rather than to the provider
-     * identity. When a user explicitly selects a different global provider profile via
-     * --profile, these fields should still be supplied by the team's local profile so the
-     * repository context is not lost.
-     */
-    static PROJECT_FIELDS = [
-        'codeMieProject',
-        'codeMieIntegration',
-        'codeMieUrl'
-    ];
-    /**
-     * Returns true when the local team profile's project context (codeMieProject,
-     * codeMieIntegration, codeMieUrl) is safe to compose with the selected global
-     * profile. The composition is only safe when both profiles target the same
-     * CodeMie environment — otherwise the local project/integration IDs reference
-     * the wrong env's database rows and the URL is outright wrong.
-     *
-     * The gate is conservative: it only blocks composition when both URLs are
-     * explicitly set and normalized-differ. A missing URL on either side is
-     * treated as "no signal of conflict" and composition proceeds. This matches
-     * the common case where a local profile sets only `codeMieProject` and relies
-     * on the global profile for the URL.
-     */
-    static shouldPreserveProjectContext(localUrl, globalUrl) {
-        if (!localUrl || !globalUrl)
-            return true;
-        const normalize = (u) => u.replace(/\/+$/, '').toLowerCase();
-        return normalize(localUrl) === normalize(globalUrl);
-    }
-    /**
-     * Keep only project-level fields from a local profile. Used when the selected global
-     * profile differs from the team's local default profile.
-     */
-    static filterProjectFields(config) {
-        const result = {};
-        for (const field of this.PROJECT_FIELDS) {
-            if (config[field] !== undefined) {
-                result[field] = config[field];
-            }
-        }
-        return result;
-    }
     /**
      * Load configuration with validation (throws if required fields missing)
      */
@@ -479,6 +448,38 @@ export class ConfigLoader {
         config.userEmail = email;
         await this.saveMultiProviderConfig(config);
     }
+    /**
+     * Keys that belong to WorkspaceConfig (repo/tooling-context) rather than to a
+     * ProviderProfile. Used to split a saved profile's input into its profile half
+     * and its workspace half — see splitProfileAndWorkspace().
+     */
+    static WORKSPACE_KEYS = [
+        'codeMieUrl',
+        'codeMieProject',
+        'codeMieIntegration',
+        'hooks',
+        'plugins',
+        'assistants',
+        'skillsSearchUrl',
+        'claudeAutocompactPct',
+        'metrics'
+    ];
+    /**
+     * Partition a profile-shaped input into its provider-identity half and its
+     * workspace half, so callers that persist a profile can route each half to
+     * where it belongs (profiles[name] vs. the scope's workspace).
+     */
+    static splitProfileAndWorkspace(input) {
+        const profile = { ...input };
+        const workspace = {};
+        for (const key of this.WORKSPACE_KEYS) {
+            if (input[key] !== undefined) {
+                workspace[key] = input[key];
+                delete profile[key];
+            }
+        }
+        return { profile, workspace };
+    }
     /**
      * Add or update a profile
      */
@@ -486,8 +487,12 @@ export class ConfigLoader {
         const config = await this.loadMultiProviderConfig();
         // Strip top-level-only fields that must not live inside a profile
         const { codemieSkills: _skills, codemieAssistants: _assistants, ...cleanProfile } = profile;
-        cleanProfile.name = profileName;
-        config.profiles[profileName] = cleanProfile;
+        const { profile: profileFields, workspace: workspaceFields } = this.splitProfileAndWorkspace(cleanProfile);
+        profileFields.name = profileName;
+        config.profiles[profileName] = profileFields;
+        if (Object.keys(this.removeUndefined(workspaceFields)).length > 0) {
+            config.workspace = { ...config.workspace, ...workspaceFields };
+        }
         // If this is the first profile, make it active
         if (Object.keys(config.profiles).length === 1) {
             config.activeProfile = profileName;
@@ -710,26 +715,21 @@ export class ConfigLoader {
         await fs.mkdir(configDir, { recursive: true });
         // Create multi-provider config structure
         const profileName = overrides?.profileName || 'default';
-        const profile = {};
-        // Add overrides if provided
-        if (overrides?.codeMieProject) {
-            profile.codeMieProject = overrides.codeMieProject;
-        }
-        if (overrides?.codeMieIntegration) {
-            profile.codeMieIntegration = overrides.codeMieIntegration;
-        }
-        // Add any other overrides
+        const rawOverrides = {};
+        // Collect all overrides (excluding the meta-only profileName key)
         for (const [key, value] of Object.entries(overrides || {})) {
-            if (key !== 'profileName' && key !== 'codeMieProject' && key !== 'codeMieIntegration' && value !== undefined) {
-                profile[key] = value;
+            if (key !== 'profileName' && value !== undefined) {
+                rawOverrides[key] = value;
             }
         }
+        const { profile, workspace } = this.splitProfileAndWorkspace(rawOverrides);
         const config = {
             version: 2,
             activeProfile: profileName,
             profiles: {
                 [profileName]: profile
-            }
+            },
+            ...(Object.keys(this.removeUndefined(workspace)).length > 0 ? { workspace } : {})
         };
         const configPath = path.join(configDir, 'codemie-cli.config.json');
         await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf-8');
@@ -854,6 +854,8 @@ export class ConfigLoader {
      * Remove undefined values from object
      */
     static removeUndefined(obj) {
+        if (obj == null)
+            return {};
         return Object.fromEntries(Object.entries(obj).filter(([_, v]) => v !== undefined));
     }
     /**
@@ -958,15 +960,15 @@ export class ConfigLoader {
         const globalConfig = await this.loadGlobalConfigProfile(selectedProfileName);
         const localConfig = await this.loadLocalConfigProfile(workingDir, localProfileName);
         const applyProjectOnly = Boolean(selectedProfileName && localProfileName && selectedProfileName !== localProfileName);
-        const selectedProfileDefinesProjectContext = Boolean(globalConfig.codeMieProject || globalConfig.codeMieIntegration);
-        const preserveProjectContext = applyProjectOnly &&
-            !selectedProfileDefinesProjectContext &&
-            this.shouldPreserveProjectContext(localConfig.codeMieUrl, globalConfig.codeMieUrl);
-        const effectiveLocalConfig = preserveProjectContext
-            ? this.filterProjectFields(localConfig)
-            : applyProjectOnly
-                ? {}
-                : localConfig;
+        const effectiveLocalConfig = applyProjectOnly ? {} : localConfig;
+        // Workspace (repo/tooling-context) fields resolve independently of profile
+        // selection — see resolveWorkspace(). Label the layer by which scope actually
+        // supplied it (mirrors resolveWorkspace()'s own local-else-global rule) rather
+        // than hardcoding 'project', so --show-sources doesn't misattribute a
+        // global-scope-only workspace value to the local config.
+        const localWorkspaceScope = await this.loadLocalMultiProviderConfig(workingDir);
+        const workspaceSource = localWorkspaceScope.workspace != null ? 'project' : 'global';
+        const workspace = await this.resolveWorkspace(workingDir);
         const configs = [
             {
                 data: {
@@ -983,6 +985,10 @@ export class ConfigLoader {
                 data: effectiveLocalConfig,
                 source: 'project'
             },
+            {
+                data: workspace,
+                source: workspaceSource
+            },
             {
                 data: this.loadFromEnv(),
                 source: 'env'