@tloncorp/openclaw 0.1.0 → 0.4.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 +232 -23
- package/dist/index.js +292 -43
- package/dist/index.js.map +1 -1
- package/dist/setup-api.js +3 -0
- package/dist/setup-api.js.map +1 -0
- package/dist/setup-entry.js +4 -0
- package/dist/setup-entry.js.map +1 -0
- package/dist/src/actions.js +30 -8
- package/dist/src/actions.js.map +1 -1
- package/dist/src/channel.js +156 -373
- package/dist/src/channel.js.map +1 -1
- package/dist/src/channel.runtime.js +142 -0
- package/dist/src/channel.runtime.js.map +1 -0
- package/dist/src/config-schema.js +41 -1
- package/dist/src/config-schema.js.map +1 -1
- package/dist/src/effective-owner.js +22 -0
- package/dist/src/effective-owner.js.map +1 -0
- package/dist/src/gateway-status.js +72 -0
- package/dist/src/gateway-status.js.map +1 -0
- package/dist/src/monitor/approval.js +194 -96
- package/dist/src/monitor/approval.js.map +1 -1
- package/dist/src/monitor/command-auth.js +62 -0
- package/dist/src/monitor/command-auth.js.map +1 -0
- package/dist/src/monitor/command-bridge.js +27 -0
- package/dist/src/monitor/command-bridge.js.map +1 -0
- package/dist/src/monitor/computing-presence.js +221 -0
- package/dist/src/monitor/computing-presence.js.map +1 -0
- package/dist/src/monitor/discovery.js +17 -9
- package/dist/src/monitor/discovery.js.map +1 -1
- package/dist/src/monitor/index.js +960 -251
- package/dist/src/monitor/index.js.map +1 -1
- package/dist/src/monitor/media.js +195 -30
- package/dist/src/monitor/media.js.map +1 -1
- package/dist/src/monitor/nudge-runner.js +232 -0
- package/dist/src/monitor/nudge-runner.js.map +1 -0
- package/dist/src/monitor/nudge-state.js +58 -0
- package/dist/src/monitor/nudge-state.js.map +1 -0
- package/dist/src/monitor/owner-reply-persistence.js +92 -0
- package/dist/src/monitor/owner-reply-persistence.js.map +1 -0
- package/dist/src/monitor/pending-nudge-persistence.js +15 -0
- package/dist/src/monitor/pending-nudge-persistence.js.map +1 -0
- package/dist/src/monitor/settings-sync.js +28 -0
- package/dist/src/monitor/settings-sync.js.map +1 -0
- package/dist/src/monitor/utils.js +21 -4
- package/dist/src/monitor/utils.js.map +1 -1
- package/dist/src/nudge-decision.js +309 -0
- package/dist/src/nudge-decision.js.map +1 -0
- package/dist/src/nudge-messages.js +25 -0
- package/dist/src/nudge-messages.js.map +1 -0
- package/dist/src/nudge-scheduler.js +91 -0
- package/dist/src/nudge-scheduler.js.map +1 -0
- package/dist/src/pending-nudge.js +57 -0
- package/dist/src/pending-nudge.js.map +1 -0
- package/dist/src/session-roles.js +39 -0
- package/dist/src/session-roles.js.map +1 -0
- package/dist/src/settings.js +82 -6
- package/dist/src/settings.js.map +1 -1
- package/dist/src/setup-core.js +164 -0
- package/dist/src/setup-core.js.map +1 -0
- package/dist/src/setup-surface.js +85 -0
- package/dist/src/setup-surface.js.map +1 -0
- package/dist/src/telemetry.js +252 -0
- package/dist/src/telemetry.js.map +1 -0
- package/dist/src/tlon-binary.js +46 -0
- package/dist/src/tlon-binary.js.map +1 -0
- package/dist/src/tlon-tool-guard.js +44 -0
- package/dist/src/tlon-tool-guard.js.map +1 -0
- package/dist/src/tool-trace.js +100 -0
- package/dist/src/tool-trace.js.map +1 -0
- package/dist/src/types.js +35 -0
- package/dist/src/types.js.map +1 -1
- package/dist/src/urbit/api-client.js +4 -3
- package/dist/src/urbit/api-client.js.map +1 -1
- package/dist/src/urbit/base-url.js +2 -2
- package/dist/src/urbit/base-url.js.map +1 -1
- package/dist/src/urbit/fetch.js +1 -1
- package/dist/src/urbit/fetch.js.map +1 -1
- package/dist/src/urbit/send.js +6 -2
- package/dist/src/urbit/send.js.map +1 -1
- package/dist/src/urbit/sse-client.js +13 -2
- package/dist/src/urbit/sse-client.js.map +1 -1
- package/dist/src/urbit/upload.js +25 -20
- package/dist/src/urbit/upload.js.map +1 -1
- package/dist/src/version.generated.js +3 -0
- package/dist/src/version.generated.js.map +1 -0
- package/package.json +32 -25
- package/dist/src/onboarding.js +0 -178
- package/dist/src/onboarding.js.map +0 -1
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import { PostHog } from "posthog-node";
|
|
2
|
+
const TLON_TELEMETRY_EVENT_NAME = "TlonBot Reply Handled";
|
|
3
|
+
const TLON_HEARTBEAT_NUDGE_EVENT = "TlonBot Heartbeat Nudge Sent";
|
|
4
|
+
const TLON_HEARTBEAT_REENGAGED_EVENT = "TlonBot Heartbeat Nudge Reengaged";
|
|
5
|
+
const TLON_TELEMETRY_LOG_SOURCE = "openclawPlugin";
|
|
6
|
+
const TOOL_TRACE_TTL_MS = 60 * 60 * 1000;
|
|
7
|
+
const MAX_TOOL_CALLS_PER_SESSION = 200;
|
|
8
|
+
const toolCallsBySession = new Map();
|
|
9
|
+
function cleanupToolCalls(now = Date.now()) {
|
|
10
|
+
for (const [sessionKey, trace] of toolCallsBySession) {
|
|
11
|
+
if (now - trace.updatedAt > TOOL_TRACE_TTL_MS) {
|
|
12
|
+
toolCallsBySession.delete(sessionKey);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export function recordToolCall(params) {
|
|
17
|
+
const sessionKey = params.sessionKey?.trim();
|
|
18
|
+
if (!sessionKey) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const now = Date.now();
|
|
22
|
+
cleanupToolCalls(now);
|
|
23
|
+
const existing = toolCallsBySession.get(sessionKey);
|
|
24
|
+
const trace = existing ?? {
|
|
25
|
+
updatedAt: now,
|
|
26
|
+
calls: [],
|
|
27
|
+
};
|
|
28
|
+
trace.updatedAt = now;
|
|
29
|
+
trace.calls.push({
|
|
30
|
+
toolName: params.toolName,
|
|
31
|
+
durationMs: typeof params.durationMs === "number" ? params.durationMs : null,
|
|
32
|
+
error: params.error ?? null,
|
|
33
|
+
recordedAt: now,
|
|
34
|
+
});
|
|
35
|
+
if (trace.calls.length > MAX_TOOL_CALLS_PER_SESSION) {
|
|
36
|
+
trace.calls.splice(0, trace.calls.length - MAX_TOOL_CALLS_PER_SESSION);
|
|
37
|
+
}
|
|
38
|
+
toolCallsBySession.set(sessionKey, trace);
|
|
39
|
+
}
|
|
40
|
+
function createToolTraceCursor(sessionKey) {
|
|
41
|
+
cleanupToolCalls();
|
|
42
|
+
return toolCallsBySession.get(sessionKey)?.calls.length ?? 0;
|
|
43
|
+
}
|
|
44
|
+
function collectToolUsageSince(sessionKey, cursor) {
|
|
45
|
+
cleanupToolCalls();
|
|
46
|
+
const calls = toolCallsBySession
|
|
47
|
+
.get(sessionKey)
|
|
48
|
+
?.calls.slice(Math.max(0, cursor))
|
|
49
|
+
.map((call) => ({
|
|
50
|
+
toolName: call.toolName,
|
|
51
|
+
durationMs: call.durationMs,
|
|
52
|
+
error: call.error,
|
|
53
|
+
})) ?? [];
|
|
54
|
+
return {
|
|
55
|
+
calls,
|
|
56
|
+
names: calls.map((call) => call.toolName),
|
|
57
|
+
totalDurationMs: calls.reduce((total, call) => total + (call.durationMs ?? 0), 0),
|
|
58
|
+
errorCount: calls.filter((call) => call.error).length,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
function resolveReplyOutcome(params) {
|
|
62
|
+
if (params.deliveredMessageCount > 0) {
|
|
63
|
+
return "responded";
|
|
64
|
+
}
|
|
65
|
+
return params.dispatchError ? "error" : "no_reply";
|
|
66
|
+
}
|
|
67
|
+
class PostHogTlonTelemetry {
|
|
68
|
+
client;
|
|
69
|
+
runtime;
|
|
70
|
+
identifiedOwners = new Set();
|
|
71
|
+
missingOwnerWarningLogged = false;
|
|
72
|
+
constructor(params) {
|
|
73
|
+
this.runtime = params.runtime;
|
|
74
|
+
this.client = new PostHog(params.apiKey, {
|
|
75
|
+
host: params.host ?? undefined,
|
|
76
|
+
flushAt: 1,
|
|
77
|
+
flushInterval: 10_000,
|
|
78
|
+
disableGeoip: true,
|
|
79
|
+
preloadFeatureFlags: false,
|
|
80
|
+
disableRemoteConfig: true,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
startReply(params) {
|
|
84
|
+
const toolTraceCursor = createToolTraceCursor(params.sessionKey);
|
|
85
|
+
return {
|
|
86
|
+
capture: async (result) => {
|
|
87
|
+
// Yield once so after_tool_call hooks for the just-finished reply have time to run.
|
|
88
|
+
await new Promise((resolve) => setTimeout(resolve, 0));
|
|
89
|
+
this.captureReplyOutcome({
|
|
90
|
+
ownerShip: params.ownerShip,
|
|
91
|
+
botShip: params.botShip,
|
|
92
|
+
outcome: resolveReplyOutcome({
|
|
93
|
+
deliveredMessageCount: result.deliveredMessageCount,
|
|
94
|
+
dispatchError: result.dispatchError,
|
|
95
|
+
}),
|
|
96
|
+
chatType: params.chatType,
|
|
97
|
+
isThreadReply: params.isThreadReply,
|
|
98
|
+
senderRole: params.senderRole,
|
|
99
|
+
attachmentCount: params.attachmentCount,
|
|
100
|
+
deliveredMessageCount: result.deliveredMessageCount,
|
|
101
|
+
replyCharCount: result.replyCharCount,
|
|
102
|
+
replyWordCount: result.replyWordCount,
|
|
103
|
+
replyMediaCount: result.replyMediaCount,
|
|
104
|
+
dispatchDurationMs: result.dispatchDurationMs,
|
|
105
|
+
queuedFinal: result.queuedFinal,
|
|
106
|
+
queuedFinalCount: result.queuedFinalCount,
|
|
107
|
+
queuedBlockCount: result.queuedBlockCount,
|
|
108
|
+
provider: result.provider,
|
|
109
|
+
model: result.model,
|
|
110
|
+
thinkLevel: result.thinkLevel,
|
|
111
|
+
toolUsage: collectToolUsageSince(params.sessionKey, toolTraceCursor),
|
|
112
|
+
});
|
|
113
|
+
},
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
captureReplyOutcome(event) {
|
|
117
|
+
const ownerShip = event.ownerShip ?? "";
|
|
118
|
+
if (!this.ensureIdentified(ownerShip, event.botShip)) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
this.client.capture({
|
|
122
|
+
distinctId: ownerShip,
|
|
123
|
+
event: TLON_TELEMETRY_EVENT_NAME,
|
|
124
|
+
properties: {
|
|
125
|
+
logSource: TLON_TELEMETRY_LOG_SOURCE,
|
|
126
|
+
botShip: event.botShip,
|
|
127
|
+
ownerShip: event.ownerShip,
|
|
128
|
+
outcome: event.outcome,
|
|
129
|
+
chatType: event.chatType,
|
|
130
|
+
isThreadReply: event.isThreadReply,
|
|
131
|
+
senderRole: event.senderRole,
|
|
132
|
+
attachmentCount: event.attachmentCount,
|
|
133
|
+
hasAttachments: event.attachmentCount > 0,
|
|
134
|
+
deliveredMessageCount: event.deliveredMessageCount,
|
|
135
|
+
replyCharCount: event.replyCharCount,
|
|
136
|
+
replyWordCount: event.replyWordCount,
|
|
137
|
+
replyMediaCount: event.replyMediaCount,
|
|
138
|
+
dispatchDurationMs: event.dispatchDurationMs,
|
|
139
|
+
queuedFinal: event.queuedFinal,
|
|
140
|
+
queuedFinalCount: event.queuedFinalCount,
|
|
141
|
+
queuedBlockCount: event.queuedBlockCount,
|
|
142
|
+
provider: event.provider,
|
|
143
|
+
model: event.model,
|
|
144
|
+
thinkLevel: event.thinkLevel,
|
|
145
|
+
toolCount: event.toolUsage.calls.length,
|
|
146
|
+
toolNames: event.toolUsage.names,
|
|
147
|
+
toolTotalDurationMs: event.toolUsage.totalDurationMs,
|
|
148
|
+
toolErrorCount: event.toolUsage.errorCount,
|
|
149
|
+
toolCalls: event.toolUsage.calls.map((call) => ({
|
|
150
|
+
toolName: call.toolName,
|
|
151
|
+
durationMs: call.durationMs,
|
|
152
|
+
error: call.error,
|
|
153
|
+
})),
|
|
154
|
+
},
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
ensureIdentified(ownerShip, botShip) {
|
|
158
|
+
if (!ownerShip) {
|
|
159
|
+
if (!this.missingOwnerWarningLogged) {
|
|
160
|
+
this.missingOwnerWarningLogged = true;
|
|
161
|
+
this.runtime?.log?.("[tlon] Telemetry is enabled but ownerShip is not configured; skipping telemetry events");
|
|
162
|
+
}
|
|
163
|
+
return false;
|
|
164
|
+
}
|
|
165
|
+
if (!this.identifiedOwners.has(ownerShip)) {
|
|
166
|
+
this.identifiedOwners.add(ownerShip);
|
|
167
|
+
this.client.identify({
|
|
168
|
+
distinctId: ownerShip,
|
|
169
|
+
properties: {
|
|
170
|
+
logSource: TLON_TELEMETRY_LOG_SOURCE,
|
|
171
|
+
tlonOwnerShip: ownerShip,
|
|
172
|
+
tlonBotShip: botShip,
|
|
173
|
+
},
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
return true;
|
|
177
|
+
}
|
|
178
|
+
captureHeartbeatNudge(event) {
|
|
179
|
+
if (!this.ensureIdentified(event.ownerShip, event.botShip)) {
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
this.client.capture({
|
|
183
|
+
distinctId: event.ownerShip,
|
|
184
|
+
event: TLON_HEARTBEAT_NUDGE_EVENT,
|
|
185
|
+
properties: {
|
|
186
|
+
logSource: TLON_TELEMETRY_LOG_SOURCE,
|
|
187
|
+
botShip: event.botShip,
|
|
188
|
+
ownerShip: event.ownerShip,
|
|
189
|
+
trigger: "heartbeat",
|
|
190
|
+
nudgeStage: event.nudgeStage,
|
|
191
|
+
nudgeTarget: event.nudgeTarget,
|
|
192
|
+
channel: event.channel,
|
|
193
|
+
success: event.success,
|
|
194
|
+
accountId: event.accountId,
|
|
195
|
+
},
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
captureHeartbeatReengagement(event) {
|
|
199
|
+
if (!this.ensureIdentified(event.ownerShip, event.botShip)) {
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
this.client.capture({
|
|
203
|
+
distinctId: event.ownerShip,
|
|
204
|
+
event: TLON_HEARTBEAT_REENGAGED_EVENT,
|
|
205
|
+
properties: {
|
|
206
|
+
logSource: TLON_TELEMETRY_LOG_SOURCE,
|
|
207
|
+
botShip: event.botShip,
|
|
208
|
+
ownerShip: event.ownerShip,
|
|
209
|
+
nudgeStage: event.nudgeStage,
|
|
210
|
+
nudgeSentAt: event.nudgeSentAt,
|
|
211
|
+
reengagedAt: event.reengagedAt,
|
|
212
|
+
reengagementDelayMs: event.reengagementDelayMs,
|
|
213
|
+
channel: event.channel,
|
|
214
|
+
accountId: event.accountId,
|
|
215
|
+
},
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
async close() {
|
|
219
|
+
try {
|
|
220
|
+
await this.client.flush();
|
|
221
|
+
}
|
|
222
|
+
catch (error) {
|
|
223
|
+
this.runtime?.error?.(`[tlon] Telemetry flush failed: ${String(error)}`);
|
|
224
|
+
}
|
|
225
|
+
try {
|
|
226
|
+
void this.client.shutdown();
|
|
227
|
+
}
|
|
228
|
+
catch (error) {
|
|
229
|
+
this.runtime?.error?.(`[tlon] Telemetry shutdown failed: ${String(error)}`);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
export function createTlonTelemetry(params) {
|
|
234
|
+
if (!params.config.enabled) {
|
|
235
|
+
return null;
|
|
236
|
+
}
|
|
237
|
+
if (!params.config.apiKey) {
|
|
238
|
+
params.runtime?.log?.("[tlon] Telemetry is enabled but telemetry.apiKey is missing; telemetry disabled");
|
|
239
|
+
return null;
|
|
240
|
+
}
|
|
241
|
+
params.runtime?.log?.(`[tlon] Telemetry enabled${params.config.host ? ` (${params.config.host})` : ""}`);
|
|
242
|
+
return new PostHogTlonTelemetry({
|
|
243
|
+
apiKey: params.config.apiKey,
|
|
244
|
+
host: params.config.host,
|
|
245
|
+
runtime: params.runtime,
|
|
246
|
+
});
|
|
247
|
+
}
|
|
248
|
+
export const _testing = {
|
|
249
|
+
clearToolCalls: () => toolCallsBySession.clear(),
|
|
250
|
+
getToolTraceTtlMs: () => TOOL_TRACE_TTL_MS,
|
|
251
|
+
};
|
|
252
|
+
//# sourceMappingURL=telemetry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
function findPluginPackageJsonPath(moduleDir, exists) {
|
|
4
|
+
return [join(moduleDir, "package.json"), join(moduleDir, "..", "package.json")].find(exists) ?? null;
|
|
5
|
+
}
|
|
6
|
+
function resolveSkillBinPath(resolveModule, readFile) {
|
|
7
|
+
try {
|
|
8
|
+
const skillPackageJsonPath = resolveModule("@tloncorp/tlon-skill/package.json");
|
|
9
|
+
const skillPackageDir = dirname(skillPackageJsonPath);
|
|
10
|
+
const skillPackageJson = JSON.parse(readFile(skillPackageJsonPath, "utf-8"));
|
|
11
|
+
const relativeBin = typeof skillPackageJson.bin === "string"
|
|
12
|
+
? skillPackageJson.bin
|
|
13
|
+
: skillPackageJson.bin?.tlon;
|
|
14
|
+
return relativeBin ? join(skillPackageDir, relativeBin) : null;
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
export function resolveTlonBinary(options) {
|
|
21
|
+
const exists = options.exists ?? existsSync;
|
|
22
|
+
const readFile = options.readFile ?? readFileSync;
|
|
23
|
+
const log = options.log ?? console.log;
|
|
24
|
+
const pluginPackageJsonPath = findPluginPackageJsonPath(options.moduleDir, exists);
|
|
25
|
+
const pluginRoot = pluginPackageJsonPath ? dirname(pluginPackageJsonPath) : options.moduleDir;
|
|
26
|
+
const candidates = [
|
|
27
|
+
["skill package bin", resolveSkillBinPath(options.resolveModule, readFile)],
|
|
28
|
+
["plugin node_modules .bin", join(pluginRoot, "node_modules", ".bin", "tlon")],
|
|
29
|
+
[
|
|
30
|
+
"plugin skill bin",
|
|
31
|
+
join(pluginRoot, "node_modules", "@tloncorp", "tlon-skill", "bin", "tlon.js"),
|
|
32
|
+
],
|
|
33
|
+
];
|
|
34
|
+
for (const [label, candidate] of candidates) {
|
|
35
|
+
if (!candidate) {
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
log(`[tlon] Checking for ${label} at: ${candidate}, exists: ${exists(candidate)}`);
|
|
39
|
+
if (exists(candidate)) {
|
|
40
|
+
return candidate;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
log("[tlon] Falling back to PATH lookup for 'tlon'");
|
|
44
|
+
return "tlon";
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=tlon-binary.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tlon-binary.js","sourceRoot":"","sources":["../../src/tlon-binary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAW1C,SAAS,yBAAyB,CAAC,SAAiB,EAAE,MAAgB;IACpE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;AACvG,CAAC;AAED,SAAS,mBAAmB,CAC1B,aAA8B,EAC9B,QAAoB;IAEpB,IAAI,CAAC;QACH,MAAM,oBAAoB,GAAG,aAAa,CAAC,mCAAmC,CAAC,CAAC;QAChF,MAAM,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAqB,CAAC;QACjG,MAAM,WAAW,GACf,OAAO,gBAAgB,CAAC,GAAG,KAAK,QAAQ;YACtC,CAAC,CAAC,gBAAgB,CAAC,GAAG;YACtB,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC;QAEjC,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAMjC;IACC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,YAAY,CAAC;IAClD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,UAAU,GAAG,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC9F,MAAM,UAAU,GAAG;QACjB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC3E,CAAC,0BAA0B,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9E;YACE,kBAAkB;YAClB,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,CAAC;SAC9E;KACO,CAAC;IAEX,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,UAAU,EAAE,CAAC;QAC5C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS;QACX,CAAC;QAED,GAAG,CAAC,uBAAuB,KAAK,QAAQ,SAAS,aAAa,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACnF,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YACtB,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,GAAG,CAAC,+CAA+C,CAAC,CAAC;IACrD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Runtime guard for the tlon tool.
|
|
3
|
+
*
|
|
4
|
+
* Blocks confirmed wrong-path send operations that should use the built-in
|
|
5
|
+
* `message` tool instead. Allows legacy club (0v...) targets for backward
|
|
6
|
+
* compatibility — clubs are deprecated and slated for removal audit.
|
|
7
|
+
*/
|
|
8
|
+
/** DM sub-operations that are send actions (not management). */
|
|
9
|
+
const DM_SEND_ACTIONS = new Set(["send", "reply"]);
|
|
10
|
+
/**
|
|
11
|
+
* Check whether a parsed tlon command is a blocked send operation.
|
|
12
|
+
*
|
|
13
|
+
* Returns a redirect message string if the operation is blocked,
|
|
14
|
+
* or null if the operation is allowed.
|
|
15
|
+
*/
|
|
16
|
+
export function checkBlockedSendOperation(args) {
|
|
17
|
+
if (args.length < 2)
|
|
18
|
+
return null;
|
|
19
|
+
const subcommand = args[0]?.toLowerCase();
|
|
20
|
+
const action = args[1]?.toLowerCase();
|
|
21
|
+
if (subcommand !== "dms" || !DM_SEND_ACTIONS.has(action)) {
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
// dms send/reply require a target as the next argument
|
|
25
|
+
const target = args[2];
|
|
26
|
+
if (!target)
|
|
27
|
+
return null;
|
|
28
|
+
// Allow legacy club targets (0v...) for backward compatibility
|
|
29
|
+
if (target.startsWith("0v")) {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
// Non-club target — this is a wrong-path send that should use `message`
|
|
33
|
+
// For replies, preserve the messageId (args[3]) so the redirect includes replyTo
|
|
34
|
+
if (action === "reply") {
|
|
35
|
+
const messageId = args[3] ?? "<messageId>";
|
|
36
|
+
return (`Blocked: 'dms reply' with a ship target should use the \`message\` tool instead. ` +
|
|
37
|
+
`Use: message action=send, channel=tlon, target=${target}, replyTo=${messageId}, message=<text>. ` +
|
|
38
|
+
`The \`message\` tool handles threading, bot profile, rate limiting, and reply routing correctly.`);
|
|
39
|
+
}
|
|
40
|
+
return (`Blocked: 'dms send' with a ship target should use the \`message\` tool instead. ` +
|
|
41
|
+
`Use: message action=send, channel=tlon, target=${target}, message=<text>. ` +
|
|
42
|
+
`The \`message\` tool handles threading, bot profile, rate limiting, and reply routing correctly.`);
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=tlon-tool-guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tlon-tool-guard.js","sourceRoot":"","sources":["../../src/tlon-tool-guard.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,gEAAgE;AAChE,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEnD;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAAc;IACtD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;IAEtC,IAAI,UAAU,KAAK,KAAK,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uDAAuD;IACvD,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,+DAA+D;IAC/D,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wEAAwE;IACxE,iFAAiF;IACjF,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC;QAC3C,OAAO,CACL,mFAAmF;YACnF,kDAAkD,MAAM,aAAa,SAAS,oBAAoB;YAClG,kGAAkG,CACnG,CAAC;IACJ,CAAC;IAED,OAAO,CACL,kFAAkF;QAClF,kDAAkD,MAAM,oBAAoB;QAC5E,kGAAkG,CACnG,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
const TOOL_TRACE_CONTENT_ENV_VARS = [
|
|
2
|
+
"TEST_LIVE_TOOL_TRACE_CONTENTS",
|
|
3
|
+
"CI_LIVE_TOOL_TRACE_CONTENTS",
|
|
4
|
+
];
|
|
5
|
+
const REDACTED = "[REDACTED]";
|
|
6
|
+
const MAX_DEPTH = 4;
|
|
7
|
+
const MAX_STRING_LENGTH = 300;
|
|
8
|
+
const MAX_ARRAY_ITEMS = 20;
|
|
9
|
+
const MAX_OBJECT_KEYS = 30;
|
|
10
|
+
const SENSITIVE_KEY_RE = /^(?:authorization|auth|password|secret|token|accesstoken|refreshtoken|apikey|api_key|cookie|set-cookie|code)$/i;
|
|
11
|
+
function isPlainObject(value) {
|
|
12
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
13
|
+
}
|
|
14
|
+
function truncateString(value) {
|
|
15
|
+
if (value.startsWith("data:")) {
|
|
16
|
+
const prefix = value.slice(0, 48);
|
|
17
|
+
return `${prefix}… [data-url ${value.length} chars]`;
|
|
18
|
+
}
|
|
19
|
+
if (value.length <= MAX_STRING_LENGTH) {
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
22
|
+
return `${value.slice(0, MAX_STRING_LENGTH)}… [${value.length} chars]`;
|
|
23
|
+
}
|
|
24
|
+
function sanitizeValue(value, depth = 0) {
|
|
25
|
+
if (value == null || typeof value === "number" || typeof value === "boolean") {
|
|
26
|
+
return value;
|
|
27
|
+
}
|
|
28
|
+
if (typeof value === "string") {
|
|
29
|
+
return truncateString(value);
|
|
30
|
+
}
|
|
31
|
+
if (typeof value === "bigint") {
|
|
32
|
+
return value.toString();
|
|
33
|
+
}
|
|
34
|
+
if (typeof value === "function") {
|
|
35
|
+
return `[Function ${value.name || "anonymous"}]`;
|
|
36
|
+
}
|
|
37
|
+
if (value instanceof Error) {
|
|
38
|
+
return {
|
|
39
|
+
name: value.name,
|
|
40
|
+
message: truncateString(value.message),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
if (depth >= MAX_DEPTH) {
|
|
44
|
+
if (Array.isArray(value)) {
|
|
45
|
+
return `[Array(${value.length})]`;
|
|
46
|
+
}
|
|
47
|
+
if (isPlainObject(value)) {
|
|
48
|
+
return `[Object keys=${Object.keys(value).length}]`;
|
|
49
|
+
}
|
|
50
|
+
return String(value);
|
|
51
|
+
}
|
|
52
|
+
if (Array.isArray(value)) {
|
|
53
|
+
const items = value.slice(0, MAX_ARRAY_ITEMS).map((item) => sanitizeValue(item, depth + 1));
|
|
54
|
+
if (value.length > MAX_ARRAY_ITEMS) {
|
|
55
|
+
items.push(`[+${value.length - MAX_ARRAY_ITEMS} more items]`);
|
|
56
|
+
}
|
|
57
|
+
return items;
|
|
58
|
+
}
|
|
59
|
+
if (isPlainObject(value)) {
|
|
60
|
+
const output = {};
|
|
61
|
+
const entries = Object.entries(value);
|
|
62
|
+
for (const [index, [key, nested]] of entries.entries()) {
|
|
63
|
+
if (index >= MAX_OBJECT_KEYS) {
|
|
64
|
+
output.__truncated__ = `[+${entries.length - MAX_OBJECT_KEYS} more keys]`;
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
output[key] = SENSITIVE_KEY_RE.test(key)
|
|
68
|
+
? REDACTED
|
|
69
|
+
: sanitizeValue(nested, depth + 1);
|
|
70
|
+
}
|
|
71
|
+
return output;
|
|
72
|
+
}
|
|
73
|
+
return String(value);
|
|
74
|
+
}
|
|
75
|
+
export function liveToolTraceContentsEnabled(env = process.env) {
|
|
76
|
+
return TOOL_TRACE_CONTENT_ENV_VARS.some((name) => /^(1|true|yes|on)$/i.test(env[name] ?? ""));
|
|
77
|
+
}
|
|
78
|
+
export function formatToolTraceEvent(params) {
|
|
79
|
+
const body = {
|
|
80
|
+
phase: params.phase,
|
|
81
|
+
sessionKey: params.sessionKey?.trim() || undefined,
|
|
82
|
+
toolName: params.toolName,
|
|
83
|
+
payload: sanitizeValue(params.payload),
|
|
84
|
+
};
|
|
85
|
+
return `tooltrace ${params.phase}: ${JSON.stringify(body)}`;
|
|
86
|
+
}
|
|
87
|
+
export function shouldLogAfterToolTrace(event) {
|
|
88
|
+
if (typeof event.durationMs === "number") {
|
|
89
|
+
return true;
|
|
90
|
+
}
|
|
91
|
+
if (event.error) {
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
94
|
+
return event.result == null;
|
|
95
|
+
}
|
|
96
|
+
export const _testing = {
|
|
97
|
+
sanitizeValue,
|
|
98
|
+
truncateString,
|
|
99
|
+
};
|
|
100
|
+
//# sourceMappingURL=tool-trace.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-trace.js","sourceRoot":"","sources":["../../src/tool-trace.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.js
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
function resolveTelemetryConfig(base, account) {
|
|
2
|
+
return {
|
|
3
|
+
enabled: account?.enabled ?? base?.enabled ?? false,
|
|
4
|
+
apiKey: account?.apiKey ?? base?.apiKey ?? null,
|
|
5
|
+
host: account?.host ?? base?.host ?? null,
|
|
6
|
+
};
|
|
7
|
+
}
|
|
1
8
|
export function resolveTlonAccount(cfg, accountId) {
|
|
2
9
|
const base = cfg.channels?.tlon;
|
|
3
10
|
if (!base) {
|
|
@@ -20,6 +27,12 @@ export function resolveTlonAccount(cfg, accountId) {
|
|
|
20
27
|
defaultAuthorizedShips: [],
|
|
21
28
|
ownerShip: null,
|
|
22
29
|
reactionLevel: null,
|
|
30
|
+
maxConsecutiveBotResponses: null,
|
|
31
|
+
telemetry: {
|
|
32
|
+
enabled: false,
|
|
33
|
+
apiKey: null,
|
|
34
|
+
host: null,
|
|
35
|
+
},
|
|
23
36
|
};
|
|
24
37
|
}
|
|
25
38
|
const useDefault = !accountId || accountId === "default";
|
|
@@ -43,6 +56,11 @@ export function resolveTlonAccount(cfg, accountId) {
|
|
|
43
56
|
null);
|
|
44
57
|
const ownerShip = (account?.ownerShip ?? base.ownerShip ?? null);
|
|
45
58
|
const reactionLevel = (account?.reactionLevel ?? base.reactionLevel ?? null);
|
|
59
|
+
const maxConsecutiveBotResponses = (account
|
|
60
|
+
?.maxConsecutiveBotResponses ??
|
|
61
|
+
base.maxConsecutiveBotResponses ??
|
|
62
|
+
null);
|
|
63
|
+
const telemetry = resolveTelemetryConfig(base.telemetry, account?.telemetry);
|
|
46
64
|
const defaultAuthorizedShips = (account?.defaultAuthorizedShips ??
|
|
47
65
|
base?.defaultAuthorizedShips ??
|
|
48
66
|
[]);
|
|
@@ -66,6 +84,8 @@ export function resolveTlonAccount(cfg, accountId) {
|
|
|
66
84
|
defaultAuthorizedShips,
|
|
67
85
|
ownerShip,
|
|
68
86
|
reactionLevel,
|
|
87
|
+
maxConsecutiveBotResponses,
|
|
88
|
+
telemetry,
|
|
69
89
|
};
|
|
70
90
|
}
|
|
71
91
|
export function listTlonAccountIds(cfg) {
|
|
@@ -76,4 +96,19 @@ export function listTlonAccountIds(cfg) {
|
|
|
76
96
|
const accounts = base.accounts ?? {};
|
|
77
97
|
return [...(base.ship ? ["default"] : []), ...Object.keys(accounts)];
|
|
78
98
|
}
|
|
99
|
+
/**
|
|
100
|
+
* Like `listTlonAccountIds`, but only includes accounts that are both
|
|
101
|
+
* `enabled !== false` and fully `configured` (ship + url + code present).
|
|
102
|
+
*
|
|
103
|
+
* Use this when the question is "how many accounts will actually run a
|
|
104
|
+
* monitor in this process". Disabled or stub accounts cannot race
|
|
105
|
+
* shared-process state and should not, for example, disable the nudge
|
|
106
|
+
* scheduler's single-runnable-account guard.
|
|
107
|
+
*/
|
|
108
|
+
export function listRunnableTlonAccountIds(cfg) {
|
|
109
|
+
return listTlonAccountIds(cfg).filter((id) => {
|
|
110
|
+
const account = resolveTlonAccount(cfg, id);
|
|
111
|
+
return account.enabled && account.configured;
|
|
112
|
+
});
|
|
113
|
+
}
|
|
79
114
|
//# sourceMappingURL=types.js.map
|
package/dist/src/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { urbitFetch } from "./fetch.js";
|
|
|
8
8
|
* The @tloncorp/api configureClient accepts a `client` that looks like an Urbit instance.
|
|
9
9
|
* Includes stubs for connect/eventSource/scryWithInfo so configureClient never crashes.
|
|
10
10
|
*/
|
|
11
|
-
function createClientShim(pokeFn, scryFn) {
|
|
11
|
+
function createClientShim(pokeFn, shipUrl, scryFn) {
|
|
12
12
|
return {
|
|
13
13
|
poke: (params) => pokeFn(params),
|
|
14
14
|
on: () => ({ on: () => ({}) }),
|
|
@@ -30,6 +30,7 @@ function createClientShim(pokeFn, scryFn) {
|
|
|
30
30
|
// Properties configureClient may access
|
|
31
31
|
verbose: false,
|
|
32
32
|
nodeId: "",
|
|
33
|
+
url: shipUrl,
|
|
33
34
|
};
|
|
34
35
|
}
|
|
35
36
|
/**
|
|
@@ -37,7 +38,7 @@ function createClientShim(pokeFn, scryFn) {
|
|
|
37
38
|
* Use this when you already have an authenticated poke backend (e.g., SSE client in monitor).
|
|
38
39
|
*/
|
|
39
40
|
export function configureTlonApiWithPoke(pokeFn, ship, shipUrl, scryFn) {
|
|
40
|
-
const shim = createClientShim(pokeFn, scryFn);
|
|
41
|
+
const shim = createClientShim(pokeFn, shipUrl, scryFn);
|
|
41
42
|
configureClient({
|
|
42
43
|
shipName: ship.replace(/^~/, ""),
|
|
43
44
|
shipUrl,
|
|
@@ -82,7 +83,7 @@ export async function withAuthenticatedTlonApi(params, fn) {
|
|
|
82
83
|
await release();
|
|
83
84
|
}
|
|
84
85
|
};
|
|
85
|
-
const shim = createClientShim(api.poke, scryFn);
|
|
86
|
+
const shim = createClientShim(api.poke, params.url, scryFn);
|
|
86
87
|
configureClient({
|
|
87
88
|
shipName: params.ship.replace(/^~/, ""),
|
|
88
89
|
shipUrl: params.url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../../src/urbit/api-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAKxC;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,MAAc,EAAE,MAAe;
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../../src/urbit/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isBlockedHostnameOrIp } from "openclaw/plugin-sdk/tlon";
|
|
2
2
|
function hasScheme(value) {
|
|
3
3
|
return /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(value);
|
|
4
4
|
}
|
|
@@ -40,6 +40,6 @@ export function isBlockedUrbitHostname(hostname) {
|
|
|
40
40
|
if (!normalized) {
|
|
41
41
|
return false;
|
|
42
42
|
}
|
|
43
|
-
return
|
|
43
|
+
return isBlockedHostnameOrIp(normalized);
|
|
44
44
|
}
|
|
45
45
|
//# sourceMappingURL=base-url.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-url.js","sourceRoot":"","sources":["../../../src/urbit/base-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"base-url.js","sourceRoot":"","sources":["../../../src/urbit/base-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAMjE,SAAS,SAAS,CAAC,KAAa;IAC9B,OAAO,+BAA+B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,OAAO,EAAE,CAAC;IAEtE,IAAI,MAAW,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,kCAAkC,EAAE,CAAC;IAClE,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACvC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,kCAAkC,EAAE,CAAC;IAClE,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAClD,CAAC;IAED,wFAAwF;IACxF,+DAA+D;IAC/D,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI;QACtB,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE;QACzD,CAAC,CAAC,MAAM;YACN,CAAC,CAAC,IAAI,QAAQ,GAAG;YACjB,CAAC,CAAC,QAAQ,CAAC;IAEf,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,QAAgB;IACrD,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,qBAAqB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC"}
|
package/dist/src/urbit/fetch.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/urbit/fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/urbit/fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsB5C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,MAAyB;IACxD,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/D,OAAO,MAAM,kBAAkB,CAAC;QAC9B,GAAG;QACH,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,UAAU;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC,CAAC;AACL,CAAC"}
|