@basaltbytes/odoo-agentic-dev 0.1.0-beta.2 → 0.1.0-beta.3
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/README.md +46 -3
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/doctor.js +1 -1
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/down.js +2 -1
- package/dist/commands/down.js.map +1 -1
- package/dist/commands/eject.d.ts +74 -0
- package/dist/commands/eject.js +331 -0
- package/dist/commands/eject.js.map +1 -0
- package/dist/commands/info.js +1 -1
- package/dist/commands/info.js.map +1 -1
- package/dist/commands/json-report.d.ts +39 -6
- package/dist/commands/json-report.js +55 -9
- package/dist/commands/json-report.js.map +1 -1
- package/dist/commands/link-source.js +1 -1
- package/dist/commands/link-source.js.map +1 -1
- package/dist/commands/list.js +1 -1
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/logs.js +1 -1
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/prune.js +1 -1
- package/dist/commands/prune.js.map +1 -1
- package/dist/commands/psql.js +1 -1
- package/dist/commands/psql.js.map +1 -1
- package/dist/commands/reset-db.js +4 -2
- package/dist/commands/reset-db.js.map +1 -1
- package/dist/commands/setup.js +5 -2
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/shell.js +1 -1
- package/dist/commands/shell.js.map +1 -1
- package/dist/commands/test.js +7 -5
- package/dist/commands/test.js.map +1 -1
- package/dist/commands/up.d.ts +11 -0
- package/dist/commands/up.js +15 -1
- package/dist/commands/up.js.map +1 -1
- package/dist/commands/update.js +1 -1
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/worktree.d.ts +1 -7
- package/dist/commands/worktree.js +5 -13
- package/dist/commands/worktree.js.map +1 -1
- package/dist/core/compose-model.d.ts +20 -2
- package/dist/core/compose-model.js +43 -13
- package/dist/core/compose-model.js.map +1 -1
- package/dist/errors/errors.d.ts +9 -1
- package/dist/errors/errors.js +8 -0
- package/dist/errors/errors.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/up.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"up.js","sourceRoot":"","sources":["../../src/commands/up.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"up.js","sourceRoot":"","sources":["../../src/commands/up.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/update.js
CHANGED
|
@@ -27,5 +27,5 @@ export const updateCommand = Command.make("update", {
|
|
|
27
27
|
yield* report.say(`Updating modules [${list.join(", ")}] in ${ctx.databaseName}`);
|
|
28
28
|
yield* lifecycle.updateModules(recipe, ctx, list, { restart: !flags.noRestart });
|
|
29
29
|
yield* report.action("update-modules");
|
|
30
|
-
})));
|
|
30
|
+
}))).pipe(Command.withDescription("run odoo -u for the given modules"));
|
|
31
31
|
//# sourceMappingURL=update.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CACvC,QAAQ,EACR;IACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IACnC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAC7B,IAAI,CAAC,eAAe,CAAC,8DAA8D,CAAC,CACrF;IACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;CAClD,EACD,CAAC,KAAK,EAAE,EAAE,CACR,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAC9C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO;SACvB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,qBAAqB,CAAC;YACxB,MAAM,EAAE,CAAC,yDAAyD,CAAC;SACpE,CAAC,CACH,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5D,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACvC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;IAClF,KAAK,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IACjF,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACzC,CAAC,CAAC,CACH,CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CACvC,QAAQ,EACR;IACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IACnC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAC7B,IAAI,CAAC,eAAe,CAAC,8DAA8D,CAAC,CACrF;IACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;CAClD,EACD,CAAC,KAAK,EAAE,EAAE,CACR,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAC9C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO;SACvB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,qBAAqB,CAAC;YACxB,MAAM,EAAE,CAAC,yDAAyD,CAAC;SACpE,CAAC,CACH,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5D,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACvC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;IAClF,KAAK,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IACjF,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACzC,CAAC,CAAC,CACH,CACJ,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,mCAAmC,CAAC,CAAC,CAAC"}
|
|
@@ -8,6 +8,7 @@ import type { GitApi } from "../platform/git.js";
|
|
|
8
8
|
import type { DockerComposeApi } from "../platform/docker-compose.js";
|
|
9
9
|
import type { StateStoreApi } from "../platform/state-store.js";
|
|
10
10
|
import type { OdooLifecycleApi } from "../platform/odoo-lifecycle.js";
|
|
11
|
+
export { withStdoutRedirectedToStderr } from "./json-report.js";
|
|
11
12
|
/** Claude Code WorktreeCreate hook payload: requires worktree_name + worktree_path. */
|
|
12
13
|
export declare const parseCreateHookPayload: (text: string) => Effect.Effect<{
|
|
13
14
|
readonly worktreeName: string;
|
|
@@ -36,13 +37,6 @@ export declare const planCopyFiles: (copyFiles: ReadonlyArray<string>, rootDir:
|
|
|
36
37
|
};
|
|
37
38
|
/** Step logger: append to --log-file (directory created) when given, else the fallback sink. */
|
|
38
39
|
export declare const makeStepLogger: (logFile: string | undefined, fallback: (line: string) => Effect.Effect<void>) => ((line: string) => Effect.Effect<void>);
|
|
39
|
-
/**
|
|
40
|
-
* Hook-mode stdout purity (the `exec 1>&2` trick): everything written to
|
|
41
|
-
* process.stdout while the effect runs — Console.log, streamed child output —
|
|
42
|
-
* lands on stderr instead; the original writer is restored afterwards so the
|
|
43
|
-
* caller can print the single contractual stdout line.
|
|
44
|
-
*/
|
|
45
|
-
export declare const withStdoutRedirectedToStderr: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
46
40
|
export type WorktreeCreateOptions = {
|
|
47
41
|
/** the CURRENT project's recipe (worktree.copyFiles / branchPrefix) */
|
|
48
42
|
readonly recipe: OdooAgenticDevConfig;
|
|
@@ -11,6 +11,10 @@ import { Git } from "../platform/git.js";
|
|
|
11
11
|
import { DockerCompose } from "../platform/docker-compose.js";
|
|
12
12
|
import { StateStore } from "../platform/state-store.js";
|
|
13
13
|
import { runSetup } from "./setup.js";
|
|
14
|
+
import { withStdoutRedirectedToStderr } from "./json-report.js";
|
|
15
|
+
// the stdout→stderr stream-swap now lives in json-report (shared with --json);
|
|
16
|
+
// re-exported here so existing importers keep working
|
|
17
|
+
export { withStdoutRedirectedToStderr } from "./json-report.js";
|
|
14
18
|
// --- hook payloads ----------------------------------------------------------
|
|
15
19
|
const parseHookJson = (text) => Effect.try({
|
|
16
20
|
try: () => {
|
|
@@ -75,19 +79,6 @@ export const makeStepLogger = (logFile, fallback) => logFile === undefined
|
|
|
75
79
|
mkdirSync(dirname(logFile), { recursive: true });
|
|
76
80
|
appendFileSync(logFile, `${line}\n`);
|
|
77
81
|
});
|
|
78
|
-
/**
|
|
79
|
-
* Hook-mode stdout purity (the `exec 1>&2` trick): everything written to
|
|
80
|
-
* process.stdout while the effect runs — Console.log, streamed child output —
|
|
81
|
-
* lands on stderr instead; the original writer is restored afterwards so the
|
|
82
|
-
* caller can print the single contractual stdout line.
|
|
83
|
-
*/
|
|
84
|
-
export const withStdoutRedirectedToStderr = (effect) => Effect.suspend(() => {
|
|
85
|
-
const original = process.stdout.write;
|
|
86
|
-
process.stdout.write = ((...args) => process.stderr.write(...args));
|
|
87
|
-
return effect.pipe(Effect.ensuring(Effect.sync(() => {
|
|
88
|
-
process.stdout.write = original;
|
|
89
|
-
})));
|
|
90
|
-
});
|
|
91
82
|
/** Read stdin to the end (the hook payload arrives this way). */
|
|
92
83
|
const readStdinText = Effect.tryPromise({
|
|
93
84
|
try: async () => {
|
|
@@ -171,6 +162,7 @@ export const runWorktreeCreate = (options) => Effect.gen(function* () {
|
|
|
171
162
|
action: () => Effect.void,
|
|
172
163
|
setContext: () => Effect.void,
|
|
173
164
|
setExitCode: () => Effect.void,
|
|
165
|
+
setExtra: () => Effect.void,
|
|
174
166
|
};
|
|
175
167
|
yield* runSetup(worktree.recipe, ctx, {
|
|
176
168
|
skipInstall: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/commands/worktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,qBAAqB,EACrB,QAAQ,EACR,cAAc,EACd,WAAW,EACX,IAAI,GACL,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,+EAA+E;AAE/E,MAAM,aAAa,GAAG,CACpB,IAAY,EACmD,EAAE,CACjE,MAAM,CAAC,GAAG,CAAC;IACT,GAAG,EAAE,GAAG,EAAE;QACR,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,MAAiC,CAAC;IAC3C,CAAC;IACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC,8BAA8B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;CACzF,CAAC,CAAC;AAEL,MAAM,WAAW,GAAG,CAAC,MAA+B,EAAE,GAAW,EAAsB,EAAE;IACvF,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC,CAAC;AAEF,uFAAuF;AACvF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAY,EAIZ,EAAE,CACF,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CACtB,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;IACxB,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC1D,OAAO,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS;QAC7D,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,qBAAqB,CAAC;YACxB,MAAM,EAAE,CAAC,2EAA2E,CAAC;SACtF,CAAC,CACH;QACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC,CACH,CAAC;AAEJ,uEAAuE;AACvE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAY,EAC6D,EAAE,CAC3E,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CACtB,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;IACxB,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC1D,OAAO,YAAY,KAAK,SAAS;QAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,qBAAqB,CAAC;YACxB,MAAM,EAAE,CAAC,0DAA0D,CAAC;SACrE,CAAC,CACH;QACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;AACvC,CAAC,CAAC,CACH,CAAC;AAEJ,+EAA+E;AAE/E;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAI9B,EAAU,EAAE;IACX,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9E,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;IACvE,OAAO,OAAO,CAAC,IAAI,IAAI,OAAO,IAAI,UAAU,IAAI,MAAM,CAAC;AACzD,CAAC,CAAC;AAEF,2FAA2F;AAC3F,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,IAAY,EAAU,EAAE,CAC3E,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAEzD,8FAA8F;AAC9F,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,SAAgC,EAChC,OAAe,EACf,SAAoC,UAAU,EACkB,EAAE;IAClE,MAAM,IAAI,GAAkB,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAkB,EAAE,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AACxB,CAAC,CAAC;AAEF,gGAAgG;AAChG,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,OAA2B,EAC3B,QAA+C,EACN,EAAE,CAC3C,OAAO,KAAK,SAAS;IACnB,CAAC,CAAC,QAAQ;IACV,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CACP,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QACf,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AAEX;;;;;GAKG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,MAA8B,EACN,EAAE,CAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;IAClB,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IACtC,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,IAA6C,EAAE,EAAE,CAC3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAgC,CAAC;IAChE,OAAO,MAAM,CAAC,IAAI,CAChB,MAAM,CAAC,QAAQ,CACb,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QACf,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;IAClC,CAAC,CAAC,CACH,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,iEAAiE;AACjE,MAAM,aAAa,GAAiD,MAAM,CAAC,UAAU,CAAC;IACpF,GAAG,EAAE,KAAK,IAAI,EAAE;QACd,MAAM,MAAM,GAAkB,EAAE,CAAC;QACjC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAgB,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,qBAAqB,CAAC;QACxB,MAAM,EAAE,CAAC,+CAA+C,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;KACzE,CAAC;CACL,CAAC,CAAC;AAEH,+EAA+E;AAE/E,MAAM,eAAe,GAAG,CACtB,MAAwB,EACxB,OAAe,EACoB,EAAE,CACrC,MAAM;KACH,GAAG,CAAC;IACH,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,CAAC,cAAc,EAAE,SAAS,EAAE,0BAA0B,CAAC;IAC7D,GAAG,EAAE,OAAO;CACb,CAAC;KACD,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;IACpB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClC,OAAO,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACrE,CAAC,CAAC,EACF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAC9C,CAAC;AAEN,MAAM,aAAa,GAAG,CAAU,MAA8B,EAAiC,EAAE,CAC/F,MAAM,CAAC,IAAI,CACT,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAChC,CAAC;AAiBJ;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAA8B,EAK9B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IAEpC,KAAK,CAAC,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAC/C,KAAK,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAE9F,MAAM,OAAO,GAAG,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,CAAC,CAAC;IAC1F,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnF,MAAM,IAAI,GAAG,cAAc,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAErE,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,GAAG,IAAI,EAAE,CAAC;IACxD,KAAK,CAAC,CAAC,GAAG,CAAC,yBAAyB,MAAM,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM;SACxB,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;SAC1F,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrF,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,QAAQ,CAAC;YACX,MAAM,EAAE,2BAA2B,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE;SAC3F,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC/C,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7B,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;gBAChB,GAAG,EAAE,GAAG,EAAE;oBACR,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC9B,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC9C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACzD,CAAC;gBACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,IAAI,8BAA8B,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;aACzF,CAAC,CAAC;YACH,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QAC/B,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7B,KAAK,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,oBAAoB,OAAO,GAAG,CAAC,CAAC;QAC5D,CAAC;QAED,wEAAwE;QACxE,sEAAsE;QACtE,iDAAiD;QACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;QACvB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,oBAAoB,CAAC;YACtC,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG;YACH,GAAG,EAAE,QAAQ;SACd,CAAC,CAAC;QACH,MAAM,QAAQ,GAAoB;YAChC,IAAI,EAAE,KAAK;YACX,GAAG;YACH,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;YACzB,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;YAC7B,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;SAC/B,CAAC;QACF,KAAK,CAAC,CAAC,QAAQ,CACb,QAAQ,CAAC,MAAM,EACf,GAAG,EACH;YACE,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;YAClB,UAAU,EAAE,KAAK;YACjB,eAAe,EAAE,KAAK;SACvB,EACD,QAAQ,CACT,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,sEAAsE;IACtE,sEAAsE;IACtE,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ;QAC5B,CAAC,CAAC,oBAAoB,CAAC,IAAI,CACvB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CACnB,aAAa,CACX,MAAM,CAAC,GAAG,CAAC;YACT,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC;YAC7C,GAAG,EAAE,OAAO;SACb,CAAC,CACH,CACF,CACF;QACH,CAAC,CAAC,oBAAoB,CAAC;AAC3B,CAAC,CAAC,CAAC;AAeL;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAA8B,EACgD,EAAE,CAChF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACjE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACrC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;IAEhC,MAAM,WAAW,GAAG,CAAC,YAAoB,EAAE,cAA6B,EAAE,EAAE,CAC1E,gBAAgB,CAAC,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC;IAEjE,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,oEAAoE;QACpE,mEAAmE;QACnE,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAC3D,MAAM,CAAC,GAAG,CACR,CACE,KAAK,EAC4E,EAAE,CACnF,KAAK,CACR,EACD,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACrB,KAAK,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAClF,CACF,CAAC;QACF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;YACvB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,oBAAoB,CAAC;gBACtC,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,GAAG;gBACH,GAAG,EAAE,QAAQ;aACd,CAAC,CAAC;YACH,IAAI,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC5E,KAAK,CAAC,CAAC,GAAG,CACR,SAAS,GAAG,CAAC,YAAY,+DAA+D,CACzF,CAAC;gBACF,OAAO;YACT,CAAC;YACD,KAAK,CAAC,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,kBAAkB,cAAc,GAAG,CAAC,YAAY,GAAG,CAAC,CAAC;YACpF,KAAK,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACtE,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;YAC/C,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAC5C,KAAK,CAAC,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,kBAAkB,oBAAoB,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1E,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,oBAAoB,CAAC;QACtC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,kBAAkB,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;QACnD,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;KAC1B,CAAC,CAAC;IACH,IAAI,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACzE,KAAK,CAAC,CAAC,GAAG,CACR,SAAS,GAAG,CAAC,YAAY,+DAA+D,CACzF,CAAC;QACF,OAAO;IACT,CAAC;IACD,KAAK,CAAC,CAAC,GAAG,CAAC,mCAAmC,GAAG,CAAC,kBAAkB,qBAAqB,CAAC,CAAC;IAC3F,KAAK,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;IACjC,KAAK,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACrD,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC5C,KAAK,CAAC,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,kBAAkB,oBAAoB,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC;AAEL;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAOrC,EAAyE,EAAE,CAC1E,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAC5C,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACzB,iBAAiB,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC;IAChD,WAAW,EAAE,OAAO,CAAC,WAAW;IAChC,GAAG,EAAE,OAAO,CAAC,GAAG;IAChB,GAAG,EAAE,OAAO,CAAC,GAAG;IAChB,UAAU,EAAE,OAAO,CAAC,UAAU;IAC9B,GAAG,EAAE,OAAO,CAAC,GAAG;CACjB,CAAC,CACH,EACD,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACrB,OAAO,CAAC,GAAG,CACT,6DACE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAC3D,EAAE,CACH,CACF,EACD,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,EAAE,CAC5B,OAAO,CAAC,GAAG,CAAC,8DAA8D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAC5F,CACF,CAAC;AAEJ,+EAA+E;AAE/E,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAChC,QAAQ,EACR;IACE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAChC,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,eAAe,CAAC,uCAAuC,CAAC,CAClE;IACD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAC5B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAAC,8DAA8D,CAAC,CACrF;IACD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAC5B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAAC,mEAAmE,CAAC,CAC1F;IACD,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CACtC,IAAI,CAAC,eAAe,CAClB,gHAAgH,CACjH,CACF;IACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;CAClD,EACD,CAAC,KAAK,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QAC5C,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;QACjD,GAAG;KACJ,CAAC,CAAC;IACH,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAClF,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,4BAA4B,CACnD,iBAAiB,CAAC;YAChB,MAAM;YACN,OAAO;YACP,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC;YAClD,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC;YACvC,GAAG;YACH,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CACH,CAAC;QACF,iEAAiE;QACjE,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,qBAAqB,CAAC;YACxB,MAAM,EAAE,CAAC,6DAA6D,CAAC;SACxE,CAAC,CACH,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;QACpC,MAAM,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAChD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;KACzC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC;QACzC,MAAM;QACN,OAAO;QACP,IAAI;QACJ,IAAI;QACJ,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC;QACvC,GAAG;QACH,QAAQ,EAAE,KAAK;QACf,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC;IACH,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC,CACL,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,6DAA6D,CAAC,CAAC,CAAC;AAE/F,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAChC,QAAQ,EACR;IACE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAChC,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,eAAe,CAAC,4CAA4C,CAAC,CACvE;IACD,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CACtC,IAAI,CAAC,eAAe,CAClB,+EAA+E,CAChF,CACF;IACD,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IACzC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CACnC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAAC,0DAA0D,CAAC,CACjF;IACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;CAClD,EACD,CAAC,KAAK,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IACxB,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAChF,KAAK,CAAC,CAAC,aAAa,CAAC,IAAI,CACvB,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAC3B,qBAAqB,CAAC;YACpB,SAAS;YACT,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,GAAG;YACH,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,UAAU,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;YAC/C,GAAG;SACJ,CAAC,CACH;QACD,mDAAmD;QACnD,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACrB,GAAG,CAAC,6DAA6D,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CACvF,CACF,CAAC;QACF,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,qBAAqB,CAAC;YACxB,MAAM,EAAE,CAAC,6DAA6D,CAAC;SACxE,CAAC,CACH,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9E,KAAK,CAAC,CAAC,iBAAiB,CAAC;QACvB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC;QAClC,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,GAAG;QACH,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,UAAU,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;QAC/C,GAAG;KACJ,CAAC,CAAC;AACL,CAAC,CAAC,CACL,CAAC,IAAI,CACJ,OAAO,CAAC,eAAe,CACrB,uFAAuF,CACxF,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAC1D,OAAO,CAAC,eAAe,CAAC,iEAAiE,CAAC,EAC1F,OAAO,CAAC,eAAe,CAAC,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CACxD,CAAC"}
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/commands/worktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,26 @@ export declare const GENERATED_COMPOSE_RELATIVE_PATH = ".odoo-agentic-dev/compos
|
|
|
11
11
|
* Drift-proofing labels stamped on every generated service and volume so
|
|
12
12
|
* `list`/`prune`/`doctor` can reconcile Docker reality against the state
|
|
13
13
|
* registry (and adopt stacks whose rows were lost) without the compose file.
|
|
14
|
+
*
|
|
15
|
+
* Portable mode (for `eject`) keeps the static identity labels but interpolates
|
|
16
|
+
* the database and omits `root-dir`/`branch` (not part of the exported compose
|
|
17
|
+
* env), so the ejected file works across worktrees.
|
|
14
18
|
*/
|
|
15
|
-
export declare const buildOadLabels: (recipe: OdooAgenticDevConfig, ctx: WorktreeContext
|
|
16
|
-
|
|
19
|
+
export declare const buildOadLabels: (recipe: OdooAgenticDevConfig, ctx: WorktreeContext, options?: {
|
|
20
|
+
readonly portable?: boolean;
|
|
21
|
+
}) => Record<string, string>;
|
|
22
|
+
/**
|
|
23
|
+
* Build the compose model for a worktree.
|
|
24
|
+
*
|
|
25
|
+
* `options.portable` emits compose interpolations (`${KEY:?}`) instead of the
|
|
26
|
+
* current worktree's baked database/port/env literals, so the result is a
|
|
27
|
+
* worktree-independent file the `eject` command can write into a repo.
|
|
28
|
+
* `options.dockerfilePath`, when set, overrides whatever `build.dockerfile`
|
|
29
|
+
* path would otherwise be emitted (eject points it at the ejected Dockerfile).
|
|
30
|
+
*/
|
|
31
|
+
export declare const buildComposeModel: (recipe: OdooAgenticDevConfig, ctx: WorktreeContext, options?: {
|
|
32
|
+
readonly portable?: boolean;
|
|
33
|
+
readonly dockerfilePath?: string;
|
|
34
|
+
}) => ComposeModel;
|
|
17
35
|
/** Deterministic hand-rolled YAML for the fixed compose shape (no YAML runtime dep). */
|
|
18
36
|
export declare const renderComposeYaml: (model: ComposeModel) => string;
|
|
@@ -6,19 +6,49 @@ const hostPath = (host) => host.startsWith("/") || host.startsWith("./") || host
|
|
|
6
6
|
* Drift-proofing labels stamped on every generated service and volume so
|
|
7
7
|
* `list`/`prune`/`doctor` can reconcile Docker reality against the state
|
|
8
8
|
* registry (and adopt stacks whose rows were lost) without the compose file.
|
|
9
|
+
*
|
|
10
|
+
* Portable mode (for `eject`) keeps the static identity labels but interpolates
|
|
11
|
+
* the database and omits `root-dir`/`branch` (not part of the exported compose
|
|
12
|
+
* env), so the ejected file works across worktrees.
|
|
9
13
|
*/
|
|
10
|
-
export const buildOadLabels = (recipe, ctx) =>
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
export const buildOadLabels = (recipe, ctx, options) => options?.portable === true
|
|
15
|
+
? {
|
|
16
|
+
"dev.basaltbytes.oad": "1",
|
|
17
|
+
"dev.basaltbytes.oad.project-id": recipe.project.id,
|
|
18
|
+
"dev.basaltbytes.oad.database": "${ODOO_DATABASE}",
|
|
19
|
+
}
|
|
20
|
+
: {
|
|
21
|
+
"dev.basaltbytes.oad": "1",
|
|
22
|
+
"dev.basaltbytes.oad.project-id": recipe.project.id,
|
|
23
|
+
"dev.basaltbytes.oad.database": ctx.databaseName,
|
|
24
|
+
"dev.basaltbytes.oad.root-dir": ctx.rootDir,
|
|
25
|
+
"dev.basaltbytes.oad.branch": ctx.branch ?? "",
|
|
26
|
+
};
|
|
27
|
+
/**
|
|
28
|
+
* Build the compose model for a worktree.
|
|
29
|
+
*
|
|
30
|
+
* `options.portable` emits compose interpolations (`${KEY:?}`) instead of the
|
|
31
|
+
* current worktree's baked database/port/env literals, so the result is a
|
|
32
|
+
* worktree-independent file the `eject` command can write into a repo.
|
|
33
|
+
* `options.dockerfilePath`, when set, overrides whatever `build.dockerfile`
|
|
34
|
+
* path would otherwise be emitted (eject points it at the ejected Dockerfile).
|
|
35
|
+
*/
|
|
36
|
+
export const buildComposeModel = (recipe, ctx, options) => {
|
|
37
|
+
const portable = options?.portable === true;
|
|
18
38
|
const dbService = recipe.odoo.databaseServiceName;
|
|
19
39
|
const odooService = recipe.odoo.serviceName;
|
|
20
|
-
const labels = buildOadLabels(recipe, ctx);
|
|
21
|
-
const
|
|
40
|
+
const labels = buildOadLabels(recipe, ctx, { portable });
|
|
41
|
+
const databaseArg = portable ? "${ODOO_DATABASE:?}" : ctx.databaseName;
|
|
42
|
+
const portMapping = portable
|
|
43
|
+
? "127.0.0.1:${ODOO_HTTP_PORT:?}:8069"
|
|
44
|
+
: `127.0.0.1:${ctx.odooHttpPort}:8069`;
|
|
45
|
+
// each exported context key resolves at compose runtime via `${KEY:?}`;
|
|
46
|
+
// the static HOST/USER/PASSWORD stay literal in both modes
|
|
47
|
+
const contextEnv = portable
|
|
48
|
+
? Object.fromEntries(Object.keys(ctx.env).map((key) => [key, `\${${key}:?}`]))
|
|
49
|
+
: ctx.env;
|
|
50
|
+
const dockerfile = options?.dockerfilePath ??
|
|
51
|
+
recipe.odoo.dockerfile ??
|
|
22
52
|
(recipe.odoo.build !== null ? GENERATED_DOCKERFILE_RELATIVE_PATH : null);
|
|
23
53
|
const imageOrBuild = dockerfile !== null
|
|
24
54
|
? {
|
|
@@ -47,17 +77,17 @@ export const buildComposeModel = (recipe, ctx) => {
|
|
|
47
77
|
depends_on: { [dbService]: { condition: "service_healthy" } },
|
|
48
78
|
// the official image's entrypoint turns HOST/USER/PASSWORD into db args;
|
|
49
79
|
// the full context env rides along for post-init scripts and in-container tests
|
|
50
|
-
environment: { HOST: dbService, USER: "odoo", PASSWORD: "odoo", ...
|
|
80
|
+
environment: { HOST: dbService, USER: "odoo", PASSWORD: "odoo", ...contextEnv },
|
|
51
81
|
// serve exactly this worktree's database, with the db manager hidden
|
|
52
82
|
command: [
|
|
53
83
|
"odoo",
|
|
54
|
-
`--database=${
|
|
84
|
+
`--database=${databaseArg}`,
|
|
55
85
|
"--no-database-list",
|
|
56
86
|
`--addons-path=${containerAddonsPath(recipe)}`,
|
|
57
87
|
...(recipe.odoo.dev === false ? [] : [`--dev=${recipe.odoo.dev}`]),
|
|
58
88
|
],
|
|
59
89
|
// loopback-only: never expose the dev Odoo on the LAN by default
|
|
60
|
-
ports: [
|
|
90
|
+
ports: [portMapping],
|
|
61
91
|
volumes: [
|
|
62
92
|
"web-data:/var/lib/odoo",
|
|
63
93
|
...recipe.odoo.addons.map((mount) => `${hostPath(mount.host)}:${mount.container}`),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-model.js","sourceRoot":"","sources":["../../src/core/compose-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAO3E,MAAM,CAAC,MAAM,+BAA+B,GAAG,yCAAyC,CAAC;AAEzF,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAU,EAAE,CACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;AAE/F
|
|
1
|
+
{"version":3,"file":"compose-model.js","sourceRoot":"","sources":["../../src/core/compose-model.ts"],"names":[],"mappings":"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"}
|
package/dist/errors/errors.d.ts
CHANGED
|
@@ -116,7 +116,15 @@ export declare class PortConflictError extends PortConflictError_base<{
|
|
|
116
116
|
}> {
|
|
117
117
|
get message(): string;
|
|
118
118
|
}
|
|
119
|
-
|
|
119
|
+
declare const EjectError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
|
|
120
|
+
readonly _tag: "EjectError";
|
|
121
|
+
} & Readonly<A>;
|
|
122
|
+
export declare class EjectError extends EjectError_base<{
|
|
123
|
+
readonly reason: string;
|
|
124
|
+
}> {
|
|
125
|
+
get message(): string;
|
|
126
|
+
}
|
|
127
|
+
export type RuntimeError = ConfigLoadError | ConfigValidationError | GitError | UnsafeDatabaseNameError | SharedDatabaseProtectionError | DockerUnavailableError | CommandFailedError | ComposeCommandError | OdooCommandError | CompanionProcessError | SourceResolverError | StateError | PortConflictError | EjectError;
|
|
120
128
|
export declare const isRuntimeError: (u: unknown) => u is RuntimeError;
|
|
121
129
|
export declare const renderError: (error: RuntimeError) => string;
|
|
122
130
|
/** Keep only the last `maxLines` lines of process output for error messages. */
|
package/dist/errors/errors.js
CHANGED
|
@@ -68,6 +68,11 @@ export class PortConflictError extends Data.TaggedError("PortConflictError") {
|
|
|
68
68
|
: `port ${this.port} is already in use by "${this.holder}"`;
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
+
export class EjectError extends Data.TaggedError("EjectError") {
|
|
72
|
+
get message() {
|
|
73
|
+
return this.reason;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
71
76
|
const RUNTIME_ERROR_TAGS = new Set([
|
|
72
77
|
"ConfigLoadError",
|
|
73
78
|
"ConfigValidationError",
|
|
@@ -82,6 +87,7 @@ const RUNTIME_ERROR_TAGS = new Set([
|
|
|
82
87
|
"SourceResolverError",
|
|
83
88
|
"StateError",
|
|
84
89
|
"PortConflictError",
|
|
90
|
+
"EjectError",
|
|
85
91
|
]);
|
|
86
92
|
export const isRuntimeError = (u) => typeof u === "object" &&
|
|
87
93
|
u !== null &&
|
|
@@ -118,6 +124,8 @@ export const renderError = (error) => {
|
|
|
118
124
|
return lines(error.holder === null
|
|
119
125
|
? `Port ${error.port} is already in use by another process.`
|
|
120
126
|
: `Port ${error.port} is already in use by the "${error.holder}" stack.`, "Next: set ODOO_HTTP_PORT to a free port, or run `odoo-agentic-dev prune` to", "clean up environments you no longer need.");
|
|
127
|
+
case "EjectError":
|
|
128
|
+
return lines(`Eject failed: ${error.reason}`);
|
|
121
129
|
}
|
|
122
130
|
};
|
|
123
131
|
/** Keep only the last `maxLines` lines of process output for error messages. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors/errors.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors/errors.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED