@vibes.diy/api-svc 2.2.13-dev.6 → 2.2.15
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/append-turn-to-chat.d.ts +20 -0
- package/intern/append-turn-to-chat.js +100 -0
- package/intern/append-turn-to-chat.js.map +1 -0
- package/intern/last-edit-diff.d.ts +14 -0
- package/intern/last-edit-diff.js +126 -0
- package/intern/last-edit-diff.js.map +1 -0
- package/intern/recovery.js +10 -3
- package/intern/recovery.js.map +1 -1
- package/intern/slot-assembler.d.ts +44 -0
- package/intern/slot-assembler.js +152 -0
- package/intern/slot-assembler.js.map +1 -0
- package/intern/version-timeline.d.ts +17 -0
- package/intern/version-timeline.js +75 -0
- package/intern/version-timeline.js.map +1 -0
- package/intern/write-apps.d.ts +7 -2
- package/intern/write-apps.js +13 -13
- package/intern/write-apps.js.map +1 -1
- package/package.json +11 -11
- package/public/ensure-app-slug-item.js +1 -1
- package/public/ensure-app-slug-item.js.map +1 -1
- package/public/prompt-chat-section.d.ts +9 -2
- package/public/prompt-chat-section.js +112 -49
- package/public/prompt-chat-section.js.map +1 -1
package/intern/write-apps.d.ts
CHANGED
|
@@ -1,9 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { VibeFile, StorageResult, ResEnsureAppSlug } from "@vibes.diy/api-types";
|
|
2
2
|
import { Result } from "@adviser/cement";
|
|
3
3
|
import { AppUserSlugBinding, VibesApiSQLCtx } from "../types.js";
|
|
4
4
|
export declare function transformJSXToJS(code: string): string;
|
|
5
5
|
export declare function importsFromJS(js: string): string[];
|
|
6
|
-
export
|
|
6
|
+
export interface EnsureAppsOpts {
|
|
7
|
+
readonly env: Record<string, string>;
|
|
8
|
+
readonly mode: "dev" | "production";
|
|
9
|
+
readonly userId: string;
|
|
10
|
+
}
|
|
11
|
+
export declare function ensureApps(ctx: VibesApiSQLCtx, opts: EnsureAppsOpts, binding: AppUserSlugBinding, fs: {
|
|
7
12
|
vibeFileItem: VibeFile;
|
|
8
13
|
storage: StorageResult;
|
|
9
14
|
}[]): Promise<Result<ResEnsureAppSlug>>;
|
package/intern/write-apps.js
CHANGED
|
@@ -157,8 +157,8 @@ async function toFileSystemItems(ctx, mode, fs) {
|
|
|
157
157
|
transformed.push(...(await createImportMap(ctx, mode, imports)));
|
|
158
158
|
return transformed;
|
|
159
159
|
}
|
|
160
|
-
export async function ensureApps(ctx,
|
|
161
|
-
const fsId = await computeFsId(
|
|
160
|
+
export async function ensureApps(ctx, opts, binding, fs) {
|
|
161
|
+
const fsId = await computeFsId(opts.env ?? {}, fs);
|
|
162
162
|
const exist = await ctx.sql.db
|
|
163
163
|
.select()
|
|
164
164
|
.from(ctx.sql.tables.apps)
|
|
@@ -166,13 +166,13 @@ export async function ensureApps(ctx, req, binding, fs) {
|
|
|
166
166
|
.limit(1)
|
|
167
167
|
.then((r) => r[0]);
|
|
168
168
|
if (exist) {
|
|
169
|
-
if (
|
|
169
|
+
if (opts.mode === "production" && exist.mode === "dev") {
|
|
170
170
|
await ctx.sql.db
|
|
171
171
|
.update(ctx.sql.tables.apps)
|
|
172
|
-
.set({ mode:
|
|
172
|
+
.set({ mode: opts.mode })
|
|
173
173
|
.where(and(eq(ctx.sql.tables.apps.userId, binding.userSlug.userId), eq(ctx.sql.tables.apps.fsId, fsId), eq(ctx.sql.tables.apps.appSlug, binding.appSlug.appSlug), eq(ctx.sql.tables.apps.userSlug, binding.userSlug.userSlug)));
|
|
174
174
|
}
|
|
175
|
-
const rFileSystems = await toFileSystemItems(ctx,
|
|
175
|
+
const rFileSystems = await toFileSystemItems(ctx, opts.mode, fs);
|
|
176
176
|
if (rFileSystems.some((item) => item.isErr())) {
|
|
177
177
|
return Result.Err(`Failed to process file system items: ${rFileSystems
|
|
178
178
|
.filter((item) => item.isErr())
|
|
@@ -183,13 +183,13 @@ export async function ensureApps(ctx, req, binding, fs) {
|
|
|
183
183
|
type: "vibes.diy.res-ensure-app-slug",
|
|
184
184
|
userSlug: binding.userSlug.userSlug,
|
|
185
185
|
appSlug: binding.appSlug.appSlug,
|
|
186
|
-
mode:
|
|
186
|
+
mode: opts.mode,
|
|
187
187
|
fsId,
|
|
188
|
-
env:
|
|
188
|
+
env: opts.env,
|
|
189
189
|
fileSystem: rFileSystems.map((item) => item.Ok()),
|
|
190
190
|
});
|
|
191
191
|
}
|
|
192
|
-
const rMaxSeq = await checkMaxAppsPerUser(ctx,
|
|
192
|
+
const rMaxSeq = await checkMaxAppsPerUser(ctx, opts.userId, binding.appSlug.appSlug);
|
|
193
193
|
if (rMaxSeq.isErr()) {
|
|
194
194
|
return Result.Err(rMaxSeq);
|
|
195
195
|
}
|
|
@@ -200,7 +200,7 @@ export async function ensureApps(ctx, req, binding, fs) {
|
|
|
200
200
|
if (typeof maxSeq !== "number") {
|
|
201
201
|
return Result.Err(`Unexpected result from checkMaxAppsPerUser: ${maxSeq}`);
|
|
202
202
|
}
|
|
203
|
-
const rFileSystems = await toFileSystemItems(ctx,
|
|
203
|
+
const rFileSystems = await toFileSystemItems(ctx, opts.mode, fs);
|
|
204
204
|
if (rFileSystems.some((item) => item.isErr())) {
|
|
205
205
|
return Result.Err(`Failed to process file system items: ${rFileSystems
|
|
206
206
|
.filter((item) => item.isErr())
|
|
@@ -225,10 +225,10 @@ export async function ensureApps(ctx, req, binding, fs) {
|
|
|
225
225
|
userSlug: binding.userSlug.userSlug,
|
|
226
226
|
releaseSeq: maxSeq + 1,
|
|
227
227
|
fsId,
|
|
228
|
-
env:
|
|
228
|
+
env: opts.env,
|
|
229
229
|
fileSystem: rFileSystems.map((item) => item.Ok()),
|
|
230
230
|
meta: carriedMeta,
|
|
231
|
-
mode:
|
|
231
|
+
mode: opts.mode,
|
|
232
232
|
created: new Date().toISOString(),
|
|
233
233
|
};
|
|
234
234
|
const rIns = await exception2Result(() => ctx.sql.db.insert(ctx.sql.tables.apps).values(sqlVal));
|
|
@@ -239,9 +239,9 @@ export async function ensureApps(ctx, req, binding, fs) {
|
|
|
239
239
|
type: "vibes.diy.res-ensure-app-slug",
|
|
240
240
|
appSlug: binding.appSlug.appSlug,
|
|
241
241
|
userSlug: binding.userSlug.userSlug,
|
|
242
|
-
mode:
|
|
242
|
+
mode: opts.mode,
|
|
243
243
|
fsId,
|
|
244
|
-
env:
|
|
244
|
+
env: opts.env,
|
|
245
245
|
fileSystem: rFileSystems.map((item) => item.Ok()),
|
|
246
246
|
wrapperUrl: "string",
|
|
247
247
|
entryPointUrl: "string",
|
package/intern/write-apps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-apps.js","sourceRoot":"","sources":["../../jsr/intern/write-apps.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"write-apps.js","sourceRoot":"","sources":["../../jsr/intern/write-apps.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-svc",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.15",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -25,18 +25,18 @@
|
|
|
25
25
|
"@libsql/client": "~0.17.2",
|
|
26
26
|
"@neondatabase/serverless": "~1.1.0",
|
|
27
27
|
"@noble/hashes": "~2.2.0",
|
|
28
|
-
"@vibes.diy/api-impl": "2.2.
|
|
29
|
-
"@vibes.diy/api-pkg": "2.2.
|
|
30
|
-
"@vibes.diy/api-sql": "2.2.
|
|
31
|
-
"@vibes.diy/api-types": "2.2.
|
|
32
|
-
"@vibes.diy/call-ai-v2": "2.2.
|
|
33
|
-
"@vibes.diy/prompts": "2.2.
|
|
34
|
-
"@vibes.diy/use-vibes-base": "2.2.
|
|
35
|
-
"@vibes.diy/vibe-db-explorer": "2.2.
|
|
36
|
-
"@vibes.diy/vibe-types": "2.2.
|
|
28
|
+
"@vibes.diy/api-impl": "2.2.15",
|
|
29
|
+
"@vibes.diy/api-pkg": "2.2.15",
|
|
30
|
+
"@vibes.diy/api-sql": "2.2.15",
|
|
31
|
+
"@vibes.diy/api-types": "2.2.15",
|
|
32
|
+
"@vibes.diy/call-ai-v2": "2.2.15",
|
|
33
|
+
"@vibes.diy/prompts": "2.2.15",
|
|
34
|
+
"@vibes.diy/use-vibes-base": "2.2.15",
|
|
35
|
+
"@vibes.diy/vibe-db-explorer": "2.2.15",
|
|
36
|
+
"@vibes.diy/vibe-types": "2.2.15",
|
|
37
37
|
"acorn": "~8.16.0",
|
|
38
38
|
"arktype": "~2.2.0",
|
|
39
|
-
"call-ai": "2.2.
|
|
39
|
+
"call-ai": "2.2.15",
|
|
40
40
|
"cookie": "~1.1.1",
|
|
41
41
|
"drizzle-orm": "~0.45.2",
|
|
42
42
|
"jose": "~6.2.2",
|
|
@@ -61,7 +61,7 @@ export async function ensureAppSlugItem(vctx, req, opts) {
|
|
|
61
61
|
vibeFileItem: writeAppSlugsOp[idx].fsItem,
|
|
62
62
|
storage: op.Ok(),
|
|
63
63
|
}));
|
|
64
|
-
const rEnsure = await ensureApps(vctx, req, rAppSlugBinding.Ok(), fullFileSystem);
|
|
64
|
+
const rEnsure = await ensureApps(vctx, { env: req.env ?? {}, mode: req.mode, userId: req._auth.verifiedAuth.claims.userId }, rAppSlugBinding.Ok(), fullFileSystem);
|
|
65
65
|
if (rEnsure.isErr()) {
|
|
66
66
|
return Result.Err(rEnsure);
|
|
67
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-app-slug-item.js","sourceRoot":"","sources":["../../jsr/public/ensure-app-slug-item.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ensure-app-slug-item.js","sourceRoot":"","sources":["../../jsr/public/ensure-app-slug-item.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventoHandler, Result, Option, HandleTriggerCtx } from "@adviser/cement";
|
|
2
2
|
import { Scope } from "@adviser/scopey";
|
|
3
|
-
import { type PromptStyle, MsgBase, PromptAndBlockMsgs, ReqPromptChatSection, ReqPromptFSChatSection, ReqWithVerifiedAuth, VibeFile, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
|
|
3
|
+
import { type PromptStyle, MsgBase, PromptAndBlockMsgs, ReqPromptChatSection, ReqPromptFSChatSection, ReqWithVerifiedAuth, VibeFile, VibesDiyError, W3CWebSocketEvent, type SelectedSlotInput, type SlotConfig } from "@vibes.diy/api-types";
|
|
4
4
|
import { VibesApiSQLCtx } from "../types.js";
|
|
5
5
|
import { ChatMessage, CodeMsg, CodeBeginMsg, CodeLineMsg, FileSystemRef, BlockEndMsg, CodeEndMsg, type ApplyEditsError, type FenceParseError } from "@vibes.diy/call-ai-v2";
|
|
6
6
|
import type { Logger } from "@adviser/cement";
|
|
@@ -68,11 +68,18 @@ export declare function handlePromptContext({ vctx, req, resChat, promptId, bloc
|
|
|
68
68
|
blockSeq: number;
|
|
69
69
|
fsRef: Option<FileSystemRef>;
|
|
70
70
|
}>>;
|
|
71
|
-
export
|
|
71
|
+
export interface ReconstructOpts {
|
|
72
|
+
readonly keepFullTurnStreamId?: string;
|
|
73
|
+
}
|
|
74
|
+
export declare function reconstructConversationMessages(sectionMsgs: PromptAndBlockMsgs[], opts?: ReconstructOpts): ChatMessage[];
|
|
72
75
|
export interface AssemblePromptPayloadArgs {
|
|
73
76
|
readonly chatId: string;
|
|
74
77
|
readonly model: string;
|
|
75
78
|
readonly newUserMessages: readonly ChatMessage[];
|
|
79
|
+
readonly selected?: SelectedSlotInput;
|
|
80
|
+
readonly slots?: SlotConfig;
|
|
81
|
+
readonly focusPath?: string;
|
|
82
|
+
readonly slotDeliveryMode?: "user" | "system";
|
|
76
83
|
}
|
|
77
84
|
export declare function assemblePromptPayload(vctx: VibesApiSQLCtx, args: AssemblePromptPayloadArgs): Promise<Result<{
|
|
78
85
|
model: string;
|
|
@@ -12,7 +12,9 @@ import { applyEdits, createStatsCollector, createLineStream, createDataStream, c
|
|
|
12
12
|
import { getRecoveryAddendum, getRecoveryStitchAddendum, makeBaseSystemPrompt, resolveEffectiveModel } from "@vibes.diy/prompts";
|
|
13
13
|
import { ensureAppSlugItem } from "./ensure-app-slug-item.js";
|
|
14
14
|
import { getModelDefaults } from "../intern/get-model-defaults.js";
|
|
15
|
-
import { buildRecoveryRequest, buildTruncatedEvent,
|
|
15
|
+
import { buildRecoveryRequest, buildTruncatedEvent, shouldAttemptRecovery, updateRecoveryCounter, } from "../intern/recovery.js";
|
|
16
|
+
import { loadVersionTimeline, selectSlotSources, loadLatestPromptId } from "../intern/version-timeline.js";
|
|
17
|
+
import { assembleSlotMessages, renderSlotMessagesAs, resolveSlotConfig } from "../intern/slot-assembler.js";
|
|
16
18
|
import { bumpAppRecency } from "../intern/bump-app-recency.js";
|
|
17
19
|
export function createPromptAssetFetch(deps) {
|
|
18
20
|
return async (url, _init) => {
|
|
@@ -30,28 +32,6 @@ export function createPromptAssetFetch(deps) {
|
|
|
30
32
|
export function promptsPkgBaseUrl(workspace) {
|
|
31
33
|
return BuildURI.from(workspace).appendRelative("@vibes.diy/prompts/").toString();
|
|
32
34
|
}
|
|
33
|
-
async function loadPriorFileSystem(vctx, chatId) {
|
|
34
|
-
const latestPrompt = await vctx.sql.db
|
|
35
|
-
.select()
|
|
36
|
-
.from(vctx.sql.tables.promptContexts)
|
|
37
|
-
.innerJoin(vctx.sql.tables.apps, eq(vctx.sql.tables.apps.fsId, vctx.sql.tables.promptContexts.fsId))
|
|
38
|
-
.where(eq(vctx.sql.tables.promptContexts.chatId, chatId))
|
|
39
|
-
.orderBy(desc(vctx.sql.tables.promptContexts.created))
|
|
40
|
-
.limit(1)
|
|
41
|
-
.then((r) => r[0]);
|
|
42
|
-
const seed = new Map();
|
|
43
|
-
if (!latestPrompt)
|
|
44
|
-
return seed;
|
|
45
|
-
const files = parseArray(latestPrompt.Apps.fileSystem, vibeFile);
|
|
46
|
-
for (const f of files) {
|
|
47
|
-
if (f.type !== "code-block")
|
|
48
|
-
continue;
|
|
49
|
-
if (typeof f.content !== "string")
|
|
50
|
-
continue;
|
|
51
|
-
seed.set(f.filename, f.content);
|
|
52
|
-
}
|
|
53
|
-
return seed;
|
|
54
|
-
}
|
|
55
35
|
export function resolveCodeBlocksToFileSystem(blocks, seed) {
|
|
56
36
|
const byPath = new Map();
|
|
57
37
|
for (const block of blocks) {
|
|
@@ -272,7 +252,11 @@ export async function handlePromptContext({ vctx, req, resChat, promptId, blockS
|
|
|
272
252
|
resolvedFileSystem = fileSystem;
|
|
273
253
|
}
|
|
274
254
|
else {
|
|
275
|
-
const
|
|
255
|
+
const timelineResult = await loadVersionTimeline(vctx, req.chatId);
|
|
256
|
+
if (timelineResult.isErr())
|
|
257
|
+
return Result.Err(timelineResult);
|
|
258
|
+
const timeline = timelineResult.Ok();
|
|
259
|
+
const seed = timeline.length > 0 ? timeline[timeline.length - 1].vfs : new Map();
|
|
276
260
|
resolvedFileSystem = resolveCodeBlocksToFileSystem(code, seed);
|
|
277
261
|
}
|
|
278
262
|
const rFs = await ensureAppSlugItem(vctx, {
|
|
@@ -324,9 +308,11 @@ export async function handlePromptContext({ vctx, req, resChat, promptId, blockS
|
|
|
324
308
|
iCollectedMsgs.splice(0, collectedMsgs.length);
|
|
325
309
|
return Result.Ok({ blockSeq, fsRef });
|
|
326
310
|
}
|
|
327
|
-
export function reconstructConversationMessages(sectionMsgs) {
|
|
311
|
+
export function reconstructConversationMessages(sectionMsgs, opts = {}) {
|
|
328
312
|
const messages = [];
|
|
329
313
|
const assistantLines = [];
|
|
314
|
+
let currentStreamId;
|
|
315
|
+
let blockBuffer = null;
|
|
330
316
|
function flushAssistant() {
|
|
331
317
|
if (assistantLines.length === 0)
|
|
332
318
|
return;
|
|
@@ -340,19 +326,49 @@ export function reconstructConversationMessages(sectionMsgs) {
|
|
|
340
326
|
switch (true) {
|
|
341
327
|
case isPromptReq(msg):
|
|
342
328
|
flushAssistant();
|
|
329
|
+
currentStreamId = msg.streamId;
|
|
343
330
|
messages.push(...msg.request.messages.filter((m) => m.role === "user"));
|
|
344
331
|
break;
|
|
345
332
|
case isToplevelLine(msg):
|
|
346
333
|
assistantLines.push(msg.line);
|
|
347
334
|
break;
|
|
348
|
-
case isCodeBegin(msg):
|
|
349
|
-
|
|
335
|
+
case isCodeBegin(msg): {
|
|
336
|
+
const compact = opts.keepFullTurnStreamId !== undefined && currentStreamId !== opts.keepFullTurnStreamId;
|
|
337
|
+
if (compact) {
|
|
338
|
+
blockBuffer = { path: msg.path ?? "App.jsx", lineCount: 0 };
|
|
339
|
+
}
|
|
340
|
+
else {
|
|
341
|
+
assistantLines.push("```" + msg.lang);
|
|
342
|
+
}
|
|
350
343
|
break;
|
|
344
|
+
}
|
|
351
345
|
case isCodeLine(msg):
|
|
352
|
-
|
|
346
|
+
if (blockBuffer) {
|
|
347
|
+
blockBuffer.lineCount++;
|
|
348
|
+
if (!blockBuffer.firstNonBlank && msg.line.trim().length > 0) {
|
|
349
|
+
blockBuffer.firstNonBlank = msg.line.trim();
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
else {
|
|
353
|
+
assistantLines.push(msg.line);
|
|
354
|
+
}
|
|
353
355
|
break;
|
|
354
356
|
case isCodeEnd(msg):
|
|
355
|
-
|
|
357
|
+
if (blockBuffer) {
|
|
358
|
+
const isEdit = blockBuffer.firstNonBlank === "<<<<<<< SEARCH";
|
|
359
|
+
if (isEdit) {
|
|
360
|
+
assistantLines.push(`[${blockBuffer.lineCount}-line edit to ${blockBuffer.path}]`);
|
|
361
|
+
}
|
|
362
|
+
else {
|
|
363
|
+
const lines = msg.stats.lines !== 0 ? msg.stats.lines : blockBuffer.lineCount;
|
|
364
|
+
const bytes = msg.stats.bytes;
|
|
365
|
+
assistantLines.push(`[Created ${blockBuffer.path} — ${lines} lines, ${bytes} bytes]`);
|
|
366
|
+
}
|
|
367
|
+
blockBuffer = null;
|
|
368
|
+
}
|
|
369
|
+
else {
|
|
370
|
+
assistantLines.push("```");
|
|
371
|
+
}
|
|
356
372
|
break;
|
|
357
373
|
}
|
|
358
374
|
}
|
|
@@ -399,31 +415,63 @@ export async function assemblePromptPayload(vctx, args) {
|
|
|
399
415
|
}
|
|
400
416
|
allSectionMsgs.push(...sectionMsgs);
|
|
401
417
|
}
|
|
402
|
-
const
|
|
418
|
+
const timelineResult = await loadVersionTimeline(vctx, chatId);
|
|
419
|
+
if (timelineResult.isErr())
|
|
420
|
+
return Result.Err(timelineResult);
|
|
421
|
+
const latestPromptIdResult = await loadLatestPromptId(vctx, chatId);
|
|
422
|
+
if (latestPromptIdResult.isErr())
|
|
423
|
+
return Result.Err(latestPromptIdResult);
|
|
424
|
+
const timeline = timelineResult.Ok();
|
|
425
|
+
const latestPromptId = latestPromptIdResult.Ok();
|
|
426
|
+
const compactionDisabled = args.slots?.compaction === "off";
|
|
427
|
+
const reconstructed = reconstructConversationMessages(allSectionMsgs, {
|
|
428
|
+
keepFullTurnStreamId: compactionDisabled ? undefined : latestPromptId,
|
|
429
|
+
});
|
|
403
430
|
const newUserOnly = newUserMessages.filter((m) => m.role === "user");
|
|
404
|
-
const conversationMessages = [...reconstructed, ...newUserOnly];
|
|
405
431
|
const { skills, theme, title } = await loadActiveSettings(vctx, chatId);
|
|
406
|
-
const
|
|
407
|
-
const
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
432
|
+
const isInitial = timeline.length === 0;
|
|
433
|
+
const systemPrompt = await exception2Result(async () => {
|
|
434
|
+
return makeBaseSystemPrompt(await resolveEffectiveModel({ model }, {}), {
|
|
435
|
+
skills,
|
|
436
|
+
theme,
|
|
437
|
+
title,
|
|
438
|
+
demoData: false,
|
|
439
|
+
variant: isInitial ? "initial" : "continuation",
|
|
440
|
+
pkgBaseUrl: promptsPkgBaseUrl(vctx.params.pkgRepos.workspace),
|
|
441
|
+
fetch: createPromptAssetFetch({ fetchAsset: vctx.fetchAsset }),
|
|
442
|
+
});
|
|
443
|
+
});
|
|
417
444
|
if (systemPrompt.isErr()) {
|
|
418
445
|
console.error("Failed to create system prompt:", systemPrompt.Err());
|
|
419
446
|
return Result.Err(systemPrompt);
|
|
420
447
|
}
|
|
421
|
-
|
|
448
|
+
const hasUserMessage = [...reconstructed, ...newUserOnly].some((m) => m.role === "user");
|
|
449
|
+
if (hasUserMessage === false) {
|
|
422
450
|
return Result.Err(`No user messages found in the prompt`);
|
|
423
451
|
}
|
|
424
|
-
const
|
|
425
|
-
|
|
426
|
-
|
|
452
|
+
const slotSources = selectSlotSources(timeline);
|
|
453
|
+
let selectedVersion;
|
|
454
|
+
const sel = args.selected;
|
|
455
|
+
if (sel?.kind === "version") {
|
|
456
|
+
const idx = timeline.findIndex((t) => t.fsId === sel.fsId);
|
|
457
|
+
if (idx >= 0) {
|
|
458
|
+
selectedVersion = { vfs: timeline[idx].vfs, turnsAgo: timeline.length - 1 - idx };
|
|
459
|
+
}
|
|
460
|
+
}
|
|
461
|
+
const selectedDraftMap = args.selected?.kind === "draft"
|
|
462
|
+
? new Map(args.selected.files.flatMap((f) => f.type === "code-block" || f.type === "str-asset-block" ? [[f.filename, f.content]] : []))
|
|
463
|
+
: undefined;
|
|
464
|
+
const slotMessages = assembleSlotMessages({
|
|
465
|
+
original: slotSources.original !== undefined ? { vfs: slotSources.original.vfs, turnsAgo: timeline.length - 1 } : undefined,
|
|
466
|
+
prev2: slotSources.prev2?.vfs,
|
|
467
|
+
previous: slotSources.previous?.vfs,
|
|
468
|
+
selectedVersion,
|
|
469
|
+
selectedDraft: selectedDraftMap,
|
|
470
|
+
focusPath: args.focusPath ?? "App.jsx",
|
|
471
|
+
config: args.slots ?? {},
|
|
472
|
+
});
|
|
473
|
+
const slotDeliveryMode = args.slotDeliveryMode ?? (vctx.sthis.env.get("SLOT_DELIVERY_MODE") === "system" ? "system" : "user");
|
|
474
|
+
const slotChatMessages = renderSlotMessagesAs(slotMessages, slotDeliveryMode);
|
|
427
475
|
return Result.Ok({
|
|
428
476
|
model,
|
|
429
477
|
messages: [
|
|
@@ -432,11 +480,13 @@ export async function assemblePromptPayload(vctx, args) {
|
|
|
432
480
|
content: [
|
|
433
481
|
{
|
|
434
482
|
type: "text",
|
|
435
|
-
text:
|
|
483
|
+
text: systemPrompt.Ok().systemPrompt,
|
|
436
484
|
},
|
|
437
485
|
],
|
|
438
486
|
},
|
|
439
|
-
...
|
|
487
|
+
...reconstructed,
|
|
488
|
+
...slotChatMessages,
|
|
489
|
+
...newUserOnly,
|
|
440
490
|
],
|
|
441
491
|
});
|
|
442
492
|
}
|
|
@@ -819,7 +869,11 @@ async function handleLlmResponse({ scope, vctx, req, ctx, res, resChat, promptId
|
|
|
819
869
|
if (!collectedMsgs) {
|
|
820
870
|
return Result.Err(`Chat context not found for chatId: ${req.chatId}`);
|
|
821
871
|
}
|
|
822
|
-
const
|
|
872
|
+
const seedTimelineResult = await loadVersionTimeline(vctx, req.chatId);
|
|
873
|
+
if (seedTimelineResult.isErr())
|
|
874
|
+
return Result.Err(seedTimelineResult);
|
|
875
|
+
const seedTimeline = seedTimelineResult.Ok();
|
|
876
|
+
const seedForResolver = seedTimeline.length > 0 ? seedTimeline[seedTimeline.length - 1].vfs : new Map();
|
|
823
877
|
const resolverLogger = ensureLogger(vctx.sthis, "streamingResolver");
|
|
824
878
|
const recoveryLogger = ensureLogger(vctx.sthis, "applyRecovery");
|
|
825
879
|
const streamingResolver = createStreamingResolver({
|
|
@@ -1296,6 +1350,15 @@ export const promptChatSection = {
|
|
|
1296
1350
|
chatId: req.chatId,
|
|
1297
1351
|
model: modelId,
|
|
1298
1352
|
newUserMessages: orig.prompt.messages,
|
|
1353
|
+
selected: orig.selected,
|
|
1354
|
+
slots: resolveSlotConfig(orig.slots, {
|
|
1355
|
+
SLOTS_ORIGINAL: vctx.sthis.env.get("SLOTS_ORIGINAL"),
|
|
1356
|
+
SLOTS_SELECTED: vctx.sthis.env.get("SLOTS_SELECTED"),
|
|
1357
|
+
SLOTS_LAST_EDIT: vctx.sthis.env.get("SLOTS_LAST_EDIT"),
|
|
1358
|
+
SLOTS_PREVIOUS: vctx.sthis.env.get("SLOTS_PREVIOUS"),
|
|
1359
|
+
SLOTS_COMPACTION: vctx.sthis.env.get("SLOTS_COMPACTION"),
|
|
1360
|
+
}),
|
|
1361
|
+
focusPath: orig.focusPath,
|
|
1299
1362
|
});
|
|
1300
1363
|
if (rAssembled.isErr())
|
|
1301
1364
|
return Result.Err(rAssembled);
|