@moxxy/cli 0.14.0 → 0.14.2
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/bin.js +469 -349
- package/dist/bin.js.map +1 -1
- package/dist/sidecar.js +45 -1
- package/dist/sidecar.js.map +1 -1
- package/package.json +2 -2
package/dist/bin.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
|
-
import { z as z$1, createMutex, defineTunnelProvider, definePlugin, defineProvider, defineTool, MoxxyError, asTurnId, defineMode, asPluginId, defineCommand, defineChannel, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, defineSurface, runManualCompaction, isFileDiffDisplay, renderFrontmatter, defineEmbedder, migrateModeName, skillFrontmatterSchema, asSkillId,
|
|
3
|
+
import { z as z$1, createMutex, defineTunnelProvider, definePlugin, defineProvider, defineTool, MoxxyError, asTurnId, defineMode, asPluginId, defineCommand, defineChannel, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, defineSurface, runManualCompaction, isFileDiffDisplay, renderFrontmatter, defineEmbedder, migrateModeName, skillFrontmatterSchema, asSkillId, startChannelWith, parseFrontmatterFile, createDeferredPermissionResolver, getInstallHint, defineTranscriber, summarizeTokensByModel, countNodes, moxxyPackageSchema, encodeLoginPrompt, classifyNetworkError, addModelTotals, createJsonFileStore, ISOLATION_RANK, MOXXY_PCM16_24KHZ_MIME, fileDiffVerb, parseFrontmatter, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, isSafeViewUrl, evaluateToolRule, summarizeSessionTokensFromEvents, toDiffRows, diffGutterNo, computeElisionState, toolResultStubbed, toolResultStub, toolResultBytes, conversationalStubbed, conversationalStub, asEventId } from '@moxxy/sdk';
|
|
4
4
|
import * as fs32 from 'fs';
|
|
5
5
|
import fs32__default, { existsSync, promises, ReadStream, mkdirSync, statSync, readdirSync, writeFileSync, readFileSync, unlinkSync, chmodSync, watch, createReadStream } from 'fs';
|
|
6
6
|
import * as path3 from 'path';
|
|
7
|
-
import path3__default, { join, dirname, basename } from 'path';
|
|
7
|
+
import path3__default, { join, dirname, resolve, relative, isAbsolute, basename } from 'path';
|
|
8
8
|
import { isCliTunnelAvailable, writeFileAtomic, spawnCliTunnel, moxxyPath, moxxyHome, bearerTokenMatches, resolveChannelToken, rotateChannelToken, readRequestBody, MOXXY_WS_SUBPROTOCOL, bearerGuard, tokenFromWsProtocolHeader, writeFileAtomicSync } from '@moxxy/sdk/server';
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
import * as os5 from 'os';
|
|
@@ -892,7 +892,7 @@ async function* runTurn(session, prompt, opts = {}) {
|
|
|
892
892
|
yield queue.shift();
|
|
893
893
|
if (done)
|
|
894
894
|
break;
|
|
895
|
-
await new Promise((
|
|
895
|
+
await new Promise((resolve13) => waiters.push(resolve13));
|
|
896
896
|
}
|
|
897
897
|
} finally {
|
|
898
898
|
unsubscribe();
|
|
@@ -7322,8 +7322,8 @@ var require_jiti = __commonJS({
|
|
|
7322
7322
|
}
|
|
7323
7323
|
const He2 = /^[/\\]{2}/, ze2 = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/, Je2 = /^[A-Za-z]:$/, Ye2 = /.(\.[^./]+|\.)$/, pathe_M_eThtNZ_normalize = function(e5) {
|
|
7324
7324
|
if (0 === e5.length) return ".";
|
|
7325
|
-
const t4 = (e5 = pathe_M_eThtNZ_normalizeWindowsPath(e5)).match(He2), i3 =
|
|
7326
|
-
return 0 === (e5 = normalizeString(e5, !i3)).length ? i3 ? "/" : n3 ? "./" : "." : (n3 && (e5 += "/"), Je2.test(e5) && (e5 += "/"), t4 ? i3 ? `//${e5}` : `//./${e5}` : i3 && !
|
|
7325
|
+
const t4 = (e5 = pathe_M_eThtNZ_normalizeWindowsPath(e5)).match(He2), i3 = isAbsolute6(e5), n3 = "/" === e5[e5.length - 1];
|
|
7326
|
+
return 0 === (e5 = normalizeString(e5, !i3)).length ? i3 ? "/" : n3 ? "./" : "." : (n3 && (e5 += "/"), Je2.test(e5) && (e5 += "/"), t4 ? i3 ? `//${e5}` : `//./${e5}` : i3 && !isAbsolute6(e5) ? `/${e5}` : e5);
|
|
7327
7327
|
}, pathe_M_eThtNZ_join = function(...e5) {
|
|
7328
7328
|
let t4 = "";
|
|
7329
7329
|
for (const i3 of e5) if (i3) if (t4.length > 0) {
|
|
@@ -7339,9 +7339,9 @@ var require_jiti = __commonJS({
|
|
|
7339
7339
|
let t4 = "", i3 = false;
|
|
7340
7340
|
for (let n3 = (e5 = e5.map((e6) => pathe_M_eThtNZ_normalizeWindowsPath(e6))).length - 1; n3 >= -1 && !i3; n3--) {
|
|
7341
7341
|
const a3 = n3 >= 0 ? e5[n3] : pathe_M_eThtNZ_cwd();
|
|
7342
|
-
a3 && 0 !== a3.length && (t4 = `${a3}/${t4}`, i3 =
|
|
7342
|
+
a3 && 0 !== a3.length && (t4 = `${a3}/${t4}`, i3 = isAbsolute6(a3));
|
|
7343
7343
|
}
|
|
7344
|
-
return t4 = normalizeString(t4, !i3), i3 && !
|
|
7344
|
+
return t4 = normalizeString(t4, !i3), i3 && !isAbsolute6(t4) ? `/${t4}` : t4.length > 0 ? t4 : ".";
|
|
7345
7345
|
};
|
|
7346
7346
|
function normalizeString(e5, t4) {
|
|
7347
7347
|
let i3 = "", n3 = 0, a3 = -1, c3 = 0, l3 = null;
|
|
@@ -7372,7 +7372,7 @@ var require_jiti = __commonJS({
|
|
|
7372
7372
|
}
|
|
7373
7373
|
return i3;
|
|
7374
7374
|
}
|
|
7375
|
-
const
|
|
7375
|
+
const isAbsolute6 = function(e5) {
|
|
7376
7376
|
return ze2.test(e5);
|
|
7377
7377
|
}, extname2 = function(e5) {
|
|
7378
7378
|
if (".." === e5) return "";
|
|
@@ -7380,7 +7380,7 @@ var require_jiti = __commonJS({
|
|
|
7380
7380
|
return t4 && t4[1] || "";
|
|
7381
7381
|
}, pathe_M_eThtNZ_dirname = function(e5) {
|
|
7382
7382
|
const t4 = pathe_M_eThtNZ_normalizeWindowsPath(e5).replace(/\/$/, "").split("/").slice(0, -1);
|
|
7383
|
-
return 1 === t4.length && Je2.test(t4[0]) && (t4[0] += "/"), t4.join("/") || (
|
|
7383
|
+
return 1 === t4.length && Je2.test(t4[0]) && (t4[0] += "/"), t4.join("/") || (isAbsolute6(e5) ? "/" : ".");
|
|
7384
7384
|
}, basename8 = function(e5, t4) {
|
|
7385
7385
|
const i3 = pathe_M_eThtNZ_normalizeWindowsPath(e5).split("/");
|
|
7386
7386
|
let n3 = "";
|
|
@@ -7856,7 +7856,7 @@ Default "index" lookups for the main are deprecated for ES modules.`, "Deprecati
|
|
|
7856
7856
|
}
|
|
7857
7857
|
if (/(?:node|data|http|https):/.test(e5)) return e5;
|
|
7858
7858
|
if (st3.has(e5)) return "node:" + e5;
|
|
7859
|
-
if (e5.startsWith("file://") && (e5 = fileURLToPath10(e5)),
|
|
7859
|
+
if (e5.startsWith("file://") && (e5 = fileURLToPath10(e5)), isAbsolute6(e5)) try {
|
|
7860
7860
|
if ((0, $e2.statSync)(e5).isFile()) return pathToFileURL3(e5);
|
|
7861
7861
|
} catch (e6) {
|
|
7862
7862
|
if ("ENOENT" !== e6?.code) throw e6;
|
|
@@ -8093,7 +8093,7 @@ Default "index" lookups for the main are deprecated for ES modules.`, "Deprecati
|
|
|
8093
8093
|
}
|
|
8094
8094
|
function nativeImportOrRequire(e5, t4, i3) {
|
|
8095
8095
|
return i3 && e5.nativeImport ? e5.nativeImport((function(e6) {
|
|
8096
|
-
return ni &&
|
|
8096
|
+
return ni && isAbsolute6(e6) ? pathToFileURL3(e6) : e6;
|
|
8097
8097
|
})(t4)).then((t5) => jitiInteropDefault(e5, t5)) : jitiInteropDefault(e5, e5.nativeRequire(t4));
|
|
8098
8098
|
}
|
|
8099
8099
|
const Ti = "9";
|
|
@@ -21478,7 +21478,7 @@ function consumeBody() {
|
|
|
21478
21478
|
let accum = [];
|
|
21479
21479
|
let accumBytes = 0;
|
|
21480
21480
|
let abort2 = false;
|
|
21481
|
-
return new Body.Promise(function(
|
|
21481
|
+
return new Body.Promise(function(resolve13, reject) {
|
|
21482
21482
|
let resTimeout;
|
|
21483
21483
|
if (_this4.timeout) {
|
|
21484
21484
|
resTimeout = setTimeout(function() {
|
|
@@ -21512,7 +21512,7 @@ function consumeBody() {
|
|
|
21512
21512
|
}
|
|
21513
21513
|
clearTimeout(resTimeout);
|
|
21514
21514
|
try {
|
|
21515
|
-
|
|
21515
|
+
resolve13(Buffer.concat(accum, accumBytes));
|
|
21516
21516
|
} catch (err) {
|
|
21517
21517
|
reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, "system", err));
|
|
21518
21518
|
}
|
|
@@ -21775,7 +21775,7 @@ function fetch3(url2, opts) {
|
|
|
21775
21775
|
throw new Error("native promise missing, set fetch.Promise to your favorite alternative");
|
|
21776
21776
|
}
|
|
21777
21777
|
Body.Promise = fetch3.Promise;
|
|
21778
|
-
return new fetch3.Promise(function(
|
|
21778
|
+
return new fetch3.Promise(function(resolve13, reject) {
|
|
21779
21779
|
const request = new Request2(url2, opts);
|
|
21780
21780
|
const options = getNodeRequestOptions(request);
|
|
21781
21781
|
const send = (options.protocol === "https:" ? https : http).request;
|
|
@@ -21908,7 +21908,7 @@ function fetch3(url2, opts) {
|
|
|
21908
21908
|
requestOpts.body = void 0;
|
|
21909
21909
|
requestOpts.headers.delete("content-length");
|
|
21910
21910
|
}
|
|
21911
|
-
|
|
21911
|
+
resolve13(fetch3(new Request2(locationURL, requestOpts)));
|
|
21912
21912
|
finalize();
|
|
21913
21913
|
return;
|
|
21914
21914
|
}
|
|
@@ -21929,7 +21929,7 @@ function fetch3(url2, opts) {
|
|
|
21929
21929
|
const codings = headers.get("Content-Encoding");
|
|
21930
21930
|
if (!request.compress || request.method === "HEAD" || codings === null || res.statusCode === 204 || res.statusCode === 304) {
|
|
21931
21931
|
response = new Response3(body, response_options);
|
|
21932
|
-
|
|
21932
|
+
resolve13(response);
|
|
21933
21933
|
return;
|
|
21934
21934
|
}
|
|
21935
21935
|
const zlibOptions = {
|
|
@@ -21939,7 +21939,7 @@ function fetch3(url2, opts) {
|
|
|
21939
21939
|
if (codings == "gzip" || codings == "x-gzip") {
|
|
21940
21940
|
body = body.pipe(zlib.createGunzip(zlibOptions));
|
|
21941
21941
|
response = new Response3(body, response_options);
|
|
21942
|
-
|
|
21942
|
+
resolve13(response);
|
|
21943
21943
|
return;
|
|
21944
21944
|
}
|
|
21945
21945
|
if (codings == "deflate" || codings == "x-deflate") {
|
|
@@ -21951,12 +21951,12 @@ function fetch3(url2, opts) {
|
|
|
21951
21951
|
body = body.pipe(zlib.createInflateRaw());
|
|
21952
21952
|
}
|
|
21953
21953
|
response = new Response3(body, response_options);
|
|
21954
|
-
|
|
21954
|
+
resolve13(response);
|
|
21955
21955
|
});
|
|
21956
21956
|
raw.on("end", function() {
|
|
21957
21957
|
if (!response) {
|
|
21958
21958
|
response = new Response3(body, response_options);
|
|
21959
|
-
|
|
21959
|
+
resolve13(response);
|
|
21960
21960
|
}
|
|
21961
21961
|
});
|
|
21962
21962
|
return;
|
|
@@ -21964,11 +21964,11 @@ function fetch3(url2, opts) {
|
|
|
21964
21964
|
if (codings == "br" && typeof zlib.createBrotliDecompress === "function") {
|
|
21965
21965
|
body = body.pipe(zlib.createBrotliDecompress());
|
|
21966
21966
|
response = new Response3(body, response_options);
|
|
21967
|
-
|
|
21967
|
+
resolve13(response);
|
|
21968
21968
|
return;
|
|
21969
21969
|
}
|
|
21970
21970
|
response = new Response3(body, response_options);
|
|
21971
|
-
|
|
21971
|
+
resolve13(response);
|
|
21972
21972
|
});
|
|
21973
21973
|
writeToStream(req, request);
|
|
21974
21974
|
});
|
|
@@ -35487,7 +35487,7 @@ var require_frameworks = __commonJS({
|
|
|
35487
35487
|
end: () => resolveResponse({ status: 204 }),
|
|
35488
35488
|
respond: (json) => resolveResponse({ jsonBody: json }),
|
|
35489
35489
|
unauthorized: () => resolveResponse({ status: 401, body: WRONG_TOKEN_ERROR }),
|
|
35490
|
-
handlerReturn: new Promise((
|
|
35490
|
+
handlerReturn: new Promise((resolve13) => resolveResponse = resolve13)
|
|
35491
35491
|
};
|
|
35492
35492
|
};
|
|
35493
35493
|
var bun = (request) => {
|
|
@@ -35511,8 +35511,8 @@ var require_frameworks = __commonJS({
|
|
|
35511
35511
|
};
|
|
35512
35512
|
var cloudflare = (event) => {
|
|
35513
35513
|
let resolveResponse;
|
|
35514
|
-
event.respondWith(new Promise((
|
|
35515
|
-
resolveResponse =
|
|
35514
|
+
event.respondWith(new Promise((resolve13) => {
|
|
35515
|
+
resolveResponse = resolve13;
|
|
35516
35516
|
}));
|
|
35517
35517
|
return {
|
|
35518
35518
|
get update() {
|
|
@@ -35596,12 +35596,12 @@ var require_frameworks = __commonJS({
|
|
|
35596
35596
|
const secretHeaderFromRequest = req.headers[SECRET_HEADER_LOWERCASE];
|
|
35597
35597
|
return {
|
|
35598
35598
|
get update() {
|
|
35599
|
-
return new Promise((
|
|
35599
|
+
return new Promise((resolve13, reject) => {
|
|
35600
35600
|
const chunks = [];
|
|
35601
35601
|
req.on("data", (chunk) => chunks.push(chunk)).once("end", () => {
|
|
35602
35602
|
const raw = Buffer.concat(chunks).toString("utf-8");
|
|
35603
35603
|
try {
|
|
35604
|
-
|
|
35604
|
+
resolve13(JSON.parse(raw));
|
|
35605
35605
|
} catch (err) {
|
|
35606
35606
|
reject(err);
|
|
35607
35607
|
}
|
|
@@ -35851,7 +35851,7 @@ var require_webhook = __commonJS({
|
|
|
35851
35851
|
function timeoutIfNecessary(task, onTimeout, timeout) {
|
|
35852
35852
|
if (timeout === Infinity)
|
|
35853
35853
|
return task;
|
|
35854
|
-
return new Promise((
|
|
35854
|
+
return new Promise((resolve13, reject) => {
|
|
35855
35855
|
const handle2 = setTimeout(() => {
|
|
35856
35856
|
debugErr(`Request timed out after ${timeout} ms`);
|
|
35857
35857
|
if (onTimeout === "throw") {
|
|
@@ -35859,7 +35859,7 @@ var require_webhook = __commonJS({
|
|
|
35859
35859
|
} else {
|
|
35860
35860
|
if (typeof onTimeout === "function")
|
|
35861
35861
|
onTimeout();
|
|
35862
|
-
|
|
35862
|
+
resolve13();
|
|
35863
35863
|
}
|
|
35864
35864
|
const now = Date.now();
|
|
35865
35865
|
task.finally(() => {
|
|
@@ -35867,7 +35867,7 @@ var require_webhook = __commonJS({
|
|
|
35867
35867
|
debugErr(`Request completed ${diff2} ms after timeout!`);
|
|
35868
35868
|
});
|
|
35869
35869
|
}, timeout);
|
|
35870
|
-
task.then(
|
|
35870
|
+
task.then(resolve13).catch(reject).finally(() => clearTimeout(handle2));
|
|
35871
35871
|
});
|
|
35872
35872
|
}
|
|
35873
35873
|
}
|
|
@@ -38478,7 +38478,7 @@ var init_protocol = __esm({
|
|
|
38478
38478
|
return;
|
|
38479
38479
|
}
|
|
38480
38480
|
const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
|
|
38481
|
-
await new Promise((
|
|
38481
|
+
await new Promise((resolve13) => setTimeout(resolve13, pollInterval));
|
|
38482
38482
|
options?.signal?.throwIfAborted();
|
|
38483
38483
|
}
|
|
38484
38484
|
} catch (error2) {
|
|
@@ -38495,7 +38495,7 @@ var init_protocol = __esm({
|
|
|
38495
38495
|
*/
|
|
38496
38496
|
request(request, resultSchema, options) {
|
|
38497
38497
|
const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
|
|
38498
|
-
return new Promise((
|
|
38498
|
+
return new Promise((resolve13, reject) => {
|
|
38499
38499
|
const earlyReject = (error2) => {
|
|
38500
38500
|
reject(error2);
|
|
38501
38501
|
};
|
|
@@ -38573,7 +38573,7 @@ var init_protocol = __esm({
|
|
|
38573
38573
|
if (!parseResult.success) {
|
|
38574
38574
|
reject(parseResult.error);
|
|
38575
38575
|
} else {
|
|
38576
|
-
|
|
38576
|
+
resolve13(parseResult.data);
|
|
38577
38577
|
}
|
|
38578
38578
|
} catch (error2) {
|
|
38579
38579
|
reject(error2);
|
|
@@ -38834,12 +38834,12 @@ var init_protocol = __esm({
|
|
|
38834
38834
|
}
|
|
38835
38835
|
} catch {
|
|
38836
38836
|
}
|
|
38837
|
-
return new Promise((
|
|
38837
|
+
return new Promise((resolve13, reject) => {
|
|
38838
38838
|
if (signal.aborted) {
|
|
38839
38839
|
reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
|
|
38840
38840
|
return;
|
|
38841
38841
|
}
|
|
38842
|
-
const timeoutId = setTimeout(
|
|
38842
|
+
const timeoutId = setTimeout(resolve13, interval);
|
|
38843
38843
|
signal.addEventListener("abort", () => {
|
|
38844
38844
|
clearTimeout(timeoutId);
|
|
38845
38845
|
reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
|
|
@@ -41844,7 +41844,7 @@ var require_compile = __commonJS({
|
|
|
41844
41844
|
const schOrFunc = root.refs[ref];
|
|
41845
41845
|
if (schOrFunc)
|
|
41846
41846
|
return schOrFunc;
|
|
41847
|
-
let _sch =
|
|
41847
|
+
let _sch = resolve13.call(this, root, ref);
|
|
41848
41848
|
if (_sch === void 0) {
|
|
41849
41849
|
const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
|
|
41850
41850
|
const { schemaId } = this.opts;
|
|
@@ -41871,7 +41871,7 @@ var require_compile = __commonJS({
|
|
|
41871
41871
|
function sameSchemaEnv(s1, s2) {
|
|
41872
41872
|
return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
|
|
41873
41873
|
}
|
|
41874
|
-
function
|
|
41874
|
+
function resolve13(root, ref) {
|
|
41875
41875
|
let sch;
|
|
41876
41876
|
while (typeof (sch = this.refs[ref]) == "string")
|
|
41877
41877
|
ref = sch;
|
|
@@ -42499,55 +42499,55 @@ var require_fast_uri = __commonJS({
|
|
|
42499
42499
|
}
|
|
42500
42500
|
return uri;
|
|
42501
42501
|
}
|
|
42502
|
-
function
|
|
42502
|
+
function resolve13(baseURI, relativeURI, options) {
|
|
42503
42503
|
const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
|
|
42504
42504
|
const resolved = resolveComponent(parse2(baseURI, schemelessOptions), parse2(relativeURI, schemelessOptions), schemelessOptions, true);
|
|
42505
42505
|
schemelessOptions.skipEscape = true;
|
|
42506
42506
|
return serialize(resolved, schemelessOptions);
|
|
42507
42507
|
}
|
|
42508
|
-
function resolveComponent(base2,
|
|
42508
|
+
function resolveComponent(base2, relative6, options, skipNormalization) {
|
|
42509
42509
|
const target = {};
|
|
42510
42510
|
if (!skipNormalization) {
|
|
42511
42511
|
base2 = parse2(serialize(base2, options), options);
|
|
42512
|
-
|
|
42512
|
+
relative6 = parse2(serialize(relative6, options), options);
|
|
42513
42513
|
}
|
|
42514
42514
|
options = options || {};
|
|
42515
|
-
if (!options.tolerant &&
|
|
42516
|
-
target.scheme =
|
|
42517
|
-
target.userinfo =
|
|
42518
|
-
target.host =
|
|
42519
|
-
target.port =
|
|
42520
|
-
target.path = removeDotSegments(
|
|
42521
|
-
target.query =
|
|
42515
|
+
if (!options.tolerant && relative6.scheme) {
|
|
42516
|
+
target.scheme = relative6.scheme;
|
|
42517
|
+
target.userinfo = relative6.userinfo;
|
|
42518
|
+
target.host = relative6.host;
|
|
42519
|
+
target.port = relative6.port;
|
|
42520
|
+
target.path = removeDotSegments(relative6.path || "");
|
|
42521
|
+
target.query = relative6.query;
|
|
42522
42522
|
} else {
|
|
42523
|
-
if (
|
|
42524
|
-
target.userinfo =
|
|
42525
|
-
target.host =
|
|
42526
|
-
target.port =
|
|
42527
|
-
target.path = removeDotSegments(
|
|
42528
|
-
target.query =
|
|
42523
|
+
if (relative6.userinfo !== void 0 || relative6.host !== void 0 || relative6.port !== void 0) {
|
|
42524
|
+
target.userinfo = relative6.userinfo;
|
|
42525
|
+
target.host = relative6.host;
|
|
42526
|
+
target.port = relative6.port;
|
|
42527
|
+
target.path = removeDotSegments(relative6.path || "");
|
|
42528
|
+
target.query = relative6.query;
|
|
42529
42529
|
} else {
|
|
42530
|
-
if (!
|
|
42530
|
+
if (!relative6.path) {
|
|
42531
42531
|
target.path = base2.path;
|
|
42532
|
-
if (
|
|
42533
|
-
target.query =
|
|
42532
|
+
if (relative6.query !== void 0) {
|
|
42533
|
+
target.query = relative6.query;
|
|
42534
42534
|
} else {
|
|
42535
42535
|
target.query = base2.query;
|
|
42536
42536
|
}
|
|
42537
42537
|
} else {
|
|
42538
|
-
if (
|
|
42539
|
-
target.path = removeDotSegments(
|
|
42538
|
+
if (relative6.path[0] === "/") {
|
|
42539
|
+
target.path = removeDotSegments(relative6.path);
|
|
42540
42540
|
} else {
|
|
42541
42541
|
if ((base2.userinfo !== void 0 || base2.host !== void 0 || base2.port !== void 0) && !base2.path) {
|
|
42542
|
-
target.path = "/" +
|
|
42542
|
+
target.path = "/" + relative6.path;
|
|
42543
42543
|
} else if (!base2.path) {
|
|
42544
|
-
target.path =
|
|
42544
|
+
target.path = relative6.path;
|
|
42545
42545
|
} else {
|
|
42546
|
-
target.path = base2.path.slice(0, base2.path.lastIndexOf("/") + 1) +
|
|
42546
|
+
target.path = base2.path.slice(0, base2.path.lastIndexOf("/") + 1) + relative6.path;
|
|
42547
42547
|
}
|
|
42548
42548
|
target.path = removeDotSegments(target.path);
|
|
42549
42549
|
}
|
|
42550
|
-
target.query =
|
|
42550
|
+
target.query = relative6.query;
|
|
42551
42551
|
}
|
|
42552
42552
|
target.userinfo = base2.userinfo;
|
|
42553
42553
|
target.host = base2.host;
|
|
@@ -42555,7 +42555,7 @@ var require_fast_uri = __commonJS({
|
|
|
42555
42555
|
}
|
|
42556
42556
|
target.scheme = base2.scheme;
|
|
42557
42557
|
}
|
|
42558
|
-
target.fragment =
|
|
42558
|
+
target.fragment = relative6.fragment;
|
|
42559
42559
|
return target;
|
|
42560
42560
|
}
|
|
42561
42561
|
function equal(uriA, uriB, options) {
|
|
@@ -42757,7 +42757,7 @@ var require_fast_uri = __commonJS({
|
|
|
42757
42757
|
var fastUri = {
|
|
42758
42758
|
SCHEMES,
|
|
42759
42759
|
normalize: normalize4,
|
|
42760
|
-
resolve:
|
|
42760
|
+
resolve: resolve13,
|
|
42761
42761
|
resolveComponent,
|
|
42762
42762
|
equal,
|
|
42763
42763
|
serialize,
|
|
@@ -46587,12 +46587,12 @@ var require_isexe = __commonJS({
|
|
|
46587
46587
|
if (typeof Promise !== "function") {
|
|
46588
46588
|
throw new TypeError("callback not provided");
|
|
46589
46589
|
}
|
|
46590
|
-
return new Promise(function(
|
|
46590
|
+
return new Promise(function(resolve13, reject) {
|
|
46591
46591
|
isexe(path62, options || {}, function(er2, is) {
|
|
46592
46592
|
if (er2) {
|
|
46593
46593
|
reject(er2);
|
|
46594
46594
|
} else {
|
|
46595
|
-
|
|
46595
|
+
resolve13(is);
|
|
46596
46596
|
}
|
|
46597
46597
|
});
|
|
46598
46598
|
});
|
|
@@ -46658,27 +46658,27 @@ var require_which = __commonJS({
|
|
|
46658
46658
|
opt = {};
|
|
46659
46659
|
const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
|
|
46660
46660
|
const found = [];
|
|
46661
|
-
const step = (i2) => new Promise((
|
|
46661
|
+
const step = (i2) => new Promise((resolve13, reject) => {
|
|
46662
46662
|
if (i2 === pathEnv.length)
|
|
46663
|
-
return opt.all && found.length ?
|
|
46663
|
+
return opt.all && found.length ? resolve13(found) : reject(getNotFoundError(cmd));
|
|
46664
46664
|
const ppRaw = pathEnv[i2];
|
|
46665
46665
|
const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
|
|
46666
46666
|
const pCmd = path62.join(pathPart, cmd);
|
|
46667
46667
|
const p3 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
|
|
46668
|
-
|
|
46668
|
+
resolve13(subStep(p3, i2, 0));
|
|
46669
46669
|
});
|
|
46670
|
-
const subStep = (p3, i2, ii) => new Promise((
|
|
46670
|
+
const subStep = (p3, i2, ii) => new Promise((resolve13, reject) => {
|
|
46671
46671
|
if (ii === pathExt.length)
|
|
46672
|
-
return
|
|
46672
|
+
return resolve13(step(i2 + 1));
|
|
46673
46673
|
const ext = pathExt[ii];
|
|
46674
46674
|
isexe(p3 + ext, { pathExt: pathExtExe }, (er2, is) => {
|
|
46675
46675
|
if (!er2 && is) {
|
|
46676
46676
|
if (opt.all)
|
|
46677
46677
|
found.push(p3 + ext);
|
|
46678
46678
|
else
|
|
46679
|
-
return
|
|
46679
|
+
return resolve13(p3 + ext);
|
|
46680
46680
|
}
|
|
46681
|
-
return
|
|
46681
|
+
return resolve13(subStep(p3, i2, ii + 1));
|
|
46682
46682
|
});
|
|
46683
46683
|
});
|
|
46684
46684
|
return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
|
|
@@ -47074,7 +47074,7 @@ var init_stdio2 = __esm({
|
|
|
47074
47074
|
if (this._process) {
|
|
47075
47075
|
throw new Error("StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.");
|
|
47076
47076
|
}
|
|
47077
|
-
return new Promise((
|
|
47077
|
+
return new Promise((resolve13, reject) => {
|
|
47078
47078
|
this._process = (0, import_cross_spawn.default)(this._serverParams.command, this._serverParams.args ?? [], {
|
|
47079
47079
|
// merge default env with server env because mcp server needs some env vars
|
|
47080
47080
|
env: {
|
|
@@ -47091,7 +47091,7 @@ var init_stdio2 = __esm({
|
|
|
47091
47091
|
this.onerror?.(error2);
|
|
47092
47092
|
});
|
|
47093
47093
|
this._process.on("spawn", () => {
|
|
47094
|
-
|
|
47094
|
+
resolve13();
|
|
47095
47095
|
});
|
|
47096
47096
|
this._process.on("close", (_code) => {
|
|
47097
47097
|
this._process = void 0;
|
|
@@ -47150,22 +47150,22 @@ var init_stdio2 = __esm({
|
|
|
47150
47150
|
if (this._process) {
|
|
47151
47151
|
const processToClose = this._process;
|
|
47152
47152
|
this._process = void 0;
|
|
47153
|
-
const closePromise = new Promise((
|
|
47153
|
+
const closePromise = new Promise((resolve13) => {
|
|
47154
47154
|
processToClose.once("close", () => {
|
|
47155
|
-
|
|
47155
|
+
resolve13();
|
|
47156
47156
|
});
|
|
47157
47157
|
});
|
|
47158
47158
|
try {
|
|
47159
47159
|
processToClose.stdin?.end();
|
|
47160
47160
|
} catch {
|
|
47161
47161
|
}
|
|
47162
|
-
await Promise.race([closePromise, new Promise((
|
|
47162
|
+
await Promise.race([closePromise, new Promise((resolve13) => setTimeout(resolve13, 2e3).unref())]);
|
|
47163
47163
|
if (processToClose.exitCode === null) {
|
|
47164
47164
|
try {
|
|
47165
47165
|
processToClose.kill("SIGTERM");
|
|
47166
47166
|
} catch {
|
|
47167
47167
|
}
|
|
47168
|
-
await Promise.race([closePromise, new Promise((
|
|
47168
|
+
await Promise.race([closePromise, new Promise((resolve13) => setTimeout(resolve13, 2e3).unref())]);
|
|
47169
47169
|
}
|
|
47170
47170
|
if (processToClose.exitCode === null) {
|
|
47171
47171
|
try {
|
|
@@ -47177,15 +47177,15 @@ var init_stdio2 = __esm({
|
|
|
47177
47177
|
this._readBuffer.clear();
|
|
47178
47178
|
}
|
|
47179
47179
|
send(message) {
|
|
47180
|
-
return new Promise((
|
|
47180
|
+
return new Promise((resolve13) => {
|
|
47181
47181
|
if (!this._process?.stdin) {
|
|
47182
47182
|
throw new Error("Not connected");
|
|
47183
47183
|
}
|
|
47184
47184
|
const json = serializeMessage(message);
|
|
47185
47185
|
if (this._process.stdin.write(json)) {
|
|
47186
|
-
|
|
47186
|
+
resolve13();
|
|
47187
47187
|
} else {
|
|
47188
|
-
this._process.stdin.once("drain",
|
|
47188
|
+
this._process.stdin.once("drain", resolve13);
|
|
47189
47189
|
}
|
|
47190
47190
|
});
|
|
47191
47191
|
}
|
|
@@ -48614,7 +48614,7 @@ var init_sse = __esm({
|
|
|
48614
48614
|
}
|
|
48615
48615
|
_startOrAuth() {
|
|
48616
48616
|
const fetchImpl2 = this?._eventSourceInit?.fetch ?? this._fetch ?? fetch;
|
|
48617
|
-
return new Promise((
|
|
48617
|
+
return new Promise((resolve13, reject) => {
|
|
48618
48618
|
this._eventSource = new EventSource(this._url.href, {
|
|
48619
48619
|
...this._eventSourceInit,
|
|
48620
48620
|
fetch: async (url2, init3) => {
|
|
@@ -48635,7 +48635,7 @@ var init_sse = __esm({
|
|
|
48635
48635
|
this._abortController = new AbortController();
|
|
48636
48636
|
this._eventSource.onerror = (event) => {
|
|
48637
48637
|
if (event.code === 401 && this._authProvider) {
|
|
48638
|
-
this._authThenStart().then(
|
|
48638
|
+
this._authThenStart().then(resolve13, reject);
|
|
48639
48639
|
return;
|
|
48640
48640
|
}
|
|
48641
48641
|
const error2 = new SseError(event.code, event.message, event);
|
|
@@ -48657,7 +48657,7 @@ var init_sse = __esm({
|
|
|
48657
48657
|
void this.close();
|
|
48658
48658
|
return;
|
|
48659
48659
|
}
|
|
48660
|
-
|
|
48660
|
+
resolve13();
|
|
48661
48661
|
});
|
|
48662
48662
|
this._eventSource.onmessage = (event) => {
|
|
48663
48663
|
const messageEvent = event;
|
|
@@ -49258,7 +49258,7 @@ var init_types2 = __esm({
|
|
|
49258
49258
|
}
|
|
49259
49259
|
});
|
|
49260
49260
|
async function runMcpCallWithFallback(callPromise, signal, toolName) {
|
|
49261
|
-
return await new Promise((
|
|
49261
|
+
return await new Promise((resolve13, reject) => {
|
|
49262
49262
|
let settled = false;
|
|
49263
49263
|
const settle = (fn) => {
|
|
49264
49264
|
if (settled)
|
|
@@ -49275,7 +49275,7 @@ async function runMcpCallWithFallback(callPromise, signal, toolName) {
|
|
|
49275
49275
|
settle(() => reject(new Error(`MCP tool "${toolName}" timed out after ${MCP_CALL_TIMEOUT_MS}ms`)));
|
|
49276
49276
|
}, MCP_CALL_TIMEOUT_MS);
|
|
49277
49277
|
signal.addEventListener("abort", onAbort, { once: true });
|
|
49278
|
-
callPromise.then((v3) => settle(() =>
|
|
49278
|
+
callPromise.then((v3) => settle(() => resolve13(v3)), (err) => settle(() => reject(err instanceof Error ? err : new Error(String(err)))));
|
|
49279
49279
|
});
|
|
49280
49280
|
}
|
|
49281
49281
|
async function wrapMcpServerTools(opts) {
|
|
@@ -52018,14 +52018,14 @@ var require_react_development = __commonJS({
|
|
|
52018
52018
|
var thenableResult = result;
|
|
52019
52019
|
var wasAwaited = false;
|
|
52020
52020
|
var thenable = {
|
|
52021
|
-
then: function(
|
|
52021
|
+
then: function(resolve13, reject) {
|
|
52022
52022
|
wasAwaited = true;
|
|
52023
52023
|
thenableResult.then(function(returnValue2) {
|
|
52024
52024
|
popActScope(prevActScopeDepth);
|
|
52025
52025
|
if (actScopeDepth === 0) {
|
|
52026
|
-
recursivelyFlushAsyncActWork(returnValue2,
|
|
52026
|
+
recursivelyFlushAsyncActWork(returnValue2, resolve13, reject);
|
|
52027
52027
|
} else {
|
|
52028
|
-
|
|
52028
|
+
resolve13(returnValue2);
|
|
52029
52029
|
}
|
|
52030
52030
|
}, function(error3) {
|
|
52031
52031
|
popActScope(prevActScopeDepth);
|
|
@@ -52055,20 +52055,20 @@ var require_react_development = __commonJS({
|
|
|
52055
52055
|
ReactCurrentActQueue.current = null;
|
|
52056
52056
|
}
|
|
52057
52057
|
var _thenable = {
|
|
52058
|
-
then: function(
|
|
52058
|
+
then: function(resolve13, reject) {
|
|
52059
52059
|
if (ReactCurrentActQueue.current === null) {
|
|
52060
52060
|
ReactCurrentActQueue.current = [];
|
|
52061
|
-
recursivelyFlushAsyncActWork(returnValue,
|
|
52061
|
+
recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
|
|
52062
52062
|
} else {
|
|
52063
|
-
|
|
52063
|
+
resolve13(returnValue);
|
|
52064
52064
|
}
|
|
52065
52065
|
}
|
|
52066
52066
|
};
|
|
52067
52067
|
return _thenable;
|
|
52068
52068
|
} else {
|
|
52069
52069
|
var _thenable2 = {
|
|
52070
|
-
then: function(
|
|
52071
|
-
|
|
52070
|
+
then: function(resolve13, reject) {
|
|
52071
|
+
resolve13(returnValue);
|
|
52072
52072
|
}
|
|
52073
52073
|
};
|
|
52074
52074
|
return _thenable2;
|
|
@@ -52084,7 +52084,7 @@ var require_react_development = __commonJS({
|
|
|
52084
52084
|
actScopeDepth = prevActScopeDepth;
|
|
52085
52085
|
}
|
|
52086
52086
|
}
|
|
52087
|
-
function recursivelyFlushAsyncActWork(returnValue,
|
|
52087
|
+
function recursivelyFlushAsyncActWork(returnValue, resolve13, reject) {
|
|
52088
52088
|
{
|
|
52089
52089
|
var queue = ReactCurrentActQueue.current;
|
|
52090
52090
|
if (queue !== null) {
|
|
@@ -52093,16 +52093,16 @@ var require_react_development = __commonJS({
|
|
|
52093
52093
|
enqueueTask(function() {
|
|
52094
52094
|
if (queue.length === 0) {
|
|
52095
52095
|
ReactCurrentActQueue.current = null;
|
|
52096
|
-
|
|
52096
|
+
resolve13(returnValue);
|
|
52097
52097
|
} else {
|
|
52098
|
-
recursivelyFlushAsyncActWork(returnValue,
|
|
52098
|
+
recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
|
|
52099
52099
|
}
|
|
52100
52100
|
});
|
|
52101
52101
|
} catch (error3) {
|
|
52102
52102
|
reject(error3);
|
|
52103
52103
|
}
|
|
52104
52104
|
} else {
|
|
52105
|
-
|
|
52105
|
+
resolve13(returnValue);
|
|
52106
52106
|
}
|
|
52107
52107
|
}
|
|
52108
52108
|
}
|
|
@@ -82777,8 +82777,8 @@ var init_ink = __esm({
|
|
|
82777
82777
|
}
|
|
82778
82778
|
}
|
|
82779
82779
|
async waitUntilExit() {
|
|
82780
|
-
this.exitPromise ||= new Promise((
|
|
82781
|
-
this.resolveExitPromise =
|
|
82780
|
+
this.exitPromise ||= new Promise((resolve13, reject) => {
|
|
82781
|
+
this.resolveExitPromise = resolve13;
|
|
82782
82782
|
this.rejectExitPromise = reject;
|
|
82783
82783
|
});
|
|
82784
82784
|
return this.exitPromise;
|
|
@@ -87498,14 +87498,14 @@ function usePermissionQueue(session, registerInteractiveResolver) {
|
|
|
87498
87498
|
if (yoloRef.current) {
|
|
87499
87499
|
return { mode: "allow", reason: "yolo mode" };
|
|
87500
87500
|
}
|
|
87501
|
-
return new Promise((
|
|
87502
|
-
setPendingPermissions((prev) => [...prev, { call, ctx, resolve:
|
|
87501
|
+
return new Promise((resolve13) => {
|
|
87502
|
+
setPendingPermissions((prev) => [...prev, { call, ctx, resolve: resolve13 }]);
|
|
87503
87503
|
});
|
|
87504
87504
|
});
|
|
87505
87505
|
session.setApprovalResolver({
|
|
87506
87506
|
name: "tui-approval",
|
|
87507
|
-
confirm: (request) => new Promise((
|
|
87508
|
-
setPendingApproval({ request, resolve:
|
|
87507
|
+
confirm: (request) => new Promise((resolve13) => {
|
|
87508
|
+
setPendingApproval({ request, resolve: resolve13 });
|
|
87509
87509
|
})
|
|
87510
87510
|
});
|
|
87511
87511
|
return () => {
|
|
@@ -87588,14 +87588,14 @@ async function startVoiceRecording(opts = {}) {
|
|
|
87588
87588
|
while (Buffer$1.concat(stderrChunks).byteLength > 16384)
|
|
87589
87589
|
stderrChunks.shift();
|
|
87590
87590
|
});
|
|
87591
|
-
const closed = new Promise((
|
|
87591
|
+
const closed = new Promise((resolve13) => {
|
|
87592
87592
|
child.once("close", (code, signal) => {
|
|
87593
87593
|
closeState = { code, signal };
|
|
87594
|
-
|
|
87594
|
+
resolve13();
|
|
87595
87595
|
});
|
|
87596
87596
|
});
|
|
87597
|
-
await new Promise((
|
|
87598
|
-
child.once("spawn",
|
|
87597
|
+
await new Promise((resolve13, reject) => {
|
|
87598
|
+
child.once("spawn", resolve13);
|
|
87599
87599
|
child.once("error", (err) => reject(toSpawnError(command, err)));
|
|
87600
87600
|
});
|
|
87601
87601
|
let stopPromise = null;
|
|
@@ -87618,14 +87618,14 @@ async function checkVoiceCaptureAvailable(opts = {}) {
|
|
|
87618
87618
|
const child = (opts.spawnImpl ?? spawn)(command, ["-version"], {
|
|
87619
87619
|
stdio: ["ignore", "ignore", "ignore"]
|
|
87620
87620
|
});
|
|
87621
|
-
return new Promise((
|
|
87621
|
+
return new Promise((resolve13) => {
|
|
87622
87622
|
let settled = false;
|
|
87623
87623
|
const done = (check) => {
|
|
87624
87624
|
if (settled)
|
|
87625
87625
|
return;
|
|
87626
87626
|
settled = true;
|
|
87627
87627
|
clearTimeout(timer);
|
|
87628
|
-
|
|
87628
|
+
resolve13(check);
|
|
87629
87629
|
};
|
|
87630
87630
|
const timer = setTimeout(() => {
|
|
87631
87631
|
if (!child.killed)
|
|
@@ -89802,9 +89802,9 @@ var init_SessionView = __esm({
|
|
|
89802
89802
|
}, onApprovalDecide: (decision) => {
|
|
89803
89803
|
if (!pendingApproval)
|
|
89804
89804
|
return;
|
|
89805
|
-
const { resolve:
|
|
89805
|
+
const { resolve: resolve13 } = pendingApproval;
|
|
89806
89806
|
permissions.setPendingApproval(null);
|
|
89807
|
-
|
|
89807
|
+
resolve13(decision);
|
|
89808
89808
|
}, onPickerSelect: handlePickerSelect, onPickerCancel: () => setPicker(null), onSubmit: handleSubmit, onPasteText: images.handlePasteText }), (0, import_jsx_runtime37.jsx)(StatusLine, { busyStartedAt: turn.busy && !pendingPermission && !pendingApproval ? turn.busyStartedAt : null, queueCount: turn.queueCount, modeName, modeBadge, provider: providerName2, model: activeModel2, mcp: mcpStatus, contextUsed, ...contextWindow ? { contextWindow } : {}, ...version ? { version } : {}, ...updateAvailable ? { updateLatest: updateAvailable.latest } : {} })] });
|
|
89809
89809
|
};
|
|
89810
89810
|
}
|
|
@@ -94586,10 +94586,10 @@ var require_browser2 = __commonJS({
|
|
|
94586
94586
|
text = canvas;
|
|
94587
94587
|
canvas = void 0;
|
|
94588
94588
|
}
|
|
94589
|
-
return new Promise(function(
|
|
94589
|
+
return new Promise(function(resolve13, reject) {
|
|
94590
94590
|
try {
|
|
94591
94591
|
const data = QRCode2.create(text, opts);
|
|
94592
|
-
|
|
94592
|
+
resolve13(renderFunc(data, canvas, opts));
|
|
94593
94593
|
} catch (e3) {
|
|
94594
94594
|
reject(e3);
|
|
94595
94595
|
}
|
|
@@ -94670,11 +94670,11 @@ var require_server = __commonJS({
|
|
|
94670
94670
|
}
|
|
94671
94671
|
function render2(renderFunc, text, params) {
|
|
94672
94672
|
if (!params.cb) {
|
|
94673
|
-
return new Promise(function(
|
|
94673
|
+
return new Promise(function(resolve13, reject) {
|
|
94674
94674
|
try {
|
|
94675
94675
|
const data = QRCode2.create(text, params.opts);
|
|
94676
94676
|
return renderFunc(data, params.opts, function(err, data2) {
|
|
94677
|
-
return err ? reject(err) :
|
|
94677
|
+
return err ? reject(err) : resolve13(data2);
|
|
94678
94678
|
});
|
|
94679
94679
|
} catch (e3) {
|
|
94680
94680
|
reject(e3);
|
|
@@ -96546,9 +96546,9 @@ var require_dispatcher_base = __commonJS({
|
|
|
96546
96546
|
}
|
|
96547
96547
|
close(callback) {
|
|
96548
96548
|
if (callback === void 0) {
|
|
96549
|
-
return new Promise((
|
|
96549
|
+
return new Promise((resolve13, reject) => {
|
|
96550
96550
|
this.close((err, data) => {
|
|
96551
|
-
return err ? reject(err) :
|
|
96551
|
+
return err ? reject(err) : resolve13(data);
|
|
96552
96552
|
});
|
|
96553
96553
|
});
|
|
96554
96554
|
}
|
|
@@ -96586,12 +96586,12 @@ var require_dispatcher_base = __commonJS({
|
|
|
96586
96586
|
err = null;
|
|
96587
96587
|
}
|
|
96588
96588
|
if (callback === void 0) {
|
|
96589
|
-
return new Promise((
|
|
96589
|
+
return new Promise((resolve13, reject) => {
|
|
96590
96590
|
this.destroy(err, (err2, data) => {
|
|
96591
96591
|
return err2 ? (
|
|
96592
96592
|
/* istanbul ignore next: should never error */
|
|
96593
96593
|
reject(err2)
|
|
96594
|
-
) :
|
|
96594
|
+
) : resolve13(data);
|
|
96595
96595
|
});
|
|
96596
96596
|
});
|
|
96597
96597
|
}
|
|
@@ -98841,8 +98841,8 @@ var require_util3 = __commonJS({
|
|
|
98841
98841
|
function createDeferredPromise() {
|
|
98842
98842
|
let res;
|
|
98843
98843
|
let rej;
|
|
98844
|
-
const promise = new Promise((
|
|
98845
|
-
res =
|
|
98844
|
+
const promise = new Promise((resolve13, reject) => {
|
|
98845
|
+
res = resolve13;
|
|
98846
98846
|
rej = reject;
|
|
98847
98847
|
});
|
|
98848
98848
|
return { promise, resolve: res, reject: rej };
|
|
@@ -101014,12 +101014,12 @@ upgrade: ${upgrade}\r
|
|
|
101014
101014
|
cb();
|
|
101015
101015
|
}
|
|
101016
101016
|
}
|
|
101017
|
-
const waitForDrain = () => new Promise((
|
|
101017
|
+
const waitForDrain = () => new Promise((resolve13, reject) => {
|
|
101018
101018
|
assert(callback === null);
|
|
101019
101019
|
if (socket[kError]) {
|
|
101020
101020
|
reject(socket[kError]);
|
|
101021
101021
|
} else {
|
|
101022
|
-
callback =
|
|
101022
|
+
callback = resolve13;
|
|
101023
101023
|
}
|
|
101024
101024
|
});
|
|
101025
101025
|
socket.on("close", onDrain).on("drain", onDrain);
|
|
@@ -101655,12 +101655,12 @@ var require_client_h2 = __commonJS({
|
|
|
101655
101655
|
cb();
|
|
101656
101656
|
}
|
|
101657
101657
|
}
|
|
101658
|
-
const waitForDrain = () => new Promise((
|
|
101658
|
+
const waitForDrain = () => new Promise((resolve13, reject) => {
|
|
101659
101659
|
assert(callback === null);
|
|
101660
101660
|
if (socket[kError]) {
|
|
101661
101661
|
reject(socket[kError]);
|
|
101662
101662
|
} else {
|
|
101663
|
-
callback =
|
|
101663
|
+
callback = resolve13;
|
|
101664
101664
|
}
|
|
101665
101665
|
});
|
|
101666
101666
|
h2stream.on("close", onDrain).on("drain", onDrain);
|
|
@@ -102133,16 +102133,16 @@ var require_client2 = __commonJS({
|
|
|
102133
102133
|
return this[kNeedDrain] < 2;
|
|
102134
102134
|
}
|
|
102135
102135
|
async [kClose]() {
|
|
102136
|
-
return new Promise((
|
|
102136
|
+
return new Promise((resolve13) => {
|
|
102137
102137
|
if (this[kSize]) {
|
|
102138
|
-
this[kClosedResolve] =
|
|
102138
|
+
this[kClosedResolve] = resolve13;
|
|
102139
102139
|
} else {
|
|
102140
|
-
|
|
102140
|
+
resolve13(null);
|
|
102141
102141
|
}
|
|
102142
102142
|
});
|
|
102143
102143
|
}
|
|
102144
102144
|
async [kDestroy](err) {
|
|
102145
|
-
return new Promise((
|
|
102145
|
+
return new Promise((resolve13) => {
|
|
102146
102146
|
const requests = this[kQueue].splice(this[kPendingIdx]);
|
|
102147
102147
|
for (let i2 = 0; i2 < requests.length; i2++) {
|
|
102148
102148
|
const request = requests[i2];
|
|
@@ -102153,7 +102153,7 @@ var require_client2 = __commonJS({
|
|
|
102153
102153
|
this[kClosedResolve]();
|
|
102154
102154
|
this[kClosedResolve] = null;
|
|
102155
102155
|
}
|
|
102156
|
-
|
|
102156
|
+
resolve13(null);
|
|
102157
102157
|
};
|
|
102158
102158
|
if (this[kHTTPContext]) {
|
|
102159
102159
|
this[kHTTPContext].destroy(err, callback);
|
|
@@ -102204,7 +102204,7 @@ var require_client2 = __commonJS({
|
|
|
102204
102204
|
});
|
|
102205
102205
|
}
|
|
102206
102206
|
try {
|
|
102207
|
-
const socket = await new Promise((
|
|
102207
|
+
const socket = await new Promise((resolve13, reject) => {
|
|
102208
102208
|
client[kConnector]({
|
|
102209
102209
|
host,
|
|
102210
102210
|
hostname,
|
|
@@ -102216,7 +102216,7 @@ var require_client2 = __commonJS({
|
|
|
102216
102216
|
if (err) {
|
|
102217
102217
|
reject(err);
|
|
102218
102218
|
} else {
|
|
102219
|
-
|
|
102219
|
+
resolve13(socket2);
|
|
102220
102220
|
}
|
|
102221
102221
|
});
|
|
102222
102222
|
});
|
|
@@ -102550,8 +102550,8 @@ var require_pool_base = __commonJS({
|
|
|
102550
102550
|
if (this[kQueue].isEmpty()) {
|
|
102551
102551
|
await Promise.all(this[kClients].map((c2) => c2.close()));
|
|
102552
102552
|
} else {
|
|
102553
|
-
await new Promise((
|
|
102554
|
-
this[kClosedResolve] =
|
|
102553
|
+
await new Promise((resolve13) => {
|
|
102554
|
+
this[kClosedResolve] = resolve13;
|
|
102555
102555
|
});
|
|
102556
102556
|
}
|
|
102557
102557
|
}
|
|
@@ -103758,7 +103758,7 @@ var require_readable = __commonJS({
|
|
|
103758
103758
|
if (this._readableState.closeEmitted) {
|
|
103759
103759
|
return null;
|
|
103760
103760
|
}
|
|
103761
|
-
return await new Promise((
|
|
103761
|
+
return await new Promise((resolve13, reject) => {
|
|
103762
103762
|
if (this[kContentLength] > limit2) {
|
|
103763
103763
|
this.destroy(new AbortError2());
|
|
103764
103764
|
}
|
|
@@ -103771,7 +103771,7 @@ var require_readable = __commonJS({
|
|
|
103771
103771
|
if (signal?.aborted) {
|
|
103772
103772
|
reject(signal.reason ?? new AbortError2());
|
|
103773
103773
|
} else {
|
|
103774
|
-
|
|
103774
|
+
resolve13(null);
|
|
103775
103775
|
}
|
|
103776
103776
|
}).on("error", noop3).on("data", function(chunk) {
|
|
103777
103777
|
limit2 -= chunk.length;
|
|
@@ -103790,7 +103790,7 @@ var require_readable = __commonJS({
|
|
|
103790
103790
|
}
|
|
103791
103791
|
async function consume(stream, type) {
|
|
103792
103792
|
assert(!stream[kConsume]);
|
|
103793
|
-
return new Promise((
|
|
103793
|
+
return new Promise((resolve13, reject) => {
|
|
103794
103794
|
if (isUnusable(stream)) {
|
|
103795
103795
|
const rState = stream._readableState;
|
|
103796
103796
|
if (rState.destroyed && rState.closeEmitted === false) {
|
|
@@ -103807,7 +103807,7 @@ var require_readable = __commonJS({
|
|
|
103807
103807
|
stream[kConsume] = {
|
|
103808
103808
|
type,
|
|
103809
103809
|
stream,
|
|
103810
|
-
resolve:
|
|
103810
|
+
resolve: resolve13,
|
|
103811
103811
|
reject,
|
|
103812
103812
|
length: 0,
|
|
103813
103813
|
body: []
|
|
@@ -103877,18 +103877,18 @@ var require_readable = __commonJS({
|
|
|
103877
103877
|
return buffer;
|
|
103878
103878
|
}
|
|
103879
103879
|
function consumeEnd(consume2) {
|
|
103880
|
-
const { type, body, resolve:
|
|
103880
|
+
const { type, body, resolve: resolve13, stream, length } = consume2;
|
|
103881
103881
|
try {
|
|
103882
103882
|
if (type === "text") {
|
|
103883
|
-
|
|
103883
|
+
resolve13(chunksDecode(body, length));
|
|
103884
103884
|
} else if (type === "json") {
|
|
103885
|
-
|
|
103885
|
+
resolve13(JSON.parse(chunksDecode(body, length)));
|
|
103886
103886
|
} else if (type === "arrayBuffer") {
|
|
103887
|
-
|
|
103887
|
+
resolve13(chunksConcat(body, length).buffer);
|
|
103888
103888
|
} else if (type === "blob") {
|
|
103889
|
-
|
|
103889
|
+
resolve13(new Blob(body, { type: stream[kContentType] }));
|
|
103890
103890
|
} else if (type === "bytes") {
|
|
103891
|
-
|
|
103891
|
+
resolve13(chunksConcat(body, length));
|
|
103892
103892
|
}
|
|
103893
103893
|
consumeFinish(consume2);
|
|
103894
103894
|
} catch (err) {
|
|
@@ -104144,9 +104144,9 @@ var require_api_request = __commonJS({
|
|
|
104144
104144
|
};
|
|
104145
104145
|
function request(opts, callback) {
|
|
104146
104146
|
if (callback === void 0) {
|
|
104147
|
-
return new Promise((
|
|
104147
|
+
return new Promise((resolve13, reject) => {
|
|
104148
104148
|
request.call(this, opts, (err, data) => {
|
|
104149
|
-
return err ? reject(err) :
|
|
104149
|
+
return err ? reject(err) : resolve13(data);
|
|
104150
104150
|
});
|
|
104151
104151
|
});
|
|
104152
104152
|
}
|
|
@@ -104368,9 +104368,9 @@ var require_api_stream = __commonJS({
|
|
|
104368
104368
|
};
|
|
104369
104369
|
function stream(opts, factory2, callback) {
|
|
104370
104370
|
if (callback === void 0) {
|
|
104371
|
-
return new Promise((
|
|
104371
|
+
return new Promise((resolve13, reject) => {
|
|
104372
104372
|
stream.call(this, opts, factory2, (err, data) => {
|
|
104373
|
-
return err ? reject(err) :
|
|
104373
|
+
return err ? reject(err) : resolve13(data);
|
|
104374
104374
|
});
|
|
104375
104375
|
});
|
|
104376
104376
|
}
|
|
@@ -104653,9 +104653,9 @@ var require_api_upgrade = __commonJS({
|
|
|
104653
104653
|
};
|
|
104654
104654
|
function upgrade(opts, callback) {
|
|
104655
104655
|
if (callback === void 0) {
|
|
104656
|
-
return new Promise((
|
|
104656
|
+
return new Promise((resolve13, reject) => {
|
|
104657
104657
|
upgrade.call(this, opts, (err, data) => {
|
|
104658
|
-
return err ? reject(err) :
|
|
104658
|
+
return err ? reject(err) : resolve13(data);
|
|
104659
104659
|
});
|
|
104660
104660
|
});
|
|
104661
104661
|
}
|
|
@@ -104746,9 +104746,9 @@ var require_api_connect = __commonJS({
|
|
|
104746
104746
|
};
|
|
104747
104747
|
function connect(opts, callback) {
|
|
104748
104748
|
if (callback === void 0) {
|
|
104749
|
-
return new Promise((
|
|
104749
|
+
return new Promise((resolve13, reject) => {
|
|
104750
104750
|
connect.call(this, opts, (err, data) => {
|
|
104751
|
-
return err ? reject(err) :
|
|
104751
|
+
return err ? reject(err) : resolve13(data);
|
|
104752
104752
|
});
|
|
104753
104753
|
});
|
|
104754
104754
|
}
|
|
@@ -108570,7 +108570,7 @@ var require_fetch = __commonJS({
|
|
|
108570
108570
|
function dispatch3({ body }) {
|
|
108571
108571
|
const url2 = requestCurrentURL(request);
|
|
108572
108572
|
const agent = fetchParams.controller.dispatcher;
|
|
108573
|
-
return new Promise((
|
|
108573
|
+
return new Promise((resolve13, reject) => agent.dispatch(
|
|
108574
108574
|
{
|
|
108575
108575
|
path: url2.pathname + url2.search,
|
|
108576
108576
|
origin: url2.origin,
|
|
@@ -108646,7 +108646,7 @@ var require_fetch = __commonJS({
|
|
|
108646
108646
|
}
|
|
108647
108647
|
}
|
|
108648
108648
|
const onError2 = this.onError.bind(this);
|
|
108649
|
-
|
|
108649
|
+
resolve13({
|
|
108650
108650
|
status,
|
|
108651
108651
|
statusText,
|
|
108652
108652
|
headersList,
|
|
@@ -108692,7 +108692,7 @@ var require_fetch = __commonJS({
|
|
|
108692
108692
|
for (let i2 = 0; i2 < rawHeaders.length; i2 += 2) {
|
|
108693
108693
|
headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i2]), rawHeaders[i2 + 1].toString("latin1"), true);
|
|
108694
108694
|
}
|
|
108695
|
-
|
|
108695
|
+
resolve13({
|
|
108696
108696
|
status,
|
|
108697
108697
|
statusText: STATUS_CODES2[status],
|
|
108698
108698
|
headersList,
|
|
@@ -112343,8 +112343,8 @@ var require_util9 = __commonJS({
|
|
|
112343
112343
|
return true;
|
|
112344
112344
|
}
|
|
112345
112345
|
function delay(ms) {
|
|
112346
|
-
return new Promise((
|
|
112347
|
-
setTimeout(
|
|
112346
|
+
return new Promise((resolve13) => {
|
|
112347
|
+
setTimeout(resolve13, ms).unref();
|
|
112348
112348
|
});
|
|
112349
112349
|
}
|
|
112350
112350
|
module.exports = {
|
|
@@ -113292,7 +113292,7 @@ function classify(input, signals) {
|
|
|
113292
113292
|
}
|
|
113293
113293
|
var CMD_TIMEOUT_MS = 5 * 6e4;
|
|
113294
113294
|
function runCmd(cmd, args, cwd2) {
|
|
113295
|
-
return new Promise((
|
|
113295
|
+
return new Promise((resolve13) => {
|
|
113296
113296
|
const child = spawn(cmd, [...args], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
|
|
113297
113297
|
let output = "";
|
|
113298
113298
|
const onData = (d2) => {
|
|
@@ -113303,11 +113303,11 @@ function runCmd(cmd, args, cwd2) {
|
|
|
113303
113303
|
const timer = setTimeout(() => child.kill("SIGKILL"), CMD_TIMEOUT_MS);
|
|
113304
113304
|
child.on("error", (err) => {
|
|
113305
113305
|
clearTimeout(timer);
|
|
113306
|
-
|
|
113306
|
+
resolve13({ exitCode: -1, output: `${cmd} failed to start: ${err.message}` });
|
|
113307
113307
|
});
|
|
113308
113308
|
child.on("close", (code) => {
|
|
113309
113309
|
clearTimeout(timer);
|
|
113310
|
-
|
|
113310
|
+
resolve13({ exitCode: code ?? -1, output });
|
|
113311
113311
|
});
|
|
113312
113312
|
});
|
|
113313
113313
|
}
|
|
@@ -113388,7 +113388,7 @@ function shortName(pkg) {
|
|
|
113388
113388
|
return pkg.startsWith(SCOPE) ? pkg.slice(SCOPE.length) : pkg;
|
|
113389
113389
|
}
|
|
113390
113390
|
function run(cmd, args, cwd2, timeoutMs = BUILD_TIMEOUT_MS) {
|
|
113391
|
-
return new Promise((
|
|
113391
|
+
return new Promise((resolve13) => {
|
|
113392
113392
|
const child = spawn(cmd, [...args], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
|
|
113393
113393
|
let output = "";
|
|
113394
113394
|
const onData = (d2) => {
|
|
@@ -113399,11 +113399,11 @@ function run(cmd, args, cwd2, timeoutMs = BUILD_TIMEOUT_MS) {
|
|
|
113399
113399
|
const timer = setTimeout(() => child.kill("SIGKILL"), timeoutMs);
|
|
113400
113400
|
child.on("error", (err) => {
|
|
113401
113401
|
clearTimeout(timer);
|
|
113402
|
-
|
|
113402
|
+
resolve13({ code: -1, output: `${cmd} failed to start: ${err.message}` });
|
|
113403
113403
|
});
|
|
113404
113404
|
child.on("close", (code) => {
|
|
113405
113405
|
clearTimeout(timer);
|
|
113406
|
-
|
|
113406
|
+
resolve13({ code: code ?? -1, output });
|
|
113407
113407
|
});
|
|
113408
113408
|
});
|
|
113409
113409
|
}
|
|
@@ -116665,7 +116665,7 @@ async function ensurePackageJson(dir) {
|
|
|
116665
116665
|
}
|
|
116666
116666
|
}
|
|
116667
116667
|
function runNpm(args, signal) {
|
|
116668
|
-
return new Promise((
|
|
116668
|
+
return new Promise((resolve13, reject) => {
|
|
116669
116669
|
if (signal?.aborted) {
|
|
116670
116670
|
reject(new Error("npm aborted before start"));
|
|
116671
116671
|
return;
|
|
@@ -116691,7 +116691,7 @@ function runNpm(args, signal) {
|
|
|
116691
116691
|
});
|
|
116692
116692
|
child.on("close", (code) => {
|
|
116693
116693
|
signal?.removeEventListener("abort", onAbort);
|
|
116694
|
-
|
|
116694
|
+
resolve13({ exitCode: code ?? -1, stdout, stderr });
|
|
116695
116695
|
});
|
|
116696
116696
|
});
|
|
116697
116697
|
}
|
|
@@ -118139,14 +118139,14 @@ var WebhookServer = class {
|
|
|
118139
118139
|
});
|
|
118140
118140
|
});
|
|
118141
118141
|
this.server = server;
|
|
118142
|
-
await new Promise((
|
|
118142
|
+
await new Promise((resolve13, reject) => {
|
|
118143
118143
|
server.once("error", reject);
|
|
118144
118144
|
server.listen(this.opts.port, this.opts.host, () => {
|
|
118145
118145
|
this.opts.logger?.info?.("webhooks: listening", {
|
|
118146
118146
|
host: this.opts.host,
|
|
118147
118147
|
port: this.opts.port
|
|
118148
118148
|
});
|
|
118149
|
-
|
|
118149
|
+
resolve13();
|
|
118150
118150
|
});
|
|
118151
118151
|
});
|
|
118152
118152
|
return {
|
|
@@ -118160,7 +118160,7 @@ var WebhookServer = class {
|
|
|
118160
118160
|
return;
|
|
118161
118161
|
const s2 = this.server;
|
|
118162
118162
|
this.server = null;
|
|
118163
|
-
await new Promise((
|
|
118163
|
+
await new Promise((resolve13) => s2.close(() => resolve13()));
|
|
118164
118164
|
}
|
|
118165
118165
|
async handle(req, res) {
|
|
118166
118166
|
const url2 = req.url ?? "/";
|
|
@@ -119431,7 +119431,7 @@ var inprocIsolator = {
|
|
|
119431
119431
|
internal.abort(signal.reason ?? new Error(`[security:inproc] tool '${call.toolName}' aborted`));
|
|
119432
119432
|
}
|
|
119433
119433
|
};
|
|
119434
|
-
return new Promise((
|
|
119434
|
+
return new Promise((resolve13, reject) => {
|
|
119435
119435
|
if (signal.aborted) {
|
|
119436
119436
|
onExternalAbort();
|
|
119437
119437
|
reject(new Error(`[security:inproc] tool '${call.toolName}' aborted`));
|
|
@@ -119451,7 +119451,7 @@ var inprocIsolator = {
|
|
|
119451
119451
|
runHandler(handler, call.input, handlerSignal).then((out) => {
|
|
119452
119452
|
clearTimeout(timer);
|
|
119453
119453
|
signal.removeEventListener("abort", onAbort);
|
|
119454
|
-
|
|
119454
|
+
resolve13(out);
|
|
119455
119455
|
}, (err) => {
|
|
119456
119456
|
clearTimeout(timer);
|
|
119457
119457
|
signal.removeEventListener("abort", onAbort);
|
|
@@ -119763,7 +119763,7 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
|
|
|
119763
119763
|
throw new Error(`[broker:exec] command '${command}' is outside the tool's declared commands allowlist`);
|
|
119764
119764
|
}
|
|
119765
119765
|
}
|
|
119766
|
-
return await new Promise((
|
|
119766
|
+
return await new Promise((resolve13, reject) => {
|
|
119767
119767
|
const child = spawn(command, [...argv], {
|
|
119768
119768
|
cwd: opts.cwd ?? cwd2,
|
|
119769
119769
|
// Filter the parent env through the tool's `caps.env` allowlist (or a
|
|
@@ -119828,7 +119828,7 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
|
|
|
119828
119828
|
});
|
|
119829
119829
|
child.on("close", (exitCode) => {
|
|
119830
119830
|
clearKill();
|
|
119831
|
-
finish(() =>
|
|
119831
|
+
finish(() => resolve13({
|
|
119832
119832
|
stdout: Buffer.concat(outChunks).toString("utf8"),
|
|
119833
119833
|
stderr: Buffer.concat(errChunks).toString("utf8"),
|
|
119834
119834
|
exitCode
|
|
@@ -120098,7 +120098,7 @@ function createWorkerIsolator(opts = {}) {
|
|
|
120098
120098
|
maxYoungGenerationSizeMb: Math.max(16, Math.floor(memMb / 4))
|
|
120099
120099
|
}
|
|
120100
120100
|
});
|
|
120101
|
-
return new Promise((
|
|
120101
|
+
return new Promise((resolve13, reject) => {
|
|
120102
120102
|
const cleanup = /* @__PURE__ */ new Set();
|
|
120103
120103
|
let settled = false;
|
|
120104
120104
|
let terminated = false;
|
|
@@ -120155,7 +120155,7 @@ function createWorkerIsolator(opts = {}) {
|
|
|
120155
120155
|
if (settled)
|
|
120156
120156
|
return;
|
|
120157
120157
|
if (msg.ok) {
|
|
120158
|
-
finish(() =>
|
|
120158
|
+
finish(() => resolve13(msg.value));
|
|
120159
120159
|
} else {
|
|
120160
120160
|
const e3 = new Error(msg.errorMessage);
|
|
120161
120161
|
e3.name = msg.errorName;
|
|
@@ -120296,7 +120296,7 @@ function createSubprocessIsolator(opts = {}) {
|
|
|
120296
120296
|
env: env3,
|
|
120297
120297
|
stdio: ["pipe", "pipe", "pipe"]
|
|
120298
120298
|
});
|
|
120299
|
-
return new Promise((
|
|
120299
|
+
return new Promise((resolve13, reject) => {
|
|
120300
120300
|
let stderr = "";
|
|
120301
120301
|
let stdoutBuffer = "";
|
|
120302
120302
|
let settled = false;
|
|
@@ -120370,7 +120370,7 @@ function createSubprocessIsolator(opts = {}) {
|
|
|
120370
120370
|
return;
|
|
120371
120371
|
}
|
|
120372
120372
|
if (msg.ok) {
|
|
120373
|
-
finish(() =>
|
|
120373
|
+
finish(() => resolve13(msg.value));
|
|
120374
120374
|
} else {
|
|
120375
120375
|
const e3 = new Error(msg.errorMessage);
|
|
120376
120376
|
e3.name = msg.errorName;
|
|
@@ -121679,8 +121679,8 @@ function _addRequestID(value, response) {
|
|
|
121679
121679
|
}
|
|
121680
121680
|
var APIPromise = class _APIPromise extends Promise {
|
|
121681
121681
|
constructor(responsePromise, parseResponse2 = defaultParseResponse) {
|
|
121682
|
-
super((
|
|
121683
|
-
|
|
121682
|
+
super((resolve13) => {
|
|
121683
|
+
resolve13(null);
|
|
121684
121684
|
});
|
|
121685
121685
|
this.responsePromise = responsePromise;
|
|
121686
121686
|
this.parseResponse = parseResponse2;
|
|
@@ -122272,7 +122272,7 @@ var startsWithSchemeRegexp = /^[a-z][a-z0-9+.-]*:/i;
|
|
|
122272
122272
|
var isAbsoluteURL = (url2) => {
|
|
122273
122273
|
return startsWithSchemeRegexp.test(url2);
|
|
122274
122274
|
};
|
|
122275
|
-
var sleep = (ms) => new Promise((
|
|
122275
|
+
var sleep = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
|
|
122276
122276
|
var validatePositiveInteger = (name, n2) => {
|
|
122277
122277
|
if (typeof n2 !== "number" || !Number.isInteger(n2)) {
|
|
122278
122278
|
throw new AnthropicError(`${name} must be an integer`);
|
|
@@ -122882,12 +122882,12 @@ var BetaMessageStream = class _BetaMessageStream {
|
|
|
122882
122882
|
}
|
|
122883
122883
|
return this._emit("error", new AnthropicError(String(error2)));
|
|
122884
122884
|
});
|
|
122885
|
-
__classPrivateFieldSet7(this, _BetaMessageStream_connectedPromise, new Promise((
|
|
122886
|
-
__classPrivateFieldSet7(this, _BetaMessageStream_resolveConnectedPromise,
|
|
122885
|
+
__classPrivateFieldSet7(this, _BetaMessageStream_connectedPromise, new Promise((resolve13, reject) => {
|
|
122886
|
+
__classPrivateFieldSet7(this, _BetaMessageStream_resolveConnectedPromise, resolve13, "f");
|
|
122887
122887
|
__classPrivateFieldSet7(this, _BetaMessageStream_rejectConnectedPromise, reject, "f");
|
|
122888
122888
|
}));
|
|
122889
|
-
__classPrivateFieldSet7(this, _BetaMessageStream_endPromise, new Promise((
|
|
122890
|
-
__classPrivateFieldSet7(this, _BetaMessageStream_resolveEndPromise,
|
|
122889
|
+
__classPrivateFieldSet7(this, _BetaMessageStream_endPromise, new Promise((resolve13, reject) => {
|
|
122890
|
+
__classPrivateFieldSet7(this, _BetaMessageStream_resolveEndPromise, resolve13, "f");
|
|
122891
122891
|
__classPrivateFieldSet7(this, _BetaMessageStream_rejectEndPromise, reject, "f");
|
|
122892
122892
|
}));
|
|
122893
122893
|
__classPrivateFieldGet8(this, _BetaMessageStream_connectedPromise, "f").catch(() => {
|
|
@@ -123045,11 +123045,11 @@ var BetaMessageStream = class _BetaMessageStream {
|
|
|
123045
123045
|
* const message = await stream.emitted('message') // rejects if the stream errors
|
|
123046
123046
|
*/
|
|
123047
123047
|
emitted(event) {
|
|
123048
|
-
return new Promise((
|
|
123048
|
+
return new Promise((resolve13, reject) => {
|
|
123049
123049
|
__classPrivateFieldSet7(this, _BetaMessageStream_catchingPromiseCreated, true);
|
|
123050
123050
|
if (event !== "error")
|
|
123051
123051
|
this.once("error", reject);
|
|
123052
|
-
this.once(event,
|
|
123052
|
+
this.once(event, resolve13);
|
|
123053
123053
|
});
|
|
123054
123054
|
}
|
|
123055
123055
|
async done() {
|
|
@@ -123330,7 +123330,7 @@ var BetaMessageStream = class _BetaMessageStream {
|
|
|
123330
123330
|
if (done) {
|
|
123331
123331
|
return { value: void 0, done: true };
|
|
123332
123332
|
}
|
|
123333
|
-
return new Promise((
|
|
123333
|
+
return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
|
|
123334
123334
|
}
|
|
123335
123335
|
const chunk = pushQueue.shift();
|
|
123336
123336
|
return { value: chunk, done: false };
|
|
@@ -123602,12 +123602,12 @@ var MessageStream = class _MessageStream {
|
|
|
123602
123602
|
}
|
|
123603
123603
|
return this._emit("error", new AnthropicError(String(error2)));
|
|
123604
123604
|
});
|
|
123605
|
-
__classPrivateFieldSet8(this, _MessageStream_connectedPromise, new Promise((
|
|
123606
|
-
__classPrivateFieldSet8(this, _MessageStream_resolveConnectedPromise,
|
|
123605
|
+
__classPrivateFieldSet8(this, _MessageStream_connectedPromise, new Promise((resolve13, reject) => {
|
|
123606
|
+
__classPrivateFieldSet8(this, _MessageStream_resolveConnectedPromise, resolve13, "f");
|
|
123607
123607
|
__classPrivateFieldSet8(this, _MessageStream_rejectConnectedPromise, reject, "f");
|
|
123608
123608
|
}));
|
|
123609
|
-
__classPrivateFieldSet8(this, _MessageStream_endPromise, new Promise((
|
|
123610
|
-
__classPrivateFieldSet8(this, _MessageStream_resolveEndPromise,
|
|
123609
|
+
__classPrivateFieldSet8(this, _MessageStream_endPromise, new Promise((resolve13, reject) => {
|
|
123610
|
+
__classPrivateFieldSet8(this, _MessageStream_resolveEndPromise, resolve13, "f");
|
|
123611
123611
|
__classPrivateFieldSet8(this, _MessageStream_rejectEndPromise, reject, "f");
|
|
123612
123612
|
}));
|
|
123613
123613
|
__classPrivateFieldGet9(this, _MessageStream_connectedPromise, "f").catch(() => {
|
|
@@ -123765,11 +123765,11 @@ var MessageStream = class _MessageStream {
|
|
|
123765
123765
|
* const message = await stream.emitted('message') // rejects if the stream errors
|
|
123766
123766
|
*/
|
|
123767
123767
|
emitted(event) {
|
|
123768
|
-
return new Promise((
|
|
123768
|
+
return new Promise((resolve13, reject) => {
|
|
123769
123769
|
__classPrivateFieldSet8(this, _MessageStream_catchingPromiseCreated, true);
|
|
123770
123770
|
if (event !== "error")
|
|
123771
123771
|
this.once("error", reject);
|
|
123772
|
-
this.once(event,
|
|
123772
|
+
this.once(event, resolve13);
|
|
123773
123773
|
});
|
|
123774
123774
|
}
|
|
123775
123775
|
async done() {
|
|
@@ -124050,7 +124050,7 @@ var MessageStream = class _MessageStream {
|
|
|
124050
124050
|
if (done) {
|
|
124051
124051
|
return { value: void 0, done: true };
|
|
124052
124052
|
}
|
|
124053
|
-
return new Promise((
|
|
124053
|
+
return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
|
|
124054
124054
|
}
|
|
124055
124055
|
const chunk = pushQueue.shift();
|
|
124056
124056
|
return { value: chunk, done: false };
|
|
@@ -125835,8 +125835,8 @@ function _addRequestID2(value, response) {
|
|
|
125835
125835
|
}
|
|
125836
125836
|
var APIPromise2 = class _APIPromise extends Promise {
|
|
125837
125837
|
constructor(responsePromise, parseResponse2 = defaultParseResponse2) {
|
|
125838
|
-
super((
|
|
125839
|
-
|
|
125838
|
+
super((resolve13) => {
|
|
125839
|
+
resolve13(null);
|
|
125840
125840
|
});
|
|
125841
125841
|
this.responsePromise = responsePromise;
|
|
125842
125842
|
this.parseResponse = parseResponse2;
|
|
@@ -126411,7 +126411,7 @@ var startsWithSchemeRegexp2 = /^[a-z][a-z0-9+.-]*:/i;
|
|
|
126411
126411
|
var isAbsoluteURL2 = (url2) => {
|
|
126412
126412
|
return startsWithSchemeRegexp2.test(url2);
|
|
126413
126413
|
};
|
|
126414
|
-
var sleep2 = (ms) => new Promise((
|
|
126414
|
+
var sleep2 = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
|
|
126415
126415
|
var validatePositiveInteger2 = (name, n2) => {
|
|
126416
126416
|
if (typeof n2 !== "number" || !Number.isInteger(n2)) {
|
|
126417
126417
|
throw new OpenAIError(`${name} must be an integer`);
|
|
@@ -126842,12 +126842,12 @@ var EventStream = class {
|
|
|
126842
126842
|
_EventStream_errored.set(this, false);
|
|
126843
126843
|
_EventStream_aborted.set(this, false);
|
|
126844
126844
|
_EventStream_catchingPromiseCreated.set(this, false);
|
|
126845
|
-
__classPrivateFieldSet11(this, _EventStream_connectedPromise, new Promise((
|
|
126846
|
-
__classPrivateFieldSet11(this, _EventStream_resolveConnectedPromise,
|
|
126845
|
+
__classPrivateFieldSet11(this, _EventStream_connectedPromise, new Promise((resolve13, reject) => {
|
|
126846
|
+
__classPrivateFieldSet11(this, _EventStream_resolveConnectedPromise, resolve13, "f");
|
|
126847
126847
|
__classPrivateFieldSet11(this, _EventStream_rejectConnectedPromise, reject, "f");
|
|
126848
126848
|
}));
|
|
126849
|
-
__classPrivateFieldSet11(this, _EventStream_endPromise, new Promise((
|
|
126850
|
-
__classPrivateFieldSet11(this, _EventStream_resolveEndPromise,
|
|
126849
|
+
__classPrivateFieldSet11(this, _EventStream_endPromise, new Promise((resolve13, reject) => {
|
|
126850
|
+
__classPrivateFieldSet11(this, _EventStream_resolveEndPromise, resolve13, "f");
|
|
126851
126851
|
__classPrivateFieldSet11(this, _EventStream_rejectEndPromise, reject, "f");
|
|
126852
126852
|
}));
|
|
126853
126853
|
__classPrivateFieldGet12(this, _EventStream_connectedPromise, "f").catch(() => {
|
|
@@ -126931,11 +126931,11 @@ var EventStream = class {
|
|
|
126931
126931
|
* const message = await stream.emitted('message') // rejects if the stream errors
|
|
126932
126932
|
*/
|
|
126933
126933
|
emitted(event) {
|
|
126934
|
-
return new Promise((
|
|
126934
|
+
return new Promise((resolve13, reject) => {
|
|
126935
126935
|
__classPrivateFieldSet11(this, _EventStream_catchingPromiseCreated, true);
|
|
126936
126936
|
if (event !== "error")
|
|
126937
126937
|
this.once("error", reject);
|
|
126938
|
-
this.once(event,
|
|
126938
|
+
this.once(event, resolve13);
|
|
126939
126939
|
});
|
|
126940
126940
|
}
|
|
126941
126941
|
async done() {
|
|
@@ -127086,7 +127086,7 @@ var AssistantStream = class _AssistantStream extends EventStream {
|
|
|
127086
127086
|
if (done) {
|
|
127087
127087
|
return { value: void 0, done: true };
|
|
127088
127088
|
}
|
|
127089
|
-
return new Promise((
|
|
127089
|
+
return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
|
|
127090
127090
|
}
|
|
127091
127091
|
const chunk = pushQueue.shift();
|
|
127092
127092
|
return { value: chunk, done: false };
|
|
@@ -128691,7 +128691,7 @@ var ChatCompletionStream = class _ChatCompletionStream extends AbstractChatCompl
|
|
|
128691
128691
|
if (done) {
|
|
128692
128692
|
return { value: void 0, done: true };
|
|
128693
128693
|
}
|
|
128694
|
-
return new Promise((
|
|
128694
|
+
return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
|
|
128695
128695
|
}
|
|
128696
128696
|
const chunk = pushQueue.shift();
|
|
128697
128697
|
return { value: chunk, done: false };
|
|
@@ -130337,7 +130337,7 @@ var ResponseStream = class _ResponseStream extends EventStream {
|
|
|
130337
130337
|
if (done) {
|
|
130338
130338
|
return { value: void 0, done: true };
|
|
130339
130339
|
}
|
|
130340
|
-
return new Promise((
|
|
130340
|
+
return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((event2) => event2 ? { value: event2, done: false } : { value: void 0, done: true });
|
|
130341
130341
|
}
|
|
130342
130342
|
const event = pushQueue.shift();
|
|
130343
130343
|
return { value: event, done: false };
|
|
@@ -131315,7 +131315,7 @@ var openaiPlugin = definePlugin({
|
|
|
131315
131315
|
init_pkce();
|
|
131316
131316
|
async function openInBrowser(url2) {
|
|
131317
131317
|
const { cmd, args, verbatim } = browserOpenCommand(url2);
|
|
131318
|
-
await new Promise((
|
|
131318
|
+
await new Promise((resolve13, reject) => {
|
|
131319
131319
|
const child = spawn(cmd, args, {
|
|
131320
131320
|
stdio: "ignore",
|
|
131321
131321
|
detached: true,
|
|
@@ -131325,7 +131325,7 @@ async function openInBrowser(url2) {
|
|
|
131325
131325
|
});
|
|
131326
131326
|
child.once("error", reject);
|
|
131327
131327
|
child.unref();
|
|
131328
|
-
setTimeout(
|
|
131328
|
+
setTimeout(resolve13, 50);
|
|
131329
131329
|
});
|
|
131330
131330
|
}
|
|
131331
131331
|
function browserOpenCommand(url2, platform2 = process.platform) {
|
|
@@ -131341,7 +131341,7 @@ function browserOpenCommand(url2, platform2 = process.platform) {
|
|
|
131341
131341
|
return { cmd: "xdg-open", args: [url2] };
|
|
131342
131342
|
}
|
|
131343
131343
|
function waitForCallback(opts) {
|
|
131344
|
-
return new Promise((
|
|
131344
|
+
return new Promise((resolve13, reject) => {
|
|
131345
131345
|
const servers = [];
|
|
131346
131346
|
let settled = false;
|
|
131347
131347
|
const settle = (fn) => {
|
|
@@ -131415,7 +131415,7 @@ function waitForCallback(opts) {
|
|
|
131415
131415
|
}
|
|
131416
131416
|
res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
|
|
131417
131417
|
res.end(htmlPage("Authorized", "You can close this window \u2014 moxxy received the token."));
|
|
131418
|
-
settle(() =>
|
|
131418
|
+
settle(() => resolve13(code));
|
|
131419
131419
|
};
|
|
131420
131420
|
const onFatalError = (e3) => {
|
|
131421
131421
|
if (e3.code === "EADDRINUSE") {
|
|
@@ -131616,10 +131616,10 @@ function abortedError(label3) {
|
|
|
131616
131616
|
});
|
|
131617
131617
|
}
|
|
131618
131618
|
function sleep3(ms, signal, label3) {
|
|
131619
|
-
return new Promise((
|
|
131619
|
+
return new Promise((resolve13, reject) => {
|
|
131620
131620
|
if (signal?.aborted)
|
|
131621
131621
|
return reject(abortedError(label3));
|
|
131622
|
-
const t2 = setTimeout(
|
|
131622
|
+
const t2 = setTimeout(resolve13, ms);
|
|
131623
131623
|
const onAbort = () => {
|
|
131624
131624
|
clearTimeout(t2);
|
|
131625
131625
|
reject(abortedError(label3));
|
|
@@ -131927,7 +131927,7 @@ async function acquireFileLock(lockPath, staleMs, pollMs, waitMs) {
|
|
|
131927
131927
|
}
|
|
131928
131928
|
}
|
|
131929
131929
|
function sleep4(ms) {
|
|
131930
|
-
return new Promise((
|
|
131930
|
+
return new Promise((resolve13) => setTimeout(resolve13, ms));
|
|
131931
131931
|
}
|
|
131932
131932
|
async function refreshAndStore(vault, spec, stored, retried = false) {
|
|
131933
131933
|
if (!stored.tokenSet.refreshToken) {
|
|
@@ -133242,7 +133242,7 @@ async function refreshClaudeUnderLock(vault, baseline) {
|
|
|
133242
133242
|
}
|
|
133243
133243
|
var fetchImpl = fetch;
|
|
133244
133244
|
var openBrowserImpl = openInBrowser;
|
|
133245
|
-
var sleepImpl = (ms) => new Promise((
|
|
133245
|
+
var sleepImpl = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
|
|
133246
133246
|
var TOKEN_POST_MAX_ATTEMPTS = 3;
|
|
133247
133247
|
var TOKEN_POST_BACKOFF_MS = [600, 1800];
|
|
133248
133248
|
async function exchangeClaudeCode(code, state, verifier) {
|
|
@@ -133931,7 +133931,7 @@ var bashTool = defineTool({
|
|
|
133931
133931
|
if (ctx.signal.aborted) {
|
|
133932
133932
|
throw new MoxxyError({ code: "ABORTED", message: `Bash aborted before start: ${command}` });
|
|
133933
133933
|
}
|
|
133934
|
-
return await new Promise((
|
|
133934
|
+
return await new Promise((resolve13, reject) => {
|
|
133935
133935
|
const child = spawn("/bin/sh", ["-lc", command], {
|
|
133936
133936
|
cwd: cwd2 ?? ctx.cwd,
|
|
133937
133937
|
env: env3 ? { ...process.env, ...env3 } : process.env,
|
|
@@ -133984,9 +133984,9 @@ ${err.text.trimEnd()}
|
|
|
133984
133984
|
` : "") + `[exit ${code ?? "null"}]`;
|
|
133985
133985
|
const dropped = out.dropped + err.dropped;
|
|
133986
133986
|
if (dropped === 0) {
|
|
133987
|
-
|
|
133987
|
+
resolve13(clampString(combined, OUTPUT_LIMIT));
|
|
133988
133988
|
} else {
|
|
133989
|
-
|
|
133989
|
+
resolve13(combined.slice(0, OUTPUT_LIMIT) + `
|
|
133990
133990
|
... [truncated ${combined.length + dropped - OUTPUT_LIMIT} chars]`);
|
|
133991
133991
|
}
|
|
133992
133992
|
});
|
|
@@ -134301,8 +134301,8 @@ async function* walk(root, regex2, cursor, signal, visited) {
|
|
|
134301
134301
|
yield* walk(root, regex2, full, signal, visited);
|
|
134302
134302
|
}
|
|
134303
134303
|
if (isFile2) {
|
|
134304
|
-
const
|
|
134305
|
-
if (regex2.test(
|
|
134304
|
+
const relative6 = path3.relative(root, full);
|
|
134305
|
+
if (regex2.test(relative6))
|
|
134306
134306
|
yield full;
|
|
134307
134307
|
}
|
|
134308
134308
|
}
|
|
@@ -134585,10 +134585,10 @@ var sleepTool = defineTool({
|
|
|
134585
134585
|
if (ctx.signal.aborted) {
|
|
134586
134586
|
throw new MoxxyError({ code: "ABORTED", message: "Sleep aborted before start" });
|
|
134587
134587
|
}
|
|
134588
|
-
await new Promise((
|
|
134588
|
+
await new Promise((resolve13, reject) => {
|
|
134589
134589
|
const timer = setTimeout(() => {
|
|
134590
134590
|
ctx.signal.removeEventListener("abort", onAbort);
|
|
134591
|
-
|
|
134591
|
+
resolve13();
|
|
134592
134592
|
}, totalMs);
|
|
134593
134593
|
const onAbort = () => {
|
|
134594
134594
|
clearTimeout(timer);
|
|
@@ -134661,16 +134661,16 @@ function retryBackoffMs(attempt) {
|
|
|
134661
134661
|
const cap = 3e4;
|
|
134662
134662
|
return Math.min(cap, base2 * 2 ** Math.max(0, attempt - 1));
|
|
134663
134663
|
}
|
|
134664
|
-
var sleepImpl2 = (ms, signal) => new Promise((
|
|
134664
|
+
var sleepImpl2 = (ms, signal) => new Promise((resolve13) => {
|
|
134665
134665
|
if (signal.aborted)
|
|
134666
|
-
return
|
|
134666
|
+
return resolve13();
|
|
134667
134667
|
const timer = setTimeout(() => {
|
|
134668
134668
|
signal.removeEventListener("abort", onAbort);
|
|
134669
|
-
|
|
134669
|
+
resolve13();
|
|
134670
134670
|
}, ms);
|
|
134671
134671
|
const onAbort = () => {
|
|
134672
134672
|
clearTimeout(timer);
|
|
134673
|
-
|
|
134673
|
+
resolve13();
|
|
134674
134674
|
};
|
|
134675
134675
|
signal.addEventListener("abort", onAbort, { once: true });
|
|
134676
134676
|
});
|
|
@@ -135979,8 +135979,8 @@ var JsonRpcPeer = class {
|
|
|
135979
135979
|
if (this.closed)
|
|
135980
135980
|
return Promise.reject(new RpcError("rpc peer is closed"));
|
|
135981
135981
|
const id = this.nextId++;
|
|
135982
|
-
return new Promise((
|
|
135983
|
-
this.pending.set(id, { resolve:
|
|
135982
|
+
return new Promise((resolve13, reject) => {
|
|
135983
|
+
this.pending.set(id, { resolve: resolve13, reject });
|
|
135984
135984
|
const frame = { id, method, ...params !== void 0 ? { params } : {} };
|
|
135985
135985
|
this.transport.send(frame);
|
|
135986
135986
|
});
|
|
@@ -136072,11 +136072,11 @@ function runnerSocketPath() {
|
|
|
136072
136072
|
return platformSocket("serve", path3__default.join(os5__default.homedir(), ".moxxy", "serve.sock"));
|
|
136073
136073
|
}
|
|
136074
136074
|
function isRunnerUp(socketPath = runnerSocketPath()) {
|
|
136075
|
-
return new Promise((
|
|
136075
|
+
return new Promise((resolve13) => {
|
|
136076
136076
|
const socket = net2.connect(socketPath);
|
|
136077
136077
|
const finish = (up) => {
|
|
136078
136078
|
socket.destroy();
|
|
136079
|
-
|
|
136079
|
+
resolve13(up);
|
|
136080
136080
|
};
|
|
136081
136081
|
socket.once("connect", () => finish(true));
|
|
136082
136082
|
socket.once("error", () => finish(false));
|
|
@@ -136158,11 +136158,11 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
|
|
|
136158
136158
|
const transport = new NdjsonTransport(socket);
|
|
136159
136159
|
connectionHandler?.(transport);
|
|
136160
136160
|
});
|
|
136161
|
-
await new Promise((
|
|
136161
|
+
await new Promise((resolve13, reject) => {
|
|
136162
136162
|
server.once("error", reject);
|
|
136163
136163
|
server.listen(socketPath, () => {
|
|
136164
136164
|
server.removeListener("error", reject);
|
|
136165
|
-
|
|
136165
|
+
resolve13();
|
|
136166
136166
|
});
|
|
136167
136167
|
});
|
|
136168
136168
|
if (process.platform !== "win32") {
|
|
@@ -136181,7 +136181,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
|
|
|
136181
136181
|
connectionHandler = handler;
|
|
136182
136182
|
},
|
|
136183
136183
|
close() {
|
|
136184
|
-
return new Promise((
|
|
136184
|
+
return new Promise((resolve13) => {
|
|
136185
136185
|
server.close(() => {
|
|
136186
136186
|
if (process.platform !== "win32") {
|
|
136187
136187
|
try {
|
|
@@ -136189,7 +136189,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
|
|
|
136189
136189
|
} catch {
|
|
136190
136190
|
}
|
|
136191
136191
|
}
|
|
136192
|
-
|
|
136192
|
+
resolve13();
|
|
136193
136193
|
});
|
|
136194
136194
|
});
|
|
136195
136195
|
}
|
|
@@ -136198,7 +136198,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
|
|
|
136198
136198
|
var DEFAULT_CONNECT_TIMEOUT_MS = 1e4;
|
|
136199
136199
|
function connectUnixSocket(socketPath, opts = {}) {
|
|
136200
136200
|
const timeoutMs = opts.timeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
|
|
136201
|
-
return new Promise((
|
|
136201
|
+
return new Promise((resolve13, reject) => {
|
|
136202
136202
|
const socket = net2.connect(socketPath);
|
|
136203
136203
|
let settled = false;
|
|
136204
136204
|
const timer = setTimeout(() => {
|
|
@@ -136223,7 +136223,7 @@ function connectUnixSocket(socketPath, opts = {}) {
|
|
|
136223
136223
|
settled = true;
|
|
136224
136224
|
clearTimeout(timer);
|
|
136225
136225
|
socket.removeListener("error", onError2);
|
|
136226
|
-
|
|
136226
|
+
resolve13(new NdjsonTransport(socket));
|
|
136227
136227
|
});
|
|
136228
136228
|
});
|
|
136229
136229
|
}
|
|
@@ -137388,7 +137388,7 @@ var TurnStream = class {
|
|
|
137388
137388
|
yield this.queue.shift();
|
|
137389
137389
|
if (this.done)
|
|
137390
137390
|
break;
|
|
137391
|
-
await new Promise((
|
|
137391
|
+
await new Promise((resolve13) => this.waiters.push(resolve13));
|
|
137392
137392
|
}
|
|
137393
137393
|
if (this.error)
|
|
137394
137394
|
throw new Error(this.error);
|
|
@@ -137778,7 +137778,7 @@ async function isMoxxyProcess(pid) {
|
|
|
137778
137778
|
}
|
|
137779
137779
|
async function pidCommand(pid) {
|
|
137780
137780
|
const { spawn: spawn17 } = await import('child_process');
|
|
137781
|
-
return await new Promise((
|
|
137781
|
+
return await new Promise((resolve13) => {
|
|
137782
137782
|
let out = "";
|
|
137783
137783
|
try {
|
|
137784
137784
|
const child = spawn17("ps", ["-p", String(pid), "-o", "command="], {
|
|
@@ -137787,10 +137787,10 @@ async function pidCommand(pid) {
|
|
|
137787
137787
|
child.stdout.on("data", (b3) => {
|
|
137788
137788
|
out += b3.toString();
|
|
137789
137789
|
});
|
|
137790
|
-
child.on("error", () =>
|
|
137791
|
-
child.on("close", () =>
|
|
137790
|
+
child.on("error", () => resolve13(""));
|
|
137791
|
+
child.on("close", () => resolve13(out.trim()));
|
|
137792
137792
|
} catch {
|
|
137793
|
-
|
|
137793
|
+
resolve13("");
|
|
137794
137794
|
}
|
|
137795
137795
|
});
|
|
137796
137796
|
}
|
|
@@ -137820,7 +137820,7 @@ async function pidsListeningOnPort(port) {
|
|
|
137820
137820
|
}
|
|
137821
137821
|
async function runLsof(args) {
|
|
137822
137822
|
const { spawn: spawn17 } = await import('child_process');
|
|
137823
|
-
return await new Promise((
|
|
137823
|
+
return await new Promise((resolve13) => {
|
|
137824
137824
|
let out = "";
|
|
137825
137825
|
try {
|
|
137826
137826
|
const child = spawn17("lsof", [...args], {
|
|
@@ -137829,10 +137829,10 @@ async function runLsof(args) {
|
|
|
137829
137829
|
child.stdout.on("data", (b3) => {
|
|
137830
137830
|
out += b3.toString();
|
|
137831
137831
|
});
|
|
137832
|
-
child.on("error", () =>
|
|
137833
|
-
child.on("close", () =>
|
|
137832
|
+
child.on("error", () => resolve13([]));
|
|
137833
|
+
child.on("close", () => resolve13(parsePids(out)));
|
|
137834
137834
|
} catch {
|
|
137835
|
-
|
|
137835
|
+
resolve13([]);
|
|
137836
137836
|
}
|
|
137837
137837
|
});
|
|
137838
137838
|
}
|
|
@@ -138418,6 +138418,8 @@ var CollaborationState = class {
|
|
|
138418
138418
|
return;
|
|
138419
138419
|
agent.status = status;
|
|
138420
138420
|
this.emitFn({ kind: "agent_status", agentId, status, ...detail ? { detail } : {} });
|
|
138421
|
+
if (status === "crashed" || status === "killed")
|
|
138422
|
+
this.releaseAllFor(agentId);
|
|
138421
138423
|
}
|
|
138422
138424
|
markDone(agentId, summary, artifacts) {
|
|
138423
138425
|
const agent = this.agents.get(agentId);
|
|
@@ -138544,6 +138546,9 @@ var CollaborationState = class {
|
|
|
138544
138546
|
if (owner)
|
|
138545
138547
|
return { ok: false, ownedBy: owner, paths };
|
|
138546
138548
|
let item = id ? this.board.get(id) : void 0;
|
|
138549
|
+
if (item && item.owner && item.owner !== by) {
|
|
138550
|
+
return { ok: false, ownedBy: item.owner, paths };
|
|
138551
|
+
}
|
|
138547
138552
|
if (!item) {
|
|
138548
138553
|
item = {
|
|
138549
138554
|
id: id ?? `t${++this.boardSeq}`,
|
|
@@ -138567,7 +138572,7 @@ var CollaborationState = class {
|
|
|
138567
138572
|
return { ok: true, item: { ...item } };
|
|
138568
138573
|
}
|
|
138569
138574
|
boardRelease(by, opts) {
|
|
138570
|
-
const targets = opts.id ? [this.board.get(opts.id)].filter(
|
|
138575
|
+
const targets = opts.id ? [this.board.get(opts.id)].filter((it4) => it4 !== void 0 && it4.owner === by) : this.boardOrder.map((id) => this.board.get(id)).filter((it4) => it4.owner === by && it4.paths && opts.paths?.some((p3) => it4.paths.some((q3) => pathsConflict(p3, q3))));
|
|
138571
138576
|
for (const item of targets) {
|
|
138572
138577
|
delete item.owner;
|
|
138573
138578
|
item.updatedBy = by;
|
|
@@ -138575,6 +138580,21 @@ var CollaborationState = class {
|
|
|
138575
138580
|
this.emitFn({ kind: "board", action: "release", item: { ...item } });
|
|
138576
138581
|
}
|
|
138577
138582
|
}
|
|
138583
|
+
/** Drop every exclusive lease an agent holds (e.g. when it crashed/was
|
|
138584
|
+
* killed), emitting a release event per item so peers + the UI stay in sync.
|
|
138585
|
+
* Without this a dead owner would hold its file locks forever, deadlocking
|
|
138586
|
+
* any survivor that needs those paths. */
|
|
138587
|
+
releaseAllFor(agentId) {
|
|
138588
|
+
for (const id of this.boardOrder) {
|
|
138589
|
+
const item = this.board.get(id);
|
|
138590
|
+
if (item.owner !== agentId)
|
|
138591
|
+
continue;
|
|
138592
|
+
delete item.owner;
|
|
138593
|
+
item.updatedBy = agentId;
|
|
138594
|
+
item.updatedAt = this.now();
|
|
138595
|
+
this.emitFn({ kind: "board", action: "release", item: { ...item } });
|
|
138596
|
+
}
|
|
138597
|
+
}
|
|
138578
138598
|
// --- contracts ------------------------------------------------------------
|
|
138579
138599
|
contractList() {
|
|
138580
138600
|
return this.contractOrder.map((id) => ({ ...this.contracts.get(id) }));
|
|
@@ -138842,10 +138862,10 @@ function stripUndefined(obj) {
|
|
|
138842
138862
|
}
|
|
138843
138863
|
var IDENTITY = ["-c", "user.name=moxxy-collab", "-c", "user.email=collab@moxxy.local"];
|
|
138844
138864
|
function git(cwd2, args) {
|
|
138845
|
-
return new Promise((
|
|
138865
|
+
return new Promise((resolve13) => {
|
|
138846
138866
|
execFile("git", args, { cwd: cwd2, maxBuffer: 64 * 1024 * 1024 }, (err, stdout, stderr) => {
|
|
138847
138867
|
const code = err && typeof err.code === "number" ? err.code : err ? 1 : 0;
|
|
138848
|
-
|
|
138868
|
+
resolve13({ code, stdout: stdout.toString(), stderr: stderr.toString() });
|
|
138849
138869
|
});
|
|
138850
138870
|
});
|
|
138851
138871
|
}
|
|
@@ -138937,6 +138957,15 @@ async function promoteStaging(repoCwd, stagingBranchName) {
|
|
|
138937
138957
|
async function deleteBranch(repoCwd, name) {
|
|
138938
138958
|
await git(repoCwd, ["branch", "-D", name]);
|
|
138939
138959
|
}
|
|
138960
|
+
function resolveWithin(baseDir, requested) {
|
|
138961
|
+
const base2 = resolve(baseDir);
|
|
138962
|
+
const target = resolve(base2, requested);
|
|
138963
|
+
const rel = relative(base2, target);
|
|
138964
|
+
if (rel === "" || rel === "." || !rel.startsWith("..") && !isAbsolute(rel)) {
|
|
138965
|
+
return target;
|
|
138966
|
+
}
|
|
138967
|
+
throw new Error("path escapes the worktree");
|
|
138968
|
+
}
|
|
138940
138969
|
function peerReaderFor(worktrees, baseSha) {
|
|
138941
138970
|
const dirFor = (agentId) => {
|
|
138942
138971
|
const dir = worktrees.get(agentId);
|
|
@@ -138950,10 +138979,7 @@ function peerReaderFor(worktrees, baseSha) {
|
|
|
138950
138979
|
},
|
|
138951
138980
|
async read(agentId, path62) {
|
|
138952
138981
|
const dir = dirFor(agentId);
|
|
138953
|
-
|
|
138954
|
-
if (!resolved.startsWith(dir))
|
|
138955
|
-
throw new Error("path escapes the worktree");
|
|
138956
|
-
return readFile(resolved, "utf8");
|
|
138982
|
+
return readFile(resolveWithin(dir, path62), "utf8");
|
|
138957
138983
|
},
|
|
138958
138984
|
async diff(agentId) {
|
|
138959
138985
|
return diffVsBase(dirFor(agentId), baseSha);
|
|
@@ -139038,8 +139064,8 @@ var PeerSupervisor = class {
|
|
|
139038
139064
|
}
|
|
139039
139065
|
if (live.length === 0)
|
|
139040
139066
|
return;
|
|
139041
|
-
await new Promise((
|
|
139042
|
-
const timer = setTimeout(
|
|
139067
|
+
await new Promise((resolve13) => {
|
|
139068
|
+
const timer = setTimeout(resolve13, FORCE_KILL_GRACE_MS);
|
|
139043
139069
|
timer.unref?.();
|
|
139044
139070
|
});
|
|
139045
139071
|
for (const p3 of this.peers.values()) {
|
|
@@ -139402,15 +139428,19 @@ async function waitForAgents(hub, ids, signal, timeoutMs) {
|
|
|
139402
139428
|
}
|
|
139403
139429
|
}
|
|
139404
139430
|
function sleep5(ms, signal) {
|
|
139405
|
-
return new Promise((
|
|
139431
|
+
return new Promise((resolve13) => {
|
|
139406
139432
|
if (signal.aborted)
|
|
139407
|
-
return
|
|
139408
|
-
const
|
|
139409
|
-
t2.unref?.();
|
|
139410
|
-
signal.addEventListener("abort", () => {
|
|
139433
|
+
return resolve13();
|
|
139434
|
+
const onAbort = () => {
|
|
139411
139435
|
clearTimeout(t2);
|
|
139412
|
-
|
|
139413
|
-
}
|
|
139436
|
+
resolve13();
|
|
139437
|
+
};
|
|
139438
|
+
const t2 = setTimeout(() => {
|
|
139439
|
+
signal.removeEventListener("abort", onAbort);
|
|
139440
|
+
resolve13();
|
|
139441
|
+
}, ms);
|
|
139442
|
+
t2.unref?.();
|
|
139443
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
139414
139444
|
});
|
|
139415
139445
|
}
|
|
139416
139446
|
function toCollabEvent(ctx, e3) {
|
|
@@ -139712,14 +139742,19 @@ function formatInboxNudge(messages) {
|
|
|
139712
139742
|
return lines.join("\n");
|
|
139713
139743
|
}
|
|
139714
139744
|
function sleep6(ms, signal) {
|
|
139715
|
-
return new Promise((
|
|
139745
|
+
return new Promise((resolve13) => {
|
|
139716
139746
|
if (signal.aborted)
|
|
139717
|
-
return
|
|
139718
|
-
const
|
|
139719
|
-
signal.addEventListener("abort", () => {
|
|
139747
|
+
return resolve13();
|
|
139748
|
+
const onAbort = () => {
|
|
139720
139749
|
clearTimeout(t2);
|
|
139721
|
-
|
|
139722
|
-
}
|
|
139750
|
+
resolve13();
|
|
139751
|
+
};
|
|
139752
|
+
const t2 = setTimeout(() => {
|
|
139753
|
+
signal.removeEventListener("abort", onAbort);
|
|
139754
|
+
resolve13();
|
|
139755
|
+
}, ms);
|
|
139756
|
+
t2.unref?.();
|
|
139757
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
139723
139758
|
});
|
|
139724
139759
|
}
|
|
139725
139760
|
function abort(ctx, reason) {
|
|
@@ -139998,11 +140033,11 @@ var TelegramPermissionResolver = class {
|
|
|
139998
140033
|
if (!this.deciderFn) {
|
|
139999
140034
|
return { mode: "deny", reason: "no decider attached (bot not running)" };
|
|
140000
140035
|
}
|
|
140001
|
-
const decision = await new Promise((
|
|
140002
|
-
this.pending.set(call.callId, { callId: call.callId, call, ctx, resolve:
|
|
140036
|
+
const decision = await new Promise((resolve13) => {
|
|
140037
|
+
this.pending.set(call.callId, { callId: call.callId, call, ctx, resolve: resolve13 });
|
|
140003
140038
|
this.deciderFn(call, ctx).catch((err) => {
|
|
140004
140039
|
this.pending.delete(call.callId);
|
|
140005
|
-
|
|
140040
|
+
resolve13({ mode: "deny", reason: err instanceof Error ? err.message : String(err) });
|
|
140006
140041
|
});
|
|
140007
140042
|
});
|
|
140008
140043
|
if (decision.mode === "allow_session")
|
|
@@ -140040,11 +140075,11 @@ var TelegramApprovalResolver = class {
|
|
|
140040
140075
|
return { optionId: request.defaultOptionId ?? request.options[0]?.id ?? "approve" };
|
|
140041
140076
|
}
|
|
140042
140077
|
const id = `appr_${this.nextId++}`;
|
|
140043
|
-
return new Promise((
|
|
140044
|
-
this.pending.set(id, { id, request, resolve:
|
|
140078
|
+
return new Promise((resolve13) => {
|
|
140079
|
+
this.pending.set(id, { id, request, resolve: resolve13 });
|
|
140045
140080
|
this.deciderFn(id, request).catch((err) => {
|
|
140046
140081
|
this.pending.delete(id);
|
|
140047
|
-
|
|
140082
|
+
resolve13({
|
|
140048
140083
|
optionId: request.defaultOptionId ?? request.options[0]?.id ?? "cancel",
|
|
140049
140084
|
text: `decider failed: ${err instanceof Error ? err.message : String(err)}`
|
|
140050
140085
|
});
|
|
@@ -142612,8 +142647,8 @@ async function runPairFlow(ctx) {
|
|
|
142612
142647
|
});
|
|
142613
142648
|
session.setPermissionResolver(channel.permissionResolver);
|
|
142614
142649
|
let issuedResolve = null;
|
|
142615
|
-
const issued = new Promise((
|
|
142616
|
-
issuedResolve =
|
|
142650
|
+
const issued = new Promise((resolve13) => {
|
|
142651
|
+
issuedResolve = resolve13;
|
|
142617
142652
|
});
|
|
142618
142653
|
const unsubscribe = channel.onPairingIssued((e3) => {
|
|
142619
142654
|
issuedResolve?.(e3);
|
|
@@ -143205,11 +143240,11 @@ var HttpChannel = class {
|
|
|
143205
143240
|
this.server = server;
|
|
143206
143241
|
let rejectRunning;
|
|
143207
143242
|
let resolveRunning;
|
|
143208
|
-
const running = new Promise((
|
|
143209
|
-
resolveRunning =
|
|
143243
|
+
const running = new Promise((resolve13, reject) => {
|
|
143244
|
+
resolveRunning = resolve13;
|
|
143210
143245
|
rejectRunning = reject;
|
|
143211
143246
|
});
|
|
143212
|
-
const listening = new Promise((
|
|
143247
|
+
const listening = new Promise((resolve13, reject) => {
|
|
143213
143248
|
const onListenError = (err) => reject(err);
|
|
143214
143249
|
server.once("error", onListenError);
|
|
143215
143250
|
server.listen(this.port, this.host, () => {
|
|
@@ -143225,7 +143260,7 @@ var HttpChannel = class {
|
|
|
143225
143260
|
port: this.boundPortValue,
|
|
143226
143261
|
authEnabled: this.authToken !== null
|
|
143227
143262
|
});
|
|
143228
|
-
|
|
143263
|
+
resolve13();
|
|
143229
143264
|
});
|
|
143230
143265
|
});
|
|
143231
143266
|
await listening;
|
|
@@ -143234,10 +143269,10 @@ var HttpChannel = class {
|
|
|
143234
143269
|
running,
|
|
143235
143270
|
stop: async () => {
|
|
143236
143271
|
const srv = this.server;
|
|
143237
|
-
await new Promise((
|
|
143272
|
+
await new Promise((resolve13) => {
|
|
143238
143273
|
if (!srv)
|
|
143239
|
-
return
|
|
143240
|
-
srv.close(() =>
|
|
143274
|
+
return resolve13();
|
|
143275
|
+
srv.close(() => resolve13());
|
|
143241
143276
|
});
|
|
143242
143277
|
if (this.server === srv) {
|
|
143243
143278
|
this.server = null;
|
|
@@ -143384,17 +143419,17 @@ function isAddrInUse(err) {
|
|
|
143384
143419
|
}
|
|
143385
143420
|
async function captureStdout(cmd, args) {
|
|
143386
143421
|
const { spawn: spawn17 } = await import('child_process');
|
|
143387
|
-
return await new Promise((
|
|
143422
|
+
return await new Promise((resolve13) => {
|
|
143388
143423
|
let out = "";
|
|
143389
143424
|
try {
|
|
143390
143425
|
const child = spawn17(cmd, [...args], { stdio: ["ignore", "pipe", "ignore"] });
|
|
143391
143426
|
child.stdout.on("data", (b3) => {
|
|
143392
143427
|
out += b3.toString();
|
|
143393
143428
|
});
|
|
143394
|
-
child.on("error", () =>
|
|
143395
|
-
child.on("close", () =>
|
|
143429
|
+
child.on("error", () => resolve13(""));
|
|
143430
|
+
child.on("close", () => resolve13(out));
|
|
143396
143431
|
} catch {
|
|
143397
|
-
|
|
143432
|
+
resolve13("");
|
|
143398
143433
|
}
|
|
143399
143434
|
});
|
|
143400
143435
|
}
|
|
@@ -143539,7 +143574,7 @@ var WebChannel = class {
|
|
|
143539
143574
|
await this.openTunnel();
|
|
143540
143575
|
this.publishSurface?.({ url: this.shareUrl, nextViewId: () => `v_srv_${++this.viewSeq}` });
|
|
143541
143576
|
this.publishControls?.({ retunnel: () => this.retunnel() });
|
|
143542
|
-
const running = new Promise((
|
|
143577
|
+
const running = new Promise((resolve13) => server.once("close", () => resolve13()));
|
|
143543
143578
|
return { running, stop: () => this.stop() };
|
|
143544
143579
|
}
|
|
143545
143580
|
/**
|
|
@@ -143552,7 +143587,7 @@ var WebChannel = class {
|
|
|
143552
143587
|
* surface actually got (the share URL embeds the real port either way).
|
|
143553
143588
|
*/
|
|
143554
143589
|
async bindServerWithRetry(server) {
|
|
143555
|
-
const tryListen = () => new Promise((
|
|
143590
|
+
const tryListen = () => new Promise((resolve13, reject) => {
|
|
143556
143591
|
const onError2 = (err) => {
|
|
143557
143592
|
server.off("listening", onListening);
|
|
143558
143593
|
reject(err);
|
|
@@ -143563,7 +143598,7 @@ var WebChannel = class {
|
|
|
143563
143598
|
if (addr && typeof addr === "object")
|
|
143564
143599
|
this.port = addr.port;
|
|
143565
143600
|
this.logger?.info?.("web channel listening", { url: this.url });
|
|
143566
|
-
|
|
143601
|
+
resolve13();
|
|
143567
143602
|
};
|
|
143568
143603
|
server.once("error", onError2);
|
|
143569
143604
|
server.once("listening", onListening);
|
|
@@ -143644,8 +143679,8 @@ var WebChannel = class {
|
|
|
143644
143679
|
}
|
|
143645
143680
|
}
|
|
143646
143681
|
this.clients.clear();
|
|
143647
|
-
await new Promise((
|
|
143648
|
-
await new Promise((
|
|
143682
|
+
await new Promise((resolve13) => this.wss ? this.wss.close(() => resolve13()) : resolve13());
|
|
143683
|
+
await new Promise((resolve13) => this.server ? this.server.close(() => resolve13()) : resolve13());
|
|
143649
143684
|
}
|
|
143650
143685
|
validToken(reqUrl) {
|
|
143651
143686
|
try {
|
|
@@ -144051,9 +144086,9 @@ async function createWebSocketTransportServer(opts) {
|
|
|
144051
144086
|
for (const handler of connectionHandlers)
|
|
144052
144087
|
handler(transport);
|
|
144053
144088
|
});
|
|
144054
|
-
await new Promise((
|
|
144089
|
+
await new Promise((resolve13, reject) => {
|
|
144055
144090
|
wss.once("error", reject);
|
|
144056
|
-
wss.once("listening",
|
|
144091
|
+
wss.once("listening", resolve13);
|
|
144057
144092
|
});
|
|
144058
144093
|
const bound = wss.address();
|
|
144059
144094
|
const boundPort = typeof bound === "object" && bound !== null ? bound.port : opts.port;
|
|
@@ -144074,10 +144109,10 @@ async function createWebSocketTransportServer(opts) {
|
|
|
144074
144109
|
return connections;
|
|
144075
144110
|
},
|
|
144076
144111
|
close() {
|
|
144077
|
-
return new Promise((
|
|
144112
|
+
return new Promise((resolve13) => {
|
|
144078
144113
|
for (const client of wss.clients)
|
|
144079
144114
|
client.terminate();
|
|
144080
|
-
wss.close(() =>
|
|
144115
|
+
wss.close(() => resolve13());
|
|
144081
144116
|
});
|
|
144082
144117
|
}
|
|
144083
144118
|
};
|
|
@@ -144256,6 +144291,11 @@ var ipcInputSchemas = {
|
|
|
144256
144291
|
workspaceId: z.string().min(1).max(256),
|
|
144257
144292
|
path: z.string().max(4096).optional()
|
|
144258
144293
|
}),
|
|
144294
|
+
"workspace.readFile": z.object({
|
|
144295
|
+
workspaceId: z.string().min(1).max(256),
|
|
144296
|
+
path: z.string().min(1).max(4096),
|
|
144297
|
+
force: z.boolean().optional()
|
|
144298
|
+
}),
|
|
144259
144299
|
"settings.fetchProviderModels": z.object({ provider: providerName }),
|
|
144260
144300
|
// Session config mutation — pin the effort to the known enum so a renderer
|
|
144261
144301
|
// can't push an arbitrary string through to the runner / provider request.
|
|
@@ -144618,8 +144658,8 @@ var MobileSessionHost = class {
|
|
|
144618
144658
|
for (const controller of this.turns.values())
|
|
144619
144659
|
controller.abort();
|
|
144620
144660
|
this.turns.clear();
|
|
144621
|
-
for (const
|
|
144622
|
-
|
|
144661
|
+
for (const resolve13 of this.pendingAsks.values())
|
|
144662
|
+
resolve13({ mode: "deny" });
|
|
144623
144663
|
this.pendingAsks.clear();
|
|
144624
144664
|
this.session.setApprovalResolver(null);
|
|
144625
144665
|
}
|
|
@@ -144671,17 +144711,17 @@ var MobileSessionHost = class {
|
|
|
144671
144711
|
if (this.disposed)
|
|
144672
144712
|
return Promise.resolve({ mode: "deny" });
|
|
144673
144713
|
const requestId = `ask-${++this.askCounter}`;
|
|
144674
|
-
return new Promise((
|
|
144675
|
-
this.pendingAsks.set(requestId,
|
|
144714
|
+
return new Promise((resolve13) => {
|
|
144715
|
+
this.pendingAsks.set(requestId, resolve13);
|
|
144676
144716
|
this.bus.broadcast("ask.request", { ...req, requestId });
|
|
144677
144717
|
});
|
|
144678
144718
|
}
|
|
144679
144719
|
answerAsk(requestId, response) {
|
|
144680
|
-
const
|
|
144681
|
-
if (!
|
|
144720
|
+
const resolve13 = this.pendingAsks.get(requestId);
|
|
144721
|
+
if (!resolve13)
|
|
144682
144722
|
return;
|
|
144683
144723
|
this.pendingAsks.delete(requestId);
|
|
144684
|
-
|
|
144724
|
+
resolve13(response);
|
|
144685
144725
|
}
|
|
144686
144726
|
};
|
|
144687
144727
|
var TOKEN_FILE = "mobile-token";
|
|
@@ -144905,8 +144945,8 @@ var MobileChannel = class {
|
|
|
144905
144945
|
throw err;
|
|
144906
144946
|
}
|
|
144907
144947
|
let resolveRunning;
|
|
144908
|
-
const running = new Promise((
|
|
144909
|
-
resolveRunning =
|
|
144948
|
+
const running = new Promise((resolve13) => {
|
|
144949
|
+
resolveRunning = resolve13;
|
|
144910
144950
|
});
|
|
144911
144951
|
return {
|
|
144912
144952
|
running,
|
|
@@ -145469,7 +145509,7 @@ ${tail}` : " (no stderr captured)")
|
|
|
145469
145509
|
throw new MoxxyError({ code: "NETWORK_ABORTED", message: "browser_session aborted" });
|
|
145470
145510
|
const id = randomUUID();
|
|
145471
145511
|
const req = { id, method, params };
|
|
145472
|
-
return new Promise((
|
|
145512
|
+
return new Promise((resolve13, reject) => {
|
|
145473
145513
|
const onAbort = () => {
|
|
145474
145514
|
if (this.pending.delete(id))
|
|
145475
145515
|
reject(new MoxxyError({ code: "NETWORK_ABORTED", message: "browser_session aborted" }));
|
|
@@ -145478,7 +145518,7 @@ ${tail}` : " (no stderr captured)")
|
|
|
145478
145518
|
this.pending.set(id, {
|
|
145479
145519
|
resolve: (v3) => {
|
|
145480
145520
|
cleanup();
|
|
145481
|
-
|
|
145521
|
+
resolve13(v3);
|
|
145482
145522
|
},
|
|
145483
145523
|
reject: (e3) => {
|
|
145484
145524
|
cleanup();
|
|
@@ -145630,7 +145670,7 @@ async function installPlaywrightPackage(opts) {
|
|
|
145630
145670
|
opts.onProgress?.("Playwright installed.");
|
|
145631
145671
|
}
|
|
145632
145672
|
function runProcess(cmd, args, opts) {
|
|
145633
|
-
return new Promise((
|
|
145673
|
+
return new Promise((resolve13, reject) => {
|
|
145634
145674
|
if (opts.signal?.aborted)
|
|
145635
145675
|
return reject(new Error("install aborted"));
|
|
145636
145676
|
const child = spawn(cmd, args, { cwd: opts.rootDir, stdio: ["ignore", "pipe", "pipe"] });
|
|
@@ -145655,7 +145695,7 @@ function runProcess(cmd, args, opts) {
|
|
|
145655
145695
|
child.once("close", (code) => {
|
|
145656
145696
|
opts.signal?.removeEventListener("abort", onAbort);
|
|
145657
145697
|
if (code === 0)
|
|
145658
|
-
|
|
145698
|
+
resolve13();
|
|
145659
145699
|
else
|
|
145660
145700
|
reject(new Error(`\`${cmd} ${args.join(" ")}\` failed (exit ${code}): ${tail.trim() || "(no output)"}`));
|
|
145661
145701
|
});
|
|
@@ -145723,6 +145763,10 @@ function buildBrowserSurface(deps) {
|
|
|
145723
145763
|
inFlight = false;
|
|
145724
145764
|
}
|
|
145725
145765
|
};
|
|
145766
|
+
const bump = () => {
|
|
145767
|
+
void tick();
|
|
145768
|
+
setTimeout(() => void tick(), 140);
|
|
145769
|
+
};
|
|
145726
145770
|
startPolling();
|
|
145727
145771
|
const runInstall3 = async () => {
|
|
145728
145772
|
if (installing)
|
|
@@ -145759,6 +145803,12 @@ function buildBrowserSurface(deps) {
|
|
|
145759
145803
|
needsInstall: true,
|
|
145760
145804
|
text: "The browser engine (Playwright) is not installed. It is a one-time ~200MB download."
|
|
145761
145805
|
} : last ? { type: "frame", base64: last.base64, mime: last.mediaType, url: last.url } : { type: "status", text: "Starting browser\u2026" },
|
|
145806
|
+
resize: async (size) => {
|
|
145807
|
+
if (!size.width || !size.height)
|
|
145808
|
+
return;
|
|
145809
|
+
await browserSidecarCall("setviewport", { width: size.width, height: size.height }, deps).catch(() => void 0);
|
|
145810
|
+
void tick();
|
|
145811
|
+
},
|
|
145762
145812
|
input: async (msg) => {
|
|
145763
145813
|
if (msg.type === "install") {
|
|
145764
145814
|
await runInstall3();
|
|
@@ -145773,16 +145823,29 @@ function buildBrowserSurface(deps) {
|
|
|
145773
145823
|
const text = err instanceof Error ? err.message : String(err);
|
|
145774
145824
|
emit2({ type: "status", text });
|
|
145775
145825
|
}
|
|
145826
|
+
bump();
|
|
145827
|
+
} else if ((msg.type === "click" || msg.type === "dblclick") && typeof msg.fx === "number" && typeof msg.fy === "number") {
|
|
145828
|
+
const count = msg.type === "dblclick" ? 2 : 1;
|
|
145829
|
+
await browserSidecarCall("mouse", { x: msg.fx * vw, y: msg.fy * vh, count }, deps).catch(() => void 0);
|
|
145830
|
+
bump();
|
|
145831
|
+
} else if (msg.type === "move" && typeof msg.fx === "number" && typeof msg.fy === "number") {
|
|
145832
|
+
await browserSidecarCall("mousemove", { x: msg.fx * vw, y: msg.fy * vh }, deps).catch(() => void 0);
|
|
145776
145833
|
void tick();
|
|
145777
|
-
} else if (msg.type === "
|
|
145778
|
-
await browserSidecarCall("
|
|
145779
|
-
|
|
145834
|
+
} else if (msg.type === "pick" && typeof msg.fx === "number" && typeof msg.fy === "number") {
|
|
145835
|
+
const element = await browserSidecarCall("pick", { x: msg.fx * vw, y: msg.fy * vh }, deps).catch(() => null);
|
|
145836
|
+
emit2({ type: "picked", element });
|
|
145837
|
+
} else if (msg.type === "zoom" && typeof msg.factor === "number") {
|
|
145838
|
+
await browserSidecarCall("zoom", { factor: msg.factor }, deps).catch(() => void 0);
|
|
145839
|
+
bump();
|
|
145780
145840
|
} else if (msg.type === "key" && typeof msg.key === "string") {
|
|
145781
145841
|
await browserSidecarCall("key", { key: msg.key }, deps).catch(() => void 0);
|
|
145782
|
-
|
|
145842
|
+
bump();
|
|
145783
145843
|
} else if (msg.type === "scroll" && typeof msg.dy === "number") {
|
|
145784
145844
|
await browserSidecarCall("scroll", { dy: msg.dy }, deps).catch(() => void 0);
|
|
145785
|
-
|
|
145845
|
+
bump();
|
|
145846
|
+
} else if (msg.type === "back" || msg.type === "forward" || msg.type === "reload") {
|
|
145847
|
+
await browserSidecarCall(msg.type, {}, deps).catch(() => void 0);
|
|
145848
|
+
bump();
|
|
145786
145849
|
}
|
|
145787
145850
|
},
|
|
145788
145851
|
close: () => {
|
|
@@ -146096,7 +146159,7 @@ function buildTerminalTool() {
|
|
|
146096
146159
|
});
|
|
146097
146160
|
}
|
|
146098
146161
|
function runCommand(proc, command, marker, timeoutMs) {
|
|
146099
|
-
return new Promise((
|
|
146162
|
+
return new Promise((resolve13) => {
|
|
146100
146163
|
let acc = "";
|
|
146101
146164
|
let settled = false;
|
|
146102
146165
|
const finish = (exitCode, timedOut) => {
|
|
@@ -146105,7 +146168,7 @@ function runCommand(proc, command, marker, timeoutMs) {
|
|
|
146105
146168
|
settled = true;
|
|
146106
146169
|
unsub();
|
|
146107
146170
|
clearTimeout(timer);
|
|
146108
|
-
|
|
146171
|
+
resolve13({ output: cleanOutput(acc, command, marker), exitCode, timedOut });
|
|
146109
146172
|
};
|
|
146110
146173
|
const sentinel2 = new RegExp(`${marker} (\\d+)`);
|
|
146111
146174
|
const carry = marker.length + 32;
|
|
@@ -146766,7 +146829,7 @@ function procFailureCause(proc, timeoutMs) {
|
|
|
146766
146829
|
return "";
|
|
146767
146830
|
}
|
|
146768
146831
|
function runProcess2(cmd, args, opts = {}) {
|
|
146769
|
-
return new Promise((
|
|
146832
|
+
return new Promise((resolve13, reject) => {
|
|
146770
146833
|
const child = spawn(cmd, [...args], { stdio: ["pipe", "pipe", "pipe"] });
|
|
146771
146834
|
const stdoutChunks = [];
|
|
146772
146835
|
let stderr = "";
|
|
@@ -146814,7 +146877,7 @@ function runProcess2(cmd, args, opts = {}) {
|
|
|
146814
146877
|
if (timer)
|
|
146815
146878
|
clearTimeout(timer);
|
|
146816
146879
|
opts.signal?.removeEventListener("abort", onAbort);
|
|
146817
|
-
|
|
146880
|
+
resolve13({
|
|
146818
146881
|
exitCode: code ?? -1,
|
|
146819
146882
|
stdout: Buffer.concat(stdoutChunks).toString("utf8"),
|
|
146820
146883
|
stderr,
|
|
@@ -151171,6 +151234,15 @@ async function probeSession(opts, read, boot = setupSessionWithConfig) {
|
|
|
151171
151234
|
}
|
|
151172
151235
|
}
|
|
151173
151236
|
|
|
151237
|
+
// src/setup/close-session.ts
|
|
151238
|
+
async function closeSession(session, persistence) {
|
|
151239
|
+
if (persistence) {
|
|
151240
|
+
await persistence.flush().catch(() => void 0);
|
|
151241
|
+
await persistence.settleWrites().catch(() => void 0);
|
|
151242
|
+
}
|
|
151243
|
+
await session.close("cli-exit").catch(() => void 0);
|
|
151244
|
+
}
|
|
151245
|
+
|
|
151174
151246
|
// src/argv-helpers.ts
|
|
151175
151247
|
function argvToSetupOptions(argv, overrides = {}) {
|
|
151176
151248
|
return {
|
|
@@ -151253,7 +151325,7 @@ ${stdinBuf}` : prompt;
|
|
|
151253
151325
|
}
|
|
151254
151326
|
const model = stringFlag(argv, "model");
|
|
151255
151327
|
const resolver2 = allowAll ? denyByDefaultResolver : allowTools.length > 0 ? createAllowListResolver(allowTools) : denyByDefaultResolver;
|
|
151256
|
-
const session = await
|
|
151328
|
+
const { session, persistence } = await setupSessionWithConfig({
|
|
151257
151329
|
...argvToSetupOptions(argv),
|
|
151258
151330
|
resolver: resolver2
|
|
151259
151331
|
});
|
|
@@ -151288,7 +151360,9 @@ ${stdinBuf}` : prompt;
|
|
|
151288
151360
|
}
|
|
151289
151361
|
} catch (err) {
|
|
151290
151362
|
printError(`fatal: ${err instanceof Error ? err.message : String(err)}`);
|
|
151291
|
-
|
|
151363
|
+
exitCode = 1;
|
|
151364
|
+
} finally {
|
|
151365
|
+
await closeSession(session, persistence);
|
|
151292
151366
|
}
|
|
151293
151367
|
return exitCode;
|
|
151294
151368
|
}
|
|
@@ -151313,8 +151387,6 @@ async function readStdinIfPiped() {
|
|
|
151313
151387
|
await init_dist9();
|
|
151314
151388
|
await init_build2();
|
|
151315
151389
|
var import_react70 = __toESM(require_react());
|
|
151316
|
-
|
|
151317
|
-
// src/commands/web-surface.ts
|
|
151318
151390
|
var REMOTE_CHANNELS = /* @__PURE__ */ new Set(["telegram"]);
|
|
151319
151391
|
async function coAttachWebSurface(opts) {
|
|
151320
151392
|
const { primary, session, vault, config } = opts;
|
|
@@ -151328,7 +151400,7 @@ async function coAttachWebSurface(opts) {
|
|
|
151328
151400
|
await resolveTunnel(primary, session, webCfg, write);
|
|
151329
151401
|
try {
|
|
151330
151402
|
const web = def.create({ cwd: process.cwd(), vault, logger: session.logger, options: webCfg });
|
|
151331
|
-
const handle2 = await web
|
|
151403
|
+
const handle2 = await startChannelWith(web, { session });
|
|
151332
151404
|
const url2 = web.shareUrl;
|
|
151333
151405
|
if (url2) write(` web surface ${url2}
|
|
151334
151406
|
`);
|
|
@@ -151740,7 +151812,7 @@ function makeStdinLinePrompt(input) {
|
|
|
151740
151812
|
const queued = lineQueue.shift();
|
|
151741
151813
|
if (queued !== void 0) return Promise.resolve(queued);
|
|
151742
151814
|
if (stdinEnded) return Promise.resolve("");
|
|
151743
|
-
return new Promise((
|
|
151815
|
+
return new Promise((resolve13) => lineWaiters.push(resolve13));
|
|
151744
151816
|
};
|
|
151745
151817
|
return async (question, promptOpts) => {
|
|
151746
151818
|
process.stdout.write(encodeLoginPrompt({ question, mask: promptOpts?.mask === true }));
|
|
@@ -151767,14 +151839,21 @@ function renderLogo(width = process.stdout.columns ?? 80, opts = {}) {
|
|
|
151767
151839
|
}
|
|
151768
151840
|
async function runInitCommand(argv) {
|
|
151769
151841
|
const interactive = Boolean(process.stdin.isTTY);
|
|
151770
|
-
const { session, vault } = await bootSessionWithConfig(argv, {
|
|
151842
|
+
const { session, vault, persistence } = await bootSessionWithConfig(argv, {
|
|
151771
151843
|
skipKeyPrompt: true,
|
|
151772
151844
|
skipProviderActivation: true,
|
|
151773
151845
|
...interactive ? { passphrasePrompt: promptVaultPassphrase } : {}
|
|
151774
151846
|
});
|
|
151775
|
-
|
|
151776
|
-
|
|
151847
|
+
try {
|
|
151848
|
+
if (!interactive) {
|
|
151849
|
+
return await runHeadlessInit(session, vault);
|
|
151850
|
+
}
|
|
151851
|
+
return await runInteractiveInit(session, vault);
|
|
151852
|
+
} finally {
|
|
151853
|
+
await closeSession(session, persistence);
|
|
151777
151854
|
}
|
|
151855
|
+
}
|
|
151856
|
+
async function runInteractiveInit(session, vault) {
|
|
151778
151857
|
process.stdout.write(renderLogo());
|
|
151779
151858
|
await vault.open();
|
|
151780
151859
|
const providerDefs = session.providers.list();
|
|
@@ -151897,8 +151976,8 @@ function titleCase(s2) {
|
|
|
151897
151976
|
// src/commands/run-tui.ts
|
|
151898
151977
|
async function killStaleRunnerAt(socketPath) {
|
|
151899
151978
|
if (!existsSync(socketPath)) return;
|
|
151900
|
-
const pid = await new Promise((
|
|
151901
|
-
if (process.platform === "win32") return
|
|
151979
|
+
const pid = await new Promise((resolve13) => {
|
|
151980
|
+
if (process.platform === "win32") return resolve13(null);
|
|
151902
151981
|
let out = "";
|
|
151903
151982
|
try {
|
|
151904
151983
|
const child = spawn("lsof", ["-t", socketPath], {
|
|
@@ -151907,13 +151986,13 @@ async function killStaleRunnerAt(socketPath) {
|
|
|
151907
151986
|
child.stdout.on("data", (b3) => {
|
|
151908
151987
|
out += b3.toString();
|
|
151909
151988
|
});
|
|
151910
|
-
child.on("error", () =>
|
|
151989
|
+
child.on("error", () => resolve13(null));
|
|
151911
151990
|
child.on("close", () => {
|
|
151912
151991
|
const parsed = parseInt(out.trim().split("\n")[0] ?? "", 10);
|
|
151913
|
-
|
|
151992
|
+
resolve13(Number.isFinite(parsed) && parsed > 0 ? parsed : null);
|
|
151914
151993
|
});
|
|
151915
151994
|
} catch {
|
|
151916
|
-
|
|
151995
|
+
resolve13(null);
|
|
151917
151996
|
}
|
|
151918
151997
|
});
|
|
151919
151998
|
if (pid && pid !== process.pid) {
|
|
@@ -152741,8 +152820,6 @@ function stringFlag2(argv, name) {
|
|
|
152741
152820
|
function errorMessage(err) {
|
|
152742
152821
|
return err instanceof Error ? err.message : String(err);
|
|
152743
152822
|
}
|
|
152744
|
-
|
|
152745
|
-
// src/commands/start-registered-channel.ts
|
|
152746
152823
|
async function startRegisteredChannel(name, argv) {
|
|
152747
152824
|
const standalone = hasBoolFlag(argv, "standalone");
|
|
152748
152825
|
const mode = chooseClientMode({ standalone, runnerUp: standalone ? false : await isRunnerUp() });
|
|
@@ -152778,7 +152855,7 @@ async function runAttachedChannel(name, argv) {
|
|
|
152778
152855
|
options: { ...configOpts, ...argv.flags }
|
|
152779
152856
|
});
|
|
152780
152857
|
remote.setPermissionResolver(channel.permissionResolver);
|
|
152781
|
-
const handle2 = await channel
|
|
152858
|
+
const handle2 = await startChannelWith(channel, {
|
|
152782
152859
|
session: remote,
|
|
152783
152860
|
model: stringFlag(argv, "model"),
|
|
152784
152861
|
...collectExtraFlags(argv)
|
|
@@ -152824,7 +152901,7 @@ async function runSelfHostedChannel(name, argv, standalone) {
|
|
|
152824
152901
|
runnerServer = null;
|
|
152825
152902
|
}
|
|
152826
152903
|
}
|
|
152827
|
-
const handle2 = await channel
|
|
152904
|
+
const handle2 = await startChannelWith(channel, {
|
|
152828
152905
|
session,
|
|
152829
152906
|
model: stringFlag(argv, "model"),
|
|
152830
152907
|
...collectExtraFlags(argv)
|
|
@@ -154165,7 +154242,7 @@ async function runScheduleNow(argv) {
|
|
|
154165
154242
|
process.stderr.write(colors.red("missing id") + "\n usage: moxxy schedule run <id>\n");
|
|
154166
154243
|
return 2;
|
|
154167
154244
|
}
|
|
154168
|
-
const { session, scheduler: full } = await setupSessionWithConfig({
|
|
154245
|
+
const { session, scheduler: full, persistence } = await setupSessionWithConfig({
|
|
154169
154246
|
cwd: process.cwd(),
|
|
154170
154247
|
skipInitHooks: true
|
|
154171
154248
|
});
|
|
@@ -154196,7 +154273,7 @@ async function runScheduleNow(argv) {
|
|
|
154196
154273
|
);
|
|
154197
154274
|
return outcome.ok ? 0 : 1;
|
|
154198
154275
|
} finally {
|
|
154199
|
-
await session
|
|
154276
|
+
await closeSession(session, persistence);
|
|
154200
154277
|
}
|
|
154201
154278
|
}
|
|
154202
154279
|
|
|
@@ -154277,7 +154354,25 @@ async function runDoctorCommand(argv) {
|
|
|
154277
154354
|
});
|
|
154278
154355
|
return emit(checks, asJson);
|
|
154279
154356
|
}
|
|
154280
|
-
const { session, config, configSources, vault, memory, pluginRegistration } = setupResult.value;
|
|
154357
|
+
const { session, config, configSources, vault, memory, pluginRegistration, persistence } = setupResult.value;
|
|
154358
|
+
try {
|
|
154359
|
+
return await runDoctorChecks({
|
|
154360
|
+
session,
|
|
154361
|
+
config,
|
|
154362
|
+
configSources,
|
|
154363
|
+
vault,
|
|
154364
|
+
memory,
|
|
154365
|
+
pluginRegistration,
|
|
154366
|
+
checks,
|
|
154367
|
+
checkKeys,
|
|
154368
|
+
asJson
|
|
154369
|
+
});
|
|
154370
|
+
} finally {
|
|
154371
|
+
await closeSession(session, persistence);
|
|
154372
|
+
}
|
|
154373
|
+
}
|
|
154374
|
+
async function runDoctorChecks(deps) {
|
|
154375
|
+
const { session, config, configSources, vault, memory, pluginRegistration, checks, checkKeys, asJson } = deps;
|
|
154281
154376
|
if (configSources.length > 0) {
|
|
154282
154377
|
const summary = configSources.map((s2) => `${s2.scope}:${s2.path}`).join(", ");
|
|
154283
154378
|
checks.push({ id: "config", status: "ok", message: `loaded from ${summary}` });
|
|
@@ -154350,8 +154445,8 @@ async function runDoctorCommand(argv) {
|
|
|
154350
154445
|
checks.push({ id: `provider:${name}`, status: "ok", message: "key resolved" });
|
|
154351
154446
|
}
|
|
154352
154447
|
}
|
|
154353
|
-
const
|
|
154354
|
-
const channelEntries = await session.channels.listWithAvailability(
|
|
154448
|
+
const channelDeps = { cwd: process.cwd(), vault, logger: session.logger, options: {} };
|
|
154449
|
+
const channelEntries = await session.channels.listWithAvailability(channelDeps);
|
|
154355
154450
|
for (const { def, availability } of channelEntries) {
|
|
154356
154451
|
if (availability.ok) {
|
|
154357
154452
|
checks.push({ id: `channel:${def.name}`, status: "ok", message: "available" });
|
|
@@ -154563,12 +154658,18 @@ async function runLoginCommand(argv) {
|
|
|
154563
154658
|
if (!sub || sub === "help" || sub === "--help" || sub === "-h") {
|
|
154564
154659
|
let session = null;
|
|
154565
154660
|
try {
|
|
154566
|
-
const { session: s2 } = await bootSessionWithConfig(argv, {
|
|
154661
|
+
const { session: s2, persistence } = await bootSessionWithConfig(argv, {
|
|
154567
154662
|
skipKeyPrompt: true,
|
|
154568
154663
|
skipProviderActivation: true,
|
|
154569
154664
|
tolerateNoProvider: true
|
|
154570
154665
|
});
|
|
154571
154666
|
session = s2;
|
|
154667
|
+
try {
|
|
154668
|
+
process.stdout.write(buildHelp(session));
|
|
154669
|
+
} finally {
|
|
154670
|
+
await closeSession(s2, persistence);
|
|
154671
|
+
}
|
|
154672
|
+
return sub ? 0 : 2;
|
|
154572
154673
|
} catch {
|
|
154573
154674
|
}
|
|
154574
154675
|
process.stdout.write(buildHelp(session));
|
|
@@ -154579,11 +154680,18 @@ async function runLoginCommand(argv) {
|
|
|
154579
154680
|
return await loginProvider(argv, sub);
|
|
154580
154681
|
}
|
|
154581
154682
|
async function loginProvider(argv, providerName2) {
|
|
154582
|
-
const { session, vault } = await bootSessionWithConfig(argv, {
|
|
154683
|
+
const { session, vault, persistence } = await bootSessionWithConfig(argv, {
|
|
154583
154684
|
skipKeyPrompt: true,
|
|
154584
154685
|
skipProviderActivation: true,
|
|
154585
154686
|
tolerateNoProvider: true
|
|
154586
154687
|
});
|
|
154688
|
+
try {
|
|
154689
|
+
return await runLoginProvider(argv, providerName2, session, vault);
|
|
154690
|
+
} finally {
|
|
154691
|
+
await closeSession(session, persistence);
|
|
154692
|
+
}
|
|
154693
|
+
}
|
|
154694
|
+
async function runLoginProvider(argv, providerName2, session, vault) {
|
|
154587
154695
|
const def = session.providers.list().find((d2) => d2.name === providerName2);
|
|
154588
154696
|
if (!def) {
|
|
154589
154697
|
process.stderr.write(
|
|
@@ -154634,11 +154742,18 @@ Run \`moxxy init\` to store its key in the vault.
|
|
|
154634
154742
|
}
|
|
154635
154743
|
}
|
|
154636
154744
|
async function loginStatus(argv) {
|
|
154637
|
-
const { session, vault } = await bootSessionWithConfig(argv, {
|
|
154745
|
+
const { session, vault, persistence } = await bootSessionWithConfig(argv, {
|
|
154638
154746
|
skipKeyPrompt: true,
|
|
154639
154747
|
skipProviderActivation: true,
|
|
154640
154748
|
tolerateNoProvider: true
|
|
154641
154749
|
});
|
|
154750
|
+
try {
|
|
154751
|
+
return await runLoginStatus(argv, session, vault);
|
|
154752
|
+
} finally {
|
|
154753
|
+
await closeSession(session, persistence);
|
|
154754
|
+
}
|
|
154755
|
+
}
|
|
154756
|
+
async function runLoginStatus(argv, session, vault) {
|
|
154642
154757
|
await vault.open();
|
|
154643
154758
|
const ctx = buildProviderAuthContext(vault, { headless: true });
|
|
154644
154759
|
const filter = argv.positional[1];
|
|
@@ -154705,11 +154820,18 @@ async function loginLogout(argv) {
|
|
|
154705
154820
|
);
|
|
154706
154821
|
return 2;
|
|
154707
154822
|
}
|
|
154708
|
-
const { session, vault } = await bootSessionWithConfig(argv, {
|
|
154823
|
+
const { session, vault, persistence } = await bootSessionWithConfig(argv, {
|
|
154709
154824
|
skipKeyPrompt: true,
|
|
154710
154825
|
skipProviderActivation: true,
|
|
154711
154826
|
tolerateNoProvider: true
|
|
154712
154827
|
});
|
|
154828
|
+
try {
|
|
154829
|
+
return await runLoginLogout(providerName2, session, vault);
|
|
154830
|
+
} finally {
|
|
154831
|
+
await closeSession(session, persistence);
|
|
154832
|
+
}
|
|
154833
|
+
}
|
|
154834
|
+
async function runLoginLogout(providerName2, session, vault) {
|
|
154713
154835
|
await vault.open();
|
|
154714
154836
|
const def = session.providers.list().find((d2) => d2.name === providerName2);
|
|
154715
154837
|
if (!def || def.auth?.kind !== "oauth") {
|
|
@@ -155145,8 +155267,6 @@ async function runPath(spec) {
|
|
|
155145
155267
|
process.stdout.write(s2.unitPath + "\n");
|
|
155146
155268
|
return 0;
|
|
155147
155269
|
}
|
|
155148
|
-
|
|
155149
|
-
// src/commands/serve.ts
|
|
155150
155270
|
var BACKGROUND_UNITS = [
|
|
155151
155271
|
{
|
|
155152
155272
|
id: "scheduler",
|
|
@@ -155395,7 +155515,7 @@ async function startChannel(def, setup, installResolver) {
|
|
|
155395
155515
|
if (installResolver) {
|
|
155396
155516
|
session.setPermissionResolver(channel.permissionResolver);
|
|
155397
155517
|
}
|
|
155398
|
-
return channel
|
|
155518
|
+
return startChannelWith(channel, { session, ...channelOpts });
|
|
155399
155519
|
}
|
|
155400
155520
|
function failureHint(_name, error2) {
|
|
155401
155521
|
const e3 = error2.toLowerCase();
|
|
@@ -155781,14 +155901,14 @@ var HELP14 = formatHelp({
|
|
|
155781
155901
|
async function runCommand2(cmd) {
|
|
155782
155902
|
const [bin, ...args] = cmd;
|
|
155783
155903
|
if (!bin) return 1;
|
|
155784
|
-
return new Promise((
|
|
155904
|
+
return new Promise((resolve13) => {
|
|
155785
155905
|
const proc = spawn(bin, args, {
|
|
155786
155906
|
stdio: "inherit",
|
|
155787
155907
|
// npm/pnpm/yarn/bun are `.cmd` shims on Windows — needs a shell to launch.
|
|
155788
155908
|
shell: process.platform === "win32"
|
|
155789
155909
|
});
|
|
155790
|
-
proc.on("error", () =>
|
|
155791
|
-
proc.on("exit", (code) =>
|
|
155910
|
+
proc.on("error", () => resolve13(127));
|
|
155911
|
+
proc.on("exit", (code) => resolve13(code ?? 1));
|
|
155792
155912
|
});
|
|
155793
155913
|
}
|
|
155794
155914
|
async function runUpdateCommand(argv, deps = {}) {
|