@agents-ensemble/core 0.6.5 → 0.8.0

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 (214) hide show
  1. package/dist/conductor/conductor-agent.d.ts +50 -14
  2. package/dist/conductor/conductor-agent.d.ts.map +1 -1
  3. package/dist/conductor/conductor-agent.js +1 -96
  4. package/dist/conductor/conductor-agent.js.map +1 -1
  5. package/dist/conductor/conductor-auth.d.ts +36 -6
  6. package/dist/conductor/conductor-auth.d.ts.map +1 -1
  7. package/dist/conductor/conductor-auth.js +59 -7
  8. package/dist/conductor/conductor-auth.js.map +1 -1
  9. package/dist/conductor/conductor-pi-auth.d.ts +75 -0
  10. package/dist/conductor/conductor-pi-auth.d.ts.map +1 -0
  11. package/dist/conductor/conductor-pi-auth.js +524 -0
  12. package/dist/conductor/conductor-pi-auth.js.map +1 -0
  13. package/dist/conductor/conductor-send-reconnect.d.ts +10 -6
  14. package/dist/conductor/conductor-send-reconnect.d.ts.map +1 -1
  15. package/dist/conductor/conductor-send-reconnect.js +6 -4
  16. package/dist/conductor/conductor-send-reconnect.js.map +1 -1
  17. package/dist/conductor/conductor-session-driver.d.ts +4 -4
  18. package/dist/conductor/conductor-session-driver.d.ts.map +1 -1
  19. package/dist/conductor/conductor-session-driver.js +47 -29
  20. package/dist/conductor/conductor-session-driver.js.map +1 -1
  21. package/dist/conductor/conductor-session.d.ts +5 -1
  22. package/dist/conductor/conductor-session.d.ts.map +1 -1
  23. package/dist/conductor/conductor-session.js +138 -32
  24. package/dist/conductor/conductor-session.js.map +1 -1
  25. package/dist/conductor/conductor-tool-pi-adapter.d.ts +13 -0
  26. package/dist/conductor/conductor-tool-pi-adapter.d.ts.map +1 -0
  27. package/dist/conductor/conductor-tool-pi-adapter.js +30 -0
  28. package/dist/conductor/conductor-tool-pi-adapter.js.map +1 -0
  29. package/dist/conductor/conductor-tool-sdk-adapter.d.ts +6 -0
  30. package/dist/conductor/conductor-tool-sdk-adapter.d.ts.map +1 -0
  31. package/dist/conductor/conductor-tool-sdk-adapter.js +16 -0
  32. package/dist/conductor/conductor-tool-sdk-adapter.js.map +1 -0
  33. package/dist/conductor/conductor-tool.d.ts +35 -0
  34. package/dist/conductor/conductor-tool.d.ts.map +1 -0
  35. package/dist/conductor/conductor-tool.js +41 -0
  36. package/dist/conductor/conductor-tool.js.map +1 -0
  37. package/dist/conductor/cursor-sdk-conductor-agent.d.ts +18 -0
  38. package/dist/conductor/cursor-sdk-conductor-agent.d.ts.map +1 -0
  39. package/dist/conductor/cursor-sdk-conductor-agent.js +134 -0
  40. package/dist/conductor/cursor-sdk-conductor-agent.js.map +1 -0
  41. package/dist/conductor/index.d.ts +21 -7
  42. package/dist/conductor/index.d.ts.map +1 -1
  43. package/dist/conductor/index.js +11 -4
  44. package/dist/conductor/index.js.map +1 -1
  45. package/dist/conductor/list-conductor-models.d.ts +7 -2
  46. package/dist/conductor/list-conductor-models.d.ts.map +1 -1
  47. package/dist/conductor/list-conductor-models.js +9 -1
  48. package/dist/conductor/list-conductor-models.js.map +1 -1
  49. package/dist/conductor/pi-conductor-agent.d.ts +47 -0
  50. package/dist/conductor/pi-conductor-agent.d.ts.map +1 -0
  51. package/dist/conductor/pi-conductor-agent.js +479 -0
  52. package/dist/conductor/pi-conductor-agent.js.map +1 -0
  53. package/dist/conductor/pi-conductor-session.d.ts +20 -0
  54. package/dist/conductor/pi-conductor-session.d.ts.map +1 -0
  55. package/dist/conductor/pi-conductor-session.js +60 -0
  56. package/dist/conductor/pi-conductor-session.js.map +1 -0
  57. package/dist/conductor/pi-mcp-bridge.d.ts +65 -0
  58. package/dist/conductor/pi-mcp-bridge.d.ts.map +1 -0
  59. package/dist/conductor/pi-mcp-bridge.js +259 -0
  60. package/dist/conductor/pi-mcp-bridge.js.map +1 -0
  61. package/dist/conductor/pi-resource-loader.d.ts +148 -0
  62. package/dist/conductor/pi-resource-loader.d.ts.map +1 -0
  63. package/dist/conductor/pi-resource-loader.js +675 -0
  64. package/dist/conductor/pi-resource-loader.js.map +1 -0
  65. package/dist/conductor/session/dispatch-hold.d.ts +14 -0
  66. package/dist/conductor/session/dispatch-hold.d.ts.map +1 -1
  67. package/dist/conductor/session/dispatch-hold.js +30 -0
  68. package/dist/conductor/session/dispatch-hold.js.map +1 -1
  69. package/dist/conductor/session/events/index.d.ts +1 -1
  70. package/dist/conductor/session/events/index.d.ts.map +1 -1
  71. package/dist/conductor/session/events/index.js.map +1 -1
  72. package/dist/conductor/session/events/session-log-event-groups.d.ts +2 -2
  73. package/dist/conductor/session/events/session-log-event-groups.d.ts.map +1 -1
  74. package/dist/conductor/session/events/session-log-event-groups.js +1 -0
  75. package/dist/conductor/session/events/session-log-event-groups.js.map +1 -1
  76. package/dist/conductor/session/events/session-log-event.d.ts +10 -1
  77. package/dist/conductor/session/events/session-log-event.d.ts.map +1 -1
  78. package/dist/conductor/session/format-session-event.js +3 -0
  79. package/dist/conductor/session/format-session-event.js.map +1 -1
  80. package/dist/conductor/session/session-logger.d.ts.map +1 -1
  81. package/dist/conductor/session/session-logger.js +1 -0
  82. package/dist/conductor/session/session-logger.js.map +1 -1
  83. package/dist/config/defaults.d.ts +2 -1
  84. package/dist/config/defaults.d.ts.map +1 -1
  85. package/dist/config/defaults.js +2 -0
  86. package/dist/config/defaults.js.map +1 -1
  87. package/dist/config/index.d.ts +3 -3
  88. package/dist/config/index.d.ts.map +1 -1
  89. package/dist/config/index.js +2 -2
  90. package/dist/config/index.js.map +1 -1
  91. package/dist/config/parse-config.d.ts.map +1 -1
  92. package/dist/config/parse-config.js +29 -1
  93. package/dist/config/parse-config.js.map +1 -1
  94. package/dist/config/resolve-settings.d.ts +25 -1
  95. package/dist/config/resolve-settings.d.ts.map +1 -1
  96. package/dist/config/resolve-settings.js +38 -1
  97. package/dist/config/resolve-settings.js.map +1 -1
  98. package/dist/config/types.d.ts +11 -0
  99. package/dist/config/types.d.ts.map +1 -1
  100. package/dist/dispatch/prompt-worker-tool.d.ts +2 -2
  101. package/dist/dispatch/prompt-worker-tool.d.ts.map +1 -1
  102. package/dist/dispatch/prompt-worker-tool.js +1 -0
  103. package/dist/dispatch/prompt-worker-tool.js.map +1 -1
  104. package/dist/dispatch/session-usage-tool.d.ts +2 -2
  105. package/dist/dispatch/session-usage-tool.d.ts.map +1 -1
  106. package/dist/dispatch/session-usage-tool.js +2 -0
  107. package/dist/dispatch/session-usage-tool.js.map +1 -1
  108. package/dist/dispatch/set-dispatch-hold-tool.d.ts +2 -2
  109. package/dist/dispatch/set-dispatch-hold-tool.d.ts.map +1 -1
  110. package/dist/dispatch/set-dispatch-hold-tool.js +1 -0
  111. package/dist/dispatch/set-dispatch-hold-tool.js.map +1 -1
  112. package/dist/dispatch/worker-status-tool.d.ts +2 -2
  113. package/dist/dispatch/worker-status-tool.d.ts.map +1 -1
  114. package/dist/dispatch/worker-status-tool.js +2 -0
  115. package/dist/dispatch/worker-status-tool.js.map +1 -1
  116. package/dist/dispatch/yaml-tool-result.d.ts +3 -9
  117. package/dist/dispatch/yaml-tool-result.d.ts.map +1 -1
  118. package/dist/dispatch/yaml-tool-result.js.map +1 -1
  119. package/dist/escalation/answer-open-question-tool.d.ts +2 -2
  120. package/dist/escalation/answer-open-question-tool.d.ts.map +1 -1
  121. package/dist/escalation/answer-open-question-tool.js +1 -0
  122. package/dist/escalation/answer-open-question-tool.js.map +1 -1
  123. package/dist/escalation/ask-human-tool.d.ts +2 -2
  124. package/dist/escalation/ask-human-tool.d.ts.map +1 -1
  125. package/dist/escalation/ask-human-tool.js +1 -0
  126. package/dist/escalation/ask-human-tool.js.map +1 -1
  127. package/dist/escalation/open-question-list-tools.d.ts +2 -2
  128. package/dist/escalation/open-question-list-tools.d.ts.map +1 -1
  129. package/dist/escalation/open-question-list-tools.js +2 -0
  130. package/dist/escalation/open-question-list-tools.js.map +1 -1
  131. package/dist/github/fetch-github-updates.d.ts +0 -6
  132. package/dist/github/fetch-github-updates.d.ts.map +1 -1
  133. package/dist/github/fetch-github-updates.js +119 -135
  134. package/dist/github/fetch-github-updates.js.map +1 -1
  135. package/dist/github/github-client.d.ts.map +1 -1
  136. package/dist/github/github-client.js +8 -0
  137. package/dist/github/github-client.js.map +1 -1
  138. package/dist/github/github-monitor-cursor.d.ts +36 -9
  139. package/dist/github/github-monitor-cursor.d.ts.map +1 -1
  140. package/dist/github/github-monitor-cursor.js +9 -19
  141. package/dist/github/github-monitor-cursor.js.map +1 -1
  142. package/dist/github/github-monitor.d.ts +2 -0
  143. package/dist/github/github-monitor.d.ts.map +1 -1
  144. package/dist/github/github-monitor.js +13 -0
  145. package/dist/github/github-monitor.js.map +1 -1
  146. package/dist/github/github-test-fixtures.d.ts +9 -0
  147. package/dist/github/github-test-fixtures.d.ts.map +1 -1
  148. package/dist/github/github-test-fixtures.js +6 -0
  149. package/dist/github/github-test-fixtures.js.map +1 -1
  150. package/dist/github/github-update-types.d.ts +11 -1
  151. package/dist/github/github-update-types.d.ts.map +1 -1
  152. package/dist/github/index.d.ts +4 -2
  153. package/dist/github/index.d.ts.map +1 -1
  154. package/dist/github/index.js +1 -0
  155. package/dist/github/index.js.map +1 -1
  156. package/dist/github/register-github-watch-tool.d.ts +7 -2
  157. package/dist/github/register-github-watch-tool.d.ts.map +1 -1
  158. package/dist/github/register-github-watch-tool.js +31 -24
  159. package/dist/github/register-github-watch-tool.js.map +1 -1
  160. package/dist/github/unregister-github-watch-tool.d.ts +11 -0
  161. package/dist/github/unregister-github-watch-tool.d.ts.map +1 -0
  162. package/dist/github/unregister-github-watch-tool.js +52 -0
  163. package/dist/github/unregister-github-watch-tool.js.map +1 -0
  164. package/dist/mcp/index.d.ts +2 -3
  165. package/dist/mcp/index.d.ts.map +1 -1
  166. package/dist/mcp/index.js +1 -1
  167. package/dist/mcp/index.js.map +1 -1
  168. package/dist/mcp/load-mcp-config.d.ts +29 -5
  169. package/dist/mcp/load-mcp-config.d.ts.map +1 -1
  170. package/dist/mcp/load-mcp-config.js +9 -2
  171. package/dist/mcp/load-mcp-config.js.map +1 -1
  172. package/dist/permission/resolve-permission-tool.d.ts +2 -2
  173. package/dist/permission/resolve-permission-tool.d.ts.map +1 -1
  174. package/dist/permission/resolve-permission-tool.js +1 -0
  175. package/dist/permission/resolve-permission-tool.js.map +1 -1
  176. package/dist/profile/index.d.ts +1 -1
  177. package/dist/profile/index.d.ts.map +1 -1
  178. package/dist/profile/index.js.map +1 -1
  179. package/dist/profile/load-profile.d.ts.map +1 -1
  180. package/dist/profile/load-profile.js +19 -0
  181. package/dist/profile/load-profile.js.map +1 -1
  182. package/dist/profile/types.d.ts +7 -0
  183. package/dist/profile/types.d.ts.map +1 -1
  184. package/dist/profile/types.js.map +1 -1
  185. package/dist/prompt/modules/ensemble/base-module.d.ts.map +1 -1
  186. package/dist/prompt/modules/ensemble/base-module.js +2 -1
  187. package/dist/prompt/modules/ensemble/base-module.js.map +1 -1
  188. package/dist/prompt/modules/ensemble/conductor-base-module.d.ts.map +1 -1
  189. package/dist/prompt/modules/ensemble/conductor-base-module.js +4 -1
  190. package/dist/prompt/modules/ensemble/conductor-base-module.js.map +1 -1
  191. package/dist/runtime/worker-session.d.ts +5 -0
  192. package/dist/runtime/worker-session.d.ts.map +1 -1
  193. package/dist/runtime/worker-session.js +5 -1
  194. package/dist/runtime/worker-session.js.map +1 -1
  195. package/dist/session/session-sidecar.d.ts +4 -0
  196. package/dist/session/session-sidecar.d.ts.map +1 -1
  197. package/dist/session/session-sidecar.js +16 -0
  198. package/dist/session/session-sidecar.js.map +1 -1
  199. package/dist/testing/mock-conductor-get-usage.d.ts +2 -1
  200. package/dist/testing/mock-conductor-get-usage.d.ts.map +1 -1
  201. package/dist/testing/mock-conductor-get-usage.js +1 -10
  202. package/dist/testing/mock-conductor-get-usage.js.map +1 -1
  203. package/dist/usage/enrich-session-usage-cost.d.ts +2 -2
  204. package/dist/usage/enrich-session-usage-cost.d.ts.map +1 -1
  205. package/dist/usage/session-usage-tracker.d.ts +2 -2
  206. package/dist/usage/session-usage-tracker.d.ts.map +1 -1
  207. package/dist/usage/session-usage-tracker.js +2 -2
  208. package/dist/usage/session-usage-tracker.js.map +1 -1
  209. package/dist/usage/types.d.ts +2 -2
  210. package/dist/usage/types.d.ts.map +1 -1
  211. package/dist/worktree/worktree.d.ts.map +1 -1
  212. package/dist/worktree/worktree.js +33 -16
  213. package/dist/worktree/worktree.js.map +1 -1
  214. package/package.json +5 -1
@@ -7,7 +7,7 @@ export class SessionUsageTracker {
7
7
  this.contextLimitTokens = options.contextLimitTokens;
8
8
  }
9
9
  recordConductorRound(input) {
10
- const usage = input.usage ? fromSdkTokenUsage(input.usage) : null;
10
+ const usage = input.usage ? fromConductorTokenUsage(input.usage) : null;
11
11
  const round = {
12
12
  roundId: nextRoundId(),
13
13
  agentKind: 'conductor',
@@ -97,7 +97,7 @@ function nextRoundId() {
97
97
  roundCounter += 1;
98
98
  return `usage-round-${roundCounter}`;
99
99
  }
100
- function fromSdkTokenUsage(usage) {
100
+ function fromConductorTokenUsage(usage) {
101
101
  return {
102
102
  source: 'sdk',
103
103
  inputTokens: usage.inputTokens,
@@ -1 +1 @@
1
- {"version":3,"file":"session-usage-tracker.js","sourceRoot":"","sources":["../../src/usage/session-usage-tracker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session-usage-tracker.js","sourceRoot":"","sources":["../../src/usage/session-usage-tracker.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { UsageCost } from '@cursor/sdk';
1
+ import type { ConductorUsageCost } from '../conductor/conductor-agent.js';
2
2
  /** Token counts for one LLM round or an aggregate. */
3
3
  export interface LlmTokenCounts {
4
4
  inputTokens: number;
@@ -51,6 +51,6 @@ export interface SessionUsageSummary {
51
51
  context: SessionContextUtilization;
52
52
  latestRound: SessionUsageRound | null;
53
53
  /** conductor `getUsage().cost`(セッション累計。未取得時は省略)。 */
54
- cost?: UsageCost;
54
+ cost?: ConductorUsageCost;
55
55
  }
56
56
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/usage/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,sDAAsD;AACtD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,KAAK,GAAG,WAAW,CAAC;AAEzD,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,qBAAqB,CAAC;IACjC,iCAAiC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,SAAS,GAAG,WAAW,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,sDAAsD;IACtD,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,EAAE,MAAM,CAAC;QACxB,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE;QACP,SAAS,EAAE,uBAAuB,CAAC;QACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;KAClD,CAAC;IACF,OAAO,EAAE,yBAAyB,CAAC;IACnC,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,oDAAoD;IACpD,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/usage/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,sDAAsD;AACtD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,KAAK,GAAG,WAAW,CAAC;AAEzD,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,qBAAqB,CAAC;IACjC,iCAAiC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,SAAS,GAAG,WAAW,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,sDAAsD;IACtD,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,EAAE,MAAM,CAAC;QACxB,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE;QACP,SAAS,EAAE,uBAAuB,CAAC;QACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;KAClD,CAAC;IACF,OAAO,EAAE,yBAAyB,CAAC;IACnC,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,oDAAoD;IACpD,IAAI,CAAC,EAAE,kBAAkB,CAAC;CAC3B"}
@@ -1 +1 @@
1
- {"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/worktree/worktree.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGtD,8EAA8E;AAC9E,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,SAAS,CAAC;AAExD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,QAAQ,CAAC;IAChB,oDAAoD;IACpD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,CAExE;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC9B,MAAM,CAER;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CASlC;AAED,kEAAkE;AAClE,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,EACf,IAAI,GAAE,kBAA+B,GACpC,OAAO,CAAC,WAAW,CAAC,CAKtB;AAED,kEAAkE;AAClE,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,WAAW,CAAC,CAItB;AAED,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,WAAW,CAAC,CAwCtB;AAED,MAAM,MAAM,0BAA0B,GAClC;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,0BAA0B,CAAC,CA+BrC;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CA6B/E"}
1
+ {"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/worktree/worktree.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGtD,8EAA8E;AAC9E,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,SAAS,CAAC;AAExD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,QAAQ,CAAC;IAChB,oDAAoD;IACpD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,CAExE;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC9B,MAAM,CAER;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CASlC;AAED,kEAAkE;AAClE,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,EACf,IAAI,GAAE,kBAA+B,GACpC,OAAO,CAAC,WAAW,CAAC,CAKtB;AAED,kEAAkE;AAClE,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,WAAW,CAAC,CAItB;AAED,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,WAAW,CAAC,CAwCtB;AAED,MAAM,MAAM,0BAA0B,GAClC;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAQtE;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,0BAA0B,CAAC,CAsCrC;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CA6B/E"}
@@ -74,6 +74,11 @@ export async function createWorkerWorktree(repoRoot, issue) {
74
74
  }
75
75
  return { path, branch, issue };
76
76
  }
77
+ /**
78
+ * Worktree の lock が ACP / worker の終了直後まで残ることがあるため、
79
+ * remove は短い backoff を挟んで限定的に再試行する。
80
+ */
81
+ const WORKTREE_REMOVE_RETRY_DELAYS_MS = [100, 250];
77
82
  /**
78
83
  * isolated worktree を削除する。存在しない場合は no-op。
79
84
  * 未コミット変更がある場合は削除せず `skipped_dirty` を返す(`--force` は使わない)。
@@ -91,22 +96,29 @@ export async function removeWorkerWorktree(repoRoot, issue) {
91
96
  branch: existing.branch,
92
97
  };
93
98
  }
94
- try {
95
- await runGit(['worktree', 'remove', existing.path], repoRoot);
96
- return {
97
- status: 'removed',
98
- path: existing.path,
99
- branch: existing.branch,
100
- };
101
- }
102
- catch (error) {
103
- const message = error instanceof Error ? error.message : String(error);
104
- return {
105
- status: 'failed',
106
- path: existing.path,
107
- branch: existing.branch,
108
- error: message,
109
- };
99
+ let lastError;
100
+ for (let attempt = 0;; attempt += 1) {
101
+ try {
102
+ await runGit(['worktree', 'remove', existing.path], repoRoot);
103
+ return {
104
+ status: 'removed',
105
+ path: existing.path,
106
+ branch: existing.branch,
107
+ };
108
+ }
109
+ catch (error) {
110
+ lastError = error instanceof Error ? error.message : String(error);
111
+ const retryDelay = WORKTREE_REMOVE_RETRY_DELAYS_MS[attempt];
112
+ if (retryDelay === undefined) {
113
+ return {
114
+ status: 'failed',
115
+ path: existing.path,
116
+ branch: existing.branch,
117
+ error: lastError,
118
+ };
119
+ }
120
+ await delay(retryDelay);
121
+ }
110
122
  }
111
123
  }
112
124
  export async function listWorktrees(repoRoot) {
@@ -188,6 +200,11 @@ async function isWorktreeDirty(worktreePath) {
188
200
  const { stdout } = await runGit(['status', '--porcelain'], worktreePath);
189
201
  return stdout.trim().length > 0;
190
202
  }
203
+ function delay(milliseconds) {
204
+ return new Promise((resolvePromise) => {
205
+ setTimeout(resolvePromise, milliseconds);
206
+ });
207
+ }
191
208
  async function gitBranchExists(repoRoot, branch) {
192
209
  try {
193
210
  await runGit(['show-ref', '--verify', `refs/heads/${branch}`], repoRoot);
@@ -1 +1 @@
1
- {"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/worktree/worktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAa3C,MAAM,UAAU,gBAAgB,CAAC,KAA+B;IAC9D,OAAO,kBAAkB,KAAK,CAAC,MAAM,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,QAAgB,EAChB,KAA+B;IAE/B,OAAO,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAgB,EAChB,KAAe;IAEf,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC7C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,MAAM,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YACvC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,kEAAkE;AAClE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,KAAe,EACf,OAA2B,UAAU;IAErC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,sBAAsB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED,kEAAkE;AAClE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,KAAe;IAEf,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,KAAe;IAEf,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9D,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3E,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,YAAY;QAC7B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;aAAM,IAAI,UAAU,EAAE,CAAC;YACtB,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,SAAS,GAAG,MAAM,qBAAqB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC/D,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC;QAEhC,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,IAAI,eAAe,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YACjC,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBACpB,MAAM,mBAAmB,GAAG,MAAM,qBAAqB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACzE,IAAI,mBAAmB;oBAAE,OAAO,mBAAmB,CAAC;gBACpD,MAAM,UAAU,CAAC;YACnB,CAAC;QACH,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AACjC,CAAC;AAQD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,KAAe;IAEf,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO;YACL,MAAM,EAAE,eAAe;YACvB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC9D,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,OAAO;SACf,CAAC;IACJ,CAAC;AACH,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,QAAgB;IAClD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAqB,EAAE,CAAC;IACrC,IAAI,WAA+B,CAAC;IACpC,IAAI,aAAiC,CAAC;IAEtC,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,aAAa,IAAI,UAAU;SACpC,CAAC,CAAC;QACH,WAAW,GAAG,SAAS,CAAC;QACxB,aAAa,GAAG,SAAS,CAAC;IAC5B,CAAC,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,KAAK,EAAE,CAAC;YACR,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC7C,SAAS;QACX,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED,KAAK,EAAE,CAAC;IACR,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,QAAgB;IAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;IACjF,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC;AAED,mEAAmE;AACnE,KAAK,UAAU,0BAA0B,CACvC,QAAgB;IAEhB,MAAM,aAAa,GAAG,MAAM,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACjE,IAAI,CAAC,aAAa;QAAE,OAAO,SAAS,CAAC;IAErC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC3D,MAAM,MAAM,CACV,CAAC,WAAW,EAAE,UAAU,EAAE,uBAAuB,aAAa,EAAE,CAAC,EACjE,QAAQ,CACT,CAAC;QACF,OAAO,UAAU,aAAa,EAAE,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,OAAO,CAAC,IAAI,CACV,qBAAqB,aAAa,sCAAsC,MAAM,EAAE,CACjF,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,QAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAC7B,CAAC,cAAc,EAAE,0BAA0B,CAAC,EAC5C,QAAQ,CACT,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnE,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAC7B,CAAC,QAAQ,EAAE,OAAO,EAAE,oBAAoB,CAAC,EACzC,QAAQ,CACT,CAAC;QACF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,YAAoB;IACjD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,YAAY,CAAC,CAAC;IACzE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,QAAgB,EAAE,MAAc;IAC7D,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,CAAS,EAAE,CAAS;IAC5C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,KAAK,KAAK,CAAC;AACxB,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,IAAY;IACtC,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/worktree/worktree.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agents-ensemble/core",
3
- "version": "0.6.5",
3
+ "version": "0.8.0",
4
4
  "type": "module",
5
5
  "description": "Core types and orchestration logic for agents-ensemble",
6
6
  "main": "dist/index.js",
@@ -27,6 +27,10 @@
27
27
  },
28
28
  "dependencies": {
29
29
  "@cursor/sdk": "1.0.27",
30
+ "@earendil-works/pi-agent-core": "0.80.6",
31
+ "@earendil-works/pi-ai": "0.80.6",
32
+ "@earendil-works/pi-coding-agent": "0.80.6",
33
+ "@modelcontextprotocol/sdk": "1.30.0",
30
34
  "@modular-prompt/core": "0.3.0",
31
35
  "js-yaml": "4.1.0"
32
36
  },