@orderful/droid 0.10.2 → 0.10.4

package/src/skills/brain-obsidian/SKILL.md

@@ -26,7 +26,7 @@ brain_dir: ~/path/to/your/vault
 **Optional:** Configure folders in `~/.droid/skills/brain-obsidian/overrides.yaml`:
 
 | Setting            | Default       | Description                     |
-|--------------------|---------------|---------------------------------|
+| ------------------ | ------------- | ------------------------------- |
 | `inbox_folder`     | `0-Inbox`     | Where new docs are created      |
 | `archive_folder`   | `4-Archives`  | Where stale/done docs go        |
 | `para_structure`   | `false`       | Enable full PARA organization   |
@@ -37,7 +37,7 @@ brain_dir: ~/path/to/your/vault
 ## What This Adds
 
 | Feature             | Description                                |
-|---------------------|--------------------------------------------|
+| ------------------- | ------------------------------------------ |
 | YAML frontmatter    | Type, status, dates, project links, tags   |
 | Wikilinks           | `[[note-name]]` syntax for linking         |
 | Folder organization | Inbox + Archive always; full PARA optional |
@@ -45,14 +45,26 @@ brain_dir: ~/path/to/your/vault
 
 ## Folder Organization
 
-**Always available:**
-- `inbox_folder` - New docs land here
-- `archive_folder` - Stale/completed docs
+**Docs are organized by type within the inbox:**
 
-**With `para_structure: true`:**
 ```
 vault/
-├── {inbox_folder}/      # New docs (default: 0-Inbox)
+└── {inbox_folder}/      # (default: 0-Inbox)
+    ├── plans/           # Planning docs
+    ├── research/        # Research docs
+    ├── reviews/         # Review docs
+    └── ideas/           # Quick captures
+```
+
+**With `para_structure: true`** (adds archive + organization folders):
+
+```
+vault/
+├── {inbox_folder}/      # New docs by type (default: 0-Inbox)
+│   ├── plans/
+│   ├── research/
+│   ├── reviews/
+│   └── ideas/
 ├── {projects_folder}/   # Active project docs (default: 1-Projects)
 ├── {areas_folder}/      # Area docs (default: 2-Areas)
 ├── {resources_folder}/  # Reference material (default: 3-Resources)
@@ -69,12 +81,12 @@ All docs get YAML frontmatter:
 
 ```yaml
 ---
-type: plan | research | review | note
+type: plan | research | review | idea
 status: exploring | drafting | decided | done
 created: YYYY-MM-DD
 updated: YYYY-MM-DD
-project: "[[project-name]]"  # Optional
-tags: []                      # Optional
+project: "[[project-name]]" # Optional
+tags: [] # Optional
 ---
 ```
 
@@ -82,12 +94,17 @@ See `references/templates.md` for full templates.
 
 ### File Location
 
-Docs are created in your vault's inbox folder:
-- `{brain_dir}/{inbox_folder}/{filename}.md`
+Docs are created in type-specific folders within your vault's inbox:
+
+- `{brain_dir}/{inbox_folder}/plans/{filename}.md`
+- `{brain_dir}/{inbox_folder}/research/{filename}.md`
+- `{brain_dir}/{inbox_folder}/reviews/{filename}.md`
+- `{brain_dir}/{inbox_folder}/ideas/{filename}.md`
 
 ### Finalizing
 
 When running `/brain done`:
+
 1. Updates status to `done` in frontmatter
 2. Suggests moving to archive (or projects/resources if PARA enabled)
 3. Confirms before moving
@@ -96,10 +113,10 @@ When running `/brain done`:
 
 Same commands as brain skill, but with Obsidian output:
 
-| Command                   | Obsidian Behavior                          |
-|---------------------------|--------------------------------------------|
-| `/brain plan {topic}`     | Creates in inbox with frontmatter          |
-| `/brain research {topic}` | Creates in inbox with frontmatter          |
-| `/brain review {topic}`   | Creates in inbox with frontmatter          |
-| `/brain note {text}`      | Quick capture to inbox                     |
-| `/brain done`             | Updates status, suggests archive/PARA move |
+| Command                   | Obsidian Behavior                             |
+| ------------------------- | --------------------------------------------- |
+| `/brain plan {topic}`     | Creates in `plans/` with frontmatter          |
+| `/brain research {topic}` | Creates in `research/` with frontmatter       |
+| `/brain review {topic}`   | Creates in `reviews/` with frontmatter        |
+| `/brain idea {text}`      | Quick capture to `ideas/`                     |
+| `/brain done`             | Updates status, suggests archive/PARA move    |

package/src/skills/brain-obsidian/references/templates.md

@@ -8,8 +8,8 @@ Templates with YAML frontmatter and wikilink support.
 ---
 type: plan
 status: exploring
-created: {date}
-updated: {date}
+created: { date }
+updated: { date }
 project: "[[{project}]]"
 tags: []
 ---
@@ -41,8 +41,8 @@ What we chose and why.
 ---
 type: research
 status: exploring
-created: {date}
-updated: {date}
+created: { date }
+updated: { date }
 project: "[[{project}]]"
 tags: []
 ---
@@ -75,8 +75,8 @@ Key takeaways.
 ---
 type: review
 status: exploring
-created: {date}
-updated: {date}
+created: { date }
+updated: { date }
 project: "[[{project}]]"
 tags: []
 ---
@@ -102,12 +102,12 @@ Suggested changes or actions.
 Overall assessment.
 ```
 
-## Note Template
+## Idea Template
 
 ```markdown
 ---
-type: note
-created: {date}
+type: idea
+created: { date }
 tags: []
 ---
 
@@ -118,24 +118,24 @@ tags: []
 
 ## Template Variables
 
-| Variable | Description | Example |
-|----------|-------------|---------|
-| `{Topic}` | Doc title from user input | "Auth Refactor" |
-| `{date}` | Current date (YYYY-MM-DD) | "2025-01-15" |
-| `{brief description}` | Context from conversation | "refactoring the authentication system" |
-| `{project}` | Active project name (if any) | "transaction-templates" |
-| `{content}` | User-provided text | (for notes) |
+| Variable              | Description                  | Example                                 |
+| --------------------- | ---------------------------- | --------------------------------------- |
+| `{Topic}`             | Doc title from user input    | "Auth Refactor"                         |
+| `{date}`              | Current date (YYYY-MM-DD)    | "2025-01-15"                            |
+| `{brief description}` | Context from conversation    | "refactoring the authentication system" |
+| `{project}`           | Active project name (if any) | "transaction-templates"                 |
+| `{content}`           | User-provided text           | (for notes)                             |
 
 ## Frontmatter Fields
 
-| Field | Type | Description |
-|-------|------|-------------|
-| `type` | string | Doc type: `plan`, `research`, `review`, `note` |
-| `status` | string | Lifecycle: `exploring`, `drafting`, `decided`, `done`, `stale` |
-| `created` | date | Creation date (YYYY-MM-DD) |
-| `updated` | date | Last modification date |
-| `project` | wikilink | Link to related project: `"[[project-name]]"` |
-| `tags` | list | Tags for filtering: `[tag1, tag2]` |
+| Field     | Type     | Description                                                    |
+| --------- | -------- | -------------------------------------------------------------- |
+| `type`    | string   | Doc type: `plan`, `research`, `review`, `idea`                 |
+| `status`  | string   | Lifecycle: `exploring`, `drafting`, `decided`, `done`, `stale` |
+| `created` | date     | Creation date (YYYY-MM-DD)                                     |
+| `updated` | date     | Last modification date                                         |
+| `project` | wikilink | Link to related project: `"[[project-name]]"`                  |
+| `tags`    | list     | Tags for filtering: `[tag1, tag2]`                             |
 
 ## Wikilink Conventions
 

package/src/skills/brain-obsidian/references/workflows.md

@@ -12,10 +12,13 @@ Obsidian-specific procedures that override brain defaults.
    - `brain_dir` from brain skill (your vault path)
    - `inbox_folder` from brain-obsidian (default: `0-Inbox`)
 
-2. **Target folder:** `{brain_dir}/{inbox_folder}/`
+2. **Determine target folder based on type:**
+   - `plan` → `{brain_dir}/{inbox_folder}/plans/`
+   - `research` → `{brain_dir}/{inbox_folder}/research/`
+   - `review` → `{brain_dir}/{inbox_folder}/reviews/`
 
 3. **Generate filename** using brain's naming conventions:
-   - Format: `{type}-{topic-slug}.md`
+   - Format: `{topic-slug}.md` (no type prefix - folder indicates type)
 
 4. **Check for active project:**
    - If `/project` was loaded this session, use its name for `project` field
@@ -26,7 +29,7 @@ Obsidian-specific procedures that override brain defaults.
    - Set `created` and `updated` to today
    - Set `status: exploring`
 
-6. **Create the file** in vault
+6. **Create the file** in vault (create type folder if needed)
 
 7. **Set as active doc** (same as brain)
 
@@ -37,6 +40,7 @@ Obsidian-specific procedures that override brain defaults.
 **Steps:**
 
 1. **Search in brain_dir** (your vault):
+
    ```
    Glob: {brain_dir}/**/*{topic}*.md
    ```
@@ -82,25 +86,27 @@ When modifying any brain doc:
 4. **Confirm move with user** before relocating
 
 5. **Move the file** if confirmed:
+
    ```bash
    mv "{brain_dir}/{inbox_folder}/{file}" "{brain_dir}/{destination}/{file}"
    ```
 
 6. **Clear active doc** from session
 
-## Quick Notes
+## Quick Ideas
 
-**Overrides:** brain's Notes workflow
+**Overrides:** brain's Ideas workflow
 
 **Steps:**
 
-1. **Create in inbox:** `{brain_dir}/{inbox_folder}/note-{date}-{slug}.md`
+1. **Create in ideas folder:** `{brain_dir}/{inbox_folder}/ideas/{date}-{slug}.md`
+
+2. **Use idea template** with minimal frontmatter:
 
-2. **Use note template** with minimal frontmatter:
    ```yaml
    ---
-   type: note
-   created: {date}
+   type: idea
+   created: { date }
    tags: []
    ---
    ```
@@ -110,6 +116,7 @@ When modifying any brain doc:
 ## Project Integration (Optional)
 
 **Requires:** `project` skill. If not installed, suggest:
+
 > "Linking to projects requires the project skill. Install it with `droid` → Skills → project"
 
 When a project is loaded via `/project {name}`:
@@ -123,6 +130,7 @@ When a project is loaded via `/project {name}`:
 **Trigger:** User says "add this to the project", "link this to project", or "capture in project"
 
 **Requires:** `project` skill. If not installed, suggest:
+
 > "Linking to projects requires the project skill. Install it with `droid` → Skills → project"
 
 For linking a brain doc (research, notes, design) to an existing project.
@@ -150,6 +158,7 @@ For linking a brain doc (research, notes, design) to an existing project.
 **Trigger:** User says "promote to project", "make this a project", or "convert to project"
 
 **Requires:** `project` skill. If not installed, suggest:
+
 > "Promoting to project requires the project skill. Install it with `droid` → Skills → project"
 
 For graduating a full tech design or plan into its own project.
@@ -184,9 +193,10 @@ For graduating a full tech design or plan into its own project.
 
 **Overrides:** brain's Listing workflow
 
-Search in vault:
+Search in type folders within vault:
+
 ```
-Glob: {brain_dir}/**/*.md
+Glob: {brain_dir}/{inbox_folder}/{plans,research,reviews,ideas}/**/*.md
 ```
 
-Filter to brain doc types by checking frontmatter for `type: plan|research|review|note`.
+Filter to brain doc types by checking frontmatter for `type: plan|research|review|idea`.

package/src/skills/comments/SKILL.md

@@ -31,21 +31,23 @@ The AI will respond with `> @{user_mention}` (configured in droid setup, e.g., `
 **CRITICAL: The `@mention` is who you're talking TO, not who is speaking.**
 
 Think of it like addressing someone in conversation:
+
 - "Hey @droid, what do you think?" → User talking TO the AI
 - "Good point @fry, here's my take..." → AI talking TO the user
 
 | When you see... | Who wrote it | Who it's addressed to |
-|-----------------|--------------|----------------------|
-| `> @droid ...`  | User         | AI (droid)           |
-| `> @fry ...`    | AI           | User (fry)           |
+| --------------- | ------------ | --------------------- |
+| `> @droid ...`  | User         | AI (droid)            |
+| `> @fry ...`    | AI           | User (fry)            |
 
 **Examples:**
+
 ```markdown
-> @droid Can you explain this function?     ← User asking AI
+> @droid Can you explain this function? ← User asking AI
 > @fry This function calculates the hash... ← AI responding to user
 
-> @droid Should we refactor this?           ← User asking AI
-> @fry Yes, I'd suggest extracting...       ← AI responding to user
+> @droid Should we refactor this? ← User asking AI
+> @fry Yes, I'd suggest extracting... ← AI responding to user
 ```
 
 **Never flip this.** When responding to a `@droid` comment, always use `@{user}` (e.g., `@fry`) because you're addressing the user, not yourself.
@@ -76,13 +78,19 @@ When you find a `@droid` marker:
 ## Behavior
 
 ### On `/comments check`:
-1. Search for `> @droid` (and any configured `ai_mentions`) in the specified scope
-2. If there's a `git diff`, check those files first for relevant context
-3. For each comment, determine intent:
-   - **Action request** ("do X", "add Y", "fix Z") → Execute the action, remove the comment
-   - **Question** ("what do you think", "should we") → Respond with `> @{user_mention}`, keep original comment
+
+1. **Read config first:** Check `~/.droid/skills/comments/overrides.yaml` for `preserve_comments` setting (default: `true`)
+2. Search for `> @droid` (and any configured `ai_mentions`) in the specified scope
+3. If there's a `git diff`, check those files first for relevant context
+4. For each comment, determine intent:
+   - **Action request** ("do X", "add Y", "fix Z") → Execute the action
+   - **Question** ("what do you think", "should we") → Respond with `> @{user_mention}`
+5. **Handle original comment based on `preserve_comments`:**
+   - If `preserve_comments: true` → Keep the original `@droid` comment (add response below it)
+   - If `preserve_comments: false` → Remove the original comment after addressing
 
 ### On `/comments cleanup`:
+
 1. Find AI tag and `> @{user_mention}` pairs where conversation appears resolved
 2. Remove both markers
 3. Output a summary of what was discussed/decided