feat: add managed SSH execution spaces
Add managed SSH Hosts and projects with signed side-by-side GoodBuddy Agent and OpenCode Runtime installation, Ask and Execute workspace access, a Main-owned model bridge, detached Agent lifecycle, durable ACP output recovery, and project activation UI. Use protocol v2 with bounded FIFO frames over SSH instead of custom credit, priority, batching, or model-message chunking. Mismatched Host Agents now upgrade automatically, an exactly verified Node runtime is reused on-host, and local Portable builds can embed strictly verified Agent artifacts. Release note: 新增托管 SSH 远程项目，可自动安装或升级签名 Agent/OpenCode Runtime，并在 SSH 断线后继续 Agent 工作和同步未确认输出。
This commit is contained in:
mesalogo
@@ -5,6 +5,34 @@ import type {
|
||||
} from './runtime'
|
||||
import { SelectedRuntimeManager } from './selected-runtime-manager'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import type { ExecutionSpaceDescriptor } from '../execution-space'
|
||||
|
||||
function executionSpace(
|
||||
cacheIdentity: string
|
||||
): ExecutionSpaceDescriptor {
|
||||
return {
|
||||
kind: 'local',
|
||||
rootPath: cacheIdentity,
|
||||
cacheIdentity,
|
||||
routeIdentity: cacheIdentity,
|
||||
workspaceAccess: {} as ExecutionSpaceDescriptor['workspaceAccess']
|
||||
}
|
||||
}
|
||||
|
||||
function remoteExecutionSpace(
|
||||
hostId: string,
|
||||
cacheIdentity: string
|
||||
): ExecutionSpaceDescriptor {
|
||||
return {
|
||||
kind: 'ssh',
|
||||
hostId,
|
||||
remoteRootPath: '/srv/project',
|
||||
cacheIdentity,
|
||||
routeIdentity: cacheIdentity,
|
||||
workspaceAccess:
|
||||
{} as ExecutionSpaceDescriptor['workspaceAccess']
|
||||
}
|
||||
}
|
||||
|
||||
function runtime() {
|
||||
const releaseConversation = vi.fn(async () => undefined)
|
||||
@@ -111,30 +139,26 @@ describe('SelectedRuntimeManager', () => {
|
||||
const manager = new SelectedRuntimeManager(create)
|
||||
const selection = { provider: 'opencode' as const }
|
||||
|
||||
const projectOne = await manager.getRuntime(
|
||||
selection,
|
||||
'C:\\Projects\\One'
|
||||
)
|
||||
const firstSpace = executionSpace('local:project-one')
|
||||
const secondSpace = executionSpace('local:project-two')
|
||||
const projectOne = await manager.getRuntime(selection, firstSpace)
|
||||
const projectOneAgain = await manager.getRuntime(
|
||||
selection,
|
||||
'C:\\Projects\\One'
|
||||
)
|
||||
const projectTwo = await manager.getRuntime(
|
||||
selection,
|
||||
'C:\\Projects\\Two'
|
||||
executionSpace('local:project-one')
|
||||
)
|
||||
const projectTwo = await manager.getRuntime(selection, secondSpace)
|
||||
|
||||
expect(projectOneAgain).toBe(projectOne)
|
||||
expect(projectTwo).not.toBe(projectOne)
|
||||
expect(create).toHaveBeenNthCalledWith(
|
||||
1,
|
||||
selection,
|
||||
'C:\\Projects\\One'
|
||||
firstSpace
|
||||
)
|
||||
expect(create).toHaveBeenNthCalledWith(
|
||||
2,
|
||||
selection,
|
||||
'C:\\Projects\\Two'
|
||||
secondSpace
|
||||
)
|
||||
await manager.dispose()
|
||||
})
|
||||
@@ -162,6 +186,64 @@ describe('SelectedRuntimeManager', () => {
|
||||
expect(second.dispose).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('retires only cached runtimes for an edited SSH Host', async () => {
|
||||
const firstHost = runtime()
|
||||
const secondHost = runtime()
|
||||
const local = runtime()
|
||||
const replacement = runtime()
|
||||
const create = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce(firstHost.value)
|
||||
.mockResolvedValueOnce(secondHost.value)
|
||||
.mockResolvedValueOnce(local.value)
|
||||
.mockResolvedValueOnce(replacement.value)
|
||||
const manager = new SelectedRuntimeManager(create)
|
||||
const selection = { provider: 'opencode' as const }
|
||||
const firstSpace = remoteExecutionSpace(
|
||||
'host-one',
|
||||
'ssh:host-one:revision-one'
|
||||
)
|
||||
const secondSpace = remoteExecutionSpace(
|
||||
'host-two',
|
||||
'ssh:host-two:revision-one'
|
||||
)
|
||||
const localSpace = executionSpace('local:project')
|
||||
|
||||
const firstController = await manager.getRuntime(
|
||||
selection,
|
||||
firstSpace
|
||||
)
|
||||
const secondController = await manager.getRuntime(
|
||||
selection,
|
||||
secondSpace
|
||||
)
|
||||
const localController = await manager.getRuntime(
|
||||
selection,
|
||||
localSpace
|
||||
)
|
||||
|
||||
await manager.invalidateHost('host-one')
|
||||
|
||||
expect(firstHost.dispose).toHaveBeenCalledOnce()
|
||||
expect(secondHost.dispose).not.toHaveBeenCalled()
|
||||
expect(local.dispose).not.toHaveBeenCalled()
|
||||
expect(
|
||||
await manager.getRuntime(selection, secondSpace)
|
||||
).toBe(secondController)
|
||||
expect(
|
||||
await manager.getRuntime(selection, localSpace)
|
||||
).toBe(localController)
|
||||
expect(
|
||||
await manager.getRuntime(selection, firstSpace)
|
||||
).not.toBe(firstController)
|
||||
expect(create).toHaveBeenCalledTimes(4)
|
||||
|
||||
await manager.dispose()
|
||||
expect(secondHost.dispose).toHaveBeenCalledOnce()
|
||||
expect(local.dispose).toHaveBeenCalledOnce()
|
||||
expect(replacement.dispose).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('disposes a connection-test runtime without caching it', async () => {
|
||||
const tested = runtime()
|
||||
const cached = runtime()
|
||||
@@ -194,7 +276,10 @@ describe('SelectedRuntimeManager', () => {
|
||||
const selection = { provider: 'opencode' as const }
|
||||
|
||||
await expect(
|
||||
manager.getNativeSnapshot(selection, 'C:\\Projects\\One')
|
||||
manager.getNativeSnapshot(
|
||||
selection,
|
||||
executionSpace('local:project-one')
|
||||
)
|
||||
).resolves.toMatchObject({
|
||||
provider: 'opencode',
|
||||
inventoryStatus: 'available'
|
||||
@@ -202,7 +287,10 @@ describe('SelectedRuntimeManager', () => {
|
||||
expect(inspected.getNativeSnapshot).toHaveBeenCalledOnce()
|
||||
expect(inspected.dispose).toHaveBeenCalledOnce()
|
||||
|
||||
await manager.getRuntime(selection, 'C:\\Projects\\One')
|
||||
await manager.getRuntime(
|
||||
selection,
|
||||
executionSpace('local:project-one')
|
||||
)
|
||||
expect(create).toHaveBeenCalledTimes(2)
|
||||
await manager.dispose()
|
||||
})
|
||||
@@ -297,6 +385,152 @@ describe('SelectedRuntimeManager', () => {
|
||||
await manager.dispose()
|
||||
})
|
||||
|
||||
it('retires a drainable Runtime without forcing it and keeps routing conversation release', async () => {
|
||||
let finishDrain!: () => void
|
||||
const drain = new Promise<void>((resolve) => {
|
||||
finishDrain = resolve
|
||||
})
|
||||
const active = runtime()
|
||||
const beginDrain = vi.fn(async () => undefined)
|
||||
const waitForDrain = vi.fn(async () => await drain)
|
||||
const forceShutdown = vi.fn(async () => undefined)
|
||||
Object.assign(active.value, {
|
||||
beginDrain,
|
||||
waitForDrain,
|
||||
forceShutdown
|
||||
})
|
||||
const manager = new SelectedRuntimeManager(
|
||||
vi.fn(async () => active.value)
|
||||
)
|
||||
const controller = await manager.getRuntime({
|
||||
provider: 'opencode'
|
||||
})
|
||||
const stream = controller.run(
|
||||
{
|
||||
requestId: '00000000-0000-4000-8000-000000000021',
|
||||
conversationId: 'conversation-draining',
|
||||
prompt: 'finish normally',
|
||||
workMode: 'ask'
|
||||
},
|
||||
new AbortController().signal
|
||||
)
|
||||
await stream.next()
|
||||
await stream.next()
|
||||
|
||||
await manager.reset()
|
||||
expect(beginDrain).toHaveBeenCalledOnce()
|
||||
expect(forceShutdown).not.toHaveBeenCalled()
|
||||
expect(active.dispose).not.toHaveBeenCalled()
|
||||
|
||||
await manager.releaseConversation('conversation-draining')
|
||||
expect(active.releaseConversation).toHaveBeenCalledWith(
|
||||
'conversation-draining'
|
||||
)
|
||||
finishDrain()
|
||||
await vi.waitFor(() =>
|
||||
expect(active.dispose).toHaveBeenCalledOnce()
|
||||
)
|
||||
expect(forceShutdown).not.toHaveBeenCalled()
|
||||
await manager.dispose()
|
||||
})
|
||||
|
||||
it('evicts only the least-recently-used idle Runtime at the cache bound', async () => {
|
||||
const first = runtime()
|
||||
const second = runtime()
|
||||
const third = runtime()
|
||||
const create = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce(first.value)
|
||||
.mockResolvedValueOnce(second.value)
|
||||
.mockResolvedValueOnce(third.value)
|
||||
const manager = new SelectedRuntimeManager(create, 2)
|
||||
const selection = (suffix: string) => ({
|
||||
provider: 'model' as const,
|
||||
profileId: `00000000-0000-4000-8000-0000000000${suffix}`
|
||||
})
|
||||
|
||||
const firstController = await manager.getRuntime(selection('31'))
|
||||
await manager.getRuntime(selection('32'))
|
||||
await expect(
|
||||
manager.getRuntime(selection('31'))
|
||||
).resolves.toBe(firstController)
|
||||
await manager.getRuntime(selection('33'))
|
||||
|
||||
await vi.waitFor(() =>
|
||||
expect(second.dispose).toHaveBeenCalledOnce()
|
||||
)
|
||||
expect(first.dispose).not.toHaveBeenCalled()
|
||||
expect(third.dispose).not.toHaveBeenCalled()
|
||||
await manager.dispose()
|
||||
})
|
||||
|
||||
it('bounds current and drain-retained Runtime controllers across resets', async () => {
|
||||
const created = [runtime(), runtime(), runtime()]
|
||||
for (const item of created) {
|
||||
Object.assign(item.value, {
|
||||
beginDrain: vi.fn(async () => undefined),
|
||||
waitForDrain: vi.fn(async () => await new Promise(() => undefined)),
|
||||
forceShutdown: vi.fn(async () => undefined)
|
||||
})
|
||||
}
|
||||
const create = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce(created[0]!.value)
|
||||
.mockResolvedValueOnce(created[1]!.value)
|
||||
.mockResolvedValueOnce(created[2]!.value)
|
||||
const manager = new SelectedRuntimeManager(create, 1, 2)
|
||||
const selection = (suffix: string) => ({
|
||||
provider: 'model' as const,
|
||||
profileId: `00000000-0000-4000-8000-0000000000${suffix}`
|
||||
})
|
||||
|
||||
await manager.getRuntime(selection('41'))
|
||||
await manager.reset()
|
||||
await manager.getRuntime(selection('42'))
|
||||
await manager.reset()
|
||||
await expect(
|
||||
manager.getRuntime(selection('43'))
|
||||
).rejects.toThrow(/退役容量/iu)
|
||||
expect(create).toHaveBeenCalledTimes(2)
|
||||
await manager.dispose()
|
||||
expect(created[0]!.dispose).toHaveBeenCalledOnce()
|
||||
expect(created[1]!.dispose).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('reserves retained capacity while an invalidated Runtime is still being created', async () => {
|
||||
let finishCreate!: (runtime: AgentRuntime) => void
|
||||
const pendingCreate = new Promise<AgentRuntime>((resolve) => {
|
||||
finishCreate = resolve
|
||||
})
|
||||
const created = runtime()
|
||||
const create = vi.fn(async () => await pendingCreate)
|
||||
const manager = new SelectedRuntimeManager(create, 1, 1)
|
||||
const selection = (suffix: string) => ({
|
||||
provider: 'model' as const,
|
||||
profileId: `00000000-0000-4000-8000-0000000000${suffix}`
|
||||
})
|
||||
|
||||
const firstRuntime = manager
|
||||
.getRuntime(selection('51'))
|
||||
.catch((error: unknown) => error)
|
||||
const reset = manager.reset()
|
||||
|
||||
await expect(
|
||||
manager.getRuntime(selection('52'))
|
||||
).rejects.toThrow(/退役容量/iu)
|
||||
expect(create).toHaveBeenCalledOnce()
|
||||
|
||||
finishCreate(created.value)
|
||||
await expect(firstRuntime).resolves.toEqual(
|
||||
expect.objectContaining({
|
||||
message: expect.stringMatching(/设置已更改/iu)
|
||||
})
|
||||
)
|
||||
await reset
|
||||
expect(created.dispose).toHaveBeenCalledOnce()
|
||||
await manager.dispose()
|
||||
})
|
||||
|
||||
it('releases a conversation from every selected runtime', async () => {
|
||||
const first = runtime()
|
||||
const second = runtime()
|
||||
@@ -321,4 +555,40 @@ describe('SelectedRuntimeManager', () => {
|
||||
)
|
||||
await manager.dispose()
|
||||
})
|
||||
|
||||
it('uses only the resolver-owned execution-space cache identity', async () => {
|
||||
const create = vi.fn(async () => runtime().value)
|
||||
const manager = new SelectedRuntimeManager(create)
|
||||
const selection = { provider: 'opencode' as const }
|
||||
const remote = (
|
||||
cacheIdentity: string
|
||||
): ExecutionSpaceDescriptor => ({
|
||||
kind: 'ssh',
|
||||
hostId: 'host-one',
|
||||
remoteRootPath: '/srv/project',
|
||||
cacheIdentity,
|
||||
routeIdentity: 'remote-route',
|
||||
workspaceAccess:
|
||||
{} as ExecutionSpaceDescriptor['workspaceAccess']
|
||||
})
|
||||
|
||||
const baseline = await manager.getRuntime(
|
||||
selection,
|
||||
remote('resolver-identity-one')
|
||||
)
|
||||
await expect(
|
||||
manager.getRuntime(
|
||||
selection,
|
||||
remote('resolver-identity-one')
|
||||
)
|
||||
).resolves.toBe(baseline)
|
||||
await expect(
|
||||
manager.getRuntime(
|
||||
selection,
|
||||
remote('resolver-identity-two')
|
||||
)
|
||||
).resolves.not.toBe(baseline)
|
||||
expect(create).toHaveBeenCalledTimes(2)
|
||||
await manager.dispose()
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user