npm - @agent-vm/agent-vm - Versions diffs - 0.0.48 → 0.0.50 - Mend

@agent-vm/agent-vm 0.0.48 → 0.0.50

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.

Files changed (126) hide show

package/dist/controller/git-push-operations.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { execa } from 'execa';
 import { scrubGithubTokenFromOutput } from './git-auth-support.js';
 import { runGitCommandWithTransientRetries } from './git-retry-support.js';
+import { buildHostGitArgs } from './host-git-command.js';
 const GIT_OPERATION_TIMEOUT_MS = 120_000;
 const GIT_PUSH_RETRY_AFTER_MESSAGE = 'GitHub or the network is still rejecting the push after retries. Try git-push again in 5 minutes; the controller retains task state while the task remains registered.';
 const GIT_PUSH_RETRY_AFTER_SECONDS = 300;
@@ -19,11 +20,6 @@ class GitPushFailedAfterRetriesError extends Error {
 function writePushFlowLog(message) {
     process.stderr.write(`[git-push-operations] ${message}\n`);
 }
-async function sleep(delayMs) {
-    await new Promise((resolve) => {
-        setTimeout(resolve, delayMs);
-    });
-}
 function parseRepoFromUrl(repoUrl) {
     const cleaned = repoUrl.replace(/\.git$/, '');
     const urlPattern = /(?:https?:\/\/)?github\.com\/([^/]+\/[^/]+)$/u;
@@ -43,7 +39,7 @@ function sanitizeBranchName(name) {
     return name.replace(/[^a-zA-Z0-9\-_./]/gu, '-');
 }
 function errorMessage(error) {
-    return error instanceof Error ? error.message : String(error);
+    return scrubGithubTokenFromOutput(error instanceof Error ? error.message : String(error));
 }
 async function recordPushEvent(options) {
     try {
@@ -54,7 +50,8 @@ async function recordPushEvent(options) {
     }
 }
 async function git(options) {
-    const result = await execa('git', ['-c', 'core.hooksPath=/dev/null', `--git-dir=${options.gitDir}`, ...options.args], {
+    const result = await execa('git', buildHostGitArgs({ args: options.args, gitDir: options.gitDir }), {
+        ...(options.signal ? { cancelSignal: options.signal } : {}),
         reject: false,
         timeout: GIT_OPERATION_TIMEOUT_MS,
     });
@@ -77,16 +74,21 @@ function formatGitCommandFailure(args, result) {
 }
 async function gitWithTransientRetries(options) {
     const retryResult = await runGitCommandWithTransientRetries({
-        run: async () => await git({ args: options.args, gitDir: options.gitDir, reject: false }),
-        sleep,
+        run: async (signal) => await git({
+            args: options.args,
+            gitDir: options.gitDir,
+            reject: false,
+            ...(signal ? { signal } : {}),
+        }),
+        ...(options.signal ? { signal: options.signal } : {}),
     });
     if (retryResult.result.exitCode !== 0) {
         throw new Error(formatGitCommandFailure(options.args, retryResult.result));
     }
     return retryResult.result;
 }
-async function gitStdout(gitDir, args) {
-    return (await gitWithTransientRetries({ args, gitDir })).stdout.trim();
+async function gitStdout(gitDir, args, signal) {
+    return (await gitWithTransientRetries({ args, gitDir, ...(signal ? { signal } : {}) })).stdout.trim();
 }
 function parseCommitSummaries(output) {
     if (output.trim().length === 0)
@@ -114,12 +116,13 @@ async function commitSummaries(gitDir, range, options) {
     const result = await gitWithTransientRetries({
         gitDir,
         args: ['log', range, `--format=${format}`],
+        ...(options?.signal ? { signal: options.signal } : {}),
     });
     return parseCommitSummaries(result.stdout);
 }
-async function refExists(gitDir, ref) {
+async function refExists(gitDir, ref, signal) {
     const args = ['rev-parse', '--verify', '--quiet', ref];
-    const result = await git({ gitDir, args, reject: false });
+    const result = await git({ gitDir, args, reject: false, ...(signal ? { signal } : {}) });
     if (result.exitCode === 0)
         return true;
     if (result.stderr.trim().length > 0) {
@@ -130,7 +133,7 @@ async function refExists(gitDir, ref) {
 async function fetchRemoteRefs(options) {
     const pushUrl = buildPushUrl(options.repoUrl, options.githubToken);
     const retryResult = await runGitCommandWithTransientRetries({
-        run: async () => await git({
+        run: async (signal) => await git({
             gitDir: options.gitDir,
             args: [
                 'fetch',
@@ -139,6 +142,7 @@ async function fetchRemoteRefs(options) {
                 `${options.defaultBranch}:refs/remotes/origin/${options.defaultBranch}`,
             ],
             reject: false,
+            ...(signal ? { signal } : {}),
         }),
         onRetry: async ({ attempt, delayMs, result }) => {
             const detail = scrubGithubTokenFromOutput(`${result.stdout}\n${result.stderr}`).trim();
@@ -155,6 +159,7 @@ async function fetchRemoteRefs(options) {
                 },
             });
         },
+        ...(options.signal ? { signal: options.signal } : {}),
     });
     if (retryResult.result.exitCode !== 0) {
         const detail = scrubGithubTokenFromOutput(`${retryResult.result.stdout}\n${retryResult.result.stderr}`).trim();
@@ -164,10 +169,10 @@ async function fetchRemoteRefs(options) {
         throw new GitPushFailedAfterRetriesError(message, retryResult.attempts, 'pre-push-fetch');
     }
 }
-async function remoteBranchHead(gitDir, branchName) {
-    if (!(await refExists(gitDir, `refs/remotes/origin/${branchName}`)))
+async function remoteBranchHead(gitDir, branchName, signal) {
+    if (!(await refExists(gitDir, `refs/remotes/origin/${branchName}`, signal)))
         return null;
-    return await gitStdout(gitDir, ['rev-parse', `refs/remotes/origin/${branchName}`]);
+    return await gitStdout(gitDir, ['rev-parse', `refs/remotes/origin/${branchName}`], signal);
 }
 async function pushBranch(options) {
     const sanitizedBranchName = sanitizeBranchName(options.branchName);
@@ -177,10 +182,11 @@ async function pushBranch(options) {
         `${sanitizedBranchName}:refs/heads/${sanitizedBranchName}`,
     ];
     const retryResult = await runGitCommandWithTransientRetries({
-        run: async () => await git({
+        run: async (signal) => await git({
             gitDir: options.gitDir,
             args: pushArgs,
             reject: false,
+            ...(signal ? { signal } : {}),
         }),
         onRetry: async ({ attempt, delayMs, result }) => {
             const detail = scrubGithubTokenFromOutput(`${result.stdout}\n${result.stderr}`).trim();
@@ -193,11 +199,12 @@ async function pushBranch(options) {
                     branch: sanitizedBranchName,
                     attempts: attempt,
                     message: detail,
+                    phase: 'push',
                     retryDelaySeconds: delayMs / 1000,
                 },
             });
         },
-        sleep,
+        ...(options.signal ? { signal: options.signal } : {}),
     });
     if (retryResult.result.exitCode === 0) {
         return { attempts: retryResult.attempts };
@@ -211,7 +218,7 @@ async function pushBranch(options) {
 }
 async function fetchPushedBranchRef(options) {
     const retryResult = await runGitCommandWithTransientRetries({
-        run: async () => await git({
+        run: async (signal) => await git({
             gitDir: options.gitDir,
             args: [
                 'fetch',
@@ -220,6 +227,7 @@ async function fetchPushedBranchRef(options) {
                 `${options.branchName}:refs/remotes/origin/${options.branchName}`,
             ],
             reject: false,
+            ...(signal ? { signal } : {}),
         }),
         onRetry: async ({ attempt, delayMs, result }) => {
             const detail = scrubGithubTokenFromOutput(`${result.stdout}\n${result.stderr}`).trim();
@@ -236,7 +244,7 @@ async function fetchPushedBranchRef(options) {
                 },
             });
         },
-        sleep,
+        ...(options.signal ? { signal: options.signal } : {}),
     });
     if (retryResult.result.exitCode !== 0) {
         const detail = scrubGithubTokenFromOutput(`${retryResult.result.stdout}\n${retryResult.result.stderr}`).trim();
@@ -253,32 +261,37 @@ function parseCountRangeOutput(output, range) {
     }
     return parsed;
 }
-async function countRange(gitDir, range) {
+async function countRange(gitDir, range, signal) {
     const result = await gitWithTransientRetries({
         gitDir,
         args: ['rev-list', '--count', range],
+        ...(signal ? { signal } : {}),
     });
     return parseCountRangeOutput(result.stdout, range);
 }
 async function buildBranchState(options) {
-    const localHead = await gitStdout(options.gitDir, ['rev-parse', 'HEAD']);
-    const pushedRemoteBranchHead = await remoteBranchHead(options.gitDir, options.branchName);
+    const localHead = await gitStdout(options.gitDir, ['rev-parse', 'HEAD'], options.signal);
+    const pushedRemoteBranchHead = await remoteBranchHead(options.gitDir, options.branchName, options.signal);
     const remoteDefaultRef = `refs/remotes/origin/${options.defaultBranch}`;
-    const remoteDefaultHead = (await refExists(options.gitDir, remoteDefaultRef))
-        ? await gitStdout(options.gitDir, ['rev-parse', remoteDefaultRef])
+    const remoteDefaultHead = (await refExists(options.gitDir, remoteDefaultRef, options.signal))
+        ? await gitStdout(options.gitDir, ['rev-parse', remoteDefaultRef], options.signal)
         : '';
     const defaultRange = remoteDefaultHead ? `${remoteDefaultRef}..HEAD` : '';
     const commitsOnBranch = defaultRange
-        ? await commitSummaries(options.gitDir, defaultRange, { includeAuthorDate: true })
+        ? await commitSummaries(options.gitDir, defaultRange, options.signal
+            ? { includeAuthorDate: true, signal: options.signal }
+            : { includeAuthorDate: true })
         : [];
     const pushedRange = options.previousRemoteBranchHead
         ? `${options.previousRemoteBranchHead}..HEAD`
         : defaultRange;
-    const pushedInThisCall = pushedRange ? await commitSummaries(options.gitDir, pushedRange) : [];
+    const pushedInThisCall = pushedRange
+        ? await commitSummaries(options.gitDir, pushedRange, options.signal ? { signal: options.signal } : undefined)
+        : [];
     const divergence = remoteDefaultHead
         ? {
-            aheadOfDefault: await countRange(options.gitDir, `${remoteDefaultRef}..HEAD`),
-            behindDefault: await countRange(options.gitDir, `HEAD..${remoteDefaultRef}`),
+            aheadOfDefault: await countRange(options.gitDir, `${remoteDefaultRef}..HEAD`, options.signal),
+            behindDefault: await countRange(options.gitDir, `HEAD..${remoteDefaultRef}`, options.signal),
         }
         : { aheadOfDefault: 0, behindDefault: 0 };
     return {
@@ -317,6 +330,7 @@ export async function pushBranchesForTask(options) {
             githubToken: options.githubToken,
             ...(options.recordEvent ? { recordEvent: options.recordEvent } : {}),
             repo,
+            ...(options.signal ? { signal: options.signal } : {}),
             task: options.activeTask,
         });
     }));
@@ -359,9 +373,10 @@ async function pushOneBranchForTask(options) {
             repoUrl: options.branch.repoUrl,
             githubToken: options.githubToken,
             ...(options.recordEvent ? { recordEvent: options.recordEvent } : {}),
+            ...(options.signal ? { signal: options.signal } : {}),
         });
-        const previousRemoteBranchHead = await remoteBranchHead(options.repo.hostGitDir, branchName);
-        const localHead = await gitStdout(options.repo.hostGitDir, ['rev-parse', 'HEAD']);
+        const previousRemoteBranchHead = await remoteBranchHead(options.repo.hostGitDir, branchName, options.signal);
+        const localHead = await gitStdout(options.repo.hostGitDir, ['rev-parse', 'HEAD'], options.signal);
         if (previousRemoteBranchHead === localHead) {
             return {
                 repoUrl: options.branch.repoUrl,
@@ -376,6 +391,7 @@ async function pushOneBranchForTask(options) {
             gitDir: options.repo.hostGitDir,
             githubToken: options.githubToken,
             ...(options.recordEvent ? { recordEvent: options.recordEvent } : {}),
+            ...(options.signal ? { signal: options.signal } : {}),
         });
         pushAttempts = pushResult.attempts;
         await fetchPushedBranchRef({
@@ -384,12 +400,14 @@ async function pushOneBranchForTask(options) {
             branchName,
             githubToken: options.githubToken,
             ...(options.recordEvent ? { recordEvent: options.recordEvent } : {}),
+            ...(options.signal ? { signal: options.signal } : {}),
         });
         const state = await buildBranchState({
             gitDir: options.repo.hostGitDir,
             branchName,
             defaultBranch: options.repo.baseBranch,
             previousRemoteBranchHead,
+            ...(options.signal ? { signal: options.signal } : {}),
         });
         await recordPushEvent({
             recordEvent: options.recordEvent,

package/dist/controller/git-push-operations.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"git-push-operations.js","sourceRoot":"","sources":["../../src/controller/git-push-operations.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"git-push-operations.js","sourceRoot":"","sources":["../../src/controller/git-push-operations.ts"],"names":[],"mappings":"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"}

package/dist/controller/git-retry-support.d.ts CHANGED Viewed

@@ -10,12 +10,13 @@ export interface GitCommandRetryResult {
 }
 export declare function isRetryableGitFailure(output: string): boolean;
 export declare function runGitCommandWithTransientRetries(options: {
-    readonly run: () => Promise<GitCommandResult>;
+    readonly run: (signal?: AbortSignal) => Promise<GitCommandResult>;
     readonly onRetry?: (props: {
         readonly attempt: number;
         readonly delayMs: number;
         readonly result: GitCommandResult;
     }) => Promise<void>;
-    readonly sleep?: (delayMs: number) => Promise<void>;
+    readonly signal?: AbortSignal;
+    readonly sleep?: (delayMs: number, signal?: AbortSignal) => Promise<void>;
 }): Promise<GitCommandRetryResult>;
 //# sourceMappingURL=git-retry-support.d.ts.map

package/dist/controller/git-retry-support.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"git-retry-support.d.ts","sourceRoot":"","sources":["../../src/controller/git-retry-support.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,8BAAkC,CAAC;AAE3E,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;CAClC;AAuBD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAK7D;~~AAED~~,wBAAsB,iCAAiC,CAAC,OAAO,EAAE;IAChE,QAAQ,CAAC,GAAG,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;~~IAC9C~~,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;KAClC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;~~CACpD~~,GAAG,OAAO,CAAC,qBAAqB,CAAC,~~CAuCjC~~"}
1	+ {"version":3,"file":"git-retry-support.d.ts","sourceRoot":"","sources":["../../src/controller/git-retry-support.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,8BAAkC,CAAC;AAE3E,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;CAClC;AAuBD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAK7D;AAoBD,wBAAsB,iCAAiC,CAAC,OAAO,EAAE;IAChE,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAClE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;KAClC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAiCjC"}

package/dist/controller/git-retry-support.js CHANGED Viewed

@@ -24,18 +24,26 @@ export function isRetryableGitFailure(output) {
     }
     return retryableGitFailurePatterns.some((pattern) => pattern.test(output));
 }
+async function defaultSleep(delayMs, signal) {
+    await new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        const timeout = setTimeout(resolve, delayMs);
+        signal?.addEventListener('abort', () => {
+            clearTimeout(timeout);
+            reject(signal.reason);
+        }, { once: true });
+    });
+}
 export async function runGitCommandWithTransientRetries(options) {
-    const sleep = options.sleep ??
-        (async (delayMs) => {
-            await new Promise((resolve) => {
-                setTimeout(resolve, delayMs);
-            });
-        });
+    const sleep = options.sleep ?? defaultSleep;
     let lastResult;
     for (let attemptNumber = 1; attemptNumber <= GIT_NETWORK_RETRY_DELAYS_MS.length + 1; attemptNumber += 1) {
         // Retry attempts are serial because each Git operation observes remote state.
         // oxlint-disable-next-line eslint/no-await-in-loop
-        const result = await options.run();
+        const result = await options.run(options.signal);
         lastResult = result;
         if (result.exitCode === 0) {
             return { attempts: attemptNumber, result };
@@ -50,7 +58,7 @@ export async function runGitCommandWithTransientRetries(options) {
         await options.onRetry?.({ attempt: attemptNumber, delayMs: retryDelayMs, result });
         // Backoff sleeps are intentionally serial between retry attempts.
         // oxlint-disable-next-line eslint/no-await-in-loop
-        await sleep(retryDelayMs);
+        await (options.signal ? sleep(retryDelayMs, options.signal) : sleep(retryDelayMs));
     }
     if (!lastResult) {
         throw new Error('Git retry loop finished without running a command.');

package/dist/controller/git-retry-support.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"git-retry-support.js","sourceRoot":"","sources":["../../src/controller/git-retry-support.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAU,CAAC;AAa3E,MAAM,2BAA2B,GAAsB;IACtD,cAAc;IACd,aAAa;IACb,oBAAoB;IACpB,0BAA0B;IAC1B,wBAAwB;IACxB,kDAAkD;IAClD,aAAa;IACb,cAAc;IACd,mCAAmC;CACnC,CAAC;AAEF,MAAM,2BAA2B,GAAsB;IACtD,gDAAgD;IAChD,oBAAoB;IACpB,wCAAwC;IACxC,yBAAyB;IACzB,wBAAwB;IACxB,qBAAqB;CACrB,CAAC;AAEF,MAAM,UAAU,qBAAqB,CAAC,MAAc;IACnD,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,2BAA2B,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,~~MAAM,CAAC,~~KAAK,UAAU,~~iCAAiC~~,CAAC,~~OAQvD~~;~~IACA~~,MAAM,~~KAAK~~,~~GACV,~~OAAO,CAAC,~~KAAK~~;~~QACb~~,~~CAAC~~,~~KAAK~~,EAAE,OAAO,~~EAAiB~~,~~EAAE~~;~~YACjC~~,MAAM,~~IAAI~~,OAAO,~~CAAO~~,CAAC,OAAO,EAAE,~~EAAE;gBACnC~~,~~UAAU~~,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;~~YAC9B~~,CAAC,CAAC,CAAC;~~QACJ~~,CAAC,CAAC,CAAC;~~IACJ~~,IAAI,UAAwC,CAAC;IAE7C,KACC,IAAI,aAAa,GAAG,CAAC,EACrB,aAAa,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EACvD,aAAa,IAAI,CAAC,EACjB,CAAC;QACF,8EAA8E;QAC9E,mDAAmD;QACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,~~EAAE~~,CAAC;~~QACnC~~,UAAU,GAAG,MAAM,CAAC;QACpB,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;QAC5C,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;QACpD,MAAM,YAAY,GAAG,2BAA2B,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;QACpE,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC;YAClE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;QAC5C,CAAC;QACD,wDAAwD;QACxD,mDAAmD;QACnD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;QACnF,kEAAkE;QAClE,mDAAmD;QACnD,MAAM,KAAK,CAAC,YAAY,CAAC,CAAC;~~IAC3B~~,CAAC;IAED,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;AACjF,CAAC"}
1	+ {"version":3,"file":"git-retry-support.js","sourceRoot":"","sources":["../../src/controller/git-retry-support.ts"],"names":[],"mappings":"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"}

package/dist/controller/heartbeat-sender.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"heartbeat-sender.d.ts","sourceRoot":"","sources":["../../src/controller/heartbeat-sender.ts"],"names":[],"mappings":"~~AAKA~~,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,CAAC,EAAE,CAC1B,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACpC,OAAO,EAAE,MAAM,KACX,MAAM,CAAC,OAAO,CAAC;IACpB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC9D,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAChD;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;CAC1B;AAMD,wBAAgB,oBAAoB,CACnC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,oBAAoB,GACzB,eAAe,~~CAiGjB~~"}
1	+ {"version":3,"file":"heartbeat-sender.d.ts","sourceRoot":"","sources":["../../src/controller/heartbeat-sender.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,CAAC,EAAE,CAC1B,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACpC,OAAO,EAAE,MAAM,KACX,MAAM,CAAC,OAAO,CAAC;IACpB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC9D,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAChD;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;CAC1B;AAMD,wBAAgB,oBAAoB,CACnC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,oBAAoB,GACzB,eAAe,CA0GjB"}

package/dist/controller/heartbeat-sender.js CHANGED Viewed

@@ -1,5 +1,6 @@
 const HEARTBEAT_CADENCE_MS_DEFAULT = 10_000;
 const HEARTBEAT_REQUEST_TIMEOUT_MS = 5_000;
+const HEARTBEAT_FAILURE_REWARN_INTERVAL = 10;
 const TERMINAL_STATUS_CODES = new Set([404, 410]);
 function defaultLogWarning(message) {
     process.stderr.write(`[heartbeat] ${message}\n`);
@@ -36,6 +37,11 @@ export function startHeartbeatSender(requestTaskId, props) {
         }
         if (consecutiveFailureCount === 3) {
             logWarning(`task ${requestTaskId}: heartbeat has failed 3 consecutive times; the caller may treat this run as stalled`);
+            return;
+        }
+        if (consecutiveFailureCount > 3 &&
+            consecutiveFailureCount % HEARTBEAT_FAILURE_REWARN_INTERVAL === 0) {
+            logWarning(`task ${requestTaskId}: heartbeat has failed ${String(consecutiveFailureCount)} consecutive times; still retrying`);
         }
     }
     function resetHeartbeatFailures() {

package/dist/controller/heartbeat-sender.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"heartbeat-sender.js","sourceRoot":"","sources":["../../src/controller/heartbeat-sender.ts"],"names":[],"mappings":"AAAA,MAAM,4BAA4B,GAAG,MAAM,CAAC;AAC5C,MAAM,4BAA4B,GAAG,KAAK,CAAC;~~AAE3C~~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"}
1	+ {"version":3,"file":"heartbeat-sender.js","sourceRoot":"","sources":["../../src/controller/heartbeat-sender.ts"],"names":[],"mappings":"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"}

package/dist/controller/host-git-command.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import type { HostGitDir } from './active-task-registry.js';
+export declare function buildHostGitArgs(options: {
+    readonly args: readonly string[];
+    readonly gitDir: HostGitDir;
+}): readonly string[];
+//# sourceMappingURL=host-git-command.d.ts.map

package/dist/controller/host-git-command.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"host-git-command.d.ts","sourceRoot":"","sources":["../../src/controller/host-git-command.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IACzC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC5B,GAAG,SAAS,MAAM,EAAE,CAUpB"}

package/dist/controller/host-git-command.js ADDED Viewed

@@ -0,0 +1,13 @@
+import { dirname } from 'node:path';
+export function buildHostGitArgs(options) {
+    return [
+        '-c',
+        'core.hooksPath=/dev/null',
+        `--git-dir=${options.gitDir}`,
+        // Shared gitdirs store VM worktrees such as /work/repos/widgets.
+        // Host-side controller Git needs a host-visible worktree for ref-only commands.
+        `--work-tree=${dirname(options.gitDir)}`,
+        ...options.args,
+    ];
+}
+//# sourceMappingURL=host-git-command.js.map

package/dist/controller/host-git-command.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"host-git-command.js","sourceRoot":"","sources":["../../src/controller/host-git-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,UAAU,gBAAgB,CAAC,OAGhC;IACA,OAAO;QACN,IAAI;QACJ,0BAA0B;QAC1B,aAAa,OAAO,CAAC,MAAM,EAAE;QAC7B,iEAAiE;QACjE,gFAAgF;QAChF,eAAe,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACxC,GAAG,OAAO,CAAC,IAAI;KACf,CAAC;AACH,CAAC"}

package/dist/controller/http/controller-client.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { type ControllerLeasePeekResponse } from './controller-lease-response-types.js';
 export interface ControllerClient {
     destroyZone(zoneId: string, purge: boolean): Promise<unknown>;
-    enableZoneSsh(zoneId: string): Promise<unknown>;
-    execInZone?(zoneId: string, command: string): Promise<unknown>;
+    enableZoneSsh(zoneId: string, options?: EnableZoneSshOptions): Promise<unknown>;
+    execInZone?(zoneId: string, command: string, options?: ExecInZoneOptions): Promise<unknown>;
     getControllerStatus(): Promise<unknown>;
     getZoneLogs(zoneId: string): Promise<unknown>;
     listLeases(): Promise<unknown>;
@@ -12,6 +12,13 @@ export interface ControllerClient {
     stopController(): Promise<unknown>;
     upgradeZone(zoneId: string): Promise<unknown>;
 }
+export interface EnableZoneSshOptions {
+    readonly adminToken?: string;
+    readonly secretEnv?: 'default' | 'with-secrets';
+}
+export interface ExecInZoneOptions {
+    readonly adminToken?: string;
+}
 export declare function createControllerClient(options: {
     readonly baseUrl: string;
     readonly fetchImpl?: (input: string | URL, init?: RequestInit) => Promise<Response>;

package/dist/controller/http/controller-client.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller-client.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,2BAA2B,EAEhC,MAAM,sCAAsC,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAChC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;~~IAChD~~,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;~~IAC/D~~,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACjE,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C;AA8BD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CACpF,GAAG,gBAAgB,~~CAmEnB~~"}
1	+ {"version":3,"file":"controller-client.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,2BAA2B,EAEhC,MAAM,sCAAsC,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAChC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAChF,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5F,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACjE,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,cAAc,CAAC;CAChD;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC7B;AA8BD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CACpF,GAAG,gBAAgB,CAoFnB"}

package/dist/controller/http/controller-client.js CHANGED Viewed

@@ -23,15 +23,25 @@ export function createControllerClient(options) {
     const fetchImpl = options.fetchImpl ?? fetch;
     const baseUrl = options.baseUrl.replace(/\/$/u, '');
     return {
-        enableZoneSsh: async (zoneId) => {
+        enableZoneSsh: async (zoneId, enableOptions = {}) => {
             const response = await fetchImpl(`${baseUrl}/zones/${zoneId}/enable-ssh`, {
+                body: JSON.stringify({
+                    ...(enableOptions.adminToken ? { adminToken: enableOptions.adminToken } : {}),
+                    secretEnv: enableOptions.secretEnv ?? 'default',
+                }),
+                headers: {
+                    'content-type': 'application/json',
+                },
                 method: 'POST',
             });
             return await readJsonResponse(response, `Enable SSH for zone '${zoneId}'`);
         },
-        execInZone: async (zoneId, command) => {
+        execInZone: async (zoneId, command, execOptions = {}) => {
             const response = await fetchImpl(`${baseUrl}/zones/${zoneId}/execute-command`, {
-                body: JSON.stringify({ command }),
+                body: JSON.stringify({
+                    ...(execOptions.adminToken ? { adminToken: execOptions.adminToken } : {}),
+                    command,
+                }),
                 headers: {
                     'content-type': 'application/json',
                 },

package/dist/controller/http/controller-client.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller-client.js","sourceRoot":"","sources":["../../../src/controller/http/controller-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,iCAAiC,GACjC,MAAM,sCAAsC,CAAC;~~AAgB9C~~,KAAK,UAAU,gBAAgB,CAAC,QAAkB,EAAE,OAAe;IAClE,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,CAAC;IACvE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,qBAAqB,QAAQ,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI,CAAC;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAY,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACd,GAAG,OAAO,2BAA2B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,YAAY,EAAE,EACpH,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;IACH,CAAC;AACF,CAAC;AAED,KAAK,UAAU,qBAAqB,CACnC,QAAkB,EAClB,OAAe;IAEf,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,aAAa,GAAG,iCAAiC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC3E,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,2CAA2C,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAGtC;IACA,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAEpD,OAAO;QACN,aAAa,EAAE,KAAK,~~EAAE~~,MAAc,~~EAAoB~~,EAAE;~~YACzD~~,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,MAAM,aAAa,EAAE;gBACzE,MAAM,EAAE,MAAM;aACd,CAAC,CAAC;YACH,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,MAAM,GAAG,CAAC,CAAC;QAC5E,CAAC;QACD,UAAU,EAAE,KAAK,~~EAAE~~,MAAc,~~EAAE~~,OAAe,~~EAAoB~~,EAAE;~~YACvE~~,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,MAAM,kBAAkB,EAAE;gBAC9E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,~~OAAO~~,EAAE,CAAC;~~gBACjC~~,OAAO,EAAE;oBACR,cAAc,EAAE,kBAAkB;iBAClC;gBACD,MAAM,EAAE,MAAM;aACd,CAAC,CAAC;YACH,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,4BAA4B,MAAM,GAAG,CAAC,CAAC;QAChF,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,MAAc,EAAE,KAAc,EAAoB,EAAE;YACvE,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,MAAM,UAAU,EAAE;gBACtE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC;gBAC/B,OAAO,EAAE;oBACR,cAAc,EAAE,kBAAkB;iBAClC;gBACD,MAAM,EAAE,MAAM;aACd,CAAC,CAAC;YACH,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,MAAM,GAAG,CAAC,CAAC;QACrE,CAAC;QACD,mBAAmB,EAAE,KAAK,IAAsB,EAAE;YACjD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,oBAAoB,CAAC,CAAC;YACjE,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;QAClE,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,MAAc,EAAoB,EAAE;YACvD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,MAAM,OAAO,CAAC,CAAC;YACpE,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,sBAAsB,MAAM,GAAG,CAAC,CAAC;QAC1E,CAAC;QACD,sBAAsB,EAAE,KAAK,EAAE,MAAc,EAAoB,EAAE;YAClE,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,MAAM,sBAAsB,EAAE;gBAClF,MAAM,EAAE,MAAM;aACd,CAAC,CAAC;YACH,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,iCAAiC,MAAM,GAAG,CAAC,CAAC;QACrF,CAAC;QACD,UAAU,EAAE,KAAK,IAAsB,EAAE;YACxC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,SAAS,CAAC,CAAC;YACtD,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QACxD,CAAC;QACD,SAAS,EAAE,KAAK,EAAE,OAAe,EAAwC,EAAE;YAC1E,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,OAAO,OAAO,CAAC,CAAC;YACrE,OAAO,MAAM,qBAAqB,CAAC,QAAQ,EAAE,eAAe,OAAO,GAAG,CAAC,CAAC;QACzE,CAAC;QACD,YAAY,EAAE,KAAK,EAAE,OAAe,EAAiB,EAAE;YACtD,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,cAAc,EAAE,KAAK,IAAsB,EAAE;YAC5C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACnF,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QAC5D,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,MAAc,EAAoB,EAAE;YACvD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,UAAU,MAAM,UAAU,EAAE;gBACtE,MAAM,EAAE,MAAM;aACd,CAAC,CAAC;YACH,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,MAAM,GAAG,CAAC,CAAC;QACrE,CAAC;KACD,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"controller-client.js","sourceRoot":"","sources":["../../../src/controller/http/controller-client.ts"],"names":[],"mappings":"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"}

package/dist/controller/http/controller-http-route-support.d.ts CHANGED Viewed

@@ -5,10 +5,17 @@ export declare class ControllerTaskNotReadyError extends Error {
 }
 export declare class ControllerRuntimeAtCapacityError extends Error {
 }
+export interface EnableSshForZoneOptions {
+    readonly adminToken?: string;
+    readonly secretEnv: 'default' | 'with-secrets';
+}
+export interface ExecInZoneOptions {
+    readonly adminToken?: string;
+}
 export interface ControllerRouteOperations {
     readonly destroyZone: (zoneId: string, purge: boolean) => Promise<unknown>;
-    readonly enableSshForZone?: (zoneId: string) => Promise<unknown>;
-    readonly execInZone?: (zoneId: string, command: string) => Promise<unknown>;
+    readonly enableSshForZone?: (zoneId: string, options: EnableSshForZoneOptions) => Promise<unknown>;
+    readonly execInZone?: (zoneId: string, command: string, options: ExecInZoneOptions) => Promise<unknown>;
     readonly getStatus: () => Promise<unknown>;
     readonly getTaskState?: (zoneId: string, taskId: string) => Promise<unknown>;
     readonly getZoneHealth?: (zoneId: string) => Promise<{

package/dist/controller/http/controller-http-route-support.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller-http-route-support.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EACX,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAExF,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AACzD,qBAAa,gCAAiC,SAAQ,KAAK;CAAG;AAE9D,MAAM,WAAW,yBAAyB;IACzC,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3E,QAAQ,CAAC,gBAAgB,CAAC,EAAE,~~CAAC~~,MAAM,EAAE,MAAM,~~KAAK~~,OAAO,CAAC,OAAO,CAAC,CAAC;~~IACjE~~,QAAQ,CAAC,UAAU,CAAC,EAAE,~~CAAC~~,MAAM,EAAE,MAAM,~~EAAE~~,OAAO,EAAE,MAAM,~~KAAK~~,OAAO,CAAC,OAAO,CAAC,CAAC;~~IAC5E~~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"}
1	+ {"version":3,"file":"controller-http-route-support.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"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"}