vibes-diy 2.2.12 → 2.2.13-dev.1
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/cli/cmd-evento.js +18 -1
- package/cli/cmd-evento.js.map +1 -1
- package/cli/cmd-evento.test.d.ts +1 -0
- package/cli/cmd-evento.test.js +11 -0
- package/cli/cmd-evento.test.js.map +1 -0
- package/cli/cmds/db/del-cmd.d.ts +42 -0
- package/cli/cmds/db/del-cmd.js +83 -0
- package/cli/cmds/db/del-cmd.js.map +1 -0
- package/cli/cmds/db/get-cmd.d.ts +43 -0
- package/cli/cmds/db/get-cmd.js +85 -0
- package/cli/cmds/db/get-cmd.js.map +1 -0
- package/cli/cmds/db/index.d.ts +188 -0
- package/cli/cmds/db/index.js +28 -0
- package/cli/cmds/db/index.js.map +1 -0
- package/cli/cmds/db/list-cmd.d.ts +37 -0
- package/cli/cmds/db/list-cmd.js +65 -0
- package/cli/cmds/db/list-cmd.js.map +1 -0
- package/cli/cmds/db/put-cmd.d.ts +45 -0
- package/cli/cmds/db/put-cmd.js +99 -0
- package/cli/cmds/db/put-cmd.js.map +1 -0
- package/cli/cmds/db/query-cmd.d.ts +58 -0
- package/cli/cmds/db/query-cmd.js +166 -0
- package/cli/cmds/db/query-cmd.js.map +1 -0
- package/cli/cmds/db/shared.d.ts +15 -0
- package/cli/cmds/db/shared.js +42 -0
- package/cli/cmds/db/shared.js.map +1 -0
- package/cli/cmds/db/subscribe-cmd.d.ts +32 -0
- package/cli/cmds/db/subscribe-cmd.js +66 -0
- package/cli/cmds/db/subscribe-cmd.js.map +1 -0
- package/cli/cmds/edit-cmd.d.ts +52 -0
- package/cli/cmds/edit-cmd.js +222 -0
- package/cli/cmds/edit-cmd.js.map +1 -0
- package/cli/cmds/edit-cmd.test.d.ts +1 -0
- package/cli/cmds/edit-cmd.test.js +297 -0
- package/cli/cmds/edit-cmd.test.js.map +1 -0
- package/cli/cmds/resolve-section-stream.test.js +20 -0
- package/cli/cmds/resolve-section-stream.test.js.map +1 -1
- package/cli/main.js +29 -0
- package/cli/main.js.map +1 -1
- package/package.json +6 -5
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
import { command, flag, option, positional, string } from "cmd-ts";
|
|
2
|
+
import { writeFile } from "fs/promises";
|
|
3
|
+
import { join } from "path";
|
|
4
|
+
import { Result, Option, exception2Result, } from "@adviser/cement";
|
|
5
|
+
import { type } from "arktype";
|
|
6
|
+
import { isResError, isSectionEvent } from "@vibes.diy/api-types";
|
|
7
|
+
import { cmdTsDefaultArgs } from "../cli-ctx.js";
|
|
8
|
+
import { sendMsg, sendProgress } from "../cmd-evento.js";
|
|
9
|
+
import { resolveUserSlug } from "../resolve-user-slug.js";
|
|
10
|
+
import { resolveSectionStream } from "./resolve-section-stream.js";
|
|
11
|
+
import { readProjectFiles, pushFromDir } from "./push-from-dir.js";
|
|
12
|
+
import { formatErr } from "./format-err.js";
|
|
13
|
+
import { formatNoFilesError } from "./format-no-files-error.js";
|
|
14
|
+
export const ResEdit = type({
|
|
15
|
+
type: "'use-vibes.cli.res-edit'",
|
|
16
|
+
appSlug: "string",
|
|
17
|
+
userSlug: "string",
|
|
18
|
+
url: "string",
|
|
19
|
+
directory: "string",
|
|
20
|
+
});
|
|
21
|
+
export function isResEdit(obj) {
|
|
22
|
+
return !(ResEdit(obj) instanceof type.errors);
|
|
23
|
+
}
|
|
24
|
+
export const ReqEdit = type({
|
|
25
|
+
type: "'use-vibes.cli.edit'",
|
|
26
|
+
appSlug: "string",
|
|
27
|
+
prompt: "string",
|
|
28
|
+
userSlug: "string",
|
|
29
|
+
instantJoin: "boolean",
|
|
30
|
+
verbose: "boolean",
|
|
31
|
+
dir: "string",
|
|
32
|
+
apiUrl: "string",
|
|
33
|
+
});
|
|
34
|
+
export function isReqEdit(obj) {
|
|
35
|
+
return !(ReqEdit(obj) instanceof type.errors);
|
|
36
|
+
}
|
|
37
|
+
export async function readSeedFilesFromDir(dir) {
|
|
38
|
+
const rFiles = await exception2Result(() => readProjectFiles(dir));
|
|
39
|
+
if (rFiles.isErr()) {
|
|
40
|
+
return Result.Err(`Failed to read edit directory: ${rFiles.Err().message}`);
|
|
41
|
+
}
|
|
42
|
+
return Result.Ok(new Map(rFiles.Ok().flatMap((file) => {
|
|
43
|
+
if (!("content" in file) || typeof file.content !== "string")
|
|
44
|
+
return [];
|
|
45
|
+
return [[file.filename.startsWith("/") ? file.filename.slice(1) : file.filename, file.content]];
|
|
46
|
+
})));
|
|
47
|
+
}
|
|
48
|
+
export const editEvento = {
|
|
49
|
+
hash: "use-vibes.cli.edit",
|
|
50
|
+
validate: (ctx) => {
|
|
51
|
+
if (isReqEdit(ctx.enRequest)) {
|
|
52
|
+
return Promise.resolve(Result.Ok(Option.Some(ctx.enRequest)));
|
|
53
|
+
}
|
|
54
|
+
return Promise.resolve(Result.Ok(Option.None()));
|
|
55
|
+
},
|
|
56
|
+
handle: async (ctx) => {
|
|
57
|
+
const ectx = ctx.ctx.getOrThrow("cliCtx");
|
|
58
|
+
if (ectx.vibesDiyApiFactory === undefined) {
|
|
59
|
+
return Result.Err("Not logged in. Run 'use-vibes login' first.");
|
|
60
|
+
}
|
|
61
|
+
const args = ctx.validated;
|
|
62
|
+
const api = ectx.vibesDiyApiFactory(args.apiUrl);
|
|
63
|
+
const userSlug = await resolveUserSlug(api, args.userSlug === "" ? undefined : args.userSlug);
|
|
64
|
+
const dir = args.dir === "" ? process.cwd() : args.dir;
|
|
65
|
+
const rSeed = await readSeedFilesFromDir(dir);
|
|
66
|
+
if (rSeed.isErr()) {
|
|
67
|
+
return Result.Err(rSeed.Err());
|
|
68
|
+
}
|
|
69
|
+
await sendProgress(ctx, "info", "Editing...");
|
|
70
|
+
const rChat = await api.openChat({
|
|
71
|
+
userSlug,
|
|
72
|
+
appSlug: args.appSlug,
|
|
73
|
+
mode: "chat",
|
|
74
|
+
});
|
|
75
|
+
if (rChat.isErr()) {
|
|
76
|
+
return Result.Err(`Failed to open chat: ${formatErr(rChat.Err())}`);
|
|
77
|
+
}
|
|
78
|
+
const chat = rChat.Ok();
|
|
79
|
+
const rPrompt = await chat.prompt({
|
|
80
|
+
messages: [{ role: "user", content: [{ type: "text", text: args.prompt }] }],
|
|
81
|
+
});
|
|
82
|
+
if (rPrompt.isErr()) {
|
|
83
|
+
return Result.Err(`Failed to send prompt: ${formatErr(rPrompt.Err())}`);
|
|
84
|
+
}
|
|
85
|
+
const upstreamErrors = [];
|
|
86
|
+
let sectionEventCount = 0;
|
|
87
|
+
let blockCount = 0;
|
|
88
|
+
let streamedBytes = 0;
|
|
89
|
+
const sectionOnly = chat.sectionStream.pipeThrough(new TransformStream({
|
|
90
|
+
transform(msg, controller) {
|
|
91
|
+
if (isSectionEvent(msg)) {
|
|
92
|
+
sectionEventCount += 1;
|
|
93
|
+
blockCount += msg.blocks.length;
|
|
94
|
+
streamedBytes += JSON.stringify(msg).length;
|
|
95
|
+
controller.enqueue(msg);
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
if (isResError(msg)) {
|
|
99
|
+
upstreamErrors.push(msg);
|
|
100
|
+
if (args.verbose) {
|
|
101
|
+
const code = msg.error?.code ? ` [${msg.error.code}]` : "";
|
|
102
|
+
process.stderr.write(`[upstream-error]${code} ${msg.error?.message ?? "(no message)"}\n`);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
},
|
|
106
|
+
}));
|
|
107
|
+
const rResolved = await resolveSectionStream({
|
|
108
|
+
sectionStream: sectionOnly,
|
|
109
|
+
streamId: rPrompt.Ok().promptId,
|
|
110
|
+
seed: rSeed.Ok(),
|
|
111
|
+
onSnapshot: (snap) => {
|
|
112
|
+
if (args.verbose) {
|
|
113
|
+
process.stderr.write(`[${snap.source}] ${snap.path} (${snap.content.length} chars, ${snap.appliedSections} sections)\n`);
|
|
114
|
+
}
|
|
115
|
+
},
|
|
116
|
+
onError: (err) => {
|
|
117
|
+
if (args.verbose) {
|
|
118
|
+
for (const fail of err.failures) {
|
|
119
|
+
process.stderr.write(`[error] ${err.path}: ${fail.reason}${fail.search ? ` near ${fail.search.slice(0, 40)}` : ""}\n`);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
},
|
|
123
|
+
});
|
|
124
|
+
await chat.close();
|
|
125
|
+
if (rResolved.isErr()) {
|
|
126
|
+
return Result.Err(`Failed to resolve edited stream: ${rResolved.Err().message}`);
|
|
127
|
+
}
|
|
128
|
+
const resolved = rResolved.Ok();
|
|
129
|
+
if (Object.keys(resolved.files).length === 0) {
|
|
130
|
+
return Result.Err(formatNoFilesError({
|
|
131
|
+
sectionEventCount,
|
|
132
|
+
blockCount,
|
|
133
|
+
streamedBytes,
|
|
134
|
+
upstreamErrors: upstreamErrors.map((e) => ({
|
|
135
|
+
code: e.error?.code,
|
|
136
|
+
message: e.error?.message ?? "(no message)",
|
|
137
|
+
})),
|
|
138
|
+
applyErrors: resolved.errors,
|
|
139
|
+
}));
|
|
140
|
+
}
|
|
141
|
+
if (upstreamErrors.length > 0 && !args.verbose) {
|
|
142
|
+
const first = upstreamErrors[0];
|
|
143
|
+
const code = first.error?.code ? ` [${first.error.code}]` : "";
|
|
144
|
+
await sendProgress(ctx, "warn", `Upstream warning${code}: ${first.error?.message ?? "(no message)"}`);
|
|
145
|
+
}
|
|
146
|
+
if (resolved.errors.length > 0 && !args.verbose) {
|
|
147
|
+
await sendProgress(ctx, "warn", `Resolved with ${resolved.errors.length} apply error(s); rerun with --verbose for detail.`);
|
|
148
|
+
}
|
|
149
|
+
const pushAppSlug = chat.appSlug;
|
|
150
|
+
const pushUserSlug = chat.userSlug;
|
|
151
|
+
for (const [path, content] of Object.entries(resolved.files)) {
|
|
152
|
+
const filename = path.startsWith("/") ? path.slice(1) : path;
|
|
153
|
+
await writeFile(join(dir, filename), content, "utf-8");
|
|
154
|
+
}
|
|
155
|
+
const rPush = await pushFromDir({
|
|
156
|
+
dir,
|
|
157
|
+
mode: "production",
|
|
158
|
+
appSlug: pushAppSlug,
|
|
159
|
+
userSlug: pushUserSlug,
|
|
160
|
+
instantJoin: args.instantJoin,
|
|
161
|
+
apiUrl: args.apiUrl,
|
|
162
|
+
api,
|
|
163
|
+
ctx,
|
|
164
|
+
});
|
|
165
|
+
if (rPush.isErr())
|
|
166
|
+
return Result.Err(rPush.Err());
|
|
167
|
+
await sendProgress(ctx, "info", `Updated: ${dir}`);
|
|
168
|
+
return sendMsg(ctx, {
|
|
169
|
+
type: "use-vibes.cli.res-edit",
|
|
170
|
+
appSlug: pushAppSlug,
|
|
171
|
+
userSlug: pushUserSlug,
|
|
172
|
+
url: rPush.Ok().publicUrl,
|
|
173
|
+
directory: dir,
|
|
174
|
+
});
|
|
175
|
+
},
|
|
176
|
+
};
|
|
177
|
+
export function editCmd(ctx) {
|
|
178
|
+
return command({
|
|
179
|
+
name: "edit",
|
|
180
|
+
description: "Send a follow-up prompt to an existing vibe, write files to disk, and push live.",
|
|
181
|
+
args: {
|
|
182
|
+
...cmdTsDefaultArgs(ctx),
|
|
183
|
+
appSlug: positional({
|
|
184
|
+
displayName: "appSlug",
|
|
185
|
+
description: "Slug of the existing app/chat to edit",
|
|
186
|
+
type: string,
|
|
187
|
+
}),
|
|
188
|
+
prompt: positional({
|
|
189
|
+
displayName: "prompt",
|
|
190
|
+
description: "Follow-up prompt describing what to change",
|
|
191
|
+
type: string,
|
|
192
|
+
}),
|
|
193
|
+
userSlug: option({
|
|
194
|
+
long: "user-slug",
|
|
195
|
+
description: "User slug to publish under (uses default if omitted)",
|
|
196
|
+
type: string,
|
|
197
|
+
defaultValue: () => "",
|
|
198
|
+
defaultValueIsSerializable: true,
|
|
199
|
+
}),
|
|
200
|
+
instantJoin: flag({
|
|
201
|
+
long: "instant-join",
|
|
202
|
+
description: "Auto-accept database sharing view requests",
|
|
203
|
+
}),
|
|
204
|
+
verbose: flag({
|
|
205
|
+
long: "verbose",
|
|
206
|
+
short: "v",
|
|
207
|
+
description: "Stream AI response to stderr as it arrives",
|
|
208
|
+
}),
|
|
209
|
+
dir: option({
|
|
210
|
+
long: "dir",
|
|
211
|
+
description: "Directory to write resolved files and push from (defaults to cwd)",
|
|
212
|
+
type: string,
|
|
213
|
+
defaultValue: () => "",
|
|
214
|
+
defaultValueIsSerializable: true,
|
|
215
|
+
}),
|
|
216
|
+
},
|
|
217
|
+
handler: ctx.cliStream.enqueue((args) => {
|
|
218
|
+
return { type: "use-vibes.cli.edit", ...args };
|
|
219
|
+
}),
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
//# sourceMappingURL=edit-cmd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"edit-cmd.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/edit-cmd.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
import { mkdtemp, readFile, rm, writeFile } from "fs/promises";
|
|
2
|
+
import { tmpdir } from "os";
|
|
3
|
+
import { join } from "path";
|
|
4
|
+
import { AppContext, Result } from "@adviser/cement";
|
|
5
|
+
import { run } from "cmd-ts";
|
|
6
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
7
|
+
import { cmd_tsStream } from "../cmd-ts-stream.js";
|
|
8
|
+
import { editCmd, editEvento } from "./edit-cmd.js";
|
|
9
|
+
const tempDirs = [];
|
|
10
|
+
afterEach(async () => {
|
|
11
|
+
vi.restoreAllMocks();
|
|
12
|
+
for (const dir of tempDirs.splice(0)) {
|
|
13
|
+
await rm(dir, { recursive: true, force: true });
|
|
14
|
+
}
|
|
15
|
+
});
|
|
16
|
+
function blockBase(fields) {
|
|
17
|
+
return {
|
|
18
|
+
blockId: fields.blockId,
|
|
19
|
+
streamId: fields.streamId,
|
|
20
|
+
seq: fields.seq,
|
|
21
|
+
blockNr: fields.blockNr,
|
|
22
|
+
timestamp: new Date(),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
function codeBlockMessages(streamId, fx) {
|
|
26
|
+
const lang = "jsx";
|
|
27
|
+
const baseSeq = fx.blockNr * 100;
|
|
28
|
+
const messages = [];
|
|
29
|
+
messages.push({
|
|
30
|
+
type: "block.code.begin",
|
|
31
|
+
sectionId: fx.sectionId,
|
|
32
|
+
lang,
|
|
33
|
+
path: fx.path,
|
|
34
|
+
...blockBase({ blockId: fx.blockId, seq: baseSeq, blockNr: fx.blockNr, streamId }),
|
|
35
|
+
});
|
|
36
|
+
fx.lines.forEach((line, idx) => {
|
|
37
|
+
messages.push({
|
|
38
|
+
type: "block.code.line",
|
|
39
|
+
sectionId: fx.sectionId,
|
|
40
|
+
lang,
|
|
41
|
+
path: fx.path,
|
|
42
|
+
lineNr: idx + 1,
|
|
43
|
+
line,
|
|
44
|
+
...blockBase({ blockId: fx.blockId, seq: baseSeq + 1 + idx, blockNr: fx.blockNr, streamId }),
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
const afterLines = baseSeq + 1 + fx.lines.length;
|
|
48
|
+
messages.push({
|
|
49
|
+
type: "block.code.end",
|
|
50
|
+
sectionId: fx.sectionId,
|
|
51
|
+
lang,
|
|
52
|
+
path: fx.path,
|
|
53
|
+
stats: { lines: fx.lines.length, bytes: fx.lines.join("\n").length },
|
|
54
|
+
...blockBase({ blockId: fx.blockId, seq: afterLines, blockNr: fx.blockNr, streamId }),
|
|
55
|
+
});
|
|
56
|
+
messages.push({
|
|
57
|
+
type: "block.end",
|
|
58
|
+
stats: {
|
|
59
|
+
toplevel: { lines: 0, bytes: 0 },
|
|
60
|
+
code: { lines: fx.lines.length, bytes: fx.lines.join("\n").length },
|
|
61
|
+
image: { lines: 0, bytes: 0 },
|
|
62
|
+
total: { lines: fx.lines.length, bytes: fx.lines.join("\n").length },
|
|
63
|
+
},
|
|
64
|
+
usage: {
|
|
65
|
+
given: [],
|
|
66
|
+
calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
|
|
67
|
+
},
|
|
68
|
+
...blockBase({ blockId: fx.blockId, seq: afterLines + 1, blockNr: fx.blockNr, streamId }),
|
|
69
|
+
});
|
|
70
|
+
return messages;
|
|
71
|
+
}
|
|
72
|
+
function sectionEventStream(streamId, blockFixtures) {
|
|
73
|
+
return new ReadableStream({
|
|
74
|
+
start(controller) {
|
|
75
|
+
blockFixtures.forEach((fx, idx) => {
|
|
76
|
+
controller.enqueue({
|
|
77
|
+
type: "vibes.diy.section-event",
|
|
78
|
+
chatId: "chat-1",
|
|
79
|
+
promptId: streamId,
|
|
80
|
+
blockSeq: idx,
|
|
81
|
+
timestamp: new Date(),
|
|
82
|
+
blocks: codeBlockMessages(streamId, fx),
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
controller.close();
|
|
86
|
+
},
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
function buildTrigger(args, api, sent) {
|
|
90
|
+
const cliCtx = {
|
|
91
|
+
sthis: { env: { get: () => undefined } },
|
|
92
|
+
cliStream: cmd_tsStream(),
|
|
93
|
+
output: { stdout: () => undefined, stderr: () => undefined },
|
|
94
|
+
vibesDiyApiFactory: () => api,
|
|
95
|
+
exitCode: 0,
|
|
96
|
+
};
|
|
97
|
+
const appCtx = new AppContext().set("cliCtx", cliCtx);
|
|
98
|
+
return {
|
|
99
|
+
id: "trigger-1",
|
|
100
|
+
ctx: appCtx,
|
|
101
|
+
enRequest: args,
|
|
102
|
+
request: {
|
|
103
|
+
type: "msg.cmd-ts",
|
|
104
|
+
cmdTs: { raw: args, outputFormat: "text" },
|
|
105
|
+
result: args,
|
|
106
|
+
},
|
|
107
|
+
validated: args,
|
|
108
|
+
send: {
|
|
109
|
+
send: async (_trigger, data) => {
|
|
110
|
+
sent.push(data);
|
|
111
|
+
return Result.Ok(undefined);
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
function buildApi(opts) {
|
|
117
|
+
const calls = {
|
|
118
|
+
openChat: [],
|
|
119
|
+
prompt: [],
|
|
120
|
+
ensureAppSlug: [],
|
|
121
|
+
ensureAppSettings: [],
|
|
122
|
+
};
|
|
123
|
+
const chat = {
|
|
124
|
+
appSlug: opts.appSlug,
|
|
125
|
+
userSlug: opts.userSlug,
|
|
126
|
+
sectionStream: opts.sectionStream,
|
|
127
|
+
prompt: async (req) => {
|
|
128
|
+
calls.prompt.push(req);
|
|
129
|
+
return Result.Ok({ promptId: opts.promptId });
|
|
130
|
+
},
|
|
131
|
+
close: async () => undefined,
|
|
132
|
+
};
|
|
133
|
+
const api = {
|
|
134
|
+
openChat: async (req) => {
|
|
135
|
+
calls.openChat.push(req);
|
|
136
|
+
return Result.Ok(chat);
|
|
137
|
+
},
|
|
138
|
+
ensureAppSlug: async (req) => {
|
|
139
|
+
calls.ensureAppSlug.push(req);
|
|
140
|
+
return Result.Ok({
|
|
141
|
+
type: "vibes.diy.res-ensure-app-slug",
|
|
142
|
+
appSlug: opts.appSlug,
|
|
143
|
+
userSlug: opts.userSlug,
|
|
144
|
+
mode: "production",
|
|
145
|
+
fsId: "fs-1",
|
|
146
|
+
env: {},
|
|
147
|
+
fileSystem: [],
|
|
148
|
+
});
|
|
149
|
+
},
|
|
150
|
+
ensureAppSettings: async (req) => {
|
|
151
|
+
calls.ensureAppSettings.push(req);
|
|
152
|
+
return Result.Ok({ settings: { entry: {} } });
|
|
153
|
+
},
|
|
154
|
+
};
|
|
155
|
+
return { api, calls };
|
|
156
|
+
}
|
|
157
|
+
describe("editEvento", () => {
|
|
158
|
+
it("maps CLI args into a use-vibes.cli.edit request", async () => {
|
|
159
|
+
const cliStream = cmd_tsStream();
|
|
160
|
+
const ctx = {
|
|
161
|
+
sthis: { env: { get: () => undefined } },
|
|
162
|
+
cliStream,
|
|
163
|
+
output: { stdout: () => undefined, stderr: () => undefined },
|
|
164
|
+
exitCode: 0,
|
|
165
|
+
};
|
|
166
|
+
const reader = cliStream.stream.getReader();
|
|
167
|
+
const firstRead = reader.read();
|
|
168
|
+
await run(editCmd(ctx), [
|
|
169
|
+
"todo-app",
|
|
170
|
+
"Refine the UI",
|
|
171
|
+
"--user-slug",
|
|
172
|
+
"alice",
|
|
173
|
+
"--dir",
|
|
174
|
+
"/tmp/target",
|
|
175
|
+
"--api-url",
|
|
176
|
+
"https://example.com/api",
|
|
177
|
+
]);
|
|
178
|
+
const first = await firstRead;
|
|
179
|
+
await cliStream.close();
|
|
180
|
+
expect(first.done).toBe(false);
|
|
181
|
+
const request = first.value.result;
|
|
182
|
+
expect(request).toMatchObject({
|
|
183
|
+
type: "use-vibes.cli.edit",
|
|
184
|
+
appSlug: "todo-app",
|
|
185
|
+
prompt: "Refine the UI",
|
|
186
|
+
userSlug: "alice",
|
|
187
|
+
dir: "/tmp/target",
|
|
188
|
+
apiUrl: "https://example.com/api",
|
|
189
|
+
instantJoin: false,
|
|
190
|
+
verbose: false,
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
it("uses cwd by default and applies SEARCH/REPLACE against local seed files", async () => {
|
|
194
|
+
const cwd = await mkdtemp(join(tmpdir(), "edit-cmd-cwd-"));
|
|
195
|
+
tempDirs.push(cwd);
|
|
196
|
+
await writeFile(join(cwd, "App.jsx"), ['import React from "react";', "", "export default function App() {", " return <h1>Hello</h1>;", "}"].join("\n"), "utf-8");
|
|
197
|
+
vi.spyOn(process, "cwd").mockReturnValue(cwd);
|
|
198
|
+
const promptId = "prompt-edit-seed";
|
|
199
|
+
const { api, calls } = buildApi({
|
|
200
|
+
promptId,
|
|
201
|
+
appSlug: "todo-app",
|
|
202
|
+
userSlug: "alice",
|
|
203
|
+
sectionStream: sectionEventStream(promptId, [
|
|
204
|
+
{
|
|
205
|
+
blockId: "b1",
|
|
206
|
+
blockNr: 1,
|
|
207
|
+
sectionId: "s1",
|
|
208
|
+
path: "App.jsx",
|
|
209
|
+
lines: ["<<<<<<< SEARCH", " return <h1>Hello</h1>;", "=======", " return <h1>Hello, world</h1>;", ">>>>>>> REPLACE"],
|
|
210
|
+
},
|
|
211
|
+
]),
|
|
212
|
+
});
|
|
213
|
+
const sent = [];
|
|
214
|
+
const args = {
|
|
215
|
+
type: "use-vibes.cli.edit",
|
|
216
|
+
appSlug: "todo-app",
|
|
217
|
+
prompt: "Update the greeting",
|
|
218
|
+
userSlug: "alice",
|
|
219
|
+
instantJoin: false,
|
|
220
|
+
verbose: false,
|
|
221
|
+
dir: "",
|
|
222
|
+
apiUrl: "https://vibes.diy/api?.stable-entry.=cli",
|
|
223
|
+
};
|
|
224
|
+
const r = await editEvento.handle(buildTrigger(args, api, sent));
|
|
225
|
+
expect(r.isOk()).toBe(true);
|
|
226
|
+
const updated = await readFile(join(cwd, "App.jsx"), "utf-8");
|
|
227
|
+
expect(updated).toContain("Hello, world");
|
|
228
|
+
expect(calls.openChat).toEqual([{ userSlug: "alice", appSlug: "todo-app", mode: "chat" }]);
|
|
229
|
+
expect(calls.prompt).toEqual([
|
|
230
|
+
{
|
|
231
|
+
messages: [
|
|
232
|
+
{
|
|
233
|
+
role: "user",
|
|
234
|
+
content: [{ type: "text", text: "Update the greeting" }],
|
|
235
|
+
},
|
|
236
|
+
],
|
|
237
|
+
},
|
|
238
|
+
]);
|
|
239
|
+
const pushed = calls.ensureAppSlug[0];
|
|
240
|
+
const pushedApp = pushed.fileSystem.find((f) => f.filename === "/App.jsx");
|
|
241
|
+
expect(pushedApp?.content).toContain("Hello, world");
|
|
242
|
+
const resEdit = sent.find((msg) => {
|
|
243
|
+
const maybe = msg;
|
|
244
|
+
return maybe.result?.type === "use-vibes.cli.res-edit";
|
|
245
|
+
});
|
|
246
|
+
expect(resEdit.result.directory).toBe(cwd);
|
|
247
|
+
});
|
|
248
|
+
it("uses --dir for write and push instead of cwd", async () => {
|
|
249
|
+
const cwd = await mkdtemp(join(tmpdir(), "edit-cmd-work-"));
|
|
250
|
+
const target = await mkdtemp(join(tmpdir(), "edit-cmd-target-"));
|
|
251
|
+
tempDirs.push(cwd, target);
|
|
252
|
+
await writeFile(join(cwd, "App.jsx"), "export default function App() { return <h1>CWD</h1>; }", "utf-8");
|
|
253
|
+
await writeFile(join(target, "App.jsx"), "export default function App() { return <h1>Target</h1>; }", "utf-8");
|
|
254
|
+
vi.spyOn(process, "cwd").mockReturnValue(cwd);
|
|
255
|
+
const promptId = "prompt-edit-dir";
|
|
256
|
+
const { api, calls } = buildApi({
|
|
257
|
+
promptId,
|
|
258
|
+
appSlug: "todo-app",
|
|
259
|
+
userSlug: "alice",
|
|
260
|
+
sectionStream: sectionEventStream(promptId, [
|
|
261
|
+
{
|
|
262
|
+
blockId: "b1",
|
|
263
|
+
blockNr: 1,
|
|
264
|
+
sectionId: "s1",
|
|
265
|
+
path: "App.jsx",
|
|
266
|
+
lines: ["<<<<<<< SEARCH", "<h1>Target</h1>", "=======", "<h1>Target Updated</h1>", ">>>>>>> REPLACE"],
|
|
267
|
+
},
|
|
268
|
+
]),
|
|
269
|
+
});
|
|
270
|
+
const sent = [];
|
|
271
|
+
const args = {
|
|
272
|
+
type: "use-vibes.cli.edit",
|
|
273
|
+
appSlug: "todo-app",
|
|
274
|
+
prompt: "Edit in target dir",
|
|
275
|
+
userSlug: "alice",
|
|
276
|
+
instantJoin: false,
|
|
277
|
+
verbose: false,
|
|
278
|
+
dir: target,
|
|
279
|
+
apiUrl: "https://vibes.diy/api?.stable-entry.=cli",
|
|
280
|
+
};
|
|
281
|
+
const r = await editEvento.handle(buildTrigger(args, api, sent));
|
|
282
|
+
expect(r.isOk()).toBe(true);
|
|
283
|
+
const cwdApp = await readFile(join(cwd, "App.jsx"), "utf-8");
|
|
284
|
+
const targetApp = await readFile(join(target, "App.jsx"), "utf-8");
|
|
285
|
+
expect(cwdApp).toContain("CWD");
|
|
286
|
+
expect(targetApp).toContain("Target Updated");
|
|
287
|
+
const pushed = calls.ensureAppSlug[0];
|
|
288
|
+
const pushedApp = pushed.fileSystem.find((f) => f.filename === "/App.jsx");
|
|
289
|
+
expect(pushedApp?.content).toContain("Target Updated");
|
|
290
|
+
const resEdit = sent.find((msg) => {
|
|
291
|
+
const maybe = msg;
|
|
292
|
+
return maybe.result?.type === "use-vibes.cli.res-edit";
|
|
293
|
+
});
|
|
294
|
+
expect(resEdit.result.directory).toBe(target);
|
|
295
|
+
});
|
|
296
|
+
});
|
|
297
|
+
//# sourceMappingURL=edit-cmd.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"edit-cmd.test.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/edit-cmd.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,6 +112,26 @@ describe("resolveSectionStream", () => {
|
|
|
112
112
|
expect(ok.files["App.jsx"]).not.toContain("<<<<<<< SEARCH");
|
|
113
113
|
expect(ok.files["App.jsx"]).not.toContain(">>>>>>> REPLACE");
|
|
114
114
|
});
|
|
115
|
+
it("composes a SEARCH/REPLACE edit against seeded file content", async () => {
|
|
116
|
+
const editLines = [
|
|
117
|
+
"<<<<<<< SEARCH",
|
|
118
|
+
" return <h1>Hello</h1>;",
|
|
119
|
+
"=======",
|
|
120
|
+
" return <h1>Hello from seed</h1>;",
|
|
121
|
+
">>>>>>> REPLACE",
|
|
122
|
+
];
|
|
123
|
+
const stream = sectionEventStream([{ blockId: "b1", blockNr: 1, sectionId: "s1", path: "App.jsx", lines: editLines }]);
|
|
124
|
+
const r = await resolveSectionStream({
|
|
125
|
+
sectionStream: stream,
|
|
126
|
+
streamId,
|
|
127
|
+
seed: new Map([["App.jsx", 'import React from "react";\n\nexport default function App() {\n return <h1>Hello</h1>;\n}']]),
|
|
128
|
+
});
|
|
129
|
+
expect(r.isOk()).toBe(true);
|
|
130
|
+
const ok = r.Ok();
|
|
131
|
+
expect(ok.errors).toEqual([]);
|
|
132
|
+
expect(ok.files["App.jsx"]).toContain("Hello from seed");
|
|
133
|
+
expect(ok.files["App.jsx"]).not.toContain("<<<<<<< SEARCH");
|
|
134
|
+
});
|
|
115
135
|
it("captures apply errors when SEARCH does not match and keeps prior content", async () => {
|
|
116
136
|
const scaffoldLines = ['import React from "react";', "export default function App() { return <h1>Hi</h1>; }"];
|
|
117
137
|
const badEditLines = ["<<<<<<< SEARCH", "this string is not in the file", "=======", "replacement", ">>>>>>> REPLACE"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-section-stream.test.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/resolve-section-stream.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolve-section-stream.test.js","sourceRoot":"","sources":["../../../jsr/cli/cmds/resolve-section-stream.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,QAAQ,GAAG,UAAU,CAAC;AAQ5B,SAAS,SAAS,CAAC,MAAuB;IACxC,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,QAAQ;QACR,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI,IAAI,EAAE;KACtB,CAAC;AACJ,CAAC;AAUD,SAAS,iBAAiB,CAAC,EAAoB;IAC7C,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,GAAG,GAAG,CAAC;IACjC,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE,kBAAkB;QACxB,SAAS,EAAE,EAAE,CAAC,SAAS;QACvB,IAAI;QACJ,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC;KACzE,CAAC,CAAC;IACH,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC7B,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,iBAAiB;YACvB,SAAS,EAAE,EAAE,CAAC,SAAS;YACvB,IAAI;YACJ,IAAI,EAAE,EAAE,CAAC,IAAI;YACb,MAAM,EAAE,GAAG,GAAG,CAAC;YACf,IAAI;YACJ,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,GAAG,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC;SACnF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;IACjD,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE,gBAAgB;QACtB,SAAS,EAAE,EAAE,CAAC,SAAS;QACvB,IAAI;QACJ,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;QACpE,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC;KAC5E,CAAC,CAAC;IACH,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE;YACL,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;YAChC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;YACnE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;YAC7B,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;SACrE;QACD,KAAK,EAAE;YACL,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE;SACxE;QACD,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,UAAU,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC;KAChF,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CAAC,aAA0C;IACpE,OAAO,IAAI,cAAc,CAAe;QACtC,KAAK,CAAC,UAAU;YACd,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE;gBAChC,UAAU,CAAC,OAAO,CAAC;oBACjB,IAAI,EAAE,yBAAyB;oBAC/B,MAAM,EAAE,QAAQ;oBAChB,QAAQ,EAAE,UAAU;oBACpB,QAAQ,EAAE,GAAG;oBACb,SAAS,EAAE,IAAI,IAAI,EAAE;oBACrB,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAA2B;iBACxD,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAChC;gBACE,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,CAAC;gBACV,SAAS,EAAE,IAAI;gBACf,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,CAAC,4BAA4B,EAAE,EAAE,EAAE,uDAAuD,CAAC;aACnG;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,qFAAqF,CAAC,CAAC;IAC1H,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,aAAa,GAAG,CAAC,4BAA4B,EAAE,EAAE,EAAE,iCAAiC,EAAE,0BAA0B,EAAE,GAAG,CAAC,CAAC;QAC7H,MAAM,SAAS,GAAG;YAChB,gBAAgB;YAChB,0BAA0B;YAC1B,SAAS;YACT,iCAAiC;YACjC,iBAAiB;SAClB,CAAC;QACF,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAChC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE;YACrF,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;SAClF,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC5D,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,SAAS,GAAG;YAChB,gBAAgB;YAChB,0BAA0B;YAC1B,SAAS;YACT,oCAAoC;YACpC,iBAAiB;SAClB,CAAC;QACF,MAAM,MAAM,GAAG,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAEvH,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC;YACnC,aAAa,EAAE,MAAM;YACrB,QAAQ;YACR,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,4FAA4F,CAAC,CAAC,CAAC;SAC3H,CAAC,CAAC;QACH,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QACzD,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;QACxF,MAAM,aAAa,GAAG,CAAC,4BAA4B,EAAE,uDAAuD,CAAC,CAAC;QAC9G,MAAM,YAAY,GAAG,CAAC,gBAAgB,EAAE,gCAAgC,EAAE,SAAS,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;QACvH,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAChC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE;YACrF,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE;SACrF,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAChC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE;YAClF,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,YAAY,CAAC,EAAE;SAC3F,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,CAAC,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;QACtF,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAChC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE;YACrF,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE;SACrF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,MAAM,oBAAoB,CAAC;YACnC,aAAa,EAAE,MAAM;YACrB,QAAQ;YACR,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1D,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;SACpC,CAAC,CAAC;QACH,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|