claude-timemachine
20cfdf62f2
Reshapes the launcher integration around two ideas:
1. ONE global Prism PreLaunch/PostExit hook is enough for all
instances. Wire it once at Settings > Default > Custom commands:
python /opt/cloud-sync.pyz pull --pack-folder=$INST_MC_DIR
python /opt/cloud-sync.pyz push --pack-folder=$INST_MC_DIR
Instances WITHOUT .cloud-sync/sync.json are silent no-ops (rc=0,
no UI, no banner). The opt-in probe runs BEFORE the UI factory
so Prism's launch log stays clean for non-sync instances.
2. Per-instance opt-in via 'setup' / 'init' subcommands that mint a
fresh ULID-style instance_id + write sync.json (mode 644) and
token (mode 600). 'disable' removes sync.json; cloud data
untouched.
Restic URL gains an /<instance_id>/ subpath under the user's
namespace, so two Prism instances of the same Discord user no longer
share a snapshot timeline. --private-repos still gates on the first
path segment (the username); deeper segments are user-controlled,
so this works without server-side coordination. First-push-on-a-new-
instance probes via 'restic cat config' and 'init's the per-instance
repo if absent.
UI label resolution is runtime-only (NEVER stored in sync.json) so
the user renaming the Prism instance just propagates through on
next launch:
--instance-label > $INST_NAME > $INST_ID > instance_id[:8]
Schema bumps:
state.json schema: 1 -> 2, adds instance_id field. Schema-1 files
are treated as missing (existing test1 user re-pulls fresh).
sync.json schema: 1 (new file).
CLI rework:
pull / push no --url; load everything from sync.json
setup interactive: Qt login dialog for token; URL prompt
if --url omitted; falls back to stdin when headless
init non-interactive setup; for scripted callers
disable rm sync.json
Args dataclass: drops 'url', adds 'instance_label'. cli.parse() now
returns (cmd, Namespace); a separate args_from(ns) builds the Args
so each subcommand can pluck the bits it needs from the Namespace
without forcing a 'one Args fits all subcommands' shape.
73 tests green; pyz 75 KB.
Smoke-verified locally:
- pull/push on a folder without sync.json: silent rc=0, no banner
- init writes sync.json (644) + token (600) with correct contents
- disable removes sync.json, keeps token
- mint produces unique 26-char base32 instance_ids
- label resolution chain (flag > INST_NAME > INST_ID > prefix)
119 lines
3.7 KiB
Python
119 lines
3.7 KiB
Python
"""sync.json read/write/mint + label resolution."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from cloud_sync import config as cfgmod
|
|
|
|
|
|
# ---- mint / new_instance_id ----
|
|
|
|
|
|
def test_new_instance_id_shape():
|
|
iid = cfgmod.new_instance_id()
|
|
assert len(iid) == 26
|
|
# base32 alphabet (uppercase + 2-7), no padding
|
|
assert re.fullmatch(r"[A-Z2-7]+", iid), iid
|
|
|
|
|
|
def test_new_instance_id_uniqueness():
|
|
ids = {cfgmod.new_instance_id() for _ in range(200)}
|
|
assert len(ids) == 200 # collisions effectively impossible
|
|
|
|
|
|
def test_mint_returns_filled_config():
|
|
cfg = cfgmod.mint(url="https://x.test")
|
|
assert cfg.url == "https://x.test"
|
|
assert len(cfg.instance_id) == 26
|
|
assert cfg.host_fingerprint # non-empty hex
|
|
assert cfg.created_at.tzinfo is not None
|
|
|
|
|
|
# ---- read / write / exists / delete ----
|
|
|
|
|
|
def test_exists_false_when_missing(tmp_path: Path):
|
|
assert cfgmod.exists(tmp_path) is False
|
|
assert cfgmod.read(tmp_path) is None
|
|
|
|
|
|
def test_write_then_read_roundtrip(tmp_path: Path):
|
|
cfg = cfgmod.mint(url="https://x.test")
|
|
cfgmod.write(tmp_path, cfg)
|
|
assert cfgmod.exists(tmp_path) is True
|
|
got = cfgmod.read(tmp_path)
|
|
assert got is not None
|
|
assert got.url == cfg.url
|
|
assert got.instance_id == cfg.instance_id
|
|
assert got.host_fingerprint == cfg.host_fingerprint
|
|
|
|
|
|
def test_write_sets_mode_644(tmp_path: Path):
|
|
"""sync.json is NOT a secret — it's the opt-in marker + (instance_id, url)
|
|
pair. token is the secret (mode 600)."""
|
|
cfg = cfgmod.mint(url="https://x.test")
|
|
cfgmod.write(tmp_path, cfg)
|
|
mode = cfgmod.config_path(tmp_path).stat().st_mode & 0o777
|
|
assert mode == 0o644
|
|
|
|
|
|
def test_delete_returns_true_when_existed(tmp_path: Path):
|
|
cfgmod.write(tmp_path, cfgmod.mint("https://x"))
|
|
assert cfgmod.delete(tmp_path) is True
|
|
assert cfgmod.exists(tmp_path) is False
|
|
|
|
|
|
def test_delete_returns_false_when_missing(tmp_path: Path):
|
|
assert cfgmod.delete(tmp_path) is False
|
|
|
|
|
|
def test_corrupt_json_returns_none(tmp_path: Path):
|
|
cfg_path = cfgmod.config_path(tmp_path)
|
|
cfg_path.parent.mkdir(parents=True)
|
|
cfg_path.write_text("{not json")
|
|
assert cfgmod.read(tmp_path) is None
|
|
|
|
|
|
def test_wrong_schema_returns_none(tmp_path: Path):
|
|
cfg_path = cfgmod.config_path(tmp_path)
|
|
cfg_path.parent.mkdir(parents=True)
|
|
cfg_path.write_text('{"schema": 999, "url": "x", "instance_id": "y", "created_at": "2026-01-01T00:00:00Z"}')
|
|
assert cfgmod.read(tmp_path) is None
|
|
|
|
|
|
# ---- resolve_label ----
|
|
|
|
|
|
def test_label_flag_wins_over_env(monkeypatch: pytest.MonkeyPatch):
|
|
monkeypatch.setenv("INST_NAME", "from-env")
|
|
assert cfgmod.resolve_label("from-flag", "ABCDEF") == "from-flag"
|
|
|
|
|
|
def test_label_falls_back_to_inst_name(monkeypatch: pytest.MonkeyPatch):
|
|
monkeypatch.setenv("INST_NAME", "Frazaserver 1.21.4")
|
|
monkeypatch.delenv("INST_ID", raising=False)
|
|
assert cfgmod.resolve_label(None, "ABCDEF") == "Frazaserver 1.21.4"
|
|
|
|
|
|
def test_label_falls_back_to_inst_id(monkeypatch: pytest.MonkeyPatch):
|
|
monkeypatch.delenv("INST_NAME", raising=False)
|
|
monkeypatch.setenv("INST_ID", "26.1.2")
|
|
assert cfgmod.resolve_label(None, "ABCDEF") == "26.1.2"
|
|
|
|
|
|
def test_label_last_resort_uses_instance_id_prefix(monkeypatch: pytest.MonkeyPatch):
|
|
monkeypatch.delenv("INST_NAME", raising=False)
|
|
monkeypatch.delenv("INST_ID", raising=False)
|
|
assert cfgmod.resolve_label(None, "ABCDEFGHIJKLMN") == "ABCDEFGH"
|
|
|
|
|
|
def test_label_blank_flag_does_not_override(monkeypatch: pytest.MonkeyPatch):
|
|
"""Empty string from --instance-label="" should not win over env."""
|
|
monkeypatch.setenv("INST_NAME", "env-name")
|
|
assert cfgmod.resolve_label("", "ABCDEF") == "env-name"
|