Fix commit message loading fallback by fkb032 · Pull Request #360 · darkmatter/nixmac

Farhan (fkb032) · 2026-06-09T22:23:15Z

Summary

Fixes the Save/Commit step getting stuck on Loading... when the backend has no stored generated commit message yet.

Treat missing generated_commit_message as expected pending state instead of a backend error.
Keep the commit subject editable and show a deterministic fallback after the pending state goes stale.
Preserve user edits when a generated message arrives late.
Prevent empty/whitespace commit submits while the suggestion is still loading.
Add focused unit coverage for pending, fallback, late-ready, error, commit reset, churn, and empty-submit behavior.

Test Plan

Docs

No docs update needed

github-actions · 2026-06-09T22:28:04Z

🎨 Storybook preview

Open Storybook preview

Updated for 6689d2b

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2b718cc40a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "Codex (@codex) review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "Codex (@codex) address that feedback".

chatgpt-codex-connector · 2026-06-09T22:28:06Z

+    store.setCommitMessageSuggestion(null);
+    store.setEvolvePrompt("");
+    resetCommitMessageDraft();


Preserve the draft when commit fails

When tauriAPI.git.commit fails (for example a hook rejects the commit or git returns an error), handleCommit catches the exception and only records the error in use-git-operations.ts, so the await handleCommit({ message }) here still resolves. These reset calls therefore run on failed commits too, clearing the user's edited subject/body and stored suggestion while they remain on the commit step and need to retry.

Useful? React with 👍 / 👎.

github-actions · 2026-06-09T22:31:52Z

📋 PR Overview


Lines changed	804 (+772 / -32)
Files	4 added, 6 modified, 0 deleted
Draft / WIP	no
Has Test Plan	yes
No Test Plan Needed	no
New UI components	no
New Storybook stories	no
New Rust modules	no
New TS source files	yes (1)
New tests	yes (2)
package.json touched	no
Cargo.toml touched	no
Infra / CI touched	no

🔬 Coverage

Report	Lines	Statements	Functions	Branches
`apps/native/coverage/coverage-summary.json`	28.3%	28.3%	26.3%	20.4%

Generated by 🚫 dangerJS against 6689d2b

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e26f9975af

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "Codex (@codex) review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "Codex (@codex) address that feedback".

chatgpt-codex-connector · 2026-06-09T23:13:21Z

+      if (statusRef.current !== "loading") {
+        return;
+      }


Reset stale suggestions when lookup goes pending

When the Save/Commit step already has a generated suggestion and the underlying changeMap changes to a state whose backend lookup returns pending (for example, the user edits files after the suggestion was generated and no generated_commit_message exists for the new hashes yet), this branch exits because statusRef is still "ready". The old subject/body remain enabled and can be committed for a different set of changes instead of showing loading/fallback for the new map; useSummary.generateCommitMessage now returns pending on a null backend result, so this is the path for a missing current suggestion.

Useful? React with 👍 / 👎.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 267b4f5f8d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "Codex (@codex) review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "Codex (@codex) address that feedback".

chatgpt-codex-connector · 2026-06-09T23:19:16Z

+  const suggestionFingerprintRef = useRef<string | null>(
+    commitMessageSuggestion ? changeMapFingerprintRef.current : null,
+  );


Revalidate stored suggestions on remount

When MergeSection remounts with a non-null commitMessageSuggestion, this initializes the suggestion fingerprint to the current change map even though the store value may have been generated for an earlier map. CommitStep/ManualCommitStep unmount this component when the user clicks “Continue editing”, so if files/changeMap change while editing and the user clicks “Back to commit”, the stale global suggestion is treated as ready for the new fingerprint; if the backend lookup is pending, the statusRef.current !== "loading" path keeps the old subject/body indefinitely and enables committing it for the new changes. The suggestion needs to be cleared or revalidated on mount instead of assuming it matches the current map.

Useful? React with 👍 / 👎.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9e2fc09a9a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "Codex (@codex) review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "Codex (@codex) address that feedback".

chatgpt-codex-connector · 2026-06-09T23:28:45Z

+          .getState()
+          .setCommitMessageSuggestion(result.message);
+        setCommitMessageStatus("ready");
+        setCommitBody(parsed.body);


Preserve manual one-line commits when suggestions arrive

If the user types their own subject while the lookup is still pending, a later generated suggestion does not overwrite that subject but this still unconditionally stores the generated body. Because the body is not editable, submitting after that point sends custom subject\n\n<generated body> even though the user only authored a one-line message, which can produce mismatched or unintended commit messages in the late-ready path.

Useful? React with 👍 / 👎.

…-message # Conflicts: # apps/native/src-tauri/src/evolve/edit_nix_file.rs # apps/native/src-tauri/src/evolve/tools.rs # apps/native/src-tauri/src/evolve/tools/edit_nix_file.rs # apps/native/src-tauri/src/state/mod.rs

…-message # Conflicts: # apps/native/scripts/run-storybook-tests-ci.mjs # apps/native/src-tauri/src/evolve/tools/edit_nix_file.rs

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0bb8fbfeb0

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "Codex (@codex) review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "Codex (@codex) address that feedback".

chatgpt-codex-connector · 2026-06-11T05:51:39Z

+      staleTimer = setTimeout(() => {
+        showFallback("fallback");
+      }, STALE_COMMIT_MESSAGE_MS);


Cancel stale fallback timers when suggestions arrive

When generateCommitMessage() returns pending, this schedules an 8-second fallback that is not cancelled if commitMessageSuggestion is populated before the timeout fires. In that case the second effect accepts the real suggestion and marks the draft ready, but this timer still calls showFallback("fallback") later and overwrites the generated subject/body with the fallback text for the same change map. Guard the timeout against a non-loading status or clear it when a suggestion is accepted.

Useful? React with 👍 / 👎.

Juanpe Bolívar (arximboldi)

As mentioned in the inner comment, this is too complex, I can't even understand what the expected behavior is from looking at the code, even less the correctness of the implementation. I suspect there is a problem of design (missing rationalization of the expected behavior) and in any case the implementation should be refactored and simplified to make it intelligible and to properly represent such specification.

Juanpe Bolívar (arximboldi) · 2026-06-11T22:41:57Z

-import { useEffect } from "react";
+import { useEffect, useRef, useState } from "react";
+
+const STALE_COMMIT_MESSAGE_MS = 8_000;


What's this? This needs a comment.

Juanpe Bolívar (arximboldi) · 2026-06-11T22:47:20Z

+  return hashes.sort().join("\0");
+}

 export function MergeSection() {


It is impossible for me to understand for me the correctness of this component now, there are 3 different useState plus 8 different useRef, massive useEffect with all kinds of asynchrnous ping-pong, and no comments. Even Claude is struggling to follow and tell me what it's doing, and only the tests are difficult to understand.

I think this requires extracting the logic parts into a hook, for example, a useCommitMessageDraft(changeMap) hook returning { subject, body, status, setSubject, reset } that makes all the commit message dance testable and specifiable in separately from the UI. It should also be documented.

github-actions Bot deployed to storybook-preview June 9, 2026 22:28 View deployment

chatgpt-codex-connector Bot reviewed Jun 9, 2026

View reviewed changes

Farhan (fkb032) force-pushed the fkb/eng-485-commit-message branch from 2b718cc to e26f997 Compare June 9, 2026 23:10

chatgpt-codex-connector Bot reviewed Jun 9, 2026

View reviewed changes

github-actions Bot deployed to storybook-preview June 9, 2026 23:16 View deployment

Farhan (fkb032) force-pushed the fkb/eng-485-commit-message branch from e26f997 to 267b4f5 Compare June 9, 2026 23:16

chatgpt-codex-connector Bot reviewed Jun 9, 2026

View reviewed changes

github-actions Bot deployed to storybook-preview June 9, 2026 23:20 View deployment

Farhan (fkb032) force-pushed the fkb/eng-485-commit-message branch 2 times, most recently from 499e0ac to 9e2fc09 Compare June 9, 2026 23:26

chatgpt-codex-connector Bot reviewed Jun 9, 2026

View reviewed changes

fix(native): fall back when commit message is pending

e9bcc4f

Farhan (fkb032) force-pushed the fkb/eng-485-commit-message branch from 9e2fc09 to e9bcc4f Compare June 9, 2026 23:44

github-actions Bot deployed to storybook-preview June 9, 2026 23:52 View deployment

Farhan (fkb032) added 3 commits June 9, 2026 19:16

fix(evolve): restore list action shorthand

1c4d43e

fix(native): repair state module merge ref

ae96288

github-actions Bot deployed to storybook-preview June 10, 2026 01:22 View deployment

fix(evolve): reject ambiguous remove shorthand

1b849c3

github-actions Bot deployed to storybook-preview June 10, 2026 01:55 View deployment

Farhan (fkb032) added 5 commits June 9, 2026 20:05

fix(storybook): skip webgl mascot snapshots

3a23185

fix(storybook): retry timed out batches by file

0e0e981

fix(storybook): cap isolated retry timeouts

f7e0e36

fix(storybook): cap batch runtime by default

b77776e

fix(storybook): preserve batch startup headroom

ee56e78

github-actions Bot deployed to storybook-preview June 10, 2026 02:14 View deployment

fix(storybook): validate retry timeout override

e374326

github-actions Bot deployed to storybook-preview June 10, 2026 02:34 View deployment

fix(evolve): reject ambiguous add shorthand

c5feb84

github-actions Bot deployed to storybook-preview June 10, 2026 03:24 View deployment

Merge remote-tracking branch 'origin/develop' into fkb/eng-485-commit…

ac2eb1f

…-message # Conflicts: # apps/native/scripts/run-storybook-tests-ci.mjs # apps/native/src-tauri/src/evolve/tools/edit_nix_file.rs

github-actions Bot deployed to storybook-preview June 10, 2026 15:17 View deployment

Update setup step story snapshot

0bb8fbf

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

github-actions Bot deployed to storybook-preview June 11, 2026 06:03 View deployment

Juanpe Bolívar (arximboldi) requested changes Jun 11, 2026

View reviewed changes

Farhan (fkb032) requested a review from cooper (czxtm) June 12, 2026 05:07

Refactor commit message draft state

6689d2b

Farhan (fkb032) requested a review from Juanpe Bolívar (arximboldi) June 13, 2026 04:14

github-actions Bot deployed to storybook-preview June 13, 2026 04:17 View deployment

Conversation

Farhan (fkb032) commented Jun 9, 2026

Summary

Test Plan

Docs

Uh oh!

github-actions Bot commented Jun 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎨 Storybook preview

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jun 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📋 PR Overview

🔬 Coverage

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

Juanpe Bolívar (arximboldi) left a comment

Choose a reason for hiding this comment

Uh oh!

Juanpe Bolívar (arximboldi) Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

Juanpe Bolívar (arximboldi) Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions Bot commented Jun 9, 2026 •

edited

Loading

github-actions Bot commented Jun 9, 2026 •

edited

Loading