Method canFastForwardToOrigin

src/node/runtime/SSHRuntime.ts:3024–3054

* Check if the local can fast-forward to origin/ . * Returns true if local is behind or equal to origin (safe to use origin). * Returns false if local is ahead or diverged (preserve local state). * * @param branch - The branch name to compare locally and on origin (e.g. "

(
    workspacePath: string,
    branch: string,
    initLogger: InitLogger,
    abortSignal?: AbortSignal
  )

   * @param branch - The branch name to compare locally and on origin (e.g. "main")
   */
  private async canFastForwardToOrigin(
    workspacePath: string,
    branch: string,
    initLogger: InitLogger,
    abortSignal?: AbortSignal
  ): Promise<boolean> {
    try {
      // Check if local <branch> is an ancestor of origin/<branch>
      // Exit code 0 = local is ancestor (can fast-forward), non-zero = cannot
      const checkCmd = `git merge-base --is-ancestor ${shescape.quote(branch)} origin/${shescape.quote(branch)}`;
      const checkStream = await this.exec(checkCmd, {
        cwd: workspacePath,
        timeout: 30,
        abortSignal,
      });

      const exitCode = await checkStream.exitCode;
      if (exitCode === 0) {
        return true; // Local is behind or equal to origin
      }

      // Local is ahead or diverged - preserve local state
      initLogger.logStderr(
        `Note: Local ${branch} is ahead of or diverged from origin/${branch}, using local state`
      );
      return false;
    } catch {
      // Error checking - assume we should preserve local state
      return false;
    }
  }

  /**
   * Fast-forward merge to latest origin/<trunkBranch> after checkout.