@workpowers/speckle 0.1.0 → 0.2.0
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/dist/headers.d.ts +10 -5
- package/dist/headers.d.ts.map +1 -1
- package/dist/headers.js +12 -5
- package/dist/headers.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +22 -5
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/headers.d.ts
CHANGED
|
@@ -5,21 +5,26 @@
|
|
|
5
5
|
* `X-Speckle-*` headers rather than tool arguments, so public tool schemas
|
|
6
6
|
* stay clean and the server can authorize before constructing an MCP
|
|
7
7
|
* session for the wrong project.
|
|
8
|
+
*
|
|
9
|
+
* Rootless mode: when no `.speckle` marker is resolvable (e.g. the router
|
|
10
|
+
* is installed globally and the host shell isn't in a Speckle repo), the
|
|
11
|
+
* workspace is omitted. Only `Authorization` + `X-Speckle-Client` are sent;
|
|
12
|
+
* the server then exposes a project-agnostic discovery toolset.
|
|
8
13
|
*/
|
|
9
14
|
import type { ResolvedWorkspace } from "./workspace.js";
|
|
10
15
|
export declare const ROUTER_CLIENT_NAME = "@workpowers/speckle";
|
|
11
|
-
export declare const ROUTER_CLIENT_VERSION = "0.
|
|
16
|
+
export declare const ROUTER_CLIENT_VERSION = "0.2.0";
|
|
12
17
|
export interface RouterRequestHeaders {
|
|
13
18
|
Authorization: string;
|
|
14
|
-
"X-Speckle-Project-Id": string;
|
|
15
19
|
"X-Speckle-Client": string;
|
|
16
|
-
"X-Speckle-
|
|
17
|
-
"X-Speckle-
|
|
20
|
+
"X-Speckle-Project-Id"?: string;
|
|
21
|
+
"X-Speckle-Marker-Hash"?: string;
|
|
22
|
+
"X-Speckle-Workspace-Hash"?: string;
|
|
18
23
|
"X-Speckle-Project-Slug"?: string;
|
|
19
24
|
"X-Speckle-Repo-Remote"?: string;
|
|
20
25
|
}
|
|
21
26
|
export declare function buildRouterHeaders(args: {
|
|
22
27
|
apiKey: string;
|
|
23
|
-
workspace
|
|
28
|
+
workspace?: ResolvedWorkspace;
|
|
24
29
|
}): RouterRequestHeaders;
|
|
25
30
|
//# sourceMappingURL=headers.d.ts.map
|
package/dist/headers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../src/headers.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../src/headers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,eAAO,MAAM,kBAAkB,wBAAwB,CAAC;AACxD,eAAO,MAAM,qBAAqB,UAAU,CAAC;AAE7C,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC/B,GAAG,oBAAoB,CAevB"}
|
package/dist/headers.js
CHANGED
|
@@ -5,19 +5,26 @@
|
|
|
5
5
|
* `X-Speckle-*` headers rather than tool arguments, so public tool schemas
|
|
6
6
|
* stay clean and the server can authorize before constructing an MCP
|
|
7
7
|
* session for the wrong project.
|
|
8
|
+
*
|
|
9
|
+
* Rootless mode: when no `.speckle` marker is resolvable (e.g. the router
|
|
10
|
+
* is installed globally and the host shell isn't in a Speckle repo), the
|
|
11
|
+
* workspace is omitted. Only `Authorization` + `X-Speckle-Client` are sent;
|
|
12
|
+
* the server then exposes a project-agnostic discovery toolset.
|
|
8
13
|
*/
|
|
9
14
|
export const ROUTER_CLIENT_NAME = "@workpowers/speckle";
|
|
10
|
-
export const ROUTER_CLIENT_VERSION = "0.
|
|
15
|
+
export const ROUTER_CLIENT_VERSION = "0.2.0";
|
|
11
16
|
export function buildRouterHeaders(args) {
|
|
12
17
|
const { apiKey, workspace } = args;
|
|
13
|
-
const m = workspace.marker.marker;
|
|
14
18
|
const headers = {
|
|
15
19
|
Authorization: `Bearer ${apiKey}`,
|
|
16
|
-
"X-Speckle-Project-Id": String(m.projectId),
|
|
17
20
|
"X-Speckle-Client": `${ROUTER_CLIENT_NAME}/${ROUTER_CLIENT_VERSION}`,
|
|
18
|
-
"X-Speckle-Marker-Hash": `sha256:${workspace.marker.contentHash}`,
|
|
19
|
-
"X-Speckle-Workspace-Hash": `sha256:${workspace.workspaceRootHash}`,
|
|
20
21
|
};
|
|
22
|
+
if (!workspace)
|
|
23
|
+
return headers;
|
|
24
|
+
const m = workspace.marker.marker;
|
|
25
|
+
headers["X-Speckle-Project-Id"] = String(m.projectId);
|
|
26
|
+
headers["X-Speckle-Marker-Hash"] = `sha256:${workspace.marker.contentHash}`;
|
|
27
|
+
headers["X-Speckle-Workspace-Hash"] = `sha256:${workspace.workspaceRootHash}`;
|
|
21
28
|
if (m.projectSlug)
|
|
22
29
|
headers["X-Speckle-Project-Slug"] = m.projectSlug;
|
|
23
30
|
if (workspace.canonicalRemote)
|
package/dist/headers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../src/headers.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../src/headers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,MAAM,CAAC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAY7C,MAAM,UAAU,kBAAkB,CAAC,IAGlC;IACC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IACnC,MAAM,OAAO,GAAyB;QACpC,aAAa,EAAE,UAAU,MAAM,EAAE;QACjC,kBAAkB,EAAE,GAAG,kBAAkB,IAAI,qBAAqB,EAAE;KACrE,CAAC;IACF,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAC;IAE/B,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;IAClC,OAAO,CAAC,sBAAsB,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACtD,OAAO,CAAC,uBAAuB,CAAC,GAAG,UAAU,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IAC5E,OAAO,CAAC,0BAA0B,CAAC,GAAG,UAAU,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAC9E,IAAI,CAAC,CAAC,WAAW;QAAE,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;IACrE,IAAI,SAAS,CAAC,eAAe;QAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,SAAS,CAAC,eAAe,CAAC;IAC5F,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -8,6 +8,10 @@
|
|
|
8
8
|
* Flow:
|
|
9
9
|
* 1. Load env config (`SPECKLE_MCP_BASE_URL`, `SPECKLE_MCP_KEY`).
|
|
10
10
|
* 2. Resolve workspace + marker (cwd-based v1; MCP-roots support is a TODO).
|
|
11
|
+
* If no marker is found, fall through to rootless mode (the server will
|
|
12
|
+
* expose a project-agnostic discovery toolset instead). Other marker
|
|
13
|
+
* errors (invalid TOML, remote mismatch, host mismatch) still fail loud
|
|
14
|
+
* — those mean broken config, not absence.
|
|
11
15
|
* 3. Pick the Speckle host (marker `speckle_url` wins over env baseUrl).
|
|
12
16
|
* 4. Connect upstream MCP client over StreamableHTTP, with auth + context headers.
|
|
13
17
|
* 5. Mirror upstream capabilities downstream and wire pass-through handlers.
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAYH,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CA8DjD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAQ9C"}
|
package/dist/index.js
CHANGED
|
@@ -8,6 +8,10 @@
|
|
|
8
8
|
* Flow:
|
|
9
9
|
* 1. Load env config (`SPECKLE_MCP_BASE_URL`, `SPECKLE_MCP_KEY`).
|
|
10
10
|
* 2. Resolve workspace + marker (cwd-based v1; MCP-roots support is a TODO).
|
|
11
|
+
* If no marker is found, fall through to rootless mode (the server will
|
|
12
|
+
* expose a project-agnostic discovery toolset instead). Other marker
|
|
13
|
+
* errors (invalid TOML, remote mismatch, host mismatch) still fail loud
|
|
14
|
+
* — those mean broken config, not absence.
|
|
11
15
|
* 3. Pick the Speckle host (marker `speckle_url` wins over env baseUrl).
|
|
12
16
|
* 4. Connect upstream MCP client over StreamableHTTP, with auth + context headers.
|
|
13
17
|
* 5. Mirror upstream capabilities downstream and wire pass-through handlers.
|
|
@@ -28,11 +32,24 @@ import { wireProxyHandlers } from "./proxy.js";
|
|
|
28
32
|
import { SpeckleRouterError } from "./errors.js";
|
|
29
33
|
export async function startRouter() {
|
|
30
34
|
const config = loadRouterConfig();
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
let workspace;
|
|
36
|
+
try {
|
|
37
|
+
workspace = resolveWorkspace({
|
|
38
|
+
cwd: config.cwd,
|
|
39
|
+
allowRepoMismatch: config.allowRepoMismatch,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
catch (err) {
|
|
43
|
+
if (err instanceof SpeckleRouterError && err.code === "marker_not_found") {
|
|
44
|
+
process.stderr.write("speckle-mcp: no .speckle marker found — running in rootless mode (discovery tools only). " +
|
|
45
|
+
"Run `speckle-mcp init --project <id>` in a repo to bind it to a project.\n");
|
|
46
|
+
workspace = undefined;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
throw err;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
const host = resolveSpeckleHost(config, workspace?.marker.marker.speckleUrl);
|
|
36
53
|
const headers = buildRouterHeaders({ apiKey: config.apiKey, workspace });
|
|
37
54
|
const upstream = new Client({ name: ROUTER_CLIENT_NAME, version: ROUTER_CLIENT_VERSION }, { capabilities: {} });
|
|
38
55
|
const httpTransport = new StreamableHTTPClientTransport(new URL(`${host.hostUrl}/mcp`), {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@workpowers/speckle",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Local MCP router for Speckle — resolves project context from a committed .speckle marker and forwards calls to the remote Speckle MCP endpoint.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|