omp-worklog 0.14.4 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc7eb58427a4d399bbca72d279fb96448b356057f3dd00860cf74c1b36b5ccf9
-  data.tar.gz: 8fcaa118dfcdf55dde097bfa8607bbb06ddbaa3f9f6bea1340082708087cd28f
+  metadata.gz: 0ee816df2ce095811beb7021f32892defbbf488840f02f0ff6e3019897f5298c
+  data.tar.gz: 443a96a73fa7bd0f4d4c37089712e1fe7126f5bc6d2800be843bf727b816667b
 SHA512:
-  metadata.gz: cd8587f9774cbb4253aebb01d5d5b6d5ccdf9428f46d10c97d0ab381e6613a2ed0d81022c2347e85e180284471e64d7ec4621235a0e82e40c533c2d987acc972
-  data.tar.gz: 22e1a457099d7997252b9437485279a6e2ceb08c39f93c7fa706211bada3541a5e09b867437b2fff8865c6df09fa10ccdc71b039fa7526c6b9707d9300eecaa5
+  metadata.gz: 2f54d4a599a17e35d500617c0aa7f44fa591f9167861343a414b3d650266b0c0e843dcdc4f84009f81c9939260b26bef867e00d43fd743418518895c7d7fd83c
+  data.tar.gz: 4a89084e3d29bc60fac8eaf06da3c409ec0b165fefc316f5d65777864f61cb2c0fbe55f33829589679d5a7608b74c087a27f89c56db39c725c0782569d4d1bc2

data/README.md

@@ -81,7 +81,7 @@ Type `/worklog ` in OMP to discover `timesheet`; date aliases appear after selec
 
 ## OMP settings
 
-The manifest declares the following settings. **Persisted settings are currently inactive in the extension**: OMP does not expose resolved user-plus-project plugin settings at factory initialization. Explicit factory options work for programmatic callers and tests. [Issue #134](https://github.com/klondikemarlen/omp-worklog/issues/134) tracks the host dependency; do not assume a successful `omp plugin config set` changed runtime behavior.
+Worklog resolves persisted user settings and project overrides through the supported `omp plugin config list omp-worklog --json` command at initialization, using the OMP project cwd. Project values override user values; explicit factory options override both for programmatic callers and tests. Resolution runs once before commands and tools register; restart or reload the extension after changing settings. A resolution failure reports a diagnostic instead of silently using the wrong destination.
 
 - `defaultHours`: hours per business day when a time-off tool call omits `hours`; defaults to `7`.
 - `holidayRegions`: comma-separated Holidays regions; defaults to `ca_yt`.
@@ -121,6 +121,16 @@ Version `0.14.0` is a clean identity cutover. Uninstall the retired `harvest-wor
 
 Version `0.14.3` renames the OMP slash command from `/omp-worklog` to `/worklog`; the `omp-worklog` package identity and CLI executable are unchanged.
 
+## Changes in 0.14.6
+
+- Activate persisted settings through the supported host CLI before registering commands, completion, and tools.
+- Honor project override precedence and retain explicit factory-option overrides without parsing host configuration files.
+
+## Changes in 0.14.5
+
+- Preserve saved user settings across the required clean plugin reinstall, without copying project overrides or manifest defaults into user configuration.
+- Retain an owner-only recovery snapshot and report its path; abort before uninstalling when settings cannot be exported.
+
 ## Changes in 0.14.4
 
 - Preserve short positive durations in mapped and review-required drafts.
@@ -148,4 +158,6 @@ omp-worklog --help
 
 `npm run release` owns the plugin uninstall/force-install mutation, including removal of the retired plugin when present. `npm run verify:release` never changes the installation: it checks the installed package version, resolved Git revision, and plugin path, then runs the installed JavaScript test suite. It exits after verification; tests alone do not exercise a fresh OMP host.
 
-After installation, start a new OMP process and exercise `/worklog` completion and a timesheet against synthetic local evidence. Verify that a newly committed SQLite project appears without restarting that process. Existing sessions retain startup-loaded extension code and cannot prove the released artifact. Use explicit factory options for a mapped smoke until #134 is resolved; do not claim persisted-setting activation from that smoke.
+The release wrapper exports explicit user settings through OMP's configuration CLI from an isolated temporary directory before uninstalling. It saves `settings.json` in an owner-only recovery directory, prints that path without values, restores settings through the CLI, and verifies equality after installation. Project overrides remain project-scoped; unset defaults stay unset. Keep the reported backup until the release is confirmed. If installation or restoration fails, recover from that private snapshot after resolving the reported phase; do not paste its contents into an issue.
+
+After installation, start a new OMP process and exercise `/worklog` completion and a timesheet against synthetic local evidence. Verify that a newly committed SQLite project appears without restarting that process. Existing sessions retain startup-loaded extension code and cannot prove the released artifact. Verify a persisted user mapping and then a different project override; an explicit factory-option smoke alone does not prove saved configuration activation.

data/bin/release-plugin

@@ -1,19 +1,68 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-installed_plugin() {
-  omp plugin list --json | node -e '
-    const plugins = JSON.parse(require("fs").readFileSync(0, "utf8")).npm ?? []
-    process.exit(plugins.some(plugin => plugin.name === process.argv[1]) ? 0 : 1)
-  ' "$1"
+#!/usr/bin/env node
+import { execFileSync } from "node:child_process"
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs"
+import { tmpdir } from "node:os"
+import { join } from "node:path"
+import { isDeepStrictEqual } from "node:util"
+
+// The CLI resolves settings against cwd; an isolated directory excludes project overrides.
+const directory = mkdtempSync(join(tmpdir(), "omp-worklog-release-"))
+let phase = "listing installed plugins"
+let snapshotPath
+
+function run(description, args) {
+  phase = description
+  return execFileSync("omp", args, {
+    cwd: directory,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+  })
 }
 
-if installed_plugin omp-worklog; then
-  omp plugin uninstall omp-worklog
-fi
+function userSettings() {
+  const { settings } = JSON.parse(run("exporting user settings", ["plugin", "config", "list", "omp-worklog", "--json"]))
+  if (!settings || typeof settings !== "object" || Array.isArray(settings)) {
+    throw new Error("Invalid settings export")
+  }
+
+  return settings
+}
 
-if installed_plugin harvest-worklog; then
-  omp plugin uninstall harvest-worklog
-fi
+try {
+  const plugins = JSON.parse(run("listing installed plugins", ["plugin", "list", "--json"])).npm ?? []
+  const installed = new Set(plugins.map(plugin => plugin.name))
+  let settings
+  if (installed.has("omp-worklog")) {
+    settings = userSettings()
+    const backupPath = join(directory, "settings.json")
+    phase = "saving the private settings snapshot"
+    writeFileSync(backupPath, JSON.stringify(settings), { mode: 0o600, flag: "wx" })
+    snapshotPath = backupPath
+    console.log(`Saved private Worklog settings backup: ${snapshotPath}`)
+    run("uninstalling omp-worklog", ["plugin", "uninstall", "omp-worklog"])
+  }
 
-omp plugin install --force github:klondikemarlen/omp-worklog
+  if (installed.has("harvest-worklog")) {
+    run("uninstalling harvest-worklog", ["plugin", "uninstall", "harvest-worklog"])
+  }
+
+  run("installing omp-worklog", ["plugin", "install", "--force", "github:klondikemarlen/omp-worklog"])
+  if (settings) {
+    for (const [key, value] of Object.entries(settings)) {
+      const argument = typeof value === "string" ? value : JSON.stringify(value)
+      run("restoring user settings", ["plugin", "config", "set", "omp-worklog", key, argument])
+    }
+    if (!isDeepStrictEqual(userSettings(), settings)) {
+      phase = "verifying restored user settings"
+      throw new Error("Settings changed")
+    }
+  }
+
+  console.log("Installed omp-worklog; user settings preserved.")
+} catch {
+  console.error(`Worklog release failed while ${phase}.`)
+  if (snapshotPath) console.error(`Recover saved user settings from ${snapshotPath}.`)
+  process.exitCode = 1
+} finally {
+  if (!snapshotPath) rmSync(directory, { recursive: true, force: true })
+}

data/lib/omp_worklog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OmpWorklog
-  VERSION = "0.14.4"
+  VERSION = "0.14.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omp-worklog
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.6
 platform: ruby
 authors:
 - Marlen Brunner