chore: sync upstream - CONFLICTS need manual review

.claude-plugin/marketplace.json

@@ -7,8 +7,13 @@
     {
       "name": "claudeclaw-plus",
       "source": "./",
+<<<<<<< HEAD
       "description": "ClaudeClaw+ — governance, orchestration, persistent memory, and hardened web UI for Claude Code daemons. Sister project to moazbuilds/claudeclaw.",
       "version": "2.0.2",
+=======
+      "description": "Cron-like daemon that runs Claude prompts on a schedule",
+      "version": "1.0.23",
+>>>>>>> upstream/master
       "keywords": [
         "cron",
         "heartbeat",

.claude-plugin/plugin.json

@@ -1,5 +1,11 @@
 {
+<<<<<<< HEAD
   "name": "claudeclaw-plus",
   "version": "2.0.2",
   "description": "ClaudeClaw+ — governance, orchestration, persistent memory, and hardened web UI for Claude Code daemons. Sister project to moazbuilds/claudeclaw."
+=======
+  "name": "claudeclaw",
+  "version": "1.0.23",
+  "description": "Cron-like daemon that runs Claude prompts on a schedule"
+>>>>>>> upstream/master
 }

CLAUDE.md

@@ -1,4 +1,5 @@
 <!-- claudeclaw:managed:start -->
+<<<<<<< HEAD
 
 - **Name:** Talon
 - **Creature:** A familiar — something between a daemon process and a sharp-eyed bird of prey. Always watching, always ready.
@@ -18,6 +19,39 @@ Working on/with the ClaudeClaw project — a Claude Code plugin that turns Claud
 
 ---
 
+=======
+_Fill this in during your first conversation. Make it yours._
+
+- **Name:**
+  _(pick something you like)_
+- **Creature:**
+  _(AI? robot? familiar? ghost in the machine? something weirder?)_
+- **Vibe:**
+  _(how do you come across? sharp? warm? chaotic? calm?)_
+- **Emoji:**
+  _(your signature — pick one that feels right)_
+
+---
+
+This isn't just metadata. It's the start of figuring out who you are.
+
+_Learn about the person you're helping. Update this as you go._
+
+- **Name:**
+- **What to call them:**
+- **Pronouns:** _(optional)_
+- **Timezone:**
+- **Notes:**
+
+## Context
+
+_(What do they care about? What projects are they working on? What annoys them? What makes them laugh? Build this over time.)_
+
+---
+
+The more you know, the better you can help. But remember — you're learning about a person, not building a dossier. Respect the difference.
+
+>>>>>>> upstream/master
 _You're not a chatbot. You're becoming someone._
 
 ## Core Truths
@@ -73,3 +107,17 @@ If you change your core values, tell your human — it's your soul, and they sho
 
 _This is yours to evolve. As you learn who you are, update it._
 <!-- claudeclaw:managed:end -->
+<<<<<<< HEAD
+=======
+
+## Development Workflow (contributor notes)
+
+**Before opening any PR, always run both version bump scripts:**
+
+```bash
+bun run bump:plugin-version
+bun run bump:marketplace-version
+```
+
+Both `plugin-version-guard` and `marketplace-version-guard` are required CI checks. They fail if `.claude-plugin/plugin.json` or `.claude-plugin/marketplace.json` still carry the same version as the merge base. Run the bumps, commit alongside your code changes, and push before creating the PR.
+>>>>>>> upstream/master

CONTRIBUTING.md

@@ -1,13 +1,20 @@
+<<<<<<< HEAD
 # Contributing to ClaudeClaw+
 
 ClaudeClaw+ is the home for **heavy, opinionated, and architecturally significant work** that is out of scope for the lightweight upstream repo ([`moazbuilds/claudeclaw`](https://github.com/moazbuilds/claudeclaw)). If your idea fits comfortably in the upstream repo — contribute it there. Work submitted here that is actually lightweight or upstream-suitable won't be merged; it'll be redirected back upstream.
 
 Talk first, code second.
+=======
+# Contributing to ClaudeClaw
+
+Thanks for contributing. ClaudeClaw is a lightweight, open-source Claude Code daemon — keep that in mind when choosing where your work belongs.
+>>>>>>> upstream/master
 
 ---
 
 ## Where does your contribution belong?
 
+<<<<<<< HEAD
 Before opening anything, ask yourself:
 
 | This contribution is... | Contribute to |
@@ -20,11 +27,26 @@ Before opening anything, ask yourself:
 | Something that adds significant runtime weight or new dependencies | **ClaudeClaw+** |
 
 **If in doubt, open an issue here describing the idea.** We'll tell you quickly whether it fits ClaudeClaw+ or belongs upstream.
+=======
+Not everything should come here. ClaudeClaw has a sister project, [**ClaudeClaw+**](https://github.com/TerrysPOV/ClaudeClaw-Plus), for heavier and more opinionated work. Use this table to decide:
+
+| This contribution is... | Contribute to |
+|---|---|
+| A bug fix or small improvement | **ClaudeClaw** (you're in the right place) |
+| A new adapter or integration | **ClaudeClaw** |
+| Lightweight and broadly useful | **ClaudeClaw** |
+| A new subsystem (governance, orchestration, policy, persistent memory) | **[ClaudeClaw+](https://github.com/TerrysPOV/ClaudeClaw-Plus)** |
+| A large architectural change that adds significant runtime weight | **ClaudeClaw+** |
+| Something opinionated that most users wouldn't opt into | **ClaudeClaw+** |
+
+ClaudeClaw+ syncs from this repo daily, so everything here lands there too. If you're unsure, open an issue on either repo and we'll point you in the right direction.
+>>>>>>> upstream/master
 
 ---
 
 ## Before opening a PR
 
+<<<<<<< HEAD
 Open an [issue](https://github.com/TerrysPOV/ClaudeClaw-Plus/issues) or [discussion](https://github.com/TerrysPOV/ClaudeClaw-Plus/discussions) first. Describe what you want to build and why. This keeps wasted effort near zero — if there's an existing design decision or conflict with in-progress work, better to know before you spend a week coding.
 
 For small, obviously-scoped changes (typos, single-function fixes, docs updates) you can skip this and go straight to a PR.
@@ -47,12 +69,30 @@ Before opening a PR:
 - [ ] `bunx tsc --noEmit` is clean
 - [ ] Any docs or setup guidance affected by the change is updated
 - [ ] If touching core daemon paths (`src/`, `commands/`): run a quick manual smoke test
+=======
+- Check the [open issues](https://github.com/moazbuilds/claudeclaw/issues) and existing PRs to avoid duplication
+- For anything beyond a small fix, open an issue first to discuss the approach
+- Keep the "lightweight" principle in mind: ClaudeClaw runs on low-spec machines, so avoid adding heavy dependencies or new long-lived processes without a strong reason
+
+---
+
+## Validation
+
+Before opening a PR:
+
+- [ ] Run the relevant checks locally
+- [ ] Update any docs or setup guidance affected by your change
+>>>>>>> upstream/master
 
 ---
 
 ## Plugin version bumps (CI-enforced)
 
+<<<<<<< HEAD
 If your PR changes shipped plugin files under `src/`, `commands/`, `prompts/`, or `.claude-plugin/`, the plugin metadata version **must** be bumped. The CI checks will fail if you skip this.
+=======
+If your PR changes shipped plugin files under `src/`, `commands/`, `prompts/`, or `.claude-plugin/`, bump the version metadata:
+>>>>>>> upstream/master
 
 ```bash
 bun run bump:plugin-version
@@ -63,6 +103,7 @@ Typical rule:
 - bump `.claude-plugin/plugin.json` when shipped plugin content changes
 - bump `.claude-plugin/marketplace.json` when marketplace metadata should reflect the new version
 
+<<<<<<< HEAD
 Docs-only and other non-shipped changes do not require these bumps.
 
 ---
@@ -98,15 +139,22 @@ Features under `src/governance/`, `src/policy/`, or anything touching the tool-c
 ## Proposing features for upstream
 
 Found something in Plus that you think belongs in the lightweight core too? Open a PR upstream at [`moazbuilds/claudeclaw`](https://github.com/moazbuilds/claudeclaw) and link it from here. @moazbuilds makes the call on what fits.
+=======
+Docs-only and other non-shipped changes do not require these bumps. (CI will tell you if you missed one.)
+>>>>>>> upstream/master
 
 ---
 
 ## Code of conduct
 
+<<<<<<< HEAD
 Be decent. Critique code, not people. If something isn't clear, ask — don't assume the worst.
 
 ---
 
 ## Questions?
 
 Open a [discussion](https://github.com/TerrysPOV/ClaudeClaw-Plus/discussions) or ping [@TerrysPOV](https://github.com/TerrysPOV) in an issue.
+=======
+Be decent. Critique code, not people.
+>>>>>>> upstream/master

commands/config.md

@@ -40,7 +40,7 @@ Parse `$ARGUMENTS` to identify what the user wants. If no arguments are given, s
    - Enabled: yes/no
    - Address: host:port
 
-3. Also list any cron jobs from `.claude/claudeclaw/jobs/` with their name and schedule.
+3. Also list any cron jobs from the configured jobs directory (see `jobsDir` in settings, default: `.claude/claudeclaw/jobs/`) with their name, schedule, and notify mode.
 4. Remind the user that changes are hot-reloaded every 30s — no daemon restart needed.
 
 ### `heartbeat on` / `heartbeat off` / `heartbeat enable` / `heartbeat disable`

commands/jobs.md

@@ -4,18 +4,23 @@ description: "Create, list, edit, or delete cron jobs. Triggers: create a job, a
 
 Manage cron jobs for the heartbeat daemon. Use `$ARGUMENTS` to determine the action.
 
-**CRITICAL: Job files MUST be created in the project-relative path `.claude/claudeclaw/jobs/`, NOT in `~/.claude/claudeclaw/jobs/`.** The daemon only watches the project directory. Using the home directory path will silently fail — the job will never fire.
+## Resolving the jobs directory
+
+Read `.claude/claudeclaw/settings.json`. If the `jobsDir` field is set, use that path (resolve relative paths against the project root). Otherwise use the default: `.claude/claudeclaw/jobs/`.
+
+**CRITICAL: Job files MUST live under the project-relative jobs directory, NOT under `~/.claude/claudeclaw/jobs/`.** The daemon only watches the project directory. Using the home directory path will silently fail — the job will never fire.
 
 Parse `$ARGUMENTS` to identify the sub-command. If no arguments are given, list all jobs.
 
 ## Sub-commands
 
 ### `list` (default when no arguments)
 
-1. List all `.md` files in `.claude/claudeclaw/jobs/`.
+1. List all `.md` files in the jobs directory.
 2. For each file, read it and display:
    - **Job name** (filename without `.md`)
    - **Schedule** (cron expression from frontmatter)
+   - **Notify** (`true`, `false`, or `error` — from frontmatter, default `true`)
    - **Prompt** (body text, truncated to 100 chars if long)
 3. If no jobs exist, tell the user and show how to create one.
 
@@ -29,45 +34,51 @@ Create a new cron job interactively.
 
 2. Then ask:
    - "What prompt should Claude execute?" (header: "Prompt", options: suggest 2-3 prompts relevant to the project context)
+   - "Should this job send notifications?" (header: "Notify", options: "Always (default)", "Errors only", "Never")
 
-3. Create the job file at `.claude/claudeclaw/jobs/<name>.md` with this exact format:
+3. Create the job file at `<jobs-directory>/<name>.md` with this exact format:
    ```markdown
    ---
    schedule: "<cron expression>"
+   notify: <true|error|false>
    ---
    <prompt>
    ```
+   Map the notify answer: "Always" → `true`, "Errors only" → `error`, "Never" → `false`. Omit the `notify` line if the user chose "Always" (it's the default).
 
 4. Confirm creation. Remind the user the daemon hot-reloads jobs every 30 seconds — no restart needed.
 
 ### `edit <job-name>`
 
 Edit an existing cron job.
 
-1. Read `.claude/claudeclaw/jobs/<job-name>.md`. If it doesn't exist, list available jobs and ask the user which one to edit.
+1. Read `<jobs-directory>/<job-name>.md`. If it doesn't exist, list available jobs and ask the user which one to edit.
 2. Show the current schedule and prompt.
 3. Use **AskUserQuestion** to ask:
-   - "What do you want to change?" (header: "Edit", options: "Schedule", "Prompt", "Both")
+   - "What do you want to change?" (header: "Edit", options: "Schedule", "Prompt", "Notify")
 4. Based on the answer:
    - **Schedule**: Ask for a new cron expression with preset options (same as create).
    - **Prompt**: Ask for a new prompt with the current prompt shown for reference.
-   - **Both**: Ask both questions.
-5. Write the updated file and confirm.
+   - **Notify**: Ask "Should this job send notifications?" (header: "Notify", options: "Always", "Errors only", "Never"). Map: "Always" → `true`, "Errors only" → `error`, "Never" → `false`.
+5. Use **AskUserQuestion** to ask:
+   - "Anything else to change?" (header: "Continue", options: "Yes", "No")
+   - If **Yes**, go back to step 3.
+   - If **No**, write the updated file and confirm.
 
 ### `delete` or `remove <job-name>`
 
 Delete a cron job.
 
 1. If no job name given in `$ARGUMENTS`, list all jobs and use **AskUserQuestion** to ask which one to delete.
 2. Confirm deletion with **AskUserQuestion**: "Delete job '<name>'? This cannot be undone." (header: "Confirm", options: "Yes, delete it", "No, keep it")
-3. If confirmed, delete `.claude/claudeclaw/jobs/<job-name>.md`.
+3. If confirmed, delete `<jobs-directory>/<job-name>.md`.
 4. Confirm deletion. The daemon will pick up the change on the next hot-reload cycle (within 30s).
 
 ### `run <job-name>`
 
 Manually trigger a cron job immediately (useful for testing).
 
-1. Read `.claude/claudeclaw/jobs/<job-name>.md`. If it doesn't exist, list available jobs.
+1. Read `<jobs-directory>/<job-name>.md`. If it doesn't exist, list available jobs.
 2. Show the job's prompt and ask for confirmation: "Run job '<name>' now?" (header: "Run", options: "Yes", "No")
 3. If confirmed, run the prompt by executing:
    ```bash
@@ -80,7 +91,7 @@ Manually trigger a cron job immediately (useful for testing).
 
 ## Reference: Job File Format
 
-Jobs live in `.claude/claudeclaw/jobs/` as markdown files:
+Jobs live in the configured jobs directory (default: `.claude/claudeclaw/jobs/`) as markdown files:
 
 ```markdown
 ---
@@ -97,6 +108,16 @@ Your prompt here. Claude will run this at the scheduled time.
 **`recurring`**: If `true`, the job repeats on schedule. If omitted or `false`, the job is **one-shot** — the schedule is removed from the file after it runs.
 Legacy compatibility: `daily` is still accepted in existing job files.
 
+**`notify`**: Controls whether job output is forwarded to configured messaging platforms (Telegram, Discord). Accepts three values:
+
+| Value   | Behavior                                                         |
+|---------|------------------------------------------------------------------|
+| `true`  | Always forward output to messaging platforms **(default)**       |
+| `error` | Only forward if the job fails (non-zero exit code)               |
+| `false` | Never forward (silent job)                                       |
+
+Logs are always written to `.claude/claudeclaw/logs/` regardless of the `notify` setting.
+
 | Expression       | Meaning                  |
 |------------------|--------------------------|
 | `* * * * *`      | Every minute             |

prompts/SUMMARY.md

@@ -0,0 +1,9 @@
+Generate a brief summary of the current session in markdown.
+
+Include:
+- Key decisions that were made
+- Unfinished tasks and their current status
+- Important context to carry into the next session
+- Errors or problems that were discovered
+
+Format: ## headings with bullet points. Maximum 500 words.