wayform 0.4.0 → 0.4.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/dist/cli.js +30 -22
- package/dist/cli.js.map +1 -1
- package/dist/hook-daemon.js +297 -0
- package/dist/hook-daemon.js.map +1 -0
- package/dist/remote-read.js +19 -2
- package/dist/remote-read.js.map +1 -1
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -13,21 +13,14 @@
|
|
|
13
13
|
* wayform build <N> [flags] -> launch your agent to build plan #N
|
|
14
14
|
* wayform doctor -> local diagnostics
|
|
15
15
|
* wayform space create [flags] -> print App install URL + allowlist reminder
|
|
16
|
+
* wayform hookd [--status] -> local keep-alive pipe for hooks (self-spawned)
|
|
16
17
|
*
|
|
17
18
|
* `hook`/`prompt-hook` set WAYFORM_HOOK_CLIENT from the positional arg, then
|
|
18
19
|
* delegate to the neutral run functions (which self-load .memorylayer-hook.env).
|
|
19
20
|
*/
|
|
20
|
-
import { loadHookEnv } from "./config.js";
|
|
21
|
-
|
|
22
|
-
import
|
|
23
|
-
import { runPromptHook } from "./prompt-hook.js";
|
|
24
|
-
import { runGuardHook } from "./guard-hook.js";
|
|
25
|
-
import { runInit } from "./init.js";
|
|
26
|
-
import { runBuild } from "./build.js";
|
|
27
|
-
import { runDoctor } from "./doctor.js";
|
|
28
|
-
import { runSpaceCreate } from "./space-create.js";
|
|
29
|
-
import { runLogin } from "./oauth-login.js";
|
|
30
|
-
import { runToken } from "./token.js";
|
|
21
|
+
import { loadConfig, loadHookEnv } from "./config.js";
|
|
22
|
+
// Subcommands load lazily: hooks run once per turn in a fresh process, and the
|
|
23
|
+
// MCP server's import graph alone cost every hook ~120 ms of startup.
|
|
31
24
|
async function main() {
|
|
32
25
|
// Self-load .memorylayer-hook.env from the project cwd for every subcommand,
|
|
33
26
|
// so the command is self-contained (no bash launcher). loadConfig stays pure.
|
|
@@ -37,17 +30,17 @@ async function main() {
|
|
|
37
30
|
case "hook":
|
|
38
31
|
if (rest[0])
|
|
39
32
|
process.env.WAYFORM_HOOK_CLIENT = rest[0];
|
|
40
|
-
await runHook();
|
|
33
|
+
await (await import("./hook.js")).runHook();
|
|
41
34
|
return;
|
|
42
35
|
case "prompt-hook":
|
|
43
36
|
if (rest[0])
|
|
44
37
|
process.env.WAYFORM_HOOK_CLIENT = rest[0];
|
|
45
|
-
await runPromptHook();
|
|
38
|
+
await (await import("./prompt-hook.js")).runPromptHook();
|
|
46
39
|
return;
|
|
47
40
|
case "guard":
|
|
48
41
|
if (rest[0])
|
|
49
42
|
process.env.WAYFORM_HOOK_CLIENT = rest[0];
|
|
50
|
-
await runGuardHook();
|
|
43
|
+
await (await import("./guard-hook.js")).runGuardHook();
|
|
51
44
|
return;
|
|
52
45
|
case "stop-review":
|
|
53
46
|
// Stop re-engagement retired (da491a7d): emit the client no-op so stale
|
|
@@ -55,33 +48,48 @@ async function main() {
|
|
|
55
48
|
process.stdout.write(rest[0] === "raw" ? "" : "{}");
|
|
56
49
|
return;
|
|
57
50
|
case "init":
|
|
58
|
-
await runInit(rest);
|
|
51
|
+
await (await import("./init.js")).runInit(rest);
|
|
59
52
|
return;
|
|
60
53
|
case "build":
|
|
61
|
-
await runBuild(rest);
|
|
54
|
+
await (await import("./build.js")).runBuild(rest);
|
|
62
55
|
return;
|
|
63
56
|
case "doctor":
|
|
64
|
-
await runDoctor();
|
|
57
|
+
await (await import("./doctor.js")).runDoctor();
|
|
65
58
|
return;
|
|
66
59
|
case "login":
|
|
67
|
-
await runLogin(rest);
|
|
60
|
+
await (await import("./oauth-login.js")).runLogin(rest);
|
|
68
61
|
return;
|
|
69
62
|
case "token":
|
|
70
|
-
await runToken(rest);
|
|
63
|
+
await (await import("./token.js")).runToken(rest);
|
|
71
64
|
return;
|
|
65
|
+
case "hookd": {
|
|
66
|
+
const { daemonRunning, socketPath, startDaemon } = await import("./hook-daemon.js");
|
|
67
|
+
if (rest[0] === "--status") {
|
|
68
|
+
const up = await daemonRunning();
|
|
69
|
+
console.log(`hookd ${up ? "running" : "not running"}: ${socketPath()}`);
|
|
70
|
+
if (!up)
|
|
71
|
+
process.exitCode = 1;
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
const { gatewayUrl } = loadConfig();
|
|
75
|
+
if (!gatewayUrl)
|
|
76
|
+
throw new Error("hookd needs WAYFORM_GATEWAY_URL");
|
|
77
|
+
await startDaemon({ gatewayUrl, socketPath: socketPath() });
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
72
80
|
case "space":
|
|
73
81
|
if (rest[0] === "create") {
|
|
74
|
-
await runSpaceCreate(rest.slice(1));
|
|
82
|
+
await (await import("./space-create.js")).runSpaceCreate(rest.slice(1));
|
|
75
83
|
return;
|
|
76
84
|
}
|
|
77
85
|
console.error(`Unknown "space" subcommand "${rest[0]}". Use: wayform space create --owner <github-login>`);
|
|
78
86
|
process.exit(1);
|
|
79
87
|
return;
|
|
80
88
|
case undefined:
|
|
81
|
-
await runServer();
|
|
89
|
+
await (await import("./index.js")).runServer();
|
|
82
90
|
return;
|
|
83
91
|
default:
|
|
84
|
-
console.error(`Unknown command "${sub}". Use: wayform [hook|prompt-hook|guard|stop-review|init|build|doctor|login|token|space] …`);
|
|
92
|
+
console.error(`Unknown command "${sub}". Use: wayform [hook|prompt-hook|guard|stop-review|init|build|doctor|login|token|hookd|space] …`);
|
|
85
93
|
process.exit(1);
|
|
86
94
|
}
|
|
87
95
|
}
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEtD,+EAA+E;AAC/E,sEAAsE;AAEtE,KAAK,UAAU,IAAI;IACjB,6EAA6E;IAC7E,8EAA8E;IAC9E,WAAW,EAAE,CAAC;IAEd,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE7C,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,IAAI,IAAI,CAAC,CAAC,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5C,OAAO;QACT,KAAK,aAAa;YAChB,IAAI,IAAI,CAAC,CAAC,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;YACzD,OAAO;QACT,KAAK,OAAO;YACV,IAAI,IAAI,CAAC,CAAC,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;YACvD,OAAO;QACT,KAAK,aAAa;YAChB,wEAAwE;YACxE,mDAAmD;YACnD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACpD,OAAO;QACT,KAAK,MAAM;YACT,MAAM,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChD,OAAO;QACT,KAAK,OAAO;YACV,MAAM,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClD,OAAO;QACT,KAAK,QAAQ;YACX,MAAM,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAChD,OAAO;QACT,KAAK,OAAO;YACV,MAAM,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxD,OAAO;QACT,KAAK,OAAO;YACV,MAAM,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClD,OAAO;QACT,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,GAC9C,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACnC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;gBAC3B,MAAM,EAAE,GAAG,MAAM,aAAa,EAAE,CAAC;gBACjC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,KAAK,UAAU,EAAE,EAAE,CAAC,CAAC;gBACxE,IAAI,CAAC,EAAE;oBAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBAC9B,OAAO;YACT,CAAC;YACD,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACpE,MAAM,WAAW,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;YAC5D,OAAO;QACT,CAAC;QACD,KAAK,OAAO;YACV,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACzB,MAAM,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxE,OAAO;YACT,CAAC;YACD,OAAO,CAAC,KAAK,CACX,+BAA+B,IAAI,CAAC,CAAC,CAAC,qDAAqD,CAC5F,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO;QACT,KAAK,SAAS;YACZ,MAAM,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAC/C,OAAO;QACT;YACE,OAAO,CAAC,KAAK,CACX,oBAAoB,GAAG,kGAAkG,CAC1H,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Local keep-alive pipe for hooks (plan #23). Every hook is a fresh process,
|
|
3
|
+
* so each call paid DNS + TCP + TLS to the gateway before any work. `wayform
|
|
4
|
+
* hookd` holds one warm keep-alive connection and relays hook requests that
|
|
5
|
+
* arrive over a user-only unix socket (a named pipe on Windows).
|
|
6
|
+
*
|
|
7
|
+
* Not an MCP server: it forwards plain HTTP to the ONE configured gateway
|
|
8
|
+
* origin and nothing else. The bearer token rides each request from the hook
|
|
9
|
+
* (oauthFetch); the daemon never stores or logs it. Clients fall back to a
|
|
10
|
+
* direct fetch whenever the daemon is not there, so it is only ever a speedup.
|
|
11
|
+
*/
|
|
12
|
+
import http from "node:http";
|
|
13
|
+
import https from "node:https";
|
|
14
|
+
import net from "node:net";
|
|
15
|
+
import os from "node:os";
|
|
16
|
+
import path from "node:path";
|
|
17
|
+
import { chmodSync, lstatSync, rmSync } from "node:fs";
|
|
18
|
+
import { spawn } from "node:child_process";
|
|
19
|
+
import { fileURLToPath } from "node:url";
|
|
20
|
+
const CONNECT_TIMEOUT_MS = 50;
|
|
21
|
+
const RELAY_TIMEOUT_MS = 10_000;
|
|
22
|
+
const IDLE_MS = 1_800_000;
|
|
23
|
+
const PING_MS = 50_000;
|
|
24
|
+
const NULL_BODY = new Set([101, 204, 205, 304]);
|
|
25
|
+
// Recomputed by the client's Response; relaying them would corrupt the body.
|
|
26
|
+
const DROP = new Set([
|
|
27
|
+
"connection",
|
|
28
|
+
"keep-alive",
|
|
29
|
+
"transfer-encoding",
|
|
30
|
+
"content-length",
|
|
31
|
+
"content-encoding",
|
|
32
|
+
]);
|
|
33
|
+
const WIN = process.platform === "win32";
|
|
34
|
+
export function socketPath() {
|
|
35
|
+
return WIN
|
|
36
|
+
? `\\\\.\\pipe\\wayform-${os.userInfo().username}`
|
|
37
|
+
: path.join(os.tmpdir(), `wayform-${process.getuid?.() ?? "u"}.sock`);
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* A shared /tmp is writable by anyone, so only a socket WE own may carry our
|
|
41
|
+
* bearer token. undefined = nothing there.
|
|
42
|
+
* ponytail: any user can squat a Windows pipe name, so Windows never relays
|
|
43
|
+
* (direct fetch, no spawn); add a pipe-owner SID check to enable it there.
|
|
44
|
+
*/
|
|
45
|
+
function ours(p) {
|
|
46
|
+
if (WIN)
|
|
47
|
+
return false;
|
|
48
|
+
try {
|
|
49
|
+
const st = lstatSync(p);
|
|
50
|
+
return st.isSocket() && st.uid === process.getuid?.();
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
export function daemonRunning(p = socketPath()) {
|
|
57
|
+
return new Promise((resolve) => {
|
|
58
|
+
const s = net.connect(p, () => {
|
|
59
|
+
s.destroy();
|
|
60
|
+
resolve(true);
|
|
61
|
+
});
|
|
62
|
+
s.on("error", () => resolve(false));
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* "down" = no daemon (fall back + spawn); "slow" = connect timed out or was
|
|
67
|
+
* aborted (fall back, no spawn); "refused" = daemon said no before forwarding
|
|
68
|
+
* (fall back). Once the request may have reached the gateway, failures REJECT
|
|
69
|
+
* instead: a direct retry would replay a non-idempotent POST.
|
|
70
|
+
*/
|
|
71
|
+
function relay(p, msg, signal) {
|
|
72
|
+
let timer;
|
|
73
|
+
let backstop;
|
|
74
|
+
return new Promise((resolve, reject) => {
|
|
75
|
+
let connected = false;
|
|
76
|
+
const req = http.request({
|
|
77
|
+
socketPath: p,
|
|
78
|
+
method: "POST",
|
|
79
|
+
path: "/",
|
|
80
|
+
agent: false,
|
|
81
|
+
headers: { "content-type": "application/json" },
|
|
82
|
+
signal: signal ?? undefined,
|
|
83
|
+
}, (res) => {
|
|
84
|
+
let body = "";
|
|
85
|
+
res.setEncoding("utf8");
|
|
86
|
+
res.on("data", (c) => (body += c));
|
|
87
|
+
res.on("error", reject);
|
|
88
|
+
res.on("close", () => {
|
|
89
|
+
if (!res.complete)
|
|
90
|
+
reject(new Error("hookd: relay cut short"));
|
|
91
|
+
});
|
|
92
|
+
res.on("end", () => {
|
|
93
|
+
if (res.statusCode === 400)
|
|
94
|
+
return resolve("refused");
|
|
95
|
+
if (res.statusCode !== 200)
|
|
96
|
+
return reject(new Error(`hookd: upstream failed (${res.statusCode})`));
|
|
97
|
+
try {
|
|
98
|
+
resolve(JSON.parse(body));
|
|
99
|
+
}
|
|
100
|
+
catch (err) {
|
|
101
|
+
reject(err);
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
// A CONNECT timeout here; the caller's AbortSignal bounds the gateway, and
|
|
106
|
+
// the backstop bounds everything if a caller passed none.
|
|
107
|
+
timer = setTimeout(() => req.destroy(), CONNECT_TIMEOUT_MS);
|
|
108
|
+
backstop = setTimeout(() => req.destroy(new Error("hookd: relay timeout")), RELAY_TIMEOUT_MS);
|
|
109
|
+
req.on("socket", (s) => s.once("connect", () => {
|
|
110
|
+
connected = true;
|
|
111
|
+
clearTimeout(timer);
|
|
112
|
+
}));
|
|
113
|
+
req.on("error", (err) => {
|
|
114
|
+
if (connected)
|
|
115
|
+
return reject(err);
|
|
116
|
+
const absent = err.code === "ENOENT" || err.code === "ECONNREFUSED";
|
|
117
|
+
resolve(absent ? "down" : "slow");
|
|
118
|
+
});
|
|
119
|
+
req.end(msg);
|
|
120
|
+
}).finally(() => {
|
|
121
|
+
clearTimeout(timer);
|
|
122
|
+
clearTimeout(backstop);
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
function note(what) {
|
|
126
|
+
if (process.env.WAYFORM_TIMING === "1")
|
|
127
|
+
process.stderr.write(`wayform-timing hookd=${what}\n`);
|
|
128
|
+
}
|
|
129
|
+
export function daemonFetchVia(p, spawnDaemon) {
|
|
130
|
+
return async (gatewayUrl, input, init = {}) => {
|
|
131
|
+
const url = input instanceof Request ? "" : String(input);
|
|
132
|
+
const { body } = init;
|
|
133
|
+
// /oauth/* goes direct: the refresh grant rotates its token, so it must
|
|
134
|
+
// go out exactly once on a path with no relay in between.
|
|
135
|
+
if (!url ||
|
|
136
|
+
(body != null && typeof body !== "string") ||
|
|
137
|
+
new URL(url).origin !== new URL(gatewayUrl).origin ||
|
|
138
|
+
new URL(url).pathname.startsWith("/oauth/"))
|
|
139
|
+
return fetch(input, init);
|
|
140
|
+
const trusted = ours(p);
|
|
141
|
+
const r = trusted
|
|
142
|
+
? await relay(p, JSON.stringify({
|
|
143
|
+
url,
|
|
144
|
+
method: init.method ?? "GET",
|
|
145
|
+
headers: Object.fromEntries(new Headers(init.headers)),
|
|
146
|
+
body,
|
|
147
|
+
}), init.signal)
|
|
148
|
+
: "down";
|
|
149
|
+
if (typeof r === "object") {
|
|
150
|
+
note("hit");
|
|
151
|
+
return new Response(NULL_BODY.has(r.status) ? null : r.body, {
|
|
152
|
+
status: r.status,
|
|
153
|
+
headers: r.headers,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
note(trusted === false ? "untrusted" : r);
|
|
157
|
+
// A foreign/non-socket file can't be reclaimed, so a spawn would be wasted.
|
|
158
|
+
if (r === "down" && trusted !== false)
|
|
159
|
+
spawnDaemon();
|
|
160
|
+
return fetch(input, init);
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
const CLI = fileURLToPath(new URL("./cli.js", import.meta.url));
|
|
164
|
+
function spawnHookd() {
|
|
165
|
+
// Tests must never leave a real daemon squatting the user's socket.
|
|
166
|
+
if (process.env.NODE_ENV === "test")
|
|
167
|
+
return;
|
|
168
|
+
try {
|
|
169
|
+
spawn(process.execPath, [CLI, "hookd"], {
|
|
170
|
+
detached: true,
|
|
171
|
+
stdio: "ignore",
|
|
172
|
+
windowsHide: true,
|
|
173
|
+
})
|
|
174
|
+
.on("error", () => { })
|
|
175
|
+
.unref();
|
|
176
|
+
}
|
|
177
|
+
catch {
|
|
178
|
+
// Best-effort: the direct fetch already served this call.
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
export const daemonFetch = daemonFetchVia(socketPath(), spawnHookd);
|
|
182
|
+
/** Take the socket path: free, or a stale socket of ours. Anything else is refused. */
|
|
183
|
+
async function claim(p) {
|
|
184
|
+
if (WIN)
|
|
185
|
+
return;
|
|
186
|
+
const own = ours(p);
|
|
187
|
+
if (own === undefined)
|
|
188
|
+
return;
|
|
189
|
+
if (!own)
|
|
190
|
+
throw new Error(`hookd: ${p} is not our socket — refusing it`);
|
|
191
|
+
if (await daemonRunning(p))
|
|
192
|
+
throw new Error("hookd: already running");
|
|
193
|
+
rmSync(p);
|
|
194
|
+
}
|
|
195
|
+
export async function startDaemon(opts) {
|
|
196
|
+
const p = opts.socketPath;
|
|
197
|
+
const origin = new URL(opts.gatewayUrl).origin;
|
|
198
|
+
const client = origin.startsWith("https:") ? https : http;
|
|
199
|
+
const agent = new client.Agent({
|
|
200
|
+
keepAlive: true,
|
|
201
|
+
maxSockets: 4,
|
|
202
|
+
keepAliveMsecs: 30_000,
|
|
203
|
+
});
|
|
204
|
+
await claim(p);
|
|
205
|
+
let idle;
|
|
206
|
+
const touch = () => {
|
|
207
|
+
clearTimeout(idle);
|
|
208
|
+
idle = setTimeout(() => void close(), opts.idleMs ?? IDLE_MS);
|
|
209
|
+
};
|
|
210
|
+
const server = http.createServer((req, res) => {
|
|
211
|
+
if (req.method === "GET")
|
|
212
|
+
return void res.end("ok"); // liveness probe
|
|
213
|
+
let raw = "";
|
|
214
|
+
req.setEncoding("utf8");
|
|
215
|
+
req.on("data", (c) => (raw += c));
|
|
216
|
+
req.on("end", () => {
|
|
217
|
+
let msg = {};
|
|
218
|
+
let url;
|
|
219
|
+
try {
|
|
220
|
+
msg = JSON.parse(raw);
|
|
221
|
+
url = new URL(String(msg.url));
|
|
222
|
+
}
|
|
223
|
+
catch {
|
|
224
|
+
// falls through to the refusal
|
|
225
|
+
}
|
|
226
|
+
if (url?.origin !== origin || url.pathname.startsWith("/oauth/")) {
|
|
227
|
+
res.statusCode = 400;
|
|
228
|
+
return void res.end("refused");
|
|
229
|
+
}
|
|
230
|
+
touch();
|
|
231
|
+
// 502 = it may have reached the gateway, so the client fails open
|
|
232
|
+
// rather than replay it.
|
|
233
|
+
const fail = () => {
|
|
234
|
+
if (res.writableEnded)
|
|
235
|
+
return;
|
|
236
|
+
res.statusCode = 502;
|
|
237
|
+
res.end();
|
|
238
|
+
};
|
|
239
|
+
const up = client.request(url, {
|
|
240
|
+
method: String(msg.method ?? "GET"),
|
|
241
|
+
headers: msg.headers,
|
|
242
|
+
agent,
|
|
243
|
+
}, (u) => {
|
|
244
|
+
let body = "";
|
|
245
|
+
u.setEncoding("utf8");
|
|
246
|
+
u.on("data", (c) => (body += c));
|
|
247
|
+
u.on("error", fail);
|
|
248
|
+
u.on("close", () => {
|
|
249
|
+
if (!u.complete)
|
|
250
|
+
fail();
|
|
251
|
+
});
|
|
252
|
+
u.on("end", () => {
|
|
253
|
+
const headers = {};
|
|
254
|
+
for (const [k, v] of Object.entries(u.headers))
|
|
255
|
+
if (v != null && !DROP.has(k))
|
|
256
|
+
headers[k] = Array.isArray(v) ? v.join(", ") : v;
|
|
257
|
+
res.setHeader("content-type", "application/json");
|
|
258
|
+
res.end(JSON.stringify({ status: u.statusCode, headers, body }));
|
|
259
|
+
});
|
|
260
|
+
});
|
|
261
|
+
up.on("error", fail);
|
|
262
|
+
// Caller gave up (its AbortSignal): drop the upstream request too.
|
|
263
|
+
res.on("close", () => {
|
|
264
|
+
if (!res.writableFinished)
|
|
265
|
+
up.destroy();
|
|
266
|
+
});
|
|
267
|
+
up.end(typeof msg.body === "string" ? msg.body : undefined);
|
|
268
|
+
});
|
|
269
|
+
});
|
|
270
|
+
const old = process.umask(0o177); // socket is born 0600 — no chmod race
|
|
271
|
+
try {
|
|
272
|
+
await new Promise((resolve, reject) => {
|
|
273
|
+
server.once("error", reject);
|
|
274
|
+
server.listen(p, resolve);
|
|
275
|
+
});
|
|
276
|
+
}
|
|
277
|
+
finally {
|
|
278
|
+
process.umask(old);
|
|
279
|
+
}
|
|
280
|
+
if (!WIN)
|
|
281
|
+
chmodSync(p, 0o600);
|
|
282
|
+
const ping = setInterval(() => client
|
|
283
|
+
.get(new URL("/health", origin), { agent }, (r) => r.resume())
|
|
284
|
+
.on("error", () => { }), PING_MS);
|
|
285
|
+
ping.unref();
|
|
286
|
+
touch();
|
|
287
|
+
let closed;
|
|
288
|
+
const close = () => (closed ??= new Promise((resolve) => {
|
|
289
|
+
clearTimeout(idle);
|
|
290
|
+
clearInterval(ping);
|
|
291
|
+
agent.destroy();
|
|
292
|
+
server.close(() => resolve());
|
|
293
|
+
server.closeAllConnections();
|
|
294
|
+
}));
|
|
295
|
+
return { close };
|
|
296
|
+
}
|
|
297
|
+
//# sourceMappingURL=hook-daemon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hook-daemon.js","sourceRoot":"","sources":["../src/hook-daemon.ts"],"names":[],"mappings":"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"}
|
package/dist/remote-read.js
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
import { oauthFetch } from "./oauth-session.js";
|
|
2
|
+
import { daemonFetch } from "./hook-daemon.js";
|
|
2
3
|
const REMOTE_TIMEOUT_MS = 4000;
|
|
4
|
+
/** WAYFORM_TIMING=1: one stderr line per hook call, for latency work. */
|
|
5
|
+
async function timed(route, fn) {
|
|
6
|
+
if (process.env.WAYFORM_TIMING !== "1")
|
|
7
|
+
return fn();
|
|
8
|
+
const t0 = performance.now();
|
|
9
|
+
try {
|
|
10
|
+
return await fn();
|
|
11
|
+
}
|
|
12
|
+
finally {
|
|
13
|
+
process.stderr.write(`wayform-timing route=${route} ms=${Math.round(performance.now() - t0)}\n`);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
/** Per-turn hooks ride the local keep-alive daemon; the token still comes from oauthFetch here. */
|
|
17
|
+
const hookFetch = (gw, input, init) => oauthFetch(gw, input, init, { fetchImpl: (i, n) => daemonFetch(gw, i, n) });
|
|
3
18
|
function configured(cfg) {
|
|
4
19
|
return Boolean(cfg.gatewayUrl);
|
|
5
20
|
}
|
|
@@ -54,7 +69,7 @@ export async function remoteHookRead(cfg, project, budgetTokens, fetchImpl = oau
|
|
|
54
69
|
}
|
|
55
70
|
}
|
|
56
71
|
/** POST /mcp/hook/prompt — returns inject text or "" (nothing to inject) or null (gateway unusable). */
|
|
57
|
-
|
|
72
|
+
async function hookPrompt(cfg, project, prompt, budgetTokens, fetchImpl = hookFetch) {
|
|
58
73
|
if (!configured(cfg))
|
|
59
74
|
return null;
|
|
60
75
|
try {
|
|
@@ -104,7 +119,7 @@ export async function remoteApiPlans(cfg, project, fetchImpl = oauthFetch) {
|
|
|
104
119
|
}
|
|
105
120
|
}
|
|
106
121
|
/** POST /mcp/hook/guard — null means "gateway unusable"; callers allow. */
|
|
107
|
-
|
|
122
|
+
async function guardCheck(cfg, project, action, { fetchImpl = hookFetch, agent, } = {}) {
|
|
108
123
|
if (!configured(cfg))
|
|
109
124
|
return null;
|
|
110
125
|
try {
|
|
@@ -138,4 +153,6 @@ export async function remoteGuardCheck(cfg, project, action, { fetchImpl = oauth
|
|
|
138
153
|
return null;
|
|
139
154
|
}
|
|
140
155
|
}
|
|
156
|
+
export const remoteHookPrompt = (...a) => timed("prompt", () => hookPrompt(...a));
|
|
157
|
+
export const remoteGuardCheck = (...a) => timed("guard", () => guardCheck(...a));
|
|
141
158
|
//# sourceMappingURL=remote-read.js.map
|
package/dist/remote-read.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-read.js","sourceRoot":"","sources":["../src/remote-read.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-read.js","sourceRoot":"","sources":["../src/remote-read.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED