@marifold/core 0.60.0 → 0.61.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/agent/AgentRunner.d.ts +4 -1
- package/dist/agent/AgentRunner.d.ts.map +1 -1
- package/dist/agent/AgentRunner.js +56 -10
- package/dist/agent/AgentRunner.js.map +1 -1
- package/dist/config/ConfigManager.d.ts +9 -0
- package/dist/config/ConfigManager.d.ts.map +1 -1
- package/dist/config/ConfigManager.js +43 -0
- package/dist/config/ConfigManager.js.map +1 -1
- package/dist/config/ConfigSchema.d.ts +4 -4
- package/dist/config/ConfigSchema.d.ts.map +1 -1
- package/dist/config/MarifoldOpenAICompatProvider.d.ts +3 -0
- package/dist/config/MarifoldOpenAICompatProvider.d.ts.map +1 -1
- package/dist/config/MarifoldOpenAICompatProvider.js +26 -3
- package/dist/config/MarifoldOpenAICompatProvider.js.map +1 -1
- package/dist/config/ProviderFactory.d.ts +4 -0
- package/dist/config/ProviderFactory.d.ts.map +1 -1
- package/dist/config/ProviderFactory.js +7 -0
- package/dist/config/ProviderFactory.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/runtime/MarifoldRuntime.d.ts +9 -5
- package/dist/runtime/MarifoldRuntime.d.ts.map +1 -1
- package/dist/runtime/MarifoldRuntime.js +116 -32
- package/dist/runtime/MarifoldRuntime.js.map +1 -1
- package/dist/runtime/MarifoldTypes.d.ts +8 -1
- package/dist/runtime/MarifoldTypes.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarifoldOpenAICompatProvider.d.ts","sourceRoot":"","sources":["../../src/config/MarifoldOpenAICompatProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAClB,OAAO,EAGP,UAAU,EACV,YAAY,EACZ,eAAe,EAEhB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"MarifoldOpenAICompatProvider.d.ts","sourceRoot":"","sources":["../../src/config/MarifoldOpenAICompatProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAClB,OAAO,EAGP,UAAU,EACV,YAAY,EACZ,eAAe,EAEhB,MAAM,iBAAiB,CAAC;AASzB,UAAU,mCAAmC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;wBACoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;kDAC8C;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,qBAAa,4BAA6B,YAAW,eAAe;IAOhE,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuB;IACpD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA0B;IAC5D,iEAAiE;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAE1C,YACmB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,YAAA,EACf,OAAO,GAAE,mCAAwC,EAanE;IAED,oBAAoB,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,YAAY,CAAA;KAAE,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAIhF;IAEK,QAAQ,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,aAAa,CAAC,CAUxB;IAEM,MAAM,CACX,QAAQ,EAAE,OAAO,EAAE,EACnB,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAIvC;IAEM,YAAY,CACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,cAAc,CAAC,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,CAWnD;YAEa,yBAAyB;IAyDvC,OAAO,CAAC,gBAAgB;IAQxB;;mDAE+C;IAC/C,OAAO,CAAC,eAAe;IAiCvB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,cAAc;CAUvB"}
|
|
@@ -6,6 +6,7 @@ const crypto_1 = require("crypto");
|
|
|
6
6
|
const proxy_1 = require("../util/proxy");
|
|
7
7
|
const OpenAICompatUrls_1 = require("./OpenAICompatUrls");
|
|
8
8
|
const ProviderRegistry_1 = require("./ProviderRegistry");
|
|
9
|
+
const NATIVE_WEB_SEARCH_COMPAT_OPTION = 'marifold_native_web_search';
|
|
9
10
|
/**
|
|
10
11
|
* Marifold-owned routing and authentication around Priest's standard OpenAI
|
|
11
12
|
* transports. Endpoint selection and subscription headers stay here; request
|
|
@@ -36,11 +37,16 @@ class MarifoldOpenAICompatProvider {
|
|
|
36
37
|
dispatcher,
|
|
37
38
|
});
|
|
38
39
|
}
|
|
40
|
+
supportsProviderTool(tool, config) {
|
|
41
|
+
return this.options.providerName === 'chatgpt'
|
|
42
|
+
&& this.endpointForModel(config.model) === 'responses'
|
|
43
|
+
&& tool.type === 'web_search';
|
|
44
|
+
}
|
|
39
45
|
async complete(messages, config, outputSpec, options) {
|
|
40
46
|
if (this.endpointForModel(config.model) !== 'responses') {
|
|
41
47
|
return this.chatProvider.complete(messages, config, outputSpec, options);
|
|
42
48
|
}
|
|
43
|
-
const responsesConfig = this.responsesConfig(config);
|
|
49
|
+
const responsesConfig = this.responsesConfig(config, options);
|
|
44
50
|
// The ChatGPT Codex backend is SSE-only ("Stream must be set to true").
|
|
45
51
|
if (this.options.providerName === 'chatgpt') {
|
|
46
52
|
return this.accumulateResponsesStream(messages, responsesConfig, outputSpec, options);
|
|
@@ -55,7 +61,7 @@ class MarifoldOpenAICompatProvider {
|
|
|
55
61
|
}
|
|
56
62
|
async *streamEvents(messages, config, outputSpec, options) {
|
|
57
63
|
if (this.endpointForModel(config.model) === 'responses') {
|
|
58
|
-
yield* this.responsesProvider.streamEvents(messages, this.responsesConfig(config), outputSpec, options);
|
|
64
|
+
yield* this.responsesProvider.streamEvents(messages, this.responsesConfig(config, options), outputSpec, options);
|
|
59
65
|
return;
|
|
60
66
|
}
|
|
61
67
|
yield* this.chatProvider.streamEvents(messages, config, outputSpec, options);
|
|
@@ -119,10 +125,27 @@ class MarifoldOpenAICompatProvider {
|
|
|
119
125
|
/** Preserve compatibility with Marifold callers that used `{think}` before
|
|
120
126
|
* Priest 2.8 introduced the provider-neutral reasoning field. Raw `think`
|
|
121
127
|
* must never leak into a Responses request. */
|
|
122
|
-
responsesConfig(config) {
|
|
128
|
+
responsesConfig(config, options) {
|
|
123
129
|
const providerOptions = { ...(config.providerOptions ?? {}) };
|
|
124
130
|
const legacyThink = providerOptions['think'];
|
|
131
|
+
const nativeWebSearch = providerOptions[NATIVE_WEB_SEARCH_COMPAT_OPTION] === true;
|
|
125
132
|
delete providerOptions['think'];
|
|
133
|
+
delete providerOptions[NATIVE_WEB_SEARCH_COMPAT_OPTION];
|
|
134
|
+
// Priest 3.1 forwards providerTools and combines them with function tools.
|
|
135
|
+
// Keep Marifold releases built against 3.0.x functional until that SDK is
|
|
136
|
+
// the installed floor by supplying the equivalent Responses wire array.
|
|
137
|
+
const forwardedProviderTools = options?.providerTools;
|
|
138
|
+
if (nativeWebSearch && !forwardedProviderTools?.some(tool => tool.type === 'web_search')) {
|
|
139
|
+
providerOptions['tools'] = [
|
|
140
|
+
{ type: 'web_search' },
|
|
141
|
+
...(options?.tools ?? []).map(tool => ({
|
|
142
|
+
type: 'function',
|
|
143
|
+
name: tool.name,
|
|
144
|
+
description: tool.description ?? '',
|
|
145
|
+
parameters: tool.parameters ?? {},
|
|
146
|
+
})),
|
|
147
|
+
];
|
|
148
|
+
}
|
|
126
149
|
return {
|
|
127
150
|
...config,
|
|
128
151
|
reasoning: config.reasoning ?? (legacyThink === true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarifoldOpenAICompatProvider.js","sourceRoot":"","sources":["../../src/config/MarifoldOpenAICompatProvider.ts"],"names":[],"mappings":";;;AAAA,0CAWyB;AACzB,mCAAoC;AACpC,yCAAgD;AAChD,yDAAkF;AAClF,yDAAqE;
|
|
1
|
+
{"version":3,"file":"MarifoldOpenAICompatProvider.js","sourceRoot":"","sources":["../../src/config/MarifoldOpenAICompatProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,10 @@ export declare class ProviderFactory {
|
|
|
5
5
|
private readonly configPath;
|
|
6
6
|
constructor(config: MarifoldConfig, configPath: string);
|
|
7
7
|
create(providerName: string): ProviderAdapter;
|
|
8
|
+
/** Provider/model capabilities exposed by the concrete adapter route. The
|
|
9
|
+
* ChatGPT subscription route uses Priest's OpenAI Responses adapter; other
|
|
10
|
+
* OpenAI-compatible entries currently use Chat Completions. */
|
|
11
|
+
supportsNativeWebSearch(providerName: string): boolean;
|
|
8
12
|
private requireBaseUrl;
|
|
9
13
|
private readOptionalApiKey;
|
|
10
14
|
private readRequiredApiKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProviderFactory.d.ts","sourceRoot":"","sources":["../../src/config/ProviderFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAA0B,MAAM,gBAAgB,CAAC;AAGxE,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAF7B,YACmB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,EACjC;IAEJ,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAgB5C;IAED,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,kBAAkB;CAU3B"}
|
|
1
|
+
{"version":3,"file":"ProviderFactory.d.ts","sourceRoot":"","sources":["../../src/config/ProviderFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAA0B,MAAM,gBAAgB,CAAC;AAGxE,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAF7B,YACmB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,EACjC;IAEJ,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAgB5C;IAED;;mEAE+D;IAC/D,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAGrD;IAED,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,kBAAkB;CAU3B"}
|
|
@@ -28,6 +28,13 @@ class ProviderFactory {
|
|
|
28
28
|
return new core_1.AnthropicProvider(this.readRequiredApiKey(providerName, provider));
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
+
/** Provider/model capabilities exposed by the concrete adapter route. The
|
|
32
|
+
* ChatGPT subscription route uses Priest's OpenAI Responses adapter; other
|
|
33
|
+
* OpenAI-compatible entries currently use Chat Completions. */
|
|
34
|
+
supportsNativeWebSearch(providerName) {
|
|
35
|
+
return providerName === 'chatgpt'
|
|
36
|
+
&& this.config.providers[providerName]?.type === 'openai-compatible';
|
|
37
|
+
}
|
|
31
38
|
requireBaseUrl(providerName, provider) {
|
|
32
39
|
if (provider.baseUrl)
|
|
33
40
|
return provider.baseUrl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProviderFactory.js","sourceRoot":"","sources":["../../src/config/ProviderFactory.ts"],"names":[],"mappings":";;;AAAA,0CAIyB;AACzB,2DAAwD;AAExD,iFAA8E;AAE9E;IAEqB,MAAM;IACN,UAAU;IAF7B,YACmB,MAAsB,EACtB,UAAkB;sBADlB,MAAM;0BACN,UAAU;IAC1B,CAAC;IAEJ,MAAM,CAAC,YAAoB;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ;YAAE,MAAM,6BAAa,CAAC,qBAAqB,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAExF,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,IAAI,qBAAc,CAAC,QAAQ,CAAC,OAAO,IAAI,wBAAwB,CAAC,CAAC;YAC1E,KAAK,mBAAmB;gBACtB,OAAO,IAAI,2DAA4B,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE;oBACpI,YAAY;oBACZ,SAAS,EAAE,QAAQ,CAAC,SAAS;oBAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK;iBACtB,CAAC,CAAC;YACL,KAAK,WAAW;gBACd,OAAO,IAAI,wBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,YAAoB,EAAE,QAAgC;QAC3E,IAAI,QAAQ,CAAC,OAAO;YAAE,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC9C,MAAM,6BAAa,CAAC,aAAa,CAAC,aAAa,YAAY,sBAAsB,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IACjH,CAAC;IAEO,kBAAkB,CAAC,YAAoB,EAAE,QAAgC;QAC/E,IAAI,CAAC,QAAQ,CAAC,SAAS;YAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;QAChD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,QAAQ,CAAC,MAAM;YAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;QAC5C,MAAM,6BAAa,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;IAEO,kBAAkB,CAAC,YAAoB,EAAE,QAAgC;QAC/E,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,IAAI,QAAQ,CAAC,MAAM;gBAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;YAC5C,MAAM,6BAAa,CAAC,aAAa,CAAC,aAAa,YAAY,yBAAyB,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,QAAQ,CAAC,MAAM;YAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;QAC5C,MAAM,6BAAa,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"ProviderFactory.js","sourceRoot":"","sources":["../../src/config/ProviderFactory.ts"],"names":[],"mappings":";;;AAAA,0CAIyB;AACzB,2DAAwD;AAExD,iFAA8E;AAE9E;IAEqB,MAAM;IACN,UAAU;IAF7B,YACmB,MAAsB,EACtB,UAAkB;sBADlB,MAAM;0BACN,UAAU;IAC1B,CAAC;IAEJ,MAAM,CAAC,YAAoB;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ;YAAE,MAAM,6BAAa,CAAC,qBAAqB,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAExF,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,IAAI,qBAAc,CAAC,QAAQ,CAAC,OAAO,IAAI,wBAAwB,CAAC,CAAC;YAC1E,KAAK,mBAAmB;gBACtB,OAAO,IAAI,2DAA4B,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE;oBACpI,YAAY;oBACZ,SAAS,EAAE,QAAQ,CAAC,SAAS;oBAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK;iBACtB,CAAC,CAAC;YACL,KAAK,WAAW;gBACd,OAAO,IAAI,wBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAED;;mEAE+D;IAC/D,uBAAuB,CAAC,YAAoB;QAC1C,OAAO,YAAY,KAAK,SAAS;eAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,KAAK,mBAAmB,CAAC;IACzE,CAAC;IAEO,cAAc,CAAC,YAAoB,EAAE,QAAgC;QAC3E,IAAI,QAAQ,CAAC,OAAO;YAAE,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC9C,MAAM,6BAAa,CAAC,aAAa,CAAC,aAAa,YAAY,sBAAsB,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IACjH,CAAC;IAEO,kBAAkB,CAAC,YAAoB,EAAE,QAAgC;QAC/E,IAAI,CAAC,QAAQ,CAAC,SAAS;YAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;QAChD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,QAAQ,CAAC,MAAM;YAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;QAC5C,MAAM,6BAAa,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;IAEO,kBAAkB,CAAC,YAAoB,EAAE,QAAgC;QAC/E,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,IAAI,QAAQ,CAAC,MAAM;gBAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;YAC5C,MAAM,6BAAa,CAAC,aAAa,CAAC,aAAa,YAAY,yBAAyB,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,QAAQ,CAAC,MAAM;YAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;QAC5C,MAAM,6BAAa,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;CACF"}
|
package/dist/index.d.ts
CHANGED
|
@@ -36,7 +36,7 @@ export type { LoadedMarifoldConfig, MarifoldConfig, MarifoldDefaultConfig, Marif
|
|
|
36
36
|
export { exportConfigBackup, importConfigBackup } from './config/ConfigBackup';
|
|
37
37
|
export type { ConfigBackupExportOptions, ConfigBackupExportResult, ConfigBackupImportOptions, ConfigBackupImportResult, } from './config/ConfigBackup';
|
|
38
38
|
export { ConfigManager, renderMarifoldConfig } from './config/ConfigManager';
|
|
39
|
-
export type { ConfigRemoveModelResult, ConfigRemoveProviderResult, ConfigSetResult } from './config/ConfigManager';
|
|
39
|
+
export type { ConfigAddProviderOptions, ConfigRemoveModelResult, ConfigRemoveProviderResult, ConfigSetResult, } from './config/ConfigManager';
|
|
40
40
|
export { ConfigLoader } from './config/ConfigLoader';
|
|
41
41
|
export { exchangeGitHubTokenForCopilotToken } from './config/GitHubCopilotAuth';
|
|
42
42
|
export type { GitHubCopilotToken } from './config/GitHubCopilotAuth';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AACA,mDAAkD;AAAzC,0GAAA,WAAW,OAAA;AAIpB,yDAGgC;AAF9B,sHAAA,oBAAoB,OAAA;AACpB,oHAAA,kBAAkB,OAAA;AAapB,+DAImC;AAHjC,kIAAA,6BAA6B,OAAA;AAC7B,6HAAA,wBAAwB,OAAA;AACxB,2HAAA,sBAAsB,OAAA;AAExB,qDAAmE;AAA1D,6GAAA,aAAa,OAAA;AAAE,4GAAA,YAAY,OAAA;AAWpC,yDAAwD;AAA/C,0GAAA,WAAW,OAAA;AACpB,6EAA4E;AAAnE,8HAAA,qBAAqB,OAAA;AAC9B,2DAA0D;AAAjD,4GAAA,YAAY,OAAA;AAErB,qEAAoE;AAA3D,sHAAA,iBAAiB,OAAA;AAC1B,2DAA0D;AAAjD,4GAAA,YAAY,OAAA;AACrB,6DAA4D;AAAnD,8GAAA,aAAa,OAAA;AACtB,6DAA4D;AAAnD,8GAAA,aAAa,OAAA;AACtB,6DAA4F;AAAnF,kHAAA,iBAAiB,OAAA;AAAE,4GAAA,WAAW,OAAA;AAAE,8GAAA,aAAa,OAAA;AACtD,+CAQ2B;AAPzB,uHAAA,0BAA0B,OAAA;AAC1B,mHAAA,sBAAsB,OAAA;AACtB,qHAAA,wBAAwB,OAAA;AACxB,oHAAA,uBAAuB,OAAA;AACvB,yHAAA,4BAA4B,OAAA;AAC5B,kHAAA,qBAAqB,OAAA;AACrB,qHAAA,wBAAwB,OAAA;AAY1B,qDAO8B;AAN5B,mHAAA,mBAAmB,OAAA;AACnB,6HAAA,6BAA6B,OAAA;AAC7B,0HAAA,0BAA0B,OAAA;AAC1B,kHAAA,kBAAkB,OAAA;AAClB,+GAAA,eAAe,OAAA;AACf,8GAAA,cAAc,OAAA;AAQhB,gEAA+D;AAAtD,sHAAA,iBAAiB,OAAA;AAC1B,8DAA6D;AAApD,oHAAA,gBAAgB,OAAA;AAEzB,oEAAmE;AAA1D,0HAAA,mBAAmB,OAAA;AAC5B,wDAAkF;AAAzE,oHAAA,mBAAmB,OAAA;AAAE,oHAAA,mBAAmB,OAAA;AAEjD,oEAAyE;AAAhE,gIAAA,yBAAyB,OAAA;AAElC,4DAAiE;AAAxD,wHAAA,qBAAqB,OAAA;AAE9B,sDAA0F;AAAjF,yHAAA,yBAAyB,OAAA;AAAE,sHAAA,sBAAsB,OAAA;AAsB1D,sDAA+E;AAAtE,kHAAA,kBAAkB,OAAA;AAAE,kHAAA,kBAAkB,OAAA;AAO/C,wDAA6E;AAApE,8GAAA,aAAa,OAAA;AAAE,qHAAA,oBAAoB,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { UsageInfo } from '@priest-ai/core';
|
|
|
2
2
|
import { AgentRunner } from '../agent/AgentRunner';
|
|
3
3
|
import { ApprovalMode, MarifoldAgentConfig, ToolKind } from '../agent/ApprovalPolicy';
|
|
4
4
|
import { ToolRegistry } from '../agent/ToolRegistry';
|
|
5
|
+
import type { ConfigAddProviderOptions } from '../config/ConfigManager';
|
|
5
6
|
import { LoadedMarifoldConfig, ProfileDetail, ProfileMode, ProfileSummary, ProviderType, SessionDetail, SessionSummary } from '../config/ConfigSchema';
|
|
6
7
|
import type { ProviderModelList, ProviderStatus } from '../config/ProviderInspector';
|
|
7
8
|
import { SearchBackend } from '../search/SearchBackend';
|
|
@@ -104,6 +105,10 @@ export declare class MarifoldRuntime {
|
|
|
104
105
|
providerStatus(): Promise<ProviderStatus[]>;
|
|
105
106
|
/** Models a provider actually serves right now (CLI `model list --live`). */
|
|
106
107
|
listProviderModels(provider: string): Promise<ProviderModelList>;
|
|
108
|
+
/** Add one registry provider for app clients. Existing entries must be
|
|
109
|
+
* edited through the config surface so an accidental double-submit cannot
|
|
110
|
+
* silently replace their connection settings. */
|
|
111
|
+
addProvider(provider: string, options?: ConfigAddProviderOptions): void;
|
|
107
112
|
/** Add a saved provider/model option (creating/updating the provider entry;
|
|
108
113
|
* secrets are not part of this surface — CLI/file only). */
|
|
109
114
|
addModelOption(provider: string, model: string, options?: {
|
|
@@ -222,11 +227,8 @@ export declare class MarifoldRuntime {
|
|
|
222
227
|
private discardFailedNewSession;
|
|
223
228
|
private createEngine;
|
|
224
229
|
private refreshProviderCredentialsIfNeeded;
|
|
225
|
-
/**
|
|
226
|
-
*
|
|
227
|
-
* web_search joins unless network policy is deny, read_file joins only when
|
|
228
|
-
* read policy is allow.
|
|
229
|
-
*/
|
|
230
|
+
/** Caller-executed tools for chat turns. Marifold web_search is advertised
|
|
231
|
+
* only in fallback mode; provider-hosted search travels separately. */
|
|
230
232
|
private chatTools;
|
|
231
233
|
private toPriestConfig;
|
|
232
234
|
private supportsNeutralReasoning;
|
|
@@ -235,6 +237,8 @@ export declare class MarifoldRuntime {
|
|
|
235
237
|
* can tell the user when `/think` would have no effect. */
|
|
236
238
|
profileSupportsThink(profile: string): boolean;
|
|
237
239
|
private memoryForRequest;
|
|
240
|
+
private resolveWebSearchMode;
|
|
241
|
+
private providerToolsFor;
|
|
238
242
|
private runtimeContext;
|
|
239
243
|
private editHistoryContext;
|
|
240
244
|
private replaceEditedExchange;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarifoldRuntime.d.ts","sourceRoot":"","sources":["../../src/runtime/MarifoldRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsH,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEhK,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,QAAQ,EAAsB,MAAM,yBAAyB,CAAC;AAS1G,OAAO,EAAa,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIhE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAA0B,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE/K,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGrF,OAAO,EAAuB,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7E,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAYrI,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAiB,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACnH,OAAO,EAEL,eAAe,EACf,oBAAoB,EACpB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACpI,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"MarifoldRuntime.d.ts","sourceRoot":"","sources":["../../src/runtime/MarifoldRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,6 +82,8 @@ const WorkspacePaths_1 = require("../workspace/WorkspacePaths");
|
|
|
82
82
|
const LEGACY_THINK_PROVIDER_NAMES = new Set(['bailian', 'alibaba_cloud']);
|
|
83
83
|
const CHAT_TOOL_MAX_ITERATIONS = 3;
|
|
84
84
|
const EDIT_HISTORY_BUDGET_DEFAULT_CHARS = 16_000;
|
|
85
|
+
const NATIVE_WEB_SEARCH_COMPAT_OPTION = 'marifold_native_web_search';
|
|
86
|
+
const WEB_SEARCH_UNAVAILABLE_CONTEXT = 'Web search is unavailable for this run. If the user asks you to browse or search the web, or their question requires current information, say clearly that you cannot access web search; do not imply that you searched.';
|
|
85
87
|
class MarifoldRuntime {
|
|
86
88
|
options;
|
|
87
89
|
profileResolver;
|
|
@@ -132,26 +134,65 @@ class MarifoldRuntime {
|
|
|
132
134
|
const engine = this.createEngine(settings.provider, Boolean(request.sessionId) && !replacing && !isolated, request.profileContext !== false);
|
|
133
135
|
const memoryOn = this.memoryEnabled(settings.profile, request.memories);
|
|
134
136
|
const memory = this.memoryForRequest(settings.profile, request.memories, request.prompt, settings.think);
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
+
const webSearchMode = this.resolveWebSearchMode(settings, request.chatTools !== false);
|
|
138
|
+
const chatTools = this.chatTools(request, webSearchMode);
|
|
139
|
+
const priestRequest = {
|
|
140
|
+
config: this.toPriestConfig(settings, webSearchMode === 'native'),
|
|
137
141
|
profile: settings.profile,
|
|
138
142
|
prompt: request.prompt,
|
|
139
143
|
session: request.sessionId && !replacing && !isolated
|
|
140
144
|
? { id: request.sessionId, createIfMissing: true }
|
|
141
145
|
: undefined,
|
|
142
146
|
context: [
|
|
143
|
-
...this.runtimeContext(memory, request.prompt, memoryOn),
|
|
147
|
+
...this.runtimeContext(memory, request.prompt, memoryOn, webSearchMode),
|
|
144
148
|
...this.editHistoryContext(request, settings),
|
|
145
149
|
...(request.instructions ?? []),
|
|
146
150
|
],
|
|
147
151
|
memory,
|
|
148
152
|
images: preparedImages.images.length > 0 ? preparedImages.images : undefined,
|
|
149
153
|
userContext: request.userContext,
|
|
150
|
-
|
|
151
|
-
|
|
154
|
+
providerTools: this.providerToolsFor(webSearchMode),
|
|
155
|
+
};
|
|
156
|
+
const exchange = [];
|
|
157
|
+
const maxIterations = chatTools ? CHAT_TOOL_MAX_ITERATIONS : 1;
|
|
158
|
+
let response;
|
|
159
|
+
let aggregateUsage;
|
|
160
|
+
// Keep the non-streaming CLI/service path at parity with stream(): a model
|
|
161
|
+
// without hosted search can call Marifold's configured fallback, then see
|
|
162
|
+
// the turn-local result before producing its final answer.
|
|
163
|
+
for (let iteration = 0; iteration < maxIterations; iteration += 1) {
|
|
164
|
+
const lastIteration = iteration === maxIterations - 1;
|
|
165
|
+
response = await engine.run({
|
|
166
|
+
...priestRequest,
|
|
167
|
+
...(chatTools && !lastIteration ? { tools: chatTools.definitions } : {}),
|
|
168
|
+
...(exchange.length > 0 ? { toolExchange: exchange } : {}),
|
|
169
|
+
}, request.signal ? { signal: request.signal } : undefined);
|
|
170
|
+
aggregateUsage = sumUsage(aggregateUsage, response.usage);
|
|
171
|
+
if (!response.ok || !chatTools || !response.toolCalls?.length)
|
|
172
|
+
break;
|
|
173
|
+
exchange.push({
|
|
174
|
+
kind: 'assistant',
|
|
175
|
+
text: response.text,
|
|
176
|
+
toolCalls: response.toolCalls,
|
|
177
|
+
...(response.reasoning ? { reasoning: response.reasoning } : {}),
|
|
178
|
+
});
|
|
179
|
+
for (const call of response.toolCalls) {
|
|
180
|
+
const result = await chatTools.execute(call.name, call.arguments);
|
|
181
|
+
exchange.push({
|
|
182
|
+
kind: 'tool_result',
|
|
183
|
+
toolCallId: call.id,
|
|
184
|
+
name: call.name,
|
|
185
|
+
content: result.content,
|
|
186
|
+
isError: result.isError,
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
// maxIterations is clamped above and therefore always produces a response.
|
|
191
|
+
const finalResponse = response;
|
|
192
|
+
const stripped = (0, MemoryControls_1.stripMemoryControls)(finalResponse.text ?? '');
|
|
152
193
|
const userTurn = request.userTurn ?? request.prompt;
|
|
153
|
-
const responseMetrics = completedResponseMetrics('chat', settings, startedAt, startedAtMs,
|
|
154
|
-
if (
|
|
194
|
+
const responseMetrics = completedResponseMetrics('chat', settings, startedAt, startedAtMs, aggregateUsage);
|
|
195
|
+
if (finalResponse.ok && request.sessionId) {
|
|
155
196
|
if (request.replaceUserTurnIndex !== undefined) {
|
|
156
197
|
this.replaceEditedExchange(request.sessionId, request.replaceUserTurnIndex, userTurn, stripped.text, preparedImages.images, responseMetrics);
|
|
157
198
|
}
|
|
@@ -166,16 +207,18 @@ class MarifoldRuntime {
|
|
|
166
207
|
this.sessionResolver.saveLastResponseMetrics(request.sessionId, responseMetrics);
|
|
167
208
|
}
|
|
168
209
|
}
|
|
169
|
-
if (
|
|
210
|
+
if (finalResponse.ok && memoryOn) {
|
|
170
211
|
this.applyTurnMemory(settings.profile, request.prompt, stripped, request.sessionId);
|
|
171
212
|
}
|
|
172
213
|
return {
|
|
173
|
-
ok:
|
|
214
|
+
ok: finalResponse.ok,
|
|
174
215
|
text: stripped.text,
|
|
175
216
|
settings,
|
|
176
|
-
latencyMs:
|
|
177
|
-
session:
|
|
178
|
-
error:
|
|
217
|
+
latencyMs: finalResponse.ok ? responseMetrics.latencyMs : finalResponse.execution.latencyMs,
|
|
218
|
+
session: finalResponse.session,
|
|
219
|
+
error: finalResponse.error
|
|
220
|
+
? { code: finalResponse.error.code, message: finalResponse.error.message }
|
|
221
|
+
: undefined,
|
|
179
222
|
};
|
|
180
223
|
}
|
|
181
224
|
async *stream(request, onComplete, onReasoningSummary) {
|
|
@@ -194,24 +237,27 @@ class MarifoldRuntime {
|
|
|
194
237
|
const engine = this.createEngine(settings.provider, enginePersistsSession, request.profileContext !== false);
|
|
195
238
|
const memoryOn = this.memoryEnabled(settings.profile, request.memories);
|
|
196
239
|
const memory = this.memoryForRequest(settings.profile, request.memories, request.prompt, settings.think);
|
|
197
|
-
const
|
|
240
|
+
const webSearchMode = this.resolveWebSearchMode(settings, request.chatTools !== false);
|
|
241
|
+
const chatTools = this.chatTools(request, webSearchMode);
|
|
198
242
|
const baseRequest = {
|
|
199
|
-
config: this.toPriestConfig(settings),
|
|
243
|
+
config: this.toPriestConfig(settings, webSearchMode === 'native'),
|
|
200
244
|
profile: settings.profile,
|
|
201
245
|
prompt: request.prompt,
|
|
202
246
|
session: request.sessionId && !replacing && !isolated
|
|
203
247
|
? { id: request.sessionId, createIfMissing: true }
|
|
204
248
|
: undefined,
|
|
205
249
|
context: [
|
|
206
|
-
...this.runtimeContext(memory, request.prompt, memoryOn),
|
|
250
|
+
...this.runtimeContext(memory, request.prompt, memoryOn, webSearchMode),
|
|
207
251
|
...this.editHistoryContext(request, settings),
|
|
208
252
|
...(request.instructions ?? []),
|
|
209
253
|
],
|
|
210
254
|
memory,
|
|
211
255
|
images: preparedImages.images.length > 0 ? preparedImages.images : undefined,
|
|
212
256
|
userContext: request.userContext,
|
|
257
|
+
providerTools: this.providerToolsFor(webSearchMode),
|
|
213
258
|
};
|
|
214
|
-
//
|
|
259
|
+
// Caller-executed fallback/read loop. Provider-hosted search is carried
|
|
260
|
+
// separately and does not enter Marifold's tool exchange.
|
|
215
261
|
// Intermediate tool-call turns are turn-local; the engine persists the
|
|
216
262
|
// session only on the loop's final response, and memory payloads are
|
|
217
263
|
// applied only from that final response.
|
|
@@ -458,6 +504,15 @@ class MarifoldRuntime {
|
|
|
458
504
|
listProviderModels(provider) {
|
|
459
505
|
return new ProviderInspector_1.ProviderInspector(this.options.loadedConfig).listModels(provider);
|
|
460
506
|
}
|
|
507
|
+
/** Add one registry provider for app clients. Existing entries must be
|
|
508
|
+
* edited through the config surface so an accidental double-submit cannot
|
|
509
|
+
* silently replace their connection settings. */
|
|
510
|
+
addProvider(provider, options = {}) {
|
|
511
|
+
if (this.options.loadedConfig.config.providers[provider]) {
|
|
512
|
+
throw MarifoldError_1.MarifoldError.configInvalid(`Provider '${provider}' is already configured.`);
|
|
513
|
+
}
|
|
514
|
+
new ConfigManager_1.ConfigManager(this.options.loadedConfig).addProvider(provider, options);
|
|
515
|
+
}
|
|
461
516
|
/** Add a saved provider/model option (creating/updating the provider entry;
|
|
462
517
|
* secrets are not part of this surface — CLI/file only). */
|
|
463
518
|
addModelOption(provider, model, options = {}) {
|
|
@@ -572,12 +627,15 @@ class MarifoldRuntime {
|
|
|
572
627
|
resolveSettings: request => this.resolveSettings(request),
|
|
573
628
|
prepareEngine: async (settings) => {
|
|
574
629
|
await this.refreshProviderCredentialsIfNeeded(settings.provider);
|
|
630
|
+
const webSearchMode = this.resolveWebSearchMode(settings);
|
|
575
631
|
return {
|
|
576
632
|
// No engine-level session store: priest would otherwise persist the
|
|
577
633
|
// raw per-iteration `Objective:`/tool framing (and duplicates). The
|
|
578
634
|
// runner instead persists one clean turn pair via `persistTurn` below.
|
|
579
635
|
engine: this.createEngine(settings.provider, false),
|
|
580
|
-
config: this.toPriestConfig(settings),
|
|
636
|
+
config: this.toPriestConfig(settings, webSearchMode === 'native'),
|
|
637
|
+
webSearchMode,
|
|
638
|
+
providerTools: this.providerToolsFor(webSearchMode),
|
|
581
639
|
};
|
|
582
640
|
},
|
|
583
641
|
prepareImages: async (images, optimize) => (await (0, ImageOptimizer_1.prepareImageInputs)(images, { optimize })).images,
|
|
@@ -625,8 +683,8 @@ class MarifoldRuntime {
|
|
|
625
683
|
registry.register(new WriteFileTool_1.WriteFileTool());
|
|
626
684
|
registry.register(new ShellExecTool_1.ShellExecTool());
|
|
627
685
|
registry.register(new PythonPackageTool_1.PythonPackageTool());
|
|
628
|
-
// web_search joins the
|
|
629
|
-
//
|
|
686
|
+
// Marifold fallback web_search joins the registry when configured. Runs
|
|
687
|
+
// with provider-hosted search filter it out before advertising tools.
|
|
630
688
|
const webSearch = (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch);
|
|
631
689
|
const approval = this.resolveAgentConfigForProfile(profile).approval;
|
|
632
690
|
if (webSearch.enabled && approval.network !== 'deny') {
|
|
@@ -935,19 +993,18 @@ class MarifoldRuntime {
|
|
|
935
993
|
throw MarifoldError_1.MarifoldError.configInvalid(`ChatGPT authorization could not be refreshed: ${error instanceof Error ? error.message : String(error)}. Run marifold provider reauth chatgpt to sign in again.`);
|
|
936
994
|
}
|
|
937
995
|
}
|
|
938
|
-
/**
|
|
939
|
-
*
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
chatTools(request) {
|
|
996
|
+
/** Caller-executed tools for chat turns. Marifold web_search is advertised
|
|
997
|
+
* only in fallback mode; provider-hosted search travels separately. */
|
|
998
|
+
chatTools(request, webSearchMode) {
|
|
999
|
+
if (request.chatTools === false)
|
|
1000
|
+
return undefined;
|
|
944
1001
|
const webSearch = (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch);
|
|
945
|
-
if (!webSearch.enabled
|
|
1002
|
+
if (!webSearch.enabled && webSearchMode !== 'fallback')
|
|
946
1003
|
return undefined;
|
|
947
1004
|
const agentConfig = this.resolveAgentConfigForProfile(request.profile);
|
|
948
1005
|
const approval = agentConfig.approval;
|
|
949
1006
|
const tools = [];
|
|
950
|
-
if (
|
|
1007
|
+
if (webSearchMode === 'fallback')
|
|
951
1008
|
tools.push(new WebSearchTool_1.WebSearchTool(this.searchBackend, webSearch.maxResults));
|
|
952
1009
|
if (approval.read === 'allow')
|
|
953
1010
|
tools.push(new ReadFileTool_1.ReadFileTool());
|
|
@@ -970,10 +1027,18 @@ class MarifoldRuntime {
|
|
|
970
1027
|
},
|
|
971
1028
|
};
|
|
972
1029
|
}
|
|
973
|
-
toPriestConfig(settings) {
|
|
1030
|
+
toPriestConfig(settings, nativeWebSearch = false) {
|
|
974
1031
|
const { config } = this.options.loadedConfig;
|
|
975
1032
|
const provider = config.providers[settings.provider];
|
|
976
1033
|
const neutralReasoning = this.supportsNeutralReasoning(settings.provider, settings.model);
|
|
1034
|
+
const providerOptions = {};
|
|
1035
|
+
if (LEGACY_THINK_PROVIDER_NAMES.has(settings.provider))
|
|
1036
|
+
providerOptions['think'] = settings.think;
|
|
1037
|
+
// Compatibility bridge for Priest 3.0.x. Priest 3.1 reads providerTools
|
|
1038
|
+
// directly; Marifold's Responses wrapper consumes and removes this marker
|
|
1039
|
+
// when an older engine does not forward that additive request field.
|
|
1040
|
+
if (nativeWebSearch)
|
|
1041
|
+
providerOptions[NATIVE_WEB_SEARCH_COMPAT_OPTION] = true;
|
|
977
1042
|
return {
|
|
978
1043
|
provider: settings.provider,
|
|
979
1044
|
model: settings.model,
|
|
@@ -991,9 +1056,7 @@ class MarifoldRuntime {
|
|
|
991
1056
|
: neutralReasoning && settings.think
|
|
992
1057
|
? { enabled: true, effort: 'high', summary: 'auto' }
|
|
993
1058
|
: undefined,
|
|
994
|
-
providerOptions:
|
|
995
|
-
? { think: settings.think }
|
|
996
|
-
: undefined,
|
|
1059
|
+
providerOptions: Object.keys(providerOptions).length > 0 ? providerOptions : undefined,
|
|
997
1060
|
};
|
|
998
1061
|
}
|
|
999
1062
|
supportsNeutralReasoning(providerName, model) {
|
|
@@ -1024,8 +1087,29 @@ class MarifoldRuntime {
|
|
|
1024
1087
|
thinking,
|
|
1025
1088
|
});
|
|
1026
1089
|
}
|
|
1027
|
-
|
|
1090
|
+
resolveWebSearchMode(settings, modelToolsEnabled = true) {
|
|
1091
|
+
if (!modelToolsEnabled)
|
|
1092
|
+
return 'unavailable';
|
|
1093
|
+
const approval = this.resolveAgentConfigForProfile(settings.profile).approval;
|
|
1094
|
+
if (approval.network === 'deny')
|
|
1095
|
+
return 'unavailable';
|
|
1096
|
+
if (this.providerFactory.supportsNativeWebSearch(settings.provider))
|
|
1097
|
+
return 'native';
|
|
1098
|
+
return (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch).enabled
|
|
1099
|
+
? 'fallback'
|
|
1100
|
+
: 'unavailable';
|
|
1101
|
+
}
|
|
1102
|
+
providerToolsFor(mode) {
|
|
1103
|
+
return mode === 'native' ? [{ type: 'web_search' }] : undefined;
|
|
1104
|
+
}
|
|
1105
|
+
runtimeContext(memory, prompt, memoryOn, webSearchMode) {
|
|
1028
1106
|
const context = ['Running inside Marifold.'];
|
|
1107
|
+
if (webSearchMode === 'native') {
|
|
1108
|
+
context.push('Provider-hosted web search is available for this run. Use it for web or current-information requests; Marifold fallback search is not exposed while native search is available.');
|
|
1109
|
+
}
|
|
1110
|
+
else if (webSearchMode === 'unavailable') {
|
|
1111
|
+
context.push(WEB_SEARCH_UNAVAILABLE_CONTEXT);
|
|
1112
|
+
}
|
|
1029
1113
|
if (memoryOn) {
|
|
1030
1114
|
context.push('Profile memory is app-owned context. Current user messages and profile rules outrank memory.');
|
|
1031
1115
|
if ((0, MemoryControls_1.shouldInjectMemoryInstructions)(prompt))
|