python-delphi-lsp 2.0.1__py3-none-any.whl → 2.0.2__py3-none-any.whl

delphi_lsp/_version.py

@@ -1 +1 @@
-__version__ = "2.0.1"
+__version__ = "2.0.2"

delphi_lsp/agent_cli.py

@@ -67,11 +67,19 @@ def build_parser() -> argparse.ArgumentParser:
 
     opencode = subcommands.add_parser("opencode", help="Install opencode integration.")
     opencode_commands = opencode.add_subparsers(dest="opencode_command", required=True)
-    opencode_install = opencode_commands.add_parser("install", help="Install .agents skill and opencode plugin.")
+    opencode_install = opencode_commands.add_parser(
+        "install", help="Install the package-named skill, Markdown agent, and OpenCode plugin."
+    )
     opencode_install.add_argument("--target", type=Path, default=Path("."))
     opencode_install.add_argument("--python", default=sys.executable)
     opencode_install.add_argument("--force", action="store_true")
-    opencode_install.add_argument("--write-config", action="store_true")
+    opencode_install.add_argument(
+        "--write-agent",
+        "--write-config",
+        dest="write_config",
+        action="store_true",
+        help="Deprecated compatibility option; the Markdown agent is always installed and opencode.json is never touched.",
+    )
     opencode_install.set_defaults(func=_opencode_install)
 
     worker = subcommands.add_parser("worker", help="Serve Protocol v2 NDJSON requests.")
@@ -139,7 +147,7 @@ def _skill_install(args: argparse.Namespace) -> None:
 
 
 def _opencode_install(args: argparse.Namespace) -> None:
-    skill_path, plugin_path, config_path = install_opencode_support(
+    skill_path, plugin_path, agent_path = install_opencode_support(
         args.target,
         python_executable=args.python,
         force=args.force,
@@ -147,8 +155,7 @@ def _opencode_install(args: argparse.Namespace) -> None:
     )
     print(skill_path)
     print(plugin_path)
-    if config_path is not None:
-        print(config_path)
+    print(agent_path)
 
 
 def _worker(args: argparse.Namespace) -> None:

delphi_lsp/agent_templates.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import hashlib
 from pathlib import Path
 import json
 import os
@@ -7,14 +8,20 @@ import secrets
 import stat
 
 
-SKILL_NAME = "delphi-codebase-navigator"
+SKILL_NAME = "python-delphi-lsp"
+AGENT_NAME = "python-delphi-lsp"
+_LEGACY_SKILL_NAME = "delphi-codebase-navigator"
+_LEGACY_SKILL_RELATIVE_PATH = Path(".agents") / "skills" / _LEGACY_SKILL_NAME / "SKILL.md"
+_LEGACY_SKILL_SHA256 = "0843d37bd48431c2b992f191b985175a3c60fe5b56d28e0a46b5e18db6383b28"
 _LEGACY_TOOL_RELATIVE_PATH = Path(".opencode") / "tools" / "delphi_codebase.ts"
 
 
 def install_skill(target: str | Path, *, force: bool = False) -> Path:
     target_path = Path(target).expanduser().resolve()
+    legacy_path = _preflight_legacy_skill(target_path, force=force)
     skill_path = target_path / ".agents" / "skills" / SKILL_NAME / "SKILL.md"
     _write_text(skill_path, _skill_markdown(), force=force)
+    _remove_legacy_skill(legacy_path)
     return skill_path
 
 
@@ -24,26 +31,30 @@ def install_opencode_support(
     python_executable: str,
     force: bool = False,
     write_config: bool = False,
-) -> tuple[Path, Path, Path | None]:
+) -> tuple[Path, Path, Path]:
     target_path = Path(target).expanduser().resolve()
     legacy_path = target_path / _LEGACY_TOOL_RELATIVE_PATH
+    legacy_skill_path = _preflight_legacy_skill(target_path, force=force)
     skill_path = target_path / ".agents" / "skills" / SKILL_NAME / "SKILL.md"
     plugin_path = target_path / ".opencode" / "plugins" / "delphi_codebase.ts"
-    config_path = target_path / "opencode.json" if write_config else None
+    agent_path = target_path / ".opencode" / "agents" / f"{AGENT_NAME}.md"
     skill_text = _skill_markdown()
     plugin_text = _opencode_plugin(python_executable)
+    agent_text = _agent_markdown()
 
     legacy_before = _preflight_legacy(legacy_path, force=force)
     snapshots: dict[Path, bytes | None] = {
         legacy_path: legacy_before,
+        **(
+            {legacy_skill_path: legacy_skill_path.read_bytes()}
+            if legacy_skill_path is not None
+            else {}
+        ),
         skill_path: _preflight_destination(skill_path, skill_text, force=force),
         plugin_path: _preflight_destination(plugin_path, plugin_text, force=force),
+        agent_path: _preflight_destination(agent_path, agent_text, force=force),
     }
-    writes = [(skill_path, skill_text), (plugin_path, plugin_text)]
-    if config_path is not None:
-        config_before, config_text = _render_opencode_config(config_path)
-        snapshots[config_path] = config_before
-        writes.append((config_path, config_text))
+    writes = [(skill_path, skill_text), (plugin_path, plugin_text), (agent_path, agent_text)]
 
     try:
         for path, text in writes:
@@ -51,11 +62,39 @@ def install_opencode_support(
                 _write_text(path, text, force=True)
         if legacy_before is not None:
             legacy_path.unlink()
+        _remove_legacy_skill(legacy_skill_path)
     except BaseException:
         for path, content in reversed(tuple(snapshots.items())):
             _restore_file(path, content)
         raise
-    return skill_path, plugin_path, config_path
+    _ = write_config  # Deprecated compatibility input; user configuration is never touched.
+    return skill_path, plugin_path, agent_path
+
+
+def _preflight_legacy_skill(target: Path, *, force: bool) -> Path | None:
+    legacy_path = target / _LEGACY_SKILL_RELATIVE_PATH
+    legacy_path.relative_to(target)
+    _reject_symbolic_link(legacy_path)
+    if not legacy_path.exists():
+        return None
+    if not legacy_path.is_file():
+        raise FileExistsError(f"Legacy skill path is not a file: {legacy_path}")
+    digest = hashlib.sha256(legacy_path.read_bytes()).hexdigest()
+    if digest != _LEGACY_SKILL_SHA256 and not force:
+        raise FileExistsError(
+            f"Refusing to remove modified legacy skill without force: {legacy_path}"
+        )
+    return legacy_path
+
+
+def _remove_legacy_skill(path: Path | None) -> None:
+    if path is None:
+        return
+    path.unlink()
+    try:
+        path.parent.rmdir()
+    except OSError:
+        pass
 
 
 def _preflight_legacy(legacy_path: Path, *, force: bool) -> bytes | None:
@@ -157,13 +196,18 @@ def _write_bytes_atomic(path: Path, content: bytes) -> None:
 
 
 def _reject_symbolic_link(path: Path) -> None:
-    if path.is_symlink():
-        raise FileExistsError(f"Generated destination must not be a symbolic link: {path}")
+    current = path
+    while current != current.parent:
+        if current.is_symlink():
+            raise FileExistsError(
+                f"Generated destination must not contain a symbolic link: {current}"
+            )
+        current = current.parent
 
 
 def _skill_markdown() -> str:
     return """---
-name: delphi-codebase-navigator
+name: python-delphi-lsp
 description: Inspect Delphi and Object Pascal codebases through the Protocol v2 semantic navigator.
 compatibility: opencode
 metadata:
@@ -192,6 +236,39 @@ Prefer `summary` and `declaration`, narrow `max_items` and `max_chars`, and requ
 """
 
 
+def _agent_markdown() -> str:
+    return """---
+description: Inspect Delphi and Object Pascal codebases through python-delphi-lsp.
+mode: subagent
+temperature: 0
+tools:
+  delphi_codebase: true
+  skill: true
+  lsp: false
+  bash: false
+  read: false
+  glob: false
+  grep: false
+  edit: false
+  write: false
+  task: false
+  webfetch: false
+  todowrite: false
+permission:
+  "*": deny
+  delphi_codebase: allow
+  skill:
+    "*": deny
+    python-delphi-lsp: allow
+---
+
+Load `python-delphi-lsp` first, then use only `delphi_codebase` for Delphi and
+Object Pascal codebase inspection. Do not use `lsp`, `bash`, `read`, `glob`,
+`grep`, `edit`, `write`, `task`, `webfetch`, or `todowrite`. Preserve returned
+citations exactly and report partial or ambiguous semantic evidence explicitly.
+"""
+
+
 def _opencode_plugin(python_executable: str) -> str:
     python_json = json.dumps(python_executable)
     template = '''import { tool, type Plugin } from "@opencode-ai/plugin"
@@ -525,56 +602,4 @@ export const DelphiCodebasePlugin: Plugin = async (_input) => {
     return template.replace("__PYTHON_EXECUTABLE__", python_json)
 
 
-def _render_opencode_config(config_path: Path) -> tuple[bytes | None, str]:
-    _reject_symbolic_link(config_path)
-    if config_path.exists():
-        if not config_path.is_file():
-            raise ValueError(f"opencode config path is not a file: {config_path}")
-        config_before = config_path.read_bytes()
-        config = json.loads(config_before.decode("utf-8"))
-    else:
-        config_before = None
-        config = {"$schema": "https://opencode.ai/config.json"}
-    if not isinstance(config, dict):
-        raise ValueError("opencode config must be a JSON object")
-    if "agent" not in config:
-        agents = {}
-        config["agent"] = agents
-    else:
-        agents = config["agent"]
-    if not isinstance(agents, dict):
-        raise ValueError("opencode config field 'agent' must be a JSON object")
-    agents["vllm-delphi-codebase"] = {
-        "description": "Use the Delphi codebase navigator skill and plugin without direct filesystem source inspection.",
-        "temperature": 0,
-        "prompt": (
-            "load delphi-codebase-navigator first, then use only delphi_codebase for Delphi/Object Pascal "
-            "codebase inspection. Do not use lsp, bash, read, glob, grep, edit, write, task, webfetch, or todowrite."
-        ),
-        "tools": {
-            "delphi_codebase": True,
-            "skill": True,
-            "lsp": False,
-            "bash": False,
-            "read": False,
-            "glob": False,
-            "grep": False,
-            "edit": False,
-            "write": False,
-            "task": False,
-            "webfetch": False,
-            "todowrite": False,
-        },
-        "permission": {
-            "delphi_codebase": "allow",
-            "skill": {
-                "*": "deny",
-                SKILL_NAME: "allow",
-            },
-            "lsp": "deny",
-        },
-    }
-    return config_before, json.dumps(config, indent=2, sort_keys=True) + "\n"
-
-
 __all__ = ["SKILL_NAME", "install_opencode_support", "install_skill"]

{python_delphi_lsp-2.0.1.dist-info → python_delphi_lsp-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-delphi-lsp
-Version: 2.0.1
+Version: 2.0.2
 Summary: Python Delphi/Object Pascal parser, semantic indexer, and language server.
 Author: Dark Light
 License-Expression: MPL-2.0
@@ -41,7 +41,7 @@ Dynamic: license-file
 
 `python-delphi-lsp` parses Delphi/Object Pascal, builds semantic and project
 indexes, serves LSP, and provides bounded codebase navigation for agents.
-Version 2.0.1 is authored by Dark Light and supports Windows, macOS, and Linux.
+Version 2.0.2 is authored by Dark Light and supports Windows, macOS, and Linux.
 
 ## Install and quick start
 
@@ -177,7 +177,7 @@ delphi-lsp-agent view --root PATH [--project-file FILE] --layer LAYER
 delphi-lsp-agent index --root PATH [--project-file FILE] [--out FILE]
 delphi-lsp-agent skill install [--target PATH] [--force]
 delphi-lsp-agent opencode install [--target PATH] [--python PYTHON]
-                                  [--force] [--write-config]
+                                  [--force] [--write-agent|--write-config]
 delphi-lsp-agent worker --root PATH [--project-file FILE]
 ```
 
@@ -187,8 +187,9 @@ delphi-lsp-agent worker --root PATH [--project-file FILE]
 returns a project summary and detailed unit metric objects; `--query` filters
 units by name or path.
 `index` materializes overview, projects, and problems JSON. `skill install`
-writes the skill; `opencode install` writes both integration files, while
-`--write-config` additionally writes the restricted agent configuration.
+writes the skill; `opencode install` writes the package-named skill, Markdown
+agent, and plugin. The two deprecated write flags are harmless aliases and do
+not change user configuration.
 `worker` serves NDJSON over standard input/output.
 
 Protocol v2 actions are `open`, `find`, `inspect`, `trace`, `focus`,
@@ -225,49 +226,47 @@ optimization does not remove LSP functionality.
 Install the generated integration in a worktree:
 
 ```bash
-delphi-lsp-agent opencode install --target . --write-config
+delphi-lsp-agent opencode install --target .
 ```
 
 It writes:
 
 ```text
-.agents/skills/delphi-codebase-navigator/SKILL.md
+.agents/skills/python-delphi-lsp/SKILL.md
 .opencode/plugins/delphi_codebase.ts
+.opencode/agents/python-delphi-lsp.md
 ```
 
-The generated configuration enables only the named
-`delphi-codebase-navigator` skill and `delphi_codebase`. It denies
+The package-named Markdown agent enables only the
+`python-delphi-lsp` skill and `delphi_codebase`. It denies
 `bash`, `read`, `glob`, `grep`, and `lsp`, along with edit/write and
 other raw source tools. The skill is enabled. The installer does not use the
-retired `.opencode/tools` path.
+retired `.opencode/tools` path and never reads or changes `opencode.json`; that
+file remains entirely user-owned. The deprecated `--write-config` and
+`--write-agent` options are accepted harmlessly for compatibility.
 
 The plugin maintains one worker per session/root, reusing focus and indexes.
 During compaction it restores the focus and summary into the new context.
 Transport failure, session deletion, and plugin disposal clean up the worker.
 
-A generated OpenCode agent looks like this; providers and unrelated agents stay
-unchanged:
-
-```json
-{
-  "agent": {
-    "vllm-delphi-codebase": {
-      "tools": {
-        "delphi_codebase": true, "skill": true, "lsp": false,
-        "bash": false, "read": false, "glob": false, "grep": false
-      },
-      "permission": {
-        "delphi_codebase": "allow",
-        "skill": {"*": "deny", "delphi-codebase-navigator": "allow"},
-        "lsp": "deny"
-      }
-    }
-  }
-}
+A generated OpenCode agent starts with this Markdown frontmatter:
+
+```markdown
+---
+description: Inspect Delphi and Object Pascal codebases through python-delphi-lsp.
+mode: subagent
+temperature: 0
+permission:
+  "*": deny
+  delphi_codebase: allow
+  skill:
+    "*": deny
+    python-delphi-lsp: allow
+---
 ```
 
-Select `vllm-delphi-codebase`, ask it to load
-`delphi-codebase-navigator`, then use `delphi_codebase` actions such as
+Select `python-delphi-lsp`, ask it to load the `python-delphi-lsp` skill, then
+use `delphi_codebase` actions such as
 `open`, `find`, `focus`, and `inspect`. Use semantic tool calls, not raw
 source tools.
 

{python_delphi_lsp-2.0.1.dist-info → python_delphi_lsp-2.0.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 delphi_lsp/__init__.py,sha256=Gtoeg_D3hLGCFi34wdYiKrIByAbkWe1zS84v6_KJ6_4,3768
-delphi_lsp/_version.py,sha256=wAxkK8w13vqoF47A8iqWdSlIgRRXmZiQ0R4wePZfzhs,22
-delphi_lsp/agent_cli.py,sha256=FY5h_rmbPLBAtr8NWL5IyzqEaJBJm7Y5IQptvlt8l4Y,9022
+delphi_lsp/_version.py,sha256=tATvJM5shAzfspHYjdVwpV2w3-gDA119NlEYi5X2lFY,22
+delphi_lsp/agent_cli.py,sha256=Mma4C1Ca_Hd_9dl0mePT7uIypw6j6gDWdKu9XxIMXQQ,9226
 delphi_lsp/agent_context.py,sha256=VCWiqIhLPQX6-_4P_kYHLKMZK7ia0c1mbFC7RcbQsOY,73316
 delphi_lsp/agent_layers.py,sha256=7TmplTL7m_riS8BxZCD-3j1p8iOGiD9QWHay5ZcDYiw,21369
 delphi_lsp/agent_metrics.py,sha256=6y9DrSnKitZbwRFQrofanw6k89YGqbvEacqgSKHgh2c,2695
 delphi_lsp/agent_protocol.py,sha256=cZ1LIMhrkOb5CqiGcjSH1eZUNqtJCYySUc54h-PCyOs,12551
 delphi_lsp/agent_relations.py,sha256=pXhuCjfwmicG3VG7lYtGvKKv-mFPQ_hJ3w0eavqMoV0,32900
-delphi_lsp/agent_templates.py,sha256=U6ldX6RpdpttF5D0QSAi_OsqkcCe30Jc75hyhV3geHQ,21305
+delphi_lsp/agent_templates.py,sha256=vPVJPlDfTU1P95-fPqHwyrDBw6zKtNMidjCdY16QHGk,21782
 delphi_lsp/agent_workspace.py,sha256=nnLwjLzkh_gsBxz8Czl_Q1OHRya7mHENGhmBi8br6AE,23527
 delphi_lsp/binary.py,sha256=40mEpE0SBYmifwEoNHwSU7IU_D2usVyWYWHJ73aDfoo,8529
 delphi_lsp/comment_builder.py,sha256=XvFW7WTbYy7yGN3MG40gtabTvhGj1ea1MYkySDbVMDA,832
@@ -26,9 +26,9 @@ delphi_lsp/semantic_builder.py,sha256=ulA7xHJpltjc6cTo5wh9yTcYazuIykM-YLMXD1h-wz
 delphi_lsp/source_reader.py,sha256=HWiw25sLVZ6s1GGpMl17uZ-o68HoxTEd3Z0__m1vsSE,520
 delphi_lsp/workspace.py,sha256=TU__SujItRlW8hB2kuYC7ZJx1WQVOj7frYxvo7rDqeI,2137
 delphi_lsp/writer.py,sha256=j-cnyiHFNOTFECL7Ehm-m43ye7ev7qFeCCscFMjrAOY,2503
-python_delphi_lsp-2.0.1.dist-info/licenses/LICENSE,sha256=-rPda9qyJvHAhjCx3ZF-Efy07F4eAg4sFvg6ChOGPoU,16726
-python_delphi_lsp-2.0.1.dist-info/METADATA,sha256=4CthXJEauAQJm7-BDm1iDnMdj9-Eovu-py69_ALNiPY,14621
-python_delphi_lsp-2.0.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-python_delphi_lsp-2.0.1.dist-info/entry_points.txt,sha256=rh_yGH7diowge_acQcST87A-ewH1QezEsAYC8T5ineY,103
-python_delphi_lsp-2.0.1.dist-info/top_level.txt,sha256=0Zp0sjw5Qtic3EQX9zNeegURga8NuXk6c2e9PN-3OTs,11
-python_delphi_lsp-2.0.1.dist-info/RECORD,,
+python_delphi_lsp-2.0.2.dist-info/licenses/LICENSE,sha256=-rPda9qyJvHAhjCx3ZF-Efy07F4eAg4sFvg6ChOGPoU,16726
+python_delphi_lsp-2.0.2.dist-info/METADATA,sha256=rMiG6A1pIFWKPfEFEqCX3ivspfyHx-KhUJyYk2R7NDA,14696
+python_delphi_lsp-2.0.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_delphi_lsp-2.0.2.dist-info/entry_points.txt,sha256=rh_yGH7diowge_acQcST87A-ewH1QezEsAYC8T5ineY,103
+python_delphi_lsp-2.0.2.dist-info/top_level.txt,sha256=0Zp0sjw5Qtic3EQX9zNeegURga8NuXk6c2e9PN-3OTs,11
+python_delphi_lsp-2.0.2.dist-info/RECORD,,