@dotlabo/agent-chat-relay 0.1.1 → 0.2.0
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/CHANGELOG.md +109 -0
- package/README.md +30 -8
- package/package.json +7 -3
- package/src/connectors/terminal.ts +367 -0
- package/src/core/access.ts +14 -4
- package/src/core/relay.ts +124 -10
- package/src/harness/harness.ts +86 -13
- package/src/harness/pi/config.ts +5 -3
- package/src/harness/pi/tool-approval.ts +60 -2
- package/src/harness/protect.ts +37 -0
- package/src/main.ts +32 -12
- package/src/terminal.ts +172 -0
- package/src/vendor/pi/adapter.js +16 -1
- package/src/vendor/pi/managed-extension.ts +10 -2
- package/src/vendor/pi/managed-pi-rpc.ts +4 -1
package/src/main.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
// 中継を起動する(チャットサービスのコネクター、チャット用ツールの MCP、ハーネス)。
|
|
5
5
|
// harness の既定は RELAY_HARNESS、なければ claude。--session-id で、そのセッションを再開する。
|
|
6
6
|
// ほかのフラグは、環境変数 RELAY_WORKSPACE・RELAY_HARNESS_SETTINGS・RELAY_HARNESS_MEMORY の別名(ADR 0017)
|
|
7
|
+
// terminal 動いている serve に、管理者の端末として参加する(話しかける、途中経過を見る、承認する。ADR 0030)
|
|
7
8
|
// pair <code> ペアリングのコードを承認する(ルームの登録、DM の相手の許可)
|
|
8
9
|
// access 登録したルームと許可した人の一覧(ID は伏せる)
|
|
9
10
|
// access mode <番号か ID> <mention|exceptOthers|exceptOthersJev|all>
|
|
@@ -21,13 +22,15 @@ import { AccessStore, isReceiveMode, localId, RECEIVE_MODES, serviceOf } from ".
|
|
|
21
22
|
import { chatworkFromEnv } from "./connectors/chatwork.ts"
|
|
22
23
|
import { discordFromEnv } from "./connectors/discord.ts"
|
|
23
24
|
import { lineFromEnv } from "./connectors/line.ts"
|
|
25
|
+
import { TERMINAL_ID, TerminalConnector, terminalPaths } from "./connectors/terminal.ts"
|
|
26
|
+
import { terminal } from "./terminal.ts"
|
|
24
27
|
import { harnessConfig, harnessOptionsFromEnv } from "./harness/config.ts"
|
|
25
|
-
import { startHarness, type HarnessConfig } from "./harness/harness.ts"
|
|
28
|
+
import { startHarness, type HarnessConfig, type HarnessHooks } from "./harness/harness.ts"
|
|
26
29
|
import { preparePiLaunch } from "./harness/pi/config.ts"
|
|
27
30
|
import { schedulePrune } from "./core/retention.ts"
|
|
28
31
|
import { mcpHandler } from "./core/mcp.ts"
|
|
29
32
|
import { parseServeArgs, type ServeArgs } from "./serve-args.ts"
|
|
30
|
-
import { type ConnectorFactory, type Log, noticeTimingFromEnv, Relay, type Routes } from "./core/relay.ts"
|
|
33
|
+
import { type Connector, type ConnectorFactory, type Log, noticeTimingFromEnv, Relay, type Routes } from "./core/relay.ts"
|
|
31
34
|
import { stopper, untilHarnessExits } from "./shutdown.ts"
|
|
32
35
|
import { relayDir, resolveWorkspace } from "./workspace.ts"
|
|
33
36
|
import { jevFromEnv, screenFromEnv } from "./jev.ts"
|
|
@@ -67,12 +70,13 @@ async function serve(access: AccessStore, args: ServeArgs): Promise<void> {
|
|
|
67
70
|
const harnessLog = join(home, "harness.log")
|
|
68
71
|
const launch = harnessName === "pi"
|
|
69
72
|
? preparePiLaunch({ home, cwd: workspace, sessionId, stderrPath: harnessLog, options: harnessOptions }, log)
|
|
70
|
-
: (mcp: HarnessConfig["mcp"], onPermission: Parameters<typeof startHarness>[1]) => startHarness({
|
|
73
|
+
: (mcp: HarnessConfig["mcp"], onPermission: Parameters<typeof startHarness>[1], hooks: HarnessHooks) => startHarness({
|
|
71
74
|
...harnessConfig(harnessName, workspace, mcp, harnessOptions, log, specified, env),
|
|
72
75
|
// 秘密情報のファイルに手で足した行(RELAY_ 以外のキー)も渡さない
|
|
73
76
|
withheld: secretKeys(envFile),
|
|
74
77
|
sessionId,
|
|
75
78
|
stderrPath: harnessLog,
|
|
79
|
+
...hooks,
|
|
76
80
|
}, onPermission, log)
|
|
77
81
|
const inbox = join(relayDir(workspace), "inbox")
|
|
78
82
|
|
|
@@ -82,10 +86,10 @@ async function serve(access: AccessStore, args: ServeArgs): Promise<void> {
|
|
|
82
86
|
const relay = new Relay(access, log, workspace, undefined, noticeTiming, attribute, screen)
|
|
83
87
|
if (attribute) log.info("送り手が複数いるターンの承認依頼は、Jev で依頼者を推して送り先を絞ります(ADR 0026)")
|
|
84
88
|
if (!screen && Object.values(access.load().rooms).some((p) => p.receive === "exceptOthersJev")) log.error(NO_JEV_KEY)
|
|
85
|
-
const
|
|
86
|
-
if (
|
|
87
|
-
|
|
88
|
-
|
|
89
|
+
const chats = CONNECTORS.map((make) => make(process.env, { relay, log, home })).filter((c) => c !== undefined)
|
|
90
|
+
if (chats.length === 0) log.info("チャットサービスの秘密情報がないため、管理者の端末だけで起動します。ルームをつなぐには、止めてから agent-chat-relay secrets line などを実行し、--session-id で再開してください")
|
|
91
|
+
// 管理者の端末は、いつも起動する。チャットサービスの秘密情報がなくても、端末だけで動かせる(ADR 0030)
|
|
92
|
+
const connectors: Connector[] = [...chats, new TerminalConnector(relay, home, log)]
|
|
89
93
|
for (const c of connectors) relay.addConnector(c)
|
|
90
94
|
|
|
91
95
|
const token = randomBytes(32).toString("base64url")
|
|
@@ -118,10 +122,21 @@ async function serve(access: AccessStore, args: ServeArgs): Promise<void> {
|
|
|
118
122
|
closers.push(() => void http.stop())
|
|
119
123
|
log.info("コネクターのエンドポイントを開きました", { url: http.url.href, routes: Object.keys(routes) })
|
|
120
124
|
}
|
|
121
|
-
await Promise.all(connectors.map((c) => c.start()))
|
|
122
125
|
for (const c of connectors) closers.push(() => c.stop())
|
|
123
|
-
|
|
124
|
-
|
|
126
|
+
let harness: Awaited<ReturnType<typeof launch>>
|
|
127
|
+
try {
|
|
128
|
+
// 1 つが失敗しても、ほかの起動が終わってから閉じる。先に閉じると、あとから作ったソケットとトークンが残る
|
|
129
|
+
const started = await Promise.allSettled(connectors.map((c) => c.start()))
|
|
130
|
+
const failed = started.find((r) => r.status === "rejected")
|
|
131
|
+
if (failed) throw failed.reason
|
|
132
|
+
// 端末の接続用のファイルは、エージェントに読ませない(ADR 0030)
|
|
133
|
+
const protect = Object.values(terminalPaths(home))
|
|
134
|
+
harness = await launch({ url: `${mcp.url.href}mcp`, token }, req => relay.requestPermission(req), { onProgress: (p) => relay.progress(p), protect })
|
|
135
|
+
} catch (err) {
|
|
136
|
+
// 起動の途中で失敗しても、端末のソケットとトークンを残さない
|
|
137
|
+
for (const close of closers) close()
|
|
138
|
+
throw err
|
|
139
|
+
}
|
|
125
140
|
relay.attach(harness.session)
|
|
126
141
|
|
|
127
142
|
// Ctrl+C は、端末と dotenvx の両方から届くことがある
|
|
@@ -131,6 +146,8 @@ async function serve(access: AccessStore, args: ServeArgs): Promise<void> {
|
|
|
131
146
|
})
|
|
132
147
|
process.on("SIGINT", stop.stop)
|
|
133
148
|
process.on("SIGTERM", stop.stop)
|
|
149
|
+
// 端末を閉じたときも、端末のソケットを片付けてから止める
|
|
150
|
+
process.on("SIGHUP", stop.stop)
|
|
134
151
|
const code = await untilHarnessExits({ exited: harness.exited, name: harnessName, logPath: harnessLog }, relay, stop, log)
|
|
135
152
|
for (const close of closers) close()
|
|
136
153
|
process.exit(code)
|
|
@@ -220,7 +237,8 @@ function accessCommand(access: AccessStore, args: string[]): void {
|
|
|
220
237
|
async function main(): Promise<void> {
|
|
221
238
|
const [cmd, ...rest] = process.argv.slice(2)
|
|
222
239
|
const arg = rest[0]
|
|
223
|
-
|
|
240
|
+
// serve の間だけ、管理者の端末を承認者に加える。access.json には書かない(ADR 0030)
|
|
241
|
+
const access = new AccessStore(accessPath, Date.now, cmd === "serve" ? [TERMINAL_ID] : [])
|
|
224
242
|
// 秘密情報は、使うコマンドでだけ読む。値は、まだない環境変数にだけ設定する
|
|
225
243
|
if (cmd === "serve" || cmd === "line-quota") loadSecrets(envFile, process.env, (msg) => log.error(msg))
|
|
226
244
|
switch (cmd) {
|
|
@@ -229,6 +247,8 @@ async function main(): Promise<void> {
|
|
|
229
247
|
return serve(access, parseServeArgs(rest, process.env.RELAY_HARNESS ?? "claude"))
|
|
230
248
|
case "secrets":
|
|
231
249
|
return secrets(arg)
|
|
250
|
+
case "terminal":
|
|
251
|
+
return terminal(home)
|
|
232
252
|
case "line-tunnel":
|
|
233
253
|
process.exit(await lineTunnel())
|
|
234
254
|
return
|
|
@@ -244,7 +264,7 @@ async function main(): Promise<void> {
|
|
|
244
264
|
return accessCommand(access, rest)
|
|
245
265
|
default:
|
|
246
266
|
throw new Error(
|
|
247
|
-
`usage: agent-chat-relay serve [harness] [--session-id <id>] [--workspace <dir>] [--harness-settings default] [--harness-memory] | pair <code> | access [mode <番号か ID> <${Object.keys(RECEIVE_MODES).join("|")}>] | secrets <line|chatwork|discord|typesafe> | line-tunnel | line-quota`,
|
|
267
|
+
`usage: agent-chat-relay serve [harness] [--session-id <id>] [--workspace <dir>] [--harness-settings default] [--harness-memory] | terminal | pair <code> | access [mode <番号か ID> <${Object.keys(RECEIVE_MODES).join("|")}>] | secrets <line|chatwork|discord|typesafe> | line-tunnel | line-quota`,
|
|
248
268
|
)
|
|
249
269
|
}
|
|
250
270
|
}
|
package/src/terminal.ts
ADDED
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
// agent-chat-relay terminal の画面(Ink。ADR 0030)。動いている serve に <RELAY_HOME> の Unix ソケットでつなぐ。
|
|
2
|
+
// 画面を閉じても、中継とセッションは動き続ける
|
|
3
|
+
|
|
4
|
+
import { readFileSync } from "node:fs"
|
|
5
|
+
import { createConnection, type Socket } from "node:net"
|
|
6
|
+
import { stripVTControlCharacters } from "node:util"
|
|
7
|
+
import { createElement, useEffect, useRef, useState } from "react"
|
|
8
|
+
import { Box, Text, render, useApp, useInput } from "ink"
|
|
9
|
+
import { appendEvent, type HistoryEvent, MAX_INPUT, readLines, TERMINAL_SERVICE, terminalPaths, type TerminalEvent, type TerminalFrame } from "./connectors/terminal.ts"
|
|
10
|
+
import type { RelayStatus } from "./core/relay.ts"
|
|
11
|
+
|
|
12
|
+
/** 画面に残す件数 */
|
|
13
|
+
const SHOWN = 200
|
|
14
|
+
|
|
15
|
+
/** エージェントやルームの人が書いた文字列に入った制御文字(ANSI・OSC のエスケープなど)を、画面で実行させない */
|
|
16
|
+
export function displayText(text: string): string {
|
|
17
|
+
return Array.from(stripVTControlCharacters(text))
|
|
18
|
+
.filter((ch) => {
|
|
19
|
+
const c = ch.codePointAt(0)!
|
|
20
|
+
return c === 9 || c === 10 || (c >= 32 && c !== 127 && !(c >= 0x80 && c <= 0x9f))
|
|
21
|
+
})
|
|
22
|
+
.join("")
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const TOOL_STATUS: Record<string, string> = { pending: "待機中", in_progress: "実行中", completed: "完了", failed: "失敗" }
|
|
26
|
+
|
|
27
|
+
/** 履歴の 1 件を、画面の 1 行(改行を含みうる)と色にする */
|
|
28
|
+
export function eventLine(e: HistoryEvent): { text: string; color?: string } {
|
|
29
|
+
switch (e.type) {
|
|
30
|
+
case "input":
|
|
31
|
+
return { text: `あなた${e.cutIn ? "(差し込み)" : ""}: ${displayText(e.text)}`, color: "cyan" }
|
|
32
|
+
case "reply":
|
|
33
|
+
return { text: `エージェント: ${displayText(e.text)}` }
|
|
34
|
+
case "sent":
|
|
35
|
+
return { text: `→ ${displayText(e.room)} に送りました: ${displayText(e.text)}`, color: "magenta" }
|
|
36
|
+
case "approval":
|
|
37
|
+
return { text: displayText(e.text), color: "yellow" }
|
|
38
|
+
case "notice":
|
|
39
|
+
return { text: `中継: ${displayText(e.text)}`, color: "green" }
|
|
40
|
+
case "progress": {
|
|
41
|
+
const p = e.progress
|
|
42
|
+
if (p.kind === "text") return { text: displayText(p.text.trim().slice(-500)), color: "gray" }
|
|
43
|
+
const status = p.status ? `(${TOOL_STATUS[p.status] ?? displayText(p.status)})` : ""
|
|
44
|
+
return { text: `ツール: ${displayText(p.title).slice(0, 200)}${status}`, color: "gray" }
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** 作業中のターンがどちらの側か */
|
|
50
|
+
function turnLabel(turn: RelayStatus["turn"]): string {
|
|
51
|
+
if (!turn) return "作業はしていません"
|
|
52
|
+
if (turn.lane === TERMINAL_SERVICE) return "この端末の作業中"
|
|
53
|
+
return `ルームの作業中(${turn.rooms.map(displayText).join("、")})`
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** 中継の状態の行(ADR 0030)。待っている発言があれば、その理由と、差し込む方法を書く */
|
|
57
|
+
export function statusLine(s: RelayStatus): string {
|
|
58
|
+
const parts = [turnLabel(s.turn)]
|
|
59
|
+
if (s.approvals > 0) parts.push(`承認待ち ${s.approvals} 件`)
|
|
60
|
+
const mine = s.queued[TERMINAL_SERVICE] ?? 0
|
|
61
|
+
const rooms = s.queued[""] ?? 0
|
|
62
|
+
if (mine > 0 && s.turn && s.turn.lane !== TERMINAL_SERVICE) {
|
|
63
|
+
const hint = s.steering ? "/now <本文> で今の作業に差し込めます" : "このハーネスは差し込みに対応していないので、/now でも作業が終わるまで待ちます"
|
|
64
|
+
parts.push(`この端末の発言 ${mine} 件は、ルームの作業が終わってから渡します(${hint})`)
|
|
65
|
+
}
|
|
66
|
+
if (rooms > 0) parts.push(`ルームの発言 ${rooms} 件が待っています`)
|
|
67
|
+
return parts.join("・")
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* 入力中の行に、受けた文字を足す。貼り付けなどで改行を含んだ入力も、改行で区切って送る(Ink は、ほかの文字と一緒に届いた改行を Enter として扱わない)。
|
|
72
|
+
* lines は送る行、rest は入力中のまま残る行
|
|
73
|
+
*/
|
|
74
|
+
export function typeInto(current: string, typed: string): { lines: string[]; rest: string } {
|
|
75
|
+
const parts = (current + typed).split(/\r\n|\r|\n/)
|
|
76
|
+
const rest = displayText(parts.pop()!).slice(0, MAX_INPUT)
|
|
77
|
+
return { lines: parts.map((l) => displayText(l).slice(0, MAX_INPUT)), rest }
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** 入力した 1 行。/now <本文> は、ルームの作業中でも差し込む。/quit で抜ける */
|
|
81
|
+
export function parseInput(line: string): TerminalFrame | "quit" | undefined {
|
|
82
|
+
const text = line.trim()
|
|
83
|
+
if (!text) return undefined
|
|
84
|
+
if (text === "/quit" || text === "/exit") return "quit"
|
|
85
|
+
const now = /^\/now(?:\s+([\s\S]*))?$/.exec(text)
|
|
86
|
+
if (now) return now[1]?.trim() ? { text: now[1].trim(), cutIn: true } : undefined
|
|
87
|
+
return { text }
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
type Shown = { events: HistoryEvent[]; status: RelayStatus }
|
|
91
|
+
|
|
92
|
+
function Terminal({ socket, token }: { socket: Socket; token: string }) {
|
|
93
|
+
const { exit } = useApp()
|
|
94
|
+
const [shown, setShown] = useState<Shown>({ events: [], status: { approvals: 0, queued: {}, steering: false } })
|
|
95
|
+
const [input, setInput] = useState("")
|
|
96
|
+
// 続けて届いた入力を、画面の更新を待たずにつなぐ
|
|
97
|
+
const typing = useRef("")
|
|
98
|
+
const edit = (next: string) => {
|
|
99
|
+
typing.current = next
|
|
100
|
+
setInput(next)
|
|
101
|
+
}
|
|
102
|
+
const submit = (line: string) => {
|
|
103
|
+
const parsed = parseInput(line)
|
|
104
|
+
if (parsed === "quit") return exit()
|
|
105
|
+
if (parsed) socket.write(`${JSON.stringify(parsed)}\n`)
|
|
106
|
+
}
|
|
107
|
+
useEffect(() => {
|
|
108
|
+
const data = readLines(
|
|
109
|
+
(line) => {
|
|
110
|
+
const e = JSON.parse(line) as TerminalEvent
|
|
111
|
+
setShown((s) => (e.type === "status" ? { ...s, status: e.status } : { ...s, events: appendEvent(s.events, e, SHOWN) }))
|
|
112
|
+
},
|
|
113
|
+
() => socket.destroy(),
|
|
114
|
+
)
|
|
115
|
+
const close = () => exit(new Error("中継との接続が切れました"))
|
|
116
|
+
socket.on("data", data)
|
|
117
|
+
socket.on("close", close)
|
|
118
|
+
socket.write(`${JSON.stringify({ token })}\n`)
|
|
119
|
+
return () => {
|
|
120
|
+
socket.off("data", data)
|
|
121
|
+
socket.off("close", close)
|
|
122
|
+
}
|
|
123
|
+
}, [socket, token, exit])
|
|
124
|
+
useInput((text, key) => {
|
|
125
|
+
if (key.escape) return exit()
|
|
126
|
+
if (key.return) {
|
|
127
|
+
const line = typing.current
|
|
128
|
+
edit("")
|
|
129
|
+
return submit(line)
|
|
130
|
+
}
|
|
131
|
+
if (key.backspace || key.delete) return edit(Array.from(typing.current).slice(0, -1).join(""))
|
|
132
|
+
if (key.ctrl || key.meta || key.upArrow || key.downArrow || key.leftArrow || key.rightArrow || key.tab) return
|
|
133
|
+
const { lines, rest } = typeInto(typing.current, text)
|
|
134
|
+
edit(rest)
|
|
135
|
+
for (const line of lines) submit(line)
|
|
136
|
+
})
|
|
137
|
+
return createElement(
|
|
138
|
+
Box,
|
|
139
|
+
{ flexDirection: "column" },
|
|
140
|
+
createElement(Text, { bold: true }, "管理者の端末(Esc・/quit で抜けます。中継とセッションは動き続けます)"),
|
|
141
|
+
createElement(Text, { dimColor: true }, "ここで話した内容は、ほかのルームの人もエージェントから引き出せます。秘密情報を入力しないでください。"),
|
|
142
|
+
...shown.events.map((e, i) => {
|
|
143
|
+
const { text, color } = eventLine(e)
|
|
144
|
+
return createElement(Text, { key: i, ...(color ? { color } : {}) }, text)
|
|
145
|
+
}),
|
|
146
|
+
createElement(Text, { color: "blue" }, `状態: ${statusLine(shown.status)}`),
|
|
147
|
+
createElement(Text, {}, `> ${input}`),
|
|
148
|
+
)
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
export async function terminal(home: string): Promise<void> {
|
|
152
|
+
if (!process.stdin.isTTY || !process.stdout.isTTY) throw new Error("terminal は、対話できる端末で実行してください")
|
|
153
|
+
const paths = terminalPaths(home)
|
|
154
|
+
let token: string
|
|
155
|
+
try {
|
|
156
|
+
token = readFileSync(paths.token, "utf8")
|
|
157
|
+
} catch {
|
|
158
|
+
throw new Error(`中継が動いていないか、別の RELAY_HOME で動いています(${paths.token} がありません)。先に agent-chat-relay serve を起動してください`)
|
|
159
|
+
}
|
|
160
|
+
const socket = createConnection(paths.socket)
|
|
161
|
+
socket.setEncoding("utf8")
|
|
162
|
+
await new Promise<void>((resolve, reject) => {
|
|
163
|
+
socket.once("connect", resolve)
|
|
164
|
+
socket.once("error", (err) => reject(new Error(`中継につなげませんでした(${paths.socket}): ${err.message}`)))
|
|
165
|
+
})
|
|
166
|
+
const app = render(createElement(Terminal, { socket, token }))
|
|
167
|
+
try {
|
|
168
|
+
await app.waitUntilExit()
|
|
169
|
+
} finally {
|
|
170
|
+
socket.destroy()
|
|
171
|
+
}
|
|
172
|
+
}
|
package/src/vendor/pi/adapter.js
CHANGED
|
@@ -740,6 +740,9 @@ var CONFIRM_PERMISSION_OPTIONS = [
|
|
|
740
740
|
];
|
|
741
741
|
var EXTENSION_UI_RAW_INPUT_KEYS = ["title", "message", "options", "placeholder", "prefill"];
|
|
742
742
|
var CHOICE_OPTION_PREFIX = "choice-";
|
|
743
|
+
var MANAGED_SIGNAL_PREFIX = "managed-chat:";
|
|
744
|
+
var PROTECTED_SIGNAL_PREFIX = "managed-chat:protected:";
|
|
745
|
+
var PROTECTED_META_KEY = "io.github.dot-labo/protected";
|
|
743
746
|
function toUsageUpdate(stats) {
|
|
744
747
|
const used = stats?.contextUsage?.tokens;
|
|
745
748
|
const size = stats?.contextUsage?.contextWindow;
|
|
@@ -945,6 +948,7 @@ var PiAcpSession = class {
|
|
|
945
948
|
fileMutationToolCallIds = /* @__PURE__ */ new Set();
|
|
946
949
|
bashToolCallIds = /* @__PURE__ */ new Set();
|
|
947
950
|
bashOutputSnapshots = /* @__PURE__ */ new Map();
|
|
951
|
+
protectedToolCallIds = /* @__PURE__ */ new Set();
|
|
948
952
|
// Ensure `session/update` notifications are sent in order and can be awaited
|
|
949
953
|
// before completing a `session/prompt` request.
|
|
950
954
|
lastEmit = Promise.resolve();
|
|
@@ -1097,6 +1101,7 @@ var PiAcpSession = class {
|
|
|
1097
1101
|
this.fileMutationToolCallIds.delete(toolCallId);
|
|
1098
1102
|
this.bashToolCallIds.delete(toolCallId);
|
|
1099
1103
|
this.bashOutputSnapshots.delete(toolCallId);
|
|
1104
|
+
this.protectedToolCallIds.delete(toolCallId);
|
|
1100
1105
|
}
|
|
1101
1106
|
startTurn(t) {
|
|
1102
1107
|
this.cancelRequested = false;
|
|
@@ -1330,12 +1335,14 @@ var PiAcpSession = class {
|
|
|
1330
1335
|
toolCallId,
|
|
1331
1336
|
status: isError ? "failed" : "completed",
|
|
1332
1337
|
content,
|
|
1333
|
-
...hasStructuredDiff ? {} : { rawOutput: result }
|
|
1338
|
+
...hasStructuredDiff ? {} : { rawOutput: result },
|
|
1339
|
+
...isError && this.protectedToolCallIds.has(toolCallId) ? { _meta: { [PROTECTED_META_KEY]: true } } : {}
|
|
1334
1340
|
});
|
|
1335
1341
|
this.cleanupToolCall(toolCallId);
|
|
1336
1342
|
break;
|
|
1337
1343
|
}
|
|
1338
1344
|
case "extension_ui_request": {
|
|
1345
|
+
if (this.takeManagedSignal(ev)) break;
|
|
1339
1346
|
void this.handleExtensionUiRequest(ev).catch(() => {
|
|
1340
1347
|
const id = stringProp(ev, "id");
|
|
1341
1348
|
if (!id) {
|
|
@@ -1399,6 +1406,14 @@ var PiAcpSession = class {
|
|
|
1399
1406
|
break;
|
|
1400
1407
|
}
|
|
1401
1408
|
}
|
|
1409
|
+
/** 中継の拡張の合図なら覚えて true を返す。合図は応答を求めない notify なので、応答も送らない。 */
|
|
1410
|
+
takeManagedSignal(ev) {
|
|
1411
|
+
const message = stringProp(ev, "message");
|
|
1412
|
+
if (stringProp(ev, "method") !== "notify" || !message?.startsWith(MANAGED_SIGNAL_PREFIX)) return false;
|
|
1413
|
+
const toolCallId = message.startsWith(PROTECTED_SIGNAL_PREFIX) ? message.slice(PROTECTED_SIGNAL_PREFIX.length) : "";
|
|
1414
|
+
if (toolCallId) this.protectedToolCallIds.add(toolCallId);
|
|
1415
|
+
return true;
|
|
1416
|
+
}
|
|
1402
1417
|
async handleExtensionUiRequest(ev) {
|
|
1403
1418
|
const id = stringProp(ev, "id");
|
|
1404
1419
|
const method = stringProp(ev, "method");
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ExtensionFactory } from "@earendil-works/pi-coding-agent"
|
|
2
2
|
import { Client } from "@modelcontextprotocol/sdk/client/index.js"
|
|
3
3
|
import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
|
|
4
|
-
import { approvePiToolCall } from "../../harness/pi/tool-approval.ts"
|
|
4
|
+
import { approvePiToolCall, guardPiToolCall } from "../../harness/pi/tool-approval.ts"
|
|
5
5
|
import { managedRead } from "./managed-read.ts"
|
|
6
6
|
|
|
7
7
|
const required = ["reply", "fetch_messages", "download_attachment", "list_rooms"]
|
|
@@ -10,7 +10,8 @@ const builtinTools = ["read", "write", "edit", "bash"]
|
|
|
10
10
|
export const managedToolSelection = [...builtinTools, ...[...chatTools].map(name => `mcp__chat__${name}`)]
|
|
11
11
|
export const managedExtensionName = "relay-managed-chat"
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
/** protect は、エージェントに触らせないパス(端末の接続用のトークンとソケット。ADR 0030) */
|
|
14
|
+
export function managedChat({ url, authorization }: { url: string; authorization: string }, workspace: string, stateDir: string, protect: string[]): ExtensionFactory {
|
|
14
15
|
return async (pi) => {
|
|
15
16
|
const client = new Client({ name: "agent-chat-relay-pi", version: "1" })
|
|
16
17
|
const transport = new StreamableHTTPClientTransport(new URL(url), {
|
|
@@ -26,6 +27,13 @@ export function managedChat({ url, authorization }: { url: string; authorization
|
|
|
26
27
|
tool.name === name && tool.sourceInfo.path === `<inline:${managedExtensionName}>`)
|
|
27
28
|
pi.on("tool_call", (event, ctx) => {
|
|
28
29
|
if (!ready) return { block: true, reason: "チャット用ツールの準備ができていません" }
|
|
30
|
+
// 承認を省く読み取りより前に、尋ねずに拒否するものを除く。
|
|
31
|
+
const guarded = guardPiToolCall(event, ctx.cwd || workspace, protect)
|
|
32
|
+
if (guarded) {
|
|
33
|
+
// 拒否したことを中継の本体のログに残す。アダプターが合図を受け、その呼び出しの failed の更新に印を付ける(#78)
|
|
34
|
+
ctx.ui.notify(`managed-chat:protected:${event.toolCallId}`)
|
|
35
|
+
return guarded
|
|
36
|
+
}
|
|
29
37
|
// 継承した拡張が同名でも、承認を省くのは中継が登録したツールだけ。
|
|
30
38
|
if (event.toolName === read.name || registered.has(event.toolName)) {
|
|
31
39
|
if (owns(event.toolName)) return
|
|
@@ -12,6 +12,8 @@ const chatInput = z.object({
|
|
|
12
12
|
url: z.string().regex(/^http:\/\/127\.0\.0\.1:[0-9]+\/mcp$/),
|
|
13
13
|
authorization: z.string().regex(/^Bearer [A-Za-z0-9_-]{43}$/),
|
|
14
14
|
})
|
|
15
|
+
// エージェントに触らせないパス(ADR 0030)。中継がいつも渡すので、なければ起動しない。
|
|
16
|
+
const protectInput = z.array(z.string().refine(isAbsolute))
|
|
15
17
|
const modelSettings = z.object({ defaultProvider: z.string().min(1), defaultModel: z.string().min(1) })
|
|
16
18
|
const relayPrompt = "あなたはチャット中継を通じて会話するアシスタントです。ルームへの返事には mcp__chat__reply を使います。"
|
|
17
19
|
|
|
@@ -47,6 +49,7 @@ async function start(): Promise<void> {
|
|
|
47
49
|
throw new Error()
|
|
48
50
|
}
|
|
49
51
|
const sessionManager = openSession(workspace, stateDir)
|
|
52
|
+
const protect = protectInput.parse(JSON.parse(process.env.PI_ACP_MANAGED_PROTECT ?? ""))
|
|
50
53
|
// MCP の認証ヘッダーを引数・環境変数・RPC の行には載せない。
|
|
51
54
|
const mcp = chatInput.parse(JSON.parse(await Bun.file(3).text()))
|
|
52
55
|
const { defaultProvider, defaultModel } = modelSettings.parse(JSON.parse(readFileSync(join(agentDir, "settings.json"), "utf8")))
|
|
@@ -74,7 +77,7 @@ async function start(): Promise<void> {
|
|
|
74
77
|
systemPrompt: "", systemPromptOverride: () => relayPrompt, appendSystemPrompt: [],
|
|
75
78
|
} : { appendSystemPromptOverride: entries => [...entries, relayPrompt] }),
|
|
76
79
|
disabledBuiltinExtensions: ["mcp"],
|
|
77
|
-
extensionFactories: [{ name: managedExtensionName, factory: managedChat(mcp, workspace, stateDir) }],
|
|
80
|
+
extensionFactories: [{ name: managedExtensionName, factory: managedChat(mcp, workspace, stateDir, protect) }],
|
|
78
81
|
},
|
|
79
82
|
})
|
|
80
83
|
const model = services.modelRuntime.getModel(defaultProvider, defaultModel)
|