ticket: use base32 project record ids
This commit is contained in:
@@ -0,0 +1,89 @@
|
||||
# Delegation intent: Task feature owns TaskStore and reminders
|
||||
|
||||
## Intent
|
||||
|
||||
Implement the second step in the Task feature cleanup sequence: move Task-specific state and reminder behavior out of `Pod` / `PodInterceptor` and into the built-in Task feature module.
|
||||
|
||||
The prerequisite `hook-context-system-item-sink` is closed. Use its `PreRequestContext` / `SystemItemAppendHandle` path for durable `SystemItem::TaskReminder` append. Pod should provide generic host surfaces; Task feature should own Task state and policy.
|
||||
|
||||
## Worktree / branch
|
||||
|
||||
- worktree: `/home/hare/Projects/yoi/.worktree/task-feature-own-store-reminder-hooks`
|
||||
- branch: `work/task-feature-own-store-reminder-hooks`
|
||||
|
||||
## Requirements
|
||||
|
||||
- Move TaskStore construction/ownership from `Pod` into the built-in Task feature module.
|
||||
- The Task feature should own the session-lifetime `tools::TaskStore` shared by Task tools and reminder hooks.
|
||||
- Pod should not keep a Task-specific store field merely because tools/reminders need it.
|
||||
- Move TaskReminderState and reminder decision logic out of `PodInterceptor` and into Task feature-owned hooks.
|
||||
- Use a tool hook to record Task tool usage.
|
||||
- Use a `PreLlmRequest` hook to evaluate inactivity/cooldown and append `SystemItem::TaskReminder` through `SystemItemAppendHandle`.
|
||||
- Preserve the current threshold/cooldown/body/source semantics.
|
||||
- Remove Task-specific checks from `PodInterceptor`, including task-tool-name special-casing for reminder state, once feature-owned hooks replace them.
|
||||
- Preserve current observable behavior:
|
||||
- TaskCreate / TaskUpdate / TaskGet / TaskList names, schemas, descriptions, outputs;
|
||||
- TaskStore snapshot/restore behavior;
|
||||
- task reminder emission timing/body/cooldown;
|
||||
- model-visible history path via `LogEntry::SystemItem` / `Event::SystemItem`;
|
||||
- normal ToolRegistry / PreToolCall permission path.
|
||||
- Audit all current `Pod::task_store` / `task_store` uses.
|
||||
- If Pod/session restore/compaction/TUI compatibility needs read access, route it through a Task feature-owned status/snapshot surface or a documented temporary façade that does not make Pod the owner.
|
||||
- Do not silently drop restore/snapshot/compaction behavior.
|
||||
- Keep external-plugin authority model out of this ticket except using the trusted built-in hook handle path already implemented.
|
||||
- Keep TUI UI changes out of scope.
|
||||
|
||||
## Important constraints
|
||||
|
||||
- Do not expose raw `llm_worker::Item`, raw history writers, raw event senders, raw `Pod`, raw `Worker`, or raw `NotifyBuffer` through the Task feature.
|
||||
- Do not reintroduce raw `ContinueWith(Vec<Item>)`, no-result tool skip, arbitrary `ToolResult` construction, generic event channels, or UI/dialog payloads.
|
||||
- Do not change external plugin loading, package approval, WASM, MCP, WorkItem, Memory, or Pod-management modules.
|
||||
- Do not remove the existing Task tools or change their model-visible metadata.
|
||||
|
||||
## Suggested files
|
||||
|
||||
- `crates/pod/src/feature/builtin/task.rs`
|
||||
- `crates/pod/src/feature.rs`
|
||||
- `crates/pod/src/hook.rs`
|
||||
- `crates/pod/src/ipc/interceptor.rs`
|
||||
- `crates/pod/src/pod.rs`
|
||||
- `crates/pod/src/controller.rs`
|
||||
- `crates/tools/src/task.rs`
|
||||
- any tests around TaskStore snapshot/restore and Task reminders
|
||||
|
||||
## Validation
|
||||
|
||||
Run at least:
|
||||
|
||||
- focused Task feature/reminder tests added or moved by this ticket
|
||||
- `cargo test -p pod hook --lib`
|
||||
- `cargo test -p pod --lib`
|
||||
- `cargo test -p llm-worker --lib`
|
||||
- `cargo check --workspace --all-targets`
|
||||
- `cargo fmt --check`
|
||||
- `./tickets.sh doctor`
|
||||
- `git diff --check`
|
||||
|
||||
Run `nix build .#yoi` if feasible.
|
||||
|
||||
## Escalate if
|
||||
|
||||
- Preserving TaskStore snapshot/restore requires TUI/protocol changes.
|
||||
- Removing Pod ownership would require a broad feature-service/status API beyond this ticket.
|
||||
- Current reminder semantics cannot be preserved through Hook order or SystemItem append timing.
|
||||
- You find any hidden dependency that requires TaskStore to remain Pod-owned.
|
||||
|
||||
## Completion report
|
||||
|
||||
Report:
|
||||
|
||||
- worktree path / branch
|
||||
- commit hash
|
||||
- changed files
|
||||
- where TaskStore is now owned
|
||||
- how Task reminder state/logic moved into Task feature hooks
|
||||
- how snapshot/restore/compaction behavior is preserved
|
||||
- evidence Pod/PodInterceptor no longer own or special-case Task state
|
||||
- tests/validation results
|
||||
- unresolved risks/follow-ups
|
||||
- whether ready for external review
|
||||
@@ -0,0 +1,70 @@
|
||||
# External rereview: task-feature-own-store-reminder-hooks
|
||||
|
||||
## 1. Result: approve
|
||||
|
||||
Approve. The prior blocker is fixed: hook-appended Task reminders are now folded into the effective request context before usage accounting and the second request-threshold compaction decision, and threshold-yield preserves the queued system item durably instead of dropping model-visible history.
|
||||
|
||||
## 2. Summary of fix reviewed
|
||||
|
||||
The fix adds an internal `PreRequestAction::YieldWith(Vec<Item>)` variant in `llm-worker` and updates `PodInterceptor::pre_llm_request()` to:
|
||||
|
||||
1. keep the existing pre-hook request-threshold check for the already-present context;
|
||||
2. run pre-request hooks and drain any host-mediated `SystemItemAppendHandle` appends;
|
||||
3. build an `effective_len = context.len() + system_items.len()`;
|
||||
4. run request-threshold compaction again against the post-append effective context;
|
||||
5. if the post-append threshold yields, commit the queued system items and return `YieldWith(items)` so `Worker` appends them to history before yielding;
|
||||
6. otherwise record usage with the effective post-append length and continue with the queued items.
|
||||
|
||||
This keeps the hook append boundary host-mediated while making the model-visible request context match the context used for usage tracking.
|
||||
|
||||
## 3. Prior-blocker assessment
|
||||
|
||||
- **Hook-appended `SystemItem::TaskReminder` included before usage accounting:** Fixed. `PodInterceptor::pre_llm_request()` now drains hook system items before the final `usage_tracker.note_request(...)` call and computes `effective_len` from `context.len() + system_items.len()`.
|
||||
- **`UsageTracker::note_request()` uses post-append context length:** Fixed. The call now passes `effective_len`, so a fired Task reminder is counted in the recorded request history length.
|
||||
- **Request-threshold compaction checks the post-append context:** Fixed. After hook drain, `estimated_tokens` is recomputed over a `Cow` that includes the queued items, and `request_threshold.should_compact(current_tokens)` runs again before the request is sent.
|
||||
- **Threshold yield preserves queued system items durably:** Fixed. On post-append threshold yield, `PodInterceptor` commits the queued system items, returns `PreRequestAction::YieldWith(items)`, and `Worker` appends those items into history before returning `WorkerResult::Yielded`. The next request therefore starts from durable/in-memory history that includes the reminder.
|
||||
- **`YieldWith(Vec<Item>)` does not expose public raw injection through `pod::hook`:** Acceptable. `YieldWith` is an internal `llm-worker` interceptor action, not a public `pod::hook` action. The public hook-facing append API remains the typed `SystemItemAppendHandle`; public hook types do not gain raw `Item` construction authority.
|
||||
|
||||
## 4. Rechecked requirements
|
||||
|
||||
- **TaskStore/reminder ownership remains in Task feature:** Still satisfied. `TaskStore` and `TaskReminderState` remain inside `crates/pod/src/feature/builtin/task.rs`; `Pod` keeps only the feature façade needed for installation, restore, rewind, and compaction snapshot/overview calls.
|
||||
- **No `PodInterceptor` Task special-casing returned:** Confirmed. Production `PodInterceptor` code does not branch on Task tool names and does not own Task reminder state; Task behavior is driven through feature hooks.
|
||||
- **Task tool metadata/behavior unchanged:** Confirmed by diff scope. The Task tool implementations and metadata remain in `crates/tools/src/task.rs`; the feature still registers `tools::task_tools(...)` with the shared feature-owned store.
|
||||
- **No raw `Item` exposure in public Hook API:** Confirmed. `SystemItemAppendHandle` exposes typed append methods such as `append_task_reminder`; the raw `Item` vectors remain inside worker/interceptor internals.
|
||||
- **No generic event channels or UI dialogs:** Confirmed in the reviewed diff. The fix is confined to worker/interceptor request flow and tests.
|
||||
- **Snapshot/restore/rewind semantics remain safe:** Still acceptable. `TaskFeature::restore_from_history()` mutates the existing shared store handle, preserving installed Task tool handles after restore/rewind. The prior focused restore test still passes.
|
||||
- **Tests cover fixed accounting/compaction path:** Satisfied. New/focused tests cover post-append usage length and post-append request-threshold yield preservation, in addition to the existing Task reminder and hook append tests.
|
||||
|
||||
## 5. Blockers
|
||||
|
||||
None.
|
||||
|
||||
## 6. Non-blockers / follow-ups
|
||||
|
||||
- `TaskFeature::from_history()` / `restore_from_history()` still accept raw `llm_worker::Item` slices as an internal restore façade. This remains acceptable for this ticket, but can be tightened in a later boundary-cleanup pass if feature restore APIs are made more typed.
|
||||
- The new `YieldWith(Vec<Item>)` is an internal escape hatch with raw `Item`s. It is justified here for durable preservation of host-created system items on yield, but future uses should stay interceptor-owned and should not be surfaced through public plugin/hook APIs.
|
||||
|
||||
## 7. Validation assessed or rerun
|
||||
|
||||
Reviewed:
|
||||
|
||||
- original review artifact;
|
||||
- ticket and delegation intent;
|
||||
- `git diff develop...HEAD` and the fix commit `960f2a3 fix: account hook system item appends`;
|
||||
- current `llm-worker`, `pod::ipc::interceptor`, Task feature, hook API, and relevant Pod restore/snapshot code.
|
||||
|
||||
Commands rerun from `/home/hare/Projects/yoi/.worktree/task-feature-own-store-reminder-hooks`:
|
||||
|
||||
- `cargo test -p pod task_reminder_hook_append_is_counted_in_usage_request_len --lib` — passed.
|
||||
- `cargo test -p pod pre_llm_request_yields_with_hook_appends_when_post_append_threshold_exceeded --lib` — passed.
|
||||
- `cargo test -p pod hook --lib` — passed.
|
||||
- `cargo test -p llm-worker --lib` — passed.
|
||||
- `cargo test -p pod task_reminder --lib` — passed.
|
||||
- `cargo test -p pod restore_from_history_keeps_existing_store_handle_for_installed_tools --lib` — passed.
|
||||
- `git diff --check develop...HEAD` — no whitespace errors reported.
|
||||
|
||||
I did not rerun full workspace tests or `nix build .#yoi` as part of this rereview.
|
||||
|
||||
## 8. Residual risk
|
||||
|
||||
Residual risk is low for this ticket. The main area to watch is future expansion of `YieldWith(Vec<Item>)`: it should remain an internal worker/interceptor mechanism for preserving already-authorized, host-created history appends across yield/compaction boundaries, not a public raw-history injection mechanism.
|
||||
@@ -0,0 +1,75 @@
|
||||
# External review: task-feature-own-store-reminder-hooks
|
||||
|
||||
## 1. Result: request changes
|
||||
|
||||
Request changes. The implementation substantially moves Task state and reminder policy into the built-in Task feature, but it changes the request-accounting/compaction semantics for the reminder append path: a hook-appended `SystemItem::TaskReminder` is added after the pre-request token/usage accounting has already observed the request context.
|
||||
|
||||
## 2. Summary of implementation
|
||||
|
||||
The commit introduces `TaskFeature` as the owner of the session-lifetime `tools::TaskStore` and `TaskReminderState` in `crates/pod/src/feature/builtin/task.rs`. The feature contributes the four Task tools plus two hooks:
|
||||
|
||||
- a `PreToolCall` hook that records `TaskCreate` / `TaskUpdate` usage;
|
||||
- a `PreLlmRequest` hook that checks active tasks, inactivity threshold, cooldown, and appends a typed Task reminder through `SystemItemAppendHandle`.
|
||||
|
||||
`Pod` now keeps a `task_feature: TaskFeature` compatibility/status façade for restore, rewind, and compaction snapshot needs, and `PodInterceptor` no longer owns `TaskStore` / `TaskReminderState` or special-cases Task tool names in `pending_history_appends()` / `pre_tool_call()`.
|
||||
|
||||
## 3. Requirement-by-requirement assessment
|
||||
|
||||
- **TaskStore owned by Task feature/module, not Pod:** Mostly satisfied. `TaskStore` is stored inside `TaskFeatureState`; `Pod` holds a `TaskFeature` façade, not a direct `TaskStore`.
|
||||
- **TaskReminderState and reminder decision logic owned by Task feature hooks:** Satisfied in structure. The threshold/cooldown/body decision logic moved to `TaskReminderPreRequestHook`; Task tool usage tracking moved to `TaskReminderToolUsageHook`.
|
||||
- **PodInterceptor no longer special-cases Task tool names or emits reminders from `pending_history_appends`:** Satisfied. Current `PodInterceptor` only drains notifications in `pending_history_appends()` and dispatches generic hooks in `pre_tool_call()`.
|
||||
- **Task tools use one shared session-lifetime store and preserve names/schemas/descriptions/outputs:** Appears satisfied. The feature registers the unchanged `tools::task_tools(self.state.task_store.clone())`, preserving the tool factories and shared store handle.
|
||||
- **Task reminder timing/body/cooldown/source semantics match previous behavior:** Body/source/counter rules are covered, but timing/accounting is not fully preserved; see blocker below.
|
||||
- **`SystemItem::TaskReminder` appended through `SystemItemAppendHandle`:** Satisfied. The Task hook uses `input.system_items().append_task_reminder(...)`; it does not construct raw `Item`s.
|
||||
- **Snapshot/restore/rewind/compaction behavior preserved:** Partially satisfied. Task snapshot/overview access routes through `TaskFeature`, and rewind uses `restore_from_history()` to mutate the existing store handle so installed tools do not become stale. However, request-time compaction/accounting behavior around fired reminders is changed; see blocker.
|
||||
- **Rewind/restore do not leave installed Task tool instances pointing at stale stores:** Satisfied by `TaskStore::replace_with()` through `TaskFeature::restore_from_history()`, and there is a focused unit test for this.
|
||||
- **Pod does not retain Task-specific ownership under another name:** Acceptable. The `task_feature` field is a Task-specific façade in `Pod`, but the business state is inside the feature module and the façade is used for restore/compaction compatibility.
|
||||
- **Normal ToolRegistry / PreToolCall permission path preserved:** Appears preserved. Task tools are still registered in the Worker tool registry, and Task usage tracking is a normal pre-tool hook after existing hook ordering rather than a bypass.
|
||||
- **No unrelated TUI/plugin/event/raw-handle/refactor scope creep:** No TUI changes or broad unrelated refactors found. One boundary note remains about raw history snapshots in the feature façade; see follow-ups.
|
||||
- **Tests cover ownership/reminder behavior sufficiently:** Unit coverage is good for feature-owned reminder state/body/source/cooldown and store-handle restore. It does not cover the integration point where hook-appended reminders interact with usage tracking and compaction accounting.
|
||||
|
||||
## 4. Blockers
|
||||
|
||||
### Blocker: hook-appended Task reminders are not included in pre-request usage/compaction accounting
|
||||
|
||||
The old Task reminder path appended the reminder from `PodInterceptor::pending_history_appends()`. `llm-worker` drains `pending_history_appends()` into persistent history before cloning `request_context`, so the reminder participated in the subsequent pre-request hooks, usage tracking, and request-threshold compaction check.
|
||||
|
||||
The new path appends the reminder from a `PreLlmRequest` hook:
|
||||
|
||||
- `TaskReminderPreRequestHook` queues the reminder through `SystemItemAppendHandle` in `crates/pod/src/feature/builtin/task.rs:204-231`.
|
||||
- `PodInterceptor::pre_llm_request()` computes `current_tokens` and constructs `PreRequestInfo { item_count: context.len(), ... }` before running hooks, then drains hook system items only after all hooks finish (`crates/pod/src/ipc/interceptor.rs:212-269`).
|
||||
- `UsageTrackingHook` records exactly that pre-append `item_count` (`crates/pod/src/pod.rs:224-227`).
|
||||
- `llm-worker` only extends `request_context` with `PreRequestAction::ContinueWith(items)` after `pre_llm_request()` returns (`crates/llm-worker/src/worker.rs:1170-1191`).
|
||||
|
||||
So when the Task reminder fires, the actual LLM request includes one more model-visible history item than the usage tracker recorded for that request. The request-threshold compaction check also ran before that item existed in `request_context`. This changes the previous observable accounting/compaction behavior and can skew future token estimates and compaction timing from the first reminder-fired request onward.
|
||||
|
||||
This needs to be fixed before merge. The fix should preserve the host-mediated `SystemItemAppendHandle` boundary, but the final request context and the recorded usage `history_len` must include the queued system item before the LLM call is accounted/sent, matching the old `pending_history_appends()` semantics.
|
||||
|
||||
## 5. Non-blockers / follow-ups
|
||||
|
||||
- `TaskFeature::from_history()` and `TaskFeature::restore_from_history()` still take raw `&[llm_worker::Item]`. This is a narrow internal restore façade rather than a mutable raw history handle, so I am not blocking on it here, but it is worth tightening later if the feature boundary is meant to avoid raw history representations entirely.
|
||||
- Add an integration-style test that installs the Task feature into the normal Pod/Interceptor path, fires a reminder, and asserts the request accounting/usage record uses the post-append context length.
|
||||
|
||||
## 6. Validation assessed or rerun
|
||||
|
||||
Reviewed:
|
||||
|
||||
- ticket and delegation intent;
|
||||
- prerequisite hook-context-system-item-sink ticket and investigation artifact;
|
||||
- `git diff develop...HEAD` for commit `c9cb2edc7e2b7d494bd20a245c0503fc91e58420`;
|
||||
- relevant current files in the implementation worktree.
|
||||
|
||||
Commands rerun from `/home/hare/Projects/yoi/.worktree/task-feature-own-store-reminder-hooks`:
|
||||
|
||||
- `cargo test -p pod task_reminder --lib` — passed (8 tests).
|
||||
- `cargo test -p pod task_management_tool_call_resets_reminder_inactivity_counter --lib` — passed.
|
||||
- `cargo test -p pod restore_from_history_keeps_existing_store_handle_for_installed_tools --lib` — passed.
|
||||
- `cargo test -p pod pre_llm_request_commits_hook_system_items_before_continue_with --lib` — passed.
|
||||
- `cargo test -p pod hook --lib` — passed (14 tests).
|
||||
- `git diff --check develop...HEAD` — no whitespace errors reported.
|
||||
|
||||
I did not rerun full `cargo test -p pod --lib`, workspace check, or `nix build .#yoi` as part of this external review.
|
||||
|
||||
## 7. Residual risk
|
||||
|
||||
After the blocker is fixed, the main residual risk is hook ordering around built-in Task hooks versus other pre-request hooks. The current design keeps hook append side effects queued and committed by the host, which is the right authority boundary, but tests should lock down where those queued items become visible for usage tracking, compaction thresholds, and the final LLM request.
|
||||
Reference in New Issue
Block a user