macro-agent 0.2.1 → 0.2.2

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/cli/acp.js CHANGED
File without changes
package/dist/cli/index.js CHANGED
File without changes
package/dist/cli/mcp.js CHANGED
File without changes
@@ -1 +1 @@
1
- {"version":3,"file":"mail-bridge.d.ts","sourceRoot":"","sources":["../../src/map/mail-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACjD,IAAI,CAAC;IACR,eAAe,CACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACjD,IAAI,CAAC;CACT;AAuDD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,oBAAoB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;IAC3B;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,IAAI,CAAC,CAqFrB"}
1
+ {"version":3,"file":"mail-bridge.d.ts","sourceRoot":"","sources":["../../src/map/mail-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACjD,IAAI,CAAC;IACR,eAAe,CACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACjD,IAAI,CAAC;CACT;AA0DD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,oBAAoB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;IAC3B;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,IAAI,CAAC,CA8FrB"}
@@ -89,10 +89,17 @@ export async function setupMailBridge(opts) {
89
89
  ...content,
90
90
  ...(turn.conversation_id ? { _conversationId: turn.conversation_id } : {}),
91
91
  };
92
+ // Derive importance from the hub's wire params. Default to "normal"
93
+ // when the hub doesn't tag the turn (backward compat).
94
+ const VALID_IMPORTANCE = ["low", "normal", "high", "urgent"];
95
+ const wireImportance = typeof turn.importance === "string" &&
96
+ VALID_IMPORTANCE.includes(turn.importance)
97
+ ? turn.importance
98
+ : "normal";
92
99
  try {
93
100
  await inboxAdapter.send(turn.participant_id ?? "openhive-hub", recipientId, contentWithConvId, {
94
101
  threadTag: turn.thread_id,
95
- importance: "normal",
102
+ importance: wireImportance,
96
103
  });
97
104
  log(`[mail-bridge] Forwarded turn ${turn.turn_id ?? "?"} into local inbox ` +
98
105
  `(schema=${content.schema ?? "n/a"})`);
@@ -1 +1 @@
1
- {"version":3,"file":"mail-bridge.js","sourceRoot":"","sources":["../../src/map/mail-bridge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mail-bridge.js","sourceRoot":"","sources":["../../src/map/mail-bridge.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "macro-agent",
3
- "version": "0.2.1",
3
+ "version": "0.2.2",
4
4
  "description": "Interact with multiple agents as if they were a single agent.",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -52,7 +52,7 @@
52
52
  "@modelcontextprotocol/sdk": "^1.25.1",
53
53
  "@multi-agent-protocol/sdk": "^0.1.12",
54
54
  "acp-factory": "^0.1.14",
55
- "agent-inbox": "^0.2.2",
55
+ "agent-inbox": "^0.2.3",
56
56
  "agent-workspace": "^0.1.5",
57
57
  "better-sqlite3": "^12.5.0",
58
58
  "chalk": "^5.6.2",
@@ -173,6 +173,94 @@ describe("setupMailBridge", () => {
173
173
  });
174
174
  });
175
175
 
176
+ describe("importance derivation", () => {
177
+ const DISPATCHER_ID = "dispatcher:host:1234:abc";
178
+
179
+ it("passes through importance from hub notification params", async () => {
180
+ await setupMailBridge({
181
+ connection: conn,
182
+ inboxAdapter: inbox as any,
183
+ dispatcherAgentId: DISPATCHER_ID,
184
+ });
185
+
186
+ await conn._fire({
187
+ conversation_id: "conv-imp-1",
188
+ turn_id: "turn-imp-1",
189
+ participant_id: "user:admin",
190
+ content_type: "application/json",
191
+ content: JSON.stringify({ schema: "x-dispatch/work", data: { taskId: "t-1" } }),
192
+ importance: "high",
193
+ });
194
+
195
+ expect(inbox.send).toHaveBeenCalledOnce();
196
+ const [, , , opts] = inbox.send.mock.calls[0];
197
+ expect(opts?.importance).toBe("high");
198
+ });
199
+
200
+ it("passes through 'urgent' importance for orchestrator recall", async () => {
201
+ await setupMailBridge({
202
+ connection: conn,
203
+ inboxAdapter: inbox as any,
204
+ dispatcherAgentId: DISPATCHER_ID,
205
+ });
206
+
207
+ await conn._fire({
208
+ conversation_id: "conv-imp-2",
209
+ turn_id: "turn-imp-2",
210
+ participant_id: "system:dispatch-orchestrator",
211
+ content_type: "application/json",
212
+ content: JSON.stringify({ schema: "x-dispatch/work", data: { taskId: "t-2" } }),
213
+ importance: "urgent",
214
+ });
215
+
216
+ expect(inbox.send).toHaveBeenCalledOnce();
217
+ const [, , , opts] = inbox.send.mock.calls[0];
218
+ expect(opts?.importance).toBe("urgent");
219
+ });
220
+
221
+ it("defaults to 'normal' when importance is missing", async () => {
222
+ await setupMailBridge({
223
+ connection: conn,
224
+ inboxAdapter: inbox as any,
225
+ dispatcherAgentId: DISPATCHER_ID,
226
+ });
227
+
228
+ await conn._fire({
229
+ conversation_id: "conv-imp-3",
230
+ turn_id: "turn-imp-3",
231
+ participant_id: "user:admin",
232
+ content_type: "application/json",
233
+ content: JSON.stringify({ schema: "x-dispatch/work", data: { taskId: "t-3" } }),
234
+ // no importance field
235
+ });
236
+
237
+ expect(inbox.send).toHaveBeenCalledOnce();
238
+ const [, , , opts] = inbox.send.mock.calls[0];
239
+ expect(opts?.importance).toBe("normal");
240
+ });
241
+
242
+ it("ignores invalid importance values and falls back to 'normal'", async () => {
243
+ await setupMailBridge({
244
+ connection: conn,
245
+ inboxAdapter: inbox as any,
246
+ dispatcherAgentId: DISPATCHER_ID,
247
+ });
248
+
249
+ await conn._fire({
250
+ conversation_id: "conv-imp-4",
251
+ turn_id: "turn-imp-4",
252
+ participant_id: "user:admin",
253
+ content_type: "application/json",
254
+ content: JSON.stringify({ schema: "x-dispatch/work", data: { taskId: "t-4" } }),
255
+ importance: "critical", // invalid value
256
+ });
257
+
258
+ expect(inbox.send).toHaveBeenCalledOnce();
259
+ const [, , , opts] = inbox.send.mock.calls[0];
260
+ expect(opts?.importance).toBe("normal");
261
+ });
262
+ });
263
+
176
264
  describe("without dispatcherAgentId (fallback mode)", () => {
177
265
  it("delivers to BRIDGE_RECIPIENT_ID", async () => {
178
266
  await setupMailBridge({
@@ -52,6 +52,9 @@ interface MailTurnReceivedParams {
52
52
  content?: unknown;
53
53
  thread_id?: string;
54
54
  created_at?: string;
55
+ /** Importance hint from the hub. When present, drives wake/interrupt
56
+ * decisions via TriggerSystemV2's mapImportanceToWakeAction. */
57
+ importance?: string;
55
58
  }
56
59
 
57
60
  /**
@@ -169,6 +172,15 @@ export async function setupMailBridge(
169
172
  ...(turn.conversation_id ? { _conversationId: turn.conversation_id } : {}),
170
173
  };
171
174
 
175
+ // Derive importance from the hub's wire params. Default to "normal"
176
+ // when the hub doesn't tag the turn (backward compat).
177
+ const VALID_IMPORTANCE = ["low", "normal", "high", "urgent"];
178
+ const wireImportance =
179
+ typeof turn.importance === "string" &&
180
+ VALID_IMPORTANCE.includes(turn.importance)
181
+ ? (turn.importance as "low" | "normal" | "high" | "urgent")
182
+ : "normal";
183
+
172
184
  try {
173
185
  await inboxAdapter.send(
174
186
  turn.participant_id ?? "openhive-hub",
@@ -176,7 +188,7 @@ export async function setupMailBridge(
176
188
  contentWithConvId as never,
177
189
  {
178
190
  threadTag: turn.thread_id,
179
- importance: "normal",
191
+ importance: wireImportance,
180
192
  },
181
193
  );
182
194
  log(
@@ -1,260 +0,0 @@
1
- /**
2
- * Dataplane Adapter
3
- *
4
- * Wraps MultiAgentRepoTracker to integrate with macro-agent's event system
5
- * and provide a simplified interface for workspace management.
6
- *
7
- * @module workspace/dataplane-adapter
8
- * @implements [[s-7ktd]] Dataplane Integration section
9
- */
10
- import Database from 'better-sqlite3';
11
- import { MultiAgentRepoTracker, type Stream, type StreamStatus, type CreateStreamOptions, type AgentWorktree, type CreateWorktreeOptions, type WorkerTask, type CreateTaskOptions, type StartTaskOptions, type CompleteTaskOptions, type StartTaskResult, type CompleteTaskResult, type ListTasksOptions, type CleanupWorkerBranchesOptions, type CleanupResult, type Checkpoint } from 'git-cascade';
12
- import type { DataplaneConfig } from './config.js';
13
- /**
14
- * Event types emitted by DataplaneAdapter
15
- */
16
- export type DataplaneEventType = 'stream:created' | 'stream:updated' | 'stream:abandoned' | 'worktree:created' | 'worktree:deallocated' | 'task:created' | 'task:started' | 'task:completed' | 'task:abandoned';
17
- /**
18
- * Event payload for dataplane events
19
- */
20
- export interface DataplaneEvent {
21
- type: DataplaneEventType;
22
- timestamp: number;
23
- data: Record<string, unknown>;
24
- }
25
- /**
26
- * Callback for dataplane events
27
- */
28
- export type DataplaneEventCallback = (event: DataplaneEvent) => void;
29
- /**
30
- * DataplaneAdapter wraps MultiAgentRepoTracker for macro-agent integration.
31
- *
32
- * Key responsibilities:
33
- * - Initialize dataplane with shared or dedicated database
34
- * - Emit events on dataplane operations
35
- * - Provide simplified API for workspace management
36
- */
37
- export declare class DataplaneAdapter {
38
- private readonly tracker;
39
- private readonly config;
40
- private readonly eventListeners;
41
- private readonly ownsDb;
42
- /**
43
- * Create a new DataplaneAdapter.
44
- *
45
- * @param config - Dataplane configuration
46
- */
47
- constructor(config: DataplaneConfig);
48
- /**
49
- * Get whether dataplane is enabled.
50
- */
51
- get enabled(): boolean;
52
- /**
53
- * Get the repository path.
54
- */
55
- get repoPath(): string;
56
- /**
57
- * Get the underlying database connection.
58
- * Use with caution - prefer adapter methods for operations.
59
- */
60
- get db(): Database.Database;
61
- /**
62
- * Get the underlying tracker.
63
- * Use with caution - prefer adapter methods for operations.
64
- */
65
- get rawTracker(): MultiAgentRepoTracker;
66
- /**
67
- * Subscribe to dataplane events.
68
- *
69
- * @param callback - Function called when events occur
70
- * @returns Unsubscribe function
71
- */
72
- onEvent(callback: DataplaneEventCallback): () => void;
73
- /**
74
- * Emit an event to all listeners.
75
- */
76
- private emit;
77
- /**
78
- * Create a new stream (integration branch).
79
- *
80
- * @param options - Stream creation options
81
- * @returns Stream ID
82
- */
83
- createStream(options: CreateStreamOptions): string;
84
- /**
85
- * Get a stream by ID.
86
- */
87
- getStream(streamId: string): Stream | null;
88
- /**
89
- * List streams with optional filters.
90
- */
91
- listStreams(options?: {
92
- agentId?: string;
93
- status?: StreamStatus;
94
- }): Stream[];
95
- /**
96
- * Update a stream.
97
- */
98
- updateStream(streamId: string, updates: Partial<Pick<Stream, 'name' | 'status' | 'metadata'>>): void;
99
- /**
100
- * Abandon a stream.
101
- */
102
- abandonStream(streamId: string, options?: {
103
- reason?: string;
104
- cascade?: boolean;
105
- }): void;
106
- /**
107
- * Get the git branch name for a stream.
108
- */
109
- getStreamBranchName(streamId: string): string;
110
- /**
111
- * Get the HEAD commit of a stream.
112
- */
113
- getStreamHead(streamId: string): string;
114
- /**
115
- * Create a worktree for an agent.
116
- *
117
- * @param options - Worktree creation options
118
- * @returns Created worktree info
119
- */
120
- createWorktree(options: CreateWorktreeOptions): AgentWorktree;
121
- /**
122
- * Get a worktree by agent ID.
123
- */
124
- getWorktree(agentId: string): AgentWorktree | null;
125
- /**
126
- * List all worktrees.
127
- */
128
- listWorktrees(): AgentWorktree[];
129
- /**
130
- * Update the stream associated with a worktree.
131
- */
132
- updateWorktreeStream(agentId: string, streamId: string | null): void;
133
- /**
134
- * Deallocate a worktree.
135
- */
136
- deallocateWorktree(agentId: string): void;
137
- /**
138
- * Create a worker task under a stream.
139
- *
140
- * @param options - Task creation options
141
- * @returns Task ID
142
- */
143
- createTask(options: CreateTaskOptions): string;
144
- /**
145
- * Get a task by ID.
146
- */
147
- getTask(taskId: string): WorkerTask | null;
148
- /**
149
- * List tasks for a stream.
150
- */
151
- listTasks(streamId: string, options?: ListTasksOptions): WorkerTask[];
152
- /**
153
- * Start a task - assigns agent and creates worker branch.
154
- *
155
- * @param options - Start task options
156
- * @returns Branch name and start commit
157
- */
158
- startTask(options: StartTaskOptions): StartTaskResult;
159
- /**
160
- * Complete a task - merges worker branch to stream.
161
- *
162
- * @param options - Complete task options
163
- * @returns Merge result
164
- */
165
- completeTask(options: CompleteTaskOptions): CompleteTaskResult;
166
- /**
167
- * Abandon a task.
168
- *
169
- * @param taskId - Task ID
170
- * @param options - Options
171
- */
172
- abandonTask(taskId: string, options?: {
173
- deleteBranch?: boolean;
174
- }): void;
175
- /**
176
- * Release a task back to 'open' status.
177
- */
178
- releaseTask(taskId: string): void;
179
- /**
180
- * Detect conflicts for a task before completing.
181
- *
182
- * @param taskId - Task ID
183
- * @param worktree - Worktree path
184
- * @returns Array of conflicting file paths, empty if no conflicts
185
- */
186
- detectTaskConflicts(taskId: string, worktree: string): string[];
187
- /**
188
- * Recover stale tasks that have been in_progress too long.
189
- *
190
- * @param thresholdMs - Tasks older than this are considered stale
191
- * @returns Result with released task IDs
192
- */
193
- recoverStaleTasks(thresholdMs?: number): {
194
- released: string[];
195
- };
196
- /**
197
- * Create checkpoints for commits made during a task.
198
- *
199
- * Creates a checkpoint for each commit between the task's startCommit and
200
- * the current HEAD of the task's stream. This captures the work done during
201
- * the task for future review and merge workflows.
202
- *
203
- * @param taskId - Task ID to create checkpoints for
204
- * @param agentId - Agent ID (used as createdBy)
205
- * @returns Array of created checkpoints
206
- */
207
- createCheckpointsForTask(taskId: string, agentId: string): Checkpoint[];
208
- /**
209
- * Commit changes in a worktree with Change tracking.
210
- *
211
- * @param options - Commit options
212
- * @returns Commit hash and change ID
213
- */
214
- commitChanges(options: {
215
- streamId: string;
216
- agentId: string;
217
- worktree: string;
218
- message: string;
219
- }): {
220
- commit: string;
221
- changeId: string;
222
- };
223
- /**
224
- * Clean up old worker branches.
225
- *
226
- * Deletes branches for:
227
- * - Completed tasks older than threshold (default 24h)
228
- * - Abandoned tasks
229
- * - Orphaned branches (no task record)
230
- *
231
- * @param options - Cleanup options
232
- * @returns Deleted branches and any errors
233
- */
234
- cleanupWorkerBranches(options?: CleanupWorkerBranchesOptions): CleanupResult;
235
- /**
236
- * Delete a specific worker branch.
237
- *
238
- * @param branchName - Branch name to delete
239
- * @returns true if deleted, false if branch didn't exist
240
- */
241
- deleteWorkerBranch(branchName: string): boolean;
242
- /**
243
- * Check system health.
244
- */
245
- healthCheck(): ReturnType<MultiAgentRepoTracker['healthCheck']>;
246
- /**
247
- * Close the adapter and release resources.
248
- *
249
- * Only closes the database if we created it (not if using shared DB).
250
- */
251
- close(): void;
252
- }
253
- /**
254
- * Create a DataplaneAdapter instance.
255
- *
256
- * @param config - Configuration options
257
- * @returns DataplaneAdapter instance
258
- */
259
- export declare function createDataplaneAdapter(config: DataplaneConfig): DataplaneAdapter;
260
- //# sourceMappingURL=dataplane-adapter.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"dataplane-adapter.d.ts","sourceRoot":"","sources":["../../src/workspace/dataplane-adapter.ts"],"names":[],"mappings":"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"}
@@ -1,416 +0,0 @@
1
- /**
2
- * Dataplane Adapter
3
- *
4
- * Wraps MultiAgentRepoTracker to integrate with macro-agent's event system
5
- * and provide a simplified interface for workspace management.
6
- *
7
- * @module workspace/dataplane-adapter
8
- * @implements [[s-7ktd]] Dataplane Integration section
9
- */
10
- import { MultiAgentRepoTracker, workerTasks, diffStacks, } from 'git-cascade';
11
- import { DEFAULT_DATAPLANE_CONFIG } from './config.js';
12
- /**
13
- * DataplaneAdapter wraps MultiAgentRepoTracker for macro-agent integration.
14
- *
15
- * Key responsibilities:
16
- * - Initialize dataplane with shared or dedicated database
17
- * - Emit events on dataplane operations
18
- * - Provide simplified API for workspace management
19
- */
20
- export class DataplaneAdapter {
21
- tracker;
22
- config;
23
- eventListeners = new Set();
24
- ownsDb;
25
- /**
26
- * Create a new DataplaneAdapter.
27
- *
28
- * @param config - Dataplane configuration
29
- */
30
- constructor(config) {
31
- const mergedConfig = {
32
- ...DEFAULT_DATAPLANE_CONFIG,
33
- ...config,
34
- repoPath: config.repoPath ?? process.cwd(),
35
- };
36
- this.config = {
37
- enabled: mergedConfig.enabled ?? true,
38
- repoPath: mergedConfig.repoPath,
39
- tablePrefix: mergedConfig.tablePrefix ?? 'dataplane_',
40
- verbose: mergedConfig.verbose ?? false,
41
- skipRecovery: mergedConfig.skipRecovery ?? false,
42
- };
43
- // Determine if we own the database connection
44
- this.ownsDb = !config.db;
45
- const trackerOptions = {
46
- repoPath: this.config.repoPath,
47
- tablePrefix: this.config.tablePrefix,
48
- verbose: this.config.verbose,
49
- skipRecovery: this.config.skipRecovery,
50
- };
51
- if (config.db) {
52
- trackerOptions.db = config.db;
53
- }
54
- else if (config.dbPath) {
55
- trackerOptions.dbPath = config.dbPath;
56
- }
57
- // If neither db nor dbPath provided, tracker uses default path
58
- this.tracker = new MultiAgentRepoTracker(trackerOptions);
59
- }
60
- /**
61
- * Get whether dataplane is enabled.
62
- */
63
- get enabled() {
64
- return this.config.enabled;
65
- }
66
- /**
67
- * Get the repository path.
68
- */
69
- get repoPath() {
70
- return this.config.repoPath;
71
- }
72
- /**
73
- * Get the underlying database connection.
74
- * Use with caution - prefer adapter methods for operations.
75
- */
76
- get db() {
77
- return this.tracker.db;
78
- }
79
- /**
80
- * Get the underlying tracker.
81
- * Use with caution - prefer adapter methods for operations.
82
- */
83
- get rawTracker() {
84
- return this.tracker;
85
- }
86
- // ─────────────────────────────────────────────────────────────────────────────
87
- // Event System
88
- // ─────────────────────────────────────────────────────────────────────────────
89
- /**
90
- * Subscribe to dataplane events.
91
- *
92
- * @param callback - Function called when events occur
93
- * @returns Unsubscribe function
94
- */
95
- onEvent(callback) {
96
- this.eventListeners.add(callback);
97
- return () => this.eventListeners.delete(callback);
98
- }
99
- /**
100
- * Emit an event to all listeners.
101
- */
102
- emit(type, data) {
103
- const event = {
104
- type,
105
- timestamp: Date.now(),
106
- data,
107
- };
108
- for (const listener of this.eventListeners) {
109
- try {
110
- listener(event);
111
- }
112
- catch (error) {
113
- console.error('[DataplaneAdapter] Event listener error:', error);
114
- }
115
- }
116
- }
117
- // ─────────────────────────────────────────────────────────────────────────────
118
- // Stream Operations
119
- // ─────────────────────────────────────────────────────────────────────────────
120
- /**
121
- * Create a new stream (integration branch).
122
- *
123
- * @param options - Stream creation options
124
- * @returns Stream ID
125
- */
126
- createStream(options) {
127
- const streamId = this.tracker.createStream(options);
128
- this.emit('stream:created', { streamId, ...options });
129
- return streamId;
130
- }
131
- /**
132
- * Get a stream by ID.
133
- */
134
- getStream(streamId) {
135
- return this.tracker.getStream(streamId);
136
- }
137
- /**
138
- * List streams with optional filters.
139
- */
140
- listStreams(options) {
141
- return this.tracker.listStreams(options);
142
- }
143
- /**
144
- * Update a stream.
145
- */
146
- updateStream(streamId, updates) {
147
- this.tracker.updateStream(streamId, updates);
148
- this.emit('stream:updated', { streamId, updates });
149
- }
150
- /**
151
- * Abandon a stream.
152
- */
153
- abandonStream(streamId, options) {
154
- this.tracker.abandonStream(streamId, options);
155
- this.emit('stream:abandoned', { streamId, ...options });
156
- }
157
- /**
158
- * Get the git branch name for a stream.
159
- */
160
- getStreamBranchName(streamId) {
161
- return this.tracker.getStreamBranchName(streamId);
162
- }
163
- /**
164
- * Get the HEAD commit of a stream.
165
- */
166
- getStreamHead(streamId) {
167
- return this.tracker.getStreamHead(streamId);
168
- }
169
- // ─────────────────────────────────────────────────────────────────────────────
170
- // Worktree Operations
171
- // ─────────────────────────────────────────────────────────────────────────────
172
- /**
173
- * Create a worktree for an agent.
174
- *
175
- * @param options - Worktree creation options
176
- * @returns Created worktree info
177
- */
178
- createWorktree(options) {
179
- const worktree = this.tracker.createWorktree(options);
180
- this.emit('worktree:created', { ...worktree });
181
- return worktree;
182
- }
183
- /**
184
- * Get a worktree by agent ID.
185
- */
186
- getWorktree(agentId) {
187
- return this.tracker.getWorktree(agentId);
188
- }
189
- /**
190
- * List all worktrees.
191
- */
192
- listWorktrees() {
193
- return this.tracker.listWorktrees();
194
- }
195
- /**
196
- * Update the stream associated with a worktree.
197
- */
198
- updateWorktreeStream(agentId, streamId) {
199
- this.tracker.updateWorktreeStream(agentId, streamId);
200
- }
201
- /**
202
- * Deallocate a worktree.
203
- */
204
- deallocateWorktree(agentId) {
205
- this.tracker.deallocateWorktree(agentId);
206
- this.emit('worktree:deallocated', { agentId });
207
- }
208
- // ─────────────────────────────────────────────────────────────────────────────
209
- // Worker Task Operations
210
- // ─────────────────────────────────────────────────────────────────────────────
211
- /**
212
- * Create a worker task under a stream.
213
- *
214
- * @param options - Task creation options
215
- * @returns Task ID
216
- */
217
- createTask(options) {
218
- const taskId = this.tracker.createTask(options);
219
- this.emit('task:created', { taskId, ...options });
220
- return taskId;
221
- }
222
- /**
223
- * Get a task by ID.
224
- */
225
- getTask(taskId) {
226
- return this.tracker.getTask(taskId);
227
- }
228
- /**
229
- * List tasks for a stream.
230
- */
231
- listTasks(streamId, options) {
232
- return this.tracker.listTasks(streamId, options);
233
- }
234
- /**
235
- * Start a task - assigns agent and creates worker branch.
236
- *
237
- * @param options - Start task options
238
- * @returns Branch name and start commit
239
- */
240
- startTask(options) {
241
- const result = this.tracker.startTask(options);
242
- this.emit('task:started', {
243
- taskId: options.taskId,
244
- agentId: options.agentId,
245
- branchName: result.branchName,
246
- startCommit: result.startCommit,
247
- });
248
- return result;
249
- }
250
- /**
251
- * Complete a task - merges worker branch to stream.
252
- *
253
- * @param options - Complete task options
254
- * @returns Merge result
255
- */
256
- completeTask(options) {
257
- const result = this.tracker.completeTask(options);
258
- this.emit('task:completed', { taskId: options.taskId, ...result });
259
- return result;
260
- }
261
- /**
262
- * Abandon a task.
263
- *
264
- * @param taskId - Task ID
265
- * @param options - Options
266
- */
267
- abandonTask(taskId, options) {
268
- this.tracker.abandonTask(taskId, options);
269
- this.emit('task:abandoned', { taskId, ...options });
270
- }
271
- /**
272
- * Release a task back to 'open' status.
273
- */
274
- releaseTask(taskId) {
275
- this.tracker.releaseTask(taskId);
276
- }
277
- /**
278
- * Detect conflicts for a task before completing.
279
- *
280
- * @param taskId - Task ID
281
- * @param worktree - Worktree path
282
- * @returns Array of conflicting file paths, empty if no conflicts
283
- */
284
- detectTaskConflicts(taskId, worktree) {
285
- return workerTasks.detectTaskConflicts(this.tracker.db, this.config.repoPath, taskId, worktree);
286
- }
287
- /**
288
- * Recover stale tasks that have been in_progress too long.
289
- *
290
- * @param thresholdMs - Tasks older than this are considered stale
291
- * @returns Result with released task IDs
292
- */
293
- recoverStaleTasks(thresholdMs = 60 * 60 * 1000) {
294
- return workerTasks.recoverStaleTasks(this.tracker.db, thresholdMs);
295
- }
296
- // ─────────────────────────────────────────────────────────────────────────────
297
- // Checkpoint Operations
298
- // ─────────────────────────────────────────────────────────────────────────────
299
- /**
300
- * Create checkpoints for commits made during a task.
301
- *
302
- * Creates a checkpoint for each commit between the task's startCommit and
303
- * the current HEAD of the task's stream. This captures the work done during
304
- * the task for future review and merge workflows.
305
- *
306
- * @param taskId - Task ID to create checkpoints for
307
- * @param agentId - Agent ID (used as createdBy)
308
- * @returns Array of created checkpoints
309
- */
310
- createCheckpointsForTask(taskId, agentId) {
311
- const task = this.getTask(taskId);
312
- if (!task) {
313
- console.warn(`[DataplaneAdapter] Task not found: ${taskId}`);
314
- return [];
315
- }
316
- if (!task.streamId) {
317
- console.warn(`[DataplaneAdapter] Task ${taskId} has no streamId`);
318
- return [];
319
- }
320
- if (!task.startCommit) {
321
- console.warn(`[DataplaneAdapter] Task ${taskId} has no startCommit`);
322
- return [];
323
- }
324
- try {
325
- // Create checkpoints from task's startCommit to stream's current HEAD
326
- const checkpoints = diffStacks.createCheckpointsFromStream(this.tracker.db, this.config.repoPath, task.streamId, {
327
- from: task.startCommit,
328
- createdBy: agentId,
329
- });
330
- return checkpoints;
331
- }
332
- catch (error) {
333
- console.error(`[DataplaneAdapter] Failed to create checkpoints for task ${taskId}:`, error);
334
- return [];
335
- }
336
- }
337
- // ─────────────────────────────────────────────────────────────────────────────
338
- // Commit Operations
339
- // ─────────────────────────────────────────────────────────────────────────────
340
- /**
341
- * Commit changes in a worktree with Change tracking.
342
- *
343
- * @param options - Commit options
344
- * @returns Commit hash and change ID
345
- */
346
- commitChanges(options) {
347
- return this.tracker.commitChanges(options);
348
- }
349
- // ─────────────────────────────────────────────────────────────────────────────
350
- // Maintenance Operations
351
- // ─────────────────────────────────────────────────────────────────────────────
352
- /**
353
- * Clean up old worker branches.
354
- *
355
- * Deletes branches for:
356
- * - Completed tasks older than threshold (default 24h)
357
- * - Abandoned tasks
358
- * - Orphaned branches (no task record)
359
- *
360
- * @param options - Cleanup options
361
- * @returns Deleted branches and any errors
362
- */
363
- cleanupWorkerBranches(options) {
364
- return workerTasks.cleanupWorkerBranches(this.tracker.db, this.config.repoPath, options);
365
- }
366
- /**
367
- * Delete a specific worker branch.
368
- *
369
- * @param branchName - Branch name to delete
370
- * @returns true if deleted, false if branch didn't exist
371
- */
372
- deleteWorkerBranch(branchName) {
373
- try {
374
- const { execSync } = require('child_process');
375
- execSync(`git branch -D "${branchName}"`, {
376
- cwd: this.config.repoPath,
377
- stdio: 'pipe',
378
- });
379
- return true;
380
- }
381
- catch {
382
- return false;
383
- }
384
- }
385
- // ─────────────────────────────────────────────────────────────────────────────
386
- // Health & Recovery
387
- // ─────────────────────────────────────────────────────────────────────────────
388
- /**
389
- * Check system health.
390
- */
391
- healthCheck() {
392
- return this.tracker.healthCheck();
393
- }
394
- // ─────────────────────────────────────────────────────────────────────────────
395
- // Lifecycle
396
- // ─────────────────────────────────────────────────────────────────────────────
397
- /**
398
- * Close the adapter and release resources.
399
- *
400
- * Only closes the database if we created it (not if using shared DB).
401
- */
402
- close() {
403
- this.eventListeners.clear();
404
- this.tracker.close();
405
- }
406
- }
407
- /**
408
- * Create a DataplaneAdapter instance.
409
- *
410
- * @param config - Configuration options
411
- * @returns DataplaneAdapter instance
412
- */
413
- export function createDataplaneAdapter(config) {
414
- return new DataplaneAdapter(config);
415
- }
416
- //# sourceMappingURL=dataplane-adapter.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"dataplane-adapter.js","sourceRoot":"","sources":["../../src/workspace/dataplane-adapter.ts"],"names":[],"mappings":"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"}