marifold 0.69.0 → 0.71.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/bridge-template/.env.example +6 -0
- package/dist/bridge-template/HOSTING.md +477 -0
- package/dist/bridge-template/README.md +176 -0
- package/dist/bridge-template/api/bridge.ts +5 -0
- package/dist/bridge-template/dist/Store.d.ts +51 -0
- package/dist/bridge-template/dist/Store.d.ts.map +1 -0
- package/dist/bridge-template/dist/Store.js +170 -0
- package/dist/bridge-template/dist/Store.js.map +1 -0
- package/dist/bridge-template/dist/index.d.ts +4 -0
- package/dist/bridge-template/dist/index.d.ts.map +1 -0
- package/dist/bridge-template/dist/index.js +189 -0
- package/dist/bridge-template/dist/index.js.map +1 -0
- package/dist/bridge-template/dist/serve.d.ts +2 -0
- package/dist/bridge-template/dist/serve.d.ts.map +1 -0
- package/dist/bridge-template/dist/serve.js +18 -0
- package/dist/bridge-template/dist/serve.js.map +1 -0
- package/dist/bridge-template/package.json +16 -0
- package/dist/bridge-template/setup/setup.py +319 -0
- package/dist/bridge-template/setup.sh +8 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/identity.d.ts +15 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/identity.d.ts.map +1 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/identity.js +93 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/identity.js.map +1 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/index.d.ts +3 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/index.d.ts.map +1 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/index.js +19 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/index.js.map +1 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/types.d.ts +97 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/types.d.ts.map +1 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/types.js +55 -0
- package/dist/bridge-template/vendor/workspace-protocol/dist/types.js.map +1 -0
- package/dist/bridge-template/vendor/workspace-protocol/package.json +9 -0
- package/dist/bridge-template/vercel.json +16 -0
- package/dist/commands/WorkspaceClient.d.ts +6 -0
- package/dist/commands/WorkspaceClient.d.ts.map +1 -0
- package/dist/commands/WorkspaceClient.js +72 -0
- package/dist/commands/WorkspaceClient.js.map +1 -0
- package/dist/commands/agent.d.ts.map +1 -1
- package/dist/commands/agent.js +9 -3
- package/dist/commands/agent.js.map +1 -1
- package/dist/commands/ask.d.ts.map +1 -1
- package/dist/commands/ask.js +10 -5
- package/dist/commands/ask.js.map +1 -1
- package/dist/commands/config.js +11 -8
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +10 -20
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/schedule.d.ts.map +1 -1
- package/dist/commands/schedule.js +20 -8
- package/dist/commands/schedule.js.map +1 -1
- package/dist/commands/workspace.d.ts +9 -0
- package/dist/commands/workspace.d.ts.map +1 -0
- package/dist/commands/workspace.js +223 -0
- package/dist/commands/workspace.js.map +1 -0
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/package.json +8 -6
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;;;;;;;AAAa,QAAA,gBAAgB,GAAG,CAAC,CAAC;AACrB,QAAA,eAAe,GAAG,GAAG,GAAG,IAAI,CAAC;AAC7B,QAAA,iBAAiB,GAAG,EAAE,GAAG,MAAM,CAAC;AAChC,QAAA,cAAc,GAAG,MAAM,CAAC;AACxB,QAAA,kBAAkB,GAAG,CAAC,GAAG,MAAM,CAAC;AAwF7C,gBAAuB,KAAc;IACnC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACxG,OAAO,KAAgC,CAAC;AAC1C,CAAC;AACD,oBAA2B,KAAc;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC/G,OAAO,KAAK,CAAC;AACf,CAAC;AACD,eAAsB,KAAc;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC;QAClG,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AACD,sBAA6B,KAAa;IACxC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG;QAChF,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,IACE,GAAG,CAAC,QAAQ,KAAK,QAAQ;QACzB,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEzF,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC/E,OAAO,GAAG,CAAC,MAAM,CAAC;AACpB,CAAC;AACD,qBAA4B,KAAc;IACxC,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACxB,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1F,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,OAAO;QACL,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;QACtC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;QAC5B,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QAClC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QACpB,SAAS,EAAE,CAAC,CAAC,SAAS;KACvB,CAAC;AACJ,CAAC;AACD,qBAA4B,CAAgB;IAC1C,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACxH,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
{
|
|
2
|
+
"framework": null,
|
|
3
|
+
"buildCommand": "",
|
|
4
|
+
"installCommand": "npm install --ignore-scripts",
|
|
5
|
+
"functions": {
|
|
6
|
+
"api/bridge.ts": {
|
|
7
|
+
"maxDuration": 300
|
|
8
|
+
}
|
|
9
|
+
},
|
|
10
|
+
"rewrites": [
|
|
11
|
+
{
|
|
12
|
+
"source": "/(.*)",
|
|
13
|
+
"destination": "/api/bridge"
|
|
14
|
+
}
|
|
15
|
+
]
|
|
16
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type ApiClient } from '@marifold/client';
|
|
2
|
+
import type { AgentEvent, AgentRunOptions } from '@marifold/core';
|
|
3
|
+
import type { Command } from 'commander';
|
|
4
|
+
export declare function workspaceClient(program: Command, selected?: string, device?: string): Promise<ApiClient | undefined>;
|
|
5
|
+
export declare function remoteAgent(api: ApiClient, options: AgentRunOptions): AsyncGenerator<AgentEvent, void, unknown>;
|
|
6
|
+
//# sourceMappingURL=WorkspaceClient.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkspaceClient.d.ts","sourceRoot":"","sources":["../../src/commands/WorkspaceClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvG,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAA+B,MAAM,gBAAgB,CAAC;AAC/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA4BhC;AACD,wBAAuB,WAAW,CAChC,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CA4B3C"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.workspaceClient = workspaceClient;
|
|
4
|
+
exports.remoteAgent = remoteAgent;
|
|
5
|
+
const client_1 = require("@marifold/client");
|
|
6
|
+
const RuntimeFactory_1 = require("./RuntimeFactory");
|
|
7
|
+
const workspace_1 = require("./workspace");
|
|
8
|
+
async function workspaceClient(program, selected, device) {
|
|
9
|
+
let settings;
|
|
10
|
+
try {
|
|
11
|
+
settings = (0, workspace_1.localServiceSettings)((0, RuntimeFactory_1.loadConfig)(program));
|
|
12
|
+
}
|
|
13
|
+
catch (error) {
|
|
14
|
+
if ((selected && selected !== 'local') || device)
|
|
15
|
+
throw error;
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
const local = (0, client_1.createApiClient)(settings);
|
|
19
|
+
if (selected === 'local') {
|
|
20
|
+
if (device)
|
|
21
|
+
throw new Error('Select a workspace before choosing an execution device.');
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
const result = await (0, client_1.startupWorkspaces)(local);
|
|
25
|
+
const target = selected ?? result.defaultId;
|
|
26
|
+
if (target === 'local') {
|
|
27
|
+
if (device)
|
|
28
|
+
throw new Error('Select a workspace before choosing an execution device.');
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
const matches = result.workspaces.filter((w) => w.id === target || w.name === target);
|
|
32
|
+
if (matches.length !== 1)
|
|
33
|
+
throw new Error(matches.length ? 'Workspace name is ambiguous; use its ID.' : 'Workspace not found.');
|
|
34
|
+
if (!matches[0].online) {
|
|
35
|
+
if (selected || device)
|
|
36
|
+
throw new Error('Workspace host is offline.');
|
|
37
|
+
process.stderr.write('Default workspace is offline. Using Local for this command.\n');
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
return (0, client_1.createApiClient)({ ...settings, workspaceId: matches[0].id, executionDevice: () => device });
|
|
41
|
+
}
|
|
42
|
+
async function* remoteAgent(api, options) {
|
|
43
|
+
const { approvalHandler, userInputHandler, signal, steering: _steering, ...input } = options;
|
|
44
|
+
if (signal?.aborted)
|
|
45
|
+
return;
|
|
46
|
+
const { run } = await api.request('POST', '/v1/runs', input);
|
|
47
|
+
process.stderr.write(`Run ${run.id}${run.execution ? ` · execution device ${run.execution.executionDeviceId}` : ''}\n`);
|
|
48
|
+
const post = (path, body) => api.request('POST', `/v1/runs/${run.id}/${path}`, body);
|
|
49
|
+
const cancel = () => {
|
|
50
|
+
void post('cancel', {}).catch(() => undefined);
|
|
51
|
+
};
|
|
52
|
+
signal?.addEventListener('abort', cancel, { once: true });
|
|
53
|
+
if (signal?.aborted)
|
|
54
|
+
cancel();
|
|
55
|
+
try {
|
|
56
|
+
for await (const event of (0, client_1.followRunEvents)(api, run.id, signal)) {
|
|
57
|
+
yield event;
|
|
58
|
+
if (event.type === 'approval_request')
|
|
59
|
+
void Promise.resolve(approvalHandler?.(event.request))
|
|
60
|
+
.then((decision) => post(`approvals/${event.request.id}`, { action: decision?.approved ? 'once' : 'deny' }))
|
|
61
|
+
.catch((error) => process.stderr.write(`Approval could not be delivered: ${error.message}\n`));
|
|
62
|
+
if (event.type === 'user_input_request')
|
|
63
|
+
void Promise.resolve(userInputHandler?.(event.request))
|
|
64
|
+
.then((submission) => post(`inputs/${event.request.id}`, submission ?? { skipped: true }))
|
|
65
|
+
.catch(() => undefined);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
finally {
|
|
69
|
+
signal?.removeEventListener('abort', cancel);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=WorkspaceClient.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkspaceClient.js","sourceRoot":"","sources":["../../src/commands/WorkspaceClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAgB1D,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CA2DpF"}
|
package/dist/commands/agent.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.registerAgentCommand = registerAgentCommand;
|
|
4
|
+
const WorkspaceClient_1 = require("./WorkspaceClient");
|
|
4
5
|
const InteractivePrompt_1 = require("../input/InteractivePrompt");
|
|
5
6
|
const TerminalStyle_1 = require("../output/TerminalStyle");
|
|
6
7
|
const RuntimeFactory_1 = require("./RuntimeFactory");
|
|
@@ -9,6 +10,9 @@ function registerAgentCommand(program, printer) {
|
|
|
9
10
|
.command('agent')
|
|
10
11
|
.description('Run an approval-aware agent loop toward an objective, persisting task state.')
|
|
11
12
|
.argument('<objective...>', 'The objective for the agent run.')
|
|
13
|
+
.option('--cwd <path>', 'Working directory on the execution device.')
|
|
14
|
+
.option('--workspace <nameOrId>', 'Use a saved workspace, or local.')
|
|
15
|
+
.option('--device <id>', 'Execution device ID (or host); defaults to this device when enabled.')
|
|
12
16
|
.option('--profile <name>', 'Profile name.')
|
|
13
17
|
.option('--provider <name>', 'Provider key from config.toml.')
|
|
14
18
|
.option('--model <model>', 'Model name.')
|
|
@@ -16,14 +20,15 @@ function registerAgentCommand(program, printer) {
|
|
|
16
20
|
.option('--tool-mode <mode>', 'Tool calling mode: auto, native, or control-block.', parseToolMode)
|
|
17
21
|
.option('--yes', 'Approve all tool calls without prompting (use with care).')
|
|
18
22
|
.action(async (objectiveParts, options) => {
|
|
19
|
-
const
|
|
23
|
+
const api = await (0, WorkspaceClient_1.workspaceClient)(program, options.workspace, options.device);
|
|
24
|
+
const runtime = api ? undefined : (0, RuntimeFactory_1.createRuntime)(program);
|
|
20
25
|
const style = new TerminalStyle_1.TerminalStyle(process.stdout.isTTY ?? false);
|
|
21
26
|
const prompt = new InteractivePrompt_1.InteractivePrompt();
|
|
22
27
|
const controller = new AbortController();
|
|
23
28
|
const onSigint = () => controller.abort();
|
|
24
29
|
process.on('SIGINT', onSigint);
|
|
25
30
|
try {
|
|
26
|
-
const runner = runtime.createAgentRunner(options.profile);
|
|
31
|
+
const runner = api ? { run: (options) => (0, WorkspaceClient_1.remoteAgent)(api, options) } : runtime.createAgentRunner(options.profile);
|
|
27
32
|
const approvalHandler = options.yes
|
|
28
33
|
// --yes may satisfy ordinary kind-level prompts, but it must never
|
|
29
34
|
// silently cross the non-persistable host/network boundary.
|
|
@@ -32,6 +37,7 @@ function registerAgentCommand(program, printer) {
|
|
|
32
37
|
: Promise.resolve({ approved: true }))
|
|
33
38
|
: ((request) => promptForApproval(prompt, style, request));
|
|
34
39
|
const events = runner.run({
|
|
40
|
+
cwd: options.cwd,
|
|
35
41
|
objective: objectiveParts.join(' '),
|
|
36
42
|
profile: options.profile,
|
|
37
43
|
provider: options.provider,
|
|
@@ -57,7 +63,7 @@ function registerAgentCommand(program, printer) {
|
|
|
57
63
|
finally {
|
|
58
64
|
process.off('SIGINT', onSigint);
|
|
59
65
|
prompt.close();
|
|
60
|
-
runtime
|
|
66
|
+
runtime?.close();
|
|
61
67
|
}
|
|
62
68
|
});
|
|
63
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.d.ts","sourceRoot":"","sources":["../../src/commands/ask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ask.d.ts","sourceRoot":"","sources":["../../src/commands/ask.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAc1D,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAqClF"}
|
package/dist/commands/ask.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.registerAskCommand = registerAskCommand;
|
|
4
|
+
const WorkspaceClient_1 = require("./WorkspaceClient");
|
|
4
5
|
const core_1 = require("@marifold/core");
|
|
6
|
+
const core_2 = require("@marifold/core");
|
|
5
7
|
const RuntimeFactory_1 = require("./RuntimeFactory");
|
|
6
8
|
function registerAskCommand(program, printer) {
|
|
7
9
|
program
|
|
8
10
|
.command('ask')
|
|
9
11
|
.description('Send one prompt and print one assistant response.')
|
|
10
12
|
.argument('<prompt...>', 'Prompt text.')
|
|
13
|
+
.option('--workspace <nameOrId>', 'Use a saved workspace, or local.')
|
|
11
14
|
.option('--profile <name>', 'Profile name.')
|
|
12
15
|
.option('--provider <name>', 'Provider key from config.toml.')
|
|
13
16
|
.option('--model <model>', 'Model name.')
|
|
@@ -16,9 +19,10 @@ function registerAskCommand(program, printer) {
|
|
|
16
19
|
.option('--think [state]', 'Enable or disable thinking mode for this run. Accepts true/false.', parseOptionalBoolean)
|
|
17
20
|
.option('--image <path>', 'Attach an image file to the prompt. Repeatable.', collectImage, [])
|
|
18
21
|
.action(async (promptParts, options) => {
|
|
19
|
-
const
|
|
22
|
+
const api = await (0, WorkspaceClient_1.workspaceClient)(program, options.workspace);
|
|
23
|
+
const runtime = api ? undefined : (0, RuntimeFactory_1.createRuntime)(program);
|
|
20
24
|
try {
|
|
21
|
-
const
|
|
25
|
+
const request = {
|
|
22
26
|
prompt: promptParts.join(' '),
|
|
23
27
|
profile: options.profile,
|
|
24
28
|
provider: options.provider,
|
|
@@ -26,8 +30,9 @@ function registerAskCommand(program, printer) {
|
|
|
26
30
|
sessionId: options.session,
|
|
27
31
|
memories: options.memories,
|
|
28
32
|
think: options.think,
|
|
29
|
-
images: options.image && options.image.length > 0 ? options.image.map(path => ({ path: (0,
|
|
30
|
-
}
|
|
33
|
+
images: options.image && options.image.length > 0 ? (await (0, core_1.prepareImageInputs)(options.image.map(path => ({ path: (0, core_2.expandHome)(path) })))).images : undefined,
|
|
34
|
+
};
|
|
35
|
+
const response = api ? await api.request('POST', '/v1/ask', request) : await runtime.ask(request);
|
|
31
36
|
printer.printAskResponse(response);
|
|
32
37
|
if (!response.ok)
|
|
33
38
|
process.exitCode = 1;
|
|
@@ -37,7 +42,7 @@ function registerAskCommand(program, printer) {
|
|
|
37
42
|
process.exitCode = 1;
|
|
38
43
|
}
|
|
39
44
|
finally {
|
|
40
|
-
runtime
|
|
45
|
+
runtime?.close();
|
|
41
46
|
}
|
|
42
47
|
});
|
|
43
48
|
}
|
package/dist/commands/ask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.js","sourceRoot":"","sources":["../../src/commands/ask.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ask.js","sourceRoot":"","sources":["../../src/commands/ask.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/config.js
CHANGED
|
@@ -103,11 +103,11 @@ function registerConfigCommand(program, printer) {
|
|
|
103
103
|
config
|
|
104
104
|
.command('search')
|
|
105
105
|
.description("Configure Marifold's fallback web search (DuckDuckGo, Firecrawl, or Ollama Cloud).")
|
|
106
|
-
.option('--provider <name>', 'Fallback provider: duckduckgo, firecrawl, ollama, or off.')
|
|
106
|
+
.option('--provider <name>', 'Fallback provider: builtin, duckduckgo, firecrawl, ollama, or off.')
|
|
107
107
|
.option('--api-key-env <name>', 'Env var holding the selected search provider API key.')
|
|
108
108
|
.option('--scrape', 'Firecrawl: scrape each result into markdown (costs more).')
|
|
109
|
-
.option('--enable', 'Enable
|
|
110
|
-
.option('--disable', 'Disable
|
|
109
|
+
.option('--enable', 'Enable native-first web search.')
|
|
110
|
+
.option('--disable', 'Disable all web search, including provider-hosted search.')
|
|
111
111
|
.action(async (options) => {
|
|
112
112
|
let prompt;
|
|
113
113
|
try {
|
|
@@ -145,7 +145,7 @@ function searchUpdateFromFlags(options) {
|
|
|
145
145
|
if (provider === 'off') {
|
|
146
146
|
update.enabled = false;
|
|
147
147
|
}
|
|
148
|
-
else if (provider === 'duckduckgo' || provider === 'firecrawl' || provider === 'ollama') {
|
|
148
|
+
else if (provider === 'builtin' || provider === 'duckduckgo' || provider === 'firecrawl' || provider === 'ollama') {
|
|
149
149
|
update.provider = provider;
|
|
150
150
|
update.enabled = true;
|
|
151
151
|
if (provider === 'ollama' && !options.apiKeyEnv) {
|
|
@@ -153,7 +153,7 @@ function searchUpdateFromFlags(options) {
|
|
|
153
153
|
}
|
|
154
154
|
}
|
|
155
155
|
else if (provider !== undefined) {
|
|
156
|
-
throw core_1.MarifoldError.configInvalid('Expected --provider to be "duckduckgo", "firecrawl", "ollama", or "off".');
|
|
156
|
+
throw core_1.MarifoldError.configInvalid('Expected --provider to be "builtin", "duckduckgo", "firecrawl", "ollama", or "off".');
|
|
157
157
|
}
|
|
158
158
|
if (options.apiKeyEnv)
|
|
159
159
|
update.apiKeyEnv = options.apiKeyEnv;
|
|
@@ -167,13 +167,16 @@ function searchUpdateFromFlags(options) {
|
|
|
167
167
|
}
|
|
168
168
|
async function searchUpdateInteractive(getPrompt, style) {
|
|
169
169
|
const provider = await pickOption(getPrompt, style, 'Fallback web search provider:', [
|
|
170
|
-
{ label: '
|
|
170
|
+
{ label: 'Built-in — experimental, no API key (default)', value: 'builtin' },
|
|
171
|
+
{ label: 'DuckDuckGo — keyless, best-effort', value: 'duckduckgo' },
|
|
171
172
|
{ label: 'Firecrawl — AI-ready results (needs an API key)', value: 'firecrawl' },
|
|
172
173
|
{ label: 'Ollama Cloud — account-backed search (needs an API key)', value: 'ollama' },
|
|
173
|
-
{ label: 'Off — disable
|
|
174
|
+
{ label: 'Off — disable all web search', value: 'off' },
|
|
174
175
|
]);
|
|
175
176
|
if (provider === 'off')
|
|
176
177
|
return { enabled: false };
|
|
178
|
+
if (provider === 'builtin')
|
|
179
|
+
return { provider: 'builtin', enabled: true };
|
|
177
180
|
if (provider === 'duckduckgo')
|
|
178
181
|
return { provider: 'duckduckgo', enabled: true };
|
|
179
182
|
if (provider === 'ollama') {
|
|
@@ -241,7 +244,7 @@ async function readLine(prompt, style, label) {
|
|
|
241
244
|
function printSearchSummary(config) {
|
|
242
245
|
if (!config)
|
|
243
246
|
return;
|
|
244
|
-
process.stdout.write(`Fallback web search: ${config.provider}${config.enabled ? '' : ' (
|
|
247
|
+
process.stdout.write(`Fallback web search: ${config.provider}${config.enabled ? '' : ' (all web search off)'}\n`);
|
|
245
248
|
if (config.provider === 'firecrawl') {
|
|
246
249
|
const key = config.apiKeyEnv ? `env ${config.apiKeyEnv}` : config.apiKey ? 'stored in config' : 'keyless (rate-limited)';
|
|
247
250
|
process.stdout.write(` key: ${key}\n scrape: ${config.scrape ? 'on' : 'off'}\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AA0B1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CA6DnF"}
|
package/dist/commands/init.js
CHANGED
|
@@ -26,7 +26,7 @@ function registerInitCommand(program, printer) {
|
|
|
26
26
|
.option('--apps-dir <path>', 'Apps directory.')
|
|
27
27
|
.option('--base-url <url>', 'Provider base URL.')
|
|
28
28
|
.option('--api-key-env <name>', 'Environment variable containing the provider API key.')
|
|
29
|
-
.option('--search-provider <name>', 'Fallback web search provider: duckduckgo, firecrawl, ollama, or off.')
|
|
29
|
+
.option('--search-provider <name>', 'Fallback web search provider: builtin, duckduckgo, firecrawl, ollama, or off.')
|
|
30
30
|
.option('--search-api-key-env <name>', 'Env var holding the selected search provider API key.')
|
|
31
31
|
.action(async (options) => {
|
|
32
32
|
const rootOptions = program.opts();
|
|
@@ -54,18 +54,17 @@ function registerInitCommand(program, printer) {
|
|
|
54
54
|
// In interactive mode, hide the bootstrap model line and Next steps —
|
|
55
55
|
// the chosen model and next steps are printed after the picker.
|
|
56
56
|
printer.printInitResult(result, interactive ? { showModel: false, showNextSteps: false } : {});
|
|
57
|
-
if (interactive) {
|
|
58
|
-
await runInteractiveSetup(program, printer);
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
57
|
if (options.searchProvider) {
|
|
62
58
|
const manager = new core_1.ConfigManager((0, RuntimeFactory_1.loadConfig)(program));
|
|
63
59
|
manager.updateWebSearch((0, config_1.searchUpdateFromFlags)({
|
|
64
60
|
provider: options.searchProvider,
|
|
65
61
|
apiKeyEnv: options.searchApiKeyEnv,
|
|
66
62
|
}));
|
|
67
|
-
|
|
63
|
+
const search = (0, core_1.resolveWebSearchConfig)(manager.config.webSearch);
|
|
64
|
+
process.stdout.write(search.enabled ? `Web search: native first, ${search.provider} fallback.\n` : 'Web search: off.\n');
|
|
68
65
|
}
|
|
66
|
+
if (interactive)
|
|
67
|
+
await runInteractiveSetup(program, printer);
|
|
69
68
|
}
|
|
70
69
|
catch (error) {
|
|
71
70
|
printer.printError(error);
|
|
@@ -73,7 +72,7 @@ function registerInitCommand(program, printer) {
|
|
|
73
72
|
}
|
|
74
73
|
});
|
|
75
74
|
}
|
|
76
|
-
/** Pick a default model
|
|
75
|
+
/** Pick a default model after init, so
|
|
77
76
|
* a first run never points at a model the user doesn't have. Reuses the same
|
|
78
77
|
* provider/model picker as `marifold model add`/`model default`. */
|
|
79
78
|
async function runInteractiveSetup(program, printer) {
|
|
@@ -97,10 +96,10 @@ async function runInteractiveSetup(program, printer) {
|
|
|
97
96
|
}
|
|
98
97
|
}
|
|
99
98
|
process.stdout.write(style.bold(`Default model: ${provider}/${model}\n`));
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
99
|
+
const search = (0, core_1.resolveWebSearchConfig)(manager.config.webSearch);
|
|
100
|
+
process.stdout.write(search.enabled
|
|
101
|
+
? `Web search: native first, ${search.provider === 'builtin' ? 'built-in experimental' : search.provider} fallback.\n`
|
|
102
|
+
: 'Web search: off. Enable it later with `marifold config search --provider builtin`.\n');
|
|
104
103
|
process.stdout.write('\nDone. Run `marifold` to start.\n');
|
|
105
104
|
process.stdout.write(style.dim('(Change the default model later with `marifold model default`.)\n'));
|
|
106
105
|
}
|
|
@@ -116,15 +115,6 @@ async function runInteractiveSetup(program, printer) {
|
|
|
116
115
|
prompt?.close();
|
|
117
116
|
}
|
|
118
117
|
}
|
|
119
|
-
async function readYesNo(prompt, style, label, def) {
|
|
120
|
-
const answer = await prompt.readUserMessage(style.bold(`${label}${def ? ' [Y/n] ' : ' [y/N] '}`));
|
|
121
|
-
if (answer === undefined)
|
|
122
|
-
return def;
|
|
123
|
-
const value = answer.trim().toLowerCase();
|
|
124
|
-
if (!value)
|
|
125
|
-
return def;
|
|
126
|
-
return value === 'y' || value === 'yes';
|
|
127
|
-
}
|
|
128
118
|
function parseProviderType(value) {
|
|
129
119
|
if (value === undefined)
|
|
130
120
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../src/commands/schedule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../src/commands/schedule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAW1D,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAgHvF"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.registerScheduleCommand = registerScheduleCommand;
|
|
4
|
+
const WorkspaceClient_1 = require("./WorkspaceClient");
|
|
4
5
|
const TerminalStyle_1 = require("../output/TerminalStyle");
|
|
5
6
|
const RuntimeFactory_1 = require("./RuntimeFactory");
|
|
6
7
|
function registerScheduleCommand(program, printer) {
|
|
7
8
|
const schedule = program
|
|
8
9
|
.command('schedule')
|
|
10
|
+
.option('--workspace <nameOrId>', 'Use a saved workspace, or local.')
|
|
9
11
|
.description('Manage scheduled agent runs. Schedules fire while marifold service is running.');
|
|
10
12
|
schedule
|
|
11
13
|
.command('add')
|
|
@@ -18,7 +20,7 @@ function registerScheduleCommand(program, printer) {
|
|
|
18
20
|
.action(async (objectiveParts, options) => {
|
|
19
21
|
await withRuntime(program, printer, async (runtime) => {
|
|
20
22
|
const objective = objectiveParts.join(' ');
|
|
21
|
-
const created = runtime.createSchedule({
|
|
23
|
+
const created = await runtime.createSchedule({
|
|
22
24
|
name: options.name ?? objective.slice(0, 60),
|
|
23
25
|
objective,
|
|
24
26
|
cron: options.cron,
|
|
@@ -34,7 +36,7 @@ function registerScheduleCommand(program, printer) {
|
|
|
34
36
|
.description('List schedules.')
|
|
35
37
|
.action(async () => {
|
|
36
38
|
await withRuntime(program, printer, async (runtime) => {
|
|
37
|
-
const schedules = runtime.listSchedules();
|
|
39
|
+
const schedules = await runtime.listSchedules();
|
|
38
40
|
if (schedules.length === 0) {
|
|
39
41
|
process.stdout.write('No schedules. Create one with marifold schedule add.\n');
|
|
40
42
|
return;
|
|
@@ -51,7 +53,7 @@ function registerScheduleCommand(program, printer) {
|
|
|
51
53
|
.argument('<id>', 'Schedule id.')
|
|
52
54
|
.action(async (id) => {
|
|
53
55
|
await withRuntime(program, printer, async (runtime) => {
|
|
54
|
-
const item = runtime.getSchedule(id);
|
|
56
|
+
const item = await runtime.getSchedule(id);
|
|
55
57
|
if (!item) {
|
|
56
58
|
process.stderr.write(`Schedule not found: ${id}\n`);
|
|
57
59
|
process.exitCode = 1;
|
|
@@ -66,7 +68,7 @@ function registerScheduleCommand(program, printer) {
|
|
|
66
68
|
.argument('<id>', 'Schedule id.')
|
|
67
69
|
.action(async (id) => {
|
|
68
70
|
await withRuntime(program, printer, async (runtime) => {
|
|
69
|
-
if (runtime.deleteSchedule(id)) {
|
|
71
|
+
if (await runtime.deleteSchedule(id)) {
|
|
70
72
|
process.stdout.write(`Deleted schedule ${id}.\n`);
|
|
71
73
|
}
|
|
72
74
|
else {
|
|
@@ -81,7 +83,7 @@ function registerScheduleCommand(program, printer) {
|
|
|
81
83
|
.argument('<id>', 'Schedule id.')
|
|
82
84
|
.action(async (id) => {
|
|
83
85
|
await withRuntime(program, printer, async (runtime) => {
|
|
84
|
-
runtime.updateSchedule(id, { enabled: true });
|
|
86
|
+
await runtime.updateSchedule(id, { enabled: true });
|
|
85
87
|
process.stdout.write(`Enabled schedule ${id}.\n`);
|
|
86
88
|
});
|
|
87
89
|
});
|
|
@@ -91,7 +93,7 @@ function registerScheduleCommand(program, printer) {
|
|
|
91
93
|
.argument('<id>', 'Schedule id.')
|
|
92
94
|
.action(async (id) => {
|
|
93
95
|
await withRuntime(program, printer, async (runtime) => {
|
|
94
|
-
runtime.updateSchedule(id, { enabled: false });
|
|
96
|
+
await runtime.updateSchedule(id, { enabled: false });
|
|
95
97
|
process.stdout.write(`Disabled schedule ${id}.\n`);
|
|
96
98
|
});
|
|
97
99
|
});
|
|
@@ -111,8 +113,18 @@ function registerScheduleCommand(program, printer) {
|
|
|
111
113
|
});
|
|
112
114
|
}
|
|
113
115
|
async function withRuntime(program, printer, action) {
|
|
114
|
-
|
|
116
|
+
let local;
|
|
115
117
|
try {
|
|
118
|
+
const selected = program.commands.find(command => command.name() === 'schedule')?.opts().workspace;
|
|
119
|
+
const api = await (0, WorkspaceClient_1.workspaceClient)(program, selected);
|
|
120
|
+
const runtime = api ? {
|
|
121
|
+
createSchedule: async (input) => (await api.request('POST', '/v1/schedules', input)).schedule,
|
|
122
|
+
listSchedules: async () => (await api.request('GET', '/v1/schedules')).schedules,
|
|
123
|
+
getSchedule: async (id) => (await api.request('GET', `/v1/schedules/${encodeURIComponent(id)}`)).schedule,
|
|
124
|
+
updateSchedule: async (id, input) => (await api.request('PATCH', `/v1/schedules/${encodeURIComponent(id)}`, input)).schedule,
|
|
125
|
+
deleteSchedule: async (id) => (await api.request('DELETE', `/v1/schedules/${encodeURIComponent(id)}`)).deleted,
|
|
126
|
+
runScheduleUnattended: id => api.request('POST', `/v1/schedules/${encodeURIComponent(id)}/run`, {}),
|
|
127
|
+
} : local = (0, RuntimeFactory_1.createRuntime)(program);
|
|
116
128
|
await action(runtime);
|
|
117
129
|
}
|
|
118
130
|
catch (error) {
|
|
@@ -120,7 +132,7 @@ async function withRuntime(program, printer, action) {
|
|
|
120
132
|
process.exitCode = 1;
|
|
121
133
|
}
|
|
122
134
|
finally {
|
|
123
|
-
|
|
135
|
+
local?.close();
|
|
124
136
|
}
|
|
125
137
|
}
|
|
126
138
|
function printSchedule(item) {
|