@agents-ensemble/core 0.20.0 → 0.22.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.
- package/assets/pi/pi-cli-env-wrapper.cmd +28 -0
- package/assets/pi/pi-cli-env-wrapper.sh +19 -0
- package/assets/pi/settings.json +4 -0
- package/dist/acp/acp-preset-bins.d.ts +3 -3
- package/dist/acp/acp-preset-bins.d.ts.map +1 -1
- package/dist/acp/acp-preset-bins.js +3 -3
- package/dist/acp/acp-preset-bins.js.map +1 -1
- package/dist/acp/index.d.ts +3 -1
- package/dist/acp/index.d.ts.map +1 -1
- package/dist/acp/index.js +2 -1
- package/dist/acp/index.js.map +1 -1
- package/dist/acp/pi-acp-wrapper.d.ts +3 -0
- package/dist/acp/pi-acp-wrapper.d.ts.map +1 -0
- package/dist/acp/pi-acp-wrapper.js +41 -0
- package/dist/acp/pi-acp-wrapper.js.map +1 -0
- package/dist/acp/pi-builtin-config.d.ts +10 -0
- package/dist/acp/pi-builtin-config.d.ts.map +1 -0
- package/dist/acp/pi-builtin-config.js +36 -0
- package/dist/acp/pi-builtin-config.js.map +1 -0
- package/dist/acp/pi-runtime.d.ts +23 -0
- package/dist/acp/pi-runtime.d.ts.map +1 -0
- package/dist/acp/pi-runtime.js +160 -0
- package/dist/acp/pi-runtime.js.map +1 -0
- package/dist/acp/pi-session-map.d.ts +36 -0
- package/dist/acp/pi-session-map.d.ts.map +1 -0
- package/dist/acp/pi-session-map.js +266 -0
- package/dist/acp/pi-session-map.js.map +1 -0
- package/dist/acp/resolve-acp-spawn.d.ts +9 -3
- package/dist/acp/resolve-acp-spawn.d.ts.map +1 -1
- package/dist/acp/resolve-acp-spawn.js +41 -9
- package/dist/acp/resolve-acp-spawn.js.map +1 -1
- package/dist/acp/resolve-bundled-acp-bin.d.ts +2 -2
- package/dist/acp/resolve-bundled-acp-bin.d.ts.map +1 -1
- package/dist/acp/resolve-bundled-acp-bin.js +4 -4
- package/dist/acp/resolve-bundled-acp-bin.js.map +1 -1
- package/dist/acp/validate-acp-preset-prerequisites.d.ts +1 -1
- package/dist/acp/validate-acp-preset-prerequisites.d.ts.map +1 -1
- package/dist/acp/validate-acp-preset-prerequisites.js +30 -10
- package/dist/acp/validate-acp-preset-prerequisites.js.map +1 -1
- package/dist/conductor/conductor-agent.d.ts +15 -3
- package/dist/conductor/conductor-agent.d.ts.map +1 -1
- package/dist/conductor/conductor-auth.d.ts +4 -3
- package/dist/conductor/conductor-auth.d.ts.map +1 -1
- package/dist/conductor/conductor-auth.js +20 -4
- package/dist/conductor/conductor-auth.js.map +1 -1
- package/dist/conductor/conductor-dispatch-lifecycle.d.ts +85 -0
- package/dist/conductor/conductor-dispatch-lifecycle.d.ts.map +1 -0
- package/dist/conductor/conductor-dispatch-lifecycle.js +190 -0
- package/dist/conductor/conductor-dispatch-lifecycle.js.map +1 -0
- package/dist/conductor/conductor-history.d.ts +15 -0
- package/dist/conductor/conductor-history.d.ts.map +1 -1
- package/dist/conductor/conductor-history.js +38 -7
- package/dist/conductor/conductor-history.js.map +1 -1
- package/dist/conductor/conductor-path-safety.d.ts +23 -0
- package/dist/conductor/conductor-path-safety.d.ts.map +1 -0
- package/dist/conductor/conductor-path-safety.js +319 -0
- package/dist/conductor/conductor-path-safety.js.map +1 -0
- package/dist/conductor/conductor-pi-auth.d.ts +57 -2
- package/dist/conductor/conductor-pi-auth.d.ts.map +1 -1
- package/dist/conductor/conductor-pi-auth.js +718 -40
- package/dist/conductor/conductor-pi-auth.js.map +1 -1
- package/dist/conductor/conductor-recovery-inbox.d.ts +73 -0
- package/dist/conductor/conductor-recovery-inbox.d.ts.map +1 -0
- package/dist/conductor/conductor-recovery-inbox.js +181 -0
- package/dist/conductor/conductor-recovery-inbox.js.map +1 -0
- package/dist/conductor/conductor-send-reconnect.d.ts +33 -4
- package/dist/conductor/conductor-send-reconnect.d.ts.map +1 -1
- package/dist/conductor/conductor-send-reconnect.js +89 -24
- package/dist/conductor/conductor-send-reconnect.js.map +1 -1
- package/dist/conductor/conductor-session-driver.d.ts +34 -1
- package/dist/conductor/conductor-session-driver.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.js +529 -75
- package/dist/conductor/conductor-session-driver.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts +4 -0
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +416 -145
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/conductor/conductor-setup.d.ts +30 -0
- package/dist/conductor/conductor-setup.d.ts.map +1 -0
- package/dist/conductor/conductor-setup.js +243 -0
- package/dist/conductor/conductor-setup.js.map +1 -0
- package/dist/conductor/cursor-bootstrap-state.d.ts +9 -0
- package/dist/conductor/cursor-bootstrap-state.d.ts.map +1 -0
- package/dist/conductor/cursor-bootstrap-state.js +11 -0
- package/dist/conductor/cursor-bootstrap-state.js.map +1 -0
- package/dist/conductor/cursor-run-snapshots.d.ts +30 -0
- package/dist/conductor/cursor-run-snapshots.d.ts.map +1 -0
- package/dist/conductor/cursor-run-snapshots.js +120 -0
- package/dist/conductor/cursor-run-snapshots.js.map +1 -0
- package/dist/conductor/index.d.ts +18 -7
- package/dist/conductor/index.d.ts.map +1 -1
- package/dist/conductor/index.js +9 -4
- package/dist/conductor/index.js.map +1 -1
- package/dist/conductor/operator-command.d.ts +5 -0
- package/dist/conductor/operator-command.d.ts.map +1 -1
- package/dist/conductor/operator-command.js +6 -0
- package/dist/conductor/operator-command.js.map +1 -1
- package/dist/conductor/operator-input-binding.d.ts +17 -0
- package/dist/conductor/operator-input-binding.d.ts.map +1 -1
- package/dist/conductor/pi-auth-recovery-snapshot-store.d.ts +45 -0
- package/dist/conductor/pi-auth-recovery-snapshot-store.d.ts.map +1 -0
- package/dist/conductor/pi-auth-recovery-snapshot-store.js +116 -0
- package/dist/conductor/pi-auth-recovery-snapshot-store.js.map +1 -0
- package/dist/conductor/pi-conductor-agent.d.ts +6 -3
- package/dist/conductor/pi-conductor-agent.d.ts.map +1 -1
- package/dist/conductor/pi-conductor-agent.js +276 -53
- package/dist/conductor/pi-conductor-agent.js.map +1 -1
- package/dist/conductor/pi-conductor-session-file.d.ts +13 -0
- package/dist/conductor/pi-conductor-session-file.d.ts.map +1 -0
- package/dist/conductor/pi-conductor-session-file.js +21 -0
- package/dist/conductor/pi-conductor-session-file.js.map +1 -0
- package/dist/conductor/pi-resource-loader.d.ts +6 -0
- package/dist/conductor/pi-resource-loader.d.ts.map +1 -1
- package/dist/conductor/pi-resource-loader.js +26 -12
- package/dist/conductor/pi-resource-loader.js.map +1 -1
- package/dist/conductor/pi-user-root-lock.d.ts +8 -0
- package/dist/conductor/pi-user-root-lock.d.ts.map +1 -0
- package/dist/conductor/pi-user-root-lock.js +53 -0
- package/dist/conductor/pi-user-root-lock.js.map +1 -0
- package/dist/conductor/recovery-inbox-command.d.ts +29 -0
- package/dist/conductor/recovery-inbox-command.d.ts.map +1 -0
- package/dist/conductor/recovery-inbox-command.js +248 -0
- package/dist/conductor/recovery-inbox-command.js.map +1 -0
- package/dist/conductor/session/events/index.d.ts +1 -1
- package/dist/conductor/session/events/index.d.ts.map +1 -1
- package/dist/conductor/session/events/index.js.map +1 -1
- package/dist/conductor/session/events/session-event.d.ts +43 -1
- package/dist/conductor/session/events/session-event.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.d.ts +1 -1
- package/dist/conductor/session/events/session-log-event-groups.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.js +2 -0
- package/dist/conductor/session/events/session-log-event-groups.js.map +1 -1
- package/dist/conductor/session/events/session-log-event.d.ts +4 -0
- package/dist/conductor/session/events/session-log-event.d.ts.map +1 -1
- package/dist/conductor/session/format-session-event.js +57 -5
- package/dist/conductor/session/format-session-event.js.map +1 -1
- package/dist/conductor/session/select-dispatch-batch.d.ts +2 -0
- package/dist/conductor/session/select-dispatch-batch.d.ts.map +1 -1
- package/dist/conductor/session/select-dispatch-batch.js +36 -2
- package/dist/conductor/session/select-dispatch-batch.js.map +1 -1
- package/dist/conductor/session/session-event-queue.d.ts +14 -0
- package/dist/conductor/session/session-event-queue.d.ts.map +1 -1
- package/dist/conductor/session/session-event-queue.js +82 -10
- package/dist/conductor/session/session-event-queue.js.map +1 -1
- package/dist/conductor/session/session-event.d.ts +1 -1
- package/dist/conductor/session/session-event.d.ts.map +1 -1
- package/dist/conductor/session-policy.d.ts.map +1 -1
- package/dist/conductor/session-policy.js +8 -4
- package/dist/conductor/session-policy.js.map +1 -1
- package/dist/conductor/submit-operator-input.d.ts +3 -0
- package/dist/conductor/submit-operator-input.d.ts.map +1 -1
- package/dist/conductor/submit-operator-input.js +21 -0
- package/dist/conductor/submit-operator-input.js.map +1 -1
- package/dist/config/deep-merge.d.ts.map +1 -1
- package/dist/config/deep-merge.js +13 -3
- package/dist/config/deep-merge.js.map +1 -1
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +1 -1
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/doctor-settings.d.ts +59 -0
- package/dist/config/doctor-settings.d.ts.map +1 -0
- package/dist/config/doctor-settings.js +343 -0
- package/dist/config/doctor-settings.js.map +1 -0
- package/dist/config/ensemble-config-digest.d.ts +2 -4
- package/dist/config/ensemble-config-digest.d.ts.map +1 -1
- package/dist/config/ensemble-config-digest.js +2 -4
- package/dist/config/ensemble-config-digest.js.map +1 -1
- package/dist/config/index.d.ts +3 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/load-ensemble-config.d.ts.map +1 -1
- package/dist/config/load-ensemble-config.js +8 -1
- package/dist/config/load-ensemble-config.js.map +1 -1
- package/dist/config/parse-config.d.ts.map +1 -1
- package/dist/config/parse-config.js +34 -14
- package/dist/config/parse-config.js.map +1 -1
- package/dist/config/resolve-settings.d.ts +3 -1
- package/dist/config/resolve-settings.d.ts.map +1 -1
- package/dist/config/resolve-settings.js +7 -4
- package/dist/config/resolve-settings.js.map +1 -1
- package/dist/config/types.d.ts +14 -5
- package/dist/config/types.d.ts.map +1 -1
- package/dist/dispatch/attach-worker.js +1 -1
- package/dist/dispatch/attach-worker.js.map +1 -1
- package/dist/dispatch/worker-acp-session.d.ts +21 -3
- package/dist/dispatch/worker-acp-session.d.ts.map +1 -1
- package/dist/dispatch/worker-acp-session.js +50 -13
- package/dist/dispatch/worker-acp-session.js.map +1 -1
- package/dist/ensemble-paths.d.ts +19 -19
- package/dist/ensemble-paths.d.ts.map +1 -1
- package/dist/ensemble-paths.js +40 -22
- package/dist/ensemble-paths.js.map +1 -1
- package/dist/issue/resolve-issue-url.d.ts +4 -0
- package/dist/issue/resolve-issue-url.d.ts.map +1 -1
- package/dist/issue/resolve-issue-url.js +2 -2
- package/dist/issue/resolve-issue-url.js.map +1 -1
- package/dist/operator-runtime.d.ts +19 -4
- package/dist/operator-runtime.d.ts.map +1 -1
- package/dist/operator-runtime.js +13 -2
- package/dist/operator-runtime.js.map +1 -1
- package/dist/profile/types.d.ts +4 -0
- package/dist/profile/types.d.ts.map +1 -1
- package/dist/profile/types.js +29 -12
- package/dist/profile/types.js.map +1 -1
- package/dist/representation/escape-terminal-control-characters.d.ts +9 -0
- package/dist/representation/escape-terminal-control-characters.d.ts.map +1 -0
- package/dist/representation/escape-terminal-control-characters.js +34 -0
- package/dist/representation/escape-terminal-control-characters.js.map +1 -0
- package/dist/representation/index.d.ts +1 -0
- package/dist/representation/index.d.ts.map +1 -1
- package/dist/representation/index.js +1 -0
- package/dist/representation/index.js.map +1 -1
- package/dist/runtime/types.d.ts +9 -0
- package/dist/runtime/types.d.ts.map +1 -1
- package/dist/runtime/worker-runtime.d.ts +14 -1
- package/dist/runtime/worker-runtime.d.ts.map +1 -1
- package/dist/runtime/worker-runtime.js +197 -50
- package/dist/runtime/worker-runtime.js.map +1 -1
- package/dist/runtime/worker-session.d.ts +2 -1
- package/dist/runtime/worker-session.d.ts.map +1 -1
- package/dist/runtime/worker-session.js +1 -0
- package/dist/runtime/worker-session.js.map +1 -1
- package/dist/session/export-session-bundle.d.ts +77 -0
- package/dist/session/export-session-bundle.d.ts.map +1 -0
- package/dist/session/export-session-bundle.js +640 -0
- package/dist/session/export-session-bundle.js.map +1 -0
- package/dist/session/index.d.ts +6 -3
- package/dist/session/index.d.ts.map +1 -1
- package/dist/session/index.js +4 -1
- package/dist/session/index.js.map +1 -1
- package/dist/session/open-question-control.d.ts +9 -0
- package/dist/session/open-question-control.d.ts.map +1 -1
- package/dist/session/open-question-control.js +26 -1
- package/dist/session/open-question-control.js.map +1 -1
- package/dist/session/open-questions-store.d.ts +1 -1
- package/dist/session/open-questions-store.d.ts.map +1 -1
- package/dist/session/open-questions-store.js +3 -6
- package/dist/session/open-questions-store.js.map +1 -1
- package/dist/session/persisted-file.d.ts +5 -0
- package/dist/session/persisted-file.d.ts.map +1 -0
- package/dist/session/persisted-file.js +56 -0
- package/dist/session/persisted-file.js.map +1 -0
- package/dist/session/session-resume-store.d.ts +79 -10
- package/dist/session/session-resume-store.d.ts.map +1 -1
- package/dist/session/session-resume-store.js +353 -83
- package/dist/session/session-resume-store.js.map +1 -1
- package/dist/session/session-snapshot-paths.d.ts +11 -0
- package/dist/session/session-snapshot-paths.d.ts.map +1 -0
- package/dist/session/session-snapshot-paths.js +41 -0
- package/dist/session/session-snapshot-paths.js.map +1 -0
- package/dist/session/session-state-store.d.ts +2 -2
- package/dist/session/session-state-store.d.ts.map +1 -1
- package/dist/session/session-state-store.js +5 -16
- package/dist/session/session-state-store.js.map +1 -1
- package/dist/session/tool-call-snapshot-history.d.ts +12 -1
- package/dist/session/tool-call-snapshot-history.d.ts.map +1 -1
- package/dist/session/tool-call-snapshot-history.js +75 -70
- package/dist/session/tool-call-snapshot-history.js.map +1 -1
- package/dist/session/worker-session-history.d.ts +51 -0
- package/dist/session/worker-session-history.d.ts.map +1 -0
- package/dist/session/worker-session-history.js +654 -0
- package/dist/session/worker-session-history.js.map +1 -0
- package/dist/workspace/index.d.ts +1 -1
- package/dist/workspace/index.d.ts.map +1 -1
- package/dist/worktree/worktree.d.ts +6 -1
- package/dist/worktree/worktree.d.ts.map +1 -1
- package/dist/worktree/worktree.js +123 -2
- package/dist/worktree/worktree.js.map +1 -1
- package/package.json +9 -4
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { canDispatchConductorSend } from '../session-policy.js';
|
|
2
|
+
import { CONDUCTOR_RECOVERY_INPUT_BYTE_LIMIT } from '../conductor-recovery-inbox.js';
|
|
2
3
|
import { isTriggerSessionEvent, sessionEventDispatchMode, } from './dispatch-mode.js';
|
|
3
4
|
const STATIC_SOURCE_PRIORITY = {
|
|
4
5
|
permission: 0,
|
|
5
6
|
'operator.reconnect': 0,
|
|
6
7
|
'worker.failed': 1,
|
|
8
|
+
'worker.session.recovered': 1,
|
|
7
9
|
'worker.completed': 2,
|
|
8
10
|
github: 3,
|
|
9
11
|
'permission.stall': 4,
|
|
10
12
|
'github.recovered': 5,
|
|
13
|
+
'conductor.recovery.report': 0,
|
|
11
14
|
};
|
|
12
15
|
/** セッションイベントの dispatch ソース key を返す。 */
|
|
13
16
|
export function eventSourceKey(event) {
|
|
@@ -24,10 +27,14 @@ export function eventSourceKey(event) {
|
|
|
24
27
|
return `worker:${event.result.name}`;
|
|
25
28
|
case 'worker.failed':
|
|
26
29
|
return `worker:${event.failure.name}`;
|
|
30
|
+
case 'worker.session.recovered':
|
|
31
|
+
return `worker:${event.name}`;
|
|
27
32
|
case 'github.update':
|
|
28
33
|
return 'github';
|
|
29
34
|
case 'harness.connectivity.recovered':
|
|
30
35
|
return 'github';
|
|
36
|
+
case 'conductor.recovery.report':
|
|
37
|
+
return 'conductor.recovery.report';
|
|
31
38
|
default: {
|
|
32
39
|
const _exhaustive = event;
|
|
33
40
|
return String(_exhaustive);
|
|
@@ -46,12 +53,16 @@ function staticEventPriority(event) {
|
|
|
46
53
|
return STATIC_SOURCE_PRIORITY['permission.stall'];
|
|
47
54
|
case 'worker.failed':
|
|
48
55
|
return STATIC_SOURCE_PRIORITY['worker.failed'];
|
|
56
|
+
case 'worker.session.recovered':
|
|
57
|
+
return STATIC_SOURCE_PRIORITY['worker.session.recovered'];
|
|
49
58
|
case 'worker.completed':
|
|
50
59
|
return STATIC_SOURCE_PRIORITY['worker.completed'];
|
|
51
60
|
case 'github.update':
|
|
52
61
|
return STATIC_SOURCE_PRIORITY.github;
|
|
53
62
|
case 'harness.connectivity.recovered':
|
|
54
63
|
return STATIC_SOURCE_PRIORITY['github.recovered'];
|
|
64
|
+
case 'conductor.recovery.report':
|
|
65
|
+
return STATIC_SOURCE_PRIORITY['conductor.recovery.report'];
|
|
55
66
|
default:
|
|
56
67
|
return Number.MAX_SAFE_INTEGER;
|
|
57
68
|
}
|
|
@@ -105,7 +116,7 @@ function canUseWorkerContinuation(state, eligibleKeys) {
|
|
|
105
116
|
* dispatch 可能なイベントが無ければ undefined。
|
|
106
117
|
*/
|
|
107
118
|
export function selectDispatchBatch(input) {
|
|
108
|
-
const { queue, state, autonomousTurns, maxTurns, allowIdleOperatorMessages = true, } = input;
|
|
119
|
+
const { queue, state, autonomousTurns, maxTurns, allowIdleOperatorMessages = true, maxOperatorInputBytes, } = input;
|
|
109
120
|
const eligible = queue.filter((event) => isDispatchable(event, autonomousTurns, maxTurns, allowIdleOperatorMessages));
|
|
110
121
|
if (eligible.length === 0) {
|
|
111
122
|
return undefined;
|
|
@@ -124,7 +135,7 @@ export function selectDispatchBatch(input) {
|
|
|
124
135
|
else {
|
|
125
136
|
chosenKey = pickStaticSourceKey(queue, eligible);
|
|
126
137
|
}
|
|
127
|
-
|
|
138
|
+
let batchEvents = queue.filter((event) => {
|
|
128
139
|
if (eventSourceKey(event) !== chosenKey) {
|
|
129
140
|
return false;
|
|
130
141
|
}
|
|
@@ -134,6 +145,29 @@ export function selectDispatchBatch(input) {
|
|
|
134
145
|
return (sessionEventDispatchMode(event) === 'inform' &&
|
|
135
146
|
canDispatchConductorSend(event, autonomousTurns, maxTurns));
|
|
136
147
|
});
|
|
148
|
+
const operatorInputByteLimit = maxOperatorInputBytes ?? CONDUCTOR_RECOVERY_INPUT_BYTE_LIMIT;
|
|
149
|
+
if (chosenKey === 'operator' && operatorInputByteLimit >= 0) {
|
|
150
|
+
const boundedEvents = [];
|
|
151
|
+
let inputBytes = 0;
|
|
152
|
+
for (const event of batchEvents) {
|
|
153
|
+
if (event.type !== 'operator.message')
|
|
154
|
+
break;
|
|
155
|
+
const eventBytes = Buffer.byteLength(event.operatorInput ?? event.text, 'utf8');
|
|
156
|
+
if (eventBytes > operatorInputByteLimit) {
|
|
157
|
+
break;
|
|
158
|
+
}
|
|
159
|
+
if (boundedEvents.length > 0 &&
|
|
160
|
+
inputBytes + eventBytes > operatorInputByteLimit) {
|
|
161
|
+
break;
|
|
162
|
+
}
|
|
163
|
+
boundedEvents.push(event);
|
|
164
|
+
inputBytes += eventBytes;
|
|
165
|
+
}
|
|
166
|
+
batchEvents = boundedEvents;
|
|
167
|
+
}
|
|
168
|
+
if (batchEvents.length === 0) {
|
|
169
|
+
return undefined;
|
|
170
|
+
}
|
|
137
171
|
const batchSet = new Set(batchEvents);
|
|
138
172
|
const remainingQueue = queue.filter((event) => !batchSet.has(event));
|
|
139
173
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select-dispatch-batch.js","sourceRoot":"","sources":["../../../src/conductor/session/select-dispatch-batch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"select-dispatch-batch.js","sourceRoot":"","sources":["../../../src/conductor/session/select-dispatch-batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,19 @@ import type { SessionEvent } from './session-event.js';
|
|
|
2
2
|
/** ConductorSession の単一イベント列(旧 inbox + conductor Queue の統合)。 */
|
|
3
3
|
export declare class SessionEventQueue {
|
|
4
4
|
private readonly queue;
|
|
5
|
+
private readonly changeListeners;
|
|
5
6
|
private readonly waiters;
|
|
6
7
|
get size(): number;
|
|
7
8
|
isEmpty(): boolean;
|
|
8
9
|
enqueue(event: SessionEvent): void;
|
|
9
10
|
dequeue(): SessionEvent | undefined;
|
|
11
|
+
subscribe(listener: () => void): () => void;
|
|
10
12
|
/** キュー内容のスナップショット(到着順)。 */
|
|
11
13
|
snapshot(): SessionEvent[];
|
|
12
14
|
/** キュー全体を置き換える(dispatch 束の除去後など)。 */
|
|
13
15
|
replaceQueue(next: SessionEvent[]): void;
|
|
16
|
+
/** Remove only the selected event objects, preserving events enqueued meanwhile. */
|
|
17
|
+
removeEvents(events: readonly SessionEvent[]): number;
|
|
14
18
|
/**
|
|
15
19
|
* 先頭に挿入する(waiter 経由で取り出したイベントを到着順どおり戻すとき用)。
|
|
16
20
|
* 新しい waiter は起こさない。
|
|
@@ -18,6 +22,8 @@ export declare class SessionEventQueue {
|
|
|
18
22
|
prependSilent(event: SessionEvent): void;
|
|
19
23
|
/** 述語に合う最初の send イベントを取り出す(キュー順は維持)。 */
|
|
20
24
|
findSendEvent(accept: (event: SessionEvent) => boolean): SessionEvent | undefined;
|
|
25
|
+
/** 条件に合う send event をすべて取り出し、残りの順序を保つ。 */
|
|
26
|
+
findSendEvents(accept: (event: SessionEvent) => boolean): SessionEvent[];
|
|
21
27
|
/**
|
|
22
28
|
* `accept` に合う send イベントが来るまで待つ。
|
|
23
29
|
* 合わないイベントはキュー末尾へ戻し、到着順を壊さない。
|
|
@@ -31,5 +37,13 @@ export declare class SessionEventQueue {
|
|
|
31
37
|
waitForEvent(signal?: AbortSignal, options?: {
|
|
32
38
|
onlyNew?: boolean;
|
|
33
39
|
}): Promise<SessionEvent>;
|
|
40
|
+
/**
|
|
41
|
+
* 条件に合う event を1件待つ。ほかの queue event は消費・並べ替えしない。
|
|
42
|
+
* これにより conductor が close 済みの間も `/reconnect` を待ちながら、
|
|
43
|
+
* その間に届く message や worker outcome を保持できる。
|
|
44
|
+
*/
|
|
45
|
+
waitForMatchingEvent(accept: (event: SessionEvent) => boolean, signal?: AbortSignal): Promise<SessionEvent>;
|
|
46
|
+
private waitForIncomingEvent;
|
|
47
|
+
private notifyChanged;
|
|
34
48
|
}
|
|
35
49
|
//# sourceMappingURL=session-event-queue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-event-queue.d.ts","sourceRoot":"","sources":["../../../src/conductor/session/session-event-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,gEAAgE;AAChE,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"session-event-queue.d.ts","sourceRoot":"","sources":["../../../src/conductor/session/session-event-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,gEAAgE;AAChE,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAIhB;IAER,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,OAAO,IAAI,OAAO;IAIlB,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAclC,OAAO,IAAI,YAAY,GAAG,SAAS;IAMnC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAK3C,2BAA2B;IAC3B,QAAQ,IAAI,YAAY,EAAE;IAI1B,qCAAqC;IACrC,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,IAAI;IAMxC,oFAAoF;IACpF,YAAY,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM;IAarD;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAKxC,wCAAwC;IACxC,aAAa,CACX,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,GACvC,YAAY,GAAG,SAAS;IAU3B,0CAA0C;IAC1C,cAAc,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,GAAG,YAAY,EAAE;IAUxE;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE;QAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC;QACzC,MAAM,CAAC,EAAE,WAAW,CAAC;KACtB,GAAG,OAAO,CAAC,YAAY,CAAC;IAiBnB,YAAY,CAChB,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAC9B,OAAO,CAAC,YAAY,CAAC;IAaxB;;;;OAIG;IACG,oBAAoB,CACxB,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,EACxC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,CAAC;IAUxB,OAAO,CAAC,oBAAoB;IAuC5B,OAAO,CAAC,aAAa;CAKtB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/** ConductorSession の単一イベント列(旧 inbox + conductor Queue の統合)。 */
|
|
2
2
|
export class SessionEventQueue {
|
|
3
3
|
queue = [];
|
|
4
|
+
changeListeners = new Set();
|
|
4
5
|
waiters = [];
|
|
5
6
|
get size() {
|
|
6
7
|
return this.queue.length;
|
|
@@ -9,15 +10,25 @@ export class SessionEventQueue {
|
|
|
9
10
|
return this.queue.length === 0;
|
|
10
11
|
}
|
|
11
12
|
enqueue(event) {
|
|
12
|
-
const
|
|
13
|
-
if (
|
|
14
|
-
waiter(
|
|
13
|
+
const waiterIndex = this.waiters.findIndex((waiter) => waiter.accept(event));
|
|
14
|
+
if (waiterIndex >= 0) {
|
|
15
|
+
const [waiter] = this.waiters.splice(waiterIndex, 1);
|
|
16
|
+
waiter.resolve(event);
|
|
17
|
+
this.notifyChanged();
|
|
15
18
|
return;
|
|
16
19
|
}
|
|
17
20
|
this.queue.push(event);
|
|
21
|
+
this.notifyChanged();
|
|
18
22
|
}
|
|
19
23
|
dequeue() {
|
|
20
|
-
|
|
24
|
+
const event = this.queue.shift();
|
|
25
|
+
if (event)
|
|
26
|
+
this.notifyChanged();
|
|
27
|
+
return event;
|
|
28
|
+
}
|
|
29
|
+
subscribe(listener) {
|
|
30
|
+
this.changeListeners.add(listener);
|
|
31
|
+
return () => this.changeListeners.delete(listener);
|
|
21
32
|
}
|
|
22
33
|
/** キュー内容のスナップショット(到着順)。 */
|
|
23
34
|
snapshot() {
|
|
@@ -27,6 +38,21 @@ export class SessionEventQueue {
|
|
|
27
38
|
replaceQueue(next) {
|
|
28
39
|
this.queue.length = 0;
|
|
29
40
|
this.queue.push(...next);
|
|
41
|
+
this.notifyChanged();
|
|
42
|
+
}
|
|
43
|
+
/** Remove only the selected event objects, preserving events enqueued meanwhile. */
|
|
44
|
+
removeEvents(events) {
|
|
45
|
+
if (events.length === 0)
|
|
46
|
+
return 0;
|
|
47
|
+
const selected = new Set(events);
|
|
48
|
+
const retained = this.queue.filter((event) => !selected.has(event));
|
|
49
|
+
const removed = this.queue.length - retained.length;
|
|
50
|
+
if (removed > 0) {
|
|
51
|
+
this.queue.length = 0;
|
|
52
|
+
this.queue.push(...retained);
|
|
53
|
+
this.notifyChanged();
|
|
54
|
+
}
|
|
55
|
+
return removed;
|
|
30
56
|
}
|
|
31
57
|
/**
|
|
32
58
|
* 先頭に挿入する(waiter 経由で取り出したイベントを到着順どおり戻すとき用)。
|
|
@@ -34,6 +60,7 @@ export class SessionEventQueue {
|
|
|
34
60
|
*/
|
|
35
61
|
prependSilent(event) {
|
|
36
62
|
this.queue.unshift(event);
|
|
63
|
+
this.notifyChanged();
|
|
37
64
|
}
|
|
38
65
|
/** 述語に合う最初の send イベントを取り出す(キュー順は維持)。 */
|
|
39
66
|
findSendEvent(accept) {
|
|
@@ -41,7 +68,20 @@ export class SessionEventQueue {
|
|
|
41
68
|
if (index < 0) {
|
|
42
69
|
return undefined;
|
|
43
70
|
}
|
|
44
|
-
|
|
71
|
+
const event = this.queue.splice(index, 1)[0];
|
|
72
|
+
this.notifyChanged();
|
|
73
|
+
return event;
|
|
74
|
+
}
|
|
75
|
+
/** 条件に合う send event をすべて取り出し、残りの順序を保つ。 */
|
|
76
|
+
findSendEvents(accept) {
|
|
77
|
+
const matched = [];
|
|
78
|
+
const retained = [];
|
|
79
|
+
for (const event of this.queue) {
|
|
80
|
+
(accept(event) ? matched : retained).push(event);
|
|
81
|
+
}
|
|
82
|
+
if (matched.length > 0)
|
|
83
|
+
this.replaceQueue(retained);
|
|
84
|
+
return matched;
|
|
45
85
|
}
|
|
46
86
|
/**
|
|
47
87
|
* `accept` に合う send イベントが来るまで待つ。
|
|
@@ -74,14 +114,35 @@ export class SessionEventQueue {
|
|
|
74
114
|
if (signal?.aborted) {
|
|
75
115
|
throw new DOMException('Session event wait aborted', 'AbortError');
|
|
76
116
|
}
|
|
117
|
+
return this.waitForIncomingEvent(() => true, signal);
|
|
118
|
+
}
|
|
119
|
+
/**
|
|
120
|
+
* 条件に合う event を1件待つ。ほかの queue event は消費・並べ替えしない。
|
|
121
|
+
* これにより conductor が close 済みの間も `/reconnect` を待ちながら、
|
|
122
|
+
* その間に届く message や worker outcome を保持できる。
|
|
123
|
+
*/
|
|
124
|
+
async waitForMatchingEvent(accept, signal) {
|
|
125
|
+
const index = this.queue.findIndex(accept);
|
|
126
|
+
if (index >= 0) {
|
|
127
|
+
const event = this.queue.splice(index, 1)[0];
|
|
128
|
+
this.notifyChanged();
|
|
129
|
+
return event;
|
|
130
|
+
}
|
|
131
|
+
return this.waitForIncomingEvent(accept, signal);
|
|
132
|
+
}
|
|
133
|
+
waitForIncomingEvent(accept, signal) {
|
|
134
|
+
if (signal?.aborted) {
|
|
135
|
+
return Promise.reject(new DOMException('Session event wait aborted', 'AbortError'));
|
|
136
|
+
}
|
|
77
137
|
return new Promise((resolve, reject) => {
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
138
|
+
const waiter = {
|
|
139
|
+
accept,
|
|
140
|
+
resolve,
|
|
141
|
+
reject: (error) => reject(error),
|
|
81
142
|
};
|
|
82
|
-
const
|
|
143
|
+
const onAbort = () => {
|
|
83
144
|
cleanup();
|
|
84
|
-
|
|
145
|
+
waiter.reject(new DOMException('Session event wait aborted', 'AbortError'));
|
|
85
146
|
};
|
|
86
147
|
const cleanup = () => {
|
|
87
148
|
signal?.removeEventListener('abort', onAbort);
|
|
@@ -90,9 +151,20 @@ export class SessionEventQueue {
|
|
|
90
151
|
this.waiters.splice(index, 1);
|
|
91
152
|
}
|
|
92
153
|
};
|
|
154
|
+
const originalResolve = waiter.resolve;
|
|
155
|
+
waiter.resolve = (event) => {
|
|
156
|
+
cleanup();
|
|
157
|
+
this.notifyChanged();
|
|
158
|
+
originalResolve(event);
|
|
159
|
+
};
|
|
93
160
|
signal?.addEventListener('abort', onAbort);
|
|
94
161
|
this.waiters.push(waiter);
|
|
95
162
|
});
|
|
96
163
|
}
|
|
164
|
+
notifyChanged() {
|
|
165
|
+
for (const listener of [...this.changeListeners]) {
|
|
166
|
+
listener();
|
|
167
|
+
}
|
|
168
|
+
}
|
|
97
169
|
}
|
|
98
170
|
//# sourceMappingURL=session-event-queue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-event-queue.js","sourceRoot":"","sources":["../../../src/conductor/session/session-event-queue.ts"],"names":[],"mappings":"AAEA,gEAAgE;AAChE,MAAM,OAAO,iBAAiB;IACX,KAAK,GAAmB,EAAE,CAAC;IAC3B,OAAO,
|
|
1
|
+
{"version":3,"file":"session-event-queue.js","sourceRoot":"","sources":["../../../src/conductor/session/session-event-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export type { SessionEvent, OperatorMessageEvent, OperatorMessageDelivery, OperatorReconnectEvent, WorkerCompletedEvent, WorkerFailedEvent, PermissionPendingEvent, PermissionStallEvent, HarnessConnectivityRecoveredEvent, GitHubUpdateEvent, SessionEventDispatchFields, } from './events/session-event.js';
|
|
1
|
+
export type { SessionEvent, OperatorMessageEvent, OperatorMessageDelivery, OperatorReconnectEvent, WorkerCompletedEvent, WorkerFailedEvent, WorkerSessionRecoveredEvent, PermissionPendingEvent, PermissionStallEvent, HarnessConnectivityRecoveredEvent, ConductorRecoveryReportEvent, GitHubUpdateEvent, SessionEventDispatchFields, } from './events/session-event.js';
|
|
2
2
|
//# sourceMappingURL=session-event.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-event.d.ts","sourceRoot":"","sources":["../../../src/conductor/session/session-event.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,EACpB,iBAAiB,EACjB,sBAAsB,EACtB,oBAAoB,EACpB,iCAAiC,EACjC,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"session-event.d.ts","sourceRoot":"","sources":["../../../src/conductor/session/session-event.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,EACpB,iBAAiB,EACjB,2BAA2B,EAC3B,sBAAsB,EACtB,oBAAoB,EACpB,iCAAiC,EACjC,4BAA4B,EAC5B,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,2BAA2B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-policy.d.ts","sourceRoot":"","sources":["../../src/conductor/session-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,MAAM,mBAAmB,GAC3B,WAAW,GACX,OAAO,GACP,WAAW,GACX,WAAW,GACX,aAAa,CAAC;AAElB,MAAM,WAAW,kBAAkB;IACjC,yCAAyC;IACzC,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,gDAAgD;IAChD,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,oDAAoD;AACpD,wBAAgB,eAAe,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED,mCAAmC;AACnC,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,yCAAyC;AACzC,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAErE;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"session-policy.d.ts","sourceRoot":"","sources":["../../src/conductor/session-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,MAAM,mBAAmB,GAC3B,WAAW,GACX,OAAO,GACP,WAAW,GACX,WAAW,GACX,aAAa,CAAC;AAElB,MAAM,WAAW,kBAAkB;IACjC,yCAAyC;IACzC,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,gDAAgD;IAChD,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,oDAAoD;AACpD,wBAAgB,eAAe,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED,mCAAmC;AACnC,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,yCAAyC;AACzC,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAErE;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAyBtE;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,kBAAkB,GACxB,mBAAmB,CAMrB;AAED,uCAAuC;AACvC,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,OAAO,CAcT;AAED,2DAA2D;AAC3D,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,GACtB,MAAM,CAKR;AAED,+DAA+D;AAC/D,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,YAAY,EAAE,EACtB,eAAe,EAAE,MAAM,GACtB,MAAM,CAcR;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAC7C,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,mBAAmB,CAAC;IACpC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,oBAAoB,CAAC;IACpC,wBAAwB,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,GAAG,kBAAkB,CAYrB"}
|
|
@@ -18,7 +18,8 @@ export function operatorInputMaxTurns(maxTurns) {
|
|
|
18
18
|
export function shouldStopIssueLoop(input) {
|
|
19
19
|
// `cancelled` is a terminal SDK run status, not a retryable conductor error.
|
|
20
20
|
// In particular, one-shot sessions must not fall through to event waiting.
|
|
21
|
-
if (input.lastStatus === 'cancelled'
|
|
21
|
+
if (input.lastStatus === 'cancelled' ||
|
|
22
|
+
input.lastStatus === 'send_rejected') {
|
|
22
23
|
return true;
|
|
23
24
|
}
|
|
24
25
|
if (input.lastStatus === 'error') {
|
|
@@ -42,8 +43,9 @@ export function shouldStopIssueLoop(input) {
|
|
|
42
43
|
export function resolveIssueLoopStopReason(input) {
|
|
43
44
|
if (input.lastStatus === 'cancelled')
|
|
44
45
|
return 'cancelled';
|
|
45
|
-
if (input.lastStatus === 'error')
|
|
46
|
+
if (input.lastStatus === 'error' || input.lastStatus === 'send_rejected') {
|
|
46
47
|
return 'error';
|
|
48
|
+
}
|
|
47
49
|
return 'completed';
|
|
48
50
|
}
|
|
49
51
|
/** 自律ターン上限到達後も conductor へ送れるイベントか。 */
|
|
@@ -51,7 +53,8 @@ export function canDispatchConductorSend(event, autonomousTurns, maxTurns) {
|
|
|
51
53
|
if (event.type === 'operator.message' ||
|
|
52
54
|
event.type === 'operator.reconnect' ||
|
|
53
55
|
event.type === 'permission.pending' ||
|
|
54
|
-
event.type === 'permission.stall'
|
|
56
|
+
event.type === 'permission.stall' ||
|
|
57
|
+
event.type === 'conductor.recovery.report') {
|
|
55
58
|
return true;
|
|
56
59
|
}
|
|
57
60
|
if (!isMaxTurnsLimited(maxTurns)) {
|
|
@@ -68,7 +71,8 @@ export function autonomousTurnsAfterConductorSend(event, autonomousTurns) {
|
|
|
68
71
|
}
|
|
69
72
|
/** 束 dispatch 後の `autonomousTurns`(束に operator が含まれればリセット)。 */
|
|
70
73
|
export function autonomousTurnsAfterConductorBatch(events, autonomousTurns) {
|
|
71
|
-
if (events.every((event) => event.type === 'operator.reconnect'
|
|
74
|
+
if (events.every((event) => event.type === 'operator.reconnect' ||
|
|
75
|
+
event.type === 'conductor.recovery.report')) {
|
|
72
76
|
return autonomousTurns;
|
|
73
77
|
}
|
|
74
78
|
if (events.some((event) => event.type === 'operator.message')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-policy.js","sourceRoot":"","sources":["../../src/conductor/session-policy.ts"],"names":[],"mappings":"AA4BA,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC,oDAAoD;AACpD,MAAM,UAAU,eAAe,CAAC,QAAiB;IAC/C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,uBAAuB,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,iBAAiB,CAAC,QAAgB;IAChD,OAAO,QAAQ,GAAG,CAAC,CAAC;AACtB,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AACvD,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,mBAAmB,CAAC,KAAyB;IAC3D,6EAA6E;IAC7E,2EAA2E;IAC3E,
|
|
1
|
+
{"version":3,"file":"session-policy.js","sourceRoot":"","sources":["../../src/conductor/session-policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ export interface SubmitOperatorInputInput {
|
|
|
18
18
|
}
|
|
19
19
|
export interface EnqueueOperatorMessageInput {
|
|
20
20
|
message: string;
|
|
21
|
+
/** Original operator text when `message` includes generated Open Question context. */
|
|
22
|
+
operatorInput?: string;
|
|
21
23
|
delivery?: OperatorMessageDelivery;
|
|
22
24
|
conductorTurn: number;
|
|
23
25
|
eventQueue: SessionEventQueue;
|
|
@@ -30,4 +32,5 @@ export interface EnqueueOperatorMessageInput {
|
|
|
30
32
|
export declare function enqueueOperatorMessage(input: EnqueueOperatorMessageInput): boolean;
|
|
31
33
|
/** オペレータ発話を open question に適用し、conductor キューへ積む。 */
|
|
32
34
|
export declare function submitOperatorInput(input: SubmitOperatorInputInput): boolean;
|
|
35
|
+
export declare function isOperatorInputWithinRecoveryLimit(message: string): boolean;
|
|
33
36
|
//# sourceMappingURL=submit-operator-input.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submit-operator-input.d.ts","sourceRoot":"","sources":["../../src/conductor/submit-operator-input.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"submit-operator-input.d.ts","sourceRoot":"","sources":["../../src/conductor/submit-operator-input.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAGpC,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,uBAAuB,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,oBAAoB,CAAC;IACpC,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC3C,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACjD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;CACjE;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,sFAAsF;IACtF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,uBAAuB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC3C,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAChE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,uDAAuD;AACvD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,2BAA2B,GACjC,OAAO,CA6BT;AAED,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAgD5E;AAED,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE3E"}
|
|
@@ -1,16 +1,23 @@
|
|
|
1
1
|
import { applyOperatorMessage } from '../escalation/apply-operator-message.js';
|
|
2
2
|
import { formatOpenQuestionAnsweredReport, joinOperatorInput } from '../escalation/format-registry-update.js';
|
|
3
3
|
import { openQuestionToEscalationRecord } from '../escalation/open-question-to-escalation.js';
|
|
4
|
+
import { CONDUCTOR_RECOVERY_INPUT_BYTE_LIMIT } from './conductor-recovery-inbox.js';
|
|
4
5
|
/** キュー受理専用。Open Question や escalation の状態は参照・変更しない。 */
|
|
5
6
|
export function enqueueOperatorMessage(input) {
|
|
6
7
|
const text = input.message.trim();
|
|
7
8
|
if (!text) {
|
|
8
9
|
return false;
|
|
9
10
|
}
|
|
11
|
+
const operatorInput = input.operatorInput?.trim() || text;
|
|
12
|
+
if (!isOperatorInputWithinRecoveryLimit(operatorInput)) {
|
|
13
|
+
emitOversizedOperatorInputWarning(input.sessionLogger);
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
10
16
|
const delivery = input.delivery ?? 'next';
|
|
11
17
|
const event = {
|
|
12
18
|
type: 'operator.message',
|
|
13
19
|
text,
|
|
20
|
+
...(operatorInput !== text ? { operatorInput } : {}),
|
|
14
21
|
delivery,
|
|
15
22
|
...(input.openQuestionAnswer ? { openQuestionAnswer: true } : {}),
|
|
16
23
|
...(input.answerPreview ? { answerPreview: input.answerPreview } : {}),
|
|
@@ -31,6 +38,10 @@ export function submitOperatorInput(input) {
|
|
|
31
38
|
if (!trimmed) {
|
|
32
39
|
return false;
|
|
33
40
|
}
|
|
41
|
+
if (!isOperatorInputWithinRecoveryLimit(trimmed)) {
|
|
42
|
+
emitOversizedOperatorInputWarning(input.sessionLogger);
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
34
45
|
const applied = applyOperatorMessage(input.openQuestions, trimmed, {
|
|
35
46
|
targetQuestionId: input.targetOpenQuestionId,
|
|
36
47
|
answeredAt: input.answeredAt,
|
|
@@ -54,6 +65,7 @@ export function submitOperatorInput(input) {
|
|
|
54
65
|
}
|
|
55
66
|
return enqueueOperatorMessage({
|
|
56
67
|
message: text,
|
|
68
|
+
...(text !== trimmed ? { operatorInput: trimmed } : {}),
|
|
57
69
|
delivery: input.delivery,
|
|
58
70
|
conductorTurn: input.conductorTurn,
|
|
59
71
|
eventQueue: input.eventQueue,
|
|
@@ -65,4 +77,13 @@ export function submitOperatorInput(input) {
|
|
|
65
77
|
.join(' / ') || undefined,
|
|
66
78
|
});
|
|
67
79
|
}
|
|
80
|
+
export function isOperatorInputWithinRecoveryLimit(message) {
|
|
81
|
+
return Buffer.byteLength(message, 'utf8') <= CONDUCTOR_RECOVERY_INPUT_BYTE_LIMIT;
|
|
82
|
+
}
|
|
83
|
+
function emitOversizedOperatorInputWarning(sessionLogger) {
|
|
84
|
+
sessionLogger.emit({
|
|
85
|
+
type: 'harness.warning',
|
|
86
|
+
message: 'recovery inbox で内容を完全に保持するため、1 MiB を超える入力は受け付けません。短くするか分割してから送信してください。',
|
|
87
|
+
});
|
|
88
|
+
}
|
|
68
89
|
//# sourceMappingURL=submit-operator-input.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submit-operator-input.js","sourceRoot":"","sources":["../../src/conductor/submit-operator-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,gCAAgC,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE9G,OAAO,EAAE,8BAA8B,EAAE,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"submit-operator-input.js","sourceRoot":"","sources":["../../src/conductor/submit-operator-input.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deep-merge.d.ts","sourceRoot":"","sources":["../../src/config/deep-merge.ts"],"names":[],"mappings":"AAIA,wDAAwD;AACxD,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,CAAC,
|
|
1
|
+
{"version":3,"file":"deep-merge.d.ts","sourceRoot":"","sources":["../../src/config/deep-merge.ts"],"names":[],"mappings":"AAIA,wDAAwD;AACxD,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,CAAC,CA0BH"}
|
|
@@ -8,12 +8,22 @@ export function deepMerge(base, override) {
|
|
|
8
8
|
if (value === undefined) {
|
|
9
9
|
continue;
|
|
10
10
|
}
|
|
11
|
-
const existing = result[key];
|
|
11
|
+
const existing = Object.hasOwn(result, key) ? result[key] : undefined;
|
|
12
12
|
if (isPlainObject(existing) && isPlainObject(value)) {
|
|
13
|
-
result
|
|
13
|
+
Object.defineProperty(result, key, {
|
|
14
|
+
value: deepMerge(existing, value),
|
|
15
|
+
enumerable: true,
|
|
16
|
+
configurable: true,
|
|
17
|
+
writable: true,
|
|
18
|
+
});
|
|
14
19
|
continue;
|
|
15
20
|
}
|
|
16
|
-
result
|
|
21
|
+
Object.defineProperty(result, key, {
|
|
22
|
+
value,
|
|
23
|
+
enumerable: true,
|
|
24
|
+
configurable: true,
|
|
25
|
+
writable: true,
|
|
26
|
+
});
|
|
17
27
|
}
|
|
18
28
|
return result;
|
|
19
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deep-merge.js","sourceRoot":"","sources":["../../src/config/deep-merge.ts"],"names":[],"mappings":"AAAA,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,SAAS,CACvB,IAAO,EACP,QAAiC;IAEjC,MAAM,MAAM,GAA4B,EAAE,GAAG,IAAI,EAAE,CAAC;IAEpD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"deep-merge.js","sourceRoot":"","sources":["../../src/config/deep-merge.ts"],"names":[],"mappings":"AAAA,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,SAAS,CACvB,IAAO,EACP,QAAiC;IAEjC,MAAM,MAAM,GAA4B,EAAE,GAAG,IAAI,EAAE,CAAC;IAEpD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACpD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE;gBACjC,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC;gBACjC,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;gBAClB,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE;YACjC,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAW,CAAC;AACrB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEnE,gEAAgE;AAChE,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEnE,gEAAgE;AAChE,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,yBAAyB,EAAE,gBAAuB,CAAC;AAEhE,eAAO,MAAM,uBAAuB,EAAE,cAwCrC,CAAC"}
|
package/dist/config/defaults.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DEFAULT_GITHUB_MONITOR_ACTIVE_POLL_INTERVAL_MS, DEFAULT_GITHUB_MONITOR_DEBOUNCE_MS, DEFAULT_GITHUB_MONITOR_POLL_INTERVAL_MS, DEFAULT_GITHUB_MONITOR_STOP_POLL_WAIT_MS, } from '../github/github-monitor.js';
|
|
2
2
|
/** `packages/cli` の `NON_INTERACTIVE_DEFAULT_MAX_TURNS` と同期。 */
|
|
3
3
|
export const DEFAULT_SESSION_MAX_TURNS_NON_TTY = 5;
|
|
4
|
-
export const DEFAULT_CONDUCTOR_BACKEND = '
|
|
4
|
+
export const DEFAULT_CONDUCTOR_BACKEND = 'pi';
|
|
5
5
|
export const DEFAULT_ENSEMBLE_CONFIG = {
|
|
6
6
|
config: {
|
|
7
7
|
loadProjectConfig: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8CAA8C,EAC9C,kCAAkC,EAClC,uCAAuC,EACvC,wCAAwC,GACzC,MAAM,6BAA6B,CAAC;AAGrC,gEAAgE;AAChE,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,CAAC;AACnD,MAAM,CAAC,MAAM,yBAAyB,GAAqB,
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8CAA8C,EAC9C,kCAAkC,EAClC,uCAAuC,EACvC,wCAAwC,GACzC,MAAM,6BAA6B,CAAC;AAGrC,gEAAgE;AAChE,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,CAAC;AACnD,MAAM,CAAC,MAAM,yBAAyB,GAAqB,IAAI,CAAC;AAEhE,MAAM,CAAC,MAAM,uBAAuB,GAAmB;IACrD,MAAM,EAAE;QACN,iBAAiB,EAAE,IAAI;KACxB;IACD,OAAO,EAAE,EAAE;IACX,SAAS,EAAE;QACT,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,yBAAyB;QAClC,OAAO,EAAE,KAAK;KACf;IACD,GAAG,EAAE;QACH,aAAa,EAAE,QAAQ;KACxB;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,KAAK;QAClB,QAAQ,EAAE;YACR,GAAG,EAAE,CAAC;YACN,MAAM,EAAE,iCAAiC;SAC1C;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,IAAI;SACX;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,wBAAwB,EAAE,IAAI;SAC/B;QACD,OAAO,EAAE;YACP,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,kCAAkC;YAC9C,cAAc,EAAE,uCAAuC;YACvD,oBAAoB,EAAE,8CAA8C;YACpE,cAAc,EAAE,wCAAwC;SACzD;KACF;IACD,GAAG,EAAE;QACH,MAAM,EAAE,QAAQ;QAChB,cAAc,EAAE,MAAM;KACvB;CACF,CAAC"}
|