Merge pull request #176 from pajoma/feature/updates

Upgrade to VS Code 1.118 baseline + vscode.l10n migration

Author: pajoma

.github/workflows/ci.yml

@@ -12,15 +12,19 @@ jobs:
   lint-build-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: ["20", "22"]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Node.js
+      - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: ${{ matrix.node-version }}
           cache: npm
 
       - name: Install dependencies

CHANGELOG.md

@@ -9,6 +9,22 @@
 * Rework the whole syntax highlighting (it's a mess)
 * More code actions and code lenses (e.g. to pull all open tasks to the current journal entry)
 
+## Unreleased
+
+### Changed
+* Bumped VS Code engine baseline to `^1.118.0` (was `^1.94.0`). `@types/vscode` and toolchain (TypeScript 5.9, ESLint 9.39, esbuild 0.28, `@vscode/test-cli` 0.0.12, `@vscode/test-electron` 2.5, Mocha 11, `@typescript-eslint/*` 8.59) bumped to current stable.
+* Migrated translations from the custom `src/ext/messages.json` system to the stable `vscode.l10n` API. Manifest strings live in `package.nls*.json`; runtime strings in `l10n/bundle.l10n*.json`. All 11 locales preserved (en, de, fr, es, it, pt, nl, ru, zh, ja, ar). Fixed a moment.js escape bug in the Spanish locale carried over from `messages.json`.
+
+### Removed
+* Redundant `activationEvents` block — implicit activation has covered all `contributes.commands` since VS Code 1.74.
+* Unused `@vscode/extension-telemetry` runtime dependency.
+* Internal `journal.test` command (was undocumented and never registered).
+
+### Added
+* `capabilities.virtualWorkspaces` (`limited`) and `capabilities.untrustedWorkspaces` (`limited` with `restrictedConfigurations: ["journal.base"]`) in the manifest.
+* `@vscode/l10n-dev` devDependency and `npm run l10n:export` script for regenerating the runtime bundle.
+* Node 22 to the CI matrix alongside Node 20.
+
 ## 1.0.2
 * [Issue #136](https://github.com/pajoma/vscode-journal/issues/136) Added a configuration option to disable syntax highlighting (disabled by default)
 ## 1.0.1

CLAUDE.md

@@ -0,0 +1,72 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project
+
+VS Code extension (`pajoma.vscode-journal`) for daily markdown journaling. TypeScript, bundled with esbuild, runs in the workspace extension host. Requires Node 20+ and VS Code 1.118+.
+
+## Commands
+
+```bash
+npm install
+npm run compile          # esbuild → dist/extension.js (CJS, external 'vscode')
+npm run watch            # esbuild watch (used as preLaunchTask for F5)
+npm run package          # production build (minified, no sourcemap)
+npm run compile-tests    # tsc -p . --outDir out (separate from extension bundle)
+npm run lint             # eslint src
+npm test                 # @vscode/test-cli — pretest auto-runs compile-tests + compile + lint
+npm run check            # lint + compile + test
+```
+
+Run a single test by passing a Mocha grep through `@vscode/test-cli`:
+
+```bash
+npm test -- --grep "MatchInput"
+```
+
+Tests live in `src/test/suite/**/*.test.ts`, compile to `out/test/suite/**/*.test.js`, and run inside a real Extension Host against the workspace `test/ws_unittests/`. Mocha TDD UI, 20s default timeout (`.vscode-test.mjs`). `src/test/direct/` contains plain-node debug scripts, not part of the suite.
+
+Launch configs (`.vscode/launch.json`):
+- **Run Extension** — opens Extension Development Host on `test/ws_manual/` (default F5)
+- **Run Extension without Workspace** — uses `test/ws_empty/`
+- **Extension Tests** — runs the suite with `watch-tests` as pre-launch
+
+CI (`.github/workflows/ci.yml`) runs lint → compile → compile-tests → `xvfb-run npm test` on push to `main`/`master`/`develop` and on PRs.
+
+## Architecture
+
+Entry: `src/extension.ts` → `Startup(config).run(context)` (in `src/ext/startup.ts`) which initializes the `Ctrl` service locator and registers commands, code actions, and optional syntax highlighting.
+
+**Service locator pattern.** `Ctrl` (`src/util/controller.ts`) owns one instance each of `Configuration`, `Parser`, `Writer`, `Reader`, `Inject`, `Dialogues`, and `Logger`. Every command/provider receives `Ctrl` in its constructor and reaches services through it. PLAN.md Phase 2.1 marks this for replacement with proper DI — new code should be written so it can accept narrower interfaces later, not lean harder on `Ctrl`.
+
+**Namespace barrel imports.** `src/index.ts` re-exports submodules as `J.Extension`, `J.Actions`, `J.Model`, `J.Util`, `J.Provider`. Existing code does `import * as J from '..'` and references `J.Util.Ctrl`, `J.Actions.Writer`, etc. PLAN.md Phase 2.3 marks this for replacement with named imports — prefer named imports in new files.
+
+**Module responsibilities** (need multiple files to grasp):
+
+- `src/ext/` — VS Code surface integration. `Configuration` (`conf.ts`) reads `journal.*` settings and resolves templates/scopes. `Dialogues` drives QuickPick/InputBox. `Startup` wires everything. i18n uses `vscode.l10n` — manifest strings in `package.nls*.json` at the repo root, runtime strings in `l10n/bundle.l10n*.json` (regenerated via `npm run l10n:export`).
+- `src/actions/` — Core domain logic, no direct command bindings.
+  - `Parser` — turns user input/URIs into structured `Input` (date, note, memo, task, weekly).
+  - `Reader` — loads entries/notes from the configured base directory using `vscode.workspace.fs`.
+  - `Writer` — creates new files (entry, note, weekly) and opens text documents.
+  - `Inject` — modifies existing documents (insert memo/task/file link, shift task).
+- `src/model/` — Plain data types: `Input`, `FileEntry`, `HeaderTemplate`/`InlineTemplate`/`ScopedTemplate`, scope/quickpick types.
+- `src/provider/` — VS Code-facing surface.
+  - `commands/` — one file per registered command (`journal.today`, `journal.note`, `journal.printDuration`, etc.); each exports a static `create(ctrl)` that returns the `Disposable`.
+  - `codeactions/` — markdown code actions for completed and open task lines.
+  - `codelens/` — task migration/shift CodeLens providers (not all registered yet — see `Startup.registerCodeLens`).
+  - `features/` — reusable building blocks: `MatchInput` (smart-input resolver), `ScanEntries` (directory walker + cache for QuickPick), `LoadNotes`, `SyncNoteLinks`.
+- `src/util/` — `Ctrl`, `Logger` (OutputChannel-backed), `dates.ts` (moment-based, slated for removal in Phase 3), `paths.ts`, `strings.ts`.
+
+**Smart-input flow.** User triggers `journal.day` (`Ctrl+Shift+J`) → `Dialogues` shows InputBox → `MatchInput.parseInput()` classifies the text (date expression, weekday, "memo:", "task:", "note ...", week reference) → command dispatches to `Reader`/`Writer`/`Inject`. The default path/file patterns (`${base}/${year}/${month}/${day}` for notes, `${base}/${year}/${month}/${day}.${ext}` for entries) come from `journal.patterns` in `package.json`.
+
+**Filesystem.** Always go through `vscode.workspace.fs` (the extension declares `extensionKind: ["workspace"]` so it runs on the remote host for Remote SSH/Codespaces). Avoid raw `fs` / `fs.promises` in new code — PLAN.md Phase 1.3 finished migrating the old `fs` call sites; do not reintroduce them.
+
+**Templates.** All user-facing inserted content comes from `journal.templates` (array of `{name, template, after?}`). Lookup happens via `Configuration.getInlineTemplate(name, fallback)`. Default template names: `memo`, `task`, `entry`, `time`, `note`, `files`, `weekly`. Issue #167 was a name-mismatch bug (`week` vs `weekly`) — when adding a new template type, register the name consistently in `package.json` defaults and the consumer.
+
+## Notes for changes
+
+- `PLAN.md` is the active modernization roadmap. Phases 0 and 1 are complete; Phase 2+ is open. Match the direction in the plan (DI, named imports, native `async`/`await` instead of `new Promise()` wrappers, `vscode.workspace.fs`, replacing moment with `Intl`/`date-fns`).
+- ESLint flat config (`eslint.config.mjs`) enforces `curly`, `eqeqeq`, `no-throw-literal`, `semi`. Import naming must be `camelCase` or `PascalCase`.
+- `tsconfig.json` runs `strict`, `noImplicitReturns`, `noFallthroughCasesInSwitch`. The bundle goes through esbuild, but tests are compiled via `tsc` — both must succeed for `npm test`.
+- `docs/` contains user-facing feature docs (entries, notes, memos, tasks, scopes, settings, codeactions) and `docs/analysis/` holds the analysis that produced `PLAN.md`.

PLAN.md

@@ -34,28 +34,28 @@
 ## Phase 1: Critical Bug Fixes
 
 ### 1.1 — Fix #167: Weekly Template Name Mismatch
-- [ ] `conf.ts:getWeeklyTemplate()` calls `getInlineTemplate("week", ...)` but `package.json` default template is named `"weekly"`
-- [ ] **Fix**: Change lookup key to `"weekly"` OR change default template name to `"week"` (the latter matches the method name and is cleaner)
-- [ ] Add regression test
+- [x] `conf.ts:getWeeklyTemplate()` calls `getInlineTemplate("week", ...)` but `package.json` default template is named `"weekly"`
+- [x] **Fix**: Changed lookup key to `"weekly"` to match the default template name in `package.json`
+- [x] Add regression test
 
 ### 1.2 — Fix #170: Wrong Day Set on New Entry
-- [ ] `MatchInput` stores `this.today = new Date()` at construction time; if the instance is reused across midnight, dates are wrong
-- [ ] **Fix**: Compute `today` at parse time, not construction time
-- [ ] Review `resolveISOString()`, `resolveWeekday()`, `resolveDayOfMonth()` for off-by-one errors
-- [ ] Add unit tests for edge cases (midnight boundary, timezone transitions)
+- [x] `MatchInput` stores `this.today = new Date()` at construction time; if the instance is reused across midnight, dates are wrong
+- [x] **Fix**: Added `refreshToday()` called at start of every `parseInput()`. Removed unused stale `Parser.today` field.
+- [x] Review `resolveISOString()`, `resolveWeekday()`, `resolveDayOfMonth()` for off-by-one errors — fixed month validation (`>12` → `>11`) and day validation (`<0` → `<1`)
+- [x] Add unit tests for edge cases (midnight boundary, timezone transitions)
 
 ### 1.3 — Fix #94: Remote Workspace Support (Local VS Remote Hosting)
-- [ ] Add `"extensionKind": ["workspace"]` to `package.json` so the extension runs on the remote host
-- [ ] Replace all direct `fs` calls with `vscode.workspace.fs` API:
-  - `util/paths.ts` — `checkIfFileIsAccessible()` → use `vscode.workspace.fs.stat()`
-  - `provider/features/scan-entries.ts` — `walkDir()` / `walkDirSync()` → use `vscode.workspace.fs.readDirectory()`
-  - `provider/features/sync-note-links.ts` — `getFilesInNotesFolder()` → use `vscode.workspace.fs.readDirectory()` + `vscode.workspace.fs.stat()`
-  - `ext/startup.ts` — `fs.promises.readFile()` for color config → bundle color configs or use `vscode.workspace.fs`
-- [ ] Replace `os.homedir()` usage in `conf.ts` with platform-appropriate handling:
-  - In remote context, use `vscode.Uri.joinPath(context.globalStorageUri, ...)` or let user configure explicitly
-  - Provide sensible fallback when `os.homedir()` returns the local home in a remote session
-- [ ] Replace `untitled:` URI scheme in `writer.ts:createSaveLoadTextDocument()` with `vscode.workspace.fs.writeFile()` + `vscode.workspace.openTextDocument()`
-- [ ] Add integration test verifying file creation via `vscode.workspace.fs`
+Make sure that, when running on a remote host, the extension can still access the journal files on the local file system. Validate if the following plan supports this. 
+
+- [x] Add `"extensionKind": ["workspace"]` to `package.json` so the extension runs on the remote host
+- [x] Replace all direct `fs` calls with `vscode.workspace.fs` API:
+  - `util/paths.ts` — `checkIfFileIsAccessible()` → `vscode.workspace.fs.stat()`
+  - `provider/features/scan-entries.ts` — `walkDir()` / `walkDirSync()` → `vscode.workspace.fs.readDirectory()` + `stat()`
+  - `provider/features/sync-note-links.ts` — `getFilesInNotesFolder()` → `vscode.workspace.fs.readDirectory()` + `stat()`
+  - `ext/startup.ts` — `fs.promises.readFile()` → `vscode.workspace.fs.readFile()`
+- [x] `os.homedir()` in `conf.ts`: No change needed — with `extensionKind: ["workspace"]` the extension runs on the remote host, so `os.homedir()` correctly returns the remote home directory where the journal resides
+- [x] Replace `untitled:` URI scheme in `writer.ts:createSaveLoadTextDocument()` with `vscode.workspace.fs.writeFile()` + `vscode.workspace.openTextDocument()`
+- [x] Add integration test verifying file creation via `vscode.workspace.fs`
 
 ---
 
@@ -88,9 +88,9 @@
 - [ ] Example: `import { Ctrl } from '../util/controller'` instead of `J.Util.Ctrl`
 
 ### 2.4 — Modernize Activation
-- [ ] Remove explicit `activationEvents` from `package.json` (VS Code 1.74+ supports implicit activation from `contributes.commands`)
+- [x] Remove explicit `activationEvents` from `package.json` (VS Code 1.74+ supports implicit activation from `contributes.commands`)
 - [ ] Or replace with `"onStartupFinished"` if the extension needs early initialization
-- [ ] Remove the `journal.test` command and its activation event
+- [x] Remove the `journal.test` command and its activation event
 
 ### 2.5 — Fix Syntax Highlighting Approach
 - [ ] Remove `enableSyntaxHighlighting()` / `disableSyntaxHighlighting()` that modify global user settings
@@ -171,13 +171,13 @@
 - [ ] Remove `getPreviouslyAccessedFilesSync()` in `scan-entries.ts` (not used)
 - [ ] Remove `JournalCodeLensProvider` in `vscode-codelens.ts` (disabled since 0.12, uses placeholder command)
 - [ ] Remove the `InsertMemoCommand` if it's truly identical to `ShowEntryForInputCommand` (or merge)
-- [ ] Remove `@vscode/extension-telemetry` if not actually used
+- [x] Remove `@vscode/extension-telemetry` if not actually used
 - [ ] Clean up `show-pick-list.ts` (219 bytes, likely empty/stub)
 
 ### 5.4 — Improve i18n
-- [ ] Replace hardcoded locale strings in `getInputDetailsTimeFormat()` with translations from `messages.json`
-- [ ] Add support for VS Code's built-in `vscode.l10n` API (available since 1.73) instead of custom translation system
-- [ ] Move all user-facing strings to the l10n system
+- [ ] Replace hardcoded locale strings in `getInputDetailsTimeFormat()` (still hardcoded in `src/ext/conf.ts`)
+- [x] Add support for VS Code's built-in `vscode.l10n` API (available since 1.73) instead of custom translation system
+- [x] Move all QuickPick/InputBox user-facing strings to the l10n system (`getInputDetailsTimeFormat()` hardcoded strings remain — tied to moment removal in Phase 3)
 
 ---