@qduc/term2 0.38.0 → 0.39.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/README.md +5 -0
- package/dist/agent.d.ts +4 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +18 -4
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts +3 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +19 -3
- package/dist/app.js.map +1 -1
- package/dist/build-info.json +2 -2
- package/dist/cli.js +59 -5
- package/dist/cli.js.map +1 -1
- package/dist/commands/bridge-command.d.ts +11 -0
- package/dist/commands/bridge-command.d.ts.map +1 -0
- package/dist/commands/bridge-command.js +67 -0
- package/dist/commands/bridge-command.js.map +1 -0
- package/dist/components/input/FirstRunSetupPrompt.js +3 -3
- package/dist/components/input/FirstRunSetupPrompt.js.map +1 -1
- package/dist/components/input/ModelMenuSession.d.ts.map +1 -1
- package/dist/components/input/ModelMenuSession.js +2 -0
- package/dist/components/input/ModelMenuSession.js.map +1 -1
- package/dist/components/input/SubagentPoolMenuSession.js +1 -1
- package/dist/components/input/SubagentPoolMenuSession.js.map +1 -1
- package/dist/components/input/menu-types.d.ts +2 -0
- package/dist/components/input/menu-types.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.js +28 -17
- package/dist/components/layout/BackgroundTaskManager.js.map +1 -1
- package/dist/components/message/ChatMessage.d.ts +1 -0
- package/dist/components/message/ChatMessage.d.ts.map +1 -1
- package/dist/components/message/ChatMessage.js +3 -3
- package/dist/components/message/ChatMessage.js.map +1 -1
- package/dist/components/message/CommandMessage.js +21 -3
- package/dist/components/message/CommandMessage.js.map +1 -1
- package/dist/components/message/MessageList.d.ts +4 -1
- package/dist/components/message/MessageList.d.ts.map +1 -1
- package/dist/components/message/MessageList.js +20 -4
- package/dist/components/message/MessageList.js.map +1 -1
- package/dist/contracts/application-stream.d.ts +3 -0
- package/dist/contracts/application-stream.d.ts.map +1 -1
- package/dist/contracts/conversation-items.d.ts +6 -0
- package/dist/contracts/conversation-items.d.ts.map +1 -1
- package/dist/contracts/streamed-model-turn.d.ts +5 -0
- package/dist/contracts/streamed-model-turn.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.d.ts +1 -0
- package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.js +6 -1
- package/dist/hooks/conversation-ui-reducer.js.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +7 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +15 -1
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-conversation-messages.d.ts +1 -1
- package/dist/hooks/use-conversation-messages.d.ts.map +1 -1
- package/dist/hooks/use-conversation-messages.js +2 -1
- package/dist/hooks/use-conversation-messages.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +1 -1
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +19 -6
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-first-run-setup.d.ts.map +1 -1
- package/dist/hooks/use-first-run-setup.js +14 -9
- package/dist/hooks/use-first-run-setup.js.map +1 -1
- package/dist/hooks/use-model-catalog.d.ts +18 -0
- package/dist/hooks/use-model-catalog.d.ts.map +1 -0
- package/dist/hooks/use-model-catalog.js +51 -0
- package/dist/hooks/use-model-catalog.js.map +1 -0
- package/dist/hooks/use-model-selection.d.ts +3 -4
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +8 -43
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-subagent-pool-selection.d.ts +1 -1
- package/dist/hooks/use-subagent-pool-selection.d.ts.map +1 -1
- package/dist/hooks/use-subagent-pool-selection.js +11 -46
- package/dist/hooks/use-subagent-pool-selection.js.map +1 -1
- package/dist/lib/agent-client.d.ts +2 -0
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +3 -1
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +3 -0
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +6 -0
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +3 -0
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +4 -2
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +4 -2
- package/dist/non-interactive.js.map +1 -1
- package/dist/prompts/bare.md +3 -8
- package/dist/prompts/discord-communication.md +7 -0
- package/dist/prompts/durable-goal-context.d.ts.map +1 -1
- package/dist/prompts/durable-goal-context.js +4 -3
- package/dist/prompts/durable-goal-context.js.map +1 -1
- package/dist/prompts/durable-goal-context.ts +4 -2
- package/dist/providers/ai-sdk-streamed-model.d.ts.map +1 -1
- package/dist/providers/ai-sdk-streamed-model.js +4 -0
- package/dist/providers/ai-sdk-streamed-model.js.map +1 -1
- package/dist/providers/codex-responses-model.d.ts.map +1 -1
- package/dist/providers/codex-responses-model.js +30 -7
- package/dist/providers/codex-responses-model.js.map +1 -1
- package/dist/providers/openai-responses-model.d.ts.map +1 -1
- package/dist/providers/openai-responses-model.js +7 -0
- package/dist/providers/openai-responses-model.js.map +1 -1
- package/dist/providers/retrying-model.d.ts.map +1 -1
- package/dist/providers/retrying-model.js +3 -1
- package/dist/providers/retrying-model.js.map +1 -1
- package/dist/providers/websocket-receive-watchdog.d.ts.map +1 -1
- package/dist/providers/websocket-receive-watchdog.js +3 -2
- package/dist/providers/websocket-receive-watchdog.js.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +7 -0
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-stream.d.ts.map +1 -1
- package/dist/services/agent-stream.js +2 -0
- package/dist/services/agent-stream.js.map +1 -1
- package/dist/services/control-socket/control-session-port.d.ts.map +1 -1
- package/dist/services/control-socket/control-session-port.js +35 -1
- package/dist/services/control-socket/control-session-port.js.map +1 -1
- package/dist/services/control-socket/control-socket.d.ts +31 -0
- package/dist/services/control-socket/control-socket.d.ts.map +1 -1
- package/dist/services/control-socket/control-socket.js +102 -2
- package/dist/services/control-socket/control-socket.js.map +1 -1
- package/dist/services/conversation/conversation-adapter-factory.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter-factory.js +3 -1
- package/dist/services/conversation/conversation-adapter-factory.js.map +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts +13 -2
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.js +49 -6
- package/dist/services/conversation/conversation-adapter.js.map +1 -1
- package/dist/services/conversation/conversation-decoder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-decoder.js +6 -2
- package/dist/services/conversation/conversation-decoder.js.map +1 -1
- package/dist/services/conversation/conversation-events.d.ts +8 -1
- package/dist/services/conversation/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation/conversation-events.js +1 -0
- package/dist/services/conversation/conversation-events.js.map +1 -1
- package/dist/services/conversation/conversation-history-repair.d.ts.map +1 -1
- package/dist/services/conversation/conversation-history-repair.js +11 -10
- package/dist/services/conversation/conversation-history-repair.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts +5 -0
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +61 -14
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts +3 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts.map +1 -1
- package/dist/services/conversation/conversation-record-stream.d.ts +2 -0
- package/dist/services/conversation/conversation-record-stream.d.ts.map +1 -1
- package/dist/services/conversation/conversation-record-stream.js +12 -8
- package/dist/services/conversation/conversation-record-stream.js.map +1 -1
- package/dist/services/conversation/conversation-record.d.ts +1 -0
- package/dist/services/conversation/conversation-record.d.ts.map +1 -1
- package/dist/services/conversation/conversation-record.js +32 -14
- package/dist/services/conversation/conversation-record.js.map +1 -1
- package/dist/services/conversation/conversation-replay.d.ts.map +1 -1
- package/dist/services/conversation/conversation-replay.js +74 -149
- package/dist/services/conversation/conversation-replay.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +7 -0
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +58 -13
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation/conversation-state-schema.d.ts +1 -0
- package/dist/services/conversation/conversation-state-schema.d.ts.map +1 -1
- package/dist/services/conversation/conversation-state-schema.js +1 -0
- package/dist/services/conversation/conversation-state-schema.js.map +1 -1
- package/dist/services/conversation/conversation-turn-items.d.ts.map +1 -1
- package/dist/services/conversation/conversation-turn-items.js +3 -0
- package/dist/services/conversation/conversation-turn-items.js.map +1 -1
- package/dist/services/conversation/durable-goal-stop-check.js +1 -1
- package/dist/services/conversation/durable-goal-stop-check.js.map +1 -1
- package/dist/services/conversation/journal-to-ledger.d.ts +2 -11
- package/dist/services/conversation/journal-to-ledger.d.ts.map +1 -1
- package/dist/services/conversation/journal-to-ledger.js +37 -180
- package/dist/services/conversation/journal-to-ledger.js.map +1 -1
- package/dist/services/conversation/queue-persistence.d.ts +2 -1
- package/dist/services/conversation/queue-persistence.d.ts.map +1 -1
- package/dist/services/conversation/queue-persistence.js +14 -1
- package/dist/services/conversation/queue-persistence.js.map +1 -1
- package/dist/services/conversation/run-item-normalizer.d.ts.map +1 -1
- package/dist/services/conversation/run-item-normalizer.js +5 -1
- package/dist/services/conversation/run-item-normalizer.js.map +1 -1
- package/dist/services/conversation/tool-occurrence.d.ts +18 -0
- package/dist/services/conversation/tool-occurrence.d.ts.map +1 -0
- package/dist/services/conversation/tool-occurrence.js +32 -0
- package/dist/services/conversation/tool-occurrence.js.map +1 -0
- package/dist/services/discord/discord-bridge.d.ts +37 -0
- package/dist/services/discord/discord-bridge.d.ts.map +1 -0
- package/dist/services/discord/discord-bridge.js +826 -0
- package/dist/services/discord/discord-bridge.js.map +1 -0
- package/dist/services/discord/discord-command.d.ts +3 -0
- package/dist/services/discord/discord-command.d.ts.map +1 -0
- package/dist/services/discord/discord-command.js +125 -0
- package/dist/services/discord/discord-command.js.map +1 -0
- package/dist/services/discord/discord-credentials.d.ts +12 -0
- package/dist/services/discord/discord-credentials.d.ts.map +1 -0
- package/dist/services/discord/discord-credentials.js +155 -0
- package/dist/services/discord/discord-credentials.js.map +1 -0
- package/dist/services/discord/discord-outbound.d.ts +51 -0
- package/dist/services/discord/discord-outbound.d.ts.map +1 -0
- package/dist/services/discord/discord-outbound.js +275 -0
- package/dist/services/discord/discord-outbound.js.map +1 -0
- package/dist/services/discord/discord-send-capability.d.ts +5 -0
- package/dist/services/discord/discord-send-capability.d.ts.map +1 -0
- package/dist/services/discord/discord-send-capability.js +11 -0
- package/dist/services/discord/discord-send-capability.js.map +1 -0
- package/dist/services/input-surge-guard.d.ts.map +1 -1
- package/dist/services/input-surge-guard.js +4 -3
- package/dist/services/input-surge-guard.js.map +1 -1
- package/dist/services/large-uncached-input-guard.d.ts +1 -1
- package/dist/services/large-uncached-input-guard.d.ts.map +1 -1
- package/dist/services/large-uncached-input-guard.js +0 -6
- package/dist/services/large-uncached-input-guard.js.map +1 -1
- package/dist/services/logging/assistant-turn-journal.d.ts +1 -1
- package/dist/services/logging/assistant-turn-journal.d.ts.map +1 -1
- package/dist/services/logging/assistant-turn-journal.js +4 -3
- package/dist/services/logging/assistant-turn-journal.js.map +1 -1
- package/dist/services/logging/conversation-log-events.d.ts +1 -0
- package/dist/services/logging/conversation-log-events.d.ts.map +1 -1
- package/dist/services/logging/conversation-log-events.js.map +1 -1
- package/dist/services/profiles/registry.d.ts.map +1 -1
- package/dist/services/profiles/registry.js +13 -6
- package/dist/services/profiles/registry.js.map +1 -1
- package/dist/services/queue/queue-controller.d.ts +12 -3
- package/dist/services/queue/queue-controller.d.ts.map +1 -1
- package/dist/services/queue/queue-controller.js +19 -4
- package/dist/services/queue/queue-controller.js.map +1 -1
- package/dist/services/retry/retry-classifier.d.ts.map +1 -1
- package/dist/services/retry/retry-classifier.js +5 -3
- package/dist/services/retry/retry-classifier.js.map +1 -1
- package/dist/services/retry/retry-errors.d.ts +15 -0
- package/dist/services/retry/retry-errors.d.ts.map +1 -1
- package/dist/services/retry/retry-errors.js +29 -0
- package/dist/services/retry/retry-errors.js.map +1 -1
- package/dist/services/retry/retry-recovery-budget.d.ts +13 -0
- package/dist/services/retry/retry-recovery-budget.d.ts.map +1 -1
- package/dist/services/retry/retry-recovery-budget.js +35 -4
- package/dist/services/retry/retry-recovery-budget.js.map +1 -1
- package/dist/services/session/background-task-control.d.ts.map +1 -1
- package/dist/services/session/background-task-control.js +4 -6
- package/dist/services/session/background-task-control.js.map +1 -1
- package/dist/services/session/continuation-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/continuation-recovery-handler.js +15 -7
- package/dist/services/session/continuation-recovery-handler.js.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.js +15 -7
- package/dist/services/session/initial-turn-recovery-handler.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +4 -0
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +10 -1
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-identity.d.ts +8 -3
- package/dist/services/session/session-identity.d.ts.map +1 -1
- package/dist/services/session/session-identity.js +16 -3
- package/dist/services/session/session-identity.js.map +1 -1
- package/dist/services/session-rollover/session-rollover-brief.d.ts +1 -2
- package/dist/services/session-rollover/session-rollover-brief.d.ts.map +1 -1
- package/dist/services/session-rollover/session-rollover-brief.js +9 -11
- package/dist/services/session-rollover/session-rollover-brief.js.map +1 -1
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +4 -0
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/tool-execution-ledger.d.ts +11 -2
- package/dist/services/tool-execution-ledger.d.ts.map +1 -1
- package/dist/services/tool-execution-ledger.js +123 -30
- package/dist/services/tool-execution-ledger.js.map +1 -1
- package/dist/test-helpers/terminal-e2e.d.ts.map +1 -1
- package/dist/test-helpers/terminal-e2e.js +37 -2
- package/dist/test-helpers/terminal-e2e.js.map +1 -1
- package/dist/tools/agent/goal-check.d.ts.map +1 -1
- package/dist/tools/agent/goal-check.js +6 -2
- package/dist/tools/agent/goal-check.js.map +1 -1
- package/dist/tools/discord-send.d.ts +14 -0
- package/dist/tools/discord-send.d.ts.map +1 -0
- package/dist/tools/discord-send.js +66 -0
- package/dist/tools/discord-send.js.map +1 -0
- package/dist/tools/tool-names.d.ts +1 -0
- package/dist/tools/tool-names.d.ts.map +1 -1
- package/dist/tools/tool-names.js +1 -0
- package/dist/tools/tool-names.js.map +1 -1
- package/dist/types/message.d.ts +3 -1
- package/dist/types/message.d.ts.map +1 -1
- package/dist/types/message.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,16 +9,19 @@ const LIVE_TASK_STATUSES = new Set(['running', 'awaiting_approval', 'waiting_for
|
|
|
9
9
|
function isLiveRolloverTask(task) {
|
|
10
10
|
return LIVE_TASK_STATUSES.has(task.status);
|
|
11
11
|
}
|
|
12
|
-
export function composeSessionRolloverBrief({ previousSessionId,
|
|
12
|
+
export function composeSessionRolloverBrief({ previousSessionId, request, taskInventory = [], }) {
|
|
13
13
|
const liveTasks = taskInventory.filter(isLiveRolloverTask);
|
|
14
14
|
const inventory = liveTasks.length === 0
|
|
15
15
|
? ['- none observed at cutover']
|
|
16
|
-
:
|
|
16
|
+
: [
|
|
17
|
+
...liveTasks.map((task) => `- ${task.kind} \`${task.id}\` status: ${task.status}`),
|
|
18
|
+
'',
|
|
19
|
+
'These handles survived the rollover; inspect or control them through the background-task tools.',
|
|
20
|
+
];
|
|
17
21
|
return [
|
|
18
22
|
'# Continuation briefing',
|
|
19
23
|
'',
|
|
20
24
|
`Previous session: \`${previousSessionId}\``,
|
|
21
|
-
`Outcome: completed into successor session \`${successorSessionId}\``,
|
|
22
25
|
`Reason: ${reasonLabel(request.reason)}`,
|
|
23
26
|
'',
|
|
24
27
|
'## Harness-observed live work at cutover',
|
|
@@ -31,14 +34,9 @@ export function composeSessionRolloverBrief({ previousSessionId, successorSessio
|
|
|
31
34
|
'',
|
|
32
35
|
'## Continuation protocol',
|
|
33
36
|
'',
|
|
34
|
-
'-
|
|
35
|
-
'-
|
|
36
|
-
'-
|
|
37
|
-
'- Do not replay the entire previous transcript.',
|
|
38
|
-
'- Live job and subagent handles remain session-owned and are retained across this rollover; inspect or control them through the background-task tools when needed. Use durable artifacts, paths, and commits for completed results rather than copying transient output into the handoff.',
|
|
39
|
-
'- User constraints and preferences stated in the handoff still apply.',
|
|
40
|
-
'- Before building on state the handoff marks unverified, or that the workspace may have changed since cutover, check it cheaply first.',
|
|
41
|
-
'- Continue from the next open step rather than redoing completed work.',
|
|
37
|
+
'- The handoff is authoritative. If it names a canonical durable artifact, that artifact holds the state and the handoff is a delta.',
|
|
38
|
+
'- For missing detail, read `session_read({ id: "previous", ... })` with bounded limits; use `session_search` only when the location is unknown. Do not replay the whole transcript.',
|
|
39
|
+
'- Check state the handoff marks unverified, or that may have changed since cutover, before building on it.',
|
|
42
40
|
].join('\n');
|
|
43
41
|
}
|
|
44
42
|
//# sourceMappingURL=session-rollover-brief.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-rollover-brief.js","sourceRoot":"","sources":["../../../source/services/session-rollover/session-rollover-brief.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG,CAAC,MAAwC,EAAU,EAAE;IACvE,IAAI,MAAM,KAAK,kBAAkB;QAAE,OAAO,kBAAkB,CAAC;IAC7D,IAAI,MAAM,KAAK,eAAe;QAAE,OAAO,eAAe,CAAC;IACvD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAQF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzG,SAAS,kBAAkB,CAAC,IAAuC;IACjE,OAAO,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,EAC1C,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"session-rollover-brief.js","sourceRoot":"","sources":["../../../source/services/session-rollover/session-rollover-brief.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG,CAAC,MAAwC,EAAU,EAAE;IACvE,IAAI,MAAM,KAAK,kBAAkB;QAAE,OAAO,kBAAkB,CAAC;IAC7D,IAAI,MAAM,KAAK,eAAe;QAAE,OAAO,eAAe,CAAC;IACvD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAQF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzG,SAAS,kBAAkB,CAAC,IAAuC;IACjE,OAAO,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,EAC1C,iBAAiB,EACjB,OAAO,EACP,aAAa,GAAG,EAAE,GAKnB;IACC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAC3D,MAAM,SAAS,GACb,SAAS,CAAC,MAAM,KAAK,CAAC;QACpB,CAAC,CAAC,CAAC,4BAA4B,CAAC;QAChC,CAAC,CAAC;YACE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,cAAc,IAAI,CAAC,MAAM,EAAE,CAAC;YAClF,EAAE;YACF,iGAAiG;SAClG,CAAC;IACR,OAAO;QACL,yBAAyB;QACzB,EAAE;QACF,uBAAuB,iBAAiB,IAAI;QAC5C,WAAW,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACxC,EAAE;QACF,0CAA0C;QAC1C,EAAE;QACF,GAAG,SAAS;QACZ,EAAE;QACF,sCAAsC;QACtC,EAAE;QACF,OAAO,CAAC,KAAK;QACb,EAAE;QACF,0BAA0B;QAC1B,EAAE;QACF,qIAAqI;QACrI,qLAAqL;QACrL,4GAA4G;KAC7G,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKpH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAQzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,4DAA4D;AAC5D,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKpH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAQzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,4DAA4D;AAC5D,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAoN/C"}
|
|
@@ -65,6 +65,10 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
|
|
|
65
65
|
yield emitted;
|
|
66
66
|
continue;
|
|
67
67
|
}
|
|
68
|
+
if (event.type === 'reasoning_started') {
|
|
69
|
+
yield { type: 'reasoning_started', ...(event.id !== undefined ? { id: event.id } : {}) };
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
68
72
|
if (event.type === 'reasoning_delta') {
|
|
69
73
|
const emitted = emitReasoning(event.text);
|
|
70
74
|
if (emitted)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-event-processor.js","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stream-event-processor.js","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare const RESTART_UNOBSERVED_TOOL_RESULT: string;
|
|
|
9
9
|
export interface SavedToolExecution {
|
|
10
10
|
turnId: string;
|
|
11
11
|
callId: string;
|
|
12
|
+
occurrence?: number;
|
|
12
13
|
toolName: string;
|
|
13
14
|
arguments?: unknown;
|
|
14
15
|
status: ToolExecutionStatus;
|
|
@@ -59,8 +60,8 @@ export declare class ToolExecutionLedger {
|
|
|
59
60
|
import(entries: readonly SavedToolExecution[] | undefined): void;
|
|
60
61
|
export(): SavedToolExecution[];
|
|
61
62
|
recordReasoningText(text: string): void;
|
|
62
|
-
recordFunctionCall(item: unknown):
|
|
63
|
-
recordFunctionResult(item: unknown):
|
|
63
|
+
recordFunctionCall(item: unknown): SavedToolExecution | undefined;
|
|
64
|
+
recordFunctionResult(item: unknown): SavedToolExecution | undefined;
|
|
64
65
|
/**
|
|
65
66
|
* Mark that the tool body for this call has begun. Used by stream recovery to
|
|
66
67
|
* distinguish "never ran" (aborted) from "ran with unobserved outcome" (unknown).
|
|
@@ -137,5 +138,13 @@ export declare function hasMalformedToolCallArguments(history: readonly unknown[
|
|
|
137
138
|
* Returns the same array reference when no changes are needed.
|
|
138
139
|
*/
|
|
139
140
|
export declare function sanitizeMalformedToolCallArguments(history: readonly unknown[]): unknown[];
|
|
141
|
+
/**
|
|
142
|
+
* Attach known admission identities to untagged provider snapshots in order.
|
|
143
|
+
* Payload matching avoids assigning an older settled sibling to a latest-only
|
|
144
|
+
* segment. Explicit tags are authoritative; no provider payload is rewritten.
|
|
145
|
+
*/
|
|
146
|
+
export declare function alignHistoryToolOccurrences(history: readonly unknown[], ledger: readonly SavedToolExecution[]): unknown[];
|
|
147
|
+
/** Give legacy ordered entries deterministic ordinals before correlation. */
|
|
148
|
+
export declare function normalizeToolLedgerOccurrences(entries: readonly SavedToolExecution[] | undefined): SavedToolExecution[];
|
|
140
149
|
export {};
|
|
141
150
|
//# sourceMappingURL=tool-execution-ledger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-execution-ledger.d.ts","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tool-execution-ledger.d.ts","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { toolOccurrenceKey, toolOccurrenceMetadata } from './conversation/tool-occurrence.js';
|
|
1
2
|
import { normalizeRunItem } from './conversation/run-item-normalizer.js';
|
|
2
3
|
/** Synthetic tool result for a dispatched call whose outcome was never observed. */
|
|
3
4
|
const UNKNOWN_OUTCOME_TOOL_RESULT = 'Outcome unobserved: this operation was dispatched but the result was lost ' +
|
|
@@ -48,7 +49,9 @@ export const outputOf = (item) => {
|
|
|
48
49
|
/** History remains provider-facing even when the stream hands us an SDK wrapper. */
|
|
49
50
|
const providerHistoryItem = (item) => {
|
|
50
51
|
const canonical = canonicalToolItem(item);
|
|
51
|
-
return
|
|
52
|
+
return canonical
|
|
53
|
+
? { ...clone(canonical.providerItem ?? rawItem(item) ?? {}), ...toolOccurrenceMetadata(canonical) }
|
|
54
|
+
: clone(rawItem(item) ?? item);
|
|
52
55
|
};
|
|
53
56
|
const turnNumberOf = (turnId) => {
|
|
54
57
|
if (typeof turnId !== 'string') {
|
|
@@ -90,11 +93,11 @@ const insertionIndexForEntry = (history, entry, latestTurnNumber = 0) => {
|
|
|
90
93
|
}
|
|
91
94
|
return history.length;
|
|
92
95
|
};
|
|
93
|
-
const hasCallPair = (history,
|
|
96
|
+
const hasCallPair = (history, entry) => {
|
|
94
97
|
let hasCall = false;
|
|
95
98
|
let hasResult = false;
|
|
96
99
|
for (const item of history) {
|
|
97
|
-
if (
|
|
100
|
+
if (toolOccurrenceKey(canonicalToolItem(item) ?? { callId: '' }) !== toolOccurrenceKey(entry)) {
|
|
98
101
|
continue;
|
|
99
102
|
}
|
|
100
103
|
if (isToolCall(item)) {
|
|
@@ -147,7 +150,7 @@ export class ToolExecutionLedger {
|
|
|
147
150
|
return this.#currentTurnId;
|
|
148
151
|
}
|
|
149
152
|
import(entries) {
|
|
150
|
-
this.#entries =
|
|
153
|
+
this.#entries = normalizeToolLedgerOccurrences(entries);
|
|
151
154
|
// The next turn id must clear every imported entry's turn number — after an
|
|
152
155
|
// undo prunes entries, entry *count* is unrelated to the logical turn
|
|
153
156
|
// numbering and reusing an old turn-N id would make journal events from
|
|
@@ -170,36 +173,43 @@ export class ToolExecutionLedger {
|
|
|
170
173
|
return;
|
|
171
174
|
}
|
|
172
175
|
const { callId } = toolCall;
|
|
173
|
-
const existing = this.#entries.find((entry) => entry.callId === callId &&
|
|
176
|
+
const existing = this.#entries.find((entry) => entry.callId === callId &&
|
|
177
|
+
entry.turnId === (toolCall.turnId ?? this.#currentTurnId) &&
|
|
178
|
+
(toolCall.occurrence !== undefined ? entry.occurrence === toolCall.occurrence : isOpenEntry(entry)));
|
|
179
|
+
const occurrence = existing?.occurrence ??
|
|
180
|
+
toolCall.occurrence ??
|
|
181
|
+
Math.max(0, ...this.#entries
|
|
182
|
+
.filter((entry) => entry.turnId === this.#currentTurnId && entry.callId === callId)
|
|
183
|
+
.map((entry) => entry.occurrence ?? 0)) + 1;
|
|
184
|
+
const accepted = { ...toolCall, turnId: toolCall.turnId ?? this.#currentTurnId, occurrence };
|
|
174
185
|
if (existing) {
|
|
175
|
-
existing
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
//
|
|
179
|
-
// later crash recovery could inherit a stale failureReason/output.
|
|
180
|
-
delete existing.output;
|
|
181
|
-
delete existing.failureReason;
|
|
182
|
-
delete existing.completedAt;
|
|
186
|
+
if (!isOpenEntry(existing))
|
|
187
|
+
return existing;
|
|
188
|
+
// Approval continuations re-offer display arguments, not a new admission.
|
|
189
|
+
// Keep the original provider payload and settlement/dispatch evidence.
|
|
183
190
|
if (!existing.historyItems || existing.historyItems.length === 0) {
|
|
184
|
-
existing.historyItems = [...this.#pendingReasoningHistoryItems, providerHistoryItem(
|
|
191
|
+
existing.historyItems = [...this.#pendingReasoningHistoryItems, providerHistoryItem(accepted)];
|
|
185
192
|
}
|
|
186
193
|
else if (this.#pendingReasoningHistoryItems.length > 0 && !hasReasoningHistoryItem(existing.historyItems)) {
|
|
187
194
|
existing.historyItems = [...this.#pendingReasoningHistoryItems, ...existing.historyItems];
|
|
188
195
|
}
|
|
189
196
|
this.#pendingReasoningHistoryItems = [];
|
|
190
|
-
return;
|
|
197
|
+
return existing;
|
|
191
198
|
}
|
|
192
|
-
|
|
193
|
-
turnId:
|
|
199
|
+
const entry = {
|
|
200
|
+
turnId: accepted.turnId,
|
|
201
|
+
occurrence,
|
|
194
202
|
...this.#stampUserTurnCount(),
|
|
195
203
|
callId,
|
|
196
204
|
toolName: toolCall.toolName,
|
|
197
205
|
arguments: toolCall.arguments,
|
|
198
206
|
status: 'started',
|
|
199
207
|
startedAt: new Date().toISOString(),
|
|
200
|
-
historyItems: [...this.#pendingReasoningHistoryItems, providerHistoryItem(
|
|
201
|
-
}
|
|
208
|
+
historyItems: [...this.#pendingReasoningHistoryItems, providerHistoryItem(accepted)],
|
|
209
|
+
};
|
|
210
|
+
this.#entries.push(entry);
|
|
202
211
|
this.#pendingReasoningHistoryItems = [];
|
|
212
|
+
return entry;
|
|
203
213
|
}
|
|
204
214
|
recordFunctionResult(item) {
|
|
205
215
|
const toolResult = canonicalToolItem(item);
|
|
@@ -207,12 +217,17 @@ export class ToolExecutionLedger {
|
|
|
207
217
|
return;
|
|
208
218
|
}
|
|
209
219
|
const { callId } = toolResult;
|
|
210
|
-
let entry = [...this.#entries]
|
|
220
|
+
let entry = [...this.#entries]
|
|
221
|
+
.reverse()
|
|
222
|
+
.find((candidate) => candidate.callId === callId &&
|
|
223
|
+
(toolResult.turnId === undefined || candidate.turnId === toolResult.turnId) &&
|
|
224
|
+
(toolResult.occurrence === undefined || candidate.occurrence === toolResult.occurrence));
|
|
211
225
|
if (!entry) {
|
|
212
226
|
entry = {
|
|
213
227
|
turnId: this.#currentTurnId,
|
|
214
228
|
...this.#stampUserTurnCount(),
|
|
215
229
|
callId,
|
|
230
|
+
occurrence: toolResult.occurrence ?? 1,
|
|
216
231
|
toolName: toolResult.toolName,
|
|
217
232
|
status: 'started',
|
|
218
233
|
startedAt: new Date().toISOString(),
|
|
@@ -220,8 +235,10 @@ export class ToolExecutionLedger {
|
|
|
220
235
|
};
|
|
221
236
|
this.#entries.push(entry);
|
|
222
237
|
}
|
|
238
|
+
if (entry.status === 'completed')
|
|
239
|
+
return entry;
|
|
223
240
|
const callItem = entry.historyItems?.find(isToolCall);
|
|
224
|
-
const resultItem = providerHistoryItem(
|
|
241
|
+
const resultItem = providerHistoryItem({ ...toolResult, ...toolOccurrenceMetadata(entry) });
|
|
225
242
|
entry.status = 'completed';
|
|
226
243
|
entry.output = toolResult.output;
|
|
227
244
|
entry.completedAt = new Date().toISOString();
|
|
@@ -229,6 +246,7 @@ export class ToolExecutionLedger {
|
|
|
229
246
|
entry.historyItems = hasResultHistoryItem(previousHistoryItems, callId)
|
|
230
247
|
? previousHistoryItems
|
|
231
248
|
: [...previousHistoryItems, resultItem];
|
|
249
|
+
return entry;
|
|
232
250
|
}
|
|
233
251
|
/**
|
|
234
252
|
* Mark that the tool body for this call has begun. Used by stream recovery to
|
|
@@ -320,6 +338,7 @@ export class ToolExecutionLedger {
|
|
|
320
338
|
{
|
|
321
339
|
type: 'function_call_output',
|
|
322
340
|
callId: entry.callId,
|
|
341
|
+
...toolOccurrenceMetadata(entry),
|
|
323
342
|
output: settlement.output,
|
|
324
343
|
},
|
|
325
344
|
];
|
|
@@ -390,20 +409,23 @@ export function dropUnpairedFunctionCalls(history) {
|
|
|
390
409
|
const callIdsWithResult = new Set();
|
|
391
410
|
for (const item of history) {
|
|
392
411
|
if (isToolCall(item)) {
|
|
393
|
-
const
|
|
412
|
+
const tool = canonicalToolItem(item);
|
|
413
|
+
const callId = tool ? toolOccurrenceKey(tool) : null;
|
|
394
414
|
if (callId) {
|
|
395
415
|
callIdsWithCall.add(callId);
|
|
396
416
|
}
|
|
397
417
|
}
|
|
398
418
|
if (isResultHistoryItem(item)) {
|
|
399
|
-
const
|
|
419
|
+
const tool = canonicalToolItem(item);
|
|
420
|
+
const callId = tool ? toolOccurrenceKey(tool) : null;
|
|
400
421
|
if (callId) {
|
|
401
422
|
callIdsWithResult.add(callId);
|
|
402
423
|
}
|
|
403
424
|
}
|
|
404
425
|
}
|
|
405
426
|
const filtered = history.filter((item) => {
|
|
406
|
-
const
|
|
427
|
+
const tool = canonicalToolItem(item);
|
|
428
|
+
const callId = tool ? toolOccurrenceKey(tool) : null;
|
|
407
429
|
if (isToolCall(item)) {
|
|
408
430
|
return !callId || callIdsWithResult.has(callId);
|
|
409
431
|
}
|
|
@@ -415,14 +437,14 @@ export function dropUnpairedFunctionCalls(history) {
|
|
|
415
437
|
return filtered.length === history.length ? history : filtered;
|
|
416
438
|
}
|
|
417
439
|
export function reconcileHistoryWithToolLedger(history, ledger) {
|
|
418
|
-
|
|
419
|
-
|
|
440
|
+
const entries = normalizeToolLedgerOccurrences(ledger);
|
|
441
|
+
let next = clone(alignHistoryToolOccurrences(history, entries));
|
|
420
442
|
let addedCompletedPairs = 0;
|
|
421
443
|
let droppedIncompleteCalls = 0;
|
|
422
444
|
const latestTurnNumber = entries.reduce((max, entry) => Math.max(max, turnNumberOf(entry.turnId) ?? 0), 0);
|
|
423
|
-
for (const entry of entries) {
|
|
445
|
+
for (const [entryIndex, entry] of entries.entries()) {
|
|
424
446
|
if (hasRecoverableCallPair(entry)) {
|
|
425
|
-
if (hasCallPair(next, entry
|
|
447
|
+
if (hasCallPair(next, entry)) {
|
|
426
448
|
continue;
|
|
427
449
|
}
|
|
428
450
|
// The persisted assistant_turn is compact: it keeps only a turn's last
|
|
@@ -432,8 +454,13 @@ export function reconcileHistoryWithToolLedger(history, ledger) {
|
|
|
432
454
|
// result that precedes its call — a shape OpenAI-compatible providers
|
|
433
455
|
// reject with 400 ("tool must be a response to a preceding message with
|
|
434
456
|
// tool_calls").
|
|
435
|
-
|
|
436
|
-
|
|
457
|
+
const ownIndex = next.findIndex((item) => toolOccurrenceKey(canonicalToolItem(item) ?? { callId: '' }) === toolOccurrenceKey(entry));
|
|
458
|
+
const laterKeys = new Set(entries.slice(entryIndex + 1).map(toolOccurrenceKey));
|
|
459
|
+
const laterIndex = next.findIndex((item) => laterKeys.has(toolOccurrenceKey(canonicalToolItem(item) ?? { callId: '' })));
|
|
460
|
+
const anchor = insertionIndexForEntry(next, entry, latestTurnNumber);
|
|
461
|
+
const insertion = ownIndex >= 0 ? ownIndex : laterIndex >= 0 ? Math.min(anchor, laterIndex) : anchor;
|
|
462
|
+
next = next.filter((item) => toolOccurrenceKey(canonicalToolItem(item) ?? { callId: '' }) !== toolOccurrenceKey(entry));
|
|
463
|
+
next.splice(insertion, 0, ...clone(entry.historyItems));
|
|
437
464
|
// Count completed, aborted, and unknown pairs as injected so the warning
|
|
438
465
|
// fires and replaceHistory is called. Without this, synthetic pairs for
|
|
439
466
|
// interrupted calls would not trigger a history replacement, leaving
|
|
@@ -531,4 +558,70 @@ export function sanitizeMalformedToolCallArguments(history) {
|
|
|
531
558
|
});
|
|
532
559
|
return changed ? result : history;
|
|
533
560
|
}
|
|
561
|
+
/**
|
|
562
|
+
* Attach known admission identities to untagged provider snapshots in order.
|
|
563
|
+
* Payload matching avoids assigning an older settled sibling to a latest-only
|
|
564
|
+
* segment. Explicit tags are authoritative; no provider payload is rewritten.
|
|
565
|
+
*/
|
|
566
|
+
export function alignHistoryToolOccurrences(history, ledger) {
|
|
567
|
+
const used = new Set();
|
|
568
|
+
// A result belongs to the call we just aligned, not an independently chosen
|
|
569
|
+
// payload-equal sibling. Null also preserves an unmatched new admission.
|
|
570
|
+
const pending = new Map();
|
|
571
|
+
const comparable = (value) => {
|
|
572
|
+
if (typeof value === 'string') {
|
|
573
|
+
try {
|
|
574
|
+
return JSON.stringify(JSON.parse(value));
|
|
575
|
+
}
|
|
576
|
+
catch {
|
|
577
|
+
return value;
|
|
578
|
+
}
|
|
579
|
+
}
|
|
580
|
+
return JSON.stringify(value);
|
|
581
|
+
};
|
|
582
|
+
return history.map((item) => {
|
|
583
|
+
const tool = canonicalToolItem(item);
|
|
584
|
+
if (!tool)
|
|
585
|
+
return item;
|
|
586
|
+
const explicit = tool.occurrence !== undefined && tool.turnId !== undefined;
|
|
587
|
+
const pairKey = JSON.stringify([tool.turnId ?? '', tool.callId]);
|
|
588
|
+
const pairedResult = !explicit && tool.type === 'tool_result' && pending.has(pairKey);
|
|
589
|
+
const entry = pairedResult
|
|
590
|
+
? pending.get(pairKey)
|
|
591
|
+
: ledger.find((entry) => {
|
|
592
|
+
const key = `${tool.type}:${toolOccurrenceKey(entry)}`;
|
|
593
|
+
if (explicit)
|
|
594
|
+
return toolOccurrenceKey(entry) === toolOccurrenceKey(tool);
|
|
595
|
+
if (used.has(key) || entry.callId !== tool.callId)
|
|
596
|
+
return false;
|
|
597
|
+
const evidence = entry.historyItems?.flatMap(normalizeRunItem).find((item) => item.type === tool.type);
|
|
598
|
+
return tool.type === 'tool_call'
|
|
599
|
+
? comparable(evidence?.type === 'tool_call' ? evidence.arguments : entry.arguments) ===
|
|
600
|
+
comparable(tool.arguments)
|
|
601
|
+
: comparable(evidence?.type === 'tool_result' ? evidence.output : entry.output) === comparable(tool.output);
|
|
602
|
+
});
|
|
603
|
+
if (tool.type === 'tool_call')
|
|
604
|
+
pending.set(pairKey, entry ?? null);
|
|
605
|
+
else
|
|
606
|
+
pending.delete(pairKey);
|
|
607
|
+
if (!entry)
|
|
608
|
+
return item;
|
|
609
|
+
used.add(`${tool.type}:${toolOccurrenceKey(entry)}`);
|
|
610
|
+
return { ...item, ...toolOccurrenceMetadata(entry) };
|
|
611
|
+
});
|
|
612
|
+
}
|
|
613
|
+
/** Give legacy ordered entries deterministic ordinals before correlation. */
|
|
614
|
+
export function normalizeToolLedgerOccurrences(entries) {
|
|
615
|
+
const normalized = Array.isArray(entries) ? clone([...entries]) : [];
|
|
616
|
+
const counters = new Map();
|
|
617
|
+
for (const entry of normalized) {
|
|
618
|
+
const key = JSON.stringify([entry.turnId, entry.callId]);
|
|
619
|
+
entry.occurrence ??= (counters.get(key) ?? 0) + 1;
|
|
620
|
+
counters.set(key, Math.max(counters.get(key) ?? 0, entry.occurrence));
|
|
621
|
+
entry.historyItems = entry.historyItems?.map((item) => callIdOf(item) === entry.callId
|
|
622
|
+
? { ...providerHistoryItem(item), ...toolOccurrenceMetadata(entry) }
|
|
623
|
+
: item);
|
|
624
|
+
}
|
|
625
|
+
return normalized;
|
|
626
|
+
}
|
|
534
627
|
//# sourceMappingURL=tool-execution-ledger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-execution-ledger.js","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-execution-ledger.js","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-e2e.d.ts","sourceRoot":"","sources":["../../source/test-helpers/terminal-e2e.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3D,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACjD,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAIF,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,MAAM,CAAC,UAAe,GAAG,MAAM,CAAC,UAAU,CAQvF;
|
|
1
|
+
{"version":3,"file":"terminal-e2e.d.ts","sourceRoot":"","sources":["../../source/test-helpers/terminal-e2e.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3D,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACjD,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAIF,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,MAAM,CAAC,UAAe,GAAG,MAAM,CAAC,UAAU,CAQvF;AAiDD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,oBAAyB,GAAG,eAAe,CAoHlH"}
|
|
@@ -20,9 +20,44 @@ function tailOf(text, max = 800) {
|
|
|
20
20
|
const stripped = stripVTControlCharacters(text).trimEnd();
|
|
21
21
|
return stripped.length > max ? `…${stripped.slice(-max)}` : stripped;
|
|
22
22
|
}
|
|
23
|
-
const PYTHON_PTY_BRIDGE =
|
|
23
|
+
const PYTHON_PTY_BRIDGE = `
|
|
24
|
+
import fcntl
|
|
25
|
+
import os
|
|
26
|
+
import pty
|
|
27
|
+
import select
|
|
28
|
+
import struct
|
|
29
|
+
import sys
|
|
30
|
+
import termios
|
|
31
|
+
|
|
32
|
+
rows, cols = int(sys.argv[1]), int(sys.argv[2])
|
|
33
|
+
argv = sys.argv[3:]
|
|
34
|
+
pid, master = pty.fork()
|
|
35
|
+
if pid == 0:
|
|
36
|
+
os.execvp(argv[0], argv)
|
|
37
|
+
fcntl.ioctl(master, termios.TIOCSWINSZ, struct.pack('HHHH', rows, cols, 0, 0))
|
|
38
|
+
stdin_open = True
|
|
39
|
+
while True:
|
|
40
|
+
readers = [master] + ([sys.stdin.fileno()] if stdin_open else [])
|
|
41
|
+
readable, _, _ = select.select(readers, [], [])
|
|
42
|
+
if master in readable:
|
|
43
|
+
try:
|
|
44
|
+
chunk = os.read(master, 4096)
|
|
45
|
+
except OSError:
|
|
46
|
+
break
|
|
47
|
+
if not chunk:
|
|
48
|
+
break
|
|
49
|
+
os.write(sys.stdout.fileno(), chunk)
|
|
50
|
+
if stdin_open and sys.stdin.fileno() in readable:
|
|
51
|
+
chunk = os.read(sys.stdin.fileno(), 4096)
|
|
52
|
+
if chunk:
|
|
53
|
+
os.write(master, chunk)
|
|
54
|
+
else:
|
|
55
|
+
stdin_open = False
|
|
56
|
+
_, status = os.waitpid(pid, 0)
|
|
57
|
+
sys.exit(os.waitstatus_to_exitcode(status))
|
|
58
|
+
`;
|
|
24
59
|
export function spawnTerminal(command, args, options = {}) {
|
|
25
|
-
const terminal = spawn('python3', ['-u', '-c', PYTHON_PTY_BRIDGE, command, ...args], {
|
|
60
|
+
const terminal = spawn('python3', ['-u', '-c', PYTHON_PTY_BRIDGE, String(options.rows ?? 24), String(options.cols ?? 80), command, ...args], {
|
|
26
61
|
cwd: options.cwd ?? process.cwd(),
|
|
27
62
|
env: createTestChildEnv(options.env),
|
|
28
63
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-e2e.js","sourceRoot":"","sources":["../../source/test-helpers/terminal-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAwBrD,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;AAEtG,qFAAqF;AACrF,MAAM,UAAU,kBAAkB,CAAC,SAAS,GAAsB,EAAE;IAClE,MAAM,GAAG,GAAsB,EAAE,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC;IACD,GAAG,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAC5B,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC;IACtB,OAAO,EAAE,GAAG,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAElC,8EAA8E;AAC9E,6EAA6E;AAC7E,mCAAmC;AACnC,SAAS,MAAM,CAAC,IAAY,EAAE,GAAG,GAAG,GAAG;IACrC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1D,OAAO,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AACvE,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"terminal-e2e.js","sourceRoot":"","sources":["../../source/test-helpers/terminal-e2e.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goal-check.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/goal-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAEL,mBAAmB,EAGpB,MAAM,wDAAwD,CAAC;
|
|
1
|
+
{"version":3,"file":"goal-check.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/goal-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAEL,mBAAmB,EAGpB,MAAM,wDAAwD,CAAC;AAiChE;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,QAE0C,CAAC;AAE5E,eAAO,MAAM,6BAA6B,EAAE,oBAiB3C,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;CACxC,GAAG,cAAc,CAAC,OAAO,mBAAmB,EAAE,OAAO,oBAAoB,CAAC,CA2B1E"}
|