@maind-dev/mcp-bridge 0.6.0 → 0.8.1
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/build/index.js +764 -157
- package/build/meta.json +1 -1
- package/package.json +16 -14
- package/build/auth.js +0 -179
- package/build/auth.js.map +0 -1
- package/build/client-detect.js +0 -109
- package/build/client-detect.js.map +0 -1
- package/build/device-id.js +0 -149
- package/build/device-id.js.map +0 -1
- package/build/forward.js +0 -433
- package/build/forward.js.map +0 -1
- package/build/index.js.map +0 -1
- package/build/install/atomic-write.js +0 -115
- package/build/install/atomic-write.js.map +0 -1
- package/build/install/browser-pair.js +0 -139
- package/build/install/browser-pair.js.map +0 -1
- package/build/install/client-targets.js +0 -135
- package/build/install/client-targets.js.map +0 -1
- package/build/install/flags.js +0 -139
- package/build/install/flags.js.map +0 -1
- package/build/install/hook-merge.js +0 -195
- package/build/install/hook-merge.js.map +0 -1
- package/build/install/index.js +0 -187
- package/build/install/index.js.map +0 -1
- package/build/install/json-merge.js +0 -160
- package/build/install/json-merge.js.map +0 -1
- package/build/install/preamble.js +0 -119
- package/build/install/preamble.js.map +0 -1
- package/build/install/project-root.js +0 -120
- package/build/install/project-root.js.map +0 -1
- package/build/install/report.js +0 -89
- package/build/install/report.js.map +0 -1
- package/build/install/telemetry.js +0 -83
- package/build/install/telemetry.js.map +0 -1
- package/build/install/toml-merge.js +0 -148
- package/build/install/toml-merge.js.map +0 -1
- package/build/project-key.js +0 -73
- package/build/project-key.js.map +0 -1
- package/build/version.js +0 -7
- package/build/version.js.map +0 -1
|
@@ -1,119 +0,0 @@
|
|
|
1
|
-
// Preamble-file writer — appends the maind MCP-integration block to the
|
|
2
|
-
// canonical agent-orientation files of the project, plus the user-scoped
|
|
3
|
-
// SessionStart-reminder file.
|
|
4
|
-
//
|
|
5
|
-
// Targets:
|
|
6
|
-
// - <PROJECT_ROOT>/CLAUDE.md
|
|
7
|
-
// - <PROJECT_ROOT>/AGENTS.md
|
|
8
|
-
// - <PROJECT_ROOT>/.github/copilot-instructions.md
|
|
9
|
-
// - <PROJECT_ROOT>/.cursorrules
|
|
10
|
-
// - <PROJECT_ROOT>/.windsurfrules
|
|
11
|
-
// - <HOMEDIR>/.claude/maind-session-start-reminder.md (re-used by the
|
|
12
|
-
// optional SessionStart hook)
|
|
13
|
-
//
|
|
14
|
-
// Idempotency: a file is considered "already configured" if any line starts
|
|
15
|
-
// with `## maind MCP integration` — both the legacy soft variant and the
|
|
16
|
-
// hardened v1.1 block share that header prefix (intentional, see ADR-099).
|
|
17
|
-
// Re-running this on an already-configured file produces a `skipped` result.
|
|
18
|
-
//
|
|
19
|
-
// Source of truth for the block content: MAIND_MCP_INTEGRATION_BLOCK in
|
|
20
|
-
// `@maind-dev/integration-snippets`. Importing it (instead of duplicating)
|
|
21
|
-
// prevents drift between bridge, dashboard snippets, and server-instructions.
|
|
22
|
-
import * as path from "node:path";
|
|
23
|
-
import { MAIND_MCP_INTEGRATION_BLOCK } from "@maind-dev/integration-snippets";
|
|
24
|
-
import { atomicWriteFile, ensureDir, hasLinePrefix, readFileSafe, } from "./atomic-write.js";
|
|
25
|
-
export const PREAMBLE_HEADER_PREFIX = "## maind MCP integration";
|
|
26
|
-
function buildPreambleTargets(ctx) {
|
|
27
|
-
return [
|
|
28
|
-
{
|
|
29
|
-
key: "preamble:CLAUDE.md",
|
|
30
|
-
path: path.join(ctx.projectRoot, "CLAUDE.md"),
|
|
31
|
-
mayNeedParentDir: false,
|
|
32
|
-
},
|
|
33
|
-
{
|
|
34
|
-
key: "preamble:AGENTS.md",
|
|
35
|
-
path: path.join(ctx.projectRoot, "AGENTS.md"),
|
|
36
|
-
mayNeedParentDir: false,
|
|
37
|
-
},
|
|
38
|
-
{
|
|
39
|
-
key: "preamble:.github/copilot-instructions.md",
|
|
40
|
-
path: path.join(ctx.projectRoot, ".github", "copilot-instructions.md"),
|
|
41
|
-
mayNeedParentDir: true,
|
|
42
|
-
},
|
|
43
|
-
{
|
|
44
|
-
key: "preamble:.cursorrules",
|
|
45
|
-
path: path.join(ctx.projectRoot, ".cursorrules"),
|
|
46
|
-
mayNeedParentDir: false,
|
|
47
|
-
},
|
|
48
|
-
{
|
|
49
|
-
key: "preamble:.windsurfrules",
|
|
50
|
-
path: path.join(ctx.projectRoot, ".windsurfrules"),
|
|
51
|
-
mayNeedParentDir: false,
|
|
52
|
-
},
|
|
53
|
-
{
|
|
54
|
-
key: "preamble:~/.claude/maind-session-start-reminder.md",
|
|
55
|
-
path: path.join(ctx.homeDir, ".claude", "maind-session-start-reminder.md"),
|
|
56
|
-
mayNeedParentDir: true,
|
|
57
|
-
},
|
|
58
|
-
];
|
|
59
|
-
}
|
|
60
|
-
export async function writePreambleFiles(ctx, dryRun = false) {
|
|
61
|
-
const targets = buildPreambleTargets(ctx);
|
|
62
|
-
const results = [];
|
|
63
|
-
for (const t of targets) {
|
|
64
|
-
results.push(await writeOnePreambleFile(t, dryRun));
|
|
65
|
-
}
|
|
66
|
-
return results;
|
|
67
|
-
}
|
|
68
|
-
async function writeOnePreambleFile(target, dryRun) {
|
|
69
|
-
try {
|
|
70
|
-
if (target.mayNeedParentDir && !dryRun) {
|
|
71
|
-
await ensureDir(path.dirname(target.path));
|
|
72
|
-
}
|
|
73
|
-
const alreadyPresent = await hasLinePrefix(target.path, PREAMBLE_HEADER_PREFIX);
|
|
74
|
-
if (alreadyPresent) {
|
|
75
|
-
return {
|
|
76
|
-
target: target.key,
|
|
77
|
-
action: "skip",
|
|
78
|
-
status: "skipped",
|
|
79
|
-
detail: "## maind MCP integration header already present",
|
|
80
|
-
};
|
|
81
|
-
}
|
|
82
|
-
const existing = await readFileSafe(target.path);
|
|
83
|
-
if (dryRun) {
|
|
84
|
-
return {
|
|
85
|
-
target: target.key,
|
|
86
|
-
action: existing === null ? "write" : "append",
|
|
87
|
-
status: existing === null ? "would-create" : "would-merge",
|
|
88
|
-
detail: target.path,
|
|
89
|
-
};
|
|
90
|
-
}
|
|
91
|
-
const nextContent = existing === null || existing.length === 0
|
|
92
|
-
? `${MAIND_MCP_INTEGRATION_BLOCK}\n`
|
|
93
|
-
: ensureTrailingBlankLine(existing) + `${MAIND_MCP_INTEGRATION_BLOCK}\n`;
|
|
94
|
-
await atomicWriteFile(target.path, nextContent);
|
|
95
|
-
return {
|
|
96
|
-
target: target.key,
|
|
97
|
-
action: existing === null ? "write" : "append",
|
|
98
|
-
status: existing === null ? "created" : "merged",
|
|
99
|
-
detail: target.path,
|
|
100
|
-
};
|
|
101
|
-
}
|
|
102
|
-
catch (err) {
|
|
103
|
-
const message = err instanceof Error ? err.message : String(err);
|
|
104
|
-
return {
|
|
105
|
-
target: target.key,
|
|
106
|
-
action: "append",
|
|
107
|
-
status: "failed",
|
|
108
|
-
detail: message,
|
|
109
|
-
};
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
function ensureTrailingBlankLine(content) {
|
|
113
|
-
if (content.endsWith("\n\n"))
|
|
114
|
-
return content;
|
|
115
|
-
if (content.endsWith("\n"))
|
|
116
|
-
return content + "\n";
|
|
117
|
-
return content + "\n\n";
|
|
118
|
-
}
|
|
119
|
-
//# sourceMappingURL=preamble.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"preamble.js","sourceRoot":"","sources":["../../src/install/preamble.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,120 +0,0 @@
|
|
|
1
|
-
// PROJECT_ROOT detection for the install sub-command.
|
|
2
|
-
//
|
|
3
|
-
// Strategy: walk up from `process.cwd()` until we hit a directory that looks
|
|
4
|
-
// like the root of a project — i.e. contains one of the marker files below.
|
|
5
|
-
// Stops at the OS filesystem root.
|
|
6
|
-
//
|
|
7
|
-
// Marker files (any one is sufficient):
|
|
8
|
-
// - package.json (Node/JS/TS)
|
|
9
|
-
// - .git/ (any git repo)
|
|
10
|
-
// - pyproject.toml (modern Python)
|
|
11
|
-
// - Cargo.toml (Rust)
|
|
12
|
-
// - go.mod (Go)
|
|
13
|
-
// - .hg/ (Mercurial)
|
|
14
|
-
//
|
|
15
|
-
// If no marker is found, the start dir itself is returned — the user is
|
|
16
|
-
// presumably in an empty workspace or a not-yet-initialised project. The
|
|
17
|
-
// orchestrator will still write into that dir (it's just `process.cwd()`).
|
|
18
|
-
import * as fs from "node:fs/promises";
|
|
19
|
-
import * as path from "node:path";
|
|
20
|
-
import * as readline from "node:readline";
|
|
21
|
-
const PROJECT_MARKERS = [
|
|
22
|
-
"package.json",
|
|
23
|
-
".git",
|
|
24
|
-
"pyproject.toml",
|
|
25
|
-
"Cargo.toml",
|
|
26
|
-
"go.mod",
|
|
27
|
-
".hg",
|
|
28
|
-
];
|
|
29
|
-
/**
|
|
30
|
-
* Detects the project root by walking up from `startDir`. Returns the first
|
|
31
|
-
* directory containing a project-marker file. Falls back to `startDir` if
|
|
32
|
-
* the walk reaches the filesystem root without a match.
|
|
33
|
-
*/
|
|
34
|
-
export async function detectProjectRoot(startDir) {
|
|
35
|
-
const resolved = path.resolve(startDir);
|
|
36
|
-
let current = resolved;
|
|
37
|
-
while (true) {
|
|
38
|
-
if (await hasAnyMarker(current)) {
|
|
39
|
-
return current;
|
|
40
|
-
}
|
|
41
|
-
const parent = path.dirname(current);
|
|
42
|
-
if (parent === current) {
|
|
43
|
-
// Reached the FS root without a hit — return the start dir, the
|
|
44
|
-
// caller will treat it as a "loose" project root.
|
|
45
|
-
return resolved;
|
|
46
|
-
}
|
|
47
|
-
current = parent;
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
/**
|
|
51
|
-
* Detects ALL plausible project roots between cwd and the FS root, not just
|
|
52
|
-
* the closest one. Used to surface monorepo ambiguity to the user.
|
|
53
|
-
*
|
|
54
|
-
* Returns the candidates in walk-up order (closest first). If the result
|
|
55
|
-
* has length > 1, the orchestrator should disambiguate via prompt or fail.
|
|
56
|
-
*/
|
|
57
|
-
export async function findAllProjectRoots(startDir) {
|
|
58
|
-
const resolved = path.resolve(startDir);
|
|
59
|
-
let current = resolved;
|
|
60
|
-
const hits = [];
|
|
61
|
-
while (true) {
|
|
62
|
-
if (await hasAnyMarker(current)) {
|
|
63
|
-
hits.push(current);
|
|
64
|
-
}
|
|
65
|
-
const parent = path.dirname(current);
|
|
66
|
-
if (parent === current)
|
|
67
|
-
break;
|
|
68
|
-
current = parent;
|
|
69
|
-
}
|
|
70
|
-
return hits;
|
|
71
|
-
}
|
|
72
|
-
async function hasAnyMarker(dir) {
|
|
73
|
-
for (const marker of PROJECT_MARKERS) {
|
|
74
|
-
try {
|
|
75
|
-
await fs.access(path.join(dir, marker));
|
|
76
|
-
return true;
|
|
77
|
-
}
|
|
78
|
-
catch {
|
|
79
|
-
// marker not present, try next
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
return false;
|
|
83
|
-
}
|
|
84
|
-
/**
|
|
85
|
-
* Disambiguates among multiple project-root candidates by asking the user
|
|
86
|
-
* (TTY only). Non-interactive mode returns `null` and the caller should
|
|
87
|
-
* fail with a clear error message ("pass --project-root explicitly").
|
|
88
|
-
*/
|
|
89
|
-
export async function disambiguateProjectRoot(candidates, isInteractive) {
|
|
90
|
-
if (candidates.length === 0)
|
|
91
|
-
return null;
|
|
92
|
-
if (candidates.length === 1)
|
|
93
|
-
return candidates[0];
|
|
94
|
-
if (!isInteractive) {
|
|
95
|
-
return null;
|
|
96
|
-
}
|
|
97
|
-
process.stdout.write("\nMultiple project roots found between cwd and the filesystem root:\n");
|
|
98
|
-
candidates.forEach((c, i) => {
|
|
99
|
-
process.stdout.write(` [${i + 1}] ${c}\n`);
|
|
100
|
-
});
|
|
101
|
-
process.stdout.write(`\nWhich one should receive the MCP config and preamble files? [1-${candidates.length}, default 1]: `);
|
|
102
|
-
const rl = readline.createInterface({
|
|
103
|
-
input: process.stdin,
|
|
104
|
-
output: process.stdout,
|
|
105
|
-
terminal: true,
|
|
106
|
-
});
|
|
107
|
-
const answer = await new Promise((resolve) => {
|
|
108
|
-
rl.question("", (input) => resolve(input.trim()));
|
|
109
|
-
});
|
|
110
|
-
rl.close();
|
|
111
|
-
if (answer === "")
|
|
112
|
-
return candidates[0];
|
|
113
|
-
const index = Number.parseInt(answer, 10);
|
|
114
|
-
if (Number.isNaN(index) || index < 1 || index > candidates.length) {
|
|
115
|
-
process.stdout.write(`Invalid selection "${answer}", aborting. Re-run with --project-root <path>.\n`);
|
|
116
|
-
return null;
|
|
117
|
-
}
|
|
118
|
-
return candidates[index - 1];
|
|
119
|
-
}
|
|
120
|
-
//# sourceMappingURL=project-root.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"project-root.js","sourceRoot":"","sources":["../../src/install/project-root.ts"],"names":[],"mappings":"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"}
|
package/build/install/report.js
DELETED
|
@@ -1,89 +0,0 @@
|
|
|
1
|
-
// Final-report structure for the install sub-command.
|
|
2
|
-
//
|
|
3
|
-
// Every step's outcome lands here. At the end of the run the orchestrator
|
|
4
|
-
// prints a Markdown-table snapshot, decides the exit code, and (optionally)
|
|
5
|
-
// forwards the summary to telemetry.
|
|
6
|
-
export class InstallReport {
|
|
7
|
-
results = [];
|
|
8
|
-
add(result) {
|
|
9
|
-
this.results.push(result);
|
|
10
|
-
}
|
|
11
|
-
results_() {
|
|
12
|
-
return this.results;
|
|
13
|
-
}
|
|
14
|
-
summary() {
|
|
15
|
-
let ok = 0;
|
|
16
|
-
let needsDecision = 0;
|
|
17
|
-
let failed = 0;
|
|
18
|
-
for (const r of this.results) {
|
|
19
|
-
if (r.status === "created" ||
|
|
20
|
-
r.status === "merged" ||
|
|
21
|
-
r.status === "skipped" ||
|
|
22
|
-
r.status === "would-create" ||
|
|
23
|
-
r.status === "would-merge" ||
|
|
24
|
-
r.status === "would-pair")
|
|
25
|
-
ok++;
|
|
26
|
-
else if (r.status === "needs-user-decision")
|
|
27
|
-
needsDecision++;
|
|
28
|
-
else if (r.status === "failed")
|
|
29
|
-
failed++;
|
|
30
|
-
}
|
|
31
|
-
return {
|
|
32
|
-
total: this.results.length,
|
|
33
|
-
ok,
|
|
34
|
-
needsDecision,
|
|
35
|
-
failed,
|
|
36
|
-
};
|
|
37
|
-
}
|
|
38
|
-
hasFailures() {
|
|
39
|
-
return this.results.some((r) => r.status === "failed");
|
|
40
|
-
}
|
|
41
|
-
hasUserDecisionPending() {
|
|
42
|
-
return this.results.some((r) => r.status === "needs-user-decision");
|
|
43
|
-
}
|
|
44
|
-
/**
|
|
45
|
-
* Exit code mapping for the install command:
|
|
46
|
-
* 0 — all OK (everything created/merged/skipped without failure)
|
|
47
|
-
* 1 — partial (at least one failure OR pending user decision); MCP setup
|
|
48
|
-
* likely usable but some target was skipped due to error or unresolved prompt
|
|
49
|
-
* 2 — reserved for fatal pre-flight errors (project-root undecidable, etc.) —
|
|
50
|
-
* set by the orchestrator before any step runs, NOT inferred here.
|
|
51
|
-
*/
|
|
52
|
-
exitCode() {
|
|
53
|
-
if (this.hasFailures() || this.hasUserDecisionPending())
|
|
54
|
-
return 1;
|
|
55
|
-
return 0;
|
|
56
|
-
}
|
|
57
|
-
toMarkdownTable() {
|
|
58
|
-
if (this.results.length === 0) {
|
|
59
|
-
return "_no steps were attempted_\n";
|
|
60
|
-
}
|
|
61
|
-
const headers = ["Target", "Action", "Status", "Detail"];
|
|
62
|
-
const targetWidth = Math.max(headers[0].length, ...this.results.map((r) => r.target.length));
|
|
63
|
-
const actionWidth = Math.max(headers[1].length, ...this.results.map((r) => r.action.length));
|
|
64
|
-
const statusWidth = Math.max(headers[2].length, ...this.results.map((r) => r.status.length));
|
|
65
|
-
const detailWidth = Math.max(headers[3].length, ...this.results.map((r) => (r.detail ?? "").length));
|
|
66
|
-
const pad = (s, w) => s + " ".repeat(Math.max(0, w - s.length));
|
|
67
|
-
const sep = `| ${"-".repeat(targetWidth)} | ${"-".repeat(actionWidth)} | ${"-".repeat(statusWidth)} | ${"-".repeat(detailWidth)} |`;
|
|
68
|
-
const lines = [];
|
|
69
|
-
lines.push(`| ${pad(headers[0], targetWidth)} | ${pad(headers[1], actionWidth)} | ${pad(headers[2], statusWidth)} | ${pad(headers[3], detailWidth)} |`);
|
|
70
|
-
lines.push(sep);
|
|
71
|
-
for (const r of this.results) {
|
|
72
|
-
lines.push(`| ${pad(r.target, targetWidth)} | ${pad(r.action, actionWidth)} | ${pad(r.status, statusWidth)} | ${pad(r.detail ?? "", detailWidth)} |`);
|
|
73
|
-
}
|
|
74
|
-
return lines.join("\n") + "\n";
|
|
75
|
-
}
|
|
76
|
-
print(stream) {
|
|
77
|
-
const s = this.summary();
|
|
78
|
-
stream.write("\n");
|
|
79
|
-
stream.write(this.toMarkdownTable());
|
|
80
|
-
stream.write(`\nSummary: ${s.ok}/${s.total} OK · ${s.needsDecision} pending · ${s.failed} failed\n`);
|
|
81
|
-
}
|
|
82
|
-
toJson() {
|
|
83
|
-
return {
|
|
84
|
-
steps: [...this.results],
|
|
85
|
-
summary: this.summary(),
|
|
86
|
-
};
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
//# sourceMappingURL=report.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/install/report.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,83 +0,0 @@
|
|
|
1
|
-
// Opt-in install telemetry (ADR-009 consent-model + ADR-142).
|
|
2
|
-
//
|
|
3
|
-
// What we send (anonymized aggregates only):
|
|
4
|
-
// - Step counts by status (ok / skipped / failed / needs-decision)
|
|
5
|
-
// - Wall-clock duration
|
|
6
|
-
// - OS family (`darwin` / `win32` / `linux`)
|
|
7
|
-
// - Node major version
|
|
8
|
-
// - Installer (bridge) version
|
|
9
|
-
//
|
|
10
|
-
// What we DON'T send:
|
|
11
|
-
// - File paths
|
|
12
|
-
// - User-id (server can infer from the api-key if it chooses to)
|
|
13
|
-
// - Tokens
|
|
14
|
-
// - PROJECT_ROOT or any project-identifying string
|
|
15
|
-
//
|
|
16
|
-
// Failure is silent — telemetry is best-effort and MUST NOT block the
|
|
17
|
-
// install exit code. We swallow network errors, timeouts, non-2xx.
|
|
18
|
-
const DEFAULT_FUNCTIONS_ORIGIN = "https://vsddmiosisvfrairepxv.supabase.co/functions/v1";
|
|
19
|
-
const TELEMETRY_PATH = "/install-completed";
|
|
20
|
-
const TELEMETRY_TIMEOUT_MS = 3_000;
|
|
21
|
-
export async function postInstallTelemetry(input) {
|
|
22
|
-
if (!input.enabled)
|
|
23
|
-
return;
|
|
24
|
-
if (input.apiKey === null)
|
|
25
|
-
return; // no auth — silent skip
|
|
26
|
-
const origin = (process.env.MAIND_FUNCTIONS_ORIGIN ?? "").trim().replace(/\/+$/, "") ||
|
|
27
|
-
DEFAULT_FUNCTIONS_ORIGIN;
|
|
28
|
-
const url = `${origin}${TELEMETRY_PATH}`;
|
|
29
|
-
const payload = {
|
|
30
|
-
installer_version: input.installerVersion,
|
|
31
|
-
wall_clock_ms: input.wallClockMs,
|
|
32
|
-
os_family: process.platform,
|
|
33
|
-
node_major: parseNodeMajor(process.version),
|
|
34
|
-
summary: {
|
|
35
|
-
total: input.summary.total,
|
|
36
|
-
ok: input.summary.ok,
|
|
37
|
-
needs_decision: input.summary.needsDecision,
|
|
38
|
-
failed: input.summary.failed,
|
|
39
|
-
},
|
|
40
|
-
step_status_counts: countStatuses(input.steps),
|
|
41
|
-
client_family_filter: input.clientFamilyFilter ?? null,
|
|
42
|
-
};
|
|
43
|
-
const controller = new AbortController();
|
|
44
|
-
const t = setTimeout(() => controller.abort(), TELEMETRY_TIMEOUT_MS);
|
|
45
|
-
try {
|
|
46
|
-
await fetch(url, {
|
|
47
|
-
method: "POST",
|
|
48
|
-
headers: {
|
|
49
|
-
"content-type": "application/json",
|
|
50
|
-
authorization: `Bearer ${input.apiKey}`,
|
|
51
|
-
"user-agent": `@maind-dev/mcp-bridge install/${input.installerVersion}`,
|
|
52
|
-
},
|
|
53
|
-
body: JSON.stringify(payload),
|
|
54
|
-
signal: controller.signal,
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
catch {
|
|
58
|
-
// Silent — telemetry is best-effort.
|
|
59
|
-
}
|
|
60
|
-
finally {
|
|
61
|
-
clearTimeout(t);
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
function countStatuses(steps) {
|
|
65
|
-
const counts = {
|
|
66
|
-
created: 0,
|
|
67
|
-
merged: 0,
|
|
68
|
-
skipped: 0,
|
|
69
|
-
"needs-user-decision": 0,
|
|
70
|
-
failed: 0,
|
|
71
|
-
};
|
|
72
|
-
for (const s of steps) {
|
|
73
|
-
counts[s.status] = (counts[s.status] ?? 0) + 1;
|
|
74
|
-
}
|
|
75
|
-
return counts;
|
|
76
|
-
}
|
|
77
|
-
function parseNodeMajor(version) {
|
|
78
|
-
const m = /^v?(\d+)\./.exec(version);
|
|
79
|
-
if (m === null)
|
|
80
|
-
return 0;
|
|
81
|
-
return Number.parseInt(m[1], 10);
|
|
82
|
-
}
|
|
83
|
-
//# sourceMappingURL=telemetry.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/install/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,148 +0,0 @@
|
|
|
1
|
-
// Idempotent TOML-config merge — currently used only for the Codex CLI
|
|
2
|
-
// (`~/.codex/config.toml`) since Codex is the one client that ships TOML.
|
|
3
|
-
//
|
|
4
|
-
// Semantics:
|
|
5
|
-
// - Parse the existing TOML.
|
|
6
|
-
// - Replace ONLY `[mcp_servers.maind]` and `[mcp_servers.maind.env]`.
|
|
7
|
-
// - Preserve every other section verbatim — Codex configs typically include
|
|
8
|
-
// unrelated `[model]`, `[ui]`, `[mcp_servers.<other>]` blocks.
|
|
9
|
-
// - Write back using smol-toml's stringify (stable key order).
|
|
10
|
-
//
|
|
11
|
-
// Why a full parse+rewrite instead of regex-replace: smol-toml is ~30 KB and
|
|
12
|
-
// gives us correct handling of nested tables, quoted keys, multiline strings,
|
|
13
|
-
// and comments-in-values. Regex-based section replacement would mis-handle
|
|
14
|
-
// nested `mcp_servers.maind.<sub>` and arrays-of-tables.
|
|
15
|
-
import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
|
|
16
|
-
import { atomicWriteFile, readFileSafe } from "./atomic-write.js";
|
|
17
|
-
export async function mergeTomlConfig(target, serverEntry, dryRun = false) {
|
|
18
|
-
if (target.kind !== "toml") {
|
|
19
|
-
return {
|
|
20
|
-
target: target.key,
|
|
21
|
-
action: "merge",
|
|
22
|
-
status: "failed",
|
|
23
|
-
detail: `expected toml target, got ${target.kind}`,
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
|
-
let raw;
|
|
27
|
-
try {
|
|
28
|
-
raw = await readFileSafe(target.path);
|
|
29
|
-
}
|
|
30
|
-
catch (err) {
|
|
31
|
-
return failed(target, "read", err);
|
|
32
|
-
}
|
|
33
|
-
let parsed;
|
|
34
|
-
let action = "create";
|
|
35
|
-
if (raw === null || raw.trim().length === 0) {
|
|
36
|
-
parsed = {};
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
action = "merge";
|
|
40
|
-
try {
|
|
41
|
-
const result = parseToml(raw);
|
|
42
|
-
if (!isObject(result)) {
|
|
43
|
-
return {
|
|
44
|
-
target: target.key,
|
|
45
|
-
action: "merge",
|
|
46
|
-
status: "failed",
|
|
47
|
-
detail: "parsed TOML is not an object at root",
|
|
48
|
-
};
|
|
49
|
-
}
|
|
50
|
-
parsed = result;
|
|
51
|
-
}
|
|
52
|
-
catch (err) {
|
|
53
|
-
return failed(target, "parse", err);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
const mcpServers = isObject(parsed.mcp_servers) ? parsed.mcp_servers : {};
|
|
57
|
-
const existing = mcpServers.maind;
|
|
58
|
-
if (isObject(existing) && tomlServerEntryEqual(existing, serverEntry)) {
|
|
59
|
-
return {
|
|
60
|
-
target: target.key,
|
|
61
|
-
action: "merge",
|
|
62
|
-
status: "skipped",
|
|
63
|
-
detail: "maind entry already up-to-date",
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
const maindBlock = {
|
|
67
|
-
command: serverEntry.command,
|
|
68
|
-
args: [...serverEntry.args],
|
|
69
|
-
env: { ...serverEntry.env },
|
|
70
|
-
};
|
|
71
|
-
const nextConfig = {
|
|
72
|
-
...parsed,
|
|
73
|
-
mcp_servers: { ...mcpServers, maind: maindBlock },
|
|
74
|
-
};
|
|
75
|
-
let nextRaw;
|
|
76
|
-
try {
|
|
77
|
-
nextRaw = stringifyToml(nextConfig);
|
|
78
|
-
if (!nextRaw.endsWith("\n"))
|
|
79
|
-
nextRaw += "\n";
|
|
80
|
-
}
|
|
81
|
-
catch (err) {
|
|
82
|
-
return failed(target, "write", err);
|
|
83
|
-
}
|
|
84
|
-
// Post-write-verification (ADR-142): the stringified output must contain
|
|
85
|
-
// exactly one [mcp_servers.maind] section header. Catches degenerate cases
|
|
86
|
-
// where smol-toml might emit duplicates for arrays-of-tables-shaped input.
|
|
87
|
-
const headerMatches = nextRaw.match(/^\[mcp_servers\.maind\]/gm) ?? [];
|
|
88
|
-
if (headerMatches.length !== 1) {
|
|
89
|
-
return {
|
|
90
|
-
target: target.key,
|
|
91
|
-
action: "merge",
|
|
92
|
-
status: "failed",
|
|
93
|
-
detail: `expected exactly one [mcp_servers.maind] section, got ${headerMatches.length}`,
|
|
94
|
-
};
|
|
95
|
-
}
|
|
96
|
-
if (dryRun) {
|
|
97
|
-
return {
|
|
98
|
-
target: target.key,
|
|
99
|
-
action: action === "create" ? "write" : "merge",
|
|
100
|
-
status: action === "create" ? "would-create" : "would-merge",
|
|
101
|
-
detail: target.path,
|
|
102
|
-
};
|
|
103
|
-
}
|
|
104
|
-
try {
|
|
105
|
-
await atomicWriteFile(target.path, nextRaw);
|
|
106
|
-
}
|
|
107
|
-
catch (err) {
|
|
108
|
-
return failed(target, "write", err);
|
|
109
|
-
}
|
|
110
|
-
return {
|
|
111
|
-
target: target.key,
|
|
112
|
-
action: action === "create" ? "write" : "merge",
|
|
113
|
-
status: action === "create" ? "created" : "merged",
|
|
114
|
-
detail: target.path,
|
|
115
|
-
};
|
|
116
|
-
}
|
|
117
|
-
function tomlServerEntryEqual(a, b) {
|
|
118
|
-
if (!isObject(a))
|
|
119
|
-
return false;
|
|
120
|
-
if (a.command !== b.command)
|
|
121
|
-
return false;
|
|
122
|
-
if (!Array.isArray(a.args) || a.args.length !== b.args.length)
|
|
123
|
-
return false;
|
|
124
|
-
for (let i = 0; i < a.args.length; i++) {
|
|
125
|
-
if (a.args[i] !== b.args[i])
|
|
126
|
-
return false;
|
|
127
|
-
}
|
|
128
|
-
if (!isObject(a.env))
|
|
129
|
-
return false;
|
|
130
|
-
for (const key of Object.keys(b.env)) {
|
|
131
|
-
if (a.env[key] !== b.env[key])
|
|
132
|
-
return false;
|
|
133
|
-
}
|
|
134
|
-
return true;
|
|
135
|
-
}
|
|
136
|
-
function isObject(v) {
|
|
137
|
-
return typeof v === "object" && v !== null && !Array.isArray(v);
|
|
138
|
-
}
|
|
139
|
-
function failed(target, phase, err) {
|
|
140
|
-
const message = err instanceof Error ? err.message : String(err);
|
|
141
|
-
return {
|
|
142
|
-
target: target.key,
|
|
143
|
-
action: "merge",
|
|
144
|
-
status: "failed",
|
|
145
|
-
detail: `${phase}: ${message}`,
|
|
146
|
-
};
|
|
147
|
-
}
|
|
148
|
-
//# sourceMappingURL=toml-merge.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"toml-merge.js","sourceRoot":"","sources":["../../src/install/toml-merge.ts"],"names":[],"mappings":"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"}
|