@builder.io/dev-tools 1.72.4-dev.202607031956.aba96bb16 → 1.72.4-dev.202607032001.716fda764

package/types/cli/codegen.d.ts

@@ -550,9 +550,10 @@ export declare class CodeGenSession {
     }): Promise<void>;
     /**
      * Force a fresh git-status emit, bypassing the periodic poll. Clears the
-     * ahead-of-base and merge-base caches first so a server-side merge (which
-     * doesn't run a local git command and so never trips #isRefMutatingCommand)
-     * is reflected immediately instead of after the next poll.
+     * ahead-of-base and merge-base caches and force-syncs local origin/<base>
+     * first so a server-side merge (which doesn't run a local git command and so
+     * never trips #isRefMutatingCommand nor refreshes local main) is reflected
+     * immediately instead of after the base-fetch throttle expires.
      */
     refreshGitStatus(): Promise<void>;
     sendMessageToOrgAgent(options: SendMessageToOrgAgentInput): Promise<{

package/types/cli/utils/codegen-utils.d.ts

@@ -126,6 +126,12 @@ export interface AheadOfBaseResult {
     baseMergeBase?: string;
     /** True when the base ref had to be fetched before it could be resolved. */
     fetched: boolean;
+    /**
+     * True when HEAD's tree differs from the base branch's tree (content diff,
+     * not commit count). Squash-merge safe, unlike aheadOfBase. Undefined when
+     * it could not be determined.
+     */
+    hasChangesAgainstBase?: boolean;
     /** Human-readable reason for the resulting aheadOfBase value. */
     reason: string;
 }
@@ -133,6 +139,11 @@ export interface GitStatusDiagnosticsInput {
     ahead: number;
     behind: number;
     aheadOfBaseResult?: AheadOfBaseResult;
+    /**
+     * Content-diff-from-base result (squash-safe). Gates the merge summary;
+     * falls back to `aheadOfBaseResult.hasChangesAgainstBase` when omitted.
+     */
+    hasChangesAgainstBase?: boolean;
     remoteBranchExists: boolean;
     remoteBranch: string;
     hasMergeConflict: boolean;