macro-agent 0.2.3 → 0.2.4

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.
Files changed (10) hide show
  1. package/dist/cli/acp.js +0 -0
  2. package/dist/cli/index.js +0 -0
  3. package/dist/cli/mcp.js +0 -0
  4. package/dist/map/sidecar.d.ts.map +1 -1
  5. package/dist/map/sidecar.js +19 -4
  6. package/dist/map/sidecar.js.map +1 -1
  7. package/package.json +4 -2
  8. package/renovate.json5 +6 -0
  9. package/src/map/__tests__/sidecar-diff-install-smoke.test.ts +17 -2
  10. package/src/map/sidecar.ts +21 -4
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
package/dist/map/sidecar.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EAKf,MAAM,YAAY,CAAC;AAUpB;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,UAAU,CA6vBZ"}
1
+ {"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EAKf,MAAM,YAAY,CAAC;AAWpB;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,UAAU,CA6wBZ"}
package/dist/map/sidecar.js CHANGED
@@ -42,6 +42,21 @@ export function createMAPSidecar(deps, config) {
42
42
  let workspaceManager = null;
43
43
  let workspaceTransport = null;
44
44
  let reconnectTimer = null;
45
+ // Cascade capability — declared only when a git-cascade adapter is wired.
46
+ // Each flag reflects what macro-agent *actually wired up* (honest declaration):
47
+ // - canServeDiff: the diff server is wired alongside the adapter
48
+ // (setupCascadeDiffServer answers cascade/diff.request).
49
+ // - canAct: the inbound action handler is wired
50
+ // (setupCascadeActionHandlers handles x-cascade/request.*).
51
+ // - emitsConflicts: the cascade-bridge forwards stream.conflicted /
52
+ // stream.conflict_resolved events.
53
+ // autoCloseOnMerge is omitted — it is an opt-in close policy (default
54
+ // manual) and macro-agent has no config/wiring for it.
55
+ const cascadeCapability = {
56
+ canServeDiff: true,
57
+ canAct: true,
58
+ emitsConflicts: true,
59
+ };
45
60
  // Resolve the workspace capability from env vars. Setting OPENHIVE_WORKSPACE_DECLARE=off
46
61
  // disables both explicit declare AND trajectory-handler bootstrap on the hub side.
47
62
  const workspaceCapability = {
@@ -154,11 +169,11 @@ export function createMAPSidecar(deps, config) {
154
169
  canUpdate: true,
155
170
  canList: true,
156
171
  },
157
- // Diff serving is gated on whether a git-cascade adapter is wired
158
- // — without it there are no worktrees to shell out against, so
159
- // declaring canServeDiff would just produce timeouts on the hub.
172
+ // Cascade capability is gated on whether a git-cascade adapter is
173
+ // wired — without it there are no worktrees to shell out against,
174
+ // so declaring it would just produce timeouts on the hub.
160
175
  ...(gitCascadeAdapter
161
- ? { cascade: { canServeDiff: true } }
176
+ ? { cascade: cascadeCapability }
162
177
  : {}),
163
178
  workspace: workspaceCapability,
164
179
  },
package/dist/map/sidecar.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.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.3",
3
+ "version": "0.2.4",
4
4
  "description": "Interact with multiple agents as if they were a single agent.",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -21,6 +21,7 @@
21
21
  "version:patch": "npm version patch && git push && git push --tags",
22
22
  "version:minor": "npm version minor && git push && git push --tags",
23
23
  "version:major": "npm version major && git push && git push --tags",
24
+ "prepublishOnly": "npm run build && publint",
24
25
  "publish:npm": "npm run build && npm publish"
25
26
  },
26
27
  "keywords": [
@@ -43,6 +44,7 @@
43
44
  "@types/node": "^20.10.0",
44
45
  "@types/supertest": "^6.0.3",
45
46
  "@types/ws": "^8.18.1",
47
+ "publint": "^0.3.21",
46
48
  "supertest": "^7.2.2",
47
49
  "typescript": "^5.3.0",
48
50
  "vitest": "^1.0.0"
@@ -58,7 +60,7 @@
58
60
  "chalk": "^5.6.2",
59
61
  "commander": "^14.0.2",
60
62
  "express": "^5.2.1",
61
- "git-cascade": "^0.0.7",
63
+ "git-cascade": "^0.0.9",
62
64
  "js-yaml": "^4.1.1",
63
65
  "nanoid": "^5.0.0",
64
66
  "opentasks": "^0.1.3",
package/renovate.json5 ADDED
@@ -0,0 +1,6 @@
1
+ {
2
+ // Dependency-update policy is shared across the swarm/openhive ecosystem.
3
+ // See github.com/alexngai/swarm-renovate-config.
4
+ "$schema": "https://docs.renovatebot.com/renovate-schema.json",
5
+ "extends": ["github>alexngai/swarm-renovate-config"]
6
+ }
package/src/map/__tests__/sidecar-diff-install-smoke.test.ts CHANGED
@@ -65,11 +65,26 @@ describe('sidecar.ts cascade-diff install (structural smoke)', () => {
65
65
  expect(cleanupBlock).toContain('diffCleanup()');
66
66
  });
67
67
 
68
- it('only declares cascade.canServeDiff capability when adapter is wired (S1.10)', () => {
68
+ it('only declares the cascade capability when adapter is wired (S1.10)', () => {
69
69
  // The capability declaration is a conditional spread keyed on
70
70
  // gitCascadeAdapter. Without an adapter, no `cascade:` block is sent.
71
71
  expect(sidecarSource).toMatch(
72
- /\.\.\.\(gitCascadeAdapter\s*\?\s*\{\s*cascade:\s*\{\s*canServeDiff:\s*true\s*\}\s*\}\s*:\s*\{\}\)/,
72
+ /\.\.\.\(gitCascadeAdapter\s*\?\s*\{\s*cascade:\s*cascadeCapability\s*\}\s*:\s*\{\}\)/,
73
73
  );
74
74
  });
75
+
76
+ it('declares the full cascade capability (canServeDiff + canAct + emitsConflicts)', () => {
77
+ // macro-agent is a full-control cascade runtime: it serves diffs,
78
+ // handles inbound x-cascade/request.* actions, and forwards conflict
79
+ // events. The CascadeCapability constant must reflect all three.
80
+ const capBlock = sidecarSource.match(
81
+ /const cascadeCapability:\s*CascadeCapability\s*=\s*{[\s\S]*?};/,
82
+ )?.[0];
83
+ expect(capBlock).toBeDefined();
84
+ expect(capBlock).toContain('canServeDiff: true');
85
+ expect(capBlock).toContain('canAct: true');
86
+ expect(capBlock).toContain('emitsConflicts: true');
87
+ // autoCloseOnMerge is an opt-in close policy with no wiring — not declared.
88
+ expect(capBlock).not.toContain('autoCloseOnMerge');
89
+ });
75
90
  });
package/src/map/sidecar.ts CHANGED
@@ -23,6 +23,7 @@ import type {
23
23
  TaskBridge,
24
24
  } from "./types.js";
25
25
  import type { AgentLifecycleCallback } from "../agent/types.js";
26
+ import type { CascadeCapability } from "git-cascade/events";
26
27
  import {
27
28
  REPO_PROTOCOL_VERSION,
28
29
  RepoClient,
@@ -66,6 +67,22 @@ export function createMAPSidecar(
66
67
  let workspaceTransport: RepoClientTransport | null = null;
67
68
  let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
68
69
 
70
+ // Cascade capability — declared only when a git-cascade adapter is wired.
71
+ // Each flag reflects what macro-agent *actually wired up* (honest declaration):
72
+ // - canServeDiff: the diff server is wired alongside the adapter
73
+ // (setupCascadeDiffServer answers cascade/diff.request).
74
+ // - canAct: the inbound action handler is wired
75
+ // (setupCascadeActionHandlers handles x-cascade/request.*).
76
+ // - emitsConflicts: the cascade-bridge forwards stream.conflicted /
77
+ // stream.conflict_resolved events.
78
+ // autoCloseOnMerge is omitted — it is an opt-in close policy (default
79
+ // manual) and macro-agent has no config/wiring for it.
80
+ const cascadeCapability: CascadeCapability = {
81
+ canServeDiff: true,
82
+ canAct: true,
83
+ emitsConflicts: true,
84
+ };
85
+
69
86
  // Resolve the workspace capability from env vars. Setting OPENHIVE_WORKSPACE_DECLARE=off
70
87
  // disables both explicit declare AND trajectory-handler bootstrap on the hub side.
71
88
  const workspaceCapability: WorkspaceCapability = {
@@ -173,11 +190,11 @@ export function createMAPSidecar(
173
190
  canUpdate: true,
174
191
  canList: true,
175
192
  },
176
- // Diff serving is gated on whether a git-cascade adapter is wired
177
- // — without it there are no worktrees to shell out against, so
178
- // declaring canServeDiff would just produce timeouts on the hub.
193
+ // Cascade capability is gated on whether a git-cascade adapter is
194
+ // wired — without it there are no worktrees to shell out against,
195
+ // so declaring it would just produce timeouts on the hub.
179
196
  ...(gitCascadeAdapter
180
- ? { cascade: { canServeDiff: true } }
197
+ ? { cascade: cascadeCapability }
181
198
  : {}),
182
199
  workspace: workspaceCapability,
183
200
  },