@vibes.diy/api-svc 14.1.41 → 14.1.48
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/analytics.d.ts +2 -0
- package/analytics.js +2 -0
- package/analytics.js.map +1 -1
- package/create-handler.js +6 -0
- package/create-handler.js.map +1 -1
- package/intern/agent-belt.js +14 -6
- package/intern/agent-belt.js.map +1 -1
- package/intern/agent-build-tools.d.ts +7 -1
- package/intern/agent-build-tools.js +28 -9
- package/intern/agent-build-tools.js.map +1 -1
- package/intern/agent-dispatcher.js +16 -5
- package/intern/agent-dispatcher.js.map +1 -1
- package/intern/agent-evidence.js +3 -1
- package/intern/agent-evidence.js.map +1 -1
- package/intern/agent-file-tools.js +2 -2
- package/intern/agent-file-tools.js.map +1 -1
- package/intern/agent-instruction.d.ts +1 -1
- package/intern/agent-instruction.js +103 -48
- package/intern/agent-instruction.js.map +1 -1
- package/intern/agent-router.d.ts +1 -0
- package/intern/agent-router.js +3 -0
- package/intern/agent-router.js.map +1 -1
- package/intern/agent-session-instruction.d.ts +2 -2
- package/intern/agent-session-instruction.js +79 -17
- package/intern/agent-session-instruction.js.map +1 -1
- package/intern/agent-session-runtime.d.ts +4 -2
- package/intern/agent-session-runtime.js +4 -4
- package/intern/agent-session-runtime.js.map +1 -1
- package/intern/codegen-build-lock.js.map +1 -1
- package/intern/components/vibe-page.js +2 -1
- package/intern/components/vibe-page.js.map +1 -1
- package/intern/ensure-chat-id.d.ts +3 -2
- package/intern/ensure-chat-id.js +15 -9
- package/intern/ensure-chat-id.js.map +1 -1
- package/intern/get-open-turn.js +20 -1
- package/intern/get-open-turn.js.map +1 -1
- package/intern/get-vibe-route-hints.d.ts +1 -0
- package/intern/get-vibe-route-hints.js +2 -1
- package/intern/get-vibe-route-hints.js.map +1 -1
- package/intern/grouped-vibe-import-map.d.ts +2 -0
- package/intern/grouped-vibe-import-map.js +2 -0
- package/intern/grouped-vibe-import-map.js.map +1 -1
- package/intern/half-open-turn.d.ts +6 -1
- package/intern/half-open-turn.js +14 -7
- package/intern/half-open-turn.js.map +1 -1
- package/intern/in-flight-turns.d.ts +10 -0
- package/intern/in-flight-turns.js +30 -0
- package/intern/in-flight-turns.js.map +1 -1
- package/intern/look-flags.d.ts +12 -0
- package/intern/look-flags.js +11 -0
- package/intern/look-flags.js.map +1 -0
- package/intern/look-lint-engine.d.ts +7 -0
- package/intern/look-lint-engine.js +44 -0
- package/intern/look-lint-engine.js.map +1 -0
- package/intern/look-lint.d.ts +27 -0
- package/intern/look-lint.js +67 -0
- package/intern/look-lint.js.map +1 -0
- package/intern/mint-decision.d.ts +8 -0
- package/intern/mint-decision.js +9 -2
- package/intern/mint-decision.js.map +1 -1
- package/intern/open-turn-sweep.d.ts +2 -0
- package/intern/open-turn-sweep.js +8 -1
- package/intern/open-turn-sweep.js.map +1 -1
- package/intern/prompt-assembly.js +6 -3
- package/intern/prompt-assembly.js.map +1 -1
- package/intern/render-vibe.js +4 -3
- package/intern/render-vibe.js.map +1 -1
- package/intern/root-html-cache-contract.d.ts +1 -1
- package/intern/root-html-cache-contract.js +1 -1
- package/intern/root-html-cache-contract.js.map +1 -1
- package/intern/ssr-theme-css.d.ts +2 -0
- package/intern/ssr-theme-css.js +22 -1
- package/intern/ssr-theme-css.js.map +1 -1
- package/intern/write-apps.js +5 -0
- package/intern/write-apps.js.map +1 -1
- package/package.json +14 -11
- package/public/open-chat.d.ts +5 -1
- package/public/open-chat.js +57 -34
- package/public/open-chat.js.map +1 -1
- package/public/prompt-chat-section.js +42 -7
- package/public/prompt-chat-section.js.map +1 -1
- package/public/root-html-live-inputs.d.ts +1 -0
- package/public/root-html-live-inputs.js +3 -1
- package/public/root-html-live-inputs.js.map +1 -1
- package/public/serv-entry-point.js +4 -4
- package/public/serv-entry-point.js.map +1 -1
- package/public/stream-assembly.js +13 -14
- package/public/stream-assembly.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"half-open-turn.js","sourceRoot":"","sources":["../../jsr/intern/half-open-turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"half-open-turn.js","sourceRoot":"","sources":["../../jsr/intern/half-open-turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,19 @@
|
|
|
1
1
|
import { SectionEvent } from "@vibes.diy/api-types";
|
|
2
2
|
declare class PromptMap extends Map<string, SectionEvent> {
|
|
3
3
|
private readonly chatId;
|
|
4
|
+
private readonly owners;
|
|
4
5
|
constructor(chatId: string);
|
|
6
|
+
claim(promptId: string, ownerInstanceId: string | undefined): void;
|
|
7
|
+
ownedBy(ownerInstanceId: string): string[];
|
|
5
8
|
delete(promptId: string): boolean;
|
|
6
9
|
}
|
|
7
10
|
export declare function inFlightTurns(chatId: string): PromptMap;
|
|
11
|
+
export declare function inFlightTurnHead(args: {
|
|
12
|
+
readonly chatId: string;
|
|
13
|
+
readonly promptId: string;
|
|
14
|
+
readonly ownerInstanceId?: string;
|
|
15
|
+
}, create: () => SectionEvent): SectionEvent;
|
|
16
|
+
export declare function inFlightProgress(chatId: string, promptId: string): number | undefined;
|
|
17
|
+
export declare function liveTurnsOwnedBy(chatId: string, ownerInstanceId: string): ReadonlySet<string>;
|
|
8
18
|
export declare function peekInFlightTurns(chatId: string): PromptMap | undefined;
|
|
9
19
|
export {};
|
|
@@ -1,10 +1,24 @@
|
|
|
1
1
|
class PromptMap extends Map {
|
|
2
2
|
chatId;
|
|
3
|
+
owners = new Map();
|
|
3
4
|
constructor(chatId) {
|
|
4
5
|
super();
|
|
5
6
|
this.chatId = chatId;
|
|
6
7
|
}
|
|
8
|
+
claim(promptId, ownerInstanceId) {
|
|
9
|
+
if (ownerInstanceId !== undefined)
|
|
10
|
+
this.owners.set(promptId, ownerInstanceId);
|
|
11
|
+
}
|
|
12
|
+
ownedBy(ownerInstanceId) {
|
|
13
|
+
const out = [];
|
|
14
|
+
for (const [promptId, owner] of this.owners) {
|
|
15
|
+
if (owner === ownerInstanceId && this.has(promptId))
|
|
16
|
+
out.push(promptId);
|
|
17
|
+
}
|
|
18
|
+
return out;
|
|
19
|
+
}
|
|
7
20
|
delete(promptId) {
|
|
21
|
+
this.owners.delete(promptId);
|
|
8
22
|
const deleted = super.delete(promptId);
|
|
9
23
|
if (this.size === 0 && turns.get(this.chatId) === this) {
|
|
10
24
|
turns.delete(this.chatId);
|
|
@@ -21,6 +35,22 @@ export function inFlightTurns(chatId) {
|
|
|
21
35
|
}
|
|
22
36
|
return prompts;
|
|
23
37
|
}
|
|
38
|
+
export function inFlightTurnHead(args, create) {
|
|
39
|
+
const prompts = inFlightTurns(args.chatId);
|
|
40
|
+
let head = prompts.get(args.promptId);
|
|
41
|
+
if (head === undefined) {
|
|
42
|
+
head = create();
|
|
43
|
+
prompts.set(args.promptId, head);
|
|
44
|
+
}
|
|
45
|
+
prompts.claim(args.promptId, args.ownerInstanceId);
|
|
46
|
+
return head;
|
|
47
|
+
}
|
|
48
|
+
export function inFlightProgress(chatId, promptId) {
|
|
49
|
+
return turns.get(chatId)?.get(promptId)?.blocks.length;
|
|
50
|
+
}
|
|
51
|
+
export function liveTurnsOwnedBy(chatId, ownerInstanceId) {
|
|
52
|
+
return new Set(turns.get(chatId)?.ownedBy(ownerInstanceId) ?? []);
|
|
53
|
+
}
|
|
24
54
|
export function peekInFlightTurns(chatId) {
|
|
25
55
|
return turns.get(chatId);
|
|
26
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-flight-turns.js","sourceRoot":"","sources":["../../jsr/intern/in-flight-turns.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"in-flight-turns.js","sourceRoot":"","sources":["../../jsr/intern/in-flight-turns.ts"],"names":[],"mappings":"AAyBA,MAAM,SAAU,SAAQ,GAAyB;IAIlB,MAAM;IAFlB,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEpD,YAA6B,MAAc;QACzC,KAAK,EAAE,CAAC;sBADmB,MAAM;IAEnC,CAAC;IAGD,KAAK,CAAC,QAAgB,EAAE,eAAmC;QACzD,IAAI,eAAe,KAAK,SAAS;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAChF,CAAC;IAGD,OAAO,CAAC,eAAuB;QAC7B,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC5C,IAAI,KAAK,KAAK,eAAe,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEQ,MAAM,CAAC,QAAgB;QAC9B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;YACvD,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAID,MAAM,KAAK,GAAG,IAAI,GAAG,EAAqB,CAAC;AAG3C,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,IAAI,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAcD,MAAM,UAAU,gBAAgB,CAC9B,IAA+F,EAC/F,MAA0B;IAE1B,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,GAAG,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC;AACd,CAAC;AAyBD,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,QAAgB;IAC/D,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;AACzD,CAAC;AAUD,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,eAAuB;IACtE,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;AACpE,CAAC;AAID,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
interface LookFlagCtx {
|
|
2
|
+
readonly sthis: {
|
|
3
|
+
readonly env: {
|
|
4
|
+
get(key: string): string | undefined;
|
|
5
|
+
};
|
|
6
|
+
};
|
|
7
|
+
}
|
|
8
|
+
export declare function isLookBriefEnabled(vctx: LookFlagCtx): boolean;
|
|
9
|
+
export declare function isLookComponentsEnabled(vctx: LookFlagCtx): boolean;
|
|
10
|
+
export type LookLintMode = "off" | "report" | "enforce";
|
|
11
|
+
export declare function lookLintMode(vctx: LookFlagCtx): LookLintMode;
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export function isLookBriefEnabled(vctx) {
|
|
2
|
+
return vctx.sthis.env.get("CODEGEN_LOOK_BRIEF") === "true";
|
|
3
|
+
}
|
|
4
|
+
export function isLookComponentsEnabled(vctx) {
|
|
5
|
+
return vctx.sthis.env.get("CODEGEN_LOOK_COMPONENTS") === "true";
|
|
6
|
+
}
|
|
7
|
+
export function lookLintMode(vctx) {
|
|
8
|
+
const raw = vctx.sthis.env.get("CODEGEN_LOOK_LINT");
|
|
9
|
+
return raw === "report" || raw === "enforce" ? raw : "off";
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=look-flags.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"look-flags.js","sourceRoot":"","sources":["../../jsr/intern/look-flags.ts"],"names":[],"mappings":"AAiCA,MAAM,UAAU,kBAAkB,CAAC,IAAiB;IAClD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,MAAM,CAAC;AAC7D,CAAC;AAQD,MAAM,UAAU,uBAAuB,CAAC,IAAiB;IACvD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC,KAAK,MAAM,CAAC;AAClE,CAAC;AAYD,MAAM,UAAU,YAAY,CAAC,IAAiB;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACpD,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7D,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export interface LookLintFinding {
|
|
2
|
+
readonly ruleId: string;
|
|
3
|
+
readonly line: number;
|
|
4
|
+
readonly message: string;
|
|
5
|
+
}
|
|
6
|
+
export declare function rewriteRestyleMessage(message: string): string;
|
|
7
|
+
export declare function lintLookSource(files: Readonly<Record<string, string>>): readonly LookLintFinding[];
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Linter } from "eslint/universal";
|
|
2
|
+
import shadcn from "@shadcn/lint";
|
|
3
|
+
const LOOK_LINT_CONFIG = [
|
|
4
|
+
{
|
|
5
|
+
files: ["**/*.{js,jsx}"],
|
|
6
|
+
languageOptions: { parserOptions: { ecmaFeatures: { jsx: true } } },
|
|
7
|
+
plugins: { shadcn },
|
|
8
|
+
settings: { shadcn: { componentImports: ["^@vibes\\.diy/look(/|$)"] } },
|
|
9
|
+
rules: {
|
|
10
|
+
"shadcn/no-restyle": ["error", { allow: ["layout"] }],
|
|
11
|
+
"shadcn/no-raw-colors": "error",
|
|
12
|
+
"shadcn/no-arbitrary-values": "error",
|
|
13
|
+
"shadcn/no-inline-styles": "error",
|
|
14
|
+
"shadcn/no-unknown-classes": "error",
|
|
15
|
+
"shadcn/require-static-classes": "error",
|
|
16
|
+
},
|
|
17
|
+
},
|
|
18
|
+
];
|
|
19
|
+
const NOWHERE = "/nonexistent";
|
|
20
|
+
const RESTYLE_ADVICE = (component) => `${component}'s className carries placement only (sizing, margin, flex/grid placement, display, overflow). ` +
|
|
21
|
+
"`bg-*`, `p-*`, `text-*`, `border-*`, `rounded-*`, `shadow-*`, `hover:*` belong to the component or to a wrapping `div`, never a `c.*` entry. " +
|
|
22
|
+
"`Button`/`Badge` take `variant`/`size`; nothing else has a prop for this.";
|
|
23
|
+
export function rewriteRestyleMessage(message) {
|
|
24
|
+
const m = /^(.*? is not allowed on (<[^>]+>)): /.exec(message);
|
|
25
|
+
if (m === null)
|
|
26
|
+
return message;
|
|
27
|
+
return `${m[1]}: ${RESTYLE_ADVICE(m[2])}`;
|
|
28
|
+
}
|
|
29
|
+
export function lintLookSource(files) {
|
|
30
|
+
const linter = new Linter({ configType: "flat", cwd: NOWHERE });
|
|
31
|
+
const findings = [];
|
|
32
|
+
for (const [path, src] of Object.entries(files)) {
|
|
33
|
+
if (!/\.(?:jsx|js)$/.test(path))
|
|
34
|
+
continue;
|
|
35
|
+
for (const msg of linter.verify(src, LOOK_LINT_CONFIG, { filename: `${NOWHERE}/${path}` })) {
|
|
36
|
+
if (msg.ruleId === null || msg.ruleId === undefined)
|
|
37
|
+
continue;
|
|
38
|
+
const message = msg.ruleId === "shadcn/no-restyle" ? rewriteRestyleMessage(msg.message) : msg.message;
|
|
39
|
+
findings.push({ ruleId: msg.ruleId, line: msg.line, message });
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return findings;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=look-lint-engine.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"look-lint-engine.js","sourceRoot":"","sources":["../../jsr/intern/look-lint-engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,MAAM,MAAM,cAAc,CAAC;AAoClC,MAAM,gBAAgB,GAAoB;IACxC;QACE,KAAK,EAAE,CAAC,eAAe,CAAC;QACxB,eAAe,EAAE,EAAE,aAAa,EAAE,EAAE,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;QACnE,OAAO,EAAE,EAAE,MAAM,EAAE;QACnB,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE;QACvE,KAAK,EAAE;YACL,mBAAmB,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,sBAAsB,EAAE,OAAO;YAC/B,4BAA4B,EAAE,OAAO;YACrC,yBAAyB,EAAE,OAAO;YAClC,2BAA2B,EAAE,OAAO;YACpC,+BAA+B,EAAE,OAAO;SACzC;KACF;CACF,CAAC;AAIF,MAAM,OAAO,GAAG,cAAc,CAAC;AAa/B,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAU,EAAE,CACnD,GAAG,SAAS,gGAAgG;IAC5G,+IAA+I;IAC/I,2EAA2E,CAAC;AAG9E,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,MAAM,CAAC,GAAG,sCAAsC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IAC/B,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5C,CAAC;AAMD,MAAM,UAAU,cAAc,CAAC,KAAuC;IACpE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,SAAS;QAC1C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;YAC3F,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS;gBAAE,SAAS;YAC9D,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;YACtG,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { VibesApiSQLCtx } from "../types.js";
|
|
2
|
+
export declare const LOOK_LINT_THEME = "house";
|
|
3
|
+
export interface LookLintResult {
|
|
4
|
+
readonly total: number;
|
|
5
|
+
readonly rules: Record<string, number>;
|
|
6
|
+
}
|
|
7
|
+
export declare function lintTurnFiles(files: Readonly<Record<string, string>>): Promise<LookLintResult>;
|
|
8
|
+
export declare function lookLintProperties(lookLint: LookLintResult): Record<string, unknown>;
|
|
9
|
+
export type LookLintCtx = VibesApiSQLCtx;
|
|
10
|
+
export interface LookLintPlanArgs {
|
|
11
|
+
readonly theme: string | undefined;
|
|
12
|
+
readonly committed: boolean;
|
|
13
|
+
}
|
|
14
|
+
export declare function lookLintPlanned(vctx: {
|
|
15
|
+
readonly sthis: {
|
|
16
|
+
readonly env: {
|
|
17
|
+
get(key: string): string | undefined;
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
}, args: LookLintPlanArgs): boolean;
|
|
21
|
+
export interface DispatchLookLintArgs extends LookLintPlanArgs {
|
|
22
|
+
readonly files: () => Promise<Readonly<Record<string, string>>>;
|
|
23
|
+
readonly onResult: (result: LookLintResult | undefined) => void;
|
|
24
|
+
}
|
|
25
|
+
export declare function __setLookLintStartHookForTests(hook: (() => void) | undefined): void;
|
|
26
|
+
export declare function dispatchLookLint(vctx: LookLintCtx, args: DispatchLookLintArgs): void;
|
|
27
|
+
export declare function loadTurnFilesByFsId(vctx: VibesApiSQLCtx, fsId: string): Promise<Record<string, string>>;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { eq } from "drizzle-orm";
|
|
2
|
+
import { DERIVED_MANIFEST_PREFIX, fileSystemItem, parseArray } from "@vibes.diy/api-types";
|
|
3
|
+
import { lookLintMode } from "./look-flags.js";
|
|
4
|
+
import { resolveVfsFromFileSystem } from "./version-timeline.js";
|
|
5
|
+
export const LOOK_LINT_THEME = "house";
|
|
6
|
+
export async function lintTurnFiles(files) {
|
|
7
|
+
const { lintLookSource } = await import("./look-lint-engine.js");
|
|
8
|
+
const rules = {};
|
|
9
|
+
let total = 0;
|
|
10
|
+
for (const finding of lintLookSource(files)) {
|
|
11
|
+
rules[finding.ruleId] = (rules[finding.ruleId] ?? 0) + 1;
|
|
12
|
+
total++;
|
|
13
|
+
}
|
|
14
|
+
return { total, rules };
|
|
15
|
+
}
|
|
16
|
+
export function lookLintProperties(lookLint) {
|
|
17
|
+
return { look_lint_total: lookLint.total, look_lint_rules: lookLint.rules };
|
|
18
|
+
}
|
|
19
|
+
export function lookLintPlanned(vctx, args) {
|
|
20
|
+
if (lookLintMode(vctx) === "off")
|
|
21
|
+
return false;
|
|
22
|
+
if (args.committed === false)
|
|
23
|
+
return false;
|
|
24
|
+
return args.theme === LOOK_LINT_THEME;
|
|
25
|
+
}
|
|
26
|
+
let lookLintStartHook;
|
|
27
|
+
export function __setLookLintStartHookForTests(hook) {
|
|
28
|
+
lookLintStartHook = hook;
|
|
29
|
+
}
|
|
30
|
+
export function dispatchLookLint(vctx, args) {
|
|
31
|
+
if (lookLintPlanned(vctx, args) === false)
|
|
32
|
+
return;
|
|
33
|
+
lookLintStartHook?.();
|
|
34
|
+
const promise = (async () => {
|
|
35
|
+
const files = await args.files();
|
|
36
|
+
if (Object.keys(files).length === 0)
|
|
37
|
+
return undefined;
|
|
38
|
+
return lintTurnFiles(files);
|
|
39
|
+
})()
|
|
40
|
+
.catch((e) => {
|
|
41
|
+
vctx.logger.Warn().Err(e).Msg("look-lint-failed");
|
|
42
|
+
return undefined;
|
|
43
|
+
})
|
|
44
|
+
.then((result) => {
|
|
45
|
+
args.onResult(result);
|
|
46
|
+
});
|
|
47
|
+
vctx.waitUntil?.(promise);
|
|
48
|
+
}
|
|
49
|
+
export async function loadTurnFilesByFsId(vctx, fsId) {
|
|
50
|
+
const rows = await vctx.sql.db
|
|
51
|
+
.select({ fileSystem: vctx.sql.tables.apps.fileSystem })
|
|
52
|
+
.from(vctx.sql.tables.apps)
|
|
53
|
+
.where(eq(vctx.sql.tables.apps.fsId, fsId))
|
|
54
|
+
.limit(1);
|
|
55
|
+
const row = rows[0];
|
|
56
|
+
if (row === undefined)
|
|
57
|
+
return {};
|
|
58
|
+
const vfs = await resolveVfsFromFileSystem(vctx, parseArray(row.fileSystem, fileSystemItem));
|
|
59
|
+
const files = {};
|
|
60
|
+
for (const [path, content] of vfs) {
|
|
61
|
+
if (path.startsWith(DERIVED_MANIFEST_PREFIX))
|
|
62
|
+
continue;
|
|
63
|
+
files[path] = content;
|
|
64
|
+
}
|
|
65
|
+
return files;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=look-lint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"look-lint.js","sourceRoot":"","sources":["../../jsr/intern/look-lint.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,15 @@ export interface MintDecision {
|
|
|
25
25
|
export interface MintDecisionCatalogs {
|
|
26
26
|
readonly catalogNames: ReadonlySet<string>;
|
|
27
27
|
readonly curatedThemes: ReadonlySet<string>;
|
|
28
|
+
readonly fallbackTheme?: string;
|
|
28
29
|
}
|
|
30
|
+
export declare function mintsOnTheBrief(vctx: {
|
|
31
|
+
readonly sthis: {
|
|
32
|
+
readonly env: {
|
|
33
|
+
get(key: string): string | undefined;
|
|
34
|
+
};
|
|
35
|
+
};
|
|
36
|
+
}, theme: string): boolean;
|
|
29
37
|
export declare function mintDecisionFromToolInput(input: CreateVibeToolInput, catalogs: MintDecisionCatalogs): MintDecision;
|
|
30
38
|
export interface MintDecisionDrops {
|
|
31
39
|
readonly offCatalog: string[];
|
package/intern/mint-decision.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
|
+
import { hasLookBrief } from "@vibes.diy/prompts";
|
|
2
|
+
import { isLookBriefEnabled } from "./look-flags.js";
|
|
1
3
|
import { MINT_FALLBACK_THEME } from "./mint-style.js";
|
|
2
4
|
import { ALWAYS_ON_SKILLS, excludeInitialTurnSkills } from "./pre-allocate.js";
|
|
3
5
|
export const DEFAULT_DEFERRED_ACCESS_WHY = "so each person's own records stay theirs, and anyone they name can be let into them";
|
|
6
|
+
export function mintsOnTheBrief(vctx, theme) {
|
|
7
|
+
return isLookBriefEnabled(vctx) && hasLookBrief(theme);
|
|
8
|
+
}
|
|
4
9
|
function trimmed(value) {
|
|
5
10
|
return typeof value === "string" ? value.trim() : "";
|
|
6
11
|
}
|
|
@@ -33,10 +38,12 @@ export function mintDecisionWithDrops(input, catalogs) {
|
|
|
33
38
|
return title.length > 0 && slug.length > 0 ? [{ title, slug }] : [];
|
|
34
39
|
})
|
|
35
40
|
.slice(0, 3);
|
|
36
|
-
const
|
|
41
|
+
const fallbackTheme = catalogs.fallbackTheme ?? MINT_FALLBACK_THEME;
|
|
42
|
+
const theme = input.theme !== undefined && catalogs.curatedThemes.has(input.theme) ? input.theme : fallbackTheme;
|
|
37
43
|
const accessWhy = trimmed(input.deferred?.access?.why);
|
|
38
44
|
const backendWhy = trimmed(input.deferred?.backend?.why);
|
|
39
|
-
const
|
|
45
|
+
const declaredNeeded = input.deferred?.access?.needed;
|
|
46
|
+
const access = declaredNeeded === true || (declaredNeeded !== false && deferredToLater.includes("access"))
|
|
40
47
|
? { needed: true, why: accessWhy.length > 0 ? accessWhy : DEFAULT_DEFERRED_ACCESS_WHY }
|
|
41
48
|
: undefined;
|
|
42
49
|
const backend = input.deferred?.backend?.recommended === true && backendWhy.length > 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint-decision.js","sourceRoot":"","sources":["../../jsr/intern/mint-decision.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAyB/E,MAAM,CAAC,MAAM,2BAA2B,GAAG,qFAAqF,CAAC;
|
|
1
|
+
{"version":3,"file":"mint-decision.js","sourceRoot":"","sources":["../../jsr/intern/mint-decision.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ export interface SweepTurnKey {
|
|
|
23
23
|
}
|
|
24
24
|
export interface SweepDeps {
|
|
25
25
|
readonly readLastBlock: (key: SweepTurnKey) => Promise<Result<PersistedBlockRow | undefined>>;
|
|
26
|
+
readonly bufferProgress: (key: SweepTurnKey) => number | undefined;
|
|
26
27
|
readonly writeTerminal: (args: {
|
|
27
28
|
readonly key: SweepTurnKey;
|
|
28
29
|
readonly rows: readonly {
|
|
@@ -51,6 +52,7 @@ export interface SweepFailure {
|
|
|
51
52
|
}
|
|
52
53
|
export interface SweepLostTurnsResult {
|
|
53
54
|
readonly swept: number;
|
|
55
|
+
readonly sweptTurns: readonly SweepTurnKey[];
|
|
54
56
|
readonly collisions: number;
|
|
55
57
|
readonly alreadyEnded: number;
|
|
56
58
|
readonly stillWriting: number;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { exception2Result, Result } from "@adviser/cement";
|
|
2
2
|
import { claimLostTurns, closeSweptTurn, reopenTurn } from "./open-turn-store.js";
|
|
3
|
+
import { inFlightProgress } from "./in-flight-turns.js";
|
|
3
4
|
import { blocksCarryTurnTerminal, lastPersistedBlock } from "./persisted-block-seq.js";
|
|
4
5
|
import { markMintJobSql } from "./mint-job-store.js";
|
|
5
6
|
export const TURN_LOST_ERROR = "turn-lost: the server restarted mid-build";
|
|
@@ -8,6 +9,7 @@ export const OWNER_GONE_RECHECK_MS = 1_000;
|
|
|
8
9
|
export function defaultSweepDeps(sql) {
|
|
9
10
|
return {
|
|
10
11
|
readLastBlock: (key) => lastPersistedBlock(sql, key),
|
|
12
|
+
bufferProgress: (key) => inFlightProgress(key.chatId, key.promptId),
|
|
11
13
|
writeTerminal: async (args) => {
|
|
12
14
|
const r = await exception2Result(() => sql.db.insert(sql.tables.chatSections).values(args.rows.map((row) => ({
|
|
13
15
|
chatId: args.key.chatId,
|
|
@@ -45,7 +47,10 @@ function isUniqueViolation(err) {
|
|
|
45
47
|
async function stillWritingVerdict(deps, key, last, bornAtMs) {
|
|
46
48
|
if (wroteSinceBirth(last, bornAtMs))
|
|
47
49
|
return "still-writing";
|
|
50
|
+
const bufferedBefore = deps.bufferProgress(key);
|
|
48
51
|
await deps.pause(OWNER_GONE_RECHECK_MS);
|
|
52
|
+
if (deps.bufferProgress(key) !== bufferedBefore)
|
|
53
|
+
return "still-writing";
|
|
49
54
|
const again = await deps.readLastBlock(key);
|
|
50
55
|
if (again.isErr())
|
|
51
56
|
return "still-writing";
|
|
@@ -76,6 +81,7 @@ export async function sweepLostTurns(sql, args) {
|
|
|
76
81
|
if (rClaim.isErr())
|
|
77
82
|
return Result.Err(rClaim);
|
|
78
83
|
let swept = 0;
|
|
84
|
+
const sweptTurns = [];
|
|
79
85
|
let collisions = 0;
|
|
80
86
|
let alreadyEnded = 0;
|
|
81
87
|
let stillWriting = 0;
|
|
@@ -154,6 +160,7 @@ export async function sweepLostTurns(sql, args) {
|
|
|
154
160
|
continue;
|
|
155
161
|
}
|
|
156
162
|
swept += 1;
|
|
163
|
+
sweptTurns.push(key);
|
|
157
164
|
if (row.kind === "first-build") {
|
|
158
165
|
const rSettle = await deps.settleFirstBuild({ chatId: row.chatId });
|
|
159
166
|
if (rSettle.isErr()) {
|
|
@@ -161,6 +168,6 @@ export async function sweepLostTurns(sql, args) {
|
|
|
161
168
|
}
|
|
162
169
|
}
|
|
163
170
|
}
|
|
164
|
-
return Result.Ok({ swept, collisions, alreadyEnded, stillWriting, failures });
|
|
171
|
+
return Result.Ok({ swept, sweptTurns, collisions, alreadyEnded, stillWriting, failures });
|
|
165
172
|
}
|
|
166
173
|
//# sourceMappingURL=open-turn-sweep.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-turn-sweep.js","sourceRoot":"","sources":["../../jsr/intern/open-turn-sweep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,UAAU,EAAoB,MAAM,sBAAsB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAA0B,MAAM,0BAA0B,CAAC;AAC/G,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAUrD,MAAM,CAAC,MAAM,eAAe,GAAG,2CAA2C,CAAC;AAG3E,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC;AAmB1C,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"open-turn-sweep.js","sourceRoot":"","sources":["../../jsr/intern/open-turn-sweep.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ import { PromptAndBlockMsgs, isActiveCodegenTheme, isActiveEnrichedPrompt, isAct
|
|
|
3
3
|
import { isCodeBegin, isCodeEnd, isCodeLine, isToplevelLine, isUserChatMessage } from "@vibes.diy/call-ai-v2";
|
|
4
4
|
import { ensureLogger } from "@vibes.diy/identity";
|
|
5
5
|
import { and, eq, ne } from "drizzle-orm/sql/expressions";
|
|
6
|
-
import { getDefaultSkills, makeBaseSystemPrompt } from "@vibes.diy/prompts";
|
|
6
|
+
import { getDefaultSkills, hasLookBrief, makeBaseSystemPrompt } from "@vibes.diy/prompts";
|
|
7
|
+
import { isLookBriefEnabled, isLookComponentsEnabled } from "./look-flags.js";
|
|
7
8
|
import { createPromptAssetFetch, promptsPkgBaseUrl } from "./prompt-asset-fetch.js";
|
|
8
9
|
import { loadModels } from "../public/list-models.js";
|
|
9
10
|
import { loadLatestScreenshotDataUrl } from "./latest-screenshot.js";
|
|
@@ -218,10 +219,12 @@ export async function assemblePromptPayload(vctx, args) {
|
|
|
218
219
|
const isFirstGeneratedTurn = timeline.filter((e) => !e.seeded).length === 0;
|
|
219
220
|
const themeChanged = (theme ?? "") !== (codegenTheme ?? "");
|
|
220
221
|
const includeTheme = isInitial || themeChanged;
|
|
222
|
+
const includeLook = includeTheme && theme !== undefined && isLookBriefEnabled(vctx) && hasLookBrief(theme);
|
|
221
223
|
const systemPrompt = await exception2Result(async () => {
|
|
222
224
|
return makeBaseSystemPrompt(model, {
|
|
223
225
|
skills: effectiveSkills,
|
|
224
226
|
theme: includeTheme ? theme : undefined,
|
|
227
|
+
...(includeLook ? { look: { components: isLookComponentsEnabled(vctx) } } : {}),
|
|
225
228
|
title,
|
|
226
229
|
enrichedPrompt: includeTheme ? enrichedPrompt : undefined,
|
|
227
230
|
layoutArchetype: isInitial ? layoutArchetype : undefined,
|
|
@@ -329,12 +332,12 @@ export async function assemblePromptPayload(vctx, args) {
|
|
|
329
332
|
}
|
|
330
333
|
}
|
|
331
334
|
}
|
|
332
|
-
const { headPre, headDocs, tail } = systemPrompt.Ok().promptSegments;
|
|
335
|
+
const { headPre, headDocs, headLook, tail } = systemPrompt.Ok().promptSegments;
|
|
333
336
|
const tailAppends = [elidedCount > 0 ? ELIDED_CODE_NOTICE : undefined].filter((block) => block !== undefined);
|
|
334
337
|
const tailText = [tail, ...tailAppends].join("\n\n");
|
|
335
338
|
const systemContent = [
|
|
336
339
|
{ type: "text", text: headPre, cache_control: { type: "ephemeral" } },
|
|
337
|
-
{ type: "text", text: headDocs, cache_control: { type: "ephemeral" } },
|
|
340
|
+
{ type: "text", text: headDocs + headLook, cache_control: { type: "ephemeral" } },
|
|
338
341
|
{ type: "text", text: tailText },
|
|
339
342
|
].filter((part) => part.text.length > 0);
|
|
340
343
|
const assembled = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-assembly.js","sourceRoot":"","sources":["../../jsr/intern/prompt-assembly.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prompt-assembly.js","sourceRoot":"","sources":["../../jsr/intern/prompt-assembly.ts"],"names":[],"mappings":"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"}
|
package/intern/render-vibe.js
CHANGED
|
@@ -13,7 +13,7 @@ import { Dependencies, render_esm_sh, resolveVersionRegistry } from "./import-ma
|
|
|
13
13
|
import { lockedGroupsVersions, lockedVersions } from "./grouped-vibe-import-map.js";
|
|
14
14
|
import { defaultFetchPkgVersion } from "../npm-package-version.js";
|
|
15
15
|
import { loadVibeLiveSettings } from "./load-vibe-env.js";
|
|
16
|
-
import { ssrStyleCss, ssrThemeCss
|
|
16
|
+
import { servedFontImportUrl, shadcnAliasFloorCss, ssrStyleCss, ssrThemeCss } from "./ssr-theme-css.js";
|
|
17
17
|
import { vibePreloadModules } from "./vibe-preload-modules.js";
|
|
18
18
|
const SANDBOX_DOCUMENT_TIMING_HEADER = { "Timing-Allow-Origin": "*" };
|
|
19
19
|
export async function buildViewerEnvForRender(vctx, args, accessFnBindings) {
|
|
@@ -177,6 +177,7 @@ export async function renderVibe({ ctx, fs, fsItems, settingsEnv, entryPointEtag
|
|
|
177
177
|
const ssrTailwindCss = await twArtifactPromise;
|
|
178
178
|
const topLevelRedirect = bareHostRedirectTarget(vctx.params.vibes.env.VIBES_DIY_PUBLIC_BASE_URL, fs.ownerHandle, fs.appSlug, URI.from(ctx.request.url));
|
|
179
179
|
const bootSource = await bootSourcePromise;
|
|
180
|
+
const rootTokenCss = themeCss ?? (await shadcnAliasFloorCss());
|
|
180
181
|
const vsctx = {
|
|
181
182
|
usrEnv,
|
|
182
183
|
svcEnv: vctx.params.vibes.env,
|
|
@@ -186,7 +187,7 @@ export async function renderVibe({ ctx, fs, fsItems, settingsEnv, entryPointEtag
|
|
|
186
187
|
...(isEmbeddedDocumentUrl(requestUrl) ? { embedded: true } : {}),
|
|
187
188
|
...(ssrHtml !== undefined ? { ssrHtml } : {}),
|
|
188
189
|
...(ssrTailwindCss !== undefined ? { ssrTailwindCss } : {}),
|
|
189
|
-
...(
|
|
190
|
+
...(rootTokenCss !== undefined ? { ssrThemeCss: rootTokenCss } : {}),
|
|
190
191
|
...(styleCss !== undefined ? { ssrStyleCss: styleCss } : {}),
|
|
191
192
|
...(styleFontUrl !== undefined ? { ssrStyleFontUrl: styleFontUrl } : {}),
|
|
192
193
|
importMap: {
|
|
@@ -289,7 +290,7 @@ export async function renderPendingVibe({ ctx, appSlug, ownerHandle, pkgRepos, a
|
|
|
289
290
|
const themeCss = await ssrThemeCss(pendingPaletteSlug);
|
|
290
291
|
const pendingStyle = rPendingSettings.isOk() ? rPendingSettings.Ok().style : undefined;
|
|
291
292
|
const pendingStyleCss = await ssrStyleCss(pendingStyle);
|
|
292
|
-
const pendingStyleFontUrl =
|
|
293
|
+
const pendingStyleFontUrl = await servedFontImportUrl(pendingStyle, pendingPaletteSlug);
|
|
293
294
|
const topLevelRedirect = bareHostRedirectTarget(vctx.params.vibes.env.VIBES_DIY_PUBLIC_BASE_URL, ownerHandle, appSlug, URI.from(ctx.request.url));
|
|
294
295
|
const preloadModules = vibePreloadModules(importMap);
|
|
295
296
|
const vsctx = {
|