mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-15 21:05:51 +00:00
* fix: bound agent communication memory growth UDS messaging now uses private local capabilities instead of exposing auth tokens through SDK metadata, environment variables, session registry, peer listing, or tool output. The receive path bounds NDJSON frames, response buffers, active clients, and pending inbox bytes, and strips auth metadata before messages enter the prompt queue. Teammate mailboxes now validate file and message sizes, fail closed on corrupt mutation inputs, compact by count and retained bytes, and use stable message identity for in-process acknowledgements. Agent summaries now fork only a bounded recent context using lazy size estimation and content fingerprints instead of retaining or serializing unbounded histories. Constraint: PR #361 was already merged; this branch is based on upstream/main@c2ac9a74. Rejected: Default-disabling COORDINATOR_MODE/TEAMMEM only | explicit feature enablement still hit unbounded paths. Rejected: Persisting UDS auth in SDK/env/session registry | bridge/remote metadata can leak local capability secrets. Rejected: Inline uds #token addresses | observable/tool/classifier paths can reflect raw addresses outside the UDS request frame. Rejected: Positional mailbox marking after compaction | compaction can shift indices across the lock boundary. Confidence: high Scope-risk: moderate Directive: Do not expose UDS capability tokens through SDK messages, environment variables, session registry, peer-list output, or SendMessage result/classifier surfaces. Directive: Do not reintroduce positional mailbox acknowledgements unless compaction is removed or read+mark is atomic under one lock. Tested: bun test src/utils/__tests__/ndjsonFramer.test.ts src/utils/__tests__/udsMessaging.test.ts packages/builtin-tools/src/tools/SendMessageTool/__tests__/udsRecipientSanitization.test.ts Tested: bunx tsc --noEmit --pretty false Tested: bun run lint Tested: bunx biome lint modified src/package files Tested: bun run test:all (3704 pass, 0 fail, 6734 expects) Tested: bun audit (No vulnerabilities found) Tested: bun run build Tested: bun run build:vite Tested: git diff --check Not-tested: End-to-end external UDS client driving a full production headless model turn. * fix: harden bounded agent communication review fixes CodeRabbit and Codecov surfaced real gaps in UDS framing, peer discovery, mailbox retention, and summary context coverage. This tightens those paths without suppressing review or coverage signals. Constraint: PR #369 must address CodeRabbit and Codecov findings without warning suppression or fake fallbacks Rejected: Suppress Codecov or CodeRabbit warnings | leaves real receive-path and test-isolation gaps Rejected: Add unreachable feature-gated tests | bun:bundle keeps those branches compile-time gated in local tests Confidence: high Scope-risk: moderate Directive: Keep UDS auth-token rejection outside feature flags; do not reintroduce inline token fallbacks Tested: bun test --coverage --coverage-reporter lcov --coverage-dir coverage; bun run test:all; bun run lint; bun run build; bun run build:vite; bun audit; git diff --cached --check Not-tested: Remote Codecov/CodeRabbit refreshed reports until pushed * fix: prevent agent communication bounds from hiding CI regressions Tighten the UDS auth, framing, and response-reader boundaries while keeping the AgentSummary lifecycle covered so Codecov and CI fail on real regressions instead of missing coverage. The poorMode settings mock mirrors unrelated real settings defaults to avoid Bun mock retention changing later permission tests. Constraint: PR #369 must fix Codecov/CI precisely without warning suppression, fallback masking, or mock pollution Rejected: Delete AgentSummary lifecycle coverage | would hide Codecov loss and stale-summary behavior Rejected: Store inline UDS rejection in a hidden input sentinel | cloned observable inputs can drop it and bypass rejection Rejected: Ignore malformed UDS frames until timeout | leaves client slots and SendMessage calls open to exhaustion Confidence: high Scope-risk: moderate Directive: Keep empty #token= markers rejected; do not require a non-empty token value in hasInlineUdsToken Tested: bun test packages/builtin-tools/src/tools/SendMessageTool/__tests__/udsRecipientSanitization.test.ts src/utils/__tests__/udsMessaging.test.ts src/utils/__tests__/udsResponseReader.test.ts src/utils/__tests__/ndjsonFramer.test.ts Tested: bunx tsc --noEmit --pretty false Tested: bun run lint Tested: bun test --coverage --coverage-reporter lcov --coverage-dir coverage Tested: bun run test:all Tested: bun audit Tested: bun run build Tested: bun run build:vite Not-tested: GitHub-hosted Codecov upload until pushed PR checks rerun --------- Co-authored-by: unraid <local@unraid.local>
274 lines
7.9 KiB
TypeScript
274 lines
7.9 KiB
TypeScript
/**
|
|
* UDS Client — connect to peer Claude Code sessions via Unix Domain Sockets.
|
|
*
|
|
* Peers are discovered by reading the PID-file registry in ~/.claude/sessions/
|
|
* (written by concurrentSessions.ts) and checking each entry's
|
|
* `messagingSocketPath` field. A peer is "alive" if its PID is running and
|
|
* its socket accepts a ping/pong round-trip.
|
|
*/
|
|
|
|
import { createConnection, type Socket } from 'net'
|
|
import { readdir, readFile } from 'fs/promises'
|
|
import { join } from 'path'
|
|
import { getClaudeConfigHomeDir } from './envUtils.js'
|
|
import { logForDebugging } from './debug.js'
|
|
import { errorMessage, isFsInaccessible } from './errors.js'
|
|
import { isProcessRunning } from './genericProcessUtils.js'
|
|
import { jsonParse, jsonStringify } from './slowOperations.js'
|
|
import type { SessionKind } from './concurrentSessions.js'
|
|
import { MAX_UDS_FRAME_BYTES, type UdsMessage } from './udsMessaging.js'
|
|
import { attachUdsResponseReader, getChunkBytes } from './udsResponseReader.js'
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Types
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export type PeerSession = {
|
|
pid: number
|
|
sessionId?: string
|
|
cwd?: string
|
|
startedAt?: number
|
|
kind?: SessionKind
|
|
name?: string
|
|
messagingSocketPath?: string
|
|
entrypoint?: string
|
|
bridgeSessionId?: string | null
|
|
alive: boolean
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Session directory
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function getSessionsDir(): string {
|
|
return join(getClaudeConfigHomeDir(), 'sessions')
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Discovery
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/**
|
|
* List all live sessions from the PID registry, optionally probing their
|
|
* UDS sockets for liveness. Sessions whose PID is no longer running are
|
|
* excluded (and their stale files cleaned up).
|
|
*/
|
|
export async function listAllLiveSessions(): Promise<PeerSession[]> {
|
|
const dir = getSessionsDir()
|
|
let files: string[]
|
|
try {
|
|
files = await readdir(dir)
|
|
} catch (e) {
|
|
if (!isFsInaccessible(e)) {
|
|
logForDebugging(`[udsClient] readdir failed: ${errorMessage(e)}`)
|
|
}
|
|
return []
|
|
}
|
|
|
|
const results: PeerSession[] = []
|
|
|
|
for (const file of files) {
|
|
if (!/^\d+\.json$/.test(file)) continue
|
|
const pid = parseInt(file.slice(0, -5), 10)
|
|
|
|
if (!isProcessRunning(pid)) {
|
|
// Stale — skip (concurrentSessions handles cleanup)
|
|
continue
|
|
}
|
|
|
|
try {
|
|
const raw = await readFile(join(dir, file), 'utf8')
|
|
const data = jsonParse(raw) as Record<string, unknown>
|
|
results.push({
|
|
pid,
|
|
sessionId: data.sessionId as string | undefined,
|
|
cwd: data.cwd as string | undefined,
|
|
startedAt: data.startedAt as number | undefined,
|
|
kind: data.kind as SessionKind | undefined,
|
|
name: data.name as string | undefined,
|
|
messagingSocketPath: data.messagingSocketPath as string | undefined,
|
|
entrypoint: data.entrypoint as string | undefined,
|
|
bridgeSessionId: data.bridgeSessionId as string | null | undefined,
|
|
alive: true,
|
|
})
|
|
} catch {
|
|
// Corrupted file — skip
|
|
}
|
|
}
|
|
|
|
return results
|
|
}
|
|
|
|
/**
|
|
* List peer sessions that have a UDS messaging socket (i.e. can receive
|
|
* messages). Excludes the current process.
|
|
*/
|
|
export async function listPeers(): Promise<PeerSession[]> {
|
|
const all = await listAllLiveSessions()
|
|
return all.filter(s => s.pid !== process.pid && s.messagingSocketPath != null)
|
|
}
|
|
|
|
async function findAuthTokenForSocketPath(
|
|
socketPath: string,
|
|
): Promise<string | undefined> {
|
|
const { readUdsCapabilityToken } = await import('./udsMessaging.js')
|
|
return readUdsCapabilityToken(socketPath)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Connection helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/**
|
|
* Probe a UDS socket to check if a server is listening (ping/pong).
|
|
* Returns true if the peer responds within the timeout.
|
|
*/
|
|
export async function isPeerAlive(
|
|
socketPath: string,
|
|
timeoutMs = 3000,
|
|
authToken?: string,
|
|
): Promise<boolean> {
|
|
const token = authToken ?? (await findAuthTokenForSocketPath(socketPath))
|
|
if (!token) return false
|
|
|
|
return new Promise<boolean>(resolve => {
|
|
const conn = createConnection(socketPath, () => {
|
|
const ping: UdsMessage = {
|
|
type: 'ping',
|
|
ts: new Date().toISOString(),
|
|
meta: { authToken: token },
|
|
}
|
|
conn.write(jsonStringify(ping) + '\n')
|
|
})
|
|
|
|
let resolved = false
|
|
|
|
const timer = setTimeout(() => {
|
|
if (!resolved) {
|
|
resolved = true
|
|
conn.destroy()
|
|
resolve(false)
|
|
}
|
|
}, timeoutMs)
|
|
|
|
let buffer = ''
|
|
conn.on('data', chunk => {
|
|
if (
|
|
Buffer.byteLength(buffer, 'utf8') + getChunkBytes(chunk) >
|
|
MAX_UDS_FRAME_BYTES
|
|
) {
|
|
if (!resolved) {
|
|
resolved = true
|
|
clearTimeout(timer)
|
|
conn.destroy()
|
|
resolve(false)
|
|
}
|
|
return
|
|
}
|
|
buffer += chunk.toString()
|
|
if (buffer.includes('"pong"')) {
|
|
if (!resolved) {
|
|
resolved = true
|
|
clearTimeout(timer)
|
|
conn.end()
|
|
resolve(true)
|
|
}
|
|
}
|
|
})
|
|
|
|
conn.on('error', () => {
|
|
if (!resolved) {
|
|
resolved = true
|
|
clearTimeout(timer)
|
|
resolve(false)
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Send a text message to a peer's UDS socket. This is the high-level helper
|
|
* used by SendMessageTool for `uds:<path>` addresses.
|
|
*/
|
|
export async function sendToUdsSocket(
|
|
targetSocketPath: string,
|
|
message: string | Record<string, unknown>,
|
|
): Promise<void> {
|
|
const { parseUdsTarget } = await import('./udsMessaging.js')
|
|
const target = parseUdsTarget(targetSocketPath)
|
|
const authToken = await findAuthTokenForSocketPath(target.socketPath)
|
|
if (!authToken) {
|
|
throw new Error(`No auth token found for peer at ${target.socketPath}`)
|
|
}
|
|
|
|
const data = typeof message === 'string' ? message : jsonStringify(message)
|
|
const udsMsg: UdsMessage = {
|
|
type: 'text',
|
|
data,
|
|
ts: new Date().toISOString(),
|
|
}
|
|
|
|
// Lazily import to avoid circular dep at module-load time
|
|
const { getUdsMessagingSocketPath } = await import('./udsMessaging.js')
|
|
udsMsg.from = getUdsMessagingSocketPath()
|
|
|
|
return new Promise<void>((resolve, reject) => {
|
|
let settled = false
|
|
let conn: ReturnType<typeof createConnection>
|
|
const finish = (error?: Error): void => {
|
|
if (settled) return
|
|
settled = true
|
|
if (error) {
|
|
conn.destroy(error)
|
|
reject(error)
|
|
} else {
|
|
conn.end()
|
|
resolve()
|
|
}
|
|
}
|
|
|
|
conn = createConnection(target.socketPath, () => {
|
|
udsMsg.meta = { ...udsMsg.meta, authToken }
|
|
conn.write(jsonStringify(udsMsg) + '\n', err => {
|
|
if (err) finish(err)
|
|
})
|
|
})
|
|
attachUdsResponseReader(conn, {
|
|
maxFrameBytes: MAX_UDS_FRAME_BYTES,
|
|
onSettled: finish,
|
|
formatSocketError: err =>
|
|
new Error(
|
|
`Failed to connect to peer at ${target.socketPath}: ${errorMessage(err)}`,
|
|
),
|
|
})
|
|
conn.setTimeout(5000, () => {
|
|
finish(new Error('Connection timed out'))
|
|
})
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Connect to a peer and return the raw socket for bidirectional communication.
|
|
* The caller is responsible for managing the connection lifecycle.
|
|
*/
|
|
export function connectToPeer(socketPath: string): Promise<Socket> {
|
|
return new Promise<Socket>((resolve, reject) => {
|
|
const conn = createConnection(socketPath, () => {
|
|
resolve(conn)
|
|
})
|
|
conn.on('error', reject)
|
|
conn.setTimeout(5000, () => {
|
|
conn.destroy(new Error('Connection timed out'))
|
|
})
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Disconnect a previously connected peer socket.
|
|
*/
|
|
export function disconnectPeer(socket: Socket): void {
|
|
if (!socket.destroyed) {
|
|
socket.end()
|
|
}
|
|
}
|