rivet-design 0.10.0 → 0.10.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/dist/index.d.ts +32 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +249 -3
- package/dist/index.js.map +1 -1
- package/dist/mcp/agent-variants/WorktreeOrchestrator.d.ts +5 -0
- package/dist/mcp/agent-variants/WorktreeOrchestrator.d.ts.map +1 -1
- package/dist/mcp/agent-variants/WorktreeOrchestrator.js +7 -0
- package/dist/mcp/agent-variants/WorktreeOrchestrator.js.map +1 -1
- package/dist/mcp/server.d.ts +19 -0
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +67 -102
- package/dist/mcp/server.js.map +1 -1
- package/dist/proxy-middleware/preview-bridge.d.ts +24 -0
- package/dist/proxy-middleware/preview-bridge.d.ts.map +1 -0
- package/dist/proxy-middleware/preview-bridge.js +358 -0
- package/dist/proxy-middleware/preview-bridge.js.map +1 -0
- package/dist/proxy-middleware/proxy-config.d.ts +5 -1
- package/dist/proxy-middleware/proxy-config.d.ts.map +1 -1
- package/dist/proxy-middleware/proxy-config.js +62 -18
- package/dist/proxy-middleware/proxy-config.js.map +1 -1
- package/dist/routes/mcp.d.ts +3 -1
- package/dist/routes/mcp.d.ts.map +1 -1
- package/dist/routes/mcp.js +33 -3
- package/dist/routes/mcp.js.map +1 -1
- package/dist/routes/static.d.ts +6 -1
- package/dist/routes/static.d.ts.map +1 -1
- package/dist/routes/static.js +15 -3
- package/dist/routes/static.js.map +1 -1
- package/dist/server.d.ts +48 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +228 -33
- package/dist/server.js.map +1 -1
- package/dist/services/AgentSessionService.d.ts +87 -0
- package/dist/services/AgentSessionService.d.ts.map +1 -0
- package/dist/services/AgentSessionService.js +275 -0
- package/dist/services/AgentSessionService.js.map +1 -0
- package/dist/services/ConfigManager.d.ts +7 -0
- package/dist/services/ConfigManager.d.ts.map +1 -1
- package/dist/services/ConfigManager.js +13 -0
- package/dist/services/ConfigManager.js.map +1 -1
- package/dist/services/HostedDemoAuthSessionService.d.ts +6 -0
- package/dist/services/HostedDemoAuthSessionService.d.ts.map +1 -1
- package/dist/services/HostedDemoAuthSessionService.js +13 -0
- package/dist/services/HostedDemoAuthSessionService.js.map +1 -1
- package/dist/services/InlineVariantGenerationService.d.ts +50 -0
- package/dist/services/InlineVariantGenerationService.d.ts.map +1 -0
- package/dist/services/InlineVariantGenerationService.js +394 -0
- package/dist/services/InlineVariantGenerationService.js.map +1 -0
- package/dist/services/SessionBridgeService.d.ts +3 -3
- package/dist/services/SessionBridgeService.d.ts.map +1 -1
- package/dist/services/SessionBridgeService.js +15 -3
- package/dist/services/SessionBridgeService.js.map +1 -1
- package/dist/services/TerminalAgentRunner.d.ts +65 -0
- package/dist/services/TerminalAgentRunner.d.ts.map +1 -0
- package/dist/services/TerminalAgentRunner.js +511 -0
- package/dist/services/TerminalAgentRunner.js.map +1 -0
- package/dist/services/WorktreeManager.d.ts +5 -4
- package/dist/services/WorktreeManager.d.ts.map +1 -1
- package/dist/services/WorktreeManager.js +22 -12
- package/dist/services/WorktreeManager.js.map +1 -1
- package/dist/services/accessTokenRefresh.d.ts +8 -0
- package/dist/services/accessTokenRefresh.d.ts.map +1 -1
- package/dist/services/accessTokenRefresh.js +30 -1
- package/dist/services/accessTokenRefresh.js.map +1 -1
- package/dist/services/createAgentVariantsOrchestrator.d.ts +16 -0
- package/dist/services/createAgentVariantsOrchestrator.d.ts.map +1 -0
- package/dist/services/createAgentVariantsOrchestrator.js +42 -0
- package/dist/services/createAgentVariantsOrchestrator.js.map +1 -0
- package/dist/types/change-request-types.d.ts +12 -0
- package/dist/types/change-request-types.d.ts.map +1 -1
- package/dist/utils/elementFileHintSignals.d.ts +8 -0
- package/dist/utils/elementFileHintSignals.d.ts.map +1 -0
- package/dist/utils/elementFileHintSignals.js +40 -0
- package/dist/utils/elementFileHintSignals.js.map +1 -0
- package/dist/utils/formatElementTargetingContext.d.ts +34 -0
- package/dist/utils/formatElementTargetingContext.d.ts.map +1 -0
- package/dist/utils/formatElementTargetingContext.js +88 -0
- package/dist/utils/formatElementTargetingContext.js.map +1 -0
- package/dist/utils/queueAccess.d.ts +11 -0
- package/dist/utils/queueAccess.d.ts.map +1 -0
- package/dist/utils/queueAccess.js +15 -0
- package/dist/utils/queueAccess.js.map +1 -0
- package/package.json +1 -1
- package/src/ui/dist/assets/main-CJ9ZAQrU.css +1 -0
- package/src/ui/dist/assets/main-D-FdZGgx.js +640 -0
- package/src/ui/dist/index.html +2 -2
- package/src/ui/dist/assets/main-BZEruoyc.css +0 -1
- package/src/ui/dist/assets/main-CIJUZXe8.js +0 -382
|
@@ -0,0 +1,394 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.InlineVariantGenerationService = void 0;
|
|
7
|
+
const crypto_1 = require("crypto");
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const index_core_1 = require("../index-core");
|
|
10
|
+
const changeBatchClassification_1 = require("../mcp/changeBatchClassification");
|
|
11
|
+
const log = (0, index_core_1.createLogger)('InlineVariantGenerationService');
|
|
12
|
+
const INLINE_VARIANT_LEASE_HEARTBEAT_MS = 60_000;
|
|
13
|
+
const INLINE_VARIANT_BRIEF_DIRECTIONS = [
|
|
14
|
+
{
|
|
15
|
+
label: 'Refined Focus',
|
|
16
|
+
body: 'Subtle polish with tighter hierarchy and calmer emphasis.',
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
label: 'Bold Contrast',
|
|
20
|
+
body: 'Stronger contrast with clearer visual weight and presence.',
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
label: 'Airy Layout',
|
|
24
|
+
body: 'More breathing room with lighter spacing and softer rhythm.',
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
label: 'Editorial Polish',
|
|
28
|
+
body: 'Magazine-like composition with crisp details and confident tone.',
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
label: 'Playful Accent',
|
|
32
|
+
body: 'Expressive accents with lively color and approachable energy.',
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
label: 'Calm Minimal',
|
|
36
|
+
body: 'Reduced ornament with quiet structure and restrained styling.',
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
label: 'Dense Utility',
|
|
40
|
+
body: 'Compact information density with practical controls and clarity.',
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
label: 'Sharp Detail',
|
|
44
|
+
body: 'Precise edges with stronger alignment and cleaner finishing.',
|
|
45
|
+
},
|
|
46
|
+
];
|
|
47
|
+
const hasWhitespace = (value) => /\s/.test(value);
|
|
48
|
+
const deriveTarget = (element) => {
|
|
49
|
+
const filePaths = element.filePaths ?? [];
|
|
50
|
+
if (filePaths.length === 1) {
|
|
51
|
+
return { type: 'file', ref: filePaths[0] };
|
|
52
|
+
}
|
|
53
|
+
if (element.rivetId) {
|
|
54
|
+
return {
|
|
55
|
+
type: 'element',
|
|
56
|
+
ref: `[data-rivet-id="${element.rivetId}"]`,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
if (element.id && !hasWhitespace(element.id)) {
|
|
60
|
+
return { type: 'element', ref: `#${element.id}` };
|
|
61
|
+
}
|
|
62
|
+
if (element.xpath) {
|
|
63
|
+
return { type: 'element', ref: element.xpath };
|
|
64
|
+
}
|
|
65
|
+
const classTokens = element.className.trim().split(/\s+/).filter(Boolean);
|
|
66
|
+
if (classTokens.length === 1) {
|
|
67
|
+
return { type: 'element', ref: `.${classTokens[0]}` };
|
|
68
|
+
}
|
|
69
|
+
return { type: 'element', ref: element.tagName.toLowerCase() };
|
|
70
|
+
};
|
|
71
|
+
const getWorktreePath = (workItem) => {
|
|
72
|
+
if (!workItem.input || typeof workItem.input !== 'object') {
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
const worktreePath = workItem.input
|
|
76
|
+
.worktreePath;
|
|
77
|
+
return typeof worktreePath === 'string' && worktreePath.trim()
|
|
78
|
+
? worktreePath
|
|
79
|
+
: null;
|
|
80
|
+
};
|
|
81
|
+
const getBrief = (workItem) => {
|
|
82
|
+
const input = workItem.input && typeof workItem.input === 'object'
|
|
83
|
+
? workItem.input
|
|
84
|
+
: {};
|
|
85
|
+
return {
|
|
86
|
+
label: typeof input.briefLabel === 'string' && input.briefLabel.trim()
|
|
87
|
+
? input.briefLabel
|
|
88
|
+
: 'Variant',
|
|
89
|
+
body: typeof input.briefBody === 'string' && input.briefBody.trim()
|
|
90
|
+
? input.briefBody
|
|
91
|
+
: 'Create a distinct inline variation.',
|
|
92
|
+
};
|
|
93
|
+
};
|
|
94
|
+
const isInsidePath = (rootPath, candidatePath) => {
|
|
95
|
+
const relativePath = path_1.default.relative(rootPath, candidatePath);
|
|
96
|
+
return (relativePath === '' ||
|
|
97
|
+
(!relativePath.startsWith('..') && !path_1.default.isAbsolute(relativePath)));
|
|
98
|
+
};
|
|
99
|
+
const rebaseFilePath = (args) => {
|
|
100
|
+
const trimmedPath = args.filePath.trim();
|
|
101
|
+
if (!trimmedPath) {
|
|
102
|
+
return null;
|
|
103
|
+
}
|
|
104
|
+
if (!path_1.default.isAbsolute(trimmedPath)) {
|
|
105
|
+
const worktreeRelativePath = path_1.default.resolve(args.worktreeProjectPath, trimmedPath);
|
|
106
|
+
return isInsidePath(args.worktreeProjectPath, worktreeRelativePath)
|
|
107
|
+
? worktreeRelativePath
|
|
108
|
+
: null;
|
|
109
|
+
}
|
|
110
|
+
if (isInsidePath(args.worktreePath, trimmedPath)) {
|
|
111
|
+
return trimmedPath;
|
|
112
|
+
}
|
|
113
|
+
if (args.baseProjectPath && isInsidePath(args.baseProjectPath, trimmedPath)) {
|
|
114
|
+
return path_1.default.join(args.worktreeProjectPath, path_1.default.relative(args.baseProjectPath, trimmedPath));
|
|
115
|
+
}
|
|
116
|
+
return null;
|
|
117
|
+
};
|
|
118
|
+
const rebaseFilePaths = (args) => Array.from(new Set(args.filePaths
|
|
119
|
+
.map((filePath) => rebaseFilePath({
|
|
120
|
+
filePath,
|
|
121
|
+
baseProjectPath: args.baseProjectPath,
|
|
122
|
+
worktreePath: args.worktreePath,
|
|
123
|
+
worktreeProjectPath: args.worktreeProjectPath,
|
|
124
|
+
}))
|
|
125
|
+
.filter((filePath) => Boolean(filePath))));
|
|
126
|
+
const rebaseElementFilePaths = (args) => ({
|
|
127
|
+
...args.element,
|
|
128
|
+
filePaths: rebaseFilePaths({
|
|
129
|
+
filePaths: args.element.filePaths,
|
|
130
|
+
baseProjectPath: args.baseProjectPath,
|
|
131
|
+
worktreePath: args.worktreePath,
|
|
132
|
+
worktreeProjectPath: args.worktreeProjectPath,
|
|
133
|
+
}),
|
|
134
|
+
});
|
|
135
|
+
const buildInlineVariantBriefs = (count) => INLINE_VARIANT_BRIEF_DIRECTIONS.slice(0, count).map((brief) => ({
|
|
136
|
+
...brief,
|
|
137
|
+
}));
|
|
138
|
+
const buildVariantChangeRequest = (args) => {
|
|
139
|
+
const brief = getBrief(args.workItem);
|
|
140
|
+
const instruction = [
|
|
141
|
+
`Create inline variant "${brief.label}".`,
|
|
142
|
+
`Variant direction: ${brief.body}`,
|
|
143
|
+
`Original request: ${args.comment.instruction}`,
|
|
144
|
+
'Apply the change only in this variant worktree. Keep the edit scoped to the selected/commented element context.',
|
|
145
|
+
].join('\n');
|
|
146
|
+
return {
|
|
147
|
+
...args.baseRequest,
|
|
148
|
+
worktreePath: args.worktreePath,
|
|
149
|
+
sourceFiles: rebaseFilePaths({
|
|
150
|
+
filePaths: args.baseRequest.sourceFiles,
|
|
151
|
+
baseProjectPath: args.baseProjectPath,
|
|
152
|
+
worktreePath: args.worktreePath,
|
|
153
|
+
worktreeProjectPath: args.worktreeProjectPath,
|
|
154
|
+
}),
|
|
155
|
+
changes: [
|
|
156
|
+
{
|
|
157
|
+
...args.comment,
|
|
158
|
+
element: rebaseElementFilePaths({
|
|
159
|
+
element: args.comment.element,
|
|
160
|
+
baseProjectPath: args.baseProjectPath,
|
|
161
|
+
worktreePath: args.worktreePath,
|
|
162
|
+
worktreeProjectPath: args.worktreeProjectPath,
|
|
163
|
+
}),
|
|
164
|
+
elements: args.comment.elements?.map((element) => rebaseElementFilePaths({
|
|
165
|
+
element,
|
|
166
|
+
baseProjectPath: args.baseProjectPath,
|
|
167
|
+
worktreePath: args.worktreePath,
|
|
168
|
+
worktreeProjectPath: args.worktreeProjectPath,
|
|
169
|
+
})),
|
|
170
|
+
instruction,
|
|
171
|
+
variantRequest: undefined,
|
|
172
|
+
},
|
|
173
|
+
],
|
|
174
|
+
};
|
|
175
|
+
};
|
|
176
|
+
/**
|
|
177
|
+
* Runs selected-element variant requests through the server-owned variants lifecycle.
|
|
178
|
+
*/
|
|
179
|
+
class InlineVariantGenerationService {
|
|
180
|
+
bridge;
|
|
181
|
+
orchestrator;
|
|
182
|
+
runner;
|
|
183
|
+
createSessionId;
|
|
184
|
+
leaseHeartbeatMs;
|
|
185
|
+
constructor(options) {
|
|
186
|
+
this.bridge = options.bridge;
|
|
187
|
+
this.orchestrator = options.orchestrator;
|
|
188
|
+
this.runner = options.runner;
|
|
189
|
+
this.createSessionId = options.createSessionId ?? crypto_1.randomUUID;
|
|
190
|
+
this.leaseHeartbeatMs =
|
|
191
|
+
options.leaseHeartbeatMs ?? INLINE_VARIANT_LEASE_HEARTBEAT_MS;
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
194
|
+
* @effect Starts an inline variants session, runs each leased worktree with an isolated terminal agent, and reports each result.
|
|
195
|
+
*/
|
|
196
|
+
async processVariantRequest(request) {
|
|
197
|
+
if (!(0, changeBatchClassification_1.isSingleVariantRequestBatch)(request)) {
|
|
198
|
+
this.bridge.reportFeedback('Inline variants require one variant comment.');
|
|
199
|
+
this.bridge.setStatus('READY');
|
|
200
|
+
return { success: false, error: 'Invalid inline variant request' };
|
|
201
|
+
}
|
|
202
|
+
const comment = request.changes[0];
|
|
203
|
+
const count = comment.variantRequest?.count;
|
|
204
|
+
if (typeof count !== 'number') {
|
|
205
|
+
this.bridge.reportFeedback('Inline variant request is missing a count.');
|
|
206
|
+
this.bridge.setStatus('READY');
|
|
207
|
+
return { success: false, error: 'Missing variant count' };
|
|
208
|
+
}
|
|
209
|
+
const agentLabel = this.runner.getDisplayName?.() ?? 'Claude Code';
|
|
210
|
+
this.bridge.setStatus('APPLYING');
|
|
211
|
+
this.bridge.reportFeedback(`Starting ${count} inline variants.`);
|
|
212
|
+
try {
|
|
213
|
+
const startResult = await this.orchestrator.startUnified({
|
|
214
|
+
prompt: comment.instruction,
|
|
215
|
+
target: deriveTarget(comment.element),
|
|
216
|
+
projectContext: { kind: 'existing' },
|
|
217
|
+
leaseOwner: `rivet-agent-${agentLabel.toLowerCase().replace(/\s+/g, '-')}`,
|
|
218
|
+
briefs: buildInlineVariantBriefs(count),
|
|
219
|
+
});
|
|
220
|
+
const leasedItems = startResult.leasedWorkItems ?? [];
|
|
221
|
+
this.bridge.reportFeedback(`Creating ${leasedItems.length} worktrees.`);
|
|
222
|
+
if (leasedItems.length === 0) {
|
|
223
|
+
const error = 'No inline variant work items were leased';
|
|
224
|
+
this.bridge.reportFeedback(`${error}.`);
|
|
225
|
+
await this.orchestrator
|
|
226
|
+
.cancel({
|
|
227
|
+
sessionId: startResult.sessionId,
|
|
228
|
+
reason: error,
|
|
229
|
+
})
|
|
230
|
+
.catch((cancelError) => {
|
|
231
|
+
log.warn('Inline variant session cancellation failed', cancelError);
|
|
232
|
+
});
|
|
233
|
+
this.bridge.setStatus('READY');
|
|
234
|
+
return { success: false, error };
|
|
235
|
+
}
|
|
236
|
+
const results = await Promise.all(leasedItems.map((workItem, index) => this.runLeasedVariantSafely({
|
|
237
|
+
request,
|
|
238
|
+
comment,
|
|
239
|
+
workItem,
|
|
240
|
+
leaseId: startResult.leaseId ?? '',
|
|
241
|
+
sessionId: startResult.sessionId,
|
|
242
|
+
index,
|
|
243
|
+
})));
|
|
244
|
+
const isSuccess = results.every((result) => result.success);
|
|
245
|
+
this.bridge.reportFeedback(isSuccess
|
|
246
|
+
? `${agentLabel} finished generating inline variants.`
|
|
247
|
+
: `${agentLabel} finished with one or more variant failures.`);
|
|
248
|
+
this.bridge.reportFeedback('__RIVET_REFRESH_GIT__');
|
|
249
|
+
this.bridge.setStatus('READY');
|
|
250
|
+
return isSuccess
|
|
251
|
+
? { success: true }
|
|
252
|
+
: {
|
|
253
|
+
success: false,
|
|
254
|
+
error: results.find((result) => !result.success)?.error ??
|
|
255
|
+
'Inline variant generation failed',
|
|
256
|
+
};
|
|
257
|
+
}
|
|
258
|
+
catch (error) {
|
|
259
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
260
|
+
log.error('Inline variant generation failed', error);
|
|
261
|
+
this.bridge.reportFeedback(`${agentLabel} failed variants: ${message}`);
|
|
262
|
+
this.bridge.reportFeedback('__RIVET_REFRESH_GIT__');
|
|
263
|
+
this.bridge.setStatus('READY');
|
|
264
|
+
return { success: false, error: message };
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* @effect Converts per-variant setup/reporting failures into failed results after sibling runs settle.
|
|
269
|
+
*/
|
|
270
|
+
async runLeasedVariantSafely(args) {
|
|
271
|
+
try {
|
|
272
|
+
return await this.runLeasedVariant(args);
|
|
273
|
+
}
|
|
274
|
+
catch (error) {
|
|
275
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
276
|
+
const brief = getBrief(args.workItem);
|
|
277
|
+
log.error(`Inline variant ${brief.label} failed`, error);
|
|
278
|
+
this.bridge.reportFeedback(`Variant ${brief.label} failed: ${message}`);
|
|
279
|
+
await this.orchestrator
|
|
280
|
+
.reportComplete({
|
|
281
|
+
sessionId: args.sessionId,
|
|
282
|
+
workItemId: args.workItem.id,
|
|
283
|
+
leaseId: args.leaseId,
|
|
284
|
+
attempt: args.workItem.attempt,
|
|
285
|
+
status: 'failed',
|
|
286
|
+
error: { code: 'VARIANT_RUN_FAILED', message },
|
|
287
|
+
})
|
|
288
|
+
.catch((reportError) => {
|
|
289
|
+
log.warn('Inline variant failure report failed', reportError);
|
|
290
|
+
});
|
|
291
|
+
return { success: false, error: message };
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
/**
|
|
295
|
+
* @effect Runs one leased code-generation item and reports its terminal status to the variants orchestrator.
|
|
296
|
+
*/
|
|
297
|
+
async runLeasedVariant(args) {
|
|
298
|
+
const worktreePath = getWorktreePath(args.workItem);
|
|
299
|
+
const brief = getBrief(args.workItem);
|
|
300
|
+
if (!worktreePath) {
|
|
301
|
+
const error = `Variant ${brief.label} has no worktree path.`;
|
|
302
|
+
await this.orchestrator.reportComplete({
|
|
303
|
+
sessionId: args.sessionId,
|
|
304
|
+
workItemId: args.workItem.id,
|
|
305
|
+
leaseId: args.leaseId,
|
|
306
|
+
attempt: args.workItem.attempt,
|
|
307
|
+
status: 'failed',
|
|
308
|
+
error: { code: 'MISSING_WORKTREE', message: error },
|
|
309
|
+
});
|
|
310
|
+
this.bridge.reportFeedback(error);
|
|
311
|
+
return { success: false, error };
|
|
312
|
+
}
|
|
313
|
+
const agentLabel = this.runner.getDisplayName?.() ?? 'Claude Code';
|
|
314
|
+
const terminalSessionId = this.createSessionId();
|
|
315
|
+
const worktreeProjectPath = await this.orchestrator.getProjectCwdInWorktree(worktreePath);
|
|
316
|
+
this.bridge.reportFeedback(`Running ${agentLabel} for variant ${args.index + 1}: ${brief.label}.`);
|
|
317
|
+
await this.orchestrator.reportComplete({
|
|
318
|
+
sessionId: args.sessionId,
|
|
319
|
+
workItemId: args.workItem.id,
|
|
320
|
+
leaseId: args.leaseId,
|
|
321
|
+
attempt: args.workItem.attempt,
|
|
322
|
+
status: 'running',
|
|
323
|
+
});
|
|
324
|
+
const stopHeartbeat = this.startLeaseHeartbeat({
|
|
325
|
+
sessionId: args.sessionId,
|
|
326
|
+
workItem: args.workItem,
|
|
327
|
+
leaseId: args.leaseId,
|
|
328
|
+
});
|
|
329
|
+
let result;
|
|
330
|
+
try {
|
|
331
|
+
result = await this.runner.runChangeRequest({
|
|
332
|
+
request: buildVariantChangeRequest({
|
|
333
|
+
baseRequest: args.request,
|
|
334
|
+
comment: args.comment,
|
|
335
|
+
workItem: args.workItem,
|
|
336
|
+
worktreePath,
|
|
337
|
+
worktreeProjectPath,
|
|
338
|
+
baseProjectPath: this.bridge.getProjectPath(),
|
|
339
|
+
}),
|
|
340
|
+
cwd: worktreeProjectPath,
|
|
341
|
+
sessionId: terminalSessionId,
|
|
342
|
+
resumeSession: false,
|
|
343
|
+
onFeedback: (message) => this.bridge.reportFeedback(`${brief.label}: ${message}`),
|
|
344
|
+
});
|
|
345
|
+
}
|
|
346
|
+
finally {
|
|
347
|
+
stopHeartbeat();
|
|
348
|
+
}
|
|
349
|
+
if (!result.success) {
|
|
350
|
+
const error = result.error ?? 'unknown error';
|
|
351
|
+
await this.orchestrator.reportComplete({
|
|
352
|
+
sessionId: args.sessionId,
|
|
353
|
+
workItemId: args.workItem.id,
|
|
354
|
+
leaseId: args.leaseId,
|
|
355
|
+
attempt: args.workItem.attempt,
|
|
356
|
+
status: 'failed',
|
|
357
|
+
error: { code: 'AGENT_FAILED', message: error },
|
|
358
|
+
});
|
|
359
|
+
this.bridge.reportFeedback(`${agentLabel} failed variant ${brief.label}: ${error}`);
|
|
360
|
+
return { success: false, error };
|
|
361
|
+
}
|
|
362
|
+
await this.orchestrator.reportComplete({
|
|
363
|
+
sessionId: args.sessionId,
|
|
364
|
+
workItemId: args.workItem.id,
|
|
365
|
+
leaseId: args.leaseId,
|
|
366
|
+
attempt: args.workItem.attempt,
|
|
367
|
+
status: 'succeeded',
|
|
368
|
+
output: { worktreePath, changedFiles: [] },
|
|
369
|
+
});
|
|
370
|
+
this.bridge.reportFeedback(`${agentLabel} completed variant ${brief.label}.`);
|
|
371
|
+
return { success: true };
|
|
372
|
+
}
|
|
373
|
+
/**
|
|
374
|
+
* @effect Periodically reports a running status so long terminal agent runs keep their variant lease.
|
|
375
|
+
*/
|
|
376
|
+
startLeaseHeartbeat(args) {
|
|
377
|
+
const interval = setInterval(() => {
|
|
378
|
+
void this.orchestrator
|
|
379
|
+
.reportComplete({
|
|
380
|
+
sessionId: args.sessionId,
|
|
381
|
+
workItemId: args.workItem.id,
|
|
382
|
+
leaseId: args.leaseId,
|
|
383
|
+
attempt: args.workItem.attempt,
|
|
384
|
+
status: 'running',
|
|
385
|
+
})
|
|
386
|
+
.catch((error) => {
|
|
387
|
+
log.warn('Inline variant lease heartbeat failed', error);
|
|
388
|
+
});
|
|
389
|
+
}, this.leaseHeartbeatMs);
|
|
390
|
+
return () => clearInterval(interval);
|
|
391
|
+
}
|
|
392
|
+
}
|
|
393
|
+
exports.InlineVariantGenerationService = InlineVariantGenerationService;
|
|
394
|
+
//# sourceMappingURL=InlineVariantGenerationService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"InlineVariantGenerationService.js","sourceRoot":"","sources":["../../src/services/InlineVariantGenerationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ export declare class SessionBridgeService {
|
|
|
92
92
|
* Clear the pending changes queue and increment the round counter.
|
|
93
93
|
* Call after the MCP client has retrieved and processed the intent.
|
|
94
94
|
*/
|
|
95
|
-
clearPending(): void;
|
|
95
|
+
clearPending(expectedIntent?: ChangeRequest): void;
|
|
96
96
|
/**
|
|
97
97
|
* Consume a single-item variant-request batch from the pending queue.
|
|
98
98
|
*
|
|
@@ -104,12 +104,12 @@ export declare class SessionBridgeService {
|
|
|
104
104
|
* Returns the consumed intent so callers can derive the agent's
|
|
105
105
|
* propose_variants target from it.
|
|
106
106
|
*/
|
|
107
|
-
consumeVariantRequestBatch(): ChangeRequest | null;
|
|
107
|
+
consumeVariantRequestBatch(expectedIntent?: ChangeRequest): ChangeRequest | null;
|
|
108
108
|
/**
|
|
109
109
|
* Remove variant-request comment items from a mixed pending batch while
|
|
110
110
|
* preserving all non-variant items for a follow-up apply run.
|
|
111
111
|
*/
|
|
112
|
-
rejectMixedVariantRequestBatch(): ChangeRequest | null;
|
|
112
|
+
rejectMixedVariantRequestBatch(expectedIntent?: ChangeRequest): ChangeRequest | null | undefined;
|
|
113
113
|
/**
|
|
114
114
|
* Mark the currently processing MCP apply run using identifiers from the queued request.
|
|
115
115
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionBridgeService.d.ts","sourceRoot":"","sources":["../../src/services/SessionBridgeService.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAIvC,KAAK,aAAa,GAAG,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC;AACnD,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,UAAU,GAAG,MAAM,CAAC;AACrE,MAAM,MAAM,qBAAqB,GAC7B,SAAS,GACT,sBAAsB,GACtB,mBAAmB,GACnB,SAAS,CAAC;AAEd,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,qBAAqB,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC1C,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,iBAAiB,CAAgD;IACzE,OAAO,CAAC,cAAc,CAAmD;IACzE,OAAO,CAAC,qBAAqB,CAA4C;IACzE,OAAO,CAAC,iBAAiB,CAAuB;IAChD,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,gBAAgB,CAAiC;IACzD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,WAAW,CAAkD;IACrE,OAAO,CAAC,oBAAoB,CAAqC;IACjE,OAAO,CAAC,eAAe,CAQrB;IAEF;;;OAGG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IA+BzC;;;;;OAKG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAerC,wDAAwD;IACxD,WAAW,IAAI,MAAM,EAAE;IAIvB,qCAAqC;IACrC,SAAS,IAAI,aAAa;IAI1B,sEAAsE;IACtE,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAOtC,kDAAkD;IAClD,QAAQ,IAAI,OAAO;IAInB,kEAAkE;IAClE,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,mDAAmD;IACnD,cAAc,IAAI,MAAM,GAAG,IAAI;IAI/B;;;OAGG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAQ5C;;;OAGG;IACH,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAqB/C;;;OAGG;IACH,iBAAiB,IAAI,aAAa,GAAG,IAAI;IAIzC;;;;OAIG;IACH,cAAc,CAAC,SAAS,SAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAkB3D;;;OAGG;IACH,YAAY,
|
|
1
|
+
{"version":3,"file":"SessionBridgeService.d.ts","sourceRoot":"","sources":["../../src/services/SessionBridgeService.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAIvC,KAAK,aAAa,GAAG,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC;AACnD,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,UAAU,GAAG,MAAM,CAAC;AACrE,MAAM,MAAM,qBAAqB,GAC7B,SAAS,GACT,sBAAsB,GACtB,mBAAmB,GACnB,SAAS,CAAC;AAEd,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,qBAAqB,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC1C,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,iBAAiB,CAAgD;IACzE,OAAO,CAAC,cAAc,CAAmD;IACzE,OAAO,CAAC,qBAAqB,CAA4C;IACzE,OAAO,CAAC,iBAAiB,CAAuB;IAChD,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,gBAAgB,CAAiC;IACzD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,WAAW,CAAkD;IACrE,OAAO,CAAC,oBAAoB,CAAqC;IACjE,OAAO,CAAC,eAAe,CAQrB;IAEF;;;OAGG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IA+BzC;;;;;OAKG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAerC,wDAAwD;IACxD,WAAW,IAAI,MAAM,EAAE;IAIvB,qCAAqC;IACrC,SAAS,IAAI,aAAa;IAI1B,sEAAsE;IACtE,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAOtC,kDAAkD;IAClD,QAAQ,IAAI,OAAO;IAInB,kEAAkE;IAClE,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,mDAAmD;IACnD,cAAc,IAAI,MAAM,GAAG,IAAI;IAI/B;;;OAGG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAQ5C;;;OAGG;IACH,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAqB/C;;;OAGG;IACH,iBAAiB,IAAI,aAAa,GAAG,IAAI;IAIzC;;;;OAIG;IACH,cAAc,CAAC,SAAS,SAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAkB3D;;;OAGG;IACH,YAAY,CAAC,cAAc,CAAC,EAAE,aAAa,GAAG,IAAI;IAclD;;;;;;;;;;OAUG;IACH,0BAA0B,CAAC,cAAc,CAAC,EAAE,aAAa,GAAG,aAAa,GAAG,IAAI;IAqBhF;;;OAGG;IACH,8BAA8B,CAC5B,cAAc,CAAC,EAAE,aAAa,GAC7B,aAAa,GAAG,IAAI,GAAG,SAAS;IAuCnC;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,sBAAsB;IAgB/D;;OAEG;IACH,4BAA4B,IAAI,oBAAoB,GAAG,IAAI;IAM3D,iEAAiE;IACjE,kBAAkB,IAAI,MAAM;IAI5B,4DAA4D;IAC5D,mBAAmB,IAAI,gBAAgB,GAAG,IAAI;IAI9C,iEAAiE;IACjE,kBAAkB,IAAI,eAAe;IAIrC,sEAAsE;IACtE,mBAAmB,CAAC,OAAO,EAAE;QAC3B,SAAS,EAAE,kBAAkB,CAAC;QAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,cAAc,EAAE,OAAO,CAAC;KACzB,GAAG,IAAI;IAUR,4DAA4D;IAC5D,qBAAqB,CAAC,MAAM,EAAE;QAC5B,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;QAC7B,MAAM,CAAC,EAAE,qBAAqB,CAAC;QAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC/B,GAAG,IAAI;IAeR,wEAAwE;IACxE,OAAO,CAAC,sBAAsB;IAoB9B,4FAA4F;IAC5F,2BAA2B,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAIpE,+GAA+G;IAC/G,qBAAqB,CAAC,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,IAAI;IAItE,iFAAiF;IACjF,4BAA4B,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI;IAIjE,4DAA4D;IAC5D,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIpD,gFAAgF;IAChF,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI3C,wDAAwD;IACxD,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIzC,wEAAwE;IACxE,oBAAoB,IAAI,OAAO;IAI/B,uDAAuD;IACvD,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO;IAInE;;;;;;;;;;;OAWG;IACH,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAyBtD,gGAAgG;IAChG,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAY5C;;;OAGG;IACH,UAAU,IAAI,MAAM;CA+BrB"}
|
|
@@ -174,7 +174,11 @@ class SessionBridgeService {
|
|
|
174
174
|
* Clear the pending changes queue and increment the round counter.
|
|
175
175
|
* Call after the MCP client has retrieved and processed the intent.
|
|
176
176
|
*/
|
|
177
|
-
clearPending() {
|
|
177
|
+
clearPending(expectedIntent) {
|
|
178
|
+
if (expectedIntent && this.pendingChanges !== expectedIntent) {
|
|
179
|
+
log.info('Pending intent changed while processing; preserving newer intent');
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
178
182
|
if (this.pendingChanges) {
|
|
179
183
|
this.roundsCompleted++;
|
|
180
184
|
this.pendingChanges = null;
|
|
@@ -192,10 +196,14 @@ class SessionBridgeService {
|
|
|
192
196
|
* Returns the consumed intent so callers can derive the agent's
|
|
193
197
|
* propose_variants target from it.
|
|
194
198
|
*/
|
|
195
|
-
consumeVariantRequestBatch() {
|
|
199
|
+
consumeVariantRequestBatch(expectedIntent) {
|
|
196
200
|
const intent = this.pendingChanges;
|
|
197
201
|
if (!intent)
|
|
198
202
|
return null;
|
|
203
|
+
if (expectedIntent && intent !== expectedIntent) {
|
|
204
|
+
log.info('Pending intent changed while consuming variant request; preserving newer intent');
|
|
205
|
+
return null;
|
|
206
|
+
}
|
|
199
207
|
this.pendingChanges = null;
|
|
200
208
|
// Wake any blocking watch_for_changes caller that hasn't returned yet,
|
|
201
209
|
// mirroring the queue/wake symmetry of queueChangeRequest. (Defensive:
|
|
@@ -209,10 +217,14 @@ class SessionBridgeService {
|
|
|
209
217
|
* Remove variant-request comment items from a mixed pending batch while
|
|
210
218
|
* preserving all non-variant items for a follow-up apply run.
|
|
211
219
|
*/
|
|
212
|
-
rejectMixedVariantRequestBatch() {
|
|
220
|
+
rejectMixedVariantRequestBatch(expectedIntent) {
|
|
213
221
|
const intent = this.pendingChanges;
|
|
214
222
|
if (!intent)
|
|
215
223
|
return null;
|
|
224
|
+
if (expectedIntent && intent !== expectedIntent) {
|
|
225
|
+
log.info('Pending intent changed while rejecting mixed variant request; preserving newer intent');
|
|
226
|
+
return undefined;
|
|
227
|
+
}
|
|
216
228
|
const nextChanges = intent.changes.filter((change) => !(change.kind === 'comment' &&
|
|
217
229
|
change.variantRequest !== undefined));
|
|
218
230
|
if (nextChanges.length === intent.changes.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionBridgeService.js","sourceRoot":"","sources":["../../src/services/SessionBridgeService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SessionBridgeService.js","sourceRoot":"","sources":["../../src/services/SessionBridgeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { type SpawnOptions } from 'child_process';
|
|
2
|
+
import type { ChangeRequest } from '../types/change-request-types';
|
|
3
|
+
export declare const DEFAULT_AGENT_TIMEOUT_SECONDS = 900;
|
|
4
|
+
export type EmbeddedAgentKind = 'claude' | 'codex';
|
|
5
|
+
type AgentInputStream = {
|
|
6
|
+
write: (chunk: string) => unknown;
|
|
7
|
+
end: () => unknown;
|
|
8
|
+
once?: (event: 'error', listener: (error: Error) => void) => unknown;
|
|
9
|
+
};
|
|
10
|
+
type AgentOutputStream = {
|
|
11
|
+
on: (event: 'data', listener: (chunk: Buffer) => void) => unknown;
|
|
12
|
+
};
|
|
13
|
+
type AgentProcess = {
|
|
14
|
+
stdin: AgentInputStream;
|
|
15
|
+
stdout: AgentOutputStream;
|
|
16
|
+
stderr: AgentOutputStream;
|
|
17
|
+
kill: (signal?: string) => boolean;
|
|
18
|
+
once: (event: 'close' | 'error', listener: ((code: number | null) => void) | ((error: Error) => void)) => unknown;
|
|
19
|
+
};
|
|
20
|
+
type SpawnProcess = (command: string, args: string[], options: SpawnOptions) => AgentProcess;
|
|
21
|
+
export type TerminalAgentRunnerOptions = {
|
|
22
|
+
agent?: EmbeddedAgentKind;
|
|
23
|
+
agentBin?: string;
|
|
24
|
+
claudeBin?: string;
|
|
25
|
+
model?: string;
|
|
26
|
+
timeoutSeconds?: number;
|
|
27
|
+
spawnProcess?: SpawnProcess;
|
|
28
|
+
};
|
|
29
|
+
export type TerminalAgentRunParams = {
|
|
30
|
+
request: ChangeRequest;
|
|
31
|
+
cwd: string;
|
|
32
|
+
sessionId: string;
|
|
33
|
+
resumeSession?: boolean;
|
|
34
|
+
onFeedback: (message: string) => void;
|
|
35
|
+
};
|
|
36
|
+
export type TerminalAgentRunResult = {
|
|
37
|
+
success: boolean;
|
|
38
|
+
error?: string;
|
|
39
|
+
};
|
|
40
|
+
export declare class TerminalAgentRunner {
|
|
41
|
+
private agent;
|
|
42
|
+
private agentBin;
|
|
43
|
+
private model?;
|
|
44
|
+
private timeoutSeconds;
|
|
45
|
+
private spawnProcess;
|
|
46
|
+
private codexThreadIds;
|
|
47
|
+
private activeProcesses;
|
|
48
|
+
constructor(options?: TerminalAgentRunnerOptions);
|
|
49
|
+
getDisplayName(): string;
|
|
50
|
+
private getDefaultAgentBin;
|
|
51
|
+
private buildClaudeArgs;
|
|
52
|
+
private buildCodexArgs;
|
|
53
|
+
private buildAgentArgs;
|
|
54
|
+
private parseFeedback;
|
|
55
|
+
/**
|
|
56
|
+
* @effect Terminates all active child agents owned by this runner.
|
|
57
|
+
*/
|
|
58
|
+
stopActiveRuns(signal?: string): number;
|
|
59
|
+
/**
|
|
60
|
+
* @effect Spawns the selected terminal agent, writes one Rivet change prompt to stdin, and streams progress from stdout.
|
|
61
|
+
*/
|
|
62
|
+
runChangeRequest(params: TerminalAgentRunParams): Promise<TerminalAgentRunResult>;
|
|
63
|
+
}
|
|
64
|
+
export {};
|
|
65
|
+
//# sourceMappingURL=TerminalAgentRunner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TerminalAgentRunner.d.ts","sourceRoot":"","sources":["../../src/services/TerminalAgentRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAUzD,OAAO,KAAK,EAEV,aAAa,EACd,MAAM,+BAA+B,CAAC;AASvC,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAejD,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEnD,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,GAAG,EAAE,MAAM,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,KAAK,OAAO,CAAC;CACtE,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,KAAK,OAAO,CAAC;CACnE,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,IAAI,EAAE,CACJ,KAAK,EAAE,OAAO,GAAG,OAAO,EACxB,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,KACjE,OAAO,CAAC;CACd,CAAC;AAEF,KAAK,YAAY,GAAG,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE,YAAY,KAClB,YAAY,CAAC;AAElB,MAAM,MAAM,0BAA0B,GAAG;IACvC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,aAAa,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAuWF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAC,CAAS;IACvB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,eAAe,CAA2B;gBAEtC,OAAO,GAAE,0BAA+B;IAkBpD,cAAc,IAAI,MAAM;IAIxB,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,aAAa;IAsBrB;;OAEG;IACH,cAAc,CAAC,MAAM,SAAY,GAAG,MAAM;IAa1C;;OAEG;IACH,gBAAgB,CACd,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,sBAAsB,CAAC;CAwInC"}
|