@mcp-abap-adt/llm-agent 3.0.0 → 3.2.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/agents/anthropic-agent.d.ts +1 -1
- package/dist/agents/anthropic-agent.d.ts.map +1 -1
- package/dist/agents/anthropic-agent.js +3 -3
- package/dist/agents/anthropic-agent.js.map +1 -1
- package/dist/agents/base.d.ts +1 -0
- package/dist/agents/base.d.ts.map +1 -1
- package/dist/agents/base.js.map +1 -1
- package/dist/agents/deepseek-agent.d.ts +2 -2
- package/dist/agents/deepseek-agent.d.ts.map +1 -1
- package/dist/agents/deepseek-agent.js +4 -4
- package/dist/agents/deepseek-agent.js.map +1 -1
- package/dist/agents/openai-agent.js +2 -2
- package/dist/agents/openai-agent.js.map +1 -1
- package/dist/agents/sap-core-ai-agent.d.ts +2 -2
- package/dist/agents/sap-core-ai-agent.d.ts.map +1 -1
- package/dist/agents/sap-core-ai-agent.js +8 -2
- package/dist/agents/sap-core-ai-agent.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/llm-providers/anthropic.d.ts +2 -1
- package/dist/llm-providers/anthropic.d.ts.map +1 -1
- package/dist/llm-providers/anthropic.js +1 -1
- package/dist/llm-providers/anthropic.js.map +1 -1
- package/dist/llm-providers/base.d.ts +2 -1
- package/dist/llm-providers/base.d.ts.map +1 -1
- package/dist/llm-providers/base.js.map +1 -1
- package/dist/llm-providers/deepseek.d.ts +2 -1
- package/dist/llm-providers/deepseek.d.ts.map +1 -1
- package/dist/llm-providers/deepseek.js +1 -1
- package/dist/llm-providers/deepseek.js.map +1 -1
- package/dist/llm-providers/openai.d.ts +2 -1
- package/dist/llm-providers/openai.d.ts.map +1 -1
- package/dist/llm-providers/openai.js +1 -1
- package/dist/llm-providers/openai.js.map +1 -1
- package/dist/llm-providers/sap-core-ai.d.ts +8 -1
- package/dist/llm-providers/sap-core-ai.d.ts.map +1 -1
- package/dist/llm-providers/sap-core-ai.js +34 -4
- package/dist/llm-providers/sap-core-ai.js.map +1 -1
- package/dist/smart-agent/adapters/cline-client-adapter.d.ts +18 -0
- package/dist/smart-agent/adapters/cline-client-adapter.d.ts.map +1 -0
- package/dist/smart-agent/adapters/cline-client-adapter.js +21 -0
- package/dist/smart-agent/adapters/cline-client-adapter.js.map +1 -0
- package/dist/smart-agent/adapters/llm-adapter.d.ts +5 -2
- package/dist/smart-agent/adapters/llm-adapter.d.ts.map +1 -1
- package/dist/smart-agent/adapters/llm-adapter.js +55 -3
- package/dist/smart-agent/adapters/llm-adapter.js.map +1 -1
- package/dist/smart-agent/agent.d.ts +2 -0
- package/dist/smart-agent/agent.d.ts.map +1 -1
- package/dist/smart-agent/agent.js +45 -6
- package/dist/smart-agent/agent.js.map +1 -1
- package/dist/smart-agent/builder.d.ts +11 -1
- package/dist/smart-agent/builder.d.ts.map +1 -1
- package/dist/smart-agent/builder.js +34 -0
- package/dist/smart-agent/builder.js.map +1 -1
- package/dist/smart-agent/context/client-context-bridge.d.ts +19 -0
- package/dist/smart-agent/context/client-context-bridge.d.ts.map +1 -0
- package/dist/smart-agent/context/client-context-bridge.js +92 -0
- package/dist/smart-agent/context/client-context-bridge.js.map +1 -0
- package/dist/smart-agent/interfaces/client-adapter.d.ts +23 -0
- package/dist/smart-agent/interfaces/client-adapter.d.ts.map +1 -0
- package/dist/smart-agent/interfaces/client-adapter.js +10 -0
- package/dist/smart-agent/interfaces/client-adapter.js.map +1 -0
- package/dist/smart-agent/interfaces/client-context-bridge.d.ts +39 -0
- package/dist/smart-agent/interfaces/client-context-bridge.d.ts.map +1 -0
- package/dist/smart-agent/interfaces/client-context-bridge.js +17 -0
- package/dist/smart-agent/interfaces/client-context-bridge.js.map +1 -0
- package/dist/smart-agent/interfaces/index.d.ts +1 -0
- package/dist/smart-agent/interfaces/index.d.ts.map +1 -1
- package/dist/smart-agent/interfaces/index.js.map +1 -1
- package/dist/smart-agent/interfaces/model-provider.d.ts +15 -0
- package/dist/smart-agent/interfaces/model-provider.d.ts.map +1 -0
- package/dist/smart-agent/interfaces/model-provider.js +5 -0
- package/dist/smart-agent/interfaces/model-provider.js.map +1 -0
- package/dist/smart-agent/interfaces/prompt-tool-extractor.d.ts +39 -0
- package/dist/smart-agent/interfaces/prompt-tool-extractor.d.ts.map +1 -0
- package/dist/smart-agent/interfaces/prompt-tool-extractor.js +11 -0
- package/dist/smart-agent/interfaces/prompt-tool-extractor.js.map +1 -0
- package/dist/smart-agent/interfaces/types.d.ts +2 -0
- package/dist/smart-agent/interfaces/types.d.ts.map +1 -1
- package/dist/smart-agent/interfaces/types.js.map +1 -1
- package/dist/smart-agent/llm/token-counting-llm.d.ts +2 -0
- package/dist/smart-agent/llm/token-counting-llm.d.ts.map +1 -1
- package/dist/smart-agent/llm/token-counting-llm.js +4 -0
- package/dist/smart-agent/llm/token-counting-llm.js.map +1 -1
- package/dist/smart-agent/plugins/types.d.ts +4 -0
- package/dist/smart-agent/plugins/types.d.ts.map +1 -1
- package/dist/smart-agent/plugins/types.js +5 -0
- package/dist/smart-agent/plugins/types.js.map +1 -1
- package/dist/smart-agent/prompt-tool-extractor.d.ts +30 -0
- package/dist/smart-agent/prompt-tool-extractor.d.ts.map +1 -0
- package/dist/smart-agent/prompt-tool-extractor.js +101 -0
- package/dist/smart-agent/prompt-tool-extractor.js.map +1 -0
- package/dist/smart-agent/smart-server.d.ts +3 -0
- package/dist/smart-agent/smart-server.d.ts.map +1 -1
- package/dist/smart-agent/smart-server.js +36 -20
- package/dist/smart-agent/smart-server.js.map +1 -1
- package/package.json +7 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llm-providers/openai.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAA6B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llm-providers/openai.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAA6B,MAAM,OAAO,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAU5C,MAAM,OAAO,cAAe,SAAQ,eAA6B;IACtD,MAAM,CAAgB;IACtB,KAAK,CAAS;IAEvB,YAAY,MAAoB;QAC9B,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,aAAa,CAAC;QAE3C,MAAM,OAAO,GAA2B;YACtC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;YACxC,cAAc,EAAE,kBAAkB;SACnC,CAAC;QAEF,sCAAsC;QACtC,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,OAAO,CAAC,qBAAqB,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;QACvD,CAAC;QAED,iCAAiC;QACjC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YACzB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,2BAA2B;YACtD,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAmB,EAAE,KAAiB;QAC/C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBAC3D,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;gBACvC,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;gBACpD,WAAW,EAAE,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;gBAC3D,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,GAAG;gBAC3C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI;aAC1C,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAExC,OAAO;gBACL,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE;gBACrC,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,GAAG,EAAE,QAAQ,CAAC,IAAI;aACnB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC;gBACvC,CAAC,CAAE,KAAK,CAAC,QAAQ,EAAE,IAAyC,EAAE,KAAK;oBAC/D,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO;gBAC9B,CAAC,CAAC,KAAK,YAAY,KAAK;oBACtB,CAAC,CAAC,KAAK,CAAC,OAAO;oBACf,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,CAAC,UAAU,CACf,QAAmB,EACnB,KAAiB;QAEjB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACrC,mBAAmB,EACnB;gBACE,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;gBACvC,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;gBACpD,WAAW,EAAE,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;gBAC3D,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,GAAG;gBAC3C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI;gBACzC,MAAM,EAAE,IAAI;aACb,EACD,EAAE,YAAY,EAAE,QAAQ,EAAE,CAC3B,CAAC;YAEF,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC7B,IAAI,MAAM,GAAG,EAAE,CAAC;YAEhB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;gBAE3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC5B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;wBAAE,SAAS;oBAExD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC9B,IAAI,IAAI,KAAK,QAAQ;wBAAE,MAAM;oBAE7B,IAAI,CAAC;wBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAChC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBACjC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;4BACjB,MAAM;gCACJ,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE;gCACnC,YAAY,EAAE,MAAM,CAAC,aAAa;gCAClC,GAAG,EAAE,MAAM;6BACZ,CAAC;wBACJ,CAAC;oBACH,CAAC;oBAAC,OAAO,EAAE,EAAE,CAAC;wBACZ,4CAA4C;oBAC9C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC;gBACvC,CAAC,CAAE,KAAK,CAAC,QAAQ,EAAE,IAAyC,EAAE,KAAK;oBAC/D,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO;gBAC9B,CAAC,CAAC,KAAK,YAAY,KAAK;oBACtB,CAAC,CAAC,KAAK,CAAC,OAAO;oBACf,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAClD,OAAQ,QAAQ,CAAC,IAAI,CAAC,IAAiD,CAAC,GAAG,CACzE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC5C,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,QAAmB;QACxC,MAAM,SAAS,GAAmC,EAAE,CAAC;QAErD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;gBAC7C,SAAS;YACX,CAAC;YAED,MAAM,KAAK,GAA4B;gBACrC,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;aAC3B,CAAC;YAEF,IACE,GAAG,CAAC,IAAI,KAAK,WAAW;gBACxB,GAAG,CAAC,UAAU;gBACd,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EACzB,CAAC;gBACD,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;gBAClC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC;YACtC,CAAC;YAED,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxB,KAAK,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;gBACtC,KAAK,CAAC,OAAO;oBACX,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;wBAC7B,CAAC,CAAC,GAAG,CAAC,OAAO;wBACb,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC1C,CAAC;YAED,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* Architecture:
|
|
8
8
|
* - Agent → SapCoreAIProvider → OrchestrationClient → SAP AI Core → External LLM
|
|
9
9
|
*/
|
|
10
|
+
import type { IModelInfo } from '../smart-agent/interfaces/model-provider.js';
|
|
10
11
|
import type { LLMProviderConfig, LLMResponse, Message } from '../types.js';
|
|
11
12
|
import { BaseLLMProvider } from './base.js';
|
|
12
13
|
/**
|
|
@@ -54,10 +55,16 @@ export declare class SapCoreAIProvider extends BaseLLMProvider<SapCoreAIConfig>
|
|
|
54
55
|
readonly resourceGroup?: string;
|
|
55
56
|
private log?;
|
|
56
57
|
private readonly destination?;
|
|
58
|
+
private modelsCache;
|
|
59
|
+
private modelsCacheExpiry;
|
|
60
|
+
private static readonly MODELS_CACHE_TTL_MS;
|
|
61
|
+
private modelOverride?;
|
|
62
|
+
/** Set a per-request model override. Cleared after each chat/streamChat call. */
|
|
63
|
+
setModelOverride(model?: string): void;
|
|
57
64
|
constructor(config: SapCoreAIConfig);
|
|
58
65
|
chat(messages: Message[], tools?: unknown[]): Promise<LLMResponse>;
|
|
59
66
|
streamChat(messages: Message[], tools?: unknown[]): AsyncIterable<LLMResponse>;
|
|
60
|
-
getModels(): Promise<
|
|
67
|
+
getModels(): Promise<IModelInfo[]>;
|
|
61
68
|
/**
|
|
62
69
|
* Create an OrchestrationClient with the given tools configuration.
|
|
63
70
|
* Tools are expected in OpenAI function format (already converted by the agent layer).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sap-core-ai.d.ts","sourceRoot":"","sources":["../../src/llm-providers/sap-core-ai.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,+FAA+F;IAC/F,eAAe,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iCAAiC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC,sBAAsB;IACtB,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;QAC7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;KAC9D,CAAC;CACH;AAED;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,eAAe,CAAC;IACrE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,CAAyB;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAA0B;
|
|
1
|
+
{"version":3,"file":"sap-core-ai.d.ts","sourceRoot":"","sources":["../../src/llm-providers/sap-core-ai.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,+FAA+F;IAC/F,eAAe,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iCAAiC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC,sBAAsB;IACtB,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;QAC7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;KAC9D,CAAC;CACH;AAED;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,eAAe,CAAC;IACrE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,CAAyB;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAA0B;IACvD,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IACrD,OAAO,CAAC,aAAa,CAAC,CAAS;IAE/B,iFAAiF;IACjF,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;gBAI1B,MAAM,EAAE,eAAe;IAkB7B,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IA6CjE,UAAU,CACf,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,GAChB,aAAa,CAAC,WAAW,CAAC;IAuBvB,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IA6BxC;;;OAGG;IACH,OAAO,CAAC,YAAY;IA0BpB;;OAEG;IACH,OAAO,CAAC,cAAc;CA+BvB"}
|
|
@@ -20,6 +20,14 @@ export class SapCoreAIProvider extends BaseLLMProvider {
|
|
|
20
20
|
resourceGroup;
|
|
21
21
|
log;
|
|
22
22
|
destination;
|
|
23
|
+
modelsCache = null;
|
|
24
|
+
modelsCacheExpiry = 0;
|
|
25
|
+
static MODELS_CACHE_TTL_MS = 60_000;
|
|
26
|
+
modelOverride;
|
|
27
|
+
/** Set a per-request model override. Cleared after each chat/streamChat call. */
|
|
28
|
+
setModelOverride(model) {
|
|
29
|
+
this.modelOverride = model;
|
|
30
|
+
}
|
|
23
31
|
constructor(config) {
|
|
24
32
|
super(config);
|
|
25
33
|
// Skip validateConfig() — SAP SDK handles auth via AICORE_SERVICE_KEY env var
|
|
@@ -74,6 +82,9 @@ export class SapCoreAIProvider extends BaseLLMProvider {
|
|
|
74
82
|
this.log?.error('SAP AI SDK API error', { error: message });
|
|
75
83
|
throw new Error(`SAP AI SDK API error: ${message}`);
|
|
76
84
|
}
|
|
85
|
+
finally {
|
|
86
|
+
this.modelOverride = undefined;
|
|
87
|
+
}
|
|
77
88
|
}
|
|
78
89
|
async *streamChat(messages, tools) {
|
|
79
90
|
try {
|
|
@@ -94,11 +105,30 @@ export class SapCoreAIProvider extends BaseLLMProvider {
|
|
|
94
105
|
this.log?.error('SAP AI SDK streaming error', { error: message });
|
|
95
106
|
throw new Error(`SAP AI SDK streaming error: ${message}`);
|
|
96
107
|
}
|
|
108
|
+
finally {
|
|
109
|
+
this.modelOverride = undefined;
|
|
110
|
+
}
|
|
97
111
|
}
|
|
98
112
|
async getModels() {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
113
|
+
if (this.modelsCache && Date.now() < this.modelsCacheExpiry) {
|
|
114
|
+
return this.modelsCache;
|
|
115
|
+
}
|
|
116
|
+
try {
|
|
117
|
+
const { ScenarioApi } = await import('@sap-ai-sdk/ai-api');
|
|
118
|
+
const result = await ScenarioApi.scenarioQueryModels('foundation-models', { 'AI-Resource-Group': this.resourceGroup ?? 'default' }).execute();
|
|
119
|
+
const models = result.resources.map((m) => ({
|
|
120
|
+
id: m.model,
|
|
121
|
+
owned_by: m.executableId,
|
|
122
|
+
}));
|
|
123
|
+
this.modelsCache = models;
|
|
124
|
+
this.modelsCacheExpiry =
|
|
125
|
+
Date.now() + SapCoreAIProvider.MODELS_CACHE_TTL_MS;
|
|
126
|
+
return models;
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
// Fallback to configured model if AI API is not available
|
|
130
|
+
return [{ id: this.model }];
|
|
131
|
+
}
|
|
102
132
|
}
|
|
103
133
|
/**
|
|
104
134
|
* Create an OrchestrationClient with the given tools configuration.
|
|
@@ -109,7 +139,7 @@ export class SapCoreAIProvider extends BaseLLMProvider {
|
|
|
109
139
|
const orchConfig = {
|
|
110
140
|
promptTemplating: {
|
|
111
141
|
model: {
|
|
112
|
-
name: this.model,
|
|
142
|
+
name: this.modelOverride ?? this.model,
|
|
113
143
|
params: {
|
|
114
144
|
max_tokens: this.config.maxTokens || 16384,
|
|
115
145
|
temperature: this.config.temperature || 0.7,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sap-core-ai.js","sourceRoot":"","sources":["../../src/llm-providers/sap-core-ai.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAEL,mBAAmB,GACpB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"sap-core-ai.js","sourceRoot":"","sources":["../../src/llm-providers/sap-core-ai.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Client adapter for Cline (VS Code AI extension).
|
|
3
|
+
*
|
|
4
|
+
* Cline is a prompt-based agent: it describes tools as XML in the system
|
|
5
|
+
* prompt and expects the LLM to respond with XML tool calls in `content`.
|
|
6
|
+
* When a task is complete, Cline requires the response to be wrapped in
|
|
7
|
+
* `<attempt_completion>` XML.
|
|
8
|
+
*
|
|
9
|
+
* This adapter detects Cline by its system prompt signature and wraps
|
|
10
|
+
* the final response accordingly.
|
|
11
|
+
*/
|
|
12
|
+
import type { IClientAdapter } from '../interfaces/client-adapter.js';
|
|
13
|
+
export declare class ClineClientAdapter implements IClientAdapter {
|
|
14
|
+
readonly name = "cline";
|
|
15
|
+
detect(systemPrompt: string): boolean;
|
|
16
|
+
wrapResponse(content: string): string;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=cline-client-adapter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cline-client-adapter.d.ts","sourceRoot":"","sources":["../../../src/smart-agent/adapters/cline-client-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,qBAAa,kBAAmB,YAAW,cAAc;IACvD,QAAQ,CAAC,IAAI,WAAW;IAExB,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAIrC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAGtC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Client adapter for Cline (VS Code AI extension).
|
|
3
|
+
*
|
|
4
|
+
* Cline is a prompt-based agent: it describes tools as XML in the system
|
|
5
|
+
* prompt and expects the LLM to respond with XML tool calls in `content`.
|
|
6
|
+
* When a task is complete, Cline requires the response to be wrapped in
|
|
7
|
+
* `<attempt_completion>` XML.
|
|
8
|
+
*
|
|
9
|
+
* This adapter detects Cline by its system prompt signature and wraps
|
|
10
|
+
* the final response accordingly.
|
|
11
|
+
*/
|
|
12
|
+
export class ClineClientAdapter {
|
|
13
|
+
name = 'cline';
|
|
14
|
+
detect(systemPrompt) {
|
|
15
|
+
return systemPrompt.includes('You are Cline');
|
|
16
|
+
}
|
|
17
|
+
wrapResponse(content) {
|
|
18
|
+
return `<attempt_completion>\n<result>\n${content}\n</result>\n</attempt_completion>`;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=cline-client-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cline-client-adapter.js","sourceRoot":"","sources":["../../../src/smart-agent/adapters/cline-client-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,MAAM,OAAO,kBAAkB;IACpB,IAAI,GAAG,OAAO,CAAC;IAExB,MAAM,CAAC,YAAoB;QACzB,OAAO,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;IAED,YAAY,CAAC,OAAe;QAC1B,OAAO,mCAAmC,OAAO,oCAAoC,CAAC;IACxF,CAAC;CACF"}
|
|
@@ -4,15 +4,18 @@
|
|
|
4
4
|
import type { BaseAgentLlmBridge } from '../../agents/base.js';
|
|
5
5
|
import type { Message } from '../../types.js';
|
|
6
6
|
import type { ILlm } from '../interfaces/llm.js';
|
|
7
|
+
import type { IModelInfo, IModelProvider } from '../interfaces/model-provider.js';
|
|
7
8
|
import { type CallOptions, LlmError, type LlmResponse, type LlmStreamChunk, type LlmTool, type Result } from '../interfaces/types.js';
|
|
8
9
|
export interface LlmAdapterProviderInfo {
|
|
9
10
|
model: string;
|
|
10
|
-
getModels?(): Promise<string[]>;
|
|
11
|
+
getModels?(): Promise<string[] | IModelInfo[]>;
|
|
11
12
|
}
|
|
12
|
-
export declare class LlmAdapter implements ILlm {
|
|
13
|
+
export declare class LlmAdapter implements ILlm, IModelProvider {
|
|
13
14
|
private readonly agent;
|
|
14
15
|
private readonly provider?;
|
|
15
16
|
constructor(agent: BaseAgentLlmBridge, provider?: LlmAdapterProviderInfo | undefined);
|
|
17
|
+
getModel(): string;
|
|
18
|
+
getModels(options?: CallOptions): Promise<Result<IModelInfo[], LlmError>>;
|
|
16
19
|
chat(messages: Message[], tools?: LlmTool[], options?: CallOptions): Promise<Result<LlmResponse, LlmError>>;
|
|
17
20
|
streamChat(messages: Message[], tools?: LlmTool[], options?: CallOptions): AsyncIterable<Result<LlmStreamChunk, LlmError>>;
|
|
18
21
|
healthCheck(options?: CallOptions): Promise<Result<boolean, LlmError>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-adapter.d.ts","sourceRoot":"","sources":["../../../src/smart-agent/adapters/llm-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAEV,OAAO,EACR,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EACL,KAAK,WAAW,EAChB,QAAQ,EACR,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,OAAO,EAGZ,KAAK,MAAM,EAEZ,MAAM,wBAAwB,CAAC;AA4NhC,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"llm-adapter.d.ts","sourceRoot":"","sources":["../../../src/smart-agent/adapters/llm-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAEV,OAAO,EACR,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,WAAW,EAChB,QAAQ,EACR,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,OAAO,EAGZ,KAAK,MAAM,EAEZ,MAAM,wBAAwB,CAAC;AA4NhC,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;CAChD;AAMD,qBAAa,UAAW,YAAW,IAAI,EAAE,cAAc;IAEnD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBADT,KAAK,EAAE,kBAAkB,EACzB,QAAQ,CAAC,EAAE,sBAAsB,YAAA;IAGpD,QAAQ,IAAI,MAAM;IAIZ,SAAS,CACb,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;IA0BpC,IAAI,CACR,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAwClC,UAAU,CACf,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAgD5C,WAAW,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;CA6B7E"}
|
|
@@ -170,6 +170,9 @@ function parseStreamChunk(raw, onDiagnostic) {
|
|
|
170
170
|
}
|
|
171
171
|
return { content: raw.content };
|
|
172
172
|
}
|
|
173
|
+
function normalizeModelEntry(entry) {
|
|
174
|
+
return typeof entry === 'string' ? { id: entry } : entry;
|
|
175
|
+
}
|
|
173
176
|
export class LlmAdapter {
|
|
174
177
|
agent;
|
|
175
178
|
provider;
|
|
@@ -177,6 +180,32 @@ export class LlmAdapter {
|
|
|
177
180
|
this.agent = agent;
|
|
178
181
|
this.provider = provider;
|
|
179
182
|
}
|
|
183
|
+
getModel() {
|
|
184
|
+
return this.provider?.model ?? 'unknown';
|
|
185
|
+
}
|
|
186
|
+
async getModels(options) {
|
|
187
|
+
if (!this.provider?.getModels) {
|
|
188
|
+
return {
|
|
189
|
+
ok: true,
|
|
190
|
+
value: [{ id: this.provider?.model ?? 'unknown' }],
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
try {
|
|
194
|
+
const modelsPromise = this.provider.getModels();
|
|
195
|
+
const raw = options?.signal
|
|
196
|
+
? await withAbort(modelsPromise, options.signal, () => new LlmError('Aborted', 'ABORTED'))
|
|
197
|
+
: await modelsPromise;
|
|
198
|
+
return { ok: true, value: raw.map(normalizeModelEntry) };
|
|
199
|
+
}
|
|
200
|
+
catch (err) {
|
|
201
|
+
if (err instanceof LlmError)
|
|
202
|
+
return { ok: false, error: err };
|
|
203
|
+
return {
|
|
204
|
+
ok: false,
|
|
205
|
+
error: new LlmError(String(err), 'MODEL_LIST_FAILED'),
|
|
206
|
+
};
|
|
207
|
+
}
|
|
208
|
+
}
|
|
180
209
|
async chat(messages, tools, options) {
|
|
181
210
|
try {
|
|
182
211
|
const onDiagnostic = options?.sessionLogger
|
|
@@ -187,7 +216,16 @@ export class LlmAdapter {
|
|
|
187
216
|
description: t.description,
|
|
188
217
|
inputSchema: t.inputSchema,
|
|
189
218
|
})) ?? [];
|
|
190
|
-
const
|
|
219
|
+
const agentOptions = options
|
|
220
|
+
? {
|
|
221
|
+
temperature: options.temperature,
|
|
222
|
+
maxTokens: options.maxTokens,
|
|
223
|
+
topP: options.topP,
|
|
224
|
+
stop: options.stop,
|
|
225
|
+
model: options.model,
|
|
226
|
+
}
|
|
227
|
+
: undefined;
|
|
228
|
+
const raw = await withAbort(this.agent.callWithTools(messages, mcpTools, agentOptions), options?.signal, () => new LlmError('Aborted', 'ABORTED'));
|
|
191
229
|
return { ok: true, value: parseProviderResponse(raw, onDiagnostic) };
|
|
192
230
|
}
|
|
193
231
|
catch (err) {
|
|
@@ -206,7 +244,16 @@ export class LlmAdapter {
|
|
|
206
244
|
description: t.description,
|
|
207
245
|
inputSchema: t.inputSchema,
|
|
208
246
|
})) ?? [];
|
|
209
|
-
const
|
|
247
|
+
const agentOptions = options
|
|
248
|
+
? {
|
|
249
|
+
temperature: options.temperature,
|
|
250
|
+
maxTokens: options.maxTokens,
|
|
251
|
+
topP: options.topP,
|
|
252
|
+
stop: options.stop,
|
|
253
|
+
model: options.model,
|
|
254
|
+
}
|
|
255
|
+
: undefined;
|
|
256
|
+
const stream = this.agent.streamWithTools(messages, mcpTools, agentOptions);
|
|
210
257
|
for await (const chunk of stream) {
|
|
211
258
|
if (options?.signal?.aborted) {
|
|
212
259
|
throw new LlmError('Aborted', 'ABORTED');
|
|
@@ -231,7 +278,12 @@ export class LlmAdapter {
|
|
|
231
278
|
? await withAbort(modelsPromise, options.signal, () => new LlmError('Aborted', 'ABORTED'))
|
|
232
279
|
: await modelsPromise;
|
|
233
280
|
const model = this.provider.model;
|
|
234
|
-
const found = models.some((m) =>
|
|
281
|
+
const found = models.some((m) => {
|
|
282
|
+
if (typeof m === 'string') {
|
|
283
|
+
return m === model || m.includes(model);
|
|
284
|
+
}
|
|
285
|
+
return m.id === model || m.id.includes(model);
|
|
286
|
+
});
|
|
235
287
|
return { ok: true, value: found };
|
|
236
288
|
}
|
|
237
289
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-adapter.js","sourceRoot":"","sources":["../../../src/smart-agent/adapters/llm-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"llm-adapter.js","sourceRoot":"","sources":["../../../src/smart-agent/adapters/llm-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { Message } from '../types.js';
|
|
|
2
2
|
import type { IToolCache } from './cache/types.js';
|
|
3
3
|
import type { IContextAssembler } from './interfaces/assembler.js';
|
|
4
4
|
import type { ISubpromptClassifier } from './interfaces/classifier.js';
|
|
5
|
+
import type { IClientAdapter } from './interfaces/client-adapter.js';
|
|
5
6
|
import type { ILlm } from './interfaces/llm.js';
|
|
6
7
|
import type { IMcpClient } from './interfaces/mcp-client.js';
|
|
7
8
|
import type { IRag } from './interfaces/rag.js';
|
|
@@ -39,6 +40,7 @@ export interface SmartAgentDeps {
|
|
|
39
40
|
outputValidator?: IOutputValidator;
|
|
40
41
|
sessionManager?: ISessionManager;
|
|
41
42
|
skillManager?: ISkillManager;
|
|
43
|
+
clientAdapters?: IClientAdapter[];
|
|
42
44
|
}
|
|
43
45
|
export interface SmartAgentConfig {
|
|
44
46
|
maxIterations: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/smart-agent/agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,cAAc,EAKnB,KAAK,MAAM,EACX,eAAe,EAGhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAK3D,OAAO,KAAK,EACV,wBAAwB,EACxB,WAAW,EACX,aAAa,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,EAAS,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAOxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,qBAAa,iBAAkB,SAAQ,eAAe;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAuB;CAIzD;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,IAAI,CAAC;IACd,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,SAAS,EAAE,mBAAmB,CAAC;IAC/B,UAAU,EAAE,oBAAoB,CAAC;IACjC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,YAAY,CAAC,EAAE,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/smart-agent/agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -193,6 +193,15 @@ export class SmartAgent {
|
|
|
193
193
|
opts = { ...options, signal: merged.signal };
|
|
194
194
|
}
|
|
195
195
|
const mode = this.config.mode || 'smart';
|
|
196
|
+
// Per-request client adapter detection from system prompt
|
|
197
|
+
let detectedAdapter;
|
|
198
|
+
const messages = typeof textOrMessages === 'string' ? undefined : textOrMessages;
|
|
199
|
+
if (messages && this.deps.clientAdapters?.length) {
|
|
200
|
+
const systemMsg = messages.find((m) => m.role === 'system');
|
|
201
|
+
if (systemMsg?.content) {
|
|
202
|
+
detectedAdapter = this.deps.clientAdapters.find((a) => a.detect(typeof systemMsg.content === 'string' ? systemMsg.content : ''));
|
|
203
|
+
}
|
|
204
|
+
}
|
|
196
205
|
const sessionId = options?.sessionId ?? 'default';
|
|
197
206
|
const normalizedExternalTools = normalizeExternalTools(options?.externalTools);
|
|
198
207
|
const { allowed: externalTools, blocked: blockedExternalTools } = this.toolAvailabilityRegistry.filterTools(sessionId, normalizedExternalTools);
|
|
@@ -207,9 +216,23 @@ export class SmartAgent {
|
|
|
207
216
|
const messages = typeof textOrMessages === 'string'
|
|
208
217
|
? [{ role: 'user', content: textOrMessages }]
|
|
209
218
|
: textOrMessages;
|
|
219
|
+
opts?.sessionLogger?.logStep('client_request', { textOrMessages });
|
|
210
220
|
const stream = this.deps.mainLlm.streamChat(messages, externalTools, opts);
|
|
211
|
-
|
|
221
|
+
let passContent = '';
|
|
222
|
+
const passToolCalls = [];
|
|
223
|
+
for await (const chunk of stream) {
|
|
224
|
+
if (chunk.ok) {
|
|
225
|
+
if (chunk.value.content)
|
|
226
|
+
passContent += chunk.value.content;
|
|
227
|
+
if (chunk.value.toolCalls)
|
|
228
|
+
passToolCalls.push(...chunk.value.toolCalls);
|
|
229
|
+
}
|
|
212
230
|
yield chunk;
|
|
231
|
+
}
|
|
232
|
+
opts?.sessionLogger?.logStep('llm_response_pass', {
|
|
233
|
+
content: passContent,
|
|
234
|
+
toolCalls: passToolCalls.length > 0 ? passToolCalls : undefined,
|
|
235
|
+
});
|
|
213
236
|
rootSpan.setStatus('ok');
|
|
214
237
|
rootSpan.end();
|
|
215
238
|
return;
|
|
@@ -243,8 +266,12 @@ export class SmartAgent {
|
|
|
243
266
|
// 2. Decide context and tools for the WHOLE request
|
|
244
267
|
const actions = subprompts.filter((sp) => sp.type === 'action');
|
|
245
268
|
const ragMode = this.config.ragRetrievalMode ?? 'auto';
|
|
246
|
-
const
|
|
247
|
-
const
|
|
269
|
+
const hasActions = actions.length > 0;
|
|
270
|
+
const hasMcpClients = this.deps.mcpClients.length > 0;
|
|
271
|
+
const hasRagStores = Object.keys(this.deps.ragStores).length > 0;
|
|
272
|
+
const shouldRetrieve = ragMode === 'always' ||
|
|
273
|
+
mode === 'hard' ||
|
|
274
|
+
(ragMode === 'auto' && hasActions && (hasMcpClients || hasRagStores));
|
|
248
275
|
let finalTools = [];
|
|
249
276
|
let retrieved = {
|
|
250
277
|
ragResults: {},
|
|
@@ -387,7 +414,7 @@ export class SmartAgent {
|
|
|
387
414
|
tools: finalTools.map((t) => t.name),
|
|
388
415
|
});
|
|
389
416
|
// 4. Single Streaming Loop
|
|
390
|
-
const stream = this._runStreamingToolLoop(mainAction, retrieved, assembleResult.value, toolClientMap, opts, rootSpan, sessionId, mode === 'hard' ? [] : externalTools, finalTools);
|
|
417
|
+
const stream = this._runStreamingToolLoop(mainAction, retrieved, assembleResult.value, toolClientMap, opts, rootSpan, sessionId, mode === 'hard' ? [] : externalTools, finalTools, detectedAdapter);
|
|
391
418
|
for await (const chunk of stream)
|
|
392
419
|
yield chunk;
|
|
393
420
|
rootSpan.setStatus('ok');
|
|
@@ -464,7 +491,7 @@ export class SmartAgent {
|
|
|
464
491
|
const { toolClientMap } = await this._listAllTools(opts);
|
|
465
492
|
return { ok: true, value: { subprompts, processedHistory, toolClientMap } };
|
|
466
493
|
}
|
|
467
|
-
async *_runStreamingToolLoop(_action, _retrieved, initialMessages, toolClientMap, opts, parentSpan, sessionId, externalTools, activeTools) {
|
|
494
|
+
async *_runStreamingToolLoop(_action, _retrieved, initialMessages, toolClientMap, opts, parentSpan, sessionId, externalTools, activeTools, clientAdapter) {
|
|
468
495
|
const toolLoopSpan = this.tracer.startSpan('smart_agent.tool_loop', {
|
|
469
496
|
parent: parentSpan,
|
|
470
497
|
});
|
|
@@ -554,7 +581,10 @@ export class SmartAgent {
|
|
|
554
581
|
const chunk = chunkResult.value;
|
|
555
582
|
if (chunk.content) {
|
|
556
583
|
content += chunk.content;
|
|
557
|
-
|
|
584
|
+
// When a client adapter is detected, buffer content — it will be wrapped after the stream completes
|
|
585
|
+
if (!clientAdapter) {
|
|
586
|
+
yield { ok: true, value: { content: chunk.content } };
|
|
587
|
+
}
|
|
558
588
|
}
|
|
559
589
|
if (chunk.toolCalls) {
|
|
560
590
|
const externalDeltas = chunk.toolCalls.filter((tc) => externalToolNames.has(getStreamToolCallName(tc) ?? ''));
|
|
@@ -634,6 +664,15 @@ export class SmartAgent {
|
|
|
634
664
|
continue;
|
|
635
665
|
}
|
|
636
666
|
opts?.sessionLogger?.logStep('final_response', { content, usage });
|
|
667
|
+
// When a client adapter matched, yield buffered content wrapped via adapter
|
|
668
|
+
if (clientAdapter && content) {
|
|
669
|
+
yield {
|
|
670
|
+
ok: true,
|
|
671
|
+
value: {
|
|
672
|
+
content: clientAdapter.wrapResponse(content),
|
|
673
|
+
},
|
|
674
|
+
};
|
|
675
|
+
}
|
|
637
676
|
timingLog.push({ phase: 'total', duration: Date.now() - loopStart });
|
|
638
677
|
toolLoopSpan.setStatus('ok');
|
|
639
678
|
toolLoopSpan.end();
|