Skip to content

撤销 commits bbe262d and 7d0de8b#390

Merged
CJKmkp merged 1 commit intobetafrom
codex/revert-two-commits-7d0de8b-and-bbe262d
Mar 5, 2026
Merged

撤销 commits bbe262d and 7d0de8b#390
CJKmkp merged 1 commit intobetafrom
codex/revert-two-commits-7d0de8b-and-bbe262d

Conversation

@CJKmkp
Copy link
Member

@CJKmkp CJKmkp commented Mar 5, 2026

Motivation

  • Remove two recent changes that introduced PPT-module adjustments and a watchdog/restart change by reverting commits bbe262df7e0fdd766658c4b90fbbbcb1fbff6d82 and 7d0de8b5a3728825e1fc8dc6fb84c649725417df to restore the previous, stable behavior.
  • Resolve a merge conflict encountered while reverting to ensure the application watchdog logic remains consistent and safe.

Description

  • Created two revert commits on branch work: revert of bbe262df7e0fdd766658c4b90fbbbcb1fbff6d82 (recorded as fc4415b) and revert of 7d0de8b5a3728825e1fc8dc6fb84c649725417df (recorded as 938cce1).
  • Resolved a conflict in Ink Canvas/App.xaml.cs by removing conflict markers and keeping the DateTime.Now-based watchdog checks and the inline startup timeout check (elapsedSinceStart.TotalMinutes >= 2).
  • Restored PPT manager behavior by reverting changes in Ink Canvas/Helpers/PPTManager.cs and introducing UpdateCurrentPresentationInfo() to centralize and harden retrieval of current presentation/slide state and COM cleanup.
  • Files changed: Ink Canvas/App.xaml.cs and Ink Canvas/Helpers/PPTManager.cs (revert commits updated those files and removed leftover conflict markers).

Testing

  • Ran git status --short and confirmed working tree is clean and no uncommitted changes remain (success).
  • Inspected history with git log --oneline -n 5 to confirm the two revert commits are present on work (success).
  • Verified revert results and touched files with git show --stat --name-only and validated that Ink Canvas/App.xaml.cs and Ink Canvas/Helpers/PPTManager.cs reflect the intended revert changes (success).
  • Searched for leftover conflict markers with rg -n "^(<<<<<<<|=======|>>>>>>>)" in the modified files and confirmed none remain (success).

Codex Task

This reverts commit 7d0de8b.
@CJKmkp CJKmkp changed the title Revert commits bbe262d and 7d0de8b 撤销 commits bbe262d and 7d0de8b Mar 5, 2026
@CJKmkp CJKmkp merged commit a406778 into beta Mar 5, 2026
1 check passed
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b575269972

ℹ️ 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 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 address that feedback".

Comment on lines +1255 to 1256
if (isStartupComplete && (DateTime.Now - lastHeartbeat).TotalSeconds > 10)
{

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep startup grace period before watchdog restarts

This restart condition now triggers immediately after isStartupComplete once heartbeat lag exceeds 10s, but the previous guard that skipped watchdog restarts during the first 2 minutes after process start was removed. On slower machines or heavy startup paths, lastHeartbeat can still be stale when startup just finished, so this can cause false-positive “main thread unresponsive” restarts and restart loops right after launch. Please restore the startup grace check (or equivalent) before applying the 10s heartbeat rule.

Useful? React with 👍 / 👎.

@CJKmkp CJKmkp deleted the codex/revert-two-commits-7d0de8b-and-bbe262d branch March 5, 2026 03:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant