@vibes.diy/api-svc 14.3.186 → 14.3.188
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-belt.js +1 -1
- package/intern/agent-belt.js.map +1 -1
- package/intern/agent-build-tools.d.ts +1 -0
- package/intern/agent-build-tools.js.map +1 -1
- package/intern/agent-evidence.js +2 -0
- package/intern/agent-evidence.js.map +1 -1
- package/intern/agent-file-validation.d.ts +4 -2
- package/intern/agent-file-validation.js +14 -6
- package/intern/agent-file-validation.js.map +1 -1
- package/intern/agent-session-instruction.d.ts +3 -2
- package/intern/agent-session-instruction.js +5 -2
- package/intern/agent-session-instruction.js.map +1 -1
- package/intern/agent-session-runtime.d.ts +2 -0
- package/intern/agent-session-runtime.js +14 -3
- package/intern/agent-session-runtime.js.map +1 -1
- package/intern/first-build-race.d.ts +1 -1
- package/intern/first-build-race.js +1 -1
- package/intern/first-build-race.js.map +1 -1
- package/intern/local-day.js +3 -6
- package/intern/local-day.js.map +1 -1
- package/intern/prompt-streaming.d.ts +7 -0
- package/intern/prompt-streaming.js +25 -2
- package/intern/prompt-streaming.js.map +1 -1
- package/intern/save-repair.d.ts +2 -1
- package/intern/save-repair.js +28 -5
- package/intern/save-repair.js.map +1 -1
- package/intern/stripe-connect-client.js +2 -2
- package/intern/stripe-connect-client.js.map +1 -1
- package/intern/turn-summary.d.ts +6 -1
- package/intern/turn-summary.js +23 -4
- package/intern/turn-summary.js.map +1 -1
- package/package.json +13 -13
- package/public/handle-prompt-context.js +2 -2
- package/public/handle-prompt-context.js.map +1 -1
- package/public/mint-signin-ticket.js +14 -18
- package/public/mint-signin-ticket.js.map +1 -1
- package/public/prompt-chat-section.d.ts +2 -2
- package/public/prompt-chat-section.js +2 -2
- package/public/prompt-chat-section.js.map +1 -1
- package/public/stream-assembly.js +23 -13
- package/public/stream-assembly.js.map +1 -1
- package/public/turn-summary-dispatch.js +26 -5
- package/public/turn-summary-dispatch.js.map +1 -1
|
@@ -5,7 +5,7 @@ import { AGENT_SESSION_RECORD_ID, readAgentSession, saveAgentSession } from "./a
|
|
|
5
5
|
import { BUILD_LANDING_PREFIX, registerTurnTerminalWaiter } from "./turn-terminal.js";
|
|
6
6
|
import { renderBuildSettledSentence } from "./agent-wake.js";
|
|
7
7
|
import { and, desc, eq, ne } from "drizzle-orm";
|
|
8
|
-
import { PromptAndBlockMsgs, COMMIT_RESULT_NEXT, QUEUED_BUILD_NEXT, QUEUED_EDIT_STARTED_NEXT, parseArrayWarning, editVibeToolInput, agentFileCommit, agentToolRefusal, expandChatSectionBlocks, } from "@vibes.diy/api-types";
|
|
8
|
+
import { PromptAndBlockMsgs, COMMIT_RESULT_NEXT, QUEUED_BUILD_NEXT, QUEUED_IDLE_BUILD_NEXT, QUEUED_EDIT_STARTED_NEXT, parseArrayWarning, editVibeToolInput, agentFileCommit, agentToolRefusal, expandChatSectionBlocks, } from "@vibes.diy/api-types";
|
|
9
9
|
import { type } from "arktype";
|
|
10
10
|
import { peekBuildLockEntry, BUILD_LOCK_DEADLINE_MS } from "./codegen-build-lock.js";
|
|
11
11
|
import { TURN_LOST_CODE } from "./open-turn-sweep.js";
|
|
@@ -254,6 +254,15 @@ export async function acquireAgentSession(vctx, input, readTerminal = readBuildT
|
|
|
254
254
|
await pump();
|
|
255
255
|
});
|
|
256
256
|
}
|
|
257
|
+
function laneBusy() {
|
|
258
|
+
if (peekBuildLockEntry(vctx.connections, input.chatId) !== undefined)
|
|
259
|
+
return true;
|
|
260
|
+
return session
|
|
261
|
+
.snapshot()
|
|
262
|
+
.handles.some((handle) => handle.state === "running" ||
|
|
263
|
+
handle.state === "dispatching" ||
|
|
264
|
+
(handle.state === "queued" && handle.kind !== "parked-build"));
|
|
265
|
+
}
|
|
257
266
|
async function pump() {
|
|
258
267
|
const dispatchEdit = execute;
|
|
259
268
|
if (pumping || closed || dispatchEdit === undefined)
|
|
@@ -339,11 +348,12 @@ export async function acquireAgentSession(vctx, input, readTerminal = readBuildT
|
|
|
339
348
|
watchBuild: (build) => watch(build.promptId, build.promptId, build.chatId),
|
|
340
349
|
async queue(edit) {
|
|
341
350
|
const handleId = vctx.sthis.nextId(12).str;
|
|
351
|
+
const busy = laneBusy();
|
|
342
352
|
const saved = await session.register({ id: handleId, state: "queued", input: edit });
|
|
343
353
|
if (saved.isErr())
|
|
344
354
|
return Result.Err(saved.Err());
|
|
345
355
|
void pump();
|
|
346
|
-
return Result.Ok({ state: "queued", next: QUEUED_BUILD_NEXT, handleId });
|
|
356
|
+
return Result.Ok({ state: "queued", busy, next: busy ? QUEUED_BUILD_NEXT : QUEUED_IDLE_BUILD_NEXT, handleId });
|
|
347
357
|
},
|
|
348
358
|
async queueParkedBuild(buildChatId) {
|
|
349
359
|
const handleId = vctx.sthis.nextId(12).str;
|
|
@@ -355,11 +365,12 @@ export async function acquireAgentSession(vctx, input, readTerminal = readBuildT
|
|
|
355
365
|
watchParked: (handleId, build) => watch(build.promptId, handleId, build.chatId),
|
|
356
366
|
async queueCommit() {
|
|
357
367
|
const handleId = vctx.sthis.nextId(12).str;
|
|
368
|
+
const busy = laneBusy();
|
|
358
369
|
const saved = await session.queueDraft(handleId);
|
|
359
370
|
if (saved.isErr())
|
|
360
371
|
return Result.Err(saved.Err());
|
|
361
372
|
void pump();
|
|
362
|
-
return Result.Ok({ state: "committing", next: COMMIT_RESULT_NEXT, handleId });
|
|
373
|
+
return Result.Ok({ state: "committing", busy, next: COMMIT_RESULT_NEXT, handleId });
|
|
363
374
|
},
|
|
364
375
|
async bind(next, commit) {
|
|
365
376
|
execute = next;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-runtime.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-runtime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-session-runtime.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ export declare const JOINED_FIRST_BUILD_REPLY: string;
|
|
|
56
56
|
export declare function joinedFirstBuildReceipt(d: Extract<AgentCreateDecision, {
|
|
57
57
|
kind: "join";
|
|
58
58
|
}>): Record<string, unknown>;
|
|
59
|
-
export declare const JOINED_ALTERNATIVE_BUILDING = "Your own plan is
|
|
59
|
+
export declare const JOINED_ALTERNATIVE_BUILDING = "Your own plan is being tried too, as a second version at its own address; if it comes together, the platform posts its \u2B50 link on its own, so keep your reply about this version.";
|
|
60
60
|
export declare function withAlternativeBuilding(joined: Readonly<Record<string, unknown>>): Record<string, unknown>;
|
|
61
61
|
export type PreJoinFate = "show" | "drop" | "pending";
|
|
62
62
|
export interface PreJoinRounds {
|
|
@@ -140,7 +140,7 @@ export function joinedFirstBuildReceipt(d) {
|
|
|
140
140
|
message: JOINED_FIRST_BUILD_NOTE + `The person was shown this opening: "${d.preamble}". ` + JOINED_FIRST_BUILD_REPLY,
|
|
141
141
|
};
|
|
142
142
|
}
|
|
143
|
-
export const JOINED_ALTERNATIVE_BUILDING = "Your own plan is
|
|
143
|
+
export const JOINED_ALTERNATIVE_BUILDING = "Your own plan is being tried too, as a second version at its own address; if it comes together, the platform posts its ⭐ link on its own, so keep your reply about this version.";
|
|
144
144
|
export function withAlternativeBuilding(joined) {
|
|
145
145
|
const message = typeof joined.message === "string" ? `${joined.message} ` : "";
|
|
146
146
|
return { ...joined, message: message + JOINED_ALTERNATIVE_BUILDING };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"first-build-race.js","sourceRoot":"","sources":["../../jsr/intern/first-build-race.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"first-build-race.js","sourceRoot":"","sources":["../../jsr/intern/first-build-race.ts"],"names":[],"mappings":"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"}
|
package/intern/local-day.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
|
+
import { exception2Result } from "@adviser/cement";
|
|
1
2
|
export const UTC_ZONE = "UTC";
|
|
2
3
|
export function resolveTimeZone(input) {
|
|
3
4
|
if (typeof input !== "string" || input.length === 0 || input.length > 64)
|
|
4
5
|
return undefined;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
catch {
|
|
9
|
-
return undefined;
|
|
10
|
-
}
|
|
6
|
+
const rZone = exception2Result(() => new Intl.DateTimeFormat("en-US", { timeZone: input }).resolvedOptions().timeZone);
|
|
7
|
+
return rZone.isOk() ? rZone.Ok() : undefined;
|
|
11
8
|
}
|
|
12
9
|
export function localDay(now, timeZone = UTC_ZONE) {
|
|
13
10
|
const parts = new Intl.DateTimeFormat("en-US", { timeZone, year: "numeric", month: "2-digit", day: "2-digit" }).formatToParts(now);
|
package/intern/local-day.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-day.js","sourceRoot":"","sources":["../../jsr/intern/local-day.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"local-day.js","sourceRoot":"","sources":["../../jsr/intern/local-day.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAYnD,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,CAAC;AAO9B,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,SAAS,CAAC;IAC3F,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC;IACvH,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/C,CAAC;AAGD,MAAM,UAAU,QAAQ,CAAC,GAAS,EAAE,QAAQ,GAAW,QAAQ;IAC7D,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,aAAa,CAC3H,GAAG,CACJ,CAAC;IACF,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9E,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;AACxD,CAAC"}
|
|
@@ -8,6 +8,12 @@ export interface CodeBlocks {
|
|
|
8
8
|
}
|
|
9
9
|
export declare function resolveCodeBlocksToFileSystem(blocks: readonly CodeBlocks[], seed?: ReadonlyMap<string, string>): VibeFile[];
|
|
10
10
|
export declare function resolveCodeBlockChangedPaths(blocks: readonly CodeBlocks[], seed?: ReadonlyMap<string, string>): string[];
|
|
11
|
+
export declare const OUTPUT_CAP_TRUNCATION: {
|
|
12
|
+
readonly kind: "output-cap";
|
|
13
|
+
readonly reason: "length";
|
|
14
|
+
};
|
|
15
|
+
export declare function isOutputCapCut(end: CodeEndMsg, finishReasons: readonly string[]): boolean;
|
|
16
|
+
export declare function unclosedFenceStart(text: string): number;
|
|
11
17
|
export interface ResolvedCodeBlocks {
|
|
12
18
|
readonly files: VibeFile[];
|
|
13
19
|
readonly changedPaths: string[];
|
|
@@ -41,6 +47,7 @@ export interface StreamingResolver {
|
|
|
41
47
|
}) => BlockApplyResult;
|
|
42
48
|
readonly getVfs: () => ReadonlyMap<string, string>;
|
|
43
49
|
}
|
|
50
|
+
export declare function normalizeFilename(rawPath: string | undefined): string;
|
|
44
51
|
export declare function createStreamingResolver(deps: StreamingResolverDeps): StreamingResolver;
|
|
45
52
|
export interface ClosedCodeBlock {
|
|
46
53
|
readonly begin: CodeBeginMsg;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { applyEdits, isCodeBegin, isCodeEnd, isCodeLine, isCodeTruncated, parseFenceBody, } from "@vibes.diy/call-ai-v2";
|
|
1
|
+
import { applyEdits, codeFenceStart, isCodeBegin, isCodeFenceEnd, isCodeEnd, isCodeLine, isCodeTruncated, parseFenceBody, } from "@vibes.diy/call-ai-v2";
|
|
2
2
|
import { ENTRY_PATH } from "./turn-reach.js";
|
|
3
3
|
export function resolveCodeBlocksToFileSystem(blocks, seed) {
|
|
4
4
|
return resolveCodeBlocks(blocks, seed).files;
|
|
@@ -6,6 +6,27 @@ export function resolveCodeBlocksToFileSystem(blocks, seed) {
|
|
|
6
6
|
export function resolveCodeBlockChangedPaths(blocks, seed) {
|
|
7
7
|
return resolveCodeBlocks(blocks, seed).changedPaths;
|
|
8
8
|
}
|
|
9
|
+
export const OUTPUT_CAP_TRUNCATION = { kind: "output-cap", reason: "length" };
|
|
10
|
+
export function isOutputCapCut(end, finishReasons) {
|
|
11
|
+
return end.unclosed === true && finishReasons.includes("length");
|
|
12
|
+
}
|
|
13
|
+
export function unclosedFenceStart(text) {
|
|
14
|
+
let openAt;
|
|
15
|
+
let at = 0;
|
|
16
|
+
for (const line of text.split("\n")) {
|
|
17
|
+
if (openAt === undefined) {
|
|
18
|
+
if (codeFenceStart(line) !== undefined)
|
|
19
|
+
openAt = at;
|
|
20
|
+
}
|
|
21
|
+
else if (isCodeFenceEnd(line))
|
|
22
|
+
openAt = undefined;
|
|
23
|
+
at += line.length + 1;
|
|
24
|
+
}
|
|
25
|
+
return openAt ?? text.length;
|
|
26
|
+
}
|
|
27
|
+
function isOutputCapTruncation(end) {
|
|
28
|
+
return isCodeTruncated(end) && end.kind === OUTPUT_CAP_TRUNCATION.kind;
|
|
29
|
+
}
|
|
9
30
|
export function resolveCodeBlocks(blocks, seed) {
|
|
10
31
|
const byPath = new Map();
|
|
11
32
|
for (const block of blocks) {
|
|
@@ -15,6 +36,8 @@ export function resolveCodeBlocks(blocks, seed) {
|
|
|
15
36
|
const langRaw = block.begin.lang?.toLowerCase() || "";
|
|
16
37
|
const ext = filename.match(/\.(\w+)$/)?.[1]?.toLowerCase() ?? "";
|
|
17
38
|
const lang = ext === "js" && langRaw === "js" ? "js" : ["js", "jsx"].includes(langRaw) ? "jsx" : langRaw || "jsx";
|
|
39
|
+
if (isOutputCapTruncation(block.end))
|
|
40
|
+
continue;
|
|
18
41
|
const acc = byPath.get(filename) ?? { lang, blocks: [] };
|
|
19
42
|
acc.blocks.push({ lines: block.lines.map((l) => l.line), truncated: isCodeTruncated(block.end) });
|
|
20
43
|
byPath.set(filename, acc);
|
|
@@ -60,7 +83,7 @@ export function resolveCodeBlocks(blocks, seed) {
|
|
|
60
83
|
}
|
|
61
84
|
return { files: result, changedPaths };
|
|
62
85
|
}
|
|
63
|
-
function normalizeFilename(rawPath) {
|
|
86
|
+
export function normalizeFilename(rawPath) {
|
|
64
87
|
const path = rawPath ?? ENTRY_PATH;
|
|
65
88
|
return path.startsWith("/") ? path : `/${path}`;
|
|
66
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-streaming.js","sourceRoot":"","sources":["../../jsr/intern/prompt-streaming.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,WAAW,EACX,SAAS,EACT,UAAU,EACV,eAAe,EACf,cAAc,GAQf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAoB7C,MAAM,UAAU,6BAA6B,CAAC,MAA6B,EAAE,IAAkC;IAC7G,OAAO,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC;AAC/C,CAAC;AASD,MAAM,UAAU,4BAA4B,CAAC,MAA6B,EAAE,IAAkC;IAC5G,OAAO,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,YAAY,CAAC;AACtD,CAAC;AAOD,MAAM,UAAU,iBAAiB,CAAC,MAA6B,EAAE,IAAkC;IAMjG,MAAM,MAAM,GAAG,IAAI,GAAG,EAA+E,CAAC;IACtG,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,SAAS;QACzB,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAIjE,MAAM,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"prompt-streaming.js","sourceRoot":"","sources":["../../jsr/intern/prompt-streaming.ts"],"names":[],"mappings":"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"}
|
package/intern/save-repair.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type VibeFile } from "@vibes.diy/api-types";
|
|
2
2
|
import type { VibesApiSQLCtx } from "../types.js";
|
|
3
3
|
import { type RepairModelCall, type RepairModelUsage } from "./save-repair-io.js";
|
|
4
4
|
export declare const SAVE_REPAIR_MAX_ATTEMPTS = 2;
|
|
@@ -11,6 +11,7 @@ export interface SaveRepairFinding {
|
|
|
11
11
|
readonly message: string;
|
|
12
12
|
}
|
|
13
13
|
export declare function saveRepairFindings(files: readonly VibeFile[], changedPaths: ReadonlySet<string>): readonly SaveRepairFinding[];
|
|
14
|
+
export declare function saveRepairLintFindings(files: readonly VibeFile[], changedPaths: ReadonlySet<string>): readonly SaveRepairFinding[];
|
|
14
15
|
export interface SaveRepairNote {
|
|
15
16
|
readonly attempts: number;
|
|
16
17
|
readonly model: string;
|
package/intern/save-repair.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { exception2Result } from "@adviser/cement";
|
|
2
|
+
import { lintVibeFiles, vibeEntryFile } from "@vibes.diy/api-types";
|
|
2
3
|
import { callWithDeadline, composeRepairAsk, parseRepairText, renderRepairFiles, repairModelCallFor, } from "./save-repair-io.js";
|
|
3
4
|
import { buildCheckCandidate } from "./work-tools.js";
|
|
4
5
|
export const SAVE_REPAIR_MAX_ATTEMPTS = 2;
|
|
@@ -32,7 +33,27 @@ export function saveRepairFindings(files, changedPaths) {
|
|
|
32
33
|
}
|
|
33
34
|
return findings;
|
|
34
35
|
}
|
|
35
|
-
|
|
36
|
+
function saveCheckCode(files) {
|
|
37
|
+
return files.filter((file) => file.type === "code-block" && file.filename.startsWith("/~~") === false);
|
|
38
|
+
}
|
|
39
|
+
function saveCheckLint(files, changedPaths) {
|
|
40
|
+
const code = saveCheckCode(files);
|
|
41
|
+
const errors = lintVibeFiles(code).errors;
|
|
42
|
+
if (errors.length === 0)
|
|
43
|
+
return { findings: [], answerable: true };
|
|
44
|
+
const entry = vibeEntryFile(code);
|
|
45
|
+
if (entry === undefined || changedPaths.has(entry.filename) === false)
|
|
46
|
+
return { findings: [], answerable: false };
|
|
47
|
+
return { findings: errors.map((message) => ({ path: entry.filename, message })), answerable: true };
|
|
48
|
+
}
|
|
49
|
+
export function saveRepairLintFindings(files, changedPaths) {
|
|
50
|
+
return saveCheckLint(files, changedPaths).findings;
|
|
51
|
+
}
|
|
52
|
+
function repairableFindings(files, changedPaths) {
|
|
53
|
+
return [...saveRepairFindings(files, changedPaths), ...saveRepairLintFindings(files, changedPaths)];
|
|
54
|
+
}
|
|
55
|
+
const REPAIR_BRIEF = "You are repairing files of a vibes.diy app that failed the save check: a file that does not parse, " +
|
|
56
|
+
"or an App entry file with no `export default`. " +
|
|
36
57
|
"For each file named below, emit the whole file again under its `### `path`` heading in one fenced code block, " +
|
|
37
58
|
"with the smallest change that fixes the reported error. Keep every other line exactly as it is. " +
|
|
38
59
|
"Emit only the files named below, each once, complete.";
|
|
@@ -51,9 +72,11 @@ export async function repairTurnFiles(vctx, args) {
|
|
|
51
72
|
attempts,
|
|
52
73
|
usage,
|
|
53
74
|
});
|
|
54
|
-
|
|
75
|
+
if (saveCheckLint(args.files, args.changedPaths).answerable === false)
|
|
76
|
+
return fail("no-parse-findings", "the app's lint refusal is not on an entry file this turn wrote", 0);
|
|
77
|
+
let findings = repairableFindings(args.files, args.changedPaths);
|
|
55
78
|
if (findings.length === 0)
|
|
56
|
-
return fail("no-parse-findings", "the refusal was not a parse error", 0);
|
|
79
|
+
return fail("no-parse-findings", "the refusal was not a parse or entry-file lint error", 0);
|
|
57
80
|
const initialFindings = findings.map(findingLine).slice(0, FINDINGS_RECORDED_MAX);
|
|
58
81
|
const model = nonEmpty(vctx.sthis.env.get("SAVE_REPAIR_MODEL")) ?? nonEmpty(args.model) ?? SAVE_REPAIR_FALLBACK_MODEL;
|
|
59
82
|
const call = args.callModel ?? repairModelCallFor(vctx);
|
|
@@ -66,7 +89,7 @@ export async function repairTurnFiles(vctx, args) {
|
|
|
66
89
|
{ role: "system", content: REPAIR_BRIEF },
|
|
67
90
|
{
|
|
68
91
|
role: "user",
|
|
69
|
-
content: renderRepairFiles({ vfs: failingVfs(), intro: "These files failed
|
|
92
|
+
content: renderRepairFiles({ vfs: failingVfs(), intro: "These files failed the save check when the app was saved." }) +
|
|
70
93
|
"\n" +
|
|
71
94
|
composeRepairAsk(findings.map(findingLine)),
|
|
72
95
|
},
|
|
@@ -98,7 +121,7 @@ export async function repairTurnFiles(vctx, args) {
|
|
|
98
121
|
repaired.add(file.filename);
|
|
99
122
|
return { ...file, content };
|
|
100
123
|
});
|
|
101
|
-
findings =
|
|
124
|
+
findings = repairableFindings(files, failing);
|
|
102
125
|
if (findings.length === 0) {
|
|
103
126
|
vctx.logger
|
|
104
127
|
.Info()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-repair.js","sourceRoot":"","sources":["../../jsr/intern/save-repair.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"save-repair.js","sourceRoot":"","sources":["../../jsr/intern/save-repair.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,13 +62,13 @@ export async function createOnboardingLink(input) {
|
|
|
62
62
|
account: input.stripeAccountId,
|
|
63
63
|
use_case: {
|
|
64
64
|
type: "account_onboarding",
|
|
65
|
-
account_onboarding: {
|
|
65
|
+
account_onboarding: { return_url: input.returnUrl, refresh_url: input.refreshUrl },
|
|
66
66
|
},
|
|
67
67
|
}, undefined);
|
|
68
68
|
return narrow(r, (v) => AccountLink(v));
|
|
69
69
|
}
|
|
70
70
|
export async function readConnectedAccount(input) {
|
|
71
|
-
const r = await call(input.fetchImpl, input.key, "GET", `/v2/core/accounts/${encodeURIComponent(input.stripeAccountId)}?${new URLSearchParams([["include[]", "configuration.merchant"]]).toString()}`, undefined, undefined);
|
|
71
|
+
const r = await call(input.fetchImpl, input.key, "GET", `/v2/core/accounts/${encodeURIComponent(input.stripeAccountId)}?${new URLSearchParams([["include[0]", "configuration.merchant"]]).toString()}`, undefined, undefined);
|
|
72
72
|
return narrow(r, (v) => {
|
|
73
73
|
const a = AccountRead(v);
|
|
74
74
|
if (a instanceof type.errors)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stripe-connect-client.js","sourceRoot":"","sources":["../../jsr/intern/stripe-connect-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stripe-connect-client.js","sourceRoot":"","sources":["../../jsr/intern/stripe-connect-client.ts"],"names":[],"mappings":"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"}
|
package/intern/turn-summary.d.ts
CHANGED
|
@@ -9,14 +9,19 @@ export declare const TURN_SUMMARY_MODEL: {
|
|
|
9
9
|
};
|
|
10
10
|
export declare const TURN_SUMMARY_MAX_TOKENS = 80;
|
|
11
11
|
export declare const TURN_SUMMARY_REQUEST_CHARS = 800;
|
|
12
|
+
export declare const TURN_SUMMARY_MAX_REQUESTS = 8;
|
|
12
13
|
export declare const TURN_SUMMARY_PROSE_CHARS = 2400;
|
|
13
14
|
export declare const TURN_SUMMARY_MAX_FILES = 8;
|
|
14
15
|
export interface TurnSummaryInput {
|
|
15
|
-
readonly
|
|
16
|
+
readonly requests: readonly string[];
|
|
16
17
|
readonly prose: string;
|
|
17
18
|
readonly files: readonly string[];
|
|
18
19
|
}
|
|
19
20
|
export declare function turnSummaryInputFrom(msgs: readonly unknown[]): TurnSummaryInput | undefined;
|
|
21
|
+
export declare function joinedTurnRequests(turns: readonly {
|
|
22
|
+
readonly promptId: string;
|
|
23
|
+
readonly msgs: readonly unknown[];
|
|
24
|
+
}[], sessionId: string): unknown[];
|
|
20
25
|
export declare const TURN_SUMMARY_SYSTEM: string;
|
|
21
26
|
export declare function turnSummaryMessages(input: TurnSummaryInput): LLMMessage[];
|
|
22
27
|
export declare function readTurnSummary(reply: string): string | undefined;
|
package/intern/turn-summary.js
CHANGED
|
@@ -6,6 +6,7 @@ import { isCodeBegin, isToplevelLine, isUserChatMessage } from "@vibes.diy/call-
|
|
|
6
6
|
export const TURN_SUMMARY_MODEL = { id: "anthropic/claude-haiku-5.5", reasoning: { enabled: false } };
|
|
7
7
|
export const TURN_SUMMARY_MAX_TOKENS = 80;
|
|
8
8
|
export const TURN_SUMMARY_REQUEST_CHARS = 800;
|
|
9
|
+
export const TURN_SUMMARY_MAX_REQUESTS = 8;
|
|
9
10
|
export const TURN_SUMMARY_PROSE_CHARS = 2400;
|
|
10
11
|
export const TURN_SUMMARY_MAX_FILES = 8;
|
|
11
12
|
const FILE_HEADER = /^File:\s*\S+$/;
|
|
@@ -29,12 +30,14 @@ function addFile(files, path) {
|
|
|
29
30
|
files.push(clean);
|
|
30
31
|
}
|
|
31
32
|
export function turnSummaryInputFrom(msgs) {
|
|
32
|
-
|
|
33
|
+
const requests = [];
|
|
33
34
|
const lines = [];
|
|
34
35
|
const files = [];
|
|
35
36
|
for (const msg of msgs) {
|
|
36
37
|
if (isPromptReq(msg)) {
|
|
37
|
-
|
|
38
|
+
const text = personText(msg);
|
|
39
|
+
if (text !== undefined && requests.includes(text) === false)
|
|
40
|
+
requests.push(text);
|
|
38
41
|
}
|
|
39
42
|
else if (isToplevelLine(msg)) {
|
|
40
43
|
const line = msg.line.trim();
|
|
@@ -57,12 +60,20 @@ export function turnSummaryInputFrom(msgs) {
|
|
|
57
60
|
const prose = joined.length > TURN_SUMMARY_PROSE_CHARS ? `…${joined.slice(-TURN_SUMMARY_PROSE_CHARS)}` : joined;
|
|
58
61
|
if (prose === "" && files.length === 0)
|
|
59
62
|
return undefined;
|
|
63
|
+
const kept = requests.slice(0, TURN_SUMMARY_MAX_REQUESTS);
|
|
64
|
+
const share = Math.floor(TURN_SUMMARY_REQUEST_CHARS / Math.max(kept.length, 1));
|
|
60
65
|
return {
|
|
61
|
-
|
|
66
|
+
requests: kept.map((text) => text.slice(0, share)),
|
|
62
67
|
prose,
|
|
63
68
|
files: files.slice(0, TURN_SUMMARY_MAX_FILES),
|
|
64
69
|
};
|
|
65
70
|
}
|
|
71
|
+
export function joinedTurnRequests(turns, sessionId) {
|
|
72
|
+
return turns
|
|
73
|
+
.filter((turn) => turn.promptId !== sessionId &&
|
|
74
|
+
turn.msgs.some((msg) => isPromptAgentEvidence(msg) && msg.evidence.kind === "active" && msg.evidence.sessionId === sessionId))
|
|
75
|
+
.flatMap((turn) => turn.msgs.filter((msg) => isPromptReq(msg)));
|
|
76
|
+
}
|
|
66
77
|
export const TURN_SUMMARY_SYSTEM = [
|
|
67
78
|
"You write the one line shown above the chat box in Vibes DIY, an app builder, after a turn finishes.",
|
|
68
79
|
"Say what this turn made or changed in the person's app, as a finished fact: one sentence, at most 90 characters, plain words.",
|
|
@@ -71,9 +82,17 @@ export const TURN_SUMMARY_SYSTEM = [
|
|
|
71
82
|
'If the turn changed nothing, say what it explained or offered, as a good thing ("Explained how laps are timed").',
|
|
72
83
|
'Use only facts from the turn below. No file names, no quotes, no emoji, no markdown, never "the assistant". Reply with the line only.',
|
|
73
84
|
].join("\n");
|
|
85
|
+
function askedPart(requests) {
|
|
86
|
+
if (requests.length === 0)
|
|
87
|
+
return "The turn was the assistant continuing on its own.";
|
|
88
|
+
if (requests.length === 1)
|
|
89
|
+
return `The person asked:\n${requests[0]}`;
|
|
90
|
+
const list = requests.map((text, i) => `${i + 1}. ${text}`).join("\n");
|
|
91
|
+
return `The person asked for ${requests.length} changes, in order:\n${list}\nThe line names every change this turn made.`;
|
|
92
|
+
}
|
|
74
93
|
export function turnSummaryMessages(input) {
|
|
75
94
|
const parts = [
|
|
76
|
-
input.
|
|
95
|
+
askedPart(input.requests),
|
|
77
96
|
input.files.length === 0 ? "Files changed: none" : `Files changed: ${input.files.join(", ")}`,
|
|
78
97
|
input.prose === "" ? "The assistant wrote no reply." : `The assistant's reply:\n${input.prose}`,
|
|
79
98
|
];
|