@tokenfactory/acc-runner 0.47.7 → 0.47.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build-info.generated.d.ts +1 -1
- package/dist/build-info.generated.js +2 -2
- package/dist/codex-model-catalog.d.ts +4 -0
- package/dist/codex-model-catalog.d.ts.map +1 -1
- package/dist/codex-model-catalog.js +21 -2
- package/dist/codex-model-catalog.js.map +1 -1
- package/dist/cost-pricing.d.ts.map +1 -1
- package/dist/cost-pricing.js +39 -1
- package/dist/cost-pricing.js.map +1 -1
- package/dist/engines/codex.d.ts +5 -0
- package/dist/engines/codex.d.ts.map +1 -1
- package/dist/engines/codex.js +63 -1
- package/dist/engines/codex.js.map +1 -1
- package/dist/engines/gemini.d.ts +31 -19
- package/dist/engines/gemini.d.ts.map +1 -1
- package/dist/engines/gemini.js +71 -35
- package/dist/engines/gemini.js.map +1 -1
- package/dist/engines/registry.d.ts +9 -1
- package/dist/engines/registry.d.ts.map +1 -1
- package/dist/engines/registry.js +17 -6
- package/dist/engines/registry.js.map +1 -1
- package/dist/prepr-gate.d.ts +52 -0
- package/dist/prepr-gate.d.ts.map +1 -1
- package/dist/prepr-gate.js +91 -16
- package/dist/prepr-gate.js.map +1 -1
- package/dist/process-tree.d.ts +115 -0
- package/dist/process-tree.d.ts.map +1 -0
- package/dist/process-tree.js +272 -0
- package/dist/process-tree.js.map +1 -0
- package/dist/program.d.ts.map +1 -1
- package/dist/program.js +21 -1
- package/dist/program.js.map +1 -1
- package/dist/remote-ops/command.d.ts +7 -0
- package/dist/remote-ops/command.d.ts.map +1 -0
- package/dist/remote-ops/command.js +34 -0
- package/dist/remote-ops/command.js.map +1 -0
- package/dist/remote-ops/daemon.d.ts +62 -0
- package/dist/remote-ops/daemon.d.ts.map +1 -0
- package/dist/remote-ops/daemon.js +192 -0
- package/dist/remote-ops/daemon.js.map +1 -0
- package/dist/remote-ops/invocation.d.ts +26 -0
- package/dist/remote-ops/invocation.d.ts.map +1 -0
- package/dist/remote-ops/invocation.js +31 -0
- package/dist/remote-ops/invocation.js.map +1 -0
- package/dist/remote-ops/validate.d.ts +35 -0
- package/dist/remote-ops/validate.d.ts.map +1 -0
- package/dist/remote-ops/validate.js +60 -0
- package/dist/remote-ops/validate.js.map +1 -0
- package/dist/runtime/rework.d.ts.map +1 -1
- package/dist/runtime/rework.js +16 -0
- package/dist/runtime/rework.js.map +1 -1
- package/dist/task-runner.d.ts +3 -3
- package/dist/task-runner.d.ts.map +1 -1
- package/dist/task-runner.js +81 -10
- package/dist/task-runner.js.map +1 -1
- package/dist/user-cli/tasks.d.ts +9 -0
- package/dist/user-cli/tasks.d.ts.map +1 -1
- package/dist/user-cli/tasks.js +83 -3
- package/dist/user-cli/tasks.js.map +1 -1
- package/dist/watch.d.ts +77 -0
- package/dist/watch.d.ts.map +1 -1
- package/dist/watch.js +168 -8
- package/dist/watch.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export declare const BUILD_COMMIT_SHA = "
|
|
1
|
+
export declare const BUILD_COMMIT_SHA = "eb4b9ee4fd4ce6ef46511960a00fb69dceb64357";
|
|
2
2
|
export declare const BUILD_DIST_SHA256 = "pending-build";
|
|
3
3
|
//# sourceMappingURL=build-info.generated.d.ts.map
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
// Generated by scripts/gen-build-info.mjs. Do not edit by hand.
|
|
2
|
-
export const BUILD_COMMIT_SHA = "
|
|
3
|
-
export const BUILD_DIST_SHA256 = "
|
|
2
|
+
export const BUILD_COMMIT_SHA = "eb4b9ee4fd4ce6ef46511960a00fb69dceb64357";
|
|
3
|
+
export const BUILD_DIST_SHA256 = "e1cfd0be17d3ecc22976f4d8fc17a47495f39510a2575088806f3fa34ebe5337";
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
import type { RunnerCapsStore } from "./build-fingerprint.js";
|
|
2
2
|
export declare function visibleCodexModelIds(data: unknown): string[];
|
|
3
|
+
/** The CLI marks its effective picker default in model/list. Never infer it
|
|
4
|
+
* from list order: an account can see several models with different prices. */
|
|
5
|
+
export declare function visibleCodexDefaultModelId(data: unknown): string | null;
|
|
3
6
|
/** Dedicated companion instances do not boot-register like `watch` runners.
|
|
4
7
|
* Publish the additive model capability with a narrow id-scoped caps merge. */
|
|
5
8
|
export declare function ensureChatModelSelectionCaps(store: RunnerCapsStore, runnerId: string): Promise<void>;
|
|
6
9
|
export declare function discoverCodexModelIds(binary?: string, timeoutMs?: number): Promise<string[]>;
|
|
10
|
+
export declare function discoverCodexDefaultModel(binary?: string, timeoutMs?: number): Promise<string | null>;
|
|
7
11
|
/** Best-effort authenticated publication for the exact bound runner identity. */
|
|
8
12
|
export declare function reportCodexModelCatalog(opts: {
|
|
9
13
|
publicUrl: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-model-catalog.d.ts","sourceRoot":"","sources":["../src/codex-model-catalog.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,EAAE,CAU5D;AAED;+EAC+E;AAC/E,wBAAsB,4BAA4B,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ1G;
|
|
1
|
+
{"version":3,"file":"codex-model-catalog.d.ts","sourceRoot":"","sources":["../src/codex-model-catalog.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,EAAE,CAU5D;AAED;+EAC+E;AAC/E,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAOvE;AAED;+EAC+E;AAC/E,wBAAsB,4BAA4B,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ1G;AAwED,wBAAsB,qBAAqB,CAAC,MAAM,SAAU,EAAE,SAAS,SAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAElG;AAED,wBAAsB,yBAAyB,CAAC,MAAM,SAAU,EAAE,SAAS,SAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAE3G;AAED,iFAAiF;AACjF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhB"}
|
|
@@ -20,6 +20,15 @@ export function visibleCodexModelIds(data) {
|
|
|
20
20
|
});
|
|
21
21
|
return [...new Set(ids)].slice(0, MAX_MODELS);
|
|
22
22
|
}
|
|
23
|
+
/** The CLI marks its effective picker default in model/list. Never infer it
|
|
24
|
+
* from list order: an account can see several models with different prices. */
|
|
25
|
+
export function visibleCodexDefaultModelId(data) {
|
|
26
|
+
if (!Array.isArray(data))
|
|
27
|
+
return null;
|
|
28
|
+
const defaults = data.filter((entry) => entry && typeof entry === "object" && entry.isDefault === true);
|
|
29
|
+
const visible = new Set(visibleCodexModelIds(defaults));
|
|
30
|
+
return visible.size === 1 ? [...visible][0] : null;
|
|
31
|
+
}
|
|
23
32
|
/** Dedicated companion instances do not boot-register like `watch` runners.
|
|
24
33
|
* Publish the additive model capability with a narrow id-scoped caps merge. */
|
|
25
34
|
export async function ensureChatModelSelectionCaps(store, runnerId) {
|
|
@@ -33,7 +42,7 @@ export async function ensureChatModelSelectionCaps(store, runnerId) {
|
|
|
33
42
|
if (write.error)
|
|
34
43
|
throw new Error("runner model caps publication unavailable");
|
|
35
44
|
}
|
|
36
|
-
|
|
45
|
+
async function discoverCodexModels(binary = "codex", timeoutMs = 8_000) {
|
|
37
46
|
const child = spawn(binary, ["app-server", "--stdio"], {
|
|
38
47
|
stdio: ["pipe", "pipe", "ignore"],
|
|
39
48
|
});
|
|
@@ -83,6 +92,7 @@ export async function discoverCodexModelIds(binary = "codex", timeoutMs = 8_000)
|
|
|
83
92
|
let cursor = null;
|
|
84
93
|
const seenCursors = new Set();
|
|
85
94
|
const ids = new Set();
|
|
95
|
+
const defaults = new Set();
|
|
86
96
|
do {
|
|
87
97
|
const result = await request("model/list", {
|
|
88
98
|
limit: 20, includeHidden: false,
|
|
@@ -90,13 +100,16 @@ export async function discoverCodexModelIds(binary = "codex", timeoutMs = 8_000)
|
|
|
90
100
|
});
|
|
91
101
|
for (const id of visibleCodexModelIds(result?.data))
|
|
92
102
|
ids.add(id);
|
|
103
|
+
const defaultModel = visibleCodexDefaultModelId(result?.data);
|
|
104
|
+
if (defaultModel)
|
|
105
|
+
defaults.add(defaultModel);
|
|
93
106
|
cursor = typeof result?.nextCursor === "string" ? result.nextCursor : null;
|
|
94
107
|
if (cursor && seenCursors.has(cursor))
|
|
95
108
|
throw new Error("repeated model/list cursor");
|
|
96
109
|
if (cursor)
|
|
97
110
|
seenCursors.add(cursor);
|
|
98
111
|
} while (cursor && ids.size < MAX_MODELS);
|
|
99
|
-
return [...ids].slice(0, MAX_MODELS);
|
|
112
|
+
return { ids: [...ids].slice(0, MAX_MODELS), defaultModel: defaults.size === 1 ? [...defaults][0] : null };
|
|
100
113
|
}
|
|
101
114
|
finally {
|
|
102
115
|
clearTimeout(timer);
|
|
@@ -104,6 +117,12 @@ export async function discoverCodexModelIds(binary = "codex", timeoutMs = 8_000)
|
|
|
104
117
|
child.kill();
|
|
105
118
|
}
|
|
106
119
|
}
|
|
120
|
+
export async function discoverCodexModelIds(binary = "codex", timeoutMs = 8_000) {
|
|
121
|
+
return (await discoverCodexModels(binary, timeoutMs)).ids;
|
|
122
|
+
}
|
|
123
|
+
export async function discoverCodexDefaultModel(binary = "codex", timeoutMs = 8_000) {
|
|
124
|
+
return (await discoverCodexModels(binary, timeoutMs)).defaultModel;
|
|
125
|
+
}
|
|
107
126
|
/** Best-effort authenticated publication for the exact bound runner identity. */
|
|
108
127
|
export async function reportCodexModelCatalog(opts) {
|
|
109
128
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-model-catalog.js","sourceRoot":"","sources":["../src/codex-model-catalog.ts"],"names":[],"mappings":"AAAA;;yDAEyD;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,MAAM,QAAQ,GAAG,sCAAsC,CAAC;AACxD,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,UAAU,oBAAoB,CAAC,IAAa;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACjC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,KAAyE,CAAC;QACvF,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACpG,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QAC7F,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;AAChD,CAAC;AAED;+EAC+E;AAC/E,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,KAAsB,EAAE,QAAgB;IACzF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACzF,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACjG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAA+B,CAAC,CAAC,CAAC,EAAE,CAAC;IACnD,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;SACtC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAChF,IAAI,KAAK,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;AAChF,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"codex-model-catalog.js","sourceRoot":"","sources":["../src/codex-model-catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cost-pricing.d.ts","sourceRoot":"","sources":["../src/cost-pricing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAO,MAAM,CAAC;IACxB,WAAW,EAAM,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAiB,MAAM,CAAC;IACrC,aAAa,CAAC,EAAgB,MAAM,CAAC;IACrC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,uBAAuB,CAAC,EAAM,MAAM,CAAC;CACtC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAgB,MAAM,CAAC;IACnC,YAAY,CAAC,EAAe,MAAM,CAAC;IACnC,oBAAoB,CAAC,EAAO,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAG,MAAM,CAAC;IACnC,OAAO,CAAC,EAAoB,MAAM,CAAC;CACpC;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAQ,MAAM,CAAC;IAC3B,aAAa,EAAO,MAAM,CAAC;IAC3B,iBAAiB,EAAG,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"cost-pricing.d.ts","sourceRoot":"","sources":["../src/cost-pricing.ts"],"names":[],"mappings":"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"}
|
package/dist/cost-pricing.js
CHANGED
|
@@ -16,6 +16,30 @@ const HAIKU = {
|
|
|
16
16
|
cacheWritePer1M: 1.25,
|
|
17
17
|
cacheReadPer1M: 0.1,
|
|
18
18
|
};
|
|
19
|
+
const GPT5 = {
|
|
20
|
+
inputPer1M: 12.5,
|
|
21
|
+
outputPer1M: 100,
|
|
22
|
+
cacheWritePer1M: 12.5,
|
|
23
|
+
cacheReadPer1M: 12.5,
|
|
24
|
+
};
|
|
25
|
+
const GPT5_MINI = {
|
|
26
|
+
inputPer1M: 0.25,
|
|
27
|
+
outputPer1M: 2,
|
|
28
|
+
cacheWritePer1M: 0.25,
|
|
29
|
+
cacheReadPer1M: 0.25,
|
|
30
|
+
};
|
|
31
|
+
// https://developers.openai.com/api/docs/models/gpt-5.5
|
|
32
|
+
// OpenAI's published standard API rate is $5/$30 per million text
|
|
33
|
+
// tokens (cached input $0.50/M). This is an estimated-equivalent rate for
|
|
34
|
+
// ChatGPT subscription runs, not a claim that the subscription is billed per
|
|
35
|
+
// token. Keep an exact row so the old gpt-5 substring fallback cannot undercount
|
|
36
|
+
// a newer Codex CLI default.
|
|
37
|
+
const GPT5_5 = {
|
|
38
|
+
inputPer1M: 5,
|
|
39
|
+
outputPer1M: 30,
|
|
40
|
+
cacheWritePer1M: 5,
|
|
41
|
+
cacheReadPer1M: 0.5,
|
|
42
|
+
};
|
|
19
43
|
// RVU-2 (FU-RVU2R): claude-opus-4-8 is the current reviewer/coding default the
|
|
20
44
|
// operator CLI subscription runs. It is priced $5/$25 per Mtok — DISTINCT from
|
|
21
45
|
// opus-4-7 ($15/$75). Without an exact row the substring fallback ("opus" →
|
|
@@ -33,6 +57,10 @@ const OPUS_4_8 = {
|
|
|
33
57
|
* server. Kept in sync with `api/llm/pricing.ts` by hand.
|
|
34
58
|
*/
|
|
35
59
|
export const MODEL_PRICING = {
|
|
60
|
+
"gpt-5.5": GPT5_5,
|
|
61
|
+
"gpt-5-codex": GPT5,
|
|
62
|
+
"gpt-5": GPT5,
|
|
63
|
+
"gpt-5-mini": GPT5_MINI,
|
|
36
64
|
"claude-opus-4-8": OPUS_4_8,
|
|
37
65
|
"claude-opus-4-7": OPUS,
|
|
38
66
|
"claude-opus-4-6": OPUS,
|
|
@@ -43,6 +71,12 @@ export const MODEL_PRICING = {
|
|
|
43
71
|
"claude-haiku-4-5": HAIKU,
|
|
44
72
|
"claude-haiku-4": HAIKU,
|
|
45
73
|
};
|
|
74
|
+
const OPENAI_MODEL_PRICING = {
|
|
75
|
+
"gpt-5.5": MODEL_PRICING["gpt-5.5"],
|
|
76
|
+
"gpt-5-codex": MODEL_PRICING["gpt-5-codex"],
|
|
77
|
+
"gpt-5": MODEL_PRICING["gpt-5"],
|
|
78
|
+
"gpt-5-mini": MODEL_PRICING["gpt-5-mini"],
|
|
79
|
+
};
|
|
46
80
|
const FALLBACK_VERSION = "fallback-2026-02-01";
|
|
47
81
|
let currentPricing = MODEL_PRICING;
|
|
48
82
|
let currentVersion = FALLBACK_VERSION;
|
|
@@ -72,7 +106,7 @@ export async function fetchPricing(baseUrl) {
|
|
|
72
106
|
if (Object.keys(table).length === 0) {
|
|
73
107
|
throw new Error("empty providers.anthropic");
|
|
74
108
|
}
|
|
75
|
-
currentPricing = table;
|
|
109
|
+
currentPricing = { ...OPENAI_MODEL_PRICING, ...table };
|
|
76
110
|
currentVersion = typeof body.version === "string" ? body.version : "unknown";
|
|
77
111
|
return { ok: true, version: currentVersion };
|
|
78
112
|
}
|
|
@@ -118,6 +152,10 @@ export function pricingFor(model) {
|
|
|
118
152
|
// table immediately governs unknown model ids too.
|
|
119
153
|
if (currentPricing[model])
|
|
120
154
|
return currentPricing[model];
|
|
155
|
+
if (model.includes("gpt-5-mini"))
|
|
156
|
+
return currentPricing["gpt-5-mini"] ?? GPT5_MINI;
|
|
157
|
+
if (model.includes("gpt-5") || model.includes("codex"))
|
|
158
|
+
return currentPricing["gpt-5"] ?? GPT5;
|
|
121
159
|
if (model.includes("opus"))
|
|
122
160
|
return currentPricing["claude-opus-4-7"] ?? OPUS;
|
|
123
161
|
if (model.includes("haiku"))
|
package/dist/cost-pricing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cost-pricing.js","sourceRoot":"","sources":["../src/cost-pricing.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cost-pricing.js","sourceRoot":"","sources":["../src/cost-pricing.ts"],"names":[],"mappings":"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"}
|
package/dist/engines/codex.d.ts
CHANGED
|
@@ -23,5 +23,10 @@ export declare function buildCodexArgs(modelId?: string | null): string[];
|
|
|
23
23
|
* pinned to "api-key" — so this only decides the first attempt.
|
|
24
24
|
*/
|
|
25
25
|
export declare function resolveCodexSpawnMode(base?: NodeJS.ProcessEnv): CodexAuthMode;
|
|
26
|
+
export declare function codexConfigPath(env?: NodeJS.ProcessEnv, home?: string): string;
|
|
27
|
+
export declare function parseCodexConfigModel(configToml: string): string | null;
|
|
28
|
+
export declare function resolveCodexCostEventFallbackModel(env?: NodeJS.ProcessEnv, home?: string): string | null;
|
|
29
|
+
/** Codex may print its effective model in the CLI banner on stderr. */
|
|
30
|
+
export declare function codexReportedModelFromStderr(stderr: string): string | null;
|
|
26
31
|
export declare const codexEngine: AgentEngine;
|
|
27
32
|
//# sourceMappingURL=codex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/engines/codex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/engines/codex.ts"],"names":[],"mappings":"AAuBA,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAoC,MAAM,YAAY,CAAC;AAIhF;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAGhF;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,EAAE,CAKhE;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,GAAE,MAAM,CAAC,UAAwB,GAAG,aAAa,CAG1F;AAoGD,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,EAAE,IAAI,SAAe,GAAG,MAAM,CAGjG;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQvE;AAED,wBAAgB,kCAAkC,CAChD,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,IAAI,SAAe,GAClB,MAAM,GAAG,IAAI,CAUf;AAED,uEAAuE;AACvE,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ1E;AA6CD,eAAO,MAAM,WAAW,EAAE,WAWzB,CAAC"}
|
package/dist/engines/codex.js
CHANGED
|
@@ -15,6 +15,9 @@
|
|
|
15
15
|
* TOLERANT (the v0.44 tolerant-parser lesson) so a point-release event-shape
|
|
16
16
|
* drift degrades to best-effort extraction rather than a hard failure.
|
|
17
17
|
*/
|
|
18
|
+
import fs from "node:fs";
|
|
19
|
+
import os from "node:os";
|
|
20
|
+
import path from "node:path";
|
|
18
21
|
import { execa } from "execa";
|
|
19
22
|
import { classifyCodexExit } from "../failure-classifier.js";
|
|
20
23
|
import { openaiApiKey, resolveCodexAuthPreference, initialCodexAuthMode, withOpenAiAuth, } from "../provider-auth.js";
|
|
@@ -81,6 +84,25 @@ function pickString(obj, keys) {
|
|
|
81
84
|
}
|
|
82
85
|
return null;
|
|
83
86
|
}
|
|
87
|
+
function looksLikeCodexModelId(value) {
|
|
88
|
+
return /^(?:gpt|o[0-9]|codex)[a-zA-Z0-9._:/-]*$/.test(value.trim());
|
|
89
|
+
}
|
|
90
|
+
function pickModelDeep(value, depth = 0) {
|
|
91
|
+
if (depth > 4)
|
|
92
|
+
return null;
|
|
93
|
+
const obj = asRecord(value);
|
|
94
|
+
if (!obj)
|
|
95
|
+
return null;
|
|
96
|
+
const direct = pickString(obj, ["model", "model_id", "modelId", "default_model", "defaultModel"]);
|
|
97
|
+
if (direct && looksLikeCodexModelId(direct))
|
|
98
|
+
return direct.trim();
|
|
99
|
+
for (const key of ["config", "session", "settings", "payload", "data", "turn", "response", "item", "msg"]) {
|
|
100
|
+
const nested = pickModelDeep(obj[key], depth + 1);
|
|
101
|
+
if (nested)
|
|
102
|
+
return nested;
|
|
103
|
+
}
|
|
104
|
+
return null;
|
|
105
|
+
}
|
|
84
106
|
/** Map a codex/OpenAI usage object onto the shared ClaudeUsage shape. */
|
|
85
107
|
function pickUsage(obj) {
|
|
86
108
|
const u = asRecord(obj.usage);
|
|
@@ -128,7 +150,7 @@ function parseCodexResult(stdout) {
|
|
|
128
150
|
(nested ? pickString(nested, ["text", "message", "content", "output_text"]) : null);
|
|
129
151
|
if (text)
|
|
130
152
|
out.result = text;
|
|
131
|
-
const model =
|
|
153
|
+
const model = pickModelDeep(obj) ?? (nested ? pickModelDeep(nested) : null);
|
|
132
154
|
if (model)
|
|
133
155
|
out.model = model;
|
|
134
156
|
const usage = pickUsage(obj) ?? (nested ? pickUsage(nested) : null);
|
|
@@ -139,6 +161,46 @@ function parseCodexResult(stdout) {
|
|
|
139
161
|
? out
|
|
140
162
|
: null;
|
|
141
163
|
}
|
|
164
|
+
export function codexConfigPath(env = process.env, home = os.homedir()) {
|
|
165
|
+
const codexHome = env.CODEX_HOME?.trim();
|
|
166
|
+
return path.join(codexHome || path.join(home, ".codex"), "config.toml");
|
|
167
|
+
}
|
|
168
|
+
export function parseCodexConfigModel(configToml) {
|
|
169
|
+
for (const line of configToml.split(/\r?\n/)) {
|
|
170
|
+
const quoted = /^\s*model\s*=\s*["']([^"']+)["']\s*(?:#.*)?$/.exec(line);
|
|
171
|
+
if (quoted?.[1]?.trim())
|
|
172
|
+
return quoted[1].trim();
|
|
173
|
+
const bare = /^\s*model\s*=\s*([^\s#]+)\s*(?:#.*)?$/.exec(line);
|
|
174
|
+
if (bare?.[1]?.trim())
|
|
175
|
+
return bare[1].trim();
|
|
176
|
+
}
|
|
177
|
+
return null;
|
|
178
|
+
}
|
|
179
|
+
export function resolveCodexCostEventFallbackModel(env = process.env, home = os.homedir()) {
|
|
180
|
+
try {
|
|
181
|
+
const configured = parseCodexConfigModel(fs.readFileSync(codexConfigPath(env, home), "utf8"));
|
|
182
|
+
if (configured)
|
|
183
|
+
return configured;
|
|
184
|
+
}
|
|
185
|
+
catch {
|
|
186
|
+
// Missing/unreadable config is normal for API-key or fresh-login hosts.
|
|
187
|
+
}
|
|
188
|
+
// The CLI's default model changes independently of the runner. Guessing one
|
|
189
|
+
// here turns an unknown model into incorrect cost attribution.
|
|
190
|
+
return null;
|
|
191
|
+
}
|
|
192
|
+
/** Codex may print its effective model in the CLI banner on stderr. */
|
|
193
|
+
export function codexReportedModelFromStderr(stderr) {
|
|
194
|
+
const jsonModel = parseCodexResult(stderr)?.model;
|
|
195
|
+
if (jsonModel && looksLikeCodexModelId(jsonModel))
|
|
196
|
+
return jsonModel;
|
|
197
|
+
for (const line of stderr.split(/\r?\n/)) {
|
|
198
|
+
const match = /^\s*model:\s*(\S+)\s*$/i.exec(line);
|
|
199
|
+
if (match?.[1] && looksLikeCodexModelId(match[1]))
|
|
200
|
+
return match[1];
|
|
201
|
+
}
|
|
202
|
+
return null;
|
|
203
|
+
}
|
|
142
204
|
function classifyCodexFailure(exitCode, stderr, stdout, durationMs) {
|
|
143
205
|
return classifyCodexExit(exitCode, stderr, stdout, durationMs);
|
|
144
206
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/engines/codex.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/engines/codex.ts"],"names":[],"mappings":"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"}
|
package/dist/engines/gemini.d.ts
CHANGED
|
@@ -4,12 +4,13 @@ import { type ParsedChatStreamEvent } from "./chat-stream.js";
|
|
|
4
4
|
/**
|
|
5
5
|
* Feature flag: `engines.gemini_enabled`. DEFAULT OFF. Truthy env forms only
|
|
6
6
|
* ("1"/"true"/"yes"/"on"). Kept as an env read (config.ts is out of this track's
|
|
7
|
-
* scope) so the flag stays fully self-contained. NOTE:
|
|
8
|
-
* engine
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* unless a runner opts
|
|
7
|
+
* scope) so the flag stays fully self-contained. NOTE: like codex, gemini is a
|
|
8
|
+
* BATCH engine in engines/registry.ts (FLAGGED_ENGINES); its chat lane is retired
|
|
9
|
+
* (0.47.8, see the file header) so it is no longer in the chat-lane registry.
|
|
10
|
+
* This flag gates whether a runner ADVERTISES gemini in its caps.engines, which
|
|
11
|
+
* is what the dispatch gate (mig 0229 / dor-gate.ts) keys on. Registration ≠
|
|
12
|
+
* dispatch: the default fleet never lands a task on gemini unless a runner opts
|
|
13
|
+
* in.
|
|
13
14
|
*/
|
|
14
15
|
export declare function geminiEngineEnabled(env?: NodeJS.ProcessEnv): boolean;
|
|
15
16
|
/** Trimmed Google model credential from `env`, or "" when unset/blank. Accepts
|
|
@@ -43,21 +44,26 @@ export declare function parseGeminiResult(stdout: string): EngineResult;
|
|
|
43
44
|
/**
|
|
44
45
|
* The tool-bus fence: acc-mcp only. `enforced` is always true for this adapter
|
|
45
46
|
* (the chat lane never runs unfenced), and `allowedServers` is exactly the
|
|
46
|
-
* acc-mcp server id (`ACC_MCP_KEY`, shared with mcp-spawn.ts).
|
|
47
|
+
* acc-mcp server id (`ACC_MCP_KEY`, shared with mcp-spawn.ts). Part of the
|
|
48
|
+
* unchanged batch engine object; the chat lane that would consult it is refused
|
|
49
|
+
* by name at the registry (0.47.8, see the file header), so this static fence
|
|
50
|
+
* declaration is left exactly as it was.
|
|
47
51
|
*/
|
|
48
52
|
export declare function accMcpToolBusOnly(): AccMcpToolBusFence;
|
|
49
53
|
/**
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
*
|
|
53
|
-
* --allowed-mcp-server-names acc → ONLY the acc-mcp MCP server's tools
|
|
54
|
-
* --exclude-tools <native…> → defence-in-depth: disable every
|
|
55
|
-
* built-in shell/file/web tool so none can escape the acc-mcp fence
|
|
56
|
-
* --yolo → non-interactive; the fence, not an
|
|
57
|
-
* approval prompt, is the boundary (mirrors the batch lane rationale).
|
|
58
|
-
* `-m` is forwarded only when the turn pins a non-blank model.
|
|
54
|
+
* Why the gemini chat lane is refused by name (0.47.8). Shown by the registry,
|
|
55
|
+
* by `buildGeminiChatArgs` and by `streamTurn`, so the reason reaches the
|
|
56
|
+
* operator whichever path selected the engine.
|
|
59
57
|
*/
|
|
60
|
-
export declare
|
|
58
|
+
export declare const GEMINI_CHAT_RETIRED_REASON: string;
|
|
59
|
+
/**
|
|
60
|
+
* Retired (0.47.8, ledger 62): throws. The argv this built —
|
|
61
|
+
* `--output-format stream-json --allowed-mcp-server-names acc --exclude-tools
|
|
62
|
+
* <claude-code tool names> --yolo` — is rejected by gemini CLI 0.59 at argument
|
|
63
|
+
* parsing (`Unknown arguments: exclude-tools`), so no turn ever ran. Kept as a
|
|
64
|
+
* throwing stub so any caller that still reaches it fails loudly with the reason.
|
|
65
|
+
*/
|
|
66
|
+
export declare function buildGeminiChatArgs(_opts?: {
|
|
61
67
|
modelId?: string | null;
|
|
62
68
|
}): string[];
|
|
63
69
|
/**
|
|
@@ -80,8 +86,14 @@ export type ParsedGeminiStreamEvent = ParsedChatStreamEvent;
|
|
|
80
86
|
* - `null` for a non-JSON line, a keep-alive, or an event with no delta.
|
|
81
87
|
*/
|
|
82
88
|
export declare function parseGeminiStreamLine(line: string): ParsedGeminiStreamEvent | null;
|
|
83
|
-
/** Static capability declaration for the gemini
|
|
84
|
-
*
|
|
89
|
+
/** Static capability declaration for the gemini build — the BATCH engine's
|
|
90
|
+
* advertised contract, carried by the FLAGGED_ENGINES registry entry. 0.47.8
|
|
91
|
+
* retired the chat LANE by name at the registry (RETIRED_CHAT_ENGINES); that
|
|
92
|
+
* retirement deliberately does NOT move this matrix, because the batch engine's
|
|
93
|
+
* advertised surface must stay unchanged. The chat-path read of gemini's
|
|
94
|
+
* capabilities is `engineCapabilities("gemini")`, which is null now that gemini
|
|
95
|
+
* is not a registered chat engine — that null is the only change the chat
|
|
96
|
+
* companion sees. */
|
|
85
97
|
export declare const GEMINI_CAPABILITIES: EngineCapabilityMatrix;
|
|
86
98
|
export interface GeminiEngineDeps {
|
|
87
99
|
/** Spawn the chat child (default: real `gemini` stream-json spawn). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/engines/gemini.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/engines/gemini.ts"],"names":[],"mappings":"AAmDA,OAAO,EAAS,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAMtD,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EAGrB,sBAAsB,EAGtB,YAAY,EAEZ,uBAAuB,EAExB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAkB,KAAK,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAI9E;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAGjF;AAED;;8CAE8C;AAC9C,wBAAgB,YAAY,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAEzE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,EAAE,CAKjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CAIlF;AA+ED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAyB9D;AA8CD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,IAAI,kBAAkB,CAEtD;AAED;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,QAIM,CAAC;AAE9C;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,GAAG,MAAM,EAAE,CAErF;AAQD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,uBAAuB,GAAG,MAAM,CAAC,UAAU,CAK9E;AAgBD,iGAAiG;AACjG,MAAM,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AAE5D;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,uBAAuB,GAAG,IAAI,CAyBlF;AA2ED;;;;;;;sBAOsB;AACtB,eAAO,MAAM,mBAAmB,EAAE,sBAOjC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,uEAAuE;IACvE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,uBAAuB,KAAK,iBAAiB,CAAC;IACjE,0FAA0F;IAC1F,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC;IACjC,mHAAmH;IACnH,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,uGAAuG;IACvG,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,sFAAsF;IACtF,WAAW,CAAC,EAAE,MAAM;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CACtD;AAYD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,GAAE,gBAAqB,GAAG,qBAAqB,CA0BrF;AAED,wDAAwD;AACxD,eAAO,MAAM,YAAY,EAAE,qBAA4C,CAAC"}
|