lee-spec-kit 0.9.2 → 0.9.3

package/dist/index.js

@@ -7724,6 +7724,14 @@ async function resolveLocalIntegrationContext(config, feature) {
   const squashCommitMatchesSource = completionStrategy === "local-squash" && state?.strategy === "local-squash" && !!featureTip && state.featureTip === featureTip && !!integratedCommit && !!baseTip && integratedCommit === baseTip && !!featureTree && integratedTree === featureTree && state.integratedTree === featureTree;
   const squashEvidencePresent = !!featureTip && evidenceTip === featureTip;
   const squashIntegrationComplete = squashCommitMatchesSource && squashEvidencePresent;
+  const recordedStrategy = state?.strategy || "local-ff";
+  const recordedIntegratedCommit = state?.integratedCommit || state?.mergedBaseTip || null;
+  const baseContainsRecordedIntegration = !!recordedIntegratedCommit && isAncestor(
+    projectRoot,
+    recordedIntegratedCommit,
+    `refs/heads/${baseBranch}`
+  );
+  const cleanedIntegrationStillValid = state?.status === "cleaned" && recordedStrategy === completionStrategy && state.featureTip === featureTip && baseContainsRecordedIntegration && (completionStrategy === "local-squash" ? state.integratedCommit === recordedIntegratedCommit && state.integratedTree === featureTree && squashEvidencePresent : state.mergedBaseTip === featureTip && baseContainsFeature);
   return {
     projectRoot,
     featureWorktree: effectiveFeatureWorktree,
@@ -7738,6 +7746,7 @@ async function resolveLocalIntegrationContext(config, feature) {
     completionStrategy,
     baseContainsFeature,
     integrationComplete: completionStrategy === "local-squash" ? squashIntegrationComplete : !!featureTip && baseTip === featureTip,
+    cleanedIntegrationStillValid,
     evidenceRef,
     squashCommitMatchesSource,
     squashEvidencePresent,
@@ -9231,6 +9240,19 @@ Task commit boundary warning: ${describeTaskCommitGateFailure(committedTaskGate)
     const localState = await resolveLocalIntegrationContext(config, feature);
     const localVerifyCommand = `npx lee-spec-kit local verify ${buildFeatureArgs(feature)} --json`;
     const localMergeBaseCommand = `npx lee-spec-kit local merge ${buildFeatureArgs(feature)} --json`;
+    if (localState.cleanedIntegrationStillValid) {
+      return {
+        status: "ok",
+        reasonCode: "WORKFLOW_STAGE_RESOLVED",
+        docsDir: config.docsDir,
+        featureRef: buildFeatureRef(feature),
+        stage: "done",
+        nextAction: null,
+        approvalRequired: false,
+        implementationAllowed: false,
+        blockedReasonCode: null
+      };
+    }
     if (!localState.integrationComplete) {
       const featureVerified = !!localState.state && ["feature_verified", "merged", "verified", "cleaned"].includes(
         localState.state.status