@deksden-com/dd-flow-cli 0.9.0-beta.113 → 0.9.0-beta.115

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @deksden-com/dd-flow-cli
 
+## 0.9.0-beta.115
+
+### Patch Changes
+
+- Freeze the reviewed source check profile for MERGE after verifying that it only adds aliases to the integration baseline; keep existing check policy immutable and verify the post-apply profile against that frozen source.
+
+## 0.9.0-beta.114
+
+### Patch Changes
+
+- Route controlled `merge apply` and `merge repair` hooks to the MERGE request's integration workspace, preserving native cwd validation across AGY, OpenCode, and Droid.
+
 ## 0.9.0-beta.113
 
 ### Patch Changes

package/dist/build-info.json

@@ -1,8 +1,8 @@
 {
   "cli_package": "@deksden-com/dd-flow-cli",
-  "cli_version": "0.9.0-beta.113",
-  "cli_commit": "97203d7f7def0313962f58ed3476cde9d9f57a74",
-  "built_at": "2026-09-27T15:24:27.962Z",
+  "cli_version": "0.9.0-beta.115",
+  "cli_commit": "c9825bc3272340c5583cab59ccdaab47c9968b10",
+  "built_at": "2026-09-27T17:57:38.414Z",
   "built_with_canon": {
     "version": "4.1.1",
     "commit": "678daa038287c948ada5b2d785a6dcc925c7b891",

package/dist/services/code-checks.js

@@ -3,6 +3,7 @@ import { isGitlessWorkspace, ownedWorkspaceHookPath, projectServicePathFilter, w
 import { spawn, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
+import { isDeepStrictEqual } from "node:util";
 import { parse } from "shell-quote";
 import { assertRunMutationAllowed } from "./run-recovery.js";
 import { AppError } from "../shared/errors.js";
@@ -66,6 +67,32 @@ export function codeCheckProfileHash(workspaceRoot, checks = []) {
     };
     return crypto.createHash("sha256").update(JSON.stringify(canonical)).digest("hex");
 }
+/** The integration target starts at its baseline profile; the reviewed source
+ * may add aliases, but must not change existing check policy or bindings. */
+export function mergeCheckProfileHash(sourceWorkspace, targetWorkspace, checks) {
+    const source = readCodeCheckProfile(sourceWorkspace).profile;
+    const target = readCodeCheckProfile(targetWorkspace).profile;
+    if (!source && !target)
+        return null;
+    if (!source || !target)
+        throw new AppError("check_profile_drift", "Source and integration check profiles differ", 1);
+    const retained = structuredClone(source);
+    for (const field of ["aliases", "ports_by_alias", "inputs_by_alias"]) {
+        const old = target[field];
+        if (!old) {
+            delete retained[field];
+            continue;
+        }
+        const current = source[field] ?? {};
+        retained[field] = Object.fromEntries(Object.keys(old).filter(key => key in current).map(key => [key, current[key]]));
+    }
+    const existingAliases = new Set(Object.keys(target.aliases));
+    const changedExistingMetadata = ["ports_by_alias", "inputs_by_alias"].some(field => Object.keys(source[field] ?? {}).some(alias => existingAliases.has(alias) && !(alias in (target[field] ?? {}))));
+    if (changedExistingMetadata || !isDeepStrictEqual(retained, target)) {
+        throw new AppError("check_profile_drift", "Source check profile changes existing integration policy", 1, { source_profile_hash: codeCheckProfileHash(sourceWorkspace, checks), target_profile_hash: codeCheckProfileHash(targetWorkspace, checks) });
+    }
+    return codeCheckProfileHash(sourceWorkspace, checks);
+}
 export function validateCodeCheckCommands(workspaceRoot, commands) {
     const { profile, file } = readCodeCheckProfile(workspaceRoot);
     return commands.map((command) => {

package/dist/services/hooks.js

@@ -676,6 +676,12 @@ function controlledLifecycleCwd(context, projectRoot, facts, providerSessionId,
     const project = context.db.get("SELECT id FROM projects WHERE root = ?", [projectRoot]);
     if (!project)
         return projectRoot;
+    if (facts?.invocation.operation === "merge_apply" || facts?.invocation.operation === "merge_repair") {
+        const requestId = commandPosition(facts.invocation, 0);
+        const request = requestId && context.db.get("SELECT target_workspace FROM merge_requests WHERE project_id = ? AND merge_request_id = ?", [project.id, requestId]);
+        if (request)
+            return resolveProjectRoot(request.target_workspace);
+    }
     let work;
     if (facts?.workId) {
         try {
@@ -718,7 +724,7 @@ function controlledLifecycleCwd(context, projectRoot, facts, providerSessionId,
     }
     if (facts?.stageName === "specify" || facts?.stageName === "protocolize")
         return projectRoot;
-    if (facts?.stageName === "merge") {
+    if (facts?.stageName === "merge" || facts?.invocation.operation === "merge_apply" || facts?.invocation.operation === "merge_repair") {
         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]);
         const targets = [...new Set(pending.map(item => resolveProjectRoot(item.target_workspace)))];
         if (targets.length > 1)

package/dist/services/vnext-merge.js

@@ -17,7 +17,7 @@ import { runtimeCommand, checkRetryArgs, recoveryEvidenceInput } from "./runtime
 import { acceptStageReport, prepareStageReport, publishStageReport } from "./stage-report-renderer.js";
 import { bindStageCoordinatorWork, createChildWork, failWork, finishFanInWork, finishWork, refreshRunWorkProjection, startStageCoordinatorWork } from "./work-registry.js";
 import { addVnextCodeRepair } from "./vnext-code.js";
-import { checkReceiptEvidenceValid, checkReceipts, codeCheckProfileHash, effectiveCheckDeclarations, runCodeChecks, validateFailedCheckRetry, workspaceChangedPaths, workspaceFingerprint } from "./code-checks.js";
+import { checkReceiptEvidenceValid, checkReceipts, effectiveCheckDeclarations, mergeCheckProfileHash, runCodeChecks, validateFailedCheckRetry, workspaceChangedPaths, workspaceFingerprint } from "./code-checks.js";
 import { applyExternalStageContext, prepareExternalStageContext } from "./stage-context.js";
 import { ensureLaneWorkspace, prepareLaneWorkspace, heartbeatLaneLock, releaseLaneLock, waitAcquireLaneLock } from "./lanes.js";
 import { assertRunMutationAllowed } from "./run-recovery.js";
@@ -71,7 +71,8 @@ export function prepareVnextMergeRequest(context, input) {
     const freezeFile = path.join(freezeRoot, "source-freeze.json");
     const gateFile = path.join(freezeRoot, "merge-gate.json");
     fs.mkdirSync(freezeRoot, { recursive: true });
-    freezeMergeGate(gateFile, { runId: run.id, protocols, checks: effective, acceptanceRefs, profileHash: codeCheckProfileHash(targetWorkspace, effective), now: context.now() });
+    const profileHash = mergeCheckProfileHash(run.workspace_root, targetWorkspace, effective);
+    freezeMergeGate(gateFile, { runId: run.id, protocols, checks: effective, acceptanceRefs, profileHash, now: context.now() });
     let sourceCommit;
     let sourcePaths;
     if (fs.existsSync(freezeFile)) {
@@ -109,7 +110,7 @@ export function prepareVnextMergeRequest(context, input) {
             return requestView(context, raced);
         const child = createChildWork(context, { parentWorkId: root.work_id, stage: "merge", slug: "merge", task: `Integrate frozen source ${sourceCommit} into ${targetBranch}, resolve material conflicts, and preserve accepted behavior.`, launchPolicy: route === "server" ? "fresh_agent_required" : "reuse_allowed", resultSchema: "dd-flow/merge-result@1", payload: { kind: "merge", checks: semantic, protocol_ids: protocols } });
         const requestId = nextMergeRequestId(context);
-        context.db.run("INSERT INTO merge_requests (merge_request_id, project_id, run_id, executor_work_id, protocol_ids_json, source_workspace, source_branch, source_commit, target_workspace, target_branch, enqueue_target_head, execution_target_head, integration_commit, execution_route, status, dispatch_owner, dispatch_lease_token, dispatch_lease_expires_at, lock_acquired_at, checkpoint, profile_hash, replacement_of_merge_request_id, adapter_receipt_json, result_json, last_error_json, created_at, updated_at, completed_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, 'queued', NULL, NULL, NULL, NULL, 'queued', ?, ?, NULL, NULL, NULL, ?, ?, NULL)", [requestId, project.id, run.id, child.work_id, JSON.stringify(protocols), run.workspace_root, sourceBranch, sourceCommit, targetWorkspace, targetBranch, enqueueTarget, route, codeCheckProfileHash(targetWorkspace, effective), replacementOf(run), now, now]);
+        context.db.run("INSERT INTO merge_requests (merge_request_id, project_id, run_id, executor_work_id, protocol_ids_json, source_workspace, source_branch, source_commit, target_workspace, target_branch, enqueue_target_head, execution_target_head, integration_commit, execution_route, status, dispatch_owner, dispatch_lease_token, dispatch_lease_expires_at, lock_acquired_at, checkpoint, profile_hash, replacement_of_merge_request_id, adapter_receipt_json, result_json, last_error_json, created_at, updated_at, completed_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, 'queued', NULL, NULL, NULL, NULL, 'queued', ?, ?, NULL, NULL, NULL, ?, ?, NULL)", [requestId, project.id, run.id, child.work_id, JSON.stringify(protocols), run.workspace_root, sourceBranch, sourceCommit, targetWorkspace, targetBranch, enqueueTarget, route, profileHash, replacementOf(run), now, now]);
         appendFlowRunTimelineEvent(context, project.id, run.id, { type: "merge_request_queued", merge_request_id: requestId, work_id: child.work_id, route, source_commit: sourceCommit, target_branch: targetBranch });
         return requestView(context, requireRequest(context, requestId));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deksden-com/dd-flow-cli",
-  "version": "0.9.0-beta.113",
+  "version": "0.9.0-beta.115",
   "description": "Mechanical runtime CLI for dd-flow workflows.",
   "type": "module",
   "bin": {