codex-workspaces 0.2.0__tar.gz → 0.3.0__tar.gz

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to `codex-workspaces` will be documented in this file.
 
 This project follows a simple changelog format while it is still pre-release.
 
-## Unreleased
+## 0.3.0 - 2026-07-04
 
 ### Added
 
@@ -18,6 +18,7 @@ This project follows a simple changelog format while it is still pre-release.
 - Added the unified `~/.codex-workspaces/` root with workspace metadata, account snapshots, and default-account restore behavior.
 - Added legacy workspace migration with `migrate`, `migrate --dry-run`, and `init <workspace> --migrate-current`.
 - Added legacy account import with `accounts import-legacy` and workspace auth import with `accounts import-workspaces`.
+- Added account `rename`, guarded `delete --force`, and account `note` management.
 - Added `pyproject.toml`, package metadata, editable install support, and PyPI-ready build configuration.
 - Added GitHub Actions CI for Linux, macOS, Windows, and Python 3.9/3.11/3.13.
 - Added GitHub Actions Trusted Publishing workflow for PyPI releases.

{codex_workspaces-0.2.0/src/codex_workspaces.egg-info → codex_workspaces-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-workspaces
-Version: 0.2.0
+Version: 0.3.0
 Summary: Cross-platform Codex workspace switcher with a preserved macOS shell workflow.
 Author: blockchain-project-lives
 Project-URL: Homepage, https://github.com/blockchain-project-lives/codex-workspaces
@@ -190,6 +190,16 @@ codex-workspaces accounts restore-default
 
 `auth.json` contains credentials. Do not commit workspace directories, account snapshots, SQLite state, sessions, or shell snapshots to git; the project `.gitignore` excludes these patterns for local checkouts.
 
+Manage account metadata and snapshots:
+
+```bash
+codex-workspaces accounts note acct_research "lab account"
+codex-workspaces accounts rename acct_research acct_lab
+codex-workspaces accounts delete acct_lab --force
+```
+
+Account deletion always requires `--force` and refuses to delete an account that is still configured as any workspace's default account.
+
 Manage workspace metadata and lifecycle:
 
 ```bash

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/README.MD

@@ -162,6 +162,16 @@ codex-workspaces accounts restore-default
 
 `auth.json` contains credentials. Do not commit workspace directories, account snapshots, SQLite state, sessions, or shell snapshots to git; the project `.gitignore` excludes these patterns for local checkouts.
 
+Manage account metadata and snapshots:
+
+```bash
+codex-workspaces accounts note acct_research "lab account"
+codex-workspaces accounts rename acct_research acct_lab
+codex-workspaces accounts delete acct_lab --force
+```
+
+Account deletion always requires `--force` and refuses to delete an account that is still configured as any workspace's default account.
+
 Manage workspace metadata and lifecycle:
 
 ```bash

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/README.zh-CN.md

@@ -162,6 +162,16 @@ codex-workspaces accounts restore-default
 
 `auth.json` 包含认证凭据，不要提交到 git。工作区目录、账号快照、SQLite 状态、sessions 和 shell snapshots 已在本项目 `.gitignore` 中排除。
 
+管理账号备注和快照生命周期：
+
+```bash
+codex-workspaces accounts note acct_research "实验室账号"
+codex-workspaces accounts rename acct_research acct_lab
+codex-workspaces accounts delete acct_lab --force
+```
+
+删除账号始终需要 `--force`；如果某个工作区仍把该账号设为默认账号，删除会被拒绝。
+
 管理工作区备注和生命周期：
 
 ```bash

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/docs/RELEASE.zh-CN.md

@@ -88,9 +88,9 @@ permissions:
 1. 更新版本号和 `CHANGELOG.md`。
 2. 本地执行测试和构建检查。
 3. 合并到 `main`。
-4. 创建 Git tag，例如 `v0.2.0`，触发 `Publish to TestPyPI`。
+4. 创建 Git tag，例如 `v0.3.0`，触发 `Publish to TestPyPI`。
 5. 确认 TestPyPI 上传和安装正常。
-6. 从同一个提交创建并推送正式发布分支，例如 `release/v0.2.0`，触发 `Publish to PyPI`。
+6. 从同一个提交创建并推送正式发布分支，例如 `release/v0.3.0`，触发 `Publish to PyPI`。
 7. 如果 `pypi` Environment 配置了 Required reviewers，在 GitHub Actions 里批准部署。
 8. 在 PyPI 页面确认 wheel、sdist 和 README 渲染正常。
 

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/docs/TESTING.zh-CN.md

@@ -7,7 +7,7 @@
 - 文件系统行为：初始化统一目录工作区、切换链接、拒绝覆盖真实目录。
 - CLI 行为：命令别名、工作区名快捷切换、错误路径、帮助输出。
 - 管理行为：诊断、列表元信息、重命名、删除保护、备注读写和账号绑定。
-- 账号行为：账号快照保存、列表、临时切换、默认账号恢复、默认账号设置。
+- 账号行为：账号快照保存、列表、备注、重命名、删除保护、临时切换、默认账号恢复、默认账号设置。
 - 迁移行为：旧 `~/.codex-<name>` 工作区迁移、旧 `~/.codex-accounts` 导入、dry-run 不落盘、迁移前备份。
 - 统计行为：只读 `state_*.sqlite`，汇总 token、模型、最近会话和每日用量。
 - 平台行为：macOS App 控制可注入，非 macOS 自动跳过 App 启停，Codex 内置 Terminal 阻止或转交危险操作。

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codex-workspaces"
-version = "0.2.0"
+version = "0.3.0"
 description = "Cross-platform Codex workspace switcher with a preserved macOS shell workflow."
 readme = "README.MD"
 requires-python = ">=3.9"

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/src/codex_workspaces/__init__.py

@@ -1,3 +1,3 @@
 """Codex workspace switching utilities."""
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/src/codex_workspaces/cli.py

@@ -231,6 +231,30 @@ def run_accounts(args: Sequence[str], manager: WorkspaceManager) -> int:
             )
         manager.accounts_set_default(positional[0], positional[1], activate)
         return 0
+    if command in {"rename", "mv"}:
+        if len(rest) != 2:
+            manager.fail(
+                "用法: codex-workspaces accounts rename <旧账号> <新账号>",
+                "Usage: codex-workspaces accounts rename <old-account> <new-account>",
+            )
+        manager.accounts_rename(rest[0], rest[1])
+        return 0
+    if command in {"delete", "remove", "rm"}:
+        if not rest:
+            manager.fail(
+                "用法: codex-workspaces accounts delete <账号> --force",
+                "Usage: codex-workspaces accounts delete <account> --force",
+            )
+        manager.accounts_delete(rest[0], rest[1:])
+        return 0
+    if command == "note":
+        if not rest:
+            manager.fail(
+                "用法: codex-workspaces accounts note <账号> [备注文本|--clear]",
+                "Usage: codex-workspaces accounts note <account> [note text|--clear]",
+            )
+        manager.accounts_note(rest[0], rest[1:])
+        return 0
     if command == "import-workspaces":
         if rest:
             manager.fail(f"未知参数: {rest[0]}", f"Unknown option: {rest[0]}")

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/src/codex_workspaces/core.py

@@ -1139,6 +1139,122 @@ class WorkspaceManager:
             self.store.write_account_meta(account_meta)
         self.info(self.message(f"已设置默认账号: {clean_name} -> {account_id}", f"Set default account: {clean_name} -> {account_id}"))
 
+    def workspace_account_references(self, account_id: str) -> tuple[list[str], list[str]]:
+        default_refs: list[str] = []
+        active_refs: list[str] = []
+        for directory in self.workspace_dirs():
+            name = strip_workspace_name(str(directory))
+            meta = self.store.ensure_workspace_meta(name, directory)
+            if meta.default_account_id == account_id:
+                default_refs.append(name)
+            if meta.active_account_id == account_id:
+                active_refs.append(name)
+        return default_refs, active_refs
+
+    def accounts_rename(self, old_account: str, new_account: str) -> None:
+        self.store.ensure_layout()
+        old_id = self.account_id_from_input(old_account)
+        new_id = self.account_id_from_input(new_account)
+        if old_id == new_id:
+            self.fail("新旧账号名相同。", "Old and new account names are the same.")
+        old_dir = self.store.account_dir(old_id)
+        new_dir = self.store.account_dir(new_id)
+        if not self.store.account_meta_path(old_id).is_file():
+            self.fail(f"账号不存在: {old_id}", f"Account not found: {old_id}\nHint: run `codex-workspaces accounts list`")
+        if new_dir.exists():
+            self.fail(f"目标账号已存在: {new_id}", f"Target account already exists: {new_id}")
+
+        with self.store.lock():
+            old_dir.rename(new_dir)
+            meta = self.store.read_account_meta(new_id)
+            meta.id = new_id
+            meta.name = self.account_name_from_input(new_account)
+            meta.updated_at = iso_now()
+            self.store.write_account_meta(meta)
+            old_meta_path = self.store.account_meta_path(old_id)
+            if old_meta_path.exists():
+                old_meta_path.unlink()
+
+            for directory in self.workspace_dirs():
+                name = strip_workspace_name(str(directory))
+                workspace_meta = self.store.ensure_workspace_meta(name, directory)
+                changed = False
+                if workspace_meta.default_account_id == old_id:
+                    workspace_meta.default_account_id = new_id
+                    changed = True
+                if workspace_meta.active_account_id == old_id:
+                    workspace_meta.active_account_id = new_id
+                    changed = True
+                if changed:
+                    workspace_meta.updated_at = iso_now()
+                    self.store.write_workspace_meta(directory, workspace_meta)
+        self.info(self.message(f"已重命名账号: {old_id} -> {new_id}", f"Renamed account: {old_id} -> {new_id}"))
+
+    def accounts_delete(self, account: str, args: Sequence[str]) -> None:
+        self.store.ensure_layout()
+        force = False
+        for arg in args:
+            if arg == "--force":
+                force = True
+            else:
+                self.fail(f"未知参数: {arg}", f"Unknown option: {arg}")
+        if not force:
+            self.fail(
+                "删除账号需要 --force，避免误删认证快照。",
+                "Deleting an account requires --force to avoid accidental credential loss.",
+            )
+
+        account_id = self.account_id_from_input(account)
+        account_dir = self.store.account_dir(account_id)
+        if not self.store.account_meta_path(account_id).is_file():
+            self.fail(f"账号不存在: {account_id}", f"Account not found: {account_id}\nHint: run `codex-workspaces accounts list`")
+
+        default_refs, active_refs = self.workspace_account_references(account_id)
+        if default_refs:
+            refs = ", ".join(default_refs)
+            self.fail(
+                f"不能删除默认账号 {account_id}，仍被工作区使用: {refs}",
+                f"Cannot delete default account {account_id}; still used by workspaces: {refs}\nHint: run `codex-workspaces accounts set-default <workspace> <account>` first.",
+            )
+
+        with self.store.lock():
+            shutil.rmtree(account_dir)
+            for directory in self.workspace_dirs():
+                name = strip_workspace_name(str(directory))
+                workspace_meta = self.store.ensure_workspace_meta(name, directory)
+                if workspace_meta.active_account_id == account_id:
+                    workspace_meta.active_account_id = None
+                    workspace_meta.updated_at = iso_now()
+                    self.store.write_workspace_meta(directory, workspace_meta)
+        suffix = f" ({', '.join(active_refs)})" if active_refs else ""
+        self.info(self.message(f"已删除账号: {account_id}{suffix}", f"Deleted account: {account_id}{suffix}"))
+
+    def accounts_note(self, account: str, args: Sequence[str]) -> None:
+        self.store.ensure_layout()
+        account_id = self.account_id_from_input(account)
+        if not self.store.account_meta_path(account_id).is_file():
+            self.fail(f"账号不存在: {account_id}", f"Account not found: {account_id}\nHint: run `codex-workspaces accounts list`")
+        meta = self.store.read_account_meta(account_id)
+        if not args:
+            if meta.notes:
+                self.info(meta.notes)
+            else:
+                self.info(self.message("未设置备注。", "No note set."))
+            return
+        if len(args) == 1 and args[0] == "--clear":
+            meta.notes = ""
+            meta.updated_at = iso_now()
+            self.store.write_account_meta(meta)
+            self.info(self.message(f"已清除账号备注: {account_id}", f"Cleared account note: {account_id}"))
+            return
+        text = " ".join(args).strip()
+        if not text:
+            self.fail("备注不能为空。", "Note cannot be empty.")
+        meta.notes = text
+        meta.updated_at = iso_now()
+        self.store.write_account_meta(meta)
+        self.info(self.message(f"已更新账号备注: {account_id}", f"Updated account note: {account_id}"))
+
     def accounts_import_workspaces(self) -> None:
         self.store.ensure_layout()
         imported: list[str] = []
@@ -1333,6 +1449,9 @@ def usage(lang: str) -> str:
   codex-workspaces accounts use <账号>
   codex-workspaces accounts restore-default [工作区]
   codex-workspaces accounts set-default <工作区> <账号> [--activate]
+  codex-workspaces accounts rename <旧账号> <新账号>
+  codex-workspaces accounts delete <账号> --force
+  codex-workspaces accounts note <账号> [备注文本|--clear]
   codex-workspaces accounts import-workspaces
   codex-workspaces accounts import-legacy <旧账号目录>
       管理 auth.json 账号快照。accounts use 是临时切换，不修改工作区默认账号。
@@ -1411,6 +1530,9 @@ Usage:
   codex-workspaces accounts use <account>
   codex-workspaces accounts restore-default [workspace]
   codex-workspaces accounts set-default <workspace> <account> [--activate]
+  codex-workspaces accounts rename <old-account> <new-account>
+  codex-workspaces accounts delete <account> --force
+  codex-workspaces accounts note <account> [note text|--clear]
   codex-workspaces accounts import-workspaces
   codex-workspaces accounts import-legacy <legacy-accounts-dir>
       Manage auth.json account snapshots. accounts use is temporary and does not change the workspace default account.

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0/src/codex_workspaces.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-workspaces
-Version: 0.2.0
+Version: 0.3.0
 Summary: Cross-platform Codex workspace switcher with a preserved macOS shell workflow.
 Author: blockchain-project-lives
 Project-URL: Homepage, https://github.com/blockchain-project-lives/codex-workspaces
@@ -190,6 +190,16 @@ codex-workspaces accounts restore-default
 
 `auth.json` contains credentials. Do not commit workspace directories, account snapshots, SQLite state, sessions, or shell snapshots to git; the project `.gitignore` excludes these patterns for local checkouts.
 
+Manage account metadata and snapshots:
+
+```bash
+codex-workspaces accounts note acct_research "lab account"
+codex-workspaces accounts rename acct_research acct_lab
+codex-workspaces accounts delete acct_lab --force
+```
+
+Account deletion always requires `--force` and refuses to delete an account that is still configured as any workspace's default account.
+
 Manage workspace metadata and lifecycle:
 
 ```bash

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/tests/test_cli.py

@@ -114,6 +114,20 @@ class TestCliDispatch:
         assert "acct_work" in output
         assert "active=acct_work default=acct_work" in output
 
+    def test_account_lifecycle_dispatches(self, tmp_path: Path) -> None:
+        manager = manager_for(tmp_path)
+
+        assert run(["accounts", "init", "research"], manager) == 0
+        assert run(["accounts", "note", "research", "lab"], manager) == 0
+        assert run(["accounts", "rename", "research", "lab"], manager) == 0
+        assert run(["accounts", "delete", "lab", "--force"], manager) == 0
+
+        output = manager.stdout.getvalue()
+        assert "Initialized account: acct_research" in output
+        assert "Updated account note: acct_research" in output
+        assert "Renamed account: acct_research -> acct_lab" in output
+        assert "Deleted account: acct_lab" in output
+
     def test_migrate_and_import_legacy_dispatch(self, tmp_path: Path) -> None:
         manager = manager_for(tmp_path)
         legacy = manager.config.home_dir / ".codex-work"

{codex_workspaces-0.2.0 → codex_workspaces-0.3.0}/tests/test_core.py

@@ -147,7 +147,7 @@ class TestWorkspaceNames:
 
 
 class TestSystemPlatform:
-    def test_force_stop_waits_five_seconds_before_killall(self, monkeypatch) -> None:
+    def test_force_stop_waits_short_grace_period_before_killall(self, monkeypatch) -> None:
         platform = StubbornMacPlatform()
         stdout = io.StringIO()
         calls = []
@@ -164,8 +164,8 @@ class TestSystemPlatform:
 
         assert ["osascript", "-e", 'tell application "Codex" to quit'] in calls
         assert ["killall", "Codex"] in calls
-        assert sleeps == [1, 1, 1, 1, 1, 1]
-        assert "did not exit within 5s" in stdout.getvalue()
+        assert sleeps == [1] * (platforms_module.FORCE_QUIT_GRACE_SECONDS + 1)
+        assert f"did not exit within {platforms_module.FORCE_QUIT_GRACE_SECONDS}s" in stdout.getvalue()
 
 
 class TestWorkspaceManager:
@@ -565,3 +565,81 @@ class TestWorkspaceManager:
         assert meta.active_account_id == "acct_work"
         assert manager.store.account_auth_path("acct_work").read_text(encoding="utf-8") == '{"account":"work"}\n'
         assert "Imported workspace default accounts: 1" in stdout.getvalue()
+
+    def test_accounts_note_sets_reads_and_clears_meta_notes(self, tmp_path: Path) -> None:
+        manager, stdout, _ = make_manager(tmp_path)
+        manager.accounts_init("research")
+
+        manager.accounts_note("research", ["lab", "account"])
+        manager.accounts_note("research", [])
+        manager.accounts_note("research", ["--clear"])
+        manager.accounts_note("research", [])
+
+        meta = manager.store.read_account_meta("acct_research")
+        output = stdout.getvalue()
+        assert meta.notes == ""
+        assert "Updated account note: acct_research" in output
+        assert "lab account" in output
+        assert "Cleared account note: acct_research" in output
+        assert "No note set." in output
+
+    def test_accounts_rename_updates_workspace_default_and_active_refs(self, tmp_path: Path) -> None:
+        manager, stdout, _ = make_manager(tmp_path)
+        manager.init_workspace("work", [])
+        manager.switch_workspace("work", ["--no-stop", "--no-start"], ["switch", "work"])
+        (manager.workspace_dir("work") / "auth.json").write_text('{"account":"work"}\n', encoding="utf-8")
+        manager.accounts_save("work")
+        manager.accounts_set_default("work", "work", activate=True)
+
+        manager.accounts_rename("work", "office")
+
+        meta = manager.store.read_workspace_meta(manager.workspace_dir("work"), "work")
+        account_meta = manager.store.read_account_meta("acct_office")
+        assert meta.default_account_id == "acct_office"
+        assert meta.active_account_id == "acct_office"
+        assert account_meta.id == "acct_office"
+        assert account_meta.name == "office"
+        assert not manager.store.account_dir("acct_work").exists()
+        assert manager.store.account_auth_path("acct_office").read_text(encoding="utf-8") == '{"account":"work"}\n'
+        assert "Renamed account: acct_work -> acct_office" in stdout.getvalue()
+
+    def test_accounts_delete_requires_force_and_refuses_default_account(self, tmp_path: Path) -> None:
+        manager, _, _ = make_manager(tmp_path)
+        manager.init_workspace("work", [])
+        manager.switch_workspace("work", ["--no-stop", "--no-start"], ["switch", "work"])
+        (manager.workspace_dir("work") / "auth.json").write_text('{"account":"work"}\n', encoding="utf-8")
+        manager.accounts_save("work")
+        manager.accounts_set_default("work", "work", activate=True)
+
+        with pytest.raises(CodexWorkspacesError, match="requires --force"):
+            manager.accounts_delete("work", [])
+        with pytest.raises(CodexWorkspacesError, match="Cannot delete default account"):
+            manager.accounts_delete("work", ["--force"])
+
+        assert manager.store.account_dir("acct_work").is_dir()
+
+    def test_accounts_delete_removes_non_default_and_clears_active_refs(self, tmp_path: Path) -> None:
+        manager, stdout, _ = make_manager(tmp_path)
+        manager.init_workspace("work", [])
+        manager.switch_workspace("work", ["--no-stop", "--no-start"], ["switch", "work"])
+        (manager.workspace_dir("work") / "auth.json").write_text('{"account":"work"}\n', encoding="utf-8")
+        manager.accounts_save("work")
+        manager.accounts_set_default("work", "work", activate=True)
+        personal_auth = tmp_path / "personal-auth.json"
+        personal_auth.write_text('{"account":"personal"}\n', encoding="utf-8")
+        manager.store.create_account(
+            "acct_personal",
+            name="personal",
+            source="manual",
+            bound_workspace=None,
+            auth_source=personal_auth,
+        )
+        manager.accounts_use("personal")
+
+        manager.accounts_delete("personal", ["--force"])
+
+        meta = manager.store.read_workspace_meta(manager.workspace_dir("work"), "work")
+        assert meta.default_account_id == "acct_work"
+        assert meta.active_account_id is None
+        assert not manager.store.account_dir("acct_personal").exists()
+        assert "Deleted account: acct_personal" in stdout.getvalue()