@agentuity/cli 1.0.36 → 1.0.37
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/sandbox/cp.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/cp.js +31 -0
- package/dist/cmd/cloud/sandbox/cp.js.map +1 -1
- package/dist/cmd/cloud/sandbox/exec.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/exec.js +44 -11
- package/dist/cmd/cloud/sandbox/exec.js.map +1 -1
- package/dist/cmd/cloud/task/get.d.ts.map +1 -1
- package/dist/cmd/cloud/task/get.js +58 -4
- package/dist/cmd/cloud/task/get.js.map +1 -1
- package/dist/cmd/cloud/task/util.d.ts +1 -0
- package/dist/cmd/cloud/task/util.d.ts.map +1 -1
- package/dist/cmd/cloud/task/util.js +13 -0
- package/dist/cmd/cloud/task/util.js.map +1 -1
- package/dist/cmd/coder/hub-url.d.ts +35 -0
- package/dist/cmd/coder/hub-url.d.ts.map +1 -0
- package/dist/cmd/coder/hub-url.js +101 -0
- package/dist/cmd/coder/hub-url.js.map +1 -0
- package/dist/cmd/coder/index.d.ts +2 -0
- package/dist/cmd/coder/index.d.ts.map +1 -0
- package/dist/cmd/coder/index.js +27 -0
- package/dist/cmd/coder/index.js.map +1 -0
- package/dist/cmd/coder/inspect.d.ts +2 -0
- package/dist/cmd/coder/inspect.d.ts.map +1 -0
- package/dist/cmd/coder/inspect.js +145 -0
- package/dist/cmd/coder/inspect.js.map +1 -0
- package/dist/cmd/coder/list.d.ts +2 -0
- package/dist/cmd/coder/list.d.ts.map +1 -0
- package/dist/cmd/coder/list.js +109 -0
- package/dist/cmd/coder/list.js.map +1 -0
- package/dist/cmd/coder/start.d.ts +2 -0
- package/dist/cmd/coder/start.d.ts.map +1 -0
- package/dist/cmd/coder/start.js +384 -0
- package/dist/cmd/coder/start.js.map +1 -0
- package/dist/cmd/dev/index.d.ts.map +1 -1
- package/dist/cmd/dev/index.js +4 -0
- package/dist/cmd/dev/index.js.map +1 -1
- package/dist/cmd/index.d.ts.map +1 -1
- package/dist/cmd/index.js +1 -0
- package/dist/cmd/index.js.map +1 -1
- package/package.json +6 -6
- package/src/cmd/cloud/sandbox/cp.ts +32 -0
- package/src/cmd/cloud/sandbox/exec.ts +62 -13
- package/src/cmd/cloud/task/get.ts +68 -4
- package/src/cmd/cloud/task/util.ts +18 -0
- package/src/cmd/coder/hub-url.ts +105 -0
- package/src/cmd/coder/index.ts +27 -0
- package/src/cmd/coder/inspect.ts +200 -0
- package/src/cmd/coder/list.ts +143 -0
- package/src/cmd/coder/start.ts +419 -0
- package/src/cmd/dev/index.ts +5 -0
- package/src/cmd/index.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cp.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/cp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cp.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/cp.ts"],"names":[],"mappings":"AAkDA,eAAO,MAAM,YAAY,sCA8FvB,CAAC;AA0aH,eAAe,YAAY,CAAC"}
|
|
@@ -26,6 +26,10 @@ const SandboxCpResponseSchema = z.object({
|
|
|
26
26
|
destination: z.string().describe('Destination path'),
|
|
27
27
|
bytesTransferred: z.number().describe('Number of bytes transferred'),
|
|
28
28
|
filesTransferred: z.number().describe('Number of files transferred'),
|
|
29
|
+
directoriesCreated: z
|
|
30
|
+
.array(z.string())
|
|
31
|
+
.optional()
|
|
32
|
+
.describe('Parent directories auto-created on the destination'),
|
|
29
33
|
});
|
|
30
34
|
export const cpSubcommand = createCommand({
|
|
31
35
|
name: 'cp',
|
|
@@ -105,6 +109,29 @@ function getAllFiles(dirPath, basePath = dirPath) {
|
|
|
105
109
|
}
|
|
106
110
|
return files;
|
|
107
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Computes the parent directories that would be auto-created by the server
|
|
114
|
+
* when writing files to the given paths. Filters out directories that always
|
|
115
|
+
* exist in a sandbox (/, /home, /home/agentuity).
|
|
116
|
+
*/
|
|
117
|
+
function getImplicitDirectories(filePaths) {
|
|
118
|
+
const dirs = new Set();
|
|
119
|
+
// Directories that always exist in a sandbox
|
|
120
|
+
const knownDirs = new Set(['/', '/home', '/home/agentuity']);
|
|
121
|
+
for (const filePath of filePaths) {
|
|
122
|
+
let dir = dirname(filePath);
|
|
123
|
+
while (dir && dir !== '.' && dir !== '/') {
|
|
124
|
+
if (!knownDirs.has(dir)) {
|
|
125
|
+
dirs.add(dir);
|
|
126
|
+
}
|
|
127
|
+
const parent = dirname(dir);
|
|
128
|
+
if (parent === dir)
|
|
129
|
+
break;
|
|
130
|
+
dir = parent;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return Array.from(dirs).sort();
|
|
134
|
+
}
|
|
108
135
|
async function uploadToSandbox(client, logger, orgId, sandboxId, localPath, remotePath, timeout, recursive, jsonOutput) {
|
|
109
136
|
const resolvedPath = resolve(localPath);
|
|
110
137
|
if (!(await Bun.file(resolvedPath).exists())) {
|
|
@@ -134,11 +161,13 @@ async function uploadSingleFile(client, _logger, orgId, sandboxId, resolvedPath,
|
|
|
134
161
|
if (!jsonOutput) {
|
|
135
162
|
tui.success(`Copied ${displayPath} → ${sandboxId}:${targetPath} (${buffer.length} bytes)`);
|
|
136
163
|
}
|
|
164
|
+
const implicitDirs = getImplicitDirectories([targetPath]);
|
|
137
165
|
return {
|
|
138
166
|
source: displayPath,
|
|
139
167
|
destination: `${sandboxId}:${targetPath}`,
|
|
140
168
|
bytesTransferred: buffer.length,
|
|
141
169
|
filesTransferred: 1,
|
|
170
|
+
directoriesCreated: implicitDirs.length > 0 ? implicitDirs : undefined,
|
|
142
171
|
};
|
|
143
172
|
}
|
|
144
173
|
async function uploadDirectory(client, logger, orgId, sandboxId, localDir, remotePath, _timeout, jsonOutput) {
|
|
@@ -163,11 +192,13 @@ async function uploadDirectory(client, logger, orgId, sandboxId, localDir, remot
|
|
|
163
192
|
if (!jsonOutput) {
|
|
164
193
|
tui.success(`Copied ${localDir} → ${sandboxId}:${baseRemotePath} (${allFiles.length} files, ${totalBytes} bytes)`);
|
|
165
194
|
}
|
|
195
|
+
const implicitDirs = getImplicitDirectories(files.map((f) => f.path));
|
|
166
196
|
return {
|
|
167
197
|
source: localDir,
|
|
168
198
|
destination: `${sandboxId}:${baseRemotePath}`,
|
|
169
199
|
bytesTransferred: totalBytes,
|
|
170
200
|
filesTransferred: allFiles.length,
|
|
201
|
+
directoriesCreated: implicitDirs.length > 0 ? implicitDirs : undefined,
|
|
171
202
|
};
|
|
172
203
|
}
|
|
173
204
|
async function downloadFromSandbox(client, logger, orgId, sandboxId, remotePath, localPath, timeout, recursive, jsonOutput) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cp.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/cp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cp.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/cp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/exec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/exec.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,cAAc,sCAiMzB,CAAC;AAwDH,eAAe,cAAc,CAAC"}
|
|
@@ -12,6 +12,14 @@ const SandboxExecResponseSchema = z.object({
|
|
|
12
12
|
status: z.string().describe('Execution status'),
|
|
13
13
|
exitCode: z.number().optional().describe('Exit code (if completed)'),
|
|
14
14
|
durationMs: z.number().optional().describe('Duration in milliseconds (if completed)'),
|
|
15
|
+
stdout: z
|
|
16
|
+
.string()
|
|
17
|
+
.optional()
|
|
18
|
+
.describe('Standard output (only when separate streams are available)'),
|
|
19
|
+
stderr: z
|
|
20
|
+
.string()
|
|
21
|
+
.optional()
|
|
22
|
+
.describe('Standard error output (only when separate streams are available)'),
|
|
15
23
|
output: z.string().optional().describe('Combined stdout/stderr output'),
|
|
16
24
|
});
|
|
17
25
|
export const execSubcommand = createCommand({
|
|
@@ -58,14 +66,6 @@ export const execSubcommand = createCommand({
|
|
|
58
66
|
};
|
|
59
67
|
process.on('SIGINT', handleSignal);
|
|
60
68
|
process.on('SIGTERM', handleSignal);
|
|
61
|
-
const outputChunks = [];
|
|
62
|
-
// For JSON output, capture to buffer; otherwise stream to process
|
|
63
|
-
const stdout = options.json
|
|
64
|
-
? createCaptureStream((chunk) => outputChunks.push(chunk))
|
|
65
|
-
: process.stdout;
|
|
66
|
-
const stderr = options.json
|
|
67
|
-
? createCaptureStream((chunk) => outputChunks.push(chunk))
|
|
68
|
-
: process.stderr;
|
|
69
69
|
try {
|
|
70
70
|
const execution = await sandboxExecute(client, {
|
|
71
71
|
sandboxId: args.sandboxId,
|
|
@@ -82,19 +82,48 @@ export const execSubcommand = createCommand({
|
|
|
82
82
|
const streamPromises = [];
|
|
83
83
|
// Check if stdout and stderr are the same stream (combined output)
|
|
84
84
|
const isCombinedOutput = stdoutStreamUrl && stderrStreamUrl && stdoutStreamUrl === stderrStreamUrl;
|
|
85
|
+
// Set up stream capture — in JSON mode, capture to buffers;
|
|
86
|
+
// when streams are separate, capture stdout/stderr independently
|
|
87
|
+
const outputChunks = [];
|
|
88
|
+
const stdoutChunks = [];
|
|
89
|
+
const stderrChunks = [];
|
|
90
|
+
let stdoutWritable;
|
|
91
|
+
let stderrWritable;
|
|
92
|
+
if (options.json) {
|
|
93
|
+
if (isCombinedOutput) {
|
|
94
|
+
// Combined stream: can't distinguish stdout from stderr
|
|
95
|
+
stdoutWritable = createCaptureStream((chunk) => outputChunks.push(chunk));
|
|
96
|
+
stderrWritable = createCaptureStream((chunk) => outputChunks.push(chunk));
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
// Separate streams: capture each independently and also to combined output
|
|
100
|
+
stdoutWritable = createCaptureStream((chunk) => {
|
|
101
|
+
stdoutChunks.push(chunk);
|
|
102
|
+
outputChunks.push(chunk);
|
|
103
|
+
});
|
|
104
|
+
stderrWritable = createCaptureStream((chunk) => {
|
|
105
|
+
stderrChunks.push(chunk);
|
|
106
|
+
outputChunks.push(chunk);
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
stdoutWritable = process.stdout;
|
|
112
|
+
stderrWritable = process.stderr;
|
|
113
|
+
}
|
|
85
114
|
if (isCombinedOutput) {
|
|
86
115
|
// Stream combined output to stdout only to avoid duplicates
|
|
87
116
|
logger.debug('using combined output stream (stdout === stderr): %s', stdoutStreamUrl);
|
|
88
|
-
streamPromises.push(streamUrlToWritable(stdoutStreamUrl,
|
|
117
|
+
streamPromises.push(streamUrlToWritable(stdoutStreamUrl, stdoutWritable, streamAbortController.signal, logger));
|
|
89
118
|
}
|
|
90
119
|
else {
|
|
91
120
|
if (stdoutStreamUrl) {
|
|
92
121
|
logger.debug('starting stdout stream from: %s', stdoutStreamUrl);
|
|
93
|
-
streamPromises.push(streamUrlToWritable(stdoutStreamUrl,
|
|
122
|
+
streamPromises.push(streamUrlToWritable(stdoutStreamUrl, stdoutWritable, streamAbortController.signal, logger));
|
|
94
123
|
}
|
|
95
124
|
if (stderrStreamUrl) {
|
|
96
125
|
logger.debug('starting stderr stream from: %s', stderrStreamUrl);
|
|
97
|
-
streamPromises.push(streamUrlToWritable(stderrStreamUrl,
|
|
126
|
+
streamPromises.push(streamUrlToWritable(stderrStreamUrl, stderrWritable, streamAbortController.signal, logger));
|
|
98
127
|
}
|
|
99
128
|
}
|
|
100
129
|
// Use server-side long-polling to wait for execution completion
|
|
@@ -120,6 +149,8 @@ export const execSubcommand = createCommand({
|
|
|
120
149
|
}
|
|
121
150
|
const duration = Date.now() - started;
|
|
122
151
|
const output = outputChunks.join('');
|
|
152
|
+
const stdoutOutput = !isCombinedOutput && stdoutStreamUrl ? stdoutChunks.join('') : undefined;
|
|
153
|
+
const stderrOutput = !isCombinedOutput && stderrStreamUrl ? stderrChunks.join('') : undefined;
|
|
123
154
|
if (!options.json) {
|
|
124
155
|
if (finalExecution.exitCode === 0) {
|
|
125
156
|
// no op
|
|
@@ -136,6 +167,8 @@ export const execSubcommand = createCommand({
|
|
|
136
167
|
status: finalExecution.status,
|
|
137
168
|
exitCode: finalExecution.exitCode,
|
|
138
169
|
durationMs: finalExecution.durationMs,
|
|
170
|
+
stdout: options.json ? stdoutOutput : undefined,
|
|
171
|
+
stderr: options.json ? stderrOutput : undefined,
|
|
139
172
|
output: options.json ? output : undefined,
|
|
140
173
|
};
|
|
141
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/exec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/sandbox/exec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/get.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/get.ts"],"names":[],"mappings":"AAwDA,eAAO,MAAM,aAAa,sCA0KxB,CAAC;AAEH,eAAe,aAAa,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { createCommand } from '../../../types';
|
|
3
3
|
import * as tui from '../../../tui';
|
|
4
|
-
import {
|
|
4
|
+
import { createStorageAdapterOptionalOrg, cacheTaskId } from './util';
|
|
5
5
|
import { getCommand } from '../../../command-prefix';
|
|
6
6
|
const EntityRefSchema = z
|
|
7
7
|
.object({
|
|
@@ -16,6 +16,14 @@ const UserEntityRefSchema = z
|
|
|
16
16
|
type: z.enum(['human', 'agent']).optional(),
|
|
17
17
|
})
|
|
18
18
|
.optional();
|
|
19
|
+
const SubtaskSchema = z.object({
|
|
20
|
+
id: z.string().describe('Subtask ID'),
|
|
21
|
+
title: z.string().describe('Subtask title'),
|
|
22
|
+
type: z.string().describe('Subtask type'),
|
|
23
|
+
status: z.string().describe('Subtask status'),
|
|
24
|
+
priority: z.string().describe('Subtask priority'),
|
|
25
|
+
assignee: UserEntityRefSchema.describe('Subtask assignee'),
|
|
26
|
+
});
|
|
19
27
|
const TaskGetResponseSchema = z.object({
|
|
20
28
|
success: z.boolean().describe('Whether the operation succeeded'),
|
|
21
29
|
task: z.object({
|
|
@@ -38,6 +46,7 @@ const TaskGetResponseSchema = z.object({
|
|
|
38
46
|
closed_date: z.string().optional().describe('Date task was closed'),
|
|
39
47
|
cancelled_date: z.string().optional().describe('Date task was cancelled'),
|
|
40
48
|
}),
|
|
49
|
+
subtasks: z.array(SubtaskSchema).optional().describe('Subtasks of this task'),
|
|
41
50
|
durationMs: z.number().describe('Operation duration in milliseconds'),
|
|
42
51
|
});
|
|
43
52
|
export const getSubcommand = createCommand({
|
|
@@ -56,23 +65,52 @@ export const getSubcommand = createCommand({
|
|
|
56
65
|
command: getCommand('cloud task get task_abc123 --json'),
|
|
57
66
|
description: 'Get task details as JSON',
|
|
58
67
|
},
|
|
68
|
+
{
|
|
69
|
+
command: getCommand('cloud task get task_abc123 --no-subtasks'),
|
|
70
|
+
description: 'Get task details without subtasks',
|
|
71
|
+
},
|
|
59
72
|
],
|
|
60
73
|
schema: {
|
|
61
74
|
args: z.object({
|
|
62
75
|
id: z.string().min(1).describe('the task ID to get'),
|
|
63
76
|
}),
|
|
77
|
+
options: z.object({
|
|
78
|
+
'no-subtasks': z.boolean().optional().describe('Do not show subtasks'),
|
|
79
|
+
}),
|
|
64
80
|
response: TaskGetResponseSchema,
|
|
65
81
|
},
|
|
66
82
|
async handler(ctx) {
|
|
67
|
-
const { args, options } = ctx;
|
|
83
|
+
const { args, opts, options } = ctx;
|
|
68
84
|
const started = Date.now();
|
|
69
|
-
const storage = await
|
|
85
|
+
const storage = await createStorageAdapterOptionalOrg(ctx);
|
|
70
86
|
const task = await storage.get(args.id);
|
|
71
|
-
const durationMs = Date.now() - started;
|
|
72
87
|
if (!task) {
|
|
73
88
|
tui.fatal(`Task not found: ${args.id}`);
|
|
74
89
|
}
|
|
75
90
|
await cacheTaskId(ctx, task.id);
|
|
91
|
+
// Fetch subtasks unless disabled
|
|
92
|
+
let subtasksList = [];
|
|
93
|
+
let subtasksError;
|
|
94
|
+
if (!opts['no-subtasks']) {
|
|
95
|
+
try {
|
|
96
|
+
const subtasksResult = await storage.list({ parent_id: task.id });
|
|
97
|
+
subtasksList = subtasksResult.tasks.map((st) => ({
|
|
98
|
+
id: st.id,
|
|
99
|
+
title: st.title,
|
|
100
|
+
type: st.type,
|
|
101
|
+
status: st.status,
|
|
102
|
+
priority: st.priority,
|
|
103
|
+
assignee: st.assignee,
|
|
104
|
+
}));
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
subtasksError = err instanceof Error ? err.message : 'Failed to fetch subtasks';
|
|
108
|
+
if (!options.json) {
|
|
109
|
+
tui.warn(`Could not load subtasks: ${subtasksError}`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
const durationMs = Date.now() - started;
|
|
76
114
|
if (!options.json) {
|
|
77
115
|
const tableData = {
|
|
78
116
|
ID: task.id,
|
|
@@ -119,6 +157,20 @@ export const getSubcommand = createCommand({
|
|
|
119
157
|
tui.header('Metadata');
|
|
120
158
|
tui.json(task.metadata);
|
|
121
159
|
}
|
|
160
|
+
// Show subtasks
|
|
161
|
+
if (subtasksList.length > 0) {
|
|
162
|
+
tui.newline();
|
|
163
|
+
tui.header('Subtasks');
|
|
164
|
+
const subtaskRows = subtasksList.map((st) => ({
|
|
165
|
+
ID: st.id,
|
|
166
|
+
Title: st.title,
|
|
167
|
+
Type: st.type,
|
|
168
|
+
Status: st.status,
|
|
169
|
+
Priority: st.priority,
|
|
170
|
+
Assignee: st.assignee?.name ?? 'Unassigned',
|
|
171
|
+
}));
|
|
172
|
+
tui.table(subtaskRows, ['ID', 'Title', 'Type', 'Status', 'Priority', 'Assignee']);
|
|
173
|
+
}
|
|
122
174
|
}
|
|
123
175
|
return {
|
|
124
176
|
success: true,
|
|
@@ -142,6 +194,8 @@ export const getSubcommand = createCommand({
|
|
|
142
194
|
closed_date: task.closed_date,
|
|
143
195
|
cancelled_date: task.cancelled_date,
|
|
144
196
|
},
|
|
197
|
+
subtasks: subtasksList.length > 0 ? subtasksList : undefined,
|
|
198
|
+
subtasksError,
|
|
145
199
|
durationMs,
|
|
146
200
|
};
|
|
147
201
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/get.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export interface TaskContext {
|
|
|
7
7
|
options: GlobalOptions;
|
|
8
8
|
}
|
|
9
9
|
export declare function createStorageAdapter(ctx: TaskContext): Promise<TaskStorageService>;
|
|
10
|
+
export declare function createStorageAdapterOptionalOrg(ctx: TaskContext): Promise<TaskStorageService>;
|
|
10
11
|
export declare function cacheTaskId(ctx: {
|
|
11
12
|
config: Config | null;
|
|
12
13
|
options: GlobalOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAMlE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEtE,MAAM,WAAW,WAAW;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,aAAa,CAAC;CACvB;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,+BAqB1D;AAED,wBAAsB,WAAW,CAChC,GAAG,EAAE;IACJ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,aAAa,CAAC;CACvB,EACD,MAAM,EAAE,MAAM,iBAOd;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAO9F"}
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAMlE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEtE,MAAM,WAAW,WAAW;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,aAAa,CAAC;CACvB;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,+BAqB1D;AAED,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,WAAW,+BAgBrE;AAED,wBAAsB,WAAW,CAChC,GAAG,EAAE;IACJ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,aAAa,CAAC;CACvB,EACD,MAAM,EAAE,MAAM,iBAOd;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAO9F"}
|
|
@@ -20,6 +20,19 @@ export async function createStorageAdapter(ctx) {
|
|
|
20
20
|
const baseUrl = getCatalystUrl(region, ctx.config?.overrides);
|
|
21
21
|
return new TaskStorageService(baseUrl, adapter);
|
|
22
22
|
}
|
|
23
|
+
export async function createStorageAdapterOptionalOrg(ctx) {
|
|
24
|
+
const orgId = ctx.options.orgId ?? (process.env.AGENTUITY_CLOUD_ORG_ID || ctx.config?.preferences?.orgId);
|
|
25
|
+
const headers = {
|
|
26
|
+
Authorization: `Bearer ${ctx.auth.apiKey}`,
|
|
27
|
+
};
|
|
28
|
+
if (orgId) {
|
|
29
|
+
headers['x-agentuity-orgid'] = orgId;
|
|
30
|
+
}
|
|
31
|
+
const adapter = createServerFetchAdapter({ headers }, ctx.logger);
|
|
32
|
+
const region = await getDefaultRegion(ctx.config?.name ?? defaultProfileName, ctx.config);
|
|
33
|
+
const baseUrl = getCatalystUrl(region, ctx.config?.overrides);
|
|
34
|
+
return new TaskStorageService(baseUrl, adapter);
|
|
35
|
+
}
|
|
23
36
|
export async function cacheTaskId(ctx, taskId) {
|
|
24
37
|
const profileName = ctx.config?.name ?? defaultProfileName;
|
|
25
38
|
const region = await getDefaultRegion(profileName, ctx.config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAUpC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAgB;IAC1D,MAAM,KAAK,GACV,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC7F,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,GAAG,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAC;IAC5F,CAAC;IAED,MAAM,OAAO,GAAG,wBAAwB,CACvC;QACC,OAAO,EAAE;YACR,aAAa,EAAE,UAAU,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;YAC1C,mBAAmB,EAAE,KAAK;SAC1B;KACD,EACD,GAAG,CAAC,MAAM,CACV,CAAC;IAEF,uEAAuE;IACvE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,IAAI,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC9D,OAAO,IAAI,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAChC,GAGC,EACD,MAAc;IAEd,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,IAAI,kBAAkB,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,KAAK,GACV,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC7F,MAAM,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAuB;IACxD,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,IAAI,CAAC;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACR,GAAG,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAC/C,CAAC;AACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/task/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Hub URL resolution for Coder CLI commands.
|
|
3
|
+
*
|
|
4
|
+
* Resolution priority:
|
|
5
|
+
* 1. --hub-url flag (explicit per-command override)
|
|
6
|
+
* 2. AGENTUITY_CODER_HUB_URL env var
|
|
7
|
+
* 3. AGENTUITY_DEVMODE_URL env var (dev tunnel URL)
|
|
8
|
+
*/
|
|
9
|
+
/**
|
|
10
|
+
* Resolve the Hub HTTP base URL for REST API calls.
|
|
11
|
+
* Converts ws:// URLs to http:// automatically.
|
|
12
|
+
*
|
|
13
|
+
* @param flagUrl Optional --hub-url flag value
|
|
14
|
+
* @returns HTTP base URL (e.g. "http://localhost:3500") or null if Hub is unreachable
|
|
15
|
+
*/
|
|
16
|
+
export declare function resolveHubUrl(flagUrl?: string): Promise<string | null>;
|
|
17
|
+
/**
|
|
18
|
+
* Resolve the Hub WebSocket URL for Pi extension connections.
|
|
19
|
+
* Converts http:// URLs to ws:// automatically and ensures /api/ws path.
|
|
20
|
+
*
|
|
21
|
+
* @param flagUrl Optional --hub-url flag value
|
|
22
|
+
* @returns WebSocket URL (e.g. "ws://127.0.0.1:3500/api/ws") or null
|
|
23
|
+
*/
|
|
24
|
+
export declare function resolveHubWsUrl(flagUrl?: string): Promise<string | null>;
|
|
25
|
+
/**
|
|
26
|
+
* Resolve the API key for Hub authentication.
|
|
27
|
+
* TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
|
|
28
|
+
*/
|
|
29
|
+
export declare function resolveApiKey(): string | null;
|
|
30
|
+
/**
|
|
31
|
+
* Build headers object with API key if available.
|
|
32
|
+
* TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
|
|
33
|
+
*/
|
|
34
|
+
export declare function hubFetchHeaders(extra?: Record<string, string>): Record<string, string>;
|
|
35
|
+
//# sourceMappingURL=hub-url.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Hub URL resolution for Coder CLI commands.
|
|
3
|
+
*
|
|
4
|
+
* Resolution priority:
|
|
5
|
+
* 1. --hub-url flag (explicit per-command override)
|
|
6
|
+
* 2. AGENTUITY_CODER_HUB_URL env var
|
|
7
|
+
* 3. AGENTUITY_DEVMODE_URL env var (dev tunnel URL)
|
|
8
|
+
*/
|
|
9
|
+
import { getVersion } from '../../version';
|
|
10
|
+
/**
|
|
11
|
+
* Resolve the Hub HTTP base URL for REST API calls.
|
|
12
|
+
* Converts ws:// URLs to http:// automatically.
|
|
13
|
+
*
|
|
14
|
+
* @param flagUrl Optional --hub-url flag value
|
|
15
|
+
* @returns HTTP base URL (e.g. "http://localhost:3500") or null if Hub is unreachable
|
|
16
|
+
*/
|
|
17
|
+
export async function resolveHubUrl(flagUrl) {
|
|
18
|
+
// 1. Explicit flag
|
|
19
|
+
if (flagUrl)
|
|
20
|
+
return normalizeToHttp(flagUrl);
|
|
21
|
+
// 2. Env var (explicit)
|
|
22
|
+
const envUrl = process.env.AGENTUITY_CODER_HUB_URL;
|
|
23
|
+
if (envUrl)
|
|
24
|
+
return normalizeToHttp(envUrl);
|
|
25
|
+
// 3. Dev mode URL (tunnel)
|
|
26
|
+
const devUrl = process.env.AGENTUITY_DEVMODE_URL;
|
|
27
|
+
if (devUrl)
|
|
28
|
+
return normalizeToHttp(devUrl);
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Resolve the Hub WebSocket URL for Pi extension connections.
|
|
33
|
+
* Converts http:// URLs to ws:// automatically and ensures /api/ws path.
|
|
34
|
+
*
|
|
35
|
+
* @param flagUrl Optional --hub-url flag value
|
|
36
|
+
* @returns WebSocket URL (e.g. "ws://127.0.0.1:3500/api/ws") or null
|
|
37
|
+
*/
|
|
38
|
+
export async function resolveHubWsUrl(flagUrl) {
|
|
39
|
+
const httpUrl = await resolveHubUrl(flagUrl);
|
|
40
|
+
if (!httpUrl)
|
|
41
|
+
return null;
|
|
42
|
+
return normalizeToWs(httpUrl);
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Convert any URL form to an HTTP base URL (strip paths, convert ws->http).
|
|
46
|
+
*/
|
|
47
|
+
function normalizeToHttp(url) {
|
|
48
|
+
let normalized = url.trim().replace(/\/+$/, '');
|
|
49
|
+
// ws:// -> http://
|
|
50
|
+
if (normalized.startsWith('ws://'))
|
|
51
|
+
normalized = 'http://' + normalized.slice(5);
|
|
52
|
+
else if (normalized.startsWith('wss://'))
|
|
53
|
+
normalized = 'https://' + normalized.slice(6);
|
|
54
|
+
// Strip /api/ws or /api/hub/* paths to get base URL
|
|
55
|
+
normalized = normalized.replace(/\/api\/ws\b.*$/, '');
|
|
56
|
+
normalized = normalized.replace(/\/api\/hub\b.*$/, '');
|
|
57
|
+
return normalized.replace(/\/+$/, '');
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Convert an HTTP base URL to a WebSocket URL with /api/ws path.
|
|
61
|
+
*/
|
|
62
|
+
function normalizeToWs(httpUrl) {
|
|
63
|
+
let wsUrl = httpUrl;
|
|
64
|
+
if (wsUrl.startsWith('http://'))
|
|
65
|
+
wsUrl = 'ws://' + wsUrl.slice(7);
|
|
66
|
+
else if (wsUrl.startsWith('https://'))
|
|
67
|
+
wsUrl = 'wss://' + wsUrl.slice(8);
|
|
68
|
+
try {
|
|
69
|
+
const parsed = new URL(wsUrl);
|
|
70
|
+
if (parsed.pathname !== '/api/ws') {
|
|
71
|
+
parsed.pathname = '/api/ws';
|
|
72
|
+
wsUrl = parsed.toString().replace(/\/$/, '');
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
catch {
|
|
76
|
+
if (!wsUrl.endsWith('/api/ws')) {
|
|
77
|
+
wsUrl = wsUrl.replace(/\/?$/, '/api/ws');
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return wsUrl;
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Resolve the API key for Hub authentication.
|
|
84
|
+
* TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
|
|
85
|
+
*/
|
|
86
|
+
export function resolveApiKey() {
|
|
87
|
+
return process.env.AGENTUITY_CODER_API_KEY || null;
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Build headers object with API key if available.
|
|
91
|
+
* TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
|
|
92
|
+
*/
|
|
93
|
+
export function hubFetchHeaders(extra) {
|
|
94
|
+
const headers = { ...extra };
|
|
95
|
+
headers['User-Agent'] = `Agentuity Coder/${getVersion()}`;
|
|
96
|
+
const apiKey = resolveApiKey();
|
|
97
|
+
if (apiKey)
|
|
98
|
+
headers['x-agentuity-auth-api-key'] = apiKey;
|
|
99
|
+
return headers;
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=hub-url.js.map
|