@vibes.diy/api-svc 14.0.5 → 14.0.7
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-instruction.d.ts +1 -1
- package/intern/agent-instruction.js +20 -1
- package/intern/agent-instruction.js.map +1 -1
- package/intern/agent-style-tools.js +2 -2
- package/intern/agent-style-tools.js.map +1 -1
- package/intern/llm-tool-loop.js +27 -4
- package/intern/llm-tool-loop.js.map +1 -1
- package/intern/restyle-nudge.d.ts +3 -1
- package/intern/restyle-nudge.js +5 -3
- package/intern/restyle-nudge.js.map +1 -1
- package/package.json +11 -11
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const AGENT_INSTRUCTION_VERSION = "2026-09-02.
|
|
1
|
+
export declare const AGENT_INSTRUCTION_VERSION = "2026-09-02.7";
|
|
2
2
|
export declare const AGENT_INSTRUCTION: string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export const AGENT_INSTRUCTION_VERSION = "2026-09-02.
|
|
1
|
+
export const AGENT_INSTRUCTION_VERSION = "2026-09-02.7";
|
|
2
2
|
export const AGENT_INSTRUCTION = [
|
|
3
3
|
"<agent-turn>",
|
|
4
4
|
"You are the Vibes agent. You are talking with the person whose app this is, and you can build",
|
|
@@ -34,6 +34,13 @@ export const AGENT_INSTRUCTION = [
|
|
|
34
34
|
"NOTHING IS QUEUED BY IT: the change you tried to send is gone, and only you can send it again.",
|
|
35
35
|
"What happens next depends on the refusal itself, which tells you which case you are in.",
|
|
36
36
|
"",
|
|
37
|
+
"A busy answer is NEVER a failure, and never a broken tool. It means another build for this app is",
|
|
38
|
+
"already running — very often the very change this conversation just asked for, dispatched moments",
|
|
39
|
+
"ago by a turn of your own. So never tell the person the change 'did not go through', that a build",
|
|
40
|
+
"'failed to start', or that anything went wrong: say only what the refusal itself says. And do not",
|
|
41
|
+
"call `edit_vibe` again in the same turn after a busy answer — a second call meets the same running",
|
|
42
|
+
"build. The build already running, or the turn you are given when it finishes, is what carries it.",
|
|
43
|
+
"",
|
|
37
44
|
"If it says you will be given another turn when that build finishes, you will — and sending the",
|
|
38
45
|
"change again in that turn is then your job, not the platform's. You may tell the person the second",
|
|
39
46
|
"part is still to come, because you are going to do it.",
|
|
@@ -99,6 +106,18 @@ export const AGENT_INSTRUCTION = [
|
|
|
99
106
|
"happens when it is pressed. An ask that is both — 'make it darker and put the total at the top' —",
|
|
100
107
|
"does both, style FIRST, so the part that is instant is not waiting behind the part that builds.",
|
|
101
108
|
"",
|
|
109
|
+
"Say the look changed only once `set_app_style` has answered `ok`. It FINISHES rather than",
|
|
110
|
+
"dispatching — the setting is saved before it answers — so that answer is your evidence, and the",
|
|
111
|
+
"description it hands back is what you report. If you did not call it, nothing changed: 'switched to",
|
|
112
|
+
"a rounder, more playful font' said after no tool call is a claim about a screen you never touched,",
|
|
113
|
+
"and there is nothing to report about a look you only pictured.",
|
|
114
|
+
"",
|
|
115
|
+
"If it comes back `failed`, call `set_app_style` ONCE more — that is a look the server could not work",
|
|
116
|
+
"out just now, not a wrong ask. If the second try fails too, tell the person plainly that the look",
|
|
117
|
+
"did not take, and stop. Never carry a colour, palette, font or spacing ask into `edit_vibe`",
|
|
118
|
+
"instead: the setting is served over the code, so the build cannot change the look, and they get a",
|
|
119
|
+
"build that reads as a fix and changes nothing they asked about.",
|
|
120
|
+
"",
|
|
102
121
|
"Do not treat a styling ask as a lesser class of request, and do not ask which shade of what before",
|
|
103
122
|
"trying something.",
|
|
104
123
|
"",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-instruction.js","sourceRoot":"","sources":["../../jsr/intern/agent-instruction.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-instruction.js","sourceRoot":"","sources":["../../jsr/intern/agent-instruction.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,12 @@ import { type } from "arktype";
|
|
|
3
3
|
import { setAppStyleToolInput } from "@vibes.diy/api-types";
|
|
4
4
|
import { AgentRefusalError, resolveChatApp } from "./agent-actor.js";
|
|
5
5
|
import { currentStyleForApp } from "./restyle-turn.js";
|
|
6
|
-
import { mapRestyle } from "./restyle-nudge.js";
|
|
6
|
+
import { mapRestyle, RESTYLE_MAPPER_TOOL_TIMEOUT_MS } from "./restyle-nudge.js";
|
|
7
7
|
import { ensureAppSettings } from "../public/ensure-app-settings.js";
|
|
8
8
|
function refuse(refusal) {
|
|
9
9
|
return Result.Err(new AgentRefusalError(refusal));
|
|
10
10
|
}
|
|
11
|
-
export const productionStyleMapper = mapRestyle;
|
|
11
|
+
export const productionStyleMapper = (vctx, args) => mapRestyle(vctx, { ...args, timeoutMs: RESTYLE_MAPPER_TOOL_TIMEOUT_MS });
|
|
12
12
|
export async function runSetAppStyleTool(vctx, args) {
|
|
13
13
|
if (args.chatId === undefined) {
|
|
14
14
|
return refuse({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-style-tools.js","sourceRoot":"","sources":["../../jsr/intern/agent-style-tools.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAsC,MAAM,sBAAsB,CAAC;AAEhG,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAmB,MAAM,kBAAkB,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAqB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-style-tools.js","sourceRoot":"","sources":["../../jsr/intern/agent-style-tools.ts"],"names":[],"mappings":"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"}
|
package/intern/llm-tool-loop.js
CHANGED
|
@@ -126,6 +126,26 @@ function completeToolCalls(partials, request) {
|
|
|
126
126
|
}
|
|
127
127
|
return Result.Ok(calls);
|
|
128
128
|
}
|
|
129
|
+
function applyRoundSeparator(event, state) {
|
|
130
|
+
let injected = false;
|
|
131
|
+
const choices = event.chunk.choices.map((choice) => {
|
|
132
|
+
const content = choice.delta.content;
|
|
133
|
+
if (typeof content !== "string" || content.length === 0)
|
|
134
|
+
return choice;
|
|
135
|
+
if (state.separatorOwed && injected === false) {
|
|
136
|
+
state.separatorOwed = false;
|
|
137
|
+
injected = true;
|
|
138
|
+
const next = `\n\n${content}`;
|
|
139
|
+
state.lastChar = next.slice(-1);
|
|
140
|
+
return { ...choice, delta: { ...choice.delta, content: next } };
|
|
141
|
+
}
|
|
142
|
+
state.lastChar = content.slice(-1);
|
|
143
|
+
return choice;
|
|
144
|
+
});
|
|
145
|
+
if (injected === false)
|
|
146
|
+
return event;
|
|
147
|
+
return { ...event, chunk: { ...event.chunk, choices } };
|
|
148
|
+
}
|
|
129
149
|
function stripToolCallDeltas(event) {
|
|
130
150
|
const choices = event.chunk.choices.map((choice) => {
|
|
131
151
|
const { tool_calls: _toolCalls, ...delta } = choice.delta;
|
|
@@ -211,7 +231,7 @@ async function executeWithDeadline(execute, call, budget, now, parentSignal) {
|
|
|
211
231
|
return Result.Err(rExecution.Err());
|
|
212
232
|
return Result.Ok(rExecution.Ok());
|
|
213
233
|
}
|
|
214
|
-
async function consumeProviderStream(args, stream, request, now) {
|
|
234
|
+
async function consumeProviderStream(args, stream, request, now, textState) {
|
|
215
235
|
const reader = stream.getReader();
|
|
216
236
|
const partials = [];
|
|
217
237
|
let sawToolCall = false;
|
|
@@ -260,7 +280,7 @@ async function consumeProviderStream(args, stream, request, now) {
|
|
|
260
280
|
if (choice.finish_reason === "tool_calls")
|
|
261
281
|
sawToolFinish = true;
|
|
262
282
|
}
|
|
263
|
-
const rVisible = await args.onVisible(sawToolCall ? stripToolCallDeltas(event) : event);
|
|
283
|
+
const rVisible = await args.onVisible(applyRoundSeparator(sawToolCall ? stripToolCallDeltas(event) : event, textState));
|
|
264
284
|
if (rVisible.isErr())
|
|
265
285
|
return Result.Err(String(rVisible.Err()));
|
|
266
286
|
for (const choice of event.chunk.choices) {
|
|
@@ -304,15 +324,16 @@ export async function runLlmToolLoop(args) {
|
|
|
304
324
|
let currentAbort = args.abort;
|
|
305
325
|
let rounds = 0;
|
|
306
326
|
let calls = 0;
|
|
327
|
+
const textState = { lastChar: "", separatorOwed: false };
|
|
307
328
|
try {
|
|
308
329
|
if (currentRequest.tools === undefined || currentRequest.tools.length === 0) {
|
|
309
|
-
const rInitial = await consumeProviderStream({ ...args, abort: currentAbort }, currentStream, currentRequest, now);
|
|
330
|
+
const rInitial = await consumeProviderStream({ ...args, abort: currentAbort }, currentStream, currentRequest, now, textState);
|
|
310
331
|
if (rInitial.isErr())
|
|
311
332
|
return Result.Err(String(rInitial.Err()));
|
|
312
333
|
return Result.Ok({ request: currentRequest, rounds, calls });
|
|
313
334
|
}
|
|
314
335
|
while (true) {
|
|
315
|
-
const rStream = await consumeProviderStream({ ...args, abort: currentAbort }, currentStream, currentRequest, now);
|
|
336
|
+
const rStream = await consumeProviderStream({ ...args, abort: currentAbort }, currentStream, currentRequest, now, textState);
|
|
316
337
|
if (rStream.isErr()) {
|
|
317
338
|
const error = rStream.Err();
|
|
318
339
|
if (error instanceof LlmToolLoopAbandonedError &&
|
|
@@ -331,6 +352,8 @@ export async function runLlmToolLoop(args) {
|
|
|
331
352
|
return Result.Err(`LLM tool loop exceeded ${maxToolCalls} tool calls`);
|
|
332
353
|
}
|
|
333
354
|
rounds++;
|
|
355
|
+
if (textState.lastChar !== "" && /\s/.test(textState.lastChar) === false)
|
|
356
|
+
textState.separatorOwed = true;
|
|
334
357
|
exception2Result(() => args.onToolRound?.({ round: rounds, calls: streamResult.toolCalls }));
|
|
335
358
|
const nextMessages = [...currentRequest.messages];
|
|
336
359
|
nextMessages.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-tool-loop.js","sourceRoot":"","sources":["../../jsr/intern/llm-tool-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"llm-tool-loop.js","sourceRoot":"","sources":["../../jsr/intern/llm-tool-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Result } from "@adviser/cement";
|
|
|
2
2
|
import { type RestyleCurrent, type RestyleMapperParsed, type RestyleTarget } from "@vibes.diy/prompts";
|
|
3
3
|
import type { Style } from "@vibes.diy/api-types";
|
|
4
4
|
import { VibesApiSQLCtx } from "../types.js";
|
|
5
|
+
export declare const RESTYLE_MAPPER_TOOL_TIMEOUT_MS = 15000;
|
|
5
6
|
export declare function promptMayBeRestyle(text: string): boolean;
|
|
6
7
|
export declare function routeRestyleMessage(vctx: VibesApiSQLCtx, { prompt, userId }: {
|
|
7
8
|
prompt: string;
|
|
@@ -17,8 +18,9 @@ export interface RestyleNudge {
|
|
|
17
18
|
readonly style: Style;
|
|
18
19
|
readonly description: string;
|
|
19
20
|
}
|
|
20
|
-
export declare function mapRestyle(vctx: VibesApiSQLCtx, { current, instruction, userId }: {
|
|
21
|
+
export declare function mapRestyle(vctx: VibesApiSQLCtx, { current, instruction, userId, timeoutMs }: {
|
|
21
22
|
current: Style;
|
|
22
23
|
instruction: string;
|
|
23
24
|
userId: string;
|
|
25
|
+
timeoutMs?: number;
|
|
24
26
|
}): Promise<Result<RestyleNudge>>;
|
package/intern/restyle-nudge.js
CHANGED
|
@@ -5,6 +5,7 @@ import { ensureLogger } from "@vibes.diy/identity";
|
|
|
5
5
|
import { RESTYLE_CUE_WORDS, getVibeFont, makeRestyleMapperMessage, makeRestyleRouterMessage, restyleMapperParsed, restyleMapperSchema, restyleRouterParsed, restyleRouterSchema, routeFromRestyleAnswer, validRestyleTargets, } from "@vibes.diy/prompts";
|
|
6
6
|
import { loadModels } from "../public/list-models.js";
|
|
7
7
|
const RESTYLE_TIMEOUT_MS = 8000;
|
|
8
|
+
export const RESTYLE_MAPPER_TOOL_TIMEOUT_MS = 15000;
|
|
8
9
|
const HUE_SCHEMES = ["analogous", "split-complementary", "triadic", "complementary"];
|
|
9
10
|
function asHueScheme(raw) {
|
|
10
11
|
return HUE_SCHEMES.find((s) => s === raw);
|
|
@@ -25,8 +26,8 @@ async function runtimeModelId(vctx) {
|
|
|
25
26
|
return Result.Err("no preSelected runtime model in catalog");
|
|
26
27
|
return Result.Ok(runtime.id);
|
|
27
28
|
}
|
|
28
|
-
async function structuredCall(vctx, { model, message, schema }) {
|
|
29
|
-
const timeout = new Promise((_, reject) => setTimeout(() => reject(new Error(`restyle LLM call timed out after ${
|
|
29
|
+
async function structuredCall(vctx, { model, message, schema, timeoutMs = RESTYLE_TIMEOUT_MS, }) {
|
|
30
|
+
const timeout = new Promise((_, reject) => setTimeout(() => reject(new Error(`restyle LLM call timed out after ${timeoutMs}ms`)), timeoutMs));
|
|
30
31
|
const rCall = await exception2Result(() => Promise.race([
|
|
31
32
|
callAI(message, {
|
|
32
33
|
model,
|
|
@@ -140,7 +141,7 @@ export function applyRestyleTargets({ current, proposed, targeted, }) {
|
|
|
140
141
|
},
|
|
141
142
|
};
|
|
142
143
|
}
|
|
143
|
-
export async function mapRestyle(vctx, { current, instruction, userId }) {
|
|
144
|
+
export async function mapRestyle(vctx, { current, instruction, userId, timeoutMs }) {
|
|
144
145
|
if ((await creditsAllow(vctx, userId)) === false)
|
|
145
146
|
return Result.Err("credits-exhausted: skipping restyle mapper");
|
|
146
147
|
const rModel = await runtimeModelId(vctx);
|
|
@@ -150,6 +151,7 @@ export async function mapRestyle(vctx, { current, instruction, userId }) {
|
|
|
150
151
|
model: rModel.Ok(),
|
|
151
152
|
message: makeRestyleMapperMessage({ current: describeCurrentStyle(current), instruction }),
|
|
152
153
|
schema: restyleMapperSchema,
|
|
154
|
+
...(timeoutMs === undefined ? {} : { timeoutMs }),
|
|
153
155
|
});
|
|
154
156
|
if (rRaw.isErr())
|
|
155
157
|
return Result.Err(rRaw);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restyle-nudge.js","sourceRoot":"","sources":["../../jsr/intern/restyle-nudge.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,mBAAmB,GAIpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKtD,MAAM,kBAAkB,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"restyle-nudge.js","sourceRoot":"","sources":["../../jsr/intern/restyle-nudge.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,mBAAmB,GAIpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKtD,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAiBhC,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,CAAC;AAGpD,MAAM,WAAW,GAAyB,CAAC,WAAW,EAAE,qBAAqB,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;AAG3G,SAAS,WAAW,CAAC,GAAW;IAC9B,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;AAC5C,CAAC;AAID,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAW,EAAE;IAC7C,MAAM,OAAO,GAAG,CAAC,GAAG,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC;IAChI,OAAO,IAAI,MAAM,CAAC,SAAS,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AASH,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,oBAAoB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAOD,KAAK,UAAU,cAAc,CAAC,IAAoB;IAChD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,OAAO,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IACpF,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACxF,OAAO,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC/B,CAAC;AAKD,KAAK,UAAU,cAAc,CAC3B,IAAoB,EACpB,EACE,KAAK,EACL,OAAO,EACP,MAAM,EACN,SAAS,GAAG,kBAAkB,GAS/B;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAC/C,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,oCAAoC,SAAS,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAClG,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACxC,OAAO,CAAC,IAAI,CAAC;QACX,MAAM,CAAC,OAAO,EAAE;YACd,KAAK;YACL,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM;YAG9B,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE;YAGpC,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE;SACtD,CAAC;QACF,OAAO;KACR,CAAC,CACH,CAAC;IACF,IAAI,KAAK,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;IACvB,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;IAC/G,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC,CAAC;IACnE,IAAI,OAAO,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,8BAA8B,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtF,OAAO,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AACjC,CAAC;AAQD,KAAK,UAAU,YAAY,CAAC,IAAoB,EAAE,MAAc;IAC9D,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3D,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnB,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QACrG,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,CAAC;AACvC,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAoB,EACpB,EAAE,MAAM,EAAE,MAAM,EAAsC;IAEtD,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAK,KAAK;QAAE,OAAO,SAAS,CAAC;IAC3D,IAAI,CAAC,MAAM,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,KAAK;QAAE,OAAO,SAAS,CAAC;IACnE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnB,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;QACvH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE;QACtC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE;QAClB,OAAO,EAAE,wBAAwB,CAAC,MAAM,CAAC;QACzC,MAAM,EAAE,mBAAmB;KAC5B,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;QACjB,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;QAChH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACjD,IAAI,SAAS,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;QACrC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC;aACrC,IAAI,EAAE;aACN,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;aAC7B,GAAG,CAAC,mDAAmD,CAAC,CAAC;QAC5D,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,sBAAsB,CAAC,SAAS,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAU,EAAE,EAAU,EAAU,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAG7F,MAAM,UAAU,oBAAoB,CAAC,KAAY;IAC/C,MAAM,IAAI,GAAwB,KAAK,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,EAAE,SAAS,IAAI;QAC5C,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,GAAG;QACb,WAAW,EAAE,GAAG;QAChB,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,GAAG;QACd,MAAM,EAAE,qBAA8B;KACvC,CAAC;IACF,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC;IAClC,OAAO;QACL,IAAI;QACJ,SAAS;QACT,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,QAAQ;QAC5B,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;QAC1C,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;KAClD,CAAC;AACJ,CAAC;AAyBD,MAAM,UAAU,mBAAmB,CAAC,EAClC,OAAO,EACP,QAAQ,EACR,QAAQ,GAKT;IACC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IACpC,MAAM,YAAY,GAAwB,CAAC,GAAG,EAAE;QAC9C,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC7C,MAAM,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QACjG,MAAM,OAAO,GAAG,CAAC,CAA8C,EAA0B,EAAE,CACzF,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC3H,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACzB,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,IAAI,YAAY,CAAC,CAAC;IAE3F,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,WAAW,EAAE,SAAS,CAAC,MAAM,IAAI,qBAAqB,CAAC;IAEhH,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC;IAKhI,MAAM,WAAW,GAAkC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC;IAC1E,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;IAE1E,OAAO;QACL,OAAO,EAAE;YACP,IAAI;YACJ,SAAS,EAAE;gBACT,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC9C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;gBAClD,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;gBACxD,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;gBACxD,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;gBACpD,MAAM;aACP;SACF;QACD,IAAI;QACJ,QAAQ,EAAE;YACR,GAAG,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YACzE,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC;SACvF;KACF,CAAC;AACJ,CAAC;AAYD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAoB,EACpB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAA+E;IAExH,IAAI,CAAC,MAAM,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,KAAK;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;IAClH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE;QACtC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE;QAClB,OAAO,EAAE,wBAAwB,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;QAC1F,MAAM,EAAE,mBAAmB;QAC3B,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;KAClD,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACjD,IAAI,SAAS,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC,GAAG,CAAC,4CAA4C,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IACrF,CAAC;IACD,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IACjD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;IAChG,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,KAAK,EAAE,mBAAmB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,mBAAmB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/G,WAAW;KACZ,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-svc",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.7",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./index.js",
|
|
@@ -30,18 +30,18 @@
|
|
|
30
30
|
"@libsql/client": "~0.17.4",
|
|
31
31
|
"@neondatabase/serverless": "~1.1.0",
|
|
32
32
|
"@noble/hashes": "~2.3.0",
|
|
33
|
-
"@vibes.diy/api-pkg": "14.0.
|
|
34
|
-
"@vibes.diy/api-sql": "14.0.
|
|
35
|
-
"@vibes.diy/api-types": "14.0.
|
|
36
|
-
"@vibes.diy/call-ai-v2": "14.0.
|
|
37
|
-
"@vibes.diy/identity": "14.0.
|
|
38
|
-
"@vibes.diy/prompts": "14.0.
|
|
39
|
-
"@vibes.diy/vibe-db-explorer": "14.0.
|
|
40
|
-
"@vibes.diy/vibe-runtime": "14.0.
|
|
41
|
-
"@vibes.diy/vibe-types": "14.0.
|
|
33
|
+
"@vibes.diy/api-pkg": "14.0.7",
|
|
34
|
+
"@vibes.diy/api-sql": "14.0.7",
|
|
35
|
+
"@vibes.diy/api-types": "14.0.7",
|
|
36
|
+
"@vibes.diy/call-ai-v2": "14.0.7",
|
|
37
|
+
"@vibes.diy/identity": "14.0.7",
|
|
38
|
+
"@vibes.diy/prompts": "14.0.7",
|
|
39
|
+
"@vibes.diy/vibe-db-explorer": "14.0.7",
|
|
40
|
+
"@vibes.diy/vibe-runtime": "14.0.7",
|
|
41
|
+
"@vibes.diy/vibe-types": "14.0.7",
|
|
42
42
|
"acorn": "~8.17.0",
|
|
43
43
|
"arktype": "~2.2.3",
|
|
44
|
-
"call-ai": "14.0.
|
|
44
|
+
"call-ai": "14.0.7",
|
|
45
45
|
"charwise": "~3.0.1",
|
|
46
46
|
"cookie": "~2.0.1",
|
|
47
47
|
"csv-parse": "~7.0.2",
|