poly-weaver 0.10.6 → 0.11.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/README.md +16 -24
- package/dist/agents/runner.d.ts.map +1 -1
- package/dist/agents/runner.js +6 -1
- package/dist/agents/runner.js.map +1 -1
- package/dist/ansi.d.ts +23 -4
- package/dist/ansi.d.ts.map +1 -1
- package/dist/ansi.js +28 -5
- package/dist/ansi.js.map +1 -1
- package/dist/auto-update/gate.d.ts +1 -0
- package/dist/auto-update/gate.d.ts.map +1 -1
- package/dist/auto-update/gate.js +7 -8
- package/dist/auto-update/gate.js.map +1 -1
- package/dist/auto-update/install-agents.d.ts +1 -0
- package/dist/auto-update/install-agents.d.ts.map +1 -1
- package/dist/auto-update/install-agents.js +19 -8
- package/dist/auto-update/install-agents.js.map +1 -1
- package/dist/auto-update/update-request.d.ts +23 -0
- package/dist/auto-update/update-request.d.ts.map +1 -0
- package/dist/auto-update/update-request.js +83 -0
- package/dist/auto-update/update-request.js.map +1 -0
- package/dist/cli.js +0 -0
- package/dist/dump/hotkey.d.ts +0 -3
- package/dist/dump/hotkey.d.ts.map +1 -1
- package/dist/dump/hotkey.js +0 -3
- package/dist/dump/hotkey.js.map +1 -1
- package/dist/launcher.d.ts +23 -0
- package/dist/launcher.d.ts.map +1 -0
- package/dist/launcher.js +90 -0
- package/dist/launcher.js.map +1 -0
- package/dist/offscreen/controller.d.ts +4 -1
- package/dist/offscreen/controller.d.ts.map +1 -1
- package/dist/offscreen/controller.js +48 -3
- package/dist/offscreen/controller.js.map +1 -1
- package/dist/offscreen/fork-launch.d.ts +1 -0
- package/dist/offscreen/fork-launch.d.ts.map +1 -1
- package/dist/offscreen/fork-launch.js +4 -0
- package/dist/offscreen/fork-launch.js.map +1 -1
- package/dist/offscreen/fork.d.ts +6 -1
- package/dist/offscreen/fork.d.ts.map +1 -1
- package/dist/offscreen/fork.js +26 -3
- package/dist/offscreen/fork.js.map +1 -1
- package/dist/offscreen/surface.d.ts.map +1 -1
- package/dist/offscreen/surface.js +6 -2
- package/dist/offscreen/surface.js.map +1 -1
- package/dist/providers/claude/strategy.d.ts +6 -0
- package/dist/providers/claude/strategy.d.ts.map +1 -1
- package/dist/providers/claude/strategy.js +2 -0
- package/dist/providers/claude/strategy.js.map +1 -1
- package/dist/providers/codex/strategy.d.ts +1 -0
- package/dist/providers/codex/strategy.d.ts.map +1 -1
- package/dist/providers/codex/strategy.js +7 -1
- package/dist/providers/codex/strategy.js.map +1 -1
- package/dist/providers/types.d.ts +2 -0
- package/dist/providers/types.d.ts.map +1 -1
- package/dist/session/process-start-time.d.ts.map +1 -1
- package/dist/session/process-start-time.js.map +1 -1
- package/dist/status-bar.d.ts +7 -0
- package/dist/status-bar.d.ts.map +1 -1
- package/dist/status-bar.js +34 -6
- package/dist/status-bar.js.map +1 -1
- package/dist/terminal/host-input-mode.d.ts +4 -0
- package/dist/terminal/host-input-mode.d.ts.map +1 -0
- package/dist/terminal/host-input-mode.js +33 -0
- package/dist/terminal/host-input-mode.js.map +1 -0
- package/dist/terminal/host.d.ts +41 -16
- package/dist/terminal/host.d.ts.map +1 -1
- package/dist/terminal/host.js +197 -64
- package/dist/terminal/host.js.map +1 -1
- package/dist/terminal/input-router.d.ts +18 -3
- package/dist/terminal/input-router.d.ts.map +1 -1
- package/dist/terminal/input-router.js +35 -6
- package/dist/terminal/input-router.js.map +1 -1
- package/dist/terminal/key-event-source.d.ts +6 -15
- package/dist/terminal/key-event-source.d.ts.map +1 -1
- package/dist/terminal/key-event-source.js +3 -22
- package/dist/terminal/key-event-source.js.map +1 -1
- package/dist/terminal/key-to-bytes.d.ts +2 -0
- package/dist/terminal/key-to-bytes.d.ts.map +1 -1
- package/dist/terminal/key-to-bytes.js +89 -13
- package/dist/terminal/key-to-bytes.js.map +1 -1
- package/dist/terminal/kitty-negotiator.d.ts +9 -0
- package/dist/terminal/kitty-negotiator.d.ts.map +1 -0
- package/dist/terminal/kitty-negotiator.js +76 -0
- package/dist/terminal/kitty-negotiator.js.map +1 -0
- package/dist/terminal/koffi-loader.d.ts +1 -5
- package/dist/terminal/koffi-loader.d.ts.map +1 -1
- package/dist/terminal/koffi-loader.js.map +1 -1
- package/dist/terminal/mouse-mode-tracker.d.ts +36 -0
- package/dist/terminal/mouse-mode-tracker.d.ts.map +1 -0
- package/dist/terminal/mouse-mode-tracker.js +245 -0
- package/dist/terminal/mouse-mode-tracker.js.map +1 -0
- package/dist/terminal/osc52.d.ts +16 -0
- package/dist/terminal/osc52.d.ts.map +1 -0
- package/dist/terminal/osc52.js +18 -0
- package/dist/terminal/osc52.js.map +1 -0
- package/dist/terminal/render.d.ts +14 -14
- package/dist/terminal/render.d.ts.map +1 -1
- package/dist/terminal/render.js +20 -28
- package/dist/terminal/render.js.map +1 -1
- package/dist/terminal/stdin-byte-source.d.ts +4 -5
- package/dist/terminal/stdin-byte-source.d.ts.map +1 -1
- package/dist/terminal/stdin-byte-source.js +11 -13
- package/dist/terminal/stdin-byte-source.js.map +1 -1
- package/dist/terminal/virtual-terminal.d.ts +9 -1
- package/dist/terminal/virtual-terminal.d.ts.map +1 -1
- package/dist/terminal/virtual-terminal.js +33 -1
- package/dist/terminal/virtual-terminal.js.map +1 -1
- package/dist/terminal-input.d.ts +13 -12
- package/dist/terminal-input.d.ts.map +1 -1
- package/dist/terminal-input.js +82 -108
- package/dist/terminal-input.js.map +1 -1
- package/dist/text-editing/emacs-input.d.ts +1 -6
- package/dist/text-editing/emacs-input.d.ts.map +1 -1
- package/dist/text-editing/emacs-input.js +15 -6
- package/dist/text-editing/emacs-input.js.map +1 -1
- package/dist/text-editing/readline-ops.d.ts.map +1 -1
- package/dist/text-editing/readline-ops.js +11 -2
- package/dist/text-editing/readline-ops.js.map +1 -1
- package/package.json +5 -2
- package/dist/terminal/win32-console-mode.d.ts +0 -23
- package/dist/terminal/win32-console-mode.d.ts.map +0 -1
- package/dist/terminal/win32-console-mode.js +0 -67
- package/dist/terminal/win32-console-mode.js.map +0 -1
- package/dist/terminal/win32-console-source.d.ts +0 -26
- package/dist/terminal/win32-console-source.d.ts.map +0 -1
- package/dist/terminal/win32-console-source.js +0 -277
- package/dist/terminal/win32-console-source.js.map +0 -1
- package/dist/terminal/win32-key-translator.d.ts +0 -26
- package/dist/terminal/win32-key-translator.d.ts.map +0 -1
- package/dist/terminal/win32-key-translator.js +0 -109
- package/dist/terminal/win32-key-translator.js.map +0 -1
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { open, readFile, rename, rm } from "node:fs/promises";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
export const UPDATE_REQUEST_ENV = "POLY_WEAVER_UPDATE_REQUEST";
|
|
6
|
+
export function createUpdateRequestPath() {
|
|
7
|
+
return join(tmpdir(), `poly-weaver-update-${process.pid}-${randomUUID()}.json`);
|
|
8
|
+
}
|
|
9
|
+
export async function requestUpdates(targets, deps = {}) {
|
|
10
|
+
const requestPath = (deps.env ?? process.env)[UPDATE_REQUEST_ENV];
|
|
11
|
+
if (!requestPath)
|
|
12
|
+
return false;
|
|
13
|
+
// requestPath is already unique per launcher (pid + uuid), so a fixed
|
|
14
|
+
// suffix suffices to stage the write before the atomic rename.
|
|
15
|
+
const tempPath = `${requestPath}.tmp`;
|
|
16
|
+
const payload = JSON.stringify({ targets }, null, 2);
|
|
17
|
+
const write = deps.writeFile ?? writeFileDurably;
|
|
18
|
+
const renameFile = deps.rename ?? rename;
|
|
19
|
+
try {
|
|
20
|
+
await write(tempPath, payload);
|
|
21
|
+
await renameFile(tempPath, requestPath);
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
await clearUpdateRequest(tempPath);
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
export async function readUpdateRequest(path, deps = {}) {
|
|
30
|
+
const read = deps.readFile ?? readFile;
|
|
31
|
+
try {
|
|
32
|
+
const content = await read(path, "utf8");
|
|
33
|
+
const parsed = JSON.parse(content);
|
|
34
|
+
return isUpdateRequest(parsed) ? parsed : null;
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
export async function clearUpdateRequest(path, deps = {}) {
|
|
41
|
+
const remove = deps.rm ?? rm;
|
|
42
|
+
try {
|
|
43
|
+
await remove(path, { force: true });
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
// Best-effort cleanup only; failed cleanup must not affect update results.
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
async function writeFileDurably(path, data) {
|
|
50
|
+
const file = await open(path, "w", 0o600);
|
|
51
|
+
try {
|
|
52
|
+
await file.writeFile(data, "utf8");
|
|
53
|
+
await file.sync();
|
|
54
|
+
}
|
|
55
|
+
finally {
|
|
56
|
+
await file.close();
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
function isUpdateRequest(value) {
|
|
60
|
+
if (!value || typeof value !== "object")
|
|
61
|
+
return false;
|
|
62
|
+
const targets = value.targets;
|
|
63
|
+
return Array.isArray(targets) && targets.every(isOutdatedTarget);
|
|
64
|
+
}
|
|
65
|
+
function isOutdatedTarget(value) {
|
|
66
|
+
if (!value || typeof value !== "object")
|
|
67
|
+
return false;
|
|
68
|
+
const target = value;
|
|
69
|
+
if (target.kind === "poly-weaver") {
|
|
70
|
+
return typeof target.current === "string"
|
|
71
|
+
&& typeof target.latest === "string"
|
|
72
|
+
&& target.installMethod === "npm";
|
|
73
|
+
}
|
|
74
|
+
if (target.kind !== "agent")
|
|
75
|
+
return false;
|
|
76
|
+
return typeof target.name === "string"
|
|
77
|
+
&& typeof target.productName === "string"
|
|
78
|
+
&& typeof target.current === "string"
|
|
79
|
+
&& typeof target.latest === "string"
|
|
80
|
+
&& (target.installMethod === "npm" || target.installMethod === "winget")
|
|
81
|
+
&& (target.unsupported === undefined || typeof target.unsupported === "boolean");
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=update-request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-request.js","sourceRoot":"","sources":["../../src/auto-update/update-request.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
File without changes
|
package/dist/dump/hotkey.d.ts
CHANGED
|
@@ -8,9 +8,6 @@ export declare const DUMP_HOTKEY_BYTE = 29;
|
|
|
8
8
|
* - VT path: `{ kind: "control", byte: 0x1D }` (Ctrl+])
|
|
9
9
|
* - Kitty path: `{ kind: "kitty-key", keyCode: 93, modifiers }` with
|
|
10
10
|
* Ctrl bit set (`(modifiers - 1) & 0x04`).
|
|
11
|
-
*
|
|
12
|
-
* The Win32-input-mode path emits `control:0x1D` after the parser
|
|
13
|
-
* translates it, so no separate branch is needed here.
|
|
14
11
|
*/
|
|
15
12
|
export declare function isDumpHotkey(key: TerminalKey): boolean;
|
|
16
13
|
//# sourceMappingURL=hotkey.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hotkey.d.ts","sourceRoot":"","sources":["../../src/dump/hotkey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,kEAAkE;AAClE,eAAO,MAAM,gBAAgB,KAAO,CAAC;AAErC
|
|
1
|
+
{"version":3,"file":"hotkey.d.ts","sourceRoot":"","sources":["../../src/dump/hotkey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,kEAAkE;AAClE,eAAO,MAAM,gBAAgB,KAAO,CAAC;AAErC;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAUtD"}
|
package/dist/dump/hotkey.js
CHANGED
|
@@ -7,9 +7,6 @@ export const DUMP_HOTKEY_BYTE = 0x1d;
|
|
|
7
7
|
* - VT path: `{ kind: "control", byte: 0x1D }` (Ctrl+])
|
|
8
8
|
* - Kitty path: `{ kind: "kitty-key", keyCode: 93, modifiers }` with
|
|
9
9
|
* Ctrl bit set (`(modifiers - 1) & 0x04`).
|
|
10
|
-
*
|
|
11
|
-
* The Win32-input-mode path emits `control:0x1D` after the parser
|
|
12
|
-
* translates it, so no separate branch is needed here.
|
|
13
10
|
*/
|
|
14
11
|
export function isDumpHotkey(key) {
|
|
15
12
|
if (key.kind === "control" && key.byte === DUMP_HOTKEY_BYTE)
|
package/dist/dump/hotkey.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hotkey.js","sourceRoot":"","sources":["../../src/dump/hotkey.ts"],"names":[],"mappings":"AAEA,kEAAkE;AAClE,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAErC
|
|
1
|
+
{"version":3,"file":"hotkey.js","sourceRoot":"","sources":["../../src/dump/hotkey.ts"],"names":[],"mappings":"AAEA,kEAAkE;AAClE,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAErC;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,GAAgB;IAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB;QAAE,OAAO,IAAI,CAAC;IACzE,IACE,GAAG,CAAC,IAAI,KAAK,WAAW;WACrB,GAAG,CAAC,OAAO,KAAK,EAAE;WAClB,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EACrC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import { spawn } from "node:child_process";
|
|
3
|
+
import { type UpdateRequest } from "./auto-update/update-request.js";
|
|
4
|
+
import type { OutdatedTarget } from "./auto-update/check-agent-updates.js";
|
|
5
|
+
type SpawnFactory = typeof spawn;
|
|
6
|
+
type SignalHandler = (signal: NodeJS.Signals) => void;
|
|
7
|
+
export interface LauncherDeps {
|
|
8
|
+
spawn?: SpawnFactory;
|
|
9
|
+
execPath?: string;
|
|
10
|
+
appPath?: string;
|
|
11
|
+
argv?: readonly string[];
|
|
12
|
+
env?: NodeJS.ProcessEnv;
|
|
13
|
+
tmpPath?: string;
|
|
14
|
+
readRequest?: (path: string) => Promise<UpdateRequest | null>;
|
|
15
|
+
clearRequest?: (path: string) => Promise<void>;
|
|
16
|
+
installAgents?: (targets: readonly OutdatedTarget[]) => Promise<Map<string, number>>;
|
|
17
|
+
exit?: (code: number) => void;
|
|
18
|
+
onSignal?: (signal: NodeJS.Signals, handler: SignalHandler) => void;
|
|
19
|
+
offSignal?: (signal: NodeJS.Signals, handler: SignalHandler) => void;
|
|
20
|
+
}
|
|
21
|
+
export declare function runLauncher(deps?: LauncherDeps): Promise<void>;
|
|
22
|
+
export {};
|
|
23
|
+
//# sourceMappingURL=launcher.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AAKzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAE3E,KAAK,YAAY,GAAG,OAAO,KAAK,CAAC;AACjC,KAAK,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAC9D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACrF,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IACpE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CACtE;AAED,wBAAsB,WAAW,CAAC,IAAI,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyCxE"}
|
package/dist/launcher.js
ADDED
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import { spawn } from "node:child_process";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
4
|
+
import { clearUpdateRequest, createUpdateRequestPath, readUpdateRequest, UPDATE_REQUEST_ENV, } from "./auto-update/update-request.js";
|
|
5
|
+
import { firstNonZero, installAgents as installAgentsDefault, } from "./auto-update/install-agents.js";
|
|
6
|
+
export async function runLauncher(deps = {}) {
|
|
7
|
+
const spawnFactory = deps.spawn ?? spawn;
|
|
8
|
+
const execPath = deps.execPath ?? process.execPath;
|
|
9
|
+
const appPath = deps.appPath ?? fileURLToPath(new URL("./cli.js", import.meta.url));
|
|
10
|
+
const argv = deps.argv ?? process.argv.slice(2);
|
|
11
|
+
const env = deps.env ?? process.env;
|
|
12
|
+
const requestPath = deps.tmpPath ?? createUpdateRequestPath();
|
|
13
|
+
const readRequest = deps.readRequest ?? readUpdateRequest;
|
|
14
|
+
const clearRequest = deps.clearRequest ?? clearUpdateRequest;
|
|
15
|
+
const installAgents = deps.installAgents ?? installAgentsDefault;
|
|
16
|
+
const exit = deps.exit ?? ((code) => { process.exit(code); });
|
|
17
|
+
const cleanupSignals = installSignalGuards(deps);
|
|
18
|
+
let finalCode = 1;
|
|
19
|
+
try {
|
|
20
|
+
const child = spawnFactory(execPath, [appPath, ...argv], {
|
|
21
|
+
stdio: "inherit",
|
|
22
|
+
env: {
|
|
23
|
+
...env,
|
|
24
|
+
[UPDATE_REQUEST_ENV]: requestPath,
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
const childExitCode = await waitForClose(child);
|
|
28
|
+
const request = await readRequest(requestPath);
|
|
29
|
+
if (request) {
|
|
30
|
+
const exitCodes = await installAgents(request.targets);
|
|
31
|
+
finalCode = firstNonZero(exitCodes) ?? 0;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
finalCode = childExitCode;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
finally {
|
|
38
|
+
try {
|
|
39
|
+
await clearRequest(requestPath);
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
// Cleanup is best-effort; the child or installer exit code remains authoritative.
|
|
43
|
+
}
|
|
44
|
+
cleanupSignals();
|
|
45
|
+
}
|
|
46
|
+
exit(finalCode);
|
|
47
|
+
}
|
|
48
|
+
function installSignalGuards(deps) {
|
|
49
|
+
const onSignal = deps.onSignal ?? process.on.bind(process);
|
|
50
|
+
const offSignal = deps.offSignal ?? process.off.bind(process);
|
|
51
|
+
// Ctrl+C reaches the child directly (it owns the terminal); the launcher must
|
|
52
|
+
// ignore the signal so it survives the child's exit and can still run the
|
|
53
|
+
// post-exit installers. The handler is intentionally a no-op.
|
|
54
|
+
const handler = () => { };
|
|
55
|
+
onSignal("SIGINT", handler);
|
|
56
|
+
onSignal("SIGTERM", handler);
|
|
57
|
+
return () => {
|
|
58
|
+
offSignal("SIGINT", handler);
|
|
59
|
+
offSignal("SIGTERM", handler);
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
function waitForClose(child) {
|
|
63
|
+
return new Promise((resolve) => {
|
|
64
|
+
let settled = false;
|
|
65
|
+
const finish = (code) => {
|
|
66
|
+
if (settled)
|
|
67
|
+
return;
|
|
68
|
+
settled = true;
|
|
69
|
+
resolve(code);
|
|
70
|
+
};
|
|
71
|
+
child.once("error", () => finish(1));
|
|
72
|
+
child.once("close", (code, signal) => finish(closeCode(code, signal)));
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
function closeCode(code, signal) {
|
|
76
|
+
if (typeof code === "number")
|
|
77
|
+
return code;
|
|
78
|
+
if (signal === "SIGINT")
|
|
79
|
+
return 130;
|
|
80
|
+
if (signal === "SIGTERM")
|
|
81
|
+
return 143;
|
|
82
|
+
return 1;
|
|
83
|
+
}
|
|
84
|
+
if (process.argv[1] === fileURLToPath(import.meta.url)) {
|
|
85
|
+
runLauncher().catch((err) => {
|
|
86
|
+
console.error(err);
|
|
87
|
+
process.exit(1);
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=launcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,16 @@ export declare class OffscreenController {
|
|
|
9
9
|
private readonly unregister;
|
|
10
10
|
private shown;
|
|
11
11
|
private disposed;
|
|
12
|
-
constructor(host: Pick<TerminalHost, "getLayout" | "scheduleRender" | "scheduleParentUiRender" | "output">, workdir: string, slots: OffscreenSlot[]);
|
|
12
|
+
constructor(host: Pick<TerminalHost, "getLayout" | "scheduleRender" | "scheduleParentUiRender" | "output" | "setActiveChildStatus" | "setMouseModeSource" | "clearMouseModeSource">, workdir: string, slots: OffscreenSlot[]);
|
|
13
13
|
wrap(base: HostParentUiMode): HostParentUiMode;
|
|
14
14
|
dispose(): void;
|
|
15
15
|
private handleForkEvents;
|
|
16
16
|
private handleForkScroll;
|
|
17
17
|
private show;
|
|
18
18
|
private ensureFork;
|
|
19
|
+
private updateStatusState;
|
|
20
|
+
private updateVisibleMouseModes;
|
|
21
|
+
private updateForkState;
|
|
19
22
|
}
|
|
20
23
|
export type { OffscreenBinding, OffscreenSlot, ForkSourceConfig, ForkSourceKey } from "./fork-launch.js";
|
|
21
24
|
//# sourceMappingURL=controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/offscreen/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/offscreen/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAMzF,OAAO,KAAK,EAAoB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAOxE,qBAAa,mBAAmB;IAS5B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAUrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAlB1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8C;IACpE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqC;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,QAAQ,CAAS;gBAGN,IAAI,EAAE,IAAI,CACzB,YAAY,EACV,WAAW,GACX,gBAAgB,GAChB,wBAAwB,GACxB,QAAQ,GACR,sBAAsB,GACtB,oBAAoB,GACpB,sBAAsB,CACzB,EACgB,OAAO,EAAE,MAAM,EAChC,KAAK,EAAE,aAAa,EAAE;IAQxB,IAAI,CAAC,IAAI,EAAE,gBAAgB,GAAG,gBAAgB;IA6B9C,OAAO,IAAI,IAAI;IAcf,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,IAAI;IA+BZ,OAAO,CAAC,UAAU;IA8BlB,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,eAAe;CAIxB;AAED,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { WHEEL_LINES_PER_EVENT } from "../terminal/input-router.js";
|
|
1
|
+
import { isRawSgrMouseFrame, WHEEL_LINES_PER_EVENT } from "../terminal/input-router.js";
|
|
2
2
|
import { encodeKeysToBytes } from "../terminal/key-to-bytes.js";
|
|
3
|
+
import { builtinStrategies } from "../providers/registry.js";
|
|
3
4
|
import { Fork } from "./fork.js";
|
|
4
5
|
import { isHideKey, isPrimaryShowKey, isSecondaryShowKey } from "./keys.js";
|
|
5
6
|
import { buildForkSurface } from "./surface.js";
|
|
6
7
|
import { registerOffscreenDisposer } from "./registry.js";
|
|
8
|
+
const OFFSCREEN_MOUSE_SOURCE = "offscreen";
|
|
7
9
|
export class OffscreenController {
|
|
8
10
|
host;
|
|
9
11
|
workdir;
|
|
@@ -47,6 +49,7 @@ export class OffscreenController {
|
|
|
47
49
|
return;
|
|
48
50
|
const fork = this.shown ? this.forks.get(this.shown) : undefined;
|
|
49
51
|
fork?.resize(cols, rows);
|
|
52
|
+
this.updateStatusState();
|
|
50
53
|
},
|
|
51
54
|
};
|
|
52
55
|
}
|
|
@@ -61,6 +64,8 @@ export class OffscreenController {
|
|
|
61
64
|
this.forks.clear();
|
|
62
65
|
this.pending.clear();
|
|
63
66
|
this.shown = undefined;
|
|
67
|
+
this.host.clearMouseModeSource(OFFSCREEN_MOUSE_SOURCE);
|
|
68
|
+
this.updateStatusState();
|
|
64
69
|
}
|
|
65
70
|
handleForkEvents(keys) {
|
|
66
71
|
const fork = this.shown ? this.forks.get(this.shown) : undefined;
|
|
@@ -72,22 +77,30 @@ export class OffscreenController {
|
|
|
72
77
|
let scrollChanged = false;
|
|
73
78
|
const forwarded = [];
|
|
74
79
|
const forkAlternate = fork.vt.isAlternate === true;
|
|
80
|
+
const forkMouseActive = fork.hasMouseReporting();
|
|
75
81
|
for (const key of keys) {
|
|
76
82
|
if (isHideKey(key)) {
|
|
77
83
|
shouldHide = true;
|
|
78
84
|
continue;
|
|
79
85
|
}
|
|
86
|
+
if (!forkAlternate && forkMouseActive && key.kind === "wheel") {
|
|
87
|
+
forwarded.push(key);
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
80
90
|
if (!forkAlternate) {
|
|
81
91
|
const scroll = this.handleForkScroll(fork, key);
|
|
82
92
|
if (scroll.handled) {
|
|
83
93
|
scrollChanged ||= scroll.changed;
|
|
84
94
|
continue;
|
|
85
95
|
}
|
|
96
|
+
if (!forkMouseActive && isRawSgrMouseFrame(key)) {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
86
99
|
}
|
|
87
100
|
forwarded.push(key);
|
|
88
101
|
}
|
|
89
102
|
if (forwarded.length > 0) {
|
|
90
|
-
const bytes = encodeKeysToBytes(forwarded, forkAlternate ? { wheelMode: "sgr" } : undefined);
|
|
103
|
+
const bytes = encodeKeysToBytes(forwarded, forkAlternate || forkMouseActive ? { wheelMode: "sgr" } : undefined);
|
|
91
104
|
if (bytes.length > 0)
|
|
92
105
|
fork.pty.write(bytes);
|
|
93
106
|
}
|
|
@@ -97,6 +110,8 @@ export class OffscreenController {
|
|
|
97
110
|
if (shouldHide) {
|
|
98
111
|
fork.setVisible(false);
|
|
99
112
|
this.shown = undefined;
|
|
113
|
+
this.host.clearMouseModeSource(OFFSCREEN_MOUSE_SOURCE);
|
|
114
|
+
this.updateStatusState();
|
|
100
115
|
this.host.scheduleRender();
|
|
101
116
|
}
|
|
102
117
|
return true;
|
|
@@ -150,6 +165,7 @@ export class OffscreenController {
|
|
|
150
165
|
fork.resize(layout.columns, layout.childRows);
|
|
151
166
|
fork.setVisible(true);
|
|
152
167
|
this.shown = binding;
|
|
168
|
+
this.updateForkState();
|
|
153
169
|
this.host.scheduleRender();
|
|
154
170
|
})
|
|
155
171
|
.catch((err) => {
|
|
@@ -166,7 +182,7 @@ export class OffscreenController {
|
|
|
166
182
|
if (pending)
|
|
167
183
|
return pending;
|
|
168
184
|
const layout = this.host.getLayout();
|
|
169
|
-
const created = Fork.spawn(slot, this.workdir, this.host, layout.columns, layout.childRows).then((fork) => {
|
|
185
|
+
const created = Fork.spawn(slot, this.workdir, this.host, layout.columns, layout.childRows, () => this.updateForkState()).then((fork) => {
|
|
170
186
|
this.pending.delete(binding);
|
|
171
187
|
if (this.disposed) {
|
|
172
188
|
fork.kill();
|
|
@@ -181,5 +197,34 @@ export class OffscreenController {
|
|
|
181
197
|
this.pending.set(binding, created);
|
|
182
198
|
return created;
|
|
183
199
|
}
|
|
200
|
+
updateStatusState() {
|
|
201
|
+
if (this.disposed) {
|
|
202
|
+
this.host.setActiveChildStatus(undefined);
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
const fork = this.shown ? this.forks.get(this.shown) : undefined;
|
|
206
|
+
if (!fork || (fork.vt.isAlternate !== true && !fork.hasMouseReporting())) {
|
|
207
|
+
this.host.setActiveChildStatus(undefined);
|
|
208
|
+
return;
|
|
209
|
+
}
|
|
210
|
+
const displayName = builtinStrategies().get(fork.driver)?.displayName ?? fork.driver;
|
|
211
|
+
this.host.setActiveChildStatus({
|
|
212
|
+
displayName,
|
|
213
|
+
isAlternate: fork.vt.isAlternate === true,
|
|
214
|
+
mouseActive: fork.hasMouseReporting(),
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
updateVisibleMouseModes() {
|
|
218
|
+
const fork = this.shown ? this.forks.get(this.shown) : undefined;
|
|
219
|
+
if (!fork) {
|
|
220
|
+
this.host.clearMouseModeSource(OFFSCREEN_MOUSE_SOURCE);
|
|
221
|
+
return;
|
|
222
|
+
}
|
|
223
|
+
this.host.setMouseModeSource(OFFSCREEN_MOUSE_SOURCE, fork.mouseModes());
|
|
224
|
+
}
|
|
225
|
+
updateForkState() {
|
|
226
|
+
this.updateStatusState();
|
|
227
|
+
this.updateVisibleMouseModes();
|
|
228
|
+
}
|
|
184
229
|
}
|
|
185
230
|
//# sourceMappingURL=controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/offscreen/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/offscreen/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ export interface OffscreenSlot {
|
|
|
25
25
|
export interface ForkLaunch {
|
|
26
26
|
command: string;
|
|
27
27
|
args: string[];
|
|
28
|
+
env?: Record<string, string>;
|
|
28
29
|
cleanup: () => void;
|
|
29
30
|
}
|
|
30
31
|
export declare function buildForkLaunch(slot: OffscreenSlot, workdir: string): Promise<ForkLaunch>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fork-launch.d.ts","sourceRoot":"","sources":["../../src/offscreen/fork-launch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fork-launch.d.ts","sourceRoot":"","sources":["../../src/offscreen/fork-launch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAKhE,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,WAAW,CAAC;AAEvD,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG,SAAS,GAAG,eAAe,CAAC;AAExE,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,aAAa,CAAC;IACnB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,UAAU,CAAC,CA0CrB"}
|
|
@@ -3,6 +3,8 @@ import { cp } from "node:fs/promises";
|
|
|
3
3
|
import { dirname, join } from "node:path";
|
|
4
4
|
import { rmSync } from "node:fs";
|
|
5
5
|
import { getCopilotSessionDir } from "../providers/copilot/session.js";
|
|
6
|
+
import { CLAUDE_CHILD_ENV } from "../providers/claude/strategy.js";
|
|
7
|
+
import { CODEX_ALTERNATE_SCREEN_ARGS } from "../providers/codex/strategy.js";
|
|
6
8
|
export async function buildForkLaunch(slot, workdir) {
|
|
7
9
|
switch (slot.driver) {
|
|
8
10
|
case "claude":
|
|
@@ -14,6 +16,7 @@ export async function buildForkLaunch(slot, workdir) {
|
|
|
14
16
|
"--fork-session",
|
|
15
17
|
...claudeFlags(slot),
|
|
16
18
|
],
|
|
19
|
+
env: CLAUDE_CHILD_ENV,
|
|
17
20
|
cleanup: () => { },
|
|
18
21
|
};
|
|
19
22
|
case "codex":
|
|
@@ -55,6 +58,7 @@ function claudeFlags(slot) {
|
|
|
55
58
|
function codexFlags(slot) {
|
|
56
59
|
return [
|
|
57
60
|
...(slot.yolo ? ["--dangerously-bypass-approvals-and-sandbox"] : []),
|
|
61
|
+
...CODEX_ALTERNATE_SCREEN_ARGS,
|
|
58
62
|
...(slot.model ? ["-m", slot.model] : []),
|
|
59
63
|
...(slot.effort ? ["-c", `model_reasoning_effort="${slot.effort}"`] : []),
|
|
60
64
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fork-launch.js","sourceRoot":"","sources":["../../src/offscreen/fork-launch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"fork-launch.js","sourceRoot":"","sources":["../../src/offscreen/fork-launch.ts"],"names":[],"mappings":"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"}
|
package/dist/offscreen/fork.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { VirtualTerminal } from "../terminal/virtual-terminal.js";
|
|
2
2
|
import type { TerminalHost } from "../terminal/host.js";
|
|
3
|
+
import { type MouseMode } from "../terminal/mouse-mode-tracker.js";
|
|
3
4
|
import type { PtyHandle } from "../pty/types.js";
|
|
4
5
|
import { type OffscreenSlot } from "./fork-launch.js";
|
|
5
6
|
export declare class Fork {
|
|
6
7
|
private readonly cleanup;
|
|
8
|
+
private readonly onStateChange;
|
|
7
9
|
readonly binding: OffscreenSlot["binding"];
|
|
8
10
|
readonly roleLabel: string;
|
|
9
11
|
readonly sourceSessionId: string;
|
|
@@ -12,9 +14,12 @@ export declare class Fork {
|
|
|
12
14
|
readonly vt: VirtualTerminal;
|
|
13
15
|
private visible;
|
|
14
16
|
private killed;
|
|
17
|
+
private readonly mouseTracker;
|
|
15
18
|
private constructor();
|
|
16
|
-
static spawn(slot: OffscreenSlot, workdir: string, host: Pick<TerminalHost, "scheduleParentUiRender">, cols: number, rows: number): Promise<Fork>;
|
|
19
|
+
static spawn(slot: OffscreenSlot, workdir: string, host: Pick<TerminalHost, "scheduleParentUiRender">, cols: number, rows: number, onStateChange?: () => void): Promise<Fork>;
|
|
17
20
|
setVisible(visible: boolean): void;
|
|
21
|
+
mouseModes(): MouseMode[];
|
|
22
|
+
hasMouseReporting(): boolean;
|
|
18
23
|
resize(cols: number, rows: number): void;
|
|
19
24
|
kill(): void;
|
|
20
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fork.d.ts","sourceRoot":"","sources":["../../src/offscreen/fork.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"fork.d.ts","sourceRoot":"","sources":["../../src/offscreen/fork.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAErF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAI1B,qBAAa,IAAI;IAeb,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAhBhC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA0B;IAEvD,OAAO;WA6CM,KAAK,CAChB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,wBAAwB,CAAC,EAClD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,aAAa,GAAE,MAAM,IAAe,GACnC,OAAO,CAAC,IAAI,CAAC;IAsChB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIlC,UAAU,IAAI,SAAS,EAAE;IAIzB,iBAAiB,IAAI,OAAO;IAI5B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAOxC,IAAI,IAAI,IAAI;CAqBb"}
|
package/dist/offscreen/fork.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { VirtualTerminal } from "../terminal/virtual-terminal.js";
|
|
2
|
+
import { MouseModeTracker } from "../terminal/mouse-mode-tracker.js";
|
|
2
3
|
import { spawnPty } from "../pty/spawn.js";
|
|
3
4
|
import { buildForkLaunch, } from "./fork-launch.js";
|
|
4
5
|
const HEADER_ROWS = 1;
|
|
5
6
|
export class Fork {
|
|
6
7
|
cleanup;
|
|
8
|
+
onStateChange;
|
|
7
9
|
binding;
|
|
8
10
|
roleLabel;
|
|
9
11
|
sourceSessionId;
|
|
@@ -12,17 +14,23 @@ export class Fork {
|
|
|
12
14
|
vt;
|
|
13
15
|
visible = false;
|
|
14
16
|
killed = false;
|
|
15
|
-
|
|
17
|
+
mouseTracker = new MouseModeTracker();
|
|
18
|
+
constructor(slot, pty, vt, cleanup, host, onStateChange) {
|
|
16
19
|
this.cleanup = cleanup;
|
|
20
|
+
this.onStateChange = onStateChange;
|
|
17
21
|
this.binding = slot.binding;
|
|
18
22
|
this.roleLabel = slot.roleLabel;
|
|
19
23
|
this.sourceSessionId = slot.sourceSessionId;
|
|
20
24
|
this.driver = slot.driver;
|
|
21
25
|
this.pty = pty;
|
|
22
26
|
this.vt = vt;
|
|
27
|
+
let lastAlternate = this.vt.isAlternate;
|
|
23
28
|
this.pty.onData((data) => {
|
|
24
29
|
if (this.killed)
|
|
25
30
|
return;
|
|
31
|
+
if (this.mouseTracker.processChunk(data)) {
|
|
32
|
+
this.onStateChange();
|
|
33
|
+
}
|
|
26
34
|
const stickyBottom = !this.vt.isScrolledBack;
|
|
27
35
|
const preWriteViewportY = this.vt.viewportY;
|
|
28
36
|
this.vt.write(data, () => {
|
|
@@ -42,10 +50,17 @@ export class Fork {
|
|
|
42
50
|
}
|
|
43
51
|
if (this.visible)
|
|
44
52
|
host.scheduleParentUiRender();
|
|
53
|
+
// Status only depends on mouse-mode (handled above, pre-write) and
|
|
54
|
+
// alternate-screen transitions, so notify after the write solely when
|
|
55
|
+
// the alternate-buffer flag flipped — not on every output chunk.
|
|
56
|
+
if (this.vt.isAlternate !== lastAlternate) {
|
|
57
|
+
lastAlternate = this.vt.isAlternate;
|
|
58
|
+
this.onStateChange();
|
|
59
|
+
}
|
|
45
60
|
});
|
|
46
61
|
});
|
|
47
62
|
}
|
|
48
|
-
static async spawn(slot, workdir, host, cols, rows) {
|
|
63
|
+
static async spawn(slot, workdir, host, cols, rows, onStateChange = () => { }) {
|
|
49
64
|
const launch = await buildForkLaunch(slot, workdir);
|
|
50
65
|
const forkRows = Math.max(1, rows - HEADER_ROWS);
|
|
51
66
|
const forkCols = Math.max(1, cols);
|
|
@@ -59,9 +74,10 @@ export class Fork {
|
|
|
59
74
|
cwd: workdir,
|
|
60
75
|
cols: forkCols,
|
|
61
76
|
rows: forkRows,
|
|
77
|
+
...(launch.env && { env: launch.env }),
|
|
62
78
|
interactive: true,
|
|
63
79
|
});
|
|
64
|
-
return new Fork(slot, pty, vt, launch.cleanup, host);
|
|
80
|
+
return new Fork(slot, pty, vt, launch.cleanup, host, onStateChange);
|
|
65
81
|
}
|
|
66
82
|
catch (err) {
|
|
67
83
|
try {
|
|
@@ -88,6 +104,12 @@ export class Fork {
|
|
|
88
104
|
setVisible(visible) {
|
|
89
105
|
this.visible = visible;
|
|
90
106
|
}
|
|
107
|
+
mouseModes() {
|
|
108
|
+
return this.mouseTracker.snapshot();
|
|
109
|
+
}
|
|
110
|
+
hasMouseReporting() {
|
|
111
|
+
return this.mouseTracker.hasActiveReportingMode();
|
|
112
|
+
}
|
|
91
113
|
resize(cols, rows) {
|
|
92
114
|
const forkCols = Math.max(1, cols);
|
|
93
115
|
const forkRows = Math.max(1, rows - HEADER_ROWS);
|
|
@@ -99,6 +121,7 @@ export class Fork {
|
|
|
99
121
|
return;
|
|
100
122
|
this.killed = true;
|
|
101
123
|
this.visible = false;
|
|
124
|
+
this.mouseTracker.reset();
|
|
102
125
|
try {
|
|
103
126
|
this.pty.kill();
|
|
104
127
|
}
|