tasko 0.0.1__tar.gz → 0.0.3__tar.gz

{tasko-0.0.1 → tasko-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasko
-Version: 0.0.1
+Version: 0.0.3
 Summary: Personal task manager
 Author: pybass
 License-Expression: MIT
@@ -17,30 +17,20 @@ Description-Content-Type: text/markdown
 
 # tasko
 
-A personal task manager: a fast Textual TUI over local SQLite, with a minimal
-CLI for quick capture.
+A personal task manager: a fast Textual TUI over local SQLite.
 
 ## Usage
 
-`tasko` with no arguments launches the TUI — the primary interface, where all
-task and project management lives.
-
-The CLI is deliberately minimal (see
-[docs/architecture.md](docs/architecture.md) for why):
-
-```sh
-tasko add "fix nginx" -p infra   # quick capture from the shell
-tasko list                       # a quick look without launching the TUI
-```
+`tasko` launches the TUI — the only interface, where all task and project
+management lives.
 
 Data is a single SQLite file under `$XDG_DATA_HOME/tasko` (default
-`~/.local/share/tasko`); override the directory with `--data-dir` or the
-`TASKO_DATA_DIR` env var.
+`~/.local/share/tasko`); override the directory with `--data-dir`.
 
 ## Design
 
-- [docs/architecture.md](docs/architecture.md) — layering (`core/` + `cli/` +
-  `tui/`), the TUI-first UI strategy, tool choices.
+- [docs/architecture.md](docs/architecture.md) — layering (`core/` + `tui/`),
+  the TUI-only UI strategy, tool choices.
 - [docs/data-model.md](docs/data-model.md) — entities, the full SQL schema,
   and the reasoning behind it.
 - [docs/non-goals.md](docs/non-goals.md) — features deliberately not built,

tasko-0.0.3/README.md

@@ -0,0 +1,24 @@
+# tasko
+
+A personal task manager: a fast Textual TUI over local SQLite.
+
+## Usage
+
+`tasko` launches the TUI — the only interface, where all task and project
+management lives.
+
+Data is a single SQLite file under `$XDG_DATA_HOME/tasko` (default
+`~/.local/share/tasko`); override the directory with `--data-dir`.
+
+## Design
+
+- [docs/architecture.md](docs/architecture.md) — layering (`core/` + `tui/`),
+  the TUI-only UI strategy, tool choices.
+- [docs/data-model.md](docs/data-model.md) — entities, the full SQL schema,
+  and the reasoning behind it.
+- [docs/non-goals.md](docs/non-goals.md) — features deliberately not built,
+  and why.
+
+## License
+
+[MIT](LICENSE)

tasko-0.0.3/pyproject.toml

@@ -0,0 +1,121 @@
+[project]
+name = "tasko"
+version = "0.0.3"
+description = "Personal task manager"
+readme = "README.md"
+license = "MIT"
+license-files = ["LICENSE"]
+requires-python = ">=3.14"
+classifiers = [
+    "Environment :: Console",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Office/Business",
+]
+dependencies = [
+    "rich~=15.0",
+    "textual~=8.2",
+]
+
+[[project.authors]]
+name = "pybass"
+
+[project.urls]
+Repository = "https://github.com/pybass/tasko"
+Issues = "https://github.com/pybass/tasko/issues"
+
+[project.scripts]
+tasko = "tasko.main:main"
+
+[build-system]
+requires = ["uv_build>=0.11,<0.13"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "ruff~=0.16.2",
+    "mypy~=2.3.0",
+    "pytest~=9.1.1",
+    "pytest-asyncio~=1.4.0",
+    "pytest-cov~=7.1.0",
+    "pytest-xdist~=3.8.0",
+    "pip-audit~=2.10.1",
+    "deptry~=0.25.1",
+    "pre-commit~=4.6.2",
+]
+
+[tool.ruff]
+line-length = 130
+target-version = "py314"
+
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+    "COM812",
+    "D203",
+    "D213",
+    "A005",
+    "PLC0414",
+    "RET503",
+    "G004",
+    "PT001",
+    "PT006",
+    "PT007",
+    "PT023",
+    "FIX",
+    "FBT",
+    "EM",
+    "CPY",
+    "TC",
+    "TRY003",
+    "C901",
+    "PLR0911",
+    "PLR0912",
+    "PLR0913",
+    "PLR2004",
+    "ASYNC109",
+]
+
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = ["pydantic.field_validator"]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**/*.py" = [
+    "ANN",
+    "S",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+docstring-code-format = true
+
+[tool.mypy]
+python_version = "3.14"
+strict = true
+
+[[tool.mypy.overrides]]
+module = "tests.*"
+disallow_untyped_defs = false
+disallow_incomplete_defs = false
+disallow_untyped_decorators = false
+disallow_untyped_calls = false
+warn_unused_ignores = false
+
+[tool.codespell]
+skip = "uv.lock,.git,.venv,.mypy_cache,.ruff_cache,.pytest_cache,htmlcov"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "-ra --strict-markers --strict-config --import-mode=importlib"
+xfail_strict = true
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+filterwarnings = ["error"]
+
+[tool.coverage.run]
+branch = true
+source = ["src"]
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = false

tasko-0.0.1/pyproject.toml → tasko-0.0.3/pyproject.toml.orig

@@ -3,7 +3,7 @@
 # ============================================================================
 [project]
 name = "tasko"
-version = "0.0.1"
+version = "0.0.3"
 description = "Personal task manager"
 readme = "README.md"
 authors = [{ name = "pybass" }]
@@ -25,7 +25,7 @@ Repository = "https://github.com/pybass/tasko"
 Issues = "https://github.com/pybass/tasko/issues"
 
 [project.scripts]
-tasko = "tasko.cli.main:main"
+tasko = "tasko.main:main"
 
 
 # ============================================================================
@@ -35,7 +35,7 @@ tasko = "tasko.cli.main:main"
 # uv.lock does not cover, so an open-ended requirement would let the same tag build differently
 # over time.
 [build-system]
-requires = ["uv_build>=0.11,<0.12"]
+requires = ["uv_build>=0.11,<0.13"]
 build-backend = "uv_build"
 
 
@@ -45,10 +45,9 @@ build-backend = "uv_build"
 [dependency-groups]
 dev = [
     # Linting & formatting
-    "ruff~=0.15.22",
+    "ruff~=0.16.2",
     # Type checking
     "mypy~=2.3.0",
-    "ty~=0.0.60",
     # Testing & coverage
     "pytest~=9.1.1",
     "pytest-asyncio~=1.4.0",
@@ -59,7 +58,7 @@ dev = [
     # Dependency hygiene — imports vs declared deps
     "deptry~=0.25.1",
     # Git pre-commit hooks
-    "pre-commit~=4.6.0",
+    "pre-commit~=4.6.2",
 ]
 
 
@@ -75,7 +74,6 @@ select = ["ALL"]
 ignore = [
     # --- Ecosystem / tool conflicts ---
     "COM812",   # trailing-comma — handled by ruff formatter, must be off here
-    "ISC001",   # single-line-implicit-string-concat — conflicts with ruff formatter
     "D203",     # one-blank-line-before-class — conflicts with D211
     "D213",     # multi-line-summary-second-line — conflicts with D212
 
@@ -95,6 +93,8 @@ ignore = [
     "FIX",      # flake8-fixme — TODOs are fine; tracked elsewhere
     "FBT",      # boolean-trap — too restrictive
     "EM",       # error-message strings — inline messages accepted
+    "CPY",      # flake8-copyright — no copyright headers: internal-only code, ships no license by design (README)
+    "TC",       # flake8-type-checking — TYPE_CHECKING blocks save import time we don't care about; cost: import noise + broken runtime annotations (pydantic)
     "TRY003",   # raise-vanilla-args — too noisy
     "C901",     # complex-structure — judgment call
 
@@ -104,14 +104,13 @@ ignore = [
     "PLR0913",  # too-many-arguments
     "PLR2004",  # magic-value-comparison
 
-    # --- TODO metadata (optional) ---
-    "TD002",    # missing-todo-author
-    "TD003",    # missing-todo-link
-
     # --- Async edge case ---
     "ASYNC109", # async-function-with-timeout — debatable, off
 ]
 
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = ["pydantic.field_validator"]  # N805: @field_validator implies classmethod — cls is correct without a stacked @classmethod
+
 [tool.ruff.lint.per-file-ignores]
 "tests/**/*.py" = ["ANN", "S"]  # tests skip type-annotation (ANN) and assert/security (S) rules
 
@@ -122,7 +121,7 @@ docstring-code-format = true  # keep code examples in docstrings formatted like
 
 
 # ============================================================================
-#  Type checking — mypy (strict) + ty
+#  Type checking — mypy (strict)
 # ============================================================================
 [tool.mypy]
 python_version = "3.14"
@@ -137,16 +136,6 @@ disallow_untyped_decorators = false
 disallow_untyped_calls = false
 warn_unused_ignores = false
 
-[tool.ty.environment]
-python-version = "3.14"
-
-# Same intent as the mypy test override: silence test-only false positives.
-[[tool.ty.overrides]]
-include = ["tests/**"]
-[tool.ty.overrides.rules]
-possibly-missing-attribute = "ignore"
-invalid-assignment = "ignore"
-
 
 # ============================================================================
 #  Spell checking — codespell

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/core/core.py

@@ -2,15 +2,12 @@
 
 import sqlite3
 import time
-from typing import TYPE_CHECKING
+from pathlib import Path
 
 from tasko.core.errors import AppError
 from tasko.core.migrations import MIGRATIONS
 from tasko.core.models import AppState, Priority, Project, Status, Task
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
 
 def _now() -> int:
     """Return the current unix time in whole seconds."""
@@ -20,13 +17,15 @@ def _now() -> int:
 class Core:
     """The application without UI: owns the SQLite connection and every operation on it.
 
-    Adapters (CLI, TUI) call these methods and show AppError messages to the user.
+    Adapters (the TUI) call these methods and show AppError messages to the user.
     """
 
     def __init__(self, db_path: Path) -> None:
         """Open the database (creating the file and its directory if needed) and migrate it."""
         db_path.parent.mkdir(parents=True, exist_ok=True)
-        self._conn = sqlite3.connect(db_path)  # single shared connection
+        # autocommit: every write is a single self-committing statement; anything that ever
+        # needs multi-statement atomicity must use explicit BEGIN/COMMIT (as _migrate does).
+        self._conn = sqlite3.connect(db_path, autocommit=True)  # single shared connection
         self._conn.row_factory = sqlite3.Row
         self._conn.execute("PRAGMA journal_mode = WAL")
         self._conn.execute("PRAGMA busy_timeout = 5000")
@@ -68,7 +67,6 @@ class Core:
             ).fetchone()
         except sqlite3.IntegrityError as e:  # foreign key: no such project
             raise AppError(f"Project #{project_id} not found.") from e
-        self._conn.commit()
         return self.get_task(int(row["id"]))
 
     def get_task(self, task_id: int) -> Task:
@@ -81,28 +79,24 @@ class Core:
             raise AppError(f"Task #{task_id} not found.")
         return Task.from_row(row)
 
-    def list_tasks(
-        self, *, project_id: int | None = None, status: Status | None = None, include_done: bool = False
-    ) -> list[Task]:
-        """Return tasks in working order, optionally filtered by project id and/or status; a None filter means "any".
+    def list_tasks(self, *, project_id: int | None = None, include_done: bool = False) -> list[Task]:
+        """Return tasks in working order, optionally filtered to one project; done tasks appear only with include_done.
 
         Working order: doing first, then by priority, then recently updated; done tasks
-        sink to the bottom (recently finished first, since done_at == updated_at). They
-        are excluded by default; asking for status DONE explicitly implies them.
+        sink to the bottom (recently finished first, since done_at == updated_at).
         """
         rows = self._conn.execute(
             """
             SELECT t.*, p.name AS project_name
             FROM tasks t JOIN projects p ON p.id = t.project_id
             WHERE (:project_id IS NULL OR t.project_id = :project_id)
-              AND (:status IS NULL OR t.status = :status)
               AND (:include_done OR t.status != 'done')
             ORDER BY t.status = 'done',
                      t.status = 'doing' DESC,
                      CASE t.priority WHEN 'high' THEN 0 WHEN 'medium' THEN 1 ELSE 2 END,
                      t.updated_at DESC
             """,
-            {"project_id": project_id, "status": status, "include_done": include_done or status is Status.DONE},
+            {"project_id": project_id, "include_done": include_done},
         ).fetchall()
         return [Task.from_row(row) for row in rows]
 
@@ -121,7 +115,6 @@ class Core:
             "UPDATE tasks SET status = :status, done_at = :done_at, updated_at = :now WHERE id = :id",
             {"status": status, "done_at": done_at, "now": now, "id": task_id},
         )
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Task #{task_id} not found.")
 
@@ -134,7 +127,6 @@ class Core:
             "UPDATE tasks SET title = :title, updated_at = :now WHERE id = :id",
             {"title": title, "now": _now(), "id": task_id},
         )
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Task #{task_id} not found.")
 
@@ -146,7 +138,6 @@ class Core:
             "UPDATE tasks SET body = :body, updated_at = :now WHERE id = :id",
             {"body": body, "now": _now(), "id": task_id},
         )
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Task #{task_id} not found.")
 
@@ -156,7 +147,6 @@ class Core:
             "UPDATE tasks SET priority = :priority, updated_at = :now WHERE id = :id",
             {"priority": priority, "now": _now(), "id": task_id},
         )
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Task #{task_id} not found.")
 
@@ -169,14 +159,12 @@ class Core:
             )
         except sqlite3.IntegrityError as e:  # foreign key: no such project
             raise AppError(f"Project #{project_id} not found.") from e
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Task #{task_id} not found.")
 
     def delete_task(self, task_id: int) -> None:
         """Delete a task permanently."""
         cur = self._conn.execute("DELETE FROM tasks WHERE id = ?", (task_id,))
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Task #{task_id} not found.")
 
@@ -194,26 +182,16 @@ class Core:
             raise AppError(f"Project #{project_id} not found.")
         return Project(**dict(row))
 
-    def get_project_by_name(self, name: str) -> Project:
-        """Return a project by its unique name; raises AppError when it does not exist.
-
-        For adapters whose input addresses projects by name (the CLI); everything else uses ids.
-        """
-        row = self._conn.execute("SELECT id, name FROM projects WHERE name = ?", (name,)).fetchone()
-        if row is None:
-            raise AppError(f"Project '{name}' not found.")
-        return Project(**dict(row))
-
-    def create_project(self, name: str) -> None:
-        """Create a project with a unique non-empty name."""
+    def create_project(self, name: str) -> Project:
+        """Create a project with a unique non-empty name and return it."""
         name = name.strip()
         if not name:
             raise AppError("Project name cannot be empty.")
         try:
-            self._conn.execute("INSERT INTO projects (name) VALUES (?)", (name,))
+            row = self._conn.execute("INSERT INTO projects (name) VALUES (?) RETURNING id", (name,)).fetchone()
         except sqlite3.IntegrityError as e:
             raise AppError(f"Project '{name}' already exists.") from e
-        self._conn.commit()
+        return Project(id=row["id"], name=name)
 
     def rename_project(self, project_id: int, new_name: str) -> None:
         """Rename a project; the new name must be unique and non-empty."""
@@ -224,7 +202,6 @@ class Core:
             cur = self._conn.execute("UPDATE projects SET name = ? WHERE id = ?", (new_name, project_id))
         except sqlite3.IntegrityError as e:
             raise AppError(f"Project '{new_name}' already exists.") from e
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Project #{project_id} not found.")
 
@@ -233,7 +210,6 @@ class Core:
         if project_id == self.app_state().default_project_id:
             raise AppError("Cannot delete the default project; make another project the default first.")
         cur = self._conn.execute("DELETE FROM projects WHERE id = ?", (project_id,))
-        self._conn.commit()
         if cur.rowcount == 0:
             raise AppError(f"Project #{project_id} not found.")
 
@@ -251,12 +227,10 @@ class Core:
     def set_selected_project(self, project_id: int | None) -> None:
         """Set the persisted project filter; None means all projects."""
         self._conn.execute("UPDATE app_state SET selected_project_id = ? WHERE id = 1", (project_id,))
-        self._conn.commit()
 
     def set_theme(self, theme: str) -> None:
         """Persist the UI theme choice."""
         self._conn.execute("UPDATE app_state SET theme = ? WHERE id = 1", (theme,))
-        self._conn.commit()
 
     def set_default_project(self, project_id: int) -> None:
         """Make the given project the default target for quick capture."""
@@ -264,4 +238,3 @@ class Core:
             self._conn.execute("UPDATE app_state SET default_project_id = ? WHERE id = 1", (project_id,))
         except sqlite3.IntegrityError as e:  # foreign key: no such project
             raise AppError(f"Project #{project_id} not found.") from e
-        self._conn.commit()

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/core/migrations.py

@@ -1,7 +1,7 @@
 """Database schema migrations, applied in order by Core."""
 
-# Schema v1 (see docs/data-model.md). IF NOT EXISTS / OR IGNORE predate the atomic runner
-# in Core._migrate and are harmless; new migrations don't need to be rerun-safe.
+# Schema v1 (see docs/data-model.md). IF NOT EXISTS / OR IGNORE make a rerun a no-op;
+# with the atomic runner in Core._migrate, new migrations don't need to be rerun-safe.
 _MIGRATION_V1 = """
 CREATE TABLE IF NOT EXISTS projects (
     id   INTEGER PRIMARY KEY AUTOINCREMENT,

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/core/models.py

@@ -1,11 +1,9 @@
 """Domain models: projects, tasks, and their enums."""
 
+import sqlite3
 from dataclasses import dataclass
 from enum import StrEnum
-from typing import TYPE_CHECKING, Any, Self
-
-if TYPE_CHECKING:
-    import sqlite3
+from typing import Any, Self
 
 
 class Status(StrEnum):

tasko-0.0.3/src/tasko/main.py

@@ -0,0 +1,33 @@
+"""Entry point: resolve the data directory, open the database, run the TUI."""
+
+import argparse
+import os
+import sys
+from importlib.metadata import version
+from pathlib import Path
+
+from tasko.core.core import Core
+from tasko.core.errors import AppError
+from tasko.tui.app import TaskoApp
+
+
+def main() -> None:
+    """Launch the TUI against the resolved database."""
+    parser = argparse.ArgumentParser(prog="tasko", description="Personal task manager.")
+    parser.add_argument("--version", action="version", version=version("tasko"))
+    parser.add_argument("--data-dir", type=Path, help="data directory (default: XDG data dir)")
+    args = parser.parse_args()
+    core = Core(_resolve_db_path(args.data_dir))
+    try:
+        TaskoApp(core).run()
+    except AppError as e:
+        sys.exit(f"error: {e}")
+    finally:
+        core.close()
+
+
+def _resolve_db_path(data_dir: Path | None) -> Path:
+    """Database file path; without an explicit directory the XDG data dir is used."""
+    if data_dir is None:
+        data_dir = Path(os.environ.get("XDG_DATA_HOME") or Path.home() / ".local" / "share") / "tasko"
+    return data_dir / "tasko.db"

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/tui/app.py

@@ -1,19 +1,16 @@
 """Textual application: a thin shell that mounts the main screen."""
 
-from typing import TYPE_CHECKING, ClassVar
+from typing import ClassVar
 
 from textual.app import App
+from textual.binding import BindingType
 
+from tasko.core.core import Core
 from tasko.tui.screens.dialogs import HelpDialog
 from tasko.tui.screens.projects import ProjectsScreen
 from tasko.tui.screens.task_detail import TaskDetailScreen
 from tasko.tui.screens.task_list import TaskListScreen
 
-if TYPE_CHECKING:
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
 
 class TaskoApp(App[None]):
     """Interactive TUI for managing tasks."""
@@ -42,7 +39,7 @@ class TaskoApp(App[None]):
     def __init__(self, core: Core) -> None:
         """Wire the app to the shared core."""
         super().__init__()
-        self._core = core  # application core, shared with the CLI
+        self._core = core  # application core, built by main() and owned by it
 
     def action_help(self) -> None:
         """Show the current screen's keys; screens opt in by defining a HELP_KEYS attribute."""
@@ -64,8 +61,9 @@ class TaskoApp(App[None]):
     def on_app_focus(self) -> None:
         """Reload the visible screen when the terminal regains focus.
 
-        This closes the quick-capture loop: `tasko add` from a shell, alt-tab back, the
-        list is fresh. Skipped while a dialog is on top — reloading under a modal could
+        The database can change under a running instance — a second tasko in another
+        terminal — so alt-tabbing back shows a fresh list rather than a stale one.
+        Skipped while a dialog is on top — reloading under a modal could
         fight the interaction in progress (r covers that case), and TaskDetailScreen.reload
         pops the top screen when its task is gone, which must never hit a dialog.
         """

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/tui/screens/dialogs.py

@@ -1,11 +1,13 @@
-"""Reusable modal dialogs: one-line text input, yes/no confirmation, option picking, and key help."""
+"""Reusable modal dialogs: one-line and multi-line text input, yes/no confirmation, option picking, and key help."""
 
+from collections.abc import Sequence
 from importlib.metadata import version
-from typing import TYPE_CHECKING, ClassVar, Final
+from typing import ClassVar, Final
 
 from rich.style import Style
 from rich.table import Table
 from rich.text import Text
+from textual.app import ComposeResult
 from textual.binding import Binding, BindingType
 from textual.containers import Vertical
 from textual.fuzzy import FuzzySearch
@@ -13,19 +15,11 @@ from textual.screen import ModalScreen
 from textual.widgets import Input, Label, OptionList, Static, TextArea
 from textual.widgets.option_list import Option
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-    from textual.app import ComposeResult
-
 _MATCH_STYLE: Final = Style(bold=True, underline=True)  # characters of a label the fuzzy query matched
 
 
 class Dialog[ResultT](ModalScreen[ResultT]):
-    """Base modal dialog: a centered bordered panel over the dimmed screen; Escape cancels.
-
-    Subclasses define action_cancel with their own "cancelled" result.
-    """
+    """Base modal dialog: a centered bordered panel over the dimmed screen; Escape cancels with None."""
 
     DEFAULT_CSS = """
     Dialog {
@@ -46,6 +40,10 @@ class Dialog[ResultT](ModalScreen[ResultT]):
 
     BINDINGS: ClassVar[list[BindingType]] = [("escape", "cancel", "Cancel")]
 
+    def action_cancel(self) -> None:
+        """Cancel the dialog without a result."""
+        self.dismiss(None)
+
 
 class InputDialog(Dialog[str | None]):
     """Prompt for one line of text; dismisses with the value, or None on cancel."""
@@ -58,7 +56,7 @@ class InputDialog(Dialog[str | None]):
     """
 
     def __init__(self, title: str, value: str = "") -> None:
-        """Set the prompt title and the optional pre-filled value (used by rename)."""
+        """Set the prompt title and the optional pre-filled value."""
         super().__init__()
         self._title = title  # prompt shown above the input
         self._value = value  # initial input content
@@ -77,10 +75,6 @@ class InputDialog(Dialog[str | None]):
         """Enter accepts the value."""
         self.dismiss(event.value)
 
-    def action_cancel(self) -> None:
-        """Escape cancels without a value."""
-        self.dismiss(None)
-
 
 class TextDialog(Dialog[str | None]):
     """Edit multi-line text; dismisses with the text on Ctrl+S, or None on cancel.
@@ -135,10 +129,6 @@ class TextDialog(Dialog[str | None]):
         """Ctrl+A selects the whole text, e.g. to replace or delete a long body at once."""
         self.query_one(TextArea).select_all()
 
-    def action_cancel(self) -> None:
-        """Escape cancels without a value."""
-        self.dismiss(None)
-
 
 class ConfirmDialog(Dialog[bool]):
     """Ask a yes/no question; dismisses with True only on explicit confirmation."""
@@ -170,10 +160,6 @@ class ConfirmDialog(Dialog[bool]):
         """Confirm the action."""
         self.dismiss(True)
 
-    def action_cancel(self) -> None:
-        """Cancel the action."""
-        self.dismiss(False)
-
 
 class HelpDialog(Dialog[None]):
     """Show the current screen's keys as a two-column list; Escape, ? or i closes it."""
@@ -207,10 +193,6 @@ class HelpDialog(Dialog[None]):
             yield Static(grid, id="keys")
             yield Label(f"tasko v{version('tasko')}", id="about")
 
-    def action_cancel(self) -> None:
-        """Close the help."""
-        self.dismiss(None)
-
 
 class SelectDialog(Dialog[str | None]):
     """Pick one option with arrows and Enter; dismisses with the option id, or None on cancel.
@@ -336,7 +318,3 @@ class SelectDialog(Dialog[str | None]):
     def action_last(self) -> None:
         """Jump the list highlight to the last option without leaving the input."""
         self.query_one(OptionList).action_last()
-
-    def action_cancel(self) -> None:
-        """Escape cancels without a choice."""
-        self.dismiss(None)

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/tui/screens/projects.py

@@ -1,28 +1,24 @@
 """Projects screen: a table of projects with management actions."""
 
-from typing import TYPE_CHECKING, ClassVar, Final
+from collections.abc import Callable
+from typing import ClassVar, Final
 
 from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import BindingType
 from textual.screen import Screen
 from textual.widgets import DataTable
 
+from tasko.core.core import Core
 from tasko.core.errors import AppError
 from tasko.tui.screens.dialogs import ConfirmDialog, InputDialog
 from tasko.tui.widgets import StatusBar
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from textual.app import ComposeResult
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
 _DEFAULT_CELL: Final = Text("default", style="green")  # marks the default project; space is not scarce here
 
 
 class ProjectsScreen(Screen[None]):
-    """Project management — rarely visited, reached from the task screen with P."""
+    """Project management — rarely visited, reached from the task list with P."""
 
     BINDINGS: ClassVar[list[BindingType]] = [
         ("j", "cursor_down", "Down"),

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/tui/screens/task_detail.py

@@ -1,32 +1,28 @@
 """Task detail screen: full details of one task with per-field editing."""
 
+from collections.abc import Callable
 from datetime import UTC, datetime
-from typing import TYPE_CHECKING, ClassVar, Final
+from typing import ClassVar, Final
 
 from rich.table import Table
 from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import BindingType
 from textual.containers import VerticalScroll
 from textual.screen import Screen
 from textual.widgets import Static
 
+from tasko.core.core import Core
 from tasko.core.errors import AppError
 from tasko.core.models import Priority, Status, Task
 from tasko.tui.screens.dialogs import ConfirmDialog, InputDialog, SelectDialog, TextDialog
 from tasko.tui.widgets import StatusBar
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from textual.app import ComposeResult
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
 # Same glyphs and colors as the table on the main screen, spelled out with the word.
 _STATUS_TEXT: Final = {
-    Status.TODO: Text("○ todo", style="dim"),
-    Status.DOING: Text("◐ doing", style="yellow"),
-    Status.DONE: Text("● done", style="green"),
+    Status.TODO: Text("· todo", style="dim"),
+    Status.DOING: Text("» doing", style="yellow"),
+    Status.DONE: Text("✓ done", style="green"),
 }
 _PRIORITY_TEXT: Final = {
     Priority.HIGH: Text("high", style="red"),
@@ -123,7 +119,7 @@ class TaskDetailScreen(Screen[None]):
         self.query_one(StatusBar).set_context(Text.assemble(f"task #{task.id}", (f" · {task.project_name}", "dim")))
 
         self.query_one("#title", Static).update(Text(task.title))
-        # Two column groups: live fields on the left (main-table order), dates on the right, all dim.
+        # Two column groups: live fields on the left (main-table order), dates on the right; all dim but the field values.
         meta = Table.grid(padding=(0, 2))
         meta.add_column(style="dim")
         meta.add_column()

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/tui/screens/task_list.py

@@ -1,12 +1,15 @@
 """Main screen: the task table."""
 
-from typing import TYPE_CHECKING, ClassVar, Final
+from typing import ClassVar, Final
 
 from rich.cells import cell_len
 from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import BindingType
 from textual.screen import Screen
 from textual.widgets import DataTable
 
+from tasko.core.core import Core
 from tasko.core.errors import AppError
 from tasko.core.models import Priority, Status
 from tasko.tui.screens.dialogs import ConfirmDialog, InputDialog, SelectDialog
@@ -14,17 +17,11 @@ from tasko.tui.screens.projects import ProjectsScreen
 from tasko.tui.screens.task_detail import TaskDetailScreen
 from tasko.tui.widgets import StatusBar
 
-if TYPE_CHECKING:
-    from textual.app import ComposeResult
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
-# One-character, color-coded cells: the S/P/B columns must not waste width.
+# One-character, color-coded cells: the status, priority and body columns must not waste width.
 _STATUS_CELLS: Final = {
-    Status.TODO: Text("○", style="dim"),
-    Status.DOING: Text("◐", style="yellow"),
-    Status.DONE: Text("●", style="green"),
+    Status.TODO: Text("·", style="dim"),
+    Status.DOING: Text("»", style="yellow"),
+    Status.DONE: Text("✓", style="green"),
 }
 _PRIORITY_CELLS: Final = {
     Priority.HIGH: Text("↑", style="red"),
@@ -46,6 +43,7 @@ class TaskListScreen(Screen[None]):
         ("j", "cursor_down", "Down"),
         ("k", "cursor_up", "Up"),
         ("a", "add", "Add"),
+        ("A", "add_with_project", "Add to project"),
         ("d", "toggle_done", "Done"),
         ("s", "toggle_doing", "Doing"),
         ("plus,equals_sign", "priority_up", "Priority up"),  # = raises too: + is shifted on most layouts
@@ -64,6 +62,7 @@ class TaskListScreen(Screen[None]):
         ("↑ ↓ j k", "move the cursor"),
         ("enter", "open the task under the cursor"),
         ("a", "add a task into the cursor row's project"),
+        ("A", "add a task, choosing the project first"),
         ("d", "mark done / back to todo"),
         ("s", "mark doing / back to todo"),
         ("+ -", "raise / lower the priority"),
@@ -162,14 +161,8 @@ class TaskListScreen(Screen[None]):
         falls back to the selected, then the default project. Wrong target? Escape, move
         the cursor to a row of the right project, or change the project on the task later.
         """
-        task_id = self._cursor_task_id()
-        if task_id is not None:
-            task = self._core.get_task(task_id)
-            project_id, name = task.project_id, task.project_name
-        else:
-            state = self._core.app_state()
-            project_id = state.selected_project_id or state.default_project_id
-            name = self._core.get_project(project_id).name
+        project_id = self._add_target_project_id()
+        name = self._core.get_project(project_id).name
 
         def on_result(title: str | None) -> None:
             if not title:
@@ -183,6 +176,47 @@ class TaskListScreen(Screen[None]):
 
         self.app.push_screen(InputDialog(f'New task in "{name}":'), on_result)
 
+    def action_add_with_project(self) -> None:
+        """Pick the target project from the full list, then prompt for a title.
+
+        The escape hatch for 'a': used when no visible row carries the wanted project.
+        """
+        options: list[tuple[str, str | Text]] = [(str(p.id), p.name) for p in self._core.list_projects()]
+        # Preselect the project plain 'a' would target, so Enter-Enter behaves like 'a'.
+        current = str(self._add_target_project_id())
+
+        def on_project(choice: str | None) -> None:
+            if choice is None:
+                return
+            project_id = int(choice)
+            name = self._core.get_project(project_id).name
+
+            def on_title(title: str | None) -> None:
+                if not title:
+                    return
+                try:
+                    self._core.add_task(title, project_id=project_id)
+                except AppError as e:
+                    self.notify(str(e), severity="error")
+                    return
+                self.reload()
+                # The task is invisible when a different project filter is active — confirm it landed.
+                filter_id = self._core.app_state().selected_project_id
+                if filter_id is not None and filter_id != project_id:
+                    self.notify(f'Added to "{name}"')
+
+            self.app.push_screen(InputDialog(f'New task in "{name}":'), on_title)
+
+        self.app.push_screen(SelectDialog("Add task to project:", options, current), on_project)
+
+    def _add_target_project_id(self) -> int:
+        """Project a plain add targets: the cursor row's project, else the selected, else the default one."""
+        task_id = self._cursor_task_id()
+        if task_id is not None:
+            return self._core.get_task(task_id).project_id
+        state = self._core.app_state()
+        return state.selected_project_id or state.default_project_id
+
     def _cursor_task_id(self) -> int | None:
         """Return the id of the task under the cursor, or None on an empty table.
 
@@ -297,7 +331,7 @@ class TaskListScreen(Screen[None]):
         self.reload()
 
     def action_refresh(self) -> None:
-        """Reload the list: apply pending re-sorts/hides from d/s and pick up outside changes (e.g. CLI adds)."""
+        """Reload the list: apply pending re-sorts/hides from d/s and pick up changes from another instance."""
         self.reload()
 
     def action_focus_project(self) -> None:

{tasko-0.0.1 → tasko-0.0.3}/src/tasko/tui/widgets.py

@@ -1,15 +1,11 @@
 """Shared TUI widgets."""
 
-from typing import TYPE_CHECKING
-
 from rich.text import Text
+from textual.app import ComposeResult
 from textual.containers import Horizontal
+from textual.visual import VisualType
 from textual.widgets import Label
 
-if TYPE_CHECKING:
-    from textual.app import ComposeResult
-    from textual.visual import VisualType
-
 
 class StatusBar(Horizontal):
     """One-line bottom bar: the screen's context on the left, the help key hint on the right.

tasko-0.0.1/README.md

@@ -1,34 +0,0 @@
-# tasko
-
-A personal task manager: a fast Textual TUI over local SQLite, with a minimal
-CLI for quick capture.
-
-## Usage
-
-`tasko` with no arguments launches the TUI — the primary interface, where all
-task and project management lives.
-
-The CLI is deliberately minimal (see
-[docs/architecture.md](docs/architecture.md) for why):
-
-```sh
-tasko add "fix nginx" -p infra   # quick capture from the shell
-tasko list                       # a quick look without launching the TUI
-```
-
-Data is a single SQLite file under `$XDG_DATA_HOME/tasko` (default
-`~/.local/share/tasko`); override the directory with `--data-dir` or the
-`TASKO_DATA_DIR` env var.
-
-## Design
-
-- [docs/architecture.md](docs/architecture.md) — layering (`core/` + `cli/` +
-  `tui/`), the TUI-first UI strategy, tool choices.
-- [docs/data-model.md](docs/data-model.md) — entities, the full SQL schema,
-  and the reasoning behind it.
-- [docs/non-goals.md](docs/non-goals.md) — features deliberately not built,
-  and why.
-
-## License
-
-[MIT](LICENSE)

tasko-0.0.1/src/tasko/cli/__init__.py

@@ -1 +0,0 @@
-"""CLI adapter."""

tasko-0.0.1/src/tasko/cli/main.py

@@ -1,89 +0,0 @@
-"""CLI adapter: quick capture and a quick look at the list. The TUI is the primary interface."""
-
-# ruff: noqa: T201 -- printing to stdout is this module's purpose: every command's user-facing
-# output goes through print(); the rule targets stray debug prints, which cannot exist here.
-
-import argparse
-import os
-import sys
-from importlib.metadata import version
-from pathlib import Path
-
-from tasko.core.core import Core
-from tasko.core.errors import AppError
-from tasko.core.models import Priority, Status
-
-DATA_DIR_ENV_VAR = "TASKO_DATA_DIR"  # overrides the default data directory
-
-
-def main() -> None:
-    """Entry point: no subcommand launches the TUI; `add` and `list` serve capture and a quick look."""
-    args = _build_parser().parse_args()
-    core = Core(_resolve_db_path(args.data_dir))
-    try:
-        if args.command is None:
-            # Lazy import: quick capture (`tasko add`) must not pay the TUI framework's import cost.
-            from tasko.tui.app import TaskoApp  # noqa: PLC0415
-
-            TaskoApp(core).run()
-        elif args.command == "add":
-            _cmd_add(core, args)
-        else:
-            _cmd_list(core, args)
-    except AppError as e:
-        sys.exit(f"error: {e}")
-    finally:
-        core.close()
-
-
-def _resolve_db_path(data_dir: Path | None = None) -> Path:
-    """Path to the SQLite database file, resolving the data directory as CLI arg → env var → XDG default."""
-    if data_dir is None:
-        env = os.environ.get(DATA_DIR_ENV_VAR)
-        if env:
-            data_dir = Path(env)
-        else:
-            xdg_data_home = Path(os.environ.get("XDG_DATA_HOME") or Path.home() / ".local" / "share")
-            data_dir = xdg_data_home / "tasko"
-    return data_dir / "tasko.db"
-
-
-def _build_parser() -> argparse.ArgumentParser:
-    """Build the argument parser with the `add` and `list` subcommands."""
-    parser = argparse.ArgumentParser(prog="tasko", description="Personal task manager.")
-    parser.add_argument("--version", action="version", version=version("tasko"))
-    parser.add_argument("--data-dir", type=Path, help=f"data directory (env: {DATA_DIR_ENV_VAR}; default: XDG data dir)")
-    subparsers = parser.add_subparsers(dest="command")
-
-    add = subparsers.add_parser("add", help="add a task")
-    add.add_argument("title", help="task title")
-    add.add_argument("-p", "--project", help="project name (default: the default project)")
-    add.add_argument("-b", "--body", help="longer description")
-    add.add_argument("--priority", type=Priority, choices=list(Priority), default=Priority.MEDIUM, help="task priority")
-
-    list_ = subparsers.add_parser("list", help="list tasks (open ones by default)")
-    list_.add_argument("-p", "--project", help="filter by project name")
-    list_.add_argument("-s", "--status", type=Status, choices=list(Status), help="filter by status")
-    list_.add_argument("--all", action="store_true", help="include done tasks")
-    return parser
-
-
-def _cmd_add(core: Core, args: argparse.Namespace) -> None:
-    """Create a task and confirm where it landed."""
-    project_id = core.get_project_by_name(args.project).id if args.project is not None else None
-    task = core.add_task(args.title, project_id=project_id, body=args.body, priority=args.priority)
-    print(f"Task #{task.id} created in project '{task.project_name}'.")
-
-
-def _cmd_list(core: Core, args: argparse.Namespace) -> None:
-    """Print tasks as an aligned table."""
-    project_id = core.get_project_by_name(args.project).id if args.project is not None else None
-    tasks = core.list_tasks(project_id=project_id, status=args.status, include_done=args.all)
-    if not tasks:
-        print("No tasks.")
-        return
-    header = ("ID", "Project", "Status", "Priority", "Title")
-    rows = [(str(t.id), t.project_name, t.status, t.priority, t.title) for t in tasks]
-    widths = [max(len(row[i]) for row in (header, *rows)) for i in range(len(header))]
-    for row in (header, *rows):
-        print("  ".join(cell.ljust(width) for cell, width in zip(row, widths, strict=True)).rstrip())