agent-yes 1.246.0 → 1.246.1-beta.586.1
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/{SUPPORTED_CLIS-DcP6VQha.js → SUPPORTED_CLIS--aR6u_NV.js} +3 -3
- package/dist/{SUPPORTED_CLIS-D_2-k7ZK.js → SUPPORTED_CLIS-CY4nG81S.js} +2 -2
- package/dist/{agentShare-DhITqvKb.js → agentShare-hm9q-36R.js} +2 -2
- package/dist/{callback-DdLX8E0I.js → callback-BCiF7yO5.js} +2 -2
- package/dist/{callback-CeNybWS2.js → callback-QxV0FFVa.js} +3 -3
- package/dist/cli.js +5 -5
- package/dist/index.js +2 -2
- package/dist/{notifyDaemon-XpKwV3oq.js → notifyDaemon-DEVu7RbI.js} +2 -2
- package/dist/{rustBinary-BHVUt_lk.js → rustBinary-ocX8DmxE.js} +2 -2
- package/dist/{schedule-JbSWgSN9.js → schedule-Cz1G-OTd.js} +4 -4
- package/dist/{serve-DsfTZs_W.js → serve-BWpXW3lb.js} +30 -24
- package/dist/{setup-PZhaZPTH.js → setup-HST79teQ.js} +2 -2
- package/dist/{subcommands-DWIL0HU9.js → subcommands-BP09cQ9N.js} +1 -1
- package/dist/{subcommands-DIJlW9WX.js → subcommands-BXHEFTJr.js} +37 -19
- package/dist/{terminal-DGFIXF4G.js → terminal-aORfCoJA.js} +2 -2
- package/dist/{ts-OaAlshag.js → ts-BWwFz7M1.js} +2 -2
- package/dist/{versionChecker-BPMjOlO6.js → versionChecker-U8rDPt2P.js} +2 -2
- package/dist/{widget-DneBUOXf.js → widget-C3sA5LBW.js} +3 -3
- package/dist/{ws-D-givibu.js → ws-BEbzquYX.js} +2 -2
- package/package.json +1 -1
- package/ts/serve.ts +25 -15
- package/ts/subcommands.ts +60 -7
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import "./logger-CDIsZ-Pp.js";
|
|
2
|
-
import "./versionChecker-
|
|
3
|
-
import "./ts-
|
|
2
|
+
import "./versionChecker-U8rDPt2P.js";
|
|
3
|
+
import "./ts-BWwFz7M1.js";
|
|
4
4
|
import "./todoAutomation-Buo457VO.js";
|
|
5
5
|
import "./JsonlStore-CPGIR0Wy.js";
|
|
6
6
|
import "./globalPidIndex-D9DOSd-c.js";
|
|
7
7
|
import "./pidStore-6EZd5DUv.js";
|
|
8
8
|
import "./messageLog-C-YIzhRj.js";
|
|
9
|
-
import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-
|
|
9
|
+
import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-CY4nG81S.js";
|
|
10
10
|
|
|
11
11
|
export { SUPPORTED_CLIS };
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { t as CLIS_CONFIG } from "./ts-
|
|
1
|
+
import { t as CLIS_CONFIG } from "./ts-BWwFz7M1.js";
|
|
2
2
|
|
|
3
3
|
//#region ts/SUPPORTED_CLIS.ts
|
|
4
4
|
const SUPPORTED_CLIS = Object.keys(CLIS_CONFIG);
|
|
5
5
|
|
|
6
6
|
//#endregion
|
|
7
7
|
export { SUPPORTED_CLIS as t };
|
|
8
|
-
//# sourceMappingURL=SUPPORTED_CLIS-
|
|
8
|
+
//# sourceMappingURL=SUPPORTED_CLIS-CY4nG81S.js.map
|
|
@@ -3,7 +3,7 @@ import "./globalPidIndex-D9DOSd-c.js";
|
|
|
3
3
|
import "./messageLog-C-YIzhRj.js";
|
|
4
4
|
import "./e2e-CEIdJGZ7.js";
|
|
5
5
|
import "./configShared-9wVlbPyC.js";
|
|
6
|
-
import { P as resolveOne } from "./subcommands-
|
|
6
|
+
import { P as resolveOne } from "./subcommands-BXHEFTJr.js";
|
|
7
7
|
import "./webrtcLink-BMYneHbu.js";
|
|
8
8
|
import "./remotes-BxQnNxQv.js";
|
|
9
9
|
import { a as startShare } from "./share-BGl3wutJ.js";
|
|
@@ -229,4 +229,4 @@ function transformEvent(rawEvent, agentId, forwarded) {
|
|
|
229
229
|
|
|
230
230
|
//#endregion
|
|
231
231
|
export { createScopedShare, listShares, revokeAllShares, revokeShare };
|
|
232
|
-
//# sourceMappingURL=agentShare-
|
|
232
|
+
//# sourceMappingURL=agentShare-hm9q-36R.js.map
|
|
@@ -3,10 +3,10 @@ import "./globalPidIndex-D9DOSd-c.js";
|
|
|
3
3
|
import "./messageLog-C-YIzhRj.js";
|
|
4
4
|
import "./e2e-CEIdJGZ7.js";
|
|
5
5
|
import "./configShared-9wVlbPyC.js";
|
|
6
|
-
import "./subcommands-
|
|
6
|
+
import "./subcommands-BXHEFTJr.js";
|
|
7
7
|
import "./webrtcLink-BMYneHbu.js";
|
|
8
8
|
import "./remotes-BxQnNxQv.js";
|
|
9
9
|
import "./callbackCore-Dd28_cBM.js";
|
|
10
|
-
import { i as loadOrCreateCallbackSecret, n as isCallbackRevoked, r as loadCallbackSecretReadOnly, t as cmdCallback } from "./callback-
|
|
10
|
+
import { i as loadOrCreateCallbackSecret, n as isCallbackRevoked, r as loadCallbackSecretReadOnly, t as cmdCallback } from "./callback-QxV0FFVa.js";
|
|
11
11
|
|
|
12
12
|
export { cmdCallback };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { t as agentYesHome } from "./agentYesHome-CtmsY6I-.js";
|
|
2
|
-
import { P as resolveOne } from "./subcommands-
|
|
2
|
+
import { P as resolveOne } from "./subcommands-BXHEFTJr.js";
|
|
3
3
|
import { a as mintCapability, o as parseExpires } from "./callbackCore-Dd28_cBM.js";
|
|
4
4
|
import { randomBytes } from "node:crypto";
|
|
5
5
|
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
|
@@ -72,7 +72,7 @@ async function resolveBase(flag) {
|
|
|
72
72
|
if (flag) return flag;
|
|
73
73
|
if (process.env.AGENT_YES_CALLBACK_BASE) return process.env.AGENT_YES_CALLBACK_BASE;
|
|
74
74
|
try {
|
|
75
|
-
const { resolveLocalServeUrl } = await import("./serve-
|
|
75
|
+
const { resolveLocalServeUrl } = await import("./serve-BWpXW3lb.js");
|
|
76
76
|
const url = await resolveLocalServeUrl();
|
|
77
77
|
if (url) return url;
|
|
78
78
|
} catch {}
|
|
@@ -187,4 +187,4 @@ async function cmdCallback(rest) {
|
|
|
187
187
|
|
|
188
188
|
//#endregion
|
|
189
189
|
export { loadOrCreateCallbackSecret as i, isCallbackRevoked as n, loadCallbackSecretReadOnly as r, cmdCallback as t };
|
|
190
|
-
//# sourceMappingURL=callback-
|
|
190
|
+
//# sourceMappingURL=callback-QxV0FFVa.js.map
|
package/dist/cli.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
#!/usr/bin/env bun
|
|
2
2
|
import { t as invokedCliName } from "./invokedCli-uqM2YYA7.js";
|
|
3
3
|
import { n as logger } from "./logger-CDIsZ-Pp.js";
|
|
4
|
-
import { i as versionString, n as displayVersion, t as checkAndAutoUpdate } from "./versionChecker-
|
|
5
|
-
import { n as getRustBinary } from "./rustBinary-
|
|
4
|
+
import { i as versionString, n as displayVersion, t as checkAndAutoUpdate } from "./versionChecker-U8rDPt2P.js";
|
|
5
|
+
import { n as getRustBinary } from "./rustBinary-ocX8DmxE.js";
|
|
6
6
|
import { argv } from "process";
|
|
7
7
|
import { spawn } from "child_process";
|
|
8
8
|
import ms from "ms";
|
|
@@ -285,7 +285,7 @@ function buildRustArgs(argv, cliFromScript, supportedClis) {
|
|
|
285
285
|
const rawArg = process.argv[2];
|
|
286
286
|
const managerCommands = !invokedCliName(process.argv);
|
|
287
287
|
const isHelpFlag = rawArg === "-h" || rawArg === "--help";
|
|
288
|
-
const { isSubcommand, runSubcommand, cmdHelp, isUnknownManagerToken } = await import("./subcommands-
|
|
288
|
+
const { isSubcommand, runSubcommand, cmdHelp, isUnknownManagerToken } = await import("./subcommands-BP09cQ9N.js");
|
|
289
289
|
if (isHelpFlag && process.argv.length === 3) {
|
|
290
290
|
await cmdHelp(managerCommands);
|
|
291
291
|
process.exit(0);
|
|
@@ -295,7 +295,7 @@ function buildRustArgs(argv, cliFromScript, supportedClis) {
|
|
|
295
295
|
process.exit(code ?? 0);
|
|
296
296
|
}
|
|
297
297
|
{
|
|
298
|
-
const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS
|
|
298
|
+
const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS--aR6u_NV.js");
|
|
299
299
|
if (isUnknownManagerToken(rawArg, managerCommands, SUPPORTED_CLIS)) {
|
|
300
300
|
process.stderr.write(`ay: unknown subcommand or CLI '${rawArg}'.\n See 'ay help' for subcommands. To run an agent, name a CLI:\n 'ay <cli> …' (e.g. 'ay claude …') or 'ay --cli <cli> …'.\n`);
|
|
301
301
|
process.exit(1);
|
|
@@ -346,7 +346,7 @@ if (config.useRust) {
|
|
|
346
346
|
}
|
|
347
347
|
}
|
|
348
348
|
if (rustBinary) {
|
|
349
|
-
const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS
|
|
349
|
+
const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS--aR6u_NV.js");
|
|
350
350
|
const rustArgs = buildRustArgs(process.argv, config.cli, SUPPORTED_CLIS);
|
|
351
351
|
if (config.verbose) {
|
|
352
352
|
console.log(`[rust] Using binary: ${rustBinary}`);
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import "./logger-CDIsZ-Pp.js";
|
|
2
|
-
import "./versionChecker-
|
|
3
|
-
import { a as hasTodoStore, c as AgentContext, i as answerAsk, n as agentYes, o as listAsks, r as config, s as listAsksForProject, t as CLIS_CONFIG } from "./ts-
|
|
2
|
+
import "./versionChecker-U8rDPt2P.js";
|
|
3
|
+
import { a as hasTodoStore, c as AgentContext, i as answerAsk, n as agentYes, o as listAsks, r as config, s as listAsksForProject, t as CLIS_CONFIG } from "./ts-BWwFz7M1.js";
|
|
4
4
|
import { _ as isKnownKind, a as renderTree, b as statesOf, c as monitorHint, d as openStore, f as DONE_STATE, g as initialState, h as canTransition, i as renderDigest, l as CycleError, m as ORPHANED_STATE, o as unblockedTasks, p as LIFECYCLES, r as openBlockers, s as describeBlock, t as reconcileTodos, u as TodoStore, v as nextStates, x as removeControlCharacters, y as requiredGate } from "./todoAutomation-Buo457VO.js";
|
|
5
5
|
import "./JsonlStore-CPGIR0Wy.js";
|
|
6
6
|
import "./globalPidIndex-D9DOSd-c.js";
|
|
@@ -3,7 +3,7 @@ import "./globalPidIndex-D9DOSd-c.js";
|
|
|
3
3
|
import "./messageLog-C-YIzhRj.js";
|
|
4
4
|
import "./e2e-CEIdJGZ7.js";
|
|
5
5
|
import "./configShared-9wVlbPyC.js";
|
|
6
|
-
import { $ as shouldStealLock, C as listRecords, J as hostId, K as appendEvent, Q as readInbox, X as listInboxParents, Z as liveWatchers, _ as isPidAlive, c as deriveLiveState, et as daemonLockDir, j as renderLogTailLines, nt as notifyDir, q as gcInboxes, tt as daemonLockOwnerPath } from "./subcommands-
|
|
6
|
+
import { $ as shouldStealLock, C as listRecords, J as hostId, K as appendEvent, Q as readInbox, X as listInboxParents, Z as liveWatchers, _ as isPidAlive, c as deriveLiveState, et as daemonLockDir, j as renderLogTailLines, nt as notifyDir, q as gcInboxes, tt as daemonLockOwnerPath } from "./subcommands-BXHEFTJr.js";
|
|
7
7
|
import "./webrtcLink-BMYneHbu.js";
|
|
8
8
|
import "./remotes-BxQnNxQv.js";
|
|
9
9
|
import { mkdir, readFile, rename, rm, stat, writeFile } from "fs/promises";
|
|
@@ -589,4 +589,4 @@ async function ensureDaemon() {
|
|
|
589
589
|
|
|
590
590
|
//#endregion
|
|
591
591
|
export { daemonStatus, ensureDaemon, requestDaemonStop, runDaemon };
|
|
592
|
-
//# sourceMappingURL=notifyDaemon-
|
|
592
|
+
//# sourceMappingURL=notifyDaemon-DEVu7RbI.js.map
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { r as getInstalledPackage } from "./versionChecker-
|
|
1
|
+
import { r as getInstalledPackage } from "./versionChecker-U8rDPt2P.js";
|
|
2
2
|
import { execFileSync } from "child_process";
|
|
3
3
|
import { existsSync, mkdirSync, unlinkSync } from "fs";
|
|
4
4
|
import { chmod, copyFile } from "fs/promises";
|
|
@@ -225,4 +225,4 @@ async function getRustBinary(options = {}) {
|
|
|
225
225
|
|
|
226
226
|
//#endregion
|
|
227
227
|
export { getRustBinary as n, findSpawnHiddenLauncher as t };
|
|
228
|
-
//# sourceMappingURL=rustBinary-
|
|
228
|
+
//# sourceMappingURL=rustBinary-ocX8DmxE.js.map
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import "./logger-CDIsZ-Pp.js";
|
|
2
|
-
import "./versionChecker-
|
|
3
|
-
import "./ts-
|
|
2
|
+
import "./versionChecker-U8rDPt2P.js";
|
|
3
|
+
import "./ts-BWwFz7M1.js";
|
|
4
4
|
import "./todoAutomation-Buo457VO.js";
|
|
5
5
|
import "./JsonlStore-CPGIR0Wy.js";
|
|
6
6
|
import "./globalPidIndex-D9DOSd-c.js";
|
|
7
7
|
import "./pidStore-6EZd5DUv.js";
|
|
8
8
|
import "./messageLog-C-YIzhRj.js";
|
|
9
|
-
import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-
|
|
9
|
+
import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-CY4nG81S.js";
|
|
10
10
|
import { d as resolveSpawnCwd } from "./workspaceConfig-DOHygA2x.js";
|
|
11
11
|
import { n as liveEnv, t as ensureNodeRuntime } from "./nodeRuntime-BtL6Oo1o.js";
|
|
12
12
|
import { createHash } from "node:crypto";
|
|
@@ -153,4 +153,4 @@ async function cmdSchedule(rest) {
|
|
|
153
153
|
|
|
154
154
|
//#endregion
|
|
155
155
|
export { cmdSchedule };
|
|
156
|
-
//# sourceMappingURL=schedule-
|
|
156
|
+
//# sourceMappingURL=schedule-Cz1G-OTd.js.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import "./logger-CDIsZ-Pp.js";
|
|
2
|
-
import { r as getInstalledPackage } from "./versionChecker-
|
|
3
|
-
import { t as findSpawnHiddenLauncher } from "./rustBinary-
|
|
4
|
-
import { i as answerAsk, l as CLAUDE_SESSION_PIN_ENV, o as listAsks } from "./ts-
|
|
2
|
+
import { r as getInstalledPackage } from "./versionChecker-U8rDPt2P.js";
|
|
3
|
+
import { t as findSpawnHiddenLauncher } from "./rustBinary-ocX8DmxE.js";
|
|
4
|
+
import { i as answerAsk, l as CLAUDE_SESSION_PIN_ENV, o as listAsks } from "./ts-BWwFz7M1.js";
|
|
5
5
|
import { t as agentYesHome$1 } from "./agentYesHome-CtmsY6I-.js";
|
|
6
6
|
import { x as removeControlCharacters } from "./todoAutomation-Buo457VO.js";
|
|
7
7
|
import "./JsonlStore-CPGIR0Wy.js";
|
|
@@ -11,12 +11,12 @@ import { r as recordInbox } from "./messageLog-C-YIzhRj.js";
|
|
|
11
11
|
import { t as pgidForWrapper } from "./reaper-DP49VCKx.js";
|
|
12
12
|
import "./e2e-CEIdJGZ7.js";
|
|
13
13
|
import "./configShared-9wVlbPyC.js";
|
|
14
|
-
import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-
|
|
15
|
-
import { A as recentReadEdges, C as listRecords, D as readNotes, G as writeToIpc, M as renderRawLog, N as renderRawLogLines, O as readPtysize, P as resolveOne, Y as isTransientLockMkdirError, f as extractNeedsInput, j as renderLogTailLines, k as recentMessageEdges, l as deriveLiveStatus, o as controlCodeFromName, p as extractTaskCounts, rt as TYPING_BADGE, u as extractBadges, x as isUserTyping, z as snapshotStatus } from "./subcommands-
|
|
14
|
+
import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-CY4nG81S.js";
|
|
15
|
+
import { A as recentReadEdges, C as listRecords, D as readNotes, G as writeToIpc, M as renderRawLog, N as renderRawLogLines, O as readPtysize, P as resolveOne, Y as isTransientLockMkdirError, f as extractNeedsInput, j as renderLogTailLines, k as recentMessageEdges, l as deriveLiveStatus, o as controlCodeFromName, p as extractTaskCounts, rt as TYPING_BADGE, u as extractBadges, x as isUserTyping, z as snapshotStatus } from "./subcommands-BXHEFTJr.js";
|
|
16
16
|
import "./webrtcLink-BMYneHbu.js";
|
|
17
17
|
import "./remotes-BxQnNxQv.js";
|
|
18
18
|
import { i as frameVisitorMessage, s as verifyCapability, t as MAX_CALLBACK_MSG_BYTES } from "./callbackCore-Dd28_cBM.js";
|
|
19
|
-
import { n as isCallbackRevoked, r as loadCallbackSecretReadOnly } from "./callback-
|
|
19
|
+
import { n as isCallbackRevoked, r as loadCallbackSecretReadOnly } from "./callback-QxV0FFVa.js";
|
|
20
20
|
import { a as getSpawnHook, c as hasProvisionHook, d as resolveSpawnCwd, i as getProvisionRoot, l as hasSpawnHook, r as getProvisionHook, u as isProvisionAllowed } from "./workspaceConfig-DOHygA2x.js";
|
|
21
21
|
import { n as liveEnv, t as ensureNodeRuntime } from "./nodeRuntime-BtL6Oo1o.js";
|
|
22
22
|
import { r as spawnRejectionReason } from "./spawnGate-BxgS_GlF.js";
|
|
@@ -1790,20 +1790,26 @@ Options:
|
|
|
1790
1790
|
try {
|
|
1791
1791
|
if (eff) {
|
|
1792
1792
|
negoCapsGoneAt.delete(pid);
|
|
1793
|
-
|
|
1793
|
+
let curr = null;
|
|
1794
1794
|
try {
|
|
1795
|
-
const
|
|
1796
|
-
|
|
1797
|
-
|
|
1798
|
-
|
|
1799
|
-
|
|
1800
|
-
|
|
1801
|
-
|
|
1802
|
-
return;
|
|
1803
|
-
}
|
|
1795
|
+
const parts = (await readFile(file, "utf-8")).trim().split(/\s+/);
|
|
1796
|
+
const c = Number(parts[0]);
|
|
1797
|
+
const r = Number(parts[1]);
|
|
1798
|
+
if (Number.isFinite(c) && Number.isFinite(r)) curr = {
|
|
1799
|
+
cols: c,
|
|
1800
|
+
rows: r
|
|
1801
|
+
};
|
|
1804
1802
|
} catch {}
|
|
1803
|
+
if (curr && Math.abs(curr.cols - eff.cols) <= 1 && Math.abs(curr.rows - eff.rows) <= 1) {
|
|
1804
|
+
negoApplied.set(pid, {
|
|
1805
|
+
cols: eff.cols,
|
|
1806
|
+
rows: eff.rows,
|
|
1807
|
+
content: ""
|
|
1808
|
+
});
|
|
1809
|
+
return;
|
|
1810
|
+
}
|
|
1805
1811
|
const content = `${eff.cols} ${eff.rows} ${Date.now()}\n`;
|
|
1806
|
-
process.stderr.write(`[api/resize] pid=${pid} ${eff.cols}x${eff.rows} src=presence-nego daemon=${daemonTag} caps=${caps.length}
|
|
1812
|
+
process.stderr.write(`[api/resize] pid=${pid} ${eff.cols}x${eff.rows} src=presence-nego daemon=${daemonTag} caps=${caps.length}` + (curr ? ` correct=${curr.cols}x${curr.rows}` : ``) + `\n`);
|
|
1807
1813
|
await mkdir(path.dirname(file), { recursive: true });
|
|
1808
1814
|
await writeFile(file, content);
|
|
1809
1815
|
negoApplied.set(pid, {
|
|
@@ -2294,7 +2300,7 @@ Options:
|
|
|
2294
2300
|
}
|
|
2295
2301
|
});
|
|
2296
2302
|
if (req.method === "GET" && p === "/api/ws") {
|
|
2297
|
-
const ws = await import("./ws-
|
|
2303
|
+
const ws = await import("./ws-BEbzquYX.js");
|
|
2298
2304
|
try {
|
|
2299
2305
|
await ws.loadProvision();
|
|
2300
2306
|
} catch (e) {
|
|
@@ -2314,7 +2320,7 @@ Options:
|
|
|
2314
2320
|
if (req.method === "GET" && p === "/api/ws/status") {
|
|
2315
2321
|
const dirRaw = url.searchParams.get("path");
|
|
2316
2322
|
if (!dirRaw) return new Response("missing ?path=<workspace dir>", { status: 400 });
|
|
2317
|
-
const ws = await import("./ws-
|
|
2323
|
+
const ws = await import("./ws-BEbzquYX.js");
|
|
2318
2324
|
let prov;
|
|
2319
2325
|
try {
|
|
2320
2326
|
prov = await ws.loadProvision();
|
|
@@ -3064,7 +3070,7 @@ Options:
|
|
|
3064
3070
|
const perm = body.perm ?? "r";
|
|
3065
3071
|
if (perm !== "r" && perm !== "rw") return new Response(`invalid perm ${perm} (want r or rw)`, { status: 400 });
|
|
3066
3072
|
try {
|
|
3067
|
-
const { createScopedShare } = await import("./agentShare-
|
|
3073
|
+
const { createScopedShare } = await import("./agentShare-hm9q-36R.js");
|
|
3068
3074
|
const share = await createScopedShare({
|
|
3069
3075
|
agent: body.agent,
|
|
3070
3076
|
perm,
|
|
@@ -3079,12 +3085,12 @@ Options:
|
|
|
3079
3085
|
}
|
|
3080
3086
|
}
|
|
3081
3087
|
if (req.method === "GET" && p === "/api/shares") {
|
|
3082
|
-
const { listShares } = await import("./agentShare-
|
|
3088
|
+
const { listShares } = await import("./agentShare-hm9q-36R.js");
|
|
3083
3089
|
return Response.json(listShares());
|
|
3084
3090
|
}
|
|
3085
3091
|
const revokeM = /^\/api\/share\/([^/]+)$/.exec(p);
|
|
3086
3092
|
if (req.method === "DELETE" && revokeM) {
|
|
3087
|
-
const { revokeShare } = await import("./agentShare-
|
|
3093
|
+
const { revokeShare } = await import("./agentShare-hm9q-36R.js");
|
|
3088
3094
|
const ok = revokeShare(decodeURIComponent(revokeM[1]));
|
|
3089
3095
|
return new Response(ok ? "revoked" : "no such share", { status: ok ? 200 : 404 });
|
|
3090
3096
|
}
|
|
@@ -3386,7 +3392,7 @@ Options:
|
|
|
3386
3392
|
const shutdown = (resolve) => {
|
|
3387
3393
|
if (heartbeat) clearInterval(heartbeat);
|
|
3388
3394
|
closeShare?.();
|
|
3389
|
-
import("./agentShare-
|
|
3395
|
+
import("./agentShare-hm9q-36R.js").then((m) => m.revokeAllShares()).catch(() => {});
|
|
3390
3396
|
server?.stop();
|
|
3391
3397
|
Promise.resolve(releaseHostLock?.()).catch(() => {}).then(resolve);
|
|
3392
3398
|
};
|
|
@@ -3399,4 +3405,4 @@ Options:
|
|
|
3399
3405
|
|
|
3400
3406
|
//#endregion
|
|
3401
3407
|
export { cmdServe, loadTokenReadOnly, mintScopedTermToken, resolveDaemonHttpBase, resolveLocalServeUrl };
|
|
3402
|
-
//# sourceMappingURL=serve-
|
|
3408
|
+
//# sourceMappingURL=serve-BWpXW3lb.js.map
|
|
@@ -32,7 +32,7 @@ async function cmdSetup(rest) {
|
|
|
32
32
|
if (!existsSync(abs)) process.stderr.write(` note: that directory doesn't exist yet — create it, or agents spawned there will fail\n`);
|
|
33
33
|
if (noShare) return 0;
|
|
34
34
|
process.stdout.write(`\nsharing this machine to agent-yes.com…\n`);
|
|
35
|
-
const { cmdServe } = await import("./serve-
|
|
35
|
+
const { cmdServe } = await import("./serve-BWpXW3lb.js");
|
|
36
36
|
return cmdServe([
|
|
37
37
|
"install",
|
|
38
38
|
"--share",
|
|
@@ -42,4 +42,4 @@ async function cmdSetup(rest) {
|
|
|
42
42
|
|
|
43
43
|
//#endregion
|
|
44
44
|
export { cmdSetup };
|
|
45
|
-
//# sourceMappingURL=setup-
|
|
45
|
+
//# sourceMappingURL=setup-HST79teQ.js.map
|
|
@@ -3,7 +3,7 @@ import "./globalPidIndex-D9DOSd-c.js";
|
|
|
3
3
|
import "./messageLog-C-YIzhRj.js";
|
|
4
4
|
import "./e2e-CEIdJGZ7.js";
|
|
5
5
|
import "./configShared-9wVlbPyC.js";
|
|
6
|
-
import { A as recentReadEdges, B as stdinActivityPath, C as listRecords, D as readNotes, E as readAgentPtysize, F as resolveReadWindow, G as writeToIpc, H as submitAndConfirm, I as resolveResumeArgs, L as restartHintLines, M as renderRawLog, N as renderRawLogLines, O as readPtysize, P as resolveOne, R as runSubcommand, S as lastStdinAt, T as menuSelectKeys, U as waitForLogQuiet, V as stopTipForCli, W as writeKeysPaced, _ as isPidAlive, a as cmdHelp, b as isUnknownManagerToken, c as deriveLiveState, d as extractMenu, f as extractNeedsInput, g as isExitRequest, h as isAgentStuck, i as backoffWhileTyping, j as renderLogTailLines, k as recentMessageEdges, l as deriveLiveStatus, m as finalizedLines, n as READ_PAGE_DEFAULT, o as controlCodeFromName, p as extractTaskCounts, r as TYPING_WINDOW_MS, s as cursorAbs, t as GRACEFUL_EXIT_COMMANDS, u as extractBadges, v as isSlashCommand, w as matchKeyword, x as isUserTyping, y as isSubcommand, z as snapshotStatus } from "./subcommands-
|
|
6
|
+
import { A as recentReadEdges, B as stdinActivityPath, C as listRecords, D as readNotes, E as readAgentPtysize, F as resolveReadWindow, G as writeToIpc, H as submitAndConfirm, I as resolveResumeArgs, L as restartHintLines, M as renderRawLog, N as renderRawLogLines, O as readPtysize, P as resolveOne, R as runSubcommand, S as lastStdinAt, T as menuSelectKeys, U as waitForLogQuiet, V as stopTipForCli, W as writeKeysPaced, _ as isPidAlive, a as cmdHelp, b as isUnknownManagerToken, c as deriveLiveState, d as extractMenu, f as extractNeedsInput, g as isExitRequest, h as isAgentStuck, i as backoffWhileTyping, j as renderLogTailLines, k as recentMessageEdges, l as deriveLiveStatus, m as finalizedLines, n as READ_PAGE_DEFAULT, o as controlCodeFromName, p as extractTaskCounts, r as TYPING_WINDOW_MS, s as cursorAbs, t as GRACEFUL_EXIT_COMMANDS, u as extractBadges, v as isSlashCommand, w as matchKeyword, x as isUserTyping, y as isSubcommand, z as snapshotStatus } from "./subcommands-BXHEFTJr.js";
|
|
7
7
|
import "./webrtcLink-BMYneHbu.js";
|
|
8
8
|
import "./remotes-BxQnNxQv.js";
|
|
9
9
|
|
|
@@ -1267,31 +1267,31 @@ async function runSubcommand(argv) {
|
|
|
1267
1267
|
return cmdCh(rest);
|
|
1268
1268
|
}
|
|
1269
1269
|
case "term": {
|
|
1270
|
-
const { cmdTerm } = await import("./terminal-
|
|
1270
|
+
const { cmdTerm } = await import("./terminal-aORfCoJA.js");
|
|
1271
1271
|
return cmdTerm(rest);
|
|
1272
1272
|
}
|
|
1273
1273
|
case "widget": {
|
|
1274
|
-
const { cmdWidget } = await import("./widget-
|
|
1274
|
+
const { cmdWidget } = await import("./widget-C3sA5LBW.js");
|
|
1275
1275
|
return cmdWidget(rest);
|
|
1276
1276
|
}
|
|
1277
1277
|
case "mint": {
|
|
1278
|
-
const { cmdMint } = await import("./widget-
|
|
1278
|
+
const { cmdMint } = await import("./widget-C3sA5LBW.js");
|
|
1279
1279
|
return cmdMint(rest);
|
|
1280
1280
|
}
|
|
1281
1281
|
case "serve": {
|
|
1282
|
-
const { cmdServe } = await import("./serve-
|
|
1282
|
+
const { cmdServe } = await import("./serve-BWpXW3lb.js");
|
|
1283
1283
|
return cmdServe(rest);
|
|
1284
1284
|
}
|
|
1285
1285
|
case "setup": {
|
|
1286
|
-
const { cmdSetup } = await import("./setup-
|
|
1286
|
+
const { cmdSetup } = await import("./setup-HST79teQ.js");
|
|
1287
1287
|
return cmdSetup(rest);
|
|
1288
1288
|
}
|
|
1289
1289
|
case "ws": {
|
|
1290
|
-
const { cmdWs } = await import("./ws-
|
|
1290
|
+
const { cmdWs } = await import("./ws-BEbzquYX.js");
|
|
1291
1291
|
return cmdWs(rest);
|
|
1292
1292
|
}
|
|
1293
1293
|
case "schedule": {
|
|
1294
|
-
const { cmdSchedule } = await import("./schedule-
|
|
1294
|
+
const { cmdSchedule } = await import("./schedule-Cz1G-OTd.js");
|
|
1295
1295
|
return cmdSchedule(rest);
|
|
1296
1296
|
}
|
|
1297
1297
|
case "remote": {
|
|
@@ -1303,7 +1303,7 @@ async function runSubcommand(argv) {
|
|
|
1303
1303
|
return cmdExpose(rest);
|
|
1304
1304
|
}
|
|
1305
1305
|
case "callback": {
|
|
1306
|
-
const { cmdCallback } = await import("./callback-
|
|
1306
|
+
const { cmdCallback } = await import("./callback-BCiF7yO5.js");
|
|
1307
1307
|
return cmdCallback(rest);
|
|
1308
1308
|
}
|
|
1309
1309
|
case "reap":
|
|
@@ -3706,11 +3706,12 @@ async function cmdAttach(rest) {
|
|
|
3706
3706
|
const winsizeDir = path.join(ayHome, "winsize");
|
|
3707
3707
|
await mkdir(winsizeDir, { recursive: true });
|
|
3708
3708
|
const winsizePath = path.join(winsizeDir, String(record.pid));
|
|
3709
|
-
const { resolveDaemonHttpBase, loadTokenReadOnly } = await import("./serve-
|
|
3709
|
+
const { resolveDaemonHttpBase, loadTokenReadOnly } = await import("./serve-BWpXW3lb.js");
|
|
3710
3710
|
const daemonBase = await resolveDaemonHttpBase().catch(() => null);
|
|
3711
|
-
const daemonToken = daemonBase ? await loadTokenReadOnly().catch(() => null) :
|
|
3711
|
+
const daemonToken = daemonBase ? await loadTokenReadOnly().catch(() => null) ?? "" : "";
|
|
3712
3712
|
const capViewer = `attach:${process.pid}`;
|
|
3713
|
-
let capMode = !!
|
|
3713
|
+
let capMode = !!daemonBase;
|
|
3714
|
+
process.stderr.write(`[ay-attach] pid=${record.pid} daemon=${daemonBase ?? "none"} token=${daemonToken ? "yes" : "empty"} mode=${capMode ? "cap" : "direct"}\n`);
|
|
3714
3715
|
const writeWinsizeDirect = async (cols, rows) => {
|
|
3715
3716
|
try {
|
|
3716
3717
|
await writeFile(winsizePath, `${cols} ${rows} ${Date.now()}\n`);
|
|
@@ -3720,10 +3721,18 @@ async function cmdAttach(rest) {
|
|
|
3720
3721
|
} catch {}
|
|
3721
3722
|
} catch {}
|
|
3722
3723
|
};
|
|
3724
|
+
let sizeWarned = false;
|
|
3723
3725
|
const sendResize = async () => {
|
|
3724
|
-
const cols = process.stdout.columns ??
|
|
3725
|
-
const rows = process.stdout.rows ??
|
|
3726
|
-
if (
|
|
3726
|
+
const cols = process.stdout.columns ?? 0;
|
|
3727
|
+
const rows = process.stdout.rows ?? 0;
|
|
3728
|
+
if (cols < 1 || rows < 1) {
|
|
3729
|
+
if (!sizeWarned) {
|
|
3730
|
+
sizeWarned = true;
|
|
3731
|
+
process.stderr.write(`[ay-attach] pid=${record.pid} terminal size unavailable (${cols}x${rows}) — not reporting yet\n`);
|
|
3732
|
+
}
|
|
3733
|
+
return;
|
|
3734
|
+
}
|
|
3735
|
+
if (capMode && daemonBase) {
|
|
3727
3736
|
try {
|
|
3728
3737
|
if ((await fetch(`${daemonBase}/api/resize/${encodeURIComponent(String(record.pid))}?token=${encodeURIComponent(daemonToken)}`, {
|
|
3729
3738
|
method: "POST",
|
|
@@ -3742,20 +3751,21 @@ async function cmdAttach(rest) {
|
|
|
3742
3751
|
}
|
|
3743
3752
|
await writeWinsizeDirect(cols, rows);
|
|
3744
3753
|
};
|
|
3754
|
+
for (let i = 0; i < 15 && (!process.stdout.columns || !process.stdout.rows); i++) await new Promise((r) => setTimeout(r, 100));
|
|
3745
3755
|
await sendResize();
|
|
3746
3756
|
const capHeartbeat = capMode ? setInterval(() => {
|
|
3747
3757
|
if (capMode) sendResize();
|
|
3748
3758
|
}, 5e3) : null;
|
|
3749
3759
|
const withdrawAttachCap = async () => {
|
|
3750
3760
|
if (capHeartbeat) clearInterval(capHeartbeat);
|
|
3751
|
-
if (!daemonBase
|
|
3761
|
+
if (!daemonBase) return;
|
|
3752
3762
|
try {
|
|
3753
3763
|
await fetch(`${daemonBase}/api/presence?token=${encodeURIComponent(daemonToken)}`, {
|
|
3754
3764
|
method: "POST",
|
|
3755
3765
|
headers: { "content-type": "application/json" },
|
|
3756
3766
|
body: JSON.stringify({
|
|
3757
3767
|
viewer: capViewer,
|
|
3758
|
-
agent:
|
|
3768
|
+
agent: record.pid
|
|
3759
3769
|
})
|
|
3760
3770
|
});
|
|
3761
3771
|
} catch {}
|
|
@@ -3811,6 +3821,8 @@ async function cmdAttach(rest) {
|
|
|
3811
3821
|
detached = true;
|
|
3812
3822
|
if (pollTimer) clearInterval(pollTimer);
|
|
3813
3823
|
if (aliveCheck) clearInterval(aliveCheck);
|
|
3824
|
+
process.off("SIGTERM", onSignalExit);
|
|
3825
|
+
process.off("SIGHUP", onSignalExit);
|
|
3814
3826
|
withdrawAttachCap();
|
|
3815
3827
|
watcher.close();
|
|
3816
3828
|
process.stdout.removeListener("resize", onResize);
|
|
@@ -3845,6 +3857,12 @@ async function cmdAttach(rest) {
|
|
|
3845
3857
|
triggerDetach();
|
|
3846
3858
|
};
|
|
3847
3859
|
process.stdin.on("data", onStdinData);
|
|
3860
|
+
const onSignalExit = () => {
|
|
3861
|
+
triggerDetach();
|
|
3862
|
+
setTimeout(() => process.exit(0), 200);
|
|
3863
|
+
};
|
|
3864
|
+
process.on("SIGTERM", onSignalExit);
|
|
3865
|
+
process.on("SIGHUP", onSignalExit);
|
|
3848
3866
|
aliveCheck = setInterval(() => {
|
|
3849
3867
|
if (!isPidAlive(record.pid)) {
|
|
3850
3868
|
process.stderr.write(`\n[pid ${record.pid} exited]\n`);
|
|
@@ -4385,7 +4403,7 @@ async function cmdNotify(rest) {
|
|
|
4385
4403
|
}
|
|
4386
4404
|
const ensure = async () => {
|
|
4387
4405
|
if (!argv["ensure-daemon"]) return;
|
|
4388
|
-
const { ensureDaemon } = await import("./notifyDaemon-
|
|
4406
|
+
const { ensureDaemon } = await import("./notifyDaemon-DEVu7RbI.js");
|
|
4389
4407
|
await ensureDaemon().catch(() => null);
|
|
4390
4408
|
};
|
|
4391
4409
|
await heartbeatWatcher(parent, selfStartedAt);
|
|
@@ -4459,7 +4477,7 @@ async function cmdNotifyCursor(args) {
|
|
|
4459
4477
|
}
|
|
4460
4478
|
async function cmdNotifyd(rest) {
|
|
4461
4479
|
const sub = rest[0] ?? "status";
|
|
4462
|
-
const daemon = await import("./notifyDaemon-
|
|
4480
|
+
const daemon = await import("./notifyDaemon-DEVu7RbI.js");
|
|
4463
4481
|
switch (sub) {
|
|
4464
4482
|
case "run": return daemon.runDaemon();
|
|
4465
4483
|
case "once": return daemon.runDaemon({ once: true });
|
|
@@ -4486,4 +4504,4 @@ async function cmdNotifyd(rest) {
|
|
|
4486
4504
|
|
|
4487
4505
|
//#endregion
|
|
4488
4506
|
export { shouldStealLock as $, recentReadEdges as A, stdinActivityPath as B, listRecords as C, readNotes as D, readAgentPtysize as E, resolveReadWindow as F, writeToIpc as G, submitAndConfirm as H, resolveResumeArgs as I, hostId as J, appendEvent as K, restartHintLines as L, renderRawLog as M, renderRawLogLines as N, readPtysize as O, resolveOne as P, readInbox as Q, runSubcommand as R, lastStdinAt as S, menuSelectKeys as T, waitForLogQuiet as U, stopTipForCli as V, writeKeysPaced as W, listInboxParents as X, isTransientLockMkdirError as Y, liveWatchers as Z, isPidAlive as _, cmdHelp as a, isUnknownManagerToken as b, deriveLiveState as c, extractMenu as d, daemonLockDir as et, extractNeedsInput as f, isExitRequest as g, isAgentStuck as h, backoffWhileTyping as i, renderLogTailLines as j, recentMessageEdges as k, deriveLiveStatus as l, finalizedLines as m, READ_PAGE_DEFAULT as n, notifyDir as nt, controlCodeFromName as o, extractTaskCounts as p, gcInboxes as q, TYPING_WINDOW_MS as r, TYPING_BADGE as rt, cursorAbs as s, GRACEFUL_EXIT_COMMANDS as t, daemonLockOwnerPath as tt, extractBadges as u, isSlashCommand as v, matchKeyword as w, isUserTyping as x, isSubcommand as y, snapshotStatus as z };
|
|
4489
|
-
//# sourceMappingURL=subcommands-
|
|
4507
|
+
//# sourceMappingURL=subcommands-BXHEFTJr.js.map
|
|
@@ -98,7 +98,7 @@ async function cmdTermMint(args) {
|
|
|
98
98
|
if (flags.ro && flags.interactive) throw new Error("--ro and --interactive are mutually exclusive");
|
|
99
99
|
const ttlSec = parseTtlSec(typeof flags.ttl === "string" ? flags.ttl : "15m");
|
|
100
100
|
const canSend = flags.interactive === true;
|
|
101
|
-
const { mintScopedTermToken } = await import("./serve-
|
|
101
|
+
const { mintScopedTermToken } = await import("./serve-BWpXW3lb.js");
|
|
102
102
|
const r = await mintScopedTermToken(pid, {
|
|
103
103
|
ttlSec,
|
|
104
104
|
canSend
|
|
@@ -135,4 +135,4 @@ async function cmdTerm(args) {
|
|
|
135
135
|
|
|
136
136
|
//#endregion
|
|
137
137
|
export { cmdTerm };
|
|
138
|
-
//# sourceMappingURL=terminal-
|
|
138
|
+
//# sourceMappingURL=terminal-aORfCoJA.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { n as __esmMin, r as __exportAll } from "./chunk-cZBX9HZv.js";
|
|
2
2
|
import { n as logger, t as addTransport } from "./logger-CDIsZ-Pp.js";
|
|
3
|
-
import { r as getInstalledPackage } from "./versionChecker-
|
|
3
|
+
import { r as getInstalledPackage } from "./versionChecker-U8rDPt2P.js";
|
|
4
4
|
import { t as agentYesHome } from "./agentYesHome-CtmsY6I-.js";
|
|
5
5
|
import { d as openStore, p as LIFECYCLES, x as removeControlCharacters } from "./todoAutomation-Buo457VO.js";
|
|
6
6
|
import { i as shouldUseLock, r as releaseLock, t as acquireLock } from "./runningLock-DBoONoM-.js";
|
|
@@ -2027,4 +2027,4 @@ function sleep(ms) {
|
|
|
2027
2027
|
|
|
2028
2028
|
//#endregion
|
|
2029
2029
|
export { hasTodoStore as a, AgentContext as c, answerAsk as i, CLAUDE_SESSION_PIN_ENV as l, agentYes as n, listAsks as o, config as r, listAsksForProject as s, CLIS_CONFIG as t };
|
|
2030
|
-
//# sourceMappingURL=ts-
|
|
2030
|
+
//# sourceMappingURL=ts-BWwFz7M1.js.map
|
|
@@ -7,7 +7,7 @@ import { fileURLToPath } from "url";
|
|
|
7
7
|
|
|
8
8
|
//#region package.json
|
|
9
9
|
var name = "agent-yes";
|
|
10
|
-
var version = "1.246.
|
|
10
|
+
var version = "1.246.1-beta.586.1";
|
|
11
11
|
|
|
12
12
|
//#endregion
|
|
13
13
|
//#region ts/versionChecker.ts
|
|
@@ -215,4 +215,4 @@ async function displayVersion() {
|
|
|
215
215
|
|
|
216
216
|
//#endregion
|
|
217
217
|
export { versionString as i, displayVersion as n, getInstalledPackage as r, checkAndAutoUpdate as t };
|
|
218
|
-
//# sourceMappingURL=versionChecker-
|
|
218
|
+
//# sourceMappingURL=versionChecker-U8rDPt2P.js.map
|
|
@@ -28,7 +28,7 @@ function parseFlags(args, known) {
|
|
|
28
28
|
}
|
|
29
29
|
/** Resolve the local daemon base URL + token (flags override discovery). */
|
|
30
30
|
async function daemonTarget(flags) {
|
|
31
|
-
const { resolveDaemonHttpBase, loadTokenReadOnly } = await import("./serve-
|
|
31
|
+
const { resolveDaemonHttpBase, loadTokenReadOnly } = await import("./serve-BWpXW3lb.js");
|
|
32
32
|
const base = typeof flags.base === "string" ? flags.base : await resolveDaemonHttpBase();
|
|
33
33
|
if (!base) throw new Error("no running ay serve daemon found — start `ay serve` or pass --base <url> (e.g. http://127.0.0.1:PORT)");
|
|
34
34
|
const token = typeof flags.token === "string" ? flags.token : await loadTokenReadOnly() ?? "";
|
|
@@ -186,7 +186,7 @@ async function cmdMint(args) {
|
|
|
186
186
|
const bad = caps.filter((c) => !KNOWN_CAPS.has(c));
|
|
187
187
|
if (bad.length) throw new Error(`unknown cap(s): ${bad.join(", ")} (valid: ${[...KNOWN_CAPS].join(", ")})`);
|
|
188
188
|
const ttlSec = parseTtlSec(typeof flags.ttl === "string" ? flags.ttl : "15m");
|
|
189
|
-
const { mintScopedTermToken } = await import("./serve-
|
|
189
|
+
const { mintScopedTermToken } = await import("./serve-BWpXW3lb.js");
|
|
190
190
|
const r = await mintScopedTermToken(target, {
|
|
191
191
|
ttlSec,
|
|
192
192
|
caps
|
|
@@ -202,4 +202,4 @@ async function cmdMint(args) {
|
|
|
202
202
|
|
|
203
203
|
//#endregion
|
|
204
204
|
export { cmdMint, cmdWidget };
|
|
205
|
-
//# sourceMappingURL=widget-
|
|
205
|
+
//# sourceMappingURL=widget-C3sA5LBW.js.map
|
|
@@ -3,7 +3,7 @@ import "./globalPidIndex-D9DOSd-c.js";
|
|
|
3
3
|
import "./messageLog-C-YIzhRj.js";
|
|
4
4
|
import "./e2e-CEIdJGZ7.js";
|
|
5
5
|
import "./configShared-9wVlbPyC.js";
|
|
6
|
-
import { C as listRecords } from "./subcommands-
|
|
6
|
+
import { C as listRecords } from "./subcommands-BXHEFTJr.js";
|
|
7
7
|
import "./webrtcLink-BMYneHbu.js";
|
|
8
8
|
import "./remotes-BxQnNxQv.js";
|
|
9
9
|
import { i as getProvisionRoot } from "./workspaceConfig-DOHygA2x.js";
|
|
@@ -418,4 +418,4 @@ async function cmdWs(args) {
|
|
|
418
418
|
|
|
419
419
|
//#endregion
|
|
420
420
|
export { WS_JSON_SCHEMA, cmdWs, collectWorkspaces, isPathInside, loadProvision, workspaceStatus };
|
|
421
|
-
//# sourceMappingURL=ws-
|
|
421
|
+
//# sourceMappingURL=ws-BEbzquYX.js.map
|
package/package.json
CHANGED
package/ts/serve.ts
CHANGED
|
@@ -2213,30 +2213,40 @@ export async function cmdServe(rest: string[]): Promise<number> {
|
|
|
2213
2213
|
try {
|
|
2214
2214
|
if (eff) {
|
|
2215
2215
|
negoCapsGoneAt.delete(pid); // caps are back — cancel any pending withdraw
|
|
2216
|
-
//
|
|
2217
|
-
//
|
|
2218
|
-
//
|
|
2219
|
-
|
|
2220
|
-
|
|
2221
|
-
//
|
|
2222
|
-
//
|
|
2223
|
-
//
|
|
2216
|
+
// RECONCILE the winsize to the negotiated min. Compare against the ACTUAL
|
|
2217
|
+
// winsize on disk — NOT the last value we ourselves negotiated (`prev`) — so
|
|
2218
|
+
// that a drift introduced by a FOREIGN writer gets healed: `ay attach`'s
|
|
2219
|
+
// direct fallback, a `force:true` resize, or an old console can pin the file
|
|
2220
|
+
// to some other size, and with no subsequent cap change the old prev-only dead
|
|
2221
|
+
// band never corrected it → a stale size (e.g. 80×24) lingered forever
|
|
2222
|
+
// (grocy's design gap). The ±1-cell band still absorbs a viewer's open-time
|
|
2223
|
+
// capacity jitter AND makes a sibling daemon's identical write a no-op (no
|
|
2224
|
+
// cross-daemon same-size thrash). The 5s grow-back sweep re-runs this, so a
|
|
2225
|
+
// foreign write is reconciled within ~5s even without a cap change.
|
|
2226
|
+
let curr: { cols: number; rows: number } | null = null;
|
|
2224
2227
|
try {
|
|
2225
|
-
const
|
|
2226
|
-
|
|
2227
|
-
|
|
2228
|
-
|
|
2229
|
-
}
|
|
2228
|
+
const parts = (await readFile(file, "utf-8")).trim().split(/\s+/);
|
|
2229
|
+
const c = Number(parts[0]);
|
|
2230
|
+
const r = Number(parts[1]);
|
|
2231
|
+
if (Number.isFinite(c) && Number.isFinite(r)) curr = { cols: c, rows: r };
|
|
2230
2232
|
} catch {
|
|
2231
|
-
/* no winsize file yet —
|
|
2233
|
+
/* no winsize file yet — treat as drift and write it */
|
|
2234
|
+
}
|
|
2235
|
+
if (curr && Math.abs(curr.cols - eff.cols) <= 1 && Math.abs(curr.rows - eff.rows) <= 1) {
|
|
2236
|
+
// Already at (≈) the negotiated size — nothing to correct.
|
|
2237
|
+
negoApplied.set(pid, { cols: eff.cols, rows: eff.rows, content: "" });
|
|
2238
|
+
return;
|
|
2232
2239
|
}
|
|
2233
2240
|
const content = `${eff.cols} ${eff.rows} ${Date.now()}\n`;
|
|
2234
2241
|
// Trace the negotiated resize + this daemon's identity (multi-daemon topology:
|
|
2235
2242
|
// the HTTP daemon and each --webrtc share daemon each negotiate off the shared
|
|
2236
2243
|
// store; the trace shows which one wrote, so a resize-fight is diagnosable).
|
|
2244
|
+
// `correct=` shows the drifted size we healed (a foreign write), if any.
|
|
2237
2245
|
process.stderr.write(
|
|
2238
2246
|
`[api/resize] pid=${pid} ${eff.cols}x${eff.rows} src=presence-nego ` +
|
|
2239
|
-
`daemon=${daemonTag} caps=${caps.length}
|
|
2247
|
+
`daemon=${daemonTag} caps=${caps.length}` +
|
|
2248
|
+
(curr ? ` correct=${curr.cols}x${curr.rows}` : ``) +
|
|
2249
|
+
`\n`,
|
|
2240
2250
|
);
|
|
2241
2251
|
await mkdir(path.dirname(file), { recursive: true });
|
|
2242
2252
|
await writeFile(file, content);
|
package/ts/subcommands.ts
CHANGED
|
@@ -4056,9 +4056,19 @@ async function cmdAttach(rest: string[]): Promise<number> {
|
|
|
4056
4056
|
// no daemon is running — then this attach is the sole authority and drives it itself.
|
|
4057
4057
|
const { resolveDaemonHttpBase, loadTokenReadOnly } = await import("./serve.ts");
|
|
4058
4058
|
const daemonBase = await resolveDaemonHttpBase().catch(() => null);
|
|
4059
|
-
|
|
4059
|
+
// The token may legitimately be "" — a localhost daemon started without a
|
|
4060
|
+
// .serve-token accepts an empty token as master. Gate cap mode on the BASE alone,
|
|
4061
|
+
// exactly like `ay widget ls` (which discovers the same daemon and works with ""):
|
|
4062
|
+
// requiring a non-null token here is what wrongly dropped attach to the direct path.
|
|
4063
|
+
const daemonToken = daemonBase ? ((await loadTokenReadOnly().catch(() => null)) ?? "") : "";
|
|
4060
4064
|
const capViewer = `attach:${process.pid}`;
|
|
4061
|
-
let capMode = !!
|
|
4065
|
+
let capMode = !!daemonBase;
|
|
4066
|
+
// Announce the resolved path up front so a "nothing happened" run is diagnosable
|
|
4067
|
+
// (grocy: attach silently did nothing — the discovery/branch was invisible).
|
|
4068
|
+
process.stderr.write(
|
|
4069
|
+
`[ay-attach] pid=${record.pid} daemon=${daemonBase ?? "none"} ` +
|
|
4070
|
+
`token=${daemonToken ? "yes" : "empty"} mode=${capMode ? "cap" : "direct"}\n`,
|
|
4071
|
+
);
|
|
4062
4072
|
|
|
4063
4073
|
const writeWinsizeDirect = async (cols: number, rows: number) => {
|
|
4064
4074
|
try {
|
|
@@ -4073,11 +4083,27 @@ async function cmdAttach(rest: string[]): Promise<number> {
|
|
|
4073
4083
|
/* ignore */
|
|
4074
4084
|
}
|
|
4075
4085
|
};
|
|
4086
|
+
let sizeWarned = false;
|
|
4076
4087
|
const sendResize = async () => {
|
|
4077
|
-
const cols = process.stdout.columns ??
|
|
4078
|
-
const rows = process.stdout.rows ??
|
|
4088
|
+
const cols = process.stdout.columns ?? 0;
|
|
4089
|
+
const rows = process.stdout.rows ?? 0;
|
|
4090
|
+
// Size not ready yet (a freshly-allocated pty — e.g. under script(1) — reports
|
|
4091
|
+
// 0×0 for a beat): skip rather than drive the agent to 0×0. Trace it ONCE so a
|
|
4092
|
+
// genuinely size-less terminal reads as "skipped: no size", not silence.
|
|
4093
|
+
if (cols < 1 || rows < 1) {
|
|
4094
|
+
if (!sizeWarned) {
|
|
4095
|
+
sizeWarned = true;
|
|
4096
|
+
process.stderr.write(
|
|
4097
|
+
`[ay-attach] pid=${record.pid} terminal size unavailable (${cols}x${rows}) — not reporting yet\n`,
|
|
4098
|
+
);
|
|
4099
|
+
}
|
|
4100
|
+
return;
|
|
4101
|
+
}
|
|
4079
4102
|
// Cap path: POST /api/resize (cap-report; the daemon publishCap+scheduleNego's it).
|
|
4080
|
-
|
|
4103
|
+
// "" is a valid token (a localhost daemon without .serve-token accepts it as
|
|
4104
|
+
// master) — gate on the daemon BASE, not the token, or a tokenless daemon wrongly
|
|
4105
|
+
// falls to the direct path (the token was the reason cap mode never fired).
|
|
4106
|
+
if (capMode && daemonBase) {
|
|
4081
4107
|
try {
|
|
4082
4108
|
const res = await fetch(
|
|
4083
4109
|
`${daemonBase}/api/resize/${encodeURIComponent(String(record.pid))}?token=${encodeURIComponent(daemonToken)}`,
|
|
@@ -4100,6 +4126,12 @@ async function cmdAttach(rest: string[]): Promise<number> {
|
|
|
4100
4126
|
}
|
|
4101
4127
|
await writeWinsizeDirect(cols, rows);
|
|
4102
4128
|
};
|
|
4129
|
+
// Some ptys report 0×0 for a beat after allocation and — because the size was
|
|
4130
|
+
// correct from creation — never fire a 'resize', so a single initial send would
|
|
4131
|
+
// skip on 0×0 and then never retry (grocy: attach silently did nothing, winsize
|
|
4132
|
+
// untouched). Poll briefly for a real size before the first report.
|
|
4133
|
+
for (let i = 0; i < 15 && (!process.stdout.columns || !process.stdout.rows); i++)
|
|
4134
|
+
await new Promise((r) => setTimeout(r, 100));
|
|
4103
4135
|
await sendResize();
|
|
4104
4136
|
// A one-shot cap fades on the daemon's ~12s TTL, so renew it while attached (cap
|
|
4105
4137
|
// mode only — a direct winsize write persists and needs no heartbeat).
|
|
@@ -4112,12 +4144,17 @@ async function cmdAttach(rest: string[]): Promise<number> {
|
|
|
4112
4144
|
// re-negotiates back to the remaining viewers / its real tty immediately.
|
|
4113
4145
|
const withdrawAttachCap = async () => {
|
|
4114
4146
|
if (capHeartbeat) clearInterval(capHeartbeat);
|
|
4115
|
-
if (!daemonBase
|
|
4147
|
+
if (!daemonBase) return; // "" token is valid — gate on the base, not the token
|
|
4116
4148
|
try {
|
|
4149
|
+
// Withdraw by reporting presence for THIS pid with NO cap: the daemon then
|
|
4150
|
+
// withdrawCap()s our entry and re-negotiates. `agent:null` does NOT work here —
|
|
4151
|
+
// the daemon keys that withdraw off an in-memory presence entry we never created
|
|
4152
|
+
// (our cap was published via /api/resize, not /api/presence), so it'd no-op and
|
|
4153
|
+
// the cap would linger a full TTL.
|
|
4117
4154
|
await fetch(`${daemonBase}/api/presence?token=${encodeURIComponent(daemonToken)}`, {
|
|
4118
4155
|
method: "POST",
|
|
4119
4156
|
headers: { "content-type": "application/json" },
|
|
4120
|
-
body: JSON.stringify({ viewer: capViewer, agent:
|
|
4157
|
+
body: JSON.stringify({ viewer: capViewer, agent: record.pid }),
|
|
4121
4158
|
});
|
|
4122
4159
|
} catch {
|
|
4123
4160
|
/* daemon gone — its TTL will prune our cap */
|
|
@@ -4194,6 +4231,8 @@ async function cmdAttach(rest: string[]): Promise<number> {
|
|
|
4194
4231
|
detached = true;
|
|
4195
4232
|
if (pollTimer) clearInterval(pollTimer);
|
|
4196
4233
|
if (aliveCheck) clearInterval(aliveCheck);
|
|
4234
|
+
process.off("SIGTERM", onSignalExit);
|
|
4235
|
+
process.off("SIGHUP", onSignalExit);
|
|
4197
4236
|
void withdrawAttachCap(); // release our size cap so the PTY re-negotiates without us
|
|
4198
4237
|
watcher.close();
|
|
4199
4238
|
process.stdout.removeListener("resize", onResize);
|
|
@@ -4240,6 +4279,20 @@ async function cmdAttach(rest: string[]): Promise<number> {
|
|
|
4240
4279
|
};
|
|
4241
4280
|
process.stdin.on("data", onStdinData);
|
|
4242
4281
|
|
|
4282
|
+
// `kill`/SIGHUP (e.g. the controlling terminal closing) must run the same cleanup
|
|
4283
|
+
// as a manual detach — restore cooked mode AND withdraw our size cap — else the
|
|
4284
|
+
// agent's PTY is left pinned at this attach's size (grocy: kill -TERM left 80×24).
|
|
4285
|
+
// In raw mode Ctrl-C arrives as a stdin byte, not SIGINT, so SIGINT isn't handled
|
|
4286
|
+
// here (it'd double-fire); SIGTERM/SIGHUP are the `kill` paths that need it.
|
|
4287
|
+
const onSignalExit = () => {
|
|
4288
|
+
triggerDetach(); // restores the terminal (sync) + fires the async cap withdraw
|
|
4289
|
+
// give withdrawAttachCap's fetch a beat to reach the daemon before we exit; the
|
|
4290
|
+
// daemon's TTL + nego reconciliation heal it even if the process dies first.
|
|
4291
|
+
setTimeout(() => process.exit(0), 200);
|
|
4292
|
+
};
|
|
4293
|
+
process.on("SIGTERM", onSignalExit);
|
|
4294
|
+
process.on("SIGHUP", onSignalExit);
|
|
4295
|
+
|
|
4243
4296
|
// 7. Detach automatically if the agent exits.
|
|
4244
4297
|
aliveCheck = setInterval(() => {
|
|
4245
4298
|
if (!isPidAlive(record.pid)) {
|