Bump version to 2.12.0 and improve close-window prompt behavior by kiyarose · Pull Request #19 · SillyLittleTech/PinStick

kiyarose · 2026-04-06T15:34:09Z

Motivation

Bump the app version from 2.6.5 to 2.12.0 across platform manifests and project configs for a new release.
Prevent unnecessary close confirmation when there is no saved note and avoid re-intercept/race conditions when programmatically closing the window.

Description

Updated MARKETING_VERSION in Jot.xcodeproj/project.pbxproj build configurations from 2.6.5 to 2.12.0.
Updated version in cross-platform/package.json and cross-platform/src-tauri/tauri.conf.json to 2.12.0.
Reworked the window close handler in cross-platform/src/main.js: renamed closeApproved to shouldBypassClosePrompt, moved the hasData check so the confirmation dialog is only shown when there is saved content, set the bypass flag before calling TAURI.window.appWindow.close(), and reset it on error to avoid re-intercept races.

Testing

No automated tests were run as part of this change.

Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/0dc7e48c-9f94-482b-a2b5-167f67f17df3 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/ae417432-2ced-490e-badf-f953e209ef04 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

…on close Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/9548dbdf-fed4-4754-8944-7716e8ed98dd Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/9548dbdf-fed4-4754-8944-7716e8ed98dd Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

… 2.6.3 Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/1cc29274-f0b2-4283-a0a7-3f19992daf66 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/6991d52b-5394-455b-8958-d33872003d01 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/c77aebba-018a-4507-b087-054d67e545f3 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

…ape; bump to 2.6.5 Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/19968bf9-a337-457c-b229-d21c45bbb52a Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

deepsource-io · 2026-04-06T15:34:21Z

DeepSource Code Review

We reviewed changes in 777cd26...1daeb2d on this pull request. Below is the summary for the review, and you can see the individual issues we found as inline review comments.

See full review on DeepSource ↗

PR Report Card

Overall Grade	Security Reliability Complexity Hygiene

Code Review Summary

Analyzer	Status	Updated (UTC)	Details
Rust		Apr 6, 2026 3:34p.m.	Review ↗

Copilot

Pull request overview

This PR prepares a new PinStick release by bumping versions across macOS and the cross-platform (Tauri) preview, and updates the window-close flow to avoid prompting when no note is saved while preventing re-intercept/race conditions during programmatic close.

Changes:

Bump release/version metadata to 2.12.0 across macOS and Tauri config/package manifests.
Update macOS close prompt to offer “Keep Notes” vs “Delete Notes” and align edited state with persisted note presence.
Add a custom close-confirmation dialog (HTML/CSS/JS) and rework the Tauri onCloseRequested handler to avoid repeated interception.

Reviewed changes

Copilot reviewed 10 out of 12 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
PinStickApp.swift	Updates close confirmation wording/choices and ties `isDocumentEdited` to persisted note state.
Jot.xcodeproj/project.pbxproj	Bumps `MARKETING_VERSION` to `2.12.0` across build configurations.
cross-platform/src/styles.css	Adds styles for the custom close dialog overlay (light/dark).
cross-platform/src/main.js	Implements close dialog behavior + close interception/bypass logic in Tauri.
cross-platform/src/index.html	Adds the close dialog markup used by the new JS/CSS.
cross-platform/src-tauri/tauri.conf.json	Bumps Tauri `package.version` to `2.12.0`.
cross-platform/src-tauri/Cargo.toml	Updates Rust crate version (currently not aligned to `2.12.0`).
cross-platform/src-tauri/Cargo.lock	Updates lockfile package version (currently not aligned to `2.12.0`).
cross-platform/package.json	Bumps cross-platform package version to `2.12.0`.
cross-platform/package-lock.json	Updates lockfile root version (currently not aligned to `2.12.0`).
AGENTS.md	Adds repo-wide agent guidelines, including version bump policy.
.github/copilot-instructions.md	Documents the version bump policy for contributors/automation.

Files not reviewed (1)

cross-platform/package-lock.json: Language not supported

Copilot · 2026-04-06T15:37:59Z

+ // closes; use closeApproved so our own appWindow.close() call is never
+ // re-intercepted, avoiding the unlisten race condition.


showCloseDialog uses the window-close bypass flag name shouldBypassClosePrompt, but the preceding comment still refers to closeApproved. This is misleading during future maintenance/debugging; update the comment to match the actual flag name/purpose.
Suggested change
// closes; use closeApproved so our own appWindow.close() call is never
// re-intercepted, avoiding the unlisten race condition.
// closes; use shouldBypassClosePrompt so our own appWindow.close() call is
// never re-intercepted, avoiding the unlisten race condition.

Copilot · 2026-04-06T15:37:59Z

+ function onCancel() { cleanup(false); }
+
+ function onKeyDown(e) {
+ if (e.key === "Escape") { cleanup(true); return; } // Escape = keep data (safe default; window closes either way)


The Escape key handler currently resolves the dialog as “confirm/keep data” (cleanup(true)), which is opposite of common dialog/accessibility expectations where Escape dismisses/cancels. Consider making Escape cancel the close (or at least map it to the dialog’s cancel action) to avoid accidental acceptance when users hit Escape reflexively.
Suggested change
if(e.key==="Escape"){cleanup(true);return;}// Escape = keep data (safe default; window closes either way)
if(e.key==="Escape"){cleanup(false);return;}// Escape = cancel/dismiss

Copilot · 2026-04-06T15:38:00Z

+ <p id="dialog-msg">Heads up! Your data will be cached to this app. Is that okay?</p>
+ <div class="dialog-buttons">
+ <button id="dialog-yea" type="button">Yea</button>
+ <button id="dialog-nah" type="button">Nah</button>


The close prompt copy implies data will be cached and asks for consent, but the dialog is shown on close when data is already saved and the actual choice is “keep vs delete saved note”. The current message/buttons can mislead users into deleting their note. Update the text/buttons to accurately reflect the keep/delete decision.
Suggested change
<pid="dialog-msg">Heads up! Your data will be cached to this app. Is that okay?</p>
<divclass="dialog-buttons">
<buttonid="dialog-yea" type="button">Yea</button>
<buttonid="dialog-nah" type="button">Nah</button>
<pid="dialog-msg">Your note is already saved in PinStick. Do you want to keep it for next time, or delete it before closing?</p>
<divclass="dialog-buttons">
<buttonid="dialog-yea" type="button">Keep Note</button>
<buttonid="dialog-nah" type="button">Delete Note</button>

Copilot · 2026-04-06T15:38:00Z

 {
 "name": "pinstick-cross",
- "version": "2.5.8",
+ "version": "2.6.5",
 "lockfileVersion": 3,
 "requires": true,
 "packages": {
 "": {
 "name": "pinstick-cross",
- "version": "2.5.8",
+ "version": "2.6.5",
 "devDependencies": {


package-lock.json still reports the app version as 2.6.5, which is inconsistent with cross-platform/package.json being bumped to 2.12.0. This can lead to confusing builds/releases; regenerate/update the lockfile so its root version matches package.json.

Copilot · 2026-04-06T15:38:00Z

 [package]
 name = "pinstick"
-version = "2.6.0"
+version = "2.6.5"


The Rust crate version is set to 2.6.5 but the cross-platform app version in tauri.conf.json/package.json is 2.12.0. Keeping these out of sync makes builds/releases harder to reason about; bump Cargo.toml (and corresponding Cargo.lock entry) to the same version unless there’s a deliberate reason to diverge.
Suggested change
version = "2.6.5"
version = "2.12.0"

Copilot · 2026-04-06T15:38:00Z

 LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 MACOSX_DEPLOYMENT_TARGET = 14.0;
- MARKETING_VERSION = 2.5.8;
+ MARKETING_VERSION = 2.12.0;
 PRODUCT_BUNDLE_IDENTIFIER = slf.PinStick;


PR description says the macOS MARKETING_VERSION is being bumped from 2.6.5, but the diff shows it was 2.5.8 in this file. Either the description is out of date or the version history is inconsistent; please reconcile so the release notes match what’s actually being changed.

CopilotAIand others added 11 commits April 6, 2026 09:27

Initial plan
58315f4

fix: prompt user to keep or delete saved notes when closing
c408845
Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/0dc7e48c-9f94-482b-a2b5-167f67f17df3 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

chore: plan dialog wording change + package-lock version fix
f8bf144
Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/ae417432-2ced-490e-badf-f953e209ef04 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

chore: bump version to 2.6.1 and update close dialog wording
7d5aa77
Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/ae417432-2ced-490e-badf-f953e209ef04 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

fix: replace TAURI.dialog.ask with in-page overlay; fix window stuck …
a979553
…on close Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/9548dbdf-fed4-4754-8944-7716e8ed98dd Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

chore: bump version to 2.6.2
774283c
Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/9548dbdf-fed4-4754-8944-7716e8ed98dd Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

fix: use unlisten to deregister close handler before closing; bump to…
c6e48dd
… 2.6.3 Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/1cc29274-f0b2-4283-a0a7-3f19992daf66 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

docs: add version bump guidelines to copilot-instructions and AGENTS.md
8900058
Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/6991d52b-5394-455b-8958-d33872003d01 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

fix: close-dialog re-entry guard, focus trap, aria-hidden; bump to 2.6.4
2182af2
Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/c77aebba-018a-4507-b087-054d67e545f3 Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

fix: close-handler race conditions, no-data close, focus restore, Esc…
aca3adf
…ape; bump to 2.6.5 Agent-Logs-Url: https://github.com/SillyLittleTech/PinStick/sessions/19968bf9-a337-457c-b229-d21c45bbb52a Co-authored-by: kiyarose <75678535+kiyarose@users.noreply.github.com>

Stabilize single-click close flow and bump to 2.12.0
1daeb2d

kiyarose added the codex label Apr 6, 2026 — with ChatGPT Codex Connector

kiyarose changed the base branch from copilot/bug-fix-pinstick-close-prompt to mainApril 6, 2026 15:34

kiyarose marked this pull request as ready for review April 6, 2026 15:34

CopilotAI review requested due to automatic review settings April 6, 2026 15:34

Copilotstarted reviewing on behalf of kiyarose April 6, 2026 15:35 View session

CopilotAI reviewed Apr 6, 2026
View reviewed changes

kiyarose closed this Apr 6, 2026

kiyarose deleted the codex/fix-modal-dialog-behavior-issues-s3oldt branch April 6, 2026 15:39

Navigation Menu

Uh oh!

Bump version to 2.12.0 and improve close-window prompt behavior - #19

Bump version to 2.12.0 and improve close-window prompt behavior#19
kiyarose wants to merge 11 commits into
mainfrom
codex/fix-modal-dialog-behavior-issues-s3oldt

kiyarose commented Apr 6, 2026

Uh oh!

deepsource-ioBot commented Apr 6, 2026•
edited
Loading

Uh oh!

CopilotAI left a comment

Uh oh!

CopilotAIApr 6, 2026

Uh oh!

CopilotAIApr 6, 2026

Uh oh!

CopilotAIApr 6, 2026

Uh oh!

CopilotAIApr 6, 2026

Uh oh!

CopilotAIApr 6, 2026

Uh oh!

CopilotAIApr 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		// closes; use closeApproved so our own appWindow.close() call is never
		// re-intercepted, avoiding the unlisten race condition.

	if(e.key==="Escape"){cleanup(true);return;}// Escape = keep data (safe default; window closes either way)
	if(e.key==="Escape"){cleanup(false);return;}// Escape = cancel/dismiss

-<pid="dialog-msg">Heads up! Your data will be cached to this app. Is that okay?</p>
-<divclass="dialog-buttons">
-<buttonid="dialog-yea" type="button">Yea</button>
-<buttonid="dialog-nah" type="button">Nah</button>
+<pid="dialog-msg">Your note is already saved in PinStick. Do you want to keep it for next time, or delete it before closing?</p>
+<divclass="dialog-buttons">
+<buttonid="dialog-yea" type="button">Keep Note</button>
+<buttonid="dialog-nah" type="button">Delete Note</button>

Uh oh!

Conversation

kiyarose commented Apr 6, 2026

Motivation

Description

Testing

Uh oh!

deepsource-ioBot commented Apr 6, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

DeepSource Code Review

PR Report Card

Code Review Summary

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

CopilotAIApr 6, 2026

Choose a reason for hiding this comment

Uh oh!

CopilotAIApr 6, 2026

Choose a reason for hiding this comment

Uh oh!

CopilotAIApr 6, 2026

Choose a reason for hiding this comment

Uh oh!

CopilotAIApr 6, 2026

Choose a reason for hiding this comment

Uh oh!

CopilotAIApr 6, 2026

Choose a reason for hiding this comment

Uh oh!

CopilotAIApr 6, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

deepsource-ioBot commented Apr 6, 2026•
edited
Loading