@vibes.diy/api-svc 12.2.3 → 12.2.5
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/evento-handler-manifest.js +2 -0
- package/evento-handler-manifest.js.map +1 -1
- package/intern/attach-draft-handle.js +2 -0
- package/intern/attach-draft-handle.js.map +1 -1
- package/intern/attempt-backend-onchange.d.ts +1 -1
- package/intern/attempt-backend-onchange.js +66 -40
- package/intern/attempt-backend-onchange.js.map +1 -1
- package/intern/attempt-backend-scheduled.d.ts +1 -0
- package/intern/attempt-backend-scheduled.js +20 -6
- package/intern/attempt-backend-scheduled.js.map +1 -1
- package/intern/backend-ai-callback.js +66 -16
- package/intern/backend-ai-callback.js.map +1 -1
- package/intern/backend-db-callback.js +2 -6
- package/intern/backend-db-callback.js.map +1 -1
- package/intern/backend-invoke-failure-log.d.ts +23 -0
- package/intern/backend-invoke-failure-log.js +50 -0
- package/intern/backend-invoke-failure-log.js.map +1 -0
- package/intern/components/vibe-page.js +3 -1
- package/intern/components/vibe-page.js.map +1 -1
- package/intern/draft-chat-store.d.ts +49 -0
- package/intern/draft-chat-store.js +3 -1
- package/intern/draft-chat-store.js.map +1 -1
- package/intern/ensure-app-metadata.js.map +1 -1
- package/intern/ensure-chat-id.d.ts +5 -2
- package/intern/ensure-chat-id.js +23 -2
- package/intern/ensure-chat-id.js.map +1 -1
- package/intern/load-vibe-env.d.ts +2 -0
- package/intern/load-vibe-env.js +5 -1
- package/intern/load-vibe-env.js.map +1 -1
- package/intern/mint-style.d.ts +3 -0
- package/intern/mint-style.js +19 -0
- package/intern/mint-style.js.map +1 -0
- package/intern/pre-allocate.d.ts +2 -0
- package/intern/pre-allocate.js +4 -2
- package/intern/pre-allocate.js.map +1 -1
- package/intern/process-access-bindings.js +2 -6
- package/intern/process-access-bindings.js.map +1 -1
- package/intern/prompt-assembly.d.ts +2 -0
- package/intern/prompt-assembly.js +9 -2
- package/intern/prompt-assembly.js.map +1 -1
- package/intern/read-anonymous-seed-docs.js +1 -0
- package/intern/read-anonymous-seed-docs.js.map +1 -1
- package/intern/render-vibe.d.ts +3 -1
- package/intern/render-vibe.js +9 -2
- package/intern/render-vibe.js.map +1 -1
- package/intern/restyle-nudge.d.ts +24 -0
- package/intern/restyle-nudge.js +168 -0
- package/intern/restyle-nudge.js.map +1 -0
- package/intern/restyle-turn.d.ts +25 -0
- package/intern/restyle-turn.js +164 -0
- package/intern/restyle-turn.js.map +1 -0
- package/intern/ssr-theme-css.d.ts +3 -0
- package/intern/ssr-theme-css.js +26 -1
- package/intern/ssr-theme-css.js.map +1 -1
- package/package.json +11 -11
- package/public/access-fn-channel-index.js +2 -6
- package/public/access-fn-channel-index.js.map +1 -1
- package/public/app-documents-read-eventos.js +1 -0
- package/public/app-documents-read-eventos.js.map +1 -1
- package/public/app-settings-secrets.js +1 -0
- package/public/app-settings-secrets.js.map +1 -1
- package/public/app-settings-sql-upsert.d.ts +4 -0
- package/public/app-settings-sql-upsert.js +26 -1
- package/public/app-settings-sql-upsert.js.map +1 -1
- package/public/audience-channels.d.ts +4 -0
- package/public/audience-channels.js +14 -0
- package/public/audience-channels.js.map +1 -1
- package/public/ensure-app-settings.js +27 -7
- package/public/ensure-app-settings.js.map +1 -1
- package/public/inherit-read-resolver.d.ts +6 -0
- package/public/inherit-read-resolver.js +26 -12
- package/public/inherit-read-resolver.js.map +1 -1
- package/public/prompt-chat-section.js +132 -95
- package/public/prompt-chat-section.js.map +1 -1
- package/public/report-activity.d.ts +3 -0
- package/public/report-activity.js +161 -0
- package/public/report-activity.js.map +1 -0
- package/public/report-dates.d.ts +1 -0
- package/public/report-dates.js +9 -0
- package/public/report-dates.js.map +1 -1
- package/public/root-html-live-inputs.d.ts +1 -0
- package/public/root-html-live-inputs.js +9 -2
- package/public/root-html-live-inputs.js.map +1 -1
- package/public/serv-entry-point.d.ts +1 -1
- package/public/serv-entry-point.js +11 -4
- package/public/serv-entry-point.js.map +1 -1
- package/public/sync-bounded-read.d.ts +1 -0
- package/public/sync-bounded-read.js +12 -0
- package/public/sync-bounded-read.js.map +1 -1
- package/public/sync-eventos.d.ts +1 -0
- package/public/sync-eventos.js +91 -32
- package/public/sync-eventos.js.map +1 -1
- package/public/sync-subject-digest.d.ts +19 -0
- package/public/sync-subject-digest.js +104 -0
- package/public/sync-subject-digest.js.map +1 -0
- package/public/viewer-channel-resolver.d.ts +3 -0
- package/public/viewer-channel-resolver.js +7 -2
- package/public/viewer-channel-resolver.js.map +1 -1
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
import { Lazy, Result, exception2Result } from "@adviser/cement";
|
|
2
|
+
import { callAI } from "call-ai";
|
|
3
|
+
import { type } from "arktype";
|
|
4
|
+
import { ensureLogger } from "@vibes.diy/identity";
|
|
5
|
+
import { RESTYLE_CUE_WORDS, getVibeFont, makeRestyleMapperMessage, makeRestyleRouterMessage, restyleMapperParsed, restyleMapperSchema, restyleRouterParsed, restyleRouterSchema, routeFromRestyleAnswer, validRestyleTargets, } from "@vibes.diy/prompts";
|
|
6
|
+
import { loadModels } from "../public/list-models.js";
|
|
7
|
+
const RESTYLE_TIMEOUT_MS = 8000;
|
|
8
|
+
const HUE_SCHEMES = ["analogous", "split-complementary", "triadic", "complementary"];
|
|
9
|
+
function asHueScheme(raw) {
|
|
10
|
+
return HUE_SCHEMES.find((s) => s === raw);
|
|
11
|
+
}
|
|
12
|
+
const getRestyleCueMatcher = Lazy(() => {
|
|
13
|
+
const escaped = [...RESTYLE_CUE_WORDS].sort((a, b) => b.length - a.length).map((w) => w.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
|
|
14
|
+
return new RegExp(`\\b(?:${escaped.join("|")})\\b`, "i");
|
|
15
|
+
});
|
|
16
|
+
export function promptMayBeRestyle(text) {
|
|
17
|
+
return getRestyleCueMatcher().test(text);
|
|
18
|
+
}
|
|
19
|
+
async function runtimeModelId(vctx) {
|
|
20
|
+
const rModels = await loadModels(vctx);
|
|
21
|
+
if (rModels.isErr())
|
|
22
|
+
return Result.Err(rModels);
|
|
23
|
+
const runtime = rModels.Ok().models.find((m) => m.preSelected?.includes("runtime"));
|
|
24
|
+
if (runtime === undefined)
|
|
25
|
+
return Result.Err("no preSelected runtime model in catalog");
|
|
26
|
+
return Result.Ok(runtime.id);
|
|
27
|
+
}
|
|
28
|
+
async function structuredCall(vctx, { model, message, schema }) {
|
|
29
|
+
const timeout = new Promise((_, reject) => setTimeout(() => reject(new Error(`restyle LLM call timed out after ${RESTYLE_TIMEOUT_MS}ms`)), RESTYLE_TIMEOUT_MS));
|
|
30
|
+
const rCall = await exception2Result(() => Promise.race([
|
|
31
|
+
callAI(message, {
|
|
32
|
+
model,
|
|
33
|
+
endpoint: vctx.params.llm.url,
|
|
34
|
+
apiKey: vctx.params.llm.apiKey,
|
|
35
|
+
mock: { fetch: vctx.inferenceFetch },
|
|
36
|
+
schema: { ...schema, required: [...schema.required] },
|
|
37
|
+
}),
|
|
38
|
+
timeout,
|
|
39
|
+
]));
|
|
40
|
+
if (rCall.isErr())
|
|
41
|
+
return Result.Err(rCall);
|
|
42
|
+
const raw = rCall.Ok();
|
|
43
|
+
if (typeof raw !== "string")
|
|
44
|
+
return Result.Err("restyle callAI returned non-string (streaming not requested)");
|
|
45
|
+
const rParsed = exception2Result(() => JSON.parse(raw));
|
|
46
|
+
if (rParsed.isErr())
|
|
47
|
+
return Result.Err(`restyle JSON parse failed: ${rParsed.Err()}`);
|
|
48
|
+
return Result.Ok(rParsed.Ok());
|
|
49
|
+
}
|
|
50
|
+
async function creditsAllow(vctx, userId) {
|
|
51
|
+
if (vctx.billing.enforceEnabled === false)
|
|
52
|
+
return true;
|
|
53
|
+
const rCheck = await vctx.billing.checkCredits({ userId });
|
|
54
|
+
if (rCheck.isErr()) {
|
|
55
|
+
ensureLogger(vctx.sthis, "restyleNudge").Warn().Err(rCheck).Msg("restyle-billing-check-failed-open");
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
return rCheck.Ok().allowed !== false;
|
|
59
|
+
}
|
|
60
|
+
export async function routeRestyleMessage(vctx, { prompt, userId }) {
|
|
61
|
+
if (promptMayBeRestyle(prompt) === false)
|
|
62
|
+
return "codegen";
|
|
63
|
+
if ((await creditsAllow(vctx, userId)) === false)
|
|
64
|
+
return "codegen";
|
|
65
|
+
const rModel = await runtimeModelId(vctx);
|
|
66
|
+
if (rModel.isErr()) {
|
|
67
|
+
ensureLogger(vctx.sthis, "restyleNudge").Warn().Err(rModel).Msg("restyle-router-model-unresolved; routing to codegen");
|
|
68
|
+
return "codegen";
|
|
69
|
+
}
|
|
70
|
+
const rRaw = await structuredCall(vctx, {
|
|
71
|
+
model: rModel.Ok(),
|
|
72
|
+
message: makeRestyleRouterMessage(prompt),
|
|
73
|
+
schema: restyleRouterSchema,
|
|
74
|
+
});
|
|
75
|
+
if (rRaw.isErr()) {
|
|
76
|
+
ensureLogger(vctx.sthis, "restyleNudge").Warn().Err(rRaw).Msg("restyle-router-call-failed; routing to codegen");
|
|
77
|
+
return "codegen";
|
|
78
|
+
}
|
|
79
|
+
const validated = restyleRouterParsed(rRaw.Ok());
|
|
80
|
+
if (validated instanceof type.errors) {
|
|
81
|
+
ensureLogger(vctx.sthis, "restyleNudge")
|
|
82
|
+
.Warn()
|
|
83
|
+
.Str("why", validated.summary)
|
|
84
|
+
.Msg("restyle-router-schema-invalid; routing to codegen");
|
|
85
|
+
return "codegen";
|
|
86
|
+
}
|
|
87
|
+
return routeFromRestyleAnswer(validated);
|
|
88
|
+
}
|
|
89
|
+
const clamp = (v, lo, hi) => (v < lo ? lo : v > hi ? hi : v);
|
|
90
|
+
export function describeCurrentStyle(style) {
|
|
91
|
+
const hues = style.palette?.hues ?? [210];
|
|
92
|
+
const character = style.palette?.character ?? {
|
|
93
|
+
chroma: 0.5,
|
|
94
|
+
contrast: 0.5,
|
|
95
|
+
neutralTint: 0.3,
|
|
96
|
+
surfaceLift: 0.5,
|
|
97
|
+
fillLevel: 0.6,
|
|
98
|
+
scheme: "split-complementary",
|
|
99
|
+
};
|
|
100
|
+
const pins = style.ornament?.pins;
|
|
101
|
+
return {
|
|
102
|
+
hues,
|
|
103
|
+
character,
|
|
104
|
+
font: style.font ?? "system",
|
|
105
|
+
pad: style.ornament?.pad ?? { x: 0, y: 0 },
|
|
106
|
+
pins: pins === undefined ? [] : Object.keys(pins),
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
export function applyRestyleTargets({ current, proposed, targeted, }) {
|
|
110
|
+
const currentSeed = current.palette;
|
|
111
|
+
const proposedHues = (() => {
|
|
112
|
+
const [first, second, third] = proposed.hues;
|
|
113
|
+
const base = first === undefined ? (currentSeed?.hues[0] ?? 210) : ((first.h % 360) + 360) % 360;
|
|
114
|
+
const control = (c) => c === undefined ? undefined : c.pinned === true ? { mode: "pinned", h: ((c.h % 360) + 360) % 360 } : { mode: "derived" };
|
|
115
|
+
const s = control(second);
|
|
116
|
+
const t = control(third);
|
|
117
|
+
return t === undefined ? (s === undefined ? [base] : [base, s]) : [base, s, t];
|
|
118
|
+
})();
|
|
119
|
+
const hues = targeted.includes("hue") ? proposedHues : (currentSeed?.hues ?? proposedHues);
|
|
120
|
+
const scheme = asHueScheme(proposed.character.scheme) ?? currentSeed?.character.scheme ?? "split-complementary";
|
|
121
|
+
const font = targeted.includes("font") && getVibeFont(proposed.font) !== undefined ? proposed.font : (current.font ?? "system");
|
|
122
|
+
const currentPins = current.ornament?.pins;
|
|
123
|
+
const pins = targeted.includes("ornament-pins") ? undefined : currentPins;
|
|
124
|
+
return {
|
|
125
|
+
palette: {
|
|
126
|
+
hues,
|
|
127
|
+
character: {
|
|
128
|
+
chroma: clamp(proposed.character.chroma, 0, 1),
|
|
129
|
+
contrast: clamp(proposed.character.contrast, 0, 1),
|
|
130
|
+
neutralTint: clamp(proposed.character.neutralTint, 0, 1),
|
|
131
|
+
surfaceLift: clamp(proposed.character.surfaceLift, 0, 1),
|
|
132
|
+
fillLevel: clamp(proposed.character.fillLevel, 0, 1),
|
|
133
|
+
scheme,
|
|
134
|
+
},
|
|
135
|
+
},
|
|
136
|
+
font,
|
|
137
|
+
ornament: {
|
|
138
|
+
pad: { x: clamp(proposed.pad.x, -1, 1), y: clamp(proposed.pad.y, -1, 1) },
|
|
139
|
+
...(pins === undefined || Object.keys(pins).length === 0 ? {} : { pins: { ...pins } }),
|
|
140
|
+
},
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
export async function mapRestyle(vctx, { current, instruction, userId }) {
|
|
144
|
+
if ((await creditsAllow(vctx, userId)) === false)
|
|
145
|
+
return Result.Err("credits-exhausted: skipping restyle mapper");
|
|
146
|
+
const rModel = await runtimeModelId(vctx);
|
|
147
|
+
if (rModel.isErr())
|
|
148
|
+
return Result.Err(rModel);
|
|
149
|
+
const rRaw = await structuredCall(vctx, {
|
|
150
|
+
model: rModel.Ok(),
|
|
151
|
+
message: makeRestyleMapperMessage({ current: describeCurrentStyle(current), instruction }),
|
|
152
|
+
schema: restyleMapperSchema,
|
|
153
|
+
});
|
|
154
|
+
if (rRaw.isErr())
|
|
155
|
+
return Result.Err(rRaw);
|
|
156
|
+
const validated = restyleMapperParsed(rRaw.Ok());
|
|
157
|
+
if (validated instanceof type.errors) {
|
|
158
|
+
return Result.Err(`restyle mapper schema validation failed: ${validated.summary}`);
|
|
159
|
+
}
|
|
160
|
+
const description = validated.description.trim();
|
|
161
|
+
if (description.length === 0)
|
|
162
|
+
return Result.Err("restyle mapper returned an empty description");
|
|
163
|
+
return Result.Ok({
|
|
164
|
+
style: applyRestyleTargets({ current, proposed: validated, targeted: validRestyleTargets(validated.targeted) }),
|
|
165
|
+
description,
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
//# sourceMappingURL=restyle-nudge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"restyle-nudge.js","sourceRoot":"","sources":["../../jsr/intern/restyle-nudge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { HandleTriggerCtx, Result } from "@adviser/cement";
|
|
2
|
+
import { MsgBase, ReqPromptChatSection, ReqPromptLLMChatSection, ReqWithVerifiedAuth, VibesDiyError, W3CWebSocketEvent, type Style } from "@vibes.diy/api-types";
|
|
3
|
+
import { VibesApiSQLCtx } from "../types.js";
|
|
4
|
+
import { type ResChat } from "../public/llm-dispatch.js";
|
|
5
|
+
import { type RestyleNudge } from "./restyle-nudge.js";
|
|
6
|
+
export declare function currentStyleForApp(vctx: VibesApiSQLCtx, { ownerHandle, appSlug, userId }: {
|
|
7
|
+
ownerHandle: string;
|
|
8
|
+
appSlug: string;
|
|
9
|
+
userId: string;
|
|
10
|
+
}): Promise<Style | undefined>;
|
|
11
|
+
export declare function resolveRestyleNudge(vctx: VibesApiSQLCtx, { ownerHandle, appSlug, userId, instruction }: {
|
|
12
|
+
ownerHandle: string;
|
|
13
|
+
appSlug: string;
|
|
14
|
+
userId: string;
|
|
15
|
+
instruction: string;
|
|
16
|
+
}): Promise<RestyleNudge | undefined>;
|
|
17
|
+
export declare function handleRestyleTurn({ ctx, vctx, req, resChat, promptId, blockSeq, nudge, }: {
|
|
18
|
+
ctx: HandleTriggerCtx<W3CWebSocketEvent, MsgBase<ReqWithVerifiedAuth<ReqPromptChatSection>>, never | VibesDiyError>;
|
|
19
|
+
vctx: VibesApiSQLCtx;
|
|
20
|
+
req: ReqWithVerifiedAuth<ReqPromptLLMChatSection>;
|
|
21
|
+
resChat: ResChat;
|
|
22
|
+
promptId: string;
|
|
23
|
+
blockSeq: number;
|
|
24
|
+
nudge: RestyleNudge;
|
|
25
|
+
}): Promise<Result<number>>;
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { Result, exception2Result } from "@adviser/cement";
|
|
2
|
+
import { appendBlockEvent } from "../public/llm-dispatch.js";
|
|
3
|
+
import { ensureAppSettings } from "../public/ensure-app-settings.js";
|
|
4
|
+
import { peekInFlightTurns } from "./in-flight-turns.js";
|
|
5
|
+
import { styleForTheme, MINT_FALLBACK_THEME } from "./mint-style.js";
|
|
6
|
+
import { mapRestyle } from "./restyle-nudge.js";
|
|
7
|
+
export async function currentStyleForApp(vctx, { ownerHandle, appSlug, userId }) {
|
|
8
|
+
const rSettings = await ensureAppSettings(vctx, { type: "vibes.diy.req-ensure-app-settings", ownerHandle, appSlug }, userId);
|
|
9
|
+
if (rSettings.isErr())
|
|
10
|
+
return undefined;
|
|
11
|
+
const settings = rSettings.Ok().settings.entry.settings;
|
|
12
|
+
if (settings.style !== undefined)
|
|
13
|
+
return settings.style;
|
|
14
|
+
const themeSlug = settings.theme ?? MINT_FALLBACK_THEME;
|
|
15
|
+
const palette = styleForTheme(settings.colorTheme ?? themeSlug);
|
|
16
|
+
if (palette === undefined)
|
|
17
|
+
return undefined;
|
|
18
|
+
const structural = styleForTheme(themeSlug) ?? palette;
|
|
19
|
+
return { palette: palette.palette, font: structural.font, ornament: structural.ornament };
|
|
20
|
+
}
|
|
21
|
+
export async function resolveRestyleNudge(vctx, { ownerHandle, appSlug, userId, instruction }) {
|
|
22
|
+
const current = await currentStyleForApp(vctx, { ownerHandle, appSlug, userId });
|
|
23
|
+
if (current === undefined)
|
|
24
|
+
return undefined;
|
|
25
|
+
const rNudge = await mapRestyle(vctx, { current, instruction, userId });
|
|
26
|
+
if (rNudge.isErr()) {
|
|
27
|
+
vctx.logger.Warn().Err(rNudge).Msg("restyle mapper failed; falling through to codegen");
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
return rNudge.Ok();
|
|
31
|
+
}
|
|
32
|
+
export async function handleRestyleTurn({ ctx, vctx, req, resChat, promptId, blockSeq, nudge, }) {
|
|
33
|
+
const userId = req._auth.verifiedAuth.claims.userId;
|
|
34
|
+
const rWrite = await ensureAppSettings(vctx, { type: "vibes.diy.req-ensure-app-settings", ownerHandle: resChat.ownerHandle, appSlug: resChat.appSlug, style: nudge.style }, userId);
|
|
35
|
+
if (rWrite.isErr())
|
|
36
|
+
return Result.Err(rWrite);
|
|
37
|
+
const writeError = rWrite.Ok().error;
|
|
38
|
+
if (writeError !== undefined)
|
|
39
|
+
return Result.Err(`restyle settings write refused: ${writeError}`);
|
|
40
|
+
const written = rWrite.Ok().settings.entry.settings.style;
|
|
41
|
+
const padMatches = written?.ornament?.pad.x === nudge.style.ornament?.pad.x && written?.ornament?.pad.y === nudge.style.ornament?.pad.y;
|
|
42
|
+
if (written === undefined || written.font !== nudge.style.font || padMatches === false) {
|
|
43
|
+
return Result.Err("restyle settings write did not land (caller may not write this app's settings)");
|
|
44
|
+
}
|
|
45
|
+
const now = new Date();
|
|
46
|
+
const blockId = vctx.sthis.nextId(12).str;
|
|
47
|
+
const sectionId = vctx.sthis.nextId(12).str;
|
|
48
|
+
await appendBlockEvent({
|
|
49
|
+
ctx,
|
|
50
|
+
vctx,
|
|
51
|
+
req,
|
|
52
|
+
promptId,
|
|
53
|
+
blockSeq: blockSeq++,
|
|
54
|
+
evt: {
|
|
55
|
+
type: "prompt.req",
|
|
56
|
+
streamId: promptId,
|
|
57
|
+
chatId: req.chatId,
|
|
58
|
+
seq: blockSeq,
|
|
59
|
+
request: req.prompt,
|
|
60
|
+
timestamp: now,
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
await appendBlockEvent({
|
|
64
|
+
ctx,
|
|
65
|
+
vctx,
|
|
66
|
+
req,
|
|
67
|
+
promptId,
|
|
68
|
+
blockSeq: blockSeq++,
|
|
69
|
+
evt: {
|
|
70
|
+
type: "prompt.restyle",
|
|
71
|
+
streamId: promptId,
|
|
72
|
+
chatId: req.chatId,
|
|
73
|
+
seq: blockSeq,
|
|
74
|
+
timestamp: now,
|
|
75
|
+
style: nudge.style,
|
|
76
|
+
description: nudge.description,
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
const lineStats = { lines: 1, bytes: nudge.description.length, cnt: 1 };
|
|
80
|
+
const zeroStats = { lines: 0, bytes: 0 };
|
|
81
|
+
await appendBlockEvent({
|
|
82
|
+
ctx,
|
|
83
|
+
vctx,
|
|
84
|
+
req,
|
|
85
|
+
promptId,
|
|
86
|
+
blockSeq: blockSeq++,
|
|
87
|
+
evt: { type: "block.begin", blockId, streamId: promptId, seq: blockSeq, blockNr: 0, timestamp: now },
|
|
88
|
+
});
|
|
89
|
+
await appendBlockEvent({
|
|
90
|
+
ctx,
|
|
91
|
+
vctx,
|
|
92
|
+
req,
|
|
93
|
+
promptId,
|
|
94
|
+
blockSeq: blockSeq++,
|
|
95
|
+
evt: { type: "block.toplevel.begin", sectionId, blockId, streamId: promptId, seq: blockSeq, blockNr: 1, timestamp: now },
|
|
96
|
+
});
|
|
97
|
+
await appendBlockEvent({
|
|
98
|
+
ctx,
|
|
99
|
+
vctx,
|
|
100
|
+
req,
|
|
101
|
+
promptId,
|
|
102
|
+
blockSeq: blockSeq++,
|
|
103
|
+
evt: {
|
|
104
|
+
type: "block.toplevel.line",
|
|
105
|
+
sectionId,
|
|
106
|
+
lineNr: 0,
|
|
107
|
+
line: nudge.description,
|
|
108
|
+
blockId,
|
|
109
|
+
streamId: promptId,
|
|
110
|
+
seq: blockSeq,
|
|
111
|
+
blockNr: 2,
|
|
112
|
+
timestamp: now,
|
|
113
|
+
},
|
|
114
|
+
});
|
|
115
|
+
await appendBlockEvent({
|
|
116
|
+
ctx,
|
|
117
|
+
vctx,
|
|
118
|
+
req,
|
|
119
|
+
promptId,
|
|
120
|
+
blockSeq: blockSeq++,
|
|
121
|
+
evt: {
|
|
122
|
+
type: "block.toplevel.end",
|
|
123
|
+
sectionId,
|
|
124
|
+
blockId,
|
|
125
|
+
streamId: promptId,
|
|
126
|
+
seq: blockSeq,
|
|
127
|
+
blockNr: 3,
|
|
128
|
+
timestamp: now,
|
|
129
|
+
stats: lineStats,
|
|
130
|
+
},
|
|
131
|
+
});
|
|
132
|
+
await appendBlockEvent({
|
|
133
|
+
ctx,
|
|
134
|
+
vctx,
|
|
135
|
+
req,
|
|
136
|
+
promptId,
|
|
137
|
+
blockSeq: blockSeq++,
|
|
138
|
+
evt: {
|
|
139
|
+
type: "block.end",
|
|
140
|
+
blockId,
|
|
141
|
+
streamId: promptId,
|
|
142
|
+
seq: blockSeq,
|
|
143
|
+
blockNr: 4,
|
|
144
|
+
timestamp: now,
|
|
145
|
+
stats: { toplevel: lineStats, code: zeroStats, image: zeroStats, total: lineStats },
|
|
146
|
+
usage: { given: [], calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } },
|
|
147
|
+
},
|
|
148
|
+
emitMode: "emit-only",
|
|
149
|
+
});
|
|
150
|
+
const promptContextSql = {
|
|
151
|
+
type: "prompt.usage.sql",
|
|
152
|
+
usage: { given: [], calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } },
|
|
153
|
+
};
|
|
154
|
+
await exception2Result(() => vctx.sql.db.insert(vctx.sql.tables.chatSections).values({
|
|
155
|
+
chatId: req.chatId,
|
|
156
|
+
promptId,
|
|
157
|
+
blockSeq: blockSeq++,
|
|
158
|
+
blocks: [promptContextSql],
|
|
159
|
+
created: now.toISOString(),
|
|
160
|
+
}));
|
|
161
|
+
peekInFlightTurns(req.chatId)?.delete(promptId);
|
|
162
|
+
return Result.Ok(blockSeq);
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=restyle-turn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"restyle-turn.js","sourceRoot":"","sources":["../../jsr/intern/restyle-turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
|
+
import type { Style } from "@vibes.diy/api-types";
|
|
1
2
|
export declare function ssrThemeCss(themeSlug: string | undefined): Promise<string | undefined>;
|
|
3
|
+
export declare function styleFontImportUrl(style: Style | undefined): string | undefined;
|
|
4
|
+
export declare function ssrStyleCss(style: Style | undefined): Promise<string | undefined>;
|
|
2
5
|
export declare function __resetSsrThemeCssForTests(): void;
|
package/intern/ssr-theme-css.js
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
|
+
import { getVibeFont } from "@vibes.diy/prompts/themes/fonts.js";
|
|
2
|
+
import { resolveOrnament } from "@vibes.diy/prompts/themes/ornament-pad.js";
|
|
1
3
|
let apiPromise;
|
|
2
4
|
function loadApi() {
|
|
3
5
|
if (!apiPromise) {
|
|
4
6
|
apiPromise = Promise.all([
|
|
5
7
|
import("@vibes.diy/prompts/themes/colorsets-bundle.js"),
|
|
6
8
|
import("@vibes.diy/prompts/themes/colorsets.js"),
|
|
7
|
-
|
|
9
|
+
import("@vibes.diy/prompts/themes/palette-gen.js"),
|
|
10
|
+
]).then(([bundle, colorsets, paletteGen]) => ({
|
|
8
11
|
getColorsetBySlug: bundle.getColorsetBySlug,
|
|
9
12
|
renderRootCssBlock: colorsets.renderRootCssBlock,
|
|
13
|
+
renderStyleCss: paletteGen.renderStyleCss,
|
|
10
14
|
}), () => undefined);
|
|
11
15
|
}
|
|
12
16
|
return apiPromise;
|
|
@@ -24,6 +28,27 @@ export async function ssrThemeCss(themeSlug) {
|
|
|
24
28
|
cssBySlug.set(slug, css);
|
|
25
29
|
return css;
|
|
26
30
|
}
|
|
31
|
+
function structuralTokens(style) {
|
|
32
|
+
const out = resolveOrnament(style.ornament);
|
|
33
|
+
const font = getVibeFont(style.font);
|
|
34
|
+
if (font !== undefined)
|
|
35
|
+
out["font-family"] = font.family;
|
|
36
|
+
return out;
|
|
37
|
+
}
|
|
38
|
+
export function styleFontImportUrl(style) {
|
|
39
|
+
return style === undefined ? undefined : getVibeFont(style.font)?.importUrl;
|
|
40
|
+
}
|
|
41
|
+
export async function ssrStyleCss(style) {
|
|
42
|
+
if (style === undefined)
|
|
43
|
+
return undefined;
|
|
44
|
+
const structural = structuralTokens(style);
|
|
45
|
+
if (style.palette === undefined && Object.keys(structural).length === 0)
|
|
46
|
+
return undefined;
|
|
47
|
+
const api = await loadApi();
|
|
48
|
+
if (api === undefined)
|
|
49
|
+
return undefined;
|
|
50
|
+
return api.renderStyleCss(style.palette, structural);
|
|
51
|
+
}
|
|
27
52
|
export function __resetSsrThemeCssForTests() {
|
|
28
53
|
apiPromise = undefined;
|
|
29
54
|
cssBySlug.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr-theme-css.js","sourceRoot":"","sources":["../../jsr/intern/ssr-theme-css.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ssr-theme-css.js","sourceRoot":"","sources":["../../jsr/intern/ssr-theme-css.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": "12.2.
|
|
3
|
+
"version": "12.2.5",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./index.js",
|
|
@@ -22,18 +22,18 @@
|
|
|
22
22
|
"@libsql/client": "~0.17.4",
|
|
23
23
|
"@neondatabase/serverless": "~1.1.0",
|
|
24
24
|
"@noble/hashes": "~2.2.0",
|
|
25
|
-
"@vibes.diy/api-pkg": "12.2.
|
|
26
|
-
"@vibes.diy/api-sql": "12.2.
|
|
27
|
-
"@vibes.diy/api-types": "12.2.
|
|
28
|
-
"@vibes.diy/call-ai-v2": "12.2.
|
|
29
|
-
"@vibes.diy/identity": "12.2.
|
|
30
|
-
"@vibes.diy/prompts": "12.2.
|
|
31
|
-
"@vibes.diy/vibe-db-explorer": "12.2.
|
|
32
|
-
"@vibes.diy/vibe-runtime": "12.2.
|
|
33
|
-
"@vibes.diy/vibe-types": "12.2.
|
|
25
|
+
"@vibes.diy/api-pkg": "12.2.5",
|
|
26
|
+
"@vibes.diy/api-sql": "12.2.5",
|
|
27
|
+
"@vibes.diy/api-types": "12.2.5",
|
|
28
|
+
"@vibes.diy/call-ai-v2": "12.2.5",
|
|
29
|
+
"@vibes.diy/identity": "12.2.5",
|
|
30
|
+
"@vibes.diy/prompts": "12.2.5",
|
|
31
|
+
"@vibes.diy/vibe-db-explorer": "12.2.5",
|
|
32
|
+
"@vibes.diy/vibe-runtime": "12.2.5",
|
|
33
|
+
"@vibes.diy/vibe-types": "12.2.5",
|
|
34
34
|
"acorn": "~8.17.0",
|
|
35
35
|
"arktype": "~2.2.3",
|
|
36
|
-
"call-ai": "12.2.
|
|
36
|
+
"call-ai": "12.2.5",
|
|
37
37
|
"charwise": "~3.0.1",
|
|
38
38
|
"cookie": "~2.0.1",
|
|
39
39
|
"csv-parse": "~7.0.1",
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { exception2Result, Result } from "@adviser/cement";
|
|
2
2
|
import { and, eq } from "drizzle-orm";
|
|
3
3
|
import { channelSetOfDescriptor } from "./sync-feed.js";
|
|
4
|
+
import { safeParseDescriptor } from "./access-output-decoder.js";
|
|
4
5
|
import { docLockKey, runLockedAllocation } from "./seq-allocation.js";
|
|
5
6
|
function tableOf(tables) {
|
|
6
7
|
return tables.accessFnChannelIndex;
|
|
@@ -38,12 +39,7 @@ function stateTableOf(tables) {
|
|
|
38
39
|
return tables.accessFnChannelIndexState;
|
|
39
40
|
}
|
|
40
41
|
function channelsOfStoredOutput(output) {
|
|
41
|
-
|
|
42
|
-
return channelSetOfDescriptor(JSON.parse(output));
|
|
43
|
-
}
|
|
44
|
-
catch {
|
|
45
|
-
return [];
|
|
46
|
-
}
|
|
42
|
+
return channelSetOfDescriptor(safeParseDescriptor(output));
|
|
47
43
|
}
|
|
48
44
|
function sameChannelSet(a, b) {
|
|
49
45
|
if (a.size !== b.size)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-fn-channel-index.js","sourceRoot":"","sources":["../../jsr/public/access-fn-channel-index.ts"],"names":[],"mappings":"AAkEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAiBtE,SAAS,OAAO,CAAC,MAAsB;IACrC,OAAQ,MAAkC,CAAC,oBAAoB,CAAC;AAClE,CAAC;AA6BD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAAiB,EACjB,MAAsB,EACtB,GAAoB,EACpB,WAAqC;IAErC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IACvC,OAAO,gBAAgB,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,IAAI;aACP,MAAM,CAAC,IAAI,CAAC;aACZ,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,EACrC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,EAC7B,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAC1B,CACF,CAAC;QACJ,IAAI,WAAW,KAAK,IAAI;YAAE,OAAO;QACjC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;QACvC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAC5B,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACrB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,OAAO;YACP,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,IAAiB,EACjB,MAAsB,EACtB,GAAoB,EACpB,UAA4B;IAE5B,OAAO,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAC;AACjF,CAAC;AAMD,MAAM,UAAU,OAAO,CAAC,CAAe,EAAE,IAAY;IACnD,IAAI,CAAC,CAAC,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;AACnG,CAAC;AAYD,SAAS,YAAY,CAAC,MAAsB;IAC1C,OAAQ,MAAkC,CAAC,yBAAyB,CAAC;AACvE,CAAC;
|
|
1
|
+
{"version":3,"file":"access-fn-channel-index.js","sourceRoot":"","sources":["../../jsr/public/access-fn-channel-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -246,6 +246,7 @@ export const queryDocsEvento = {
|
|
|
246
246
|
const { userHandle, effectiveChannels, publicChannels } = await resolveViewerChannels(vctx, {
|
|
247
247
|
ownerHandle: req.ownerHandle,
|
|
248
248
|
appSlug: req.appSlug,
|
|
249
|
+
dbName: req.dbName,
|
|
249
250
|
userId: req._auth?.verifiedAuth.claims.userId ?? null,
|
|
250
251
|
isDm,
|
|
251
252
|
access,
|