aui-agent-builder 0.3.127 → 0.3.128
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/api-client/index.d.ts +28 -0
- package/dist/api-client/index.d.ts.map +1 -1
- package/dist/api-client/index.js +16 -0
- package/dist/api-client/index.js.map +1 -1
- package/dist/commands/apollo.d.ts.map +1 -1
- package/dist/commands/apollo.js +72 -30
- package/dist/commands/apollo.js.map +1 -1
- package/dist/commands/util/apollo-agent.d.ts +47 -9
- package/dist/commands/util/apollo-agent.d.ts.map +1 -1
- package/dist/commands/util/apollo-agent.js +81 -15
- package/dist/commands/util/apollo-agent.js.map +1 -1
- package/dist/services/auth.service.d.ts +31 -0
- package/dist/services/auth.service.d.ts.map +1 -1
- package/dist/services/auth.service.js +83 -0
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/status.service.d.ts +8 -0
- package/dist/services/status.service.d.ts.map +1 -1
- package/dist/services/status.service.js +16 -1
- package/dist/services/status.service.js.map +1 -1
- package/dist/ui/views/StatusView.js +1 -1
- package/dist/ui/views/StatusView.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/apollo.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import * as path from "path";
|
|
3
3
|
import { render, Box, Text } from "ink";
|
|
4
|
-
import { getConfig, loadSession, loadProjectConfig, findProjectRoot, } from "../config/index.js";
|
|
4
|
+
import { getConfig, loadSession, loadProjectConfig, saveProjectConfig, findProjectRoot, loadAgentSettingsApiKey, } from "../config/index.js";
|
|
5
5
|
import { ApolloClient, } from "../api-client/apollo-client.js";
|
|
6
|
+
import { AUIClient } from "../api-client/index.js";
|
|
6
7
|
import { resolveApolloAgent } from "./util/apollo-agent.js";
|
|
8
|
+
import { getOrgScopedToken } from "../services/auth.service.js";
|
|
7
9
|
import { validate } from "./validate.js";
|
|
8
10
|
import { findAuiFiles, parseAuiFile, assembleBundleFromFiles } from "../utils/index.js";
|
|
9
11
|
import { getTracer, SpanStatusCode, setUserContext, setProjectContext, setAgentContext, } from "../telemetry.js";
|
|
@@ -28,8 +30,15 @@ function startSpinner(label) {
|
|
|
28
30
|
* Resolve the CLI session + project config into the `ApolloClient` used
|
|
29
31
|
* for the runtime call. Throws clear auth / config errors when the
|
|
30
32
|
* session is incomplete.
|
|
33
|
+
*
|
|
34
|
+
* Cross-org handling: the login token is scoped to the user's default
|
|
35
|
+
* org, but a project's `.auirc` can target an agent in a DIFFERENT org.
|
|
36
|
+
* The gateway in front of Apollo trusts the token's org claim (not the
|
|
37
|
+
* org-id header), so for such projects we mint a token scoped to the
|
|
38
|
+
* project org via `getOrgScopedToken` before constructing the client.
|
|
39
|
+
* It's a no-op (no network call) when the token already matches.
|
|
31
40
|
*/
|
|
32
|
-
function buildContext(optionPath) {
|
|
41
|
+
async function buildContext(optionPath) {
|
|
33
42
|
const projectRoot = optionPath
|
|
34
43
|
? path.resolve(optionPath)
|
|
35
44
|
: findProjectRoot() || undefined;
|
|
@@ -47,19 +56,64 @@ function buildContext(optionPath) {
|
|
|
47
56
|
}
|
|
48
57
|
const accountId = projectConfig?.account_id || config.accountId || "";
|
|
49
58
|
const userId = session?.user_id;
|
|
59
|
+
const authToken = await getOrgScopedToken(config.authToken, organizationId, {
|
|
60
|
+
apiUrl: config.apiUrl,
|
|
61
|
+
environment: config.environment,
|
|
62
|
+
});
|
|
63
|
+
const orgTokenSwitched = authToken !== config.authToken;
|
|
50
64
|
const apollo = new ApolloClient({
|
|
51
|
-
authToken
|
|
65
|
+
authToken,
|
|
52
66
|
organizationId,
|
|
53
67
|
accountId,
|
|
54
68
|
userId,
|
|
55
69
|
environment: config.environment,
|
|
56
70
|
});
|
|
57
|
-
|
|
71
|
+
// Agent-management client used to resolve a legacy network_id in
|
|
72
|
+
// `.auirc` into the agent_management_id Apollo expects. Shares the
|
|
73
|
+
// org-scoped token + org/account so the lookup runs in the right org.
|
|
74
|
+
const agentClient = new AUIClient({
|
|
75
|
+
baseUrl: config.apiUrl,
|
|
76
|
+
authToken,
|
|
77
|
+
organizationId,
|
|
78
|
+
accountId,
|
|
79
|
+
environment: config.environment,
|
|
80
|
+
});
|
|
81
|
+
const agentSettingsKey = loadAgentSettingsApiKey();
|
|
82
|
+
if (agentSettingsKey)
|
|
83
|
+
agentClient.setAgentSettingsApiKey(agentSettingsKey);
|
|
84
|
+
return { apollo, agentClient, projectRoot, projectConfig, orgTokenSwitched };
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Resolve the target agent-management id for an Apollo call, persisting it
|
|
88
|
+
* back to `.auirc` when it had to be resolved from a network_id so future
|
|
89
|
+
* runs skip the lookup (the same first-run migration `aui push` does).
|
|
90
|
+
*/
|
|
91
|
+
async function resolveAgentManagementId(ctx, agentIdOption) {
|
|
92
|
+
const resolved = await resolveApolloAgent({
|
|
93
|
+
agentIdOption,
|
|
94
|
+
projectConfig: ctx.projectConfig,
|
|
95
|
+
client: ctx.agentClient,
|
|
96
|
+
});
|
|
97
|
+
if (resolved.resolvedFromNetworkId &&
|
|
98
|
+
ctx.projectRoot &&
|
|
99
|
+
ctx.projectConfig &&
|
|
100
|
+
ctx.projectConfig.agent_management_id !== resolved.agentManagementId) {
|
|
101
|
+
try {
|
|
102
|
+
saveProjectConfig({ ...ctx.projectConfig, agent_management_id: resolved.agentManagementId }, ctx.projectRoot);
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
if (process.env.AUI_DEBUG) {
|
|
106
|
+
console.error(`[debug] failed to persist agent_management_id to .auirc: ${err instanceof Error ? err.message : err}`);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
return resolved.agentManagementId;
|
|
58
111
|
}
|
|
59
112
|
/** Attach the standard user / project / agent telemetry onto a span. */
|
|
60
113
|
async function attachContextTelemetry(span, ctx, agentManagementId) {
|
|
61
114
|
await setUserContext(span);
|
|
62
115
|
await setProjectContext(span, ctx.projectRoot);
|
|
116
|
+
span.setAttribute("apollo.org_token_switched", ctx.orgTokenSwitched);
|
|
63
117
|
await setAgentContext(span, {
|
|
64
118
|
agentManagementId: agentManagementId ?? ctx.projectConfig?.agent_management_id ?? undefined,
|
|
65
119
|
agentId: ctx.projectConfig?.agent_id ?? undefined,
|
|
@@ -109,7 +163,7 @@ export async function apolloCreateTask(options = {}) {
|
|
|
109
163
|
const tracer = getTracer();
|
|
110
164
|
await tracer.startActiveSpan("aui.apollo.create_task", async (span) => {
|
|
111
165
|
try {
|
|
112
|
-
const ctx = buildContext();
|
|
166
|
+
const ctx = await buildContext();
|
|
113
167
|
const session = loadSession();
|
|
114
168
|
const userId = options.userId?.trim() || session?.user_id;
|
|
115
169
|
if (!userId) {
|
|
@@ -120,16 +174,13 @@ export async function apolloCreateTask(options = {}) {
|
|
|
120
174
|
const taskOriginType = options.taskOriginType?.trim() || "web-widget";
|
|
121
175
|
await attachContextTelemetry(span, ctx, options.agentId);
|
|
122
176
|
const spinner = startSpinner("Resolving agent...");
|
|
123
|
-
const
|
|
124
|
-
|
|
125
|
-
projectConfig: ctx.projectConfig,
|
|
126
|
-
});
|
|
127
|
-
span.setAttribute("apollo.agent_id", resolved.agentManagementId);
|
|
177
|
+
const agentManagementId = await resolveAgentManagementId(ctx, options.agentId);
|
|
178
|
+
span.setAttribute("apollo.agent_id", agentManagementId);
|
|
128
179
|
span.setAttribute("apollo.task_origin_type", taskOriginType);
|
|
129
180
|
spinner.stop();
|
|
130
181
|
const sp2 = startSpinner("Starting thread...");
|
|
131
182
|
const result = await ctx.apollo.createTask({
|
|
132
|
-
agent_id:
|
|
183
|
+
agent_id: agentManagementId,
|
|
133
184
|
user_id: userId,
|
|
134
185
|
task_origin_type: taskOriginType,
|
|
135
186
|
});
|
|
@@ -173,14 +224,11 @@ export async function apolloSendMessage(options = {}) {
|
|
|
173
224
|
suggestion: 'Pass --text "your message".',
|
|
174
225
|
});
|
|
175
226
|
}
|
|
176
|
-
const ctx = buildContext(options.path);
|
|
227
|
+
const ctx = await buildContext(options.path);
|
|
177
228
|
await attachContextTelemetry(span, ctx, options.agentId);
|
|
178
229
|
const spinner = startSpinner("Resolving agent...");
|
|
179
|
-
const
|
|
180
|
-
|
|
181
|
-
projectConfig: ctx.projectConfig,
|
|
182
|
-
});
|
|
183
|
-
span.setAttribute("apollo.agent_id", resolved.agentManagementId);
|
|
230
|
+
const agentManagementId = await resolveAgentManagementId(ctx, options.agentId);
|
|
231
|
+
span.setAttribute("apollo.agent_id", agentManagementId);
|
|
184
232
|
span.setAttribute("apollo.task_id", taskId);
|
|
185
233
|
span.setAttribute("apollo.include_trace", !!options.includeTrace);
|
|
186
234
|
spinner.stop();
|
|
@@ -248,14 +296,11 @@ export async function apolloRerun(options = {}) {
|
|
|
248
296
|
suggestion: 'Pass --text "..." (the edited or original message to replay; min length 1).',
|
|
249
297
|
});
|
|
250
298
|
}
|
|
251
|
-
const ctx = buildContext(options.path);
|
|
299
|
+
const ctx = await buildContext(options.path);
|
|
252
300
|
await attachContextTelemetry(span, ctx, options.agentId);
|
|
253
301
|
const spinner = startSpinner("Resolving agent...");
|
|
254
|
-
const
|
|
255
|
-
|
|
256
|
-
projectConfig: ctx.projectConfig,
|
|
257
|
-
});
|
|
258
|
-
span.setAttribute("apollo.agent_id", resolved.agentManagementId);
|
|
302
|
+
const agentManagementId = await resolveAgentManagementId(ctx, options.agentId);
|
|
303
|
+
span.setAttribute("apollo.agent_id", agentManagementId);
|
|
259
304
|
span.setAttribute("apollo.task_id", taskId);
|
|
260
305
|
span.setAttribute("apollo.interaction_id", interactionId);
|
|
261
306
|
spinner.stop();
|
|
@@ -277,7 +322,7 @@ export async function apolloRerun(options = {}) {
|
|
|
277
322
|
interaction_id: interactionId,
|
|
278
323
|
text,
|
|
279
324
|
agent: {
|
|
280
|
-
agent_id:
|
|
325
|
+
agent_id: agentManagementId,
|
|
281
326
|
version_id: versionId ?? null,
|
|
282
327
|
},
|
|
283
328
|
agent_settings_bundle: bundle ?? null,
|
|
@@ -323,14 +368,11 @@ export async function apolloTrace(options = {}) {
|
|
|
323
368
|
});
|
|
324
369
|
}
|
|
325
370
|
const interactionId = options.interactionId?.trim();
|
|
326
|
-
const ctx = buildContext();
|
|
371
|
+
const ctx = await buildContext();
|
|
327
372
|
await attachContextTelemetry(span, ctx, options.agentId);
|
|
328
373
|
const spinner = startSpinner("Resolving agent...");
|
|
329
|
-
const
|
|
330
|
-
|
|
331
|
-
projectConfig: ctx.projectConfig,
|
|
332
|
-
});
|
|
333
|
-
span.setAttribute("apollo.agent_id", resolved.agentManagementId);
|
|
374
|
+
const agentManagementId = await resolveAgentManagementId(ctx, options.agentId);
|
|
375
|
+
span.setAttribute("apollo.agent_id", agentManagementId);
|
|
334
376
|
span.setAttribute("apollo.task_id", taskId);
|
|
335
377
|
spinner.stop();
|
|
336
378
|
// Interaction-level trace (single object) when --interaction-id is
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["../../src/commands/apollo.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["../../src/commands/apollo.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,31 +2,69 @@
|
|
|
2
2
|
* Agent resolution for the Apollo runtime messaging commands
|
|
3
3
|
* (`aui apollo create-task | send-message | rerun | trace`).
|
|
4
4
|
*
|
|
5
|
-
* Resolves the
|
|
6
|
-
* request body and `rerun` attaches as agent metadata.
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
5
|
+
* Resolves the **agent-management id** that `create-task` puts in the
|
|
6
|
+
* request body and `rerun` attaches as agent metadata. Apollo takes that
|
|
7
|
+
* `agent_id`, resolves the underlying `network_id` + active version from
|
|
8
|
+
* agent-settings, and the agent's org must match the caller's org.
|
|
9
|
+
*
|
|
10
|
+
* ─── Why this does a network lookup ─────────────────────────────────────
|
|
11
|
+
*
|
|
12
|
+
* `.auirc.agent_id` is — by historical mis-naming — usually the
|
|
13
|
+
* **network_id**, NOT the agent-management id (see `ProjectConfig.agent_id`
|
|
14
|
+
* docs: "historically the network ID"). Sending a network_id to Apollo
|
|
15
|
+
* yields `404 {"detail":"Agent not found"}` because Apollo expects the
|
|
16
|
+
* agent-management id. Every other command (`aui push`, `aui import`)
|
|
17
|
+
* already resolves the agent-management id from the network_id via a
|
|
18
|
+
* dual-shape lookup; this mirrors that exactly so Apollo gets the id it
|
|
19
|
+
* actually wants.
|
|
20
|
+
*
|
|
21
|
+
* Resolution order (first hit wins):
|
|
22
|
+
* 1. An explicit `--agent-id` flag (may be either shape → resolved).
|
|
23
|
+
* 2. `.auirc.agent_management_id` if already present (trusted as-is —
|
|
24
|
+
* it was resolved on a previous run / import; no lookup).
|
|
25
|
+
* 3. `.auirc.agent_id` (the legacy network_id) → resolved.
|
|
26
|
+
*
|
|
27
|
+
* Dual-shape resolve for cases 1 & 3 (same as `resolveExplicitAgentForPush`
|
|
28
|
+
* in push.tsx):
|
|
29
|
+
* a) `getAgent(id)` — treat the id as an agent_management_id.
|
|
30
|
+
* b) on 404, `listAgents(network_id=id, network_category_id=id)` — the
|
|
31
|
+
* server OR's the filters, covering both a legacy network_id (regular
|
|
32
|
+
* agent) and a network_category_id (template). `match.id` is the
|
|
33
|
+
* agent_management_id.
|
|
34
|
+
* Non-404 errors (auth / 5xx) bubble so we don't mask real failures.
|
|
10
35
|
*
|
|
11
36
|
* NOTE: these commands work for **both** bundle-mode and records-mode
|
|
12
37
|
* ("regular") agents — there is intentionally no `bundle_mode` gate here.
|
|
13
|
-
* (An earlier version restricted them to bundle-mode agents; that guard was
|
|
14
|
-
* removed so the Apollo runtime endpoints are available for every agent.)
|
|
15
38
|
*/
|
|
16
39
|
import type { ProjectConfig } from "../../config/index.js";
|
|
40
|
+
import { AUIClient } from "../../api-client/index.js";
|
|
17
41
|
export interface ResolveApolloAgentInput {
|
|
18
42
|
/** Value of the command's `--agent-id` flag, if provided. */
|
|
19
43
|
agentIdOption?: string;
|
|
20
44
|
/** Loaded `.auirc` for the project, if any. */
|
|
21
45
|
projectConfig: ProjectConfig | null;
|
|
46
|
+
/**
|
|
47
|
+
* Org-scoped agent-management client used to resolve a legacy
|
|
48
|
+
* network_id (`.auirc.agent_id`) into the agent_management_id Apollo
|
|
49
|
+
* expects. Must already carry the correct org/account + a token scoped
|
|
50
|
+
* to that org (see `buildContext` in apollo.tsx).
|
|
51
|
+
*/
|
|
52
|
+
client: AUIClient;
|
|
22
53
|
}
|
|
23
54
|
export interface ResolvedApolloAgent {
|
|
24
55
|
/** The agent-management id used for the Apollo body / metadata. */
|
|
25
56
|
agentManagementId: string;
|
|
57
|
+
/**
|
|
58
|
+
* True when the id had to be resolved from a network_id (i.e. it was
|
|
59
|
+
* NOT already known in `.auirc.agent_management_id`). Lets the caller
|
|
60
|
+
* persist it back to `.auirc` so subsequent runs skip the lookup.
|
|
61
|
+
*/
|
|
62
|
+
resolvedFromNetworkId: boolean;
|
|
26
63
|
}
|
|
27
64
|
/**
|
|
28
65
|
* Resolve the target agent-management id. Throws `ConfigError` when no
|
|
29
|
-
* agent can be resolved from the flag or the project config
|
|
66
|
+
* agent can be resolved from the flag or the project config, and lets
|
|
67
|
+
* non-404 API errors (auth / 5xx) bubble.
|
|
30
68
|
*/
|
|
31
|
-
export declare function resolveApolloAgent(input: ResolveApolloAgentInput): ResolvedApolloAgent
|
|
69
|
+
export declare function resolveApolloAgent(input: ResolveApolloAgentInput): Promise<ResolvedApolloAgent>;
|
|
32
70
|
//# sourceMappingURL=apollo-agent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apollo-agent.d.ts","sourceRoot":"","sources":["../../../src/commands/util/apollo-agent.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"apollo-agent.d.ts","sourceRoot":"","sources":["../../../src/commands/util/apollo-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAe,MAAM,2BAA2B,CAAC;AAEnE,MAAM,WAAW,uBAAuB;IACtC,6DAA6D;IAC7D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,+CAA+C;IAC/C,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC;;;;;OAKG;IACH,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,mEAAmE;IACnE,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAUD;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CA8D9B"}
|
|
@@ -2,31 +2,97 @@
|
|
|
2
2
|
* Agent resolution for the Apollo runtime messaging commands
|
|
3
3
|
* (`aui apollo create-task | send-message | rerun | trace`).
|
|
4
4
|
*
|
|
5
|
-
* Resolves the
|
|
6
|
-
* request body and `rerun` attaches as agent metadata.
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
5
|
+
* Resolves the **agent-management id** that `create-task` puts in the
|
|
6
|
+
* request body and `rerun` attaches as agent metadata. Apollo takes that
|
|
7
|
+
* `agent_id`, resolves the underlying `network_id` + active version from
|
|
8
|
+
* agent-settings, and the agent's org must match the caller's org.
|
|
9
|
+
*
|
|
10
|
+
* ─── Why this does a network lookup ─────────────────────────────────────
|
|
11
|
+
*
|
|
12
|
+
* `.auirc.agent_id` is — by historical mis-naming — usually the
|
|
13
|
+
* **network_id**, NOT the agent-management id (see `ProjectConfig.agent_id`
|
|
14
|
+
* docs: "historically the network ID"). Sending a network_id to Apollo
|
|
15
|
+
* yields `404 {"detail":"Agent not found"}` because Apollo expects the
|
|
16
|
+
* agent-management id. Every other command (`aui push`, `aui import`)
|
|
17
|
+
* already resolves the agent-management id from the network_id via a
|
|
18
|
+
* dual-shape lookup; this mirrors that exactly so Apollo gets the id it
|
|
19
|
+
* actually wants.
|
|
20
|
+
*
|
|
21
|
+
* Resolution order (first hit wins):
|
|
22
|
+
* 1. An explicit `--agent-id` flag (may be either shape → resolved).
|
|
23
|
+
* 2. `.auirc.agent_management_id` if already present (trusted as-is —
|
|
24
|
+
* it was resolved on a previous run / import; no lookup).
|
|
25
|
+
* 3. `.auirc.agent_id` (the legacy network_id) → resolved.
|
|
26
|
+
*
|
|
27
|
+
* Dual-shape resolve for cases 1 & 3 (same as `resolveExplicitAgentForPush`
|
|
28
|
+
* in push.tsx):
|
|
29
|
+
* a) `getAgent(id)` — treat the id as an agent_management_id.
|
|
30
|
+
* b) on 404, `listAgents(network_id=id, network_category_id=id)` — the
|
|
31
|
+
* server OR's the filters, covering both a legacy network_id (regular
|
|
32
|
+
* agent) and a network_category_id (template). `match.id` is the
|
|
33
|
+
* agent_management_id.
|
|
34
|
+
* Non-404 errors (auth / 5xx) bubble so we don't mask real failures.
|
|
10
35
|
*
|
|
11
36
|
* NOTE: these commands work for **both** bundle-mode and records-mode
|
|
12
37
|
* ("regular") agents — there is intentionally no `bundle_mode` gate here.
|
|
13
|
-
* (An earlier version restricted them to bundle-mode agents; that guard was
|
|
14
|
-
* removed so the Apollo runtime endpoints are available for every agent.)
|
|
15
38
|
*/
|
|
16
39
|
import { ConfigError } from "../../errors/index.js";
|
|
40
|
+
import { AUIAPIError } from "../../api-client/index.js";
|
|
41
|
+
function statusOf(err) {
|
|
42
|
+
if (err instanceof AUIAPIError)
|
|
43
|
+
return err.status;
|
|
44
|
+
return (err.statusCode ??
|
|
45
|
+
err.status);
|
|
46
|
+
}
|
|
17
47
|
/**
|
|
18
48
|
* Resolve the target agent-management id. Throws `ConfigError` when no
|
|
19
|
-
* agent can be resolved from the flag or the project config
|
|
49
|
+
* agent can be resolved from the flag or the project config, and lets
|
|
50
|
+
* non-404 API errors (auth / 5xx) bubble.
|
|
20
51
|
*/
|
|
21
|
-
export function resolveApolloAgent(input) {
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
52
|
+
export async function resolveApolloAgent(input) {
|
|
53
|
+
const knownMgmtId = input.projectConfig?.agent_management_id?.trim();
|
|
54
|
+
const explicit = input.agentIdOption?.trim();
|
|
55
|
+
// (2) Already-resolved agent_management_id from a prior run / import —
|
|
56
|
+
// trust it, no lookup. An explicit `--agent-id` overrides it (it may be
|
|
57
|
+
// either shape, so it still goes through resolution below).
|
|
58
|
+
if (!explicit && knownMgmtId) {
|
|
59
|
+
return { agentManagementId: knownMgmtId, resolvedFromNetworkId: false };
|
|
60
|
+
}
|
|
61
|
+
// (1)/(3) The candidate could be an agent_management_id OR a legacy
|
|
62
|
+
// network_id / template category id.
|
|
63
|
+
const candidate = explicit || input.projectConfig?.agent_id?.trim();
|
|
64
|
+
if (!candidate) {
|
|
26
65
|
throw new ConfigError("No agent could be resolved for this command.", {
|
|
27
|
-
suggestion: "Pass --agent-id <
|
|
66
|
+
suggestion: "Pass --agent-id <id>, or run from an imported agent project (so .auirc has agent_id / agent_management_id). Use `aui import-agent` to link one.",
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
// a) Treat the candidate as an agent_management_id.
|
|
70
|
+
try {
|
|
71
|
+
const info = await input.client.agentManagement.getAgent(candidate);
|
|
72
|
+
return { agentManagementId: info.id, resolvedFromNetworkId: false };
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
const status = statusOf(err);
|
|
76
|
+
// Only a 404 means "not an agent_management_id, try as network_id".
|
|
77
|
+
// Auth / 5xx are real failures — surface them.
|
|
78
|
+
if (status !== 404)
|
|
79
|
+
throw err;
|
|
80
|
+
if (process.env.AUI_DEBUG) {
|
|
81
|
+
console.error(`[debug] resolveApolloAgent: getAgent(${candidate}) → 404; trying as network_id / network_category_id`);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
// b) Fall back: treat the candidate as a legacy network_id (regular
|
|
85
|
+
// agent) or a network_category_id (template). One call covers both.
|
|
86
|
+
const resp = await input.client.agentManagement.listAgents(input.client.getOrganizationId(), 1, 50, { network_id: candidate, network_category_id: candidate });
|
|
87
|
+
const match = resp.items.find((a) => a.scope.network_id === candidate ||
|
|
88
|
+
a.scope.network_category_id === candidate ||
|
|
89
|
+
a.id === candidate);
|
|
90
|
+
if (!match) {
|
|
91
|
+
throw new ConfigError(`Could not resolve agent "${candidate}" to an agent_management_id.`, {
|
|
92
|
+
suggestion: "Verify the agent exists in this organization (`aui agents`), or pass --agent-id <agent-management-id>. " +
|
|
93
|
+
"If you imported from another org, make sure .auirc points at the right org/account.",
|
|
28
94
|
});
|
|
29
95
|
}
|
|
30
|
-
return { agentManagementId };
|
|
96
|
+
return { agentManagementId: match.id, resolvedFromNetworkId: true };
|
|
31
97
|
}
|
|
32
98
|
//# sourceMappingURL=apollo-agent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apollo-agent.js","sourceRoot":"","sources":["../../../src/commands/util/apollo-agent.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"apollo-agent.js","sourceRoot":"","sources":["../../../src/commands/util/apollo-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAa,WAAW,EAAE,MAAM,2BAA2B,CAAC;AA2BnE,SAAS,QAAQ,CAAC,GAAY;IAC5B,IAAI,GAAG,YAAY,WAAW;QAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAClD,OAAO,CACJ,GAA+B,CAAC,UAAU;QAC1C,GAA2B,CAAC,MAAM,CACpC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAA8B;IAE9B,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC;IACrE,MAAM,QAAQ,GAAG,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;IAE7C,uEAAuE;IACvE,wEAAwE;IACxE,4DAA4D;IAC5D,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;QAC7B,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC1E,CAAC;IAED,oEAAoE;IACpE,qCAAqC;IACrC,MAAM,SAAS,GAAG,QAAQ,IAAI,KAAK,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACpE,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,WAAW,CAAC,8CAA8C,EAAE;YACpE,UAAU,EACR,iJAAiJ;SACpJ,CAAC,CAAC;IACL,CAAC;IAED,oDAAoD;IACpD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpE,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,EAAE,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACtE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC7B,oEAAoE;QACpE,+CAA+C;QAC/C,IAAI,MAAM,KAAK,GAAG;YAAE,MAAM,GAAG,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CACX,wCAAwC,SAAS,qDAAqD,CACvG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,oEAAoE;IACpE,uEAAuE;IACvE,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CACxD,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,EAChC,CAAC,EACD,EAAE,EACF,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,SAAS,EAAE,CAC1D,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAC3B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS;QAChC,CAAC,CAAC,KAAK,CAAC,mBAAmB,KAAK,SAAS;QACzC,CAAC,CAAC,EAAE,KAAK,SAAS,CACrB,CAAC;IACF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,WAAW,CACnB,4BAA4B,SAAS,8BAA8B,EACnE;YACE,UAAU,EACR,yGAAyG;gBACzG,qFAAqF;SACxF,CACF,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC;AACtE,CAAC"}
|
|
@@ -40,6 +40,37 @@ export declare function tryRefreshSession(): Promise<UserSession | null>;
|
|
|
40
40
|
*/
|
|
41
41
|
export declare function getValidSession(): Promise<UserSession | null>;
|
|
42
42
|
export declare function saveApiKey(key: string): void;
|
|
43
|
+
/**
|
|
44
|
+
* Return an access token whose `organizationId` claim matches
|
|
45
|
+
* `targetOrgId`, minting one via `switch-organization` only when the
|
|
46
|
+
* current token is scoped to a different org.
|
|
47
|
+
*
|
|
48
|
+
* Why this exists: the CLI carries ONE login token (scoped to the user's
|
|
49
|
+
* default org) but lets each project's `.auirc` point at a different
|
|
50
|
+
* org/account. The org-id *header* is advisory — the gateway trusts the
|
|
51
|
+
* token's org claim — so org-scoped runtime endpoints (Apollo
|
|
52
|
+
* create-task / send-message / rerun / trace) 404 with "Agent not found"
|
|
53
|
+
* when a project targets an agent in a non-default org. This re-mints a
|
|
54
|
+
* token for that org on demand.
|
|
55
|
+
*
|
|
56
|
+
* Safety / adaptivity:
|
|
57
|
+
* - **No-op when already correct.** If the token's org claim already
|
|
58
|
+
* equals `targetOrgId` (the common, currently-working case) the
|
|
59
|
+
* original token is returned untouched — zero network calls, zero
|
|
60
|
+
* behavior change.
|
|
61
|
+
* - **Never persisted.** The switched token is returned for one-off
|
|
62
|
+
* use; the global `~/.aui/session.json` (the user's default-org
|
|
63
|
+
* context) is left intact, so targeting an org-B agent in one folder
|
|
64
|
+
* can't break an org-A agent in another.
|
|
65
|
+
* - **Best-effort.** Any failure (endpoint missing, network, an
|
|
66
|
+
* unexpected response without a token) falls back to the original
|
|
67
|
+
* token so this can never make a call fail harder than it did before
|
|
68
|
+
* — at worst the downstream call surfaces the same 404 it would have.
|
|
69
|
+
*/
|
|
70
|
+
export declare function getOrgScopedToken(authToken: string, targetOrgId: string, context: {
|
|
71
|
+
apiUrl: string;
|
|
72
|
+
environment: AUIEnvironment;
|
|
73
|
+
}): Promise<string>;
|
|
43
74
|
export declare function performLogout(session: UserSession): Promise<void>;
|
|
44
75
|
export declare function resolveEnvironment(env?: string): AUIEnvironment;
|
|
45
76
|
export declare function getApiUrl(environment: AUIEnvironment): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -145,6 +145,89 @@ export async function getValidSession() {
|
|
|
145
145
|
export function saveApiKey(key) {
|
|
146
146
|
saveAgentSettingsApiKey(key);
|
|
147
147
|
}
|
|
148
|
+
/**
|
|
149
|
+
* Pull the new access token out of a `switch-organization` response,
|
|
150
|
+
* tolerating the field nesting the identity service might use
|
|
151
|
+
* (`data.token`, `data.accessToken`, top-level `token`, …). Returns
|
|
152
|
+
* `null` when nothing token-shaped is present so the caller can fall
|
|
153
|
+
* back to the original token rather than send `undefined` as a bearer.
|
|
154
|
+
*/
|
|
155
|
+
function extractSwitchedToken(resp) {
|
|
156
|
+
if (!resp || typeof resp !== "object")
|
|
157
|
+
return null;
|
|
158
|
+
const r = resp;
|
|
159
|
+
const data = r.data ?? undefined;
|
|
160
|
+
const candidate = (typeof data?.token === "string" && data.token) ||
|
|
161
|
+
(typeof data?.accessToken === "string" && data.accessToken) ||
|
|
162
|
+
(typeof r.token === "string" && r.token) ||
|
|
163
|
+
(typeof r.accessToken === "string" && r.accessToken) ||
|
|
164
|
+
"";
|
|
165
|
+
return candidate ? candidate : null;
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* Return an access token whose `organizationId` claim matches
|
|
169
|
+
* `targetOrgId`, minting one via `switch-organization` only when the
|
|
170
|
+
* current token is scoped to a different org.
|
|
171
|
+
*
|
|
172
|
+
* Why this exists: the CLI carries ONE login token (scoped to the user's
|
|
173
|
+
* default org) but lets each project's `.auirc` point at a different
|
|
174
|
+
* org/account. The org-id *header* is advisory — the gateway trusts the
|
|
175
|
+
* token's org claim — so org-scoped runtime endpoints (Apollo
|
|
176
|
+
* create-task / send-message / rerun / trace) 404 with "Agent not found"
|
|
177
|
+
* when a project targets an agent in a non-default org. This re-mints a
|
|
178
|
+
* token for that org on demand.
|
|
179
|
+
*
|
|
180
|
+
* Safety / adaptivity:
|
|
181
|
+
* - **No-op when already correct.** If the token's org claim already
|
|
182
|
+
* equals `targetOrgId` (the common, currently-working case) the
|
|
183
|
+
* original token is returned untouched — zero network calls, zero
|
|
184
|
+
* behavior change.
|
|
185
|
+
* - **Never persisted.** The switched token is returned for one-off
|
|
186
|
+
* use; the global `~/.aui/session.json` (the user's default-org
|
|
187
|
+
* context) is left intact, so targeting an org-B agent in one folder
|
|
188
|
+
* can't break an org-A agent in another.
|
|
189
|
+
* - **Best-effort.** Any failure (endpoint missing, network, an
|
|
190
|
+
* unexpected response without a token) falls back to the original
|
|
191
|
+
* token so this can never make a call fail harder than it did before
|
|
192
|
+
* — at worst the downstream call surfaces the same 404 it would have.
|
|
193
|
+
*/
|
|
194
|
+
export async function getOrgScopedToken(authToken, targetOrgId, context) {
|
|
195
|
+
if (!authToken || !targetOrgId)
|
|
196
|
+
return authToken;
|
|
197
|
+
const claims = decodeJwt(authToken);
|
|
198
|
+
const tokenOrg = claims?.organizationId || "";
|
|
199
|
+
// Already scoped to the right org — nothing to do.
|
|
200
|
+
if (tokenOrg && tokenOrg === targetOrgId)
|
|
201
|
+
return authToken;
|
|
202
|
+
try {
|
|
203
|
+
// Authenticate the switch with the CURRENT org context (the token's
|
|
204
|
+
// own org), matching the playground's call. Account-id is left to the
|
|
205
|
+
// session default — the switch is authenticated by the token, not the
|
|
206
|
+
// account header, and sending a target-org account here could
|
|
207
|
+
// mismatch.
|
|
208
|
+
const session = loadSessionRaw();
|
|
209
|
+
const client = new AUIClient({
|
|
210
|
+
baseUrl: context.apiUrl,
|
|
211
|
+
authToken,
|
|
212
|
+
organizationId: tokenOrg || session?.organization_id,
|
|
213
|
+
accountId: session?.account_id,
|
|
214
|
+
environment: context.environment,
|
|
215
|
+
});
|
|
216
|
+
const resp = await client.identity.switchOrganization(targetOrgId);
|
|
217
|
+
const newToken = extractSwitchedToken(resp);
|
|
218
|
+
if (newToken)
|
|
219
|
+
return newToken;
|
|
220
|
+
if (process.env.AUI_DEBUG) {
|
|
221
|
+
console.error(`[debug] switch-organization to ${targetOrgId} returned no token; using original token`);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
catch (err) {
|
|
225
|
+
if (process.env.AUI_DEBUG) {
|
|
226
|
+
console.error(`[debug] switch-organization to ${targetOrgId} failed: ${err instanceof Error ? err.message : err}; using original token`);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
return authToken;
|
|
230
|
+
}
|
|
148
231
|
export async function performLogout(session) {
|
|
149
232
|
try {
|
|
150
233
|
const client = new AUIClient({
|