@vibes.diy/api-svc 14.3.16 → 14.3.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/intern/agent-dispatcher.d.ts +1 -0
- package/intern/agent-dispatcher.js +2 -0
- package/intern/agent-dispatcher.js.map +1 -1
- package/intern/agent-session.d.ts +22 -1
- package/intern/agent-session.js +19 -1
- package/intern/agent-session.js.map +1 -1
- package/intern/agent-wake.d.ts +1 -0
- package/intern/agent-wake.js +1 -0
- package/intern/agent-wake.js.map +1 -1
- package/intern/builder-model.d.ts +4 -1
- package/intern/builder-model.js +12 -6
- package/intern/builder-model.js.map +1 -1
- package/intern/eval-handles.d.ts +1 -1
- package/intern/eval-handles.js +3 -3
- package/intern/eval-handles.js.map +1 -1
- package/intern/get-model-defaults.d.ts +1 -0
- package/intern/get-model-defaults.js +13 -0
- package/intern/get-model-defaults.js.map +1 -1
- package/intern/in-flight-turns.d.ts +1 -1
- package/intern/in-flight-turns.js +1 -1
- package/intern/in-flight-turns.js.map +1 -1
- package/intern/mint-fire-core.d.ts +2 -0
- package/intern/mint-fire-core.js +2 -0
- package/intern/mint-fire-core.js.map +1 -1
- package/intern/process-access-bindings.js +1 -1
- package/intern/process-access-bindings.js.map +1 -1
- package/intern/prompt-usage.js +20 -0
- package/intern/prompt-usage.js.map +1 -1
- package/intern/subagent-model.d.ts +20 -0
- package/intern/subagent-model.js +30 -0
- package/intern/subagent-model.js.map +1 -0
- package/intern/usage-rounds.d.ts +7 -0
- package/intern/usage-rounds.js +20 -0
- package/intern/usage-rounds.js.map +1 -0
- package/models.json +63 -1
- package/package.json +12 -12
- package/public/agent-turn-action.d.ts +30 -0
- package/public/agent-turn-action.js +374 -0
- package/public/agent-turn-action.js.map +1 -0
- package/public/agent-turn-assembly.d.ts +34 -0
- package/public/agent-turn-assembly.js +199 -0
- package/public/agent-turn-assembly.js.map +1 -0
- package/public/append-block-event.d.ts +31 -0
- package/public/append-block-event.js +121 -0
- package/public/append-block-event.js.map +1 -0
- package/public/auto-publish-on-persist.d.ts +10 -0
- package/public/auto-publish-on-persist.js +40 -0
- package/public/auto-publish-on-persist.js.map +1 -0
- package/public/codegen-turn-route.d.ts +40 -0
- package/public/codegen-turn-route.js +177 -0
- package/public/codegen-turn-route.js.map +1 -0
- package/public/draft-runtime.js +12 -2
- package/public/draft-runtime.js.map +1 -1
- package/public/guest-build-generation.js +2 -1
- package/public/guest-build-generation.js.map +1 -1
- package/public/handle-prompt-context.d.ts +41 -0
- package/public/handle-prompt-context.js +397 -0
- package/public/handle-prompt-context.js.map +1 -0
- package/public/handler-llm-request.d.ts +48 -0
- package/public/handler-llm-request.js +363 -0
- package/public/handler-llm-request.js.map +1 -0
- package/public/image-gen.js +1 -1
- package/public/image-gen.js.map +1 -1
- package/public/llm-dispatch-fallback.d.ts +46 -0
- package/public/llm-dispatch-fallback.js +293 -0
- package/public/llm-dispatch-fallback.js.map +1 -0
- package/public/llm-dispatch.d.ts +5 -180
- package/public/llm-dispatch.js +5 -1158
- package/public/llm-dispatch.js.map +1 -1
- package/public/open-chat.d.ts +2 -0
- package/public/open-chat.js +51 -7
- package/public/open-chat.js.map +1 -1
- package/public/prompt-chat-section.js +119 -1167
- package/public/prompt-chat-section.js.map +1 -1
- package/public/prompt-section-actions.d.ts +41 -0
- package/public/prompt-section-actions.js +161 -0
- package/public/prompt-section-actions.js.map +1 -0
- package/public/prompt-turn-envelope.d.ts +26 -0
- package/public/prompt-turn-envelope.js +120 -0
- package/public/prompt-turn-envelope.js.map +1 -0
- package/public/prompt-turn-settled.d.ts +32 -0
- package/public/prompt-turn-settled.js +157 -0
- package/public/prompt-turn-settled.js.map +1 -0
- package/public/prompt-turn-terminal.d.ts +22 -0
- package/public/prompt-turn-terminal.js +135 -0
- package/public/prompt-turn-terminal.js.map +1 -0
- package/public/prompt-turn-types.d.ts +37 -0
- package/public/prompt-turn-types.js +2 -0
- package/public/prompt-turn-types.js.map +1 -0
- package/public/social-store.js.map +1 -1
- package/public/stream-assembly.js +33 -51
- package/public/stream-assembly.js.map +1 -1
|
@@ -0,0 +1,374 @@
|
|
|
1
|
+
import { Result, exception2Result } from "@adviser/cement";
|
|
2
|
+
import { isUserChatMessage } from "@vibes.diy/call-ai-v2";
|
|
3
|
+
import { classifyTurnReach } from "../intern/turn-reach.js";
|
|
4
|
+
import { acquireTurnBuildLock, releaseTurnBuildLock } from "../intern/codegen-build-lock.js";
|
|
5
|
+
import { runEditVibeTool } from "../intern/agent-build-tools.js";
|
|
6
|
+
import { claimFirstTurnMint, claimMintJob } from "../intern/mint-job-store.js";
|
|
7
|
+
import { claimAgentAppContext } from "../intern/agent-request-frame.js";
|
|
8
|
+
import { createAgentBelt } from "../intern/agent-belt.js";
|
|
9
|
+
import { createAgentTurnStream, agentTotalBudgetMs } from "../intern/agent-turn.js";
|
|
10
|
+
import { createAgentBuildDispatcher } from "../intern/agent-dispatcher.js";
|
|
11
|
+
import { resolveAgentActor, resolveChatApp } from "../intern/agent-actor.js";
|
|
12
|
+
import { langForFilename } from "../intern/ensure-push-seeded-chat.js";
|
|
13
|
+
import { dispatchLlmRequestWithFallback } from "./llm-dispatch.js";
|
|
14
|
+
import { createProviderSseStream } from "../intern/provider-sse.js";
|
|
15
|
+
import { loadWorkVfs, withoutServerTools } from "../intern/work-tools.js";
|
|
16
|
+
import { extendOpenTurnDeadline, OPEN_TURN_AWAIT_BUILD_EXTENSION_MS } from "../intern/open-turn-store.js";
|
|
17
|
+
import { maxPersistedBlockSeq } from "../intern/persisted-block-seq.js";
|
|
18
|
+
import { announceModelResolved, appendBlockEvent, handlerLlmRequest } from "./llm-dispatch.js";
|
|
19
|
+
import { createAgentEvidenceWriter, nextAgentSessionMessages } from "../intern/agent-evidence.js";
|
|
20
|
+
import { observeEvidenceLine } from "../intern/turn-latency.js";
|
|
21
|
+
import { handleLlmResponse } from "./stream-assembly.js";
|
|
22
|
+
import { handleFSPrompt } from "./fs-prompt.js";
|
|
23
|
+
export function createAgentTurnAction(args) {
|
|
24
|
+
const { ctx, vctx, req, orig, resChat, agentPayload, liveSession, agentEvidence, agentFetchUrlContext, agentFirstTurnMint, submittedAt, agentWakeTurn, dispatchCarry, instructionVariant, turnLatency, terminal, facts, reenter, } = args;
|
|
25
|
+
return async ({ scope, blockSeq, promptId }) => {
|
|
26
|
+
const rActor = await resolveAgentActor(vctx, {
|
|
27
|
+
userId: req._auth.verifiedAuth.claims.userId,
|
|
28
|
+
scope: agentFirstTurnMint
|
|
29
|
+
? { ownerHandle: resChat.ownerHandle }
|
|
30
|
+
: { ownerHandle: resChat.ownerHandle, appSlug: resChat.appSlug },
|
|
31
|
+
});
|
|
32
|
+
if (rActor.isErr())
|
|
33
|
+
return Result.Err(rActor.Err());
|
|
34
|
+
let liveAppSlug = resChat.appSlug;
|
|
35
|
+
let firstTurnAppClaimed = agentFirstTurnMint === false;
|
|
36
|
+
const rVfs = await loadWorkVfs(vctx, {
|
|
37
|
+
chatId: req.chatId,
|
|
38
|
+
ownerHandle: resChat.ownerHandle,
|
|
39
|
+
appSlug: resChat.appSlug,
|
|
40
|
+
editBaseFsId: undefined,
|
|
41
|
+
});
|
|
42
|
+
if (rVfs.isErr())
|
|
43
|
+
return Result.Err(rVfs.Err());
|
|
44
|
+
const vfs = new Map(rVfs.Ok());
|
|
45
|
+
function extendDeadlineForAwaitedBuild(awaiting) {
|
|
46
|
+
void extendOpenTurnDeadline(vctx.sql, {
|
|
47
|
+
chatId: req.chatId,
|
|
48
|
+
promptId,
|
|
49
|
+
deadlineAtMs: Date.now() + OPEN_TURN_AWAIT_BUILD_EXTENSION_MS,
|
|
50
|
+
}).then((r) => {
|
|
51
|
+
if (r.isErr()) {
|
|
52
|
+
vctx.logger
|
|
53
|
+
.Warn()
|
|
54
|
+
.Err(r)
|
|
55
|
+
.Any("event", { chatId: req.chatId, promptId, awaiting })
|
|
56
|
+
.Msg("agent-await-deadline-extend-failed");
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
const firstTurnFileBlocks = orig.prompt.messages
|
|
61
|
+
.filter(isUserChatMessage)
|
|
62
|
+
.flatMap((m) => m.content.filter((c) => c.type === "vibes_file"));
|
|
63
|
+
const dispatcher = createAgentBuildDispatcher({
|
|
64
|
+
vctx,
|
|
65
|
+
host: ctx,
|
|
66
|
+
auth: req.auth,
|
|
67
|
+
outerTid: req.outerTid,
|
|
68
|
+
handle: (dispatchCtx) => reenter(dispatchCtx),
|
|
69
|
+
wakeBudget: 0,
|
|
70
|
+
onPendingBuild: (t) => {
|
|
71
|
+
extendDeadlineForAwaitedBuild(t.promptId);
|
|
72
|
+
return liveSession.watch(t.promptId);
|
|
73
|
+
},
|
|
74
|
+
...(agentFirstTurnMint
|
|
75
|
+
? {
|
|
76
|
+
firstTurn: {
|
|
77
|
+
chatId: req.chatId,
|
|
78
|
+
...(submittedAt === undefined ? {} : { submittedAt }),
|
|
79
|
+
...(firstTurnFileBlocks.length === 0 ? {} : { fileBlocks: firstTurnFileBlocks }),
|
|
80
|
+
...(orig.varietyPin === undefined
|
|
81
|
+
? {}
|
|
82
|
+
: { varietyPin: orig.varietyPin }),
|
|
83
|
+
...(typeof orig.stylePin === "string"
|
|
84
|
+
? { stylePin: orig.stylePin }
|
|
85
|
+
: {}),
|
|
86
|
+
},
|
|
87
|
+
}
|
|
88
|
+
: {}),
|
|
89
|
+
...(Object.keys(dispatchCarry).length === 0 ? {} : { carry: dispatchCarry }),
|
|
90
|
+
});
|
|
91
|
+
const belt = createAgentBelt(vctx, {
|
|
92
|
+
actor: rActor.Ok(),
|
|
93
|
+
chatId: req.chatId,
|
|
94
|
+
vfs,
|
|
95
|
+
...(agentFirstTurnMint
|
|
96
|
+
? {
|
|
97
|
+
firstTurn: {
|
|
98
|
+
chatId: req.chatId,
|
|
99
|
+
claim: () => claimFirstTurnMint(vctx, req.chatId),
|
|
100
|
+
release: async () => {
|
|
101
|
+
await claimMintJob(vctx, req.chatId, ["pending"], "agent");
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
}
|
|
105
|
+
: {}),
|
|
106
|
+
...(agentFetchUrlContext === undefined ? {} : { fetchUrl: agentFetchUrlContext }),
|
|
107
|
+
dispatcher,
|
|
108
|
+
queueEdit: (input) => liveSession.queue(input),
|
|
109
|
+
fileSession: liveSession,
|
|
110
|
+
...(instructionVariant === undefined ? {} : { instructionVariant }),
|
|
111
|
+
onStyleApplied: async (applied) => {
|
|
112
|
+
await appendBlockEvent({
|
|
113
|
+
ctx,
|
|
114
|
+
vctx,
|
|
115
|
+
req,
|
|
116
|
+
promptId,
|
|
117
|
+
blockSeq,
|
|
118
|
+
evt: {
|
|
119
|
+
type: "prompt.restyle",
|
|
120
|
+
streamId: promptId,
|
|
121
|
+
chatId: req.chatId,
|
|
122
|
+
seq: blockSeq,
|
|
123
|
+
timestamp: new Date(),
|
|
124
|
+
style: applied.style,
|
|
125
|
+
description: applied.description,
|
|
126
|
+
},
|
|
127
|
+
emitMode: "emit-only",
|
|
128
|
+
});
|
|
129
|
+
},
|
|
130
|
+
onDispatch: (dispatched) => {
|
|
131
|
+
liveAppSlug = dispatched.appSlug;
|
|
132
|
+
liveSession.claimAppAddress(dispatched.appSlug);
|
|
133
|
+
firstTurnAppClaimed = true;
|
|
134
|
+
vctx.logger
|
|
135
|
+
.Info()
|
|
136
|
+
.Any("event", { chatId: dispatched.chatId, appSlug: dispatched.appSlug, promptId })
|
|
137
|
+
.Msg("agent-turn-dispatched-build");
|
|
138
|
+
},
|
|
139
|
+
});
|
|
140
|
+
facts.toolsOffered = belt.definitions.map((d) => d.function.name);
|
|
141
|
+
await liveSession.bind((input) => runEditVibeTool(vctx, {
|
|
142
|
+
actor: rActor.Ok(),
|
|
143
|
+
chatId: req.chatId,
|
|
144
|
+
input,
|
|
145
|
+
dispatcher,
|
|
146
|
+
toolsOffered: belt.definitions.map((d) => d.function.name),
|
|
147
|
+
}), bindStagedCommit({ ctx, vctx, req, resChat, rActor, scope, appClaimed: () => firstTurnAppClaimed }));
|
|
148
|
+
const res = await handlerLlmRequest({
|
|
149
|
+
ctx,
|
|
150
|
+
blockSeq,
|
|
151
|
+
scope,
|
|
152
|
+
vctx,
|
|
153
|
+
req: req,
|
|
154
|
+
resChat,
|
|
155
|
+
promptId,
|
|
156
|
+
preAssembled: { ...agentPayload, isInitialTurn: false },
|
|
157
|
+
modelUsage: "agent",
|
|
158
|
+
serverTools: belt.definitions,
|
|
159
|
+
});
|
|
160
|
+
const evidence = agentEvidence ??
|
|
161
|
+
observeEvidenceLine(createAgentEvidenceWriter({
|
|
162
|
+
chatId: req.chatId,
|
|
163
|
+
promptId,
|
|
164
|
+
sessionId: liveSession.promptId,
|
|
165
|
+
append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId, blockSeq, evt }),
|
|
166
|
+
}), turnLatency);
|
|
167
|
+
let providerStream;
|
|
168
|
+
let toolResumeResolvedSeq = -20_000;
|
|
169
|
+
let toolResumeActiveModel = res.llmReq.model;
|
|
170
|
+
const rSse = createProviderSseStream(res.res, promptId);
|
|
171
|
+
if (rSse.isErr()) {
|
|
172
|
+
vctx.logger.Warn().Err(rSse).Str("chatId", req.chatId).Msg("agent-turn-provider-stream-unavailable");
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
providerStream = createAgentTurnStream({
|
|
176
|
+
vctx,
|
|
177
|
+
belt,
|
|
178
|
+
actor: rActor.Ok(),
|
|
179
|
+
chatId: req.chatId,
|
|
180
|
+
vfs,
|
|
181
|
+
dispatcher,
|
|
182
|
+
request: res.llmReq,
|
|
183
|
+
stream: rSse.Ok(),
|
|
184
|
+
abort: res.abort,
|
|
185
|
+
onToolEvidence: ({ kind, call, text, round, epoch }) => evidence({ kind, callId: call.id, name: call.name, text, round, epoch }),
|
|
186
|
+
session: {
|
|
187
|
+
checkpoint: async (messages) => {
|
|
188
|
+
const saved = await liveSession.session.checkpoint(messages);
|
|
189
|
+
if (saved.isErr())
|
|
190
|
+
return saved;
|
|
191
|
+
const extended = await extendOpenTurnDeadline(vctx.sql, {
|
|
192
|
+
chatId: req.chatId,
|
|
193
|
+
promptId,
|
|
194
|
+
deadlineAtMs: Date.now() + agentTotalBudgetMs(vctx) + OPEN_TURN_AWAIT_BUILD_EXTENSION_MS,
|
|
195
|
+
});
|
|
196
|
+
if (extended.isErr())
|
|
197
|
+
return Result.Err(extended.Err());
|
|
198
|
+
return Result.Ok();
|
|
199
|
+
},
|
|
200
|
+
next: () => nextAgentSessionMessages(liveSession.session, evidence),
|
|
201
|
+
head: () => liveSession.session.head(),
|
|
202
|
+
dispatchBudgetMs: agentTotalBudgetMs(vctx),
|
|
203
|
+
},
|
|
204
|
+
dispatch: async ({ request, budget }) => {
|
|
205
|
+
const messages = agentFirstTurnMint && firstTurnAppClaimed
|
|
206
|
+
? claimAgentAppContext(request.messages, { ownerHandle: resChat.ownerHandle, appSlug: liveAppSlug })
|
|
207
|
+
: request.messages;
|
|
208
|
+
{
|
|
209
|
+
const latest = await loadWorkVfs(vctx, {
|
|
210
|
+
chatId: req.chatId,
|
|
211
|
+
ownerHandle: resChat.ownerHandle,
|
|
212
|
+
appSlug: liveAppSlug,
|
|
213
|
+
editBaseFsId: undefined,
|
|
214
|
+
});
|
|
215
|
+
if (latest.isErr())
|
|
216
|
+
return Result.Err(latest.Err());
|
|
217
|
+
vfs.clear();
|
|
218
|
+
for (const [path, content] of latest.Ok())
|
|
219
|
+
vfs.set(path, content);
|
|
220
|
+
}
|
|
221
|
+
const dispatch = await dispatchLlmRequestWithFallback({
|
|
222
|
+
vctx,
|
|
223
|
+
mode: req.mode,
|
|
224
|
+
llmReq: { ...res.llmReq, messages },
|
|
225
|
+
chatId: req.chatId,
|
|
226
|
+
promptId,
|
|
227
|
+
phase: "tool-resume",
|
|
228
|
+
budget,
|
|
229
|
+
});
|
|
230
|
+
if (dispatch.ok === false)
|
|
231
|
+
return Result.Err(dispatch.error);
|
|
232
|
+
await announceModelResolved({
|
|
233
|
+
ctx,
|
|
234
|
+
vctx,
|
|
235
|
+
req,
|
|
236
|
+
promptId,
|
|
237
|
+
nextSeq: () => --toolResumeResolvedSeq,
|
|
238
|
+
requested: toolResumeActiveModel,
|
|
239
|
+
resolved: dispatch.llmReq.model,
|
|
240
|
+
failMsg: "tool-resume-model-resolved-emit-failed",
|
|
241
|
+
});
|
|
242
|
+
toolResumeActiveModel = dispatch.llmReq.model;
|
|
243
|
+
const rRound = createProviderSseStream(dispatch.res, promptId);
|
|
244
|
+
if (rRound.isErr())
|
|
245
|
+
return Result.Err(rRound);
|
|
246
|
+
return Result.Ok({
|
|
247
|
+
request: { ...res.llmReq, messages },
|
|
248
|
+
stream: rRound.Ok(),
|
|
249
|
+
abort: dispatch.abort,
|
|
250
|
+
});
|
|
251
|
+
},
|
|
252
|
+
onError: (error) => {
|
|
253
|
+
vctx.logger.Warn().Any("event", { chatId: req.chatId, promptId, error }).Msg("agent-turn-loop-failed");
|
|
254
|
+
},
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
const finalBlockSeq = await handleLlmResponse({
|
|
258
|
+
scope,
|
|
259
|
+
vctx,
|
|
260
|
+
req: req,
|
|
261
|
+
ctx,
|
|
262
|
+
res: res.res,
|
|
263
|
+
resChat,
|
|
264
|
+
promptId,
|
|
265
|
+
blockSeq: res.blockSeq,
|
|
266
|
+
llmReq: res.llmReq,
|
|
267
|
+
abort: res.abort,
|
|
268
|
+
...(providerStream === undefined ? {} : { providerStream }),
|
|
269
|
+
stripServerTools: withoutServerTools,
|
|
270
|
+
proseOnly: true,
|
|
271
|
+
terminal,
|
|
272
|
+
researchRequested: false,
|
|
273
|
+
platformInitiated: agentWakeTurn,
|
|
274
|
+
step: agentWakeTurn ? "wake" : "agent",
|
|
275
|
+
});
|
|
276
|
+
return Result.Ok(finalBlockSeq);
|
|
277
|
+
};
|
|
278
|
+
}
|
|
279
|
+
function bindStagedCommit(args) {
|
|
280
|
+
const { ctx, vctx, req, resChat, rActor, scope, appClaimed } = args;
|
|
281
|
+
return async (commit) => {
|
|
282
|
+
if (appClaimed() === false)
|
|
283
|
+
return Result.Ok({
|
|
284
|
+
ok: false,
|
|
285
|
+
reason: "no-app-yet",
|
|
286
|
+
message: "Call create_vibe first; there is no app to edit until it has been created.",
|
|
287
|
+
});
|
|
288
|
+
const currentActor = await resolveAgentActor(vctx, {
|
|
289
|
+
userId: rActor.Ok().userId,
|
|
290
|
+
requestedHandle: rActor.Ok().ownerHandle,
|
|
291
|
+
scope: rActor.Ok().scope,
|
|
292
|
+
});
|
|
293
|
+
if (currentActor.isErr())
|
|
294
|
+
return Result.Err(currentActor.Err());
|
|
295
|
+
const scoped = await resolveChatApp(vctx, currentActor.Ok(), req.chatId);
|
|
296
|
+
if (scoped.isErr())
|
|
297
|
+
return Result.Err(scoped.Err());
|
|
298
|
+
const commitId = vctx.sthis.nextId(12).str;
|
|
299
|
+
const lock = acquireTurnBuildLock({
|
|
300
|
+
vctx,
|
|
301
|
+
chatId: req.chatId,
|
|
302
|
+
promptId: commitId,
|
|
303
|
+
movesFilesystem: true,
|
|
304
|
+
wakesOnTerminal: false,
|
|
305
|
+
});
|
|
306
|
+
if (lock.acquired === false)
|
|
307
|
+
return Result.Err("A build is running; the staged commit could not acquire the write lane.");
|
|
308
|
+
const committed = { promptBlockEndEmitted: false };
|
|
309
|
+
const saved = await exception2Result(() => handleFSPrompt({
|
|
310
|
+
scope,
|
|
311
|
+
vctx,
|
|
312
|
+
ctx,
|
|
313
|
+
promptId: commitId,
|
|
314
|
+
blockSeq: 0,
|
|
315
|
+
terminal: committed,
|
|
316
|
+
beginDirect: true,
|
|
317
|
+
resChat: { ...resChat, mode: "fs-update" },
|
|
318
|
+
req: {
|
|
319
|
+
type: "vibes.diy.req-prompt-chat-section",
|
|
320
|
+
mode: "fs-update",
|
|
321
|
+
auth: req.auth,
|
|
322
|
+
_auth: req._auth,
|
|
323
|
+
chatId: req.chatId,
|
|
324
|
+
outerTid: req.outerTid,
|
|
325
|
+
agentFileCommit: commit,
|
|
326
|
+
fsUpdate: {
|
|
327
|
+
update: commit.changes.map((file) => ({
|
|
328
|
+
type: "code-block",
|
|
329
|
+
filename: file.path,
|
|
330
|
+
content: file.contents,
|
|
331
|
+
lang: langForFilename(file.path),
|
|
332
|
+
})),
|
|
333
|
+
remove: [],
|
|
334
|
+
},
|
|
335
|
+
},
|
|
336
|
+
})).finally(() => {
|
|
337
|
+
committed.releasePersistGate?.();
|
|
338
|
+
releaseTurnBuildLock(vctx, req.chatId, commitId);
|
|
339
|
+
});
|
|
340
|
+
if (saved.isErr()) {
|
|
341
|
+
const last = await maxPersistedBlockSeq(vctx.sql, { chatId: req.chatId, promptId: commitId });
|
|
342
|
+
if (last.isErr())
|
|
343
|
+
return Result.Err(last.Err());
|
|
344
|
+
const seq = (last.Ok() ?? -1) + 1;
|
|
345
|
+
await appendBlockEvent({
|
|
346
|
+
ctx,
|
|
347
|
+
vctx,
|
|
348
|
+
req,
|
|
349
|
+
promptId: commitId,
|
|
350
|
+
blockSeq: seq,
|
|
351
|
+
evt: {
|
|
352
|
+
type: "prompt.error",
|
|
353
|
+
streamId: commitId,
|
|
354
|
+
chatId: req.chatId,
|
|
355
|
+
seq,
|
|
356
|
+
timestamp: new Date(),
|
|
357
|
+
error: saved.Err().message,
|
|
358
|
+
},
|
|
359
|
+
});
|
|
360
|
+
return Result.Err(saved.Err());
|
|
361
|
+
}
|
|
362
|
+
if (committed.fsRef === undefined)
|
|
363
|
+
return Result.Err("The commit did not persist a version.");
|
|
364
|
+
const committedPaths = commit.changes.map((file) => file.path);
|
|
365
|
+
return Result.Ok({
|
|
366
|
+
ok: true,
|
|
367
|
+
saved: true,
|
|
368
|
+
fsRef: committed.fsRef,
|
|
369
|
+
paths: committedPaths,
|
|
370
|
+
entryTouched: classifyTurnReach(committedPaths).entryTouched,
|
|
371
|
+
});
|
|
372
|
+
};
|
|
373
|
+
}
|
|
374
|
+
//# sourceMappingURL=agent-turn-action.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-turn-action.js","sourceRoot":"","sources":["../../jsr/public/agent-turn-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { Result } from "@adviser/cement";
|
|
2
|
+
import { ReqPromptChatSection, ReqWithVerifiedAuth } from "@vibes.diy/api-types";
|
|
3
|
+
import { VibesApiSQLCtx } from "../types.js";
|
|
4
|
+
import type { ModelDefaults } from "../intern/get-model-defaults.js";
|
|
5
|
+
import { type LiveAgentSession } from "../intern/agent-session-runtime.js";
|
|
6
|
+
import type { AgentSessionPins } from "../intern/agent-session.js";
|
|
7
|
+
import type { InstructionVariant } from "../intern/instruction-variant.js";
|
|
8
|
+
import type { FetchUrlToolContext } from "../intern/fetch-url-tool.js";
|
|
9
|
+
import { type TurnLatencySignal } from "../intern/turn-latency.js";
|
|
10
|
+
import { type ResChat } from "./llm-dispatch.js";
|
|
11
|
+
import type { TurnEnvelope } from "./prompt-turn-envelope.js";
|
|
12
|
+
import type { AgentAssembled, AgentEvidence, PromptHandlerCtx, ReqCreationPromptChatSection } from "./prompt-turn-types.js";
|
|
13
|
+
export type AgentTurnAssembly = {
|
|
14
|
+
kind: "receipt";
|
|
15
|
+
} | {
|
|
16
|
+
kind: "live";
|
|
17
|
+
agentAssembled: AgentAssembled;
|
|
18
|
+
agentSession: LiveAgentSession;
|
|
19
|
+
agentEvidence: AgentEvidence;
|
|
20
|
+
agentFetchUrlContext: FetchUrlToolContext | undefined;
|
|
21
|
+
};
|
|
22
|
+
export declare function assembleAgentTurn(args: {
|
|
23
|
+
ctx: PromptHandlerCtx;
|
|
24
|
+
vctx: VibesApiSQLCtx;
|
|
25
|
+
req: ReqWithVerifiedAuth<ReqPromptChatSection>;
|
|
26
|
+
orig: ReqCreationPromptChatSection;
|
|
27
|
+
resChat: ResChat;
|
|
28
|
+
defaults: ModelDefaults;
|
|
29
|
+
envelope: TurnEnvelope;
|
|
30
|
+
agentFirstTurnMint: boolean;
|
|
31
|
+
instructionVariant: InstructionVariant | undefined;
|
|
32
|
+
turnLatency: TurnLatencySignal;
|
|
33
|
+
pins?: AgentSessionPins;
|
|
34
|
+
}): Promise<Result<AgentTurnAssembly>>;
|
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
import { Result } from "@adviser/cement";
|
|
2
|
+
import { isChatMessage, isUserChatMessage } from "@vibes.diy/call-ai-v2";
|
|
3
|
+
import { wrapMsgBase } from "../unwrap-msg-base.js";
|
|
4
|
+
import { peekBuildLockEntry } from "../intern/codegen-build-lock.js";
|
|
5
|
+
import { deliverAgentSession } from "../intern/agent-session-runtime.js";
|
|
6
|
+
import { readAgentSession } from "../intern/agent-session-store.js";
|
|
7
|
+
import { assembleAgentPayload } from "../intern/agent-assembly.js";
|
|
8
|
+
import { composeAgentRequest, isAppContextMessage, markJournalCacheTail } from "../intern/agent-request-frame.js";
|
|
9
|
+
import { activateWorkUrls, loadWorkFetchUrlContext } from "../intern/work-tools.js";
|
|
10
|
+
import { createAgentEvidenceWriter, nextAgentSessionMessages } from "../intern/agent-evidence.js";
|
|
11
|
+
import { observeEvidenceLine } from "../intern/turn-latency.js";
|
|
12
|
+
import { appendBlockEvent, currentUserMessageText } from "./llm-dispatch.js";
|
|
13
|
+
export async function assembleAgentTurn(args) {
|
|
14
|
+
const { ctx, vctx, req, orig, resChat, defaults, agentFirstTurnMint, instructionVariant, turnLatency } = args;
|
|
15
|
+
const { agentWakeNote, agentWakeTurn, nonInteractive } = args.envelope;
|
|
16
|
+
const pinOpts = args.pins === undefined ? undefined : { pins: args.pins };
|
|
17
|
+
const agentFetchUrlContext = await loadWorkFetchUrlContext(vctx, {
|
|
18
|
+
userId: req._auth.verifiedAuth.claims.userId,
|
|
19
|
+
chatId: req.chatId,
|
|
20
|
+
ownerHandle: resChat.ownerHandle,
|
|
21
|
+
appSlug: resChat.appSlug,
|
|
22
|
+
activatedUrls: activateWorkUrls(currentUserMessageText(orig.prompt.messages.filter(isChatMessage))),
|
|
23
|
+
});
|
|
24
|
+
const buildInFlight = peekBuildLockEntry(vctx.connections, req.chatId);
|
|
25
|
+
const rSeenHead = await readAgentSession(vctx.sql, req.chatId);
|
|
26
|
+
if (rSeenHead.isErr())
|
|
27
|
+
vctx.logger.Warn().Err(rSeenHead).Str("chatId", req.chatId).Msg("agent-session-head-read-failed");
|
|
28
|
+
const lastSeenHeadFsId = rSeenHead.isOk() ? rSeenHead.Ok().snapshot?.headFsId : undefined;
|
|
29
|
+
const rAgent = await assembleAgentPayload(vctx, {
|
|
30
|
+
chatId: req.chatId,
|
|
31
|
+
userId: req._auth.verifiedAuth.claims.userId,
|
|
32
|
+
model: orig.prompt.model ?? defaults.agent.model.id,
|
|
33
|
+
ownerHandle: resChat.ownerHandle,
|
|
34
|
+
appSlug: resChat.appSlug,
|
|
35
|
+
newUserMessages: orig.prompt.messages.filter(isChatMessage),
|
|
36
|
+
...(agentWakeNote === undefined ? {} : { wakeNote: agentWakeNote }),
|
|
37
|
+
...(buildInFlight === undefined ? {} : { buildInFlight: { promptId: buildInFlight.promptId } }),
|
|
38
|
+
...(agentFirstTurnMint ? { noAppYet: true } : {}),
|
|
39
|
+
...(nonInteractive ? { nonInteractive: true } : {}),
|
|
40
|
+
...(lastSeenHeadFsId === undefined ? {} : { lastSeenHeadFsId }),
|
|
41
|
+
...(instructionVariant === undefined ? {} : { instructionVariant }),
|
|
42
|
+
});
|
|
43
|
+
if (rAgent.isErr())
|
|
44
|
+
return Result.Err(rAgent);
|
|
45
|
+
let agentAssembled = { model: rAgent.Ok().model, messages: rAgent.Ok().messages };
|
|
46
|
+
const rawIncoming = orig.prompt.messages.filter(isUserChatMessage);
|
|
47
|
+
const newMessageCount = orig.prompt.messages.filter(isChatMessage).length;
|
|
48
|
+
const incoming = newMessageCount === 0 ? [] : rAgent.Ok().messages.slice(-newMessageCount).filter(isUserChatMessage);
|
|
49
|
+
const delivered = incoming.length === 0 && agentWakeTurn
|
|
50
|
+
? [
|
|
51
|
+
{
|
|
52
|
+
role: "user",
|
|
53
|
+
content: [
|
|
54
|
+
{
|
|
55
|
+
type: "text",
|
|
56
|
+
text: agentWakeNote ??
|
|
57
|
+
"[session resumed] Continue from your persisted context and pending results. Inspect outcomes before retrying interrupted tools.",
|
|
58
|
+
},
|
|
59
|
+
],
|
|
60
|
+
},
|
|
61
|
+
]
|
|
62
|
+
: incoming;
|
|
63
|
+
const acquired = await deliverAgentSession(vctx, {
|
|
64
|
+
chatId: req.chatId,
|
|
65
|
+
userId: req._auth.verifiedAuth.claims.userId,
|
|
66
|
+
ownerHandle: resChat.ownerHandle,
|
|
67
|
+
appSlug: resChat.appSlug,
|
|
68
|
+
}, { id: ctx.validated.tid, messages: delivered }, rAgent.Ok().messages.filter((message) => message.role === "system" || isAppContextMessage(message)));
|
|
69
|
+
if (acquired.isErr())
|
|
70
|
+
return Result.Err(acquired.Err());
|
|
71
|
+
const { live, created } = acquired.Ok();
|
|
72
|
+
const composedHead = rAgent.Ok().headFsId;
|
|
73
|
+
if (composedHead !== undefined) {
|
|
74
|
+
const noted = await live.session.observeHead(composedHead);
|
|
75
|
+
if (noted.isErr())
|
|
76
|
+
vctx.logger.Warn().Err(noted).Str("chatId", req.chatId).Msg("agent-session-head-note-failed");
|
|
77
|
+
}
|
|
78
|
+
if (created === false) {
|
|
79
|
+
const receiptId = vctx.sthis.nextId(12).str;
|
|
80
|
+
const receiptEvidence = createAgentEvidenceWriter({
|
|
81
|
+
chatId: req.chatId,
|
|
82
|
+
promptId: receiptId,
|
|
83
|
+
sessionId: live.promptId,
|
|
84
|
+
append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId: receiptId, blockSeq, evt }),
|
|
85
|
+
});
|
|
86
|
+
const linked = await receiptEvidence({ kind: "active" });
|
|
87
|
+
if (linked.isErr())
|
|
88
|
+
return Result.Err(linked.Err());
|
|
89
|
+
await ctx.send.send(ctx, wrapMsgBase(ctx.validated, {
|
|
90
|
+
payload: {
|
|
91
|
+
type: "vibes.diy.res-prompt-chat-section",
|
|
92
|
+
chatId: req.chatId,
|
|
93
|
+
ownerHandle: resChat.ownerHandle,
|
|
94
|
+
appSlug: resChat.appSlug,
|
|
95
|
+
promptId: receiptId,
|
|
96
|
+
outerTid: req.outerTid,
|
|
97
|
+
mode: req.mode,
|
|
98
|
+
},
|
|
99
|
+
tid: ctx.validated.tid,
|
|
100
|
+
src: "agentSession",
|
|
101
|
+
}));
|
|
102
|
+
const echo = await appendBlockEvent({
|
|
103
|
+
ctx,
|
|
104
|
+
vctx,
|
|
105
|
+
req,
|
|
106
|
+
promptId: receiptId,
|
|
107
|
+
blockSeq: 0,
|
|
108
|
+
evt: {
|
|
109
|
+
type: "prompt.req",
|
|
110
|
+
...(orig.mode === "codegen" && orig.source === "suggestion" ? { source: "suggestion" } : {}),
|
|
111
|
+
streamId: receiptId,
|
|
112
|
+
chatId: req.chatId,
|
|
113
|
+
seq: 0,
|
|
114
|
+
request: { messages: rawIncoming },
|
|
115
|
+
timestamp: new Date(),
|
|
116
|
+
},
|
|
117
|
+
});
|
|
118
|
+
if (echo.isErr())
|
|
119
|
+
return Result.Err(echo.Err());
|
|
120
|
+
const terminal = await appendBlockEvent({
|
|
121
|
+
ctx,
|
|
122
|
+
vctx,
|
|
123
|
+
req,
|
|
124
|
+
promptId: receiptId,
|
|
125
|
+
blockSeq: 1,
|
|
126
|
+
evt: {
|
|
127
|
+
type: "block.end",
|
|
128
|
+
streamId: receiptId,
|
|
129
|
+
blockId: receiptId,
|
|
130
|
+
blockNr: 0,
|
|
131
|
+
seq: 1,
|
|
132
|
+
timestamp: new Date(),
|
|
133
|
+
stats: {
|
|
134
|
+
toplevel: { lines: 0, bytes: 0 },
|
|
135
|
+
code: { lines: 0, bytes: 0 },
|
|
136
|
+
image: { lines: 0, bytes: 0 },
|
|
137
|
+
total: { lines: 0, bytes: 0 },
|
|
138
|
+
},
|
|
139
|
+
usage: { given: [], calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } },
|
|
140
|
+
},
|
|
141
|
+
});
|
|
142
|
+
if (terminal.isErr())
|
|
143
|
+
return Result.Err(terminal.Err());
|
|
144
|
+
const ended = await appendBlockEvent({
|
|
145
|
+
ctx,
|
|
146
|
+
vctx,
|
|
147
|
+
req,
|
|
148
|
+
promptId: receiptId,
|
|
149
|
+
blockSeq: 2,
|
|
150
|
+
evt: { type: "prompt.block-end", streamId: receiptId, chatId: req.chatId, seq: 2, timestamp: new Date() },
|
|
151
|
+
});
|
|
152
|
+
if (ended.isErr())
|
|
153
|
+
return Result.Err(ended.Err());
|
|
154
|
+
return Result.Ok({ kind: "receipt" });
|
|
155
|
+
}
|
|
156
|
+
const agentEvidence = observeEvidenceLine(createAgentEvidenceWriter({
|
|
157
|
+
chatId: req.chatId,
|
|
158
|
+
promptId: live.promptId,
|
|
159
|
+
sessionId: live.promptId,
|
|
160
|
+
append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId: live.promptId, blockSeq, evt }),
|
|
161
|
+
}), turnLatency);
|
|
162
|
+
const active = await agentEvidence({
|
|
163
|
+
kind: "active",
|
|
164
|
+
...(live.supersedes === undefined ? {} : { supersedes: live.supersedes }),
|
|
165
|
+
});
|
|
166
|
+
if (active.isErr()) {
|
|
167
|
+
live.close();
|
|
168
|
+
return Result.Err(active.Err());
|
|
169
|
+
}
|
|
170
|
+
if (live.session.messages().length === 0) {
|
|
171
|
+
const initial = agentAssembled.messages.slice(0, agentAssembled.messages.length - newMessageCount - (agentWakeNote === undefined ? 0 : 1));
|
|
172
|
+
const saved = await live.session.checkpoint(initial, pinOpts);
|
|
173
|
+
if (saved.isErr()) {
|
|
174
|
+
live.close();
|
|
175
|
+
return Result.Err(saved.Err());
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
const events = await nextAgentSessionMessages(live.session, agentEvidence);
|
|
179
|
+
if (events.isErr()) {
|
|
180
|
+
live.close();
|
|
181
|
+
return Result.Err(events.Err());
|
|
182
|
+
}
|
|
183
|
+
agentAssembled = {
|
|
184
|
+
...agentAssembled,
|
|
185
|
+
messages: composeAgentRequest({
|
|
186
|
+
system: agentAssembled.messages.filter((message) => message.role === "system"),
|
|
187
|
+
journal: markJournalCacheTail(live.session.messages()),
|
|
188
|
+
context: agentAssembled.messages.filter(isAppContextMessage),
|
|
189
|
+
tail: events.Ok() ?? [],
|
|
190
|
+
}),
|
|
191
|
+
};
|
|
192
|
+
const saved = await live.session.checkpoint(agentAssembled.messages, pinOpts);
|
|
193
|
+
if (saved.isErr()) {
|
|
194
|
+
live.close();
|
|
195
|
+
return Result.Err(saved.Err());
|
|
196
|
+
}
|
|
197
|
+
return Result.Ok({ kind: "live", agentAssembled, agentSession: live, agentEvidence, agentFetchUrlContext });
|
|
198
|
+
}
|
|
199
|
+
//# sourceMappingURL=agent-turn-assembly.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-turn-assembly.js","sourceRoot":"","sources":["../../jsr/public/agent-turn-assembly.ts"],"names":[],"mappings":"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"}
|