vibes-diy 14.3.319 → 14.3.320
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.
|
@@ -7,6 +7,7 @@ export interface AgentPictureDownloadCtx {
|
|
|
7
7
|
readonly fetch?: typeof globalThis.fetch;
|
|
8
8
|
readonly dir?: string;
|
|
9
9
|
readonly path?: string;
|
|
10
|
+
readonly sleep?: (ms: number) => Promise<void>;
|
|
10
11
|
}
|
|
11
12
|
export declare function assetCookieFrom(setCookie: string | null | undefined): string | undefined;
|
|
12
13
|
export declare function agentPictureSafeName(picture: Pick<AgentPicture, "name">): string;
|
|
@@ -5,6 +5,9 @@ import { Result, URI, exception2Result } from "@adviser/cement";
|
|
|
5
5
|
import { AGENT_PICTURE_MAX_BYTES } from "@vibes.diy/api-types";
|
|
6
6
|
const ASSET_COOKIE = "vibes-asset-session";
|
|
7
7
|
const PICTURE_TIMEOUT_MS = 30_000;
|
|
8
|
+
const ASSET_STATE_HEADER = "x-vibes-asset-state";
|
|
9
|
+
const UPLOAD_ID_HEADER = "x-vibes-upload-id";
|
|
10
|
+
const HELD_RETRY_DELAYS_MS = [1_000, 2_000, 3_000, 4_000, 5_000, 5_000];
|
|
8
11
|
export function assetCookieFrom(setCookie) {
|
|
9
12
|
if (setCookie === null || setCookie === undefined)
|
|
10
13
|
return undefined;
|
|
@@ -14,39 +17,90 @@ export function assetCookieFrom(setCookie) {
|
|
|
14
17
|
export function agentPictureSafeName(picture) {
|
|
15
18
|
return picture.name.replace(/[^A-Za-z0-9._-]/g, "_").replace(/^\.+/, "") || "picture";
|
|
16
19
|
}
|
|
20
|
+
function heldState(res, picture) {
|
|
21
|
+
const state = res.headers.get(ASSET_STATE_HEADER)?.trim().toLowerCase();
|
|
22
|
+
if (state === "high")
|
|
23
|
+
return "blocked";
|
|
24
|
+
if (state === "pending" || state === "error")
|
|
25
|
+
return "held";
|
|
26
|
+
const type = res.headers.get("content-type")?.split(";")[0].trim().toLowerCase();
|
|
27
|
+
if (type === "image/svg+xml" && picture.mimeType.toLowerCase() !== "image/svg+xml")
|
|
28
|
+
return "held";
|
|
29
|
+
return "ok";
|
|
30
|
+
}
|
|
17
31
|
export async function downloadAgentPicture(ctx, picture) {
|
|
18
32
|
const doFetch = ctx.fetch ?? ((input, init) => fetch(input, init));
|
|
33
|
+
const sleep = ctx.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
|
|
19
34
|
const rOrigin = exception2Result(() => {
|
|
20
35
|
const u = URI.from(picture.url);
|
|
21
36
|
return `${u.protocol}//${u.hostname}${u.port === "" ? "" : `:${u.port}`}`;
|
|
22
37
|
});
|
|
23
38
|
if (rOrigin.isErr())
|
|
24
39
|
return Result.Err(`picture url ${picture.url} is not a URL`);
|
|
40
|
+
const rExpected = exception2Result(() => URI.from(picture.url).getParam("v"));
|
|
41
|
+
const expectedUploadId = rExpected.isOk() && rExpected.Ok() ? rExpected.Ok() : undefined;
|
|
25
42
|
const rToken = await ctx.getToken();
|
|
26
43
|
if (rToken.isErr())
|
|
27
44
|
return Result.Err(`not signed in: ${rToken.Err().message}`);
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
return Result.
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
45
|
+
const token = rToken.Ok().token;
|
|
46
|
+
const mintCookie = async () => {
|
|
47
|
+
const rSession = await exception2Result(() => doFetch(`${rOrigin.Ok()}/_auth/session`, {
|
|
48
|
+
method: "POST",
|
|
49
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
50
|
+
signal: AbortSignal.timeout(PICTURE_TIMEOUT_MS),
|
|
51
|
+
}));
|
|
52
|
+
if (rSession.isErr())
|
|
53
|
+
return Result.Err(`asset session: ${rSession.Err().message}`);
|
|
54
|
+
if (!rSession.Ok().ok)
|
|
55
|
+
return Result.Err(`asset session answered ${rSession.Ok().status}`);
|
|
56
|
+
const cookie = assetCookieFrom(rSession.Ok().headers.get("set-cookie"));
|
|
57
|
+
if (cookie === undefined)
|
|
58
|
+
return Result.Err("asset session set no cookie");
|
|
59
|
+
return Result.Ok(cookie);
|
|
60
|
+
};
|
|
61
|
+
const rCookie = await mintCookie();
|
|
62
|
+
if (rCookie.isErr())
|
|
63
|
+
return Result.Err(rCookie.Err().message);
|
|
64
|
+
let cookie = rCookie.Ok();
|
|
65
|
+
let reminted = false;
|
|
66
|
+
let held = 0;
|
|
67
|
+
let bytes;
|
|
68
|
+
while (bytes === undefined) {
|
|
69
|
+
const rGet = await exception2Result(() => doFetch(picture.url, { headers: { Cookie: cookie }, signal: AbortSignal.timeout(PICTURE_TIMEOUT_MS) }));
|
|
70
|
+
if (rGet.isErr())
|
|
71
|
+
return Result.Err(`picture fetch: ${rGet.Err().message}`);
|
|
72
|
+
const res = rGet.Ok();
|
|
73
|
+
if ((res.status === 401 || res.status === 403) && held > 0 && !reminted) {
|
|
74
|
+
reminted = true;
|
|
75
|
+
const rFresh = await mintCookie();
|
|
76
|
+
if (rFresh.isErr())
|
|
77
|
+
return Result.Err(rFresh.Err().message);
|
|
78
|
+
cookie = rFresh.Ok();
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
if (!res.ok)
|
|
82
|
+
return Result.Err(`picture answered ${res.status}`);
|
|
83
|
+
const served = res.headers.get(UPLOAD_ID_HEADER)?.trim();
|
|
84
|
+
if (expectedUploadId !== undefined && served !== undefined && served !== "" && served !== expectedUploadId) {
|
|
85
|
+
await exception2Result(() => res.arrayBuffer());
|
|
86
|
+
return Result.Err("picture changed in the app before it could be sent");
|
|
87
|
+
}
|
|
88
|
+
const state = heldState(res, picture);
|
|
89
|
+
if (state === "blocked")
|
|
90
|
+
return Result.Err("picture was blocked by the safety check");
|
|
91
|
+
if (state === "held") {
|
|
92
|
+
await exception2Result(() => res.arrayBuffer());
|
|
93
|
+
if (held >= HELD_RETRY_DELAYS_MS.length)
|
|
94
|
+
return Result.Err("picture is still being checked; it is waiting in the app");
|
|
95
|
+
await sleep(HELD_RETRY_DELAYS_MS[held]);
|
|
96
|
+
held++;
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
const rBody = await exception2Result(() => res.arrayBuffer());
|
|
100
|
+
if (rBody.isErr())
|
|
101
|
+
return Result.Err(`picture body: ${rBody.Err().message}`);
|
|
102
|
+
bytes = new Uint8Array(rBody.Ok());
|
|
103
|
+
}
|
|
50
104
|
if (bytes.byteLength === 0)
|
|
51
105
|
return Result.Err("picture was empty");
|
|
52
106
|
if (bytes.byteLength > AGENT_PICTURE_MAX_BYTES)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-picture-download.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/agent-picture-download.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAqB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-picture-download.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/agent-picture-download.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { readFileSync, mkdtempSync } from "node:fs";
|
|
2
|
+
import { readFileSync, mkdtempSync, readdirSync } from "node:fs";
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { Result } from "@adviser/cement";
|
|
@@ -84,4 +84,104 @@ describe("downloadAgentPicture body failures", () => {
|
|
|
84
84
|
expect(r.Err().message).toContain("picture body");
|
|
85
85
|
});
|
|
86
86
|
});
|
|
87
|
+
describe("downloadAgentPicture while the safety check holds the picture", () => {
|
|
88
|
+
const png = {
|
|
89
|
+
...picture,
|
|
90
|
+
url: "https://assets.example.test/_files/vg-1/hello-wall/photos/p1/apple.png",
|
|
91
|
+
mimeType: "image/png",
|
|
92
|
+
name: "apple.png",
|
|
93
|
+
};
|
|
94
|
+
const placeholder = () => new Response('<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><rect fill="#d9d9d9"/></svg>', {
|
|
95
|
+
status: 200,
|
|
96
|
+
headers: { "content-type": "image/svg+xml", "x-vibes-asset-state": "pending" },
|
|
97
|
+
});
|
|
98
|
+
const real = () => new Response(new Uint8Array([9, 8, 7]), {
|
|
99
|
+
status: 200,
|
|
100
|
+
headers: { "content-type": "image/png", "x-vibes-asset-state": "low" },
|
|
101
|
+
});
|
|
102
|
+
function fetchOf(answers) {
|
|
103
|
+
const gets = [];
|
|
104
|
+
let sessions = 0;
|
|
105
|
+
const fetch = (async (url, init) => {
|
|
106
|
+
if (url.endsWith("/_auth/session")) {
|
|
107
|
+
sessions++;
|
|
108
|
+
return new Response("{}", { status: 200, headers: { "set-cookie": "vibes-asset-session=tok" } });
|
|
109
|
+
}
|
|
110
|
+
gets.push(init ?? {});
|
|
111
|
+
const next = answers.length > 1 ? answers.shift() : answers[0];
|
|
112
|
+
return next();
|
|
113
|
+
});
|
|
114
|
+
return { fetch, gets, sessions: () => sessions };
|
|
115
|
+
}
|
|
116
|
+
const token = () => Promise.resolve(Result.Ok({ token: "t" }));
|
|
117
|
+
const recorder = () => {
|
|
118
|
+
const slept = [];
|
|
119
|
+
return { slept, sleep: (ms) => (slept.push(ms), Promise.resolve()) };
|
|
120
|
+
};
|
|
121
|
+
it("waits out a held answer and saves the real bytes once it clears", async () => {
|
|
122
|
+
const f = fetchOf([placeholder, placeholder, real]);
|
|
123
|
+
const s = recorder();
|
|
124
|
+
const dir = mkdtempSync(join(tmpdir(), "agent-picture-held-"));
|
|
125
|
+
const r = await downloadAgentPicture({ getToken: token, fetch: f.fetch, dir, sleep: s.sleep }, png);
|
|
126
|
+
expect(r.isOk()).toBe(true);
|
|
127
|
+
expect([...readFileSync(r.Ok())]).toEqual([9, 8, 7]);
|
|
128
|
+
expect(f.gets).toHaveLength(3);
|
|
129
|
+
expect(s.slept).toHaveLength(2);
|
|
130
|
+
expect(f.sessions()).toBe(1);
|
|
131
|
+
expect(f.gets.every((g) => g.headers.Cookie === "vibes-asset-session=tok")).toBe(true);
|
|
132
|
+
});
|
|
133
|
+
it("refuses a picture the record replaced while it waited, and keeps the one the receipt names", async () => {
|
|
134
|
+
const pinned = { ...png, url: `${png.url}?v=u1` };
|
|
135
|
+
const as = (id) => () => new Response(new Uint8Array([5]), {
|
|
136
|
+
status: 200,
|
|
137
|
+
headers: { "content-type": "image/png", "x-vibes-asset-state": "low", "x-vibes-upload-id": id },
|
|
138
|
+
});
|
|
139
|
+
const dir = mkdtempSync(join(tmpdir(), "agent-picture-held-"));
|
|
140
|
+
const swapped = await downloadAgentPicture({ getToken: token, fetch: fetchOf([placeholder, as("u2")]).fetch, dir, sleep: recorder().sleep }, pinned);
|
|
141
|
+
expect(swapped.isErr()).toBe(true);
|
|
142
|
+
expect(swapped.Err().message).toContain("changed");
|
|
143
|
+
expect(readdirSync(dir)).toEqual([]);
|
|
144
|
+
const same = await downloadAgentPicture({ getToken: token, fetch: fetchOf([placeholder, as("u1")]).fetch, dir, sleep: recorder().sleep }, pinned);
|
|
145
|
+
expect(same.isOk()).toBe(true);
|
|
146
|
+
});
|
|
147
|
+
it("gives up with a clear Err after a bounded wait and writes nothing", async () => {
|
|
148
|
+
const f = fetchOf([placeholder]);
|
|
149
|
+
const s = recorder();
|
|
150
|
+
const dir = mkdtempSync(join(tmpdir(), "agent-picture-held-"));
|
|
151
|
+
const r = await downloadAgentPicture({ getToken: token, fetch: f.fetch, dir, sleep: s.sleep }, png);
|
|
152
|
+
expect(r.isErr()).toBe(true);
|
|
153
|
+
expect(r.Err().message).toContain("still being checked");
|
|
154
|
+
expect(s.slept.length).toBeGreaterThan(0);
|
|
155
|
+
expect(s.slept.reduce((a, b) => a + b, 0)).toBeLessThanOrEqual(20_000);
|
|
156
|
+
expect(readdirSync(dir)).toEqual([]);
|
|
157
|
+
});
|
|
158
|
+
it("treats an SVG answer for a PNG picture as held even without the state header", async () => {
|
|
159
|
+
const bare = () => new Response("<svg/>", { status: 200, headers: { "content-type": "image/svg+xml" } });
|
|
160
|
+
const f = fetchOf([bare, real]);
|
|
161
|
+
const dir = mkdtempSync(join(tmpdir(), "agent-picture-held-"));
|
|
162
|
+
const r = await downloadAgentPicture({ getToken: token, fetch: f.fetch, dir, sleep: recorder().sleep }, png);
|
|
163
|
+
expect(r.isOk()).toBe(true);
|
|
164
|
+
expect([...readFileSync(r.Ok())]).toEqual([9, 8, 7]);
|
|
165
|
+
expect(f.gets).toHaveLength(2);
|
|
166
|
+
});
|
|
167
|
+
it("errs at once on a blocked picture, without retrying", async () => {
|
|
168
|
+
const blocked = () => new Response(new Uint8Array([1]), { status: 200, headers: { "content-type": "image/webp", "x-vibes-asset-state": "high" } });
|
|
169
|
+
const f = fetchOf([blocked]);
|
|
170
|
+
const s = recorder();
|
|
171
|
+
const dir = mkdtempSync(join(tmpdir(), "agent-picture-held-"));
|
|
172
|
+
const r = await downloadAgentPicture({ getToken: token, fetch: f.fetch, dir, sleep: s.sleep }, png);
|
|
173
|
+
expect(r.isErr()).toBe(true);
|
|
174
|
+
expect(r.Err().message).toContain("blocked");
|
|
175
|
+
expect(f.gets).toHaveLength(1);
|
|
176
|
+
expect(s.slept).toEqual([]);
|
|
177
|
+
expect(readdirSync(dir)).toEqual([]);
|
|
178
|
+
});
|
|
179
|
+
it("mints a fresh asset session when a retry's cookie is refused", async () => {
|
|
180
|
+
const f = fetchOf([placeholder, () => new Response("no", { status: 401 }), real]);
|
|
181
|
+
const dir = mkdtempSync(join(tmpdir(), "agent-picture-held-"));
|
|
182
|
+
const r = await downloadAgentPicture({ getToken: token, fetch: f.fetch, dir, sleep: recorder().sleep }, png);
|
|
183
|
+
expect(r.isOk()).toBe(true);
|
|
184
|
+
expect(f.sessions()).toBe(2);
|
|
185
|
+
});
|
|
186
|
+
});
|
|
87
187
|
//# sourceMappingURL=agent-picture-download.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-picture-download.test.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/agent-picture-download.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-picture-download.test.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/agent-picture-download.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEpF,MAAM,OAAO,GAAiB;IAC5B,GAAG,EAAE,6EAA6E;IAClF,QAAQ,EAAE,YAAY;IACtB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,CAAC;IACP,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,eAAe,CAAC,2DAA2D,CAAC,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACzH,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACnD,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0FAA0F,EAAE,KAAK,IAAI,EAAE;QACxG,MAAM,KAAK,GAA0C,EAAE,CAAC;QACxD,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,GAAW,EAAE,IAAkB,EAAE,EAAE;YACvD,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YAC7D,IAAI,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAChC,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,mCAAmC,EAAE,EAAE,CAAC,CAAC;YAC7G,OAAO,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7G,CAAC,CAA4B,CAAC;QAC9B,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAClC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EACjF,OAAO,CACR,CAAC;QACF,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,2CAA2C,EAAE,CAAC,CAAC;QACrF,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAkC,EAAC,aAAa,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACjG,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAkC,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE,CACnC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5B,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC;YAC3F,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;QACtE,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;QACrH,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,+DAA+D,EAAE,GAAG,EAAE;IAC7E,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE,CACnC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC5B,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC;QAC3F,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;IAE3F,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACjF,MAAM,GAAG,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACxF,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,CAAC,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAClD,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE,CACnC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5B,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC;YAC3F,CAAC,CAAC,IAAI,QAAQ,CACV,IAAI,cAAc,CAAC;gBACjB,KAAK,CAAC,CAAC;oBACL,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBAC3C,CAAC;aACF,CAAC,EACF,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CAA4B,CAAC;QACpC,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAClC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EACrE;YACE,GAAG,EAAE,kDAAkD;YACvD,QAAQ,EAAE,WAAW;YACrB,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,CAAC;YACP,WAAW,EAAE,GAAG;YAChB,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,GAAG;SACX,CACF,CAAC;QACF,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,+DAA+D,EAAE,GAAG,EAAE;IAC7E,MAAM,GAAG,GAAiB;QACxB,GAAG,OAAO;QACV,GAAG,EAAE,wEAAwE;QAC7E,QAAQ,EAAE,WAAW;QACrB,IAAI,EAAE,WAAW;KAClB,CAAC;IACF,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,IAAI,QAAQ,CAAC,6FAA6F,EAAE;QAC1G,MAAM,EAAE,GAAG;QACX,OAAO,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,qBAAqB,EAAE,SAAS,EAAE;KAC/E,CAAC,CAAC;IACL,MAAM,IAAI,GAAG,GAAG,EAAE,CAChB,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;QACtC,MAAM,EAAE,GAAG;QACX,OAAO,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,qBAAqB,EAAE,KAAK,EAAE;KACvE,CAAC,CAAC;IACL,SAAS,OAAO,CAAC,OAA2B;QAC1C,MAAM,IAAI,GAAkB,EAAE,CAAC;QAC/B,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,GAAW,EAAE,IAAkB,EAAE,EAAE;YACvD,IAAI,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACnC,QAAQ,EAAE,CAAC;gBACX,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;YACnG,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/D,OAAQ,IAAuB,EAAE,CAAC;QACpC,CAAC,CAA4B,CAAC;QAC9B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IACnD,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;IAC/E,CAAC,CAAC;IAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;QACpG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,OAAkC,CAAC,MAAM,KAAK,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4FAA4F,EAAE,KAAK,IAAI,EAAE;QAC1G,MAAM,MAAM,GAAiB,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,GAAG,OAAO,EAAE,CAAC;QAChE,MAAM,EAAE,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,GAAG,EAAE,CAC9B,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YAChC,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,qBAAqB,EAAE,KAAK,EAAE,mBAAmB,EAAE,EAAE,EAAE;SAChG,CAAC,CAAC;QACL,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,MAAM,oBAAoB,CACxC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAChG,MAAM,CACP,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,oBAAoB,CACrC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAChG,MAAM,CACP,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;QACpG,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QACzD,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACvE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;QACzG,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAChC,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7G,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,OAAO,GAAG,GAAG,EAAE,CACnB,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAC/H,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;QACpG,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC5E,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAClF,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7G,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vibes-diy",
|
|
3
|
-
"version": "14.3.
|
|
3
|
+
"version": "14.3.320",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"description": "Command-line tool for vibes.diy — generate, edit, pull, push, and publish AI-built apps",
|
|
@@ -41,13 +41,13 @@
|
|
|
41
41
|
"@neondatabase/serverless": "~1.2.0",
|
|
42
42
|
"@noble/hashes": "~2.4.0",
|
|
43
43
|
"@shadcn/lint": "~0.2.3",
|
|
44
|
-
"@vibes.diy/api-impl": "14.3.
|
|
45
|
-
"@vibes.diy/api-types": "14.3.
|
|
46
|
-
"@vibes.diy/call-ai-v2": "14.3.
|
|
47
|
-
"@vibes.diy/cmd-harness": "14.3.
|
|
48
|
-
"@vibes.diy/cmd-tools": "14.3.
|
|
49
|
-
"@vibes.diy/identity": "14.3.
|
|
50
|
-
"@vibes.diy/prompts": "14.3.
|
|
44
|
+
"@vibes.diy/api-impl": "14.3.320",
|
|
45
|
+
"@vibes.diy/api-types": "14.3.320",
|
|
46
|
+
"@vibes.diy/call-ai-v2": "14.3.320",
|
|
47
|
+
"@vibes.diy/cmd-harness": "14.3.320",
|
|
48
|
+
"@vibes.diy/cmd-tools": "14.3.320",
|
|
49
|
+
"@vibes.diy/identity": "14.3.320",
|
|
50
|
+
"@vibes.diy/prompts": "14.3.320",
|
|
51
51
|
"acorn": "~8.19.0",
|
|
52
52
|
"acorn-jsx": "~5.3.2",
|
|
53
53
|
"arktype": "~2.2.9",
|