grift-cli 0.5.5__tar.gz → 0.5.6__tar.gz

{grift_cli-0.5.5 → grift_cli-0.5.6}/CHANGELOG.md

@@ -4,6 +4,27 @@
 
 タグ・PyPI・リポ public 化は本ファイルの記載対象外（人間ゲート）。
 
+## [0.5.6] — 2026-08-23
+
+公開後検収で発見の仕様記述↔実挙動の矛盾 3 件（D-1/D-2/D-3）を解消するホットフィックス。
+
+### Fixed
+
+- **動詞の意味を確定: `analyze` = 表示（stdout）・`report` = 記録（`.grift/`）**。README 日英の 2 語動詞表の analyze 行（「`.grift/` を生成」と誤記）を訂正
+- **D-3b**: 裸 `grift analyze` の既定スコープを **repo** に統一（パス明示の従来モードは既定 tenant のまま不変）
+- **D-3a**: `grift report --scope {repo,tenant}`（既定 repo）を追加
+- D-2 文書: report の help「default: ./out」誤記を `.grift/` に訂正・docstring/examples を動詞意味確定版に更新
+- **errata（0.5.5 の記載について）**: 0.5.5 の README/EVIDENCE に「裸 `grift analyze` が `.grift/` を自動生成する」との記述があったが、実挙動は stdout 出力のみ（`.grift/` は `grift report` が作る）。本版で文書をバイナリに合わせ、動詞意味を上記のとおり確定した
+- CHANGELOG の受け口 URL 表記を tep-contributions に統一
+
+### Added（報告規律・恒久）
+
+- **「wheel 実測」節の各 claim には実行コマンドと生ログを添付する**（0.5.5 で裸 analyze の claim が公開 wheel で再現しなかった件の再発防止）
+
+### テスト（反証）
+
+- 裸 analyze が `.grift/` を作らず stdout へ出すピン / 裸 analyze の scope=repo ピン / パス明示の既定 tenant 維持ピン / 裸 report が `.grift/` を書き scope=repo のピン / `report --scope tenant` のピン / help 文言の golden（`./out` 残存なし）
+
 ## [0.5.5] — 2026-08-23
 
 UX 統一（2語動詞 + `.grift/` 出力）+ contribute 受け口の実運用化 + 全ドキュメント日英対応。

{grift_cli-0.5.5 → grift_cli-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: grift-cli
-Version: 0.5.5
+Version: 0.5.6
 Summary: Deterministic TEP evidence metrics from a single git repository. No LLM.
 Project-URL: Homepage, https://github.com/Cor-Incorporated/grift-cli
 Author: TEP contributors
@@ -41,16 +41,16 @@ Named after the Grift product line.
 ```bash
 pipx install grift-cli
 cd your-repo
-grift analyze     # 分析 → .grift/report.{json,md} に書き出し
+grift analyze     # 分析結果を stdout に表示（repo スコープ）
 grift verify      # .grift/report.json を現在のリポジトリで再計算・突合
 ```
 
-基本操作はすべて **`grift <動詞>` の2語**で完結します（対象 = カレントディレクトリ、出力 = `.grift/`）:
+基本操作はすべて **`grift <動詞>` の2語**で完結します。動詞の意味は「**analyze = 表示（stdout）**・**report = 記録（`.grift/`）**」です:
 
 | 2語コマンド | 動作 |
 |---|---|
-| `grift analyze` | カレントリポジトリを分析し `.grift/report.{json,md}` を生成 |
-| `grift report` | `grift analyze` と同結果（常に現在の HEAD を再分析） |
+| `grift analyze` | カレントリポジトリを**stdout に表示**（repo スコープ・`.grift/` は作らない） |
+| `grift report` | 分析して `.grift/report.{json,md}` に**記録**（常に現在の HEAD を再分析・既定 repo スコープ・`--scope tenant` 可） |
 | `grift verify` | `.grift/report.json` を同条件で再計算し改ざんを検出（VERIFIED / MISMATCH / CANNOT_VERIFY） |
 | `grift contribute` | `.grift/report.json` から opt-in 提出 payload を組む（**何も送信しない**） |
 

{grift_cli-0.5.5 → grift_cli-0.5.6}/README.en.md

@@ -18,17 +18,17 @@ Commit counts, line counts, and “activity” inflate easily once agents and ge
 ```bash
 pipx install grift-cli
 cd your-repo
-grift analyze     # analyze → writes .grift/report.{json,md}
+grift analyze     # analyze and print to stdout (repo scope)
 grift verify      # recompute .grift/report.json against the current repo
 ```
 
-Every basic operation is just **`grift <verb>`** (target = current directory,
-output = `.grift/`):
+Every basic operation is just **`grift <verb>`**. Verb semantics:
+**analyze = display (stdout)** · **report = record (`.grift/`)**:
 
 | Verb | Action |
 |---|---|
-| `grift analyze` | Analyze the current repository into `.grift/report.{json,md}` |
-| `grift report` | Same as bare analyze (always re-analyzes the current HEAD) |
+| `grift analyze` | Analyze the current repository and **print to stdout** (repo scope; does not create `.grift/`) |
+| `grift report` | Analyze and **record into `.grift/report.{json,md}`** (always re-analyzes the current HEAD; repo scope by default, `--scope tenant` available) |
 | `grift verify` | Recompute `.grift/report.json` under recorded provenance (VERIFIED / MISMATCH / CANNOT_VERIFY) |
 | `grift contribute` | Build an opt-in submission payload from `.grift/report.json` (**never sends**) |
 

{grift_cli-0.5.5 → grift_cli-0.5.6}/README.md

@@ -18,16 +18,16 @@ Named after the Grift product line.
 ```bash
 pipx install grift-cli
 cd your-repo
-grift analyze     # 分析 → .grift/report.{json,md} に書き出し
+grift analyze     # 分析結果を stdout に表示（repo スコープ）
 grift verify      # .grift/report.json を現在のリポジトリで再計算・突合
 ```
 
-基本操作はすべて **`grift <動詞>` の2語**で完結します（対象 = カレントディレクトリ、出力 = `.grift/`）:
+基本操作はすべて **`grift <動詞>` の2語**で完結します。動詞の意味は「**analyze = 表示（stdout）**・**report = 記録（`.grift/`）**」です:
 
 | 2語コマンド | 動作 |
 |---|---|
-| `grift analyze` | カレントリポジトリを分析し `.grift/report.{json,md}` を生成 |
-| `grift report` | `grift analyze` と同結果（常に現在の HEAD を再分析） |
+| `grift analyze` | カレントリポジトリを**stdout に表示**（repo スコープ・`.grift/` は作らない） |
+| `grift report` | 分析して `.grift/report.{json,md}` に**記録**（常に現在の HEAD を再分析・既定 repo スコープ・`--scope tenant` 可） |
 | `grift verify` | `.grift/report.json` を同条件で再計算し改ざんを検出（VERIFIED / MISMATCH / CANNOT_VERIFY） |
 | `grift contribute` | `.grift/report.json` から opt-in 提出 payload を組む（**何も送信しない**） |
 

{grift_cli-0.5.5 → grift_cli-0.5.6}/action.yml

@@ -16,7 +16,7 @@ inputs:
   version:
     description: "grift-cli version to install (pinned)"
     required: false
-    default: "0.5.5"
+    default: "0.5.6"
   comment:
     description: "Opt-in: post the shared block as a PR comment (default off)"
     required: false

{grift_cli-0.5.5 → grift_cli-0.5.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "grift-cli"
-version = "0.5.5"
+version = "0.5.6"
 description = "Deterministic TEP evidence metrics from a single git repository. No LLM."
 readme = "README.md"
 license = { text = "MIT" }

{grift_cli-0.5.5 → grift_cli-0.5.6}/src/tep_cli/__main__.py

@@ -1,4 +1,4 @@
-"""grift CLI (method = TEP)."""
+"""grift CLI (method = TEP). Verb semantics: analyze=display (stdout), report=record (.grift/)."""
 
 from __future__ import annotations
 
@@ -16,11 +16,11 @@ from tep_core.verify import CANNOT_VERIFY, MISMATCH, VERIFIED, verify_report
 from tep_core.version import __version__
 
 _EPILOG = """examples:
-  grift analyze             # analyze the current repo → .grift/report.{json,md}
-  grift report              # same as bare analyze: always re-analyzes HEAD
+  grift analyze             # analyze the current repo, print to stdout (repo scope)
+  grift report              # analyze and RECORD into .grift/report.{json,md} (always re-analyzes)
+  grift report --scope tenant   # record a tenant-scope report (needs .tep/identity.toml)
   grift verify              # verify .grift/report.json against the current repo
   grift contribute          # build an opt-in payload from .grift/report.json (never sends)
-  grift analyze PATH --scope tenant --identity .tep/identity.toml   # custom
 詳細: README"""
 
 
@@ -105,8 +105,8 @@ def build_parser() -> argparse.ArgumentParser:
     analyze.add_argument(
         "--scope",
         choices=("tenant", "repo"),
-        default="tenant",
-        help="tenant: identity-matched evidence. repo: all human commits (reference distribution).",
+        default=None,
+        help="tenant: identity-matched evidence. repo: all human commits (reference distribution). Bare `grift analyze` defaults to repo; explicit-path invocations default to tenant.",
     )
     analyze.add_argument(
         "--reference-version",
@@ -154,7 +154,7 @@ def build_parser() -> argparse.ArgumentParser:
 
     render = sub.add_parser(
         "report",
-        help="Analyze the current repo and write ./out/report.{json,md}; or re-render md from an existing report.json",
+        help="Analyze the current repo and RECORD into .grift/report.{json,md}; or re-render md from an existing report.json",
         epilog=_EPILOG,
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
@@ -163,7 +163,13 @@ def build_parser() -> argparse.ArgumentParser:
         type=Path,
         nargs="?",
         default=None,
-        help="Path to an existing report.json to re-render (default: analyze the current repo into ./out)",
+        help="Path to an existing report.json to re-render (default: analyze the current repo into .grift/)",
+    )
+    render.add_argument(
+        "--scope",
+        choices=("tenant", "repo"),
+        default="repo",
+        help="Analysis scope for the bare form (default: repo)",
     )
     render.add_argument(
         "--out",
@@ -183,7 +189,7 @@ def build_parser() -> argparse.ArgumentParser:
         type=Path,
         nargs="?",
         default=None,
-        help="Path to a repo-scope report.json (default: .grift/, then legacy locations)",
+        help="Path to a repo-scope report.json (default: .grift/report.json)",
     )
     contribute.add_argument(
         "--out",
@@ -201,6 +207,7 @@ def build_parser() -> argparse.ArgumentParser:
 
 def _run_analyze(args: argparse.Namespace) -> int:
     repo: Path = args.repo if args.repo is not None else Path(".")
+    scope = str(args.scope) if args.scope is not None else ("repo" if args.repo is None else "tenant")
     if not (repo / ".git").exists() and not repo.joinpath("HEAD").exists():
         sys.stderr.write(f"not a git repository: {repo}\n")
         return 2
@@ -219,7 +226,7 @@ def _run_analyze(args: argparse.Namespace) -> int:
         include_files=bool(args.vendor_scan),
         include_local_path=bool(args.include_local_path),
         survival=bool(args.survival),
-        scope=str(args.scope),
+        scope=scope,
         reference_version=str(args.reference_version) if args.reference_version else None,
     )
     markdown = render_markdown(report)
@@ -298,7 +305,7 @@ def _run_report(args: argparse.Namespace) -> int:
         # back to a stale report.json — "report で測ったつもりが古い
         # SHA のまま" は自己証明の罠になるため、既存ファイルは無条件に
         # 上書きする。再分析なしの再レンダリングは引数指定時のみ。
-        return _analyze_to_grift_dir(scope="repo")
+        return _analyze_to_grift_dir(scope=str(args.scope))
     try:
         payload = json.loads(args.report_json.read_text(encoding="utf-8"))
     except (OSError, json.JSONDecodeError) as exc:

{grift_cli-0.5.5 → grift_cli-0.5.6}/src/tep_core/version.py

@@ -1,6 +1,6 @@
-__version__ = "0.5.5"
+__version__ = "0.5.6"
 REPORT_SCHEMA_VERSION = "report-v1"
-DEFINITION_VERSION = "tep-v0.5.5-2026-08-23"
+DEFINITION_VERSION = "tep-v0.5.6-2026-08-23"
 ORIGIN_DEFINITION_VERSION = "origin-v1.1-2026-08-22"
 ACTIVITY_DEFINITION_VERSION = "activity-v1-2026-08-16"
 CORE_ACTIVITY_DEFINITION_VERSION = "core-activity-v1-2026-08-16"

grift_cli-0.5.6/tests/test_verb_semantics.py

@@ -0,0 +1,113 @@
+"""v0.5.6 verb semantics (D-1/D-2/D-3 fixes): analyze=display, report=record.
+
+Falsifiable pins:
+- bare `grift analyze` prints to stdout and does NOT create .grift/ (D-1)
+- bare `grift analyze` uses repo scope (D-3b)
+- bare `grift report` writes .grift/report.{json,md} with scope=repo (D-2)
+- `grift report --scope tenant` records a tenant-scope report (D-3a)
+- help text pins (no stale ./out mention)
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+from tep_cli.__main__ import build_parser, main
+
+from git_fixture import commit, init_repo
+
+
+def _repo_with_tests(tmp_path: Path, name: str = "repo") -> Path:
+    repo = init_repo(tmp_path / name)
+    (repo / "pyproject.toml").write_text(
+        '[project]\nname = "demo"\ndependencies = ["pytest"]\n', encoding="utf-8"
+    )
+    (repo / "tests").mkdir()
+    (repo / "tests" / "t.py").write_text("def test_o():\n    pass\n", encoding="utf-8")
+    (repo / ".tep").mkdir()
+    (repo / ".tep" / "identity.toml").write_text(
+        'schema_version = "identity-v1"\n\n[[actors]]\ncanonical_id = "alice"\n'
+        'emails = ["a@example.com"]\nattribution_state = "verified"\n',
+        encoding="utf-8",
+    )
+    for index in range(24):
+        commit(
+            repo,
+            email="a@example.com",
+            date="2026-01-05",
+            message=f"feat: {index}",
+            filename="app.py",
+        )
+        if index % 2 == 0:
+            commit(
+                repo,
+                email="a@example.com",
+                date="2026-01-05",
+                message=f"test: {index}",
+                filename="tests/t.py",
+            )
+    return repo
+
+
+def test_d1_bare_analyze_stdout_only_no_grift_dir(tmp_path, capsys, monkeypatch):
+    """D-1: bare analyze = display. Prints to stdout, never creates .grift/."""
+    repo = _repo_with_tests(tmp_path)
+    monkeypatch.chdir(repo)
+    code = main(["analyze"])
+    assert code == 0
+    out = capsys.readouterr()
+    assert "# TEP analysis" in out.out  # markdown on stdout
+    assert not (repo / ".grift").exists(), "analyze must NOT create .grift/ (that is report's job)"
+
+
+def test_d3b_bare_analyze_defaults_to_repo_scope(tmp_path, capsys, monkeypatch):
+    """D-3b: bare analyze default scope = repo (deciles may appear)."""
+    repo = _repo_with_tests(tmp_path)
+    monkeypatch.chdir(repo)
+    code = main(["analyze", "--format", "json"])
+    assert code == 0
+    payload = json.loads(capsys.readouterr().out)
+    assert payload["provenance"]["analysis_scope"] == "repo"
+
+
+def test_d3b_explicit_path_still_defaults_tenant(tmp_path, capsys):
+    """Back-compat: explicit-path invocation keeps the tenant default."""
+    repo = _repo_with_tests(tmp_path, "explicit")
+    code = main(["analyze", str(repo), "--format", "json"])
+    assert code == 0
+    payload = json.loads(capsys.readouterr().out)
+    assert payload["provenance"]["analysis_scope"] == "tenant"
+
+
+def test_d2_bare_report_records_grift_dir_repo_scope(tmp_path, capsys, monkeypatch):
+    """D-2: bare report = record. Writes .grift/report.{json,md} with repo scope."""
+    repo = _repo_with_tests(tmp_path)
+    monkeypatch.chdir(repo)
+    code = main(["report"])
+    assert code == 0
+    payload = json.loads((repo / ".grift" / "report.json").read_text(encoding="utf-8"))
+    assert payload["provenance"]["analysis_scope"] == "repo"
+    assert (repo / ".grift" / "report.md").is_file()
+
+
+def test_d3a_report_scope_tenant(tmp_path, capsys, monkeypatch):
+    """D-3a: report --scope tenant records a tenant-scope report."""
+    repo = _repo_with_tests(tmp_path)
+    monkeypatch.chdir(repo)
+    code = main(["report", "--scope", "tenant"])
+    assert code == 0
+    payload = json.loads((repo / ".grift" / "report.json").read_text(encoding="utf-8"))
+    assert payload["provenance"]["analysis_scope"] == "tenant"
+    assert payload["identity"]["actor_count"] == 1
+
+
+def test_help_text_has_no_stale_out_dir(tmp_path):
+    """D-2 doc pin: help mentions .grift/, never the stale './out' default."""
+    parser = build_parser()
+    report_help = parser._subparsers._group_actions[0].choices["report"].format_help()
+    analyze_help = parser._subparsers._group_actions[0].choices["analyze"].format_help()
+    assert ".grift/" in report_help
+    collapsed = " ".join(report_help.split())
+    assert "default: analyze the current repo into .grift/" in collapsed
+    assert "./out" not in collapsed and "./out" not in " ".join(analyze_help.split())