@idea1/cli 1.8.1 → 1.8.3

package/dist/workflow/engine/handlers/agent-implementation.js

@@ -4,18 +4,24 @@ import { projectItemPromptModel, renderAgentImplementationPrompt } from '../../.
 import * as git from '../../../services/git.js';
 import * as worktree from '../../../services/worktree.js';
 import { WorkflowStates } from '../../data/workflow-states.js';
-import { requireLiveContext, requireWorkingPath } from '../workflow-engine.js';
+import { logger } from '../../../lib/logger.js';
+import { isWorkMerged, requireLiveContext, requireWorkingPath } from '../workflow-engine.js';
 /**
  * Entering "Agent Implementation": make sure the branch is checked out locally
  * (worktree or main repo, per the isolation mode), then — once the state is
  * recorded — launch Claude to implement the item with the Agent Implementation
  * prompt, rendered against the item's branch context. This is the only
- * transition that starts code-writing automation.
+ * transition that starts code-writing automation. Work that is already merged
+ * has no branch to implement on, so re-entering the state then does nothing.
  */
 export const agentImplementationHandler = {
     state: WorkflowStates.AgentImplementation,
-    options: [isolationModeOption, ...claudeSessionOptions, claudeEntryPointOption, ...claudeEntryPointPromptOptions],
+    options: [isolationModeOption, claudeEntryPointOption, ...claudeSessionOptions, ...claudeEntryPointPromptOptions],
     async prepare(transition) {
+        if (isWorkMerged(transition)) {
+            logger.dim('The item\'s work is already merged; nothing to do.');
+            return;
+        }
         const { branchName } = requireLiveContext(transition);
         const isolationMode = resolveIsolationMode(transition.options);
         const { workingPath } = await worktree.ensureBranchEnvironment(isolationMode, branchName);
@@ -25,6 +31,9 @@ export const agentImplementationHandler = {
         }
     },
     async complete(transition) {
+        if (isWorkMerged(transition)) {
+            return;
+        }
         const context = requireLiveContext(transition);
         const workingPath = requireWorkingPath(transition, 'run the implementation session');
         const { permissionMode, model, effort, claudeEntryPointMode, entryPointPrompt } = resolveClaudeSessionOptions(transition.options);

package/dist/workflow/engine/handlers/agent-implementation.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-implementation.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/agent-implementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC1J,OAAO,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AACnH,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAA6B,MAAM,uBAAuB,CAAC;AAE1G;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAyB;IAC9D,KAAK,EAAE,cAAc,CAAC,mBAAmB;IACzC,OAAO,EAAE,CAAC,mBAAmB,EAAE,GAAG,oBAAoB,EAAE,sBAAsB,EAAE,GAAG,6BAA6B,CAAC;IAEjH,KAAK,CAAC,OAAO,CAAC,UAAU;QACtB,MAAM,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAE/D,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,uBAAuB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC1F,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC;QAErC,IAAI,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,WAAW,EAAE,CAAC;YACrD,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,kBAAkB,CAAC,UAAU,EAAE,gCAAgC,CAAC,CAAC;QACrF,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,GAAG,2BAA2B,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClI,MAAM,MAAM,GAAG,MAAM,+BAA+B,CAClD,sBAAsB,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,EACvE,gBAAgB,CACjB,CAAC;QAEF,MAAM,QAAQ,CAAC,qBAAqB,CAAC,WAAW,EAAE;YAChD,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,MAAM;YACN,cAAc;YACd,KAAK;YACL,MAAM;YACN,oBAAoB;SACrB,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"agent-implementation.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/agent-implementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC1J,OAAO,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AACnH,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAA6B,MAAM,uBAAuB,CAAC;AAExH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAyB;IAC9D,KAAK,EAAE,cAAc,CAAC,mBAAmB;IACzC,OAAO,EAAE,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,oBAAoB,EAAE,GAAG,6BAA6B,CAAC;IAEjH,KAAK,CAAC,OAAO,CAAC,UAAU;QACtB,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAE/D,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,uBAAuB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC1F,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC;QAErC,IAAI,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,WAAW,EAAE,CAAC;YACrD,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,kBAAkB,CAAC,UAAU,EAAE,gCAAgC,CAAC,CAAC;QACrF,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,GAAG,2BAA2B,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClI,MAAM,MAAM,GAAG,MAAM,+BAA+B,CAClD,sBAAsB,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,EACvE,gBAAgB,CACjB,CAAC;QAEF,MAAM,QAAQ,CAAC,qBAAqB,CAAC,WAAW,EAAE;YAChD,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,MAAM;YACN,cAAc;YACd,KAAK;YACL,MAAM;YACN,oBAAoB;SACrB,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/workflow/engine/handlers/approve-pr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approve-pr.d.ts","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/approve-pr.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsC,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEtG;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB,EAAE,oBAiD9B,CAAC"}
+{"version":3,"file":"approve-pr.d.ts","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/approve-pr.ts"],"names":[],"mappings":"AAOA,OAAO,EAAoD,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEpH;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB,EAAE,oBAuD9B,CAAC"}

package/dist/workflow/engine/handlers/approve-pr.js

@@ -3,9 +3,9 @@ import * as git from '../../../services/git.js';
 import * as github from '../../../services/github.js';
 import { WorkflowBranchState } from '../../data/workflow-context.js';
 import { WorkflowStates } from '../../data/workflow-states.js';
-import { cleanUpMergedBranch, mergeAsApprover } from '../approval-flow.js';
-import { confirmApproverIdentity } from '../release-flow.js';
-import { requireContext, requireLiveContext } from '../workflow-engine.js';
+import { cleanUpMergedBranch, mergeAsApprover, mergeConfirmationOption } from '../approval-flow.js';
+import { confirmApproverIdentity } from '../release-engine.js';
+import { isWorkMerged, requireContext, requireLiveContext } from '../workflow-engine.js';
 /**
  * Entering "Approved and Merged": merge the PR. The merge IS the approval - it is performed by
  * the PR's assignee, and GitHub records it as `merged_by` with a timestamp and merge commit
@@ -20,9 +20,10 @@ import { requireContext, requireLiveContext } from '../workflow-engine.js';
  */
 export const approvePrHandler = {
     state: WorkflowStates.ApprovedAndMerged,
+    options: [mergeConfirmationOption],
     async prepare(transition) {
         // The pull request was merged on an earlier pass through this state.
-        if (requireContext(transition).branchState === WorkflowBranchState.Merged) {
+        if (isWorkMerged(transition)) {
             logger.dim('The branch\'s PR is already merged; nothing to approve.');
             return;
         }
@@ -43,7 +44,12 @@ export const approvePrHandler = {
             return;
         }
         await confirmApproverIdentity(context.branchName);
-        await mergeAsApprover({ branchName: context.branchName, baseBranch: context.baseBranch, prNumber: prInfo.number });
+        await mergeAsApprover({
+            branchName: context.branchName,
+            baseBranch: context.baseBranch,
+            prNumber: prInfo.number,
+            confirmed: transition.options[mergeConfirmationOption.longName] === 'true'
+        });
         context.branchState = WorkflowBranchState.Merged;
     },
     async complete(transition) {

package/dist/workflow/engine/handlers/approve-pr.js.map

@@ -1 +1 @@
-{"version":3,"file":"approve-pr.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/approve-pr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAA6B,MAAM,uBAAuB,CAAC;AAEtG;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAyB;IACpD,KAAK,EAAE,cAAc,CAAC,iBAAiB;IAEvC,KAAK,CAAC,OAAO,CAAC,UAAU;QACtB,qEAAqE;QACrE,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC,WAAW,KAAK,mBAAmB,CAAC,MAAM,EAAE,CAAC;YAC1E,MAAM,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,MAAM,QAAQ,CAAC,CAAC;QAC1C,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC;QAEpC,oFAAoF;QACpF,IAAI,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,CAAC,GAAG,CAAC,OAAO,MAAM,CAAC,MAAM,yCAAyC,CAAC,CAAC;YAC1E,OAAO,CAAC,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC;YACjD,OAAO;QACT,CAAC;QAED,MAAM,uBAAuB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,eAAe,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACnH,OAAO,CAAC,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,MAAM,OAAO,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,mBAAmB,CAAC;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,UAAU,CAAC,WAAW;SACpC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACrC,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,UAAU,uCAAuC,CAAC,CAAC;QACzF,MAAM,CAAC,IAAI,CAAC,iBAAiB,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF,CAAC"}
+{"version":3,"file":"approve-pr.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/approve-pr.ts"],"names":[],"mappings":"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"}

package/dist/workflow/engine/handlers/dev-implementation.d.ts

@@ -3,7 +3,8 @@ import { type WorkflowStateHandler } from '../workflow-engine.js';
  * Entering "Dev Implementation": the agent's work is committed and pushed and a
  * PR exists, so a developer can test, clean up and finish the work. Afterwards
  * the worktree is removed when `removeWorktreeAtState` says so. Idempotent: an
- * existing PR is reused and a clean branch is pushed as it is.
+ * existing PR is reused, a clean branch is pushed as it is, and work that is
+ * already merged is left as it is.
  */
 export declare const devImplementationHandler: WorkflowStateHandler;
 //# sourceMappingURL=dev-implementation.d.ts.map

package/dist/workflow/engine/handlers/dev-implementation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-implementation.d.ts","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/dev-implementation.ts"],"names":[],"mappings":"AAKA,OAAO,EAA0C,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE1G;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,EAAE,oBA2BtC,CAAC"}
+{"version":3,"file":"dev-implementation.d.ts","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/dev-implementation.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwD,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAExH;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,EAAE,oBAoCtC,CAAC"}

package/dist/workflow/engine/handlers/dev-implementation.js

@@ -3,16 +3,21 @@ import * as git from '../../../services/git.js';
 import * as github from '../../../services/github.js';
 import { removeWorktreeForWorkflowState } from '../../../services/worktree.js';
 import { WorkflowStates } from '../../data/workflow-states.js';
-import { requireLiveContext, requireWorkingPath } from '../workflow-engine.js';
+import { isWorkMerged, requireLiveContext, requireWorkingPath } from '../workflow-engine.js';
 /**
  * Entering "Dev Implementation": the agent's work is committed and pushed and a
  * PR exists, so a developer can test, clean up and finish the work. Afterwards
  * the worktree is removed when `removeWorktreeAtState` says so. Idempotent: an
- * existing PR is reused and a clean branch is pushed as it is.
+ * existing PR is reused, a clean branch is pushed as it is, and work that is
+ * already merged is left as it is.
  */
 export const devImplementationHandler = {
     state: WorkflowStates.DevImplementation,
     async prepare(transition) {
+        if (isWorkMerged(transition)) {
+            logger.dim('The item\'s work is already merged; nothing to do.');
+            return;
+        }
         const context = requireLiveContext(transition);
         requireWorkingPath(transition, 'commit and push the implementation');
         if (await git.hasUncommittedChanges()) {
@@ -26,6 +31,9 @@ export const devImplementationHandler = {
         }
     },
     async complete(transition) {
+        if (isWorkMerged(transition)) {
+            return;
+        }
         const { branchName } = requireLiveContext(transition);
         await removeWorktreeForWorkflowState(WorkflowStates.DevImplementation, branchName, transition.projectItemUrl, { checkoutBranchInMainRepo: false });
         logger.newline();

package/dist/workflow/engine/handlers/dev-implementation.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-implementation.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/dev-implementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAA6B,MAAM,uBAAuB,CAAC;AAE1G;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAyB;IAC5D,KAAK,EAAE,cAAc,CAAC,iBAAiB;IAEvC,KAAK,CAAC,OAAO,CAAC,UAAU;QACtB,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,kBAAkB,CAAC,UAAU,EAAE,oCAAoC,CAAC,CAAC;QAErE,IAAI,MAAM,GAAG,CAAC,qBAAqB,EAAE,EAAE,CAAC;YACtC,MAAM,GAAG,CAAC,gBAAgB,CAAC,2BAA2B,UAAU,CAAC,cAAc,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9G,CAAC;QACD,MAAM,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC;QAChH,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,MAAM,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,8BAA8B,CAAC,cAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,EAAE,wBAAwB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEnJ,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,0GAA0G,CAAC,CAAC;IAC1H,CAAC;CACF,CAAC"}
+{"version":3,"file":"dev-implementation.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/dev-implementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAA6B,MAAM,uBAAuB,CAAC;AAExH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAyB;IAC5D,KAAK,EAAE,cAAc,CAAC,iBAAiB;IAEvC,KAAK,CAAC,OAAO,CAAC,UAAU;QACtB,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC/C,kBAAkB,CAAC,UAAU,EAAE,oCAAoC,CAAC,CAAC;QAErE,IAAI,MAAM,GAAG,CAAC,qBAAqB,EAAE,EAAE,CAAC;YACtC,MAAM,GAAG,CAAC,gBAAgB,CAAC,2BAA2B,UAAU,CAAC,cAAc,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9G,CAAC;QACD,MAAM,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC;QAChH,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,8BAA8B,CAAC,cAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,EAAE,wBAAwB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEnJ,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,0GAA0G,CAAC,CAAC;IAC1H,CAAC;CACF,CAAC"}

package/dist/workflow/engine/handlers/ready-for-approval.d.ts

@@ -1,11 +1,17 @@
+import type { CommandOption } from '../../../types/index.js';
 import { type WorkflowStateHandler } from '../workflow-engine.js';
+/**
+ * Reviewers requested on the PR. Optional: the assignee is the approver.
+ */
+export declare const reviewersOption: CommandOption;
 /**
  * Entering "Needs Approval for Release": the PR is complete and gets its assignee - the person
  * who will approve it by merging it with `idea1 approve-pr`. The assignee is required: without
  * one the PR has no approver of record (change-management-policy.md clause 2). Reviewers are
  * optional. From here on the branch stays as it is, so the CI/CD run the approval is gated on is
  * the run on the code exactly as it will merge. Afterwards the worktree is removed when
- * `removeWorktreeAtState` says so (this state is the default).
+ * `removeWorktreeAtState` says so (this state is the default). Work that is already merged has
+ * nothing left to approve, so re-entering the state then does nothing.
  */
 export declare const readyForApprovalHandler: WorkflowStateHandler;
 //# sourceMappingURL=ready-for-approval.d.ts.map

package/dist/workflow/engine/handlers/ready-for-approval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ready-for-approval.d.ts","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/ready-for-approval.ts"],"names":[],"mappings":"AAKA,OAAO,EAAsB,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEtF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,EAAE,oBA6CrC,CAAC"}
+{"version":3,"file":"ready-for-approval.d.ts","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/ready-for-approval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,OAAO,EAAoC,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEpG;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,aAM7B,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,EAAE,oBAgDrC,CAAC"}

package/dist/workflow/engine/handlers/ready-for-approval.js

@@ -3,14 +3,25 @@ import * as git from '../../../services/git.js';
 import { removeWorktreeForWorkflowState } from '../../../services/worktree.js';
 import { WorkflowStates } from '../../data/workflow-states.js';
 import { ensurePrReadyForApproval } from '../approval-flow.js';
-import { requireLiveContext } from '../workflow-engine.js';
+import { isWorkMerged, requireLiveContext } from '../workflow-engine.js';
+/**
+ * Reviewers requested on the PR. Optional: the assignee is the approver.
+ */
+export const reviewersOption = {
+    longName: 'reviewers',
+    shortName: 'r',
+    description: 'Who to request a review from - optional, the assignee is the approver (select any number)',
+    choices: 'github-members',
+    multiSelect: true
+};
 /**
  * Entering "Needs Approval for Release": the PR is complete and gets its assignee - the person
  * who will approve it by merging it with `idea1 approve-pr`. The assignee is required: without
  * one the PR has no approver of record (change-management-policy.md clause 2). Reviewers are
  * optional. From here on the branch stays as it is, so the CI/CD run the approval is gated on is
  * the run on the code exactly as it will merge. Afterwards the worktree is removed when
- * `removeWorktreeAtState` says so (this state is the default).
+ * `removeWorktreeAtState` says so (this state is the default). Work that is already merged has
+ * nothing left to approve, so re-entering the state then does nothing.
  */
 export const readyForApprovalHandler = {
     state: WorkflowStates.NeedsApprovalForRelease,
@@ -22,15 +33,13 @@ export const readyForApprovalHandler = {
             choices: 'github-members',
             validate: value => value.trim() ? undefined : 'An assignee is required - the assignee is the approver of record'
         },
-        {
-            longName: 'reviewers',
-            shortName: 'r',
-            description: 'Who to request a review from - optional, the assignee is the approver (select any number)',
-            choices: 'github-members',
-            multiSelect: true
-        }
+        reviewersOption
     ],
     async prepare(transition) {
+        if (isWorkMerged(transition)) {
+            logger.dim('The item\'s work is already merged; nothing to do.');
+            return;
+        }
         const context = requireLiveContext(transition);
         if (transition.workingPath) {
             await git.ensureBranchUpToDate();
@@ -46,6 +55,9 @@ export const readyForApprovalHandler = {
         context.pullRequestUrl = prInfo.url;
     },
     async complete(transition) {
+        if (isWorkMerged(transition)) {
+            return;
+        }
         const { branchName } = requireLiveContext(transition);
         await removeWorktreeForWorkflowState(WorkflowStates.NeedsApprovalForRelease, branchName, transition.projectItemUrl, { checkoutBranchInMainRepo: false });
         logger.newline();

package/dist/workflow/engine/handlers/ready-for-approval.js.map

@@ -1 +1 @@
-{"version":3,"file":"ready-for-approval.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/ready-for-approval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAA6B,MAAM,uBAAuB,CAAC;AAEtF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAyB;IAC3D,KAAK,EAAE,cAAc,CAAC,uBAAuB;IAC7C,OAAO,EAAE;QACP;YACE,QAAQ,EAAE,UAAU;YACpB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,+FAA+F;YAC5G,OAAO,EAAE,gBAAgB;YACzB,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kEAAkE;SACjH;QACD;YACE,QAAQ,EAAE,WAAW;YACrB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,2FAA2F;YACxG,OAAO,EAAE,gBAAgB;YACzB,WAAW,EAAE,IAAI;SAClB;KACF;IAED,KAAK,CAAC,OAAO,CAAC,UAAU;QACtB,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACnC,CAAC;QAED,oFAAoF;QACpF,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC;YAC5C,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC;YACxC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;YAChD,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QACH,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,MAAM,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,8BAA8B,CAAC,cAAc,CAAC,uBAAuB,EAAE,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,EAAE,wBAAwB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEzJ,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,qGAAqG,CAAC,CAAC;IACrH,CAAC;CACF,CAAC"}
+{"version":3,"file":"ready-for-approval.js","sourceRoot":"","sources":["../../../../src/workflow/engine/handlers/ready-for-approval.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAA6B,MAAM,uBAAuB,CAAC;AAEpG;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAkB;IAC5C,QAAQ,EAAE,WAAW;IACrB,SAAS,EAAE,GAAG;IACd,WAAW,EAAE,2FAA2F;IACxG,OAAO,EAAE,gBAAgB;IACzB,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAyB;IAC3D,KAAK,EAAE,cAAc,CAAC,uBAAuB;IAC7C,OAAO,EAAE;QACP;YACE,QAAQ,EAAE,UAAU;YACpB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,+FAA+F;YAC5G,OAAO,EAAE,gBAAgB;YACzB,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kEAAkE;SACjH;QACD,eAAe;KAChB;IAED,KAAK,CAAC,OAAO,CAAC,UAAU;QACtB,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACnC,CAAC;QAED,oFAAoF;QACpF,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC;YAC5C,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC;YACxC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;YAChD,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QACH,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,8BAA8B,CAAC,cAAc,CAAC,uBAAuB,EAAE,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,EAAE,wBAAwB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEzJ,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,qGAAqG,CAAC,CAAC;IACrH,CAAC;CACF,CAAC"}

package/dist/workflow/engine/{release-flow.d.ts → release-engine.d.ts}

@@ -1,11 +1,23 @@
-import type { CommandOption } from '../../types/index.js';
+import type { CommandOption, VersionedPackage } from '../../types/index.js';
 /**
- * The gated PR sequence: a PR whose body is the approval chain of the changes it carries, assigned
+ * The release engine: the gated PR sequence, a PR whose body is the approval chain of the changes it carries, assigned
  * to its approver, merged only once the required CI/CD checks have passed. `idea1 release`
  * (release branch -> main) runs the whole sequence here, including the one sanctioned admin
  * override (change-management-policy.md clause 3) recorded on the PR before any merge happens.
  * `idea1 ready-for-approval` opens a stage-1 change PR with the same kind of body for a branch
  * that has no project item (see approval-flow.ts).
+ *
+ * A release's version bumps land on the release branch before its PR is opened, so the PR's head,
+ * and the one CI/CD run the release is gated on, already carry them. The packages that changed since
+ * the last release are detected here, and this engine makes the bump itself: it edits each package's
+ * `package.json` and the lockfiles above it in the local checkout, commits the edit as one
+ * `chore: bump ...` commit, and pushes it. The repository only declares which folders are candidates
+ * (`release.versionedPackages` in `.idea1/settings.json`); no script or workflow is involved.
+ *
+ * The platform's `ReleaseEngine` (backend-core/applicationlayer/workflow) runs the same release
+ * sequence from the web app and writes the same PR and the same bump commit, by making the same edits
+ * to the same files and committing them through the GitHub API instead of a local checkout, so a
+ * release cut on either side reads the same. Keep the two in step.
  */
 /** Which command opened the PR; shapes the PR body and the override record. */
 export interface GatedPrKind {
@@ -28,7 +40,8 @@ export type PrMode = 'create' | 'merge';
 /**
  * The `--pr-mode` option of `idea1 release`. `create` is the default: the PR is opened and the
  * approver merges it in GitHub once the required checks are green - that merge is the approval of
- * record, exactly as in `merge` mode, where the CLI waits for the checks and merges here.
+ * record, exactly as in `merge` mode, where the CLI turns on GitHub's auto-merge on the approver's
+ * behalf (or, where GitHub can't auto-merge, waits for the checks and merges here).
  */
 export declare const PR_MODE_OPTION: CommandOption;
 /** The first line of the comment that records an admin override; the evidence script keys on it. */
@@ -40,11 +53,46 @@ export declare const OVERRIDE_COMMENT_MARKER = "**Change-management exception: m
  * the two separately.
  */
 export declare const UNAPPROVED_COMMITS_COMMENT_MARKER = "**Change-management exception: released with commits that had no pull request.**";
+/**
+ * The first line of the comment that records a release approved in the Idea1 web app. A web merge,
+ * or a web-enabled auto-merge, is performed by the Idea1 GitHub App, so GitHub records the app as
+ * `merged_by`; the platform posts this comment, naming the approver, before the merge happens, and
+ * the evidence script keys on it to attribute the merge to that approver.
+ */
+export declare const RELEASE_APPROVAL_COMMENT_MARKER = "**Change-management approval: release approved in Idea1.**";
 /**
  * The local checkout must be the source branch, clean, fully pushed and level with origin, so the
  * PR carries exactly what the person running the command is looking at.
  */
 export declare function validateSourceBranch(sourceBranch: string): Promise<void>;
+export type VersionBumpType = 'patch' | 'minor' | 'major';
+export declare const VERSION_BUMP_TYPES: readonly VersionBumpType[];
+/** A versioned package that changed in the release without its version being bumped yet. */
+export interface PendingVersionBump extends VersionedPackage {
+    currentVersion: string;
+}
+/**
+ * The versioned packages the release still has to bump, read from origin's branches as last
+ * fetched. A package needs a bump when its folder changed between the target and the release
+ * branch and its package.json version is still the same on both - a version that already differs
+ * was bumped for this release, so re-running a release never bumps twice. The Idea1 web app applies
+ * the same rule.
+ */
+export declare function detectPendingVersionBumps(packages: readonly VersionedPackage[], releaseBranch: string, targetBranch: string): Promise<PendingVersionBump[]>;
+export interface CommitVersionBumpsOptions {
+    /** The release branch, which must be the checked-out branch. */
+    releaseBranch: string;
+    /** The packages that need a bump, as `detectPendingVersionBumps` returned them. */
+    pending: readonly PendingVersionBump[];
+    /** Bump type per package name; every pending package needs one. */
+    bumps: Record<string, VersionBumpType>;
+}
+/**
+ * Bump the versions of the pending packages in one commit on the release branch and push it, so
+ * the release PR opens against a branch that already carries them. The commit is `chore: bump
+ * <package> <version>, ...` and is made as whoever runs the command.
+ */
+export declare function commitVersionBumps(options: CommitVersionBumpsOptions): Promise<void>;
 interface BranchCommit {
     sha: string;
     author: string;
@@ -101,20 +149,43 @@ export declare function confirmApproverIdentity(branchName: string): Promise<voi
  * comment cannot be posted, nothing is merged.
  */
 export declare function mergeWithCheckGate(branchName: string, kind: GatedPrKind): Promise<void>;
+/** What `enableAutoMergeOrPoll` left the PR as. */
+export type AutoMergeOutcome = 'auto-merge-enabled' | 'merged';
+/**
+ * Merge the PR the way that records the person running this as `merged_by`, without them having to
+ * wait: GitHub's auto-merge, which merges once the required checks pass. Where GitHub can't
+ * auto-merge (the PR is already mergeable, or the repository doesn't allow auto-merge), it falls
+ * back to waiting for the checks here and merging (`mergeWithCheckGate`, with its admin-override
+ * path). Any other refusal throws.
+ */
+export declare function enableAutoMergeOrPoll(branchName: string, kind: GatedPrKind): Promise<AutoMergeOutcome>;
 export interface RunPrModeOptions {
     mode: PrMode;
     sourceBranch: string;
     targetBranch: string;
     prUrl: string;
     kind: GatedPrKind;
-    /** Open the Actions page after the merge - the merge to main triggers the production deploy. */
+    /**
+     * Open the Actions page after a merge made here - the merge to main triggers the production
+     * deploy. An auto-merge GitHub performs later opens nothing.
+     */
     openActionsAfterMerge: boolean;
 }
 /**
  * Finish the sequence in the chosen mode. Either way the merge is the approval of record: in
  * `create` mode the approver performs it in GitHub once the checks are green; in `merge` mode the
- * CLI waits for the checks and performs it here, as the approver.
+ * CLI turns on GitHub's auto-merge as the approver, so GitHub merges once the checks pass and
+ * records the approver as the merger - or, where GitHub can't auto-merge, waits for the checks and
+ * merges here.
  */
 export declare function runPrMode(options: RunPrModeOptions): Promise<void>;
+/**
+ * `idea1 release --approve`: approve and merge the open release PR from the source branch into the
+ * target, as its approver. With every check passed it merges now; with checks still running it
+ * turns on auto-merge (or waits and merges where GitHub can't auto-merge); with a failed check it
+ * goes to the gate's admin-override path, which refuses unless the override is confirmed, reasoned
+ * and recorded.
+ */
+export declare function approveRelease(sourceBranch: string, targetBranch: string): Promise<void>;
 export {};
-//# sourceMappingURL=release-flow.d.ts.map
+//# sourceMappingURL=release-engine.d.ts.map

package/dist/workflow/engine/release-engine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"release-engine.d.ts","sourceRoot":"","sources":["../../../src/workflow/engine/release-engine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAQ5E;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,+EAA+E;AAC/E,MAAM,WAAW,WAAW;IAC1B,+DAA+D;IAC/D,WAAW,EAAE,MAAM,CAAC;IACpB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,sBAAsB,EAAE,OAAO,CAAC;CACjC;AAED,eAAO,MAAM,YAAY,EAAE,WAA+F,CAAC;AAC3H,eAAO,MAAM,WAAW,EAAE,WAAwG,CAAC;AAEnI,MAAM,MAAM,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AAExC;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAC;AAEF,oGAAoG;AACpG,eAAO,MAAM,uBAAuB,iEAAiE,CAAC;AAEtG;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,qFACsC,CAAC;AAErF;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,+DAA+D,CAAC;AAE5G;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C9E;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAE1D,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAAgC,CAAC;AAK1F,4FAA4F;AAC5F,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D,cAAc,EAAE,MAAM,CAAC;CACxB;AAiBD;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,SAAS,gBAAgB,EAAE,EACrC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAkB/B;AA0HD,MAAM,WAAW,yBAAyB;IACxC,gEAAgE;IAChE,aAAa,EAAE,MAAM,CAAC;IACtB,mFAAmF;IACnF,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACvC,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CACxC;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB1F;AAED,UAAU,YAAY;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAmDD,wFAAwF;AACxF,MAAM,WAAW,sBAAsB;IACrC,kEAAkE;IAClE,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,8FAA8F;AAC9F,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC1C;AAyED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CAkJxB;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC;CACnB;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBlF;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8B/E;AAsBD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC7F;AAED,mDAAmD;AACnD,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,QAAQ,CAAC;AAS/D;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAe5G;AA+BD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,CAAC;IAClB;;;OAGG;IACH,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BxE;AA2BD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC9F"}