audit-tools 0.32.28 → 0.32.30
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/audit/cli/args.d.ts +10 -1
- package/dist/audit/cli/args.d.ts.map +1 -1
- package/dist/audit/cli/args.js +18 -1
- package/dist/audit/cli/args.js.map +1 -1
- package/dist/audit/cli/dispatch/quotaPool.d.ts.map +1 -1
- package/dist/audit/cli/dispatch/quotaPool.js +3 -6
- package/dist/audit/cli/dispatch/quotaPool.js.map +1 -1
- package/dist/audit/cli/hybridDispatch.d.ts.map +1 -1
- package/dist/audit/cli/hybridDispatch.js +3 -12
- package/dist/audit/cli/hybridDispatch.js.map +1 -1
- package/dist/audit/cli/nextStepCommand.d.ts.map +1 -1
- package/dist/audit/cli/nextStepCommand.js +9 -2
- package/dist/audit/cli/nextStepCommand.js.map +1 -1
- package/dist/audit/cli/nextStepHelpers.d.ts.map +1 -1
- package/dist/audit/cli/nextStepHelpers.js +8 -2
- package/dist/audit/cli/nextStepHelpers.js.map +1 -1
- package/dist/audit/cli/quotaCommand.d.ts.map +1 -1
- package/dist/audit/cli/quotaCommand.js +7 -8
- package/dist/audit/cli/quotaCommand.js.map +1 -1
- package/dist/audit/cli/rollingAuditDispatch.d.ts +6 -0
- package/dist/audit/cli/rollingAuditDispatch.d.ts.map +1 -1
- package/dist/audit/cli/rollingAuditDispatch.js +10 -3
- package/dist/audit/cli/rollingAuditDispatch.js.map +1 -1
- package/dist/audit/quota/index.d.ts +10 -15
- package/dist/audit/quota/index.d.ts.map +1 -1
- package/dist/audit/quota/index.js +1 -1
- package/dist/audit/quota/index.js.map +1 -1
- package/dist/audit/supervisor/sessionConfig.d.ts +9 -1
- package/dist/audit/supervisor/sessionConfig.d.ts.map +1 -1
- package/dist/audit/supervisor/sessionConfig.js +28 -0
- package/dist/audit/supervisor/sessionConfig.js.map +1 -1
- package/dist/audit/validation/sessionConfig.d.ts.map +1 -1
- package/dist/audit/validation/sessionConfig.js +9 -0
- package/dist/audit/validation/sessionConfig.js.map +1 -1
- package/dist/remediate/index.d.ts.map +1 -1
- package/dist/remediate/index.js +14 -1
- package/dist/remediate/index.js.map +1 -1
- package/dist/remediate/quota/index.d.ts +2 -2
- package/dist/remediate/quota/index.d.ts.map +1 -1
- package/dist/remediate/quota/index.js +1 -1
- package/dist/remediate/quota/index.js.map +1 -1
- package/dist/remediate/steps/dispatch/waveScheduling.d.ts.map +1 -1
- package/dist/remediate/steps/dispatch/waveScheduling.js +9 -17
- package/dist/remediate/steps/dispatch/waveScheduling.js.map +1 -1
- package/dist/remediate/steps/nextStep.d.ts +7 -1
- package/dist/remediate/steps/nextStep.d.ts.map +1 -1
- package/dist/remediate/steps/nextStep.js +20 -6
- package/dist/remediate/steps/nextStep.js.map +1 -1
- package/dist/shared/dispatch/rollingDispatch.d.ts +0 -5
- package/dist/shared/dispatch/rollingDispatch.d.ts.map +1 -1
- package/dist/shared/dispatch/rollingDispatch.js +25 -19
- package/dist/shared/dispatch/rollingDispatch.js.map +1 -1
- package/dist/shared/index.d.ts +6 -6
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +5 -5
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/providers/providerPathGuard.d.ts +52 -1
- package/dist/shared/providers/providerPathGuard.d.ts.map +1 -1
- package/dist/shared/providers/providerPathGuard.js +62 -0
- package/dist/shared/providers/providerPathGuard.js.map +1 -1
- package/dist/shared/quota/apiPool.d.ts +22 -0
- package/dist/shared/quota/apiPool.d.ts.map +1 -1
- package/dist/shared/quota/apiPool.js +30 -0
- package/dist/shared/quota/apiPool.js.map +1 -1
- package/dist/shared/quota/capacity.d.ts +6 -6
- package/dist/shared/quota/capacity.d.ts.map +1 -1
- package/dist/shared/quota/capacity.js +3 -4
- package/dist/shared/quota/capacity.js.map +1 -1
- package/dist/shared/quota/claimRegistry.d.ts.map +1 -1
- package/dist/shared/quota/claimRegistry.js +8 -4
- package/dist/shared/quota/claimRegistry.js.map +1 -1
- package/dist/shared/quota/compositeQuotaSource.d.ts +0 -1
- package/dist/shared/quota/compositeQuotaSource.d.ts.map +1 -1
- package/dist/shared/quota/compositeQuotaSource.js +1 -1
- package/dist/shared/quota/compositeQuotaSource.js.map +1 -1
- package/dist/shared/quota/learnedQuotaSource.d.ts +9 -3
- package/dist/shared/quota/learnedQuotaSource.d.ts.map +1 -1
- package/dist/shared/quota/learnedQuotaSource.js +18 -9
- package/dist/shared/quota/learnedQuotaSource.js.map +1 -1
- package/dist/shared/quota/reservationLedger.d.ts.map +1 -1
- package/dist/shared/quota/reservationLedger.js +10 -3
- package/dist/shared/quota/reservationLedger.js.map +1 -1
- package/dist/shared/quota/scheduler.d.ts +0 -2
- package/dist/shared/quota/scheduler.d.ts.map +1 -1
- package/dist/shared/quota/scheduler.js +9 -27
- package/dist/shared/quota/scheduler.js.map +1 -1
- package/dist/shared/quota/state.d.ts +88 -19
- package/dist/shared/quota/state.d.ts.map +1 -1
- package/dist/shared/quota/state.js +182 -135
- package/dist/shared/quota/state.js.map +1 -1
- package/dist/shared/quota/types.d.ts +10 -15
- package/dist/shared/quota/types.d.ts.map +1 -1
- package/dist/shared/quota/types.js +0 -2
- package/dist/shared/quota/types.js.map +1 -1
- package/dist/shared/repair/brokeredDispatch.d.ts +9 -6
- package/dist/shared/repair/brokeredDispatch.d.ts.map +1 -1
- package/dist/shared/repair/brokeredDispatch.js +12 -20
- package/dist/shared/repair/brokeredDispatch.js.map +1 -1
- package/dist/shared/types/sessionConfig.d.ts +13 -12
- package/dist/shared/types/sessionConfig.d.ts.map +1 -1
- package/dist/shared/types/sessionConfig.js +0 -13
- package/dist/shared/types/sessionConfig.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { scheduleWave, classifyProvider } from '../quota/scheduler.js';
|
|
2
2
|
import { estimateTokensFromBytes, ESTIMATED_PROMPT_OVERHEAD_TOKENS } from '../tokens.js';
|
|
3
3
|
import { resolveContextBudget } from '../tokens.js';
|
|
4
|
-
import { getQuotaStatePath,
|
|
4
|
+
import { getQuotaStatePath, readQuotaStateForUpdate, writeQuotaState } from '../quota/state.js';
|
|
5
5
|
import { withFileLock } from '../quota/fileLock.js';
|
|
6
6
|
/**
|
|
7
7
|
* Deterministic-local per-slot token estimate: byte-derived estimate plus a
|
|
@@ -12,12 +12,16 @@ export function estimateSlotTokens(slot) {
|
|
|
12
12
|
return estimateTokensFromBytes(slot.payloadBytes) + ESTIMATED_PROMPT_OVERHEAD_TOKENS;
|
|
13
13
|
}
|
|
14
14
|
/**
|
|
15
|
-
* Classify whether a host is "capable" — i.e. it
|
|
15
|
+
* Classify whether a host is "capable" — i.e. it DECLARES real concurrency
|
|
16
16
|
* head-room ABOVE the conservative cold-start (first-contact) floor. On first
|
|
17
|
-
* contact, with no
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
17
|
+
* contact, with no reported host ceiling, a host sits AT the floor and is NOT yet
|
|
18
|
+
* capable; once it reports an active-subagent ceiling above the floor, it is.
|
|
19
|
+
* Single-sourced here so both halves classify identically off the SAME floor.
|
|
20
|
+
*
|
|
21
|
+
* Capability is DECLARED, never inferred: there is no observational evidence that
|
|
22
|
+
* can lift a host off the floor. (The former "any recorded safe concurrency
|
|
23
|
+
* bucket lifts the host" branch was a learned-concurrency inference — see
|
|
24
|
+
* `spec/audit/dispatch-admission-control.md`.)
|
|
21
25
|
*/
|
|
22
26
|
export function classifyCapableHost(input) {
|
|
23
27
|
// Cold-start floor comes from the single classifier struct (CE-005) — there is
|
|
@@ -27,16 +31,7 @@ export function classifyCapableHost(input) {
|
|
|
27
31
|
// gate, and this floor serves only the capable-vs-cold host classification.)
|
|
28
32
|
const floor = Math.max(1, classifyProvider(input.providerName).concurrencyFloor);
|
|
29
33
|
const reported = input.hostConcurrencyLimit?.active_subagents ?? null;
|
|
30
|
-
|
|
31
|
-
return true;
|
|
32
|
-
// Learned evidence (any recorded safe bucket) lifts the host off the floor.
|
|
33
|
-
const buckets = input.quotaStateEntry?.buckets ?? {};
|
|
34
|
-
for (const key of Object.keys(buckets)) {
|
|
35
|
-
const c = Number(key);
|
|
36
|
-
if (Number.isFinite(c) && c > floor)
|
|
37
|
-
return true;
|
|
38
|
-
}
|
|
39
|
-
return false;
|
|
34
|
+
return reported != null && reported > floor;
|
|
40
35
|
}
|
|
41
36
|
/**
|
|
42
37
|
* The over-budget gate: an admitted wave's estimated tokens must fit the pool's
|
|
@@ -99,11 +94,10 @@ function persistPoolCooldownBestEffort(poolKey, cooldownUntil) {
|
|
|
99
94
|
return;
|
|
100
95
|
}
|
|
101
96
|
void withFileLock(lockPath, async () => {
|
|
102
|
-
const state = await
|
|
97
|
+
const state = await readQuotaStateForUpdate("persistPoolCooldown");
|
|
103
98
|
const existing = state.entries[poolKey];
|
|
104
99
|
const entry = existing ?? {
|
|
105
100
|
updated_at: new Date().toISOString(),
|
|
106
|
-
buckets: {},
|
|
107
101
|
cooldown_until: null,
|
|
108
102
|
last_429_at: null,
|
|
109
103
|
};
|
|
@@ -158,7 +152,6 @@ export function createBrokeredRepairDispatch() {
|
|
|
158
152
|
? { ...effectiveQuotaStateEntry, cooldown_until: merged }
|
|
159
153
|
: {
|
|
160
154
|
updated_at: new Date().toISOString(),
|
|
161
|
-
buckets: {},
|
|
162
155
|
cooldown_until: merged,
|
|
163
156
|
last_429_at: null,
|
|
164
157
|
};
|
|
@@ -190,7 +183,6 @@ export function createBrokeredRepairDispatch() {
|
|
|
190
183
|
providerName: input.providerName,
|
|
191
184
|
sessionConfig: input.sessionConfig,
|
|
192
185
|
hostConcurrencyLimit: input.hostConcurrencyLimit ?? null,
|
|
193
|
-
quotaStateEntry: input.quotaStateEntry ?? null,
|
|
194
186
|
});
|
|
195
187
|
const { admittedSlots, estimatedTokens, refused } = fitWaveToBudget(input.slots, schedule.max_concurrent, schedule.resolved_limits);
|
|
196
188
|
let admission;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brokeredDispatch.js","sourceRoot":"","sources":["../../../src/shared/repair/brokeredDispatch.ts"],"names":[],"mappings":"AA+BA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"brokeredDispatch.js","sourceRoot":"","sources":["../../../src/shared/repair/brokeredDispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,16 +3,6 @@ import type { DispatchModelTier } from "./stepContract.js";
|
|
|
3
3
|
export declare const PROVIDER_NAMES: readonly ["auto", "local-subprocess", "subprocess-template", "claude-code", "codex", "opencode", "openai-compatible", "vscode-task", "antigravity"];
|
|
4
4
|
export type ProviderName = (typeof PROVIDER_NAMES)[number];
|
|
5
5
|
export type ResolvedProviderName = Exclude<ProviderName, "auto">;
|
|
6
|
-
/**
|
|
7
|
-
* The host's resolved provider identity for quota-key / driver-classification:
|
|
8
|
-
* the configured `sessionConfig.provider`, defaulting to the conversation host
|
|
9
|
-
* (`claude-code`) when unset or `auto`. Single-sourced so the `?? "claude-code"`
|
|
10
|
-
* default and the `auto`-exclusion live in ONE place rather than being re-spelled
|
|
11
|
-
* (with an ad-hoc cast) at each dispatch call site across both orchestrators.
|
|
12
|
-
*/
|
|
13
|
-
export declare function resolveHostProviderName(sessionConfig: {
|
|
14
|
-
provider?: ProviderName;
|
|
15
|
-
} | null | undefined): ResolvedProviderName;
|
|
16
6
|
/**
|
|
17
7
|
* The attended-vs-headless discriminator for dispatch (defect-1). TRUE (default,
|
|
18
8
|
* conversation-first) means an attended conversation host is driving THIS invocation
|
|
@@ -245,8 +235,6 @@ export interface QuotaConfig {
|
|
|
245
235
|
safety_margin?: number;
|
|
246
236
|
default_context_tokens?: number;
|
|
247
237
|
reserved_output_tokens?: number;
|
|
248
|
-
empirical_half_life_hours?: number;
|
|
249
|
-
ramp_up_enabled?: boolean;
|
|
250
238
|
host_active_subagent_limit?: number;
|
|
251
239
|
models?: Record<string, QuotaModelLimits>;
|
|
252
240
|
}
|
|
@@ -402,6 +390,19 @@ export interface ConfirmedProviderPoolRef {
|
|
|
402
390
|
}
|
|
403
391
|
export interface SessionConfig {
|
|
404
392
|
provider?: ProviderName;
|
|
393
|
+
/**
|
|
394
|
+
* Explicit override for the CONVERSATION-HOST identity — the auditor/agent
|
|
395
|
+
* actually driving THIS next-step process, whose account meter the dispatch
|
|
396
|
+
* fan-out is charged against (a quota-ATTRIBUTION key, distinct from
|
|
397
|
+
* `provider`, which may name a demoted headless backend that is only the
|
|
398
|
+
* per-packet worker). Normally left unset: `resolveConversationHostProvider`
|
|
399
|
+
* auto-detects the real host from the same in-session env signals the
|
|
400
|
+
* self-spawn guard reads (`isSelfSpawnBlocked` — CODEX* ⇒ codex, CLAUDECODE ⇒
|
|
401
|
+
* claude-code), defaulting to `claude-code`. Set this (via `--host-provider`)
|
|
402
|
+
* only to override that detection when the environment is ambiguous. `"auto"`
|
|
403
|
+
* is treated as unset (fall through to env detection).
|
|
404
|
+
*/
|
|
405
|
+
host_provider?: ProviderName;
|
|
405
406
|
timeout_ms?: number;
|
|
406
407
|
ui_mode?: SessionUiMode;
|
|
407
408
|
host_can_dispatch_subagents?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionConfig.d.ts","sourceRoot":"","sources":["../../../src/shared/types/sessionConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,eAAO,MAAM,cAAc,qJAUjB,CAAC;AACX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAC3D,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAEjE
|
|
1
|
+
{"version":3,"file":"sessionConfig.d.ts","sourceRoot":"","sources":["../../../src/shared/types/sessionConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,19 +10,6 @@ export const PROVIDER_NAMES = [
|
|
|
10
10
|
"vscode-task",
|
|
11
11
|
"antigravity",
|
|
12
12
|
];
|
|
13
|
-
/**
|
|
14
|
-
* The host's resolved provider identity for quota-key / driver-classification:
|
|
15
|
-
* the configured `sessionConfig.provider`, defaulting to the conversation host
|
|
16
|
-
* (`claude-code`) when unset or `auto`. Single-sourced so the `?? "claude-code"`
|
|
17
|
-
* default and the `auto`-exclusion live in ONE place rather than being re-spelled
|
|
18
|
-
* (with an ad-hoc cast) at each dispatch call site across both orchestrators.
|
|
19
|
-
*/
|
|
20
|
-
export function resolveHostProviderName(sessionConfig) {
|
|
21
|
-
const provider = sessionConfig?.provider;
|
|
22
|
-
if (provider === undefined || provider === "auto")
|
|
23
|
-
return "claude-code";
|
|
24
|
-
return provider;
|
|
25
|
-
}
|
|
26
13
|
/**
|
|
27
14
|
* The attended-vs-headless discriminator for dispatch (defect-1). TRUE (default,
|
|
28
15
|
* conversation-first) means an attended conversation host is driving THIS invocation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionConfig.js","sourceRoot":"","sources":["../../../src/shared/types/sessionConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,MAAM;IACN,kBAAkB;IAClB,qBAAqB;IACrB,aAAa;IACb,OAAO;IACP,UAAU;IACV,mBAAmB;IACnB,aAAa;IACb,aAAa;CACL,CAAC;AAIX
|
|
1
|
+
{"version":3,"file":"sessionConfig.js","sourceRoot":"","sources":["../../../src/shared/types/sessionConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,MAAM;IACN,kBAAkB;IAClB,qBAAqB;IACrB,aAAa;IACb,OAAO;IACP,UAAU;IACV,mBAAmB;IACnB,aAAa;IACb,aAAa;CACL,CAAC;AAIX;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,6BAA6B,CAAC,OAK7C;IACC,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC5D,MAAM,GAAG,GAAG,OAAO,CAAC,aAAa,EAAE,2BAA2B,CAAC;IAC/D,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClE,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,SAAS,EAAE,UAAU,CAAU,CAAC;AAoHjE,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,qBAAqB,EAAE,qBAAqB;IAC5C,aAAa,EAAE,aAAa;IAC5B,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,mBAAmB,EAAE,mBAAmB;IACxC,aAAa,EAAE,aAAa;IAC5B,WAAW,EAAE,aAAa;CAClB,CAAC;AAEX;;;;;GAKG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG;IAC3C,mBAAmB;IACnB,OAAO;IACP,UAAU;IACV,kBAAkB;IAClB,qBAAqB;CACb,CAAC;AA+LX;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,MAAM;IACN,WAAW;IACX,WAAW;IACX,MAAM;IACN,MAAM;CACE,CAAC;AACX,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC"}
|