@agentage/cli 0.7.1 → 0.8.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/dist/commands/login.js +2 -2
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +45 -1
- package/dist/commands/status.js.map +1 -1
- package/dist/hub/auth-callback.d.ts +1 -1
- package/dist/hub/auth-callback.d.ts.map +1 -1
- package/dist/hub/auth-callback.js +74 -4
- package/dist/hub/auth-callback.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/login.js
CHANGED
|
@@ -13,7 +13,7 @@ export const registerLogin = (program) => {
|
|
|
13
13
|
.option('--token <token>', 'Use access token directly (headless/CI)')
|
|
14
14
|
.action(async (opts) => {
|
|
15
15
|
await ensureDaemon();
|
|
16
|
-
const hubUrl = opts.hub
|
|
16
|
+
const hubUrl = opts.hub.startsWith('http') ? opts.hub : `https://${opts.hub}`;
|
|
17
17
|
if (opts.token) {
|
|
18
18
|
// Direct token mode — for headless/CI
|
|
19
19
|
console.log(chalk.yellow('Direct token login — skipping browser flow'));
|
|
@@ -37,7 +37,7 @@ export const registerLogin = (program) => {
|
|
|
37
37
|
}
|
|
38
38
|
// Start callback server, then open browser to hub login page
|
|
39
39
|
console.log('Opening browser for authentication...');
|
|
40
|
-
const authPromise = startCallbackServer();
|
|
40
|
+
const authPromise = startCallbackServer(hubUrl);
|
|
41
41
|
// Wait a tick for the server to start, then get the port
|
|
42
42
|
await new Promise((r) => setTimeout(r, 100));
|
|
43
43
|
const port = getCallbackPort();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAgB,EAAQ,EAAE;IACtD,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,uBAAuB,CAAC;SACpC,MAAM,CAAC,aAAa,EAAE,SAAS,EAAE,eAAe,CAAC;SACjD,MAAM,CAAC,iBAAiB,EAAE,yCAAyC,CAAC;SACpE,MAAM,CAAC,KAAK,EAAE,IAAqC,EAAE,EAAE;QACtD,MAAM,YAAY,EAAE,CAAC;QAErB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBzC,eAAO,MAAM,cAAc,GAAI,SAAS,OAAO,KAAG,IAwDjD,CAAC"}
|
package/dist/commands/status.js
CHANGED
|
@@ -1,12 +1,24 @@
|
|
|
1
|
+
import { resolve } from 'node:path';
|
|
1
2
|
import chalk from 'chalk';
|
|
2
3
|
import { ensureDaemon } from '../utils/ensure-daemon.js';
|
|
3
4
|
import { get } from '../utils/daemon-client.js';
|
|
4
5
|
import { getDaemonPid } from '../daemon/daemon.js';
|
|
6
|
+
import { loadConfig, saveConfig } from '../daemon/config.js';
|
|
5
7
|
export const registerStatus = (program) => {
|
|
6
8
|
program
|
|
7
9
|
.command('status')
|
|
8
10
|
.description('Show daemon and connection status')
|
|
9
|
-
.
|
|
11
|
+
.option('--add-dir <path>', 'Add directory to agent discovery')
|
|
12
|
+
.option('--remove-dir <path>', 'Remove directory from agent discovery')
|
|
13
|
+
.action(async (opts) => {
|
|
14
|
+
if (opts.addDir) {
|
|
15
|
+
handleAddDir(opts.addDir);
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
if (opts.removeDir) {
|
|
19
|
+
handleRemoveDir(opts.removeDir);
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
10
22
|
await ensureDaemon();
|
|
11
23
|
const health = await get('/api/health');
|
|
12
24
|
const agents = await get('/api/agents');
|
|
@@ -30,9 +42,41 @@ export const registerStatus = (program) => {
|
|
|
30
42
|
console.log(`Machine: ${health.machineId}`);
|
|
31
43
|
console.log(`Agents: ${agents.length} discovered`);
|
|
32
44
|
console.log(`Runs: ${activeRuns} active`);
|
|
45
|
+
const config = loadConfig();
|
|
46
|
+
const dirs = config.discovery.dirs;
|
|
47
|
+
if (dirs.length > 0) {
|
|
48
|
+
console.log(`Discovery: ${dirs[0]}`);
|
|
49
|
+
for (const dir of dirs.slice(1)) {
|
|
50
|
+
console.log(` ${dir}`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
console.log('Discovery: (none)');
|
|
55
|
+
}
|
|
33
56
|
process.exit(0);
|
|
34
57
|
});
|
|
35
58
|
};
|
|
59
|
+
const handleAddDir = (path) => {
|
|
60
|
+
const absolute = resolve(path);
|
|
61
|
+
const config = loadConfig();
|
|
62
|
+
if (config.discovery.dirs.includes(absolute)) {
|
|
63
|
+
console.log(chalk.yellow(`Directory already in discovery: ${absolute}`));
|
|
64
|
+
process.exit(0);
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
config.discovery.dirs.push(absolute);
|
|
68
|
+
saveConfig(config);
|
|
69
|
+
console.log(chalk.green(`Added discovery directory: ${absolute}`));
|
|
70
|
+
process.exit(0);
|
|
71
|
+
};
|
|
72
|
+
const handleRemoveDir = (path) => {
|
|
73
|
+
const absolute = resolve(path);
|
|
74
|
+
const config = loadConfig();
|
|
75
|
+
config.discovery.dirs = config.discovery.dirs.filter((d) => d !== absolute);
|
|
76
|
+
saveConfig(config);
|
|
77
|
+
console.log(chalk.green(`Removed discovery directory: ${absolute}`));
|
|
78
|
+
process.exit(0);
|
|
79
|
+
};
|
|
36
80
|
const formatUptime = (seconds) => {
|
|
37
81
|
const h = Math.floor(seconds / 3600);
|
|
38
82
|
const m = Math.floor((seconds % 3600) / 60);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type AuthState } from './auth.js';
|
|
2
|
-
export declare const startCallbackServer: () => Promise<AuthState>;
|
|
2
|
+
export declare const startCallbackServer: (hubUrl?: string) => Promise<AuthState>;
|
|
3
3
|
export declare const getCallbackPort: () => number;
|
|
4
4
|
//# sourceMappingURL=auth-callback.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-callback.d.ts","sourceRoot":"","sources":["../../src/hub/auth-callback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-callback.d.ts","sourceRoot":"","sources":["../../src/hub/auth-callback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAoF3C,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,KAAG,OAAO,CAAC,SAAS,CAwFnE,CAAC;AAEL,eAAO,MAAM,eAAe,QAAO,MAKlC,CAAC"}
|
|
@@ -8,8 +8,63 @@ const decodeJwtPayload = (token) => {
|
|
|
8
8
|
const json = Buffer.from(payload, 'base64url').toString('utf-8');
|
|
9
9
|
return JSON.parse(json);
|
|
10
10
|
};
|
|
11
|
-
|
|
11
|
+
const buildPage = (opts) => {
|
|
12
|
+
const isSuccess = opts.status === 'success';
|
|
13
|
+
const color = isSuccess ? '#22c55e' : '#ef4444';
|
|
14
|
+
const icon = isSuccess
|
|
15
|
+
? `<svg width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="${color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"/><polyline points="22 4 12 14.01 9 11.01"/></svg>`
|
|
16
|
+
: `<svg width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="${color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>`;
|
|
17
|
+
const dashboardButton = opts.dashboardUrl
|
|
18
|
+
? `<a href="${opts.dashboardUrl}" style="display:inline-block;margin-top:24px;padding:10px 32px;background:#f5a623;color:#0a0a0f;font-weight:600;font-size:14px;border-radius:9999px;text-decoration:none;transition:background 0.2s" onmouseover="this.style.background='#d97706'" onmouseout="this.style.background='#f5a623'">Open Dashboard</a>`
|
|
19
|
+
: '';
|
|
20
|
+
return `<!DOCTYPE html>
|
|
21
|
+
<html lang="en">
|
|
22
|
+
<head>
|
|
23
|
+
<meta charset="utf-8">
|
|
24
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
25
|
+
<title>${opts.title} — Agentage</title>
|
|
26
|
+
<style>
|
|
27
|
+
* { margin: 0; padding: 0; box-sizing: border-box; }
|
|
28
|
+
body {
|
|
29
|
+
background: #0a0a0f;
|
|
30
|
+
color: #f5f5f5;
|
|
31
|
+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
|
|
32
|
+
display: flex;
|
|
33
|
+
align-items: center;
|
|
34
|
+
justify-content: center;
|
|
35
|
+
min-height: 100vh;
|
|
36
|
+
-webkit-font-smoothing: antialiased;
|
|
37
|
+
}
|
|
38
|
+
.card {
|
|
39
|
+
background: #1a1a24;
|
|
40
|
+
border: 1px solid #2a2a34;
|
|
41
|
+
border-radius: 16px;
|
|
42
|
+
padding: 48px;
|
|
43
|
+
max-width: 420px;
|
|
44
|
+
width: 100%;
|
|
45
|
+
text-align: center;
|
|
46
|
+
box-shadow: 0 4px 6px -1px rgba(0,0,0,0.5), 0 2px 4px -2px rgba(0,0,0,0.3);
|
|
47
|
+
}
|
|
48
|
+
.logo { color: #f5a623; font-size: 20px; font-weight: 700; margin-bottom: 24px; }
|
|
49
|
+
.icon { display: flex; justify-content: center; margin-bottom: 16px; }
|
|
50
|
+
h2 { font-size: 22px; font-weight: 600; margin-bottom: 8px; color: ${color}; }
|
|
51
|
+
p { color: #6b7280; font-size: 14px; line-height: 1.6; }
|
|
52
|
+
</style>
|
|
53
|
+
</head>
|
|
54
|
+
<body>
|
|
55
|
+
<div class="card">
|
|
56
|
+
<div class="logo">Agentage</div>
|
|
57
|
+
<div class="icon">${icon}</div>
|
|
58
|
+
<h2>${opts.title}</h2>
|
|
59
|
+
<p>${opts.message}</p>
|
|
60
|
+
${dashboardButton}
|
|
61
|
+
</div>
|
|
62
|
+
</body>
|
|
63
|
+
</html>`;
|
|
64
|
+
};
|
|
65
|
+
export const startCallbackServer = (hubUrl) => new Promise((resolve, reject) => {
|
|
12
66
|
const app = express();
|
|
67
|
+
const dashboardUrl = hubUrl ? `${hubUrl}/dashboard` : undefined;
|
|
13
68
|
const server = app.listen(0, () => {
|
|
14
69
|
const addr = server.address();
|
|
15
70
|
const port = typeof addr === 'object' && addr ? addr.port : 0;
|
|
@@ -27,7 +82,12 @@ export const startCallbackServer = () => new Promise((resolve, reject) => {
|
|
|
27
82
|
// Primary flow — tokens provided directly by the hub login page
|
|
28
83
|
try {
|
|
29
84
|
const payload = decodeJwtPayload(accessToken);
|
|
30
|
-
res.send(
|
|
85
|
+
res.send(buildPage({
|
|
86
|
+
title: 'Login successful!',
|
|
87
|
+
message: 'You can close this window and return to the terminal.',
|
|
88
|
+
status: 'success',
|
|
89
|
+
dashboardUrl,
|
|
90
|
+
}));
|
|
31
91
|
server.close();
|
|
32
92
|
resolve({
|
|
33
93
|
session: {
|
|
@@ -48,14 +108,24 @@ export const startCallbackServer = () => new Promise((resolve, reject) => {
|
|
|
48
108
|
});
|
|
49
109
|
}
|
|
50
110
|
catch (err) {
|
|
51
|
-
|
|
111
|
+
const errorHtml = buildPage({
|
|
112
|
+
title: 'Login failed',
|
|
113
|
+
message: 'Failed to decode access token.',
|
|
114
|
+
status: 'error',
|
|
115
|
+
});
|
|
116
|
+
res.status(500).send(errorHtml);
|
|
52
117
|
server.close();
|
|
53
118
|
reject(new Error(`Failed to decode access token: ${err instanceof Error ? err.message : String(err)}`));
|
|
54
119
|
}
|
|
55
120
|
return;
|
|
56
121
|
}
|
|
57
122
|
// No recognized params
|
|
58
|
-
|
|
123
|
+
const missingHtml = buildPage({
|
|
124
|
+
title: 'Login failed',
|
|
125
|
+
message: 'Missing authentication parameters.',
|
|
126
|
+
status: 'error',
|
|
127
|
+
});
|
|
128
|
+
res.status(400).send(missingHtml);
|
|
59
129
|
server.close();
|
|
60
130
|
reject(new Error('Missing authentication parameters in callback'));
|
|
61
131
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-callback.js","sourceRoot":"","sources":["../../src/hub/auth-callback.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAa9B,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAc,EAAE;IACrD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAe,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"auth-callback.js","sourceRoot":"","sources":["../../src/hub/auth-callback.ts"],"names":[],"mappings":"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"}
|