@claudexor/orchestrator 3.6.0 → 3.8.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/account-resolution.d.ts +3 -0
- package/dist/account-resolution.d.ts.map +1 -1
- package/dist/account-resolution.js +7 -0
- package/dist/account-resolution.js.map +1 -1
- package/dist/deepScanReducer.d.ts.map +1 -1
- package/dist/deepScanReducer.js +2 -1
- package/dist/deepScanReducer.js.map +1 -1
- package/dist/modelGovernance.d.ts +35 -4
- package/dist/modelGovernance.d.ts.map +1 -1
- package/dist/modelGovernance.js +71 -27
- package/dist/modelGovernance.js.map +1 -1
- package/dist/orchestrator-credentials.d.ts.map +1 -1
- package/dist/orchestrator-credentials.js +7 -1
- package/dist/orchestrator-credentials.js.map +1 -1
- package/dist/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator.js +15 -20
- package/dist/orchestrator.js.map +1 -1
- package/dist/plannerAttempt.d.ts.map +1 -1
- package/dist/plannerAttempt.js +2 -1
- package/dist/plannerAttempt.js.map +1 -1
- package/dist/routeContext.d.ts +4 -1
- package/dist/routeContext.d.ts.map +1 -1
- package/dist/routeContext.js +8 -3
- package/dist/routeContext.js.map +1 -1
- package/package.json +17 -17
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plannerAttempt.d.ts","sourceRoot":"","sources":["../src/plannerAttempt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAGL,KAAK,kBAAkB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EACV,qBAAqB,EACrB,YAAY,EACZ,cAAc,EACd,MAAM,EACN,YAAY,EACb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAKL,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"plannerAttempt.d.ts","sourceRoot":"","sources":["../src/plannerAttempt.ts"],"names":[],"mappings":"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"}
|
package/dist/plannerAttempt.js
CHANGED
|
@@ -6,6 +6,7 @@ import { finalizeAttempt, unrecoveredToolErrorFailure, unwrapWorkReportEnvelope,
|
|
|
6
6
|
import { createAttemptTelemetry, observeAttemptTelemetry, setAttemptOutcome, telemetrySummary, unrecoveredToolErrors, webUnsatisfied, } from "./attemptTelemetry.js";
|
|
7
7
|
import { settleGrantedAttemptLease } from "./attemptUsageCost.js";
|
|
8
8
|
import { observeNativeSessionEvent } from "./credential-profiles.js";
|
|
9
|
+
import { runModelGovernedRoute } from "./modelGovernance.js";
|
|
9
10
|
import { harnessEventPayload, observeAuthSwitch, observeBudgetSignals, redactHarnessEvent, safeErrorMessage, } from "./runSupport.js";
|
|
10
11
|
export async function runPlannerAttempt(deps, args) {
|
|
11
12
|
const { input, contract, taskId, log, paths, ledger, routed, attemptId } = args;
|
|
@@ -96,7 +97,7 @@ export async function runPlannerAttempt(deps, args) {
|
|
|
96
97
|
...(knobs.ignored.length > 0 ? { ignored_settings: knobs.ignored } : {}),
|
|
97
98
|
});
|
|
98
99
|
if (!input.signal?.aborted) {
|
|
99
|
-
const watchedPlan = withInactivityWatchdog(
|
|
100
|
+
const watchedPlan = withInactivityWatchdog(runModelGovernedRoute(routed, spec), {
|
|
100
101
|
timeoutMs: deps.inactivityTimeoutMs(input.repoRoot),
|
|
101
102
|
countsAsProgress: countsAsAgentProgress,
|
|
102
103
|
onTimeout: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plannerAttempt.js","sourceRoot":"","sources":["../src/plannerAttempt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,mBAAmB,EAAqB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EACL,cAAc,EACd,qBAAqB,EAErB,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,eAAe,EACf,2BAA2B,EAC3B,wBAAwB,EACxB,kBAAkB,GAGnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,GAEf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"plannerAttempt.js","sourceRoot":"","sources":["../src/plannerAttempt.ts"],"names":[],"mappings":"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"}
|
package/dist/routeContext.d.ts
CHANGED
|
@@ -13,6 +13,9 @@ export interface ResolvedRouteContext {
|
|
|
13
13
|
cwd: string;
|
|
14
14
|
/** Scoped env the run will receive verbatim in `spec.env`. */
|
|
15
15
|
env: Record<string, string>;
|
|
16
|
+
/** Optional per-harness durable lane env. Thread ask/plan routes use this so
|
|
17
|
+
* doctor, model inventory, and the eventual spawn share one HOME. */
|
|
18
|
+
envForHarness?: (harnessId: string) => Record<string, string> | null;
|
|
16
19
|
/** Release the scoped state after the run (or a failed routing) ends. */
|
|
17
20
|
dispose: () => void;
|
|
18
21
|
}
|
|
@@ -20,7 +23,7 @@ export interface ResolvedRouteContext {
|
|
|
20
23
|
* Resolve the read-only route context: the scoped throwaway HOME every
|
|
21
24
|
* read-only attempt of this run will spawn with (workspace §6/§7 containment).
|
|
22
25
|
*/
|
|
23
|
-
export declare function resolveReadOnlyRouteContext(execRoot: string): ResolvedRouteContext;
|
|
26
|
+
export declare function resolveReadOnlyRouteContext(execRoot: string, envForHarness?: ResolvedRouteContext["envForHarness"]): ResolvedRouteContext;
|
|
24
27
|
/**
|
|
25
28
|
* The readiness truth that ADMITS one candidate route. Without a route
|
|
26
29
|
* context this is the host-level statusAll evidence unchanged. With one, the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routeContext.d.ts","sourceRoot":"","sources":["../src/routeContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,yEAAyE;IACzE,GAAG,EAAE,MAAM,CAAC;IACZ,8DAA8D;IAC9D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,yEAAyE;IACzE,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"routeContext.d.ts","sourceRoot":"","sources":["../src/routeContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,yEAAyE;IACzE,GAAG,EAAE,MAAM,CAAC;IACZ,8DAA8D;IAC9D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B;yEACqE;IACrE,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACrE,yEAAyE;IACzE,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,GACpD,oBAAoB,CAQtB;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAA;CAAE,EACrF,GAAG,EAAE,oBAAoB,GAAG,SAAS,EACrC,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GACrC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAepC"}
|
package/dist/routeContext.js
CHANGED
|
@@ -3,9 +3,14 @@ import { WorkspaceManager } from "@claudexor/workspace";
|
|
|
3
3
|
* Resolve the read-only route context: the scoped throwaway HOME every
|
|
4
4
|
* read-only attempt of this run will spawn with (workspace §6/§7 containment).
|
|
5
5
|
*/
|
|
6
|
-
export function resolveReadOnlyRouteContext(execRoot) {
|
|
6
|
+
export function resolveReadOnlyRouteContext(execRoot, envForHarness) {
|
|
7
7
|
const scoped = new WorkspaceManager(execRoot).readOnlyHomeEnv();
|
|
8
|
-
return {
|
|
8
|
+
return {
|
|
9
|
+
cwd: execRoot,
|
|
10
|
+
env: scoped.env,
|
|
11
|
+
...(envForHarness ? { envForHarness } : {}),
|
|
12
|
+
dispose: scoped.dispose,
|
|
13
|
+
};
|
|
9
14
|
}
|
|
10
15
|
/**
|
|
11
16
|
* The readiness truth that ADMITS one candidate route. Without a route
|
|
@@ -23,7 +28,7 @@ export async function candidateStatusInRouteContext(gateway, ctx, harnessId, aut
|
|
|
23
28
|
return host;
|
|
24
29
|
const scoped = await gateway.routeStatus(harnessId, {
|
|
25
30
|
cwd: ctx.cwd,
|
|
26
|
-
env: ctx.env,
|
|
31
|
+
env: ctx.envForHarness?.(harnessId) ?? ctx.env,
|
|
27
32
|
authPreference,
|
|
28
33
|
fresh: true,
|
|
29
34
|
});
|
package/dist/routeContext.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routeContext.js","sourceRoot":"","sources":["../src/routeContext.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"routeContext.js","sourceRoot":"","sources":["../src/routeContext.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAqBxD;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CACzC,QAAgB,EAChB,aAAqD;IAErD,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IAChE,OAAO;QACL,GAAG,EAAE,QAAQ;QACb,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,OAAqF,EACrF,GAAqC,EACrC,SAAiB,EACjB,cAA8B,EAC9B,UAAsC;IAEtC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE;QAClD,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,GAAG,EAAE,GAAG,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,GAAG;QAC9C,cAAc;QACd,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IACH,4EAA4E;IAC5E,yEAAyE;IACzE,qDAAqD;IACrD,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@claudexor/orchestrator",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.8.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Hub that composes all subsystems and implements the three canonical intents (ask, plan, agent) with their strategy flags (ask deep-scan, plan solo/council, agent best-of-N race, attempt caps, until-clean, create, delegate).",
|
|
6
6
|
"type": "module",
|
|
@@ -17,24 +17,24 @@
|
|
|
17
17
|
],
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"ajv": "^8.20.0",
|
|
20
|
-
"@claudexor/arbitration": "3.
|
|
21
|
-
"@claudexor/
|
|
22
|
-
"@claudexor/
|
|
23
|
-
"@claudexor/
|
|
24
|
-
"@claudexor/
|
|
25
|
-
"@claudexor/core": "3.
|
|
26
|
-
"@claudexor/delivery": "3.
|
|
27
|
-
"@claudexor/event-log": "3.
|
|
28
|
-
"@claudexor/gateway": "3.
|
|
29
|
-
"@claudexor/policy": "3.
|
|
30
|
-
"@claudexor/review": "3.
|
|
31
|
-
"@claudexor/schema": "3.
|
|
32
|
-
"@claudexor/synthesis": "3.
|
|
33
|
-
"@claudexor/util": "3.
|
|
34
|
-
"@claudexor/workspace": "3.
|
|
20
|
+
"@claudexor/arbitration": "3.8.0",
|
|
21
|
+
"@claudexor/budget": "3.8.0",
|
|
22
|
+
"@claudexor/context": "3.8.0",
|
|
23
|
+
"@claudexor/artifact-store": "3.8.0",
|
|
24
|
+
"@claudexor/config": "3.8.0",
|
|
25
|
+
"@claudexor/core": "3.8.0",
|
|
26
|
+
"@claudexor/delivery": "3.8.0",
|
|
27
|
+
"@claudexor/event-log": "3.8.0",
|
|
28
|
+
"@claudexor/gateway": "3.8.0",
|
|
29
|
+
"@claudexor/policy": "3.8.0",
|
|
30
|
+
"@claudexor/review": "3.8.0",
|
|
31
|
+
"@claudexor/schema": "3.8.0",
|
|
32
|
+
"@claudexor/synthesis": "3.8.0",
|
|
33
|
+
"@claudexor/util": "3.8.0",
|
|
34
|
+
"@claudexor/workspace": "3.8.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@claudexor/harness-fake": "3.
|
|
37
|
+
"@claudexor/harness-fake": "3.8.0"
|
|
38
38
|
},
|
|
39
39
|
"repository": {
|
|
40
40
|
"type": "git",
|