@roarpeng/graphflow 1.4.4 → 1.7.4
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/AGENTS.md +1 -1
- package/CHANGELOG.md +72 -0
- package/CLAUDE.md +1 -1
- package/README.md +76 -50
- package/dist/agents/atp-schema.d.ts +59 -0
- package/dist/agents/atp-schema.d.ts.map +1 -0
- package/dist/agents/atp-schema.js +3 -0
- package/dist/agents/atp-schema.js.map +1 -0
- package/dist/agents/decision-engine.d.ts +55 -0
- package/dist/agents/decision-engine.d.ts.map +1 -0
- package/dist/agents/decision-engine.js +338 -0
- package/dist/agents/decision-engine.js.map +1 -0
- package/dist/agents/insight.d.ts +69 -2
- package/dist/agents/insight.d.ts.map +1 -1
- package/dist/agents/insight.js +420 -27
- package/dist/agents/insight.js.map +1 -1
- package/dist/agents/task-profile.d.ts +19 -0
- package/dist/agents/task-profile.d.ts.map +1 -0
- package/dist/agents/task-profile.js +64 -0
- package/dist/agents/task-profile.js.map +1 -0
- package/dist/agents/validator.js +1 -1
- package/dist/agents/validator.js.map +1 -1
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +4 -3
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/discover-workspace.d.ts.map +1 -1
- package/dist/config/discover-workspace.js +13 -2
- package/dist/config/discover-workspace.js.map +1 -1
- package/dist/config/embedding-factory.d.ts.map +1 -1
- package/dist/config/embedding-factory.js +87 -8
- package/dist/config/embedding-factory.js.map +1 -1
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +10 -4
- package/dist/config/loader.js.map +1 -1
- package/dist/config/provider-env.d.ts +32 -0
- package/dist/config/provider-env.d.ts.map +1 -0
- package/dist/config/provider-env.js +51 -0
- package/dist/config/provider-env.js.map +1 -0
- package/dist/config/resolve.d.ts.map +1 -1
- package/dist/config/resolve.js +7 -2
- package/dist/config/resolve.js.map +1 -1
- package/dist/config/schema.d.ts +17 -3
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/workspace-root.d.ts +0 -12
- package/dist/config/workspace-root.d.ts.map +1 -1
- package/dist/config/workspace-root.js +21 -5
- package/dist/config/workspace-root.js.map +1 -1
- package/dist/core/agent-delegation.d.ts +8 -1
- package/dist/core/agent-delegation.d.ts.map +1 -1
- package/dist/core/agent-delegation.js +233 -38
- package/dist/core/agent-delegation.js.map +1 -1
- package/dist/core/cancellation.d.ts +57 -0
- package/dist/core/cancellation.d.ts.map +1 -0
- package/dist/core/cancellation.js +195 -0
- package/dist/core/cancellation.js.map +1 -0
- package/dist/core/dag-engine.d.ts +6 -1
- package/dist/core/dag-engine.d.ts.map +1 -1
- package/dist/core/dag-engine.js +67 -9
- package/dist/core/dag-engine.js.map +1 -1
- package/dist/core/orchestrator-context.d.ts.map +1 -1
- package/dist/core/orchestrator-context.js +28 -3
- package/dist/core/orchestrator-context.js.map +1 -1
- package/dist/core/orchestrator-route.d.ts +1 -1
- package/dist/core/orchestrator-route.d.ts.map +1 -1
- package/dist/core/orchestrator-route.js.map +1 -1
- package/dist/core/orchestrator.js +6 -1
- package/dist/core/orchestrator.js.map +1 -1
- package/dist/core/runtime-controller.d.ts +19 -0
- package/dist/core/runtime-controller.d.ts.map +1 -0
- package/dist/core/runtime-controller.js +89 -0
- package/dist/core/runtime-controller.js.map +1 -0
- package/dist/core/types.d.ts +17 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/graph/context-slicer-types.d.ts +2 -4
- package/dist/graph/context-slicer-types.d.ts.map +1 -1
- package/dist/graph/context-slicer-types.js.map +1 -1
- package/dist/graph/context-slicer.d.ts +1 -0
- package/dist/graph/context-slicer.d.ts.map +1 -1
- package/dist/graph/context-slicer.js +54 -18
- package/dist/graph/context-slicer.js.map +1 -1
- package/dist/graph/file-indexer-walker.d.ts +3 -0
- package/dist/graph/file-indexer-walker.d.ts.map +1 -1
- package/dist/graph/file-indexer-walker.js.map +1 -1
- package/dist/graph/file-indexer.d.ts +1 -0
- package/dist/graph/file-indexer.d.ts.map +1 -1
- package/dist/graph/file-indexer.js +14 -18
- package/dist/graph/file-indexer.js.map +1 -1
- package/dist/graph/file-watcher.d.ts.map +1 -1
- package/dist/graph/file-watcher.js +9 -2
- package/dist/graph/file-watcher.js.map +1 -1
- package/dist/graph/graph-utils.d.ts +6 -1
- package/dist/graph/graph-utils.d.ts.map +1 -1
- package/dist/graph/graph-utils.js +116 -2
- package/dist/graph/graph-utils.js.map +1 -1
- package/dist/graph/graphify-file-client.d.ts.map +1 -1
- package/dist/graph/graphify-file-client.js +2 -1
- package/dist/graph/graphify-file-client.js.map +1 -1
- package/dist/graph/hit-diversify.d.ts +31 -0
- package/dist/graph/hit-diversify.d.ts.map +1 -0
- package/dist/graph/hit-diversify.js +270 -0
- package/dist/graph/hit-diversify.js.map +1 -0
- package/dist/graph/language-indexers/go.d.ts.map +1 -1
- package/dist/graph/language-indexers/go.js +2 -3
- package/dist/graph/language-indexers/go.js.map +1 -1
- package/dist/graph/language-indexers/incremental-parse.d.ts +9 -0
- package/dist/graph/language-indexers/incremental-parse.d.ts.map +1 -0
- package/dist/graph/language-indexers/incremental-parse.js +114 -0
- package/dist/graph/language-indexers/incremental-parse.js.map +1 -0
- package/dist/graph/language-indexers/python.d.ts.map +1 -1
- package/dist/graph/language-indexers/python.js +2 -3
- package/dist/graph/language-indexers/python.js.map +1 -1
- package/dist/graph/language-indexers/rust.d.ts.map +1 -1
- package/dist/graph/language-indexers/rust.js +2 -3
- package/dist/graph/language-indexers/rust.js.map +1 -1
- package/dist/graph/language-indexers/tree-sitter-loader.d.ts +19 -3
- package/dist/graph/language-indexers/tree-sitter-loader.d.ts.map +1 -1
- package/dist/graph/language-indexers/tree-sitter-loader.js +24 -4
- package/dist/graph/language-indexers/tree-sitter-loader.js.map +1 -1
- package/dist/graph/query-expand.d.ts.map +1 -1
- package/dist/graph/query-expand.js +2 -0
- package/dist/graph/query-expand.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/integrations/agent-mcp-installer.d.ts +39 -0
- package/dist/integrations/agent-mcp-installer.d.ts.map +1 -1
- package/dist/integrations/agent-mcp-installer.js +220 -14
- package/dist/integrations/agent-mcp-installer.js.map +1 -1
- package/dist/learning/embedding-quality.d.ts +46 -0
- package/dist/learning/embedding-quality.d.ts.map +1 -0
- package/dist/learning/embedding-quality.js +131 -0
- package/dist/learning/embedding-quality.js.map +1 -0
- package/dist/learning/embeddings.d.ts +46 -3
- package/dist/learning/embeddings.d.ts.map +1 -1
- package/dist/learning/embeddings.js +186 -26
- package/dist/learning/embeddings.js.map +1 -1
- package/dist/learning/hnsw-index.d.ts +9 -35
- package/dist/learning/hnsw-index.d.ts.map +1 -1
- package/dist/learning/hnsw-index.js +8 -154
- package/dist/learning/hnsw-index.js.map +1 -1
- package/dist/learning/skill-flywheel.d.ts +1 -1
- package/dist/learning/skill-flywheel.d.ts.map +1 -1
- package/dist/learning/skill-flywheel.js +10 -3
- package/dist/learning/skill-flywheel.js.map +1 -1
- package/dist/routing/deepseek-tools.d.ts +7 -0
- package/dist/routing/deepseek-tools.d.ts.map +1 -0
- package/dist/routing/deepseek-tools.js +154 -0
- package/dist/routing/deepseek-tools.js.map +1 -0
- package/dist/routing/model-router.d.ts +1 -1
- package/dist/routing/model-router.d.ts.map +1 -1
- package/dist/routing/model-router.js +5 -1
- package/dist/routing/model-router.js.map +1 -1
- package/dist/routing/provider-adapters/anthropic.d.ts.map +1 -1
- package/dist/routing/provider-adapters/anthropic.js +7 -4
- package/dist/routing/provider-adapters/anthropic.js.map +1 -1
- package/dist/routing/provider-adapters/bailian.d.ts.map +1 -1
- package/dist/routing/provider-adapters/bailian.js +7 -4
- package/dist/routing/provider-adapters/bailian.js.map +1 -1
- package/dist/routing/provider-adapters/deepseek.d.ts +5 -0
- package/dist/routing/provider-adapters/deepseek.d.ts.map +1 -0
- package/dist/routing/provider-adapters/deepseek.js +109 -0
- package/dist/routing/provider-adapters/deepseek.js.map +1 -0
- package/dist/routing/provider-adapters/doubao.d.ts.map +1 -1
- package/dist/routing/provider-adapters/doubao.js +7 -4
- package/dist/routing/provider-adapters/doubao.js.map +1 -1
- package/dist/routing/provider-adapters/openai.d.ts +2 -4
- package/dist/routing/provider-adapters/openai.d.ts.map +1 -1
- package/dist/routing/provider-adapters/openai.js +23 -32
- package/dist/routing/provider-adapters/openai.js.map +1 -1
- package/dist/routing/provider-adapters/types.d.ts +61 -0
- package/dist/routing/provider-adapters/types.d.ts.map +1 -0
- package/dist/routing/provider-adapters/types.js +56 -0
- package/dist/routing/provider-adapters/types.js.map +1 -0
- package/dist/routing/provider-executor.d.ts +6 -1
- package/dist/routing/provider-executor.d.ts.map +1 -1
- package/dist/routing/provider-executor.js +70 -39
- package/dist/routing/provider-executor.js.map +1 -1
- package/dist/routing/provider-health.d.ts.map +1 -1
- package/dist/routing/provider-health.js +7 -1
- package/dist/routing/provider-health.js.map +1 -1
- package/dist/routing/role-capabilities.d.ts +11 -0
- package/dist/routing/role-capabilities.d.ts.map +1 -0
- package/dist/routing/role-capabilities.js +94 -0
- package/dist/routing/role-capabilities.js.map +1 -0
- package/dist/surfaces/antigravity-rules/graphflow.md +8 -8
- package/dist/surfaces/cli/runtime/env.d.ts.map +1 -1
- package/dist/surfaces/cli/runtime/env.js +3 -0
- package/dist/surfaces/cli/runtime/env.js.map +1 -1
- package/dist/surfaces/cli/runtime/facade.d.ts +2 -1
- package/dist/surfaces/cli/runtime/facade.d.ts.map +1 -1
- package/dist/surfaces/cli/runtime/facade.js +1 -0
- package/dist/surfaces/cli/runtime/facade.js.map +1 -1
- package/dist/surfaces/cli/runtime/graph.d.ts.map +1 -1
- package/dist/surfaces/cli/runtime/graph.js +7 -1
- package/dist/surfaces/cli/runtime/graph.js.map +1 -1
- package/dist/surfaces/cli/runtime/routing.d.ts +3 -0
- package/dist/surfaces/cli/runtime/routing.d.ts.map +1 -1
- package/dist/surfaces/cli/runtime/routing.js +31 -4
- package/dist/surfaces/cli/runtime/routing.js.map +1 -1
- package/dist/surfaces/cli/runtime/settings.d.ts.map +1 -1
- package/dist/surfaces/cli/runtime/settings.js +0 -5
- package/dist/surfaces/cli/runtime/settings.js.map +1 -1
- package/dist/surfaces/cli/runtime/types.d.ts +23 -9
- package/dist/surfaces/cli/runtime/types.d.ts.map +1 -1
- package/dist/surfaces/cli/runtime.d.ts +1 -1
- package/dist/surfaces/cli/runtime.d.ts.map +1 -1
- package/dist/surfaces/cli/runtime.js +2 -1
- package/dist/surfaces/cli/runtime.js.map +1 -1
- package/dist/surfaces/copilot-instructions/graphflow.md +6 -6
- package/dist/surfaces/cursor-rules/graphflow.mdc +20 -27
- package/dist/surfaces/mcp/server.js +17 -6
- package/dist/surfaces/mcp/server.js.map +1 -1
- package/dist/surfaces/mcp/tool-definitions.d.ts.map +1 -1
- package/dist/surfaces/mcp/tool-definitions.js +31 -124
- package/dist/surfaces/mcp/tool-definitions.js.map +1 -1
- package/dist/surfaces/mcp/tool-handlers.d.ts.map +1 -1
- package/dist/surfaces/mcp/tool-handlers.js +80 -42
- package/dist/surfaces/mcp/tool-handlers.js.map +1 -1
- package/dist/surfaces/trae-rules/graphflow.md +9 -9
- package/dist/surfaces/trae-skill/graphflow/SKILL.md +68 -75
- package/package.json +2 -2
- package/src/surfaces/antigravity-rules/graphflow.md +8 -8
- package/src/surfaces/copilot-instructions/graphflow.md +6 -6
- package/src/surfaces/cursor-rules/graphflow.mdc +20 -27
- package/src/surfaces/trae-rules/graphflow.md +9 -9
- package/src/surfaces/trae-skill/graphflow/SKILL.md +68 -75
|
@@ -1,29 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.openaiGenerateText = openaiGenerateText;
|
|
4
|
+
const cancellation_1 = require("../../core/cancellation");
|
|
4
5
|
const logger_1 = require("../../utils/logger");
|
|
5
|
-
|
|
6
|
-
if (value && typeof value === "object") {
|
|
7
|
-
return value;
|
|
8
|
-
}
|
|
9
|
-
return {};
|
|
10
|
-
}
|
|
6
|
+
const types_1 = require("./types");
|
|
11
7
|
function pickContent(payload) {
|
|
12
|
-
|
|
13
|
-
if (!Array.isArray(choices) || choices.length === 0) {
|
|
14
|
-
return undefined;
|
|
15
|
-
}
|
|
16
|
-
const first = asRecord(choices[0]);
|
|
17
|
-
const message = asRecord(first.message);
|
|
18
|
-
const content = message.content;
|
|
19
|
-
if (typeof content === "string" && content.trim().length > 0) {
|
|
20
|
-
return content.trim();
|
|
21
|
-
}
|
|
22
|
-
const text = first.text;
|
|
23
|
-
if (typeof text === "string" && text.trim().length > 0) {
|
|
24
|
-
return text.trim();
|
|
25
|
-
}
|
|
26
|
-
return undefined;
|
|
8
|
+
return (0, types_1.pickChatContent)(payload).content;
|
|
27
9
|
}
|
|
28
10
|
async function openaiGenerateText(request) {
|
|
29
11
|
const strict = process.env.GRAPHFLOW_OPENAI_STRICT === "1";
|
|
@@ -37,28 +19,34 @@ async function openaiGenerateText(request) {
|
|
|
37
19
|
}
|
|
38
20
|
return `[openai:${request.model}] ${request.prompt}`;
|
|
39
21
|
}
|
|
40
|
-
const
|
|
41
|
-
const
|
|
22
|
+
const { signal, dispose } = (0, cancellation_1.createTimeoutSignal)(timeoutMs, request.signal);
|
|
23
|
+
const messages = request.messages && request.messages.length > 0
|
|
24
|
+
? request.messages
|
|
25
|
+
: [{ role: "user", content: request.prompt }];
|
|
42
26
|
try {
|
|
27
|
+
const body = {
|
|
28
|
+
model: request.model,
|
|
29
|
+
messages,
|
|
30
|
+
temperature: request.temperature ?? 0.1,
|
|
31
|
+
max_tokens: request.maxTokens ?? 512,
|
|
32
|
+
};
|
|
33
|
+
if (request.responseFormat) {
|
|
34
|
+
body.response_format = request.responseFormat;
|
|
35
|
+
}
|
|
43
36
|
const response = await fetch(`${baseUrl}/chat/completions`, {
|
|
44
37
|
method: "POST",
|
|
45
38
|
headers: {
|
|
46
39
|
"content-type": "application/json",
|
|
47
40
|
authorization: `Bearer ${apiKey}`,
|
|
48
41
|
},
|
|
49
|
-
body: JSON.stringify(
|
|
50
|
-
|
|
51
|
-
messages: [{ role: "user", content: request.prompt }],
|
|
52
|
-
temperature: 0.1,
|
|
53
|
-
max_tokens: 512,
|
|
54
|
-
}),
|
|
55
|
-
signal: controller.signal,
|
|
42
|
+
body: JSON.stringify(body),
|
|
43
|
+
signal,
|
|
56
44
|
});
|
|
57
45
|
if (!response.ok) {
|
|
58
46
|
const text = await response.text();
|
|
59
47
|
throw new Error(`openai http ${response.status}: ${text.slice(0, 300)}`);
|
|
60
48
|
}
|
|
61
|
-
const payload = asRecord(await response.json());
|
|
49
|
+
const payload = (0, types_1.asRecord)(await response.json());
|
|
62
50
|
const content = pickContent(payload);
|
|
63
51
|
if (!content) {
|
|
64
52
|
throw new Error("openai response missing content");
|
|
@@ -66,6 +54,9 @@ async function openaiGenerateText(request) {
|
|
|
66
54
|
return content;
|
|
67
55
|
}
|
|
68
56
|
catch (error) {
|
|
57
|
+
if ((0, cancellation_1.isAbortError)(error) || signal.aborted) {
|
|
58
|
+
throw error instanceof Error ? error : new Error("openai request aborted");
|
|
59
|
+
}
|
|
69
60
|
const message = error instanceof Error ? error.message : String(error);
|
|
70
61
|
logger_1.logger.error({ error: message }, "Provider adapter caught error");
|
|
71
62
|
if (strict) {
|
|
@@ -74,7 +65,7 @@ async function openaiGenerateText(request) {
|
|
|
74
65
|
return `[openai:${request.model}] ${request.prompt}`;
|
|
75
66
|
}
|
|
76
67
|
finally {
|
|
77
|
-
|
|
68
|
+
dispose();
|
|
78
69
|
}
|
|
79
70
|
}
|
|
80
71
|
//# sourceMappingURL=openai.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/routing/provider-adapters/openai.ts"],"names":[],"mappings":";;AA
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/routing/provider-adapters/openai.ts"],"names":[],"mappings":";;AAcA,gDAiEC;AA/ED,0DAA4E;AAC5E,+CAA4C;AAC5C,mCAIiB;AAIjB,SAAS,WAAW,CAAC,OAAgC;IACnD,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AAC1C,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,OAA4B;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,GAAG,CAAC;IAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IAC1C,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,2BAA2B,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACjG,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,KAAK,CAAC,CAAC;IAC9E,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAEnG,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,WAAW,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IACvD,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,kCAAmB,EAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3E,MAAM,QAAQ,GACZ,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;QAC7C,CAAC,CAAC,OAAO,CAAC,QAAQ;QAClB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE3D,IAAI,CAAC;QACH,MAAM,IAAI,GAA4B;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ;YACR,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,GAAG;YACvC,UAAU,EAAE,OAAO,CAAC,SAAS,IAAI,GAAG;SACrC,CAAC;QACF,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;QAChD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,mBAAmB,EAAE;YAC1D,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,EAAE;aAClC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,MAAM;SACP,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,gBAAQ,EAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IAAI,IAAA,2BAAY,EAAC,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC1C,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC7E,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,eAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,+BAA+B,CAAC,CAAC;QAClE,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,KAAK,CAAC;QACd,CAAC;QACD,OAAO,WAAW,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IACvD,CAAC;YAAS,CAAC;QACT,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
export interface ProviderChatMessage {
|
|
2
|
+
role: "system" | "user" | "assistant" | "tool";
|
|
3
|
+
content: string;
|
|
4
|
+
reasoning_content?: string;
|
|
5
|
+
tool_calls?: ProviderToolCall[];
|
|
6
|
+
tool_call_id?: string;
|
|
7
|
+
}
|
|
8
|
+
export interface ProviderToolCall {
|
|
9
|
+
id: string;
|
|
10
|
+
type: "function";
|
|
11
|
+
function: {
|
|
12
|
+
name: string;
|
|
13
|
+
arguments: string;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
export interface ProviderToolDefinition {
|
|
17
|
+
type: "function";
|
|
18
|
+
function: {
|
|
19
|
+
name: string;
|
|
20
|
+
description: string;
|
|
21
|
+
parameters: Record<string, unknown>;
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
export interface ProviderTextRequest {
|
|
25
|
+
prompt: string;
|
|
26
|
+
model: string;
|
|
27
|
+
/** External cancel/timeout signal; merged with provider-local timeout. */
|
|
28
|
+
signal?: AbortSignal;
|
|
29
|
+
/** Optional multi-message layout (system + user). When set, preferred over prompt-only. */
|
|
30
|
+
messages?: ProviderChatMessage[];
|
|
31
|
+
maxTokens?: number;
|
|
32
|
+
temperature?: number;
|
|
33
|
+
thinking?: "enabled" | "disabled";
|
|
34
|
+
reasoningEffort?: "high" | "max";
|
|
35
|
+
responseFormat?: {
|
|
36
|
+
type: "json_object";
|
|
37
|
+
};
|
|
38
|
+
tools?: ProviderToolDefinition[];
|
|
39
|
+
}
|
|
40
|
+
export interface ProviderUsageStats {
|
|
41
|
+
promptTokens?: number;
|
|
42
|
+
completionTokens?: number;
|
|
43
|
+
promptCacheHitTokens?: number;
|
|
44
|
+
promptCacheMissTokens?: number;
|
|
45
|
+
}
|
|
46
|
+
export interface ProviderTextResult {
|
|
47
|
+
content: string;
|
|
48
|
+
reasoningContent?: string;
|
|
49
|
+
toolCalls?: ProviderToolCall[];
|
|
50
|
+
usage?: ProviderUsageStats;
|
|
51
|
+
rawAssistantMessage?: ProviderChatMessage;
|
|
52
|
+
}
|
|
53
|
+
export declare function asRecord(value: unknown): Record<string, unknown>;
|
|
54
|
+
/** Prefer final content; fall back to reasoning_content when content is empty. */
|
|
55
|
+
export declare function pickChatContent(payload: Record<string, unknown>): {
|
|
56
|
+
content?: string;
|
|
57
|
+
reasoningContent?: string;
|
|
58
|
+
toolCalls?: ProviderToolCall[];
|
|
59
|
+
};
|
|
60
|
+
export declare function pickUsage(payload: Record<string, unknown>): ProviderUsageStats | undefined;
|
|
61
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/routing/provider-adapters/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACrC,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,0EAA0E;IAC1E,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,2FAA2F;IAC3F,QAAQ,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,eAAe,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACjC,cAAc,CAAC,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC;IACzC,KAAK,CAAC,EAAE,sBAAsB,EAAE,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAKhE;AAED,kFAAkF;AAClF,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC,CAwBA;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,kBAAkB,GAAG,SAAS,CAmB1F"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.asRecord = asRecord;
|
|
4
|
+
exports.pickChatContent = pickChatContent;
|
|
5
|
+
exports.pickUsage = pickUsage;
|
|
6
|
+
function asRecord(value) {
|
|
7
|
+
if (value && typeof value === "object") {
|
|
8
|
+
return value;
|
|
9
|
+
}
|
|
10
|
+
return {};
|
|
11
|
+
}
|
|
12
|
+
/** Prefer final content; fall back to reasoning_content when content is empty. */
|
|
13
|
+
function pickChatContent(payload) {
|
|
14
|
+
const choices = payload.choices;
|
|
15
|
+
if (!Array.isArray(choices) || choices.length === 0) {
|
|
16
|
+
return {};
|
|
17
|
+
}
|
|
18
|
+
const first = asRecord(choices[0]);
|
|
19
|
+
const message = asRecord(first.message);
|
|
20
|
+
const contentRaw = typeof message.content === "string" ? message.content.trim() : "";
|
|
21
|
+
const reasoningRaw = message.reasoning_content ?? message.reasoning;
|
|
22
|
+
const reasoningContent = typeof reasoningRaw === "string" && reasoningRaw.trim().length > 0
|
|
23
|
+
? reasoningRaw.trim()
|
|
24
|
+
: undefined;
|
|
25
|
+
const toolCalls = Array.isArray(message.tool_calls)
|
|
26
|
+
? message.tool_calls
|
|
27
|
+
: undefined;
|
|
28
|
+
const textFallback = typeof first.text === "string" && first.text.trim().length > 0 ? first.text.trim() : undefined;
|
|
29
|
+
const content = contentRaw || textFallback || reasoningContent;
|
|
30
|
+
return {
|
|
31
|
+
...(content ? { content } : {}),
|
|
32
|
+
...(reasoningContent ? { reasoningContent } : {}),
|
|
33
|
+
...(toolCalls ? { toolCalls } : {}),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
function pickUsage(payload) {
|
|
37
|
+
const usage = asRecord(payload.usage);
|
|
38
|
+
if (Object.keys(usage).length === 0) {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
const stats = {};
|
|
42
|
+
if (typeof usage.prompt_tokens === "number") {
|
|
43
|
+
stats.promptTokens = usage.prompt_tokens;
|
|
44
|
+
}
|
|
45
|
+
if (typeof usage.completion_tokens === "number") {
|
|
46
|
+
stats.completionTokens = usage.completion_tokens;
|
|
47
|
+
}
|
|
48
|
+
if (typeof usage.prompt_cache_hit_tokens === "number") {
|
|
49
|
+
stats.promptCacheHitTokens = usage.prompt_cache_hit_tokens;
|
|
50
|
+
}
|
|
51
|
+
if (typeof usage.prompt_cache_miss_tokens === "number") {
|
|
52
|
+
stats.promptCacheMissTokens = usage.prompt_cache_miss_tokens;
|
|
53
|
+
}
|
|
54
|
+
return Object.keys(stats).length > 0 ? stats : undefined;
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/routing/provider-adapters/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { AgentRole } from "../core/types";
|
|
2
2
|
import type { ModelSelection } from "./model-router";
|
|
3
|
+
import type { ProviderChatMessage, ProviderUsageStats } from "./provider-adapters/types";
|
|
3
4
|
export declare class ProviderError extends Error {
|
|
4
5
|
provider: ModelSelection["provider"];
|
|
5
6
|
model: string;
|
|
@@ -16,6 +17,10 @@ export interface PromptContext {
|
|
|
16
17
|
skillHints?: string[];
|
|
17
18
|
extraInstructions?: string[];
|
|
18
19
|
}
|
|
20
|
+
export declare function getLastProviderUsage(): ProviderUsageStats | undefined;
|
|
19
21
|
export declare function formatPromptWithContext(role: AgentRole, prompt: string, context?: PromptContext): string;
|
|
20
|
-
export declare function executeRolePrompt(role: AgentRole, prompt: string, selection: ModelSelection, context?: PromptContext): Promise<string>;
|
|
22
|
+
export declare function executeRolePrompt(role: AgentRole, prompt: string, selection: ModelSelection, context?: PromptContext, signal?: AbortSignal): Promise<string>;
|
|
23
|
+
/** @internal test helper */
|
|
24
|
+
export declare function __resetProviderCircuitsForTests(): void;
|
|
25
|
+
export type { ProviderChatMessage };
|
|
21
26
|
//# sourceMappingURL=provider-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-executor.d.ts","sourceRoot":"","sources":["../../src/routing/provider-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-executor.d.ts","sourceRoot":"","sources":["../../src/routing/provider-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAMrD,OAAO,KAAK,EAAE,mBAAmB,EAAuB,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAI9G,qBAAa,aAAc,SAAQ,KAAK;IACtC,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;gBAEP,MAAM,EAAE;QAClB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;QACrC,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,OAAO,CAAC;KACpB;CAOF;AAYD,MAAM,WAAW,aAAa;IAC5B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAOD,wBAAgB,oBAAoB,IAAI,kBAAkB,GAAG,SAAS,CAErE;AAYD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,CAgCR;AA4FD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,cAAc,EACzB,OAAO,CAAC,EAAE,aAAa,EACvB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CA4GjB;AAED,4BAA4B;AAC5B,wBAAgB,+BAA+B,IAAI,IAAI,CAGtD;AAED,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
|
|
@@ -1,13 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ProviderError = void 0;
|
|
4
|
+
exports.getLastProviderUsage = getLastProviderUsage;
|
|
4
5
|
exports.formatPromptWithContext = formatPromptWithContext;
|
|
5
6
|
exports.executeRolePrompt = executeRolePrompt;
|
|
7
|
+
exports.__resetProviderCircuitsForTests = __resetProviderCircuitsForTests;
|
|
8
|
+
const cancellation_1 = require("../core/cancellation");
|
|
9
|
+
const resolve_1 = require("../config/resolve");
|
|
6
10
|
const logger_1 = require("../utils/logger");
|
|
7
11
|
const anthropic_1 = require("./provider-adapters/anthropic");
|
|
8
12
|
const bailian_1 = require("./provider-adapters/bailian");
|
|
13
|
+
const deepseek_1 = require("./provider-adapters/deepseek");
|
|
9
14
|
const doubao_1 = require("./provider-adapters/doubao");
|
|
10
15
|
const openai_1 = require("./provider-adapters/openai");
|
|
16
|
+
const role_capabilities_1 = require("./role-capabilities");
|
|
17
|
+
const deepseek_tools_1 = require("./deepseek-tools");
|
|
11
18
|
class ProviderError extends Error {
|
|
12
19
|
provider;
|
|
13
20
|
model;
|
|
@@ -27,6 +34,10 @@ const DEFAULT_CIRCUIT_FAILURE_THRESHOLD = 5;
|
|
|
27
34
|
const DEFAULT_CIRCUIT_OPEN_MS = 60_000;
|
|
28
35
|
const MAX_SUMMARY_LINES = 20;
|
|
29
36
|
const MAX_SKILL_HINTS = 8;
|
|
37
|
+
let lastProviderUsage;
|
|
38
|
+
function getLastProviderUsage() {
|
|
39
|
+
return lastProviderUsage;
|
|
40
|
+
}
|
|
30
41
|
function hasAnyContext(context) {
|
|
31
42
|
if (!context) {
|
|
32
43
|
return false;
|
|
@@ -64,25 +75,6 @@ function formatPromptWithContext(role, prompt, context) {
|
|
|
64
75
|
lines.push(prompt);
|
|
65
76
|
return lines.join("\n");
|
|
66
77
|
}
|
|
67
|
-
async function withTimeout(promise, timeoutMs, label) {
|
|
68
|
-
if (timeoutMs <= 0) {
|
|
69
|
-
return promise;
|
|
70
|
-
}
|
|
71
|
-
let timer;
|
|
72
|
-
const timeout = new Promise((_resolve, reject) => {
|
|
73
|
-
timer = setTimeout(() => {
|
|
74
|
-
reject(new Error(`${label} timed out after ${timeoutMs}ms`));
|
|
75
|
-
}, timeoutMs);
|
|
76
|
-
});
|
|
77
|
-
try {
|
|
78
|
-
return await Promise.race([promise, timeout]);
|
|
79
|
-
}
|
|
80
|
-
finally {
|
|
81
|
-
if (timer) {
|
|
82
|
-
clearTimeout(timer);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
78
|
function getCircuitState(key) {
|
|
87
79
|
const found = circuitByProvider.get(key);
|
|
88
80
|
if (found) {
|
|
@@ -130,13 +122,46 @@ function sleep(ms) {
|
|
|
130
122
|
}
|
|
131
123
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
132
124
|
}
|
|
133
|
-
async function
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
125
|
+
async function dispatchProvider(request, selection, enableTools) {
|
|
126
|
+
if (selection.provider === "anthropic") {
|
|
127
|
+
return (0, anthropic_1.anthropicGenerateText)(request);
|
|
128
|
+
}
|
|
129
|
+
if (selection.provider === "bailian") {
|
|
130
|
+
return (0, bailian_1.bailianGenerateText)(request);
|
|
131
|
+
}
|
|
132
|
+
if (selection.provider === "doubao") {
|
|
133
|
+
return (0, doubao_1.doubaoGenerateText)(request);
|
|
134
|
+
}
|
|
135
|
+
if (selection.provider === "deepseek") {
|
|
136
|
+
if (enableTools) {
|
|
137
|
+
const result = await (0, deepseek_tools_1.runDeepseekToolLoop)(request);
|
|
138
|
+
lastProviderUsage = result.usage;
|
|
139
|
+
if (result.usage?.promptCacheHitTokens !== undefined) {
|
|
140
|
+
logger_1.logger.info({
|
|
141
|
+
provider: "deepseek",
|
|
142
|
+
cacheHit: result.usage.promptCacheHitTokens,
|
|
143
|
+
cacheMiss: result.usage.promptCacheMissTokens,
|
|
144
|
+
}, "DeepSeek cache usage");
|
|
145
|
+
}
|
|
146
|
+
return result.content;
|
|
147
|
+
}
|
|
148
|
+
const detailed = await (0, deepseek_1.deepseekGenerateTextDetailed)(request);
|
|
149
|
+
lastProviderUsage = detailed.usage;
|
|
150
|
+
return detailed.content || (await (0, deepseek_1.deepseekGenerateText)(request));
|
|
151
|
+
}
|
|
152
|
+
return (0, openai_1.openaiGenerateText)(request);
|
|
153
|
+
}
|
|
154
|
+
async function executeRolePrompt(role, prompt, selection, context, signal) {
|
|
155
|
+
const config = (0, resolve_1.resolveConfig)();
|
|
156
|
+
const request = (0, role_capabilities_1.buildProviderRequestForRole)(role, prompt, selection, config, context);
|
|
157
|
+
if (signal) {
|
|
158
|
+
request.signal = signal;
|
|
159
|
+
}
|
|
160
|
+
const enableTools = role === "planner" &&
|
|
161
|
+
!/^\s*Reply with exactly:\s*ok\s*$/i.test(prompt.trim()) &&
|
|
162
|
+
(0, role_capabilities_1.shouldEnableProviderTools)(selection, config);
|
|
163
|
+
const label = `${selection.provider}/${selection.model}`;
|
|
164
|
+
const timeoutMsRaw = Number(process.env.GRAPHFLOW_PROVIDER_TIMEOUT_MS ?? (selection.provider === "deepseek" ? 60000 : 15000));
|
|
140
165
|
const timeoutMs = Number.isFinite(timeoutMsRaw) ? Math.max(1000, Math.floor(timeoutMsRaw)) : 15000;
|
|
141
166
|
const circuitKey = `${selection.provider}:${selection.model}`;
|
|
142
167
|
const circuitState = getCircuitState(circuitKey);
|
|
@@ -148,32 +173,33 @@ async function executeRolePrompt(role, prompt, selection, context) {
|
|
|
148
173
|
retryable: true,
|
|
149
174
|
});
|
|
150
175
|
}
|
|
151
|
-
const execute = async () => {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
}
|
|
155
|
-
if (selection.provider === "bailian") {
|
|
156
|
-
return (0, bailian_1.bailianGenerateText)(request);
|
|
157
|
-
}
|
|
158
|
-
if (selection.provider === "doubao") {
|
|
159
|
-
return (0, doubao_1.doubaoGenerateText)(request);
|
|
160
|
-
}
|
|
161
|
-
return (0, openai_1.openaiGenerateText)(request);
|
|
176
|
+
const execute = async (abortSignal) => {
|
|
177
|
+
const req = { ...request, signal: abortSignal };
|
|
178
|
+
return dispatchProvider(req, selection, enableTools);
|
|
162
179
|
};
|
|
163
180
|
const retryBudget = getRetryBudget();
|
|
164
181
|
const circuitThreshold = getCircuitThreshold();
|
|
165
182
|
const circuitOpenMs = getCircuitOpenMs();
|
|
166
183
|
let attempt = 0;
|
|
167
184
|
while (attempt <= retryBudget) {
|
|
185
|
+
if (signal?.aborted) {
|
|
186
|
+
throw new ProviderError({
|
|
187
|
+
provider: selection.provider,
|
|
188
|
+
model: selection.model,
|
|
189
|
+
message: `${label} aborted`,
|
|
190
|
+
retryable: false,
|
|
191
|
+
});
|
|
192
|
+
}
|
|
168
193
|
try {
|
|
169
|
-
const value = await
|
|
194
|
+
const value = await (0, cancellation_1.runAbortable)(label, timeoutMs, signal, execute, "provider.fetch");
|
|
170
195
|
circuitState.failures = 0;
|
|
171
196
|
delete circuitState.openedUntil;
|
|
172
197
|
return value;
|
|
173
198
|
}
|
|
174
199
|
catch (error) {
|
|
175
200
|
const message = error instanceof Error ? error.message : String(error);
|
|
176
|
-
const
|
|
201
|
+
const aborted = (0, cancellation_1.isAbortError)(error) || signal?.aborted || /timed out|aborted/i.test(message);
|
|
202
|
+
const retryable = !aborted && !/invalid|unauthorized|forbidden|404|not found/i.test(message);
|
|
177
203
|
const wrapped = new ProviderError({
|
|
178
204
|
provider: selection.provider,
|
|
179
205
|
model: selection.model,
|
|
@@ -210,4 +236,9 @@ async function executeRolePrompt(role, prompt, selection, context) {
|
|
|
210
236
|
retryable: true,
|
|
211
237
|
});
|
|
212
238
|
}
|
|
239
|
+
/** @internal test helper */
|
|
240
|
+
function __resetProviderCircuitsForTests() {
|
|
241
|
+
circuitByProvider.clear();
|
|
242
|
+
lastProviderUsage = undefined;
|
|
243
|
+
}
|
|
213
244
|
//# sourceMappingURL=provider-executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-executor.js","sourceRoot":"","sources":["../../src/routing/provider-executor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"provider-executor.js","sourceRoot":"","sources":["../../src/routing/provider-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-health.d.ts","sourceRoot":"","sources":["../../src/routing/provider-health.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEtE,eAAO,MAAM,aAAa,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"provider-health.d.ts","sourceRoot":"","sources":["../../src/routing/provider-health.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEtE,eAAO,MAAM,aAAa,EAAE,YAAY,EAMvC,CAAC;AAKF,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAElE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAElE;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,eAAe,GAAG,iBAAiB,CAwBjF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,eAAe,GAAG,YAAY,EAAE,CAiB1E"}
|
|
@@ -7,7 +7,13 @@ exports.resetProviderHealth = resetProviderHealth;
|
|
|
7
7
|
exports.buildProviderHealthMap = buildProviderHealthMap;
|
|
8
8
|
exports.buildFallbackChain = buildFallbackChain;
|
|
9
9
|
const secrets_1 = require("../config/secrets");
|
|
10
|
-
exports.ALL_PROVIDERS = [
|
|
10
|
+
exports.ALL_PROVIDERS = [
|
|
11
|
+
"openai",
|
|
12
|
+
"anthropic",
|
|
13
|
+
"bailian",
|
|
14
|
+
"doubao",
|
|
15
|
+
"deepseek",
|
|
16
|
+
];
|
|
11
17
|
// Runtime consecutive-failure tracker (in-memory only)
|
|
12
18
|
const failureCounts = new Map();
|
|
13
19
|
function recordProviderFailure(provider) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-health.js","sourceRoot":"","sources":["../../src/routing/provider-health.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"provider-health.js","sourceRoot":"","sources":["../../src/routing/provider-health.ts"],"names":[],"mappings":";;;AAeA,sDAEC;AAED,sDAEC;AAED,kDAEC;AAED,wDAwBC;AAED,gDAiBC;AAtED,+CAAwD;AAI3C,QAAA,aAAa,GAAmB;IAC3C,QAAQ;IACR,WAAW;IACX,SAAS;IACT,QAAQ;IACR,UAAU;CACX,CAAC;AAEF,uDAAuD;AACvD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAwB,CAAC;AAEtD,SAAgB,qBAAqB,CAAC,QAAsB;IAC1D,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,SAAgB,qBAAqB,CAAC,QAAsB;IAC1D,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAED,SAAgB,mBAAmB;IACjC,aAAa,CAAC,KAAK,EAAE,CAAC;AACxB,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAuB;IAC5D,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,EAAE,uBAAuB,IAAI,KAAK,CAAC;IAE7E,MAAM,aAAa,GAAG,qBAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE3C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAU,CAAC;QACpC,CAAC;QAED,8EAA8E;QAC9E,MAAM,mBAAmB,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,mBAAmB,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAU,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAU,CAAC;QACnC,CAAC;QAED,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAA,6BAAmB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAU,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,WAAW,CAAC,aAAa,CAAsB,CAAC;AAChE,CAAC;AAED,SAAgB,kBAAkB,CAAC,MAAuB;IACxD,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,gBAAgB,IAAI,qBAAa,CAAC;IACzE,MAAM,MAAM,GAAmB,EAAE,CAAC;IAElC,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,qBAAa,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { AgentRole } from "../core/types";
|
|
2
|
+
import type { GraphFlowConfig } from "../config/schema";
|
|
3
|
+
import type { ModelSelection } from "./model-router";
|
|
4
|
+
import type { PromptContext } from "./provider-executor";
|
|
5
|
+
import type { ProviderChatMessage, ProviderTextRequest } from "./provider-adapters/types";
|
|
6
|
+
export declare function formatMessagesWithContext(role: AgentRole, prompt: string, context?: PromptContext, options?: {
|
|
7
|
+
jsonMode?: boolean;
|
|
8
|
+
}): ProviderChatMessage[];
|
|
9
|
+
export declare function buildProviderRequestForRole(role: AgentRole, prompt: string, selection: ModelSelection, config: GraphFlowConfig, context?: PromptContext): ProviderTextRequest;
|
|
10
|
+
export declare function shouldEnableProviderTools(selection: ModelSelection, config: GraphFlowConfig): boolean;
|
|
11
|
+
//# sourceMappingURL=role-capabilities.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"role-capabilities.d.ts","sourceRoot":"","sources":["../../src/routing/role-capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,kBAAkB,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAK1F,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC/B,mBAAmB,EAAE,CAgCvB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,cAAc,EACzB,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,mBAAmB,CAmDrB;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,cAAc,EACzB,MAAM,EAAE,eAAe,GACtB,OAAO,CAYT"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatMessagesWithContext = formatMessagesWithContext;
|
|
4
|
+
exports.buildProviderRequestForRole = buildProviderRequestForRole;
|
|
5
|
+
exports.shouldEnableProviderTools = shouldEnableProviderTools;
|
|
6
|
+
const JSON_SYSTEM_HINT = "Respond with valid json only. EXAMPLE JSON OUTPUT: {\"ok\":true,\"summary\":\"...\"}";
|
|
7
|
+
function formatMessagesWithContext(role, prompt, context, options) {
|
|
8
|
+
const systemParts = [`You are GraphFlow's ${role} agent.`];
|
|
9
|
+
if (options?.jsonMode) {
|
|
10
|
+
systemParts.push(JSON_SYSTEM_HINT);
|
|
11
|
+
}
|
|
12
|
+
const skills = (context?.skillHints ?? []).filter((s) => s && s.trim().length > 0);
|
|
13
|
+
if (skills.length > 0) {
|
|
14
|
+
systemParts.push(`Skills to apply: ${skills.slice(0, 8).join(", ")}`);
|
|
15
|
+
}
|
|
16
|
+
const notes = (context?.extraInstructions ?? []).filter((n) => n && n.trim().length > 0);
|
|
17
|
+
if (notes.length > 0) {
|
|
18
|
+
systemParts.push(`Notes:\n${notes.map((n) => `- ${n}`).join("\n")}`);
|
|
19
|
+
}
|
|
20
|
+
const userParts = [];
|
|
21
|
+
const summaries = (context?.summaryChannel ?? []).filter((line) => line && line.trim().length > 0);
|
|
22
|
+
if (summaries.length > 0) {
|
|
23
|
+
userParts.push("Knowledge graph context:");
|
|
24
|
+
for (const item of summaries.slice(0, 20)) {
|
|
25
|
+
userParts.push(`- ${item}`);
|
|
26
|
+
}
|
|
27
|
+
userParts.push("");
|
|
28
|
+
}
|
|
29
|
+
userParts.push("Task:");
|
|
30
|
+
userParts.push(prompt);
|
|
31
|
+
return [
|
|
32
|
+
{ role: "system", content: systemParts.join("\n") },
|
|
33
|
+
{ role: "user", content: userParts.join("\n") },
|
|
34
|
+
];
|
|
35
|
+
}
|
|
36
|
+
function buildProviderRequestForRole(role, prompt, selection, config, context) {
|
|
37
|
+
const providerCfg = (config.providers[selection.provider] ?? {});
|
|
38
|
+
const isDeepseek = selection.provider === "deepseek";
|
|
39
|
+
const smartRole = role === "planner" || role === "validator";
|
|
40
|
+
const isProbe = /^\s*Reply with exactly:\s*ok\s*$/i.test(prompt.trim());
|
|
41
|
+
const thinkingMode = providerCfg.thinking ?? "auto";
|
|
42
|
+
const thinking = isProbe || thinkingMode === "disabled"
|
|
43
|
+
? "disabled"
|
|
44
|
+
: thinkingMode === "enabled"
|
|
45
|
+
? "enabled"
|
|
46
|
+
: smartRole && selection.tier === "smart"
|
|
47
|
+
? "enabled"
|
|
48
|
+
: "disabled";
|
|
49
|
+
const jsonModeSetting = providerCfg.jsonMode ?? "auto";
|
|
50
|
+
const jsonMode = isProbe
|
|
51
|
+
? false
|
|
52
|
+
: jsonModeSetting === true
|
|
53
|
+
? true
|
|
54
|
+
: jsonModeSetting === false
|
|
55
|
+
? false
|
|
56
|
+
: role === "planner" || role === "validator";
|
|
57
|
+
const maxTokens = providerCfg.maxTokens ??
|
|
58
|
+
(isProbe ? 32 : role === "planner" ? 2048 : role === "validator" ? 1024 : 512);
|
|
59
|
+
const messages = formatMessagesWithContext(role, prompt, context, { jsonMode });
|
|
60
|
+
const request = {
|
|
61
|
+
prompt,
|
|
62
|
+
model: selection.model,
|
|
63
|
+
messages,
|
|
64
|
+
maxTokens,
|
|
65
|
+
...(providerCfg.temperature !== undefined ? { temperature: providerCfg.temperature } : {}),
|
|
66
|
+
};
|
|
67
|
+
if (isDeepseek) {
|
|
68
|
+
request.thinking = thinking;
|
|
69
|
+
if (thinking === "enabled") {
|
|
70
|
+
request.reasoningEffort = providerCfg.reasoningEffort ?? (role === "planner" ? "high" : "high");
|
|
71
|
+
}
|
|
72
|
+
if (jsonMode) {
|
|
73
|
+
request.responseFormat = { type: "json_object" };
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else if (jsonMode && (selection.provider === "openai" || selection.provider === "bailian")) {
|
|
77
|
+
request.responseFormat = { type: "json_object" };
|
|
78
|
+
}
|
|
79
|
+
return request;
|
|
80
|
+
}
|
|
81
|
+
function shouldEnableProviderTools(selection, config) {
|
|
82
|
+
if (selection.provider !== "deepseek") {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
if (config.routingPolicy?.enableProviderTools === false) {
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
88
|
+
const providerCfg = config.providers.deepseek;
|
|
89
|
+
if (providerCfg?.enableTools === false) {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
94
|
+
//# sourceMappingURL=role-capabilities.js.map
|