@agentuity/cli 1.0.42 → 1.0.43
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/cmd/cloud/oidc/activity.d.ts.map +1 -1
- package/dist/cmd/cloud/oidc/activity.js +6 -3
- package/dist/cmd/cloud/oidc/activity.js.map +1 -1
- package/dist/cmd/cloud/oidc/create.d.ts.map +1 -1
- package/dist/cmd/cloud/oidc/create.js +8 -5
- package/dist/cmd/cloud/oidc/create.js.map +1 -1
- package/dist/cmd/cloud/oidc/delete.d.ts.map +1 -1
- package/dist/cmd/cloud/oidc/delete.js +6 -3
- package/dist/cmd/cloud/oidc/delete.js.map +1 -1
- package/dist/cmd/cloud/oidc/get.d.ts.map +1 -1
- package/dist/cmd/cloud/oidc/get.js +6 -3
- package/dist/cmd/cloud/oidc/get.js.map +1 -1
- package/dist/cmd/cloud/oidc/list.d.ts.map +1 -1
- package/dist/cmd/cloud/oidc/list.js +6 -3
- package/dist/cmd/cloud/oidc/list.js.map +1 -1
- package/dist/cmd/cloud/oidc/rotate-secret.d.ts.map +1 -1
- package/dist/cmd/cloud/oidc/rotate-secret.js +6 -3
- package/dist/cmd/cloud/oidc/rotate-secret.js.map +1 -1
- package/dist/cmd/cloud/oidc/users.d.ts.map +1 -1
- package/dist/cmd/cloud/oidc/users.js +6 -3
- package/dist/cmd/cloud/oidc/users.js.map +1 -1
- package/dist/cmd/cloud/oidc/util.d.ts +10 -0
- package/dist/cmd/cloud/oidc/util.d.ts.map +1 -0
- package/dist/cmd/cloud/oidc/util.js +13 -0
- package/dist/cmd/cloud/oidc/util.js.map +1 -0
- package/dist/cmd/coder/hub-url.d.ts +1 -0
- package/dist/cmd/coder/hub-url.d.ts.map +1 -1
- package/dist/cmd/coder/hub-url.js +4 -1
- package/dist/cmd/coder/hub-url.js.map +1 -1
- package/dist/cmd/coder/start.d.ts.map +1 -1
- package/dist/cmd/coder/start.js +14 -8
- package/dist/cmd/coder/start.js.map +1 -1
- package/dist/cmd/coder/tui-init.d.ts +9 -0
- package/dist/cmd/coder/tui-init.d.ts.map +1 -0
- package/dist/cmd/coder/tui-init.js +56 -0
- package/dist/cmd/coder/tui-init.js.map +1 -0
- package/package.json +6 -6
- package/src/cmd/cloud/oidc/activity.ts +7 -4
- package/src/cmd/cloud/oidc/create.ts +8 -10
- package/src/cmd/cloud/oidc/delete.ts +7 -4
- package/src/cmd/cloud/oidc/get.ts +7 -4
- package/src/cmd/cloud/oidc/list.ts +7 -4
- package/src/cmd/cloud/oidc/rotate-secret.ts +7 -4
- package/src/cmd/cloud/oidc/users.ts +7 -4
- package/src/cmd/cloud/oidc/util.ts +28 -0
- package/src/cmd/coder/hub-url.ts +5 -1
- package/src/cmd/coder/start.ts +22 -8
- package/src/cmd/coder/tui-init.ts +75 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/activity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/activity.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,kBAAkB,yCAgD7B,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { z } from 'zod';
|
|
|
3
3
|
import { getCommand } from '../../../command-prefix';
|
|
4
4
|
import * as tui from '../../../tui';
|
|
5
5
|
import { createSubcommand } from '../../../types';
|
|
6
|
+
import { createOAuthClient } from './util';
|
|
6
7
|
const OAuthClientActivityResponseSchema = z.array(z.object({
|
|
7
8
|
activity_date: z.string(),
|
|
8
9
|
total_access: z.number(),
|
|
@@ -19,8 +20,9 @@ export const activitySubcommand = createSubcommand({
|
|
|
19
20
|
description: 'Show OAuth activity for last 30 days',
|
|
20
21
|
},
|
|
21
22
|
],
|
|
22
|
-
requires: { auth: true
|
|
23
|
+
requires: { auth: true },
|
|
23
24
|
idempotent: true,
|
|
25
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
24
26
|
schema: {
|
|
25
27
|
args: z.object({
|
|
26
28
|
id: z.string().describe('the OAuth client id'),
|
|
@@ -31,9 +33,10 @@ export const activitySubcommand = createSubcommand({
|
|
|
31
33
|
response: OAuthClientActivityResponseSchema,
|
|
32
34
|
},
|
|
33
35
|
async handler(ctx) {
|
|
34
|
-
const { args, opts,
|
|
36
|
+
const { args, opts, options } = ctx;
|
|
37
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
35
38
|
const activity = await tui.spinner('Fetching OAuth activity', () => {
|
|
36
|
-
return oauthClientActivity(
|
|
39
|
+
return oauthClientActivity(catalystClient, args.id, opts.days);
|
|
37
40
|
});
|
|
38
41
|
if (!options.json) {
|
|
39
42
|
if (activity.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/activity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/create.ts"],"names":[],"mappings":"AA+BA,eAAO,MAAM,gBAAgB,yCAsM3B,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { oauthClientCreate, oauthScopes
|
|
1
|
+
import { oauthClientCreate, oauthScopes } from '@agentuity/core';
|
|
2
2
|
import enquirer from 'enquirer';
|
|
3
3
|
import { z } from 'zod';
|
|
4
4
|
import { getCommand } from '../../../command-prefix';
|
|
5
5
|
import * as tui from '../../../tui';
|
|
6
6
|
import { createSubcommand as createSubcommandHelper } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
7
8
|
const OAuthClientCreateResponseSchema = z.object({
|
|
8
9
|
client: z.object({
|
|
9
10
|
id: z.string(),
|
|
@@ -41,8 +42,9 @@ export const createSubcommand = createSubcommandHelper({
|
|
|
41
42
|
description: 'Create OAuth application interactively',
|
|
42
43
|
},
|
|
43
44
|
],
|
|
44
|
-
requires: { auth: true
|
|
45
|
+
requires: { auth: true },
|
|
45
46
|
idempotent: false,
|
|
47
|
+
webUrl: '/settings/oauth-apps',
|
|
46
48
|
schema: {
|
|
47
49
|
options: z.object({
|
|
48
50
|
name: z.string().optional().describe('the OAuth application name'),
|
|
@@ -64,9 +66,10 @@ export const createSubcommand = createSubcommandHelper({
|
|
|
64
66
|
response: OAuthClientCreateResponseSchema,
|
|
65
67
|
},
|
|
66
68
|
async handler(ctx) {
|
|
67
|
-
const { opts,
|
|
69
|
+
const { opts, options } = ctx;
|
|
70
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
68
71
|
const availableScopes = await tui.spinner('Fetching available OAuth scopes', () => {
|
|
69
|
-
return oauthScopes(
|
|
72
|
+
return oauthScopes(catalystClient);
|
|
70
73
|
});
|
|
71
74
|
const nonInteractive = !process.stdin.isTTY || !process.stdout.isTTY;
|
|
72
75
|
let name = opts?.name?.trim() || '';
|
|
@@ -176,7 +179,7 @@ export const createSubcommand = createSubcommandHelper({
|
|
|
176
179
|
scopes,
|
|
177
180
|
};
|
|
178
181
|
const result = await tui.spinner('Creating OAuth application', () => {
|
|
179
|
-
return oauthClientCreate(
|
|
182
|
+
return oauthClientCreate(catalystClient, request);
|
|
180
183
|
});
|
|
181
184
|
if (!options.json) {
|
|
182
185
|
tui.newline();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/create.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/delete.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/delete.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,gBAAgB,yCAoD3B,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { getCommand } from '../../../command-prefix';
|
|
|
4
4
|
import { ErrorCode } from '../../../errors';
|
|
5
5
|
import * as tui from '../../../tui';
|
|
6
6
|
import { createSubcommand } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
7
8
|
const OAuthClientDeleteResponseSchema = z.object({
|
|
8
9
|
success: z.boolean().describe('Whether the operation succeeded'),
|
|
9
10
|
id: z.string().describe('OAuth client id that was deleted'),
|
|
@@ -21,7 +22,8 @@ export const deleteSubcommand = createSubcommand({
|
|
|
21
22
|
description: 'Delete OAuth application without confirmation',
|
|
22
23
|
},
|
|
23
24
|
],
|
|
24
|
-
requires: { auth: true
|
|
25
|
+
requires: { auth: true },
|
|
26
|
+
webUrl: '/settings/oauth-apps',
|
|
25
27
|
schema: {
|
|
26
28
|
args: z.object({
|
|
27
29
|
id: z.string().describe('the OAuth client id to delete'),
|
|
@@ -33,7 +35,8 @@ export const deleteSubcommand = createSubcommand({
|
|
|
33
35
|
response: OAuthClientDeleteResponseSchema,
|
|
34
36
|
},
|
|
35
37
|
async handler(ctx) {
|
|
36
|
-
const { args, opts,
|
|
38
|
+
const { args, opts, options } = ctx;
|
|
39
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
37
40
|
const skipConfirm = opts.force || opts.yes;
|
|
38
41
|
if (!skipConfirm) {
|
|
39
42
|
const confirmed = await tui.confirm(`Delete OAuth application "${args.id}"?`, false);
|
|
@@ -42,7 +45,7 @@ export const deleteSubcommand = createSubcommand({
|
|
|
42
45
|
}
|
|
43
46
|
}
|
|
44
47
|
await tui.spinner('Deleting OAuth application', () => {
|
|
45
|
-
return oauthClientDelete(
|
|
48
|
+
return oauthClientDelete(catalystClient, args.id);
|
|
46
49
|
});
|
|
47
50
|
if (!options.json) {
|
|
48
51
|
tui.success(`OAuth application '${args.id}' deleted successfully`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/delete.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/get.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/get.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,aAAa,yCA2DxB,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { getCommand } from '../../../command-prefix';
|
|
|
4
4
|
import { ErrorCode } from '../../../errors';
|
|
5
5
|
import * as tui from '../../../tui';
|
|
6
6
|
import { createSubcommand } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
7
8
|
export const getSubcommand = createSubcommand({
|
|
8
9
|
name: 'get',
|
|
9
10
|
description: 'Get a specific OAuth application',
|
|
@@ -11,19 +12,21 @@ export const getSubcommand = createSubcommand({
|
|
|
11
12
|
examples: [
|
|
12
13
|
{ command: getCommand('cloud oidc get <id>'), description: 'Get OAuth application details' },
|
|
13
14
|
],
|
|
14
|
-
requires: { auth: true
|
|
15
|
+
requires: { auth: true },
|
|
15
16
|
idempotent: true,
|
|
17
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
16
18
|
schema: {
|
|
17
19
|
args: z.object({
|
|
18
20
|
id: z.string().describe('the OAuth client id'),
|
|
19
21
|
}),
|
|
20
22
|
},
|
|
21
23
|
async handler(ctx) {
|
|
22
|
-
const { args,
|
|
24
|
+
const { args, options } = ctx;
|
|
25
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
23
26
|
let client;
|
|
24
27
|
try {
|
|
25
28
|
client = await tui.spinner('Fetching OAuth application', () => {
|
|
26
|
-
return oauthClientGet(
|
|
29
|
+
return oauthClientGet(catalystClient, args.id);
|
|
27
30
|
});
|
|
28
31
|
}
|
|
29
32
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/get.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/list.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/list.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,yCA8CzB,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { oauthClientList } from '@agentuity/core';
|
|
|
2
2
|
import { getCommand } from '../../../command-prefix';
|
|
3
3
|
import * as tui from '../../../tui';
|
|
4
4
|
import { createSubcommand } from '../../../types';
|
|
5
|
+
import { createOAuthClient } from './util';
|
|
5
6
|
export const listSubcommand = createSubcommand({
|
|
6
7
|
name: 'list',
|
|
7
8
|
aliases: ['ls'],
|
|
@@ -11,12 +12,14 @@ export const listSubcommand = createSubcommand({
|
|
|
11
12
|
{ command: getCommand('cloud oidc list'), description: 'List OAuth applications' },
|
|
12
13
|
{ command: getCommand('cloud oidc ls'), description: 'List OAuth applications' },
|
|
13
14
|
],
|
|
14
|
-
requires: { auth: true
|
|
15
|
+
requires: { auth: true },
|
|
15
16
|
idempotent: true,
|
|
17
|
+
webUrl: '/settings/oauth-apps',
|
|
16
18
|
async handler(ctx) {
|
|
17
|
-
const {
|
|
19
|
+
const { options } = ctx;
|
|
20
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
18
21
|
const clients = await tui.spinner('Fetching OAuth applications', () => {
|
|
19
|
-
return oauthClientList(
|
|
22
|
+
return oauthClientList(catalystClient);
|
|
20
23
|
});
|
|
21
24
|
if (!options.json) {
|
|
22
25
|
if (clients.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC9C,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,CAAC,IAAI,CAAC;IACf,WAAW,EAAE,6BAA6B;IAC1C,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,eAAe,CAAC;IAC5C,QAAQ,EAAE;QACT,EAAE,OAAO,EAAE,UAAU,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE;QAClF,EAAE,OAAO,EAAE,UAAU,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE;KAChF;IACD,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IACxB,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,sBAAsB;IAE9B,KAAK,CAAC,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QACxB,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAEpD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrE,OAAO,eAAe,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACP,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBAC1B,GAAG,CAAC,OAAO,EAAE,CAAC;oBACd,GAAG,CAAC,OAAO,CAAC,uBAAuB,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC;oBACvD,GAAG,CAAC,OAAO,EAAE,CAAC;gBACf,CAAC;gBAED,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBACrC,EAAE,EAAE,MAAM,CAAC,EAAE;oBACb,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,WAAW;oBACxB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;oBAC5B,KAAK,EAAE,MAAM,CAAC,UAAU;oBACxB,OAAO,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,cAAc,EAAE;iBACrD,CAAC,CAAC,CAAC;gBAEJ,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CACD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rotate-secret.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/rotate-secret.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rotate-secret.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/rotate-secret.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,sBAAsB,yCAkEjC,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { getCommand } from '../../../command-prefix';
|
|
|
4
4
|
import { ErrorCode } from '../../../errors';
|
|
5
5
|
import * as tui from '../../../tui';
|
|
6
6
|
import { createSubcommand } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
7
8
|
const OAuthClientRotateSecretResponseSchema = z.object({
|
|
8
9
|
client_id: z.string(),
|
|
9
10
|
client_secret: z.string(),
|
|
@@ -22,8 +23,9 @@ export const rotateSecretSubcommand = createSubcommand({
|
|
|
22
23
|
description: 'Rotate OAuth client secret without confirmation',
|
|
23
24
|
},
|
|
24
25
|
],
|
|
25
|
-
requires: { auth: true
|
|
26
|
+
requires: { auth: true },
|
|
26
27
|
idempotent: false,
|
|
28
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
27
29
|
schema: {
|
|
28
30
|
args: z.object({
|
|
29
31
|
id: z.string().describe('the OAuth client id'),
|
|
@@ -34,7 +36,8 @@ export const rotateSecretSubcommand = createSubcommand({
|
|
|
34
36
|
response: OAuthClientRotateSecretResponseSchema,
|
|
35
37
|
},
|
|
36
38
|
async handler(ctx) {
|
|
37
|
-
const { args, opts,
|
|
39
|
+
const { args, opts, options } = ctx;
|
|
40
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
38
41
|
if (!opts.force) {
|
|
39
42
|
const confirmed = await tui.confirm(`Rotate secret for OAuth application "${args.id}"?`, false);
|
|
40
43
|
if (!confirmed) {
|
|
@@ -42,7 +45,7 @@ export const rotateSecretSubcommand = createSubcommand({
|
|
|
42
45
|
}
|
|
43
46
|
}
|
|
44
47
|
const result = await tui.spinner('Rotating OAuth client secret', () => {
|
|
45
|
-
return oauthClientRotateSecret(
|
|
48
|
+
return oauthClientRotateSecret(catalystClient, args.id);
|
|
46
49
|
});
|
|
47
50
|
if (!options.json) {
|
|
48
51
|
tui.newline();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rotate-secret.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/rotate-secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,
|
|
1
|
+
{"version":3,"file":"rotate-secret.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/rotate-secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,MAAM,qCAAqC,GAAG,CAAC,CAAC,MAAM,CAAC;IACtD,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;CACzB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,gBAAgB,CAAC;IACtD,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,mDAAmD;IAChE,IAAI,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;IACtC,QAAQ,EAAE;QACT;YACC,OAAO,EAAE,UAAU,CAAC,+BAA+B,CAAC;YACpD,WAAW,EAAE,4BAA4B;SACzC;QACD;YACC,OAAO,EAAE,UAAU,CAAC,uCAAuC,CAAC;YAC5D,WAAW,EAAE,iDAAiD;SAC9D;KACD;IACD,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IACxB,UAAU,EAAE,KAAK;IACjB,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,wBAAwB,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;IAC1E,MAAM,EAAE;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACd,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;SAC9C,CAAC;QACF,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,0BAA0B,CAAC;SACjF,CAAC;QACF,QAAQ,EAAE,qCAAqC;KAC/C;IAED,KAAK,CAAC,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QACpC,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,OAAO,CAClC,wCAAwC,IAAI,CAAC,EAAE,IAAI,EACnD,KAAK,CACL,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChB,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;YAC5D,CAAC;QACF,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACrE,OAAO,uBAAuB,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACnB,GAAG,CAAC,OAAO,EAAE,CAAC;YACd,GAAG,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;YACzD,GAAG,CAAC,OAAO,EAAE,CAAC;YACd,GAAG,CAAC,OAAO,CAAC,6DAA6D,CAAC,CAAC;YAC3E,GAAG,CAAC,OAAO,EAAE,CAAC;YAEd,GAAG,CAAC,KAAK,CACR;gBACC;oBACC,WAAW,EAAE,MAAM,CAAC,SAAS;oBAC7B,eAAe,EAAE,MAAM,CAAC,aAAa;iBACrC;aACD,EACD,SAAS,EACT,EAAE,MAAM,EAAE,UAAU,EAAE,CACtB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/users.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/users.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe,yCA4C1B,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { z } from 'zod';
|
|
|
3
3
|
import { getCommand } from '../../../command-prefix';
|
|
4
4
|
import * as tui from '../../../tui';
|
|
5
5
|
import { createSubcommand } from '../../../types';
|
|
6
|
+
import { createOAuthClient } from './util';
|
|
6
7
|
const OAuthClientUsersResponseSchema = z.array(z.object({
|
|
7
8
|
user_id: z.string(),
|
|
8
9
|
scopes: z.array(z.string()),
|
|
@@ -18,8 +19,9 @@ export const usersSubcommand = createSubcommand({
|
|
|
18
19
|
description: 'List connected users for OAuth application',
|
|
19
20
|
},
|
|
20
21
|
],
|
|
21
|
-
requires: { auth: true
|
|
22
|
+
requires: { auth: true },
|
|
22
23
|
idempotent: true,
|
|
24
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
23
25
|
schema: {
|
|
24
26
|
args: z.object({
|
|
25
27
|
id: z.string().describe('the OAuth client id'),
|
|
@@ -27,9 +29,10 @@ export const usersSubcommand = createSubcommand({
|
|
|
27
29
|
response: OAuthClientUsersResponseSchema,
|
|
28
30
|
},
|
|
29
31
|
async handler(ctx) {
|
|
30
|
-
const { args,
|
|
32
|
+
const { args, options } = ctx;
|
|
33
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
31
34
|
const users = await tui.spinner('Fetching connected OAuth users', () => {
|
|
32
|
-
return oauthClientUsers(
|
|
35
|
+
return oauthClientUsers(catalystClient, args.id);
|
|
33
36
|
});
|
|
34
37
|
if (!options.json) {
|
|
35
38
|
if (users.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAC7C,CAAC,CAAC,MAAM,CAAC;IACR,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAAC;IAC/C,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,+CAA+C;IAC5D,IAAI,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;IACpC,QAAQ,EAAE;QACT;YACC,OAAO,EAAE,UAAU,CAAC,uBAAuB,CAAC;YAC5C,WAAW,EAAE,4CAA4C;SACzD;KACD;IACD,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IACxB,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,wBAAwB,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;IAC1E,MAAM,EAAE;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACd,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;SAC9C,CAAC;QACF,QAAQ,EAAE,8BAA8B;KACxC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAC9B,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAEpD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACtE,OAAO,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACjC,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC9B,YAAY,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,EAAE;iBACxD,CAAC,CAAC,CAAC;gBAEJ,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC;QACF,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD,CAAC,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { Logger } from '@agentuity/core';
|
|
2
|
+
import type { AuthData, Config, GlobalOptions, ProjectConfig } from '../../../types';
|
|
3
|
+
export declare function createOAuthClient(ctx: {
|
|
4
|
+
logger: Logger;
|
|
5
|
+
auth: AuthData;
|
|
6
|
+
project?: ProjectConfig;
|
|
7
|
+
config: Config | null;
|
|
8
|
+
options: GlobalOptions;
|
|
9
|
+
}, explicitOrgId?: string): Promise<import("@agentuity/core").APIClient>;
|
|
10
|
+
//# sourceMappingURL=util.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAErF,wBAAsB,iBAAiB,CACtC,GAAG,EAAE;IACJ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,aAAa,CAAC;CACvB,EACD,aAAa,CAAC,EAAE,MAAM,gDActB"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { getGlobalCatalystAPIClient } from '../../../config';
|
|
2
|
+
import * as tui from '../../../tui';
|
|
3
|
+
export async function createOAuthClient(ctx, explicitOrgId) {
|
|
4
|
+
const orgId = explicitOrgId ??
|
|
5
|
+
ctx.project?.orgId ??
|
|
6
|
+
ctx.options.orgId ??
|
|
7
|
+
(process.env.AGENTUITY_CLOUD_ORG_ID || ctx.config?.preferences?.orgId);
|
|
8
|
+
if (!orgId) {
|
|
9
|
+
tui.fatal('Organization ID is required. Either run from a project directory or use --org-id flag.');
|
|
10
|
+
}
|
|
11
|
+
return getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name, orgId, ctx.config);
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/oidc/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAGpC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACtC,GAMC,EACD,aAAsB;IAEtB,MAAM,KAAK,GACV,aAAa;QACb,GAAG,CAAC,OAAO,EAAE,KAAK;QAClB,GAAG,CAAC,OAAO,CAAC,KAAK;QACjB,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IACxE,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,GAAG,CAAC,KAAK,CACR,wFAAwF,CACxF,CAAC;IACH,CAAC;IAED,OAAO,0BAA0B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;AAC9F,CAAC"}
|
|
@@ -22,6 +22,7 @@ export declare function resolveHubUrl(flagUrl?: string): Promise<string | null>;
|
|
|
22
22
|
* @returns WebSocket URL (e.g. "ws://127.0.0.1:3500/api/ws") or null
|
|
23
23
|
*/
|
|
24
24
|
export declare function resolveHubWsUrl(flagUrl?: string): Promise<string | null>;
|
|
25
|
+
export declare function toHubWsUrl(hubHttpUrl: string): string;
|
|
25
26
|
/**
|
|
26
27
|
* Resolve the API key for Hub authentication.
|
|
27
28
|
* TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-url.d.ts","sourceRoot":"","sources":["../../../src/cmd/coder/hub-url.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAa5E;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAI9E;AA0CD;;;GAGG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,IAAI,CAE7C;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMtF"}
|
|
1
|
+
{"version":3,"file":"hub-url.d.ts","sourceRoot":"","sources":["../../../src/cmd/coder/hub-url.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAa5E;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAI9E;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAErD;AA0CD;;;GAGG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,IAAI,CAE7C;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMtF"}
|
|
@@ -39,7 +39,10 @@ export async function resolveHubWsUrl(flagUrl) {
|
|
|
39
39
|
const httpUrl = await resolveHubUrl(flagUrl);
|
|
40
40
|
if (!httpUrl)
|
|
41
41
|
return null;
|
|
42
|
-
return
|
|
42
|
+
return toHubWsUrl(httpUrl);
|
|
43
|
+
}
|
|
44
|
+
export function toHubWsUrl(hubHttpUrl) {
|
|
45
|
+
return normalizeToWs(hubHttpUrl);
|
|
43
46
|
}
|
|
44
47
|
/**
|
|
45
48
|
* Convert any URL form to an HTTP base URL (strip paths, convert ws->http).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-url.js","sourceRoot":"","sources":["../../../src/cmd/coder/hub-url.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAgB;IACnD,mBAAmB;IACnB,IAAI,OAAO;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;IAE7C,wBAAwB;IACxB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACnD,IAAI,MAAM;QAAE,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;IAE3C,2BAA2B;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IACjD,IAAI,MAAM;QAAE,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;IAE3C,OAAO,IAAI,CAAC;AACb,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAgB;IACrD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"hub-url.js","sourceRoot":"","sources":["../../../src/cmd/coder/hub-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/cmd/coder/start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/cmd/coder/start.ts"],"names":[],"mappings":"AAmEA,eAAO,MAAM,eAAe,sCAiW1B,CAAC"}
|
package/dist/cmd/coder/start.js
CHANGED
|
@@ -13,7 +13,8 @@ import { createSubcommand } from '../../types';
|
|
|
13
13
|
import * as tui from '../../tui';
|
|
14
14
|
import { getCommand } from '../../command-prefix';
|
|
15
15
|
import { ErrorCode } from '../../errors';
|
|
16
|
-
import {
|
|
16
|
+
import { toHubWsUrl, resolveHubUrl, hubFetchHeaders } from './hub-url';
|
|
17
|
+
import { probeTuiInitAccess } from './tui-init';
|
|
17
18
|
/**
|
|
18
19
|
* Resolve the Coder extension path.
|
|
19
20
|
*
|
|
@@ -134,11 +135,21 @@ export const startSubcommand = createSubcommand({
|
|
|
134
135
|
async handler(ctx) {
|
|
135
136
|
const { opts, options } = ctx;
|
|
136
137
|
// Resolve Hub URL
|
|
137
|
-
const
|
|
138
|
-
if (!
|
|
138
|
+
const hubHttpUrl = await resolveHubUrl(opts?.hubUrl);
|
|
139
|
+
if (!hubHttpUrl) {
|
|
139
140
|
tui.fatal('Could not find a running Coder Hub.\n\nEither:\n - Start the Hub with: bun run dev\n - Set AGENTUITY_CODER_HUB_URL environment variable\n - Pass --hub-url flag', ErrorCode.NETWORK_ERROR);
|
|
140
141
|
return;
|
|
141
142
|
}
|
|
143
|
+
const hubWsUrl = toHubWsUrl(hubHttpUrl);
|
|
144
|
+
const tuiInitProbe = await probeTuiInitAccess(hubHttpUrl);
|
|
145
|
+
if (!tuiInitProbe.ok) {
|
|
146
|
+
if (tuiInitProbe.code === 'unauthorized') {
|
|
147
|
+
tui.fatal(`Coder Hub at ${hubHttpUrl} requires authentication.\n\nSet AGENTUITY_CODER_API_KEY in your shell and retry.\n\nServer said: ${tuiInitProbe.message}`, ErrorCode.NETWORK_ERROR);
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
tui.fatal(`Could not bootstrap the Coder Hub at ${hubHttpUrl}: ${tuiInitProbe.message}`, ErrorCode.NETWORK_ERROR);
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
142
153
|
// Resolve extension path
|
|
143
154
|
const extensionPath = resolveExtensionPath(opts?.extension);
|
|
144
155
|
if (!extensionPath) {
|
|
@@ -157,11 +168,6 @@ export const startSubcommand = createSubcommand({
|
|
|
157
168
|
}
|
|
158
169
|
else {
|
|
159
170
|
// No session ID — fetch connectable sessions and show picker
|
|
160
|
-
const hubHttpUrl = await resolveHubUrl(opts?.hubUrl);
|
|
161
|
-
if (!hubHttpUrl) {
|
|
162
|
-
tui.fatal('Could not find Hub URL for session picker.', ErrorCode.NETWORK_ERROR);
|
|
163
|
-
return;
|
|
164
|
-
}
|
|
165
171
|
try {
|
|
166
172
|
const sessions = await tui.spinner({
|
|
167
173
|
message: 'Fetching connectable sessions…',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cmd/coder/start.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cmd/coder/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export type TuiInitProbeResult = {
|
|
2
|
+
ok: true;
|
|
3
|
+
} | {
|
|
4
|
+
ok: false;
|
|
5
|
+
code: 'unauthorized' | 'http_error' | 'invalid_response' | 'network_error';
|
|
6
|
+
message: string;
|
|
7
|
+
};
|
|
8
|
+
export declare function probeTuiInitAccess(hubHttpUrl: string, fetchImpl?: typeof fetch): Promise<TuiInitProbeResult>;
|
|
9
|
+
//# sourceMappingURL=tui-init.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tui-init.d.ts","sourceRoot":"","sources":["../../../src/cmd/coder/tui-init.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,kBAAkB,GAC3B;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IACA,EAAE,EAAE,KAAK,CAAC;IACV,IAAI,EAAE,cAAc,GAAG,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;IAC3E,OAAO,EAAE,MAAM,CAAC;CACf,CAAC;AAaL,wBAAsB,kBAAkB,CACvC,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,OAAO,KAAa,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CAkD7B"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { hubFetchHeaders } from './hub-url';
|
|
2
|
+
function normalizeErrorMessage(payload, fallback) {
|
|
3
|
+
if (payload &&
|
|
4
|
+
typeof payload === 'object' &&
|
|
5
|
+
typeof payload.error === 'string') {
|
|
6
|
+
return payload.error;
|
|
7
|
+
}
|
|
8
|
+
return fallback;
|
|
9
|
+
}
|
|
10
|
+
export async function probeTuiInitAccess(hubHttpUrl, fetchImpl = fetch) {
|
|
11
|
+
try {
|
|
12
|
+
const response = await fetchImpl(`${hubHttpUrl}/api/hub/tui/init`, {
|
|
13
|
+
headers: hubFetchHeaders({ accept: 'application/json' }),
|
|
14
|
+
signal: AbortSignal.timeout(5_000),
|
|
15
|
+
});
|
|
16
|
+
let payload;
|
|
17
|
+
try {
|
|
18
|
+
payload = await response.json();
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
payload = undefined;
|
|
22
|
+
}
|
|
23
|
+
if (response.status === 401 || response.status === 403) {
|
|
24
|
+
return {
|
|
25
|
+
ok: false,
|
|
26
|
+
code: 'unauthorized',
|
|
27
|
+
message: normalizeErrorMessage(payload, `${response.status} ${response.statusText}`),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
if (!response.ok) {
|
|
31
|
+
return {
|
|
32
|
+
ok: false,
|
|
33
|
+
code: 'http_error',
|
|
34
|
+
message: normalizeErrorMessage(payload, `${response.status} ${response.statusText}`),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
if (!payload ||
|
|
38
|
+
typeof payload !== 'object' ||
|
|
39
|
+
payload.type !== 'init') {
|
|
40
|
+
return {
|
|
41
|
+
ok: false,
|
|
42
|
+
code: 'invalid_response',
|
|
43
|
+
message: 'Hub init endpoint did not return an init payload',
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
return { ok: true };
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
return {
|
|
50
|
+
ok: false,
|
|
51
|
+
code: 'network_error',
|
|
52
|
+
message: error instanceof Error ? error.message : String(error),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=tui-init.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tui-init.js","sourceRoot":"","sources":["../../../src/cmd/coder/tui-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAU5C,SAAS,qBAAqB,CAAC,OAAgB,EAAE,QAAgB;IAChE,IACC,OAAO;QACP,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAQ,OAA+B,CAAC,KAAK,KAAK,QAAQ,EACzD,CAAC;QACF,OAAQ,OAA6B,CAAC,KAAK,CAAC;IAC7C,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,UAAkB,EAClB,YAA0B,KAAK;IAE/B,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,UAAU,mBAAmB,EAAE;YAClE,OAAO,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;YACxD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;SAClC,CAAC,CAAC;QAEH,IAAI,OAAgB,CAAC;QACrB,IAAI,CAAC;YACJ,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,GAAG,SAAS,CAAC;QACrB,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACxD,OAAO;gBACN,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,qBAAqB,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;aACpF,CAAC;QACH,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,OAAO;gBACN,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,qBAAqB,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;aACpF,CAAC;QACH,CAAC;QAED,IACC,CAAC,OAAO;YACR,OAAO,OAAO,KAAK,QAAQ;YAC1B,OAA8B,CAAC,IAAI,KAAK,MAAM,EAC9C,CAAC;YACF,OAAO;gBACN,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,kDAAkD;aAC3D,CAAC;QACH,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO;YACN,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC/D,CAAC;IACH,CAAC;AACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentuity/cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.43",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Agentuity employees and contributors",
|
|
6
6
|
"type": "module",
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"prepublishOnly": "bun run clean && bun run build"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@agentuity/auth": "1.0.
|
|
45
|
-
"@agentuity/core": "1.0.
|
|
46
|
-
"@agentuity/server": "1.0.
|
|
44
|
+
"@agentuity/auth": "1.0.43",
|
|
45
|
+
"@agentuity/core": "1.0.43",
|
|
46
|
+
"@agentuity/server": "1.0.43",
|
|
47
47
|
"@datasert/cronjs-parser": "^1.4.0",
|
|
48
48
|
"@vitejs/plugin-react": "^5.1.2",
|
|
49
49
|
"acorn-loose": "^8.5.2",
|
|
@@ -59,10 +59,10 @@
|
|
|
59
59
|
"typescript": "^5.9.0",
|
|
60
60
|
"vite": "^7.2.7",
|
|
61
61
|
"zod": "^4.3.5",
|
|
62
|
-
"@agentuity/frontend": "1.0.
|
|
62
|
+
"@agentuity/frontend": "1.0.43"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@agentuity/test-utils": "1.0.
|
|
65
|
+
"@agentuity/test-utils": "1.0.43",
|
|
66
66
|
"@types/adm-zip": "^0.5.7",
|
|
67
67
|
"@types/bun": "latest",
|
|
68
68
|
"@types/tar-fs": "^2.0.4",
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { oauthClientActivity
|
|
1
|
+
import { oauthClientActivity } from '@agentuity/core';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { getCommand } from '../../../command-prefix';
|
|
4
4
|
import * as tui from '../../../tui';
|
|
5
5
|
import { createSubcommand } from '../../../types';
|
|
6
|
+
import { createOAuthClient } from './util';
|
|
6
7
|
|
|
7
8
|
const OAuthClientActivityResponseSchema = z.array(
|
|
8
9
|
z.object({
|
|
@@ -23,8 +24,9 @@ export const activitySubcommand = createSubcommand({
|
|
|
23
24
|
description: 'Show OAuth activity for last 30 days',
|
|
24
25
|
},
|
|
25
26
|
],
|
|
26
|
-
requires: { auth: true
|
|
27
|
+
requires: { auth: true },
|
|
27
28
|
idempotent: true,
|
|
29
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
28
30
|
schema: {
|
|
29
31
|
args: z.object({
|
|
30
32
|
id: z.string().describe('the OAuth client id'),
|
|
@@ -36,10 +38,11 @@ export const activitySubcommand = createSubcommand({
|
|
|
36
38
|
},
|
|
37
39
|
|
|
38
40
|
async handler(ctx) {
|
|
39
|
-
const { args, opts,
|
|
41
|
+
const { args, opts, options } = ctx;
|
|
42
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
40
43
|
|
|
41
44
|
const activity = await tui.spinner('Fetching OAuth activity', () => {
|
|
42
|
-
return oauthClientActivity(
|
|
45
|
+
return oauthClientActivity(catalystClient, args.id, opts.days);
|
|
43
46
|
});
|
|
44
47
|
|
|
45
48
|
if (!options.json) {
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
oauthClientCreate,
|
|
3
|
-
oauthScopes,
|
|
4
|
-
type APIClient,
|
|
5
|
-
type OAuthClientCreateRequest,
|
|
6
|
-
} from '@agentuity/core';
|
|
1
|
+
import { oauthClientCreate, oauthScopes, type OAuthClientCreateRequest } from '@agentuity/core';
|
|
7
2
|
import enquirer from 'enquirer';
|
|
8
3
|
import { z } from 'zod';
|
|
9
4
|
import { getCommand } from '../../../command-prefix';
|
|
10
5
|
import * as tui from '../../../tui';
|
|
11
6
|
import { createSubcommand as createSubcommandHelper } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
12
8
|
|
|
13
9
|
const OAuthClientCreateResponseSchema = z.object({
|
|
14
10
|
client: z.object({
|
|
@@ -50,8 +46,9 @@ export const createSubcommand = createSubcommandHelper({
|
|
|
50
46
|
description: 'Create OAuth application interactively',
|
|
51
47
|
},
|
|
52
48
|
],
|
|
53
|
-
requires: { auth: true
|
|
49
|
+
requires: { auth: true },
|
|
54
50
|
idempotent: false,
|
|
51
|
+
webUrl: '/settings/oauth-apps',
|
|
55
52
|
schema: {
|
|
56
53
|
options: z.object({
|
|
57
54
|
name: z.string().optional().describe('the OAuth application name'),
|
|
@@ -74,10 +71,11 @@ export const createSubcommand = createSubcommandHelper({
|
|
|
74
71
|
},
|
|
75
72
|
|
|
76
73
|
async handler(ctx) {
|
|
77
|
-
const { opts,
|
|
74
|
+
const { opts, options } = ctx;
|
|
75
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
78
76
|
|
|
79
77
|
const availableScopes = await tui.spinner('Fetching available OAuth scopes', () => {
|
|
80
|
-
return oauthScopes(
|
|
78
|
+
return oauthScopes(catalystClient);
|
|
81
79
|
});
|
|
82
80
|
|
|
83
81
|
const nonInteractive = !process.stdin.isTTY || !process.stdout.isTTY;
|
|
@@ -201,7 +199,7 @@ export const createSubcommand = createSubcommandHelper({
|
|
|
201
199
|
};
|
|
202
200
|
|
|
203
201
|
const result = await tui.spinner('Creating OAuth application', () => {
|
|
204
|
-
return oauthClientCreate(
|
|
202
|
+
return oauthClientCreate(catalystClient, request);
|
|
205
203
|
});
|
|
206
204
|
|
|
207
205
|
if (!options.json) {
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { oauthClientDelete
|
|
1
|
+
import { oauthClientDelete } from '@agentuity/core';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { getCommand } from '../../../command-prefix';
|
|
4
4
|
import { ErrorCode } from '../../../errors';
|
|
5
5
|
import * as tui from '../../../tui';
|
|
6
6
|
import { createSubcommand } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
7
8
|
|
|
8
9
|
const OAuthClientDeleteResponseSchema = z.object({
|
|
9
10
|
success: z.boolean().describe('Whether the operation succeeded'),
|
|
@@ -23,7 +24,8 @@ export const deleteSubcommand = createSubcommand({
|
|
|
23
24
|
description: 'Delete OAuth application without confirmation',
|
|
24
25
|
},
|
|
25
26
|
],
|
|
26
|
-
requires: { auth: true
|
|
27
|
+
requires: { auth: true },
|
|
28
|
+
webUrl: '/settings/oauth-apps',
|
|
27
29
|
schema: {
|
|
28
30
|
args: z.object({
|
|
29
31
|
id: z.string().describe('the OAuth client id to delete'),
|
|
@@ -36,7 +38,8 @@ export const deleteSubcommand = createSubcommand({
|
|
|
36
38
|
},
|
|
37
39
|
|
|
38
40
|
async handler(ctx) {
|
|
39
|
-
const { args, opts,
|
|
41
|
+
const { args, opts, options } = ctx;
|
|
42
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
40
43
|
|
|
41
44
|
const skipConfirm = opts.force || opts.yes;
|
|
42
45
|
|
|
@@ -48,7 +51,7 @@ export const deleteSubcommand = createSubcommand({
|
|
|
48
51
|
}
|
|
49
52
|
|
|
50
53
|
await tui.spinner('Deleting OAuth application', () => {
|
|
51
|
-
return oauthClientDelete(
|
|
54
|
+
return oauthClientDelete(catalystClient, args.id);
|
|
52
55
|
});
|
|
53
56
|
|
|
54
57
|
if (!options.json) {
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { oauthClientGet
|
|
1
|
+
import { oauthClientGet } from '@agentuity/core';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { getCommand } from '../../../command-prefix';
|
|
4
4
|
import { ErrorCode } from '../../../errors';
|
|
5
5
|
import * as tui from '../../../tui';
|
|
6
6
|
import { createSubcommand } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
7
8
|
|
|
8
9
|
export const getSubcommand = createSubcommand({
|
|
9
10
|
name: 'get',
|
|
@@ -12,8 +13,9 @@ export const getSubcommand = createSubcommand({
|
|
|
12
13
|
examples: [
|
|
13
14
|
{ command: getCommand('cloud oidc get <id>'), description: 'Get OAuth application details' },
|
|
14
15
|
],
|
|
15
|
-
requires: { auth: true
|
|
16
|
+
requires: { auth: true },
|
|
16
17
|
idempotent: true,
|
|
18
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
17
19
|
schema: {
|
|
18
20
|
args: z.object({
|
|
19
21
|
id: z.string().describe('the OAuth client id'),
|
|
@@ -21,12 +23,13 @@ export const getSubcommand = createSubcommand({
|
|
|
21
23
|
},
|
|
22
24
|
|
|
23
25
|
async handler(ctx) {
|
|
24
|
-
const { args,
|
|
26
|
+
const { args, options } = ctx;
|
|
27
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
25
28
|
|
|
26
29
|
let client: Awaited<ReturnType<typeof oauthClientGet>>;
|
|
27
30
|
try {
|
|
28
31
|
client = await tui.spinner('Fetching OAuth application', () => {
|
|
29
|
-
return oauthClientGet(
|
|
32
|
+
return oauthClientGet(catalystClient, args.id);
|
|
30
33
|
});
|
|
31
34
|
} catch (error) {
|
|
32
35
|
if (error instanceof Error && error.message.includes('not found')) {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { oauthClientList
|
|
1
|
+
import { oauthClientList } from '@agentuity/core';
|
|
2
2
|
import { getCommand } from '../../../command-prefix';
|
|
3
3
|
import * as tui from '../../../tui';
|
|
4
4
|
import { createSubcommand } from '../../../types';
|
|
5
|
+
import { createOAuthClient } from './util';
|
|
5
6
|
|
|
6
7
|
export const listSubcommand = createSubcommand({
|
|
7
8
|
name: 'list',
|
|
@@ -12,14 +13,16 @@ export const listSubcommand = createSubcommand({
|
|
|
12
13
|
{ command: getCommand('cloud oidc list'), description: 'List OAuth applications' },
|
|
13
14
|
{ command: getCommand('cloud oidc ls'), description: 'List OAuth applications' },
|
|
14
15
|
],
|
|
15
|
-
requires: { auth: true
|
|
16
|
+
requires: { auth: true },
|
|
16
17
|
idempotent: true,
|
|
18
|
+
webUrl: '/settings/oauth-apps',
|
|
17
19
|
|
|
18
20
|
async handler(ctx) {
|
|
19
|
-
const {
|
|
21
|
+
const { options } = ctx;
|
|
22
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
20
23
|
|
|
21
24
|
const clients = await tui.spinner('Fetching OAuth applications', () => {
|
|
22
|
-
return oauthClientList(
|
|
25
|
+
return oauthClientList(catalystClient);
|
|
23
26
|
});
|
|
24
27
|
|
|
25
28
|
if (!options.json) {
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { oauthClientRotateSecret
|
|
1
|
+
import { oauthClientRotateSecret } from '@agentuity/core';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { getCommand } from '../../../command-prefix';
|
|
4
4
|
import { ErrorCode } from '../../../errors';
|
|
5
5
|
import * as tui from '../../../tui';
|
|
6
6
|
import { createSubcommand } from '../../../types';
|
|
7
|
+
import { createOAuthClient } from './util';
|
|
7
8
|
|
|
8
9
|
const OAuthClientRotateSecretResponseSchema = z.object({
|
|
9
10
|
client_id: z.string(),
|
|
@@ -24,8 +25,9 @@ export const rotateSecretSubcommand = createSubcommand({
|
|
|
24
25
|
description: 'Rotate OAuth client secret without confirmation',
|
|
25
26
|
},
|
|
26
27
|
],
|
|
27
|
-
requires: { auth: true
|
|
28
|
+
requires: { auth: true },
|
|
28
29
|
idempotent: false,
|
|
30
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
29
31
|
schema: {
|
|
30
32
|
args: z.object({
|
|
31
33
|
id: z.string().describe('the OAuth client id'),
|
|
@@ -37,7 +39,8 @@ export const rotateSecretSubcommand = createSubcommand({
|
|
|
37
39
|
},
|
|
38
40
|
|
|
39
41
|
async handler(ctx) {
|
|
40
|
-
const { args, opts,
|
|
42
|
+
const { args, opts, options } = ctx;
|
|
43
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
41
44
|
|
|
42
45
|
if (!opts.force) {
|
|
43
46
|
const confirmed = await tui.confirm(
|
|
@@ -50,7 +53,7 @@ export const rotateSecretSubcommand = createSubcommand({
|
|
|
50
53
|
}
|
|
51
54
|
|
|
52
55
|
const result = await tui.spinner('Rotating OAuth client secret', () => {
|
|
53
|
-
return oauthClientRotateSecret(
|
|
56
|
+
return oauthClientRotateSecret(catalystClient, args.id);
|
|
54
57
|
});
|
|
55
58
|
|
|
56
59
|
if (!options.json) {
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { oauthClientUsers
|
|
1
|
+
import { oauthClientUsers } from '@agentuity/core';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { getCommand } from '../../../command-prefix';
|
|
4
4
|
import * as tui from '../../../tui';
|
|
5
5
|
import { createSubcommand } from '../../../types';
|
|
6
|
+
import { createOAuthClient } from './util';
|
|
6
7
|
|
|
7
8
|
const OAuthClientUsersResponseSchema = z.array(
|
|
8
9
|
z.object({
|
|
@@ -22,8 +23,9 @@ export const usersSubcommand = createSubcommand({
|
|
|
22
23
|
description: 'List connected users for OAuth application',
|
|
23
24
|
},
|
|
24
25
|
],
|
|
25
|
-
requires: { auth: true
|
|
26
|
+
requires: { auth: true },
|
|
26
27
|
idempotent: true,
|
|
28
|
+
webUrl: (ctx) => `/settings/oauth-apps/${encodeURIComponent(ctx.args.id)}`,
|
|
27
29
|
schema: {
|
|
28
30
|
args: z.object({
|
|
29
31
|
id: z.string().describe('the OAuth client id'),
|
|
@@ -32,10 +34,11 @@ export const usersSubcommand = createSubcommand({
|
|
|
32
34
|
},
|
|
33
35
|
|
|
34
36
|
async handler(ctx) {
|
|
35
|
-
const { args,
|
|
37
|
+
const { args, options } = ctx;
|
|
38
|
+
const catalystClient = await createOAuthClient(ctx);
|
|
36
39
|
|
|
37
40
|
const users = await tui.spinner('Fetching connected OAuth users', () => {
|
|
38
|
-
return oauthClientUsers(
|
|
41
|
+
return oauthClientUsers(catalystClient, args.id);
|
|
39
42
|
});
|
|
40
43
|
|
|
41
44
|
if (!options.json) {
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { Logger } from '@agentuity/core';
|
|
2
|
+
import { getGlobalCatalystAPIClient } from '../../../config';
|
|
3
|
+
import * as tui from '../../../tui';
|
|
4
|
+
import type { AuthData, Config, GlobalOptions, ProjectConfig } from '../../../types';
|
|
5
|
+
|
|
6
|
+
export async function createOAuthClient(
|
|
7
|
+
ctx: {
|
|
8
|
+
logger: Logger;
|
|
9
|
+
auth: AuthData;
|
|
10
|
+
project?: ProjectConfig;
|
|
11
|
+
config: Config | null;
|
|
12
|
+
options: GlobalOptions;
|
|
13
|
+
},
|
|
14
|
+
explicitOrgId?: string
|
|
15
|
+
) {
|
|
16
|
+
const orgId =
|
|
17
|
+
explicitOrgId ??
|
|
18
|
+
ctx.project?.orgId ??
|
|
19
|
+
ctx.options.orgId ??
|
|
20
|
+
(process.env.AGENTUITY_CLOUD_ORG_ID || ctx.config?.preferences?.orgId);
|
|
21
|
+
if (!orgId) {
|
|
22
|
+
tui.fatal(
|
|
23
|
+
'Organization ID is required. Either run from a project directory or use --org-id flag.'
|
|
24
|
+
);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
return getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name, orgId, ctx.config);
|
|
28
|
+
}
|
package/src/cmd/coder/hub-url.ts
CHANGED
|
@@ -41,7 +41,11 @@ export async function resolveHubUrl(flagUrl?: string): Promise<string | null> {
|
|
|
41
41
|
export async function resolveHubWsUrl(flagUrl?: string): Promise<string | null> {
|
|
42
42
|
const httpUrl = await resolveHubUrl(flagUrl);
|
|
43
43
|
if (!httpUrl) return null;
|
|
44
|
-
return
|
|
44
|
+
return toHubWsUrl(httpUrl);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export function toHubWsUrl(hubHttpUrl: string): string {
|
|
48
|
+
return normalizeToWs(hubHttpUrl);
|
|
45
49
|
}
|
|
46
50
|
|
|
47
51
|
/**
|
package/src/cmd/coder/start.ts
CHANGED
|
@@ -5,7 +5,8 @@ import { createSubcommand } from '../../types';
|
|
|
5
5
|
import * as tui from '../../tui';
|
|
6
6
|
import { getCommand } from '../../command-prefix';
|
|
7
7
|
import { ErrorCode } from '../../errors';
|
|
8
|
-
import {
|
|
8
|
+
import { toHubWsUrl, resolveHubUrl, hubFetchHeaders } from './hub-url';
|
|
9
|
+
import { probeTuiInitAccess } from './tui-init';
|
|
9
10
|
|
|
10
11
|
/**
|
|
11
12
|
* Resolve the Coder extension path.
|
|
@@ -129,14 +130,32 @@ export const startSubcommand = createSubcommand({
|
|
|
129
130
|
const { opts, options } = ctx;
|
|
130
131
|
|
|
131
132
|
// Resolve Hub URL
|
|
132
|
-
const
|
|
133
|
-
if (!
|
|
133
|
+
const hubHttpUrl = await resolveHubUrl(opts?.hubUrl);
|
|
134
|
+
if (!hubHttpUrl) {
|
|
134
135
|
tui.fatal(
|
|
135
136
|
'Could not find a running Coder Hub.\n\nEither:\n - Start the Hub with: bun run dev\n - Set AGENTUITY_CODER_HUB_URL environment variable\n - Pass --hub-url flag',
|
|
136
137
|
ErrorCode.NETWORK_ERROR
|
|
137
138
|
);
|
|
138
139
|
return;
|
|
139
140
|
}
|
|
141
|
+
const hubWsUrl = toHubWsUrl(hubHttpUrl);
|
|
142
|
+
|
|
143
|
+
const tuiInitProbe = await probeTuiInitAccess(hubHttpUrl);
|
|
144
|
+
if (!tuiInitProbe.ok) {
|
|
145
|
+
if (tuiInitProbe.code === 'unauthorized') {
|
|
146
|
+
tui.fatal(
|
|
147
|
+
`Coder Hub at ${hubHttpUrl} requires authentication.\n\nSet AGENTUITY_CODER_API_KEY in your shell and retry.\n\nServer said: ${tuiInitProbe.message}`,
|
|
148
|
+
ErrorCode.NETWORK_ERROR
|
|
149
|
+
);
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
tui.fatal(
|
|
154
|
+
`Could not bootstrap the Coder Hub at ${hubHttpUrl}: ${tuiInitProbe.message}`,
|
|
155
|
+
ErrorCode.NETWORK_ERROR
|
|
156
|
+
);
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
140
159
|
|
|
141
160
|
// Resolve extension path
|
|
142
161
|
const extensionPath = resolveExtensionPath(opts?.extension);
|
|
@@ -160,11 +179,6 @@ export const startSubcommand = createSubcommand({
|
|
|
160
179
|
remoteSessionId = remoteValue;
|
|
161
180
|
} else {
|
|
162
181
|
// No session ID — fetch connectable sessions and show picker
|
|
163
|
-
const hubHttpUrl = await resolveHubUrl(opts?.hubUrl);
|
|
164
|
-
if (!hubHttpUrl) {
|
|
165
|
-
tui.fatal('Could not find Hub URL for session picker.', ErrorCode.NETWORK_ERROR);
|
|
166
|
-
return;
|
|
167
|
-
}
|
|
168
182
|
try {
|
|
169
183
|
type SessionInfo = {
|
|
170
184
|
id: string;
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { hubFetchHeaders } from './hub-url';
|
|
2
|
+
|
|
3
|
+
export type TuiInitProbeResult =
|
|
4
|
+
| { ok: true }
|
|
5
|
+
| {
|
|
6
|
+
ok: false;
|
|
7
|
+
code: 'unauthorized' | 'http_error' | 'invalid_response' | 'network_error';
|
|
8
|
+
message: string;
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
function normalizeErrorMessage(payload: unknown, fallback: string): string {
|
|
12
|
+
if (
|
|
13
|
+
payload &&
|
|
14
|
+
typeof payload === 'object' &&
|
|
15
|
+
typeof (payload as { error?: unknown }).error === 'string'
|
|
16
|
+
) {
|
|
17
|
+
return (payload as { error: string }).error;
|
|
18
|
+
}
|
|
19
|
+
return fallback;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export async function probeTuiInitAccess(
|
|
23
|
+
hubHttpUrl: string,
|
|
24
|
+
fetchImpl: typeof fetch = fetch
|
|
25
|
+
): Promise<TuiInitProbeResult> {
|
|
26
|
+
try {
|
|
27
|
+
const response = await fetchImpl(`${hubHttpUrl}/api/hub/tui/init`, {
|
|
28
|
+
headers: hubFetchHeaders({ accept: 'application/json' }),
|
|
29
|
+
signal: AbortSignal.timeout(5_000),
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
let payload: unknown;
|
|
33
|
+
try {
|
|
34
|
+
payload = await response.json();
|
|
35
|
+
} catch {
|
|
36
|
+
payload = undefined;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
if (response.status === 401 || response.status === 403) {
|
|
40
|
+
return {
|
|
41
|
+
ok: false,
|
|
42
|
+
code: 'unauthorized',
|
|
43
|
+
message: normalizeErrorMessage(payload, `${response.status} ${response.statusText}`),
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if (!response.ok) {
|
|
48
|
+
return {
|
|
49
|
+
ok: false,
|
|
50
|
+
code: 'http_error',
|
|
51
|
+
message: normalizeErrorMessage(payload, `${response.status} ${response.statusText}`),
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
if (
|
|
56
|
+
!payload ||
|
|
57
|
+
typeof payload !== 'object' ||
|
|
58
|
+
(payload as { type?: unknown }).type !== 'init'
|
|
59
|
+
) {
|
|
60
|
+
return {
|
|
61
|
+
ok: false,
|
|
62
|
+
code: 'invalid_response',
|
|
63
|
+
message: 'Hub init endpoint did not return an init payload',
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return { ok: true };
|
|
68
|
+
} catch (error) {
|
|
69
|
+
return {
|
|
70
|
+
ok: false,
|
|
71
|
+
code: 'network_error',
|
|
72
|
+
message: error instanceof Error ? error.message : String(error),
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
}
|