@exla/rudder 4.0.0-alpha.7 → 4.1.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.
Files changed (238) hide show
  1. package/README.md +33 -69
  2. package/assets/skills/burst/SKILL.md +64 -0
  3. package/dist/agent-efficiency/backend-observer.d.ts +13 -0
  4. package/dist/agent-efficiency/backend-observer.js +77 -0
  5. package/dist/agent-efficiency/backend-observer.js.map +1 -0
  6. package/dist/agent-efficiency/handoff.d.ts +9 -0
  7. package/dist/agent-efficiency/handoff.js +42 -0
  8. package/dist/agent-efficiency/handoff.js.map +1 -0
  9. package/dist/agent-efficiency/index.d.ts +11 -0
  10. package/dist/agent-efficiency/index.js +7 -0
  11. package/dist/agent-efficiency/index.js.map +1 -0
  12. package/dist/agent-efficiency/lessons.d.ts +55 -0
  13. package/dist/agent-efficiency/lessons.js +107 -0
  14. package/dist/agent-efficiency/lessons.js.map +1 -0
  15. package/dist/agent-efficiency/privacy.d.ts +6 -0
  16. package/dist/agent-efficiency/privacy.js +28 -0
  17. package/dist/agent-efficiency/privacy.js.map +1 -0
  18. package/dist/agent-efficiency/production.d.ts +16 -0
  19. package/dist/agent-efficiency/production.js +120 -0
  20. package/dist/agent-efficiency/production.js.map +1 -0
  21. package/dist/agent-efficiency/storage.d.ts +3 -0
  22. package/dist/agent-efficiency/storage.js +28 -0
  23. package/dist/agent-efficiency/storage.js.map +1 -0
  24. package/dist/agent-efficiency/telemetry.d.ts +59 -0
  25. package/dist/agent-efficiency/telemetry.js +143 -0
  26. package/dist/agent-efficiency/telemetry.js.map +1 -0
  27. package/dist/agent-efficiency/trace-lessons.d.ts +21 -0
  28. package/dist/agent-efficiency/trace-lessons.js +36 -0
  29. package/dist/agent-efficiency/trace-lessons.js.map +1 -0
  30. package/dist/agent-efficiency/waits.d.ts +52 -0
  31. package/dist/agent-efficiency/waits.js +131 -0
  32. package/dist/agent-efficiency/waits.js.map +1 -0
  33. package/dist/backends.js +14 -8
  34. package/dist/backends.js.map +1 -1
  35. package/dist/board/authority.d.ts +48 -0
  36. package/dist/board/authority.js +125 -0
  37. package/dist/board/authority.js.map +1 -0
  38. package/dist/board/board.js +6 -2
  39. package/dist/board/daemon.d.ts +3 -6
  40. package/dist/board/daemon.js +242 -222
  41. package/dist/board/daemon.js.map +1 -1
  42. package/dist/board/host-access.d.ts +8 -0
  43. package/dist/board/host-access.js +222 -0
  44. package/dist/board/host-access.js.map +1 -0
  45. package/dist/board/project-files.d.ts +12 -0
  46. package/dist/board/project-files.js +78 -0
  47. package/dist/board/project-files.js.map +1 -0
  48. package/dist/brain.d.ts +2 -1
  49. package/dist/brain.js +15 -21
  50. package/dist/brain.js.map +1 -1
  51. package/dist/claude-sdk-protocol.js +10 -7
  52. package/dist/claude-sdk-protocol.js.map +1 -1
  53. package/dist/cloud-build-profile.d.ts +22 -0
  54. package/dist/cloud-build-profile.js +160 -0
  55. package/dist/cloud-build-profile.js.map +1 -0
  56. package/dist/cloud.js +23 -470
  57. package/dist/cloud.js.map +1 -1
  58. package/dist/codex-binary.d.ts +1 -0
  59. package/dist/codex-binary.js +8 -1
  60. package/dist/codex-binary.js.map +1 -1
  61. package/dist/daemon.d.ts +2 -0
  62. package/dist/daemon.js +14 -2
  63. package/dist/daemon.js.map +1 -1
  64. package/dist/effort.d.ts +8 -0
  65. package/dist/effort.js +15 -2
  66. package/dist/effort.js.map +1 -1
  67. package/dist/engine-authority.js +16 -0
  68. package/dist/engine-authority.js.map +1 -1
  69. package/dist/engine.d.ts +1 -1
  70. package/dist/engine.js +11 -2
  71. package/dist/engine.js.map +1 -1
  72. package/dist/fabric-fetch.d.ts +25 -0
  73. package/dist/fabric-fetch.js +402 -0
  74. package/dist/fabric-fetch.js.map +1 -0
  75. package/dist/fabric-local.d.ts +5 -2
  76. package/dist/fabric-local.js +36 -1
  77. package/dist/fabric-local.js.map +1 -1
  78. package/dist/fabric-remote.d.ts +76 -1
  79. package/dist/fabric-remote.js +333 -61
  80. package/dist/fabric-remote.js.map +1 -1
  81. package/dist/git.js +23 -0
  82. package/dist/git.js.map +1 -1
  83. package/dist/graph.js +9 -1
  84. package/dist/graph.js.map +1 -1
  85. package/dist/jj.d.ts +3 -1
  86. package/dist/jj.js +34 -2
  87. package/dist/jj.js.map +1 -1
  88. package/dist/main.js +115 -311
  89. package/dist/main.js.map +1 -1
  90. package/dist/migration.d.ts +2 -0
  91. package/dist/migration.js +3 -0
  92. package/dist/migration.js.map +1 -1
  93. package/dist/models.js +11 -6
  94. package/dist/models.js.map +1 -1
  95. package/dist/native/darwin-arm64/native-manifest.json +19 -0
  96. package/dist/native/darwin-arm64/rudder-jj +0 -0
  97. package/dist/native/darwin-arm64/rudder-native +0 -0
  98. package/dist/native/linux-x64/native-manifest.json +19 -0
  99. package/dist/native/linux-x64/rudder-jj +0 -0
  100. package/dist/native/linux-x64/rudder-native +0 -0
  101. package/dist/native-agents.js +3 -7
  102. package/dist/native-agents.js.map +1 -1
  103. package/dist/native-binary.js +11 -1
  104. package/dist/native-binary.js.map +1 -1
  105. package/dist/operations/cli.d.ts +23 -0
  106. package/dist/operations/cli.js +110 -0
  107. package/dist/operations/cli.js.map +1 -0
  108. package/dist/operations/registry.d.ts +1076 -0
  109. package/dist/operations/registry.js +69 -0
  110. package/dist/operations/registry.js.map +1 -0
  111. package/dist/operations/registry.json +124 -0
  112. package/dist/operations/requests.d.ts +167 -0
  113. package/dist/operations/requests.js +223 -0
  114. package/dist/operations/requests.js.map +1 -0
  115. package/dist/planning-ownership/index.d.ts +134 -0
  116. package/dist/planning-ownership/index.js +291 -0
  117. package/dist/planning-ownership/index.js.map +1 -0
  118. package/dist/planning-ownership/ingress.d.ts +30 -0
  119. package/dist/planning-ownership/ingress.js +41 -0
  120. package/dist/planning-ownership/ingress.js.map +1 -0
  121. package/dist/planning-ownership/store.d.ts +19 -0
  122. package/dist/planning-ownership/store.js +30 -0
  123. package/dist/planning-ownership/store.js.map +1 -0
  124. package/dist/private-access/cli.d.ts +22 -0
  125. package/dist/private-access/cli.js +76 -0
  126. package/dist/private-access/cli.js.map +1 -0
  127. package/dist/private-access/engine.d.ts +20 -0
  128. package/dist/private-access/engine.js +47 -0
  129. package/dist/private-access/engine.js.map +1 -0
  130. package/dist/private-access/home.d.ts +21 -0
  131. package/dist/private-access/home.js +80 -0
  132. package/dist/private-access/home.js.map +1 -0
  133. package/dist/private-access/previews.d.ts +101 -0
  134. package/dist/private-access/previews.js +447 -0
  135. package/dist/private-access/previews.js.map +1 -0
  136. package/dist/project-files/cli.d.ts +7 -0
  137. package/dist/project-files/cli.js +22 -0
  138. package/dist/project-files/cli.js.map +1 -0
  139. package/dist/project-files/engine.d.ts +14 -0
  140. package/dist/project-files/engine.js +52 -0
  141. package/dist/project-files/engine.js.map +1 -0
  142. package/dist/project-files/home.d.ts +13 -0
  143. package/dist/project-files/home.js +46 -0
  144. package/dist/project-files/home.js.map +1 -0
  145. package/dist/project-files/http.d.ts +9 -0
  146. package/dist/project-files/http.js +54 -0
  147. package/dist/project-files/http.js.map +1 -0
  148. package/dist/project-files/open.d.ts +10 -0
  149. package/dist/project-files/open.js +37 -0
  150. package/dist/project-files/open.js.map +1 -0
  151. package/dist/project-files/references.d.ts +9 -0
  152. package/dist/project-files/references.js +29 -0
  153. package/dist/project-files/references.js.map +1 -0
  154. package/dist/project-files/service.d.ts +32 -0
  155. package/dist/project-files/service.js +236 -0
  156. package/dist/project-files/service.js.map +1 -0
  157. package/dist/project-files/types.d.ts +40 -0
  158. package/dist/project-files/types.js +2 -0
  159. package/dist/project-files/types.js.map +1 -0
  160. package/dist/run-manager.d.ts +8 -0
  161. package/dist/run-manager.js +193 -13
  162. package/dist/run-manager.js.map +1 -1
  163. package/dist/run-timeline.d.ts +31 -0
  164. package/dist/run-timeline.js +116 -0
  165. package/dist/run-timeline.js.map +1 -0
  166. package/dist/scheduler.js +72 -13
  167. package/dist/scheduler.js.map +1 -1
  168. package/dist/surfaces.js +3 -8
  169. package/dist/surfaces.js.map +1 -1
  170. package/dist/tailscale-preview.d.ts +6 -2
  171. package/dist/tailscale-preview.js +58 -13
  172. package/dist/tailscale-preview.js.map +1 -1
  173. package/dist/task-routing.d.ts +2 -0
  174. package/dist/task-routing.js +42 -25
  175. package/dist/task-routing.js.map +1 -1
  176. package/dist/terminal-screen.d.ts +6 -0
  177. package/dist/terminal-screen.js +23 -0
  178. package/dist/terminal-screen.js.map +1 -0
  179. package/dist/tool-cache.d.ts +23 -0
  180. package/dist/tool-cache.js +144 -0
  181. package/dist/tool-cache.js.map +1 -0
  182. package/dist/types.d.ts +0 -17
  183. package/dist/types.js.map +1 -1
  184. package/dist/util.d.ts +8 -0
  185. package/dist/util.js +38 -2
  186. package/dist/util.js.map +1 -1
  187. package/dist/v4-migration/capture.d.ts +53 -0
  188. package/dist/v4-migration/capture.js +197 -0
  189. package/dist/v4-migration/capture.js.map +1 -0
  190. package/dist/v4-migration/cli.d.ts +4 -0
  191. package/dist/v4-migration/cli.js +38 -0
  192. package/dist/v4-migration/cli.js.map +1 -0
  193. package/dist/v4-migration/recovery.d.ts +43 -0
  194. package/dist/v4-migration/recovery.js +180 -0
  195. package/dist/v4-migration/recovery.js.map +1 -0
  196. package/dist/version-check.d.ts +2 -0
  197. package/dist/version-check.js +23 -0
  198. package/dist/version-check.js.map +1 -1
  199. package/dist/warm-snapshot.d.ts +55 -0
  200. package/dist/warm-snapshot.js +382 -0
  201. package/dist/warm-snapshot.js.map +1 -0
  202. package/package.json +4 -3
  203. package/scripts/copy-native.mjs +35 -48
  204. package/scripts/native-artifacts.mjs +248 -0
  205. package/dist/improve/advisor.d.ts +0 -10
  206. package/dist/improve/advisor.js +0 -115
  207. package/dist/improve/advisor.js.map +0 -1
  208. package/dist/improve/collect.d.ts +0 -49
  209. package/dist/improve/collect.js +0 -274
  210. package/dist/improve/collect.js.map +0 -1
  211. package/dist/improve/gate.d.ts +0 -17
  212. package/dist/improve/gate.js +0 -60
  213. package/dist/improve/gate.js.map +0 -1
  214. package/dist/improve/index.d.ts +0 -9
  215. package/dist/improve/index.js +0 -376
  216. package/dist/improve/index.js.map +0 -1
  217. package/dist/improve/judge.d.ts +0 -32
  218. package/dist/improve/judge.js +0 -114
  219. package/dist/improve/judge.js.map +0 -1
  220. package/dist/improve/mine.d.ts +0 -31
  221. package/dist/improve/mine.js +0 -192
  222. package/dist/improve/mine.js.map +0 -1
  223. package/dist/improve/propose.d.ts +0 -51
  224. package/dist/improve/propose.js +0 -150
  225. package/dist/improve/propose.js.map +0 -1
  226. package/dist/improve/rank.d.ts +0 -16
  227. package/dist/improve/rank.js +0 -49
  228. package/dist/improve/rank.js.map +0 -1
  229. package/dist/improve/schedule.d.ts +0 -1
  230. package/dist/improve/schedule.js +0 -95
  231. package/dist/improve/schedule.js.map +0 -1
  232. package/dist/improve/ship.d.ts +0 -25
  233. package/dist/improve/ship.js +0 -82
  234. package/dist/improve/ship.js.map +0 -1
  235. package/dist/improve/state.d.ts +0 -157
  236. package/dist/improve/state.js +0 -264
  237. package/dist/improve/state.js.map +0 -1
  238. package/dist/native/darwin-x64/rudder-native +0 -0
@@ -0,0 +1,55 @@
1
+ export declare const WARM_WORKSPACE_PREFIX = "rudderwarm-";
2
+ export type WarmSnapshot = {
3
+ key: string;
4
+ commit: string;
5
+ dir: string;
6
+ builtAt: string;
7
+ };
8
+ export declare function warmDir(repoRoot: string): string;
9
+ export declare function forkStateDir(workspace: string): string;
10
+ /**
11
+ * A fork's files exist only inside its mount namespace: run `command` there
12
+ * when `cwd` is an overlay fork, otherwise unchanged.
13
+ */
14
+ export declare function inFork(cwd: string, command: string, args: string[]): {
15
+ command: string;
16
+ args: string[];
17
+ };
18
+ /** The single parent of the main checkout's @: what `jj workspace add` bases on. */
19
+ export declare function currentBaseCommit(repoRoot: string): Promise<string | null>;
20
+ export declare function readySnapshots(repoRoot: string): WarmSnapshot[];
21
+ /** Commands from rudder.toml `[warm] commands = [...]`, else detected from lockfiles. */
22
+ export declare function warmCommands(dir: string): string[];
23
+ /**
24
+ * Builds the warm snapshot for `commit` (blocking). Returns it, or null when
25
+ * another builder holds the key or the build failed (a failed key is not
26
+ * retried; a new base commit gets a new key).
27
+ */
28
+ export declare function buildWarmSnapshot(repoRoot: string, commit: string): Promise<WarmSnapshot | null>;
29
+ /**
30
+ * Incremental warm build: copies the previous snapshot's untracked top-level
31
+ * entries (dependencies and build outputs such as node_modules, target, .venv)
32
+ * into the new checkout, so install/build only redo what changed.
33
+ */
34
+ export declare function seedFromPrevious(previousDir: string, dir: string): Promise<void>;
35
+ /** Starts a detached builder for `commit` unless one is ready, failed or running. */
36
+ export declare function startWarmBuild(repoRoot: string, commit: string): void;
37
+ /** Deletes ready snapshots beyond the newest few that no fork still uses. */
38
+ export declare function pruneWarmSnapshots(repoRoot: string): Promise<void>;
39
+ /**
40
+ * Creates `targetPath` as an overlay fork of the newest warm snapshot. Returns
41
+ * null (after cleaning up) when there is no snapshot or the overlay cannot be
42
+ * mounted here; the caller then makes a full jj checkout.
43
+ */
44
+ export declare function createForkWorkspace(params: {
45
+ repoRoot: string;
46
+ targetPath: string;
47
+ workspaceName: string;
48
+ description?: string;
49
+ }): Promise<{
50
+ snapshot: WarmSnapshot;
51
+ } | {
52
+ reason: string;
53
+ }>;
54
+ /** Removes `<workspace>.fork/` (OverlayFS leaves a mode-000 `work/work`). */
55
+ export declare function removeForkState(workspace: string): Promise<void>;
@@ -0,0 +1,382 @@
1
+ /**
2
+ * Warm snapshots and overlay forks (Linux).
3
+ *
4
+ * A warm snapshot is one jj workspace per base commit (`rudderwarm-<key>`)
5
+ * where the trusted builder installed dependencies and ran the build once. It
6
+ * is never written again: agents get an OverlayFS fork of it instead of a full
7
+ * checkout.
8
+ *
9
+ * A fork is a jj workspace on the `rudder-overlay` working copy, added by
10
+ * `rudder-jj rudder-fork-add`: its directory on disk holds only `.jj`, the
11
+ * agent's private OverlayFS layers live in `.jj/working_copy/{upper,work}`,
12
+ * and the warm snapshot directory is the lower layer (linked into the shared
13
+ * `.warm/lowers/<tree>` cache). Snapshot reads only the upper layer (no tree
14
+ * scan); check-out repoints the lower (no copy). Only rudder-jj can load such
15
+ * a workspace. Next to it, `<workspace>.fork/` holds:
16
+ * - `lower`: path of the warm snapshot (for pruning);
17
+ * - `bin/jj`: rudder-jj, first on PATH inside the fork;
18
+ * - `enter`: runs a command in a private user+mount namespace with the overlay
19
+ * mounted at the workspace path and `.jj` bound back, as the real user.
20
+ * The native PTY layer runs every agent command whose cwd has a sibling
21
+ * `.fork/enter` through it.
22
+ */
23
+ import fs from "node:fs";
24
+ import fsp from "node:fs/promises";
25
+ import path from "node:path";
26
+ import { spawn, spawnSync } from "node:child_process";
27
+ import { fileURLToPath } from "node:url";
28
+ import { runCommand, rudderJjPath } from "./util.js";
29
+ import { workspacePath } from "./state.js";
30
+ import { toolCacheEnv } from "./tool-cache.js";
31
+ export const WARM_WORKSPACE_PREFIX = "rudderwarm-";
32
+ const KEEP_READY = 2;
33
+ /** `.rudder-workspaces/<repo>/` (where agent workspaces live). */
34
+ function workspacesDir(repoRoot) {
35
+ return path.dirname(workspacePath(repoRoot, "warm-probe"));
36
+ }
37
+ export function warmDir(repoRoot) {
38
+ return path.join(workspacesDir(repoRoot), ".warm");
39
+ }
40
+ export function forkStateDir(workspace) {
41
+ return `${workspace}.fork`;
42
+ }
43
+ /**
44
+ * A fork's files exist only inside its mount namespace: run `command` there
45
+ * when `cwd` is an overlay fork, otherwise unchanged.
46
+ */
47
+ export function inFork(cwd, command, args) {
48
+ const enter = path.join(forkStateDir(cwd), "enter");
49
+ if (process.platform !== "linux" || !fs.existsSync(enter))
50
+ return { command, args };
51
+ return { command: enter, args: [command, ...args] };
52
+ }
53
+ /** The single parent of the main checkout's @: what `jj workspace add` bases on. */
54
+ export async function currentBaseCommit(repoRoot) {
55
+ const result = await runCommand("jj", ["log", "--no-graph", "--ignore-working-copy", "-r", "@-", "-T", 'commit_id ++ "\\n"'], {
56
+ cwd: repoRoot,
57
+ allowFailure: true,
58
+ });
59
+ const ids = result.stdout.split("\n").map((line) => line.trim()).filter(Boolean);
60
+ if (result.code === 0 && ids.length === 1)
61
+ return ids[0];
62
+ // After automatic merges @ is itself the merge commit (several parents):
63
+ // its content is current main, so new work starts from it.
64
+ if (result.code !== 0 || ids.length < 2)
65
+ return null;
66
+ const merge = await runCommand("jj", ["log", "--no-graph", "--ignore-working-copy", "-r", "@", "-T", 'commit_id ++ "\\n"'], {
67
+ cwd: repoRoot,
68
+ allowFailure: true,
69
+ });
70
+ const id = merge.stdout.trim();
71
+ return merge.code === 0 && id ? id : null;
72
+ }
73
+ export function readySnapshots(repoRoot) {
74
+ const dir = warmDir(repoRoot);
75
+ let names = [];
76
+ try {
77
+ names = fs.readdirSync(dir);
78
+ }
79
+ catch {
80
+ return [];
81
+ }
82
+ const out = [];
83
+ for (const name of names.filter((n) => n.endsWith(".ready"))) {
84
+ try {
85
+ const snap = JSON.parse(fs.readFileSync(path.join(dir, name), "utf8"));
86
+ if (fs.existsSync(path.join(snap.dir, ".jj")))
87
+ out.push(snap);
88
+ }
89
+ catch {
90
+ /* torn marker: ignore */
91
+ }
92
+ }
93
+ return out.sort((a, b) => b.builtAt.localeCompare(a.builtAt));
94
+ }
95
+ /** Commands from rudder.toml `[warm] commands = [...]`, else detected from lockfiles. */
96
+ export function warmCommands(dir) {
97
+ const configured = readConfiguredCommands(path.join(dir, "rudder.toml"));
98
+ if (configured)
99
+ return configured;
100
+ const has = (file) => fs.existsSync(path.join(dir, file));
101
+ const commands = [];
102
+ if (has("pnpm-lock.yaml"))
103
+ commands.push("pnpm install --frozen-lockfile");
104
+ else if (has("yarn.lock"))
105
+ commands.push("yarn install --frozen-lockfile");
106
+ else if (has("package-lock.json"))
107
+ commands.push("npm ci");
108
+ else if (has("package.json"))
109
+ commands.push("npm install");
110
+ if (has("package.json")) {
111
+ try {
112
+ const pkg = JSON.parse(fs.readFileSync(path.join(dir, "package.json"), "utf8"));
113
+ if (pkg.scripts?.build)
114
+ commands.push(has("pnpm-lock.yaml") ? "pnpm run build" : has("yarn.lock") ? "yarn build" : "npm run build");
115
+ }
116
+ catch {
117
+ /* unreadable package.json: install only */
118
+ }
119
+ }
120
+ if (has("Cargo.lock") || has("Cargo.toml"))
121
+ commands.push("cargo build");
122
+ if (has("uv.lock"))
123
+ commands.push("uv sync");
124
+ else if (has("requirements.txt"))
125
+ commands.push("python3 -m venv .venv && .venv/bin/pip install -r requirements.txt");
126
+ return commands;
127
+ }
128
+ function readConfiguredCommands(file) {
129
+ let text;
130
+ try {
131
+ text = fs.readFileSync(file, "utf8");
132
+ }
133
+ catch {
134
+ return null;
135
+ }
136
+ const section = text.split(/^\s*\[warm\]\s*$/m)[1]?.split(/^\s*\[/m)[0];
137
+ const match = section?.match(/^\s*commands\s*=\s*\[([\s\S]*?)\]/m);
138
+ if (!match)
139
+ return null;
140
+ return [...match[1].matchAll(/"((?:[^"\\]|\\.)*)"/g)].map((m) => JSON.parse(`"${m[1]}"`));
141
+ }
142
+ /**
143
+ * Builds the warm snapshot for `commit` (blocking). Returns it, or null when
144
+ * another builder holds the key or the build failed (a failed key is not
145
+ * retried; a new base commit gets a new key).
146
+ */
147
+ export async function buildWarmSnapshot(repoRoot, commit) {
148
+ const key = commit.slice(0, 12);
149
+ const root = warmDir(repoRoot);
150
+ await fsp.mkdir(root, { recursive: true });
151
+ const marker = (suffix) => path.join(root, `${key}.${suffix}`);
152
+ if (fs.existsSync(marker("ready")) || fs.existsSync(marker("failed"))) {
153
+ return readySnapshots(repoRoot).find((snap) => snap.key === key) ?? null;
154
+ }
155
+ let lock;
156
+ try {
157
+ lock = await fsp.open(marker("building"), "wx");
158
+ }
159
+ catch {
160
+ return null;
161
+ }
162
+ const dir = path.join(root, key);
163
+ const name = `${WARM_WORKSPACE_PREFIX}${key}`;
164
+ try {
165
+ await lock.write(String(process.pid));
166
+ await runCommand("jj", ["workspace", "forget", name], { cwd: repoRoot, allowFailure: true });
167
+ await fsp.rm(dir, { recursive: true, force: true });
168
+ const added = await runCommand("jj", ["workspace", "add", dir, "--name", name, "-r", commit], { cwd: repoRoot, allowFailure: true });
169
+ if (added.code !== 0)
170
+ throw new Error(added.stderr.trim() || "jj workspace add failed");
171
+ const previous = readySnapshots(repoRoot).find((snap) => snap.key !== key);
172
+ if (previous)
173
+ await seedFromPrevious(previous.dir, dir);
174
+ const env = { ...process.env, ...toolCacheEnv("builder") };
175
+ for (const command of warmCommands(dir)) {
176
+ process.stderr.write(`[rudder] warm snapshot ${key}: ${command}\n`);
177
+ const ran = spawnSync("sh", ["-c", command], { cwd: dir, env, stdio: ["ignore", "inherit", "inherit"] });
178
+ if (ran.status !== 0)
179
+ throw new Error(`${command} exited ${ran.status ?? ran.signal}`);
180
+ }
181
+ // Record file stats for the whole tree once; forks reuse this state.
182
+ await runCommand("jj", ["status"], { cwd: dir, allowFailure: true });
183
+ const snap = { key, commit, dir, builtAt: new Date().toISOString() };
184
+ await fsp.writeFile(marker("ready"), JSON.stringify(snap));
185
+ await pruneWarmSnapshots(repoRoot);
186
+ return snap;
187
+ }
188
+ catch (error) {
189
+ process.stderr.write(`[rudder] warm snapshot ${key} failed: ${error instanceof Error ? error.message : String(error)}\n`);
190
+ await fsp.writeFile(marker("failed"), String(error));
191
+ return null;
192
+ }
193
+ finally {
194
+ await lock.close();
195
+ await fsp.rm(marker("building"), { force: true });
196
+ }
197
+ }
198
+ /**
199
+ * Incremental warm build: copies the previous snapshot's untracked top-level
200
+ * entries (dependencies and build outputs such as node_modules, target, .venv)
201
+ * into the new checkout, so install/build only redo what changed.
202
+ */
203
+ export async function seedFromPrevious(previousDir, dir) {
204
+ let names;
205
+ try {
206
+ names = await fsp.readdir(previousDir);
207
+ }
208
+ catch {
209
+ return;
210
+ }
211
+ for (const name of names) {
212
+ if (name === ".jj" || name === ".git" || fs.existsSync(path.join(dir, name)))
213
+ continue;
214
+ const from = path.join(previousDir, name);
215
+ const to = path.join(dir, name);
216
+ // GNU cp reflinks where it can; macOS cp -c clones on APFS, else copies.
217
+ const attempts = process.platform === "linux" ? [["-a", "--reflink=auto"]] : [["-cRp"], ["-Rp"]];
218
+ let copied = false;
219
+ for (const flags of attempts) {
220
+ if (spawnSync("cp", [...flags, from, to], { stdio: "ignore" }).status === 0) {
221
+ copied = true;
222
+ break;
223
+ }
224
+ await fsp.rm(to, { recursive: true, force: true });
225
+ }
226
+ if (!copied)
227
+ await fsp.rm(to, { recursive: true, force: true });
228
+ }
229
+ }
230
+ /** Starts a detached builder for `commit` unless one is ready, failed or running. */
231
+ export function startWarmBuild(repoRoot, commit) {
232
+ const key = commit.slice(0, 12);
233
+ const root = warmDir(repoRoot);
234
+ if (["ready", "failed", "building"].some((s) => fs.existsSync(path.join(root, `${key}.${s}`))))
235
+ return;
236
+ fs.mkdirSync(root, { recursive: true });
237
+ const log = fs.openSync(path.join(root, `${key}.log`), "a");
238
+ const child = spawn(process.execPath, [fileURLToPath(import.meta.url), repoRoot, commit], {
239
+ detached: true,
240
+ stdio: ["ignore", log, log],
241
+ });
242
+ child.unref();
243
+ fs.closeSync(log);
244
+ }
245
+ /** Deletes ready snapshots beyond the newest few that no fork still uses. */
246
+ export async function pruneWarmSnapshots(repoRoot) {
247
+ const used = new Set();
248
+ const parent = workspacesDir(repoRoot);
249
+ for (const name of fs.readdirSync(parent).filter((n) => n.endsWith(".fork"))) {
250
+ try {
251
+ used.add(fs.readFileSync(path.join(parent, name, "lower"), "utf8").trim());
252
+ }
253
+ catch {
254
+ /* not a fork */
255
+ }
256
+ }
257
+ for (const snap of readySnapshots(repoRoot).slice(KEEP_READY)) {
258
+ if (used.has(snap.dir))
259
+ continue;
260
+ await fsp.rm(path.join(warmDir(repoRoot), `${snap.key}.ready`), { force: true });
261
+ await removeLowerLinks(repoRoot, snap.dir);
262
+ await runCommand("jj", ["workspace", "forget", `${WARM_WORKSPACE_PREFIX}${snap.key}`], { cwd: repoRoot, allowFailure: true });
263
+ await fsp.rm(snap.dir, { recursive: true, force: true });
264
+ }
265
+ }
266
+ /** Drops `.warm/lowers/<tree>` links into a snapshot that is being deleted. */
267
+ async function removeLowerLinks(repoRoot, target) {
268
+ const root = path.join(warmDir(repoRoot), "lowers");
269
+ for (const name of await fsp.readdir(root).catch(() => [])) {
270
+ const link = path.join(root, name);
271
+ if ((await fsp.readlink(link).catch(() => null)) === target)
272
+ await fsp.rm(link, { force: true });
273
+ }
274
+ }
275
+ const ENTER_SCRIPT = `#!/bin/sh
276
+ # Runs "$@" inside this Rudder fork: private user+mount namespace, overlay of
277
+ # the warm snapshot mounted at the workspace path, .jj bound back, real uid.
278
+ F="$(dirname "$(readlink -f "$0")")"; M="\${F%.fork}"; U="$(id -u)"; G="$(id -g)"
279
+ exec unshare -rm --propagation private sh -ec '
280
+ F="$1"; M="$2"; U="$3"; G="$4"; shift 4
281
+ mount --bind "$M/.jj" "$F/jjmnt"
282
+ W="$F/jjmnt/working_copy"
283
+ mount -t overlay overlay -o "lowerdir=$(readlink -f "$(cat "$W/lower")"),upperdir=$W/upper,workdir=$W/work,userxattr" "$M"
284
+ mount --bind "$F/jjmnt" "$M/.jj"
285
+ # Login shells rebuild PATH; make every jj on it this fork-aware rudder-jj.
286
+ J="$(readlink -f "$F/bin/jj")"
287
+ for d in $(printf %s "$PATH" | tr : " ") /usr/local/bin /usr/bin "$HOME/.local/bin"; do
288
+ [ -f "$d/jj" ] && [ "$(readlink -f "$d/jj")" != "$J" ] && mount --bind "$J" "$d/jj" 2>/dev/null || true
289
+ done
290
+ cd "$M"
291
+ PATH="$F/bin:$PATH"; export PATH
292
+ exec unshare -U --map-user="$U" --map-group="$G" -- "$@"' sh "$F" "$M" "$U" "$G" "$@"
293
+ `;
294
+ // $1 = snapshot commit, $2 = base. Paths come NUL-free from jj, one per line.
295
+ const MOVE_TO_BASE = `
296
+ jj diff --ignore-working-copy --from "$1" --to "$2" --name-only | while IFS= read -r f; do
297
+ if jj file show --ignore-working-copy -r "$2" -- "root-file:\\"$f\\"" > /dev/null 2>&1; then
298
+ mkdir -p "$(dirname "$f")"; rm -rf "$f"
299
+ jj file show --ignore-working-copy -r "$2" -- "root-file:\\"$f\\"" > "$f"
300
+ if [ "$(jj file list --ignore-working-copy -r "$2" -T 'executable' -- "root-file:\\"$f\\"")" = true ]; then chmod +x "$f"; fi
301
+ else
302
+ rm -rf "$f"
303
+ fi
304
+ done
305
+ jj rebase -r @ -d "$2"
306
+ `;
307
+ /**
308
+ * Creates `targetPath` as an overlay fork of the newest warm snapshot. Returns
309
+ * null (after cleaning up) when there is no snapshot or the overlay cannot be
310
+ * mounted here; the caller then makes a full jj checkout.
311
+ */
312
+ export async function createForkWorkspace(params) {
313
+ if (process.platform !== "linux")
314
+ return { reason: "not Linux" };
315
+ const base = await currentBaseCommit(params.repoRoot);
316
+ const snaps = readySnapshots(params.repoRoot);
317
+ // Projects with nothing to install or build keep the plain checkout.
318
+ const warmable = warmCommands(params.repoRoot).length > 0;
319
+ if (base && !snaps.some((snap) => snap.commit === base) && warmable) {
320
+ startWarmBuild(params.repoRoot, base);
321
+ }
322
+ const snapshot = snaps.find((snap) => snap.commit === base) ?? snaps[0];
323
+ if (!snapshot)
324
+ return { reason: warmable ? "no warm snapshot yet (building)" : "nothing to install or build" };
325
+ const rudderJj = rudderJjPath();
326
+ if (!rudderJj)
327
+ return { reason: "rudder-jj is not available" };
328
+ const added = await runCommand("jj", [
329
+ "rudder-fork-add", params.targetPath, "--name", params.workspaceName, "-r", snapshot.commit,
330
+ "--lower", snapshot.dir, "--lowers-root", path.join(warmDir(params.repoRoot), "lowers"),
331
+ "-m", params.description ?? "",
332
+ ], { cwd: params.repoRoot, allowFailure: true });
333
+ if (added.code !== 0) {
334
+ await fsp.rm(params.targetPath, { recursive: true, force: true });
335
+ return { reason: added.stderr.trim() || "rudder-jj rudder-fork-add failed" };
336
+ }
337
+ const state = forkStateDir(params.targetPath);
338
+ try {
339
+ for (const sub of ["jjmnt", "bin"])
340
+ await fsp.mkdir(path.join(state, sub), { recursive: true });
341
+ await fsp.symlink(rudderJj, path.join(state, "bin", "jj"));
342
+ await fsp.writeFile(path.join(state, "lower"), snapshot.dir);
343
+ await fsp.writeFile(path.join(state, "enter"), ENTER_SCRIPT, { mode: 0o755 });
344
+ const probe = spawnSync(path.join(state, "enter"), ["true"], { cwd: params.targetPath, stdio: ["ignore", "ignore", "pipe"] });
345
+ if (probe.status !== 0)
346
+ throw new Error(`overlay mount unavailable: ${probe.stderr?.toString().trim()}`);
347
+ // The snapshot supplies dependencies and build output; the code must be
348
+ // current. Move the fork's change onto the main checkout's base so only the
349
+ // files that differ are written into the upper layer.
350
+ if (base && base !== snapshot.commit) {
351
+ // Write the differing files through the mounted overlay (it records
352
+ // deletions itself), then move @ onto the base. The tree is then
353
+ // identical, so the working copy keeps the warm lower.
354
+ const moved = spawnSync(path.join(state, "enter"), ["sh", "-ec", MOVE_TO_BASE, "sh", snapshot.commit, base], {
355
+ cwd: params.targetPath, stdio: ["ignore", "ignore", "pipe"],
356
+ });
357
+ if (moved.status !== 0)
358
+ throw new Error(`could not move fork to ${base.slice(0, 12)}: ${moved.stderr?.toString().trim()}`);
359
+ }
360
+ return { snapshot };
361
+ }
362
+ catch (error) {
363
+ await runCommand("jj", ["workspace", "forget", params.workspaceName], { cwd: params.repoRoot, allowFailure: true });
364
+ await removeForkState(params.targetPath);
365
+ await fsp.rm(params.targetPath, { recursive: true, force: true });
366
+ return { reason: error instanceof Error ? error.message : String(error) };
367
+ }
368
+ }
369
+ /** Removes `<workspace>.fork/` (OverlayFS leaves a mode-000 `work/work`). */
370
+ export async function removeForkState(workspace) {
371
+ const state = forkStateDir(workspace);
372
+ await fsp.chmod(path.join(workspace, ".jj", "working_copy", "work", "work"), 0o700).catch(() => undefined);
373
+ await fsp.chmod(path.join(state, "work", "work"), 0o700).catch(() => undefined);
374
+ await fsp.rm(state, { recursive: true, force: true });
375
+ }
376
+ // Detached builder entry: node warm-snapshot.js <repoRoot> <commit>
377
+ if (process.argv[1] && fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
378
+ const [repoRoot, commit] = process.argv.slice(2);
379
+ if (repoRoot && commit)
380
+ await buildWarmSnapshot(repoRoot, commit);
381
+ }
382
+ //# sourceMappingURL=warm-snapshot.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"warm-snapshot.js","sourceRoot":"","sources":["../src/warm-snapshot.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@exla/rudder",
3
- "version": "4.0.0-alpha.7",
4
- "description": "A TUI for managing coding agents: run Claude Code, Codex and opencode side by side, each in its own isolated jj workspace.",
3
+ "version": "4.1.0",
4
+ "description": "Run Claude Code and Codex locally or in Rudder Cloud, with one dashboard for tasks and agent communication.",
5
5
  "keywords": [
6
6
  "tui",
7
7
  "coding-agents",
@@ -27,7 +27,7 @@
27
27
  "clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",
28
28
  "build": "npm run clean && tsc -p tsconfig.json && npm run build-board && npm run build-native && npm run copy-native && npm run chmod-cli",
29
29
  "build-board": "esbuild src/board/ui/index.tsx --bundle --minify --format=esm --jsx=automatic --jsx-import-source=preact --outfile=dist/board/board.js && esbuild src/board/ui/board.css --bundle --minify --outfile=dist/board/board.css",
30
- "build-native": "cargo build --release --manifest-path native/Cargo.toml",
30
+ "build-native": "node scripts/build-native.mjs",
31
31
  "check": "tsc -p tsconfig.json --noEmit",
32
32
  "test": "tsc -p tsconfig.json && npm run chmod-cli && node --test tests/*.test.mjs",
33
33
  "test:tui": "node --test tests/tui/*.test.mjs",
@@ -44,6 +44,7 @@
44
44
  "dist/",
45
45
  "assets/",
46
46
  "scripts/copy-native.mjs",
47
+ "scripts/native-artifacts.mjs",
47
48
  "scripts/postinstall.mjs",
48
49
  "README.md",
49
50
  "package.json"
@@ -1,9 +1,12 @@
1
1
  #!/usr/bin/env node
2
2
  import fs from "node:fs";
3
3
  import path from "node:path";
4
+ import { randomUUID } from "node:crypto";
5
+ import { checkedSourceRevision, MANIFEST_NAME, readNativeBinary, verifyNativeArtifacts } from "./native-artifacts.mjs";
4
6
 
5
7
  const nativeBinaryBase = "rudder-native";
6
8
  const nativeBinaryName = process.platform === "win32" ? `${nativeBinaryBase}.exe` : nativeBinaryBase;
9
+ const companionBinaryName = process.platform === "win32" ? "rudder-jj.exe" : "rudder-jj";
7
10
  const platformKey = `${process.platform}-${process.arch}`;
8
11
  const distNativeDir = path.join("dist", "native");
9
12
 
@@ -16,7 +19,7 @@ function copyExecutable(src, dest) {
16
19
  }
17
20
 
18
21
  function copyCurrentBuild() {
19
- const sources = [
22
+ const sources = process.env.CARGO_TARGET_DIR ? [path.join(process.env.CARGO_TARGET_DIR, "release", nativeBinaryName)] : [
20
23
  path.join("target", "release", nativeBinaryName),
21
24
  path.join("native", "target", "release", nativeBinaryName),
22
25
  ];
@@ -24,59 +27,43 @@ function copyCurrentBuild() {
24
27
  if (!src) {
25
28
  return false;
26
29
  }
30
+ const companion = path.join(path.dirname(src), companionBinaryName);
31
+ if (!fs.existsSync(companion)) {
32
+ throw new Error("Native build is missing rudder-jj; run npm run build-native.");
33
+ }
27
34
  copyExecutable(src, path.join(distNativeDir, platformKey, nativeBinaryName));
35
+ copyExecutable(companion, path.join(distNativeDir, platformKey, companionBinaryName));
28
36
  return true;
29
37
  }
30
38
 
31
- function copyPrebuiltArtifacts() {
39
+ async function copyPrebuiltArtifacts() {
32
40
  const root = process.env.RUDDER_NATIVE_PREBUILTS;
33
- if (!root || !fs.existsSync(root)) {
34
- return 0;
35
- }
36
- let copied = 0;
37
- for (const entry of fs.readdirSync(root, { withFileTypes: true })) {
38
- if (!entry.isDirectory()) {
39
- continue;
40
- }
41
- const key = entry.name.replace(/^rudder-native-/, "");
42
- const dir = path.join(root, entry.name);
43
- const candidates = [
44
- path.join(dir, "rudder-native"),
45
- path.join(dir, "rudder-native.exe"),
46
- path.join(dir, key, "rudder-native"),
47
- path.join(dir, key, "rudder-native.exe"),
48
- path.join(dir, "native-dist", key, "rudder-native"),
49
- path.join(dir, "native-dist", key, "rudder-native.exe"),
50
- ];
51
- const src = candidates.find((candidate) => fs.existsSync(candidate)) ?? findNestedNativeBinary(dir);
52
- if (!src) {
53
- continue;
54
- }
55
- const name = src.endsWith(".exe") ? "rudder-native.exe" : "rudder-native";
56
- copyExecutable(src, path.join(distNativeDir, key, name));
57
- copied += 1;
58
- }
59
- return copied;
60
- }
61
-
62
- function findNestedNativeBinary(dir) {
63
- const pending = [{ dir, depth: 0 }];
64
- while (pending.length > 0) {
65
- const current = pending.pop();
66
- if (!current || current.depth > 4) {
67
- continue;
68
- }
69
- for (const entry of fs.readdirSync(current.dir, { withFileTypes: true })) {
70
- const full = path.join(current.dir, entry.name);
71
- if (entry.isFile() && (entry.name === "rudder-native" || entry.name === "rudder-native.exe")) {
72
- return full;
73
- }
74
- if (entry.isDirectory()) {
75
- pending.push({ dir: full, depth: current.depth + 1 });
41
+ if (!root) throw new Error("RUDDER_NATIVE_PREBUILTS must name a complete verified artifact set");
42
+ const verified = await verifyNativeArtifacts({ root, expectedRevision: process.env.RUDDER_NATIVE_SOURCE_REVISION });
43
+ // Check every platform before any output changes; rehash while copying into
44
+ // private staging so a changed source cannot become a packaged executable.
45
+ fs.mkdirSync("dist", { recursive: true });
46
+ const staging = path.join("dist", `.native-stage-${randomUUID()}`);
47
+ fs.mkdirSync(staging, { mode: 0o700 });
48
+ try {
49
+ for (const artifact of verified.artifacts) {
50
+ const directory = path.join(staging, artifact.platform);
51
+ fs.mkdirSync(directory);
52
+ for (const file of artifact.files) {
53
+ await readNativeBinary(file.path, file, path.join(directory, file.name));
76
54
  }
55
+ fs.writeFileSync(path.join(directory, MANIFEST_NAME), JSON.stringify(artifact.manifest, null, 2) + "\n");
56
+ }
57
+ if (checkedSourceRevision({ expectedRevision: process.env.RUDDER_NATIVE_SOURCE_REVISION }) !== verified.sourceRevision) throw new Error("Native source changed while staging artifacts");
58
+ fs.mkdirSync(distNativeDir, { recursive: true });
59
+ for (const artifact of verified.artifacts) {
60
+ const destination = path.join(distNativeDir, artifact.platform);
61
+ fs.rmSync(destination, { recursive: true, force: true });
62
+ fs.renameSync(path.join(staging, artifact.platform), destination);
77
63
  }
64
+ } finally {
65
+ fs.rmSync(staging, { recursive: true, force: true });
78
66
  }
79
- return undefined;
80
67
  }
81
68
 
82
69
  function removeLegacyFlatBinary() {
@@ -84,6 +71,6 @@ function removeLegacyFlatBinary() {
84
71
  fs.rmSync(path.join(distNativeDir, "rudder-native.exe"), { force: true });
85
72
  }
86
73
 
87
- copyCurrentBuild();
88
- copyPrebuiltArtifacts();
74
+ if (Object.hasOwn(process.env, "RUDDER_NATIVE_PREBUILTS")) await copyPrebuiltArtifacts();
75
+ else copyCurrentBuild();
89
76
  removeLegacyFlatBinary();