@stigmer/runner 3.5.3 → 3.7.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/.build-fingerprint +1 -1
- package/dist/activities/call-agent.js +85 -10
- package/dist/activities/call-agent.js.map +1 -1
- package/dist/activities/discover-mcp-server.js +9 -1
- package/dist/activities/discover-mcp-server.js.map +1 -1
- package/dist/activities/execute-cursor/index.d.ts +5 -0
- package/dist/activities/execute-cursor/index.js +88 -14
- package/dist/activities/execute-cursor/index.js.map +1 -1
- package/dist/activities/execute-cursor/model-pricing.d.ts +9 -0
- package/dist/activities/execute-cursor/model-pricing.js +19 -0
- package/dist/activities/execute-cursor/model-pricing.js.map +1 -1
- package/dist/activities/execute-cursor/prompt-builder.d.ts +7 -0
- package/dist/activities/execute-cursor/prompt-builder.js +9 -0
- package/dist/activities/execute-cursor/prompt-builder.js.map +1 -1
- package/dist/activities/execute-cursor/service-tier.d.ts +68 -0
- package/dist/activities/execute-cursor/service-tier.js +187 -0
- package/dist/activities/execute-cursor/service-tier.js.map +1 -0
- package/dist/activities/execute-cursor/session-lifecycle.d.ts +16 -1
- package/dist/activities/execute-cursor/session-lifecycle.js +12 -4
- package/dist/activities/execute-cursor/session-lifecycle.js.map +1 -1
- package/dist/activities/execute-cursor/usage-accumulator.d.ts +21 -1
- package/dist/activities/execute-cursor/usage-accumulator.js +23 -3
- package/dist/activities/execute-cursor/usage-accumulator.js.map +1 -1
- package/dist/activities/execute-deep-agent/prompt-builder.d.ts +6 -0
- package/dist/activities/execute-deep-agent/prompt-builder.js +3 -0
- package/dist/activities/execute-deep-agent/prompt-builder.js.map +1 -1
- package/dist/activities/execute-deep-agent/setup.js +45 -9
- package/dist/activities/execute-deep-agent/setup.js.map +1 -1
- package/dist/client/stigmer-client.d.ts +32 -1
- package/dist/client/stigmer-client.js +42 -2
- package/dist/client/stigmer-client.js.map +1 -1
- package/dist/main.js +18 -0
- package/dist/main.js.map +1 -1
- package/dist/runner.js +48 -0
- package/dist/runner.js.map +1 -1
- package/dist/sandbox-token-renewal.d.ts +65 -0
- package/dist/sandbox-token-renewal.js +169 -0
- package/dist/sandbox-token-renewal.js.map +1 -0
- package/dist/shared/artifact-storage.d.ts +17 -3
- package/dist/shared/artifact-storage.js +22 -4
- package/dist/shared/artifact-storage.js.map +1 -1
- package/dist/shared/caller-identity.d.ts +89 -0
- package/dist/shared/caller-identity.js +124 -0
- package/dist/shared/caller-identity.js.map +1 -0
- package/dist/shared/channel-attachment.d.ts +85 -0
- package/dist/shared/channel-attachment.js +203 -0
- package/dist/shared/channel-attachment.js.map +1 -0
- package/dist/shared/datastore-attachment.d.ts +2 -25
- package/dist/shared/datastore-attachment.js +1 -28
- package/dist/shared/datastore-attachment.js.map +1 -1
- package/dist/shared/synthesized-attachment.d.ts +51 -0
- package/dist/shared/synthesized-attachment.js +45 -0
- package/dist/shared/synthesized-attachment.js.map +1 -0
- package/dist/workflow-engine/loader.js +99 -2
- package/dist/workflow-engine/loader.js.map +1 -1
- package/dist/workflow-engine/tasks/call-agent.d.ts +0 -2
- package/dist/workflow-engine/tasks/call-agent.js +0 -2
- package/dist/workflow-engine/tasks/call-agent.js.map +1 -1
- package/dist/workflow-engine/types.d.ts +39 -7
- package/dist/workflow-engine/types.js.map +1 -1
- package/dist/workflows/call-agent-orchestrator.d.ts +3 -2
- package/dist/workflows/call-agent-orchestrator.js +8 -2
- package/dist/workflows/call-agent-orchestrator.js.map +1 -1
- package/package.json +2 -2
- package/src/__test-utils__/mock-client.ts +4 -0
- package/src/__tests__/sandbox-token-renewal.test.ts +174 -0
- package/src/activities/__tests__/call-agent-contracts.test.ts +4 -4
- package/src/activities/__tests__/call-agent.test.ts +219 -4
- package/src/activities/__tests__/discover-mcp-server.test.ts +49 -0
- package/src/activities/call-agent.ts +94 -10
- package/src/activities/discover-mcp-server.ts +13 -1
- package/src/activities/execute-cursor/__tests__/model-pricing.test.ts +20 -0
- package/src/activities/execute-cursor/__tests__/service-tier.test.ts +170 -0
- package/src/activities/execute-cursor/__tests__/usage-accumulator.test.ts +87 -1
- package/src/activities/execute-cursor/index.ts +121 -20
- package/src/activities/execute-cursor/model-pricing.ts +23 -0
- package/src/activities/execute-cursor/prompt-builder.ts +19 -0
- package/src/activities/execute-cursor/service-tier.ts +244 -0
- package/src/activities/execute-cursor/session-lifecycle.ts +33 -5
- package/src/activities/execute-cursor/usage-accumulator.ts +35 -3
- package/src/activities/execute-deep-agent/prompt-builder.ts +10 -0
- package/src/activities/execute-deep-agent/setup.ts +66 -10
- package/src/client/stigmer-client.ts +57 -4
- package/src/main.ts +20 -0
- package/src/runner.ts +62 -0
- package/src/sandbox-token-renewal.ts +212 -0
- package/src/shared/__tests__/caller-identity.test.ts +159 -0
- package/src/shared/__tests__/channel-attachment.test.ts +276 -0
- package/src/shared/__tests__/datastore-attachment.test.ts +4 -4
- package/src/shared/artifact-storage.ts +32 -7
- package/src/shared/caller-identity.ts +161 -0
- package/src/shared/channel-attachment.ts +237 -0
- package/src/shared/datastore-attachment.ts +2 -54
- package/src/shared/synthesized-attachment.ts +77 -0
- package/src/workflow-engine/__tests__/golden-execution.test.ts +8 -8
- package/src/workflow-engine/__tests__/loader.test.ts +192 -7
- package/src/workflow-engine/__tests__/tasks/call-agent.test.ts +9 -9
- package/src/workflow-engine/loader.ts +113 -2
- package/src/workflow-engine/tasks/call-agent.ts +0 -2
- package/src/workflow-engine/types.ts +40 -7
- package/src/workflows/call-agent-orchestrator.ts +8 -2
package/dist/.build-fingerprint
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"hash":"
|
|
1
|
+
{"hash":"f59012b1fb99fae0","builtAt":"2026-08-07T07:55:08.387Z","fileCount":271}
|
|
@@ -29,6 +29,8 @@ import { AgentExecutionSpecSchema, ExecutionConfigSchema } from "@stigmer/protos
|
|
|
29
29
|
import { SessionSchema } from "@stigmer/protos/ai/stigmer/agentic/session/v1/api_pb";
|
|
30
30
|
import { SessionSpecSchema } from "@stigmer/protos/ai/stigmer/agentic/session/v1/spec_pb";
|
|
31
31
|
import { Harness, ExecutionTarget } from "@stigmer/protos/ai/stigmer/agentic/session/v1/enum_pb";
|
|
32
|
+
import { ServiceTier } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
|
|
33
|
+
import { WorkspaceEntrySchema, WorkspaceSourceSchema, GitRepoSourceSchema, } from "@stigmer/protos/ai/stigmer/agentic/session/v1/workspace_pb";
|
|
32
34
|
import { AgentExecutionSchema } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/api_pb";
|
|
33
35
|
import { ExecutionValueSchema } from "@stigmer/protos/ai/stigmer/agentic/executioncontext/v1/spec_pb";
|
|
34
36
|
import { ApiResourceMetadataSchema } from "@stigmer/protos/ai/stigmer/commons/apiresource/metadata_pb";
|
|
@@ -46,12 +48,13 @@ export async function callAgentAction(config, runtimeEnv, parentWorkflowId) {
|
|
|
46
48
|
throw new Error("call:agent: 'message' resolved to empty after placeholder substitution. " +
|
|
47
49
|
"The agent requires a non-empty prompt message.");
|
|
48
50
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
51
|
+
// The execution is always created in the workflow's org — the workflow
|
|
52
|
+
// owner pays for the run. A cross-org agent reference ("org/slug") only
|
|
53
|
+
// changes where the agent blueprint is looked up, never the billing org.
|
|
54
|
+
const orgId = runtimeEnv["__stigmer_org_id"] ?? "";
|
|
52
55
|
if (!orgId) {
|
|
53
56
|
throw new Error("call:agent requires an organization context. " +
|
|
54
|
-
"
|
|
57
|
+
"Ensure '__stigmer_org_id' is in the workflow environment.");
|
|
55
58
|
}
|
|
56
59
|
const appConfig = loadConfig();
|
|
57
60
|
const client = new StigmerClient({
|
|
@@ -103,6 +106,7 @@ export async function callAgentAction(config, runtimeEnv, parentWorkflowId) {
|
|
|
103
106
|
harness,
|
|
104
107
|
executionTarget,
|
|
105
108
|
subject: "Auto-created session",
|
|
109
|
+
workspaceEntries: buildWorkspaceEntries(resolved.workspace_entries),
|
|
106
110
|
}),
|
|
107
111
|
}));
|
|
108
112
|
const sessionId = session?.metadata?.id ?? "";
|
|
@@ -124,10 +128,17 @@ export async function callAgentAction(config, runtimeEnv, parentWorkflowId) {
|
|
|
124
128
|
if (skippedKeys.length > 0) {
|
|
125
129
|
console.warn(`[CallAgent] agent declares env keys not present in workflow env: [${skippedKeys.join(",")}]`);
|
|
126
130
|
}
|
|
127
|
-
// Task-config-level env takes precedence over auto-forwarded values
|
|
131
|
+
// Task-config-level env takes precedence over auto-forwarded values.
|
|
132
|
+
// The agent's declared secret marking survives the override: a key the
|
|
133
|
+
// agent declares secret stays secret no matter which channel supplied
|
|
134
|
+
// the value, so an explicit task-level `env:` entry cannot downgrade
|
|
135
|
+
// redaction (issue #358 — the override used to hardcode isSecret:false).
|
|
128
136
|
if (resolved.env) {
|
|
129
137
|
for (const [key, value] of Object.entries(resolved.env)) {
|
|
130
|
-
executionRuntimeEnv[key] = {
|
|
138
|
+
executionRuntimeEnv[key] = {
|
|
139
|
+
value: String(value),
|
|
140
|
+
isSecret: agentEnvDecls[key]?.isSecret ?? false,
|
|
141
|
+
};
|
|
131
142
|
}
|
|
132
143
|
}
|
|
133
144
|
const finalKeys = Object.keys(executionRuntimeEnv);
|
|
@@ -144,11 +155,37 @@ export async function callAgentAction(config, runtimeEnv, parentWorkflowId) {
|
|
|
144
155
|
}
|
|
145
156
|
const parentQueue = runtimeEnv["__stigmer_activity_task_queue"];
|
|
146
157
|
const activityTaskQueue = parentQueue?.startsWith("wfexec:") ? parentQueue : "";
|
|
147
|
-
|
|
158
|
+
// Honest RunConfig → ExecutionConfig mapping (issue #358): every field
|
|
159
|
+
// the author may set is forwarded to a field the runner enforces.
|
|
160
|
+
// model_name replaces the agent's default outright; max_cost_usd feeds
|
|
161
|
+
// the harness-generic cost guards (cost-cap middleware / cursor
|
|
162
|
+
// cost-guard); max_tool_rounds feeds resolveRecursionLimit (native
|
|
163
|
+
// harness only); service_tier feeds the cursor harness's explicit
|
|
164
|
+
// variant selection (issue #357). Zero/unset means "no override" and is
|
|
165
|
+
// omitted.
|
|
166
|
+
const runConfig = resolved.run_config;
|
|
167
|
+
const hasModel = !!runConfig?.model_name;
|
|
168
|
+
const hasCostCap = (runConfig?.max_cost_usd ?? 0) > 0;
|
|
169
|
+
const hasToolRounds = (runConfig?.max_tool_rounds ?? 0) > 0;
|
|
170
|
+
// Loader guarantees a canonical enum name; an unknown one here means the
|
|
171
|
+
// loader and this mapping drifted — fail the task, never silently drop a
|
|
172
|
+
// pricing directive.
|
|
173
|
+
const SERVICE_TIER_BY_NAME = {
|
|
174
|
+
SERVICE_TIER_STANDARD: ServiceTier.STANDARD,
|
|
175
|
+
SERVICE_TIER_FAST: ServiceTier.FAST,
|
|
176
|
+
};
|
|
177
|
+
const serviceTier = runConfig?.service_tier
|
|
178
|
+
? SERVICE_TIER_BY_NAME[runConfig.service_tier]
|
|
179
|
+
: undefined;
|
|
180
|
+
if (runConfig?.service_tier && serviceTier === undefined) {
|
|
181
|
+
throw new Error(`call:agent run_config.service_tier '${runConfig.service_tier}' has no proto mapping`);
|
|
182
|
+
}
|
|
183
|
+
const hasServiceTier = serviceTier !== undefined;
|
|
148
184
|
const hasOutputSchema = !!resolved.output?.schema;
|
|
149
185
|
console.log(`[CallAgent] schema propagation diagnostic: ` +
|
|
150
186
|
`hasOutputSchema=${hasOutputSchema}, ` +
|
|
151
|
-
`hasModel=${hasModel}, ` +
|
|
187
|
+
`hasModel=${hasModel}, hasCostCap=${hasCostCap}, hasToolRounds=${hasToolRounds}, ` +
|
|
188
|
+
`hasServiceTier=${hasServiceTier}, ` +
|
|
152
189
|
`configKeys=[${Object.keys(resolved).join(",")}], ` +
|
|
153
190
|
`hasOutput=${resolved.output !== undefined}, ` +
|
|
154
191
|
`outputKeys=${resolved.output ? JSON.stringify(Object.keys(resolved.output)) : "N/A"}, ` +
|
|
@@ -163,26 +200,64 @@ export async function callAgentAction(config, runtimeEnv, parentWorkflowId) {
|
|
|
163
200
|
activityTaskQueue,
|
|
164
201
|
runtimeEnv: runtimeEnvProto,
|
|
165
202
|
});
|
|
166
|
-
if (hasModel || hasOutputSchema) {
|
|
203
|
+
if (hasModel || hasCostCap || hasToolRounds || hasServiceTier || hasOutputSchema) {
|
|
167
204
|
const execConfig = create(ExecutionConfigSchema, {});
|
|
168
205
|
if (hasModel)
|
|
169
|
-
execConfig.modelName =
|
|
206
|
+
execConfig.modelName = runConfig.model_name;
|
|
207
|
+
if (hasCostCap)
|
|
208
|
+
execConfig.maxCostUsd = runConfig.max_cost_usd;
|
|
209
|
+
if (hasToolRounds)
|
|
210
|
+
execConfig.maxToolRounds = runConfig.max_tool_rounds;
|
|
211
|
+
if (hasServiceTier)
|
|
212
|
+
execConfig.serviceTier = serviceTier;
|
|
170
213
|
if (hasOutputSchema) {
|
|
171
214
|
execConfig.structuredOutputSchema = resolved.output.schema;
|
|
172
215
|
}
|
|
173
216
|
executionSpec.executionConfig = execConfig;
|
|
174
217
|
}
|
|
218
|
+
// Workflow provenance labels: the server's CreateExecutionContextStep
|
|
219
|
+
// keys the agent_call environment_refs resolution on these (the
|
|
220
|
+
// schedule-label lineage). The cloud edition additionally gates the
|
|
221
|
+
// branch on the trusted runner caller identity, so the labels are only
|
|
222
|
+
// load-bearing inside that trust boundary.
|
|
223
|
+
const labels = {};
|
|
224
|
+
if (wfExecId && taskName) {
|
|
225
|
+
labels["stigmer.ai/workflow-execution-id"] = wfExecId;
|
|
226
|
+
labels["stigmer.ai/workflow-task"] = taskName;
|
|
227
|
+
}
|
|
175
228
|
await client.createAgentExecution(create(AgentExecutionSchema, {
|
|
176
229
|
apiVersion: "agentic.stigmer.ai/v1",
|
|
177
230
|
kind: "AgentExecution",
|
|
178
231
|
metadata: create(ApiResourceMetadataSchema, {
|
|
179
232
|
name: executionName,
|
|
180
233
|
org: orgId,
|
|
234
|
+
labels,
|
|
181
235
|
}),
|
|
182
236
|
spec: executionSpec,
|
|
183
237
|
}));
|
|
184
238
|
throw new CompleteAsyncError();
|
|
185
239
|
}
|
|
240
|
+
// buildWorkspaceEntries maps the task's git-only workspace entries onto the
|
|
241
|
+
// shared session WorkspaceEntry proto. Provisioning credentials are NOT the
|
|
242
|
+
// runner's concern here: the provisioner resolves GITHUB_TOKEN from the
|
|
243
|
+
// merged environment (DD-018 D-4), which the task's environment_refs feed
|
|
244
|
+
// via server-side resolution.
|
|
245
|
+
function buildWorkspaceEntries(entries) {
|
|
246
|
+
if (!entries || entries.length === 0)
|
|
247
|
+
return [];
|
|
248
|
+
return entries.map((entry) => create(WorkspaceEntrySchema, {
|
|
249
|
+
name: entry.name ?? "",
|
|
250
|
+
source: create(WorkspaceSourceSchema, {
|
|
251
|
+
source: {
|
|
252
|
+
case: "gitRepo",
|
|
253
|
+
value: create(GitRepoSourceSchema, {
|
|
254
|
+
url: entry.source.git_repo.url,
|
|
255
|
+
branch: entry.source.git_repo.branch ?? "",
|
|
256
|
+
}),
|
|
257
|
+
},
|
|
258
|
+
}),
|
|
259
|
+
}));
|
|
260
|
+
}
|
|
186
261
|
function parseAgentReference(agentStr, defaultOrg) {
|
|
187
262
|
if (agentStr.includes("/")) {
|
|
188
263
|
const [org, slug] = agentStr.split("/", 2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call-agent.js","sourceRoot":"","sources":["../../src/activities/call-agent.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"call-agent.js","sourceRoot":"","sources":["../../src/activities/call-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ import { mcpServerToResolved } from "../shared/mcp-resolver.js";
|
|
|
25
25
|
import { toMcpClientConfig } from "../shared/mcp-manager.js";
|
|
26
26
|
import { assertTransportAllowed, resolveMcpTransportPosture, } from "../shared/mcp-transport-guard.js";
|
|
27
27
|
import { detectOAuthChallenge } from "../shared/mcp-oauth-detect.js";
|
|
28
|
+
import { injectAnonymousCallerIdentityForDiscovery } from "../shared/caller-identity.js";
|
|
28
29
|
import { withTimeout } from "../shared/with-timeout.js";
|
|
29
30
|
const SESSION_INIT_TIMEOUT_MS = 270_000;
|
|
30
31
|
const PLATFORM_INJECTABLE_MAP = {
|
|
@@ -132,7 +133,14 @@ export async function discoverMcpServer(input, deps) {
|
|
|
132
133
|
const declaredEnvKeys = mcpServer.spec.env
|
|
133
134
|
? new Set(Object.keys(mcpServer.spec.env))
|
|
134
135
|
: new Set();
|
|
135
|
-
const
|
|
136
|
+
const platformEnv = injectPlatformEnv(declaredEnvKeys, envVars);
|
|
137
|
+
// Discovery runs with no session, so every declared caller-identity key
|
|
138
|
+
// resolves to the anonymous sentinel — without it, a server templating
|
|
139
|
+
// ${STIGMER_CALLER_IDENTITY_VALUE} in its headers would fail discovery
|
|
140
|
+
// with PlaceholderResolutionError and its tools would never be
|
|
141
|
+
// classified. Servers consuming these keys answer tools/list to
|
|
142
|
+
// anonymous callers by contract.
|
|
143
|
+
const finalEnv = injectAnonymousCallerIdentityForDiscovery(declaredEnvKeys, platformEnv);
|
|
136
144
|
const resolved = mcpServerToResolved(mcpServer, slug, finalEnv);
|
|
137
145
|
if (!resolved) {
|
|
138
146
|
throw new Error(`MCP server '${slug}' has no valid server type configured ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discover-mcp-server.js","sourceRoot":"","sources":["../../src/activities/discover-mcp-server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"discover-mcp-server.js","sourceRoot":"","sources":["../../src/activities/discover-mcp-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,11 @@ export interface BuildPromptInput {
|
|
|
44
44
|
skills: import("./prompt-builder.js").SkillMetadata[];
|
|
45
45
|
/** Datastores attached via `datastore_usages` — the `<available_datastores>` section. */
|
|
46
46
|
datastoreUsages?: import("@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb").DatastoreUsage[];
|
|
47
|
+
/**
|
|
48
|
+
* Serving proactive channels + their templates (the DD-006 D2
|
|
49
|
+
* discovery read) — the `<available_channel_templates>` section.
|
|
50
|
+
*/
|
|
51
|
+
channelMessaging?: import("../../shared/channel-attachment.js").ChannelMessagingInfo[];
|
|
47
52
|
subAgents: import("@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb").SubAgent[];
|
|
48
53
|
workspaceDirs: string[];
|
|
49
54
|
workspaceFileRefs: string[];
|
|
@@ -41,6 +41,7 @@ import { utcTimestamp, persistStatus, reportSetupProgress, slimStatus } from "..
|
|
|
41
41
|
import { TimingRecorder, emitTimingLog } from "../../shared/cold-start-timing.js";
|
|
42
42
|
import { readContextBridge } from "../../shared/context-bridge.js";
|
|
43
43
|
import { readSenderIdentity } from "../../shared/sender-identity.js";
|
|
44
|
+
import { injectCallerIdentityEnv, resolveCallerIdentity, } from "../../shared/caller-identity.js";
|
|
44
45
|
import { readSessionContext } from "../../shared/session-context.js";
|
|
45
46
|
import { withholdSecretContentFromMessages } from "../../shared/tool-row.js";
|
|
46
47
|
import { StallTimeoutError, formatStallFailure } from "../../shared/stall-watchdog.js";
|
|
@@ -52,7 +53,9 @@ import { StreamingUpdateScheduler, loadStreamingConfig } from "../../shared/stre
|
|
|
52
53
|
import { createCursorEventRecorder } from "./cursor-event-recorder.js";
|
|
53
54
|
import { resolveMcpServers, toCursorMcpConfig, validateMcpServerEnv } from "./mcp-resolver.js";
|
|
54
55
|
import { resolveMcpTransportPosture } from "../../shared/mcp-transport-guard.js";
|
|
55
|
-
import {
|
|
56
|
+
import { synthesizeDatastoreAttachment } from "../../shared/datastore-attachment.js";
|
|
57
|
+
import { discoverChannelMessaging, synthesizeChannelAttachment, } from "../../shared/channel-attachment.js";
|
|
58
|
+
import { injectSynthesizedAttachment } from "../../shared/synthesized-attachment.js";
|
|
56
59
|
import { mergeApprovalPolicies } from "./approval-policy.js";
|
|
57
60
|
import { deriveActiveLeases, isUnattendedApprovalMode } from "../../shared/approval-policy.js";
|
|
58
61
|
import { backfillMcpServersIfNeeded } from "./connect-backfill.js";
|
|
@@ -83,6 +86,7 @@ import { statusProtoWriter } from "../../shared/execution-status-writer.js";
|
|
|
83
86
|
import { setInterceptorExecutionId, runWithExecutionContext } from "./fetch-interceptor.js";
|
|
84
87
|
import { closeProxySessions } from "./http2-interceptor.js";
|
|
85
88
|
import { resolveModelId, ensureLoaded as ensurePricingLoaded } from "./model-pricing.js";
|
|
89
|
+
import { resolveEffectiveServiceTier, resolveServiceTierParams } from "./service-tier.js";
|
|
86
90
|
import { UsageAccumulator } from "./usage-accumulator.js";
|
|
87
91
|
import { StreamingUsageSummarySchema } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/usage_pb";
|
|
88
92
|
import { activityStarted, activityFinished } from "../../idle-watchdog.js";
|
|
@@ -507,16 +511,32 @@ turnSeq) {
|
|
|
507
511
|
return slimStatus(status);
|
|
508
512
|
}
|
|
509
513
|
}
|
|
510
|
-
// Phase 4: Resolve MCP servers with approval policies
|
|
514
|
+
// Phase 4: Resolve MCP servers with approval policies.
|
|
515
|
+
// The MCP-bound env map (and ONLY it — never the agent process env)
|
|
516
|
+
// carries the reserved caller-identity keys, so a server that declares
|
|
517
|
+
// them in spec.env can template the platform-verified caller into its
|
|
518
|
+
// headers. filterEnvToDeclaredKeys keeps every other server blind.
|
|
511
519
|
await reportSetupProgress(client, executionId, "Resolving MCP servers");
|
|
512
520
|
const transportPosture = resolveMcpTransportPosture(config.mode);
|
|
513
|
-
|
|
521
|
+
const mcpEnvVars = injectCallerIdentityEnv(envVars, resolveCallerIdentity(blueprint.sessionSpec.metadata, session.status?.audit?.specAudit?.createdBy), sessionId);
|
|
522
|
+
let mcpResolution = await resolveMcpServers(client, blueprint.mergedMcpServerUsages, mcpEnvVars, transportPosture);
|
|
514
523
|
setupTiming.mark("resolve_mcp_servers");
|
|
515
524
|
// Phase 4a: Connect backfill for undiscovered MCP servers
|
|
516
525
|
heartbeatPhase = "resolving_mcp_servers";
|
|
517
526
|
const sessionOrg = session.metadata?.org ?? "";
|
|
518
|
-
mcpResolution = await backfillMcpServersIfNeeded(client, mcpResolution, blueprint.mergedMcpServerUsages,
|
|
527
|
+
mcpResolution = await backfillMcpServersIfNeeded(client, mcpResolution, blueprint.mergedMcpServerUsages, mcpEnvVars, sessionOrg, transportPosture, heartbeat, secretKeys);
|
|
519
528
|
setupTiming.mark("backfill_mcp");
|
|
529
|
+
// The synthesized attachments' credential story (DD-006 D4): the
|
|
530
|
+
// exchanged token authenticates the discovery reads per-call (a
|
|
531
|
+
// desktop runner's ambient embedded_runner credential is refused by
|
|
532
|
+
// the messaging reach; undefined lets a cloud sandbox runner's
|
|
533
|
+
// ambient session-scoped token or OSS's no-auth apply). The
|
|
534
|
+
// attachment header falls back to the ambient credential where no
|
|
535
|
+
// exchange happens.
|
|
536
|
+
const exchangedRunnerToken = await client.acquireScopedRunnerToken({ agentExecutionId: executionId });
|
|
537
|
+
const attachmentCredential = exchangedRunnerToken
|
|
538
|
+
?? config.stigmerTokenRef?.current
|
|
539
|
+
?? config.stigmerToken;
|
|
520
540
|
// Phase 4a2: Synthesize the datastore records attachment (T05).
|
|
521
541
|
// Deliberately AFTER resolve + backfill: the attachment has no
|
|
522
542
|
// McpServerUsage and reports discovered capabilities, so the
|
|
@@ -524,16 +544,34 @@ turnSeq) {
|
|
|
524
544
|
// delete_record (which on channels would be silently skipped).
|
|
525
545
|
// Empty approval maps keep it approval-free by construction.
|
|
526
546
|
if (blueprint.datastoreUsages.length > 0) {
|
|
527
|
-
const scopedCredential = (await client.acquireScopedRunnerToken({ agentExecutionId: executionId }))
|
|
528
|
-
?? config.stigmerTokenRef?.current
|
|
529
|
-
?? config.stigmerToken;
|
|
530
547
|
const attachment = synthesizeDatastoreAttachment(blueprint.datastoreUsages, {
|
|
531
548
|
bridgeEndpoint: config.mcpBridgeEndpoint,
|
|
532
|
-
credential:
|
|
549
|
+
credential: attachmentCredential,
|
|
533
550
|
backendEndpoint: config.stigmerBackendEndpoint,
|
|
534
551
|
});
|
|
535
552
|
if (attachment) {
|
|
536
|
-
const resolvedServers =
|
|
553
|
+
const resolvedServers = injectSynthesizedAttachment(mcpResolution.resolvedServers, attachment, "datastore records");
|
|
554
|
+
mcpResolution = {
|
|
555
|
+
resolvedServers,
|
|
556
|
+
cursorConfig: toCursorMcpConfig(resolvedServers),
|
|
557
|
+
};
|
|
558
|
+
}
|
|
559
|
+
}
|
|
560
|
+
// Phase 4a3: Synthesize the channel messaging attachment (DD-006
|
|
561
|
+
// D7/D8), the records attachment's twin. The discovery read is the
|
|
562
|
+
// attachment decision — the control plane runs the SAME candidate
|
|
563
|
+
// computation the send authorization uses — and every failure mode
|
|
564
|
+
// (no channel, OSS, registry down, pre-3a control plane) degrades
|
|
565
|
+
// to honest absence: no tool, no section, execution unharmed.
|
|
566
|
+
const channelMessaging = await discoverChannelMessaging(client, exchangedRunnerToken);
|
|
567
|
+
if (channelMessaging.length > 0) {
|
|
568
|
+
const attachment = synthesizeChannelAttachment(channelMessaging, {
|
|
569
|
+
bridgeEndpoint: config.mcpBridgeEndpoint,
|
|
570
|
+
credential: attachmentCredential,
|
|
571
|
+
backendEndpoint: config.stigmerBackendEndpoint,
|
|
572
|
+
});
|
|
573
|
+
if (attachment) {
|
|
574
|
+
const resolvedServers = injectSynthesizedAttachment(mcpResolution.resolvedServers, attachment, "channel messaging");
|
|
537
575
|
mcpResolution = {
|
|
538
576
|
resolvedServers,
|
|
539
577
|
cursorConfig: toCursorMcpConfig(resolvedServers),
|
|
@@ -710,12 +748,15 @@ turnSeq) {
|
|
|
710
748
|
// Phase 5d: Ensure model pricing registry is populated before validation
|
|
711
749
|
await ensurePricingLoaded();
|
|
712
750
|
setupTiming.mark("load_pricing");
|
|
713
|
-
// Phase 6: Validate model selection
|
|
751
|
+
// Phase 6: Validate model selection and resolve the service tier.
|
|
752
|
+
// UNSPECIFIED → STANDARD resolves here and nowhere else (#357): every
|
|
753
|
+
// upstream layer preserves the caller's raw enum value.
|
|
714
754
|
const requestedModel = spec.executionConfig?.modelName || "default";
|
|
715
755
|
const validatedModel = resolveModelId(requestedModel);
|
|
716
756
|
if (validatedModel !== requestedModel) {
|
|
717
757
|
console.log(`ExecuteCursor model resolved: execution=${executionId}, requested="${requestedModel}", using="${validatedModel}"`);
|
|
718
758
|
}
|
|
759
|
+
const requestedServiceTier = resolveEffectiveServiceTier(spec.executionConfig?.serviceTier);
|
|
719
760
|
heartbeat();
|
|
720
761
|
// Phase 7: Resolve Cursor Agent (create, resume, or graceful fallback)
|
|
721
762
|
await reportSetupProgress(client, executionId, "Initializing Cursor agent");
|
|
@@ -740,10 +781,20 @@ turnSeq) {
|
|
|
740
781
|
console.log(`ExecuteCursor registering ${Object.keys(cursorSubAgents).length} custom sub-agent(s): ` +
|
|
741
782
|
`execution=${executionId}, names=${Object.keys(cursorSubAgents).join(", ")}`);
|
|
742
783
|
}
|
|
784
|
+
// Translate the tier into the explicit variant params sent with every
|
|
785
|
+
// create/resume. Never a bare { id }: the catalog's default variant is
|
|
786
|
+
// account-influenced and picks the price (#357).
|
|
787
|
+
const modelParams = await resolveServiceTierParams({
|
|
788
|
+
apiKey: effectiveApiKey,
|
|
789
|
+
modelId: validatedModel,
|
|
790
|
+
tier: requestedServiceTier,
|
|
791
|
+
executionId,
|
|
792
|
+
});
|
|
743
793
|
const createOptions = agentMode === "cloud"
|
|
744
794
|
? {
|
|
745
795
|
apiKey: effectiveApiKey,
|
|
746
796
|
model: validatedModel || undefined,
|
|
797
|
+
modelParams,
|
|
747
798
|
repos: blueprint.cloudRepos,
|
|
748
799
|
sessionId,
|
|
749
800
|
mcpServers: mcpConfig,
|
|
@@ -752,6 +803,7 @@ turnSeq) {
|
|
|
752
803
|
: {
|
|
753
804
|
apiKey: effectiveApiKey,
|
|
754
805
|
model: validatedModel,
|
|
806
|
+
modelParams,
|
|
755
807
|
workspaceDirs: blueprint.workspaceDirs,
|
|
756
808
|
sessionId,
|
|
757
809
|
workspaceRootDir: config.workspaceRootDir,
|
|
@@ -839,6 +891,7 @@ turnSeq) {
|
|
|
839
891
|
userMessage: spec.message,
|
|
840
892
|
skills: skillMetadata,
|
|
841
893
|
datastoreUsages: blueprint.datastoreUsages,
|
|
894
|
+
channelMessaging,
|
|
842
895
|
subAgents: blueprint.subAgents,
|
|
843
896
|
workspaceDirs: blueprint.workspaceDirs,
|
|
844
897
|
workspaceFileRefs: spec.workspaceFileRefs ?? [],
|
|
@@ -865,7 +918,7 @@ turnSeq) {
|
|
|
865
918
|
`resolution=${resolution.reason}, mode=${resolution.mode}`);
|
|
866
919
|
// Phase 10b: Initialize usage accumulator for runner-side token tracking
|
|
867
920
|
await ensurePricingLoaded();
|
|
868
|
-
const usageAccumulator = new UsageAccumulator(validatedModel);
|
|
921
|
+
const usageAccumulator = new UsageAccumulator(validatedModel, requestedServiceTier, modelParams);
|
|
869
922
|
// Phase 10c: Start OTel turn span. Coarse-grained — spans the whole turn
|
|
870
923
|
// (agent.send + stream + any recovery retry + the turn boundary), ended once
|
|
871
924
|
// from the finally via finishTurnTelemetry with the final token snapshot.
|
|
@@ -1301,10 +1354,29 @@ turnSeq) {
|
|
|
1301
1354
|
}
|
|
1302
1355
|
// Phase 13: Map final result
|
|
1303
1356
|
const result = await run.wait();
|
|
1304
|
-
const sdkResolvedModel = result.model?.id || undefined;
|
|
1305
1357
|
console.log(`ExecuteCursor run.wait() result: execution=${executionId}, result=${JSON.stringify(result)}`);
|
|
1306
|
-
|
|
1307
|
-
|
|
1358
|
+
// Echo sanity check only: result.model ECHOES the requested selection —
|
|
1359
|
+
// the SDK never reports the variant that actually served the call
|
|
1360
|
+
// (verified against the billing ledger, #357). A mismatch here means the
|
|
1361
|
+
// SDK rewrote our selection (contract change), not variant drift; the
|
|
1362
|
+
// authoritative requested-vs-billed reconciliation is the cloud billing
|
|
1363
|
+
// handler's pricing_variant mismatch metric.
|
|
1364
|
+
const echoedSelection = result.model;
|
|
1365
|
+
if (echoedSelection) {
|
|
1366
|
+
const idMatches = echoedSelection.id === validatedModel;
|
|
1367
|
+
// Compare id/value pairs explicitly, never serialized objects: the SDK
|
|
1368
|
+
// may add fields to ModelParameterValue or reorder keys, and neither
|
|
1369
|
+
// is contract drift.
|
|
1370
|
+
const echoedParams = [...(echoedSelection.params ?? [])]
|
|
1371
|
+
.sort((a, b) => a.id.localeCompare(b.id));
|
|
1372
|
+
const paramsMatch = echoedParams.length === modelParams.length &&
|
|
1373
|
+
echoedParams.every((p, i) => p.id === modelParams[i].id && p.value === modelParams[i].value);
|
|
1374
|
+
if (!idMatches || !paramsMatch) {
|
|
1375
|
+
console.warn(`ExecuteCursor model selection echo mismatch (SDK contract drift?): ` +
|
|
1376
|
+
`execution=${executionId}, ` +
|
|
1377
|
+
`requested=${JSON.stringify({ id: validatedModel, params: modelParams })}, ` +
|
|
1378
|
+
`echoed=${JSON.stringify(echoedSelection)}`);
|
|
1379
|
+
}
|
|
1308
1380
|
}
|
|
1309
1381
|
status.completedAt = utcTimestamp();
|
|
1310
1382
|
switch (result.status) {
|
|
@@ -1366,6 +1438,7 @@ turnSeq) {
|
|
|
1366
1438
|
userMessage: spec.message,
|
|
1367
1439
|
skills: skillMetadata,
|
|
1368
1440
|
datastoreUsages: blueprint.datastoreUsages,
|
|
1441
|
+
channelMessaging,
|
|
1369
1442
|
subAgents: blueprint.subAgents,
|
|
1370
1443
|
workspaceDirs: blueprint.workspaceDirs,
|
|
1371
1444
|
workspaceFileRefs: spec.workspaceFileRefs ?? [],
|
|
@@ -1886,6 +1959,7 @@ export function buildPrompt(input) {
|
|
|
1886
1959
|
userMessage,
|
|
1887
1960
|
skills,
|
|
1888
1961
|
datastoreUsages: input.datastoreUsages ?? [],
|
|
1962
|
+
channelMessaging: input.channelMessaging ?? [],
|
|
1889
1963
|
subAgents,
|
|
1890
1964
|
workspaceDirs,
|
|
1891
1965
|
workspaceFileRefs,
|