campfire-cli 0.1.5__tar.gz → 0.1.6__tar.gz

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: campfire-cli
-Version: 0.1.5
+Version: 0.1.6
 Summary: Local-first shared context and governance CLI for humans and agents
 License-Expression: MIT
 License-File: LICENSE

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "campfire-cli"
-version = "0.1.5"
+version = "0.1.6"
 description = "Local-first shared context and governance CLI for humans and agents"
 readme = "README.md"
 license = "MIT"

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/__init__.py

@@ -1,3 +1,3 @@
 """Campfire CLI package."""
 
-__version__ = "0.1.5"
+__version__ = "0.1.6"

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/document/cli/document_cli.py

@@ -13,6 +13,7 @@ from campfire_cli.app.document.service.document_service import DocumentService
 from campfire_cli.app.workspace.repository.workspace_repository import SqliteWorkspaceRepository
 from campfire_cli.app.workspace.service.workspace_service import WorkspaceService
 from campfire_cli.common.exceptions import AppError
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import WorkspaceSettings, campfire_home
 
 document_cli = typer.Typer(
@@ -27,7 +28,7 @@ def service(ctx: typer.Context) -> DocumentService:
     selector = ctx.find_root().params.get("workspace")
     root = campfire_home()
     resolution = WorkspaceService(root, SqliteWorkspaceRepository(root)).resolve(
-        selector, Path.cwd()
+        selector, safe_cwd()
     )
     settings = WorkspaceSettings.load(resolution.workspace_id, Path(resolution.workspace))
     return DocumentService(settings)

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/document/cli/profile_cli.py

@@ -16,6 +16,7 @@ from campfire_cli.app.document.service.document_profile_service import (
 from campfire_cli.app.workspace.repository.workspace_repository import SqliteWorkspaceRepository
 from campfire_cli.app.workspace.service.workspace_service import WorkspaceService
 from campfire_cli.common.exceptions import AppError
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import WorkspaceSettings, campfire_home
 
 profile_cli = typer.Typer(
@@ -28,7 +29,7 @@ def service(ctx: typer.Context) -> DocumentProfileService:
     selector = ctx.find_root().params.get("workspace")
     root = campfire_home()
     resolution = WorkspaceService(root, SqliteWorkspaceRepository(root)).resolve(
-        selector, Path.cwd()
+        selector, safe_cwd()
     )
     settings = WorkspaceSettings.load(resolution.workspace_id, Path(resolution.workspace))
     return DocumentProfileService(

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/document/cli/type_cli.py

@@ -14,6 +14,7 @@ from campfire_cli.app.document.service.document_type_service import DocumentType
 from campfire_cli.app.workspace.repository.workspace_repository import SqliteWorkspaceRepository
 from campfire_cli.app.workspace.service.workspace_service import WorkspaceService
 from campfire_cli.common.exceptions import AppError
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import WorkspaceSettings, campfire_home
 
 type_cli = typer.Typer(
@@ -26,7 +27,7 @@ def service(ctx: typer.Context) -> DocumentTypeService:
     selector = ctx.find_root().params.get("workspace")
     root = campfire_home()
     resolution = WorkspaceService(root, SqliteWorkspaceRepository(root)).resolve(
-        selector, Path.cwd()
+        selector, safe_cwd()
     )
     settings = WorkspaceSettings.load(resolution.workspace_id, Path(resolution.workspace))
     return DocumentTypeService(

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/workspace/cli/config_cli.py

@@ -8,6 +8,7 @@ from campfire_cli.app.workspace.cli.workspace_cli import emit, invoke
 from campfire_cli.app.workspace.repository.workspace_repository import SqliteWorkspaceRepository
 from campfire_cli.app.workspace.service.config_service import WorkspaceConfigService
 from campfire_cli.app.workspace.service.workspace_service import WorkspaceService
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import WorkspaceSettings, campfire_home
 
 config_cli = typer.Typer(
@@ -19,7 +20,7 @@ config_cli = typer.Typer(
 def service(workspace: str | None) -> WorkspaceConfigService:
     home = campfire_home()
     resolved = WorkspaceService(home, SqliteWorkspaceRepository(home)).resolve(
-        workspace, Path.cwd()
+        workspace, safe_cwd()
     )
     settings = WorkspaceSettings.load(resolved.workspace_id, Path(resolved.workspace))
     return WorkspaceConfigService(settings)

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/workspace/cli/domain_cli.py

@@ -8,6 +8,7 @@ from campfire_cli.app.workspace.cli.workspace_cli import emit, invoke
 from campfire_cli.app.workspace.repository.workspace_repository import SqliteWorkspaceRepository
 from campfire_cli.app.workspace.service.structure_service import DomainService
 from campfire_cli.app.workspace.service.workspace_service import WorkspaceService
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import campfire_home
 
 domain_cli = typer.Typer(
@@ -18,7 +19,7 @@ domain_cli = typer.Typer(
 def service(workspace: str | None) -> DomainService:
     home = campfire_home()
     resolved = WorkspaceService(home, SqliteWorkspaceRepository(home)).resolve(
-        workspace, Path.cwd()
+        workspace, safe_cwd()
     )
     return DomainService(Path(resolved.workspace), home)
 

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/workspace/cli/project_cli.py

@@ -8,6 +8,7 @@ from campfire_cli.app.workspace.cli.workspace_cli import emit, invoke
 from campfire_cli.app.workspace.repository.workspace_repository import SqliteWorkspaceRepository
 from campfire_cli.app.workspace.schema.workspace_schema import ProjectUpsertRequest
 from campfire_cli.app.workspace.service.project_service import ProjectService
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import campfire_home
 
 project_cli = typer.Typer(
@@ -117,7 +118,7 @@ def show(project_id: str) -> None:
 @project_cli.command("resolve")
 def resolve(path: Path | None = typer.Option(None, "--path")) -> None:
     """按本地路径和 Git remote 解析已注册 Project，不修改注册数据。"""
-    emit(invoke(lambda: service().resolve(path or Path.cwd())))
+    emit(invoke(lambda: service().resolve(path or safe_cwd())))
 
 
 @project_cli.command("check")

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/workspace/cli/space_cli.py

@@ -8,6 +8,7 @@ from campfire_cli.app.workspace.cli.workspace_cli import emit, invoke
 from campfire_cli.app.workspace.repository.workspace_repository import SqliteWorkspaceRepository
 from campfire_cli.app.workspace.service.structure_service import SpaceService
 from campfire_cli.app.workspace.service.workspace_service import WorkspaceService
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import campfire_home
 
 space_cli = typer.Typer(
@@ -18,7 +19,7 @@ space_cli = typer.Typer(
 def service(workspace: str | None) -> SpaceService:
     home = campfire_home()
     resolved = WorkspaceService(home, SqliteWorkspaceRepository(home)).resolve(
-        workspace, Path.cwd()
+        workspace, safe_cwd()
     )
     return SpaceService(Path(resolved.workspace), home)
 

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/workspace/cli/workspace_cli.py

@@ -11,6 +11,7 @@ from campfire_cli.app.workspace.repository.workspace_repository import SqliteWor
 from campfire_cli.app.workspace.schema.workspace_schema import WorkspaceCreateRequest
 from campfire_cli.app.workspace.service.workspace_service import WorkspaceService
 from campfire_cli.common.exceptions import AppError
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.settings import campfire_home
 
 workspace_cli = typer.Typer(
@@ -97,7 +98,7 @@ def show(workspace_id: str) -> None:
 @workspace_cli.command("resolve")
 def resolve(selector: str | None = typer.Option(None, "--workspace")) -> None:
     """按显式选择、当前目录或默认值解析 Workspace。"""
-    emit(invoke(lambda: service().resolve(selector, Path.cwd())))
+    emit(invoke(lambda: service().resolve(selector, safe_cwd())))
 
 
 @workspace_cli.command("set-default")

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/workspace/service/project_service.py

@@ -115,6 +115,31 @@ class ProjectService:
 
     def resolve(self, path: Path) -> ProjectResolutionResult:
         query = path.expanduser().resolve()
+        # 先做零成本的 local_path 匹配；有命中时注册信息足以应答，跳过 git 子进程
+        # （每次会话冷启动必经路径，两个 git 探测只为富化字段，属纯延迟开销）。
+        # 无 local_path 命中才跑 git 探测走 remote 兜底；此时 git_root/git_remote_url
+        # 输出实测值，local 命中路径输出 None 与注册 remote。
+        local_matches: list[ProjectMatch] = []
+        for project in self._repository.list_projects():
+            if not project.local_path:
+                continue
+            registered = Path(project.local_path).expanduser().resolve()
+            if query == registered or registered in query.parents:
+                local_matches.append(ProjectMatch(project=project, match_basis=["local-path"]))
+        if local_matches:
+            deepest = max(len(Path(item.project.local_path or "/").parts) for item in local_matches)
+            local_matches = [
+                item
+                for item in local_matches
+                if len(Path(item.project.local_path or "/").parts) == deepest
+            ]
+            return ProjectResolutionResult(
+                status="matched" if len(local_matches) == 1 else "ambiguous",
+                query_path=str(query),
+                git_root=None,
+                git_remote_url=local_matches[0].project.git_remote_url,
+                matches=local_matches,
+            )
         git_root_value = self._git_command(query, "rev-parse", "--show-toplevel")
         git_root = Path(git_root_value).resolve() if git_root_value else None
         remote = self._git_command(git_root or query, "remote", "get-url", "origin")
@@ -122,10 +147,6 @@ class ProjectService:
         matches: list[ProjectMatch] = []
         for project in self._repository.list_projects():
             basis: list[str] = []
-            if project.local_path:
-                registered = Path(project.local_path).expanduser().resolve()
-                if query == registered or registered in query.parents:
-                    basis.append("local-path")
             if (
                 normalized_remote
                 and project.git_remote_url
@@ -134,8 +155,7 @@ class ProjectService:
                 basis.append("git-remote")
             if basis:
                 matches.append(ProjectMatch(project=project, match_basis=basis))
-        local_matches = [item for item in matches if "local-path" in item.match_basis]
-        remote_only = [item for item in matches if "local-path" not in item.match_basis]
+        remote_only = matches
         if local_matches:
             deepest = max(len(Path(item.project.local_path or "/").parts) for item in local_matches)
             local_matches = [

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/app/workspace/service/workspace_service.py

@@ -26,6 +26,7 @@ from campfire_cli.app.workspace.service.structure_service import SpaceService
 from campfire_cli.app.workspace.service.workspace_protocol import WorkspaceRepositoryProtocol
 from campfire_cli.common.exceptions import ConfigurationError
 from campfire_cli.common.filesystem import atomic_write, workspace_write_lock
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.config.defaults import config_section
 
 
@@ -248,7 +249,7 @@ class WorkspaceService:
             raise ConfigurationError(
                 f"Workspace 未注册：{selector}；请先运行 campfire workspace add"
             )
-        current = (cwd or Path.cwd()).resolve()
+        current = (cwd or safe_cwd()).resolve()
         matches = [
             (workspace_id, Path(entry.path).expanduser().resolve())
             for workspace_id, entry in registry.workspaces.items()

campfire_cli-0.1.6/src/campfire_cli/common/filesystem/cwd.py

@@ -0,0 +1,21 @@
+"""cwd 探测的统一出口。
+
+进程工作目录可能已被删除（目录改名/移走后残留的 shell），os.getcwd() 此时抛
+OSError。所有以 cwd 作为解析起点的入口统一走 safe_cwd：探测失败回落 HOME，
+调用方拿到的语义是"尽力而为的上下文锚点"而非进程崩溃。
+"""
+
+import sys
+from pathlib import Path
+
+
+def safe_cwd() -> Path:
+    """返回当前工作目录；目录已不存在时回落用户 HOME 并告警。"""
+    try:
+        return Path.cwd()
+    except OSError:
+        print(
+            '{"warning": "当前工作目录已不存在，已回落 HOME 解析"}',
+            file=sys.stderr,
+        )
+        return Path.home()

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/container.py

@@ -32,6 +32,7 @@ from campfire_cli.app.workspace.service.workspace_service import WorkspaceServic
 from campfire_cli.common.agent_hints import default_hint_paths, inject_agent_hint
 from campfire_cli.common.database import create_sqlite_engine, open_session, upgrade_database
 from campfire_cli.common.exceptions import ConfigurationError
+from campfire_cli.common.filesystem.cwd import safe_cwd
 from campfire_cli.common.package_version import (
     default_align_command,
     detect_install_method,
@@ -213,7 +214,7 @@ class AppContainer:
         governance_root = campfire_home()
         resolution = WorkspaceService(
             governance_root, SqliteWorkspaceRepository(governance_root)
-        ).resolve(str(workspace) if workspace is not None else None, Path.cwd())
+        ).resolve(str(workspace) if workspace is not None else None, safe_cwd())
         settings = WorkspaceSettings.load(resolution.workspace_id, Path(resolution.workspace))
         database_path = governance_root / "campfire.db"
         upgrade_database(database_path)

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/src/campfire_cli/resources/defaults/config.yml

@@ -444,6 +444,7 @@ skills:
   - campfire-inbox-triage
   - campfire-weekly-report-writing
   - campfire-kanban-board
+  - campfire-task-management
   unknown_skill_policy: ignore
   orphaned_skill_policy: report
 bases:

campfire_cli-0.1.6/src/campfire_cli/resources/skills/campfire-task-management/SKILL.md

@@ -0,0 +1,90 @@
+---
+name: campfire-task-management
+description: "创建、更新和完成 Campfire 任务文档；适用于用户要求为某项目或个人新建/更新/完成任务时定位归属、按 Profile 契约写入并验证，不负责执行任务、改代码或 Agent Session 调度。"
+---
+
+# Campfire 任务管理
+
+统一任务文档（`任务-` 前缀）的创建、状态更新与完成闭环。任务分两类：有项目任务（关联已注册 Project）与无项目任务（个人待办、跨项目事务）。两类任务都不得虚构归属：`project` 字段只在能唯一解析到已注册 Project 时填写。
+
+通用写入门禁（授权、对象唯一、事实核验）遵循 `campfire-document-capture`；本 Skill 是任务类型的专项 SOP，不复制通用纪律。首次读写 Campfire 文档的 Session 先运行 `campfire-context-bootstrap` 解析 Workspace 与 Project。
+
+## 状态机
+
+```text
+用户表达任务意图
+        │
+        ▼
+project list 关键词匹配
+        │
+   ┌────┴────┐
+唯一命中   多候选/无候选
+   │           │
+   ▼           ▼
+有项目任务   能澄清则问用户，
+   │         不凭相似度猜测
+   │           │
+   │      用户明确无项目？
+   │        │        │
+   │       是        否（取消或继续澄清）
+   │        │
+   ▼        ▼
+项目文档中心  全局任务领域
+   └────┬────┘
+        ▼
+document inspect 取契约 → 写入 → check → sync → 回报路径
+```
+
+## 工作流
+
+### 1. 归属定位
+
+1. 从用户表述提取项目关键词（项目名、简称、仓库名、路径片段）。
+2. 运行 `campfire workspace project list`，在 id、name、git_remote_url、local_path、document_domain 中做子串匹配。
+3. 唯一命中即定位该项目及其 `document_domain`；多候选或无候选时向用户列出候选并询问，不凭名称相似度猜测。
+4. 用户明确表示任务不关联项目（个人待办、跨项目事务）时归入无项目任务。
+
+### 2. 无项目任务归属
+
+- 无项目任务统一落 `mywork/【工作日志】文档中心/任务/`（个人事务域；该子目录不存在时随首次任务创建，并遵循 `campfire-workspace-maintenance` 的领域检查）。
+- frontmatter 的 `project` 字段留空，`domain` 填实际所在领域；不虚构项目归属，不把跨项目事务挂到某一个项目下。
+
+### 3. 契约获取与写入
+
+1. 文件名使用 `任务-<一句话标题>.md` 前缀，类型契约以 `campfire document type list` 为准。
+2. 运行 `campfire document inspect --path <同领域最近一篇任务文档>` 获取该领域 task 类型的 Profile 字段与顺序；同领域无先例时在目标路径上以 inspect 反查领域默认 Profile。不硬编码字段清单。
+3. 按 field_order 拼 frontmatter 并写入正文骨架。字段规则：
+
+| 字段 | 规则 |
+|------|------|
+| task_id | 同领域既有任务递增编号；无先例时从 1 起 |
+| status | 新建 `todo`，进行中 `doing`，完成 `done`，取消 `cancelled`；以 Profile 实际枚举为准 |
+| lifecycle | 新建 `proposed`，进行中 `current`，完成/取消后 `completed` |
+| priority | 默认 `medium`；用户明示紧急/低优时用 `high`/`low` |
+| requires_human | 任务含部署、发布、对外沟通等 Agent 不可独立完成的关键步骤时为 `true` |
+| project | 仅在唯一解析到已注册 Project 时填写；无项目任务留空 |
+
+4. 有项目任务落各自文档中心的任务子目录（已有 `任务/` 惯例的项目沿用；无先例时在文档中心根下创建并沿用同规则）。
+
+### 4. 状态流转
+
+- 更新任务：只改 status、lifecycle、completed、result_summary 等状态字段与正文进展记录，不重写既有事实。
+- 完成任务：status → `done`、lifecycle → `completed`、补 result_summary 与 completed 日期；正文追加结论与证据来源。
+- 取消任务：status → `cancelled`，正文注明取消原因；不删除文档。
+- 用户口头报进度时主动提议同步对应任务文档；一次汇报合并提议，不逐条打断。
+
+### 5. 验证闭环
+
+```bash
+campfire --workspace personal document check --path "mywork/【某项目】文档中心/任务/任务-....md"
+campfire --workspace personal maintenance sync --scope "mywork/【某项目】文档中心"
+```
+
+写入或更新后必须执行 check 与 sync，向用户回报写入路径、创建或更新结果与未决字段；check 不通过不得声称完成。
+
+## 边界
+
+- 不负责执行任务本身、不修改代码、不分派或恢复 Agent Session。
+- 任务的讨论与方案沉淀遵循 `campfire-document-capture`，结构治理遵循 `campfire-workspace-maintenance`。
+- 看板类任务清单（`看板-` 前缀）的改造遵循 `campfire-kanban-board`，本 Skill 只处理单篇任务文档。
+- 不确定归属、字段枚举与 Profile 冲突时询问用户或走 Decision，不静默落盘。

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/tests/perf/test_resolve_subprocess_count.py

@@ -10,7 +10,7 @@ import pytest
 def test_project_resolve_git_subprocesses_do_not_scale_with_registry(
     workspace: Path, monkeypatch: pytest.MonkeyPatch, tmp_path_factory: pytest.TempPathFactory
 ) -> None:
-    """resolve 的 git 子进程数固定为至多 2 次，不随注册项目数增长。"""
+    """resolve 的 git 子进程数：命中注册 local_path 时为 0，未命中走 remote 兜底时至多 2 次。"""
     from typer.testing import CliRunner
 
     from campfire_cli.main import app
@@ -60,8 +60,7 @@ def test_project_resolve_git_subprocesses_do_not_scale_with_registry(
         app, ["workspace", "project", "resolve", "--path", str(project_dir)]
     )
     assert matched.exit_code == 0, matched.output
-    bounded = len(calls)
-    assert bounded <= 2, calls
+    assert len(calls) == 0, calls
 
     unregistered = tmp_path_factory.mktemp("unregistered")
     calls.clear()
@@ -69,4 +68,4 @@ def test_project_resolve_git_subprocesses_do_not_scale_with_registry(
         app, ["workspace", "project", "resolve", "--path", str(unregistered)]
     )
     assert unmatched.exit_code == 0, unmatched.output
-    assert len(calls) == bounded, calls
+    assert len(calls) <= 2, calls

{campfire_cli-0.1.5 → campfire_cli-0.1.6}/uv.lock

@@ -36,7 +36,7 @@ wheels = [
 
 [[package]]
 name = "campfire-cli"
-version = "0.1.4"
+version = "0.1.6"
 source = { editable = "." }
 dependencies = [
     { name = "alembic" },