@neuralnomads/codenomad 0.14.0 → 0.15.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/dist/cli-upgrade.js +53 -0
- package/dist/cli-upgrade.test.js +31 -0
- package/dist/filesystem/browser.js +15 -1
- package/dist/index.js +23 -6
- package/dist/opencode-config/package-lock.json +380 -0
- package/dist/opencode-config/package.json +2 -2
- package/dist/server/__tests__/remote-proxy.test.js +204 -0
- package/dist/server/http-server.js +8 -32
- package/dist/server/remote-proxy.js +466 -0
- package/dist/server/routes/remote-proxy.js +42 -0
- package/dist/server/routes/settings.js +1 -1
- package/dist/server/routes/workspaces.js +118 -0
- package/dist/workspaces/__tests__/git-worktrees.test.js +43 -0
- package/dist/workspaces/__tests__/spawn.test.js +140 -0
- package/dist/workspaces/git-mutations.js +98 -0
- package/dist/workspaces/git-status.js +323 -0
- package/dist/workspaces/git-worktrees.js +18 -1
- package/dist/workspaces/manager.js +9 -4
- package/dist/workspaces/opencode-auth.js +18 -0
- package/dist/workspaces/opencode-auth.test.js +34 -0
- package/dist/workspaces/runtime.js +54 -77
- package/dist/workspaces/spawn.js +219 -0
- package/dist/workspaces/worktree-directory.js +74 -0
- package/package.json +1 -1
- package/public/assets/ChangesTab-ovdqLHc3.js +2 -0
- package/public/assets/DiffToolbar-B12EfXMX.js +1 -0
- package/public/assets/FilesTab-nb_itEXG.js +2 -0
- package/public/assets/GitChangesTab-DcT_4BL2.js +2 -0
- package/public/assets/{SplitFilePanel-CupweEA5.js → SplitFilePanel-BOHH3F--.js} +1 -1
- package/public/assets/StatusTab-Dyt_EG33.js +1 -0
- package/public/assets/align-justify-9zpyaAdy.js +1 -0
- package/public/assets/{bundle-full-B-5u6Iv3.js → bundle-full-xFW13Lny.js} +1 -1
- package/public/assets/{diff-viewer-_ehhYA-Z.js → diff-viewer-xG9yjpN8.js} +1 -1
- package/public/assets/index-7DpT014-.js +1 -0
- package/public/assets/index-BDK4V9L0.js +1 -0
- package/public/assets/index-Bx-Bezt2.js +1 -0
- package/public/assets/{index-BqiNjV6R.js → index-CCAZZY0l.js} +1 -1
- package/public/assets/{index-BntAaLZs.js → index-CEcZq5WB.js} +1 -1
- package/public/assets/index-CQCmSDHL.js +1 -0
- package/public/assets/{index-CxQr-wOF.js → index-Cz_fl8aY.js} +1 -1
- package/public/assets/index-Dcgftm1m.css +1 -0
- package/public/assets/index-m4C3yx3J.js +1 -0
- package/public/assets/index-mh_z9p40.js +2 -0
- package/public/assets/{loading-Dck2H3XH.js → loading-HUhLEgb_.js} +1 -1
- package/public/assets/main-CKhfaeKI.js +48 -0
- package/public/assets/{markdown-CFV9kR80.js → markdown-BeXU9Z-x.js} +22 -22
- package/public/assets/monaco-viewer-BgP6xpZ6.js +26 -0
- package/public/assets/{todo-Ghwirj-b.js → todo-D6PVVp_f.js} +1 -1
- package/public/assets/tool-call-Dgn3NlA8.js +60 -0
- package/public/assets/{unified-picker-Dw0kTXoT.js → unified-picker-DuNuUpLy.js} +1 -1
- package/public/assets/wrap-text-zghCl6wN.js +1 -0
- package/public/index.html +4 -4
- package/public/loading.html +4 -4
- package/public/sw.js +1 -1
- package/public/ui-version.json +1 -1
- package/public/assets/ChangesTab-CFkk3tAp.js +0 -2
- package/public/assets/DiffToolbar-CQQLR1mp.js +0 -1
- package/public/assets/FilesTab-CXgucPtN.js +0 -2
- package/public/assets/GitChangesTab-BidSb28_.js +0 -2
- package/public/assets/StatusTab-C2Pl_Vce.js +0 -1
- package/public/assets/index-BnfDkr8C.js +0 -1
- package/public/assets/index-BwCEJ4BE.css +0 -1
- package/public/assets/index-DXaitXVC.js +0 -1
- package/public/assets/index-DzRzoTK8.js +0 -2
- package/public/assets/index-ShHad48G.js +0 -1
- package/public/assets/index-_EaXFUIj.js +0 -1
- package/public/assets/index-mMh5TJvW.js +0 -1
- package/public/assets/main-BsIf5lOY.js +0 -50
- package/public/assets/monaco-viewer-CMM6n0T3.js +0 -25
- package/public/assets/tool-call-BC2Pv3uG.js +0 -60
- package/public/assets/wrap-text-D2MJk2ad.js +0 -1
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { after, afterEach, describe, it } from "node:test";
|
|
3
|
+
import fs from "node:fs";
|
|
4
|
+
import http from "node:http";
|
|
5
|
+
import os from "node:os";
|
|
6
|
+
import path from "node:path";
|
|
7
|
+
import { Agent, fetch } from "undici";
|
|
8
|
+
import { RemoteProxySessionManager } from "../remote-proxy";
|
|
9
|
+
import { resolveHttpsOptions } from "../tls";
|
|
10
|
+
const sharedTempDir = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-remote-proxy-test-"));
|
|
11
|
+
const sharedTls = resolveHttpsOptions({
|
|
12
|
+
enabled: true,
|
|
13
|
+
configDir: sharedTempDir,
|
|
14
|
+
host: "127.0.0.1",
|
|
15
|
+
logger: createStubLogger(),
|
|
16
|
+
});
|
|
17
|
+
if (!sharedTls) {
|
|
18
|
+
throw new Error("Failed to generate HTTPS options for remote proxy tests");
|
|
19
|
+
}
|
|
20
|
+
const sharedHttpsOptions = sharedTls.httpsOptions;
|
|
21
|
+
const httpsDispatcher = new Agent({ connect: { rejectUnauthorized: false } });
|
|
22
|
+
const managers = new Set();
|
|
23
|
+
afterEach(async () => {
|
|
24
|
+
for (const manager of managers) {
|
|
25
|
+
await disposeManager(manager);
|
|
26
|
+
}
|
|
27
|
+
managers.clear();
|
|
28
|
+
});
|
|
29
|
+
after(() => {
|
|
30
|
+
fs.rmSync(sharedTempDir, { recursive: true, force: true });
|
|
31
|
+
httpsDispatcher.close().catch(() => { });
|
|
32
|
+
});
|
|
33
|
+
describe("RemoteProxySessionManager", () => {
|
|
34
|
+
it("blocks proxying before activation and keeps bootstrap tokens scoped per session", async () => {
|
|
35
|
+
await withUpstreamServer(async (upstreamBaseUrl) => {
|
|
36
|
+
const manager = createSessionManager();
|
|
37
|
+
const session1 = await createSession(manager, `${upstreamBaseUrl}/base`);
|
|
38
|
+
const session2 = await createSession(manager, `${upstreamBaseUrl}/base`);
|
|
39
|
+
const blocked = await proxyFetch(`${session1.proxyOrigin}/status`);
|
|
40
|
+
assert.equal(blocked.status, 403);
|
|
41
|
+
const wrongTokenResponse = await proxyFetch(`${session1.proxyOrigin}/__codenomad/api/auth/token`, {
|
|
42
|
+
method: "POST",
|
|
43
|
+
headers: { "content-type": "application/json" },
|
|
44
|
+
body: JSON.stringify({ token: session2.token }),
|
|
45
|
+
});
|
|
46
|
+
assert.equal(wrongTokenResponse.status, 401);
|
|
47
|
+
assert.equal(await activateSession(session1), true);
|
|
48
|
+
assert.equal(await activateSession(session2), true);
|
|
49
|
+
}, (req, res) => {
|
|
50
|
+
res.writeHead(200, { "content-type": "text/plain" });
|
|
51
|
+
res.end(req.url ?? "");
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
it("preserves remote base paths and rewrites same-origin redirects to the local proxy origin", async () => {
|
|
55
|
+
await withUpstreamServer(async (upstreamBaseUrl) => {
|
|
56
|
+
const manager = createSessionManager();
|
|
57
|
+
const session = await createSession(manager, `${upstreamBaseUrl}/base`);
|
|
58
|
+
await activateSession(session);
|
|
59
|
+
const apiResponse = await proxyFetch(`${session.proxyOrigin}/api/auth/status?foo=bar`);
|
|
60
|
+
assert.equal(apiResponse.status, 200);
|
|
61
|
+
assert.equal(await apiResponse.text(), "/base/api/auth/status?foo=bar");
|
|
62
|
+
const redirectResponse = await proxyFetch(`${session.proxyOrigin}/redirect`, { redirect: "manual" });
|
|
63
|
+
assert.equal(redirectResponse.status, 302);
|
|
64
|
+
assert.equal(redirectResponse.headers.get("location"), `${session.proxyOrigin}/base/after?ok=1`);
|
|
65
|
+
}, (req, res) => {
|
|
66
|
+
const requestUrl = req.url ?? "";
|
|
67
|
+
if (requestUrl === "/base/redirect") {
|
|
68
|
+
res.writeHead(302, { location: "/base/after?ok=1" });
|
|
69
|
+
res.end();
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
res.writeHead(200, { "content-type": "text/plain" });
|
|
73
|
+
res.end(requestUrl);
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
it("rewrites set-cookie names for the proxy and restores cookie names on proxied requests", async () => {
|
|
77
|
+
await withUpstreamServer(async (upstreamBaseUrl) => {
|
|
78
|
+
const manager = createSessionManager();
|
|
79
|
+
const session = await createSession(manager, `${upstreamBaseUrl}/base`);
|
|
80
|
+
await activateSession(session);
|
|
81
|
+
const loginResponse = await proxyFetch(`${session.proxyOrigin}/login`);
|
|
82
|
+
assert.equal(loginResponse.status, 200);
|
|
83
|
+
const setCookie = getSetCookie(loginResponse)[0];
|
|
84
|
+
assert.match(setCookie, /^cnrp_[0-9a-f]+_session=abc123/i);
|
|
85
|
+
assert.doesNotMatch(setCookie, /domain=/i);
|
|
86
|
+
const cookieHeader = setCookie.split(";", 1)[0];
|
|
87
|
+
const whoamiResponse = await proxyFetch(`${session.proxyOrigin}/whoami`, {
|
|
88
|
+
headers: { cookie: cookieHeader },
|
|
89
|
+
});
|
|
90
|
+
assert.equal(await whoamiResponse.text(), "session=abc123");
|
|
91
|
+
}, (req, res) => {
|
|
92
|
+
const requestUrl = req.url ?? "";
|
|
93
|
+
if (requestUrl === "/base/login") {
|
|
94
|
+
res.writeHead(200, {
|
|
95
|
+
"content-type": "text/plain",
|
|
96
|
+
"set-cookie": "session=abc123; Path=/; Secure; HttpOnly; Domain=127.0.0.1",
|
|
97
|
+
});
|
|
98
|
+
res.end("ok");
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
if (requestUrl === "/base/whoami") {
|
|
102
|
+
res.writeHead(200, { "content-type": "text/plain" });
|
|
103
|
+
res.end(req.headers.cookie ?? "");
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
res.writeHead(404, { "content-type": "text/plain" });
|
|
107
|
+
res.end(requestUrl);
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
it("supports explicit deletion and idle cleanup of sessions", async () => {
|
|
111
|
+
await withUpstreamServer(async (upstreamBaseUrl) => {
|
|
112
|
+
const manager = createSessionManager();
|
|
113
|
+
const session = await createSession(manager, `${upstreamBaseUrl}/base`);
|
|
114
|
+
assert.equal(await manager.deleteSession(session.sessionId), true);
|
|
115
|
+
assert.equal(await manager.deleteSession(session.sessionId), false);
|
|
116
|
+
const session3 = await createSession(manager, `${upstreamBaseUrl}/base`);
|
|
117
|
+
const internalSessions = manager.sessions;
|
|
118
|
+
const internalCleanup = manager.cleanupExpiredSessions;
|
|
119
|
+
internalSessions.get(session3.sessionId).lastAccessAt = Date.now() - 31 * 60000;
|
|
120
|
+
await internalCleanup.call(manager);
|
|
121
|
+
assert.equal(internalSessions.has(session3.sessionId), false);
|
|
122
|
+
assert.equal(await manager.deleteSession(session3.sessionId), false);
|
|
123
|
+
}, (_req, res) => {
|
|
124
|
+
res.writeHead(200, { "content-type": "text/plain" });
|
|
125
|
+
res.end("ok");
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
function createSessionManager() {
|
|
130
|
+
const manager = new RemoteProxySessionManager({
|
|
131
|
+
authManager: {
|
|
132
|
+
isLoopbackRequest: () => true,
|
|
133
|
+
},
|
|
134
|
+
logger: createStubLogger(),
|
|
135
|
+
httpsOptions: sharedHttpsOptions,
|
|
136
|
+
});
|
|
137
|
+
managers.add(manager);
|
|
138
|
+
return manager;
|
|
139
|
+
}
|
|
140
|
+
async function createSession(manager, baseUrl) {
|
|
141
|
+
const created = await manager.createSession(baseUrl, false);
|
|
142
|
+
const windowUrl = new URL(created.windowUrl);
|
|
143
|
+
return {
|
|
144
|
+
sessionId: created.sessionId,
|
|
145
|
+
windowUrl,
|
|
146
|
+
proxyOrigin: windowUrl.origin,
|
|
147
|
+
token: decodeURIComponent(windowUrl.hash.replace(/^#/, "")),
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
async function activateSession(session) {
|
|
151
|
+
const response = await proxyFetch(`${session.proxyOrigin}/__codenomad/api/auth/token`, {
|
|
152
|
+
method: "POST",
|
|
153
|
+
headers: { "content-type": "application/json" },
|
|
154
|
+
body: JSON.stringify({ token: session.token }),
|
|
155
|
+
});
|
|
156
|
+
if (!response.ok) {
|
|
157
|
+
return false;
|
|
158
|
+
}
|
|
159
|
+
const body = (await response.json());
|
|
160
|
+
return body.ok === true;
|
|
161
|
+
}
|
|
162
|
+
function getSetCookie(response) {
|
|
163
|
+
const values = response.headers.getSetCookie?.();
|
|
164
|
+
if (Array.isArray(values) && values.length > 0) {
|
|
165
|
+
return values;
|
|
166
|
+
}
|
|
167
|
+
const fallback = response.headers.get("set-cookie");
|
|
168
|
+
return fallback ? [fallback] : [];
|
|
169
|
+
}
|
|
170
|
+
async function proxyFetch(url, init) {
|
|
171
|
+
return fetch(url, { dispatcher: httpsDispatcher, ...init });
|
|
172
|
+
}
|
|
173
|
+
async function disposeManager(manager) {
|
|
174
|
+
const sessions = Array.from(manager.sessions.keys());
|
|
175
|
+
for (const sessionId of sessions) {
|
|
176
|
+
await manager.deleteSession(sessionId);
|
|
177
|
+
}
|
|
178
|
+
clearInterval(manager.cleanupTimer);
|
|
179
|
+
}
|
|
180
|
+
async function withUpstreamServer(callback, handler) {
|
|
181
|
+
const server = http.createServer(handler);
|
|
182
|
+
await new Promise((resolve) => server.listen(0, "127.0.0.1", () => resolve()));
|
|
183
|
+
try {
|
|
184
|
+
const address = server.address();
|
|
185
|
+
if (!address || typeof address === "string") {
|
|
186
|
+
throw new Error("Failed to resolve upstream server address");
|
|
187
|
+
}
|
|
188
|
+
await callback(`http://127.0.0.1:${address.port}`);
|
|
189
|
+
}
|
|
190
|
+
finally {
|
|
191
|
+
await new Promise((resolve, reject) => server.close((error) => (error ? reject(error) : resolve())));
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
function createStubLogger() {
|
|
195
|
+
const logger = {
|
|
196
|
+
info() { },
|
|
197
|
+
warn() { },
|
|
198
|
+
error() { },
|
|
199
|
+
child() {
|
|
200
|
+
return logger;
|
|
201
|
+
},
|
|
202
|
+
};
|
|
203
|
+
return logger;
|
|
204
|
+
}
|
|
@@ -7,7 +7,8 @@ import { connect as connectTcp } from "net";
|
|
|
7
7
|
import path from "path";
|
|
8
8
|
import { connect as connectTls } from "tls";
|
|
9
9
|
import { fetch } from "undici";
|
|
10
|
-
import { isValidWorktreeSlug
|
|
10
|
+
import { isValidWorktreeSlug } from "../workspaces/git-worktrees";
|
|
11
|
+
import { resolveWorktreeDirectory } from "../workspaces/worktree-directory";
|
|
11
12
|
import { registerWorkspaceRoutes } from "./routes/workspaces";
|
|
12
13
|
import { registerSettingsRoutes } from "./routes/settings";
|
|
13
14
|
import { registerFilesystemRoutes } from "./routes/filesystem";
|
|
@@ -19,6 +20,7 @@ import { registerBackgroundProcessRoutes } from "./routes/background-processes";
|
|
|
19
20
|
import { registerWorktreeRoutes } from "./routes/worktrees";
|
|
20
21
|
import { registerSpeechRoutes } from "./routes/speech";
|
|
21
22
|
import { registerRemoteServerRoutes } from "./routes/remote-servers";
|
|
23
|
+
import { registerRemoteProxyRoutes } from "./routes/remote-proxy";
|
|
22
24
|
import { registerSideCarRoutes } from "./routes/sidecars";
|
|
23
25
|
import { BackgroundProcessManager } from "../background-processes/manager";
|
|
24
26
|
import { registerAuthRoutes } from "./routes/auth";
|
|
@@ -138,7 +140,10 @@ export function createHttpServer(deps) {
|
|
|
138
140
|
if (deps.authManager.isTokenBootstrapEnabled()) {
|
|
139
141
|
publicPagePaths.add("/auth/token");
|
|
140
142
|
}
|
|
141
|
-
|
|
143
|
+
const isLoopbackRemoteProxyDelete = request.method === "DELETE" &&
|
|
144
|
+
pathname.startsWith("/api/remote-proxy/sessions/") &&
|
|
145
|
+
deps.authManager.isLoopbackRequest(request);
|
|
146
|
+
if (publicApiPaths.has(pathname) || publicPagePaths.has(pathname) || isLoopbackRemoteProxyDelete) {
|
|
142
147
|
done();
|
|
143
148
|
return;
|
|
144
149
|
}
|
|
@@ -202,6 +207,7 @@ export function createHttpServer(deps) {
|
|
|
202
207
|
workspaceManager: deps.workspaceManager,
|
|
203
208
|
});
|
|
204
209
|
registerRemoteServerRoutes(app, { logger: apiLogger });
|
|
210
|
+
registerRemoteProxyRoutes(app, { logger: proxyLogger, sessionManager: deps.remoteProxySessionManager });
|
|
205
211
|
registerSpeechRoutes(app, { speechService: deps.speechService });
|
|
206
212
|
registerSideCarRoutes(app, { sidecarManager: deps.sidecarManager });
|
|
207
213
|
registerSideCarProxyRoutes(app, { sidecarManager: deps.sidecarManager, logger: proxyLogger });
|
|
@@ -602,36 +608,6 @@ function normalizeInstanceSuffix(pathSuffix) {
|
|
|
602
608
|
const trimmed = pathSuffix.replace(/^\/+/, "");
|
|
603
609
|
return trimmed.length === 0 ? "/" : `/${trimmed}`;
|
|
604
610
|
}
|
|
605
|
-
const WORKTREE_CACHE_TTL_MS = 2000;
|
|
606
|
-
const worktreeCache = new Map();
|
|
607
|
-
async function getCachedWorktrees(params) {
|
|
608
|
-
const cached = worktreeCache.get(params.workspaceId);
|
|
609
|
-
const now = Date.now();
|
|
610
|
-
if (cached && cached.expiresAt > now) {
|
|
611
|
-
return cached;
|
|
612
|
-
}
|
|
613
|
-
const { repoRoot } = await resolveRepoRoot(params.workspacePath, params.logger);
|
|
614
|
-
const worktrees = await listWorktrees({ repoRoot, workspaceFolder: params.workspacePath, logger: params.logger });
|
|
615
|
-
const entry = {
|
|
616
|
-
expiresAt: now + WORKTREE_CACHE_TTL_MS,
|
|
617
|
-
repoRoot,
|
|
618
|
-
worktrees: worktrees.map((wt) => ({ slug: wt.slug, directory: wt.directory })),
|
|
619
|
-
};
|
|
620
|
-
worktreeCache.set(params.workspaceId, entry);
|
|
621
|
-
return entry;
|
|
622
|
-
}
|
|
623
|
-
async function resolveWorktreeDirectory(params) {
|
|
624
|
-
const { worktreeSlug } = params;
|
|
625
|
-
const cached = await getCachedWorktrees({ workspaceId: params.workspaceId, workspacePath: params.workspacePath, logger: params.logger });
|
|
626
|
-
const match = cached.worktrees.find((wt) => wt.slug === worktreeSlug);
|
|
627
|
-
if (match) {
|
|
628
|
-
return match.directory;
|
|
629
|
-
}
|
|
630
|
-
// If the slug is new (e.g., created moments ago), refresh once.
|
|
631
|
-
worktreeCache.delete(params.workspaceId);
|
|
632
|
-
const refreshed = await getCachedWorktrees({ workspaceId: params.workspaceId, workspacePath: params.workspacePath, logger: params.logger });
|
|
633
|
-
return refreshed.worktrees.find((wt) => wt.slug === worktreeSlug)?.directory ?? null;
|
|
634
|
-
}
|
|
635
611
|
function setupStaticUi(app, uiDir, authManager) {
|
|
636
612
|
if (!uiDir) {
|
|
637
613
|
app.log.warn("UI static directory not provided; API endpoints only");
|