arc402-cli 0.9.18 → 0.10.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/README.md +41 -2
- package/dist/abis.d.ts +1 -0
- package/dist/abis.d.ts.map +1 -1
- package/dist/abis.js +45 -14
- package/dist/abis.js.map +1 -1
- package/dist/bundler.d.ts +1 -1
- package/dist/bundler.d.ts.map +1 -1
- package/dist/bundler.js +61 -27
- package/dist/bundler.js.map +1 -1
- package/dist/client.d.ts +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +9 -5
- package/dist/client.js.map +1 -1
- package/dist/coinbase-smart-wallet.js +4 -1
- package/dist/coinbase-smart-wallet.js.map +1 -1
- package/dist/commands/accept.js +28 -25
- package/dist/commands/accept.js.map +1 -1
- package/dist/commands/agent-handshake.js +18 -15
- package/dist/commands/agent-handshake.js.map +1 -1
- package/dist/commands/agent.js +104 -98
- package/dist/commands/agent.js.map +1 -1
- package/dist/commands/agreements.js +98 -62
- package/dist/commands/agreements.js.map +1 -1
- package/dist/commands/arbitrator.js +81 -45
- package/dist/commands/arbitrator.js.map +1 -1
- package/dist/commands/arena-handshake.d.ts.map +1 -1
- package/dist/commands/arena-handshake.js +35 -53
- package/dist/commands/arena-handshake.js.map +1 -1
- package/dist/commands/arena.js +18 -12
- package/dist/commands/arena.js.map +1 -1
- package/dist/commands/backup.js +36 -30
- package/dist/commands/backup.js.map +1 -1
- package/dist/commands/cancel.js +18 -15
- package/dist/commands/cancel.js.map +1 -1
- package/dist/commands/channel.js +81 -45
- package/dist/commands/channel.js.map +1 -1
- package/dist/commands/coldstart.js +34 -31
- package/dist/commands/coldstart.js.map +1 -1
- package/dist/commands/compute.d.ts +14 -0
- package/dist/commands/compute.d.ts.map +1 -0
- package/dist/commands/compute.js +466 -0
- package/dist/commands/compute.js.map +1 -0
- package/dist/commands/config.js +30 -24
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/contract-interaction.js +15 -12
- package/dist/commands/contract-interaction.js.map +1 -1
- package/dist/commands/daemon.d.ts.map +1 -1
- package/dist/commands/daemon.js +135 -98
- package/dist/commands/daemon.js.map +1 -1
- package/dist/commands/deliver.js +76 -37
- package/dist/commands/deliver.js.map +1 -1
- package/dist/commands/discover.js +27 -24
- package/dist/commands/discover.js.map +1 -1
- package/dist/commands/dispute.js +110 -104
- package/dist/commands/dispute.js.map +1 -1
- package/dist/commands/doctor.js +55 -16
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/endpoint.js +95 -56
- package/dist/commands/endpoint.js.map +1 -1
- package/dist/commands/feed.js +18 -11
- package/dist/commands/feed.js.map +1 -1
- package/dist/commands/hire.js +40 -37
- package/dist/commands/hire.js.map +1 -1
- package/dist/commands/migrate.js +33 -30
- package/dist/commands/migrate.js.map +1 -1
- package/dist/commands/negotiate.d.ts.map +1 -1
- package/dist/commands/negotiate.js +36 -34
- package/dist/commands/negotiate.js.map +1 -1
- package/dist/commands/openshell.js +104 -68
- package/dist/commands/openshell.js.map +1 -1
- package/dist/commands/owner.js +20 -17
- package/dist/commands/owner.js.map +1 -1
- package/dist/commands/policy.js +43 -41
- package/dist/commands/policy.js.map +1 -1
- package/dist/commands/relay.d.ts.map +1 -1
- package/dist/commands/relay.js +51 -18
- package/dist/commands/relay.js.map +1 -1
- package/dist/commands/remediate.js +23 -20
- package/dist/commands/remediate.js.map +1 -1
- package/dist/commands/reputation.js +27 -25
- package/dist/commands/reputation.js.map +1 -1
- package/dist/commands/setup.js +104 -65
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/trust.js +20 -17
- package/dist/commands/trust.js.map +1 -1
- package/dist/commands/verify.js +21 -18
- package/dist/commands/verify.js.map +1 -1
- package/dist/commands/wallet.d.ts.map +1 -1
- package/dist/commands/wallet.js +645 -679
- package/dist/commands/wallet.js.map +1 -1
- package/dist/commands/watch.js +36 -33
- package/dist/commands/watch.js.map +1 -1
- package/dist/commands/watchtower.js +73 -37
- package/dist/commands/watchtower.js.map +1 -1
- package/dist/commands/workroom.d.ts.map +1 -1
- package/dist/commands/workroom.js +282 -143
- package/dist/commands/workroom.js.map +1 -1
- package/dist/config.d.ts +3 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +71 -22
- package/dist/config.js.map +1 -1
- package/dist/daemon/compute-metering.d.ts +61 -0
- package/dist/daemon/compute-metering.d.ts.map +1 -0
- package/dist/daemon/compute-metering.js +299 -0
- package/dist/daemon/compute-metering.js.map +1 -0
- package/dist/daemon/compute-session.d.ts +100 -0
- package/dist/daemon/compute-session.d.ts.map +1 -0
- package/dist/daemon/compute-session.js +231 -0
- package/dist/daemon/compute-session.js.map +1 -0
- package/dist/daemon/config.d.ts +19 -1
- package/dist/daemon/config.d.ts.map +1 -1
- package/dist/daemon/config.js +90 -16
- package/dist/daemon/config.js.map +1 -1
- package/dist/daemon/credentials.d.ts +24 -0
- package/dist/daemon/credentials.d.ts.map +1 -0
- package/dist/daemon/credentials.js +80 -0
- package/dist/daemon/credentials.js.map +1 -0
- package/dist/daemon/delivery-client.d.ts +35 -0
- package/dist/daemon/delivery-client.d.ts.map +1 -0
- package/dist/daemon/delivery-client.js +231 -0
- package/dist/daemon/delivery-client.js.map +1 -0
- package/dist/daemon/file-delivery.d.ts +98 -0
- package/dist/daemon/file-delivery.d.ts.map +1 -0
- package/dist/daemon/file-delivery.js +461 -0
- package/dist/daemon/file-delivery.js.map +1 -0
- package/dist/daemon/hire-listener.d.ts +3 -3
- package/dist/daemon/hire-listener.d.ts.map +1 -1
- package/dist/daemon/hire-listener.js +47 -13
- package/dist/daemon/hire-listener.js.map +1 -1
- package/dist/daemon/index.d.ts +2 -1
- package/dist/daemon/index.d.ts.map +1 -1
- package/dist/daemon/index.js +526 -53
- package/dist/daemon/index.js.map +1 -1
- package/dist/daemon/job-lifecycle.d.ts +1 -1
- package/dist/daemon/job-lifecycle.d.ts.map +1 -1
- package/dist/daemon/job-lifecycle.js +51 -11
- package/dist/daemon/job-lifecycle.js.map +1 -1
- package/dist/daemon/notify.d.ts +1 -1
- package/dist/daemon/notify.d.ts.map +1 -1
- package/dist/daemon/notify.js +53 -19
- package/dist/daemon/notify.js.map +1 -1
- package/dist/daemon/token-metering.js +47 -8
- package/dist/daemon/token-metering.js.map +1 -1
- package/dist/daemon/userops.d.ts +2 -2
- package/dist/daemon/userops.d.ts.map +1 -1
- package/dist/daemon/userops.js +27 -23
- package/dist/daemon/userops.js.map +1 -1
- package/dist/daemon/wallet-monitor.d.ts +1 -1
- package/dist/daemon/wallet-monitor.d.ts.map +1 -1
- package/dist/daemon/wallet-monitor.js +12 -8
- package/dist/daemon/wallet-monitor.js.map +1 -1
- package/dist/daemon/worker-executor.d.ts +71 -0
- package/dist/daemon/worker-executor.d.ts.map +1 -0
- package/dist/daemon/worker-executor.js +382 -0
- package/dist/daemon/worker-executor.js.map +1 -0
- package/dist/drain-v4.js +64 -26
- package/dist/drain-v4.js.map +1 -1
- package/dist/endpoint-config.js +63 -20
- package/dist/endpoint-config.js.map +1 -1
- package/dist/endpoint-notify.js +48 -9
- package/dist/endpoint-notify.js.map +1 -1
- package/dist/index.js +50 -18
- package/dist/index.js.map +1 -1
- package/dist/openshell-runtime.d.ts.map +1 -1
- package/dist/openshell-runtime.js +82 -38
- package/dist/openshell-runtime.js.map +1 -1
- package/dist/program.d.ts.map +1 -1
- package/dist/program.js +85 -78
- package/dist/program.js.map +1 -1
- package/dist/repl.js +31 -25
- package/dist/repl.js.map +1 -1
- package/dist/signing.js +6 -3
- package/dist/signing.js.map +1 -1
- package/dist/telegram-notify.js +40 -3
- package/dist/telegram-notify.js.map +1 -1
- package/dist/tui/App.d.ts.map +1 -1
- package/dist/tui/App.js +56 -89
- package/dist/tui/App.js.map +1 -1
- package/dist/tui/Footer.js +7 -4
- package/dist/tui/Footer.js.map +1 -1
- package/dist/tui/Header.d.ts +1 -1
- package/dist/tui/Header.d.ts.map +1 -1
- package/dist/tui/Header.js +14 -9
- package/dist/tui/Header.js.map +1 -1
- package/dist/tui/InputLine.d.ts +2 -1
- package/dist/tui/InputLine.d.ts.map +1 -1
- package/dist/tui/InputLine.js +47 -97
- package/dist/tui/InputLine.js.map +1 -1
- package/dist/tui/Viewport.d.ts +1 -2
- package/dist/tui/Viewport.d.ts.map +1 -1
- package/dist/tui/Viewport.js +26 -6
- package/dist/tui/Viewport.js.map +1 -1
- package/dist/tui/WalletConnectPairing.js +19 -16
- package/dist/tui/WalletConnectPairing.js.map +1 -1
- package/dist/tui/components/Button.js +9 -6
- package/dist/tui/components/Button.js.map +1 -1
- package/dist/tui/components/CeremonyView.js +8 -5
- package/dist/tui/components/CeremonyView.js.map +1 -1
- package/dist/tui/components/CompletionDropdown.js +9 -6
- package/dist/tui/components/CompletionDropdown.js.map +1 -1
- package/dist/tui/components/ConfirmPrompt.js +8 -5
- package/dist/tui/components/ConfirmPrompt.js.map +1 -1
- package/dist/tui/components/CustomTextInput.js +14 -11
- package/dist/tui/components/CustomTextInput.js.map +1 -1
- package/dist/tui/components/InteractiveTable.js +12 -9
- package/dist/tui/components/InteractiveTable.js.map +1 -1
- package/dist/tui/components/StepSpinner.js +13 -10
- package/dist/tui/components/StepSpinner.js.map +1 -1
- package/dist/tui/components/Toast.js +12 -8
- package/dist/tui/components/Toast.js.map +1 -1
- package/dist/tui/index.d.ts.map +1 -1
- package/dist/tui/index.js +21 -28
- package/dist/tui/index.js.map +1 -1
- package/dist/tui/useChat.js +19 -13
- package/dist/tui/useChat.js.map +1 -1
- package/dist/tui/useCommand.d.ts +2 -3
- package/dist/tui/useCommand.d.ts.map +1 -1
- package/dist/tui/useCommand.js +24 -100
- package/dist/tui/useCommand.js.map +1 -1
- package/dist/tui/useNotifications.js +8 -5
- package/dist/tui/useNotifications.js.map +1 -1
- package/dist/tui/useScroll.d.ts.map +1 -1
- package/dist/tui/useScroll.js +12 -15
- package/dist/tui/useScroll.js.map +1 -1
- package/dist/ui/banner.d.ts +0 -12
- package/dist/ui/banner.d.ts.map +1 -1
- package/dist/ui/banner.js +19 -35
- package/dist/ui/banner.js.map +1 -1
- package/dist/ui/colors.js +19 -13
- package/dist/ui/colors.js.map +1 -1
- package/dist/ui/format.js +14 -6
- package/dist/ui/format.js.map +1 -1
- package/dist/ui/qr-render.js +11 -4
- package/dist/ui/qr-render.js.map +1 -1
- package/dist/ui/rpc-fallback.js +11 -6
- package/dist/ui/rpc-fallback.js.map +1 -1
- package/dist/ui/spinner.js +12 -6
- package/dist/ui/spinner.js.map +1 -1
- package/dist/ui/tree.js +6 -3
- package/dist/ui/tree.js.map +1 -1
- package/dist/utils/format.js +41 -27
- package/dist/utils/format.js.map +1 -1
- package/dist/utils/hash.js +42 -4
- package/dist/utils/hash.js.map +1 -1
- package/dist/utils/time.js +6 -2
- package/dist/utils/time.js.map +1 -1
- package/dist/wallet-router.d.ts +1 -1
- package/dist/wallet-router.d.ts.map +1 -1
- package/dist/wallet-router.js +19 -12
- package/dist/wallet-router.js.map +1 -1
- package/dist/walletconnect-session.d.ts +1 -1
- package/dist/walletconnect-session.d.ts.map +1 -1
- package/dist/walletconnect-session.js +11 -6
- package/dist/walletconnect-session.js.map +1 -1
- package/dist/walletconnect.d.ts +5 -6
- package/dist/walletconnect.d.ts.map +1 -1
- package/dist/walletconnect.js +35 -32
- package/dist/walletconnect.js.map +1 -1
- package/package.json +11 -10
- package/INK6-UX-SPEC.md +0 -446
- package/MIGRATION-SPEC.md +0 -108
- package/TUI-SPEC.md +0 -214
- package/scripts/authorize-machine-key.ts +0 -43
- package/scripts/drain-wallet.ts +0 -149
- package/scripts/execute-spend-only.ts +0 -81
- package/scripts/register-agent-userop.ts +0 -186
- package/src/abis.ts +0 -187
- package/src/bundler.ts +0 -235
- package/src/client.ts +0 -36
- package/src/coinbase-smart-wallet.ts +0 -51
- package/src/commands/accept.ts +0 -64
- package/src/commands/agent-handshake.ts +0 -72
- package/src/commands/agent.ts +0 -691
- package/src/commands/agreements.ts +0 -350
- package/src/commands/arbitrator.ts +0 -180
- package/src/commands/arena-handshake.ts +0 -274
- package/src/commands/arena.ts +0 -122
- package/src/commands/backup.ts +0 -117
- package/src/commands/cancel.ts +0 -35
- package/src/commands/channel.ts +0 -218
- package/src/commands/coldstart.ts +0 -165
- package/src/commands/config.ts +0 -68
- package/src/commands/contract-interaction.ts +0 -166
- package/src/commands/daemon.ts +0 -1054
- package/src/commands/deliver.ts +0 -148
- package/src/commands/discover.ts +0 -350
- package/src/commands/dispute.ts +0 -375
- package/src/commands/doctor.ts +0 -172
- package/src/commands/endpoint.ts +0 -620
- package/src/commands/feed.ts +0 -229
- package/src/commands/hire.ts +0 -245
- package/src/commands/migrate.ts +0 -177
- package/src/commands/negotiate.ts +0 -272
- package/src/commands/openshell.ts +0 -1055
- package/src/commands/owner.ts +0 -35
- package/src/commands/policy.ts +0 -263
- package/src/commands/relay.ts +0 -277
- package/src/commands/remediate.ts +0 -24
- package/src/commands/reputation.ts +0 -79
- package/src/commands/setup.ts +0 -343
- package/src/commands/trust.ts +0 -27
- package/src/commands/verify.ts +0 -91
- package/src/commands/wallet.ts +0 -3548
- package/src/commands/watch.ts +0 -220
- package/src/commands/watchtower.ts +0 -248
- package/src/commands/workroom.ts +0 -963
- package/src/config.ts +0 -220
- package/src/daemon/config.ts +0 -344
- package/src/daemon/hire-listener.ts +0 -226
- package/src/daemon/index.ts +0 -1089
- package/src/daemon/job-lifecycle.ts +0 -215
- package/src/daemon/notify.ts +0 -297
- package/src/daemon/token-metering.ts +0 -183
- package/src/daemon/userops.ts +0 -119
- package/src/daemon/wallet-monitor.ts +0 -90
- package/src/drain-v4.ts +0 -159
- package/src/endpoint-config.ts +0 -83
- package/src/endpoint-notify.ts +0 -129
- package/src/index.ts +0 -74
- package/src/openshell-runtime.ts +0 -281
- package/src/program.ts +0 -88
- package/src/repl.ts +0 -178
- package/src/signing.ts +0 -28
- package/src/telegram-notify.ts +0 -88
- package/src/tui/App.tsx +0 -263
- package/src/tui/Footer.tsx +0 -18
- package/src/tui/Header.tsx +0 -45
- package/src/tui/InputLine.tsx +0 -243
- package/src/tui/Viewport.tsx +0 -51
- package/src/tui/WalletConnectPairing.tsx +0 -114
- package/src/tui/components/Button.tsx +0 -38
- package/src/tui/components/CeremonyView.tsx +0 -39
- package/src/tui/components/CompletionDropdown.tsx +0 -56
- package/src/tui/components/ConfirmPrompt.tsx +0 -36
- package/src/tui/components/CustomTextInput.tsx +0 -132
- package/src/tui/components/InteractiveTable.tsx +0 -106
- package/src/tui/components/StepSpinner.tsx +0 -84
- package/src/tui/components/Toast.tsx +0 -59
- package/src/tui/index.tsx +0 -90
- package/src/tui/useChat.ts +0 -103
- package/src/tui/useCommand.ts +0 -238
- package/src/tui/useNotifications.ts +0 -28
- package/src/tui/useScroll.ts +0 -69
- package/src/ui/banner.ts +0 -78
- package/src/ui/colors.ts +0 -30
- package/src/ui/format.ts +0 -78
- package/src/ui/qr-render.ts +0 -92
- package/src/ui/rpc-fallback.ts +0 -59
- package/src/ui/spinner.ts +0 -56
- package/src/ui/tree.ts +0 -16
- package/src/utils/format.ts +0 -48
- package/src/utils/hash.ts +0 -5
- package/src/utils/time.ts +0 -15
- package/src/wallet-router.ts +0 -178
- package/src/walletconnect-session.ts +0 -27
- package/src/walletconnect.ts +0 -309
- package/test/time.test.js +0 -11
- package/tsconfig.json +0 -33
|
@@ -1,3 +1,42 @@
|
|
|
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.getUsageReportPath = getUsageReportPath;
|
|
37
|
+
exports.prepareUsageReport = prepareUsageReport;
|
|
38
|
+
exports.readUsageReport = readUsageReport;
|
|
39
|
+
exports.formatUsageReport = formatUsageReport;
|
|
1
40
|
/**
|
|
2
41
|
* ARC-402 Token Usage Metering
|
|
3
42
|
*
|
|
@@ -20,9 +59,9 @@
|
|
|
20
59
|
* is responsible for reporting its own usage. OpenClaw agents can do this
|
|
21
60
|
* natively via session metadata.
|
|
22
61
|
*/
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
62
|
+
const fs = __importStar(require("fs"));
|
|
63
|
+
const path = __importStar(require("path"));
|
|
64
|
+
const os = __importStar(require("os"));
|
|
26
65
|
const ARC402_DIR = path.join(os.homedir(), ".arc402");
|
|
27
66
|
const JOBS_DIR = path.join(ARC402_DIR, "jobs");
|
|
28
67
|
// ─── Known model pricing (USD per 1M tokens, as of 2026-03) ──────────────────
|
|
@@ -44,21 +83,21 @@ const MODEL_PRICING = {
|
|
|
44
83
|
};
|
|
45
84
|
function estimateCost(model, inputTokens, outputTokens) {
|
|
46
85
|
const pricing = MODEL_PRICING[model] ?? MODEL_PRICING["default"];
|
|
47
|
-
return (inputTokens * pricing.input + outputTokens * pricing.output) /
|
|
86
|
+
return (inputTokens * pricing.input + outputTokens * pricing.output) / 1000000;
|
|
48
87
|
}
|
|
49
88
|
// ─── Usage report path ────────────────────────────────────────────────────────
|
|
50
89
|
/**
|
|
51
90
|
* Get the path where the worker should write token usage for an agreement.
|
|
52
91
|
* The daemon sets this as an env var before calling exec_command.
|
|
53
92
|
*/
|
|
54
|
-
|
|
93
|
+
function getUsageReportPath(agreementId) {
|
|
55
94
|
return path.join(JOBS_DIR, `agreement-${agreementId}`, "token-usage.jsonl");
|
|
56
95
|
}
|
|
57
96
|
/**
|
|
58
97
|
* Create the parent directory and return the path.
|
|
59
98
|
* Called by the daemon before spawning the worker.
|
|
60
99
|
*/
|
|
61
|
-
|
|
100
|
+
function prepareUsageReport(agreementId) {
|
|
62
101
|
const reportPath = getUsageReportPath(agreementId);
|
|
63
102
|
fs.mkdirSync(path.dirname(reportPath), { recursive: true });
|
|
64
103
|
return reportPath;
|
|
@@ -68,7 +107,7 @@ export function prepareUsageReport(agreementId) {
|
|
|
68
107
|
* Read the token usage report for an agreement and aggregate totals.
|
|
69
108
|
* Returns null if no report exists.
|
|
70
109
|
*/
|
|
71
|
-
|
|
110
|
+
function readUsageReport(agreementId) {
|
|
72
111
|
const reportPath = getUsageReportPath(agreementId);
|
|
73
112
|
if (!fs.existsSync(reportPath))
|
|
74
113
|
return null;
|
|
@@ -120,7 +159,7 @@ export function readUsageReport(agreementId) {
|
|
|
120
159
|
/**
|
|
121
160
|
* Format token usage for CLI display.
|
|
122
161
|
*/
|
|
123
|
-
|
|
162
|
+
function formatUsageReport(usage) {
|
|
124
163
|
const lines = [];
|
|
125
164
|
lines.push(`Token Usage`);
|
|
126
165
|
lines.push(`───────────`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-metering.js","sourceRoot":"","sources":["../../src/daemon/token-metering.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token-metering.js","sourceRoot":"","sources":["../../src/daemon/token-metering.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/userops.d.ts
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
* Wraps protocol calls (accept, fulfill) into ERC-4337 UserOperations.
|
|
4
4
|
*/
|
|
5
5
|
import { ethers } from "ethers";
|
|
6
|
-
import type { UserOperation } from "../bundler
|
|
7
|
-
import type { DaemonConfig } from "./config
|
|
6
|
+
import type { UserOperation } from "../bundler";
|
|
7
|
+
import type { DaemonConfig } from "./config";
|
|
8
8
|
export declare function encodeWalletCall(target: string, innerCalldata: string, value?: bigint): string;
|
|
9
9
|
export declare function buildAcceptCalldata(serviceAgreementAddress: string, agreementId: string, walletAddress: string): string;
|
|
10
10
|
export declare function buildFulfillCalldata(serviceAgreementAddress: string, agreementId: string, deliveryHash: string, walletAddress: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userops.d.ts","sourceRoot":"","sources":["../../src/daemon/userops.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"userops.d.ts","sourceRoot":"","sources":["../../src/daemon/userops.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAY7C,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,SAAY,GAChB,MAAM,CASR;AAED,wBAAgB,mBAAmB,CACjC,uBAAuB,EAAE,MAAM,EAC/B,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACpB,MAAM,CAGR;AAED,wBAAgB,oBAAoB,CAClC,uBAAuB,EAAE,MAAM,EAC/B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,MAAM,CAGR;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ;IAarD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAwB3E,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK/D,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;CActC"}
|
package/dist/daemon/userops.js
CHANGED
|
@@ -1,60 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UserOpsManager = void 0;
|
|
4
|
+
exports.encodeWalletCall = encodeWalletCall;
|
|
5
|
+
exports.buildAcceptCalldata = buildAcceptCalldata;
|
|
6
|
+
exports.buildFulfillCalldata = buildFulfillCalldata;
|
|
1
7
|
/**
|
|
2
8
|
* UserOperation builder and submitter for the ARC-402 daemon.
|
|
3
9
|
* Wraps protocol calls (accept, fulfill) into ERC-4337 UserOperations.
|
|
4
10
|
*/
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
11
|
+
const ethers_1 = require("ethers");
|
|
12
|
+
const bundler_1 = require("../bundler");
|
|
13
|
+
const abis_1 = require("../abis");
|
|
8
14
|
// ServiceAgreement calldata encoders
|
|
9
|
-
const SA_IFACE = new ethers.Interface([
|
|
15
|
+
const SA_IFACE = new ethers_1.ethers.Interface([
|
|
10
16
|
"function accept(uint256 agreementId) external",
|
|
11
17
|
"function fulfill(uint256 agreementId, bytes32 actualDeliverablesHash) external",
|
|
12
18
|
]);
|
|
13
19
|
// ARC402Wallet.executeContractCall param type
|
|
14
|
-
const WALLET_EXEC_IFACE = new ethers.Interface(ARC402_WALLET_EXECUTE_ABI);
|
|
15
|
-
|
|
20
|
+
const WALLET_EXEC_IFACE = new ethers_1.ethers.Interface(abis_1.ARC402_WALLET_EXECUTE_ABI);
|
|
21
|
+
function encodeWalletCall(target, innerCalldata, value = BigInt(0)) {
|
|
16
22
|
return WALLET_EXEC_IFACE.encodeFunctionData("executeContractCall", [{
|
|
17
23
|
target,
|
|
18
24
|
data: innerCalldata,
|
|
19
25
|
value,
|
|
20
26
|
minReturnValue: BigInt(0),
|
|
21
27
|
maxApprovalAmount: BigInt(0),
|
|
22
|
-
approvalToken: ethers.ZeroAddress,
|
|
28
|
+
approvalToken: ethers_1.ethers.ZeroAddress,
|
|
23
29
|
}]);
|
|
24
30
|
}
|
|
25
|
-
|
|
31
|
+
function buildAcceptCalldata(serviceAgreementAddress, agreementId, walletAddress) {
|
|
26
32
|
const inner = SA_IFACE.encodeFunctionData("accept", [BigInt(agreementId)]);
|
|
27
33
|
return encodeWalletCall(serviceAgreementAddress, inner);
|
|
28
34
|
}
|
|
29
|
-
|
|
35
|
+
function buildFulfillCalldata(serviceAgreementAddress, agreementId, deliveryHash, walletAddress) {
|
|
30
36
|
const inner = SA_IFACE.encodeFunctionData("fulfill", [BigInt(agreementId), deliveryHash]);
|
|
31
37
|
return encodeWalletCall(serviceAgreementAddress, inner);
|
|
32
38
|
}
|
|
33
|
-
|
|
34
|
-
bundlerClient;
|
|
35
|
-
provider;
|
|
36
|
-
config;
|
|
39
|
+
class UserOpsManager {
|
|
37
40
|
constructor(config, provider) {
|
|
38
41
|
this.config = config;
|
|
39
42
|
this.provider = provider;
|
|
40
43
|
const bundlerUrl = config.bundler.endpoint || "https://api.pimlico.io/v2/base/rpc";
|
|
41
|
-
this.bundlerClient = new BundlerClient(bundlerUrl, config.network.entry_point, config.network.chain_id);
|
|
44
|
+
this.bundlerClient = new bundler_1.BundlerClient(bundlerUrl, config.network.entry_point, config.network.chain_id);
|
|
42
45
|
}
|
|
43
46
|
async buildUserOp(callData, senderWallet) {
|
|
44
|
-
const entryPointContract = new ethers.Contract(this.config.network.entry_point, ["function getNonce(address sender, uint192 key) external view returns (uint256)"], this.provider);
|
|
47
|
+
const entryPointContract = new ethers_1.ethers.Contract(this.config.network.entry_point, ["function getNonce(address sender, uint192 key) external view returns (uint256)"], this.provider);
|
|
45
48
|
const nonce = await entryPointContract.getNonce(senderWallet, 0);
|
|
46
49
|
const feeData = await this.provider.getFeeData();
|
|
47
|
-
const maxFeePerGas = feeData.maxFeePerGas ?? BigInt(
|
|
48
|
-
const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? BigInt(
|
|
50
|
+
const maxFeePerGas = feeData.maxFeePerGas ?? BigInt(1000000000);
|
|
51
|
+
const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? BigInt(100000000);
|
|
49
52
|
return {
|
|
50
53
|
sender: senderWallet,
|
|
51
|
-
nonce: ethers.toBeHex(nonce),
|
|
54
|
+
nonce: ethers_1.ethers.toBeHex(nonce),
|
|
52
55
|
callData,
|
|
53
|
-
callGasLimit: ethers.toBeHex(
|
|
54
|
-
verificationGasLimit: ethers.toBeHex(
|
|
55
|
-
preVerificationGas: ethers.toBeHex(
|
|
56
|
-
maxFeePerGas: ethers.toBeHex(maxFeePerGas),
|
|
57
|
-
maxPriorityFeePerGas: ethers.toBeHex(maxPriorityFeePerGas),
|
|
56
|
+
callGasLimit: ethers_1.ethers.toBeHex(300000),
|
|
57
|
+
verificationGasLimit: ethers_1.ethers.toBeHex(150000),
|
|
58
|
+
preVerificationGas: ethers_1.ethers.toBeHex(50000),
|
|
59
|
+
maxFeePerGas: ethers_1.ethers.toBeHex(maxFeePerGas),
|
|
60
|
+
maxPriorityFeePerGas: ethers_1.ethers.toBeHex(maxPriorityFeePerGas),
|
|
58
61
|
signature: "0x",
|
|
59
62
|
};
|
|
60
63
|
}
|
|
@@ -81,4 +84,5 @@ export class UserOpsManager {
|
|
|
81
84
|
}
|
|
82
85
|
}
|
|
83
86
|
}
|
|
87
|
+
exports.UserOpsManager = UserOpsManager;
|
|
84
88
|
//# sourceMappingURL=userops.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userops.js","sourceRoot":"","sources":["../../src/daemon/userops.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"userops.js","sourceRoot":"","sources":["../../src/daemon/userops.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Steps 4 and 5 of the daemon startup sequence (Spec 32 §3).
|
|
4
4
|
*/
|
|
5
5
|
import { ethers } from "ethers";
|
|
6
|
-
import type { DaemonConfig } from "./config
|
|
6
|
+
import type { DaemonConfig } from "./config";
|
|
7
7
|
export interface WalletStatus {
|
|
8
8
|
contractAddress: string;
|
|
9
9
|
ownerAddress: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-monitor.d.ts","sourceRoot":"","sources":["../../src/daemon/wallet-monitor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"wallet-monitor.d.ts","sourceRoot":"","sources":["../../src/daemon/wallet-monitor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAM7C,MAAM,WAAW,YAAY;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC,CA0DvB;AAED,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,CAGjB"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.verifyWallet = verifyWallet;
|
|
4
|
+
exports.getWalletBalance = getWalletBalance;
|
|
1
5
|
/**
|
|
2
6
|
* Wallet monitor — verifies wallet contract exists and is operational.
|
|
3
7
|
* Steps 4 and 5 of the daemon startup sequence (Spec 32 §3).
|
|
4
8
|
*/
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
9
|
+
const ethers_1 = require("ethers");
|
|
10
|
+
const abis_1 = require("../abis");
|
|
11
|
+
async function verifyWallet(config, provider, machineKeyAddress) {
|
|
8
12
|
const { contract_address, owner_address } = config.wallet;
|
|
9
13
|
// Step 4: Verify wallet contract exists
|
|
10
14
|
const code = await provider.getCode(contract_address);
|
|
11
15
|
if (code === "0x") {
|
|
12
16
|
throw new Error(`No contract at wallet address ${contract_address}`);
|
|
13
17
|
}
|
|
14
|
-
const guardianContract = new ethers.Contract(contract_address, ARC402_WALLET_GUARDIAN_ABI, provider);
|
|
18
|
+
const guardianContract = new ethers_1.ethers.Contract(contract_address, abis_1.ARC402_WALLET_GUARDIAN_ABI, provider);
|
|
15
19
|
// Verify owner matches config (if owner_address is set)
|
|
16
20
|
if (owner_address) {
|
|
17
21
|
const onChainOwner = await guardianContract.owner();
|
|
@@ -28,7 +32,7 @@ export async function verifyWallet(config, provider, machineKeyAddress) {
|
|
|
28
32
|
// Check machine key authorization (best effort — v1 wallets may not have registry)
|
|
29
33
|
let machineKeyAuthorized = false;
|
|
30
34
|
try {
|
|
31
|
-
const machineKeyContract = new ethers.Contract(contract_address, ARC402_WALLET_MACHINE_KEY_ABI, provider);
|
|
35
|
+
const machineKeyContract = new ethers_1.ethers.Contract(contract_address, abis_1.ARC402_WALLET_MACHINE_KEY_ABI, provider);
|
|
32
36
|
machineKeyAuthorized = await machineKeyContract.authorizedMachineKeys(machineKeyAddress);
|
|
33
37
|
}
|
|
34
38
|
catch {
|
|
@@ -37,7 +41,7 @@ export async function verifyWallet(config, provider, machineKeyAddress) {
|
|
|
37
41
|
}
|
|
38
42
|
// Get ETH balance
|
|
39
43
|
const balanceBig = await provider.getBalance(contract_address);
|
|
40
|
-
const ethBalance = ethers.formatEther(balanceBig);
|
|
44
|
+
const ethBalance = ethers_1.ethers.formatEther(balanceBig);
|
|
41
45
|
return {
|
|
42
46
|
contractAddress: contract_address,
|
|
43
47
|
ownerAddress: onChainOwner,
|
|
@@ -46,8 +50,8 @@ export async function verifyWallet(config, provider, machineKeyAddress) {
|
|
|
46
50
|
ethBalance,
|
|
47
51
|
};
|
|
48
52
|
}
|
|
49
|
-
|
|
53
|
+
async function getWalletBalance(contractAddress, provider) {
|
|
50
54
|
const balanceBig = await provider.getBalance(contractAddress);
|
|
51
|
-
return ethers.formatEther(balanceBig);
|
|
55
|
+
return ethers_1.ethers.formatEther(balanceBig);
|
|
52
56
|
}
|
|
53
57
|
//# sourceMappingURL=wallet-monitor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-monitor.js","sourceRoot":"","sources":["../../src/daemon/wallet-monitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wallet-monitor.js","sourceRoot":"","sources":["../../src/daemon/wallet-monitor.ts"],"names":[],"mappings":";;AAmBA,oCA8DC;AAED,4CAMC;AAzFD;;;GAGG;AACH,mCAAgC;AAEhC,kCAGiB;AAUV,KAAK,UAAU,YAAY,CAChC,MAAoB,EACpB,QAAyB,EACzB,iBAAyB;IAEzB,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC;IAE1D,wCAAwC;IACxC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACtD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iCAAiC,gBAAgB,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,eAAM,CAAC,QAAQ,CAC1C,gBAAgB,EAChB,iCAA0B,EAC1B,QAAQ,CACT,CAAC;IAEF,wDAAwD;IACxD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,YAAY,GAAW,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC5D,IAAI,YAAY,CAAC,WAAW,EAAE,KAAK,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CACb,kCAAkC,aAAa,eAAe,YAAY,EAAE,CAC7E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAW,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAE5D,qCAAqC;IACrC,MAAM,MAAM,GAAY,MAAM,gBAAgB,CAAC,MAAM,EAAE,CAAC;IACxD,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAED,mFAAmF;IACnF,IAAI,oBAAoB,GAAG,KAAK,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,kBAAkB,GAAG,IAAI,eAAM,CAAC,QAAQ,CAC5C,gBAAgB,EAChB,oCAA6B,EAC7B,QAAQ,CACT,CAAC;QACF,oBAAoB,GAAG,MAAM,kBAAkB,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAC3F,CAAC;IAAC,MAAM,CAAC;QACP,4EAA4E;QAC5E,oBAAoB,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,kBAAkB;IAClB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,eAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAElD,OAAO;QACL,eAAe,EAAE,gBAAgB;QACjC,YAAY,EAAE,YAAY;QAC1B,QAAQ,EAAE,KAAK;QACf,oBAAoB;QACpB,UAAU;KACX,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,gBAAgB,CACpC,eAAuB,EACvB,QAAyB;IAEzB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAC9D,OAAO,eAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { FileDeliveryManager } from "./file-delivery.js";
|
|
2
|
+
export type WorkerStatus = "queued" | "running" | "completed" | "failed";
|
|
3
|
+
export type AgentType = "openclaw" | "claude-code" | "codex" | "shell";
|
|
4
|
+
export interface WorkerExecution {
|
|
5
|
+
agreementId: string;
|
|
6
|
+
capability: string;
|
|
7
|
+
specHash: string;
|
|
8
|
+
jobDir: string;
|
|
9
|
+
agentType: AgentType;
|
|
10
|
+
pid: number | null;
|
|
11
|
+
status: WorkerStatus;
|
|
12
|
+
startedAt: number;
|
|
13
|
+
completedAt: number | null;
|
|
14
|
+
exitCode: number | null;
|
|
15
|
+
deliverableHash: string | null;
|
|
16
|
+
error: string | null;
|
|
17
|
+
}
|
|
18
|
+
export declare class WorkerExecutor {
|
|
19
|
+
private readonly maxConcurrentJobs;
|
|
20
|
+
private readonly jobTimeoutMs;
|
|
21
|
+
private readonly agentType;
|
|
22
|
+
private readonly autoExecute;
|
|
23
|
+
private readonly delivery;
|
|
24
|
+
private readonly jobs;
|
|
25
|
+
private queue;
|
|
26
|
+
private runningCount;
|
|
27
|
+
onJobCompleted: ((agreementId: string, rootHash: string) => void) | null;
|
|
28
|
+
onJobFailed: ((agreementId: string, error: string) => void) | null;
|
|
29
|
+
log: (entry: Record<string, unknown>) => void;
|
|
30
|
+
constructor(opts: {
|
|
31
|
+
maxConcurrentJobs?: number;
|
|
32
|
+
jobTimeoutSeconds?: number;
|
|
33
|
+
agentType?: AgentType;
|
|
34
|
+
autoExecute?: boolean;
|
|
35
|
+
delivery: FileDeliveryManager;
|
|
36
|
+
});
|
|
37
|
+
/**
|
|
38
|
+
* Enqueue a job. If auto_execute is true, starts immediately (up to concurrency limit).
|
|
39
|
+
* Returns the WorkerExecution record.
|
|
40
|
+
*/
|
|
41
|
+
enqueue(params: {
|
|
42
|
+
agreementId: string;
|
|
43
|
+
capability: string;
|
|
44
|
+
specHash: string;
|
|
45
|
+
taskDescription?: string;
|
|
46
|
+
}): WorkerExecution;
|
|
47
|
+
/**
|
|
48
|
+
* Get current status of a job.
|
|
49
|
+
*/
|
|
50
|
+
getStatus(agreementId: string): WorkerExecution | null;
|
|
51
|
+
/**
|
|
52
|
+
* Get all jobs (for status IPC command).
|
|
53
|
+
*/
|
|
54
|
+
listAll(): WorkerExecution[];
|
|
55
|
+
/**
|
|
56
|
+
* Read job log contents (for worker-logs IPC command).
|
|
57
|
+
*/
|
|
58
|
+
readLog(agreementId: string, tail?: number): string;
|
|
59
|
+
/**
|
|
60
|
+
* Cancel a queued job. Cannot cancel running jobs.
|
|
61
|
+
*/
|
|
62
|
+
cancel(agreementId: string): boolean;
|
|
63
|
+
private drainQueue;
|
|
64
|
+
private runJob;
|
|
65
|
+
private spawnAgent;
|
|
66
|
+
private buildCommand;
|
|
67
|
+
private buildTask;
|
|
68
|
+
private collectDeliverables;
|
|
69
|
+
private toPublic;
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=worker-executor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-executor.d.ts","sourceRoot":"","sources":["../../src/daemon/worker-executor.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,mBAAmB,EAAyB,MAAM,oBAAoB,CAAC;AAwChF,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;AACzE,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,aAAa,GAAG,OAAO,GAAG,OAAO,CAAC;AAEvE,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AASD,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAE/C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsC;IAC3D,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,YAAY,CAAK;IAGzB,cAAc,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAChF,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC1E,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAY;gBAE7C,IAAI,EAAE;QAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,QAAQ,EAAE,mBAAmB,CAAC;KAC/B;IAUD;;;OAGG;IACH,OAAO,CAAC,MAAM,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,GAAG,eAAe;IA0CnB;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI;IAKtD;;OAEG;IACH,OAAO,IAAI,eAAe,EAAE;IAI5B;;OAEG;IACH,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,SAAM,GAAG,MAAM;IAYhD;;OAEG;IACH,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAapC,OAAO,CAAC,UAAU;YASJ,MAAM;IAsDpB,OAAO,CAAC,UAAU;IAiDlB,OAAO,CAAC,YAAY;IA6BpB,OAAO,CAAC,SAAS;YAyCH,mBAAmB;IAcjC,OAAO,CAAC,QAAQ;CAKjB"}
|