@scotthuang/agent-knock-knock 0.13.15 → 0.13.17
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/CHANGELOG.md +13 -0
- package/README.md +2 -1
- package/dist/src/claude-terminal-agent-adapter.js +1 -1
- package/dist/src/claude-terminal-agent-adapter.js.map +1 -1
- package/dist/src/cli-core.js +6 -3
- package/dist/src/cli-core.js.map +1 -1
- package/dist/src/codex-app-server-interaction-client.js +68 -26
- package/dist/src/codex-app-server-interaction-client.js.map +1 -1
- package/dist/src/codex-app-server-read-client.js +52 -20
- package/dist/src/codex-app-server-read-client.js.map +1 -1
- package/dist/src/codex-astra-composer-proof.js +1 -1
- package/dist/src/codex-astra-composer-proof.js.map +1 -1
- package/dist/src/codex-open-rollout-inventory.d.ts +51 -0
- package/dist/src/codex-open-rollout-inventory.js +365 -0
- package/dist/src/codex-open-rollout-inventory.js.map +1 -0
- package/dist/src/codex-paginated-thread-binding.js +1 -1
- package/dist/src/codex-paginated-thread-binding.js.map +1 -1
- package/dist/src/codex-permission-surface.d.ts +23 -0
- package/dist/src/codex-permission-surface.js +211 -0
- package/dist/src/codex-permission-surface.js.map +1 -0
- package/dist/src/codex-rollout-bound-completion.d.ts +44 -0
- package/dist/src/codex-rollout-bound-completion.js +357 -0
- package/dist/src/codex-rollout-bound-completion.js.map +1 -0
- package/dist/src/codex-rollout-file.d.ts +15 -0
- package/dist/src/codex-rollout-file.js +98 -0
- package/dist/src/codex-rollout-file.js.map +1 -0
- package/dist/src/codex-rollout-human-task.d.ts +61 -0
- package/dist/src/codex-rollout-human-task.js +555 -0
- package/dist/src/codex-rollout-human-task.js.map +1 -0
- package/dist/src/codex-rollout-interaction-evidence.d.ts +48 -0
- package/dist/src/codex-rollout-interaction-evidence.js +521 -0
- package/dist/src/codex-rollout-interaction-evidence.js.map +1 -0
- package/dist/src/codex-rollout-inventory.d.ts +5 -0
- package/dist/src/codex-rollout-inventory.js +81 -0
- package/dist/src/codex-rollout-inventory.js.map +1 -0
- package/dist/src/codex-rollout-records.d.ts +49 -0
- package/dist/src/codex-rollout-records.js +298 -0
- package/dist/src/codex-rollout-records.js.map +1 -0
- package/dist/src/codex-sqlite-thread-query.d.ts +85 -0
- package/dist/src/codex-sqlite-thread-query.js +440 -0
- package/dist/src/codex-sqlite-thread-query.js.map +1 -0
- package/dist/src/codex-status-history-navigation.d.ts +1 -1
- package/dist/src/codex-status-history-navigation.js +1 -1
- package/dist/src/codex-status-history-navigation.js.map +1 -1
- package/dist/src/codex-store-adapter.d.ts +3 -50
- package/dist/src/codex-store-adapter.js +5 -796
- package/dist/src/codex-store-adapter.js.map +1 -1
- package/dist/src/codex-terminal-agent-adapter.js +1 -1
- package/dist/src/codex-terminal-agent-adapter.js.map +1 -1
- package/dist/src/native-thread-lifecycle-cli-adapter.d.ts +7 -136
- package/dist/src/native-thread-lifecycle-cli-adapter.js +39 -633
- package/dist/src/native-thread-lifecycle-cli-adapter.js.map +1 -1
- package/dist/src/native-thread-lifecycle-cli-contract.d.ts +138 -0
- package/dist/src/native-thread-lifecycle-cli-contract.js +2 -0
- package/dist/src/native-thread-lifecycle-cli-contract.js.map +1 -0
- package/dist/src/semantic-permission-control.d.ts +19 -0
- package/dist/src/semantic-permission-control.js +201 -0
- package/dist/src/semantic-permission-control.js.map +1 -0
- package/dist/src/semantic-tool-command-helpers.d.ts +7 -0
- package/dist/src/semantic-tool-command-helpers.js +29 -1
- package/dist/src/semantic-tool-command-helpers.js.map +1 -1
- package/dist/src/semantic-tool-descriptions.d.ts +26 -0
- package/dist/src/semantic-tool-descriptions.js +259 -0
- package/dist/src/semantic-tool-descriptions.js.map +1 -0
- package/dist/src/semantic-tool-list-projection.js +4 -0
- package/dist/src/semantic-tool-list-projection.js.map +1 -1
- package/dist/src/semantic-tool-presentation.js +5 -2
- package/dist/src/semantic-tool-presentation.js.map +1 -1
- package/dist/src/semantic-tool-runtime.js +50 -36
- package/dist/src/semantic-tool-runtime.js.map +1 -1
- package/dist/src/semantic-tool-schemas.d.ts +33 -0
- package/dist/src/semantic-tool-schemas.js +165 -31
- package/dist/src/semantic-tool-schemas.js.map +1 -1
- package/dist/src/terminal-action-contracts.d.ts +4 -0
- package/dist/src/terminal-action-contracts.js +695 -0
- package/dist/src/terminal-action-contracts.js.map +1 -0
- package/dist/src/terminal-action-projection.d.ts +1 -1
- package/dist/src/terminal-action-projection.js.map +1 -1
- package/dist/src/terminal-agent-bridge.d.ts +3 -0
- package/dist/src/terminal-agent-bridge.js +11 -0
- package/dist/src/terminal-agent-bridge.js.map +1 -1
- package/dist/src/terminal-composer-classifier.d.ts +1 -1
- package/dist/src/terminal-composer-classifier.js +31 -5
- package/dist/src/terminal-composer-classifier.js.map +1 -1
- package/dist/src/terminal-interaction-response-bridge.js +1 -1
- package/dist/src/terminal-interaction-response-bridge.js.map +1 -1
- package/dist/src/terminal-list-cli-adapter.js +7 -12
- package/dist/src/terminal-list-cli-adapter.js.map +1 -1
- package/dist/src/terminal-list-renderer.d.ts +8 -2
- package/dist/src/terminal-list-renderer.js +37 -400
- package/dist/src/terminal-list-renderer.js.map +1 -1
- package/dist/src/terminal-model-control-action-policy.d.ts +1 -1
- package/dist/src/terminal-model-control-availability.d.ts +1 -1
- package/dist/src/terminal-model-control-availability.js +1 -1
- package/dist/src/terminal-model-control-availability.js.map +1 -1
- package/dist/src/terminal-model-control-cli-adapter.d.ts +34 -0
- package/dist/src/terminal-model-control-cli-adapter.js +669 -0
- package/dist/src/terminal-model-control-cli-adapter.js.map +1 -0
- package/dist/src/terminal-model-control-contract.d.ts +198 -0
- package/dist/src/terminal-model-control-contract.js +15 -0
- package/dist/src/terminal-model-control-contract.js.map +1 -0
- package/dist/src/terminal-model-control-input.d.ts +29 -0
- package/dist/src/terminal-model-control-input.js +86 -0
- package/dist/src/terminal-model-control-input.js.map +1 -0
- package/dist/src/terminal-model-control-profile.d.ts +2 -0
- package/dist/src/terminal-model-control-profile.js +6 -0
- package/dist/src/terminal-model-control-profile.js.map +1 -1
- package/dist/src/terminal-model-control-subject.d.ts +52 -0
- package/dist/src/terminal-model-control-subject.js +73 -0
- package/dist/src/terminal-model-control-subject.js.map +1 -1
- package/dist/src/terminal-model-control-surface.d.ts +82 -0
- package/dist/src/terminal-model-control-surface.js +688 -0
- package/dist/src/terminal-model-control-surface.js.map +1 -0
- package/dist/src/terminal-model-control.d.ts +6 -270
- package/dist/src/terminal-model-control.js +11 -988
- package/dist/src/terminal-model-control.js.map +1 -1
- package/dist/src/terminal-model-selection.d.ts +33 -0
- package/dist/src/terminal-model-selection.js +143 -0
- package/dist/src/terminal-model-selection.js.map +1 -0
- package/dist/src/terminal-monitor-application-service.js +38 -59
- package/dist/src/terminal-monitor-application-service.js.map +1 -1
- package/dist/src/terminal-monitor-attention-store.d.ts +65 -0
- package/dist/src/terminal-monitor-attention-store.js +518 -0
- package/dist/src/terminal-monitor-attention-store.js.map +1 -0
- package/dist/src/terminal-monitor-collateral-recovery.d.ts +12 -0
- package/dist/src/terminal-monitor-collateral-recovery.js +415 -0
- package/dist/src/terminal-monitor-collateral-recovery.js.map +1 -0
- package/dist/src/terminal-monitor-decision-policy.d.ts +1 -1
- package/dist/src/terminal-monitor-interaction-projection.d.ts +19 -0
- package/dist/src/terminal-monitor-interaction-projection.js +48 -0
- package/dist/src/terminal-monitor-interaction-projection.js.map +1 -0
- package/dist/src/terminal-monitor-startup-recovery.d.ts +15 -0
- package/dist/src/terminal-monitor-startup-recovery.js +767 -0
- package/dist/src/terminal-monitor-startup-recovery.js.map +1 -0
- package/dist/src/terminal-monitor-state-cli-adapter.d.ts +2 -104
- package/dist/src/terminal-monitor-state-cli-adapter.js +28 -1640
- package/dist/src/terminal-monitor-state-cli-adapter.js.map +1 -1
- package/dist/src/terminal-monitor-state-contract.d.ts +108 -0
- package/dist/src/terminal-monitor-state-contract.js +8 -0
- package/dist/src/terminal-monitor-state-contract.js.map +1 -0
- package/dist/src/terminal-native-control-cli-contract.d.ts +16 -0
- package/dist/src/terminal-native-control-cli-contract.js +2 -0
- package/dist/src/terminal-native-control-cli-contract.js.map +1 -0
- package/dist/src/terminal-native-inspection-bridge.d.ts +4 -153
- package/dist/src/terminal-native-inspection-bridge.js +7 -646
- package/dist/src/terminal-native-inspection-bridge.js.map +1 -1
- package/dist/src/terminal-native-inspection-contract.d.ts +128 -0
- package/dist/src/terminal-native-inspection-contract.js +38 -0
- package/dist/src/terminal-native-inspection-contract.js.map +1 -0
- package/dist/src/terminal-native-inspection-profile.d.ts +15 -0
- package/dist/src/terminal-native-inspection-profile.js +185 -0
- package/dist/src/terminal-native-inspection-profile.js.map +1 -0
- package/dist/src/terminal-native-inspection-proof.d.ts +62 -0
- package/dist/src/terminal-native-inspection-proof.js +362 -0
- package/dist/src/terminal-native-inspection-proof.js.map +1 -0
- package/dist/src/terminal-permission-control-availability.d.ts +31 -0
- package/dist/src/terminal-permission-control-availability.js +50 -0
- package/dist/src/terminal-permission-control-availability.js.map +1 -0
- package/dist/src/terminal-permission-control-bridge.d.ts +16 -0
- package/dist/src/terminal-permission-control-bridge.js +93 -0
- package/dist/src/terminal-permission-control-bridge.js.map +1 -0
- package/dist/src/terminal-permission-control-cli-adapter.d.ts +31 -0
- package/dist/src/terminal-permission-control-cli-adapter.js +152 -0
- package/dist/src/terminal-permission-control-cli-adapter.js.map +1 -0
- package/dist/src/terminal-permission-control-list-projection.d.ts +23 -0
- package/dist/src/terminal-permission-control-list-projection.js +47 -0
- package/dist/src/terminal-permission-control-list-projection.js.map +1 -0
- package/dist/src/terminal-permission-control-runtime.d.ts +28 -0
- package/dist/src/terminal-permission-control-runtime.js +88 -0
- package/dist/src/terminal-permission-control-runtime.js.map +1 -0
- package/dist/src/terminal-permission-control.d.ts +69 -0
- package/dist/src/terminal-permission-control.js +217 -0
- package/dist/src/terminal-permission-control.js.map +1 -0
- package/dist/src/terminal-runtime-cli-adapter.d.ts +2 -1
- package/dist/src/terminal-runtime-cli-adapter.js +1 -1
- package/dist/src/terminal-runtime-cli-adapter.js.map +1 -1
- package/dist/src/terminal-submission-acceptance.d.ts +5 -148
- package/dist/src/terminal-submission-acceptance.js +21 -1845
- package/dist/src/terminal-submission-acceptance.js.map +1 -1
- package/dist/src/terminal-watch-anchor-capture.d.ts +9 -0
- package/dist/src/terminal-watch-anchor-capture.js +139 -0
- package/dist/src/terminal-watch-anchor-capture.js.map +1 -0
- package/dist/src/terminal-watch-cli-adapter.d.ts +3 -117
- package/dist/src/terminal-watch-cli-adapter.js +10 -1992
- package/dist/src/terminal-watch-cli-adapter.js.map +1 -1
- package/dist/src/terminal-watch-cli-contract.d.ts +117 -0
- package/dist/src/terminal-watch-cli-contract.js +2 -0
- package/dist/src/terminal-watch-cli-contract.js.map +1 -0
- package/dist/src/terminal-watch-fallback-observation.d.ts +15 -0
- package/dist/src/terminal-watch-fallback-observation.js +249 -0
- package/dist/src/terminal-watch-fallback-observation.js.map +1 -0
- package/dist/src/terminal-watch-interaction-observation.d.ts +26 -0
- package/dist/src/terminal-watch-interaction-observation.js +262 -0
- package/dist/src/terminal-watch-interaction-observation.js.map +1 -0
- package/dist/src/terminal-watch-observation-adapter.d.ts +4 -0
- package/dist/src/terminal-watch-observation-adapter.js +307 -0
- package/dist/src/terminal-watch-observation-adapter.js.map +1 -0
- package/dist/src/terminal-watch-observation-evidence.d.ts +25 -0
- package/dist/src/terminal-watch-observation-evidence.js +184 -0
- package/dist/src/terminal-watch-observation-evidence.js.map +1 -0
- package/dist/src/terminal-watch-response-authority.d.ts +6 -0
- package/dist/src/terminal-watch-response-authority.js +333 -0
- package/dist/src/terminal-watch-response-authority.js.map +1 -0
- package/dist/src/terminal-watch-response-cli-adapter.d.ts +3 -0
- package/dist/src/terminal-watch-response-cli-adapter.js +230 -0
- package/dist/src/terminal-watch-response-cli-adapter.js.map +1 -0
- package/dist/src/terminal-watch-terminal-identity.d.ts +39 -0
- package/dist/src/terminal-watch-terminal-identity.js +380 -0
- package/dist/src/terminal-watch-terminal-identity.js.map +1 -0
- package/docs/codex-permissions.md +95 -0
- package/openclaw.plugin.json +9 -1
- package/package.json +3 -2
- package/templates/openclaw-skills/agent-knock-knock/SKILL.md +6 -1
|
@@ -0,0 +1,415 @@
|
|
|
1
|
+
/** Repair legacy collateral stalls only from exact completion, delivery, and owner evidence. */
|
|
2
|
+
import { listDeferredForegroundTransfers } from "./deferred-foreground-transfer.js";
|
|
3
|
+
import { isFinalDeferredForegroundTransferStatus } from "./deferred-foreground-transfer-policy.js";
|
|
4
|
+
import { isSessionSendBlockingStatus, sessionIdForConversation, turnIdForConversation } from "./protocol.js";
|
|
5
|
+
import { appendEvent, listConversations, loadState, logPathForStatePath, saveState, withStoreWriterLeaseAsync } from "./store.js";
|
|
6
|
+
import { readNdjsonLog } from "./transcript.js";
|
|
7
|
+
import { cliNow, cliRuntimeLog } from "./cli-runtime-context.js";
|
|
8
|
+
import { terminalControlFromTakeover } from "./terminal-runtime-cli-adapter.js";
|
|
9
|
+
import { terminalControlsShareIncarnation } from "./terminal-authority-policy.js";
|
|
10
|
+
import { terminalBridgeSubmission } from "./terminal-dispatch-receipt.js";
|
|
11
|
+
import { validTerminalMonitorTimestampMs } from "./terminal-monitor-decision-policy.js";
|
|
12
|
+
import { isRecord, nonBlankString } from "./value-guards.js";
|
|
13
|
+
import { COLLATERAL_STALL_REASON, takeoverFor } from "./terminal-monitor-state-contract.js";
|
|
14
|
+
export class TerminalMonitorCollateralRecovery {
|
|
15
|
+
#dependencies;
|
|
16
|
+
#stateFileLock;
|
|
17
|
+
constructor(dependencies, stateFileLock) {
|
|
18
|
+
this.#dependencies = dependencies;
|
|
19
|
+
this.#stateFileLock = stateFileLock;
|
|
20
|
+
}
|
|
21
|
+
#stallOtherConversations(input) {
|
|
22
|
+
const stalledConversationIds = [];
|
|
23
|
+
for (const listed of listConversations(input.storeDir)) {
|
|
24
|
+
if (listed.conversation_id === input.currentConversationId ||
|
|
25
|
+
!isSessionSendBlockingStatus(listed.status)) {
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
const listedTakeover = takeoverFor(listed);
|
|
29
|
+
if (listedTakeover?.terminal_bridge !== true ||
|
|
30
|
+
!terminalControlsShareIncarnation(terminalControlFromTakeover(listedTakeover), input.terminalControl)) {
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const statePath = nonBlankString(listed.state_path);
|
|
34
|
+
if (!statePath) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
const release = this.#stateFileLock.acquire(`${statePath}.lock`);
|
|
38
|
+
try {
|
|
39
|
+
const current = loadState(statePath);
|
|
40
|
+
const currentTakeover = takeoverFor(current);
|
|
41
|
+
if (!isSessionSendBlockingStatus(current.status) ||
|
|
42
|
+
currentTakeover?.terminal_bridge !== true ||
|
|
43
|
+
!terminalControlsShareIncarnation(terminalControlFromTakeover(currentTakeover), input.terminalControl)) {
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
const stalledAt = cliNow().toISOString();
|
|
47
|
+
const stalledConversation = {
|
|
48
|
+
...current,
|
|
49
|
+
status: "stalled",
|
|
50
|
+
stalled_at: stalledAt,
|
|
51
|
+
stalled_reason: COLLATERAL_STALL_REASON,
|
|
52
|
+
native_session_takeover: {
|
|
53
|
+
...currentTakeover,
|
|
54
|
+
terminal_bridge_uncertain_dispatch_fence: {
|
|
55
|
+
message_id: input.uncertainMessageId,
|
|
56
|
+
observed_at: stalledAt,
|
|
57
|
+
previous_status: current.status
|
|
58
|
+
}
|
|
59
|
+
},
|
|
60
|
+
updated_at: stalledAt
|
|
61
|
+
};
|
|
62
|
+
saveState(statePath, stalledConversation);
|
|
63
|
+
try {
|
|
64
|
+
appendEvent(logPathForStatePath(statePath), {
|
|
65
|
+
ts: stalledAt,
|
|
66
|
+
conversation_id: current.conversation_id,
|
|
67
|
+
event: "terminal_bridge_stalled_by_uncertain_dispatch",
|
|
68
|
+
terminal_control: input.terminalControl,
|
|
69
|
+
uncertain_message_id: input.uncertainMessageId
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
// State plus the terminal ledger are the authoritative fence.
|
|
74
|
+
}
|
|
75
|
+
stalledConversationIds.push(current.conversation_id);
|
|
76
|
+
}
|
|
77
|
+
finally {
|
|
78
|
+
release();
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return stalledConversationIds;
|
|
82
|
+
}
|
|
83
|
+
stallOther(input) {
|
|
84
|
+
return this.#stallOtherConversations(input);
|
|
85
|
+
}
|
|
86
|
+
#exactCollateralRepairEvidence(conversation, storeDir) {
|
|
87
|
+
const source = collateralSourceEvidence(conversation);
|
|
88
|
+
if (!source)
|
|
89
|
+
return undefined;
|
|
90
|
+
const { uncertainMessageId } = source;
|
|
91
|
+
const control = this.#dependencies.authority
|
|
92
|
+
.terminalControlForConversation(conversation);
|
|
93
|
+
if (!control) {
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
const ownerCandidates = listConversations(storeDir).filter((candidate) => {
|
|
97
|
+
if (candidate.conversation_id === conversation.conversation_id) {
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
const candidateTakeover = takeoverFor(candidate);
|
|
101
|
+
const candidateSubmission = terminalBridgeSubmission(candidate);
|
|
102
|
+
return candidateTakeover?.terminal_bridge === true &&
|
|
103
|
+
nonBlankString(candidateTakeover.terminal_bridge_message_id) ===
|
|
104
|
+
uncertainMessageId &&
|
|
105
|
+
nonBlankString(candidateSubmission?.message_id) === uncertainMessageId &&
|
|
106
|
+
terminalControlsShareIncarnation(this.#dependencies.authority.terminalControlForConversation(candidate), control);
|
|
107
|
+
});
|
|
108
|
+
if (ownerCandidates.length !== 1) {
|
|
109
|
+
return undefined;
|
|
110
|
+
}
|
|
111
|
+
return this.#verifyCollateralOwner({
|
|
112
|
+
...source,
|
|
113
|
+
control,
|
|
114
|
+
ownerListed: ownerCandidates[0]
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
#verifyCollateralOwner(input) {
|
|
118
|
+
const ownerStatePath = nonBlankString(input.ownerListed.state_path);
|
|
119
|
+
if (!ownerStatePath) {
|
|
120
|
+
return undefined;
|
|
121
|
+
}
|
|
122
|
+
let owner;
|
|
123
|
+
let ownerEvents;
|
|
124
|
+
let events;
|
|
125
|
+
try {
|
|
126
|
+
owner = loadState(ownerStatePath);
|
|
127
|
+
ownerEvents = readNdjsonLog(nonBlankString(owner.event_log_path) ??
|
|
128
|
+
logPathForStatePath(ownerStatePath));
|
|
129
|
+
const statePath = nonBlankString(input.conversation.state_path);
|
|
130
|
+
if (!statePath) {
|
|
131
|
+
return undefined;
|
|
132
|
+
}
|
|
133
|
+
events = readNdjsonLog(nonBlankString(input.conversation.event_log_path) ??
|
|
134
|
+
logPathForStatePath(statePath));
|
|
135
|
+
}
|
|
136
|
+
catch {
|
|
137
|
+
return undefined;
|
|
138
|
+
}
|
|
139
|
+
const ownerTakeover = takeoverFor(owner);
|
|
140
|
+
const ownerSubmission = terminalBridgeSubmission(owner);
|
|
141
|
+
const ownerClosedAt = nonBlankString(owner.closed_at);
|
|
142
|
+
const ownerClosedAtMs = validTerminalMonitorTimestampMs(ownerClosedAt);
|
|
143
|
+
if (owner.conversation_id !== input.ownerListed.conversation_id ||
|
|
144
|
+
owner.status !== "closed" ||
|
|
145
|
+
!ownerClosedAt ||
|
|
146
|
+
ownerClosedAtMs === undefined ||
|
|
147
|
+
ownerClosedAtMs < input.fenceAtMs ||
|
|
148
|
+
!nonBlankString(owner.close_reason) ||
|
|
149
|
+
owner.updated_at !== ownerClosedAt ||
|
|
150
|
+
ownerTakeover?.terminal_bridge !== true ||
|
|
151
|
+
nonBlankString(ownerTakeover.terminal_bridge_message_id) !==
|
|
152
|
+
input.uncertainMessageId ||
|
|
153
|
+
ownerSubmission?.status !== "uncertain" ||
|
|
154
|
+
nonBlankString(ownerSubmission.message_id) !== input.uncertainMessageId ||
|
|
155
|
+
nonBlankString(ownerSubmission.session_id) !== sessionIdForConversation(owner) ||
|
|
156
|
+
nonBlankString(ownerSubmission.turn_id) !== turnIdForConversation(owner) ||
|
|
157
|
+
isRecord(ownerTakeover.terminal_bridge_uncertain_dispatch_fence) ||
|
|
158
|
+
!terminalControlsShareIncarnation(this.#dependencies.authority.terminalControlForConversation(owner), input.control)) {
|
|
159
|
+
return undefined;
|
|
160
|
+
}
|
|
161
|
+
if (!this.#hasExactCollateralEvents(input, owner, ownerClosedAt, events, ownerEvents)) {
|
|
162
|
+
return undefined;
|
|
163
|
+
}
|
|
164
|
+
return {
|
|
165
|
+
uncertainMessageId: input.uncertainMessageId,
|
|
166
|
+
ownerConversationId: owner.conversation_id,
|
|
167
|
+
restoredStatus: "idle"
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
#hasExactCollateralEvents(input, owner, ownerClosedAt, events, ownerEvents) {
|
|
171
|
+
const hasCompletionClaim = events.some((event) => event.event === "terminal_bridge_completion_claimed" &&
|
|
172
|
+
event.conversation_id === input.conversation.conversation_id &&
|
|
173
|
+
event.terminal_bridge_message_id === input.ownMessageId &&
|
|
174
|
+
event.callback_message_id === input.callbackMessageId &&
|
|
175
|
+
event.completion_fingerprint === input.completionClaim.completion_fingerprint &&
|
|
176
|
+
event.completion_id === input.completionClaim.completion_id &&
|
|
177
|
+
event.outcome === "success" &&
|
|
178
|
+
event.ts === input.claimedAt);
|
|
179
|
+
const hasCompletionDetected = events.some((event) => event.event === "terminal_bridge_completion_detected" &&
|
|
180
|
+
event.conversation_id === input.conversation.conversation_id &&
|
|
181
|
+
event.terminal_bridge_message_id === input.ownMessageId &&
|
|
182
|
+
event.callback_message_id === input.callbackMessageId &&
|
|
183
|
+
event.completion_id === input.completionClaim.completion_id &&
|
|
184
|
+
event.completion_outcome === "success" &&
|
|
185
|
+
validTerminalMonitorTimestampMs(event.ts) !== undefined &&
|
|
186
|
+
validTerminalMonitorTimestampMs(event.ts) <= input.fenceAtMs);
|
|
187
|
+
const hasDeliveredCallback = events.some((event) => event.event === "callback_delivery_succeeded" &&
|
|
188
|
+
event.conversation_id === input.conversation.conversation_id &&
|
|
189
|
+
event.message_id === input.callbackMessageId &&
|
|
190
|
+
event.status === "idle" &&
|
|
191
|
+
event.ts === input.deliveredAt);
|
|
192
|
+
const hasExactFence = events.some((event) => event.event === "terminal_bridge_stalled_by_uncertain_dispatch" &&
|
|
193
|
+
event.conversation_id === input.conversation.conversation_id &&
|
|
194
|
+
event.uncertain_message_id === input.uncertainMessageId &&
|
|
195
|
+
event.ts === input.fenceObservedAt);
|
|
196
|
+
const hasExactOwnerClose = ownerEvents.some((event) => event.event === "conversation_closed" &&
|
|
197
|
+
event.conversation_id === owner.conversation_id &&
|
|
198
|
+
event.status === "closed" &&
|
|
199
|
+
event.ts === ownerClosedAt &&
|
|
200
|
+
event.reason === owner.close_reason);
|
|
201
|
+
return hasCompletionClaim && hasCompletionDetected &&
|
|
202
|
+
hasDeliveredCallback && hasExactFence && hasExactOwnerClose;
|
|
203
|
+
}
|
|
204
|
+
async reconcileCollateral(storeDir, conversationId) {
|
|
205
|
+
return withStoreWriterLeaseAsync(storeDir, async () => this.#reconcileCollateralLocked(storeDir, conversationId));
|
|
206
|
+
}
|
|
207
|
+
#reconcileCollateralLocked(storeDir, conversationId) {
|
|
208
|
+
const reservedSourceTurnIds = new Set(listDeferredForegroundTransfers(storeDir)
|
|
209
|
+
.filter((transfer) => transfer.version === 2 &&
|
|
210
|
+
transfer.source_kind === "candidate_rollout_quiescent" &&
|
|
211
|
+
!isFinalDeferredForegroundTransferStatus(transfer.status))
|
|
212
|
+
.flatMap((transfer) => (transfer.source_turn_history ?? []).map((turn) => turn.turn_id)));
|
|
213
|
+
const candidates = listConversations(storeDir).filter((conversation) => {
|
|
214
|
+
const takeover = takeoverFor(conversation);
|
|
215
|
+
return (conversationId === undefined ||
|
|
216
|
+
conversation.conversation_id === conversationId) &&
|
|
217
|
+
!reservedSourceTurnIds.has(turnIdForConversation(conversation)) &&
|
|
218
|
+
conversation.status === "stalled" &&
|
|
219
|
+
isRecord(takeover?.terminal_bridge_uncertain_dispatch_fence);
|
|
220
|
+
});
|
|
221
|
+
const result = {
|
|
222
|
+
checked: candidates.length,
|
|
223
|
+
repaired: 0,
|
|
224
|
+
skipped: 0,
|
|
225
|
+
errors: [],
|
|
226
|
+
items: []
|
|
227
|
+
};
|
|
228
|
+
for (const listed of candidates) {
|
|
229
|
+
this.#reconcileCollateralCandidate(storeDir, listed, result);
|
|
230
|
+
}
|
|
231
|
+
return result;
|
|
232
|
+
}
|
|
233
|
+
#reconcileCollateralCandidate(storeDir, listed, result) {
|
|
234
|
+
const statePath = nonBlankString(listed.state_path);
|
|
235
|
+
if (!statePath) {
|
|
236
|
+
result.skipped += 1;
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
239
|
+
let release;
|
|
240
|
+
try {
|
|
241
|
+
release = this.#stateFileLock.acquire(`${statePath}.lock`);
|
|
242
|
+
const current = loadState(statePath);
|
|
243
|
+
const evidence = this.#exactCollateralRepairEvidence(current, storeDir);
|
|
244
|
+
if (!evidence) {
|
|
245
|
+
result.skipped += 1;
|
|
246
|
+
return;
|
|
247
|
+
}
|
|
248
|
+
const repaired = this.#persistCollateralRepair(statePath, current, evidence);
|
|
249
|
+
result.repaired += 1;
|
|
250
|
+
result.items.push(repaired);
|
|
251
|
+
}
|
|
252
|
+
catch (error) {
|
|
253
|
+
result.skipped += 1;
|
|
254
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
255
|
+
result.errors.push(`${listed.conversation_id}: ${reason}`);
|
|
256
|
+
result.items.push({
|
|
257
|
+
conversation_id: listed.conversation_id,
|
|
258
|
+
status: "error",
|
|
259
|
+
reason
|
|
260
|
+
});
|
|
261
|
+
}
|
|
262
|
+
finally {
|
|
263
|
+
release?.();
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
#persistCollateralRepair(statePath, current, evidence) {
|
|
267
|
+
const takeover = { ...takeoverFor(current) };
|
|
268
|
+
delete takeover.terminal_bridge_uncertain_dispatch_fence;
|
|
269
|
+
const repairedAt = cliNow().toISOString();
|
|
270
|
+
takeover.terminal_bridge_collateral_stall_repair = {
|
|
271
|
+
repaired_at: repairedAt,
|
|
272
|
+
uncertain_message_id: evidence.uncertainMessageId,
|
|
273
|
+
uncertain_owner_conversation_id: evidence.ownerConversationId,
|
|
274
|
+
restored_status: evidence.restoredStatus,
|
|
275
|
+
evidence: "foreign_uncertain_fence+completion_claim+delivered_callback+closed_owner"
|
|
276
|
+
};
|
|
277
|
+
const conversation = {
|
|
278
|
+
...current,
|
|
279
|
+
status: evidence.restoredStatus,
|
|
280
|
+
native_session_takeover: takeover,
|
|
281
|
+
updated_at: repairedAt
|
|
282
|
+
};
|
|
283
|
+
delete conversation.stalled_at;
|
|
284
|
+
delete conversation.stalled_reason;
|
|
285
|
+
saveState(statePath, conversation);
|
|
286
|
+
const eventWarning = this.#appendCollateralRepairEvent(statePath, current, evidence, repairedAt);
|
|
287
|
+
return {
|
|
288
|
+
conversation_id: current.conversation_id,
|
|
289
|
+
status: "repaired",
|
|
290
|
+
reason: "legacy_terminal_bridge_collateral_stall",
|
|
291
|
+
uncertain_message_id: evidence.uncertainMessageId,
|
|
292
|
+
uncertain_owner_conversation_id: evidence.ownerConversationId,
|
|
293
|
+
restored_status: evidence.restoredStatus,
|
|
294
|
+
...(eventWarning ? { event_warning: eventWarning } : {})
|
|
295
|
+
};
|
|
296
|
+
}
|
|
297
|
+
#appendCollateralRepairEvent(statePath, current, evidence, repairedAt) {
|
|
298
|
+
try {
|
|
299
|
+
appendEvent(nonBlankString(current.event_log_path) ??
|
|
300
|
+
logPathForStatePath(statePath), {
|
|
301
|
+
ts: repairedAt,
|
|
302
|
+
conversation_id: current.conversation_id,
|
|
303
|
+
event: "terminal_bridge_collateral_stall_repaired",
|
|
304
|
+
uncertain_message_id: evidence.uncertainMessageId,
|
|
305
|
+
uncertain_owner_conversation_id: evidence.ownerConversationId,
|
|
306
|
+
previous_status: "stalled",
|
|
307
|
+
restored_status: evidence.restoredStatus,
|
|
308
|
+
evidence: "foreign_uncertain_fence+completion_claim+delivered_callback+closed_owner"
|
|
309
|
+
});
|
|
310
|
+
return undefined;
|
|
311
|
+
}
|
|
312
|
+
catch (error) {
|
|
313
|
+
const warning = error instanceof Error ? error.message : String(error);
|
|
314
|
+
cliRuntimeLog("warn", "terminal_bridge_collateral_stall_repair_event_failed", {
|
|
315
|
+
conversation_id: current.conversation_id,
|
|
316
|
+
uncertain_message_id: evidence.uncertainMessageId,
|
|
317
|
+
error: warning
|
|
318
|
+
});
|
|
319
|
+
return warning;
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
/** Validate the source receipt before consulting any collateral owner. */
|
|
324
|
+
function collateralSourceEvidence(conversation) {
|
|
325
|
+
if (conversation.status !== "stalled" ||
|
|
326
|
+
conversation.stalled_reason !== COLLATERAL_STALL_REASON) {
|
|
327
|
+
return undefined;
|
|
328
|
+
}
|
|
329
|
+
const takeover = takeoverFor(conversation);
|
|
330
|
+
const fence = isRecord(takeover?.terminal_bridge_uncertain_dispatch_fence)
|
|
331
|
+
? takeover.terminal_bridge_uncertain_dispatch_fence
|
|
332
|
+
: undefined;
|
|
333
|
+
const uncertainMessageId = nonBlankString(fence?.message_id);
|
|
334
|
+
const fenceObservedAt = nonBlankString(fence?.observed_at);
|
|
335
|
+
const previousStatus = nonBlankString(fence?.previous_status);
|
|
336
|
+
const ownMessageId = nonBlankString(takeover?.terminal_bridge_message_id);
|
|
337
|
+
const ownSubmission = terminalBridgeSubmission(conversation);
|
|
338
|
+
const completionClaim = isRecord(takeover?.terminal_bridge_completion_claim)
|
|
339
|
+
? takeover.terminal_bridge_completion_claim
|
|
340
|
+
: undefined;
|
|
341
|
+
const callbackDelivery = isRecord(conversation.callback_delivery)
|
|
342
|
+
? conversation.callback_delivery
|
|
343
|
+
: undefined;
|
|
344
|
+
const callbackMessage = isRecord(callbackDelivery?.message)
|
|
345
|
+
? callbackDelivery.message
|
|
346
|
+
: undefined;
|
|
347
|
+
const idleSince = nonBlankString(conversation.idle_since);
|
|
348
|
+
const deliveredAt = nonBlankString(callbackDelivery?.delivered_at);
|
|
349
|
+
const claimedAt = nonBlankString(completionClaim?.claimed_at);
|
|
350
|
+
const fenceAtMs = validTerminalMonitorTimestampMs(fenceObservedAt);
|
|
351
|
+
const idleAtMs = validTerminalMonitorTimestampMs(idleSince);
|
|
352
|
+
const deliveredAtMs = validTerminalMonitorTimestampMs(deliveredAt);
|
|
353
|
+
const claimedAtMs = validTerminalMonitorTimestampMs(claimedAt);
|
|
354
|
+
if (takeover?.terminal_bridge !== true ||
|
|
355
|
+
!uncertainMessageId ||
|
|
356
|
+
!fenceObservedAt ||
|
|
357
|
+
fenceAtMs === undefined ||
|
|
358
|
+
uncertainMessageId === ownMessageId ||
|
|
359
|
+
(previousStatus !== undefined && previousStatus !== "idle") ||
|
|
360
|
+
conversation.stalled_at !== fenceObservedAt ||
|
|
361
|
+
conversation.updated_at !== fenceObservedAt ||
|
|
362
|
+
!idleSince ||
|
|
363
|
+
idleAtMs === undefined ||
|
|
364
|
+
idleAtMs > fenceAtMs ||
|
|
365
|
+
!ownMessageId ||
|
|
366
|
+
ownSubmission?.status !== "agent_accepted" ||
|
|
367
|
+
nonBlankString(ownSubmission.message_id) !== ownMessageId ||
|
|
368
|
+
nonBlankString(ownSubmission.session_id) !==
|
|
369
|
+
sessionIdForConversation(conversation) ||
|
|
370
|
+
nonBlankString(ownSubmission.turn_id) !== turnIdForConversation(conversation) ||
|
|
371
|
+
!completionClaim ||
|
|
372
|
+
nonBlankString(completionClaim.terminal_bridge_message_id) !== ownMessageId ||
|
|
373
|
+
completionClaim.outcome !== "success" ||
|
|
374
|
+
!claimedAt ||
|
|
375
|
+
claimedAtMs === undefined ||
|
|
376
|
+
claimedAtMs > fenceAtMs ||
|
|
377
|
+
callbackDelivery?.status !== "delivered" ||
|
|
378
|
+
callbackDelivery.final_status !== "idle" ||
|
|
379
|
+
callbackDelivery.preserve_conversation_status !== true ||
|
|
380
|
+
!callbackMessage ||
|
|
381
|
+
!collateralCallbackMatchesSource(callbackMessage, completionClaim, conversation, ownMessageId) ||
|
|
382
|
+
!deliveredAt ||
|
|
383
|
+
deliveredAtMs === undefined ||
|
|
384
|
+
deliveredAtMs > fenceAtMs) {
|
|
385
|
+
return undefined;
|
|
386
|
+
}
|
|
387
|
+
return {
|
|
388
|
+
conversation,
|
|
389
|
+
takeover,
|
|
390
|
+
ownMessageId,
|
|
391
|
+
completionClaim,
|
|
392
|
+
callbackMessage,
|
|
393
|
+
callbackMessageId: nonBlankString(callbackMessage.id),
|
|
394
|
+
deliveredAt,
|
|
395
|
+
claimedAt,
|
|
396
|
+
fenceObservedAt,
|
|
397
|
+
fenceAtMs,
|
|
398
|
+
uncertainMessageId
|
|
399
|
+
};
|
|
400
|
+
}
|
|
401
|
+
function collateralCallbackMatchesSource(callbackMessage, completionClaim, conversation, ownMessageId) {
|
|
402
|
+
return !(callbackMessage.type !== "done" ||
|
|
403
|
+
callbackMessage.requires_response !== false ||
|
|
404
|
+
nonBlankString(callbackMessage.id) !==
|
|
405
|
+
nonBlankString(completionClaim.callback_message_id) ||
|
|
406
|
+
nonBlankString(callbackMessage.conversation_id) !==
|
|
407
|
+
conversation.conversation_id ||
|
|
408
|
+
nonBlankString(callbackMessage.session_id) !==
|
|
409
|
+
sessionIdForConversation(conversation) ||
|
|
410
|
+
nonBlankString(callbackMessage.turn_id) !== turnIdForConversation(conversation) ||
|
|
411
|
+
nonBlankString(isRecord(callbackMessage.metadata)
|
|
412
|
+
? callbackMessage.metadata.terminal_bridge_message_id
|
|
413
|
+
: undefined) !== ownMessageId);
|
|
414
|
+
}
|
|
415
|
+
//# sourceMappingURL=terminal-monitor-collateral-recovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terminal-monitor-collateral-recovery.js","sourceRoot":"","sources":["../../src/terminal-monitor-collateral-recovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,8 +32,8 @@ export declare function decideTerminalMonitorApproval(input: TerminalMonitorAppr
|
|
|
32
32
|
markPromptCleared: boolean;
|
|
33
33
|
suppressions: TerminalMonitorApprovalSuppression[];
|
|
34
34
|
notification: {
|
|
35
|
-
kind: string;
|
|
36
35
|
reason?: undefined;
|
|
36
|
+
kind: string;
|
|
37
37
|
};
|
|
38
38
|
} | {
|
|
39
39
|
markPromptCleared: boolean;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/** Managed-Turn interaction normalization and public projection, without effects. */
|
|
2
|
+
import { type Conversation, type Executor } from "./protocol.js";
|
|
3
|
+
import type { TerminalControlRef } from "./terminal-agent-adapter.js";
|
|
4
|
+
import type { TerminalBridgeStatus } from "./terminal-agent-bridge.js";
|
|
5
|
+
import { type TerminalInteractionSubjectProjection } from "./terminal-interaction-protocol.js";
|
|
6
|
+
interface MonitorInteractionProjectionInput {
|
|
7
|
+
state: {
|
|
8
|
+
conversation: Conversation;
|
|
9
|
+
executor: Pick<Executor, "kind">;
|
|
10
|
+
};
|
|
11
|
+
terminalStatus: TerminalBridgeStatus;
|
|
12
|
+
terminalControl: TerminalControlRef;
|
|
13
|
+
currentMessageId?: string;
|
|
14
|
+
}
|
|
15
|
+
export declare function normalizeManagedMonitorInteraction(input: MonitorInteractionProjectionInput, projection: NonNullable<TerminalBridgeStatus["interaction_state"]>, fingerprint: string | undefined, surfaceId: string | undefined): TerminalInteractionSubjectProjection | undefined;
|
|
16
|
+
export declare function terminalInteractionSurfaceId(value: unknown): string | undefined;
|
|
17
|
+
export declare function interactionCallbackPublicConversation(conversation: Conversation): Conversation;
|
|
18
|
+
export declare function interactionObservationMatchesMonitor(input: MonitorInteractionProjectionInput, projection: TerminalBridgeStatus["interaction_state"]): boolean;
|
|
19
|
+
export {};
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/** Managed-Turn interaction normalization and public projection, without effects. */
|
|
2
|
+
import { turnIdForConversation } from "./protocol.js";
|
|
3
|
+
import { normalizeTerminalInteractionProjectionV2 } from "./terminal-interaction-protocol.js";
|
|
4
|
+
import { nonBlankString as stringValue } from "./value-guards.js";
|
|
5
|
+
export function normalizeManagedMonitorInteraction(input, projection, fingerprint, surfaceId) {
|
|
6
|
+
if (!input.currentMessageId || !fingerprint || !surfaceId) {
|
|
7
|
+
return undefined;
|
|
8
|
+
}
|
|
9
|
+
try {
|
|
10
|
+
return normalizeTerminalInteractionProjectionV2(projection, {
|
|
11
|
+
subject: {
|
|
12
|
+
kind: "managed_turn",
|
|
13
|
+
turn_id: turnIdForConversation(input.state.conversation),
|
|
14
|
+
message_id: input.currentMessageId
|
|
15
|
+
},
|
|
16
|
+
surfaceId,
|
|
17
|
+
promptFingerprint: fingerprint,
|
|
18
|
+
responseAuthority: projection.state === "pending" &&
|
|
19
|
+
projection.capabilities.respond
|
|
20
|
+
? "executable"
|
|
21
|
+
: "notify_only"
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
export function terminalInteractionSurfaceId(value) {
|
|
29
|
+
const candidate = stringValue(value);
|
|
30
|
+
return candidate && /^tis_[0-9a-f]{40}$/u.test(candidate)
|
|
31
|
+
? candidate
|
|
32
|
+
: undefined;
|
|
33
|
+
}
|
|
34
|
+
export function interactionCallbackPublicConversation(conversation) {
|
|
35
|
+
const projected = { ...conversation };
|
|
36
|
+
delete projected.native_session_takeover;
|
|
37
|
+
delete projected.callback_delivery;
|
|
38
|
+
delete projected.callback_notification_delivery;
|
|
39
|
+
return projected;
|
|
40
|
+
}
|
|
41
|
+
export function interactionObservationMatchesMonitor(input, projection) {
|
|
42
|
+
return input.terminalStatus.reachable &&
|
|
43
|
+
input.terminalStatus.provider === input.terminalControl.kind &&
|
|
44
|
+
input.terminalStatus.target === input.terminalControl.target &&
|
|
45
|
+
input.terminalStatus.agent === input.state.executor.kind &&
|
|
46
|
+
(projection === undefined || projection.agent === input.state.executor.kind);
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=terminal-monitor-interaction-projection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terminal-monitor-interaction-projection.js","sourceRoot":"","sources":["../../src/terminal-monitor-interaction-projection.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,OAAO,EAAE,qBAAqB,EAAoC,MAAM,eAAe,CAAC;AAGxF,OAAO,EACL,wCAAwC,EAEzC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,cAAc,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AASlE,MAAM,UAAU,kCAAkC,CAChD,KAAwC,EACxC,UAAkE,EAClE,WAA+B,EAC/B,SAA6B;IAE7B,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1D,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC;QACH,OAAO,wCAAwC,CAAC,UAAU,EAAE;YAC1D,OAAO,EAAE;gBACP,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC;gBACxD,UAAU,EAAE,KAAK,CAAC,gBAAgB;aACnC;YACD,SAAS;YACT,iBAAiB,EAAE,WAAW;YAC9B,iBAAiB,EAAE,UAAU,CAAC,KAAK,KAAK,SAAS;gBAC7C,UAAU,CAAC,YAAY,CAAC,OAAO;gBACjC,CAAC,CAAC,YAAY;gBACd,CAAC,CAAC,aAAa;SAClB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,KAAc;IACzD,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACrC,OAAO,SAAS,IAAI,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC;QACvD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,qCAAqC,CACnD,YAA0B;IAE1B,MAAM,SAAS,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC;IACtC,OAAO,SAAS,CAAC,uBAAuB,CAAC;IACzC,OAAO,SAAS,CAAC,iBAAiB,CAAC;IACnC,OAAO,SAAS,CAAC,8BAA8B,CAAC;IAChD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,oCAAoC,CAClD,KAAwC,EACxC,UAAqD;IAErD,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS;QACnC,KAAK,CAAC,cAAc,CAAC,QAAQ,KAAK,KAAK,CAAC,eAAe,CAAC,IAAI;QAC5D,KAAK,CAAC,cAAc,CAAC,MAAM,KAAK,KAAK,CAAC,eAAe,CAAC,MAAM;QAC5D,KAAK,CAAC,cAAc,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI;QACxD,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACjF,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { type Conversation } from "./protocol.js";
|
|
2
|
+
import type { createFileLockCliAdapter } from "./file-lock-cli-adapter.js";
|
|
3
|
+
import type { TerminalMonitorStatePaths } from "./terminal-monitor-state-reconciliation-service.js";
|
|
4
|
+
import { type MonitorCliOptions, type TerminalMonitorStateCliDependencies } from "./terminal-monitor-state-contract.js";
|
|
5
|
+
type StartupRecoveryDependencies = {
|
|
6
|
+
dispatch: Pick<TerminalMonitorStateCliDependencies["dispatch"], "repository">;
|
|
7
|
+
authority: Pick<TerminalMonitorStateCliDependencies["authority"], "createBridge" | "handoff">;
|
|
8
|
+
};
|
|
9
|
+
export declare class TerminalMonitorStartupRecovery {
|
|
10
|
+
#private;
|
|
11
|
+
constructor(dependencies: StartupRecoveryDependencies, stateFileLock: ReturnType<typeof createFileLockCliAdapter>);
|
|
12
|
+
recoverSubmissionRetry(storeDir: string, initialConversation: Conversation, paths: TerminalMonitorStatePaths): Promise<Conversation>;
|
|
13
|
+
recoverDeferred(options: MonitorCliOptions, storeDir: string, initialConversation: Conversation, paths: TerminalMonitorStatePaths): Promise<Conversation>;
|
|
14
|
+
}
|
|
15
|
+
export {};
|