@agents-ensemble/core 0.2.0 → 0.3.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 (121) hide show
  1. package/dist/acp/extract-acp-tool-name.d.ts +4 -0
  2. package/dist/acp/extract-acp-tool-name.d.ts.map +1 -0
  3. package/dist/acp/extract-acp-tool-name.js +29 -0
  4. package/dist/acp/extract-acp-tool-name.js.map +1 -0
  5. package/dist/acp/index.d.ts +1 -0
  6. package/dist/acp/index.d.ts.map +1 -1
  7. package/dist/acp/index.js +1 -0
  8. package/dist/acp/index.js.map +1 -1
  9. package/dist/conductor/conductor-agent.d.ts +2 -1
  10. package/dist/conductor/conductor-agent.d.ts.map +1 -1
  11. package/dist/conductor/conductor-agent.js +3 -0
  12. package/dist/conductor/conductor-agent.js.map +1 -1
  13. package/dist/conductor/conductor-session.d.ts.map +1 -1
  14. package/dist/conductor/conductor-session.js +90 -21
  15. package/dist/conductor/conductor-session.js.map +1 -1
  16. package/dist/conductor/session/events/index.d.ts +1 -1
  17. package/dist/conductor/session/events/index.d.ts.map +1 -1
  18. package/dist/conductor/session/events/index.js.map +1 -1
  19. package/dist/conductor/session/events/session-log-event-groups.d.ts +2 -2
  20. package/dist/conductor/session/events/session-log-event-groups.d.ts.map +1 -1
  21. package/dist/conductor/session/events/session-log-event-groups.js +2 -0
  22. package/dist/conductor/session/events/session-log-event-groups.js.map +1 -1
  23. package/dist/conductor/session/events/session-log-event.d.ts +12 -1
  24. package/dist/conductor/session/events/session-log-event.d.ts.map +1 -1
  25. package/dist/conductor/session/session-logger.d.ts.map +1 -1
  26. package/dist/conductor/session/session-logger.js +2 -0
  27. package/dist/conductor/session/session-logger.js.map +1 -1
  28. package/dist/dispatch/attach-worker.d.ts +2 -0
  29. package/dist/dispatch/attach-worker.d.ts.map +1 -1
  30. package/dist/dispatch/attach-worker.js +4 -0
  31. package/dist/dispatch/attach-worker.js.map +1 -1
  32. package/dist/dispatch/session-usage-tool.d.ts +2 -0
  33. package/dist/dispatch/session-usage-tool.d.ts.map +1 -1
  34. package/dist/dispatch/session-usage-tool.js +3 -1
  35. package/dist/dispatch/session-usage-tool.js.map +1 -1
  36. package/dist/dispatch/worker-acp-session.d.ts +8 -1
  37. package/dist/dispatch/worker-acp-session.d.ts.map +1 -1
  38. package/dist/dispatch/worker-acp-session.js +15 -4
  39. package/dist/dispatch/worker-acp-session.js.map +1 -1
  40. package/dist/github/fetch-github-updates.d.ts.map +1 -1
  41. package/dist/github/fetch-github-updates.js +56 -5
  42. package/dist/github/fetch-github-updates.js.map +1 -1
  43. package/dist/github/github-post-loop-resume.d.ts +9 -0
  44. package/dist/github/github-post-loop-resume.d.ts.map +1 -0
  45. package/dist/github/github-post-loop-resume.js +16 -0
  46. package/dist/github/github-post-loop-resume.js.map +1 -0
  47. package/dist/github/github-test-fixtures.d.ts +13 -0
  48. package/dist/github/github-test-fixtures.d.ts.map +1 -1
  49. package/dist/github/github-test-fixtures.js +17 -0
  50. package/dist/github/github-test-fixtures.js.map +1 -1
  51. package/dist/profile/index.d.ts +3 -2
  52. package/dist/profile/index.d.ts.map +1 -1
  53. package/dist/profile/index.js +1 -1
  54. package/dist/profile/index.js.map +1 -1
  55. package/dist/profile/load-profile.d.ts +18 -19
  56. package/dist/profile/load-profile.d.ts.map +1 -1
  57. package/dist/profile/load-profile.js +42 -51
  58. package/dist/profile/load-profile.js.map +1 -1
  59. package/dist/profile/profile-paths.d.ts +19 -0
  60. package/dist/profile/profile-paths.d.ts.map +1 -0
  61. package/dist/profile/profile-paths.js +39 -0
  62. package/dist/profile/profile-paths.js.map +1 -0
  63. package/dist/profile/resolve-worker-workspace.d.ts +12 -0
  64. package/dist/profile/resolve-worker-workspace.d.ts.map +1 -0
  65. package/dist/profile/resolve-worker-workspace.js +48 -0
  66. package/dist/profile/resolve-worker-workspace.js.map +1 -0
  67. package/dist/profile/team-profile-resolution.d.ts +39 -0
  68. package/dist/profile/team-profile-resolution.d.ts.map +1 -0
  69. package/dist/profile/team-profile-resolution.js +154 -0
  70. package/dist/profile/team-profile-resolution.js.map +1 -0
  71. package/dist/profile/types.d.ts +18 -0
  72. package/dist/profile/types.d.ts.map +1 -1
  73. package/dist/profile/types.js +11 -2
  74. package/dist/profile/types.js.map +1 -1
  75. package/dist/profiles/implementer-and-reviewer/conductor.prompt.yaml +18 -0
  76. package/dist/profiles/implementer-and-reviewer/implementer.prompt.yaml +15 -0
  77. package/dist/profiles/implementer-and-reviewer/reviewer.prompt.yaml +16 -0
  78. package/dist/prompt/build-worker-attach-prompt.d.ts +1 -0
  79. package/dist/prompt/build-worker-attach-prompt.d.ts.map +1 -1
  80. package/dist/prompt/build-worker-attach-prompt.js +6 -3
  81. package/dist/prompt/build-worker-attach-prompt.js.map +1 -1
  82. package/dist/prompt/contexts/kind.d.ts +1 -0
  83. package/dist/prompt/contexts/kind.d.ts.map +1 -1
  84. package/dist/prompt/contexts/kind.js.map +1 -1
  85. package/dist/prompt/modules/ensemble/conductor-base-module.js +6 -6
  86. package/dist/prompt/modules/ensemble/conductor-base-module.js.map +1 -1
  87. package/dist/prompt/modules/ensemble/worker-base-module.d.ts.map +1 -1
  88. package/dist/prompt/modules/ensemble/worker-base-module.js +3 -4
  89. package/dist/prompt/modules/ensemble/worker-base-module.js.map +1 -1
  90. package/dist/runtime/types.d.ts +4 -0
  91. package/dist/runtime/types.d.ts.map +1 -1
  92. package/dist/runtime/worker-runtime.d.ts +9 -1
  93. package/dist/runtime/worker-runtime.d.ts.map +1 -1
  94. package/dist/runtime/worker-runtime.js +42 -7
  95. package/dist/runtime/worker-runtime.js.map +1 -1
  96. package/dist/runtime/worker-session.d.ts +9 -3
  97. package/dist/runtime/worker-session.d.ts.map +1 -1
  98. package/dist/runtime/worker-session.js +9 -3
  99. package/dist/runtime/worker-session.js.map +1 -1
  100. package/dist/runtime/worker-status.d.ts +2 -0
  101. package/dist/runtime/worker-status.d.ts.map +1 -1
  102. package/dist/session/session-sidecar.d.ts +2 -0
  103. package/dist/session/session-sidecar.d.ts.map +1 -1
  104. package/dist/session/session-sidecar.js +4 -1
  105. package/dist/session/session-sidecar.js.map +1 -1
  106. package/dist/testing/mock-conductor-get-usage.d.ts +3 -0
  107. package/dist/testing/mock-conductor-get-usage.d.ts.map +1 -0
  108. package/dist/testing/mock-conductor-get-usage.js +15 -0
  109. package/dist/testing/mock-conductor-get-usage.js.map +1 -0
  110. package/dist/usage/enrich-session-usage-cost.d.ts +6 -0
  111. package/dist/usage/enrich-session-usage-cost.d.ts.map +1 -0
  112. package/dist/usage/enrich-session-usage-cost.js +17 -0
  113. package/dist/usage/enrich-session-usage-cost.js.map +1 -0
  114. package/dist/usage/types.d.ts +3 -0
  115. package/dist/usage/types.d.ts.map +1 -1
  116. package/package.json +1 -1
  117. package/dist/profiles/default/conductor.prompt.yaml +0 -29
  118. package/dist/profiles/default/implementer.prompt.yaml +0 -17
  119. package/dist/profiles/default/reviewer.prompt.yaml +0 -18
  120. /package/dist/profiles/{default → implementer-and-reviewer}/profile.yaml +0 -0
  121. /package/dist/profiles/{default → implementer-and-reviewer}/team.md +0 -0
@@ -0,0 +1,18 @@
1
+ persona:
2
+ - あなたは **conductor** です。
3
+ - implementer / reviewer とチームを組み、指示を出して進捗を管理します
4
+ instructions:
5
+ - 自分で判断できないことは open question でオペレータの最終判断を仰ぐ
6
+ - implementer / reviewer との会話は簡潔に行います。詳細な状態・報告の正本は Issue / PR とします。
7
+ - permission.pending が届いたら、必ず resolve_permission で可否を決定します(回答があるまで worker は作業を完遂できません)。不安要素があれば ask_human でオペレータに問い合わせます
8
+ - '指示の典型的な内容:'
9
+ - ' - **implementer** へ: 対象 Issue、今回のゴール、スコープ、使う Skill 等'
10
+ - ' - **reviewer** へ: 対象 PR URL、レビュー観点、再レビューなら前回ブロッカー'
11
+ - type: subsection
12
+ title: 資料の読み方
13
+ items:
14
+ - 同梱の `team.md`(標準動作モード)を読んでください。
15
+ - '**§3 conductor** — 指示として従う'
16
+ - その他の章 — 相手(implementer / reviewer)への期待として読む
17
+ - §1 全員の前提、§6 連携 — 全員共通のルール
18
+ - '`team.md` は手順書ではなく、役割の境界と連携の作法を決める。いま何をすべきかの正本は **Issue / PR** と、指示のあった **Skill**。'
@@ -0,0 +1,15 @@
1
+ persona:
2
+ - あなたは **implementer** です。
3
+ - 調査・実装・テスト・ドキュメント・PR 作成を担います
4
+ instructions:
5
+ - reviewer と直接会話しない。伝えることは Issue / PR に書く
6
+ - 作業が長く続く場合は、手を止めて conductor との情報共有することができます
7
+ - 気づき・違和感・未解決は解決できなくても Issue に残す
8
+ - type: subsection
9
+ title: 資料の読み方
10
+ items:
11
+ - 同梱の `team.md`(標準動作モード)を読んでください。
12
+ - '**§4 implementer** — 指示として従う'
13
+ - その他の章 — 相手(conductor / reviewer)への期待として読む
14
+ - §1 全員の前提、§6 連携 — 全員共通のルール
15
+ - 手順の細部の正本は **Skill(指示があれば)と Issue / PR**。
@@ -0,0 +1,16 @@
1
+ persona:
2
+ - あなたは **reviewer** です。
3
+ - 独立した検証者として振る舞います。
4
+ instructions:
5
+ - '**コードは書かない。** 成果物は判定と根拠(PR コメント)'
6
+ - conductor から PR URL とレビュー観点の指示を受けてから動く
7
+ - implementer が作成した worktree に入って独立検証する
8
+ - implementer と直接会話はできません
9
+ - type: subsection
10
+ title: 資料の読み方
11
+ items:
12
+ - 同梱の `team.md`(標準動作モード)を読んでください。
13
+ - '**§5 reviewer** — 指示として従う'
14
+ - その他の章 — 相手(conductor / implementer)への期待として読む
15
+ - §1 全員の前提、§6 連携 — 全員共通のルール
16
+ - '`team.md` 全文は conductor の materials にも載る。検証のたびに **Issue / PR から読み直す**(会話の記憶や前回の approve を前提にしない)。'
@@ -4,6 +4,7 @@ export interface WorkerAttachPromptOptions {
4
4
  issueUrl: string;
5
5
  kind: string;
6
6
  worktreePath?: string;
7
+ workspacePath?: string;
7
8
  worktreeInRepo?: boolean;
8
9
  sessionState: EnsembleSessionState;
9
10
  agentModule?: PromptModule;
@@ -1 +1 @@
1
- {"version":3,"file":"build-worker-attach-prompt.d.ts","sourceRoot":"","sources":["../../src/prompt/build-worker-attach-prompt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAOhE,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,oBAAoB,CAAC;IACnC,WAAW,CAAC,EAAE,YAAY,CAAC;CAC5B;AAiBD,0EAA0E;AAC1E,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,yBAAyB,GACjC,MAAM,CAaR"}
1
+ {"version":3,"file":"build-worker-attach-prompt.d.ts","sourceRoot":"","sources":["../../src/prompt/build-worker-attach-prompt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAOhE,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,oBAAoB,CAAC;IACnC,WAAW,CAAC,EAAE,YAAY,CAAC;CAC5B;AAmBD,0EAA0E;AAC1E,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,yBAAyB,GACjC,MAAM,CAcR"}
@@ -7,9 +7,11 @@ const workerAttachModule = {
7
7
  instructions: [
8
8
  (ctx) => ctx.worktreeInRepo
9
9
  ? '⚠️ 特別モード: メイン worktree(リポジトリルート)で直接作業する。通常の isolated worktree は使わない。'
10
- : ctx.worktreePath
11
- ? `作業 worktree: ${ctx.worktreePath}`
12
- : null,
10
+ : ctx.workspacePath && ctx.workspacePath !== ctx.worktreePath
11
+ ? `作業ディレクトリ: ${ctx.workspacePath}(Issue worktree とは別の ACP cwd)`
12
+ : ctx.worktreePath
13
+ ? `作業 worktree: ${ctx.worktreePath}`
14
+ : null,
13
15
  '- 自分の立場: conductor 配下の実作業者。Issue / PR 上の記録も成果物',
14
16
  '- 届く prompt の種類: **init prompt**(本 prompt・attach 用・待機が目的)と **instruction**(conductor からの本番作業指示)',
15
17
  '- セッションに attach 済み。conductor からの作業指示(次の session/prompt)を待つ',
@@ -26,6 +28,7 @@ export function buildWorkerAttachPrompt(options) {
26
28
  return renderCompiledPrompt(compile(module, {
27
29
  ...ensembleContext(options.kind, options.issueUrl, options.sessionState),
28
30
  worktreePath: options.worktreePath,
31
+ workspacePath: options.workspacePath,
29
32
  worktreeInRepo: options.worktreeInRepo,
30
33
  }));
31
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"build-worker-attach-prompt.js","sourceRoot":"","sources":["../../src/prompt/build-worker-attach-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAWnE,MAAM,kBAAkB,GAAwC;IAC9D,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,cAAc;YAChB,CAAC,CAAC,sEAAsE;YACxE,CAAC,CAAC,GAAG,CAAC,YAAY;gBAChB,CAAC,CAAC,gBAAgB,GAAG,CAAC,YAAY,EAAE;gBACpC,CAAC,CAAC,IAAI;QACZ,gDAAgD;QAChD,iGAAiG;QACjG,4DAA4D;QAC5D,+DAA+D;KAChE;CACF,CAAC;AAEF,0EAA0E;AAC1E,MAAM,UAAU,uBAAuB,CACrC,OAAkC;IAElC,MAAM,aAAa,GAAG,mBAAmB,CAAC;QACxC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS;KAC1C,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,KAAK,CAAC,uBAAuB,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACjF,OAAO,oBAAoB,CACzB,OAAO,CAAC,MAAM,EAAE;QACd,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC;QACxE,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,cAAc,EAAE,OAAO,CAAC,cAAc;KACvC,CAAC,CACH,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"build-worker-attach-prompt.js","sourceRoot":"","sources":["../../src/prompt/build-worker-attach-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAYnE,MAAM,kBAAkB,GAAwC;IAC9D,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,cAAc;YAChB,CAAC,CAAC,sEAAsE;YACxE,CAAC,CAAC,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,KAAK,GAAG,CAAC,YAAY;gBAC3D,CAAC,CAAC,aAAa,GAAG,CAAC,aAAa,+BAA+B;gBAC/D,CAAC,CAAC,GAAG,CAAC,YAAY;oBAChB,CAAC,CAAC,gBAAgB,GAAG,CAAC,YAAY,EAAE;oBACpC,CAAC,CAAC,IAAI;QACd,gDAAgD;QAChD,iGAAiG;QACjG,4DAA4D;QAC5D,+DAA+D;KAChE;CACF,CAAC;AAEF,0EAA0E;AAC1E,MAAM,UAAU,uBAAuB,CACrC,OAAkC;IAElC,MAAM,aAAa,GAAG,mBAAmB,CAAC;QACxC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS;KAC1C,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,KAAK,CAAC,uBAAuB,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACjF,OAAO,oBAAoB,CACzB,OAAO,CAAC,MAAM,EAAE;QACd,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC;QACxE,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,cAAc,EAAE,OAAO,CAAC,cAAc;KACvC,CAAC,CACH,CAAC;AACJ,CAAC"}
@@ -8,6 +8,7 @@ export interface EnsembleContext extends EnsembleSessionState {
8
8
  /** worker dispatch 時に instructions へ載せる実行時データ。 */
9
9
  export type WorkerDispatchContext = EnsembleContext & {
10
10
  worktreePath?: string;
11
+ workspacePath?: string;
11
12
  worktreeInRepo?: boolean;
12
13
  };
13
14
  export declare function ensembleContext(kind: string, issueUrl: string, session: EnsembleSessionState): EnsembleContext;
@@ -1 +1 @@
1
- {"version":3,"file":"kind.d.ts","sourceRoot":"","sources":["../../../src/prompt/contexts/kind.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,gDAAgD;AAChD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,kDAAkD;AAClD,MAAM,MAAM,qBAAqB,GAAG,eAAe,GAAG;IACpD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,oBAAoB,GAC5B,eAAe,CASjB"}
1
+ {"version":3,"file":"kind.d.ts","sourceRoot":"","sources":["../../../src/prompt/contexts/kind.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,gDAAgD;AAChD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,kDAAkD;AAClD,MAAM,MAAM,qBAAqB,GAAG,eAAe,GAAG;IACpD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,oBAAoB,GAC5B,eAAe,CASjB"}
@@ -1 +1 @@
1
- {"version":3,"file":"kind.js","sourceRoot":"","sources":["../../../src/prompt/contexts/kind.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAgBzD,MAAM,UAAU,eAAe,CAC7B,IAAY,EACZ,QAAgB,EAChB,OAA6B;IAE7B,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACpC,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,GAAG,CAAC,GAAG;QACjB,WAAW,EAAE,GAAG,CAAC,MAAM;QACvB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"kind.js","sourceRoot":"","sources":["../../../src/prompt/contexts/kind.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAiBzD,MAAM,UAAU,eAAe,CAC7B,IAAY,EACZ,QAAgB,EAChB,OAA6B;IAE7B,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACpC,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,GAAG,CAAC,GAAG;QACjB,WAAW,EAAE,GAAG,CAAC,MAAM;QACvB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC;AACJ,CAAC"}
@@ -4,18 +4,18 @@
4
4
  */
5
5
  export const conductorBaseModule = {
6
6
  objective: [
7
- '作業フローの連鎖(Issue の明確さ → worker の自律実行 → オペレータのゲート)が途切れないよう調整する。',
8
- 'Issue / PR を正本とし、`prompt_worker` で常駐 worker に作業を指示する。',
7
+ '- チーム全体を統合し、Issue 解決を目指してください',
8
+ '- conductor は演奏しない(ファイル編集・シェル実行・直接実装はしない)',
9
9
  ],
10
10
  terms: [
11
11
  '- **open question**: conductor がオペレータの最終判断を仰ぐために登録する質問',
12
12
  '- **セッションイベント**: worker の完了・失敗・permission 待ちなど、実行時に conductor へ届く通知',
13
- '- **harness**: オペレータ、conductor、workerを繋いでいる定型処理のプログラム部分',
13
+ '- **harness**: オペレータ、conductor、worker を繋いでいる定型処理のプログラム部分',
14
14
  ],
15
15
  instructions: [
16
- '- conductorは演奏しない(ファイル編集・シェル実行・直接実装はしない)',
17
- '- チーム全体を統合し、issue解決を目指してください',
18
- '- チーム内の出来事を非同期で処理する必要があります。Awaitツールは使わないようにしてください',
16
+ '- 作業フローの連鎖(Issue の明確さ → worker の自律実行 → オペレータのゲート)が途切れないよう調整する。',
17
+ '- Issue / PR を正本とし、`prompt_worker` で常駐 worker に作業を指示する。',
18
+ '- チーム内の出来事を非同期で処理する必要があります。`Await` ツールは使わないようにしてください',
19
19
  {
20
20
  type: 'subsection',
21
21
  title: 'harnessからのイベント',
@@ -1 +1 @@
1
- {"version":3,"file":"conductor-base-module.js","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/conductor-base-module.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAkC;IAChE,SAAS,EAAE;QACT,8DAA8D;QAC9D,uDAAuD;KACxD;IACD,KAAK,EAAE;QACL,wDAAwD;QACxD,qEAAqE;QACrE,yDAAyD;KAC1D;IACD,YAAY,EAAE;QACZ,0CAA0C;QAC1C,8BAA8B;QAC9B,mDAAmD;QACnD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,gBAAgB;YACvB,KAAK,EAAE;gBACL,mCAAmC;gBACnC,wCAAwC;gBACxC,wCAAwC;gBACxC,kKAAkK;gBAClK,2CAA2C;aAC5C;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,qBAAqB;YAC5B,KAAK,EAAE;gBACL,sDAAsD;gBACtD,gFAAgF;gBAChF,gDAAgD;gBAChD,mFAAmF;aACpF;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,gDAAgD;gBAChD,2CAA2C;gBAC3C,oCAAoC;gBACpC,2EAA2E;gBAC3E,qDAAqD;gBACrD,2BAA2B;aAC5B;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,iGAAiG;gBACjG,yEAAyE;gBACzE,iEAAiE;gBACjE,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE;gBACL,8FAA8F;gBAC9F,uEAAuE;gBACvE,8DAA8D;gBAC9D,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE;gBACL,+CAA+C;gBAC/C,8CAA8C;gBAC9C,yCAAyC;gBACzC,iCAAiC;gBACjC,uDAAuD;aACxD;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,wCAAwC;gBACxC,qDAAqD;gBACrD,+BAA+B;gBAC/B,qDAAqD;gBACrD,0DAA0D;aAC3D;SACF;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"conductor-base-module.js","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/conductor-base-module.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAkC;IAChE,SAAS,EAAE;QACT,+BAA+B;QAC/B,2CAA2C;KAC5C;IACD,KAAK,EAAE;QACL,wDAAwD;QACxD,qEAAqE;QACrE,0DAA0D;KAC3D;IACD,YAAY,EAAE;QACZ,gEAAgE;QAChE,yDAAyD;QACzD,sDAAsD;QACtD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,gBAAgB;YACvB,KAAK,EAAE;gBACL,mCAAmC;gBACnC,wCAAwC;gBACxC,wCAAwC;gBACxC,kKAAkK;gBAClK,2CAA2C;aAC5C;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,qBAAqB;YAC5B,KAAK,EAAE;gBACL,sDAAsD;gBACtD,gFAAgF;gBAChF,gDAAgD;gBAChD,mFAAmF;aACpF;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,gDAAgD;gBAChD,2CAA2C;gBAC3C,oCAAoC;gBACpC,2EAA2E;gBAC3E,qDAAqD;gBACrD,2BAA2B;aAC5B;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,iGAAiG;gBACjG,yEAAyE;gBACzE,iEAAiE;gBACjE,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE;gBACL,8FAA8F;gBAC9F,uEAAuE;gBACvE,8DAA8D;gBAC9D,2DAA2D;aAC5D;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE;gBACL,+CAA+C;gBAC/C,8CAA8C;gBAC9C,yCAAyC;gBACzC,iCAAiC;gBACjC,uDAAuD;aACxD;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,wCAAwC;gBACxC,qDAAqD;gBACrD,+BAA+B;gBAC/B,qDAAqD;gBACrD,0DAA0D;aAC3D;SACF;KACF;CACF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"worker-base-module.d.ts","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/worker-base-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,eAAe,CAW1D,CAAC"}
1
+ {"version":3,"file":"worker-base-module.d.ts","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/worker-base-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,eAAe,CAU1D,CAAC"}
@@ -4,14 +4,13 @@
4
4
  */
5
5
  export const workerBaseModule = {
6
6
  objective: [
7
- 'セッション開始時に起動し、conductor からの作業指示を待つ。',
7
+ '- 作業者としてチームに貢献する',
8
8
  ],
9
9
  instructions: [
10
- '- 作業指示が届いたら Issue / PR を正本として動く',
11
- '- 起動後はconductorからの明示的な作業指示のメッセージが来るまで待機すること',
10
+ '- セッション開始時に起動し、conductor からの作業指示を待つ。明示的な作業指示のメッセージが来るまで待機すること',
11
+ '- 手順の細部は Skill(指示があれば)と Issue / PR を正本にする',
12
12
  '- 気づき・違和感・未解決は解決できなくても Issue に残す',
13
13
  '- 操作の許可が必要なときは harness 経由で permission を要求する',
14
- '- 手順の細部は Skill(指示があれば)と Issue / PR を正本にする',
15
14
  ],
16
15
  };
17
16
  //# sourceMappingURL=worker-base-module.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker-base-module.js","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/worker-base-module.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAkC;IAC7D,SAAS,EAAE;QACT,oCAAoC;KACrC;IACD,YAAY,EAAE;QACZ,iCAAiC;QACjC,6CAA6C;QAC7C,kCAAkC;QAClC,6CAA6C;QAC7C,2CAA2C;KAC5C;CACF,CAAC"}
1
+ {"version":3,"file":"worker-base-module.js","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/worker-base-module.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAkC;IAC7D,SAAS,EAAE;QACT,kBAAkB;KACnB;IACD,YAAY,EAAE;QACZ,+DAA+D;QAC/D,2CAA2C;QAC3C,kCAAkC;QAClC,6CAA6C;KAC9C;CACF,CAAC"}
@@ -11,6 +11,8 @@ export interface WorkerStartParams {
11
11
  issueUrl: string;
12
12
  worktree: WorktreeRef;
13
13
  sessionState: EnsembleSessionState;
14
+ resolvedWorkspacePath?: string;
15
+ expectedResumeAcpCwd?: string;
14
16
  resumeAcpSessionId?: string;
15
17
  }
16
18
  export interface WorkerStartedInfo extends WorkerStartParams {
@@ -56,6 +58,8 @@ export interface WorkerAcpUpdateTelemetry {
56
58
  kind: string;
57
59
  sessionUpdate: string;
58
60
  sessionId?: string;
61
+ /** `tool_call` / `tool_call_update` 時の tool 名(あれば)。 */
62
+ toolName?: string;
59
63
  }
60
64
  export interface WorkerStateTelemetry {
61
65
  workerId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/runtime/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,WAAW,CAAC;IACtB,YAAY,EAAE,oBAAoB,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,YAAY,GACpB;IACE,IAAI,EAAE,oBAAoB,CAAC;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,oBAAoB,CAAC;CAC9B,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5E,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC1C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,oBAAoB,EAAE,kBAAkB,CAAC;CACxD"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/runtime/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,WAAW,CAAC;IACtB,YAAY,EAAE,oBAAoB,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,YAAY,GACpB;IACE,IAAI,EAAE,oBAAoB,CAAC;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,oBAAoB,CAAC;CAC9B,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5E,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC1C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,oBAAoB,EAAE,kBAAkB,CAAC;CACxD"}
@@ -7,6 +7,8 @@ import type { WorkerPromptTelemetry, WorkerAcpUpdateTelemetry, WorkerStateTeleme
7
7
  import type { WorkerStatusDetail, WorkerStatusSummary } from './worker-status.js';
8
8
  export interface WorkerRuntimeOptions {
9
9
  inbox: ConductorInbox;
10
+ /** harness 表示で workspace パスを repo 相対に要約する際の基準。 */
11
+ repoRoot?: string;
10
12
  connectAcp?: ConnectWorkerAcpFn;
11
13
  spawn?: SpawnAcpProcessOptions;
12
14
  /** integration の共有 bridge 注入時は false。 */
@@ -43,9 +45,15 @@ export declare class WorkerRuntime {
43
45
  /** 常駐 worker へ user メッセージ(ACP `session/prompt`)を送る。busy 時はキュー、preempt 時は割り込み。 */
44
46
  sendWorkerMessage(name: string, instruction: string, options?: SendWorkerMessageOptions): SendWorkerMessageResult;
45
47
  waitForIdle(): Promise<void>;
48
+ /** 進行中の全 resident prompt を `session/cancel` する(明示 exit 用)。 */
49
+ cancelAllActivePrompts(): void;
46
50
  /** ensemble 終了時に全 resident の ACP 接続を閉じる。 */
47
- shutdown(): Promise<void>;
51
+ shutdown(options?: {
52
+ force?: boolean;
53
+ }): Promise<void>;
54
+ private resolveIdleWaiters;
48
55
  private summarizeWorkerStatus;
56
+ private summarizeAcpCwd;
49
57
  private emitPromptTelemetry;
50
58
  private emitWorkerState;
51
59
  private emitAcpUpdate;
@@ -1 +1 @@
1
- {"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACxB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,cAAc,CAAC;IACtB,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,sBAAsB,CAAC;IAC/B,yCAAyC;IACzC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAC3D,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACxD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;CACvD;AA0BD,qBAAa,aAAa;IAQZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAPpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwC;IACnE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqC;IAC/D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IACjE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IACvD,OAAO,CAAC,cAAc,CAAK;gBAEE,OAAO,EAAE,oBAAoB;IAE1D,oDAAoD;IACpD,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,0BAA0B;IAC1B,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,oDAAoD;IACpD,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,YAAY,IAAI,cAAc,EAAE;IAIhC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAIrD,WAAW,IAAI,iBAAiB,EAAE;IAIlC,qDAAqD;IACrD,kBAAkB,IAAI,mBAAmB,EAAE;IAS3C,+CAA+C;IAC/C,yCAAyC;IACzC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IA4BxD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAgC7D,KAAK,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;IAOxC,iFAAiF;IACjF,iBAAiB,CACf,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,wBAAwB,GACjC,uBAAuB;IA0CpB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAOlC,4CAA4C;IACtC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ/B,OAAO,CAAC,qBAAqB;IAqC7B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,aAAa;YAcP,aAAa;YA6Fb,YAAY;IA+F1B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,kBAAkB;CAQ3B"}
1
+ {"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACxB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,cAAc,CAAC;IACtB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,sBAAsB,CAAC;IAC/B,yCAAyC;IACzC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAC3D,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACxD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;CACvD;AA0BD,qBAAa,aAAa;IAQZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAPpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwC;IACnE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqC;IAC/D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IACjE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IACvD,OAAO,CAAC,cAAc,CAAK;gBAEE,OAAO,EAAE,oBAAoB;IAE1D,oDAAoD;IACpD,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,0BAA0B;IAC1B,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,oDAAoD;IACpD,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,YAAY,IAAI,cAAc,EAAE;IAIhC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAIrD,WAAW,IAAI,iBAAiB,EAAE;IAIlC,qDAAqD;IACrD,kBAAkB,IAAI,mBAAmB,EAAE;IAS3C,+CAA+C;IAC/C,yCAAyC;IACzC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IA4BxD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAgC7D,KAAK,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;IAOxC,iFAAiF;IACjF,iBAAiB,CACf,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,wBAAwB,GACjC,uBAAuB;IA0CpB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAOlC,8DAA8D;IAC9D,sBAAsB,IAAI,IAAI;IAS9B,4CAA4C;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5D,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,qBAAqB;IAsC7B,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,aAAa;YAgBP,aAAa;YAiGb,YAAY;IAiG1B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,kBAAkB;CAK3B"}
@@ -1,6 +1,8 @@
1
1
  import { randomUUID } from 'node:crypto';
2
+ import { extractAcpToolName } from '../acp/extract-acp-tool-name.js';
2
3
  import { attachWorker, buildWorkerAttachPrompt, runAttachedWorkerPrompt, } from '../dispatch/attach-worker.js';
3
4
  import { cancelWorkerAcpPrompt, closeWorkerAcpSession, } from '../dispatch/worker-acp-session.js';
5
+ import { summarizeWorkspacePath } from '../profile/resolve-worker-workspace.js';
4
6
  export class WorkerRuntime {
5
7
  options;
6
8
  processing = new Map();
@@ -144,14 +146,37 @@ export class WorkerRuntime {
144
146
  this.idleResolvers.add(resolve);
145
147
  });
146
148
  }
149
+ /** 進行中の全 resident prompt を `session/cancel` する(明示 exit 用)。 */
150
+ cancelAllActivePrompts() {
151
+ for (const resident of this.residents.values()) {
152
+ if (resident.state === 'processing' && !resident.cancelInFlight) {
153
+ resident.cancelInFlight = true;
154
+ cancelWorkerAcpPrompt(resident.attached.session);
155
+ }
156
+ }
157
+ }
147
158
  /** ensemble 終了時に全 resident の ACP 接続を閉じる。 */
148
- async shutdown() {
159
+ async shutdown(options) {
160
+ if (options?.force) {
161
+ this.cancelAllActivePrompts();
162
+ const residents = [...this.residents.values()];
163
+ await Promise.all(residents.map((resident) => closeWorkerAcpSession(resident.attached.session)));
164
+ this.residents.clear();
165
+ this.resolveIdleWaiters();
166
+ return;
167
+ }
149
168
  await this.waitForIdle();
150
169
  for (const resident of this.residents.values()) {
151
170
  await closeWorkerAcpSession(resident.attached.session);
152
171
  }
153
172
  this.residents.clear();
154
173
  }
174
+ resolveIdleWaiters() {
175
+ for (const resolve of this.idleResolvers) {
176
+ resolve();
177
+ }
178
+ this.idleResolvers.clear();
179
+ }
155
180
  summarizeWorkerStatus(name) {
156
181
  const failed = this.failedWorkers.get(name);
157
182
  if (failed) {
@@ -182,22 +207,30 @@ export class WorkerRuntime {
182
207
  state: resident.state === 'processing' ? 'processing' : 'idle',
183
208
  queueDepth: resident.queue.length,
184
209
  worktreePath: resident.started.worktree.path,
210
+ workspacePath: this.summarizeAcpCwd(resident.attached.session.acpCwd),
185
211
  acpSessionId: resident.attached.session.sessionId,
186
212
  };
187
213
  }
214
+ summarizeAcpCwd(acpCwd) {
215
+ if (this.options.repoRoot) {
216
+ return summarizeWorkspacePath(acpCwd, this.options.repoRoot);
217
+ }
218
+ return acpCwd;
219
+ }
188
220
  emitPromptTelemetry(event) {
189
221
  this.options.onPromptTelemetry?.(event);
190
222
  }
191
223
  emitWorkerState(workerId, name, kind, state) {
192
224
  this.options.onWorkerState?.({ workerId, name, kind, state });
193
225
  }
194
- emitAcpUpdate(resident, sessionUpdate, sessionId) {
226
+ emitAcpUpdate(resident, sessionUpdate, sessionId, toolName) {
195
227
  this.options.onAcpUpdate?.({
196
228
  workerId: resident.workerId,
197
229
  name: resident.started.name,
198
230
  kind: resident.started.kind,
199
231
  sessionUpdate,
200
232
  sessionId,
233
+ ...(toolName ? { toolName } : {}),
201
234
  });
202
235
  }
203
236
  async attachAndInit(started) {
@@ -223,6 +256,8 @@ export class WorkerRuntime {
223
256
  prompt: started.prompt,
224
257
  worktree: started.worktree,
225
258
  sessionState: started.sessionState,
259
+ resolvedWorkspacePath: started.resolvedWorkspacePath,
260
+ expectedResumeAcpCwd: started.expectedResumeAcpCwd,
226
261
  resumeAcpSessionId: started.resumeAcpSessionId,
227
262
  connectAcp: this.options.connectAcp,
228
263
  spawn: this.options.spawn,
@@ -246,6 +281,8 @@ export class WorkerRuntime {
246
281
  prompt: started.prompt,
247
282
  worktree: started.worktree,
248
283
  sessionState: started.sessionState,
284
+ resolvedWorkspacePath: started.resolvedWorkspacePath,
285
+ expectedResumeAcpCwd: started.expectedResumeAcpCwd,
249
286
  resumeAcpSessionId: started.resumeAcpSessionId,
250
287
  }, attached.session);
251
288
  await this.executeRound(resident, prompt, 'harness');
@@ -297,7 +334,8 @@ export class WorkerRuntime {
297
334
  onUpdate: (update) => {
298
335
  const sessionUpdate = update.update?.sessionUpdate;
299
336
  if (typeof sessionUpdate === 'string' && sessionUpdate.length > 0) {
300
- this.emitAcpUpdate(resident, sessionUpdate, update.sessionId);
337
+ const toolName = extractAcpToolName(update.update);
338
+ this.emitAcpUpdate(resident, sessionUpdate, update.sessionId, toolName);
301
339
  }
302
340
  },
303
341
  });
@@ -356,10 +394,7 @@ export class WorkerRuntime {
356
394
  }
357
395
  resolveIdleIfReady() {
358
396
  if (this.processing.size === 0 && this.attachInFlight === 0) {
359
- for (const resolve of this.idleResolvers) {
360
- resolve();
361
- }
362
- this.idleResolvers.clear();
397
+ this.resolveIdleWaiters();
363
398
  }
364
399
  }
365
400
  }
@@ -1 +1 @@
1
- {"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../../src/runtime/worker-runtime.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../../src/runtime/worker-runtime.ts"],"names":[],"mappings":"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"}
@@ -15,10 +15,14 @@ export interface WorkerSessionOptions {
15
15
  issueUrl: string;
16
16
  /** Conductor が worker 起動前に resolve した作業ディレクトリ(worker ありのとき必須)。 */
17
17
  worktree?: WorktreeRef;
18
+ repoRoot?: string;
18
19
  workers: SessionWorkerSpec[];
19
20
  sessionState: EnsembleSessionState;
20
- /** resume 時に復元する worker 名 → ACP session id。 */
21
- restoredWorkerSessions?: Record<string, string>;
21
+ /** resume 時に復元する worker 名 → ACP session 情報。 */
22
+ restoredWorkerSessions?: Record<string, string | {
23
+ acpSessionId: string;
24
+ acpCwd?: string;
25
+ }>;
22
26
  connectAcp?: ConnectWorkerAcpFn;
23
27
  spawn?: SpawnAcpProcessOptions;
24
28
  /** integration の共有 bridge 注入時は false(既定 true)。 */
@@ -50,6 +54,8 @@ export declare class WorkerSession {
50
54
  bootstrap(): void;
51
55
  /** 常駐 worker へ作業指示を送る(`session/prompt`)。 */
52
56
  sendWorkerMessage(name: string, instruction: string, options?: SendWorkerMessageOptions): SendWorkerMessageResult;
53
- stop(): Promise<void>;
57
+ stop(options?: {
58
+ force?: boolean;
59
+ }): Promise<void>;
54
60
  }
55
61
  //# sourceMappingURL=worker-session.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,YAAY,EAAE,oBAAoB,CAAC;IACnC,+CAA+C;IAC/C,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,sBAAsB,CAAC;IAC/B,kDAAkD;IAClD,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,gBAAgB,CAAC,EAAE,CACjB,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,KACd,kBAAkB,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IACpE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC3D,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACxD,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAChF,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAC7E,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,oBAAoB,KAAK,IAAI,CAAC;CAC5E;AAED;;;GAGG;AACH,qBAAa,aAAa;IAOZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,QAAQ,CAAC,KAAK,iBAAwB;IACtC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAEzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAEE,OAAO,EAAE,oBAAoB;IAuC1D,4DAA4D;IAC5D,YAAY,IAAI,IAAI;IAmBpB;;OAEG;IACH,SAAS,IAAI,IAAI;IAIjB,4CAA4C;IAC5C,iBAAiB,CACf,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,wBAAwB,GACjC,uBAAuB;IAIpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAI5B"}
1
+ {"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"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"}
@@ -23,6 +23,7 @@ export class WorkerSession {
23
23
  });
24
24
  this.runtime = new WorkerRuntime({
25
25
  inbox: this.inbox,
26
+ ...(options.repoRoot ? { repoRoot: options.repoRoot } : {}),
26
27
  ...(options.connectAcp ? { connectAcp: options.connectAcp } : {}),
27
28
  ...(options.spawn ? { spawn: options.spawn } : {}),
28
29
  ...(options.ownsWorkerAcpConnections !== undefined
@@ -47,6 +48,9 @@ export class WorkerSession {
47
48
  throw new Error('WorkerSession requires worktree when workers are configured');
48
49
  }
49
50
  for (const worker of this.options.workers) {
51
+ const restored = this.options.restoredWorkerSessions?.[worker.name];
52
+ const resumeAcpSessionId = typeof restored === 'string' ? restored : restored?.acpSessionId;
53
+ const expectedResumeAcpCwd = typeof restored === 'string' ? undefined : restored?.acpCwd;
50
54
  const workerId = this.runtime.start({
51
55
  name: worker.name,
52
56
  issueUrl: this.options.issueUrl,
@@ -54,7 +58,9 @@ export class WorkerSession {
54
58
  prompt: worker.prompt,
55
59
  worktree: this.options.worktree,
56
60
  sessionState: this.options.sessionState,
57
- resumeAcpSessionId: this.options.restoredWorkerSessions?.[worker.name],
61
+ resolvedWorkspacePath: worker.resolvedWorkspacePath,
62
+ expectedResumeAcpCwd,
63
+ resumeAcpSessionId,
58
64
  });
59
65
  this.startedWorkerIds.push(workerId);
60
66
  }
@@ -69,8 +75,8 @@ export class WorkerSession {
69
75
  sendWorkerMessage(name, instruction, options) {
70
76
  return this.runtime.sendWorkerMessage(name, instruction, options);
71
77
  }
72
- async stop() {
73
- await this.runtime.shutdown();
78
+ async stop(options) {
79
+ await this.runtime.shutdown(options);
74
80
  await this.processor.stop();
75
81
  }
76
82
  }
@@ -1 +1 @@
1
- {"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../src/runtime/worker-session.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAqCpD;;;GAGG;AACH,MAAM,OAAO,aAAa;IAOK;IANpB,KAAK,GAAG,IAAI,cAAc,EAAE,CAAC;IAC7B,OAAO,CAAgB;IACvB,gBAAgB,GAAa,EAAE,CAAC;IAExB,SAAS,CAAC;IAE3B,YAA6B,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QACxD,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;QACJ,CAAC;QAED,MAAM,gBAAgB,GACpB,OAAO,CAAC,gBAAgB;YACxB,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;gBAChC,MAAM,OAAO,GAAG,OAAO,CAAC,kBAAmB,CAAC,QAAQ,CAClD,SAAS,EACT,QAAQ,EACR,OAAO,CACR,CAAC;gBACF,OAAO,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;YACjE,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,OAAO,GAAG,IAAI,aAAa,CAAC;YAC/B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,OAAO,CAAC,wBAAwB,KAAK,SAAS;gBAChD,CAAC,CAAC,EAAE,wBAAwB,EAAE,OAAO,CAAC,wBAAwB,EAAE;gBAChE,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,CAAC,iBAAiB;gBAC3B,CAAC,CAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE;gBAClD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3E,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC;YACnC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,gBAAgB;YAChB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,cAAc,EAAE,OAAO,CAAC,cAAc;SACvC,CAAC,CAAC;IACL,CAAC;IAED,4DAA4D;IAC5D,YAAY;QACV,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACjF,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpE,MAAM,kBAAkB,GACtB,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC;YACnE,MAAM,oBAAoB,GACxB,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC;YAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBAClC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAS;gBAChC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;gBACvC,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;gBACnD,oBAAoB;gBACpB,kBAAkB;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,SAAS;QACP,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,4CAA4C;IAC5C,iBAAiB,CACf,IAAY,EACZ,WAAmB,EACnB,OAAkC;QAElC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA6B;QACtC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;CACF"}
@@ -7,6 +7,8 @@ export interface WorkerStatusSummary {
7
7
  state: WorkerLifecycleState;
8
8
  queueDepth: number;
9
9
  worktreePath?: string;
10
+ /** ACP 起動 cwd(要約)。profile `workspace` 指定時は Issue worktree と異なることがある。 */
11
+ workspacePath?: string;
10
12
  acpSessionId?: string;
11
13
  /** attach 失敗時のみ */
12
14
  error?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"worker-status.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,oDAAoD;AACpD,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,oBAAoB,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC"}
1
+ {"version":3,"file":"worker-status.d.ts","sourceRoot":"","sources":["../../src/runtime/worker-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,oDAAoD;AACpD,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,oBAAoB,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC"}
@@ -10,6 +10,8 @@ export declare class SessionSidecarNotFoundError extends Error {
10
10
  }
11
11
  export interface WorkerSessionSidecar {
12
12
  acpSessionId: string;
13
+ /** ACP `session/new` / `session/load` に渡した cwd(resume 検証用)。 */
14
+ acpCwd?: string;
13
15
  }
14
16
  export interface SessionSidecar {
15
17
  version: typeof SESSION_SIDECAR_VERSION;
@@ -1 +1 @@
1
- {"version":3,"file":"session-sidecar.d.ts","sourceRoot":"","sources":["../../src/session/session-sidecar.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,qBAAa,2BAA4B,SAAQ,KAAK;aAIlC,gBAAgB,EAAE,MAAM;aACxB,IAAI,EAAE,MAAM;IAJ9B,QAAQ,CAAC,IAAI,+BAA+B;gBAG1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM;CAO/B;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,uBAAuB,CAAC;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAC9C,0BAA0B;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAE7E;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAQrC;AAED,kDAAkD;AAClD,wBAAsB,8BAA8B,CAAC,KAAK,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,cAAc,CAAC,CAO1B;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CAiB3B;AAED,oDAAoD;AACpD,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAWrC;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,GACtE,IAAI,CAgBN"}
1
+ {"version":3,"file":"session-sidecar.d.ts","sourceRoot":"","sources":["../../src/session/session-sidecar.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,qBAAa,2BAA4B,SAAQ,KAAK;aAIlC,gBAAgB,EAAE,MAAM;aACxB,IAAI,EAAE,MAAM;IAJ9B,QAAQ,CAAC,IAAI,+BAA+B;gBAG1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM;CAO/B;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,uBAAuB,CAAC;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAC9C,0BAA0B;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAE7E;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAQrC;AAED,kDAAkD;AAClD,wBAAsB,8BAA8B,CAAC,KAAK,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,cAAc,CAAC,CAO1B;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CAiB3B;AAED,oDAAoD;AACpD,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAWrC;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,GACtE,IAAI,CAgBN"}
@@ -131,7 +131,10 @@ function parseSessionSidecar(value) {
131
131
  if (typeof worker.acpSessionId !== 'string') {
132
132
  throw new Error(`Invalid session sidecar worker acpSessionId: ${name}`);
133
133
  }
134
- workers[name] = { acpSessionId: worker.acpSessionId };
134
+ workers[name] = {
135
+ acpSessionId: worker.acpSessionId,
136
+ ...(typeof worker.acpCwd === 'string' ? { acpCwd: worker.acpCwd } : {}),
137
+ };
135
138
  }
136
139
  return {
137
140
  version: SESSION_SIDECAR_VERSION,