@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-command.d.ts","sourceRoot":"","sources":["../../src/tools/execute-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-command.d.ts","sourceRoot":"","sources":["../../src/tools/execute-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAiBxB,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK9C;AAED,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQ/B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAyFvE,wBAAsB,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CA8J7F"}
|
|
@@ -11,7 +11,8 @@ import { generateTaskWrapper } from '../services/cloud/task-wrapper.js';
|
|
|
11
11
|
import { escapeShellArg, escapePowerShellArg } from '../utils/shell-escape.js';
|
|
12
12
|
import { credentialResolve, registerTaskCredentials } from '../services/credential-store.js';
|
|
13
13
|
import { collectOobConfirm } from '../services/auth-socket.js';
|
|
14
|
-
import { LogScope, maskSecrets, truncateForLog } from '../utils/log-helpers.js';
|
|
14
|
+
import { LogScope, maskSecrets, truncateForLog, logLine } from '../utils/log-helpers.js';
|
|
15
|
+
import { getLogPreviewChars } from '../services/user-config.js';
|
|
15
16
|
import { tryKillPid } from '../utils/pid-helpers.js';
|
|
16
17
|
export function resolveTilde(p) {
|
|
17
18
|
if (p === '~' || p.startsWith('~/')) {
|
|
@@ -32,6 +33,15 @@ export const executeCommandSchema = z.object({
|
|
|
32
33
|
const NETWORK_TOOL_RE = /\b(curl|wget|ssh|sftp|scp|rsync|nc|netcat|http|fetch|Invoke-WebRequest|Invoke-RestMethod)\b/i;
|
|
33
34
|
// Matches raw sec:// credential handles that must never reach shell or LLM
|
|
34
35
|
const SEC_RE = /sec:\/\/[a-zA-Z0-9_]+/;
|
|
36
|
+
/** Cap command output before logging it, to protect the fleet log from huge dumps. */
|
|
37
|
+
function capForLog(text, maxLines = 50, maxChars = 4000) {
|
|
38
|
+
let t = text.length > maxChars ? text.slice(0, maxChars) + '\n... [output truncated]' : text;
|
|
39
|
+
const lines = t.split('\n');
|
|
40
|
+
if (lines.length > maxLines) {
|
|
41
|
+
t = lines.slice(0, maxLines).join('\n') + `\n... [+${lines.length - maxLines} more lines]`;
|
|
42
|
+
}
|
|
43
|
+
return t;
|
|
44
|
+
}
|
|
35
45
|
/**
|
|
36
46
|
* Scan a command string for {{secure.NAME}} tokens, resolve each from the
|
|
37
47
|
* credential store, and return the substituted command plus metadata for
|
|
@@ -100,7 +110,7 @@ export async function executeCommand(input, extra) {
|
|
|
100
110
|
return `Failed to execute command on "${agentOrError.friendlyName}": ${err.message}`;
|
|
101
111
|
}
|
|
102
112
|
const strategy = getStrategy(agent);
|
|
103
|
-
const scope = new LogScope('execute_command',
|
|
113
|
+
const scope = new LogScope('execute_command', truncateForLog(maskSecrets(input.command), getLogPreviewChars()), agent);
|
|
104
114
|
const onPidCaptured = (pid) => scope.info(`pid=${pid}`);
|
|
105
115
|
const cmds = getOsCommands(getAgentOS(agent));
|
|
106
116
|
const agentOs = getAgentOS(agent);
|
|
@@ -210,6 +220,12 @@ export async function executeCommand(input, extra) {
|
|
|
210
220
|
// Redact credential values from output
|
|
211
221
|
const output = credentials.length > 0 ? redactOutput(rawOutput, credentials) : rawOutput;
|
|
212
222
|
writeStatusline();
|
|
223
|
+
// Log command output under a dedicated tag so `watch` can surface it (the
|
|
224
|
+
// fleet log is watch's source; short-command stdout is otherwise not
|
|
225
|
+
// persisted anywhere). Capped to protect the log from huge outputs.
|
|
226
|
+
if (output && output !== '(no output)') {
|
|
227
|
+
logLine('command_output', capForLog(output), agent, scope.getInv());
|
|
228
|
+
}
|
|
213
229
|
if (result.code !== 0)
|
|
214
230
|
scope.fail(`exit=${result.code}`);
|
|
215
231
|
else
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-command.js","sourceRoot":"","sources":["../../src/tools/execute-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execute-command.js","sourceRoot":"","sources":["../../src/tools/execute-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,5 +35,6 @@ export declare const executePromptSchema: z.ZodObject<{
|
|
|
35
35
|
export type ExecutePromptInput = z.infer<typeof executePromptSchema>;
|
|
36
36
|
export declare function resolveModelForTier(agent: Agent, tier: string, provider: ProviderAdapter): string;
|
|
37
37
|
export declare const inFlightAgents: Set<string>;
|
|
38
|
+
export declare const provisionedRemoteAgents: Set<string>;
|
|
38
39
|
export declare function executePrompt(input: ExecutePromptInput, extra?: any): Promise<string>;
|
|
39
40
|
//# sourceMappingURL=execute-prompt.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-prompt.d.ts","sourceRoot":"","sources":["../../src/tools/execute-prompt.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-prompt.d.ts","sourceRoot":"","sources":["../../src/tools/execute-prompt.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAoBxB,OAAO,KAAK,EAAE,KAAK,EAAiB,MAAM,aAAa,CAAC;AAExD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAS9B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAsDrE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,MAAM,CAOjG;AAID,eAAO,MAAM,cAAc,aAAoB,CAAC;AAQhD,eAAO,MAAM,uBAAuB,aAAoB,CAAC;AAqCzD,wBAAsB,aAAa,CAAC,KAAK,EAAE,kBAAkB,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAuO3F"}
|
|
@@ -15,11 +15,13 @@ import { writeStatusline } from '../services/statusline.js';
|
|
|
15
15
|
import { getModelOverride } from '../services/user-config.js';
|
|
16
16
|
import { ensureCloudReady } from '../services/cloud/lifecycle.js';
|
|
17
17
|
import { getStallDetector, resolveSessionLogPath } from '../services/stall/index.js';
|
|
18
|
+
import { provisionAgents, remoteAgentsDir } from '../services/agent-provisioner.js';
|
|
18
19
|
import { escapeWindowsArg, escapeDoubleQuoted } from '../os/os-commands.js';
|
|
19
20
|
import { resolveTilde } from './execute-command.js';
|
|
20
21
|
import { clearStoredPid } from '../utils/agent-helpers.js';
|
|
21
22
|
import { tryKillPid } from '../utils/pid-helpers.js';
|
|
22
23
|
import { LogScope, maskSecrets, truncateForLog } from '../utils/log-helpers.js';
|
|
24
|
+
import { getLogPreviewChars } from '../services/user-config.js';
|
|
23
25
|
export const executePromptSchema = z.object({
|
|
24
26
|
...memberIdentifier,
|
|
25
27
|
prompt: z.string().describe('The prompt to send to the LLM on the remote member'),
|
|
@@ -91,6 +93,40 @@ export function resolveModelForTier(agent, tier, provider) {
|
|
|
91
93
|
}
|
|
92
94
|
const SECURE_TOKEN_RE = /\{\{secure\.[a-zA-Z0-9_-]{1,64}\}\}/;
|
|
93
95
|
export const inFlightAgents = new Set();
|
|
96
|
+
// Member ids whose remote agent files (planner.md, doer.md, _shared/, schemas/, ...)
|
|
97
|
+
// have already been probed/refreshed this server process uptime -- the #336
|
|
98
|
+
// provisioner is a real SSH round trip, so we pay that cost once per member per
|
|
99
|
+
// run rather than on every dispatch. Local members share the operator's home dir
|
|
100
|
+
// and never need this; providers with no remote agents dir (codex, copilot) are
|
|
101
|
+
// cheap to check and also skipped.
|
|
102
|
+
export const provisionedRemoteAgents = new Set();
|
|
103
|
+
/**
|
|
104
|
+
* Bring a remote member's agent files current before dispatch (the 0.3.4->0.3.5
|
|
105
|
+
* upgrade path: #336 only provisions on register_member/update_member, so an
|
|
106
|
+
* already-registered member stays stale until this runs). Never throws --
|
|
107
|
+
* provisioning failures must not block the prompt dispatch.
|
|
108
|
+
*/
|
|
109
|
+
async function ensureAgentFilesProvisioned(agent) {
|
|
110
|
+
if (agent.agentType === 'local')
|
|
111
|
+
return;
|
|
112
|
+
if (provisionedRemoteAgents.has(agent.id))
|
|
113
|
+
return;
|
|
114
|
+
provisionedRemoteAgents.add(agent.id);
|
|
115
|
+
if (remoteAgentsDir(agent.llmProvider ?? 'claude') === null)
|
|
116
|
+
return;
|
|
117
|
+
try {
|
|
118
|
+
const result = await provisionAgents(agent);
|
|
119
|
+
if (result.warning) {
|
|
120
|
+
// Probe or upload failed -- do not trust the cache, retry on next dispatch.
|
|
121
|
+
provisionedRemoteAgents.delete(agent.id);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
// warn-and-continue, same as register_member/update_member's wire-in, but
|
|
126
|
+
// a transient failure must not permanently poison the cache.
|
|
127
|
+
provisionedRemoteAgents.delete(agent.id);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
94
130
|
// All exit paths from executePrompt clear busy state via the finally block (inFlightAgents.delete + writeStatusline):
|
|
95
131
|
// (a) normal success: result.code === 0 → finally sets idle and removes agent from inFlight
|
|
96
132
|
// (b) non-zero exit from execCommand: result.code !== 0 → finally sets idle and removes agent from inFlight
|
|
@@ -118,6 +154,7 @@ export async function executePrompt(input, extra) {
|
|
|
118
154
|
return `❌ execute_prompt is already running for "${agent.friendlyName}". Wait for the current call to finish before sending another.`;
|
|
119
155
|
}
|
|
120
156
|
inFlightAgents.add(agent.id);
|
|
157
|
+
await ensureAgentFilesProvisioned(agent);
|
|
121
158
|
const stallDetector = getStallDetector();
|
|
122
159
|
let clearedByStall = false;
|
|
123
160
|
stallDetector.add(agent.id, {
|
|
@@ -175,7 +212,7 @@ export async function executePrompt(input, extra) {
|
|
|
175
212
|
const deprecationWarning = input.dangerously_skip_permissions
|
|
176
213
|
? '⚠️ DEPRECATION: dangerously_skip_permissions is deprecated and ignored. Use update_member(unattended="dangerous") instead.\n\n'
|
|
177
214
|
: '';
|
|
178
|
-
const scope = new LogScope('execute_prompt', `[${resolvedModel}] resume=${input.resume} timeout=${input.timeout_s ?? 300}s ${truncateForLog(maskSecrets(input.prompt))}`, agent);
|
|
215
|
+
const scope = new LogScope('execute_prompt', `[${resolvedModel}] resume=${input.resume} timeout=${input.timeout_s ?? 300}s ${truncateForLog(maskSecrets(input.prompt), getLogPreviewChars())}`, agent);
|
|
179
216
|
const resuming = !!(input.resume && agent.sessionId && provider.supportsResume());
|
|
180
217
|
const mintedId = (provider.name === 'claude' || provider.name === 'gemini' || provider.name === 'agy')
|
|
181
218
|
? (resuming ? agent.sessionId : uuid())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-prompt.js","sourceRoot":"","sources":["../../src/tools/execute-prompt.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execute-prompt.js","sourceRoot":"","sources":["../../src/tools/execute-prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
export declare const listMembersSchema: z.ZodObject<{
|
|
3
3
|
format: z.ZodDefault<z.ZodEnum<["compact", "json"]>>;
|
|
4
|
+
tags: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
4
5
|
}, "strip", z.ZodTypeAny, {
|
|
5
6
|
format: "compact" | "json";
|
|
7
|
+
tags?: string[] | undefined;
|
|
6
8
|
}, {
|
|
9
|
+
tags?: string[] | undefined;
|
|
7
10
|
format?: "compact" | "json" | undefined;
|
|
8
11
|
}>;
|
|
9
12
|
export type ListMembersInput = z.infer<typeof listMembersSchema>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-members.d.ts","sourceRoot":"","sources":["../../src/tools/list-members.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAUxB,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"list-members.d.ts","sourceRoot":"","sources":["../../src/tools/list-members.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAUxB,eAAO,MAAM,iBAAiB;;;;;;;;;EAG5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAkDjE,wBAAsB,WAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkE3E"}
|
|
@@ -5,9 +5,10 @@ import { serverVersion } from '../version.js';
|
|
|
5
5
|
import { getStrategy } from '../services/strategy.js';
|
|
6
6
|
import { getOsCommands } from '../os/index.js';
|
|
7
7
|
import { getProvider } from '../providers/index.js';
|
|
8
|
-
import { getAgentOS } from '../utils/agent-helpers.js';
|
|
8
|
+
import { getAgentOS, groupByCategory } from '../utils/agent-helpers.js';
|
|
9
9
|
export const listMembersSchema = z.object({
|
|
10
10
|
format: z.enum(['compact', 'json']).default('compact').describe('Output format: "compact" (default, few lines) or "json" (structured data for detailed rendering)'),
|
|
11
|
+
tags: z.array(z.string()).optional().describe('Filter members by tags (AND semantics): only return members that have ALL specified tags. Omit to return all members.'),
|
|
11
12
|
});
|
|
12
13
|
async function getAuthStatus(agent) {
|
|
13
14
|
if (agent.agentType === 'local')
|
|
@@ -58,7 +59,11 @@ async function getAuthStatus(agent) {
|
|
|
58
59
|
}
|
|
59
60
|
export async function listMembers(input) {
|
|
60
61
|
const format = input?.format ?? 'compact';
|
|
61
|
-
const
|
|
62
|
+
const filterTags = input?.tags;
|
|
63
|
+
let agents = getAllAgents();
|
|
64
|
+
if (filterTags && filterTags.length > 0) {
|
|
65
|
+
agents = agents.filter(a => filterTags.every(tag => a.tags?.includes(tag)));
|
|
66
|
+
}
|
|
62
67
|
if (agents.length === 0)
|
|
63
68
|
return 'No members registered.';
|
|
64
69
|
const authStatusPromises = agents.map(getAuthStatus);
|
|
@@ -82,26 +87,36 @@ export async function listMembers(input) {
|
|
|
82
87
|
session: a.sessionId ?? null,
|
|
83
88
|
created: a.createdAt,
|
|
84
89
|
lastUsed: a.lastUsed ?? 'never',
|
|
90
|
+
category: a.category ?? null,
|
|
91
|
+
tags: a.tags ?? null,
|
|
85
92
|
})),
|
|
86
93
|
});
|
|
87
94
|
}
|
|
88
|
-
// Compact:
|
|
95
|
+
// Compact: group members by category, one group per row block
|
|
96
|
+
const combined = agents.map((agent, i) => ({ agent, authStatus: authStatuses[i] }));
|
|
97
|
+
const { grouped, sortedKeys } = groupByCategory(combined, ({ agent: a }) => a.category?.trim());
|
|
89
98
|
let t = `${agents.length} member(s)\n`;
|
|
90
|
-
for (const
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
const authStatus
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
t += ` |
|
|
97
|
-
if (
|
|
98
|
-
t += ` |
|
|
99
|
+
for (const category of sortedKeys) {
|
|
100
|
+
const members = grouped.get(category);
|
|
101
|
+
t += `\n[${category}]\n`;
|
|
102
|
+
for (const { agent: a, authStatus } of members) {
|
|
103
|
+
const icon = a.icon ?? DEFAULT_ICON;
|
|
104
|
+
const host = a.agentType === 'local' ? 'local' : `${a.host}:${a.port}`;
|
|
105
|
+
t += ` ${icon} ${a.friendlyName}: ${a.id} | ${host} | ${a.os ?? '?'} | provider=${a.llmProvider ?? 'claude'}`;
|
|
106
|
+
if (a.agentType !== 'local') {
|
|
107
|
+
t += ` | user=${a.username} | ssh=${a.authType}`;
|
|
108
|
+
if (authStatus !== 'offline' && authStatus !== 'N/A') {
|
|
109
|
+
t += ` | llm-auth=${authStatus}`;
|
|
110
|
+
}
|
|
111
|
+
else if (authStatus === 'offline') {
|
|
112
|
+
t += ` | status=offline`;
|
|
113
|
+
}
|
|
99
114
|
}
|
|
100
|
-
|
|
101
|
-
t += ` |
|
|
115
|
+
if (a.tags && a.tags.length > 0) {
|
|
116
|
+
t += ` | tags=[${a.tags.join(', ')}]`;
|
|
102
117
|
}
|
|
118
|
+
t += '\n';
|
|
103
119
|
}
|
|
104
|
-
t += '\n';
|
|
105
120
|
}
|
|
106
121
|
return t;
|
|
107
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-members.js","sourceRoot":"","sources":["../../src/tools/list-members.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"list-members.js","sourceRoot":"","sources":["../../src/tools/list-members.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,12 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
18
18
|
cloud_idle_timeout_min: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
|
|
19
19
|
cloud_activity_command: z.ZodOptional<z.ZodString>;
|
|
20
20
|
llm_provider: z.ZodDefault<z.ZodOptional<z.ZodEnum<["claude", "gemini", "codex", "copilot", "agy", "opencode"]>>>;
|
|
21
|
-
model_cheap: z.ZodOptional<z.ZodEnum<["gpt-oss-120b", "gpt-120", "gemini-3.5-flash-lite", "gemini-3.1-flash-lite-preview", "
|
|
22
|
-
model_standard: z.ZodOptional<z.ZodEnum<["gemini-3.5-flash", "gpt-oss-120b", "gpt-120", "
|
|
23
|
-
model_premium: z.ZodOptional<z.ZodEnum<["
|
|
21
|
+
model_cheap: z.ZodOptional<z.ZodEnum<["gpt-oss-120b", "gpt-120", "gemini-3.5-flash-lite", "gemini-3.1-flash-lite-preview", "haiku", "gpt-5.4-mini"]>>;
|
|
22
|
+
model_standard: z.ZodOptional<z.ZodEnum<["gemini-3.5-flash", "gpt-oss-120b", "gpt-120", "sonnet", "gemini-3-flash-preview", "gpt-5.4"]>>;
|
|
23
|
+
model_premium: z.ZodOptional<z.ZodEnum<["sonnet", "opus", "gpt-oss-120b", "gemini-3.1-pro-preview"]>>;
|
|
24
24
|
unattended: z.ZodOptional<z.ZodEffects<z.ZodEnum<["false", "auto", "dangerous"]>, "auto" | "dangerous" | "false", unknown>>;
|
|
25
|
+
category: z.ZodOptional<z.ZodString>;
|
|
26
|
+
tags: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
25
27
|
model_tiers: z.ZodOptional<z.ZodObject<{
|
|
26
28
|
cheap: z.ZodOptional<z.ZodString>;
|
|
27
29
|
standard: z.ZodOptional<z.ZodString>;
|
|
@@ -47,6 +49,8 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
47
49
|
host?: string | undefined;
|
|
48
50
|
username?: string | undefined;
|
|
49
51
|
unattended?: "auto" | "dangerous" | "false" | undefined;
|
|
52
|
+
category?: string | undefined;
|
|
53
|
+
tags?: string[] | undefined;
|
|
50
54
|
auth_type?: "password" | "key" | undefined;
|
|
51
55
|
key_path?: string | undefined;
|
|
52
56
|
git_access?: "read" | "push" | "admin" | "issues" | "full" | undefined;
|
|
@@ -55,9 +59,9 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
55
59
|
cloud_instance_id?: string | undefined;
|
|
56
60
|
cloud_profile?: string | undefined;
|
|
57
61
|
cloud_activity_command?: string | undefined;
|
|
58
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "gemini-3.1-flash-lite-preview" | "
|
|
59
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "
|
|
60
|
-
model_premium?: "gpt-oss-120b" | "
|
|
62
|
+
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "gemini-3.1-flash-lite-preview" | "haiku" | "gpt-5.4-mini" | undefined;
|
|
63
|
+
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "sonnet" | "gemini-3-flash-preview" | "gpt-5.4" | undefined;
|
|
64
|
+
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | "gemini-3.1-pro-preview" | undefined;
|
|
61
65
|
model_tiers?: {
|
|
62
66
|
cheap?: string | undefined;
|
|
63
67
|
standard?: string | undefined;
|
|
@@ -71,6 +75,8 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
71
75
|
port?: number | undefined;
|
|
72
76
|
username?: string | undefined;
|
|
73
77
|
unattended?: unknown;
|
|
78
|
+
category?: string | undefined;
|
|
79
|
+
tags?: string[] | undefined;
|
|
74
80
|
member_type?: "local" | "remote" | undefined;
|
|
75
81
|
auth_type?: "password" | "key" | undefined;
|
|
76
82
|
key_path?: string | undefined;
|
|
@@ -83,9 +89,9 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
83
89
|
cloud_idle_timeout_min?: number | undefined;
|
|
84
90
|
cloud_activity_command?: string | undefined;
|
|
85
91
|
llm_provider?: "claude" | "gemini" | "codex" | "copilot" | "agy" | "opencode" | undefined;
|
|
86
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "gemini-3.1-flash-lite-preview" | "
|
|
87
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "
|
|
88
|
-
model_premium?: "gpt-oss-120b" | "
|
|
92
|
+
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "gemini-3.1-flash-lite-preview" | "haiku" | "gpt-5.4-mini" | undefined;
|
|
93
|
+
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "sonnet" | "gemini-3-flash-preview" | "gpt-5.4" | undefined;
|
|
94
|
+
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | "gemini-3.1-pro-preview" | undefined;
|
|
89
95
|
model_tiers?: {
|
|
90
96
|
cheap?: string | undefined;
|
|
91
97
|
standard?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-member.d.ts","sourceRoot":"","sources":["../../src/tools/register-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"register-member.d.ts","sourceRoot":"","sources":["../../src/tools/register-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAsBxB,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0C/B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEvE,wBAAsB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiUhF"}
|
|
@@ -16,6 +16,7 @@ import { logLine } from '../utils/log-helpers.js';
|
|
|
16
16
|
import { CURATED_CHEAP_MODELS, CURATED_STANDARD_MODELS, CURATED_PREMIUM_MODELS } from '../cli/config.js';
|
|
17
17
|
import { writeAgyWorkspaceOverlays } from '../cli/install.js';
|
|
18
18
|
import { validateOpenCodeModelTiers } from '../utils/opencode-model-validation.js';
|
|
19
|
+
import { provisionAgents } from '../services/agent-provisioner.js';
|
|
19
20
|
export const registerMemberSchema = z.object({
|
|
20
21
|
friendly_name: z.string()
|
|
21
22
|
.min(1).max(64)
|
|
@@ -45,6 +46,11 @@ export const registerMemberSchema = z.object({
|
|
|
45
46
|
model_standard: z.enum(CURATED_STANDARD_MODELS).optional().describe('Custom standard model choice from a curated list'),
|
|
46
47
|
model_premium: z.enum(CURATED_PREMIUM_MODELS).optional().describe('Custom premium model choice from a curated list'),
|
|
47
48
|
unattended: z.preprocess((v) => v === false ? 'false' : v, z.enum(['false', 'auto', 'dangerous'])).optional().describe('Permission mode for unattended execution. Omit or pass "false" for interactive prompts (default); "auto" = auto-approve safe operations; "dangerous" = skip all permission checks.'),
|
|
49
|
+
category: z.string().max(64).optional().describe('Optional group label for this member (e.g. "doers", "reviewers", "cloud"). Used to group devices in fleet status output.'),
|
|
50
|
+
tags: z.array(z.string().max(64, 'Each tag must be 64 characters or fewer'))
|
|
51
|
+
.max(10, 'At most 10 tags are allowed')
|
|
52
|
+
.optional()
|
|
53
|
+
.describe('Optional list of free-form labels for this member (max 10 tags, each max 64 chars). Used for filtering and grouping.'),
|
|
48
54
|
model_tiers: z.object({
|
|
49
55
|
cheap: z.string().optional(),
|
|
50
56
|
standard: z.string().optional(),
|
|
@@ -213,11 +219,14 @@ export async function registerMember(input) {
|
|
|
213
219
|
modelPremium: input.model_premium,
|
|
214
220
|
unattended: (input.unattended === 'false' ? false : input.unattended) ?? false,
|
|
215
221
|
modelTiers: normalizedModelTiers,
|
|
222
|
+
category: input.category,
|
|
223
|
+
tags: input.tags,
|
|
216
224
|
};
|
|
217
225
|
// --- SSH-dependent steps (skipped for stopped cloud instances) ---
|
|
218
226
|
let detectedOS = isCloud ? 'linux' : undefined;
|
|
219
227
|
let claudeVersion;
|
|
220
228
|
let connResult = { ok: true };
|
|
229
|
+
let agentProvisionResult;
|
|
221
230
|
if (!skipSshOps) {
|
|
222
231
|
const strategy = getStrategy(tempAgent);
|
|
223
232
|
// Step 1: Test connectivity
|
|
@@ -278,6 +287,14 @@ export async function registerMember(input) {
|
|
|
278
287
|
: strategy.execCommand(cmds.mkdir(input.work_folder), 10000)
|
|
279
288
|
.catch(() => { warnings.push(`Could not create folder "${input.work_folder}"`); });
|
|
280
289
|
await Promise.all([versionCheck, authCheck, mkdirCheck]);
|
|
290
|
+
// --- Provision role-agent definition files (planner.md, doer.md, ...) ---
|
|
291
|
+
// Remote members have their own home dir and never receive these via install() --
|
|
292
|
+
// only when connectivity is confirmed do we attempt the probe/push round trip.
|
|
293
|
+
if (connResult.ok) {
|
|
294
|
+
agentProvisionResult = await provisionAgents(tempAgent);
|
|
295
|
+
if (agentProvisionResult.warning)
|
|
296
|
+
warnings.push(agentProvisionResult.warning);
|
|
297
|
+
}
|
|
281
298
|
// --- Validate opencode model_tiers against available models ---
|
|
282
299
|
if (!skipSshOps && (input.llm_provider ?? 'claude') === 'opencode' && normalizedModelTiers) {
|
|
283
300
|
const { warnings: tierWarnings } = await validateOpenCodeModelTiers(tempAgent, normalizedModelTiers);
|
|
@@ -288,6 +305,7 @@ export async function registerMember(input) {
|
|
|
288
305
|
tempAgent.os = detectedOS;
|
|
289
306
|
if (isCloud) {
|
|
290
307
|
warnings.push(`${input.llm_provider ?? 'claude'} CLI and auth not verified — run provision_llm_auth after the instance starts.`);
|
|
308
|
+
warnings.push('Agent files not provisioned -- run update_member after the instance starts.');
|
|
291
309
|
}
|
|
292
310
|
}
|
|
293
311
|
// OS support warning for cloud members: cloud features are designed for Linux
|
|
@@ -316,6 +334,12 @@ export async function registerMember(input) {
|
|
|
316
334
|
result += ` OS: ${detectedOS}\n`;
|
|
317
335
|
result += ` Folder: ${tempAgent.workFolder}\n`;
|
|
318
336
|
result += ` Provider: ${tempAgent.llmProvider ?? 'claude'}\n`;
|
|
337
|
+
if (tempAgent.category) {
|
|
338
|
+
result += ` Category: ${tempAgent.category}\n`;
|
|
339
|
+
}
|
|
340
|
+
if (tempAgent.tags && tempAgent.tags.length > 0) {
|
|
341
|
+
result += ` Tags: ${tempAgent.tags.join(', ')}\n`;
|
|
342
|
+
}
|
|
319
343
|
if (tempAgent.modelCheap)
|
|
320
344
|
result += ` Model Cheap: ${tempAgent.modelCheap}\n`;
|
|
321
345
|
if (tempAgent.modelStandard)
|
|
@@ -329,6 +353,17 @@ export async function registerMember(input) {
|
|
|
329
353
|
if (claudeVersion) {
|
|
330
354
|
result += ` CLI: ${claudeVersion}\n`;
|
|
331
355
|
}
|
|
356
|
+
if (agentProvisionResult) {
|
|
357
|
+
if (agentProvisionResult.skippedReason) {
|
|
358
|
+
result += ` Agents: skipped (${agentProvisionResult.skippedReason})\n`;
|
|
359
|
+
}
|
|
360
|
+
else if (agentProvisionResult.pushed.length > 0) {
|
|
361
|
+
result += ` Agents: ${agentProvisionResult.pushed.length} file(s) provisioned\n`;
|
|
362
|
+
}
|
|
363
|
+
else {
|
|
364
|
+
result += ` Agents: up to date\n`;
|
|
365
|
+
}
|
|
366
|
+
}
|
|
332
367
|
if (!isLocal) {
|
|
333
368
|
result += ` Auth: ${tempAgent.authType}\n`;
|
|
334
369
|
if (connResult.latencyMs !== undefined) {
|