@mnemonik/shared 7.127.5 → 7.127.7
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.
|
@@ -20,6 +20,7 @@ export declare class HookConversation {
|
|
|
20
20
|
private save;
|
|
21
21
|
/** Existing authenticated response is the acquisition; no additional endpoint. */
|
|
22
22
|
request(url: string, init: HookFetchInit, post: (init: HookFetchInit) => Promise<Response>): Promise<Response>;
|
|
23
|
+
private forget;
|
|
23
24
|
/** Grok adopts only an authenticated explicit-bootstrap tool result. */
|
|
24
25
|
adopt(result: unknown): Promise<void>;
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hookConversation.d.ts","sourceRoot":"","sources":["../src/hookConversation.ts"],"names":[],"mappings":"AAOA,KAAK,aAAa,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAG9D,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAOD,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,YAA6B,KAAK,EAAE,qBAAqB,EAYxD;IACD,IAAI,EAAE,IAAI,MAAM,GAAG,SAAS,CAE3B;IAEK,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA0CxC;YAEa,MAAM;YAmBN,IAAI;IAsBlB,kFAAkF;IAC5E,OAAO,CACX,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,QAAQ,CAAC,GAC/C,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"hookConversation.d.ts","sourceRoot":"","sources":["../src/hookConversation.ts"],"names":[],"mappings":"AAOA,KAAK,aAAa,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAG9D,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAOD,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,YAA6B,KAAK,EAAE,qBAAqB,EAYxD;IACD,IAAI,EAAE,IAAI,MAAM,GAAG,SAAS,CAE3B;IAEK,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA0CxC;YAEa,MAAM;YAmBN,IAAI;IAsBlB,kFAAkF;IAC5E,OAAO,CACX,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,QAAQ,CAAC,GAC/C,OAAO,CAAC,QAAQ,CAAC,CAwDnB;YAEa,MAAM;IASpB,wEAAwE;IAClE,KAAK,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC1C;CACF;AAGD,wBAAsB,yBAAyB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3F;AACD,wBAAgB,qBAAqB,IAAI,MAAM,GAAG,SAAS,CAE1D;AACD,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAIvD;AACD,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;AACD,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,QAAQ,CAAC,GAC/C,OAAO,CAAC,QAAQ,CAAC,CAEnB"}
|
package/dist/hookConversation.js
CHANGED
|
@@ -113,6 +113,7 @@ export class HookConversation {
|
|
|
113
113
|
(url.endsWith('/hooks/mcp-precheck') ||
|
|
114
114
|
(url.endsWith('/hooks/injections') &&
|
|
115
115
|
['SessionStart', 'SubagentStart', 'UserPromptSubmit'].includes(String(body.event))));
|
|
116
|
+
let rejected;
|
|
116
117
|
const send = async () => {
|
|
117
118
|
await this.load();
|
|
118
119
|
const response = await post({
|
|
@@ -122,11 +123,17 @@ export class HookConversation {
|
|
|
122
123
|
...(this.conversationId ? { conversationId: this.conversationId } : {}),
|
|
123
124
|
}),
|
|
124
125
|
});
|
|
125
|
-
|
|
126
|
-
|
|
126
|
+
const result = response.ok
|
|
127
|
+
? (await response
|
|
127
128
|
.clone()
|
|
128
129
|
.json()
|
|
129
|
-
.catch(() => null))
|
|
130
|
+
.catch(() => null))
|
|
131
|
+
: null;
|
|
132
|
+
if (this.conversationId && result?.ok === false && result.reason === 'invalid_conversation') {
|
|
133
|
+
rejected = this.conversationId;
|
|
134
|
+
return response;
|
|
135
|
+
}
|
|
136
|
+
if (acquisition && response.ok) {
|
|
130
137
|
if (boundedHandle(result?.conversationId)) {
|
|
131
138
|
if (this.conversationId && this.conversationId !== result.conversationId)
|
|
132
139
|
throw new Error('conversation response mismatch');
|
|
@@ -137,7 +144,22 @@ export class HookConversation {
|
|
|
137
144
|
await this.save(this.conversationId);
|
|
138
145
|
return response;
|
|
139
146
|
};
|
|
140
|
-
|
|
147
|
+
const response = acquisition ? await this.locked(send) : await send();
|
|
148
|
+
// The server refused the cached handle (a signing-secret rotation, say).
|
|
149
|
+
// Forget it so the next acquiring event mints a fresh one; this request
|
|
150
|
+
// is never resent, and a handle another event acquired meanwhile stays.
|
|
151
|
+
if (rejected)
|
|
152
|
+
await this.forget(rejected);
|
|
153
|
+
return response;
|
|
154
|
+
}
|
|
155
|
+
async forget(id) {
|
|
156
|
+
await this.locked(async () => {
|
|
157
|
+
await this.load();
|
|
158
|
+
if (this.conversationId !== id)
|
|
159
|
+
return;
|
|
160
|
+
await rm(this.input.stateFile, { force: true });
|
|
161
|
+
this.conversationId = undefined;
|
|
162
|
+
}).catch(() => undefined);
|
|
141
163
|
}
|
|
142
164
|
/** Grok adopts only an authenticated explicit-bootstrap tool result. */
|
|
143
165
|
async adopt(result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hookConversation.js","sourceRoot":"","sources":["../src/hookConversation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hookConversation.js","sourceRoot":"","sources":["../src/hookConversation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/hookConversation.ts
CHANGED
|
@@ -152,6 +152,7 @@ export class HookConversation {
|
|
|
152
152
|
(url.endsWith('/hooks/mcp-precheck') ||
|
|
153
153
|
(url.endsWith('/hooks/injections') &&
|
|
154
154
|
['SessionStart', 'SubagentStart', 'UserPromptSubmit'].includes(String(body.event))));
|
|
155
|
+
let rejected: string | undefined;
|
|
155
156
|
const send = async () => {
|
|
156
157
|
await this.load();
|
|
157
158
|
const response = await post({
|
|
@@ -161,11 +162,21 @@ export class HookConversation {
|
|
|
161
162
|
...(this.conversationId ? { conversationId: this.conversationId } : {}),
|
|
162
163
|
}),
|
|
163
164
|
});
|
|
165
|
+
const result = response.ok
|
|
166
|
+
? ((await response
|
|
167
|
+
.clone()
|
|
168
|
+
.json()
|
|
169
|
+
.catch(() => null)) as {
|
|
170
|
+
ok?: unknown;
|
|
171
|
+
reason?: unknown;
|
|
172
|
+
conversationId?: unknown;
|
|
173
|
+
} | null)
|
|
174
|
+
: null;
|
|
175
|
+
if (this.conversationId && result?.ok === false && result.reason === 'invalid_conversation') {
|
|
176
|
+
rejected = this.conversationId;
|
|
177
|
+
return response;
|
|
178
|
+
}
|
|
164
179
|
if (acquisition && response.ok) {
|
|
165
|
-
const result = (await response
|
|
166
|
-
.clone()
|
|
167
|
-
.json()
|
|
168
|
-
.catch(() => null)) as { conversationId?: unknown } | null;
|
|
169
180
|
if (boundedHandle(result?.conversationId)) {
|
|
170
181
|
if (this.conversationId && this.conversationId !== result.conversationId)
|
|
171
182
|
throw new Error('conversation response mismatch');
|
|
@@ -174,7 +185,21 @@ export class HookConversation {
|
|
|
174
185
|
} else if (this.conversationId) await this.save(this.conversationId);
|
|
175
186
|
return response;
|
|
176
187
|
};
|
|
177
|
-
|
|
188
|
+
const response = acquisition ? await this.locked(send) : await send();
|
|
189
|
+
// The server refused the cached handle (a signing-secret rotation, say).
|
|
190
|
+
// Forget it so the next acquiring event mints a fresh one; this request
|
|
191
|
+
// is never resent, and a handle another event acquired meanwhile stays.
|
|
192
|
+
if (rejected) await this.forget(rejected);
|
|
193
|
+
return response;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
private async forget(id: string): Promise<void> {
|
|
197
|
+
await this.locked(async () => {
|
|
198
|
+
await this.load();
|
|
199
|
+
if (this.conversationId !== id) return;
|
|
200
|
+
await rm(this.input.stateFile, { force: true });
|
|
201
|
+
this.conversationId = undefined;
|
|
202
|
+
}).catch(() => undefined);
|
|
178
203
|
}
|
|
179
204
|
|
|
180
205
|
/** Grok adopts only an authenticated explicit-bootstrap tool result. */
|