@cleocode/cleo 2026.4.157 → 2026.4.158
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/dist/cli/index.js +12 -3
- package/dist/cli/index.js.map +2 -2
- package/package.json +9 -9
package/dist/cli/index.js
CHANGED
|
@@ -9080,7 +9080,7 @@ var init_registry = __esm({
|
|
|
9080
9080
|
gateway: "mutate",
|
|
9081
9081
|
domain: "orchestrate",
|
|
9082
9082
|
operation: "worktree.complete",
|
|
9083
|
-
description: "orchestrate.worktree.complete (mutate) \u2014
|
|
9083
|
+
description: "orchestrate.worktree.complete (mutate) \u2014 merge (--no-ff) a task worktree branch into the project default branch (preserves agent commit SHAs per ADR-062) and clean up the worktree",
|
|
9084
9084
|
tier: 2,
|
|
9085
9085
|
idempotent: false,
|
|
9086
9086
|
sessionRequired: false,
|
|
@@ -28893,8 +28893,17 @@ async function orchestrateAnalyzeParallelSafety(taskIds, projectRoot) {
|
|
|
28893
28893
|
}
|
|
28894
28894
|
async function handleWorktreeComplete(taskId, projectRoot) {
|
|
28895
28895
|
try {
|
|
28896
|
-
const {
|
|
28897
|
-
const result =
|
|
28896
|
+
const { completeAgentWorktreeViaMerge } = await import("@cleocode/core/internal");
|
|
28897
|
+
const result = completeAgentWorktreeViaMerge(taskId, projectRoot);
|
|
28898
|
+
if (!result.merged && result.error) {
|
|
28899
|
+
return {
|
|
28900
|
+
success: false,
|
|
28901
|
+
error: {
|
|
28902
|
+
code: "E_WORKTREE_COMPLETE_FAILED",
|
|
28903
|
+
message: result.error
|
|
28904
|
+
}
|
|
28905
|
+
};
|
|
28906
|
+
}
|
|
28898
28907
|
return { success: true, data: result };
|
|
28899
28908
|
} catch (error) {
|
|
28900
28909
|
getLogger11("domain:orchestrate").error(
|