@marifold/core 0.60.0 → 0.64.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/AgentEvents.d.ts +7 -0
- package/dist/agent/AgentEvents.d.ts.map +1 -1
- package/dist/agent/AgentRunner.d.ts +4 -1
- package/dist/agent/AgentRunner.d.ts.map +1 -1
- package/dist/agent/AgentRunner.js +108 -20
- package/dist/agent/AgentRunner.js.map +1 -1
- package/dist/agent/AttachmentResources.d.ts +40 -0
- package/dist/agent/AttachmentResources.d.ts.map +1 -0
- package/dist/agent/AttachmentResources.js +192 -0
- package/dist/agent/AttachmentResources.js.map +1 -0
- package/dist/agent/RunArtifacts.d.ts +18 -0
- package/dist/agent/RunArtifacts.d.ts.map +1 -0
- package/dist/agent/RunArtifacts.js +137 -0
- package/dist/agent/RunArtifacts.js.map +1 -0
- package/dist/agent/tools/InspectAttachmentTool.d.ts.map +1 -1
- package/dist/agent/tools/InspectAttachmentTool.js +4 -69
- package/dist/agent/tools/InspectAttachmentTool.js.map +1 -1
- package/dist/agent/tools/ReadAttachmentTool.d.ts +34 -0
- package/dist/agent/tools/ReadAttachmentTool.d.ts.map +1 -0
- package/dist/agent/tools/ReadAttachmentTool.js +84 -0
- package/dist/agent/tools/ReadAttachmentTool.js.map +1 -0
- package/dist/agent/tools/SearchAttachmentTool.d.ts +33 -0
- package/dist/agent/tools/SearchAttachmentTool.d.ts.map +1 -0
- package/dist/agent/tools/SearchAttachmentTool.js +76 -0
- package/dist/agent/tools/SearchAttachmentTool.js.map +1 -0
- package/dist/agent/tools/SkillManagementTool.d.ts +75 -0
- package/dist/agent/tools/SkillManagementTool.d.ts.map +1 -0
- package/dist/agent/tools/SkillManagementTool.js +312 -0
- package/dist/agent/tools/SkillManagementTool.js.map +1 -0
- 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 +35 -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/errors/MarifoldError.d.ts +2 -1
- package/dist/errors/MarifoldError.d.ts.map +1 -1
- package/dist/errors/MarifoldError.js +3 -0
- package/dist/errors/MarifoldError.js.map +1 -1
- package/dist/index.d.ts +10 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +26 -3
- package/dist/index.js.map +1 -1
- package/dist/runs/RunRegistry.d.ts +4 -0
- package/dist/runs/RunRegistry.d.ts.map +1 -1
- package/dist/runs/RunRegistry.js +22 -1
- package/dist/runs/RunRegistry.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 +140 -35
- 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/dist/skill/BuiltInSkillManager.d.ts.map +1 -1
- package/dist/skill/BuiltInSkillManager.js +2 -1
- package/dist/skill/BuiltInSkillManager.js.map +1 -1
- package/dist/skill/BuiltInSkills.d.ts +6 -0
- package/dist/skill/BuiltInSkills.d.ts.map +1 -0
- package/dist/skill/BuiltInSkills.js +91 -0
- package/dist/skill/BuiltInSkills.js.map +1 -0
- package/dist/skill/SkillSchema.d.ts +2 -2
- package/dist/skill/SkillSchema.d.ts.map +1 -1
- package/dist/skill/SkillStore.d.ts +9 -0
- package/dist/skill/SkillStore.d.ts.map +1 -1
- package/dist/skill/SkillStore.js +87 -14
- package/dist/skill/SkillStore.js.map +1 -1
- package/dist/skill/index.d.ts +1 -0
- package/dist/skill/index.d.ts.map +1 -1
- package/dist/skill/index.js +5 -1
- package/dist/skill/index.js.map +1 -1
- package/package.json +1 -1
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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"}
|
|
@@ -3,6 +3,7 @@ import { AgentEvent, AgentUsage } from '../agent/AgentEvents';
|
|
|
3
3
|
import { AgentRunner } from '../agent/AgentRunner';
|
|
4
4
|
import { ApprovalMode, ApprovalRequest, ToolKind } from '../agent/ApprovalPolicy';
|
|
5
5
|
import type { RunFileInput } from '../agent/RunWorkspace';
|
|
6
|
+
import type { ResolvedRunArtifact, RunArtifact } from '../agent/RunArtifacts';
|
|
6
7
|
import { TaskStatus } from '../tasks/TaskStore';
|
|
7
8
|
import { type UserInputRequest } from '../agent/UserInput';
|
|
8
9
|
/** The narrow runtime slice the registry needs, so tests can fake it without a
|
|
@@ -69,6 +70,8 @@ export interface RunRecord {
|
|
|
69
70
|
finishedAt?: string;
|
|
70
71
|
summary?: string;
|
|
71
72
|
usage?: AgentUsage;
|
|
73
|
+
/** Generated files for this run. Absent on records from pre-artifact services. */
|
|
74
|
+
artifacts?: RunArtifact[];
|
|
72
75
|
/** Sequence number of the newest buffered event (0 = none yet). */
|
|
73
76
|
eventCount: number;
|
|
74
77
|
pendingApprovals: ApprovalRequest[];
|
|
@@ -103,6 +106,7 @@ export declare class RunRegistry {
|
|
|
103
106
|
get(runId: string): RunRecord | undefined;
|
|
104
107
|
require(runId: string): RunRecord;
|
|
105
108
|
list(): RunRecord[];
|
|
109
|
+
requireArtifact(runId: string, artifactId: string): ResolvedRunArtifact;
|
|
106
110
|
/** Replay buffered events past `afterSeq`, then follow live ones. Returns
|
|
107
111
|
* after yielding the terminal `done` event (or immediately after replay when
|
|
108
112
|
* the run already finished). `signal` detaches the subscriber early. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunRegistry.d.ts","sourceRoot":"","sources":["../../src/runs/RunRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAoB,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"RunRegistry.d.ts","sourceRoot":"","sources":["../../src/runs/RunRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAoB,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAG9E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,oBAAoB,CAAC;AAS5B;qFACqF;AACrF,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACjD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IACnF,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACjE,cAAc,IAAI,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,kBAAkB,CAAC;IAC5B;sEACkE;IAClE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;+CAC2C;IAC3C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;oDACgD;IAChD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;8CAC0C;IAC1C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED;+DAC+D;AAC/D,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;uBACmB;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,sEAAsE;IACtE,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,qEAAqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;iEACiE;AACjE,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,kFAAkF;IAClF,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1B,mEAAmE;IACnE,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAsCrE;;;;;;GAMG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgC;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsC;IAC9D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;IACzE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAA4B;IACjD,OAAO,CAAC,MAAM,CAAS;IAEvB,YAAY,OAAO,EAAE,kBAAkB,EAQtC;IAED,KAAK,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,CAiCrC;IAED,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAGxC;IAED,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAIhC;IAED,IAAI,IAAI,SAAS,EAAE,CAKlB;IAED,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAStE;IAED;;4EAEwE;IACjE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,SAAI,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,cAAc,CAAC,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,CAa9G;IAED,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CA4CpH;IAED,eAAe,CACb,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,GACb;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE,CAQvC;IAED;uEACmE;IACnE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAKvC;IAED;+EAC2E;IAC3E,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAKhC;IAED,KAAK,IAAI,IAAI,CAMZ;YAEa,IAAI;IAyClB,OAAO,CAAC,MAAM;IAuBd,OAAO,CAAC,MAAM;IAwBd;;uEAEmE;IACnE,OAAO,CAAC,cAAc;IAgCtB,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,WAAW;CAIpB"}
|
package/dist/runs/RunRegistry.js
CHANGED
|
@@ -36,12 +36,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.RunRegistry = void 0;
|
|
37
37
|
const crypto = __importStar(require("crypto"));
|
|
38
38
|
const path_1 = require("path");
|
|
39
|
+
const RunWorkspace_1 = require("../agent/RunWorkspace");
|
|
40
|
+
const RunArtifacts_1 = require("../agent/RunArtifacts");
|
|
39
41
|
const WriteFileTool_1 = require("../agent/tools/WriteFileTool");
|
|
40
42
|
const MarifoldError_1 = require("../errors/MarifoldError");
|
|
41
43
|
const UserInput_1 = require("../agent/UserInput");
|
|
42
44
|
const DEFAULT_APPROVAL_TIMEOUT_MS = 5 * 60 * 1000;
|
|
43
45
|
const DEFAULT_USER_INPUT_TIMEOUT_MS = 30 * 60 * 1000;
|
|
44
|
-
const DEFAULT_FINISHED_RUN_TTL_MS =
|
|
46
|
+
const DEFAULT_FINISHED_RUN_TTL_MS = RunWorkspace_1.RUN_WORKSPACE_RETENTION_MS;
|
|
45
47
|
const DEFAULT_MAX_ACTIVE_RUNS = 5;
|
|
46
48
|
const DEFAULT_MAX_BUFFERED_EVENTS = 10_000;
|
|
47
49
|
const MAX_RETAINED_FINISHED_RUNS = 50;
|
|
@@ -96,6 +98,7 @@ class RunRegistry {
|
|
|
96
98
|
steeringQueue: [],
|
|
97
99
|
grantedKinds: new Set(),
|
|
98
100
|
trustedFolders: [],
|
|
101
|
+
artifacts: [],
|
|
99
102
|
waiters: [],
|
|
100
103
|
};
|
|
101
104
|
this.runs.set(run.id, run);
|
|
@@ -123,6 +126,18 @@ class RunRegistry {
|
|
|
123
126
|
.sort((a, b) => b.createdAt.localeCompare(a.createdAt))
|
|
124
127
|
.map(run => this.toRecord(run));
|
|
125
128
|
}
|
|
129
|
+
requireArtifact(runId, artifactId) {
|
|
130
|
+
const run = this.runs.get(runId);
|
|
131
|
+
if (!run)
|
|
132
|
+
throw MarifoldError_1.MarifoldError.runNotFound(runId);
|
|
133
|
+
if (!run.artifacts.some(artifact => artifact.id === artifactId)) {
|
|
134
|
+
throw MarifoldError_1.MarifoldError.artifactNotFound(runId, artifactId);
|
|
135
|
+
}
|
|
136
|
+
const artifact = (0, RunArtifacts_1.resolveRunArtifact)(runId, artifactId);
|
|
137
|
+
if (!artifact)
|
|
138
|
+
throw MarifoldError_1.MarifoldError.artifactNotFound(runId, artifactId);
|
|
139
|
+
return artifact;
|
|
140
|
+
}
|
|
126
141
|
/** Replay buffered events past `afterSeq`, then follow live ones. Returns
|
|
127
142
|
* after yielding the terminal `done` event (or immediately after replay when
|
|
128
143
|
* the run already finished). `signal` detaches the subscriber early. */
|
|
@@ -290,6 +305,11 @@ class RunRegistry {
|
|
|
290
305
|
run.usage = event.usage;
|
|
291
306
|
this.finish(run, event.status);
|
|
292
307
|
}
|
|
308
|
+
else if (event.type === 'artifact') {
|
|
309
|
+
if (!run.artifacts.some(artifact => artifact.id === event.artifact.id)) {
|
|
310
|
+
run.artifacts.push(event.artifact);
|
|
311
|
+
}
|
|
312
|
+
}
|
|
293
313
|
else if (event.type === 'status') {
|
|
294
314
|
run.status = event.status;
|
|
295
315
|
}
|
|
@@ -411,6 +431,7 @@ class RunRegistry {
|
|
|
411
431
|
finishedAt: run.finishedAt,
|
|
412
432
|
summary: run.summary,
|
|
413
433
|
usage: run.usage,
|
|
434
|
+
artifacts: [...run.artifacts],
|
|
414
435
|
eventCount: run.lastSeq,
|
|
415
436
|
pendingApprovals: [...this.pending.values()]
|
|
416
437
|
.filter(entry => entry.runId === run.id)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunRegistry.js","sourceRoot":"","sources":["../../src/runs/RunRegistry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RunRegistry.js","sourceRoot":"","sources":["../../src/runs/RunRegistry.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;
|
|
1
|
+
{"version":3,"file":"MarifoldRuntime.d.ts","sourceRoot":"","sources":["../../src/runtime/MarifoldRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,12 +41,15 @@ const AgentHistory_1 = require("../agent/AgentHistory");
|
|
|
41
41
|
const ApprovalPolicy_1 = require("../agent/ApprovalPolicy");
|
|
42
42
|
const DelegateTool_1 = require("../agent/tools/DelegateTool");
|
|
43
43
|
const PythonPackageTool_1 = require("../agent/tools/PythonPackageTool");
|
|
44
|
+
const ReadAttachmentTool_1 = require("../agent/tools/ReadAttachmentTool");
|
|
44
45
|
const ReadFileTool_1 = require("../agent/tools/ReadFileTool");
|
|
46
|
+
const SearchAttachmentTool_1 = require("../agent/tools/SearchAttachmentTool");
|
|
45
47
|
const ShellExecTool_1 = require("../agent/tools/ShellExecTool");
|
|
46
48
|
const WebSearchTool_1 = require("../agent/tools/WebSearchTool");
|
|
47
49
|
const AskUserTool_1 = require("../agent/tools/AskUserTool");
|
|
48
50
|
const InspectAttachmentTool_1 = require("../agent/tools/InspectAttachmentTool");
|
|
49
51
|
const WriteFileTool_1 = require("../agent/tools/WriteFileTool");
|
|
52
|
+
const SkillManagementTool_1 = require("../agent/tools/SkillManagementTool");
|
|
50
53
|
const ToolRegistry_1 = require("../agent/ToolRegistry");
|
|
51
54
|
const ChatGptTokenRefresh_1 = require("../config/ChatGptTokenRefresh");
|
|
52
55
|
const XaiTokenRefresh_1 = require("../config/XaiTokenRefresh");
|
|
@@ -72,6 +75,7 @@ const SessionResolver_1 = require("../sessions/SessionResolver");
|
|
|
72
75
|
const SkillStore_1 = require("../skill/SkillStore");
|
|
73
76
|
const SkillInvocation_1 = require("../skill/SkillInvocation");
|
|
74
77
|
const BuiltInSkillManager_1 = require("../skill/BuiltInSkillManager");
|
|
78
|
+
const BuiltInSkills_1 = require("../skill/BuiltInSkills");
|
|
75
79
|
const AppStore_1 = require("../app/AppStore");
|
|
76
80
|
const SkillAppResolver_1 = require("../app/SkillAppResolver");
|
|
77
81
|
const SkillAppInstanceRegistry_1 = require("../app/SkillAppInstanceRegistry");
|
|
@@ -82,6 +86,8 @@ const WorkspacePaths_1 = require("../workspace/WorkspacePaths");
|
|
|
82
86
|
const LEGACY_THINK_PROVIDER_NAMES = new Set(['bailian', 'alibaba_cloud']);
|
|
83
87
|
const CHAT_TOOL_MAX_ITERATIONS = 3;
|
|
84
88
|
const EDIT_HISTORY_BUDGET_DEFAULT_CHARS = 16_000;
|
|
89
|
+
const NATIVE_WEB_SEARCH_COMPAT_OPTION = 'marifold_native_web_search';
|
|
90
|
+
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
91
|
class MarifoldRuntime {
|
|
86
92
|
options;
|
|
87
93
|
profileResolver;
|
|
@@ -132,26 +138,65 @@ class MarifoldRuntime {
|
|
|
132
138
|
const engine = this.createEngine(settings.provider, Boolean(request.sessionId) && !replacing && !isolated, request.profileContext !== false);
|
|
133
139
|
const memoryOn = this.memoryEnabled(settings.profile, request.memories);
|
|
134
140
|
const memory = this.memoryForRequest(settings.profile, request.memories, request.prompt, settings.think);
|
|
135
|
-
const
|
|
136
|
-
|
|
141
|
+
const webSearchMode = this.resolveWebSearchMode(settings, request.chatTools !== false);
|
|
142
|
+
const chatTools = this.chatTools(request, webSearchMode);
|
|
143
|
+
const priestRequest = {
|
|
144
|
+
config: this.toPriestConfig(settings, webSearchMode === 'native'),
|
|
137
145
|
profile: settings.profile,
|
|
138
146
|
prompt: request.prompt,
|
|
139
147
|
session: request.sessionId && !replacing && !isolated
|
|
140
148
|
? { id: request.sessionId, createIfMissing: true }
|
|
141
149
|
: undefined,
|
|
142
150
|
context: [
|
|
143
|
-
...this.runtimeContext(memory, request.prompt, memoryOn),
|
|
151
|
+
...this.runtimeContext(memory, request.prompt, memoryOn, webSearchMode),
|
|
144
152
|
...this.editHistoryContext(request, settings),
|
|
145
153
|
...(request.instructions ?? []),
|
|
146
154
|
],
|
|
147
155
|
memory,
|
|
148
156
|
images: preparedImages.images.length > 0 ? preparedImages.images : undefined,
|
|
149
157
|
userContext: request.userContext,
|
|
150
|
-
|
|
151
|
-
|
|
158
|
+
providerTools: this.providerToolsFor(webSearchMode),
|
|
159
|
+
};
|
|
160
|
+
const exchange = [];
|
|
161
|
+
const maxIterations = chatTools ? CHAT_TOOL_MAX_ITERATIONS : 1;
|
|
162
|
+
let response;
|
|
163
|
+
let aggregateUsage;
|
|
164
|
+
// Keep the non-streaming CLI/service path at parity with stream(): a model
|
|
165
|
+
// without hosted search can call Marifold's configured fallback, then see
|
|
166
|
+
// the turn-local result before producing its final answer.
|
|
167
|
+
for (let iteration = 0; iteration < maxIterations; iteration += 1) {
|
|
168
|
+
const lastIteration = iteration === maxIterations - 1;
|
|
169
|
+
response = await engine.run({
|
|
170
|
+
...priestRequest,
|
|
171
|
+
...(chatTools && !lastIteration ? { tools: chatTools.definitions } : {}),
|
|
172
|
+
...(exchange.length > 0 ? { toolExchange: exchange } : {}),
|
|
173
|
+
}, request.signal ? { signal: request.signal } : undefined);
|
|
174
|
+
aggregateUsage = sumUsage(aggregateUsage, response.usage);
|
|
175
|
+
if (!response.ok || !chatTools || !response.toolCalls?.length)
|
|
176
|
+
break;
|
|
177
|
+
exchange.push({
|
|
178
|
+
kind: 'assistant',
|
|
179
|
+
text: response.text,
|
|
180
|
+
toolCalls: response.toolCalls,
|
|
181
|
+
...(response.reasoning ? { reasoning: response.reasoning } : {}),
|
|
182
|
+
});
|
|
183
|
+
for (const call of response.toolCalls) {
|
|
184
|
+
const result = await chatTools.execute(call.name, call.arguments);
|
|
185
|
+
exchange.push({
|
|
186
|
+
kind: 'tool_result',
|
|
187
|
+
toolCallId: call.id,
|
|
188
|
+
name: call.name,
|
|
189
|
+
content: result.content,
|
|
190
|
+
isError: result.isError,
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
// maxIterations is clamped above and therefore always produces a response.
|
|
195
|
+
const finalResponse = response;
|
|
196
|
+
const stripped = (0, MemoryControls_1.stripMemoryControls)(finalResponse.text ?? '');
|
|
152
197
|
const userTurn = request.userTurn ?? request.prompt;
|
|
153
|
-
const responseMetrics = completedResponseMetrics('chat', settings, startedAt, startedAtMs,
|
|
154
|
-
if (
|
|
198
|
+
const responseMetrics = completedResponseMetrics('chat', settings, startedAt, startedAtMs, aggregateUsage);
|
|
199
|
+
if (finalResponse.ok && request.sessionId) {
|
|
155
200
|
if (request.replaceUserTurnIndex !== undefined) {
|
|
156
201
|
this.replaceEditedExchange(request.sessionId, request.replaceUserTurnIndex, userTurn, stripped.text, preparedImages.images, responseMetrics);
|
|
157
202
|
}
|
|
@@ -166,16 +211,18 @@ class MarifoldRuntime {
|
|
|
166
211
|
this.sessionResolver.saveLastResponseMetrics(request.sessionId, responseMetrics);
|
|
167
212
|
}
|
|
168
213
|
}
|
|
169
|
-
if (
|
|
214
|
+
if (finalResponse.ok && memoryOn) {
|
|
170
215
|
this.applyTurnMemory(settings.profile, request.prompt, stripped, request.sessionId);
|
|
171
216
|
}
|
|
172
217
|
return {
|
|
173
|
-
ok:
|
|
218
|
+
ok: finalResponse.ok,
|
|
174
219
|
text: stripped.text,
|
|
175
220
|
settings,
|
|
176
|
-
latencyMs:
|
|
177
|
-
session:
|
|
178
|
-
error:
|
|
221
|
+
latencyMs: finalResponse.ok ? responseMetrics.latencyMs : finalResponse.execution.latencyMs,
|
|
222
|
+
session: finalResponse.session,
|
|
223
|
+
error: finalResponse.error
|
|
224
|
+
? { code: finalResponse.error.code, message: finalResponse.error.message }
|
|
225
|
+
: undefined,
|
|
179
226
|
};
|
|
180
227
|
}
|
|
181
228
|
async *stream(request, onComplete, onReasoningSummary) {
|
|
@@ -194,24 +241,27 @@ class MarifoldRuntime {
|
|
|
194
241
|
const engine = this.createEngine(settings.provider, enginePersistsSession, request.profileContext !== false);
|
|
195
242
|
const memoryOn = this.memoryEnabled(settings.profile, request.memories);
|
|
196
243
|
const memory = this.memoryForRequest(settings.profile, request.memories, request.prompt, settings.think);
|
|
197
|
-
const
|
|
244
|
+
const webSearchMode = this.resolveWebSearchMode(settings, request.chatTools !== false);
|
|
245
|
+
const chatTools = this.chatTools(request, webSearchMode);
|
|
198
246
|
const baseRequest = {
|
|
199
|
-
config: this.toPriestConfig(settings),
|
|
247
|
+
config: this.toPriestConfig(settings, webSearchMode === 'native'),
|
|
200
248
|
profile: settings.profile,
|
|
201
249
|
prompt: request.prompt,
|
|
202
250
|
session: request.sessionId && !replacing && !isolated
|
|
203
251
|
? { id: request.sessionId, createIfMissing: true }
|
|
204
252
|
: undefined,
|
|
205
253
|
context: [
|
|
206
|
-
...this.runtimeContext(memory, request.prompt, memoryOn),
|
|
254
|
+
...this.runtimeContext(memory, request.prompt, memoryOn, webSearchMode),
|
|
207
255
|
...this.editHistoryContext(request, settings),
|
|
208
256
|
...(request.instructions ?? []),
|
|
209
257
|
],
|
|
210
258
|
memory,
|
|
211
259
|
images: preparedImages.images.length > 0 ? preparedImages.images : undefined,
|
|
212
260
|
userContext: request.userContext,
|
|
261
|
+
providerTools: this.providerToolsFor(webSearchMode),
|
|
213
262
|
};
|
|
214
|
-
//
|
|
263
|
+
// Caller-executed fallback/read loop. Provider-hosted search is carried
|
|
264
|
+
// separately and does not enter Marifold's tool exchange.
|
|
215
265
|
// Intermediate tool-call turns are turn-local; the engine persists the
|
|
216
266
|
// session only on the loop's final response, and memory payloads are
|
|
217
267
|
// applied only from that final response.
|
|
@@ -458,6 +508,15 @@ class MarifoldRuntime {
|
|
|
458
508
|
listProviderModels(provider) {
|
|
459
509
|
return new ProviderInspector_1.ProviderInspector(this.options.loadedConfig).listModels(provider);
|
|
460
510
|
}
|
|
511
|
+
/** Add one registry provider for app clients. Existing entries must be
|
|
512
|
+
* edited through the config surface so an accidental double-submit cannot
|
|
513
|
+
* silently replace their connection settings. */
|
|
514
|
+
addProvider(provider, options = {}) {
|
|
515
|
+
if (this.options.loadedConfig.config.providers[provider]) {
|
|
516
|
+
throw MarifoldError_1.MarifoldError.configInvalid(`Provider '${provider}' is already configured.`);
|
|
517
|
+
}
|
|
518
|
+
new ConfigManager_1.ConfigManager(this.options.loadedConfig).addProvider(provider, options);
|
|
519
|
+
}
|
|
461
520
|
/** Add a saved provider/model option (creating/updating the provider entry;
|
|
462
521
|
* secrets are not part of this surface — CLI/file only). */
|
|
463
522
|
addModelOption(provider, model, options = {}) {
|
|
@@ -572,12 +631,15 @@ class MarifoldRuntime {
|
|
|
572
631
|
resolveSettings: request => this.resolveSettings(request),
|
|
573
632
|
prepareEngine: async (settings) => {
|
|
574
633
|
await this.refreshProviderCredentialsIfNeeded(settings.provider);
|
|
634
|
+
const webSearchMode = this.resolveWebSearchMode(settings);
|
|
575
635
|
return {
|
|
576
636
|
// No engine-level session store: priest would otherwise persist the
|
|
577
637
|
// raw per-iteration `Objective:`/tool framing (and duplicates). The
|
|
578
638
|
// runner instead persists one clean turn pair via `persistTurn` below.
|
|
579
639
|
engine: this.createEngine(settings.provider, false),
|
|
580
|
-
config: this.toPriestConfig(settings),
|
|
640
|
+
config: this.toPriestConfig(settings, webSearchMode === 'native'),
|
|
641
|
+
webSearchMode,
|
|
642
|
+
providerTools: this.providerToolsFor(webSearchMode),
|
|
581
643
|
};
|
|
582
644
|
},
|
|
583
645
|
prepareImages: async (images, optimize) => (await (0, ImageOptimizer_1.prepareImageInputs)(images, { optimize })).images,
|
|
@@ -619,14 +681,24 @@ class MarifoldRuntime {
|
|
|
619
681
|
}
|
|
620
682
|
createDefaultToolRegistry(profile) {
|
|
621
683
|
const registry = new ToolRegistry_1.ToolRegistry();
|
|
684
|
+
const { config } = this.options.loadedConfig;
|
|
685
|
+
const resolvedProfile = profile ?? config.default.profile;
|
|
622
686
|
registry.register(new AskUserTool_1.AskUserTool());
|
|
623
687
|
registry.register(new InspectAttachmentTool_1.InspectAttachmentTool());
|
|
688
|
+
registry.register(new ReadAttachmentTool_1.ReadAttachmentTool());
|
|
689
|
+
registry.register(new SearchAttachmentTool_1.SearchAttachmentTool());
|
|
624
690
|
registry.register(new ReadFileTool_1.ReadFileTool());
|
|
625
691
|
registry.register(new WriteFileTool_1.WriteFileTool());
|
|
626
692
|
registry.register(new ShellExecTool_1.ShellExecTool());
|
|
627
693
|
registry.register(new PythonPackageTool_1.PythonPackageTool());
|
|
628
|
-
|
|
629
|
-
|
|
694
|
+
registry.register(new SkillManagementTool_1.SkillManagementTool({
|
|
695
|
+
store: this.createSkillStore(resolvedProfile),
|
|
696
|
+
profile: resolvedProfile,
|
|
697
|
+
globalDir: config.paths.skillsDir ?? (0, WorkspacePaths_1.defaultSkillsDir)(),
|
|
698
|
+
profileDir: path.join(config.paths.profilesDir, resolvedProfile, 'skills'),
|
|
699
|
+
}));
|
|
700
|
+
// Marifold fallback web_search joins the registry when configured. Runs
|
|
701
|
+
// with provider-hosted search filter it out before advertising tools.
|
|
630
702
|
const webSearch = (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch);
|
|
631
703
|
const approval = this.resolveAgentConfigForProfile(profile).approval;
|
|
632
704
|
if (webSearch.enabled && approval.network !== 'deny') {
|
|
@@ -655,10 +727,16 @@ class MarifoldRuntime {
|
|
|
655
727
|
});
|
|
656
728
|
}
|
|
657
729
|
listSkills(profile, scope) {
|
|
658
|
-
|
|
730
|
+
const userSkills = this.createSkillStore(profile).list(scope);
|
|
731
|
+
if (scope !== undefined)
|
|
732
|
+
return userSkills;
|
|
733
|
+
const byName = new Map(userSkills.map(skill => [skill.name, skill]));
|
|
734
|
+
for (const skill of (0, BuiltInSkills_1.listBuiltInSkills)())
|
|
735
|
+
byName.set(skill.name, skill);
|
|
736
|
+
return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
|
|
659
737
|
}
|
|
660
738
|
getSkill(name, profile) {
|
|
661
|
-
return this.createSkillStore(profile).get(name);
|
|
739
|
+
return (0, BuiltInSkills_1.getBuiltInSkill)(name) ?? this.createSkillStore(profile).get(name);
|
|
662
740
|
}
|
|
663
741
|
resolveSkillInvocation(input, profile) {
|
|
664
742
|
const parsed = (0, SkillInvocation_1.parseSkillInvocation)(input);
|
|
@@ -666,7 +744,8 @@ class MarifoldRuntime {
|
|
|
666
744
|
throw MarifoldError_1.MarifoldError.skillInvalid('Expected an invocation beginning with $.');
|
|
667
745
|
const resolvedProfile = profile ?? this.options.loadedConfig.config.default.profile;
|
|
668
746
|
this.profileResolver.loadSettings(resolvedProfile);
|
|
669
|
-
const skill =
|
|
747
|
+
const skill = (0, BuiltInSkills_1.getBuiltInSkill)(parsed.name)
|
|
748
|
+
?? this.createSkillStore(resolvedProfile).require(parsed.name);
|
|
670
749
|
return (0, SkillInvocation_1.resolveSkillInvocation)(skill, parsed);
|
|
671
750
|
}
|
|
672
751
|
installSkillFromText(text, scope = 'global', profile) {
|
|
@@ -935,19 +1014,18 @@ class MarifoldRuntime {
|
|
|
935
1014
|
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
1015
|
}
|
|
937
1016
|
}
|
|
938
|
-
/**
|
|
939
|
-
*
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
chatTools(request) {
|
|
1017
|
+
/** Caller-executed tools for chat turns. Marifold web_search is advertised
|
|
1018
|
+
* only in fallback mode; provider-hosted search travels separately. */
|
|
1019
|
+
chatTools(request, webSearchMode) {
|
|
1020
|
+
if (request.chatTools === false)
|
|
1021
|
+
return undefined;
|
|
944
1022
|
const webSearch = (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch);
|
|
945
|
-
if (!webSearch.enabled
|
|
1023
|
+
if (!webSearch.enabled && webSearchMode !== 'fallback')
|
|
946
1024
|
return undefined;
|
|
947
1025
|
const agentConfig = this.resolveAgentConfigForProfile(request.profile);
|
|
948
1026
|
const approval = agentConfig.approval;
|
|
949
1027
|
const tools = [];
|
|
950
|
-
if (
|
|
1028
|
+
if (webSearchMode === 'fallback')
|
|
951
1029
|
tools.push(new WebSearchTool_1.WebSearchTool(this.searchBackend, webSearch.maxResults));
|
|
952
1030
|
if (approval.read === 'allow')
|
|
953
1031
|
tools.push(new ReadFileTool_1.ReadFileTool());
|
|
@@ -970,10 +1048,18 @@ class MarifoldRuntime {
|
|
|
970
1048
|
},
|
|
971
1049
|
};
|
|
972
1050
|
}
|
|
973
|
-
toPriestConfig(settings) {
|
|
1051
|
+
toPriestConfig(settings, nativeWebSearch = false) {
|
|
974
1052
|
const { config } = this.options.loadedConfig;
|
|
975
1053
|
const provider = config.providers[settings.provider];
|
|
976
1054
|
const neutralReasoning = this.supportsNeutralReasoning(settings.provider, settings.model);
|
|
1055
|
+
const providerOptions = {};
|
|
1056
|
+
if (LEGACY_THINK_PROVIDER_NAMES.has(settings.provider))
|
|
1057
|
+
providerOptions['think'] = settings.think;
|
|
1058
|
+
// Compatibility bridge for Priest 3.0.x. Priest 3.1 reads providerTools
|
|
1059
|
+
// directly; Marifold's Responses wrapper consumes and removes this marker
|
|
1060
|
+
// when an older engine does not forward that additive request field.
|
|
1061
|
+
if (nativeWebSearch)
|
|
1062
|
+
providerOptions[NATIVE_WEB_SEARCH_COMPAT_OPTION] = true;
|
|
977
1063
|
return {
|
|
978
1064
|
provider: settings.provider,
|
|
979
1065
|
model: settings.model,
|
|
@@ -991,9 +1077,7 @@ class MarifoldRuntime {
|
|
|
991
1077
|
: neutralReasoning && settings.think
|
|
992
1078
|
? { enabled: true, effort: 'high', summary: 'auto' }
|
|
993
1079
|
: undefined,
|
|
994
|
-
providerOptions:
|
|
995
|
-
? { think: settings.think }
|
|
996
|
-
: undefined,
|
|
1080
|
+
providerOptions: Object.keys(providerOptions).length > 0 ? providerOptions : undefined,
|
|
997
1081
|
};
|
|
998
1082
|
}
|
|
999
1083
|
supportsNeutralReasoning(providerName, model) {
|
|
@@ -1024,8 +1108,29 @@ class MarifoldRuntime {
|
|
|
1024
1108
|
thinking,
|
|
1025
1109
|
});
|
|
1026
1110
|
}
|
|
1027
|
-
|
|
1111
|
+
resolveWebSearchMode(settings, modelToolsEnabled = true) {
|
|
1112
|
+
if (!modelToolsEnabled)
|
|
1113
|
+
return 'unavailable';
|
|
1114
|
+
const approval = this.resolveAgentConfigForProfile(settings.profile).approval;
|
|
1115
|
+
if (approval.network === 'deny')
|
|
1116
|
+
return 'unavailable';
|
|
1117
|
+
if (this.providerFactory.supportsNativeWebSearch(settings.provider))
|
|
1118
|
+
return 'native';
|
|
1119
|
+
return (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch).enabled
|
|
1120
|
+
? 'fallback'
|
|
1121
|
+
: 'unavailable';
|
|
1122
|
+
}
|
|
1123
|
+
providerToolsFor(mode) {
|
|
1124
|
+
return mode === 'native' ? [{ type: 'web_search' }] : undefined;
|
|
1125
|
+
}
|
|
1126
|
+
runtimeContext(memory, prompt, memoryOn, webSearchMode) {
|
|
1028
1127
|
const context = ['Running inside Marifold.'];
|
|
1128
|
+
if (webSearchMode === 'native') {
|
|
1129
|
+
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.');
|
|
1130
|
+
}
|
|
1131
|
+
else if (webSearchMode === 'unavailable') {
|
|
1132
|
+
context.push(WEB_SEARCH_UNAVAILABLE_CONTEXT);
|
|
1133
|
+
}
|
|
1029
1134
|
if (memoryOn) {
|
|
1030
1135
|
context.push('Profile memory is app-owned context. Current user messages and profile rules outrank memory.');
|
|
1031
1136
|
if ((0, MemoryControls_1.shouldInjectMemoryInstructions)(prompt))
|