ridgeline 0.3.10 → 0.3.12
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/engine/claude/claude.exec.js +5 -2
- package/dist/engine/claude/claude.exec.js.map +1 -1
- package/dist/engine/claude/sandbox.greywall.js +36 -4
- package/dist/engine/claude/sandbox.greywall.js.map +1 -1
- package/dist/engine/claude/sandbox.types.d.ts +2 -0
- package/dist/engine/worktree.js +24 -11
- package/dist/engine/worktree.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,7 +7,11 @@ const stream_decode_1 = require("./stream.decode");
|
|
|
7
7
|
const DEFAULT_STARTUP_TIMEOUT_MS = 2 * 60 * 1000;
|
|
8
8
|
/** Default: kill if no stdout arrives for 5 minutes during execution. */
|
|
9
9
|
const DEFAULT_STALL_TIMEOUT_MS = 5 * 60 * 1000;
|
|
10
|
-
const invokeClaude = (opts) => {
|
|
10
|
+
const invokeClaude = async (opts) => {
|
|
11
|
+
const provider = opts.sandboxProvider ?? null;
|
|
12
|
+
if (provider?.syncRules) {
|
|
13
|
+
await provider.syncRules(opts.networkAllowlist ?? []);
|
|
14
|
+
}
|
|
11
15
|
return new Promise((resolve, reject) => {
|
|
12
16
|
const args = [
|
|
13
17
|
"-p",
|
|
@@ -34,7 +38,6 @@ const invokeClaude = (opts) => {
|
|
|
34
38
|
}
|
|
35
39
|
// System prompt passed via --system-prompt flag
|
|
36
40
|
args.push("--system-prompt", opts.systemPrompt);
|
|
37
|
-
const provider = opts.sandboxProvider ?? null;
|
|
38
41
|
const spawnCmd = provider ? provider.command : "claude";
|
|
39
42
|
const spawnArgs = provider
|
|
40
43
|
? [...provider.buildArgs(opts.cwd, opts.networkAllowlist ?? [], opts.additionalWritePaths), "claude", ...args]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.exec.js","sourceRoot":"","sources":["../../../src/engine/claude/claude.exec.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAExD,mDAA+C;AAG/C,oEAAoE;AACpE,MAAM,0BAA0B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;AAEhD,yEAAyE;AACzE,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;AAwBvC,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"claude.exec.js","sourceRoot":"","sources":["../../../src/engine/claude/claude.exec.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const node_child_process_1 = require("node:child_process");
|
|
|
5
5
|
const node_fs_1 = require("node:fs");
|
|
6
6
|
const node_path_1 = require("node:path");
|
|
7
7
|
const node_os_1 = require("node:os");
|
|
8
|
+
const GREYPROXY_API = "http://localhost:43080";
|
|
8
9
|
/** Directories package managers need write access to for caching. */
|
|
9
10
|
const packageManagerCachePaths = () => {
|
|
10
11
|
const home = (0, node_os_1.homedir)();
|
|
@@ -17,6 +18,28 @@ const packageManagerCachePaths = () => {
|
|
|
17
18
|
(0, node_path_1.join)(home, ".local", "share"), // pip user installs, various tools
|
|
18
19
|
];
|
|
19
20
|
};
|
|
21
|
+
/** Ensure a greyproxy allow rule exists for the given domain. */
|
|
22
|
+
const ensureRule = async (domain, existingDestinations) => {
|
|
23
|
+
if (existingDestinations.has(domain))
|
|
24
|
+
return;
|
|
25
|
+
const body = JSON.stringify({
|
|
26
|
+
container_pattern: "claude*",
|
|
27
|
+
destination_pattern: domain,
|
|
28
|
+
port_pattern: "443",
|
|
29
|
+
rule_type: "permanent",
|
|
30
|
+
action: "allow",
|
|
31
|
+
created_by: "ridgeline",
|
|
32
|
+
notes: `Ridgeline network allowlist`,
|
|
33
|
+
});
|
|
34
|
+
const res = await fetch(`${GREYPROXY_API}/api/rules`, {
|
|
35
|
+
method: "POST",
|
|
36
|
+
headers: { "Content-Type": "application/json" },
|
|
37
|
+
body,
|
|
38
|
+
});
|
|
39
|
+
if (!res.ok) {
|
|
40
|
+
throw new Error(`Failed to create greyproxy rule for ${domain}: ${res.status} ${await res.text()}`);
|
|
41
|
+
}
|
|
42
|
+
};
|
|
20
43
|
exports.greywallProvider = {
|
|
21
44
|
name: "greywall",
|
|
22
45
|
command: "greywall",
|
|
@@ -38,16 +61,25 @@ exports.greywallProvider = {
|
|
|
38
61
|
return "greyproxy is not running. Start it with: greywall setup";
|
|
39
62
|
}
|
|
40
63
|
},
|
|
41
|
-
|
|
64
|
+
async syncRules(networkAllowlist) {
|
|
65
|
+
if (networkAllowlist.length === 0)
|
|
66
|
+
return;
|
|
67
|
+
// Fetch existing rules to avoid duplicates
|
|
68
|
+
const res = await fetch(`${GREYPROXY_API}/api/rules`);
|
|
69
|
+
if (!res.ok) {
|
|
70
|
+
throw new Error(`Failed to fetch greyproxy rules: ${res.status}`);
|
|
71
|
+
}
|
|
72
|
+
const data = (await res.json());
|
|
73
|
+
const existing = new Set(data.items.map((r) => r.destination_pattern));
|
|
74
|
+
await Promise.all(networkAllowlist.map((domain) => ensureRule(domain, existing)));
|
|
75
|
+
},
|
|
76
|
+
buildArgs(repoRoot, _networkAllowlist, additionalWritePaths) {
|
|
42
77
|
const writePaths = [repoRoot, "/tmp", ...packageManagerCachePaths(), ...(additionalWritePaths ?? [])];
|
|
43
78
|
const settings = {
|
|
44
79
|
filesystem: {
|
|
45
80
|
allowWrite: writePaths,
|
|
46
81
|
},
|
|
47
82
|
};
|
|
48
|
-
if (networkAllowlist.length > 0) {
|
|
49
|
-
settings.network = { allowlist: networkAllowlist };
|
|
50
|
-
}
|
|
51
83
|
const settingsPath = (0, node_path_1.join)((0, node_os_1.tmpdir)(), `ridgeline-greywall-${process.pid}.json`);
|
|
52
84
|
(0, node_fs_1.writeFileSync)(settingsPath, JSON.stringify(settings));
|
|
53
85
|
return ["--auto-profile", "--no-credential-protection", "--settings", settingsPath, "--"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.greywall.js","sourceRoot":"","sources":["../../../src/engine/claude/sandbox.greywall.ts"],"names":[],"mappings":";;;AAAA,2DAA6C;AAC7C,qCAAuC;AACvC,yCAAgC;AAChC,qCAAyC;AAGzC,qEAAqE;AACrE,MAAM,wBAAwB,GAAG,GAAa,EAAE;IAC9C,MAAM,IAAI,GAAG,IAAA,iBAAO,GAAE,CAAA;IACtB,OAAO;QACL,IAAA,gBAAI,EAAC,IAAI,EAAE,MAAM,CAAC,EAAY,MAAM;QACpC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAU,8BAA8B;QAC5D,IAAA,gBAAI,EAAC,IAAI,EAAE,OAAO,CAAC,EAAW,eAAe;QAC7C,IAAA,gBAAI,EAAC,IAAI,EAAE,aAAa,CAAC,EAAK,OAAO;QACrC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAU,QAAQ;QACtC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,mCAAmC;KACnE,CAAA;AACH,CAAC,CAAA;AAEY,QAAA,gBAAgB,GAAoB;IAC/C,IAAI,EAAE,UAAU;IAChB,OAAO,EAAE,UAAU;IACnB,UAAU;QACR,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAA,6BAAQ,EAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;YACjG,IAAI,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzC,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,yDAAyD,CAAA;QAClE,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,kFAAkF;YAClF,MAAM,MAAM,GAAI,GAA4C,CAAC,MAAM,IAAI,EAAE;kBACrE,CAAE,GAA4C,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;YAChE,IAAI,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzC,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,yDAAyD,CAAA;QAClE,CAAC;IACH,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"sandbox.greywall.js","sourceRoot":"","sources":["../../../src/engine/claude/sandbox.greywall.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,4 +4,6 @@ export type SandboxProvider = {
|
|
|
4
4
|
buildArgs: (repoRoot: string, networkAllowlist: string[], additionalWritePaths?: string[]) => string[];
|
|
5
5
|
/** Check if the sandbox is ready to use. Returns null if ready, or an error message. */
|
|
6
6
|
checkReady?: () => string | null;
|
|
7
|
+
/** Sync network allowlist rules with the proxy before spawning the sandboxed process. */
|
|
8
|
+
syncRules?: (networkAllowlist: string[]) => Promise<void>;
|
|
7
9
|
};
|
package/dist/engine/worktree.js
CHANGED
|
@@ -152,19 +152,32 @@ const validateWorktree = (repoRoot, buildName) => {
|
|
|
152
152
|
exports.validateWorktree = validateWorktree;
|
|
153
153
|
const reflectCommits = (repoRoot, buildName) => {
|
|
154
154
|
const branch = (0, exports.wipBranch)(buildName);
|
|
155
|
-
//
|
|
156
|
-
//
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
run(`git
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
155
|
+
// Remove untracked files that would conflict with the merge.
|
|
156
|
+
// The WIP branch is authoritative, so its versions always win.
|
|
157
|
+
// This commonly happens with package-lock.json, build metadata, etc.
|
|
158
|
+
try {
|
|
159
|
+
const untrackedRaw = run("git ls-files --others --exclude-standard", repoRoot);
|
|
160
|
+
if (untrackedRaw) {
|
|
161
|
+
const wipFiles = new Set(run(`git diff --name-only HEAD...${branch}`, repoRoot).split("\n").filter(Boolean));
|
|
162
|
+
for (const f of untrackedRaw.split("\n").filter(Boolean)) {
|
|
163
|
+
if (wipFiles.has(f)) {
|
|
164
|
+
fs.unlinkSync(path.join(repoRoot, f));
|
|
165
|
+
}
|
|
166
|
+
}
|
|
166
167
|
}
|
|
167
168
|
}
|
|
169
|
+
catch {
|
|
170
|
+
// best-effort — merge may still succeed without cleanup
|
|
171
|
+
}
|
|
172
|
+
// Stage and commit any remaining dirty files (e.g. modified tracked files)
|
|
173
|
+
// so the merge doesn't fail on uncommitted changes.
|
|
174
|
+
try {
|
|
175
|
+
run("git add -A", repoRoot);
|
|
176
|
+
run('git commit -m "ridgeline: stage pre-merge state"', repoRoot);
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
// Nothing to commit — safe to ignore
|
|
180
|
+
}
|
|
168
181
|
try {
|
|
169
182
|
// Try fast-forward first
|
|
170
183
|
run(`git merge --ff-only ${branch}`, repoRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/engine/worktree.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/engine/worktree.ts"],"names":[],"mappings":"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"}
|