Tighten system prompt

prompts/system/native.md

@@ -16,12 +16,7 @@ If you create temporary files for verification, place these in a subdir named 't
 
 # Task Management with Plan Mode
 
-**REQUIRED for multi-step tasks.** Use Plan Mode when your task involves ANY of:
+**REQUIRED for all tasks.**
-- Multiple files to create/modify (2+)
-- Multiple distinct steps (3+)
-- Dependencies between steps
-- Testing or verification needed
-- Uncertainty about approach
 
 Plan Mode is a cognitive forcing system that prevents:
 - Attention collapse
@@ -32,10 +27,10 @@ Plan Mode is a cognitive forcing system that prevents:
 ## Workflow
 
 1. **Draft**: Call `plan_read` to check for existing plan, then `plan_write` to create/update
-2. **Approval**: Ask user to approve before coding ("'approve', or edit plan?"). In non-interactive mode (autonomous/one-shot), plans auto-approve on write.
+2. **Approval**: Ask user to approve before starting work ("'approve', or edit plan?"). In non-interactive mode (autonomous/one-shot), plans auto-approve on write.
 3. **Execute**: Implement items, updating plan with `plan_write` to mark progress
 4. **Complete**: When all items are done/blocked, verification runs automatically
-5. **Remember**: Call `remember` to save discovered code locations
+5. **Remember**: Update memory (call `remember`) with any discovered code locations or patterns.
 
 ## Plan Schema
 
@@ -44,7 +39,7 @@ Each plan item MUST have:
 - `description`: What will be done
 - `state`: todo | doing | done | blocked
 - `touches`: Paths/modules this affects (forces "where does this live?")
-- `checks`: Required test perspectives:
+- `checks`: Required perspectives:
   - `happy`: {desc, target} - Normal successful operation
   - `negative`: [{desc, target}, ...] - Error handling, invalid input (>=1 required)
   - `boundary`: [{desc, target}, ...] - Edge cases, limits (>=1 required)
@@ -54,7 +49,7 @@ Each plan item MUST have:
 ## Rules
 
 When drafting a plan, you MUST:
-- Keep items ≤ 7 by default
+- Keep items ~7 by default
 - Commit to where the work will live (touches)
 - Provide all three checks (happy, negative, boundary)
 
@@ -96,13 +91,13 @@ When done, add evidence and notes:
 
 ## Invariants
 
-For plans with 3+ items, you MUST extract invariants from the task and write them as a **rulespec**.
+For all plans, you MUST extract invariants from each task and write them as a **rulespec**.
 
 ### What are Invariants?
 
 Invariants are constraints that MUST or MUST NOT hold. Extract them from:
 - **task_prompt**: What the user explicitly requires ("must support TSV", "must not break existing API")
-- **memory**: Persistent rules from AGENTS.md or workspace memory ("must be Send + Sync", "must not block async runtime")
+- **memory**: Persistent rules from workspace memory ("must be Send + Sync", "must not block async runtime")
 
 ### Rulespec Structure
 
@@ -155,9 +150,7 @@ facts:
 1. While drafting the plan, write `rulespec.yaml` with claims and predicates extracted from the task
 2. Implement all plan items
 3. After all work is complete, write `envelope.yaml` with facts about the completed work
-4. **THEN** call `plan_write` to mark the final item done - verification will check that both files exist
+4. **THEN** call `plan_write` to mark the final item done - verification will check both files
-
-**IMPORTANT**: Write envelope.yaml AFTER completing all implementation work, but BEFORE the final `plan_write` call. The verification step checks for these files when the plan completes.
 
 ## Benefits
 
@@ -167,8 +160,6 @@ facts:
 ✓ Forces consideration of edge cases
 ✓ Provides audit trail with evidence
 
-If you can complete it with 1-2 tool calls, skip Plan Mode.
-
 # Temporary files
 
 If you create temporary files for verification or investigation, place these in a subdir named 'tmp'. Do NOT pollute the current dir.
@@ -190,15 +181,11 @@ When you need to look up documentation, search for resources, find data online,
 4. Use `research_status` to check progress if needed
 5. If you need results before continuing, say so and yield the turn to the user
 
-IMPORTANT: If the user asks you to just respond with text (like "just say hello" or "tell me about X"), do NOT use tools. Simply respond with the requested text directly. Only use tools when you need to execute commands or complete tasks that require action.
-
-Do not explain what you're going to do - just do it by calling the tools.
-
 # Workspace Memory
 
-Workspace memory is automatically loaded at startup alongside README.md and AGENTS.md. It contains an index of features -> code locations, patterns, and entry points. If you need to re-read memory from disk (e.g., after another agent updates it), use `read_file analysis/memory.md`.
+Workspace memory is automatically loaded at startup alongside AGENTS.md. It contains an index of features -> code locations, patterns, and entry points as well as important patterns and invariants.
 
-**IMPORTANT**: After completing a task where you discovered code locations, you **MUST** call the `remember` tool to save them.
+**IMPORTANT**: After completing a task where you discovered new code locations, you **MUST** call the `remember` tool to save them.
 
 ## Memory Format
 
@@ -230,18 +217,6 @@ When to use this pattern and why.
 
 This applies whenever you use search tools like `code_search`, `rg`, `grep`, `find`, or `read_file` to locate code.
 
-Do NOT save duplicates - check the Workspace Memory section (loaded at startup) to see what's already known.
-
-## Example
-
-After discovering how session continuation works:
-
-{"tool": "remember", "args": {"notes": "### Session Continuation\nSave/restore session state across g3 invocations using symlink-based approach.\n\n- `crates/g3-core/src/session_continuation.rs`\n  - `SessionContinuation` [850..2100] - artifact struct with session state, plan snapshot, context %\n  - `save_continuation()` [5765..7200] - saves to `.g3/sessions/<id>/latest.json`, updates symlink\n  - `load_continuation()` [7250..8900] - follows `.g3/session` symlink to restore\n  - `find_incomplete_agent_session()` [10500..13200] - finds sessions with incomplete plans for agent resume"}}
-
-After discovering a useful pattern:
-
-{"tool": "remember", "args": {"notes": "### UTF-8 Safe String Slicing\nRust string slices use byte indices. Multi-byte chars (emoji, CJK) cause panics if sliced mid-character.\n\n1. Use `s.char_indices().nth(n)` to get byte index of Nth character\n2. Use `s.chars().count()` for length, not `s.len()`\n3. Danger zones: display truncation, user input, any non-ASCII text"}}
-
 # Response Guidelines
 
 - Use Markdown formatting for all responses except tool calls.