!174 · krz/orgstar

Sources/OrgApp/ClockModel.swift +1

	@@ -286,6 +286,7 @@ public final class ClockModel {
286	clock, description: "Dangling clock started \(minutes) mins ago", lastValid: clock.startedAt, clockingIn: true, session, ask: ask, now: now	286	clock, description: "Dangling clock started \(minutes) mins ago", lastValid: clock.startedAt, clockingIn: true, session, ask: ask, now: now
287	)	287	)
288	outcome.messages += result.messages	288	outcome.messages += result.messages
		289	if let jump = result.jump { outcome.jump = jump }
289	}	290	}
290	}	291	}
291	let location: (path: String, offset: Int)	292	let location: (path: String, offset: Int)

Sources/OrgApp/EmacsImport.swift +6

             let days: Int? = value.integer ?? ["day": 1, "week": 7, "fortnight": 14, "month": 30, "year": 365][value.symbol ?? ""]
             guard let days else { return note("unknown span \(value.description)") }
             add(name, .integer(days))
+        case "org-clock-idle-time":
+            // nil is never; a number is minutes.
+            if value.symbol == "nil" { add(name, .integer(0)) } else if let minutes = value.integer, minutes > 0 { add(name, .integer(minutes)) } else { note("not a number of minutes") }
+        case "org-clock-history-length":
+            guard let length = value.integer, length > 0 else { return note("not a positive number") }
+            add(name, .integer(length))
         case "org-agenda-start-day":
             if value.symbol == "nil" { add(name, .string("+0d")) } else if let s = value.string, UserConfig.dayOffset(s) != nil { add(name, .string(s)) } else { note("only day offsets such as \"-3d\" are supported") }
         case "org-todo-keywords":

Sources/OrgCore/Commands/ClockResolution.swift +1 −1

	@@ -6,7 +6,7 @@ import Foundation
6		6
7	public enum ClockResolution {	7	public enum ClockResolution {
8	/// The keys `org-clock-resolve` reads.	8	/// The keys `org-clock-resolve` reads.
9	public static let keys: [Character] = ["j", "k", "K", "t", "T", "g", "G", "S", "s", "c", "C", "i", "q"]	9	public static let keys: [Character] = ["j", "J", "k", "K", "t", "T", "g", "G", "S", "s", "C", "i", "q"]
10		10
11	/// The question's suffix, after the clock's description.	11	/// The question's suffix, after the clock's description.
12	public static let keyHint = " [jkKtTgGSscCiq]? "	12	public static let keyHint = " [jkKtTgGSscCiq]? "

Tests/OrgAppTests/ClockHistoryModelTests.swift +12

	@@ -111,6 +111,18 @@ struct ClockHistoryModelTests {
111	#expect(clock.leftover == nil)	111	#expect(clock.leftover == nil)
112	}	112	}
113		113
		114	@Test func jumpingFromADanglingClockShowsItAfterClockingIn() async throws {
		115	let other = try notes.write("other.org", "* Old\n:LOGBOOK:\nCLOCK: [2026-09-09 Wed 09:00]\n:END:\n")
		116	let clock = ClockModel(file: stateFile, defaults: defaults)
		117	let started = clock.openClocks(session, paths: [other.path])[0].startedAt
		118	// `c` isn't a key org-clock-resolve reads; `J` clocks out and jumps.
		119	let answers = ScriptedAnswers(["c", "J"])
		120	let outcome = await clock.clockIn(session, target: .caret, paths: [other.path], ask: answers.ask, now: { started.addingTimeInterval(600) })
		121	#expect(answers.asked.count == 2)
		122	#expect(outcome.jump?.path == other.path)
		123	#expect(clock.running?.heading == "A")
		124	}
		125
114	@Test func idleTimeIsSubtractedAndOfferedToTheNextClock() async throws {	126	@Test func idleTimeIsSubtractedAndOfferedToTheNextClock() async throws {
115	let clock = ClockModel(file: stateFile, defaults: defaults)	127	let clock = ClockModel(file: stateFile, defaults: defaults)
116	_ = clock.clockIn(session, path: work.path, at: offset("* A"), now: start)	128	_ = clock.clockIn(session, path: work.path, at: offset("* A"), now: start)

Tests/OrgAppTests/EmacsImportTests.swift +5 −1

       (setq org-tags-column 0
             org-agenda-span 10
             org-agenda-start-day "-3d"
+            org-clock-idle-time 15
+            org-clock-history-length 10
             org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)") (sequence "[ ](T)" "|" "[X](D)") (sequence "BUG" "|" "FIXED"))))
     (after! org (setq org-M-RET-may-split-line nil org-list-allow-alphabetical t))
     (map! :map org-mode-map "C-c q" #'org-set-tags-command)
         #expect(s["org-tags-column"] == .integer(-80))
         #expect(s["org-agenda-span"] == .integer(10))
         #expect(s["org-agenda-start-day"] == .string("-3d"))
+        #expect(s["org-clock-idle-time"] == .integer(15))
+        #expect(s["org-clock-history-length"] == .integer(10))
         #expect(s["org-M-RET-may-split-line"] == .bool(false))
         #expect(s["org-todo-keywords"] == .string("TODO(t) WAIT(w) | DONE(d)\nBUG | FIXED"))
         #expect(s["fill-column"] == nil)
         let keymap = folder.appendingPathComponent("keymap.toml")
         #expect(KeymapLoader.load(.doom, userFile: keymap).problems.isEmpty)
         #expect(KeymapLoader.load(.doom, userFile: keymap).keymap.keyLabels(for: "app.agenda", modes: ["normal"]).contains("C-c a"))
-        #expect(summary.hasPrefix("Imported 17 settings, 3 capture templates, 3 key bindings."), "\(summary)")
+        #expect(summary.hasPrefix("Imported 19 settings, 3 capture templates, 3 key bindings."), "\(summary)")
         #expect(defaults.string(forKey: "themeFont") == "JetBrains Mono")
         #expect(defaults.integer(forKey: "themeFontSize") == 14)

docs/manual/guide/06-dates-and-clocking.org +3 −2

 | Key            | What happens to the =CLOCK:= line                                                                   |
 |----------------+-----------------------------------------------------------------------------------------------------|
-| =j=            | Nothing; after Resolve Open Clocks… or the idle question, the line opens in the editor to adjust by hand. |
+| =j=            | Nothing; the line opens in the editor to adjust by hand (after the clock-in, when you were clocking in). |
+| =J=            | Ends the line now, then opens it in the editor.                                                     |
 | =k=            | Asks how many minutes of the idle time to keep, all of them by default. With all, the clock keeps running. With fewer, the line ends that many minutes after the idle time began, and a new clock starts now. |
 | =K=            | Asks the same, then ends the line after the minutes kept and leaves you clocked out.               |
 | =t=            | Like =k=, but asks for the date and time you got distracted; the line ends then.                    |
 | =s=            | Subtracts the idle time: the line ends when the idle time began, and a new clock starts now.        |
 | =S=            | Subtracts the idle time and leaves you clocked out.                                                 |
 | =C=            | Removes the line, as though you never clocked in.                                                   |
-| =c=, =i=, =q=, =Esc= | Leaves the line as it is, keeping all the idle time.                                          |
+| =i=, =q=, =Esc= | Leaves the line as it is, keeping all the idle time.                                               |
 - =k=, =K=, =g= and =G= ask for minutes with the default in the question, as =Keep how many minutes (default 95):=; Return with an empty field takes the default.
 - =t= and =T= ask =Date+time:= with Org's date syntax, as =14:00= or =-1h=.

docs/manual/guide/13-configuration.org +2

 | =org-log-into-drawer=                                              | A string as given; =t= becomes ="LOGBOOK"=; =nil= becomes =""=                                 |
 | =display-line-numbers-type=                                        | =true= unless =nil=; =relative= and =visual= become absolute numbers                          |
 | =org-agenda-span=                                                  | A number, or =day= (1), =week= (7), =fortnight= (14), =month= (30), =year= (365)               |
+| =org-clock-idle-time=                                             | Minutes; =nil= becomes =0= (never)                                                            |
+| =org-clock-history-length=                                         | The same key, when the value is a positive number                                             |
 | =org-agenda-start-day=                                             | A day offset such as ="-3d"=; =nil= becomes ="+0d"=. Other forms aren't supported.            |
 | =org-todo-keywords=                                                | =org-todo-keywords=, one line per sequence. Keywords with spaces are left out; =type= sequences are read as sequences. |
 | =org-directory=                                                    | A folder to add                                                                               |

Clock resolution keys and import as Org !174