@linkshell/host 0.4.7 → 0.4.9
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/host/src/computer-preview-capture.d.ts +11 -0
- package/dist/host/src/computer-preview-capture.js +87 -0
- package/dist/host/src/computer-preview-capture.js.map +1 -0
- package/dist/host/src/computer-preview.d.ts +73 -0
- package/dist/host/src/computer-preview.js +335 -0
- package/dist/host/src/computer-preview.js.map +1 -0
- package/dist/host/src/drivers/acp/connection.d.ts +2 -0
- package/dist/host/src/drivers/acp/connection.js +14 -1
- package/dist/host/src/drivers/acp/connection.js.map +1 -1
- package/dist/host/src/drivers/acp/driver.d.ts +4 -0
- package/dist/host/src/drivers/acp/driver.js +45 -1
- package/dist/host/src/drivers/acp/driver.js.map +1 -1
- package/dist/host/src/drivers/acp/mapper.js +11 -1
- package/dist/host/src/drivers/acp/mapper.js.map +1 -1
- package/dist/host/src/drivers/claude/activity.d.ts +1 -0
- package/dist/host/src/drivers/claude/activity.js +1 -0
- package/dist/host/src/drivers/claude/activity.js.map +1 -1
- package/dist/host/src/drivers/claude/driver.d.ts +6 -0
- package/dist/host/src/drivers/claude/driver.js +30 -2
- package/dist/host/src/drivers/claude/driver.js.map +1 -1
- package/dist/host/src/drivers/claude/tasks.d.ts +33 -0
- package/dist/host/src/drivers/claude/tasks.js +138 -0
- package/dist/host/src/drivers/claude/tasks.js.map +1 -0
- package/dist/host/src/drivers/claude/transcript.d.ts +31 -3
- package/dist/host/src/drivers/claude/transcript.js +20 -1
- package/dist/host/src/drivers/claude/transcript.js.map +1 -1
- package/dist/host/src/drivers/codex/app-server.js +0 -3
- package/dist/host/src/drivers/codex/app-server.js.map +1 -1
- package/dist/host/src/drivers/codex/commands.js +7 -1
- package/dist/host/src/drivers/codex/commands.js.map +1 -1
- package/dist/host/src/drivers/codex/computer-preview.d.ts +3 -0
- package/dist/host/src/drivers/codex/computer-preview.js +44 -0
- package/dist/host/src/drivers/codex/computer-preview.js.map +1 -0
- package/dist/host/src/drivers/codex/driver.d.ts +16 -1
- package/dist/host/src/drivers/codex/driver.js +262 -6
- package/dist/host/src/drivers/codex/driver.js.map +1 -1
- package/dist/host/src/drivers/codex/mapper.js +38 -3
- package/dist/host/src/drivers/codex/mapper.js.map +1 -1
- package/dist/host/src/drivers/registry.js +1 -1
- package/dist/host/src/drivers/registry.js.map +1 -1
- package/dist/host/src/drivers/types.d.ts +23 -1
- package/dist/host/src/hub.d.ts +18 -1
- package/dist/host/src/hub.js +102 -1
- package/dist/host/src/hub.js.map +1 -1
- package/dist/host/src/input.d.ts +9 -0
- package/dist/host/src/input.js +15 -0
- package/dist/host/src/input.js.map +1 -1
- package/dist/host/src/rpc/server.d.ts +1 -0
- package/dist/host/src/rpc/server.js +20 -2
- package/dist/host/src/rpc/server.js.map +1 -1
- package/dist/host/src/screen-viewer.js +641 -109
- package/dist/host/src/screen-viewer.js.map +1 -1
- package/dist/host/src/store.d.ts +10 -0
- package/dist/host/src/store.js +29 -0
- package/dist/host/src/store.js.map +1 -1
- package/dist/host/src/task-output.d.ts +6 -0
- package/dist/host/src/task-output.js +22 -0
- package/dist/host/src/task-output.js.map +1 -0
- package/dist/host/src/terminals.d.ts +37 -2
- package/dist/host/src/terminals.js +54 -14
- package/dist/host/src/terminals.js.map +1 -1
- package/dist/host/tsconfig.tsbuildinfo +1 -1
- package/dist/wire/src/computer-preview.d.ts +35 -0
- package/dist/wire/src/computer-preview.js +51 -0
- package/dist/wire/src/computer-preview.js.map +1 -0
- package/dist/wire/src/goal.d.ts +66 -0
- package/dist/wire/src/goal.js +19 -0
- package/dist/wire/src/goal.js.map +1 -0
- package/dist/wire/src/index.d.ts +2 -0
- package/dist/wire/src/index.js +2 -0
- package/dist/wire/src/index.js.map +1 -1
- package/dist/wire/src/model.d.ts +78 -0
- package/dist/wire/src/model.js +31 -0
- package/dist/wire/src/model.js.map +1 -1
- package/dist/wire/src/rpc.d.ts +1289 -60
- package/dist/wire/src/rpc.js +53 -3
- package/dist/wire/src/rpc.js.map +1 -1
- package/dist/wire/src/updates.d.ts +334 -22
- package/dist/wire/src/updates.js +11 -1
- package/dist/wire/src/updates.js.map +1 -1
- package/package.json +8 -5
- package/scripts/postinstall.mjs +23 -0
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { PreviewCaptureTarget } from "./computer-preview.js";
|
|
2
|
+
/** The helper instance belongs exclusively to previews, never to screen sharing or input. */
|
|
3
|
+
export declare class MacPreviewCapture {
|
|
4
|
+
private readonly log;
|
|
5
|
+
private app?;
|
|
6
|
+
private opening?;
|
|
7
|
+
private users;
|
|
8
|
+
constructor(log: (message: string) => void);
|
|
9
|
+
private getApp;
|
|
10
|
+
capture(target: PreviewCaptureTarget, frame: (dataUrl: string) => void, failed?: () => void): Promise<() => void>;
|
|
11
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { createHash, randomBytes } from "node:crypto";
|
|
2
|
+
import { previewApp } from "./input.js";
|
|
3
|
+
/** The helper instance belongs exclusively to previews, never to screen sharing or input. */
|
|
4
|
+
export class MacPreviewCapture {
|
|
5
|
+
log;
|
|
6
|
+
app;
|
|
7
|
+
opening;
|
|
8
|
+
users = 0;
|
|
9
|
+
constructor(log) {
|
|
10
|
+
this.log = log;
|
|
11
|
+
}
|
|
12
|
+
getApp() {
|
|
13
|
+
return this.opening ??= (async () => {
|
|
14
|
+
const app = previewApp(this.log);
|
|
15
|
+
if (!app)
|
|
16
|
+
throw new Error("当前电脑没有窗口采集组件");
|
|
17
|
+
this.app = app;
|
|
18
|
+
let timer;
|
|
19
|
+
try {
|
|
20
|
+
const status = await Promise.race([app.access(), new Promise((_, reject) => { timer = setTimeout(() => reject(new Error("窗口采集组件启动超时")), 8000); })]);
|
|
21
|
+
if (!status.recording)
|
|
22
|
+
throw new Error("电脑未允许 LinkShell 录制屏幕");
|
|
23
|
+
if (!status.preview)
|
|
24
|
+
throw new Error("请更新电脑端窗口采集组件");
|
|
25
|
+
return app;
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
app.close();
|
|
29
|
+
this.app = undefined;
|
|
30
|
+
this.opening = undefined;
|
|
31
|
+
throw error;
|
|
32
|
+
}
|
|
33
|
+
finally {
|
|
34
|
+
if (timer)
|
|
35
|
+
clearTimeout(timer);
|
|
36
|
+
}
|
|
37
|
+
})();
|
|
38
|
+
}
|
|
39
|
+
async capture(target, frame, failed = () => { }) {
|
|
40
|
+
if (this.users >= 4)
|
|
41
|
+
throw new Error("同时观看的窗口预览已达上限");
|
|
42
|
+
this.users++;
|
|
43
|
+
let released = false;
|
|
44
|
+
const release = () => {
|
|
45
|
+
if (released)
|
|
46
|
+
return;
|
|
47
|
+
released = true;
|
|
48
|
+
this.users--;
|
|
49
|
+
if (!this.users) {
|
|
50
|
+
this.app?.close();
|
|
51
|
+
this.app = undefined;
|
|
52
|
+
this.opening = undefined;
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
try {
|
|
56
|
+
const app = await this.getApp();
|
|
57
|
+
const id = randomBytes(12).toString("hex");
|
|
58
|
+
let last = "", problem = "";
|
|
59
|
+
await app.preview(id, target, message => {
|
|
60
|
+
if (released)
|
|
61
|
+
return;
|
|
62
|
+
if (message.t === "preview.frame" && typeof message.data === "string" && message.data.length <= 256 * 1024) {
|
|
63
|
+
const hash = createHash("sha256").update(message.data).digest("hex");
|
|
64
|
+
if (last === hash)
|
|
65
|
+
return;
|
|
66
|
+
last = hash;
|
|
67
|
+
frame(`data:image/jpeg;base64,${message.data}`);
|
|
68
|
+
}
|
|
69
|
+
else if (message.t === "preview.paused" && typeof message.error === "string" && problem !== message.error) {
|
|
70
|
+
problem = message.error;
|
|
71
|
+
this.log(`[computer-preview] ${problem}`);
|
|
72
|
+
}
|
|
73
|
+
else if (message.t === "gone") {
|
|
74
|
+
this.log("[computer-preview] capture process ended; last frame retained");
|
|
75
|
+
release();
|
|
76
|
+
failed();
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
return () => { app.endPreview(id); release(); };
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
release();
|
|
83
|
+
throw error;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=computer-preview-capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"computer-preview-capture.js","sourceRoot":"","sources":["../../../src/computer-preview-capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { type PreviewFrame } from "@linkshell/wire";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
export declare const previewCaptureSchema: z.ZodObject<{
|
|
4
|
+
bundleId: z.ZodString;
|
|
5
|
+
title: z.ZodOptional<z.ZodString>;
|
|
6
|
+
app: z.ZodOptional<z.ZodBoolean>;
|
|
7
|
+
}, "strip", z.ZodTypeAny, {
|
|
8
|
+
bundleId: string;
|
|
9
|
+
title?: string | undefined;
|
|
10
|
+
app?: boolean | undefined;
|
|
11
|
+
}, {
|
|
12
|
+
bundleId: string;
|
|
13
|
+
title?: string | undefined;
|
|
14
|
+
app?: boolean | undefined;
|
|
15
|
+
}>;
|
|
16
|
+
export type PreviewCaptureTarget = z.infer<typeof previewCaptureSchema>;
|
|
17
|
+
export interface PreviewInput {
|
|
18
|
+
sourceId: string;
|
|
19
|
+
target: string;
|
|
20
|
+
capturedAt: number;
|
|
21
|
+
dataUrl?: string;
|
|
22
|
+
capture?: PreviewCaptureTarget;
|
|
23
|
+
}
|
|
24
|
+
interface Persistence {
|
|
25
|
+
load(sessionId: string): string | undefined;
|
|
26
|
+
save(sessionId: string, value: string): void;
|
|
27
|
+
exists(sessionId: string): boolean;
|
|
28
|
+
log(message: string): void;
|
|
29
|
+
capture?(target: PreviewCaptureTarget, frame: (dataUrl: string) => void, failed: () => void): Promise<() => void>;
|
|
30
|
+
}
|
|
31
|
+
/** One durable latest frame per session; images never enter conversation history. */
|
|
32
|
+
export declare class ComputerPreviews {
|
|
33
|
+
private readonly persistence;
|
|
34
|
+
private readonly cache;
|
|
35
|
+
private readonly pending;
|
|
36
|
+
private readonly listeners;
|
|
37
|
+
private draining?;
|
|
38
|
+
private closed;
|
|
39
|
+
private readonly captures;
|
|
40
|
+
private readonly captureRetries;
|
|
41
|
+
private readonly captureFailures;
|
|
42
|
+
constructor(persistence: Persistence);
|
|
43
|
+
get(sessionId: string): PreviewFrame | undefined;
|
|
44
|
+
getRelay(sessionId: string): PreviewFrame | undefined;
|
|
45
|
+
private read;
|
|
46
|
+
private remember;
|
|
47
|
+
put(sessionId: string, input: PreviewInput): Promise<void>;
|
|
48
|
+
private drain;
|
|
49
|
+
subscribe(id: string, listener: () => void): () => void;
|
|
50
|
+
private readonly savedAt;
|
|
51
|
+
private persist;
|
|
52
|
+
private startCapture;
|
|
53
|
+
private endCapture;
|
|
54
|
+
forget(id: string): void;
|
|
55
|
+
stop(): Promise<void>;
|
|
56
|
+
}
|
|
57
|
+
/** Read-only, one-use grants; existing proxy/direct transports carry these sockets. */
|
|
58
|
+
export declare class ComputerPreviewServer {
|
|
59
|
+
private readonly frames;
|
|
60
|
+
private server?;
|
|
61
|
+
private opening?;
|
|
62
|
+
private readonly grants;
|
|
63
|
+
private readonly sockets;
|
|
64
|
+
private relayNextAt;
|
|
65
|
+
constructor(frames: ComputerPreviews);
|
|
66
|
+
open(sessionId: string, direct?: boolean): Promise<{
|
|
67
|
+
port: number;
|
|
68
|
+
token: string;
|
|
69
|
+
}>;
|
|
70
|
+
private accept;
|
|
71
|
+
stop(): void;
|
|
72
|
+
}
|
|
73
|
+
export {};
|
|
@@ -0,0 +1,335 @@
|
|
|
1
|
+
import { createHash, randomBytes } from "node:crypto";
|
|
2
|
+
import { createServer } from "node:net";
|
|
3
|
+
import sharp from "sharp";
|
|
4
|
+
import { encodePreviewFrame, PREVIEW_MAX_BYTES, previewFrameSchema } from "@linkshell/wire";
|
|
5
|
+
import { z } from "zod";
|
|
6
|
+
export const previewCaptureSchema = z.object({ bundleId: z.string().max(256).regex(/^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/), title: z.string().min(1).max(512).optional(), app: z.boolean().optional() });
|
|
7
|
+
/** One durable latest frame per session; images never enter conversation history. */
|
|
8
|
+
export class ComputerPreviews {
|
|
9
|
+
persistence;
|
|
10
|
+
cache = new Map();
|
|
11
|
+
pending = new Map();
|
|
12
|
+
listeners = new Map();
|
|
13
|
+
draining;
|
|
14
|
+
closed = false;
|
|
15
|
+
captures = new Map();
|
|
16
|
+
captureRetries = new Map();
|
|
17
|
+
captureFailures = new Map();
|
|
18
|
+
constructor(persistence) {
|
|
19
|
+
this.persistence = persistence;
|
|
20
|
+
}
|
|
21
|
+
get(sessionId) { return this.read(sessionId)?.frame; }
|
|
22
|
+
getRelay(sessionId) { return this.read(sessionId)?.relay; }
|
|
23
|
+
read(sessionId) {
|
|
24
|
+
if (!this.persistence.exists(sessionId))
|
|
25
|
+
return;
|
|
26
|
+
const cached = this.cache.get(sessionId);
|
|
27
|
+
if (cached)
|
|
28
|
+
return cached;
|
|
29
|
+
try {
|
|
30
|
+
const text = this.persistence.load(sessionId);
|
|
31
|
+
if (!text || text.length > 120_000)
|
|
32
|
+
return;
|
|
33
|
+
const saved = JSON.parse(text);
|
|
34
|
+
if (!saved.frame && typeof saved.target === "string" && saved.target.length <= 1024 && typeof saved.sourceId === "string") {
|
|
35
|
+
const entry = { sourceId: saved.sourceId, toolSourceId: saved.toolSourceId, target: saved.target, capture: previewCaptureSchema.parse(saved.capture) };
|
|
36
|
+
this.remember(sessionId, entry);
|
|
37
|
+
return entry;
|
|
38
|
+
}
|
|
39
|
+
const info = previewFrameSchema.parse(saved.frame);
|
|
40
|
+
if (typeof saved.data !== "string" || typeof saved.sourceId !== "string")
|
|
41
|
+
return;
|
|
42
|
+
const bytes = Buffer.from(saved.data, "base64");
|
|
43
|
+
if (!bytes.length || bytes.length > PREVIEW_MAX_BYTES)
|
|
44
|
+
return;
|
|
45
|
+
const relayInfo = saved.relay ? previewFrameSchema.parse(saved.relay) : info;
|
|
46
|
+
const relayBytes = typeof saved.relayData === "string" ? Buffer.from(saved.relayData, "base64") : bytes;
|
|
47
|
+
if (relayBytes.length > PREVIEW_MAX_BYTES)
|
|
48
|
+
return;
|
|
49
|
+
const capture = saved.capture ? previewCaptureSchema.parse(saved.capture) : undefined;
|
|
50
|
+
const entry = { target: info.target, sourceId: saved.sourceId, toolSourceId: typeof saved.toolSourceId === "string" ? saved.toolSourceId : saved.sourceId, frame: { ...info, bytes }, relay: { ...relayInfo, bytes: relayBytes }, capture };
|
|
51
|
+
this.remember(sessionId, entry);
|
|
52
|
+
return entry;
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
remember(id, entry) {
|
|
59
|
+
this.cache.delete(id);
|
|
60
|
+
this.cache.set(id, entry);
|
|
61
|
+
if (this.cache.size > 128)
|
|
62
|
+
this.cache.delete(this.cache.keys().next().value);
|
|
63
|
+
}
|
|
64
|
+
put(sessionId, input) {
|
|
65
|
+
const previous = this.read(sessionId);
|
|
66
|
+
if (!input.capture && previous?.target === input.target && previous.capture)
|
|
67
|
+
input = { ...input, capture: previous.capture };
|
|
68
|
+
if (input.capture?.app && !input.capture.title && previous?.target === input.target && previous.capture?.title)
|
|
69
|
+
input = { ...input, capture: previous.capture };
|
|
70
|
+
const sameCapture = JSON.stringify(previous?.capture) === JSON.stringify(input.capture);
|
|
71
|
+
if (this.closed || !this.persistence.exists(sessionId) || ((previous?.sourceId === input.sourceId || previous?.toolSourceId === input.sourceId) && sameCapture))
|
|
72
|
+
return Promise.resolve();
|
|
73
|
+
if (previous && !input.sourceId.startsWith("capture:") && previous.sourceId.startsWith("capture:") && sameCapture && previous.target === input.target && this.captures.has(sessionId)) {
|
|
74
|
+
previous.toolSourceId = input.sourceId;
|
|
75
|
+
return Promise.resolve();
|
|
76
|
+
}
|
|
77
|
+
if (!input.sourceId.startsWith("capture:") && previous && (!sameCapture || previous.target !== input.target))
|
|
78
|
+
this.endCapture(sessionId);
|
|
79
|
+
if (!this.pending.has(sessionId) && this.pending.size >= 32)
|
|
80
|
+
return Promise.resolve();
|
|
81
|
+
this.pending.set(sessionId, input);
|
|
82
|
+
this.draining ??= this.drain().finally(() => { this.draining = undefined; });
|
|
83
|
+
return this.draining;
|
|
84
|
+
}
|
|
85
|
+
async drain() {
|
|
86
|
+
// Only one image decode at a time. A busy source replaces its pending frame.
|
|
87
|
+
while (this.pending.size && !this.closed) {
|
|
88
|
+
const [id, input] = this.pending.entries().next().value;
|
|
89
|
+
this.pending.delete(id);
|
|
90
|
+
try {
|
|
91
|
+
if (!input.dataUrl && input.capture) {
|
|
92
|
+
const previous = this.read(id);
|
|
93
|
+
this.remember(id, { sourceId: input.sourceId, toolSourceId: input.sourceId, target: input.target, capture: input.capture, ...(previous?.target === input.target ? { frame: previous.frame, relay: previous.relay } : {}) });
|
|
94
|
+
this.persist(id, true);
|
|
95
|
+
this.startCapture(id);
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
if (!input.dataUrl || input.dataUrl.length > 4 * 1024 * 1024 || !/^data:image\/(jpeg|png|webp);base64,/.test(input.dataUrl))
|
|
99
|
+
continue;
|
|
100
|
+
const source = Buffer.from(input.dataUrl.slice(input.dataUrl.indexOf(",") + 1), "base64");
|
|
101
|
+
const pipeline = () => sharp(source, { limitInputPixels: 16_000_000, animated: false }).rotate();
|
|
102
|
+
let result = await pipeline().resize({ width: 480, height: 720, fit: "inside", withoutEnlargement: true }).webp({ quality: 60, effort: 2 }).toBuffer({ resolveWithObject: true });
|
|
103
|
+
if (result.data.length > PREVIEW_MAX_BYTES)
|
|
104
|
+
result = await pipeline().resize({ width: 320, height: 480, fit: "inside", withoutEnlargement: true }).webp({ quality: 35, effort: 2 }).toBuffer({ resolveWithObject: true });
|
|
105
|
+
if (this.closed || !this.persistence.exists(id) || result.data.length > PREVIEW_MAX_BYTES)
|
|
106
|
+
continue;
|
|
107
|
+
// If a newer image arrived during decoding, publish that next instead of flashing an old image.
|
|
108
|
+
if (this.pending.has(id))
|
|
109
|
+
continue;
|
|
110
|
+
let small = await sharp(result.data).resize({ width: 320, height: 480, fit: "inside", withoutEnlargement: true }).webp({ quality: 45, effort: 2 }).toBuffer({ resolveWithObject: true });
|
|
111
|
+
if (small.data.length > 16_384)
|
|
112
|
+
small = await sharp(result.data).resize({ width: 200, height: 300, fit: "inside", withoutEnlargement: true }).webp({ quality: 30, effort: 2 }).toBuffer({ resolveWithObject: true });
|
|
113
|
+
if (small.data.length > 16_384 || this.closed || !this.persistence.exists(id))
|
|
114
|
+
continue;
|
|
115
|
+
const makeFrame = (image) => ({ id: createHash("sha256").update(input.target).update(image.data).digest("hex"), target: input.target, capturedAt: input.capturedAt, width: image.info.width, height: image.info.height, mimeType: "image/webp", bytes: image.data });
|
|
116
|
+
const frame = makeFrame(result), relay = makeFrame(small), hash = frame.id;
|
|
117
|
+
const changed = this.read(id)?.frame?.id !== hash;
|
|
118
|
+
const toolSourceId = input.sourceId.startsWith("capture:") ? this.read(id)?.toolSourceId : input.sourceId;
|
|
119
|
+
this.remember(id, { sourceId: input.sourceId, toolSourceId, target: input.target, frame, relay, capture: input.capture });
|
|
120
|
+
// Continuous captures live in memory. Persist at most once every ten seconds, and when viewing ends.
|
|
121
|
+
this.persist(id);
|
|
122
|
+
this.startCapture(id);
|
|
123
|
+
if (changed)
|
|
124
|
+
for (const listener of this.listeners.get(id) ?? [])
|
|
125
|
+
listener();
|
|
126
|
+
}
|
|
127
|
+
catch (error) {
|
|
128
|
+
this.persistence.log(`[computer-preview] frame rejected: ${error instanceof Error ? error.message : String(error)}`);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
subscribe(id, listener) {
|
|
133
|
+
const listeners = this.listeners.get(id) ?? new Set();
|
|
134
|
+
this.listeners.set(id, listeners);
|
|
135
|
+
listeners.add(listener);
|
|
136
|
+
this.startCapture(id);
|
|
137
|
+
return () => { listeners.delete(listener); if (!listeners.size) {
|
|
138
|
+
this.listeners.delete(id);
|
|
139
|
+
this.persist(id, true);
|
|
140
|
+
this.endCapture(id);
|
|
141
|
+
} };
|
|
142
|
+
}
|
|
143
|
+
savedAt = new Map();
|
|
144
|
+
persist(id, force = false) {
|
|
145
|
+
const saved = this.cache.get(id);
|
|
146
|
+
if (!saved || !this.persistence.exists(id) || (!force && saved.sourceId.startsWith("capture:") && Date.now() - (this.savedAt.get(id) ?? 0) < 10_000))
|
|
147
|
+
return;
|
|
148
|
+
if (!saved.frame || !saved.relay) {
|
|
149
|
+
this.persistence.save(id, JSON.stringify(saved));
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
const { bytes, ...frame } = saved.frame;
|
|
153
|
+
const { bytes: relayBytes, ...relay } = saved.relay;
|
|
154
|
+
this.persistence.save(id, JSON.stringify({ sourceId: saved.sourceId, toolSourceId: saved.toolSourceId, capture: saved.capture, frame, relay, data: Buffer.from(bytes).toString("base64"), relayData: Buffer.from(relayBytes).toString("base64") }));
|
|
155
|
+
this.savedAt.set(id, Date.now());
|
|
156
|
+
}
|
|
157
|
+
startCapture(id) {
|
|
158
|
+
if (!this.listeners.get(id)?.size || !this.persistence.capture || this.closed || this.captureRetries.has(id))
|
|
159
|
+
return;
|
|
160
|
+
const saved = this.read(id);
|
|
161
|
+
if (!saved?.capture) {
|
|
162
|
+
this.endCapture(id);
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
const key = JSON.stringify([saved.target, saved.capture]);
|
|
166
|
+
if (this.captures.get(id)?.key === key)
|
|
167
|
+
return;
|
|
168
|
+
this.endCapture(id);
|
|
169
|
+
const run = { key, cancelled: false };
|
|
170
|
+
this.captures.set(id, run);
|
|
171
|
+
const failed = () => {
|
|
172
|
+
if (run.cancelled || this.captures.get(id) !== run)
|
|
173
|
+
return;
|
|
174
|
+
this.endCapture(id);
|
|
175
|
+
const attempts = (this.captureFailures.get(id) ?? 0) + 1;
|
|
176
|
+
this.captureFailures.set(id, attempts);
|
|
177
|
+
const timer = setTimeout(() => { this.captureRetries.delete(id); this.startCapture(id); }, Math.min(60_000, 15_000 * 2 ** Math.min(attempts - 1, 2)));
|
|
178
|
+
timer.unref();
|
|
179
|
+
this.captureRetries.set(id, timer);
|
|
180
|
+
};
|
|
181
|
+
void this.persistence.capture(saved.capture, dataUrl => {
|
|
182
|
+
if (run.cancelled || this.captures.get(id) !== run)
|
|
183
|
+
return;
|
|
184
|
+
this.captureFailures.delete(id);
|
|
185
|
+
const sourceId = "capture:" + createHash("sha256").update(dataUrl).digest("hex");
|
|
186
|
+
void this.put(id, { sourceId, dataUrl, target: saved.target, capture: saved.capture, capturedAt: Date.now() });
|
|
187
|
+
}, failed).then(stop => { if (run.cancelled)
|
|
188
|
+
stop();
|
|
189
|
+
else
|
|
190
|
+
run.stop = stop; }).catch(error => {
|
|
191
|
+
this.persistence.log(`[computer-preview] capture unavailable: ${error instanceof Error ? error.message : String(error)}`);
|
|
192
|
+
failed();
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
endCapture(id) {
|
|
196
|
+
const timer = this.captureRetries.get(id);
|
|
197
|
+
if (timer)
|
|
198
|
+
clearTimeout(timer);
|
|
199
|
+
this.captureRetries.delete(id);
|
|
200
|
+
const run = this.captures.get(id);
|
|
201
|
+
this.captures.delete(id);
|
|
202
|
+
if (run) {
|
|
203
|
+
run.cancelled = true;
|
|
204
|
+
try {
|
|
205
|
+
run.stop?.();
|
|
206
|
+
}
|
|
207
|
+
catch { /* The capture is isolated. */ }
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
forget(id) { this.endCapture(id); this.pending.delete(id); this.cache.delete(id); this.savedAt.delete(id); this.captureFailures.delete(id); }
|
|
211
|
+
async stop() {
|
|
212
|
+
this.closed = true;
|
|
213
|
+
for (const id of new Set([...this.captures.keys(), ...this.captureRetries.keys()]))
|
|
214
|
+
this.endCapture(id);
|
|
215
|
+
this.pending.clear();
|
|
216
|
+
await this.draining;
|
|
217
|
+
for (const id of this.cache.keys())
|
|
218
|
+
this.persist(id, true);
|
|
219
|
+
this.cache.clear();
|
|
220
|
+
this.listeners.clear();
|
|
221
|
+
this.savedAt.clear();
|
|
222
|
+
this.captureFailures.clear();
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
/** Read-only, one-use grants; existing proxy/direct transports carry these sockets. */
|
|
226
|
+
export class ComputerPreviewServer {
|
|
227
|
+
frames;
|
|
228
|
+
server;
|
|
229
|
+
opening;
|
|
230
|
+
grants = new Map();
|
|
231
|
+
sockets = new Set();
|
|
232
|
+
relayNextAt = 0;
|
|
233
|
+
constructor(frames) {
|
|
234
|
+
this.frames = frames;
|
|
235
|
+
}
|
|
236
|
+
async open(sessionId, direct = false) {
|
|
237
|
+
const port = await (this.opening ??= new Promise((resolve, reject) => {
|
|
238
|
+
this.server = createServer(socket => this.accept(socket));
|
|
239
|
+
this.server.once("error", reject);
|
|
240
|
+
this.server.listen(0, "127.0.0.1", () => resolve(this.server.address().port));
|
|
241
|
+
}).catch(error => { this.opening = undefined; throw error; }));
|
|
242
|
+
for (const [token, grant] of this.grants)
|
|
243
|
+
if (grant.expires < Date.now())
|
|
244
|
+
this.grants.delete(token);
|
|
245
|
+
if (this.grants.size >= 128)
|
|
246
|
+
this.grants.delete(this.grants.keys().next().value);
|
|
247
|
+
const token = randomBytes(32).toString("hex");
|
|
248
|
+
this.grants.set(token, { sessionId, expires: Date.now() + 30_000, direct });
|
|
249
|
+
return { port, token };
|
|
250
|
+
}
|
|
251
|
+
accept(socket) {
|
|
252
|
+
if (this.sockets.size >= 32) {
|
|
253
|
+
socket.destroy();
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
256
|
+
this.sockets.add(socket);
|
|
257
|
+
let line = "", id, last = "", waiting = false, nextAt = 0, direct = false;
|
|
258
|
+
let timer;
|
|
259
|
+
let unsubscribe;
|
|
260
|
+
socket.setTimeout(10_000, () => socket.destroy());
|
|
261
|
+
const send = () => {
|
|
262
|
+
if (!id || waiting || socket.destroyed || timer)
|
|
263
|
+
return;
|
|
264
|
+
const frame = direct ? this.frames.get(id) : this.frames.getRelay(id);
|
|
265
|
+
if (!frame || frame.id === last)
|
|
266
|
+
return;
|
|
267
|
+
if (!direct && frame.bytes.length > 16_384)
|
|
268
|
+
return;
|
|
269
|
+
const delay = Math.max(nextAt, direct ? 0 : this.relayNextAt) - Date.now();
|
|
270
|
+
if (delay > 0) {
|
|
271
|
+
timer = setTimeout(() => { timer = undefined; send(); }, delay);
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
274
|
+
const bytes = encodePreviewFrame(frame);
|
|
275
|
+
waiting = true;
|
|
276
|
+
last = frame.id;
|
|
277
|
+
// Charge twice the payload plus envelope/ack headroom: proxy.data and the
|
|
278
|
+
// encrypted gateway envelope both use base64. One bounded initial burst.
|
|
279
|
+
const cost = direct ? bytes.length : bytes.length * 2 + 512;
|
|
280
|
+
nextAt = Date.now() + Math.max(direct ? 250 : 2000, Math.ceil(cost / (direct ? 96_000 : 4000) * 1000));
|
|
281
|
+
if (!direct)
|
|
282
|
+
this.relayNextAt = Date.now() + Math.ceil(cost / 6000 * 1000);
|
|
283
|
+
socket.setTimeout(45_000);
|
|
284
|
+
socket.write(bytes);
|
|
285
|
+
};
|
|
286
|
+
socket.on("data", chunk => {
|
|
287
|
+
line += chunk.toString("utf8");
|
|
288
|
+
if (line.length > 1024) {
|
|
289
|
+
socket.destroy();
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
292
|
+
let end;
|
|
293
|
+
while ((end = line.indexOf("\n")) >= 0) {
|
|
294
|
+
const command = line.slice(0, end);
|
|
295
|
+
line = line.slice(end + 1);
|
|
296
|
+
if (!id) {
|
|
297
|
+
try {
|
|
298
|
+
const hello = JSON.parse(command);
|
|
299
|
+
const grant = this.grants.get(hello.token);
|
|
300
|
+
if (!grant || grant.expires < Date.now()) {
|
|
301
|
+
socket.destroy();
|
|
302
|
+
return;
|
|
303
|
+
}
|
|
304
|
+
this.grants.delete(hello.token);
|
|
305
|
+
id = grant.sessionId;
|
|
306
|
+
direct = hello.direct === true && grant.direct;
|
|
307
|
+
last = typeof hello.after === "string" ? hello.after.slice(0, 64) : "";
|
|
308
|
+
unsubscribe = this.frames.subscribe(id, send);
|
|
309
|
+
socket.setTimeout(0);
|
|
310
|
+
send();
|
|
311
|
+
}
|
|
312
|
+
catch {
|
|
313
|
+
socket.destroy();
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
else if (command === "ack" && waiting) {
|
|
318
|
+
waiting = false;
|
|
319
|
+
socket.setTimeout(0);
|
|
320
|
+
send();
|
|
321
|
+
}
|
|
322
|
+
else {
|
|
323
|
+
socket.destroy();
|
|
324
|
+
return;
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
});
|
|
328
|
+
socket.on("error", () => socket.destroy());
|
|
329
|
+
socket.on("close", () => { unsubscribe?.(); if (timer)
|
|
330
|
+
clearTimeout(timer); this.sockets.delete(socket); });
|
|
331
|
+
}
|
|
332
|
+
stop() { for (const socket of this.sockets)
|
|
333
|
+
socket.destroy(); this.grants.clear(); this.server?.close(); this.server = undefined; this.opening = undefined; }
|
|
334
|
+
}
|
|
335
|
+
//# sourceMappingURL=computer-preview.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"computer-preview.js","sourceRoot":"","sources":["../../../src/computer-preview.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,8 @@ export interface AcpConnectionOptions {
|
|
|
35
35
|
env?: NodeJS.ProcessEnv;
|
|
36
36
|
cwd?: string;
|
|
37
37
|
clientVersion: string;
|
|
38
|
+
/** Namespace extensions implemented by this client for this adapter. */
|
|
39
|
+
clientMeta?: Record<string, unknown>;
|
|
38
40
|
onUpdate: (sessionId: string, update: unknown) => void;
|
|
39
41
|
/** Agent → client requests (session/request_permission, …). */
|
|
40
42
|
onRequest: (method: string, params: unknown, id: RpcId) => unknown;
|
|
@@ -34,6 +34,19 @@ export class AcpConnection {
|
|
|
34
34
|
child.stdin.write(`${text}\n`);
|
|
35
35
|
},
|
|
36
36
|
onNotification: (method, params) => {
|
|
37
|
+
if (method === "_claude/sdkMessage") {
|
|
38
|
+
const raw = params;
|
|
39
|
+
if (raw?.sessionId && raw.message?.type === "active_goal") {
|
|
40
|
+
const value = raw.message.value;
|
|
41
|
+
if (value === null || typeof value?.condition === "string")
|
|
42
|
+
this.options.onUpdate(raw.sessionId, {
|
|
43
|
+
sessionUpdate: "session_info_update", _meta: { jetbrains: { air: { goal: value === null ? null : {
|
|
44
|
+
objective: value.condition.trim(), status: "active", iterations: value.iterations, lastReason: value.last_reason,
|
|
45
|
+
} } } },
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
37
50
|
if (method !== "session/update")
|
|
38
51
|
return;
|
|
39
52
|
const payload = params;
|
|
@@ -84,7 +97,7 @@ export class AcpConnection {
|
|
|
84
97
|
elicitation: { form: {} },
|
|
85
98
|
// Ask adapters that support it (Claude's) to stream sub-agents' own
|
|
86
99
|
// messages and tool calls, each stamped with the spawning call.
|
|
87
|
-
_meta: { "subagent-transcript": true },
|
|
100
|
+
_meta: { "subagent-transcript": true, ...this.options.clientMeta },
|
|
88
101
|
},
|
|
89
102
|
clientInfo: { name: "linkshell", title: "LinkShell", version: this.options.clientVersion },
|
|
90
103
|
}, 30_000),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../../src/drivers/acp/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAc,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../../src/drivers/acp/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAc,MAAM,iBAAiB,CAAC;AAsCtD;;;GAGG;AACH,MAAM,OAAO,aAAa;IAOK;IANrB,KAAK,CAAgB;IACrB,IAAI,CAAW;IACf,QAAQ,GAAG,KAAK,CAAC;IACjB,UAAU,GAAG,EAAE,CAAC;IACxB,gBAAgB,GAAwB,EAAE,CAAC;IAE3C,YAA6B,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;IAAG,CAAC;IAE9D,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,IAAI,EAAE,CAAC;IACvD,CAAC;IAED,IAAI,KAAK;QACP,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrF,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YAC3D,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;YACrB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;YACrB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC;YACvB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;gBACb,IAAI,KAAK,CAAC,KAAK,EAAE,QAAQ;oBAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;YAC5D,CAAC;YACD,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBACjC,IAAI,MAAM,KAAK,oBAAoB,EAAE,CAAC;oBACpC,MAAM,GAAG,GAAG,MAA+I,CAAC;oBAC5J,IAAI,GAAG,EAAE,SAAS,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,KAAK,aAAa,EAAE,CAAC;wBAC1D,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;wBAChC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,EAAE,SAAS,KAAK,QAAQ;4BAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE;gCAC/F,aAAa,EAAE,qBAAqB,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gDAC/F,SAAS,EAAE,KAAK,CAAC,SAAU,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,WAAW;6CAClH,EAAE,EAAE,EAAE;6BACR,CAAC,CAAC;oBACL,CAAC;oBACD,OAAO;gBACT,CAAC;gBACD,IAAI,MAAM,KAAK,gBAAgB;oBAAE,OAAO;gBACxC,MAAM,OAAO,GAAG,MAA+D,CAAC;gBAChF,IAAI,OAAO,OAAO,EAAE,SAAS,KAAK,QAAQ;oBAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACvG,CAAC;YACD,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;YAC7E,gBAAgB,EAAE,CAAC;SACpB,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,6EAA6E;QAC7E,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACzC,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,GAAG,GAAG,CAAC;gBAAE,OAAO;YACpB,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACvC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACzC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YAC9C,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBAClC,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,YAAY,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBAC7J,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACnB,IAAI,CAAC,IAAI,CAAC,QAAQ;oBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAChD,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC5B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAEvB,IAAI,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YACzC,IAAI,CAAC,OAAO,CACV,YAAY,EACZ;gBACE,eAAe,EAAE,CAAC;gBAClB,uFAAuF;gBACvF,kBAAkB,EAAE;oBAClB,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE;oBACjD,QAAQ,EAAE,KAAK;oBACf,kFAAkF;oBAClF,uFAAuF;oBACvF,WAAW,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;oBACzB,oEAAoE;oBACpE,gEAAgE;oBAChE,KAAK,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;iBACnE;gBACD,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;aAC3F,EACD,MAAM,CACP;YACD,MAAM;SACP,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,OAAO,CAAI,MAAc,EAAE,MAAe,EAAE,SAAS,GAAG,MAAM;QAC5D,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAI,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,MAAc,EAAE,MAAe;QACpC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;YAAE,OAAO;QAC9C,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;QACnB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACtB,OAAO,EAAE,CAAC;YACZ,CAAC,EAAE,IAAI,CAAC,CAAC;YACT,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;gBACtB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -17,6 +17,8 @@ export interface AcpAgentSpec {
|
|
|
17
17
|
};
|
|
18
18
|
env?: Record<string, string>;
|
|
19
19
|
authStatus?: (env: NodeJS.ProcessEnv) => Promise<AgentAuth>;
|
|
20
|
+
/** Non-interactive ACP method that reuses the agent's own saved login. */
|
|
21
|
+
cachedAuthMethod?: string;
|
|
20
22
|
/**
|
|
21
23
|
* Start the agent process with the host so its existing sessions show up
|
|
22
24
|
* (needs ACP session/list). Otherwise it starts on first use.
|
|
@@ -80,6 +82,7 @@ export declare class AcpDriver implements AgentDriver {
|
|
|
80
82
|
private restartDelay;
|
|
81
83
|
private stopped;
|
|
82
84
|
private nextPermissionId;
|
|
85
|
+
private authenticating?;
|
|
83
86
|
constructor(spec: AcpAgentSpec, options: {
|
|
84
87
|
env?: NodeJS.ProcessEnv;
|
|
85
88
|
hostVersion: string;
|
|
@@ -92,6 +95,7 @@ export declare class AcpDriver implements AgentDriver {
|
|
|
92
95
|
listSessions(limit: number): Promise<DiscoveredSession[]>;
|
|
93
96
|
/** ACP's session/fork, for agents that offer it: the whole conversation, in `cwd`. */
|
|
94
97
|
fork(nativeId: string, options: ForkOptions): Promise<DiscoveredSession>;
|
|
98
|
+
protected sessionMeta(): Record<string, unknown>;
|
|
95
99
|
createSession(options: {
|
|
96
100
|
cwd: string;
|
|
97
101
|
model?: string;
|