resutil 0.2.2__tar.gz → 0.2.3__tar.gz

resutil-0.2.3/.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+extend-ignore = E203, E501, W503

{resutil-0.2.2 → resutil-0.2.3}/.github/workflows/publish.yaml

@@ -16,9 +16,20 @@ jobs:
       - name: Set up uv
         uses: astral-sh/setup-uv@v7
 
+      - name: Install and verify
+        run: |
+          uv sync --locked
+          uv run pytest -q
+          uv run black --check src tests
+          uv run flake8 src tests
+          uv run mypy src
+
       - name: Build (wheel and sdist)
         run: uv build --no-sources
 
+      - name: Validate distribution metadata
+        run: uvx --from twine==6.2.0 twine check dist/*
+
       - name: Save build artifacts
         uses: actions/upload-artifact@v4
         with:

resutil-0.2.3/.github/workflows/tests.yaml

@@ -0,0 +1,22 @@
+name: Tests
+on:
+  push:
+  pull_request:
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        python: ["3.10", "3.12"]
+    steps:
+      - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v7
+        with:
+          python-version: ${{ matrix.python }}
+      - run: uv sync --locked
+      - run: uv run pytest -q
+      - run: uv run black --check src tests
+      - run: uv run flake8 src tests
+      - run: uv run mypy src

{resutil-0.2.2 → resutil-0.2.3}/CLAUDE.md

@@ -51,5 +51,10 @@ All backends implement the `Storage` base class (`src/resutil/storage/storage.py
 
 - `RESUTIL_COMMENT` - Pre-set experiment comment (skips prompt)
 - `RESUTIL_NO_INTERACTIVE` - Non-interactive mode (no user prompts)
-- `RESUTIIL_REMOTE` - Suppress cloud upload (note: typo is intentional, kept for backwards compat)
+- `RESUTIL_NO_REMOTE` - Suppress cloud upload (legacy RESUTIIL_REMOTE is also accepted)
 - `RESUTIL_DEBUG` - Use temp directory, skip upload
+
+- `RESUTIL_TIMEZONE` - IANA time zone (default: local); metadata includes the UTC offset
+- `RESUTIL_STORAGE_TYPE`, `RESUTIL_GCS_BUCKET_NAME`, `RESUTIL_GCS_KEY_FILE_PATH` - Config overrides
+
+Reliability and server-login compatibility are documented in docs/review-fixes.md.

{resutil-0.2.2 → resutil-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: resutil
-Version: 0.2.2
+Version: 0.2.3
 Summary: Resutil is a utility to manage experimental result data obtained from Python projects. It also manages dependency such as codes and input data with result data. Data is synced to the cloud for team sharing and collaboration.
 Project-URL: Homepage, https://github.com/KatayamaLab/resutil
 Project-URL: Issues, https://github.com/KatayamaLab/resutil/issues
@@ -40,6 +40,7 @@ Requires-Dist: pyreadline3>=3.5.4; platform_system == 'Windows'
 Requires-Dist: pyyaml>=6.0.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: textual>=8.2.1
+Requires-Dist: tzdata>=2024.1; sys_platform == 'win32'
 Description-Content-Type: text/markdown
 
 # Resutil
@@ -204,9 +205,9 @@ storage_config:
 
 ### `resutil push`
 
-The `resutil push` command is used to upload experimental data to the cloud that does not exist in the cloud result directory.
+The `resutil push EXPERIMENT` command uploads a local experiment, replacing its remote archive if it exists. `resutil push --all` uploads new or locally modified experiments.
 
-`resutil push [exp_name]` uploads experiment a specific directory to the cloud. Depending directorys included in `exp-config.yaml` are automtically uploaded. `--no-dependency` option restrain automatic dependency upload.
+`resutil push EXPERIMENT` uploads the specified experiment and any new or modified local dependencies listed in `resutil-exp.yaml`. Pass `--no-dependency` to upload only the specified experiment.
 
 `resutil push  --all` will upload all experimental data to the cloud.
 
@@ -216,7 +217,7 @@ This is useful for keeping your local data up-to-date with the data stored in th
 
 The `resutil pull` command is used to download a specific experimental data from the cloud that does not exist in the local result directory.
 
-`resutil pull [exp_name]` downloads experiment directory from cloud. Depending directorys included in `exp-config.yaml` are automtically downlowded. `--no-dependency` option restrain automatic dependency download.
+`resutil pull [exp_name]` downloads experiment directory from cloud. Depending directorys included in `resutil-exp.yaml` are automtically downlowded. `--no-dependency` option restrain automatic dependency download.
 
 `resutil pull --all` will download all experimental data from the cloud that is not currently in your local result directory.
 
@@ -240,7 +241,7 @@ The `resutil rm` command removes experiments. You can use it as follows: resutil
 
 ### `resutil comment` **EXPERIMENTAL**
 
-`resutil comment [EXPERIMENT] [COMMENT]` adds or modifies a comment following the timestamp in the experiment name. Both local and cloud experiment names will change if they exist. Note that Resutil regards a different experiment name as a different experiment, so this does not affect the name of the same experiment other users have already pulled.
+`resutil comment [EXPERIMENT] [COMMENT]` adds or modifies a comment following the timestamp in the experiment name. Both local and cloud experiment names will change if they exist. Dependency references and the experiment metadata are updated; remote archives are inspected to find references. Note that Resutil regards a different experiment name as a different experiment, so this does not affect the name of the same experiment other users have already pulled.
 
 ### `resutil login`
 
@@ -262,7 +263,7 @@ When running code that integrates Resutil, you can use the following environment
 
 `RESUTIL_NO_INTERACTIVE` Enables non-interactive mode. This prevents any user prompts during execution. This is useful when running as a batch job. If `RESUTIL_COMMENT` is not specified, no comment will be added to the experiment directory.
 
-`RESUTIIL_REMOTE` Suppresses uploading results to cloud storage.
+`RESUTIL_NO_REMOTE` Suppresses uploading results to cloud storage.
 
 `RESUTIL_DEBUG` Enables debug mode where a temporary directory is used as experiment directory. The temporary directory will not be uploaded to cloud storage.
 
@@ -320,3 +321,24 @@ dependency: Dependencies (automatically extracted from directories in the comman
     ## Bug Fixed
     - Fix a bug resuitl does not works properly when git is not initialized
     ```
+
+
+### Reliability and configuration
+
+- `resutil rm` asks for confirmation; pass `--yes` for scripts. Without `--local`
+  or `--remote`, both copies are deleted.
+- `RESUTIL_NO_REMOTE` disables storage authentication and uploads, including checkpoints.
+  The old spelling `RESUTIIL_REMOTE` is accepted as an alias.
+- `RESUTIL_DEBUG` uses a unique temporary directory, cleans it up after execution,
+  and skips storage authentication and uploads.
+- `RESUTIL_TIMEZONE=Asia/Tokyo` selects an IANA time zone. Metadata records the UTC offset.
+- `RESUTIL_STORAGE_TYPE`, `RESUTIL_GCS_BUCKET_NAME` and `RESUTIL_GCS_KEY_FILE_PATH`
+  override the corresponding storage settings.
+- Configuration paths resolve relative to `resutil-conf.yaml`; the working directory is preserved.
+- Comments accept up to 200 UTF-8 bytes. Directory-name collisions receive a unique suffix.
+- `params.save_checkpoint()` returns `False` when disabled or failed. It does not interrupt
+  computation. A failed final upload raises an error; retry with `resutil push EXPERIMENT`.
+- New or modified local data is detected using `results/.resutil-sync.json`.
+  Missing receipts trigger a conservative upload; remote-only edits are not compared.
+- The server login endpoint must echo the login `state` through its sign-in page
+  and callback. See [server compatibility](docs/review-fixes.md) and the included server patch.

{resutil-0.2.2 → resutil-0.2.3}/README.ja.md

@@ -158,9 +158,9 @@ storage_config:
 
 ### `resutil push`
 
-`resutil push`コマンドは、クラウドの結果ディレクトリに存在しない実験データをクラウドにアップロードするために使用されます。
+`resutil push 実験名` はローカルの実験をアップロードし、同名のリモート実験があれば上書きします。`resutil push --all` は未送信またはローカルで変更された実験を送信します。
 
-`resutil push [exp_name]`は、特定のディレクトリの実験データをクラウドにアップロードします。`exp-config.yaml`に含まれる依存ディレクトリは自動的にアップロードされます。`--no-dependency`オプションを使用すると、自動依存アップロードが制限されます。
+`resutil push [exp_name]`は、特定のディレクトリの実験データをクラウドにアップロードします。`resutil-exp.yaml`に含まれる依存ディレクトリは自動的にアップロードされます。`--no-dependency`オプションを使用すると、自動依存アップロードが制限されます。
 
 `resutil push --all`は、すべての実験データをクラウドにアップロードします。
 
@@ -168,7 +168,7 @@ storage_config:
 
 `resutil pull`コマンドは、ローカルの結果ディレクトリに存在しない特定の実験データをクラウドからダウンロードするために使用されます。
 
-`resutil pull [exp_name]`は、クラウドから実験ディレクトリをダウンロードします。`exp-config.yaml`に含まれる依存ディレクトリは自動的にダウンロードされます。`--no-dependency`オプションを使用すると、自動依存ダウンロードが制限されます。
+`resutil pull [exp_name]`は、クラウドから実験ディレクトリをダウンロードします。`resutil-exp.yaml`に含まれる依存ディレクトリは自動的にダウンロードされます。`--no-dependency`オプションを使用すると、自動依存ダウンロードが制限されます。
 
 `resutil pull --all`は、現在ローカルの結果ディレクトリに存在しないすべての実験データをクラウドからダウンロードします。
 
@@ -214,7 +214,7 @@ Resutilを組み込んだコードを実行する際に、以下の環境変数
 
 `RESUTIL_NO_INTERACTIVE` 非インタラクティブモードにします。実行時にユーザーへ問い合わせをしなくなります。バッチジョブとして実行する場合に利用します。`RESUTIL_COMMENT` が指定されていない場合には実験ディレクトリにコメントは付与されません。
 
-`RESUTIIL_REMOTE` クラウドストレージへのアップロードを抑制します。
+`RESUTIL_NO_REMOTE` クラウドストレージへのアップロードを抑制します。
 
 `RESUTIL_DEBUG` デバッグモードを有効にします。一時ディレクトリが実験ディレクトリとして使用され、クラウドストレージへのアップロードは行われません。
 
@@ -265,3 +265,24 @@ dependency: Dependencies (automatically extracted from directories in the comman
 1. `pyproject.toml` のバージョン番号を変更
 2. `main` ブランチにマージ
 3. `v*.*.*` タグを付与すると自動的にPyPIにデプロイされます
+
+
+### 安全性と追加設定
+
+- `resutil rm` は削除前に確認します。スクリプトでは `--yes` を指定できます。
+- `RESUTIL_NO_REMOTE` は認証とチェックポイントを含むアップロードを抑制します。
+  旧表記 `RESUTIIL_REMOTE` も互換用に受け付けます。
+- `RESUTIL_DEBUG` は実行ごとの一時ディレクトリを使用し、終了時に削除します。
+- `RESUTIL_TIMEZONE=Asia/Tokyo` のようにIANAタイムゾーンを指定できます。
+- `RESUTIL_STORAGE_TYPE`、`RESUTIL_GCS_BUCKET_NAME`、
+  `RESUTIL_GCS_KEY_FILE_PATH` で設定を上書きできます。
+- 設定内の相対パスは設定ファイルを基準に解決し、作業ディレクトリは変更しません。
+- コメントはUTF-8で200バイトまでです。同名ディレクトリの衝突時は一意な接尾辞を付けます。
+- `save_checkpoint()` は無効時・失敗時に `False` を返し、実験を止めません。
+  最終アップロードの失敗は例外になり、`resutil push 実験名` で再送できます。
+- 同期記録 `results/.resutil-sync.json` により、チェックポイント後の変更も検出します。
+  記録のない既存実験は一度再送します。別クライアントによるリモートだけの変更は比較しません。
+- コメント変更では依存参照とメタデータも更新します。リモートの依存参照を調べるため、
+  リモートアーカイブの読み取りが必要です。
+- 安全なログインには、サーバー側も `state` をサインイン画面とコールバックへ
+  引き継ぐ必要があります。[互換性の説明](docs/review-fixes.md) とサーバー用パッチを参照してください。

{resutil-0.2.2 → resutil-0.2.3}/README.md

@@ -160,9 +160,9 @@ storage_config:
 
 ### `resutil push`
 
-The `resutil push` command is used to upload experimental data to the cloud that does not exist in the cloud result directory.
+The `resutil push EXPERIMENT` command uploads a local experiment, replacing its remote archive if it exists. `resutil push --all` uploads new or locally modified experiments.
 
-`resutil push [exp_name]` uploads experiment a specific directory to the cloud. Depending directorys included in `exp-config.yaml` are automtically uploaded. `--no-dependency` option restrain automatic dependency upload.
+`resutil push EXPERIMENT` uploads the specified experiment and any new or modified local dependencies listed in `resutil-exp.yaml`. Pass `--no-dependency` to upload only the specified experiment.
 
 `resutil push  --all` will upload all experimental data to the cloud.
 
@@ -172,7 +172,7 @@ This is useful for keeping your local data up-to-date with the data stored in th
 
 The `resutil pull` command is used to download a specific experimental data from the cloud that does not exist in the local result directory.
 
-`resutil pull [exp_name]` downloads experiment directory from cloud. Depending directorys included in `exp-config.yaml` are automtically downlowded. `--no-dependency` option restrain automatic dependency download.
+`resutil pull [exp_name]` downloads experiment directory from cloud. Depending directorys included in `resutil-exp.yaml` are automtically downlowded. `--no-dependency` option restrain automatic dependency download.
 
 `resutil pull --all` will download all experimental data from the cloud that is not currently in your local result directory.
 
@@ -196,7 +196,7 @@ The `resutil rm` command removes experiments. You can use it as follows: resutil
 
 ### `resutil comment` **EXPERIMENTAL**
 
-`resutil comment [EXPERIMENT] [COMMENT]` adds or modifies a comment following the timestamp in the experiment name. Both local and cloud experiment names will change if they exist. Note that Resutil regards a different experiment name as a different experiment, so this does not affect the name of the same experiment other users have already pulled.
+`resutil comment [EXPERIMENT] [COMMENT]` adds or modifies a comment following the timestamp in the experiment name. Both local and cloud experiment names will change if they exist. Dependency references and the experiment metadata are updated; remote archives are inspected to find references. Note that Resutil regards a different experiment name as a different experiment, so this does not affect the name of the same experiment other users have already pulled.
 
 ### `resutil login`
 
@@ -218,7 +218,7 @@ When running code that integrates Resutil, you can use the following environment
 
 `RESUTIL_NO_INTERACTIVE` Enables non-interactive mode. This prevents any user prompts during execution. This is useful when running as a batch job. If `RESUTIL_COMMENT` is not specified, no comment will be added to the experiment directory.
 
-`RESUTIIL_REMOTE` Suppresses uploading results to cloud storage.
+`RESUTIL_NO_REMOTE` Suppresses uploading results to cloud storage.
 
 `RESUTIL_DEBUG` Enables debug mode where a temporary directory is used as experiment directory. The temporary directory will not be uploaded to cloud storage.
 
@@ -276,3 +276,24 @@ dependency: Dependencies (automatically extracted from directories in the comman
     ## Bug Fixed
     - Fix a bug resuitl does not works properly when git is not initialized
     ```
+
+
+### Reliability and configuration
+
+- `resutil rm` asks for confirmation; pass `--yes` for scripts. Without `--local`
+  or `--remote`, both copies are deleted.
+- `RESUTIL_NO_REMOTE` disables storage authentication and uploads, including checkpoints.
+  The old spelling `RESUTIIL_REMOTE` is accepted as an alias.
+- `RESUTIL_DEBUG` uses a unique temporary directory, cleans it up after execution,
+  and skips storage authentication and uploads.
+- `RESUTIL_TIMEZONE=Asia/Tokyo` selects an IANA time zone. Metadata records the UTC offset.
+- `RESUTIL_STORAGE_TYPE`, `RESUTIL_GCS_BUCKET_NAME` and `RESUTIL_GCS_KEY_FILE_PATH`
+  override the corresponding storage settings.
+- Configuration paths resolve relative to `resutil-conf.yaml`; the working directory is preserved.
+- Comments accept up to 200 UTF-8 bytes. Directory-name collisions receive a unique suffix.
+- `params.save_checkpoint()` returns `False` when disabled or failed. It does not interrupt
+  computation. A failed final upload raises an error; retry with `resutil push EXPERIMENT`.
+- New or modified local data is detected using `results/.resutil-sync.json`.
+  Missing receipts trigger a conservative upload; remote-only edits are not compared.
+- The server login endpoint must echo the login `state` through its sign-in page
+  and callback. See [server compatibility](docs/review-fixes.md) and the included server patch.

resutil-0.2.3/docs/releases/v0.2.3.md

@@ -0,0 +1,34 @@
+## Fixes
+
+- Prevent missing local experiments from overwriting remote results with empty archives.
+- Validate experiment names and deletion paths; require confirmation before deletion.
+- Fix legacy dependency paths, nested and cyclic transfers, and hidden transfer errors.
+- Detect modified results after checkpoints and retry failed final uploads.
+- Preserve function return values, failure exit codes, and the working directory.
+- Refresh server credentials during long runs, bind credentials to their server, and encode API paths.
+- Validate login callback state and tolerate unrelated callback requests.
+- Update dependency references when renaming comments; restore local metadata if renaming fails.
+- Fix Google Drive pagination, folder selection, concurrent access, and archive updates.
+- Avoid Unicode logging failures with legacy Windows output encodings.
+- Handle Git repositories without commits and record untracked files and deletions.
+- Improve TUI network-error handling, UTF-8 support, timezone selection, and directory-name collisions.
+
+## Compatibility
+
+- Server login requires a resutil-server deployment that preserves the login state.
+  Update the server before upgrading clients. Existing matching credentials can still be refreshed.
+  See `docs/server-login-state.patch` and `docs/review-fixes.md`.
+- Comments are limited to 200 UTF-8 bytes.
+- `resutil rm` requires confirmation; use `--yes` for scripts.
+- `RESUTIL_NO_REMOTE` skips authentication and uploads; `RESUTIIL_REMOTE` remains an alias.
+- Experiments without synchronization receipts are conservatively uploaded once.
+- `RESUTIL_TIMEZONE` accepts an IANA zone such as `Asia/Tokyo`.
+
+## Validation
+
+70 regression tests; Black, Flake8, mypy, and package-build checks.
+Added CI for Linux and Windows on Python 3.10 and 3.12.
+
+```sh
+pip install --upgrade resutil==0.2.3
+```

resutil-0.2.3/docs/review-fixes.md

@@ -0,0 +1,43 @@
+# Review fixes and compatibility
+
+- Transfers validate experiment names and directories before any destructive operation.
+  Local symlinks and archive traversal are rejected. Downloads are staged before publication.
+- Legacy dependency paths are normalized on read; new metadata stores experiment identifiers.
+  The coordinator visits cyclic graphs once and observes worker exceptions.
+- Successful transfers save a content receipt in results/.resutil-sync.json for each destination.
+  Missing receipts and modified data are treated as unsynced, including final results after a checkpoint.
+  Old experiments without receipts are conservatively uploaded once.
+  This tracks local changes; edits made by another client to the remote archive are not detected.
+- Explicit push can overwrite an existing remote experiment. Bulk push and the TUI skip
+  experiments whose local content matches the last successful transfer.
+- rm requires confirmation unless --yes is passed. --local works without storage credentials.
+- comment retains directory renaming. It updates local metadata and remote archive references.
+  Because the remote API has no dependency index, this reads remote archives before renaming.
+  The original remote target remains available until updated references have been saved.
+  Other clients' existing local copies keep their previous names and metadata.
+- User exceptions, interrupts and SystemExit retain their exit semantics after best-effort
+  result upload. Successful computation with failed final upload raises an error.
+  Checkpoint failure returns False and does not abort computation.
+- NO_REMOTE and DEBUG skip storage authentication and all uploads. Debug output is held
+  in a unique temporary directory and removed when the wrapped call finishes.
+- Configuration paths resolve relative to the config file; the process cwd is unchanged.
+- Metadata, configuration and text files use UTF-8. Comments are limited to 200 UTF-8 bytes.
+- RESUTIL_TIMEZONE accepts an IANA zone, such as Asia/Tokyo. The default is the local zone.
+  started_at includes the UTC offset; the alphabetical identifier uses UTC elapsed minutes.
+- Git snapshots include untracked files and deletion records; a first commit is optional.
+- Google Drive operations are serialized, lists are paginated and project folders are scoped
+  to the configured parent. Existing archives are updated in place rather than deleted first.
+- Server credentials are bound to their originating URL. Expiring tokens are refreshed on
+  requests; a 401 triggers one refresh/retry. URL path components are encoded.
+- Login callbacks require an unpredictable state and ignore unrelated requests until timeout.
+  The server must preserve the state parameter from /auth/login to /auth/signin and /callback.
+  Apply server-login-state.patch in the resutil-server checkout and deploy the updated server
+  before using the new login command. Older servers fail safely rather than accepting an
+  unbound callback. Existing matching credentials can still be used and refreshed.
+- Tests use temporary directories, in-memory storage, mocked Google clients and HTTP transports.
+  Real cloud storage is not contacted.
+
+Related issues: #20, #28, #29, #31, #33, #34, #37, #39, #41, #45.
+The architecture-only request #15 is intentionally outside this bug-fix scope.
+Windows readline dependency (#36), keyless server authentication (#44) and the TUI (#27)
+already exist; their surrounding error handling and documentation are covered here.

resutil-0.2.3/docs/server-login-state.patch

@@ -0,0 +1,69 @@
+--- a/src/resutil_server/routers/auth.py
++++ b/src/resutil_server/routers/auth.py
+@@ -1,3 +1,6 @@
++import json
++from urllib.parse import urlencode
++
+ from fastapi import APIRouter, Query, Request
+ from fastapi.responses import HTMLResponse
+ 
+@@ -14,17 +17,19 @@
+ @router.get("/login")
+ async def login(
+     request: Request,
+-    port: int = Query(description="CLI のローカルサーバーポート"),
++    port: int = Query(description="CLI のローカルサーバーポート", ge=1, le=65535),
++    state: str = Query(default="", max_length=256, pattern=r"^[A-Za-z0-9_-]*$"),
+ ) -> dict:
+     """CLI がブラウザで開く SSO ログインページの URL を返す。"""
+     signin_url = str(request.url_for("signin")).rstrip("/")
+-    login_url = f"{signin_url}?port={port}"
++    login_url = signin_url + "?" + urlencode({"port": port, "state": state})
+     return {"login_url": login_url, "api_key": settings.firebase_api_key}
+ 
+ 
+ @router.get("/signin", response_class=HTMLResponse)
+ async def signin(
+-    port: int = Query(description="CLI のローカルサーバーポート"),
++    port: int = Query(description="CLI のローカルサーバーポート", ge=1, le=65535),
++    state: str = Query(default="", max_length=256, pattern=r"^[A-Za-z0-9_-]*$"),
+ ) -> str:
+     """プロバイダ選択 → Firebase JS SDK で SSO → トークンを CLI に返す HTML ページ。"""
+     return f"""<!DOCTYPE html>
+@@ -106,7 +111,8 @@
+         window.location.href =
+           "http://localhost:{port}/callback"
+           + "?id_token=" + encodeURIComponent(idToken)
+-          + "&refresh_token=" + encodeURIComponent(refreshToken);
++          + "&refresh_token=" + encodeURIComponent(refreshToken)
++          + "&state=" + encodeURIComponent({json.dumps(state)});
+       }} catch (err) {{
+         status.className = "error";
+         status.textContent = "認証に失敗しました: " + err.message;
+--- a/tests/test_auth.py
++++ b/tests/test_auth.py
+@@ -34,3 +34,24 @@
+     assert resp.status_code == 200
+     assert "login('google')" in resp.text
+     assert "login('microsoft')" in resp.text
++
++
++def test_login_state_roundtrip():
++    client = TestClient(app)
++    state = "test_state-123"
++    resp = client.get("/auth/login", params={"port": 8085, "state": state})
++    assert resp.status_code == 200
++    assert "state=" + state in resp.json()["login_url"]
++    page = client.get(resp.json()["login_url"])
++    assert page.status_code == 200
++    assert 'encodeURIComponent("test_state-123")' in page.text
++
++
++def test_invalid_state_rejected():
++    client = TestClient(app)
++    assert client.get("/auth/signin", params={"port": 8085, "state": "<script>"}).status_code == 422
++
++
++def test_invalid_port_rejected():
++    client = TestClient(app)
++    assert client.get("/auth/login", params={"port": 0}).status_code == 422

{resutil-0.2.2 → resutil-0.2.3}/migration-to-server.md

@@ -54,11 +54,11 @@ resutil push/pull
 resutil login --server-url https://resutil-server-586113954845.asia-northeast1.run.app
 
 # Microsoft アカウントでログイン
-resutil login --provider microsoft --server-url https://resutil-server-586113954845.asia-northeast1.run.app
+resutil login --server-url https://resutil-server-586113954845.asia-northeast1.run.app
 
 # resutil-conf.yaml に server_url が設定済みなら --server-url は省略可能
 resutil login
-resutil login --provider microsoft
+resutil login
 ```
 
 ### 2. プロジェクト初期化
@@ -122,11 +122,11 @@ storage_config:
 ```
 
 - `id_token`: Firebase が発行する JWT（有効期限 1 時間）
-- `refresh_token`: トークン更新用（未実装。期限切れ時は `resutil login` を再実行）
+- `refresh_token`: トークン更新用（API要求前と401応答時に自動更新）
 - ファイルパーミッション: `600`
 
 ## 未実装・今後の課題
 
-- **トークン自動リフレッシュ**: 現状は id_token の期限が切れたら `resutil login` を再実行する必要がある。CLI 側で refresh_token を使った自動更新を実装予定
+- **ログインstate対応**: 新しいCLIを利用する前に docs/server-login-state.patch をサーバーへ適用し、デプロイする。state未対応サーバーへの新規ログインは拒否される。
 - **resutil-server 側のテスト**: サーバー側は 30 テスト通過済み（`uv run pytest -v`）
-- **CLI 側のテスト**: `ResutilServerStorage` の単体テストを追加予定
+- **CLI 側のテスト**: 認証更新、接続先照合、URLエンコード、コールバックstateを回帰テストで検証。

{resutil-0.2.2 → resutil-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "resutil"
-version = "0.2.2"
+version = "0.2.3"
 description = "Resutil is a utility to manage experimental result data obtained from Python projects. It also manages dependency such as codes and input data with result data. Data is synced to the cloud for team sharing and collaboration."
 authors = [{ name = "nobkat", email = "katayama@rs.tus.ac.jp" }]
 dependencies = [
@@ -16,6 +16,7 @@ dependencies = [
     "pyreadline3>=3.5.4; platform_system == 'Windows'",
     "textual>=8.2.1",
     "httpx>=0.27.0",
+    "tzdata>=2024.1 ; sys_platform == 'win32'",
 ]
 readme = "README.md"
 requires-python = ">= 3.10"
@@ -32,12 +33,14 @@ dev = [
     "black>=24.4.0",
     "pytest-mock>=3.14.0",
     "mypy>=1.10.0",
+    "types-pyyaml>=6.0.12.20261103",
 ]
 
 [tool.hatch.metadata]
 allow-direct-references = true
 
 [tool.hatch.build.targets.wheel]
+core-metadata-version = "2.4"
 packages = ["src/resutil"]
 
 [project.scripts]
@@ -46,3 +49,13 @@ resutil = 'resutil.cli:main'
 [project.urls]
 Homepage = "https://github.com/KatayamaLab/resutil"
 Issues = "https://github.com/KatayamaLab/resutil/issues"
+
+[tool.mypy]
+ignore_missing_imports = true
+check_untyped_defs = true
+
+[tool.black]
+target-version = ["py310"]
+
+[tool.hatch.build.targets.sdist]
+core-metadata-version = "2.4"

resutil-0.2.3/src/resutil/__init__.py

@@ -0,0 +1,3 @@
+from .main import main
+
+__all__ = ["main"]

{resutil-0.2.2 → resutil-0.2.3}/src/resutil/cli/__init__.py

@@ -1 +1,3 @@
 from .cli_main import main
+
+__all__ = ["main"]