@mrclrchtr/supi-review 11.0.0 → 11.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/node_modules/@mrclrchtr/supi-agent-runtime/README.md +45 -1
- package/node_modules/@mrclrchtr/supi-agent-runtime/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-agent-runtime/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +41 -1
- package/node_modules/@mrclrchtr/supi-agent-runtime/package.json +2 -2
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/api.ts +9 -4
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/auxiliary-models.ts +86 -0
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/debug-retrospective.ts +64 -0
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/provider-authority.ts +176 -60
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/run.ts +139 -15
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/session/agent-run-registry.ts +7 -2
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/types.ts +27 -2
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/ui/agents-run-viewer-render.ts +2 -1
- package/node_modules/@mrclrchtr/supi-agent-runtime/src/ui/agents-run-viewer.ts +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/README.md +41 -4
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/README.md +48 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/build.sh +73 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/lib/gradle-tooling-api-9.4.0.jar +0 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/lib/slf4j-api-2.0.17.jar +0 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/lib/slf4j-simple-2.0.17.jar +0 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/lib/supi-gradle-observation.jar +0 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/licenses/DEPENDENCIES.md +11 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/licenses/LICENSE-gradle-tooling-api.txt +422 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/licenses/LICENSE-slf4j.txt +21 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/licenses/NOTICE-gradle.txt +21 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/gradle-helper/src/GradleObservation.java +597 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +41 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/README.md +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +41 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/README.md +5 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/lib/browser/ril.js +8 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/lib/common/connection.js +7 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/lib/common/ral.d.ts +8 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/lib/node/main.d.ts +14 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/lib/node/main.js +6 -4
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/lib/node/ril.js +5 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-jsonrpc/package.json +4 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-languageserver-protocol/package.json +4 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-languageserver-types/lib/esm/main.js +2 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-languageserver-types/lib/umd/main.js +2 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/node_modules/vscode-languageserver-types/package.json +2 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/package.json +6 -6
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/client/client.ts +21 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-lsp/src/manager/manager.ts +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/README.md +1 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +41 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/package.json +5 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/tsx/LICENSE +21 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/tsx/tree-sitter-tsx.wasm +0 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/tsx/tree-sitter-tsx.wasm.json +19 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/typescript/LICENSE +21 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/typescript/tree-sitter-typescript.wasm +0 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/typescript/tree-sitter-typescript.wasm.json +19 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/ignore/README.md +95 -14
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/ignore/index.d.ts +56 -20
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/ignore/index.js +150 -120
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/ignore/legacy.js +159 -131
- package/node_modules/@mrclrchtr/supi-code-intelligence/node_modules/ignore/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/package.json +11 -6
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/gradle/query.ts +273 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/gradle/runtime.ts +173 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/gradle/types.ts +65 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/read-next.ts +1 -4
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/refactor/apply.ts +2 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/refactor/mutation-authority.ts +4 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/search/ast-scan.ts +143 -18
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/workspace/safe-path.ts +14 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/analysis/workspace/types.ts +2 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/extension.ts +10 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/gradle/consent.ts +279 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/headless.ts +3 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/overview/collect.ts +11 -3
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/orientation/workspace-context.ts +49 -28
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/orientation-types.ts +11 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/orientation-workflow.ts +2 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/session/session.ts +8 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_find/execute.ts +1 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_find/markdown.ts +24 -17
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_find/result.ts +18 -5
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_find/spec.ts +2 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_find/structured.ts +161 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_graph/result.ts +32 -15
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_graph/spec.ts +2 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_graph/structured.ts +142 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_health/markdown.ts +5 -15
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_inspect/markdown.ts +19 -11
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_inspect/result.ts +1 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/directory-navigation.ts +66 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/gradle-sections.ts +68 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/markdown.ts +19 -8
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/result.ts +89 -11
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/workspace-format.ts +2 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/workspace-output.ts +40 -13
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/workspace-projects.ts +170 -50
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_orientation/workspace-sections.ts +3 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_resolve/markdown.ts +4 -10
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_resolve/result.ts +2 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_resolve/spec.ts +2 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/code_resolve/structured.ts +103 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/infra/truncate.ts +12 -4
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/register.ts +10 -6
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/result/display.ts +17 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/result/model-budget.ts +195 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/result/structured.ts +62 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/result/types.ts +10 -2
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/tool/specs.ts +2 -0
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/types/execution.ts +5 -1
- package/node_modules/@mrclrchtr/supi-code-intelligence/src/ui/tui/display.ts +10 -4
- package/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +41 -1
- package/package.json +4 -4
- package/src/config.ts +14 -0
- package/src/tool/review_run/child-resources.ts +12 -3
- package/src/tool/review_run/child-session.ts +18 -1
- package/src/tool/review_run/child-tools.ts +2 -0
- package/src/tool/review_run/execute.ts +1 -0
- package/src/tool/review_run/execution.ts +8 -0
- package/src/tool/review_run/planner.ts +6 -2
- package/src/tool/review_run/runner.ts +97 -35
- package/src/tool/review_run/system-prompt.ts +15 -3
- package/src/tool/review_run/workflow.ts +26 -0
- package/src/tui/review-command.ts +2 -0
- package/src/types.ts +7 -0
|
@@ -1,14 +1,25 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type Api,
|
|
3
|
+
type AssistantImages,
|
|
3
4
|
type AuthResult,
|
|
5
|
+
type ClassifierApi,
|
|
6
|
+
type ClassifierContext,
|
|
7
|
+
type ClassifierModel,
|
|
8
|
+
type ClassifierResult,
|
|
9
|
+
type ImageApi,
|
|
10
|
+
type ImageModel,
|
|
11
|
+
type ImagesContext,
|
|
4
12
|
InMemoryCredentialStore,
|
|
5
13
|
InMemoryModelsStore,
|
|
6
14
|
lazyStream,
|
|
7
15
|
type Model,
|
|
16
|
+
type ModelsClassifierOptions,
|
|
17
|
+
type ModelsImagesOptions,
|
|
8
18
|
type Provider,
|
|
9
19
|
type ProviderHeaders,
|
|
10
20
|
} from "@earendil-works/pi-ai";
|
|
11
21
|
import { type ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
|
|
22
|
+
import { type AgentRunAuxiliaryModelSnapshot, freezeAuxiliaryModels } from "./auxiliary-models.ts";
|
|
12
23
|
|
|
13
24
|
/** Provider and authentication authority borrowed from the containing PI session. */
|
|
14
25
|
export interface AgentRunProviderAuthority {
|
|
@@ -16,8 +27,22 @@ export interface AgentRunProviderAuthority {
|
|
|
16
27
|
getProvider(providerId: string): Provider | undefined;
|
|
17
28
|
/** Resolve current provider authentication, including runtime credentials and OAuth refresh. */
|
|
18
29
|
getProviderAuth(providerId: string): Promise<AuthResult | undefined>;
|
|
19
|
-
/** Resolve model-specific
|
|
30
|
+
/** Resolve model-specific request auth when PI exposes it. */
|
|
20
31
|
getApiKeyAndHeaders?: (model: Model<Api>) => Promise<AgentRunRequestAuth>;
|
|
32
|
+
/** Return the currently available auxiliary models for a caller-owned invocation snapshot. */
|
|
33
|
+
getAvailableAuxiliaryModels?: () => Promise<AgentRunAuxiliaryModelSnapshot>;
|
|
34
|
+
/** Dispatch one classifier request through the containing provider authority. */
|
|
35
|
+
classify?: (
|
|
36
|
+
model: ClassifierModel<ClassifierApi>,
|
|
37
|
+
context: ClassifierContext,
|
|
38
|
+
options?: ModelsClassifierOptions,
|
|
39
|
+
) => Promise<ClassifierResult>;
|
|
40
|
+
/** Dispatch one image-generation request through the containing provider authority. */
|
|
41
|
+
generateImages?: (
|
|
42
|
+
model: ImageModel<ImageApi>,
|
|
43
|
+
context: ImagesContext,
|
|
44
|
+
options?: ModelsImagesOptions,
|
|
45
|
+
) => Promise<AssistantImages>;
|
|
21
46
|
}
|
|
22
47
|
|
|
23
48
|
/** Model-specific request auth returned by PI's compatibility registry facade. */
|
|
@@ -31,18 +56,37 @@ export type AgentRunRequestAuth =
|
|
|
31
56
|
}
|
|
32
57
|
| { ok: false; error: string };
|
|
33
58
|
|
|
59
|
+
type AgentRunModelRegistry = Pick<
|
|
60
|
+
ModelRegistry,
|
|
61
|
+
"getProvider" | "getProviderAuth" | "getApiKeyAndHeaders"
|
|
62
|
+
> &
|
|
63
|
+
Partial<Pick<ModelRegistry, "getAvailableOfType" | "classify" | "generateImages">>;
|
|
64
|
+
|
|
34
65
|
/** Adapt PI's public model registry to the narrow Agent Run authority interface. */
|
|
35
66
|
export function createAgentRunProviderAuthority(
|
|
36
|
-
registry:
|
|
67
|
+
registry: AgentRunModelRegistry,
|
|
37
68
|
): AgentRunProviderAuthority {
|
|
69
|
+
const classify = registry.classify?.bind(registry);
|
|
70
|
+
const generateImages = registry.generateImages?.bind(registry);
|
|
38
71
|
return {
|
|
39
72
|
getProvider: (providerId) => registry.getProvider(providerId),
|
|
40
73
|
getProviderAuth: (providerId) => registry.getProviderAuth(providerId),
|
|
41
74
|
getApiKeyAndHeaders: (model) => registry.getApiKeyAndHeaders(model),
|
|
75
|
+
getAvailableAuxiliaryModels: async () => {
|
|
76
|
+
const [classifiers, images] = registry.getAvailableOfType
|
|
77
|
+
? await Promise.all([
|
|
78
|
+
registry.getAvailableOfType("classifier"),
|
|
79
|
+
registry.getAvailableOfType("image"),
|
|
80
|
+
])
|
|
81
|
+
: [[], []];
|
|
82
|
+
return freezeAuxiliaryModels({ classifiers, images });
|
|
83
|
+
},
|
|
84
|
+
...(classify ? { classify } : {}),
|
|
85
|
+
...(generateImages ? { generateImages } : {}),
|
|
42
86
|
};
|
|
43
87
|
}
|
|
44
88
|
|
|
45
|
-
/** Private model runtime plus its authorized
|
|
89
|
+
/** Private model runtime plus its authorized model-selection predicate. */
|
|
46
90
|
export interface CreatedAgentRunModelRuntime {
|
|
47
91
|
runtime: ModelRuntime;
|
|
48
92
|
selectModel(model: Model<Api>): boolean;
|
|
@@ -52,6 +96,7 @@ export interface CreatedAgentRunModelRuntime {
|
|
|
52
96
|
export async function createAgentRunModelRuntime(
|
|
53
97
|
authority: AgentRunProviderAuthority,
|
|
54
98
|
models: readonly Model<Api>[],
|
|
99
|
+
auxiliaryModels: AgentRunAuxiliaryModelSnapshot = { classifiers: [], images: [] },
|
|
55
100
|
): Promise<CreatedAgentRunModelRuntime> {
|
|
56
101
|
const configuredModels = uniqueModels(models);
|
|
57
102
|
const originalModel = configuredModels[0];
|
|
@@ -62,6 +107,7 @@ export async function createAgentRunModelRuntime(
|
|
|
62
107
|
const authorizedModels = configuredModels.filter(
|
|
63
108
|
(model, index) => index === 0 || authority.getProvider(model.provider) !== undefined,
|
|
64
109
|
);
|
|
110
|
+
const authorizedAuxiliaryModels = freezeAuxiliaryModels(auxiliaryModels);
|
|
65
111
|
|
|
66
112
|
const runtime = await ModelRuntime.create({
|
|
67
113
|
credentials: new InMemoryCredentialStore(),
|
|
@@ -69,44 +115,62 @@ export async function createAgentRunModelRuntime(
|
|
|
69
115
|
modelsPath: null,
|
|
70
116
|
allowModelNetwork: false,
|
|
71
117
|
});
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
118
|
+
const requestedProviderIds = new Set([
|
|
119
|
+
...authorizedModels.map((model) => model.provider),
|
|
120
|
+
...authorizedAuxiliaryModels.classifiers.map((model) => model.provider),
|
|
121
|
+
...authorizedAuxiliaryModels.images.map((model) => model.provider),
|
|
122
|
+
]);
|
|
123
|
+
const registeredProviderIds = new Set<string>();
|
|
124
|
+
for (const providerId of requestedProviderIds) {
|
|
125
|
+
const provider = authority.getProvider(providerId);
|
|
126
|
+
if (!provider) continue;
|
|
127
|
+
registeredProviderIds.add(providerId);
|
|
80
128
|
runtime.registerNativeProvider(
|
|
81
|
-
createBorrowedProvider(
|
|
129
|
+
createBorrowedProvider({
|
|
82
130
|
authority,
|
|
83
131
|
providerId,
|
|
84
|
-
|
|
85
|
-
() =>
|
|
86
|
-
|
|
132
|
+
provider,
|
|
133
|
+
models: authorizedModels.filter((model) => model.provider === providerId),
|
|
134
|
+
classifiers: authorizedAuxiliaryModels.classifiers.filter(
|
|
135
|
+
(model) => model.provider === providerId,
|
|
136
|
+
),
|
|
137
|
+
images: authorizedAuxiliaryModels.images.filter((model) => model.provider === providerId),
|
|
138
|
+
}),
|
|
87
139
|
);
|
|
88
140
|
}
|
|
141
|
+
for (const builtin of runtime.getProviders()) {
|
|
142
|
+
if (!registeredProviderIds.has(builtin.id)) {
|
|
143
|
+
runtime.registerNativeProvider(createUnavailableProvider(builtin));
|
|
144
|
+
}
|
|
145
|
+
}
|
|
89
146
|
await runtime.refresh({ allowNetwork: false });
|
|
90
147
|
return {
|
|
91
148
|
runtime,
|
|
92
149
|
selectModel(model) {
|
|
93
|
-
|
|
150
|
+
return authorizedModels.some(
|
|
94
151
|
(candidate) => candidate.provider === model.provider && candidate.id === model.id,
|
|
95
152
|
);
|
|
96
|
-
if (!selected) return false;
|
|
97
|
-
activeModel = selected;
|
|
98
|
-
return true;
|
|
99
153
|
},
|
|
100
154
|
};
|
|
101
155
|
}
|
|
102
156
|
|
|
103
|
-
|
|
104
|
-
authority: AgentRunProviderAuthority
|
|
105
|
-
providerId: string
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
157
|
+
interface BorrowedProviderOptions {
|
|
158
|
+
authority: AgentRunProviderAuthority;
|
|
159
|
+
providerId: string;
|
|
160
|
+
provider: Provider;
|
|
161
|
+
models: readonly Model<Api>[];
|
|
162
|
+
classifiers: readonly ClassifierModel<ClassifierApi>[];
|
|
163
|
+
images: readonly ImageModel<ImageApi>[];
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
function createBorrowedProvider({
|
|
167
|
+
authority,
|
|
168
|
+
providerId,
|
|
169
|
+
provider,
|
|
170
|
+
models,
|
|
171
|
+
classifiers,
|
|
172
|
+
images,
|
|
173
|
+
}: BorrowedProviderOptions): Provider {
|
|
110
174
|
return {
|
|
111
175
|
id: provider.id,
|
|
112
176
|
name: provider.name,
|
|
@@ -121,39 +185,71 @@ function createBorrowedProvider(
|
|
|
121
185
|
apiKey: {
|
|
122
186
|
name: `${provider.name} borrowed authority`,
|
|
123
187
|
resolve: async () => {
|
|
124
|
-
const
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
? await authority.getApiKeyAndHeaders?.(activeModel)
|
|
129
|
-
: undefined;
|
|
130
|
-
if (requestAuth && !requestAuth.ok) throw new Error(requestAuth.error);
|
|
131
|
-
if (!auth && !requestAuth?.ok) return undefined;
|
|
132
|
-
return mergeRequestAuth(auth, requestAuth);
|
|
188
|
+
const providerAuth = await authority.getProviderAuth(providerId);
|
|
189
|
+
if (providerAuth || !authority.getApiKeyAndHeaders) return providerAuth;
|
|
190
|
+
// ModelRuntime gates chat requests at provider scope; real credentials stay in the exact-model wrapper.
|
|
191
|
+
return { auth: {} };
|
|
133
192
|
},
|
|
134
193
|
},
|
|
135
194
|
},
|
|
136
195
|
getModels: () => [...models],
|
|
196
|
+
getAllModels: () => [...models, ...classifiers, ...images],
|
|
137
197
|
stream: (childModel, context, options) =>
|
|
138
198
|
lazyStream(childModel, async () => {
|
|
139
199
|
const currentProvider = requireProvider(authority, providerId);
|
|
140
200
|
const authorizedModel = requireAuthorizedModel(models, childModel);
|
|
201
|
+
const requestAuth = await resolveRequestAuth(authority, authorizedModel);
|
|
202
|
+
const requestModel = resolveParentModel(
|
|
203
|
+
currentProvider,
|
|
204
|
+
applyRequestBaseUrl(childModel, requestAuth),
|
|
205
|
+
authorizedModel,
|
|
206
|
+
);
|
|
141
207
|
return currentProvider.stream(
|
|
142
|
-
|
|
208
|
+
requestModel,
|
|
143
209
|
context,
|
|
144
|
-
options,
|
|
210
|
+
applyRequestAuth(options, requestAuth),
|
|
145
211
|
);
|
|
146
212
|
}),
|
|
147
213
|
streamSimple: (childModel, context, options) =>
|
|
148
214
|
lazyStream(childModel, async () => {
|
|
149
215
|
const currentProvider = requireProvider(authority, providerId);
|
|
150
216
|
const authorizedModel = requireAuthorizedModel(models, childModel);
|
|
217
|
+
const requestAuth = await resolveRequestAuth(authority, authorizedModel);
|
|
218
|
+
const requestModel = resolveParentModel(
|
|
219
|
+
currentProvider,
|
|
220
|
+
applyRequestBaseUrl(childModel, requestAuth),
|
|
221
|
+
authorizedModel,
|
|
222
|
+
);
|
|
151
223
|
return currentProvider.streamSimple(
|
|
152
|
-
|
|
224
|
+
requestModel,
|
|
153
225
|
context,
|
|
154
|
-
options,
|
|
226
|
+
applyRequestAuth(options, requestAuth),
|
|
155
227
|
);
|
|
156
228
|
}),
|
|
229
|
+
...(authority.classify && classifiers.length > 0
|
|
230
|
+
? {
|
|
231
|
+
classify: (model, context, options) => {
|
|
232
|
+
// Child auth may contain the active chat model's credentials; only forward cancellation.
|
|
233
|
+
return authority.classify?.(
|
|
234
|
+
requireAuthorizedModel(classifiers, model),
|
|
235
|
+
context,
|
|
236
|
+
options?.signal ? { signal: options.signal } : undefined,
|
|
237
|
+
) as Promise<ClassifierResult>;
|
|
238
|
+
},
|
|
239
|
+
}
|
|
240
|
+
: {}),
|
|
241
|
+
...(authority.generateImages && images.length > 0
|
|
242
|
+
? {
|
|
243
|
+
generateImages: (model, context, options) => {
|
|
244
|
+
// Resolve image credentials against the authorized image model in the parent registry.
|
|
245
|
+
return authority.generateImages?.(
|
|
246
|
+
requireAuthorizedModel(images, model),
|
|
247
|
+
context,
|
|
248
|
+
options?.signal ? { signal: options.signal } : undefined,
|
|
249
|
+
) as Promise<AssistantImages>;
|
|
250
|
+
},
|
|
251
|
+
}
|
|
252
|
+
: {}),
|
|
157
253
|
};
|
|
158
254
|
}
|
|
159
255
|
|
|
@@ -167,14 +263,18 @@ function uniqueModels(models: readonly Model<Api>[]): Model<Api>[] {
|
|
|
167
263
|
});
|
|
168
264
|
}
|
|
169
265
|
|
|
170
|
-
function requireAuthorizedModel
|
|
266
|
+
function requireAuthorizedModel<TModel extends { provider: string; id: string }>(
|
|
267
|
+
models: readonly TModel[],
|
|
268
|
+
requested: { provider: string; id: string },
|
|
269
|
+
): TModel {
|
|
171
270
|
const model = models.find(
|
|
172
271
|
(candidate) => candidate.provider === requested.provider && candidate.id === requested.id,
|
|
173
272
|
);
|
|
174
|
-
if (!model)
|
|
273
|
+
if (!model) {
|
|
175
274
|
throw new Error(
|
|
176
275
|
`Model is not authorized for this Agent Run: ${requested.provider}/${requested.id}`,
|
|
177
276
|
);
|
|
277
|
+
}
|
|
178
278
|
return model;
|
|
179
279
|
}
|
|
180
280
|
|
|
@@ -222,25 +322,41 @@ function resolveParentModel(
|
|
|
222
322
|
: { ...parentModel, baseUrl: childModel.baseUrl };
|
|
223
323
|
}
|
|
224
324
|
|
|
225
|
-
function
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
):
|
|
229
|
-
const
|
|
230
|
-
|
|
231
|
-
|
|
325
|
+
async function resolveRequestAuth(
|
|
326
|
+
authority: AgentRunProviderAuthority,
|
|
327
|
+
model: Model<Api>,
|
|
328
|
+
): Promise<Extract<AgentRunRequestAuth, { ok: true }> | undefined> {
|
|
329
|
+
const requestAuth = await authority.getApiKeyAndHeaders?.(model);
|
|
330
|
+
if (requestAuth && !requestAuth.ok) throw new Error(requestAuth.error);
|
|
331
|
+
return requestAuth?.ok ? requestAuth : undefined;
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
function applyRequestBaseUrl<TModel extends { baseUrl: string }>(
|
|
335
|
+
model: TModel,
|
|
336
|
+
requestAuth: Extract<AgentRunRequestAuth, { ok: true }> | undefined,
|
|
337
|
+
): TModel {
|
|
338
|
+
return requestAuth?.baseUrl ? { ...model, baseUrl: requestAuth.baseUrl } : model;
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
function applyRequestAuth<
|
|
342
|
+
TOptions extends {
|
|
343
|
+
apiKey?: string;
|
|
344
|
+
headers?: ProviderHeaders;
|
|
345
|
+
env?: Record<string, string>;
|
|
346
|
+
},
|
|
347
|
+
>(
|
|
348
|
+
options: TOptions | undefined,
|
|
349
|
+
requestAuth: Extract<AgentRunRequestAuth, { ok: true }> | undefined,
|
|
350
|
+
): TOptions | undefined {
|
|
351
|
+
if (!requestAuth) return options;
|
|
232
352
|
return {
|
|
233
|
-
...
|
|
234
|
-
...(
|
|
235
|
-
|
|
353
|
+
...options,
|
|
354
|
+
...(requestAuth.apiKey ? { apiKey: requestAuth.apiKey } : {}),
|
|
355
|
+
...(options?.headers || requestAuth.headers
|
|
356
|
+
? { headers: { ...(options?.headers ?? {}), ...(requestAuth.headers ?? {}) } }
|
|
236
357
|
: {}),
|
|
237
|
-
|
|
238
|
-
...(
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
...(auth?.headers || resolved?.headers
|
|
242
|
-
? { headers: { ...(auth?.headers ?? {}), ...(resolved?.headers ?? {}) } }
|
|
243
|
-
: {}),
|
|
244
|
-
},
|
|
245
|
-
};
|
|
358
|
+
...(options?.env || requestAuth.env
|
|
359
|
+
? { env: { ...(options?.env ?? {}), ...(requestAuth.env ?? {}) } }
|
|
360
|
+
: {}),
|
|
361
|
+
} as TOptions;
|
|
246
362
|
}
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
createAgentSession,
|
|
13
13
|
createAgentSessionRuntime,
|
|
14
14
|
getAgentDir,
|
|
15
|
+
SettingsManager,
|
|
15
16
|
} from "@earendil-works/pi-coding-agent";
|
|
16
17
|
import {
|
|
17
18
|
captureAgentRunContext,
|
|
@@ -149,6 +150,11 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
149
150
|
sessionSetupFinished = true;
|
|
150
151
|
resolveSessionSetupFinished();
|
|
151
152
|
};
|
|
153
|
+
let taskOutcome: AgentRunOutcome<T> | undefined;
|
|
154
|
+
let resolveTaskResult!: (outcome: AgentRunOutcome<T>) => void;
|
|
155
|
+
const taskResult = new Promise<AgentRunOutcome<T>>((resolve) => {
|
|
156
|
+
resolveTaskResult = resolve;
|
|
157
|
+
});
|
|
152
158
|
let resolveResult!: (outcome: AgentRunOutcome<T>) => void;
|
|
153
159
|
const result = new Promise<AgentRunOutcome<T>>((resolve) => {
|
|
154
160
|
resolveResult = resolve;
|
|
@@ -327,8 +333,9 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
327
333
|
if (finalizing) return finalization ?? Promise.resolve();
|
|
328
334
|
finalizing = true;
|
|
329
335
|
closeSessionAdmission();
|
|
336
|
+
const capturedContext = taskOutcome ? taskOutcome.context : captureFinalizedContext();
|
|
337
|
+
const selectedOutcome = taskOutcome ?? outcome;
|
|
330
338
|
finalization = (async () => {
|
|
331
|
-
const capturedContext = captureFinalizedContext();
|
|
332
339
|
if (timeoutId) clearTimeout(timeoutId);
|
|
333
340
|
timeoutId = undefined;
|
|
334
341
|
unsubscribe?.();
|
|
@@ -341,11 +348,12 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
341
348
|
observerCleanup = undefined;
|
|
342
349
|
if (view) deactivateAgentRunSessionView(view);
|
|
343
350
|
await disposeRuntime();
|
|
344
|
-
const finalOutcome = outcomeWithUsage(withAgentRunContext(
|
|
351
|
+
const finalOutcome = outcomeWithUsage(withAgentRunContext(selectedOutcome, capturedContext));
|
|
345
352
|
terminal = true;
|
|
346
353
|
progressState.status = finalOutcome.kind === "success" ? "completed" : finalOutcome.kind;
|
|
347
354
|
progressState.usage = finalOutcome.usage ?? progressState.usage;
|
|
348
355
|
publish();
|
|
356
|
+
resolveTaskResult(finalOutcome);
|
|
349
357
|
resolveResult(finalOutcome);
|
|
350
358
|
runtime = undefined;
|
|
351
359
|
session = undefined;
|
|
@@ -651,6 +659,118 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
651
659
|
return completed;
|
|
652
660
|
};
|
|
653
661
|
|
|
662
|
+
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: freeze task evidence, publish readiness, then retain one cancellable assessment in the audited lifecycle.
|
|
663
|
+
const finishTask = async (value: T): Promise<void> => {
|
|
664
|
+
const policy = options.retrospective;
|
|
665
|
+
let enabled = false;
|
|
666
|
+
try {
|
|
667
|
+
enabled = Boolean(policy && (policy.isEnabled?.() ?? true));
|
|
668
|
+
} catch {
|
|
669
|
+
// Unavailable evidence policy fails closed without affecting the task.
|
|
670
|
+
}
|
|
671
|
+
if (!enabled || !policy || !session) {
|
|
672
|
+
await finish(outcomeWithUsage({ kind: "success", value }));
|
|
673
|
+
return;
|
|
674
|
+
}
|
|
675
|
+
const activeSession = session;
|
|
676
|
+
taskOutcome = withAgentRunContext(
|
|
677
|
+
outcomeWithUsage({ kind: "success", value }),
|
|
678
|
+
captureFinalizedContext(),
|
|
679
|
+
);
|
|
680
|
+
if (taskOutcome.usage) taskOutcome = { ...taskOutcome, usage: cloneUsage(taskOutcome.usage) };
|
|
681
|
+
if (timeoutId) clearTimeout(timeoutId);
|
|
682
|
+
timeoutId = undefined;
|
|
683
|
+
try {
|
|
684
|
+
observerCleanup?.();
|
|
685
|
+
} catch {
|
|
686
|
+
// Task evidence is best effort and must be frozen before the extra turn.
|
|
687
|
+
}
|
|
688
|
+
observerCleanup = undefined;
|
|
689
|
+
closeSessionAdmission();
|
|
690
|
+
resolveTaskResult(taskOutcome);
|
|
691
|
+
// Drain already-admitted steering before changing tools; late writes are fenced.
|
|
692
|
+
const steeringDrained = await awaitInitialSteeringDrain();
|
|
693
|
+
if (aborting || terminal || finalizing) return;
|
|
694
|
+
if (!steeringDrained) {
|
|
695
|
+
await finish(taskOutcome);
|
|
696
|
+
return;
|
|
697
|
+
}
|
|
698
|
+
setStatus("retrospecting");
|
|
699
|
+
const before = refreshUsage();
|
|
700
|
+
const previousAssistant = latestAssistant(activeSession);
|
|
701
|
+
let accepted = false;
|
|
702
|
+
let failed = false;
|
|
703
|
+
let promptClosed = false;
|
|
704
|
+
let dispositionSeen = false;
|
|
705
|
+
let requested = false;
|
|
706
|
+
let exceededRequestLimit = false;
|
|
707
|
+
try {
|
|
708
|
+
activeSession.settingsManager.applyOverrides({
|
|
709
|
+
retry: { enabled: false, maxRetries: 0, provider: { maxRetries: 0 } },
|
|
710
|
+
compaction: { enabled: false },
|
|
711
|
+
cacheWarming: "off",
|
|
712
|
+
});
|
|
713
|
+
activeSession.setActiveToolsByName([]);
|
|
714
|
+
activeSession.agent.beforeToolCall = async () => ({
|
|
715
|
+
block: true,
|
|
716
|
+
terminate: true,
|
|
717
|
+
reason: "Agent Run retrospectives cannot execute tools",
|
|
718
|
+
});
|
|
719
|
+
const stream = activeSession.agent.streamFunction;
|
|
720
|
+
activeSession.agent.streamFunction = (...args) => {
|
|
721
|
+
if (
|
|
722
|
+
requested ||
|
|
723
|
+
aborting ||
|
|
724
|
+
terminal ||
|
|
725
|
+
finalizing ||
|
|
726
|
+
activeSession.getActiveToolNames().length > 0
|
|
727
|
+
) {
|
|
728
|
+
exceededRequestLimit = true;
|
|
729
|
+
beginAbort();
|
|
730
|
+
throw new Error("Agent Run retrospective allows one request only");
|
|
731
|
+
}
|
|
732
|
+
requested = true;
|
|
733
|
+
return stream(...args);
|
|
734
|
+
};
|
|
735
|
+
await activeSession.prompt(policy.prompt, {
|
|
736
|
+
preflightResult: (disposition) => {
|
|
737
|
+
if (
|
|
738
|
+
disposition === "started" &&
|
|
739
|
+
(promptClosed || aborting || terminal || finalizing || (dispositionSeen && !accepted))
|
|
740
|
+
) {
|
|
741
|
+
throw new Error("Agent Run assessment closed");
|
|
742
|
+
}
|
|
743
|
+
if (dispositionSeen) return;
|
|
744
|
+
dispositionSeen = true;
|
|
745
|
+
accepted = disposition === "started";
|
|
746
|
+
},
|
|
747
|
+
});
|
|
748
|
+
promptClosed = true;
|
|
749
|
+
await awaitSessionQuiescence(activeSession);
|
|
750
|
+
} catch {
|
|
751
|
+
failed = true;
|
|
752
|
+
} finally {
|
|
753
|
+
promptClosed = true;
|
|
754
|
+
}
|
|
755
|
+
if (aborting || terminal || finalizing) return;
|
|
756
|
+
const completed =
|
|
757
|
+
accepted &&
|
|
758
|
+
!failed &&
|
|
759
|
+
!exceededRequestLimit &&
|
|
760
|
+
latestAssistant(activeSession) !== previousAssistant &&
|
|
761
|
+
!isProviderError(activeSession);
|
|
762
|
+
try {
|
|
763
|
+
policy.onResult({
|
|
764
|
+
status: completed ? "completed" : "failed",
|
|
765
|
+
...(completed ? { text: activeSession.getLastAssistantText() } : {}),
|
|
766
|
+
...usageDeltaFields(before, refreshUsage()),
|
|
767
|
+
});
|
|
768
|
+
} catch {
|
|
769
|
+
// Evidence failures cannot replace an already published task result.
|
|
770
|
+
}
|
|
771
|
+
await finish(taskOutcome);
|
|
772
|
+
};
|
|
773
|
+
|
|
654
774
|
const runContinuation = async (
|
|
655
775
|
initialFailureCode: AgentRunContinuationFailureCode,
|
|
656
776
|
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: the bounded loop keeps continuation and terminal selection in the lifecycle closure.
|
|
@@ -698,7 +818,7 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
698
818
|
const value = await options.completionResolver(activeView);
|
|
699
819
|
if (aborting || terminal || finalizing) return;
|
|
700
820
|
if (value !== undefined) {
|
|
701
|
-
await
|
|
821
|
+
await finishTask(value);
|
|
702
822
|
return;
|
|
703
823
|
}
|
|
704
824
|
} catch {
|
|
@@ -782,7 +902,7 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
782
902
|
if (value === undefined) {
|
|
783
903
|
await runContinuation("missing-completion");
|
|
784
904
|
} else {
|
|
785
|
-
await
|
|
905
|
+
await finishTask(value);
|
|
786
906
|
}
|
|
787
907
|
} catch {
|
|
788
908
|
if (!terminal && !finalizing && !aborting) {
|
|
@@ -922,6 +1042,12 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
922
1042
|
return;
|
|
923
1043
|
}
|
|
924
1044
|
const agentDir = options.inputs.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? getAgentDir();
|
|
1045
|
+
// Phase-specific retry overrides must never mutate caller or sibling settings.
|
|
1046
|
+
const settingsManager = options.retrospective
|
|
1047
|
+
? SettingsManager.inMemory(options.inputs.settingsManager.getSettings(), {
|
|
1048
|
+
projectTrusted: options.inputs.settingsManager.isProjectTrusted(),
|
|
1049
|
+
})
|
|
1050
|
+
: options.inputs.settingsManager;
|
|
925
1051
|
runtime = await createAgentSessionRuntime(
|
|
926
1052
|
async ({ cwd, agentDir: runtimeAgentDir, sessionManager, sessionStartEvent }) => {
|
|
927
1053
|
const createdModelRuntime = await createAgentRunModelRuntime(
|
|
@@ -930,6 +1056,7 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
930
1056
|
options.inputs.model as Model<Api>,
|
|
931
1057
|
...((options.inputs.authorizedContinuationModels ?? []) as Model<Api>[]),
|
|
932
1058
|
],
|
|
1059
|
+
options.inputs.authorizedAuxiliaryModels,
|
|
933
1060
|
);
|
|
934
1061
|
selectAuthorizedModel = createdModelRuntime.selectModel;
|
|
935
1062
|
const modelRuntime = createdModelRuntime.runtime;
|
|
@@ -942,7 +1069,7 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
942
1069
|
tools: [...options.inputs.tools],
|
|
943
1070
|
customTools: options.inputs.customTools ? [...options.inputs.customTools] : undefined,
|
|
944
1071
|
resourceLoader: options.inputs.resourceLoader,
|
|
945
|
-
settingsManager
|
|
1072
|
+
settingsManager,
|
|
946
1073
|
sessionManager,
|
|
947
1074
|
sessionStartEvent,
|
|
948
1075
|
});
|
|
@@ -953,7 +1080,7 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
953
1080
|
cwd,
|
|
954
1081
|
agentDir: runtimeAgentDir,
|
|
955
1082
|
modelRuntime,
|
|
956
|
-
settingsManager
|
|
1083
|
+
settingsManager,
|
|
957
1084
|
resourceLoader: options.inputs.resourceLoader,
|
|
958
1085
|
diagnostics: [],
|
|
959
1086
|
},
|
|
@@ -1051,6 +1178,7 @@ export function startAgentRun<T>(options: StartAgentRunOptions<T>): AgentRunHand
|
|
|
1051
1178
|
!aborting
|
|
1052
1179
|
);
|
|
1053
1180
|
},
|
|
1181
|
+
taskResult,
|
|
1054
1182
|
result,
|
|
1055
1183
|
subscribe(listener) {
|
|
1056
1184
|
listeners.add(listener);
|
|
@@ -1129,18 +1257,12 @@ export function startRegisteredAgentRun<T>(
|
|
|
1129
1257
|
batchId: registration.metadata.batchId ?? "default",
|
|
1130
1258
|
};
|
|
1131
1259
|
const transcript = registry?.createTranscriptCapture(metadata, transcriptSystemPrompt ?? "");
|
|
1260
|
+
let detachTranscript: (() => void) | undefined;
|
|
1132
1261
|
const observer = async (session: AgentRunSessionView): Promise<(() => void) | undefined> => {
|
|
1133
|
-
|
|
1262
|
+
detachTranscript = registry?.attachSession(runKey, session);
|
|
1134
1263
|
try {
|
|
1135
1264
|
const detachCallerObserver = await options.observer?.(session);
|
|
1136
|
-
|
|
1137
|
-
return () => {
|
|
1138
|
-
try {
|
|
1139
|
-
detachCallerObserver?.();
|
|
1140
|
-
} finally {
|
|
1141
|
-
detachTranscript?.();
|
|
1142
|
-
}
|
|
1143
|
-
};
|
|
1265
|
+
return detachCallerObserver;
|
|
1144
1266
|
} catch (error) {
|
|
1145
1267
|
try {
|
|
1146
1268
|
detachTranscript?.();
|
|
@@ -1153,6 +1275,7 @@ export function startRegisteredAgentRun<T>(
|
|
|
1153
1275
|
const handle = startAgentRun({ ...runOptions, observer });
|
|
1154
1276
|
const result = handle.result.then(async (outcome) => {
|
|
1155
1277
|
try {
|
|
1278
|
+
detachTranscript?.();
|
|
1156
1279
|
await transcript?.finish();
|
|
1157
1280
|
} catch {
|
|
1158
1281
|
// Transcript storage cannot change the Agent Run outcome.
|
|
@@ -1164,6 +1287,7 @@ export function startRegisteredAgentRun<T>(
|
|
|
1164
1287
|
get steeringAvailable() {
|
|
1165
1288
|
return handle.steeringAvailable;
|
|
1166
1289
|
},
|
|
1290
|
+
taskResult: handle.taskResult,
|
|
1167
1291
|
result,
|
|
1168
1292
|
subscribe(listener) {
|
|
1169
1293
|
return handle.subscribe(listener);
|
|
@@ -222,7 +222,7 @@ export class AgentRunRegistry {
|
|
|
222
222
|
if (
|
|
223
223
|
!run ||
|
|
224
224
|
!handle ||
|
|
225
|
-
(run.status !== "starting" && run.status !== "running") ||
|
|
225
|
+
(run.status !== "starting" && run.status !== "running" && run.status !== "retrospecting") ||
|
|
226
226
|
!this.#isCurrent(run)
|
|
227
227
|
) {
|
|
228
228
|
return "not-running";
|
|
@@ -359,7 +359,12 @@ export class AgentRunRegistry {
|
|
|
359
359
|
}
|
|
360
360
|
|
|
361
361
|
function isActive(status: AgentRunRegistryRun["status"]): boolean {
|
|
362
|
-
return
|
|
362
|
+
return (
|
|
363
|
+
status === "starting" ||
|
|
364
|
+
status === "running" ||
|
|
365
|
+
status === "retrospecting" ||
|
|
366
|
+
status === "stopping"
|
|
367
|
+
);
|
|
363
368
|
}
|
|
364
369
|
|
|
365
370
|
function copyConversation(conversation: AgentRunDisplayConversation): AgentRunDisplayConversation {
|