@jterrats/open-orchestra 1.1.2 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +14 -1
- package/CHANGELOG.md +48 -0
- package/CLAUDE.md +14 -1
- package/README.md +21 -6
- package/dist/autonomous-phase-lifecycle.js +52 -2
- package/dist/autonomous-phase-lifecycle.js.map +1 -1
- package/dist/autonomous-run-state.d.ts +3 -1
- package/dist/autonomous-run-state.js +28 -2
- package/dist/autonomous-run-state.js.map +1 -1
- package/dist/autonomous-run-store.js +9 -0
- package/dist/autonomous-run-store.js.map +1 -1
- package/dist/benchmark.js +54 -6
- package/dist/benchmark.js.map +1 -1
- package/dist/capability-commands.d.ts +2 -0
- package/dist/capability-commands.js +82 -0
- package/dist/capability-commands.js.map +1 -0
- package/dist/capture-commands.d.ts +16 -0
- package/dist/capture-commands.js +70 -0
- package/dist/capture-commands.js.map +1 -0
- package/dist/cli-capability-catalog.d.ts +10 -0
- package/dist/cli-capability-catalog.js +110 -0
- package/dist/cli-capability-catalog.js.map +1 -0
- package/dist/cli-capability-data.d.ts +2 -0
- package/dist/cli-capability-data.js +233 -0
- package/dist/cli-capability-data.js.map +1 -0
- package/dist/cli-capability-renderer.d.ts +2 -0
- package/dist/cli-capability-renderer.js +43 -0
- package/dist/cli-capability-renderer.js.map +1 -0
- package/dist/cli-capability-types.d.ts +30 -0
- package/dist/cli-capability-types.js +2 -0
- package/dist/cli-capability-types.js.map +1 -0
- package/dist/command-manifest.js +11 -5
- package/dist/command-manifest.js.map +1 -1
- package/dist/command-routes-integrations.js +2 -1
- package/dist/command-routes-integrations.js.map +1 -1
- package/dist/command-routes.js +8 -1
- package/dist/command-routes.js.map +1 -1
- package/dist/commands.d.ts +4 -2
- package/dist/commands.js +7 -2
- package/dist/commands.js.map +1 -1
- package/dist/constants.js +2 -0
- package/dist/constants.js.map +1 -1
- package/dist/delivery-commands.js +1 -0
- package/dist/delivery-commands.js.map +1 -1
- package/dist/delivery-dashboard-charts.js +7 -3
- package/dist/delivery-dashboard-charts.js.map +1 -1
- package/dist/delivery-dashboard-types.d.ts +4 -0
- package/dist/delivery-dashboard.js +6 -0
- package/dist/delivery-dashboard.js.map +1 -1
- package/dist/effort-classification.d.ts +1 -0
- package/dist/effort-classification.js +15 -0
- package/dist/effort-classification.js.map +1 -1
- package/dist/fs-utils.js +6 -5
- package/dist/fs-utils.js.map +1 -1
- package/dist/mcp-integrations.d.ts +9 -2
- package/dist/mcp-integrations.js +50 -13
- package/dist/mcp-integrations.js.map +1 -1
- package/dist/mcp-oauth-proxy.d.ts +8 -0
- package/dist/mcp-oauth-proxy.js +25 -0
- package/dist/mcp-oauth-proxy.js.map +1 -1
- package/dist/mcp-runtime-config.d.ts +55 -0
- package/dist/mcp-runtime-config.js +252 -0
- package/dist/mcp-runtime-config.js.map +1 -0
- package/dist/mcp-tool-adapter.js +2 -4
- package/dist/mcp-tool-adapter.js.map +1 -1
- package/dist/model-providers.d.ts +1 -1
- package/dist/model-providers.js +1 -1
- package/dist/model-providers.js.map +1 -1
- package/dist/ollama-provider.d.ts +7 -0
- package/dist/ollama-provider.js +41 -15
- package/dist/ollama-provider.js.map +1 -1
- package/dist/phase-playbooks.js +17 -0
- package/dist/phase-playbooks.js.map +1 -1
- package/dist/planning-commands.js +5 -0
- package/dist/planning-commands.js.map +1 -1
- package/dist/qa-evidence-validation.d.ts +1 -1
- package/dist/qa-evidence-validation.js +3 -1
- package/dist/qa-evidence-validation.js.map +1 -1
- package/dist/quality-contracts.js +1 -1
- package/dist/quality-contracts.js.map +1 -1
- package/dist/release-inclusion.js +1 -1
- package/dist/release-inclusion.js.map +1 -1
- package/dist/runtime-bootstrap.js +13 -0
- package/dist/runtime-bootstrap.js.map +1 -1
- package/dist/runtime-child-prompt.js +25 -0
- package/dist/runtime-child-prompt.js.map +1 -1
- package/dist/runtime-commands.d.ts +3 -0
- package/dist/runtime-commands.js +96 -0
- package/dist/runtime-commands.js.map +1 -1
- package/dist/runtime-events.d.ts +48 -0
- package/dist/runtime-events.js +255 -0
- package/dist/runtime-events.js.map +1 -0
- package/dist/runtime-execution-renderer.js +8 -0
- package/dist/runtime-execution-renderer.js.map +1 -1
- package/dist/runtime-parent-actions.js +3 -0
- package/dist/runtime-parent-actions.js.map +1 -1
- package/dist/runtime-spawn-bridge.js +15 -5
- package/dist/runtime-spawn-bridge.js.map +1 -1
- package/dist/sonar-preflight.js +21 -1
- package/dist/sonar-preflight.js.map +1 -1
- package/dist/sprint-metrics.js +7 -1
- package/dist/sprint-metrics.js.map +1 -1
- package/dist/task-graph-commands.js +48 -0
- package/dist/task-graph-commands.js.map +1 -1
- package/dist/tool-commands.d.ts +1 -0
- package/dist/tool-commands.js +129 -14
- package/dist/tool-commands.js.map +1 -1
- package/dist/types/metrics.d.ts +5 -1
- package/dist/types/runtime.d.ts +3 -0
- package/dist/types/tasks.d.ts +24 -1
- package/dist/types/workflow-run.d.ts +16 -0
- package/dist/types.d.ts +5 -3
- package/dist/types.js.map +1 -1
- package/dist/validation.js +6 -0
- package/dist/validation.js.map +1 -1
- package/dist/verifier-contracts.d.ts +29 -0
- package/dist/verifier-contracts.js +184 -0
- package/dist/verifier-contracts.js.map +1 -0
- package/dist/web-api-read-routes.d.ts +1 -0
- package/dist/web-api-read-routes.js +6 -1
- package/dist/web-api-read-routes.js.map +1 -1
- package/dist/web-api.js +58 -1
- package/dist/web-api.js.map +1 -1
- package/dist/web-console/assets/index-Cip-y4WE.css +1 -0
- package/dist/web-console/assets/index-CuWjFxss.js +11 -0
- package/dist/web-console/index.html +2 -2
- package/dist/workflow-approval-service.js +36 -2
- package/dist/workflow-approval-service.js.map +1 -1
- package/dist/workflow-continuation-policy.d.ts +3 -0
- package/dist/workflow-continuation-policy.js +20 -0
- package/dist/workflow-continuation-policy.js.map +1 -0
- package/dist/workflow-correction-context.d.ts +30 -0
- package/dist/workflow-correction-context.js +117 -0
- package/dist/workflow-correction-context.js.map +1 -0
- package/dist/workflow-evidence-service.js +31 -22
- package/dist/workflow-evidence-service.js.map +1 -1
- package/dist/workflow-gates.js +6 -0
- package/dist/workflow-gates.js.map +1 -1
- package/dist/workflow-handoff-assessment.js +10 -2
- package/dist/workflow-handoff-assessment.js.map +1 -1
- package/dist/workflow-handoff-contract.d.ts +7 -0
- package/dist/workflow-handoff-contract.js +18 -0
- package/dist/workflow-handoff-contract.js.map +1 -1
- package/dist/workflow-phase-planner.js +56 -22
- package/dist/workflow-phase-planner.js.map +1 -1
- package/dist/workflow-return-routing.d.ts +14 -0
- package/dist/workflow-return-routing.js +61 -0
- package/dist/workflow-return-routing.js.map +1 -0
- package/dist/workflow-run-commands.js +173 -52
- package/dist/workflow-run-commands.js.map +1 -1
- package/dist/workflow-services.js +6 -3
- package/dist/workflow-services.js.map +1 -1
- package/dist/workflow-task-service.js +15 -7
- package/dist/workflow-task-service.js.map +1 -1
- package/docs/autonomous-workflow.md +10 -0
- package/docs/ci-self-hosted-runners.md +82 -0
- package/docs/command-contracts.md +21 -0
- package/docs/e2e-test-batteries.md +115 -25
- package/docs/runtime-adapters.md +4 -0
- package/docs/runtime-llm-flow.md +6 -3
- package/docs/security-env-vars.md +1 -0
- package/docs/sonar-quality-gates.md +19 -9
- package/docs/verifier-contracts.md +87 -0
- package/package.json +7 -3
- package/site/dist/assets/{index-Bi8l6tCE.js → index-B1Xsl_Kg.js} +1 -1
- package/site/dist/index.html +1 -1
- package/dist/web-console/assets/index--_RLc7Zp.js +0 -11
- package/dist/web-console/assets/index-Cxo3REa4.css +0 -1
package/dist/mcp-integrations.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getWorkflowConfig } from "./workflow-services.js";
|
|
2
|
+
import { listScopedMcpServerStatuses, } from "./mcp-runtime-config.js";
|
|
2
3
|
const REGISTRY = [
|
|
3
4
|
integration("lucid", "Lucid", "http", true, ["boards:read", "boards:write"], ["architect", "product_owner", "business_analyst"]),
|
|
4
5
|
integration("figma", "Figma", "http", true, ["files:read"], ["ux_ui_designer", "architect"]),
|
|
@@ -10,28 +11,64 @@ const REGISTRY = [
|
|
|
10
11
|
export function listMcpIntegrationRegistry() {
|
|
11
12
|
return REGISTRY.map((item) => ({ ...item, useCases: [...item.useCases] }));
|
|
12
13
|
}
|
|
13
|
-
export async function listMcpIntegrationStatuses(root = process.cwd()) {
|
|
14
|
+
export async function listMcpIntegrationStatuses(root = process.cwd(), options = {}) {
|
|
14
15
|
const config = await getWorkflowConfig(root);
|
|
15
|
-
const
|
|
16
|
-
|
|
16
|
+
const runtime = options.runtime ?? "generic";
|
|
17
|
+
const runtimeStatuses = await listScopedMcpServerStatuses({ root, runtime });
|
|
18
|
+
const runtimeStatusById = new Map(runtimeStatuses.map((status) => [status.id, status]));
|
|
19
|
+
const workflowConfigured = options.includeWorkflowConfig === false
|
|
20
|
+
? new Set()
|
|
21
|
+
: scopedWorkflowConfiguredIntegrations(config.tools, root);
|
|
17
22
|
return REGISTRY.map((item) => {
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
23
|
+
const runtimeStatus = runtimeStatusById.get(item.id);
|
|
24
|
+
const isWorkflowConfigured = workflowConfigured.has(item.id);
|
|
25
|
+
const state = runtimeStatus?.state ??
|
|
26
|
+
(isWorkflowConfigured
|
|
22
27
|
? "configured"
|
|
23
28
|
: item.transport === "mcp-skill"
|
|
24
29
|
? "missing"
|
|
25
|
-
: "unavailable"
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
30
|
+
: "unavailable");
|
|
31
|
+
return {
|
|
32
|
+
...item,
|
|
33
|
+
state,
|
|
34
|
+
detail: runtimeStatus?.detail ??
|
|
35
|
+
(isWorkflowConfigured
|
|
36
|
+
? "integration configured in this workspace without exposing credentials"
|
|
37
|
+
: item.transport === "mcp-skill"
|
|
38
|
+
? "MCP skill or local transport is not configured yet"
|
|
39
|
+
: "HTTP integration requires OAuth setup before use"),
|
|
31
40
|
...(item.oauthRequired ? { oauthBadge: "OAuth 2.0" } : {}),
|
|
41
|
+
...(runtimeStatus
|
|
42
|
+
? {
|
|
43
|
+
runtime: runtimeStatus.runtime,
|
|
44
|
+
scope: runtimeStatus.scope,
|
|
45
|
+
...(runtimeStatus.diagnostic
|
|
46
|
+
? { diagnostic: runtimeStatus.diagnostic }
|
|
47
|
+
: {}),
|
|
48
|
+
}
|
|
49
|
+
: {}),
|
|
32
50
|
};
|
|
33
51
|
});
|
|
34
52
|
}
|
|
53
|
+
function scopedWorkflowConfiguredIntegrations(tools, root) {
|
|
54
|
+
const integrations = isRecord(tools) ? mcpIntegrationsFromTools(tools) : {};
|
|
55
|
+
return new Set(Object.entries(integrations)
|
|
56
|
+
.filter(([, value]) => belongsToWorkspace(value, root))
|
|
57
|
+
.map(([id]) => id));
|
|
58
|
+
}
|
|
59
|
+
function mcpIntegrationsFromTools(tools) {
|
|
60
|
+
const mcp = isRecord(tools.mcp) ? tools.mcp : undefined;
|
|
61
|
+
return isRecord(mcp?.integrations) ? mcp.integrations : {};
|
|
62
|
+
}
|
|
63
|
+
function belongsToWorkspace(value, root) {
|
|
64
|
+
if (!isRecord(value))
|
|
65
|
+
return true;
|
|
66
|
+
const workspaceRoot = value.workspaceRoot;
|
|
67
|
+
return typeof workspaceRoot !== "string" || workspaceRoot === root;
|
|
68
|
+
}
|
|
69
|
+
function isRecord(value) {
|
|
70
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
71
|
+
}
|
|
35
72
|
function integration(id, label, transport, oauthRequired, scopes, supportedRoles) {
|
|
36
73
|
return {
|
|
37
74
|
id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-integrations.js","sourceRoot":"","sources":["../src/mcp-integrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-integrations.js","sourceRoot":"","sources":["../src/mcp-integrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,13 @@ export interface McpOAuthStartResult {
|
|
|
48
48
|
token: McpTokenStatus;
|
|
49
49
|
proxyReady: boolean;
|
|
50
50
|
}
|
|
51
|
+
export type McpOAuthDiagnosticStage = "discovery" | "registration" | "authorization-start" | "authorization-callback" | "token-exchange" | "refresh" | "status";
|
|
52
|
+
export interface McpOAuthDiagnostic {
|
|
53
|
+
stage: McpOAuthDiagnosticStage;
|
|
54
|
+
state: "unavailable" | "revoked" | "expired" | "failed";
|
|
55
|
+
message: string;
|
|
56
|
+
retryable: boolean;
|
|
57
|
+
}
|
|
51
58
|
export interface McpOAuthAuthorizationServerMetadata {
|
|
52
59
|
issuer?: string;
|
|
53
60
|
authorizationEndpoint: string;
|
|
@@ -74,6 +81,7 @@ export interface McpAuthenticatedResponse {
|
|
|
74
81
|
}
|
|
75
82
|
export declare function evaluateMcpOAuthProxy(config: McpOAuthProxyConfig): McpProxyEvaluation;
|
|
76
83
|
export declare function validateMcpOAuthProxyConfig(config: McpOAuthProxyConfig): string[];
|
|
84
|
+
export declare function diagnoseMcpOAuthFailure(stage: McpOAuthDiagnosticStage, error: unknown): McpOAuthDiagnostic;
|
|
77
85
|
export declare function discoverMcpOAuthMetadata({ serverUrl, fetchFn, }: {
|
|
78
86
|
serverUrl: string;
|
|
79
87
|
fetchFn?: typeof fetch;
|
package/dist/mcp-oauth-proxy.js
CHANGED
|
@@ -3,6 +3,7 @@ import { createServer } from "node:http";
|
|
|
3
3
|
import { chmod, mkdir, readFile, rm, writeFile } from "node:fs/promises";
|
|
4
4
|
import { spawn } from "node:child_process";
|
|
5
5
|
import path from "node:path";
|
|
6
|
+
import { redactMcpDiagnostic } from "./mcp-runtime-config.js";
|
|
6
7
|
export function evaluateMcpOAuthProxy(config) {
|
|
7
8
|
const risks = validateMcpOAuthProxyConfig(config);
|
|
8
9
|
return {
|
|
@@ -67,6 +68,15 @@ export function validateMcpOAuthProxyConfig(config) {
|
|
|
67
68
|
}
|
|
68
69
|
return risks;
|
|
69
70
|
}
|
|
71
|
+
export function diagnoseMcpOAuthFailure(stage, error) {
|
|
72
|
+
const message = redactMcpDiagnostic(error instanceof Error ? error.message : String(error));
|
|
73
|
+
return {
|
|
74
|
+
stage,
|
|
75
|
+
state: oauthStateFromMessage(message),
|
|
76
|
+
message,
|
|
77
|
+
retryable: isRetryableOAuthFailure(message),
|
|
78
|
+
};
|
|
79
|
+
}
|
|
70
80
|
export async function discoverMcpOAuthMetadata({ serverUrl, fetchFn = fetch, }) {
|
|
71
81
|
const server = new URL(serverUrl);
|
|
72
82
|
if (server.protocol !== "https:") {
|
|
@@ -427,6 +437,21 @@ function tokenNeedsRefresh(token, now, refreshWindowSeconds) {
|
|
|
427
437
|
return (now.getTime() >=
|
|
428
438
|
new Date(token.expiresAt).getTime() - refreshWindowSeconds * 1000);
|
|
429
439
|
}
|
|
440
|
+
function oauthStateFromMessage(message) {
|
|
441
|
+
if (/revoked|invalid_grant|unauthorized|forbidden|401|403/i.test(message)) {
|
|
442
|
+
return "revoked";
|
|
443
|
+
}
|
|
444
|
+
if (/expired|refresh/i.test(message)) {
|
|
445
|
+
return "expired";
|
|
446
|
+
}
|
|
447
|
+
if (/unavailable|not found|404|bind|network|fetch|timeout/i.test(message)) {
|
|
448
|
+
return "unavailable";
|
|
449
|
+
}
|
|
450
|
+
return "failed";
|
|
451
|
+
}
|
|
452
|
+
function isRetryableOAuthFailure(message) {
|
|
453
|
+
return /timeout|network|fetch|5\d\d|unavailable|bind/i.test(message);
|
|
454
|
+
}
|
|
430
455
|
function assertSecureFileStorage(config) {
|
|
431
456
|
if (config.tokenStorage !== "secure-file") {
|
|
432
457
|
throw new Error("only secure-file token storage is implemented");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-oauth-proxy.js","sourceRoot":"","sources":["../src/mcp-oauth-proxy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcp-oauth-proxy.js","sourceRoot":"","sources":["../src/mcp-oauth-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import type { RuntimeExecutionId, SkillRenderTarget } from "./types.js";
|
|
2
|
+
export type McpRuntimeConfigState = "configured" | "installed" | "authenticated" | "expired" | "revoked" | "unavailable";
|
|
3
|
+
export type McpConfigScope = "workspace" | "user";
|
|
4
|
+
export interface McpRuntimeServerEnv {
|
|
5
|
+
[name: string]: string;
|
|
6
|
+
}
|
|
7
|
+
export interface McpRuntimeServerConfig {
|
|
8
|
+
id: string;
|
|
9
|
+
command?: string;
|
|
10
|
+
args?: string[];
|
|
11
|
+
url?: string;
|
|
12
|
+
env?: McpRuntimeServerEnv;
|
|
13
|
+
oauth?: {
|
|
14
|
+
required?: boolean;
|
|
15
|
+
authenticated?: boolean;
|
|
16
|
+
expiresAt?: string;
|
|
17
|
+
revoked?: boolean;
|
|
18
|
+
unavailable?: boolean;
|
|
19
|
+
diagnostic?: string;
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
export interface McpRuntimeConfigTarget {
|
|
23
|
+
runtime: string;
|
|
24
|
+
target: SkillRenderTarget | "generic";
|
|
25
|
+
scope: McpConfigScope;
|
|
26
|
+
relativePath: string;
|
|
27
|
+
configPath: string;
|
|
28
|
+
supportsWorkspaceScope: boolean;
|
|
29
|
+
}
|
|
30
|
+
export interface McpRuntimeServerStatus {
|
|
31
|
+
id: string;
|
|
32
|
+
runtime: string;
|
|
33
|
+
scope: McpConfigScope;
|
|
34
|
+
state: McpRuntimeConfigState;
|
|
35
|
+
detail: string;
|
|
36
|
+
configPath: string;
|
|
37
|
+
diagnostic?: string;
|
|
38
|
+
}
|
|
39
|
+
export declare function resolveMcpRuntimeConfigTarget({ root, runtime, scope, }: {
|
|
40
|
+
root: string;
|
|
41
|
+
runtime: RuntimeExecutionId | SkillRenderTarget | string;
|
|
42
|
+
scope?: McpConfigScope;
|
|
43
|
+
}): McpRuntimeConfigTarget;
|
|
44
|
+
export declare function writeScopedMcpServerConfig({ root, runtime, server, scope, }: {
|
|
45
|
+
root: string;
|
|
46
|
+
runtime: RuntimeExecutionId | SkillRenderTarget | string;
|
|
47
|
+
server: McpRuntimeServerConfig;
|
|
48
|
+
scope?: McpConfigScope;
|
|
49
|
+
}): Promise<McpRuntimeServerStatus>;
|
|
50
|
+
export declare function listScopedMcpServerStatuses({ root, runtime, scope, }: {
|
|
51
|
+
root: string;
|
|
52
|
+
runtime?: RuntimeExecutionId | SkillRenderTarget | string;
|
|
53
|
+
scope?: McpConfigScope;
|
|
54
|
+
}): Promise<McpRuntimeServerStatus[]>;
|
|
55
|
+
export declare function redactMcpDiagnostic(value: string): string;
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { readJson, updateJsonFile } from "./fs-utils.js";
|
|
3
|
+
const MCP_CONFIG_TARGETS = {
|
|
4
|
+
"claude-cli": {
|
|
5
|
+
target: "claude",
|
|
6
|
+
relativePath: ".mcp.json",
|
|
7
|
+
supportsWorkspaceScope: true,
|
|
8
|
+
},
|
|
9
|
+
claude: {
|
|
10
|
+
target: "claude",
|
|
11
|
+
relativePath: ".mcp.json",
|
|
12
|
+
supportsWorkspaceScope: true,
|
|
13
|
+
},
|
|
14
|
+
"codex-cli": {
|
|
15
|
+
target: "codex",
|
|
16
|
+
relativePath: ".codex/mcp.json",
|
|
17
|
+
supportsWorkspaceScope: true,
|
|
18
|
+
},
|
|
19
|
+
codex: {
|
|
20
|
+
target: "codex",
|
|
21
|
+
relativePath: ".codex/mcp.json",
|
|
22
|
+
supportsWorkspaceScope: true,
|
|
23
|
+
},
|
|
24
|
+
"cursor-cli": {
|
|
25
|
+
target: "cursor",
|
|
26
|
+
relativePath: ".cursor/mcp.json",
|
|
27
|
+
supportsWorkspaceScope: true,
|
|
28
|
+
},
|
|
29
|
+
cursor: {
|
|
30
|
+
target: "cursor",
|
|
31
|
+
relativePath: ".cursor/mcp.json",
|
|
32
|
+
supportsWorkspaceScope: true,
|
|
33
|
+
},
|
|
34
|
+
"vscode-agent": {
|
|
35
|
+
target: "vscode",
|
|
36
|
+
relativePath: ".vscode/mcp.json",
|
|
37
|
+
supportsWorkspaceScope: true,
|
|
38
|
+
},
|
|
39
|
+
vscode: {
|
|
40
|
+
target: "vscode",
|
|
41
|
+
relativePath: ".vscode/mcp.json",
|
|
42
|
+
supportsWorkspaceScope: true,
|
|
43
|
+
},
|
|
44
|
+
"windsurf-cli": {
|
|
45
|
+
target: "windsurf",
|
|
46
|
+
relativePath: ".windsurf/mcp_config.json",
|
|
47
|
+
supportsWorkspaceScope: true,
|
|
48
|
+
},
|
|
49
|
+
windsurf: {
|
|
50
|
+
target: "windsurf",
|
|
51
|
+
relativePath: ".windsurf/mcp_config.json",
|
|
52
|
+
supportsWorkspaceScope: true,
|
|
53
|
+
},
|
|
54
|
+
generic: {
|
|
55
|
+
target: "generic",
|
|
56
|
+
relativePath: ".agent-workflow/mcp.json",
|
|
57
|
+
supportsWorkspaceScope: true,
|
|
58
|
+
},
|
|
59
|
+
};
|
|
60
|
+
export function resolveMcpRuntimeConfigTarget({ root, runtime, scope, }) {
|
|
61
|
+
const entry = MCP_CONFIG_TARGETS[runtime] ?? MCP_CONFIG_TARGETS.generic;
|
|
62
|
+
const resolvedScope = scope ?? (entry.supportsWorkspaceScope ? "workspace" : "user");
|
|
63
|
+
if (resolvedScope !== "workspace") {
|
|
64
|
+
throw new Error("user-scoped MCP config writes require explicit support");
|
|
65
|
+
}
|
|
66
|
+
return {
|
|
67
|
+
runtime,
|
|
68
|
+
target: entry.target,
|
|
69
|
+
scope: resolvedScope,
|
|
70
|
+
relativePath: entry.relativePath,
|
|
71
|
+
configPath: path.join(root, entry.relativePath),
|
|
72
|
+
supportsWorkspaceScope: entry.supportsWorkspaceScope,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
export async function writeScopedMcpServerConfig({ root, runtime, server, scope, }) {
|
|
76
|
+
validateServerConfig(server);
|
|
77
|
+
const target = resolveMcpRuntimeConfigTarget({
|
|
78
|
+
root,
|
|
79
|
+
runtime,
|
|
80
|
+
...(scope ? { scope } : {}),
|
|
81
|
+
});
|
|
82
|
+
const nextConfig = await updateJsonFile(target.configPath, {}, (current) => ({
|
|
83
|
+
...current,
|
|
84
|
+
mcpServers: {
|
|
85
|
+
...serverMap(current),
|
|
86
|
+
[server.id]: redactServerConfig(server),
|
|
87
|
+
},
|
|
88
|
+
}));
|
|
89
|
+
const written = serverMap(nextConfig)[server.id];
|
|
90
|
+
return {
|
|
91
|
+
id: server.id,
|
|
92
|
+
runtime: target.runtime,
|
|
93
|
+
scope: target.scope,
|
|
94
|
+
state: stateFromServerConfig(written),
|
|
95
|
+
detail: detailForState(stateFromServerConfig(written)),
|
|
96
|
+
configPath: target.configPath,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
export async function listScopedMcpServerStatuses({ root, runtime = "generic", scope = "workspace", }) {
|
|
100
|
+
const target = resolveMcpRuntimeConfigTarget({ root, runtime, scope });
|
|
101
|
+
const config = await readJson(target.configPath, {});
|
|
102
|
+
return Object.entries(serverMap(config)).map(([id, raw]) => {
|
|
103
|
+
const server = normalizeServerConfig(id, raw);
|
|
104
|
+
const state = stateFromServerConfig(server);
|
|
105
|
+
return {
|
|
106
|
+
id,
|
|
107
|
+
runtime: target.runtime,
|
|
108
|
+
scope: target.scope,
|
|
109
|
+
state,
|
|
110
|
+
detail: detailForState(state),
|
|
111
|
+
configPath: target.configPath,
|
|
112
|
+
...(server.oauth?.diagnostic
|
|
113
|
+
? { diagnostic: redactMcpDiagnostic(server.oauth.diagnostic) }
|
|
114
|
+
: {}),
|
|
115
|
+
};
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
export function redactMcpDiagnostic(value) {
|
|
119
|
+
const redacted = value
|
|
120
|
+
.replace(/Bearer\s+[A-Za-z0-9._~+/=-]+/g, "Bearer [REDACTED]")
|
|
121
|
+
.replace(/\b(access_token|refresh_token|id_token|token|code)=([^&\s]+)/gi, "$1=[REDACTED]")
|
|
122
|
+
.replace(/\b(api[_-]?key|client_secret|secret)[=:]\s*[\w.+/=-]+/gi, "$1=[REDACTED]");
|
|
123
|
+
return redactSensitiveDiagnosticUrls(redacted);
|
|
124
|
+
}
|
|
125
|
+
function redactSensitiveDiagnosticUrls(value) {
|
|
126
|
+
return value.replace(/https:\/\/\S+/gi, (candidate) => {
|
|
127
|
+
try {
|
|
128
|
+
const url = new URL(candidate);
|
|
129
|
+
const hasSensitiveParam = [
|
|
130
|
+
"code",
|
|
131
|
+
"token",
|
|
132
|
+
"access_token",
|
|
133
|
+
"refresh_token",
|
|
134
|
+
].some((name) => url.searchParams.has(name));
|
|
135
|
+
return hasSensitiveParam ? "https://[REDACTED_URL]" : candidate;
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
return candidate;
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
function validateServerConfig(server) {
|
|
143
|
+
if (!server.id || !/^[a-z0-9][a-z0-9._-]*$/i.test(server.id)) {
|
|
144
|
+
throw new Error("MCP server id must be alphanumeric with ._- separators");
|
|
145
|
+
}
|
|
146
|
+
if (!server.command && !server.url) {
|
|
147
|
+
throw new Error("MCP server config requires command or url");
|
|
148
|
+
}
|
|
149
|
+
if (server.url && !server.url.startsWith("https://")) {
|
|
150
|
+
throw new Error("MCP HTTP server url must use https");
|
|
151
|
+
}
|
|
152
|
+
if (server.command?.includes("/") || server.command?.includes("\\")) {
|
|
153
|
+
throw new Error("MCP command must be a command name, not a path");
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
function serverMap(config) {
|
|
157
|
+
return isRecord(config.mcpServers) ? config.mcpServers : {};
|
|
158
|
+
}
|
|
159
|
+
function normalizeServerConfig(id, value) {
|
|
160
|
+
const raw = isRecord(value) ? value : {};
|
|
161
|
+
const oauth = isRecord(raw.oauth) ? raw.oauth : undefined;
|
|
162
|
+
return {
|
|
163
|
+
id,
|
|
164
|
+
...(typeof raw.command === "string" ? { command: raw.command } : {}),
|
|
165
|
+
...(Array.isArray(raw.args)
|
|
166
|
+
? {
|
|
167
|
+
args: raw.args.filter((arg) => typeof arg === "string"),
|
|
168
|
+
}
|
|
169
|
+
: {}),
|
|
170
|
+
...(typeof raw.url === "string" ? { url: raw.url } : {}),
|
|
171
|
+
...(oauth
|
|
172
|
+
? {
|
|
173
|
+
oauth: {
|
|
174
|
+
...(typeof oauth.required === "boolean"
|
|
175
|
+
? { required: oauth.required }
|
|
176
|
+
: {}),
|
|
177
|
+
...(typeof oauth.authenticated === "boolean"
|
|
178
|
+
? { authenticated: oauth.authenticated }
|
|
179
|
+
: {}),
|
|
180
|
+
...(typeof oauth.expiresAt === "string"
|
|
181
|
+
? { expiresAt: oauth.expiresAt }
|
|
182
|
+
: {}),
|
|
183
|
+
...(typeof oauth.revoked === "boolean"
|
|
184
|
+
? { revoked: oauth.revoked }
|
|
185
|
+
: {}),
|
|
186
|
+
...(typeof oauth.unavailable === "boolean"
|
|
187
|
+
? { unavailable: oauth.unavailable }
|
|
188
|
+
: {}),
|
|
189
|
+
...(typeof oauth.diagnostic === "string"
|
|
190
|
+
? { diagnostic: oauth.diagnostic }
|
|
191
|
+
: {}),
|
|
192
|
+
},
|
|
193
|
+
}
|
|
194
|
+
: {}),
|
|
195
|
+
};
|
|
196
|
+
}
|
|
197
|
+
function redactServerConfig(server) {
|
|
198
|
+
return {
|
|
199
|
+
...(server.command ? { command: server.command } : {}),
|
|
200
|
+
...(server.args ? { args: server.args } : {}),
|
|
201
|
+
...(server.url ? { url: server.url } : {}),
|
|
202
|
+
...(server.env ? { env: redactEnv(server.env) } : {}),
|
|
203
|
+
...(server.oauth
|
|
204
|
+
? {
|
|
205
|
+
oauth: {
|
|
206
|
+
...server.oauth,
|
|
207
|
+
...(server.oauth.diagnostic
|
|
208
|
+
? { diagnostic: redactMcpDiagnostic(server.oauth.diagnostic) }
|
|
209
|
+
: {}),
|
|
210
|
+
},
|
|
211
|
+
}
|
|
212
|
+
: {}),
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
function redactEnv(env) {
|
|
216
|
+
return Object.fromEntries(Object.entries(env).map(([key, value]) => [
|
|
217
|
+
key,
|
|
218
|
+
/token|secret|key|password/i.test(key) ? "[REDACTED]" : value,
|
|
219
|
+
]));
|
|
220
|
+
}
|
|
221
|
+
function stateFromServerConfig(server) {
|
|
222
|
+
if (!server)
|
|
223
|
+
return "unavailable";
|
|
224
|
+
if (server.oauth?.unavailable)
|
|
225
|
+
return "unavailable";
|
|
226
|
+
if (server.oauth?.revoked)
|
|
227
|
+
return "revoked";
|
|
228
|
+
if (server.oauth?.expiresAt &&
|
|
229
|
+
Date.parse(server.oauth.expiresAt) <= Date.now()) {
|
|
230
|
+
return "expired";
|
|
231
|
+
}
|
|
232
|
+
if (server.oauth?.authenticated)
|
|
233
|
+
return "authenticated";
|
|
234
|
+
if (server.command || server.url)
|
|
235
|
+
return "installed";
|
|
236
|
+
return "configured";
|
|
237
|
+
}
|
|
238
|
+
function detailForState(state) {
|
|
239
|
+
const details = {
|
|
240
|
+
configured: "MCP server is present in scoped config",
|
|
241
|
+
installed: "MCP server transport is installed but authentication is not confirmed",
|
|
242
|
+
authenticated: "MCP server is configured and OAuth is authenticated",
|
|
243
|
+
expired: "MCP OAuth token is expired and needs reauthorization or refresh",
|
|
244
|
+
revoked: "MCP OAuth authorization appears revoked; reauthorize before use",
|
|
245
|
+
unavailable: "MCP server is unavailable in the scoped runtime config",
|
|
246
|
+
};
|
|
247
|
+
return details[state];
|
|
248
|
+
}
|
|
249
|
+
function isRecord(value) {
|
|
250
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
251
|
+
}
|
|
252
|
+
//# sourceMappingURL=mcp-runtime-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-runtime-config.js","sourceRoot":"","sources":["../src/mcp-runtime-config.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp-tool-adapter.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { removeUndefined } from "./command-utils.js";
|
|
2
|
+
import { redactMcpDiagnostic } from "./mcp-runtime-config.js";
|
|
2
3
|
import { appendEvent } from "./workspace.js";
|
|
3
4
|
import { authorizeWebAction } from "./web-action-security.js";
|
|
4
5
|
export async function invokeMcpTool(root, request) {
|
|
@@ -35,10 +36,7 @@ export async function invokeMcpTool(root, request) {
|
|
|
35
36
|
}
|
|
36
37
|
export function redactedMcpError(error) {
|
|
37
38
|
const message = error instanceof Error ? error.message : String(error);
|
|
38
|
-
return message
|
|
39
|
-
.replace(/Bearer\s+[A-Za-z0-9._-]+/g, "Bearer [REDACTED]")
|
|
40
|
-
.replace(/api[_-]?key[=:]\s*[\w.-]+/gi, "api_key=[REDACTED]")
|
|
41
|
-
.replace(/token[=:]\s*[\w.-]+/gi, "token=[REDACTED]");
|
|
39
|
+
return redactMcpDiagnostic(message);
|
|
42
40
|
}
|
|
43
41
|
function validateMcpToolInvocation(request) {
|
|
44
42
|
if (!request.integrationId)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-tool-adapter.js","sourceRoot":"","sources":["../src/mcp-tool-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAwB9D,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,OAAiC;IAEjC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,kBAAkB,CACtB,eAAe,CAAC;QACd,IAAI;QACJ,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,OAAO,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE;QAC1E,OAAO,EAAE,OAAO,CAAC,QAAQ;QACzB,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,MAAM;KACrD,CAAC,CACH,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,QAAQ,GAA8B;QAC1C,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;QAC/B,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ;KACxC,CAAC;IACF,MAAM,WAAW,CACf,IAAI,EACJ,eAAe,CAAC;QACd,IAAI,EAAE,kBAAkB;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,aAAa;QACpB,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE;QACjG,QAAQ,EAAE;YACR,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;SAChC;KACF,CAAC,CACH,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"mcp-tool-adapter.js","sourceRoot":"","sources":["../src/mcp-tool-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type ModelProviderRuntimeOptions } from "./provider-utils.js";
|
|
2
2
|
import type { ConfiguredProviderSummary, ModelProvider, ModelProviderCapabilities, ModelRequest, ModelResponse, ProviderPolicyConfig, ProviderRegistryEntry, WorkflowConfig, ProviderCredentialConfig } from "./types.js";
|
|
3
3
|
export { GeminiModelProvider } from "./gemini-provider.js";
|
|
4
|
-
export { OllamaModelProvider } from "./ollama-provider.js";
|
|
4
|
+
export { OllamaModelProvider, ollamaProviderEndpointPolicy, } from "./ollama-provider.js";
|
|
5
5
|
export declare class InMemoryModelProviderRegistry {
|
|
6
6
|
private readonly providers;
|
|
7
7
|
register(provider: ModelProvider): void;
|
package/dist/model-providers.js
CHANGED
|
@@ -2,7 +2,7 @@ import { apiKeyFromEnvFile, joinUrlPath, modelProviderCapabilities, modelProvide
|
|
|
2
2
|
import { GeminiModelProvider } from "./gemini-provider.js";
|
|
3
3
|
import { OllamaModelProvider } from "./ollama-provider.js";
|
|
4
4
|
export { GeminiModelProvider } from "./gemini-provider.js";
|
|
5
|
-
export { OllamaModelProvider } from "./ollama-provider.js";
|
|
5
|
+
export { OllamaModelProvider, ollamaProviderEndpointPolicy, } from "./ollama-provider.js";
|
|
6
6
|
const defaultCapabilities = modelProviderCapabilities({ jsonMode: false });
|
|
7
7
|
const BUILT_IN_PROVIDER_FACTORIES = {
|
|
8
8
|
fake: () => new FakeModelProvider(),
|