wayform 0.1.8 → 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/README.md +85 -50
- package/dist/cli.js +8 -3
- package/dist/cli.js.map +1 -1
- package/dist/config.js +6 -6
- package/dist/config.js.map +1 -1
- package/dist/credential-store.js +77 -0
- package/dist/credential-store.js.map +1 -0
- package/dist/doctor.js +30 -26
- package/dist/doctor.js.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/init-configs.js +60 -21
- package/dist/init-configs.js.map +1 -1
- package/dist/init-env.js +13 -6
- package/dist/init-env.js.map +1 -1
- package/dist/init-remote.js +159 -95
- package/dist/init-remote.js.map +1 -1
- package/dist/init.js +7 -3
- package/dist/init.js.map +1 -1
- package/dist/keychain.js +31 -0
- package/dist/keychain.js.map +1 -0
- package/dist/oauth-login.js +149 -0
- package/dist/oauth-login.js.map +1 -0
- package/dist/oauth-session.js +122 -0
- package/dist/oauth-session.js.map +1 -0
- package/dist/remote-read.js +11 -13
- package/dist/remote-read.js.map +1 -1
- package/dist/space-create.js +17 -201
- package/dist/space-create.js.map +1 -1
- package/package.json +2 -1
package/dist/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,KAAK,IAAI,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,GAChB,MAAM,eAAe,CAAC;AAEvB,MAAM,KAAK,GAAG
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}
|
package/dist/keychain.js
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { createCredentialStore, } from "./credential-store.js";
|
|
2
|
+
function resolveStore(store) {
|
|
3
|
+
return store ?? createCredentialStore();
|
|
4
|
+
}
|
|
5
|
+
export function keychainGet(account, store) {
|
|
6
|
+
return resolveStore(store).get(account);
|
|
7
|
+
}
|
|
8
|
+
export function keychainSet(account, secret, store) {
|
|
9
|
+
resolveStore(store).set(account, secret);
|
|
10
|
+
}
|
|
11
|
+
export function keychainDelete(account, store) {
|
|
12
|
+
resolveStore(store).delete(account);
|
|
13
|
+
}
|
|
14
|
+
export function gatewayAccount(gatewayUrl) {
|
|
15
|
+
return gatewayUrl.replace(/\/+$/, "");
|
|
16
|
+
}
|
|
17
|
+
export function loadStoredOAuth(gatewayUrl, store) {
|
|
18
|
+
const raw = keychainGet(gatewayAccount(gatewayUrl), store);
|
|
19
|
+
if (!raw)
|
|
20
|
+
return null;
|
|
21
|
+
try {
|
|
22
|
+
return JSON.parse(raw);
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
export function saveStoredOAuth(gatewayUrl, tokens, store) {
|
|
29
|
+
keychainSet(gatewayAccount(gatewayUrl), JSON.stringify(tokens), store);
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=keychain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keychain.js","sourceRoot":"","sources":["../src/keychain.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,GAEtB,MAAM,uBAAuB,CAAC;AAE/B,SAAS,YAAY,CAAC,KAAuB;IAC3C,OAAO,KAAK,IAAI,qBAAqB,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,OAAe,EACf,KAAuB;IAEvB,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,OAAe,EACf,MAAc,EACd,KAAuB;IAEvB,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,KAAuB;IACrE,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACtC,CAAC;AAWD,MAAM,UAAU,cAAc,CAAC,UAAkB;IAC/C,OAAO,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,UAAkB,EAClB,KAAuB;IAEvB,MAAM,GAAG,GAAG,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;IAC3D,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAgB,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,UAAkB,EAClB,MAAmB,EACnB,KAAuB;IAEvB,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
import http from "node:http";
|
|
2
|
+
import { createHash, randomBytes } from "node:crypto";
|
|
3
|
+
import { execFileSync } from "node:child_process";
|
|
4
|
+
import { saveStoredOAuth } from "./keychain.js";
|
|
5
|
+
export const DEFAULT_GATEWAY_URL = "https://memorylayer-gateway.memory-layer.workers.dev";
|
|
6
|
+
export const LOGIN_TIMEOUT_MS = 11 * 60 * 1000;
|
|
7
|
+
function b64url(buf) {
|
|
8
|
+
return buf.toString("base64url");
|
|
9
|
+
}
|
|
10
|
+
function pkce() {
|
|
11
|
+
const verifier = b64url(randomBytes(32));
|
|
12
|
+
const challenge = b64url(createHash("sha256").update(verifier).digest());
|
|
13
|
+
return { verifier, challenge };
|
|
14
|
+
}
|
|
15
|
+
async function defaultListen(handler) {
|
|
16
|
+
const server = http.createServer(handler);
|
|
17
|
+
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
|
|
18
|
+
const addr = server.address();
|
|
19
|
+
if (!addr || typeof addr === "string") {
|
|
20
|
+
throw new Error("login listener failed");
|
|
21
|
+
}
|
|
22
|
+
return { port: addr.port, close: () => server.close() };
|
|
23
|
+
}
|
|
24
|
+
function defaultOpen(url) {
|
|
25
|
+
try {
|
|
26
|
+
if (process.platform === "darwin") {
|
|
27
|
+
execFileSync("open", [url], { stdio: "ignore" });
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
// printed for the user to open by hand
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Localhost PKCE against the hosted gateway. Tokens go to the OS keychain
|
|
36
|
+
* (or WAYFORM_KEYCHAIN_FILE in tests) and are never printed.
|
|
37
|
+
*/
|
|
38
|
+
export async function runLogin(args, deps = {}) {
|
|
39
|
+
const fetchImpl = deps.fetchImpl ?? fetch;
|
|
40
|
+
const log = deps.log ?? ((m) => console.log(m));
|
|
41
|
+
const gwFlag = args.indexOf("--gateway");
|
|
42
|
+
const gatewayUrl = ((gwFlag >= 0 ? args[gwFlag + 1] : undefined) ??
|
|
43
|
+
process.env.MEMORYLAYER_GATEWAY_URL ??
|
|
44
|
+
DEFAULT_GATEWAY_URL).replace(/\/+$/, "");
|
|
45
|
+
const { verifier, challenge } = pkce();
|
|
46
|
+
const oauthState = b64url(randomBytes(16));
|
|
47
|
+
let settle;
|
|
48
|
+
let fail;
|
|
49
|
+
const codePromise = new Promise((resolve, reject) => {
|
|
50
|
+
settle = resolve;
|
|
51
|
+
fail = reject;
|
|
52
|
+
});
|
|
53
|
+
const timeout = setTimeout(() => fail(new Error("login timed out waiting for the browser")), LOGIN_TIMEOUT_MS);
|
|
54
|
+
const listen = deps.listen ?? defaultListen;
|
|
55
|
+
const listener = await listen((req, res) => {
|
|
56
|
+
try {
|
|
57
|
+
const url = new URL(req.url ?? "/", "http://127.0.0.1");
|
|
58
|
+
if (url.pathname !== "/callback") {
|
|
59
|
+
res.writeHead(404);
|
|
60
|
+
res.end();
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const err = url.searchParams.get("error");
|
|
64
|
+
const code = url.searchParams.get("code");
|
|
65
|
+
const returnedState = url.searchParams.get("state");
|
|
66
|
+
res.writeHead(200, { "content-type": "text/html; charset=utf-8" });
|
|
67
|
+
res.end("<!doctype html><title>Wayform</title><p>You can close this tab and return to the terminal.</p>");
|
|
68
|
+
clearTimeout(timeout);
|
|
69
|
+
listener.close();
|
|
70
|
+
if (returnedState !== oauthState) {
|
|
71
|
+
fail(new Error("authorization state mismatch"));
|
|
72
|
+
}
|
|
73
|
+
else if (err)
|
|
74
|
+
fail(new Error(`authorization failed: ${err}`));
|
|
75
|
+
else if (!code)
|
|
76
|
+
fail(new Error("authorization missing code"));
|
|
77
|
+
else
|
|
78
|
+
settle(code);
|
|
79
|
+
}
|
|
80
|
+
catch (e) {
|
|
81
|
+
fail(e instanceof Error ? e : new Error(String(e)));
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
const redirectUri = `http://127.0.0.1:${listener.port}/callback`;
|
|
85
|
+
try {
|
|
86
|
+
const reg = await fetchImpl(`${gatewayUrl}/oauth/register`, {
|
|
87
|
+
method: "POST",
|
|
88
|
+
headers: { "content-type": "application/json" },
|
|
89
|
+
body: JSON.stringify({
|
|
90
|
+
client_name: "wayform-cli",
|
|
91
|
+
redirect_uris: [redirectUri],
|
|
92
|
+
token_endpoint_auth_method: "none",
|
|
93
|
+
grant_types: ["authorization_code", "refresh_token"],
|
|
94
|
+
response_types: ["code"],
|
|
95
|
+
}),
|
|
96
|
+
});
|
|
97
|
+
if (!reg.ok) {
|
|
98
|
+
throw new Error(`client registration failed (${reg.status})`);
|
|
99
|
+
}
|
|
100
|
+
const client = (await reg.json());
|
|
101
|
+
const authorize = new URL(`${gatewayUrl}/authorize`);
|
|
102
|
+
authorize.searchParams.set("client_id", client.client_id);
|
|
103
|
+
authorize.searchParams.set("redirect_uri", redirectUri);
|
|
104
|
+
authorize.searchParams.set("response_type", "code");
|
|
105
|
+
authorize.searchParams.set("code_challenge", challenge);
|
|
106
|
+
authorize.searchParams.set("code_challenge_method", "S256");
|
|
107
|
+
authorize.searchParams.set("state", oauthState);
|
|
108
|
+
const resource = `${gatewayUrl}/mcp`;
|
|
109
|
+
authorize.searchParams.set("resource", resource);
|
|
110
|
+
log("Open this URL to authorize Wayform with GitHub:");
|
|
111
|
+
log(` ${authorize.href}`);
|
|
112
|
+
(deps.openUrl ?? defaultOpen)(authorize.href);
|
|
113
|
+
const code = await codePromise;
|
|
114
|
+
const tokenRes = await fetchImpl(`${gatewayUrl}/oauth/token`, {
|
|
115
|
+
method: "POST",
|
|
116
|
+
headers: { "content-type": "application/x-www-form-urlencoded" },
|
|
117
|
+
body: new URLSearchParams({
|
|
118
|
+
grant_type: "authorization_code",
|
|
119
|
+
code,
|
|
120
|
+
redirect_uri: redirectUri,
|
|
121
|
+
client_id: client.client_id,
|
|
122
|
+
code_verifier: verifier,
|
|
123
|
+
resource,
|
|
124
|
+
}).toString(),
|
|
125
|
+
});
|
|
126
|
+
if (!tokenRes.ok) {
|
|
127
|
+
throw new Error(`token exchange failed (${tokenRes.status})`);
|
|
128
|
+
}
|
|
129
|
+
const tokens = (await tokenRes.json());
|
|
130
|
+
if (!tokens.access_token) {
|
|
131
|
+
throw new Error("token response missing access_token");
|
|
132
|
+
}
|
|
133
|
+
saveStoredOAuth(gatewayUrl, {
|
|
134
|
+
client_id: client.client_id,
|
|
135
|
+
access_token: tokens.access_token,
|
|
136
|
+
refresh_token: tokens.refresh_token,
|
|
137
|
+
expires_at: Date.now() + (tokens.expires_in ?? 3600) * 1000,
|
|
138
|
+
token_endpoint: `${gatewayUrl}/oauth/token`,
|
|
139
|
+
resource,
|
|
140
|
+
}, deps.credentialStore);
|
|
141
|
+
log("Logged in. Restart your agent, then ask it to record a test decision.");
|
|
142
|
+
}
|
|
143
|
+
catch (err) {
|
|
144
|
+
clearTimeout(timeout);
|
|
145
|
+
listener.close();
|
|
146
|
+
throw err;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
//# sourceMappingURL=oauth-login.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-login.js","sourceRoot":"","sources":["../src/oauth-login.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { loadStoredOAuth, saveStoredOAuth, } from "./keychain.js";
|
|
2
|
+
const REFRESH_SKEW_MS = 60_000;
|
|
3
|
+
const LOGIN_REQUIRED = "Wayform login expired — run: wayform login";
|
|
4
|
+
const refreshes = new Map();
|
|
5
|
+
function requireLogin() {
|
|
6
|
+
throw new Error(LOGIN_REQUIRED);
|
|
7
|
+
}
|
|
8
|
+
function isTerminalRefreshFailure(status) {
|
|
9
|
+
return status === 400 || status === 401 || status === 403;
|
|
10
|
+
}
|
|
11
|
+
function concurrentSession(gatewayUrl, stored, store) {
|
|
12
|
+
const latest = loadStoredOAuth(gatewayUrl, store);
|
|
13
|
+
if (latest?.access_token &&
|
|
14
|
+
(latest.access_token !== stored.access_token ||
|
|
15
|
+
latest.refresh_token !== stored.refresh_token)) {
|
|
16
|
+
return latest;
|
|
17
|
+
}
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
async function refreshAccessToken(gatewayUrl, stored, options) {
|
|
21
|
+
const now = options.now ?? Date.now;
|
|
22
|
+
if (!stored.refresh_token || !stored.client_id || !stored.token_endpoint) {
|
|
23
|
+
return requireLogin();
|
|
24
|
+
}
|
|
25
|
+
const fetchImpl = options.fetchImpl ?? fetch;
|
|
26
|
+
let response;
|
|
27
|
+
try {
|
|
28
|
+
response = await fetchImpl(stored.token_endpoint, {
|
|
29
|
+
method: "POST",
|
|
30
|
+
headers: { "content-type": "application/x-www-form-urlencoded" },
|
|
31
|
+
body: new URLSearchParams({
|
|
32
|
+
grant_type: "refresh_token",
|
|
33
|
+
refresh_token: stored.refresh_token,
|
|
34
|
+
client_id: stored.client_id,
|
|
35
|
+
resource: stored.resource,
|
|
36
|
+
}).toString(),
|
|
37
|
+
signal: options.signal,
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
throw new Error("Wayform could not refresh the OAuth session", {
|
|
42
|
+
cause: error,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
if (!response.ok) {
|
|
46
|
+
if (isTerminalRefreshFailure(response.status)) {
|
|
47
|
+
const concurrent = concurrentSession(gatewayUrl, stored, options.store);
|
|
48
|
+
if (concurrent)
|
|
49
|
+
return concurrent.access_token;
|
|
50
|
+
return requireLogin();
|
|
51
|
+
}
|
|
52
|
+
throw new Error(`Wayform OAuth refresh failed (${response.status})`);
|
|
53
|
+
}
|
|
54
|
+
const body = (await response.json());
|
|
55
|
+
if (typeof body.access_token !== "string" || !body.access_token) {
|
|
56
|
+
const concurrent = concurrentSession(gatewayUrl, stored, options.store);
|
|
57
|
+
if (concurrent)
|
|
58
|
+
return concurrent.access_token;
|
|
59
|
+
return requireLogin();
|
|
60
|
+
}
|
|
61
|
+
const expiresIn = typeof body.expires_in === "number" &&
|
|
62
|
+
Number.isFinite(body.expires_in) &&
|
|
63
|
+
body.expires_in > 0
|
|
64
|
+
? body.expires_in
|
|
65
|
+
: 3600;
|
|
66
|
+
const refreshed = {
|
|
67
|
+
...stored,
|
|
68
|
+
access_token: body.access_token,
|
|
69
|
+
refresh_token: typeof body.refresh_token === "string" && body.refresh_token
|
|
70
|
+
? body.refresh_token
|
|
71
|
+
: stored.refresh_token,
|
|
72
|
+
expires_at: now() + expiresIn * 1000,
|
|
73
|
+
};
|
|
74
|
+
saveStoredOAuth(gatewayUrl, refreshed, options.store);
|
|
75
|
+
return refreshed.access_token;
|
|
76
|
+
}
|
|
77
|
+
export async function getValidAccessToken(gatewayUrl, options = {}) {
|
|
78
|
+
const stored = loadStoredOAuth(gatewayUrl, options.store);
|
|
79
|
+
if (!stored?.access_token) {
|
|
80
|
+
throw new Error("Wayform is not logged in — run: wayform login");
|
|
81
|
+
}
|
|
82
|
+
const now = options.now ?? Date.now;
|
|
83
|
+
if (!options.forceRefresh && stored.expires_at > now() + REFRESH_SKEW_MS) {
|
|
84
|
+
return stored.access_token;
|
|
85
|
+
}
|
|
86
|
+
const active = refreshes.get(gatewayUrl);
|
|
87
|
+
if (active)
|
|
88
|
+
return active;
|
|
89
|
+
const refresh = refreshAccessToken(gatewayUrl, stored, options);
|
|
90
|
+
refreshes.set(gatewayUrl, refresh);
|
|
91
|
+
try {
|
|
92
|
+
return await refresh;
|
|
93
|
+
}
|
|
94
|
+
finally {
|
|
95
|
+
if (refreshes.get(gatewayUrl) === refresh)
|
|
96
|
+
refreshes.delete(gatewayUrl);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
function withAuthorization(init, accessToken) {
|
|
100
|
+
const headers = new Headers(init?.headers);
|
|
101
|
+
headers.set("authorization", `Bearer ${accessToken}`);
|
|
102
|
+
return { ...init, headers };
|
|
103
|
+
}
|
|
104
|
+
export async function oauthFetch(gatewayUrl, input, init = {}, options = {}) {
|
|
105
|
+
const fetchImpl = options.fetchImpl ?? fetch;
|
|
106
|
+
const sessionOptions = {
|
|
107
|
+
...options,
|
|
108
|
+
signal: options.signal ?? init.signal ?? undefined,
|
|
109
|
+
};
|
|
110
|
+
const accessToken = await getValidAccessToken(gatewayUrl, sessionOptions);
|
|
111
|
+
const firstInput = input instanceof Request ? input.clone() : input;
|
|
112
|
+
const first = await fetchImpl(firstInput, withAuthorization(init, accessToken));
|
|
113
|
+
if (first.status !== 401)
|
|
114
|
+
return first;
|
|
115
|
+
const refreshed = await getValidAccessToken(gatewayUrl, {
|
|
116
|
+
...sessionOptions,
|
|
117
|
+
forceRefresh: true,
|
|
118
|
+
});
|
|
119
|
+
const retryInput = input instanceof Request ? input.clone() : input;
|
|
120
|
+
return fetchImpl(retryInput, withAuthorization(init, refreshed));
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=oauth-session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-session.js","sourceRoot":"","sources":["../src/oauth-session.ts"],"names":[],"mappings":"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"}
|
package/dist/remote-read.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
|
+
import { oauthFetch } from "./oauth-session.js";
|
|
1
2
|
const REMOTE_TIMEOUT_MS = 4000;
|
|
2
3
|
function configured(cfg) {
|
|
3
|
-
return Boolean(cfg.gatewayUrl
|
|
4
|
+
return Boolean(cfg.gatewayUrl);
|
|
4
5
|
}
|
|
5
|
-
export async function remoteApiRead(cfg, opts, fetchImpl =
|
|
6
|
+
export async function remoteApiRead(cfg, opts, fetchImpl = oauthFetch) {
|
|
6
7
|
if (!configured(cfg))
|
|
7
8
|
return null;
|
|
8
9
|
try {
|
|
9
|
-
const url = new URL(`${cfg.gatewayUrl}/api/read`);
|
|
10
|
+
const url = new URL(`${cfg.gatewayUrl}/mcp/api/read`);
|
|
10
11
|
url.searchParams.set("project", opts.project);
|
|
11
12
|
if (opts.query)
|
|
12
13
|
url.searchParams.set("query", opts.query);
|
|
@@ -16,8 +17,7 @@ export async function remoteApiRead(cfg, opts, fetchImpl = fetch) {
|
|
|
16
17
|
url.searchParams.set("kinds", opts.kinds.join(","));
|
|
17
18
|
if (opts.trigger)
|
|
18
19
|
url.searchParams.set("trigger", opts.trigger);
|
|
19
|
-
const res = await fetchImpl(url.toString(), {
|
|
20
|
-
headers: { authorization: `Bearer ${cfg.gatewayToken}` },
|
|
20
|
+
const res = await fetchImpl(cfg.gatewayUrl, url.toString(), {
|
|
21
21
|
signal: AbortSignal.timeout(REMOTE_TIMEOUT_MS),
|
|
22
22
|
});
|
|
23
23
|
if (!res.ok)
|
|
@@ -35,15 +35,14 @@ export async function remoteApiRead(cfg, opts, fetchImpl = fetch) {
|
|
|
35
35
|
return null;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
export async function remoteHookRead(cfg, project, budgetTokens, fetchImpl =
|
|
38
|
+
export async function remoteHookRead(cfg, project, budgetTokens, fetchImpl = oauthFetch) {
|
|
39
39
|
if (!configured(cfg))
|
|
40
40
|
return null;
|
|
41
41
|
try {
|
|
42
|
-
const url = new URL(`${cfg.gatewayUrl}/hook/read`);
|
|
42
|
+
const url = new URL(`${cfg.gatewayUrl}/mcp/hook/read`);
|
|
43
43
|
url.searchParams.set("project", project);
|
|
44
44
|
url.searchParams.set("budget", String(budgetTokens));
|
|
45
|
-
const res = await fetchImpl(url.toString(), {
|
|
46
|
-
headers: { authorization: `Bearer ${cfg.gatewayToken}` },
|
|
45
|
+
const res = await fetchImpl(cfg.gatewayUrl, url.toString(), {
|
|
47
46
|
signal: AbortSignal.timeout(REMOTE_TIMEOUT_MS),
|
|
48
47
|
});
|
|
49
48
|
if (!res.ok)
|
|
@@ -54,15 +53,14 @@ export async function remoteHookRead(cfg, project, budgetTokens, fetchImpl = fet
|
|
|
54
53
|
return null;
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
|
-
/** POST /hook/prompt — returns inject text or "" (nothing to inject) or null (gateway unusable). */
|
|
58
|
-
export async function remoteHookPrompt(cfg, project, prompt, budgetTokens, fetchImpl =
|
|
56
|
+
/** POST /mcp/hook/prompt — returns inject text or "" (nothing to inject) or null (gateway unusable). */
|
|
57
|
+
export async function remoteHookPrompt(cfg, project, prompt, budgetTokens, fetchImpl = oauthFetch) {
|
|
59
58
|
if (!configured(cfg))
|
|
60
59
|
return null;
|
|
61
60
|
try {
|
|
62
|
-
const res = await fetchImpl(`${cfg.gatewayUrl}/hook/prompt`, {
|
|
61
|
+
const res = await fetchImpl(cfg.gatewayUrl, `${cfg.gatewayUrl}/mcp/hook/prompt`, {
|
|
63
62
|
method: "POST",
|
|
64
63
|
headers: {
|
|
65
|
-
authorization: `Bearer ${cfg.gatewayToken}`,
|
|
66
64
|
"content-type": "application/json",
|
|
67
65
|
},
|
|
68
66
|
body: JSON.stringify({ project, prompt, budget: budgetTokens }),
|
package/dist/remote-read.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-read.js","sourceRoot":"","sources":["../src/remote-read.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remote-read.js","sourceRoot":"","sources":["../src/remote-read.ts"],"names":[],"mappings":"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"}
|