@superblocksteam/gateway 2.0.178-next.3 → 2.0.179-next.1

package/dist/capabilities/branching.js

@@ -0,0 +1,540 @@
+import { DEFAULT_BRANCH, } from "@superblocksteam/shared";
+import { gatewayDebug } from "../debug.js";
+import { ServerHttpError } from "../server/client.js";
+import { attachToBranch, ensurePrincipal, namingApplication, resolveApplicationId, } from "./lifecycle.js";
+/** Resolves the caller and the app, then runs one branch action. A server refusal comes back as an error. */
+async function onApplication({ ctx, applicationId, write, action, }) {
+    const principal = await ensurePrincipal(ctx);
+    if (principal.kind !== "ok") {
+        return principal;
+    }
+    const resolved = await resolveApplicationId(ctx, principal.value, applicationId, { unambiguous: write });
+    if (resolved.kind !== "ok") {
+        return resolved;
+    }
+    const app = { apiKey: principal.value.apiKey, applicationId: resolved.value };
+    try {
+        return namingApplication(app.applicationId, await action(app, principal.value));
+    }
+    catch (error) {
+        const status = error instanceof ServerHttpError ? error.status : undefined;
+        gatewayDebug("branch action failed", {
+            "application.id": app.applicationId,
+            "http.status": status,
+        });
+        return {
+            kind: "error",
+            applicationId: app.applicationId,
+            code: branchErrorCode(status),
+            message: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+// The code tells the agent whether to retry, ask the user, or stop.
+const BRANCH_ERROR_CODES = {
+    403: "branch_action_forbidden",
+    404: "branch_not_found",
+    409: "branch_action_conflict",
+};
+function branchErrorCode(status) {
+    if (status === undefined)
+        return "branch_action_failed";
+    if (status >= 500)
+        return "downstream_unavailable";
+    return BRANCH_ERROR_CODES[status] ?? "branch_action_failed";
+}
+/** Teammates write commit messages, so the agent gets counts and paths, not their text. */
+function pullSummary({ incoming, conflicts, ...update }) {
+    return {
+        ...update,
+        incomingCount: incoming.length,
+        conflicts: conflicts.map(({ path }) => path),
+    };
+}
+const readStatus = (ctx, app) => ctx.server.getBranchStatus({
+    ...app,
+    ...(ctx.signal ? { signal: ctx.signal } : {}),
+});
+// The server refuses branch actions off a user branch with a 404, which reads as a missing branch.
+const notOnABranch = (action) => ({
+    kind: "error",
+    code: "not_on_a_branch",
+    message: `The user is not on a branch of their own, so there is nothing to ${action}. Call switch_branch or create_branch first.`,
+});
+/** Checkpoints and named commits, newest first, as the editor's history lists them. Drafts are unaccepted changes. */
+const versionsOf = ({ autosaves, commits, }) => [
+    ...autosaves.filter(({ autosaveType }) => autosaveType?.startsWith("savepoint")),
+    ...commits,
+].sort((a, b) => b.commitDate - a.commitDate);
+const toVersion = ({ autosave, commitDate, commitId, commitMessage, committer, }) => ({
+    commitId,
+    message: commitMessage,
+    author: committer.name ?? committer.email,
+    at: new Date(commitDate).toISOString(),
+    kind: autosave ? "checkpoint" : "commit",
+});
+/** Superblocks gets the conflicted files in its own turn context, so the client hands the conflicts to it. */
+function resolveWithSuperblocks(branch, after) {
+    return `The merge stopped on conflicts on branch "${branch}". Call edit_app with branch "${branch}" and ask Superblocks to resolve the merge conflicts. Do not resolve them yourself. ${after}`;
+}
+export function listBranches(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: false,
+        action: async (app, { userId }) => {
+            const status = await readStatus(ctx, app);
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    branch: status.branch,
+                    branchingEnabled: status.branchingEnabled,
+                    mainHead: status.mainHead,
+                    mode: status.mode,
+                    branches: (status.branches ?? []).map((branch) => ({
+                        ...branch,
+                        heldByTeammate: branch.holderId !== null && branch.holderId !== userId,
+                    })),
+                },
+            };
+        },
+    });
+}
+export function getBranchStatus(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: false,
+        action: async (app) => {
+            // Commit messages and author names are teammates' text, so the agent gets the ahead and behind counts.
+            const { branches: _branches, aheadCommits: _aheadCommits, behindCommits: _behindCommits, ...status } = await readStatus(ctx, app);
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    ...status,
+                    ...(status.pendingMerge
+                        ? {
+                            agentInstructions: resolveWithSuperblocks(status.branch, "The conflicted files are in conflictPaths."),
+                        }
+                        : {}),
+                },
+            };
+        },
+    });
+}
+export function enableBranching(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: true,
+        action: async (app) => {
+            await ctx.server.enableBranching({ ...app, name: input.name });
+            const { branch } = await readStatus(ctx, app);
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    created: input.name,
+                    branch,
+                },
+            };
+        },
+    });
+}
+export function createBranch(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: true,
+        action: async (app) => {
+            await ctx.server.createBranch({
+                ...app,
+                base: input.base,
+                name: input.name,
+            });
+            const { branch } = await readStatus(ctx, app);
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    created: input.name,
+                    upstream: input.base,
+                    branch,
+                },
+            };
+        },
+    });
+}
+export function pullBranch(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: true,
+        action: async (app) => {
+            const { branch, mode } = await readStatus(ctx, app);
+            if (mode !== "user-branch") {
+                return notOnABranch("pull into");
+            }
+            const result = await ctx.server.updateBranch({
+                ...app,
+                ...(input.target ? { target: input.target } : {}),
+            });
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    branch,
+                    ...pullSummary(result),
+                    ...(result.outcome === "conflict"
+                        ? {
+                            agentInstructions: resolveWithSuperblocks(branch, "Then call get_branch_status to check that pendingMerge is false."),
+                        }
+                        : {}),
+                },
+            };
+        },
+    });
+}
+export function mergeBranch(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: true,
+        action: async (app) => {
+            const status = await readStatus(ctx, app);
+            if (status.mode !== "user-branch") {
+                return notOnABranch("merge");
+            }
+            const source = input.source ?? status.branch;
+            const other = source === status.branch
+                ? undefined
+                : status.branches?.find(({ name }) => name === source);
+            if (source !== status.branch && !other) {
+                return {
+                    kind: "error",
+                    code: "branch_not_found",
+                    message: `There is no branch named "${source}". Call list_branches for the names.`,
+                };
+            }
+            const target = input.target ?? (other ?? status).upstream;
+            const merge = {
+                applicationId: app.applicationId,
+                branch: source,
+                target,
+            };
+            // Only an explicit target of main means the user confirmed the merge into main.
+            if (input.target === undefined &&
+                (target === null || target === DEFAULT_BRANCH)) {
+                return {
+                    kind: "ok",
+                    value: {
+                        ...merge,
+                        target: DEFAULT_BRANCH,
+                        outcome: "confirmation-required",
+                        agentInstructions: `The upstream of "${source}" is main. Ask the user to confirm the merge into main, then call merge_branch again with target "main".`,
+                    },
+                };
+            }
+            const result = await ctx.server.landBranch({
+                ...app,
+                retryFailedMigrations: false,
+                source,
+                ...(target ? { target } : {}),
+            });
+            const { update, ...land } = result;
+            const pulled = update && pullSummary(update);
+            const value = {
+                ...merge,
+                ...land,
+                ...(pulled ? { update: pulled } : {}),
+                conflicts: pulled?.conflicts ?? [],
+            };
+            // Read before the switch narrows it away: a newer server can send an outcome this build has no case for.
+            const outcome = result.outcome;
+            switch (result.outcome) {
+                case "landed":
+                case "up-to-date":
+                    return { kind: "ok", value };
+                case "conflict":
+                    return {
+                        kind: "ok",
+                        value: {
+                            ...value,
+                            agentInstructions: resolveWithSuperblocks(source, "The merge finishes by itself when the resolution is saved. Then call get_branch_status, and if the branch is still ahead, call merge_branch again."),
+                        },
+                    };
+                case "migrating":
+                case "contended":
+                    return {
+                        kind: "ok",
+                        value: {
+                            ...value,
+                            agentInstructions: "The merge did not finish yet. Call merge_branch again with the same source and target in a minute.",
+                        },
+                    };
+                case "migration-failed":
+                    return {
+                        kind: "error",
+                        code: "merge_failed",
+                        message: `The app database could not apply this branch's migrations: ${result.migrationError ?? "unknown error"}`,
+                    };
+                default:
+                    return {
+                        kind: "error",
+                        code: "merge_failed",
+                        message: `The merge ended with "${outcome}", which this Platform MCP does not know how to finish. Ask the user to merge from the Superblocks editor.`,
+                        pendingAction: "open_editor",
+                    };
+            }
+        },
+    });
+}
+export function deleteBranch(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: true,
+        action: async (app) => {
+            await ctx.server.deleteBranch({
+                ...app,
+                force: input.force,
+                name: input.name,
+            });
+            // The held live-edit session belongs to the deleted branch.
+            if (ctx.sessionPeer.heldContext(app.applicationId)?.branch === input.name) {
+                ctx.sessionPeer.release(app.applicationId);
+            }
+            const { branch } = await readStatus(ctx, app);
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    deleted: input.name,
+                    branch,
+                },
+            };
+        },
+    });
+}
+export function switchBranch(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: true,
+        action: async (app, principal) => {
+            if (input.branch === DEFAULT_BRANCH) {
+                return {
+                    kind: "error",
+                    code: "main_is_view_only",
+                    message: "main is view only and changes reach it through merge_branch. Switch to a branch, or call create_branch to make one.",
+                };
+            }
+            const before = await readStatus(ctx, app);
+            if (!before.branches?.some(({ name }) => name === input.branch)) {
+                return {
+                    kind: "error",
+                    code: "branch_not_found",
+                    message: `There is no branch named "${input.branch}". Call list_branches for the names.`,
+                };
+            }
+            const attached = await attachToBranch({
+                ctx,
+                principal,
+                applicationId: app.applicationId,
+                branch: input.branch,
+            });
+            if (attached.kind !== "ok") {
+                return attached;
+            }
+            const { branch } = await readStatus(ctx, app);
+            if (branch !== input.branch) {
+                return {
+                    kind: "error",
+                    code: "switch_failed",
+                    message: `The server kept "${branch}" as the current branch. Call switch_branch again.`,
+                };
+            }
+            // The user's open editor follows the switch at its next branch status check.
+            return {
+                kind: "ok",
+                value: { applicationId: app.applicationId, branch },
+            };
+        },
+    });
+}
+const COMMITS_SHOWN = 10;
+export function compareBranches(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: false,
+        action: async (app) => {
+            const status = await readStatus(ctx, app);
+            if (status.mode !== "user-branch") {
+                return notOnABranch("compare");
+            }
+            const other = input.other ?? status.upstream ?? DEFAULT_BRANCH;
+            const known = other === DEFAULT_BRANCH ||
+                status.branches?.some(({ name }) => name === other);
+            if (other === status.branch || !known) {
+                return {
+                    kind: "error",
+                    code: "branch_not_found",
+                    message: `"${other}" is not another branch of this app. Call list_branches for the names.`,
+                };
+            }
+            const versionsOn = async (branch) => versionsOf(await ctx.server.listCommits({ ...app, branch }));
+            const [ours, theirs] = await Promise.all([
+                versionsOn(status.branch),
+                versionsOn(other),
+            ]);
+            const ourIds = new Set(ours.map(({ commitId }) => commitId));
+            const theirIds = new Set(theirs.map(({ commitId }) => commitId));
+            // ponytail: each list is the newest 200 versions; a server route that compares two branches lifts this limit.
+            const base = ours.find(({ commitId }) => theirIds.has(commitId));
+            if (!base) {
+                return {
+                    kind: "error",
+                    code: "compare_unavailable",
+                    message: `"${status.branch}" and "${other}" share no version in their recent history. Ask the user to compare them in the Superblocks editor.`,
+                    pendingAction: "open_editor",
+                };
+            }
+            // The changes from the shared version to the newest version only one side has.
+            const oneWay = async (versions, skip) => {
+                const only = versions.filter(({ commitId }) => !skip.has(commitId));
+                const summary = {
+                    count: only.length,
+                    commits: only.slice(0, COMMITS_SHOWN).map(toVersion),
+                };
+                const [head] = only;
+                if (!head) {
+                    return { ...summary, files: [] };
+                }
+                const { changes } = await ctx.server.compareCommits({
+                    ...app,
+                    branch: status.branch,
+                    fromCommit: base.commitId,
+                    toCommit: head.commitId,
+                });
+                return {
+                    ...summary,
+                    files: changes.map(({ action, entityName }) => ({
+                        action,
+                        path: entityName,
+                    })),
+                };
+            };
+            const [incoming, outgoing] = await Promise.all([
+                oneWay(theirs, ourIds),
+                oneWay(ours, theirIds),
+            ]);
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    branch: status.branch,
+                    other,
+                    hasUncommittedChanges: status.hasUncommittedChanges,
+                    incoming,
+                    outgoing,
+                },
+            };
+        },
+    });
+}
+export function getCurrentPublish(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: false,
+        action: async (app, { userId }) => {
+            const { active, last } = await ctx.server.getCurrentPublish(app);
+            const describe = (publish) => ({
+                commitId: publish.commitId,
+                branch: publish.branch,
+                message: publish.commitMessage,
+                by: publish.userName,
+                byTheUser: publish.userId === userId,
+                at: publish.at,
+            });
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    active: active && { ...describe(active), status: active.status },
+                    last: last && { ...describe(last), isLive: last.isLive },
+                },
+            };
+        },
+    });
+}
+export function listVersions(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: false,
+        action: async (app) => {
+            const { branch } = await readStatus(ctx, app);
+            const versions = versionsOf(await ctx.server.listCommits({ ...app, branch, limit: input.limit }));
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    branch,
+                    versions: versions.map(toVersion),
+                },
+            };
+        },
+    });
+}
+export function restoreVersion(ctx, input) {
+    return onApplication({
+        ctx,
+        applicationId: input.applicationId,
+        write: true,
+        action: async (app, principal) => {
+            const { branch, mode } = await readStatus(ctx, app);
+            // Off a branch, the app's sandbox does not reload the restored files by itself; the editor restarts it.
+            if (mode !== "user-branch") {
+                return {
+                    kind: "error",
+                    code: "restore_needs_branch",
+                    message: "restore_version restores a version on the user's own branch, and main is updated by merge_branch only. Call switch_branch first. If branching is off, ask the user to restore the version from the Superblocks editor's history.",
+                    pendingAction: "open_editor",
+                };
+            }
+            const turn = ctx.sessionPeer.turnState({
+                applicationId: app.applicationId,
+                branch,
+                organizationId: principal.organizationId,
+                userId: principal.userId,
+            });
+            if (turn?.phase === "running") {
+                return {
+                    kind: "error",
+                    code: "turn_running",
+                    message: `Superblocks is still changing branch "${branch}". Wait for check_app_progress to finish, then call restore_version again.`,
+                };
+            }
+            const { newCommitId } = await ctx.server.resetBranch({
+                ...app,
+                branch,
+                commitId: input.commitId,
+            });
+            return {
+                kind: "ok",
+                value: {
+                    applicationId: app.applicationId,
+                    branch,
+                    restored: input.commitId,
+                    ...(newCommitId ? { newCommitId } : {}),
+                    agentInstructions: "The branch now has the restored version, and the app reloads it within about 10 seconds.",
+                },
+            };
+        },
+    });
+}
+//# sourceMappingURL=branching.js.map

package/dist/capabilities/branching.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"branching.js","sourceRoot":"","sources":["../../src/capabilities/branching.ts"],"names":[],"mappings":"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"}

package/dist/capabilities/lifecycle.d.ts

@@ -40,6 +40,13 @@ export type CapabilityContext = {
     signal?: AbortSignal;
     stepUpTurns: StepUpTurnStore;
 };
+/** Holds a live edit on `branch`, which makes it the caller's current branch on the server. */
+export declare function attachToBranch({ ctx, principal, applicationId, branch, }: {
+    ctx: CapabilityContext;
+    principal: ResolvedPrincipal;
+    applicationId: string;
+    branch: string;
+}): Promise<CapabilityResult<void>>;
 /**
  * Resolves the Superblocks user behind the CLI session this Gateway was
  * started with.
@@ -58,6 +65,18 @@ export declare function resolveApplicationId(ctx: CapabilityContext, principal:
 options?: {
     unambiguous?: boolean;
 }): Promise<CapabilityResult<string>>;
+/**
+ * Names the application a failed call was working on.
+ *
+ * Every failure past the point where an application exists has to carry its id,
+ * because that id is the caller's only handle on a resource the call already
+ * persisted. `start_app` creates the row before it reaches live edit, so a
+ * connect that times out leaves an app the caller owns and never saw; and every
+ * app-scoped entry point may have resolved the id from the recent-app default
+ * rather than from its arguments, so the failure is the one place a caller can
+ * learn which app it actually drove.
+ */
+export declare function namingApplication<T>(applicationId: string, result: CapabilityResult<T>): CapabilityResult<T>;
 /**
  * Settles a user's plan approval against what became of the prompt it
  * approved.

package/dist/capabilities/lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/capabilities/lifecycle.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EACV,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlD,OAAO,EACL,KAAK,wBAAwB,EAE9B,MAAM,kCAAkC,CAAC;AAM1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAML,KAAK,WAAW,EAIjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAEV,aAAa,EACb,cAAc,EACd,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,KAAK,EAGV,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,yBAAyB,EAEzB,YAAY,EACZ,aAAa,EAEb,YAAY,EACZ,aAAa,EACb,WAAW,EACX,YAAY,EAEZ,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,EACT,aAAa,EACb,eAAe,EACf,gBAAgB,EAEhB,iBAAiB,EAEjB,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,aAAa,CAAC;IACtB,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7D,SAAS,EAAE,SAAS,CAAC;IACrB,uDAAuD;IACvD,QAAQ,EAAE,QAAQ,CAAC;IACnB,+EAA+E;IAC/E,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;IAC3B;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD;;;OAGG;IACH,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,MAAM,EAAE,uBAAuB,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,eAAe,CAAC;CAC9B,CAAC;AAsaF;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAgE9C;AA2HD,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,iBAAiB,EACtB,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,MAAM,GAAG,SAAS;AACjC;;;;GAIG;AACH,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CA6BnC;AAohCD;;;;;;;;;;GAUG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,IAAI,IAAI,CAAC;IACnB,SAAS,IAAI,IAAI,CAAC;CACnB,CAAC;AAgJF,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAoH3C;AAwQD,wBAAsB,cAAc,CAClC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,mBAAmB,GACzB,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC,CAiDjD;AAwQD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,CAqInD;AAyGD,wBAAsB,OAAO,CAC3B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,YAAY,EACnB,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,kBAAkB,GACtC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CA4B1C;AAsbD;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAiO7C;AAED,+EAA+E;AAC/E,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CA8EhD;AA8gBD;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAC3B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAsE1C;AAED;;GAEG;AACH,wBAAsB,MAAM,CAC1B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAyFzC;AA2GD,wBAAgB,eAAe,CAAC,KAAK,EAAE;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAsBpC;AAED,wBAAsB,UAAU,CAC9B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAsB7C;AAyED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CA8N7C"}
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/capabilities/lifecycle.ts"],"names":[],"mappings":"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"}