@deksden-com/dd-flow-cli 0.9.0-beta.113 → 0.9.0-beta.114
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/CHANGELOG.md +6 -0
- package/dist/build-info.json +3 -3
- package/dist/services/hooks.js +7 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @deksden-com/dd-flow-cli
|
|
2
2
|
|
|
3
|
+
## 0.9.0-beta.114
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Route controlled `merge apply` and `merge repair` hooks to the MERGE request's integration workspace, preserving native cwd validation across AGY, OpenCode, and Droid.
|
|
8
|
+
|
|
3
9
|
## 0.9.0-beta.113
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
package/dist/build-info.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"cli_package": "@deksden-com/dd-flow-cli",
|
|
3
|
-
"cli_version": "0.9.0-beta.
|
|
4
|
-
"cli_commit": "
|
|
5
|
-
"built_at": "2026-09-
|
|
3
|
+
"cli_version": "0.9.0-beta.114",
|
|
4
|
+
"cli_commit": "b2fd68b574186d2202266ad9856455cc59ce7ed9",
|
|
5
|
+
"built_at": "2026-09-27T17:40:23.830Z",
|
|
6
6
|
"built_with_canon": {
|
|
7
7
|
"version": "4.1.1",
|
|
8
8
|
"commit": "678daa038287c948ada5b2d785a6dcc925c7b891",
|
package/dist/services/hooks.js
CHANGED
|
@@ -676,6 +676,12 @@ function controlledLifecycleCwd(context, projectRoot, facts, providerSessionId,
|
|
|
676
676
|
const project = context.db.get("SELECT id FROM projects WHERE root = ?", [projectRoot]);
|
|
677
677
|
if (!project)
|
|
678
678
|
return projectRoot;
|
|
679
|
+
if (facts?.invocation.operation === "merge_apply" || facts?.invocation.operation === "merge_repair") {
|
|
680
|
+
const requestId = commandPosition(facts.invocation, 0);
|
|
681
|
+
const request = requestId && context.db.get("SELECT target_workspace FROM merge_requests WHERE project_id = ? AND merge_request_id = ?", [project.id, requestId]);
|
|
682
|
+
if (request)
|
|
683
|
+
return resolveProjectRoot(request.target_workspace);
|
|
684
|
+
}
|
|
679
685
|
let work;
|
|
680
686
|
if (facts?.workId) {
|
|
681
687
|
try {
|
|
@@ -718,7 +724,7 @@ function controlledLifecycleCwd(context, projectRoot, facts, providerSessionId,
|
|
|
718
724
|
}
|
|
719
725
|
if (facts?.stageName === "specify" || facts?.stageName === "protocolize")
|
|
720
726
|
return projectRoot;
|
|
721
|
-
if (facts?.stageName === "merge") {
|
|
727
|
+
if (facts?.stageName === "merge" || facts?.invocation.operation === "merge_apply" || facts?.invocation.operation === "merge_repair") {
|
|
722
728
|
const pending = context.db.all("SELECT target_workspace FROM merge_requests WHERE project_id = ? AND run_id = ? AND status IN ('dispatching','active','action_required') ORDER BY updated_at DESC", [project.id, run.id]);
|
|
723
729
|
const targets = [...new Set(pending.map(item => resolveProjectRoot(item.target_workspace)))];
|
|
724
730
|
if (targets.length > 1)
|