@agentworkforce/deploy 3.0.2 → 3.0.4
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/connect.d.ts +11 -0
- package/dist/connect.d.ts.map +1 -1
- package/dist/connect.js +120 -2
- package/dist/connect.js.map +1 -1
- package/dist/connect.test.d.ts +2 -0
- package/dist/connect.test.d.ts.map +1 -0
- package/dist/connect.test.js +93 -0
- package/dist/connect.test.js.map +1 -0
- package/dist/deploy.d.ts.map +1 -1
- package/dist/deploy.js +52 -19
- package/dist/deploy.js.map +1 -1
- package/dist/deploy.test.js +132 -11
- package/dist/deploy.test.js.map +1 -1
- package/dist/index.d.ts +4 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/login.d.ts +41 -2
- package/dist/login.d.ts.map +1 -1
- package/dist/login.js +265 -6
- package/dist/login.js.map +1 -1
- package/dist/login.test.d.ts +2 -0
- package/dist/login.test.d.ts.map +1 -0
- package/dist/login.test.js +126 -0
- package/dist/login.test.js.map +1 -0
- package/dist/modes/cloud.d.ts +22 -14
- package/dist/modes/cloud.d.ts.map +1 -1
- package/dist/modes/cloud.js +635 -57
- package/dist/modes/cloud.js.map +1 -1
- package/dist/modes/cloud.test.d.ts +2 -0
- package/dist/modes/cloud.test.d.ts.map +1 -0
- package/dist/modes/cloud.test.js +519 -0
- package/dist/modes/cloud.test.js.map +1 -0
- package/dist/modes/input-values.test.js +17 -5
- package/dist/modes/input-values.test.js.map +1 -1
- package/dist/modes/sandbox.d.ts +1 -1
- package/dist/modes/sandbox.d.ts.map +1 -1
- package/dist/modes/sandbox.js +2 -2
- package/dist/modes/sandbox.js.map +1 -1
- package/dist/types.d.ts +27 -3
- package/dist/types.d.ts.map +1 -1
- package/package.json +4 -3
package/dist/connect.d.ts
CHANGED
|
@@ -49,6 +49,17 @@ export interface ProviderSubscriptionResolver {
|
|
|
49
49
|
* the orchestrator's flow stays uniform across resolvers.
|
|
50
50
|
*/
|
|
51
51
|
export declare function envIntegrationResolver(): IntegrationConnectResolver;
|
|
52
|
+
export declare function relayfileIntegrationResolver(opts: {
|
|
53
|
+
apiUrl: string;
|
|
54
|
+
workspaceId: string;
|
|
55
|
+
workspaceToken: string;
|
|
56
|
+
io?: Pick<DeployIO, 'info' | 'warn'>;
|
|
57
|
+
pollIntervalMs?: number;
|
|
58
|
+
timeoutMs?: number;
|
|
59
|
+
fetch?: typeof fetch;
|
|
60
|
+
openUrl?: (url: string) => void | Promise<void>;
|
|
61
|
+
sleep?: (ms: number) => Promise<void>;
|
|
62
|
+
}): IntegrationConnectResolver;
|
|
52
63
|
export interface ConnectAllInput {
|
|
53
64
|
persona: PersonaSpec;
|
|
54
65
|
workspace: string;
|
package/dist/connect.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAkBtE;;;;;;;;;GASG;AACH,MAAM,WAAW,0BAA0B;IACzC,uDAAuD;IACvD,WAAW,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7E,2EAA2E;IAC3E,OAAO,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3F;AAED;;;;GAIG;AACH,MAAM,WAAW,4BAA4B;IAC3C,WAAW,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5F;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,0BAA0B,CAcnE;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC,GAAG,0BAA0B,CA2D7B;AAUD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,EAAE,EAAE,QAAQ,CAAC;IACb,YAAY,EAAE,0BAA0B,CAAC;IACzC,0DAA0D;IAC1D,YAAY,CAAC,EAAE,4BAA4B,CAAC;CAC7C;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,yBAAyB,EAAE,CAAC;IACtC,+DAA+D;IAC/D,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0F3F"}
|
package/dist/connect.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { platform } from 'node:os';
|
|
2
|
+
import { spawn } from 'node:child_process';
|
|
1
3
|
/**
|
|
2
4
|
* Provider env-var conventions the deploy CLI checks when no higher-level
|
|
3
5
|
* integration resolver is supplied. The convention is:
|
|
@@ -33,6 +35,57 @@ export function envIntegrationResolver() {
|
|
|
33
35
|
}
|
|
34
36
|
};
|
|
35
37
|
}
|
|
38
|
+
export function relayfileIntegrationResolver(opts) {
|
|
39
|
+
const fetchImpl = opts.fetch ?? fetch;
|
|
40
|
+
const io = opts.io;
|
|
41
|
+
const sleepImpl = opts.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
|
|
42
|
+
const apiUrl = opts.apiUrl.replace(/\/+$/, '');
|
|
43
|
+
return {
|
|
44
|
+
async isConnected({ workspace, provider }) {
|
|
45
|
+
const workspaceId = workspace || opts.workspaceId;
|
|
46
|
+
const body = await requestJson(fetchImpl, `${apiUrl}/api/v1/workspaces/${encodeURIComponent(workspaceId)}/integrations`, opts.workspaceToken);
|
|
47
|
+
return listHasConnectedProvider(body, provider);
|
|
48
|
+
},
|
|
49
|
+
async connect({ workspace, provider }) {
|
|
50
|
+
const workspaceId = workspace || opts.workspaceId;
|
|
51
|
+
const session = await requestJson(fetchImpl, `${apiUrl}/api/v1/workspaces/${encodeURIComponent(workspaceId)}/integrations/connect-session`, opts.workspaceToken, {
|
|
52
|
+
method: 'POST',
|
|
53
|
+
body: JSON.stringify({ allowedIntegrations: [provider] })
|
|
54
|
+
});
|
|
55
|
+
const sessionUrl = readString(session, 'sessionUrl')
|
|
56
|
+
?? readString(session, 'connectLink')
|
|
57
|
+
?? readString(session, 'url');
|
|
58
|
+
if (!sessionUrl) {
|
|
59
|
+
throw new Error(`integration ${provider} connect-session did not return a session URL`);
|
|
60
|
+
}
|
|
61
|
+
const sessionId = readString(session, 'sessionId') ?? readString(session, 'connectionId');
|
|
62
|
+
io?.info(`Connecting ${provider}: opening ${sessionUrl}`);
|
|
63
|
+
try {
|
|
64
|
+
await (opts.openUrl ?? openBrowser)(sessionUrl);
|
|
65
|
+
}
|
|
66
|
+
catch (err) {
|
|
67
|
+
io?.warn?.(`Could not open browser automatically: ${err instanceof Error ? err.message : String(err)}`);
|
|
68
|
+
}
|
|
69
|
+
const deadline = Date.now() + (opts.timeoutMs ?? 5 * 60_000);
|
|
70
|
+
while (Date.now() < deadline) {
|
|
71
|
+
await sleepImpl(opts.pollIntervalMs ?? 2_000);
|
|
72
|
+
const statusUrl = new URL(`${apiUrl}/api/v1/workspaces/${encodeURIComponent(workspaceId)}/integrations/${encodeURIComponent(provider)}/status`);
|
|
73
|
+
if (sessionId)
|
|
74
|
+
statusUrl.searchParams.set('connectionId', sessionId);
|
|
75
|
+
const status = await requestJson(fetchImpl, statusUrl.toString(), opts.workspaceToken);
|
|
76
|
+
if (isConnectedStatus(status)) {
|
|
77
|
+
const connectionId = readString(status, 'connectionId')
|
|
78
|
+
?? readString(status, 'currentConnectionId')
|
|
79
|
+
?? sessionId
|
|
80
|
+
?? provider;
|
|
81
|
+
io?.info(`${provider} connected.`);
|
|
82
|
+
return { connectionId };
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
throw new Error(`Timed out waiting for ${provider} OAuth to complete. Re-run \`agentworkforce deploy ...\` after connecting.`);
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
}
|
|
36
89
|
function providerHasEnvCredentials(provider) {
|
|
37
90
|
const upper = provider.toUpperCase();
|
|
38
91
|
return Boolean(process.env[`${PROVIDER_ENV_PREFIX}${upper}_TOKEN`] ||
|
|
@@ -68,11 +121,11 @@ export async function connectIntegrations(input) {
|
|
|
68
121
|
continue;
|
|
69
122
|
}
|
|
70
123
|
if (input.noConnect) {
|
|
71
|
-
input.io.error(`integrations.${provider}: not connected, and
|
|
124
|
+
input.io.error(`integrations.${provider}: not connected, and prompts are disabled`);
|
|
72
125
|
outcomes.push({
|
|
73
126
|
provider,
|
|
74
127
|
status: 'failed',
|
|
75
|
-
message: 'not connected (
|
|
128
|
+
message: 'not connected (prompts are disabled)'
|
|
76
129
|
});
|
|
77
130
|
continue;
|
|
78
131
|
}
|
|
@@ -124,4 +177,69 @@ export async function connectIntegrations(input) {
|
|
|
124
177
|
...(subscriptionProvider ? { subscriptionProvider } : {})
|
|
125
178
|
};
|
|
126
179
|
}
|
|
180
|
+
async function requestJson(fetchImpl, url, token, init = {}) {
|
|
181
|
+
const res = await fetchImpl(url, {
|
|
182
|
+
...init,
|
|
183
|
+
headers: {
|
|
184
|
+
authorization: `Bearer ${token}`,
|
|
185
|
+
'content-type': 'application/json',
|
|
186
|
+
...(init.headers ?? {})
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
if (res.status === 401) {
|
|
190
|
+
throw new Error('cloud integration request failed: unauthorized. Run `agentworkforce login` and retry.');
|
|
191
|
+
}
|
|
192
|
+
if (!res.ok) {
|
|
193
|
+
throw new Error(`cloud integration request failed: ${res.status} ${await res.text().catch(() => '')}`.trim());
|
|
194
|
+
}
|
|
195
|
+
return await res.json();
|
|
196
|
+
}
|
|
197
|
+
function listHasConnectedProvider(body, provider) {
|
|
198
|
+
const candidates = Array.isArray(body)
|
|
199
|
+
? body
|
|
200
|
+
: body && typeof body === 'object' && Array.isArray(body.integrations)
|
|
201
|
+
? body.integrations
|
|
202
|
+
: [];
|
|
203
|
+
return candidates.some((item) => {
|
|
204
|
+
if (!item || typeof item !== 'object' || Array.isArray(item))
|
|
205
|
+
return false;
|
|
206
|
+
const record = item;
|
|
207
|
+
return record.provider === provider && isConnectedStatus(record);
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
function isConnectedStatus(value) {
|
|
211
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
212
|
+
return false;
|
|
213
|
+
const record = value;
|
|
214
|
+
return record.status === 'connected'
|
|
215
|
+
|| record.status === 'active'
|
|
216
|
+
|| record.status === 'ready'
|
|
217
|
+
|| record.state === 'connected'
|
|
218
|
+
|| record.state === 'ready'
|
|
219
|
+
|| record.ready === true
|
|
220
|
+
|| Boolean(record.connectionId)
|
|
221
|
+
|| Boolean(record.currentConnectionId)
|
|
222
|
+
|| (record.oauth !== null
|
|
223
|
+
&& typeof record.oauth === 'object'
|
|
224
|
+
&& record.oauth.connected === true);
|
|
225
|
+
}
|
|
226
|
+
function readString(value, field) {
|
|
227
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
228
|
+
return undefined;
|
|
229
|
+
const raw = value[field];
|
|
230
|
+
return typeof raw === 'string' && raw.trim() ? raw.trim() : undefined;
|
|
231
|
+
}
|
|
232
|
+
function openBrowser(url) {
|
|
233
|
+
const command = platform() === 'darwin'
|
|
234
|
+
? 'open'
|
|
235
|
+
: platform() === 'win32'
|
|
236
|
+
? 'cmd'
|
|
237
|
+
: 'xdg-open';
|
|
238
|
+
const args = platform() === 'win32' ? ['/c', 'start', '', url] : [url];
|
|
239
|
+
const child = spawn(command, args, { stdio: 'ignore', detached: true });
|
|
240
|
+
child.on('error', () => {
|
|
241
|
+
// The URL is printed by the caller; browser launch is best-effort.
|
|
242
|
+
});
|
|
243
|
+
child.unref();
|
|
244
|
+
}
|
|
127
245
|
//# sourceMappingURL=connect.js.map
|
package/dist/connect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect.test.d.ts","sourceRoot":"","sources":["../src/connect.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import test from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { relayfileIntegrationResolver } from './connect.js';
|
|
4
|
+
import { createBufferedIO } from './io.js';
|
|
5
|
+
function okJson(body, status = 200) {
|
|
6
|
+
return new Response(JSON.stringify(body), {
|
|
7
|
+
status,
|
|
8
|
+
headers: { 'content-type': 'application/json' }
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
test('relayfileIntegrationResolver isConnected reads the cloud integration list', async () => {
|
|
12
|
+
const urls = [];
|
|
13
|
+
const resolver = relayfileIntegrationResolver({
|
|
14
|
+
apiUrl: 'https://cloud.example.test',
|
|
15
|
+
workspaceId: 'ws-1',
|
|
16
|
+
workspaceToken: 'tok',
|
|
17
|
+
fetch: async (url) => {
|
|
18
|
+
urls.push(String(url));
|
|
19
|
+
return okJson([
|
|
20
|
+
{ provider: 'github', status: 'ready', connectionId: 'conn-1' }
|
|
21
|
+
]);
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
assert.equal(await resolver.isConnected({ workspace: 'ws-runtime', provider: 'github' }), true);
|
|
25
|
+
assert.equal(await resolver.isConnected({ workspace: 'ws-runtime', provider: 'notion' }), false);
|
|
26
|
+
assert.deepEqual(urls, [
|
|
27
|
+
'https://cloud.example.test/api/v1/workspaces/ws-runtime/integrations',
|
|
28
|
+
'https://cloud.example.test/api/v1/workspaces/ws-runtime/integrations'
|
|
29
|
+
]);
|
|
30
|
+
});
|
|
31
|
+
test('relayfileIntegrationResolver connect opens a session and polls until connected', async () => {
|
|
32
|
+
let polls = 0;
|
|
33
|
+
const opened = [];
|
|
34
|
+
const urls = [];
|
|
35
|
+
const io = createBufferedIO();
|
|
36
|
+
const resolver = relayfileIntegrationResolver({
|
|
37
|
+
apiUrl: 'https://cloud.example.test',
|
|
38
|
+
workspaceId: 'ws-1',
|
|
39
|
+
workspaceToken: 'tok',
|
|
40
|
+
io,
|
|
41
|
+
pollIntervalMs: 0,
|
|
42
|
+
timeoutMs: 100,
|
|
43
|
+
openUrl: (url) => {
|
|
44
|
+
opened.push(url);
|
|
45
|
+
},
|
|
46
|
+
sleep: async () => undefined,
|
|
47
|
+
fetch: async (input, init) => {
|
|
48
|
+
const url = input.toString();
|
|
49
|
+
urls.push(url);
|
|
50
|
+
if (url.endsWith('/integrations/connect-session')) {
|
|
51
|
+
assert.equal(init?.method, 'POST');
|
|
52
|
+
assert.deepEqual(JSON.parse(String(init?.body)), {
|
|
53
|
+
allowedIntegrations: ['notion']
|
|
54
|
+
});
|
|
55
|
+
return okJson({ connectLink: 'https://connect.example.test/session', connectionId: 'conn-1' });
|
|
56
|
+
}
|
|
57
|
+
if (url.includes('/integrations/notion/status')) {
|
|
58
|
+
polls += 1;
|
|
59
|
+
return okJson(polls < 3
|
|
60
|
+
? { ready: false, state: 'pending' }
|
|
61
|
+
: { ready: true, state: 'ready', currentConnectionId: 'conn-1' });
|
|
62
|
+
}
|
|
63
|
+
throw new Error(`unexpected URL ${url}`);
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
assert.deepEqual(await resolver.connect({ workspace: 'ws-runtime', provider: 'notion' }), {
|
|
67
|
+
connectionId: 'conn-1'
|
|
68
|
+
});
|
|
69
|
+
assert.deepEqual(opened, ['https://connect.example.test/session']);
|
|
70
|
+
assert.ok(urls.every((url) => url.includes('/workspaces/ws-runtime/')));
|
|
71
|
+
assert.equal(polls, 3);
|
|
72
|
+
assert.ok(io.messages.some((message) => message.message.includes('notion connected')));
|
|
73
|
+
});
|
|
74
|
+
test('relayfileIntegrationResolver connect times out clearly', async () => {
|
|
75
|
+
const resolver = relayfileIntegrationResolver({
|
|
76
|
+
apiUrl: 'https://cloud.example.test',
|
|
77
|
+
workspaceId: 'ws-1',
|
|
78
|
+
workspaceToken: 'tok',
|
|
79
|
+
pollIntervalMs: 0,
|
|
80
|
+
timeoutMs: 1,
|
|
81
|
+
openUrl: () => undefined,
|
|
82
|
+
sleep: async () => undefined,
|
|
83
|
+
fetch: async (input) => {
|
|
84
|
+
const url = input.toString();
|
|
85
|
+
if (url.endsWith('/integrations/connect-session')) {
|
|
86
|
+
return okJson({ sessionUrl: 'https://connect.example.test/session' });
|
|
87
|
+
}
|
|
88
|
+
return okJson({ ready: false, state: 'pending' });
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
await assert.rejects(resolver.connect({ workspace: 'ws-1', provider: 'github' }), /Timed out waiting for github OAuth/);
|
|
92
|
+
});
|
|
93
|
+
//# sourceMappingURL=connect.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect.test.js","sourceRoot":"","sources":["../src/connect.test.ts"],"names":[],"mappings":"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"}
|
package/dist/deploy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EAClC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAKlE,OAAO,KAAK,EACV,YAAY,EAEZ,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C,YAAY,CAAC,EAAE,4BAA4B,CAAC;IAC5C,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;CACnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,aAAa,GAAG,UAAU,CAQxD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,GAAE,eAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,CAoHxG"}
|
package/dist/deploy.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { mkdir } from 'node:fs/promises';
|
|
3
|
+
import { defaultApiUrl } from '@agent-relay/cloud';
|
|
3
4
|
import { bundleStager } from './bundle.js';
|
|
4
|
-
import { connectIntegrations, envIntegrationResolver } from './connect.js';
|
|
5
|
+
import { connectIntegrations, envIntegrationResolver, relayfileIntegrationResolver } from './connect.js';
|
|
5
6
|
import { createTerminalIO } from './io.js';
|
|
6
7
|
import { envWorkspaceAuth } from './login.js';
|
|
7
8
|
import { devLauncher } from './modes/dev.js';
|
|
@@ -92,31 +93,26 @@ export async function deploy(opts, resolvers = {}) {
|
|
|
92
93
|
warnings
|
|
93
94
|
};
|
|
94
95
|
}
|
|
95
|
-
const
|
|
96
|
-
const { workspace } = await workspaceAuth.resolveWorkspace({
|
|
96
|
+
const mode = opts.mode ?? pickMode(opts);
|
|
97
|
+
const { workspace, token } = await (resolvers.workspaceAuth ?? envWorkspaceAuth()).resolveWorkspace({
|
|
97
98
|
override: opts.workspace,
|
|
98
99
|
io
|
|
99
100
|
});
|
|
100
101
|
io.info(`workspace: ${workspace}`);
|
|
101
|
-
const
|
|
102
|
+
const connectedIntegrations = await connectAndCollectIntegrations({
|
|
102
103
|
persona: preflight.persona,
|
|
103
104
|
workspace,
|
|
104
105
|
noConnect: opts.noConnect === true,
|
|
105
106
|
io,
|
|
106
|
-
integrations: resolvers.integrations ??
|
|
107
|
+
integrations: resolvers.integrations ?? defaultIntegrationResolver({
|
|
108
|
+
mode,
|
|
109
|
+
workspace,
|
|
110
|
+
token,
|
|
111
|
+
cloudUrl: opts.cloudUrl,
|
|
112
|
+
io
|
|
113
|
+
}),
|
|
107
114
|
...(resolvers.subscription ? { subscription: resolvers.subscription } : {})
|
|
108
115
|
});
|
|
109
|
-
const failed = connectResult.outcomes.filter((o) => o.status === 'failed');
|
|
110
|
-
if (failed.length > 0) {
|
|
111
|
-
throw new Error(`deploy aborted: ${failed.length} integration(s) failed to connect: ${failed.map((f) => f.provider).join(', ')}`);
|
|
112
|
-
}
|
|
113
|
-
const skipped = connectResult.outcomes.filter((o) => o.status === 'skipped');
|
|
114
|
-
if (skipped.length > 0) {
|
|
115
|
-
throw new Error(`deploy aborted: ${skipped.length} integration(s) skipped: ${skipped.map((s) => s.provider).join(', ')}`);
|
|
116
|
-
}
|
|
117
|
-
const connectedIntegrations = connectResult.outcomes
|
|
118
|
-
.filter((o) => o.status === 'already-connected' || o.status === 'connected-now')
|
|
119
|
-
.map((o) => o.provider);
|
|
120
116
|
const bundleDir = path.resolve(path.join(preflight.personaDir, '.workforce', 'build', preflight.persona.id));
|
|
121
117
|
await mkdir(bundleDir, { recursive: true });
|
|
122
118
|
const stager = resolvers.bundle ?? bundleStager;
|
|
@@ -126,7 +122,6 @@ export async function deploy(opts, resolvers = {}) {
|
|
|
126
122
|
outDir: bundleDir
|
|
127
123
|
});
|
|
128
124
|
io.info(`bundle: staged to ${bundle.runnerPath} (${formatBytes(bundle.sizeBytes)})`);
|
|
129
|
-
const mode = opts.mode ?? pickMode(opts);
|
|
130
125
|
io.info(`mode: ${mode}`);
|
|
131
126
|
const launcher = resolveLauncher(mode, resolvers);
|
|
132
127
|
const handle = await launcher.launch({
|
|
@@ -134,9 +129,16 @@ export async function deploy(opts, resolvers = {}) {
|
|
|
134
129
|
bundle,
|
|
135
130
|
workspace,
|
|
136
131
|
io,
|
|
137
|
-
...(
|
|
132
|
+
...(token ? { workspaceToken: token } : {}),
|
|
138
133
|
...(opts.detach ? { detach: true } : {}),
|
|
139
|
-
...(opts.byoSandbox ? { byoSandbox: true } : {})
|
|
134
|
+
...(opts.byoSandbox ? { byoSandbox: true } : {}),
|
|
135
|
+
...(opts.cloudUrl ? { cloudUrl: opts.cloudUrl } : {}),
|
|
136
|
+
...(opts.noPrompt ? { noPrompt: true } : {}),
|
|
137
|
+
...(opts.harnessSource ? { harnessSource: opts.harnessSource } : {}),
|
|
138
|
+
...(opts.byokKey ? { byokKey: opts.byokKey } : {}),
|
|
139
|
+
...(opts.onExists ? { onExists: opts.onExists } : {}),
|
|
140
|
+
...(opts.inputs ? { inputs: opts.inputs } : {}),
|
|
141
|
+
...(opts.onLog ? { onLog: opts.onLog } : {})
|
|
140
142
|
});
|
|
141
143
|
io.info(`launched: ${mode}/${handle.id}`);
|
|
142
144
|
return {
|
|
@@ -163,6 +165,37 @@ function resolveLauncher(mode, resolvers) {
|
|
|
163
165
|
return cloudLauncher;
|
|
164
166
|
}
|
|
165
167
|
}
|
|
168
|
+
async function connectAndCollectIntegrations(input) {
|
|
169
|
+
const connectResult = await connectIntegrations(input);
|
|
170
|
+
const failed = connectResult.outcomes.filter((o) => o.status === 'failed');
|
|
171
|
+
if (failed.length > 0) {
|
|
172
|
+
throw new Error(`deploy aborted: ${failed.length} integration(s) failed to connect: ${failed.map((f) => f.provider).join(', ')}`);
|
|
173
|
+
}
|
|
174
|
+
const skipped = connectResult.outcomes.filter((o) => o.status === 'skipped');
|
|
175
|
+
if (skipped.length > 0) {
|
|
176
|
+
throw new Error(`deploy aborted: ${skipped.length} integration(s) skipped: ${skipped.map((s) => s.provider).join(', ')}`);
|
|
177
|
+
}
|
|
178
|
+
return connectResult.outcomes
|
|
179
|
+
.filter((o) => o.status === 'already-connected' || o.status === 'connected-now')
|
|
180
|
+
.map((o) => o.provider);
|
|
181
|
+
}
|
|
182
|
+
function defaultIntegrationResolver(args) {
|
|
183
|
+
if (args.mode !== 'cloud')
|
|
184
|
+
return envIntegrationResolver();
|
|
185
|
+
return relayfileIntegrationResolver({
|
|
186
|
+
apiUrl: normalizeCloudUrl(args.cloudUrl
|
|
187
|
+
?? process.env.WORKFORCE_DEPLOY_CLOUD_URL
|
|
188
|
+
?? process.env.WORKFORCE_CLOUD_URL
|
|
189
|
+
?? defaultApiUrl()),
|
|
190
|
+
workspaceId: args.workspace,
|
|
191
|
+
workspaceToken: args.token,
|
|
192
|
+
io: args.io
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
function normalizeCloudUrl(url) {
|
|
196
|
+
const trimmed = url.trim();
|
|
197
|
+
return trimmed ? trimmed.replace(/\/+$/, '') : defaultApiUrl().replace(/\/+$/, '');
|
|
198
|
+
}
|
|
166
199
|
function formatBytes(bytes) {
|
|
167
200
|
if (bytes < 1024)
|
|
168
201
|
return `${bytes}B`;
|
package/dist/deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EACL,mBAAmB,EACnB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"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"}
|