wayform 0.1.8 → 0.3.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 +145 -54
- package/dist/cli.js +25 -10
- package/dist/cli.js.map +1 -1
- package/dist/config.js +46 -24
- 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 +114 -32
- package/dist/doctor.js.map +1 -1
- package/dist/frontmatter.js +25 -0
- package/dist/frontmatter.js.map +1 -1
- package/dist/guard-hook.js +94 -0
- package/dist/guard-hook.js.map +1 -0
- package/dist/hook-clients.js +20 -34
- package/dist/hook-clients.js.map +1 -1
- package/dist/hook.js +3 -3
- package/dist/hook.js.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/init-configs.js +84 -31
- package/dist/init-configs.js.map +1 -1
- package/dist/init-env.js +18 -11
- package/dist/init-env.js.map +1 -1
- package/dist/init-remote.js +186 -98
- package/dist/init-remote.js.map +1 -1
- package/dist/init.js +22 -9
- package/dist/init.js.map +1 -1
- package/dist/keychain.js +19 -0
- package/dist/keychain.js.map +1 -0
- package/dist/metrics.js +1 -1
- package/dist/metrics.js.map +1 -1
- package/dist/oauth-login.js +197 -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/prompt-hook.js +5 -4
- package/dist/prompt-hook.js.map +1 -1
- package/dist/remote-read.js +42 -13
- package/dist/remote-read.js.map +1 -1
- package/dist/session-prompt.js +33 -8
- package/dist/session-prompt.js.map +1 -1
- package/dist/space-create.js +17 -201
- package/dist/space-create.js.map +1 -1
- package/dist/store.js +3 -2
- package/dist/store.js.map +1 -1
- package/dist/token-budget.js +7 -0
- package/dist/token-budget.js.map +1 -1
- package/dist/token.js +36 -0
- package/dist/token.js.map +1 -0
- package/package.json +3 -2
- package/dist/review-prompt.js +0 -25
- package/dist/review-prompt.js.map +0 -1
- package/dist/stop-hook.js +0 -45
- package/dist/stop-hook.js.map +0 -1
package/dist/init-configs.js
CHANGED
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
* - idempotent: our command appears at most once on re-run (matched by command
|
|
8
8
|
* substring / server key).
|
|
9
9
|
*
|
|
10
|
-
* Commands invoke the globally-installed `
|
|
11
|
-
* NOT a bash launcher or npx. All are secret-free: `
|
|
10
|
+
* Commands invoke the globally-installed `wayform` binary (fast, offline),
|
|
11
|
+
* NOT a bash launcher or npx. All are secret-free: `wayform` self-loads
|
|
12
12
|
* `.memorylayer-hook.env` from the project cwd at runtime.
|
|
13
13
|
*/
|
|
14
14
|
import { createHash } from "node:crypto";
|
|
@@ -19,7 +19,7 @@ const asArray = (v) => (Array.isArray(v) ? [...v] : []);
|
|
|
19
19
|
* for this event. `marker` MUST be the stable `<subcommand> <client>` token
|
|
20
20
|
* (e.g. "hook cursor", "stop-review claude-code") — NOT a whole command string —
|
|
21
21
|
* so an equivalent hook that invokes the tool via a different form (the dogfood
|
|
22
|
-
* `node ./dist/cli.js hook cursor`, an absolute path, or `npx
|
|
22
|
+
* `node ./dist/cli.js hook cursor`, an absolute path, or `npx wayform …`) is
|
|
23
23
|
* still recognized and re-running `init` stays idempotent instead of appending a
|
|
24
24
|
* duplicate hook that would fire the read/review twice per turn.
|
|
25
25
|
*/
|
|
@@ -27,7 +27,7 @@ function addOnce(list, marker, entry) {
|
|
|
27
27
|
const present = list.some((item) => JSON.stringify(item).includes(marker));
|
|
28
28
|
return present ? list : [...list, entry];
|
|
29
29
|
}
|
|
30
|
-
export function mergeClaudeSettings(existing, bin = "
|
|
30
|
+
export function mergeClaudeSettings(existing, bin = "wayform") {
|
|
31
31
|
const root = asObject(existing);
|
|
32
32
|
const hooks = asObject(root.hooks);
|
|
33
33
|
hooks.SessionStart = addOnce(asArray(hooks.SessionStart), "hook claude-code", {
|
|
@@ -45,10 +45,20 @@ export function mergeClaudeSettings(existing, bin = "memorylayer") {
|
|
|
45
45
|
},
|
|
46
46
|
],
|
|
47
47
|
});
|
|
48
|
+
// PreToolUse guard (Phase E): matcher limits the hook to mutating tools so
|
|
49
|
+
// reads never pay for a network round trip.
|
|
50
|
+
hooks.PreToolUse = addOnce(asArray(hooks.PreToolUse), "guard claude-code", {
|
|
51
|
+
matcher: "Edit|Write|Bash",
|
|
52
|
+
hooks: [
|
|
53
|
+
// 10s wrapper > GUARD_TIMEOUT_MS (6s) + node startup; the hook itself
|
|
54
|
+
// fails open long before the wrapper would kill it.
|
|
55
|
+
{ type: "command", command: `${bin} guard claude-code`, timeout: 10 },
|
|
56
|
+
],
|
|
57
|
+
});
|
|
48
58
|
root.hooks = hooks;
|
|
49
59
|
return root;
|
|
50
60
|
}
|
|
51
|
-
export function mergeCursorHooks(existing, bin = "
|
|
61
|
+
export function mergeCursorHooks(existing, bin = "wayform") {
|
|
52
62
|
const root = asObject(existing);
|
|
53
63
|
root.version = 1;
|
|
54
64
|
const hooks = asObject(root.hooks);
|
|
@@ -60,7 +70,7 @@ export function mergeCursorHooks(existing, bin = "memorylayer") {
|
|
|
60
70
|
root.hooks = hooks;
|
|
61
71
|
return root;
|
|
62
72
|
}
|
|
63
|
-
export function mergeCodexHooks(existing, bin = "
|
|
73
|
+
export function mergeCodexHooks(existing, bin = "wayform") {
|
|
64
74
|
const root = asObject(existing);
|
|
65
75
|
const hooks = asObject(root.hooks);
|
|
66
76
|
hooks.SessionStart = addOnce(asArray(hooks.SessionStart), "hook codex", {
|
|
@@ -157,52 +167,95 @@ export function mergeCodexTrustToml(existing, entries) {
|
|
|
157
167
|
export function mergeMcpJson(existing) {
|
|
158
168
|
const root = asObject(existing);
|
|
159
169
|
const servers = asObject(root.mcpServers);
|
|
160
|
-
servers.
|
|
170
|
+
servers.wayform = { command: "wayform", args: [], env: {} };
|
|
161
171
|
root.mcpServers = servers;
|
|
162
172
|
return root;
|
|
163
173
|
}
|
|
164
174
|
/**
|
|
165
175
|
* Project-scoped Codex MCP block for the LOCAL (self-hosted clone) tier, written
|
|
166
|
-
* to `.codex/config.toml`. Secret-free stdio server: `command = "
|
|
176
|
+
* to `.codex/config.toml`. Secret-free stdio server: `command = "wayform"`
|
|
167
177
|
* self-loads `.memorylayer-hook.env` at runtime. Codex applies project config
|
|
168
178
|
* for trusted repos, so this needs no global paste.
|
|
169
179
|
*/
|
|
170
|
-
export const CODEX_MCP_TOML = `[mcp_servers.
|
|
171
|
-
command = "
|
|
180
|
+
export const CODEX_MCP_TOML = `[mcp_servers.wayform]
|
|
181
|
+
command = "wayform"
|
|
172
182
|
args = []
|
|
173
183
|
`;
|
|
174
184
|
/**
|
|
175
|
-
* Native HTTP MCP for a hosted member
|
|
176
|
-
*
|
|
177
|
-
*
|
|
185
|
+
* Native HTTP MCP for a hosted member. No token in the file — the client runs
|
|
186
|
+
* OAuth. Used for Cursor `.cursor/mcp.json` and Claude Code project-scope
|
|
187
|
+
* `.mcp.json` (never `~/.cursor/mcp.json` or `--scope user`).
|
|
188
|
+
*
|
|
189
|
+
* `type` is REQUIRED, not decorative: Claude Code skips a `url` entry that
|
|
190
|
+
* omits it ("has a url but no type; add type: http"), so a URL-only file
|
|
191
|
+
* silently yields no tools. Cursor ignores the extra key.
|
|
178
192
|
*/
|
|
179
|
-
export function
|
|
193
|
+
export function mergeRemoteHttpMcp(existing, gatewayUrl) {
|
|
180
194
|
const root = asObject(existing);
|
|
181
195
|
const servers = asObject(root.mcpServers);
|
|
182
|
-
servers.wayform = {
|
|
183
|
-
url: `${gatewayUrl}/mcp`,
|
|
184
|
-
headers: { Authorization: `Bearer ${token}` },
|
|
185
|
-
};
|
|
196
|
+
servers.wayform = { type: "http", url: `${gatewayUrl}/mcp` };
|
|
186
197
|
root.mcpServers = servers;
|
|
187
198
|
return root;
|
|
188
199
|
}
|
|
200
|
+
export const mergeCursorRemoteMcp = mergeRemoteHttpMcp;
|
|
189
201
|
/**
|
|
190
|
-
* Project-scoped Codex MCP block for a HOSTED (gateway) member
|
|
191
|
-
* `.codex/config.toml
|
|
192
|
-
* project config for trusted repos, so no global paste and no `mcp-remote`
|
|
193
|
-
* bridge are needed. The member token is inlined as a literal Authorization
|
|
194
|
-
* header via `http_headers` — the same pattern as `.cursor/mcp.json` — because
|
|
195
|
-
* the env-var alternative (`bearer_token_env_var`) requires exporting the token
|
|
196
|
-
* before every launch and fails SILENTLY for IDE-launched Codex (the MCP client
|
|
197
|
-
* never initializes and the model just sees no tools). Codex rejects a literal
|
|
198
|
-
* `bearer_token` field for HTTP servers; `http_headers` is the sanctioned
|
|
199
|
-
* literal path. This file therefore CARRIES THE TOKEN: `init --remote` MUST
|
|
200
|
-
* gitignore it and harden it to 0600.
|
|
202
|
+
* Project-scoped Codex MCP block for a HOSTED (gateway) member. Lives in
|
|
203
|
+
* `.codex/config.toml` (trusted project only) — not `~/.codex/config.toml`.
|
|
201
204
|
*/
|
|
202
|
-
export function codexRemoteConfigToml(gatewayUrl
|
|
205
|
+
export function codexRemoteConfigToml(gatewayUrl) {
|
|
203
206
|
return `[mcp_servers.wayform]
|
|
204
207
|
url = "${gatewayUrl}/mcp"
|
|
205
|
-
|
|
208
|
+
auth = "oauth"
|
|
206
209
|
`;
|
|
207
210
|
}
|
|
211
|
+
/**
|
|
212
|
+
* Replace only Codex's project-scoped Wayform table. Keeping the operation
|
|
213
|
+
* text-based preserves comments, model settings, trust, and unrelated MCP
|
|
214
|
+
* servers without introducing a TOML serializer that rewrites user config.
|
|
215
|
+
*/
|
|
216
|
+
export function mergeCodexRemoteConfigToml(existing, gatewayUrl) {
|
|
217
|
+
const replacement = codexRemoteConfigToml(gatewayUrl);
|
|
218
|
+
const header = /^\[mcp_servers\.wayform\]\s*$/m;
|
|
219
|
+
const found = header.exec(existing);
|
|
220
|
+
if (!found) {
|
|
221
|
+
let out = existing;
|
|
222
|
+
if (out && !out.endsWith("\n"))
|
|
223
|
+
out += "\n";
|
|
224
|
+
if (out && !out.endsWith("\n\n"))
|
|
225
|
+
out += "\n";
|
|
226
|
+
return out + replacement;
|
|
227
|
+
}
|
|
228
|
+
const nextHeader = /^\[/gm;
|
|
229
|
+
nextHeader.lastIndex = found.index + found[0].length;
|
|
230
|
+
const next = nextHeader.exec(existing);
|
|
231
|
+
const end = next?.index ?? existing.length;
|
|
232
|
+
const suffix = existing.slice(end);
|
|
233
|
+
return (existing.slice(0, found.index) + replacement + (suffix ? "\n" : "") + suffix);
|
|
234
|
+
}
|
|
235
|
+
/**
|
|
236
|
+
* Devin CLI project MCP (`.devin/mcp_config.json`). Not `--scope user` /
|
|
237
|
+
* `~/.config/devin/mcp_config.json`, which would load in every repo.
|
|
238
|
+
*/
|
|
239
|
+
export function mergeDevinRemoteMcp(existing, gatewayUrl) {
|
|
240
|
+
const root = asObject(existing);
|
|
241
|
+
const servers = asObject(root.mcpServers);
|
|
242
|
+
servers.wayform = {
|
|
243
|
+
url: `${gatewayUrl}/mcp`,
|
|
244
|
+
transport: "http",
|
|
245
|
+
};
|
|
246
|
+
root.mcpServers = servers;
|
|
247
|
+
return root;
|
|
248
|
+
}
|
|
249
|
+
/**
|
|
250
|
+
* Antigravity workspace MCP (`.agents/mcp_config.json`). Uses `serverUrl`
|
|
251
|
+
* per Google's schema. Not `~/.gemini/config/mcp_config.json` (global).
|
|
252
|
+
* DCR OAuth: URL only, no headers.
|
|
253
|
+
*/
|
|
254
|
+
export function mergeAntigravityRemoteMcp(existing, gatewayUrl) {
|
|
255
|
+
const root = asObject(existing);
|
|
256
|
+
const servers = asObject(root.mcpServers);
|
|
257
|
+
servers.wayform = { serverUrl: `${gatewayUrl}/mcp` };
|
|
258
|
+
root.mcpServers = servers;
|
|
259
|
+
return root;
|
|
260
|
+
}
|
|
208
261
|
//# sourceMappingURL=init-configs.js.map
|
package/dist/init-configs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-configs.js","sourceRoot":"","sources":["../src/init-configs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAQ,EAAE,CACpC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAI,CAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5E,MAAM,OAAO,GAAG,CAAC,CAAU,EAAa,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE5E;;;;;;;;GAQG;AACH,SAAS,OAAO,CAAC,IAAe,EAAE,MAAc,EAAE,KAAc;IAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,QAAiB,EACjB,MAAc,
|
|
1
|
+
{"version":3,"file":"init-configs.js","sourceRoot":"","sources":["../src/init-configs.ts"],"names":[],"mappings":"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"}
|
package/dist/init-env.js
CHANGED
|
@@ -30,22 +30,19 @@ export function buildHookEnv(v) {
|
|
|
30
30
|
"# Wayform per-user hook config — gitignored. Do NOT commit.",
|
|
31
31
|
"# Written by `wayform init`. Your identity + context-repo access.",
|
|
32
32
|
`CONTEXT_REPO_URL=${v.repoUrl}`,
|
|
33
|
-
`
|
|
34
|
-
`
|
|
35
|
-
`
|
|
33
|
+
`WAYFORM_AUTHOR=${v.author}`,
|
|
34
|
+
`WAYFORM_AUTHOR_EMAIL=${v.email}`,
|
|
35
|
+
`WAYFORM_PROJECT=${v.project}`,
|
|
36
36
|
"",
|
|
37
37
|
].join("\n");
|
|
38
38
|
}
|
|
39
|
-
/** Contents of `.
|
|
39
|
+
/** Contents of `.wayform-hook.env` for a HOSTED (gateway) member. */
|
|
40
40
|
export function buildRemoteHookEnv(v) {
|
|
41
41
|
return [
|
|
42
|
-
"# Wayform
|
|
43
|
-
"# Written by `wayform init --remote`.
|
|
44
|
-
`
|
|
45
|
-
`
|
|
46
|
-
`MEMORYLAYER_PROJECT=${v.project}`,
|
|
47
|
-
`MEMORYLAYER_AUTHOR=${v.author}`,
|
|
48
|
-
`MEMORYLAYER_AUTHOR_EMAIL=${v.email}`,
|
|
42
|
+
"# Wayform hosted hook config — project scoped and credential-free.",
|
|
43
|
+
"# Written by `wayform init --remote`. Safe to commit for teammates.",
|
|
44
|
+
`WAYFORM_GATEWAY_URL=${v.gatewayUrl}`,
|
|
45
|
+
`WAYFORM_PROJECT=${v.project}`,
|
|
49
46
|
"",
|
|
50
47
|
].join("\n");
|
|
51
48
|
}
|
|
@@ -97,4 +94,14 @@ export function ensureGitignore(existing, entries) {
|
|
|
97
94
|
}
|
|
98
95
|
return out;
|
|
99
96
|
}
|
|
97
|
+
/** Remove exact obsolete ignore entries while preserving all unrelated lines. */
|
|
98
|
+
export function removeGitignoreEntries(existing, entries) {
|
|
99
|
+
const removed = new Set(entries);
|
|
100
|
+
const lines = existing
|
|
101
|
+
.split(/\r?\n/)
|
|
102
|
+
.filter((line) => !removed.has(line.trim()));
|
|
103
|
+
while (lines.length > 0 && lines.at(-1) === "")
|
|
104
|
+
lines.pop();
|
|
105
|
+
return lines.length > 0 ? `${lines.join("\n")}\n` : "";
|
|
106
|
+
}
|
|
100
107
|
//# sourceMappingURL=init-env.js.map
|
package/dist/init-env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-env.js","sourceRoot":"","sources":["../src/init-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExE;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,QAAgB;IAC5D,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAClD,gBAAgB,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,0EAA0E;IAC5E,CAAC;AACH,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,YAAY,CAAC,CAK5B;IACC,OAAO;QACL,6DAA6D;QAC7D,mEAAmE;QACnE,oBAAoB,CAAC,CAAC,OAAO,EAAE;QAC/B,
|
|
1
|
+
{"version":3,"file":"init-env.js","sourceRoot":"","sources":["../src/init-env.ts"],"names":[],"mappings":"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"}
|
package/dist/init-remote.js
CHANGED
|
@@ -1,17 +1,19 @@
|
|
|
1
|
+
import { HOOK_ENV_FILE, LEGACY_HOOK_ENV_FILE } from "./config.js";
|
|
1
2
|
/**
|
|
2
3
|
* `wayform init --remote` — wire a HOSTED (gateway) member into the current
|
|
3
|
-
* project. Same LOUD, idempotent posture as local `init`, but writes gateway
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
4
|
+
* project. Same LOUD, idempotent posture as local `init`, but writes a gateway
|
|
5
|
+
* URL + native HTTP MCP instead of a local clone. No member token is written
|
|
6
|
+
* anywhere: selected clients run OAuth; hooks use `wayform login` + keychain.
|
|
7
|
+
* `--clients` picks which vendor folders to write so unused tools are not dumped.
|
|
7
8
|
*/
|
|
8
9
|
import { execFileSync } from "node:child_process";
|
|
9
10
|
import fs from "node:fs";
|
|
10
11
|
import path from "node:path";
|
|
11
12
|
import readline from "node:readline/promises";
|
|
12
13
|
import { stdin as input, stdout as output } from "node:process";
|
|
13
|
-
import { mergeClaudeSettings, mergeCursorHooks, mergeCodexHooks,
|
|
14
|
-
import { buildRemoteHookEnv,
|
|
14
|
+
import { mergeClaudeSettings, mergeCursorHooks, mergeCodexHooks, mergeRemoteHttpMcp, mergeDevinRemoteMcp, mergeAntigravityRemoteMcp, mergeCodexRemoteConfigToml, } from "./init-configs.js";
|
|
15
|
+
import { buildRemoteHookEnv, ensureGitignore, removeGitignoreEntries, writeSecretFile, trustCodexHooks, } from "./init-env.js";
|
|
16
|
+
import { DEFAULT_GATEWAY_URL } from "./oauth-login.js";
|
|
15
17
|
const defaultRunner = (cmd, args) => {
|
|
16
18
|
// Bounded + non-interactive: a hanging or prompting `claude` must never freeze
|
|
17
19
|
// init. On timeout/ENOENT this throws → the caller falls open to a printed
|
|
@@ -38,26 +40,22 @@ const defaultRunner = (cmd, args) => {
|
|
|
38
40
|
throw lastErr;
|
|
39
41
|
};
|
|
40
42
|
/**
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
* returned command is printed for the member to run by hand.
|
|
43
|
+
* Recommended Claude Code CLI if someone adds the server by hand.
|
|
44
|
+
* `--scope project` writes `.mcp.json` in this repo. Never `--scope user`
|
|
45
|
+
* (that would load Wayform in every folder they open).
|
|
45
46
|
*/
|
|
46
|
-
export function registerClaudeCodeMcp(gatewayUrl,
|
|
47
|
+
export function registerClaudeCodeMcp(gatewayUrl, run = defaultRunner) {
|
|
47
48
|
const args = [
|
|
48
49
|
"mcp",
|
|
49
50
|
"add",
|
|
50
51
|
"--transport",
|
|
51
52
|
"http",
|
|
52
53
|
"--scope",
|
|
53
|
-
"
|
|
54
|
+
"project",
|
|
54
55
|
"wayform",
|
|
55
56
|
`${gatewayUrl}/mcp`,
|
|
56
|
-
"--header",
|
|
57
|
-
`Authorization: Bearer ${token}`,
|
|
58
57
|
];
|
|
59
|
-
|
|
60
|
-
const command = `claude ${args.map((a) => (a.includes(" ") ? `"${a}"` : a)).join(" ")}`;
|
|
58
|
+
const command = `claude ${args.join(" ")}`;
|
|
61
59
|
try {
|
|
62
60
|
run("claude", args);
|
|
63
61
|
return { ok: true, command };
|
|
@@ -66,6 +64,47 @@ export function registerClaudeCodeMcp(gatewayUrl, token, run = defaultRunner) {
|
|
|
66
64
|
return { ok: false, command };
|
|
67
65
|
}
|
|
68
66
|
}
|
|
67
|
+
const CLIENT_ALIASES = {
|
|
68
|
+
cursor: "cursor",
|
|
69
|
+
claude: "claude",
|
|
70
|
+
"claude-code": "claude",
|
|
71
|
+
codex: "codex",
|
|
72
|
+
devin: "devin",
|
|
73
|
+
antigravity: "antigravity",
|
|
74
|
+
agy: "antigravity",
|
|
75
|
+
};
|
|
76
|
+
export function parseRemoteClients(raw) {
|
|
77
|
+
const out = [];
|
|
78
|
+
for (const part of raw.split(/[\s,]+/).filter(Boolean)) {
|
|
79
|
+
const id = CLIENT_ALIASES[part.toLowerCase()];
|
|
80
|
+
if (!id) {
|
|
81
|
+
throw new Error(`Unknown client "${part}". Use: cursor, claude, codex, devin, antigravity`);
|
|
82
|
+
}
|
|
83
|
+
if (!out.includes(id))
|
|
84
|
+
out.push(id);
|
|
85
|
+
}
|
|
86
|
+
return out;
|
|
87
|
+
}
|
|
88
|
+
/** Clients that already have a project folder/file in this repo. */
|
|
89
|
+
export function detectExistingClients(cwd) {
|
|
90
|
+
const found = [];
|
|
91
|
+
if (fs.existsSync(path.join(cwd, ".cursor")))
|
|
92
|
+
found.push("cursor");
|
|
93
|
+
if (fs.existsSync(path.join(cwd, ".claude")) ||
|
|
94
|
+
fs.existsSync(path.join(cwd, ".mcp.json"))) {
|
|
95
|
+
found.push("claude");
|
|
96
|
+
}
|
|
97
|
+
if (fs.existsSync(path.join(cwd, ".codex")))
|
|
98
|
+
found.push("codex");
|
|
99
|
+
if (fs.existsSync(path.join(cwd, ".devin")))
|
|
100
|
+
found.push("devin");
|
|
101
|
+
if (fs.existsSync(path.join(cwd, ".agents")))
|
|
102
|
+
found.push("antigravity");
|
|
103
|
+
return found;
|
|
104
|
+
}
|
|
105
|
+
function wants(clients, id) {
|
|
106
|
+
return clients.includes(id);
|
|
107
|
+
}
|
|
69
108
|
const flag = (args, name) => {
|
|
70
109
|
const i = args.indexOf(`--${name}`);
|
|
71
110
|
return i >= 0 && i + 1 < args.length ? args[i + 1] : undefined;
|
|
@@ -95,39 +134,14 @@ function writeText(cwd, rel, text) {
|
|
|
95
134
|
fs.writeFileSync(file, text);
|
|
96
135
|
console.log(` wrote ${rel}`);
|
|
97
136
|
}
|
|
98
|
-
/**
|
|
99
|
-
* Exchange a team invite for this member's own personal token via the
|
|
100
|
-
* gateway's public /join. The token is minted server-side and returned
|
|
101
|
-
* exactly once — it exists nowhere but this process until init writes it
|
|
102
|
-
* to the 0600 secret files.
|
|
103
|
-
*/
|
|
104
|
-
export async function joinGateway(gatewayUrl, invite, author, email, fetchImpl = fetch) {
|
|
105
|
-
const res = await fetchImpl(`${gatewayUrl}/join`, {
|
|
106
|
-
method: "POST",
|
|
107
|
-
headers: { "content-type": "application/json" },
|
|
108
|
-
body: JSON.stringify({ invite, author, authorEmail: email }),
|
|
109
|
-
});
|
|
110
|
-
if (!res.ok) {
|
|
111
|
-
const detail = await res.text();
|
|
112
|
-
throw new Error(`invite join failed (${res.status}): ${detail}`);
|
|
113
|
-
}
|
|
114
|
-
const { token } = (await res.json());
|
|
115
|
-
return token;
|
|
116
|
-
}
|
|
117
137
|
export async function runInitRemote(args) {
|
|
118
138
|
const cwd = process.cwd();
|
|
119
139
|
if (!fs.existsSync(path.join(cwd, ".git"))) {
|
|
120
140
|
throw new Error("Not a git repository — cd to your project's root and re-run. Nothing was written.");
|
|
121
141
|
}
|
|
122
|
-
const gatewayUrl = (flag(args, "gateway") ??
|
|
123
|
-
let token = flag(args, "token") ?? "";
|
|
124
|
-
const inviteCode = flag(args, "invite") ?? "";
|
|
125
|
-
if (!gatewayUrl || (!token && !inviteCode)) {
|
|
126
|
-
throw new Error("wayform init --remote requires --gateway <url> and --token <mlk_...> or --invite <wfi_...>");
|
|
127
|
-
}
|
|
128
|
-
// Identity (attribution/display; the gateway is authoritative on write).
|
|
142
|
+
const gatewayUrl = (flag(args, "gateway") ?? DEFAULT_GATEWAY_URL).replace(/\/+$/, "");
|
|
129
143
|
const useDefaults = has(args, "yes");
|
|
130
|
-
const rl = useDefaults
|
|
144
|
+
const rl = useDefaults
|
|
131
145
|
? undefined
|
|
132
146
|
: readline.createInterface({ input, output });
|
|
133
147
|
const ask = async (q, def) => {
|
|
@@ -136,70 +150,144 @@ export async function runInitRemote(args) {
|
|
|
136
150
|
const a = (await rl.question(def ? `${q} [${def}]: ` : `${q}: `)).trim();
|
|
137
151
|
return a || def;
|
|
138
152
|
};
|
|
139
|
-
const author = flag(args, "author") ??
|
|
140
|
-
(await ask("Author name", gitConfigDefault("user.name")));
|
|
141
|
-
const email = flag(args, "email") ??
|
|
142
|
-
(await ask("Author email", gitConfigDefault("user.email")));
|
|
143
153
|
const project = flag(args, "project") ?? path.basename(cwd);
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
writeJson(cwd, ".codex/hooks.json", codexHooks);
|
|
154
|
-
// User tier: codex requires per-hook trust in ~/.codex/config.toml and
|
|
155
|
-
// silently skips untrusted hooks — grant it for the hooks we just wrote.
|
|
156
|
-
trustCodexHooks(cwd, codexHooks);
|
|
157
|
-
// --- Cursor native HTTP MCP (gitignored — carries the token) ---
|
|
158
|
-
writeJson(cwd, ".cursor/mcp.json", mergeCursorRemoteMcp(readJson(path.join(cwd, ".cursor/mcp.json")), gatewayUrl, token));
|
|
159
|
-
// Token-bearing: tighten to owner-only (writeJson creates at umask default).
|
|
160
|
-
hardenSecretFile(path.join(cwd, ".cursor/mcp.json"));
|
|
161
|
-
// --- Codex native HTTP MCP (project-scoped, gitignored — carries the token) ---
|
|
162
|
-
writeText(cwd, ".codex/config.toml", codexRemoteConfigToml(gatewayUrl, token));
|
|
163
|
-
hardenSecretFile(path.join(cwd, ".codex/config.toml"));
|
|
164
|
-
// --- User tier: gitignored gateway env (hosted-only, no CONTEXT_REPO_URL) ---
|
|
165
|
-
const envFile = path.join(cwd, ".memorylayer-hook.env");
|
|
166
|
-
if (fs.existsSync(envFile) && !has(args, "force")) {
|
|
167
|
-
hardenSecretFile(envFile); // retro-tighten a pre-existing 0644 file
|
|
168
|
-
console.log(" .memorylayer-hook.env exists — leaving it (use --force to rewrite).");
|
|
154
|
+
const clientsFlag = flag(args, "clients");
|
|
155
|
+
let clients;
|
|
156
|
+
if (clientsFlag !== undefined) {
|
|
157
|
+
clients = parseRemoteClients(clientsFlag);
|
|
158
|
+
}
|
|
159
|
+
else if (rl) {
|
|
160
|
+
const existing = detectExistingClients(cwd);
|
|
161
|
+
const picked = await ask("Clients to wire (cursor, claude, codex, devin, antigravity)", existing.join(","));
|
|
162
|
+
clients = picked ? parseRemoteClients(picked) : existing;
|
|
169
163
|
}
|
|
170
164
|
else {
|
|
171
|
-
|
|
172
|
-
|
|
165
|
+
clients = detectExistingClients(cwd);
|
|
166
|
+
}
|
|
167
|
+
rl?.close();
|
|
168
|
+
if (wants(clients, "claude")) {
|
|
169
|
+
writeJson(cwd, ".claude/settings.json", mergeClaudeSettings(readJson(path.join(cwd, ".claude/settings.json")), "wayform"));
|
|
170
|
+
writeJson(cwd, ".mcp.json", mergeRemoteHttpMcp(readJson(path.join(cwd, ".mcp.json")), gatewayUrl));
|
|
171
|
+
}
|
|
172
|
+
if (wants(clients, "cursor")) {
|
|
173
|
+
writeJson(cwd, ".cursor/hooks.json", mergeCursorHooks(readJson(path.join(cwd, ".cursor/hooks.json")), "wayform"));
|
|
174
|
+
writeJson(cwd, ".cursor/mcp.json", mergeRemoteHttpMcp(readJson(path.join(cwd, ".cursor/mcp.json")), gatewayUrl));
|
|
175
|
+
}
|
|
176
|
+
if (wants(clients, "codex")) {
|
|
177
|
+
const codexHooks = mergeCodexHooks(readJson(path.join(cwd, ".codex/hooks.json")), "wayform");
|
|
178
|
+
writeJson(cwd, ".codex/hooks.json", codexHooks);
|
|
179
|
+
trustCodexHooks(cwd, codexHooks);
|
|
180
|
+
const codexConfig = path.join(cwd, ".codex/config.toml");
|
|
181
|
+
const existing = fs.existsSync(codexConfig)
|
|
182
|
+
? fs.readFileSync(codexConfig, "utf8")
|
|
183
|
+
: "";
|
|
184
|
+
writeText(cwd, ".codex/config.toml", mergeCodexRemoteConfigToml(existing, gatewayUrl));
|
|
185
|
+
}
|
|
186
|
+
if (wants(clients, "devin")) {
|
|
187
|
+
writeJson(cwd, ".devin/mcp_config.json", mergeDevinRemoteMcp(readJson(path.join(cwd, ".devin/mcp_config.json")), gatewayUrl));
|
|
188
|
+
}
|
|
189
|
+
if (wants(clients, "antigravity")) {
|
|
190
|
+
writeJson(cwd, ".agents/mcp_config.json", mergeAntigravityRemoteMcp(readJson(path.join(cwd, ".agents/mcp_config.json")), gatewayUrl));
|
|
173
191
|
}
|
|
174
|
-
// --- Gitignore secrets: env + local settings + the token-bearing cursor mcp ---
|
|
175
192
|
const giPath = path.join(cwd, ".gitignore");
|
|
193
|
+
const initialGitignore = fs.existsSync(giPath)
|
|
194
|
+
? fs.readFileSync(giPath, "utf8")
|
|
195
|
+
: "";
|
|
196
|
+
fs.writeFileSync(giPath, ensureGitignore(initialGitignore, [
|
|
197
|
+
`${HOOK_ENV_FILE}.bak`,
|
|
198
|
+
`${LEGACY_HOOK_ENV_FILE}.bak`,
|
|
199
|
+
]));
|
|
200
|
+
const envFile = path.join(cwd, HOOK_ENV_FILE);
|
|
201
|
+
const legacyFile = path.join(cwd, LEGACY_HOOK_ENV_FILE);
|
|
202
|
+
const hasNew = fs.existsSync(envFile);
|
|
203
|
+
const hasLegacy = fs.existsSync(legacyFile);
|
|
204
|
+
const existingEnv = hasNew
|
|
205
|
+
? fs.readFileSync(envFile, "utf8")
|
|
206
|
+
: hasLegacy
|
|
207
|
+
? fs.readFileSync(legacyFile, "utf8")
|
|
208
|
+
: "";
|
|
209
|
+
// Credential-bearing shapes from before token-free onboarding. Both env-var
|
|
210
|
+
// prefixes are checked: the rename does not make an old token safe.
|
|
211
|
+
const credentialed = /(?:MEMORYLAYER|WAYFORM)_GATEWAY_TOKEN\s*=|(?:MEMORYLAYER|WAYFORM)_AUTHOR(?:_EMAIL)?\s*=|(?:mlk_|wfi_)[A-Za-z0-9_-]+/.test(existingEnv);
|
|
212
|
+
if (credentialed) {
|
|
213
|
+
writeSecretFile(`${envFile}.bak`, existingEnv);
|
|
214
|
+
writeSecretFile(envFile, buildRemoteHookEnv({ gatewayUrl, project }));
|
|
215
|
+
if (hasLegacy)
|
|
216
|
+
fs.rmSync(legacyFile, { force: true });
|
|
217
|
+
console.log(` migrated ${HOOK_ENV_FILE} (legacy file backed up to ${HOOK_ENV_FILE}.bak)`);
|
|
218
|
+
}
|
|
219
|
+
else if (hasLegacy && !hasNew) {
|
|
220
|
+
// Same contract, new file name. Rewrite rather than copy so the contents
|
|
221
|
+
// use the current var names too.
|
|
222
|
+
writeSecretFile(envFile, buildRemoteHookEnv({ gatewayUrl, project }));
|
|
223
|
+
fs.rmSync(legacyFile, { force: true });
|
|
224
|
+
console.log(` renamed ${LEGACY_HOOK_ENV_FILE} -> ${HOOK_ENV_FILE}`);
|
|
225
|
+
}
|
|
226
|
+
else if (existingEnv && !has(args, "force")) {
|
|
227
|
+
console.log(` ${HOOK_ENV_FILE} exists — leaving it (use --force to rewrite).`);
|
|
228
|
+
}
|
|
229
|
+
else {
|
|
230
|
+
writeSecretFile(envFile, buildRemoteHookEnv({ gatewayUrl, project }));
|
|
231
|
+
console.log(` wrote ${HOOK_ENV_FILE}`);
|
|
232
|
+
}
|
|
176
233
|
const gi = fs.existsSync(giPath) ? fs.readFileSync(giPath, "utf8") : "";
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
234
|
+
const cleaned = removeGitignoreEntries(gi, [
|
|
235
|
+
HOOK_ENV_FILE,
|
|
236
|
+
LEGACY_HOOK_ENV_FILE,
|
|
180
237
|
".cursor/mcp.json",
|
|
181
238
|
".codex/config.toml",
|
|
182
|
-
])
|
|
239
|
+
]);
|
|
240
|
+
const ignore = [
|
|
241
|
+
`${HOOK_ENV_FILE}.bak`,
|
|
242
|
+
`${LEGACY_HOOK_ENV_FILE}.bak`,
|
|
243
|
+
];
|
|
244
|
+
if (wants(clients, "claude"))
|
|
245
|
+
ignore.push(".claude/settings.local.json");
|
|
246
|
+
fs.writeFileSync(giPath, ensureGitignore(cleaned, ignore));
|
|
183
247
|
console.log(" updated .gitignore");
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
console.log(" registered Claude Code MCP (claude mcp add --scope local)");
|
|
248
|
+
if (clients.length === 0) {
|
|
249
|
+
console.log("\nNo agent configs written. Pass --clients with the tools this team uses:");
|
|
250
|
+
console.log(" wayform init --remote --clients cursor,claude # example — only those folders");
|
|
188
251
|
}
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
console.log(
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
252
|
+
console.log("\nNext steps (this product repo only — not a global MCP):");
|
|
253
|
+
console.log(" 1. wayform login # OS keychain for session-start hooks");
|
|
254
|
+
if (clients.length > 0) {
|
|
255
|
+
console.log(" 2. In this folder, authenticate the client you use:");
|
|
256
|
+
if (wants(clients, "cursor")) {
|
|
257
|
+
console.log(" Cursor: Connect on the wayform server");
|
|
258
|
+
}
|
|
259
|
+
if (wants(clients, "claude")) {
|
|
260
|
+
console.log(" Claude Code: claude mcp login wayform");
|
|
261
|
+
}
|
|
262
|
+
if (wants(clients, "codex")) {
|
|
263
|
+
console.log(" Codex: codex mcp login wayform");
|
|
264
|
+
}
|
|
265
|
+
if (wants(clients, "devin")) {
|
|
266
|
+
console.log(" Devin CLI: devin mcp login wayform");
|
|
267
|
+
}
|
|
268
|
+
if (wants(clients, "antigravity")) {
|
|
269
|
+
console.log(" Antigravity: Authenticate wayform in MCP settings");
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
console.log(" 3. wayform doctor");
|
|
273
|
+
const add = commitPaths(clients);
|
|
274
|
+
if (add.length > 0) {
|
|
275
|
+
console.log(" 4. Commit the project MCP files so teammates inherit them:");
|
|
276
|
+
console.log(` git add ${add.join(" ")} && git commit -m 'chore: wire Wayform (remote)'`);
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
function commitPaths(clients) {
|
|
280
|
+
const add = [".gitignore", ".memorylayer-hook.env"];
|
|
281
|
+
if (wants(clients, "claude"))
|
|
282
|
+
add.push(".mcp.json", ".claude");
|
|
283
|
+
if (wants(clients, "cursor"))
|
|
284
|
+
add.push(".cursor");
|
|
285
|
+
if (wants(clients, "codex"))
|
|
286
|
+
add.push(".codex");
|
|
287
|
+
if (wants(clients, "devin"))
|
|
288
|
+
add.push(".devin");
|
|
289
|
+
if (wants(clients, "antigravity"))
|
|
290
|
+
add.push(".agents");
|
|
291
|
+
return add;
|
|
204
292
|
}
|
|
205
293
|
//# sourceMappingURL=init-remote.js.map
|