sync from internal repository

Author: lostmygithubaccount

AGENTS.md

@@ -21,19 +21,28 @@ bin/bump-version   # Bump version (--patch, --minor (default), --major)
 ## Architecture
 
 ```
-crates/bookmarks-cli/     # Core Rust crate (dkdc-bookmarks on crates.io, bookmarks binary)
-  src/lib.rs              # Library root
+crates/bookmarks-core/    # Core library (config, storage, open, strings)
+  src/lib.rs              # Library root — re-exports Config, Storage, TomlStorage
+  src/config.rs           # Config struct, validation, parsing, editing
+  src/storage.rs          # Storage trait (backend-agnostic)
+  src/toml_storage.rs     # TOML file storage implementation
+  src/open.rs             # Link resolution (alias → link → URI) and opening
+  src/strings.rs          # Shared string constants and error templates
+crates/bookmarks-app/     # iced desktop app
+  src/lib.rs              # Desktop UI (depends on bookmarks-core)
+  assets/icon.png         # App window icon
+crates/bookmarks-webapp/  # Axum HTMX webapp (port 1414)
+  src/lib.rs              # Web UI (depends on bookmarks-core)
+crates/bookmarks-cli/     # CLI binary (dkdc-bookmarks on crates.io)
   src/main.rs             # Binary entry point
+  src/lib.rs              # Re-exports core + run_cli
   src/cli.rs              # CLI (clap) with -f, --app, --webapp flags
-  src/config.rs           # Config loading/saving
-  src/open.rs             # Link resolution (alias → link → URI)
-  src/app.rs              # iced desktop app (behind `app` feature flag)
-  src/webapp.rs           # Axum HTMX webapp on port 1414 (behind `webapp` feature flag)
-  assets/icon.png         # App window icon
 crates/bookmarks-py/      # PyO3 bindings (cdylib)
 py/bookmarks/             # Python wrapper + type stubs (core.pyi, py.typed)
 ```
 
+Feature flags on `bookmarks-cli`: `app` (pulls in bookmarks-app), `webapp` (pulls in bookmarks-webapp).
+
 Config resolution: `-f` flag > `./bookmarks.toml` (cwd) > `~/.config/bookmarks/bookmarks.toml` (global).
 
 Config structure: aliases map to links, links map to URIs, groups expand to multiple aliases/links.

Cargo.lock

@@ -1,6 +1,11 @@
 [workspace]
 resolver = "2"
-members = ["crates/bookmarks-cli"]
+members = [
+    "crates/bookmarks-core",
+    "crates/bookmarks-app",
+    "crates/bookmarks-webapp",
+    "crates/bookmarks-cli",
+]
 exclude = ["crates/bookmarks-py"]
 
 [profile.release]

Cargo.toml

@@ -1,4 +1,4 @@
-Copyright 2025 Cody
+Copyright 2026 Cody
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

LICENSE

@@ -3,6 +3,6 @@ set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
 echo "Building bookmarks..."
-cargo build --manifest-path crates/bookmarks-cli/Cargo.toml --features app,webapp "$@"
+cargo build --features app,webapp "$@"
 
 echo "Rust build complete!"

bin/build-rs

@@ -40,6 +40,9 @@ BUMP="${BUMP:-minor}"
 
 TOML_FILES=(
   pyproject.toml
+  crates/bookmarks-core/Cargo.toml
+  crates/bookmarks-app/Cargo.toml
+  crates/bookmarks-webapp/Cargo.toml
   crates/bookmarks-cli/Cargo.toml
   crates/bookmarks-py/Cargo.toml
 )
@@ -79,6 +82,17 @@ for f in "${TOML_FILES[@]}"; do
   echo "  updated $f"
 done
 
+# update inter-crate dependency versions
+for f in crates/bookmarks-app/Cargo.toml crates/bookmarks-webapp/Cargo.toml crates/bookmarks-cli/Cargo.toml; do
+  sed -i '' "s/dkdc-bookmarks-core = { version = \"$CURRENT\"/dkdc-bookmarks-core = { version = \"$NEW\"/" "$f"
+  echo "  updated dep version in $f"
+done
+for f in crates/bookmarks-cli/Cargo.toml; do
+  sed -i '' "s/dkdc-bookmarks-app = { version = \"$CURRENT\"/dkdc-bookmarks-app = { version = \"$NEW\"/" "$f"
+  sed -i '' "s/dkdc-bookmarks-webapp = { version = \"$CURRENT\"/dkdc-bookmarks-webapp = { version = \"$NEW\"/" "$f"
+  echo "  updated dep versions in $f"
+done
+
 # ---------- regenerate lock files ----------
 
 echo "Regenerating lock files..."

bin/bump-version

@@ -3,12 +3,12 @@ set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
 echo "Checking Rust formatting..."
-cargo fmt --manifest-path crates/bookmarks-cli/Cargo.toml -- --check
+cargo fmt -- --check
 
 echo "Running clippy..."
-cargo clippy --manifest-path crates/bookmarks-cli/Cargo.toml --features app,webapp -- -D warnings
+cargo clippy --features app,webapp -- -D warnings
 
 echo "Running Rust tests..."
-cargo test --manifest-path crates/bookmarks-cli/Cargo.toml --features app,webapp
+cargo test --features app,webapp
 
 echo "Rust checks passed!"

bin/check-rs

@@ -3,6 +3,6 @@ set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
 echo "Installing bookmarks CLI via uv..."
-uv tool install .
+uv tool install . --force
 
 echo "Python install complete!"

bin/install-py

@@ -2,7 +2,16 @@
 set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
+echo "Publishing dkdc-bookmarks-core to crates.io..."
+cargo publish -p dkdc-bookmarks-core
+
+echo "Publishing dkdc-bookmarks-app to crates.io..."
+cargo publish -p dkdc-bookmarks-app
+
+echo "Publishing dkdc-bookmarks-webapp to crates.io..."
+cargo publish -p dkdc-bookmarks-webapp
+
 echo "Publishing dkdc-bookmarks to crates.io..."
-cargo publish --manifest-path crates/bookmarks-cli/Cargo.toml
+cargo publish -p dkdc-bookmarks
 
 echo "Published!"

bin/release-crates-io

@@ -0,0 +1,19 @@
+[package]
+name = "dkdc-bookmarks-app"
+version = "0.2.0"
+edition = "2024"
+authors = ["Cody <cody@dkdc.dev>"]
+description = "Desktop app for bookmarks (iced)"
+repository = "https://github.com/lostmygithubaccount/bookmarks"
+license = "MIT"
+readme = "README.md"
+
+[lib]
+name = "bookmarks_app"
+path = "src/lib.rs"
+
+[dependencies]
+dkdc-bookmarks-core = { version = "0.2.0", path = "../bookmarks-core" }
+iced = { version = "0.14", features = ["tokio", "svg"] }
+open = "5"
+png = "0.17"