pi-agent-flow 2.3.7 → 2.4.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/batch/execute.d.ts +7 -0
- package/dist/batch/execute.d.ts.map +1 -1
- package/dist/batch/execute.js +33 -1
- package/dist/batch/execute.js.map +1 -1
- package/dist/config/config.d.ts +11 -0
- package/dist/config/config.d.ts.map +1 -1
- package/dist/config/config.js +65 -4
- package/dist/config/config.js.map +1 -1
- package/dist/config/models.d.ts +11 -0
- package/dist/config/models.d.ts.map +1 -1
- package/dist/config/models.js +41 -2
- package/dist/config/models.js.map +1 -1
- package/dist/config/settings-resolver.d.ts +10 -0
- package/dist/config/settings-resolver.d.ts.map +1 -1
- package/dist/config/settings-resolver.js +13 -0
- package/dist/config/settings-resolver.js.map +1 -1
- package/dist/flow/audit-formatters.d.ts.map +1 -1
- package/dist/flow/audit-formatters.js +15 -2
- package/dist/flow/audit-formatters.js.map +1 -1
- package/dist/flow/continuation.d.ts.map +1 -1
- package/dist/flow/continuation.js +18 -13
- package/dist/flow/continuation.js.map +1 -1
- package/dist/flow/cycle-guard.d.ts.map +1 -1
- package/dist/flow/cycle-guard.js +32 -1
- package/dist/flow/cycle-guard.js.map +1 -1
- package/dist/flow/execute-single.d.ts.map +1 -1
- package/dist/flow/execute-single.js +41 -2
- package/dist/flow/execute-single.js.map +1 -1
- package/dist/flow/executor.d.ts.map +1 -1
- package/dist/flow/executor.js +1 -1
- package/dist/flow/executor.js.map +1 -1
- package/dist/flow/flow-args-prep.d.ts.map +1 -1
- package/dist/flow/flow-args-prep.js +6 -2
- package/dist/flow/flow-args-prep.js.map +1 -1
- package/dist/flow/store.d.ts.map +1 -1
- package/dist/flow/store.js +24 -0
- package/dist/flow/store.js.map +1 -1
- package/dist/flow/warp.d.ts.map +1 -1
- package/dist/flow/warp.js +45 -28
- package/dist/flow/warp.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +37 -8
- package/dist/index.js.map +1 -1
- package/dist/tools/trace.d.ts +11 -0
- package/dist/tools/trace.d.ts.map +1 -1
- package/dist/tools/trace.js +7 -3
- package/dist/tools/trace.js.map +1 -1
- package/dist/types/flow.d.ts.map +1 -1
- package/dist/types/flow.js +13 -11
- package/dist/types/flow.js.map +1 -1
- package/package.json +1 -1
package/dist/config/models.js
CHANGED
|
@@ -2,7 +2,7 @@ import * as fs from "node:fs";
|
|
|
2
2
|
import * as path from "node:path";
|
|
3
3
|
import { logWarn } from "./log.js";
|
|
4
4
|
import { getAgentDir, hasAgentDirOverride } from "./paths.js";
|
|
5
|
-
function getModelsJsonPath() {
|
|
5
|
+
export function getModelsJsonPath() {
|
|
6
6
|
const agentDir = getAgentDir();
|
|
7
7
|
const defaultPath = path.join(agentDir, "models.json");
|
|
8
8
|
if (!hasAgentDirOverride() && !fs.existsSync(defaultPath)) {
|
|
@@ -12,6 +12,19 @@ function getModelsJsonPath() {
|
|
|
12
12
|
}
|
|
13
13
|
return defaultPath;
|
|
14
14
|
}
|
|
15
|
+
const _modelsJsonCache = new Map();
|
|
16
|
+
export function readModelsJson() {
|
|
17
|
+
const filePath = getModelsJsonPath();
|
|
18
|
+
if (_modelsJsonCache.has(filePath))
|
|
19
|
+
return _modelsJsonCache.get(filePath);
|
|
20
|
+
const parsed = readSettingsJson(filePath);
|
|
21
|
+
_modelsJsonCache.set(filePath, parsed);
|
|
22
|
+
return parsed;
|
|
23
|
+
}
|
|
24
|
+
/** Clear the parsed models.json cache. Exposed for tests and future hot-reload boundaries. */
|
|
25
|
+
export function invalidateModelsJsonCache() {
|
|
26
|
+
_modelsJsonCache.clear();
|
|
27
|
+
}
|
|
15
28
|
function readSettingsJson(filePath) {
|
|
16
29
|
try {
|
|
17
30
|
const content = fs.readFileSync(filePath, "utf-8");
|
|
@@ -31,7 +44,7 @@ export function resolveModelContextWindow(model) {
|
|
|
31
44
|
return undefined;
|
|
32
45
|
const providerKey = parts[0];
|
|
33
46
|
const modelId = parts.slice(1).join("/");
|
|
34
|
-
const raw =
|
|
47
|
+
const raw = readModelsJson();
|
|
35
48
|
if (!isPlainObject(raw))
|
|
36
49
|
return undefined;
|
|
37
50
|
const providers = raw.providers;
|
|
@@ -54,4 +67,30 @@ export function resolveModelContextWindow(model) {
|
|
|
54
67
|
}
|
|
55
68
|
return undefined;
|
|
56
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
* Return whether a provider/model entry is known in models.json.
|
|
72
|
+
*
|
|
73
|
+
* `undefined` means the local model registry cannot answer authoritatively
|
|
74
|
+
* (for example, no provider/model form or unreadable models.json).
|
|
75
|
+
*/
|
|
76
|
+
export function hasConfiguredModel(model, registry) {
|
|
77
|
+
const parts = model.split("/");
|
|
78
|
+
if (parts.length < 2)
|
|
79
|
+
return undefined;
|
|
80
|
+
const providerKey = parts[0];
|
|
81
|
+
const modelId = parts.slice(1).join("/");
|
|
82
|
+
const raw = registry === undefined ? readModelsJson() : registry;
|
|
83
|
+
if (!isPlainObject(raw))
|
|
84
|
+
return undefined;
|
|
85
|
+
const providers = raw.providers;
|
|
86
|
+
if (!isPlainObject(providers))
|
|
87
|
+
return undefined;
|
|
88
|
+
const provider = providers[providerKey];
|
|
89
|
+
if (!isPlainObject(provider))
|
|
90
|
+
return undefined;
|
|
91
|
+
const models = provider.models;
|
|
92
|
+
if (!Array.isArray(models))
|
|
93
|
+
return undefined;
|
|
94
|
+
return models.some((m) => isPlainObject(m) && m.id === modelId);
|
|
95
|
+
}
|
|
57
96
|
//# sourceMappingURL=models.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/config/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE9D,
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/config/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,16 @@ import { type FlowConfig } from "../flow/agents.js";
|
|
|
8
8
|
import { type LoadedFlowModelConfigs } from "./config.js";
|
|
9
9
|
import { type Complexity } from "../flow/complexity.js";
|
|
10
10
|
import type { CompressionLevel } from "../core2/snapshot.js";
|
|
11
|
+
/**
|
|
12
|
+
* Lightweight re-resolution of tool-affecting settings only.
|
|
13
|
+
* Used by the settings-change emitter in index.ts to re-apply pi.setActiveTools
|
|
14
|
+
* without the full overhead of resolveSettings (which re-discovers flows, etc.).
|
|
15
|
+
*/
|
|
16
|
+
export declare function resolveToolSettings(pi: ExtensionAPI, cwd: string): {
|
|
17
|
+
toolOptimize: boolean;
|
|
18
|
+
traceEnabled: boolean;
|
|
19
|
+
batchReadEnabled: boolean;
|
|
20
|
+
};
|
|
11
21
|
export interface ResolvedSettings {
|
|
12
22
|
toolOptimize: boolean;
|
|
13
23
|
structuredOutput: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-resolver.d.ts","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAQN,KAAK,sBAAsB,EAC3B,MAAM,aAAa,CAAC;AAErB,OAAO,EAAmB,KAAK,UAAU,EAAsB,MAAM,uBAAuB,CAAC;AAC7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"settings-resolver.d.ts","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAQN,KAAK,sBAAsB,EAC3B,MAAM,aAAa,CAAC;AAErB,OAAO,EAAmB,KAAK,UAAU,EAAsB,MAAM,uBAAuB,CAAC;AAC7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAI7D;;;;GAIG;AACH,wBAAgB,mBAAmB,CAClC,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,GACT;IAAE,YAAY,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,CAO7E;AAWD,MAAM,WAAW,gBAAgB;IAChC,YAAY,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IACzE,iBAAiB,EAAE,UAAU,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;IACxD,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,OAAO,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;IACpD,cAAc,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAChD,eAAe,EAAE,UAAU,EAAE,CAAC;IAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAC9E,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1E,SAAS,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IACrE,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,gBAAgB,CAAC;CACtC;AAED,wBAAgB,eAAe,CAC9B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,GACT,gBAAgB,GAAG;IAAE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAuHvD"}
|
|
@@ -11,6 +11,19 @@ import { getInheritedCliArgs } from "../snapshot/cli-args.js";
|
|
|
11
11
|
import { parseComplexity, DEFAULT_COMPLEXITY } from "../flow/complexity.js";
|
|
12
12
|
import { logWarn } from "./log.js";
|
|
13
13
|
import { resolveBoolean, resolveString, resolveNumber } from "./resolver-helpers.js";
|
|
14
|
+
/**
|
|
15
|
+
* Lightweight re-resolution of tool-affecting settings only.
|
|
16
|
+
* Used by the settings-change emitter in index.ts to re-apply pi.setActiveTools
|
|
17
|
+
* without the full overhead of resolveSettings (which re-discovers flows, etc.).
|
|
18
|
+
*/
|
|
19
|
+
export function resolveToolSettings(pi, cwd) {
|
|
20
|
+
const flowSettings = loadFlowSettings(cwd);
|
|
21
|
+
const ctx = { pi, settings: flowSettings };
|
|
22
|
+
const toolOptimize = resolveBoolean(ctx, { cliFlag: "tool-optimize", envVar: PI_FLOW_TOOL_OPTIMIZE_ENV, settingsPath: ["toolOptimize"], defaultValue: true });
|
|
23
|
+
const traceEnabled = resolveBoolean(ctx, { cliFlag: "tools-trace", envVar: PI_FLOW_TOOLS_TRACE_ENV, settingsPath: ["tools", "trace"], defaultValue: true });
|
|
24
|
+
const batchReadEnabled = resolveBoolean(ctx, { cliFlag: "tools-batch-read", envVar: PI_FLOW_TOOLS_BATCH_READ_ENV, settingsPath: ["tools", "batchRead"], defaultValue: toolOptimize });
|
|
25
|
+
return { toolOptimize, traceEnabled, batchReadEnabled };
|
|
26
|
+
}
|
|
14
27
|
const PI_FLOW_NO_STEERING_ENV = "PI_FLOW_NO_STEERING";
|
|
15
28
|
const PI_FLOW_NO_ANIMATION_ENV = "PI_FLOW_NO_ANIMATION";
|
|
16
29
|
const PI_FLOW_NO_GLITCH_ENV = "PI_FLOW_NO_GLITCH";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-resolver.js","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settings-resolver.js","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit-formatters.d.ts","sourceRoot":"","sources":["../../src/flow/audit-formatters.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAGN,KAAK,iBAAiB,EACtB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"audit-formatters.d.ts","sourceRoot":"","sources":["../../src/flow/audit-formatters.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAGN,KAAK,iBAAiB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,UAAU,EAAE,EACnB,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,KAAK,MAAM,GAAG,SAAS,EAC7E,QAAQ,EAAE,iBAAiB,EAC3B,aAAa,CAAC,EAAE,MAAM,GACpB;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,CA4B/C;AAED,wBAAgB,iBAAiB,CAChC,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,aAAa,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,iBAAiB,EAAE,GAChC,MAAM,CA+BR;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAyB5E;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAe5E;AAED,wBAAgB,qBAAqB,CACpC,MAAM,EAAE,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EACrG,YAAY,CAAC,EAAE,iBAAiB,EAAE,GAChC,MAAM,CA8CR"}
|
|
@@ -2,19 +2,32 @@
|
|
|
2
2
|
* Audit formatting helpers — extracted from executor.ts.
|
|
3
3
|
*/
|
|
4
4
|
import { resolveFlowModelCandidates, resolveModelContextWindow, } from "../config/config.js";
|
|
5
|
+
import { logWarn } from "../config/log.js";
|
|
5
6
|
// ~6 KB limit to keep grouped audit intent under typical prompt budget while preserving enough context for meaningful audit
|
|
6
7
|
const MAX_AUDIT_OUTPUT_SLICE = 6000;
|
|
7
8
|
export function resolveAuditModel(flows, tierOverrideResolver, strategy, fallbackModel) {
|
|
8
9
|
const auditFlow = flows.find((f) => f.name === "audit");
|
|
9
10
|
const tier = auditFlow?.tier ?? "flash";
|
|
10
|
-
const { candidates } = resolveFlowModelCandidates({
|
|
11
|
+
const { candidates, effectivePrimary } = resolveFlowModelCandidates({
|
|
11
12
|
tier,
|
|
12
13
|
flowModel: auditFlow?.model,
|
|
13
14
|
cliTierOverride: tierOverrideResolver(tier),
|
|
14
15
|
strategy,
|
|
15
16
|
fallbackModel,
|
|
16
17
|
});
|
|
17
|
-
|
|
18
|
+
// Drift detection: if the resolved effectivePrimary differs from the
|
|
19
|
+
// originally requested primary, surface a one-time warn so silent audit
|
|
20
|
+
// model swaps (e.g. stale models.json, provider renames) are visible.
|
|
21
|
+
// The candidates list preserves priority order; the first candidate is
|
|
22
|
+
// what would have been used pre-effectivePrimary filtering.
|
|
23
|
+
const requestedPrimary = candidates[0];
|
|
24
|
+
if (requestedPrimary && effectivePrimary && requestedPrimary !== effectivePrimary) {
|
|
25
|
+
logWarn(`[pi-agent-flow] Audit model drifted from requested "${requestedPrimary}" to effective "${effectivePrimary}" (requested model missing from models.json).`);
|
|
26
|
+
}
|
|
27
|
+
else if (requestedPrimary && !effectivePrimary) {
|
|
28
|
+
logWarn(`[pi-agent-flow] Audit requested "${requestedPrimary}" but no valid candidate is registered in models.json; audit will run on heuristics.`);
|
|
29
|
+
}
|
|
30
|
+
const model = effectivePrimary;
|
|
18
31
|
const maxContextTokens = resolveModelContextWindow(model);
|
|
19
32
|
return { model, maxContextTokens };
|
|
20
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit-formatters.js","sourceRoot":"","sources":["../../src/flow/audit-formatters.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACN,0BAA0B,EAC1B,yBAAyB,GAEzB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"audit-formatters.js","sourceRoot":"","sources":["../../src/flow/audit-formatters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation.d.ts","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,iCAAiC,CAAC;AAuCpG;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAI1D;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAIhE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAIhD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAKrC;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"continuation.d.ts","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,iCAAiC,CAAC;AAuCpG;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAI1D;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAIhE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAIhD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAKrC;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAsJxD"}
|
|
@@ -162,34 +162,39 @@ export function setupContinuation(pi) {
|
|
|
162
162
|
.join("")
|
|
163
163
|
: "";
|
|
164
164
|
addTokens(cwd, Math.ceil(messageText.length / 4));
|
|
165
|
+
// Re-read goal to get updated token count — addTokens mutates the
|
|
166
|
+
// store, but our local `goal` is a stale deep copy from above.
|
|
167
|
+
const freshGoal = getGoal(cwd);
|
|
168
|
+
if (!freshGoal || freshGoal.status !== "active")
|
|
169
|
+
return;
|
|
165
170
|
// Budget guards — silent
|
|
166
|
-
const flowCount =
|
|
167
|
-
const overTokens =
|
|
168
|
-
const overFlows =
|
|
171
|
+
const flowCount = freshGoal.completedFlows.length;
|
|
172
|
+
const overTokens = freshGoal.maxTokens !== undefined && freshGoal.totalTokens >= freshGoal.maxTokens;
|
|
173
|
+
const overFlows = freshGoal.maxFlows !== undefined && flowCount >= freshGoal.maxFlows;
|
|
169
174
|
// Budget guards — actually pause when exceeded
|
|
170
175
|
if (overTokens || overFlows) {
|
|
171
176
|
if (loop?.status === "active") {
|
|
172
|
-
const warpPrompt = buildAutoWarpPrompt(
|
|
177
|
+
const warpPrompt = buildAutoWarpPrompt(freshGoal, loop);
|
|
173
178
|
pi.sendMessage({ content: warpPrompt, display: false }, { triggerTurn: true });
|
|
174
179
|
return;
|
|
175
180
|
}
|
|
176
181
|
updateGoalStatus(cwd, "paused");
|
|
177
182
|
const pausedPrompt = budgetLimitTemplate
|
|
178
|
-
.replace("{{objective}}",
|
|
179
|
-
.replace("{{totalTokens}}", String(
|
|
180
|
-
.replace("{{maxTokens}}", String(
|
|
183
|
+
.replace("{{objective}}", freshGoal.objective)
|
|
184
|
+
.replace("{{totalTokens}}", String(freshGoal.totalTokens))
|
|
185
|
+
.replace("{{maxTokens}}", String(freshGoal.maxTokens ?? "unlimited"))
|
|
181
186
|
.replace("{{flowCount}}", String(flowCount))
|
|
182
|
-
.replace("{{maxFlows}}", String(
|
|
187
|
+
.replace("{{maxFlows}}", String(freshGoal.maxFlows ?? "unlimited"));
|
|
183
188
|
pi.sendMessage({ content: pausedPrompt, display: false }, { triggerTurn: true });
|
|
184
189
|
return;
|
|
185
190
|
}
|
|
186
191
|
// Build a continuation prompt with goal context
|
|
187
|
-
const maxFlowsClause =
|
|
188
|
-
const tokenInfo = `${
|
|
189
|
-
const acceptanceClause =
|
|
192
|
+
const maxFlowsClause = freshGoal.maxFlows !== undefined ? `/${freshGoal.maxFlows}` : '';
|
|
193
|
+
const tokenInfo = `${freshGoal.totalTokens}${freshGoal.maxTokens !== undefined ? `/${freshGoal.maxTokens}` : ''}`;
|
|
194
|
+
const acceptanceClause = freshGoal.acceptance ? `\nAcceptance: ${freshGoal.acceptance}` : '';
|
|
190
195
|
const continuationPrompt = (loop?.status === "active")
|
|
191
196
|
? loopContinuationPromptTemplate
|
|
192
|
-
.replace('{{objective}}',
|
|
197
|
+
.replace('{{objective}}', freshGoal.objective)
|
|
193
198
|
.replace('{{acceptanceClause}}', acceptanceClause)
|
|
194
199
|
.replace('{{flowCount}}', String(flowCount))
|
|
195
200
|
.replace('{{maxFlowsClause}}', maxFlowsClause)
|
|
@@ -198,7 +203,7 @@ export function setupContinuation(pi) {
|
|
|
198
203
|
.replace('{{sessionCount}}', String(loop.sessionCount))
|
|
199
204
|
.replace('{{totalTokensAcrossSessions}}', String(loop.totalTokensAcrossSessions))
|
|
200
205
|
: continuationPromptTemplate
|
|
201
|
-
.replace('{{objective}}',
|
|
206
|
+
.replace('{{objective}}', freshGoal.objective)
|
|
202
207
|
.replace('{{acceptanceClause}}', acceptanceClause)
|
|
203
208
|
.replace('{{flowCount}}', String(flowCount))
|
|
204
209
|
.replace('{{maxFlowsClause}}', maxFlowsClause)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation.js","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"continuation.js","sourceRoot":"","sources":["../../src/flow/continuation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cycle-guard.d.ts","sourceRoot":"","sources":["../../src/flow/cycle-guard.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,kBAAkB,CAAC;AAErF,wBAAgB,sBAAsB,CACrC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,iBAAiB,EAAE,MAAM,EAAE,GACzB,MAAM,EAAE,CAIV;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,IAAI,CAUlF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"cycle-guard.d.ts","sourceRoot":"","sources":["../../src/flow/cycle-guard.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,kBAAkB,CAAC;AAErF,wBAAgB,sBAAsB,CACrC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,iBAAiB,EAAE,MAAM,EAAE,GACzB,MAAM,EAAE,CAIV;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,IAAI,CAUlF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAoD5D;AAeD;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,EAyB7C,CAAC;AAEF;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAKzF;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,YAAY,CAapI;AAED,MAAM,WAAW,iBAAiB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;CACnC"}
|
package/dist/flow/cycle-guard.js
CHANGED
|
@@ -29,7 +29,12 @@ export function shouldFailover(result) {
|
|
|
29
29
|
const text = `${result.errorMessage ?? ""}\n${result.stderr ?? ""}`.toLowerCase();
|
|
30
30
|
if (!text.trim())
|
|
31
31
|
return false;
|
|
32
|
-
if (text.includes("permission") || text.includes("
|
|
32
|
+
if (text.includes("permission") || text.includes("bad settings")) {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
// Generic "invalid tool" failures are not retryable, but "invalid tool_call_id"
|
|
36
|
+
// errors are a specific provider-side rejection that failover can recover from.
|
|
37
|
+
if (text.includes("invalid tool") && !text.includes("tool_call_id")) {
|
|
33
38
|
return false;
|
|
34
39
|
}
|
|
35
40
|
if (result.exitCode > 0)
|
|
@@ -44,6 +49,32 @@ export function shouldFailover(result) {
|
|
|
44
49
|
if (!isFlowComplete(result) && text.includes("400") && text.includes("tool_call_id")) {
|
|
45
50
|
return true;
|
|
46
51
|
}
|
|
52
|
+
// Provider-side 404 / resource-not-found errors should fail over to the next
|
|
53
|
+
// configured model even when the process exits 0. Trigger shape:
|
|
54
|
+
// - the canonical JSON envelope (`"type":"resource_not_found_error"`)
|
|
55
|
+
// fails over with or without a 404 token;
|
|
56
|
+
// - the bare machine type marker (`resource_not_found_error`) fails over
|
|
57
|
+
// (covers providers that print just the type);
|
|
58
|
+
// - the bare English phrase ("requested resource was not found") only
|
|
59
|
+
// fails over when paired with an explicit 404 token, since that phrase
|
|
60
|
+
// alone is plausible in tool output or docs text;
|
|
61
|
+
// - a bare 404 token (no envelope, no type marker, no English phrase)
|
|
62
|
+
// fails over only when stderr also looks like a provider/API context
|
|
63
|
+
// (e.g. an /v1/* API path). A bare "404" in tool output or docs
|
|
64
|
+
// narration — "HTTP 404 while checking a website" — must NOT trigger,
|
|
65
|
+
// since that text is what ordinary child stderr looks like when a tool
|
|
66
|
+
// fetched a missing URL.
|
|
67
|
+
const has404Token = /\b404\b/.test(text);
|
|
68
|
+
const hasEnglishPhrase = text.includes("requested resource was not found");
|
|
69
|
+
const hasResourceJsonEnvelope = /"type"\s*:\s*"resource_not_found_error"/.test(text);
|
|
70
|
+
const hasResourceTypeMarker = text.includes("resource_not_found_error");
|
|
71
|
+
const hasApiPathContext = /\/v\d+\/[a-z0-9_-]+/i.test(text);
|
|
72
|
+
if (!isFlowComplete(result) &&
|
|
73
|
+
((hasResourceJsonEnvelope || hasResourceTypeMarker) ||
|
|
74
|
+
(hasEnglishPhrase && has404Token) ||
|
|
75
|
+
(has404Token && hasApiPathContext))) {
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
47
78
|
return false;
|
|
48
79
|
}
|
|
49
80
|
/** Substrings that indicate a failure should not be retried as a transient connection error. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cycle-guard.js","sourceRoot":"","sources":["../../src/flow/cycle-guard.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAqB,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAErF,MAAM,UAAU,sBAAsB,CACrC,cAA2B,EAC3B,iBAA2B;IAE3B,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC3E,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC5C,OAAO,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AACxE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAoB,EAAE,MAAqB;IAC3E,IAAI,MAAM,EAAE,YAAY,EAAE,CAAC;QAC1B,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAC3C,CAAC;IACD,IAAI,MAAM,EAAE,eAAe,EAAE,CAAC;QAC7B,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;IACjD,CAAC;IACD,IAAI,MAAM,EAAE,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnD,CAAC;AACF,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAoB;IAClD,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAClD,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,KAAK,MAAM,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC;IAClF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QAAE,OAAO,KAAK,CAAC;IAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cycle-guard.js","sourceRoot":"","sources":["../../src/flow/cycle-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-single.d.ts","sourceRoot":"","sources":["../../src/flow/execute-single.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAyBlE,wBAAsB,iBAAiB,CACtC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,iBAAiB,EACvB,UAAU,EAAE,YAAY,EAAE,EAC1B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,EAC9C,uBAAuB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"execute-single.d.ts","sourceRoot":"","sources":["../../src/flow/execute-single.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAyBlE,wBAAsB,iBAAiB,CACtC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,iBAAiB,EACvB,UAAU,EAAE,YAAY,EAAE,EAC1B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,EAC9C,uBAAuB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,YAAY,CAAC,CAwNvB"}
|
|
@@ -39,17 +39,56 @@ export async function executeSingleFlow(deps, item, allResults, resultIndex, too
|
|
|
39
39
|
const effectiveMaxDepth = targetFlow?.maxDepth !== undefined ? targetFlow.maxDepth : maxDepth;
|
|
40
40
|
const shouldInheritContext = targetFlow?.inheritContext !== false;
|
|
41
41
|
const tier = targetFlow?.tier ?? "flash";
|
|
42
|
-
const { candidates } = resolveFlowModelCandidates({
|
|
42
|
+
const { candidates, invalidCandidates } = resolveFlowModelCandidates({
|
|
43
43
|
tier,
|
|
44
44
|
flowModel: targetFlow?.model,
|
|
45
45
|
cliTierOverride: tierOverrideResolver(tier),
|
|
46
46
|
strategy: selectedFlowModelConfig.strategy,
|
|
47
47
|
fallbackModel,
|
|
48
48
|
});
|
|
49
|
-
const attemptModels = candidates.length > 0 ? candidates : [undefined];
|
|
50
49
|
const attemptedModels = [];
|
|
51
50
|
let result = allResults[resultIndex];
|
|
52
51
|
const flowStart = Date.now();
|
|
52
|
+
// Fail fast when every configured model is known to be missing from models.json.
|
|
53
|
+
if (invalidCandidates.length > 0 && candidates.length === invalidCandidates.length) {
|
|
54
|
+
const badSettingsMessage = `Bad settings: all configured flow models are missing from models.json: ${invalidCandidates.join(", ")}`;
|
|
55
|
+
// model stays undefined: no candidate was actually invoked, so any
|
|
56
|
+
// per-model telemetry rollup would be poisoned if we set it to one
|
|
57
|
+
// of the invalid candidates. Downstream consumers can read
|
|
58
|
+
// invalidCandidates from errorMessage / stderr for diagnostics.
|
|
59
|
+
result = {
|
|
60
|
+
type: normalizedType,
|
|
61
|
+
agentSource: targetFlow?.source ?? "unknown",
|
|
62
|
+
intent: item.intent,
|
|
63
|
+
aim: item.aim,
|
|
64
|
+
exitCode: 1,
|
|
65
|
+
messages: [],
|
|
66
|
+
stderr: badSettingsMessage,
|
|
67
|
+
usage: emptyFlowUsage(),
|
|
68
|
+
stopReason: "error",
|
|
69
|
+
errorMessage: badSettingsMessage,
|
|
70
|
+
};
|
|
71
|
+
const previous = allResults[resultIndex];
|
|
72
|
+
allResults[resultIndex] = result;
|
|
73
|
+
preserveMetadata(allResults[resultIndex], previous);
|
|
74
|
+
emitProgress();
|
|
75
|
+
if (onFlowMetrics) {
|
|
76
|
+
onFlowMetrics({
|
|
77
|
+
type: normalizedType,
|
|
78
|
+
durationMs: Date.now() - flowStart,
|
|
79
|
+
exitCode: result.exitCode,
|
|
80
|
+
success: false,
|
|
81
|
+
model: result.model,
|
|
82
|
+
failoverCount: 0,
|
|
83
|
+
connectionRetryCount: 0,
|
|
84
|
+
usage: result.usage,
|
|
85
|
+
source: result.agentSource,
|
|
86
|
+
depth: currentDepth + 1,
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
return result;
|
|
90
|
+
}
|
|
91
|
+
const attemptModels = candidates.length > 0 ? candidates : [undefined];
|
|
53
92
|
const maxRetries = deps.subAgentMaxRetries ?? DEFAULT_SUB_AGENT_MAX_RETRIES;
|
|
54
93
|
const baseDelayMs = deps.subAgentBaseDelayMs ?? DEFAULT_SUB_AGENT_BASE_DELAY_MS;
|
|
55
94
|
let retryCount = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-single.js","sourceRoot":"","sources":["../../src/flow/execute-single.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAChG,OAAO,EAAuB,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAM5F,MAAM,6BAA6B,GAAG,CAAC,CAAC;AACxC,MAAM,+BAA+B,GAAG,IAAI,CAAC;AAC7C,MAAM,wBAAwB,GAAG,IAAI,CAAC;AAEtC,KAAK,UAAU,cAAc,CAAC,EAAU,EAAE,MAAoB;IAC7D,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,EAAE,OAAO;QAAE,OAAO;IACvC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACnC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACX,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,MAAM,OAAO,GAAG,GAAG,EAAE;YACpB,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACX,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,GAAG,EAAE;YACpB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC,CAAC;QACF,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACtC,IAAsB,EACtB,IAAuB,EACvB,UAA0B,EAC1B,WAAmB,EACnB,UAAkB,EAClB,YAA8C,EAC9C,uBAA+C;IAE/C,MAAM,EACL,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,iBAAiB,EAAE,aAAa,EAC/D,YAAY,EAAE,gBAAgB,EAAE,GAAG,EACnC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EACtC,oBAAoB,EAAE,aAAa,EAAE,wBAAwB,EAC7D,aAAa,EAAE,WAAW,GAC1B,GAAG,IAAI,CAAC;IAET,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IACzE,MAAM,UAAU,GAAG,cAAc,CAAC;IAClC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IAC5D,MAAM,iBAAiB,GACtB,UAAU,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAErE,MAAM,oBAAoB,GAAG,UAAU,EAAE,cAAc,KAAK,KAAK,CAAC;IAClE,MAAM,IAAI,GAAG,UAAU,EAAE,IAAI,IAAI,OAAO,CAAC;IACzC,MAAM,EAAE,UAAU,EAAE,GAAG,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-single.js","sourceRoot":"","sources":["../../src/flow/execute-single.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/flow/executor.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EACX,YAAY,EACZ,WAAW,EACX,WAAW,EACX,MAAM,kBAAkB,CAAC;AAO1B,OAAO,
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/flow/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/flow/executor.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { isFlowSuccess, isFlowError, emptyFlowUsage } from "../types/flow.js";
|
|
9
9
|
import { getFlowSummaryText } from "../snapshot/runner-events.js";
|
|
10
|
-
import { normalizeFlowModeName, selectFlowModelStrategy } from "../config/config.js";
|
|
10
|
+
import { normalizeFlowModeName, selectFlowModelStrategy, } from "../config/config.js";
|
|
11
11
|
import { getImpliedAuditLoop } from "./complexity.js";
|
|
12
12
|
import { setFlowComplete } from "../notify/notify-state.js";
|
|
13
13
|
import { setLiveText, clearLiveText } from '../tui/scramble/index.js';
|