@vfarcic/dot-ai 1.19.1 → 1.21.0

package/dist/core/ai-provider-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-provider-factory.d.ts","sourceRoot":"","sources":["../../src/core/ai-provider-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAiCvE;;;;;;;;;;;;;;GAcG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,UAAU;IA+BnD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,aAAa,IAAI,UAAU;IAsGlC;;;;;OAKG;IACH,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAWrD;;;;OAIG;IACH,MAAM,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAMxC;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAGxD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,CAE7C"}
+{"version":3,"file":"ai-provider-factory.d.ts","sourceRoot":"","sources":["../../src/core/ai-provider-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAkCvE;;;;;;;;;;;;;;GAcG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,UAAU;IA+BnD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,aAAa,IAAI,UAAU;IAsGlC;;;;;OAKG;IACH,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAWrD;;;;OAIG;IACH,MAAM,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAMxC;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAGxD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,CAE7C"}

package/dist/core/ai-provider-factory.js

@@ -31,6 +31,7 @@ const PROVIDER_ENV_KEYS = {
     alibaba: 'ALIBABA_API_KEY', // PRD #382: Alibaba Qwen 3.5 Plus
     xai: 'XAI_API_KEY',
     custom: 'CUSTOM_LLM_API_KEY', // PRD #194 / Issue #474: Explicit opt-in to custom OpenAI-compatible endpoint
+    copilot: 'GITHUB_COPILOT_TOKEN', // PRD #587: GitHub Copilot provider
 };
 const IMPLEMENTED_PROVIDERS = Object.keys(model_config_1.CURRENT_MODELS);
 /**

package/dist/core/model-config.d.ts

@@ -18,6 +18,7 @@ export declare const CURRENT_MODELS: {
     readonly openrouter: "anthropic/claude-haiku-4.5";
     readonly custom: "gpt-5.4";
     readonly amazon_bedrock: "global.anthropic.claude-sonnet-4-6";
+    readonly copilot: "claude-sonnet-4.6";
 };
 /**
  * Get current model for a provider

package/dist/core/model-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/core/model-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;CAcjB,CAAC;AAEX;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,cAAc,GAAG,MAAM,CAE7E"}
+{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/core/model-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;CAejB,CAAC;AAEX;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,cAAc,GAAG,MAAM,CAE7E"}

package/dist/core/model-config.js

@@ -22,6 +22,7 @@ exports.CURRENT_MODELS = {
     openrouter: 'anthropic/claude-haiku-4.5', // PRD #194: OpenRouter default model (overridden by AI_MODEL env var)
     custom: 'gpt-5.4', // PRD #194: Custom endpoint default model (overridden by AI_MODEL env var)
     amazon_bedrock: 'global.anthropic.claude-sonnet-4-6', // PRD #175: Amazon Bedrock default model (overridden by AI_MODEL env var)
+    copilot: 'claude-sonnet-4.6', // PRD #587: GitHub Copilot provider - use dot notation (catalog ID); Copilot supports both /chat/completions and /v1/messages for Claude
 };
 /**
  * Get current model for a provider

package/dist/core/providers/copilot-token-exchanger.d.ts

@@ -0,0 +1,41 @@
+/**
+ * GitHub Copilot Credential Resolver
+ *
+ * Resolves a GitHub token suitable for direct use against api.githubcopilot.com.
+ * Hermes/dot-ai uses the raw token directly as the Bearer credential — no
+ * token-exchange step is required and the exchange endpoint
+ * (api.github.com/copilot_internal/v2/token) can return 404 for some account
+ * types, so it is intentionally NOT used here.
+ *
+ * Supported token types (classic PATs / ghp_* are NOT accepted):
+ *   gho_*          OAuth token (recommended — via `gh auth login`)
+ *   github_pat_*   Fine-grained PAT (needs Copilot Requests permission)
+ *   ghu_*          GitHub App installation token
+ *
+ * Token resolution priority:
+ *   1. GITHUB_COPILOT_TOKEN env var
+ *   2. GH_TOKEN env var
+ *   3. GITHUB_TOKEN env var
+ *
+ * On HTTP 401, callers should invoke resolve() again to re-read the chain
+ * (credentials may have been refreshed externally) and retry once.
+ *
+ * PRD #587: GitHub Copilot Provider
+ */
+export interface CopilotCredentialResolver {
+    /**
+     * Resolve a GitHub token from the environment chain / CLI.
+     * Throws if no supported token is found.
+     */
+    resolve(): string;
+}
+/**
+ * Create a CopilotCredentialResolver.
+ *
+ * @param overrideToken  Optional explicit token (e.g. from env at factory time).
+ *                       If provided and supported it is returned immediately without
+ *                       inspecting the env chain.
+ */
+export declare function makeCopilotCredentialResolver(overrideToken?: string): CopilotCredentialResolver;
+export type CopilotTokenExchanger = CopilotCredentialResolver;
+//# sourceMappingURL=copilot-token-exchanger.d.ts.map

package/dist/core/providers/copilot-token-exchanger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"copilot-token-exchanger.d.ts","sourceRoot":"","sources":["../../../src/core/providers/copilot-token-exchanger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAOH,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,OAAO,IAAI,MAAM,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,aAAa,CAAC,EAAE,MAAM,GACrB,yBAAyB,CAuB3B;AAID,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,CAAC"}

package/dist/core/providers/copilot-token-exchanger.js

@@ -0,0 +1,58 @@
+"use strict";
+/**
+ * GitHub Copilot Credential Resolver
+ *
+ * Resolves a GitHub token suitable for direct use against api.githubcopilot.com.
+ * Hermes/dot-ai uses the raw token directly as the Bearer credential — no
+ * token-exchange step is required and the exchange endpoint
+ * (api.github.com/copilot_internal/v2/token) can return 404 for some account
+ * types, so it is intentionally NOT used here.
+ *
+ * Supported token types (classic PATs / ghp_* are NOT accepted):
+ *   gho_*          OAuth token (recommended — via `gh auth login`)
+ *   github_pat_*   Fine-grained PAT (needs Copilot Requests permission)
+ *   ghu_*          GitHub App installation token
+ *
+ * Token resolution priority:
+ *   1. GITHUB_COPILOT_TOKEN env var
+ *   2. GH_TOKEN env var
+ *   3. GITHUB_TOKEN env var
+ *
+ * On HTTP 401, callers should invoke resolve() again to re-read the chain
+ * (credentials may have been refreshed externally) and retry once.
+ *
+ * PRD #587: GitHub Copilot Provider
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeCopilotCredentialResolver = makeCopilotCredentialResolver;
+const SUPPORTED_PREFIXES = ['gho_', 'github_pat_', 'ghu_'];
+function isSupported(token) {
+    return SUPPORTED_PREFIXES.some((p) => token.startsWith(p));
+}
+/**
+ * Create a CopilotCredentialResolver.
+ *
+ * @param overrideToken  Optional explicit token (e.g. from env at factory time).
+ *                       If provided and supported it is returned immediately without
+ *                       inspecting the env chain.
+ */
+function makeCopilotCredentialResolver(overrideToken) {
+    return {
+        resolve() {
+            // 1. Explicit override (e.g. GITHUB_COPILOT_TOKEN passed by factory)
+            if (overrideToken && isSupported(overrideToken)) {
+                return overrideToken;
+            }
+            // 2. Env chain
+            for (const envVar of ['GITHUB_COPILOT_TOKEN', 'GH_TOKEN', 'GITHUB_TOKEN']) {
+                const val = process.env[envVar];
+                if (val && isSupported(val)) {
+                    return val;
+                }
+            }
+            throw new Error('No supported GitHub token found for Copilot. ' +
+                'Set GITHUB_COPILOT_TOKEN (gho_*, github_pat_*, or ghu_*). ' +
+                'GH_TOKEN and GITHUB_TOKEN are also checked in that order.');
+        },
+    };
+}

package/dist/core/providers/vercel-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel-provider.d.ts","sourceRoot":"","sources":["../../../src/core/providers/vercel-provider.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,OAAO,EACL,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,aAAa,EACd,MAAM,0BAA0B,CAAC;AA6DlC,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,aAAa,CAAC,CAAyB;IAC/C,OAAO,CAAC,aAAa,CAAiB;gBAE1B,MAAM,EAAE,gBAAgB;IAYpC,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,eAAe;IAyJvB,eAAe,IAAI,MAAM;IAIzB,eAAe,IAAI,MAAM;IAIzB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,OAAO;IAIxB,OAAO,CAAC,iBAAiB;IAyBnB,WAAW,CACf,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,MAAkB,EAC7B,iBAAiB,CAAC,EAAE;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GACA,OAAO,CAAC,UAAU,CAAC;IAwJtB;;;;;;;;;;;;OAYG;IACG,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAmc/D"}
+{"version":3,"file":"vercel-provider.d.ts","sourceRoot":"","sources":["../../../src/core/providers/vercel-provider.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,OAAO,EACL,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,aAAa,EACd,MAAM,0BAA0B,CAAC;AA8DlC,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,aAAa,CAAC,CAAyB;IAC/C,OAAO,CAAC,aAAa,CAAiB;gBAE1B,MAAM,EAAE,gBAAgB;IAYpC,OAAO,CAAC,qBAAqB;IAkB7B,OAAO,CAAC,eAAe;IA+OvB,eAAe,IAAI,MAAM;IAIzB,eAAe,IAAI,MAAM;IAIzB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,OAAO;IAIxB,OAAO,CAAC,iBAAiB;IAyBnB,WAAW,CACf,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,MAAkB,EAC7B,iBAAiB,CAAC,EAAE;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GACA,OAAO,CAAC,UAAU,CAAC;IAwJtB;;;;;;;;;;;;OAYG;IACG,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAmc/D"}

package/dist/core/providers/vercel-provider.js

@@ -22,6 +22,7 @@ const model_config_1 = require("../model-config");
 const investigation_1 = require("../constants/investigation");
 const ai_tracing_1 = require("../tracing/ai-tracing");
 const ai_retry_config_1 = require("../ai-retry-config");
+const copilot_token_exchanger_1 = require("./copilot-token-exchanger");
 // Get all supported provider keys dynamically from CURRENT_MODELS
 const SUPPORTED_PROVIDERS = Object.keys(model_config_1.CURRENT_MODELS);
 class VercelProvider {
@@ -43,7 +44,8 @@ class VercelProvider {
         this.initializeModel();
     }
     validateConfiguration() {
-        if (!this.apiKey) {
+        // Copilot resolves its credential from the env chain at fetch time — no apiKey required.
+        if (!this.apiKey && this.providerType !== 'copilot') {
             throw new Error(constants_1.AI_SERVICE_ERROR_TEMPLATES.API_KEY_REQUIRED(this.providerType));
         }
         if (!SUPPORTED_PROVIDERS.includes(this.providerType)) {
@@ -169,6 +171,92 @@ class VercelProvider {
                     // Use .chat() explicitly for custom endpoints to use /chat/completions instead of /responses
                     this.modelInstance = provider.chat(this.model);
                     return; // Early return - model instance already set
+                case 'copilot': {
+                    // PRD #587: GitHub Copilot provider
+                    // Uses the raw GitHub token (gho_*, github_pat_*, ghu_*) directly as a
+                    // Bearer credential against api.githubcopilot.com — no token-exchange step.
+                    //
+                    // Routing (mirrors Hermes Agent):
+                    //   - Claude model IDs (claude-*) → createAnthropic at githubcopilot.com
+                    //     because the Copilot OpenAI-compat non-streaming response for Claude omits
+                    //     the "index" field that @ai-sdk/openai requires, causing parse failures.
+                    //   - All other models → createOpenAI at githubcopilot.com (OpenAI-compat path)
+                    //
+                    // Model IDs must use dot notation matching the Copilot catalog
+                    //   (e.g. claude-sonnet-4.6, NOT claude-sonnet-4-6).
+                    // On 401: re-resolve credentials from the env chain and retry once.
+                    const resolver = (0, copilot_token_exchanger_1.makeCopilotCredentialResolver)(this.apiKey);
+                    // These headers were captured from VS Code Copilot Chat network traffic.
+                    // They are required by api.githubcopilot.com to accept the request —
+                    // the endpoint validates the Integration-Id and Editor-Version before routing.
+                    // Future maintainers: if GitHub changes the required headers, update here.
+                    const copilotHeaders = {
+                        'Copilot-Integration-Id': 'vscode-chat',
+                        'Editor-Version': 'vscode/1.104.1',
+                        'Openai-Intent': 'conversation-edits',
+                        'x-initiator': 'user',
+                    };
+                    const COPILOT_FETCH_TIMEOUT_MS = 30000; // 30s — matches git-utils.ts fetchWithTimeout
+                    const copilotFetch = async (url, init) => {
+                        const token = resolver.resolve();
+                        const headers = new Headers(init?.headers);
+                        headers.set('Authorization', `Bearer ${token}`);
+                        for (const [k, v] of Object.entries(copilotHeaders)) {
+                            headers.set(k, v);
+                        }
+                        const controller = new AbortController();
+                        const timeoutId = setTimeout(() => controller.abort(), COPILOT_FETCH_TIMEOUT_MS);
+                        let response;
+                        try {
+                            response = await fetch(url, { ...init, headers, signal: controller.signal });
+                        }
+                        finally {
+                            clearTimeout(timeoutId);
+                        }
+                        if (response.status === 401) {
+                            // Drain body to allow connection reuse before retrying
+                            await response.text().catch(() => { });
+                            // Re-resolve from env chain (credentials may have been refreshed externally)
+                            const freshToken = resolver.resolve();
+                            // Build fresh headers for retry — do not mutate the first-attempt object
+                            const retryHeaders = new Headers(init?.headers);
+                            retryHeaders.set('Authorization', `Bearer ${freshToken}`);
+                            for (const [k, v] of Object.entries(copilotHeaders)) {
+                                retryHeaders.set(k, v);
+                            }
+                            const retryController = new AbortController();
+                            const retryTimeoutId = setTimeout(() => retryController.abort(), COPILOT_FETCH_TIMEOUT_MS);
+                            try {
+                                return await fetch(url, { ...init, headers: retryHeaders, signal: retryController.signal });
+                            }
+                            finally {
+                                clearTimeout(retryTimeoutId);
+                            }
+                        }
+                        return response;
+                    };
+                    const isClaudeModel = this.model.startsWith('claude-');
+                    if (isClaudeModel) {
+                        // Use Anthropic SDK routed through the Copilot endpoint.
+                        // baseURL must include /v1 — the SDK appends /messages, so the
+                        // final URL is https://api.githubcopilot.com/v1/messages.
+                        const anthropicProvider = (0, anthropic_1.createAnthropic)({
+                            baseURL: 'https://api.githubcopilot.com/v1',
+                            apiKey: 'unused', // required by SDK but overridden by copilotFetch
+                            fetch: copilotFetch,
+                        });
+                        this.modelInstance = anthropicProvider(this.model);
+                    }
+                    else {
+                        provider = (0, openai_1.createOpenAI)({
+                            apiKey: 'unused',
+                            baseURL: 'https://api.githubcopilot.com',
+                            fetch: copilotFetch,
+                        });
+                        this.modelInstance = provider.chat(this.model);
+                    }
+                    return; // Early return - model instance already set
+                }
                 default:
                     throw new Error(`Cannot initialize model for provider: ${this.providerType}`);
             }

package/dist/core/user-prompts-loader.d.ts

@@ -24,17 +24,65 @@ export interface UserPromptsConfig {
     cacheTtlSeconds: number;
 }
 /**
- * Cache state for tracking repository freshness
+ * Per-request override for user prompts repository.
+ * When supplied to loadUserPrompts(), bypasses DOT_AI_USER_PROMPTS_REPO env vars
+ * for that call while reusing DOT_AI_GIT_TOKEN and the cache TTL.
+ */
+export interface UserPromptsOverride {
+    repoUrl: string;
+    branch?: string;
+    subPath?: string;
+}
+/**
+ * Cache state for tracking repository freshness.
+ * Cache is invalidated when any of repoUrl, branch, or subPath changes,
+ * so we record all three on every clone.
  */
 interface CacheState {
     lastPullTime: number;
     localPath: string;
+    repoUrl: string;
+    branch: string;
+    subPath: string;
 }
 /**
  * Read user prompts configuration from environment variables
  * Returns null if DOT_AI_USER_PROMPTS_REPO is not set
  */
 export declare function getUserPromptsConfig(): UserPromptsConfig | null;
+/**
+ * Compute the `source` value the REST endpoints expose in their responses.
+ * The CLI (vfarcic/dot-ai-cli) uses this string verbatim to tag the skill
+ * files it writes, so:
+ *   - per-request override supplied  → override.repoUrl
+ *   - no override, env-var configured → DOT_AI_USER_PROMPTS_REPO
+ *   - no override, no env-var         → "built-in"
+ *
+ * URLs flow through scrubSourceUrl before returning, which scrubs BOTH:
+ *   - userinfo credentials (https://user:token@host/repo)
+ *   - credential-bearing query params (?access_token=... etc — CodeRabbit
+ *     Major A)
+ *
+ * Stability is preserved: scrubSourceUrl is deterministic (fixed `***`
+ * placeholder), so two identical credential-bearing inputs produce the same
+ * scrubbed source — keeping the CLI's "wipe only my own slice" invariant
+ * intact.
+ */
+export declare function computePromptsSource(override?: UserPromptsOverride): string;
+/**
+ * Build a UserPromptsConfig from a per-request override.
+ * Reuses DOT_AI_GIT_TOKEN and DOT_AI_USER_PROMPTS_CACHE_TTL from the environment;
+ * branch and subPath fall back to the same defaults as the env-var path.
+ *
+ * Validates the override inputs before returning:
+ *   - repoUrl scheme must be http or https (prevents file://, ssh://, etc.)
+ *   - subPath must be a relative path inside the cache directory (no '..',
+ *     no absolute, no null bytes)
+ *   - branch must match the git-safe character set used elsewhere
+ *
+ * Throws Error with a credential-scrubbed message on any validation failure.
+ */
+export declare function getUserPromptsConfigFromOverride(override: UserPromptsOverride): UserPromptsConfig;
 /**
  * Get the cache directory for user prompts
  * Tries project-relative tmp first, falls back to system temp
@@ -45,10 +93,28 @@ export declare function getCacheDirectory(): string;
  */
 export declare function sanitizeUrlForLogging(url: string): string;
 /**
- * Load user prompts from the configured git repository
- * Returns empty array if not configured or on error
+ * Source-only deep scrub for URLs that flow into the response body and the
+ * on-disk skill frontmatter the CLI writes (PRD #581 / CodeRabbit Major A).
+ *
+ * In addition to the userinfo scrub from sanitizeUrlForLogging, redacts the
+ * VALUES of query parameters whose names look credential-bearing (token, key,
+ * secret, password, auth, credential — case-insensitive). The placeholder is
+ * a fixed string so the output is deterministic — same input always produces
+ * the same source, preserving the CLI's "tag-and-wipe-by-source" invariant.
+ *
+ * Scope: ONLY called from computePromptsSource. NOT a general-purpose
+ * replacement for sanitizeUrlForLogging — the broader hygiene of the shared
+ * helper was deferred per the M2 follow-up scope.
+ */
+export declare function scrubSourceUrl(url: string): string;
+/**
+ * Load user prompts from a git repository.
+ *
+ * When `override` is supplied, fetches from that repository for this call only,
+ * ignoring DOT_AI_USER_PROMPTS_REPO env vars. Otherwise, uses env-var configuration.
+ * Returns empty array if not configured or on error.
  */
-export declare function loadUserPrompts(logger: Logger, forceRefresh?: boolean): Promise<Prompt[]>;
+export declare function loadUserPrompts(logger: Logger, forceRefresh?: boolean, override?: UserPromptsOverride): Promise<Prompt[]>;
 /**
  * Clear the cache state (useful for testing)
  */

package/dist/core/user-prompts-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-prompts-loader.d.ts","sourceRoot":"","sources":["../../src/core/user-prompts-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAA8B,MAAM,kBAAkB,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,UAAU,UAAU;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAKD;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,GAAG,IAAI,CAsB/D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAqB1C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUzD;AAgOD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CA4FnB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAED;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,UAAU,GAAG,IAAI,CAE5D"}
+{"version":3,"file":"user-prompts-loader.d.ts","sourceRoot":"","sources":["../../src/core/user-prompts-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAO1C,OAAO,EAAE,MAAM,EAA8B,MAAM,kBAAkB,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,UAAU,UAAU;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAKD;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,GAAG,IAAI,CAsB/D;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAS3E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,mBAAmB,GAC5B,iBAAiB,CAkDnB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAqB1C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUzD;AAQD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAoBlD;AA2PD;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,YAAY,GAAE,OAAe,EAC7B,QAAQ,CAAC,EAAE,mBAAmB,GAC7B,OAAO,CAAC,MAAM,EAAE,CAAC,CA0HnB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAED;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,UAAU,GAAG,IAAI,CAE5D"}

package/dist/core/user-prompts-loader.js

@@ -47,8 +47,11 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserPromptsConfig = getUserPromptsConfig;
+exports.computePromptsSource = computePromptsSource;
+exports.getUserPromptsConfigFromOverride = getUserPromptsConfigFromOverride;
 exports.getCacheDirectory = getCacheDirectory;
 exports.sanitizeUrlForLogging = sanitizeUrlForLogging;
+exports.scrubSourceUrl = scrubSourceUrl;
 exports.loadUserPrompts = loadUserPrompts;
 exports.clearUserPromptsCache = clearUserPromptsCache;
 exports.getUserPromptsCacheState = getUserPromptsCacheState;
@@ -79,6 +82,88 @@ function getUserPromptsConfig() {
         cacheTtlSeconds,
     };
 }
+/**
+ * Compute the `source` value the REST endpoints expose in their responses.
+ * The CLI (vfarcic/dot-ai-cli) uses this string verbatim to tag the skill
+ * files it writes, so:
+ *   - per-request override supplied  → override.repoUrl
+ *   - no override, env-var configured → DOT_AI_USER_PROMPTS_REPO
+ *   - no override, no env-var         → "built-in"
+ *
+ * URLs flow through scrubSourceUrl before returning, which scrubs BOTH:
+ *   - userinfo credentials (https://user:token@host/repo)
+ *   - credential-bearing query params (?access_token=... etc — CodeRabbit
+ *     Major A)
+ *
+ * Stability is preserved: scrubSourceUrl is deterministic (fixed `***`
+ * placeholder), so two identical credential-bearing inputs produce the same
+ * scrubbed source — keeping the CLI's "wipe only my own slice" invariant
+ * intact.
+ */
+function computePromptsSource(override) {
+    if (override?.repoUrl) {
+        return scrubSourceUrl(override.repoUrl);
+    }
+    const envRepo = process.env.DOT_AI_USER_PROMPTS_REPO;
+    if (envRepo) {
+        return scrubSourceUrl(envRepo);
+    }
+    return 'built-in';
+}
+/**
+ * Build a UserPromptsConfig from a per-request override.
+ * Reuses DOT_AI_GIT_TOKEN and DOT_AI_USER_PROMPTS_CACHE_TTL from the environment;
+ * branch and subPath fall back to the same defaults as the env-var path.
+ *
+ * Validates the override inputs before returning:
+ *   - repoUrl scheme must be http or https (prevents file://, ssh://, etc.)
+ *   - subPath must be a relative path inside the cache directory (no '..',
+ *     no absolute, no null bytes)
+ *   - branch must match the git-safe character set used elsewhere
+ *
+ * Throws Error with a credential-scrubbed message on any validation failure.
+ */
+function getUserPromptsConfigFromOverride(override) {
+    // F1: repoUrl scheme must be http/https
+    let parsedUrl;
+    try {
+        parsedUrl = new URL(override.repoUrl);
+    }
+    catch {
+        throw new Error(`Invalid override repoUrl: ${sanitizeUrlForLogging(override.repoUrl)} (failed to parse)`);
+    }
+    if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+        throw new Error(`Invalid override repoUrl scheme: ${parsedUrl.protocol} (only http and https are allowed) for ${sanitizeUrlForLogging(override.repoUrl)}`);
+    }
+    // F2: subPath must be a safe relative path
+    let normalizedSubPath = '';
+    if (override.subPath) {
+        if (override.subPath.includes('\0')) {
+            throw new Error('Invalid override subPath: contains null byte');
+        }
+        try {
+            normalizedSubPath = (0, git_utils_1.sanitizeRelativePath)(override.subPath);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : 'Unknown error';
+            throw new Error(`Invalid override subPath: ${message}`, { cause: error });
+        }
+    }
+    // F3: branch (if supplied) must match the git-safe character set
+    const branch = override.branch || 'main';
+    if (override.branch !== undefined && !isValidGitBranch(override.branch)) {
+        throw new Error(`Invalid override branch name: ${override.branch}`);
+    }
+    const parsedTtl = parseInt(process.env.DOT_AI_USER_PROMPTS_CACHE_TTL || '86400', 10);
+    const cacheTtlSeconds = Number.isNaN(parsedTtl) || parsedTtl < 0 ? 86400 : parsedTtl;
+    return {
+        repoUrl: override.repoUrl,
+        branch,
+        subPath: normalizedSubPath,
+        gitToken: process.env.DOT_AI_GIT_TOKEN,
+        cacheTtlSeconds,
+    };
+}
 /**
  * Get the cache directory for user prompts
  * Tries project-relative tmp first, falls back to system temp
@@ -120,6 +205,47 @@ function sanitizeUrlForLogging(url) {
         return url.replace(/\/\/[^@]+@/, '//***@');
     }
 }
+/**
+ * Query-param names whose values look credential-bearing. Conservative
+ * allowlist-on-redaction — case-insensitive substring match.
+ */
+const CREDENTIAL_PARAM_RE = /token|key|secret|password|auth|credential/i;
+/**
+ * Source-only deep scrub for URLs that flow into the response body and the
+ * on-disk skill frontmatter the CLI writes (PRD #581 / CodeRabbit Major A).
+ *
+ * In addition to the userinfo scrub from sanitizeUrlForLogging, redacts the
+ * VALUES of query parameters whose names look credential-bearing (token, key,
+ * secret, password, auth, credential — case-insensitive). The placeholder is
+ * a fixed string so the output is deterministic — same input always produces
+ * the same source, preserving the CLI's "tag-and-wipe-by-source" invariant.
+ *
+ * Scope: ONLY called from computePromptsSource. NOT a general-purpose
+ * replacement for sanitizeUrlForLogging — the broader hygiene of the shared
+ * helper was deferred per the M2 follow-up scope.
+ */
+function scrubSourceUrl(url) {
+    // Userinfo scrub first; this also handles "//user:pass@" via the regex
+    // fallback when URL parsing fails.
+    const userinfoScrubbed = sanitizeUrlForLogging(url);
+    try {
+        const parsed = new URL(userinfoScrubbed);
+        let mutated = false;
+        for (const name of [...parsed.searchParams.keys()]) {
+            if (CREDENTIAL_PARAM_RE.test(name)) {
+                parsed.searchParams.set(name, '***');
+                mutated = true;
+            }
+        }
+        return mutated ? parsed.toString() : userinfoScrubbed;
+    }
+    catch {
+        // Unparseable; return the userinfo-scrubbed form unchanged. Query-param
+        // scrubbing on unparseable URLs is meaningless — there's no reliable
+        // boundary to walk.
+        return userinfoScrubbed;
+    }
+}
 /**
  * Validate git branch name to prevent command injection
  * Allows alphanumeric characters, hyphens, underscores, slashes, and dots
@@ -207,11 +333,34 @@ async function ensureRepository(config, logger, forceRefresh = false) {
     const localPath = getCacheDirectory();
     const now = Date.now();
     const ttlMs = config.cacheTtlSeconds * 1000;
-    // Check if we need to clone or pull
-    if (!cacheState || !fs.existsSync(cacheState.localPath)) {
-        // First time or cache directory was deleted - clone
+    // Check if we need to clone or pull. The cache is invalidated when any of
+    // (repoUrl, branch, subPath) differs from the cached entry so that, for
+    // example, a future override with a different branch but the same repoUrl
+    // won't serve stale content from the previous clone.
+    const cacheMisses = cacheState !== null &&
+        (cacheState.repoUrl !== config.repoUrl ||
+            cacheState.branch !== config.branch ||
+            cacheState.subPath !== config.subPath);
+    if (!cacheState || !fs.existsSync(cacheState.localPath) || cacheMisses) {
+        // First time, cache directory deleted, or cached coordinates differ - clone fresh
+        if (cacheMisses) {
+            logger.debug('Cached repo coordinates differ from requested, re-cloning', {
+                cachedUrl: sanitizeUrlForLogging(cacheState.repoUrl),
+                cachedBranch: cacheState.branch,
+                cachedSubPath: cacheState.subPath,
+                requestedUrl: sanitizeUrlForLogging(config.repoUrl),
+                requestedBranch: config.branch,
+                requestedSubPath: config.subPath,
+            });
+        }
         await cloneRepository(config, localPath, logger);
-        cacheState = { lastPullTime: now, localPath };
+        cacheState = {
+            lastPullTime: now,
+            localPath,
+            repoUrl: config.repoUrl,
+            branch: config.branch,
+            subPath: config.subPath,
+        };
     }
     else if (forceRefresh || now - cacheState.lastPullTime >= ttlMs) {
         // Cache expired or force refresh - pull
@@ -283,11 +432,28 @@ function loadSkillFolder(dirPath, dirName, logger) {
     return prompt;
 }
 /**
- * Load user prompts from the configured git repository
- * Returns empty array if not configured or on error
+ * Load user prompts from a git repository.
+ *
+ * When `override` is supplied, fetches from that repository for this call only,
+ * ignoring DOT_AI_USER_PROMPTS_REPO env vars. Otherwise, uses env-var configuration.
+ * Returns empty array if not configured or on error.
  */
-async function loadUserPrompts(logger, forceRefresh = false) {
-    const config = getUserPromptsConfig();
+async function loadUserPrompts(logger, forceRefresh = false, override) {
+    let config;
+    try {
+        // Override validation can throw on bad scheme / traversal / branch — keep
+        // the call inside the catch so a malformed per-request override returns
+        // [] rather than propagating an exception to the caller.
+        config = override
+            ? getUserPromptsConfigFromOverride(override)
+            : getUserPromptsConfig();
+    }
+    catch (error) {
+        const rawMessage = error instanceof Error ? error.message : 'Unknown error';
+        const safeMessage = (0, git_utils_1.scrubCredentials)(rawMessage);
+        logger.error('Failed to load user prompts, falling back to built-in only', new Error(safeMessage));
+        return [];
+    }
     if (!config) {
         logger.debug('User prompts not configured (DOT_AI_USER_PROMPTS_REPO not set)');
         return [];
@@ -313,7 +479,10 @@ async function loadUserPrompts(logger, forceRefresh = false) {
                 const prompt = (0, prompts_1.loadPromptFile)(filePath, 'user');
                 prompts.push(prompt);
                 loadedNames.add(prompt.name);
-                logger.debug('Loaded user prompt', { name: prompt.name, file: entry.name });
+                logger.debug('Loaded user prompt', {
+                    name: prompt.name,
+                    file: entry.name,
+                });
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : 'Unknown error';
@@ -361,8 +530,13 @@ async function loadUserPrompts(logger, forceRefresh = false) {
         return prompts;
     }
     catch (error) {
-        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-        logger.error('Failed to load user prompts, falling back to built-in only', new Error(errorMessage));
+        // F5: scrub credentials before they reach loggers/callers. Underlying git
+        // errors can echo the authenticated URL (with embedded token) verbatim.
+        const rawMessage = error instanceof Error ? error.message : 'Unknown error';
+        const safeMessage = (0, git_utils_1.scrubCredentials)(config.gitToken
+            ? rawMessage.replaceAll(config.gitToken, '***')
+            : rawMessage);
+        logger.error('Failed to load user prompts, falling back to built-in only', new Error(safeMessage));
         return [];
     }
 }

package/dist/interfaces/rest-api.d.ts

@@ -10,6 +10,27 @@ import { RestRouteRegistry } from './rest-route-registry';
 import { Logger } from '../core/error-handling';
 import { DotAI } from '../core/index';
 import { PluginManager } from '../core/plugin-manager';
+/**
+ * Constant placeholder used when the request URL fails to parse and the
+ * caller would otherwise have to choose between logging a potentially
+ * credential-bearing query string or dropping the request log entirely. A
+ * stable string keeps log-grepping useful.
+ */
+export declare const UNPARSEABLE_QUERY_PLACEHOLDER = "?<redacted-unparseable>";
+/**
+ * F3: req.url is logged on every request; with PRD #581 the query string may
+ * carry `?repo=<user-supplied-url>` whose value can include credentials. This
+ * helper rewrites the `repo` value to its credential-scrubbed form so the
+ * raw token doesn't reach the log. Everything else is preserved verbatim.
+ *
+ * CodeRabbit Major B: on parse failure, we no longer return the input
+ * verbatim — an unparseable URL is more likely than a parseable one to hide
+ * a credential (a stray character may have broken the parse). Instead, keep
+ * the pathname (so the log still tells you which endpoint was hit) but
+ * REDACT the entire query string with a fixed placeholder. URLs without a
+ * '?' are pass-through (no risk).
+ */
+export declare function sanitizeRequestUrlForLogging(url: string | undefined): string | undefined;
 /**
  * HTTP status codes for REST responses
  */
@@ -212,6 +233,18 @@ export declare class RestApiRouter {
      * Returns container logs for a pod
      */
     private handleGetLogs;
+    /**
+     * Extract and validate the per-request `repo` override (PRD #581).
+     *
+     * Returns:
+     *   - { ok: true, override }    when no repo param is supplied, override is undefined.
+     *   - { ok: true, override }    when a syntactically valid override URL is supplied.
+     *   - { ok: false, message }    when the override fails validation (HTTP 400).
+     *
+     * The validation message is run through scrubCredentials so embedded tokens
+     * never reach the wire response.
+     */
+    private extractPromptsOverride;
     /**
      * Handle prompts list requests
      */
@@ -221,7 +254,7 @@ export declare class RestApiRouter {
      */
     private handlePromptsGetRequest;
     /**
-     * Handle prompts cache refresh requests (PRD #386)
+     * Handle prompts cache refresh requests (PRD #386, extended PRD #581)
      */
     private handlePromptsCacheRefresh;
     /**

package/dist/interfaces/rest-api.d.ts.map

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

package/dist/interfaces/rest-api.js

@@ -39,7 +39,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestApiRouter = exports.HttpStatus = void 0;
+exports.RestApiRouter = exports.HttpStatus = exports.UNPARSEABLE_QUERY_PLACEHOLDER = void 0;
+exports.sanitizeRequestUrlForLogging = sanitizeRequestUrlForLogging;
 const node_url_1 = require("node:url");
 const openapi_generator_1 = require("./openapi-generator");
 const rest_route_registry_1 = require("./rest-route-registry");
@@ -47,6 +48,8 @@ const routes_1 = require("./routes");
 const resource_sync_handler_1 = require("./resource-sync-handler");
 const embedding_migration_handler_1 = require("./embedding-migration-handler");
 const prompts_1 = require("../tools/prompts");
+const user_prompts_loader_1 = require("../core/user-prompts-loader");
+const git_utils_1 = require("../core/git-utils");
 const generic_session_manager_1 = require("../core/generic-session-manager");
 const session_events_1 = require("../core/session-events");
 const shared_prompt_loader_1 = require("../core/shared-prompt-loader");
@@ -60,6 +63,51 @@ const manage_knowledge_1 = require("../tools/manage-knowledge");
 const user_management_1 = require("./oauth/user-management");
 const request_context_1 = require("./request-context");
 const rbac_1 = require("../core/rbac");
+/**
+ * Constant placeholder used when the request URL fails to parse and the
+ * caller would otherwise have to choose between logging a potentially
+ * credential-bearing query string or dropping the request log entirely. A
+ * stable string keeps log-grepping useful.
+ */
+exports.UNPARSEABLE_QUERY_PLACEHOLDER = '?<redacted-unparseable>';
+/**
+ * F3: req.url is logged on every request; with PRD #581 the query string may
+ * carry `?repo=<user-supplied-url>` whose value can include credentials. This
+ * helper rewrites the `repo` value to its credential-scrubbed form so the
+ * raw token doesn't reach the log. Everything else is preserved verbatim.
+ *
+ * CodeRabbit Major B: on parse failure, we no longer return the input
+ * verbatim — an unparseable URL is more likely than a parseable one to hide
+ * a credential (a stray character may have broken the parse). Instead, keep
+ * the pathname (so the log still tells you which endpoint was hit) but
+ * REDACT the entire query string with a fixed placeholder. URLs without a
+ * '?' are pass-through (no risk).
+ */
+function sanitizeRequestUrlForLogging(url) {
+    if (!url)
+        return url;
+    if (!url.includes('repo='))
+        return url;
+    try {
+        // req.url is path-relative; provide a dummy base for URL parsing.
+        const parsed = new node_url_1.URL(url, 'http://internal.invalid');
+        const repo = parsed.searchParams.get('repo');
+        if (repo) {
+            parsed.searchParams.set('repo', (0, user_prompts_loader_1.sanitizeUrlForLogging)(repo));
+        }
+        // Return path + search only (drop the dummy base).
+        return parsed.pathname + parsed.search + parsed.hash;
+    }
+    catch {
+        // F3/Major B: don't echo a potentially credential-bearing query string
+        // we couldn't parse. Keep the path (useful for log triage) and replace
+        // the rest with a constant marker.
+        const qIdx = url.indexOf('?');
+        if (qIdx === -1)
+            return url;
+        return url.slice(0, qIdx) + exports.UNPARSEABLE_QUERY_PLACEHOLDER;
+    }
+}
 /**
  * HTTP status codes for REST responses
  */
@@ -122,7 +170,10 @@ class RestApiRouter {
             this.logger.debug('REST API request received', {
                 requestId,
                 method: req.method,
-                url: req.url,
+                // F3: req.url may carry a `?repo=<user-supplied-url>` whose query
+                // value includes credentials (PRD #581). Sanitize that single
+                // value before logging.
+                url: sanitizeRequestUrlForLogging(req.url),
                 hasBody: !!body,
             });
             // Handle CORS preflight
@@ -192,9 +243,9 @@ class RestApiRouter {
             'GET:/api/v1/namespaces': () => this.handleGetNamespaces(req, res, requestId),
             'GET:/api/v1/events': () => this.handleGetEvents(req, res, requestId, searchParams),
             'GET:/api/v1/logs': () => this.handleGetLogs(req, res, requestId, searchParams),
-            'GET:/api/v1/prompts': () => this.handlePromptsListRequest(req, res, requestId),
-            'POST:/api/v1/prompts/refresh': () => this.handlePromptsCacheRefresh(req, res, requestId),
-            'POST:/api/v1/prompts/:promptName': () => this.handlePromptsGetRequest(req, res, requestId, params.promptName, body),
+            'GET:/api/v1/prompts': () => this.handlePromptsListRequest(req, res, requestId, searchParams),
+            'POST:/api/v1/prompts/refresh': () => this.handlePromptsCacheRefresh(req, res, requestId, body),
+            'POST:/api/v1/prompts/:promptName': () => this.handlePromptsGetRequest(req, res, requestId, params.promptName, body, searchParams),
             'GET:/api/v1/visualize/:sessionId': () => this.handleVisualize(req, res, requestId, params.sessionId, searchParams),
             'GET:/api/v1/events/remediations': () => this.handleRemediationSSE(req, res, requestId),
             'GET:/api/v1/sessions': () => this.handleListSessions(req, res, requestId, searchParams),
@@ -1035,13 +1086,58 @@ class RestApiRouter {
             await this.sendErrorResponse(res, requestId, HttpStatus.INTERNAL_SERVER_ERROR, 'LOGS_ERROR', 'Failed to retrieve logs', { error: errorMessage });
         }
     }
+    /**
+     * Extract and validate the per-request `repo` override (PRD #581).
+     *
+     * Returns:
+     *   - { ok: true, override }    when no repo param is supplied, override is undefined.
+     *   - { ok: true, override }    when a syntactically valid override URL is supplied.
+     *   - { ok: false, message }    when the override fails validation (HTTP 400).
+     *
+     * The validation message is run through scrubCredentials so embedded tokens
+     * never reach the wire response.
+     */
+    extractPromptsOverride(repoParam) {
+        // Treat absent (null/undefined) as no override.
+        if (repoParam === undefined || repoParam === null) {
+            return { ok: true, override: undefined };
+        }
+        // The wire contract says `repo` is a string. Anything else (array,
+        // number, object, boolean) is a 400 — otherwise downstream code
+        // would crash to a 500.
+        if (typeof repoParam !== 'string') {
+            return {
+                ok: false,
+                message: `repo must be a string (got ${Array.isArray(repoParam) ? 'array' : typeof repoParam})`,
+            };
+        }
+        const trimmed = repoParam.trim();
+        if (!trimmed) {
+            return { ok: true, override: undefined };
+        }
+        const candidate = { repoUrl: trimmed };
+        try {
+            // Throws on invalid scheme / subPath / branch.
+            (0, user_prompts_loader_1.getUserPromptsConfigFromOverride)(candidate);
+            return { ok: true, override: candidate };
+        }
+        catch (error) {
+            const raw = error instanceof Error ? error.message : 'Invalid override';
+            return { ok: false, message: (0, git_utils_1.scrubCredentials)(raw) };
+        }
+    }
     /**
      * Handle prompts list requests
      */
-    async handlePromptsListRequest(req, res, requestId) {
+    async handlePromptsListRequest(req, res, requestId, searchParams) {
         try {
             this.logger.info('Processing prompts list request', { requestId });
-            const result = await (0, prompts_1.handlePromptsListRequest)({}, this.logger, requestId);
+            const overrideResult = this.extractPromptsOverride(searchParams.get('repo'));
+            if (!overrideResult.ok) {
+                await this.sendErrorResponse(res, requestId, HttpStatus.BAD_REQUEST, 'VALIDATION_ERROR', overrideResult.message);
+                return;
+            }
+            const result = await (0, prompts_1.handlePromptsListRequest)({}, this.logger, requestId, overrideResult.override);
             const response = {
                 success: true,
                 data: result,
@@ -1067,14 +1163,19 @@ class RestApiRouter {
     /**
      * Handle prompt get requests
      */
-    async handlePromptsGetRequest(req, res, requestId, promptName, body) {
+    async handlePromptsGetRequest(req, res, requestId, promptName, body, searchParams) {
         try {
             this.logger.info('Processing prompt get request', {
                 requestId,
                 promptName,
             });
+            const overrideResult = this.extractPromptsOverride(searchParams.get('repo'));
+            if (!overrideResult.ok) {
+                await this.sendErrorResponse(res, requestId, HttpStatus.BAD_REQUEST, 'VALIDATION_ERROR', overrideResult.message);
+                return;
+            }
             const bodyObj = body;
-            const result = await (0, prompts_1.handlePromptsGetRequest)({ name: promptName, arguments: bodyObj?.arguments }, this.logger, requestId);
+            const result = await (0, prompts_1.handlePromptsGetRequest)({ name: promptName, arguments: bodyObj?.arguments }, this.logger, requestId, overrideResult.override);
             const response = {
                 success: true,
                 data: result,
@@ -1105,16 +1206,23 @@ class RestApiRouter {
         }
     }
     /**
-     * Handle prompts cache refresh requests (PRD #386)
+     * Handle prompts cache refresh requests (PRD #386, extended PRD #581)
      */
-    async handlePromptsCacheRefresh(req, res, requestId) {
+    async handlePromptsCacheRefresh(req, res, requestId, body) {
         try {
             this.logger.info('Processing prompts cache refresh request', {
                 requestId,
             });
-            const prompts = await (0, prompts_1.loadAllPrompts)(this.logger, undefined, true);
-            const hasUserPromptsRepo = !!process.env.DOT_AI_USER_PROMPTS_REPO;
-            const source = hasUserPromptsRepo ? 'built-in+repository' : 'built-in';
+            // body.repo type is checked inside extractPromptsOverride (it accepts
+            // unknown and rejects non-string values with 400 — see F2).
+            const bodyObj = body;
+            const overrideResult = this.extractPromptsOverride(bodyObj?.repo);
+            if (!overrideResult.ok) {
+                await this.sendErrorResponse(res, requestId, HttpStatus.BAD_REQUEST, 'VALIDATION_ERROR', overrideResult.message);
+                return;
+            }
+            const prompts = await (0, prompts_1.loadAllPrompts)(this.logger, undefined, true, overrideResult.override);
+            const source = (0, user_prompts_loader_1.computePromptsSource)(overrideResult.override);
             const response = {
                 success: true,
                 data: {
@@ -1419,7 +1527,12 @@ class RestApiRouter {
             const status = searchParams.get('status') || undefined;
             const limit = Math.min(Math.max(parseInt(searchParams.get('limit') || '50', 10) || 50, 1), 200);
             const offset = Math.max(parseInt(searchParams.get('offset') || '0', 10) || 0, 0);
-            this.logger.info('Listing sessions', { requestId, status, limit, offset });
+            this.logger.info('Listing sessions', {
+                requestId,
+                status,
+                limit,
+                offset,
+            });
             const sessionManager = new generic_session_manager_1.GenericSessionManager('rem');
             const sessionIds = sessionManager.listSessions();
             // Load all sessions and build summaries
@@ -1482,7 +1595,7 @@ class RestApiRouter {
         const headers = {
             'Content-Type': 'text/event-stream',
             'Cache-Control': 'no-cache',
-            'Connection': 'keep-alive',
+            Connection: 'keep-alive',
         };
         if (this.config.enableCors) {
             headers['Access-Control-Allow-Origin'] = '*';

package/dist/interfaces/schemas/prompts.d.ts

@@ -68,8 +68,8 @@ export type PromptsListResponse = z.infer<typeof PromptsListResponseSchema>;
  */
 export declare const PromptMessageSchema: z.ZodObject<{
     role: z.ZodEnum<{
-        system: "system";
         user: "user";
+        system: "system";
         assistant: "assistant";
     }>;
     content: z.ZodObject<{
@@ -94,8 +94,8 @@ export declare const PromptGetDataSchema: z.ZodObject<{
     description: z.ZodOptional<z.ZodString>;
     messages: z.ZodArray<z.ZodObject<{
         role: z.ZodEnum<{
-            system: "system";
             user: "user";
+            system: "system";
             assistant: "assistant";
         }>;
         content: z.ZodObject<{
@@ -115,8 +115,8 @@ export declare const PromptGetResponseSchema: z.ZodObject<{
         description: z.ZodOptional<z.ZodString>;
         messages: z.ZodArray<z.ZodObject<{
             role: z.ZodEnum<{
-                system: "system";
                 user: "user";
+                system: "system";
                 assistant: "assistant";
             }>;
             content: z.ZodObject<{

package/dist/tools/prompts.d.ts

@@ -42,7 +42,7 @@ export declare function mergePrompts(builtInPrompts: Prompt[], userPrompts: Prom
  * Loads all prompts (built-in + user) with collision detection
  * This is the main entry point for loading prompts
  */
-export declare function loadAllPrompts(logger: Logger, baseDir?: string, forceRefresh?: boolean): Promise<Prompt[]>;
+export declare function loadAllPrompts(logger: Logger, baseDir?: string, forceRefresh?: boolean, override?: import('../core/user-prompts-loader.js').UserPromptsOverride): Promise<Prompt[]>;
 export interface PromptsListArgs {
     baseDir?: string;
     excludeFileSkills?: boolean;
@@ -53,11 +53,16 @@ interface PromptsListResponse {
         description: string;
         arguments?: PromptArgument[];
     }>;
+    source: string;
 }
 /**
- * Handle prompts/list MCP request
+ * Handle prompts/list MCP request.
+ *
+ * The optional `override` parameter (PRD #581) is REST-only; MCP callers always
+ * pass undefined since there's no natural way for MCP to express a per-request
+ * repo override.
  */
-export declare function handlePromptsListRequest(args: PromptsListArgs | undefined, logger: Logger, requestId: string): Promise<PromptsListResponse>;
+export declare function handlePromptsListRequest(args: PromptsListArgs | undefined, logger: Logger, requestId: string, override?: import('../core/user-prompts-loader.js').UserPromptsOverride): Promise<PromptsListResponse>;
 interface PromptsGetArgs {
     name: string;
     arguments?: Record<string, string>;
@@ -73,10 +78,15 @@ interface PromptsGetResponse {
         };
     }>;
     files?: PromptFile[];
+    source: string;
 }
 /**
- * Handle prompts/get MCP request
+ * Handle prompts/get MCP request.
+ *
+ * The optional `override` parameter (PRD #581) is REST-only; MCP callers always
+ * pass undefined since there's no natural way for MCP to express a per-request
+ * repo override.
  */
-export declare function handlePromptsGetRequest(args: PromptsGetArgs, logger: Logger, requestId: string): Promise<PromptsGetResponse>;
+export declare function handlePromptsGetRequest(args: PromptsGetArgs, logger: Logger, requestId: string, override?: import('../core/user-prompts-loader.js').UserPromptsOverride): Promise<PromptsGetResponse>;
 export {};
 //# sourceMappingURL=prompts.d.ts.map

package/dist/tools/prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/tools/prompts.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQhD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7B,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;CACtB;AA8ED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,UAAU,GAAG,MAAmB,EACxC,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAyCR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAoC7E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,MAAM,GACb,MAAM,EAAE,CAmBV;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,mBAAmB;IAC3B,OAAO,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;KAC9B,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,eAAe,GAAG,SAAS,EACjC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,mBAAmB,CAAC,CAqD9B;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,kBAAkB;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC3E,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,kBAAkB,CAAC,CA6G7B"}
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/tools/prompts.ts"],"names":[],"mappings":"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"}

package/dist/tools/prompts.js

@@ -209,14 +209,16 @@ function mergePrompts(builtInPrompts, userPrompts, logger) {
  * Loads all prompts (built-in + user) with collision detection
  * This is the main entry point for loading prompts
  */
-async function loadAllPrompts(logger, baseDir, forceRefresh = false) {
+async function loadAllPrompts(logger, baseDir, forceRefresh = false, override) {
     // Load built-in prompts (synchronous)
     const builtInPrompts = loadBuiltInPrompts(logger, baseDir);
-    // Load user prompts from git repository (async, graceful failure)
+    // Load user prompts from git repository (async, graceful failure). When a
+    // per-request override is supplied (PRD #581), it replaces the env-var
+    // configured repo for this single call.
     let userPrompts = [];
     try {
         const { loadUserPrompts } = await Promise.resolve().then(() => __importStar(require('../core/user-prompts-loader.js')));
-        userPrompts = await loadUserPrompts(logger, forceRefresh);
+        userPrompts = await loadUserPrompts(logger, forceRefresh, override);
     }
     catch (error) {
         logger.debug('User prompts loader not available or failed', {
@@ -234,12 +236,16 @@ async function loadAllPrompts(logger, baseDir, forceRefresh = false) {
     return allPrompts;
 }
 /**
- * Handle prompts/list MCP request
+ * Handle prompts/list MCP request.
+ *
+ * The optional `override` parameter (PRD #581) is REST-only; MCP callers always
+ * pass undefined since there's no natural way for MCP to express a per-request
+ * repo override.
  */
-async function handlePromptsListRequest(args, logger, requestId) {
+async function handlePromptsListRequest(args, logger, requestId, override) {
     try {
         logger.info('Processing prompts/list request', { requestId });
-        const allPrompts = await loadAllPrompts(logger, process.env.NODE_ENV === 'test' ? args?.baseDir : undefined);
+        const allPrompts = await loadAllPrompts(logger, process.env.NODE_ENV === 'test' ? args?.baseDir : undefined, false, override);
         // Filter out file-dependent skills when requested (MCP clients can't deliver files)
         const prompts = args?.excludeFileSkills
             ? allPrompts.filter(p => !p.files || p.files.length === 0)
@@ -259,8 +265,10 @@ async function handlePromptsListRequest(args, logger, requestId) {
             requestId,
             promptCount: promptList.length,
         });
+        const { computePromptsSource } = await Promise.resolve().then(() => __importStar(require('../core/user-prompts-loader.js')));
         return {
             prompts: promptList,
+            source: computePromptsSource(override),
         };
     }
     catch (error) {
@@ -274,9 +282,13 @@ async function handlePromptsListRequest(args, logger, requestId) {
     }
 }
 /**
- * Handle prompts/get MCP request
+ * Handle prompts/get MCP request.
+ *
+ * The optional `override` parameter (PRD #581) is REST-only; MCP callers always
+ * pass undefined since there's no natural way for MCP to express a per-request
+ * repo override.
  */
-async function handlePromptsGetRequest(args, logger, requestId) {
+async function handlePromptsGetRequest(args, logger, requestId, override) {
     try {
         logger.info('Processing prompts/get request', {
             requestId,
@@ -285,7 +297,7 @@ async function handlePromptsGetRequest(args, logger, requestId) {
         if (!args.name) {
             throw new Error(validation_1.VALIDATION_MESSAGES.MISSING_PARAMETER('name'));
         }
-        const prompts = await loadAllPrompts(logger, process.env.NODE_ENV === 'test' ? args?.baseDir : undefined);
+        const prompts = await loadAllPrompts(logger, process.env.NODE_ENV === 'test' ? args?.baseDir : undefined, false, override);
         const prompt = prompts.find(p => p.name === args.name);
         if (!prompt) {
             throw error_handling_1.ErrorHandler.createError(error_handling_1.ErrorCategory.VALIDATION, error_handling_1.ErrorSeverity.MEDIUM, `Prompt not found: ${args.name}`, {
@@ -322,6 +334,7 @@ async function handlePromptsGetRequest(args, logger, requestId) {
             promptName: prompt.name,
             argumentsProvided: Object.keys(providedArgs).length,
         });
+        const { computePromptsSource } = await Promise.resolve().then(() => __importStar(require('../core/user-prompts-loader.js')));
         // Convert to MCP prompts/get response format
         const response = {
             description: prompt.description,
@@ -334,6 +347,7 @@ async function handlePromptsGetRequest(args, logger, requestId) {
                     },
                 },
             ],
+            source: computePromptsSource(override),
         };
         if (prompt.files && prompt.files.length > 0) {
             response.files = prompt.files;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vfarcic/dot-ai",
-  "version": "1.19.1",
+  "version": "1.21.0",
   "description": "AI-powered development productivity platform that enhances software development workflows through intelligent automation and AI-driven assistance",
   "mcpName": "io.github.vfarcic/dot-ai",
   "main": "dist/index.js",
@@ -101,6 +101,7 @@
     "globals": "^17.2.0",
     "prettier": "^3.0.0",
     "ts-node": "^10.9.0",
+    "tsx": "^4.22.3",
     "typescript": "^5.0.0",
     "typescript-eslint": "^8.54.0",
     "uuid": "^14.0.0",