dvalincode 0.23.0 → 0.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +51 -12
- package/README.zh-CN.md +43 -11
- package/dist/agent/compact.js +9 -1
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +9 -1
- package/dist/agent/loop.js +56 -12
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/modes.js +7 -0
- package/dist/agent/modes.js.map +1 -1
- package/dist/agent/runner.d.ts +2 -1
- package/dist/agent/runner.js +180 -32
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +21 -0
- package/dist/agent/session.js +71 -33
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/toolFollowups.d.ts +13 -0
- package/dist/agent/toolFollowups.js +50 -0
- package/dist/agent/toolFollowups.js.map +1 -0
- package/dist/agent/types.d.ts +3 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +41 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/minimize.js +2 -1
- package/dist/audit/minimize.js.map +1 -1
- package/dist/audit/taps.js +10 -1
- package/dist/audit/taps.js.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/checkpoint.d.ts +3 -0
- package/dist/commands/checkpoint.js +34 -0
- package/dist/commands/checkpoint.js.map +1 -0
- package/dist/commands/run.d.ts +1 -0
- package/dist/commands/run.js +46 -18
- package/dist/commands/run.js.map +1 -1
- package/dist/core/checkpoint.d.ts +41 -0
- package/dist/core/checkpoint.js +159 -0
- package/dist/core/checkpoint.js.map +1 -0
- package/dist/core/context.d.ts +7 -0
- package/dist/core/context.js +1 -0
- package/dist/core/context.js.map +1 -1
- package/dist/core/gitRead.d.ts +20 -0
- package/dist/core/gitRead.js +97 -0
- package/dist/core/gitRead.js.map +1 -0
- package/dist/core/ignorefile.d.ts +2 -0
- package/dist/core/ignorefile.js +8 -0
- package/dist/core/ignorefile.js.map +1 -1
- package/dist/core/policy.d.ts +4 -0
- package/dist/core/policy.js +8 -6
- package/dist/core/policy.js.map +1 -1
- package/dist/core/redactSecrets.d.ts +14 -0
- package/dist/core/redactSecrets.js +35 -0
- package/dist/core/redactSecrets.js.map +1 -0
- package/dist/core/trust.d.ts +5 -0
- package/dist/core/trust.js +12 -0
- package/dist/core/trust.js.map +1 -1
- package/dist/core/webEgress.d.ts +66 -0
- package/dist/core/webEgress.js +281 -0
- package/dist/core/webEgress.js.map +1 -0
- package/dist/evidence/compliance.js +1 -1
- package/dist/evidence/compliance.js.map +1 -1
- package/dist/harness/run.d.ts +4 -0
- package/dist/harness/run.js +20 -15
- package/dist/harness/run.js.map +1 -1
- package/dist/mcp/register.js +4 -1
- package/dist/mcp/register.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -2
- package/dist/mcp/server.js +28 -9
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/anthropic.js +16 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/chatImages.d.ts +21 -0
- package/dist/providers/chatImages.js +18 -0
- package/dist/providers/chatImages.js.map +1 -0
- package/dist/providers/egress.js +7 -0
- package/dist/providers/egress.js.map +1 -1
- package/dist/providers/openaiCompatible.js +19 -1
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/retry.js +2 -0
- package/dist/providers/retry.js.map +1 -1
- package/dist/providers/runBudget.d.ts +11 -0
- package/dist/providers/runBudget.js +74 -0
- package/dist/providers/runBudget.js.map +1 -0
- package/dist/providers/types.d.ts +6 -0
- package/dist/server/auth.d.ts +33 -0
- package/dist/server/auth.js +53 -0
- package/dist/server/auth.js.map +1 -0
- package/dist/server/configStore.d.ts +10 -0
- package/dist/server/configStore.js +9 -0
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/index.d.ts +5 -0
- package/dist/server/index.js +73 -5
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/config.js +37 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/sessions.js +2 -1
- package/dist/server/routes/sessions.js.map +1 -1
- package/dist/server/wsHandler.js +23 -12
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/sessions/journal.d.ts +2 -0
- package/dist/sessions/journal.js.map +1 -1
- package/dist/sessions/store.d.ts +6 -0
- package/dist/sessions/store.js +11 -0
- package/dist/sessions/store.js.map +1 -1
- package/dist/tools/applyPatch.d.ts +13 -0
- package/dist/tools/applyPatch.js +144 -0
- package/dist/tools/applyPatch.js.map +1 -0
- package/dist/tools/askUser.d.ts +3 -0
- package/dist/tools/askUser.js +23 -0
- package/dist/tools/askUser.js.map +1 -0
- package/dist/tools/checkDiagnostics.d.ts +8 -0
- package/dist/tools/checkDiagnostics.js +48 -0
- package/dist/tools/checkDiagnostics.js.map +1 -0
- package/dist/tools/editFile.d.ts +8 -2
- package/dist/tools/editFile.js +95 -26
- package/dist/tools/editFile.js.map +1 -1
- package/dist/tools/gitBlame.d.ts +11 -0
- package/dist/tools/gitBlame.js +43 -0
- package/dist/tools/gitBlame.js.map +1 -0
- package/dist/tools/gitDiff.js +13 -24
- package/dist/tools/gitDiff.js.map +1 -1
- package/dist/tools/gitLog.d.ts +11 -0
- package/dist/tools/gitLog.js +39 -0
- package/dist/tools/gitLog.js.map +1 -0
- package/dist/tools/gitShow.d.ts +11 -0
- package/dist/tools/gitShow.js +41 -0
- package/dist/tools/gitShow.js.map +1 -0
- package/dist/tools/gitStatus.js +2 -5
- package/dist/tools/gitStatus.js.map +1 -1
- package/dist/tools/htmlText.d.ts +19 -0
- package/dist/tools/htmlText.js +104 -0
- package/dist/tools/htmlText.js.map +1 -0
- package/dist/tools/readFile.js +84 -1
- package/dist/tools/readFile.js.map +1 -1
- package/dist/tools/registry.d.ts +2 -1
- package/dist/tools/registry.js +29 -3
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rollbackRun.d.ts +5 -0
- package/dist/tools/rollbackRun.js +142 -0
- package/dist/tools/rollbackRun.js.map +1 -0
- package/dist/tools/runCheck.js +10 -1
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/searchText.d.ts +10 -0
- package/dist/tools/searchText.js +193 -19
- package/dist/tools/searchText.js.map +1 -1
- package/dist/tools/updatePlan.d.ts +38 -0
- package/dist/tools/updatePlan.js +81 -0
- package/dist/tools/updatePlan.js.map +1 -0
- package/dist/tools/webFetch.d.ts +8 -0
- package/dist/tools/webFetch.js +103 -0
- package/dist/tools/webFetch.js.map +1 -0
- package/dist/tools/webSearch.d.ts +26 -0
- package/dist/tools/webSearch.js +157 -0
- package/dist/tools/webSearch.js.map +1 -0
- package/dist/tools/writeFile.js +4 -1
- package/dist/tools/writeFile.js.map +1 -1
- package/dist/tui/app.js +22 -1
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.js +7 -1
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { randomBytes, timingSafeEqual } from 'node:crypto';
|
|
2
|
+
/** URL- and shell-safe, so the launch URL can be printed and opened as-is. */
|
|
3
|
+
const TOKEN_PATTERN = /^[A-Za-z0-9_-]{16,256}$/;
|
|
4
|
+
export function newAccessToken() {
|
|
5
|
+
return randomBytes(32).toString('base64url');
|
|
6
|
+
}
|
|
7
|
+
/** Rejects a token from the environment that could not be used safely in the launch URL. */
|
|
8
|
+
export function resolveAccessToken(configured) {
|
|
9
|
+
if (!configured)
|
|
10
|
+
return newAccessToken();
|
|
11
|
+
if (!TOKEN_PATTERN.test(configured)) {
|
|
12
|
+
throw new Error('DVALINCODE_SERVER_TOKEN must be 16–256 characters of A–Z, a–z, 0–9, "-" or "_".');
|
|
13
|
+
}
|
|
14
|
+
return configured;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Browsers share cookies across every port of a host, so a desktop window and a
|
|
18
|
+
* `serve` tab on the same machine would overwrite each other's cookie. The name
|
|
19
|
+
* carries the port to keep them apart.
|
|
20
|
+
*/
|
|
21
|
+
export function accessCookieName(port) {
|
|
22
|
+
return `dvalincode_token_${port}`;
|
|
23
|
+
}
|
|
24
|
+
export function tokenMatches(expected, candidate) {
|
|
25
|
+
if (typeof candidate !== 'string')
|
|
26
|
+
return false;
|
|
27
|
+
const a = Buffer.from(expected);
|
|
28
|
+
const b = Buffer.from(candidate);
|
|
29
|
+
return a.length === b.length && timingSafeEqual(a, b);
|
|
30
|
+
}
|
|
31
|
+
function cookieValue(header, name) {
|
|
32
|
+
for (const part of (header ?? '').split(';')) {
|
|
33
|
+
const eq = part.indexOf('=');
|
|
34
|
+
if (eq !== -1 && part.slice(0, eq).trim() === name)
|
|
35
|
+
return part.slice(eq + 1).trim();
|
|
36
|
+
}
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
/** True when the request carries this server's token, as a Bearer header or the session cookie. */
|
|
40
|
+
export function isAuthorized(req, access) {
|
|
41
|
+
if (!access)
|
|
42
|
+
return false;
|
|
43
|
+
const header = req.headers.authorization;
|
|
44
|
+
const presented = header?.startsWith('Bearer ')
|
|
45
|
+
? header.slice('Bearer '.length).trim()
|
|
46
|
+
: cookieValue(req.headers.cookie, access.cookieName);
|
|
47
|
+
return tokenMatches(access.token, presented);
|
|
48
|
+
}
|
|
49
|
+
/** HttpOnly keeps it from page scripts; SameSite=Strict keeps other sites from sending it. */
|
|
50
|
+
export function accessCookie(access) {
|
|
51
|
+
return `${access.cookieName}=${access.token}; Path=/; HttpOnly; SameSite=Strict`;
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/server/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAmB3D,8EAA8E;AAC9E,MAAM,aAAa,GAAG,yBAAyB,CAAC;AAEhD,MAAM,UAAU,cAAc;IAC5B,OAAO,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC/C,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,kBAAkB,CAAC,UAA8B;IAC/D,IAAI,CAAC,UAAU;QAAE,OAAO,cAAc,EAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,oBAAoB,IAAI,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAgB,EAAE,SAAkB;IAC/D,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAChD,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,WAAW,CAAC,MAA0B,EAAE,IAAY;IAC3D,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7C,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,YAAY,CAAC,GAAoB,EAAE,MAA+B;IAChF,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;IACzC,MAAM,SAAS,GAAG,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC;QAC7C,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE;QACvC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IACvD,OAAO,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC/C,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,YAAY,CAAC,MAAmB;IAC9C,OAAO,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,KAAK,qCAAqC,CAAC;AACnF,CAAC"}
|
|
@@ -37,11 +37,18 @@ export type ProviderPoolConfig = {
|
|
|
37
37
|
export type McpConfig = {
|
|
38
38
|
servers: McpServerConfig[];
|
|
39
39
|
};
|
|
40
|
+
/** API key for the web_search tool, saved from Settings. TAVILY_API_KEY / BRAVE_API_KEY work too. */
|
|
41
|
+
export type WebSearchConfig = {
|
|
42
|
+
provider: 'tavily' | 'brave' | 'searxng';
|
|
43
|
+
apiKey?: string;
|
|
44
|
+
endpoint?: string;
|
|
45
|
+
};
|
|
40
46
|
export type AppConfig = {
|
|
41
47
|
llm: LLMConfig;
|
|
42
48
|
profiles?: Record<string, Profile>;
|
|
43
49
|
pool?: ProviderPoolConfig;
|
|
44
50
|
mcp?: McpConfig;
|
|
51
|
+
webSearch?: WebSearchConfig;
|
|
45
52
|
};
|
|
46
53
|
export declare function readConfig(): Promise<AppConfig>;
|
|
47
54
|
export declare function writeConfig(config: AppConfig): Promise<void>;
|
|
@@ -50,4 +57,7 @@ export declare function maskConfig(config: AppConfig): AppConfig & {
|
|
|
50
57
|
llm: {
|
|
51
58
|
apiKeySet: boolean;
|
|
52
59
|
};
|
|
60
|
+
webSearch?: WebSearchConfig & {
|
|
61
|
+
apiKeySet: boolean;
|
|
62
|
+
};
|
|
53
63
|
};
|
|
@@ -24,6 +24,7 @@ export async function readConfig() {
|
|
|
24
24
|
profiles: parsed.profiles,
|
|
25
25
|
pool: parsed.pool,
|
|
26
26
|
mcp: parsed.mcp,
|
|
27
|
+
webSearch: parsed.webSearch,
|
|
27
28
|
};
|
|
28
29
|
}
|
|
29
30
|
catch {
|
|
@@ -73,6 +74,14 @@ export function maskConfig(config) {
|
|
|
73
74
|
profiles: maskedProfiles,
|
|
74
75
|
pool: maskedPool,
|
|
75
76
|
mcp: maskedMcp,
|
|
77
|
+
webSearch: config.webSearch
|
|
78
|
+
? {
|
|
79
|
+
provider: config.webSearch.provider,
|
|
80
|
+
endpoint: config.webSearch.endpoint,
|
|
81
|
+
apiKey: config.webSearch.apiKey ? '••••••••' : undefined,
|
|
82
|
+
apiKeySet: !!config.webSearch.apiKey,
|
|
83
|
+
}
|
|
84
|
+
: undefined,
|
|
76
85
|
};
|
|
77
86
|
}
|
|
78
87
|
//# sourceMappingURL=configStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configStore.js","sourceRoot":"","sources":["../../src/server/configStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"configStore.js","sourceRoot":"","sources":["../../src/server/configStore.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -5,13 +5,18 @@
|
|
|
5
5
|
* `open` controls the browser auto-open. When left undefined it falls back to
|
|
6
6
|
* the legacy behavior: open only when running as a compiled binary (not dev)
|
|
7
7
|
* and `DVALINCODE_NO_OPEN` is unset.
|
|
8
|
+
*
|
|
9
|
+
* `token` is the access token (see ./auth.ts); without one, `DVALINCODE_SERVER_TOKEN`
|
|
10
|
+
* or a fresh random token is used. The returned `url` carries it.
|
|
8
11
|
*/
|
|
9
12
|
export declare function startServer(opts?: {
|
|
10
13
|
port?: number;
|
|
11
14
|
host?: string;
|
|
12
15
|
open?: boolean;
|
|
16
|
+
token?: string;
|
|
13
17
|
}): Promise<{
|
|
14
18
|
url: string;
|
|
15
19
|
port: number;
|
|
16
20
|
host: string;
|
|
21
|
+
close: () => Promise<void>;
|
|
17
22
|
}>;
|
package/dist/server/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { executeRollback } from '../commands/checkpoint.js';
|
|
2
|
+
import { loadCheckpoint } from '../core/checkpoint.js';
|
|
1
3
|
import express from 'express';
|
|
2
4
|
import { createServer } from 'node:http';
|
|
3
5
|
import { WebSocketServer } from 'ws';
|
|
@@ -18,7 +20,8 @@ import { remediationRouter } from './routes/remediation.js';
|
|
|
18
20
|
import { skillsRouter } from './routes/skills.js';
|
|
19
21
|
import { getPlaybook, savePlaybook } from './playbookHandler.js';
|
|
20
22
|
import { handleWebSocket } from './wsHandler.js';
|
|
21
|
-
import { isAllowedRequestOrigin } from './security.js';
|
|
23
|
+
import { isAllowedRequestOrigin, resolveAllowedCwd } from './security.js';
|
|
24
|
+
import { accessCookie, accessCookieName, isAuthorized, resolveAccessToken, tokenMatches } from './auth.js';
|
|
22
25
|
const __serverPath = fileURLToPath(import.meta.url);
|
|
23
26
|
const __serverDir = path.dirname(__serverPath);
|
|
24
27
|
// Bun compiled binaries embed source files in virtual paths:
|
|
@@ -45,11 +48,22 @@ const localMutationLimiter = rateLimit({
|
|
|
45
48
|
standardHeaders: 'draft-8',
|
|
46
49
|
legacyHeaders: false,
|
|
47
50
|
});
|
|
51
|
+
// Set by startServer once the port is known; until then every request is refused.
|
|
52
|
+
let access;
|
|
48
53
|
const wss = new WebSocketServer({
|
|
49
54
|
server,
|
|
50
55
|
path: '/ws',
|
|
56
|
+
maxPayload: 12 * 1024 * 1024,
|
|
51
57
|
verifyClient: ({ origin, req }, done) => {
|
|
52
|
-
|
|
58
|
+
if (!isAllowedRequestOrigin(origin, req.headers.host)) {
|
|
59
|
+
done(false, 403, 'Forbidden');
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
if (!isAuthorized(req, access)) {
|
|
63
|
+
done(false, 401, 'Unauthorized');
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
done(true);
|
|
53
67
|
},
|
|
54
68
|
});
|
|
55
69
|
app.use((req, res, next) => {
|
|
@@ -60,9 +74,31 @@ app.use((req, res, next) => {
|
|
|
60
74
|
next();
|
|
61
75
|
});
|
|
62
76
|
app.use(cors());
|
|
77
|
+
app.use(localAppLimiter);
|
|
78
|
+
// The only /api route open without the token: the page asks whether it holds
|
|
79
|
+
// the cookie, and trades the token from its launch URL (or a pasted one) for it.
|
|
80
|
+
app.get('/api/auth/session', (req, res) => {
|
|
81
|
+
res.status(isAuthorized(req, access) ? 204 : 401).end();
|
|
82
|
+
});
|
|
83
|
+
app.post('/api/auth/session', localMutationLimiter, express.json({ limit: '4kb' }), (req, res) => {
|
|
84
|
+
if (!access || !tokenMatches(access.token, req.body?.token)) {
|
|
85
|
+
res.status(401).json({ error: 'Invalid access token' });
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
res.setHeader('Set-Cookie', accessCookie(access));
|
|
89
|
+
res.status(204).end();
|
|
90
|
+
});
|
|
91
|
+
// Checked before the body parser, so a caller without the token cannot make the
|
|
92
|
+
// server parse a 64 MB request.
|
|
93
|
+
app.use('/api', (req, res, next) => {
|
|
94
|
+
if (!isAuthorized(req, access)) {
|
|
95
|
+
res.status(401).json({ error: 'Unauthorized' });
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
next();
|
|
99
|
+
});
|
|
63
100
|
// Larger limit: data import accepts a full local-data bundle (sessions + audit).
|
|
64
101
|
app.use(express.json({ limit: '64mb' }));
|
|
65
|
-
app.use(localAppLimiter);
|
|
66
102
|
app.use('/api/sessions', sessionsRouter);
|
|
67
103
|
app.use('/api/tools', toolsRouter);
|
|
68
104
|
app.use('/api/config', configRouter);
|
|
@@ -70,6 +106,22 @@ app.use('/api/files', filesRouter);
|
|
|
70
106
|
app.use('/api/git', gitRouter);
|
|
71
107
|
app.use('/api/projects', projectsRouter);
|
|
72
108
|
app.use('/api/data', dataRouter);
|
|
109
|
+
app.post('/api/checkpoint/rollback', localMutationLimiter, async (req, res) => {
|
|
110
|
+
const runId = req.body?.runId;
|
|
111
|
+
if (typeof runId !== 'string') {
|
|
112
|
+
res.status(400).json({ error: 'A checkpoint run ID is required' });
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
try {
|
|
116
|
+
const { root } = await loadCheckpoint(runId);
|
|
117
|
+
const cwd = await resolveAllowedCwd(root);
|
|
118
|
+
const output = await executeRollback(runId, cwd);
|
|
119
|
+
res.json({ output });
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
|
|
123
|
+
}
|
|
124
|
+
});
|
|
73
125
|
app.use('/api/remediation', localMutationLimiter, remediationRouter);
|
|
74
126
|
app.use('/api/skills', localMutationLimiter, skillsRouter);
|
|
75
127
|
app.get('/api/playbook', localMutationLimiter, (req, res) => void getPlaybook(req, res));
|
|
@@ -89,20 +141,26 @@ wss.on('connection', (ws) => {
|
|
|
89
141
|
* `open` controls the browser auto-open. When left undefined it falls back to
|
|
90
142
|
* the legacy behavior: open only when running as a compiled binary (not dev)
|
|
91
143
|
* and `DVALINCODE_NO_OPEN` is unset.
|
|
144
|
+
*
|
|
145
|
+
* `token` is the access token (see ./auth.ts); without one, `DVALINCODE_SERVER_TOKEN`
|
|
146
|
+
* or a fresh random token is used. The returned `url` carries it.
|
|
92
147
|
*/
|
|
93
148
|
export function startServer(opts = {}) {
|
|
94
149
|
const port = opts.port ?? parseInt(process.env.PORT ?? '3000', 10);
|
|
95
150
|
const host = opts.host ?? process.env.HOST ?? '127.0.0.1';
|
|
151
|
+
const token = resolveAccessToken(opts.token ?? process.env.DVALINCODE_SERVER_TOKEN);
|
|
96
152
|
return new Promise((resolve) => {
|
|
97
153
|
server.listen(port, host, () => {
|
|
98
154
|
// Resolve the actual bound port — supports an ephemeral port (0), which
|
|
99
155
|
// the desktop GUI uses to avoid colliding with a running `serve`.
|
|
100
156
|
const addr = server.address();
|
|
101
157
|
const actualPort = typeof addr === 'object' && addr ? addr.port : port;
|
|
102
|
-
|
|
158
|
+
access = { token, cookieName: accessCookieName(actualPort) };
|
|
159
|
+
const url = `http://localhost:${actualPort}/?token=${token}`;
|
|
103
160
|
console.log('');
|
|
104
161
|
console.log('DvalinCode is running.');
|
|
105
162
|
console.log(`Open the Web GUI to use the coding assistant: ${url}`);
|
|
163
|
+
console.log('The link carries this server\'s access token — anyone holding it can drive the agent, so keep it private.');
|
|
106
164
|
console.log('Keep this terminal window open while you work.');
|
|
107
165
|
console.log(`Workspace roots: ${process.env.DVALINCODE_WORKSPACE_ROOTS ?? `${process.cwd()} plus ~/.dvalincode/projects`}`);
|
|
108
166
|
console.log('');
|
|
@@ -113,7 +171,17 @@ export function startServer(opts = {}) {
|
|
|
113
171
|
`xdg-open "${url}"`;
|
|
114
172
|
exec(cmd, () => { });
|
|
115
173
|
}
|
|
116
|
-
resolve({
|
|
174
|
+
resolve({
|
|
175
|
+
url,
|
|
176
|
+
port: actualPort,
|
|
177
|
+
host,
|
|
178
|
+
close: () => new Promise((done) => {
|
|
179
|
+
for (const client of wss.clients)
|
|
180
|
+
client.terminate();
|
|
181
|
+
server.closeAllConnections();
|
|
182
|
+
server.close(() => done());
|
|
183
|
+
}),
|
|
184
|
+
});
|
|
117
185
|
});
|
|
118
186
|
});
|
|
119
187
|
}
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { parseWebUrl } from '../../core/webEgress.js';
|
|
1
2
|
import { Router } from 'express';
|
|
2
3
|
import { readConfig, writeConfig, maskConfig } from '../configStore.js';
|
|
3
4
|
import { resetRRCursor } from '../../providers/pool.js';
|
|
@@ -87,6 +88,42 @@ configRouter.get('/', async (_req, res) => {
|
|
|
87
88
|
const config = await readConfig();
|
|
88
89
|
res.json(maskConfig(config));
|
|
89
90
|
});
|
|
91
|
+
// Save or clear the web_search API key. An empty key removes the section; the
|
|
92
|
+
// mask placeholder keeps the stored key, as it does for provider keys.
|
|
93
|
+
configRouter.post('/web-search', async (req, res) => {
|
|
94
|
+
const body = req.body;
|
|
95
|
+
if (body.provider === 'searxng') {
|
|
96
|
+
const endpoint = typeof body.endpoint === 'string' ? body.endpoint.trim() : '';
|
|
97
|
+
if (endpoint) {
|
|
98
|
+
try {
|
|
99
|
+
const url = parseWebUrl(endpoint);
|
|
100
|
+
if (url.search || url.hash)
|
|
101
|
+
throw new Error('Query and fragment are not supported');
|
|
102
|
+
}
|
|
103
|
+
catch {
|
|
104
|
+
res.status(400).json({ error: 'Enter an HTTP(S) SearXNG search endpoint without credentials, query or fragment' });
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
const current = await readConfig();
|
|
109
|
+
await writeConfig({ ...current, webSearch: endpoint ? { provider: 'searxng', endpoint } : undefined });
|
|
110
|
+
res.json({ provider: 'searxng', endpoint, apiKeySet: false });
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
if (body.provider !== 'tavily' && body.provider !== 'brave') {
|
|
114
|
+
res.status(400).json({ error: 'provider must be "tavily", "brave", or "searxng"' });
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
if (typeof body.apiKey !== 'string') {
|
|
118
|
+
res.status(400).json({ error: 'Missing apiKey' });
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
const current = await readConfig();
|
|
122
|
+
const apiKey = persistableApiKey({ apiKey: body.apiKey.trim() }, current.webSearch);
|
|
123
|
+
const updated = { ...current, webSearch: apiKey ? { provider: body.provider, apiKey } : undefined };
|
|
124
|
+
await writeConfig(updated);
|
|
125
|
+
res.json(maskConfig(updated).webSearch ?? { provider: body.provider, apiKeySet: false });
|
|
126
|
+
});
|
|
90
127
|
configRouter.post('/test', async (req, res) => {
|
|
91
128
|
const body = req.body;
|
|
92
129
|
if (!body.llm) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/server/routes/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC;AAErC,SAAS,iBAAiB,CACxB,QAAiD,EACjD,QAA8B;IAE9B,IAAI,QAAQ,CAAC,SAAS,KAAK,KAAK,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACpE,OAAO,QAAQ,EAAE,MAAM,CAAC;IAC1B,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,IAAI,SAAS,CAAC;AACtC,CAAC;AAED,kFAAkF;AAElF,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;IAChD,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IACvC,8BAA8B;IAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAC/B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;QAChD,IAAI;QACJ,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE;KAChE,CAAC,CACH,CAAC;IACF,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACnB,CAAC,CAAC,CAAC;AAEH,YAAY,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACtD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAwB,CAAC;IAC1C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kCAAkC,EAAE,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IACvC,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1G,QAAQ,CAAC,IAAI,CAAC,GAAG;QACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC;QAC/C,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS;QACtC,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS;QAClC,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;KAC/B,CAAC;IACF,MAAM,OAAO,GAAG,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC;IACxC,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC7G,CAAC,CAAC,CAAC;AAEH,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IACvC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,IAAI,aAAa,EAAE,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,MAAM,OAAO,GAAG,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC;IACxC,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,YAAY,CAAC,IAAI,CAAC,uBAAuB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,IAAI,aAAa,EAAE,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG;QACd,GAAG,MAAM;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB;KACF,CAAC;IACF,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;IACxC,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAoC,CAAC;IACtD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACjE,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;IACnC,MAAM,SAAS,GAAc;QAC3B,GAAG,OAAO,CAAC,GAAG;QACd,GAAG,IAAI,CAAC,GAAG;QACX,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;KACjD,CAAC;IAEF,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC,CAAC;QACnE,OAAO;IACT,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAChE,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,6BAA6B,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QACrF,MAAM,QAAQ,GAAG,qBAAqB,CAAC,SAAS,CAAC,QAAQ,EAAE;YACzD,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC;YAChC,OAAO;YACP,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,yEAAyE;YACzE,KAAK,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE;SACzB,CAAC,CAAC;QACH,MAAM,QAAQ,CAAC,IAAI,CAAC;YAClB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;YAC/D,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACf,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAChH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACxC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAoC,CAAC;IACtD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACtD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;IAEnC,MAAM,OAAO,GAAG;QACd,GAAG,OAAO;QACV,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,GAAG,IAAI,CAAC,GAAG;YACX,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;SACjD;KACF,CAAC;IAEF,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,iFAAiF;AAEjF,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;IAC5C,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC;AAEH,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAmC,CAAC;IACrD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACvD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;IACnC,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC;IAEpD,qEAAqE;IACrE,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAClD,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC;QACjE,OAAO,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAmB;QAC9B,GAAG,OAAO;QACV,IAAI,EAAE;YACJ,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,aAAa;YACpC,OAAO;SACR;KACF,CAAC;IAEF,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,aAAa,EAAE,CAAC;IAChB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/server/routes/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Router } from 'express';
|
|
2
|
-
import { listSessions, loadSession, deleteSession, deleteAllSessions } from '../../sessions/store.js';
|
|
2
|
+
import { listSessions, loadSession, deleteSession, deleteAllSessions, sessionTitle } from '../../sessions/store.js';
|
|
3
3
|
import { renderSessionMarkdown } from '../../sessions/markdown.js';
|
|
4
4
|
import { readJournal, unresolvedRecoveredTurns } from '../../sessions/journal.js';
|
|
5
5
|
import { allowWorkspaceRoot } from '../security.js';
|
|
@@ -12,6 +12,7 @@ sessionsRouter.get('/', async (_req, res) => {
|
|
|
12
12
|
updatedAt: s.updatedAt,
|
|
13
13
|
cwd: s.cwd,
|
|
14
14
|
goal: s.goal,
|
|
15
|
+
title: sessionTitle(s),
|
|
15
16
|
summary: s.summary,
|
|
16
17
|
messageCount: s.messages.length,
|
|
17
18
|
})));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/server/routes/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/server/routes/sessions.ts"],"names":[],"mappings":"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"}
|
package/dist/server/wsHandler.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { budgetedProvider } from '../providers/runBudget.js';
|
|
1
2
|
import { runAgentTurn, resolveProvider } from "../agent/session.js";
|
|
2
3
|
import { loadSession, saveSession } from "../sessions/store.js";
|
|
3
4
|
import { estimateTokens, summarizeWithLLM, buildCompactedHistory, } from "../agent/compact.js";
|
|
@@ -30,7 +31,7 @@ export function handleWebSocket(ws) {
|
|
|
30
31
|
const resolve = pendingApprovals.get(msg.id);
|
|
31
32
|
if (resolve) {
|
|
32
33
|
pendingApprovals.delete(msg.id);
|
|
33
|
-
resolve(msg.approved);
|
|
34
|
+
resolve(msg.approved === true, msg.choice);
|
|
34
35
|
}
|
|
35
36
|
return;
|
|
36
37
|
}
|
|
@@ -62,7 +63,7 @@ export function handleWebSocket(ws) {
|
|
|
62
63
|
throw new PolicyViolationError("model", modelDecision.rule, model);
|
|
63
64
|
}
|
|
64
65
|
const tokensBefore = estimateTokens(session.messages);
|
|
65
|
-
const summary = await summarizeWithLLM(session.messages, provider, {
|
|
66
|
+
const summary = await summarizeWithLLM(session.messages, budgetedProvider(provider, loadedPolicy.policy), {
|
|
66
67
|
policy: loadedPolicy.policy,
|
|
67
68
|
model,
|
|
68
69
|
});
|
|
@@ -140,25 +141,32 @@ export function handleWebSocket(ws) {
|
|
|
140
141
|
};
|
|
141
142
|
// Approval round-trip: park the resolver until the browser replies, and
|
|
142
143
|
// auto-reject if the turn is interrupted.
|
|
143
|
-
const
|
|
144
|
-
return new Promise(
|
|
144
|
+
const requestResponse = (id, toolName, input) => {
|
|
145
|
+
return new Promise(resolve => {
|
|
145
146
|
if (abort.signal.aborted) {
|
|
146
|
-
resolve(false);
|
|
147
|
+
resolve({ approved: false });
|
|
147
148
|
return;
|
|
148
149
|
}
|
|
149
|
-
|
|
150
|
+
const finish = (approved, choice) => {
|
|
151
|
+
pendingApprovals.delete(id);
|
|
152
|
+
abort.signal.removeEventListener("abort", cancel);
|
|
153
|
+
resolve({ approved, choice });
|
|
154
|
+
};
|
|
155
|
+
const cancel = () => finish(false);
|
|
156
|
+
pendingApprovals.set(id, finish);
|
|
157
|
+
abort.signal.addEventListener("abort", cancel, { once: true });
|
|
150
158
|
send(ws, { type: "approval_request", id, toolName, input });
|
|
151
|
-
abort.signal.addEventListener("abort", () => {
|
|
152
|
-
if (pendingApprovals.has(id)) {
|
|
153
|
-
pendingApprovals.delete(id);
|
|
154
|
-
resolve(false);
|
|
155
|
-
}
|
|
156
|
-
}, { once: true });
|
|
157
159
|
});
|
|
158
160
|
};
|
|
161
|
+
const requestApproval = async (id, toolName, input) => (await requestResponse(id, toolName, input)).approved;
|
|
162
|
+
const askUser = async (id, input) => {
|
|
163
|
+
const response = await requestResponse(id, "ask_user", input);
|
|
164
|
+
return response.approved ? response.choice : undefined;
|
|
165
|
+
};
|
|
159
166
|
try {
|
|
160
167
|
const turn = await runAgentTurn({
|
|
161
168
|
content: msg.content,
|
|
169
|
+
images: msg.images,
|
|
162
170
|
sessionId: msg.sessionId,
|
|
163
171
|
messageId: msg.messageId,
|
|
164
172
|
cwd,
|
|
@@ -172,6 +180,7 @@ export function handleWebSocket(ws) {
|
|
|
172
180
|
onProviderSelected: (providerId) => send(ws, { type: "provider_selected", providerId }),
|
|
173
181
|
onEvent,
|
|
174
182
|
requestApproval,
|
|
183
|
+
askUser,
|
|
175
184
|
});
|
|
176
185
|
if (abort.signal.aborted)
|
|
177
186
|
return;
|
|
@@ -188,6 +197,7 @@ export function handleWebSocket(ws) {
|
|
|
188
197
|
type: "run_report",
|
|
189
198
|
runId: turn.result.runId,
|
|
190
199
|
markdown: turn.reportMarkdown,
|
|
200
|
+
...(turn.result.checkpoint ? { checkpoint: turn.result.checkpoint } : {}),
|
|
191
201
|
});
|
|
192
202
|
}
|
|
193
203
|
send(ws, {
|
|
@@ -196,6 +206,7 @@ export function handleWebSocket(ws) {
|
|
|
196
206
|
iterations: turn.result.iterationsUsed,
|
|
197
207
|
usage: turn.result.usage,
|
|
198
208
|
replayed: turn.replayed || undefined,
|
|
209
|
+
stopReason: turn.result.stopReason,
|
|
199
210
|
});
|
|
200
211
|
}
|
|
201
212
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsHandler.js","sourceRoot":"","sources":["../../src/server/wsHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wsHandler.js","sourceRoot":"","sources":["../../src/server/wsHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TurnStopReason } from '../agent/types.js';
|
|
1
2
|
/**
|
|
2
3
|
* Durable session journal — an append-only JSONL record of every turn's intent
|
|
3
4
|
* and outcome, one file per session (see docs/DURABLE-SESSION.md). It mirrors the
|
|
@@ -25,6 +26,7 @@ export type JournalTurnEnd = {
|
|
|
25
26
|
/** Audit chain head hash after run_end — the checkpoint anchor. */
|
|
26
27
|
auditHead?: string;
|
|
27
28
|
iterations?: number;
|
|
29
|
+
stopReason?: TurnStopReason;
|
|
28
30
|
};
|
|
29
31
|
export type JournalTurnInterrupted = {
|
|
30
32
|
type: 'turn_interrupted';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/sessions/journal.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/sessions/journal.ts"],"names":[],"mappings":"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"}
|
package/dist/sessions/store.d.ts
CHANGED
|
@@ -19,6 +19,12 @@ export declare function loadSession(id: string): Promise<Session | null>;
|
|
|
19
19
|
export declare function listSessions(): Promise<Session[]>;
|
|
20
20
|
export declare function deleteSession(id: string): Promise<void>;
|
|
21
21
|
export declare function deleteAllSessions(): Promise<number>;
|
|
22
|
+
/**
|
|
23
|
+
* What the session is about, for the session list: the first line of the first
|
|
24
|
+
* thing the user asked. The summary describes only the latest turn, which after
|
|
25
|
+
* a long agent run is an assistant reply such as "## Security Scan Results".
|
|
26
|
+
*/
|
|
27
|
+
export declare function sessionTitle(session: Session): string | undefined;
|
|
22
28
|
/**
|
|
23
29
|
* Generate a short summary of the session's latest turn for cross-session memory.
|
|
24
30
|
* Uses the last assistant response and user message.
|