@specforge/cli 0.2.4 → 0.2.5
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.
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote.test.d.ts","sourceRoot":"","sources":["../../../src/transport/__tests__/remote.test.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/transport/remote.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAQlE,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;
|
|
1
|
+
{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/transport/remote.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAQlE,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAwBD,qBAAa,eAAgB,YAAW,UAAU;IAChD,OAAO,CAAC,MAAM,CAAwB;IACtC,4EAA4E;IAC5E,OAAO,CAAC,WAAW,CAAuB;gBAE9B,MAAM,EAAE,qBAAqB;IAIzC;;;;OAIG;YACW,OAAO;IAoCf,OAAO,CAAC,CAAC,GAAG,OAAO,EACvB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,CAAC,CAAC;CAkEd"}
|
package/dist/transport/remote.js
CHANGED
|
@@ -6,6 +6,18 @@ import {
|
|
|
6
6
|
} from "./resolve-endpoint.js";
|
|
7
7
|
const DEFAULT_TIMEOUT = 3e4;
|
|
8
8
|
const MCP_CACHE_KEY = "mcp-endpoint-cache";
|
|
9
|
+
function safeUrl(u) {
|
|
10
|
+
try {
|
|
11
|
+
return new URL(u);
|
|
12
|
+
} catch {
|
|
13
|
+
return null;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
function isChannelHost(apiUrl) {
|
|
17
|
+
const h = safeUrl(apiUrl)?.host;
|
|
18
|
+
if (!h) return false;
|
|
19
|
+
return h === safeUrl(CHANNEL.endpoint.primary)?.host || h === safeUrl(CHANNEL.endpoint.fallback)?.host;
|
|
20
|
+
}
|
|
9
21
|
class RemoteTransport {
|
|
10
22
|
config;
|
|
11
23
|
/** Resolved URL pinned for this transport instance after the first call. */
|
|
@@ -20,15 +32,22 @@ class RemoteTransport {
|
|
|
20
32
|
*/
|
|
21
33
|
async pickUrl() {
|
|
22
34
|
if (this.resolvedUrl) return this.resolvedUrl;
|
|
23
|
-
const
|
|
24
|
-
if (!
|
|
35
|
+
const apiUrl = safeUrl(this.config.apiUrl);
|
|
36
|
+
if (!apiUrl || !isChannelHost(this.config.apiUrl)) {
|
|
25
37
|
this.resolvedUrl = this.config.apiUrl;
|
|
26
38
|
return this.resolvedUrl;
|
|
27
39
|
}
|
|
28
|
-
|
|
40
|
+
const resolvedBase = await resolveEndpoint({
|
|
29
41
|
...CHANNEL.endpoint,
|
|
30
42
|
cacheKey: MCP_CACHE_KEY
|
|
31
43
|
});
|
|
44
|
+
const resolved = safeUrl(resolvedBase);
|
|
45
|
+
if (resolved && apiUrl) {
|
|
46
|
+
resolved.pathname = apiUrl.pathname;
|
|
47
|
+
this.resolvedUrl = resolved.toString().replace(/\/$/, "");
|
|
48
|
+
} else {
|
|
49
|
+
this.resolvedUrl = resolvedBase;
|
|
50
|
+
}
|
|
32
51
|
if (this.config.debug) {
|
|
33
52
|
console.log(`[RemoteTransport] Resolved MCP endpoint: ${this.resolvedUrl}`);
|
|
34
53
|
}
|
|
@@ -59,7 +78,7 @@ class RemoteTransport {
|
|
|
59
78
|
});
|
|
60
79
|
clearTimeout(timeoutId);
|
|
61
80
|
if (!response.ok) {
|
|
62
|
-
if (shouldInvalidateOnStatus(response.status) && this.config.apiUrl
|
|
81
|
+
if (shouldInvalidateOnStatus(response.status) && isChannelHost(this.config.apiUrl)) {
|
|
63
82
|
await invalidate(MCP_CACHE_KEY);
|
|
64
83
|
this.resolvedUrl = null;
|
|
65
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/transport/remote.ts"],"sourcesContent":["/**\n * RemoteTransport — HTTP POST transport to SpecForge API Gateway\n *\n * Extracted from ApiClient.call() to implement ITransport.\n *\n * Endpoint resolution: when `config.apiUrl` matches `CHANNEL.endpoint.primary`\n * (i.e. no `SPECFORGE_API_URL` override is active), the transport delegates\n * to `resolveEndpoint` on the first call so the URL flows from the\n * canary-channel client probe (PLAN-canary-channel.md §D) — primary first,\n * fallback on DNS-class failure, cached for 5 min. On a 401/403 the cache\n * is invalidated so the next call re-probes.\n */\n\nimport type { ITransport, TransportOrigin } from './interface.js';\nimport { CHANNEL } from '../channel.js';\nimport {\n resolveEndpoint,\n invalidate,\n shouldInvalidateOnStatus,\n} from './resolve-endpoint.js';\n\nexport interface RemoteTransportConfig {\n apiUrl: string;\n apiKey: string;\n debug?: boolean;\n timeout?: number;\n /**\n * Calling context, sent as the `X-SpecForge-Origin` header (M9.7). Defaults to\n * `mcp` (agent traffic); the human CLI surface passes `cli`.\n */\n origin?: TransportOrigin;\n}\n\nconst DEFAULT_TIMEOUT = 30000;\nconst MCP_CACHE_KEY = 'mcp-endpoint-cache';\n\nexport class RemoteTransport implements ITransport {\n private config: RemoteTransportConfig;\n /** Resolved URL pinned for this transport instance after the first call. */\n private resolvedUrl: string | null = null;\n\n constructor(config: RemoteTransportConfig) {\n this.config = config;\n }\n\n /**\n * Pick the URL for this call. When `config.apiUrl` is the channel default,\n * defer to the resolver. Otherwise (env override / explicit test fixture),\n * use the configured URL directly.\n */\n private async pickUrl(): Promise<string> {\n if (this.resolvedUrl) return this.resolvedUrl;\n
|
|
1
|
+
{"version":3,"sources":["../../src/transport/remote.ts"],"sourcesContent":["/**\n * RemoteTransport — HTTP POST transport to SpecForge API Gateway\n *\n * Extracted from ApiClient.call() to implement ITransport.\n *\n * Endpoint resolution: when `config.apiUrl` matches `CHANNEL.endpoint.primary`\n * (i.e. no `SPECFORGE_API_URL` override is active), the transport delegates\n * to `resolveEndpoint` on the first call so the URL flows from the\n * canary-channel client probe (PLAN-canary-channel.md §D) — primary first,\n * fallback on DNS-class failure, cached for 5 min. On a 401/403 the cache\n * is invalidated so the next call re-probes.\n */\n\nimport type { ITransport, TransportOrigin } from './interface.js';\nimport { CHANNEL } from '../channel.js';\nimport {\n resolveEndpoint,\n invalidate,\n shouldInvalidateOnStatus,\n} from './resolve-endpoint.js';\n\nexport interface RemoteTransportConfig {\n apiUrl: string;\n apiKey: string;\n debug?: boolean;\n timeout?: number;\n /**\n * Calling context, sent as the `X-SpecForge-Origin` header (M9.7). Defaults to\n * `mcp` (agent traffic); the human CLI surface passes `cli`.\n */\n origin?: TransportOrigin;\n}\n\nconst DEFAULT_TIMEOUT = 30000;\nconst MCP_CACHE_KEY = 'mcp-endpoint-cache';\n\n/** Parse a URL, returning null instead of throwing on malformed input. */\nfunction safeUrl(u: string): URL | null {\n try {\n return new URL(u);\n } catch {\n return null;\n }\n}\n\n/** True when `apiUrl` targets one of the channel's hosts (on any surface path). */\nfunction isChannelHost(apiUrl: string): boolean {\n const h = safeUrl(apiUrl)?.host;\n if (!h) return false;\n return (\n h === safeUrl(CHANNEL.endpoint.primary)?.host ||\n h === safeUrl(CHANNEL.endpoint.fallback)?.host\n );\n}\n\nexport class RemoteTransport implements ITransport {\n private config: RemoteTransportConfig;\n /** Resolved URL pinned for this transport instance after the first call. */\n private resolvedUrl: string | null = null;\n\n constructor(config: RemoteTransportConfig) {\n this.config = config;\n }\n\n /**\n * Pick the URL for this call. When `config.apiUrl` is the channel default,\n * defer to the resolver. Otherwise (env override / explicit test fixture),\n * use the configured URL directly.\n */\n private async pickUrl(): Promise<string> {\n if (this.resolvedUrl) return this.resolvedUrl;\n\n // Match the channel by HOST, not by exact URL. `createCliClient` rewrites the\n // default `/local` (MCP/agent) surface to `/cli` (human CLI), so an exact\n // `=== CHANNEL.endpoint.primary` check wrongly classified the CLI surface as\n // an \"override\" and skipped the resolver entirely — meaning `specforge login`\n // hit the dead primary with NO fallback. Comparing hosts makes BOTH surfaces\n // go through the primary→fallback probe.\n const apiUrl = safeUrl(this.config.apiUrl);\n if (!apiUrl || !isChannelHost(this.config.apiUrl)) {\n // A genuine override (env var / explicit test fixture) — use it verbatim.\n this.resolvedUrl = this.config.apiUrl;\n return this.resolvedUrl;\n }\n\n // Resolve the live host via the /health probes (primary → fallback), then\n // re-apply THIS transport's surface path (`/cli` or `/local`) onto the\n // resolved host so the fallback works on either surface.\n const resolvedBase = await resolveEndpoint({\n ...CHANNEL.endpoint,\n cacheKey: MCP_CACHE_KEY,\n });\n const resolved = safeUrl(resolvedBase);\n if (resolved && apiUrl) {\n resolved.pathname = apiUrl.pathname;\n this.resolvedUrl = resolved.toString().replace(/\\/$/, '');\n } else {\n this.resolvedUrl = resolvedBase;\n }\n if (this.config.debug) {\n console.log(`[RemoteTransport] Resolved MCP endpoint: ${this.resolvedUrl}`);\n }\n return this.resolvedUrl;\n }\n\n async execute<T = unknown>(\n operation: string,\n args: Record<string, unknown>\n ): Promise<T> {\n const timeout = this.config.timeout ?? DEFAULT_TIMEOUT;\n const controller = new AbortController();\n const timeoutId = setTimeout(() => controller.abort(), timeout);\n\n try {\n if (this.config.debug) {\n console.log(`[RemoteTransport] Calling operation: ${operation}`, {\n args: Object.keys(args),\n });\n }\n\n const url = await this.pickUrl();\n const response = await fetch(url, {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `Bearer ${this.config.apiKey}`,\n // M9.7: server-derived feedback/telemetry provenance. The backend\n // reads this header (never a request-body `source` field).\n 'X-SpecForge-Origin': this.config.origin ?? 'mcp',\n },\n body: JSON.stringify({ operation, args }),\n signal: controller.signal,\n });\n\n clearTimeout(timeoutId);\n\n if (!response.ok) {\n // Auth failures may indicate the channel was rotated under us;\n // invalidate so the next call re-probes.\n if (\n shouldInvalidateOnStatus(response.status) &&\n isChannelHost(this.config.apiUrl)\n ) {\n await invalidate(MCP_CACHE_KEY);\n this.resolvedUrl = null;\n }\n const errorText = await response.text();\n const statusMessage = getStatusMessage(response.status);\n throw new Error(\n `API request failed: ${response.status} ${statusMessage}\\n${errorText}`\n );\n }\n\n // Transport is a dumb pipe (M9, approach A): return the raw response body.\n // Response-shape interpretation lives in the consumer that owns the\n // contract — `ApiClient.call` unwraps the `/cli` `{ data } / { error }`\n // shape; the agent `/local` path interprets the M8 envelope itself.\n const body = (await response.json()) as T;\n\n if (this.config.debug) {\n console.log(`[RemoteTransport] Operation completed: ${operation}`);\n }\n\n return body;\n } catch (error) {\n clearTimeout(timeoutId);\n if (error instanceof Error && error.name === 'AbortError') {\n throw new Error(\n `Request timed out after ${timeout}ms for operation: ${operation}`\n );\n }\n throw error;\n }\n }\n}\n\nfunction getStatusMessage(status: number): string {\n const messages: Record<number, string> = {\n 400: 'Bad Request',\n 401: 'Unauthorized - Check your API key',\n 403: 'Forbidden - Insufficient permissions',\n 404: 'Not Found',\n 429: 'Too Many Requests - Rate limit exceeded',\n 500: 'Internal Server Error',\n 501: 'Not Implemented',\n 502: 'Bad Gateway',\n 503: 'Service Unavailable',\n 504: 'Gateway Timeout',\n };\n return messages[status] || 'Unknown Error';\n}\n"],"mappings":"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","names":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@specforge/cli",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.5",
|
|
4
4
|
"description": "MCP server for SpecForge - AI agent integration",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"@specforge/session-types",
|
|
62
62
|
"@specforge/report-types"
|
|
63
63
|
],
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "39a5444038d38674bebc486923ff133e89271cc9",
|
|
65
65
|
"scripts": {
|
|
66
66
|
"build": "tsup && tsc --emitDeclarationOnly --outDir dist",
|
|
67
67
|
"typecheck": "tsc --noEmit",
|