@roackb2/heddle 0.0.28 → 0.0.30
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 +87 -36
- package/dist/examples/programmatic-loop.js +12 -0
- package/dist/examples/programmatic-loop.js.map +1 -1
- package/dist/src/cli/ask.d.ts.map +1 -1
- package/dist/src/cli/ask.js +27 -5
- package/dist/src/cli/ask.js.map +1 -1
- package/dist/src/cli/chat/App.js +5 -3
- package/dist/src/cli/chat/App.js.map +1 -1
- package/dist/src/cli/chat/hooks/useAgentRun.d.ts +1 -0
- package/dist/src/cli/chat/hooks/useAgentRun.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useAgentRun.js +73 -0
- package/dist/src/cli/chat/hooks/useAgentRun.js.map +1 -1
- package/dist/src/cli/chat/hooks/useApprovalFlow.d.ts +1 -0
- package/dist/src/cli/chat/hooks/useApprovalFlow.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useApprovalFlow.js +3 -0
- package/dist/src/cli/chat/hooks/useApprovalFlow.js.map +1 -1
- package/dist/src/cli/chat/utils/format.d.ts.map +1 -1
- package/dist/src/cli/chat/utils/format.js +8 -0
- package/dist/src/cli/chat/utils/format.js.map +1 -1
- package/dist/src/cli/chat/utils/runtime.d.ts.map +1 -1
- package/dist/src/cli/chat/utils/runtime.js +7 -3
- package/dist/src/cli/chat/utils/runtime.js.map +1 -1
- package/dist/src/cli/main.js +235 -2
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/remote/control-plane-client.d.ts +76 -0
- package/dist/src/cli/remote/control-plane-client.d.ts.map +1 -1
- package/dist/src/core/agent/mutation-tracking.d.ts.map +1 -1
- package/dist/src/core/agent/mutation-tracking.js +3 -0
- package/dist/src/core/agent/mutation-tracking.js.map +1 -1
- package/dist/src/core/agent/post-mutation.js +2 -2
- package/dist/src/core/agent/post-mutation.js.map +1 -1
- package/dist/src/core/agent/run-agent.d.ts +1 -0
- package/dist/src/core/agent/run-agent.d.ts.map +1 -1
- package/dist/src/core/agent/run-agent.js +136 -28
- package/dist/src/core/agent/run-agent.js.map +1 -1
- package/dist/src/core/agent/tool-dispatch.d.ts +2 -0
- package/dist/src/core/agent/tool-dispatch.d.ts.map +1 -1
- package/dist/src/core/agent/tool-dispatch.js +8 -7
- package/dist/src/core/agent/tool-dispatch.js.map +1 -1
- package/dist/src/core/chat/conversation-lines.d.ts.map +1 -1
- package/dist/src/core/chat/conversation-lines.js +1 -26
- package/dist/src/core/chat/conversation-lines.js.map +1 -1
- package/dist/src/core/chat/session-lease.d.ts +4 -0
- package/dist/src/core/chat/session-lease.d.ts.map +1 -1
- package/dist/src/core/chat/session-lease.js +29 -1
- package/dist/src/core/chat/session-lease.js.map +1 -1
- package/dist/src/core/chat/session-submit.d.ts +2 -0
- package/dist/src/core/chat/session-submit.d.ts.map +1 -1
- package/dist/src/core/chat/session-submit.js +120 -15
- package/dist/src/core/chat/session-submit.js.map +1 -1
- package/dist/src/core/chat/trace-summary.d.ts.map +1 -1
- package/dist/src/core/chat/trace-summary.js +10 -0
- package/dist/src/core/chat/trace-summary.js.map +1 -1
- package/dist/src/core/memory/catalog.d.ts +46 -0
- package/dist/src/core/memory/catalog.d.ts.map +1 -0
- package/dist/src/core/memory/catalog.js +230 -0
- package/dist/src/core/memory/catalog.js.map +1 -0
- package/dist/src/core/memory/domain-prompt.d.ts +2 -0
- package/dist/src/core/memory/domain-prompt.d.ts.map +1 -0
- package/dist/src/core/memory/domain-prompt.js +35 -0
- package/dist/src/core/memory/domain-prompt.js.map +1 -0
- package/dist/src/core/memory/maintainer-tools.d.ts +5 -0
- package/dist/src/core/memory/maintainer-tools.d.ts.map +1 -0
- package/dist/src/core/memory/maintainer-tools.js +10 -0
- package/dist/src/core/memory/maintainer-tools.js.map +1 -0
- package/dist/src/core/memory/maintainer.d.ts +45 -0
- package/dist/src/core/memory/maintainer.d.ts.map +1 -0
- package/dist/src/core/memory/maintainer.js +204 -0
- package/dist/src/core/memory/maintainer.js.map +1 -0
- package/dist/src/core/memory/maintenance-integration.d.ts +20 -0
- package/dist/src/core/memory/maintenance-integration.d.ts.map +1 -0
- package/dist/src/core/memory/maintenance-integration.js +189 -0
- package/dist/src/core/memory/maintenance-integration.js.map +1 -0
- package/dist/src/core/memory/templates.d.ts +9 -0
- package/dist/src/core/memory/templates.d.ts.map +1 -0
- package/dist/src/core/memory/templates.js +32 -0
- package/dist/src/core/memory/templates.js.map +1 -0
- package/dist/src/core/memory/validation.d.ts +39 -0
- package/dist/src/core/memory/validation.d.ts.map +1 -0
- package/dist/src/core/memory/validation.js +94 -0
- package/dist/src/core/memory/validation.js.map +1 -0
- package/dist/src/core/memory/visibility.d.ts +42 -0
- package/dist/src/core/memory/visibility.d.ts.map +1 -0
- package/dist/src/core/memory/visibility.js +156 -0
- package/dist/src/core/memory/visibility.js.map +1 -0
- package/dist/src/core/prompts/system-prompt.d.ts.map +1 -1
- package/dist/src/core/prompts/system-prompt.js +0 -10
- package/dist/src/core/prompts/system-prompt.js.map +1 -1
- package/dist/src/core/review/diff-domain.d.ts +24 -0
- package/dist/src/core/review/diff-domain.d.ts.map +1 -0
- package/dist/src/core/review/diff-domain.js +134 -0
- package/dist/src/core/review/diff-domain.js.map +1 -0
- package/dist/src/core/runtime/agent-loop.d.ts.map +1 -1
- package/dist/src/core/runtime/agent-loop.js +1 -0
- package/dist/src/core/runtime/agent-loop.js.map +1 -1
- package/dist/src/core/runtime/daemon-registry.d.ts +6 -1
- package/dist/src/core/runtime/daemon-registry.d.ts.map +1 -1
- package/dist/src/core/runtime/daemon-registry.js +32 -5
- package/dist/src/core/runtime/daemon-registry.js.map +1 -1
- package/dist/src/core/runtime/default-tools.d.ts +1 -0
- package/dist/src/core/runtime/default-tools.d.ts.map +1 -1
- package/dist/src/core/runtime/default-tools.js +33 -13
- package/dist/src/core/runtime/default-tools.js.map +1 -1
- package/dist/src/core/runtime/heartbeat.d.ts.map +1 -1
- package/dist/src/core/runtime/heartbeat.js +9 -2
- package/dist/src/core/runtime/heartbeat.js.map +1 -1
- package/dist/src/core/runtime/runtime-hosts.js +1 -1
- package/dist/src/core/runtime/runtime-hosts.js.map +1 -1
- package/dist/src/core/runtime/workspaces.d.ts +7 -0
- package/dist/src/core/runtime/workspaces.d.ts.map +1 -1
- package/dist/src/core/runtime/workspaces.js +31 -2
- package/dist/src/core/runtime/workspaces.js.map +1 -1
- package/dist/src/core/tools/edit-file.d.ts +4 -0
- package/dist/src/core/tools/edit-file.d.ts.map +1 -1
- package/dist/src/core/tools/edit-file.js +48 -43
- package/dist/src/core/tools/edit-file.js.map +1 -1
- package/dist/src/core/tools/file-edit-core.d.ts +1 -0
- package/dist/src/core/tools/file-edit-core.d.ts.map +1 -1
- package/dist/src/core/tools/file-edit-core.js +10 -0
- package/dist/src/core/tools/file-edit-core.js.map +1 -1
- package/dist/src/core/tools/list-files.d.ts +4 -0
- package/dist/src/core/tools/list-files.d.ts.map +1 -1
- package/dist/src/core/tools/list-files.js +34 -29
- package/dist/src/core/tools/list-files.js.map +1 -1
- package/dist/src/core/tools/memory-checkpoint.d.ts +8 -0
- package/dist/src/core/tools/memory-checkpoint.d.ts.map +1 -0
- package/dist/src/core/tools/memory-checkpoint.js +131 -0
- package/dist/src/core/tools/memory-checkpoint.js.map +1 -0
- package/dist/src/core/tools/memory-notes.d.ts.map +1 -1
- package/dist/src/core/tools/memory-notes.js +4 -3
- package/dist/src/core/tools/memory-notes.js.map +1 -1
- package/dist/src/core/tools/read-file.d.ts +4 -0
- package/dist/src/core/tools/read-file.d.ts.map +1 -1
- package/dist/src/core/tools/read-file.js +50 -45
- package/dist/src/core/tools/read-file.js.map +1 -1
- package/dist/src/core/tools/record-knowledge.d.ts +9 -0
- package/dist/src/core/tools/record-knowledge.d.ts.map +1 -0
- package/dist/src/core/tools/record-knowledge.js +177 -0
- package/dist/src/core/tools/record-knowledge.js.map +1 -0
- package/dist/src/core/tools/run-shell.d.ts +2 -0
- package/dist/src/core/tools/run-shell.d.ts.map +1 -1
- package/dist/src/core/tools/run-shell.js +3 -0
- package/dist/src/core/tools/run-shell.js.map +1 -1
- package/dist/src/core/tools/search-files.d.ts +1 -0
- package/dist/src/core/tools/search-files.d.ts.map +1 -1
- package/dist/src/core/tools/search-files.js +4 -2
- package/dist/src/core/tools/search-files.js.map +1 -1
- package/dist/src/core/tools/view-image.d.ts +1 -0
- package/dist/src/core/tools/view-image.d.ts.map +1 -1
- package/dist/src/core/tools/view-image.js +2 -1
- package/dist/src/core/tools/view-image.js.map +1 -1
- package/dist/src/core/types.d.ts +33 -0
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/index.d.ts +13 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +8 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/server/app.d.ts.map +1 -1
- package/dist/src/server/app.js +1 -1
- package/dist/src/server/app.js.map +1 -1
- package/dist/src/server/features/control-plane/router.d.ts +78 -1
- package/dist/src/server/features/control-plane/router.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/router.js +87 -2
- package/dist/src/server/features/control-plane/router.js.map +1 -1
- package/dist/src/server/features/control-plane/services/ask.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/ask.js +23 -5
- package/dist/src/server/features/control-plane/services/ask.js.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts +2 -0
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.js +69 -0
- package/dist/src/server/features/control-plane/services/chat-sessions.js.map +1 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.js +26 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.js.map +1 -1
- package/dist/src/server/features/control-plane/services/memory.d.ts +22 -0
- package/dist/src/server/features/control-plane/services/memory.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/services/memory.js +36 -0
- package/dist/src/server/features/control-plane/services/memory.js.map +1 -0
- package/dist/src/server/features/control-plane/services/workspace-diff.d.ts +4 -0
- package/dist/src/server/features/control-plane/services/workspace-diff.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/services/workspace-diff.js +258 -0
- package/dist/src/server/features/control-plane/services/workspace-diff.js.map +1 -0
- package/dist/src/server/features/control-plane/services/workspace-files.d.ts +18 -0
- package/dist/src/server/features/control-plane/services/workspace-files.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/workspace-files.js +68 -2
- package/dist/src/server/features/control-plane/services/workspace-files.js.map +1 -1
- package/dist/src/server/features/control-plane/types.d.ts +38 -0
- package/dist/src/server/features/control-plane/types.d.ts.map +1 -1
- package/dist/src/server/index.d.ts.map +1 -1
- package/dist/src/server/index.js +1 -0
- package/dist/src/server/index.js.map +1 -1
- package/dist/src/server/router.d.ts +76 -0
- package/dist/src/server/router.d.ts.map +1 -1
- package/dist/src/web/assets/index-BKSxomk7.js +55 -0
- package/dist/src/web/assets/index-Bl3oDytR.css +2 -0
- package/dist/src/web/index.html +2 -2
- package/package.json +18 -2
- package/dist/src/web/assets/index-COAJyPuH.css +0 -2
- package/dist/src/web/assets/index-DxGlp0Wk.js +0 -52
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// runAgent — the heart of Heddle
|
|
3
3
|
// A minimal, executable agent loop.
|
|
4
4
|
// ---------------------------------------------------------------------------
|
|
5
|
+
import { resolve } from 'node:path';
|
|
5
6
|
import { createToolRegistry } from '../tools/registry.js';
|
|
6
7
|
import { createTraceRecorder } from '../trace/recorder.js';
|
|
7
8
|
import { createBudget } from '../utils/budget.js';
|
|
@@ -70,6 +71,7 @@ function createRunContext(options) {
|
|
|
70
71
|
maxSteps,
|
|
71
72
|
llm: options.llm,
|
|
72
73
|
registry,
|
|
74
|
+
workspaceRoot: resolve(options.workspaceRoot ?? process.cwd()),
|
|
73
75
|
log: options.logger ?? defaultLogger,
|
|
74
76
|
messages: buildInitialMessages(options.goal, registry.names(), options.systemContext, options.history),
|
|
75
77
|
trace,
|
|
@@ -93,6 +95,15 @@ function createRunContext(options) {
|
|
|
93
95
|
consecutiveErrors: 0,
|
|
94
96
|
outcome: 'max_steps',
|
|
95
97
|
summary: '',
|
|
98
|
+
memoryCheckpoint: {
|
|
99
|
+
required: shouldRequireMemoryCheckpoint(options.goal, registry.names()),
|
|
100
|
+
completed: false,
|
|
101
|
+
},
|
|
102
|
+
reminders: {
|
|
103
|
+
postMutationFollowUpSent: false,
|
|
104
|
+
memoryCheckpointSent: false,
|
|
105
|
+
structuredSummarySent: false,
|
|
106
|
+
},
|
|
96
107
|
},
|
|
97
108
|
};
|
|
98
109
|
}
|
|
@@ -185,6 +196,7 @@ async function executeToolTurn(context, call) {
|
|
|
185
196
|
step: context.state.step,
|
|
186
197
|
now: context.now,
|
|
187
198
|
approveToolCall: context.approveToolCall,
|
|
199
|
+
workspaceRoot: context.workspaceRoot,
|
|
188
200
|
record: context.record,
|
|
189
201
|
log: context.log,
|
|
190
202
|
});
|
|
@@ -200,6 +212,7 @@ async function executeToolTurn(context, call) {
|
|
|
200
212
|
registry: context.registry,
|
|
201
213
|
seenToolCalls: context.seenToolCalls,
|
|
202
214
|
approveToolCall: context.approveToolCall,
|
|
215
|
+
workspaceRoot: context.workspaceRoot,
|
|
203
216
|
record: context.record,
|
|
204
217
|
log: context.log,
|
|
205
218
|
});
|
|
@@ -230,6 +243,9 @@ function handleExecutedToolResult(context, effectiveCall, toolCallId, result) {
|
|
|
230
243
|
else {
|
|
231
244
|
context.state.consecutiveErrors = 0;
|
|
232
245
|
trackToolResult(context.mutation, effectiveCall, result);
|
|
246
|
+
trackMemoryCheckpointNeed(context, effectiveCall);
|
|
247
|
+
recordMemoryCandidateEvent(context, effectiveCall, result);
|
|
248
|
+
recordMemoryCheckpointSkippedEvent(context, effectiveCall, result);
|
|
233
249
|
if (effectiveCall.tool === 'update_plan') {
|
|
234
250
|
context.state.activePlan = parsePlanState(result.output);
|
|
235
251
|
}
|
|
@@ -239,9 +255,66 @@ function handleExecutedToolResult(context, effectiveCall, toolCallId, result) {
|
|
|
239
255
|
content: JSON.stringify(result),
|
|
240
256
|
toolCallId,
|
|
241
257
|
});
|
|
258
|
+
pushHostRequirementReminders(context);
|
|
242
259
|
pushProgressReminders(context, effectiveCall, result);
|
|
243
260
|
return undefined;
|
|
244
261
|
}
|
|
262
|
+
function recordMemoryCandidateEvent(context, effectiveCall, result) {
|
|
263
|
+
if (effectiveCall.tool !== 'record_knowledge' && effectiveCall.tool !== 'memory_checkpoint') {
|
|
264
|
+
return;
|
|
265
|
+
}
|
|
266
|
+
if (effectiveCall.tool === 'memory_checkpoint') {
|
|
267
|
+
context.state.memoryCheckpoint.completed = true;
|
|
268
|
+
}
|
|
269
|
+
const output = result.output;
|
|
270
|
+
if (!output || typeof output !== 'object' || Array.isArray(output)) {
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
const candidateId = output.id;
|
|
274
|
+
const path = output.path;
|
|
275
|
+
if (typeof candidateId !== 'string' || typeof path !== 'string') {
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
context.record({
|
|
279
|
+
type: 'memory.candidate_recorded',
|
|
280
|
+
candidateId,
|
|
281
|
+
path,
|
|
282
|
+
step: context.state.step,
|
|
283
|
+
timestamp: context.now(),
|
|
284
|
+
});
|
|
285
|
+
}
|
|
286
|
+
function recordMemoryCheckpointSkippedEvent(context, effectiveCall, result) {
|
|
287
|
+
if (effectiveCall.tool !== 'memory_checkpoint') {
|
|
288
|
+
return;
|
|
289
|
+
}
|
|
290
|
+
context.state.memoryCheckpoint.completed = true;
|
|
291
|
+
const output = result.output;
|
|
292
|
+
if (!output || typeof output !== 'object' || Array.isArray(output)) {
|
|
293
|
+
return;
|
|
294
|
+
}
|
|
295
|
+
const decision = output.decision;
|
|
296
|
+
const rationale = output.rationale;
|
|
297
|
+
if (decision !== 'skip' || typeof rationale !== 'string') {
|
|
298
|
+
return;
|
|
299
|
+
}
|
|
300
|
+
context.record({
|
|
301
|
+
type: 'memory.checkpoint_skipped',
|
|
302
|
+
rationale,
|
|
303
|
+
step: context.state.step,
|
|
304
|
+
timestamp: context.now(),
|
|
305
|
+
});
|
|
306
|
+
}
|
|
307
|
+
function trackMemoryCheckpointNeed(context, effectiveCall) {
|
|
308
|
+
if (effectiveCall.tool === 'memory_checkpoint') {
|
|
309
|
+
return;
|
|
310
|
+
}
|
|
311
|
+
if (isMemoryOnlyTool(effectiveCall.tool)) {
|
|
312
|
+
return;
|
|
313
|
+
}
|
|
314
|
+
if (context.registry.get('memory_checkpoint')) {
|
|
315
|
+
context.state.memoryCheckpoint.required = true;
|
|
316
|
+
}
|
|
317
|
+
}
|
|
245
318
|
function handleFailedToolExecution(context, result) {
|
|
246
319
|
if (isRecoverableToolError(result.error)) {
|
|
247
320
|
context.messages.push({
|
|
@@ -268,26 +341,21 @@ function finalizeAssistantResponse(context, response) {
|
|
|
268
341
|
if (!response.content) {
|
|
269
342
|
return finishRun(context, 'error', 'Model returned an empty response');
|
|
270
343
|
}
|
|
271
|
-
const
|
|
272
|
-
if (
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
logMessage: 'Agent run finished with host-enforced structured change summary',
|
|
287
|
-
});
|
|
288
|
-
}
|
|
289
|
-
context.messages.push({ role: 'system', content: completionBlocker });
|
|
290
|
-
return 'continue';
|
|
344
|
+
const forcedSummary = buildForcedStructuredChangeSummary(context, response.content);
|
|
345
|
+
if (forcedSummary) {
|
|
346
|
+
context.record({
|
|
347
|
+
type: 'assistant.turn',
|
|
348
|
+
content: forcedSummary,
|
|
349
|
+
diagnostics: response.diagnostics,
|
|
350
|
+
requestedTools: false,
|
|
351
|
+
step: context.state.step,
|
|
352
|
+
timestamp: context.now(),
|
|
353
|
+
});
|
|
354
|
+
context.messages.push({ role: 'assistant', content: forcedSummary });
|
|
355
|
+
return finishRun(context, 'done', forcedSummary, {
|
|
356
|
+
logLevel: 'info',
|
|
357
|
+
logMessage: 'Agent run finished with host-enforced structured change summary',
|
|
358
|
+
});
|
|
291
359
|
}
|
|
292
360
|
context.record({
|
|
293
361
|
type: 'assistant.turn',
|
|
@@ -303,13 +371,30 @@ function finalizeAssistantResponse(context, response) {
|
|
|
303
371
|
logMessage: 'Agent run finished',
|
|
304
372
|
});
|
|
305
373
|
}
|
|
306
|
-
function
|
|
374
|
+
function pushHostRequirementReminders(context) {
|
|
375
|
+
const postMutationReminder = getPostMutationFollowUpReminder(context);
|
|
376
|
+
if (postMutationReminder && !context.state.reminders.postMutationFollowUpSent) {
|
|
377
|
+
context.state.reminders.postMutationFollowUpSent = true;
|
|
378
|
+
context.messages.push({ role: 'system', content: postMutationReminder });
|
|
379
|
+
}
|
|
380
|
+
const memoryReminder = getMemoryCheckpointReminder(context);
|
|
381
|
+
if (memoryReminder && !context.state.reminders.memoryCheckpointSent) {
|
|
382
|
+
context.state.reminders.memoryCheckpointSent = true;
|
|
383
|
+
context.messages.push({ role: 'system', content: memoryReminder });
|
|
384
|
+
}
|
|
385
|
+
const structuredReminder = getStructuredSummaryReminder(context);
|
|
386
|
+
if (structuredReminder && !context.state.reminders.structuredSummarySent) {
|
|
387
|
+
context.state.reminders.structuredSummarySent = true;
|
|
388
|
+
context.messages.push({ role: 'system', content: structuredReminder });
|
|
389
|
+
}
|
|
390
|
+
}
|
|
391
|
+
function getPostMutationFollowUpReminder(context) {
|
|
307
392
|
if (context.mutation.pendingVerification || context.mutation.pendingChangeReview) {
|
|
308
393
|
context.log.info({
|
|
309
394
|
step: context.state.step,
|
|
310
395
|
pendingVerification: context.mutation.pendingVerification,
|
|
311
396
|
pendingChangeReview: context.mutation.pendingChangeReview,
|
|
312
|
-
}, '
|
|
397
|
+
}, 'Reminding agent to complete mutation follow-up before final answer');
|
|
313
398
|
return buildPostMutationRequirement({
|
|
314
399
|
pendingVerification: context.mutation.pendingVerification,
|
|
315
400
|
pendingChangeReview: context.mutation.pendingChangeReview,
|
|
@@ -318,21 +403,44 @@ function getCompletionBlocker(context, responseContent) {
|
|
|
318
403
|
noteExistingVerification: !context.mutation.pendingVerification,
|
|
319
404
|
});
|
|
320
405
|
}
|
|
406
|
+
return undefined;
|
|
407
|
+
}
|
|
408
|
+
function getStructuredSummaryReminder(context) {
|
|
321
409
|
if (context.mutation.requiresStructuredChangeSummary &&
|
|
322
|
-
!
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
verificationCommands: context.mutation.executedVerificationCommands,
|
|
326
|
-
})) {
|
|
327
|
-
context.log.info({ step: context.state.step }, 'Blocking vague final answer until structured change summary is provided');
|
|
410
|
+
!context.mutation.pendingVerification &&
|
|
411
|
+
!context.mutation.pendingChangeReview) {
|
|
412
|
+
context.log.info({ step: context.state.step }, 'Reminding agent to provide structured change summary');
|
|
328
413
|
return buildStructuredChangeSummaryRequirement(context.mutation);
|
|
329
414
|
}
|
|
330
415
|
return undefined;
|
|
331
416
|
}
|
|
417
|
+
function getMemoryCheckpointReminder(context) {
|
|
418
|
+
if (context.state.memoryCheckpoint.required && !context.state.memoryCheckpoint.completed) {
|
|
419
|
+
context.log.info({ step: context.state.step }, 'Reminding agent to run memory checkpoint');
|
|
420
|
+
return 'Before your final answer, call memory_checkpoint exactly once. Use decision "record" if the user asked you to remember a durable preference/workflow/fact or this turn discovered stable reusable workspace knowledge. Use decision "skip" if there is nothing durable to preserve, the fact is speculative/temporary/duplicate, or it should not be stored.';
|
|
421
|
+
}
|
|
422
|
+
return undefined;
|
|
423
|
+
}
|
|
424
|
+
function shouldRequireMemoryCheckpoint(goal, toolNames) {
|
|
425
|
+
return toolNames.includes('memory_checkpoint') && hasExplicitMemoryIntent(goal);
|
|
426
|
+
}
|
|
427
|
+
function hasExplicitMemoryIntent(goal) {
|
|
428
|
+
return /\b(?:remember|note down|keep in memory|use this going forward|going forward|preferred format|preference|don't forget|do not forget|preserve this|save this)\b/i.test(goal);
|
|
429
|
+
}
|
|
430
|
+
function isMemoryOnlyTool(tool) {
|
|
431
|
+
return tool === 'list_memory_notes'
|
|
432
|
+
|| tool === 'read_memory_note'
|
|
433
|
+
|| tool === 'search_memory_notes'
|
|
434
|
+
|| tool === 'record_knowledge'
|
|
435
|
+
|| tool === 'memory_checkpoint';
|
|
436
|
+
}
|
|
332
437
|
function buildForcedStructuredChangeSummary(context, responseContent) {
|
|
333
438
|
if (context.mutation.pendingVerification || context.mutation.pendingChangeReview) {
|
|
334
439
|
return undefined;
|
|
335
440
|
}
|
|
441
|
+
if (context.state.memoryCheckpoint.required && !context.state.memoryCheckpoint.completed) {
|
|
442
|
+
return undefined;
|
|
443
|
+
}
|
|
336
444
|
if (!context.mutation.requiresStructuredChangeSummary) {
|
|
337
445
|
return undefined;
|
|
338
446
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-agent.js","sourceRoot":"","sources":["../../../../src/core/agent/run-agent.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-agent.js","sourceRoot":"","sources":["../../../../src/core/agent/run-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare function maybeDenyToolCall(args: {
|
|
|
9
9
|
step: number;
|
|
10
10
|
now: () => string;
|
|
11
11
|
approveToolCall: RunAgentOptions['approveToolCall'];
|
|
12
|
+
workspaceRoot?: string;
|
|
12
13
|
record: (event: TraceEvent) => void;
|
|
13
14
|
log: Logger;
|
|
14
15
|
}): Promise<{
|
|
@@ -22,6 +23,7 @@ export declare function executeToolCallWithFallback(args: {
|
|
|
22
23
|
registry: ReturnType<typeof createToolRegistry>;
|
|
23
24
|
seenToolCalls: Map<string, number>;
|
|
24
25
|
approveToolCall: RunAgentOptions['approveToolCall'];
|
|
26
|
+
workspaceRoot?: string;
|
|
25
27
|
record: (event: TraceEvent) => void;
|
|
26
28
|
log: Logger;
|
|
27
29
|
}): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-dispatch.d.ts","sourceRoot":"","sources":["../../../../src/core/agent/tool-dispatch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,cAAc,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAwBpD;AAED,wBAAsB,2BAA2B,CAAC,IAAI,EAAE;IACtD,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;IAChD,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC;IAAE,aAAa,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"tool-dispatch.d.ts","sourceRoot":"","sources":["../../../../src/core/agent/tool-dispatch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,cAAc,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAC;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAwBpD;AAED,wBAAsB,2BAA2B,CAAC,IAAI,EAAE;IACtD,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;IAChD,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAC;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC;IAAE,aAAa,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAA;CAAE,CAAC,CA4CxF"}
|
|
@@ -11,7 +11,7 @@ export async function maybeDenyToolCall(args) {
|
|
|
11
11
|
if (!tool) {
|
|
12
12
|
return undefined;
|
|
13
13
|
}
|
|
14
|
-
if (!requiresApprovalForCall(call, tool)) {
|
|
14
|
+
if (!requiresApprovalForCall(call, tool, args.workspaceRoot)) {
|
|
15
15
|
return undefined;
|
|
16
16
|
}
|
|
17
17
|
const approval = await resolveToolApproval({ call, tool, step, now, approveToolCall, record });
|
|
@@ -56,6 +56,7 @@ export async function executeToolCallWithFallback(args) {
|
|
|
56
56
|
step: args.step,
|
|
57
57
|
now: args.now,
|
|
58
58
|
approveToolCall: args.approveToolCall,
|
|
59
|
+
workspaceRoot: args.workspaceRoot,
|
|
59
60
|
record: args.record,
|
|
60
61
|
log: args.log,
|
|
61
62
|
});
|
|
@@ -97,13 +98,13 @@ async function resolveToolApproval(args) {
|
|
|
97
98
|
});
|
|
98
99
|
return approval;
|
|
99
100
|
}
|
|
100
|
-
function requiresApprovalForCall(call, tool) {
|
|
101
|
+
function requiresApprovalForCall(call, tool, workspaceRoot) {
|
|
101
102
|
if (tool.requiresApproval) {
|
|
102
103
|
return true;
|
|
103
104
|
}
|
|
104
|
-
return isOutsideWorkspaceInspectionCall(call);
|
|
105
|
+
return isOutsideWorkspaceInspectionCall(call, workspaceRoot);
|
|
105
106
|
}
|
|
106
|
-
function isOutsideWorkspaceInspectionCall(call) {
|
|
107
|
+
function isOutsideWorkspaceInspectionCall(call, workspaceRoot = process.cwd()) {
|
|
107
108
|
if (call.tool !== 'read_file' && call.tool !== 'list_files' && call.tool !== 'search_files' && call.tool !== 'edit_file') {
|
|
108
109
|
return false;
|
|
109
110
|
}
|
|
@@ -119,9 +120,9 @@ function isOutsideWorkspaceInspectionCall(call) {
|
|
|
119
120
|
if (!rawPath) {
|
|
120
121
|
return false;
|
|
121
122
|
}
|
|
122
|
-
const
|
|
123
|
-
const
|
|
124
|
-
return resolvedTarget !==
|
|
123
|
+
const resolvedWorkspaceRoot = resolve(workspaceRoot);
|
|
124
|
+
const resolvedTarget = resolve(resolvedWorkspaceRoot, rawPath);
|
|
125
|
+
return resolvedTarget !== resolvedWorkspaceRoot && !resolvedTarget.startsWith(`${resolvedWorkspaceRoot}/`);
|
|
125
126
|
}
|
|
126
127
|
function getInspectFallbackReason(call, result) {
|
|
127
128
|
if (call.tool !== 'run_shell_inspect' || result.ok) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-dispatch.js","sourceRoot":"","sources":["../../../../src/core/agent/tool-dispatch.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,yEAAyE;AACzE,sBAAsB;AACtB,8EAA8E;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAG7F,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"tool-dispatch.js","sourceRoot":"","sources":["../../../../src/core/agent/tool-dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-lines.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"conversation-lines.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,CA4BpF"}
|
|
@@ -18,34 +18,9 @@ export function buildConversationMessages(history) {
|
|
|
18
18
|
return [{ id: `${message.role}-${index}-${message.content}`, role: message.role, text: message.content }];
|
|
19
19
|
}
|
|
20
20
|
if (message.role === 'tool') {
|
|
21
|
-
|
|
22
|
-
if (!rendered) {
|
|
23
|
-
return [];
|
|
24
|
-
}
|
|
25
|
-
return [{ id: `tool-${index}-${rendered}`, role: 'assistant', text: rendered }];
|
|
21
|
+
return [];
|
|
26
22
|
}
|
|
27
23
|
return [];
|
|
28
24
|
});
|
|
29
25
|
}
|
|
30
|
-
function renderToolHistoryMessage(message, history, index) {
|
|
31
|
-
const priorAssistant = findPriorAssistantWithToolCall(history, index, message.toolCallId);
|
|
32
|
-
const toolName = priorAssistant?.toolCalls?.find((call) => call.id === message.toolCallId)?.tool ?? 'tool';
|
|
33
|
-
const summary = message.content.trim();
|
|
34
|
-
if (!summary) {
|
|
35
|
-
return `${toolName} returned no visible output.`;
|
|
36
|
-
}
|
|
37
|
-
return `${toolName}: ${summary}`;
|
|
38
|
-
}
|
|
39
|
-
function findPriorAssistantWithToolCall(history, index, toolCallId) {
|
|
40
|
-
for (let cursor = index - 1; cursor >= 0; cursor--) {
|
|
41
|
-
const candidate = history[cursor];
|
|
42
|
-
if (candidate?.role !== 'assistant' || !candidate.toolCalls?.length) {
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
if (candidate.toolCalls.some((call) => call.id === toolCallId)) {
|
|
46
|
-
return candidate;
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
return undefined;
|
|
50
|
-
}
|
|
51
26
|
//# sourceMappingURL=conversation-lines.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-lines.js","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAG5D,MAAM,UAAU,yBAAyB,CAAC,OAAsB;IAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACvE,OAAO,CAAC;oBACN,EAAE,EAAE,aAAa,KAAK,EAAE;oBACxB,IAAI,EAAE,WAAW;oBACjB,IAAI,EACF,gBAAgB,CAAC,CAAC;wBAChB,iGAAiG,gBAAgB,CAAC,CAAC,CAAC,GAAG;wBACzH,CAAC,CAAC,4EAA4E;iBACjF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC5D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC5B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,IAAI,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5G,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC5B,
|
|
1
|
+
{"version":3,"file":"conversation-lines.js","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAG5D,MAAM,UAAU,yBAAyB,CAAC,OAAsB;IAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACvE,OAAO,CAAC;oBACN,EAAE,EAAE,aAAa,KAAK,EAAE;oBACxB,IAAI,EAAE,WAAW;oBACjB,IAAI,EACF,gBAAgB,CAAC,CAAC;wBAChB,iGAAiG,gBAAgB,CAAC,CAAC,CAAC,GAAG;wBACzH,CAAC,CAAC,4EAA4E;iBACjF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC5D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC5B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,IAAI,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5G,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -8,6 +8,9 @@ export declare function isSessionLeaseFresh(lease: ChatSessionLease | undefined,
|
|
|
8
8
|
now?: number;
|
|
9
9
|
staleAfterMs?: number;
|
|
10
10
|
}): boolean;
|
|
11
|
+
export declare function isSessionLeaseOwnedByDeadLocalProcess(lease: ChatSessionLease | undefined, options?: {
|
|
12
|
+
isProcessAlive?: (pid: number) => boolean;
|
|
13
|
+
}): boolean;
|
|
11
14
|
export declare function acquireSessionLease(session: ChatSession, owner: ChatSessionLeaseOwner, options?: {
|
|
12
15
|
now?: number;
|
|
13
16
|
}): ChatSession;
|
|
@@ -15,5 +18,6 @@ export declare function releaseSessionLease(session: ChatSession, owner?: Pick<C
|
|
|
15
18
|
export declare function getSessionLeaseConflict(session: ChatSession, owner: ChatSessionLeaseOwner, options?: {
|
|
16
19
|
now?: number;
|
|
17
20
|
staleAfterMs?: number;
|
|
21
|
+
isProcessAlive?: (pid: number) => boolean;
|
|
18
22
|
}): string | undefined;
|
|
19
23
|
//# sourceMappingURL=session-lease.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lease.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-lease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"session-lease.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-lease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAKhE,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,gBAAgB,GAAG,SAAS,EACnC,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAChD,OAAO,CAWT;AAED,wBAAgB,qCAAqC,CACnD,KAAK,EAAE,gBAAgB,GAAG,SAAS,EACnC,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;CAAE,GACtD,OAAO,CAaT;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,qBAAqB,EAC5B,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GACzB,WAAW,CAYb;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC,GAAG,WAAW,CASrH;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,qBAAqB,EAC5B,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;CAAE,GAC3F,MAAM,GAAG,SAAS,CAepB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
const DEFAULT_SESSION_LEASE_STALE_AFTER_MS = 15 * 60 * 1000;
|
|
2
|
+
const LOCAL_PROCESS_LEASE_OWNER_PATTERN = /^(?:tui|ask|submit|daemon)-(\d+)$/;
|
|
2
3
|
export function isSessionLeaseFresh(lease, options) {
|
|
3
4
|
if (!lease) {
|
|
4
5
|
return false;
|
|
@@ -9,6 +10,18 @@ export function isSessionLeaseFresh(lease, options) {
|
|
|
9
10
|
}
|
|
10
11
|
return (options?.now ?? Date.now()) - lastSeenAt <= (options?.staleAfterMs ?? DEFAULT_SESSION_LEASE_STALE_AFTER_MS);
|
|
11
12
|
}
|
|
13
|
+
export function isSessionLeaseOwnedByDeadLocalProcess(lease, options) {
|
|
14
|
+
if (!lease) {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
const match = LOCAL_PROCESS_LEASE_OWNER_PATTERN.exec(lease.ownerId);
|
|
18
|
+
const pid = match ? Number.parseInt(match[1] ?? '', 10) : NaN;
|
|
19
|
+
if (!Number.isInteger(pid) || pid <= 0) {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
const isProcessAlive = options?.isProcessAlive ?? defaultIsProcessAlive;
|
|
23
|
+
return !isProcessAlive(pid);
|
|
24
|
+
}
|
|
12
25
|
export function acquireSessionLease(session, owner, options) {
|
|
13
26
|
const timestamp = new Date(options?.now ?? Date.now()).toISOString();
|
|
14
27
|
return {
|
|
@@ -32,7 +45,10 @@ export function releaseSessionLease(session, owner) {
|
|
|
32
45
|
};
|
|
33
46
|
}
|
|
34
47
|
export function getSessionLeaseConflict(session, owner, options) {
|
|
35
|
-
if (!session.lease ||
|
|
48
|
+
if (!session.lease ||
|
|
49
|
+
session.lease.ownerId === owner.ownerId ||
|
|
50
|
+
isSessionLeaseOwnedByDeadLocalProcess(session.lease, options) ||
|
|
51
|
+
!isSessionLeaseFresh(session.lease, options)) {
|
|
36
52
|
return undefined;
|
|
37
53
|
}
|
|
38
54
|
return [
|
|
@@ -41,4 +57,16 @@ export function getSessionLeaseConflict(session, owner, options) {
|
|
|
41
57
|
'Wait for the other client to finish or use a different session.',
|
|
42
58
|
].join(' ');
|
|
43
59
|
}
|
|
60
|
+
function defaultIsProcessAlive(pid) {
|
|
61
|
+
try {
|
|
62
|
+
process.kill(pid, 0);
|
|
63
|
+
return true;
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
if (typeof error === 'object' && error && 'code' in error && error.code === 'ESRCH') {
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
return true;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
44
72
|
//# sourceMappingURL=session-lease.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lease.js","sourceRoot":"","sources":["../../../../src/core/chat/session-lease.ts"],"names":[],"mappings":"AAEA,MAAM,oCAAoC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"session-lease.js","sourceRoot":"","sources":["../../../../src/core/chat/session-lease.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ export type SubmitChatSessionPromptArgs = {
|
|
|
9
9
|
sessionId: string;
|
|
10
10
|
prompt: string;
|
|
11
11
|
apiKey?: string;
|
|
12
|
+
systemContext?: string;
|
|
13
|
+
memoryMaintenanceMode?: 'none' | 'background' | 'inline';
|
|
12
14
|
onEvent?: (event: AgentLoopEvent) => void;
|
|
13
15
|
onCompactionStatus?: (event: {
|
|
14
16
|
status: 'running' | 'finished' | 'failed';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAmB,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhF,OAAO,EAAqE,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEnI,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,CAAC;IACzD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAChJ,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5G,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B;;;;GAsN9E;AA+ED,wBAAgB,qBAAqB,CAAC,kBAAkB,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,QAgBhH"}
|