@granular-software/sdk 0.4.44 → 0.4.46
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/agent-evals.d.mts +7 -3
- package/dist/agent-evals.d.ts +7 -3
- package/dist/agent-evals.js +423 -37
- package/dist/agent-evals.js.map +1 -1
- package/dist/agent-evals.mjs +423 -37
- package/dist/agent-evals.mjs.map +1 -1
- package/dist/agent-harness.d.mts +1 -0
- package/dist/agent-harness.d.ts +1 -0
- package/dist/agent-harness.js +87 -11
- package/dist/agent-harness.js.map +1 -1
- package/dist/agent-harness.mjs +87 -11
- package/dist/agent-harness.mjs.map +1 -1
- package/dist/cli/index.js +114 -18
- package/dist/{client-BZ8NuQ_e.d.ts → client-ButG6ePW.d.ts} +7 -1
- package/dist/{client-CBQFvuKf.d.mts → client-C1UqPDwe.d.mts} +7 -1
- package/dist/index.d.mts +3 -4
- package/dist/index.d.ts +3 -4
- package/dist/index.js +201 -29
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +201 -29
- package/dist/index.mjs.map +1 -1
- package/dist/{spend-tAz2a16I.d.mts → spend-D2Vy3N1D.d.mts} +113 -4
- package/dist/{spend-tAz2a16I.d.ts → spend-D2Vy3N1D.d.ts} +113 -4
- package/dist/spend.d.mts +1 -2
- package/dist/spend.d.ts +1 -2
- package/package.json +2 -2
package/dist/agent-evals.js
CHANGED
|
@@ -4029,6 +4029,9 @@ var MAX_TIMER_DELAY_MS = 2147483647;
|
|
|
4029
4029
|
var DEBUG_WS = process.env.GRANULAR_DEBUG_WS === "1";
|
|
4030
4030
|
var DEFAULT_RPC_TIMEOUT_MS = 3e4;
|
|
4031
4031
|
var DOMAIN_PACKAGE_RPC_TIMEOUT_MS = 12e4;
|
|
4032
|
+
var EFFECT_CONTROL_RPC_TIMEOUT_MS = 12e4;
|
|
4033
|
+
var DEFAULT_RECONNECT_DELAY_MS = 3e3;
|
|
4034
|
+
var DEFAULT_MAX_RECONNECT_ATTEMPTS = 5;
|
|
4032
4035
|
function debugWs(...args) {
|
|
4033
4036
|
if (DEBUG_WS) {
|
|
4034
4037
|
console.log(...args);
|
|
@@ -4039,6 +4042,10 @@ function rpcTimeoutMsForMethod(method) {
|
|
|
4039
4042
|
case "domain.fetchPackagePart":
|
|
4040
4043
|
case "domain.getSummary":
|
|
4041
4044
|
return DOMAIN_PACKAGE_RPC_TIMEOUT_MS;
|
|
4045
|
+
case "client.heartbeat":
|
|
4046
|
+
case "effects.publishCatalog":
|
|
4047
|
+
case "effects.refresh":
|
|
4048
|
+
return EFFECT_CONTROL_RPC_TIMEOUT_MS;
|
|
4042
4049
|
default:
|
|
4043
4050
|
return DEFAULT_RPC_TIMEOUT_MS;
|
|
4044
4051
|
}
|
|
@@ -4058,6 +4065,7 @@ var WSClient = class {
|
|
|
4058
4065
|
reconnectTimer = null;
|
|
4059
4066
|
tokenRefreshTimer = null;
|
|
4060
4067
|
isExplicitlyDisconnected = false;
|
|
4068
|
+
reconnectAttempts = 0;
|
|
4061
4069
|
options;
|
|
4062
4070
|
constructor(options) {
|
|
4063
4071
|
this.options = options;
|
|
@@ -4212,6 +4220,7 @@ var WSClient = class {
|
|
|
4212
4220
|
clearTimeout(this.reconnectTimer);
|
|
4213
4221
|
this.reconnectTimer = null;
|
|
4214
4222
|
}
|
|
4223
|
+
this.reconnectAttempts = 0;
|
|
4215
4224
|
this.emit("open", {});
|
|
4216
4225
|
resolve();
|
|
4217
4226
|
});
|
|
@@ -4243,6 +4252,7 @@ var WSClient = class {
|
|
|
4243
4252
|
clearTimeout(this.reconnectTimer);
|
|
4244
4253
|
this.reconnectTimer = null;
|
|
4245
4254
|
}
|
|
4255
|
+
this.reconnectAttempts = 0;
|
|
4246
4256
|
this.emit("open", {});
|
|
4247
4257
|
resolve();
|
|
4248
4258
|
};
|
|
@@ -4302,7 +4312,8 @@ var WSClient = class {
|
|
|
4302
4312
|
return new Error(`WebSocket disconnected${suffix}`);
|
|
4303
4313
|
}
|
|
4304
4314
|
handleDisconnect(close = {}) {
|
|
4305
|
-
const
|
|
4315
|
+
const baseReconnectDelayMs = typeof this.options.reconnectDelayMs === "number" && Number.isFinite(this.options.reconnectDelayMs) && this.options.reconnectDelayMs > 0 ? this.options.reconnectDelayMs : DEFAULT_RECONNECT_DELAY_MS;
|
|
4316
|
+
const maxReconnectAttempts = typeof this.options.maxReconnectAttempts === "number" && Number.isFinite(this.options.maxReconnectAttempts) && this.options.maxReconnectAttempts >= 0 ? Math.floor(this.options.maxReconnectAttempts) : DEFAULT_MAX_RECONNECT_ATTEMPTS;
|
|
4306
4317
|
const unexpected = !this.isExplicitlyDisconnected;
|
|
4307
4318
|
const info = {
|
|
4308
4319
|
code: close.code,
|
|
@@ -4322,6 +4333,30 @@ var WSClient = class {
|
|
|
4322
4333
|
const disconnectError = this.buildDisconnectError(info);
|
|
4323
4334
|
this.rejectPending(disconnectError);
|
|
4324
4335
|
this.emit("disconnect", info);
|
|
4336
|
+
if (this.reconnectAttempts >= maxReconnectAttempts) {
|
|
4337
|
+
const reconnectInfo = {
|
|
4338
|
+
error: `WebSocket reconnect attempts exhausted after ${maxReconnectAttempts} attempt(s).`,
|
|
4339
|
+
sessionId: this.sessionId,
|
|
4340
|
+
timestamp: Date.now()
|
|
4341
|
+
};
|
|
4342
|
+
this.emit("reconnect_error", reconnectInfo);
|
|
4343
|
+
if (this.options.onReconnectError) {
|
|
4344
|
+
try {
|
|
4345
|
+
this.options.onReconnectError(reconnectInfo);
|
|
4346
|
+
} catch (callbackError) {
|
|
4347
|
+
console.error(
|
|
4348
|
+
"[Granular] onReconnectError callback failed:",
|
|
4349
|
+
callbackError
|
|
4350
|
+
);
|
|
4351
|
+
}
|
|
4352
|
+
}
|
|
4353
|
+
return;
|
|
4354
|
+
}
|
|
4355
|
+
this.reconnectAttempts += 1;
|
|
4356
|
+
const reconnectDelayMs = Math.min(
|
|
4357
|
+
3e4,
|
|
4358
|
+
baseReconnectDelayMs * 2 ** Math.max(0, this.reconnectAttempts - 1)
|
|
4359
|
+
);
|
|
4325
4360
|
info.reconnectScheduled = true;
|
|
4326
4361
|
info.reconnectDelayMs = reconnectDelayMs;
|
|
4327
4362
|
if (this.options.onUnexpectedClose) {
|
|
@@ -4776,6 +4811,9 @@ var Session = class {
|
|
|
4776
4811
|
promptCache = /* @__PURE__ */ new Map();
|
|
4777
4812
|
/** Prompt ids locally answered before the document sync catches up. */
|
|
4778
4813
|
hiddenPromptIds = /* @__PURE__ */ new Set();
|
|
4814
|
+
domainPackagePartCache = /* @__PURE__ */ new Map();
|
|
4815
|
+
domainPackagePartPromises = /* @__PURE__ */ new Map();
|
|
4816
|
+
domainPackageFetchQueue = Promise.resolve();
|
|
4779
4817
|
constructor(client, clientId, options = {}) {
|
|
4780
4818
|
this.client = client;
|
|
4781
4819
|
this.clientId = clientId || `client_${Date.now()}`;
|
|
@@ -4983,12 +5021,18 @@ var Session = class {
|
|
|
4983
5021
|
const resolvedAnswer = resolvePromptAnswer(prompt, answer);
|
|
4984
5022
|
this.promptCache.delete(promptId);
|
|
4985
5023
|
this.hiddenPromptIds.add(promptId);
|
|
5024
|
+
this.emit("prompt", { id: promptId, status: "answered" });
|
|
4986
5025
|
try {
|
|
4987
|
-
await this.client.call("prompt.answer", {
|
|
5026
|
+
const response = await this.client.call("prompt.answer", {
|
|
4988
5027
|
promptId,
|
|
4989
5028
|
answer: resolvedAnswer,
|
|
4990
5029
|
value: resolvedAnswer
|
|
4991
5030
|
});
|
|
5031
|
+
if (response && typeof response === "object" && "ok" in response && response.ok === false) {
|
|
5032
|
+
const rejected = response;
|
|
5033
|
+
const errorMessage = typeof rejected.error === "string" ? rejected.error : "Prompt answer was rejected.";
|
|
5034
|
+
throw new Error(errorMessage);
|
|
5035
|
+
}
|
|
4992
5036
|
} catch (error) {
|
|
4993
5037
|
this.hiddenPromptIds.delete(promptId);
|
|
4994
5038
|
if (prompt) {
|
|
@@ -5216,11 +5260,33 @@ var Session = class {
|
|
|
5216
5260
|
* Fetch a domain package part from the backend (no fallback).
|
|
5217
5261
|
*/
|
|
5218
5262
|
async fetchDomainPart(part) {
|
|
5219
|
-
const
|
|
5220
|
-
|
|
5221
|
-
|
|
5263
|
+
const cached = this.domainPackagePartCache.get(part);
|
|
5264
|
+
if (cached !== void 0) {
|
|
5265
|
+
return cached;
|
|
5266
|
+
}
|
|
5267
|
+
const inFlight = this.domainPackagePartPromises.get(part);
|
|
5268
|
+
if (inFlight) {
|
|
5269
|
+
return inFlight;
|
|
5270
|
+
}
|
|
5271
|
+
const fetchPromise = this.domainPackageFetchQueue.then(async () => {
|
|
5272
|
+
const result = await this.client.call("domain.fetchPackagePart", {
|
|
5273
|
+
moduleSpecifier: "@sandbox/domain",
|
|
5274
|
+
part
|
|
5275
|
+
});
|
|
5276
|
+
const content = result?.content ?? "";
|
|
5277
|
+
this.domainPackagePartCache.set(part, content);
|
|
5278
|
+
return content;
|
|
5222
5279
|
});
|
|
5223
|
-
|
|
5280
|
+
this.domainPackagePartPromises.set(part, fetchPromise);
|
|
5281
|
+
this.domainPackageFetchQueue = fetchPromise.then(
|
|
5282
|
+
() => void 0,
|
|
5283
|
+
() => void 0
|
|
5284
|
+
);
|
|
5285
|
+
try {
|
|
5286
|
+
return await fetchPromise;
|
|
5287
|
+
} finally {
|
|
5288
|
+
this.domainPackagePartPromises.delete(part);
|
|
5289
|
+
}
|
|
5224
5290
|
}
|
|
5225
5291
|
/**
|
|
5226
5292
|
* Get TypeScript class declarations for the current domain (for LLM/code gen).
|
|
@@ -5470,7 +5536,10 @@ import { ${allImports} } from "./sandbox-tools";
|
|
|
5470
5536
|
const emitPrompt = (payload) => {
|
|
5471
5537
|
const prompt = normalizePrompt(payload);
|
|
5472
5538
|
if (!prompt) return;
|
|
5473
|
-
this.hiddenPromptIds.
|
|
5539
|
+
if (this.hiddenPromptIds.has(prompt.id)) {
|
|
5540
|
+
this.emit("prompt", { ...prompt, status: "answered" });
|
|
5541
|
+
return;
|
|
5542
|
+
}
|
|
5474
5543
|
this.promptCache.set(prompt.id, prompt);
|
|
5475
5544
|
this.emit("prompt", prompt);
|
|
5476
5545
|
};
|
|
@@ -13081,6 +13150,7 @@ var LOCAL_CONTROL_REQUEST_RETRY_DELAY_MS = 500;
|
|
|
13081
13150
|
var SESSION_DATA_REQUEST_RETRY_COUNT = 4;
|
|
13082
13151
|
var SESSION_DATA_REQUEST_RETRY_DELAY_MS = 500;
|
|
13083
13152
|
var EFFECT_HOST_CONNECT_TIMEOUT_MS = 15e3;
|
|
13153
|
+
var SESSION_CONNECT_TIMEOUT_MS = 15e3;
|
|
13084
13154
|
function filenameFromUploadBody(body) {
|
|
13085
13155
|
const maybe = body;
|
|
13086
13156
|
return typeof maybe.name === "string" && maybe.name.trim() ? maybe.name.trim() : null;
|
|
@@ -13100,7 +13170,7 @@ function bodyInitFromSessionFileUpload(body) {
|
|
|
13100
13170
|
}
|
|
13101
13171
|
return body;
|
|
13102
13172
|
}
|
|
13103
|
-
var EFFECT_CATALOG_SYNC_TIMEOUT_MS =
|
|
13173
|
+
var EFFECT_CATALOG_SYNC_TIMEOUT_MS = 12e4;
|
|
13104
13174
|
var EFFECT_CATALOG_SYNC_RETRY_COUNT = 3;
|
|
13105
13175
|
var EFFECT_CATALOG_SYNC_RETRY_DELAY_MS = 1e3;
|
|
13106
13176
|
function planRecordObjectsChunks(records, batchSize) {
|
|
@@ -15056,7 +15126,14 @@ var Granular = class _Granular {
|
|
|
15056
15126
|
return tag;
|
|
15057
15127
|
}
|
|
15058
15128
|
buildManagedEnvironmentName(tag, versionId) {
|
|
15059
|
-
return `__sdk__${tag}__${versionId}`;
|
|
15129
|
+
return `__sdk__${tag}__${versionId}__pinned`;
|
|
15130
|
+
}
|
|
15131
|
+
isManagedEnvironmentName(environment, tagName) {
|
|
15132
|
+
const name = environment.environment || environment.envName || "";
|
|
15133
|
+
return name.startsWith(`__sdk__${tagName}__`);
|
|
15134
|
+
}
|
|
15135
|
+
isPinnedToVersion(environment, versionId) {
|
|
15136
|
+
return environment.buildPolicy.mode === "pinned" && (environment.versionId === versionId || environment.buildPolicy.versionId === versionId || environment.buildPolicy.buildId === versionId);
|
|
15060
15137
|
}
|
|
15061
15138
|
matchesTagTrackedEnvironment(environment, tagName, tagId) {
|
|
15062
15139
|
const environmentTagName = environment.tag?.name || environment.buildPolicy.tagName || null;
|
|
@@ -15117,7 +15194,7 @@ var Granular = class _Granular {
|
|
|
15117
15194
|
);
|
|
15118
15195
|
const currentMatches = this.sortEnvironmentsByRecency(
|
|
15119
15196
|
userEnvironments.filter(
|
|
15120
|
-
(environment) => this.matchesTagTrackedEnvironment(environment, tagName, tag.tagId) && environment.versionId === targetVersionId
|
|
15197
|
+
(environment) => this.matchesTagTrackedEnvironment(environment, tagName, tag.tagId) && environment.versionId === targetVersionId && (!this.isManagedEnvironmentName(environment, tagName) || this.isPinnedToVersion(environment, targetVersionId))
|
|
15121
15198
|
)
|
|
15122
15199
|
);
|
|
15123
15200
|
if (currentMatches.length > 0) {
|
|
@@ -15146,6 +15223,7 @@ var Granular = class _Granular {
|
|
|
15146
15223
|
subjectId: user.granularId,
|
|
15147
15224
|
environment: this.buildManagedEnvironmentName(tagName, targetVersionId),
|
|
15148
15225
|
tagId: tag.tagId,
|
|
15226
|
+
versionId: targetVersionId,
|
|
15149
15227
|
permissionProfileId: null
|
|
15150
15228
|
}),
|
|
15151
15229
|
requestedOntology: ontology,
|
|
@@ -15191,6 +15269,7 @@ var Granular = class _Granular {
|
|
|
15191
15269
|
row.summaryUpdatedAt ?? row.summary_updated_at
|
|
15192
15270
|
) : null,
|
|
15193
15271
|
subjectId: row.subjectId != null ? String(row.subjectId) : null,
|
|
15272
|
+
sessionScope: row.sessionScope != null || row.session_scope != null ? String(row.sessionScope ?? row.session_scope) : null,
|
|
15194
15273
|
jobCount: typeof row.jobCount === "number" ? row.jobCount : void 0,
|
|
15195
15274
|
toolCallCount: typeof row.toolCallCount === "number" ? row.toolCallCount : void 0
|
|
15196
15275
|
};
|
|
@@ -15398,7 +15477,11 @@ var Granular = class _Granular {
|
|
|
15398
15477
|
onUnexpectedClose: this.onUnexpectedClose,
|
|
15399
15478
|
onReconnectError: this.onReconnectError
|
|
15400
15479
|
});
|
|
15401
|
-
await
|
|
15480
|
+
await withTimeout(
|
|
15481
|
+
client.connect(),
|
|
15482
|
+
SESSION_CONNECT_TIMEOUT_MS,
|
|
15483
|
+
`session WebSocket connect for ${session.sessionId}`
|
|
15484
|
+
);
|
|
15402
15485
|
const environmentSession = new EnvironmentSession(
|
|
15403
15486
|
client,
|
|
15404
15487
|
environment,
|
|
@@ -15569,12 +15652,24 @@ var Granular = class _Granular {
|
|
|
15569
15652
|
host.heartbeatInFlight = false;
|
|
15570
15653
|
}
|
|
15571
15654
|
async synchronizeEffectHost(host) {
|
|
15572
|
-
|
|
15573
|
-
|
|
15574
|
-
|
|
15575
|
-
|
|
15576
|
-
|
|
15577
|
-
|
|
15655
|
+
if (host.syncPromise) {
|
|
15656
|
+
return host.syncPromise;
|
|
15657
|
+
}
|
|
15658
|
+
host.syncPromise = (async () => {
|
|
15659
|
+
await host.wsClient.call("client.hello", {
|
|
15660
|
+
clientId: host.clientId,
|
|
15661
|
+
protocolVersion: "2.0"
|
|
15662
|
+
});
|
|
15663
|
+
await this.publishSandboxEffectCatalog(host);
|
|
15664
|
+
this.startEffectHostHeartbeat(host);
|
|
15665
|
+
})();
|
|
15666
|
+
try {
|
|
15667
|
+
await host.syncPromise;
|
|
15668
|
+
} finally {
|
|
15669
|
+
if (host.syncPromise) {
|
|
15670
|
+
host.syncPromise = null;
|
|
15671
|
+
}
|
|
15672
|
+
}
|
|
15578
15673
|
}
|
|
15579
15674
|
async ensureSandboxEffectHost(sandboxId) {
|
|
15580
15675
|
const existing = this.sandboxEffectHosts.get(sandboxId);
|
|
@@ -15610,7 +15705,8 @@ var Granular = class _Granular {
|
|
|
15610
15705
|
wsClient,
|
|
15611
15706
|
heartbeatTimer: null,
|
|
15612
15707
|
heartbeatInFlight: false,
|
|
15613
|
-
recovering: false
|
|
15708
|
+
recovering: false,
|
|
15709
|
+
syncPromise: null
|
|
15614
15710
|
};
|
|
15615
15711
|
wsClient.registerRpcHandler("effect.invoke", async (params) => {
|
|
15616
15712
|
const request = params;
|
|
@@ -16428,6 +16524,79 @@ function validateHarnessTemplateManifest(value, context = "HarnessTemplateManife
|
|
|
16428
16524
|
function defineHarnessTemplateManifest(value, context) {
|
|
16429
16525
|
return validateHarnessTemplateManifest(value, context);
|
|
16430
16526
|
}
|
|
16527
|
+
var DEFAULT_IGNORED_REASONING_COMMENT_DIRECTIVES = [
|
|
16528
|
+
/^@ts-ignore\b/i,
|
|
16529
|
+
/^@ts-expect-error\b/i,
|
|
16530
|
+
/^eslint-[\w-]+\b/i,
|
|
16531
|
+
/^biome-ignore\b/i,
|
|
16532
|
+
/^prettier-ignore\b/i,
|
|
16533
|
+
/^istanbul ignore\b/i
|
|
16534
|
+
];
|
|
16535
|
+
var DEFAULT_LOW_SIGNAL_REASONING_LINES = [
|
|
16536
|
+
/^running\.?$/i,
|
|
16537
|
+
/^working\.?$/i,
|
|
16538
|
+
/^thinking\.?$/i,
|
|
16539
|
+
/^generating(?: code)?\.?$/i,
|
|
16540
|
+
/^starting(?: execution)?\.?$/i
|
|
16541
|
+
];
|
|
16542
|
+
function parseReasoningCommentLine(line, options = {}) {
|
|
16543
|
+
const trimmed = line.trimStart();
|
|
16544
|
+
if (!trimmed.startsWith("//")) return null;
|
|
16545
|
+
const text = trimmed.replace(/^\/\/\s?/, "").trim();
|
|
16546
|
+
if (!text) return { kind: "ignored" };
|
|
16547
|
+
const ignoredDirectives = options.ignoredCommentDirectives || DEFAULT_IGNORED_REASONING_COMMENT_DIRECTIVES;
|
|
16548
|
+
if (ignoredDirectives.some((pattern) => pattern.test(text))) {
|
|
16549
|
+
return { kind: "ignored" };
|
|
16550
|
+
}
|
|
16551
|
+
const lowSignalLines = options.lowSignalReasoningLines || DEFAULT_LOW_SIGNAL_REASONING_LINES;
|
|
16552
|
+
if (lowSignalLines.some((pattern) => pattern.test(text))) {
|
|
16553
|
+
return { kind: "ignored" };
|
|
16554
|
+
}
|
|
16555
|
+
return { kind: "reasoning", text };
|
|
16556
|
+
}
|
|
16557
|
+
function consumeGranularReasoningTraceChunk(buffer, chunk, options = {}) {
|
|
16558
|
+
let text = buffer + chunk;
|
|
16559
|
+
let visibleText = "";
|
|
16560
|
+
const reasoningLines = [];
|
|
16561
|
+
while (true) {
|
|
16562
|
+
const newlineIndex = text.indexOf("\n");
|
|
16563
|
+
if (newlineIndex === -1) break;
|
|
16564
|
+
const rawLine = text.slice(0, newlineIndex);
|
|
16565
|
+
text = text.slice(newlineIndex + 1);
|
|
16566
|
+
const comment = parseReasoningCommentLine(
|
|
16567
|
+
rawLine.replace(/\r$/, ""),
|
|
16568
|
+
options
|
|
16569
|
+
);
|
|
16570
|
+
if (comment?.kind === "reasoning") {
|
|
16571
|
+
reasoningLines.push(comment.text);
|
|
16572
|
+
} else if (comment?.kind === "ignored") {
|
|
16573
|
+
continue;
|
|
16574
|
+
} else {
|
|
16575
|
+
visibleText += `${rawLine}
|
|
16576
|
+
`;
|
|
16577
|
+
}
|
|
16578
|
+
}
|
|
16579
|
+
if (options.final && text.length > 0) {
|
|
16580
|
+
const comment = parseReasoningCommentLine(text.replace(/\r$/, ""), options);
|
|
16581
|
+
if (comment?.kind === "reasoning") {
|
|
16582
|
+
reasoningLines.push(comment.text);
|
|
16583
|
+
text = "";
|
|
16584
|
+
} else if (comment?.kind === "ignored") {
|
|
16585
|
+
text = "";
|
|
16586
|
+
} else {
|
|
16587
|
+
visibleText += text;
|
|
16588
|
+
text = "";
|
|
16589
|
+
}
|
|
16590
|
+
}
|
|
16591
|
+
return { buffer: text, visibleText, reasoningLines };
|
|
16592
|
+
}
|
|
16593
|
+
function consumeGranularReasoningOnlyChunk(buffer, chunk, options = {}) {
|
|
16594
|
+
const result = consumeGranularReasoningTraceChunk(buffer, chunk, options);
|
|
16595
|
+
return {
|
|
16596
|
+
buffer: result.buffer,
|
|
16597
|
+
reasoningLines: result.reasoningLines
|
|
16598
|
+
};
|
|
16599
|
+
}
|
|
16431
16600
|
function asRecord4(value) {
|
|
16432
16601
|
if (!value || typeof value !== "object" || Array.isArray(value)) return null;
|
|
16433
16602
|
return value;
|
|
@@ -17633,7 +17802,8 @@ function buildGranularAgentSessionBlock(sessionContext) {
|
|
|
17633
17802
|
runtimeId: sessionContext?.sandboxId || null,
|
|
17634
17803
|
environmentId: sessionContext?.environmentId || null,
|
|
17635
17804
|
userName: sessionContext?.userName || null,
|
|
17636
|
-
domainRevision: sessionContext?.domainRevision || null
|
|
17805
|
+
domainRevision: sessionContext?.domainRevision || null,
|
|
17806
|
+
uiContext: sessionContext?.uiContext || null
|
|
17637
17807
|
});
|
|
17638
17808
|
}
|
|
17639
17809
|
function buildGranularAgentHeapBlock(heapSummary) {
|
|
@@ -17880,7 +18050,7 @@ function buildGranularAgentToolBlock(tools, capabilityOverrides) {
|
|
|
17880
18050
|
const rightScope = `${right.className || "global"}:${right.static ? "static" : "instance"}`;
|
|
17881
18051
|
return leftScope.localeCompare(rightScope) || left.name.localeCompare(right.name);
|
|
17882
18052
|
});
|
|
17883
|
-
const
|
|
18053
|
+
const availableActions = normalizedTools.filter((tool) => tool.ready !== false).map((tool) => {
|
|
17884
18054
|
const scope = tool.className ? `${tool.static ? "class" : "record"}:${tool.className}` : "global";
|
|
17885
18055
|
return {
|
|
17886
18056
|
name: tool.name,
|
|
@@ -17891,7 +18061,8 @@ function buildGranularAgentToolBlock(tools, capabilityOverrides) {
|
|
|
17891
18061
|
const capabilities = {
|
|
17892
18062
|
executeCode: resolvedCapabilities.executeCode,
|
|
17893
18063
|
readEntities: resolvedCapabilities.readEntities,
|
|
17894
|
-
|
|
18064
|
+
availableActions,
|
|
18065
|
+
writeActions: availableActions,
|
|
17895
18066
|
workflowHelpers: resolvedCapabilities.workflowHelpers,
|
|
17896
18067
|
savedData: resolvedCapabilities.savedData,
|
|
17897
18068
|
showRecords: resolvedCapabilities.showRecords
|
|
@@ -17905,7 +18076,7 @@ function buildGranularAgentActionIndex(tools) {
|
|
|
17905
18076
|
return leftScope.localeCompare(rightScope) || left.name.localeCompare(right.name);
|
|
17906
18077
|
});
|
|
17907
18078
|
if (normalizedTools.length === 0) {
|
|
17908
|
-
return "No
|
|
18079
|
+
return "No executable actions are available.";
|
|
17909
18080
|
}
|
|
17910
18081
|
const globalTools = normalizedTools.filter((tool) => !tool.className);
|
|
17911
18082
|
const staticTools = normalizedTools.filter(
|
|
@@ -17999,6 +18170,76 @@ function splitDomainDocumentation(domainDocumentation) {
|
|
|
17999
18170
|
}
|
|
18000
18171
|
return { types: normalized, docs: "" };
|
|
18001
18172
|
}
|
|
18173
|
+
var DOMAIN_HELPER_FUNCTION_NAMES = /* @__PURE__ */ new Set([
|
|
18174
|
+
"agent_heap_objects",
|
|
18175
|
+
"agent_message",
|
|
18176
|
+
"agent_text_message"
|
|
18177
|
+
]);
|
|
18178
|
+
function inferGlobalActionToolsFromDomainTypes(domainTypes) {
|
|
18179
|
+
const inferred = [];
|
|
18180
|
+
const seen = /* @__PURE__ */ new Set();
|
|
18181
|
+
const declarationPattern = /(?:export\s+)?declare\s+function\s+([A-Za-z_$][\w$]*)\s*\(/g;
|
|
18182
|
+
let match;
|
|
18183
|
+
while (match = declarationPattern.exec(domainTypes)) {
|
|
18184
|
+
const name = match[1];
|
|
18185
|
+
if (!name || DOMAIN_HELPER_FUNCTION_NAMES.has(name) || seen.has(name)) {
|
|
18186
|
+
continue;
|
|
18187
|
+
}
|
|
18188
|
+
seen.add(name);
|
|
18189
|
+
inferred.push({
|
|
18190
|
+
name,
|
|
18191
|
+
description: "Executable global action declared by the domain runtime."
|
|
18192
|
+
});
|
|
18193
|
+
}
|
|
18194
|
+
const actionLinePattern = /^-\s*([A-Za-z_$][\w$]*)\s+\(global\):\s*(.+)$/gm;
|
|
18195
|
+
while (match = actionLinePattern.exec(domainTypes)) {
|
|
18196
|
+
const name = match[1];
|
|
18197
|
+
if (!name || DOMAIN_HELPER_FUNCTION_NAMES.has(name) || seen.has(name)) {
|
|
18198
|
+
continue;
|
|
18199
|
+
}
|
|
18200
|
+
seen.add(name);
|
|
18201
|
+
inferred.push({
|
|
18202
|
+
name,
|
|
18203
|
+
description: match[2]?.trim() || "Executable global action declared by the domain runtime."
|
|
18204
|
+
});
|
|
18205
|
+
}
|
|
18206
|
+
const scopedActionLinePattern = /^-\s*([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)\s+\((record|class)\):\s*(.+)$/gm;
|
|
18207
|
+
while (match = scopedActionLinePattern.exec(domainTypes)) {
|
|
18208
|
+
const className = match[1]?.toLowerCase();
|
|
18209
|
+
const name = match[2];
|
|
18210
|
+
const scope = match[3];
|
|
18211
|
+
if (!className || !name || DOMAIN_HELPER_FUNCTION_NAMES.has(name)) {
|
|
18212
|
+
continue;
|
|
18213
|
+
}
|
|
18214
|
+
const key = `${className}:${scope}:${name}`;
|
|
18215
|
+
if (seen.has(key)) {
|
|
18216
|
+
continue;
|
|
18217
|
+
}
|
|
18218
|
+
seen.add(key);
|
|
18219
|
+
inferred.push({
|
|
18220
|
+
name,
|
|
18221
|
+
className,
|
|
18222
|
+
static: scope === "class",
|
|
18223
|
+
description: match[4]?.trim() || "Executable action declared by the domain runtime."
|
|
18224
|
+
});
|
|
18225
|
+
}
|
|
18226
|
+
return inferred;
|
|
18227
|
+
}
|
|
18228
|
+
function resolvePromptTools(tools, domainTypes) {
|
|
18229
|
+
const byKey = /* @__PURE__ */ new Map();
|
|
18230
|
+
for (const tool of tools || []) {
|
|
18231
|
+
if (!tool?.name) continue;
|
|
18232
|
+
const key = `${tool.className || "global"}:${tool.static ? "static" : "instance"}:${tool.name}`;
|
|
18233
|
+
byKey.set(key, tool);
|
|
18234
|
+
}
|
|
18235
|
+
for (const tool of inferGlobalActionToolsFromDomainTypes(domainTypes)) {
|
|
18236
|
+
const key = `global:instance:${tool.name}`;
|
|
18237
|
+
if (!byKey.has(key)) {
|
|
18238
|
+
byKey.set(key, tool);
|
|
18239
|
+
}
|
|
18240
|
+
}
|
|
18241
|
+
return [...byKey.values()];
|
|
18242
|
+
}
|
|
18002
18243
|
function buildGranularAgentCheckpointBlock(checkpoint) {
|
|
18003
18244
|
if (!checkpoint) {
|
|
18004
18245
|
return renderConstBlock("previousCodeResult", null);
|
|
@@ -18071,12 +18312,13 @@ function buildGranularAgentSystemPrompt(input) {
|
|
|
18071
18312
|
const outputMode = input.outputMode || "agentMessages";
|
|
18072
18313
|
const promptCapabilities = resolvePromptCapabilities(input.capabilities);
|
|
18073
18314
|
const domainSections = splitDomainDocumentation(input.domainDocumentation);
|
|
18315
|
+
const promptTools = resolvePromptTools(input.tools, domainSections.types);
|
|
18074
18316
|
const sessionBlock = buildGranularAgentSessionBlock(input.sessionContext);
|
|
18075
18317
|
const toolBlock = buildGranularAgentToolBlock(
|
|
18076
|
-
|
|
18318
|
+
promptTools,
|
|
18077
18319
|
input.capabilities
|
|
18078
18320
|
);
|
|
18079
|
-
const actionIndex = buildGranularAgentActionIndex(
|
|
18321
|
+
const actionIndex = buildGranularAgentActionIndex(promptTools);
|
|
18080
18322
|
const domainBlock = buildGranularAgentDomainBlock(domainSections.types);
|
|
18081
18323
|
const workflowBlock = buildGranularAgentWorkflowBlock(input.workflowSummary);
|
|
18082
18324
|
const checkpointBlock = buildGranularAgentCheckpointBlock(input.checkpoint);
|
|
@@ -18104,7 +18346,7 @@ function buildGranularAgentSystemPrompt(input) {
|
|
|
18104
18346
|
- When \`agent_text_message(...)\` mentions a grounded record that should remain clickable/referable, wrap only the visible record label in a self-closing inline reference tag: \`<granular-object class="class_name" id="stable_id_or_path" label="Visible label" />\`. Use the actual class name and stable id/path from the runtime record or effect result; do not invent ids, field names, or snake/camel-case aliases that are not present in the type declarations or returned object.
|
|
18105
18347
|
- Treat \`agent_heap_objects(...)\` as the UI display call for user-visible records, not as a general storage helper. Do not wrap records under an \`items\` key.
|
|
18106
18348
|
- When records should remain reusable for follow-ups, first save the runtime record or ordered record array with \`await heap.setVar("stable_selection_name", value)\`, then display that saved selection exactly once with \`await agent_heap_objects({ variableNames: ["stable_selection_name"] })\`.
|
|
18107
|
-
- \`heap.setVar(...)\` only accepts scalar values, runtime records/sandbox instances, or arrays of runtime records/sandbox instances. Do not save plain action/effect result objects. If an action returns
|
|
18349
|
+
- \`heap.setVar(...)\` only accepts scalar values, runtime records/sandbox instances, or arrays of runtime records/sandbox instances from one class. Do not save plain action/effect result objects or arrays of JSON summaries returned by actions. If an action returns ids/paths for records that should remain referable or displayed as records, fetch the matching runtime records first with the generated class \`.get(...)\`/query API, then save/display those fetched records. If the action returned only structured summaries, answer from those summaries with \`agent_text_message(...)\`.
|
|
18108
18350
|
- Do not use \`agent_heap_objects({ entries: [...] })\` or \`agent_heap_objects({ saveAs, entries })\` as a shortcut for ordered pages, queues, search results, or ranked lists; those forms can create duplicate or poorly labelled displays. Save the selection with \`heap.setVar(...)\` and display it via \`variableNames\` instead.
|
|
18109
18351
|
- Use \`entryPaths\` only for a few already-known individual records and \`listNames\` only for a host-created list that you intentionally want to show. Do not display both an entry/list selection and a heap variable for the same records.
|
|
18110
18352
|
- When the user asks to show, list, display, open, or "show them" for records you found, call \`agent_heap_objects(...)\`; do not answer only with a count or text summary.
|
|
@@ -18154,10 +18396,11 @@ ${outputRules}` : `Code:
|
|
|
18154
18396
|
- Use choice only for 2 to 5 short grounded options.
|
|
18155
18397
|
- For record choices, set each option value to a stable scalar such as the record \`_graphPath\` or \`id\`, not a label-only value.
|
|
18156
18398
|
- After \`await loop.ask_user(...)\` returns from a choice prompt, tolerate either the option value, the option object, or a human-readable label by matching against value, id/path, label, and description before failing. If a returned label is a prefix or substring of exactly one option label, treat it as that option.
|
|
18157
|
-
- Use \`loop.confirm(...)\` for yes/no confirmation only when the user explicitly asks for
|
|
18399
|
+
- Use \`loop.confirm(...)\` for yes/no confirmation only when the user explicitly asks for a separate confirmation step, policy requires confirmation outside the action runtime, or material uncertainty remains after grounding.
|
|
18400
|
+
- If action, effect, tool, or permission metadata already marks the invoked action as confirmation-gated, do not call \`loop.confirm(...)\` before invoking it. Ground the target and input, then call the action once; the runtime action policy will surface the confirmation prompt and resume the same invocation after approval.
|
|
18158
18401
|
- Do not add a generic yes/no confirmation after the user has already made a grounded choice, unless one of those confirmation conditions still applies.
|
|
18159
|
-
- Do not add confirmation only because an allowed mutation is visible to other people, customer-facing, or consequential. If the user clearly requested the mutation and the grounded target, action, and condition are unique, perform the mutation unless confirmation is required
|
|
18160
|
-
- A conditional request such as "if this is true, do that" is authorization to perform the requested action after you verify the condition. Once the condition, target, and action are grounded uniquely, call the action directly; do not ask "should I perform/post/send this?" unless the user, policy
|
|
18402
|
+
- Do not add confirmation only because an allowed mutation is visible to other people, customer-facing, or consequential. If the user clearly requested the mutation and the grounded target, action, and condition are unique, perform the mutation unless confirmation is required outside the action runtime or remaining material uncertainty exists.
|
|
18403
|
+
- A conditional request such as "if this is true, do that" is authorization to perform the requested action after you verify the condition. Once the condition, target, and action are grounded uniquely, call the action directly; do not ask "should I perform/post/send this?" unless the user, policy outside the action runtime, or unresolved material uncertainty requires confirmation. The visibility or impact of an allowed action is not by itself unresolved uncertainty.
|
|
18161
18404
|
- If the user explicitly asks you to stop for confirmation, natural-language text such as "please confirm" is not enough: call \`await loop.confirm(...)\` before the mutation, then perform the approved mutation in the same resumed job when it returns true.
|
|
18162
18405
|
- Reuse existing task, decision, and closure ids from [State].
|
|
18163
18406
|
- If a user request matches both a domain record/action and a workflow helper, prefer the domain capability.` : "";
|
|
@@ -18303,7 +18546,8 @@ Query policy:
|
|
|
18303
18546
|
- For operational blocker, risk, status, or "what is happening" questions, inspect the relevant record's scalar fields such as status, priority, blocker, summary, latest update/message, due date, amount, and other domain-specific descriptive fields before answering.
|
|
18304
18547
|
- For read-only readiness, risk, health, or status summaries, call any visible read-only assessment/status action on the grounded primary record before ad-hoc aggregation when such an action semantically matches the request. Use the returned fields in the reply and supplement with counts or record reads only when useful.
|
|
18305
18548
|
- Do not hide required visible read-only assessment/status actions inside broad try/catch blocks. The runtime action surface should show that the assessment action ran.
|
|
18306
|
-
- Treat action/effect results as structured values, not necessarily arrays. Before indexing, iterating, checking \`.length\`, or calling array methods, normalize the result first: use the result itself only when \`Array.isArray(result)\`; otherwise read the exact array field shown in the output schema, or a documented array field such as \`items\`, \`matches\`, \`results\`, \`records\`, \`entries\`, \`candidates\`, \`options\`, or
|
|
18549
|
+
- Treat action/effect results as structured values, not necessarily arrays. Before indexing, iterating, checking \`.length\`, or calling array methods, normalize the result first: use the result itself only when \`Array.isArray(result)\`; otherwise read the exact array field shown in the output schema, or a documented array field such as \`items\`, \`matches\`, \`results\`, \`records\`, \`entries\`, \`candidates\`, \`options\`, \`requests\`, \`vendors\`, \`transactions\`, \`approvals\`, \`receipts\`, or another domain-specific array field. If a structured result has \`count > 0\`, never conclude there are no matches until you inspect every array-valued field on that result object, especially fields named by the output schema. Never convert a non-array object result to \`[]\` before checking its documented fields.
|
|
18550
|
+
- Plain JSON objects returned by actions are not sandbox record instances, even when they contain ids, titles, labels, or status fields. Use them for reasoning and text responses. Do not pass action-returned JSON objects or arrays directly to \`heap.setVar(...)\` or \`agent_heap_objects(...)\`; fetch corresponding runtime records first when the user needs record display or follow-up references.
|
|
18307
18551
|
- When a visible search, lookup, availability, or assessment action returns candidates or matches, treat those returned records as already scoped by the action inputs unless the output schema gives reliable fields for further narrowing. When matching returned candidates to grounded records, use the output schema's actual identifier fields, including \`id\`, \`path\`, or fields ending in \`Id\`; do not assume candidates have \`_graphPath\`. Do not discard all returned candidates by re-filtering on guessed property names.
|
|
18308
18552
|
- For scheduling actions, convert relative wording into concrete ISO timestamps before mutating records.
|
|
18309
18553
|
- When a decision depends on fresh external state and a visible read-only status/lookup action exists on the grounded record, call it before deciding, mutating, or refusing based on stale stored fields.
|
|
@@ -18365,6 +18609,7 @@ ${domainSections.docs}
|
|
|
18365
18609
|
|
|
18366
18610
|
Actions:
|
|
18367
18611
|
${actionIndex}
|
|
18612
|
+
- Global actions are executable functions exported by "./sandbox-tools"; import each global action you call, e.g. \`import { some_action } from "./sandbox-tools"; await some_action(...)\`. This includes frontend actions such as opening, focusing, or navigating the host UI.
|
|
18368
18613
|
- Actions listed under "Record-level" are instance methods. First fetch or find the specific record, then call the action on that instance, e.g. \`const item = await Item.get({ path }); await item.action_name(...)\`.
|
|
18369
18614
|
- Actions listed under "Class-level" are class/static methods. Call them on the imported class, e.g. \`await Item.action_name(...)\`.
|
|
18370
18615
|
- The action index is the visibility contract. If an action is listed for a class, call it directly on fetched/listed instances of that class; do not use \`typeof record.action_name === "function"\` as a discovery gate. If an action is not listed, do not call it.
|
|
@@ -19140,7 +19385,7 @@ function extractJsonStringField(source, fieldName) {
|
|
|
19140
19385
|
function modelOutputInstruction() {
|
|
19141
19386
|
return [
|
|
19142
19387
|
"Return only a JSON object with this shape:",
|
|
19143
|
-
'{ "action": "reply" | "job", "
|
|
19388
|
+
'{ "action": "reply" | "job", "code": string, "reply": string }',
|
|
19144
19389
|
'Use "action":"reply" only when a plain conversational answer is enough and no live session state should change.',
|
|
19145
19390
|
'Do not use "action":"reply" to promise future tool work; if the user asks to check, find, look up, inspect, read, reopen, summarize, transform, update, post, send, approve, schedule, reschedule, calculate, or confirm around session state, session files, generated files, tools, or a domain action, use "action":"job".',
|
|
19146
19391
|
'If the user asks to use an attached file, uploaded file, generated file, previous output file, or "the summary/workbook/file you just created", choose "action":"job" and read it through [Runtime Imports] instead of answering from memory.',
|
|
@@ -19148,7 +19393,8 @@ function modelOutputInstruction() {
|
|
|
19148
19393
|
'Before claiming you lack access, inspect the visible action list. If a visible read-only search, lookup, list, guidance, note, policy, or knowledge action can satisfy a "check", "find", "look up", or "whether we have guidance" request, choose "action":"job" and call it.',
|
|
19149
19394
|
"Generated code must not report no matches for the primary human-described anchor after a single zero-result list/find/page call. Before that primary no-match return, retry the primary anchor with fewer text constraints or a distinct fallback such as owner/container grounding, relationship traversal, exact-id/path lookup, or shorter target-local search.",
|
|
19150
19395
|
'Use "action":"job" when the next step should run code or mutate workflow state.',
|
|
19151
|
-
'When action is "job", include runnable code in "code".',
|
|
19396
|
+
'When action is "job", include runnable code in "code" and emit the "code" field before any non-empty "reply" field so generated code comments can stream as progress.',
|
|
19397
|
+
"Generated job code must use plain ASCII punctuation in string literals and comments. Do not use curly quotes, smart apostrophes, en dashes, em dashes, or other typographic punctuation in code.",
|
|
19152
19398
|
"Generated code must not reference prompt-only symbols such as runtimeImports, savedData, sessionFileManifest, recentReferences, workflowContext, workflowState, or capabilities. Copy concrete paths/ids from the prompt into strings, fetch records with documented imports, or use documented runtime globals.",
|
|
19153
19399
|
"Generated code must follow [Runtime Imports]: import module exports from their listed module, use listed globals directly without importing them, and do not leave undeclared identifiers in the job.",
|
|
19154
19400
|
"Generated action calls must use the exact input property names from the visible action schema. Do not invent synonym keys for required inputs.",
|
|
@@ -19233,13 +19479,36 @@ ${modelOutputInstruction()}`
|
|
|
19233
19479
|
let text = "";
|
|
19234
19480
|
let usage = null;
|
|
19235
19481
|
let requestId = null;
|
|
19236
|
-
if (input.onTextDelta) {
|
|
19237
|
-
const onTextDelta = input.onTextDelta;
|
|
19482
|
+
if (input.onTextDelta || input.onReplyDelta || input.onCodeDelta) {
|
|
19238
19483
|
const stream = await client.chat.completions.create({
|
|
19239
19484
|
...payload,
|
|
19240
19485
|
stream: true,
|
|
19241
19486
|
stream_options: { include_usage: true }
|
|
19242
19487
|
});
|
|
19488
|
+
let streamedReply = "";
|
|
19489
|
+
let streamedCode = "";
|
|
19490
|
+
const emitReplyDelta = async () => {
|
|
19491
|
+
if (!input.onReplyDelta) return;
|
|
19492
|
+
const replyField = extractJsonStringField(text, "reply");
|
|
19493
|
+
if (!replyField) return;
|
|
19494
|
+
const nextReply = replyField.value;
|
|
19495
|
+
if (!nextReply.startsWith(streamedReply)) return;
|
|
19496
|
+
const delta = nextReply.slice(streamedReply.length);
|
|
19497
|
+
if (!delta) return;
|
|
19498
|
+
streamedReply = nextReply;
|
|
19499
|
+
await input.onReplyDelta(delta);
|
|
19500
|
+
};
|
|
19501
|
+
const emitCodeDelta = async () => {
|
|
19502
|
+
if (!input.onCodeDelta) return;
|
|
19503
|
+
const codeField = extractJsonStringField(text, "code");
|
|
19504
|
+
if (!codeField) return;
|
|
19505
|
+
const nextCode = codeField.value;
|
|
19506
|
+
if (!nextCode.startsWith(streamedCode)) return;
|
|
19507
|
+
const delta = nextCode.slice(streamedCode.length);
|
|
19508
|
+
if (!delta) return;
|
|
19509
|
+
streamedCode = nextCode;
|
|
19510
|
+
await input.onCodeDelta(delta);
|
|
19511
|
+
};
|
|
19243
19512
|
for await (const event of stream) {
|
|
19244
19513
|
requestId = requestId || event.id || event._request_id || null;
|
|
19245
19514
|
usage = event.usage || usage;
|
|
@@ -19247,8 +19516,12 @@ ${modelOutputInstruction()}`
|
|
|
19247
19516
|
const deltaText = typeof delta === "string" ? delta : Array.isArray(delta) ? delta.map((part) => asRecord6(part)?.text || "").join("") : "";
|
|
19248
19517
|
if (!deltaText) continue;
|
|
19249
19518
|
text += deltaText;
|
|
19250
|
-
await onTextDelta(deltaText);
|
|
19519
|
+
await input.onTextDelta?.(deltaText);
|
|
19520
|
+
await emitReplyDelta();
|
|
19521
|
+
await emitCodeDelta();
|
|
19251
19522
|
}
|
|
19523
|
+
await emitReplyDelta();
|
|
19524
|
+
await emitCodeDelta();
|
|
19252
19525
|
raw = { streamed: true, model, usage, request_id: requestId };
|
|
19253
19526
|
} else {
|
|
19254
19527
|
const completion = await client.chat.completions.create(
|
|
@@ -19350,6 +19623,64 @@ function normalizeHeapSnapshot2(heap) {
|
|
|
19350
19623
|
updatedAt: typeof heap?.updatedAt === "number" ? heap.updatedAt : Date.now()
|
|
19351
19624
|
};
|
|
19352
19625
|
}
|
|
19626
|
+
function targetFromUiContext(context) {
|
|
19627
|
+
const target = asRecord6(context?.target) || asRecord6(context?.currentPageObject) || asRecord6(context?.commentaryTarget);
|
|
19628
|
+
const className = typeof target?.className === "string" ? target.className : "";
|
|
19629
|
+
const id = typeof target?.id === "string" ? target.id : "";
|
|
19630
|
+
if (!className || !id) return null;
|
|
19631
|
+
return {
|
|
19632
|
+
className,
|
|
19633
|
+
id,
|
|
19634
|
+
label: typeof target?.label === "string" ? target.label : void 0
|
|
19635
|
+
};
|
|
19636
|
+
}
|
|
19637
|
+
function heapEntryMatchesTarget(entry, target) {
|
|
19638
|
+
if (entry.className !== target.className) return false;
|
|
19639
|
+
if (entry.id === target.id) return true;
|
|
19640
|
+
const fields = asRecord6(entry.fields);
|
|
19641
|
+
return fields?.real_id === target.id || fields?._realId === target.id;
|
|
19642
|
+
}
|
|
19643
|
+
function focusedHeapEntryPathsFromUiContext(heap, context) {
|
|
19644
|
+
const target = targetFromUiContext(context);
|
|
19645
|
+
if (!target) return [];
|
|
19646
|
+
return Object.entries(heap.entriesByPath).filter(([, entry]) => heapEntryMatchesTarget(entry, target)).map(([path2]) => path2);
|
|
19647
|
+
}
|
|
19648
|
+
function hasSessionDocumentContext(document) {
|
|
19649
|
+
const doc = asRecord6(document);
|
|
19650
|
+
if (!doc) return false;
|
|
19651
|
+
const heap = normalizeHeapSnapshot2(asRecord6(doc.heap));
|
|
19652
|
+
if (Object.keys(heap.entriesByPath).length > 0 || Object.keys(heap.listsByName).length > 0 || Object.keys(heap.variablesByName).length > 0) {
|
|
19653
|
+
return true;
|
|
19654
|
+
}
|
|
19655
|
+
const domain = asRecord6(doc.domain);
|
|
19656
|
+
const packages = asRecord6(domain?.packages);
|
|
19657
|
+
if (packages && Object.keys(packages).length > 0) return true;
|
|
19658
|
+
const prompts = asRecord6(doc.prompts);
|
|
19659
|
+
if (prompts && Object.keys(prompts).length > 0) return true;
|
|
19660
|
+
const workflows = asRecord6(doc.workflows);
|
|
19661
|
+
if (workflows && Object.keys(workflows).length > 0) return true;
|
|
19662
|
+
return false;
|
|
19663
|
+
}
|
|
19664
|
+
async function waitForSessionDocumentContext(environment, timeoutMs = 3e3) {
|
|
19665
|
+
if (hasSessionDocumentContext(environment.document)) return;
|
|
19666
|
+
await new Promise((resolve) => {
|
|
19667
|
+
let settled = false;
|
|
19668
|
+
let unsubscribe = null;
|
|
19669
|
+
const settle = () => {
|
|
19670
|
+
if (settled) return;
|
|
19671
|
+
settled = true;
|
|
19672
|
+
if (unsubscribe) unsubscribe();
|
|
19673
|
+
clearTimeout(timer);
|
|
19674
|
+
resolve();
|
|
19675
|
+
};
|
|
19676
|
+
const timer = setTimeout(settle, timeoutMs);
|
|
19677
|
+
unsubscribe = environment.on("sync", (document) => {
|
|
19678
|
+
if (hasSessionDocumentContext(document)) {
|
|
19679
|
+
settle();
|
|
19680
|
+
}
|
|
19681
|
+
});
|
|
19682
|
+
});
|
|
19683
|
+
}
|
|
19353
19684
|
function buildContinuationPreview(checkpoint, noProgressCount) {
|
|
19354
19685
|
const lines = [
|
|
19355
19686
|
`Controller no-progress count: ${noProgressCount}`,
|
|
@@ -19371,7 +19702,7 @@ function readableAgentMessage(message) {
|
|
|
19371
19702
|
const show = asRecord6(record.show);
|
|
19372
19703
|
const variableNames = asArray3(show?.variableNames).map((value) => String(value)).filter(Boolean);
|
|
19373
19704
|
if (variableNames.length) {
|
|
19374
|
-
return
|
|
19705
|
+
return variableNames.length === 1 ? "Displayed the selected record" : "Displayed the selected records";
|
|
19375
19706
|
}
|
|
19376
19707
|
if (typeof record.kind === "string") {
|
|
19377
19708
|
return `Agent ${record.kind} message`;
|
|
@@ -20364,6 +20695,7 @@ function createAgentEvalHarness(options) {
|
|
|
20364
20695
|
if (environment.getEffects().length > 0) break;
|
|
20365
20696
|
await sleep2(250);
|
|
20366
20697
|
}
|
|
20698
|
+
await waitForSessionDocumentContext(environment);
|
|
20367
20699
|
await ensureDir(path__default.default.join(artifactDir, slugify(label)));
|
|
20368
20700
|
return {
|
|
20369
20701
|
label,
|
|
@@ -20645,6 +20977,7 @@ function createAgentEvalHarness(options) {
|
|
|
20645
20977
|
);
|
|
20646
20978
|
while (iteration < maxIterations) {
|
|
20647
20979
|
const liveDoc = cloneJson(conversation.environment.document);
|
|
20980
|
+
const promptHeap = normalizeHeapSnapshot2(asRecord6(liveDoc?.heap));
|
|
20648
20981
|
const pendingPrompts = filterPromptsByBoundary(
|
|
20649
20982
|
liveDoc,
|
|
20650
20983
|
getOpenPromptsFromDoc(liveDoc),
|
|
@@ -20660,7 +20993,11 @@ function createAgentEvalHarness(options) {
|
|
|
20660
20993
|
...referentFocus.variableNames
|
|
20661
20994
|
],
|
|
20662
20995
|
listNames: [...workflowFocus.listNames, ...referentFocus.listNames],
|
|
20663
|
-
entryPaths: [
|
|
20996
|
+
entryPaths: [
|
|
20997
|
+
...workflowFocus.entryPaths,
|
|
20998
|
+
...referentFocus.entryPaths,
|
|
20999
|
+
...focusedHeapEntryPathsFromUiContext(promptHeap, input.uiContext)
|
|
21000
|
+
]
|
|
20664
21001
|
};
|
|
20665
21002
|
const tools = conversation.environment.getEffects().map((tool) => ({
|
|
20666
21003
|
name: tool.name,
|
|
@@ -20676,7 +21013,8 @@ function createAgentEvalHarness(options) {
|
|
|
20676
21013
|
sessionContext: {
|
|
20677
21014
|
sandboxId: conversation.environment.sandboxId,
|
|
20678
21015
|
environmentId: conversation.environment.environmentId,
|
|
20679
|
-
domainRevision: conversation.environment.domainRevision
|
|
21016
|
+
domainRevision: conversation.environment.domainRevision,
|
|
21017
|
+
uiContext: input.uiContext || null
|
|
20680
21018
|
},
|
|
20681
21019
|
heapSummary: projectHeapSummary(asRecord6(liveDoc?.heap), {
|
|
20682
21020
|
focus: heapFocus
|
|
@@ -20725,6 +21063,24 @@ function createAgentEvalHarness(options) {
|
|
|
20725
21063
|
title: iteration === 0 ? "Generating agent response" : "Generating continuation",
|
|
20726
21064
|
message: request
|
|
20727
21065
|
});
|
|
21066
|
+
const emittedGeneratedReasoningLines = /* @__PURE__ */ new Set();
|
|
21067
|
+
let generatedReasoningBuffer = "";
|
|
21068
|
+
const emitGeneratedReasoningLine = async (line) => {
|
|
21069
|
+
if (emittedGeneratedReasoningLines.has(line)) return;
|
|
21070
|
+
emittedGeneratedReasoningLines.add(line);
|
|
21071
|
+
await emitProgress(onProgress, {
|
|
21072
|
+
phase: "generation",
|
|
21073
|
+
status: "running",
|
|
21074
|
+
scenarioId: conversation.label,
|
|
21075
|
+
stepId: turnId,
|
|
21076
|
+
iteration: iteration + 1,
|
|
21077
|
+
templateId: renderedPrompt.templateId,
|
|
21078
|
+
templateVersion: renderedPrompt.templateVersion,
|
|
21079
|
+
title: "Generated reasoning comment",
|
|
21080
|
+
message: line,
|
|
21081
|
+
data: { source: "generated_code_comment" }
|
|
21082
|
+
});
|
|
21083
|
+
};
|
|
20728
21084
|
const generation = await withTimeout2(
|
|
20729
21085
|
generateTurnWithRepair(options.generator, {
|
|
20730
21086
|
systemPrompt,
|
|
@@ -20732,6 +21088,30 @@ function createAgentEvalHarness(options) {
|
|
|
20732
21088
|
request,
|
|
20733
21089
|
attempt: 1,
|
|
20734
21090
|
tools,
|
|
21091
|
+
onReplyDelta: async (delta) => {
|
|
21092
|
+
await emitProgress(onProgress, {
|
|
21093
|
+
phase: "generation",
|
|
21094
|
+
status: "running",
|
|
21095
|
+
scenarioId: conversation.label,
|
|
21096
|
+
stepId: turnId,
|
|
21097
|
+
iteration: iteration + 1,
|
|
21098
|
+
templateId: renderedPrompt.templateId,
|
|
21099
|
+
templateVersion: renderedPrompt.templateVersion,
|
|
21100
|
+
title: "Generated text reply delta",
|
|
21101
|
+
message: delta,
|
|
21102
|
+
data: { delta }
|
|
21103
|
+
});
|
|
21104
|
+
},
|
|
21105
|
+
onCodeDelta: async (delta) => {
|
|
21106
|
+
const parsed = consumeGranularReasoningOnlyChunk(
|
|
21107
|
+
generatedReasoningBuffer,
|
|
21108
|
+
delta
|
|
21109
|
+
);
|
|
21110
|
+
generatedReasoningBuffer = parsed.buffer;
|
|
21111
|
+
for (const line of parsed.reasoningLines) {
|
|
21112
|
+
await emitGeneratedReasoningLine(line);
|
|
21113
|
+
}
|
|
21114
|
+
},
|
|
20735
21115
|
usageContext: {
|
|
20736
21116
|
sandboxId: conversation.environment.sandboxId,
|
|
20737
21117
|
environmentId: conversation.environment.environmentId,
|
|
@@ -20760,6 +21140,12 @@ function createAgentEvalHarness(options) {
|
|
|
20760
21140
|
usage: tokenUsageForGenerationOutput(generation)
|
|
20761
21141
|
}
|
|
20762
21142
|
});
|
|
21143
|
+
const generatedReasoningLines = generation.code ? consumeGranularReasoningOnlyChunk("", generation.code, {
|
|
21144
|
+
final: true
|
|
21145
|
+
}).reasoningLines : [];
|
|
21146
|
+
for (const line of generatedReasoningLines) {
|
|
21147
|
+
await emitGeneratedReasoningLine(line);
|
|
21148
|
+
}
|
|
20763
21149
|
const iterationLog = {
|
|
20764
21150
|
iteration: iteration + 1,
|
|
20765
21151
|
request,
|