aimux-cli 0.1.16 → 0.1.18
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 +184 -67
- package/bin/aimux-dev +10 -0
- package/dist/alert-display.d.ts +21 -0
- package/dist/alert-display.js +86 -0
- package/dist/alert-display.js.map +1 -0
- package/dist/attachment-store.d.ts +0 -7
- package/dist/attachment-store.js +2 -86
- package/dist/attachment-store.js.map +1 -1
- package/dist/builtin-metadata-watchers.js +4 -4
- package/dist/builtin-metadata-watchers.js.map +1 -1
- package/dist/claude-hooks.d.ts +1 -0
- package/dist/claude-hooks.js +25 -0
- package/dist/claude-hooks.js.map +1 -1
- package/dist/config.d.ts +19 -13
- package/dist/config.js +28 -14
- package/dist/config.js.map +1 -1
- package/dist/connection-targets.d.ts +8 -0
- package/dist/connection-targets.js +28 -0
- package/dist/connection-targets.js.map +1 -0
- package/dist/credentials.d.ts +12 -0
- package/dist/credentials.js +49 -0
- package/dist/credentials.js.map +1 -0
- package/dist/daemon.d.ts +23 -0
- package/dist/daemon.js +391 -66
- package/dist/daemon.js.map +1 -1
- package/dist/dashboard/index.d.ts +13 -10
- package/dist/dashboard/index.js +3 -26
- package/dist/dashboard/index.js.map +1 -1
- package/dist/dashboard/order.d.ts +22 -0
- package/dist/dashboard/order.js +55 -0
- package/dist/dashboard/order.js.map +1 -0
- package/dist/dashboard/pending-actions.d.ts +39 -10
- package/dist/dashboard/pending-actions.js +166 -36
- package/dist/dashboard/pending-actions.js.map +1 -1
- package/dist/dashboard/quick-jump.d.ts +2 -1
- package/dist/dashboard/quick-jump.js +7 -4
- package/dist/dashboard/quick-jump.js.map +1 -1
- package/dist/dashboard/session-actions.d.ts +4 -4
- package/dist/dashboard/session-actions.js +1 -1
- package/dist/dashboard/session-actions.js.map +1 -1
- package/dist/dashboard/session-registry.d.ts +4 -3
- package/dist/dashboard/session-registry.js +16 -50
- package/dist/dashboard/session-registry.js.map +1 -1
- package/dist/dashboard/state.d.ts +1 -1
- package/dist/dashboard/state.js.map +1 -1
- package/dist/dashboard/ui-state-store.d.ts +16 -1
- package/dist/dashboard/ui-state-store.js +73 -2
- package/dist/dashboard/ui-state-store.js.map +1 -1
- package/dist/debug-state.d.ts +97 -0
- package/dist/debug-state.js +541 -0
- package/dist/debug-state.js.map +1 -0
- package/dist/debug.d.ts +38 -0
- package/dist/debug.js +219 -15
- package/dist/debug.js.map +1 -1
- package/dist/default-plugins/gh-pr-context.d.ts +2 -1
- package/dist/default-plugins/gh-pr-context.js +17 -11
- package/dist/default-plugins/gh-pr-context.js.map +1 -1
- package/dist/default-plugins/transcript-length.js +15 -2
- package/dist/default-plugins/transcript-length.js.map +1 -1
- package/dist/fast-control.js +37 -19
- package/dist/fast-control.js.map +1 -1
- package/dist/http-client.js +31 -2
- package/dist/http-client.js.map +1 -1
- package/dist/local-ui-server.d.ts +22 -0
- package/dist/local-ui-server.js +186 -0
- package/dist/local-ui-server.js.map +1 -0
- package/dist/login-flow.d.ts +7 -0
- package/dist/login-flow.js +120 -0
- package/dist/login-flow.js.map +1 -0
- package/dist/main.js +821 -151
- package/dist/main.js.map +1 -1
- package/dist/managed-launch-env.js +14 -0
- package/dist/managed-launch-env.js.map +1 -1
- package/dist/metadata-server.d.ts +36 -36
- package/dist/metadata-server.js +638 -137
- package/dist/metadata-server.js.map +1 -1
- package/dist/metadata-store.d.ts +4 -1
- package/dist/metadata-store.js +30 -2
- package/dist/metadata-store.js.map +1 -1
- package/dist/multiplexer/agent-io-methods.d.ts +2 -10
- package/dist/multiplexer/agent-io-methods.js +12 -43
- package/dist/multiplexer/agent-io-methods.js.map +1 -1
- package/dist/multiplexer/archives.js +8 -9
- package/dist/multiplexer/archives.js.map +1 -1
- package/dist/multiplexer/dashboard-control.js +45 -13
- package/dist/multiplexer/dashboard-control.js.map +1 -1
- package/dist/multiplexer/dashboard-interaction.d.ts +8 -2
- package/dist/multiplexer/dashboard-interaction.js +187 -28
- package/dist/multiplexer/dashboard-interaction.js.map +1 -1
- package/dist/multiplexer/dashboard-model.d.ts +10 -3
- package/dist/multiplexer/dashboard-model.js +417 -35
- package/dist/multiplexer/dashboard-model.js.map +1 -1
- package/dist/multiplexer/dashboard-ops.d.ts +9 -7
- package/dist/multiplexer/dashboard-ops.js +178 -68
- package/dist/multiplexer/dashboard-ops.js.map +1 -1
- package/dist/multiplexer/dashboard-state-methods.d.ts +2 -1
- package/dist/multiplexer/dashboard-state-methods.js +3 -2
- package/dist/multiplexer/dashboard-state-methods.js.map +1 -1
- package/dist/multiplexer/dashboard-tail-methods.d.ts +22 -10
- package/dist/multiplexer/dashboard-tail-methods.js +164 -47
- package/dist/multiplexer/dashboard-tail-methods.js.map +1 -1
- package/dist/multiplexer/dashboard-view-methods.d.ts +1 -1
- package/dist/multiplexer/dashboard-view-methods.js +23 -8
- package/dist/multiplexer/dashboard-view-methods.js.map +1 -1
- package/dist/multiplexer/graveyard-view-model.d.ts +9 -1
- package/dist/multiplexer/graveyard-view-model.js +39 -0
- package/dist/multiplexer/graveyard-view-model.js.map +1 -1
- package/dist/multiplexer/index.d.ts +15 -12
- package/dist/multiplexer/index.js +64 -43
- package/dist/multiplexer/index.js.map +1 -1
- package/dist/multiplexer/notifications.js +107 -24
- package/dist/multiplexer/notifications.js.map +1 -1
- package/dist/multiplexer/persistence-methods.d.ts +31 -4
- package/dist/multiplexer/persistence-methods.js +304 -308
- package/dist/multiplexer/persistence-methods.js.map +1 -1
- package/dist/multiplexer/runtime-lifecycle-methods.d.ts +8 -10
- package/dist/multiplexer/runtime-lifecycle-methods.js +104 -86
- package/dist/multiplexer/runtime-lifecycle-methods.js.map +1 -1
- package/dist/multiplexer/runtime-state.d.ts +8 -10
- package/dist/multiplexer/runtime-state.js +82 -145
- package/dist/multiplexer/runtime-state.js.map +1 -1
- package/dist/multiplexer/runtime-sync.d.ts +2 -10
- package/dist/multiplexer/runtime-sync.js +3 -18
- package/dist/multiplexer/runtime-sync.js.map +1 -1
- package/dist/multiplexer/service-state-snapshot.d.ts +2 -4
- package/dist/multiplexer/service-state-snapshot.js +4 -51
- package/dist/multiplexer/service-state-snapshot.js.map +1 -1
- package/dist/multiplexer/services.d.ts +1 -0
- package/dist/multiplexer/services.js +55 -5
- package/dist/multiplexer/services.js.map +1 -1
- package/dist/multiplexer/session-capture.d.ts +1 -0
- package/dist/multiplexer/session-capture.js +24 -0
- package/dist/multiplexer/session-capture.js.map +1 -0
- package/dist/multiplexer/session-launch.d.ts +4 -1
- package/dist/multiplexer/session-launch.js +152 -63
- package/dist/multiplexer/session-launch.js.map +1 -1
- package/dist/multiplexer/session-runtime-core.d.ts +8 -20
- package/dist/multiplexer/session-runtime-core.js +40 -135
- package/dist/multiplexer/session-runtime-core.js.map +1 -1
- package/dist/multiplexer/subscreens.js +10 -3
- package/dist/multiplexer/subscreens.js.map +1 -1
- package/dist/multiplexer/worktree-graveyard.d.ts +0 -1
- package/dist/multiplexer/worktree-graveyard.js +15 -16
- package/dist/multiplexer/worktree-graveyard.js.map +1 -1
- package/dist/multiplexer/worktrees.js +96 -40
- package/dist/multiplexer/worktrees.js.map +1 -1
- package/dist/notification-context.js +8 -4
- package/dist/notification-context.js.map +1 -1
- package/dist/notifications.js +163 -101
- package/dist/notifications.js.map +1 -1
- package/dist/notify.d.ts +4 -0
- package/dist/notify.js +14 -0
- package/dist/notify.js.map +1 -1
- package/dist/paths.d.ts +32 -7
- package/dist/paths.js +82 -58
- package/dist/paths.js.map +1 -1
- package/dist/pending-actions.d.ts +5 -0
- package/dist/pending-actions.js +14 -0
- package/dist/pending-actions.js.map +1 -0
- package/dist/plugin-runtime.js +9 -2
- package/dist/plugin-runtime.js.map +1 -1
- package/dist/project-events.d.ts +1 -10
- package/dist/project-events.js +0 -10
- package/dist/project-events.js.map +1 -1
- package/dist/project-scanner.d.ts +2 -3
- package/dist/project-scanner.js +58 -129
- package/dist/project-scanner.js.map +1 -1
- package/dist/project-service-manifest.d.ts +1 -3
- package/dist/project-service-manifest.js +1 -3
- package/dist/project-service-manifest.js.map +1 -1
- package/dist/relay-client.d.ts +30 -0
- package/dist/relay-client.js +191 -0
- package/dist/relay-client.js.map +1 -0
- package/dist/remote-access.d.ts +16 -0
- package/dist/remote-access.js +91 -0
- package/dist/remote-access.js.map +1 -0
- package/dist/runtime-core/exchange-derived.d.ts +2 -0
- package/dist/runtime-core/exchange-derived.js +154 -0
- package/dist/runtime-core/exchange-derived.js.map +1 -0
- package/dist/runtime-core/exchange-import.d.ts +24 -0
- package/dist/runtime-core/exchange-import.js +318 -0
- package/dist/runtime-core/exchange-import.js.map +1 -0
- package/dist/runtime-core/exchange-store.d.ts +157 -0
- package/dist/runtime-core/exchange-store.js +453 -0
- package/dist/runtime-core/exchange-store.js.map +1 -0
- package/dist/runtime-core/topology-services.d.ts +38 -0
- package/dist/runtime-core/topology-services.js +171 -0
- package/dist/runtime-core/topology-services.js.map +1 -0
- package/dist/runtime-core/topology-sessions.d.ts +52 -0
- package/dist/runtime-core/topology-sessions.js +239 -0
- package/dist/runtime-core/topology-sessions.js.map +1 -0
- package/dist/runtime-core/topology-store.d.ts +171 -0
- package/dist/runtime-core/topology-store.js +420 -0
- package/dist/runtime-core/topology-store.js.map +1 -0
- package/dist/runtime-core/topology-worktrees.d.ts +60 -0
- package/dist/runtime-core/topology-worktrees.js +200 -0
- package/dist/runtime-core/topology-worktrees.js.map +1 -0
- package/dist/runtime-migration.d.ts +69 -0
- package/dist/runtime-migration.js +399 -0
- package/dist/runtime-migration.js.map +1 -0
- package/dist/session-bootstrap.d.ts +8 -6
- package/dist/session-bootstrap.js +51 -158
- package/dist/session-bootstrap.js.map +1 -1
- package/dist/session-runtime.d.ts +2 -0
- package/dist/session-runtime.js +1 -0
- package/dist/session-runtime.js.map +1 -1
- package/dist/session-semantics.d.ts +12 -4
- package/dist/session-semantics.js +14 -0
- package/dist/session-semantics.js.map +1 -1
- package/dist/shell-hooks.js +32 -10
- package/dist/shell-hooks.js.map +1 -1
- package/dist/shell-state.d.ts +2 -0
- package/dist/shell-state.js +26 -1
- package/dist/shell-state.js.map +1 -1
- package/dist/statusline-model.d.ts +10 -2
- package/dist/statusline-model.js +106 -30
- package/dist/statusline-model.js.map +1 -1
- package/dist/task-workflow.d.ts +6 -9
- package/dist/task-workflow.js +37 -84
- package/dist/task-workflow.js.map +1 -1
- package/dist/tasks.d.ts +6 -33
- package/dist/tasks.js +46 -88
- package/dist/tasks.js.map +1 -1
- package/dist/team.d.ts +29 -0
- package/dist/team.js +40 -0
- package/dist/team.js.map +1 -1
- package/dist/threads.d.ts +6 -35
- package/dist/threads.js +89 -98
- package/dist/threads.js.map +1 -1
- package/dist/tmux/inbox-popup.js +37 -15
- package/dist/tmux/inbox-popup.js.map +1 -1
- package/dist/tmux/runtime-manager.d.ts +3 -0
- package/dist/tmux/runtime-manager.js +21 -4
- package/dist/tmux/runtime-manager.js.map +1 -1
- package/dist/tmux/statusline.js +49 -9
- package/dist/tmux/statusline.js.map +1 -1
- package/dist/tmux/window-open.js +1 -2
- package/dist/tmux/window-open.js.map +1 -1
- package/dist/tool-output-watchers.d.ts +0 -18
- package/dist/tool-output-watchers.js +0 -322
- package/dist/tool-output-watchers.js.map +1 -1
- package/dist/tui/screens/dashboard-renderers.js +37 -25
- package/dist/tui/screens/dashboard-renderers.js.map +1 -1
- package/dist/tui/screens/overlay-renderers.d.ts +2 -0
- package/dist/tui/screens/overlay-renderers.js +37 -1
- package/dist/tui/screens/overlay-renderers.js.map +1 -1
- package/dist/tui/screens/subscreen-renderers.js +7 -0
- package/dist/tui/screens/subscreen-renderers.js.map +1 -1
- package/dist/worktree.js +17 -0
- package/dist/worktree.js.map +1 -1
- package/dist-ui/_expo/static/css/web-30453ede1678c16acb08b97e83e8646d.css +1 -0
- package/dist-ui/_expo/static/js/web/entry-477c745b2adc79367a4380ecf07d9ff6.js +14620 -0
- package/dist-ui/assets/assets/images/icon.a5413dcd2e811c9f2317d01a28118d8a.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/back-icon-mask.0a328cd9c1afd0afe8e3b1ec5165b1b4.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/back-icon.35ba0eaec5a4f5ed12ca16fabeae451d.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/clear-icon.c94f6478e7ae0cdd9f15de1fcb9e5e55.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/clear-icon.c94f6478e7ae0cdd9f15de1fcb9e5e55@2x.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/clear-icon.c94f6478e7ae0cdd9f15de1fcb9e5e55@3x.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/clear-icon.c94f6478e7ae0cdd9f15de1fcb9e5e55@4x.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/close-icon.808e1b1b9b53114ec2838071a7e6daa7.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/close-icon.808e1b1b9b53114ec2838071a7e6daa7@2x.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/close-icon.808e1b1b9b53114ec2838071a7e6daa7@3x.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/close-icon.808e1b1b9b53114ec2838071a7e6daa7@4x.png +0 -0
- package/dist-ui/assets/node_modules/@react-navigation/elements/lib/module/assets/search-icon.286d67d3f74808a60a78d3ebf1a5fb57.png +0 -0
- package/dist-ui/assets/node_modules/expo-router/assets/arrow_down.017bc6ba3fc25503e5eb5e53826d48a8.png +0 -0
- package/dist-ui/assets/node_modules/expo-router/assets/error.d1ea1496f9057eb392d5bbf3732a61b7.png +0 -0
- package/dist-ui/assets/node_modules/expo-router/assets/file.19eeb73b9593a38f8e9f418337fc7d10.png +0 -0
- package/dist-ui/assets/node_modules/expo-router/assets/forward.d8b800c443b8972542883e0b9de2bdc6.png +0 -0
- package/dist-ui/assets/node_modules/expo-router/assets/pkg.ab19f4cbc543357183a20571f68380a3.png +0 -0
- package/dist-ui/assets/node_modules/expo-router/assets/sitemap.412dd9275b6b48ad28f5e3d81bb1f626.png +0 -0
- package/dist-ui/assets/node_modules/expo-router/assets/unmatched.20e71bdf79e3a97bf55fd9e164041578.png +0 -0
- package/dist-ui/favicon.ico +0 -0
- package/dist-ui/index.html +38 -0
- package/dist-ui/metadata.json +1 -0
- package/package.json +28 -12
- package/dist/agent-message-parts.d.ts +0 -17
- package/dist/agent-message-parts.js +0 -31
- package/dist/agent-message-parts.js.map +0 -1
- package/dist/instance-directory.d.ts +0 -32
- package/dist/instance-directory.js +0 -82
- package/dist/instance-directory.js.map +0 -1
- package/dist/instance-registry.d.ts +0 -39
- package/dist/instance-registry.js +0 -208
- package/dist/instance-registry.js.map +0 -1
- package/dist/multiplexer/session-actions.d.ts +0 -40
- package/dist/multiplexer/session-actions.js +0 -110
- package/dist/multiplexer/session-actions.js.map +0 -1
- package/dist/orchestration-dispatcher.d.ts +0 -25
- package/dist/orchestration-dispatcher.js +0 -59
- package/dist/orchestration-dispatcher.js.map +0 -1
- package/dist/session-input-operations.d.ts +0 -19
- package/dist/session-input-operations.js +0 -46
- package/dist/session-input-operations.js.map +0 -1
- package/dist/session-message-history.d.ts +0 -27
- package/dist/session-message-history.js +0 -105
- package/dist/session-message-history.js.map +0 -1
- package/dist/task-dispatcher.d.ts +0 -64
- package/dist/task-dispatcher.js +0 -213
- package/dist/task-dispatcher.js.map +0 -1
package/dist/debug.js
CHANGED
|
@@ -1,16 +1,224 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
import { appendFileSync, existsSync, mkdirSync, renameSync, rmSync, statSync } from "node:fs";
|
|
2
|
+
import { dirname } from "node:path";
|
|
3
|
+
const LEVEL_PRIORITY = {
|
|
4
|
+
error: 0,
|
|
5
|
+
warn: 1,
|
|
6
|
+
info: 2,
|
|
7
|
+
debug: 3,
|
|
8
|
+
trace: 4,
|
|
9
|
+
};
|
|
10
|
+
const SENSITIVE_ASSIGNMENT_PATTERN = /\b([A-Za-z_][A-Za-z0-9_]*=)(?:\\"(?:[^"\\]|\\.)*\\"|\\'(?:[^'\\]|\\.)*\\'|"[^"]*"|'[^']*'|[^"',\s\]]+)/g;
|
|
11
|
+
const DEFAULT_RUNTIME_CONFIG = {
|
|
12
|
+
enabled: false,
|
|
13
|
+
level: "info",
|
|
14
|
+
categories: ["*"],
|
|
15
|
+
maxBytes: 10_000_000,
|
|
16
|
+
maxFiles: 5,
|
|
17
|
+
path: "",
|
|
18
|
+
processKind: "cli",
|
|
19
|
+
};
|
|
20
|
+
let runtimeConfig = { ...DEFAULT_RUNTIME_CONFIG };
|
|
21
|
+
function normalizeLevel(level, fallback) {
|
|
22
|
+
return level === "error" || level === "warn" || level === "info" || level === "debug" || level === "trace"
|
|
23
|
+
? level
|
|
24
|
+
: fallback;
|
|
25
|
+
}
|
|
26
|
+
function isExplicitFalse(value) {
|
|
27
|
+
return ["0", "false", "off", "no"].includes(value.trim().toLowerCase());
|
|
28
|
+
}
|
|
29
|
+
function normalizeCategories(categories) {
|
|
30
|
+
const normalized = (categories ?? ["*"]).map((category) => category.trim()).filter(Boolean);
|
|
31
|
+
return normalized.length > 0 ? normalized : ["*"];
|
|
32
|
+
}
|
|
33
|
+
export function parseLogCategories(value) {
|
|
34
|
+
if (!value)
|
|
35
|
+
return undefined;
|
|
36
|
+
return normalizeCategories(value.split(","));
|
|
37
|
+
}
|
|
38
|
+
export function resolveLoggingRuntimeConfig(options) {
|
|
39
|
+
const env = options.env ?? process.env;
|
|
40
|
+
const cli = options.cli ?? {};
|
|
41
|
+
let enabled = options.config.enabled;
|
|
42
|
+
let level = options.config.level;
|
|
43
|
+
let categories = normalizeCategories(options.config.categories);
|
|
44
|
+
const envLog = env.AIMUX_LOG;
|
|
45
|
+
if (envLog !== undefined) {
|
|
46
|
+
if (isExplicitFalse(envLog)) {
|
|
47
|
+
enabled = false;
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
enabled = true;
|
|
51
|
+
level = normalizeLevel(envLog, level);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
if (env.AIMUX_LOG_LEVEL) {
|
|
55
|
+
enabled = true;
|
|
56
|
+
level = normalizeLevel(env.AIMUX_LOG_LEVEL, level);
|
|
57
|
+
}
|
|
58
|
+
const envCategories = parseLogCategories(env.AIMUX_LOG_CATEGORIES);
|
|
59
|
+
if (envCategories) {
|
|
60
|
+
enabled = true;
|
|
61
|
+
categories = envCategories;
|
|
62
|
+
}
|
|
63
|
+
if (cli.debug) {
|
|
64
|
+
enabled = true;
|
|
65
|
+
level = "debug";
|
|
66
|
+
}
|
|
67
|
+
if (cli.trace) {
|
|
68
|
+
enabled = true;
|
|
69
|
+
level = "trace";
|
|
70
|
+
}
|
|
71
|
+
if (cli.logLevel) {
|
|
72
|
+
enabled = true;
|
|
73
|
+
level = normalizeLevel(cli.logLevel, level);
|
|
74
|
+
}
|
|
75
|
+
const cliCategories = parseLogCategories(cli.logCategory);
|
|
76
|
+
if (cliCategories) {
|
|
77
|
+
enabled = true;
|
|
78
|
+
categories = cliCategories;
|
|
79
|
+
}
|
|
80
|
+
return {
|
|
81
|
+
enabled,
|
|
82
|
+
level,
|
|
83
|
+
categories,
|
|
84
|
+
maxBytes: options.config.maxBytes,
|
|
85
|
+
maxFiles: options.config.maxFiles,
|
|
86
|
+
path: options.path,
|
|
87
|
+
processKind: options.processKind,
|
|
88
|
+
projectId: options.projectId,
|
|
89
|
+
projectRoot: options.projectRoot,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
export function configureLogging(config) {
|
|
93
|
+
runtimeConfig = {
|
|
94
|
+
...runtimeConfig,
|
|
95
|
+
...config,
|
|
96
|
+
enabled: config.enabled ?? runtimeConfig.enabled,
|
|
97
|
+
level: normalizeLevel(config.level, runtimeConfig.level),
|
|
98
|
+
categories: normalizeCategories(config.categories ?? runtimeConfig.categories),
|
|
99
|
+
maxBytes: config.maxBytes ?? runtimeConfig.maxBytes,
|
|
100
|
+
maxFiles: config.maxFiles ?? runtimeConfig.maxFiles,
|
|
101
|
+
path: config.path ?? runtimeConfig.path,
|
|
102
|
+
processKind: config.processKind ?? runtimeConfig.processKind,
|
|
103
|
+
};
|
|
104
|
+
return { ...runtimeConfig, categories: [...runtimeConfig.categories] };
|
|
105
|
+
}
|
|
106
|
+
export function getLoggingConfig() {
|
|
107
|
+
return { ...runtimeConfig, categories: [...runtimeConfig.categories] };
|
|
108
|
+
}
|
|
109
|
+
export function resetLoggingForTests() {
|
|
110
|
+
runtimeConfig = { ...DEFAULT_RUNTIME_CONFIG, categories: [...DEFAULT_RUNTIME_CONFIG.categories] };
|
|
111
|
+
}
|
|
112
|
+
function shouldLog(level, category) {
|
|
113
|
+
if (!runtimeConfig.enabled || !runtimeConfig.path)
|
|
114
|
+
return false;
|
|
115
|
+
if (LEVEL_PRIORITY[level] > LEVEL_PRIORITY[runtimeConfig.level])
|
|
116
|
+
return false;
|
|
117
|
+
return runtimeConfig.categories.includes("*") || runtimeConfig.categories.includes(category);
|
|
118
|
+
}
|
|
119
|
+
function rotatedPath(path, index) {
|
|
120
|
+
return `${path}.${index}`;
|
|
121
|
+
}
|
|
122
|
+
function rotateIfNeeded(path, incomingBytes) {
|
|
123
|
+
if (runtimeConfig.maxBytes <= 0 || runtimeConfig.maxFiles <= 0 || !existsSync(path))
|
|
124
|
+
return;
|
|
125
|
+
const size = statSync(path).size;
|
|
126
|
+
if (size + incomingBytes <= runtimeConfig.maxBytes)
|
|
127
|
+
return;
|
|
128
|
+
rmSync(rotatedPath(path, runtimeConfig.maxFiles), { force: true });
|
|
129
|
+
for (let i = runtimeConfig.maxFiles - 1; i >= 1; i -= 1) {
|
|
130
|
+
const source = rotatedPath(path, i);
|
|
131
|
+
if (existsSync(source)) {
|
|
132
|
+
renameSync(source, rotatedPath(path, i + 1));
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
renameSync(path, rotatedPath(path, 1));
|
|
136
|
+
}
|
|
137
|
+
function writeRecord(record) {
|
|
138
|
+
const line = `${JSON.stringify(record)}\n`;
|
|
139
|
+
try {
|
|
140
|
+
mkdirSync(dirname(runtimeConfig.path), { recursive: true });
|
|
141
|
+
rotateIfNeeded(runtimeConfig.path, Buffer.byteLength(line));
|
|
142
|
+
appendFileSync(runtimeConfig.path, line);
|
|
143
|
+
}
|
|
144
|
+
catch {
|
|
145
|
+
// Logging must never break aimux runtime behavior.
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
function sanitizeLogString(value) {
|
|
149
|
+
return value.replace(SENSITIVE_ASSIGNMENT_PATTERN, (match, assignment) => {
|
|
150
|
+
const name = assignment.slice(0, -1);
|
|
151
|
+
return isSensitiveLogName(name) ? `${assignment}<redacted>` : match;
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
function isSensitiveLogName(name) {
|
|
155
|
+
const normalized = name.toLowerCase();
|
|
156
|
+
return (normalized.includes("token") ||
|
|
157
|
+
normalized.includes("secret") ||
|
|
158
|
+
normalized.includes("password") ||
|
|
159
|
+
normalized.includes("credential") ||
|
|
160
|
+
normalized.includes("authorization") ||
|
|
161
|
+
normalized.includes("auth") ||
|
|
162
|
+
normalized === "key" ||
|
|
163
|
+
normalized.endsWith("key") ||
|
|
164
|
+
normalized.includes("_key"));
|
|
165
|
+
}
|
|
166
|
+
function sanitizeLogValue(value, seen = new WeakSet()) {
|
|
167
|
+
if (typeof value === "string")
|
|
168
|
+
return sanitizeLogString(value);
|
|
169
|
+
if (value === null || typeof value !== "object")
|
|
170
|
+
return value;
|
|
171
|
+
const jsonLike = value;
|
|
172
|
+
if (typeof jsonLike.toJSON === "function") {
|
|
173
|
+
try {
|
|
174
|
+
const serialized = jsonLike.toJSON();
|
|
175
|
+
if (serialized !== value)
|
|
176
|
+
return sanitizeLogValue(serialized, seen);
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
// Fall through to structural sanitization.
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
if (seen.has(value))
|
|
183
|
+
return "[Circular]";
|
|
184
|
+
seen.add(value);
|
|
185
|
+
if (Array.isArray(value))
|
|
186
|
+
return value.map((entry) => sanitizeLogValue(entry, seen));
|
|
187
|
+
const output = {};
|
|
188
|
+
for (const [key, fieldValue] of Object.entries(value)) {
|
|
189
|
+
output[key] = isSensitiveLogName(key) ? "<redacted>" : sanitizeLogValue(fieldValue, seen);
|
|
6
190
|
}
|
|
7
|
-
return
|
|
191
|
+
return output;
|
|
8
192
|
}
|
|
193
|
+
function sanitizeLogFields(fields) {
|
|
194
|
+
if (!fields)
|
|
195
|
+
return undefined;
|
|
196
|
+
return sanitizeLogValue(fields);
|
|
197
|
+
}
|
|
198
|
+
export function logAt(level, message, category = "general", fields) {
|
|
199
|
+
if (!shouldLog(level, category))
|
|
200
|
+
return;
|
|
201
|
+
writeRecord({
|
|
202
|
+
ts: new Date().toISOString(),
|
|
203
|
+
level,
|
|
204
|
+
category,
|
|
205
|
+
message: sanitizeLogString(message),
|
|
206
|
+
pid: process.pid,
|
|
207
|
+
processKind: runtimeConfig.processKind,
|
|
208
|
+
projectId: runtimeConfig.projectId,
|
|
209
|
+
projectRoot: runtimeConfig.projectRoot,
|
|
210
|
+
fields: sanitizeLogFields(fields),
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
export const log = {
|
|
214
|
+
error: (message, category, fields) => logAt("error", message, category, fields),
|
|
215
|
+
warn: (message, category, fields) => logAt("warn", message, category, fields),
|
|
216
|
+
info: (message, category, fields) => logAt("info", message, category, fields),
|
|
217
|
+
debug: (message, category, fields) => logAt("debug", message, category, fields),
|
|
218
|
+
trace: (message, category, fields) => logAt("trace", message, category, fields),
|
|
219
|
+
};
|
|
9
220
|
export function debug(msg, category) {
|
|
10
|
-
|
|
11
|
-
const ts = new Date().toISOString().slice(11, 23);
|
|
12
|
-
const prefix = category ? `[${ts}] [${category}]` : `[${ts}]`;
|
|
13
|
-
s.write(`${prefix} ${msg}\n`);
|
|
221
|
+
log.debug(msg, category);
|
|
14
222
|
}
|
|
15
223
|
export function debugContext(action, file, sizeBytes) {
|
|
16
224
|
const sizeKB = (sizeBytes / 1024).toFixed(1);
|
|
@@ -32,10 +240,6 @@ export function debugGit(filesChanged, diffLen) {
|
|
|
32
240
|
debug(`git: ${filesChanged} files changed, diff ${diffLen} chars`, "git");
|
|
33
241
|
}
|
|
34
242
|
export function closeDebug() {
|
|
35
|
-
|
|
36
|
-
debug("--- aimux session ended ---");
|
|
37
|
-
stream.end();
|
|
38
|
-
stream = null;
|
|
39
|
-
}
|
|
243
|
+
log.info("--- aimux session ended ---", "lifecycle");
|
|
40
244
|
}
|
|
41
245
|
//# sourceMappingURL=debug.js.map
|
package/dist/debug.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../src/debug.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../src/debug.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { AimuxPluginAPI, AimuxPluginInstance } from "../plugin-runtime.js";
|
|
2
|
+
import { type RuntimeTopologySessionState } from "../runtime-core/topology-sessions.js";
|
|
2
3
|
interface SessionTarget {
|
|
3
4
|
id: string;
|
|
4
5
|
worktreePath?: string;
|
|
5
6
|
}
|
|
6
|
-
export declare function collectGithubPrTargets(statusline: any, state: any, metadata: any): SessionTarget[];
|
|
7
|
+
export declare function collectGithubPrTargets(statusline: any, state: any, metadata: any, topologySessions?: RuntimeTopologySessionState[]): SessionTarget[];
|
|
7
8
|
export declare function createGithubPrContextPlugin(api: AimuxPluginAPI): AimuxPluginInstance;
|
|
8
9
|
export {};
|
|
@@ -3,6 +3,8 @@ import { existsSync, mkdirSync, readFileSync } from "node:fs";
|
|
|
3
3
|
import { basename, join, resolve } from "node:path";
|
|
4
4
|
import { getProjectStateDirFor } from "../paths.js";
|
|
5
5
|
import { writeJsonAtomic } from "../atomic-write.js";
|
|
6
|
+
import { createRuntimeTopologyStore } from "../runtime-core/topology-store.js";
|
|
7
|
+
import { listTopologySessionStates } from "../runtime-core/topology-sessions.js";
|
|
6
8
|
const POLL_INTERVAL_MS = 60_000;
|
|
7
9
|
const PR_CACHE_TTL_MS = 5 * 60_000;
|
|
8
10
|
const PR_CACHE_PENDING_TTL_MS = 20_000;
|
|
@@ -104,21 +106,19 @@ async function resolveBranchPr(cwd, repo, branch) {
|
|
|
104
106
|
function stableSerialize(value) {
|
|
105
107
|
return JSON.stringify(value ?? null);
|
|
106
108
|
}
|
|
107
|
-
export function collectGithubPrTargets(statusline, state, metadata) {
|
|
109
|
+
export function collectGithubPrTargets(statusline, state, metadata, topologySessions = []) {
|
|
108
110
|
const targets = new Map();
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
targets.set(session.id, {
|
|
112
|
-
id: session.id,
|
|
113
|
-
worktreePath: session.worktreePath ?? existingContext.worktreePath ?? existingContext.cwd,
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
for (const session of state?.sessions ?? []) {
|
|
111
|
+
const statuslineById = new Map((statusline?.sessions ?? []).map((session) => [session.id, session]));
|
|
112
|
+
for (const session of topologySessions) {
|
|
117
113
|
if (!targets.has(session.id)) {
|
|
114
|
+
const statuslineSession = statuslineById.get(session.id);
|
|
118
115
|
const existingContext = metadata?.sessions?.[session.id]?.context ?? {};
|
|
119
116
|
targets.set(session.id, {
|
|
120
117
|
id: session.id,
|
|
121
|
-
worktreePath: session.worktreePath ??
|
|
118
|
+
worktreePath: session.worktreePath ??
|
|
119
|
+
statuslineSession?.worktreePath ??
|
|
120
|
+
existingContext.worktreePath ??
|
|
121
|
+
existingContext.cwd,
|
|
122
122
|
});
|
|
123
123
|
}
|
|
124
124
|
}
|
|
@@ -136,8 +136,10 @@ export function createGithubPrContextPlugin(api) {
|
|
|
136
136
|
const projectStateDir = getProjectStateDirFor(api.projectRoot);
|
|
137
137
|
const statuslinePath = join(projectStateDir, "statusline.json");
|
|
138
138
|
const statePath = join(projectStateDir, "state.json");
|
|
139
|
+
const runtimeTopologyPath = join(projectStateDir, "runtime-topology.yaml");
|
|
139
140
|
const metadataPath = join(projectStateDir, "metadata.json");
|
|
140
141
|
const prCachePath = join(projectStateDir, "plugin-cache", "gh-pr-context.json");
|
|
142
|
+
const topologyStore = createRuntimeTopologyStore(runtimeTopologyPath);
|
|
141
143
|
const prCache = new Map();
|
|
142
144
|
const contextCache = new Map();
|
|
143
145
|
const fileCache = new Map();
|
|
@@ -169,7 +171,11 @@ export function createGithubPrContextPlugin(api) {
|
|
|
169
171
|
const statusline = loadCachedJson(statuslinePath);
|
|
170
172
|
const state = loadCachedJson(statePath);
|
|
171
173
|
const metadata = loadCachedJson(metadataPath);
|
|
172
|
-
|
|
174
|
+
const topologySessions = listTopologySessionStates({
|
|
175
|
+
statuses: ["running", "idle", "offline"],
|
|
176
|
+
store: topologyStore,
|
|
177
|
+
});
|
|
178
|
+
return collectGithubPrTargets(statusline, state, metadata, topologySessions);
|
|
173
179
|
}
|
|
174
180
|
async function resolveCachedPr(repoRoot, cwd, repo, branch) {
|
|
175
181
|
const cacheKey = `${repoRoot}::${branch ?? ""}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gh-pr-context.js","sourceRoot":"","sources":["../../src/default-plugins/gh-pr-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"gh-pr-context.js","sourceRoot":"","sources":["../../src/default-plugins/gh-pr-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { existsSync, readFileSync } from "node:fs";
|
|
1
|
+
import { existsSync, readFileSync, statSync } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { readHistory } from "../context/history.js";
|
|
4
4
|
import { loadConfig } from "../config.js";
|
|
5
5
|
import { getContextDir } from "../paths.js";
|
|
6
|
+
import { loadMetadataState } from "../metadata-store.js";
|
|
6
7
|
function formatBytes(bytes) {
|
|
7
8
|
if (bytes < 1024)
|
|
8
9
|
return `${bytes}b`;
|
|
@@ -34,8 +35,20 @@ function transcriptBytesSinceCheckpoint(sessionId) {
|
|
|
34
35
|
const turns = readHistory(sessionId, lastTurnTs ? { since: lastTurnTs } : undefined).filter((turn) => !lastTurnTs || turn.ts > lastTurnTs);
|
|
35
36
|
return turns.reduce((total, turn) => total + Buffer.byteLength(`${JSON.stringify(turn)}\n`), 0);
|
|
36
37
|
}
|
|
38
|
+
function externalTranscriptBytes(sessionId) {
|
|
39
|
+
const transcriptPath = loadMetadataState().sessions[sessionId]?.context?.transcriptPath;
|
|
40
|
+
if (!transcriptPath)
|
|
41
|
+
return undefined;
|
|
42
|
+
try {
|
|
43
|
+
const stat = statSync(transcriptPath);
|
|
44
|
+
return stat.isFile() ? stat.size : undefined;
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
37
50
|
function buildSegmentText(sessionId) {
|
|
38
|
-
const bytes = transcriptBytesSinceCheckpoint(sessionId);
|
|
51
|
+
const bytes = externalTranscriptBytes(sessionId) ?? transcriptBytesSinceCheckpoint(sessionId);
|
|
39
52
|
return formatBytes(bytes);
|
|
40
53
|
}
|
|
41
54
|
export function createTranscriptLengthPlugin(api, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcript-length.js","sourceRoot":"","sources":["../../src/default-plugins/transcript-length.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"transcript-length.js","sourceRoot":"","sources":["../../src/default-plugins/transcript-length.ts"],"names":[],"mappings":"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"}
|
package/dist/fast-control.js
CHANGED
|
@@ -32,12 +32,17 @@ export function resolveScopedWorktreePath(projectRoot, currentPath) {
|
|
|
32
32
|
const match = worktrees.find((worktreePath) => fallback === worktreePath || fallback.startsWith(`${worktreePath}/`));
|
|
33
33
|
return match ?? fallback;
|
|
34
34
|
}
|
|
35
|
-
function resolveContextWorktreePath(context,
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
35
|
+
function resolveContextWorktreePath(context, currentManagedWindow) {
|
|
36
|
+
if (currentManagedWindow?.metadata.worktreePath) {
|
|
37
|
+
return pathResolve(currentManagedWindow.metadata.worktreePath);
|
|
38
|
+
}
|
|
39
|
+
return resolveScopedWorktreePath(context.projectRoot, context.currentPath);
|
|
40
|
+
}
|
|
41
|
+
function resolveCurrentManagedWindow(context, tmux, managedWindows) {
|
|
42
|
+
if (context.currentWindowId) {
|
|
43
|
+
const byWindowId = managedWindows.find((entry) => entry.target.windowId === context.currentWindowId);
|
|
44
|
+
if (byWindowId)
|
|
45
|
+
return byWindowId;
|
|
41
46
|
}
|
|
42
47
|
const currentClientSession = context.currentClientSession?.trim();
|
|
43
48
|
if (currentClientSession) {
|
|
@@ -46,12 +51,25 @@ function resolveContextWorktreePath(context, tmux, managedWindows) {
|
|
|
46
51
|
.find((window) => window.active && !isDashboardWindowName(window.name));
|
|
47
52
|
if (currentClientWindow) {
|
|
48
53
|
const byActiveClientWindow = managedWindows.find((entry) => entry.target.windowId === currentClientWindow.id);
|
|
49
|
-
if (byActiveClientWindow
|
|
50
|
-
return
|
|
51
|
-
}
|
|
54
|
+
if (byActiveClientWindow)
|
|
55
|
+
return byActiveClientWindow;
|
|
52
56
|
}
|
|
53
57
|
}
|
|
54
|
-
return
|
|
58
|
+
return managedWindows.find(({ target, metadata }) => target.windowName === context.currentWindow || metadata.label === context.currentWindow);
|
|
59
|
+
}
|
|
60
|
+
function compareSwitchableWindows(left, right, teammateParentSessionId) {
|
|
61
|
+
if (teammateParentSessionId) {
|
|
62
|
+
const leftOrder = typeof left.metadata.team?.order === "number" ? left.metadata.team.order : Number.POSITIVE_INFINITY;
|
|
63
|
+
const rightOrder = typeof right.metadata.team?.order === "number" ? right.metadata.team.order : Number.POSITIVE_INFINITY;
|
|
64
|
+
if (leftOrder !== rightOrder)
|
|
65
|
+
return leftOrder - rightOrder;
|
|
66
|
+
return left.target.windowIndex - right.target.windowIndex;
|
|
67
|
+
}
|
|
68
|
+
const kindRank = left.metadata.kind === "service" ? 1 : 0;
|
|
69
|
+
const otherKindRank = right.metadata.kind === "service" ? 1 : 0;
|
|
70
|
+
if (kindRank !== otherKindRank)
|
|
71
|
+
return kindRank - otherKindRank;
|
|
72
|
+
return left.target.windowIndex - right.target.windowIndex;
|
|
55
73
|
}
|
|
56
74
|
function urgencyFor(projectRoot, sessionId) {
|
|
57
75
|
if (!sessionId)
|
|
@@ -70,21 +88,20 @@ export function listSwitchableAgentItems(context, tmux = new TmuxRuntimeManager(
|
|
|
70
88
|
const tmuxSession = tmux.getProjectSession(context.projectRoot);
|
|
71
89
|
const recentRankMap = getRecentRankMap(context.projectRoot, context.currentClientSession);
|
|
72
90
|
const managedWindows = tmux.listManagedWindows(tmuxSession.sessionName);
|
|
73
|
-
const
|
|
91
|
+
const currentManagedWindow = resolveCurrentManagedWindow(context, tmux, managedWindows);
|
|
92
|
+
const teammateParentSessionId = currentManagedWindow?.metadata.team?.parentSessionId;
|
|
93
|
+
const scopedWorktreePath = resolveContextWorktreePath(context, currentManagedWindow);
|
|
74
94
|
let managed = managedWindows
|
|
75
95
|
.filter(({ target, metadata }) => {
|
|
76
96
|
if (isDashboardWindowName(target.windowName))
|
|
77
97
|
return false;
|
|
98
|
+
if (teammateParentSessionId) {
|
|
99
|
+
return metadata.kind !== "service" && metadata.team?.parentSessionId === teammateParentSessionId;
|
|
100
|
+
}
|
|
78
101
|
const worktreePath = metadata.worktreePath || context.projectRoot;
|
|
79
|
-
return pathResolve(worktreePath) === scopedWorktreePath;
|
|
80
|
-
})
|
|
81
|
-
.sort((a, b) => {
|
|
82
|
-
const kindRank = a.metadata.kind === "service" ? 1 : 0;
|
|
83
|
-
const otherKindRank = b.metadata.kind === "service" ? 1 : 0;
|
|
84
|
-
if (kindRank !== otherKindRank)
|
|
85
|
-
return kindRank - otherKindRank;
|
|
86
|
-
return a.target.windowIndex - b.target.windowIndex;
|
|
102
|
+
return !metadata.team && pathResolve(worktreePath) === scopedWorktreePath;
|
|
87
103
|
})
|
|
104
|
+
.sort((a, b) => compareSwitchableWindows(a, b, teammateParentSessionId))
|
|
88
105
|
.map((entry) => ({
|
|
89
106
|
...entry,
|
|
90
107
|
id: entry.metadata.sessionId,
|
|
@@ -92,6 +109,7 @@ export function listSwitchableAgentItems(context, tmux = new TmuxRuntimeManager(
|
|
|
92
109
|
kind: entry.metadata.kind === "service" ? "service" : "agent",
|
|
93
110
|
tool: entry.metadata.command || entry.target.windowName,
|
|
94
111
|
label: entry.metadata.label,
|
|
112
|
+
launchCommandLine: entry.metadata.launchCommandLine,
|
|
95
113
|
role: entry.metadata.role,
|
|
96
114
|
id: entry.metadata.sessionId,
|
|
97
115
|
}),
|
package/dist/fast-control.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fast-control.js","sourceRoot":"","sources":["../src/fast-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EACL,qBAAqB,EACrB,kBAAkB,GAGnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"fast-control.js","sourceRoot":"","sources":["../src/fast-control.ts"],"names":[],"mappings":"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"}
|