xdog-coding 2.4.2__tar.gz → 2.4.4__tar.gz

{xdog_coding-2.4.2 → xdog_coding-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: xdog-coding
-Version: 2.4.2
+Version: 2.4.4
 Summary: Interactive coding agent CLI
 Project-URL: Homepage, https://xdog.942295.xyz
 Project-URL: Repository, https://github.com/litterzhang/xdog
@@ -23,9 +23,11 @@ Requires-Dist: agent-client-protocol<0.13,>=0.12.1; python_version < '3.15'
 Requires-Dist: click>=8.1.0
 Requires-Dist: pydantic>=2.0
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: xdog-agent>=2.4.2
-Requires-Dist: xdog-ai[openai]>=2.4.2
-Requires-Dist: xdog-tui>=2.4.2
+Requires-Dist: xdog-agent>=2.4.4
+Requires-Dist: xdog-ai[openai]>=2.4.4
+Requires-Dist: xdog-tui>=2.4.4
+Provides-Extra: skills
+Requires-Dist: xdog-skills>=2.4.4; extra == 'skills'
 Description-Content-Type: text/markdown
 
 # xdog-coding
@@ -578,7 +580,8 @@ continuation silently reconnects, replays POSTs or expands configured disclosure
 
 ### Task planning and host read-only scope
 
-The builtin **`xdog-planning`** skill uses ordinary conversation or task documents
+The builtin **`xdog-planning`** skill, supplied by `xdog-skills` (install the
+`skills` extra), uses ordinary conversation or task documents
 for objectives, dependencies, acceptance criteria and evidence-backed progress.
 It does not create a separate plan database, inspector, execution mode or model
 loop. The former `/plan`, `PlanPanel` and `update_plan` UI/tool APIs are removed.
@@ -775,7 +778,7 @@ none of these interfaces grants tool permission or full Pi API compatibility.
 
 ### Supervised child agents
 
-`/agents start TASK` starts bounded read-only child work. `/agents start --inherit
+`/agents start TASK` starts host-managed read-only child work. `/agents start --inherit
 TASK` inherits the current host policy; it does not copy approval grants or bypass
 read-only. Inspect with `/agents list` or `/agents inspect ID`; use `steer ID TEXT`,
 `follow-up ID TEXT`, `cancel ID`, `wait ID` and `close ID` under `/agents`.
@@ -784,10 +787,34 @@ recursively delegate through their parent's supervision tools.
 
 Children share the workspace, so coordinate conflicting writes. Context is copied
 at admission through a complete tool/result checkpoint. Model/options/tool execution
-mode are inherited. Defaults are three active children, 16 retained records,
-120-second execution deadline, 16 model calls and a 32,000 reported-token stop
-threshold—not exact billing. Output limits are clamped; input accounting can
-overshoot on the final request. Cleanup/persistence may outlast the execution deadline.
+mode are inherited. There is no fixed concurrent-child or retained-record count
+limit, elapsed-time deadline, model-call cap or cumulative reported-token stop
+threshold. The main Agent/host manages lifecycle with cancel/wait/close. Usage
+counters remain reported usage, not exact billable accounting; actual model
+output/context limits, permissions and message/input/image/per-file capacities
+still apply. Complete history uses atomic segmented persistence instead of a
+cumulative 512 KiB / 2,000-message execution cutoff; tool/result pairs are not
+silently truncated.
+
+Coding and Claw child factories explicitly enable the Agent's existing built-in
+compaction policy through `AgentConfig(compaction=selected.compaction(child_stream))`
+and provide `archive_compaction=store.archive_compaction` to the supervisor.
+This does **not** change the generic Agent default: automatic compaction is off
+unless explicitly configured. The selected helper uses the executing adapter's
+real context/prompt/output capacity; unknown metadata, context capacity or output
+reserve returns `None` (auto-compaction remains off), not a guessed fallback.
+A host requiring automatic compaction must reject that case or explicitly supply
+trusted capacity/reserve through native `CompactionConfig`.
+
+With the policy enabled, one long tool turn can compact repeatedly at safe paired
+boundaries. The supervisor waits for a durable full pre-compaction snapshot before
+the native summary request starts. Archive, summary or stream-cleanup failure does
+not commit a history cut, and cancellation settles owned writes/cleanup. The native
+summary's per-request timeout/capacity checks remain; there is no replacement child
+lifetime cap. Inspect shows the current retained context, possibly with summaries;
+`children.store.compaction_archives(child_id)` reads full earlier snapshots without
+replay. These child archives are separate from the parent session's `/tree`
+compaction checkpoints.
 
 Each child has independent Coding approvals and extension workers/state. Parent
 validation/context hooks and current read-only/permission gates remain authoritative;
@@ -830,10 +857,10 @@ still uses silent no-UI answers to avoid borrowing its separate dialog reservati
 Complex extension forms are removed; basic child dialogs retain these ownership and cancellation checks.
 
 
-### Child specialization and limits
+### Child specialization and protocol limits
 
 `/agents start --label Reviewer --instructions "Inspect only" --tools filesystem,current_time
---fresh --timeout 60 --calls 4 --tokens 8000 -- TASK` specializes a child without
+--fresh -- TASK` specializes a child without
 changing parent permissions. Options precede the task; `--` preserves a task that
 starts with flags. Plain tasks preserve quotes/newlines. `--tools none` gives the
 child no executable tools; otherwise selected names must exist in its inherited tool
@@ -842,11 +869,15 @@ fail visibly. Instructions append to, rather than replace, parent restrictions.
 
 In `/agents` press `n`, then Ctrl+G for settings JSON. Supported keys are `label`,
 `instructions`, `tools` (array or null for inherited tools), `inherit_context`,
-`timeout`, `max_model_calls` and `max_tokens`. Enter applies the settings draft only;
+`model`, `thinking` and `preset`. Enter applies the settings draft only;
 start review requires every page to be painted before confirmation. Resize invalidates
 that review. This confirmation does NOT approve tool use. Effective settings persist
-with child results and appear in complete child source. Request/token caps may be
-lowered, not raised above 16 / 32,000; token usage is not exact billable accounting.
+with child results and appear in complete child source. Runtime budget options
+`--timeout`, `--calls`, `--tokens` and config/preset keys `timeout`, `max_model_calls`,
+`max_tokens` are removed and rejected for new starts. Historical child records with
+these budget fields remain readable; the fields are inert and never reapply a
+budget or restart work. This removal does not remove the actual model's per-request
+output token ceiling.
 `--fresh` omits canonical history/child entry inheritance, not mandatory parent
 validation/context or the shared workspace. Model/reasoning inherit by default; explicit overrides now use the actual adapter.
 Named presets now use explicit user configuration. Claw specialized
@@ -870,9 +901,12 @@ host native-tool overrides. Switching to a nonreasoning model disables inherited
 reasoning; unsupported positive choices fail visibly. Model switches omit inherited/
 transformed provider continuity and old reasoning from the CHILD copy, leaving parent
 provenance/history intact. Transformed images are validated; oversized switched-model
-contexts fail a conservative byte-based preflight with fresh/lower-output/larger-model
-guidance, not automatic summarization or exact token accounting. Parent model/options/
-settings/grants never change. Named presets now use explicit user configuration.
+contexts use the same built-in text-token estimate as native compaction, rather
+than comparing text bytes to token capacity. This is not exact tokenizer accounting.
+Host-enabled compaction runs before forwarding the next model request; context that
+cannot be safely compacted or fit still fails explicitly with original history
+retained. Image/capability and actual output limits remain enforced. Parent
+model/options/settings/grants never change. Named presets use explicit user configuration.
 
 
 ### Named child presets
@@ -889,15 +923,14 @@ using this descriptor shape:
         "instructions": "Review requested code; return findings with file locations.",
         "tools": ["filesystem", "current_time"],
         "inherit_context": false,
-        "max_model_calls": 4,
-        "max_tokens": 8000
+        "label": "Reviewer"
       }
     }
   }
 }
 ```
 
-Browse `/agents presets`, or use `/agents start --preset reviewer --tokens 6000 --
+Browse `/agents presets`, or use `/agents start --preset reviewer --label Audit --
 TASK`. Explicit flags override template fields. Ctrl+P selects a template in a new
 child form, Ctrl+G adjusts the draft, and full expanded settings/task review still
 precedes execution. Selection itself makes no model request. Templates cannot encode
@@ -2622,3 +2655,68 @@ and widget layouts are removed. Native approval and recovery reviews remain host
 owned; they expose no plugin layout or editor/session-mutation authority. Core TUI
 overlays, transcript fullscreen, Unicode, clipping, cursor and tool-approval behavior
 remain.
+
+## Session ownership and reliable shutdown
+
+Coding's TUI, print, SDK and ACP ingress share one session controller and Agent.
+Persistent writer locks live under `<sessions>/.owners`; they do not depend on
+`TMPDIR`. Short private Linux Unix socket/discovery files are separate, under
+`/tmp/xdog-coding-<uid>/<store-hash>`. Stop older Coding processes before upgrading:
+old binaries do not participate in this store-anchored writer-lock protocol. Do
+not run mixed old/new writers against the same session store.
+
+SDK applications should `await session.aclose()` in `finally`. Closure is
+idempotent, waits for actual child/Goal/extension/MCP cleanup, and reports cleanup
+errors only after attempting the other resources. Cancellation of a waiter does
+not abandon the underlying close. `session.dispose()` requests the same close
+and returns a concurrent Future; synchronous applications can wait on `.result()`.
+Do not block an asynchronous caller loop with `.result()`; await `aclose()` instead.
+Synchronous construction and controls can be called with `asyncio.to_thread` when
+used from an async application. A receiver accepting a queued message does not
+require message approval; existing approval applies to tool execution only.
+
+Automatic project instructions come **only** from the working directory's
+`AGENTS.md`, `.coding/INSTRUCTIONS.md` and `.coding/instructions.md`. There is no
+parent walk. Other harness configuration files are not automatic instruction
+sources; they remain ordinary files that users can explicitly read or attach under
+normal file-access and permission rules. There is no filename denylist.
+Each automatic source must be a regular UTF-8 file of at most 64 KiB; symlinks,
+special files and unreadable/oversized sources cause an explicit preparation error. Missing files are optional. These
+instructions are refreshed in owned off-loop preparation before a turn, reach the
+actual model prompt, and never grant tool permissions. The Agent alone renders
+skill indexes and session/turn-scoped bodies; loading a skill starts no observer,
+model, receiver or daemon.
+
+`CreateSessionOptions.thinking_level` is honored, including explicit `"off"`.
+Initial `allowed_tools` configuration is a **tool selection**, not authorization:
+absent/null falls through to a lower layer, `[]` selects no tools, and a nonempty
+list selects those configured names. Caller options/overrides take precedence
+over saved explicit choices, then project and global configuration. Choices are
+not unioned. Unavailable saved names do not create tools or gain authority later;
+normal permission checks still apply to the selected tools.
+
+The separate input history ledger has a common **64 MiB** read/write bound.
+Admission reserves final-state, batch-ID and bounded diagnostic space for every
+unfinished input; if it cannot fit, it is refused before acknowledgement. Errors
+retain up to 4096 characters with an explicit truncation marker; batch IDs are
+limited to 256 UTF-8 bytes. Accepted execution facts are never silently deleted.
+At capacity, explicitly start another session rather than automatically archiving
+or replaying requests. Recovery marks unfinished execution interrupted and never
+replays potentially executed tool effects automatically.
+
+Ordinary turn history uses one immutable, original-owner disk commit, off the
+model loop, before publishing saved state and completing producer receipts.
+File replacement synchronizes the file and parent directory. A failed or
+uncertain history commit retains the live executed tail and fences further turns;
+close and explicitly reload/inspect the saved state before continuing. Concurrent
+metadata revision conflicts fail closed instead of overwriting newer facts.
+These are local filesystem/process guarantees, not hardware power-loss
+exactly-once execution or an OS security sandbox. No existing user data is migrated
+or discarded automatically.
+
+Enabled extensions may declare a public slash name. The packaged `goal_ui`
+display exposes `/goals [GOAL_ID | page OFFSET]`; `/goal` remains the skill name.
+This is generic extension routing, not a Coding-specific Goal command. Public
+names appear in help/completion and cannot shadow builtin or skill commands;
+model tool names and permissions do not change. See
+`docs/extension-public-commands.md` for the shared Coding/Claw contract.

{xdog_coding-2.4.2 → xdog_coding-2.4.4}/README.md

@@ -548,7 +548,8 @@ continuation silently reconnects, replays POSTs or expands configured disclosure
 
 ### Task planning and host read-only scope
 
-The builtin **`xdog-planning`** skill uses ordinary conversation or task documents
+The builtin **`xdog-planning`** skill, supplied by `xdog-skills` (install the
+`skills` extra), uses ordinary conversation or task documents
 for objectives, dependencies, acceptance criteria and evidence-backed progress.
 It does not create a separate plan database, inspector, execution mode or model
 loop. The former `/plan`, `PlanPanel` and `update_plan` UI/tool APIs are removed.
@@ -745,7 +746,7 @@ none of these interfaces grants tool permission or full Pi API compatibility.
 
 ### Supervised child agents
 
-`/agents start TASK` starts bounded read-only child work. `/agents start --inherit
+`/agents start TASK` starts host-managed read-only child work. `/agents start --inherit
 TASK` inherits the current host policy; it does not copy approval grants or bypass
 read-only. Inspect with `/agents list` or `/agents inspect ID`; use `steer ID TEXT`,
 `follow-up ID TEXT`, `cancel ID`, `wait ID` and `close ID` under `/agents`.
@@ -754,10 +755,34 @@ recursively delegate through their parent's supervision tools.
 
 Children share the workspace, so coordinate conflicting writes. Context is copied
 at admission through a complete tool/result checkpoint. Model/options/tool execution
-mode are inherited. Defaults are three active children, 16 retained records,
-120-second execution deadline, 16 model calls and a 32,000 reported-token stop
-threshold—not exact billing. Output limits are clamped; input accounting can
-overshoot on the final request. Cleanup/persistence may outlast the execution deadline.
+mode are inherited. There is no fixed concurrent-child or retained-record count
+limit, elapsed-time deadline, model-call cap or cumulative reported-token stop
+threshold. The main Agent/host manages lifecycle with cancel/wait/close. Usage
+counters remain reported usage, not exact billable accounting; actual model
+output/context limits, permissions and message/input/image/per-file capacities
+still apply. Complete history uses atomic segmented persistence instead of a
+cumulative 512 KiB / 2,000-message execution cutoff; tool/result pairs are not
+silently truncated.
+
+Coding and Claw child factories explicitly enable the Agent's existing built-in
+compaction policy through `AgentConfig(compaction=selected.compaction(child_stream))`
+and provide `archive_compaction=store.archive_compaction` to the supervisor.
+This does **not** change the generic Agent default: automatic compaction is off
+unless explicitly configured. The selected helper uses the executing adapter's
+real context/prompt/output capacity; unknown metadata, context capacity or output
+reserve returns `None` (auto-compaction remains off), not a guessed fallback.
+A host requiring automatic compaction must reject that case or explicitly supply
+trusted capacity/reserve through native `CompactionConfig`.
+
+With the policy enabled, one long tool turn can compact repeatedly at safe paired
+boundaries. The supervisor waits for a durable full pre-compaction snapshot before
+the native summary request starts. Archive, summary or stream-cleanup failure does
+not commit a history cut, and cancellation settles owned writes/cleanup. The native
+summary's per-request timeout/capacity checks remain; there is no replacement child
+lifetime cap. Inspect shows the current retained context, possibly with summaries;
+`children.store.compaction_archives(child_id)` reads full earlier snapshots without
+replay. These child archives are separate from the parent session's `/tree`
+compaction checkpoints.
 
 Each child has independent Coding approvals and extension workers/state. Parent
 validation/context hooks and current read-only/permission gates remain authoritative;
@@ -800,10 +825,10 @@ still uses silent no-UI answers to avoid borrowing its separate dialog reservati
 Complex extension forms are removed; basic child dialogs retain these ownership and cancellation checks.
 
 
-### Child specialization and limits
+### Child specialization and protocol limits
 
 `/agents start --label Reviewer --instructions "Inspect only" --tools filesystem,current_time
---fresh --timeout 60 --calls 4 --tokens 8000 -- TASK` specializes a child without
+--fresh -- TASK` specializes a child without
 changing parent permissions. Options precede the task; `--` preserves a task that
 starts with flags. Plain tasks preserve quotes/newlines. `--tools none` gives the
 child no executable tools; otherwise selected names must exist in its inherited tool
@@ -812,11 +837,15 @@ fail visibly. Instructions append to, rather than replace, parent restrictions.
 
 In `/agents` press `n`, then Ctrl+G for settings JSON. Supported keys are `label`,
 `instructions`, `tools` (array or null for inherited tools), `inherit_context`,
-`timeout`, `max_model_calls` and `max_tokens`. Enter applies the settings draft only;
+`model`, `thinking` and `preset`. Enter applies the settings draft only;
 start review requires every page to be painted before confirmation. Resize invalidates
 that review. This confirmation does NOT approve tool use. Effective settings persist
-with child results and appear in complete child source. Request/token caps may be
-lowered, not raised above 16 / 32,000; token usage is not exact billable accounting.
+with child results and appear in complete child source. Runtime budget options
+`--timeout`, `--calls`, `--tokens` and config/preset keys `timeout`, `max_model_calls`,
+`max_tokens` are removed and rejected for new starts. Historical child records with
+these budget fields remain readable; the fields are inert and never reapply a
+budget or restart work. This removal does not remove the actual model's per-request
+output token ceiling.
 `--fresh` omits canonical history/child entry inheritance, not mandatory parent
 validation/context or the shared workspace. Model/reasoning inherit by default; explicit overrides now use the actual adapter.
 Named presets now use explicit user configuration. Claw specialized
@@ -840,9 +869,12 @@ host native-tool overrides. Switching to a nonreasoning model disables inherited
 reasoning; unsupported positive choices fail visibly. Model switches omit inherited/
 transformed provider continuity and old reasoning from the CHILD copy, leaving parent
 provenance/history intact. Transformed images are validated; oversized switched-model
-contexts fail a conservative byte-based preflight with fresh/lower-output/larger-model
-guidance, not automatic summarization or exact token accounting. Parent model/options/
-settings/grants never change. Named presets now use explicit user configuration.
+contexts use the same built-in text-token estimate as native compaction, rather
+than comparing text bytes to token capacity. This is not exact tokenizer accounting.
+Host-enabled compaction runs before forwarding the next model request; context that
+cannot be safely compacted or fit still fails explicitly with original history
+retained. Image/capability and actual output limits remain enforced. Parent
+model/options/settings/grants never change. Named presets use explicit user configuration.
 
 
 ### Named child presets
@@ -859,15 +891,14 @@ using this descriptor shape:
         "instructions": "Review requested code; return findings with file locations.",
         "tools": ["filesystem", "current_time"],
         "inherit_context": false,
-        "max_model_calls": 4,
-        "max_tokens": 8000
+        "label": "Reviewer"
       }
     }
   }
 }
 ```
 
-Browse `/agents presets`, or use `/agents start --preset reviewer --tokens 6000 --
+Browse `/agents presets`, or use `/agents start --preset reviewer --label Audit --
 TASK`. Explicit flags override template fields. Ctrl+P selects a template in a new
 child form, Ctrl+G adjusts the draft, and full expanded settings/task review still
 precedes execution. Selection itself makes no model request. Templates cannot encode
@@ -2592,3 +2623,68 @@ and widget layouts are removed. Native approval and recovery reviews remain host
 owned; they expose no plugin layout or editor/session-mutation authority. Core TUI
 overlays, transcript fullscreen, Unicode, clipping, cursor and tool-approval behavior
 remain.
+
+## Session ownership and reliable shutdown
+
+Coding's TUI, print, SDK and ACP ingress share one session controller and Agent.
+Persistent writer locks live under `<sessions>/.owners`; they do not depend on
+`TMPDIR`. Short private Linux Unix socket/discovery files are separate, under
+`/tmp/xdog-coding-<uid>/<store-hash>`. Stop older Coding processes before upgrading:
+old binaries do not participate in this store-anchored writer-lock protocol. Do
+not run mixed old/new writers against the same session store.
+
+SDK applications should `await session.aclose()` in `finally`. Closure is
+idempotent, waits for actual child/Goal/extension/MCP cleanup, and reports cleanup
+errors only after attempting the other resources. Cancellation of a waiter does
+not abandon the underlying close. `session.dispose()` requests the same close
+and returns a concurrent Future; synchronous applications can wait on `.result()`.
+Do not block an asynchronous caller loop with `.result()`; await `aclose()` instead.
+Synchronous construction and controls can be called with `asyncio.to_thread` when
+used from an async application. A receiver accepting a queued message does not
+require message approval; existing approval applies to tool execution only.
+
+Automatic project instructions come **only** from the working directory's
+`AGENTS.md`, `.coding/INSTRUCTIONS.md` and `.coding/instructions.md`. There is no
+parent walk. Other harness configuration files are not automatic instruction
+sources; they remain ordinary files that users can explicitly read or attach under
+normal file-access and permission rules. There is no filename denylist.
+Each automatic source must be a regular UTF-8 file of at most 64 KiB; symlinks,
+special files and unreadable/oversized sources cause an explicit preparation error. Missing files are optional. These
+instructions are refreshed in owned off-loop preparation before a turn, reach the
+actual model prompt, and never grant tool permissions. The Agent alone renders
+skill indexes and session/turn-scoped bodies; loading a skill starts no observer,
+model, receiver or daemon.
+
+`CreateSessionOptions.thinking_level` is honored, including explicit `"off"`.
+Initial `allowed_tools` configuration is a **tool selection**, not authorization:
+absent/null falls through to a lower layer, `[]` selects no tools, and a nonempty
+list selects those configured names. Caller options/overrides take precedence
+over saved explicit choices, then project and global configuration. Choices are
+not unioned. Unavailable saved names do not create tools or gain authority later;
+normal permission checks still apply to the selected tools.
+
+The separate input history ledger has a common **64 MiB** read/write bound.
+Admission reserves final-state, batch-ID and bounded diagnostic space for every
+unfinished input; if it cannot fit, it is refused before acknowledgement. Errors
+retain up to 4096 characters with an explicit truncation marker; batch IDs are
+limited to 256 UTF-8 bytes. Accepted execution facts are never silently deleted.
+At capacity, explicitly start another session rather than automatically archiving
+or replaying requests. Recovery marks unfinished execution interrupted and never
+replays potentially executed tool effects automatically.
+
+Ordinary turn history uses one immutable, original-owner disk commit, off the
+model loop, before publishing saved state and completing producer receipts.
+File replacement synchronizes the file and parent directory. A failed or
+uncertain history commit retains the live executed tail and fences further turns;
+close and explicitly reload/inspect the saved state before continuing. Concurrent
+metadata revision conflicts fail closed instead of overwriting newer facts.
+These are local filesystem/process guarantees, not hardware power-loss
+exactly-once execution or an OS security sandbox. No existing user data is migrated
+or discarded automatically.
+
+Enabled extensions may declare a public slash name. The packaged `goal_ui`
+display exposes `/goals [GOAL_ID | page OFFSET]`; `/goal` remains the skill name.
+This is generic extension routing, not a Coding-specific Goal command. Public
+names appear in help/completion and cannot shadow builtin or skill commands;
+model tool names and permissions do not change. See
+`docs/extension-public-commands.md` for the shared Coding/Claw contract.

{xdog_coding-2.4.2 → xdog_coding-2.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "xdog-coding"
-version = "2.4.2"
+version = "2.4.4"
 description = "Interactive coding agent CLI"
 requires-python = ">=3.12"
 classifiers = [
@@ -22,15 +22,18 @@ readme = "README.md"
 license = "AGPL-3.0-or-later"
 license-files = ["LICENSE", "LICENSE-EXCEPTION.md"]
 dependencies = [
-    "xdog-ai[openai]>=2.4.2",
-    "xdog-agent>=2.4.2",
+    "xdog-ai[openai]>=2.4.4",
+    "xdog-agent>=2.4.4",
     "agent-client-protocol>=0.12.1,<0.13; python_version < '3.15'",
-    "xdog-tui>=2.4.2",
+    "xdog-tui>=2.4.4",
     "pyyaml>=6.0",
     "click>=8.1.0",
     "pydantic>=2.0",
 ]
 
+[project.optional-dependencies]
+skills = ["xdog-skills>=2.4.4"]
+
 [project.urls]
 Homepage = "https://xdog.942295.xyz"
 Repository = "https://github.com/litterzhang/xdog"

{xdog_coding-2.4.2 → xdog_coding-2.4.4}/src/xdog/coding/__init__.py

@@ -1,3 +1,3 @@
 """coding - Interactive coding agent CLI."""
 
-__version__ = "2.4.2"
+__version__ = "2.4.4"

{xdog_coding-2.4.2 → xdog_coding-2.4.4}/src/xdog/coding/acp/backend.py

@@ -89,17 +89,19 @@ class CodingBackend:
         try:
             session = await asyncio.shield(task)
         except asyncio.CancelledError:
-            session = await task
-            session.dispose()
+            from xdog.agent.async_work import wait_owned
+            async def settle_construction() -> None:
+                late_session = await task
+                await late_session.aclose()
+            await wait_owned(asyncio.create_task(settle_construction(), name='coding-acp-canceled-construction'))
             raise
-        runtime = SessionRuntime(session, bound=False, router=self.router)
-        runtime.start()
         try:
+            runtime = SessionRuntime(session, bound=False, router=self.router)
+            runtime.start()
             from xdog.coding.acp.server import serve_local
-
             server = await serve_local(runtime)
         except BaseException:
-            await asyncio.wrap_future(runtime.close())
+            await session.aclose()
             raise
         self._owned[session.session_id] = peer.id, runtime, server
         ref = SessionRef(session.session_id, session.working_dir, runtime.controller.generation)
@@ -300,31 +302,51 @@ class CodingBackend:
                 await asyncio.wrap_future(running.controller.cancel(running.ticket.id, peer_id=peer.id))
 
     async def disconnect(self, peer: Peer) -> None:
-        await self._inbox.disconnect(peer)
+        from functools import partial
+
+        from xdog.agent.async_work import settle_cleanup
         pending = tuple(row for key, row in self._running.items() if key[0] == peer.id)
-        for row in pending:
-            if row.ticket is None and not row.task.cancelling():
-                row.task.cancel()
-        for controller in {row.controller for row in pending}:
-            await asyncio.wrap_future(controller.disconnect(peer.id))
-        tasks = [row.task for row in pending if row.task is not asyncio.current_task()]
-        if tasks:
-            for task in tasks:
-                if not task.done() and not task.cancelling():
-                    task.cancel()
-            await asyncio.gather(*tasks, return_exceptions=True)
-        for key, remote in tuple(self._remote.items()):
-            if key[0] == peer.id:
-                await remote.close()
-                del self._remote[key]
-        for identifier, (owner, runtime, server) in tuple(self._owned.items()):
-            if owner == peer.id:
-                await server.close()
-                await asyncio.wrap_future(runtime.close())
-                del self._owned[identifier]
-        for key in tuple(self._refs):
-            if key[0] == peer.id:
-                del self._refs[key]
+        async def ingress() -> None:
+            await self._inbox.disconnect(peer)
+        async def requests() -> None:
+            for row in pending:
+                if row.ticket is None and not row.task.cancelling():
+                    row.task.cancel()
+            async def disconnect(controller: SessionController) -> None:
+                await asyncio.wrap_future(controller.disconnect(peer.id))
+            async def join() -> None:
+                tasks = [row.task for row in pending if row.task is not asyncio.current_task()]
+                for task in tasks:
+                    if not task.done() and not task.cancelling():
+                        task.cancel()
+                if tasks:
+                    await asyncio.gather(*tasks, return_exceptions=True)
+            controllers = {row.controller for row in pending}
+            await settle_cleanup(*(partial(disconnect, controller) for controller in controllers),
+                                 join, message='ACP request retirement failed')
+        async def remote(key: tuple[str, str], attachment: AcpAttachment) -> None:
+            try:
+                await attachment.close()
+            finally:
+                self._remote.pop(key, None)
+        async def owned(identifier: str, runtime: SessionRuntime) -> None:
+            try:
+                # The session owns its CURRENT endpoint too. Closing the saved
+                # old endpoint first would bypass all remaining resource cleanup.
+                await runtime.session.aclose()
+            finally:
+                if runtime.session._lease is None:
+                    self._owned.pop(identifier, None)
+        async def references() -> None:
+            for key in tuple(self._refs):
+                if key[0] == peer.id:
+                    self._refs.pop(key, None)
+        owned_sessions = tuple(self._owned.items())
+        await settle_cleanup(ingress, requests,
+            *(partial(remote, key, attachment) for key, attachment in tuple(self._remote.items()) if key[0] == peer.id),
+            *(partial(owned, identifier, runtime) for identifier, (owner, runtime, _server) in owned_sessions
+              if owner == peer.id), references, message='ACP peer cleanup failed')
+
     async def extension(self, peer: Peer, method: str, params: dict[str, Any]) -> dict[str, Any]:
         if method in {'xdog/enqueue', 'xdog/inbox_status'}:
             target = params.get('session_id')

{xdog_coding-2.4.2 → xdog_coding-2.4.4}/src/xdog/coding/acp/server.py

@@ -22,6 +22,7 @@ class LocalServer:
         self.identity: tuple[int, int] | None = None
         self.server: asyncio.AbstractServer | None = None
         self.closing = False
+        self._closing: asyncio.Task[None] | None = None
         self.writers: set[asyncio.StreamWriter] = set()
         self.tasks: set[asyncio.Task[None]] = set()
 
@@ -47,24 +48,38 @@ class LocalServer:
             await writer.wait_closed()
 
     async def close(self) -> None:
-        self.closing = True
-        if self.server is not None:
-            self.server.close()
-        for writer in tuple(self.writers):
-            writer.close()
-        if self.server is not None:
-            # Python >=3.12 waits for client transports too; close them first.
-            await self.server.wait_closed()
-            self.server = None
-        if self.tasks:
-            await asyncio.gather(*tuple(self.tasks), return_exceptions=True)
-        path = self.record.address
-        if path.exists():
-            info = path.lstat()
-            if (stat.S_ISSOCK(info.st_mode) and info.st_uid == os.getuid()
-                    and (info.st_dev, info.st_ino) == self.identity):
-                path.unlink()
-        self.runtime.registry.remove(self.record)
+        from xdog.agent.async_work import wait_owned
+        if self._closing is None:
+            self.closing = True
+            self._closing = asyncio.create_task(self._close(), name='coding-endpoint-close')
+        await wait_owned(self._closing)
+
+    async def _close(self) -> None:
+        from xdog.agent.async_work import settle_cleanup
+        from xdog.coding.core.session_lifecycle import settle_sync
+        async def transports() -> None:
+            steps = [writer.close for writer in tuple(self.writers)]
+            if self.server is not None:
+                steps.insert(0, self.server.close)
+            settle_sync(*steps, message='ACP transport close failed')
+        async def server() -> None:
+            if self.server is not None:
+                await self.server.wait_closed()
+                self.server = None
+        async def peers() -> None:
+            if self.tasks:
+                # Disconnect/request errors are peer outcomes, not cleanup errors.
+                await asyncio.gather(*tuple(self.tasks), return_exceptions=True)
+        async def unlink() -> None:
+            path = self.record.address
+            if path.exists():
+                info = path.lstat()
+                if (stat.S_ISSOCK(info.st_mode) and info.st_uid == os.getuid()
+                        and (info.st_dev, info.st_ino) == self.identity):
+                    path.unlink()
+        async def registry() -> None:
+            self.runtime.registry.remove(self.record)
+        await settle_cleanup(transports, server, peers, unlink, registry, message='ACP endpoint cleanup failed')
 
 
 async def serve_local(runtime: SessionRuntime) -> LocalServer: