@markusylisiurunen/tau 0.2.129 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +111 -59
- package/dist/core/async/cli.js +12 -2
- package/dist/core/async/cli.js.map +1 -1
- package/dist/core/async/http_protocol.js +7 -1
- package/dist/core/async/http_protocol.js.map +1 -1
- package/dist/core/async/http_server.js +9 -1
- package/dist/core/async/http_server.js.map +1 -1
- package/dist/core/async/index.js.map +1 -1
- package/dist/core/async/session_manager.js +94 -51
- package/dist/core/async/session_manager.js.map +1 -1
- package/dist/core/cli.js +12 -15
- package/dist/core/cli.js.map +1 -1
- package/dist/core/commands/registry.js +9 -55
- package/dist/core/commands/registry.js.map +1 -1
- package/dist/core/config/index.js.map +1 -1
- package/dist/core/config/runtime.js +0 -1
- package/dist/core/config/runtime.js.map +1 -1
- package/dist/core/config/schema.js +102 -17
- package/dist/core/config/schema.js.map +1 -1
- package/dist/core/debug.js +1 -20
- package/dist/core/debug.js.map +1 -1
- package/dist/core/diff_review/{session.js → bridge.js} +57 -114
- package/dist/core/diff_review/bridge.js.map +1 -0
- package/dist/core/diff_review/index.js +2 -3
- package/dist/core/diff_review/index.js.map +1 -1
- package/dist/core/diff_review/review_thread.js +48 -23
- package/dist/core/diff_review/review_thread.js.map +1 -1
- package/dist/core/diff_review/snapshot.js +40 -11
- package/dist/core/diff_review/snapshot.js.map +1 -1
- package/dist/core/events/parser.js +43 -12
- package/dist/core/events/parser.js.map +1 -1
- package/dist/core/index.js +0 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/modes/index.js +1 -2
- package/dist/core/modes/index.js.map +1 -1
- package/dist/core/modes/rpc_server.js +15 -321
- package/dist/core/modes/rpc_server.js.map +1 -1
- package/dist/core/modes/websocket_server.js +181 -0
- package/dist/core/modes/websocket_server.js.map +1 -0
- package/dist/core/personas.js +11 -1
- package/dist/core/personas.js.map +1 -1
- package/dist/core/runtime/chat_runtime.js +19 -12
- package/dist/core/runtime/chat_runtime.js.map +1 -1
- package/dist/core/runtime/conversation_turn_runtime.js +16 -1
- package/dist/core/runtime/conversation_turn_runtime.js.map +1 -1
- package/dist/core/runtime/runtime_bootstrap.js +326 -0
- package/dist/core/runtime/runtime_bootstrap.js.map +1 -1
- package/dist/core/session/compaction.js +13 -11
- package/dist/core/session/compaction.js.map +1 -1
- package/dist/core/session/core_session.js +9 -0
- package/dist/core/session/core_session.js.map +1 -1
- package/dist/core/session/direct_bash.js +34 -0
- package/dist/core/session/direct_bash.js.map +1 -0
- package/dist/core/session/pruning.js +595 -0
- package/dist/core/session/pruning.js.map +1 -0
- package/dist/core/session/runner.js +45 -5
- package/dist/core/session/runner.js.map +1 -1
- package/dist/core/session/session_engine.js +84 -10
- package/dist/core/session/session_engine.js.map +1 -1
- package/dist/core/static/prompts/diff-review-wrapper.md +1 -1
- package/dist/core/subagents/subagent_engine.js +1 -1
- package/dist/core/subagents/subagent_engine.js.map +1 -1
- package/dist/core/tools/catalog.js.map +1 -1
- package/dist/core/tools/diff_review.js +12 -12
- package/dist/core/tools/diff_review.js.map +1 -1
- package/dist/core/tools/execution_backend.js +9 -2
- package/dist/core/tools/execution_backend.js.map +1 -1
- package/dist/core/tools/registry.js.map +1 -1
- package/dist/core/usage/logs.js.map +1 -1
- package/dist/core/utils/context.js +1 -1
- package/dist/core/utils/context.js.map +1 -1
- package/dist/core/utils/context_builder.js +1 -18
- package/dist/core/utils/context_builder.js.map +1 -1
- package/dist/core/utils/gemini_speech.js +1 -1
- package/dist/core/utils/gemini_speech.js.map +1 -1
- package/dist/core/utils/project_files.js +11 -16
- package/dist/core/utils/project_files.js.map +1 -1
- package/dist/core/utils/spawn_capture.js +2 -2
- package/dist/core/utils/spawn_capture.js.map +1 -1
- package/dist/core/version.js +1 -1
- package/dist/core/version.js.map +1 -1
- package/dist/execution/cloudflare_sandbox_execution_environment.js +400 -0
- package/dist/execution/cloudflare_sandbox_execution_environment.js.map +1 -0
- package/dist/execution/execution_environment.js +24 -0
- package/dist/execution/execution_environment.js.map +1 -0
- package/dist/execution/fly_sprite_execution_environment.js +559 -0
- package/dist/execution/fly_sprite_execution_environment.js.map +1 -0
- package/dist/execution/local_execution_environment.js +93 -0
- package/dist/execution/local_execution_environment.js.map +1 -0
- package/dist/execution/runtime_config_snapshot.js +209 -0
- package/dist/execution/runtime_config_snapshot.js.map +1 -0
- package/dist/execution/sandbox_tool_helpers.js +55 -0
- package/dist/execution/sandbox_tool_helpers.js.map +1 -0
- package/dist/execution/tool_backend_execution_environment.js +55 -0
- package/dist/execution/tool_backend_execution_environment.js.map +1 -0
- package/dist/host/hosted_ephemeral_agent_session.js +286 -0
- package/dist/host/hosted_ephemeral_agent_session.js.map +1 -0
- package/dist/host/index.js +3 -0
- package/dist/host/index.js.map +1 -0
- package/dist/host/local_session_host.js +1464 -0
- package/dist/host/local_session_host.js.map +1 -0
- package/dist/host/session_host.js +2 -0
- package/dist/host/session_host.js.map +1 -0
- package/dist/host/session_protocol_handler.js +873 -0
- package/dist/host/session_protocol_handler.js.map +1 -0
- package/dist/main.js +537 -77
- package/dist/main.js.map +1 -1
- package/dist/protocol/index.d.ts +2 -0
- package/dist/protocol/index.js +2 -0
- package/dist/protocol/index.js.map +1 -0
- package/dist/protocol/session_protocol.d.ts +691 -0
- package/dist/protocol/session_protocol.js +2117 -0
- package/dist/protocol/session_protocol.js.map +1 -0
- package/dist/sdk/client.d.ts +2 -1
- package/dist/sdk/client.js +136 -392
- package/dist/sdk/client.js.map +1 -1
- package/dist/sdk/index.d.ts +7 -4
- package/dist/sdk/index.js +4 -2
- package/dist/sdk/index.js.map +1 -1
- package/dist/sdk/session.d.ts +5 -0
- package/dist/sdk/session.js +406 -0
- package/dist/sdk/session.js.map +1 -0
- package/dist/sdk/types.d.ts +97 -78
- package/dist/store/file_session_store.js +157 -0
- package/dist/store/file_session_store.js.map +1 -0
- package/dist/store/memory_session_store.js +24 -0
- package/dist/store/memory_session_store.js.map +1 -0
- package/dist/store/session_store.js +32 -0
- package/dist/store/session_store.js.map +1 -0
- package/dist/transport/errors.d.ts +29 -0
- package/dist/{sdk → transport}/errors.js +5 -5
- package/dist/transport/errors.js.map +1 -0
- package/dist/transport/in_process_session_transport.js +102 -0
- package/dist/transport/in_process_session_transport.js.map +1 -0
- package/dist/transport/index.d.ts +7 -0
- package/dist/transport/index.js +4 -0
- package/dist/transport/index.js.map +1 -0
- package/dist/transport/pending_session_protocol_requests.js +67 -0
- package/dist/transport/pending_session_protocol_requests.js.map +1 -0
- package/dist/transport/session_protocol_transport_helpers.js +98 -0
- package/dist/transport/session_protocol_transport_helpers.js.map +1 -0
- package/dist/transport/session_transport.d.ts +11 -0
- package/dist/transport/session_transport.js +2 -0
- package/dist/transport/session_transport.js.map +1 -0
- package/dist/transport/stdio_session_transport.d.ts +38 -0
- package/dist/transport/stdio_session_transport.js +243 -0
- package/dist/transport/stdio_session_transport.js.map +1 -0
- package/dist/transport/websocket_session_transport.d.ts +52 -0
- package/dist/transport/websocket_session_transport.js +235 -0
- package/dist/transport/websocket_session_transport.js.map +1 -0
- package/dist/tui/chat_controller/assistant_clipboard.js +39 -0
- package/dist/tui/chat_controller/assistant_clipboard.js.map +1 -0
- package/dist/tui/chat_controller/command_hints.js +43 -0
- package/dist/tui/chat_controller/command_hints.js.map +1 -0
- package/dist/tui/chat_controller/diff_review_service.js +9 -9
- package/dist/tui/chat_controller/diff_review_service.js.map +1 -1
- package/dist/tui/chat_controller/diff_review_user_message.js +17 -0
- package/dist/tui/chat_controller/diff_review_user_message.js.map +1 -0
- package/dist/tui/chat_controller/history_labels.js +8 -0
- package/dist/tui/chat_controller/history_labels.js.map +1 -0
- package/dist/tui/chat_controller/history_message_model.js +36 -0
- package/dist/tui/chat_controller/history_message_model.js.map +1 -0
- package/dist/tui/chat_controller/status_format.js +22 -0
- package/dist/tui/chat_controller/status_format.js.map +1 -0
- package/dist/tui/chat_view.js +0 -1
- package/dist/tui/chat_view.js.map +1 -1
- package/dist/tui/index.js +1 -1
- package/dist/tui/index.js.map +1 -1
- package/dist/tui/listen_capture.js +87 -0
- package/dist/tui/listen_capture.js.map +1 -0
- package/dist/tui/memory_mode.js +23 -0
- package/dist/tui/memory_mode.js.map +1 -0
- package/dist/tui/session_chat_app.js +227 -0
- package/dist/tui/session_chat_app.js.map +1 -0
- package/dist/tui/session_chat_controller.js +2176 -0
- package/dist/tui/session_chat_controller.js.map +1 -0
- package/dist/tui/session_tool_execution_backend.js +170 -0
- package/dist/tui/session_tool_execution_backend.js.map +1 -0
- package/dist/tui/speech_playback.js +107 -0
- package/dist/tui/speech_playback.js.map +1 -0
- package/dist/tui/ui/assistant_message.js +27 -21
- package/dist/tui/ui/assistant_message.js.map +1 -1
- package/dist/tui/ui/chat_container.js +4 -0
- package/dist/tui/ui/chat_container.js.map +1 -1
- package/dist/tui/ui/custom_editor.js +0 -5
- package/dist/tui/ui/custom_editor.js.map +1 -1
- package/dist/tui/ui/slash_autocomplete.js +14 -36
- package/dist/tui/ui/slash_autocomplete.js.map +1 -1
- package/dist/tui/ui/tool_ui_registry.js +21 -0
- package/dist/tui/ui/tool_ui_registry.js.map +1 -1
- package/package.json +6 -3
- package/dist/core/config/bash_commands.js +0 -44
- package/dist/core/config/bash_commands.js.map +0 -1
- package/dist/core/diff_review/session.js.map +0 -1
- package/dist/core/modes/rpc_adapter.js +0 -17
- package/dist/core/modes/rpc_adapter.js.map +0 -1
- package/dist/core/modes/rpc_protocol.js +0 -500
- package/dist/core/modes/rpc_protocol.js.map +0 -1
- package/dist/core/session/checkpoint.js +0 -34
- package/dist/core/session/checkpoint.js.map +0 -1
- package/dist/sdk/errors.d.ts +0 -33
- package/dist/sdk/errors.js.map +0 -1
- package/dist/tui/app.js +0 -64
- package/dist/tui/app.js.map +0 -1
- package/dist/tui/chat_controller/session_maintenance_service.js +0 -634
- package/dist/tui/chat_controller/session_maintenance_service.js.map +0 -1
- package/dist/tui/chat_controller.js +0 -2579
- package/dist/tui/chat_controller.js.map +0 -1
|
@@ -6,8 +6,6 @@ import { join } from "node:path";
|
|
|
6
6
|
import { createInterface } from "node:readline";
|
|
7
7
|
import { createDefaultCoreDeps } from "../runtime/deps.js";
|
|
8
8
|
import { createDiffReviewErrorResponse, createDiffReviewSuccessResponse, DIFF_REVIEW_CLIENT_METHODS, DIFF_REVIEW_ERROR_CODES, DIFF_REVIEW_PROTOCOL_VERSION, parseDiffReviewMessageLine, serializeDiffReviewMessage, } from "./protocol.js";
|
|
9
|
-
import { DiffReviewThread, } from "./review_thread.js";
|
|
10
|
-
import { captureDiffReviewSnapshot, } from "./snapshot.js";
|
|
11
9
|
class DiffReviewRequestError extends Error {
|
|
12
10
|
code;
|
|
13
11
|
constructor(code, message) {
|
|
@@ -18,18 +16,34 @@ class DiffReviewRequestError extends Error {
|
|
|
18
16
|
}
|
|
19
17
|
const DIFF_REVIEW_INITIALIZE_TIMEOUT_MS = 10_000;
|
|
20
18
|
const DIFF_REVIEW_CLOSE_TIMEOUT_MS = 1_000;
|
|
21
|
-
|
|
19
|
+
async function launchDiffToolProcess(options) {
|
|
20
|
+
await new Promise((resolve, reject) => {
|
|
21
|
+
const child = spawn(options.diffTool.command, options.diffTool.args ?? [], {
|
|
22
|
+
cwd: options.cwd,
|
|
23
|
+
env: options.env,
|
|
24
|
+
stdio: "ignore",
|
|
25
|
+
detached: true,
|
|
26
|
+
});
|
|
27
|
+
const onError = (error) => reject(error);
|
|
28
|
+
child.once("error", onError);
|
|
29
|
+
child.once("spawn", () => {
|
|
30
|
+
child.off("error", onError);
|
|
31
|
+
child.unref();
|
|
32
|
+
resolve();
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
export class DiffReviewBridge {
|
|
22
37
|
sessionId;
|
|
23
38
|
snapshot;
|
|
24
|
-
|
|
25
|
-
|
|
39
|
+
contextWindow;
|
|
40
|
+
submitThreadMessage;
|
|
26
41
|
deps;
|
|
27
|
-
|
|
28
|
-
|
|
42
|
+
toolLaunchCwd;
|
|
43
|
+
toolLauncher;
|
|
29
44
|
socketPath;
|
|
30
45
|
authToken;
|
|
31
46
|
server;
|
|
32
|
-
threads = new Map();
|
|
33
47
|
reviewAgentRecords = new Map();
|
|
34
48
|
connections = new Set();
|
|
35
49
|
uiStateListeners = new Set();
|
|
@@ -43,28 +57,15 @@ export class DiffReviewSession {
|
|
|
43
57
|
completedResult;
|
|
44
58
|
closed = false;
|
|
45
59
|
constructor(options) {
|
|
46
|
-
this.sessionId = `
|
|
60
|
+
this.sessionId = `diff-review-${randomUUID()}`;
|
|
47
61
|
this.snapshot = options.snapshot;
|
|
48
|
-
this.
|
|
49
|
-
this.
|
|
62
|
+
this.contextWindow = options.contextWindow;
|
|
63
|
+
this.submitThreadMessage = options.submitThreadMessage;
|
|
50
64
|
this.deps = options.deps ?? createDefaultCoreDeps();
|
|
51
|
-
this.
|
|
65
|
+
this.toolLaunchCwd = options.toolLaunchCwd;
|
|
66
|
+
this.toolLauncher = options.toolLauncher ?? launchDiffToolProcess;
|
|
52
67
|
this.socketPath = join("/tmp", `tau-diff-${randomBytes(8).toString("hex")}.sock`);
|
|
53
68
|
this.authToken = randomBytes(24).toString("hex");
|
|
54
|
-
this.createThreadSession =
|
|
55
|
-
options.createThread ??
|
|
56
|
-
((threadOptions) => new DiffReviewThread({
|
|
57
|
-
threadId: threadOptions.threadId,
|
|
58
|
-
snapshot: this.snapshot,
|
|
59
|
-
persona: this.persona,
|
|
60
|
-
config: this.config,
|
|
61
|
-
discoveredSkills: options.discoveredSkills,
|
|
62
|
-
includeAgentContext: options.includeAgentContext,
|
|
63
|
-
deps: this.deps,
|
|
64
|
-
toolExecutionBackend: this.toolExecutionBackend,
|
|
65
|
-
onUpdate: threadOptions.onUpdate,
|
|
66
|
-
forkFrom: threadOptions.forkFrom,
|
|
67
|
-
}));
|
|
68
69
|
this.completionPromise = new Promise((resolve) => {
|
|
69
70
|
this.completionResolver = resolve;
|
|
70
71
|
});
|
|
@@ -130,20 +131,10 @@ export class DiffReviewSession {
|
|
|
130
131
|
...(diffTool.env ?? {}),
|
|
131
132
|
...this.launchEnvironment,
|
|
132
133
|
};
|
|
133
|
-
await
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
stdio: "ignore",
|
|
138
|
-
detached: true,
|
|
139
|
-
});
|
|
140
|
-
const onError = (error) => reject(error);
|
|
141
|
-
child.once("error", onError);
|
|
142
|
-
child.once("spawn", () => {
|
|
143
|
-
child.off("error", onError);
|
|
144
|
-
child.unref();
|
|
145
|
-
resolve();
|
|
146
|
-
});
|
|
134
|
+
await this.toolLauncher({
|
|
135
|
+
diffTool,
|
|
136
|
+
cwd: this.toolLaunchCwd ?? this.snapshot.cwd,
|
|
137
|
+
env,
|
|
147
138
|
});
|
|
148
139
|
}
|
|
149
140
|
async cancel(reason = "controller_cancelled") {
|
|
@@ -157,7 +148,6 @@ export class DiffReviewSession {
|
|
|
157
148
|
return;
|
|
158
149
|
}
|
|
159
150
|
this.closed = true;
|
|
160
|
-
this.disposeReviewAgents();
|
|
161
151
|
await this.closeServer();
|
|
162
152
|
}
|
|
163
153
|
handleConnection(socket) {
|
|
@@ -315,13 +305,17 @@ export class DiffReviewSession {
|
|
|
315
305
|
let acquired;
|
|
316
306
|
try {
|
|
317
307
|
acquired = this.acquireThreadForSubmit(request.params);
|
|
318
|
-
const
|
|
308
|
+
const result = await this.submitThreadMessage({
|
|
309
|
+
threadId: acquired.threadId,
|
|
310
|
+
...(acquired.forkFromThreadId ? { forkFromThreadId: acquired.forkFromThreadId } : {}),
|
|
311
|
+
message: request.params.message,
|
|
312
|
+
});
|
|
319
313
|
if (this.completedResult || connection.socket.destroyed) {
|
|
320
314
|
return;
|
|
321
315
|
}
|
|
322
316
|
await this.respond(connection, request.id, request.method, {
|
|
323
|
-
threadId:
|
|
324
|
-
response,
|
|
317
|
+
threadId: result.threadId,
|
|
318
|
+
response: result.response,
|
|
325
319
|
});
|
|
326
320
|
}
|
|
327
321
|
catch (error) {
|
|
@@ -342,31 +336,25 @@ export class DiffReviewSession {
|
|
|
342
336
|
}
|
|
343
337
|
acquireThreadForSubmit(params) {
|
|
344
338
|
if (params.threadId) {
|
|
345
|
-
|
|
346
|
-
if (!existing) {
|
|
339
|
+
if (!this.reviewAgentRecords.has(params.threadId)) {
|
|
347
340
|
throw new DiffReviewRequestError("invalidParams", `unknown thread '${params.threadId}'`);
|
|
348
341
|
}
|
|
349
342
|
this.markReviewAgentRunning(params.threadId);
|
|
350
|
-
return { threadId: params.threadId
|
|
343
|
+
return { threadId: params.threadId };
|
|
351
344
|
}
|
|
352
345
|
const threadId = randomUUID();
|
|
353
|
-
|
|
354
|
-
? this.threads.get(params.forkFromThreadId)
|
|
355
|
-
: undefined;
|
|
356
|
-
if (params.forkFromThreadId && !forkSource) {
|
|
346
|
+
if (params.forkFromThreadId && !this.reviewAgentRecords.has(params.forkFromThreadId)) {
|
|
357
347
|
throw new DiffReviewRequestError("invalidParams", `unknown fork source thread '${params.forkFromThreadId}'`);
|
|
358
348
|
}
|
|
359
349
|
if (params.forkFromThreadId && this.hasActiveReviewAgentRequest(params.forkFromThreadId)) {
|
|
360
350
|
throw new DiffReviewRequestError("invalidRequest", `thread '${params.forkFromThreadId}' already has an active request and cannot be used as a fork source`);
|
|
361
351
|
}
|
|
362
|
-
|
|
363
|
-
threadId,
|
|
364
|
-
...(forkSource ? { forkFrom: forkSource.createForkSource() } : {}),
|
|
365
|
-
onUpdate: (update) => this.applyReviewAgentUpdate(threadId, update),
|
|
366
|
-
});
|
|
367
|
-
this.threads.set(threadId, created);
|
|
352
|
+
this.ensureReviewAgentRecord(threadId);
|
|
368
353
|
this.markReviewAgentRunning(threadId);
|
|
369
|
-
return {
|
|
354
|
+
return {
|
|
355
|
+
threadId,
|
|
356
|
+
...(params.forkFromThreadId ? { forkFromThreadId: params.forkFromThreadId } : {}),
|
|
357
|
+
};
|
|
370
358
|
}
|
|
371
359
|
updateDiffToolUiText(text) {
|
|
372
360
|
const nextText = text.trim() || undefined;
|
|
@@ -389,7 +377,7 @@ export class DiffReviewSession {
|
|
|
389
377
|
status: "idle",
|
|
390
378
|
activeRequestCount: 0,
|
|
391
379
|
costTotal: 0,
|
|
392
|
-
usage: createEmptyReviewAgentUsage(this.
|
|
380
|
+
usage: createEmptyReviewAgentUsage(this.contextWindow),
|
|
393
381
|
};
|
|
394
382
|
this.reviewAgentRecords.set(threadId, created);
|
|
395
383
|
return created;
|
|
@@ -415,7 +403,7 @@ export class DiffReviewSession {
|
|
|
415
403
|
this.syncReviewAgents();
|
|
416
404
|
}
|
|
417
405
|
}
|
|
418
|
-
|
|
406
|
+
applyThreadUpdate(threadId, update) {
|
|
419
407
|
const record = this.ensureReviewAgentRecord(threadId);
|
|
420
408
|
let changed = false;
|
|
421
409
|
if (record.costTotal !== update.costTotal) {
|
|
@@ -437,16 +425,6 @@ export class DiffReviewSession {
|
|
|
437
425
|
hasActiveReviewAgentRequest(threadId) {
|
|
438
426
|
return (this.reviewAgentRecords.get(threadId)?.activeRequestCount ?? 0) > 0;
|
|
439
427
|
}
|
|
440
|
-
interruptAllReviewAgents() {
|
|
441
|
-
for (const thread of this.threads.values()) {
|
|
442
|
-
thread.interrupt();
|
|
443
|
-
}
|
|
444
|
-
}
|
|
445
|
-
disposeReviewAgents() {
|
|
446
|
-
for (const thread of this.threads.values()) {
|
|
447
|
-
thread.dispose();
|
|
448
|
-
}
|
|
449
|
-
}
|
|
450
428
|
syncReviewAgents() {
|
|
451
429
|
this.uiState = {
|
|
452
430
|
...this.uiState,
|
|
@@ -491,11 +469,14 @@ export class DiffReviewSession {
|
|
|
491
469
|
}
|
|
492
470
|
this.clearInitializeTimeout();
|
|
493
471
|
this.completedResult = result;
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
472
|
+
try {
|
|
473
|
+
await this.requestToolShutdown();
|
|
474
|
+
await this.close();
|
|
475
|
+
}
|
|
476
|
+
finally {
|
|
477
|
+
this.completionResolver?.(result);
|
|
478
|
+
this.completionResolver = undefined;
|
|
479
|
+
}
|
|
499
480
|
}
|
|
500
481
|
async requestToolShutdown() {
|
|
501
482
|
const connection = this.initializedConnection;
|
|
@@ -691,42 +672,4 @@ function cloneDiffReviewUiState(state) {
|
|
|
691
672
|
})),
|
|
692
673
|
};
|
|
693
674
|
}
|
|
694
|
-
|
|
695
|
-
throwIfDiffReviewStartAborted(options.signal);
|
|
696
|
-
const snapshot = await captureDiffReviewSnapshot({
|
|
697
|
-
cwd: options.cwd,
|
|
698
|
-
source: options.source,
|
|
699
|
-
signal: options.signal,
|
|
700
|
-
deps: options.deps,
|
|
701
|
-
});
|
|
702
|
-
throwIfDiffReviewStartAborted(options.signal);
|
|
703
|
-
const session = new DiffReviewSession({
|
|
704
|
-
snapshot,
|
|
705
|
-
persona: options.persona,
|
|
706
|
-
config: options.config,
|
|
707
|
-
discoveredSkills: options.discoveredSkills,
|
|
708
|
-
includeAgentContext: options.includeAgentContext,
|
|
709
|
-
deps: options.deps,
|
|
710
|
-
toolExecutionBackend: options.toolExecutionBackend,
|
|
711
|
-
});
|
|
712
|
-
await session.start();
|
|
713
|
-
try {
|
|
714
|
-
throwIfDiffReviewStartAborted(options.signal);
|
|
715
|
-
await session.launchTool(options.diffTool);
|
|
716
|
-
}
|
|
717
|
-
catch (error) {
|
|
718
|
-
await session.cancel("launch_failed");
|
|
719
|
-
throw error;
|
|
720
|
-
}
|
|
721
|
-
return {
|
|
722
|
-
session,
|
|
723
|
-
result: session.result,
|
|
724
|
-
};
|
|
725
|
-
}
|
|
726
|
-
function throwIfDiffReviewStartAborted(signal) {
|
|
727
|
-
if (!signal?.aborted) {
|
|
728
|
-
return;
|
|
729
|
-
}
|
|
730
|
-
throw new Error("diff review start aborted");
|
|
731
|
-
}
|
|
732
|
-
//# sourceMappingURL=session.js.map
|
|
675
|
+
//# sourceMappingURL=bridge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../../src/core/diff_review/bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
+
export { DiffReviewBridge } from "./bridge.js";
|
|
1
2
|
export { createDiffReviewError, createDiffReviewErrorResponse, createDiffReviewSuccessResponse, DIFF_REVIEW_CLIENT_METHODS, DIFF_REVIEW_ERROR_CODES, DIFF_REVIEW_METHODS, DIFF_REVIEW_PROTOCOL_VERSION, DIFF_REVIEW_SERVER_METHODS, parseDiffReviewMessageLine, parseDiffReviewRequestLine, serializeDiffReviewMessage, validateDiffReviewParams, } from "./protocol.js";
|
|
2
|
-
export {
|
|
3
|
-
export { DiffReviewSession, startDiffReviewSession } from "./session.js";
|
|
4
|
-
export { captureDiffReviewSnapshot, DiffReviewSnapshot } from "./snapshot.js";
|
|
3
|
+
export { captureDiffReviewSnapshot, DiffReviewSnapshot, diffReviewSnapshotFromData, diffReviewSnapshotToData, } from "./snapshot.js";
|
|
5
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/diff_review/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/diff_review/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAwC/C,OAAO,EACL,qBAAqB,EACrB,6BAA6B,EAC7B,+BAA+B,EAC/B,0BAA0B,EAC1B,uBAAuB,EACvB,mBAAmB,EACnB,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,EAC1B,0BAA0B,EAC1B,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,eAAe,CAAC;AASvB,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAClB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,eAAe,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ConversationTurnRuntime } from "../runtime/conversation_turn_runtime.js";
|
|
2
2
|
import { createDefaultCoreDeps } from "../runtime/deps.js";
|
|
3
3
|
import { resolveRuntimePromptBootstrap } from "../runtime/runtime_bootstrap.js";
|
|
4
|
-
import { composeSessionPrompts } from "../runtime/session_prompt_composer.js";
|
|
4
|
+
import { composeSessionPrompts, } from "../runtime/session_prompt_composer.js";
|
|
5
5
|
import { CoreSession } from "../session/core_session.js";
|
|
6
6
|
import { renderDiffReviewWrapperPrompt } from "../static/index.js";
|
|
7
7
|
import { ToolCatalog } from "../tools/catalog.js";
|
|
@@ -38,24 +38,27 @@ export class DiffReviewThread {
|
|
|
38
38
|
contextWindow: options.persona.model.contextWindow,
|
|
39
39
|
};
|
|
40
40
|
const persona = createDiffReviewPersona(options.persona, options.snapshot);
|
|
41
|
-
const promptBootstrap =
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
41
|
+
const promptBootstrap = options.promptComposition
|
|
42
|
+
? undefined
|
|
43
|
+
: resolveRuntimePromptBootstrap({
|
|
44
|
+
persona,
|
|
45
|
+
discoveredSkills: options.discoveredSkills ?? [],
|
|
46
|
+
cwd: options.snapshot.cwd,
|
|
47
|
+
home: deps.env.home(),
|
|
48
|
+
includeAgentContext: options.includeAgentContext ?? true,
|
|
49
|
+
readFile: deps.fs.readFile,
|
|
50
|
+
});
|
|
51
|
+
const promptComposition = options.promptComposition ??
|
|
52
|
+
composeSessionPrompts({
|
|
53
|
+
persona,
|
|
54
|
+
riskLevel: "read-only",
|
|
55
|
+
cwd: promptBootstrap.promptContext.cwd,
|
|
56
|
+
datetime: new Date(deps.clock.now()).toISOString(),
|
|
57
|
+
platform: deps.env.platform(),
|
|
58
|
+
nodeVersion: deps.env.nodeVersion(),
|
|
59
|
+
skillsBlock: promptBootstrap.promptContext.skillsBlock,
|
|
60
|
+
projectContextBlock: promptBootstrap.promptContext.projectContextBlock,
|
|
61
|
+
});
|
|
59
62
|
const toolRegistry = ToolCatalog.createSubagentRegistry([TOOL_NAME_BASH, TOOL_NAME_VIEW_IMAGE], options.config, backend);
|
|
60
63
|
this.session = new CoreSession({
|
|
61
64
|
persona,
|
|
@@ -65,9 +68,9 @@ export class DiffReviewThread {
|
|
|
65
68
|
toolRegistry,
|
|
66
69
|
config: options.config,
|
|
67
70
|
deps,
|
|
68
|
-
cwd: promptBootstrap
|
|
69
|
-
home: promptBootstrap
|
|
70
|
-
includeAgentContext: promptBootstrap
|
|
71
|
+
cwd: promptBootstrap?.promptContext.cwd ?? options.snapshot.cwd,
|
|
72
|
+
home: promptBootstrap?.promptContext.home ?? deps.env.home(),
|
|
73
|
+
includeAgentContext: promptBootstrap?.promptContext.includeAgentContext ?? options.includeAgentContext ?? true,
|
|
71
74
|
});
|
|
72
75
|
if (options.forkFrom) {
|
|
73
76
|
this.usage = { ...options.forkFrom.usageBaseline };
|
|
@@ -190,6 +193,28 @@ export function buildDiffReviewSystemPrompt(mainPersonaSystemPrompt, snapshot) {
|
|
|
190
193
|
reviewContext: buildReviewContextBlock(snapshot),
|
|
191
194
|
});
|
|
192
195
|
}
|
|
196
|
+
export function buildDiffReviewInstructions(snapshot) {
|
|
197
|
+
return [
|
|
198
|
+
"You are Tau's diff review assistant.",
|
|
199
|
+
"",
|
|
200
|
+
"### Rules",
|
|
201
|
+
"",
|
|
202
|
+
"Keep the following in mind as you work:",
|
|
203
|
+
"",
|
|
204
|
+
"- The user is working in Tau's diff review workflow. Treat the review context below as the user-selected review scope. It may be only part of the current repo changes.",
|
|
205
|
+
"- Keep the review centered on that scope by default. That scoped patch is the default review target, even when it is narrower than the repo's overall changes.",
|
|
206
|
+
"- The review context reflects the initial diff Tau captured when the review session started. The live repo state is authoritative when you inspect code or answer follow-up questions.",
|
|
207
|
+
"- Support the full review workflow within that scope: explain what changed, answer follow-up questions, assess correctness and regression risk, discuss tradeoffs, and point out missing validation when it matters.",
|
|
208
|
+
"- If answering well requires nearby or out-of-scope repo context, inspect it as needed, but use it to support the in-scope review unless the user asks to broaden the review target.",
|
|
209
|
+
"- Never mutate files, install packages, or act like a general coding agent. You are here to help review and explain code, not to implement changes.",
|
|
210
|
+
"- Keep answers concise unless the user asks for more. Prefer dense, direct, prose-style responses with minimal preamble and only use bullets when they genuinely help.",
|
|
211
|
+
"- Be concrete and technically specific. Reference files or code paths when useful. Distinguish confirmed facts from inference, and say when something cannot be verified from the available context.",
|
|
212
|
+
"",
|
|
213
|
+
"### Review context",
|
|
214
|
+
"",
|
|
215
|
+
buildReviewContextBlock(snapshot),
|
|
216
|
+
].join("\n");
|
|
217
|
+
}
|
|
193
218
|
function createDiffReviewPersona(persona, snapshot) {
|
|
194
219
|
return {
|
|
195
220
|
...persona,
|
|
@@ -221,7 +246,7 @@ function buildReviewContextBlock(snapshot) {
|
|
|
221
246
|
"Files in review scope:",
|
|
222
247
|
changedFiles,
|
|
223
248
|
"",
|
|
224
|
-
"This review context is the exact change selection captured when
|
|
249
|
+
"This review context is the exact change selection captured when the review session started. It may be narrower than the full set of current repo changes.",
|
|
225
250
|
"Treat this scoped patch as the default review target.",
|
|
226
251
|
"If answering well requires code outside this scope, inspect it as needed, but use it as supporting context unless the user broadens the review target.",
|
|
227
252
|
"The current repo state is authoritative. Use read-only tools to inspect relevant repo context when needed.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review_thread.js","sourceRoot":"","sources":["../../../src/core/diff_review/review_thread.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,
|
|
1
|
+
{"version":3,"file":"review_thread.js","sourceRoot":"","sources":["../../../src/core/diff_review/review_thread.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { existsSync, readFileSync, statSync } from "node:fs";
|
|
3
2
|
import { resolve } from "node:path";
|
|
4
3
|
import { createDefaultCoreDeps } from "../runtime/deps.js";
|
|
5
4
|
const GIT_TIMEOUT_MS = 30_000;
|
|
@@ -16,7 +15,7 @@ export class DiffReviewSnapshot {
|
|
|
16
15
|
scopeLabel;
|
|
17
16
|
patchByPath;
|
|
18
17
|
constructor(args) {
|
|
19
|
-
this.id = args.id ?? `
|
|
18
|
+
this.id = args.id ?? `diff-${randomUUID()}`;
|
|
20
19
|
this.repoRoot = args.repoRoot;
|
|
21
20
|
this.cwd = args.cwd;
|
|
22
21
|
this.diffArgs = [...args.diffArgs];
|
|
@@ -35,6 +34,37 @@ export class DiffReviewSnapshot {
|
|
|
35
34
|
return this.scopeLabel;
|
|
36
35
|
}
|
|
37
36
|
}
|
|
37
|
+
export function diffReviewSnapshotToData(snapshot) {
|
|
38
|
+
const patchByPath = {};
|
|
39
|
+
for (const file of snapshot.files) {
|
|
40
|
+
const patch = snapshot.getFilePatch(file.path);
|
|
41
|
+
if (patch !== undefined) {
|
|
42
|
+
patchByPath[file.path] = patch;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
id: snapshot.id,
|
|
47
|
+
repoRoot: snapshot.repoRoot,
|
|
48
|
+
cwd: snapshot.cwd,
|
|
49
|
+
diffArgs: [...snapshot.diffArgs],
|
|
50
|
+
patch: snapshot.patch,
|
|
51
|
+
files: snapshot.files.map((file) => ({ ...file })),
|
|
52
|
+
patchByPath,
|
|
53
|
+
scopeLabel: snapshot.toDiffCommand(),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
export function diffReviewSnapshotFromData(data) {
|
|
57
|
+
return new DiffReviewSnapshot({
|
|
58
|
+
id: data.id,
|
|
59
|
+
repoRoot: data.repoRoot,
|
|
60
|
+
cwd: data.cwd,
|
|
61
|
+
diffArgs: data.diffArgs,
|
|
62
|
+
patch: data.patch,
|
|
63
|
+
files: data.files,
|
|
64
|
+
patchByPath: new Map(Object.entries(data.patchByPath)),
|
|
65
|
+
scopeLabel: data.scopeLabel,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
38
68
|
export function formatDiffReviewScope(diffArgs) {
|
|
39
69
|
return diffArgs.length > 0 ? `git diff ${diffArgs.join(" ")}` : WORKING_TREE_SCOPE_LABEL;
|
|
40
70
|
}
|
|
@@ -89,11 +119,7 @@ async function capturePatchFilesSnapshot(cwd, patchFiles, deps, signal) {
|
|
|
89
119
|
for (const patchFile of patchFiles) {
|
|
90
120
|
throwIfSnapshotAborted(signal);
|
|
91
121
|
const patchPath = resolve(cwd, patchFile);
|
|
92
|
-
const
|
|
93
|
-
if (totalBytes + patchBytes > GIT_MAX_CAPTURE_BYTES) {
|
|
94
|
-
throw new Error(`patch files exceeded ${GIT_MAX_CAPTURE_BYTES} bytes while capturing diff review snapshot`);
|
|
95
|
-
}
|
|
96
|
-
const patch = deps.fs.readFile(patchPath);
|
|
122
|
+
const patch = await deps.fs.readFile(patchPath);
|
|
97
123
|
totalBytes += Buffer.byteLength(patch, "utf-8");
|
|
98
124
|
if (totalBytes > GIT_MAX_CAPTURE_BYTES) {
|
|
99
125
|
throw new Error(`patch files exceeded ${GIT_MAX_CAPTURE_BYTES} bytes while capturing diff review snapshot`);
|
|
@@ -168,14 +194,17 @@ async function captureUntrackedFilePatches(repoRoot, deps, signal) {
|
|
|
168
194
|
const patchByPath = new Map();
|
|
169
195
|
for (const path of paths) {
|
|
170
196
|
const filePath = resolve(repoRoot, path);
|
|
171
|
-
|
|
197
|
+
let content;
|
|
198
|
+
try {
|
|
199
|
+
content = await deps.fs.readFile(filePath);
|
|
200
|
+
}
|
|
201
|
+
catch {
|
|
172
202
|
continue;
|
|
173
203
|
}
|
|
174
|
-
|
|
175
|
-
if (content.length > MAX_UNTRACKED_TEXT_BYTES || content.includes(0)) {
|
|
204
|
+
if (Buffer.byteLength(content, "utf-8") > MAX_UNTRACKED_TEXT_BYTES || content.includes("\0")) {
|
|
176
205
|
continue;
|
|
177
206
|
}
|
|
178
|
-
const patch = createUntrackedFilePatch(path, content
|
|
207
|
+
const patch = createUntrackedFilePatch(path, content);
|
|
179
208
|
files.push({
|
|
180
209
|
path,
|
|
181
210
|
status: "added",
|