Commit `ba62721654`

ba6272165474d294fe74fc0966638c329e972346

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-18 01:22 UTC

Clear the clipboard instead of restoring it

Layout: unified · split

Sources/keycask/Clipboard.swift +4 −5

 enum Clipboard {
     struct Handoff: Codable, Equatable {
         var secret: String
-        var previous: String
     }
     struct Tool: Equatable {
     static let timeoutSeconds = 45
-    static func shouldRestore(secret: String, current: String?) -> Bool {
+    static func shouldClear(secret: String, current: String?) -> Bool {
         current == secret
     }
     static func copyWithTimeout(_ secret: String, seconds: Int = timeoutSeconds) throws {
         _ = try requireTool()
-        let handoff = Handoff(secret: secret, previous: try read())
+        let handoff = Handoff(secret: secret)
         try write(secret)
         let process = Process()
         process.executableURL = Bundle.main.executableURL
         }
         Thread.sleep(forTimeInterval: TimeInterval(seconds))
         let current = try? read()
-        guard shouldRestore(secret: handoff.secret, current: current) else { return }
+        guard shouldClear(secret: handoff.secret, current: current) else { return }
-        try write(handoff.previous)
+        try write("")
     }
     private static func requireTool() throws -> Tool {

Tests/KeycaskCLITests/ClipboardTests.swift +5 −5

	@@ -4,14 +4,14 @@ import Testing
4	@testable import keycask	4	@testable import keycask
5		5
6	@Suite struct ClipboardTests {	6	@Suite struct ClipboardTests {
7	@Test func restoresOnlyWhenClipboardStillHoldsTheSecret() {	7	@Test func clearsOnlyWhenClipboardStillHoldsTheSecret() {
8	#expect(Clipboard.shouldRestore(secret: "s", current: "s"))	8	#expect(Clipboard.shouldClear(secret: "s", current: "s"))
9	#expect(!Clipboard.shouldRestore(secret: "s", current: "user pasted"))	9	#expect(!Clipboard.shouldClear(secret: "s", current: "user pasted"))
10	#expect(!Clipboard.shouldRestore(secret: "s", current: nil))	10	#expect(!Clipboard.shouldClear(secret: "s", current: nil))
11	}	11	}
12		12
13	@Test func handoffRoundTrips() throws {	13	@Test func handoffRoundTrips() throws {
14	let h = Clipboard.Handoff(secret: "s3cret", previous: "old")	14	let h = Clipboard.Handoff(secret: "s3cret")
15	let data = try JSONEncoder().encode(h)	15	let data = try JSONEncoder().encode(h)
16	#expect(try JSONDecoder().decode(Clipboard.Handoff.self, from: data) == h)	16	#expect(try JSONDecoder().decode(Clipboard.Handoff.self, from: data) == h)
17	}	17	}

docs/superpowers/specs/2026-09-17-keycask-design.md +7 −6

   Linux; `clip.exe` to write and `powershell -command Get-Clipboard` to
   read on Windows. No tool found is exit 1 with a message naming the
   tools. `clip` spawns `keycask clipboard-daemon` detached with stdout
-  and stderr to null, writes `{"secret": ..., "previous": ...}` to its
+  and stderr to null and exits without waiting. `clip` writes the
-  stdin, and exits without waiting. `clip` writes the clipboard itself,
+  clipboard itself, then spawns the daemon with `{"secret": ...}` on its
-  then spawns the daemon. The daemon sleeps 45 seconds, reads the
+  stdin. The daemon sleeps 45 seconds, reads the clipboard, and clears
-  clipboard, and if it still equals the secret restores `previous` or
+  it if it still equals the secret. It never restores earlier contents,
-  clears when `previous` is empty.
+  so a second `clip` inside the window cannot bring an earlier secret
+  back.
 ## Errors
   masking versus `--reveal`, `--field` raw output, the ambiguous-name
   listing, `rm` without `--yes` and without a TTY, `edit` with no flags,
   `--generate` with `--words`, and `init` on an existing vault.
-- The clipboard daemon's restore decision is unit-tested in process;
+- The clipboard daemon's clear decision is unit-tested in process;
   the tests do not touch the real clipboard.
 The CLI suite is the conformance suite. When the app exists, its

Commit ba62721654