@apralabs/apra-fleet 0.3.3 → 0.3.5
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 +8 -1
- package/dist/agents/_shared/GRAPH-SEMANTICS.md +47 -0
- package/dist/agents/ci-watcher.md +43 -0
- package/dist/agents/deployer.md +51 -28
- package/dist/agents/doer.md +160 -31
- package/dist/agents/harvester.md +81 -6
- package/dist/agents/integ-test-runner.md +147 -17
- package/dist/agents/plan-reviewer.md +76 -9
- package/dist/agents/planner.md +80 -15
- package/dist/agents/reviewer.md +90 -13
- package/dist/agents/schemas/ci-watcher-input.json +26 -0
- package/dist/agents/schemas/ci-watcher-output.json +18 -0
- package/dist/agents/schemas/deployer-input.json +19 -0
- package/dist/agents/schemas/deployer-output.json +17 -0
- package/dist/agents/schemas/doer-input.json +25 -0
- package/dist/agents/schemas/doer-output.json +22 -0
- package/dist/agents/schemas/harvester-input.json +31 -0
- package/dist/agents/schemas/harvester-output.json +18 -0
- package/dist/agents/schemas/integ-test-runner-input.json +20 -0
- package/dist/agents/schemas/integ-test-runner-output.json +27 -0
- package/dist/agents/schemas/plan-reviewer-input.json +15 -0
- package/dist/agents/schemas/plan-reviewer-output.json +30 -0
- package/dist/agents/schemas/reviewer-input.json +25 -0
- package/dist/agents/schemas/reviewer-output.json +34 -0
- package/dist/cli/config.d.ts +9 -3
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +21 -8
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/install.d.ts +10 -0
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +74 -23
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +19 -0
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/watch.d.ts +8 -0
- package/dist/cli/watch.d.ts.map +1 -0
- package/dist/cli/watch.js +536 -0
- package/dist/cli/watch.js.map +1 -0
- package/dist/index.js +10 -4
- package/dist/index.js.map +1 -1
- package/dist/os/linux.d.ts +1 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +4 -0
- package/dist/os/linux.js.map +1 -1
- package/dist/os/macos.d.ts +1 -0
- package/dist/os/macos.d.ts.map +1 -1
- package/dist/os/macos.js +5 -0
- package/dist/os/macos.js.map +1 -1
- package/dist/os/os-commands.d.ts +2 -0
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/windows.d.ts +1 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +7 -0
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +10 -6
- package/dist/providers/claude.js.map +1 -1
- package/dist/services/agent-provisioner.d.ts +39 -0
- package/dist/services/agent-provisioner.d.ts.map +1 -0
- package/dist/services/agent-provisioner.js +130 -0
- package/dist/services/agent-provisioner.js.map +1 -0
- package/dist/services/sftp.d.ts +15 -0
- package/dist/services/sftp.d.ts.map +1 -1
- package/dist/services/sftp.js +34 -0
- package/dist/services/sftp.js.map +1 -1
- package/dist/services/ssh.d.ts +13 -0
- package/dist/services/ssh.d.ts.map +1 -1
- package/dist/services/ssh.js +46 -0
- package/dist/services/ssh.js.map +1 -1
- package/dist/services/stall/log-path-resolver.d.ts +8 -0
- package/dist/services/stall/log-path-resolver.d.ts.map +1 -1
- package/dist/services/stall/log-path-resolver.js +12 -4
- package/dist/services/stall/log-path-resolver.js.map +1 -1
- package/dist/services/statusline.d.ts.map +1 -1
- package/dist/services/statusline.js +16 -4
- package/dist/services/statusline.js.map +1 -1
- package/dist/services/user-config.d.ts +14 -0
- package/dist/services/user-config.d.ts.map +1 -1
- package/dist/services/user-config.js +22 -0
- package/dist/services/user-config.js.map +1 -1
- package/dist/services/watch/fleet-log.d.ts +34 -0
- package/dist/services/watch/fleet-log.d.ts.map +1 -0
- package/dist/services/watch/fleet-log.js +168 -0
- package/dist/services/watch/fleet-log.js.map +1 -0
- package/dist/services/watch/project-resolver.d.ts +51 -0
- package/dist/services/watch/project-resolver.d.ts.map +1 -0
- package/dist/services/watch/project-resolver.js +104 -0
- package/dist/services/watch/project-resolver.js.map +1 -0
- package/dist/services/watch/transcript-formatter.d.ts +26 -0
- package/dist/services/watch/transcript-formatter.d.ts.map +1 -0
- package/dist/services/watch/transcript-formatter.js +210 -0
- package/dist/services/watch/transcript-formatter.js.map +1 -0
- package/dist/skills/auto-sprint-args/SKILL.md +88 -0
- package/dist/skills/pm/SKILL.md +101 -42
- package/dist/skills/pm/beads.md +27 -22
- package/dist/skills/pm/cost.md +6 -4
- package/dist/skills/pm/doer-reviewer-loop.md +62 -62
- package/dist/skills/pm/fleet-addendum.md +11 -5
- package/dist/skills/pm/simple-sprint.md +6 -5
- package/dist/skills/pm/sprint.md +53 -37
- package/dist/tools/check-status.d.ts.map +1 -1
- package/dist/tools/check-status.js +47 -29
- package/dist/tools/check-status.js.map +1 -1
- package/dist/tools/cloud-control.d.ts +2 -2
- package/dist/tools/compose-permissions.d.ts +6 -3
- package/dist/tools/compose-permissions.d.ts.map +1 -1
- package/dist/tools/compose-permissions.js +63 -5
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +18 -2
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts +1 -0
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +38 -1
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/list-members.d.ts +3 -0
- package/dist/tools/list-members.d.ts.map +1 -1
- package/dist/tools/list-members.js +30 -15
- package/dist/tools/list-members.js.map +1 -1
- package/dist/tools/register-member.d.ts +15 -9
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +35 -0
- package/dist/tools/register-member.js.map +1 -1
- package/dist/tools/update-member.d.ts +15 -9
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +40 -0
- package/dist/tools/update-member.js.map +1 -1
- package/dist/types.d.ts +2 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agent-helpers.d.ts +8 -0
- package/dist/utils/agent-helpers.d.ts.map +1 -1
- package/dist/utils/agent-helpers.js +21 -0
- package/dist/utils/agent-helpers.js.map +1 -1
- package/dist/utils/skill-matrix.d.ts +19 -0
- package/dist/utils/skill-matrix.d.ts.map +1 -0
- package/dist/utils/skill-matrix.js +47 -0
- package/dist/utils/skill-matrix.js.map +1 -0
- package/dist/workflows/auto-sprint.js +1213 -208
- package/package.json +3 -2
- package/skills/fleet/permissions.md +60 -5
- package/skills/fleet/profiles/tag-devops.json +4 -0
- package/skills/fleet/profiles/tag-gpu.json +4 -0
- package/skills/fleet/skill-matrix.md +15 -8
- package/version.json +1 -1
- package/dist/services/stall/log-path-resolver.test.d.ts +0 -2
- package/dist/services/stall/log-path-resolver.test.d.ts.map +0 -1
- package/dist/services/stall/log-path-resolver.test.js +0 -76
- package/dist/services/stall/log-path-resolver.test.js.map +0 -1
- package/dist/skills/pm/tpl-progress.json +0 -35
|
@@ -0,0 +1,536 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { getAllAgents } from '../services/registry.js';
|
|
4
|
+
import { resolveSessionLogDir } from '../services/stall/index.js';
|
|
5
|
+
import { encodeClaudeProjectDir } from '../services/stall/log-path-resolver.js';
|
|
6
|
+
import { execCommand, execStream } from '../services/ssh.js';
|
|
7
|
+
import { enrichMember, groupByProject, projectKey, projectKeyForDir, } from '../services/watch/project-resolver.js';
|
|
8
|
+
import { formatTranscriptLine } from '../services/watch/transcript-formatter.js';
|
|
9
|
+
import { resolveFleetLogFile, formatFleetLogLine, readRecentActivity, } from '../services/watch/fleet-log.js';
|
|
10
|
+
import { escapeShellArg } from '../utils/shell-escape.js';
|
|
11
|
+
const ACTIVE_WINDOW_MS = 90_000; // a member is "active" if it produced activity within this window
|
|
12
|
+
const POLL_INTERVAL_MS = 700;
|
|
13
|
+
const COLORS = ['\x1b[36m', '\x1b[32m', '\x1b[33m', '\x1b[35m', '\x1b[34m', '\x1b[31m', '\x1b[96m', '\x1b[92m'];
|
|
14
|
+
const RESET = '\x1b[0m';
|
|
15
|
+
const DIM = '\x1b[2m';
|
|
16
|
+
const GREEN = '\x1b[32m';
|
|
17
|
+
const RED = '\x1b[31m';
|
|
18
|
+
const CYAN = '\x1b[36m';
|
|
19
|
+
const YELLOW = '\x1b[33m';
|
|
20
|
+
const useColor = () => process.stdout.isTTY === true && !process.env.NO_COLOR;
|
|
21
|
+
/** Newest *.jsonl in a directory, or null. */
|
|
22
|
+
function newestTranscript(dir) {
|
|
23
|
+
let entries;
|
|
24
|
+
try {
|
|
25
|
+
entries = fs.readdirSync(dir).filter((f) => f.endsWith('.jsonl'));
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
let best = null;
|
|
31
|
+
let bestM = -1;
|
|
32
|
+
for (const f of entries) {
|
|
33
|
+
const full = path.join(dir, f);
|
|
34
|
+
try {
|
|
35
|
+
const m = fs.statSync(full).mtimeMs;
|
|
36
|
+
if (m > bestM) {
|
|
37
|
+
bestM = m;
|
|
38
|
+
best = full;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
catch { /* ignore */ }
|
|
42
|
+
}
|
|
43
|
+
return best;
|
|
44
|
+
}
|
|
45
|
+
function mtimeOf(file) {
|
|
46
|
+
try {
|
|
47
|
+
return fs.statSync(file).mtimeMs;
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return 0;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
/** Read the last non-empty formatted transcript event, for overview status. */
|
|
54
|
+
function lastTranscriptText(provider, file) {
|
|
55
|
+
let content;
|
|
56
|
+
try {
|
|
57
|
+
content = fs.readFileSync(file, 'utf-8');
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
62
|
+
const lines = content.split('\n');
|
|
63
|
+
for (let i = lines.length - 1; i >= 0; i--) {
|
|
64
|
+
const events = formatTranscriptLine(provider, lines[i]);
|
|
65
|
+
if (events.length > 0)
|
|
66
|
+
return { ms: mtimeOf(file), text: events[events.length - 1].text };
|
|
67
|
+
}
|
|
68
|
+
return null;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Overview status for a member. Activity is universal (from the fleet log);
|
|
72
|
+
* the transcript adds a richer "last did" snippet for local members.
|
|
73
|
+
*/
|
|
74
|
+
function activityOf(agent, recent) {
|
|
75
|
+
const isLocal = agent.agentType !== 'remote';
|
|
76
|
+
const provider = agent.llmProvider ?? 'claude';
|
|
77
|
+
let txDir = null;
|
|
78
|
+
let txFile = null;
|
|
79
|
+
let txMs = 0;
|
|
80
|
+
let txText = null;
|
|
81
|
+
if (isLocal) {
|
|
82
|
+
txDir = resolveSessionLogDir(provider, agent.workFolder);
|
|
83
|
+
if (txDir) {
|
|
84
|
+
txFile = newestTranscript(txDir);
|
|
85
|
+
if (txFile) {
|
|
86
|
+
const last = lastTranscriptText(provider, txFile);
|
|
87
|
+
if (last) {
|
|
88
|
+
txMs = last.ms;
|
|
89
|
+
txText = last.text;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
const rec = recent.get(agent.id) ?? recent.get(agent.friendlyName.toLowerCase());
|
|
95
|
+
const flMs = rec?.ms ?? 0;
|
|
96
|
+
const flText = rec?.text ?? null;
|
|
97
|
+
const lastMs = Math.max(txMs, flMs);
|
|
98
|
+
const active = lastMs > 0 && Date.now() - lastMs < ACTIVE_WINDOW_MS;
|
|
99
|
+
const lastText = txMs >= flMs ? (txText ?? flText) : (flText ?? txText);
|
|
100
|
+
return { active, lastText, txDir, txFile };
|
|
101
|
+
}
|
|
102
|
+
function parseFlagValue(args, flag) {
|
|
103
|
+
const i = args.indexOf(flag);
|
|
104
|
+
return i !== -1 && i + 1 < args.length ? args[i + 1] : undefined;
|
|
105
|
+
}
|
|
106
|
+
export async function runWatch(args) {
|
|
107
|
+
if (args.includes('--help') || args.includes('-h')) {
|
|
108
|
+
printUsage();
|
|
109
|
+
process.exit(0);
|
|
110
|
+
}
|
|
111
|
+
if (args.includes('--complete')) {
|
|
112
|
+
for (const a of getAllAgents())
|
|
113
|
+
console.log(a.friendlyName);
|
|
114
|
+
process.exit(0);
|
|
115
|
+
}
|
|
116
|
+
const listOnly = args.includes('--list');
|
|
117
|
+
const verbose = args.includes('--verbose') || args.includes('-v');
|
|
118
|
+
const projectDir = parseFlagValue(args, '--project');
|
|
119
|
+
const feature = parseFlagValue(args, '--feature') ?? parseFlagValue(args, '--branch');
|
|
120
|
+
const tailN = parseInt(parseFlagValue(args, '--tail') ?? '0', 10) || 0;
|
|
121
|
+
const flagsWithValues = new Set(['--project', '--feature', '--branch', '--tail']);
|
|
122
|
+
const names = [];
|
|
123
|
+
for (let i = 0; i < args.length; i++) {
|
|
124
|
+
const a = args[i];
|
|
125
|
+
if (a.startsWith('-')) {
|
|
126
|
+
if (flagsWithValues.has(a))
|
|
127
|
+
i++;
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
130
|
+
names.push(a);
|
|
131
|
+
}
|
|
132
|
+
const contexts = getAllAgents().map(enrichMember);
|
|
133
|
+
if (contexts.length === 0) {
|
|
134
|
+
console.log('No members registered. Use register_member to add one.');
|
|
135
|
+
process.exit(0);
|
|
136
|
+
}
|
|
137
|
+
// --- Determine scope ---
|
|
138
|
+
let scope = contexts;
|
|
139
|
+
let scopeLabel = 'fleet';
|
|
140
|
+
if (names.length > 0) {
|
|
141
|
+
const wanted = new Set(names.map((n) => n.toLowerCase()));
|
|
142
|
+
scope = contexts.filter((c) => wanted.has(c.agent.friendlyName.toLowerCase()));
|
|
143
|
+
scopeLabel = names.join(', ');
|
|
144
|
+
const found = new Set(scope.map((c) => c.agent.friendlyName.toLowerCase()));
|
|
145
|
+
const missing = names.filter((n) => !found.has(n.toLowerCase()));
|
|
146
|
+
if (missing.length > 0) {
|
|
147
|
+
console.error(`Unknown member(s): ${missing.join(', ')}`);
|
|
148
|
+
console.error(`Known members: ${contexts.map((c) => c.agent.friendlyName).join(', ')}`);
|
|
149
|
+
process.exit(1);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
else if (projectDir) {
|
|
153
|
+
const key = projectKeyForDir(projectDir);
|
|
154
|
+
scope = contexts.filter((c) => projectKey(c) === key);
|
|
155
|
+
scopeLabel = path.basename(path.resolve(projectDir));
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
const cwdKey = projectKeyForDir(process.cwd());
|
|
159
|
+
const inCwd = contexts.filter((c) => projectKey(c) === cwdKey);
|
|
160
|
+
if (inCwd.length > 0) {
|
|
161
|
+
scope = inCwd;
|
|
162
|
+
scopeLabel = path.basename(process.cwd());
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
if (feature) {
|
|
166
|
+
const f = feature.toLowerCase();
|
|
167
|
+
scope = scope.filter((c) => c.branch != null && (c.branch.toLowerCase() === f || c.branch.toLowerCase().includes(f)));
|
|
168
|
+
}
|
|
169
|
+
if (scope.length === 0) {
|
|
170
|
+
console.log(`No members in scope (${scopeLabel}).`);
|
|
171
|
+
process.exit(0);
|
|
172
|
+
}
|
|
173
|
+
const fleetLogFile = resolveFleetLogFile();
|
|
174
|
+
const recent = fleetLogFile ? readRecentActivity(fleetLogFile) : new Map();
|
|
175
|
+
// --- Overview ---
|
|
176
|
+
printOverview(scope, recent);
|
|
177
|
+
if (listOnly)
|
|
178
|
+
process.exit(0);
|
|
179
|
+
// --- Build follow set: every member in scope (fleet log covers all) ---
|
|
180
|
+
const followers = [];
|
|
181
|
+
const byKey = new Map();
|
|
182
|
+
let colorIdx = 0;
|
|
183
|
+
for (const ctx of scope) {
|
|
184
|
+
const isLocal = ctx.agent.agentType !== 'remote';
|
|
185
|
+
const provider = ctx.agent.llmProvider ?? 'claude';
|
|
186
|
+
const txDir = isLocal ? resolveSessionLogDir(provider, ctx.agent.workFolder) : null;
|
|
187
|
+
// Remote Claude members: tail the transcript over SSH (it lives on their disk).
|
|
188
|
+
const rtEnc = !isLocal && provider === 'claude' ? encodeClaudeProjectDir(ctx.agent.workFolder) : null;
|
|
189
|
+
const f = {
|
|
190
|
+
agent: ctx.agent,
|
|
191
|
+
provider,
|
|
192
|
+
color: COLORS[colorIdx++ % COLORS.length],
|
|
193
|
+
txDir,
|
|
194
|
+
txFile: txDir ? newestTranscript(txDir) : null,
|
|
195
|
+
txOffset: 0,
|
|
196
|
+
txLeftover: '',
|
|
197
|
+
txBackfilled: false,
|
|
198
|
+
rtEnc,
|
|
199
|
+
rtFile: null,
|
|
200
|
+
rtStream: null,
|
|
201
|
+
rtLeftover: '',
|
|
202
|
+
rtStarted: false,
|
|
203
|
+
rtBusy: false,
|
|
204
|
+
};
|
|
205
|
+
followers.push(f);
|
|
206
|
+
byKey.set(ctx.agent.friendlyName.toLowerCase(), f);
|
|
207
|
+
byKey.set(ctx.agent.id, f);
|
|
208
|
+
}
|
|
209
|
+
const single = followers.length === 1;
|
|
210
|
+
console.log('');
|
|
211
|
+
console.log(`${DIM}Following ${followers.length} member(s); idle ones stream when they start. Press Ctrl-C to stop.${RESET}`);
|
|
212
|
+
if (!fleetLogFile)
|
|
213
|
+
console.log(`${DIM}(no fleet server log found -- command activity will not show until the server logs one)${RESET}`);
|
|
214
|
+
console.log('');
|
|
215
|
+
const fl = {
|
|
216
|
+
file: fleetLogFile, offset: 0, leftover: '', backfilled: false,
|
|
217
|
+
mtime: fleetLogFile ? mtimeOf(fleetLogFile) : 0,
|
|
218
|
+
};
|
|
219
|
+
// Prime (with optional backfill), then poll.
|
|
220
|
+
pumpFleetLog(fl, byKey, single, tailN, verbose);
|
|
221
|
+
for (const f of followers)
|
|
222
|
+
pumpTranscript(f, single, tailN, verbose);
|
|
223
|
+
// Open the remote tail channels immediately (they stream on their own after this).
|
|
224
|
+
for (const f of followers)
|
|
225
|
+
void ensureRemoteTail(f, single, verbose);
|
|
226
|
+
// Remote tails push content on their own; we only periodically check whether a
|
|
227
|
+
// channel died or the session rotated (a cheap `ls`), not every poll tick.
|
|
228
|
+
let tick = 0;
|
|
229
|
+
const timer = setInterval(() => {
|
|
230
|
+
tick++;
|
|
231
|
+
// The server rolls its log on restart (new pid). Follow a STRICTLY newer log
|
|
232
|
+
// (not just any different one -- short-lived servers create noise logs with
|
|
233
|
+
// fresh mtimes), and jump to its END rather than replaying its history.
|
|
234
|
+
const newestLog = resolveFleetLogFile();
|
|
235
|
+
if (newestLog && newestLog !== fl.file) {
|
|
236
|
+
const m = mtimeOf(newestLog);
|
|
237
|
+
if (m > fl.mtime) {
|
|
238
|
+
fl.file = newestLog;
|
|
239
|
+
fl.mtime = m;
|
|
240
|
+
try {
|
|
241
|
+
fl.offset = fs.statSync(newestLog).size;
|
|
242
|
+
}
|
|
243
|
+
catch {
|
|
244
|
+
fl.offset = 0;
|
|
245
|
+
}
|
|
246
|
+
fl.leftover = '';
|
|
247
|
+
fl.backfilled = true;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
pumpFleetLog(fl, byKey, single, 0, verbose);
|
|
251
|
+
for (const f of followers) {
|
|
252
|
+
if (f.txDir) {
|
|
253
|
+
const newest = newestTranscript(f.txDir);
|
|
254
|
+
if (newest && newest !== f.txFile) {
|
|
255
|
+
f.txFile = newest;
|
|
256
|
+
f.txOffset = 0;
|
|
257
|
+
f.txLeftover = '';
|
|
258
|
+
f.txBackfilled = true;
|
|
259
|
+
}
|
|
260
|
+
pumpTranscript(f, single, 0, verbose);
|
|
261
|
+
}
|
|
262
|
+
if (tick % RT_CHECK_EVERY_TICKS === 0)
|
|
263
|
+
void ensureRemoteTail(f, single, verbose);
|
|
264
|
+
}
|
|
265
|
+
}, POLL_INTERVAL_MS);
|
|
266
|
+
const stop = () => {
|
|
267
|
+
clearInterval(timer);
|
|
268
|
+
for (const f of followers) {
|
|
269
|
+
if (f.rtStream) {
|
|
270
|
+
try {
|
|
271
|
+
f.rtStream.close();
|
|
272
|
+
}
|
|
273
|
+
catch { /* best-effort */ }
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
console.log('');
|
|
277
|
+
process.exit(0);
|
|
278
|
+
};
|
|
279
|
+
process.on('SIGINT', stop);
|
|
280
|
+
process.on('SIGTERM', stop);
|
|
281
|
+
}
|
|
282
|
+
/** Read appended bytes of a file since `offset`; returns new complete lines. */
|
|
283
|
+
function readNewLines(file, state, tailN) {
|
|
284
|
+
let size = 0;
|
|
285
|
+
try {
|
|
286
|
+
size = fs.statSync(file).size;
|
|
287
|
+
}
|
|
288
|
+
catch {
|
|
289
|
+
return null;
|
|
290
|
+
}
|
|
291
|
+
if (size < state.offset) {
|
|
292
|
+
state.offset = 0;
|
|
293
|
+
state.leftover = '';
|
|
294
|
+
}
|
|
295
|
+
if (!state.backfilled) {
|
|
296
|
+
state.backfilled = true;
|
|
297
|
+
if (tailN <= 0) {
|
|
298
|
+
state.offset = size;
|
|
299
|
+
return null;
|
|
300
|
+
} // no backfill: jump to EOF
|
|
301
|
+
}
|
|
302
|
+
if (size <= state.offset)
|
|
303
|
+
return null;
|
|
304
|
+
let chunk = '';
|
|
305
|
+
try {
|
|
306
|
+
const fd = fs.openSync(file, 'r');
|
|
307
|
+
const buf = Buffer.alloc(size - state.offset);
|
|
308
|
+
fs.readSync(fd, buf, 0, buf.length, state.offset);
|
|
309
|
+
fs.closeSync(fd);
|
|
310
|
+
chunk = buf.toString('utf-8');
|
|
311
|
+
}
|
|
312
|
+
catch {
|
|
313
|
+
return null;
|
|
314
|
+
}
|
|
315
|
+
state.offset = size;
|
|
316
|
+
const parts = (state.leftover + chunk).split('\n');
|
|
317
|
+
state.leftover = parts.pop() ?? '';
|
|
318
|
+
return parts;
|
|
319
|
+
}
|
|
320
|
+
/** Tail the fleet activity log; dispatch each line to the matching follower. */
|
|
321
|
+
function pumpFleetLog(fl, byKey, single, tailN, verbose) {
|
|
322
|
+
if (!fl.file) {
|
|
323
|
+
fl.file = resolveFleetLogFile();
|
|
324
|
+
if (!fl.file)
|
|
325
|
+
return;
|
|
326
|
+
fl.offset = 0;
|
|
327
|
+
}
|
|
328
|
+
const lines = readNewLines(fl.file, fl, tailN);
|
|
329
|
+
if (!lines)
|
|
330
|
+
return;
|
|
331
|
+
const collected = [];
|
|
332
|
+
for (const line of lines) {
|
|
333
|
+
const entry = formatFleetLogLine(line, verbose);
|
|
334
|
+
if (!entry)
|
|
335
|
+
continue;
|
|
336
|
+
const f = (entry.mem && byKey.get(entry.mem.toLowerCase())) || (entry.mid ? byKey.get(entry.mid) : undefined);
|
|
337
|
+
if (!f)
|
|
338
|
+
continue;
|
|
339
|
+
// "Transcript owns the prompt": for members whose full transcript is tailed
|
|
340
|
+
// (local, or remote Claude with a live SSH channel), skip the fleet-log prompt
|
|
341
|
+
// preview so the prompt isn't shown twice. Fall back to the preview line
|
|
342
|
+
// whenever no transcript is actually streaming right now (e.g. the remote
|
|
343
|
+
// tail channel is down or still connecting), so the prompt isn't dropped.
|
|
344
|
+
if (entry.promptLine && (f.txDir || f.rtStream))
|
|
345
|
+
continue;
|
|
346
|
+
for (const ev of entry.events)
|
|
347
|
+
collected.push({ f, ev });
|
|
348
|
+
}
|
|
349
|
+
const toPrint = tailN > 0 && collected.length > tailN ? collected.slice(-tailN) : collected;
|
|
350
|
+
for (const { f, ev } of toPrint)
|
|
351
|
+
emit(f, ev, single);
|
|
352
|
+
}
|
|
353
|
+
/** Tail one local member's provider transcript for LLM-session detail. */
|
|
354
|
+
function pumpTranscript(f, single, tailN, verbose) {
|
|
355
|
+
if (!f.txDir)
|
|
356
|
+
return;
|
|
357
|
+
if (!f.txFile) {
|
|
358
|
+
const newest = newestTranscript(f.txDir);
|
|
359
|
+
if (!newest)
|
|
360
|
+
return;
|
|
361
|
+
f.txFile = newest;
|
|
362
|
+
f.txOffset = 0;
|
|
363
|
+
}
|
|
364
|
+
const state = { offset: f.txOffset, leftover: f.txLeftover, backfilled: f.txBackfilled };
|
|
365
|
+
const lines = readNewLines(f.txFile, state, tailN);
|
|
366
|
+
f.txOffset = state.offset;
|
|
367
|
+
f.txLeftover = state.leftover;
|
|
368
|
+
f.txBackfilled = state.backfilled;
|
|
369
|
+
if (!lines)
|
|
370
|
+
return;
|
|
371
|
+
const collected = [];
|
|
372
|
+
for (const line of lines) {
|
|
373
|
+
for (const ev of formatTranscriptLine(f.provider, line, verbose))
|
|
374
|
+
collected.push(ev);
|
|
375
|
+
}
|
|
376
|
+
const toPrint = tailN > 0 && collected.length > tailN ? collected.slice(-tailN) : collected;
|
|
377
|
+
for (const ev of toPrint)
|
|
378
|
+
emit(f, ev, single);
|
|
379
|
+
}
|
|
380
|
+
/**
|
|
381
|
+
* Build the `tail -F` command for a remote transcript file. `file` is untrusted
|
|
382
|
+
* (it comes from `ls -t` on the member's disk), so it is shell-escaped before
|
|
383
|
+
* interpolation. `startFlag` is caller-controlled (`-n0` / `-n +1`).
|
|
384
|
+
*/
|
|
385
|
+
export function buildTailCommand(startFlag, file) {
|
|
386
|
+
return `tail ${startFlag} -F ${escapeShellArg(file)}`;
|
|
387
|
+
}
|
|
388
|
+
// A remote tail is re-checked every this-many poll ticks (~POLL_INTERVAL_MS each)
|
|
389
|
+
// -- only to detect a dead channel or a rotated session, NOT to fetch content
|
|
390
|
+
// (the tail streams that on its own). Rotations are rare, so this stays light.
|
|
391
|
+
const RT_CHECK_EVERY_TICKS = 5;
|
|
392
|
+
/** Feed a chunk of tailed transcript bytes out as formatted lines, keeping any trailing partial line. */
|
|
393
|
+
function processRemoteChunk(f, chunk, single, verbose) {
|
|
394
|
+
const parts = (f.rtLeftover + chunk).split('\n');
|
|
395
|
+
f.rtLeftover = parts.pop() ?? '';
|
|
396
|
+
for (const line of parts) {
|
|
397
|
+
for (const ev of formatTranscriptLine(f.provider, line, verbose))
|
|
398
|
+
emit(f, ev, single);
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
/**
|
|
402
|
+
* Ensure a remote Claude member has a live `tail -F` channel on its newest
|
|
403
|
+
* session transcript. The transcript .jsonl lives on the member's own disk, so
|
|
404
|
+
* we stream it over a dedicated long-lived SSH channel (push, not poll). This
|
|
405
|
+
* runs once at startup and then only periodically -- just to (re)open a channel
|
|
406
|
+
* that died or to follow a session rotation. A cheap `ls` finds the newest file:
|
|
407
|
+
* - first open primes to EOF (`-n0`) so no history is dumped;
|
|
408
|
+
* - a rotation opens the new session from its top (`-n +1`) so nothing is missed.
|
|
409
|
+
* Fails soft: connect/exec errors leave rtStream null and the next check retries.
|
|
410
|
+
*/
|
|
411
|
+
async function ensureRemoteTail(f, single, verbose) {
|
|
412
|
+
if (!f.rtEnc || f.rtBusy)
|
|
413
|
+
return;
|
|
414
|
+
f.rtBusy = true;
|
|
415
|
+
try {
|
|
416
|
+
const dir = `"$HOME/.claude/projects/${f.rtEnc}"`;
|
|
417
|
+
const res = await execCommand(f.agent, `ls -t ${dir}/*.jsonl 2>/dev/null | head -1`, 8000);
|
|
418
|
+
const newest = res.stdout.trim().split('\n')[0]?.trim();
|
|
419
|
+
if (!newest)
|
|
420
|
+
return;
|
|
421
|
+
if (f.rtStream && newest === f.rtFile)
|
|
422
|
+
return; // already tailing the current session
|
|
423
|
+
// (Re)open: close any stale channel, then tail the newest file.
|
|
424
|
+
if (f.rtStream) {
|
|
425
|
+
try {
|
|
426
|
+
f.rtStream.close();
|
|
427
|
+
}
|
|
428
|
+
catch { /* best-effort */ }
|
|
429
|
+
f.rtStream = null;
|
|
430
|
+
}
|
|
431
|
+
const primed = f.rtStarted; // first open = EOF; any later open = a new session, read from top
|
|
432
|
+
const startFlag = primed ? '-n +1' : '-n0';
|
|
433
|
+
f.rtLeftover = '';
|
|
434
|
+
let stream;
|
|
435
|
+
const onEnd = () => { if (f.rtStream === stream)
|
|
436
|
+
f.rtStream = null; }; // channel died -> next check reopens
|
|
437
|
+
stream = await execStream(f.agent, buildTailCommand(startFlag, newest), (chunk) => processRemoteChunk(f, chunk, single, verbose), onEnd);
|
|
438
|
+
f.rtFile = newest;
|
|
439
|
+
f.rtStarted = true;
|
|
440
|
+
f.rtStream = stream;
|
|
441
|
+
}
|
|
442
|
+
catch {
|
|
443
|
+
// Member asleep / connection dropped -- leave rtStream null; the next check retries.
|
|
444
|
+
if (f.rtStream) {
|
|
445
|
+
try {
|
|
446
|
+
f.rtStream.close();
|
|
447
|
+
}
|
|
448
|
+
catch { /* best-effort */ }
|
|
449
|
+
f.rtStream = null;
|
|
450
|
+
}
|
|
451
|
+
}
|
|
452
|
+
finally {
|
|
453
|
+
f.rtBusy = false;
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
const TIME_W = 8; // "HH:MM:SS"
|
|
457
|
+
function paintBody(kind, text) {
|
|
458
|
+
switch (kind) {
|
|
459
|
+
case 'add': return `${GREEN}${text}${RESET}`;
|
|
460
|
+
case 'del': return `${RED}${text}${RESET}`;
|
|
461
|
+
case 'dim':
|
|
462
|
+
case 'out': return `${DIM}${text}${RESET}`;
|
|
463
|
+
default: return text;
|
|
464
|
+
}
|
|
465
|
+
}
|
|
466
|
+
function paintMarker(marker) {
|
|
467
|
+
switch (marker) {
|
|
468
|
+
case '>': return `${CYAN}>${RESET}`;
|
|
469
|
+
case '*': return `${YELLOW}*${RESET}`;
|
|
470
|
+
case '$': return `${GREEN}$${RESET}`;
|
|
471
|
+
default: return ' ';
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
function emit(f, ev, single) {
|
|
475
|
+
const color = useColor();
|
|
476
|
+
if (!color) {
|
|
477
|
+
const who = single ? '' : `${f.agent.friendlyName} | `;
|
|
478
|
+
if (ev.detail) {
|
|
479
|
+
console.log(`${' '.repeat(single ? 6 : 0)}${who} ${ev.text}`);
|
|
480
|
+
return;
|
|
481
|
+
}
|
|
482
|
+
const mk = ev.marker ? `${ev.marker} ` : ' ';
|
|
483
|
+
const ts = ev.time ? `${ev.time} ` : ' '.repeat(TIME_W + 1);
|
|
484
|
+
console.log(`${ts}${who}${mk}${ev.text}`);
|
|
485
|
+
return;
|
|
486
|
+
}
|
|
487
|
+
const tsCell = `${DIM}${(ev.time ?? '').padEnd(TIME_W)}${RESET}`;
|
|
488
|
+
const label = single ? '' : ` ${f.color}${(f.agent.icon ?? '')} ${f.agent.friendlyName}${RESET}`;
|
|
489
|
+
if (ev.detail) {
|
|
490
|
+
const indent = ' '.repeat(TIME_W);
|
|
491
|
+
console.log(`${indent}${label} ${paintBody(ev.kind, ev.text)}`);
|
|
492
|
+
return;
|
|
493
|
+
}
|
|
494
|
+
console.log(`${tsCell}${label} ${paintMarker(ev.marker)} ${paintBody(ev.kind, ev.text)}`);
|
|
495
|
+
}
|
|
496
|
+
function printOverview(scope, recent) {
|
|
497
|
+
const projects = groupByProject(scope);
|
|
498
|
+
if (projects.length > 1) {
|
|
499
|
+
console.log(`Fleet -- ${projects.length} project(s) in scope`);
|
|
500
|
+
console.log('');
|
|
501
|
+
}
|
|
502
|
+
for (const proj of projects) {
|
|
503
|
+
console.log(`${proj.project} -- ${proj.features.length} feature(s)`);
|
|
504
|
+
for (const feat of proj.features) {
|
|
505
|
+
console.log(` ${feat.feature}`);
|
|
506
|
+
for (const ctx of feat.members) {
|
|
507
|
+
const act = activityOf(ctx.agent, recent);
|
|
508
|
+
const icon = ctx.agent.icon ?? '';
|
|
509
|
+
const kind = ctx.agent.agentType === 'remote' ? ' (remote)' : '';
|
|
510
|
+
const status = act.active ? (act.lastText ? `working: ${act.lastText}` : 'working') : 'idle';
|
|
511
|
+
console.log(` ${icon} ${ctx.agent.friendlyName}${kind} ${status}`);
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
console.log('');
|
|
515
|
+
}
|
|
516
|
+
}
|
|
517
|
+
function printUsage() {
|
|
518
|
+
console.log(`apra-fleet watch -- stream live member activity
|
|
519
|
+
|
|
520
|
+
Usage:
|
|
521
|
+
apra-fleet watch Follow members (scope inferred from cwd)
|
|
522
|
+
apra-fleet watch <name> [<name>...] Follow specific members by name
|
|
523
|
+
apra-fleet watch --project <dir> Follow members working on the repo at <dir>
|
|
524
|
+
apra-fleet watch --feature <name> Follow members on one feature (branch match)
|
|
525
|
+
apra-fleet watch --branch <ref> Follow members on an exact branch
|
|
526
|
+
apra-fleet watch --list Print the overview and exit (no follow)
|
|
527
|
+
apra-fleet watch --tail <n> Backfill the last n events per member
|
|
528
|
+
apra-fleet watch --verbose | -v Also show the model's thinking/reasoning
|
|
529
|
+
(diffs, file contents + output show by default)
|
|
530
|
+
|
|
531
|
+
Sources: the fleet activity log (all shell commands + prompt dispatches, for
|
|
532
|
+
local AND remote members) plus the LLM session transcript (reasoning, edits,
|
|
533
|
+
output) -- read from disk for local members and tailed over SSH for remote
|
|
534
|
+
Claude members. Scope: project = git origin, feature = git branch.`);
|
|
535
|
+
}
|
|
536
|
+
//# sourceMappingURL=watch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/cli/watch.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -21,6 +21,7 @@ Usage:
|
|
|
21
21
|
apra-fleet --stdio Alias for run (backward compat for existing MCP configs)
|
|
22
22
|
apra-fleet update Check for and install latest update
|
|
23
23
|
apra-fleet update --check Check for update
|
|
24
|
+
apra-fleet watch Stream live member logs (see 'watch --help')
|
|
24
25
|
apra-fleet install Install binary + hooks + statusline + MCP + fleet & PM skills
|
|
25
26
|
apra-fleet install --skill all Same as bare install (all skills)
|
|
26
27
|
apra-fleet install --skill fleet Install fleet skill only
|
|
@@ -94,6 +95,11 @@ Usage:
|
|
|
94
95
|
.catch(err => { logError('cli', `Update failed: ${err.message}`); process.exit(1); });
|
|
95
96
|
}
|
|
96
97
|
}
|
|
98
|
+
else if (arg === 'watch') {
|
|
99
|
+
import('./cli/watch.js')
|
|
100
|
+
.then(m => m.runWatch(process.argv.slice(3)))
|
|
101
|
+
.catch(err => { logError('cli', `Watch failed: ${err.message}`); process.exit(1); });
|
|
102
|
+
}
|
|
97
103
|
else if (arg === 'run' || arg === 'start' || arg === '--stdio') {
|
|
98
104
|
// Start MCP server -- invoked by LLM providers via their MCP config, or manually
|
|
99
105
|
startServer();
|
|
@@ -239,10 +245,10 @@ async function startServer() {
|
|
|
239
245
|
};
|
|
240
246
|
}
|
|
241
247
|
// --- Core Member Management ---
|
|
242
|
-
server.tool('register_member', 'Add a machine to the fleet. Use member_type "local" for this machine or "remote" for a machine reachable over SSH. Choose the AI provider the member will use for prompts.', registerMemberSchema.shape, wrapTool('register_member', (input) => registerMember(input)));
|
|
243
|
-
server.tool('list_members', 'List all fleet members and their current status. Use format="json" for structured data.', listMembersSchema.shape, wrapTool('list_members', (input) => listMembers(input)));
|
|
248
|
+
server.tool('register_member', 'Add a machine to the fleet. Use member_type "local" for this machine or "remote" for a machine reachable over SSH. Choose the AI provider the member will use for prompts. Optional: add tags for grouping and filtering members.', registerMemberSchema.shape, wrapTool('register_member', (input) => registerMember(input)));
|
|
249
|
+
server.tool('list_members', 'List all fleet members and their current status. Use format="json" for structured data. Use tags=["gpu"] to filter to members that have ALL specified tags (AND semantics); omit tags to return all members.', listMembersSchema.shape, wrapTool('list_members', (input) => listMembers(input)));
|
|
244
250
|
server.tool('remove_member', 'Remove a member from the fleet.', removeMemberSchema.shape, wrapTool('remove_member', (input) => removeMember(input)));
|
|
245
|
-
server.tool('update_member', "Change a member's name, connection details, working directory, AI provider, or other settings.", updateMemberSchema.shape, wrapTool('update_member', (input) => updateMember(input)));
|
|
251
|
+
server.tool('update_member', "Change a member's name, connection details, working directory, AI provider, tags, or other settings.", updateMemberSchema.shape, wrapTool('update_member', (input) => updateMember(input)));
|
|
246
252
|
// --- File Operations ---
|
|
247
253
|
server.tool('send_files', 'Transfer local files to a member. Always batch multiple files into a single call — never invoke repeatedly for individual files.', sendFilesSchema.shape, wrapTool('send_files', (input, extra) => sendFiles(input, extra)));
|
|
248
254
|
server.tool('receive_files', 'Download files from a member to a local directory. Always batch multiple files into a single call — never invoke repeatedly for individual files.', receiveFilesSchema.shape, wrapTool('receive_files', (input, extra) => receiveFiles(input, extra)));
|
|
@@ -263,7 +269,7 @@ async function startServer() {
|
|
|
263
269
|
server.tool('shutdown_server', 'Gracefully shut down the MCP server. Run /mcp afterwards to start a fresh instance with the latest code.', shutdownServerSchema.shape, wrapTool('shutdown_server', () => shutdownServer()));
|
|
264
270
|
server.tool('version', 'Returns the installed apra-fleet server version', versionSchema.shape, wrapTool('version', () => version()));
|
|
265
271
|
// --- Permissions ---
|
|
266
|
-
server.tool('compose_permissions', 'Set up and deliver the right permissions to a member for their role. Automatically tailors permissions to the project type. Use grant to add specific permissions mid-sprint without a full recompose.', composePermissionsSchema.shape, wrapTool('compose_permissions', (input) => composePermissions(input)));
|
|
272
|
+
server.tool('compose_permissions', 'Set up and deliver the right permissions to a member for their role or tags. Automatically tailors permissions to the project type. Pass tags (e.g. ["doer","gpu"]) to layer custom tag profiles additively on top of the base role; a doer/reviewer tag sets the primary mode and wins over role. Use grant to add specific permissions mid-sprint without a full recompose.', composePermissionsSchema.shape, wrapTool('compose_permissions', (input) => composePermissions(input)));
|
|
267
273
|
// --- Cloud Control ---
|
|
268
274
|
server.tool('cloud_control', 'Manually start, stop, or check status of a cloud fleet member. Start waits until the member is ready; stop is immediate.', cloudControlSchema.shape, wrapTool('cloud_control', (input) => cloudControl(input)));
|
|
269
275
|
server.tool('monitor_task', 'Check status of a long-running background task on a cloud member. Optionally stop the cloud instance automatically when the task completes.', monitorTaskSchema.shape, wrapTool('monitor_task', (input) => monitorTask(input)));
|