@opengeni/worker-bundle 0.23.3-canary.0 → 0.23.4-canary.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/activities/agent-turn/admission.d.ts +10 -2
- package/dist/activities/agent-turn/claim.d.ts +1 -0
- package/dist/activities/agent-turn/codex.d.ts +2 -2
- package/dist/activities/agent-turn/list-models.d.ts +16 -0
- package/dist/activities/agent-turn/model-usage.d.ts +10 -1
- package/dist/activities/agent-turn/tool-environment.d.ts +1 -0
- package/dist/activities/agent-turn/tool-policy.d.ts +36 -5
- package/dist/activities/agent-turn/turn-context.d.ts +2 -0
- package/dist/activities/automations.d.ts +1 -0
- package/dist/activities/capabilities.d.ts +2 -1
- package/dist/activities/goals.d.ts +11 -0
- package/dist/activities/image-generation-references.d.ts +2 -1
- package/dist/activities/scheduled-tasks.d.ts +1 -0
- package/dist/activities/types.d.ts +8 -0
- package/dist/{activities-control-52W5IDWM.js → activities-control-SGU2WEVB.js} +206 -97
- package/dist/activities-control-SGU2WEVB.js.map +1 -0
- package/dist/activities-control.d.ts +2 -0
- package/dist/{activities-turn-A2G2KLSY.js → activities-turn-7EAQXW6Q.js} +301 -65
- package/dist/activities-turn-7EAQXW6Q.js.map +1 -0
- package/dist/activities.d.ts +2 -0
- package/dist/{chunk-IPVMCAW5.js → chunk-S2QVRVJW.js} +85 -23
- package/dist/chunk-S2QVRVJW.js.map +1 -0
- package/dist/{chunk-GFNXVZVQ.js → chunk-TJIPCHMP.js} +3 -2
- package/dist/chunk-TJIPCHMP.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +29 -6
- package/dist/index.js.map +1 -1
- package/dist/observability-metrics.d.ts +1 -0
- package/dist/workflow-bundle.js +26 -3
- package/dist/workflows/activities.d.ts +5 -0
- package/dist/workflows/automations.d.ts +5 -0
- package/package.json +17 -17
- package/src/activities/agent-run-admission.ts +7 -1
- package/src/activities/agent-turn/admission.ts +28 -6
- package/src/activities/agent-turn/claim.ts +25 -5
- package/src/activities/agent-turn/codex.ts +2 -2
- package/src/activities/agent-turn/compaction-prep.ts +2 -0
- package/src/activities/agent-turn/list-models.ts +101 -0
- package/src/activities/agent-turn/model-usage.ts +88 -42
- package/src/activities/agent-turn/run.ts +6 -3
- package/src/activities/agent-turn/stream-attempt.ts +8 -0
- package/src/activities/agent-turn/tool-environment.ts +62 -1
- package/src/activities/agent-turn/tool-policy.ts +58 -5
- package/src/activities/agent-turn/turn-context.ts +4 -0
- package/src/activities/automations.ts +122 -67
- package/src/activities/capabilities.ts +72 -2
- package/src/activities/goals.ts +107 -31
- package/src/activities/image-generation-references.ts +9 -9
- package/src/activities/scheduled-tasks.ts +120 -26
- package/src/activities/site-auth-maintenance.ts +12 -12
- package/src/activities/types.ts +6 -0
- package/src/activities.ts +1 -0
- package/src/activity-services.ts +4 -1
- package/src/github-rest-mcp.ts +2 -1
- package/src/index.ts +19 -4
- package/src/observability-metrics.ts +2 -0
- package/src/workflows/activities.ts +15 -0
- package/src/workflows/automations.ts +21 -2
- package/dist/activities-control-52W5IDWM.js.map +0 -1
- package/dist/activities-turn-A2G2KLSY.js.map +0 -1
- package/dist/chunk-GFNXVZVQ.js.map +0 -1
- package/dist/chunk-IPVMCAW5.js.map +0 -1
package/dist/activities.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ export declare function createActivityTestHarness(dependencies?: ActivityDepende
|
|
|
14
14
|
} | null>;
|
|
15
15
|
reconcileCodexCapacityWait: (input: import("./activities.js").ReconcileCodexCapacityWaitInput) => Promise<import("./activities.js").ReconcileCodexCapacityWaitResult>;
|
|
16
16
|
maintainBrowserStateArtifacts: () => Promise<import("./activities/browser-state-artifact-reaper.js").MaintainBrowserStateArtifactsResult>;
|
|
17
|
+
settleAutomationRunFailure: (input: import("./activities.js").DispatchAutomationRunInput) => Promise<void>;
|
|
17
18
|
dispatchAutomationRun: (input: import("./activities.js").DispatchAutomationRunInput) => Promise<import("./activities.js").DispatchAutomationRunResult>;
|
|
18
19
|
indexDocument: (input: import("./activities.js").IndexDocumentInput) => Promise<{
|
|
19
20
|
id: string;
|
|
@@ -222,6 +223,7 @@ export declare const expireSessionInteractionIntervention: (input: import("./act
|
|
|
222
223
|
export declare const markSessionIdle: (input: import("./activities/types.js").MarkSessionIdleInput) => Promise<void>;
|
|
223
224
|
export declare const dispatchScheduledTaskRun: (input: import("./activities.js").DispatchScheduledTaskRunInput) => Promise<import("./activities.js").DispatchScheduledTaskRunResult>;
|
|
224
225
|
export declare const dispatchAutomationRun: (input: import("./activities.js").DispatchAutomationRunInput) => Promise<import("./activities.js").DispatchAutomationRunResult>;
|
|
226
|
+
export declare const settleAutomationRunFailure: (input: import("./activities.js").DispatchAutomationRunInput) => Promise<void>;
|
|
225
227
|
export declare const runKnowledgeSourceSyncBatch: (input: import("./activities.js").RunKnowledgeSourceSyncBatchInput) => Promise<import("./activities.js").RunKnowledgeSourceSyncBatchResult>;
|
|
226
228
|
export declare const enqueueGoalRetryWake: (input: import("./activities.js").MaybeContinueGoalInput) => Promise<void>;
|
|
227
229
|
export declare const maybeContinueGoal: (input: import("./activities.js").MaybeContinueGoalInput) => Promise<import("./activities.js").MaybeContinueGoalResult>;
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
observabilityEventLogger
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-TJIPCHMP.js";
|
|
4
4
|
|
|
5
5
|
// src/activity-services.ts
|
|
6
6
|
import { dbSearchPath, getSettings, resolveNatsControlPlaneAuth } from "@opengeni/config";
|
|
7
7
|
import { configureChildLifecycleNotices, createDb } from "@opengeni/db";
|
|
8
8
|
import { createNatsEventBus } from "@opengeni/events";
|
|
9
9
|
import { createObservability } from "@opengeni/observability";
|
|
10
|
+
import { resolveCatalogSettings } from "@opengeni/core";
|
|
10
11
|
import { createObjectStorage } from "@opengeni/storage";
|
|
11
12
|
|
|
12
13
|
// src/personal-github-git-credentials.ts
|
|
@@ -400,9 +401,11 @@ function createSharedActivityServices(dependencies) {
|
|
|
400
401
|
});
|
|
401
402
|
const controlPlaneAuth = resolveNatsControlPlaneAuth(settings);
|
|
402
403
|
const db = dependencies.db ?? dbClient.db;
|
|
404
|
+
const resolvedSettings = (await resolveCatalogSettings(db, settings)).settings;
|
|
403
405
|
configureChildLifecycleNotices({ enabled: settings.childLifecycleNoticesEnabled });
|
|
404
406
|
return {
|
|
405
|
-
settings,
|
|
407
|
+
settings: resolvedSettings,
|
|
408
|
+
catalogSourceSettings: settings,
|
|
406
409
|
db,
|
|
407
410
|
bus: dependencies.bus ?? await createNatsEventBus(
|
|
408
411
|
settings.natsUrl,
|
|
@@ -972,7 +975,13 @@ function createCodexCapacityActivities(services) {
|
|
|
972
975
|
import {
|
|
973
976
|
allowedFirstPartyMcpToolsForSession,
|
|
974
977
|
configuredStaticUsageLimits,
|
|
975
|
-
policyProviderIdForModel
|
|
978
|
+
policyProviderIdForModel,
|
|
979
|
+
resolveModelProvider,
|
|
980
|
+
resolveTurnExecutionPolicyV1,
|
|
981
|
+
withCodexCatalogProvider,
|
|
982
|
+
withXaiSubscriptionCatalogProvider,
|
|
983
|
+
WORKSPACE_GATEWAY_MODEL_ID_PREFIX,
|
|
984
|
+
WORKSPACE_OPENROUTER_MODEL_ID_PREFIX
|
|
976
985
|
} from "@opengeni/config";
|
|
977
986
|
import {
|
|
978
987
|
evaluateWorkspaceModelPolicy,
|
|
@@ -990,6 +999,11 @@ import {
|
|
|
990
999
|
requireSession,
|
|
991
1000
|
sumUsageQuantity
|
|
992
1001
|
} from "@opengeni/db";
|
|
1002
|
+
import {
|
|
1003
|
+
modelFundingForAdmission,
|
|
1004
|
+
resolveCatalogSettings as resolveCatalogSettings2,
|
|
1005
|
+
resolveWorkspaceCatalogSettings
|
|
1006
|
+
} from "@opengeni/core";
|
|
993
1007
|
function createGoalActivities(services) {
|
|
994
1008
|
async function enqueueGoalRetryWake(input) {
|
|
995
1009
|
const { db } = await services();
|
|
@@ -1005,35 +1019,40 @@ function createGoalActivities(services) {
|
|
|
1005
1019
|
});
|
|
1006
1020
|
}
|
|
1007
1021
|
async function maybeContinueGoal(input) {
|
|
1008
|
-
const
|
|
1022
|
+
const service = await services();
|
|
1023
|
+
const { db, bus } = service;
|
|
1024
|
+
const catalogSourceSettings = service.catalogSourceSettings ?? service.settings;
|
|
1009
1025
|
const existingGoal = await getSessionGoal(db, input.workspaceId, input.sessionId);
|
|
1010
1026
|
if (!existingGoal || existingGoal.status !== "active") {
|
|
1011
1027
|
return { action: "none" };
|
|
1012
1028
|
}
|
|
1029
|
+
let settings = (await resolveCatalogSettings2(db, catalogSourceSettings)).settings;
|
|
1013
1030
|
const session = await requireSession(db, input.workspaceId, input.sessionId);
|
|
1014
1031
|
const latestStartedTurn = await getLatestStartedSessionTurn(
|
|
1015
1032
|
db,
|
|
1016
1033
|
input.workspaceId,
|
|
1017
1034
|
input.sessionId
|
|
1018
1035
|
);
|
|
1019
|
-
|
|
1036
|
+
const inheritedContinuationModel = latestStartedTurn?.model ?? session.model;
|
|
1037
|
+
let continuationModel = inheritedContinuationModel;
|
|
1020
1038
|
const continuationReasoningEffort = latestStartedTurn?.reasoningEffort ?? session.reasoningEffort;
|
|
1021
1039
|
const continuationLatencyMode = latestStartedTurn?.latencyMode ?? session.latencyMode;
|
|
1022
|
-
let modelPolicyBlocked = null;
|
|
1023
1040
|
const workspaceModelPolicy = await getWorkspaceModelPolicy(db, input.workspaceId);
|
|
1024
|
-
if (
|
|
1025
|
-
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
if (continuationModel !== session.model && !policyBlocks(session.model)) {
|
|
1031
|
-
continuationModel = session.model;
|
|
1032
|
-
} else {
|
|
1033
|
-
modelPolicyBlocked = `workspace model policy blocks model "${continuationModel}"; pick an allowed model or change the workspace model policy`;
|
|
1034
|
-
}
|
|
1035
|
-
}
|
|
1041
|
+
if (inheritedContinuationModel.startsWith(WORKSPACE_GATEWAY_MODEL_ID_PREFIX) || inheritedContinuationModel.startsWith(WORKSPACE_OPENROUTER_MODEL_ID_PREFIX) || session.model.startsWith(WORKSPACE_GATEWAY_MODEL_ID_PREFIX) || session.model.startsWith(WORKSPACE_OPENROUTER_MODEL_ID_PREFIX)) {
|
|
1042
|
+
settings = (await resolveWorkspaceCatalogSettings(db, catalogSourceSettings, {
|
|
1043
|
+
accountId: input.accountId,
|
|
1044
|
+
workspaceId: input.workspaceId,
|
|
1045
|
+
retainedProductModelIds: [inheritedContinuationModel, session.model]
|
|
1046
|
+
})).settings;
|
|
1036
1047
|
}
|
|
1048
|
+
const modelDecision = goalContinuationModelDecision({
|
|
1049
|
+
settings,
|
|
1050
|
+
workspaceModelPolicy,
|
|
1051
|
+
inheritedModel: inheritedContinuationModel,
|
|
1052
|
+
sessionModel: session.model
|
|
1053
|
+
});
|
|
1054
|
+
continuationModel = modelDecision.model;
|
|
1055
|
+
let modelPolicyBlocked = modelDecision.blocked;
|
|
1037
1056
|
if (!modelPolicyBlocked && session.codexCompactionMode === "remote_v2" && !isCodexBilledModel(continuationModel)) {
|
|
1038
1057
|
modelPolicyBlocked = `session is locked to Codex remote compaction v2; model "${continuationModel}" is not a Codex subscription model`;
|
|
1039
1058
|
}
|
|
@@ -1043,13 +1062,27 @@ function createGoalActivities(services) {
|
|
|
1043
1062
|
workspaceId: input.workspaceId,
|
|
1044
1063
|
model: continuationModel
|
|
1045
1064
|
});
|
|
1065
|
+
const fundedWithoutCredits = goalContinuationFundedWithoutCredits(
|
|
1066
|
+
settings,
|
|
1067
|
+
continuationModel,
|
|
1068
|
+
isCodexRun
|
|
1069
|
+
);
|
|
1046
1070
|
const budgetBlocked = await goalRunBudgetBlocked(
|
|
1047
1071
|
settings,
|
|
1048
1072
|
db,
|
|
1049
1073
|
input.accountId,
|
|
1050
1074
|
input.workspaceId,
|
|
1051
|
-
|
|
1075
|
+
fundedWithoutCredits
|
|
1052
1076
|
);
|
|
1077
|
+
const turnExecutionPolicy = resolveTurnExecutionPolicyV1(settings, {
|
|
1078
|
+
modelId: continuationModel,
|
|
1079
|
+
requestedModelId: null,
|
|
1080
|
+
modelSource: "continuation",
|
|
1081
|
+
reasoningEffort: continuationReasoningEffort,
|
|
1082
|
+
reasoningSource: "continuation",
|
|
1083
|
+
latencyMode: continuationLatencyMode,
|
|
1084
|
+
latencyModeSource: "continuation"
|
|
1085
|
+
});
|
|
1053
1086
|
const decision = await materializeGoalContinuation(db, {
|
|
1054
1087
|
accountId: input.accountId,
|
|
1055
1088
|
workspaceId: input.workspaceId,
|
|
@@ -1070,6 +1103,7 @@ function createGoalActivities(services) {
|
|
|
1070
1103
|
model: continuationModel,
|
|
1071
1104
|
reasoningEffort: continuationReasoningEffort,
|
|
1072
1105
|
latencyMode: continuationLatencyMode,
|
|
1106
|
+
turnExecutionPolicy,
|
|
1073
1107
|
tools: withFirstPartyTools(settings, session.tools),
|
|
1074
1108
|
sandboxBackend: session.sandboxBackend
|
|
1075
1109
|
},
|
|
@@ -1100,6 +1134,34 @@ function createGoalActivities(services) {
|
|
|
1100
1134
|
maybeContinueGoal
|
|
1101
1135
|
};
|
|
1102
1136
|
}
|
|
1137
|
+
function goalContinuationModelDecision(input) {
|
|
1138
|
+
const catalogSettings = input.settings.supergrokSubscriptionEnabled ? withXaiSubscriptionCatalogProvider(
|
|
1139
|
+
input.settings.codexSubscriptionEnabled ? withCodexCatalogProvider(input.settings) : input.settings
|
|
1140
|
+
) : input.settings.codexSubscriptionEnabled ? withCodexCatalogProvider(input.settings) : input.settings;
|
|
1141
|
+
const policyBlocks = (modelId) => input.workspaceModelPolicy !== null && !evaluateWorkspaceModelPolicy(input.workspaceModelPolicy, {
|
|
1142
|
+
providerId: policyProviderIdForModel(catalogSettings, modelId),
|
|
1143
|
+
modelId
|
|
1144
|
+
}).allowed;
|
|
1145
|
+
const candidates = [.../* @__PURE__ */ new Set([input.inheritedModel, input.sessionModel])];
|
|
1146
|
+
for (const model of candidates) {
|
|
1147
|
+
if (resolveModelProvider(catalogSettings, model) && !policyBlocks(model)) {
|
|
1148
|
+
return { model, blocked: null };
|
|
1149
|
+
}
|
|
1150
|
+
}
|
|
1151
|
+
if (!resolveModelProvider(catalogSettings, input.inheritedModel)) {
|
|
1152
|
+
return {
|
|
1153
|
+
model: input.inheritedModel,
|
|
1154
|
+
blocked: `model "${input.inheritedModel}" is no longer in the deployment or workspace catalog; choose an available model before resuming the goal`
|
|
1155
|
+
};
|
|
1156
|
+
}
|
|
1157
|
+
return {
|
|
1158
|
+
model: input.inheritedModel,
|
|
1159
|
+
blocked: `workspace model policy blocks model "${input.inheritedModel}"; pick an allowed model or change the workspace model policy`
|
|
1160
|
+
};
|
|
1161
|
+
}
|
|
1162
|
+
function goalContinuationFundedWithoutCredits(settings, model, codexBilled) {
|
|
1163
|
+
return modelFundingForAdmission(settings, model, codexBilled).fundedWithoutCredits;
|
|
1164
|
+
}
|
|
1103
1165
|
function goalContinuationPrompt(_goal, _autoContinuation, _cap, options = {}) {
|
|
1104
1166
|
const waitingGuidance = options.goalWaitAvailable ? [
|
|
1105
1167
|
"Waiting on child sessions or external events:",
|
|
@@ -1166,8 +1228,8 @@ function withFirstPartyTools(settings, tools) {
|
|
|
1166
1228
|
}
|
|
1167
1229
|
return mergeToolRefs(tools, [{ kind: "mcp", id: "opengeni" }]);
|
|
1168
1230
|
}
|
|
1169
|
-
async function goalRunBudgetBlocked(settings, db, accountId, workspaceId,
|
|
1170
|
-
if (!
|
|
1231
|
+
async function goalRunBudgetBlocked(settings, db, accountId, workspaceId, fundedWithoutCredits) {
|
|
1232
|
+
if (!fundedWithoutCredits && (settings.billingMode === "stripe" || settings.usageLimitsMode === "managed")) {
|
|
1171
1233
|
const balance = await getBillingBalance(db, accountId);
|
|
1172
1234
|
if (balance.balanceMicros <= 0) {
|
|
1173
1235
|
return "insufficient OpenGeni credits";
|
|
@@ -1175,7 +1237,7 @@ async function goalRunBudgetBlocked(settings, db, accountId, workspaceId, isCode
|
|
|
1175
1237
|
}
|
|
1176
1238
|
if (settings.usageLimitsMode === "static" || settings.usageLimitsMode === "managed") {
|
|
1177
1239
|
const limits = configuredStaticUsageLimits(settings);
|
|
1178
|
-
if (!
|
|
1240
|
+
if (!fundedWithoutCredits && limits.maxMonthlyCostMicrosPerAccount) {
|
|
1179
1241
|
const used = await sumUsageQuantity(db, {
|
|
1180
1242
|
accountId,
|
|
1181
1243
|
eventType: "model.cost",
|
|
@@ -4932,4 +4994,4 @@ export {
|
|
|
4932
4994
|
codexUsageLimitFailurePayload,
|
|
4933
4995
|
CODEX_USAGE_LIMIT_MAX_RESUME_MS
|
|
4934
4996
|
};
|
|
4935
|
-
//# sourceMappingURL=chunk-
|
|
4997
|
+
//# sourceMappingURL=chunk-S2QVRVJW.js.map
|