diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index 6ce781f..746d533 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Check out Repository
-        uses: https://git.konstantinfickel.de/actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: https://git.konstantinfickel.de/actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v6
 
       - run: nix --version
       - run: nix flake check
@@ -22,6 +22,6 @@ jobs:
 
     steps:
       - name: Check out Repository
-        uses: https://git.konstantinfickel.de/actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: https://git.konstantinfickel.de/actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v6
 
       - run: nix build
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index 0db21a7..fce32e9 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -2,8 +2,8 @@ name: Release
 
 on:
   push:
-    tags:
-      - 'v*'
+    branches:
+      - main
   workflow_dispatch:
 
 jobs:
@@ -13,52 +13,61 @@ jobs:
 
     steps:
       - name: Check out Repository
-        uses: https://git.konstantinfickel.de/actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: https://git.konstantinfickel.de/actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v6
         with:
           fetch-depth: 0
 
       - name: Extract version and handle tagging
         id: version
         run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            # Manual trigger: read version from Cargo.toml
-            VERSION_LINE=$(grep '^version' Cargo.toml | head -1)
-            VERSION="${VERSION_LINE#*\"}"
-            VERSION="${VERSION%\"*}"
-            TAG="v${VERSION}"
+          # Read version from Cargo.toml
+          VERSION_LINE=$(grep '^version' Cargo.toml | head -1)
+          VERSION="${VERSION_LINE#*\"}"
+          VERSION="${VERSION%\"*}"
+          TAG="v${VERSION}"
 
-            # Check if tag already exists
-            if git rev-parse "$TAG" >/dev/null 2>&1; then
-              echo "::error::Version ${VERSION} is already released"
-              exit 1
-            fi
-
-            # Create and push the tag
-            git tag "$TAG"
-            git push origin "$TAG"
-
-            echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-            echo "TAG=${TAG}" >> $GITHUB_OUTPUT
-          else
-            # Tag push trigger: extract version from tag
-            VERSION="${GITHUB_REF_NAME#v}"
-            echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-            echo "TAG=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
+          # Check if tag already exists
+          if git rev-parse "$TAG" >/dev/null 2>&1; then
+            echo "Tag ${TAG} already exists, skipping release"
+            echo "SKIP=true" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
+          # Create and push the tag
+          git tag "$TAG"
+          git push origin "$TAG"
+
+          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+          echo "TAG=${TAG}" >> $GITHUB_OUTPUT
+          echo "SKIP=false" >> $GITHUB_OUTPUT
+
       - name: Build .deb package
+        if: steps.version.outputs.SKIP != 'true'
         run: nix build .#streamd-deb -o result-deb
 
       - name: Build static binary
+        if: steps.version.outputs.SKIP != 'true'
         run: nix build .#streamd-musl -o result-musl
 
+      - name: Build Windows binary
+        if: steps.version.outputs.SKIP != 'true'
+        run: nix build .#streamd-windows -o result-windows
+
+      - name: Build Zed extension
+        if: steps.version.outputs.SKIP != 'true'
+        run: nix build .#zed-extension-zip -o result-zed-extension-zip
+
       - name: Prepare release artifacts
+        if: steps.version.outputs.SKIP != 'true'
         run: |
           mkdir -p release
           cp result-deb release/streamd_${{ steps.version.outputs.VERSION }}_amd64.deb
           cp result-musl/bin/streamd release/streamd-${{ steps.version.outputs.VERSION }}-linux-x86_64
+          cp result-windows/bin/streamd.exe release/streamd-${{ steps.version.outputs.VERSION }}-windows-x86_64.exe
+          cp result-zed-extension-zip release/streamd-zed-extension-${{ steps.version.outputs.VERSION }}.zip
 
       - name: Create release
+        if: steps.version.outputs.SKIP != 'true'
         uses: https://git.konstantinfickel.de/actions/forgejo-release@v2
         with:
           direction: upload
diff --git a/CLAUDE.md b/CLAUDE.md
index 3ca95b6..8ec1886 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -16,6 +16,8 @@ cargo clippy             # Lint
 cargo fmt                # Format
 ```
 
+After finishing tests, always check the package with `nix flake check`.
+
 ## Architecture
 
 Streamd parses markdown files into hierarchical **Shards**, then **localizes** them by assigning temporal moments and dimensional placements based on `@Tag` markers.
diff --git a/Cargo.lock b/Cargo.lock
index bf965c3..d414f49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -91,6 +91,28 @@ version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "auto_impl"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -123,9 +145,15 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "bumpalo"
@@ -134,10 +162,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
 [[package]]
-name = "cc"
-version = "1.2.59"
+name = "bytes"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "cc"
+version = "1.2.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -175,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.6.0"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -197,18 +231,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.6.0"
+version = "4.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c9f1dde76b736e3681f28cec9d5a61299cbaae0fce80a68e43724ad56031eb"
+checksum = "660c0520455b1013b9bcb0393d5f643d7e4454fb69c915b8d6d2aa0e9a45acc3"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.6.0"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -234,6 +268,39 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -261,6 +328,17 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -285,9 +363,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "find-msvc-tools"
@@ -301,6 +379,91 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
+
 [[package]]
 name = "getopts"
 version = "0.2.24"
@@ -340,6 +503,12 @@ version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
 [[package]]
 name = "hashbrown"
 version = "0.15.5"
@@ -351,9 +520,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
 
 [[package]]
 name = "heck"
@@ -361,6 +530,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.65"
@@ -385,6 +560,88 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
 [[package]]
 name = "id-arena"
 version = "2.3.0"
@@ -392,13 +649,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
-name = "indexmap"
-version = "2.13.1"
+name = "idna"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "serde",
  "serde_core",
 ]
@@ -432,9 +710,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "js-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -448,15 +726,15 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "libredox"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
 dependencies = [
  "libc",
 ]
@@ -467,12 +745,40 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
+[[package]]
+name = "lsp-types"
+version = "0.94.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
+dependencies = [
+ "bitflags 1.3.2",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "url",
+]
+
 [[package]]
 name = "memchr"
 version = "2.8.0"
@@ -560,6 +866,25 @@ version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d"
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
 [[package]]
 name = "phf"
 version = "0.12.1"
@@ -578,6 +903,41 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pin-project"
+version = "1.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "pretty_assertions"
 version = "1.4.1"
@@ -613,7 +973,7 @@ version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c3a14896dfa883796f1cb410461aef38810ea05f2b2c33c5aded3649095fdad"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.1",
  "getopts",
  "memchr",
  "pulldown-cmark-escape",
@@ -641,6 +1001,15 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.11.1",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.5.2"
@@ -693,7 +1062,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.1",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -716,10 +1085,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "semver"
-version = "1.0.27"
+name = "scopeguard"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "serde"
@@ -764,6 +1139,17 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "serde_spanned"
 version = "1.1.1"
@@ -785,14 +1171,33 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
 
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
 [[package]]
 name = "streamd"
-version = "0.1.1"
+version = "0.2.5"
 dependencies = [
  "chrono",
  "chrono-tz",
  "clap",
  "clap_complete",
+ "dashmap 6.1.0",
  "directories",
  "indexmap",
  "itertools",
@@ -802,9 +1207,12 @@ dependencies = [
  "pulldown-cmark",
  "regex",
  "serde",
+ "serde_json",
  "tempfile",
  "thiserror",
+ "tokio",
  "toml",
+ "tower-lsp",
  "walkdir",
 ]
 
@@ -846,6 +1254,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.27.0"
@@ -899,6 +1318,38 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.52.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "110a78583f19d5cdb2c5ccf321d1290344e71313c6c37d43520d386027d18386"
+dependencies = [
+ "pin-project-lite",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "toml"
 version = "1.1.2+spec-1.1.0"
@@ -938,6 +1389,97 @@ version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-lsp"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508"
+dependencies = [
+ "async-trait",
+ "auto_impl",
+ "bytes",
+ "dashmap 5.5.3",
+ "futures",
+ "httparse",
+ "lsp-types",
+ "memchr",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-util",
+ "tower",
+ "tower-lsp-macros",
+ "tracing",
+]
+
+[[package]]
+name = "tower-lsp-macros"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+]
+
 [[package]]
 name = "unicase"
 version = "2.9.0"
@@ -974,6 +1516,25 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -998,11 +1559,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
@@ -1011,14 +1572,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -1029,9 +1590,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1039,9 +1600,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -1052,9 +1613,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
 dependencies = [
  "unicode-ident",
 ]
@@ -1087,7 +1648,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.1",
  "hashbrown 0.15.5",
  "indexmap",
  "semver",
@@ -1185,6 +1746,12 @@ dependencies = [
  "wit-bindgen-rust-macro",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
@@ -1234,7 +1801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags",
+ "bitflags 2.11.1",
  "indexmap",
  "log",
  "serde",
@@ -1264,12 +1831,95 @@ dependencies = [
  "wasmparser",
 ]
 
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
 [[package]]
 name = "yansi"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zmij"
 version = "1.0.21"
diff --git a/Cargo.toml b/Cargo.toml
index cb39165..2d70525 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "streamd"
-version = "0.1.1"
+version = "0.2.5"
 edition = "2021"
 description = "Personal knowledge management and time-tracking CLI using @Tag annotations"
 license = "AGPL-3.0-only"
@@ -11,6 +11,7 @@ repository = "https://github.com/konstantinfickel/streamd"
 clap = { version = "4", features = ["derive", "env"] }
 clap_complete = "4"
 serde = { version = "1", features = ["derive"] }
+serde_json = "1"
 toml = "1.0"
 thiserror = "2"
 miette = { version = "7", features = ["fancy"] }
@@ -23,6 +24,9 @@ walkdir = "2"
 indexmap = { version = "2", features = ["serde"] }
 itertools = "0.14"
 directories = "6"
+tower-lsp = "0.20"
+tokio = { version = "1", features = ["rt-multi-thread", "io-std"] }
+dashmap = "6"
 
 [dev-dependencies]
 pretty_assertions = "=1.4.1"
diff --git a/README.md b/README.md
index a738339..52b17e6 100644
--- a/README.md
+++ b/README.md
@@ -49,17 +49,27 @@ Markdown files are named with a timestamp: `YYYYMMDD-HHMMSS [markers].md`
 
 For example: `20260131-210000 Task Streamd.md`
 
+An optional `_file_type` segment can follow the timestamp to classify the file:
+
+```
+YYYYMMDD-HHMMSS_<file_type> [markers].md
+```
+
+For example: `20260413-083000_daily.md` — the `daily` prefix is stored as the `file_type` dimension and propagates to all child shards.
+
 Within files, `@`-prefixed markers at the beginning of paragraphs or headings define how a shard is categorized.
 
 ## Commands
 
 - `streamd` / `streamd new` — Create a new timestamped markdown entry, opening your editor
+- `streamd daily [YYYYMMDD]` — Open today's daily file (or create it if missing); pass a date to open that day's file instead
 - `streamd todo` — Show all open tasks (shards with `@Task` markers), numbered for easy reference
 - `streamd todo N edit` — Edit task N in your editor, jumping to the task's line
 - `streamd todo N done` — Mark task N as done by inserting `@Done` after `@Task`
 - `streamd todo --show-future` — Include tasks with future dates in the listing
 - `streamd edit [number]` — Edit a stream file by index (most recent first)
 - `streamd timesheet` — Generate time reports from `@Timesheet` markers
+- `streamd lsp` — Start the LSP server (stdin/stdout transport; see [Editor Integration](#editor-integration) below)
 
 ## Configuration
 
@@ -101,3 +111,122 @@ Running `streamd todo` finds all shards marked as open tasks and displays them n
 You can quickly edit or complete tasks by number:
 - `streamd todo 1 edit` opens task 1 in your editor at the correct line
 - `streamd todo 1 done` marks task 1 as done by inserting `@Done` after `@Task`
+
+## Editor Integration
+
+`streamd lsp` starts a Language Server Protocol server that provides IDE features for your stream markdown files. The server communicates over **stdin/stdout** and auto-activates only when a `.streamd.toml` file is present in the workspace root.
+
+### Features
+
+| Feature | Description |
+|---|---|
+| `@` completions | Suggests known markers from your config; conditional suggestions (e.g. `@Done` when `@Task` is on the line) |
+| Temporal snippets | `@` followed by a digit offers `YYYYMMDD` / `HHMMSS` format snippets |
+| Diagnostics | File-name format warnings (R15); timesheet errors (overlapping timecards, unclosed days) |
+| Document symbols | Shard tree exposed as outline symbols |
+| "Mark task as done" | Quick-fix code action: inserts `@Done` after `@Task` |
+| Workspace symbols | Search shards across all `.md` files |
+| References | Find all occurrences of an `@Marker` across the workspace |
+| Rename | Rename an `@Marker` across all files |
+
+### Zed
+
+Add to `~/.config/zed/settings.json`:
+
+```json
+{
+  "languages": {
+    "Markdown": {
+      "language_servers": ["streamd-lsp", "..."]
+    }
+  },
+  "lsp": {
+    "streamd-lsp": {
+      "binary": {
+        "path": "streamd",
+        "arguments": ["lsp"]
+      }
+    }
+  }
+}
+```
+
+The `"..."` keeps Zed's default Markdown servers (e.g. `marksman`) active alongside streamd.
+
+#### Zed Extension (WSL2)
+
+If you run Zed on Windows with streamd installed inside WSL2, use the pre-built Zed extension instead of the manual config above. The extension auto-detects Windows and routes LSP communication through WSL2.
+
+**1. Install streamd in WSL2** (e.g. via the `.deb` package):
+
+```bash
+wget https://git.konstantinfickel.de/kfickel/streamd/releases/download/vX.Y.Z/streamd_X.Y.Z_amd64.deb
+sudo dpkg -i streamd_X.Y.Z_amd64.deb
+```
+
+**2. Download the extension** from the same release page:
+
+```
+streamd-zed-extension-X.Y.Z.zip
+```
+
+**3. Extract the zip** to a permanent folder on your Windows machine, e.g.:
+
+```
+C:\Users\<you>\zed-extensions\streamd-zed-extension\
+```
+
+The folder must contain `extension.toml` and `extension.wasm`.
+
+**4. Install the extension in Zed** via the command palette (`Ctrl+Shift+P`):
+
+```
+zed: install dev extension
+```
+
+Point Zed to the extracted folder.
+
+**5. Verify** by opening a Markdown file inside a directory that contains `.streamd.toml` — `@` completions and diagnostics should become active.
+
+### Neovim (nvim-lspconfig)
+
+**1. Register the server** — add to your Neovim config (e.g. `~/.config/nvim/init.lua` or a plugin file):
+
+```lua
+local lspconfig = require('lspconfig')
+local configs = require('lspconfig.configs')
+
+if not configs.streamd then
+  configs.streamd = {
+    default_config = {
+      cmd = { 'streamd', 'lsp' },
+      filetypes = { 'markdown' },
+      root_dir = lspconfig.util.root_pattern('.streamd.toml'),
+      single_file_support = false,
+    },
+  }
+end
+
+lspconfig.streamd.setup {}
+```
+
+The server activates automatically when Neovim opens a Markdown file inside a directory that contains a `.streamd.toml` file.
+
+**2. Using LSP features** — standard Neovim LSP keymaps apply (`:help lsp`):
+
+| Action | Default keymap | Notes |
+|---|---|---|
+| Trigger `@` completions | `<C-x><C-o>` (insert mode) | Or via your completion plugin (`nvim-cmp`, `blink.cmp`, …) |
+| Show diagnostics for current line | `<C-w>d` / `gl` | File-name format warnings, timesheet errors |
+| Jump to next / previous diagnostic | `]d` / `[d` | Navigate between warnings |
+| Code actions (mark task as done) | `<leader>ca` (Neovim ≥ 0.10) | Place cursor on a line with `@Task` |
+| Rename marker across all files | `<leader>cr` / `grn` | Renames the `@Marker` under the cursor everywhere |
+| Find all references to a marker | `grr` / `<leader>fr` | Lists every occurrence of `@Marker` across the workspace |
+| Document outline (shard tree) | `:lua vim.lsp.buf.document_symbol()` | Or via Telescope: `:Telescope lsp_document_symbols` |
+| Workspace symbol search | `:lua vim.lsp.buf.workspace_symbol()` | Or via Telescope: `:Telescope lsp_workspace_symbols` |
+
+> **Note:** default keymaps (`grn`, `grr`, `<C-w>d`, `]d`/`[d`) are available from Neovim 0.10+. On older versions use `:lua vim.lsp.buf.*` commands or set up keymaps manually in your `on_attach` callback.
+
+### VS Code (tasks.json / manual)
+
+Use any extension that lets you configure custom LSP servers, pointing `cmd` to `streamd lsp`.
diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md
index 49f3f42..01b555f 100644
--- a/REQUIREMENTS.md
+++ b/REQUIREMENTS.md
@@ -275,13 +275,18 @@ This allows conditional placements to override base placements.
 
 ### R15: File Name Format
 
-Files follow the pattern: `YYYYMMDD-HHMMSS [markers].md`
+Files follow the pattern: `YYYYMMDD-HHMMSS[_file_type] [markers].md`
 
 - `YYYYMMDD`: Date (8 digits, required)
 - `HHMMSS`: Time (4-6 digits, optional, pads with zeros)
+- `_file_type`: Optional alphanumeric prefix identifying the file type (e.g. `_daily`)
 - `[markers]`: Space-separated marker names extracted from file content
 
-**Extraction regex:** `^(?P<date>\d{8})(?:-(?P<time>\d{4,6}))?.+\.md$`
+**Extraction regex for datetime:** `^(?P<date>\d{8})(?:-(?P<time>\d{4,6}))?.+\.md$`
+
+**Extraction regex for file type:** `^\d{8}(?:-\d{4,6})?_([a-zA-Z0-9]+)`
+
+When a `_file_type` prefix is present it is stored in the `file_type` dimension of the root shard and propagates to all child shards.
 
 ### R16: Temporal Markers
 
@@ -387,6 +392,7 @@ Provide recursive search through the shard tree:
 | Command | Description |
 |---------|-------------|
 | `streamd new` | Create new timestamped file, open editor, rename with markers on close |
+| `streamd daily [YYYYMMDD]` | Open the earliest daily file for the given date (default: today in configured timezone), or create a new `_daily` file if none exists |
 | `streamd todo` | List all shards with `task: "open"`, numbered, hiding future tasks |
 | `streamd todo --show-future` | Include tasks with future dates in the todo listing |
 | `streamd todo N edit` | Edit task N in editor, cursor positioned at task line |
@@ -394,6 +400,24 @@ Provide recursive search through the shard tree:
 | `streamd edit [n]` | Edit nth file (supports negative indexing for recent files) |
 | `streamd timesheet` | Generate formatted timesheet report with expected/actual hours |
 | `streamd completions <shell>` | Generate shell completions (bash, zsh, fish, elvish, powershell) |
+| `streamd lsp` | Start Language Server Protocol server over stdin/stdout |
+
+### R21a: Daily Command Behavior
+
+`streamd daily [YYYYMMDD]` provides quick access to the daily journal entry for a given date.
+
+**Date resolution:**
+- If a `YYYYMMDD` argument is provided, it is parsed as the target date.
+- If no argument is given, today's date is used, interpreted in the repository timezone (from `.streamd.toml`, defaulting to UTC).
+
+**File lookup:**
+- All markdown files in the base folder are localized.
+- Files with `file_type = "daily"` whose root shard `moment` falls within the target date (in the configured timezone) are collected.
+- The file with the earliest `moment` is opened in `$EDITOR` (defaults to `vi`).
+
+**File creation:**
+- If no matching file is found, a new file is created at `<now_local>_daily.md` (e.g. `20260413-083000_daily.md`) containing `# ` and opened in the editor.
+- The `_daily` suffix is permanent — it identifies the file type and is not renamed after editing.
 
 ### R21: Todo Command Behavior
 
@@ -448,3 +472,53 @@ Multiple configurations can be merged:
 - Dimensions are combined (later configs can add new dimensions)
 - Markers are combined (later configs can add new markers)
 - This allows base configuration + domain-specific extensions
+
+---
+
+## LSP Server
+
+### R25: LSP Subcommand
+
+`streamd lsp` starts a Language Server Protocol server over stdin/stdout.
+
+**Workspace root resolution:**
+- The base folder is taken from `initializeParams.rootUri` (or `rootPath` as fallback).
+- R22/R23 global config resolution is bypassed in LSP mode.
+
+**Passive mode:**
+- If `.streamd.toml` is absent from the workspace root, the server enters passive mode: all requests return empty results and no diagnostics are published.
+
+**Config watching:**
+- The server registers a `workspace/didChangeWatchedFiles` watcher for `.streamd.toml`.
+- Config is reloaded without restarting the server when `.streamd.toml` changes.
+
+**Document sync:**
+- Full-document sync (`TextDocumentSyncKind::FULL`).
+- Re-parses on `didOpen`, `didChange`, and `didSave`.
+
+### R25a: LSP Completion
+
+- Trigger character: `@`
+- Returns marker names from the merged config (BasicTimesheetConfiguration + TaskConfiguration).
+- Conditional suggestions: if marker A is on the line and A has placements with `if_with: {B}`, B is offered with higher priority.
+- Temporal snippets: `@` followed by a digit offers `YYYYMMDD` and `HHMMSS` format snippets (R16).
+
+### R25b: LSP Diagnostics
+
+- **File-name format (R15)**: Warning when the file basename does not match `^(\d{8})(?:-(\d{4,6}))?.+\.md$`.
+- **Timesheet violations (R18)**: Error when a day ends without a break; Warning for overlapping timecards.
+
+### R25c: LSP Document Symbols
+
+- Returns the `LocalizedShard` tree as nested `DocumentSymbol` nodes.
+- Symbol names are derived from marker names or tag names.
+
+### R25d: LSP Code Actions
+
+- "Mark task as done": offered on any line containing `@Task` without `@Done`; inserts ` @Done` after `@Task`.
+
+### R25e: LSP Cross-file Features
+
+- `workspace/symbol`: searches all `.md` files in base folder (depth 1) for shards matching the query.
+- `textDocument/references`: finds all occurrences of the `@Marker` under the cursor across the workspace.
+- `textDocument/rename`: renames an `@Marker` across all files via `WorkspaceEdit`.
diff --git a/flake.lock b/flake.lock
index 20b479f..0c44fe5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1774313767,
-        "narHash": "sha256-hy0XTQND6avzGEUFrJtYBBpFa/POiiaGBr2vpU6Y9tY=",
+        "lastModified": 1775839657,
+        "narHash": "sha256-SPm9ck7jh3Un9nwPuMGbRU04UroFmOHjLP56T10MOeM=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "3d9df76e29656c679c744968b17fbaf28f0e923d",
+        "rev": "7cf72d978629469c4bd4206b95c402514c1f6000",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775036584,
-        "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
+        "lastModified": 1775585728,
+        "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
+        "rev": "580633fa3fe5fc0379905986543fd7495481913d",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775036866,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775099554,
-        "narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=",
+        "lastModified": 1775963625,
+        "narHash": "sha256-OmwF0Rd/HDbEGC0ZcBS2jPMvmCcn3HDqUypjXrR7KfM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99",
+        "rev": "573a61faa8ec910a6b8576cc3c145844245574f3",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 38723ae..46c7606 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,6 +89,41 @@
           }
         );
 
+      mkZedExtension =
+        system:
+        let
+          pkgs = mkPkgs system;
+          toolchain = pkgs.rust-bin.stable.latest.default.override {
+            targets = [ "wasm32-wasip1" ];
+          };
+          craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
+          extensionSrc = ./zed-extension;
+          vendoredDeps = craneLib.vendorCargoDeps { src = extensionSrc; };
+        in
+        pkgs.stdenv.mkDerivation {
+          pname = "streamd-zed-extension";
+          version = "0.0.1";
+          src = extensionSrc;
+
+          nativeBuildInputs = [
+            toolchain
+            pkgs.cargo-component
+          ];
+
+          buildPhase = ''
+            export HOME=$TMPDIR
+            mkdir -p .cargo
+            cp ${vendoredDeps}/config.toml .cargo/config.toml
+            cargo component build --release --offline
+          '';
+
+          installPhase = ''
+            mkdir -p $out
+            cp extension.toml $out/
+            cp target/wasm32-wasip1/release/streamd_zed.wasm $out/extension.wasm
+          '';
+        };
+
       mkGitHooksCheck =
         system:
         let
@@ -106,6 +141,36 @@
           };
         };
 
+      mkGitHooksDev =
+        system:
+        let
+          pkgs = mkPkgs system;
+          toolchain = pkgs.rust-bin.stable.latest.default;
+        in
+        git-hooks.lib.${system}.run {
+          src = ./.;
+          hooks = {
+            rustfmt = {
+              enable = true;
+              package = toolchain;
+            };
+            clippy = {
+              enable = true;
+              package = toolchain;
+              settings.denyWarnings = true;
+            };
+            cargo-test = {
+              enable = true;
+              name = "cargo test";
+              entry = "${toolchain}/bin/cargo test";
+              pass_filenames = false;
+              language = "system";
+              files = "\\.(rs|toml)$";
+            };
+            commitizen.enable = true;
+          };
+        };
+
       mkMuslCraneLib =
         system:
         let
@@ -132,6 +197,53 @@
         in
         craneLib.buildPackage (commonArgs // { inherit cargoArtifacts; });
 
+      mkWindowsCraneLib =
+        system:
+        let
+          pkgs = mkPkgs system;
+          toolchain = pkgs.rust-bin.stable.latest.default.override {
+            targets = [ "x86_64-pc-windows-gnu" ];
+          };
+        in
+        (crane.mkLib pkgs).overrideToolchain toolchain;
+
+      mkStreamdWindows =
+        system:
+        let
+          pkgs = mkPkgs system;
+          pkgsCross = pkgs.pkgsCross.mingwW64;
+          craneLib = mkWindowsCraneLib system;
+          commonArgs = {
+            src = craneLib.path ./.;
+            pname = "streamd";
+            inherit version;
+            strictDeps = true;
+            CARGO_BUILD_TARGET = "x86_64-pc-windows-gnu";
+            CC_x86_64_pc_windows_gnu = "${pkgsCross.stdenv.cc}/bin/x86_64-w64-mingw32-gcc";
+            CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER = "${pkgsCross.stdenv.cc}/bin/x86_64-w64-mingw32-gcc";
+            nativeBuildInputs = [ pkgsCross.stdenv.cc ];
+            buildInputs = [ pkgsCross.windows.pthreads ];
+            doCheck = false;
+          };
+          cargoArtifacts = craneLib.buildDepsOnly commonArgs;
+        in
+        craneLib.buildPackage (commonArgs // { inherit cargoArtifacts; });
+
+      mkZedExtensionZip =
+        system:
+        let
+          pkgs = mkPkgs system;
+          zed-extension = mkZedExtension system;
+        in
+        pkgs.runCommand "streamd-zed-extension-${version}.zip" {
+          nativeBuildInputs = [ pkgs.zip ];
+        } ''
+          mkdir -p streamd-zed-extension
+          cp ${zed-extension}/extension.toml streamd-zed-extension/
+          cp ${zed-extension}/extension.wasm streamd-zed-extension/
+          zip -r $out streamd-zed-extension
+        '';
+
       mkStreamdDeb =
         system:
         let
@@ -181,9 +293,12 @@
           streamd = mkStreamd system;
           streamd-musl = mkStreamdMusl system;
           streamd-deb = mkStreamdDeb system;
+          streamd-windows = mkStreamdWindows system;
+          zed-extension = mkZedExtension system;
+          zed-extension-zip = mkZedExtensionZip system;
         in
         {
-          inherit streamd streamd-musl streamd-deb;
+          inherit streamd streamd-musl streamd-deb streamd-windows zed-extension zed-extension-zip;
           default = streamd;
         }
       );
@@ -270,7 +385,7 @@
             ];
 
             shellHook = ''
-              ${(mkGitHooksCheck system).shellHook}
+              ${(mkGitHooksDev system).shellHook}
             '';
           };
         }
diff --git a/src/cli/args.rs b/src/cli/args.rs
index be56ee3..af1303d 100644
--- a/src/cli/args.rs
+++ b/src/cli/args.rs
@@ -20,10 +20,11 @@ pub enum TodoAction {
         /// Task number to edit
         number: usize,
     },
-    /// Mark a task as done
+    /// Mark one or more tasks as done
     Done {
-        /// Task number to mark as done
-        number: usize,
+        /// Task numbers to mark as done (processed highest-index-first for stable indices)
+        #[arg(required = true, num_args = 1..)]
+        numbers: Vec<usize>,
     },
 }
 
@@ -50,7 +51,21 @@ pub enum Commands {
     },
 
     /// Display extracted timesheets
-    Timesheet,
+    Timesheet {
+        /// Display time as decimal hours (X.XXh) instead of the default HH:MM format
+        #[arg(short, long)]
+        decimal: bool,
+
+        /// Show all timecards grouped by day instead of the summary report
+        #[arg(short, long)]
+        debug: bool,
+    },
+
+    /// Open or create the daily entry for a given date
+    Daily {
+        /// Date in YYYYMMDD format (defaults to today in configured timezone)
+        date: Option<String>,
+    },
 
     /// Generate shell completions
     Completions {
@@ -58,4 +73,7 @@ pub enum Commands {
         #[arg(value_enum)]
         shell: Shell,
     },
+
+    /// Start LSP server (communicates over stdin/stdout)
+    Lsp,
 }
diff --git a/src/cli/commands/daily.rs b/src/cli/commands/daily.rs
new file mode 100644
index 0000000..7edd317
--- /dev/null
+++ b/src/cli/commands/daily.rs
@@ -0,0 +1,83 @@
+use std::fs;
+use std::path::Path;
+use std::process::Command;
+
+use chrono::{Days, NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
+use chrono_tz::Tz;
+
+use crate::config::Settings;
+use crate::error::StreamdError;
+use crate::models::RepositoryConfiguration;
+use crate::timesheet::load_repository_config;
+
+use super::load_markdown_shards;
+
+pub fn run(date: Option<String>) -> Result<(), StreamdError> {
+    let settings = Settings::load()?;
+    let base_folder = Path::new(&settings.base_folder);
+
+    let repo_config = load_repository_config(base_folder)?;
+    let tz: Tz = repo_config
+        .timezone
+        .as_deref()
+        .and_then(|s| s.parse().ok())
+        .unwrap_or(chrono_tz::UTC);
+
+    let target_date: NaiveDate = match date {
+        Some(s) => NaiveDate::parse_from_str(&s, "%Y%m%d").map_err(|_| {
+            StreamdError::ConfigError("Invalid date format, expected YYYYMMDD".into())
+        })?,
+        None => Utc::now().with_timezone(&tz).date_naive(),
+    };
+
+    let day_start = tz
+        .from_local_datetime(&NaiveDateTime::new(target_date, NaiveTime::MIN))
+        .earliest()
+        .unwrap()
+        .with_timezone(&Utc);
+    let day_end = tz
+        .from_local_datetime(&NaiveDateTime::new(
+            target_date + Days::new(1),
+            NaiveTime::MIN,
+        ))
+        .earliest()
+        .unwrap()
+        .with_timezone(&Utc);
+
+    let all_shards = load_markdown_shards(base_folder, &RepositoryConfiguration::new(), tz)?;
+    let mut daily_shards: Vec<_> = all_shards
+        .into_iter()
+        .filter(|s| {
+            s.location
+                .get("file_type")
+                .map(|v| v == "daily")
+                .unwrap_or(false)
+                && s.moment >= day_start
+                && s.moment < day_end
+        })
+        .collect();
+    daily_shards.sort_by_key(|s| s.moment);
+
+    let editor = std::env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
+
+    if let Some(shard) = daily_shards.first() {
+        let file_path = shard.location.get("file").unwrap();
+        Command::new(&editor).arg(file_path).status()?;
+    } else {
+        let now_local = Utc::now().with_timezone(&tz);
+        let file_timestamp = if target_date == now_local.date_naive() {
+            now_local
+        } else {
+            tz.from_local_datetime(&NaiveDateTime::new(target_date, NaiveTime::MIN))
+                .earliest()
+                .unwrap()
+        };
+        let file_name = file_timestamp.format("%Y%m%d-%H%M%S_daily.md").to_string();
+        let file_path = base_folder.join(&file_name);
+        fs::write(&file_path, "# ")?;
+        Command::new(&editor).arg(&file_path).status()?;
+        println!("Created {}", file_name);
+    }
+
+    Ok(())
+}
diff --git a/src/cli/commands/edit.rs b/src/cli/commands/edit.rs
index 89a0240..a5feeee 100644
--- a/src/cli/commands/edit.rs
+++ b/src/cli/commands/edit.rs
@@ -1,40 +1,19 @@
-use std::fs;
+use std::path::Path;
 use std::process::Command;
 
-use walkdir::WalkDir;
-
 use crate::config::Settings;
 use crate::error::StreamdError;
-use crate::extract::parse_markdown_file;
-use crate::localize::{localize_stream_file, TaskConfiguration};
-use crate::models::LocalizedShard;
+use crate::localize::TaskConfiguration;
 
-fn all_files() -> Result<Vec<LocalizedShard>, StreamdError> {
-    let settings = Settings::load()?;
-    let mut shards = Vec::new();
-
-    for entry in WalkDir::new(&settings.base_folder)
-        .max_depth(1)
-        .into_iter()
-        .filter_map(|e| e.ok())
-    {
-        let path = entry.path();
-        if path.extension().map(|e| e == "md").unwrap_or(false) {
-            let file_name = path.to_string_lossy().to_string();
-            let content = fs::read_to_string(path)?;
-            let stream_file = parse_markdown_file(&file_name, &content);
-
-            if let Ok(shard) = localize_stream_file(&stream_file, &TaskConfiguration) {
-                shards.push(shard);
-            }
-        }
-    }
-
-    Ok(shards)
-}
+use super::load_markdown_shards;
 
 pub fn run(number: i32) -> Result<(), StreamdError> {
-    let all_shards = all_files()?;
+    let settings = Settings::load()?;
+    let all_shards = load_markdown_shards(
+        Path::new(&settings.base_folder),
+        &TaskConfiguration,
+        chrono_tz::UTC,
+    )?;
 
     // Sort by moment (timestamp)
     let mut sorted_shards = all_shards;
@@ -65,7 +44,13 @@ pub fn run(number: i32) -> Result<(), StreamdError> {
     };
 
     if let Some(file_path) = sorted_shards[selected_index].location.get("file") {
-        let editor = std::env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
+        let editor = std::env::var("EDITOR").unwrap_or_else(|_| {
+            if cfg!(windows) {
+                "notepad".to_string()
+            } else {
+                "vi".to_string()
+            }
+        });
         Command::new(&editor).arg(file_path).status()?;
     }
 
diff --git a/src/cli/commands/lsp.rs b/src/cli/commands/lsp.rs
new file mode 100644
index 0000000..88362d0
--- /dev/null
+++ b/src/cli/commands/lsp.rs
@@ -0,0 +1,1080 @@
+use std::fs;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use chrono::{Timelike, Utc};
+use chrono_tz::Tz;
+use dashmap::DashMap;
+use once_cell::sync::Lazy;
+use regex::Regex;
+use tokio::sync::RwLock;
+use tower_lsp::jsonrpc::Result;
+use tower_lsp::lsp_types::*;
+use tower_lsp::{Client, LanguageServer, LspService, Server};
+use walkdir::WalkDir;
+
+use crate::error::StreamdError;
+use crate::extract::parse_markdown_file;
+use crate::localize::{localize_stream_file, merge_repository_configuration, TaskConfiguration};
+use crate::models::{LocalizedShard, RepositoryConfiguration};
+use crate::timesheet::{
+    extract_timesheets, find_overlapping_timecards, load_repository_config,
+    BasicTimesheetConfiguration,
+};
+
+const MD_EXT: &str = "md";
+
+/// R15 file name validation: YYYYMMDD[-HHMMSS][_type][...].md
+/// The extraction regex requires at least one non-dot char after date/time.
+static FILE_NAME_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"^(?P<date>\d{8})(?:-(?P<time>\d{4,6}))?.+\.md$").unwrap());
+
+/// Collect all `@Word` marker names present on a line.
+pub fn extract_markers_from_line(line: &str) -> Vec<String> {
+    let mut markers = Vec::new();
+    let mut remaining = line;
+    while let Some(at_pos) = remaining.find('@') {
+        remaining = &remaining[at_pos + 1..];
+        let end = remaining
+            .find(|c: char| !c.is_alphanumeric() && c != '_')
+            .unwrap_or(remaining.len());
+        let marker = &remaining[..end];
+        if !marker.is_empty() {
+            markers.push(marker.to_string());
+        }
+        remaining = &remaining[end..];
+    }
+    markers
+}
+
+/// Extract the marker name under the cursor (the word after the nearest `@`).
+/// `cursor_col` is the 0-indexed character offset; the character *at* that
+/// offset is treated as part of the cursor position (inclusive).
+pub fn extract_marker_at_position(line: &str, cursor_col: u32) -> Option<String> {
+    // +1 so the character at the cursor itself is included in the search.
+    let col = ((cursor_col as usize).saturating_add(1)).min(line.len());
+    let line_prefix = &line[..col];
+    let at_pos = line_prefix.rfind('@')?;
+
+    let after_at = &line[at_pos + 1..];
+    let end = after_at
+        .find(|c: char| !c.is_alphanumeric() && c != '_')
+        .unwrap_or(after_at.len());
+
+    // Cursor must be within or at the end of the marker word.
+    if col > at_pos + 1 + end {
+        return None;
+    }
+
+    let marker = &after_at[..end];
+    if marker.is_empty() {
+        None
+    } else {
+        Some(marker.to_string())
+    }
+}
+
+/// Produce a file-name diagnostic if the basename does not match R15.
+pub fn compute_file_name_diagnostic(file_name: &str) -> Option<Diagnostic> {
+    if !file_name.ends_with(".md") {
+        return None;
+    }
+    if FILE_NAME_REGEX.is_match(file_name) {
+        return None;
+    }
+    Some(Diagnostic {
+        range: Range {
+            start: Position::new(0, 0),
+            end: Position::new(0, 0),
+        },
+        severity: Some(DiagnosticSeverity::WARNING),
+        source: Some("streamd".to_string()),
+        message: "File name does not match streamd format: \
+                  YYYYMMDD-HHMMSS[_type] [markers].md"
+            .to_string(),
+        ..Default::default()
+    })
+}
+
+/// Build completion items for a given line and cursor position.
+pub fn completions_for_line(
+    line: &str,
+    cursor_col: u32,
+    config: &RepositoryConfiguration,
+    tz: Tz,
+) -> Vec<CompletionItem> {
+    let col = (cursor_col as usize).min(line.len());
+    let line_prefix = &line[..col];
+
+    // Only trigger when there is a `@` before the cursor.
+    let at_pos = match line_prefix.rfind('@') {
+        Some(p) => p,
+        None => return vec![],
+    };
+
+    let after_at = &line_prefix[at_pos + 1..];
+
+    // Markers already on this line (for conditional suggestion logic).
+    let existing: Vec<String> = extract_markers_from_line(line);
+
+    // Collect markers whose `if_with` conditions are satisfied by existing markers:
+    // if marker M has a placement with `if_with: {A, B}`, and A is on the line,
+    // then B is a candidate to suggest.
+    let mut conditional: std::collections::HashSet<String> = std::collections::HashSet::new();
+    for existing_name in &existing {
+        if let Some(marker_def) = config.markers.get(existing_name) {
+            for placement in &marker_def.placements {
+                for cond in &placement.if_with {
+                    if !existing.contains(cond) {
+                        conditional.insert(cond.clone());
+                    }
+                }
+            }
+        }
+    }
+
+    // Filter by typed prefix.
+    let prefix = after_at.to_lowercase();
+    let mut items: Vec<CompletionItem> = config
+        .markers
+        .iter()
+        .filter(|(name, _)| name.to_lowercase().starts_with(&prefix))
+        .map(|(name, marker)| {
+            let is_conditional = conditional.contains(name.as_str());
+            CompletionItem {
+                label: format!("@{}", name),
+                kind: Some(CompletionItemKind::KEYWORD),
+                detail: Some(marker.display_name.clone()),
+                insert_text: Some(name.clone()),
+                // Conditional completions sort before unconditional ones.
+                sort_text: Some(if is_conditional {
+                    format!("0_{}", name)
+                } else {
+                    format!("1_{}", name)
+                }),
+                ..Default::default()
+            }
+        })
+        .collect();
+
+    // Offer date/time snippets when prefix is empty or starts with a digit.
+    if prefix.is_empty() || prefix.starts_with(|c: char| c.is_ascii_digit()) {
+        let now = Utc::now().with_timezone(&tz);
+        let date_str = now.format("%Y%m%d").to_string();
+        let time_str = now.format("%H%M%S").to_string();
+        items.push(CompletionItem {
+            label: format!("@{}", date_str),
+            kind: Some(CompletionItemKind::VALUE),
+            detail: Some("Current date".to_string()),
+            insert_text: Some(date_str),
+            sort_text: Some("2_date".to_string()),
+            ..Default::default()
+        });
+        items.push(CompletionItem {
+            label: format!("@{}", time_str),
+            kind: Some(CompletionItemKind::VALUE),
+            detail: Some("Current time".to_string()),
+            insert_text: Some(time_str),
+            sort_text: Some("2_time".to_string()),
+            ..Default::default()
+        });
+    }
+
+    items.sort_by(|a, b| {
+        a.sort_text
+            .as_deref()
+            .unwrap_or("")
+            .cmp(b.sort_text.as_deref().unwrap_or(""))
+    });
+
+    items
+}
+
+/// Convert a `LocalizedShard` tree node to a `DocumentSymbol`.
+fn shard_to_document_symbol(shard: &LocalizedShard) -> DocumentSymbol {
+    let name = if !shard.markers.is_empty() {
+        shard.markers.join(" @")
+    } else if !shard.tags.is_empty() {
+        shard.tags.join(" @")
+    } else {
+        "(shard)".to_string()
+    };
+
+    let start_line = shard.start_line.saturating_sub(1) as u32;
+    let end_line = shard.end_line.saturating_sub(1) as u32;
+
+    let range = Range {
+        start: Position::new(start_line, 0),
+        end: Position::new(end_line, u32::MAX),
+    };
+    let selection_range = Range {
+        start: Position::new(start_line, 0),
+        end: Position::new(start_line, u32::MAX),
+    };
+
+    let children: Vec<DocumentSymbol> = shard
+        .children
+        .iter()
+        .map(shard_to_document_symbol)
+        .collect();
+
+    #[allow(deprecated)]
+    DocumentSymbol {
+        name,
+        detail: None,
+        kind: SymbolKind::STRING,
+        tags: None,
+        deprecated: None,
+        range,
+        selection_range,
+        children: if children.is_empty() {
+            None
+        } else {
+            Some(children)
+        },
+    }
+}
+
+/// Collect workspace symbols from a shard tree, filtering by query.
+fn collect_workspace_symbols(
+    shard: &LocalizedShard,
+    uri: &Url,
+    query: &str,
+    out: &mut Vec<SymbolInformation>,
+) {
+    let name = if !shard.markers.is_empty() {
+        shard.markers.join(" @")
+    } else if !shard.tags.is_empty() {
+        shard.tags.join(" @")
+    } else {
+        return;
+    };
+
+    if query.is_empty() || name.to_lowercase().contains(query) {
+        let start_line = shard.start_line.saturating_sub(1) as u32;
+        let end_line = shard.end_line.saturating_sub(1) as u32;
+        #[allow(deprecated)]
+        out.push(SymbolInformation {
+            name: name.clone(),
+            kind: SymbolKind::STRING,
+            tags: None,
+            deprecated: None,
+            location: Location {
+                uri: uri.clone(),
+                range: Range {
+                    start: Position::new(start_line, 0),
+                    end: Position::new(end_line, 0),
+                },
+            },
+            container_name: None,
+        });
+    }
+
+    for child in &shard.children {
+        collect_workspace_symbols(child, uri, query, out);
+    }
+}
+
+/// Find all word-boundary-respecting occurrences of `pattern` in `lines`.
+/// Returns `(line_idx, start_col, end_col)` for each match.
+fn find_pattern_occurrences_in_lines(
+    lines: &[String],
+    pattern: &str,
+) -> Vec<(usize, usize, usize)> {
+    let mut results = Vec::new();
+    for (line_idx, line) in lines.iter().enumerate() {
+        let mut start = 0;
+        while let Some(pos) = line[start..].find(pattern) {
+            let abs = start + pos;
+            let after = abs + pattern.len();
+            let is_word_boundary =
+                after >= line.len() || !line.as_bytes()[after].is_ascii_alphanumeric();
+            if is_word_boundary {
+                results.push((line_idx, abs, after));
+            }
+            start = abs + pattern.len();
+            if start >= line.len() {
+                break;
+            }
+        }
+    }
+    results
+}
+
+struct LspState {
+    config: RepositoryConfiguration,
+    tz: Tz,
+    base_folder: PathBuf,
+    /// URI → localized shard root (None when file could not be localized)
+    file_cache: DashMap<Url, Option<LocalizedShard>>,
+    /// URI → lines of text (for line-based operations)
+    file_lines: DashMap<Url, Vec<String>>,
+}
+
+impl LspState {
+    /// Parse `text` for `uri`, update caches.
+    fn parse_and_cache(&self, uri: &Url, text: &str) {
+        let lines: Vec<String> = text.lines().map(String::from).collect();
+        self.file_lines.insert(uri.clone(), lines);
+
+        let path_str = uri.path();
+        let stream_file = parse_markdown_file(path_str, text);
+        let localized = localize_stream_file(&stream_file, &self.config, self.tz).ok();
+        self.file_cache.insert(uri.clone(), localized);
+    }
+
+    /// Parse a file from disk on demand (for cross-file features).
+    /// Also populates `file_lines` so subsequent line-based requests avoid a re-read.
+    fn parse_file_from_disk(&self, uri: &Url, path: &std::path::Path) -> Option<LocalizedShard> {
+        let text = fs::read_to_string(path).ok()?;
+        let lines: Vec<String> = text.lines().map(String::from).collect();
+        self.file_lines.insert(uri.clone(), lines);
+        let path_str = path.to_string_lossy();
+        let stream_file = parse_markdown_file(&path_str, &text);
+        localize_stream_file(&stream_file, &self.config, self.tz).ok()
+    }
+
+    /// Ensure a file's lines are in `file_lines` (read from disk if not cached).
+    fn ensure_lines(&self, uri: &Url, path: &std::path::Path) -> Option<Vec<String>> {
+        if let Some(cached) = self.file_lines.get(uri) {
+            return Some(cached.clone());
+        }
+        let text = fs::read_to_string(path).ok()?;
+        let lines: Vec<String> = text.lines().map(String::from).collect();
+        self.file_lines.insert(uri.clone(), lines.clone());
+        Some(lines)
+    }
+
+    /// Compute diagnostics for `uri`:
+    ///   - R15 file-name format
+    ///   - R18 timesheet violations
+    fn compute_diagnostics(&self, uri: &Url) -> Vec<Diagnostic> {
+        let mut diags = Vec::new();
+
+        // File-name format (R15)
+        if let Some(name) = uri.path_segments().and_then(|mut s| s.next_back()) {
+            if let Some(d) = compute_file_name_diagnostic(name) {
+                diags.push(d);
+            }
+        }
+
+        // Timesheet diagnostics (R18)
+        if let Some(entry) = self.file_cache.get(uri) {
+            if let Some(root) = entry.as_ref() {
+                let now = Utc::now();
+                match extract_timesheets(std::slice::from_ref(root), now, self.tz) {
+                    Ok(timesheets) => {
+                        for ts in &timesheets {
+                            for (first, second) in find_overlapping_timecards(&ts.timecards) {
+                                diags.push(Diagnostic {
+                                    range: Range {
+                                        start: Position::new(0, 0),
+                                        end: Position::new(0, 0),
+                                    },
+                                    severity: Some(DiagnosticSeverity::WARNING),
+                                    source: Some("streamd".to_string()),
+                                    message: format!(
+                                        "Overlapping timecards on {}: \
+                                         {:02}:{:02}-{:02}:{:02} overlaps \
+                                         {:02}:{:02}-{:02}:{:02}",
+                                        ts.date,
+                                        first.0.hour(),
+                                        first.0.minute(),
+                                        first.1.hour(),
+                                        first.1.minute(),
+                                        second.0.hour(),
+                                        second.0.minute(),
+                                        second.1.hour(),
+                                        second.1.minute(),
+                                    ),
+                                    ..Default::default()
+                                });
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        // Unclosed day or conflicting day types → Error
+                        diags.push(Diagnostic {
+                            range: Range {
+                                start: Position::new(0, 0),
+                                end: Position::new(0, 0),
+                            },
+                            severity: Some(DiagnosticSeverity::ERROR),
+                            source: Some("streamd".to_string()),
+                            message: format!("Timesheet error: {}", e),
+                            ..Default::default()
+                        });
+                    }
+                }
+            }
+        }
+
+        diags
+    }
+}
+
+struct Backend {
+    client: Client,
+    /// None → passive mode (no .streamd.toml found)
+    state: RwLock<Option<Arc<LspState>>>,
+}
+
+impl Backend {
+    fn new(client: Client) -> Self {
+        Backend {
+            client,
+            state: RwLock::new(None),
+        }
+    }
+
+    async fn build_state(root: PathBuf) -> Option<Arc<LspState>> {
+        let config_path = root.join(".streamd.toml");
+        if !config_path.exists() {
+            return None;
+        }
+        let repo_config = load_repository_config(&root).ok()?;
+        let tz: Tz = repo_config
+            .timezone
+            .as_deref()
+            .and_then(|s| s.parse().ok())
+            .unwrap_or(chrono_tz::UTC);
+
+        let config =
+            merge_repository_configuration(&BasicTimesheetConfiguration, &TaskConfiguration);
+
+        Some(Arc::new(LspState {
+            config,
+            tz,
+            base_folder: root,
+            file_cache: DashMap::new(),
+            file_lines: DashMap::new(),
+        }))
+    }
+}
+
+#[tower_lsp::async_trait]
+impl LanguageServer for Backend {
+    async fn initialize(&self, params: InitializeParams) -> Result<InitializeResult> {
+        #[allow(deprecated)]
+        let root: Option<PathBuf> = params
+            .root_uri
+            .as_ref()
+            .and_then(|u| u.to_file_path().ok())
+            .or_else(|| params.root_path.as_ref().map(PathBuf::from));
+
+        if let Some(root) = root {
+            match Backend::build_state(root).await {
+                Some(state) => {
+                    *self.state.write().await = Some(state);
+                    self.client
+                        .log_message(
+                            MessageType::INFO,
+                            "streamd LSP: active (found .streamd.toml)",
+                        )
+                        .await;
+                }
+                None => {
+                    self.client
+                        .log_message(
+                            MessageType::INFO,
+                            "streamd LSP: passive mode (no .streamd.toml in workspace root)",
+                        )
+                        .await;
+                }
+            }
+        }
+
+        Ok(InitializeResult {
+            capabilities: ServerCapabilities {
+                text_document_sync: Some(TextDocumentSyncCapability::Options(
+                    TextDocumentSyncOptions {
+                        open_close: Some(true),
+                        change: Some(TextDocumentSyncKind::FULL),
+                        save: Some(TextDocumentSyncSaveOptions::SaveOptions(SaveOptions {
+                            include_text: Some(true),
+                        })),
+                        ..Default::default()
+                    },
+                )),
+                completion_provider: Some(CompletionOptions {
+                    trigger_characters: Some(vec!["@".to_string()]),
+                    ..Default::default()
+                }),
+                document_symbol_provider: Some(OneOf::Left(true)),
+                code_action_provider: Some(CodeActionProviderCapability::Simple(true)),
+                workspace_symbol_provider: Some(OneOf::Left(true)),
+                references_provider: Some(OneOf::Left(true)),
+                rename_provider: Some(OneOf::Left(true)),
+                ..Default::default()
+            },
+            server_info: Some(ServerInfo {
+                name: "streamd-lsp".to_string(),
+                version: Some(env!("CARGO_PKG_VERSION").to_string()),
+            }),
+        })
+    }
+
+    async fn initialized(&self, _: InitializedParams) {
+        // Register a watcher for .streamd.toml so we can reload on change.
+        let opts = DidChangeWatchedFilesRegistrationOptions {
+            watchers: vec![FileSystemWatcher {
+                glob_pattern: GlobPattern::String("**/.streamd.toml".to_string()),
+                kind: Some(WatchKind::all()),
+            }],
+        };
+        if let Ok(opts_value) = serde_json::to_value(opts) {
+            let registration = Registration {
+                id: "streamd-config-watcher".to_string(),
+                method: "workspace/didChangeWatchedFiles".to_string(),
+                register_options: Some(opts_value),
+            };
+            let _ = self.client.register_capability(vec![registration]).await;
+        }
+    }
+
+    async fn shutdown(&self) -> Result<()> {
+        Ok(())
+    }
+
+    async fn did_change_watched_files(&self, params: DidChangeWatchedFilesParams) {
+        let has_config_change = params
+            .changes
+            .iter()
+            .any(|c| c.uri.path().ends_with(".streamd.toml"));
+        if !has_config_change {
+            return;
+        }
+
+        let base_folder: Option<PathBuf> = {
+            let guard = self.state.read().await;
+            guard.as_ref().map(|s| s.base_folder.clone())
+        };
+
+        if let Some(root) = base_folder {
+            match Backend::build_state(root).await {
+                Some(new_state) => {
+                    *self.state.write().await = Some(new_state);
+                    self.client
+                        .log_message(MessageType::INFO, "streamd LSP: reloaded .streamd.toml")
+                        .await;
+                }
+                None => {
+                    *self.state.write().await = None;
+                    self.client
+                        .log_message(
+                            MessageType::INFO,
+                            "streamd LSP: .streamd.toml removed, entering passive mode",
+                        )
+                        .await;
+                }
+            }
+        }
+    }
+
+    async fn did_open(&self, params: DidOpenTextDocumentParams) {
+        let guard = self.state.read().await;
+        if let Some(state) = guard.as_ref() {
+            let uri = &params.text_document.uri;
+            state.parse_and_cache(uri, &params.text_document.text);
+            let diags = state.compute_diagnostics(uri);
+            self.client
+                .publish_diagnostics(uri.clone(), diags, None)
+                .await;
+        }
+    }
+
+    async fn did_change(&self, params: DidChangeTextDocumentParams) {
+        let guard = self.state.read().await;
+        if let Some(state) = guard.as_ref() {
+            let uri = &params.text_document.uri;
+            if let Some(change) = params.content_changes.into_iter().last() {
+                state.parse_and_cache(uri, &change.text);
+                let diags = state.compute_diagnostics(uri);
+                self.client
+                    .publish_diagnostics(uri.clone(), diags, None)
+                    .await;
+            }
+        }
+    }
+
+    async fn did_save(&self, params: DidSaveTextDocumentParams) {
+        let guard = self.state.read().await;
+        if let Some(state) = guard.as_ref() {
+            let uri = &params.text_document.uri;
+            if let Some(text) = params.text.as_deref() {
+                state.parse_and_cache(uri, text);
+            } else if let Ok(path) = uri.to_file_path() {
+                if let Ok(text) = fs::read_to_string(&path) {
+                    state.parse_and_cache(uri, &text);
+                }
+            }
+            let diags = state.compute_diagnostics(uri);
+            self.client
+                .publish_diagnostics(uri.clone(), diags, None)
+                .await;
+        }
+    }
+
+    async fn completion(&self, params: CompletionParams) -> Result<Option<CompletionResponse>> {
+        let guard = self.state.read().await;
+        let state = match guard.as_ref() {
+            Some(s) => s,
+            None => return Ok(None),
+        };
+
+        let uri = &params.text_document_position.text_document.uri;
+        let position = params.text_document_position.position;
+
+        let lines = match state.file_lines.get(uri) {
+            Some(l) => l.clone(),
+            None => return Ok(None),
+        };
+        let line = lines
+            .get(position.line as usize)
+            .map(String::as_str)
+            .unwrap_or("");
+
+        Ok(Some(CompletionResponse::Array(completions_for_line(
+            line,
+            position.character,
+            &state.config,
+            state.tz,
+        ))))
+    }
+
+    async fn document_symbol(
+        &self,
+        params: DocumentSymbolParams,
+    ) -> Result<Option<DocumentSymbolResponse>> {
+        let guard = self.state.read().await;
+        let state = match guard.as_ref() {
+            Some(s) => s,
+            None => return Ok(None),
+        };
+
+        let uri = &params.text_document.uri;
+        let entry = match state.file_cache.get(uri) {
+            Some(e) => e,
+            None => return Ok(None),
+        };
+        let root = match entry.as_ref() {
+            Some(r) => r,
+            None => return Ok(None),
+        };
+
+        Ok(Some(DocumentSymbolResponse::Nested(vec![
+            shard_to_document_symbol(root),
+        ])))
+    }
+
+    async fn code_action(&self, params: CodeActionParams) -> Result<Option<CodeActionResponse>> {
+        let guard = self.state.read().await;
+        let state = match guard.as_ref() {
+            Some(s) => s,
+            None => return Ok(None),
+        };
+
+        let uri = &params.text_document.uri;
+        let lines = match state.file_lines.get(uri) {
+            Some(l) => l.clone(),
+            None => return Ok(None),
+        };
+
+        let mut actions: Vec<CodeActionOrCommand> = Vec::new();
+        let start_line = params.range.start.line as usize;
+        let end_line = params.range.end.line as usize;
+
+        let range_end = end_line.min(lines.len().saturating_sub(1));
+        for (line_idx, line) in lines
+            .iter()
+            .enumerate()
+            .skip(start_line)
+            .take(range_end.saturating_sub(start_line) + 1)
+        {
+            if line.contains("@Task") && !line.contains("@Done") {
+                let new_line = line.replacen("@Task", "@Task @Done", 1);
+                let mut changes: std::collections::HashMap<Url, Vec<TextEdit>> =
+                    std::collections::HashMap::new();
+                changes.insert(
+                    uri.clone(),
+                    vec![TextEdit {
+                        range: Range {
+                            start: Position::new(line_idx as u32, 0),
+                            end: Position::new(line_idx as u32, line.len() as u32),
+                        },
+                        new_text: new_line,
+                    }],
+                );
+                actions.push(CodeActionOrCommand::CodeAction(CodeAction {
+                    title: "Mark task as done".to_string(),
+                    kind: Some(CodeActionKind::QUICKFIX),
+                    edit: Some(WorkspaceEdit {
+                        changes: Some(changes),
+                        ..Default::default()
+                    }),
+                    ..Default::default()
+                }));
+            }
+        }
+
+        Ok(Some(actions))
+    }
+
+    async fn symbol(
+        &self,
+        params: WorkspaceSymbolParams,
+    ) -> Result<Option<Vec<SymbolInformation>>> {
+        let guard = self.state.read().await;
+        let state = match guard.as_ref() {
+            Some(s) => s,
+            None => return Ok(None),
+        };
+
+        let query = params.query.to_lowercase();
+        let mut symbols = Vec::new();
+
+        for entry in WalkDir::new(&state.base_folder)
+            .max_depth(1)
+            .into_iter()
+            .filter_map(|e| e.ok())
+        {
+            let path = entry.path();
+            if path.extension().is_none_or(|e| e != MD_EXT) {
+                continue;
+            }
+            let uri = match Url::from_file_path(path) {
+                Ok(u) => u,
+                Err(()) => continue,
+            };
+
+            let shard = if let Some(cached) = state.file_cache.get(&uri) {
+                cached.clone()
+            } else {
+                let parsed = state.parse_file_from_disk(&uri, path);
+                state.file_cache.insert(uri.clone(), parsed.clone());
+                parsed
+            };
+
+            if let Some(root) = shard {
+                collect_workspace_symbols(&root, &uri, &query, &mut symbols);
+            }
+        }
+
+        Ok(Some(symbols))
+    }
+
+    async fn references(&self, params: ReferenceParams) -> Result<Option<Vec<Location>>> {
+        let guard = self.state.read().await;
+        let state = match guard.as_ref() {
+            Some(s) => s,
+            None => return Ok(None),
+        };
+
+        let uri = &params.text_document_position.text_document.uri;
+        let position = params.text_document_position.position;
+
+        let marker_name: Option<String> = {
+            let lines = match state.file_lines.get(uri) {
+                Some(l) => l.clone(),
+                None => return Ok(None),
+            };
+            let line = match lines.get(position.line as usize) {
+                Some(l) => l.clone(),
+                None => return Ok(None),
+            };
+            extract_marker_at_position(&line, position.character)
+        };
+
+        let marker_name = match marker_name {
+            Some(m) => m,
+            None => return Ok(Some(vec![])),
+        };
+
+        let pattern = format!("@{}", marker_name);
+        let mut locations = Vec::new();
+
+        for entry in WalkDir::new(&state.base_folder)
+            .max_depth(1)
+            .into_iter()
+            .filter_map(|e| e.ok())
+        {
+            let path = entry.path();
+            if path.extension().is_none_or(|e| e != MD_EXT) {
+                continue;
+            }
+            let file_uri = match Url::from_file_path(path) {
+                Ok(u) => u,
+                Err(()) => continue,
+            };
+            let lines = match state.ensure_lines(&file_uri, path) {
+                Some(l) => l,
+                None => continue,
+            };
+
+            for (line_idx, abs, after) in find_pattern_occurrences_in_lines(&lines, &pattern) {
+                locations.push(Location {
+                    uri: file_uri.clone(),
+                    range: Range {
+                        start: Position::new(line_idx as u32, abs as u32),
+                        end: Position::new(line_idx as u32, after as u32),
+                    },
+                });
+            }
+        }
+
+        Ok(Some(locations))
+    }
+
+    async fn rename(&self, params: RenameParams) -> Result<Option<WorkspaceEdit>> {
+        let guard = self.state.read().await;
+        let state = match guard.as_ref() {
+            Some(s) => s,
+            None => return Ok(None),
+        };
+
+        let uri = &params.text_document_position.text_document.uri;
+        let position = params.text_document_position.position;
+        // Strip leading `@` if the user typed it.
+        let new_name = params.new_name.trim_start_matches('@').to_string();
+
+        let marker_name: Option<String> = {
+            let lines = match state.file_lines.get(uri) {
+                Some(l) => l.clone(),
+                None => return Ok(None),
+            };
+            let line = match lines.get(position.line as usize) {
+                Some(l) => l.clone(),
+                None => return Ok(None),
+            };
+            extract_marker_at_position(&line, position.character)
+        };
+
+        let marker_name = match marker_name {
+            Some(m) => m,
+            None => return Ok(None),
+        };
+
+        let pattern = format!("@{}", marker_name);
+        let replacement = format!("@{}", new_name);
+        let mut changes: std::collections::HashMap<Url, Vec<TextEdit>> =
+            std::collections::HashMap::new();
+
+        for entry in WalkDir::new(&state.base_folder)
+            .max_depth(1)
+            .into_iter()
+            .filter_map(|e| e.ok())
+        {
+            let path = entry.path();
+            if path.extension().is_none_or(|e| e != MD_EXT) {
+                continue;
+            }
+            let file_uri = match Url::from_file_path(path) {
+                Ok(u) => u,
+                Err(()) => continue,
+            };
+            let lines = match state.ensure_lines(&file_uri, path) {
+                Some(l) => l,
+                None => continue,
+            };
+
+            let file_edits: Vec<TextEdit> = find_pattern_occurrences_in_lines(&lines, &pattern)
+                .into_iter()
+                .map(|(line_idx, abs, after)| TextEdit {
+                    range: Range {
+                        start: Position::new(line_idx as u32, abs as u32),
+                        end: Position::new(line_idx as u32, after as u32),
+                    },
+                    new_text: replacement.clone(),
+                })
+                .collect();
+            if !file_edits.is_empty() {
+                changes.insert(file_uri, file_edits);
+            }
+        }
+
+        Ok(Some(WorkspaceEdit {
+            changes: Some(changes),
+            ..Default::default()
+        }))
+    }
+}
+
+/// Run the LSP server over stdin/stdout.
+pub fn run() -> std::result::Result<(), StreamdError> {
+    let rt = tokio::runtime::Runtime::new().map_err(StreamdError::IoError)?;
+    rt.block_on(async {
+        let stdin = tokio::io::stdin();
+        let stdout = tokio::io::stdout();
+        let (service, socket) = LspService::new(Backend::new);
+        Server::new(stdin, stdout, socket).serve(service).await;
+    });
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::models::{Dimension, Marker, MarkerPlacement};
+
+    fn make_config() -> RepositoryConfiguration {
+        RepositoryConfiguration::new()
+            .with_dimension("task", Dimension::new("Task").with_propagate(false))
+            .with_marker(
+                "Task",
+                Marker::new("Task").with_placements(vec![
+                    MarkerPlacement::new("task").with_value("open"),
+                    MarkerPlacement::new("task")
+                        .with_if_with(vec!["Done"])
+                        .with_value("done"),
+                    MarkerPlacement::new("task")
+                        .with_if_with(vec!["Waiting"])
+                        .with_value("waiting"),
+                ]),
+            )
+            .with_marker("Done", Marker::new("Done").with_placements(vec![]))
+            .with_marker("Waiting", Marker::new("Waiting").with_placements(vec![]))
+            .with_marker("Break", Marker::new("Break").with_placements(vec![]))
+    }
+
+    #[test]
+    fn test_valid_file_name_no_diagnostic() {
+        assert!(compute_file_name_diagnostic("20260413-120000_daily.md").is_none());
+        assert!(compute_file_name_diagnostic("20260413-1200_daily.md").is_none());
+        assert!(compute_file_name_diagnostic("20260413-120000 markers.md").is_none());
+        assert!(compute_file_name_diagnostic("20260413 some title.md").is_none());
+    }
+
+    #[test]
+    fn test_invalid_file_name_emits_warning() {
+        let d = compute_file_name_diagnostic("notes.md");
+        assert!(d.is_some());
+        assert_eq!(d.unwrap().severity, Some(DiagnosticSeverity::WARNING));
+    }
+
+    #[test]
+    fn test_non_md_file_no_diagnostic() {
+        assert!(compute_file_name_diagnostic("notes.txt").is_none());
+    }
+
+    #[test]
+    fn test_extract_markers_from_line() {
+        let markers = extract_markers_from_line("@Task @Done some content @Tag");
+        assert_eq!(markers, vec!["Task", "Done", "Tag"]);
+    }
+
+    #[test]
+    fn test_extract_markers_empty_line() {
+        assert!(extract_markers_from_line("no markers here").is_empty());
+    }
+
+    #[test]
+    fn test_extract_marker_at_position_on_marker() {
+        let line = "some @Task content";
+        // Cursor on 'T' of Task → position 6
+        assert_eq!(
+            extract_marker_at_position(line, 6),
+            Some("Task".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_marker_at_position_at_at_sign() {
+        let line = "some @Task content";
+        // Cursor on '@' → position 5
+        assert_eq!(
+            extract_marker_at_position(line, 5),
+            Some("Task".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_marker_at_position_on_content() {
+        let line = "some @Task content";
+        // Cursor on 'c' of 'content' (position 11)
+        assert!(extract_marker_at_position(line, 11).is_none());
+    }
+
+    #[test]
+    fn test_completions_no_at_sign_returns_empty() {
+        let config = make_config();
+        let items = completions_for_line("hello world", 5, &config, chrono_tz::UTC);
+        assert!(items.is_empty());
+    }
+
+    #[test]
+    fn test_completions_at_sign_returns_all_markers() {
+        let config = make_config();
+        let items = completions_for_line("@", 1, &config, chrono_tz::UTC);
+        assert!(!items.is_empty());
+        let labels: Vec<&str> = items.iter().map(|i| i.label.as_str()).collect();
+        assert!(labels.contains(&"@Task"));
+        assert!(labels.contains(&"@Done"));
+    }
+
+    #[test]
+    fn test_completions_prefix_filters() {
+        let config = make_config();
+        let items = completions_for_line("@Ta", 3, &config, chrono_tz::UTC);
+        assert!(items
+            .iter()
+            .all(|i| i.label.starts_with("@Ta") || i.label.starts_with("@ta")));
+        assert!(items.iter().any(|i| i.label == "@Task"));
+    }
+
+    #[test]
+    fn test_completions_conditional_sorted_first() {
+        let config = make_config();
+        // @Task is on the line → Done and Waiting should be conditional suggestions
+        let items = completions_for_line("@Task @", 7, &config, chrono_tz::UTC);
+        let done = items.iter().find(|i| i.label == "@Done");
+        let waiting = items.iter().find(|i| i.label == "@Waiting");
+        assert!(done.is_some());
+        assert!(waiting.is_some());
+        // Conditional items have sort_text starting with "0_"
+        assert!(done
+            .unwrap()
+            .sort_text
+            .as_deref()
+            .unwrap_or("")
+            .starts_with("0_"));
+    }
+
+    #[test]
+    fn test_completions_temporal_snippet_at_sign() {
+        let config = make_config();
+        // Timestamps suggested when prefix is empty (just @)
+        let items = completions_for_line("@", 1, &config, chrono_tz::UTC);
+        // Labels contain actual timestamps (8-digit date and 6-digit time)
+        assert!(items
+            .iter()
+            .any(|i| i.kind == Some(CompletionItemKind::VALUE)
+                && i.insert_text
+                    .as_deref()
+                    .is_some_and(|t| t.len() == 8 && t.chars().all(|c| c.is_ascii_digit()))));
+        assert!(items
+            .iter()
+            .any(|i| i.kind == Some(CompletionItemKind::VALUE)
+                && i.insert_text
+                    .as_deref()
+                    .is_some_and(|t| t.len() == 6 && t.chars().all(|c| c.is_ascii_digit()))));
+    }
+
+    #[test]
+    fn test_completions_temporal_snippet_digit_after_at() {
+        let config = make_config();
+        let items = completions_for_line("@2", 2, &config, chrono_tz::UTC);
+        assert!(!items.is_empty());
+        // Should contain VALUE kind timestamp items
+        assert!(items
+            .iter()
+            .any(|i| i.kind == Some(CompletionItemKind::VALUE)));
+    }
+
+    #[test]
+    fn test_completions_no_double_at() {
+        let config = make_config();
+        let items = completions_for_line("@Br", 3, &config, chrono_tz::UTC);
+        let break_item = items.iter().find(|i| i.label == "@Break").unwrap();
+        assert_eq!(break_item.insert_text.as_deref(), Some("Break"));
+    }
+}
diff --git a/src/cli/commands/mod.rs b/src/cli/commands/mod.rs
index d5f79ce..67a8661 100644
--- a/src/cli/commands/mod.rs
+++ b/src/cli/commands/mod.rs
@@ -1,5 +1,42 @@
+use std::fs;
+use std::path::Path;
+
+use chrono_tz::Tz;
+use walkdir::WalkDir;
+
+use crate::error::StreamdError;
+use crate::extract::parse_markdown_file;
+use crate::localize::localize_stream_file;
+use crate::models::{LocalizedShard, RepositoryConfiguration};
+
 pub mod completions;
+pub mod daily;
 pub mod edit;
+pub mod lsp;
 pub mod new;
 pub mod timesheet;
 pub mod todo;
+
+pub fn load_markdown_shards(
+    base_folder: &Path,
+    config: &RepositoryConfiguration,
+    tz: Tz,
+) -> Result<Vec<LocalizedShard>, StreamdError> {
+    let mut shards = Vec::new();
+    for entry in WalkDir::new(base_folder)
+        .max_depth(1)
+        .into_iter()
+        .filter_map(|e| e.ok())
+    {
+        let path = entry.path();
+        if path.extension().map(|e| e == "md").unwrap_or(false) {
+            let file_name = path.to_string_lossy().to_string();
+            let content = fs::read_to_string(path)?;
+            let stream_file = parse_markdown_file(&file_name, &content);
+            if let Ok(shard) = localize_stream_file(&stream_file, config, tz) {
+                shards.push(shard);
+            }
+        }
+    }
+    Ok(shards)
+}
diff --git a/src/cli/commands/new.rs b/src/cli/commands/new.rs
index de7d351..5c3eecb 100644
--- a/src/cli/commands/new.rs
+++ b/src/cli/commands/new.rs
@@ -24,7 +24,13 @@ pub fn run() -> Result<(), StreamdError> {
     drop(file);
 
     // Open in editor
-    let editor = std::env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
+    let editor = std::env::var("EDITOR").unwrap_or_else(|_| {
+        if cfg!(windows) {
+            "notepad".to_string()
+        } else {
+            "vi".to_string()
+        }
+    });
     let status = Command::new(&editor).arg(&preliminary_path).status()?;
 
     if !status.success() {
diff --git a/src/cli/commands/timesheet.rs b/src/cli/commands/timesheet.rs
index 80346b4..1b422c9 100644
--- a/src/cli/commands/timesheet.rs
+++ b/src/cli/commands/timesheet.rs
@@ -1,59 +1,60 @@
-use std::fs;
+use std::collections::HashMap;
 use std::path::Path;
 
 use chrono::Datelike;
-use walkdir::WalkDir;
+use chrono::NaiveDate;
+use chrono::Utc;
+use chrono_tz::Tz;
 
 use crate::config::Settings;
 
 const SEPARATOR_WIDTH: usize = 71;
 const COLUMN_SEPARATOR_WIDTH: usize = 65;
 use crate::error::StreamdError;
-use crate::extract::parse_markdown_file;
-use crate::localize::localize_stream_file;
-use crate::models::LocalizedShard;
+use crate::models::Timesheet;
 use crate::timesheet::{
     extract_timesheets, generate_report, load_repository_config, BasicTimesheetConfiguration,
     DayType, DayWarning, MonthReport, TimesheetReport,
 };
 
-fn load_all_shards(base_folder: &Path) -> Result<Vec<LocalizedShard>, StreamdError> {
-    let mut shards = Vec::new();
+use super::load_markdown_shards;
 
-    for entry in WalkDir::new(base_folder)
-        .max_depth(1)
-        .into_iter()
-        .filter_map(|e| e.ok())
-    {
-        let path = entry.path();
-        if path.extension().map(|e| e == "md").unwrap_or(false) {
-            let file_name = path.to_string_lossy().to_string();
-            let content = fs::read_to_string(path)?;
-            let stream_file = parse_markdown_file(&file_name, &content);
+enum DisplayMode {
+    Minutes,
+    Decimal,
+}
 
-            if let Ok(shard) = localize_stream_file(&stream_file, &BasicTimesheetConfiguration) {
-                shards.push(shard);
-            }
+/// Format minutes with sign for display.
+fn format_diff(minutes: i64, mode: &DisplayMode) -> String {
+    let sign = if minutes >= 0 { "+" } else { "-" };
+    match mode {
+        DisplayMode::Minutes => {
+            let h = minutes.unsigned_abs() / 60;
+            let m = minutes.unsigned_abs() % 60;
+            format!("{}{}:{:02}", sign, h, m)
+        }
+        DisplayMode::Decimal => {
+            let hours = minutes.unsigned_abs() as f64 / 60.0;
+            format!("{}{:.2}h", sign, hours)
         }
     }
-
-    Ok(shards)
 }
 
-/// Format hours with sign for display.
-fn format_diff(hours: f64) -> String {
-    if hours >= 0.0 {
-        format!("+{:.1}h", hours.abs())
-    } else {
-        format!("{:.1}h", hours)
+/// Format minutes for display without sign.
+fn format_hours(minutes: i64, mode: &DisplayMode) -> String {
+    match mode {
+        DisplayMode::Minutes => {
+            let h = minutes.unsigned_abs() / 60;
+            let m = minutes.unsigned_abs() % 60;
+            format!("{}:{:02}", h, m)
+        }
+        DisplayMode::Decimal => {
+            let hours = minutes.unsigned_abs() as f64 / 60.0;
+            format!("{:.2}h", hours)
+        }
     }
 }
 
-/// Format hours for display without sign.
-fn format_hours(hours: f64) -> String {
-    format!("{:.1}h", hours.abs())
-}
-
 /// Get the weekday abbreviation.
 fn weekday_abbrev(date: chrono::NaiveDate) -> &'static str {
     match date.weekday() {
@@ -77,8 +78,8 @@ fn print_header() {
 }
 
 /// Print a month report.
-fn print_month(month: &MonthReport) {
-    let diff_str = format_diff(month.diff());
+fn print_month(month: &MonthReport, mode: &DisplayMode) {
+    let diff_str = format_diff(month.diff(), mode);
     let month_title = format!("{} {}", month.month_name(), month.year);
 
     // Month header with diff
@@ -99,9 +100,9 @@ fn print_month(month: &MonthReport) {
     for day in &month.days {
         let date_str = day.date.format("%Y-%m-%d").to_string();
         let weekday = weekday_abbrev(day.date);
-        let expected = format_hours(day.expected_hours);
-        let actual = format_hours(day.actual_hours);
-        let diff = format_diff(day.diff());
+        let expected = format_hours(day.expected_minutes, mode);
+        let actual = format_hours(day.actual_minutes, mode);
+        let diff = format_diff(day.diff(), mode);
 
         let type_str = match day.day_type {
             DayType::Regular => String::new(),
@@ -134,26 +135,26 @@ fn print_month(month: &MonthReport) {
     println!("  {}", light_line);
     println!(
         "  Monthly:       {:>7}  {:>7}  {:>6}",
-        format_hours(month.total_expected()),
-        format_hours(month.total_actual()),
-        format_diff(month.diff())
+        format_hours(month.total_expected(), mode),
+        format_hours(month.total_actual(), mode),
+        format_diff(month.diff(), mode)
     );
     println!();
 }
 
 /// Print the cumulative balance.
-fn print_cumulative_balance(balance: f64) {
+fn print_cumulative_balance(balance: i64, mode: &DisplayMode) {
     let light_line = "\u{2500}".repeat(SEPARATOR_WIDTH);
     println!("{}", light_line);
     println!(
         "                    CUMULATIVE BALANCE: {}",
-        format_diff(balance)
+        format_diff(balance, mode)
     );
     println!("{}", light_line);
 }
 
 /// Print warnings section.
-fn print_warnings(report: &TimesheetReport) {
+fn print_warnings(report: &TimesheetReport, mode: &DisplayMode) {
     if !report.has_warnings() {
         return;
     }
@@ -214,11 +215,11 @@ fn print_warnings(report: &TimesheetReport) {
     if !outside_period_warnings.is_empty() {
         println!("  Work logged outside configured periods:");
         for w in &outside_period_warnings {
-            if let DayWarning::OutsidePeriod { hours_worked } = &w.warning {
+            if let DayWarning::OutsidePeriod { minutes_worked } = &w.warning {
                 println!(
-                    "    - {}: {:.1}h worked (no period configured)",
+                    "    - {}: {} worked (no period configured)",
                     w.date.format("%Y-%m-%d"),
-                    hours_worked
+                    format_hours(*minutes_worked, mode)
                 );
             }
         }
@@ -226,13 +227,83 @@ fn print_warnings(report: &TimesheetReport) {
     }
 }
 
-pub fn run() -> Result<(), StreamdError> {
+/// Print debug view: all timecards grouped and sorted by day.
+fn print_debug(report: &TimesheetReport, timesheets: &[Timesheet]) {
+    let timesheets_by_date: HashMap<NaiveDate, &Timesheet> =
+        timesheets.iter().map(|ts| (ts.date, ts)).collect();
+
+    for month in &report.months {
+        let month_title = format!("{} {}", month.month_name(), month.year);
+        let separator = "\u{2550}".repeat(SEPARATOR_WIDTH);
+        println!("{}", separator);
+        println!("  {}", month_title);
+        println!("{}", separator);
+        println!();
+
+        for day in &month.days {
+            let date_str = day.date.format("%Y-%m-%d").to_string();
+            let weekday = weekday_abbrev(day.date);
+
+            let mut parts: Vec<String> = Vec::new();
+
+            // Add day type label for non-regular days
+            let type_label = match day.day_type {
+                DayType::Regular => None,
+                DayType::SickLeave => Some("Sick Leave"),
+                DayType::Vacation => Some("Vacation"),
+                DayType::Holiday => Some("Holiday"),
+                DayType::FlexDay => Some("Flex Day"),
+                DayType::Weekend => Some("Weekend"),
+                DayType::Missing => Some("Missing"),
+                DayType::OutsidePeriod => Some("Outside Period"),
+            };
+            if let Some(label) = type_label {
+                parts.push(label.to_string());
+            }
+
+            // Add timecards
+            if let Some(ts) = timesheets_by_date.get(&day.date) {
+                for tc in &ts.timecards {
+                    parts.push(format!(
+                        "{} - {}",
+                        tc.from_time.format("%H:%M"),
+                        tc.to_time.format("%H:%M")
+                    ));
+                }
+            }
+
+            let content = if parts.is_empty() {
+                String::new()
+            } else {
+                parts.join(", ")
+            };
+
+            println!("  {} ({}): {}", date_str, weekday, content);
+        }
+
+        println!();
+    }
+}
+
+pub fn run(decimal: bool, debug: bool) -> Result<(), StreamdError> {
+    let mode = if decimal {
+        DisplayMode::Decimal
+    } else {
+        DisplayMode::Minutes
+    };
     let settings = Settings::load()?;
     let base_folder = Path::new(&settings.base_folder);
 
     // Load repository configuration
     let repo_config = load_repository_config(base_folder)?;
 
+    // Parse timezone from config, defaulting to UTC
+    let tz: Tz = repo_config
+        .timezone
+        .as_deref()
+        .and_then(|s| s.parse().ok())
+        .unwrap_or(chrono_tz::UTC);
+
     // Check if timesheet is configured
     let timesheet_config = match repo_config.timesheet {
         Some(config) => config,
@@ -250,27 +321,70 @@ pub fn run() -> Result<(), StreamdError> {
         }
     };
 
+    let now = Utc::now();
+
     // Load all markdown files and extract timesheets
-    let all_shards = load_all_shards(base_folder)?;
-    let timesheets = extract_timesheets(&all_shards)?;
+    let all_shards = load_markdown_shards(base_folder, &BasicTimesheetConfiguration, tz)?;
+    let timesheets = extract_timesheets(&all_shards, now, tz)?;
 
     // Generate the report
-    let report = generate_report(&timesheets, &timesheet_config)?;
+    let report = generate_report(&timesheets, &timesheet_config, now, tz)?;
 
     if report.months.is_empty() {
         println!("No timesheet data found for the configured periods.");
         return Ok(());
     }
 
-    // Print the report
-    print_header();
+    if debug {
+        print_debug(&report, &timesheets);
+    } else {
+        print_header();
 
-    for month in &report.months {
-        print_month(month);
+        for month in &report.months {
+            print_month(month, &mode);
+        }
+
+        print_cumulative_balance(report.cumulative_balance, &mode);
+        print_warnings(&report, &mode);
     }
 
-    print_cumulative_balance(report.cumulative_balance);
-    print_warnings(&report);
-
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_format_hours_decimal() {
+        assert_eq!(format_hours(480, &DisplayMode::Decimal), "8.00h");
+        assert_eq!(format_hours(510, &DisplayMode::Decimal), "8.50h");
+        assert_eq!(format_hours(507, &DisplayMode::Decimal), "8.45h");
+        assert_eq!(format_hours(0, &DisplayMode::Decimal), "0.00h");
+    }
+
+    #[test]
+    fn test_format_hours_minutes() {
+        assert_eq!(format_hours(480, &DisplayMode::Minutes), "8:00");
+        assert_eq!(format_hours(510, &DisplayMode::Minutes), "8:30");
+        assert_eq!(format_hours(0, &DisplayMode::Minutes), "0:00");
+        assert_eq!(format_hours(75, &DisplayMode::Minutes), "1:15");
+        assert_eq!(format_hours(77, &DisplayMode::Minutes), "1:17");
+        assert_eq!(format_hours(200, &DisplayMode::Minutes), "3:20");
+    }
+
+    #[test]
+    fn test_format_diff_decimal() {
+        assert_eq!(format_diff(30, &DisplayMode::Decimal), "+0.50h");
+        assert_eq!(format_diff(-90, &DisplayMode::Decimal), "-1.50h");
+        assert_eq!(format_diff(0, &DisplayMode::Decimal), "+0.00h");
+    }
+
+    #[test]
+    fn test_format_diff_minutes() {
+        assert_eq!(format_diff(30, &DisplayMode::Minutes), "+0:30");
+        assert_eq!(format_diff(-90, &DisplayMode::Minutes), "-1:30");
+        assert_eq!(format_diff(0, &DisplayMode::Minutes), "+0:00");
+        assert_eq!(format_diff(75, &DisplayMode::Minutes), "+1:15");
+    }
+}
diff --git a/src/cli/commands/todo.rs b/src/cli/commands/todo.rs
index fe8e870..ca38fbd 100644
--- a/src/cli/commands/todo.rs
+++ b/src/cli/commands/todo.rs
@@ -1,42 +1,24 @@
 use std::fs;
+use std::path::Path;
 use std::process::Command;
 
 use chrono::Utc;
-use walkdir::WalkDir;
 
 use crate::config::Settings;
 use crate::error::StreamdError;
-use crate::extract::parse_markdown_file;
-use crate::localize::{localize_stream_file, TaskConfiguration};
+use crate::localize::TaskConfiguration;
 use crate::models::LocalizedShard;
 use crate::query::find_shard_by_position;
 
-fn all_files() -> Result<Vec<LocalizedShard>, StreamdError> {
-    let settings = Settings::load()?;
-    let mut shards = Vec::new();
-
-    for entry in WalkDir::new(&settings.base_folder)
-        .max_depth(1)
-        .into_iter()
-        .filter_map(|e| e.ok())
-    {
-        let path = entry.path();
-        if path.extension().map(|e| e == "md").unwrap_or(false) {
-            let file_name = path.to_string_lossy().to_string();
-            let content = fs::read_to_string(path)?;
-            let stream_file = parse_markdown_file(&file_name, &content);
-
-            if let Ok(shard) = localize_stream_file(&stream_file, &TaskConfiguration) {
-                shards.push(shard);
-            }
-        }
-    }
-
-    Ok(shards)
-}
+use super::load_markdown_shards;
 
 pub fn collect_open_tasks(show_future: bool) -> Result<Vec<LocalizedShard>, StreamdError> {
-    let all_shards = all_files()?;
+    let settings = Settings::load()?;
+    let all_shards = load_markdown_shards(
+        Path::new(&settings.base_folder),
+        &TaskConfiguration,
+        chrono_tz::UTC,
+    )?;
     let now = Utc::now();
 
     let mut tasks: Vec<LocalizedShard> = find_shard_by_position(&all_shards, "task", "open")
@@ -90,13 +72,19 @@ pub fn run_edit(number: usize) -> Result<(), StreamdError> {
         .get("file")
         .ok_or(StreamdError::MissingFilePath)?;
 
-    let editor = std::env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
-    let line_arg = format!("+{}", task.start_line);
+    let editor = std::env::var("EDITOR").unwrap_or_else(|_| {
+        if cfg!(windows) {
+            "notepad".to_string()
+        } else {
+            "vi".to_string()
+        }
+    });
 
-    let status = Command::new(&editor)
-        .arg(&line_arg)
-        .arg(file_path)
-        .status()?;
+    let mut cmd = Command::new(&editor);
+    if !editor.to_lowercase().contains("notepad") {
+        cmd.arg(format!("+{}", task.start_line));
+    }
+    let status = cmd.arg(file_path).status()?;
 
     if !status.success() {
         return Err(StreamdError::IoError(std::io::Error::other(
@@ -107,15 +95,12 @@ pub fn run_edit(number: usize) -> Result<(), StreamdError> {
     Ok(())
 }
 
-pub fn run_done(number: usize) -> Result<(), StreamdError> {
-    // Always include all tasks for done (user might want to mark a future task as done)
-    let tasks = collect_open_tasks(true)?;
-
-    if number == 0 || number > tasks.len() {
-        return Err(StreamdError::InvalidTaskNumber(number, tasks.len()));
+pub fn mark_task_done(task_number: usize, tasks: &[LocalizedShard]) -> Result<(), StreamdError> {
+    if task_number == 0 || task_number > tasks.len() {
+        return Err(StreamdError::InvalidTaskNumber(task_number, tasks.len()));
     }
 
-    let task = &tasks[number - 1];
+    let task = &tasks[task_number - 1];
     let file_path = task
         .location
         .get("file")
@@ -124,7 +109,6 @@ pub fn run_done(number: usize) -> Result<(), StreamdError> {
     let content = fs::read_to_string(file_path)?;
     let mut lines: Vec<String> = content.lines().map(String::from).collect();
 
-    // Find the line containing @Task (should be at start_line)
     let task_line_idx = task.start_line.saturating_sub(1);
     if task_line_idx >= lines.len() {
         return Err(StreamdError::InvalidLineNumber);
@@ -132,7 +116,6 @@ pub fn run_done(number: usize) -> Result<(), StreamdError> {
 
     let line = &lines[task_line_idx];
 
-    // Check for multiple @Task occurrences
     let task_count = line.matches("@Task").count();
     if task_count > 1 {
         return Err(StreamdError::MultipleTaskMarkers(
@@ -147,11 +130,9 @@ pub fn run_done(number: usize) -> Result<(), StreamdError> {
         ));
     }
 
-    // Insert @Done after @Task
     let new_line = line.replacen("@Task", "@Task @Done", 1);
-    lines[task_line_idx] = new_line;
+    lines[task_line_idx] = new_line.clone();
 
-    // Write back to file, preserving trailing newline if present
     let new_content = if content.ends_with('\n') {
         format!("{}\n", lines.join("\n"))
     } else {
@@ -159,7 +140,39 @@ pub fn run_done(number: usize) -> Result<(), StreamdError> {
     };
     fs::write(file_path, new_content)?;
 
-    println!("Marked task {} as done", number);
+    // Print the completed task block
+    let start = task.start_line.saturating_sub(1);
+    let end = std::cmp::min(task.end_line, lines.len());
+    println!(
+        "Done: [{}] --- {}:{} ---",
+        task_number, file_path, task.start_line
+    );
+    for line in &lines[start..end] {
+        println!("{}", line);
+    }
+    println!();
+
+    Ok(())
+}
+
+pub fn run_done(numbers: &[usize]) -> Result<(), StreamdError> {
+    let tasks = collect_open_tasks(true)?;
+
+    // Validate all numbers before processing any
+    for &number in numbers {
+        if number == 0 || number > tasks.len() {
+            return Err(StreamdError::InvalidTaskNumber(number, tasks.len()));
+        }
+    }
+
+    // Process highest-index-first so earlier indices remain valid
+    let mut sorted_numbers: Vec<usize> = numbers.to_vec();
+    sorted_numbers.sort_unstable_by(|a, b| b.cmp(a));
+    sorted_numbers.dedup();
+
+    for number in sorted_numbers {
+        mark_task_done(number, &tasks)?;
+    }
 
     Ok(())
 }
@@ -328,4 +341,65 @@ mod tests {
             "No @Task marker found in /path/file.md:42"
         );
     }
+
+    #[test]
+    fn test_done_numbers_sorted_highest_first() {
+        let mut numbers: Vec<usize> = vec![1, 3, 2];
+        numbers.sort_unstable_by(|a, b| b.cmp(a));
+        assert_eq!(numbers, vec![3, 2, 1]);
+    }
+
+    #[test]
+    fn test_done_numbers_deduped() {
+        let mut numbers: Vec<usize> = vec![3, 2, 3, 1];
+        numbers.sort_unstable_by(|a, b| b.cmp(a));
+        numbers.dedup();
+        assert_eq!(numbers, vec![3, 2, 1]);
+    }
+
+    #[test]
+    fn test_mark_task_done_writes_file_and_prints() {
+        use std::io::Write;
+        use tempfile::NamedTempFile;
+
+        let mut tmp = NamedTempFile::new().unwrap();
+        writeln!(tmp, "## Fix the thing @Task").unwrap();
+        let path = tmp.path().to_str().unwrap().to_string();
+
+        let now = Utc::now();
+        let mut location = IndexMap::new();
+        location.insert("file".to_string(), path.clone());
+        location.insert("task".to_string(), "open".to_string());
+
+        let task = LocalizedShard {
+            markers: vec!["Task".to_string()],
+            tags: vec![],
+            start_line: 1,
+            end_line: 1,
+            moment: now,
+            location,
+            children: vec![],
+        };
+
+        let tasks = vec![task];
+        mark_task_done(1, &tasks).unwrap();
+
+        let result = fs::read_to_string(&path).unwrap();
+        assert!(result.contains("@Task @Done"));
+    }
+
+    #[test]
+    fn test_mark_task_done_invalid_number_zero() {
+        let tasks = vec![];
+        let err = mark_task_done(0, &tasks).unwrap_err();
+        assert!(matches!(err, StreamdError::InvalidTaskNumber(0, 0)));
+    }
+
+    #[test]
+    fn test_mark_task_done_invalid_number_exceeds() {
+        let now = Utc::now();
+        let tasks = vec![make_task_shard(now, "a.md")];
+        let err = mark_task_done(2, &tasks).unwrap_err();
+        assert!(matches!(err, StreamdError::InvalidTaskNumber(2, 1)));
+    }
 }
diff --git a/src/config.rs b/src/config.rs
index c828ba9..417e8f0 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -37,8 +37,10 @@ impl Settings {
     fn config_path() -> PathBuf {
         if let Some(proj_dirs) = ProjectDirs::from("", "", "streamd") {
             proj_dirs.config_dir().join("config.toml")
+        } else if let Some(base_dirs) = directories::BaseDirs::new() {
+            base_dirs.config_dir().join("streamd").join("config.toml")
         } else {
-            PathBuf::from("~/.config/streamd/config.toml")
+            PathBuf::from("streamd_config.toml")
         }
     }
 }
diff --git a/src/extract/parser.rs b/src/extract/parser.rs
index 1326371..b1d0374 100644
--- a/src/extract/parser.rs
+++ b/src/extract/parser.rs
@@ -12,6 +12,8 @@ struct BlockInfo {
     end_line: usize,
     block_type: BlockType,
     events: Vec<Event<'static>>,
+    /// Nested list items contained within this block (for ListItem blocks with sub-lists).
+    nested_items: Vec<BlockInfo>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -110,12 +112,14 @@ pub fn parse_markdown_file(file_name: &str, file_content: &str) -> StreamFile {
 fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
     let mut blocks = Vec::new();
     let mut current_block: Option<BlockInfo> = None;
-    let _current_events: Vec<Event<'static>> = Vec::new();
     let mut depth = 0;
     let mut list_items: Vec<BlockInfo> = Vec::new();
     let mut in_list = false;
     let mut list_start_line = 0;
 
+    // Stack for nested lists: (saved current_block, saved list_items, saved list_start_line)
+    let mut list_nesting_stack: Vec<(Option<BlockInfo>, Vec<BlockInfo>, usize)> = Vec::new();
+
     // Pre-compute line starts for offset-to-line mapping
     let line_starts: Vec<usize> = std::iter::once(0)
         .chain(content.match_indices('\n').map(|(i, _)| i + 1))
@@ -135,6 +139,7 @@ fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
                         end_line: line,
                         block_type: BlockType::Paragraph,
                         events: Vec::new(),
+                        nested_items: Vec::new(),
                     });
                 }
                 depth += 1;
@@ -166,6 +171,7 @@ fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
                         end_line: line,
                         block_type: BlockType::Heading(heading_level),
                         events: Vec::new(),
+                        nested_items: Vec::new(),
                     });
                 }
                 depth += 1;
@@ -186,7 +192,15 @@ fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
                 }
             }
             Event::Start(Tag::List(_)) => {
-                if !in_list {
+                if in_list {
+                    // Entering a nested list: save current list item and collected items
+                    list_nesting_stack.push((
+                        current_block.take(),
+                        std::mem::take(&mut list_items),
+                        list_start_line,
+                    ));
+                    list_start_line = line;
+                } else {
                     in_list = true;
                     list_start_line = line;
                     list_items.clear();
@@ -195,7 +209,18 @@ fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
             }
             Event::End(TagEnd::List(_)) => {
                 depth -= 1;
-                if depth == 0 && in_list {
+                if let Some((parent_block, parent_items, parent_start_line)) =
+                    list_nesting_stack.pop()
+                {
+                    // Nested list ended: attach collected items as nested children of parent item
+                    let nested = std::mem::take(&mut list_items);
+                    list_start_line = parent_start_line;
+                    list_items = parent_items;
+                    current_block = parent_block.map(|mut item| {
+                        item.nested_items = nested;
+                        item
+                    });
+                } else if depth == 0 && in_list {
                     in_list = false;
                     // Create a list block containing all list items
                     if !list_items.is_empty() {
@@ -204,6 +229,7 @@ fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
                             end_line: line,
                             block_type: BlockType::List,
                             events: vec![], // List events are handled through list_items
+                            nested_items: vec![],
                         });
                         // Store list items for later processing
                         for item in list_items.drain(..) {
@@ -222,6 +248,7 @@ fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
                         end_line: line,
                         block_type: BlockType::ListItem,
                         events: Vec::new(),
+                        nested_items: Vec::new(),
                     });
                 }
             }
@@ -240,6 +267,7 @@ fn collect_blocks(content: &str, parser: Parser) -> Vec<BlockInfo> {
                         end_line: line,
                         block_type: BlockType::CodeBlock,
                         events: Vec::new(),
+                        nested_items: Vec::new(),
                     });
                 }
                 depth += 1;
@@ -507,13 +535,21 @@ fn parse_single_block_shard(
             }
         }
         BlockType::List | BlockType::ListItem => {
-            // List handling is complex - for now, extract any markers/tags
             let (markers, tags) = extract_block_markers_and_tags(block);
-            if markers.is_empty() {
+            // Recursively build child shards from nested list items
+            let children: Vec<Shard> = block
+                .nested_items
+                .iter()
+                .filter_map(|item| {
+                    let (child, _) = parse_single_block_shard(item, item.start_line, item.end_line);
+                    child
+                })
+                .collect();
+            if markers.is_empty() && children.is_empty() {
                 (None, tags)
             } else {
                 (
-                    Some(build_shard(start_line, end_line, markers, tags, vec![])),
+                    Some(build_shard(start_line, end_line, markers, tags, children)),
                     vec![],
                 )
             }
@@ -716,6 +752,26 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_parse_nested_list_creates_three_shards() {
+        let content = "* @Task 1\n  * @Task 2\n* @Task 3";
+        let result = parse_markdown_file(&make_file_name(), content);
+        let root = result.shard.unwrap();
+        // The root shard should have two top-level children: @Task 1 and @Task 3
+        assert_eq!(root.children.len(), 2, "expected 2 top-level shards");
+        let task1 = &root.children[0];
+        let task3 = &root.children[1];
+        // @Task 1 must carry its marker and contain @Task 2 as a child
+        assert_eq!(task1.markers, vec!["Task"], "@Task 1 marker");
+        assert_eq!(task1.children.len(), 1, "@Task 1 should have one child");
+        let task2 = &task1.children[0];
+        assert_eq!(task2.markers, vec!["Task"], "@Task 2 marker");
+        assert!(task2.children.is_empty(), "@Task 2 should have no children");
+        // @Task 3 is a sibling of @Task 1
+        assert_eq!(task3.markers, vec!["Task"], "@Task 3 marker");
+        assert!(task3.children.is_empty(), "@Task 3 should have no children");
+    }
+
     #[test]
     fn test_parse_continues_looking_for_markers_after_first_link_marker() {
         let result = parse_markdown_file(
diff --git a/src/localize/datetime.rs b/src/localize/datetime.rs
index 87a2718..f5fd601 100644
--- a/src/localize/datetime.rs
+++ b/src/localize/datetime.rs
@@ -1,4 +1,5 @@
-use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
+use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
+use chrono_tz::Tz;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use std::path::Path;
@@ -8,6 +9,11 @@ use std::path::Path;
 static FILE_NAME_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^(?P<date>\d{8})(?:-(?P<time>\d{4,6}))?.+\.md$").unwrap());
 
+/// Regex for extracting a file-type prefix from file names.
+/// Matches filenames like `20260412-123456_daily.md` or `20260412_daily Some Title.md`.
+static FILE_TYPE_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"^\d{8}(?:-\d{4,6})?_([a-zA-Z0-9]+)").unwrap());
+
 /// Regex for validating datetime marker format (14 digits).
 static DATETIME_MARKER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^\d{14}$").unwrap());
 
@@ -17,15 +23,25 @@ static DATE_MARKER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^\d{8}$").unwr
 /// Regex for validating time marker format (6 digits).
 static TIME_MARKER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^\d{6}$").unwrap());
 
+/// Convert a NaiveDateTime to UTC via the given timezone.
+/// Falls back to the earliest local interpretation for ambiguous DST times.
+fn naive_to_utc(dt: NaiveDateTime, tz: Tz) -> Option<DateTime<Utc>> {
+    tz.from_local_datetime(&dt)
+        .single()
+        .or_else(|| tz.from_local_datetime(&dt).earliest())
+        .map(|dt| dt.with_timezone(&Utc))
+}
+
 /// Extract a datetime from a file name in the format YYYYMMDD-HHMMSS.
 ///
 /// The time component is optional and can be 4-6 digits (HHMM, HHMMS, or HHMMSS).
+/// The datetime is interpreted in the given timezone.
 ///
 /// # Examples
-/// - "20230101-123456 Some Text.md" -> DateTime for 2023-01-01 12:34:56
-/// - "20230101 Some Text.md" -> DateTime for 2023-01-01 00:00:00
+/// - "20230101-123456 Some Text.md" -> DateTime for 2023-01-01 12:34:56 in tz
+/// - "20230101 Some Text.md" -> DateTime for 2023-01-01 00:00:00 in tz
 /// - "invalid-file-name.md" -> None
-pub fn extract_datetime_from_file_name(file_name: &str) -> Option<DateTime<Utc>> {
+pub fn extract_datetime_from_file_name(file_name: &str, tz: Tz) -> Option<DateTime<Utc>> {
     let base_name = Path::new(file_name)
         .file_name()
         .and_then(|s| s.to_str())
@@ -48,20 +64,45 @@ pub fn extract_datetime_from_file_name(file_name: &str) -> Option<DateTime<Utc>>
 
     NaiveDateTime::parse_from_str(&datetime_str, "%Y%m%d %H:%M:%S")
         .ok()
-        .map(|dt| dt.and_utc())
+        .and_then(|dt| naive_to_utc(dt, tz))
+}
+
+/// Extract the file-type prefix from a filename.
+///
+/// Filenames with a `_prefix` segment after the timestamp (and optional time component)
+/// are recognised. The prefix must consist of alphanumeric characters only.
+///
+/// # Examples
+/// - `"20260412-123456_daily.md"` → `Some("daily")`
+/// - `"20260412_daily Some Title.md"` → `Some("daily")`
+/// - `"20260412-123456 Some Title.md"` → `None`
+/// - `"/path/to/20260412-123456_daily.md"` → `Some("daily")`
+pub fn extract_file_type_from_file_name(file_name: &str) -> Option<String> {
+    let base_name = Path::new(file_name)
+        .file_name()
+        .and_then(|s| s.to_str())
+        .unwrap_or(file_name);
+
+    FILE_TYPE_REGEX
+        .captures(base_name)
+        .and_then(|c| c.get(1))
+        .map(|m| m.as_str().to_string())
+}
+
+/// Parse a 14-digit marker string as a NaiveDateTime without timezone conversion.
+fn parse_naive_datetime_from_marker(marker: &str) -> Option<NaiveDateTime> {
+    if !DATETIME_MARKER_REGEX.is_match(marker) {
+        return None;
+    }
+    NaiveDateTime::parse_from_str(marker, "%Y%m%d%H%M%S").ok()
 }
 
 /// Extract a datetime from a marker string in the exact format: YYYYMMDDHHMMSS.
 ///
+/// The datetime is interpreted in the given timezone.
 /// Returns the parsed datetime if the format matches and values are valid.
-pub fn extract_datetime_from_marker(marker: &str) -> Option<DateTime<Utc>> {
-    if !DATETIME_MARKER_REGEX.is_match(marker) {
-        return None;
-    }
-
-    NaiveDateTime::parse_from_str(marker, "%Y%m%d%H%M%S")
-        .ok()
-        .map(|dt| dt.and_utc())
+pub fn extract_datetime_from_marker(marker: &str, tz: Tz) -> Option<DateTime<Utc>> {
+    parse_naive_datetime_from_marker(marker).and_then(|dt| naive_to_utc(dt, tz))
 }
 
 /// Extract a date from a marker string in the exact format: YYYYMMDD.
@@ -90,6 +131,7 @@ pub fn extract_time_from_marker(marker: &str) -> Option<NaiveTime> {
 ///
 /// The function processes markers in reverse order, allowing later markers to override
 /// earlier ones. It combines date-only and time-only markers when both are present.
+/// All naive datetimes (from markers and the inherited fallback) are interpreted in `tz`.
 ///
 /// Rules:
 /// - If a full datetime marker (14 digits) is found, it sets both date and time
@@ -99,6 +141,7 @@ pub fn extract_time_from_marker(marker: &str) -> Option<NaiveTime> {
 pub fn extract_datetime_from_marker_list(
     markers: &[String],
     inherited_datetime: DateTime<Utc>,
+    tz: Tz,
 ) -> DateTime<Utc> {
     let mut shard_time: Option<NaiveTime> = None;
     let mut shard_date: Option<NaiveDate> = None;
@@ -111,34 +154,84 @@ pub fn extract_datetime_from_marker_list(
         if let Some(date) = extract_date_from_marker(marker) {
             shard_date = Some(date);
         }
-        if let Some(datetime) = extract_datetime_from_marker(marker) {
-            shard_date = Some(datetime.naive_utc().date());
-            shard_time = Some(datetime.naive_utc().time());
+        if let Some(naive_dt) = parse_naive_datetime_from_marker(marker) {
+            shard_date = Some(naive_dt.date());
+            shard_time = Some(naive_dt.time());
         }
     }
 
+    // Interpret the inherited datetime in the configured timezone for fallback values
+    let inherited_local = inherited_datetime.with_timezone(&tz).naive_local();
+
     // Combine date and time, applying defaults as needed
-    let final_date = shard_date.unwrap_or_else(|| inherited_datetime.naive_utc().date());
+    let final_date = shard_date.unwrap_or_else(|| inherited_local.date());
     let final_time = match (shard_date, shard_time) {
         // If we have a date but no time, use midnight
         (Some(_), None) => NaiveTime::from_hms_opt(0, 0, 0).unwrap(),
         // Otherwise use the shard time or inherit
-        _ => shard_time.unwrap_or_else(|| inherited_datetime.naive_utc().time()),
+        _ => shard_time.unwrap_or_else(|| inherited_local.time()),
     };
 
-    NaiveDateTime::new(final_date, final_time).and_utc()
+    let naive = NaiveDateTime::new(final_date, final_time);
+    naive_to_utc(naive, tz).unwrap_or(inherited_datetime)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use chrono::TimeZone;
+    use chrono_tz::UTC;
+
+    #[test]
+    fn test_extract_file_type_with_time() {
+        assert_eq!(
+            extract_file_type_from_file_name("20260412-123456_daily.md"),
+            Some("daily".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_file_type_with_time_and_title() {
+        assert_eq!(
+            extract_file_type_from_file_name("20260412-123456_daily Some Title.md"),
+            Some("daily".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_file_type_without_time() {
+        assert_eq!(
+            extract_file_type_from_file_name("20260412_daily.md"),
+            Some("daily".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_file_type_without_prefix() {
+        assert_eq!(
+            extract_file_type_from_file_name("20260412-123456 Some Title.md"),
+            None
+        );
+    }
+
+    #[test]
+    fn test_extract_file_type_with_full_path() {
+        assert_eq!(
+            extract_file_type_from_file_name("/path/to/20260412-123456_daily.md"),
+            Some("daily".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_file_type_no_timestamp() {
+        assert_eq!(extract_file_type_from_file_name("notes.md"), None);
+    }
 
     #[test]
     fn test_extract_date_from_file_name_valid() {
         let file_name = "20230101-123456 Some Text.md";
         assert_eq!(
-            extract_datetime_from_file_name(file_name),
+            extract_datetime_from_file_name(file_name, UTC),
             Some(Utc.with_ymd_and_hms(2023, 1, 1, 12, 34, 56).unwrap())
         );
     }
@@ -146,14 +239,14 @@ mod tests {
     #[test]
     fn test_extract_date_from_file_name_invalid() {
         let file_name = "invalid-file-name.md";
-        assert_eq!(extract_datetime_from_file_name(file_name), None);
+        assert_eq!(extract_datetime_from_file_name(file_name, UTC), None);
     }
 
     #[test]
     fn test_extract_date_from_file_name_without_time() {
         let file_name = "20230101 Some Text.md";
         assert_eq!(
-            extract_datetime_from_file_name(file_name),
+            extract_datetime_from_file_name(file_name, UTC),
             Some(Utc.with_ymd_and_hms(2023, 1, 1, 0, 0, 0).unwrap())
         );
     }
@@ -162,7 +255,7 @@ mod tests {
     fn test_extract_date_from_file_name_short_time() {
         let file_name = "20230101-1234 Some Text.md";
         assert_eq!(
-            extract_datetime_from_file_name(file_name),
+            extract_datetime_from_file_name(file_name, UTC),
             Some(Utc.with_ymd_and_hms(2023, 1, 1, 12, 34, 0).unwrap())
         );
     }
@@ -170,41 +263,61 @@ mod tests {
     #[test]
     fn test_extract_date_from_file_name_empty_string() {
         let file_name = "";
-        assert_eq!(extract_datetime_from_file_name(file_name), None);
+        assert_eq!(extract_datetime_from_file_name(file_name, UTC), None);
     }
 
     #[test]
     fn test_extract_date_from_file_name_with_full_path() {
         let file_name = "/path/to/20230101-123456 Some Text.md";
         assert_eq!(
-            extract_datetime_from_file_name(file_name),
+            extract_datetime_from_file_name(file_name, UTC),
             Some(Utc.with_ymd_and_hms(2023, 1, 1, 12, 34, 56).unwrap())
         );
     }
 
+    #[test]
+    fn test_extract_date_from_file_name_with_timezone_offset() {
+        // Europe/Berlin is UTC+1 in January (CET)
+        let file_name = "20230101-120000 Some Text.md";
+        assert_eq!(
+            extract_datetime_from_file_name(file_name, chrono_tz::Europe::Berlin),
+            Some(Utc.with_ymd_and_hms(2023, 1, 1, 11, 0, 0).unwrap())
+        );
+    }
+
     #[test]
     fn test_extract_datetime_from_marker_valid() {
         let marker = "20250101150000";
         assert_eq!(
-            extract_datetime_from_marker(marker),
+            extract_datetime_from_marker(marker, UTC),
             Some(Utc.with_ymd_and_hms(2025, 1, 1, 15, 0, 0).unwrap())
         );
     }
 
+    #[test]
+    fn test_extract_datetime_from_marker_with_timezone_offset() {
+        // Europe/Berlin is UTC+1 in January (CET)
+        let marker = "20250101150000";
+        assert_eq!(
+            extract_datetime_from_marker(marker, chrono_tz::Europe::Berlin),
+            Some(Utc.with_ymd_and_hms(2025, 1, 1, 14, 0, 0).unwrap())
+        );
+    }
+
     #[test]
     fn test_extract_datetime_from_marker_invalid_format() {
-        assert_eq!(extract_datetime_from_marker("2025010115000"), None); // too short
-        assert_eq!(extract_datetime_from_marker("202501011500000"), None); // too long
-        assert_eq!(extract_datetime_from_marker("2025-01-01T150000"), None); // separators
-        assert_eq!(extract_datetime_from_marker("2025010115000a"), None); // non-digit
-        assert_eq!(extract_datetime_from_marker(""), None);
+        assert_eq!(extract_datetime_from_marker("2025010115000", UTC), None); // too short
+        assert_eq!(extract_datetime_from_marker("202501011500000", UTC), None); // too long
+        assert_eq!(extract_datetime_from_marker("2025-01-01T150000", UTC), None); // separators
+        assert_eq!(extract_datetime_from_marker("2025010115000a", UTC), None); // non-digit
+        assert_eq!(extract_datetime_from_marker("", UTC), None);
     }
 
     #[test]
     fn test_extract_datetime_from_marker_invalid_values() {
-        assert_eq!(extract_datetime_from_marker("20250230120000"), None); // Feb 30
-        assert_eq!(extract_datetime_from_marker("20250101126000"), None); // minute 60
-        assert_eq!(extract_datetime_from_marker("20250101240000"), None); // hour 24
+        assert_eq!(extract_datetime_from_marker("20250230120000", UTC), None); // Feb 30
+        assert_eq!(extract_datetime_from_marker("20250101126000", UTC), None); // minute 60
+        assert_eq!(extract_datetime_from_marker("20250101240000", UTC), None); // hour 24
     }
 
     #[test]
@@ -260,7 +373,10 @@ mod tests {
     #[test]
     fn test_no_markers_inherits_datetime() {
         let inherited = Utc.with_ymd_and_hms(2025, 1, 2, 3, 4, 5).unwrap();
-        assert_eq!(extract_datetime_from_marker_list(&[], inherited), inherited);
+        assert_eq!(
+            extract_datetime_from_marker_list(&[], inherited, UTC),
+            inherited
+        );
     }
 
     #[test]
@@ -273,7 +389,7 @@ mod tests {
             "1234567".to_string(),
         ];
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             inherited
         );
     }
@@ -283,7 +399,7 @@ mod tests {
         let inherited = Utc.with_ymd_and_hms(2025, 6, 7, 8, 9, 10).unwrap();
         let markers = vec!["20250101".to_string()];
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             Utc.with_ymd_and_hms(2025, 1, 1, 0, 0, 0).unwrap()
         );
     }
@@ -293,7 +409,7 @@ mod tests {
         let inherited = Utc.with_ymd_and_hms(2025, 6, 7, 8, 9, 10).unwrap();
         let markers = vec!["150000".to_string()];
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             Utc.with_ymd_and_hms(2025, 6, 7, 15, 0, 0).unwrap()
         );
     }
@@ -303,7 +419,7 @@ mod tests {
         let inherited = Utc.with_ymd_and_hms(2025, 6, 7, 8, 9, 10).unwrap();
         let markers = vec!["20250101150000".to_string()];
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             Utc.with_ymd_and_hms(2025, 1, 1, 15, 0, 0).unwrap()
         );
     }
@@ -313,7 +429,7 @@ mod tests {
         let inherited = Utc.with_ymd_and_hms(2025, 6, 7, 8, 9, 10).unwrap();
         let markers = vec!["20250101".to_string(), "150000".to_string()];
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             Utc.with_ymd_and_hms(2025, 1, 1, 15, 0, 0).unwrap()
         );
     }
@@ -328,7 +444,7 @@ mod tests {
             "160000".to_string(),
         ];
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             Utc.with_ymd_and_hms(2025, 1, 1, 15, 0, 0).unwrap()
         );
     }
@@ -343,7 +459,7 @@ mod tests {
         ];
         // The first date (20250101) and first time (150000) should win over the later combined datetime
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             Utc.with_ymd_and_hms(2025, 1, 1, 15, 0, 0).unwrap()
         );
     }
@@ -358,8 +474,19 @@ mod tests {
             "150000".to_string(),   // valid
         ];
         assert_eq!(
-            extract_datetime_from_marker_list(&markers, inherited),
+            extract_datetime_from_marker_list(&markers, inherited, UTC),
             Utc.with_ymd_and_hms(2025, 1, 1, 15, 0, 0).unwrap()
         );
     }
+
+    #[test]
+    fn test_marker_list_with_timezone_offset() {
+        // Europe/Berlin is UTC+2 in summer (CEST)
+        let inherited = Utc.with_ymd_and_hms(2025, 6, 7, 8, 9, 10).unwrap();
+        let markers = vec!["150000".to_string()];
+        assert_eq!(
+            extract_datetime_from_marker_list(&markers, inherited, chrono_tz::Europe::Berlin),
+            Utc.with_ymd_and_hms(2025, 6, 7, 13, 0, 0).unwrap()
+        );
+    }
 }
diff --git a/src/localize/mod.rs b/src/localize/mod.rs
index c8f0441..e6fc873 100644
--- a/src/localize/mod.rs
+++ b/src/localize/mod.rs
@@ -9,7 +9,7 @@ pub use configuration::{
 };
 pub use datetime::{
     extract_date_from_marker, extract_datetime_from_file_name, extract_datetime_from_marker,
-    extract_datetime_from_marker_list, extract_time_from_marker,
+    extract_datetime_from_marker_list, extract_file_type_from_file_name, extract_time_from_marker,
 };
 pub use preconfigured::TaskConfiguration;
 pub use shard::{localize_shard, localize_stream_file};
diff --git a/src/localize/preconfigured.rs b/src/localize/preconfigured.rs
index 99b60cf..6192a14 100644
--- a/src/localize/preconfigured.rs
+++ b/src/localize/preconfigured.rs
@@ -20,6 +20,12 @@ pub static TaskConfiguration: Lazy<RepositoryConfiguration> = Lazy::new(|| {
                 .with_comment("Project the task is attached to")
                 .with_propagate(true),
         )
+        .with_dimension(
+            "file_type",
+            Dimension::new("File Type")
+                .with_comment("Type of file derived from filename prefix (e.g. 'daily')")
+                .with_propagate(true),
+        )
         .with_marker(
             "Task",
             Marker::new("Task").with_placements(vec![
diff --git a/src/localize/shard.rs b/src/localize/shard.rs
index 279b8c6..5efbf2d 100644
--- a/src/localize/shard.rs
+++ b/src/localize/shard.rs
@@ -1,10 +1,14 @@
 use chrono::{DateTime, Utc};
+use chrono_tz::Tz;
 use indexmap::{IndexMap, IndexSet};
 
 use crate::error::StreamdError;
 use crate::models::{LocalizedShard, RepositoryConfiguration, Shard, StreamFile};
 
-use super::datetime::{extract_datetime_from_file_name, extract_datetime_from_marker_list};
+use super::datetime::{
+    extract_datetime_from_file_name, extract_datetime_from_marker_list,
+    extract_file_type_from_file_name,
+};
 
 /// Localize a shard within the repository's coordinate system.
 ///
@@ -17,12 +21,13 @@ pub fn localize_shard(
     config: &RepositoryConfiguration,
     propagated: &IndexMap<String, String>,
     moment: DateTime<Utc>,
+    tz: Tz,
 ) -> LocalizedShard {
     let mut position = propagated.clone();
     let mut private_position: IndexMap<String, String> = IndexMap::new();
 
     // Extract datetime from markers
-    let adjusted_moment = extract_datetime_from_marker_list(&shard.markers, moment);
+    let adjusted_moment = extract_datetime_from_marker_list(&shard.markers, moment, tz);
 
     // Convert markers to a set for if_with checking
     let marker_set: IndexSet<String> = shard.markers.iter().cloned().collect();
@@ -64,7 +69,7 @@ pub fn localize_shard(
     let children: Vec<LocalizedShard> = shard
         .children
         .iter()
-        .map(|child| localize_shard(child, config, &position, adjusted_moment))
+        .map(|child| localize_shard(child, config, &position, adjusted_moment, tz))
         .collect();
 
     // Merge private position into final position
@@ -84,11 +89,13 @@ pub fn localize_shard(
 /// Localize an entire stream file.
 ///
 /// Extracts the datetime from the file name and localizes the root shard.
+/// Timestamps in the file name and markers are interpreted in `tz`.
 pub fn localize_stream_file(
     stream_file: &StreamFile,
     config: &RepositoryConfiguration,
+    tz: Tz,
 ) -> Result<LocalizedShard, StreamdError> {
-    let shard_date = extract_datetime_from_file_name(&stream_file.file_name)
+    let shard_date = extract_datetime_from_file_name(&stream_file.file_name, tz)
         .ok_or_else(|| StreamdError::DateExtractionError(stream_file.file_name.clone()))?;
 
     let shard = stream_file
@@ -98,8 +105,17 @@ pub fn localize_stream_file(
 
     let mut initial_location = IndexMap::new();
     initial_location.insert("file".to_string(), stream_file.file_name.clone());
+    if let Some(file_type) = extract_file_type_from_file_name(&stream_file.file_name) {
+        initial_location.insert("file_type".to_string(), file_type);
+    }
 
-    Ok(localize_shard(shard, config, &initial_location, shard_date))
+    Ok(localize_shard(
+        shard,
+        config,
+        &initial_location,
+        shard_date,
+        tz,
+    ))
 }
 
 #[cfg(test)]
@@ -107,6 +123,7 @@ mod tests {
     use super::*;
     use crate::models::{Dimension, Marker, MarkerPlacement};
     use chrono::TimeZone;
+    use chrono_tz::UTC;
 
     fn make_config() -> RepositoryConfiguration {
         RepositoryConfiguration::new()
@@ -149,7 +166,7 @@ mod tests {
         let stream_file = StreamFile::new("20250622-121000 Test File.md")
             .with_shard(Shard::new(1, 1).with_markers(vec!["Streamd".to_string()]));
 
-        let result = localize_stream_file(&stream_file, &config).unwrap();
+        let result = localize_stream_file(&stream_file, &config, UTC).unwrap();
 
         assert_eq!(
             result.moment,
@@ -170,7 +187,7 @@ mod tests {
             Shard::new(1, 1).with_markers(vec!["Timesheet".to_string(), "Streamd".to_string()]),
         );
 
-        let result = localize_stream_file(&stream_file, &config).unwrap();
+        let result = localize_stream_file(&stream_file, &config, UTC).unwrap();
 
         assert_eq!(
             result.moment,
@@ -202,7 +219,7 @@ mod tests {
         let stream_file = StreamFile::new("20260131-210000 Test File.md")
             .with_shard(Shard::new(1, 1).with_markers(vec!["A".to_string(), "B".to_string()]));
 
-        let result = localize_stream_file(&stream_file, &config).unwrap();
+        let result = localize_stream_file(&stream_file, &config, UTC).unwrap();
 
         assert_eq!(result.location.get("project"), Some(&"b".to_string()));
     }
@@ -226,7 +243,7 @@ mod tests {
         let stream_file = StreamFile::new("20260131-210000 Test File.md")
             .with_shard(Shard::new(1, 1).with_markers(vec!["A".to_string(), "B".to_string()]));
 
-        let result = localize_stream_file(&stream_file, &config).unwrap();
+        let result = localize_stream_file(&stream_file, &config, UTC).unwrap();
 
         assert_eq!(result.location.get("project"), Some(&"a".to_string()));
     }
@@ -250,7 +267,7 @@ mod tests {
         let stream_file = StreamFile::new("20260131-210000 Test File.md")
             .with_shard(Shard::new(1, 1).with_markers(vec!["A".to_string(), "B".to_string()]));
 
-        let result = localize_stream_file(&stream_file, &config).unwrap();
+        let result = localize_stream_file(&stream_file, &config, UTC).unwrap();
 
         assert_eq!(result.location.get("label"), Some(&"b".to_string()));
     }
@@ -275,7 +292,7 @@ mod tests {
         let stream_file = StreamFile::new("20260131-210000 Test File.md")
             .with_shard(Shard::new(1, 1).with_markers(vec!["A".to_string(), "B".to_string()]));
 
-        let result = localize_stream_file(&stream_file, &config).unwrap();
+        let result = localize_stream_file(&stream_file, &config, UTC).unwrap();
 
         assert_eq!(result.location.get("label"), Some(&"a".to_string()));
     }
diff --git a/src/main.rs b/src/main.rs
index e6325c8..e7fc178 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,14 +12,18 @@ fn main() -> miette::Result<()> {
         }) => match action {
             None => streamd::cli::commands::todo::run_list(show_future)?,
             Some(TodoAction::Edit { number }) => streamd::cli::commands::todo::run_edit(number)?,
-            Some(TodoAction::Done { number }) => streamd::cli::commands::todo::run_done(number)?,
+            Some(TodoAction::Done { numbers }) => streamd::cli::commands::todo::run_done(&numbers)?,
         },
         Some(Commands::Edit { number }) => streamd::cli::commands::edit::run(number)?,
-        Some(Commands::Timesheet) => streamd::cli::commands::timesheet::run()?,
+        Some(Commands::Timesheet { decimal, debug }) => {
+            streamd::cli::commands::timesheet::run(decimal, debug)?
+        }
+        Some(Commands::Daily { date }) => streamd::cli::commands::daily::run(date)?,
         Some(Commands::Completions { shell }) => {
             streamd::cli::commands::completions::run(shell);
         }
-        None => streamd::cli::commands::new::run()?,
+        Some(Commands::Lsp) => streamd::cli::commands::lsp::run()?,
+        None => streamd::cli::commands::daily::run(None)?,
     }
 
     Ok(())
diff --git a/src/timesheet/extract.rs b/src/timesheet/extract.rs
index 017434f..0a6c8ff 100644
--- a/src/timesheet/extract.rs
+++ b/src/timesheet/extract.rs
@@ -1,4 +1,5 @@
 use chrono::{DateTime, Utc};
+use chrono_tz::Tz;
 use itertools::Itertools;
 
 use crate::error::StreamdError;
@@ -35,7 +36,11 @@ fn shards_to_timesheet_points(shards: &[LocalizedShard]) -> Vec<TimesheetPoint>
 }
 
 /// Aggregate timesheet points for a single day into a Timesheet.
-fn aggregate_timecard_day(points: &[TimesheetPoint]) -> Result<Option<Timesheet>, StreamdError> {
+fn aggregate_timecard_day(
+    points: &[TimesheetPoint],
+    now: DateTime<Utc>,
+    tz: Tz,
+) -> Result<Option<Timesheet>, StreamdError> {
     if points.is_empty() {
         return Ok(None);
     }
@@ -46,23 +51,23 @@ fn aggregate_timecard_day(points: &[TimesheetPoint]) -> Result<Option<Timesheet>
         pts
     };
 
-    let card_date = sorted_points[0].moment.date_naive();
+    let card_date = sorted_points[0].moment.with_timezone(&tz).date_naive();
     let mut is_sick_leave = false;
     let mut special_day_type: Option<SpecialDayType> = None;
 
     // State machine: starting in "break" mode (not working)
     let mut last_is_break = true;
-    let mut last_time = sorted_points[0].moment.time();
+    let mut last_time = sorted_points[0].moment.with_timezone(&tz).time();
     let mut timecards: Vec<Timecard> = Vec::new();
 
     for point in &sorted_points {
-        if point.moment.date_naive() != card_date {
+        if point.moment.with_timezone(&tz).date_naive() != card_date {
             return Err(StreamdError::TimesheetError(
                 "Dates of all given timesheet days should be consistent".to_string(),
             ));
         }
 
-        let point_time = point.moment.time();
+        let point_time = point.moment.with_timezone(&tz).time();
 
         match point.point_type {
             TimesheetPointType::Holiday => {
@@ -113,10 +118,16 @@ fn aggregate_timecard_day(points: &[TimesheetPoint]) -> Result<Option<Timesheet>
 
     // Check that we ended in break mode
     if !last_is_break {
-        return Err(StreamdError::TimesheetError(format!(
-            "Last Timecard of {} is not a break!",
-            card_date
-        )));
+        let now_local = now.with_timezone(&tz);
+        if card_date == now_local.date_naive() {
+            // No closing break yet for today — artificially close at now
+            timecards.push(Timecard::new(last_time, now_local.time()));
+        } else {
+            return Err(StreamdError::TimesheetError(format!(
+                "Last Timecard of {} is not a break!",
+                card_date
+            )));
+        }
     }
 
     // Only return a timesheet if there's meaningful data
@@ -133,17 +144,24 @@ fn aggregate_timecard_day(points: &[TimesheetPoint]) -> Result<Option<Timesheet>
 }
 
 /// Aggregate timesheet points into timesheets, grouped by day.
-fn aggregate_timecards(points: &[TimesheetPoint]) -> Result<Vec<Timesheet>, StreamdError> {
+fn aggregate_timecards(
+    points: &[TimesheetPoint],
+    now: DateTime<Utc>,
+    tz: Tz,
+) -> Result<Vec<Timesheet>, StreamdError> {
     let mut timesheets = Vec::new();
 
     // Sort points by moment to ensure proper grouping
     let mut sorted_points = points.to_vec();
     sorted_points.sort_by_key(|p| p.moment);
 
-    // Group by date
-    for (_date, group) in &sorted_points.iter().chunk_by(|p| p.moment.date_naive()) {
+    // Group by local date in the configured timezone
+    for (_date, group) in &sorted_points
+        .iter()
+        .chunk_by(|p| p.moment.with_timezone(&tz).date_naive())
+    {
         let day_points: Vec<_> = group.cloned().collect();
-        if let Some(timesheet) = aggregate_timecard_day(&day_points)? {
+        if let Some(timesheet) = aggregate_timecard_day(&day_points, now, tz)? {
             timesheets.push(timesheet);
         }
     }
@@ -152,9 +170,13 @@ fn aggregate_timecards(points: &[TimesheetPoint]) -> Result<Vec<Timesheet>, Stre
 }
 
 /// Extract timesheets from localized shards.
-pub fn extract_timesheets(shards: &[LocalizedShard]) -> Result<Vec<Timesheet>, StreamdError> {
+pub fn extract_timesheets(
+    shards: &[LocalizedShard],
+    now: DateTime<Utc>,
+    tz: Tz,
+) -> Result<Vec<Timesheet>, StreamdError> {
     let points = shards_to_timesheet_points(shards);
-    aggregate_timecards(&points)
+    aggregate_timecards(&points, now, tz)
 }
 
 #[cfg(test)]
@@ -163,6 +185,13 @@ mod tests {
     use chrono::{NaiveTime, TimeZone};
     use indexmap::IndexMap;
 
+    use chrono_tz::UTC;
+
+    /// A fixed "now" in the past, so tests never match today.
+    fn past_now() -> DateTime<Utc> {
+        Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap()
+    }
+
     fn point(at: DateTime<Utc>, point_type: TimesheetPointType) -> LocalizedShard {
         let mut location = IndexMap::new();
         location.insert(
@@ -198,7 +227,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].date, day.date_naive());
@@ -251,7 +280,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].timecards.len(), 3);
@@ -302,7 +331,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].timecards.len(), 3);
@@ -336,7 +365,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 2);
         assert_eq!(result[0].date, day1.date_naive());
@@ -359,7 +388,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].special_day_type, Some(SpecialDayType::Vacation));
@@ -382,7 +411,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].special_day_type, Some(SpecialDayType::Holiday));
@@ -404,7 +433,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].special_day_type, Some(SpecialDayType::Undertime));
@@ -431,7 +460,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert!(result[0].is_sick_leave);
@@ -454,7 +483,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert_eq!(result.len(), 1);
         assert!(result[0].is_sick_leave);
@@ -463,7 +492,7 @@ mod tests {
 
     #[test]
     fn test_empty_input() {
-        let result = extract_timesheets(&[]).unwrap();
+        let result = extract_timesheets(&[], past_now(), UTC).unwrap();
         assert!(result.is_empty());
     }
 
@@ -483,7 +512,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards);
+        let result = extract_timesheets(&shards, past_now(), UTC);
 
         assert!(result.is_err());
         let err = result.unwrap_err();
@@ -511,7 +540,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards);
+        let result = extract_timesheets(&shards, past_now(), UTC);
 
         assert!(result.is_err());
         let err = result.unwrap_err();
@@ -534,7 +563,7 @@ mod tests {
             ),
         ];
 
-        let result = extract_timesheets(&shards).unwrap();
+        let result = extract_timesheets(&shards, past_now(), UTC).unwrap();
 
         assert!(result.is_empty());
     }
diff --git a/src/timesheet/generator.rs b/src/timesheet/generator.rs
index 45fbb32..ede7898 100644
--- a/src/timesheet/generator.rs
+++ b/src/timesheet/generator.rs
@@ -2,7 +2,8 @@ use std::collections::HashMap;
 use std::fs;
 use std::path::Path;
 
-use chrono::{Datelike, NaiveDate, Weekday};
+use chrono::{DateTime, Datelike, NaiveDate, Utc, Weekday};
+use chrono_tz::Tz;
 
 use crate::error::StreamdError;
 use crate::models::{SpecialDayType, Timesheet};
@@ -30,14 +31,14 @@ pub fn load_repository_config(base_folder: &Path) -> Result<RepositoryConfig, St
     Ok(config)
 }
 
-/// Calculate total hours worked from timecards.
-fn calculate_timecard_hours(timesheet: &Timesheet) -> f64 {
+/// Calculate total minutes worked from timecards.
+fn calculate_timecard_minutes(timesheet: &Timesheet) -> i64 {
     timesheet
         .timecards
         .iter()
         .map(|tc| {
             let duration = tc.to_time - tc.from_time;
-            duration.num_minutes() as f64 / 60.0
+            duration.num_minutes()
         })
         .sum()
 }
@@ -79,31 +80,35 @@ fn determine_day_type(date: NaiveDate, timesheet: Option<&Timesheet>, has_period
     DayType::Missing
 }
 
-/// Calculate expected hours for a day based on period config and day type.
-fn calculate_expected_hours(day_type: DayType, hours_per_day: f64, _date: NaiveDate) -> f64 {
+/// Calculate expected minutes for a day based on period config and day type.
+fn calculate_expected_minutes(day_type: DayType, minutes_per_day: i64) -> i64 {
     match day_type {
-        DayType::Regular => hours_per_day,
-        DayType::SickLeave => hours_per_day,
-        DayType::Vacation => hours_per_day,
-        DayType::Holiday => 0.0,
-        DayType::FlexDay => hours_per_day,
-        DayType::Weekend => 0.0,
-        DayType::Missing => hours_per_day,
-        DayType::OutsidePeriod => 0.0,
+        DayType::Regular => minutes_per_day,
+        DayType::SickLeave => minutes_per_day,
+        DayType::Vacation => minutes_per_day,
+        DayType::Holiday => 0,
+        DayType::FlexDay => minutes_per_day,
+        DayType::Weekend => 0,
+        DayType::Missing => minutes_per_day,
+        DayType::OutsidePeriod => 0,
     }
 }
 
-/// Calculate actual hours for a day based on day type rules.
-fn calculate_actual_hours(day_type: DayType, timecard_hours: f64, expected_hours: f64) -> f64 {
+/// Calculate actual minutes for a day based on day type rules.
+fn calculate_actual_minutes(
+    day_type: DayType,
+    timecard_minutes: i64,
+    expected_minutes: i64,
+) -> i64 {
     match day_type {
-        DayType::Regular => timecard_hours,
-        DayType::SickLeave => expected_hours.max(timecard_hours),
-        DayType::Vacation => expected_hours + timecard_hours,
-        DayType::Holiday => timecard_hours,
-        DayType::FlexDay => 0.0,
-        DayType::Weekend => timecard_hours,
-        DayType::Missing => 0.0,
-        DayType::OutsidePeriod => timecard_hours,
+        DayType::Regular => timecard_minutes,
+        DayType::SickLeave => expected_minutes.max(timecard_minutes),
+        DayType::Vacation => expected_minutes + timecard_minutes,
+        DayType::Holiday => timecard_minutes,
+        DayType::FlexDay => 0,
+        DayType::Weekend => timecard_minutes,
+        DayType::Missing => 0,
+        DayType::OutsidePeriod => timecard_minutes,
     }
 }
 
@@ -111,6 +116,8 @@ fn calculate_actual_hours(day_type: DayType, timecard_hours: f64, expected_hours
 pub fn generate_report(
     timesheets: &[Timesheet],
     config: &TimesheetConfig,
+    now: DateTime<Utc>,
+    tz: Tz,
 ) -> Result<TimesheetReport, StreamdError> {
     if config.periods.is_empty() {
         return Ok(TimesheetReport::new());
@@ -124,14 +131,14 @@ pub fn generate_report(
     let earliest_period_start = config.periods.iter().map(|p| p.start).min().unwrap();
     let latest_period_end = config.periods.iter().map(|p| p.end).max().unwrap();
 
-    // Limit to today
-    let today = chrono::Local::now().date_naive();
+    // Limit to today in the configured timezone
+    let today = now.with_timezone(&tz).date_naive();
     let end_date = latest_period_end.min(today);
 
     // Group by month and generate reports
     let mut month_reports: Vec<MonthReport> = Vec::new();
     let mut all_warnings: Vec<ReportWarning> = Vec::new();
-    let mut cumulative_balance: f64 = 0.0;
+    let mut cumulative_balance: i64 = 0;
 
     // Iterate through all dates in the range
     let mut current_date = earliest_period_start;
@@ -160,29 +167,32 @@ pub fn generate_report(
         // Find if this date falls within a period
         let period = config.find_period(current_date);
         let has_period = period.is_some();
-        let hours_per_day = period.map(|p| p.hours_per_day()).unwrap_or(0.0);
+        let minutes_per_day = period
+            .map(|p| (p.hours_per_day() * 60.0).round() as i64)
+            .unwrap_or(0);
 
         // Get timesheet for this date
         let timesheet = timesheets_by_date.get(&current_date).copied();
-        let timecard_hours = timesheet.map(calculate_timecard_hours).unwrap_or(0.0);
+        let timecard_minutes = timesheet.map(calculate_timecard_minutes).unwrap_or(0);
 
         // Determine day type
         let day_type = determine_day_type(current_date, timesheet, has_period);
 
         // Skip weekends with no work and days outside periods with no work
         let should_include = match day_type {
-            DayType::Weekend => timecard_hours > 0.0,
-            DayType::OutsidePeriod => timecard_hours > 0.0,
+            DayType::Weekend => timecard_minutes > 0,
+            DayType::OutsidePeriod => timecard_minutes > 0,
             _ => has_period, // Only include days within periods
         };
 
         if should_include {
-            // Calculate expected and actual hours
-            let expected_hours = calculate_expected_hours(day_type, hours_per_day, current_date);
-            let actual_hours = calculate_actual_hours(day_type, timecard_hours, expected_hours);
+            // Calculate expected and actual minutes
+            let expected_minutes = calculate_expected_minutes(day_type, minutes_per_day);
+            let actual_minutes =
+                calculate_actual_minutes(day_type, timecard_minutes, expected_minutes);
 
             let mut day_report =
-                DayReport::new(current_date, expected_hours, actual_hours, day_type);
+                DayReport::new(current_date, expected_minutes, actual_minutes, day_type);
 
             // Collect warnings
             let mut day_warnings: Vec<DayWarning> = Vec::new();
@@ -207,9 +217,9 @@ pub fn generate_report(
             }
 
             // Warning: Work outside period
-            if day_type == DayType::OutsidePeriod && timecard_hours > 0.0 {
+            if day_type == DayType::OutsidePeriod && timecard_minutes > 0 {
                 let warning = DayWarning::OutsidePeriod {
-                    hours_worked: timecard_hours,
+                    minutes_worked: timecard_minutes,
                 };
                 day_warnings.push(warning.clone());
                 all_warnings.push(ReportWarning::new(current_date, warning));
@@ -253,7 +263,13 @@ mod tests {
     use super::*;
     use crate::models::Timecard;
     use crate::timesheet::Period;
-    use chrono::NaiveTime;
+    use chrono::{NaiveTime, TimeZone};
+    use chrono_tz::UTC;
+
+    /// A "now" well past all test dates so report limits aren't hit.
+    fn future_now() -> DateTime<Utc> {
+        Utc.with_ymd_and_hms(2030, 1, 1, 0, 0, 0).unwrap()
+    }
 
     fn date(year: i32, month: u32, day: u32) -> NaiveDate {
         NaiveDate::from_ymd_opt(year, month, day).unwrap()
@@ -286,17 +302,17 @@ mod tests {
     }
 
     #[test]
-    fn test_calculate_timecard_hours() {
+    fn test_calculate_timecard_minutes() {
         let ts = make_timesheet(date(2026, 3, 2), vec![(9, 0, 12, 0), (13, 0, 17, 0)]);
-        let hours = calculate_timecard_hours(&ts);
-        assert!((hours - 7.0).abs() < 0.0001);
+        let minutes = calculate_timecard_minutes(&ts);
+        assert_eq!(minutes, 420); // 3h + 4h = 7h = 420 min
     }
 
     #[test]
-    fn test_calculate_timecard_hours_with_minutes() {
+    fn test_calculate_timecard_minutes_with_minutes() {
         let ts = make_timesheet(date(2026, 3, 2), vec![(9, 0, 12, 30), (13, 0, 17, 15)]);
-        let hours = calculate_timecard_hours(&ts);
-        assert!((hours - 7.75).abs() < 0.0001);
+        let minutes = calculate_timecard_minutes(&ts);
+        assert_eq!(minutes, 465); // 3.5h + 4.25h = 7.75h = 465 min
     }
 
     #[test]
@@ -376,61 +392,61 @@ mod tests {
     }
 
     #[test]
-    fn test_expected_hours_regular() {
-        let hours = calculate_expected_hours(DayType::Regular, 7.6, date(2026, 3, 2));
-        assert!((hours - 7.6).abs() < 0.0001);
+    fn test_expected_minutes_regular() {
+        let minutes = calculate_expected_minutes(DayType::Regular, 456); // 7.6h = 456 min
+        assert_eq!(minutes, 456);
     }
 
     #[test]
-    fn test_expected_hours_holiday() {
-        let hours = calculate_expected_hours(DayType::Holiday, 7.6, date(2026, 3, 2));
-        assert!((hours - 0.0).abs() < 0.0001);
+    fn test_expected_minutes_holiday() {
+        let minutes = calculate_expected_minutes(DayType::Holiday, 456);
+        assert_eq!(minutes, 0);
     }
 
     #[test]
-    fn test_expected_hours_weekend() {
-        let hours = calculate_expected_hours(DayType::Weekend, 7.6, date(2026, 3, 7));
-        assert!((hours - 0.0).abs() < 0.0001);
+    fn test_expected_minutes_weekend() {
+        let minutes = calculate_expected_minutes(DayType::Weekend, 456);
+        assert_eq!(minutes, 0);
     }
 
     #[test]
-    fn test_actual_hours_regular() {
-        let hours = calculate_actual_hours(DayType::Regular, 8.0, 7.6);
-        assert!((hours - 8.0).abs() < 0.0001);
+    fn test_actual_minutes_regular() {
+        let minutes = calculate_actual_minutes(DayType::Regular, 480, 456); // 8h, expected 7.6h
+        assert_eq!(minutes, 480);
     }
 
     #[test]
-    fn test_actual_hours_sick_leave_max() {
+    fn test_actual_minutes_sick_leave_max() {
         // Sick leave: max(expected, worked)
-        let hours = calculate_actual_hours(DayType::SickLeave, 3.0, 7.6);
-        assert!((hours - 7.6).abs() < 0.0001);
+        let minutes = calculate_actual_minutes(DayType::SickLeave, 180, 456); // 3h worked, 7.6h expected
+        assert_eq!(minutes, 456);
     }
 
     #[test]
-    fn test_actual_hours_sick_leave_worked_more() {
+    fn test_actual_minutes_sick_leave_worked_more() {
         // Sick leave where worked > expected
-        let hours = calculate_actual_hours(DayType::SickLeave, 9.0, 7.6);
-        assert!((hours - 9.0).abs() < 0.0001);
+        let minutes = calculate_actual_minutes(DayType::SickLeave, 540, 456); // 9h worked, 7.6h expected
+        assert_eq!(minutes, 540);
     }
 
     #[test]
-    fn test_actual_hours_vacation() {
+    fn test_actual_minutes_vacation() {
         // Vacation: expected + worked
-        let hours = calculate_actual_hours(DayType::Vacation, 2.0, 7.6);
-        assert!((hours - 9.6).abs() < 0.0001);
+        let minutes = calculate_actual_minutes(DayType::Vacation, 120, 456); // 2h worked, 7.6h expected
+        assert_eq!(minutes, 576); // 2h + 7.6h = 9.6h = 576 min
     }
 
     #[test]
-    fn test_actual_hours_flex_day() {
+    fn test_actual_minutes_flex_day() {
         // Flex day: always 0
-        let hours = calculate_actual_hours(DayType::FlexDay, 5.0, 7.6);
-        assert!((hours - 0.0).abs() < 0.0001);
+        let minutes = calculate_actual_minutes(DayType::FlexDay, 300, 456);
+        assert_eq!(minutes, 0);
     }
 
     #[test]
     fn test_generate_report_empty_config() {
         let config = TimesheetConfig { periods: vec![] };
-        let report = generate_report(&[], &config).unwrap();
+        let report = generate_report(&[], &config, future_now(), UTC).unwrap();
         assert!(report.months.is_empty());
     }
 
@@ -440,15 +456,15 @@ mod tests {
         let timesheets = vec![make_timesheet(date(2026, 3, 2), vec![(9, 0, 17, 0)])];
         let config = make_config(date(2026, 3, 2), date(2026, 3, 2), 40.0);
 
-        let report = generate_report(&timesheets, &config).unwrap();
+        let report = generate_report(&timesheets, &config, future_now(), UTC).unwrap();
 
         assert_eq!(report.months.len(), 1);
         assert_eq!(report.months[0].days.len(), 1);
 
         let day = &report.months[0].days[0];
         assert_eq!(day.date, date(2026, 3, 2));
-        assert!((day.expected_hours - 8.0).abs() < 0.0001);
-        assert!((day.actual_hours - 8.0).abs() < 0.0001);
+        assert_eq!(day.expected_minutes, 480); // 8h = 480 min
+        assert_eq!(day.actual_minutes, 480);
         assert_eq!(day.day_type, DayType::Regular);
     }
 
@@ -459,7 +475,7 @@ mod tests {
         // March 2 is Monday, March 3 is Tuesday
         let config = make_config(date(2026, 3, 2), date(2026, 3, 3), 40.0);
 
-        let report = generate_report(&timesheets, &config).unwrap();
+        let report = generate_report(&timesheets, &config, future_now(), UTC).unwrap();
 
         assert_eq!(report.months[0].days.len(), 2);
 
@@ -477,7 +493,7 @@ mod tests {
         let timesheets = vec![make_timesheet(date(2026, 3, 2), vec![(9, 0, 17, 0)])];
         let config = make_config(date(2026, 3, 2), date(2026, 3, 8), 40.0);
 
-        let report = generate_report(&timesheets, &config).unwrap();
+        let report = generate_report(&timesheets, &config, future_now(), UTC).unwrap();
 
         // Should only include Mon-Fri (5 days), not Sat-Sun
         let days = &report.months[0].days;
@@ -496,7 +512,7 @@ mod tests {
         ];
         let config = make_config(date(2026, 3, 2), date(2026, 3, 8), 40.0);
 
-        let report = generate_report(&timesheets, &config).unwrap();
+        let report = generate_report(&timesheets, &config, future_now(), UTC).unwrap();
 
         // Should include Saturday
         let has_saturday = report.months[0]
@@ -519,7 +535,7 @@ mod tests {
         };
         let config = make_config(date(2026, 3, 2), date(2026, 3, 2), 40.0);
 
-        let report = generate_report(&[ts], &config).unwrap();
+        let report = generate_report(&[ts], &config, future_now(), UTC).unwrap();
 
         assert!(report.has_warnings());
         assert!(report.months[0].days[0].has_warnings());
@@ -534,9 +550,9 @@ mod tests {
         ];
         let config = make_config(date(2026, 3, 2), date(2026, 3, 3), 40.0);
 
-        let report = generate_report(&timesheets, &config).unwrap();
+        let report = generate_report(&timesheets, &config, future_now(), UTC).unwrap();
 
-        // Balance should be +2h (18h actual - 16h expected)
-        assert!((report.cumulative_balance - 2.0).abs() < 0.0001);
+        // Balance should be +120 min (+2h: 18h actual - 16h expected)
+        assert_eq!(report.cumulative_balance, 120);
     }
 }
diff --git a/src/timesheet/report.rs b/src/timesheet/report.rs
index 8c405d8..92682d6 100644
--- a/src/timesheet/report.rs
+++ b/src/timesheet/report.rs
@@ -48,7 +48,7 @@ pub enum DayWarning {
         second: (NaiveTime, NaiveTime),
     },
     /// Work logged outside any configured period.
-    OutsidePeriod { hours_worked: f64 },
+    OutsidePeriod { minutes_worked: i64 },
 }
 
 impl fmt::Display for DayWarning {
@@ -67,8 +67,12 @@ impl fmt::Display for DayWarning {
                     second.1.format("%H:%M")
                 )
             }
-            DayWarning::OutsidePeriod { hours_worked } => {
-                write!(f, "{:.1}h worked (no period configured)", hours_worked)
+            DayWarning::OutsidePeriod { minutes_worked } => {
+                write!(
+                    f,
+                    "{:.1}h worked (no period configured)",
+                    *minutes_worked as f64 / 60.0
+                )
             }
         }
     }
@@ -78,18 +82,23 @@ impl fmt::Display for DayWarning {
 #[derive(Debug, Clone)]
 pub struct DayReport {
     pub date: NaiveDate,
-    pub expected_hours: f64,
-    pub actual_hours: f64,
+    pub expected_minutes: i64,
+    pub actual_minutes: i64,
     pub day_type: DayType,
     pub warnings: Vec<DayWarning>,
 }
 
 impl DayReport {
-    pub fn new(date: NaiveDate, expected_hours: f64, actual_hours: f64, day_type: DayType) -> Self {
+    pub fn new(
+        date: NaiveDate,
+        expected_minutes: i64,
+        actual_minutes: i64,
+        day_type: DayType,
+    ) -> Self {
         Self {
             date,
-            expected_hours,
-            actual_hours,
+            expected_minutes,
+            actual_minutes,
             day_type,
             warnings: Vec::new(),
         }
@@ -105,9 +114,9 @@ impl DayReport {
         self
     }
 
-    /// Calculate the difference between actual and expected hours.
-    pub fn diff(&self) -> f64 {
-        self.actual_hours - self.expected_hours
+    /// Calculate the difference between actual and expected minutes.
+    pub fn diff(&self) -> i64 {
+        self.actual_minutes - self.expected_minutes
     }
 
     /// Check if this day has any warnings.
@@ -138,18 +147,18 @@ impl MonthReport {
         self
     }
 
-    /// Calculate total expected hours for the month.
-    pub fn total_expected(&self) -> f64 {
-        self.days.iter().map(|d| d.expected_hours).sum()
+    /// Calculate total expected minutes for the month.
+    pub fn total_expected(&self) -> i64 {
+        self.days.iter().map(|d| d.expected_minutes).sum()
     }
 
-    /// Calculate total actual hours for the month.
-    pub fn total_actual(&self) -> f64 {
-        self.days.iter().map(|d| d.actual_hours).sum()
+    /// Calculate total actual minutes for the month.
+    pub fn total_actual(&self) -> i64 {
+        self.days.iter().map(|d| d.actual_minutes).sum()
     }
 
     /// Calculate the difference for the month.
-    pub fn diff(&self) -> f64 {
+    pub fn diff(&self) -> i64 {
         self.total_actual() - self.total_expected()
     }
 
@@ -178,7 +187,7 @@ impl ReportWarning {
 #[derive(Debug, Clone)]
 pub struct TimesheetReport {
     pub months: Vec<MonthReport>,
-    pub cumulative_balance: f64,
+    pub cumulative_balance: i64,
     pub warnings: Vec<ReportWarning>,
 }
 
@@ -186,7 +195,7 @@ impl TimesheetReport {
     pub fn new() -> Self {
         Self {
             months: Vec::new(),
-            cumulative_balance: 0.0,
+            cumulative_balance: 0,
             warnings: Vec::new(),
         }
     }
@@ -196,7 +205,7 @@ impl TimesheetReport {
         self
     }
 
-    pub fn with_cumulative_balance(mut self, balance: f64) -> Self {
+    pub fn with_cumulative_balance(mut self, balance: i64) -> Self {
         self.cumulative_balance = balance;
         self
     }
@@ -232,27 +241,30 @@ mod tests {
 
     #[test]
     fn test_day_report_diff() {
-        let report = DayReport::new(date(2026, 3, 2), 7.6, 8.2, DayType::Regular);
-        assert!((report.diff() - 0.6).abs() < 0.0001);
+        // 7.6h = 456 min, 8.2h = 492 min, diff = 36 min
+        let report = DayReport::new(date(2026, 3, 2), 456, 492, DayType::Regular);
+        assert_eq!(report.diff(), 36);
     }
 
     #[test]
     fn test_day_report_negative_diff() {
-        let report = DayReport::new(date(2026, 3, 2), 7.6, 6.0, DayType::Regular);
-        assert!((report.diff() - (-1.6)).abs() < 0.0001);
+        // 7.6h = 456 min, 6.0h = 360 min, diff = -96 min
+        let report = DayReport::new(date(2026, 3, 2), 456, 360, DayType::Regular);
+        assert_eq!(report.diff(), -96);
     }
 
     #[test]
     fn test_month_report_totals() {
+        // 7.6h = 456 min, 8.2h = 492 min, 6.0h = 360 min
         let month = MonthReport::new(2026, 3).with_days(vec![
-            DayReport::new(date(2026, 3, 2), 7.6, 8.2, DayType::Regular),
-            DayReport::new(date(2026, 3, 3), 7.6, 7.6, DayType::Regular),
-            DayReport::new(date(2026, 3, 4), 7.6, 6.0, DayType::Regular),
+            DayReport::new(date(2026, 3, 2), 456, 492, DayType::Regular),
+            DayReport::new(date(2026, 3, 3), 456, 456, DayType::Regular),
+            DayReport::new(date(2026, 3, 4), 456, 360, DayType::Regular),
         ]);
 
-        assert!((month.total_expected() - 22.8).abs() < 0.0001);
-        assert!((month.total_actual() - 21.8).abs() < 0.0001);
-        assert!((month.diff() - (-1.0)).abs() < 0.0001);
+        assert_eq!(month.total_expected(), 1368); // 456 * 3
+        assert_eq!(month.total_actual(), 1308); // 492 + 456 + 360
+        assert_eq!(month.diff(), -60); // -1 hour
     }
 
     #[test]
@@ -281,13 +293,15 @@ mod tests {
 
     #[test]
     fn test_day_warning_outside_period_display() {
-        let warning = DayWarning::OutsidePeriod { hours_worked: 3.5 };
+        let warning = DayWarning::OutsidePeriod {
+            minutes_worked: 210,
+        }; // 3.5h
         assert_eq!(warning.to_string(), "3.5h worked (no period configured)");
     }
 
     #[test]
     fn test_day_report_with_warnings() {
-        let report = DayReport::new(date(2026, 3, 2), 7.6, 8.2, DayType::Regular).with_warning(
+        let report = DayReport::new(date(2026, 3, 2), 456, 492, DayType::Regular).with_warning(
             DayWarning::OverlappingTimecards {
                 first: (time(9, 0), time(12, 30)),
                 second: (time(12, 0), time(13, 0)),
diff --git a/zed-extension/Cargo.lock b/zed-extension/Cargo.lock
new file mode 100644
index 0000000..f137907
--- /dev/null
+++ b/zed-extension/Cargo.lock
@@ -0,0 +1,817 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
+[[package]]
+name = "auditable-serde"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7bf8143dfc3c0258df908843e169b5cc5fcf76c7718bd66135ef4a9cd558c5"
+dependencies = [
+ "semver",
+ "serde",
+ "serde_json",
+ "topological-sort",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.17.0",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
+[[package]]
+name = "memchr"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "spdx"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e17e880bafaeb362a7b751ec46bdc5b61445a188f80e0606e68167cd540fa3"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "streamd-zed"
+version = "0.0.1"
+dependencies = [
+ "zed_extension_api",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "topological-sort"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "wasm-encoder"
+version = "0.227.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80bb72f02e7fbf07183443b27b0f3d4144abf8c114189f2e088ed95b696a7822"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.227.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce1ef0faabbbba6674e97a56bee857ccddf942785a336c8b47b42373c922a91d"
+dependencies = [
+ "anyhow",
+ "auditable-serde",
+ "flate2",
+ "indexmap",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "spdx",
+ "url",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.227.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10fb6648689b3929d56bbc7eb1acf70c9a42a29eb5358c67c10f54dbd5d695de"
+dependencies = [
+ "wit-bindgen-rt",
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92fa781d4f2ff6d3f27f3cc9b74a73327b31ca0dc4a3ef25a0ce2983e0e5af9b"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4db52a11d4dfb0a59f194c064055794ee6564eb1ced88c25da2cf76e50c5621"
+dependencies = [
+ "bitflags",
+ "futures",
+ "once_cell",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d0809dc5ba19e2e98661bf32fc0addc5a3ca5bf3a6a7083aa6ba484085ff3ce"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad19eec017904e04c60719592a803ee5da76cb51c81e3f6fbf9457f59db49799"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.227.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "635c3adc595422cbf2341a17fb73a319669cc8d33deed3a48368a841df86b676"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.227.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddf445ed5157046e4baf56f9138c124a0824d4d1657e7204d71886ad8ce2fc11"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zed_extension_api"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0729d50b4ca0a7e28e590bbe32e3ca0194d97ef654961451a424c661a366fca0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "wit-bindgen",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/zed-extension/Cargo.toml b/zed-extension/Cargo.toml
new file mode 100644
index 0000000..881887a
--- /dev/null
+++ b/zed-extension/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "streamd-zed"
+version = "0.0.1"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.component]
+package = "zed:extension"
+
+[dependencies]
+zed_extension_api = "0.7"
diff --git a/zed-extension/extension.toml b/zed-extension/extension.toml
new file mode 100644
index 0000000..e2e91f5
--- /dev/null
+++ b/zed-extension/extension.toml
@@ -0,0 +1,11 @@
+id = "streamd"
+name = "Streamd"
+version = "0.0.1"
+schema_version = 1
+authors = ["Konstantin Fickel"]
+description = "Streamd LSP support for Zed editor"
+repository = "https://git.konstantinfickel.de/kfickel/streamd"
+
+[language_servers.streamd]
+name = "Streamd LSP"
+languages = ["Markdown"]
diff --git a/zed-extension/src/lib.rs b/zed-extension/src/lib.rs
new file mode 100644
index 0000000..155d838
--- /dev/null
+++ b/zed-extension/src/lib.rs
@@ -0,0 +1,32 @@
+use zed_extension_api::{self as zed, Command, LanguageServerId, Os, Result, Worktree, current_platform};
+
+struct StreamdExtension;
+
+impl zed::Extension for StreamdExtension {
+    fn new() -> Self {
+        StreamdExtension
+    }
+
+    fn language_server_command(
+        &mut self,
+        _language_server_id: &LanguageServerId,
+        _worktree: &Worktree,
+    ) -> Result<Command> {
+        let (os, _) = current_platform();
+        if os == Os::Windows {
+            Ok(Command {
+                command: "wsl".into(),
+                args: vec!["streamd".into(), "lsp".into()],
+                env: vec![],
+            })
+        } else {
+            Ok(Command {
+                command: "streamd".into(),
+                args: vec!["lsp".into()],
+                env: vec![],
+            })
+        }
+    }
+}
+
+zed::register_extension!(StreamdExtension);