macro-agent 0.1.7 → 0.1.10
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/CLAUDE.md +179 -38
- package/README.md +781 -131
- package/dist/acp/claude-code-replay.d.ts +11 -0
- package/dist/acp/claude-code-replay.d.ts.map +1 -0
- package/dist/acp/claude-code-replay.js +190 -0
- package/dist/acp/claude-code-replay.js.map +1 -0
- package/dist/acp/macro-agent.d.ts.map +1 -1
- package/dist/acp/macro-agent.js +155 -6
- package/dist/acp/macro-agent.js.map +1 -1
- package/dist/acp/types.d.ts +9 -0
- package/dist/acp/types.d.ts.map +1 -1
- package/dist/acp/types.js.map +1 -1
- package/dist/agent/agent-manager-v2.d.ts +21 -0
- package/dist/agent/agent-manager-v2.d.ts.map +1 -1
- package/dist/agent/agent-manager-v2.js +234 -71
- package/dist/agent/agent-manager-v2.js.map +1 -1
- package/dist/agent/agent-manager.d.ts +12 -0
- package/dist/agent/agent-manager.d.ts.map +1 -1
- package/dist/agent/agent-manager.js.map +1 -1
- package/dist/agent/types.d.ts +15 -2
- package/dist/agent/types.d.ts.map +1 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/boot-v2.d.ts +41 -0
- package/dist/boot-v2.d.ts.map +1 -1
- package/dist/boot-v2.js +34 -37
- package/dist/boot-v2.js.map +1 -1
- package/dist/cli/index.js +56 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cognitive/macro-agent-backend.d.ts.map +1 -1
- package/dist/cognitive/macro-agent-backend.js +40 -22
- package/dist/cognitive/macro-agent-backend.js.map +1 -1
- package/dist/integrations/skilltree.d.ts.map +1 -1
- package/dist/integrations/skilltree.js +1 -0
- package/dist/integrations/skilltree.js.map +1 -1
- package/dist/lifecycle/cleanup.d.ts +33 -2
- package/dist/lifecycle/cleanup.d.ts.map +1 -1
- package/dist/lifecycle/cleanup.js +28 -6
- package/dist/lifecycle/cleanup.js.map +1 -1
- package/dist/lifecycle/handlers-v2.d.ts +7 -0
- package/dist/lifecycle/handlers-v2.d.ts.map +1 -1
- package/dist/lifecycle/handlers-v2.js +28 -2
- package/dist/lifecycle/handlers-v2.js.map +1 -1
- package/dist/lifecycle/types.d.ts +11 -0
- package/dist/lifecycle/types.d.ts.map +1 -1
- package/dist/lifecycle/types.js.map +1 -1
- package/dist/map/acp-bridge.d.ts +9 -0
- package/dist/map/acp-bridge.d.ts.map +1 -1
- package/dist/map/acp-bridge.js +15 -2
- package/dist/map/acp-bridge.js.map +1 -1
- package/dist/map/cascade-bridge.d.ts +44 -0
- package/dist/map/cascade-bridge.d.ts.map +1 -0
- package/dist/map/cascade-bridge.js +257 -0
- package/dist/map/cascade-bridge.js.map +1 -0
- package/dist/map/lifecycle-bridge.d.ts +1 -8
- package/dist/map/lifecycle-bridge.d.ts.map +1 -1
- package/dist/map/lifecycle-bridge.js +76 -22
- package/dist/map/lifecycle-bridge.js.map +1 -1
- package/dist/map/server.d.ts.map +1 -1
- package/dist/map/server.js +47 -6
- package/dist/map/server.js.map +1 -1
- package/dist/map/sidecar.d.ts.map +1 -1
- package/dist/map/sidecar.js +33 -4
- package/dist/map/sidecar.js.map +1 -1
- package/dist/map/types.d.ts +20 -0
- package/dist/map/types.d.ts.map +1 -1
- package/dist/mcp/tools/done-v2.d.ts.map +1 -1
- package/dist/mcp/tools/done-v2.js +8 -0
- package/dist/mcp/tools/done-v2.js.map +1 -1
- package/dist/teams/team-manager-v2.d.ts.map +1 -1
- package/dist/teams/team-manager-v2.js +26 -0
- package/dist/teams/team-manager-v2.js.map +1 -1
- package/dist/teams/team-runtime-v2.d.ts.map +1 -1
- package/dist/teams/team-runtime-v2.js +16 -3
- package/dist/teams/team-runtime-v2.js.map +1 -1
- package/dist/workspace/config.d.ts +10 -10
- package/dist/workspace/config.d.ts.map +1 -1
- package/dist/workspace/config.js +4 -4
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/git-cascade-adapter.d.ts +510 -0
- package/dist/workspace/git-cascade-adapter.d.ts.map +1 -0
- package/dist/workspace/git-cascade-adapter.js +908 -0
- package/dist/workspace/git-cascade-adapter.js.map +1 -0
- package/dist/workspace/index.d.ts +3 -3
- package/dist/workspace/index.d.ts.map +1 -1
- package/dist/workspace/index.js +4 -4
- package/dist/workspace/index.js.map +1 -1
- package/dist/workspace/landing/direct-push.d.ts +20 -0
- package/dist/workspace/landing/direct-push.d.ts.map +1 -0
- package/dist/workspace/landing/direct-push.js +74 -0
- package/dist/workspace/landing/direct-push.js.map +1 -0
- package/dist/workspace/landing/index.d.ts +29 -0
- package/dist/workspace/landing/index.d.ts.map +1 -0
- package/dist/workspace/landing/index.js +37 -0
- package/dist/workspace/landing/index.js.map +1 -0
- package/dist/workspace/landing/merge-to-parent.d.ts +41 -0
- package/dist/workspace/landing/merge-to-parent.d.ts.map +1 -0
- package/dist/workspace/landing/merge-to-parent.js +185 -0
- package/dist/workspace/landing/merge-to-parent.js.map +1 -0
- package/dist/workspace/landing/optimistic-push.d.ts +16 -0
- package/dist/workspace/landing/optimistic-push.d.ts.map +1 -0
- package/dist/workspace/landing/optimistic-push.js +27 -0
- package/dist/workspace/landing/optimistic-push.js.map +1 -0
- package/dist/workspace/landing/queue-to-branch.d.ts +24 -0
- package/dist/workspace/landing/queue-to-branch.d.ts.map +1 -0
- package/dist/workspace/landing/queue-to-branch.js +79 -0
- package/dist/workspace/landing/queue-to-branch.js.map +1 -0
- package/dist/workspace/merge-queue/merge-queue.d.ts +10 -0
- package/dist/workspace/merge-queue/merge-queue.d.ts.map +1 -1
- package/dist/workspace/merge-queue/merge-queue.js +10 -0
- package/dist/workspace/merge-queue/merge-queue.js.map +1 -1
- package/dist/workspace/merge-queue/types.d.ts +16 -2
- package/dist/workspace/merge-queue/types.d.ts.map +1 -1
- package/dist/workspace/merge-queue/types.js +9 -0
- package/dist/workspace/merge-queue/types.js.map +1 -1
- package/dist/workspace/pool/types.d.ts +1 -0
- package/dist/workspace/pool/types.d.ts.map +1 -1
- package/dist/workspace/pool/worktree-pool.d.ts.map +1 -1
- package/dist/workspace/pool/worktree-pool.js +1 -0
- package/dist/workspace/pool/worktree-pool.js.map +1 -1
- package/dist/workspace/recovery/abandon.d.ts +15 -0
- package/dist/workspace/recovery/abandon.d.ts.map +1 -0
- package/dist/workspace/recovery/abandon.js +45 -0
- package/dist/workspace/recovery/abandon.js.map +1 -0
- package/dist/workspace/recovery/auto-resolve.d.ts +27 -0
- package/dist/workspace/recovery/auto-resolve.d.ts.map +1 -0
- package/dist/workspace/recovery/auto-resolve.js +99 -0
- package/dist/workspace/recovery/auto-resolve.js.map +1 -0
- package/dist/workspace/recovery/defer.d.ts +15 -0
- package/dist/workspace/recovery/defer.d.ts.map +1 -0
- package/dist/workspace/recovery/defer.js +16 -0
- package/dist/workspace/recovery/defer.js.map +1 -0
- package/dist/workspace/recovery/escalate.d.ts +16 -0
- package/dist/workspace/recovery/escalate.d.ts.map +1 -0
- package/dist/workspace/recovery/escalate.js +24 -0
- package/dist/workspace/recovery/escalate.js.map +1 -0
- package/dist/workspace/recovery/index.d.ts +32 -0
- package/dist/workspace/recovery/index.d.ts.map +1 -0
- package/dist/workspace/recovery/index.js +45 -0
- package/dist/workspace/recovery/index.js.map +1 -0
- package/dist/workspace/recovery/spawn-resolver.d.ts +45 -0
- package/dist/workspace/recovery/spawn-resolver.d.ts.map +1 -0
- package/dist/workspace/recovery/spawn-resolver.js +111 -0
- package/dist/workspace/recovery/spawn-resolver.js.map +1 -0
- package/dist/workspace/recovery/types.d.ts +63 -0
- package/dist/workspace/recovery/types.d.ts.map +1 -0
- package/dist/workspace/recovery/types.js +12 -0
- package/dist/workspace/recovery/types.js.map +1 -0
- package/dist/workspace/topology/index.d.ts +9 -0
- package/dist/workspace/topology/index.d.ts.map +1 -0
- package/dist/workspace/topology/index.js +8 -0
- package/dist/workspace/topology/index.js.map +1 -0
- package/dist/workspace/topology/no-workspace.d.ts +18 -0
- package/dist/workspace/topology/no-workspace.d.ts.map +1 -0
- package/dist/workspace/topology/no-workspace.js +25 -0
- package/dist/workspace/topology/no-workspace.js.map +1 -0
- package/dist/workspace/topology/types.d.ts +97 -0
- package/dist/workspace/topology/types.d.ts.map +1 -0
- package/dist/workspace/topology/types.js +20 -0
- package/dist/workspace/topology/types.js.map +1 -0
- package/dist/workspace/topology/yaml-driven.d.ts +69 -0
- package/dist/workspace/topology/yaml-driven.d.ts.map +1 -0
- package/dist/workspace/topology/yaml-driven.js +273 -0
- package/dist/workspace/topology/yaml-driven.js.map +1 -0
- package/dist/workspace/types-v3.d.ts +110 -0
- package/dist/workspace/types-v3.d.ts.map +1 -0
- package/dist/workspace/types-v3.js +20 -0
- package/dist/workspace/types-v3.js.map +1 -0
- package/dist/workspace/types.d.ts +145 -17
- package/dist/workspace/types.d.ts.map +1 -1
- package/dist/workspace/workspace-manager.d.ts +92 -13
- package/dist/workspace/workspace-manager.d.ts.map +1 -1
- package/dist/workspace/workspace-manager.js +373 -13
- package/dist/workspace/workspace-manager.js.map +1 -1
- package/dist/workspace/yaml-schema.d.ts +254 -0
- package/dist/workspace/yaml-schema.d.ts.map +1 -0
- package/dist/workspace/yaml-schema.js +170 -0
- package/dist/workspace/yaml-schema.js.map +1 -0
- package/docs/conflict-recovery.md +472 -0
- package/docs/git-cascade-integration-gaps.md +678 -0
- package/docs/workspace-interfaces.md +731 -0
- package/docs/workspace-redesign-plan.md +302 -0
- package/package.json +4 -4
- package/src/__tests__/e2e/auto-sync.e2e.test.ts +257 -0
- package/src/__tests__/e2e/cascade-rebase.e2e.test.ts +254 -0
- package/src/__tests__/e2e/cli-run.e2e.test.ts +167 -0
- package/src/__tests__/e2e/self-driving-v3.e2e.test.ts +197 -0
- package/src/__tests__/e2e/spawn-resolver.e2e.test.ts +200 -0
- package/src/__tests__/e2e/workspace-lifecycle.e2e.test.ts +30 -22
- package/src/__tests__/e2e/workspace-v3.e2e.test.ts +413 -0
- package/src/acp/__tests__/claude-code-replay.test.ts +225 -0
- package/src/acp/__tests__/macro-agent.test.ts +39 -1
- package/src/acp/claude-code-replay.ts +208 -0
- package/src/acp/macro-agent.ts +167 -9
- package/src/acp/types.ts +10 -0
- package/src/agent/__tests__/agent-manager-topology.test.ts +73 -0
- package/src/agent/__tests__/agent-manager-v2.test.ts +71 -11
- package/src/agent/__tests__/task-ref-resolution.test.ts +231 -0
- package/src/agent/agent-manager-v2.ts +293 -77
- package/src/agent/agent-manager.ts +14 -0
- package/src/agent/types.ts +16 -2
- package/src/boot-v2.ts +87 -36
- package/src/cli/index.ts +61 -0
- package/src/cognitive/__tests__/macro-agent-backend.test.ts +47 -5
- package/src/cognitive/macro-agent-backend.ts +45 -29
- package/src/integrations/skilltree.ts +1 -0
- package/src/lifecycle/cleanup.ts +52 -3
- package/src/lifecycle/handlers-v2.ts +40 -3
- package/src/lifecycle/types.ts +12 -0
- package/src/map/__tests__/cascade-bridge.test.ts +229 -0
- package/src/map/__tests__/lifecycle-bridge.test.ts +165 -22
- package/src/map/acp-bridge.ts +26 -3
- package/src/map/cascade-bridge.ts +301 -0
- package/src/map/lifecycle-bridge.ts +77 -27
- package/src/map/server.ts +47 -6
- package/src/map/sidecar.ts +31 -3
- package/src/map/types.ts +20 -0
- package/src/mcp/tools/done-v2.ts +9 -0
- package/src/teams/team-manager-v2.ts +37 -0
- package/src/teams/team-runtime-v2.ts +23 -3
- package/src/workspace/__tests__/{dataplane-adapter.test.ts → git-cascade-adapter.test.ts} +209 -14
- package/src/workspace/__tests__/self-driving-yaml.test.ts +114 -0
- package/src/workspace/__tests__/shared-worktree-refcount.test.ts +154 -0
- package/src/workspace/__tests__/standalone-mode.test.ts +118 -0
- package/src/workspace/__tests__/workspace-manager-v3.test.ts +245 -0
- package/src/workspace/__tests__/yaml-schema.test.ts +210 -0
- package/src/workspace/config.ts +11 -11
- package/src/workspace/git-cascade-adapter.ts +1186 -0
- package/src/workspace/index.ts +11 -11
- package/src/workspace/landing/__tests__/strategies.test.ts +142 -0
- package/src/workspace/landing/direct-push.ts +91 -0
- package/src/workspace/landing/index.ts +40 -0
- package/src/workspace/landing/merge-to-parent.ts +228 -0
- package/src/workspace/landing/optimistic-push.ts +36 -0
- package/src/workspace/landing/queue-to-branch.ts +108 -0
- package/src/workspace/merge-queue/merge-queue.ts +10 -0
- package/src/workspace/merge-queue/types.ts +16 -2
- package/src/workspace/pool/__tests__/worktree-pool.integration.test.ts +5 -5
- package/src/workspace/pool/types.ts +1 -0
- package/src/workspace/pool/worktree-pool.ts +1 -0
- package/src/workspace/recovery/__tests__/auto-resolve-integration.test.ts +127 -0
- package/src/workspace/recovery/__tests__/spawn-resolver.test.ts +139 -0
- package/src/workspace/recovery/__tests__/strategies.test.ts +145 -0
- package/src/workspace/recovery/abandon.ts +51 -0
- package/src/workspace/recovery/auto-resolve.ts +119 -0
- package/src/workspace/recovery/defer.ts +23 -0
- package/src/workspace/recovery/escalate.ts +30 -0
- package/src/workspace/recovery/index.ts +58 -0
- package/src/workspace/recovery/spawn-resolver.ts +145 -0
- package/src/workspace/recovery/types.ts +54 -0
- package/src/workspace/topology/__tests__/yaml-driven.test.ts +345 -0
- package/src/workspace/topology/index.ts +18 -0
- package/src/workspace/topology/no-workspace.ts +39 -0
- package/src/workspace/topology/types.ts +116 -0
- package/src/workspace/topology/yaml-driven.ts +316 -0
- package/src/workspace/types-v3.ts +155 -0
- package/src/workspace/types.ts +191 -20
- package/src/workspace/workspace-manager.ts +474 -19
- package/src/workspace/yaml-schema.ts +216 -0
- package/src/workspace/dataplane-adapter.ts +0 -546
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for AgentManagerV2's three-level TaskRef resolution:
|
|
3
|
+
* 1. Explicit SpawnAgentOptions.taskRef wins.
|
|
4
|
+
* 2. resolveTaskRef(opts) runs when no explicit ref.
|
|
5
|
+
* 3. Fallback to taskResourceId + options.task_id when both above yield nothing.
|
|
6
|
+
*
|
|
7
|
+
* Verifies the G3/G14 closure: single-graph default via boot config + multi-graph
|
|
8
|
+
* resolver for deployments that touch more than one opentasks graph.
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
12
|
+
import { createAgentManagerV2 } from "../agent-manager-v2.js";
|
|
13
|
+
import { AgentStore } from "../agent-store.js";
|
|
14
|
+
import type { AgentManager } from "../agent-manager.js";
|
|
15
|
+
import type { InboxAdapter, TasksAdapter } from "../../adapters/types.js";
|
|
16
|
+
import type { SpawnAgentOptions } from "../types.js";
|
|
17
|
+
import type { TaskRef } from "git-cascade/events";
|
|
18
|
+
|
|
19
|
+
vi.mock("acp-factory", () => ({
|
|
20
|
+
AgentFactory: {
|
|
21
|
+
spawn: vi.fn().mockResolvedValue({
|
|
22
|
+
createSession: vi.fn().mockResolvedValue({
|
|
23
|
+
id: "provider-session-1",
|
|
24
|
+
prompt: vi.fn().mockReturnValue({
|
|
25
|
+
[Symbol.asyncIterator]: () => ({
|
|
26
|
+
next: () => Promise.resolve({ done: true, value: undefined }),
|
|
27
|
+
}),
|
|
28
|
+
}),
|
|
29
|
+
forkWithFlush: vi.fn().mockResolvedValue({ id: "forked-session-1" }),
|
|
30
|
+
}),
|
|
31
|
+
loadSession: vi.fn(),
|
|
32
|
+
close: vi.fn().mockResolvedValue(undefined),
|
|
33
|
+
isRunning: vi.fn().mockReturnValue(true),
|
|
34
|
+
}),
|
|
35
|
+
},
|
|
36
|
+
}));
|
|
37
|
+
|
|
38
|
+
function mockInbox(): InboxAdapter {
|
|
39
|
+
return {
|
|
40
|
+
registerAgent: vi.fn().mockResolvedValue(undefined),
|
|
41
|
+
deregisterAgent: vi.fn().mockResolvedValue(undefined),
|
|
42
|
+
send: vi.fn().mockResolvedValue("msg-1"),
|
|
43
|
+
onDelivery: vi.fn(),
|
|
44
|
+
offDelivery: vi.fn(),
|
|
45
|
+
checkInbox: vi.fn().mockResolvedValue([]),
|
|
46
|
+
readThread: vi.fn().mockResolvedValue([]),
|
|
47
|
+
setSignalFilter: vi.fn(),
|
|
48
|
+
setEmissionValidator: vi.fn(),
|
|
49
|
+
socketPath: "/tmp/test-inbox.sock",
|
|
50
|
+
stop: vi.fn().mockResolvedValue(undefined),
|
|
51
|
+
} as unknown as InboxAdapter;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function mockTasks(): TasksAdapter {
|
|
55
|
+
return {
|
|
56
|
+
createTask: vi.fn().mockResolvedValue("ot-task-1"),
|
|
57
|
+
assignTask: vi.fn().mockResolvedValue(undefined),
|
|
58
|
+
transitionTask: vi.fn().mockResolvedValue(undefined),
|
|
59
|
+
getTask: vi.fn().mockResolvedValue({ id: "t-1", title: "x", status: "open" }),
|
|
60
|
+
queryReady: vi.fn().mockResolvedValue([]),
|
|
61
|
+
listTasks: vi.fn().mockResolvedValue([]),
|
|
62
|
+
addBlocker: vi.fn().mockResolvedValue(undefined),
|
|
63
|
+
removeBlocker: vi.fn().mockResolvedValue(undefined),
|
|
64
|
+
claimTask: vi.fn().mockResolvedValue(null),
|
|
65
|
+
unclaimTask: vi.fn().mockResolvedValue(undefined),
|
|
66
|
+
listClaimable: vi.fn().mockResolvedValue([]),
|
|
67
|
+
connect: vi.fn().mockResolvedValue(undefined),
|
|
68
|
+
disconnect: vi.fn(),
|
|
69
|
+
connected: true,
|
|
70
|
+
} as unknown as TasksAdapter;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
describe("AgentManagerV2 taskRef resolution", () => {
|
|
74
|
+
let agentStore: AgentStore;
|
|
75
|
+
let inbox: InboxAdapter;
|
|
76
|
+
let tasks: TasksAdapter;
|
|
77
|
+
let manager: AgentManager;
|
|
78
|
+
|
|
79
|
+
afterEach(async () => {
|
|
80
|
+
await manager?.close();
|
|
81
|
+
agentStore?.close();
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
beforeEach(() => {
|
|
85
|
+
agentStore = new AgentStore(":memory:");
|
|
86
|
+
inbox = mockInbox();
|
|
87
|
+
tasks = mockTasks();
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
function getStoredTaskRef(agentId: string): TaskRef | undefined {
|
|
91
|
+
const record = agentStore.getAgent(agentId);
|
|
92
|
+
const meta = record?.metadata as Record<string, unknown> | undefined;
|
|
93
|
+
return meta?.task_ref as TaskRef | undefined;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
it("uses taskResourceId + task_id when no other source resolves a ref", async () => {
|
|
97
|
+
manager = createAgentManagerV2(agentStore, inbox, tasks, {
|
|
98
|
+
defaultCwd: "/tmp/t",
|
|
99
|
+
taskResourceId: "resource-default",
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
const result = await manager.spawn({
|
|
103
|
+
task: "work",
|
|
104
|
+
task_id: "node-42" as unknown as SpawnAgentOptions["task_id"],
|
|
105
|
+
role: "worker",
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
expect(getStoredTaskRef(result.id)).toEqual({
|
|
109
|
+
resource_id: "resource-default",
|
|
110
|
+
node_id: "node-42",
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
it("falls through to no taskRef when neither resolver nor taskResourceId apply", async () => {
|
|
115
|
+
manager = createAgentManagerV2(agentStore, inbox, tasks, {
|
|
116
|
+
defaultCwd: "/tmp/t",
|
|
117
|
+
// No taskResourceId, no resolveTaskRef.
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
const result = await manager.spawn({ task: "work", role: "worker" });
|
|
121
|
+
|
|
122
|
+
expect(getStoredTaskRef(result.id)).toBeUndefined();
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
it("resolveTaskRef wins over the taskResourceId fallback", async () => {
|
|
126
|
+
const resolveTaskRef = vi
|
|
127
|
+
.fn()
|
|
128
|
+
.mockReturnValue({ resource_id: "resource-from-resolver", node_id: "n1" });
|
|
129
|
+
|
|
130
|
+
manager = createAgentManagerV2(agentStore, inbox, tasks, {
|
|
131
|
+
defaultCwd: "/tmp/t",
|
|
132
|
+
taskResourceId: "resource-default",
|
|
133
|
+
resolveTaskRef,
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
const result = await manager.spawn({ task: "work", role: "worker" });
|
|
137
|
+
|
|
138
|
+
expect(resolveTaskRef).toHaveBeenCalledOnce();
|
|
139
|
+
expect(getStoredTaskRef(result.id)).toEqual({
|
|
140
|
+
resource_id: "resource-from-resolver",
|
|
141
|
+
node_id: "n1",
|
|
142
|
+
});
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
it("resolveTaskRef returning undefined falls through to taskResourceId", async () => {
|
|
146
|
+
const resolveTaskRef = vi.fn().mockReturnValue(undefined);
|
|
147
|
+
|
|
148
|
+
manager = createAgentManagerV2(agentStore, inbox, tasks, {
|
|
149
|
+
defaultCwd: "/tmp/t",
|
|
150
|
+
taskResourceId: "resource-default",
|
|
151
|
+
resolveTaskRef,
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
const result = await manager.spawn({
|
|
155
|
+
task: "work",
|
|
156
|
+
task_id: "node-9" as unknown as SpawnAgentOptions["task_id"],
|
|
157
|
+
role: "worker",
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
expect(resolveTaskRef).toHaveBeenCalledOnce();
|
|
161
|
+
expect(getStoredTaskRef(result.id)).toEqual({
|
|
162
|
+
resource_id: "resource-default",
|
|
163
|
+
node_id: "node-9",
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
it("explicit SpawnAgentOptions.taskRef wins over resolver AND taskResourceId", async () => {
|
|
168
|
+
const resolveTaskRef = vi
|
|
169
|
+
.fn()
|
|
170
|
+
.mockReturnValue({ resource_id: "resource-from-resolver", node_id: "r1" });
|
|
171
|
+
|
|
172
|
+
manager = createAgentManagerV2(agentStore, inbox, tasks, {
|
|
173
|
+
defaultCwd: "/tmp/t",
|
|
174
|
+
taskResourceId: "resource-default",
|
|
175
|
+
resolveTaskRef,
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
const explicit: TaskRef = { resource_id: "resource-explicit", node_id: "e1" };
|
|
179
|
+
const result = await manager.spawn({
|
|
180
|
+
task: "work",
|
|
181
|
+
role: "worker",
|
|
182
|
+
taskRef: explicit,
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
// Resolver should NOT be called when caller already supplied taskRef.
|
|
186
|
+
expect(resolveTaskRef).not.toHaveBeenCalled();
|
|
187
|
+
expect(getStoredTaskRef(result.id)).toEqual(explicit);
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
it("resolver receives the intercepted SpawnAgentOptions (post-interceptor)", async () => {
|
|
191
|
+
const resolveTaskRef = vi.fn().mockReturnValue(undefined);
|
|
192
|
+
|
|
193
|
+
manager = createAgentManagerV2(agentStore, inbox, tasks, {
|
|
194
|
+
defaultCwd: "/tmp/t",
|
|
195
|
+
resolveTaskRef,
|
|
196
|
+
});
|
|
197
|
+
manager.setSpawnInterceptor((opts) => ({ ...opts, cwd: "/overridden/cwd" }));
|
|
198
|
+
|
|
199
|
+
await manager.spawn({ task: "x", role: "worker" });
|
|
200
|
+
|
|
201
|
+
expect(resolveTaskRef).toHaveBeenCalledOnce();
|
|
202
|
+
const passed = resolveTaskRef.mock.calls[0][0];
|
|
203
|
+
expect(passed.cwd).toBe("/overridden/cwd");
|
|
204
|
+
});
|
|
205
|
+
|
|
206
|
+
it("resolver throwing does not block spawn; falls through to taskResourceId", async () => {
|
|
207
|
+
const resolveTaskRef = vi.fn().mockImplementation(() => {
|
|
208
|
+
throw new Error("resolver exploded");
|
|
209
|
+
});
|
|
210
|
+
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
|
|
211
|
+
|
|
212
|
+
manager = createAgentManagerV2(agentStore, inbox, tasks, {
|
|
213
|
+
defaultCwd: "/tmp/t",
|
|
214
|
+
taskResourceId: "resource-safe",
|
|
215
|
+
resolveTaskRef,
|
|
216
|
+
});
|
|
217
|
+
|
|
218
|
+
const result = await manager.spawn({
|
|
219
|
+
task: "x",
|
|
220
|
+
task_id: "safe-node" as unknown as SpawnAgentOptions["task_id"],
|
|
221
|
+
role: "worker",
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
expect(warnSpy).toHaveBeenCalled();
|
|
225
|
+
expect(getStoredTaskRef(result.id)).toEqual({
|
|
226
|
+
resource_id: "resource-safe",
|
|
227
|
+
node_id: "safe-node",
|
|
228
|
+
});
|
|
229
|
+
warnSpy.mockRestore();
|
|
230
|
+
});
|
|
231
|
+
});
|