Update CLI source options for OpenCode

Author: KNN-07

dataclaw/cli.py

@@ -4,13 +4,15 @@
 import json
 import re
 import sys
+import urllib.error
 import urllib.request
 from datetime import datetime, timezone
 from pathlib import Path
+from typing import Any, Mapping, cast
 
 from .anonymizer import Anonymizer
 from .config import CONFIG_FILE, DataClawConfig, load_config, save_config
-from .parser import CLAUDE_DIR, CODEX_DIR, discover_projects, parse_project_sessions
+from .parser import CLAUDE_DIR, CODEX_DIR, OPENCODE_DIR, discover_projects, parse_project_sessions
 from .secrets import _has_mixed_char_types, _shannon_entropy, redact_session
 
 HF_TAG = "dataclaw"
@@ -56,8 +58,8 @@
     "Step 6/6: After explicit user approval, publish: dataclaw export --publish-attestation \"User explicitly approved publishing to Hugging Face.\"",
 ]
 
-EXPLICIT_SOURCE_CHOICES = {"claude", "codex", "both"}
-SOURCE_CHOICES = ["auto", "claude", "codex", "both"]
+EXPLICIT_SOURCE_CHOICES = {"claude", "codex", "opencode", "both"}
+SOURCE_CHOICES = ["auto", "claude", "codex", "opencode", "both"]
 
 
 def _mask_secret(s: str) -> str:
@@ -67,7 +69,7 @@ def _mask_secret(s: str) -> str:
     return f"{s[:4]}...{s[-4:]}"
 
 
-def _mask_config_for_display(config: dict) -> dict:
+def _mask_config_for_display(config: Mapping[str, Any]) -> dict[str, Any]:
     """Return a copy of config with redact_strings values masked."""
     out = dict(config)
     if out.get("redact_strings"):
@@ -81,7 +83,9 @@ def _source_label(source_filter: str) -> str:
         return "Claude Code"
     if source_filter == "codex":
         return "Codex"
-    return "Claude Code or Codex"
+    if source_filter == "opencode":
+        return "OpenCode"
+    return "Claude Code, Codex, or OpenCode"
 
 
 def _normalize_source_filter(source_filter: str) -> str:
@@ -119,7 +123,9 @@ def _has_session_sources(source_filter: str = "auto") -> bool:
         return CLAUDE_DIR.exists()
     if source_filter == "codex":
         return CODEX_DIR.exists()
-    return CLAUDE_DIR.exists() or CODEX_DIR.exists()
+    if source_filter == "opencode":
+        return OPENCODE_DIR.exists()
+    return CLAUDE_DIR.exists() or CODEX_DIR.exists() or OPENCODE_DIR.exists()
 
 
 def _filter_projects_by_source(projects: list[dict], source_filter: str) -> list[dict]:
@@ -130,11 +136,12 @@ def _filter_projects_by_source(projects: list[dict], source_filter: str) -> list
 
 
 def _format_size(size_bytes: int) -> str:
+    size = float(size_bytes)
     for unit in ("B", "KB", "MB"):
-        if size_bytes < 1024:
-            return f"{size_bytes:.1f} {unit}" if unit != "B" else f"{size_bytes} B"
-        size_bytes /= 1024
-    return f"{size_bytes:.1f} GB"
+        if size < 1024:
+            return f"{size:.1f} {unit}" if unit != "B" else f"{int(size)} B"
+        size /= 1024
+    return f"{size:.1f} GB"
 
 
 def _format_token_count(count: int) -> str:
@@ -1111,7 +1118,7 @@ def prep(source_filter: str = "auto") -> None:
         repo_id = default_repo_name(hf_user)
 
     # Build contextual next_steps
-    stage_config = dict(config)
+    stage_config = cast(DataClawConfig, dict(config))
     if source_explicit:
         stage_config["source"] = resolved_source_choice
     next_steps, next_command = _build_status_next_steps(stage, stage_config, hf_user, repo_id)

dataclaw/config.py

@@ -3,7 +3,7 @@
 import json
 import sys
 from pathlib import Path
-from typing import TypedDict
+from typing import TypedDict, cast
 
 CONFIG_DIR = Path.home() / ".dataclaw"
 CONFIG_FILE = CONFIG_DIR / "config.json"
@@ -20,6 +20,10 @@ class DataClawConfig(TypedDict, total=False):
     last_export: dict
     stage: str | None  # "auth" | "configure" | "review" | "confirmed" | "done"
     projects_confirmed: bool  # True once user has addressed folder exclusions
+    review_attestations: dict
+    review_verification: dict
+    last_confirm: dict
+    publish_attestation: str
 
 
 DEFAULT_CONFIG: DataClawConfig = {
@@ -35,10 +39,10 @@ def load_config() -> DataClawConfig:
         try:
             with open(CONFIG_FILE) as f:
                 stored = json.load(f)
-            return {**DEFAULT_CONFIG, **stored}
+            return cast(DataClawConfig, {**DEFAULT_CONFIG, **stored})
         except (json.JSONDecodeError, OSError) as e:
             print(f"Warning: could not read {CONFIG_FILE}: {e}", file=sys.stderr)
-    return dict(DEFAULT_CONFIG)
+    return cast(DataClawConfig, dict(DEFAULT_CONFIG))
 
 
 def save_config(config: DataClawConfig) -> None:

tests/test_cli.py

@@ -400,7 +400,7 @@ def test_no_projects(self, monkeypatch, capsys):
         monkeypatch.setattr("dataclaw.cli.discover_projects", lambda: [])
         list_projects()
         captured = capsys.readouterr()
-        assert "No Claude Code or Codex sessions" in captured.out
+        assert "No Claude Code, Codex, or OpenCode sessions" in captured.out
 
     def test_source_filter_codex(self, monkeypatch, capsys):
         monkeypatch.setattr(
@@ -626,7 +626,7 @@ def test_export_requires_explicit_source_selection(self, monkeypatch, capsys):
         assert payload["error"] == "Source scope is not confirmed yet."
         assert payload["blocked_on_step"] == "Step 2/6"
         assert len(payload["process_steps"]) == 6
-        assert payload["allowed_sources"] == ["both", "claude", "codex"]
+        assert payload["allowed_sources"] == ["both", "claude", "codex", "opencode"]
         assert payload["next_command"] == "dataclaw config --source both"
 
     def test_configure_next_steps_require_full_folder_presentation(self):