Make ChangeIds mandatory for commits in but_workspace::ui::RefInfo

Co-authored-by: GPT 5.4 <codex@openai.com>

Author: Byron

crates/but-core/src/commit.rs

@@ -59,7 +59,10 @@ impl Headers {
         if self.change_id.is_none() {
             self.change_id = commit_id
                 .into()
-                .map_or_else(ChangeId::generate_sha1, Self::synthetic_change_id_from_commit_id)
+                .map_or_else(
+                    ChangeId::generate_sha1,
+                    Self::synthetic_change_id_from_commit_id,
+                )
                 .into();
         }
         self
@@ -528,6 +531,15 @@ impl CommitOwned {
             inner,
         }
     }
+
+    /// Return the stored change-id if present, or derive a deterministic fallback from the commit id.
+    pub fn change_id(&self) -> ChangeId {
+        Headers::try_from_commit(&self.inner)
+            .unwrap_or_default()
+            .ensure_change_id(self.id)
+            .change_id
+            .expect("change-id is ensured")
+    }
 }
 
 /// Mutations
@@ -604,6 +616,15 @@ impl<'repo> Commit<'repo> {
     pub fn headers(&self) -> Option<Headers> {
         Headers::try_from_commit(&self.inner)
     }
+
+    /// Return the stored change-id if present, or derive a deterministic fallback from the commit id.
+    pub fn change_id(&self) -> ChangeId {
+        self.headers()
+            .unwrap_or_default()
+            .ensure_change_id(self.id.detach())
+            .change_id
+            .expect("change-id is ensured")
+    }
 }
 
 /// Conflict specific details

crates/but-workspace/src/branch_details.rs

@@ -234,10 +234,7 @@ fn local_commits_gix(
             state: CommitState::LocalAndRemote(info.id),
             created_at: i128::from(commit.committer.time.seconds) * 1000,
             author,
-            change_id: commit
-                .headers()
-                .and_then(|headers| headers.change_id)
-                .map(|id| id.to_string()),
+            change_id: commit.change_id().to_string(),
             gerrit_review_url: None,
         });
     }

crates/but-workspace/src/commit_engine/mod.rs

@@ -222,9 +222,8 @@ fn create_possibly_signed_commit(
     parents: impl IntoIterator<Item = impl Into<gix::ObjectId>>,
     commit_headers: Option<but_core::commit::Headers>,
 ) -> anyhow::Result<gix::ObjectId> {
-    let commit_headers = commit_headers.unwrap_or_else(|| {
-        Headers::from_config(&repo.config_snapshot())
-    });
+    let commit_headers =
+        commit_headers.unwrap_or_else(|| Headers::from_config(&repo.config_snapshot()));
     let commit = gix::objs::Commit {
         message: message.into(),
         tree,

crates/but-workspace/src/legacy/stacks.rs

@@ -627,7 +627,11 @@ pub fn local_and_remote_commits(
             state,
             created_at,
             author: gix_commit.author()?.into(),
-            change_id: change_id.map(|id| id.to_string()),
+            change_id: change_id
+                .unwrap_or_else(|| {
+                    but_core::commit::Headers::synthetic_change_id_from_commit_id(*commit_id)
+                })
+                .to_string(),
             gerrit_review_url: None,
         };
         local_and_remote.push(api_commit);

crates/but-workspace/src/ui/mod.rs

@@ -108,8 +108,10 @@ pub struct Commit {
     pub created_at: i128,
     /// The author of the commit.
     pub author: Author,
-    /// The GitButler change-id associated with this commit, if available.
-    pub change_id: Option<String>,
+    /// The GitButler change-id associated with this commit.
+    /// It always exists as we either read it from the [headers][but_core::commit::Headers], or we
+    /// synthesize one from [the commit id][but_core::commit::Headers::synthetic_change_id_from_commit_id()].
+    pub change_id: String,
     /// Optional URL to the Gerrit review for this commit, if applicable.
     /// Only populated if Gerrit mode is enabled and the commit has an associated review.
     pub gerrit_review_url: Option<String>,
@@ -123,17 +125,22 @@ impl TryFrom<gix::Commit<'_>> for Commit {
         let commit_id = commit.id;
         let commit = commit.decode()?;
         let headers = but_core::commit::Headers::try_from_commit_headers(|| commit.extra_headers());
+        let has_conflicts = headers.as_ref().is_some_and(|hdr| hdr.is_conflicted());
+        let change_id = headers
+            .unwrap_or_default()
+            .ensure_change_id(commit_id)
+            .change_id
+            .expect("change-id is ensured")
+            .to_string();
         Ok(Commit {
             id: commit_id,
             parent_ids: commit.parents().collect(),
             message: commit.message.to_owned(),
-            has_conflicts: headers.as_ref().is_some_and(|hdr| hdr.is_conflicted()),
+            has_conflicts,
             state: CommitState::LocalAndRemote(commit_id),
             created_at: i128::from(commit.time()?.seconds) * 1000,
             author: commit.author()?.into(),
-            change_id: headers
-                .and_then(|headers| headers.change_id)
-                .map(|id| id.to_string()),
+            change_id,
             gerrit_review_url: None,
         })
     }
@@ -144,8 +151,11 @@ impl From<but_core::CommitOwned> for Commit {
         let headers = commit::Headers::try_from_commit(&inner);
         let has_conflicts = headers.as_ref().is_some_and(|hdr| hdr.is_conflicted());
         let change_id = headers
-            .and_then(|hdr| hdr.change_id)
-            .map(|id| id.to_string());
+            .unwrap_or_default()
+            .ensure_change_id(id)
+            .change_id
+            .expect("change-id is ensured")
+            .to_string();
         let gix::objs::Commit {
             tree: _,
             parents,
@@ -439,7 +449,12 @@ impl From<&LocalCommit> for ui::Commit {
             author: author
                 .to_ref(&mut gix::date::parse::TimeBuf::default())
                 .into(),
-            change_id: change_id.as_ref().map(ToString::to_string),
+            change_id: change_id
+                .as_ref()
+                .map(ToString::to_string)
+                .unwrap_or_else(|| {
+                    but_core::commit::Headers::synthetic_change_id_from_commit_id(*id).to_string()
+                }),
             gerrit_review_url: None,
         }
     }

crates/but-workspace/tests/workspace/ui.rs

@@ -259,7 +259,7 @@ mod changes_in_branch {
                         "email": "author@example.com",
                         "gravatarUrl": "https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=100&r=g&d=retro"
                       },
-                      "changeId": "rwzxluzvxmyzkuqmpzovmuwqsxptxrpn"
+                      "changeId": null
                     }
                   ],
                   "commitsOutside": null,
@@ -444,7 +444,7 @@ mod changes_in_branch {
                         "email": "author@example.com",
                         "gravatarUrl": "https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=100&r=g&d=retro"
                       },
-                      "changeId": "rwzxluzvxmyzkuqmpzovmuwqsxptxrpn"
+                      "changeId": null
                     }
                   ],
                   "commitsOutside": null,

packages/but-sdk/src/generated/index.d.ts

@@ -581,6 +581,12 @@ export type Commit = {
   createdAt: number;
   /** The author of the commit. */
   author: Author;
+  /**
+   * The GitButler change-id associated with this commit.
+   * It always exists as we either read it from the [headers][but_core::commit::Headers], or we
+   * synthesize one from [the commit id][but_core::commit::Headers::synthetic_change_id_from_commit_id()].
+   */
+  changeId: string;
   /**
    * Optional URL to the Gerrit review for this commit, if applicable.
    * Only populated if Gerrit mode is enabled and the commit has an associated review.
@@ -1489,6 +1495,8 @@ export type UpstreamCommit = {
   createdAt: number;
   /** The author of the commit. */
   author: Author;
+  /** The GitButler change-id associated with this commit, if available. */
+  changeId?: string | null;
 };
 
 /** Git files activity. Supplies the head sha */