@vibes.diy/api-svc 4.4.2 → 4.5.4
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/app-msg-evento.js.map +1 -1
- package/chat-msg-evento.js.map +1 -1
- package/intern/prompt-assembly.d.ts +1 -0
- package/intern/prompt-assembly.js +11 -7
- package/intern/prompt-assembly.js.map +1 -1
- package/package.json +12 -15
- package/public/access-function.js +73 -15
- package/public/access-function.js.map +1 -1
- package/public/app-documents-broadcast.d.ts +36 -0
- package/public/app-documents-broadcast.js +99 -0
- package/public/app-documents-broadcast.js.map +1 -0
- package/public/app-documents-grant-delta.d.ts +13 -0
- package/public/app-documents-grant-delta.js +76 -0
- package/public/app-documents-grant-delta.js.map +1 -0
- package/public/app-documents-put-persist.d.ts +28 -0
- package/public/app-documents-put-persist.js +106 -0
- package/public/app-documents-put-persist.js.map +1 -0
- package/public/app-documents-read-eventos.js +10 -4
- package/public/app-documents-read-eventos.js.map +1 -1
- package/public/app-documents-write-eventos.js +71 -280
- package/public/app-documents-write-eventos.js.map +1 -1
- package/public/app-settings-icon-gen.d.ts +8 -0
- package/public/app-settings-icon-gen.js +29 -0
- package/public/app-settings-icon-gen.js.map +1 -0
- package/public/app-settings-secrets.d.ts +5 -0
- package/public/app-settings-secrets.js +92 -0
- package/public/app-settings-secrets.js.map +1 -0
- package/public/app-settings-sql-upsert.d.ts +5 -0
- package/public/app-settings-sql-upsert.js +139 -0
- package/public/app-settings-sql-upsert.js.map +1 -0
- package/public/app-settings-suggestion-bless.d.ts +4 -0
- package/public/app-settings-suggestion-bless.js +88 -0
- package/public/app-settings-suggestion-bless.js.map +1 -0
- package/public/ensure-app-settings.d.ts +5 -5
- package/public/ensure-app-settings.js +6 -337
- package/public/ensure-app-settings.js.map +1 -1
- package/public/fs-prompt.d.ts +16 -0
- package/public/fs-prompt.js +173 -0
- package/public/fs-prompt.js.map +1 -0
- package/public/image-gen.d.ts +15 -0
- package/public/image-gen.js +222 -0
- package/public/image-gen.js.map +1 -0
- package/public/llm-dispatch.d.ts +113 -0
- package/public/llm-dispatch.js +621 -0
- package/public/llm-dispatch.js.map +1 -0
- package/public/prompt-chat-section.d.ts +5 -41
- package/public/prompt-chat-section.js +10 -1607
- package/public/prompt-chat-section.js.map +1 -1
- package/public/provider-errors.d.ts +55 -0
- package/public/provider-errors.js +150 -0
- package/public/provider-errors.js.map +1 -0
- package/public/request-flow.js +4 -2
- package/public/request-flow.js.map +1 -1
- package/public/set-mode-fsid.js +2 -2
- package/public/set-mode-fsid.js.map +1 -1
- package/public/stream-assembly.d.ts +38 -0
- package/public/stream-assembly.js +470 -0
- package/public/stream-assembly.js.map +1 -0
- package/shared-msg-evento.js.map +1 -1
- package/types.js.map +1 -1
- package/intern/get-slug-binding.d.ts +0 -7
- package/intern/get-slug-binding.js +0 -34
- package/intern/get-slug-binding.js.map +0 -1
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { Result, HandleTriggerCtx } from "@adviser/cement";
|
|
2
|
+
import { Scope } from "@adviser/scopey";
|
|
3
|
+
import { MsgBase, PromptAndBlockMsgs, ReqPromptChatSection, ReqPromptLLMChatSection, ReqWithVerifiedAuth, VibeFile, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
|
|
4
|
+
import { BlockEndMsg } from "@vibes.diy/call-ai-v2";
|
|
5
|
+
import { VibesApiSQLCtx } from "../types.js";
|
|
6
|
+
import { type LLMRequestWithHeaders, type ResChat } from "./llm-dispatch.js";
|
|
7
|
+
export interface PromptTerminalSignal {
|
|
8
|
+
promptBlockEndEmitted: boolean;
|
|
9
|
+
releasePersistGate?: () => void;
|
|
10
|
+
}
|
|
11
|
+
export declare function handleEndMsg({ collectedMsgs, vctx, req, ctx, resChat, promptId, value, blockSeq, fileSystem, terminal, model, codegenTheme, }: {
|
|
12
|
+
collectedMsgs: PromptAndBlockMsgs[];
|
|
13
|
+
vctx: VibesApiSQLCtx;
|
|
14
|
+
req: ReqWithVerifiedAuth<ReqPromptChatSection>;
|
|
15
|
+
ctx: HandleTriggerCtx<W3CWebSocketEvent, MsgBase<ReqWithVerifiedAuth<ReqPromptChatSection>>, never | VibesDiyError>;
|
|
16
|
+
resChat: ResChat;
|
|
17
|
+
promptId: string;
|
|
18
|
+
value: BlockEndMsg;
|
|
19
|
+
blockSeq: number;
|
|
20
|
+
fileSystem?: VibeFile[];
|
|
21
|
+
terminal: PromptTerminalSignal;
|
|
22
|
+
model?: string;
|
|
23
|
+
codegenTheme?: string;
|
|
24
|
+
}): Promise<Result<number>>;
|
|
25
|
+
export declare function handleLlmResponse({ scope, vctx, req, ctx, res, resChat, promptId, blockSeq, llmReq, abort, terminal, codegenTheme, }: {
|
|
26
|
+
scope: Scope;
|
|
27
|
+
ctx: HandleTriggerCtx<W3CWebSocketEvent, MsgBase<ReqWithVerifiedAuth<ReqPromptChatSection>>, never | VibesDiyError>;
|
|
28
|
+
vctx: VibesApiSQLCtx;
|
|
29
|
+
req: ReqWithVerifiedAuth<ReqPromptLLMChatSection>;
|
|
30
|
+
resChat: ResChat;
|
|
31
|
+
res: Response;
|
|
32
|
+
promptId: string;
|
|
33
|
+
blockSeq: number;
|
|
34
|
+
llmReq: LLMRequestWithHeaders;
|
|
35
|
+
abort: AbortController;
|
|
36
|
+
terminal: PromptTerminalSignal;
|
|
37
|
+
codegenTheme?: string;
|
|
38
|
+
}): Promise<number>;
|
|
@@ -0,0 +1,470 @@
|
|
|
1
|
+
import { Result, exception2Result } from "@adviser/cement";
|
|
2
|
+
import { ensureLogger } from "@vibes.diy/identity";
|
|
3
|
+
import { withHeartbeat } from "./stream-heartbeat.js";
|
|
4
|
+
import { createStatsCollector, createLineStream, createDataStream, createSseStream, createDeltaStream, createSectionsStream, isBlockEnd, isDeltaLine, isBlockStreamMsg, } from "@vibes.diy/call-ai-v2";
|
|
5
|
+
import { getRecoveryAddendum, getRecoveryStitchAddendum } from "@vibes.diy/prompts";
|
|
6
|
+
import { buildRecoveryRequest, buildTruncatedEvent, shouldAttemptRecovery, updateRecoveryCounter, } from "../intern/recovery.js";
|
|
7
|
+
import { loadVersionTimeline } from "../intern/version-timeline.js";
|
|
8
|
+
import { createStreamingResolver, createBlockAccumulator, logApplyError } from "../intern/prompt-streaming.js";
|
|
9
|
+
import { createPromptAssetFetch, promptsPkgBaseUrl } from "../intern/prompt-asset-fetch.js";
|
|
10
|
+
import { acquireChatPersistGate } from "../intern/chat-persist-gate.js";
|
|
11
|
+
import { appendBlockEvent, dispatchLlmRequestWithFallback, handlePromptContext, } from "./llm-dispatch.js";
|
|
12
|
+
export async function handleEndMsg({ collectedMsgs, vctx, req, ctx, resChat, promptId, value, blockSeq, fileSystem, terminal, model, codegenTheme, }) {
|
|
13
|
+
terminal.releasePersistGate ??= acquireChatPersistGate(vctx.connections, req.chatId);
|
|
14
|
+
const endSeq = blockSeq++;
|
|
15
|
+
const rEnd = await appendBlockEvent({
|
|
16
|
+
ctx,
|
|
17
|
+
vctx,
|
|
18
|
+
req,
|
|
19
|
+
promptId,
|
|
20
|
+
blockSeq: endSeq,
|
|
21
|
+
evt: { type: "prompt.block-end", streamId: promptId, chatId: req.chatId, seq: endSeq, timestamp: new Date() },
|
|
22
|
+
emitMode: "emit-only",
|
|
23
|
+
});
|
|
24
|
+
if (rEnd.isErr()) {
|
|
25
|
+
return Result.Err(rEnd);
|
|
26
|
+
}
|
|
27
|
+
terminal.promptBlockEndEmitted = true;
|
|
28
|
+
const revealSeq = blockSeq++;
|
|
29
|
+
const r = await handlePromptContext({
|
|
30
|
+
vctx,
|
|
31
|
+
req,
|
|
32
|
+
promptId,
|
|
33
|
+
resChat,
|
|
34
|
+
value,
|
|
35
|
+
blockSeq,
|
|
36
|
+
collectedMsgs,
|
|
37
|
+
fileSystem,
|
|
38
|
+
model,
|
|
39
|
+
codegenTheme,
|
|
40
|
+
onFsRef: async (fsRefVal) => {
|
|
41
|
+
const rReveal = await appendBlockEvent({
|
|
42
|
+
ctx,
|
|
43
|
+
vctx,
|
|
44
|
+
req,
|
|
45
|
+
promptId,
|
|
46
|
+
blockSeq: revealSeq,
|
|
47
|
+
evt: {
|
|
48
|
+
type: "prompt.fs-persisted",
|
|
49
|
+
streamId: promptId,
|
|
50
|
+
chatId: req.chatId,
|
|
51
|
+
seq: revealSeq,
|
|
52
|
+
timestamp: new Date(),
|
|
53
|
+
fsRef: fsRefVal,
|
|
54
|
+
},
|
|
55
|
+
emitMode: "emit-only",
|
|
56
|
+
});
|
|
57
|
+
if (rReveal.isErr()) {
|
|
58
|
+
vctx.logger.Warn().Err(rReveal).Str("promptId", promptId).Msg("reveal-emit-failed");
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
});
|
|
62
|
+
if (r.isErr()) {
|
|
63
|
+
return Result.Err(r);
|
|
64
|
+
}
|
|
65
|
+
blockSeq = r.Ok().blockSeq;
|
|
66
|
+
const rEvt = await appendBlockEvent({
|
|
67
|
+
ctx,
|
|
68
|
+
vctx,
|
|
69
|
+
req,
|
|
70
|
+
promptId,
|
|
71
|
+
blockSeq: blockSeq++,
|
|
72
|
+
evt: { ...value, fsRef: r.Ok().fsRef.toValue() },
|
|
73
|
+
emitMode: "emit-only",
|
|
74
|
+
});
|
|
75
|
+
for (const conn of vctx.connections) {
|
|
76
|
+
const chatCtx = conn.chatIds.get(req.chatId);
|
|
77
|
+
const promptIdCtx = chatCtx?.promptIds.get(promptId);
|
|
78
|
+
if (promptIdCtx && chatCtx) {
|
|
79
|
+
chatCtx.promptIds.delete(promptId);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
if (rEvt.isErr()) {
|
|
83
|
+
return Result.Err(rEvt);
|
|
84
|
+
}
|
|
85
|
+
return Result.Ok(blockSeq);
|
|
86
|
+
}
|
|
87
|
+
export async function handleLlmResponse({ scope, vctx, req, ctx, res, resChat, promptId, blockSeq, llmReq, abort, terminal, codegenTheme, }) {
|
|
88
|
+
await scope
|
|
89
|
+
.evalResult(async () => {
|
|
90
|
+
let collectedMsgs;
|
|
91
|
+
for (const conn of vctx.connections) {
|
|
92
|
+
const tChatCtx = conn.chatIds.get(req.chatId);
|
|
93
|
+
if (tChatCtx) {
|
|
94
|
+
const promptIdCtx = tChatCtx.promptIds.get(promptId);
|
|
95
|
+
if (!promptIdCtx) {
|
|
96
|
+
collectedMsgs = [];
|
|
97
|
+
tChatCtx.promptIds.set(promptId, {
|
|
98
|
+
blocks: collectedMsgs,
|
|
99
|
+
promptId,
|
|
100
|
+
type: "vibes.diy.section-event",
|
|
101
|
+
chatId: req.chatId,
|
|
102
|
+
blockSeq: 0,
|
|
103
|
+
timestamp: new Date(),
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
collectedMsgs = promptIdCtx.blocks;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
if (!collectedMsgs) {
|
|
112
|
+
collectedMsgs = [];
|
|
113
|
+
}
|
|
114
|
+
const seedTimelineResult = await loadVersionTimeline(vctx, req.chatId);
|
|
115
|
+
if (seedTimelineResult.isErr())
|
|
116
|
+
return Result.Err(seedTimelineResult);
|
|
117
|
+
const seedTimeline = seedTimelineResult.Ok();
|
|
118
|
+
const seedForResolver = seedTimeline.length > 0 ? seedTimeline[seedTimeline.length - 1].vfs : new Map();
|
|
119
|
+
const resolverLogger = ensureLogger(vctx.sthis, "streamingResolver");
|
|
120
|
+
const recoveryLogger = ensureLogger(vctx.sthis, "applyRecovery");
|
|
121
|
+
const streamingResolver = createStreamingResolver({
|
|
122
|
+
chatId: req.chatId,
|
|
123
|
+
promptId,
|
|
124
|
+
seed: seedForResolver,
|
|
125
|
+
onApplyError: (evt) => logApplyError(resolverLogger, evt),
|
|
126
|
+
});
|
|
127
|
+
const blockAcc = createBlockAccumulator();
|
|
128
|
+
let recoveryCounter = { consecutiveFruitless: 0 };
|
|
129
|
+
let isRecoveryStream = false;
|
|
130
|
+
let turnRawText = "";
|
|
131
|
+
let rawEmitted = false;
|
|
132
|
+
const emitTurnRaw = async () => {
|
|
133
|
+
if (rawEmitted || turnRawText === "")
|
|
134
|
+
return Result.Ok();
|
|
135
|
+
rawEmitted = true;
|
|
136
|
+
const r = await appendBlockEvent({
|
|
137
|
+
ctx,
|
|
138
|
+
vctx,
|
|
139
|
+
req,
|
|
140
|
+
promptId,
|
|
141
|
+
blockSeq,
|
|
142
|
+
evt: {
|
|
143
|
+
type: "prompt.raw",
|
|
144
|
+
streamId: promptId,
|
|
145
|
+
chatId: req.chatId,
|
|
146
|
+
seq: blockSeq,
|
|
147
|
+
text: turnRawText,
|
|
148
|
+
timestamp: new Date(),
|
|
149
|
+
},
|
|
150
|
+
resChat,
|
|
151
|
+
});
|
|
152
|
+
blockSeq++;
|
|
153
|
+
return r;
|
|
154
|
+
};
|
|
155
|
+
let currentRes = res;
|
|
156
|
+
let currentAbort = abort;
|
|
157
|
+
const HEARTBEAT_MS = 20_000;
|
|
158
|
+
while (true) {
|
|
159
|
+
let streamMadeProgress = false;
|
|
160
|
+
const partialBuffer = { text: "", safeCut: 0, lastReplaceFileLines: undefined };
|
|
161
|
+
const captureDeltas = new TransformStream({
|
|
162
|
+
transform(msg, controller) {
|
|
163
|
+
if (isDeltaLine(msg))
|
|
164
|
+
partialBuffer.text += msg.content;
|
|
165
|
+
controller.enqueue(msg);
|
|
166
|
+
},
|
|
167
|
+
});
|
|
168
|
+
const pipeline = currentRes
|
|
169
|
+
.body.pipeThrough(createStatsCollector(promptId, 1000))
|
|
170
|
+
.pipeThrough(createLineStream(promptId))
|
|
171
|
+
.pipeThrough(createDataStream(promptId))
|
|
172
|
+
.pipeThrough(createSseStream(promptId))
|
|
173
|
+
.pipeThrough(createDeltaStream(promptId, () => vctx.sthis.nextId(12).str))
|
|
174
|
+
.pipeThrough(captureDeltas)
|
|
175
|
+
.pipeThrough(createSectionsStream(promptId, () => vctx.sthis.nextId(12).str));
|
|
176
|
+
const reader = pipeline.getReader();
|
|
177
|
+
let recoverHint = null;
|
|
178
|
+
let drainOnly = false;
|
|
179
|
+
readLoop: while (true) {
|
|
180
|
+
const rRead = await exception2Result(() => withHeartbeat(() => reader.read(), {
|
|
181
|
+
intervalMs: HEARTBEAT_MS,
|
|
182
|
+
beat: () => {
|
|
183
|
+
ctx.send
|
|
184
|
+
.send(ctx, { type: "vibes.diy.res-progress", stage: "generating" })
|
|
185
|
+
.catch((e) => {
|
|
186
|
+
recoveryLogger
|
|
187
|
+
.Warn()
|
|
188
|
+
.Any("event", { chatId: req.chatId, promptId, err: String(e) })
|
|
189
|
+
.Msg("heartbeat-emit-failed");
|
|
190
|
+
});
|
|
191
|
+
},
|
|
192
|
+
}));
|
|
193
|
+
if (rRead.isErr()) {
|
|
194
|
+
const intentional = drainOnly || currentAbort.signal.aborted;
|
|
195
|
+
if (!intentional) {
|
|
196
|
+
recoveryLogger
|
|
197
|
+
.Info()
|
|
198
|
+
.Any("event", {
|
|
199
|
+
chatId: req.chatId,
|
|
200
|
+
promptId,
|
|
201
|
+
err: String(rRead.Err()),
|
|
202
|
+
})
|
|
203
|
+
.Msg("upstream-read-failed");
|
|
204
|
+
}
|
|
205
|
+
break readLoop;
|
|
206
|
+
}
|
|
207
|
+
const { done, value } = rRead.Ok();
|
|
208
|
+
if (done)
|
|
209
|
+
break readLoop;
|
|
210
|
+
if (drainOnly)
|
|
211
|
+
continue;
|
|
212
|
+
if (!isBlockEnd(value)) {
|
|
213
|
+
if (!isBlockStreamMsg(value))
|
|
214
|
+
continue;
|
|
215
|
+
const closed = blockAcc.ingest(value);
|
|
216
|
+
const applyResult = closed ? streamingResolver.observeBlock(closed) : undefined;
|
|
217
|
+
const isFailedCodeEnd = closed !== undefined && applyResult !== undefined && applyResult.errors.length > 0;
|
|
218
|
+
if (isFailedCodeEnd) {
|
|
219
|
+
const first = applyResult.errors[0];
|
|
220
|
+
const truncateEvt = buildTruncatedEvent({
|
|
221
|
+
closed,
|
|
222
|
+
firstError: first,
|
|
223
|
+
errorCount: applyResult.errors.length,
|
|
224
|
+
promptId,
|
|
225
|
+
blockSeq,
|
|
226
|
+
now: new Date(),
|
|
227
|
+
});
|
|
228
|
+
collectedMsgs.push(truncateEvt);
|
|
229
|
+
const r = await appendBlockEvent({
|
|
230
|
+
ctx,
|
|
231
|
+
vctx,
|
|
232
|
+
req,
|
|
233
|
+
promptId,
|
|
234
|
+
blockSeq: blockSeq++,
|
|
235
|
+
evt: truncateEvt,
|
|
236
|
+
emitMode: "emit-only",
|
|
237
|
+
});
|
|
238
|
+
if (r.isErr()) {
|
|
239
|
+
return Result.Err(r);
|
|
240
|
+
}
|
|
241
|
+
recoverHint = {
|
|
242
|
+
partial: partialBuffer.text.slice(0, partialBuffer.safeCut),
|
|
243
|
+
focusPath: applyResult.path,
|
|
244
|
+
blockId: closed.end.blockId,
|
|
245
|
+
sectionId: closed.end.sectionId,
|
|
246
|
+
reason: first.reason,
|
|
247
|
+
kind: first.kind,
|
|
248
|
+
errorCount: applyResult.errors.length,
|
|
249
|
+
lastReplaceFileLines: partialBuffer.lastReplaceFileLines,
|
|
250
|
+
};
|
|
251
|
+
currentAbort.abort();
|
|
252
|
+
drainOnly = true;
|
|
253
|
+
continue;
|
|
254
|
+
}
|
|
255
|
+
collectedMsgs.push(value);
|
|
256
|
+
const r = await appendBlockEvent({
|
|
257
|
+
ctx,
|
|
258
|
+
vctx,
|
|
259
|
+
req,
|
|
260
|
+
promptId,
|
|
261
|
+
blockSeq: blockSeq++,
|
|
262
|
+
evt: value,
|
|
263
|
+
emitMode: "emit-only",
|
|
264
|
+
resChat,
|
|
265
|
+
});
|
|
266
|
+
if (r.isErr()) {
|
|
267
|
+
return Result.Err(r);
|
|
268
|
+
}
|
|
269
|
+
if (closed !== undefined && applyResult !== undefined && applyResult.errors.length === 0) {
|
|
270
|
+
partialBuffer.safeCut = partialBuffer.text.length;
|
|
271
|
+
streamMadeProgress = true;
|
|
272
|
+
const wasReplace = closed.lines.some((l) => l.line.startsWith("<<<<<<< SEARCH"));
|
|
273
|
+
if (wasReplace) {
|
|
274
|
+
const resolvedText = streamingResolver.getVfs().get(applyResult.path);
|
|
275
|
+
partialBuffer.lastReplaceFileLines = resolvedText ? resolvedText.split("\n").length : undefined;
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
partialBuffer.lastReplaceFileLines = undefined;
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
else {
|
|
283
|
+
collectedMsgs.push(value);
|
|
284
|
+
const x = await handleEndMsg({
|
|
285
|
+
collectedMsgs,
|
|
286
|
+
vctx,
|
|
287
|
+
req,
|
|
288
|
+
ctx,
|
|
289
|
+
resChat,
|
|
290
|
+
promptId,
|
|
291
|
+
value,
|
|
292
|
+
blockSeq,
|
|
293
|
+
terminal,
|
|
294
|
+
model: llmReq.model,
|
|
295
|
+
codegenTheme,
|
|
296
|
+
});
|
|
297
|
+
if (x.isErr())
|
|
298
|
+
return Result.Err(x);
|
|
299
|
+
blockSeq = x.Ok();
|
|
300
|
+
collectedMsgs.splice(0, collectedMsgs.length);
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
turnRawText += recoverHint === null ? partialBuffer.text : recoverHint.partial;
|
|
304
|
+
if (isRecoveryStream) {
|
|
305
|
+
recoveryCounter = updateRecoveryCounter(recoveryCounter, { madeProgress: streamMadeProgress });
|
|
306
|
+
recoveryLogger
|
|
307
|
+
.Debug()
|
|
308
|
+
.Any("event", {
|
|
309
|
+
chatId: req.chatId,
|
|
310
|
+
promptId,
|
|
311
|
+
madeProgress: streamMadeProgress,
|
|
312
|
+
consecutiveFruitless: recoveryCounter.consecutiveFruitless,
|
|
313
|
+
})
|
|
314
|
+
.Msg("recovery-stream-end");
|
|
315
|
+
}
|
|
316
|
+
if (recoverHint === null) {
|
|
317
|
+
const rRaw = await emitTurnRaw();
|
|
318
|
+
if (rRaw.isErr())
|
|
319
|
+
return Result.Err(rRaw);
|
|
320
|
+
return Result.Ok();
|
|
321
|
+
}
|
|
322
|
+
if (!shouldAttemptRecovery(recoveryCounter)) {
|
|
323
|
+
recoveryLogger
|
|
324
|
+
.Info()
|
|
325
|
+
.Any("event", {
|
|
326
|
+
chatId: req.chatId,
|
|
327
|
+
promptId,
|
|
328
|
+
blockId: recoverHint.blockId,
|
|
329
|
+
consecutiveFruitless: recoveryCounter.consecutiveFruitless,
|
|
330
|
+
})
|
|
331
|
+
.Msg("recovery-exhausted");
|
|
332
|
+
const rRaw = await emitTurnRaw();
|
|
333
|
+
if (rRaw.isErr())
|
|
334
|
+
return Result.Err(rRaw);
|
|
335
|
+
const exhaustedEnd = {
|
|
336
|
+
type: "block.end",
|
|
337
|
+
blockId: recoverHint.blockId,
|
|
338
|
+
streamId: promptId,
|
|
339
|
+
seq: blockSeq,
|
|
340
|
+
blockNr: 0,
|
|
341
|
+
timestamp: new Date(),
|
|
342
|
+
stats: {
|
|
343
|
+
toplevel: { lines: 0, bytes: 0 },
|
|
344
|
+
code: { lines: 0, bytes: 0 },
|
|
345
|
+
image: { lines: 0, bytes: 0 },
|
|
346
|
+
total: { lines: 0, bytes: 0 },
|
|
347
|
+
},
|
|
348
|
+
usage: {
|
|
349
|
+
given: [],
|
|
350
|
+
calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
|
|
351
|
+
},
|
|
352
|
+
};
|
|
353
|
+
collectedMsgs.push(exhaustedEnd);
|
|
354
|
+
const xEnd = await handleEndMsg({
|
|
355
|
+
collectedMsgs,
|
|
356
|
+
vctx,
|
|
357
|
+
req,
|
|
358
|
+
ctx,
|
|
359
|
+
resChat,
|
|
360
|
+
promptId,
|
|
361
|
+
value: exhaustedEnd,
|
|
362
|
+
blockSeq,
|
|
363
|
+
terminal,
|
|
364
|
+
model: llmReq.model,
|
|
365
|
+
codegenTheme,
|
|
366
|
+
});
|
|
367
|
+
if (xEnd.isErr())
|
|
368
|
+
return Result.Err(xEnd);
|
|
369
|
+
return Result.Ok();
|
|
370
|
+
}
|
|
371
|
+
const stitchMode = recoveryCounter.consecutiveFruitless === 2;
|
|
372
|
+
recoveryLogger
|
|
373
|
+
.Debug()
|
|
374
|
+
.Any("event", {
|
|
375
|
+
chatId: req.chatId,
|
|
376
|
+
promptId,
|
|
377
|
+
blockId: recoverHint.blockId,
|
|
378
|
+
sectionId: recoverHint.sectionId,
|
|
379
|
+
path: recoverHint.focusPath,
|
|
380
|
+
reason: recoverHint.reason,
|
|
381
|
+
kind: recoverHint.kind,
|
|
382
|
+
errorCount: recoverHint.errorCount,
|
|
383
|
+
consecutiveFruitless: recoveryCounter.consecutiveFruitless,
|
|
384
|
+
mode: stitchMode ? "stitch" : "continue",
|
|
385
|
+
})
|
|
386
|
+
.Msg("recovery-start");
|
|
387
|
+
const pkgBaseUrl = promptsPkgBaseUrl(vctx.params.pkgRepos.workspace);
|
|
388
|
+
const fetchOverride = createPromptAssetFetch({ fetchAsset: vctx.fetchAsset });
|
|
389
|
+
const addendum = await exception2Result(() => stitchMode ? getRecoveryStitchAddendum(pkgBaseUrl, fetchOverride) : getRecoveryAddendum(pkgBaseUrl, fetchOverride));
|
|
390
|
+
if (addendum.isErr()) {
|
|
391
|
+
recoveryLogger
|
|
392
|
+
.Info()
|
|
393
|
+
.Any("event", { chatId: req.chatId, promptId, err: String(addendum.Err()) })
|
|
394
|
+
.Msg("recovery-addendum-failed");
|
|
395
|
+
return Result.Ok();
|
|
396
|
+
}
|
|
397
|
+
const recReq = buildRecoveryRequest({
|
|
398
|
+
originalRequest: llmReq,
|
|
399
|
+
recoveryAddendum: addendum.Ok(),
|
|
400
|
+
vfs: streamingResolver.getVfs(),
|
|
401
|
+
focusPath: recoverHint.focusPath,
|
|
402
|
+
assistantPartial: stitchMode ? undefined : recoverHint.partial,
|
|
403
|
+
lastReplaceFileLines: stitchMode ? undefined : recoverHint.lastReplaceFileLines,
|
|
404
|
+
});
|
|
405
|
+
if (recReq.isErr()) {
|
|
406
|
+
recoveryLogger
|
|
407
|
+
.Info()
|
|
408
|
+
.Any("event", {
|
|
409
|
+
chatId: req.chatId,
|
|
410
|
+
promptId,
|
|
411
|
+
err: String(recReq.Err()),
|
|
412
|
+
originalMessageCount: llmReq.messages.length,
|
|
413
|
+
originalRoles: llmReq.messages.map((m) => m.role),
|
|
414
|
+
})
|
|
415
|
+
.Msg("recovery-build-failed");
|
|
416
|
+
return Result.Ok();
|
|
417
|
+
}
|
|
418
|
+
const recPayload = recReq.Ok();
|
|
419
|
+
const recMessageCount = recPayload.messages.length;
|
|
420
|
+
const recRoles = recPayload.messages.map((m) => m.role);
|
|
421
|
+
const recLlmReq = {
|
|
422
|
+
...recPayload,
|
|
423
|
+
headers: llmReq.headers,
|
|
424
|
+
model: llmReq.model,
|
|
425
|
+
};
|
|
426
|
+
const recDispatch = await dispatchLlmRequestWithFallback({
|
|
427
|
+
vctx,
|
|
428
|
+
mode: req.mode,
|
|
429
|
+
llmReq: recLlmReq,
|
|
430
|
+
chatId: req.chatId,
|
|
431
|
+
promptId,
|
|
432
|
+
phase: "recovery",
|
|
433
|
+
});
|
|
434
|
+
const recModel = recDispatch.llmReq.model;
|
|
435
|
+
if (recDispatch.ok === false) {
|
|
436
|
+
recoveryLogger
|
|
437
|
+
.Info()
|
|
438
|
+
.Any("event", {
|
|
439
|
+
chatId: req.chatId,
|
|
440
|
+
promptId,
|
|
441
|
+
err: recDispatch.error,
|
|
442
|
+
model: recModel,
|
|
443
|
+
messageCount: recMessageCount,
|
|
444
|
+
roles: recRoles,
|
|
445
|
+
})
|
|
446
|
+
.Msg("recovery-call-failed");
|
|
447
|
+
return Result.Ok();
|
|
448
|
+
}
|
|
449
|
+
const nextRes = recDispatch.res;
|
|
450
|
+
recoveryLogger
|
|
451
|
+
.Debug()
|
|
452
|
+
.Any("event", {
|
|
453
|
+
chatId: req.chatId,
|
|
454
|
+
promptId,
|
|
455
|
+
partialBytes: recoverHint.partial.length,
|
|
456
|
+
focusPath: recoverHint.focusPath,
|
|
457
|
+
model: recModel,
|
|
458
|
+
messageCount: recMessageCount,
|
|
459
|
+
roles: recRoles,
|
|
460
|
+
})
|
|
461
|
+
.Msg("recovery-call-started");
|
|
462
|
+
currentRes = nextRes;
|
|
463
|
+
currentAbort = recDispatch.abort;
|
|
464
|
+
isRecoveryStream = true;
|
|
465
|
+
}
|
|
466
|
+
})
|
|
467
|
+
.do();
|
|
468
|
+
return blockSeq;
|
|
469
|
+
}
|
|
470
|
+
//# sourceMappingURL=stream-assembly.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-assembly.js","sourceRoot":"","sources":["../../jsr/public/stream-assembly.ts"],"names":[],"mappings":"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"}
|
package/shared-msg-evento.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-msg-evento.js","sourceRoot":"","sources":["../jsr/shared-msg-evento.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"shared-msg-evento.js","sourceRoot":"","sources":["../jsr/shared-msg-evento.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE;IACvC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,gCAAgC,EAAE,CAAC,CAAC;IAClE,MAAM,CAAC,IAAI,CACT,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EAC7B;QACE,IAAI,EAAE,UAAU,CAAC,QAAQ;QACzB,IAAI,EAAE,oCAAoC;QAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACpB,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvB,IAAI,EAAE,qBAAqB;gBAC3B,KAAK,EAAE,EAAE,OAAO,EAAE,oBAAoB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE;aACrD,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;KACF,EACD;QACE,IAAI,EAAE,UAAU,CAAC,KAAK;QACtB,IAAI,EAAE,sBAAsB;QAC5B,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACpB,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,KAAK,EAAG,GAAG,CAAC,KAA6B,EAAE,KAAK,CAAC,CAAC;YACrG,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvB,IAAI,EAAE,qBAAqB;gBAC3B,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,uBAAuB,EAAE,EAAE;aACvE,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;KACF,CACF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC,CAAC"}
|
package/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../jsr/types.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../jsr/types.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AA6G/B,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;IAChC,IAAI,EAAE,+BAA+B;IACrC,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,QAAQ;IACrB,MAAM,EAAE,QAAQ;CACjB,CAAC,CAAC;AAGH,MAAM,UAAU,eAAe,CAAC,GAAY;IAC1C,OAAO,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;IACjC,IAAI,EAAE,8BAA8B;IACpC,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,QAAQ;CACjB,CAAC,CAAC;AAGH,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,OAAO,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;IACnC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,aAAa;IAC1B,OAAO,EAAE,cAAc;CACxB,CAAC,CAAC;AAGH,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC7C,OAAO,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC"}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import { Result } from "@adviser/cement";
|
|
2
|
-
import { AppHandleBinding, VibesApiSQLCtx } from "../types.js";
|
|
3
|
-
export interface GetSlugBinding {
|
|
4
|
-
ownerHandle: string;
|
|
5
|
-
appSlug: string;
|
|
6
|
-
}
|
|
7
|
-
export declare function getSlugBinding(ctx: VibesApiSQLCtx, binding: GetSlugBinding): Promise<Result<AppHandleBinding>>;
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import { Result, exception2Result } from "@adviser/cement";
|
|
2
|
-
import { eq, and } from "drizzle-orm/sql/expressions";
|
|
3
|
-
export async function getSlugBinding(ctx, binding) {
|
|
4
|
-
const r = await exception2Result(() => ctx.sql.db
|
|
5
|
-
.select()
|
|
6
|
-
.from(ctx.sql.tables.handleBinding)
|
|
7
|
-
.innerJoin(ctx.sql.tables.appSlugBinding, eq(ctx.sql.tables.appSlugBinding.ownerHandle, ctx.sql.tables.handleBinding.handle))
|
|
8
|
-
.where(and(eq(ctx.sql.tables.handleBinding.handle, binding.ownerHandle), eq(ctx.sql.tables.appSlugBinding.appSlug, binding.appSlug)))
|
|
9
|
-
.limit(1)
|
|
10
|
-
.then((r) => r[0]));
|
|
11
|
-
if (r.isErr()) {
|
|
12
|
-
return Result.Err(r);
|
|
13
|
-
}
|
|
14
|
-
const sql = r.Ok();
|
|
15
|
-
if (!sql) {
|
|
16
|
-
return Result.Err(`appSlug/ownerHandle not found ${binding.appSlug}:${binding.ownerHandle} not found`);
|
|
17
|
-
}
|
|
18
|
-
return Result.Ok({
|
|
19
|
-
type: "vibes.diy-app-user-slug-binding",
|
|
20
|
-
ownerHandle: {
|
|
21
|
-
type: "vibes.diy-user-slug-binding",
|
|
22
|
-
userId: sql.UserSlugBindings.userId,
|
|
23
|
-
ownerHandle: sql.UserSlugBindings.handle,
|
|
24
|
-
tenant: sql.UserSlugBindings.tenant,
|
|
25
|
-
},
|
|
26
|
-
appSlug: {
|
|
27
|
-
type: "vibes.diy-app-slug-binding",
|
|
28
|
-
userId: sql.UserSlugBindings.userId,
|
|
29
|
-
appSlug: sql.AppSlugBindings.appSlug,
|
|
30
|
-
ledger: sql.AppSlugBindings.ledger,
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
//# sourceMappingURL=get-slug-binding.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"get-slug-binding.js","sourceRoot":"","sources":["../../jsr/intern/get-slug-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAQtD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAmB,EAAE,OAAuB;IAC/E,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACpC,GAAG,CAAC,GAAG,CAAC,EAAE;SACP,MAAM,EAAE;SACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;SAClC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SAC5H,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,EAC5D,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAC3D,CACF;SACA,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;IACF,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;IACnB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,MAAM,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,YAAY,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,IAAI,EAAE,iCAAiC;QACvC,WAAW,EAAE;YACX,IAAI,EAAE,6BAA6B;YACnC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACnC,WAAW,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACxC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;SACpC;QACD,OAAO,EAAE;YACP,IAAI,EAAE,4BAA4B;YAClC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACnC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,OAAO;YACpC,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM;SACnC;KAKF,CAAC,CAAC;AACL,CAAC"}
|