@marifold/core 0.67.0 → 0.70.5
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 +7 -1
- package/dist/agent/AgentRunner.d.ts.map +1 -1
- package/dist/agent/AgentRunner.js +50 -16
- package/dist/agent/AgentRunner.js.map +1 -1
- package/dist/agent/RunArtifacts.d.ts +6 -1
- package/dist/agent/RunArtifacts.d.ts.map +1 -1
- package/dist/agent/RunArtifacts.js +16 -3
- package/dist/agent/RunArtifacts.js.map +1 -1
- package/dist/agent/RunWorkspace.d.ts +3 -0
- package/dist/agent/RunWorkspace.d.ts.map +1 -1
- package/dist/agent/RunWorkspace.js +5 -0
- package/dist/agent/RunWorkspace.js.map +1 -1
- package/dist/agent/ScopedProcess.d.ts.map +1 -1
- package/dist/agent/ScopedProcess.js +1 -0
- package/dist/agent/ScopedProcess.js.map +1 -1
- package/dist/agent/ToolRegistry.d.ts +6 -1
- package/dist/agent/ToolRegistry.d.ts.map +1 -1
- package/dist/agent/ToolRegistry.js +4 -1
- package/dist/agent/ToolRegistry.js.map +1 -1
- package/dist/agent/tools/ReadFileTool.d.ts.map +1 -1
- package/dist/agent/tools/ReadFileTool.js +4 -0
- package/dist/agent/tools/ReadFileTool.js.map +1 -1
- package/dist/agent/tools/SkillManagementTool.d.ts +10 -1
- package/dist/agent/tools/SkillManagementTool.d.ts.map +1 -1
- package/dist/agent/tools/SkillManagementTool.js +95 -42
- package/dist/agent/tools/SkillManagementTool.js.map +1 -1
- package/dist/agent/tools/WriteFileTool.d.ts.map +1 -1
- package/dist/agent/tools/WriteFileTool.js +4 -0
- package/dist/agent/tools/WriteFileTool.js.map +1 -1
- package/dist/app/SkillAppInstanceRegistry.d.ts.map +1 -1
- package/dist/app/SkillAppInstanceRegistry.js +5 -0
- package/dist/app/SkillAppInstanceRegistry.js.map +1 -1
- package/dist/channels/TelegramBridge.d.ts +0 -1
- package/dist/channels/TelegramBridge.d.ts.map +1 -1
- package/dist/channels/TelegramBridge.js +8 -26
- package/dist/channels/TelegramBridge.js.map +1 -1
- package/dist/config/ChatGptCatalogVersion.d.ts +3 -0
- package/dist/config/ChatGptCatalogVersion.d.ts.map +1 -0
- package/dist/config/ChatGptCatalogVersion.js +55 -0
- package/dist/config/ChatGptCatalogVersion.js.map +1 -0
- package/dist/config/ConfigManager.d.ts.map +1 -1
- package/dist/config/ConfigManager.js +0 -1
- package/dist/config/ConfigManager.js.map +1 -1
- package/dist/config/ConfigSchema.d.ts +13 -4
- package/dist/config/ConfigSchema.d.ts.map +1 -1
- package/dist/config/ProviderInspector.d.ts.map +1 -1
- package/dist/config/ProviderInspector.js +2 -5
- package/dist/config/ProviderInspector.js.map +1 -1
- package/dist/errors/MarifoldError.d.ts +1 -1
- package/dist/errors/MarifoldError.d.ts.map +1 -1
- package/dist/errors/MarifoldError.js.map +1 -1
- package/dist/images/AvatarThumbnail.d.ts +3 -0
- package/dist/images/AvatarThumbnail.d.ts.map +1 -0
- package/dist/images/AvatarThumbnail.js +16 -0
- package/dist/images/AvatarThumbnail.js.map +1 -0
- package/dist/index.d.ts +13 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +19 -4
- package/dist/index.js.map +1 -1
- package/dist/memory/MemoryControls.js +1 -1
- package/dist/memory/MemoryControls.js.map +1 -1
- package/dist/profiles/ProfileInstructions.d.ts +15 -0
- package/dist/profiles/ProfileInstructions.d.ts.map +1 -0
- package/dist/profiles/ProfileInstructions.js +101 -0
- package/dist/profiles/ProfileInstructions.js.map +1 -0
- package/dist/profiles/ProfileManager.d.ts +15 -6
- package/dist/profiles/ProfileManager.d.ts.map +1 -1
- package/dist/profiles/ProfileManager.js +78 -21
- package/dist/profiles/ProfileManager.js.map +1 -1
- package/dist/profiles/ProfileResolver.d.ts.map +1 -1
- package/dist/profiles/ProfileResolver.js +37 -8
- package/dist/profiles/ProfileResolver.js.map +1 -1
- package/dist/runs/RunRegistry.d.ts +27 -1
- package/dist/runs/RunRegistry.d.ts.map +1 -1
- package/dist/runs/RunRegistry.js +75 -16
- package/dist/runs/RunRegistry.js.map +1 -1
- package/dist/runtime/MarifoldRuntime.d.ts +13 -4
- package/dist/runtime/MarifoldRuntime.d.ts.map +1 -1
- package/dist/runtime/MarifoldRuntime.js +36 -7
- package/dist/runtime/MarifoldRuntime.js.map +1 -1
- package/dist/runtime/MarifoldTypes.d.ts +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.js +10 -10
- package/dist/skill/BuiltInSkills.js.map +1 -1
- package/dist/workspace/DeviceDelegateTool.d.ts +40 -0
- package/dist/workspace/DeviceDelegateTool.d.ts.map +1 -0
- package/dist/workspace/DeviceDelegateTool.js +79 -0
- package/dist/workspace/DeviceDelegateTool.js.map +1 -0
- package/dist/workspace/WorkspaceArtifactTransfer.d.ts +8 -0
- package/dist/workspace/WorkspaceArtifactTransfer.d.ts.map +1 -0
- package/dist/workspace/WorkspaceArtifactTransfer.js +45 -0
- package/dist/workspace/WorkspaceArtifactTransfer.js.map +1 -0
- package/dist/workspace/WorkspaceExecutor.d.ts +19 -0
- package/dist/workspace/WorkspaceExecutor.d.ts.map +1 -0
- package/dist/workspace/WorkspaceExecutor.js +212 -0
- package/dist/workspace/WorkspaceExecutor.js.map +1 -0
- package/dist/workspace/WorkspaceInitializer.d.ts.map +1 -1
- package/dist/workspace/WorkspaceInitializer.js +10 -13
- package/dist/workspace/WorkspaceInitializer.js.map +1 -1
- package/dist/workspace/WorkspaceManager.d.ts +43 -0
- package/dist/workspace/WorkspaceManager.d.ts.map +1 -0
- package/dist/workspace/WorkspaceManager.js +378 -0
- package/dist/workspace/WorkspaceManager.js.map +1 -0
- package/dist/workspace/WorkspaceRuns.d.ts +18 -0
- package/dist/workspace/WorkspaceRuns.d.ts.map +1 -0
- package/dist/workspace/WorkspaceRuns.js +152 -0
- package/dist/workspace/WorkspaceRuns.js.map +1 -0
- package/dist/workspace/WorkspaceStore.d.ts +49 -0
- package/dist/workspace/WorkspaceStore.d.ts.map +1 -0
- package/dist/workspace/WorkspaceStore.js +419 -0
- package/dist/workspace/WorkspaceStore.js.map +1 -0
- package/dist/workspace/WorkspaceTerminal.d.ts +4 -0
- package/dist/workspace/WorkspaceTerminal.d.ts.map +1 -0
- package/dist/workspace/WorkspaceTerminal.js +80 -0
- package/dist/workspace/WorkspaceTerminal.js.map +1 -0
- package/dist/workspace/bridge/BridgePeer.d.ts +48 -0
- package/dist/workspace/bridge/BridgePeer.d.ts.map +1 -0
- package/dist/workspace/bridge/BridgePeer.js +307 -0
- package/dist/workspace/bridge/BridgePeer.js.map +1 -0
- package/dist/workspace/bridge/ChunkTransfers.d.ts +19 -0
- package/dist/workspace/bridge/ChunkTransfers.d.ts.map +1 -0
- package/dist/workspace/bridge/ChunkTransfers.js +125 -0
- package/dist/workspace/bridge/ChunkTransfers.js.map +1 -0
- package/package.json +6 -3
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type AgentTool } from '../agent/ToolRegistry';
|
|
2
|
+
import type { WorkspaceOperationContext } from './WorkspaceManager';
|
|
3
|
+
import type { MarifoldAgentConfig } from '../agent/ApprovalPolicy';
|
|
4
|
+
export declare function executionTools(): AgentTool[];
|
|
5
|
+
/** A device owns its own capability construction. Host paths, trusted folders,
|
|
6
|
+
* shell environments, and credentials are never accepted as grants over RPC. */
|
|
7
|
+
export declare class WorkspaceExecutor {
|
|
8
|
+
private readonly config;
|
|
9
|
+
private readonly runsDir?;
|
|
10
|
+
private readonly protectedPaths;
|
|
11
|
+
private runs;
|
|
12
|
+
private registry;
|
|
13
|
+
private timer;
|
|
14
|
+
constructor(config: () => MarifoldAgentConfig, runsDir?: string | undefined, protectedPaths?: string[]);
|
|
15
|
+
close(): void;
|
|
16
|
+
cancelWorkspace(workspaceId: string): void;
|
|
17
|
+
handle(operation: string, value: unknown, context: WorkspaceOperationContext): Promise<unknown>;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=WorkspaceExecutor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkspaceExecutor.d.ts","sourceRoot":"","sources":["../../src/workspace/WorkspaceExecutor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAgB,KAAK,SAAS,EAA6B,MAAM,uBAAuB,CAAC;AAQhG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,wBAAgB,cAAc,IAAI,SAAS,EAAE,CAS5C;AAQD;gFACgF;AAChF,qBAAa,iBAAiB;IAK1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IANjC,OAAO,CAAC,IAAI,CAAgC;IAC5C,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,KAAK,CAAiC;IAC9C,YACmB,MAAM,EAAE,MAAM,mBAAmB,EACjC,OAAO,CAAC,EAAE,MAAM,YAAA,EAChB,cAAc,GAAE,MAAM,EAAO,EAW/C;IACD,KAAK,IAAI,IAAI,CAIZ;IACD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAMzC;IACK,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC,CAqGpG;CACF"}
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.WorkspaceExecutor = void 0;
|
|
37
|
+
exports.executionTools = executionTools;
|
|
38
|
+
const WorkspaceArtifactTransfer_1 = require("./WorkspaceArtifactTransfer");
|
|
39
|
+
const fs = __importStar(require("node:fs"));
|
|
40
|
+
const path = __importStar(require("node:path"));
|
|
41
|
+
const workspace_protocol_1 = require("@marifold/workspace-protocol");
|
|
42
|
+
const RunWorkspace_1 = require("../agent/RunWorkspace");
|
|
43
|
+
const RunArtifacts_1 = require("../agent/RunArtifacts");
|
|
44
|
+
const ToolRegistry_1 = require("../agent/ToolRegistry");
|
|
45
|
+
const InspectAttachmentTool_1 = require("../agent/tools/InspectAttachmentTool");
|
|
46
|
+
const ReadAttachmentTool_1 = require("../agent/tools/ReadAttachmentTool");
|
|
47
|
+
const SearchAttachmentTool_1 = require("../agent/tools/SearchAttachmentTool");
|
|
48
|
+
const ReadFileTool_1 = require("../agent/tools/ReadFileTool");
|
|
49
|
+
const WriteFileTool_1 = require("../agent/tools/WriteFileTool");
|
|
50
|
+
const ShellExecTool_1 = require("../agent/tools/ShellExecTool");
|
|
51
|
+
const WorkspacePaths_1 = require("./WorkspacePaths");
|
|
52
|
+
function executionTools() {
|
|
53
|
+
return [
|
|
54
|
+
new InspectAttachmentTool_1.InspectAttachmentTool(),
|
|
55
|
+
new ReadAttachmentTool_1.ReadAttachmentTool(),
|
|
56
|
+
new SearchAttachmentTool_1.SearchAttachmentTool(),
|
|
57
|
+
new ReadFileTool_1.ReadFileTool(),
|
|
58
|
+
new WriteFileTool_1.WriteFileTool(),
|
|
59
|
+
new ShellExecTool_1.ShellExecTool(),
|
|
60
|
+
];
|
|
61
|
+
}
|
|
62
|
+
/** A device owns its own capability construction. Host paths, trusted folders,
|
|
63
|
+
* shell environments, and credentials are never accepted as grants over RPC. */
|
|
64
|
+
class WorkspaceExecutor {
|
|
65
|
+
config;
|
|
66
|
+
runsDir;
|
|
67
|
+
protectedPaths;
|
|
68
|
+
runs = new Map();
|
|
69
|
+
registry = new ToolRegistry_1.ToolRegistry();
|
|
70
|
+
timer;
|
|
71
|
+
constructor(config, runsDir, protectedPaths = []) {
|
|
72
|
+
this.config = config;
|
|
73
|
+
this.runsDir = runsDir;
|
|
74
|
+
this.protectedPaths = protectedPaths;
|
|
75
|
+
for (const tool of executionTools())
|
|
76
|
+
this.registry.register(tool);
|
|
77
|
+
this.timer = setInterval(() => {
|
|
78
|
+
for (const [id, run] of this.runs)
|
|
79
|
+
if (run.lease < Date.now()) {
|
|
80
|
+
run.abort.abort();
|
|
81
|
+
this.runs.delete(id);
|
|
82
|
+
}
|
|
83
|
+
}, 5000);
|
|
84
|
+
this.timer.unref();
|
|
85
|
+
}
|
|
86
|
+
close() {
|
|
87
|
+
clearInterval(this.timer);
|
|
88
|
+
for (const run of this.runs.values())
|
|
89
|
+
run.abort.abort();
|
|
90
|
+
this.runs.clear();
|
|
91
|
+
}
|
|
92
|
+
cancelWorkspace(workspaceId) {
|
|
93
|
+
for (const [key, run] of this.runs)
|
|
94
|
+
if (key.startsWith(`${workspaceId}:`)) {
|
|
95
|
+
run.abort.abort();
|
|
96
|
+
this.runs.delete(key);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
async handle(operation, value, context) {
|
|
100
|
+
const b = (0, workspace_protocol_1.record)(value);
|
|
101
|
+
const runId = (0, workspace_protocol_1.identifier)(b.runId);
|
|
102
|
+
const key = `${context.workspaceId}:${runId}`;
|
|
103
|
+
// Completed output is read-only and recoverable after a guest restart. Never
|
|
104
|
+
// reconstruct execution capabilities or grants from an on-disk run directory.
|
|
105
|
+
if (operation === 'executor.artifact') {
|
|
106
|
+
const artifact = (0, RunArtifacts_1.resolveRunArtifact)(`ws_${(0, workspace_protocol_1.identifier)(context.workspaceId)}_${runId}`, (0, workspace_protocol_1.identifier)(b.artifactId), this.runsDir ?? path.join((0, WorkspacePaths_1.marifoldHome)(), 'runs'));
|
|
107
|
+
if (!artifact)
|
|
108
|
+
throw new Error('Artifact is unavailable.');
|
|
109
|
+
const offset = b.offset;
|
|
110
|
+
if (typeof offset !== 'number' || !Number.isSafeInteger(offset) || offset < 0 || offset > artifact.size)
|
|
111
|
+
throw new Error('Invalid artifact offset.');
|
|
112
|
+
const fd = fs.openSync(artifact.path, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
|
|
113
|
+
try {
|
|
114
|
+
const bytes = Buffer.alloc(Math.min((0, WorkspaceArtifactTransfer_1.artifactReadLength)(b.length), artifact.size - offset));
|
|
115
|
+
const n = fs.readSync(fd, bytes, 0, bytes.length, offset);
|
|
116
|
+
return { data: bytes.subarray(0, n).toString('base64'), size: artifact.size };
|
|
117
|
+
}
|
|
118
|
+
finally {
|
|
119
|
+
fs.closeSync(fd);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
if (operation === 'executor.prepare') {
|
|
123
|
+
if (this.runs.has(key))
|
|
124
|
+
throw new Error('Execution already prepared.');
|
|
125
|
+
if (this.runs.size >= 50)
|
|
126
|
+
throw new Error('Execution capacity reached.');
|
|
127
|
+
if (Array.isArray(b.images) && b.images.some((image) => !image || typeof image !== 'object' || 'path' in image))
|
|
128
|
+
throw new Error('Remote image inputs must carry bytes or URLs, never device paths.');
|
|
129
|
+
const config = this.config();
|
|
130
|
+
const workspace = (0, RunWorkspace_1.createRunWorkspace)({
|
|
131
|
+
deniedRoots: this.protectedPaths,
|
|
132
|
+
id: `ws_${context.workspaceId}_${runId}`,
|
|
133
|
+
cwd: typeof b.cwd === 'string' ? b.cwd : undefined,
|
|
134
|
+
trustedFolders: config.trustedFolders,
|
|
135
|
+
files: Array.isArray(b.files) ? b.files : undefined,
|
|
136
|
+
images: Array.isArray(b.images) ? b.images : undefined,
|
|
137
|
+
...(this.runsDir ? { runsDir: this.runsDir } : {}),
|
|
138
|
+
});
|
|
139
|
+
this.runs.set(key, {
|
|
140
|
+
workspace,
|
|
141
|
+
abort: new AbortController(),
|
|
142
|
+
lease: Date.now() + 45000,
|
|
143
|
+
grants: new Map(),
|
|
144
|
+
completed: false,
|
|
145
|
+
});
|
|
146
|
+
return workspace;
|
|
147
|
+
}
|
|
148
|
+
const run = this.runs.get(key);
|
|
149
|
+
if (!run)
|
|
150
|
+
throw new Error('Execution is unavailable or its lease expired. Start a new run explicitly.');
|
|
151
|
+
if (operation === 'executor.cancel') {
|
|
152
|
+
run.abort.abort();
|
|
153
|
+
return { cancelled: true };
|
|
154
|
+
}
|
|
155
|
+
if (operation === 'executor.lease') {
|
|
156
|
+
if (!run.completed && !run.abort.signal.aborted)
|
|
157
|
+
run.lease = Date.now() + 45000;
|
|
158
|
+
return { active: !run.abort.signal.aborted };
|
|
159
|
+
}
|
|
160
|
+
if (operation === 'executor.artifacts') {
|
|
161
|
+
run.completed = true;
|
|
162
|
+
run.lease = Date.now() + 24 * 60 * 60 * 1000;
|
|
163
|
+
return (0, RunArtifacts_1.listRunArtifacts)(run.workspace);
|
|
164
|
+
}
|
|
165
|
+
if (run.completed || run.abort.signal.aborted)
|
|
166
|
+
throw new Error('Execution has ended.');
|
|
167
|
+
const tool = this.registry.get(String(b.tool));
|
|
168
|
+
if (!tool || tool.kind === 'interaction')
|
|
169
|
+
throw new Error('Unsupported execution tool.');
|
|
170
|
+
const input = (0, workspace_protocol_1.record)(b.input);
|
|
171
|
+
const toolContext = {
|
|
172
|
+
workspace: run.workspace,
|
|
173
|
+
cwd: run.workspace.cwd,
|
|
174
|
+
trustedFolders: this.config().trustedFolders,
|
|
175
|
+
outputLimit: this.config().toolOutputLimit,
|
|
176
|
+
signal: run.abort.signal,
|
|
177
|
+
};
|
|
178
|
+
const risk = (await tool.assessRisk?.(input, toolContext)) ?? { escalate: false };
|
|
179
|
+
const blocked = risk.blocked || (!risk.trusted && this.config().approval[tool.kind] === 'deny');
|
|
180
|
+
const hash = (0, workspace_protocol_1.digest)(JSON.stringify([tool.definition.name, input]));
|
|
181
|
+
if (operation === 'executor.assess') {
|
|
182
|
+
const grant = (0, workspace_protocol_1.randomId)();
|
|
183
|
+
for (const [id, g] of run.grants)
|
|
184
|
+
if (g.expires < Date.now())
|
|
185
|
+
run.grants.delete(id);
|
|
186
|
+
if (run.grants.size >= 128)
|
|
187
|
+
throw new Error('Too many outstanding execution grants.');
|
|
188
|
+
if (!blocked)
|
|
189
|
+
run.grants.set(grant, { hash, expires: Date.now() + 6 * 60 * 1000 });
|
|
190
|
+
return {
|
|
191
|
+
...risk,
|
|
192
|
+
blocked,
|
|
193
|
+
grant,
|
|
194
|
+
persistable: false,
|
|
195
|
+
trusted: false,
|
|
196
|
+
escalate: true,
|
|
197
|
+
reason: blocked
|
|
198
|
+
? (risk.reason ?? 'Denied by execution device policy.')
|
|
199
|
+
: (risk.reason ?? 'Approve this call on the selected device.'),
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
if (operation !== 'executor.execute')
|
|
203
|
+
throw new Error('Unsupported executor operation.');
|
|
204
|
+
const grant = run.grants.get(String(b.grant));
|
|
205
|
+
run.grants.delete(String(b.grant));
|
|
206
|
+
if (blocked || !grant || grant.hash !== hash || grant.expires < Date.now())
|
|
207
|
+
throw new Error('Execution grant is invalid or expired.');
|
|
208
|
+
return tool.execute(input, toolContext);
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
exports.WorkspaceExecutor = WorkspaceExecutor;
|
|
212
|
+
//# sourceMappingURL=WorkspaceExecutor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkspaceExecutor.js","sourceRoot":"","sources":["../../src/workspace/WorkspaceExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceInitializer.d.ts","sourceRoot":"","sources":["../../src/workspace/WorkspaceInitializer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"WorkspaceInitializer.d.ts","sourceRoot":"","sources":["../../src/workspace/WorkspaceInitializer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBtD,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAErE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,uBAAuB,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED,qBAAa,oBAAoB;IAC/B,UAAU,CAAC,OAAO,GAAE,oBAAyB,GAAG,mBAAmB,CA0ElE;CACF"}
|
|
@@ -39,18 +39,9 @@ const path = __importStar(require("path"));
|
|
|
39
39
|
const MarifoldError_1 = require("../errors/MarifoldError");
|
|
40
40
|
const MemoryStore_1 = require("../memory/MemoryStore");
|
|
41
41
|
const ProfileManager_1 = require("../profiles/ProfileManager");
|
|
42
|
+
const ProfileInstructions_1 = require("../profiles/ProfileInstructions");
|
|
42
43
|
const WorkspacePaths_1 = require("./WorkspacePaths");
|
|
43
44
|
const SAFE_PROFILE_NAME = /^[A-Za-z0-9_-]+$/;
|
|
44
|
-
const DEFAULT_PROFILE = `# PROFILE.md
|
|
45
|
-
|
|
46
|
-
You are Marifold, a local-first personal AI workspace assistant.
|
|
47
|
-
`;
|
|
48
|
-
const DEFAULT_RULES = `# RULES.md
|
|
49
|
-
|
|
50
|
-
Answer clearly and practically.
|
|
51
|
-
Do not claim unsupported capabilities.
|
|
52
|
-
`;
|
|
53
|
-
const DEFAULT_CUSTOM = '';
|
|
54
45
|
class WorkspaceInitializer {
|
|
55
46
|
initialize(options = {}) {
|
|
56
47
|
const configPath = (0, WorkspacePaths_1.resolveUserPath)(options.configPath ?? (0, WorkspacePaths_1.defaultConfigPath)());
|
|
@@ -96,9 +87,15 @@ class WorkspaceInitializer {
|
|
|
96
87
|
files.push({ path: configPath, status: configStatus });
|
|
97
88
|
const profileDir = path.join(profilesDir, profile);
|
|
98
89
|
fs.mkdirSync(profileDir, { recursive: true });
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
90
|
+
const existingInstructions = (0, ProfileInstructions_1.resolveDirectoryProfileInstructions)(profileDir);
|
|
91
|
+
if (existingInstructions.format === 'legacy') {
|
|
92
|
+
for (const fileName of existingInstructions.legacyFiles) {
|
|
93
|
+
files.push({ path: path.join(profileDir, fileName), status: 'kept' });
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
files.push(writeIfMissing(path.join(profileDir, ProfileInstructions_1.PROFILE_INSTRUCTIONS_FILE), ProfileInstructions_1.DEFAULT_MARIFOLD_PROFILE_INSTRUCTIONS));
|
|
98
|
+
}
|
|
102
99
|
files.push(writeIfMissing(path.join(profileDir, 'profile.toml'), ProfileManager_1.PROFILE_TOML_STUB));
|
|
103
100
|
files.push(...(0, MemoryStore_1.ensureProfileMemoryFiles)(profileDir));
|
|
104
101
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceInitializer.js","sourceRoot":"","sources":["../../src/workspace/WorkspaceInitializer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,EAAE,+BAAW;AACzB,MAAY,IAAI,iCAAa;AAC7B,2DAAwD;AAExD,uDAAiE;AACjE,+DAA+D;AAC/D,qDAS0B;AAE1B,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"WorkspaceInitializer.js","sourceRoot":"","sources":["../../src/workspace/WorkspaceInitializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { WorkspaceSummary } from '@marifold/workspace-protocol';
|
|
2
|
+
import { WorkspaceStore } from './WorkspaceStore';
|
|
3
|
+
export interface WorkspaceOperationContext {
|
|
4
|
+
workspaceId: string;
|
|
5
|
+
senderDeviceId: string;
|
|
6
|
+
hostDeviceId: string;
|
|
7
|
+
}
|
|
8
|
+
export declare class WorkspaceManager {
|
|
9
|
+
readonly store: WorkspaceStore;
|
|
10
|
+
private peers;
|
|
11
|
+
private hostStatus;
|
|
12
|
+
private presence;
|
|
13
|
+
onMembershipRemoved?: (workspaceId: string, deviceId?: string) => void;
|
|
14
|
+
private heartbeat?;
|
|
15
|
+
private remoteHandler?;
|
|
16
|
+
private executorHandler?;
|
|
17
|
+
constructor(configPath: string);
|
|
18
|
+
start(handler: NonNullable<WorkspaceManager['remoteHandler']>, executor?: WorkspaceManager['executorHandler']): void;
|
|
19
|
+
close(): void;
|
|
20
|
+
list(): WorkspaceSummary[];
|
|
21
|
+
create(name: string, url: string, registrationToken: string): Promise<{
|
|
22
|
+
workspace: WorkspaceSummary;
|
|
23
|
+
invitation: string;
|
|
24
|
+
}>;
|
|
25
|
+
add(url: string, token: string, executor?: boolean): Promise<WorkspaceSummary>;
|
|
26
|
+
devices(id: string): {
|
|
27
|
+
id: string;
|
|
28
|
+
name: string;
|
|
29
|
+
host: boolean;
|
|
30
|
+
platform: string;
|
|
31
|
+
architecture: string;
|
|
32
|
+
executor: boolean;
|
|
33
|
+
online: boolean;
|
|
34
|
+
}[];
|
|
35
|
+
request(id: string, operation: string, input: unknown, requestId?: string): Promise<unknown>;
|
|
36
|
+
execute(id: string, device: string, operation: string, input: unknown, requestId?: string): Promise<unknown>;
|
|
37
|
+
remove(id: string): Promise<void>;
|
|
38
|
+
setExecutor(id: string, enabled: boolean): Promise<void>;
|
|
39
|
+
private connect;
|
|
40
|
+
private checkHost;
|
|
41
|
+
private dispatch;
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=WorkspaceManager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkspaceManager.d.ts","sourceRoot":"","sources":["../../src/workspace/WorkspaceManager.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAGV,gBAAgB,EAGjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,cAAc,EAAuB,MAAM,kBAAkB,CAAC;AAGvE,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AACD,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,QAAQ,CAAkG;IAClH,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACvE,OAAO,CAAC,SAAS,CAAC,CAAiC;IACnD,OAAO,CAAC,aAAa,CAAC,CAA8F;IACpH,OAAO,CAAC,eAAe,CAAC,CAA8F;IACtH,YAAY,UAAU,EAAE,MAAM,EAE7B;IACD,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAQnH;IACD,KAAK,IAAI,IAAI,CAIZ;IACD,IAAI,IAAI,gBAAgB,EAAE,CAazB;IACK,MAAM,CACV,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC;QAAE,SAAS,EAAE,gBAAgB,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAoB9D;IACK,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAuDjF;IACD,OAAO,CAAC,EAAE,EAAE,MAAM;;;;;;;;QAmBjB;IACK,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,SAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CA8BrG;IACK,OAAO,CACX,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,SAAS,SAAa,GACrB,OAAO,CAAC,OAAO,CAAC,CAelB;IACK,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBtC;IACK,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAK7D;IACD,OAAO,CAAC,OAAO;YAiCD,SAAS;YAoBT,QAAQ;CAoFvB"}
|