windcode 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

windcode/__init__.py

@@ -3,4 +3,4 @@
 from windcode.sdk import Windcode
 
 __all__ = ["Windcode"]
-__version__ = "0.1.1"
+__version__ = "0.1.2"

windcode/cli.py

@@ -8,7 +8,7 @@ from collections.abc import Sequence
 from dataclasses import dataclass
 from pathlib import Path
 
-from windcode.config import AppConfig, ConfigError, PermissionMode, load_config
+from windcode.config import AppConfig, ConfigError, PermissionMode, ensure_user_config, load_config
 
 
 @dataclass(frozen=True, slots=True)
@@ -156,8 +156,9 @@ def run(argv: Sequence[str] | None = None) -> int:
         options = parse_options(arguments)
         if not options.workspace.is_dir():
             raise ConfigError(options.workspace, "workspace is not a directory")
+        write_config_file = options.config_file or ensure_user_config()
         config = resolve_config(options)
-    except ConfigError as exc:
+    except (ConfigError, OSError) as exc:
         print(f"windcode: {exc}", file=sys.stderr)
         return 2
 
@@ -171,7 +172,7 @@ def run(argv: Sequence[str] | None = None) -> int:
         permission_mode=(
             options.permission_mode.value if options.permission_mode is not None else None
         ),
-        config_file=options.config_file,
+        config_file=write_config_file,
     )
     app.run()
     return 0

windcode/config/__init__.py

@@ -1,4 +1,9 @@
-from windcode.config.loader import ConfigError, load_config
+from windcode.config.loader import (
+    ConfigError,
+    default_user_config_path,
+    ensure_user_config,
+    load_config,
+)
 from windcode.config.models import (
     HARD_MAX_CONCURRENT_SUBAGENTS,
     HARD_MAX_SUBAGENT_TASKS,
@@ -35,6 +40,8 @@ __all__ = [
     "StorageConfig",
     "SubagentConfig",
     "TraceConfig",
+    "default_user_config_path",
+    "ensure_user_config",
     "load_config",
     "save_memory_config",
     "save_model_config",

windcode/config/loader.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import copy
+import os
 import tomllib
 from collections.abc import Mapping
 from pathlib import Path
 from typing import Any, cast
 
+import tomli_w
 from platformdirs import user_config_path
 from pydantic import ValidationError
 
@@ -18,6 +20,30 @@ class ConfigError(ValueError):
         super().__init__(f"{source}: {message}")
 
 
+def default_user_config_path() -> Path:
+    return user_config_path("windcode") / "config.toml"
+
+
+def ensure_user_config(path: Path | None = None) -> Path:
+    """Create the default user configuration once without overwriting an existing file."""
+    target = (path or default_user_config_path()).expanduser().resolve()
+    if target.exists():
+        return target
+
+    content = tomli_w.dumps(AppConfig().model_dump(mode="json", exclude_none=True)).encode()
+    target.parent.mkdir(parents=True, exist_ok=True)
+    try:
+        descriptor = os.open(target, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600)
+    except FileExistsError:
+        return target
+
+    with os.fdopen(descriptor, "wb") as stream:
+        stream.write(content)
+        stream.flush()
+        os.fsync(stream.fileno())
+    return target
+
+
 def _deep_merge(base: dict[str, Any], overlay: Mapping[str, Any]) -> dict[str, Any]:
     merged = copy.deepcopy(base)
     for key, value in overlay.items():
@@ -52,7 +78,7 @@ def load_config(
     overrides: Mapping[str, Any] | None = None,
 ) -> AppConfig:
     workspace = workspace.expanduser().resolve()
-    default_user = user_config_path("windcode") / "config.toml"
+    default_user = default_user_config_path()
     default_project = workspace / ".windcode" / "config.toml"
     layers: list[tuple[Path | str, dict[str, Any]]] = [
         (

windcode/extensions/service.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import cast
 from uuid import uuid4
 
+from platformdirs import user_state_path
 from pydantic import TypeAdapter, ValidationError
 
 from windcode.config.models import (
@@ -57,13 +58,23 @@ class ExtensionService:
         workspace: Path,
         state_store: ExtensionStateStore,
         plugins_root: Path,
+        *,
+        user_skill_root: Path | None = None,
     ) -> None:
         self.config = config
         self.workspace = workspace.expanduser().resolve()
         self.state_store = state_store
         self.plugins_root = plugins_root
-        self._user_skill_roots = tuple(Path(path).expanduser() for path in config.skill_roots)
-        self._project_skill_root = self.workspace / ".windcode" / "skills"
+        default_user_skill_root = user_skill_root or user_state_path("windcode") / "skill"
+        self._user_skill_roots = tuple(
+            dict.fromkeys(
+                (
+                    default_user_skill_root.expanduser().resolve(),
+                    *(Path(path).expanduser().resolve() for path in config.skill_roots),
+                )
+            )
+        )
+        self._project_skill_root = self.workspace / ".windcode" / "skill"
         loaded = state_store.load()
         self._state = loaded.state
         self._state_diagnostics = loaded.diagnostics

windcode/sdk.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import shutil
 from collections.abc import AsyncIterator, Mapping
 from dataclasses import replace
 from pathlib import Path
@@ -226,21 +225,13 @@ class Windcode:
     def _resolve_state_root(self, explicit_root: Path | None) -> Path:
         if explicit_root is not None:
             return explicit_root.expanduser().resolve()
-        legacy_root = user_state_path("windcode").expanduser().resolve()
+        configured_project_root = self.config.storage.project_state_root
+        if configured_project_root is not None:
+            return self._configured_state_path(configured_project_root)
         configured_user_root = self.config.storage.user_storage_root
-        user_root = (
-            self._configured_state_path(configured_user_root)
-            if configured_user_root is not None
-            else legacy_root / "state"
-        )
-        source_root = user_root if user_root.exists() else legacy_root
-        configured = self.config.storage.project_state_root
-        if configured is None:
-            self._migrate_state_root(source_root, user_root)
-            return user_root
-        project_root = self._configured_state_path(configured)
-        self._migrate_state_root(source_root, project_root)
-        return project_root
+        if configured_user_root is not None:
+            return self._configured_state_path(configured_user_root)
+        return user_state_path("windcode").expanduser().resolve()
 
     def _configured_state_path(self, value: str) -> Path:
         project_root = Path(value).expanduser()
@@ -248,34 +239,6 @@ class Windcode:
             project_root = self.workspace / project_root
         return project_root.resolve()
 
-    @staticmethod
-    def _state_manifest(root: Path) -> dict[str, int]:
-        return {
-            str(path.relative_to(root)): path.stat().st_size
-            for path in root.rglob("*")
-            if path.is_file() and not path.is_symlink()
-        }
-
-    @classmethod
-    def _migrate_state_root(cls, source: Path, target: Path) -> None:
-        """Copy the complete legacy state once, validate it, then atomically install it."""
-        if source == target or target.exists():
-            return
-        target.parent.mkdir(parents=True, exist_ok=True)
-        temporary_parent = source.parent if target.is_relative_to(source) else target.parent
-        temporary = temporary_parent / f".{target.name}.migrate-{uuid4().hex}"
-        try:
-            if source.exists():
-                shutil.copytree(source, temporary, copy_function=shutil.copy2)
-                if cls._state_manifest(source) != cls._state_manifest(temporary):
-                    raise OSError("project state migration validation failed")
-            else:
-                temporary.mkdir(parents=True)
-            temporary.replace(target)
-        finally:
-            if temporary.exists():
-                shutil.rmtree(temporary)
-
     @classmethod
     def open(
         cls,

windcode/tui/app.py

@@ -16,7 +16,7 @@ from textual.theme import Theme
 from textual.widgets import Static
 
 from windcode.auth import CredentialStore, CredentialStoreError
-from windcode.config import AppConfig, PermissionMode, ProviderConfig
+from windcode.config import AppConfig, PermissionMode, ProviderConfig, default_user_config_path
 from windcode.domain.events import (
     ApprovalRequested,
     ApprovalResponse,
@@ -86,9 +86,7 @@ class WindcodeApp(App[None]):
         super().__init__()
         self.config = config
         self.workspace = workspace
-        self.config_file = (
-            (config_file or self.workspace / ".windcode" / "config.toml").expanduser().resolve()
-        )
+        self.config_file = (config_file or default_user_config_path()).expanduser().resolve()
         self.model = model
         self.session_id = session_id
         self.permission_mode = permission_mode or config.permission.mode.value

{windcode-0.1.1.dist-info → windcode-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: windcode
-Version: 0.1.1
+Version: 0.1.2
 Summary: A safe, extensible terminal coding agent
 Project-URL: Homepage, https://github.com/tingfeng347/windcode
 Project-URL: Repository, https://github.com/tingfeng347/windcode
@@ -149,12 +149,13 @@ Windcode 将记忆、会话、trace、扩展状态和 Worktree 统一存放在
 
 ```toml
 [storage]
-project_state_root = ".windcode/state"
-user_storage_root = "~/.local/state/windcode/state"
+project_state_root = ".windcode"
+user_storage_root = "~/.local/state/windcode"
 ```
 
-配置项目状态根时优先使用项目目录；未配置时使用用户状态目录。`.windcode/config.toml` 和
-`.windcode/state/` 都不应提交到 Git。
+配置项目状态根时优先使用项目目录；未配置时使用用户状态目录。Skill 会同时扫描两边的
+`skill/`，同名时项目级覆盖用户级。`.windcode/config.toml` 和 `.windcode/` 下的运行状态都
+不应提交到 Git。
 
 ## 开发
 

{windcode-0.1.1.dist-info → windcode-0.1.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-windcode/__init__.py,sha256=2Bsyy3KCOtcG7zJKag0Xc-MkKeosPbEjBiHm0Qq7tgc,112
+windcode/__init__.py,sha256=BARt9N0vEfFCqTjqKDwuV6nSmvFe3SAZ5FW2zoxxPdE,112
 windcode/__main__.py,sha256=eVJiCQBfl2fHUaa2hkQOWBdUMwXKeAPCV9yY-20rvpg,69
-windcode/cli.py,sha256=ummnlFAzPA6g05vCKic1ztJKA-bvYoUo72ajIaYD_-U,6844
-windcode/sdk.py,sha256=aw4SZvfFiDzllVI8iUGpUPYlQOLochP4jL4dwM5QllQ,53055
+windcode/cli.py,sha256=DLV2LiZFphNljqZCw1h59YyYTqH4f2cnltj7yfazbaI,6945
+windcode/sdk.py,sha256=5P4iw4WGKF5o-P4iPxQ3UJPr_0UrvZcs0jQE6iKFoO8,51543
 windcode/types.py,sha256=G5pI3aW5THKom4nlQJzeUtLkaVMoC88t_q2c5BoZsIo,1792
 windcode/auth/__init__.py,sha256=s5qLbtQu4C32u1KdubMDD1xGQH9wulJC168f1xaW2sE,201
 windcode/auth/store.py,sha256=aJ_qpdZN0SsI6gfm5jTfZCzAu3E025AkUTmf8GLodQA,3417
-windcode/config/__init__.py,sha256=KvwUx9yljb4AO5bcAgSHcBF_XOQH4wjNoTftq_cz3ho,932
-windcode/config/loader.py,sha256=wGINWvpTI5Z8rZs00byMTwwxSOQsFoKvJHsBCUUE-jA,4734
+windcode/config/__init__.py,sha256=J0Z0cA3RWqSgWl0MjwLQKlL_ZhorYNNZXU84OLqNFK8,1057
+windcode/config/loader.py,sha256=cNkIFsGVB5wteRs4OeTr9505WyFEpfNiARQqaRQvoZs,5551
 windcode/config/models.py,sha256=xKrGcjz-s1VhExHHKcn0kWyl2PETzcCqJ0pUYh1pT-E,7923
 windcode/config/writer.py,sha256=oE-18hbuCR6Q-8ePhRsr3H7xzw1Wa1s5yPo4cFywfhU,2512
 windcode/context/__init__.py,sha256=Dzjn41dbOox4xe1flx1S4VOvoIICwnAuxNU6Ks8xIt4,491
@@ -27,7 +27,7 @@ windcode/extensions/events.py,sha256=0pkMqldCjl0KxLeUPZv3ya8NvUgqO77dmjCApgCwWP0
 windcode/extensions/models.py,sha256=ZE7wyIXj_wL3PXaucLv6FRzA6Ihuyl5VCtoFo8kjp18,4562
 windcode/extensions/paths.py,sha256=bvyDE7Weka3yKKxkJXSMDIwDP5zndzXZgOb0UL9_540,2886
 windcode/extensions/runtime.py,sha256=0MWCYbaUvV1aEc-VEGjcs4OrGPWyinA7XhdSi0hzUn8,13254
-windcode/extensions/service.py,sha256=RF9EHX8Nt5oS-f1djfQ3AUZxf_UWkeyaAi2VBNwdZsU,17583
+windcode/extensions/service.py,sha256=esUt0cjQYLPOpvMes_3pdJhUb0xYLsQA4jqZcZEdwiA,17959
 windcode/extensions/snapshot.py,sha256=_llJ28td26FET9Ug33L9rf4Ej07hhQTeyoMTHVoRZpo,1836
 windcode/extensions/state.py,sha256=j4q2vBNVts2cAN6N5YALyaKSIZNMdg9nHWEjnkwJt4w,5636
 windcode/extensions/hooks/__init__.py,sha256=--8uqNAykerTXedXCepSJvjiCFFP1Ps8HbD5oAv2dUc,224
@@ -114,7 +114,7 @@ windcode/tools/subagents/list.py,sha256=7mGQEh_Jz2UyRZLbTpTYot6ZFXdXbWQixG3yTWzF
 windcode/tools/subagents/spawn.py,sha256=6CpovAguSZFAvBBJvBFPpzdLdRQoCGTDnrqjBLhtsLE,3038
 windcode/tools/subagents/wait.py,sha256=EJ_b-_JN7b_vdpdp8ly6Hc0176YAIxkcsJKiokCiR9Q,2859
 windcode/tui/__init__.py,sha256=K0DprxN5miNlExKuhffx1pkIxpUoEx7Iw1WKRn6RqGQ,68
-windcode/tui/app.py,sha256=w2RVcnsDStsacNW9asIsHomM_BWyVREuwhCOLvIvE80,46503
+windcode/tui/app.py,sha256=s7vl7PazplQ5sW7H7dr6bGu_cKHs9nxRb7_Ue0dPXNo,46487
 windcode/tui/commands.py,sha256=8hRutDmxCD89jJRxhaMmS03D7zZBsBJS_QBWzE3W2P0,2826
 windcode/tui/permission_display.py,sha256=gRVJ_OEXYGtgFx5Glv3aIdF0ybQO-J5s1ZkeLGu4j3U,565
 windcode/tui/styles.tcss,sha256=fn9PKO6AbAn1a3Iu5oTrijXE3Fn3PNVjQkBB90OzjH0,8244
@@ -136,8 +136,8 @@ windcode/worktrees/__init__.py,sha256=q3bfRMdZgECXrZfm-zwgNsHry3hpSsQDY3KltgnE4e
 windcode/worktrees/git.py,sha256=QNJO2qjdAIu33QM1ySHgwxxk6wed2j8t1VtJqNv1Lk8,3111
 windcode/worktrees/manager.py,sha256=eItN4zDogWX_lWP3QWpSVyH2u7oMdk2UoDfoJoM4MRs,10271
 windcode/worktrees/models.py,sha256=o3lR_SF5IwiBKmCqE9UThZffexW75TAShc7gvcnppVQ,1408
-windcode-0.1.1.dist-info/METADATA,sha256=VpMtURNmkSFhz2J8GLKYOycS4su5ZjHBJsHfvMtdCLo,5662
-windcode-0.1.1.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-windcode-0.1.1.dist-info/entry_points.txt,sha256=kZES599OUKWaEE7_wmuWPvWtfaaNFup1qggmQbxaXMg,47
-windcode-0.1.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-windcode-0.1.1.dist-info/RECORD,,
+windcode-0.1.2.dist-info/METADATA,sha256=l-1cmQXHn1cf263Wvx63RKQkWhlaLm084upMtXAl-zc,5741
+windcode-0.1.2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+windcode-0.1.2.dist-info/entry_points.txt,sha256=kZES599OUKWaEE7_wmuWPvWtfaaNFup1qggmQbxaXMg,47
+windcode-0.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+windcode-0.1.2.dist-info/RECORD,,