@agentuity/cli 1.0.13 → 1.0.15
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/bin/cli.ts +8 -0
- package/dist/agent-detection.js +2 -2
- package/dist/agent-detection.js.map +1 -1
- package/dist/banner.js +2 -2
- package/dist/banner.js.map +1 -1
- package/dist/bun-path.d.ts.map +1 -1
- package/dist/bun-path.js +2 -1
- package/dist/bun-path.js.map +1 -1
- package/dist/cmd/build/ast.d.ts.map +1 -1
- package/dist/cmd/build/ast.js +87 -14
- package/dist/cmd/build/ast.js.map +1 -1
- package/dist/cmd/build/vite/agent-discovery.d.ts.map +1 -1
- package/dist/cmd/build/vite/agent-discovery.js +3 -2
- package/dist/cmd/build/vite/agent-discovery.js.map +1 -1
- package/dist/cmd/build/vite/metadata-generator.d.ts.map +1 -1
- package/dist/cmd/build/vite/metadata-generator.js +2 -1
- package/dist/cmd/build/vite/metadata-generator.js.map +1 -1
- package/dist/cmd/build/vite/registry-generator.d.ts.map +1 -1
- package/dist/cmd/build/vite/registry-generator.js +9 -7
- package/dist/cmd/build/vite/registry-generator.js.map +1 -1
- package/dist/cmd/build/vite/route-discovery.d.ts.map +1 -1
- package/dist/cmd/build/vite/route-discovery.js +3 -2
- package/dist/cmd/build/vite/route-discovery.js.map +1 -1
- package/dist/cmd/cloud/deploy.d.ts.map +1 -1
- package/dist/cmd/cloud/deploy.js +19 -21
- package/dist/cmd/cloud/deploy.js.map +1 -1
- package/dist/cmd/cloud/env/delete.d.ts.map +1 -1
- package/dist/cmd/cloud/env/delete.js +3 -26
- package/dist/cmd/cloud/env/delete.js.map +1 -1
- package/dist/cmd/cloud/env/import.d.ts.map +1 -1
- package/dist/cmd/cloud/env/import.js +3 -16
- package/dist/cmd/cloud/env/import.js.map +1 -1
- package/dist/cmd/cloud/env/set.d.ts.map +1 -1
- package/dist/cmd/cloud/env/set.js +3 -19
- package/dist/cmd/cloud/env/set.js.map +1 -1
- package/dist/cmd/cloud/sandbox/cp.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/cp.js +2 -1
- package/dist/cmd/cloud/sandbox/cp.js.map +1 -1
- package/dist/cmd/git/account/add.d.ts +6 -8
- package/dist/cmd/git/account/add.d.ts.map +1 -1
- package/dist/cmd/git/account/add.js +37 -151
- package/dist/cmd/git/account/add.js.map +1 -1
- package/dist/cmd/git/account/index.d.ts +0 -1
- package/dist/cmd/git/account/index.d.ts.map +1 -1
- package/dist/cmd/git/account/index.js +3 -4
- package/dist/cmd/git/account/index.js.map +1 -1
- package/dist/cmd/git/account/list.d.ts.map +1 -1
- package/dist/cmd/git/account/list.js +35 -67
- package/dist/cmd/git/account/list.js.map +1 -1
- package/dist/cmd/git/account/remove.d.ts.map +1 -1
- package/dist/cmd/git/account/remove.js +42 -84
- package/dist/cmd/git/account/remove.js.map +1 -1
- package/dist/cmd/git/api.d.ts +19 -23
- package/dist/cmd/git/api.d.ts.map +1 -1
- package/dist/cmd/git/api.js +38 -56
- package/dist/cmd/git/api.js.map +1 -1
- package/dist/cmd/git/identity/connect.d.ts +15 -0
- package/dist/cmd/git/identity/connect.d.ts.map +1 -0
- package/dist/cmd/git/identity/connect.js +135 -0
- package/dist/cmd/git/identity/connect.js.map +1 -0
- package/dist/cmd/git/identity/disconnect.d.ts +2 -0
- package/dist/cmd/git/identity/disconnect.d.ts.map +1 -0
- package/dist/cmd/git/identity/disconnect.js +83 -0
- package/dist/cmd/git/identity/disconnect.js.map +1 -0
- package/dist/cmd/git/identity/index.d.ts +2 -0
- package/dist/cmd/git/identity/index.d.ts.map +1 -0
- package/dist/cmd/git/identity/index.js +10 -0
- package/dist/cmd/git/identity/index.js.map +1 -0
- package/dist/cmd/git/identity/status.d.ts +2 -0
- package/dist/cmd/git/identity/status.d.ts.map +1 -0
- package/dist/cmd/git/identity/status.js +77 -0
- package/dist/cmd/git/identity/status.js.map +1 -0
- package/dist/cmd/git/index.d.ts +0 -1
- package/dist/cmd/git/index.d.ts.map +1 -1
- package/dist/cmd/git/index.js +3 -2
- package/dist/cmd/git/index.js.map +1 -1
- package/dist/cmd/git/link.d.ts +2 -3
- package/dist/cmd/git/link.d.ts.map +1 -1
- package/dist/cmd/git/link.js +22 -28
- package/dist/cmd/git/link.js.map +1 -1
- package/dist/cmd/git/list.d.ts.map +1 -1
- package/dist/cmd/git/list.js +42 -55
- package/dist/cmd/git/list.js.map +1 -1
- package/dist/cmd/git/status.d.ts.map +1 -1
- package/dist/cmd/git/status.js +51 -38
- package/dist/cmd/git/status.js.map +1 -1
- package/dist/cmd/upgrade/npm-availability.d.ts +6 -7
- package/dist/cmd/upgrade/npm-availability.d.ts.map +1 -1
- package/dist/cmd/upgrade/npm-availability.js +9 -18
- package/dist/cmd/upgrade/npm-availability.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +14 -4
- package/dist/config.js.map +1 -1
- package/dist/utils/detectSubagent.d.ts.map +1 -1
- package/dist/utils/detectSubagent.js +3 -0
- package/dist/utils/detectSubagent.js.map +1 -1
- package/dist/utils/normalize-path.d.ts +11 -0
- package/dist/utils/normalize-path.d.ts.map +1 -0
- package/dist/utils/normalize-path.js +13 -0
- package/dist/utils/normalize-path.js.map +1 -0
- package/dist/utils/zip.d.ts.map +1 -1
- package/dist/utils/zip.js +2 -1
- package/dist/utils/zip.js.map +1 -1
- package/package.json +6 -6
- package/src/agent-detection.ts +2 -2
- package/src/banner.ts +2 -2
- package/src/bun-path.ts +2 -1
- package/src/cmd/build/ast.ts +96 -15
- package/src/cmd/build/vite/agent-discovery.ts +3 -2
- package/src/cmd/build/vite/metadata-generator.ts +2 -1
- package/src/cmd/build/vite/registry-generator.ts +9 -7
- package/src/cmd/build/vite/route-discovery.ts +3 -2
- package/src/cmd/cloud/deploy.ts +54 -61
- package/src/cmd/cloud/env/delete.ts +3 -34
- package/src/cmd/cloud/env/import.ts +2 -18
- package/src/cmd/cloud/env/set.ts +2 -21
- package/src/cmd/cloud/sandbox/cp.ts +2 -1
- package/src/cmd/git/account/add.ts +51 -190
- package/src/cmd/git/account/index.ts +3 -5
- package/src/cmd/git/account/list.ts +51 -82
- package/src/cmd/git/account/remove.ts +45 -95
- package/src/cmd/git/api.ts +49 -111
- package/src/cmd/git/identity/connect.ts +178 -0
- package/src/cmd/git/identity/disconnect.ts +103 -0
- package/src/cmd/git/identity/index.ts +10 -0
- package/src/cmd/git/identity/status.ts +96 -0
- package/src/cmd/git/index.ts +3 -3
- package/src/cmd/git/link.ts +32 -35
- package/src/cmd/git/list.ts +48 -59
- package/src/cmd/git/status.ts +55 -40
- package/src/cmd/upgrade/npm-availability.ts +14 -23
- package/src/config.ts +14 -5
- package/src/utils/detectSubagent.ts +5 -0
- package/src/utils/normalize-path.ts +12 -0
- package/src/utils/zip.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/cmd/git/link.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/cmd/git/link.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAI3C,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,aAAa,CAAC;AAW5D,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAgB,aAAa,IAAI,eAAe,CAmC/C;AAED,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAyQtF;AAoBD,eAAO,MAAM,cAAc,sCAiGzB,CAAC"}
|
package/dist/cmd/git/link.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { createSubcommand } from '../../types';
|
|
2
|
-
import * as tui from '../../tui';
|
|
3
|
-
import { getCommand } from '../../command-prefix';
|
|
4
|
-
import { ErrorCode } from '../../errors';
|
|
5
1
|
import enquirer from 'enquirer';
|
|
6
2
|
import { z } from 'zod';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
3
|
+
import { getCommand } from '../../command-prefix';
|
|
4
|
+
import { ErrorCode } from '../../errors';
|
|
5
|
+
import * as tui from '../../tui';
|
|
6
|
+
import { createSubcommand } from '../../types';
|
|
7
|
+
import { getGithubIntegrationStatus, getProjectGithubStatus, linkProjectToRepo, listGithubRepos, } from './api';
|
|
8
|
+
import { runGitIdentityConnect } from './identity/connect';
|
|
9
9
|
export function detectGitInfo() {
|
|
10
10
|
let repo = null;
|
|
11
11
|
let branch = null;
|
|
@@ -42,7 +42,7 @@ export function detectGitInfo() {
|
|
|
42
42
|
return { repo, branch };
|
|
43
43
|
}
|
|
44
44
|
export async function runGitLink(options) {
|
|
45
|
-
const { apiClient, projectId,
|
|
45
|
+
const { apiClient, projectId, logger, branchOption, rootOption, noAuto = false, noPreview = false, skipAlreadyLinkedCheck = false, config, } = options;
|
|
46
46
|
try {
|
|
47
47
|
if (!skipAlreadyLinkedCheck) {
|
|
48
48
|
const currentStatus = await tui.spinner({
|
|
@@ -64,20 +64,19 @@ export async function runGitLink(options) {
|
|
|
64
64
|
let githubStatus = await tui.spinner({
|
|
65
65
|
message: 'Checking GitHub connection...',
|
|
66
66
|
clearOnSuccess: true,
|
|
67
|
-
callback: () => getGithubIntegrationStatus(apiClient
|
|
67
|
+
callback: () => getGithubIntegrationStatus(apiClient),
|
|
68
68
|
});
|
|
69
|
-
if (!githubStatus.connected || githubStatus.
|
|
69
|
+
if (!githubStatus.connected || githubStatus.installations.length === 0) {
|
|
70
70
|
tui.newline();
|
|
71
|
-
tui.warning('No GitHub accounts connected
|
|
71
|
+
tui.warning('No GitHub accounts connected.');
|
|
72
72
|
tui.newline();
|
|
73
73
|
const wantConnect = await tui.confirm('Would you like to connect a GitHub account now?');
|
|
74
74
|
if (!wantConnect) {
|
|
75
75
|
tui.info('Cancelled');
|
|
76
76
|
return { linked: false, cancelled: true };
|
|
77
77
|
}
|
|
78
|
-
const connectResult = await
|
|
78
|
+
const connectResult = await runGitIdentityConnect({
|
|
79
79
|
apiClient,
|
|
80
|
-
orgId,
|
|
81
80
|
logger,
|
|
82
81
|
config,
|
|
83
82
|
});
|
|
@@ -87,8 +86,8 @@ export async function runGitLink(options) {
|
|
|
87
86
|
}
|
|
88
87
|
return { linked: false, noGithubConnected: true };
|
|
89
88
|
}
|
|
90
|
-
githubStatus = await getGithubIntegrationStatus(apiClient
|
|
91
|
-
if (!githubStatus.connected || githubStatus.
|
|
89
|
+
githubStatus = await getGithubIntegrationStatus(apiClient);
|
|
90
|
+
if (!githubStatus.connected || githubStatus.installations.length === 0) {
|
|
92
91
|
tui.error('GitHub connection failed. Please try again.');
|
|
93
92
|
return { linked: false, noGithubConnected: true };
|
|
94
93
|
}
|
|
@@ -100,7 +99,7 @@ export async function runGitLink(options) {
|
|
|
100
99
|
const allRepos = await tui.spinner({
|
|
101
100
|
message: 'Fetching available repositories...',
|
|
102
101
|
clearOnSuccess: true,
|
|
103
|
-
callback: () => listGithubRepos(apiClient
|
|
102
|
+
callback: () => listGithubRepos(apiClient),
|
|
104
103
|
});
|
|
105
104
|
if (allRepos.length === 0) {
|
|
106
105
|
tui.newline();
|
|
@@ -125,12 +124,12 @@ export async function runGitLink(options) {
|
|
|
125
124
|
}
|
|
126
125
|
if (!selectedRepo) {
|
|
127
126
|
let repos = allRepos;
|
|
128
|
-
if (githubStatus.
|
|
127
|
+
if (githubStatus.installations.length > 1) {
|
|
129
128
|
tui.newline();
|
|
130
|
-
const accountChoices = githubStatus.
|
|
131
|
-
name:
|
|
132
|
-
value:
|
|
133
|
-
message: `${
|
|
129
|
+
const accountChoices = githubStatus.installations.map((installation) => ({
|
|
130
|
+
name: installation.accountName,
|
|
131
|
+
value: installation.integrationId ?? installation.installationId,
|
|
132
|
+
message: `${installation.accountName} ${tui.muted(`(${installation.accountType})`)}`,
|
|
134
133
|
}));
|
|
135
134
|
const accountResponse = await enquirer.prompt({
|
|
136
135
|
type: 'select',
|
|
@@ -138,7 +137,7 @@ export async function runGitLink(options) {
|
|
|
138
137
|
message: 'Select a GitHub account',
|
|
139
138
|
choices: accountChoices,
|
|
140
139
|
result(name) {
|
|
141
|
-
// Return the value (
|
|
140
|
+
// Return the value (integrationId) instead of the name
|
|
142
141
|
const choice = accountChoices.find((c) => c.name === name);
|
|
143
142
|
return choice?.value ?? name;
|
|
144
143
|
},
|
|
@@ -146,7 +145,7 @@ export async function runGitLink(options) {
|
|
|
146
145
|
repos = await tui.spinner({
|
|
147
146
|
message: 'Fetching repositories...',
|
|
148
147
|
clearOnSuccess: true,
|
|
149
|
-
callback: () => listGithubRepos(apiClient,
|
|
148
|
+
callback: () => listGithubRepos(apiClient, accountResponse.integrationId),
|
|
150
149
|
});
|
|
151
150
|
if (repos.length === 0) {
|
|
152
151
|
tui.newline();
|
|
@@ -172,7 +171,7 @@ export async function runGitLink(options) {
|
|
|
172
171
|
}
|
|
173
172
|
}
|
|
174
173
|
// Prompt for settings with defaults
|
|
175
|
-
const defaultBranch = branchOption ??
|
|
174
|
+
const defaultBranch = branchOption ?? selectedRepo.defaultBranch;
|
|
176
175
|
const defaultRoot = rootOption ?? '.';
|
|
177
176
|
tui.newline();
|
|
178
177
|
const { directory } = await enquirer.prompt({
|
|
@@ -212,7 +211,6 @@ export async function runGitLink(options) {
|
|
|
212
211
|
autoDeploy: finalAutoDeploy,
|
|
213
212
|
previewDeploy: finalPreviewDeploy,
|
|
214
213
|
directory: directory === '.' ? undefined : directory,
|
|
215
|
-
integrationId: selectedRepo.integrationId,
|
|
216
214
|
}),
|
|
217
215
|
});
|
|
218
216
|
tui.newline();
|
|
@@ -307,9 +305,6 @@ export const linkSubcommand = createSubcommand({
|
|
|
307
305
|
const { apiClient, project, opts, config, logger, options } = ctx;
|
|
308
306
|
try {
|
|
309
307
|
// Non-interactive mode when repo is provided
|
|
310
|
-
// Note: integrationId is not passed in non-interactive mode. The API will
|
|
311
|
-
// attempt to find a matching integration based on the repo owner. This may
|
|
312
|
-
// fail if the org has multiple GitHub integrations with access to the same repo.
|
|
313
308
|
if (opts.repo && opts.confirm) {
|
|
314
309
|
const branch = opts.branch ?? 'main';
|
|
315
310
|
const directory = opts.root === '.' ? undefined : opts.root;
|
|
@@ -334,7 +329,6 @@ export const linkSubcommand = createSubcommand({
|
|
|
334
329
|
const result = await runGitLink({
|
|
335
330
|
apiClient,
|
|
336
331
|
projectId: project.projectId,
|
|
337
|
-
orgId: project.orgId,
|
|
338
332
|
logger,
|
|
339
333
|
branchOption: opts.branch,
|
|
340
334
|
rootOption: opts.root,
|
package/dist/cmd/git/link.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../../src/cmd/git/link.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../../src/cmd/git/link.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/cmd/git/list.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/cmd/git/list.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,cAAc,sCA0IzB,CAAC"}
|
package/dist/cmd/git/list.js
CHANGED
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
import { createSubcommand } from '../../types';
|
|
2
|
-
import * as tui from '../../tui';
|
|
3
|
-
import { getCommand } from '../../command-prefix';
|
|
4
1
|
import enquirer from 'enquirer';
|
|
5
2
|
import { z } from 'zod';
|
|
6
|
-
import {
|
|
3
|
+
import { getCommand } from '../../command-prefix';
|
|
7
4
|
import { ErrorCode } from '../../errors';
|
|
8
|
-
import
|
|
5
|
+
import * as tui from '../../tui';
|
|
6
|
+
import { createSubcommand } from '../../types';
|
|
7
|
+
import { getGithubIntegrationStatus, listGithubRepos } from './api';
|
|
9
8
|
const ListOptionsSchema = z.object({
|
|
10
|
-
|
|
11
|
-
account: z.string().optional().describe('GitHub account/integration ID to filter by'),
|
|
9
|
+
account: z.string().optional().describe('GitHub account name to filter by'),
|
|
12
10
|
});
|
|
13
11
|
export const listSubcommand = createSubcommand({
|
|
14
12
|
name: 'list',
|
|
15
|
-
description: 'List GitHub repositories accessible to your
|
|
13
|
+
description: 'List GitHub repositories accessible to your account',
|
|
16
14
|
aliases: ['ls'],
|
|
17
15
|
tags: ['read-only'],
|
|
18
16
|
idempotent: true,
|
|
@@ -26,8 +24,8 @@ export const listSubcommand = createSubcommand({
|
|
|
26
24
|
description: 'List all accessible GitHub repositories',
|
|
27
25
|
},
|
|
28
26
|
{
|
|
29
|
-
command: getCommand('git list --org
|
|
30
|
-
description: 'List repos for a specific
|
|
27
|
+
command: getCommand('git list --account my-org'),
|
|
28
|
+
description: 'List repos for a specific GitHub account',
|
|
31
29
|
},
|
|
32
30
|
{
|
|
33
31
|
command: getCommand('--json git list'),
|
|
@@ -37,71 +35,60 @@ export const listSubcommand = createSubcommand({
|
|
|
37
35
|
async handler(ctx) {
|
|
38
36
|
const { logger, apiClient, opts, options } = ctx;
|
|
39
37
|
try {
|
|
40
|
-
//
|
|
41
|
-
const orgs = await tui.spinner({
|
|
42
|
-
message: 'Fetching organizations...',
|
|
43
|
-
clearOnSuccess: true,
|
|
44
|
-
callback: () => listOrganizations(apiClient),
|
|
45
|
-
});
|
|
46
|
-
if (orgs.length === 0) {
|
|
47
|
-
tui.error('No organizations found');
|
|
48
|
-
return [];
|
|
49
|
-
}
|
|
50
|
-
// Select org
|
|
51
|
-
let orgId = opts.org;
|
|
52
|
-
if (!orgId) {
|
|
53
|
-
const firstOrg = orgs[0];
|
|
54
|
-
if (orgs.length === 1 && firstOrg) {
|
|
55
|
-
orgId = firstOrg.id;
|
|
56
|
-
}
|
|
57
|
-
else {
|
|
58
|
-
tui.newline();
|
|
59
|
-
const orgChoices = orgs.map((o) => ({
|
|
60
|
-
name: o.id,
|
|
61
|
-
message: o.name,
|
|
62
|
-
}));
|
|
63
|
-
const response = await enquirer.prompt({
|
|
64
|
-
type: 'select',
|
|
65
|
-
name: 'orgId',
|
|
66
|
-
message: 'Select an organization',
|
|
67
|
-
choices: orgChoices,
|
|
68
|
-
});
|
|
69
|
-
orgId = response.orgId;
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
// Check GitHub integrations
|
|
38
|
+
// Check GitHub connection
|
|
73
39
|
const githubStatus = await tui.spinner({
|
|
74
40
|
message: 'Checking GitHub connection...',
|
|
75
41
|
clearOnSuccess: true,
|
|
76
|
-
callback: () => getGithubIntegrationStatus(apiClient
|
|
42
|
+
callback: () => getGithubIntegrationStatus(apiClient),
|
|
77
43
|
});
|
|
78
|
-
if (!githubStatus.connected || githubStatus.
|
|
44
|
+
if (!githubStatus.connected || githubStatus.installations.length === 0) {
|
|
79
45
|
tui.newline();
|
|
80
|
-
tui.error('No GitHub accounts connected
|
|
46
|
+
tui.error('No GitHub accounts connected.');
|
|
81
47
|
console.log(tui.muted(`Run ${tui.bold('agentuity git account add')} to connect one`));
|
|
82
48
|
return [];
|
|
83
49
|
}
|
|
84
|
-
// Select
|
|
85
|
-
let integrationId
|
|
86
|
-
if (
|
|
50
|
+
// Select installation if multiple and not specified
|
|
51
|
+
let integrationId;
|
|
52
|
+
if (opts.account) {
|
|
53
|
+
// Match by account name
|
|
54
|
+
const matched = githubStatus.installations.find((inst) => inst.accountName.toLowerCase() === opts.account.toLowerCase());
|
|
55
|
+
if (!matched) {
|
|
56
|
+
tui.newline();
|
|
57
|
+
tui.error(`No installation found for account "${opts.account}"`);
|
|
58
|
+
console.log(tui.muted(`Available: ${githubStatus.installations.map((i) => i.accountName).join(', ')}`));
|
|
59
|
+
return [];
|
|
60
|
+
}
|
|
61
|
+
integrationId = matched.integrationId;
|
|
62
|
+
}
|
|
63
|
+
else if (githubStatus.installations.length > 1) {
|
|
87
64
|
tui.newline();
|
|
88
|
-
const accountChoices = githubStatus.
|
|
89
|
-
name:
|
|
90
|
-
message: `${
|
|
65
|
+
const accountChoices = githubStatus.installations.map((installation) => ({
|
|
66
|
+
name: installation.installationId,
|
|
67
|
+
message: `${installation.accountName} ${tui.muted(`(${installation.accountType})`)}`,
|
|
68
|
+
value: installation.integrationId,
|
|
91
69
|
}));
|
|
92
70
|
const response = await enquirer.prompt({
|
|
93
71
|
type: 'select',
|
|
94
|
-
name: '
|
|
72
|
+
name: 'installationId',
|
|
95
73
|
message: 'Select a GitHub account',
|
|
96
74
|
choices: accountChoices,
|
|
75
|
+
result(name) {
|
|
76
|
+
// Return the value (integrationId) instead of the display name
|
|
77
|
+
const choice = accountChoices.find((c) => c.name === name);
|
|
78
|
+
return choice?.value ?? name;
|
|
79
|
+
},
|
|
97
80
|
});
|
|
98
|
-
integrationId = response.
|
|
81
|
+
integrationId = response.installationId;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
// Single installation — use its integrationId
|
|
85
|
+
integrationId = githubStatus.installations[0]?.integrationId;
|
|
99
86
|
}
|
|
100
87
|
// Fetch repos
|
|
101
88
|
const repos = await tui.spinner({
|
|
102
89
|
message: 'Fetching repositories...',
|
|
103
90
|
clearOnSuccess: true,
|
|
104
|
-
callback: () => listGithubRepos(apiClient,
|
|
91
|
+
callback: () => listGithubRepos(apiClient, integrationId),
|
|
105
92
|
});
|
|
106
93
|
if (repos.length === 0) {
|
|
107
94
|
tui.newline();
|
package/dist/cmd/git/list.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/cmd/git/list.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/cmd/git/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/cmd/git/status.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/cmd/git/status.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,gBAAgB,sCA4H3B,CAAC"}
|
package/dist/cmd/git/status.js
CHANGED
|
@@ -1,19 +1,25 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import * as tui from '../../tui';
|
|
1
|
+
import { z } from 'zod';
|
|
3
2
|
import { getCommand } from '../../command-prefix';
|
|
4
3
|
import { ErrorCode } from '../../errors';
|
|
5
|
-
import
|
|
6
|
-
import {
|
|
4
|
+
import * as tui from '../../tui';
|
|
5
|
+
import { createSubcommand } from '../../types';
|
|
6
|
+
import { getGithubIntegrationStatus, getProjectGithubStatus } from './api';
|
|
7
7
|
const StatusResponseSchema = z.object({
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
connected: z.boolean().describe('Whether GitHub is connected'),
|
|
9
|
+
identity: z
|
|
10
|
+
.object({
|
|
11
|
+
githubUsername: z.string(),
|
|
12
|
+
githubEmail: z.string().optional(),
|
|
13
|
+
})
|
|
14
|
+
.nullable()
|
|
15
|
+
.describe('Connected GitHub identity'),
|
|
16
|
+
installations: z
|
|
11
17
|
.array(z.object({
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
18
|
+
installationId: z.string(),
|
|
19
|
+
accountName: z.string(),
|
|
20
|
+
accountType: z.enum(['User', 'Organization']),
|
|
15
21
|
}))
|
|
16
|
-
.describe('
|
|
22
|
+
.describe('GitHub App installations'),
|
|
17
23
|
projectId: z.string().describe('Project ID'),
|
|
18
24
|
linked: z.boolean().describe('Whether the project is linked to a repo'),
|
|
19
25
|
repoFullName: z.string().optional().describe('Full repository name'),
|
|
@@ -44,11 +50,11 @@ export const statusSubcommand = createSubcommand({
|
|
|
44
50
|
async handler(ctx) {
|
|
45
51
|
const { logger, apiClient, project, options } = ctx;
|
|
46
52
|
try {
|
|
47
|
-
// Get
|
|
48
|
-
const
|
|
53
|
+
// Get user-level GitHub status
|
|
54
|
+
const githubStatus = await tui.spinner({
|
|
49
55
|
message: 'Checking GitHub connection...',
|
|
50
56
|
clearOnSuccess: true,
|
|
51
|
-
callback: () => getGithubIntegrationStatus(apiClient
|
|
57
|
+
callback: () => getGithubIntegrationStatus(apiClient),
|
|
52
58
|
});
|
|
53
59
|
// Get project-level link status
|
|
54
60
|
const projectStatus = await tui.spinner({
|
|
@@ -57,12 +63,17 @@ export const statusSubcommand = createSubcommand({
|
|
|
57
63
|
callback: () => getProjectGithubStatus(apiClient, project.projectId),
|
|
58
64
|
});
|
|
59
65
|
const result = {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
+
connected: githubStatus.connected,
|
|
67
|
+
identity: githubStatus.identity
|
|
68
|
+
? {
|
|
69
|
+
githubUsername: githubStatus.identity.githubUsername,
|
|
70
|
+
githubEmail: githubStatus.identity.githubEmail,
|
|
71
|
+
}
|
|
72
|
+
: null,
|
|
73
|
+
installations: githubStatus.installations.map((i) => ({
|
|
74
|
+
installationId: i.installationId,
|
|
75
|
+
accountName: i.accountName,
|
|
76
|
+
accountType: i.accountType,
|
|
66
77
|
})),
|
|
67
78
|
projectId: project.projectId,
|
|
68
79
|
linked: projectStatus.linked,
|
|
@@ -76,36 +87,38 @@ export const statusSubcommand = createSubcommand({
|
|
|
76
87
|
return result;
|
|
77
88
|
}
|
|
78
89
|
tui.newline();
|
|
79
|
-
|
|
90
|
+
tui.output(tui.bold('GitHub Status'));
|
|
80
91
|
tui.newline();
|
|
81
|
-
//
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
const
|
|
87
|
-
|
|
92
|
+
// GitHub identity status
|
|
93
|
+
if (githubStatus.connected && githubStatus.identity) {
|
|
94
|
+
tui.output(`${tui.bold('GitHub:')} ${tui.colorSuccess('✓')} Connected as ${tui.bold(githubStatus.identity.githubUsername)}`);
|
|
95
|
+
if (githubStatus.installations.length > 0) {
|
|
96
|
+
tui.output(` ${githubStatus.installations.length} installation${githubStatus.installations.length > 1 ? 's' : ''}`);
|
|
97
|
+
for (const installation of githubStatus.installations) {
|
|
98
|
+
const typeLabel = installation.accountType === 'Organization' ? 'org' : 'user';
|
|
99
|
+
tui.output(` - ${installation.accountName} ${tui.muted(`(${typeLabel})`)}`);
|
|
100
|
+
}
|
|
88
101
|
}
|
|
89
102
|
}
|
|
90
103
|
else {
|
|
91
|
-
|
|
92
|
-
|
|
104
|
+
tui.output(`${tui.bold('GitHub:')} ${tui.colorError('✗')} No GitHub account connected`);
|
|
105
|
+
tui.output(tui.muted(` Run ${tui.bold('agentuity git identity connect')} to connect one`));
|
|
93
106
|
}
|
|
94
107
|
tui.newline();
|
|
95
108
|
// Project status
|
|
96
|
-
|
|
109
|
+
tui.output(`${tui.bold('Project:')} ${project.projectId}`);
|
|
97
110
|
if (projectStatus.linked) {
|
|
98
|
-
|
|
99
|
-
|
|
111
|
+
tui.output(` ${tui.colorSuccess('✓')} Linked to ${tui.bold(projectStatus.repoFullName ?? '<unknown repository>')}`);
|
|
112
|
+
tui.output(` Branch: ${projectStatus.branch}`);
|
|
100
113
|
if (projectStatus.directory) {
|
|
101
|
-
|
|
114
|
+
tui.output(` Directory: ${projectStatus.directory}`);
|
|
102
115
|
}
|
|
103
|
-
|
|
104
|
-
|
|
116
|
+
tui.output(` Auto-deploy: ${projectStatus.autoDeploy ? tui.colorSuccess('enabled') : tui.muted('disabled')}`);
|
|
117
|
+
tui.output(` Preview deploys: ${projectStatus.previewDeploy ? tui.colorSuccess('enabled') : tui.muted('disabled')}`);
|
|
105
118
|
}
|
|
106
119
|
else {
|
|
107
|
-
|
|
108
|
-
|
|
120
|
+
tui.output(` ${tui.muted('○')} Not linked to a repository`);
|
|
121
|
+
tui.output(tui.muted(` Run ${tui.bold('agentuity git link')} to link one`));
|
|
109
122
|
}
|
|
110
123
|
tui.newline();
|
|
111
124
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cmd/git/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cmd/git/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* npm registry availability checking utilities.
|
|
3
|
-
* Used to verify a version is available
|
|
3
|
+
* Used to verify a version is available on npm before attempting upgrade.
|
|
4
4
|
*/
|
|
5
5
|
/**
|
|
6
6
|
* Run a command via Bun.spawn with a timeout that kills the process.
|
|
@@ -15,17 +15,16 @@ export declare function spawnWithTimeout(cmd: string[], options: {
|
|
|
15
15
|
stderr: Buffer;
|
|
16
16
|
}>;
|
|
17
17
|
/**
|
|
18
|
-
* Check if a specific version of @agentuity/cli is
|
|
19
|
-
* Uses `bun info` to verify bun's own resolver/CDN can see the version,
|
|
20
|
-
* which avoids the race where npm registry returns 200 but bun's CDN
|
|
21
|
-
* has not yet propagated the version.
|
|
18
|
+
* Check if a specific version of @agentuity/cli is available on the npm registry.
|
|
22
19
|
*
|
|
23
20
|
* @param version - Version to check (with or without 'v' prefix)
|
|
24
21
|
* @returns true if version is available, false otherwise
|
|
25
22
|
*/
|
|
26
|
-
export declare function isVersionAvailableOnNpm(version: string
|
|
23
|
+
export declare function isVersionAvailableOnNpm(version: string, options?: {
|
|
24
|
+
timeoutMs?: number;
|
|
25
|
+
}): Promise<boolean>;
|
|
27
26
|
/**
|
|
28
|
-
* Quick check if a version is available
|
|
27
|
+
* Quick check if a version is available on npm.
|
|
29
28
|
* Used for implicit version checks (auto-upgrade flow).
|
|
30
29
|
*
|
|
31
30
|
* @param version - Version to check (with or without 'v' prefix)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-availability.d.ts","sourceRoot":"","sources":["../../../src/cmd/upgrade/npm-availability.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"npm-availability.d.ts","sourceRoot":"","sources":["../../../src/cmd/upgrade/npm-availability.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH;;;GAGG;AACH,wBAAsB,gBAAgB,CACrC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACxC,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC/D;AAoCD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC5C,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9B,OAAO,CAAC,OAAO,CAAC,CAclB;AAED;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpF;AAED,MAAM,WAAW,iBAAiB;IACjC,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC3C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,OAAO,CAAC,CAsBlB;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,MAAM,WAAW,uBAAuB;IACvC,0FAA0F;IAC1F,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iEAAiE;IACjE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+CAA+C;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oFAAoF;IACpF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACrC,SAAS,EAAE,MAAM,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9D,OAAO,GAAE,uBAA4B,GACnC,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAoD/C"}
|