@nervekit/orchestrator 0.2.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{server.d.ts → app/orchestrator-state.d.ts} +11 -17
- package/dist/app/orchestrator-state.d.ts.map +1 -0
- package/dist/app/orchestrator-state.js +105 -0
- package/dist/app/orchestrator-state.js.map +1 -0
- package/dist/app/server.d.ts +5 -0
- package/dist/app/server.d.ts.map +1 -0
- package/dist/{server.js → app/server.js} +6 -112
- package/dist/app/server.js.map +1 -0
- package/dist/app/version.d.ts.map +1 -0
- package/dist/app/version.js.map +1 -0
- package/dist/domains/agents/agent-lifecycle.service.d.ts +1 -1
- package/dist/domains/agents/agent-lifecycle.service.d.ts.map +1 -1
- package/dist/domains/agents/prompting/index.d.ts +4 -0
- package/dist/domains/agents/prompting/index.d.ts.map +1 -0
- package/dist/domains/agents/prompting/index.js +4 -0
- package/dist/domains/agents/prompting/index.js.map +1 -0
- package/dist/domains/agents/prompting/nerve-system-prompt.d.ts.map +1 -0
- package/dist/{nerve-system-prompt.js → domains/agents/prompting/nerve-system-prompt.js} +4 -2
- package/dist/domains/agents/prompting/nerve-system-prompt.js.map +1 -0
- package/dist/domains/agents/prompting/prompt-text.d.ts.map +1 -0
- package/dist/domains/agents/prompting/prompt-text.js.map +1 -0
- package/dist/domains/agents/prompting/resource-loader.d.ts.map +1 -0
- package/dist/{resource-loader.js → domains/agents/prompting/resource-loader.js} +1 -1
- package/dist/domains/agents/prompting/resource-loader.js.map +1 -0
- package/dist/domains/agents/run/agent-run-session.d.ts.map +1 -1
- package/dist/domains/agents/run/agent-run-session.js +4 -2
- package/dist/domains/agents/run/agent-run-session.js.map +1 -1
- package/dist/domains/agents/run/agent-runner.d.ts +7 -7
- package/dist/domains/agents/run/agent-runner.d.ts.map +1 -1
- package/dist/domains/agents/run/agent-runner.js +16 -234
- package/dist/domains/agents/run/agent-runner.js.map +1 -1
- package/dist/domains/agents/run/auto-compaction-runner.d.ts +19 -0
- package/dist/domains/agents/run/auto-compaction-runner.d.ts.map +1 -0
- package/dist/domains/agents/run/auto-compaction-runner.js +105 -0
- package/dist/domains/agents/run/auto-compaction-runner.js.map +1 -0
- package/dist/domains/agents/run/explore-helpers.d.ts.map +1 -1
- package/dist/domains/agents/run/explore-helpers.js +73 -16
- package/dist/domains/agents/run/explore-helpers.js.map +1 -1
- package/dist/domains/agents/run/inline-command-results.d.ts.map +1 -1
- package/dist/domains/agents/run/inline-command-results.js +1 -2
- package/dist/domains/agents/run/inline-command-results.js.map +1 -1
- package/dist/domains/agents/run/inline-command-runner.d.ts +19 -0
- package/dist/domains/agents/run/inline-command-runner.d.ts.map +1 -0
- package/dist/domains/agents/run/inline-command-runner.js +168 -0
- package/dist/domains/agents/run/inline-command-runner.js.map +1 -0
- package/dist/domains/agents/run/interrupted-run-recovery.d.ts +1 -1
- package/dist/domains/agents/run/interrupted-run-recovery.d.ts.map +1 -1
- package/dist/domains/agents/run/subagent-runner.d.ts +4 -2
- package/dist/domains/agents/run/subagent-runner.d.ts.map +1 -1
- package/dist/domains/agents/run/subagent-runner.js +13 -7
- package/dist/domains/agents/run/subagent-runner.js.map +1 -1
- package/dist/domains/agents/run/system-prompt-builder.d.ts +1 -1
- package/dist/domains/agents/run/system-prompt-builder.d.ts.map +1 -1
- package/dist/domains/agents/run/system-prompt-builder.js +2 -2
- package/dist/domains/agents/run/system-prompt-builder.js.map +1 -1
- package/dist/domains/agents/run/tool-draft-progress.d.ts +4 -0
- package/dist/domains/agents/run/tool-draft-progress.d.ts.map +1 -1
- package/dist/domains/agents/run/tool-draft-progress.js +114 -2
- package/dist/domains/agents/run/tool-draft-progress.js.map +1 -1
- package/dist/{auth.d.ts → domains/auth/auth-manager.d.ts} +2 -2
- package/dist/domains/auth/auth-manager.d.ts.map +1 -0
- package/dist/{auth.js → domains/auth/auth-manager.js} +1 -1
- package/dist/domains/auth/auth-manager.js.map +1 -0
- package/dist/{credential-crypto.d.ts → domains/auth/credential-key.service.d.ts} +1 -1
- package/dist/domains/auth/credential-key.service.d.ts.map +1 -0
- package/dist/{credential-crypto.js → domains/auth/credential-key.service.js} +2 -2
- package/dist/domains/auth/credential-key.service.js.map +1 -0
- package/dist/domains/auth/index.d.ts +4 -0
- package/dist/domains/auth/index.d.ts.map +1 -0
- package/dist/domains/auth/index.js +4 -0
- package/dist/domains/auth/index.js.map +1 -0
- package/dist/{oauth-flow.d.ts → domains/auth/oauth-flow-manager.d.ts} +3 -3
- package/dist/domains/auth/oauth-flow-manager.d.ts.map +1 -0
- package/dist/{oauth-flow.js → domains/auth/oauth-flow-manager.js} +2 -2
- package/dist/domains/auth/oauth-flow-manager.js.map +1 -0
- package/dist/domains/conversations/conversation-lifecycle.service.d.ts +1 -1
- package/dist/domains/conversations/conversation-lifecycle.service.d.ts.map +1 -1
- package/dist/domains/conversations/conversation-lifecycle.service.js +21 -4
- package/dist/domains/conversations/conversation-lifecycle.service.js.map +1 -1
- package/dist/domains/conversations/conversation-query.service.d.ts +2 -2
- package/dist/domains/conversations/conversation-query.service.d.ts.map +1 -1
- package/dist/domains/conversations/conversation-query.service.js +6 -2
- package/dist/domains/conversations/conversation-query.service.js.map +1 -1
- package/dist/domains/conversations/conversation-runtime.d.ts +2 -0
- package/dist/domains/conversations/conversation-runtime.d.ts.map +1 -1
- package/dist/domains/conversations/conversation-runtime.js +36 -2
- package/dist/domains/conversations/conversation-runtime.js.map +1 -1
- package/dist/domains/conversations/operations/import-service.d.ts.map +1 -1
- package/dist/domains/conversations/operations/import-service.js +1 -0
- package/dist/domains/conversations/operations/import-service.js.map +1 -1
- package/dist/domains/git/git-service.d.ts +1 -0
- package/dist/domains/git/git-service.d.ts.map +1 -1
- package/dist/domains/git/git-service.js +53 -0
- package/dist/domains/git/git-service.js.map +1 -1
- package/dist/domains/human-input/human-input-resolution.service.d.ts +1 -1
- package/dist/domains/human-input/human-input-resolution.service.d.ts.map +1 -1
- package/dist/domains/pinned-commands/pinned-command.service.d.ts +3 -1
- package/dist/domains/pinned-commands/pinned-command.service.d.ts.map +1 -1
- package/dist/domains/pinned-commands/pinned-command.service.js +26 -3
- package/dist/domains/pinned-commands/pinned-command.service.js.map +1 -1
- package/dist/domains/plans/plan-service.d.ts +2 -0
- package/dist/domains/plans/plan-service.d.ts.map +1 -1
- package/dist/domains/plans/plan-service.js +31 -6
- package/dist/domains/plans/plan-service.js.map +1 -1
- package/dist/domains/projects/prune-conversations.service.d.ts +1 -1
- package/dist/domains/projects/prune-conversations.service.d.ts.map +1 -1
- package/dist/domains/tasks/index.d.ts +1 -0
- package/dist/domains/tasks/index.d.ts.map +1 -1
- package/dist/domains/tasks/index.js +1 -0
- package/dist/domains/tasks/index.js.map +1 -1
- package/dist/domains/tasks/task-launch-config.store.d.ts +1 -1
- package/dist/domains/tasks/task-launch-config.store.d.ts.map +1 -1
- package/dist/domains/tasks/task-manager-orphan.d.ts +4 -1
- package/dist/domains/tasks/task-manager-orphan.d.ts.map +1 -1
- package/dist/domains/tasks/task-manager-orphan.js +100 -1
- package/dist/domains/tasks/task-manager-orphan.js.map +1 -1
- package/dist/domains/tasks/task-manager-start.d.ts.map +1 -1
- package/dist/domains/tasks/task-manager-start.js +46 -0
- package/dist/domains/tasks/task-manager-start.js.map +1 -1
- package/dist/domains/tasks/task-manager.d.ts +24 -3
- package/dist/domains/tasks/task-manager.d.ts.map +1 -1
- package/dist/domains/tasks/task-manager.js +10 -1
- package/dist/domains/tasks/task-manager.js.map +1 -1
- package/dist/domains/tasks/task-notification.service.d.ts +2 -2
- package/dist/domains/tasks/task-notification.service.d.ts.map +1 -1
- package/dist/domains/tasks/task-port-inspector.d.ts +7 -0
- package/dist/domains/tasks/task-port-inspector.d.ts.map +1 -0
- package/dist/domains/tasks/task-port-inspector.js +286 -0
- package/dist/domains/tasks/task-port-inspector.js.map +1 -0
- package/dist/domains/tasks/task-summary-format.d.ts +1 -0
- package/dist/domains/tasks/task-summary-format.d.ts.map +1 -1
- package/dist/domains/tasks/task-summary-format.js +14 -0
- package/dist/domains/tasks/task-summary-format.js.map +1 -1
- package/dist/domains/tasks/task-supervisor.d.ts +3 -1
- package/dist/domains/tasks/task-supervisor.d.ts.map +1 -1
- package/dist/domains/tasks/task-supervisor.js +3 -0
- package/dist/domains/tasks/task-supervisor.js.map +1 -1
- package/dist/domains/tools/agent-tool-adapter.d.ts.map +1 -1
- package/dist/domains/tools/agent-tool-adapter.js +1 -2
- package/dist/domains/tools/agent-tool-adapter.js.map +1 -1
- package/dist/domains/tools/orchestration-tool-dispatcher-handlers.d.ts.map +1 -1
- package/dist/domains/tools/orchestration-tool-dispatcher-handlers.js +24 -4
- package/dist/domains/tools/orchestration-tool-dispatcher-handlers.js.map +1 -1
- package/dist/domains/tools/orchestration-tool-dispatcher.d.ts.map +1 -1
- package/dist/domains/tools/orchestration-tool-dispatcher.js +2 -1
- package/dist/domains/tools/orchestration-tool-dispatcher.js.map +1 -1
- package/dist/domains/tools/tool-call-transcript-preview.d.ts +3 -0
- package/dist/domains/tools/tool-call-transcript-preview.d.ts.map +1 -0
- package/dist/domains/tools/tool-call-transcript-preview.js +442 -0
- package/dist/domains/tools/tool-call-transcript-preview.js.map +1 -0
- package/dist/domains/tools/tool-call.repository.d.ts.map +1 -1
- package/dist/domains/tools/tool-call.repository.js +6 -9
- package/dist/domains/tools/tool-call.repository.js.map +1 -1
- package/dist/domains/tools/tool-executor.service.d.ts +1 -1
- package/dist/domains/tools/tool-executor.service.d.ts.map +1 -1
- package/dist/domains/tools/tool-executor.service.js +3 -2
- package/dist/domains/tools/tool-executor.service.js.map +1 -1
- package/dist/domains/tools/tool-result-bounds.d.ts.map +1 -1
- package/dist/domains/tools/tool-result-bounds.js +23 -9
- package/dist/domains/tools/tool-result-bounds.js.map +1 -1
- package/dist/domains/tools/tool-result-model-limits.d.ts +2 -0
- package/dist/domains/tools/tool-result-model-limits.d.ts.map +1 -0
- package/dist/domains/tools/tool-result-model-limits.js +84 -0
- package/dist/domains/tools/tool-result-model-limits.js.map +1 -0
- package/dist/domains/tools/tool-service.d.ts +4 -2
- package/dist/domains/tools/tool-service.d.ts.map +1 -1
- package/dist/domains/tools/tool-service.js +2 -1
- package/dist/domains/tools/tool-service.js.map +1 -1
- package/dist/domains/transcription/transcription.service.d.ts +1 -1
- package/dist/domains/transcription/transcription.service.d.ts.map +1 -1
- package/dist/domains/transcription/transcription.service.js.map +1 -1
- package/dist/domains/usage/subscription-usage-service.d.ts +1 -1
- package/dist/domains/usage/subscription-usage-service.d.ts.map +1 -1
- package/dist/http/request-context.d.ts +1 -1
- package/dist/http/request-context.d.ts.map +1 -1
- package/dist/http/static-files.d.ts +1 -1
- package/dist/http/static-files.d.ts.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/infrastructure/diagnostics/crash-reports.d.ts +14 -0
- package/dist/infrastructure/diagnostics/crash-reports.d.ts.map +1 -0
- package/dist/infrastructure/diagnostics/crash-reports.js +199 -0
- package/dist/infrastructure/diagnostics/crash-reports.js.map +1 -0
- package/dist/infrastructure/diagnostics/index.d.ts +3 -0
- package/dist/infrastructure/diagnostics/index.d.ts.map +1 -0
- package/dist/infrastructure/diagnostics/index.js +3 -0
- package/dist/infrastructure/diagnostics/index.js.map +1 -0
- package/dist/infrastructure/diagnostics/logging.d.ts.map +1 -0
- package/dist/{logging.js → infrastructure/diagnostics/logging.js} +1 -1
- package/dist/infrastructure/diagnostics/logging.js.map +1 -0
- package/dist/{secrets.d.ts → infrastructure/secrets/index.d.ts} +1 -1
- package/dist/infrastructure/secrets/index.d.ts.map +1 -0
- package/dist/{secrets.js → infrastructure/secrets/index.js} +2 -2
- package/dist/infrastructure/secrets/index.js.map +1 -0
- package/dist/main.js +43 -7
- package/dist/main.js.map +1 -1
- package/dist/routes/agent-routes.d.ts +1 -1
- package/dist/routes/agent-routes.d.ts.map +1 -1
- package/dist/routes/agent-routes.js.map +1 -1
- package/dist/routes/auth-routes.d.ts +1 -1
- package/dist/routes/auth-routes.d.ts.map +1 -1
- package/dist/routes/auth-routes.js.map +1 -1
- package/dist/routes/completion-routes.d.ts +1 -1
- package/dist/routes/completion-routes.d.ts.map +1 -1
- package/dist/routes/completion-routes.js.map +1 -1
- package/dist/routes/conversation-routes.d.ts +1 -1
- package/dist/routes/conversation-routes.d.ts.map +1 -1
- package/dist/routes/conversation-routes.js.map +1 -1
- package/dist/routes/filesystem-routes.d.ts +1 -1
- package/dist/routes/filesystem-routes.d.ts.map +1 -1
- package/dist/routes/filesystem-routes.js.map +1 -1
- package/dist/routes/git-routes.d.ts +1 -1
- package/dist/routes/git-routes.d.ts.map +1 -1
- package/dist/routes/git-routes.js +4 -0
- package/dist/routes/git-routes.js.map +1 -1
- package/dist/routes/index.d.ts +1 -1
- package/dist/routes/index.d.ts.map +1 -1
- package/dist/routes/log-routes.d.ts +1 -1
- package/dist/routes/log-routes.d.ts.map +1 -1
- package/dist/routes/log-routes.js.map +1 -1
- package/dist/routes/model-routes.d.ts +1 -1
- package/dist/routes/model-routes.d.ts.map +1 -1
- package/dist/routes/project-routes.d.ts +1 -1
- package/dist/routes/project-routes.d.ts.map +1 -1
- package/dist/routes/project-routes.js +7 -1
- package/dist/routes/project-routes.js.map +1 -1
- package/dist/routes/provider-catalog-routes.d.ts +1 -1
- package/dist/routes/provider-catalog-routes.d.ts.map +1 -1
- package/dist/routes/provider-catalog-routes.js +1 -1
- package/dist/routes/provider-catalog-routes.js.map +1 -1
- package/dist/routes/settings-routes.d.ts +1 -1
- package/dist/routes/settings-routes.d.ts.map +1 -1
- package/dist/routes/settings-routes.js.map +1 -1
- package/dist/routes/status-routes.d.ts +1 -1
- package/dist/routes/status-routes.d.ts.map +1 -1
- package/dist/routes/status-routes.js +1 -1
- package/dist/routes/status-routes.js.map +1 -1
- package/dist/routes/storage-routes.d.ts +1 -1
- package/dist/routes/storage-routes.d.ts.map +1 -1
- package/dist/routes/storage-routes.js.map +1 -1
- package/dist/routes/task-routes.d.ts +1 -1
- package/dist/routes/task-routes.d.ts.map +1 -1
- package/dist/routes/task-routes.js.map +1 -1
- package/dist/routes/tool-routes.d.ts +1 -1
- package/dist/routes/tool-routes.d.ts.map +1 -1
- package/dist/routes/tool-routes.js +47 -19
- package/dist/routes/tool-routes.js.map +1 -1
- package/dist/routes/transcription-routes.d.ts +1 -1
- package/dist/routes/transcription-routes.d.ts.map +1 -1
- package/dist/routes/transcription-routes.js.map +1 -1
- package/dist/routes/worker-routes.d.ts +1 -1
- package/dist/routes/worker-routes.d.ts.map +1 -1
- package/dist/routes/worker-routes.js.map +1 -1
- package/dist/runtime/runtime-composition.d.ts +3 -3
- package/dist/runtime/runtime-composition.d.ts.map +1 -1
- package/dist/runtime/runtime-composition.js.map +1 -1
- package/dist/{registry.d.ts → runtime/runtime-registry.d.ts} +148 -33
- package/dist/runtime/runtime-registry.d.ts.map +1 -0
- package/dist/{registry.js → runtime/runtime-registry.js} +7 -12
- package/dist/runtime/runtime-registry.js.map +1 -0
- package/dist/runtime/runtime-state.d.ts +1 -0
- package/dist/runtime/runtime-state.d.ts.map +1 -1
- package/dist/runtime/types.d.ts.map +1 -0
- package/dist/{registry → runtime}/types.js.map +1 -1
- package/dist/web/assets/{dist-BaA_eB0I.js → dist-DuVh-9Yy.js} +1 -1
- package/dist/web/assets/index-bmeeVJYV.css +2 -0
- package/dist/web/assets/index-hdM6dgBG.js +192 -0
- package/dist/web/index.html +2 -2
- package/dist/web/sw.js +1 -1
- package/package.json +4 -4
- package/dist/auth.d.ts.map +0 -1
- package/dist/auth.js.map +0 -1
- package/dist/credential-crypto.d.ts.map +0 -1
- package/dist/credential-crypto.js.map +0 -1
- package/dist/logging.d.ts.map +0 -1
- package/dist/logging.js.map +0 -1
- package/dist/nerve-system-prompt.d.ts.map +0 -1
- package/dist/nerve-system-prompt.js.map +0 -1
- package/dist/oauth-flow.d.ts.map +0 -1
- package/dist/oauth-flow.js.map +0 -1
- package/dist/prompt-text.d.ts.map +0 -1
- package/dist/prompt-text.js.map +0 -1
- package/dist/registry/types.d.ts.map +0 -1
- package/dist/registry.d.ts.map +0 -1
- package/dist/registry.js.map +0 -1
- package/dist/resource-loader.d.ts.map +0 -1
- package/dist/resource-loader.js.map +0 -1
- package/dist/secrets.d.ts.map +0 -1
- package/dist/secrets.js.map +0 -1
- package/dist/server.d.ts.map +0 -1
- package/dist/server.js.map +0 -1
- package/dist/version.d.ts.map +0 -1
- package/dist/version.js.map +0 -1
- package/dist/web/assets/index-C45Kmr75.css +0 -2
- package/dist/web/assets/index-DHfIkEia.js +0 -167
- /package/dist/{version.d.ts → app/version.d.ts} +0 -0
- /package/dist/{version.js → app/version.js} +0 -0
- /package/dist/{nerve-system-prompt.d.ts → domains/agents/prompting/nerve-system-prompt.d.ts} +0 -0
- /package/dist/{prompt-text.d.ts → domains/agents/prompting/prompt-text.d.ts} +0 -0
- /package/dist/{prompt-text.js → domains/agents/prompting/prompt-text.js} +0 -0
- /package/dist/{resource-loader.d.ts → domains/agents/prompting/resource-loader.d.ts} +0 -0
- /package/dist/{logging.d.ts → infrastructure/diagnostics/logging.d.ts} +0 -0
- /package/dist/{registry → runtime}/types.d.ts +0 -0
- /package/dist/{registry → runtime}/types.js +0 -0
|
@@ -27,14 +27,37 @@ export class PinnedCommandService {
|
|
|
27
27
|
await this.repository.replace(projectId, [...existing, record]);
|
|
28
28
|
return record;
|
|
29
29
|
}
|
|
30
|
+
async update(projectId, commandId, request) {
|
|
31
|
+
this.getProject(projectId);
|
|
32
|
+
const existing = await this.repository.list(projectId);
|
|
33
|
+
const index = existing.findIndex((command) => command.id === commandId);
|
|
34
|
+
if (index === -1)
|
|
35
|
+
throw this.notFound();
|
|
36
|
+
const current = existing[index];
|
|
37
|
+
if (!current)
|
|
38
|
+
throw this.notFound();
|
|
39
|
+
const updated = {
|
|
40
|
+
...current,
|
|
41
|
+
...(request.label ? { label: request.label } : { label: undefined }),
|
|
42
|
+
command: request.command,
|
|
43
|
+
...(request.cwd ? { cwd: request.cwd } : { cwd: undefined }),
|
|
44
|
+
updatedAt: new Date().toISOString(),
|
|
45
|
+
};
|
|
46
|
+
const next = [...existing];
|
|
47
|
+
next[index] = updated;
|
|
48
|
+
await this.repository.replace(projectId, next);
|
|
49
|
+
return updated;
|
|
50
|
+
}
|
|
30
51
|
async remove(projectId, commandId) {
|
|
31
52
|
this.getProject(projectId);
|
|
32
53
|
const existing = await this.repository.list(projectId);
|
|
33
54
|
const filtered = existing.filter((command) => command.id !== commandId);
|
|
34
|
-
if (filtered.length === existing.length)
|
|
35
|
-
throw
|
|
36
|
-
}
|
|
55
|
+
if (filtered.length === existing.length)
|
|
56
|
+
throw this.notFound();
|
|
37
57
|
await this.repository.replace(projectId, filtered);
|
|
38
58
|
}
|
|
59
|
+
notFound() {
|
|
60
|
+
return new HttpError(404, "PINNED_COMMAND_NOT_FOUND", "Pinned command not found.");
|
|
61
|
+
}
|
|
39
62
|
}
|
|
40
63
|
//# sourceMappingURL=pinned-command.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pinned-command.service.js","sourceRoot":"","sources":["../../../src/domains/pinned-commands/pinned-command.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,
|
|
1
|
+
{"version":3,"file":"pinned-command.service.js","sourceRoot":"","sources":["../../../src/domains/pinned-commands/pinned-command.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export type PlanReviewResult = {
|
|
|
11
11
|
text: string;
|
|
12
12
|
}>;
|
|
13
13
|
};
|
|
14
|
+
export declare function planReviewPreview(review: PlanReviewRecord): PlanReviewRecord;
|
|
14
15
|
export type SetAgentMode = (agentId: string, mode: Mode, reason: string) => Promise<AgentRecord>;
|
|
15
16
|
export declare class PlanService {
|
|
16
17
|
private readonly storage;
|
|
@@ -43,6 +44,7 @@ export declare class PlanService {
|
|
|
43
44
|
listPlanFiles(agent: AgentRecord): Promise<string[]>;
|
|
44
45
|
createPlanReview(toolCall: ToolCallRecord, agent: AgentRecord, args: Record<string, unknown>): Promise<PlanReviewRecord>;
|
|
45
46
|
presentPlan(toolCall: ToolCallRecord, agent: AgentRecord, args: Record<string, unknown>, signal?: AbortSignal): Promise<PlanReviewResult>;
|
|
47
|
+
waitForPlanReviewResult(reviewId: string, signal?: AbortSignal): Promise<PlanReviewResult>;
|
|
46
48
|
planReviewResult(review: PlanReviewRecord): PlanReviewResult;
|
|
47
49
|
acceptPlanReview(reviewId: string, feedback?: string): Promise<PlanReviewRecord>;
|
|
48
50
|
acceptPlanReviewInNewChat(reviewId: string, feedback?: string): Promise<PlanReviewRecord>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-service.d.ts","sourceRoot":"","sources":["../../../src/domains/plans/plan-service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,IAAI,EACT,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAchF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC;IACX,aAAa,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvD,CAAC;
|
|
1
|
+
{"version":3,"file":"plan-service.d.ts","sourceRoot":"","sources":["../../../src/domains/plans/plan-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,19 @@ import { createId, planReviewRecordSchema, } from "@nervekit/shared";
|
|
|
4
4
|
import { appendJsonLine, pathExists, readJsonLines, rewriteJsonLines, } from "../../infrastructure/storage/index.js";
|
|
5
5
|
import { isPathInsidePlanDir, planDirForStorageHome, planSlugFromPath, resolvePlanPath, } from "./plan-paths.js";
|
|
6
6
|
const UNRESOLVED_PLAN_MARKER = /\[!(QUESTION|DECISION)\]/i;
|
|
7
|
+
const PLAN_REVIEW_CONTENT_PREVIEW_LINES = 10;
|
|
8
|
+
function firstLines(text, count) {
|
|
9
|
+
const lines = text.split("\n");
|
|
10
|
+
return lines.length > count ? lines.slice(0, count).join("\n") : text;
|
|
11
|
+
}
|
|
12
|
+
export function planReviewPreview(review) {
|
|
13
|
+
return review.content === undefined
|
|
14
|
+
? review
|
|
15
|
+
: {
|
|
16
|
+
...review,
|
|
17
|
+
content: firstLines(review.content, PLAN_REVIEW_CONTENT_PREVIEW_LINES),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
7
20
|
export class PlanService {
|
|
8
21
|
storage;
|
|
9
22
|
events;
|
|
@@ -90,7 +103,9 @@ export class PlanService {
|
|
|
90
103
|
updatedAt: now,
|
|
91
104
|
};
|
|
92
105
|
await this.upsertPlanReview(review);
|
|
93
|
-
await this.events.publish("plan_review.requested", {
|
|
106
|
+
await this.events.publish("plan_review.requested", {
|
|
107
|
+
planReview: planReviewPreview(review),
|
|
108
|
+
});
|
|
94
109
|
return review;
|
|
95
110
|
}
|
|
96
111
|
async presentPlan(toolCall, agent, args, signal) {
|
|
@@ -98,6 +113,10 @@ export class PlanService {
|
|
|
98
113
|
const resolved = await this.waitForPlanReview(review.id, signal);
|
|
99
114
|
return this.planReviewResult(resolved);
|
|
100
115
|
}
|
|
116
|
+
async waitForPlanReviewResult(reviewId, signal) {
|
|
117
|
+
const resolved = await this.waitForPlanReview(reviewId, signal);
|
|
118
|
+
return this.planReviewResult(resolved);
|
|
119
|
+
}
|
|
101
120
|
planReviewResult(review) {
|
|
102
121
|
return {
|
|
103
122
|
review,
|
|
@@ -116,14 +135,16 @@ export class PlanService {
|
|
|
116
135
|
const review = this.getPendingPlanReview(reviewId);
|
|
117
136
|
await this.setAgentMode(review.agentId, "coding", "Plan accepted by user.");
|
|
118
137
|
const updated = await this.resolvePlanReview(review, "accepted", feedback);
|
|
119
|
-
await this.events.publish("plan_review.accepted", {
|
|
138
|
+
await this.events.publish("plan_review.accepted", {
|
|
139
|
+
planReview: planReviewPreview(updated),
|
|
140
|
+
});
|
|
120
141
|
return updated;
|
|
121
142
|
}
|
|
122
143
|
async acceptPlanReviewInNewChat(reviewId, feedback) {
|
|
123
144
|
const review = this.getPendingPlanReview(reviewId);
|
|
124
145
|
const updated = await this.resolvePlanReview(review, "accepted_in_new_chat", feedback);
|
|
125
146
|
await this.events.publish("plan_review.accepted_in_new_chat", {
|
|
126
|
-
planReview: updated,
|
|
147
|
+
planReview: planReviewPreview(updated),
|
|
127
148
|
});
|
|
128
149
|
return updated;
|
|
129
150
|
}
|
|
@@ -131,20 +152,24 @@ export class PlanService {
|
|
|
131
152
|
const review = this.getPendingPlanReview(reviewId);
|
|
132
153
|
const updated = await this.resolvePlanReview(review, "changes_requested", feedback);
|
|
133
154
|
await this.events.publish("plan_review.changes_requested", {
|
|
134
|
-
planReview: updated,
|
|
155
|
+
planReview: planReviewPreview(updated),
|
|
135
156
|
});
|
|
136
157
|
return updated;
|
|
137
158
|
}
|
|
138
159
|
async rejectPlanReview(reviewId, feedback) {
|
|
139
160
|
const review = this.getPendingPlanReview(reviewId);
|
|
140
161
|
const updated = await this.resolvePlanReview(review, "changes_requested", feedback ?? "Plan rejected by user.");
|
|
141
|
-
await this.events.publish("plan_review.rejected", {
|
|
162
|
+
await this.events.publish("plan_review.rejected", {
|
|
163
|
+
planReview: planReviewPreview(updated),
|
|
164
|
+
});
|
|
142
165
|
return updated;
|
|
143
166
|
}
|
|
144
167
|
async discardPlanReview(reviewId, feedback) {
|
|
145
168
|
const review = this.getPendingPlanReview(reviewId);
|
|
146
169
|
const updated = await this.resolvePlanReview(review, "discarded", feedback);
|
|
147
|
-
await this.events.publish("plan_review.discarded", {
|
|
170
|
+
await this.events.publish("plan_review.discarded", {
|
|
171
|
+
planReview: planReviewPreview(updated),
|
|
172
|
+
});
|
|
148
173
|
return updated;
|
|
149
174
|
}
|
|
150
175
|
async forceExitAgentPlanning(agentId, reason) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-service.js","sourceRoot":"","sources":["../../../src/domains/plans/plan-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plan-service.js","sourceRoot":"","sources":["../../../src/domains/plans/plan-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AgentRecord, ConversationRecord, ProjectRecord, PruneProjectConversationsRequest, PruneProjectConversationsResponse, TaskRecord } from "@nervekit/shared";
|
|
2
|
+
import type { ApplicationLogger } from "../../infrastructure/diagnostics/index.js";
|
|
2
3
|
import type { EventBus } from "../../infrastructure/events/index.js";
|
|
3
|
-
import type { ApplicationLogger } from "../../logging.js";
|
|
4
4
|
import type { ConversationRepository } from "../conversations/index.js";
|
|
5
5
|
export interface PruneConversationsTaskPort {
|
|
6
6
|
activeTasksForConversations(conversationIds: string[]): TaskRecord[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune-conversations.service.d.ts","sourceRoot":"","sources":["../../../src/domains/projects/prune-conversations.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,gCAAgC,EAChC,iCAAiC,EACjC,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"prune-conversations.service.d.ts","sourceRoot":"","sources":["../../../src/domains/projects/prune-conversations.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,gCAAgC,EAChC,iCAAiC,EACjC,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE,MAAM,WAAW,0BAA0B;IACzC,2BAA2B,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;IACrE,mCAAmC,CACjC,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,6BAA6B,CAC3B,eAAe,EAAE,MAAM,EAAE,EACzB,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED,MAAM,WAAW,0BAA0B;IACzC,6BAA6B,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,gCAAgC;IAC/C,iCAAiC,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7E;AAED,MAAM,WAAW,oCAAoC;IACnD,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,aAAa,CAAC;IACjD,iBAAiB,EAAE,MAAM,kBAAkB,EAAE,CAAC;IAC9C,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACjC,KAAK,EAAE,0BAA0B,CAAC;IAClC,KAAK,EAAE,0BAA0B,CAAC;IAClC,KAAK,EAAE,0BAA0B,CAAC;IAClC,WAAW,EAAE,gCAAgC,CAAC;IAC9C,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,kBAAkB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,qBAAa,gCAAgC;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,oCAAoC;IAEjE,yBAAyB,CAC7B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,gCAGR,GACA,OAAO,CAAC,iCAAiC,CAAC;IAkF7C,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,oBAAoB;CAa7B"}
|
|
@@ -4,6 +4,7 @@ export { SecretTaskLaunchConfigStore, taskLaunchConfigSecretName, UnconfiguredTa
|
|
|
4
4
|
export type { TaskLogCursor, TaskLogStream } from "./task-log.service.js";
|
|
5
5
|
export { createTaskLogCursor, MAX_BUFFERED_LOG_LINE_CHARS, TaskLogService, } from "./task-log.service.js";
|
|
6
6
|
export { TaskNotificationService } from "./task-notification.service.js";
|
|
7
|
+
export { dedupeListeningPorts, formatListeningPort, inspectPortListeners, inspectRuntimeListeningPorts, isSameProcessIdentity, } from "./task-port-inspector.js";
|
|
7
8
|
export { TaskReadinessService } from "./task-readiness.service.js";
|
|
8
9
|
export { isActiveTaskStatus, isOrphanedTaskStatus, isStoppableTaskStatus, } from "./task-status.js";
|
|
9
10
|
export type { SpawnedManagedTask, SpawnManagedTaskOptions, TaskSupervisor, TerminateTaskOptions, TerminateTaskResult, } from "./task-supervisor.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,oBAAoB,GACrB,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,oBAAoB,GACrB,MAAM,sBAAsB,CAAC"}
|
|
@@ -2,6 +2,7 @@ export { TaskRepository } from "./task.repository.js";
|
|
|
2
2
|
export { SecretTaskLaunchConfigStore, taskLaunchConfigSecretName, UnconfiguredTaskLaunchConfigStore, } from "./task-launch-config.store.js";
|
|
3
3
|
export { createTaskLogCursor, MAX_BUFFERED_LOG_LINE_CHARS, TaskLogService, } from "./task-log.service.js";
|
|
4
4
|
export { TaskNotificationService } from "./task-notification.service.js";
|
|
5
|
+
export { dedupeListeningPorts, formatListeningPort, inspectPortListeners, inspectRuntimeListeningPorts, isSameProcessIdentity, } from "./task-port-inspector.js";
|
|
5
6
|
export { TaskReadinessService } from "./task-readiness.service.js";
|
|
6
7
|
export { isActiveTaskStatus, isOrphanedTaskStatus, isStoppableTaskStatus, } from "./task-status.js";
|
|
7
8
|
export { defaultTaskSupervisor, isTaskRuntimeTargetAlive, runtimeForChild, spawnManagedTask, terminateTask, terminateTaskRuntime, } from "./task-supervisor.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domains/tasks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,oBAAoB,GACrB,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domains/tasks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,oBAAoB,GACrB,MAAM,sBAAsB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type TaskLaunchConfig } from "@nervekit/shared";
|
|
2
|
-
import type { SecretProvider } from "../../secrets.js";
|
|
2
|
+
import type { SecretProvider } from "../../infrastructure/secrets/index.js";
|
|
3
3
|
export interface TaskLaunchConfigStore {
|
|
4
4
|
write(taskId: string, config: TaskLaunchConfig): Promise<void>;
|
|
5
5
|
read(taskId: string): Promise<TaskLaunchConfig | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-launch-config.store.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/task-launch-config.store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"task-launch-config.store.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/task-launch-config.store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAE5E,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAC5D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,qBAAa,2BAA4B,YAAW,qBAAqB;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,cAAc;IAE9C,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9D,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAsB3D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5C;AAED,qBAAa,iCACX,YAAW,qBAAqB;IAE1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,IAAI,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAM7C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CancelTaskRequest, TaskRecord, TaskRuntime } from "@nervekit/shared";
|
|
1
|
+
import type { CancelTaskRequest, TaskListeningPort, TaskRecord, TaskRuntime } from "@nervekit/shared";
|
|
2
2
|
import type { TaskManager } from "./task-manager.js";
|
|
3
3
|
export declare function markHydratedRecordOrphaned(this: TaskManager, record: TaskRecord): TaskRecord;
|
|
4
4
|
export declare function orphanedHydrateMessage(this: TaskManager, runtime: TaskRuntime | undefined): string;
|
|
@@ -7,6 +7,9 @@ export declare function orphanCleanupValidationError(this: TaskManager, runtime:
|
|
|
7
7
|
export declare function terminateRuntimeForCleanup(this: TaskManager, record: TaskRecord, runtime: TaskRuntime, signal: NodeJS.Signals): Promise<import("./task-supervisor.js").TerminateTaskResult>;
|
|
8
8
|
export declare function waitForRuntimeTargetExit(this: TaskManager, runtime: TaskRuntime, timeoutMs: number): Promise<boolean>;
|
|
9
9
|
export declare function isRuntimeTargetAlive(this: TaskManager, runtime: TaskRuntime): Promise<boolean>;
|
|
10
|
+
export declare function listeningPortsForOrphanCleanup(this: TaskManager, record: TaskRecord, runtime: TaskRuntime): Promise<TaskListeningPort[]>;
|
|
11
|
+
export declare function releaseOrphanedListeningPorts(this: TaskManager, record: TaskRecord, cleanupPorts: TaskListeningPort[]): Promise<TaskListeningPort[]>;
|
|
12
|
+
export declare function inspectPortListenersForCleanup(this: TaskManager, record: TaskRecord, cleanupPorts: TaskListeningPort[]): Promise<TaskListeningPort[]>;
|
|
10
13
|
export declare function finalizeOrphanCleanup(this: TaskManager, taskId: string, finalSignal: NodeJS.Signals, runtime: TaskRuntime, context?: Record<string, unknown>): Promise<TaskRecord>;
|
|
11
14
|
export declare function failOrphanCleanup(this: TaskManager, record: TaskRecord, message: string, context?: Record<string, unknown>): Promise<never>;
|
|
12
15
|
export declare function runtimeLogContext(this: TaskManager, runtime: TaskRuntime | undefined, extra?: Record<string, unknown>): Record<string, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-manager-orphan.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/task-manager-orphan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,UAAU,EACV,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"task-manager-orphan.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/task-manager-orphan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,EACV,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAWrD,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,GACjB,UAAU,CA8BZ;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,WAAW,GAAG,SAAS,GAC/B,MAAM,CAQR;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,UAAU,CAAC,CA6GrB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,WAAW,GAAG,SAAS,GAC/B,MAAM,GAAG,SAAS,CAkBpB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,CAAC,OAAO,+DAmBvB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAiB9B;AAED,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,iBAAiB,EAAE,GAChC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAgD9B;AAaD,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,iBAAiB,EAAE,GAChC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAc9B;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,CAAC,OAAO,EAC3B,OAAO,EAAE,WAAW,EACpB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,OAAO,CAAC,UAAU,CAAC,CAwCrB;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,OAAO,CAAC,KAAK,CAAC,CAmBhB;AAMD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAWzB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEtE"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { dedupeListeningPorts, formatListeningPort, isSameProcessIdentity, } from "./task-port-inspector.js";
|
|
1
2
|
function delay(ms) {
|
|
2
3
|
return new Promise((resolveDelay) => setTimeout(resolveDelay, ms));
|
|
3
4
|
}
|
|
@@ -49,6 +50,7 @@ export async function cleanupOrphanedTask(taskId, request) {
|
|
|
49
50
|
}
|
|
50
51
|
const runtime = record.runtime;
|
|
51
52
|
const initialSignal = request.signal ?? "SIGTERM";
|
|
53
|
+
const cleanupPorts = await this.listeningPortsForOrphanCleanup(record, runtime);
|
|
52
54
|
const timeoutMs = request.timeoutMs ?? 5000;
|
|
53
55
|
await this.events.publish("task.stop_requested", {
|
|
54
56
|
taskId: record.id,
|
|
@@ -67,8 +69,10 @@ export async function cleanupOrphanedTask(taskId, request) {
|
|
|
67
69
|
if (!result.attempted || result.error) {
|
|
68
70
|
await this.failOrphanCleanup(record, result.error ?? "Could not clean up orphaned task runtime target.", { method: result.method, signal: "SIGKILL" });
|
|
69
71
|
}
|
|
72
|
+
const releasedPorts = await this.releaseOrphanedListeningPorts(record, cleanupPorts);
|
|
70
73
|
return this.finalizeOrphanCleanup(record.id, "SIGKILL", runtime, {
|
|
71
74
|
method: result.method,
|
|
75
|
+
releasedPorts,
|
|
72
76
|
});
|
|
73
77
|
}
|
|
74
78
|
const initialResult = await this.terminateRuntimeForCleanup(record, runtime, initialSignal);
|
|
@@ -103,7 +107,10 @@ export async function cleanupOrphanedTask(taskId, request) {
|
|
|
103
107
|
});
|
|
104
108
|
}
|
|
105
109
|
}
|
|
106
|
-
|
|
110
|
+
const releasedPorts = await this.releaseOrphanedListeningPorts(record, cleanupPorts);
|
|
111
|
+
return this.finalizeOrphanCleanup(record.id, finalSignal, runtime, {
|
|
112
|
+
releasedPorts,
|
|
113
|
+
});
|
|
107
114
|
}
|
|
108
115
|
export function orphanCleanupValidationError(runtime) {
|
|
109
116
|
if (!runtime) {
|
|
@@ -165,6 +172,92 @@ export async function isRuntimeTargetAlive(runtime) {
|
|
|
165
172
|
return true;
|
|
166
173
|
}
|
|
167
174
|
}
|
|
175
|
+
export async function listeningPortsForOrphanCleanup(record, runtime) {
|
|
176
|
+
const persisted = runtime.listeningPorts ?? [];
|
|
177
|
+
try {
|
|
178
|
+
const detected = await this.supervisor.inspectRuntimeListeningPorts(runtime);
|
|
179
|
+
return dedupeListeningPorts([...persisted, ...detected]);
|
|
180
|
+
}
|
|
181
|
+
catch (error) {
|
|
182
|
+
await this.logger?.warn("Orphaned task listening-port inspection failed", {
|
|
183
|
+
taskId: record.id,
|
|
184
|
+
projectId: record.projectId,
|
|
185
|
+
conversationId: record.conversationId,
|
|
186
|
+
agentId: record.agentId,
|
|
187
|
+
error,
|
|
188
|
+
context: this.runtimeLogContext(runtime),
|
|
189
|
+
});
|
|
190
|
+
return dedupeListeningPorts(persisted);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
export async function releaseOrphanedListeningPorts(record, cleanupPorts) {
|
|
194
|
+
if (cleanupPorts.length === 0 || process.platform === "win32")
|
|
195
|
+
return [];
|
|
196
|
+
let current = await this.inspectPortListenersForCleanup(record, cleanupPorts);
|
|
197
|
+
const killedPids = new Set();
|
|
198
|
+
for (const expected of cleanupPorts) {
|
|
199
|
+
for (const actual of current) {
|
|
200
|
+
if (!isSameProcessIdentity(expected, actual) || !actual.pid)
|
|
201
|
+
continue;
|
|
202
|
+
if (killedPids.has(actual.pid))
|
|
203
|
+
continue;
|
|
204
|
+
killedPids.add(actual.pid);
|
|
205
|
+
try {
|
|
206
|
+
process.kill(actual.pid, "SIGKILL");
|
|
207
|
+
await this.logger?.warn("Released orphaned task listening port", {
|
|
208
|
+
taskId: record.id,
|
|
209
|
+
projectId: record.projectId,
|
|
210
|
+
conversationId: record.conversationId,
|
|
211
|
+
agentId: record.agentId,
|
|
212
|
+
context: {
|
|
213
|
+
port: formatListeningPort(actual),
|
|
214
|
+
pid: actual.pid,
|
|
215
|
+
processGroupId: actual.processGroupId,
|
|
216
|
+
},
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
catch (error) {
|
|
220
|
+
await this.logger?.warn("Failed to release orphaned task listening port", {
|
|
221
|
+
taskId: record.id,
|
|
222
|
+
projectId: record.projectId,
|
|
223
|
+
conversationId: record.conversationId,
|
|
224
|
+
agentId: record.agentId,
|
|
225
|
+
error,
|
|
226
|
+
context: {
|
|
227
|
+
port: formatListeningPort(actual),
|
|
228
|
+
pid: actual.pid,
|
|
229
|
+
processGroupId: actual.processGroupId,
|
|
230
|
+
},
|
|
231
|
+
});
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
if (killedPids.size > 0)
|
|
236
|
+
await delay(100);
|
|
237
|
+
current = await this.inspectPortListenersForCleanup(record, cleanupPorts);
|
|
238
|
+
return dedupeListeningPorts(cleanupPorts.filter((expected) => !current.some((actual) => sameEndpoint(expected, actual))));
|
|
239
|
+
}
|
|
240
|
+
function sameEndpoint(left, right) {
|
|
241
|
+
return (left.protocol === right.protocol &&
|
|
242
|
+
left.address === right.address &&
|
|
243
|
+
left.port === right.port);
|
|
244
|
+
}
|
|
245
|
+
export async function inspectPortListenersForCleanup(record, cleanupPorts) {
|
|
246
|
+
try {
|
|
247
|
+
return await this.supervisor.inspectPortListeners(cleanupPorts);
|
|
248
|
+
}
|
|
249
|
+
catch (error) {
|
|
250
|
+
await this.logger?.warn("Orphaned task port-listener recheck failed", {
|
|
251
|
+
taskId: record.id,
|
|
252
|
+
projectId: record.projectId,
|
|
253
|
+
conversationId: record.conversationId,
|
|
254
|
+
agentId: record.agentId,
|
|
255
|
+
error,
|
|
256
|
+
context: { ports: cleanupPorts.map(formatListeningPort) },
|
|
257
|
+
});
|
|
258
|
+
return cleanupPorts;
|
|
259
|
+
}
|
|
260
|
+
}
|
|
168
261
|
export async function finalizeOrphanCleanup(taskId, finalSignal, runtime, context = {}) {
|
|
169
262
|
const record = this.getTask(taskId);
|
|
170
263
|
if (record.status !== "orphaned")
|
|
@@ -176,6 +269,7 @@ export async function finalizeOrphanCleanup(taskId, finalSignal, runtime, contex
|
|
|
176
269
|
const readiness = record.readiness.outcome === "pending"
|
|
177
270
|
? { ...record.readiness, outcome: "exited" }
|
|
178
271
|
: record.readiness;
|
|
272
|
+
const releasedPorts = taskListeningPortsFromContext(context.releasedPorts);
|
|
179
273
|
const updated = await this.updateTask(taskId, {
|
|
180
274
|
status: "cancelled",
|
|
181
275
|
readiness,
|
|
@@ -183,6 +277,7 @@ export async function finalizeOrphanCleanup(taskId, finalSignal, runtime, contex
|
|
|
183
277
|
exitCode: null,
|
|
184
278
|
signal: finalSignal,
|
|
185
279
|
error: undefined,
|
|
280
|
+
lastOrphanCleanupReleasedPorts: releasedPorts,
|
|
186
281
|
});
|
|
187
282
|
this.managed.delete(taskId);
|
|
188
283
|
await this.events.publish("task.cancelled", { task: updated });
|
|
@@ -224,6 +319,9 @@ export async function failOrphanCleanup(record, message, context = {}) {
|
|
|
224
319
|
});
|
|
225
320
|
throw new Error(message);
|
|
226
321
|
}
|
|
322
|
+
function taskListeningPortsFromContext(value) {
|
|
323
|
+
return Array.isArray(value) ? value : [];
|
|
324
|
+
}
|
|
227
325
|
export function runtimeLogContext(runtime, extra = {}) {
|
|
228
326
|
return {
|
|
229
327
|
pid: runtime?.childPid,
|
|
@@ -232,6 +330,7 @@ export function runtimeLogContext(runtime, extra = {}) {
|
|
|
232
330
|
detached: runtime?.detached,
|
|
233
331
|
shell: runtime?.shell,
|
|
234
332
|
spawnedAt: runtime?.spawnedAt,
|
|
333
|
+
listeningPorts: runtime?.listeningPorts?.map(formatListeningPort),
|
|
235
334
|
...extra,
|
|
236
335
|
};
|
|
237
336
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-manager-orphan.js","sourceRoot":"","sources":["../../../src/domains/tasks/task-manager-orphan.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-manager-orphan.js","sourceRoot":"","sources":["../../../src/domains/tasks/task-manager-orphan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-manager-start.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/task-manager-start.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"task-manager-start.d.ts","sourceRoot":"","sources":["../../../src/domains/tasks/task-manager-start.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,gBAAgB,EAErB,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAWlE,wBAAsB,SAAS,CAC7B,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,gBAAgB,GAAG;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;IACtC,UAAU,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,yBAAyB,KAAK,IAAI,CAAC;CACxD,GACA,OAAO,CAAC,UAAU,CAAC,CAiLrB"}
|
|
@@ -3,6 +3,8 @@ import { join, resolve } from "node:path";
|
|
|
3
3
|
import { createId, } from "@nervekit/shared";
|
|
4
4
|
import { createTaskLogCursor } from "./index.js";
|
|
5
5
|
import { buildTaskEnvInfo, defaultTaskNotificationsEnabled, } from "./task-manager-utils.js";
|
|
6
|
+
import { dedupeListeningPorts, formatListeningPort, } from "./task-port-inspector.js";
|
|
7
|
+
import { isActiveTaskStatus } from "./task-status.js";
|
|
6
8
|
export async function startTask(request) {
|
|
7
9
|
const now = new Date().toISOString();
|
|
8
10
|
const id = createId("task");
|
|
@@ -150,6 +152,7 @@ export async function startTask(request) {
|
|
|
150
152
|
pid: runtime.childPid,
|
|
151
153
|
runtime,
|
|
152
154
|
});
|
|
155
|
+
scheduleListeningPortDetection(this, record.id, runtime);
|
|
153
156
|
await this.logger?.info("Task started", {
|
|
154
157
|
taskId: record.id,
|
|
155
158
|
projectId: record.projectId,
|
|
@@ -163,4 +166,47 @@ export async function startTask(request) {
|
|
|
163
166
|
});
|
|
164
167
|
return this.getTask(record.id);
|
|
165
168
|
}
|
|
169
|
+
function scheduleListeningPortDetection(manager, taskId, runtime) {
|
|
170
|
+
for (const delayMs of [250, 1000, 2500]) {
|
|
171
|
+
const timer = setTimeout(() => {
|
|
172
|
+
void detectListeningPorts(manager, taskId, runtime).catch((error) => {
|
|
173
|
+
void manager.logger?.debug?.("Task listening-port detection failed", {
|
|
174
|
+
taskId,
|
|
175
|
+
error,
|
|
176
|
+
});
|
|
177
|
+
});
|
|
178
|
+
}, delayMs);
|
|
179
|
+
timer.unref?.();
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
async function detectListeningPorts(manager, taskId, runtime) {
|
|
183
|
+
const current = manager.tasks.get(taskId);
|
|
184
|
+
if (!current || !isActiveTaskStatus(current.status))
|
|
185
|
+
return;
|
|
186
|
+
const detected = await manager.supervisor.inspectRuntimeListeningPorts(current.runtime ?? runtime);
|
|
187
|
+
if (detected.length === 0)
|
|
188
|
+
return;
|
|
189
|
+
const fresh = manager.tasks.get(taskId);
|
|
190
|
+
if (!fresh?.runtime || !isActiveTaskStatus(fresh.status))
|
|
191
|
+
return;
|
|
192
|
+
const merged = mergeListeningPorts(fresh.runtime.listeningPorts, detected);
|
|
193
|
+
if ((fresh.runtime.listeningPorts ?? []).length === merged.length)
|
|
194
|
+
return;
|
|
195
|
+
const updated = await manager.updateTask(taskId, {
|
|
196
|
+
runtime: { ...fresh.runtime, listeningPorts: merged },
|
|
197
|
+
});
|
|
198
|
+
await manager.events.publish("task.runtime_updated", { task: updated });
|
|
199
|
+
await manager.logger?.info("Task listening ports detected", {
|
|
200
|
+
taskId: updated.id,
|
|
201
|
+
projectId: updated.projectId,
|
|
202
|
+
conversationId: updated.conversationId,
|
|
203
|
+
agentId: updated.agentId,
|
|
204
|
+
context: {
|
|
205
|
+
ports: merged.map(formatListeningPort),
|
|
206
|
+
},
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
function mergeListeningPorts(existing, detected) {
|
|
210
|
+
return dedupeListeningPorts([...(existing ?? []), ...detected]);
|
|
211
|
+
}
|
|
166
212
|
//# sourceMappingURL=task-manager-start.js.map
|