aimux-cli 0.1.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 +743 -0
- package/bin/aimux +2 -0
- package/dist/agent-events.d.ts +20 -0
- package/dist/agent-events.js +2 -0
- package/dist/agent-events.js.map +1 -0
- package/dist/agent-message-parts.d.ts +17 -0
- package/dist/agent-message-parts.js +31 -0
- package/dist/agent-message-parts.js.map +1 -0
- package/dist/agent-output-parser.d.ts +16 -0
- package/dist/agent-output-parser.js +229 -0
- package/dist/agent-output-parser.js.map +1 -0
- package/dist/agent-tracker.d.ts +9 -0
- package/dist/agent-tracker.js +144 -0
- package/dist/agent-tracker.js.map +1 -0
- package/dist/agent-watcher.d.ts +15 -0
- package/dist/agent-watcher.js +2 -0
- package/dist/agent-watcher.js.map +1 -0
- package/dist/attachment-store.d.ts +35 -0
- package/dist/attachment-store.js +129 -0
- package/dist/attachment-store.js.map +1 -0
- package/dist/builtin-metadata-watchers.d.ts +2 -0
- package/dist/builtin-metadata-watchers.js +275 -0
- package/dist/builtin-metadata-watchers.js.map +1 -0
- package/dist/claude-hooks.d.ts +29 -0
- package/dist/claude-hooks.js +106 -0
- package/dist/claude-hooks.js.map +1 -0
- package/dist/config.d.ts +78 -0
- package/dist/config.js +172 -0
- package/dist/config.js.map +1 -0
- package/dist/context/compactor.d.ts +20 -0
- package/dist/context/compactor.js +212 -0
- package/dist/context/compactor.js.map +1 -0
- package/dist/context/context-bridge.d.ts +67 -0
- package/dist/context/context-bridge.js +471 -0
- package/dist/context/context-bridge.js.map +1 -0
- package/dist/context/context-file.d.ts +11 -0
- package/dist/context/context-file.js +93 -0
- package/dist/context/context-file.js.map +1 -0
- package/dist/context/history.d.ts +40 -0
- package/dist/context/history.js +108 -0
- package/dist/context/history.js.map +1 -0
- package/dist/daemon.d.ts +39 -0
- package/dist/daemon.js +344 -0
- package/dist/daemon.js.map +1 -0
- package/dist/dashboard-session-registry.d.ts +47 -0
- package/dist/dashboard-session-registry.js +161 -0
- package/dist/dashboard-session-registry.js.map +1 -0
- package/dist/dashboard-state.d.ts +18 -0
- package/dist/dashboard-state.js +26 -0
- package/dist/dashboard-state.js.map +1 -0
- package/dist/dashboard.d.ts +118 -0
- package/dist/dashboard.js +91 -0
- package/dist/dashboard.js.map +1 -0
- package/dist/debug.d.ts +7 -0
- package/dist/debug.js +41 -0
- package/dist/debug.js.map +1 -0
- package/dist/fast-control.d.ts +45 -0
- package/dist/fast-control.js +174 -0
- package/dist/fast-control.js.map +1 -0
- package/dist/hotkeys.d.ts +44 -0
- package/dist/hotkeys.js +118 -0
- package/dist/hotkeys.js.map +1 -0
- package/dist/http-client.d.ts +10 -0
- package/dist/http-client.js +54 -0
- package/dist/http-client.js.map +1 -0
- package/dist/instance-directory.d.ts +32 -0
- package/dist/instance-directory.js +82 -0
- package/dist/instance-directory.js.map +1 -0
- package/dist/instance-registry.d.ts +38 -0
- package/dist/instance-registry.js +208 -0
- package/dist/instance-registry.js.map +1 -0
- package/dist/key-parser.d.ts +30 -0
- package/dist/key-parser.js +272 -0
- package/dist/key-parser.js.map +1 -0
- package/dist/last-used.d.ts +31 -0
- package/dist/last-used.js +93 -0
- package/dist/last-used.js.map +1 -0
- package/dist/main.d.ts +1 -0
- package/dist/main.js +2483 -0
- package/dist/main.js.map +1 -0
- package/dist/metadata-server.d.ts +268 -0
- package/dist/metadata-server.js +1379 -0
- package/dist/metadata-server.js.map +1 -0
- package/dist/metadata-store.d.ts +80 -0
- package/dist/metadata-store.js +87 -0
- package/dist/metadata-store.js.map +1 -0
- package/dist/multiplexer.d.ts +471 -0
- package/dist/multiplexer.js +5714 -0
- package/dist/multiplexer.js.map +1 -0
- package/dist/notification-context.d.ts +18 -0
- package/dist/notification-context.js +68 -0
- package/dist/notification-context.js.map +1 -0
- package/dist/notifications.d.ts +38 -0
- package/dist/notifications.js +111 -0
- package/dist/notifications.js.map +1 -0
- package/dist/notify.d.ts +10 -0
- package/dist/notify.js +62 -0
- package/dist/notify.js.map +1 -0
- package/dist/orchestration-actions.d.ts +76 -0
- package/dist/orchestration-actions.js +310 -0
- package/dist/orchestration-actions.js.map +1 -0
- package/dist/orchestration-dispatcher.d.ts +22 -0
- package/dist/orchestration-dispatcher.js +49 -0
- package/dist/orchestration-dispatcher.js.map +1 -0
- package/dist/orchestration-routing.d.ts +20 -0
- package/dist/orchestration-routing.js +78 -0
- package/dist/orchestration-routing.js.map +1 -0
- package/dist/orchestration.d.ts +26 -0
- package/dist/orchestration.js +110 -0
- package/dist/orchestration.js.map +1 -0
- package/dist/osc-notifications.d.ts +15 -0
- package/dist/osc-notifications.js +180 -0
- package/dist/osc-notifications.js.map +1 -0
- package/dist/paths.d.ts +55 -0
- package/dist/paths.js +259 -0
- package/dist/paths.js.map +1 -0
- package/dist/plugin-runtime.d.ts +46 -0
- package/dist/plugin-runtime.js +180 -0
- package/dist/plugin-runtime.js.map +1 -0
- package/dist/project-events.d.ts +36 -0
- package/dist/project-events.js +63 -0
- package/dist/project-events.js.map +1 -0
- package/dist/project-scanner.d.ts +38 -0
- package/dist/project-scanner.js +243 -0
- package/dist/project-scanner.js.map +1 -0
- package/dist/project-service-manifest.d.ts +18 -0
- package/dist/project-service-manifest.js +56 -0
- package/dist/project-service-manifest.js.map +1 -0
- package/dist/recency.d.ts +2 -0
- package/dist/recency.js +34 -0
- package/dist/recency.js.map +1 -0
- package/dist/recorder.d.ts +14 -0
- package/dist/recorder.js +130 -0
- package/dist/recorder.js.map +1 -0
- package/dist/session-bootstrap.d.ts +45 -0
- package/dist/session-bootstrap.js +436 -0
- package/dist/session-bootstrap.js.map +1 -0
- package/dist/session-message-history.d.ts +27 -0
- package/dist/session-message-history.js +105 -0
- package/dist/session-message-history.js.map +1 -0
- package/dist/session-runtime.d.ts +44 -0
- package/dist/session-runtime.js +56 -0
- package/dist/session-runtime.js.map +1 -0
- package/dist/session-semantics.d.ts +35 -0
- package/dist/session-semantics.js +110 -0
- package/dist/session-semantics.js.map +1 -0
- package/dist/status-detector.d.ts +17 -0
- package/dist/status-detector.js +67 -0
- package/dist/status-detector.js.map +1 -0
- package/dist/statusline-model.d.ts +103 -0
- package/dist/statusline-model.js +177 -0
- package/dist/statusline-model.js.map +1 -0
- package/dist/task-dispatcher.d.ts +63 -0
- package/dist/task-dispatcher.js +210 -0
- package/dist/task-dispatcher.js.map +1 -0
- package/dist/task-workflow.d.ts +13 -0
- package/dist/task-workflow.js +153 -0
- package/dist/task-workflow.js.map +1 -0
- package/dist/tasks.d.ts +60 -0
- package/dist/tasks.js +120 -0
- package/dist/tasks.js.map +1 -0
- package/dist/team.d.ts +28 -0
- package/dist/team.js +91 -0
- package/dist/team.js.map +1 -0
- package/dist/terminal-host.d.ts +10 -0
- package/dist/terminal-host.js +52 -0
- package/dist/terminal-host.js.map +1 -0
- package/dist/threads.d.ts +61 -0
- package/dist/threads.js +200 -0
- package/dist/threads.js.map +1 -0
- package/dist/tmux-doctor.d.ts +47 -0
- package/dist/tmux-doctor.js +112 -0
- package/dist/tmux-doctor.js.map +1 -0
- package/dist/tmux-runtime-manager.d.ts +164 -0
- package/dist/tmux-runtime-manager.js +794 -0
- package/dist/tmux-runtime-manager.js.map +1 -0
- package/dist/tmux-session-transport.d.ts +31 -0
- package/dist/tmux-session-transport.js +115 -0
- package/dist/tmux-session-transport.js.map +1 -0
- package/dist/tmux-statusline.d.ts +17 -0
- package/dist/tmux-statusline.js +166 -0
- package/dist/tmux-statusline.js.map +1 -0
- package/dist/tool-output-watchers.d.ts +10 -0
- package/dist/tool-output-watchers.js +190 -0
- package/dist/tool-output-watchers.js.map +1 -0
- package/dist/tui/render/box.d.ts +1 -0
- package/dist/tui/render/box.js +20 -0
- package/dist/tui/render/box.js.map +1 -0
- package/dist/tui/render/text.d.ts +8 -0
- package/dist/tui/render/text.js +92 -0
- package/dist/tui/render/text.js.map +1 -0
- package/dist/tui/screens/dashboard-renderers.d.ts +23 -0
- package/dist/tui/screens/dashboard-renderers.js +411 -0
- package/dist/tui/screens/dashboard-renderers.js.map +1 -0
- package/dist/tui/screens/overlay-renderers.d.ts +10 -0
- package/dist/tui/screens/overlay-renderers.js +274 -0
- package/dist/tui/screens/overlay-renderers.js.map +1 -0
- package/dist/tui/screens/subscreen-renderers.d.ts +9 -0
- package/dist/tui/screens/subscreen-renderers.js +327 -0
- package/dist/tui/screens/subscreen-renderers.js.map +1 -0
- package/dist/workflow.d.ts +19 -0
- package/dist/workflow.js +111 -0
- package/dist/workflow.js.map +1 -0
- package/dist/worktree.d.ts +23 -0
- package/dist/worktree.js +101 -0
- package/dist/worktree.js.map +1 -0
- package/package.json +70 -0
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
import { resolve as pathResolve } from "node:path";
|
|
2
|
+
import { loadMetadataState } from "./metadata-store.js";
|
|
3
|
+
import { compareLastUsed, getLastUsedAt, getRecentRankMap } from "./last-used.js";
|
|
4
|
+
import { parseRecencyTimestamp } from "./recency.js";
|
|
5
|
+
import { isDashboardWindowName, TmuxRuntimeManager, } from "./tmux-runtime-manager.js";
|
|
6
|
+
import { compactSessionTitle } from "./statusline-model.js";
|
|
7
|
+
import { listWorktrees } from "./worktree.js";
|
|
8
|
+
export function navigationUrgencyScore(input) {
|
|
9
|
+
if (input.semantic) {
|
|
10
|
+
const semanticAttention = input.semantic.attention;
|
|
11
|
+
if (semanticAttention === "error")
|
|
12
|
+
return 5;
|
|
13
|
+
if (semanticAttention === "needs_input")
|
|
14
|
+
return 4;
|
|
15
|
+
if (semanticAttention === "blocked")
|
|
16
|
+
return 3;
|
|
17
|
+
if ((input.semantic.unseenCount ?? 0) > 0)
|
|
18
|
+
return 2;
|
|
19
|
+
if (input.semantic.activity === "done")
|
|
20
|
+
return 1;
|
|
21
|
+
return 0;
|
|
22
|
+
}
|
|
23
|
+
if (input.attention === "error")
|
|
24
|
+
return 5;
|
|
25
|
+
if (input.attention === "needs_input")
|
|
26
|
+
return 4;
|
|
27
|
+
if (input.attention === "blocked")
|
|
28
|
+
return 3;
|
|
29
|
+
if ((input.unseenCount ?? 0) > 0)
|
|
30
|
+
return 2;
|
|
31
|
+
if (input.activity === "done")
|
|
32
|
+
return 1;
|
|
33
|
+
return 0;
|
|
34
|
+
}
|
|
35
|
+
export function resolveScopedWorktreePath(projectRoot, currentPath) {
|
|
36
|
+
const fallback = pathResolve(currentPath || projectRoot);
|
|
37
|
+
const worktrees = listWorktrees(projectRoot)
|
|
38
|
+
.map((worktree) => pathResolve(worktree.path))
|
|
39
|
+
.sort((a, b) => b.length - a.length);
|
|
40
|
+
const match = worktrees.find((worktreePath) => fallback === worktreePath || fallback.startsWith(`${worktreePath}/`));
|
|
41
|
+
return match ?? fallback;
|
|
42
|
+
}
|
|
43
|
+
function resolveContextWorktreePath(context, tmux, managedWindows) {
|
|
44
|
+
const byWindowId = context.currentWindowId
|
|
45
|
+
? managedWindows.find((entry) => entry.target.windowId === context.currentWindowId)
|
|
46
|
+
: undefined;
|
|
47
|
+
if (byWindowId?.metadata.worktreePath) {
|
|
48
|
+
return pathResolve(byWindowId.metadata.worktreePath);
|
|
49
|
+
}
|
|
50
|
+
const currentClientSession = context.currentClientSession?.trim();
|
|
51
|
+
if (currentClientSession) {
|
|
52
|
+
const currentClientWindow = tmux
|
|
53
|
+
.listWindows(currentClientSession)
|
|
54
|
+
.find((window) => window.active && !isDashboardWindowName(window.name));
|
|
55
|
+
if (currentClientWindow) {
|
|
56
|
+
const byActiveClientWindow = managedWindows.find((entry) => entry.target.windowId === currentClientWindow.id);
|
|
57
|
+
if (byActiveClientWindow?.metadata.worktreePath) {
|
|
58
|
+
return pathResolve(byActiveClientWindow.metadata.worktreePath);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
return resolveScopedWorktreePath(context.projectRoot, context.currentPath);
|
|
63
|
+
}
|
|
64
|
+
function urgencyFor(projectRoot, sessionId) {
|
|
65
|
+
if (!sessionId)
|
|
66
|
+
return 0;
|
|
67
|
+
const derived = loadMetadataState(projectRoot).sessions[sessionId]?.derived;
|
|
68
|
+
return navigationUrgencyScore(derived ?? {});
|
|
69
|
+
}
|
|
70
|
+
export function listSwitchableAgentItems(context, tmux = new TmuxRuntimeManager()) {
|
|
71
|
+
const tmuxSession = tmux.getProjectSession(context.projectRoot);
|
|
72
|
+
const recentRankMap = getRecentRankMap(context.projectRoot, context.currentClientSession);
|
|
73
|
+
const managedWindows = tmux.listManagedWindows(tmuxSession.sessionName);
|
|
74
|
+
const scopedWorktreePath = resolveContextWorktreePath(context, tmux, managedWindows);
|
|
75
|
+
let managed = managedWindows
|
|
76
|
+
.filter(({ target, metadata }) => {
|
|
77
|
+
if (isDashboardWindowName(target.windowName))
|
|
78
|
+
return false;
|
|
79
|
+
const worktreePath = metadata.worktreePath || context.projectRoot;
|
|
80
|
+
return pathResolve(worktreePath) === scopedWorktreePath;
|
|
81
|
+
})
|
|
82
|
+
.sort((a, b) => {
|
|
83
|
+
const kindRank = a.metadata.kind === "service" ? 1 : 0;
|
|
84
|
+
const otherKindRank = b.metadata.kind === "service" ? 1 : 0;
|
|
85
|
+
if (kindRank !== otherKindRank)
|
|
86
|
+
return kindRank - otherKindRank;
|
|
87
|
+
return a.target.windowIndex - b.target.windowIndex;
|
|
88
|
+
})
|
|
89
|
+
.map((entry) => ({
|
|
90
|
+
...entry,
|
|
91
|
+
id: entry.metadata.sessionId,
|
|
92
|
+
label: compactSessionTitle({
|
|
93
|
+
kind: entry.metadata.kind === "service" ? "service" : "agent",
|
|
94
|
+
tool: entry.metadata.command || entry.target.windowName,
|
|
95
|
+
label: entry.metadata.label,
|
|
96
|
+
role: entry.metadata.role,
|
|
97
|
+
id: entry.metadata.sessionId,
|
|
98
|
+
}),
|
|
99
|
+
urgency: urgencyFor(context.projectRoot, entry.metadata.sessionId),
|
|
100
|
+
activity: entry.target.windowIndex,
|
|
101
|
+
lastUsedAt: getLastUsedAt(context.projectRoot, entry.metadata.sessionId),
|
|
102
|
+
recentRank: recentRankMap.get(entry.metadata.sessionId) ?? Number.MAX_SAFE_INTEGER,
|
|
103
|
+
}));
|
|
104
|
+
const activityByWindowId = new Map(tmux.listWindows(tmuxSession.sessionName).map((window) => [window.id, window.activity ?? 0]));
|
|
105
|
+
managed = managed.map((entry) => ({
|
|
106
|
+
...entry,
|
|
107
|
+
activity: activityByWindowId.get(entry.target.windowId) ?? 0,
|
|
108
|
+
}));
|
|
109
|
+
return managed;
|
|
110
|
+
}
|
|
111
|
+
export function resolveCurrentAgentIndex(items, context) {
|
|
112
|
+
const byId = context.currentWindowId
|
|
113
|
+
? items.findIndex(({ target }) => target.windowId === context.currentWindowId)
|
|
114
|
+
: -1;
|
|
115
|
+
if (byId >= 0)
|
|
116
|
+
return byId;
|
|
117
|
+
return items.findIndex(({ target, metadata }) => target.windowName === context.currentWindow || metadata.label === context.currentWindow);
|
|
118
|
+
}
|
|
119
|
+
export function resolveNextAgent(context, tmux = new TmuxRuntimeManager()) {
|
|
120
|
+
const items = listSwitchableAgentItems(context, tmux);
|
|
121
|
+
if (items.length === 0)
|
|
122
|
+
return null;
|
|
123
|
+
const currentIndex = resolveCurrentAgentIndex(items, context);
|
|
124
|
+
const resolvedIndex = currentIndex >= 0 ? currentIndex : 0;
|
|
125
|
+
return items[(resolvedIndex + 1) % items.length] ?? null;
|
|
126
|
+
}
|
|
127
|
+
export function resolvePrevAgent(context, tmux = new TmuxRuntimeManager()) {
|
|
128
|
+
const items = listSwitchableAgentItems(context, tmux);
|
|
129
|
+
if (items.length === 0)
|
|
130
|
+
return null;
|
|
131
|
+
const currentIndex = resolveCurrentAgentIndex(items, context);
|
|
132
|
+
const resolvedIndex = currentIndex >= 0 ? currentIndex : 0;
|
|
133
|
+
return items[(resolvedIndex - 1 + items.length) % items.length] ?? null;
|
|
134
|
+
}
|
|
135
|
+
export function resolveAttentionAgent(context, tmux = new TmuxRuntimeManager()) {
|
|
136
|
+
const items = listSwitchableAgentItems(context, tmux)
|
|
137
|
+
.filter((entry) => entry.urgency > 0)
|
|
138
|
+
.sort((a, b) => b.urgency - a.urgency);
|
|
139
|
+
if (items.length === 0)
|
|
140
|
+
return null;
|
|
141
|
+
const nonCurrent = items.find(({ target, metadata }) => {
|
|
142
|
+
return (target.windowId !== context.currentWindowId &&
|
|
143
|
+
target.windowName !== context.currentWindow &&
|
|
144
|
+
metadata.label !== context.currentWindow);
|
|
145
|
+
});
|
|
146
|
+
return nonCurrent ?? items[0] ?? null;
|
|
147
|
+
}
|
|
148
|
+
export function serializeFastControlItem(item) {
|
|
149
|
+
return {
|
|
150
|
+
target: item.target,
|
|
151
|
+
id: item.metadata.sessionId,
|
|
152
|
+
metadata: item.metadata,
|
|
153
|
+
label: item.label,
|
|
154
|
+
urgency: item.urgency,
|
|
155
|
+
activity: item.activity,
|
|
156
|
+
lastUsedAt: item.lastUsedAt,
|
|
157
|
+
recentRank: item.recentRank,
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
export function listSwitchableAgentMenuItems(context, tmux = new TmuxRuntimeManager()) {
|
|
161
|
+
const recentRankMap = getRecentRankMap(context.projectRoot, context.currentClientSession);
|
|
162
|
+
return [...listSwitchableAgentItems(context, tmux)].sort((a, b) => {
|
|
163
|
+
const lastUsedDiff = compareLastUsed(a, b, recentRankMap);
|
|
164
|
+
if (lastUsedDiff !== 0)
|
|
165
|
+
return lastUsedDiff;
|
|
166
|
+
if ((parseRecencyTimestamp(b.lastUsedAt) ?? 0) !== (parseRecencyTimestamp(a.lastUsedAt) ?? 0)) {
|
|
167
|
+
return (parseRecencyTimestamp(b.lastUsedAt) ?? 0) - (parseRecencyTimestamp(a.lastUsedAt) ?? 0);
|
|
168
|
+
}
|
|
169
|
+
if (b.activity !== a.activity)
|
|
170
|
+
return b.activity - a.activity;
|
|
171
|
+
return a.target.windowIndex - b.target.windowIndex;
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
//# sourceMappingURL=fast-control.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fast-control.js","sourceRoot":"","sources":["../src/fast-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
export type HotkeyAction = {
|
|
2
|
+
type: "dashboard";
|
|
3
|
+
} | {
|
|
4
|
+
type: "help";
|
|
5
|
+
} | {
|
|
6
|
+
type: "focus";
|
|
7
|
+
index: number;
|
|
8
|
+
} | {
|
|
9
|
+
type: "next";
|
|
10
|
+
} | {
|
|
11
|
+
type: "prev";
|
|
12
|
+
} | {
|
|
13
|
+
type: "create";
|
|
14
|
+
} | {
|
|
15
|
+
type: "kill";
|
|
16
|
+
} | {
|
|
17
|
+
type: "switcher";
|
|
18
|
+
} | {
|
|
19
|
+
type: "worktree-create";
|
|
20
|
+
} | {
|
|
21
|
+
type: "worktree-list";
|
|
22
|
+
} | {
|
|
23
|
+
type: "review";
|
|
24
|
+
} | {
|
|
25
|
+
type: "passthrough";
|
|
26
|
+
data: string;
|
|
27
|
+
};
|
|
28
|
+
export type ActionCallback = (action: HotkeyAction) => void;
|
|
29
|
+
export declare class HotkeyHandler {
|
|
30
|
+
private waitingForAction;
|
|
31
|
+
private timeout;
|
|
32
|
+
private onAction;
|
|
33
|
+
constructor(onAction: ActionCallback);
|
|
34
|
+
/**
|
|
35
|
+
* Process raw stdin data. Returns any bytes that should be
|
|
36
|
+
* forwarded to the active PTY (non-hotkey data).
|
|
37
|
+
*/
|
|
38
|
+
feed(data: Buffer): string | null;
|
|
39
|
+
private handleActionEvent;
|
|
40
|
+
private showLeaderIndicator;
|
|
41
|
+
private hideLeaderIndicator;
|
|
42
|
+
private clearTimeout;
|
|
43
|
+
destroy(): void;
|
|
44
|
+
}
|
package/dist/hotkeys.js
ADDED
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { parseKeys, matchKey } from "./key-parser.js";
|
|
2
|
+
import { debug } from "./debug.js";
|
|
3
|
+
const TIMEOUT_MS = 1000;
|
|
4
|
+
export class HotkeyHandler {
|
|
5
|
+
waitingForAction = false;
|
|
6
|
+
timeout = null;
|
|
7
|
+
onAction;
|
|
8
|
+
constructor(onAction) {
|
|
9
|
+
this.onAction = onAction;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Process raw stdin data. Returns any bytes that should be
|
|
13
|
+
* forwarded to the active PTY (non-hotkey data).
|
|
14
|
+
*/
|
|
15
|
+
feed(data) {
|
|
16
|
+
const events = parseKeys(data);
|
|
17
|
+
debug(`hotkey feed: ${events.length} events, waiting=${this.waitingForAction}, bytes=${data.length}`, "hotkey");
|
|
18
|
+
if (events.length === 0)
|
|
19
|
+
return data.toString();
|
|
20
|
+
// If we're waiting for the action key after leader
|
|
21
|
+
if (this.waitingForAction) {
|
|
22
|
+
this.clearTimeout();
|
|
23
|
+
this.waitingForAction = false;
|
|
24
|
+
this.hideLeaderIndicator();
|
|
25
|
+
return this.handleActionEvent(events[0], data);
|
|
26
|
+
}
|
|
27
|
+
// Check if this is the leader key (Ctrl+A)
|
|
28
|
+
if (events.length === 1 && matchKey(events[0], "ctrl+a")) {
|
|
29
|
+
this.waitingForAction = true;
|
|
30
|
+
this.showLeaderIndicator();
|
|
31
|
+
this.timeout = setTimeout(() => {
|
|
32
|
+
this.waitingForAction = false;
|
|
33
|
+
this.hideLeaderIndicator();
|
|
34
|
+
// Timeout: forward the original data
|
|
35
|
+
this.onAction({ type: "passthrough", data: data.toString() });
|
|
36
|
+
}, TIMEOUT_MS);
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
// Regular data — pass through
|
|
40
|
+
return data.toString();
|
|
41
|
+
}
|
|
42
|
+
handleActionEvent(event, rawData) {
|
|
43
|
+
// Double Ctrl+A: send literal through
|
|
44
|
+
if (matchKey(event, "ctrl+a")) {
|
|
45
|
+
this.onAction({ type: "passthrough", data: rawData.toString() });
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
const key = event.name || event.char;
|
|
49
|
+
switch (key) {
|
|
50
|
+
case "d":
|
|
51
|
+
this.onAction({ type: "dashboard" });
|
|
52
|
+
return null;
|
|
53
|
+
case "?":
|
|
54
|
+
this.onAction({ type: "help" });
|
|
55
|
+
return null;
|
|
56
|
+
case "n":
|
|
57
|
+
this.onAction({ type: "next" });
|
|
58
|
+
return null;
|
|
59
|
+
case "p":
|
|
60
|
+
this.onAction({ type: "prev" });
|
|
61
|
+
return null;
|
|
62
|
+
case "c":
|
|
63
|
+
this.onAction({ type: "create" });
|
|
64
|
+
return null;
|
|
65
|
+
case "x":
|
|
66
|
+
this.onAction({ type: "kill" });
|
|
67
|
+
return null;
|
|
68
|
+
case "s":
|
|
69
|
+
this.onAction({ type: "switcher" });
|
|
70
|
+
return null;
|
|
71
|
+
case "w":
|
|
72
|
+
this.onAction({ type: "worktree-create" });
|
|
73
|
+
return null;
|
|
74
|
+
case "W":
|
|
75
|
+
this.onAction({ type: "worktree-list" });
|
|
76
|
+
return null;
|
|
77
|
+
case "v":
|
|
78
|
+
this.onAction({ type: "review" });
|
|
79
|
+
return null;
|
|
80
|
+
default:
|
|
81
|
+
// Check for digits 1-9
|
|
82
|
+
if (key >= "1" && key <= "9") {
|
|
83
|
+
this.onAction({ type: "focus", index: parseInt(key) - 1 });
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
// Unknown action key — forward raw data
|
|
87
|
+
this.onAction({ type: "passthrough", data: rawData.toString() });
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
showLeaderIndicator() {
|
|
92
|
+
// Save cursor, move to top-right, show indicator, restore cursor
|
|
93
|
+
const cols = process.stdout.columns ?? 80;
|
|
94
|
+
const label = " ^A → ? ";
|
|
95
|
+
const col = cols - label.length;
|
|
96
|
+
process.stdout.write(`\x1b7` + // save cursor
|
|
97
|
+
`\x1b[1;${col}H` + // move to top-right
|
|
98
|
+
`\x1b[7;33m${label}\x1b[0m` + // inverse yellow
|
|
99
|
+
`\x1b8`);
|
|
100
|
+
}
|
|
101
|
+
hideLeaderIndicator() {
|
|
102
|
+
// Save cursor, clear the indicator area, restore cursor
|
|
103
|
+
const cols = process.stdout.columns ?? 80;
|
|
104
|
+
const label = " ^A → ? ";
|
|
105
|
+
const col = cols - label.length;
|
|
106
|
+
process.stdout.write(`\x1b7` + `\x1b[1;${col}H` + `${" ".repeat(label.length)}` + `\x1b8`);
|
|
107
|
+
}
|
|
108
|
+
clearTimeout() {
|
|
109
|
+
if (this.timeout) {
|
|
110
|
+
clearTimeout(this.timeout);
|
|
111
|
+
this.timeout = null;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
destroy() {
|
|
115
|
+
this.clearTimeout();
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
//# sourceMappingURL=hotkeys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hotkeys.js","sourceRoot":"","sources":["../src/hotkeys.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export interface HttpJsonResponse<T = any> {
|
|
2
|
+
status: number;
|
|
3
|
+
json: T;
|
|
4
|
+
}
|
|
5
|
+
export declare function requestJson<T = any>(urlString: string, options?: {
|
|
6
|
+
method?: string;
|
|
7
|
+
headers?: Record<string, string>;
|
|
8
|
+
body?: unknown;
|
|
9
|
+
timeoutMs?: number;
|
|
10
|
+
}): Promise<HttpJsonResponse<T>>;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import http from "node:http";
|
|
2
|
+
import https from "node:https";
|
|
3
|
+
export async function requestJson(urlString, options = {}) {
|
|
4
|
+
const url = new URL(urlString);
|
|
5
|
+
const transport = url.protocol === "https:" ? https : http;
|
|
6
|
+
const bodyString = options.body === undefined
|
|
7
|
+
? undefined
|
|
8
|
+
: typeof options.body === "string"
|
|
9
|
+
? options.body
|
|
10
|
+
: JSON.stringify(options.body);
|
|
11
|
+
const headers = {
|
|
12
|
+
accept: "application/json",
|
|
13
|
+
...(options.headers ?? {}),
|
|
14
|
+
};
|
|
15
|
+
if (bodyString !== undefined && headers["content-type"] === undefined) {
|
|
16
|
+
headers["content-type"] = "application/json";
|
|
17
|
+
}
|
|
18
|
+
if (bodyString !== undefined && headers["content-length"] === undefined) {
|
|
19
|
+
headers["content-length"] = Buffer.byteLength(bodyString).toString();
|
|
20
|
+
}
|
|
21
|
+
return await new Promise((resolve, reject) => {
|
|
22
|
+
const req = transport.request(url, {
|
|
23
|
+
method: options.method ?? (bodyString === undefined ? "GET" : "POST"),
|
|
24
|
+
headers,
|
|
25
|
+
}, (res) => {
|
|
26
|
+
const chunks = [];
|
|
27
|
+
res.on("data", (chunk) => chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)));
|
|
28
|
+
res.on("end", () => {
|
|
29
|
+
const raw = Buffer.concat(chunks).toString("utf8").trim();
|
|
30
|
+
let json;
|
|
31
|
+
try {
|
|
32
|
+
json = raw ? JSON.parse(raw) : {};
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
reject(error);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
resolve({
|
|
39
|
+
status: res.statusCode ?? 0,
|
|
40
|
+
json,
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
req.on("error", reject);
|
|
45
|
+
req.setTimeout(options.timeoutMs ?? 0, () => {
|
|
46
|
+
req.destroy(new Error(`request timed out after ${options.timeoutMs ?? 0}ms`));
|
|
47
|
+
});
|
|
48
|
+
if (bodyString !== undefined) {
|
|
49
|
+
req.write(bodyString);
|
|
50
|
+
}
|
|
51
|
+
req.end();
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=http-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../src/http-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { type InstanceInfo, type InstanceSessionRef } from "./instance-registry.js";
|
|
2
|
+
export interface SessionsFileEntry {
|
|
3
|
+
id: string;
|
|
4
|
+
tool: string;
|
|
5
|
+
status: string;
|
|
6
|
+
backendSessionId?: string;
|
|
7
|
+
worktreePath?: string;
|
|
8
|
+
instance?: string;
|
|
9
|
+
}
|
|
10
|
+
export interface InstanceDirectoryFns {
|
|
11
|
+
getRemoteInstances?: (ownInstanceId: string, cwd: string) => InstanceInfo[];
|
|
12
|
+
registerInstance?: (instanceId: string, cwd: string) => Promise<InstanceInfo[]>;
|
|
13
|
+
unregisterInstance?: (instanceId: string, cwd: string) => Promise<void>;
|
|
14
|
+
updateHeartbeat?: (instanceId: string, sessions: InstanceSessionRef[], cwd: string) => Promise<string[]>;
|
|
15
|
+
claimSession?: (sessionId: string, fromInstanceId: string, cwd: string) => Promise<InstanceSessionRef | undefined>;
|
|
16
|
+
}
|
|
17
|
+
export declare class InstanceDirectory {
|
|
18
|
+
private readonly fns;
|
|
19
|
+
constructor(fns?: InstanceDirectoryFns);
|
|
20
|
+
getRemoteInstancesSafe(ownInstanceId: string, cwd: string): InstanceInfo[];
|
|
21
|
+
registerInstance(instanceId: string, cwd: string): Promise<InstanceInfo[]>;
|
|
22
|
+
unregisterInstance(instanceId: string, cwd: string): Promise<void>;
|
|
23
|
+
getRemoteOwnedSessionKeys(ownInstanceId: string, cwd: string): Set<string>;
|
|
24
|
+
updateHeartbeat(instanceId: string, sessions: InstanceSessionRef[], cwd: string): Promise<string[]>;
|
|
25
|
+
reconcileHeartbeat(instanceId: string, sessions: InstanceSessionRef[], cwd: string, confirmedRegistered: Set<string>): Promise<{
|
|
26
|
+
claimedIds: string[];
|
|
27
|
+
confirmedIds: Set<string>;
|
|
28
|
+
skippedClaimDetection: boolean;
|
|
29
|
+
}>;
|
|
30
|
+
claimSession(sessionId: string, fromInstanceId: string, cwd: string): Promise<InstanceSessionRef | undefined>;
|
|
31
|
+
buildSessionsFileEntries(localSessions: InstanceSessionRef[], remoteInstances: InstanceInfo[]): SessionsFileEntry[];
|
|
32
|
+
}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { claimSession, getRemoteInstances, registerInstance, unregisterInstance, updateHeartbeat, } from "./instance-registry.js";
|
|
2
|
+
import { getRemoteOwnedSessionKeys } from "./dashboard-session-registry.js";
|
|
3
|
+
export class InstanceDirectory {
|
|
4
|
+
fns;
|
|
5
|
+
constructor(fns = {}) {
|
|
6
|
+
this.fns = fns;
|
|
7
|
+
}
|
|
8
|
+
getRemoteInstancesSafe(ownInstanceId, cwd) {
|
|
9
|
+
try {
|
|
10
|
+
return (this.fns.getRemoteInstances ?? getRemoteInstances)(ownInstanceId, cwd);
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
return [];
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
async registerInstance(instanceId, cwd) {
|
|
17
|
+
return (this.fns.registerInstance ?? registerInstance)(instanceId, cwd);
|
|
18
|
+
}
|
|
19
|
+
async unregisterInstance(instanceId, cwd) {
|
|
20
|
+
return (this.fns.unregisterInstance ?? unregisterInstance)(instanceId, cwd);
|
|
21
|
+
}
|
|
22
|
+
getRemoteOwnedSessionKeys(ownInstanceId, cwd) {
|
|
23
|
+
return getRemoteOwnedSessionKeys(this.getRemoteInstancesSafe(ownInstanceId, cwd));
|
|
24
|
+
}
|
|
25
|
+
async updateHeartbeat(instanceId, sessions, cwd) {
|
|
26
|
+
return (this.fns.updateHeartbeat ?? updateHeartbeat)(instanceId, sessions, cwd);
|
|
27
|
+
}
|
|
28
|
+
async reconcileHeartbeat(instanceId, sessions, cwd, confirmedRegistered) {
|
|
29
|
+
const previousIds = await this.updateHeartbeat(instanceId, sessions, cwd);
|
|
30
|
+
const nextConfirmed = new Set(confirmedRegistered);
|
|
31
|
+
const claimedIds = [];
|
|
32
|
+
let skippedClaimDetection = false;
|
|
33
|
+
if (previousIds.length > 0 || confirmedRegistered.size === 0) {
|
|
34
|
+
const previousSet = new Set(previousIds);
|
|
35
|
+
for (const id of confirmedRegistered) {
|
|
36
|
+
if (!previousSet.has(id)) {
|
|
37
|
+
claimedIds.push(id);
|
|
38
|
+
nextConfirmed.delete(id);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
else if (confirmedRegistered.size > 0) {
|
|
43
|
+
skippedClaimDetection = true;
|
|
44
|
+
}
|
|
45
|
+
for (const session of sessions) {
|
|
46
|
+
nextConfirmed.add(session.id);
|
|
47
|
+
}
|
|
48
|
+
return {
|
|
49
|
+
claimedIds,
|
|
50
|
+
confirmedIds: nextConfirmed,
|
|
51
|
+
skippedClaimDetection,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
async claimSession(sessionId, fromInstanceId, cwd) {
|
|
55
|
+
return (this.fns.claimSession ?? claimSession)(sessionId, fromInstanceId, cwd);
|
|
56
|
+
}
|
|
57
|
+
buildSessionsFileEntries(localSessions, remoteInstances) {
|
|
58
|
+
const data = localSessions.map((session) => ({
|
|
59
|
+
id: session.id,
|
|
60
|
+
tool: session.tool,
|
|
61
|
+
status: "running",
|
|
62
|
+
backendSessionId: session.backendSessionId,
|
|
63
|
+
worktreePath: session.worktreePath,
|
|
64
|
+
}));
|
|
65
|
+
for (const inst of remoteInstances) {
|
|
66
|
+
for (const session of inst.sessions) {
|
|
67
|
+
if (data.some((entry) => entry.id === session.id))
|
|
68
|
+
continue;
|
|
69
|
+
data.push({
|
|
70
|
+
id: session.id,
|
|
71
|
+
tool: session.tool,
|
|
72
|
+
status: "running",
|
|
73
|
+
backendSessionId: session.backendSessionId,
|
|
74
|
+
worktreePath: session.worktreePath,
|
|
75
|
+
instance: `PID ${inst.pid}`,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return data;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=instance-directory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instance-directory.js","sourceRoot":"","sources":["../src/instance-directory.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
export interface InstanceSessionRef {
|
|
2
|
+
id: string;
|
|
3
|
+
tool: string;
|
|
4
|
+
backendSessionId?: string;
|
|
5
|
+
worktreePath?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface InstanceInfo {
|
|
8
|
+
instanceId: string;
|
|
9
|
+
pid: number;
|
|
10
|
+
startedAt: string;
|
|
11
|
+
heartbeat: string;
|
|
12
|
+
cwd: string;
|
|
13
|
+
sessions: InstanceSessionRef[];
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Register this instance in instances.json.
|
|
17
|
+
*/
|
|
18
|
+
export declare function registerInstance(instanceId: string, cwd: string): Promise<InstanceInfo[]>;
|
|
19
|
+
/**
|
|
20
|
+
* Unregister this instance from instances.json.
|
|
21
|
+
*/
|
|
22
|
+
export declare function unregisterInstance(instanceId: string, cwd: string): Promise<void>;
|
|
23
|
+
/**
|
|
24
|
+
* Update heartbeat timestamp and sessions list. Also prunes dead instances.
|
|
25
|
+
* Returns the session IDs that were in the registry BEFORE this update
|
|
26
|
+
* (so the caller can detect which were claimed by comparing against expectations).
|
|
27
|
+
*/
|
|
28
|
+
export declare function updateHeartbeat(instanceId: string, sessions: InstanceSessionRef[], cwd: string): Promise<string[]>;
|
|
29
|
+
/**
|
|
30
|
+
* Get instances belonging to other aimux processes.
|
|
31
|
+
* Reads from all known instances.json files for cross-worktree visibility.
|
|
32
|
+
*/
|
|
33
|
+
export declare function getRemoteInstances(ownInstanceId: string, cwd: string): InstanceInfo[];
|
|
34
|
+
/**
|
|
35
|
+
* Remove a session from another instance's entry (takeover step).
|
|
36
|
+
* Returns the claimed session ref, or undefined if not found.
|
|
37
|
+
*/
|
|
38
|
+
export declare function claimSession(sessionId: string, fromInstanceId: string, cwd: string): Promise<InstanceSessionRef | undefined>;
|