agent-nuvira 3.5.9 → 3.5.10
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/README.md +19 -1
- package/dist/cli/cli-program.d.ts.map +1 -1
- package/dist/cli/cli-program.js +6 -0
- package/dist/cli/cli-program.js.map +1 -1
- package/dist/cli/motion.d.ts +53 -0
- package/dist/cli/motion.d.ts.map +1 -0
- package/dist/cli/motion.js +516 -0
- package/dist/cli/motion.js.map +1 -0
- package/dist/learning/machine-facts.d.ts +7 -0
- package/dist/learning/machine-facts.d.ts.map +1 -1
- package/dist/learning/machine-facts.js +37 -2
- package/dist/learning/machine-facts.js.map +1 -1
- package/dist/skills/bundled-skills-phase3.d.ts.map +1 -1
- package/dist/skills/bundled-skills-phase3.js +3 -3
- package/dist/skills/bundled-skills-phase3.js.map +1 -1
- package/dist/skills/sandbox-executor.d.ts.map +1 -1
- package/dist/skills/sandbox-executor.js +115 -34
- package/dist/skills/sandbox-executor.js.map +1 -1
- package/dist/tools/modality/motion-tool.d.ts +28 -1
- package/dist/tools/modality/motion-tool.d.ts.map +1 -1
- package/dist/tools/modality/motion-tool.js +261 -10
- package/dist/tools/modality/motion-tool.js.map +1 -1
- package/dist/tools/modality/motion.d.ts +403 -3
- package/dist/tools/modality/motion.d.ts.map +1 -1
- package/dist/tools/modality/motion.js +1096 -41
- package/dist/tools/modality/motion.js.map +1 -1
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +34 -4
- package/dist/tools/registry.js.map +1 -1
- package/dist/web-dashboard/motion-data.d.ts +62 -0
- package/dist/web-dashboard/motion-data.d.ts.map +1 -0
- package/dist/web-dashboard/motion-data.js +91 -0
- package/dist/web-dashboard/motion-data.js.map +1 -0
- package/dist/web-dashboard/server.d.ts.map +1 -1
- package/dist/web-dashboard/server.js +58 -30
- package/dist/web-dashboard/server.js.map +1 -1
- package/dist/web-dashboard/src/types.d.ts +31 -0
- package/dist/web-dashboard/src/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/web-dashboard/public/assets/{index-CzRU84ET.css → index-CXdBvA0N.css} +1 -1
- package/src/web-dashboard/public/assets/{index-CGYIlLpO.js → index-DfjkO16t.js} +81 -81
- package/src/web-dashboard/public/assets/{index-CGYIlLpO.js.map → index-DfjkO16t.js.map} +1 -1
- package/src/web-dashboard/public/index.html +2 -2
|
@@ -15,12 +15,56 @@
|
|
|
15
15
|
* 4. Execute the script with timeout
|
|
16
16
|
* 5. Capture output and cleanup
|
|
17
17
|
*/
|
|
18
|
-
import { spawn } from 'node:child_process';
|
|
19
|
-
import { writeFile, mkdir, rm } from 'node:fs/promises';
|
|
18
|
+
import { spawn, spawnSync } from 'node:child_process';
|
|
19
|
+
import { writeFile, mkdir, realpath, rm } from 'node:fs/promises';
|
|
20
20
|
import { join } from 'node:path';
|
|
21
|
-
import {
|
|
21
|
+
import { homedir } from 'node:os';
|
|
22
22
|
import { randomBytes } from 'node:crypto';
|
|
23
|
+
/**
|
|
24
|
+
* Where the host script is written before it is mounted into the container.
|
|
25
|
+
*
|
|
26
|
+
* NOT the OS temp dir, which is what this used and why every sandboxed run failed
|
|
27
|
+
* on macOS: `os.tmpdir()` is under /var/folders (or /tmp, a symlink to /private/tmp),
|
|
28
|
+
* and neither is shared with the Docker VM by default — colima shares $HOME, Docker
|
|
29
|
+
* Desktop shares $HOME. A bind mount from an unshared host path does not error: the
|
|
30
|
+
* daemon silently creates an EMPTY DIRECTORY at the target, and the container then
|
|
31
|
+
* fails with `/tmp/skill.sh: Is a directory` (measured: Docker 29.7.2 on aarch64
|
|
32
|
+
* with colima). $HOME is the one location every macOS Docker backend shares.
|
|
33
|
+
*
|
|
34
|
+
* NUVIRA_SANDBOX_DIR overrides it for a machine with a different shared root.
|
|
35
|
+
*/
|
|
36
|
+
function sandboxHostDir() {
|
|
37
|
+
const override = process.env.NUVIRA_SANDBOX_DIR;
|
|
38
|
+
return override && override.trim() ? override.trim() : join(homedir(), '.nuvira', 'sandbox');
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* The path INSIDE the container the script is mounted at.
|
|
42
|
+
*
|
|
43
|
+
* Deliberately not under /tmp: the container mounts a tmpfs there, and a bind mount
|
|
44
|
+
* whose target lives inside another mount point is replaced by a directory — the same
|
|
45
|
+
* "Is a directory" failure from the other direction. `/` is the root filesystem, which
|
|
46
|
+
* every image has.
|
|
47
|
+
*/
|
|
48
|
+
function containerScriptPath(ext) {
|
|
49
|
+
return `/skill${ext}`;
|
|
50
|
+
}
|
|
23
51
|
// ─── Default Configuration ───────────────────────────────────────────────
|
|
52
|
+
/**
|
|
53
|
+
* The image a runtime needs, when the caller does not name one.
|
|
54
|
+
*
|
|
55
|
+
* The default image is `node:20-slim`, which has NO python3: a `.py` skill in the
|
|
56
|
+
* sandbox exited 127 with "python3: not found" whatever its code said, because the
|
|
57
|
+
* container was chosen for a runtime it does not contain. `getRuntimeCommand` runs
|
|
58
|
+
* python3 for a `.py` file, so the image has to follow the file.
|
|
59
|
+
*/
|
|
60
|
+
const RUNTIME_IMAGES = {
|
|
61
|
+
python: 'python:3.12-slim',
|
|
62
|
+
node: 'node:20-slim',
|
|
63
|
+
shell: 'node:20-slim',
|
|
64
|
+
};
|
|
65
|
+
function defaultImageFor(runtime) {
|
|
66
|
+
return RUNTIME_IMAGES[runtime] ?? 'node:20-slim';
|
|
67
|
+
}
|
|
24
68
|
const DEFAULT_SANDBOX_CONFIG = {
|
|
25
69
|
image: 'node:20-slim',
|
|
26
70
|
cpuLimit: 1,
|
|
@@ -44,21 +88,33 @@ const DEFAULT_SANDBOX_CONFIG = {
|
|
|
44
88
|
*/
|
|
45
89
|
export async function executeInSandbox(scriptContent, scriptPath, env, args, config) {
|
|
46
90
|
const startTime = Date.now();
|
|
47
|
-
|
|
91
|
+
// The extension decides the RUNTIME, and the runtime decides the image (unless the
|
|
92
|
+
// caller named one), because the default image cannot run every runtime.
|
|
93
|
+
const ext = getScriptExtension(scriptPath);
|
|
94
|
+
const runtime = getRuntimeFromPath(`skill${ext}`);
|
|
95
|
+
const containerScript = containerScriptPath(ext);
|
|
96
|
+
const cfg = {
|
|
97
|
+
...DEFAULT_SANDBOX_CONFIG,
|
|
98
|
+
...config,
|
|
99
|
+
image: config?.image ?? defaultImageFor(runtime),
|
|
100
|
+
};
|
|
48
101
|
// Create temporary directory for the sandbox
|
|
49
|
-
const tmpDir = join(
|
|
102
|
+
const tmpDir = join(sandboxHostDir(), 'sandbox-exec', randomBytes(8).toString('hex'));
|
|
50
103
|
await mkdir(tmpDir, { recursive: true });
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
const
|
|
54
|
-
const hostScript = join(
|
|
104
|
+
// The REAL path, because a shared root may itself be a symlink (/tmp → /private/tmp)
|
|
105
|
+
// and the Docker VM resolves the path it is given, not the one this process used.
|
|
106
|
+
const sharedDir = await realpath(tmpDir).catch(() => tmpDir);
|
|
107
|
+
const hostScript = join(sharedDir, `skill${ext}`);
|
|
108
|
+
// Named so a timeout can kill the CONTAINER: the docker CLI is a separate process,
|
|
109
|
+
// and killing it leaves the script running inside the VM.
|
|
110
|
+
const containerName = `nuvira-sandbox-${randomBytes(6).toString('hex')}`;
|
|
55
111
|
try {
|
|
56
112
|
// Write script to temporary file
|
|
57
113
|
await writeFile(hostScript, scriptContent, 'utf-8');
|
|
58
114
|
// Build Docker command
|
|
59
|
-
const dockerArgs = buildDockerArgs(hostScript, containerScript, env, args, cfg);
|
|
115
|
+
const dockerArgs = buildDockerArgs(hostScript, containerScript, env, args, cfg, containerName);
|
|
60
116
|
// Execute in Docker
|
|
61
|
-
const result = await spawnDocker(dockerArgs, cfg.timeoutMs);
|
|
117
|
+
const result = await spawnDocker(dockerArgs, cfg.timeoutMs, containerName);
|
|
62
118
|
return {
|
|
63
119
|
success: result.exitCode === 0,
|
|
64
120
|
stdout: result.stdout,
|
|
@@ -80,22 +136,36 @@ export async function executeInSandbox(scriptContent, scriptPath, env, args, con
|
|
|
80
136
|
/**
|
|
81
137
|
* Build Docker arguments for sandboxed execution.
|
|
82
138
|
*/
|
|
83
|
-
function buildDockerArgs(hostScript, containerScript, env, args, config) {
|
|
139
|
+
function buildDockerArgs(hostScript, containerScript, env, args, config, name) {
|
|
84
140
|
const cfg = { ...DEFAULT_SANDBOX_CONFIG, ...config };
|
|
85
141
|
const dockerArgs = [
|
|
86
142
|
'run',
|
|
87
143
|
'--rm', // Auto-remove container after execution
|
|
144
|
+
...(name ? ['--name', name] : []), // So a timeout can kill THIS container
|
|
88
145
|
'--interactive', // Keep stdin open
|
|
89
146
|
`--memory=${cfg.memoryLimitMb}m`, // Memory limit
|
|
90
147
|
`--cpus=${cfg.cpuLimit}`, // CPU limit
|
|
91
148
|
`--network=${cfg.networkMode}`, // Network mode
|
|
92
149
|
`--read-only`, // Read-only root filesystem
|
|
93
150
|
`--tmpfs=/tmp:size=${cfg.diskLimitMb}m`, // Writable /tmp
|
|
94
|
-
`--
|
|
95
|
-
`--
|
|
96
|
-
|
|
97
|
-
|
|
151
|
+
// `--no-new-privileges` is NOT a Docker flag: the only way to ask for it is
|
|
152
|
+
// through `--security-opt`, and a current CLI (29.x) refuses the bare flag with
|
|
153
|
+
// "unknown flag" and exit 125, which failed EVERY sandboxed execution — the
|
|
154
|
+
// stream test asked for this and got "unknown flag: --no-new-privileges" instead
|
|
155
|
+
// of its script's output. `sandbox/manager.ts` already used the correct form.
|
|
156
|
+
`--security-opt=no-new-privileges:true`, // Prevent privilege escalation
|
|
98
157
|
];
|
|
158
|
+
// ONE FLAG PER CAPABILITY. Docker's `--cap-add` takes a single capability, so a
|
|
159
|
+
// comma-joined list is read as one name and rejected: `--cap-add=SETUID,SETGID`
|
|
160
|
+
// comes back as `invalid CapAdd: unknown capability: "CAP_SETUID,SETGID"` and the
|
|
161
|
+
// container never starts (exit 125). The default config sets capAdd to
|
|
162
|
+
// ['SETUID','SETGID'], so this failed EVERY sandboxed execution — measured with
|
|
163
|
+
// Docker 29.7.2 on aarch64. Only non-empty lists are pushed, because `--cap-add=``
|
|
164
|
+
// is likewise an invalid capability named "CAP_".
|
|
165
|
+
for (const cap of cfg.capDrop ?? [])
|
|
166
|
+
dockerArgs.push(`--cap-drop=${cap}`);
|
|
167
|
+
for (const cap of cfg.capAdd ?? [])
|
|
168
|
+
dockerArgs.push(`--cap-add=${cap}`);
|
|
99
169
|
// Mount the script into the container
|
|
100
170
|
dockerArgs.push('-v', `${hostScript}:${containerScript}:ro`);
|
|
101
171
|
// Add environment variables
|
|
@@ -119,7 +189,7 @@ function buildDockerArgs(hostScript, containerScript, env, args, config) {
|
|
|
119
189
|
/**
|
|
120
190
|
* Spawn Docker process with timeout and output capture.
|
|
121
191
|
*/
|
|
122
|
-
async function spawnDocker(args, timeoutMs) {
|
|
192
|
+
async function spawnDocker(args, timeoutMs, containerName) {
|
|
123
193
|
return new Promise((resolve, reject) => {
|
|
124
194
|
const child = spawn('docker', args, {
|
|
125
195
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
@@ -127,6 +197,14 @@ async function spawnDocker(args, timeoutMs) {
|
|
|
127
197
|
let stdout = '';
|
|
128
198
|
let stderr = '';
|
|
129
199
|
let killed = false;
|
|
200
|
+
let settled = false;
|
|
201
|
+
const finish = (payload) => {
|
|
202
|
+
if (settled)
|
|
203
|
+
return;
|
|
204
|
+
settled = true;
|
|
205
|
+
clearTimeout(timer);
|
|
206
|
+
resolve(payload);
|
|
207
|
+
};
|
|
130
208
|
// Capture stdout
|
|
131
209
|
child.stdout?.on('data', (data) => {
|
|
132
210
|
stdout += data.toString();
|
|
@@ -138,34 +216,37 @@ async function spawnDocker(args, timeoutMs) {
|
|
|
138
216
|
// Set timeout
|
|
139
217
|
const timer = setTimeout(() => {
|
|
140
218
|
killed = true;
|
|
141
|
-
|
|
142
|
-
//
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
219
|
+
// Kill the CONTAINER first. SIGTERM to the docker CLI only asks it to stop the
|
|
220
|
+
// container, which it waits for: with `sleep 10` inside, 'close' arrived when
|
|
221
|
+
// the SCRIPT finished, so a 1s timeout took 10s and the caller's 10s budget
|
|
222
|
+
// expired — the timeout never actually timed anything out.
|
|
223
|
+
if (containerName) {
|
|
224
|
+
try {
|
|
225
|
+
spawnSync('docker', ['kill', '--signal=SIGKILL', containerName], { stdio: 'ignore' });
|
|
226
|
+
}
|
|
227
|
+
catch {
|
|
228
|
+
/* best-effort: the container may have exited on its own */
|
|
146
229
|
}
|
|
147
|
-
}
|
|
230
|
+
}
|
|
231
|
+
child.kill('SIGKILL');
|
|
232
|
+
// 124 is the `timeout(1)` convention the caller expects, rather than the
|
|
233
|
+
// signal-derived code (137/143) the client happens to report.
|
|
234
|
+
finish({ stdout, stderr: stderr + '\n[Sandbox execution timed out]', exitCode: 124 });
|
|
148
235
|
}, timeoutMs);
|
|
149
236
|
// Handle completion
|
|
150
237
|
child.on('close', (code) => {
|
|
151
|
-
clearTimeout(timer);
|
|
152
238
|
if (killed) {
|
|
153
|
-
|
|
154
|
-
stdout,
|
|
155
|
-
stderr: stderr + '\n[Sandbox execution timed out]',
|
|
156
|
-
exitCode: code ?? 124,
|
|
157
|
-
});
|
|
239
|
+
finish({ stdout, stderr: stderr + '\n[Sandbox execution timed out]', exitCode: 124 });
|
|
158
240
|
}
|
|
159
241
|
else {
|
|
160
|
-
|
|
161
|
-
stdout,
|
|
162
|
-
stderr,
|
|
163
|
-
exitCode: code ?? 1,
|
|
164
|
-
});
|
|
242
|
+
finish({ stdout, stderr, exitCode: code ?? 1 });
|
|
165
243
|
}
|
|
166
244
|
});
|
|
167
245
|
// Handle errors
|
|
168
246
|
child.on('error', (err) => {
|
|
247
|
+
if (settled)
|
|
248
|
+
return;
|
|
249
|
+
settled = true;
|
|
169
250
|
clearTimeout(timer);
|
|
170
251
|
reject(err);
|
|
171
252
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-executor.js","sourceRoot":"","sources":["../../src/skills/sandbox-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"sandbox-executor.js","sourceRoot":"","sources":["../../src/skills/sandbox-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAU,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;;;;;GAYG;AACH,SAAS,cAAc;IACrB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IAChD,OAAO,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAC/F,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,mBAAmB,CAAC,GAAW;IACtC,OAAO,SAAS,GAAG,EAAE,CAAC;AACxB,CAAC;AAkCD,4EAA4E;AAE5E;;;;;;;GAOG;AACH,MAAM,cAAc,GAA2B;IAC7C,MAAM,EAAE,kBAAkB;IAC1B,IAAI,EAAE,cAAc;IACpB,KAAK,EAAE,cAAc;CACtB,CAAC;AAEF,SAAS,eAAe,CAAC,OAAe;IACtC,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,cAAc,CAAC;AACnD,CAAC;AAED,MAAM,sBAAsB,GAAkB;IAC5C,KAAK,EAAE,cAAc;IACrB,QAAQ,EAAE,CAAC;IACX,aAAa,EAAE,GAAG;IAClB,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,CAAC,KAAK,CAAC;IAChB,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,0BAA0B;CACzD,CAAC;AAEF,4EAA4E;AAE5E;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,aAAqB,EACrB,UAAkB,EAClB,GAA4B,EAC5B,IAAe,EACf,MAA+B;IAE/B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,mFAAmF;IACnF,yEAAyE;IACzE,MAAM,GAAG,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;IAClD,MAAM,eAAe,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,GAAG,GAAkB;QACzB,GAAG,sBAAsB;QACzB,GAAG,MAAM;QACT,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,eAAe,CAAC,OAAO,CAAC;KACjD,CAAC;IAEF,6CAA6C;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,qFAAqF;IACrF,kFAAkF;IAClF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC;IAElD,mFAAmF;IACnF,0DAA0D;IAC1D,MAAM,aAAa,GAAG,kBAAkB,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAEzE,IAAI,CAAC;QACH,iCAAiC;QACjC,MAAM,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAEpD,uBAAuB;QACvB,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QAE/F,oBAAoB;QACpB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,SAAU,EAAE,aAAa,CAAC,CAAC;QAE5E,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,QAAQ,KAAK,CAAC;YAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;SACnC,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,8BAA8B;QAC9B,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC;YACP,wBAAwB;QAC1B,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CACtB,UAAkB,EAClB,eAAuB,EACvB,GAA4B,EAC5B,IAAe,EACf,MAA+B,EAC/B,IAAa;IAEb,MAAM,GAAG,GAAG,EAAE,GAAG,sBAAsB,EAAE,GAAG,MAAM,EAAE,CAAC;IACrD,MAAM,UAAU,GAAa;QAC3B,KAAK;QACL,MAAM,EAA2B,wCAAwC;QACzE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,uCAAuC;QAC1E,eAAe,EAAkB,kBAAkB;QACnD,YAAY,GAAG,CAAC,aAAa,GAAG,EAAE,eAAe;QACjD,UAAU,GAAG,CAAC,QAAQ,EAAE,EAAS,YAAY;QAC7C,aAAa,GAAG,CAAC,WAAW,EAAE,EAAG,eAAe;QAChD,aAAa,EAAoB,4BAA4B;QAC7D,qBAAqB,GAAG,CAAC,WAAW,GAAG,EAAE,gBAAgB;QACzD,4EAA4E;QAC5E,gFAAgF;QAChF,4EAA4E;QAC5E,iFAAiF;QACjF,8EAA8E;QAC9E,uCAAuC,EAAE,+BAA+B;KACzE,CAAC;IAEF,gFAAgF;IAChF,gFAAgF;IAChF,kFAAkF;IAClF,uEAAuE;IACvE,gFAAgF;IAChF,mFAAmF;IACnF,kDAAkD;IAClD,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,EAAE;QAAE,UAAU,CAAC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;IAC1E,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,EAAE;QAAE,UAAU,CAAC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;IAExE,sCAAsC;IACtC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,UAAU,IAAI,eAAe,KAAK,CAAC,CAAC;IAE7D,4BAA4B;IAC5B,IAAI,GAAG,EAAE,CAAC;QACR,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,gBAAgB;IAChB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAM,CAAC,CAAC;IAE5B,6BAA6B;IAC7B,MAAM,OAAO,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC9C,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,EAAE,eAAe,CAAC,CAAC;IAEhD,uBAAuB;IACvB,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,WAAW,CACxB,IAAc,EACd,SAAiB,EACjB,aAAsB;IAEtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE;YAClC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAChC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,MAAM,MAAM,GAAG,CAAC,OAA6D,EAAQ,EAAE;YACrF,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC,CAAC;QAEF,iBAAiB;QACjB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACxC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,iBAAiB;QACjB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACxC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,cAAc;QACd,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,MAAM,GAAG,IAAI,CAAC;YACd,+EAA+E;YAC/E,8EAA8E;YAC9E,4EAA4E;YAC5E,2DAA2D;YAC3D,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,CAAC;oBACH,SAAS,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,kBAAkB,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACxF,CAAC;gBAAC,MAAM,CAAC;oBACP,2DAA2D;gBAC7D,CAAC;YACH,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtB,yEAAyE;YACzE,8DAA8D;YAC9D,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,iCAAiC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;QACxF,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,oBAAoB;QACpB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACzB,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,iCAAiC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACxF,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,gBAAgB;QAChB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,4EAA4E;AAE5E;;GAEG;AACH,SAAS,kBAAkB,CAAC,QAAgB;IAC1C,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC;IACrD,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,IAAI;YACP,OAAO,KAAK,CAAC;QACf,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf,KAAK,IAAI,CAAC;QACV,KAAK,MAAM;YACT,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CAAC,QAAgB;IAC1C,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC;IACrD,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,IAAI;YACP,OAAO,QAAQ,CAAC;QAClB,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,MAAM,CAAC;QAChB,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,MAAM,CAAC;QAChB,KAAK,IAAI;YACP,OAAO,MAAM,CAAC;QAChB,KAAK,IAAI;YACP,OAAO,IAAI,CAAC;QACd,KAAK,IAAI;YACP,OAAO,MAAM,CAAC;QAChB,KAAK,IAAI,CAAC;QACV,KAAK,MAAM;YACT,OAAO,OAAO,CAAC;QACjB;YACE,OAAO,OAAO,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CAAC,OAAe;IACxC,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,CAAC,SAAS,CAAC,CAAC;QACrB,KAAK,MAAM;YACT,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,KAAK,OAAO;YACV,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,KAAK,IAAI;YACP,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvB,KAAK,MAAM;YACT,+DAA+D;YAC/D,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxB;YACE,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED,4EAA4E;AAE5E;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IAKxC,IAAI,CAAC;QACH,kEAAkE;QAClE,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,aAAa,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,0BAA0B,EAAE,CAAC;QAChG,CAAC;QACD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAE5C,2EAA2E;QAC3E,kEAAkE;QAClE,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,UAAU,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO;gBACL,SAAS,EAAE,KAAK;gBAChB,OAAO;gBACP,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,8BAA8B;aAClE,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACtC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACxD,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAa;IAClD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAAa;IACnD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAC3D,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -17,9 +17,36 @@
|
|
|
17
17
|
import type { ToolContext } from '../registry.js';
|
|
18
18
|
import { type MotionCaption, type MotionFormat } from './motion.js';
|
|
19
19
|
export interface MotionToolArgs {
|
|
20
|
-
action?: 'render' | 'revise' | 'list' | 'presets';
|
|
20
|
+
action?: 'render' | 'revise' | 'list' | 'presets' | 'inspect';
|
|
21
21
|
html?: string;
|
|
22
22
|
html_path?: string;
|
|
23
|
+
/** Frames rendered by the CALLER's own program — see motion.ts. */
|
|
24
|
+
frames_dir?: string;
|
|
25
|
+
frames_pattern?: string;
|
|
26
|
+
/** An existing audio file (music, SFX, voice-over) muxed onto the video. */
|
|
27
|
+
audio_path?: string;
|
|
28
|
+
/**
|
|
29
|
+
* The command that produced `frames_dir` (e.g. `python render.py`).
|
|
30
|
+
*
|
|
31
|
+
* Recorded with the render, and re-run by a later `revise` so a revision gets
|
|
32
|
+
* FRESH frames instead of re-encoding the ones already on disk.
|
|
33
|
+
*/
|
|
34
|
+
renderer_command?: string;
|
|
35
|
+
/** Directory the renderer command runs in (defaults to the turn's cwd). */
|
|
36
|
+
renderer_cwd?: string;
|
|
37
|
+
/** How long the renderer may run before it is killed. */
|
|
38
|
+
renderer_timeout_ms?: number;
|
|
39
|
+
/** Revise even though the recorded renderer changed since the render was made. */
|
|
40
|
+
allow_renderer_change?: boolean;
|
|
41
|
+
/**
|
|
42
|
+
* action:'revise' on a frames render — show what WOULD run and change nothing.
|
|
43
|
+
*
|
|
44
|
+
* A revision executes a stored command, so "tell me first" has to be an option.
|
|
45
|
+
*/
|
|
46
|
+
preview?: boolean;
|
|
47
|
+
/** `inspect` options. */
|
|
48
|
+
tiles?: number;
|
|
49
|
+
tile_width?: number;
|
|
23
50
|
preset?: string;
|
|
24
51
|
params?: Record<string, unknown>;
|
|
25
52
|
data?: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-tool.d.ts","sourceRoot":"","sources":["../../../src/tools/modality/motion-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"motion-tool.d.ts","sourceRoot":"","sources":["../../../src/tools/modality/motion-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,YAAY,EAqBlB,MAAM,aAAa,CAAC;AAUrB,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kFAAkF;IAClF,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,+CAA+C;IAC/C,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CACzD;AA8RD;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0NtG"}
|