gitlab-ai-provider 6.15.0 → 6.15.1

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## <small>6.15.1 (2026-09-09)</small>
+
+- Merge branch 'fix/agent-platform-model-discovery' into 'main' ([98c1fa7](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/98c1fa7))
+- fix(discovery): scope Agent Platform model discovery by project and correct stale workflow refs ([9dd9681](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/9dd9681))
+
 ## 6.15.0 (2026-09-07)
 
 - Merge branch 'feature-add-gpt-6-astra' into 'main' ([19d1e4f](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/19d1e4f))

package/README.md

@@ -629,7 +629,14 @@ const directToken = await client.getDirectAccessToken();
 
 #### GitLabModelDiscovery
 
-Discovers available workflow models via GraphQL.
+Discovers available workflow models via GraphQL. Scope by `projectId`
+(preferred — works for both group- and user-namespace projects) or
+`rootNamespaceId` (group namespaces only, supported on older GitLab
+instances). A bare string is treated as `rootNamespaceId` for backwards
+compatibility. When scoped by `projectId` with a `rootNamespaceId` also
+supplied, discovery falls back to the namespace-scoped query if the
+`projectId` query fails (e.g. on GitLab versions predating `projectId`
+support).
 
 ```typescript
 const discovery = new GitLabModelDiscovery({
@@ -637,11 +644,14 @@ const discovery = new GitLabModelDiscovery({
   getHeaders: () => ({ Authorization: `Bearer ${token}` }),
 });
 
-const models = await discovery.discover('gid://gitlab/Group/12345');
+const models = await discovery.discover({
+  projectId: 'gid://gitlab/Project/12345',
+  rootNamespaceId: 'gid://gitlab/Group/6789', // optional fallback
+});
 // Returns: { defaultModel, selectableModels, pinnedModel, modelSwitchingEnabled }
 
 const effectiveRef = await discovery.getEffectiveModelRef(
-  'gid://gitlab/Group/12345',
+  { projectId: 'gid://gitlab/Project/12345' },
   'claude_sonnet_4_6'
 );
 ```

package/dist/index.d.mts

@@ -161,15 +161,18 @@ declare class GitLabAnthropicLanguageModel implements LanguageModelV3 {
  * Dynamic model discovery via GitLab GraphQL API.
  *
  * Queries `aiChatAvailableModels` to discover which models are available
- * for a given GitLab namespace. Used to dynamically populate `duo-workflow-*`
- * model IDs at runtime.
+ * for a given GitLab project or namespace. Used to dynamically populate
+ * `duo-workflow-*` model IDs at runtime.
  *
- * Requires GitLab 18.4+ (18.5+ for pinned model support).
+ * Requires GitLab 18.4+ (18.5+ for pinned model support). `projectId` scoping
+ * requires a newer GitLab release than `rootNamespaceId` scoping; when a
+ * `projectId` query fails and a `rootNamespaceId` is also known, discovery
+ * falls back to the namespace-scoped query.
  */
 interface AiModel {
     /** Display name (e.g., 'Claude Sonnet 4.6') */
     name: string;
-    /** Model reference for API use (e.g., 'claude_sonnet_4_6' or 'anthropic/claude-sonnet-4-5-20250929') */
+    /** Model reference for API use (e.g., 'claude_sonnet_4_6') */
     ref: string;
 }
 interface AiChatAvailableModels {
@@ -197,29 +200,43 @@ interface ModelDiscoveryConfig {
     /** Custom fetch */
     fetch?: typeof fetch;
 }
+/**
+ * Scope to discover models for. `projectId` is preferred (works for both
+ * group- and user-namespace projects). An optional `rootNamespaceId` may be
+ * supplied alongside it as a fallback for GitLab instances too old to
+ * support `projectId`-scoped discovery.
+ */
+type DiscoveryScope = {
+    projectId: string;
+    rootNamespaceId?: string;
+} | {
+    rootNamespaceId: string;
+};
 declare class GitLabModelDiscovery {
     private readonly config;
     private readonly fetchFn;
     private cache;
     constructor(config: ModelDiscoveryConfig);
     /**
-     * Discover available models for a given root namespace.
+     * Discover available models for a given project or root namespace.
      *
-     * Results are cached per `rootNamespaceId` with a 10-minute TTL.
+     * Results are cached per scope with a 10-minute TTL.
      * Use `invalidateCache()` to force an immediate refresh.
      *
-     * @param rootNamespaceId - GitLab group ID (e.g., 'gid://gitlab/Group/12345')
+     * @param scope - `{ projectId }` (preferred), `{ rootNamespaceId }`, or a
+     *   bare string (treated as `rootNamespaceId` for backwards compatibility)
      */
-    discover(rootNamespaceId: string): Promise<DiscoveredModels>;
+    discover(scope: DiscoveryScope | string): Promise<DiscoveredModels>;
+    private query;
     /**
      * Get the effective model ref to use for a workflow.
      *
      * Priority: pinned > user-selected > default.
      *
-     * @param rootNamespaceId - GitLab group ID
+     * @param scope - Project or root namespace to discover models for
      * @param userSelectedRef - Optional user preference
      */
-    getEffectiveModelRef(rootNamespaceId: string, userSelectedRef?: string): Promise<string | null>;
+    getEffectiveModelRef(scope: DiscoveryScope | string, userSelectedRef?: string): Promise<string | null>;
     /**
      * Invalidate the cached discovery results.
      */
@@ -885,6 +902,14 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      *   3. Cached from previous call
      */
     private resolveRootNamespaceId;
+    /**
+     * Resolve the model discovery scope to use for `aiChatAvailableModels`.
+     *
+     * `projectId` is preferred — it works for both group- and user-namespace
+     * projects — with `rootNamespaceId` attached as a fallback for GitLab
+     * instances too old to support `projectId`-scoped discovery.
+     */
+    private resolveDiscoveryScope;
     /**
      * Resolve the effective DWS model ref to use for this stream.
      * Deduplicates concurrent calls via a shared promise.
@@ -905,10 +930,12 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      * Call this early (e.g., on IDE startup) to avoid blocking the first stream.
      * Results are persisted to the workspace model cache.
      *
-     * @param rootNamespaceId - GitLab group ID (e.g., 'gid://gitlab/Group/12345')
+     * @param scope - Project or root namespace GID to discover models for.
+     *   A bare string is treated as a `rootNamespaceId` (e.g.
+     *   'gid://gitlab/Group/12345') for backwards compatibility.
      * @returns Discovered models with default, selectable, and pinned models
      */
-    discoverModels(rootNamespaceId: string): Promise<DiscoveredModels>;
+    discoverModels(scope: DiscoveryScope | string): Promise<DiscoveredModels>;
     /**
      * Get the file-based model cache instance for this workspace.
      * Useful for consumers that need direct cache access (e.g., the discover route).
@@ -1851,4 +1878,4 @@ interface WorkflowDiscoveryResult {
 }
 declare function discoverWorkflowModels(config: WorkflowDiscoveryConfig, options: WorkflowDiscoveryOptions): Promise<WorkflowDiscoveryResult>;
 
-export { AGENT_PRIVILEGES, type ActionResponsePayload, type AdditionalContext, type AiChatAvailableModels, type AiModel, type ApprovalDecision, BUNDLED_CLIENT_ID, CLIENT_VERSION, type ClientEvent, DEFAULT_AGENT_PRIVILEGES, DEFAULT_AI_GATEWAY_URL, DEFAULT_CLIENT_CAPABILITIES, DEFAULT_WORKFLOW_DEFINITION, type DirectAccessToken, type DiscoveredModels, type DiscoveredWorkflowModel, GITLAB_COM_URL, type GenerateTokenResponse, type GitLabAgenticOptions, type GitLabAnthropicConfig, GitLabAnthropicLanguageModel, GitLabDirectAccessClient, type GitLabDirectAccessConfig, GitLabError, type GitLabErrorOptions, GitLabModelCache, GitLabModelConfigRegistry, GitLabModelDiscovery, GitLabOAuthManager, type GitLabOAuthTokenResponse, type GitLabOAuthTokens, type GitLabOpenAIConfig, GitLabOpenAILanguageModel, type GitLabProject, GitLabProjectCache, GitLabProjectDetector, type GitLabProjectDetectorConfig, type GitLabProvider, type GitLabProviderSettings, type GitLabThinkingConfig, GitLabWorkflowClient, type GitLabWorkflowClientConfig, GitLabWorkflowLanguageModel, type GitLabWorkflowLanguageModelConfig, type GitLabWorkflowOptions, GitLabWorkflowTokenClient, MODEL_ID_TO_ANTHROPIC_MODEL, MODEL_MAPPINGS, type McpToolDefinition, type ModelCacheEntry, type ModelConfig, type ModelConfigRegistryOptions, type ModelDiscoveryConfig, type ModelMapping, type ModelProvider, type NewCheckpoint, OAUTH_SCOPES, OPENCODE_GITLAB_AUTH_CLIENT_ID, type OpenAIApiType, type OpenCodeAuth, type OpenCodeAuthApi, type OpenCodeAuthOAuth, type RunMcpTool, type StartRequest, TOKEN_EXPIRY_SKEW_MS, VERSION, WORKFLOW_ENVIRONMENT, WS_HEARTBEAT_INTERVAL_MS, WS_KEEPALIVE_PING_INTERVAL_MS, type WorkflowAction, type WorkflowClientEvent, type WorkflowDiscoveryConfig, type WorkflowDiscoveryOptions, type WorkflowDiscoveryResult, type WorkflowStatus, type WorkflowToolExecutor, WorkflowType, type WorkflowWebSocketOptions, createGitLab, discoverWorkflowModels, getAnthropicModelForModelId, getModelMapping, getOpenAIApiType, getOpenAIModelForModelId, getProviderForModelId, getValidModelsForProvider, getWorkflowModelRef, gitlab, gitlabOAuthTokenResponseSchema, isResponsesApiModel, isWorkflowModel, parseModelsYml };
+export { AGENT_PRIVILEGES, type ActionResponsePayload, type AdditionalContext, type AiChatAvailableModels, type AiModel, type ApprovalDecision, BUNDLED_CLIENT_ID, CLIENT_VERSION, type ClientEvent, DEFAULT_AGENT_PRIVILEGES, DEFAULT_AI_GATEWAY_URL, DEFAULT_CLIENT_CAPABILITIES, DEFAULT_WORKFLOW_DEFINITION, type DirectAccessToken, type DiscoveredModels, type DiscoveredWorkflowModel, type DiscoveryScope, GITLAB_COM_URL, type GenerateTokenResponse, type GitLabAgenticOptions, type GitLabAnthropicConfig, GitLabAnthropicLanguageModel, GitLabDirectAccessClient, type GitLabDirectAccessConfig, GitLabError, type GitLabErrorOptions, GitLabModelCache, GitLabModelConfigRegistry, GitLabModelDiscovery, GitLabOAuthManager, type GitLabOAuthTokenResponse, type GitLabOAuthTokens, type GitLabOpenAIConfig, GitLabOpenAILanguageModel, type GitLabProject, GitLabProjectCache, GitLabProjectDetector, type GitLabProjectDetectorConfig, type GitLabProvider, type GitLabProviderSettings, type GitLabThinkingConfig, GitLabWorkflowClient, type GitLabWorkflowClientConfig, GitLabWorkflowLanguageModel, type GitLabWorkflowLanguageModelConfig, type GitLabWorkflowOptions, GitLabWorkflowTokenClient, MODEL_ID_TO_ANTHROPIC_MODEL, MODEL_MAPPINGS, type McpToolDefinition, type ModelCacheEntry, type ModelConfig, type ModelConfigRegistryOptions, type ModelDiscoveryConfig, type ModelMapping, type ModelProvider, type NewCheckpoint, OAUTH_SCOPES, OPENCODE_GITLAB_AUTH_CLIENT_ID, type OpenAIApiType, type OpenCodeAuth, type OpenCodeAuthApi, type OpenCodeAuthOAuth, type RunMcpTool, type StartRequest, TOKEN_EXPIRY_SKEW_MS, VERSION, WORKFLOW_ENVIRONMENT, WS_HEARTBEAT_INTERVAL_MS, WS_KEEPALIVE_PING_INTERVAL_MS, type WorkflowAction, type WorkflowClientEvent, type WorkflowDiscoveryConfig, type WorkflowDiscoveryOptions, type WorkflowDiscoveryResult, type WorkflowStatus, type WorkflowToolExecutor, WorkflowType, type WorkflowWebSocketOptions, createGitLab, discoverWorkflowModels, getAnthropicModelForModelId, getModelMapping, getOpenAIApiType, getOpenAIModelForModelId, getProviderForModelId, getValidModelsForProvider, getWorkflowModelRef, gitlab, gitlabOAuthTokenResponseSchema, isResponsesApiModel, isWorkflowModel, parseModelsYml };

package/dist/index.d.ts

@@ -161,15 +161,18 @@ declare class GitLabAnthropicLanguageModel implements LanguageModelV3 {
  * Dynamic model discovery via GitLab GraphQL API.
  *
  * Queries `aiChatAvailableModels` to discover which models are available
- * for a given GitLab namespace. Used to dynamically populate `duo-workflow-*`
- * model IDs at runtime.
+ * for a given GitLab project or namespace. Used to dynamically populate
+ * `duo-workflow-*` model IDs at runtime.
  *
- * Requires GitLab 18.4+ (18.5+ for pinned model support).
+ * Requires GitLab 18.4+ (18.5+ for pinned model support). `projectId` scoping
+ * requires a newer GitLab release than `rootNamespaceId` scoping; when a
+ * `projectId` query fails and a `rootNamespaceId` is also known, discovery
+ * falls back to the namespace-scoped query.
  */
 interface AiModel {
     /** Display name (e.g., 'Claude Sonnet 4.6') */
     name: string;
-    /** Model reference for API use (e.g., 'claude_sonnet_4_6' or 'anthropic/claude-sonnet-4-5-20250929') */
+    /** Model reference for API use (e.g., 'claude_sonnet_4_6') */
     ref: string;
 }
 interface AiChatAvailableModels {
@@ -197,29 +200,43 @@ interface ModelDiscoveryConfig {
     /** Custom fetch */
     fetch?: typeof fetch;
 }
+/**
+ * Scope to discover models for. `projectId` is preferred (works for both
+ * group- and user-namespace projects). An optional `rootNamespaceId` may be
+ * supplied alongside it as a fallback for GitLab instances too old to
+ * support `projectId`-scoped discovery.
+ */
+type DiscoveryScope = {
+    projectId: string;
+    rootNamespaceId?: string;
+} | {
+    rootNamespaceId: string;
+};
 declare class GitLabModelDiscovery {
     private readonly config;
     private readonly fetchFn;
     private cache;
     constructor(config: ModelDiscoveryConfig);
     /**
-     * Discover available models for a given root namespace.
+     * Discover available models for a given project or root namespace.
      *
-     * Results are cached per `rootNamespaceId` with a 10-minute TTL.
+     * Results are cached per scope with a 10-minute TTL.
      * Use `invalidateCache()` to force an immediate refresh.
      *
-     * @param rootNamespaceId - GitLab group ID (e.g., 'gid://gitlab/Group/12345')
+     * @param scope - `{ projectId }` (preferred), `{ rootNamespaceId }`, or a
+     *   bare string (treated as `rootNamespaceId` for backwards compatibility)
      */
-    discover(rootNamespaceId: string): Promise<DiscoveredModels>;
+    discover(scope: DiscoveryScope | string): Promise<DiscoveredModels>;
+    private query;
     /**
      * Get the effective model ref to use for a workflow.
      *
      * Priority: pinned > user-selected > default.
      *
-     * @param rootNamespaceId - GitLab group ID
+     * @param scope - Project or root namespace to discover models for
      * @param userSelectedRef - Optional user preference
      */
-    getEffectiveModelRef(rootNamespaceId: string, userSelectedRef?: string): Promise<string | null>;
+    getEffectiveModelRef(scope: DiscoveryScope | string, userSelectedRef?: string): Promise<string | null>;
     /**
      * Invalidate the cached discovery results.
      */
@@ -885,6 +902,14 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      *   3. Cached from previous call
      */
     private resolveRootNamespaceId;
+    /**
+     * Resolve the model discovery scope to use for `aiChatAvailableModels`.
+     *
+     * `projectId` is preferred — it works for both group- and user-namespace
+     * projects — with `rootNamespaceId` attached as a fallback for GitLab
+     * instances too old to support `projectId`-scoped discovery.
+     */
+    private resolveDiscoveryScope;
     /**
      * Resolve the effective DWS model ref to use for this stream.
      * Deduplicates concurrent calls via a shared promise.
@@ -905,10 +930,12 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      * Call this early (e.g., on IDE startup) to avoid blocking the first stream.
      * Results are persisted to the workspace model cache.
      *
-     * @param rootNamespaceId - GitLab group ID (e.g., 'gid://gitlab/Group/12345')
+     * @param scope - Project or root namespace GID to discover models for.
+     *   A bare string is treated as a `rootNamespaceId` (e.g.
+     *   'gid://gitlab/Group/12345') for backwards compatibility.
      * @returns Discovered models with default, selectable, and pinned models
      */
-    discoverModels(rootNamespaceId: string): Promise<DiscoveredModels>;
+    discoverModels(scope: DiscoveryScope | string): Promise<DiscoveredModels>;
     /**
      * Get the file-based model cache instance for this workspace.
      * Useful for consumers that need direct cache access (e.g., the discover route).
@@ -1851,4 +1878,4 @@ interface WorkflowDiscoveryResult {
 }
 declare function discoverWorkflowModels(config: WorkflowDiscoveryConfig, options: WorkflowDiscoveryOptions): Promise<WorkflowDiscoveryResult>;
 
-export { AGENT_PRIVILEGES, type ActionResponsePayload, type AdditionalContext, type AiChatAvailableModels, type AiModel, type ApprovalDecision, BUNDLED_CLIENT_ID, CLIENT_VERSION, type ClientEvent, DEFAULT_AGENT_PRIVILEGES, DEFAULT_AI_GATEWAY_URL, DEFAULT_CLIENT_CAPABILITIES, DEFAULT_WORKFLOW_DEFINITION, type DirectAccessToken, type DiscoveredModels, type DiscoveredWorkflowModel, GITLAB_COM_URL, type GenerateTokenResponse, type GitLabAgenticOptions, type GitLabAnthropicConfig, GitLabAnthropicLanguageModel, GitLabDirectAccessClient, type GitLabDirectAccessConfig, GitLabError, type GitLabErrorOptions, GitLabModelCache, GitLabModelConfigRegistry, GitLabModelDiscovery, GitLabOAuthManager, type GitLabOAuthTokenResponse, type GitLabOAuthTokens, type GitLabOpenAIConfig, GitLabOpenAILanguageModel, type GitLabProject, GitLabProjectCache, GitLabProjectDetector, type GitLabProjectDetectorConfig, type GitLabProvider, type GitLabProviderSettings, type GitLabThinkingConfig, GitLabWorkflowClient, type GitLabWorkflowClientConfig, GitLabWorkflowLanguageModel, type GitLabWorkflowLanguageModelConfig, type GitLabWorkflowOptions, GitLabWorkflowTokenClient, MODEL_ID_TO_ANTHROPIC_MODEL, MODEL_MAPPINGS, type McpToolDefinition, type ModelCacheEntry, type ModelConfig, type ModelConfigRegistryOptions, type ModelDiscoveryConfig, type ModelMapping, type ModelProvider, type NewCheckpoint, OAUTH_SCOPES, OPENCODE_GITLAB_AUTH_CLIENT_ID, type OpenAIApiType, type OpenCodeAuth, type OpenCodeAuthApi, type OpenCodeAuthOAuth, type RunMcpTool, type StartRequest, TOKEN_EXPIRY_SKEW_MS, VERSION, WORKFLOW_ENVIRONMENT, WS_HEARTBEAT_INTERVAL_MS, WS_KEEPALIVE_PING_INTERVAL_MS, type WorkflowAction, type WorkflowClientEvent, type WorkflowDiscoveryConfig, type WorkflowDiscoveryOptions, type WorkflowDiscoveryResult, type WorkflowStatus, type WorkflowToolExecutor, WorkflowType, type WorkflowWebSocketOptions, createGitLab, discoverWorkflowModels, getAnthropicModelForModelId, getModelMapping, getOpenAIApiType, getOpenAIModelForModelId, getProviderForModelId, getValidModelsForProvider, getWorkflowModelRef, gitlab, gitlabOAuthTokenResponseSchema, isResponsesApiModel, isWorkflowModel, parseModelsYml };
+export { AGENT_PRIVILEGES, type ActionResponsePayload, type AdditionalContext, type AiChatAvailableModels, type AiModel, type ApprovalDecision, BUNDLED_CLIENT_ID, CLIENT_VERSION, type ClientEvent, DEFAULT_AGENT_PRIVILEGES, DEFAULT_AI_GATEWAY_URL, DEFAULT_CLIENT_CAPABILITIES, DEFAULT_WORKFLOW_DEFINITION, type DirectAccessToken, type DiscoveredModels, type DiscoveredWorkflowModel, type DiscoveryScope, GITLAB_COM_URL, type GenerateTokenResponse, type GitLabAgenticOptions, type GitLabAnthropicConfig, GitLabAnthropicLanguageModel, GitLabDirectAccessClient, type GitLabDirectAccessConfig, GitLabError, type GitLabErrorOptions, GitLabModelCache, GitLabModelConfigRegistry, GitLabModelDiscovery, GitLabOAuthManager, type GitLabOAuthTokenResponse, type GitLabOAuthTokens, type GitLabOpenAIConfig, GitLabOpenAILanguageModel, type GitLabProject, GitLabProjectCache, GitLabProjectDetector, type GitLabProjectDetectorConfig, type GitLabProvider, type GitLabProviderSettings, type GitLabThinkingConfig, GitLabWorkflowClient, type GitLabWorkflowClientConfig, GitLabWorkflowLanguageModel, type GitLabWorkflowLanguageModelConfig, type GitLabWorkflowOptions, GitLabWorkflowTokenClient, MODEL_ID_TO_ANTHROPIC_MODEL, MODEL_MAPPINGS, type McpToolDefinition, type ModelCacheEntry, type ModelConfig, type ModelConfigRegistryOptions, type ModelDiscoveryConfig, type ModelMapping, type ModelProvider, type NewCheckpoint, OAUTH_SCOPES, OPENCODE_GITLAB_AUTH_CLIENT_ID, type OpenAIApiType, type OpenCodeAuth, type OpenCodeAuthApi, type OpenCodeAuthOAuth, type RunMcpTool, type StartRequest, TOKEN_EXPIRY_SKEW_MS, VERSION, WORKFLOW_ENVIRONMENT, WS_HEARTBEAT_INTERVAL_MS, WS_KEEPALIVE_PING_INTERVAL_MS, type WorkflowAction, type WorkflowClientEvent, type WorkflowDiscoveryConfig, type WorkflowDiscoveryOptions, type WorkflowDiscoveryResult, type WorkflowStatus, type WorkflowToolExecutor, WorkflowType, type WorkflowWebSocketOptions, createGitLab, discoverWorkflowModels, getAnthropicModelForModelId, getModelMapping, getOpenAIApiType, getOpenAIModelForModelId, getProviderForModelId, getValidModelsForProvider, getWorkflowModelRef, gitlab, gitlabOAuthTokenResponseSchema, isResponsesApiModel, isWorkflowModel, parseModelsYml };

package/dist/index.js

@@ -1662,14 +1662,14 @@ var MODEL_MAPPINGS = {
   "duo-workflow-default": { provider: "workflow", model: "default" },
   "duo-workflow-sonnet-4-5": {
     provider: "workflow",
-    model: "anthropic/claude-sonnet-4-5-20250929"
+    model: "claude_sonnet_4_5_20250929"
   },
   "duo-workflow-sonnet-5": { provider: "workflow", model: "claude_sonnet_5" },
   "duo-workflow-opus-5": { provider: "workflow", model: "claude_opus_5" },
   "duo-workflow-sonnet-4-6": { provider: "workflow", model: "claude_sonnet_4_6" },
   "duo-workflow-opus-4-5": {
     provider: "workflow",
-    model: "anthropic/claude-opus-4-5-20251101"
+    model: "claude_opus_4_5_20251101"
   },
   "duo-workflow-haiku-4-5": { provider: "workflow", model: "claude_haiku_4_5_20251001" },
   "duo-workflow-opus-4-6": { provider: "workflow", model: "claude_opus_4_6_20260205" }
@@ -2771,7 +2771,7 @@ var import_node_async_hooks = require("async_hooks");
 var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
 
 // src/version.ts
-var VERSION = true ? "6.14.0" : "0.0.0-dev";
+var VERSION = true ? "6.15.0" : "0.0.0-dev";
 
 // src/gitlab-workflow-client.ts
 var WS_CONNECT_TIMEOUT_MS = 3e4;
@@ -3491,8 +3491,14 @@ var GitLabProjectDetector = class {
 };
 
 // src/gitlab-model-discovery.ts
+function scopeCacheKey(scope) {
+  return "projectId" in scope ? `p:${scope.projectId}` : `n:${scope.rootNamespaceId}`;
+}
+function normalizeScope(scope) {
+  return typeof scope === "string" ? { rootNamespaceId: scope } : scope;
+}
 var AI_CHAT_AVAILABLE_MODELS_QUERY = `
-  query aiChatAvailableModels($rootNamespaceId: GroupID!) {
+  query aiChatAvailableModels($projectId: ProjectID, $rootNamespaceId: GroupID) {
     metadata {
       featureFlags(names: ["ai_user_model_switching"]) {
         enabled
@@ -3501,7 +3507,7 @@ var AI_CHAT_AVAILABLE_MODELS_QUERY = `
       version
     }
 
-    aiChatAvailableModels(rootNamespaceId: $rootNamespaceId) {
+    aiChatAvailableModels(projectId: $projectId, rootNamespaceId: $rootNamespaceId) {
       defaultModel {
         name
         ref
@@ -3527,18 +3533,42 @@ var GitLabModelDiscovery = class {
     this.fetchFn = config.fetch ?? fetch;
   }
   /**
-   * Discover available models for a given root namespace.
+   * Discover available models for a given project or root namespace.
    *
-   * Results are cached per `rootNamespaceId` with a 10-minute TTL.
+   * Results are cached per scope with a 10-minute TTL.
    * Use `invalidateCache()` to force an immediate refresh.
    *
-   * @param rootNamespaceId - GitLab group ID (e.g., 'gid://gitlab/Group/12345')
+   * @param scope - `{ projectId }` (preferred), `{ rootNamespaceId }`, or a
+   *   bare string (treated as `rootNamespaceId` for backwards compatibility)
    */
-  async discover(rootNamespaceId) {
-    const cached = this.cache.get(rootNamespaceId);
+  async discover(scope) {
+    const normalized = normalizeScope(scope);
+    const cacheKey = scopeCacheKey(normalized);
+    const cached = this.cache.get(cacheKey);
     if (cached && cached.expiresAt > Date.now()) {
       return cached.data;
     }
+    try {
+      const result = await this.query(normalized);
+      this.cache.set(cacheKey, {
+        data: result,
+        expiresAt: Date.now() + DISCOVERY_CACHE_TTL_MS
+      });
+      return result;
+    } catch (error) {
+      if ("projectId" in normalized && normalized.rootNamespaceId) {
+        const fallbackScope = { rootNamespaceId: normalized.rootNamespaceId };
+        const result = await this.query(fallbackScope);
+        this.cache.set(scopeCacheKey(fallbackScope), {
+          data: result,
+          expiresAt: Date.now() + DISCOVERY_CACHE_TTL_MS
+        });
+        return result;
+      }
+      throw error;
+    }
+  }
+  async query(scope) {
     const url = `${this.config.instanceUrl}/api/graphql`;
     try {
       const response = await this.fetchFn(url, {
@@ -3549,7 +3579,7 @@ var GitLabModelDiscovery = class {
         },
         body: JSON.stringify({
           query: AI_CHAT_AVAILABLE_MODELS_QUERY,
-          variables: { rootNamespaceId }
+          variables: "projectId" in scope ? { projectId: scope.projectId, rootNamespaceId: void 0 } : { projectId: void 0, rootNamespaceId: scope.rootNamespaceId }
         })
       });
       if (!response.ok) {
@@ -3568,19 +3598,15 @@ var GitLabModelDiscovery = class {
       }
       const models = json.data?.aiChatAvailableModels;
       const metadata = json.data?.metadata;
-      const modelSwitchingEnabled = metadata?.featureFlags?.find((f) => f.name === "ai_user_model_switching")?.enabled ?? false;
-      const result = {
+      const flag = metadata?.featureFlags?.find((f) => f.name === "ai_user_model_switching");
+      const modelSwitchingEnabled = flag ? flag.enabled : true;
+      return {
         defaultModel: models?.defaultModel ?? null,
         selectableModels: models?.selectableModels ?? [],
         pinnedModel: models?.pinnedModel ?? null,
         modelSwitchingEnabled,
         instanceVersion: metadata?.version ?? null
       };
-      this.cache.set(rootNamespaceId, {
-        data: result,
-        expiresAt: Date.now() + DISCOVERY_CACHE_TTL_MS
-      });
-      return result;
     } catch (error) {
       if (error instanceof GitLabError) throw error;
       throw new GitLabError({
@@ -3594,11 +3620,11 @@ var GitLabModelDiscovery = class {
    *
    * Priority: pinned > user-selected > default.
    *
-   * @param rootNamespaceId - GitLab group ID
+   * @param scope - Project or root namespace to discover models for
    * @param userSelectedRef - Optional user preference
    */
-  async getEffectiveModelRef(rootNamespaceId, userSelectedRef) {
-    const discovered = await this.discover(rootNamespaceId);
+  async getEffectiveModelRef(scope, userSelectedRef) {
+    const discovered = await this.discover(scope);
     if (discovered.pinnedModel) {
       return discovered.pinnedModel.ref;
     }
@@ -4045,6 +4071,25 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
     this._rootNamespaceId = null;
     return null;
   }
+  /**
+   * Resolve the model discovery scope to use for `aiChatAvailableModels`.
+   *
+   * `projectId` is preferred — it works for both group- and user-namespace
+   * projects — with `rootNamespaceId` attached as a fallback for GitLab
+   * instances too old to support `projectId`-scoped discovery.
+   */
+  async resolveDiscoveryScope() {
+    const rootNamespaceId = await this.resolveRootNamespaceId();
+    const workDir = this.workflowOptions.workingDirectory ?? process.cwd();
+    const project = await this.projectDetector.detectProject(workDir);
+    if (project?.id) {
+      return {
+        projectId: `gid://gitlab/Project/${project.id}`,
+        ...rootNamespaceId ? { rootNamespaceId } : {}
+      };
+    }
+    return rootNamespaceId ? { rootNamespaceId } : null;
+  }
   /**
    * Resolve the effective DWS model ref to use for this stream.
    * Deduplicates concurrent calls via a shared promise.
@@ -4075,13 +4120,13 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
     return this._discoveryPromise;
   }
   async doResolveModelRef() {
-    const rootNamespaceId = await this.resolveRootNamespaceId();
-    if (!rootNamespaceId) {
+    const scope = await this.resolveDiscoveryScope();
+    if (!scope) {
       this._selectedModelRef = "default";
       return "default";
     }
     try {
-      const discovered = await this.modelDiscovery.discover(rootNamespaceId);
+      const discovered = await this.modelDiscovery.discover(scope);
       this.modelCache.saveDiscovery(discovered);
       if (discovered.pinnedModel) {
         this._selectedModelRef = discovered.pinnedModel.ref;
@@ -4124,11 +4169,13 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
    * Call this early (e.g., on IDE startup) to avoid blocking the first stream.
    * Results are persisted to the workspace model cache.
    *
-   * @param rootNamespaceId - GitLab group ID (e.g., 'gid://gitlab/Group/12345')
+   * @param scope - Project or root namespace GID to discover models for.
+   *   A bare string is treated as a `rootNamespaceId` (e.g.
+   *   'gid://gitlab/Group/12345') for backwards compatibility.
    * @returns Discovered models with default, selectable, and pinned models
    */
-  async discoverModels(rootNamespaceId) {
-    const result = await this.modelDiscovery.discover(rootNamespaceId);
+  async discoverModels(scope) {
+    const result = await this.modelDiscovery.discover(scope);
     this.modelCache.saveDiscovery(result);
     return result;
   }
@@ -5870,7 +5917,7 @@ async function buildModels(discovered, project) {
   for (const model of all) {
     if (!model.ref || seen.has(model.ref)) continue;
     seen.add(model.ref);
-    const id = refToID.get(model.ref) ?? `duo-workflow-${model.ref.replace(/[/_]/g, "-")}`;
+    const id = refToID.get(model.ref) ?? (model.ref.startsWith("__default__") ? "duo-workflow-default" : `duo-workflow-${model.ref.replace(/[/_]/g, "-")}`);
     const limits = configs.get(model.ref);
     models.push({
       id,
@@ -5902,14 +5949,22 @@ async function discoverWorkflowModels(config, options) {
   } catch {
     return { models: [], project: null };
   }
-  const namespaceId = project?.namespaceId;
-  if (!namespaceId) return { models: [], project };
+  if (!project?.id) return { models: [], project };
+  const scope = {
+    projectId: `gid://gitlab/Project/${project.id}`,
+    ...project.namespaceId ? { rootNamespaceId: `gid://gitlab/Group/${project.namespaceId}` } : {}
+  };
   const discovery = new GitLabModelDiscovery({
     instanceUrl: config.instanceUrl,
     getHeaders: config.getHeaders,
     fetch: config.fetch
   });
-  const discovered = await discovery.discover(`gid://gitlab/Group/${namespaceId}`);
+  let discovered;
+  try {
+    discovered = await discovery.discover(scope);
+  } catch {
+    return { models: [], project };
+  }
   cache.saveDiscovery(discovered, project);
   if (!cache.getSelectedModelRef()) {
     const pick = discovered.pinnedModel ?? discovered.defaultModel;